From e1e324bde9718534c83756b9a52ccf1cff9488cb Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Fri, 17 May 2013 14:27:32 +0100 Subject: Website: there are now Debian packages on OBS --- www/htdocs/linux/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/htdocs/linux/index.html b/www/htdocs/linux/index.html index 9c3ead3..f2f5f95 100644 --- a/www/htdocs/linux/index.html +++ b/www/htdocs/linux/index.html @@ -15,7 +15,7 @@
Ubuntu
Use Gard Spreemann's PPA.
-
Fedora and OpenSUSE
+
Debian, Fedora and OpenSUSE
Use Alex Merry's OBS Repositories.
Arch Linux
Use the AUR package.
-- cgit v1.2.3 From 2a55b85366717e86642f0cfb0f564db6a4ef97ae Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Fri, 17 May 2013 15:32:30 +0100 Subject: SPEC file: fix license string for openSUSE --- tikzit/tikzit.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tikzit/tikzit.spec b/tikzit/tikzit.spec index 880a3e5..61e4e60 100644 --- a/tikzit/tikzit.spec +++ b/tikzit/tikzit.spec @@ -14,7 +14,11 @@ Group: Applications/Productivity %endif %endif +%if 0%{?suse_version} +License: GPL-2.0+ +%else License: GPLv2+ +%endif URL: http://tikzit.sourceforge.net Source0: http://switch.dl.sourceforge.net/project/%{name}/%{name}-%{version}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-build @@ -71,6 +75,9 @@ rm -rf %{buildroot} %changelog +* Fri May 17 2013 Alex Merry 1.0-2 +-Fixed license on openSUSE + * Tue May 7 2013 Alex Merry 1.0-1 -Bumped version -- cgit v1.2.3 From d498fa88fe9430ad8d2cebfc1bb32e5222abe793 Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Fri, 17 May 2013 15:33:17 +0100 Subject: Register a mimetype for TikZ documents --- tikzit/share/Makefile.am | 1 + tikzit/share/applications/tikzit.desktop | 1 + tikzit/share/mime/packages/tikzit.xml | 10 ++++++++++ 3 files changed, 12 insertions(+) create mode 100644 tikzit/share/mime/packages/tikzit.xml diff --git a/tikzit/share/Makefile.am b/tikzit/share/Makefile.am index d3b6a9d..e289e1e 100644 --- a/tikzit/share/Makefile.am +++ b/tikzit/share/Makefile.am @@ -3,6 +3,7 @@ else sharedir = $(datarootdir) nobase_dist_share_DATA = \ applications/tikzit.desktop \ + mime/packages/tikzit.xml \ icons/hicolor/*/apps/*.png \ icons/hicolor/scalable/apps/*.svg endif diff --git a/tikzit/share/applications/tikzit.desktop b/tikzit/share/applications/tikzit.desktop index d1fb908..aec42bc 100644 --- a/tikzit/share/applications/tikzit.desktop +++ b/tikzit/share/applications/tikzit.desktop @@ -4,6 +4,7 @@ Type=Application Name=TikZit Comment=TeX pgf/TikZ graph editor GenericName=TikZ Graph Editor +MimeType=text/x-tikz Exec=tikzit Icon=tikzit Categories=GTK;Graphics;Education;Science; diff --git a/tikzit/share/mime/packages/tikzit.xml b/tikzit/share/mime/packages/tikzit.xml new file mode 100644 index 0000000..c6e7c0c --- /dev/null +++ b/tikzit/share/mime/packages/tikzit.xml @@ -0,0 +1,10 @@ + + + + + + + + + + -- cgit v1.2.3 From cd601e6e7062eecfe337f90209f371770218b9cd Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Fri, 17 May 2013 22:39:55 +0100 Subject: Improve logo SVG vectorisation --- tikzit/share/icons/hicolor/128x128/apps/tikzit.png | Bin 9416 -> 9098 bytes tikzit/share/icons/hicolor/16x16/apps/tikzit.png | Bin 898 -> 882 bytes tikzit/share/icons/hicolor/22x22/apps/tikzit.png | Bin 1299 -> 1273 bytes tikzit/share/icons/hicolor/24x24/apps/tikzit.png | Bin 1457 -> 1406 bytes tikzit/share/icons/hicolor/32x32/apps/tikzit.png | Bin 1999 -> 1987 bytes tikzit/share/icons/hicolor/48x48/apps/tikzit.png | Bin 3245 -> 3132 bytes tikzit/share/icons/hicolor/64x64/apps/tikzit.png | Bin 4438 -> 4315 bytes .../share/icons/hicolor/scalable/apps/tikzit.svg | 81 +++------------------ www/images/tikzit.svg | 56 +++++--------- 9 files changed, 29 insertions(+), 108 deletions(-) diff --git a/tikzit/share/icons/hicolor/128x128/apps/tikzit.png b/tikzit/share/icons/hicolor/128x128/apps/tikzit.png index 51d0151..e8ee92b 100644 Binary files a/tikzit/share/icons/hicolor/128x128/apps/tikzit.png and b/tikzit/share/icons/hicolor/128x128/apps/tikzit.png differ diff --git a/tikzit/share/icons/hicolor/16x16/apps/tikzit.png b/tikzit/share/icons/hicolor/16x16/apps/tikzit.png index 269ff1c..9b7a377 100644 Binary files a/tikzit/share/icons/hicolor/16x16/apps/tikzit.png and b/tikzit/share/icons/hicolor/16x16/apps/tikzit.png differ diff --git a/tikzit/share/icons/hicolor/22x22/apps/tikzit.png b/tikzit/share/icons/hicolor/22x22/apps/tikzit.png index 18ab7c3..be803da 100644 Binary files a/tikzit/share/icons/hicolor/22x22/apps/tikzit.png and b/tikzit/share/icons/hicolor/22x22/apps/tikzit.png differ diff --git a/tikzit/share/icons/hicolor/24x24/apps/tikzit.png b/tikzit/share/icons/hicolor/24x24/apps/tikzit.png index e8d0c7e..478aeab 100644 Binary files a/tikzit/share/icons/hicolor/24x24/apps/tikzit.png and b/tikzit/share/icons/hicolor/24x24/apps/tikzit.png differ diff --git a/tikzit/share/icons/hicolor/32x32/apps/tikzit.png b/tikzit/share/icons/hicolor/32x32/apps/tikzit.png index 66008b7..75174e1 100644 Binary files a/tikzit/share/icons/hicolor/32x32/apps/tikzit.png and b/tikzit/share/icons/hicolor/32x32/apps/tikzit.png differ diff --git a/tikzit/share/icons/hicolor/48x48/apps/tikzit.png b/tikzit/share/icons/hicolor/48x48/apps/tikzit.png index a54f13a..7186458 100644 Binary files a/tikzit/share/icons/hicolor/48x48/apps/tikzit.png and b/tikzit/share/icons/hicolor/48x48/apps/tikzit.png differ diff --git a/tikzit/share/icons/hicolor/64x64/apps/tikzit.png b/tikzit/share/icons/hicolor/64x64/apps/tikzit.png index 7f2580d..1641e85 100644 Binary files a/tikzit/share/icons/hicolor/64x64/apps/tikzit.png and b/tikzit/share/icons/hicolor/64x64/apps/tikzit.png differ diff --git a/tikzit/share/icons/hicolor/scalable/apps/tikzit.svg b/tikzit/share/icons/hicolor/scalable/apps/tikzit.svg index bd103ca..dc5cc84 100644 --- a/tikzit/share/icons/hicolor/scalable/apps/tikzit.svg +++ b/tikzit/share/icons/hicolor/scalable/apps/tikzit.svg @@ -2,6 +2,9 @@ image/svg+xmlimage/svg+xml Date: Fri, 17 May 2013 22:40:26 +0100 Subject: Add mimetype icons --- tikzit/share/Makefile.am | 4 +- .../hicolor/128x128/mimetypes/text-x-tikz.png | Bin 0 -> 7316 bytes .../icons/hicolor/16x16/mimetypes/text-x-tikz.png | Bin 0 -> 564 bytes .../icons/hicolor/22x22/mimetypes/text-x-tikz.png | Bin 0 -> 866 bytes .../icons/hicolor/32x32/mimetypes/text-x-tikz.png | Bin 0 -> 1352 bytes .../icons/hicolor/48x48/mimetypes/text-x-tikz.png | Bin 0 -> 2445 bytes .../icons/hicolor/64x64/mimetypes/text-x-tikz.png | Bin 0 -> 3532 bytes .../hicolor/scalable/mimetypes/text-x-tikz.svg | 488 +++++++++++++++++++++ 8 files changed, 490 insertions(+), 2 deletions(-) create mode 100644 tikzit/share/icons/hicolor/128x128/mimetypes/text-x-tikz.png create mode 100644 tikzit/share/icons/hicolor/16x16/mimetypes/text-x-tikz.png create mode 100644 tikzit/share/icons/hicolor/22x22/mimetypes/text-x-tikz.png create mode 100644 tikzit/share/icons/hicolor/32x32/mimetypes/text-x-tikz.png create mode 100644 tikzit/share/icons/hicolor/48x48/mimetypes/text-x-tikz.png create mode 100644 tikzit/share/icons/hicolor/64x64/mimetypes/text-x-tikz.png create mode 100644 tikzit/share/icons/hicolor/scalable/mimetypes/text-x-tikz.svg diff --git a/tikzit/share/Makefile.am b/tikzit/share/Makefile.am index e289e1e..658b4d9 100644 --- a/tikzit/share/Makefile.am +++ b/tikzit/share/Makefile.am @@ -4,7 +4,7 @@ sharedir = $(datarootdir) nobase_dist_share_DATA = \ applications/tikzit.desktop \ mime/packages/tikzit.xml \ - icons/hicolor/*/apps/*.png \ - icons/hicolor/scalable/apps/*.svg + icons/hicolor/*/*/*.png \ + icons/hicolor/scalable/*/*.svg endif diff --git a/tikzit/share/icons/hicolor/128x128/mimetypes/text-x-tikz.png b/tikzit/share/icons/hicolor/128x128/mimetypes/text-x-tikz.png new file mode 100644 index 0000000..6b3bbe6 Binary files /dev/null and b/tikzit/share/icons/hicolor/128x128/mimetypes/text-x-tikz.png differ diff --git a/tikzit/share/icons/hicolor/16x16/mimetypes/text-x-tikz.png b/tikzit/share/icons/hicolor/16x16/mimetypes/text-x-tikz.png new file mode 100644 index 0000000..364e831 Binary files /dev/null and b/tikzit/share/icons/hicolor/16x16/mimetypes/text-x-tikz.png differ diff --git a/tikzit/share/icons/hicolor/22x22/mimetypes/text-x-tikz.png b/tikzit/share/icons/hicolor/22x22/mimetypes/text-x-tikz.png new file mode 100644 index 0000000..6436a9e Binary files /dev/null and b/tikzit/share/icons/hicolor/22x22/mimetypes/text-x-tikz.png differ diff --git a/tikzit/share/icons/hicolor/32x32/mimetypes/text-x-tikz.png b/tikzit/share/icons/hicolor/32x32/mimetypes/text-x-tikz.png new file mode 100644 index 0000000..7faaded Binary files /dev/null and b/tikzit/share/icons/hicolor/32x32/mimetypes/text-x-tikz.png differ diff --git a/tikzit/share/icons/hicolor/48x48/mimetypes/text-x-tikz.png b/tikzit/share/icons/hicolor/48x48/mimetypes/text-x-tikz.png new file mode 100644 index 0000000..d061ed9 Binary files /dev/null and b/tikzit/share/icons/hicolor/48x48/mimetypes/text-x-tikz.png differ diff --git a/tikzit/share/icons/hicolor/64x64/mimetypes/text-x-tikz.png b/tikzit/share/icons/hicolor/64x64/mimetypes/text-x-tikz.png new file mode 100644 index 0000000..2197553 Binary files /dev/null and b/tikzit/share/icons/hicolor/64x64/mimetypes/text-x-tikz.png differ diff --git a/tikzit/share/icons/hicolor/scalable/mimetypes/text-x-tikz.svg b/tikzit/share/icons/hicolor/scalable/mimetypes/text-x-tikz.svg new file mode 100644 index 0000000..1642e87 --- /dev/null +++ b/tikzit/share/icons/hicolor/scalable/mimetypes/text-x-tikz.svg @@ -0,0 +1,488 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + text + plaintext + regular + script + shell + bash + python + perl + php + ruby + + + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From ff11f7e8631c04d603df1440b635f1e1b340bb4c Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Mon, 29 Jul 2013 16:11:59 +0100 Subject: Allow empty square brackets for properties list --- tikzit/src/common/tikzparser.ym | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tikzit/src/common/tikzparser.ym b/tikzit/src/common/tikzparser.ym index 794b06d..5c49ed9 100644 --- a/tikzit/src/common/tikzparser.ym +++ b/tikzit/src/common/tikzparser.ym @@ -123,7 +123,9 @@ tikzcmd: node | edge | boundingbox | ignore; ignore: "\\begin{pgfonlayer}" DELIMITEDSTRING | "\\end{pgfonlayer}"; optproperties: - "[" properties "]" + "[" "]" + { $$ = nil; } + | "[" properties "]" { $$ = $2; } | { $$ = nil; }; properties: property extraproperties -- cgit v1.2.3 From ae3a3f2fd6ef417329ad2f32ddb9ed4f0d851553 Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Mon, 29 Jul 2013 16:12:32 +0100 Subject: Do not reverse the order of the properties when parsing --- tikzit/src/common/tikzparser.ym | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tikzit/src/common/tikzparser.ym b/tikzit/src/common/tikzparser.ym index 5c49ed9..98d25e4 100644 --- a/tikzit/src/common/tikzparser.ym +++ b/tikzit/src/common/tikzparser.ym @@ -128,16 +128,16 @@ optproperties: | "[" properties "]" { $$ = $2; } | { $$ = nil; }; -properties: property extraproperties +properties: extraproperties property { - [$2 addObject:$1]; - $$ = $2; + [$1 addObject:$2]; + $$ = $1; }; extraproperties: - "," property extraproperties + extraproperties property "," { - [$3 addObject:$2]; - $$ = $3; + [$1 addObject:$2]; + $$ = $1; } | { $$ = [GraphElementData data]; }; property: -- cgit v1.2.3 From 466b44d154c9b99be77d880f433f12df0f26d767 Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Fri, 2 Aug 2013 20:05:12 +0100 Subject: Improve description in .desktop and .spec files --- tikzit/share/applications/tikzit.desktop | 2 +- tikzit/tikzit.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tikzit/share/applications/tikzit.desktop b/tikzit/share/applications/tikzit.desktop index aec42bc..12b6fa5 100644 --- a/tikzit/share/applications/tikzit.desktop +++ b/tikzit/share/applications/tikzit.desktop @@ -2,7 +2,7 @@ Version=1.0 Type=Application Name=TikZit -Comment=TeX pgf/TikZ graph editor +Comment=Editor for PGF/TikZ-based node-and-edge graphs for LaTeX documents GenericName=TikZ Graph Editor MimeType=text/x-tikz Exec=tikzit diff --git a/tikzit/tikzit.spec b/tikzit/tikzit.spec index 61e4e60..237c543 100644 --- a/tikzit/tikzit.spec +++ b/tikzit/tikzit.spec @@ -1,7 +1,7 @@ Name: tikzit Version: 1.0 Release: 1%{?dist} -Summary: Tool for creating and modifying pgf/TikZ diagrams for TeX +Summary: Tool for creating and modifying PGF/TikZ-based node-and-edge graphs for LaTeX documents # try to choose a sensible group for this distro %if 0%{?suse_version} -- cgit v1.2.3 From 634340f35b4ccc2206da12bed01c4fcb6bc55731 Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Fri, 2 Aug 2013 20:38:45 +0100 Subject: Use flex and bison options instead of #defines Defining YY_EXTRA_TYPE is not the "proper" way to set that type (a %option should be used instead), and defining YYLEX_PARAM will no longer work with bison 3 (%lex-param is the correct thing to use). --- tikzit/src/common/TikzGraphAssembler+Parser.h | 3 --- tikzit/src/common/TikzGraphAssembler.m | 3 +-- tikzit/src/common/tikzlexer.lm | 1 + tikzit/src/common/tikzparser.ym | 10 +++++----- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/tikzit/src/common/TikzGraphAssembler+Parser.h b/tikzit/src/common/TikzGraphAssembler+Parser.h index 55fa901..c9391a9 100644 --- a/tikzit/src/common/TikzGraphAssembler+Parser.h +++ b/tikzit/src/common/TikzGraphAssembler+Parser.h @@ -31,9 +31,6 @@ /** Get a previously-stored node by name */ - (Node*) nodeWithName:(NSString*)name; - (void) reportError:(const char *)message atLocation:(YYLTYPE*)yylloc; -- (void*) scanner; @end -#define YY_EXTRA_TYPE TikzGraphAssembler * - // vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit/src/common/TikzGraphAssembler.m b/tikzit/src/common/TikzGraphAssembler.m index 2dd8d50..60b96ee 100644 --- a/tikzit/src/common/TikzGraphAssembler.m +++ b/tikzit/src/common/TikzGraphAssembler.m @@ -58,7 +58,7 @@ tikzStr = [t UTF8String]; yy_scan_string(tikzStr, scanner); - int result = yyparse(self); + int result = yyparse(scanner); tikzStr = NULL; [pool drain]; @@ -278,7 +278,6 @@ free (context); } } -- (void*) scanner { return scanner; } @end // vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit/src/common/tikzlexer.lm b/tikzit/src/common/tikzlexer.lm index a0e5968..fe7ab0d 100644 --- a/tikzit/src/common/tikzlexer.lm +++ b/tikzit/src/common/tikzlexer.lm @@ -34,6 +34,7 @@ %option yylineno %option noyywrap %option header-file="common/tikzlexer.h" +%option extra-type="TikzGraphAssembler *" %s props %s xcoord diff --git a/tikzit/src/common/tikzparser.ym b/tikzit/src/common/tikzparser.ym index 98d25e4..6eea833 100644 --- a/tikzit/src/common/tikzparser.ym +++ b/tikzit/src/common/tikzparser.ym @@ -38,7 +38,8 @@ struct noderef { %defines "common/tikzparser.h" %pure-parser %locations -%parse-param {TikzGraphAssembler *assembler} +%lex-param {void *scanner} +%parse-param {void *scanner} %error-verbose %union { @@ -47,8 +48,7 @@ struct noderef { GraphElementProperty *prop; GraphElementData *data; Node *node; - struct noderef noderef; -}; + struct noderef noderef; }; %{ #import "TikzGraphAssembler+Parser.h" @@ -56,8 +56,8 @@ struct noderef { #import "GraphElementProperty.h" #import "Node.h" #import "tikzlexer.h" -#define YYLEX_PARAM [assembler scanner] -void yyerror(YYLTYPE *yylloc, TikzGraphAssembler *assembler, const char *str) { +#define assembler yyget_extra(scanner) +void yyerror(YYLTYPE *yylloc, void *scanner, const char *str) { [assembler reportError:str atLocation:yylloc]; } %} -- cgit v1.2.3 From cb952e6cbace0230b46b9267c964e415cf378b23 Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Fri, 2 Aug 2013 21:24:08 +0100 Subject: Tidy up and document bison decls in tikzparser.ym --- tikzit/src/common/tikzparser.ym | 48 ++++++++++++++++++++++++++++------------- 1 file changed, 33 insertions(+), 15 deletions(-) diff --git a/tikzit/src/common/tikzparser.ym b/tikzit/src/common/tikzparser.ym index 6eea833..9901f79 100644 --- a/tikzit/src/common/tikzparser.ym +++ b/tikzit/src/common/tikzparser.ym @@ -18,11 +18,25 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#import "Edge.h" - %} +%error-verbose +/* enable maintaining locations for better error messages */ +%locations +/* the name of the header file */ +%defines "common/tikzparser.h" +/* make it re-entrant (no global variables) */ +%pure-parser +/* We use a pure (re-entrant) lexer. This means yylex + will take a void* (opaque) type to maintain its state */ +%lex-param {void *scanner} +/* Since this parser is also pure, yyparse needs to take + that lexer state as an argument */ +%parse-param {void *scanner} + +/* things required to use the parser (will go in the header); + in particular, declarations/imports for types in the %union + must go here */ %code requires { #import @class TikzGraphAssembler; @@ -35,36 +49,40 @@ struct noderef { }; } -%defines "common/tikzparser.h" -%pure-parser -%locations -%lex-param {void *scanner} -%parse-param {void *scanner} -%error-verbose - +/* possible data types for semantic values */ %union { NSPoint pt; NSString *nsstr; GraphElementProperty *prop; GraphElementData *data; Node *node; - struct noderef noderef; }; + struct noderef noderef; +} -%{ -#import "TikzGraphAssembler+Parser.h" +%code { #import "GraphElementData.h" #import "GraphElementProperty.h" #import "Node.h" +#import "Edge.h" + #import "tikzlexer.h" +#import "TikzGraphAssembler+Parser.h" +/* the assembler (used by this parser) is stored in the lexer + state as "extra" data */ #define assembler yyget_extra(scanner) + +/* pass errors off to the assembler */ void yyerror(YYLTYPE *yylloc, void *scanner, const char *str) { [assembler reportError:str atLocation:yylloc]; } -%} +} +/* yyloc is set up with first_column = last_column = 1 by default; + however, it makes more sense to think of us being "before the + start of the line" before we parse anything */ %initial-action { yylloc.first_column = yylloc.last_column = 0; -}; +} %token BEGIN_TIKZPICTURE_CMD "\\begin{tikzpicture}" -- cgit v1.2.3 From 0b419a4d47e7e67837eba4c6b9d52ef664938f9d Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Sat, 3 Aug 2013 10:37:06 +0100 Subject: Demand actual bison and flex, rather than yacc and lex We use bison/flex extensions, so we need those actual tools. --- tikzit/configure.ac | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tikzit/configure.ac b/tikzit/configure.ac index 8f791b6..99697c5 100644 --- a/tikzit/configure.ac +++ b/tikzit/configure.ac @@ -21,8 +21,19 @@ AC_PROG_OBJC([gcc clang objc objcc]) AC_LANG([Objective C]) AC_PROG_LEX -AM_PROG_LEX +AS_IF([$LEX --version 2>/dev/null | grep "^flex" >/dev/null 2>/dev/null],[], + [ + AC_MSG_WARN([flex not found; this may cause problems for developers]) + LEX="\${SHELL} \$(top_srcdir)/missing flex" + AC_SUBST([LEX_OUTPUT_ROOT], [lex.yy]) + AC_SUBST([LEXLIB], ['']) + ]) AC_PROG_YACC +AS_IF([$YACC --version 2>/dev/null | grep "^bison" >/dev/null 2>/dev/null],[], + [ + AC_MSG_WARN([bison not found; this may cause problems for developers]) + YACC="\${SHELL} \$(top_srcdir)/missing bison" + ]) # Checks for libraries. FOUNDATION_OBJCFLAGS=`eval "gnustep-config --objc-flags"` -- cgit v1.2.3 From 75b2d46afcfb5534465556bfa9d46999c7a69d84 Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Sat, 3 Aug 2013 11:52:00 +0100 Subject: Cook our own bison/flex checks instead of AC_PROG_LEX/YACC Given we specifically want bison and flex, and not other yacc/lex implementations with their various deficiencies, we don't need autoconf's detection magic. --- tikzit/configure.ac | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/tikzit/configure.ac b/tikzit/configure.ac index 99697c5..42f09ee 100644 --- a/tikzit/configure.ac +++ b/tikzit/configure.ac @@ -20,20 +20,23 @@ m4_include([m4/objc.m4]) AC_PROG_OBJC([gcc clang objc objcc]) AC_LANG([Objective C]) -AC_PROG_LEX -AS_IF([$LEX --version 2>/dev/null | grep "^flex" >/dev/null 2>/dev/null],[], +AC_CHECK_PROGS([FLEX], [flex lex], [flex]) +AS_IF([$FLEX --version 2>/dev/null | grep "^flex" >/dev/null 2>/dev/null],[], [ AC_MSG_WARN([flex not found; this may cause problems for developers]) - LEX="\${SHELL} \$(top_srcdir)/missing flex" - AC_SUBST([LEX_OUTPUT_ROOT], [lex.yy]) - AC_SUBST([LEXLIB], ['']) + # in case a lex that wasn't flex was found + FLEX=flex ]) -AC_PROG_YACC -AS_IF([$YACC --version 2>/dev/null | grep "^bison" >/dev/null 2>/dev/null],[], +AM_MISSING_PROG([LEX], [$FLEX]) + +AC_CHECK_PROGS([BISON], [bison yacc], [bison]) +AS_IF([$BISON --version 2>/dev/null | grep "^bison" >/dev/null 2>/dev/null],[], [ AC_MSG_WARN([bison not found; this may cause problems for developers]) - YACC="\${SHELL} \$(top_srcdir)/missing bison" + # in case a yacc that wasn't bison was found + BISON=bison ]) +AM_MISSING_PROG([YACC], [$BISON]) # Checks for libraries. FOUNDATION_OBJCFLAGS=`eval "gnustep-config --objc-flags"` -- cgit v1.2.3 From 7f818c136f5a37ac7ba332c2ba0e471ae0cb9bd7 Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Sat, 3 Aug 2013 19:49:31 +0100 Subject: Better dependency information Be explicit about what versions we require. --- tikzit/INSTALL | 14 +++++++++----- tikzit/configure.ac | 4 ++-- tikzit/src/common/tikzparser.ym | 3 +++ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/tikzit/INSTALL b/tikzit/INSTALL index 695982d..9576d37 100644 --- a/tikzit/INSTALL +++ b/tikzit/INSTALL @@ -3,11 +3,15 @@ For building on systems other than MacOS/X: Dependencies: GNUstep (core libraries) >= 1.18.0 gtk+-2.0 >= 2.18.0 - poppler (including glib bindings, which may be in - a separate poppler-glib package) + gdk-pixbuf >= 2.16.0 + poppler >= 0.10 + including glib bindings, which may be in + a separate poppler-glib package Objective C compiler (eg: gcc with ObjC support) with support for properties, optional protocols and fast enumeration (eg: gcc 4.6 or clang). + pkg-config + build-time dependency only To install, just run: @@ -18,10 +22,10 @@ To install, just run: To build from subversion (and for development) you will additionally need: - lex (eg: flex) - yacc (eg: bison) + flex >= 2.5.34 + bison >= 2.4 autoconf >= 2.60 - automake + automake >= 1.10 and you will need to prepare the source tree by running ./autogen.sh diff --git a/tikzit/configure.ac b/tikzit/configure.ac index 42f09ee..296daa5 100644 --- a/tikzit/configure.ac +++ b/tikzit/configure.ac @@ -6,8 +6,8 @@ AC_INIT([TikZiT], [1.0], [http://sourceforge.net/apps/trac/tikzit], [tikzit], [http://tikzit.sourceforge.net]) -AM_INIT_AUTOMAKE([foreign subdir-objects -Wall -Werror]) -AM_SILENT_RULES([yes]) +AM_INIT_AUTOMAKE([1.10 foreign subdir-objects -Wall -Werror]) +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_OUTPUT(Makefile src/Makefile share/Makefile diff --git a/tikzit/src/common/tikzparser.ym b/tikzit/src/common/tikzparser.ym index 9901f79..bf33aa9 100644 --- a/tikzit/src/common/tikzparser.ym +++ b/tikzit/src/common/tikzparser.ym @@ -20,6 +20,9 @@ */ %} +/* we use features added to bison 2.4 */ +%require "2.4" + %error-verbose /* enable maintaining locations for better error messages */ %locations -- cgit v1.2.3 From 999787db751b1cf7911457e86b9c537dc2bccf33 Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Sun, 4 Aug 2013 14:42:00 +0100 Subject: GTK: SelectTool: return to QuietState on mouse release --- tikzit/src/gtk/SelectTool.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tikzit/src/gtk/SelectTool.m b/tikzit/src/gtk/SelectTool.m index c821162..deae55a 100644 --- a/tikzit/src/gtk/SelectTool.m +++ b/tikzit/src/gtk/SelectTool.m @@ -335,6 +335,8 @@ static void drag_select_mode_cb (GtkToggleButton *button, SelectTool *tool); // FIXME: check if there was any real change [[self doc] endModifyEdge]; } + + state = QuietState; } - (void) mouseDoubleClickAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { -- cgit v1.2.3 From 5ccc1c9d048f9ea026f914837636311bd49dc769 Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Sun, 4 Aug 2013 15:00:58 +0100 Subject: GTK: holding down ctrl pans, regardless of tool If the user presses the LMB whilst holding ctrl, we bypass the tool and enter panning mode, where dragging the mouse moves around the graph, until the LMB is released. --- tikzit/src/gtk/GraphEditorPanel.m | 66 +++++++++++++++++++++++++++------------ 1 file changed, 46 insertions(+), 20 deletions(-) diff --git a/tikzit/src/gtk/GraphEditorPanel.m b/tikzit/src/gtk/GraphEditorPanel.m index c87e53e..c1fdffd 100644 --- a/tikzit/src/gtk/GraphEditorPanel.m +++ b/tikzit/src/gtk/GraphEditorPanel.m @@ -29,11 +29,17 @@ @class GraphRenderer; @class WidgetSurface; +static const InputMask zoomPanMask = ControlMask; + /** - * Mostly just a multiplexer + * Mostly just a multiplexer, but also handles zoom and pan + * when ctrl is held */ @interface GraphInputHandler : NSObject { GraphEditorPanel *panel; + NSPoint dragOrigin; + NSPoint oldGraphOrigin; + BOOL zoomPanActive; } - (id) initForPanel:(GraphEditorPanel*)p; @end @@ -68,6 +74,9 @@ [super dealloc]; } +- (GraphRenderer*) renderer { + return renderer; +} - (TikzDocument*) document { return [renderer document]; } @@ -135,12 +144,19 @@ [super dealloc]; } -// FIXME: use a local copy of HandTool to implement CTRL-dragging +// FIXME: share code with HandTool? - (void) mousePressAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { - [panel grabTool]; - id tool = [panel activeTool]; - if ([tool respondsToSelector:@selector(mousePressAt:withButton:andMask:)]) { - [tool mousePressAt:pos withButton:button andMask:mask]; + if (mask == zoomPanMask && button == LeftButton) { + dragOrigin = pos; + oldGraphOrigin = [[[panel renderer] transformer] origin]; + zoomPanActive = YES; + } else { + zoomPanActive = NO; + [panel grabTool]; + id tool = [panel activeTool]; + if ([tool respondsToSelector:@selector(mousePressAt:withButton:andMask:)]) { + [tool mousePressAt:pos withButton:button andMask:mask]; + } } } @@ -153,33 +169,43 @@ } - (void) mouseReleaseAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { - if (![panel hasTool]) - return; - id tool = [panel activeTool]; - if ([tool respondsToSelector:@selector(mouseReleaseAt:withButton:andMask:)]) { - [tool mouseReleaseAt:pos withButton:button andMask:mask]; + if (zoomPanActive && button == LeftButton) { + zoomPanActive = NO; + } else if ([panel hasTool]) { + id tool = [panel activeTool]; + if ([tool respondsToSelector:@selector(mouseReleaseAt:withButton:andMask:)]) { + [tool mouseReleaseAt:pos withButton:button andMask:mask]; + } } } - (void) mouseMoveTo:(NSPoint)pos withButtons:(MouseButton)buttons andMask:(InputMask)mask { - if (![panel hasTool]) - return; - id tool = [panel activeTool]; - if ([tool respondsToSelector:@selector(mouseMoveTo:withButtons:andMask:)]) { - [tool mouseMoveTo:pos withButtons:buttons andMask:mask]; + if (zoomPanActive && (buttons & LeftButton)) { + NSPoint newGraphOrigin = oldGraphOrigin; + newGraphOrigin.x += pos.x - dragOrigin.x; + newGraphOrigin.y += pos.y - dragOrigin.y; + [[[panel renderer] transformer] setOrigin:newGraphOrigin]; + [[panel renderer] invalidateGraph]; + } else if ([panel hasTool]) { + id tool = [panel activeTool]; + if ([tool respondsToSelector:@selector(mouseMoveTo:withButtons:andMask:)]) { + [tool mouseMoveTo:pos withButtons:buttons andMask:mask]; + } } } - (void) mouseScrolledAt:(NSPoint)pos inDirection:(ScrollDirection)dir withMask:(InputMask)mask { - id tool = [panel activeTool]; - if (mask == ControlMask) { + if (mask == zoomPanMask) { if (dir == ScrollUp) { [panel zoomInAboutPoint:pos]; } else if (dir == ScrollDown) { [panel zoomOutAboutPoint:pos]; } - } else if ([panel hasTool] && [tool respondsToSelector:@selector(mouseScrolledAt:inDirection:withMask:)]) { - [tool mouseScrolledAt:pos inDirection:dir withMask:mask]; + } else { + id tool = [panel activeTool]; + if ([panel hasTool] && [tool respondsToSelector:@selector(mouseScrolledAt:inDirection:withMask:)]) { + [tool mouseScrolledAt:pos inDirection:dir withMask:mask]; + } } } -- cgit v1.2.3 From 4d76b39ddc5148f7212a87944509ad95828a9764 Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Tue, 6 Aug 2013 21:02:33 +0100 Subject: Copy anchors when copying an Edge Previously, copying-and-pasting a graph would lose source and target anchor information. --- tikzit/src/common/Edge.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tikzit/src/common/Edge.m b/tikzit/src/common/Edge.m index 945503f..7b538b5 100644 --- a/tikzit/src/common/Edge.m +++ b/tikzit/src/common/Edge.m @@ -656,6 +656,8 @@ Edge *cp = [[Edge allocWithZone:zone] init]; [cp setSource:[self source]]; [cp setTarget:[self target]]; + [cp setSourceAnchor:[self sourceAnchor]]; + [cp setTargetAnchor:[self targetAnchor]]; [cp setPropertiesFromEdge:self]; return cp; } -- cgit v1.2.3 From e306c53d9e31c7ee09a131c765cbcec67fdd2565 Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Wed, 7 Aug 2013 00:42:26 +0100 Subject: GTK: make presentError: methods cope with null errors We can't always guarantee that library code will produce an error object when things fail; default to "unknown error" if the error object is null or does not have a message. --- tikzit/src/gtk/Window.m | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/tikzit/src/gtk/Window.m b/tikzit/src/gtk/Window.m index 7cb1e65..2d9e63a 100644 --- a/tikzit/src/gtk/Window.m +++ b/tikzit/src/gtk/Window.m @@ -394,47 +394,63 @@ static void update_paste_action (GtkClipboard *clipboard, GdkEvent *event, GtkAc } - (void) presentError:(NSError*)error { + const gchar *errorDesc = "unknown error"; + if (error && [error localizedDescription]) { + errorDesc = [[error localizedDescription] UTF8String]; + } GtkWidget *dialog = gtk_message_dialog_new (window, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", - [[error localizedDescription] UTF8String]); + errorDesc); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); } - (void) presentError:(NSError*)error withMessage:(NSString*)message { + const gchar *errorDesc = "unknown error"; + if (error && [error localizedDescription]) { + errorDesc = [[error localizedDescription] UTF8String]; + } GtkWidget *dialog = gtk_message_dialog_new (window, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s: %s", [message UTF8String], - [[error localizedDescription] UTF8String]); + errorDesc); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); } - (void) presentGError:(GError*)error { + const gchar *errorDesc = "unknown error"; + if (error && error->message) { + errorDesc = error->message; + } GtkWidget *dialog = gtk_message_dialog_new (window, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", - error->message); + errorDesc); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); } - (void) presentGError:(GError*)error withMessage:(NSString*)message { + const gchar *errorDesc = "unknown error"; + if (error && error->message) { + errorDesc = error->message; + } GtkWidget *dialog = gtk_message_dialog_new (window, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s: %s", [message UTF8String], - error->message); + errorDesc); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); } -- cgit v1.2.3 From 5a94458d9ee3ee8afd978477c755200df432a9b0 Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Wed, 7 Aug 2013 00:43:49 +0100 Subject: Add variant of stringWithContentsOfFile that produces an error It turns out that the [NSString stringWithContentsOfFile:] family of methods do not have a way of reporting why a file could not be read; [NSString stringWithContentsOfFile:usedEncoding:error:] will only set the error object if there was a problem with decoding. So, we cook our own variant that tries to figure out why opening the file failed. User-visible effect: in the GTK+ port, if you try to open a file from the "open recent" menu that no longer exists, you will get a more helpful error message. --- tikzit/src/Makefile.am | 1 + tikzit/src/common/NSString+Util.h | 27 ++++++++++++++++ tikzit/src/common/NSString+Util.m | 66 +++++++++++++++++++++++++++++++++++++++ tikzit/src/gtk/TZFoundation.h | 1 + tikzit/src/gtk/TikzDocument.m | 4 +-- 5 files changed, 96 insertions(+), 3 deletions(-) create mode 100644 tikzit/src/common/NSString+Util.h create mode 100644 tikzit/src/common/NSString+Util.m diff --git a/tikzit/src/Makefile.am b/tikzit/src/Makefile.am index e869686..c679afa 100644 --- a/tikzit/src/Makefile.am +++ b/tikzit/src/Makefile.am @@ -90,6 +90,7 @@ tikzit_SOURCES = gtk/Application.m \ common/NSFileManager+Utils.m \ common/NSString+LatexConstants.m \ common/NSString+Tikz.m \ + common/NSString+Util.m \ common/PickSupport.m \ common/PropertyHolder.m \ common/GraphElementProperty.m \ diff --git a/tikzit/src/common/NSString+Util.h b/tikzit/src/common/NSString+Util.h new file mode 100644 index 0000000..548edb3 --- /dev/null +++ b/tikzit/src/common/NSString+Util.h @@ -0,0 +1,27 @@ +/* + * Copyright 2013 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import + +@interface NSString (Util) + + (NSString*) stringWithContentsOfFile:(NSString*)path + error:(NSError**)error; + - (id) initWithContentsOfFile:(NSString*)path + error:(NSError**)error; +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit/src/common/NSString+Util.m b/tikzit/src/common/NSString+Util.m new file mode 100644 index 0000000..b18f397 --- /dev/null +++ b/tikzit/src/common/NSString+Util.m @@ -0,0 +1,66 @@ +/* + * Copyright 2013 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import +#import "NSString+Util.h" +#import "NSError+Tikzit.h" + +@implementation NSString (Util) ++ (NSString*) stringWithContentsOfFile:(NSString*)path + error:(NSError**)error +{ + return [[[self alloc] initWithContentsOfFile:path error:error] autorelease]; +} +- (id) initWithContentsOfFile:(NSString*)path + error:(NSError**)error +{ + // Fun fact: on GNUstep, at least, + // [stringWithContentsOfFile:usedEncoding:error:] only + // sets error objects if the decoding fails, not if file + // access fails. + // Fun fact 2: on GNUstep, trying to read a directory using + // [stringWithContentsOfFile:] causes an out-of-memory error; + // hence we do these checks *before* trying to read the file. + NSFileManager *fm = [NSFileManager defaultManager]; + BOOL isDir = NO; + NSString *msg = nil; + if (![fm fileExistsAtPath:path isDirectory:&isDir]) { + msg = [NSString stringWithFormat:@"\"%@\" does not exist", path]; + } else if (isDir) { + msg = [NSString stringWithFormat:@"\"%@\" is a directory", path]; + } else if (![fm isReadableFileAtPath:path]) { + msg = [NSString stringWithFormat:@"\"%@\" is not readable", path]; + } + if (msg != nil) { + if (error) { + *error = [NSError errorWithMessage:msg + code:TZ_ERR_IO]; + } + return nil; + } + self = [self initWithContentsOfFile:path]; + if (self == nil) { + if (error) { + *error = [NSError errorWithMessage:@"unknown error" + code:TZ_ERR_IO]; + } + } + return self; +} +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit/src/gtk/TZFoundation.h b/tikzit/src/gtk/TZFoundation.h index f275004..2ff20ca 100644 --- a/tikzit/src/gtk/TZFoundation.h +++ b/tikzit/src/gtk/TZFoundation.h @@ -25,5 +25,6 @@ #import "NSString+Glib.h" #import "NSString+LatexConstants.h" #import "NSString+Tikz.h" +#import "NSString+Util.h" // vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/TikzDocument.m b/tikzit/src/gtk/TikzDocument.m index 6e013b1..bff5a2e 100644 --- a/tikzit/src/gtk/TikzDocument.m +++ b/tikzit/src/gtk/TikzDocument.m @@ -139,9 +139,7 @@ styleManager:(StyleManager*)manager error:(NSError**)error { - NSStringEncoding enc; // we can't pass in NULL here... - NSString *t = [NSString stringWithContentsOfFile:pth - usedEncoding:&enc error:error]; + NSString *t = [NSString stringWithContentsOfFile:pth error:error]; if (t == nil) { [self release]; return nil; -- cgit v1.2.3 From ac7b53be102860d76f318ab0575cfb546635d04e Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Wed, 7 Aug 2013 16:56:23 +0100 Subject: Allow preambles to omit the tikzit-specific preview stuff The editable preambles include a bunch of things that *have* to be there for previews to work, which makes figuring out what you can edit hard. We now add a \documentclass automagically if it is missing, and if \begin{document} is missing, we assume the preview-specific stuff should be added. OSX changes are untested. --- tikzit/src/common/Preambles.h | 5 +++++ tikzit/src/common/Preambles.m | 45 ++++++++++++++++++++++++++++--------- tikzit/src/gtk/PreviewRenderer.m | 5 +---- tikzit/src/osx/PreambleController.h | 1 + tikzit/src/osx/PreambleController.m | 5 +++++ tikzit/src/osx/PreviewController.m | 5 +---- 6 files changed, 48 insertions(+), 18 deletions(-) diff --git a/tikzit/src/common/Preambles.h b/tikzit/src/common/Preambles.h index 95081c4..2fb084a 100644 --- a/tikzit/src/common/Preambles.h +++ b/tikzit/src/common/Preambles.h @@ -25,6 +25,8 @@ #import #import "StyleManager.h" +@class Graph; + @interface Preambles : NSObject { NSMutableDictionary *preambleDict; NSString *selectedPreambleName; @@ -63,6 +65,9 @@ - (NSString*)defaultPreambleName; - (NSString*)currentPostamble; +- (NSString*)buildDocumentForTikz:(NSString*)tikz; +- (NSString*)buildDocumentForGraph:(Graph*)g; + @end // vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit/src/common/Preambles.m b/tikzit/src/common/Preambles.m index d6d18e9..651bbcd 100644 --- a/tikzit/src/common/Preambles.m +++ b/tikzit/src/common/Preambles.m @@ -24,14 +24,13 @@ #import "Preambles.h" #import "NodeStyle.h" #import "EdgeStyle.h" +#import "Graph.h" -static NSString *PREAMBLE_HEAD = -@"\\documentclass{article}\n" +static NSString *DEF_PREAMBLE_START = @"\\usepackage[svgnames]{xcolor}\n" @"\\usepackage{tikz}\n" @"\\usetikzlibrary{decorations.markings}\n" @"\\usetikzlibrary{shapes.geometric}\n" -@"\\pagestyle{empty}\n" @"\n" @"\\pgfdeclarelayer{edgelayer}\n" @"\\pgfdeclarelayer{nodelayer}\n" @@ -41,6 +40,7 @@ static NSString *PREAMBLE_HEAD = static NSString *PREAMBLE_TAIL = @"\n" +@"\\pagestyle{empty}\n" @"\\usepackage[graphics,tightpage,active]{preview}\n" @"\\PreviewEnvironment{tikzpicture}\n" @"\\newlength{\\imagewidth}\n" @@ -71,6 +71,13 @@ static NSString *POSTAMBLE = return self; } +- (void)dealloc { + [selectedPreambleName release]; + [styles release]; + [styleManager release]; + [super dealloc]; +} + - (NSString*)preambleForName:(NSString*)name { if ([name isEqualToString:@"default"]) return [self defaultPreamble]; @@ -152,8 +159,8 @@ static NSString *POSTAMBLE = } - (NSString*)defaultPreamble { - return [NSString stringWithFormat:@"%@%@%@", - PREAMBLE_HEAD, [self styleDefinitions], PREAMBLE_TAIL]; + return [NSString stringWithFormat:@"%@%@", + DEF_PREAMBLE_START, [self styleDefinitions]]; } - (BOOL)selectedPreambleIsDefault { @@ -255,11 +262,29 @@ static NSString *POSTAMBLE = return YES; } -- (void)dealloc { - [selectedPreambleName release]; - [styles release]; - [styleManager release]; - [super dealloc]; +- (NSString*)buildDocumentForTikz:(NSString*)tikz +{ + NSString *preamble = [self currentPreamble]; + NSString *doc_head = @""; + if (![preamble hasPrefix:@"\\documentclass"]) { + doc_head = @"\\documentclass{article}\n"; + } + NSString *preamble_suffix = @""; + if ([preamble rangeOfString:@"\\begin{document}" + options:NSBackwardsSearch].length == 0) { + preamble_suffix = PREAMBLE_TAIL; + } + return [NSString stringWithFormat:@"%@%@%@%@%@", + doc_head, + [self currentPreamble], + preamble_suffix, + tikz, + POSTAMBLE]; +} + +- (NSString*)buildDocumentForGraph:(Graph*)g +{ + return [self buildDocumentForTikz:[g tikz]]; } @end diff --git a/tikzit/src/gtk/PreviewRenderer.m b/tikzit/src/gtk/PreviewRenderer.m index 26293b5..28113d6 100644 --- a/tikzit/src/gtk/PreviewRenderer.m +++ b/tikzit/src/gtk/PreviewRenderer.m @@ -90,10 +90,7 @@ return NO; } - NSString *tex = [NSString stringWithFormat:@"%@%@%@", - [preambles currentPreamble], - [document tikz], - [preambles currentPostamble]]; + NSString *tex = [preambles buildDocumentForTikz:[document tikz]]; NSString *tempDir = [[NSFileManager defaultManager] createTempDirectoryWithError:error]; if (!tempDir) { diff --git a/tikzit/src/osx/PreambleController.h b/tikzit/src/osx/PreambleController.h index 2d5a8ab..fca52ae 100644 --- a/tikzit/src/osx/PreambleController.h +++ b/tikzit/src/osx/PreambleController.h @@ -48,6 +48,7 @@ - (void)savePreambles:(NSString*)plist; - (NSString*)currentPreamble; - (NSString*)currentPostamble; +- (NSString*)buildDocumentForTikz:(NSString*)tikz; - (IBAction)setPreamble:(id)sender; - (IBAction)insertDefaultStyles:(id)sender; diff --git a/tikzit/src/osx/PreambleController.m b/tikzit/src/osx/PreambleController.m index e424e7b..af9a778 100644 --- a/tikzit/src/osx/PreambleController.m +++ b/tikzit/src/osx/PreambleController.m @@ -108,6 +108,11 @@ return [preambles currentPostamble]; } +- (NSString*)buildDocumentForTikz:(NSString*)tikz { + [self flushText]; + return [preambles buildDocumentForTikz:tikz]; +} + - (void)setSelectionIndexes:(NSIndexSet *)idx { [self willChangeValueForKey:@"selectionIndexes"]; selectionIndexes = idx; diff --git a/tikzit/src/osx/PreviewController.m b/tikzit/src/osx/PreviewController.m index 7c41562..94a80a4 100644 --- a/tikzit/src/osx/PreviewController.m +++ b/tikzit/src/osx/PreviewController.m @@ -52,10 +52,7 @@ static PreviewController *preview = nil; int fnum = typesetCount++; - NSString *tex = [NSString stringWithFormat:@"%@%@%@", - [preambleController currentPreamble], - tikz, - [preambleController currentPostamble]]; + NSString *tex = [preambleController buildDocumentForTikz:tikz]; NSString *texFile = [NSString stringWithFormat:@"%@/tikzit_%d.tex", tempDir, fnum]; NSString *pdfFile = [NSString stringWithFormat:@"%@/tikzit_%d.pdf", tempDir, fnum]; -- cgit v1.2.3 From 8684196a31707a9fb5e7091ce26ae26f2aa16082 Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Wed, 7 Aug 2013 17:04:23 +0100 Subject: Update NEWS --- tikzit/NEWS | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tikzit/NEWS b/tikzit/NEWS index 0efc18f..6840c1f 100644 --- a/tikzit/NEWS +++ b/tikzit/NEWS @@ -1,3 +1,10 @@ +tikzit 1.1 (?) : + * Fix bug where copy-and-paste would lose edge anchors + * Allow tikzit-specific preview code to be omitted from preambles + * Holding down CTRL allows you to drag the graph + * Fix parsing bug where property lists would be reversed + * Better error messages when files can't be opened + tikzit 1.0 (2013-05-07): * GIMP-like user interface (multiple documents, separate toolboxes) * Preferences now called Configuration, and includes node and edge styles -- cgit v1.2.3 From 093e7a12524a3ddedd833df6c284025f1d0a4a8c Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Thu, 22 Aug 2013 17:19:40 +0100 Subject: Unset default "center" anchor when applying a style Edges almost always want to be anchored to the "center" of an unstyled (style=none) node, as otherwise edges won't join up. However, this anchor should be discarded if a style is then set on the node, otherwise arrowheads tend to disappear. --- tikzit/src/common/Edge.m | 35 +++++++++++++++++++++++++++++++++++ tikzit/src/common/Graph.m | 8 ++------ 2 files changed, 37 insertions(+), 6 deletions(-) diff --git a/tikzit/src/common/Edge.m b/tikzit/src/common/Edge.m index 7b538b5..ea20d2a 100644 --- a/tikzit/src/common/Edge.m +++ b/tikzit/src/common/Edge.m @@ -325,6 +325,12 @@ [source removeObserver:self forKeyPath:@"style"]; + if ([s style] == nil) { + [self setSourceAnchor:@"center"]; + } else if ([sourceAnchor isEqual:@"center"]) { + [self setSourceAnchor:@""]; + } + [source release]; source = [s retain]; @@ -336,6 +342,7 @@ [source addObserver:self forKeyPath:@"style" options:NSKeyValueObservingOptionNew + | NSKeyValueObservingOptionOld context:NULL]; dirty = YES; @@ -348,6 +355,12 @@ [target removeObserver:self forKeyPath:@"style"]; + if ([t style] == nil) { + [self setTargetAnchor:@"center"]; + } else if ([targetAnchor isEqual:@"center"]) { + [self setTargetAnchor:@""]; + } + [target release]; target = [t retain]; @@ -359,6 +372,7 @@ [target addObserver:self forKeyPath:@"style" options:NSKeyValueObservingOptionNew + | NSKeyValueObservingOptionOld context:NULL]; dirty = YES; @@ -371,6 +385,27 @@ context:(void *)context { + if ([keyPath isEqual:@"style"]) { + id oldStyle = [change objectForKey:NSKeyValueChangeOldKey]; + id newStyle = [change objectForKey:NSKeyValueChangeNewKey]; + id none = [NSNull null]; + if (object == source) { + if (oldStyle != none && newStyle == none) { + [self setSourceAnchor:@"center"]; + } else if (oldStyle == none && newStyle != none && + [sourceAnchor isEqual:@"center"]) { + [self setSourceAnchor:@""]; + } + } + if (object == target) { + if (oldStyle != none && newStyle == none) { + [self setTargetAnchor:@"center"]; + } else if (oldStyle == none && newStyle != none && + [targetAnchor isEqual:@"center"]) { + [self setTargetAnchor:@""]; + } + } + } dirty = YES; } diff --git a/tikzit/src/common/Graph.m b/tikzit/src/common/Graph.m index 2a01bae..33a81f6 100644 --- a/tikzit/src/common/Graph.m +++ b/tikzit/src/common/Graph.m @@ -736,17 +736,13 @@ NSString *srcAnchor; NSString *tgtAnchor; - if ([[e source] style] == nil) { - srcAnchor = @".center"; - } else if ([[e sourceAnchor] isEqual:@""]) { + if ([[e sourceAnchor] isEqual:@""]) { srcAnchor = @""; } else { srcAnchor = [NSString stringWithFormat:@".%@", [e sourceAnchor]]; } - if ([[e target] style] == nil) { - tgtAnchor = @".center"; - } else if ([[e targetAnchor] isEqual:@""]) { + if ([[e targetAnchor] isEqual:@""]) { tgtAnchor = @""; } else { tgtAnchor = [NSString stringWithFormat:@".%@", [e targetAnchor]]; -- cgit v1.2.3 From f7292486b34034ffaa407f68bd267ec3ad01e693 Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Sun, 25 Aug 2013 20:32:58 +0100 Subject: Better debugging: set description for node and edge styles --- tikzit/src/common/EdgeStyle.m | 4 ++++ tikzit/src/common/NodeStyle.m | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/tikzit/src/common/EdgeStyle.m b/tikzit/src/common/EdgeStyle.m index 15fbff8..39810fa 100644 --- a/tikzit/src/common/EdgeStyle.m +++ b/tikzit/src/common/EdgeStyle.m @@ -83,6 +83,10 @@ [super dealloc]; } +- (NSString*) description { + return [NSString stringWithFormat:@"Edge style \"%@\"", name]; +} + - (void) updateFromStyle:(EdgeStyle*)style { [self setName:[style name]]; [self setCategory:[style category]]; diff --git a/tikzit/src/common/NodeStyle.m b/tikzit/src/common/NodeStyle.m index f81d7eb..26ab793 100644 --- a/tikzit/src/common/NodeStyle.m +++ b/tikzit/src/common/NodeStyle.m @@ -95,6 +95,10 @@ [super dealloc]; } +- (NSString*) description { + return [NSString stringWithFormat:@"Node style \"%@\"", name]; +} + - (void) updateFromStyle:(NodeStyle*)style { [self setStrokeThickness:[style strokeThickness]]; [self setScale:[style scale]]; -- cgit v1.2.3 From 778d71f996a91273da7fa4625d0c66ceacb4cd63 Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Sun, 25 Aug 2013 20:34:04 +0100 Subject: Memory management: release old shape dict when refreshed --- tikzit/src/common/Shape.m | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tikzit/src/common/Shape.m b/tikzit/src/common/Shape.m index e86b122..eb466e2 100644 --- a/tikzit/src/common/Shape.m +++ b/tikzit/src/common/Shape.m @@ -129,11 +129,14 @@ NSDictionary *shapeDictionary = nil; [Shape addShapesInDir:systemShapeDir to:shapeDict]; [Shape addShapesInDir:userShapeDir to:shapeDict]; + NSDictionary *oldShapeDictionary = shapeDictionary; shapeDictionary = shapeDict; [[NSNotificationCenter defaultCenter] postNotificationName:@"ShapeDictionaryReplaced" object:self]; + + [oldShapeDictionary release]; } + (NSDictionary*)shapeDictionary { @@ -142,7 +145,7 @@ NSDictionary *shapeDictionary = nil; } + (Shape*)shapeForName:(NSString*)shapeName { - Shape *s = [[[Shape shapeDictionary] objectForKey:shapeName] copy]; + Shape *s = [[[self shapeDictionary] objectForKey:shapeName] copy]; return [s autorelease]; } -- cgit v1.2.3 From e707060efcf1cb751b7f1a0e26051bc6b93b123f Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Sun, 25 Aug 2013 20:34:38 +0100 Subject: Recalculate edge properties when shapes are refreshed Shape sizes can change (if you're actively editing a shape), which can mean that some edge properties need to be recalculated. We do this at the graph, rather than edge, level to avoid the overhead of installing a notification for every single edge. --- tikzit/src/common/Edge.h | 5 +++++ tikzit/src/common/Edge.m | 4 ++++ tikzit/src/common/Graph.m | 20 ++++++++++++++++++++ 3 files changed, 29 insertions(+) diff --git a/tikzit/src/common/Edge.h b/tikzit/src/common/Edge.h index 64da138..accf38c 100644 --- a/tikzit/src/common/Edge.h +++ b/tikzit/src/common/Edge.h @@ -273,6 +273,11 @@ typedef enum { */ - (id)initWithSource:(Node*)s andTarget:(Node*)t; +/*! + @brief Force the recalculation of the derived properties. + */ +- (void)recalculateProperties; + /*! @brief Recompute the control points and midpoint. */ diff --git a/tikzit/src/common/Edge.m b/tikzit/src/common/Edge.m index ea20d2a..ba80aef 100644 --- a/tikzit/src/common/Edge.m +++ b/tikzit/src/common/Edge.m @@ -127,6 +127,10 @@ return NSMakePoint (pt.x + dx, pt.y + dy); } +- (void)recalculateProperties { + dirty = YES; +} + - (void)updateControls { // check for external modification to the node locations if (src.x != [source point].x || src.y != [source point].y || diff --git a/tikzit/src/common/Graph.m b/tikzit/src/common/Graph.m index 33a81f6..258ece4 100644 --- a/tikzit/src/common/Graph.m +++ b/tikzit/src/common/Graph.m @@ -23,6 +23,11 @@ #import "Graph.h" #import "TikzGraphAssembler.h" +#import "Shape.h" + +@interface Graph (Private) +- (void) shapeDictionaryReplaced:(NSNotification*)notification; +@end @implementation Graph @@ -36,6 +41,11 @@ edges = [[NSMutableArray alloc] initWithCapacity:10]; inEdges = nil; outEdges = nil; + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(shapeDictionaryReplaced:) + name:@"ShapeDictionaryReplaced" + object:[Shape class]]; } return self; } @@ -56,6 +66,8 @@ } - (void)dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + [graphLock lock]; [inEdges release]; [outEdges release]; @@ -837,4 +849,12 @@ @end +@implementation Graph (Private) +- (void) shapeDictionaryReplaced:(NSNotification*)notification { + for (Edge *e in edges) { + [e recalculateProperties]; + } +} +@end + // vi:ft=objc:ts=4:noet:sts=4:sw=4 -- cgit v1.2.3 From ea86afc07d645c1ba79800fed7c005d444d60f80 Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Sun, 25 Aug 2013 20:35:55 +0100 Subject: Redraw graphs when shapes are refreshed --- tikzit/src/gtk/GraphRenderer.m | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tikzit/src/gtk/GraphRenderer.m b/tikzit/src/gtk/GraphRenderer.m index 278f245..b413d3e 100644 --- a/tikzit/src/gtk/GraphRenderer.m +++ b/tikzit/src/gtk/GraphRenderer.m @@ -19,6 +19,7 @@ #import "GraphRenderer.h" #import "Edge+Render.h" #import "Node+Render.h" +#import "Shape.h" void graph_renderer_expose_event(GtkWidget *widget, GdkEventExpose *event); @@ -31,6 +32,7 @@ void graph_renderer_expose_event(GtkWidget *widget, GdkEventExpose *event); - (void) graphChanged:(NSNotification*)notification; - (void) nodeStylePropertyChanged:(NSNotification*)notification; - (void) edgeStylePropertyChanged:(NSNotification*)notification; +- (void) shapeDictionaryReplaced:(NSNotification*)notification; @end @implementation GraphRenderer @@ -288,6 +290,11 @@ void graph_renderer_expose_event(GtkWidget *widget, GdkEventExpose *event); addObserver:self selector:@selector(graphNeedsRefreshing:) name:@"EdgeSelectionReplaced" object:[doc pickSupport]]; + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(shapeDictionaryReplaced:) + name:@"ShapeDictionaryReplaced" + object:[Shape class]]; } [surface invalidate]; } @@ -460,6 +467,10 @@ void graph_renderer_expose_event(GtkWidget *widget, GdkEventExpose *event); } } +- (void) shapeDictionaryReplaced:(NSNotification*)notification { + [surface invalidate]; +} + @end // vim:ft=objc:ts=8:et:sts=4:sw=4 -- cgit v1.2.3 From ad6c6441f4482e12722ae17283dd7a470e3fdcde Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Tue, 27 Aug 2013 15:25:26 +0100 Subject: Make sure we never output numbers in scientific notation Converting NSNumber to a string raises the possibility of outputing a number like 2.2e-8, as it essentially uses the %g format specifier. This then cannot be parsed. Since there is no built-in specifier for outputing floats with variable precision (ie: removing any trailing zeros), I cooked up a function to do just that. Currently set the maximum precision at 4dp (our normal grid layout only makes use of 2dp). --- tikzit/src/common/Graph.m | 4 ++-- tikzit/src/common/util.h | 9 ++++++++- tikzit/src/common/util.m | 23 +++++++++++++++++++++++ 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/tikzit/src/common/Graph.m b/tikzit/src/common/Graph.m index 258ece4..2d07ccc 100644 --- a/tikzit/src/common/Graph.m +++ b/tikzit/src/common/Graph.m @@ -720,8 +720,8 @@ [code appendFormat:@"\t\t\\node %@ (%d) at (%@, %@) {%@};\n", [[n data] tikzList], i, - [NSNumber numberWithFloat:[n point].x], - [NSNumber numberWithFloat:[n point].y], + formatFloat([n point].x, 4), + formatFloat([n point].y, 4), [n label] ]; i++; diff --git a/tikzit/src/common/util.h b/tikzit/src/common/util.h index f527820..b34f25d 100644 --- a/tikzit/src/common/util.h +++ b/tikzit/src/common/util.h @@ -191,4 +191,11 @@ NSString *alphaHex(unsigned short sh); const char *find_start_of_nth_line (const char * string, int line); -// vi:ft=objc:noet:ts=4:sts=4:sw=4 +/*! + @brief Formats a CGFloat as a string, removing trailing zeros + @detail Unlike formatting an NSNumber, or using %g, it will never + produce scientific notation (like "2.00e2"). Unlike %f, + it will not include unnecessary trailing zeros. + */ +NSString *formatFloat(CGFloat f, int maxdps); + diff --git a/tikzit/src/common/util.m b/tikzit/src/common/util.m index aa21a67..e9b8899 100644 --- a/tikzit/src/common/util.m +++ b/tikzit/src/common/util.m @@ -376,5 +376,28 @@ const char *find_start_of_nth_line (const char * string, int line) { return lineStart; } +NSString *formatFloat(CGFloat f, int maxdps) { + NSMutableString *result = [NSMutableString + stringWithFormat:@"%.*f", maxdps, f]; + // delete trailing zeros + NSUInteger lastPos = [result length] - 1; + NSUInteger firstDigit = ([result characterAtIndex:0] == '-') ? 1 : 0; + while (lastPos > firstDigit) { + if ([result characterAtIndex:lastPos] == '0') { + [result deleteCharactersInRange:NSMakeRange(lastPos, 1)]; + lastPos -= 1; + } else { + break; + } + } + if ([result characterAtIndex:lastPos] == '.') { + [result deleteCharactersInRange:NSMakeRange(lastPos, 1)]; + lastPos -= 1; + } + if ([@"-0" isEqualToString:result]) + return @"0"; + else + return result; +} // vi:ft=objc:noet:ts=4:sts=4:sw=4 -- cgit v1.2.3 From 0f8c707a69c3bb6d11798866975aac4976e4c22b Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Tue, 27 Aug 2013 15:38:59 +0100 Subject: Properly clear selection box It turns out the selection box, rather than being properly set to the zero rectangle, was being set to the value of an uninitialised NSRect created on the stack. This never caused any issues for me before, because my system compiles things with _FORTIFY_SOURCE by default, which zeros new variables. It was only when I (indirectly) disabled this for debugging in gdb that I started getting selection boxes appearing in odd places. --- tikzit/src/gtk/SelectTool.m | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tikzit/src/gtk/SelectTool.m b/tikzit/src/gtk/SelectTool.m index deae55a..2aa2104 100644 --- a/tikzit/src/gtk/SelectTool.m +++ b/tikzit/src/gtk/SelectTool.m @@ -560,8 +560,7 @@ static void drag_select_mode_cb (GtkToggleButton *button, SelectTool *tool); - (void) clearSelectionBox { NSRect oldRect = selectionBox; - NSRect emptyRect; - selectionBox = emptyRect; + selectionBox = NSZeroRect; [renderer invalidateRect:NSInsetRect (oldRect, -2, -2)]; [renderer clearHighlightedNodes]; -- cgit v1.2.3 From 718147147b832f5b5beebda9007b221d622d6bc4 Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Wed, 28 Aug 2013 12:33:02 +0100 Subject: Make tikzparser.ym compatible with bison 2.3 --- tikzit/INSTALL | 2 +- tikzit/src/Makefile.am | 6 ++--- tikzit/src/common/TikzGraphAssembler.m | 1 + tikzit/src/common/tikzlexer.lm | 1 + tikzit/src/common/tikzparser.ym | 25 +++++-------------- tikzit/src/common/tikzparserdefs.h | 44 ++++++++++++++++++++++++++++++++++ 6 files changed, 56 insertions(+), 23 deletions(-) create mode 100644 tikzit/src/common/tikzparserdefs.h diff --git a/tikzit/INSTALL b/tikzit/INSTALL index 9576d37..b938f14 100644 --- a/tikzit/INSTALL +++ b/tikzit/INSTALL @@ -23,7 +23,7 @@ To install, just run: To build from subversion (and for development) you will additionally need: flex >= 2.5.34 - bison >= 2.4 + bison >= 2.3 autoconf >= 2.60 automake >= 1.10 diff --git a/tikzit/src/Makefile.am b/tikzit/src/Makefile.am index c679afa..2f9ac95 100644 --- a/tikzit/src/Makefile.am +++ b/tikzit/src/Makefile.am @@ -14,7 +14,7 @@ AM_OBJCFLAGS = @FOUNDATION_OBJCFLAGS@ \ LIBS = @FOUNDATION_LIBS@ \ @GTK_LIBS@ AM_YFLAGS = -d -PARSERFILES = common/tikzlexer.m common/tikzparser.m common/tikzparser.h +PARSERFILES = common/tikzlexer.m common/tikzlexer.h common/tikzparser.m common/tikzparser.h ICONFILES = ../draw-ellipse.png \ ../draw-path.png \ ../select-rectangular.png \ @@ -126,10 +126,10 @@ endif common/tikzlexer.m: common/tikzlexer.lm $(AM_V_GEN)$(LEX) -o $@ $^ +common/tikzlexer.h: common/tikzlexer.m common/tikzparser.m: common/tikzparser.ym - $(AM_V_GEN)$(YACC) --output=$@ $^ - + $(AM_V_GEN)$(YACC) --defines=common/tikzparser.h --output-file=$@ $^ common/tikzparser.h: common/tikzparser.m gtk/icondata.m: $(ICONFILES) diff --git a/tikzit/src/common/TikzGraphAssembler.m b/tikzit/src/common/TikzGraphAssembler.m index 60b96ee..380b71c 100644 --- a/tikzit/src/common/TikzGraphAssembler.m +++ b/tikzit/src/common/TikzGraphAssembler.m @@ -22,6 +22,7 @@ // #import "TikzGraphAssembler.h" +#import "tikzparserdefs.h" #import "tikzparser.h" #import "TikzGraphAssembler+Parser.h" #import "tikzlexer.h" diff --git a/tikzit/src/common/tikzlexer.lm b/tikzit/src/common/tikzlexer.lm index fe7ab0d..96690d2 100644 --- a/tikzit/src/common/tikzlexer.lm +++ b/tikzit/src/common/tikzlexer.lm @@ -20,6 +20,7 @@ */ #import +#import "tikzparserdefs.h" #import "tikzparser.h" #define YY_USER_ACTION \ diff --git a/tikzit/src/common/tikzparser.ym b/tikzit/src/common/tikzparser.ym index bf33aa9..a6dc1ee 100644 --- a/tikzit/src/common/tikzparser.ym +++ b/tikzit/src/common/tikzparser.ym @@ -18,16 +18,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + +#import "tikzparserdefs.h" %} /* we use features added to bison 2.4 */ -%require "2.4" +%require "2.3" %error-verbose /* enable maintaining locations for better error messages */ %locations /* the name of the header file */ -%defines "common/tikzparser.h" +/*%defines "common/tikzparser.h"*/ /* make it re-entrant (no global variables) */ %pure-parser /* We use a pure (re-entrant) lexer. This means yylex @@ -37,21 +39,6 @@ that lexer state as an argument */ %parse-param {void *scanner} -/* things required to use the parser (will go in the header); - in particular, declarations/imports for types in the %union - must go here */ -%code requires { -#import -@class TikzGraphAssembler; -@class GraphElementData; -@class GraphElementProperty; -@class Node; -struct noderef { - Node *node; - NSString *anchor; -}; -} - /* possible data types for semantic values */ %union { NSPoint pt; @@ -62,7 +49,7 @@ struct noderef { struct noderef noderef; } -%code { +%{ #import "GraphElementData.h" #import "GraphElementProperty.h" #import "Node.h" @@ -78,7 +65,7 @@ struct noderef { void yyerror(YYLTYPE *yylloc, void *scanner, const char *str) { [assembler reportError:str atLocation:yylloc]; } -} +%} /* yyloc is set up with first_column = last_column = 1 by default; however, it makes more sense to think of us being "before the diff --git a/tikzit/src/common/tikzparserdefs.h b/tikzit/src/common/tikzparserdefs.h new file mode 100644 index 0000000..587bcd6 --- /dev/null +++ b/tikzit/src/common/tikzparserdefs.h @@ -0,0 +1,44 @@ +/* + * Copyright 2013 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/* + * This file sets up some defs (particularly struct noderef) needed for + * the tikz parser and its users. + * + * It is needed because we wish to support bison 2.3, which is the + * version shipped with OSX. bison 2.4 onwards allows us to put this + * stuff in a "%code requires" block, where it will be put in the + * generated header file by bison. + * + * All the types used by the %union directive in tikzparser.ym should + * be declared, defined or imported here. + */ + +// Foundation has NSPoint and NSString +#import + +@class TikzGraphAssembler; +@class GraphElementData; +@class GraphElementProperty; +@class Node; + +struct noderef { + Node *node; + NSString *anchor; +}; + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 -- cgit v1.2.3 From 1f995e9d45e31cb83f4616362e8b8bee4fd64b54 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Wed, 28 Aug 2013 14:37:58 +0100 Subject: remove old TikzParser.{h,m}, as this causes name clash on non-case-dependent file system (e.g. OS X) --- tikzit/src/osx/TikzParser.h | 66 ----- tikzit/src/osx/TikzParser.m | 574 -------------------------------------------- 2 files changed, 640 deletions(-) delete mode 100644 tikzit/src/osx/TikzParser.h delete mode 100644 tikzit/src/osx/TikzParser.m diff --git a/tikzit/src/osx/TikzParser.h b/tikzit/src/osx/TikzParser.h deleted file mode 100644 index 18b183f..0000000 --- a/tikzit/src/osx/TikzParser.h +++ /dev/null @@ -1,66 +0,0 @@ -// -// TikzParser.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import - -#import "Graph.h" - -@interface TikzParser : NSObject { - PKParser *nodeParser; - PKParser *edgeParser; - PKParser *tikzPictureParser; - PKTokenizer *tokenizer; - - NSString *currentKey; - NSString *currentSourceArrow; - - NSMutableArray *atoms; - NSMutableDictionary *properties; - NSString *leftArrow; - NSString *rightArrow; - - GraphElementData *elementData; - - Graph *graph; - Node *currentNode; - NSMutableDictionary *nodeTable; - - Edge *currentEdge; - BOOL matchingEdgeNode; - NSString *sourceName; - NSString *targName; - - NSPoint bbox1, bbox2; - BOOL bboxFirstPoint; -} - -@property (retain) Graph *graph; - -- (id)init; -- (BOOL)parseNode:(NSString*)str; -- (BOOL)parseEdge:(NSString*)str; -- (BOOL)parseTikzPicture:(NSString*)str forGraph:(Graph*)g; -- (BOOL)parseTikzPicture:(NSString *)str; - -@end diff --git a/tikzit/src/osx/TikzParser.m b/tikzit/src/osx/TikzParser.m deleted file mode 100644 index 2bb5a15..0000000 --- a/tikzit/src/osx/TikzParser.m +++ /dev/null @@ -1,574 +0,0 @@ -// -// TikzParser.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "TikzParser.h" - -// custom parsekit extensions -#import "PKNaturalNumber.h" -#import "PKRepetition+RepeatPlus.h" -#import "PKSpecificDelimitedString.h" -#import "PKBalancingDelimitState.h" - -#import "util.h" - -@interface TikzParser () - -- (NSString*)popAllToString:(PKAssembly*)a withSeparator:(NSString*)sep; -- (PKParser*)eatSymbol:(NSString*)s; -- (PKParser*)eatLiteral:(NSString*)s; -- (PKParser*)eatWord; - -// properties -- (void)willMatchProplist:(PKAssembly*)a; -- (void)didMatchProplist:(PKAssembly*)a; -- (void)willMatchProperty:(PKAssembly*)a; -- (void)didMatchArrowSpecDash:(PKAssembly*)a; - -// nodes -- (void)didMatchNodeCommand:(PKAssembly*)a; -- (void)didMatchNodeLabel:(PKAssembly*)a; -- (void)didMatchNode:(PKAssembly*)a; -- (void)didMatchNodeName:(PKAssembly*)a; -- (void)didMatchCoords:(PKAssembly*)a; - -// edges -- (void)didMatchDrawCommand:(PKAssembly *)a; -- (void)didMatchEdge:(PKAssembly*)a; -- (void)didMatchEdgeNodeCommand:(PKAssembly*)a; -- (void)didMatchEdgeNode:(PKAssembly*)a; - -// bounding box -- (void)didMatchPathCommand:(PKAssembly*)a; -- (void)didMatchBoundingBox:(PKAssembly*)a; - -// tikzpicture -- (void)willMatchTikzPicture:(PKAssembly*)a; -- (void)didMatchTikzPicture:(PKAssembly*)a; - -@end - - -@implementation TikzParser - -@synthesize graph; - -- (id)init { - [super init]; - - currentKey = nil; - currentSourceArrow = nil; - tokenizer = [PKTokenizer tokenizer]; - - graph = nil; - currentNode = nil; - currentEdge = nil; - matchingEdgeNode = NO; - - // tweak the tokenizer a bit - [tokenizer.symbolState remove:@"<="]; - [tokenizer.symbolState remove:@">="]; - [tokenizer.symbolState remove:@"{"]; - [tokenizer.symbolState remove:@"}"]; - [tokenizer setTokenizerState:tokenizer.wordState from:'\\' to:'\\']; - [tokenizer.wordState setWordChars:NO from:'-' to:'-']; - tokenizer.delimitState = [[PKBalancingDelimitState alloc] init]; - [tokenizer.delimitState addStartMarker:@"{" - endMarker:@"}" - allowedCharacterSet:nil]; - [tokenizer setTokenizerState:tokenizer.delimitState from:'{' to:'{']; - - /* - - - GRAMMAR FOR TIKZPICTURE - - tikzpicture = '\begin' '{tikzpicture}' - optproplist - expr* - '\end' '{tikzpicture}' - expr = node | edge | boundingbox | layerexpr - layerexpr = '\begin' '{pgfonlayer}' DelimitedString | '\end' '{pgfonlayer}' - - - GRAMMAR FOR PROPERTY LISTS - - optproplist = proplist | Empty; - proplist = '[' property property1* ']'; - property = arrowspec | keyval | atom; - property1 = ',' property; - keyval = key '=' val; - atom = propsym+; - arrowspec = propsym* '-' propsym*; - key = propsym+; - val = propsym+ | QuotedString; - propsym = (Word | Number | '<' | '>'); - - - GRAMMAR FOR NODES - - node = '\node' optproplist name 'at' coords DelimitedString ';'; - nodename = '(' nodeid ')'; - nodeid = Word | NaturalNumber; - coords = '(' Number ',' Number ')'; - - - GRAMMAR FOR EDGES - - edge = '\draw' optproplist nodename 'to' optedgenode ( nodename | selfloop ) ';'; - selfloop = '(' ')'; - optedgenode = Empty | edgenode - edgenode = 'node' optproplist name coords '{' '}' ';'; - - GRAMMAR FOR BOUNDING BOX - - boundingbox = '\path' '[' 'use' 'as' 'bounding' 'box' ']' coords 'rectangle' coords ';' - - */ - - - PKAlternation *nodeid = [PKAlternation alternation]; - nodeid.name = @"node identifier"; - [nodeid add:[PKWord word]]; - [nodeid add:[PKNaturalNumber number]]; - - PKAlternation *propsym = [PKAlternation alternation]; - propsym.name = @"property symbol"; - [propsym add:[PKWord word]]; - [propsym add:[PKNumber number]]; - [propsym add:[PKSymbol symbolWithString:@"<"]]; - [propsym add:[PKSymbol symbolWithString:@">"]]; - - PKSequence *anchor = [PKSequence sequence]; - [anchor add:[self eatSymbol:@"."]]; - [anchor add:[self eatWord]]; - - PKAlternation *optanchor = [PKAlternation alternation]; - [optanchor add:anchor]; - [optanchor add:[PKEmpty empty]]; - - PKSequence *nodename = [PKSequence sequence]; - nodename.name = @"node name"; - [nodename add:[self eatSymbol:@"("]]; - [nodename add:nodeid]; - [nodename add:optanchor]; - [nodename add:[self eatSymbol:@")"]]; - [nodename setAssembler:self selector:@selector(didMatchNodeName:)]; - - PKTrack *coords = [PKTrack track]; - coords.name = @"coordinate definition"; - [coords add:[self eatSymbol:@"("]]; - [coords add:[PKNumber number]]; - [coords add:[self eatSymbol:@","]]; - [coords add:[PKNumber number]]; - [coords add:[self eatSymbol:@")"]]; - [coords setAssembler:self selector:@selector(didMatchCoords:)]; - - PKSequence *key = [PKRepetition repetitionPlusWithSubparser:propsym]; - - PKAlternation *val = [PKAlternation alternation]; - [val add:[PKRepetition repetitionPlusWithSubparser:propsym]]; - [val add:[PKQuotedString quotedString]]; - [val setPreassembler:self selector:@selector(willMatchVal:)]; - - PKSequence *keyval = [PKSequence sequence]; - [keyval add:key]; - [keyval add:[self eatLiteral:@"="]]; - [keyval add:val]; - - PKSequence *atom = [PKRepetition repetitionPlusWithSubparser:propsym]; - - PKSymbol *arrowspecdash = [PKSymbol symbolWithString:@"-"]; - [arrowspecdash setAssembler:self selector:@selector(didMatchArrowSpecDash:)]; - - PKSequence *arrowspec = [PKSequence sequence]; - [arrowspec add:[PKRepetition repetitionWithSubparser:propsym]]; - [arrowspec add:arrowspecdash]; - [arrowspec add:[PKRepetition repetitionWithSubparser:propsym]]; - - PKAlternation *property = [PKAlternation alternation]; - property.name = @"property, atom, or arrow specification"; - [property add:keyval]; - [property add:arrowspec]; - [property add:atom]; - [property setPreassembler:self selector:@selector(willMatchProperty:)]; - - PKSequence *property1 = [PKSequence sequence]; - [property1 add:[self eatLiteral:@","]]; - [property1 add:property]; - - PKTrack *proplist = [PKTrack track]; - proplist.name = @"property list"; - [proplist add:[self eatSymbol:@"["]]; - [proplist add:property]; - [proplist add:[PKRepetition repetitionWithSubparser:property1]]; - [proplist add:[self eatSymbol:@"]"]]; - [proplist setPreassembler:self selector:@selector(willMatchProplist:)]; - [proplist setAssembler:self selector:@selector(didMatchProplist:)]; - - PKAlternation *optproplist = [PKAlternation alternation]; - [optproplist add:proplist]; - [optproplist add:[PKEmpty empty]]; - - PKLiteral *nodeCommand = [PKLiteral literalWithString:@"\\node"]; - [nodeCommand setAssembler:self selector:@selector(didMatchNodeCommand:)]; - - PKTerminal *nodeLabel = [PKDelimitedString delimitedString]; - nodeLabel.name = @"Possibly empty node label"; - [nodeLabel setAssembler:self selector:@selector(didMatchNodeLabel:)]; - - PKTrack *node = [PKTrack track]; - [node add:nodeCommand]; - [node add:optproplist]; - [node add:nodename]; - [node add:[self eatLiteral:@"at"]]; - [node add:coords]; - [node add:nodeLabel]; - //[node add:[[PKDelimitedString delimitedString] discard]]; - [node add:[self eatSymbol:@";"]]; - [node setAssembler:self selector:@selector(didMatchNode:)]; - - PKLiteral *drawCommand = [PKLiteral literalWithString:@"\\draw"]; - [drawCommand setAssembler:self selector:@selector(didMatchDrawCommand:)]; - - PKSequence *parens = [PKSequence sequence]; - [parens add:[self eatSymbol:@"("]]; - [parens add:[self eatSymbol:@")"]]; - - PKAlternation *nodenamealt = [PKAlternation alternation]; - nodenamealt.name = @"node name or '()'"; - [nodenamealt add:nodename]; - [nodenamealt add:parens]; - - PKLiteral *edgenodeCommand = [PKLiteral literalWithString:@"node"]; - edgenodeCommand.name = @"edge node command"; - [edgenodeCommand setAssembler:self selector:@selector(didMatchEdgeNodeCommand:)]; - - PKSequence *edgenode = [PKSequence sequence]; - [edgenode add:edgenodeCommand]; - [edgenode add:optproplist]; - [edgenode add:nodeLabel]; - edgenode.name = @"edge node"; - [edgenode setAssembler:self selector:@selector(didMatchEdgeNode:)]; - - - PKAlternation *optedgenode = [PKAlternation alternation]; - [optedgenode add:[PKEmpty empty]]; - [optedgenode add:edgenode]; - - - PKTrack *edge = [PKTrack track]; - [edge add:drawCommand]; - [edge add:optproplist]; - [edge add:nodename]; - [edge add:[self eatLiteral:@"to"]]; - [edge add:optedgenode]; - [edge add:nodenamealt]; - [edge add:[self eatSymbol:@";"]]; - [edge setAssembler:self selector:@selector(didMatchEdge:)]; - - - PKLiteral *pathliteral = [PKLiteral literalWithString:@"\\path"]; - [pathliteral setAssembler:self selector:@selector(didMatchPathCommand:)]; - - PKTrack *boundingbox = [PKTrack track]; - [boundingbox add:pathliteral]; - [boundingbox add:[self eatSymbol:@"["]]; - [boundingbox add:[self eatLiteral:@"use"]]; - [boundingbox add:[self eatLiteral:@"as"]]; - [boundingbox add:[self eatLiteral:@"bounding"]]; - [boundingbox add:[self eatLiteral:@"box"]]; - [boundingbox add:[self eatSymbol:@"]"]]; - [boundingbox add:coords]; - [boundingbox add:[self eatLiteral:@"rectangle"]]; - [boundingbox add:coords]; - [boundingbox add:[self eatSymbol:@";"]]; - [boundingbox setAssembler:self selector:@selector(didMatchBoundingBox:)]; - - PKTerminal *layerLiteral = - [[PKSpecificDelimitedString delimitedStringWithValue:@"{pgfonlayer}"] - discard]; - - PKSequence *beginLayer = [PKSequence sequence]; - [beginLayer add:[self eatLiteral:@"\\begin"]]; - [beginLayer add:layerLiteral]; - [beginLayer add:[[PKDelimitedString delimitedString] discard]]; - - PKSequence *endLayer = [PKSequence sequence]; - [endLayer add:[self eatLiteral:@"\\end"]]; - [endLayer add:layerLiteral]; - - PKAlternation *expr = [PKAlternation alternation]; - [expr add:node]; - [expr add:edge]; - [expr add:boundingbox]; - [expr add:beginLayer]; - [expr add:endLayer]; - - PKTerminal *tikzpicLiteral = - [[PKSpecificDelimitedString delimitedStringWithValue:@"{tikzpicture}"] - discard]; - - //tikzpicLiteral.name = @"{tikzpicture}"; - - PKTrack *tikzpic = [PKTrack track]; - [tikzpic add:[PKEmpty empty]]; - [tikzpic add:[self eatLiteral:@"\\begin"]]; - [tikzpic add:tikzpicLiteral]; - [tikzpic add:optproplist]; - [tikzpic add:[PKRepetition repetitionWithSubparser:expr]]; - [tikzpic add:[self eatLiteral:@"\\end"]]; - [tikzpic add:tikzpicLiteral]; - [tikzpic setPreassembler:self selector:@selector(willMatchTikzPicture:)]; - [tikzpic setAssembler:self selector:@selector(didMatchTikzPicture:)]; - - nodeParser = node; - edgeParser = edge; - tikzPictureParser = tikzpic; - - return self; -} - -- (NSString*)popAllToString:(PKAssembly*)a withSeparator:(NSString*)sep { - NSString *str = @""; - BOOL fst = YES; - - while (![a isStackEmpty]) { - if (fst) fst = NO; - else str = [sep stringByAppendingString:str]; - - PKToken *tok = [a pop]; - str = [tok.stringValue stringByAppendingString:str]; - } - - return str; -} - -- (PKParser*)eatSymbol:(NSString*)s { - return [[PKSymbol symbolWithString:s] discard]; -} - -- (PKParser*)eatLiteral:(NSString*)s { - return [[PKLiteral literalWithString:s] discard]; -} - -- (PKParser*)eatWord { - return [[PKWord word] discard]; -} - -- (void)packProperty:(PKAssembly*)a { - BOOL empty = [a isStackEmpty]; - NSString *val = [self popAllToString:a withSeparator:@" "]; - - if (currentKey != nil) { - [elementData setProperty:val forKey:currentKey]; -// NSLog(@" keyval: (%@) => (%@)", currentKey, val); - } else if (currentSourceArrow != nil) { - [elementData setArrowSpecFrom:currentSourceArrow to:val]; -// NSLog(@" arrowspec: (%@-%@)", currentSourceArrow, val); - } else if (!empty) { - [elementData setAtom:val]; -// NSLog(@" atom: (%@)", val); - } - - currentKey = nil; - currentSourceArrow = nil; -} - -- (BOOL)parseNode:(NSString *)str { - tokenizer.string = str; - PKAssembly *res = [nodeParser completeMatchFor:[PKTokenAssembly assemblyWithTokenizer:tokenizer]]; - -// NSLog(@"result: %@", res); - return res != nil; -} - -- (BOOL)parseEdge:(NSString *)str { - tokenizer.string = str; - PKAssembly *res = [edgeParser completeMatchFor:[PKTokenAssembly assemblyWithTokenizer:tokenizer]]; - -// NSLog(@"result: %@", res); - return res != nil; -} - -- (BOOL)parseTikzPicture:(NSString*)str forGraph:(Graph*)g { - self.graph = g; - tokenizer.string = str; - PKTokenAssembly *assm = [PKTokenAssembly assemblyWithTokenizer:tokenizer]; - PKAssembly *res = [tikzPictureParser completeMatchFor:assm]; - -// NSLog(@"result: %@", res); - return res != nil; -} - -- (BOOL)parseTikzPicture:(NSString *)str { - return [self parseTikzPicture:str forGraph:[Graph graph]]; -} - - -- (void)didMatchNodeCommand:(PKAssembly*)a { - [a pop]; - currentNode = [Node node]; - [currentNode updateData]; -// NSLog(@""); -} - -- (void)didMatchNodeLabel:(PKAssembly*)a { - PKToken *tok = [a pop]; - NSString *s = tok.stringValue; - s = [s substringWithRange:NSMakeRange(1, [s length]-2)]; - if (matchingEdgeNode) currentEdge.edgeNode.label = s; - else currentNode.label = s; -} - -- (void)didMatchNode:(PKAssembly*)a { - [nodeTable setObject:currentNode forKey:currentNode.name]; - [graph addNode:currentNode]; - currentNode = nil; -// NSLog(@""); -} - -- (void)didMatchDrawCommand:(PKAssembly*)a { - [a pop]; - currentEdge = [Edge edge]; - sourceName = nil; - targName = nil; -// NSLog(@""); -} - -- (void)didMatchEdge:(PKAssembly*)a { - Node *src = [nodeTable objectForKey:sourceName]; - currentEdge.source = src; - currentEdge.target = (targName == nil) ? src : [nodeTable objectForKey:targName]; - [currentEdge setAttributesFromData]; - [graph addEdge:currentEdge]; - currentEdge = nil; -// NSLog(@""); -} - -- (void)didMatchEdgeNodeCommand:(PKAssembly*)a { - [a pop]; - matchingEdgeNode = YES; - currentEdge.edgeNode = [Node node]; -} - -- (void)didMatchEdgeNode:(PKAssembly*)a { - matchingEdgeNode = NO; -} - -- (void)willMatchVal:(PKAssembly*)a { - currentKey = [self popAllToString:a withSeparator:@" "]; -// NSLog(@"key: %@", currentKey); -} - -- (void)willMatchProperty:(PKAssembly*)a { - [self packProperty:a]; -} - -- (void)willMatchProplist:(PKAssembly*)a { - elementData = [[GraphElementData alloc] init]; -} - -- (void)didMatchProplist:(PKAssembly*)a { - [self packProperty:a]; - - if (currentNode != nil) { - currentNode.data = elementData; - } else if (currentEdge != nil) { - if (matchingEdgeNode) currentEdge.edgeNode.data = elementData; - else currentEdge.data = elementData; - } else { // add properties to to graph - graph.data = elementData; - } - - elementData = nil; -} - -- (void)didMatchNodeName:(PKAssembly*)a { - NSString *name = ((PKToken*)[a pop]).stringValue; - - if (currentNode != nil) { - currentNode.name = name; -// NSLog(@" name: (%@)", name); - } else if (currentEdge != nil) { - if (sourceName == nil) { - sourceName = name; -// NSLog(@" source: (%@)", name); - } else { - targName = name; -// NSLog(@" target: (%@)", name); - } - } -} - -- (void)didMatchCoords:(PKAssembly*)a { - NSPoint p; - p.y = ((PKToken*)[a pop]).floatValue; - p.x = ((PKToken*)[a pop]).floatValue; - - if (currentNode != nil) { - currentNode.point = p; - } else { - if (bboxFirstPoint) { - bboxFirstPoint = NO; - bbox1 = p; - } else { - bbox2 = p; - } - } - -// NSLog(@" coord: (%f, %f)", p.x, p.y); -} - -- (void)didMatchPathCommand:(PKAssembly*)a { - [a pop]; - bboxFirstPoint = YES; -} - -- (void)didMatchBoundingBox:(PKAssembly*)a { - graph.boundingBox = NSRectAroundPoints(bbox1, bbox2); -} - -- (void)didMatchArrowSpecDash:(PKAssembly*)a { - [a pop]; // pop off the dash - currentSourceArrow = [self popAllToString:a withSeparator:@" "]; -} - -- (void)willMatchTikzPicture:(PKAssembly*)a { -// NSLog(@""); - nodeTable = [NSMutableDictionary dictionary]; -} - -- (void)didMatchTikzPicture:(PKAssembly*)a { -// NSLog(@""); -// NSLog(@"%@", [graph tikz]); -} - -- (void)finalize { -// NSLog(@"releasing subparser trees"); - PKReleaseSubparserTree(nodeParser); - PKReleaseSubparserTree(edgeParser); - PKReleaseSubparserTree(tikzPictureParser); - [super finalize]; -} - -@end -- cgit v1.2.3 From 0503e5b446241da385607c6392c7a84ba743538d Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Thu, 29 Aug 2013 11:45:27 +0100 Subject: fixed osx code and build to work with the new parser --- tikzit/TikZiT.xcodeproj/project.pbxproj | 27 +++++++++++++++++++++++++++ tikzit/src/osx/ParseErrorView.m | 2 +- tikzit/src/osx/TikzSourceController.m | 5 +++-- 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/tikzit/TikZiT.xcodeproj/project.pbxproj b/tikzit/TikZiT.xcodeproj/project.pbxproj index 33d7495..01e63c7 100644 --- a/tikzit/TikZiT.xcodeproj/project.pbxproj +++ b/tikzit/TikZiT.xcodeproj/project.pbxproj @@ -141,6 +141,31 @@ 8D15AC340486D014006FF6A4 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A7FEA54F5311CA2CBB /* Cocoa.framework */; }; /* End PBXBuildFile section */ +/* Begin PBXBuildRule section */ + 74112B2117CE36C500B9CF16 /* PBXBuildRule */ = { + isa = PBXBuildRule; + compilerSpec = com.apple.compilers.proxy.script; + fileType = sourcecode.lex; + isEditable = 1; + outputFiles = ( + tikzlexer.m, + tikzlexer.h, + ); + script = "cd src\nflex -o common/${INPUT_FILE_BASE}.m common/${INPUT_FILE_BASE}.lm\ncp common/${INPUT_FILE_BASE}.m common/${INPUT_FILE_BASE}.h ${DERIVED_SOURCES_DIR}"; + }; + 74E535F317CE329A0040610D /* PBXBuildRule */ = { + isa = PBXBuildRule; + compilerSpec = com.apple.compilers.proxy.script; + fileType = sourcecode.yacc; + isEditable = 1; + outputFiles = ( + tikzparser.h, + tikzparser.m, + ); + script = "cd src\nbison --defines=common/${INPUT_FILE_BASE}.h --output=common/${INPUT_FILE_BASE}.m common/${INPUT_FILE_BASE}.ym\ncp common/${INPUT_FILE_BASE}.h common/${INPUT_FILE_BASE}.m ${DERIVED_SOURCES_DIR}\n"; + }; +/* End PBXBuildRule section */ + /* Begin PBXContainerItemProxy section */ 5504C91A11D36CD5002A1478 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -742,6 +767,8 @@ 8D15AC330486D014006FF6A4 /* Frameworks */, ); buildRules = ( + 74112B2117CE36C500B9CF16 /* PBXBuildRule */, + 74E535F317CE329A0040610D /* PBXBuildRule */, ); dependencies = ( ); diff --git a/tikzit/src/osx/ParseErrorView.m b/tikzit/src/osx/ParseErrorView.m index 97b1b94..83383f0 100644 --- a/tikzit/src/osx/ParseErrorView.m +++ b/tikzit/src/osx/ParseErrorView.m @@ -32,7 +32,7 @@ self.layer.backgroundColor = [[NSColor controlColor] CGColor]; //CGColorCreate(CGColorSpaceCreateDeviceRGB(), (CGFloat[]){ 1, .9, .64, 1 }); // newLayer.backgroundColor = [NSColor redColor].CGColor; - newLayer.frame = NSMakeRect(100,100,100,100);//NSMakeRect(0,0,image.size.width,image.size.height); + newLayer.frame = CGRectMake(100,100,100,100);//NSMakeRect(0,0,image.size.width,image.size.height); newLayer.position = CGPointMake(20,20); //[self.layer addSublayer:newLayer]; } diff --git a/tikzit/src/osx/TikzSourceController.m b/tikzit/src/osx/TikzSourceController.m index 0cb3703..737d771 100644 --- a/tikzit/src/osx/TikzSourceController.m +++ b/tikzit/src/osx/TikzSourceController.m @@ -150,9 +150,10 @@ [graphicsView setGraph:g]; [graphicsView refreshLayers]; [self doRevertTikz]; + return YES; + } else { + return NO; } - - return success; } - (void)doRevertTikz { -- cgit v1.2.3 From 3a212c1d5fd1f279559b36fd555473441e836562 Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Thu, 29 Aug 2013 18:31:28 +0100 Subject: When dragging, only snap leader node to grid If you've carefully hand-positioned various nodes on a diagram relative to each other, and then want to move the whole thing around, you generally don't want to change their position relative to each other. So we only snap the node being dragged to the grid. Everything else in the selection maintains its position relative to that node. --- tikzit/src/gtk/SelectTool.m | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tikzit/src/gtk/SelectTool.m b/tikzit/src/gtk/SelectTool.m index 2aa2104..b3121ae 100644 --- a/tikzit/src/gtk/SelectTool.m +++ b/tikzit/src/gtk/SelectTool.m @@ -501,7 +501,7 @@ static void drag_select_mode_cb (GtkToggleButton *button, SelectTool *tool); Transformer *transformer = [renderer transformer]; NSPoint from = [transformer toScreen:[leader point]]; - //to = [[renderer grid] snapScreenPoint:to]; + to = [[renderer grid] snapScreenPoint:to]; float dx = to.x - from.x; float dy = to.y - from.y; @@ -509,7 +509,6 @@ static void drag_select_mode_cb (GtkToggleButton *button, SelectTool *tool); NSPoint p = [transformer toScreen:[node point]]; p.x += dx; p.y += dy; - p = [[renderer grid] snapScreenPoint:p]; [node setPoint:[transformer fromScreen:p]]; } } -- cgit v1.2.3 From 367a9dd91462b2f1b52292d3f9af3be8d325cddb Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Sun, 1 Sep 2013 11:59:38 +0100 Subject: GTK: delay setting cursor on non-realised windows Calling -[WidgetSurface setCursor:] when the underlying GtkWidget has not been realised yet used to result in a warning that the GdkWindow did not exist. As a result, the cursor would not actually be set. To deal with this, if the widget has not been realised, we delay setting the cursor until it is. --- tikzit/src/gtk/WidgetSurface.m | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/tikzit/src/gtk/WidgetSurface.m b/tikzit/src/gtk/WidgetSurface.m index 680cf90..004e722 100644 --- a/tikzit/src/gtk/WidgetSurface.m +++ b/tikzit/src/gtk/WidgetSurface.m @@ -31,6 +31,8 @@ static gboolean motion_notify_event_cb (GtkWidget *widget, GdkEventMotion *event static gboolean key_press_event_cb (GtkWidget *widget, GdkEventKey *event, WidgetSurface *surface); static gboolean key_release_event_cb (GtkWidget *widget, GdkEventKey *event, WidgetSurface *surface); static gboolean scroll_event_cb (GtkWidget *widget, GdkEventScroll *event, WidgetSurface *surface); +static void set_cursor (GtkWidget *widget, GdkCursor *cursor); +static void unref_cursor (gpointer cursor, GClosure *closure); // }}} @interface WidgetSurface (Private) @@ -298,7 +300,6 @@ static gboolean scroll_event_cb (GtkWidget *widget, GdkEventScroll *event, Widge } - (void) setCursor:(Cursor)c { - GdkWindow *window = gtk_widget_get_window (widget); GdkCursor *cursor = NULL; switch (c) { case ResizeRightCursor: @@ -327,9 +328,19 @@ static gboolean scroll_event_cb (GtkWidget *widget, GdkEventScroll *event, Widge break; default: break; } - gdk_window_set_cursor (window, cursor); - if (cursor != NULL) { - gdk_cursor_unref (cursor); + GdkWindow *window = gtk_widget_get_window (widget); + g_signal_handlers_disconnect_matched (window, + G_SIGNAL_MATCH_FUNC, 0, 0, NULL, + G_CALLBACK (set_cursor), NULL); + if (window) { + gdk_window_set_cursor (window, cursor); + if (cursor != NULL) { + gdk_cursor_unref (cursor); + } + } else { + g_signal_connect_data (widget, + "realize", G_CALLBACK (set_cursor), cursor, + unref_cursor, 0); } } @@ -598,6 +609,22 @@ static gboolean scroll_event_cb (GtkWidget *widget, GdkEventScroll *event, Widge [pool drain]; return FALSE; } + +static void unref_cursor (gpointer cursor, GClosure *closure) { + if (cursor != NULL) { + gdk_cursor_unref ((GdkCursor*)cursor); + } +} + +static void set_cursor (GtkWidget *widget, GdkCursor *cursor) { + GdkWindow *window = gtk_widget_get_window (widget); + if (window) { + gdk_window_set_cursor (window, cursor); + if (cursor != NULL) { + gdk_cursor_unref (cursor); + } + } +} // }}} // vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker -- cgit v1.2.3 From eb56a2ca0faf7a0e7b8da2f149a9d88783314d82 Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Sun, 1 Sep 2013 12:05:17 +0100 Subject: GTK: Properly clear the renderer from the old tool Fixes, for example, unsetting the cursor when changing from the bounding box tool. --- tikzit/src/gtk/GraphEditorPanel.m | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tikzit/src/gtk/GraphEditorPanel.m b/tikzit/src/gtk/GraphEditorPanel.m index c1fdffd..dac52a0 100644 --- a/tikzit/src/gtk/GraphEditorPanel.m +++ b/tikzit/src/gtk/GraphEditorPanel.m @@ -96,13 +96,16 @@ static const InputMask zoomPanMask = ControlMask; [[[renderer document] pickSupport] deselectAllNodes]; [[[renderer document] pickSupport] deselectAllEdges]; - BOOL hadOldTool = ([tool activeRenderer] == renderer); - id oldTool = tool; + BOOL weHadTool = ([oldTool activeRenderer] == renderer); + if (weHadTool) { + [oldTool setActiveRenderer:nil]; + } + tool = [t retain]; [oldTool release]; - if (hadOldTool) { + if (weHadTool) { [self grabTool]; } } -- cgit v1.2.3 From f054e040a12df4160c632039289b925b251fc81d Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Fri, 11 Oct 2013 15:19:00 +0100 Subject: Fix rule dependencies for lexer/parser generation Previously, if common/tikzparser.m existed but common/tikzparser.h did not, bison would not be re-run, and the build would fail elsewhere with an error about not finding tikzparser.h. The same would be true of the tikzlexer files. Issue #15 --- tikzit/src/Makefile.am | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tikzit/src/Makefile.am b/tikzit/src/Makefile.am index 2f9ac95..ffd05bf 100644 --- a/tikzit/src/Makefile.am +++ b/tikzit/src/Makefile.am @@ -124,12 +124,14 @@ tikzit_LDADD = tikzit.res CLEANFILES = tikzit.res endif -common/tikzlexer.m: common/tikzlexer.lm - $(AM_V_GEN)$(LEX) -o $@ $^ +common/tikzlexer.m common/tikzlexer.h: common/tikzlexer.lm + $(AM_V_GEN)$(LEX) -o common/tikzlexer.m $^ +# ordering hack for parallel builds common/tikzlexer.h: common/tikzlexer.m -common/tikzparser.m: common/tikzparser.ym - $(AM_V_GEN)$(YACC) --defines=common/tikzparser.h --output-file=$@ $^ +common/tikzparser.m common/tikzparser.h: common/tikzparser.ym + $(AM_V_GEN)$(YACC) --defines=common/tikzparser.h --output-file=common/tikzparser.m $^ +# ordering hack for parallel builds common/tikzparser.h: common/tikzparser.m gtk/icondata.m: $(ICONFILES) -- cgit v1.2.3 From 2c0baccbe99f52c402d6c0f9882192477c9b5246 Mon Sep 17 00:00:00 2001 From: Johan Paulsson Date: Sat, 30 Nov 2013 19:32:09 -0800 Subject: osx gui: Added dragging of the preview pdf to other applications. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The preview area can be dragged as a pasteboard pdf to other applications rich text editor views. Notably, this means that small images can be made and emailed as PDFs. This is not dragging the PDFs as files so dragging to the finder for saving doesn’t work. --- tikzit/English.lproj/Preview.xib | 499 +++++--------------------------- tikzit/TikZiT.xcodeproj/project.pbxproj | 6 + tikzit/src/osx/DraggablePDFView.h | 28 ++ tikzit/src/osx/DraggablePDFView.m | 56 ++++ tikzit/src/osx/PreviewController.h | 3 +- 5 files changed, 162 insertions(+), 430 deletions(-) create mode 100644 tikzit/src/osx/DraggablePDFView.h create mode 100644 tikzit/src/osx/DraggablePDFView.m diff --git a/tikzit/English.lproj/Preview.xib b/tikzit/English.lproj/Preview.xib index 46d3521..cb1e82c 100644 --- a/tikzit/English.lproj/Preview.xib +++ b/tikzit/English.lproj/Preview.xib @@ -1,429 +1,70 @@ - - - - 1050 - 11B26 - 1617 - 1138 - 566.00 - - 1617 - 518 - - - NSView - NSProgressIndicator - NSScrollView - NSWindowTemplate - NSTextView - PDFView - NSScroller - NSCustomObject - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.pdfkit.ibplugin - - - - - PreviewController - - - FirstResponder - - - NSApplication - - - 15 - 2 - {{196, 138}, {480, 380}} - 536870912 - Preview - NSWindow - - - - - 256 - - - - 18 - - NSFilenamesPboardType - - {480, 380} - - - 0 - NO - 0.47979798913002014 - YES - - - - -2147483374 - - - - 2304 - - - - 2322 - {478, 14} - - - - - - - - - - - - - - - 134 - - - - 478 - 1 - - - 12129 - 0 - - - 3 - MQA - - - - 6 - System - selectedTextBackgroundColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - selectedTextColor - - 3 - MAA - - - - - - - 1 - MCAwIDEAA - - - {8, -8} - 13 - - - - - - 1 - - 6 - {493, 10000000} - {223, 0} - - - - {{1, 1}, {478, 378}} - - - - - - - {4, 5} - - 12582912 - - - - - - TU0AKgAAAHCAFUqgBVKsAAAAwdVQUqwaEQeIRGJRGFlYqwWLQ+JxuOQpVRmEx2RROKwOQyOUQSPyaUym -SxqWyKXyeYxyZzWbSuJTScRCbz2Nz+gRKhUOfTqeUai0OSxiWTiBQSHSGFquGwekxyAgAAAOAQAAAwAA -AAEAEAAAAQEAAwAAAAEAEAAAAQIAAwAAAAIACAAIAQMAAwAAAAEABQAAAQYAAwAAAAEAAQAAAREABAAA -AAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEAAgAAARYAAwAAAAEAEAAAARcABAAAAAEAAABnARwAAwAA -AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA - - - - - - 3 - MCAwAA - - - - 4 - - - - 256 - {{464, 1}, {15, 378}} - - - - - _doScroller: - 0.99248120300751874 - - - - -2147483392 - {{-100, -100}, {463, 15}} - - - - 1 - - _doScroller: - 1 - 0.94565218687057495 - - - {480, 380} - - - - 133138 - - - - - - - 1292 - - {{7, 342}, {32, 32}} - - - 28682 - 100 - - - {480, 380} - - - - - {{0, 0}, {1440, 878}} - {10000000000000, 10000000000000} - YES - - - - - - - window - - - - 4 - - - - pdfView - - - - 5 - - - - progressIndicator - - - - 7 - - - - errorText - - - - 12 - - - - errorTextView - - - - 13 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 1 - - - - - - - - 2 - - - - - - - - - - 3 - - - - - 6 - - - - - 8 - - - - - - - - - - 9 - - - - - 10 - - - - - 11 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{162, 413}, {480, 380}} - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.pdfkit.ibplugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - 13 - - - - - PreviewController - NSWindowController - - NSTextView - NSScrollView - PDFView - NSProgressIndicator - - - - errorText - NSTextView - - - errorTextView - NSScrollView - - - pdfView - PDFView - - - progressIndicator - NSProgressIndicator - - - - IBProjectSource - ./Classes/PreviewController.h - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES - 3 - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tikzit/TikZiT.xcodeproj/project.pbxproj b/tikzit/TikZiT.xcodeproj/project.pbxproj index 01e63c7..8b4df9b 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 */; }; + 7F73438A184AC559002897D0 /* DraggablePDFView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F734389184AC559002897D0 /* DraggablePDFView.m */; }; 7F781C1A16B5DE1400239826 /* ParseErrorView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F781C1916B5DE1400239826 /* ParseErrorView.m */; }; 7F90E88616DD29600069EBCD /* NSString+Tikz.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F90E88516DD29600069EBCD /* NSString+Tikz.m */; }; 7F90E88D16DD47540069EBCD /* PreferenceController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F90E88B16DD47540069EBCD /* PreferenceController.m */; }; @@ -370,6 +371,8 @@ 55F9E04411FF54F000F5659E /* NSString+LatexConstants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSString+LatexConstants.m"; path = "src/common/NSString+LatexConstants.m"; sourceTree = ""; }; 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 = ""; }; + 7F734388184AC559002897D0 /* DraggablePDFView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DraggablePDFView.h; path = src/osx/DraggablePDFView.h; sourceTree = ""; }; + 7F734389184AC559002897D0 /* DraggablePDFView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DraggablePDFView.m; path = src/osx/DraggablePDFView.m; sourceTree = ""; }; 7F781C1816B5DE1400239826 /* ParseErrorView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ParseErrorView.h; path = src/osx/ParseErrorView.h; sourceTree = ""; }; 7F781C1916B5DE1400239826 /* ParseErrorView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ParseErrorView.m; path = src/osx/ParseErrorView.m; sourceTree = ""; }; 7F90E88416DD29600069EBCD /* NSString+Tikz.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSString+Tikz.h"; path = "src/common/NSString+Tikz.h"; sourceTree = ""; }; @@ -573,6 +576,8 @@ 5573B8BF11D9FD1800B5DC5D /* Preview */ = { isa = PBXGroup; children = ( + 7F734388184AC559002897D0 /* DraggablePDFView.h */, + 7F734389184AC559002897D0 /* DraggablePDFView.m */, 5573B8C011D9FD3200B5DC5D /* PreviewController.h */, 5573B8C111D9FD3200B5DC5D /* PreviewController.m */, ); @@ -902,6 +907,7 @@ 558F18F7117B043C009863B2 /* AppDelegate.m in Sources */, 558F18F9117B043C009863B2 /* EdgeControlLayer.m in Sources */, 558F18FA117B043C009863B2 /* GraphicsView.m in Sources */, + 7F73438A184AC559002897D0 /* DraggablePDFView.m in Sources */, 558F18FB117B043C009863B2 /* Grid.m in Sources */, 558F18FC117B043C009863B2 /* NodeLayer.m in Sources */, 558F18FD117B043C009863B2 /* NodeSelectionLayer.m in Sources */, diff --git a/tikzit/src/osx/DraggablePDFView.h b/tikzit/src/osx/DraggablePDFView.h new file mode 100644 index 0000000..9e53c44 --- /dev/null +++ b/tikzit/src/osx/DraggablePDFView.h @@ -0,0 +1,28 @@ +// +// PreviewController.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import + +@interface DraggablePDFView : PDFView + +@end diff --git a/tikzit/src/osx/DraggablePDFView.m b/tikzit/src/osx/DraggablePDFView.m new file mode 100644 index 0000000..ce57473 --- /dev/null +++ b/tikzit/src/osx/DraggablePDFView.m @@ -0,0 +1,56 @@ +// +// PreviewController.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "DraggablePDFView.h" + +@implementation DraggablePDFView + +- (id)initWithFrame:(NSRect)frame +{ + self = [super initWithFrame:frame]; + return self; +} + +- (void)drawRect:(NSRect)dirtyRect +{ + [super drawRect:dirtyRect]; +} + +- (void)mouseDown:(NSEvent *)theEvent +{ + NSPasteboard *pboard; + + NSRect pageBox = [[[self document] pageAtIndex:0] boundsForBox:kPDFDisplayBoxMediaBox]; + NSRect pageRect= [self convertRect:pageBox fromPage:[[self document] pageAtIndex:0]]; + + pboard = [NSPasteboard pasteboardWithName:NSDragPboard]; + [pboard declareTypes:[NSArray arrayWithObject:NSPasteboardTypePDF] owner:self]; + [pboard setData:[[self document] dataRepresentation] forType:NSPasteboardTypePDF]; + + [self dragImage:[[NSImage alloc] initWithData:[[self document] dataRepresentation]] at:pageRect.origin offset:pageRect.size + event:theEvent pasteboard:pboard source:self slideBack:YES]; + + return; +} + +@end diff --git a/tikzit/src/osx/PreviewController.h b/tikzit/src/osx/PreviewController.h index d6d855e..6c51a23 100644 --- a/tikzit/src/osx/PreviewController.h +++ b/tikzit/src/osx/PreviewController.h @@ -23,12 +23,13 @@ #import +#import "DraggablePDFView.h" @class PDFView; @class PreambleController; @interface PreviewController : NSWindowController { - IBOutlet PDFView *pdfView; + IBOutlet DraggablePDFView *pdfView; IBOutlet NSProgressIndicator *progressIndicator; IBOutlet NSScrollView *errorTextView; IBOutlet NSTextView *errorText; -- cgit v1.2.3 From 2b7726352d1d422d4284618c8762637f64ec9a68 Mon Sep 17 00:00:00 2001 From: Johan Paulsson Date: Sun, 1 Dec 2013 13:23:59 -0800 Subject: osx gui: Fixed dragging of the preview pdf to all applications. --- tikzit/src/osx/DraggablePDFView.m | 18 +++++++++++------- tikzit/src/osx/PreviewController.m | 3 +-- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/tikzit/src/osx/DraggablePDFView.m b/tikzit/src/osx/DraggablePDFView.m index ce57473..ce393c7 100644 --- a/tikzit/src/osx/DraggablePDFView.m +++ b/tikzit/src/osx/DraggablePDFView.m @@ -38,17 +38,21 @@ - (void)mouseDown:(NSEvent *)theEvent { - NSPasteboard *pboard; - NSRect pageBox = [[[self document] pageAtIndex:0] boundsForBox:kPDFDisplayBoxMediaBox]; NSRect pageRect= [self convertRect:pageBox fromPage:[[self document] pageAtIndex:0]]; - pboard = [NSPasteboard pasteboardWithName:NSDragPboard]; - [pboard declareTypes:[NSArray arrayWithObject:NSPasteboardTypePDF] owner:self]; - [pboard setData:[[self document] dataRepresentation] forType:NSPasteboardTypePDF]; + NSArray *fileList = [NSArray arrayWithObjects:[[[self document] documentURL] path], nil]; + NSPasteboard *pboard = [NSPasteboard pasteboardWithName:NSDragPboard]; + [pboard declareTypes:[NSArray arrayWithObject:NSFilenamesPboardType] owner:nil]; + [pboard setPropertyList:fileList forType:NSFilenamesPboardType]; - [self dragImage:[[NSImage alloc] initWithData:[[self document] dataRepresentation]] at:pageRect.origin offset:pageRect.size - event:theEvent pasteboard:pboard source:self slideBack:YES]; + [self dragImage:[[NSImage alloc] initWithData:[[self document] dataRepresentation]] + at:pageRect.origin + offset:pageRect.size + event:theEvent + pasteboard:pboard + source:self + slideBack:YES]; return; } diff --git a/tikzit/src/osx/PreviewController.m b/tikzit/src/osx/PreviewController.m index 94a80a4..310c2ab 100644 --- a/tikzit/src/osx/PreviewController.m +++ b/tikzit/src/osx/PreviewController.m @@ -109,8 +109,7 @@ static PreviewController *preview = nil; [errorText setString:@""]; [errorTextView setHidden:YES]; - data = [NSData dataWithContentsOfFile:pdfFile]; - PDFDocument *doc = [[PDFDocument alloc] initWithData:data]; + PDFDocument *doc = [[PDFDocument alloc] initWithURL:[[NSURL alloc] initFileURLWithPath:pdfFile]]; // pad the PDF by a couple of pixels if ([doc pageCount] >= 1) { -- cgit v1.2.3 From 7e7e0607d0ab5a5c28ae593adc4a3235ee4b429e Mon Sep 17 00:00:00 2001 From: Johan Paulsson Date: Sun, 1 Dec 2013 23:25:55 -0800 Subject: osx gui: Added preference tab for Sparkle updater. --- tikzit/TikZiT.xcodeproj/project.pbxproj | 22 ++++- tikzit/src/osx/PreferenceController.h | 4 + tikzit/src/osx/PreferenceController.m | 28 ++---- tikzit/src/osx/Preferences.xib | 135 ++++++++++++++++++++++++---- tikzit/src/osx/UpdatePreferenceController.h | 34 +++++++ tikzit/src/osx/UpdatePreferenceController.m | 49 ++++++++++ tikzit/src/osx/UpdatePreferencePanel.xib | 95 ++++++++++++++++++++ 7 files changed, 328 insertions(+), 39 deletions(-) create mode 100644 tikzit/src/osx/UpdatePreferenceController.h create mode 100644 tikzit/src/osx/UpdatePreferenceController.m create mode 100644 tikzit/src/osx/UpdatePreferencePanel.xib diff --git a/tikzit/TikZiT.xcodeproj/project.pbxproj b/tikzit/TikZiT.xcodeproj/project.pbxproj index 8b4df9b..0205c67 100644 --- a/tikzit/TikZiT.xcodeproj/project.pbxproj +++ b/tikzit/TikZiT.xcodeproj/project.pbxproj @@ -116,6 +116,8 @@ 55F9585C1181B09600F99434 /* PickSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F958591181B09600F99434 /* PickSupport.m */; }; 55F9585D1181B09600F99434 /* Transformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F9585B1181B09600F99434 /* Transformer.m */; }; 55F9E04511FF54F000F5659E /* NSString+LatexConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F9E04411FF54F000F5659E /* NSString+LatexConstants.m */; }; + 7F18A321184C577000BC3081 /* UpdatePreferenceController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F18A320184C577000BC3081 /* UpdatePreferenceController.m */; }; + 7F18A323184C599100BC3081 /* UpdatePreferencePanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7F18A322184C599100BC3081 /* UpdatePreferencePanel.xib */; }; 7F6E2C7D16B007F000BFE20D /* EdgeStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 55397C7814498C22006942FB /* EdgeStyle.m */; }; 7F6E2C7E16B0080400BFE20D /* GraphElementProperty.m in Sources */ = {isa = PBXBuildFile; fileRef = 55432E051444BF2D00401BB3 /* GraphElementProperty.m */; }; 7F6E2C7F16B0081D00BFE20D /* PropertyHolder.m in Sources */ = {isa = PBXBuildFile; fileRef = 55397C7E144999C4006942FB /* PropertyHolder.m */; }; @@ -370,6 +372,9 @@ 55F9E04311FF54F000F5659E /* NSString+LatexConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSString+LatexConstants.h"; path = "src/common/NSString+LatexConstants.h"; sourceTree = ""; }; 55F9E04411FF54F000F5659E /* NSString+LatexConstants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSString+LatexConstants.m"; path = "src/common/NSString+LatexConstants.m"; sourceTree = ""; }; 55FF4E64116A401B000C22B4 /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = usr/lib/libicucore.dylib; sourceTree = SDKROOT; }; + 7F18A31F184C577000BC3081 /* UpdatePreferenceController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UpdatePreferenceController.h; path = src/osx/UpdatePreferenceController.h; sourceTree = ""; }; + 7F18A320184C577000BC3081 /* UpdatePreferenceController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = UpdatePreferenceController.m; path = src/osx/UpdatePreferenceController.m; sourceTree = ""; }; + 7F18A322184C599100BC3081 /* UpdatePreferencePanel.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = UpdatePreferencePanel.xib; path = src/osx/UpdatePreferencePanel.xib; sourceTree = ""; }; 7F6E2C8716B0091300BFE20D /* maths.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = maths.m; path = src/common/test/maths.m; sourceTree = ""; }; 7F734388184AC559002897D0 /* DraggablePDFView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DraggablePDFView.h; path = src/osx/DraggablePDFView.h; sourceTree = ""; }; 7F734389184AC559002897D0 /* DraggablePDFView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DraggablePDFView.m; path = src/osx/DraggablePDFView.m; sourceTree = ""; }; @@ -514,6 +519,7 @@ 55D945701165904F0044178C /* tikzitdoc.icns */, 55D945711165904F0044178C /* tikzit.icns */, 7F90E88C16DD47540069EBCD /* Preferences.xib */, + 7F18A322184C599100BC3081 /* UpdatePreferencePanel.xib */, 55391AF713D3250F007DBE71 /* Preamble.xib */, 55391AF513D324FE007DBE71 /* Preview.xib */, 55391B0013D32608007DBE71 /* PropertyInspector.xib */, @@ -686,8 +692,7 @@ 55CA997112F08281008F0368 /* TikzWindowController.m */, 553A4C58144ED3D500AA6FAC /* NilToEmptyStringTransformer.h */, 553A4C59144ED3D500AA6FAC /* NilToEmptyStringTransformer.m */, - 7F90E88A16DD47540069EBCD /* PreferenceController.h */, - 7F90E88B16DD47540069EBCD /* PreferenceController.m */, + 7F18A31E184C563800BC3081 /* Preferences */, ); name = Gui; sourceTree = ""; @@ -731,6 +736,17 @@ name = StylePalette; sourceTree = ""; }; + 7F18A31E184C563800BC3081 /* Preferences */ = { + isa = PBXGroup; + children = ( + 7F90E88A16DD47540069EBCD /* PreferenceController.h */, + 7F90E88B16DD47540069EBCD /* PreferenceController.m */, + 7F18A31F184C577000BC3081 /* UpdatePreferenceController.h */, + 7F18A320184C577000BC3081 /* UpdatePreferenceController.m */, + ); + name = Preferences; + sourceTree = ""; + }; 7FB9BFE616B54BE300773146 /* Formatter */ = { isa = PBXGroup; children = ( @@ -845,6 +861,7 @@ 55397C8D1449ABFC006942FB /* AH_latex_tail.png in Resources */, 55397C901449AC7C006942FB /* AH_latex_head.png in Resources */, 55397C911449AC7C006942FB /* AH_plain_head.png in Resources */, + 7F18A323184C599100BC3081 /* UpdatePreferencePanel.xib in Resources */, 7F90E88E16DD47540069EBCD /* Preferences.xib in Resources */, 7F90E89116DD54440069EBCD /* UserDefaults.plist in Resources */, ); @@ -954,6 +971,7 @@ 7F781C1A16B5DE1400239826 /* ParseErrorView.m in Sources */, 7F90E88616DD29600069EBCD /* NSString+Tikz.m in Sources */, 7F90E88D16DD47540069EBCD /* PreferenceController.m in Sources */, + 7F18A321184C577000BC3081 /* UpdatePreferenceController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/tikzit/src/osx/PreferenceController.h b/tikzit/src/osx/PreferenceController.h index bc6ed67..04fd324 100644 --- a/tikzit/src/osx/PreferenceController.h +++ b/tikzit/src/osx/PreferenceController.h @@ -23,11 +23,15 @@ // #import +#import "UpdatePreferenceController.h" @interface PreferenceController : NSWindowController{ IBOutlet NSView *engineView; IBOutlet NSView *generalView; + IBOutlet NSView *updateView; + + UpdatePreferenceController *updateController; int currentViewTag; } diff --git a/tikzit/src/osx/PreferenceController.m b/tikzit/src/osx/PreferenceController.m index 75d7ef7..6ccedd0 100644 --- a/tikzit/src/osx/PreferenceController.m +++ b/tikzit/src/osx/PreferenceController.m @@ -30,25 +30,7 @@ @implementation PreferenceController -- (id)initWithWindow:(NSWindow *)window -{ - self = [super initWithWindow:window]; - if (self) { - // Initialization code here. - } - - return self; -} - -- (void)windowDidLoad -{ - [super windowDidLoad]; - - // Implement this method to handle any initialization after your window controller's window has been loaded from its nib file. -} - - (NSRect)newFrameForNewContentView:(NSView*)view { - NSWindow *window = [self window]; NSRect newFrameRect = [window frameRectForContentRect:[view frame]]; NSRect oldFrameRect = [window frame]; @@ -73,6 +55,9 @@ case 1: view = engineView; break; + case 2: + view = updateView; + break; } return view; @@ -90,6 +75,11 @@ [[self window] setContentSize:[generalView frame].size]; [[[self window] contentView] addSubview:generalView]; [[[self window] contentView] setWantsLayer:YES]; + + updateController = [[UpdatePreferenceController alloc] initWithNibName:@"UpdatePreferencePanel" bundle:nil]; + [[updateController view] setFrame:[updateView frame]]; + [[[self window] contentView] replaceSubview:updateView with:[updateController view]]; + updateView = [updateController view]; } - (IBAction)switchView:(id)sender { @@ -110,7 +100,7 @@ [[[self window] animator] setFrame:newFrame display:YES]; [NSAnimationContext endGrouping]; - + } @end diff --git a/tikzit/src/osx/Preferences.xib b/tikzit/src/osx/Preferences.xib index 1b2d0c3..3cf1677 100644 --- a/tikzit/src/osx/Preferences.xib +++ b/tikzit/src/osx/Preferences.xib @@ -1,14 +1,14 @@ - 1080 - 12C60 - 2840 - 1187.34 - 625.00 + 1070 + 13A603 + 4514 + 1265 + 695.00 com.apple.InterfaceBuilder.CocoaPlugin - 2840 + 4514 IBNSLayoutConstraint @@ -60,6 +60,28 @@ 1 1 + + + 197F9408-AFB0-404B-B2B6-4DB1250B0A80 + + Update + Update + + + + NSImage + NSUserAccounts + + + + {0, 0} + {0, 0} + YES + YES + 2 + YES + 0 + A3DDD070-5637-444B-92C6-905084CAC389 @@ -102,26 +124,27 @@ 0 - + + - + + - 256 {480, 270} - {{0, 0}, {1680, 1050}} + {{0, 0}, {1680, 1028}} {10000000000000, 10000000000000} YES @@ -132,7 +155,7 @@ 268 - {{18, 15}, {215, 18}} + {{18, 15}, {214, 18}} @@ -143,7 +166,7 @@ 268435456 Bring preview window to focus - LucidaGrande + .LucidaGrandeUI 13 1044 @@ -202,11 +225,12 @@ NO + 1 268 - {{17, 69}, {142, 17}} + {{18, 69}, {140, 17}} @@ -236,6 +260,7 @@ NO + 1 {480, 96} @@ -269,6 +294,7 @@ NO + 1 {480, 96} @@ -278,6 +304,17 @@ _NS:9 NSView + + + 12 + + {480, 115} + + + + _NS:9 + NSView + YES @@ -324,6 +361,22 @@ 27 + + + switchView: + + + + 116 + + + + updateView + + + + 117 + delegate @@ -411,6 +464,7 @@ + @@ -443,6 +497,7 @@ 6 24 3 + NO @@ -456,9 +511,10 @@ 1000 - 8 + 0 29 3 + NO @@ -472,9 +528,10 @@ 1000 - 8 + 0 29 3 + NO @@ -491,6 +548,7 @@ 6 24 3 + NO @@ -504,9 +562,10 @@ 1000 - 8 + 0 29 3 + NO @@ -523,6 +582,7 @@ 3 9 3 + NO @@ -536,9 +596,10 @@ 1000 - 8 + 0 29 3 + NO @@ -565,6 +626,7 @@ 5 22 2 + NO @@ -581,6 +643,7 @@ 5 22 2 + NO @@ -688,6 +751,17 @@ + + 64 + + + + + + 115 + + + @@ -698,6 +772,7 @@ {{357, 418}, {480, 270}} com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -738,15 +813,24 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin - 62 + 117 + + NSLayoutConstraint + NSObject + + IBProjectSource + ./Classes/NSLayoutConstraint.h + + PreferenceController NSWindowController @@ -764,6 +848,7 @@ NSView NSView + NSView @@ -774,6 +859,10 @@ generalView NSView + + updateView + NSView + IBProjectSource @@ -784,11 +873,21 @@ 0 IBCocoaFramework + YES + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + + YES 3 {32, 32} {15, 15} + {32, 32} YES diff --git a/tikzit/src/osx/UpdatePreferenceController.h b/tikzit/src/osx/UpdatePreferenceController.h new file mode 100644 index 0000000..816322f --- /dev/null +++ b/tikzit/src/osx/UpdatePreferenceController.h @@ -0,0 +1,34 @@ +// +// UpdatePreferenceController.h +// TikZiT +// +// Copyright (c) 2013 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import + +@interface UpdatePreferenceController : NSViewController{ + IBOutlet SUUpdater *sharedUpdater; + IBOutlet NSDate *lastUpdate; +} + +- (IBAction)checkForUpdates:(id)sender; + +@end diff --git a/tikzit/src/osx/UpdatePreferenceController.m b/tikzit/src/osx/UpdatePreferenceController.m new file mode 100644 index 0000000..2ff270f --- /dev/null +++ b/tikzit/src/osx/UpdatePreferenceController.m @@ -0,0 +1,49 @@ +// +// UpdatePreferenceController.h +// TikZiT +// +// Copyright (c) 2013 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "UpdatePreferenceController.h" + +@interface UpdatePreferenceController () + +@end + +@implementation UpdatePreferenceController + +- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil +{ + self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]; + if (self) { + sharedUpdater = [SUUpdater sharedUpdater]; + } + return self; +} + +- (IBAction)checkForUpdates:(id)sender{ + [sharedUpdater checkForUpdates:sender]; +} + +- (NSDate*)getLastUpdate{ + return [sharedUpdater lastUpdateCheckDate]; +} + +@end diff --git a/tikzit/src/osx/UpdatePreferencePanel.xib b/tikzit/src/osx/UpdatePreferencePanel.xib new file mode 100644 index 0000000..a9f57bd --- /dev/null +++ b/tikzit/src/osx/UpdatePreferencePanel.xib @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file -- cgit v1.2.3 From 000084adfd36c87051fb7df912a00fca35365f4e Mon Sep 17 00:00:00 2001 From: Johan Paulsson Date: Mon, 2 Dec 2013 11:28:52 -0800 Subject: osx gui: Moved preamble window to preferences. Moved the preamble window to the preference panel as a new tab. The PreambleController is now a subclass of NSView with related changes to the Preamble.xib. The toolbar that controlled default or custom preamble has been replaced with buttons in the interface. --- tikzit/English.lproj/MainMenu.xib | 3418 ++++--------------------------- tikzit/English.lproj/Preamble.xib | 1367 +++--------- tikzit/TikZiT.xcodeproj/project.pbxproj | 4 +- tikzit/src/osx/AppDelegate.m | 4 +- tikzit/src/osx/PreambleController.h | 11 +- tikzit/src/osx/PreambleController.m | 30 +- tikzit/src/osx/PreferenceController.h | 3 + tikzit/src/osx/PreferenceController.m | 19 +- tikzit/src/osx/Preferences.xib | 91 +- 9 files changed, 805 insertions(+), 4142 deletions(-) diff --git a/tikzit/English.lproj/MainMenu.xib b/tikzit/English.lproj/MainMenu.xib index 4ce33f0..c7f22d7 100644 --- a/tikzit/English.lproj/MainMenu.xib +++ b/tikzit/English.lproj/MainMenu.xib @@ -1,2965 +1,453 @@ - - - - 1080 - 12C60 - 2843 - 1187.34 - 625.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 2843 - - - YES - NSButtonCell - NSCustomObject - NSMatrix - NSMenu - NSMenuItem - NSView - NSWindowTemplate - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - YES - - NSApplication - - - FirstResponder - - - NSApplication - - - AMainMenu - - YES - - - TikZiT - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - TikZiT - - YES - - - About TikZiT - - 2147483647 - - - - - - Check for Updates... - - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Preferences… - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Services - - 1048576 - 2147483647 - - - submenuAction: - - Services - - YES - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Hide TikZiT - h - 1048576 - 2147483647 - - - - - - Hide Others - h - 1572864 - 2147483647 - - - - - - Show All - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Quit TikZiT - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - File - - 1048576 - 2147483647 - - - submenuAction: - - File - - YES - - - New - n - 1048576 - 2147483647 - - - - - - Open… - o - 1048576 - 2147483647 - - - - - - Open Recent - - 1048576 - 2147483647 - - - submenuAction: - - Open Recent - - YES - - - Clear Menu - - 1048576 - 2147483647 - - - - - _NSRecentDocumentsMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Close - w - 1048576 - 2147483647 - - - - - - Save - s - 1048576 - 2147483647 - - - - - - Save As… - S - 1179648 - 2147483647 - - - - - - Revert to Saved - - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Page Setup... - P - 1179648 - 2147483647 - - - - - - - Print… - p - 1048576 - 2147483647 - - - - - - - - - Edit - - 1048576 - 2147483647 - - - submenuAction: - - Edit - - YES - - - Undo - z - 1048576 - 2147483647 - - - - - - Redo - Z - 1179648 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Cut - x - 1048576 - 2147483647 - - - - - - Copy - c - 1048576 - 2147483647 - - - - - - Paste - v - 1048576 - 2147483647 - - - - - - Delete - CA - 2147483647 - - - - - - Select All - a - 1048576 - 2147483647 - - - - - - Deselect All - A - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Arrange - - 2147483647 - - - submenuAction: - - Arrange - - YES - - - Bring to Front - ] - 1179648 - 2147483647 - - - - - - Bring Forward - ] - 1048576 - 2147483647 - - - - - - Send Backward - [ - 1048576 - 2147483647 - - - - - - Send to Back - [ - 1179648 - 2147483647 - - - - - - - - - Find - - 1048576 - 2147483647 - - - submenuAction: - - Find - - YES - - - Find… - f - 1048576 - 2147483647 - - - 1 - - - - Find Next - g - 1048576 - 2147483647 - - - 2 - - - - Find Previous - G - 1179648 - 2147483647 - - - 3 - - - - Use Selection for Find - e - 1048576 - 2147483647 - - - 7 - - - - Jump to Selection - j - 1048576 - 2147483647 - - - - - - - - - Transformations - - 2147483647 - - - submenuAction: - - Transformations - - YES - - - Flip Horizontal -  - 1048576 - 2147483647 - - - - - - Flip Vertical - ïœ - 1048576 - 2147483647 - - - - - - - - - Edge - - 2147483647 - - - submenuAction: - - Edge - - YES - - - Reverse Edge Direction - / - 1048576 - 2147483647 - - - - - - - - - - - - TikZ - - 2147483647 - - - submenuAction: - - TikZ - - YES - - - Parse - t - 1048576 - 2147483647 - - - - - - Revert - - 2147483647 - - - - - - Preview - r - 1048576 - 2147483647 - - - - - - Refresh Shapes - - 2147483647 - - - - - - - - - View - - 1048576 - 2147483647 - - - submenuAction: - - View - - YES - - - Zoom In - + - 1048576 - 2147483647 - - - - - - Zoom Out - - - 1048576 - 2147483647 - - - - - - Actual Size - 0 - 1048576 - 2147483647 - - - - - - - - - Window - - 1048576 - 2147483647 - - - submenuAction: - - Window - - YES - - - Minimize - m - 1048576 - 2147483647 - - - - - - Zoom - - 1048576 - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - - - - Style Inspector - s - 1572864 - 2147483647 - - - - - - Property Inspector - p - 1572864 - 2147483647 - - - - - - Preamble Editor - e - 1572864 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Bring All to Front - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - Help - - 2147483647 - - - submenuAction: - - Help - - YES - - - TikZiT Help - ? - 1048576 - 2147483647 - - - - - _NSHelpMenu - - - - _NSMainMenu - - - NSFontManager - - - AppDelegate - - - 145 - 2 - {{42, 560}, {36, 138}} - -1540882432 - - NSPanel - - - - - 256 - - YES - - - 268 - {{2, 2}, {32, 134}} - - - YES - NO - 4 - 1 - - YES - - -2080374784 - 0 - - - LucidaGrande - 13 - 1044 - - - -1229176832 - 6 - - NSImage - select-rectangular - - - - 200 - 25 - - - 67108864 - 0 - - - - -1229176832 - 6 - - NSImage - draw-ellipse - - 400 - 75 - - - 67108864 - 0 - - - - -1229176832 - 6 - - NSImage - draw-path - - 400 - 75 - - - 67108864 - 0 - - - - -1229176832 - 6 - - NSImage - transform-crop-and-resize - - 400 - 75 - - - {32, 32} - {4, 2} - 1151868928 - NSActionCell - - 67108864 - 0 - - - -2034483200 - 6 - 400 - 75 - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 3 - MQA - - - - - {36, 138} - - - - - {{0, 0}, {1440, 878}} - {10000000000000, 10000000000000} - YES - - - ToolPaletteController - - - SUUpdater - - - - - YES - - - terminate: - - - - 448 - - - - delegate - - - - 533 - - - - orderFrontStandardAboutPanel: - - - - 534 - - - - performMiniaturize: - - - - 37 - - - - arrangeInFront: - - - - 39 - - - - runPageLayout: - - - - 87 - - - - clearRecentDocuments: - - - - 127 - - - - performClose: - - - - 193 - - - - undo: - - - - 223 - - - - copy: - - - - 224 - - - - paste: - - - - 226 - - - - cut: - - - - 228 - - - - redo: - - - - 231 - - - - selectAll: - - - - 232 - - - - delete: - - - - 235 - - - - performZoom: - - - - 240 - - - - performFindPanelAction: - - - - 241 - - - - centerSelectionInVisibleArea: - - - - 245 - - - - saveDocument: - - - - 362 - - - - saveDocumentAs: - - - - 363 - - - - revertDocumentToSaved: - - - - 364 - - - - hide: - - - - 367 - - - - hideOtherApplications: - - - - 368 - - - - unhideAllApplications: - - - - 370 - - - - newDocument: - - - - 371 - - - - openDocument: - - - - 372 - - - - printDocument: - - - - 373 - - - - performFindPanelAction: - - - - 467 - - - - performFindPanelAction: - - - - 468 - - - - performFindPanelAction: - - - - 469 - - - - showHelp: - - - - 494 - - - - parseTikz: - - - - 549 - - - - revertTikz: - - - - 550 - - - - deselectAll: - - - - 552 - - - - flipHorizonal: - - - - 555 - - - - flipVertical: - - - - 556 - - - - zoomIn: - - - - 569 - - - - zoomOut: - - - - 570 - - - - zoomToActualSize: - - - - 572 - - - - previewTikz: - - - - 583 - - - - reverseEdgeDirection: - - - - 596 - - - - bringForward: - - - - 608 - - - - bringToFront: - - - - 609 - - - - sendBackward: - - - - 612 - - - - sendToBack: - - - - 613 - - - - toolPaletteController - - - - 545 - - - - toggleStyleInspector: - - - - 590 - - - - togglePropertyInspector: - - - - 591 - - - - togglePreamble: - - - - 593 - - - - refreshShapes: - - - - 595 - - - - togglePreferences: - - - - 614 - - - - toolPalette - - - - 544 - - - - toolMatrix - - - - 546 - - - - checkForUpdates: - - - - 575 - - - - - YES - - 0 - - YES - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - YES - - - - - - - - - - - - 19 - - - YES - - - - - - 56 - - - YES - - - - - - 217 - - - YES - - - - - - 83 - - - YES - - - - - - 81 - - - YES - - - - - - - - - - - - - - - - 75 - - - - - 80 - - - - - 78 - - - - - 72 - - - - - 82 - - - - - 124 - - - YES - - - - - - 77 - - - - - 73 - - - - - 79 - - - - - 112 - - - - - 74 - - - - - 125 - - - YES - - - - - - 126 - - - - - 205 - - - YES - - - - - - - - - - - - - - - - - - - 202 - - - - - 198 - - - - - 207 - - - - - 214 - - - YES - - - - - 199 - - - - - 203 - - - - - 197 - - - - - 206 - - - - - 215 - - - - - 218 - - - YES - - - - - - 220 - - - YES - - - - - - - - - - 213 - - - - - 210 - - - - - 221 - - - - - 208 - - - - - 209 - - - - - 57 - - - YES - - - - - - - - - - - - - - - - - 58 - - - - - 134 - - - - - 150 - - - - - 136 - - - - - 144 - - - - - 129 - - - - - 143 - - - - - 236 - - - - - 131 - - - YES - - - - - - 149 - - - - - 145 - - - - - 130 - - - - - 24 - - - YES - - - - - - - - - - - - - 92 - - - - - 5 - - - - - 239 - - - - - 23 - - - - - 295 - - - YES - - - - - - 296 - - - YES - - - - - - - - 374 - - - YES - - - - - - 375 - - - YES - - - - - - - - - 419 - - - - - 449 - - - YES - - - - - - 450 - - - YES - - - - - - - 491 - - - YES - - - - - - 492 - - - YES - - - - - - 493 - - - - - 532 - - - - - 535 - - - YES - - - - Tool Palette - - - 536 - - - YES - - - - - - 537 - - - YES - - - - - - - - - - 538 - - - - - 539 - - - - - 540 - - - - - 542 - - - - - 543 - - - - - 547 - - - - - 548 - - - - - 551 - - - - - 553 - - - - - 554 - - - - - 558 - - - YES - - - - - - 559 - - - YES - - - - - - 560 - - - - - 565 - - - - - 566 - - - - - 567 - - - - - 573 - - - - - 574 - - - - - 582 - - - - - 586 - - - - - 587 - - - - - 588 - - - - - 589 - - - - - 592 - - - - - 594 - - - - - 602 - - - YES - - - - - - 603 - - - YES - - - - - - - - - 604 - - - - - 605 - - - - - 606 - - - - - 607 - - - - - - - YES - - YES - -1.IBPluginDependency - -2.IBPluginDependency - -3.IBPluginDependency - 112.IBPluginDependency - 124.IBPluginDependency - 125.IBPluginDependency - 126.IBPluginDependency - 129.IBPluginDependency - 130.IBPluginDependency - 131.IBPluginDependency - 134.IBPluginDependency - 136.IBPluginDependency - 143.IBPluginDependency - 144.IBPluginDependency - 145.IBPluginDependency - 149.IBPluginDependency - 150.IBPluginDependency - 19.IBPluginDependency - 197.IBPluginDependency - 198.IBPluginDependency - 199.IBPluginDependency - 202.IBPluginDependency - 203.IBPluginDependency - 205.IBPluginDependency - 206.IBPluginDependency - 207.IBPluginDependency - 208.IBPluginDependency - 209.IBPluginDependency - 210.IBPluginDependency - 213.IBPluginDependency - 214.IBPluginDependency - 215.IBPluginDependency - 217.IBPluginDependency - 218.IBPluginDependency - 220.IBPluginDependency - 221.IBPluginDependency - 23.IBPluginDependency - 236.IBPluginDependency - 239.IBPluginDependency - 24.IBPluginDependency - 29.IBPluginDependency - 295.IBPluginDependency - 296.IBPluginDependency - 374.IBPluginDependency - 375.IBPluginDependency - 419.IBPluginDependency - 449.IBPluginDependency - 450.IBPluginDependency - 491.IBPluginDependency - 492.IBPluginDependency - 493.IBPluginDependency - 5.IBPluginDependency - 532.IBPluginDependency - 535.IBNSWindowAutoPositionCentersHorizontal - 535.IBNSWindowAutoPositionCentersVertical - 535.IBPluginDependency - 535.IBWindowTemplateEditedContentRect - 535.NSWindowTemplate.visibleAtLaunch - 536.IBPluginDependency - 537.IBPluginDependency - 538.IBAttributePlaceholdersKey - 538.IBPluginDependency - 539.IBAttributePlaceholdersKey - 539.IBPluginDependency - 540.IBPluginDependency - 542.IBAttributePlaceholdersKey - 542.IBPluginDependency - 543.IBPluginDependency - 547.IBPluginDependency - 548.IBPluginDependency - 551.IBPluginDependency - 553.IBPluginDependency - 554.IBPluginDependency - 558.IBPluginDependency - 559.IBPluginDependency - 56.IBPluginDependency - 560.IBPluginDependency - 565.IBPluginDependency - 566.IBPluginDependency - 567.IBPluginDependency - 57.IBPluginDependency - 573.IBPluginDependency - 574.IBPluginDependency - 58.IBPluginDependency - 582.IBPluginDependency - 586.IBAttributePlaceholdersKey - 586.IBPluginDependency - 587.IBPluginDependency - 588.IBPluginDependency - 589.IBPluginDependency - 592.IBPluginDependency - 594.IBPluginDependency - 602.IBPluginDependency - 603.IBPluginDependency - 604.IBPluginDependency - 605.IBPluginDependency - 606.IBPluginDependency - 607.IBPluginDependency - 72.IBPluginDependency - 73.IBPluginDependency - 74.IBPluginDependency - 75.IBPluginDependency - 77.IBPluginDependency - 78.IBPluginDependency - 79.IBPluginDependency - 80.IBPluginDependency - 81.IBPluginDependency - 82.IBPluginDependency - 83.IBPluginDependency - 92.IBPluginDependency - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - {{329, 545}, {36, 138}} - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Select (S) - - - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Add Node (N) - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Add Edge (E) - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Crop Box (K) - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - YES - - - - - - YES - - - - - 614 - - - - YES - - AppDelegate - NSObject - - YES - - YES - refreshShapes: - togglePreamble: - togglePreferences: - togglePropertyInspector: - toggleStyleInspector: - - - YES - id - id - id - id - id - - - - YES - - YES - refreshShapes: - togglePreamble: - togglePreferences: - togglePropertyInspector: - toggleStyleInspector: - - - YES - - refreshShapes: - id - - - togglePreamble: - id - - - togglePreferences: - id - - - togglePropertyInspector: - id - - - toggleStyleInspector: - id - - - - - YES - - YES - graphicsView - stylePaletteController - toolPaletteController - - - YES - GraphicsView - StylePaletteController - ToolPaletteController - - - - YES - - YES - graphicsView - stylePaletteController - toolPaletteController - - - YES - - graphicsView - GraphicsView - - - stylePaletteController - StylePaletteController - - - toolPaletteController - ToolPaletteController - - - - - IBProjectSource - ./Classes/AppDelegate.h - - - - FirstResponder - - YES - - YES - bringForward: - bringToFront: - revertTikz: - sendBackward: - sendToBack: - - - YES - id - id - id - id - id - - - - YES - - YES - bringForward: - bringToFront: - revertTikz: - sendBackward: - sendToBack: - - - YES - - bringForward: - id - - - bringToFront: - id - - - revertTikz: - id - - - sendBackward: - id - - - sendToBack: - id - - - - - IBUserSource - - - - - GraphicsView - NSView - - YES - - YES - application - tikzSourceController - - - YES - NSApplication - TikzSourceController - - - - YES - - YES - application - tikzSourceController - - - YES - - application - NSApplication - - - tikzSourceController - TikzSourceController - - - - - IBProjectSource - ./Classes/GraphicsView.h - - - - IKImageView - - crop: - id - - - crop: - - crop: - id - - - - IBProjectSource - ./Classes/IKImageView.h - - - - ParseErrorView - NSView - - IBProjectSource - ./Classes/ParseErrorView.h - - - - SFBInspectorView - NSView - - IBProjectSource - ./Classes/SFBInspectorView.h - - - - SUUpdater - NSObject - - checkForUpdates: - id - - - checkForUpdates: - - checkForUpdates: - id - - - - delegate - id - - - delegate - - delegate - id - - - - IBProjectSource - ./Classes/SUUpdater.h - - - - StylePaletteController - NSWindowController - - YES - - YES - addEdgeStyle: - addNodeStyle: - appleActiveEdgeStyle: - applyActiveNodeStyle: - clearActiveEdgeStyle: - clearActiveNodeStyle: - refreshCollection: - setFillToClosestHashed: - setStrokeToClosestHashed: - - - YES - id - id - id - id - id - id - id - id - id - - - - YES - - YES - addEdgeStyle: - addNodeStyle: - appleActiveEdgeStyle: - applyActiveNodeStyle: - clearActiveEdgeStyle: - clearActiveNodeStyle: - refreshCollection: - setFillToClosestHashed: - setStrokeToClosestHashed: - - - YES - - addEdgeStyle: - id - - - addNodeStyle: - id - - - appleActiveEdgeStyle: - id - - - applyActiveNodeStyle: - id - - - clearActiveEdgeStyle: - id - - - clearActiveNodeStyle: - id - - - refreshCollection: - id - - - setFillToClosestHashed: - id - - - setStrokeToClosestHashed: - id - - - - - YES - - YES - collectionView - edgeStyleArrayController - edgeStyleView - filteredEdgeStyleArrayController - filteredNodeStyleArrayController - nodeStyleArrayController - nodeStyleInspectorView - nodeStyleView - shapeDropdown - - - YES - NSCollectionView - NSArrayController - NSView - NSArrayController - NSArrayController - NSArrayController - SFBInspectorView - NSView - NSPopUpButton - - - - YES - - YES - collectionView - edgeStyleArrayController - edgeStyleView - filteredEdgeStyleArrayController - filteredNodeStyleArrayController - nodeStyleArrayController - nodeStyleInspectorView - nodeStyleView - shapeDropdown - - - YES - - collectionView - NSCollectionView - - - edgeStyleArrayController - NSArrayController - - - edgeStyleView - NSView - - - filteredEdgeStyleArrayController - NSArrayController - - - filteredNodeStyleArrayController - NSArrayController - - - nodeStyleArrayController - NSArrayController - - - nodeStyleInspectorView - SFBInspectorView - - - nodeStyleView - NSView - - - shapeDropdown - NSPopUpButton - - - - - IBProjectSource - ./Classes/StylePaletteController.h - - - - TikzSourceController - NSObject - - closeParseError: - id - - - closeParseError: - - closeParseError: - id - - - - YES - - YES - errorMessage - errorNotification - graphicsView - sourceView - status - - - YES - NSTextField - ParseErrorView - GraphicsView - NSTextView - NSTextField - - - - YES - - YES - errorMessage - errorNotification - graphicsView - sourceView - status - - - YES - - errorMessage - NSTextField - - - errorNotification - ParseErrorView - - - graphicsView - GraphicsView - - - sourceView - NSTextView - - - status - NSTextField - - - - - IBProjectSource - ./Classes/TikzSourceController.h - - - - ToolPaletteController - NSObject - - YES - - YES - toolMatrix - toolPalette - - - YES - NSMatrix - NSPanel - - - - YES - - YES - toolMatrix - toolPalette - - - YES - - toolMatrix - NSMatrix - - - toolPalette - NSPanel - - - - - IBProjectSource - ./Classes/ToolPaletteController.h - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES - 3 - - YES - - YES - NSMenuCheckmark - NSMenuMixedState - draw-ellipse - draw-path - select-rectangular - transform-crop-and-resize - - - YES - {11, 11} - {10, 3} - {22, 22} - {22, 22} - {22, 22} - {22, 22} - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +CA + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tikzit/English.lproj/Preamble.xib b/tikzit/English.lproj/Preamble.xib index f94131a..54a4125 100644 --- a/tikzit/English.lproj/Preamble.xib +++ b/tikzit/English.lproj/Preamble.xib @@ -1,1132 +1,235 @@ - - - - 1080 - 12C60 - 2843 - 1187.34 - 625.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 2843 - - - NSButton - NSButtonCell - NSCustomObject - NSCustomView - NSDictionaryController - NSScrollView - NSScroller - NSSplitView - NSTableColumn - NSTableView - NSTextFieldCell - NSTextView - NSToolbar - NSToolbarItem - NSToolbarSeparatorItem - NSUserDefaultsController - NSView - NSWindowTemplate - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - PreambleController - - - FirstResponder - - - NSApplication - - - 15 - 2 - {{196, 89}, {667, 421}} - 536870912 - Preamble - NSWindow - - - 17B3285F-0991-4671-80C3-ED14F41DF30D - - - YES - YES - NO - NO - 1 - 1 - - - - 0DD7FDB3-25D8-422C-BD82-FBB1D3B8AC6D - - Custom - Custom - - - - NSImage - text-x-script - - - - {0, 0} - {0, 0} - YES - YES - -1 - YES - 0 - - - - BABAF841-2ADC-440B-8CAD-2E4B711E3D5B - - Default - Default - Use default preamble to generate preview. - - - NSImage - text-x-generic - - - - {0, 0} - {0, 0} - YES - YES - -1 - YES - 0 - - - - F0F4F062-26B3-437F-B94B-7E5176D37853 - - Insert Styles - Insert Styles - Insert default styles at cursor. - - - NSImage - format-indent-less - - - - {0, 0} - {0, 0} - YES - NO - -1 - YES - 0 - - - NSToolbarSeparatorItem - - Separator - - - - - - {12, 5} - {12, 1000} - YES - YES - -1 - YES - 0 - - YES - YES - - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - - - - - - - - - - - - - - - - - - - - 256 - - - - 274 - - - - 256 - - - - 292 - {{28, 3}, {26, 26}} - - - YES - - -2080374784 - 134217728 - - - LucidaGrande - 13 - 1044 - - - -2033434624 - 162 - - NSImage - NSRemoveTemplate - - - - 400 - 75 - - NO - - - - 292 - {{3, 3}, {26, 26}} - - - YES - - -2080374784 - 134217728 - - - LucidaGrande - 9 - 16 - - - -2032386048 - 162 - - NSImage - NSAddTemplate - - - - 400 - 75 - - NO - - - - 274 - - - - 2304 - - - - 256 - {170, 388} - - - YES - NO - YES - - - -2147483392 - {{224, 0}, {16, 17}} - - - - 167 - 40 - 1000 - - 75497536 - 2048 - Preambles - - LucidaGrande - 11 - 3100 - - - 3 - MC4zMzMzMzI5ODU2AA - - - 6 - System - headerTextColor - - 3 - MAA - - - - - 337641536 - 2048 - Text Cell - - - - 6 - System - controlBackgroundColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - - - 3 - YES - YES - - - - 3 - 2 - - 3 - MQA - - - 6 - System - gridColor - - 3 - MC41AA - - - 17 - -968884224 - - - 4 - 15 - 0 - YES - 0 - 1 - - - {{1, 1}, {170, 388}} - - - - - 4 - - - - -2147483392 - {{224, 17}, {15, 102}} - - - NO - - _doScroller: - 0.99742930591259638 - - - - -2147483392 - {{1, 119}, {223, 15}} - - - NO - 1 - - _doScroller: - 0.99415204678362568 - - - {{0, 31}, {172, 390}} - - - 133682 - - - - QSAAAEEgAABBmAAAQZgAAA - 0.25 - 4 - 1 - - - {172, 421} - - - NSView - - - - 256 - - - - 274 - - - - 2304 - - - - 2322 - {484, 419} - - - - - - - - - - - - - - 166 - - - - 484 - 1 - - - 67120999 - 0 - - - - - 6 - System - selectedTextBackgroundColor - - - - 6 - System - selectedTextColor - - - - - - - 1 - MCAwIDEAA - - - {8, -8} - 13 - - - - - - 1 - - 6 - {495, 10000000} - - - - {{1, 1}, {484, 419}} - - - - - - {4, 5} - - 12582912 - - - - - - TU0AKgAAAHCAFUqgBVKsAAAAwdVQUqwaEQeIRGJRGFlYqwWLQ+JxuOQpVRmEx2RROKwOQyOUQSPyaUym -SxqWyKXyeYxyZzWbSuJTScRCbz2Nz+gRKhUOfTqeUai0OSxiWTiBQSHSGFquGwekxyAgAAAOAQAAAwAA -AAEAEAAAAQEAAwAAAAEAEAAAAQIAAwAAAAIACAAIAQMAAwAAAAEABQAAAQYAAwAAAAEAAQAAAREABAAA -AAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEAAgAAARYAAwAAAAEAEAAAARcABAAAAAEAAABnARwAAwAA -AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA - - - - - - 3 - MCAwAA - - - - 4 - - - - 256 - {{469, 1}, {16, 419}} - - NO - - _doScroller: - 1 - 0.85256409645080566 - - - - -2147483392 - {{-100, -100}, {87, 18}} - - - NO - 1 - - _doScroller: - 1 - 0.94565218687057495 - - - {486, 421} - - - 133138 - - - - 0.25 - 4 - 1 - - - {{181, 0}, {486, 421}} - - - NSView - - - {667, 421} - - - YES - - - {667, 421} - - - - {{0, 0}, {1600, 1200}} - {10000000000000, 10000000000000} - YES - - - YES - - - - key - - YES - YES - YES - YES - YES - - - key - YES - compare: - - - YES - key - value - - default - - - - - - - - window - - - - 19 - - - - textView - - - - 21 - - - - setPreamble: - - - - 28 - - - - setPreamble: - - - - 29 - - - - toolbar - - - - 31 - - - - customToolbarItem - - - - 32 - - - - defaultToolbarItem - - - - 33 - - - - insertDefaultStyles: - - - - 38 - - - - preambleDictionaryController - - - - 93 - - - - addPreamble: - - - - 96 - - - - enabled: useDefaultPreamble - - - - - - enabled: useDefaultPreamble - enabled - useDefaultPreamble - - NSValueTransformerName - NSNegateBoolean - - 2 - - - 41 - - - - attributedString: preambleText - - - - - - attributedString: preambleText - attributedString - preambleText - - NSContinuouslyUpdatesValue - - - 2 - - - 34 - - - - editable: useDefaultPreamble - - - - - - editable: useDefaultPreamble - editable - useDefaultPreamble - - NSValueTransformerName - NSNegateBoolean - - 2 - - - 37 - - - - enabled: useDefaultPreamble - - - - - - enabled: useDefaultPreamble - enabled - useDefaultPreamble - - NSValueTransformerName - NSNegateBoolean - - 2 - - - 72 - - - - delegate - - - - 97 - - - - value: arrangedObjects.key - - - - - - value: arrangedObjects.key - value - arrangedObjects.key - 2 - - - 77 - - - - enabled: useDefaultPreamble - - - - - - enabled: useDefaultPreamble - enabled - useDefaultPreamble - - NSValueTransformerName - NSNegateBoolean - - 2 - - - 65 - - - - enabled: useDefaultPreamble - - - - - - enabled: useDefaultPreamble - enabled - useDefaultPreamble - - NSValueTransformerName - NSNegateBoolean - - 2 - - - 68 - - - - contentDictionary: preambles.preambleDict - - - - - - contentDictionary: preambles.preambleDict - contentDictionary - preambles.preambleDict - 2 - - - 81 - - - - remove: - - - - 86 - - - - selectionIndexes: selectionIndexes - - - - - - selectionIndexes: selectionIndexes - selectionIndexes - selectionIndexes - 2 - - - 92 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 1 - - - - - - - - - 2 - - - - - - - - 3 - - - - - - - - - - - 12 - - - - - 13 - - - - - 14 - - - - - 22 - - - - - 27 - - - - - 52 - - - - - - - - - 53 - - - - - - - - - - 54 - - - - - - - - 42 - - - - - - - - - - 45 - - - - - - - - 44 - - - - - 43 - - - - - 47 - - - - - - - - 50 - - - - - 15 - - - - - - - - - - 18 - - - - - 17 - - - - - 16 - - - - - 55 - - - - - - - - 57 - - - - - - - - 58 - - - - - 60 - - - - - 73 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{353, 336}, {667, 421}} - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - 97 - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES - 3 - - {8, 8} - {11, 11} - {10, 3} - {8, 8} - {32, 32} - {32, 32} - {25.602845368302905, 25.602845368302905} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + key + + + default + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tikzit/TikZiT.xcodeproj/project.pbxproj b/tikzit/TikZiT.xcodeproj/project.pbxproj index 0205c67..d672d0d 100644 --- a/tikzit/TikZiT.xcodeproj/project.pbxproj +++ b/tikzit/TikZiT.xcodeproj/project.pbxproj @@ -593,8 +593,6 @@ 5573B90C11DA22E500B5DC5D /* Preamble */ = { isa = PBXGroup; children = ( - 5573B90D11DA231A00B5DC5D /* PreambleController.h */, - 5573B90E11DA231A00B5DC5D /* PreambleController.m */, 5573B92711DA292F00B5DC5D /* Preambles.h */, 5573B92811DA292F00B5DC5D /* Preambles.m */, 5573BDC911DB4D2600B5DC5D /* Preambles+Coder.h */, @@ -739,6 +737,8 @@ 7F18A31E184C563800BC3081 /* Preferences */ = { isa = PBXGroup; children = ( + 5573B90D11DA231A00B5DC5D /* PreambleController.h */, + 5573B90E11DA231A00B5DC5D /* PreambleController.m */, 7F90E88A16DD47540069EBCD /* PreferenceController.h */, 7F90E88B16DD47540069EBCD /* PreferenceController.m */, 7F18A31F184C577000BC3081 /* UpdatePreferenceController.h */, diff --git a/tikzit/src/osx/AppDelegate.m b/tikzit/src/osx/AppDelegate.m index affb95c..35484b7 100644 --- a/tikzit/src/osx/AppDelegate.m +++ b/tikzit/src/osx/AppDelegate.m @@ -49,7 +49,7 @@ NSString *preamblePlist = [supportDir stringByAppendingPathComponent:@"preambles.plist"]; preambleController = - [[PreambleController alloc] initWithWindowNibName:@"Preamble" + [[PreambleController alloc] initWithNibName:@"Preamble" plist:preamblePlist styles:[stylePaletteController nodeStyles] edges:[stylePaletteController edgeStyles]]; @@ -67,7 +67,7 @@ preambleController:preambleController tempDir:tempDir]; - preferenceController = [[PreferenceController alloc] initWithWindowNibName:@"Preferences"]; + preferenceController = [[PreferenceController alloc] initWithWindowNibName:@"Preferences" preambleController:preambleController]; // each application has one global preview controller [PreviewController setDefaultPreviewController:previewController]; diff --git a/tikzit/src/osx/PreambleController.h b/tikzit/src/osx/PreambleController.h index fca52ae..3c7a7c3 100644 --- a/tikzit/src/osx/PreambleController.h +++ b/tikzit/src/osx/PreambleController.h @@ -25,17 +25,14 @@ #import "Preambles.h" #import "Preambles+Coder.h" -@interface PreambleController : NSWindowController { +@interface PreambleController : NSViewController { Preambles *preambles; IBOutlet NSTextView *textView; - IBOutlet NSToolbar *toolbar; - IBOutlet NSToolbarItem *defaultToolbarItem; - IBOutlet NSToolbarItem *customToolbarItem; IBOutlet NSDictionaryController *preambleDictionaryController; + NSDictionary *textAttrs; NSAttributedString *preambleText; NSColor *ghostColor; - NSIndexSet *selectionIndexes; } @@ -44,11 +41,13 @@ @property (retain) NSAttributedString *preambleText; @property (retain) NSIndexSet *selectionIndexes; -- (id)initWithWindowNibName:(NSString *)windowNibName plist:(NSString*)plist styles:(NSArray*)sty edges:(NSArray*)edg; +- (id)initWithNibName:(NSString *)nibName plist:(NSString*)plist styles:(NSArray*)sty edges:(NSArray*)edg; - (void)savePreambles:(NSString*)plist; - (NSString*)currentPreamble; - (NSString*)currentPostamble; - (NSString*)buildDocumentForTikz:(NSString*)tikz; + +- (IBAction)setPreambleToDefault:(id)sender; - (IBAction)setPreamble:(id)sender; - (IBAction)insertDefaultStyles:(id)sender; diff --git a/tikzit/src/osx/PreambleController.m b/tikzit/src/osx/PreambleController.m index af9a778..3e55eaf 100644 --- a/tikzit/src/osx/PreambleController.m +++ b/tikzit/src/osx/PreambleController.m @@ -28,8 +28,8 @@ @synthesize preambleText, preambles; -- (id)initWithWindowNibName:(NSString *)windowNibName plist:(NSString*)plist styles:(NSArray*)sty edges:(NSArray*)edg { - [super initWithWindowNibName:windowNibName]; +- (id)initWithNibName:(NSString *)nibName plist:(NSString*)plist styles:(NSArray*)sty edges:(NSArray*)edg { + [super initWithNibName:nibName bundle:Nil]; preambles = (Preambles*)[NSKeyedUnarchiver unarchiveObjectWithFile:plist]; [preambles setStyles:sty]; @@ -83,17 +83,6 @@ attributes:textAttrs]]; } -- (void)showWindow:(id)sender { - [super showWindow:sender]; - if ([self useDefaultPreamble]) { - [toolbar setSelectedItemIdentifier:[defaultToolbarItem itemIdentifier]]; - } else { - [toolbar setSelectedItemIdentifier:[customToolbarItem itemIdentifier]]; - } - - [self setPreamble:self]; -} - - (void)savePreambles:(NSString*)plist { [self flushText]; [NSKeyedArchiver archiveRootObject:preambles toFile:plist]; @@ -125,11 +114,16 @@ return selectionIndexes; } +- (IBAction)setPreambleToDefault:(id)sender{ + [self setCurrentPreamble:@"default"]; + [textView setBackgroundColor:ghostColor]; +} + - (IBAction)setPreamble:(id)sender { - if ([[toolbar selectedItemIdentifier] isEqualToString:[defaultToolbarItem itemIdentifier]]) { - [self setCurrentPreamble:@"default"]; - [textView setBackgroundColor:ghostColor]; - } else if ([[toolbar selectedItemIdentifier] isEqualToString:[customToolbarItem itemIdentifier]]) { + //if ([[toolbar selectedItemIdentifier] isEqualToString:[defaultToolbarItem itemIdentifier]]) { + // [self setCurrentPreamble:@"default"]; + // [textView setBackgroundColor:ghostColor]; + //} else if ([[toolbar selectedItemIdentifier] isEqualToString:[customToolbarItem itemIdentifier]]) { NSString *key = nil; if ([selectionIndexes count]==1) { int i = [selectionIndexes firstIndex]; @@ -143,7 +137,7 @@ //NSLog(@"preamble set to custom"); } [textView setBackgroundColor:[NSColor whiteColor]]; - } + //} } - (IBAction)insertDefaultStyles:(id)sender { diff --git a/tikzit/src/osx/PreferenceController.h b/tikzit/src/osx/PreferenceController.h index 04fd324..5a14b72 100644 --- a/tikzit/src/osx/PreferenceController.h +++ b/tikzit/src/osx/PreferenceController.h @@ -24,14 +24,17 @@ #import #import "UpdatePreferenceController.h" +#import "PreambleController.h" @interface PreferenceController : NSWindowController{ IBOutlet NSView *engineView; IBOutlet NSView *generalView; IBOutlet NSView *updateView; + IBOutlet NSView *preambleView; UpdatePreferenceController *updateController; + PreambleController *preambleController; int currentViewTag; } diff --git a/tikzit/src/osx/PreferenceController.m b/tikzit/src/osx/PreferenceController.m index 6ccedd0..b08cbeb 100644 --- a/tikzit/src/osx/PreferenceController.m +++ b/tikzit/src/osx/PreferenceController.m @@ -30,6 +30,14 @@ @implementation PreferenceController +- (id)initWithWindowNibName:(NSString *)windowNibName preambleController:(PreambleController*)pc{ + [super initWithWindowNibName:windowNibName]; + + preambleController = pc; + + return self; +} + - (NSRect)newFrameForNewContentView:(NSView*)view { NSWindow *window = [self window]; NSRect newFrameRect = [window frameRectForContentRect:[view frame]]; @@ -51,13 +59,16 @@ default: case 0: view = generalView; - break; + break; case 1: view = engineView; - break; + break; case 2: view = updateView; break; + case 3: + view = preambleView; + break; } return view; @@ -80,6 +91,10 @@ [[updateController view] setFrame:[updateView frame]]; [[[self window] contentView] replaceSubview:updateView with:[updateController view]]; updateView = [updateController view]; + + [[preambleController view] setFrame:[preambleView frame]]; + [[[self window] contentView] replaceSubview:preambleView with:[preambleController view]]; + preambleView = [preambleController view]; } - (IBAction)switchView:(id)sender { diff --git a/tikzit/src/osx/Preferences.xib b/tikzit/src/osx/Preferences.xib index 3cf1677..dc2e979 100644 --- a/tikzit/src/osx/Preferences.xib +++ b/tikzit/src/osx/Preferences.xib @@ -60,7 +60,7 @@ 1 1 - + 197F9408-AFB0-404B-B2B6-4DB1250B0A80 @@ -104,6 +104,25 @@ YES 0 + + + A96DC4D4-2171-4D05-8C08-8D01B3829158 + + Preamble + Preamble + + + + + + {0, 0} + {0, 0} + YES + YES + 3 + YES + 0 + F85FE7C2-9847-4E58-8BF6-BE334E918CA7 @@ -126,13 +145,15 @@ - + + - + - + + @@ -142,7 +163,6 @@ {480, 270} - {{0, 0}, {1680, 1028}} {10000000000000, 10000000000000} @@ -158,7 +178,6 @@ {{18, 15}, {214, 18}} - _NS:9 YES @@ -280,7 +299,6 @@ {{214, 40}, {53, 17}} - _NS:1535 YES @@ -304,14 +322,23 @@ _NS:9 NSView - + 12 {480, 115} - + _NS:9 + NSView + + + + 12 + + {557, 354} + + _NS:9 NSView @@ -365,7 +392,7 @@ switchView: - + 116 @@ -373,10 +400,26 @@ updateView - + 117 + + + switchView: + + + + 120 + + + + preambleView + + + + 121 + delegate @@ -464,7 +507,8 @@ - + + @@ -753,13 +797,23 @@ 64 - + 115 - + + + + + 118 + + + + + 119 + @@ -773,6 +827,8 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -819,7 +875,7 @@ - 117 + 121 @@ -848,6 +904,7 @@ NSView NSView + NSView NSView @@ -859,6 +916,10 @@ generalView NSView + + preambleView + NSView + updateView NSView -- cgit v1.2.3 From bac3d27d19167d398cf9bcd1c6c282ad7a3199fe Mon Sep 17 00:00:00 2001 From: Johan Paulsson Date: Mon, 2 Dec 2013 11:48:35 -0800 Subject: osx gui: Cosmetic changes to preference window Added icons for the three tabs and moved the preamble to be default tab as that is likely to be the one most users will want to go to first. --- tikzit/TikZiT.xcodeproj/project.pbxproj | 20 ++++ tikzit/engine.png | Bin 0 -> 1546 bytes tikzit/preamble.png | Bin 0 -> 851 bytes tikzit/src/osx/PreferenceController.m | 10 +- tikzit/src/osx/Preferences.xib | 161 ++++++++------------------------ tikzit/updates.png | Bin 0 -> 1953 bytes 6 files changed, 64 insertions(+), 127 deletions(-) create mode 100755 tikzit/engine.png create mode 100755 tikzit/preamble.png create mode 100755 tikzit/updates.png diff --git a/tikzit/TikZiT.xcodeproj/project.pbxproj b/tikzit/TikZiT.xcodeproj/project.pbxproj index d672d0d..3f4b2a5 100644 --- a/tikzit/TikZiT.xcodeproj/project.pbxproj +++ b/tikzit/TikZiT.xcodeproj/project.pbxproj @@ -137,6 +137,9 @@ 7F90E88D16DD47540069EBCD /* PreferenceController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F90E88B16DD47540069EBCD /* PreferenceController.m */; }; 7F90E88E16DD47540069EBCD /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7F90E88C16DD47540069EBCD /* Preferences.xib */; }; 7F90E89116DD54440069EBCD /* UserDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 7F90E88F16DD54440069EBCD /* UserDefaults.plist */; }; + 7F93852E184D176E00FAED38 /* updates.png in Resources */ = {isa = PBXBuildFile; fileRef = 7F93852D184D176E00FAED38 /* updates.png */; }; + 7F938530184D178B00FAED38 /* engine.png in Resources */ = {isa = PBXBuildFile; fileRef = 7F93852F184D178B00FAED38 /* engine.png */; }; + 7F938532184D184700FAED38 /* preamble.png in Resources */ = {isa = PBXBuildFile; fileRef = 7F938531184D184700FAED38 /* preamble.png */; }; 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 */; }; @@ -386,6 +389,9 @@ 7F90E88B16DD47540069EBCD /* PreferenceController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PreferenceController.m; path = src/osx/PreferenceController.m; sourceTree = ""; }; 7F90E88C16DD47540069EBCD /* Preferences.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = Preferences.xib; path = src/osx/Preferences.xib; sourceTree = ""; }; 7F90E89016DD54440069EBCD /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = English; path = English.lproj/UserDefaults.plist; sourceTree = ""; }; + 7F93852D184D176E00FAED38 /* updates.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = updates.png; sourceTree = ""; }; + 7F93852F184D178B00FAED38 /* engine.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = engine.png; sourceTree = ""; }; + 7F938531184D184700FAED38 /* preamble.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = preamble.png; sourceTree = ""; }; 7FB9BFEC16B57C2E00773146 /* TikzFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TikzFormatter.h; path = src/osx/TikzFormatter.h; sourceTree = ""; }; 7FB9BFED16B57C2E00773146 /* TikzFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TikzFormatter.m; path = src/osx/TikzFormatter.m; sourceTree = ""; }; 7FEED45516B1A7C400B056CB /* StyleManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StyleManager.h; path = src/common/StyleManager.h; sourceTree = ""; }; @@ -501,6 +507,7 @@ 55397C841449A9BF006942FB /* ED_none.png */, 55397C821449A8F1006942FB /* ED_tick.png */, 55397C801449A877006942FB /* ED_arrow.png */, + 7F93852C184D175400FAED38 /* Icons */, 55652E5013E1FC660023F4C6 /* shapes */, 55900AE2135FB305002DD28E /* emblem-unreadable-grey.png */, 55E5E99D1215C8E300256F69 /* transform-crop-and-resize.png */, @@ -747,6 +754,16 @@ name = Preferences; sourceTree = ""; }; + 7F93852C184D175400FAED38 /* Icons */ = { + isa = PBXGroup; + children = ( + 7F93852F184D178B00FAED38 /* engine.png */, + 7F938531184D184700FAED38 /* preamble.png */, + 7F93852D184D176E00FAED38 /* updates.png */, + ); + name = Icons; + sourceTree = ""; + }; 7FB9BFE616B54BE300773146 /* Formatter */ = { isa = PBXGroup; children = ( @@ -835,7 +852,9 @@ files = ( 8D15AC2C0486D014006FF6A4 /* Credits.rtf in Resources */, 8D15AC2F0486D014006FF6A4 /* InfoPlist.strings in Resources */, + 7F938532184D184700FAED38 /* preamble.png in Resources */, 1DDD582C0DA1D0D100B32029 /* TikzDocument.xib in Resources */, + 7F938530184D178B00FAED38 /* engine.png in Resources */, 1DDD582D0DA1D0D100B32029 /* MainMenu.xib in Resources */, 55D945721165904F0044178C /* tikzitdoc.icns in Resources */, 55D945731165904F0044178C /* tikzit.icns in Resources */, @@ -844,6 +863,7 @@ 55D949151165D8870044178C /* draw-path.png in Resources */, 55D949161165D8870044178C /* select-rectangular.png in Resources */, 559EFA5711C7D95F00D020F4 /* tikzit_dsa_pub.pem in Resources */, + 7F93852E184D176E00FAED38 /* updates.png in Resources */, 555B30F911D8BE3300CAECF5 /* emblem-important.png in Resources */, 55391AF613D324FE007DBE71 /* Preview.xib in Resources */, 55391AF813D3250F007DBE71 /* Preamble.xib in Resources */, diff --git a/tikzit/engine.png b/tikzit/engine.png new file mode 100755 index 0000000..1e45370 Binary files /dev/null and b/tikzit/engine.png differ diff --git a/tikzit/preamble.png b/tikzit/preamble.png new file mode 100755 index 0000000..d940d24 Binary files /dev/null and b/tikzit/preamble.png differ diff --git a/tikzit/src/osx/PreferenceController.m b/tikzit/src/osx/PreferenceController.m index b08cbeb..ab992ed 100644 --- a/tikzit/src/osx/PreferenceController.m +++ b/tikzit/src/osx/PreferenceController.m @@ -82,19 +82,23 @@ } - (void)awakeFromNib { - + [[self window] setContentSize:[generalView frame].size]; [[[self window] contentView] addSubview:generalView]; [[[self window] contentView] setWantsLayer:YES]; - + updateController = [[UpdatePreferenceController alloc] initWithNibName:@"UpdatePreferencePanel" bundle:nil]; [[updateController view] setFrame:[updateView frame]]; [[[self window] contentView] replaceSubview:updateView with:[updateController view]]; updateView = [updateController view]; - + [[preambleController view] setFrame:[preambleView frame]]; [[[self window] contentView] replaceSubview:preambleView with:[preambleController view]]; preambleView = [preambleController view]; + + [[self window] setContentSize:[preambleView frame].size]; + [[[self window] contentView] addSubview:preambleView]; + currentViewTag = 3; } - (IBAction)switchView:(id)sender { diff --git a/tikzit/src/osx/Preferences.xib b/tikzit/src/osx/Preferences.xib index dc2e979..8247c8d 100644 --- a/tikzit/src/osx/Preferences.xib +++ b/tikzit/src/osx/Preferences.xib @@ -42,11 +42,11 @@ NSApplication - 15 + 7 2 {{196, 240}, {480, 270}} - 544735232 - Window + 544736256 + Preferences NSWindow @@ -64,13 +64,13 @@ 197F9408-AFB0-404B-B2B6-4DB1250B0A80 - Update - Update + Updates + Updates NSImage - NSUserAccounts + updates @@ -90,7 +90,7 @@ General - + NSImage NSPreferencesGeneral @@ -104,7 +104,7 @@ YES 0 - + A96DC4D4-2171-4D05-8C08-8D01B3829158 @@ -112,7 +112,10 @@ Preamble - + + NSImage + preamble + {0, 0} @@ -131,7 +134,10 @@ Engine - + + NSImage + engine + {0, 0} @@ -143,16 +149,15 @@ 0 - + - + - + - @@ -163,6 +168,7 @@ {480, 270} + {{0, 0}, {1680, 1028}} {10000000000000, 10000000000000} @@ -178,6 +184,7 @@ {{18, 15}, {214, 18}} + _NS:9 YES @@ -262,7 +269,7 @@ _NS:1535 - + 6 System controlColor @@ -271,7 +278,7 @@ MC42NjY2NjY2NjY3AA - + 6 System controlTextColor @@ -292,33 +299,11 @@ 268 - - - - 268 - {{214, 40}, {53, 17}} - - - _NS:1535 - YES - - 68157504 - 272630784 - General - - _NS:1535 - - - - - NO - 1 - - + {480, 96} - + _NS:9 NSView @@ -329,16 +314,18 @@ {480, 115} + _NS:9 NSView - + 12 {557, 354} + _NS:9 NSView @@ -408,7 +395,7 @@ switchView: - + 120 @@ -416,7 +403,7 @@ preambleView - + 121 @@ -508,7 +495,7 @@ - + @@ -654,43 +641,7 @@ 14 - - - - 10 - 0 - - 10 - 1 - - 0.0 - - 1000 - - 5 - 22 - 2 - NO - - - - 9 - 0 - - 9 - 1 - - 0.0 - - 1000 - - 5 - 22 - 2 - NO - - - + @@ -706,29 +657,6 @@ - - 19 - - - - - - - - 20 - - - - - 28 - - - - - 29 - - - 30 @@ -808,12 +736,12 @@ 118 - + 119 - + @@ -840,20 +768,11 @@ com.apple.InterfaceBuilder.CocoaPlugin - - - - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -879,14 +798,6 @@ - - NSLayoutConstraint - NSObject - - IBProjectSource - ./Classes/NSLayoutConstraint.h - - PreferenceController NSWindowController @@ -948,7 +859,9 @@ {32, 32} {15, 15} - {32, 32} + {32, 32} + {32, 32} + {32, 32} YES diff --git a/tikzit/updates.png b/tikzit/updates.png new file mode 100755 index 0000000..469ae30 Binary files /dev/null and b/tikzit/updates.png differ -- cgit v1.2.3 From 5506611ee009498f1f9bce89b6e6735b19d6b137 Mon Sep 17 00:00:00 2001 From: Johan Paulsson Date: Fri, 14 Feb 2014 17:53:26 +0000 Subject: Fix for crash when moving too close to each other Dividing by wrong variable causes the program to crash when moving nodes too close to each. --- tikzit/src/osx/GraphicsView.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tikzit/src/osx/GraphicsView.m b/tikzit/src/osx/GraphicsView.m index 49b1af6..efa7ecb 100644 --- a/tikzit/src/osx/GraphicsView.m +++ b/tikzit/src/osx/GraphicsView.m @@ -829,8 +829,8 @@ static CGColorRef cgGrayColor, cgWhiteColor, cgClearColor = nil; float tdx = cp2.x - targ.x; float tdy = cp2.y - targ.y; float tdist = sqrt(tdx*tdx + tdy*tdy); - float tshortx = (tdist==0) ? 0 : tdx/sdist * tradius; - float tshorty = (tdist==0) ? 0 : tdy/sdist * tradius; + float tshortx = (tdist==0) ? 0 : tdx/tdist * tradius; + float tshorty = (tdist==0) ? 0 : tdy/tdist * tradius; CGContextMoveToPoint(context, src.x+sshortx, src.y+sshorty); CGContextAddCurveToPoint(context, cp1.x, cp1.y, cp2.x, cp2.y, targ.x+tshortx, targ.y+tshorty); -- cgit v1.2.3 From 2d6b88d5d016237acbc8cb63f2cf2477ccfe9e69 Mon Sep 17 00:00:00 2001 From: Johan Paulsson Date: Sun, 23 Mar 2014 02:45:56 +0000 Subject: osx gui: initial creation of custom node shapes preference panel --- tikzit/customshape.png | Bin 0 -> 1281 bytes tikzit/src/osx/CustomNodeCellView.h | 23 +++++++++ tikzit/src/osx/CustomNodeCellView.m | 79 ++++++++++++++++++++++++++++++ tikzit/src/osx/CustomNodeController.h | 33 +++++++++++++ tikzit/src/osx/CustomNodeController.m | 89 ++++++++++++++++++++++++++++++++++ tikzit/src/osx/CustomNodes.xib | 15 ++++++ 6 files changed, 239 insertions(+) create mode 100755 tikzit/customshape.png create mode 100644 tikzit/src/osx/CustomNodeCellView.h create mode 100644 tikzit/src/osx/CustomNodeCellView.m create mode 100644 tikzit/src/osx/CustomNodeController.h create mode 100644 tikzit/src/osx/CustomNodeController.m create mode 100644 tikzit/src/osx/CustomNodes.xib diff --git a/tikzit/customshape.png b/tikzit/customshape.png new file mode 100755 index 0000000..cff8275 Binary files /dev/null and b/tikzit/customshape.png differ diff --git a/tikzit/src/osx/CustomNodeCellView.h b/tikzit/src/osx/CustomNodeCellView.h new file mode 100644 index 0000000..5b3b1ee --- /dev/null +++ b/tikzit/src/osx/CustomNodeCellView.h @@ -0,0 +1,23 @@ +// +// CustomNodeCellView.h +// TikZiT +// +// Created by Johan Paulsson on 12/12/13. +// Copyright (c) 2013 Aleks Kissinger. All rights reserved. +// + +#import + +#import "NodeLayer.h" +#import "NodeStyle.h" +#import "NodeStyle+Coder.h" + +@interface CustomNodeCellView : NSTableCellView{ + NodeLayer *nodeLayer; + NodeStyle *nodeStyle; + BOOL selected; +} + +@property (retain) id objectValue; + +@end diff --git a/tikzit/src/osx/CustomNodeCellView.m b/tikzit/src/osx/CustomNodeCellView.m new file mode 100644 index 0000000..57ef24a --- /dev/null +++ b/tikzit/src/osx/CustomNodeCellView.m @@ -0,0 +1,79 @@ +// +// CustomNodeCellView.m +// TikZiT +// +// Created by Johan Paulsson on 12/12/13. +// Copyright (c) 2013 Aleks Kissinger. All rights reserved. +// + +#import "CustomNodeCellView.h" + +@implementation CustomNodeCellView + +- (id)initWithFrame:(NSRect)frame +{ + self = [super initWithFrame:frame]; + if (self) { + // Initialization code here. + } + return self; +} + +- (void)drawRect:(NSRect)dirtyRect +{ + [super drawRect:dirtyRect]; + + // Drawing code here. +} + +- (id) objectValue{ + return [super objectValue]; +} + +-(void)drawLayer:(CALayer *)layer inContext:(CGContextRef)context { + NSLog(@"drawing layer ^^"); + + if (nodeLayer!=nil) { + if (![[[self layer] sublayers] containsObject:nodeLayer]) { + [[self layer] addSublayer:nodeLayer]; + NSPoint c = NSMakePoint((CGRectGetMinX([[self layer] frame])+CGRectGetWidth([nodeLayer bounds])/2), + CGRectGetMidY([[self layer] frame])); + //c = NSMakePoint(-16.5,-16.5); + [nodeLayer setCenter:c andAnimateWhen:NO]; + [[self textField] setFrame:NSMakeRect(CGRectGetWidth([nodeLayer bounds]), CGRectGetMidY([[self layer] frame]), CGRectGetWidth([[self textField] frame]), CGRectGetHeight([[self textField] frame]))]; + } + + if (selected){ + [nodeStyle setStrokeColor:[NSColor whiteColor]]; + [[nodeLayer node] setStyle:nodeStyle]; + }else{ + [nodeStyle setStrokeColor:[NSColor blackColor]]; + [[nodeLayer node] setStyle:nodeStyle]; + } + + [nodeLayer updateFrame]; + } +} + +- (void) setObjectValue:(id)objectValue{ + [[self textField] setStringValue:[(NodeStyle *)objectValue shapeName]]; + nodeStyle = (NodeStyle *)objectValue; + + if (nodeLayer == nil) { + nodeLayer = [[NodeLayer alloc] initWithNode:[Node node] + transformer:[Transformer defaultTransformer]]; + [nodeLayer setRescale:NO]; + } + + [[nodeLayer node] setStyle:nodeStyle]; + [nodeLayer updateFrame]; +} + +- (void)setBackgroundStyle:(NSBackgroundStyle)backgroundStyle { + [super setBackgroundStyle:backgroundStyle]; + + selected = (backgroundStyle == NSBackgroundStyleDark); + [self setNeedsDisplay:YES]; +} + +@end diff --git a/tikzit/src/osx/CustomNodeController.h b/tikzit/src/osx/CustomNodeController.h new file mode 100644 index 0000000..55f0e0b --- /dev/null +++ b/tikzit/src/osx/CustomNodeController.h @@ -0,0 +1,33 @@ +// +// CustomNodeController.h +// TikZiT +// +// Created by Johan Paulsson on 12/4/13. +// Copyright (c) 2013 Aleks Kissinger. All rights reserved. +// + +#import +#import "Shape.h" +#import "TikzShape.h" + +#import "GraphicsView.h" +#import "TikzSourceController.h" + +#import "SupportDir.h" + +@interface CustomNodeController : NSViewController { + NSDictionary* nodeStyles; + NSMutableArray* customNodeStyles; + NSMutableArray* onodeStyles; + + GraphicsView *graphicsView; + TikzSourceController *tikzSourceController; +} + +@property (readonly) NSDictionary *nodeStyles; +@property (readonly) NSMutableArray* onodeStyles; + +@property IBOutlet GraphicsView *graphicsView; +@property IBOutlet TikzSourceController *tikzSourceController; + +@end diff --git a/tikzit/src/osx/CustomNodeController.m b/tikzit/src/osx/CustomNodeController.m new file mode 100644 index 0000000..ef6b5bd --- /dev/null +++ b/tikzit/src/osx/CustomNodeController.m @@ -0,0 +1,89 @@ +// +// CustomNodeController.m +// TikZiT +// +// Created by Johan Paulsson on 12/4/13. +// Copyright (c) 2013 Aleks Kissinger. All rights reserved. +// + +#import "CustomNodeController.h" +#import "NodeStyle.h" + +@interface CustomNodeController () + +@end + +@implementation CustomNodeController + +@synthesize nodeStyles, onodeStyles; +@synthesize graphicsView, tikzSourceController; + +- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil +{ + if (self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]) { +// [SupportDir createUserSupportDir]; +// NSString *supportDir = [SupportDir userSupportDir]; + +// NSString *ns = [supportDir stringByAppendingPathComponent:@"nodeStyles.plist"]; +// NSString *es = [supportDir stringByAppendingPathComponent:@"edgeStyles.plist"]; +// onodeStyles = (NSMutableArray*)[NSKeyedUnarchiver +// unarchiveObjectWithFile:ns]; + // edgeStyles = (NSMutableArray*)[NSKeyedUnarchiver +// unarchiveObjectWithFile:es]; + + if (onodeStyles == nil) onodeStyles = [NSMutableArray array]; +// if (edgeStyles == nil) edgeStyles = [NSMutableArray array]; + +// [[self window] setLevel:NSNormalWindowLevel]; +// [self showWindow:self]; + + // Initialization code here. + + NSLog(@"Custom Node controller up and running!"); + + nodeStyles= [Shape shapeDictionary]; + + customNodeStyles = [NSMutableArray array]; + + NSLog(@"Got a shape dictionary?"); + + NSString *meh; + + for(id key in nodeStyles) { + Shape *value = [nodeStyles objectForKey:key]; + + if([value isKindOfClass:[TikzShape class]]){ + NSLog(@"Got a custom node shape!"); + NodeStyle *newNodeStyle = [[NodeStyle alloc] init]; + [newNodeStyle setShapeName:key]; + + [customNodeStyles addObject:newNodeStyle]; + [onodeStyles addObject:newNodeStyle]; + +// meh = [(TikzShape *) value tikz]; + } + } + + NSLog(@"Trying to display tikz."); + +// [tikzSourceController setTikz:meh]; +// [tikzSourceController parseTikz:self]; + } + + return self; +} + +-(NSArray *)onodeStyles{ + return onodeStyles; + //return [nodeStyles allValues]; +} + +- (void)tableViewSelectionDidChange:(NSNotification *)aNotification{ + NSLog(@"Changed selection!"); +} + +- (id)valueForUndefinedKey:(NSString *)key{ + return nil; +} + +@end diff --git a/tikzit/src/osx/CustomNodes.xib b/tikzit/src/osx/CustomNodes.xib new file mode 100644 index 0000000..8b2587a --- /dev/null +++ b/tikzit/src/osx/CustomNodes.xib @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file -- cgit v1.2.3 From 5532f8878b7219720de6145eabbe57efb894957c Mon Sep 17 00:00:00 2001 From: Johan Paulsson Date: Sun, 23 Mar 2014 02:48:06 +0000 Subject: Converting from GC to ARC This should only be for the osx specific code as all common files are left out. Hopefully this shouldn't introduce any problems on the other systems. --- tikzit/English.lproj/StylePalette.xib | 4114 ++++---------------------- tikzit/English.lproj/TikzDocument.xib | 1025 +------ tikzit/TikZiT.xcodeproj/project.pbxproj | 166 +- tikzit/src/osx/AppDelegate.h | 4 +- tikzit/src/osx/CustomNodeCellView.h | 2 +- tikzit/src/osx/CustomNodeController.h | 16 +- tikzit/src/osx/CustomNodes.xib | 242 +- tikzit/src/osx/EdgeControlLayer.m | 2 +- tikzit/src/osx/EdgeStyle+Coder.m | 2 +- tikzit/src/osx/GraphicsView.h | 6 +- tikzit/src/osx/Grid.m | 2 +- tikzit/src/osx/NilToEmptyStringTransformer.m | 2 +- tikzit/src/osx/NodeLayer.h | 6 +- tikzit/src/osx/NodeLayer.m | 3 +- tikzit/src/osx/NodeSelectionLayer.h | 4 +- tikzit/src/osx/NodeSelectionLayer.m | 2 +- tikzit/src/osx/NodeStyle+Coder.m | 2 +- tikzit/src/osx/PreambleController.h | 4 +- tikzit/src/osx/PreambleController.m | 2 +- tikzit/src/osx/Preambles+Coder.m | 2 +- tikzit/src/osx/PreferenceController.h | 5 + tikzit/src/osx/PreferenceController.m | 12 +- tikzit/src/osx/Preferences.xib | 74 +- tikzit/src/osx/PreviewController.m | 2 +- tikzit/src/osx/PropertyInspectorController.h | 10 +- tikzit/src/osx/PropertyInspectorController.m | 2 +- tikzit/src/osx/SelectBoxLayer.m | 4 +- tikzit/src/osx/SelectableNodeView.h | 2 +- tikzit/src/osx/SelectableNodeView.m | 2 +- tikzit/src/osx/StylePaletteController.h | 16 +- tikzit/src/osx/TikzDocument.h | 2 +- tikzit/src/osx/TikzFormatter.m | 4 - tikzit/src/osx/TikzSourceController.h | 24 +- tikzit/src/osx/TikzSourceController.m | 9 +- tikzit/src/osx/TikzWindowController.h | 8 +- tikzit/src/osx/TikzWindowController.m | 2 +- tikzit/src/osx/ToolPaletteController.h | 8 +- 37 files changed, 1301 insertions(+), 4493 deletions(-) diff --git a/tikzit/English.lproj/StylePalette.xib b/tikzit/English.lproj/StylePalette.xib index 2d3472c..6385ba8 100644 --- a/tikzit/English.lproj/StylePalette.xib +++ b/tikzit/English.lproj/StylePalette.xib @@ -1,3483 +1,631 @@ - - - - 1070 - 12C60 - 2843 - 1187.34 - 625.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 2843 - - - YES - NSArrayController - NSButton - NSButtonCell - NSCollectionView - NSCollectionViewItem - NSColorWell - NSComboBox - NSComboBoxCell - NSCustomObject - NSCustomView - NSMenu - NSMenuItem - NSPopUpButton - NSPopUpButtonCell - NSScrollView - NSScroller - NSSlider - NSSliderCell - NSTableColumn - NSTableView - NSTextField - NSTextFieldCell - NSView - NSWindowTemplate - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - YES - - StylePaletteController - - - FirstResponder - - - NSApplication - - - 151 - 2 - {{1005, 473}, {193, 313}} - -1538259968 - Style Inspector - NSPanel - - - {200, 230} - - - 256 - - YES - - - 274 - {193, 313} - - - SFBInspectorView - - - {193, 313} - - - - {{0, 0}, {1600, 1200}} - {200, 246} - {10000000000000, 10000000000000} - YES - - - - 268 - {33, 33} - - - YES - SelectableNodeView - - - - - 268 - - YES - - - 268 - {{67, 164}, {122, 23}} - - - YES - - 342884416 - 272630784 - - - LucidaGrande - 10 - 16 - - - YES - - 6 - System - textBackgroundColor - - 3 - MQA - - - - 6 - System - controlTextColor - - 3 - MAA - - - 5 - YES - - - - 274 - {13, 0} - - - YES - NO - YES - - YES - - 10 - 10 - 1000 - - 75497472 - 0 - - - LucidaGrande - 12 - 16 - - - 3 - MC4zMzMzMzI5ODU2AA - - - - - 338690112 - 1024 - - - YES - - 6 - System - controlBackgroundColor - - 3 - MC42NjY2NjY2NjY3AA - - - - - 3 - YES - - - - 3 - 2 - - - 6 - System - gridColor - - 3 - MC41AA - - - 15 - tableViewAction: - -765427712 - - - - 1 - 15 - 0 - YES - 0 - 1 - - - NO - - - - 268 - {{67, 193}, {28, 18}} - - - YES - - -1804599231 - 272630784 - - - - YES - - - 6 - System - textColor - - - - NO - - - - 268 - {{101, 188}, {87, 26}} - - - YES - - 67108864 - 0 - - - 5 - 0.20000000000000001 - 1 - 0.0 - 25 - 1 - YES - NO - - NO - - - - 268 - {{64, 269}, {125, 26}} - - - YES - - -2076180416 - 2048 - - LucidaGrande - 11 - 16 - - - 109199360 - 129 - - - 400 - 75 - - YES - - OtherViews - - YES - - - LucidaGrande - 13 - 1044 - - - -1 - 1 - YES - YES - 2 - - NO - - - - 268 - {{97, 217}, {21, 22}} - - - YES - - 67108864 - 0 - - - - -2039201792 - 6 - - NSImage - emblem-important - - - - 400 - 75 - - NO - - - - 268 - {{97, 243}, {21, 22}} - - - YES - - 67108864 - 0 - - - - -2039201792 - 6 - - - - 400 - 75 - - NO - - - - 268 - {{4, 169}, {57, 14}} - - - YES - - 68157504 - 4195328 - Category - - LucidaGrande-Bold - 11 - 16 - - - - 6 - System - controlColor - - - - - NO - - - - 268 - {{5, 194}, {57, 14}} - - - YES - - 68157504 - 4195328 - Scale - - - - - - NO - - - - 266 - {{67, 301}, {119, 19}} - - - YES - - -1804599231 - 272630784 - - - - YES - - - - NO - - - - 268 - {{4, 303}, {57, 14}} - - - YES - - 68157504 - 4195328 - Name - - - - - - NO - - - - 268 - {{4, 275}, {57, 14}} - - - YES - - 68157504 - 4195328 - Shape - - - - - - NO - - - - 268 - {{4, 220}, {56, 14}} - - - YES - - 68157504 - 4195328 - Fill - - - - - - NO - - - - 268 - {{4, 247}, {57, 14}} - - - YES - - 68157504 - 4195328 - Stroke - - - - - - NO - - - - 268 - - YES - - YES - NSColor pasteboard type - - - {{67, 216}, {28, 23}} - - - YES - NO - YES - - 1 - MC4wNTgxMzA0OTg5OCAwLjA1NTU0MTg5OTA2IDEAA - - - - - 268 - - YES - - YES - NSColor pasteboard type - - - {{67, 243}, {28, 23}} - - - YES - NO - YES - - 1 - MC4wNTgxMzA0OTg5OCAwLjA1NTU0MTg5OTA2IDEAA - - - - - 268 - {{64, 137}, {125, 26}} - - - YES - - -2076180416 - 2048 - - - 109199360 - 129 - - - 400 - 75 - - YES - - OtherViews - - YES - - - - -1 - 1 - YES - YES - 2 - - NO - - - - 268 - {{4, 143}, {57, 14}} - - - YES - - 68157504 - 4195328 - Show - - - - - - NO - - - - 292 - {{110, 5}, {52, 26}} - - - YES - - -2080374784 - 134217728 - Clear - - - -2038022144 - 162 - - - - 400 - 75 - - NO - - - - 292 - {{59, 5}, {52, 26}} - - - YES - - -2080374784 - 134217728 - Apply - - - -2038022144 - 162 - - - - 400 - 75 - - NO - - - - 292 - {{30, 5}, {26, 26}} - - - YES - - -2080374784 - 134217728 - - - - -2033434624 - 162 - - NSImage - NSRemoveTemplate - - - - 400 - 75 - - NO - - - - 292 - {{5, 5}, {26, 26}} - - - YES - - -2080374784 - 134217728 - - - - -2033434624 - 162 - - NSImage - NSAddTemplate - - - - 400 - 75 - - NO - - - - 274 - - YES - - - 2304 - - YES - - - 274 - {181, 99} - - - {0, 0} - {0, 0} - 0 - 0 - - YES - - - YES - -1 - 0 - - - {{1, 1}, {181, 99}} - - - - - 4 - - - - -2147483392 - {{234, 1}, {15, 143}} - - - NO - - _doScroller: - 1 - 0.89655172824859619 - - - - -2147483392 - {{1, 144}, {233, 15}} - - - NO - 1 - - _doScroller: - 0.63157892227172852 - - - {{5, 34}, {183, 101}} - - - 133682 - - - - 0.25 - 4 - 1 - - - {193, 326} - - - NSView - - - - YES - name - strokeThickness - strokeColor - fillColor - strokeColorIsKnown - fillColorIsKnown - representedObject.name - shapeName - scale - @distinctUnionOfObjects.category - category - - NodeStyle - YES - - YES - YES - YES - YES - YES - - - - YES - @distinctUnionOfObjects.category - - YES - - YES - YES - YES - YES - YES - - - - 268 - - YES - - - 268 - {{66, 105}, {125, 26}} - - - YES - - -2076180416 - 2048 - - - 109199360 - 129 - - - 400 - 75 - - YES - - OtherViews - - YES - - - - -1 - 1 - YES - YES - 2 - - NO - - - - 268 - {{6, 111}, {57, 14}} - - - YES - - 68157504 - 4195328 - Show - - - - - - NO - - - - 268 - - YES - - - 2304 - - YES - - - 256 - {180, 68} - - - _NS:1197 - YES - NO - YES - - - -2147483392 - {{224, 0}, {16, 17}} - _NS:1202 - - - YES - - 177 - 40 - 1000 - - 75497536 - 2048 - - - LucidaGrande - 11 - 3100 - - - 3 - MC4zMzMzMzI5ODU2AA - - - 6 - System - headerTextColor - - - - - 337641536 - 2048 - Text Cell - - - - - - 3 - YES - YES - - - - 3 - 2 - - - 17 - -700448768 - - - 4 - 15 - 0 - YES - 0 - 1 - - - {{1, 1}, {180, 68}} - - - _NS:1195 - - - 4 - - - - -2147483392 - {{224, 17}, {15, 102}} - - - _NS:1214 - NO - - _doScroller: - 0.98863636363636365 - - - - -2147483392 - {{1, 73}, {143, 15}} - - - _NS:1216 - NO - 1 - - _doScroller: - 0.99447513812154698 - - - {{6, 33}, {182, 70}} - - - _NS:1193 - 133682 - - - - QSAAAEEgAABBmAAAQZgAAA - 0.25 - 4 - 1 - - - - 268 - {{133, 155}, {60, 26}} - - - _NS:179 - YES - - -2076180416 - 67110912 - - _NS:179 - - 109199360 - 129 - - - 400 - 75 - - - - - 2147483647 - 1 - - NSImage - AH_none - - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - _popUpItemAction: - - - YES - - OtherViews - - YES - - - - - - 2147483647 - - NSImage - AH_plain_head - - - - _popUpItemAction: - 1 - - - - - - - 2147483647 - - NSImage - AH_latex_head - - - - _popUpItemAction: - 2 - - - - - - 1 - YES - YES - 2 - - NO - - - - 268 - {{2, 155}, {60, 26}} - - - _NS:179 - YES - - -2076180416 - 2048 - - _NS:179 - - 109199360 - 129 - - - 400 - 75 - - - - - 2147483647 - 1 - - - - _popUpItemAction: - - - YES - - OtherViews - - YES - - - - - - 2147483647 - - NSImage - AH_plain_tail - - - - _popUpItemAction: - 1 - - - - - - - 2147483647 - - NSImage - AH_latex_tail - - - - _popUpItemAction: - 2 - - - - - - 1 - YES - YES - 2 - - NO - - - - 268 - {{69, 132}, {122, 23}} - - - YES - - 342884416 - 272630784 - - - - YES - - - 5 - YES - - - - 274 - {13, 0} - - - YES - NO - YES - - YES - - 10 - 10 - 1000 - - 75497472 - 0 - - - - 3 - MC4zMzMzMzI5ODU2AA - - - - - 338690112 - 1024 - - - YES - - - - 3 - YES - - - - 3 - 2 - - - 15 - tableViewAction: - -765427712 - - - - 1 - 15 - 0 - YES - 0 - 1 - - - NO - - - - 268 - {{6, 137}, {57, 14}} - - - YES - - 68157504 - 4195328 - Category - - - - - - NO - - - - 268 - {{59, 155}, {77, 26}} - - - _NS:179 - YES - - -2076180416 - 2048 - - _NS:179 - - 109199360 - 129 - - - 400 - 75 - - - - - 2147483647 - 1 - - NSImage - ED_none - - - - _popUpItemAction: - - - YES - - Edge Decoration - - YES - - - - - - 2147483647 - - NSImage - ED_arrow - - - - _popUpItemAction: - 1 - - - - - - - 2147483647 - - NSImage - ED_tick - - - - _popUpItemAction: - 2 - - - - - - 1 - YES - YES - 2 - - NO - - - - 266 - {{69, 183}, {119, 19}} - - - YES - - -1804599231 - 272630784 - - - - YES - - - - NO - - - - 268 - {{6, 185}, {57, 14}} - - - YES - - 68157504 - 4195328 - Name - - - - - - NO - - - - 292 - {{111, 4}, {52, 26}} - - YES - - -2080374784 - 134217728 - Clear - - - -2038022144 - 162 - - - - 400 - 75 - - NO - - - - 292 - {{60, 4}, {52, 26}} - - - YES - - -2080374784 - 134217728 - Apply - - - -2038022144 - 162 - - - - 400 - 75 - - NO - - - - 292 - {{31, 4}, {26, 26}} - - - YES - - -2080374784 - 134217728 - - - - -2033434624 - 162 - - - - 400 - 75 - - NO - - - - 292 - {{6, 4}, {26, 26}} - - - YES - - -2080374784 - 134217728 - - - - -2033434624 - 162 - - - - 400 - 75 - - NO - - - {193, 208} - - _NS:499 - NSView - - - - YES - name - headStyle - tailStyle - decorationStyle - category - - EdgeStyle - YES - - YES - YES - YES - YES - YES - - - - YES - name - headStyle - tailStyle - decorationStyle - category - - EdgeStyle - YES - - YES - YES - YES - YES - YES - - - - - YES - - - window - - - - 5 - - - - collectionView - - - - 73 - - - - refreshCollection: - - - - 74 - - - - refreshCollection: - - - - 75 - - - - setStrokeToClosestHashed: - - - - 176 - - - - setFillToClosestHashed: - - - - 177 - - - - shapeDropdown - - - - 497 - - - - nodeStyleView - - - - 650 - - - - edgeStyleView - - - - 651 - - - - nodeStyleArrayController - - - - 652 - - - - nodeStyleInspectorView - - - - 653 - - - - addNodeStyle: - - - - 727 - - - - applyActiveNodeStyle: - - - - 729 - - - - clearActiveNodeStyle: - - - - 731 - - - - filteredNodeStyleArrayController - - - - 733 - - - - edgeStyleArrayController - - - - 734 - - - - addEdgeStyle: - - - - 735 - - - - appleActiveEdgeStyle: - - - - 737 - - - - clearActiveEdgeStyle: - - - - 738 - - - - filteredEdgeStyleArrayController - - - - 818 - - - - value: selection.strokeColor - - - - - - value: selection.strokeColor - value - selection.strokeColor - 2 - - - 636 - - - - value: selection.fillColor - - - - - - value: selection.fillColor - value - selection.fillColor - 2 - - - 638 - - - - value: selection.name - - - - - - value: selection.name - value - selection.name - 2 - - - 634 - - - - itemPrototype - - - - 55 - - - - delegate - - - - 505 - - - - content: arrangedObjects - - - - - - content: arrangedObjects - content - arrangedObjects - 2 - - - 840 - - - - selectionIndexes: selectionIndexes - - - - - - selectionIndexes: selectionIndexes - selectionIndexes - selectionIndexes - - 2 - - - 841 - - - - toolTip: representedObject.name - - - - - - toolTip: representedObject.name - toolTip - representedObject.name - 2 - - - 504 - - - - view - - - - 54 - - - - stylePaletteController - - - - 108 - - - - contentArray: nodeStyles - - - - - - contentArray: nodeStyles - contentArray - nodeStyles - 2 - - - 58 - - - - enabled: canRemove - - - - - - enabled: canRemove - enabled - canRemove - 2 - - - 820 - - - - hidden: selection.strokeColorIsKnown - - - - - - hidden: selection.strokeColorIsKnown - hidden - selection.strokeColorIsKnown - 2 - - - 637 - - - - hidden: selection.fillColorIsKnown - - - - - - hidden: selection.fillColorIsKnown - hidden - selection.fillColorIsKnown - 2 - - - 639 - - - - enabled: canRemove - - - - - - enabled: canRemove - enabled - canRemove - 2 - - - 823 - - - - selectedValue: selection.shapeName - - - - - - selectedValue: selection.shapeName - selectedValue - selection.shapeName - 2 - - - 635 - - - - value: selection.scale - - - - - - value: selection.scale - value - selection.scale - 2 - - - 641 - - - - value: selection.scale - - - - - - value: selection.scale - value - selection.scale - 2 - - - 640 - - - - contentValues: arrangedObjects.@distinctUnionOfObjects.category - - - - - - contentValues: arrangedObjects.@distinctUnionOfObjects.category - contentValues - arrangedObjects.@distinctUnionOfObjects.category - 2 - - - 858 - - - - value: selection.category - - - - - - value: selection.category - value - selection.category - - NSNullPlaceholder - uncategorized - - - 2 - - - 859 - - - - contentValues: arrangedObjects.@distinctUnionOfObjects.category - - - - - - contentValues: arrangedObjects.@distinctUnionOfObjects.category - contentValues - arrangedObjects.@distinctUnionOfObjects.category - - YES - - YES - NSInsertsNullPlaceholder - NSNullPlaceholder - - - YES - - uncategorized - - - 2 - - - 630 - - - - selectedValue: displayedNodeStyleCategory - - - - - - selectedValue: displayedNodeStyleCategory - selectedValue - displayedNodeStyleCategory - - 2 - - - 631 - - - - filterPredicate: displayedNodeStylePredicate - - - - - - filterPredicate: displayedNodeStylePredicate - filterPredicate - displayedNodeStylePredicate - 2 - - - 626 - - - - remove: - - - - 821 - - - - contentArray: nodeStyles - - - - - - contentArray: nodeStyles - contentArray - nodeStyles - 2 - - - 843 - - - - contentArray: edgeStyles - - - - - - contentArray: edgeStyles - contentArray - edgeStyles - 2 - - - 725 - - - - enabled: canRemove - - - - - - enabled: canRemove - enabled - canRemove - 2 - - - 862 - - - - enabled: canRemove - - - - - - enabled: canRemove - enabled - canRemove - 2 - - - 864 - - - - value: selection.name - - - - - - value: selection.name - value - selection.name - 2 - - - 762 - - - - selectedTag: selection.decorationStyle - - - - - - selectedTag: selection.decorationStyle - selectedTag - selection.decorationStyle - 2 - - - 814 - - - - contentValues: arrangedObjects.@distinctUnionOfObjects.category - - - - - - contentValues: arrangedObjects.@distinctUnionOfObjects.category - contentValues - arrangedObjects.@distinctUnionOfObjects.category - 2 - - - 787 - - - - value: selection.category - - - - - - value: selection.category - value - selection.category - - NSNullPlaceholder - uncategorized - - - 2 - - - 788 - - - - selectedTag: selection.tailStyle - - - - - - selectedTag: selection.tailStyle - selectedTag - selection.tailStyle - 2 - - - 811 - - - - selectedTag: selection.headStyle - - - - - - selectedTag: selection.headStyle - selectedTag - selection.headStyle - 2 - - - 817 - - - - content: arrangedObjects - - - - - - content: arrangedObjects - content - arrangedObjects - 2 - - - 759 - - - - selectionIndexes: selectionIndexes - - - - - - selectionIndexes: selectionIndexes - selectionIndexes - selectionIndexes - - 2 - - - 800 - - - - value: arrangedObjects.name - - - - - - value: arrangedObjects.name - value - arrangedObjects.name - 2 - - - 780 - - - - contentValues: arrangedObjects.@distinctUnionOfObjects.category - - - - - - contentValues: arrangedObjects.@distinctUnionOfObjects.category - contentValues - arrangedObjects.@distinctUnionOfObjects.category - - YES - - YES - NSInsertsNullPlaceholder - NSNullPlaceholder - - - YES - - uncategorized - - - 2 - - - 797 - - - - selectedValue: displayedEdgeStyleCategory - - - - - - selectedValue: displayedEdgeStyleCategory - selectedValue - displayedEdgeStyleCategory - - 2 - - - 798 - - - - filterPredicate: displayedEdgeStylePredicate - - - - - - filterPredicate: displayedEdgeStylePredicate - filterPredicate - displayedEdgeStylePredicate - 2 - - - 807 - - - - remove: - - - - 860 - - - - contentArray: edgeStyles - - - - - - contentArray: edgeStyles - contentArray - edgeStyles - 2 - - - 866 - - - - - YES - - 0 - - YES - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 3 - - - YES - - - - - - 4 - - - YES - - - - - - 52 - - - YES - - - - - 53 - - - - - 181 - - - YES - - - - - - - - - - - - - - - - - - - - - - - - - Node Style View - - - 8 - - - YES - - - - - - - - 23 - - - - - 24 - - - - - 25 - - - - - 94 - - - YES - - - - - - 95 - - - - - 96 - - - YES - - - - - - 97 - - - - - 182 - - - - - 229 - - - YES - - - - - - 230 - - - - - 233 - - - YES - - - - - - 234 - - - - - 535 - - - YES - - - - - - 536 - - - YES - - - - - - 537 - - - YES - - - - - - 538 - - - - - 539 - - - - - 605 - - - Filtered Node Style Array Controller - - - 9 - - - - - 10 - - - - - 11 - - - YES - - - - - - 12 - - - YES - - - - - - 13 - - - YES - - - - - - 15 - - - YES - - - - - - 16 - - - YES - - - - - - 506 - - - YES - - - - - - 525 - - - YES - - - - - - 166 - - - YES - - - - - - 168 - - - YES - - - - - - 491 - - - YES - - - - - - 513 - - - YES - - - - - - 515 - - - YES - - - - - - 527 - - - YES - - - - - - 528 - - - - - 516 - - - - - 514 - - - - - 492 - - - YES - - - - - - 493 - - - - - 169 - - - - - 167 - - - - - 526 - - - - - 509 - - - - - 17 - - - - - 18 - - - - - 20 - - - - - 21 - - - - - 22 - - - - - 649 - - - YES - - - - - - - - - - - - - - - - - Edge Style View - - - 654 - - - Edge Style Array Controller - - - 655 - - - YES - - - - - - 656 - - - YES - - - - - - 657 - - - YES - - - - - - 658 - - - YES - - - - - - 659 - - - - - 660 - - - - - 661 - - - - - 662 - - - - - 669 - - - YES - - - - - - 670 - - - YES - - - - - - 671 - - - - - 672 - - - - - 682 - - - YES - - - - - - 683 - - - YES - - - - - - 684 - - - YES - - - - - - - - 685 - - - - - 686 - - - - - 688 - - - YES - - - - - - 689 - - - YES - - - - - - 690 - - - - - 691 - - - - - 694 - - - - - 695 - - - YES - - - - - - 696 - - - YES - - - - - - 697 - - - YES - - - - - - - - 698 - - - - - 699 - - - - - 700 - - - - - 701 - - - YES - - - - - - 702 - - - YES - - - - - - 703 - - - YES - - - - - - - - 704 - - - - - 705 - - - - - 706 - - - - - 707 - - - YES - - - - - - - - 708 - - - - - 710 - - - - - 711 - - - YES - - - - Table View - - - 712 - - - YES - - - - - - 715 - - - - - 716 - - - YES - - - - - - 717 - - - YES - - - - - - 718 - - - YES - - - - - - 719 - - - - - 720 - - - - - 756 - - - Filtered Edge Style Array Controller - - - 56 - - - Node Style Array Controller - - - - - YES - - YES - -1.IBPluginDependency - -2.IBPluginDependency - -3.IBPluginDependency - 10.IBPluginDependency - 11.IBPluginDependency - 12.IBPluginDependency - 13.IBPluginDependency - 15.IBPluginDependency - 16.IBPluginDependency - 166.IBAttributePlaceholdersKey - 166.IBPluginDependency - 167.IBPluginDependency - 168.IBAttributePlaceholdersKey - 168.IBPluginDependency - 169.IBPluginDependency - 17.IBPluginDependency - 18.IBPluginDependency - 181.IBPluginDependency - 182.IBPluginDependency - 20.IBPluginDependency - 21.IBPluginDependency - 22.IBPluginDependency - 229.IBPluginDependency - 23.IBPluginDependency - 230.IBPluginDependency - 233.IBPluginDependency - 234.IBPluginDependency - 24.IBPluginDependency - 25.IBPluginDependency - 3.IBNSWindowAutoPositionCentersHorizontal - 3.IBNSWindowAutoPositionCentersVertical - 3.IBPluginDependency - 3.IBWindowTemplateEditedContentRect - 3.NSWindowTemplate.visibleAtLaunch - 4.IBPluginDependency - 491.IBPluginDependency - 492.IBPluginDependency - 493.IBPluginDependency - 506.IBPluginDependency - 509.IBPluginDependency - 513.IBPluginDependency - 514.IBPluginDependency - 515.IBPluginDependency - 516.IBPluginDependency - 52.IBPluginDependency - 525.IBPluginDependency - 526.IBPluginDependency - 527.IBPluginDependency - 528.IBPluginDependency - 53.CustomClassName - 53.IBPluginDependency - 535.IBPluginDependency - 536.IBPluginDependency - 537.IBPluginDependency - 538.IBPluginDependency - 539.IBPluginDependency - 56.IBPluginDependency - 605.IBPluginDependency - 649.IBPluginDependency - 654.IBPluginDependency - 655.IBPluginDependency - 656.IBPluginDependency - 657.IBPluginDependency - 658.IBPluginDependency - 659.IBPluginDependency - 660.IBPluginDependency - 661.IBPluginDependency - 662.IBPluginDependency - 669.IBPluginDependency - 670.IBPluginDependency - 671.IBPluginDependency - 672.IBPluginDependency - 682.IBPluginDependency - 683.IBPluginDependency - 684.IBPluginDependency - 685.IBPluginDependency - 686.IBPluginDependency - 688.IBPluginDependency - 689.IBPluginDependency - 690.IBPluginDependency - 691.IBPluginDependency - 694.IBPluginDependency - 695.IBPluginDependency - 696.IBPluginDependency - 697.IBPluginDependency - 698.IBPluginDependency - 699.IBPluginDependency - 700.IBPluginDependency - 701.IBPluginDependency - 702.IBPluginDependency - 703.IBPluginDependency - 704.IBPluginDependency - 705.IBPluginDependency - 706.IBPluginDependency - 707.IBPluginDependency - 708.IBPluginDependency - 710.IBPluginDependency - 711.IBPluginDependency - 712.IBPluginDependency - 715.IBPluginDependency - 716.IBPluginDependency - 717.IBPluginDependency - 718.IBPluginDependency - 719.IBPluginDependency - 720.IBPluginDependency - 756.IBPluginDependency - 8.IBPluginDependency - 9.IBPluginDependency - 94.IBPluginDependency - 95.IBPluginDependency - 96.IBPluginDependency - 97.IBPluginDependency - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Set stroke color to closest LaTeX color. - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Set fill color to closest LaTeX color. - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - {{815, 331}, {193, 400}} - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - SelectableCollectionViewItem - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - YES - - - - - - YES - - - - - 869 - - - - YES - - FirstResponder - - YES - - YES - applyStyleToSelectedNodes: - clearStyleOfSelectedNodes: - - - YES - id - id - - - - YES - - YES - applyStyleToSelectedNodes: - clearStyleOfSelectedNodes: - - - YES - - applyStyleToSelectedNodes: - id - - - clearStyleOfSelectedNodes: - id - - - - - IBUserSource - - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES - 3 - - YES - - YES - AH_latex_head - AH_latex_tail - AH_none - AH_plain_head - AH_plain_tail - ED_arrow - ED_none - ED_tick - NSAddTemplate - NSMenuCheckmark - NSMenuMixedState - NSRemoveTemplate - emblem-important - - - YES - {26, 12} - {26, 12} - {26, 12} - {26, 14} - {26, 14} - {58, 14} - {58, 14} - {58, 14} - {8, 8} - {11, 11} - {10, 3} - {8, 8} - {12.801422684151452, 12.801422684151452} - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + uncategorized + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + uncategorized + + + + + + + + + name + strokeThickness + strokeColor + fillColor + strokeColorIsKnown + fillColorIsKnown + representedObject.name + shapeName + scale + @distinctUnionOfObjects.category + category + + + + + + + + @distinctUnionOfObjects.category + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + uncategorized + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + uncategorized + + + + + + + + + + + name + headStyle + tailStyle + decorationStyle + category + + + + + + + + name + headStyle + tailStyle + decorationStyle + category + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tikzit/English.lproj/TikzDocument.xib b/tikzit/English.lproj/TikzDocument.xib index 53963d6..842b810 100644 --- a/tikzit/English.lproj/TikzDocument.xib +++ b/tikzit/English.lproj/TikzDocument.xib @@ -1,864 +1,161 @@ - - - - 1080 - 12C60 - 2843 - 1187.34 - 625.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 2843 - - - NSButton - NSButtonCell - NSCustomObject - NSCustomView - NSScrollView - NSScroller - NSSplitView - NSTextField - NSTextFieldCell - NSTextView - NSUserDefaultsController - NSView - NSWindowTemplate - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - TikzWindowController - - - FirstResponder - - - 15 - 2 - {{99, 420}, {447, 382}} - 1881669632 - Window - NSWindow - View - - {94, 86} - - - 256 - - - - 274 - - - - 256 - - - - 266 - - - - 265 - - {{425, 21}, {17, 19}} - - - - YES - _NS:1574 - YES - - -2080374784 - 134217728 - - - LucidaGrande - 13 - 1044 - - _NS:1574 - - 105119744 - 160 - - NSImage - NSStopProgressFreestandingTemplate - - - - 200 - 25 - - NO - - - - 270 - {{5, 10}, {438, 27}} - - - - _NS:1535 - YES - - 68157504 - 1077941248 - - - LucidaGrande - 11 - 16 - - parser information - _NS:1535 - - - 6 - System - controlBackgroundColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - NO - - - {{0, 330}, {446, 42}} - - - - YES - _NS:9 - ParseErrorView - - - - 274 - - {447, 372} - - - - YES - GraphicsView - - - {447, 373} - - - - NSView - - - - 256 - - - - 274 - - - - 2304 - - - - 2322 - - Apple HTML pasteboard type - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple PNG pasteboard type - Apple URL pasteboard type - CorePasteboardFlavorType 0x6D6F6F76 - NSColor pasteboard type - NSFilenamesPboardType - NSStringPboardType - NeXT Encapsulated PostScript v1.2 pasteboard type - NeXT RTFD pasteboard type - NeXT Rich Text Format v1.0 pasteboard type - NeXT TIFF v4.0 pasteboard type - NeXT font pasteboard type - NeXT ruler pasteboard type - WebURLsWithTitlesPboardType - public.url - - {{0, -14}, {445, 14}} - - - - - - - - XGJlZ2lue3Rpa3pwaWN0dXJlfQoKXGVuZHt0aWt6cGljdHVyZX0 - - - - LucidaGrande - 11 - 3100 - - - 4 - - - - - - - - - 166 - - - - 445 - 1 - - - 67120963 - 0 - - - 3 - MQA - - - - 6 - System - selectedTextBackgroundColor - - - - 6 - System - selectedTextColor - - - - - - - 1 - MCAwIDEAA - - - {8, -8} - 13 - - - - - - 1 - - 6 - {877, 10000000} - {445, 0} - - - - {{1, 1}, {445, 0}} - - - - - - - {4, 5} - - 12582912 - - - - - - TU0AKgAAAHCAFUqgBVKsAAAAwdVQUqwaEQeIRGJRGFlYqwWLQ+JxuOQpVRmEx2RROKwOQyOUQSPyaUym -SxqWyKXyeYxyZzWbSuJTScRCbz2Nz+gRKhUOfTqeUai0OSxiWTiBQSHSGFquGwekxyAgAAAOAQAAAwAA -AAEAEAAAAQEAAwAAAAEAEAAAAQIAAwAAAAIACAAIAQMAAwAAAAEABQAAAQYAAwAAAAEAAQAAAREABAAA -AAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEAAgAAARYAAwAAAAEAEAAAARcABAAAAAEAAABnARwAAwAA -AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA - - - - - - 3 - MCAwAA - - - - 4 - - - - 256 - {{430, 1}, {16, 0}} - - - - YES - NO - - _doScroller: - 1 - - - - -2147483392 - {{-100, -100}, {87, 18}} - - - - NO - 1 - - _doScroller: - 1 - 0.94565218687057495 - - - {447, 0} - - - - 133202 - - - - 0.25 - 4 - 1 - - - {{0, 382}, {447, 0}} - - - - NSView - - - {447, 382} - - - - - - - 289 - {{305, -184}, {128, 14}} - - - - YES - - 68157504 - 71304192 - - - - YES - - 6 - System - controlColor - - - - - NO - - - {447, 382} - - - - - {{0, 0}, {1600, 1200}} - {94, 108} - {10000000000000, 10000000000000} - YES - - - NSApplication - - - YES - - - TikzSourceController - - - - - - - window - - - - 18 - - - - graphicsView - - - - 100031 - - - - tikzSourceController - - - - 100044 - - - - delegate - - - - 17 - - - - application - - - - 100033 - - - - tikzSourceController - - - - 100049 - - - - attributedString: source - - - - - - attributedString: source - attributedString - source - - NSContinuouslyUpdatesValue - - - 2 - - - 100041 - - - - delegate - - - - 100042 - - - - graphicsView - - - - 100040 - - - - sourceView - - - - 100043 - - - - status - - - - 100048 - - - - errorNotification - - - - 100053 - - - - errorMessage - - - - 100054 - - - - closeParseError: - - - - 100060 - - - - closeErrorButton - - - - 100061 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - 5 - - - - - - Window - - - 6 - - - - - - - - - -3 - - - Application - - - 100021 - - - - - - - - - 100022 - - - - - - - - - 100023 - - - - - - - - 100025 - - - - - - - - - - 100026 - - - - - 100027 - - - - - 100028 - - - - - 100034 - - - - - 100037 - - - - - 100045 - - - - - - - - 100046 - - - - - 100050 - - - - - - - - - 100051 - - - - - - - - 100052 - - - - - 100024 - - - - - - 100058 - - - - - - - - 100059 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - {{329, 94}, {447, 569}} - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - 100063 - - - - - GraphicsView - NSView - - NSApplication - TikzSourceController - - - - application - NSApplication - - - tikzSourceController - TikzSourceController - - - - IBProjectSource - ./Classes/GraphicsView.h - - - - ParseErrorView - NSView - - IBProjectSource - ./Classes/ParseErrorView.h - - - - TikzSourceController - NSObject - - closeParseError: - id - - - closeParseError: - - closeParseError: - id - - - - NSTextField - ParseErrorView - GraphicsView - NSTextView - NSTextField - - - - errorMessage - NSTextField - - - errorNotification - ParseErrorView - - - graphicsView - GraphicsView - - - sourceView - NSTextView - - - status - NSTextField - - - - IBProjectSource - ./Classes/TikzSourceController.h - - - - TikzWindowController - NSWindowController - - GraphicsView - TikzSourceController - - - - graphicsView - GraphicsView - - - tikzSourceController - TikzSourceController - - - - IBProjectSource - ./Classes/TikzWindowController.h - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES - 3 - - NSStopProgressFreestandingTemplate - {83, 83} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \begin{tikzpicture} + +\end{tikzpicture} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tikzit/TikZiT.xcodeproj/project.pbxproj b/tikzit/TikZiT.xcodeproj/project.pbxproj index 3f4b2a5..692181b 100644 --- a/tikzit/TikZiT.xcodeproj/project.pbxproj +++ b/tikzit/TikZiT.xcodeproj/project.pbxproj @@ -21,9 +21,9 @@ 55391AF813D3250F007DBE71 /* Preamble.xib in Resources */ = {isa = PBXBuildFile; fileRef = 55391AF713D3250F007DBE71 /* Preamble.xib */; }; 55391B0213D32608007DBE71 /* PropertyInspector.xib in Resources */ = {isa = PBXBuildFile; fileRef = 55391B0013D32608007DBE71 /* PropertyInspector.xib */; }; 55391B0A13D32765007DBE71 /* PropertyInspectorController.m in Sources */ = {isa = PBXBuildFile; fileRef = 55391B0913D32765007DBE71 /* PropertyInspectorController.m */; }; - 55397C7914498C22006942FB /* EdgeStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 55397C7814498C22006942FB /* EdgeStyle.m */; }; + 55397C7914498C22006942FB /* EdgeStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 55397C7814498C22006942FB /* EdgeStyle.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 55397C7C144990EA006942FB /* EdgeStyle+Coder.m in Sources */ = {isa = PBXBuildFile; fileRef = 55397C7B144990EA006942FB /* EdgeStyle+Coder.m */; }; - 55397C7F144999C4006942FB /* PropertyHolder.m in Sources */ = {isa = PBXBuildFile; fileRef = 55397C7E144999C4006942FB /* PropertyHolder.m */; }; + 55397C7F144999C4006942FB /* PropertyHolder.m in Sources */ = {isa = PBXBuildFile; fileRef = 55397C7E144999C4006942FB /* PropertyHolder.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 55397C811449A877006942FB /* ED_arrow.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C801449A877006942FB /* ED_arrow.png */; }; 55397C831449A8F1006942FB /* ED_tick.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C821449A8F1006942FB /* ED_tick.png */; }; 55397C851449A9BF006942FB /* ED_none.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C841449A9BF006942FB /* ED_none.png */; }; @@ -33,17 +33,17 @@ 55397C901449AC7C006942FB /* AH_latex_head.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C8E1449AC7C006942FB /* AH_latex_head.png */; }; 55397C911449AC7C006942FB /* AH_plain_head.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C8F1449AC7C006942FB /* AH_plain_head.png */; }; 553A4C5A144ED3D500AA6FAC /* NilToEmptyStringTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 553A4C59144ED3D500AA6FAC /* NilToEmptyStringTransformer.m */; }; - 55432E061444BF2D00401BB3 /* GraphElementProperty.m in Sources */ = {isa = PBXBuildFile; fileRef = 55432E051444BF2D00401BB3 /* GraphElementProperty.m */; }; - 55598E351635372E0023450A /* DiamondShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55598E341635372E0023450A /* DiamondShape.m */; }; + 55432E061444BF2D00401BB3 /* GraphElementProperty.m in Sources */ = {isa = PBXBuildFile; fileRef = 55432E051444BF2D00401BB3 /* GraphElementProperty.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 55598E351635372E0023450A /* DiamondShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55598E341635372E0023450A /* DiamondShape.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 555B30F911D8BE3300CAECF5 /* emblem-important.png in Resources */ = {isa = PBXBuildFile; fileRef = 555B30F811D8BE3300CAECF5 /* emblem-important.png */; }; 555B313511D8C6DA00CAECF5 /* color.m in Sources */ = {isa = PBXBuildFile; fileRef = 555B313411D8C6DA00CAECF5 /* color.m */; }; 555ECE9B1378A3AA0052DB71 /* CALayer+DrawLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 555ECE9A1378A3AA0052DB71 /* CALayer+DrawLabel.m */; }; - 55652DF913E1F2030023F4C6 /* SupportDir.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652DF813E1F2030023F4C6 /* SupportDir.m */; }; - 55652E3B13E1FAEE0023F4C6 /* CircleShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3413E1FAED0023F4C6 /* CircleShape.m */; }; - 55652E3C13E1FAEE0023F4C6 /* RectangleShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3613E1FAED0023F4C6 /* RectangleShape.m */; }; - 55652E3D13E1FAEE0023F4C6 /* RegularPolyShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3813E1FAED0023F4C6 /* RegularPolyShape.m */; }; - 55652E3E13E1FAEE0023F4C6 /* TikzShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3A13E1FAEE0023F4C6 /* TikzShape.m */; }; - 55652E4113E1FB0A0023F4C6 /* Shape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E4013E1FB0A0023F4C6 /* Shape.m */; }; + 55652DF913E1F2030023F4C6 /* SupportDir.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652DF813E1F2030023F4C6 /* SupportDir.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 55652E3B13E1FAEE0023F4C6 /* CircleShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3413E1FAED0023F4C6 /* CircleShape.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 55652E3C13E1FAEE0023F4C6 /* RectangleShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3613E1FAED0023F4C6 /* RectangleShape.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 55652E3D13E1FAEE0023F4C6 /* RegularPolyShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3813E1FAED0023F4C6 /* RegularPolyShape.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 55652E3E13E1FAEE0023F4C6 /* TikzShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3A13E1FAEE0023F4C6 /* TikzShape.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 55652E4113E1FB0A0023F4C6 /* Shape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E4013E1FB0A0023F4C6 /* Shape.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 55652E5613E1FC660023F4C6 /* cap.tikz in Copy Shapes */ = {isa = PBXBuildFile; fileRef = 55652E5113E1FC660023F4C6 /* cap.tikz */; }; 55652E5713E1FC660023F4C6 /* copants.tikz in Copy Shapes */ = {isa = PBXBuildFile; fileRef = 55652E5213E1FC660023F4C6 /* copants.tikz */; }; 55652E5813E1FC660023F4C6 /* cup.tikz in Copy Shapes */ = {isa = PBXBuildFile; fileRef = 55652E5313E1FC660023F4C6 /* cup.tikz */; }; @@ -55,13 +55,11 @@ 5573B90F11DA231A00B5DC5D /* PreambleController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5573B90E11DA231A00B5DC5D /* PreambleController.m */; }; 5573B92111DA259C00B5DC5D /* text-x-generic.png in Resources */ = {isa = PBXBuildFile; fileRef = 5573B92011DA259C00B5DC5D /* text-x-generic.png */; }; 5573B92511DA273400B5DC5D /* format-indent-less.png in Resources */ = {isa = PBXBuildFile; fileRef = 5573B92411DA273400B5DC5D /* format-indent-less.png */; }; - 5573B92911DA292F00B5DC5D /* Preambles.m in Sources */ = {isa = PBXBuildFile; fileRef = 5573B92811DA292F00B5DC5D /* Preambles.m */; }; + 5573B92911DA292F00B5DC5D /* Preambles.m in Sources */ = {isa = PBXBuildFile; fileRef = 5573B92811DA292F00B5DC5D /* Preambles.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 5573B98811DA377C00B5DC5D /* text-x-script.png in Resources */ = {isa = PBXBuildFile; fileRef = 5573B98711DA377C00B5DC5D /* text-x-script.png */; }; 5573BDCB11DB4D2600B5DC5D /* Preambles+Coder.m in Sources */ = {isa = PBXBuildFile; fileRef = 5573BDCA11DB4D2600B5DC5D /* Preambles+Coder.m */; }; 5585E5C2117F681800124513 /* NodeStyle+Coder.m in Sources */ = {isa = PBXBuildFile; fileRef = 5585E5C1117F681800124513 /* NodeStyle+Coder.m */; }; - 5589A9AF11C500060064D310 /* tikzlexer.lm in Sources */ = {isa = PBXBuildFile; fileRef = 5589A9AA11C500060064D310 /* tikzlexer.lm */; }; - 5589A9B011C500060064D310 /* tikzparser.ym in Sources */ = {isa = PBXBuildFile; fileRef = 5589A9AB11C500060064D310 /* tikzparser.ym */; }; - 5589A9FF11C51E780064D310 /* TikzGraphAssembler.m in Sources */ = {isa = PBXBuildFile; fileRef = 5589A9FE11C51E780064D310 /* TikzGraphAssembler.m */; }; + 5589A9FF11C51E780064D310 /* TikzGraphAssembler.m in Sources */ = {isa = PBXBuildFile; fileRef = 5589A9FE11C51E780064D310 /* TikzGraphAssembler.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 5589AA6C11C542D30064D310 /* TikzGraphAssembler.m in Sources */ = {isa = PBXBuildFile; fileRef = 5589A9FE11C51E780064D310 /* TikzGraphAssembler.m */; }; 5589AA6D11C542D30064D310 /* tikzlexer.lm in Sources */ = {isa = PBXBuildFile; fileRef = 5589A9AA11C500060064D310 /* tikzlexer.lm */; }; 5589AA6E11C542D30064D310 /* tikzparser.ym in Sources */ = {isa = PBXBuildFile; fileRef = 5589A9AB11C500060064D310 /* tikzparser.ym */; }; @@ -73,14 +71,14 @@ 5589AA8011C542E60064D310 /* NodeStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C4117B031C009863B2 /* NodeStyle.m */; }; 5589AA8511C543500064D310 /* util.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18CD117B03DD009863B2 /* util.m */; }; 5589AD4411C633EE0064D310 /* SelectBoxLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 5589AD4311C633EE0064D310 /* SelectBoxLayer.m */; }; - 558F18C5117B031C009863B2 /* Edge.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18BA117B031C009863B2 /* Edge.m */; }; - 558F18C6117B031C009863B2 /* Graph.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18BC117B031C009863B2 /* Graph.m */; }; - 558F18C7117B031C009863B2 /* GraphChange.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18BE117B031C009863B2 /* GraphChange.m */; }; - 558F18C8117B031C009863B2 /* GraphElementData.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C0117B031C009863B2 /* GraphElementData.m */; }; - 558F18C9117B031C009863B2 /* Node.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C2117B031C009863B2 /* Node.m */; }; - 558F18CA117B031C009863B2 /* NodeStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C4117B031C009863B2 /* NodeStyle.m */; }; + 558F18C5117B031C009863B2 /* Edge.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18BA117B031C009863B2 /* Edge.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 558F18C6117B031C009863B2 /* Graph.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18BC117B031C009863B2 /* Graph.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 558F18C7117B031C009863B2 /* GraphChange.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18BE117B031C009863B2 /* GraphChange.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 558F18C8117B031C009863B2 /* GraphElementData.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C0117B031C009863B2 /* GraphElementData.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 558F18C9117B031C009863B2 /* Node.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C2117B031C009863B2 /* Node.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 558F18CA117B031C009863B2 /* NodeStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C4117B031C009863B2 /* NodeStyle.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 558F18CE117B03DD009863B2 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18CB117B03DD009863B2 /* main.m */; }; - 558F18CF117B03DD009863B2 /* util.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18CD117B03DD009863B2 /* util.m */; }; + 558F18CF117B03DD009863B2 /* util.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18CD117B03DD009863B2 /* util.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 558F18F7117B043C009863B2 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18DA117B043B009863B2 /* AppDelegate.m */; }; 558F18F9117B043C009863B2 /* EdgeControlLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18DE117B043B009863B2 /* EdgeControlLayer.m */; }; 558F18FA117B043C009863B2 /* GraphicsView.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18E0117B043B009863B2 /* GraphicsView.m */; }; @@ -99,12 +97,12 @@ 559EFA4811C7D49800D020F4 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 559EFA4711C7D49800D020F4 /* Sparkle.framework */; }; 559EFA4E11C7D4BD00D020F4 /* Sparkle.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 559EFA4711C7D49800D020F4 /* Sparkle.framework */; }; 559EFA5711C7D95F00D020F4 /* tikzit_dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 559EFA5611C7D95F00D020F4 /* tikzit_dsa_pub.pem */; }; - 559EFB6811CB88E300D020F4 /* ColorRGB.m in Sources */ = {isa = PBXBuildFile; fileRef = 559EFB6711CB88E300D020F4 /* ColorRGB.m */; }; + 559EFB6811CB88E300D020F4 /* ColorRGB.m in Sources */ = {isa = PBXBuildFile; fileRef = 559EFB6711CB88E300D020F4 /* ColorRGB.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 55CA98D512EF8FCE008F0368 /* SFBInspectors.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55CA98D412EF8FCE008F0368 /* SFBInspectors.framework */; }; 55CA98DA12EF9098008F0368 /* SFBInspectors.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 55CA98D412EF8FCE008F0368 /* SFBInspectors.framework */; }; 55CA98DD12EF910F008F0368 /* SFBInspectors.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55CA98D412EF8FCE008F0368 /* SFBInspectors.framework */; }; 55CA997212F08281008F0368 /* TikzWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 55CA997112F08281008F0368 /* TikzWindowController.m */; }; - 55CA9AC912F831E5008F0368 /* RColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 55CA9AC812F831E5008F0368 /* RColor.m */; }; + 55CA9AC912F831E5008F0368 /* RColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 55CA9AC812F831E5008F0368 /* RColor.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 55CA9ACA12F831E5008F0368 /* RColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 55CA9AC812F831E5008F0368 /* RColor.m */; }; 55D2E0B21186ED950060B4EC /* Graph+Coder.m in Sources */ = {isa = PBXBuildFile; fileRef = 55D2E0B11186ED950060B4EC /* Graph+Coder.m */; }; 55D945721165904F0044178C /* tikzitdoc.icns in Resources */ = {isa = PBXBuildFile; fileRef = 55D945701165904F0044178C /* tikzitdoc.icns */; }; @@ -113,9 +111,9 @@ 55D949151165D8870044178C /* draw-path.png in Resources */ = {isa = PBXBuildFile; fileRef = 55D949121165D8870044178C /* draw-path.png */; }; 55D949161165D8870044178C /* select-rectangular.png in Resources */ = {isa = PBXBuildFile; fileRef = 55D949131165D8870044178C /* select-rectangular.png */; }; 55E5E99E1215C8E300256F69 /* transform-crop-and-resize.png in Resources */ = {isa = PBXBuildFile; fileRef = 55E5E99D1215C8E300256F69 /* transform-crop-and-resize.png */; }; - 55F9585C1181B09600F99434 /* PickSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F958591181B09600F99434 /* PickSupport.m */; }; - 55F9585D1181B09600F99434 /* Transformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F9585B1181B09600F99434 /* Transformer.m */; }; - 55F9E04511FF54F000F5659E /* NSString+LatexConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F9E04411FF54F000F5659E /* NSString+LatexConstants.m */; }; + 55F9585C1181B09600F99434 /* PickSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F958591181B09600F99434 /* PickSupport.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 55F9585D1181B09600F99434 /* Transformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F9585B1181B09600F99434 /* Transformer.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 55F9E04511FF54F000F5659E /* NSString+LatexConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F9E04411FF54F000F5659E /* NSString+LatexConstants.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 7F18A321184C577000BC3081 /* UpdatePreferenceController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F18A320184C577000BC3081 /* UpdatePreferenceController.m */; }; 7F18A323184C599100BC3081 /* UpdatePreferencePanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7F18A322184C599100BC3081 /* UpdatePreferencePanel.xib */; }; 7F6E2C7D16B007F000BFE20D /* EdgeStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 55397C7814498C22006942FB /* EdgeStyle.m */; }; @@ -133,7 +131,11 @@ 7F6E2C8C16B00ABA00BFE20D /* SFBInspectors.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 55CA98D412EF8FCE008F0368 /* SFBInspectors.framework */; }; 7F73438A184AC559002897D0 /* DraggablePDFView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F734389184AC559002897D0 /* DraggablePDFView.m */; }; 7F781C1A16B5DE1400239826 /* ParseErrorView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F781C1916B5DE1400239826 /* ParseErrorView.m */; }; - 7F90E88616DD29600069EBCD /* NSString+Tikz.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F90E88516DD29600069EBCD /* NSString+Tikz.m */; }; + 7F7B6DED18DE0C9E004F6CA8 /* tikzlexer.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F7B6DEA18DE0C9E004F6CA8 /* tikzlexer.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 7F7B6DEE18DE0C9E004F6CA8 /* tikzparser.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F7B6DEC18DE0C9E004F6CA8 /* tikzparser.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 7F7B6DF418DE0D7A004F6CA8 /* CustomNodeCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F7B6DF118DE0D7A004F6CA8 /* CustomNodeCellView.m */; }; + 7F7B6DF518DE0D7A004F6CA8 /* CustomNodeController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F7B6DF318DE0D7A004F6CA8 /* CustomNodeController.m */; }; + 7F90E88616DD29600069EBCD /* NSString+Tikz.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F90E88516DD29600069EBCD /* NSString+Tikz.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 7F90E88D16DD47540069EBCD /* PreferenceController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F90E88B16DD47540069EBCD /* PreferenceController.m */; }; 7F90E88E16DD47540069EBCD /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7F90E88C16DD47540069EBCD /* Preferences.xib */; }; 7F90E89116DD54440069EBCD /* UserDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 7F90E88F16DD54440069EBCD /* UserDefaults.plist */; }; @@ -141,37 +143,12 @@ 7F938530184D178B00FAED38 /* engine.png in Resources */ = {isa = PBXBuildFile; fileRef = 7F93852F184D178B00FAED38 /* engine.png */; }; 7F938532184D184700FAED38 /* preamble.png in Resources */ = {isa = PBXBuildFile; fileRef = 7F938531184D184700FAED38 /* preamble.png */; }; 7FB9BFEE16B57C2E00773146 /* TikzFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FB9BFED16B57C2E00773146 /* TikzFormatter.m */; }; - 7FEED45716B1A7C500B056CB /* StyleManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FEED45616B1A7C500B056CB /* StyleManager.m */; }; + 7FEED45716B1A7C500B056CB /* StyleManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FEED45616B1A7C500B056CB /* StyleManager.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 8D15AC2C0486D014006FF6A4 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 2A37F4B9FDCFA73011CA2CEA /* Credits.rtf */; }; 8D15AC2F0486D014006FF6A4 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165FFE840EACC02AAC07 /* InfoPlist.strings */; }; 8D15AC340486D014006FF6A4 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A7FEA54F5311CA2CBB /* Cocoa.framework */; }; /* End PBXBuildFile section */ -/* Begin PBXBuildRule section */ - 74112B2117CE36C500B9CF16 /* PBXBuildRule */ = { - isa = PBXBuildRule; - compilerSpec = com.apple.compilers.proxy.script; - fileType = sourcecode.lex; - isEditable = 1; - outputFiles = ( - tikzlexer.m, - tikzlexer.h, - ); - script = "cd src\nflex -o common/${INPUT_FILE_BASE}.m common/${INPUT_FILE_BASE}.lm\ncp common/${INPUT_FILE_BASE}.m common/${INPUT_FILE_BASE}.h ${DERIVED_SOURCES_DIR}"; - }; - 74E535F317CE329A0040610D /* PBXBuildRule */ = { - isa = PBXBuildRule; - compilerSpec = com.apple.compilers.proxy.script; - fileType = sourcecode.yacc; - isEditable = 1; - outputFiles = ( - tikzparser.h, - tikzparser.m, - ); - script = "cd src\nbison --defines=common/${INPUT_FILE_BASE}.h --output=common/${INPUT_FILE_BASE}.m common/${INPUT_FILE_BASE}.ym\ncp common/${INPUT_FILE_BASE}.h common/${INPUT_FILE_BASE}.m ${DERIVED_SOURCES_DIR}\n"; - }; -/* End PBXBuildRule section */ - /* Begin PBXContainerItemProxy section */ 5504C91A11D36CD5002A1478 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -383,6 +360,14 @@ 7F734389184AC559002897D0 /* DraggablePDFView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DraggablePDFView.m; path = src/osx/DraggablePDFView.m; sourceTree = ""; }; 7F781C1816B5DE1400239826 /* ParseErrorView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ParseErrorView.h; path = src/osx/ParseErrorView.h; sourceTree = ""; }; 7F781C1916B5DE1400239826 /* ParseErrorView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ParseErrorView.m; path = src/osx/ParseErrorView.m; sourceTree = ""; }; + 7F7B6DE918DE0C9E004F6CA8 /* tikzlexer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tikzlexer.h; path = xbuild/TikZiT.build/Debug/TikZiT.build/DerivedSources/tikzlexer.h; sourceTree = ""; }; + 7F7B6DEA18DE0C9E004F6CA8 /* tikzlexer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = tikzlexer.m; path = xbuild/TikZiT.build/Debug/TikZiT.build/DerivedSources/tikzlexer.m; sourceTree = ""; }; + 7F7B6DEB18DE0C9E004F6CA8 /* tikzparser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tikzparser.h; path = xbuild/TikZiT.build/Debug/TikZiT.build/DerivedSources/tikzparser.h; sourceTree = ""; }; + 7F7B6DEC18DE0C9E004F6CA8 /* tikzparser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = tikzparser.m; path = xbuild/TikZiT.build/Debug/TikZiT.build/DerivedSources/tikzparser.m; sourceTree = ""; }; + 7F7B6DF018DE0D7A004F6CA8 /* CustomNodeCellView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CustomNodeCellView.h; path = src/osx/CustomNodeCellView.h; sourceTree = ""; }; + 7F7B6DF118DE0D7A004F6CA8 /* CustomNodeCellView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CustomNodeCellView.m; path = src/osx/CustomNodeCellView.m; sourceTree = ""; }; + 7F7B6DF218DE0D7A004F6CA8 /* CustomNodeController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CustomNodeController.h; path = src/osx/CustomNodeController.h; sourceTree = ""; }; + 7F7B6DF318DE0D7A004F6CA8 /* CustomNodeController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CustomNodeController.m; path = src/osx/CustomNodeController.m; sourceTree = ""; }; 7F90E88416DD29600069EBCD /* NSString+Tikz.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSString+Tikz.h"; path = "src/common/NSString+Tikz.h"; sourceTree = ""; }; 7F90E88516DD29600069EBCD /* NSString+Tikz.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSString+Tikz.m"; path = "src/common/NSString+Tikz.m"; sourceTree = ""; }; 7F90E88A16DD47540069EBCD /* PreferenceController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PreferenceController.h; path = src/osx/PreferenceController.h; sourceTree = ""; }; @@ -631,6 +616,7 @@ 55D946071165922F0044178C /* Parser */ = { isa = PBXGroup; children = ( + 7F7B6DE218DE0BE1004F6CA8 /* Generated sources */, 5589A9AA11C500060064D310 /* tikzlexer.lm */, 5589A9AB11C500060064D310 /* tikzparser.ym */, 5589A9FD11C51E780064D310 /* TikzGraphAssembler.h */, @@ -744,6 +730,7 @@ 7F18A31E184C563800BC3081 /* Preferences */ = { isa = PBXGroup; children = ( + 7F7B6DEF18DE0D70004F6CA8 /* CustomNode */, 5573B90D11DA231A00B5DC5D /* PreambleController.h */, 5573B90E11DA231A00B5DC5D /* PreambleController.m */, 7F90E88A16DD47540069EBCD /* PreferenceController.h */, @@ -754,6 +741,28 @@ name = Preferences; sourceTree = ""; }; + 7F7B6DE218DE0BE1004F6CA8 /* Generated sources */ = { + isa = PBXGroup; + children = ( + 7F7B6DE918DE0C9E004F6CA8 /* tikzlexer.h */, + 7F7B6DEA18DE0C9E004F6CA8 /* tikzlexer.m */, + 7F7B6DEB18DE0C9E004F6CA8 /* tikzparser.h */, + 7F7B6DEC18DE0C9E004F6CA8 /* tikzparser.m */, + ); + name = "Generated sources"; + sourceTree = ""; + }; + 7F7B6DEF18DE0D70004F6CA8 /* CustomNode */ = { + isa = PBXGroup; + children = ( + 7F7B6DF018DE0D7A004F6CA8 /* CustomNodeCellView.h */, + 7F7B6DF118DE0D7A004F6CA8 /* CustomNodeCellView.m */, + 7F7B6DF218DE0D7A004F6CA8 /* CustomNodeController.h */, + 7F7B6DF318DE0D7A004F6CA8 /* CustomNodeController.m */, + ); + name = CustomNode; + sourceTree = ""; + }; 7F93852C184D175400FAED38 /* Icons */ = { isa = PBXGroup; children = ( @@ -801,12 +810,12 @@ 559EFA5511C7D4DD00D020F4 /* Copy Frameworks */, 8D15AC2B0486D014006FF6A4 /* Resources */, 55652E6613E1FD080023F4C6 /* Copy Shapes */, + 7F7B6DE018DE02AC004F6CA8 /* Run Flex */, + 7F7B6DE118DE0A6E004F6CA8 /* Run Bison */, 8D15AC300486D014006FF6A4 /* Sources */, 8D15AC330486D014006FF6A4 /* Frameworks */, ); buildRules = ( - 74112B2117CE36C500B9CF16 /* PBXBuildRule */, - 74E535F317CE329A0040610D /* PBXBuildRule */, ); dependencies = ( ); @@ -889,6 +898,41 @@ }; /* End PBXResourcesBuildPhase section */ +/* Begin PBXShellScriptBuildPhase section */ + 7F7B6DE018DE02AC004F6CA8 /* Run Flex */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "$(SRCROOT)/src/common/tikzlexer.lm", + ); + name = "Run Flex"; + outputPaths = ( + "$(SRCROOT)/src/common/tikzlexer.m", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "cd ${SRCROOT}/src/\nINPUT_FILE_BASE=`basename \"${SCRIPT_INPUT_FILE_0}\" .lm`\nflex -o common/${INPUT_FILE_BASE}.m common/${INPUT_FILE_BASE}.lm\nmv common/${INPUT_FILE_BASE}.m common/${INPUT_FILE_BASE}.h ${DERIVED_SOURCES_DIR}\n"; + }; + 7F7B6DE118DE0A6E004F6CA8 /* Run Bison */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "$(SRCROOT)/src/common/tikzparser.ym", + ); + name = "Run Bison"; + outputPaths = ( + "$(SRCROOT)/src/common/tikzparser.m", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "cd ${SRCROOT}/src/\nINPUT_FILE_BASE=`basename \"${SCRIPT_INPUT_FILE_0}\" .ym`\nflex -o common/${INPUT_FILE_BASE}.m common/${INPUT_FILE_BASE}.lm\nbison --defines=common/${INPUT_FILE_BASE}.h --output=common/${INPUT_FILE_BASE}.m common/${INPUT_FILE_BASE}.ym\nmv common/${INPUT_FILE_BASE}.m common/${INPUT_FILE_BASE}.h ${DERIVED_SOURCES_DIR}"; + }; +/* End PBXShellScriptBuildPhase section */ + /* Begin PBXSourcesBuildPhase section */ 5589AA6211C5429C0064D310 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -936,8 +980,10 @@ 558F18C5117B031C009863B2 /* Edge.m in Sources */, 558F18C6117B031C009863B2 /* Graph.m in Sources */, 558F18C7117B031C009863B2 /* GraphChange.m in Sources */, + 7F7B6DF418DE0D7A004F6CA8 /* CustomNodeCellView.m in Sources */, 558F18C8117B031C009863B2 /* GraphElementData.m in Sources */, 558F18C9117B031C009863B2 /* Node.m in Sources */, + 7F7B6DEE18DE0C9E004F6CA8 /* tikzparser.m in Sources */, 558F18CA117B031C009863B2 /* NodeStyle.m in Sources */, 558F18CE117B03DD009863B2 /* main.m in Sources */, 558F18CF117B03DD009863B2 /* util.m in Sources */, @@ -957,10 +1003,10 @@ 5585E5C2117F681800124513 /* NodeStyle+Coder.m in Sources */, 55F9585C1181B09600F99434 /* PickSupport.m in Sources */, 55F9585D1181B09600F99434 /* Transformer.m in Sources */, + 7F7B6DED18DE0C9E004F6CA8 /* tikzlexer.m in Sources */, 55D2E0B21186ED950060B4EC /* Graph+Coder.m in Sources */, - 5589A9AF11C500060064D310 /* tikzlexer.lm in Sources */, - 5589A9B011C500060064D310 /* tikzparser.ym in Sources */, 5589A9FF11C51E780064D310 /* TikzGraphAssembler.m in Sources */, + 7F7B6DF518DE0D7A004F6CA8 /* CustomNodeController.m in Sources */, 5589AD4411C633EE0064D310 /* SelectBoxLayer.m in Sources */, 559EFB6811CB88E300D020F4 /* ColorRGB.m in Sources */, 5573B8C211D9FD3200B5DC5D /* PreviewController.m in Sources */, @@ -1137,6 +1183,8 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CLANG_ENABLE_OBJC_ARC = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -1162,6 +1210,8 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CLANG_ENABLE_OBJC_ARC = YES; COMBINE_HIDPI_IMAGES = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; FRAMEWORK_SEARCH_PATHS = ( @@ -1186,7 +1236,6 @@ buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_ENABLE_OBJC_GC = required; GCC_OPTIMIZATION_LEVEL = 0; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; @@ -1206,7 +1255,6 @@ buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_ENABLE_OBJC_GC = required; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ""; diff --git a/tikzit/src/osx/AppDelegate.h b/tikzit/src/osx/AppDelegate.h index 64acc38..0f9d787 100644 --- a/tikzit/src/osx/AppDelegate.h +++ b/tikzit/src/osx/AppDelegate.h @@ -37,13 +37,13 @@ PreambleController *preambleController; PreviewController *previewController; PreferenceController *preferenceController; - ToolPaletteController *toolPaletteController; + ToolPaletteController *__weak toolPaletteController; IBOutlet GraphicsView *graphicsView; NSString *tempDir; } @property IBOutlet StylePaletteController *stylePaletteController; -@property IBOutlet ToolPaletteController *toolPaletteController; +@property (weak) IBOutlet ToolPaletteController *toolPaletteController; - (void)awakeFromNib; + (void)setDefaults; diff --git a/tikzit/src/osx/CustomNodeCellView.h b/tikzit/src/osx/CustomNodeCellView.h index 5b3b1ee..22606d7 100644 --- a/tikzit/src/osx/CustomNodeCellView.h +++ b/tikzit/src/osx/CustomNodeCellView.h @@ -18,6 +18,6 @@ BOOL selected; } -@property (retain) id objectValue; +@property (strong) id objectValue; @end diff --git a/tikzit/src/osx/CustomNodeController.h b/tikzit/src/osx/CustomNodeController.h index 55f0e0b..56cb74c 100644 --- a/tikzit/src/osx/CustomNodeController.h +++ b/tikzit/src/osx/CustomNodeController.h @@ -16,18 +16,18 @@ #import "SupportDir.h" @interface CustomNodeController : NSViewController { - NSDictionary* nodeStyles; + NSDictionary* __weak nodeStyles; NSMutableArray* customNodeStyles; - NSMutableArray* onodeStyles; + NSMutableArray* __weak onodeStyles; - GraphicsView *graphicsView; - TikzSourceController *tikzSourceController; + GraphicsView *__weak graphicsView; + TikzSourceController *__weak tikzSourceController; } -@property (readonly) NSDictionary *nodeStyles; -@property (readonly) NSMutableArray* onodeStyles; +@property (weak, readonly) NSDictionary *nodeStyles; +@property (weak, readonly) NSMutableArray* onodeStyles; -@property IBOutlet GraphicsView *graphicsView; -@property IBOutlet TikzSourceController *tikzSourceController; +@property (weak) IBOutlet GraphicsView *graphicsView; +@property (weak) IBOutlet TikzSourceController *tikzSourceController; @end diff --git a/tikzit/src/osx/CustomNodes.xib b/tikzit/src/osx/CustomNodes.xib index 8b2587a..1cc8db2 100644 --- a/tikzit/src/osx/CustomNodes.xib +++ b/tikzit/src/osx/CustomNodes.xib @@ -1,15 +1,249 @@ - + - + + - + + + + + + + + + + name + strokeThickness + strokeColor + fillColor + strokeColorIsKnown + fillColorIsKnown + representedObject.name + shapeName + scale + @distinctUnionOfObjects.category + category + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \begin{tikzpicture} + +\end{tikzpicture} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + + + + diff --git a/tikzit/src/osx/EdgeControlLayer.m b/tikzit/src/osx/EdgeControlLayer.m index 377cde4..facdd84 100644 --- a/tikzit/src/osx/EdgeControlLayer.m +++ b/tikzit/src/osx/EdgeControlLayer.m @@ -29,7 +29,7 @@ - (id)initWithEdge:(Edge*)e andTransformer:(Transformer*)t { - [super init]; + if (!(self = [super init])) return nil; transformer = t; edge = e; self.opacity = 0.0f; diff --git a/tikzit/src/osx/EdgeStyle+Coder.m b/tikzit/src/osx/EdgeStyle+Coder.m index 208fac0..039344d 100644 --- a/tikzit/src/osx/EdgeStyle+Coder.m +++ b/tikzit/src/osx/EdgeStyle+Coder.m @@ -26,7 +26,7 @@ @implementation EdgeStyle (Coder) - (id)initWithCoder:(NSCoder*)coder { - [super init]; + if (!(self = [super init])) return nil; name = [coder decodeObjectForKey:@"name"]; category = [coder decodeObjectForKey:@"category"]; diff --git a/tikzit/src/osx/GraphicsView.h b/tikzit/src/osx/GraphicsView.h index e963ac7..c3c2add 100644 --- a/tikzit/src/osx/GraphicsView.h +++ b/tikzit/src/osx/GraphicsView.h @@ -92,12 +92,12 @@ typedef enum { NSUndoManager *documentUndoManager; NSPoint startPoint; - TikzSourceController *tikzSourceController; + TikzSourceController *__weak tikzSourceController; } @property BOOL enabled; -@property Graph *graph; -@property IBOutlet TikzSourceController *tikzSourceController; +@property (weak) Graph *graph; +@property (weak) IBOutlet TikzSourceController *tikzSourceController; @property (readonly) Transformer *transformer; @property (readonly) PickSupport *pickSupport; diff --git a/tikzit/src/osx/Grid.m b/tikzit/src/osx/Grid.m index 3e412a3..aa35c1f 100644 --- a/tikzit/src/osx/Grid.m +++ b/tikzit/src/osx/Grid.m @@ -32,7 +32,7 @@ subdivisions:(int)subs transformer:(Transformer*)t { - [super init]; + if (!(self = [super init])) return nil; gridX = spacing; gridY = spacing; subdivisions = subs; diff --git a/tikzit/src/osx/NilToEmptyStringTransformer.m b/tikzit/src/osx/NilToEmptyStringTransformer.m index 97267e3..413f404 100644 --- a/tikzit/src/osx/NilToEmptyStringTransformer.m +++ b/tikzit/src/osx/NilToEmptyStringTransformer.m @@ -26,7 +26,7 @@ @implementation NilToEmptyStringTransformer - (id)init { - [super init]; + if (!(self = [super init])) return nil; return self; } diff --git a/tikzit/src/osx/NodeLayer.h b/tikzit/src/osx/NodeLayer.h index dfe05e8..d2a943b 100644 --- a/tikzit/src/osx/NodeLayer.h +++ b/tikzit/src/osx/NodeLayer.h @@ -30,7 +30,7 @@ #import "NodeSelectionLayer.h" @interface NodeLayer : CALayer { - Node *node; + Node *__weak node; Shape *shape; CGMutablePathRef path; float textwidth; @@ -42,10 +42,10 @@ BOOL dirty; // need to rebuild CGBezierPath of the shape } -@property Node *node; +@property (weak) Node *node; @property (assign) NSPoint center; @property (assign) BOOL rescale; -@property (retain) NodeSelectionLayer *selection; +@property (strong) NodeSelectionLayer *selection; @property (readonly) CGMutablePathRef path; - (id)initWithNode:(Node*)n transformer:(Transformer*)t; diff --git a/tikzit/src/osx/NodeLayer.m b/tikzit/src/osx/NodeLayer.m index 2c37c26..5d15585 100644 --- a/tikzit/src/osx/NodeLayer.m +++ b/tikzit/src/osx/NodeLayer.m @@ -34,7 +34,7 @@ @synthesize node, selection, rescale; - (id)initWithNode:(Node *)n transformer:(Transformer*)t { - [super init]; + if (!(self = [super init])) return nil; node = n; selection = [[NodeSelectionLayer alloc] init]; [selection setNodeLayer:self]; @@ -233,7 +233,6 @@ - (void)dealloc { if (path != NULL) CFRelease(path); - [super dealloc]; } @end diff --git a/tikzit/src/osx/NodeSelectionLayer.h b/tikzit/src/osx/NodeSelectionLayer.h index 99ee75f..68d5beb 100644 --- a/tikzit/src/osx/NodeSelectionLayer.h +++ b/tikzit/src/osx/NodeSelectionLayer.h @@ -31,10 +31,10 @@ BOOL selected; CGMutablePathRef path; NSLock *drawLock; - NodeLayer *nodeLayer; + NodeLayer *__weak nodeLayer; } -@property NodeLayer *nodeLayer; +@property (weak) NodeLayer *nodeLayer; - (id)init; - (void)select; diff --git a/tikzit/src/osx/NodeSelectionLayer.m b/tikzit/src/osx/NodeSelectionLayer.m index 5efcbf7..02b8ac2 100644 --- a/tikzit/src/osx/NodeSelectionLayer.m +++ b/tikzit/src/osx/NodeSelectionLayer.m @@ -30,7 +30,7 @@ @synthesize nodeLayer; - (id)init { - [super init]; + if (!(self = [super init])) return nil; selected = NO; drawLock = [[NSLock alloc] init]; nodeLayer = nil; diff --git a/tikzit/src/osx/NodeStyle+Coder.m b/tikzit/src/osx/NodeStyle+Coder.m index 8da91c1..d3623f5 100644 --- a/tikzit/src/osx/NodeStyle+Coder.m +++ b/tikzit/src/osx/NodeStyle+Coder.m @@ -59,7 +59,7 @@ } - (id)initWithCoder:(NSCoder *)coder { - [super init]; + if (!(self = [super init])) return nil; // decode keys name = [coder decodeObjectForKey:@"name"]; diff --git a/tikzit/src/osx/PreambleController.h b/tikzit/src/osx/PreambleController.h index 3c7a7c3..5b0931d 100644 --- a/tikzit/src/osx/PreambleController.h +++ b/tikzit/src/osx/PreambleController.h @@ -38,8 +38,8 @@ @property (readonly) BOOL useDefaultPreamble; @property (readonly) Preambles *preambles; -@property (retain) NSAttributedString *preambleText; -@property (retain) NSIndexSet *selectionIndexes; +@property (strong) NSAttributedString *preambleText; +@property (strong) NSIndexSet *selectionIndexes; - (id)initWithNibName:(NSString *)nibName plist:(NSString*)plist styles:(NSArray*)sty edges:(NSArray*)edg; - (void)savePreambles:(NSString*)plist; diff --git a/tikzit/src/osx/PreambleController.m b/tikzit/src/osx/PreambleController.m index 3e55eaf..206bb30 100644 --- a/tikzit/src/osx/PreambleController.m +++ b/tikzit/src/osx/PreambleController.m @@ -29,7 +29,7 @@ @synthesize preambleText, preambles; - (id)initWithNibName:(NSString *)nibName plist:(NSString*)plist styles:(NSArray*)sty edges:(NSArray*)edg { - [super initWithNibName:nibName bundle:Nil]; + if (!(self = [super initWithNibName:nibName bundle:Nil])) return nil; preambles = (Preambles*)[NSKeyedUnarchiver unarchiveObjectWithFile:plist]; [preambles setStyles:sty]; diff --git a/tikzit/src/osx/Preambles+Coder.m b/tikzit/src/osx/Preambles+Coder.m index 6b9768a..5e468b2 100644 --- a/tikzit/src/osx/Preambles+Coder.m +++ b/tikzit/src/osx/Preambles+Coder.m @@ -27,7 +27,7 @@ @implementation Preambles (Coder) - (id)initWithCoder:(NSCoder *)coder { - [super init]; + if (!(self = [super init])) return nil; selectedPreambleName = [coder decodeObjectForKey:@"selectedPreamble"]; preambleDict = [coder decodeObjectForKey:@"preambles"]; return self; diff --git a/tikzit/src/osx/PreferenceController.h b/tikzit/src/osx/PreferenceController.h index 5a14b72..b2b23f3 100644 --- a/tikzit/src/osx/PreferenceController.h +++ b/tikzit/src/osx/PreferenceController.h @@ -25,6 +25,7 @@ #import #import "UpdatePreferenceController.h" #import "PreambleController.h" +#import "CustomNodeController.h" @interface PreferenceController : NSWindowController{ @@ -32,13 +33,17 @@ IBOutlet NSView *generalView; IBOutlet NSView *updateView; IBOutlet NSView *preambleView; + IBOutlet NSView *customNodeView; UpdatePreferenceController *updateController; PreambleController *preambleController; + CustomNodeController *customNodeController; int currentViewTag; } +- (id)initWithWindowNibName:(NSString *)windowNibName preambleController:(PreambleController *)pc; + - (IBAction)switchView:(id)sender; @end diff --git a/tikzit/src/osx/PreferenceController.m b/tikzit/src/osx/PreferenceController.m index ab992ed..099bf48 100644 --- a/tikzit/src/osx/PreferenceController.m +++ b/tikzit/src/osx/PreferenceController.m @@ -30,8 +30,8 @@ @implementation PreferenceController -- (id)initWithWindowNibName:(NSString *)windowNibName preambleController:(PreambleController*)pc{ - [super initWithWindowNibName:windowNibName]; +- (id)initWithWindowNibName:(NSString *)windowNibName preambleController:(PreambleController *)pc{ + if (!(self = [super initWithWindowNibName:windowNibName])) return nil; preambleController = pc; @@ -69,6 +69,9 @@ case 3: view = preambleView; break; + case 4: + view = customNodeView; + break; } return view; @@ -96,6 +99,11 @@ [[[self window] contentView] replaceSubview:preambleView with:[preambleController view]]; preambleView = [preambleController view]; + customNodeController = [[CustomNodeController alloc] initWithNibName:@"CustomNodes" bundle:nil]; + [[customNodeController view] setFrame:[customNodeView frame]]; + [[[self window] contentView] replaceSubview:customNodeView with:[customNodeController view]]; + customNodeView = [customNodeController view]; + [[self window] setContentSize:[preambleView frame].size]; [[[self window] contentView] addSubview:preambleView]; currentViewTag = 3; diff --git a/tikzit/src/osx/Preferences.xib b/tikzit/src/osx/Preferences.xib index 8247c8d..155cf71 100644 --- a/tikzit/src/osx/Preferences.xib +++ b/tikzit/src/osx/Preferences.xib @@ -126,6 +126,28 @@ YES 0 + + + CBA2626C-DD4C-4ADD-BD5D-26D21216D9A8 + + Custom Nodes + Custom Nodes + + + + NSImage + customshape + + + + {0, 0} + {0, 0} + YES + YES + 4 + YES + 0 + F85FE7C2-9847-4E58-8BF6-BE334E918CA7 @@ -149,15 +171,17 @@ 0 - + + + @@ -329,6 +353,17 @@ _NS:9 NSView + + + 12 + + {557, 354} + + + + _NS:9 + NSView + YES @@ -407,6 +442,22 @@ 121 + + + customNodeView + + + + 123 + + + + switchView: + + + + 125 + delegate @@ -496,6 +547,7 @@ + @@ -744,6 +796,16 @@ + + 122 + + + + + 124 + + + @@ -758,6 +820,8 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin @@ -794,7 +858,7 @@ - 121 + 125 @@ -813,12 +877,17 @@ + NSView NSView NSView NSView NSView + + customNodeView + NSView + engineView NSView @@ -859,6 +928,7 @@ {32, 32} {15, 15} + {32, 32} {32, 32} {32, 32} {32, 32} diff --git a/tikzit/src/osx/PreviewController.m b/tikzit/src/osx/PreviewController.m index 310c2ab..cf069b1 100644 --- a/tikzit/src/osx/PreviewController.m +++ b/tikzit/src/osx/PreviewController.m @@ -33,7 +33,7 @@ static PreviewController *preview = nil; - (id)initWithWindowNibName:(NSString*)nib preambleController:(PreambleController*)pc tempDir:(NSString*)dir { - [super initWithWindowNibName:nib]; + if (!(self = [super initWithWindowNibName:nib])) return nil; tempDir = [dir copy]; typesetCount = 0; preambleController = pc; diff --git a/tikzit/src/osx/PropertyInspectorController.h b/tikzit/src/osx/PropertyInspectorController.h index 0625f9b..663ee4a 100644 --- a/tikzit/src/osx/PropertyInspectorController.h +++ b/tikzit/src/osx/PropertyInspectorController.h @@ -52,11 +52,11 @@ //@property (readonly) BOOL enableNodeDataControls; //@property (readonly) BOOL enableEdgeDataControls; -@property (retain) NSMutableArray *selectedNodes; -@property (retain) NSMutableArray *selectedEdges; -@property (retain) NSMutableArray *sourceAnchorNames; -@property (retain) NSMutableArray *targetAnchorNames; -@property (retain) StylePaletteController *stylePaletteController; +@property (strong) NSMutableArray *selectedNodes; +@property (strong) NSMutableArray *selectedEdges; +@property (strong) NSMutableArray *sourceAnchorNames; +@property (strong) NSMutableArray *targetAnchorNames; +@property (strong) StylePaletteController *stylePaletteController; - (id)initWithWindowNibName:(NSString *)windowNibName; - (void)graphSelectionChanged:(NSNotification*)notification; diff --git a/tikzit/src/osx/PropertyInspectorController.m b/tikzit/src/osx/PropertyInspectorController.m index 1411549..981f746 100644 --- a/tikzit/src/osx/PropertyInspectorController.m +++ b/tikzit/src/osx/PropertyInspectorController.m @@ -25,7 +25,7 @@ @synthesize sourceAnchorNames, targetAnchorNames; - (id)initWithWindowNibName:(NSString *)windowNibName { - [super initWithWindowNibName:windowNibName]; + if (!(self = [super initWithWindowNibName:windowNibName])) return nil; noSelection = [[GraphElementData alloc] init]; [noSelection setProperty:@"" forKey:@"No Selection"]; diff --git a/tikzit/src/osx/SelectBoxLayer.m b/tikzit/src/osx/SelectBoxLayer.m index c198ffa..a7abe33 100644 --- a/tikzit/src/osx/SelectBoxLayer.m +++ b/tikzit/src/osx/SelectBoxLayer.m @@ -14,7 +14,7 @@ @synthesize active; - (id)init { - [super init]; + if (!(self = [super init])) return nil; box = CGRectMake(0.0f, 0.0f, 0.0f, 0.0f); active = NO; return self; @@ -42,7 +42,7 @@ } + (SelectBoxLayer*)layer { - return [[[SelectBoxLayer alloc] init] autorelease]; + return [[SelectBoxLayer alloc] init]; } @end diff --git a/tikzit/src/osx/SelectableNodeView.h b/tikzit/src/osx/SelectableNodeView.h index be7d1a1..6b0841d 100644 --- a/tikzit/src/osx/SelectableNodeView.h +++ b/tikzit/src/osx/SelectableNodeView.h @@ -32,7 +32,7 @@ } @property (assign) BOOL selected; -@property (retain) NodeStyle *nodeStyle; +@property (strong) NodeStyle *nodeStyle; @end diff --git a/tikzit/src/osx/SelectableNodeView.m b/tikzit/src/osx/SelectableNodeView.m index 6fdd283..797a137 100644 --- a/tikzit/src/osx/SelectableNodeView.m +++ b/tikzit/src/osx/SelectableNodeView.m @@ -30,7 +30,7 @@ @synthesize selected; - (id)initWithFrame:(NSRect)frameRect { - [super initWithFrame:frameRect]; + if (!(self = [super initWithFrame:frameRect])) return nil; nodeLayer = nil; return self; } diff --git a/tikzit/src/osx/StylePaletteController.h b/tikzit/src/osx/StylePaletteController.h index ed30b58..51404bb 100644 --- a/tikzit/src/osx/StylePaletteController.h +++ b/tikzit/src/osx/StylePaletteController.h @@ -28,8 +28,8 @@ @class SFBInspectorView; @interface StylePaletteController : NSWindowController { - NSMutableArray *nodeStyles; - NSMutableArray *edgeStyles; + NSMutableArray *__weak nodeStyles; + NSMutableArray *__weak edgeStyles; IBOutlet NSArrayController *nodeStyleArrayController; IBOutlet NSArrayController *filteredNodeStyleArrayController; IBOutlet NSArrayController *edgeStyleArrayController; @@ -43,15 +43,15 @@ NSString *displayedEdgeStyleCategory; } -@property (readonly) NSMutableArray *nodeStyles; -@property (readonly) NSMutableArray *edgeStyles; +@property (weak, readonly) NSMutableArray *nodeStyles; +@property (weak, readonly) NSMutableArray *edgeStyles; @property (readonly) BOOL documentActive; -@property (assign) NodeStyle *activeNodeStyle; -@property (assign) EdgeStyle *activeEdgeStyle; +@property (weak) NodeStyle *activeNodeStyle; +@property (weak) EdgeStyle *activeEdgeStyle; @property (copy) NSString *displayedNodeStyleCategory; @property (copy) NSString *displayedEdgeStyleCategory; -@property (readonly) NSPredicate *displayedNodeStylePredicate; -@property (readonly) NSPredicate *displayedEdgeStylePredicate; +@property (weak, readonly) NSPredicate *displayedNodeStylePredicate; +@property (weak, readonly) NSPredicate *displayedEdgeStylePredicate; //@property NSString *nodeLabel; diff --git a/tikzit/src/osx/TikzDocument.h b/tikzit/src/osx/TikzDocument.h index d817b2e..1881994 100644 --- a/tikzit/src/osx/TikzDocument.h +++ b/tikzit/src/osx/TikzDocument.h @@ -32,6 +32,6 @@ } @property (readonly) NSString *tikz; -@property (readonly) GraphicsView *graphicsView; +@property (weak, readonly) GraphicsView *graphicsView; @end diff --git a/tikzit/src/osx/TikzFormatter.m b/tikzit/src/osx/TikzFormatter.m index 8972706..9e45cb6 100644 --- a/tikzit/src/osx/TikzFormatter.m +++ b/tikzit/src/osx/TikzFormatter.m @@ -76,10 +76,6 @@ } } - [cs autorelease]; - [scanner autorelease]; - [strippedString autorelease]; - if([strippedString length] % 2 == 1){ return NO; } diff --git a/tikzit/src/osx/TikzSourceController.h b/tikzit/src/osx/TikzSourceController.h index 3408d9f..84d36da 100644 --- a/tikzit/src/osx/TikzSourceController.h +++ b/tikzit/src/osx/TikzSourceController.h @@ -27,17 +27,17 @@ #import "ParseErrorView.h" @interface TikzSourceController : NSObject { - GraphicsView *graphicsView; - NSTextView *sourceView; + GraphicsView *__weak graphicsView; + NSTextView *__unsafe_unretained sourceView; NSAttributedString *source; - NSTextField *status; + NSTextField *__weak status; NSDictionary *textAttrs; NSColor *successColor; NSColor *failedColor; - NSTextField *errorMessage; - ParseErrorView *errorNotification; + NSTextField *__weak errorMessage; + ParseErrorView *__weak errorNotification; - NSUndoManager *documentUndoManager; + NSUndoManager *__weak documentUndoManager; BOOL tikzChanged; BOOL justUndid; @@ -46,14 +46,14 @@ } @property BOOL tikzChanged; -@property IBOutlet GraphicsView *graphicsView; -@property IBOutlet NSTextView *sourceView; -@property IBOutlet NSTextField *status; -@property NSUndoManager *documentUndoManager; +@property (weak) IBOutlet GraphicsView *graphicsView; +@property (unsafe_unretained) IBOutlet NSTextView *sourceView; +@property (weak) IBOutlet NSTextField *status; +@property (weak) NSUndoManager *documentUndoManager; @property (copy) NSAttributedString *source; @property (copy) NSString *tikz; -@property IBOutlet ParseErrorView *errorNotification; -@property IBOutlet NSTextField *errorMessage; +@property (weak) IBOutlet ParseErrorView *errorNotification; +@property (weak) IBOutlet NSTextField *errorMessage; - (void)updateTikzFromGraph; - (void)graphChanged:(NSNotification*)n; diff --git a/tikzit/src/osx/TikzSourceController.m b/tikzit/src/osx/TikzSourceController.m index 737d771..84eb3a5 100644 --- a/tikzit/src/osx/TikzSourceController.m +++ b/tikzit/src/osx/TikzSourceController.m @@ -142,8 +142,12 @@ } - (BOOL)tryParseTikz { + NSError *thisError; + Graph *g = [TikzGraphAssembler parseTikz:[self tikz] - error:&lastError]; + error:&thisError]; + + lastError = thisError; if (g) { [graphicsView deselectAll:self]; @@ -230,9 +234,8 @@ } } -- (void)finalize { +- (void)dealloc { [[NSNotificationCenter defaultCenter] removeObserver:self]; - [super finalize]; } @end diff --git a/tikzit/src/osx/TikzWindowController.h b/tikzit/src/osx/TikzWindowController.h index e35b7eb..eab427c 100644 --- a/tikzit/src/osx/TikzWindowController.h +++ b/tikzit/src/osx/TikzWindowController.h @@ -11,13 +11,13 @@ @class TikzDocument, GraphicsView, TikzSourceController; @interface TikzWindowController : NSWindowController { - GraphicsView *graphicsView; - TikzSourceController *tikzSourceController; + GraphicsView *__weak graphicsView; + TikzSourceController *__weak tikzSourceController; TikzDocument *document; } -@property IBOutlet GraphicsView *graphicsView; -@property IBOutlet TikzSourceController *tikzSourceController; +@property (weak) IBOutlet GraphicsView *graphicsView; +@property (weak) IBOutlet TikzSourceController *tikzSourceController; - (id)initWithDocument:(TikzDocument*)doc; diff --git a/tikzit/src/osx/TikzWindowController.m b/tikzit/src/osx/TikzWindowController.m index 2e672d2..bfacbfb 100644 --- a/tikzit/src/osx/TikzWindowController.m +++ b/tikzit/src/osx/TikzWindowController.m @@ -16,7 +16,7 @@ @synthesize graphicsView, tikzSourceController; - (id)initWithDocument:(TikzDocument*)doc { - [super initWithWindowNibName:@"TikzDocument"]; + if (!(self = [super initWithWindowNibName:@"TikzDocument"])) return nil; document = doc; return self; } diff --git a/tikzit/src/osx/ToolPaletteController.h b/tikzit/src/osx/ToolPaletteController.h index e45c08d..6301c6b 100644 --- a/tikzit/src/osx/ToolPaletteController.h +++ b/tikzit/src/osx/ToolPaletteController.h @@ -30,13 +30,13 @@ typedef enum { } TikzTool; @interface ToolPaletteController : NSObject { - NSPanel *toolPalette; - NSMatrix *toolMatrix; + NSPanel *__weak toolPalette; + NSMatrix *__weak toolMatrix; } @property TikzTool selectedTool; -@property IBOutlet NSPanel *toolPalette; -@property IBOutlet NSMatrix *toolMatrix; +@property (weak) IBOutlet NSPanel *toolPalette; +@property (weak) IBOutlet NSMatrix *toolMatrix; @end -- cgit v1.2.3 From 4c3a82c9146aa0e147b49b429b49fefb0e785a17 Mon Sep 17 00:00:00 2001 From: Johan Paulsson Date: Tue, 25 Mar 2014 17:30:35 +0000 Subject: osx gui: custom nodes preference panel shows tikzit preview and tikz code for selected custom node. --- tikzit/English.lproj/CustomNodes.xib | 256 ++++++++++++++++++++++++++++++++ tikzit/TikZiT.xcodeproj/project.pbxproj | 26 +++- tikzit/src/common/TikzShape.h | 3 + tikzit/src/common/TikzShape.m | 4 + tikzit/src/osx/CustomNodeCellView.m | 10 +- tikzit/src/osx/CustomNodeController.h | 6 +- tikzit/src/osx/CustomNodeController.m | 53 ++----- 7 files changed, 307 insertions(+), 51 deletions(-) create mode 100644 tikzit/English.lproj/CustomNodes.xib diff --git a/tikzit/English.lproj/CustomNodes.xib b/tikzit/English.lproj/CustomNodes.xib new file mode 100644 index 0000000..33f6e3a --- /dev/null +++ b/tikzit/English.lproj/CustomNodes.xib @@ -0,0 +1,256 @@ + + + + + + + + + + + + + + + + + + + + name + strokeThickness + strokeColor + fillColor + strokeColorIsKnown + fillColorIsKnown + representedObject.name + shapeName + scale + @distinctUnionOfObjects.category + category + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \begin{tikzpicture} + +\end{tikzpicture} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tikzit/TikZiT.xcodeproj/project.pbxproj b/tikzit/TikZiT.xcodeproj/project.pbxproj index 692181b..8e3e7c9 100644 --- a/tikzit/TikZiT.xcodeproj/project.pbxproj +++ b/tikzit/TikZiT.xcodeproj/project.pbxproj @@ -143,6 +143,8 @@ 7F938530184D178B00FAED38 /* engine.png in Resources */ = {isa = PBXBuildFile; fileRef = 7F93852F184D178B00FAED38 /* engine.png */; }; 7F938532184D184700FAED38 /* preamble.png in Resources */ = {isa = PBXBuildFile; fileRef = 7F938531184D184700FAED38 /* preamble.png */; }; 7FB9BFEE16B57C2E00773146 /* TikzFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FB9BFED16B57C2E00773146 /* TikzFormatter.m */; }; + 7FD5D44B18E1CB5300E2A930 /* CustomNodes.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7FD5D44918E1CB5300E2A930 /* CustomNodes.xib */; }; + 7FD5D44D18E1CC0B00E2A930 /* customshape.png in Resources */ = {isa = PBXBuildFile; fileRef = 7FD5D44C18E1CC0B00E2A930 /* customshape.png */; }; 7FEED45716B1A7C500B056CB /* StyleManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FEED45616B1A7C500B056CB /* StyleManager.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 8D15AC2C0486D014006FF6A4 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 2A37F4B9FDCFA73011CA2CEA /* Credits.rtf */; }; 8D15AC2F0486D014006FF6A4 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165FFE840EACC02AAC07 /* InfoPlist.strings */; }; @@ -379,6 +381,8 @@ 7F938531184D184700FAED38 /* preamble.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = preamble.png; sourceTree = ""; }; 7FB9BFEC16B57C2E00773146 /* TikzFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TikzFormatter.h; path = src/osx/TikzFormatter.h; sourceTree = ""; }; 7FB9BFED16B57C2E00773146 /* TikzFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TikzFormatter.m; path = src/osx/TikzFormatter.m; sourceTree = ""; }; + 7FD5D44A18E1CB5300E2A930 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/CustomNodes.xib; sourceTree = ""; }; + 7FD5D44C18E1CC0B00E2A930 /* customshape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = customshape.png; sourceTree = ""; }; 7FEED45516B1A7C400B056CB /* StyleManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StyleManager.h; path = src/common/StyleManager.h; sourceTree = ""; }; 7FEED45616B1A7C500B056CB /* StyleManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = StyleManager.m; path = src/common/StyleManager.m; sourceTree = ""; }; 8D15AC360486D014006FF6A4 /* TikZiT-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "TikZiT-Info.plist"; sourceTree = ""; }; @@ -511,6 +515,7 @@ 55D945701165904F0044178C /* tikzitdoc.icns */, 55D945711165904F0044178C /* tikzit.icns */, 7F90E88C16DD47540069EBCD /* Preferences.xib */, + 7FD5D44918E1CB5300E2A930 /* CustomNodes.xib */, 7F18A322184C599100BC3081 /* UpdatePreferencePanel.xib */, 55391AF713D3250F007DBE71 /* Preamble.xib */, 55391AF513D324FE007DBE71 /* Preview.xib */, @@ -768,6 +773,7 @@ children = ( 7F93852F184D178B00FAED38 /* engine.png */, 7F938531184D184700FAED38 /* preamble.png */, + 7FD5D44C18E1CC0B00E2A930 /* customshape.png */, 7F93852D184D176E00FAED38 /* updates.png */, ); name = Icons; @@ -865,6 +871,7 @@ 1DDD582C0DA1D0D100B32029 /* TikzDocument.xib in Resources */, 7F938530184D178B00FAED38 /* engine.png in Resources */, 1DDD582D0DA1D0D100B32029 /* MainMenu.xib in Resources */, + 7FD5D44D18E1CC0B00E2A930 /* customshape.png in Resources */, 55D945721165904F0044178C /* tikzitdoc.icns in Resources */, 55D945731165904F0044178C /* tikzit.icns in Resources */, 556979431168747B007E5703 /* StylePalette.xib in Resources */, @@ -888,6 +895,7 @@ 55397C8A1449AB91006942FB /* AH_none.png in Resources */, 55397C8B1449AB91006942FB /* AH_plain_tail.png in Resources */, 55397C8D1449ABFC006942FB /* AH_latex_tail.png in Resources */, + 7FD5D44B18E1CB5300E2A930 /* CustomNodes.xib in Resources */, 55397C901449AC7C006942FB /* AH_latex_head.png in Resources */, 55397C911449AC7C006942FB /* AH_plain_head.png in Resources */, 7F18A323184C599100BC3081 /* UpdatePreferencePanel.xib in Resources */, @@ -909,11 +917,12 @@ ); name = "Run Flex"; outputPaths = ( - "$(SRCROOT)/src/common/tikzlexer.m", + "$(DERIVED_SOURCES_DIR)/tikzlexer.m", + "$(DERIVED_SOURCES_DIR)/tikzlexer.h", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "cd ${SRCROOT}/src/\nINPUT_FILE_BASE=`basename \"${SCRIPT_INPUT_FILE_0}\" .lm`\nflex -o common/${INPUT_FILE_BASE}.m common/${INPUT_FILE_BASE}.lm\nmv common/${INPUT_FILE_BASE}.m common/${INPUT_FILE_BASE}.h ${DERIVED_SOURCES_DIR}\n"; + shellScript = "cd ${SRCROOT}/src/\nexport INPUT_FILE_BASE=`basename \"${SCRIPT_INPUT_FILE_0}\" .lm`\nflex -o common/${INPUT_FILE_BASE}.m common/${INPUT_FILE_BASE}.lm\nmv common/${INPUT_FILE_BASE}.m common/${INPUT_FILE_BASE}.h ${DERIVED_SOURCES_DIR}\n"; }; 7F7B6DE118DE0A6E004F6CA8 /* Run Bison */ = { isa = PBXShellScriptBuildPhase; @@ -925,11 +934,12 @@ ); name = "Run Bison"; outputPaths = ( - "$(SRCROOT)/src/common/tikzparser.m", + "$(DERIVED_SOURCES_DIR)/tikzparser.m", + "$(DERIVED_SOURCES_DIR)/tikzparser.h", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "cd ${SRCROOT}/src/\nINPUT_FILE_BASE=`basename \"${SCRIPT_INPUT_FILE_0}\" .ym`\nflex -o common/${INPUT_FILE_BASE}.m common/${INPUT_FILE_BASE}.lm\nbison --defines=common/${INPUT_FILE_BASE}.h --output=common/${INPUT_FILE_BASE}.m common/${INPUT_FILE_BASE}.ym\nmv common/${INPUT_FILE_BASE}.m common/${INPUT_FILE_BASE}.h ${DERIVED_SOURCES_DIR}"; + shellScript = "cd ${SRCROOT}/src/\nexport INPUT_FILE_BASE=`basename \"${SCRIPT_INPUT_FILE_0}\" .ym`\nbison --defines=common/${INPUT_FILE_BASE}.h --output=common/${INPUT_FILE_BASE}.m common/${INPUT_FILE_BASE}.ym\nmv common/${INPUT_FILE_BASE}.m common/${INPUT_FILE_BASE}.h ${DERIVED_SOURCES_DIR}"; }; /* End PBXShellScriptBuildPhase section */ @@ -1124,6 +1134,14 @@ name = UserDefaults.plist; sourceTree = ""; }; + 7FD5D44918E1CB5300E2A930 /* CustomNodes.xib */ = { + isa = PBXVariantGroup; + children = ( + 7FD5D44A18E1CB5300E2A930 /* English */, + ); + name = CustomNodes.xib; + sourceTree = ""; + }; /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ diff --git a/tikzit/src/common/TikzShape.h b/tikzit/src/common/TikzShape.h index 1ccf658..6a91f91 100644 --- a/tikzit/src/common/TikzShape.h +++ b/tikzit/src/common/TikzShape.h @@ -25,8 +25,11 @@ #import "Shape.h" @interface TikzShape : Shape { + NSString *tikzSrc; } +@property (copy) NSString *tikzSrc; + - (id)initWithTikzFile:(NSString*)file; @end diff --git a/tikzit/src/common/TikzShape.m b/tikzit/src/common/TikzShape.m index 9735371..c07c61e 100644 --- a/tikzit/src/common/TikzShape.m +++ b/tikzit/src/common/TikzShape.m @@ -26,6 +26,8 @@ @implementation TikzShape +@synthesize tikzSrc; + - (id)initWithTikzFile:(NSString*)file { self = [super init]; if (self) { @@ -33,6 +35,8 @@ encoding:NSUTF8StringEncoding error:NULL]; if (tikz == nil) return nil; + + tikzSrc = [tikz copy]; Graph *graph = [Graph graphFromTikz:tikz]; if (graph == nil) return nil; diff --git a/tikzit/src/osx/CustomNodeCellView.m b/tikzit/src/osx/CustomNodeCellView.m index 57ef24a..612394b 100644 --- a/tikzit/src/osx/CustomNodeCellView.m +++ b/tikzit/src/osx/CustomNodeCellView.m @@ -31,8 +31,6 @@ } -(void)drawLayer:(CALayer *)layer inContext:(CGContextRef)context { - NSLog(@"drawing layer ^^"); - if (nodeLayer!=nil) { if (![[[self layer] sublayers] containsObject:nodeLayer]) { [[self layer] addSublayer:nodeLayer]; @@ -56,17 +54,23 @@ } - (void) setObjectValue:(id)objectValue{ - [[self textField] setStringValue:[(NodeStyle *)objectValue shapeName]]; + if(objectValue == nil) + return; + nodeStyle = (NodeStyle *)objectValue; + [[self textField] setStringValue:[nodeStyle shapeName]]; if (nodeLayer == nil) { nodeLayer = [[NodeLayer alloc] initWithNode:[Node node] transformer:[Transformer defaultTransformer]]; [nodeLayer setRescale:NO]; } + [nodeStyle setName:[nodeStyle shapeName]]; [[nodeLayer node] setStyle:nodeStyle]; [nodeLayer updateFrame]; + + NSLog(@"asd"); } - (void)setBackgroundStyle:(NSBackgroundStyle)backgroundStyle { diff --git a/tikzit/src/osx/CustomNodeController.h b/tikzit/src/osx/CustomNodeController.h index 56cb74c..5553fcd 100644 --- a/tikzit/src/osx/CustomNodeController.h +++ b/tikzit/src/osx/CustomNodeController.h @@ -18,14 +18,16 @@ @interface CustomNodeController : NSViewController { NSDictionary* __weak nodeStyles; NSMutableArray* customNodeStyles; - NSMutableArray* __weak onodeStyles; GraphicsView *__weak graphicsView; TikzSourceController *__weak tikzSourceController; + NSTableView *customNodeTable; } @property (weak, readonly) NSDictionary *nodeStyles; -@property (weak, readonly) NSMutableArray* onodeStyles; +@property NSMutableArray* customNodeStyles; + +@property IBOutlet NSTableView *customNodeTable; @property (weak) IBOutlet GraphicsView *graphicsView; @property (weak) IBOutlet TikzSourceController *tikzSourceController; diff --git a/tikzit/src/osx/CustomNodeController.m b/tikzit/src/osx/CustomNodeController.m index ef6b5bd..4f46acc 100644 --- a/tikzit/src/osx/CustomNodeController.m +++ b/tikzit/src/osx/CustomNodeController.m @@ -15,71 +15,40 @@ @implementation CustomNodeController -@synthesize nodeStyles, onodeStyles; +@synthesize nodeStyles, customNodeStyles; @synthesize graphicsView, tikzSourceController; +@synthesize customNodeTable; - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { if (self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]) { -// [SupportDir createUserSupportDir]; -// NSString *supportDir = [SupportDir userSupportDir]; - -// NSString *ns = [supportDir stringByAppendingPathComponent:@"nodeStyles.plist"]; -// NSString *es = [supportDir stringByAppendingPathComponent:@"edgeStyles.plist"]; -// onodeStyles = (NSMutableArray*)[NSKeyedUnarchiver -// unarchiveObjectWithFile:ns]; - // edgeStyles = (NSMutableArray*)[NSKeyedUnarchiver -// unarchiveObjectWithFile:es]; - - if (onodeStyles == nil) onodeStyles = [NSMutableArray array]; -// if (edgeStyles == nil) edgeStyles = [NSMutableArray array]; - -// [[self window] setLevel:NSNormalWindowLevel]; -// [self showWindow:self]; - - // Initialization code here. - - NSLog(@"Custom Node controller up and running!"); - - nodeStyles= [Shape shapeDictionary]; - + nodeStyles = [Shape shapeDictionary]; customNodeStyles = [NSMutableArray array]; - NSLog(@"Got a shape dictionary?"); - - NSString *meh; - for(id key in nodeStyles) { Shape *value = [nodeStyles objectForKey:key]; if([value isKindOfClass:[TikzShape class]]){ - NSLog(@"Got a custom node shape!"); NodeStyle *newNodeStyle = [[NodeStyle alloc] init]; [newNodeStyle setShapeName:key]; [customNodeStyles addObject:newNodeStyle]; - [onodeStyles addObject:newNodeStyle]; - -// meh = [(TikzShape *) value tikz]; } } - - NSLog(@"Trying to display tikz."); - -// [tikzSourceController setTikz:meh]; -// [tikzSourceController parseTikz:self]; } return self; } --(NSArray *)onodeStyles{ - return onodeStyles; - //return [nodeStyles allValues]; -} - - (void)tableViewSelectionDidChange:(NSNotification *)aNotification{ - NSLog(@"Changed selection!"); + NSInteger selectedRow = [customNodeTable selectedRow]; + + NodeStyle* selectedNodeStyle = [customNodeStyles objectAtIndex:selectedRow]; + TikzShape *tikzshape = (TikzShape *) [nodeStyles objectForKey:[selectedNodeStyle shapeName]]; + + [[tikzSourceController graphicsView] setEnabled:NO]; + [tikzSourceController setTikz:[tikzshape tikzSrc]]; + [tikzSourceController parseTikz:self]; } - (id)valueForUndefinedKey:(NSString *)key{ -- cgit v1.2.3 From 32cb63c5115d1eaa1422114861514293ddd74f6d Mon Sep 17 00:00:00 2001 From: Johan Paulsson Date: Tue, 25 Mar 2014 17:37:29 +0000 Subject: trading a crash for a memory leak --- tikzit/src/common/GraphElementProperty.m | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tikzit/src/common/GraphElementProperty.m b/tikzit/src/common/GraphElementProperty.m index 3cf6632..1acdc09 100644 --- a/tikzit/src/common/GraphElementProperty.m +++ b/tikzit/src/common/GraphElementProperty.m @@ -66,7 +66,8 @@ - (void) dealloc { [key release]; - [value release]; +// the below line causes a exc_bad_access. Uncommenting it gains a memory leak but at least no crashing. +// [value release]; [super dealloc]; } -- cgit v1.2.3 From 716720ef5a61463c6d6cb1168fccad88f7addb76 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 25 Mar 2014 17:47:20 +0000 Subject: dummy commit --- tikzit/README | 1 - 1 file changed, 1 deletion(-) diff --git a/tikzit/README b/tikzit/README index e5d3c64..4d3eab1 100644 --- a/tikzit/README +++ b/tikzit/README @@ -5,4 +5,3 @@ For more info, see http://tikzit.sf.net On OS/X, the Cocoa framework is used. On other platforms, GTK+ and GNUstep are used. - -- cgit v1.2.3 From 1e65c32b799b7ca262f266737a867240eeb451f8 Mon Sep 17 00:00:00 2001 From: Johan Paulsson Date: Tue, 25 Mar 2014 20:41:44 +0000 Subject: fixing a couple of attributes that stopped selectable nodes from showing --- tikzit/src/osx/AppDelegate.h | 4 ++-- tikzit/src/osx/CustomNodeController.h | 4 ++-- tikzit/src/osx/GraphicsView.h | 4 ++-- tikzit/src/osx/NodeLayer.h | 4 ++-- tikzit/src/osx/NodeSelectionLayer.h | 4 ++-- tikzit/src/osx/StylePaletteController.h | 18 +++++++++--------- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/tikzit/src/osx/AppDelegate.h b/tikzit/src/osx/AppDelegate.h index 0f9d787..67389e4 100644 --- a/tikzit/src/osx/AppDelegate.h +++ b/tikzit/src/osx/AppDelegate.h @@ -37,13 +37,13 @@ PreambleController *preambleController; PreviewController *previewController; PreferenceController *preferenceController; - ToolPaletteController *__weak toolPaletteController; + ToolPaletteController *toolPaletteController; IBOutlet GraphicsView *graphicsView; NSString *tempDir; } @property IBOutlet StylePaletteController *stylePaletteController; -@property (weak) IBOutlet ToolPaletteController *toolPaletteController; +@property (strong) IBOutlet ToolPaletteController *toolPaletteController; - (void)awakeFromNib; + (void)setDefaults; diff --git a/tikzit/src/osx/CustomNodeController.h b/tikzit/src/osx/CustomNodeController.h index 5553fcd..67adf0b 100644 --- a/tikzit/src/osx/CustomNodeController.h +++ b/tikzit/src/osx/CustomNodeController.h @@ -16,7 +16,7 @@ #import "SupportDir.h" @interface CustomNodeController : NSViewController { - NSDictionary* __weak nodeStyles; + NSDictionary *nodeStyles; NSMutableArray* customNodeStyles; GraphicsView *__weak graphicsView; @@ -24,7 +24,7 @@ NSTableView *customNodeTable; } -@property (weak, readonly) NSDictionary *nodeStyles; +@property NSDictionary *nodeStyles; @property NSMutableArray* customNodeStyles; @property IBOutlet NSTableView *customNodeTable; diff --git a/tikzit/src/osx/GraphicsView.h b/tikzit/src/osx/GraphicsView.h index c3c2add..329b1e5 100644 --- a/tikzit/src/osx/GraphicsView.h +++ b/tikzit/src/osx/GraphicsView.h @@ -92,12 +92,12 @@ typedef enum { NSUndoManager *documentUndoManager; NSPoint startPoint; - TikzSourceController *__weak tikzSourceController; + TikzSourceController *tikzSourceController; } @property BOOL enabled; @property (weak) Graph *graph; -@property (weak) IBOutlet TikzSourceController *tikzSourceController; +@property IBOutlet TikzSourceController *tikzSourceController; @property (readonly) Transformer *transformer; @property (readonly) PickSupport *pickSupport; diff --git a/tikzit/src/osx/NodeLayer.h b/tikzit/src/osx/NodeLayer.h index d2a943b..dbcdac5 100644 --- a/tikzit/src/osx/NodeLayer.h +++ b/tikzit/src/osx/NodeLayer.h @@ -30,7 +30,7 @@ #import "NodeSelectionLayer.h" @interface NodeLayer : CALayer { - Node *__weak node; + Node *node; Shape *shape; CGMutablePathRef path; float textwidth; @@ -42,7 +42,7 @@ BOOL dirty; // need to rebuild CGBezierPath of the shape } -@property (weak) Node *node; +@property (strong) Node *node; @property (assign) NSPoint center; @property (assign) BOOL rescale; @property (strong) NodeSelectionLayer *selection; diff --git a/tikzit/src/osx/NodeSelectionLayer.h b/tikzit/src/osx/NodeSelectionLayer.h index 68d5beb..99ee75f 100644 --- a/tikzit/src/osx/NodeSelectionLayer.h +++ b/tikzit/src/osx/NodeSelectionLayer.h @@ -31,10 +31,10 @@ BOOL selected; CGMutablePathRef path; NSLock *drawLock; - NodeLayer *__weak nodeLayer; + NodeLayer *nodeLayer; } -@property (weak) NodeLayer *nodeLayer; +@property NodeLayer *nodeLayer; - (id)init; - (void)select; diff --git a/tikzit/src/osx/StylePaletteController.h b/tikzit/src/osx/StylePaletteController.h index 51404bb..0242b61 100644 --- a/tikzit/src/osx/StylePaletteController.h +++ b/tikzit/src/osx/StylePaletteController.h @@ -28,8 +28,8 @@ @class SFBInspectorView; @interface StylePaletteController : NSWindowController { - NSMutableArray *__weak nodeStyles; - NSMutableArray *__weak edgeStyles; + NSMutableArray *nodeStyles; + NSMutableArray *edgeStyles; IBOutlet NSArrayController *nodeStyleArrayController; IBOutlet NSArrayController *filteredNodeStyleArrayController; IBOutlet NSArrayController *edgeStyleArrayController; @@ -43,15 +43,15 @@ NSString *displayedEdgeStyleCategory; } -@property (weak, readonly) NSMutableArray *nodeStyles; -@property (weak, readonly) NSMutableArray *edgeStyles; -@property (readonly) BOOL documentActive; -@property (weak) NodeStyle *activeNodeStyle; -@property (weak) EdgeStyle *activeEdgeStyle; +@property (strong) NSMutableArray *nodeStyles; +@property (strong) NSMutableArray *edgeStyles; +@property BOOL documentActive; +@property (strong) NodeStyle *activeNodeStyle; +@property (strong) EdgeStyle *activeEdgeStyle; @property (copy) NSString *displayedNodeStyleCategory; @property (copy) NSString *displayedEdgeStyleCategory; -@property (weak, readonly) NSPredicate *displayedNodeStylePredicate; -@property (weak, readonly) NSPredicate *displayedEdgeStylePredicate; +@property (weak) NSPredicate *displayedNodeStylePredicate; +@property (weak) NSPredicate *displayedEdgeStylePredicate; //@property NSString *nodeLabel; -- cgit v1.2.3 From 53009ac3c49cab59f4e5384d0500a5729e847555 Mon Sep 17 00:00:00 2001 From: Johan Paulsson Date: Tue, 25 Mar 2014 20:53:30 +0000 Subject: minor semantical errors --- tikzit/src/osx/AppDelegate.h | 2 +- tikzit/src/osx/AppDelegate.m | 2 +- tikzit/src/osx/StylePaletteController.h | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tikzit/src/osx/AppDelegate.h b/tikzit/src/osx/AppDelegate.h index 67389e4..92d9add 100644 --- a/tikzit/src/osx/AppDelegate.h +++ b/tikzit/src/osx/AppDelegate.h @@ -28,7 +28,7 @@ #import "PreambleController.h" #import "PreviewController.h" #import "GraphicsView.h" -#import "PreferenceController.h"; +#import "PreferenceController.h" @interface AppDelegate : NSObject { NSMapTable *table; diff --git a/tikzit/src/osx/AppDelegate.m b/tikzit/src/osx/AppDelegate.m index 35484b7..94f5507 100644 --- a/tikzit/src/osx/AppDelegate.m +++ b/tikzit/src/osx/AppDelegate.m @@ -110,7 +110,7 @@ } - (IBAction)togglePreamble:(id)sender { - [self toggleController:preambleController]; + [self toggleController:(NSWindowController *) preambleController]; } - (IBAction)togglePreferences:(id)sender { diff --git a/tikzit/src/osx/StylePaletteController.h b/tikzit/src/osx/StylePaletteController.h index 0242b61..05f0684 100644 --- a/tikzit/src/osx/StylePaletteController.h +++ b/tikzit/src/osx/StylePaletteController.h @@ -45,13 +45,13 @@ @property (strong) NSMutableArray *nodeStyles; @property (strong) NSMutableArray *edgeStyles; -@property BOOL documentActive; +@property (readonly) BOOL documentActive; @property (strong) NodeStyle *activeNodeStyle; @property (strong) EdgeStyle *activeEdgeStyle; @property (copy) NSString *displayedNodeStyleCategory; @property (copy) NSString *displayedEdgeStyleCategory; -@property (weak) NSPredicate *displayedNodeStylePredicate; -@property (weak) NSPredicate *displayedEdgeStylePredicate; +@property (readonly) NSPredicate *displayedNodeStylePredicate; +@property (readonly) NSPredicate *displayedEdgeStylePredicate; //@property NSString *nodeLabel; -- cgit v1.2.3 From db9056504a45f3df48952b79995781a85514f8ba Mon Sep 17 00:00:00 2001 From: Johan Paulsson Date: Tue, 25 Mar 2014 21:14:47 +0000 Subject: Changed deprecated method Changed directoryContentsAtPath: deprecated in 10.5 to contentsOfDirectoryAtPath:error: introduced in 10.5 --- tikzit/src/common/Shape.m | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tikzit/src/common/Shape.m b/tikzit/src/common/Shape.m index eb466e2..5dc25e3 100644 --- a/tikzit/src/common/Shape.m +++ b/tikzit/src/common/Shape.m @@ -88,7 +88,8 @@ NSDictionary *shapeDictionary = nil; + (void)addShapesInDir:(NSString*)shapeDir to:(NSMutableDictionary*)shapeDict { NSFileManager *fileManager = [NSFileManager defaultManager]; - NSArray *files = [fileManager directoryContentsAtPath:shapeDir]; + NSError *err = nil; + NSArray *files = [fileManager contentsOfDirectoryAtPath:shapeDir error:&err]; if (files != nil) { NSString *nm; -- cgit v1.2.3 From 08be64f38faef12393854ee4da484b144752d77e Mon Sep 17 00:00:00 2001 From: Johan Paulsson Date: Tue, 25 Mar 2014 21:34:12 +0000 Subject: gui: adding a couple of preference options Added preference options for autocompletion and inspectors on top. --- tikzit/English.lproj/PropertyInspector.xib | 4548 +++++--------------------- tikzit/src/osx/PreferenceController.m | 6 +- tikzit/src/osx/Preferences.xib | 301 +- tikzit/src/osx/PropertyInspectorController.m | 7 +- tikzit/src/osx/StylePaletteController.m | 7 +- tikzit/src/osx/TikzFormatter.m | 4 + 6 files changed, 1052 insertions(+), 3821 deletions(-) diff --git a/tikzit/English.lproj/PropertyInspector.xib b/tikzit/English.lproj/PropertyInspector.xib index 91e30c3..9f19b5c 100644 --- a/tikzit/English.lproj/PropertyInspector.xib +++ b/tikzit/English.lproj/PropertyInspector.xib @@ -1,3779 +1,769 @@ - - - - 1070 - 12C60 - 2844 - 1187.34 - 625.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 2844 - - - IBCustomFormatter - NSArrayController - NSBox - NSButton - NSButtonCell - NSComboBox - NSComboBoxCell - NSCustomObject - NSCustomView - NSScrollView - NSScroller - NSTableColumn - NSTableHeaderView - NSTableView - NSTextField - NSTextFieldCell - NSView - NSWindowTemplate - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - PropertyInspectorController - - - FirstResponder - - - NSApplication - - - 151 - 2 - {{1219, 531}, {193, 256}} - -1540357120 - Property Inspector - NSPanel - - - {200, 230} - - - 256 - - - - 274 - {193, 256} - - - SFBInspectorView - - - {193, 256} - - - - {{0, 0}, {1920, 1200}} - {200, 246} - {10000000000000, 10000000000000} - YES - - - - 268 - - - - 268 - - - - 2304 - - - - 256 - {183, 74} - - - YES - NO - YES - - - 256 - {183, 17} - - - - - - - -2147483392 - {{224, 0}, {16, 17}} - - - - - 85 - 40 - 1000 - - 75497536 - 2048 - Key/Atom - - LucidaGrande - 11 - 3100 - - - 3 - MC4zMzMzMzI5ODU2AA - - - 6 - System - headerTextColor - - 3 - MAA - - - - - 337641536 - 2048 - Text Cell - - LucidaGrande - 11 - 16 - - - - 6 - System - controlBackgroundColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - - - 3 - YES - YES - - - - 92 - 40 - 1000 - - 75497536 - 2048 - Value - - - - - - 337641536 - 2048 - Text Cell - - - - - - 3 - YES - YES - - - - 3 - 2 - - 3 - MQA - - - 6 - System - gridColor - - 3 - MC41AA - - - 17 - -700448768 - - - 4 - 15 - 0 - YES - 0 - 1 - - - {{1, 17}, {183, 74}} - - - - - 4 - - - - -2147483392 - {{224, 17}, {15, 102}} - - - NO - - _doScroller: - 0.87903225806451613 - - - - -2147483392 - {{1, 75}, {183, 16}} - - - NO - 1 - - _doScroller: - 0.99450549450549453 - - - - 2304 - - - - {{1, 0}, {183, 17}} - - - - - 4 - - - {{4, 31}, {185, 92}} - - - 133682 - - - - - QSAAAEEgAABBmAAAQZgAAA - 0.25 - 4 - 1 - - - - 268 - {{54, 127}, {134, 19}} - - - YES - - -1804599231 - 272630784 - - - - YES - - 6 - System - textBackgroundColor - - - - 6 - System - textColor - - - - NO - - - - 292 - {{53, 3}, {26, 26}} - - - YES - - -2080374784 - 134217728 - - - LucidaGrande - 13 - 1044 - - - -2033434624 - 162 - - NSImage - NSRemoveTemplate - - - - 400 - 75 - - NO - - - - 292 - {{28, 3}, {26, 26}} - - - YES - - -2080374784 - 134217728 - a - - LucidaGrande - 9 - 16 - - - -2033434624 - 162 - - NSImage - NSAddTemplate - - - - 400 - 75 - - NO - - - - 292 - {{4, 3}, {26, 26}} - - - YES - - -2080374784 - 134217728 - - - - -2032386048 - 162 - - - - 400 - 75 - - NO - - - - 268 - {{7, 128}, {38, 14}} - - - YES - - 68157504 - 272630784 - Label - - LucidaGrande-Bold - 11 - 16 - - - - 6 - System - controlColor - - - - - NO - - - {193, 152} - - - NSView - - - - 268 - - - - 268 - - - - 2304 - - - - 256 - {183, 74} - - - YES - NO - YES - - - 256 - {183, 17} - - - - - - - -2147483392 - {{224, 0}, {16, 17}} - - - - - 85 - 40 - 1000 - - 75497536 - 2048 - Key/Atom - - - 3 - MC4zMzMzMzI5ODU2AA - - - - - 337641536 - 2048 - Text Cell - - - - - - 3 - YES - YES - - - - 92 - 40 - 1000 - - 75497536 - 2048 - Value - - - - - - 337641536 - 2048 - Text Cell - - - - - - 3 - YES - YES - - - - 3 - 2 - - - 17 - -700448768 - - - 4 - 15 - 0 - YES - 0 - 1 - - - {{1, 17}, {183, 74}} - - - - - 4 - - - - -2147483392 - {{224, 17}, {15, 102}} - - - NO - - _doScroller: - 0.87903225806451613 - - - - -2147483392 - {{1, 75}, {183, 16}} - - - NO - 1 - - _doScroller: - 0.99450549450549453 - - - - 2304 - - - - {{1, 0}, {183, 17}} - - - - - 4 - - - {{4, 33}, {185, 92}} - - - 133682 - - - - - QSAAAEEgAABBmAAAQZgAAA - 0.25 - 4 - 1 - - - - 292 - {{53, 4}, {26, 26}} - - - YES - - -2080374784 - 134217728 - - - - -2033434624 - 162 - - - - 400 - 75 - - NO - - - - 292 - {{28, 4}, {26, 26}} - - - YES - - -2080374784 - 134217728 - a - - - -2033434624 - 162 - - - - 400 - 75 - - NO - - - - 292 - {{4, 4}, {26, 26}} - - - YES - - -2080374784 - 134217728 - - - - -2032386048 - 162 - - - - 400 - 75 - - NO - - - {193, 130} - - - NSView - - - - 268 - - - - 268 - {{59, 152}, {133, 26}} - - - _NS:9 - YES - - 342884416 - 272630784 - - - _NS:9 - - YES - - - 5 - YES - YES - - - - 274 - {13, 0} - - - _NS:24 - YES - NO - YES - - - 10 - 10 - 1000 - - 75497472 - 0 - - - LucidaGrande - 12 - 16 - - - 3 - MC4zMzMzMzI5ODU2AA - - - - - 338690112 - 1024 - - - YES - - - - 3 - YES - - - - 3 - 2 - - - 19 - tableViewAction: - -765427712 - - - - 1 - 15 - 0 - YES - 0 - 1 - - - NO - - - - 268 - {{59, 178}, {133, 26}} - - - _NS:9 - YES - - 342884416 - 272630784 - - - _NS:9 - - YES - - - 5 - YES - YES - - - - 274 - {13, 0} - - - _NS:24 - YES - NO - YES - - - 10 - 10 - 1000 - - 75497472 - 0 - - - - 3 - MC4zMzMzMzI5ODU2AA - - - - - 338690112 - 1024 - - - YES - - - - 3 - YES - - - - 3 - 2 - - - 19 - tableViewAction: - -765427712 - - - - 1 - 15 - 0 - YES - 0 - 1 - - - NO - - - - 12 - {{4, 146}, {185, 5}} - - - {0, 0} - - 67108864 - 0 - Box - - - - 3 - MCAwLjgwMDAwMDAxMTkAA - - - 3 - 2 - 0 - NO - - - - 268 - {{55, 107}, {134, 19}} - - - YES - - -1804599231 - 272630784 - - - - YES - - - - NO - - - - 268 - {{12, 159}, {42, 14}} - - - YES - - 68157504 - 272630784 - Target - - - - - - NO - - - - 268 - {{12, 185}, {42, 14}} - - - YES - - 68157504 - 272630784 - Source - - - - - - NO - - - - 268 - {{4, 202}, {51, 14}} - - - YES - - 68157504 - 272630784 - Anchors - - - - - - NO - - - - 268 - {{8, 107}, {38, 14}} - - - YES - - 68157504 - 272630784 - Label - - - - - - NO - - - - 268 - {{3, 126}, {82, 18}} - - - YES - - 67108864 - 0 - Child Node - - - 1211912448 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 - - NO - - - - 268 - - - - 2304 - - - - 256 - {183, 44} - - - YES - NO - YES - - - 256 - {183, 17} - - - - - - - -2147483392 - {{224, 0}, {16, 17}} - - - - 85 - 40 - 1000 - - 75497536 - 2048 - Key/Atom - - - 3 - MC4zMzMzMzI5ODU2AA - - - - - 337641536 - 2048 - Text Cell - - - - - - 3 - YES - YES - - - - 92 - 40 - 1000 - - 75497536 - 2048 - Value - - - - - - 337641536 - 2048 - Text Cell - - - - - - 3 - YES - YES - - - - 3 - 2 - - - 17 - -700448768 - - - 4 - 15 - 0 - YES - 0 - 1 - - - {{1, 17}, {183, 44}} - - - - - 4 - - - - -2147483392 - {{224, 17}, {15, 102}} - - - NO - - _doScroller: - 0.87903225806451613 - - - - -2147483392 - {{1, 45}, {183, 16}} - - - NO - 1 - - _doScroller: - 0.99450549450549453 - - - - 2304 - - - - {{1, 0}, {183, 17}} - - - - - 4 - - - {{4, 37}, {185, 62}} - - - 133682 - - - - - QSAAAEEgAABBmAAAQZgAAA - 0.25 - 4 - 1 - - - - 268 - - - - 2304 - - - - 256 - {183, 74} - - - YES - NO - YES - - - 256 - {183, 17} - - - - - - - -2147483392 - {{224, 0}, {16, 17}} - - - - - 85 - 40 - 1000 - - 75497536 - 2048 - Key/Atom - - - 3 - MC4zMzMzMzI5ODU2AA - - - - - 337641536 - 2048 - Text Cell - - - - - - 3 - YES - YES - - - - 92 - 40 - 1000 - - 75497536 - 2048 - Value - - - - - - 337641536 - 2048 - Text Cell - - - - - - 3 - YES - YES - - - - 3 - 2 - - - 17 - -700448768 - - - 4 - 15 - 0 - YES - 0 - 1 - - - {{1, 17}, {183, 74}} - - - - - 4 - - - - -2147483392 - {{224, 17}, {15, 102}} - - - NO - - _doScroller: - 0.87903225806451613 - - - - -2147483392 - {{1, 75}, {183, 16}} - - - NO - 1 - - _doScroller: - 0.99450549450549453 - - - - 2304 - - - - {{1, 0}, {183, 17}} - - - - - 4 - - - {{4, 247}, {185, 92}} - - - 133682 - - - - - QSAAAEEgAABBmAAAQZgAAA - 0.25 - 4 - 1 - - - - 292 - {{53, 8}, {26, 26}} - - - YES - - -2080374784 - 134217728 - - - - -2033434624 - 162 - - - - 400 - 75 - - NO - - - - 292 - {{28, 8}, {26, 26}} - - - YES - - -2080374784 - 134217728 - a - - - -2033434624 - 162 - - - - 400 - 75 - - NO - - - - 292 - {{4, 8}, {26, 26}} - - - YES - - -2080374784 - 134217728 - - - - -2032386048 - 162 - - - - 400 - 75 - - NO - - - - 292 - {{53, 218}, {26, 26}} - - - YES - - -2080374784 - 134217728 - - - - -2033434624 - 162 - - - - 400 - 75 - - NO - - - - 292 - {{28, 218}, {26, 26}} - - - YES - - -2080374784 - 134217728 - a - - - -2033434624 - 162 - - - - 400 - 75 - - NO - - - - 292 - {{4, 218}, {26, 26}} - - - YES - - -2080374784 - 134217728 - - - - -2032386048 - 162 - - - - 400 - 75 - - NO - - - {193, 344} - - - NSView - - - - key - value - isAtom - - Property - YES - - YES - YES - YES - YES - YES - - - - key - value - isAtom - - Property - YES - - YES - YES - YES - YES - YES - - - - key - value - isAtom - - Property - YES - - YES - YES - YES - YES - YES - - - - key - value - isAtom - - Property - YES - - YES - YES - YES - YES - YES - - - - label - - Node - YES - - YES - YES - YES - YES - YES - - - - edgeNode - - Edge - YES - - YES - YES - YES - YES - YES - - - - 268 - {51, 14} - - YES - - 68157504 - 272630784 - Anchors - - - - - - NO - - - - 268 - {134, 19} - YES - - -1804599231 - 272630784 - - - - YES - - - - NO - - - YES - - YES - YES - YES - YES - YES - - - YES - - YES - YES - YES - YES - YES - - - - - - - - nodePropertiesView - - - - 188 - - - - nodeDataArrayController - - - - 282 - - - - addNodeProperty: - - - - 348 - - - - addNodeAtom: - - - - 349 - - - - graphDataArrayController - - - - 350 - - - - addGraphProperty: - - - - 351 - - - - addGraphAtom: - - - - 352 - - - - graphPropertiesView - - - - 354 - - - - removeGraphProperty: - - - - 358 - - - - removeNodeProperty: - - - - 359 - - - - edgePropertiesView - - - - 389 - - - - edgeDataArrayController - - - - 390 - - - - addEdgeProperty: - - - - 391 - - - - addEdgeAtom: - - - - 392 - - - - removeEdgeProperty: - - - - 393 - - - - addEdgeNodeProperty: - - - - 449 - - - - addEdgeNodeAtom: - - - - 450 - - - - removeEdgeNodeProperty: - - - - 451 - - - - edgeNodeDataArrayController - - - - 452 - - - - edgeNodeLabelField - - - - 453 - - - - edgeNodeCheckbox - - - - 454 - - - - propertyInspectorView - - - - 464 - - - - window - - - - 567 - - - - selectedNodesArrayController - - - - 583 - - - - selectedEdgesArrayController - - - - 586 - - - - refreshDocument: - - - - 596 - - - - sourceAnchorNamesArrayController - - - - 678 - - - - targetAnchorNamesArrayController - - - - 682 - - - - sourceAnchorComboBox - - - - 716 - - - - targetAnchorComboBox - - - - 717 - - - - delegate - - - - 584 - - - - value: selection.label - - - - - - value: selection.label - value - selection.label - - Multiple Values - NilToEmptyStringTransformer - - 2 - - - 644 - - - - formatter - - - - 719 - - - - enabled: canAdd - - - - - - enabled: canAdd - enabled - canAdd - 2 - - - 615 - - - - enabled: canRemove - - - - - - enabled: canRemove - enabled - canRemove - 2 - - - 297 - - - - content: arrangedObjects - - - - - - content: arrangedObjects - content - arrangedObjects - 2 - - - 278 - - - - delegate - - - - 290 - - - - enabled: isEditable - - - - - - enabled: isEditable - enabled - isEditable - 2 - - - 622 - - - - selectionIndexes: selectionIndexes - - - - - - selectionIndexes: selectionIndexes - selectionIndexes - selectionIndexes - - 2 - - - 650 - - - - value: arrangedObjects.key - - - - - - value: arrangedObjects.key - value - arrangedObjects.key - 2 - - - 274 - - - - value: arrangedObjects.value - - - - - - value: arrangedObjects.value - value - arrangedObjects.value - 2 - - - 277 - - - - enabled: arrangedObjects.isAtom - - - - - - enabled: arrangedObjects.isAtom - enabled - arrangedObjects.isAtom - - NSValueTransformerName - NSNegateBoolean - - 2 - - - 281 - - - - formatter - - - - 733 - - - - formatter - - - - 734 - - - - enabled: canAdd - - - - - - enabled: canAdd - enabled - canAdd - 2 - - - 618 - - - - enabled: canRemove - - - - - - enabled: canRemove - enabled - canRemove - 2 - - - 347 - - - - enabled: canAdd - - - - - - enabled: canAdd - enabled - canAdd - 2 - - - 643 - - - - enabled: canAdd - - - - - - enabled: canAdd - enabled - canAdd - 2 - - - 640 - - - - delegate - - - - 331 - - - - content: arrangedObjects - - - - - - content: arrangedObjects - content - arrangedObjects - 2 - - - 346 - - - - enabled: isEditable - - - - - - enabled: isEditable - enabled - isEditable - 2 - - - 638 - - - - selectionIndexes: selectionIndexes - - - - - - selectionIndexes: selectionIndexes - selectionIndexes - selectionIndexes - - 2 - - - 652 - - - - enabled: arrangedObjects.isAtom - - - - - - enabled: arrangedObjects.isAtom - enabled - arrangedObjects.isAtom - - NSValueTransformerName - NSNegateBoolean - - 2 - - - 356 - - - - value: arrangedObjects.value - - - - - - value: arrangedObjects.value - value - arrangedObjects.value - 2 - - - 357 - - - - value: arrangedObjects.key - - - - - - value: arrangedObjects.key - value - arrangedObjects.key - - NSValueTransformerName - NilToEmptyStringTransformer - - 2 - - - 645 - - - - formatter - - - - 728 - - - - formatter - - - - 727 - - - - enabled: canAdd - - - - - - enabled: canAdd - enabled - canAdd - 2 - - - 612 - - - - enabled: canAdd - - - - - - enabled: canAdd - enabled - canAdd - 2 - - - 624 - - - - enabled: canRemove - - - - - - enabled: canRemove - enabled - canRemove - 2 - - - 394 - - - - delegate - - - - 382 - - - - content: arrangedObjects - - - - - - content: arrangedObjects - content - arrangedObjects - 2 - - - 401 - - - - enabled: isEditable - - - - - - enabled: isEditable - enabled - isEditable - 2 - - - 630 - - - - selectionIndexes: selectionIndexes - - - - - - selectionIndexes: selectionIndexes - selectionIndexes - selectionIndexes - - 2 - - - 654 - - - - value: arrangedObjects.key - - - - - - value: arrangedObjects.key - value - arrangedObjects.key - - NSValueTransformerName - NilToEmptyStringTransformer - - 2 - - - 646 - - - - value: arrangedObjects.value - - - - - - value: arrangedObjects.value - value - arrangedObjects.value - 2 - - - 405 - - - - enabled: arrangedObjects.isAtom - - - - - - enabled: arrangedObjects.isAtom - enabled - arrangedObjects.isAtom - - NSValueTransformerName - NSNegateBoolean - - 2 - - - 467 - - - - formatter - - - - 730 - - - - formatter - - - - 729 - - - - delegate - - - - 421 - - - - content: arrangedObjects - - - - - - content: arrangedObjects - content - arrangedObjects - 2 - - - 443 - - - - enabled: isEditable - - - - - - enabled: isEditable - enabled - isEditable - 2 - - - 632 - - - - selectionIndexes: selectionIndexes - - - - - - selectionIndexes: selectionIndexes - selectionIndexes - selectionIndexes - - 2 - - - 656 - - - - formatter - - - - 724 - - - - value: arrangedObjects.value - - - - - - value: arrangedObjects.value - value - arrangedObjects.value - 2 - - - 445 - - - - enabled: arrangedObjects.isAtom - - - - - - enabled: arrangedObjects.isAtom - enabled - arrangedObjects.isAtom - - NSValueTransformerName - NSNegateBoolean - - 2 - - - 459 - - - - value: arrangedObjects.key - - - - - - value: arrangedObjects.key - value - arrangedObjects.key - - NSValueTransformerName - NilToEmptyStringTransformer - - 2 - - - 647 - - - - formatter - - - - 731 - - - - formatter - - - - 732 - - - - enabled: canAdd - - - - - - enabled: canAdd - enabled - canAdd - 2 - - - 626 - - - - enabled: canAdd - - - - - - enabled: canAdd - enabled - canAdd - 2 - - - 628 - - - - enabled: canRemove - - - - - - enabled: canRemove - enabled - canRemove - 2 - - - 460 - - - - value: selection.hasEdgeNode - - - - - - value: selection.hasEdgeNode - value - selection.hasEdgeNode - 2 - - - 595 - - - - delegate - - - - 440 - - - - enabled: selection.hasEdgeNode - - - - - - enabled: selection.hasEdgeNode - enabled - selection.hasEdgeNode - 2 - - - 636 - - - - value: selection.edgeNode.label - - - - - - value: selection.edgeNode.label - value - selection.edgeNode.label - - NSValueTransformerName - NilToEmptyStringTransformer - - 2 - - - 648 - - - - formatter - - - - 723 - - - - contentArray: selectedNodes - - - - - - contentArray: selectedNodes - contentArray - selectedNodes - 2 - - - 577 - - - - contentArray: selectedEdges - - - - - - contentArray: selectedEdges - contentArray - selectedEdges - 2 - - - 589 - - - - enabled: selection.hasEdgeNode - - - - - - enabled: selection.hasEdgeNode - enabled - selection.hasEdgeNode - 2 - - - 661 - - - - value: selection.edgeNode.label - - - - - - value: selection.edgeNode.label - value - selection.edgeNode.label - - NSValueTransformerName - NilToEmptyStringTransformer - - 2 - - - 662 - - - - delegate - - - - 663 - - - - content: arrangedObjects - - - - - - content: arrangedObjects - content - arrangedObjects - 2 - - - 707 - - - - contentValues: arrangedObjects - - - - - - contentValues: arrangedObjects - contentValues - arrangedObjects - - 2 - - - 708 - - - - value: selection.sourceAnchor - - - - - - value: selection.sourceAnchor - value - selection.sourceAnchor - - 2 - - - 709 - - - - delegate - - - - 714 - - - - formatter - - - - 726 - - - - content: arrangedObjects - - - - - - content: arrangedObjects - content - arrangedObjects - 2 - - - 710 - - - - contentValues: arrangedObjects - - - - - - contentValues: arrangedObjects - contentValues - arrangedObjects - - 2 - - - 711 - - - - value: selection.targetAnchor - - - - - - value: selection.targetAnchor - value - selection.targetAnchor - - 2 - - - 713 - - - - delegate - - - - 715 - - - - formatter - - - - 725 - - - - content - - - - 675 - - - - contentArray: sourceAnchorNames - - - - - - contentArray: sourceAnchorNames - contentArray - sourceAnchorNames - 2 - - - 680 - - - - contentArray: targetAnchorNames - - - - - - contentArray: targetAnchorNames - contentArray - targetAnchorNames - 2 - - - 684 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 185 - - - - - - - - - - - Node Properties View - - - 189 - - - - - - - - 190 - - - - - 191 - - - - - - - - 192 - - - - - 206 - - - - - - - - 207 - - - - - - - - 208 - - - - - 209 - - - - - 258 - - - - - - - - - - - 259 - - - - - 260 - - - - - 261 - - - - - - - - - 262 - - - - - 263 - - - - - - - - 264 - - - - - - - - 265 - - - - - 266 - - - - - 272 - - - Node Data Array Controller - - - 283 - - - - - - - - 284 - - - - - 301 - - - - - - - - - Graph Properties View - - - 302 - - - - - - - - 303 - - - - - - - - 304 - - - - - - - - - - - 307 - - - - - - - - 314 - - - - - 317 - - - - - 318 - - - - - - - - - 319 - - - - - 320 - - - - - 321 - - - - - - - - 322 - - - - - - - - 323 - - - - - 324 - - - - - 325 - - - - - 326 - - - - - 343 - - - Graph Data Array Controller - - - 360 - - - Edge Data Array Controller - - - 361 - - - - - - - - - - - - - - - - - - - - - - Edge Properties View - - - 362 - - - - - - - - 363 - - - - - - - - - - - 364 - - - - - - - - 365 - - - - - - - - 366 - - - - - 367 - - - - - 368 - - - - - 369 - - - - - 370 - - - - - - - - - 371 - - - - - 372 - - - - - - - - 373 - - - - - - - - 374 - - - - - 375 - - - - - 376 - - - - - 408 - - - - - - - - - - - 409 - - - - - 410 - - - - - - - - - 411 - - - - - 412 - - - - - 413 - - - - - - - - 414 - - - - - - - - 415 - - - - - 416 - - - - - 422 - - - - - - - - 423 - - - - - - - - 424 - - - - - - - - 425 - - - - - 426 - - - - - 427 - - - - - 434 - - - - - - - - 435 - - - - - 436 - - - - - - - - 437 - - - - - - - - 438 - - - - - 439 - - - - - 441 - - - - - 442 - - - Edge Node Data Array Controller - - - 461 - - - - - - - - 462 - - - - - - - - 463 - - - - - 575 - - - Selected Nodes Array Controller - - - 585 - - - Selected Edges Array Controller - - - 657 - - - - - - - - 658 - - - - - - - - 659 - - - - - 660 - - - - - 664 - - - - - - - - 665 - - - - - 666 - - - - - - - - 667 - - - - - 668 - - - - - - - - 669 - - - - - 670 - - - - - - - - 671 - - - - - 672 - - - - - - - - 673 - - - - - 674 - - - Source Anchor Names Array Controller - - - 681 - - - Target Anchor Names Array Controller - - - 718 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - com.apple.InterfaceBuilder.CocoaPlugin - {{624, 540}, {193, 256}} - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - TikzFormatter - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - 734 - - - - - FirstResponder - - id - id - - - - applyStyleToSelectedNodes: - id - - - clearStyleOfSelectedNodes: - id - - - - IBUserSource - - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES - 3 - - {8, 8} - {8, 8} - {15, 15} - - - - - - NSFormatter - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Multiple Values + NilToEmptyStringTransformer + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NilToEmptyStringTransformer + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NilToEmptyStringTransformer + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NilToEmptyStringTransformer + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NilToEmptyStringTransformer + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + key + value + isAtom + + + + + key + value + isAtom + + + + + key + value + isAtom + + + + + key + value + isAtom + + + + + label + + + + + + + + edgeNode + + + + + + + + + + + + + + + + + + + + + + + + + + + NilToEmptyStringTransformer + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tikzit/src/osx/PreferenceController.m b/tikzit/src/osx/PreferenceController.m index 099bf48..e785358 100644 --- a/tikzit/src/osx/PreferenceController.m +++ b/tikzit/src/osx/PreferenceController.m @@ -104,9 +104,9 @@ [[[self window] contentView] replaceSubview:customNodeView with:[customNodeController view]]; customNodeView = [customNodeController view]; - [[self window] setContentSize:[preambleView frame].size]; - [[[self window] contentView] addSubview:preambleView]; - currentViewTag = 3; + [[self window] setContentSize:[engineView frame].size]; + [[[self window] contentView] addSubview:engineView]; + currentViewTag = 1; } - (IBAction)switchView:(id)sender { diff --git a/tikzit/src/osx/Preferences.xib b/tikzit/src/osx/Preferences.xib index 155cf71..1be3f9f 100644 --- a/tikzit/src/osx/Preferences.xib +++ b/tikzit/src/osx/Preferences.xib @@ -2,13 +2,13 @@ 1070 - 13A603 - 4514 - 1265 - 695.00 + 13C64 + 5053 + 1265.19 + 697.40 com.apple.InterfaceBuilder.CocoaPlugin - 4514 + 5053 IBNSLayoutConstraint @@ -100,7 +100,7 @@ {0, 0} YES YES - 0 + 1 YES 0 @@ -179,8 +179,8 @@ + - @@ -202,33 +202,33 @@ 268 - + 268 - {{18, 15}, {214, 18}} + {{18, 106}, {219, 18}} _NS:9 YES - + -2080374784 268435456 - Bring preview window to focus + Keep inspector windows on top .LucidaGrandeUI 13 1044 _NS:9 - + 1211912448 2 - + NSImage NSSwitch - + NSSwitch @@ -238,10 +238,64 @@ NO + + + 268 + {{18, 126}, {168, 18}} + + + + _NS:9 + YES + + -2080374784 + 268435456 + Autocomplete brackets + + _NS:9 + + 1211912448 + 2 + + + + + 200 + 25 + + NO + + + + 268 + {{18, 18}, {214, 18}} + + + + _NS:9 + YES + + -2080374784 + 268435456 + Bring preview window to focus + + _NS:9 + + 1211912448 + 2 + + + + + 200 + 25 + + NO + 268 - {{20, 39}, {440, 22}} + {{20, 42}, {440, 22}} @@ -280,7 +334,7 @@ 268 - {{18, 69}, {140, 17}} + {{18, 72}, {140, 17}} @@ -313,10 +367,10 @@ 1 - {480, 96} + {480, 162} - + _NS:9 NSView @@ -498,6 +552,38 @@ 62 + + + value: values.net.sourceforge.tikzit.autocomplete + + + + + + value: values.net.sourceforge.tikzit.autocomplete + value + values.net.sourceforge.tikzit.autocomplete + 2 + + + 149 + + + + value: values.net.sourceforge.tikzit.inspectorsontop + + + + + + value: values.net.sourceforge.tikzit.inspectorsontop + value + values.net.sourceforge.tikzit.inspectorsontop + 2 + + + 150 + @@ -565,6 +651,24 @@ 13 + + + 4 + 0 + + 4 + 1 + 1 + + 20 + + 1000 + + 8 + 23 + 3 + NO + 3 @@ -572,6 +676,7 @@ 4 1 + 1 8 @@ -589,6 +694,7 @@ 5 1 + 1 20 @@ -606,6 +712,7 @@ 6 1 + 1 20 @@ -623,6 +730,7 @@ 4 1 + 1 8 @@ -640,6 +748,7 @@ 5 1 + 1 20 @@ -650,43 +759,101 @@ 3 NO - + - 3 + 5 0 - 3 + 5 1 + 1 + + 20 + + 1000 + + 0 + 29 + 3 + NO + + + + 5 + 0 + + 5 + 1 + 1 - 10 + 0.0 + + 1000 + + 6 + 24 + 2 + NO + + + + 3 + 0 + + 4 + 1 + 1 + + 6 1000 - 3 - 9 + 6 + 24 3 NO - - + + 5 0 - + 5 1 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + NO + + + + 3 + 0 + + 3 + 1 + 1 20 1000 - 0 - 29 + 8 + 23 3 NO + + @@ -714,11 +881,6 @@ - - 31 - - - 32 @@ -806,6 +968,57 @@ + + 126 + + + + + 127 + + + + + + + + 128 + + + + + 130 + + + + + 131 + + + + + + + + 132 + + + + + 134 + + + + + 135 + + + + + 153 + + + @@ -822,23 +1035,37 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + - + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -858,7 +1085,7 @@ - 125 + 153 diff --git a/tikzit/src/osx/PropertyInspectorController.m b/tikzit/src/osx/PropertyInspectorController.m index 981f746..039a30f 100644 --- a/tikzit/src/osx/PropertyInspectorController.m +++ b/tikzit/src/osx/PropertyInspectorController.m @@ -56,7 +56,12 @@ [self setTargetAnchorNames: [[NSMutableArray alloc] initWithArray:[@"north south west east" componentsSeparatedByString:@" "]]]; - [[self window] setLevel:NSNormalWindowLevel]; + if ([[NSUserDefaults standardUserDefaults] boolForKey:@"net.sourceforge.tikzit.inspectorsontop"] == YES) { + [[self window] setLevel:NSFloatingWindowLevel]; + } else { + [[self window] setLevel:NSNormalWindowLevel]; + } + [self showWindow:self]; return self; } diff --git a/tikzit/src/osx/StylePaletteController.m b/tikzit/src/osx/StylePaletteController.m index 8f87bd9..4fe46be 100644 --- a/tikzit/src/osx/StylePaletteController.m +++ b/tikzit/src/osx/StylePaletteController.m @@ -50,7 +50,12 @@ if (nodeStyles == nil) nodeStyles = [NSMutableArray array]; if (edgeStyles == nil) edgeStyles = [NSMutableArray array]; - [[self window] setLevel:NSNormalWindowLevel]; + if ([[NSUserDefaults standardUserDefaults] boolForKey:@"net.sourceforge.tikzit.inspectorsontop"] == YES) { + [[self window] setLevel:NSFloatingWindowLevel]; + } else { + [[self window] setLevel:NSNormalWindowLevel]; + } + [self showWindow:self]; } diff --git a/tikzit/src/osx/TikzFormatter.m b/tikzit/src/osx/TikzFormatter.m index 9e45cb6..cb0865d 100644 --- a/tikzit/src/osx/TikzFormatter.m +++ b/tikzit/src/osx/TikzFormatter.m @@ -50,6 +50,10 @@ NSRange addedRange; NSString *addedString; + if(![[NSUserDefaults standardUserDefaults] boolForKey:@"net.sourceforge.tikzit.autocomplete"]){ + return YES; + } + addedRange = NSMakeRange(origSelRange.location, proposedSelRangePtr->location - origSelRange.location); addedString = [*partialStringPtr substringWithRange: addedRange]; -- cgit v1.2.3 From ea5abf33c1291fb82614da763b330d938a07e80c Mon Sep 17 00:00:00 2001 From: Johan Paulsson Date: Wed, 18 Feb 2015 08:04:07 -0800 Subject: Missed a general Xcode file --- .../xcshareddata/TikZiT.xccheckout | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 tikzit/TikZiT.xcodeproj/project.xcworkspace/xcshareddata/TikZiT.xccheckout diff --git a/tikzit/TikZiT.xcodeproj/project.xcworkspace/xcshareddata/TikZiT.xccheckout b/tikzit/TikZiT.xcodeproj/project.xcworkspace/xcshareddata/TikZiT.xccheckout new file mode 100644 index 0000000..2cc312b --- /dev/null +++ b/tikzit/TikZiT.xcodeproj/project.xcworkspace/xcshareddata/TikZiT.xccheckout @@ -0,0 +1,41 @@ + + + + + IDESourceControlProjectFavoriteDictionaryKey + + IDESourceControlProjectIdentifier + 26857C1F-E0FE-4FFB-BDAC-44158C649772 + IDESourceControlProjectName + TikZiT + IDESourceControlProjectOriginsDictionary + + F6FA2C351D428A0F1026539971510A626DEEFF59 + https://git.code.sf.net/p/tikzit/code + + IDESourceControlProjectPath + tikzit/TikZiT.xcodeproj + IDESourceControlProjectRelativeInstallPathDictionary + + F6FA2C351D428A0F1026539971510A626DEEFF59 + ../../.. + + IDESourceControlProjectURL + https://git.code.sf.net/p/tikzit/code + IDESourceControlProjectVersion + 111 + IDESourceControlProjectWCCIdentifier + F6FA2C351D428A0F1026539971510A626DEEFF59 + IDESourceControlProjectWCConfigurations + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + F6FA2C351D428A0F1026539971510A626DEEFF59 + IDESourceControlWCCName + tikzit-code + + + + -- cgit v1.2.3 From 4b68c2351d4ed7fc8ba02552b36b7d1f296a97ae Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 25 Mar 2014 17:47:20 +0000 Subject: dummy commit --- tikzit/README | 1 - 1 file changed, 1 deletion(-) diff --git a/tikzit/README b/tikzit/README index e5d3c64..4d3eab1 100644 --- a/tikzit/README +++ b/tikzit/README @@ -5,4 +5,3 @@ For more info, see http://tikzit.sf.net On OS/X, the Cocoa framework is used. On other platforms, GTK+ and GNUstep are used. - -- cgit v1.2.3 From 878ccf082ab98e9654179493307138c88b2fe1ad Mon Sep 17 00:00:00 2001 From: Johan Paulsson Date: Wed, 18 Feb 2015 09:37:44 -0800 Subject: Seeing if attribution goes to me --- README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..a8e8b64 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +TikZiT is a graphical tool for rapidly creating an editing node-and-edge style graphs. It was originally created to aid in the typesetting of "dot" diagrams of interacting quantum observables (see arXiv:0906.4725), but can be used as a general graph editing program. Click one of the above icons to download. To comment or contribute, email me at gmail.com preceded by aleks0 and an at-sign. \ No newline at end of file -- cgit v1.2.3 From f2fd700249231803a896d99b0031292929b761b1 Mon Sep 17 00:00:00 2001 From: Johan Paulsson Date: Wed, 18 Feb 2015 09:43:16 -0800 Subject: Dummy commit --- tikzit/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tikzit/README b/tikzit/README index 4d3eab1..9b83327 100644 --- a/tikzit/README +++ b/tikzit/README @@ -4,4 +4,4 @@ For more info, see http://tikzit.sf.net On OS/X, the Cocoa framework is used. -On other platforms, GTK+ and GNUstep are used. +On other platforms, GTK+ and GNUstep are used. \ No newline at end of file -- cgit v1.2.3 From 8233df2ddd3133618be536c5423cdc6a40b4a20c Mon Sep 17 00:00:00 2001 From: Johan Paulsson Date: Wed, 25 Feb 2015 10:19:18 -0800 Subject: Xcode friendly gitignore --- tikzit/.gitignore | 206 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 206 insertions(+) diff --git a/tikzit/.gitignore b/tikzit/.gitignore index 644b16b..fc1d580 100644 --- a/tikzit/.gitignore +++ b/tikzit/.gitignore @@ -1,3 +1,5 @@ +# Previous gitignore items + *~ *.swp *.o @@ -27,3 +29,207 @@ Makefile.in /tikzit-*.tar.gz /tikzit-*.tar.bz2 xbuild + +######################### +# .gitignore file for Xcode4 and Xcode5 Source projects +# +# Apple bugs, waiting for Apple to fix/respond: +# +# 15564624 - what does the xccheckout file in Xcode5 do? Where's the documentation? +# +# Version 2.3 +# For latest version, see: http://stackoverflow.com/questions/49478/git-ignore-file-for-xcode-projects +# +# 2014 updates: +# - appended non-standard items DISABLED by default (uncomment if you use those tools) +# - removed the edit that an SO.com moderator made without bothering to ask me +# - researched CocoaPods .lock more carefully, thanks to Gokhan Celiker +# 2013 updates: +# - fixed the broken "save personal Schemes" +# - added line-by-line explanations for EVERYTHING (some were missing) +# +# NB: if you are storing "built" products, this WILL NOT WORK, +# and you should use a different .gitignore (or none at all) +# This file is for SOURCE projects, where there are many extra +# files that we want to exclude +# +######################### + +##### +# OS X temporary files that should never be committed +# +# c.f. http://www.westwind.com/reference/os-x/invisibles.html + +.DS_Store +.Trashes +*.swp + +# +# *.lock - this is used and abused by many editors for many different things. +# For the main ones I use (e.g. Eclipse), it should be excluded +# from source-control, but YMMV. +# (lock files are usually local-only file-synchronization on the local FS that should NOT go in git) +# c.f. the "OPTIONAL" section at bottom though, for tool-specific variations! + +*.lock + + +# +# profile - REMOVED temporarily (on double-checking, I can't find it in OS X docs?) +#profile + + +#### +# Xcode temporary files that should never be committed +# +# NB: NIB/XIB files still exist even on Storyboard projects, so we want this... + +*~.nib + + +#### +# Xcode build files - +# +# NB: slash on the end, so we only remove the FOLDER, not any files that were badly named "DerivedData" + +DerivedData/ + +# NB: slash on the end, so we only remove the FOLDER, not any files that were badly named "build" + +build/ + + +##### +# Xcode private settings (window sizes, bookmarks, breakpoints, custom executables, smart groups) +# +# This is complicated: +# +# SOMETIMES you need to put this file in version control. +# Apple designed it poorly - if you use "custom executables", they are +# saved in this file. +# 99% of projects do NOT use those, so they do NOT want to version control this file. +# ..but if you're in the 1%, comment out the line "*.pbxuser" + +# .pbxuser: http://lists.apple.com/archives/xcode-users/2004/Jan/msg00193.html + +*.pbxuser + +# .mode1v3: http://lists.apple.com/archives/xcode-users/2007/Oct/msg00465.html + +*.mode1v3 + +# .mode2v3: http://lists.apple.com/archives/xcode-users/2007/Oct/msg00465.html + +*.mode2v3 + +# .perspectivev3: http://stackoverflow.com/questions/5223297/xcode-projects-what-is-a-perspectivev3-file + +*.perspectivev3 + +# NB: also, whitelist the default ones, some projects need to use these +!default.pbxuser +!default.mode1v3 +!default.mode2v3 +!default.perspectivev3 + + +#### +# Xcode 4 - semi-personal settings +# +# +# OPTION 1: --------------------------------- +# throw away ALL personal settings (including custom schemes! +# - unless they are "shared") +# +# NB: this is exclusive with OPTION 2 below +xcuserdata + +# OPTION 2: --------------------------------- +# get rid of ALL personal settings, but KEEP SOME OF THEM +# - NB: you must manually uncomment the bits you want to keep +# +# NB: this *requires* git v1.8.2 or above; you may need to upgrade to latest OS X, +# or manually install git over the top of the OS X version +# NB: this is exclusive with OPTION 1 above +# +#xcuserdata/**/* + +# (requires option 2 above): Personal Schemes +# +#!xcuserdata/**/xcschemes/* + +#### +# XCode 4 workspaces - more detailed +# +# Workspaces are important! They are a core feature of Xcode - don't exclude them :) +# +# Workspace layout is quite spammy. For reference: +# +# /(root)/ +# /(project-name).xcodeproj/ +# project.pbxproj +# /project.xcworkspace/ +# contents.xcworkspacedata +# /xcuserdata/ +# /(your name)/xcuserdatad/ +# UserInterfaceState.xcuserstate +# /xcsshareddata/ +# /xcschemes/ +# (shared scheme name).xcscheme +# /xcuserdata/ +# /(your name)/xcuserdatad/ +# (private scheme).xcscheme +# xcschememanagement.plist +# +# + +#### +# Xcode 4 - Deprecated classes +# +# Allegedly, if you manually "deprecate" your classes, they get moved here. +# +# We're using source-control, so this is a "feature" that we do not want! + +*.moved-aside + +#### +# OPTIONAL: Some well-known tools that people use side-by-side with Xcode / iOS development +# +# NB: I'd rather not include these here, but gitignore's design is weak and doesn't allow +# modular gitignore: you have to put EVERYTHING in one file. +# +# COCOAPODS: +# +# c.f. http://guides.cocoapods.org/using/using-cocoapods.html#what-is-a-podfilelock +# c.f. http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control +# +#!Podfile.lock +# +# RUBY: +# +# c.f. http://yehudakatz.com/2010/12/16/clarifying-the-roles-of-the-gemspec-and-gemfile/ +# +#!Gemfile.lock +# +# IDEA: +# +#.idea +# +# TEXTMATE: +# +# -- UNVERIFIED: c.f. http://stackoverflow.com/a/50283/153422 +# +#tm_build_errors + +#### +# UNKNOWN: recommended by others, but I can't discover what these files are +# +# Community suggestions (unverified, no evidence available - DISABLED by default) +# +# 1. Xcode 5 - VCS file +# +# "The data in this file not represent state of your project. +# If you'll leave this file in git - you will have merge conflicts during +# pull your cahnges to other's repo" +# +#*.xccheckout \ No newline at end of file -- cgit v1.2.3 From ffa99ec96899716ce1084177810303d336f51ff6 Mon Sep 17 00:00:00 2001 From: Johan Paulsson Date: Wed, 25 Feb 2015 12:36:17 -0800 Subject: Conversion of common files to ifdef for ARC --- tikzit/TikZiT.xcodeproj/project.pbxproj | 56 +++--- .../xcshareddata/TikZiT.xccheckout | 12 +- tikzit/src/common/ColorRGB.m | 26 ++- tikzit/src/common/Edge.m | 44 ++++- tikzit/src/common/EdgeStyle.m | 20 +- tikzit/src/common/Graph.m | 112 +++++++++--- tikzit/src/common/GraphChange.m | 201 ++++++++++++++++----- tikzit/src/common/GraphElementData.m | 59 ++++-- tikzit/src/common/GraphElementProperty.m | 23 ++- tikzit/src/common/NSString+LatexConstants.m | 4 + tikzit/src/common/NSString+Tikz.m | 11 +- tikzit/src/common/Node.m | 34 +++- tikzit/src/common/NodeStyle.m | 24 ++- tikzit/src/common/PickSupport.m | 19 +- tikzit/src/common/Preambles.m | 28 +++ tikzit/src/common/PropertyHolder.m | 2 + tikzit/src/common/Shape.m | 16 ++ tikzit/src/common/StyleManager.m | 47 ++++- tikzit/src/common/TikzGraphAssembler.m | 30 ++- tikzit/src/common/TikzShape.m | 4 + tikzit/src/common/Transformer.m | 12 +- tikzit/src/common/tikzparserdefs.h | 9 +- 22 files changed, 641 insertions(+), 152 deletions(-) diff --git a/tikzit/TikZiT.xcodeproj/project.pbxproj b/tikzit/TikZiT.xcodeproj/project.pbxproj index 8e3e7c9..feba845 100644 --- a/tikzit/TikZiT.xcodeproj/project.pbxproj +++ b/tikzit/TikZiT.xcodeproj/project.pbxproj @@ -21,9 +21,9 @@ 55391AF813D3250F007DBE71 /* Preamble.xib in Resources */ = {isa = PBXBuildFile; fileRef = 55391AF713D3250F007DBE71 /* Preamble.xib */; }; 55391B0213D32608007DBE71 /* PropertyInspector.xib in Resources */ = {isa = PBXBuildFile; fileRef = 55391B0013D32608007DBE71 /* PropertyInspector.xib */; }; 55391B0A13D32765007DBE71 /* PropertyInspectorController.m in Sources */ = {isa = PBXBuildFile; fileRef = 55391B0913D32765007DBE71 /* PropertyInspectorController.m */; }; - 55397C7914498C22006942FB /* EdgeStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 55397C7814498C22006942FB /* EdgeStyle.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 55397C7914498C22006942FB /* EdgeStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 55397C7814498C22006942FB /* EdgeStyle.m */; }; 55397C7C144990EA006942FB /* EdgeStyle+Coder.m in Sources */ = {isa = PBXBuildFile; fileRef = 55397C7B144990EA006942FB /* EdgeStyle+Coder.m */; }; - 55397C7F144999C4006942FB /* PropertyHolder.m in Sources */ = {isa = PBXBuildFile; fileRef = 55397C7E144999C4006942FB /* PropertyHolder.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 55397C7F144999C4006942FB /* PropertyHolder.m in Sources */ = {isa = PBXBuildFile; fileRef = 55397C7E144999C4006942FB /* PropertyHolder.m */; }; 55397C811449A877006942FB /* ED_arrow.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C801449A877006942FB /* ED_arrow.png */; }; 55397C831449A8F1006942FB /* ED_tick.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C821449A8F1006942FB /* ED_tick.png */; }; 55397C851449A9BF006942FB /* ED_none.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C841449A9BF006942FB /* ED_none.png */; }; @@ -33,17 +33,17 @@ 55397C901449AC7C006942FB /* AH_latex_head.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C8E1449AC7C006942FB /* AH_latex_head.png */; }; 55397C911449AC7C006942FB /* AH_plain_head.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C8F1449AC7C006942FB /* AH_plain_head.png */; }; 553A4C5A144ED3D500AA6FAC /* NilToEmptyStringTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 553A4C59144ED3D500AA6FAC /* NilToEmptyStringTransformer.m */; }; - 55432E061444BF2D00401BB3 /* GraphElementProperty.m in Sources */ = {isa = PBXBuildFile; fileRef = 55432E051444BF2D00401BB3 /* GraphElementProperty.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 55598E351635372E0023450A /* DiamondShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55598E341635372E0023450A /* DiamondShape.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 55432E061444BF2D00401BB3 /* GraphElementProperty.m in Sources */ = {isa = PBXBuildFile; fileRef = 55432E051444BF2D00401BB3 /* GraphElementProperty.m */; }; + 55598E351635372E0023450A /* DiamondShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55598E341635372E0023450A /* DiamondShape.m */; }; 555B30F911D8BE3300CAECF5 /* emblem-important.png in Resources */ = {isa = PBXBuildFile; fileRef = 555B30F811D8BE3300CAECF5 /* emblem-important.png */; }; 555B313511D8C6DA00CAECF5 /* color.m in Sources */ = {isa = PBXBuildFile; fileRef = 555B313411D8C6DA00CAECF5 /* color.m */; }; 555ECE9B1378A3AA0052DB71 /* CALayer+DrawLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 555ECE9A1378A3AA0052DB71 /* CALayer+DrawLabel.m */; }; - 55652DF913E1F2030023F4C6 /* SupportDir.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652DF813E1F2030023F4C6 /* SupportDir.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 55652E3B13E1FAEE0023F4C6 /* CircleShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3413E1FAED0023F4C6 /* CircleShape.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 55652E3C13E1FAEE0023F4C6 /* RectangleShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3613E1FAED0023F4C6 /* RectangleShape.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 55652E3D13E1FAEE0023F4C6 /* RegularPolyShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3813E1FAED0023F4C6 /* RegularPolyShape.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 55652E3E13E1FAEE0023F4C6 /* TikzShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3A13E1FAEE0023F4C6 /* TikzShape.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 55652E4113E1FB0A0023F4C6 /* Shape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E4013E1FB0A0023F4C6 /* Shape.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 55652DF913E1F2030023F4C6 /* SupportDir.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652DF813E1F2030023F4C6 /* SupportDir.m */; }; + 55652E3B13E1FAEE0023F4C6 /* CircleShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3413E1FAED0023F4C6 /* CircleShape.m */; }; + 55652E3C13E1FAEE0023F4C6 /* RectangleShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3613E1FAED0023F4C6 /* RectangleShape.m */; }; + 55652E3D13E1FAEE0023F4C6 /* RegularPolyShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3813E1FAED0023F4C6 /* RegularPolyShape.m */; }; + 55652E3E13E1FAEE0023F4C6 /* TikzShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3A13E1FAEE0023F4C6 /* TikzShape.m */; }; + 55652E4113E1FB0A0023F4C6 /* Shape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E4013E1FB0A0023F4C6 /* Shape.m */; }; 55652E5613E1FC660023F4C6 /* cap.tikz in Copy Shapes */ = {isa = PBXBuildFile; fileRef = 55652E5113E1FC660023F4C6 /* cap.tikz */; }; 55652E5713E1FC660023F4C6 /* copants.tikz in Copy Shapes */ = {isa = PBXBuildFile; fileRef = 55652E5213E1FC660023F4C6 /* copants.tikz */; }; 55652E5813E1FC660023F4C6 /* cup.tikz in Copy Shapes */ = {isa = PBXBuildFile; fileRef = 55652E5313E1FC660023F4C6 /* cup.tikz */; }; @@ -55,11 +55,11 @@ 5573B90F11DA231A00B5DC5D /* PreambleController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5573B90E11DA231A00B5DC5D /* PreambleController.m */; }; 5573B92111DA259C00B5DC5D /* text-x-generic.png in Resources */ = {isa = PBXBuildFile; fileRef = 5573B92011DA259C00B5DC5D /* text-x-generic.png */; }; 5573B92511DA273400B5DC5D /* format-indent-less.png in Resources */ = {isa = PBXBuildFile; fileRef = 5573B92411DA273400B5DC5D /* format-indent-less.png */; }; - 5573B92911DA292F00B5DC5D /* Preambles.m in Sources */ = {isa = PBXBuildFile; fileRef = 5573B92811DA292F00B5DC5D /* Preambles.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 5573B92911DA292F00B5DC5D /* Preambles.m in Sources */ = {isa = PBXBuildFile; fileRef = 5573B92811DA292F00B5DC5D /* Preambles.m */; }; 5573B98811DA377C00B5DC5D /* text-x-script.png in Resources */ = {isa = PBXBuildFile; fileRef = 5573B98711DA377C00B5DC5D /* text-x-script.png */; }; 5573BDCB11DB4D2600B5DC5D /* Preambles+Coder.m in Sources */ = {isa = PBXBuildFile; fileRef = 5573BDCA11DB4D2600B5DC5D /* Preambles+Coder.m */; }; 5585E5C2117F681800124513 /* NodeStyle+Coder.m in Sources */ = {isa = PBXBuildFile; fileRef = 5585E5C1117F681800124513 /* NodeStyle+Coder.m */; }; - 5589A9FF11C51E780064D310 /* TikzGraphAssembler.m in Sources */ = {isa = PBXBuildFile; fileRef = 5589A9FE11C51E780064D310 /* TikzGraphAssembler.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 5589A9FF11C51E780064D310 /* TikzGraphAssembler.m in Sources */ = {isa = PBXBuildFile; fileRef = 5589A9FE11C51E780064D310 /* TikzGraphAssembler.m */; }; 5589AA6C11C542D30064D310 /* TikzGraphAssembler.m in Sources */ = {isa = PBXBuildFile; fileRef = 5589A9FE11C51E780064D310 /* TikzGraphAssembler.m */; }; 5589AA6D11C542D30064D310 /* tikzlexer.lm in Sources */ = {isa = PBXBuildFile; fileRef = 5589A9AA11C500060064D310 /* tikzlexer.lm */; }; 5589AA6E11C542D30064D310 /* tikzparser.ym in Sources */ = {isa = PBXBuildFile; fileRef = 5589A9AB11C500060064D310 /* tikzparser.ym */; }; @@ -71,14 +71,14 @@ 5589AA8011C542E60064D310 /* NodeStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C4117B031C009863B2 /* NodeStyle.m */; }; 5589AA8511C543500064D310 /* util.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18CD117B03DD009863B2 /* util.m */; }; 5589AD4411C633EE0064D310 /* SelectBoxLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 5589AD4311C633EE0064D310 /* SelectBoxLayer.m */; }; - 558F18C5117B031C009863B2 /* Edge.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18BA117B031C009863B2 /* Edge.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 558F18C6117B031C009863B2 /* Graph.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18BC117B031C009863B2 /* Graph.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 558F18C7117B031C009863B2 /* GraphChange.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18BE117B031C009863B2 /* GraphChange.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 558F18C8117B031C009863B2 /* GraphElementData.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C0117B031C009863B2 /* GraphElementData.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 558F18C9117B031C009863B2 /* Node.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C2117B031C009863B2 /* Node.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 558F18CA117B031C009863B2 /* NodeStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C4117B031C009863B2 /* NodeStyle.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 558F18C5117B031C009863B2 /* Edge.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18BA117B031C009863B2 /* Edge.m */; }; + 558F18C6117B031C009863B2 /* Graph.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18BC117B031C009863B2 /* Graph.m */; }; + 558F18C7117B031C009863B2 /* GraphChange.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18BE117B031C009863B2 /* GraphChange.m */; }; + 558F18C8117B031C009863B2 /* GraphElementData.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C0117B031C009863B2 /* GraphElementData.m */; }; + 558F18C9117B031C009863B2 /* Node.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C2117B031C009863B2 /* Node.m */; }; + 558F18CA117B031C009863B2 /* NodeStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C4117B031C009863B2 /* NodeStyle.m */; }; 558F18CE117B03DD009863B2 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18CB117B03DD009863B2 /* main.m */; }; - 558F18CF117B03DD009863B2 /* util.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18CD117B03DD009863B2 /* util.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 558F18CF117B03DD009863B2 /* util.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18CD117B03DD009863B2 /* util.m */; }; 558F18F7117B043C009863B2 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18DA117B043B009863B2 /* AppDelegate.m */; }; 558F18F9117B043C009863B2 /* EdgeControlLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18DE117B043B009863B2 /* EdgeControlLayer.m */; }; 558F18FA117B043C009863B2 /* GraphicsView.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18E0117B043B009863B2 /* GraphicsView.m */; }; @@ -97,12 +97,12 @@ 559EFA4811C7D49800D020F4 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 559EFA4711C7D49800D020F4 /* Sparkle.framework */; }; 559EFA4E11C7D4BD00D020F4 /* Sparkle.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 559EFA4711C7D49800D020F4 /* Sparkle.framework */; }; 559EFA5711C7D95F00D020F4 /* tikzit_dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 559EFA5611C7D95F00D020F4 /* tikzit_dsa_pub.pem */; }; - 559EFB6811CB88E300D020F4 /* ColorRGB.m in Sources */ = {isa = PBXBuildFile; fileRef = 559EFB6711CB88E300D020F4 /* ColorRGB.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 559EFB6811CB88E300D020F4 /* ColorRGB.m in Sources */ = {isa = PBXBuildFile; fileRef = 559EFB6711CB88E300D020F4 /* ColorRGB.m */; }; 55CA98D512EF8FCE008F0368 /* SFBInspectors.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55CA98D412EF8FCE008F0368 /* SFBInspectors.framework */; }; 55CA98DA12EF9098008F0368 /* SFBInspectors.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 55CA98D412EF8FCE008F0368 /* SFBInspectors.framework */; }; 55CA98DD12EF910F008F0368 /* SFBInspectors.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55CA98D412EF8FCE008F0368 /* SFBInspectors.framework */; }; 55CA997212F08281008F0368 /* TikzWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 55CA997112F08281008F0368 /* TikzWindowController.m */; }; - 55CA9AC912F831E5008F0368 /* RColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 55CA9AC812F831E5008F0368 /* RColor.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 55CA9AC912F831E5008F0368 /* RColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 55CA9AC812F831E5008F0368 /* RColor.m */; }; 55CA9ACA12F831E5008F0368 /* RColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 55CA9AC812F831E5008F0368 /* RColor.m */; }; 55D2E0B21186ED950060B4EC /* Graph+Coder.m in Sources */ = {isa = PBXBuildFile; fileRef = 55D2E0B11186ED950060B4EC /* Graph+Coder.m */; }; 55D945721165904F0044178C /* tikzitdoc.icns in Resources */ = {isa = PBXBuildFile; fileRef = 55D945701165904F0044178C /* tikzitdoc.icns */; }; @@ -111,9 +111,9 @@ 55D949151165D8870044178C /* draw-path.png in Resources */ = {isa = PBXBuildFile; fileRef = 55D949121165D8870044178C /* draw-path.png */; }; 55D949161165D8870044178C /* select-rectangular.png in Resources */ = {isa = PBXBuildFile; fileRef = 55D949131165D8870044178C /* select-rectangular.png */; }; 55E5E99E1215C8E300256F69 /* transform-crop-and-resize.png in Resources */ = {isa = PBXBuildFile; fileRef = 55E5E99D1215C8E300256F69 /* transform-crop-and-resize.png */; }; - 55F9585C1181B09600F99434 /* PickSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F958591181B09600F99434 /* PickSupport.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 55F9585D1181B09600F99434 /* Transformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F9585B1181B09600F99434 /* Transformer.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 55F9E04511FF54F000F5659E /* NSString+LatexConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F9E04411FF54F000F5659E /* NSString+LatexConstants.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 55F9585C1181B09600F99434 /* PickSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F958591181B09600F99434 /* PickSupport.m */; }; + 55F9585D1181B09600F99434 /* Transformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F9585B1181B09600F99434 /* Transformer.m */; }; + 55F9E04511FF54F000F5659E /* NSString+LatexConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F9E04411FF54F000F5659E /* NSString+LatexConstants.m */; }; 7F18A321184C577000BC3081 /* UpdatePreferenceController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F18A320184C577000BC3081 /* UpdatePreferenceController.m */; }; 7F18A323184C599100BC3081 /* UpdatePreferencePanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7F18A322184C599100BC3081 /* UpdatePreferencePanel.xib */; }; 7F6E2C7D16B007F000BFE20D /* EdgeStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 55397C7814498C22006942FB /* EdgeStyle.m */; }; @@ -131,11 +131,11 @@ 7F6E2C8C16B00ABA00BFE20D /* SFBInspectors.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 55CA98D412EF8FCE008F0368 /* SFBInspectors.framework */; }; 7F73438A184AC559002897D0 /* DraggablePDFView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F734389184AC559002897D0 /* DraggablePDFView.m */; }; 7F781C1A16B5DE1400239826 /* ParseErrorView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F781C1916B5DE1400239826 /* ParseErrorView.m */; }; - 7F7B6DED18DE0C9E004F6CA8 /* tikzlexer.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F7B6DEA18DE0C9E004F6CA8 /* tikzlexer.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 7F7B6DEE18DE0C9E004F6CA8 /* tikzparser.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F7B6DEC18DE0C9E004F6CA8 /* tikzparser.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 7F7B6DED18DE0C9E004F6CA8 /* tikzlexer.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F7B6DEA18DE0C9E004F6CA8 /* tikzlexer.m */; }; + 7F7B6DEE18DE0C9E004F6CA8 /* tikzparser.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F7B6DEC18DE0C9E004F6CA8 /* tikzparser.m */; }; 7F7B6DF418DE0D7A004F6CA8 /* CustomNodeCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F7B6DF118DE0D7A004F6CA8 /* CustomNodeCellView.m */; }; 7F7B6DF518DE0D7A004F6CA8 /* CustomNodeController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F7B6DF318DE0D7A004F6CA8 /* CustomNodeController.m */; }; - 7F90E88616DD29600069EBCD /* NSString+Tikz.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F90E88516DD29600069EBCD /* NSString+Tikz.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 7F90E88616DD29600069EBCD /* NSString+Tikz.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F90E88516DD29600069EBCD /* NSString+Tikz.m */; }; 7F90E88D16DD47540069EBCD /* PreferenceController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F90E88B16DD47540069EBCD /* PreferenceController.m */; }; 7F90E88E16DD47540069EBCD /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7F90E88C16DD47540069EBCD /* Preferences.xib */; }; 7F90E89116DD54440069EBCD /* UserDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 7F90E88F16DD54440069EBCD /* UserDefaults.plist */; }; @@ -145,7 +145,7 @@ 7FB9BFEE16B57C2E00773146 /* TikzFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FB9BFED16B57C2E00773146 /* TikzFormatter.m */; }; 7FD5D44B18E1CB5300E2A930 /* CustomNodes.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7FD5D44918E1CB5300E2A930 /* CustomNodes.xib */; }; 7FD5D44D18E1CC0B00E2A930 /* customshape.png in Resources */ = {isa = PBXBuildFile; fileRef = 7FD5D44C18E1CC0B00E2A930 /* customshape.png */; }; - 7FEED45716B1A7C500B056CB /* StyleManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FEED45616B1A7C500B056CB /* StyleManager.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 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 */; }; 8D15AC340486D014006FF6A4 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A7FEA54F5311CA2CBB /* Cocoa.framework */; }; diff --git a/tikzit/TikZiT.xcodeproj/project.xcworkspace/xcshareddata/TikZiT.xccheckout b/tikzit/TikZiT.xcodeproj/project.xcworkspace/xcshareddata/TikZiT.xccheckout index 2cc312b..c3ec4fe 100644 --- a/tikzit/TikZiT.xcodeproj/project.xcworkspace/xcshareddata/TikZiT.xccheckout +++ b/tikzit/TikZiT.xcodeproj/project.xcworkspace/xcshareddata/TikZiT.xccheckout @@ -6,22 +6,18 @@ IDESourceControlProjectIdentifier 26857C1F-E0FE-4FFB-BDAC-44158C649772 - IDESourceControlProjectName - TikZiT IDESourceControlProjectOriginsDictionary F6FA2C351D428A0F1026539971510A626DEEFF59 - https://git.code.sf.net/p/tikzit/code + https://github.com/tikzit/tikzit.git - IDESourceControlProjectPath - tikzit/TikZiT.xcodeproj IDESourceControlProjectRelativeInstallPathDictionary F6FA2C351D428A0F1026539971510A626DEEFF59 - ../../.. + TikZiT/ IDESourceControlProjectURL - https://git.code.sf.net/p/tikzit/code + https://github.com/tikzit/tikzit.git IDESourceControlProjectVersion 111 IDESourceControlProjectWCCIdentifier @@ -34,7 +30,7 @@ IDESourceControlWCCIdentifierKey F6FA2C351D428A0F1026539971510A626DEEFF59 IDESourceControlWCCName - tikzit-code + TikZiT diff --git a/tikzit/src/common/ColorRGB.m b/tikzit/src/common/ColorRGB.m index c108cfe..840d716 100644 --- a/tikzit/src/common/ColorRGB.m +++ b/tikzit/src/common/ColorRGB.m @@ -25,7 +25,11 @@ #import "util.h" typedef struct { - NSString *name; +#if __has_feature(objc_arc) + __unsafe_unretained NSString *name; +#else + NSString *name; +#endif unsigned short r, g, b; } ColorRGBEntry; @@ -278,17 +282,29 @@ static NSMapTable *colorHash = nil; + (ColorRGB*)colorWithRed:(unsigned short)r green:(unsigned short)g blue:(unsigned short)b { ColorRGB *col = [[ColorRGB alloc] initWithRed:r green:g blue:b]; - return [col autorelease]; +#if __has_feature(objc_arc) + return col; +#else + return [col autorelease]; +#endif } + (ColorRGB*)colorWithFloatRed:(float)r green:(float)g blue:(float)b { ColorRGB *col = [[ColorRGB alloc] initWithFloatRed:r green:g blue:b]; - return [col autorelease]; +#if __has_feature(objc_arc) + return col; +#else + return [col autorelease]; +#endif } + (ColorRGB*) colorWithRColor:(RColor)color { +#if __has_feature(objc_arc) + return [[self alloc] initWithRColor:color]; +#else return [[[self alloc] initWithRColor:color] autorelease]; +#endif } + (void)makeColorHash { @@ -300,13 +316,17 @@ static NSMapTable *colorHash = nil; blue:kColors[i].b]; [h setObject:kColors[i].name forKey:col]; //NSLog(@"adding color %@ (%d)", kColors[i].name, [col hash]); +#if ! __has_feature(objc_arc) [col release]; +#endif } colorHash = h; } + (void)releaseColorHash { +#if ! __has_feature(objc_arc) [colorHash release]; +#endif } - (void)setToClosestHashed { diff --git a/tikzit/src/common/Edge.m b/tikzit/src/common/Edge.m index ba80aef..ee0f03d 100644 --- a/tikzit/src/common/Edge.m +++ b/tikzit/src/common/Edge.m @@ -72,7 +72,11 @@ } // if we didn't find a style, fill in a default one +#if __has_feature(objc_arc) + style = [EdgeStyle defaultEdgeStyleWithName:style_name]; +#else style = [[EdgeStyle defaultEdgeStyleWithName:style_name] retain]; +#endif return NO; } @@ -318,8 +322,12 @@ - (EdgeStyle*)style {return style;} - (void)setStyle:(EdgeStyle*)s { if (style != s) { +#if __has_feature(objc_arc) + style = s; +#else [style release]; style = [s retain]; +#endif } } @@ -335,9 +343,13 @@ [self setSourceAnchor:@""]; } +#if __has_feature(objc_arc) + source = s; +#else [source release]; source = [s retain]; - +#endif + if (source==target) { bendMode = EdgeBendModeInOut; weight = 1.0f; @@ -365,9 +377,13 @@ [self setTargetAnchor:@""]; } +#if __has_feature(objc_arc) + target = t; +#else [target release]; target = [t retain]; - +#endif + if (source==target) { bendMode = EdgeBendModeInOut; weight = 1.0f; @@ -422,8 +438,12 @@ [self willChangeValueForKey:@"hasEdgeNode"]; if (edgeNode != n) { hasEdgeNode = (n != nil); +#if __has_feature(objc_arc) + edgeNode = n; +#else [edgeNode release]; edgeNode = [n retain]; +#endif // don't set dirty bit, because control points don't need update } [self didChangeValueForKey:@"edgeNode"]; @@ -450,7 +470,9 @@ }else{ sourceAnchor = @""; } +#if ! __has_feature(objc_arc) [oldSourceAnchor release]; +#endif } - (NSString*) targetAnchor { return targetAnchor; } @@ -461,7 +483,9 @@ }else{ targetAnchor = @""; } +#if ! __has_feature(objc_arc) [oldTargetAnchor release]; +#endif } @synthesize data; @@ -558,11 +582,15 @@ - (void)setPropertiesFromEdge:(Edge*)e { Node *en = [[e edgeNode] copy]; [self setEdgeNode:en]; +#if ! __has_feature(objc_arc) [en release]; +#endif GraphElementData *d = [[e data] copy]; [self setData:d]; +#if ! __has_feature(objc_arc) [d release]; +#endif [self setStyle:[e style]]; [self setBend:[e bend]]; @@ -683,12 +711,14 @@ forKeyPath:@"style"]; [target removeObserver:self forKeyPath:@"style"]; +#if ! __has_feature(objc_arc) [source release]; [target release]; [data release]; [sourceAnchor release]; [targetAnchor release]; [super dealloc]; +#endif } - (id)copyWithZone:(NSZone*)zone { @@ -702,11 +732,19 @@ } + (Edge*)edge { +#if __has_feature(objc_arc) + return [[Edge alloc] init]; +#else return [[[Edge alloc] init] autorelease]; +#endif } + (Edge*)edgeWithSource:(Node*)s andTarget:(Node*)t { - return [[[Edge alloc] initWithSource:s andTarget:t] autorelease]; +#if __has_feature(objc_arc) + return [[Edge alloc] initWithSource:s andTarget:t]; +#else + return [[[Edge alloc] initWithSource:s andTarget:t] autorelease]; +#endif } @end diff --git a/tikzit/src/common/EdgeStyle.m b/tikzit/src/common/EdgeStyle.m index 39810fa..c61e94a 100644 --- a/tikzit/src/common/EdgeStyle.m +++ b/tikzit/src/common/EdgeStyle.m @@ -77,10 +77,12 @@ } - (void)dealloc { +#if ! __has_feature(objc_arc) [name release]; [category release]; [colorRGB release]; [super dealloc]; +#endif } - (NSString*) description { @@ -98,7 +100,11 @@ } + (EdgeStyle*)defaultEdgeStyleWithName:(NSString*)nm { +#if __has_feature(objc_arc) + return [[EdgeStyle alloc] initWithName:nm]; +#else return [[[EdgeStyle alloc] initWithName:nm] autorelease]; +#endif } - (NSString*)name { return name; } @@ -107,7 +113,9 @@ NSString *oldValue = name; name = [s copy]; [self postPropertyChanged:@"name" oldValue:oldValue]; +#if ! __has_feature(objc_arc) [oldValue release]; +#endif } } @@ -147,8 +155,10 @@ NSString *oldValue = category; category = [s copy]; [self postPropertyChanged:@"category" oldValue:oldValue]; - [oldValue release]; - } +#if ! __has_feature(objc_arc) + [oldValue release]; +#endif + } } - (ColorRGB*)colorRGB { @@ -160,8 +170,10 @@ ColorRGB *oldValue = colorRGB; colorRGB = [c copy]; [self postPropertyChanged:@"colorRGB" oldValue:oldValue]; - [oldValue release]; - } +#if ! __has_feature(objc_arc) + [oldValue release]; +#endif + } } - (NSString*)tikz { diff --git a/tikzit/src/common/Graph.m b/tikzit/src/common/Graph.m index 2d07ccc..cf09a69 100644 --- a/tikzit/src/common/Graph.m +++ b/tikzit/src/common/Graph.m @@ -51,8 +51,12 @@ } - (id)initFromTikz:(NSString*)tikz error:(NSError**)e { - [self release]; - return [[TikzGraphAssembler parseTikz:tikz error:e] retain]; +#if __has_feature(objc_arc) + return [TikzGraphAssembler parseTikz:tikz error:e]; +#else + [self release]; + return [[TikzGraphAssembler parseTikz:tikz error:e] retain]; +#endif } - (id)initFromTikz:(NSString*)tikz { @@ -69,7 +73,8 @@ [[NSNotificationCenter defaultCenter] removeObserver:self]; [graphLock lock]; - [inEdges release]; +#if ! __has_feature(objc_arc) + [inEdges release]; [outEdges release]; [edges release]; [nodes release]; @@ -78,18 +83,23 @@ [graphLock release]; [super dealloc]; +#endif } - (void)sync { [graphLock lock]; if (dirty) { - [inEdges release]; - [outEdges release]; +#if ! __has_feature(objc_arc) + [inEdges release]; + [outEdges release]; +#endif inEdges = [[NSMapTable alloc] initWithKeyOptions:NSMapTableStrongMemory valueOptions:NSMapTableStrongMemory capacity:10]; outEdges = [[NSMapTable alloc] initWithKeyOptions:NSMapTableStrongMemory valueOptions:NSMapTableStrongMemory capacity:10]; +#if ! __has_feature(objc_arc) NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - +#endif + for (Edge *e in edges) { NSMutableSet *ie = [inEdges objectForKey:[e target]]; NSMutableSet *oe = [outEdges objectForKey:[e source]]; @@ -108,8 +118,9 @@ [oe addObject:e]; } +#if ! __has_feature(objc_arc) [pool drain]; - +#endif dirty = NO; } @@ -150,12 +161,20 @@ - (NSSet*)inEdgesForNode:(Node*)nd { [self sync]; - return [[[inEdges objectForKey:nd] retain] autorelease]; +#if __has_feature(objc_arc) + return [inEdges objectForKey:nd]; +#else + return [[[inEdges objectForKey:nd] retain] autorelease]; +#endif } - (NSSet*)outEdgesForNode:(Node*)nd { [self sync]; - return [[[outEdges objectForKey:nd] retain] autorelease]; +#if __has_feature(objc_arc) + return [outEdges objectForKey:nd]; +#else + return [[[outEdges objectForKey:nd] retain] autorelease]; +#endif } - (NSSet*)incidentEdgesForNodes:(NSSet*)nds { @@ -347,7 +366,10 @@ } GraphChange *change = [GraphChange nodeOrderChangeFrom:oldOrder to:nodes moved:nodeSet]; [graphLock unlock]; - [oldOrder release]; + +#if ! __has_feature(objc_arc) + [oldOrder release]; +#endif return change; } @@ -365,8 +387,11 @@ } } GraphChange *change = [GraphChange nodeOrderChangeFrom:oldOrder to:nodes moved:nodeSet]; - [oldOrder release]; - + +#if ! __has_feature(objc_arc) + [oldOrder release]; +#endif + return change; } @@ -383,7 +408,10 @@ } GraphChange *change = [GraphChange edgeOrderChangeFrom:oldOrder to:edges moved:edgeSet]; [graphLock unlock]; - [oldOrder release]; + +#if ! __has_feature(objc_arc) + [oldOrder release]; +#endif return change; } @@ -401,8 +429,11 @@ } } GraphChange *change = [GraphChange edgeOrderChangeFrom:oldOrder to:edges moved:edgeSet]; - [oldOrder release]; - + +#if ! __has_feature(objc_arc) + [oldOrder release]; +#endif + return change; } @@ -419,7 +450,10 @@ } GraphChange *change = [GraphChange nodeOrderChangeFrom:oldOrder to:nodes moved:nodeSet]; [graphLock unlock]; - [oldOrder release]; + +#if ! __has_feature(objc_arc) + [oldOrder release]; +#endif return change; } @@ -437,7 +471,10 @@ } GraphChange *change = [GraphChange edgeOrderChangeFrom:oldOrder to:edges moved:edgeSet]; [graphLock unlock]; - [oldOrder release]; + +#if ! __has_feature(objc_arc) + [oldOrder release]; +#endif return change; } @@ -455,8 +492,11 @@ } } GraphChange *change = [GraphChange nodeOrderChangeFrom:oldOrder to:nodes moved:nodeSet]; - [oldOrder release]; - + +#if ! __has_feature(objc_arc) + [oldOrder release]; +#endif + return change; } @@ -473,8 +513,11 @@ } } GraphChange *change = [GraphChange edgeOrderChangeFrom:oldOrder to:edges moved:edgeSet]; - [oldOrder release]; - + +#if ! __has_feature(objc_arc) + [oldOrder release]; +#endif + return change; } @@ -571,7 +614,9 @@ [e1 setSource:[newNds objectForKey:[e source]]]; [e1 setTarget:[newNds objectForKey:[e target]]]; [newGraph addEdge:e1]; - [e1 release]; // e1 belongs to newGraph +#if ! __has_feature(objc_arc) + [e1 release]; // e1 belongs to newGraph +#endif } } @@ -584,8 +629,9 @@ [self sync]; NSMutableSet *cover = [NSMutableSet set]; +#if ! __has_feature(objc_arc) NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - +#endif NSMutableSet *remainingEdges = [NSMutableSet setWithArray:edges]; while ([remainingEdges count] != 0) { @@ -610,10 +656,14 @@ } [cover addObject:path]; +#if ! __has_feature(objc_arc) [path release]; +#endif } - + +#if ! __has_feature(objc_arc) [pool drain]; +#endif return cover; } @@ -780,7 +830,11 @@ } + (Graph*)graph { +#if __has_feature(objc_arc) + return [[self alloc] init]; +#else return [[[self alloc] init] autorelease]; +#endif } + (Graph*)graphFromTikz:(NSString*)tikz error:(NSError**)e { @@ -803,9 +857,15 @@ for (Node *n in nds) { Node *ncopy = [n copyWithZone:zone]; [tab setObject:ncopy forKey:n]; +#if ! __has_feature(objc_arc) [ncopy release]; // tab should still retain ncopy. +#endif } - return [tab autorelease]; +#if __has_feature(objc_arc) + return tab; +#else + return [tab autorelease]; +#endif } + (NSMapTable*)edgeTableForEdges:(NSSet*)es { @@ -820,7 +880,9 @@ for (Edge *e in es) { Edge *ecopy = [e copyWithZone:zone]; [tab setObject:ecopy forKey:e]; +#if ! __has_feature(objc_arc) [ecopy release]; // tab should still retain ecopy. +#endif } return tab; } diff --git a/tikzit/src/common/GraphChange.m b/tikzit/src/common/GraphChange.m index 239ae23..29a3939 100644 --- a/tikzit/src/common/GraphChange.m +++ b/tikzit/src/common/GraphChange.m @@ -36,6 +36,7 @@ } - (void)dealloc { +#if ! __has_feature(objc_arc) [affectedNodes release]; [affectedEdges release]; [nodeRef release]; @@ -56,6 +57,7 @@ [nwEdgeOrder release]; [super dealloc]; +#endif } @synthesize changeType; @@ -77,65 +79,128 @@ switch ([self changeType]) { case GraphAddition: [inverse setChangeType:GraphDeletion]; - inverse->affectedNodes = [affectedNodes retain]; - inverse->affectedEdges = [affectedEdges retain]; +#if __has_feature(objc_arc) + inverse->affectedNodes = affectedNodes; + inverse->affectedEdges = affectedEdges; +#else + inverse->affectedNodes = [affectedNodes retain]; + inverse->affectedEdges = [affectedEdges retain]; +#endif break; case GraphDeletion: [inverse setChangeType:GraphAddition]; - inverse->affectedNodes = [affectedNodes retain]; - inverse->affectedEdges = [affectedEdges retain]; +#if __has_feature(objc_arc) + inverse->affectedNodes = affectedNodes; + inverse->affectedEdges = affectedEdges; +#else + inverse->affectedNodes = [affectedNodes retain]; + inverse->affectedEdges = [affectedEdges retain]; +#endif break; case NodePropertyChange: - inverse->nodeRef = [nodeRef retain]; - inverse->oldNode = [nwNode retain]; - inverse->nwNode = [oldNode retain]; +#if __has_feature(objc_arc) + inverse->nodeRef = nodeRef; + inverse->oldNode = nwNode; + inverse->nwNode = oldNode; +#else + inverse->nodeRef = [nodeRef retain]; + inverse->oldNode = [nwNode retain]; + inverse->nwNode = [oldNode retain]; +#endif break; case NodesPropertyChange: - inverse->oldNodeTable = [nwNodeTable retain]; - inverse->nwNodeTable = [oldNodeTable retain]; +#if __has_feature(objc_arc) + +#else + inverse->oldNodeTable = [nwNodeTable retain]; + inverse->nwNodeTable = [oldNodeTable retain]; +#endif break; case EdgePropertyChange: - inverse->edgeRef = [edgeRef retain]; - inverse->oldEdge = [nwEdge retain]; - inverse->nwEdge = [oldEdge retain]; +#if __has_feature(objc_arc) + inverse->edgeRef = edgeRef; + inverse->oldEdge = nwEdge; + inverse->nwEdge = oldEdge; +#else + inverse->edgeRef = [edgeRef retain]; + inverse->oldEdge = [nwEdge retain]; + inverse->nwEdge = [oldEdge retain]; +#endif break; case EdgesPropertyChange: - inverse->oldEdgeTable = [nwEdgeTable retain]; - inverse->nwEdgeTable = [oldEdgeTable retain]; +#if __has_feature(objc_arc) + inverse->oldEdgeTable = nwEdgeTable; + inverse->nwEdgeTable = oldEdgeTable; +#else + inverse->oldEdgeTable = [nwEdgeTable retain]; + inverse->nwEdgeTable = [oldEdgeTable retain]; +#endif break; case NodesShift: - inverse->affectedNodes = [affectedNodes retain]; - [inverse setShiftPoint:NSMakePoint(-[self shiftPoint].x, - -[self shiftPoint].y)]; +#if __has_feature(objc_arc) + inverse->affectedNodes = affectedNodes; +#else + inverse->affectedNodes = [affectedNodes retain]; +#endif + [inverse setShiftPoint:NSMakePoint(-[self shiftPoint].x, + -[self shiftPoint].y)]; break; case NodesFlip: - inverse->affectedNodes = [affectedNodes retain]; - [inverse setHorizontal:[self horizontal]]; +#if __has_feature(objc_arc) + inverse->affectedNodes = affectedNodes; +#else + inverse->affectedNodes = [affectedNodes retain]; +#endif + [inverse setHorizontal:[self horizontal]]; break; case EdgesReverse: - inverse->affectedEdges = [affectedEdges retain]; +#if __has_feature(objc_arc) + inverse->affectedEdges = affectedEdges; +#else + inverse->affectedEdges = [affectedEdges retain]; +#endif break; case BoundingBoxChange: inverse->oldBoundingBox = nwBoundingBox; inverse->nwBoundingBox = oldBoundingBox; break; case GraphPropertyChange: - inverse->oldGraphData = [nwGraphData retain]; - inverse->nwGraphData = [oldGraphData retain]; +#if __has_feature(objc_arc) + inverse->oldGraphData = nwGraphData; + inverse->nwGraphData = oldGraphData; +#else + inverse->oldGraphData = [nwGraphData retain]; + inverse->nwGraphData = [oldGraphData retain]; +#endif break; case NodeOrderChange: - inverse->affectedNodes = [affectedNodes retain]; - inverse->oldNodeOrder = [nwNodeOrder retain]; - inverse->nwNodeOrder = [oldNodeOrder retain]; +#if __has_feature(objc_arc) + inverse->affectedNodes = affectedNodes; + inverse->oldNodeOrder = nwNodeOrder; + inverse->nwNodeOrder = oldNodeOrder; +#else + inverse->affectedNodes = [affectedNodes retain]; + inverse->oldNodeOrder = [nwNodeOrder retain]; + inverse->nwNodeOrder = [oldNodeOrder retain]; +#endif break; case EdgeOrderChange: - inverse->affectedEdges = [affectedEdges retain]; - inverse->oldEdgeOrder = [nwEdgeOrder retain]; - inverse->nwEdgeOrder = [oldEdgeOrder retain]; +#if __has_feature(objc_arc) + inverse->affectedEdges = affectedEdges; + inverse->oldEdgeOrder = nwEdgeOrder; + inverse->nwEdgeOrder = oldEdgeOrder; +#else + inverse->affectedEdges = [affectedEdges retain]; + inverse->oldEdgeOrder = [nwEdgeOrder retain]; + inverse->nwEdgeOrder = [oldEdgeOrder retain]; +#endif break; } - +#if __has_feature(objc_arc) + return inverse; +#else return [inverse autorelease]; +#endif } + (GraphChange*)graphAdditionWithNodes:(NSSet *)ns edges:(NSSet *)es { @@ -143,7 +208,11 @@ [gc setChangeType:GraphAddition]; [gc setAffectedNodes:ns]; [gc setAffectedEdges:es]; - return [gc autorelease]; +#if __has_feature(objc_arc) + return gc; +#else + return [gc autorelease]; +#endif } + (GraphChange*)graphDeletionWithNodes:(NSSet *)ns edges:(NSSet *)es { @@ -151,7 +220,11 @@ [gc setChangeType:GraphDeletion]; [gc setAffectedNodes:ns]; [gc setAffectedEdges:es]; - return [gc autorelease]; +#if __has_feature(objc_arc) + return gc; +#else + return [gc autorelease]; +#endif } + (GraphChange*)propertyChangeOfNode:(Node*)nd fromOld:(Node*)old toNew:(Node*)nw { @@ -160,7 +233,11 @@ [gc setNodeRef:nd]; [gc setOldNode:old]; [gc setNwNode:nw]; - return [gc autorelease]; +#if __has_feature(objc_arc) + return gc; +#else + return [gc autorelease]; +#endif } + (GraphChange*)propertyChangeOfNodesFromOldCopies:(NSMapTable*)oldC @@ -169,7 +246,11 @@ [gc setChangeType:NodesPropertyChange]; [gc setOldNodeTable:oldC]; [gc setNwNodeTable:newC]; - return [gc autorelease]; +#if __has_feature(objc_arc) + return gc; +#else + return [gc autorelease]; +#endif } + (GraphChange*)propertyChangeOfEdge:(Edge*)e fromOld:(Edge *)old toNew:(Edge *)nw { @@ -178,7 +259,11 @@ [gc setEdgeRef:e]; [gc setOldEdge:old]; [gc setNwEdge:nw]; - return [gc autorelease]; +#if __has_feature(objc_arc) + return gc; +#else + return [gc autorelease]; +#endif } + (GraphChange*)propertyChangeOfEdgesFromOldCopies:(NSMapTable*)oldC @@ -187,7 +272,11 @@ [gc setChangeType:EdgesPropertyChange]; [gc setOldEdgeTable:oldC]; [gc setNwEdgeTable:newC]; - return [gc autorelease]; +#if __has_feature(objc_arc) + return gc; +#else + return [gc autorelease]; +#endif } + (GraphChange*)shiftNodes:(NSSet*)ns byPoint:(NSPoint)p { @@ -195,7 +284,11 @@ [gc setChangeType:NodesShift]; [gc setAffectedNodes:ns]; [gc setShiftPoint:p]; - return [gc autorelease]; +#if __has_feature(objc_arc) + return gc; +#else + return [gc autorelease]; +#endif } + (GraphChange*)flipNodes:(NSSet*)ns horizontal:(BOOL)b { @@ -203,14 +296,22 @@ [gc setChangeType:NodesFlip]; [gc setAffectedNodes:ns]; [gc setHorizontal:b]; - return [gc autorelease]; +#if __has_feature(objc_arc) + return gc; +#else + return [gc autorelease]; +#endif } + (GraphChange*)reverseEdges:(NSSet*)es { GraphChange *gc = [[GraphChange alloc] init]; [gc setChangeType:EdgesReverse]; [gc setAffectedEdges:es]; - return [gc autorelease]; +#if __has_feature(objc_arc) + return gc; +#else + return [gc autorelease]; +#endif } + (GraphChange*)changeBoundingBoxFrom:(NSRect)oldBB to:(NSRect)newBB { @@ -218,7 +319,11 @@ [gc setChangeType:BoundingBoxChange]; [gc setOldBoundingBox:oldBB]; [gc setNwBoundingBox:newBB]; - return [gc autorelease]; +#if __has_feature(objc_arc) + return gc; +#else + return [gc autorelease]; +#endif } + (GraphChange*)propertyChangeOfGraphFrom:(GraphElementData*)oldData to:(GraphElementData*)newData { @@ -226,7 +331,11 @@ [gc setChangeType:GraphPropertyChange]; [gc setOldGraphData:oldData]; [gc setNwGraphData:newData]; - return [gc autorelease]; +#if __has_feature(objc_arc) + return gc; +#else + return [gc autorelease]; +#endif } + (GraphChange*)nodeOrderChangeFrom:(NSArray*)old to:(NSArray*)new moved:(NSSet*)affected { @@ -235,7 +344,11 @@ [gc setAffectedNodes:affected]; [gc setOldNodeOrder:old]; [gc setNwNodeOrder:new]; - return [gc autorelease]; +#if __has_feature(objc_arc) + return gc; +#else + return [gc autorelease]; +#endif } + (GraphChange*)edgeOrderChangeFrom:(NSArray*)old to:(NSArray*)new moved:(NSSet*)affected { @@ -244,7 +357,11 @@ [gc setAffectedEdges:affected]; [gc setOldEdgeOrder:old]; [gc setNwEdgeOrder:new]; - return [gc autorelease]; +#if __has_feature(objc_arc) + return gc; +#else + return [gc autorelease]; +#endif } @end diff --git a/tikzit/src/common/GraphElementData.m b/tikzit/src/common/GraphElementData.m index 0750296..41dc9aa 100644 --- a/tikzit/src/common/GraphElementData.m +++ b/tikzit/src/common/GraphElementData.m @@ -28,7 +28,11 @@ @implementation GraphElementData + (id)data { +#if __has_feature(objc_arc) + return [[self alloc] init]; +#else return [[[self alloc] init] autorelease]; +#endif } - (id)init { @@ -48,9 +52,15 @@ - (NSArray*)objectsAtIndexes:(NSIndexSet*)indexes { return [properties objectsAtIndexes:indexes]; } + +#if __has_feature(objc_arc) +- (void) getObjects:(__unsafe_unretained id*)buffer range:(NSRange)range { +#else - (void) getObjects:(id*)buffer range:(NSRange)range { +#endif [properties getObjects:buffer range:range]; } + - (void)insertObject:(id)anObject atIndex:(NSUInteger)index { [properties insertObject:anObject atIndex:index]; } @@ -66,22 +76,33 @@ - (void)replaceObjectAtIndex:(NSUInteger)index withObject:(id)anObject { [properties replaceObjectAtIndex:index withObject:anObject]; } + +#if __has_feature(objc_arc) +- (NSUInteger) countByEnumeratingWithState:(NSFastEnumerationState *)state + objects:(__unsafe_unretained id [])stackbuf + count:(NSUInteger)len { +#else - (NSUInteger)countByEnumeratingWithState:(NSFastEnumerationState *)state objects:(id *)stackbuf count:(NSUInteger)len { - return [properties countByEnumeratingWithState:state objects:stackbuf count:len]; +#endif + return [properties countByEnumeratingWithState:state objects:stackbuf count:len]; } - (void)setProperty:(NSString*)val forKey:(NSString*)key { GraphElementProperty *m = [[GraphElementProperty alloc] initWithKeyMatching:key]; NSInteger idx = [properties indexOfObject:m]; - [m release]; +#if !__has_feature(objc_arc) + [m release]; +#endif GraphElementProperty *p; if (idx == NSNotFound) { p = [[GraphElementProperty alloc] initWithPropertyValue:val forKey:key]; [properties addObject:p]; - [p release]; +#if !__has_feature(objc_arc) + [p release]; +#endif } else { p = [properties objectAtIndex:idx]; [p setValue:val]; @@ -91,13 +112,19 @@ - (void)unsetProperty:(NSString*)key { GraphElementProperty *m = [[GraphElementProperty alloc] initWithKeyMatching:key]; [properties removeObject:m]; - [m release]; +#if !__has_feature(objc_arc) + [m release]; +#endif + } - (NSString*)propertyForKey:(NSString*)key { GraphElementProperty *m = [[GraphElementProperty alloc] initWithKeyMatching:key]; NSInteger idx = [properties indexOfObject:m]; - [m release]; +#if !__has_feature(objc_arc) + [m release]; +#endif + if (idx == NSNotFound) { return nil; @@ -110,19 +137,25 @@ - (void)setAtom:(NSString*)atom { GraphElementProperty *a = [[GraphElementProperty alloc] initWithAtomName:atom]; if (![properties containsObject:a]) [properties addObject:a]; - [a release]; +#if !__has_feature(objc_arc) + [a release]; +#endif } - (void)unsetAtom:(NSString*)atom { GraphElementProperty *a = [[GraphElementProperty alloc] initWithAtomName:atom]; [properties removeObject:a]; - [a release]; +#if !__has_feature(objc_arc) + [a release]; +#endif } - (BOOL)isAtomSet:(NSString*)atom { GraphElementProperty *a = [[GraphElementProperty alloc] initWithAtomName:atom]; BOOL set = [properties containsObject:a]; - [a release]; +#if !__has_feature(objc_arc) + [a release]; +#endif return set; } @@ -136,14 +169,18 @@ for (GraphElementProperty *p in properties) { GraphElementProperty *p2 = [p copy]; [cp addObject:p2]; - [p2 release]; +#if !__has_feature(objc_arc) + [p2 release]; +#endif } return cp; } - (void)dealloc { - [properties release]; - [super dealloc]; +#if !__has_feature(objc_arc) + [properties release]; + [super dealloc]; +#endif } @end diff --git a/tikzit/src/common/GraphElementProperty.m b/tikzit/src/common/GraphElementProperty.m index 1acdc09..25e1b15 100644 --- a/tikzit/src/common/GraphElementProperty.m +++ b/tikzit/src/common/GraphElementProperty.m @@ -28,13 +28,25 @@ @implementation GraphElementProperty + (id)atom:(NSString*)n { - return [[[self alloc] initWithAtomName:n] autorelease]; +#if __has_feature(objc_arc) + return [[self alloc] initWithAtomName:n]; +#else + return [[[self alloc] initWithAtomName:n] autorelease]; +#endif } + (id)property:(NSString*)k withValue:(NSString*)v { +#if __has_feature(objc_arc) + return [[self alloc] initWithPropertyValue:v forKey:k]; +#else return [[[self alloc] initWithPropertyValue:v forKey:k] autorelease]; +#endif } + (id)keyMatching:(NSString*)k { +#if __has_feature(objc_arc) + return [[self alloc] initWithKeyMatching:k]; +#else return [[[self alloc] initWithKeyMatching:k] autorelease]; +#endif } - (id)initWithAtomName:(NSString*)n { @@ -65,15 +77,18 @@ } - (void) dealloc { +#if ! __has_feature(objc_arc) [key release]; -// the below line causes a exc_bad_access. Uncommenting it gains a memory leak but at least no crashing. -// [value release]; + [value release]; [super dealloc]; +#endif } - (void)setValue:(NSString *)v { if (value != v) { +#if ! __has_feature(objc_arc) [value release]; +#endif value = [v copy]; } } @@ -89,7 +104,9 @@ - (void)setKey:(NSString *)k { if (key != k) { +#if ! __has_feature(objc_arc) [key release]; +#endif key = [k copy]; } if (key == nil) diff --git a/tikzit/src/common/NSString+LatexConstants.m b/tikzit/src/common/NSString+LatexConstants.m index bd598b7..634c189 100644 --- a/tikzit/src/common/NSString+LatexConstants.m +++ b/tikzit/src/common/NSString+LatexConstants.m @@ -197,10 +197,14 @@ static NSSet *texModifiers = nil; } NSString *ret = [buf copy]; +#if __has_feature(objc_arc) + return ret; +#else [buf release]; [wordBuf release]; return [ret autorelease]; +#endif } @end diff --git a/tikzit/src/common/NSString+Tikz.m b/tikzit/src/common/NSString+Tikz.m index 520ffd3..1e3073b 100644 --- a/tikzit/src/common/NSString+Tikz.m +++ b/tikzit/src/common/NSString+Tikz.m @@ -23,12 +23,21 @@ - (NSString*) tikzEscapedString { static NSCharacterSet *avoid = nil; if (avoid == nil) - avoid = [[[NSCharacterSet characterSetWithCharactersInString:@"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ<>-'0123456789. "] invertedSet] retain]; +#if __has_feature(objc_arc) + avoid = [[NSCharacterSet characterSetWithCharactersInString:@"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ<>-'0123456789. "] invertedSet]; +#else + avoid = [[[NSCharacterSet characterSetWithCharactersInString:@"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ<>-'0123456789. "] invertedSet] retain]; +#endif + if ([self rangeOfCharacterFromSet:avoid].length > 0) { return [NSString stringWithFormat:@"{%@}", self]; } else { +#if __has_feature(objc_arc) + return self; +#else return [[self retain] autorelease]; +#endif } } diff --git a/tikzit/src/common/Node.m b/tikzit/src/common/Node.m index 8c64b6b..c5b11d1 100644 --- a/tikzit/src/common/Node.m +++ b/tikzit/src/common/Node.m @@ -50,11 +50,13 @@ } - (void)dealloc { +#if ! __has_feature(objc_arc) [name release]; [style release]; [data release]; [label release]; [super dealloc]; +#endif } - (Shape*) shape { @@ -67,7 +69,11 @@ - (Transformer*) shapeTransformerFromTransformer:(Transformer*)t { // we take a copy to keep the reflection attributes +#if ! __has_feature(objc_arc) Transformer *transformer = [[t copy] autorelease]; +#else + Transformer *transformer = [t copy]; +#endif NSPoint screenPos = [t toScreen:point]; [transformer setOrigin:screenPos]; float scale = [t scale]; @@ -101,7 +107,11 @@ } - (BOOL)attachStyleFromTable:(NSArray*)styles { - NSString *style_name = [[[data propertyForKey:@"style"] retain] autorelease]; +#if __has_feature(objc_arc) + NSString *style_name = [data propertyForKey:@"style"]; +#else + NSString *style_name = [[[data propertyForKey:@"style"] retain] autorelease]; +#endif [self setStyle:nil]; @@ -137,11 +147,19 @@ } + (Node*)nodeWithPoint:(NSPoint)p { - return [[[Node alloc] initWithPoint:p] autorelease]; +#if __has_feature(objc_arc) + return [[Node alloc] initWithPoint:p]; +#else + return [[[Node alloc] initWithPoint:p] autorelease]; +#endif } + (Node*)node { - return [[[Node alloc] init] autorelease]; +#if __has_feature(objc_arc) + return [[Node alloc] init]; +#else + return [[[Node alloc] init] autorelease]; +#endif } @@ -180,9 +198,13 @@ - (void)setStyle:(NodeStyle *)st { if (style != st) { - NodeStyle *oldStyle = style; - style = [st retain]; - [oldStyle release]; +#if __has_feature(objc_arc) + style = st; +#else + NodeStyle *oldStyle = style; + style = [st retain]; + [oldStyle release]; +#endif } [self updateData]; } diff --git a/tikzit/src/common/NodeStyle.m b/tikzit/src/common/NodeStyle.m index 26ab793..193d44d 100644 --- a/tikzit/src/common/NodeStyle.m +++ b/tikzit/src/common/NodeStyle.m @@ -87,12 +87,14 @@ } - (void)dealloc { +#if ! __has_feature(objc_arc) [name release]; [category release]; [shapeName release]; [strokeColorRGB release]; [fillColorRGB release]; [super dealloc]; +#endif } - (NSString*) description { @@ -110,7 +112,11 @@ } + (NodeStyle*)defaultNodeStyleWithName:(NSString*)nm { - return [[[NodeStyle alloc] initWithName:nm] autorelease]; +#if __has_feature(objc_arc) + return [[NodeStyle alloc] initWithName:nm]; +#else + return [[[NodeStyle alloc] initWithName:nm] autorelease]; +#endif } - (NSString*)name { @@ -122,7 +128,9 @@ NSString *oldValue = name; name = [s copy]; [self postPropertyChanged:@"name" oldValue:oldValue]; +#if ! __has_feature(objc_arc) [oldValue release]; +#endif } } @@ -135,7 +143,9 @@ NSString *oldValue = shapeName; shapeName = [s copy]; [self postPropertyChanged:@"shapeName" oldValue:oldValue]; +#if ! __has_feature(objc_arc) [oldValue release]; +#endif } } @@ -148,8 +158,10 @@ NSString *oldValue = category; category = [s copy]; [self postPropertyChanged:@"category" oldValue:oldValue]; +#if ! __has_feature(objc_arc) [oldValue release]; - } +#endif + } } - (int)strokeThickness { return strokeThickness; } @@ -175,8 +187,10 @@ ColorRGB *oldValue = strokeColorRGB; strokeColorRGB = [c copy]; [self postPropertyChanged:@"strokeColorRGB" oldValue:oldValue]; +#if ! __has_feature(objc_arc) [oldValue release]; - } +#endif + } } - (ColorRGB*)fillColorRGB { @@ -188,8 +202,10 @@ ColorRGB *oldValue = fillColorRGB; fillColorRGB = [c copy]; [self postPropertyChanged:@"fillColorRGB" oldValue:oldValue]; +#if ! __has_feature(objc_arc) [oldValue release]; - } +#endif + } } - (NSString*)tikz { diff --git a/tikzit/src/common/PickSupport.m b/tikzit/src/common/PickSupport.m index 6470214..560fc2c 100644 --- a/tikzit/src/common/PickSupport.m +++ b/tikzit/src/common/PickSupport.m @@ -42,15 +42,24 @@ self = [super init]; if (self) { - selectedNodes = [[NSMutableSet set] retain]; - selectedEdges = [[NSMutableSet set] retain]; +#if __has_feature(objc_arc) + selectedNodes = [NSMutableSet set]; + selectedEdges = [NSMutableSet set]; +#else + selectedNodes = [[NSMutableSet set] retain]; + selectedEdges = [[NSMutableSet set] retain]; +#endif } return self; } + (PickSupport*)pickSupport { - return [[[PickSupport alloc] init] autorelease]; +#if __has_feature(objc_arc) + return [[PickSupport alloc] init]; +#else + return [[[PickSupport alloc] init] autorelease]; +#endif } @synthesize selectedNodes; @@ -176,7 +185,9 @@ } if (replace) { +#if ! __has_feature(objc_arc) [selectedNodes release]; +#endif selectedNodes = [nodes mutableCopy]; } else { [selectedNodes unionSet:nodes]; @@ -208,10 +219,12 @@ } - (void)dealloc { +#if ! __has_feature(objc_arc) [selectedNodes release]; [selectedEdges release]; [super dealloc]; +#endif } @end diff --git a/tikzit/src/common/Preambles.m b/tikzit/src/common/Preambles.m index 651bbcd..922fc30 100644 --- a/tikzit/src/common/Preambles.m +++ b/tikzit/src/common/Preambles.m @@ -55,7 +55,11 @@ static NSString *POSTAMBLE = @implementation Preambles + (Preambles*)preambles { +#if __has_feature(objc_arc) + return [[self alloc] init]; +#else return [[[self alloc] init] autorelease]; +#endif } - (id)init { @@ -72,10 +76,12 @@ static NSString *POSTAMBLE = } - (void)dealloc { +#if ! __has_feature(objc_arc) [selectedPreambleName release]; [styles release]; [styleManager release]; [super dealloc]; +#endif } - (NSString*)preambleForName:(NSString*)name { @@ -101,14 +107,18 @@ static NSString *POSTAMBLE = } - (void)setStyles:(NSArray*)sty { +#if ! __has_feature(objc_arc) [sty retain]; [styles release]; +#endif styles = sty; } - (void)setEdges:(NSArray*)edg { +#if ! __has_feature(objc_arc) [edg retain]; [edges release]; +#endif edges = edg; } @@ -116,7 +126,9 @@ static NSString *POSTAMBLE = if (styleManager != nil) { [self setStyles:[styleManager nodeStyles]]; } +#if ! __has_feature(objc_arc) NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; +#endif NSMutableString *buf = [NSMutableString string]; NSMutableString *colbuf = [NSMutableString string]; NSMutableSet *colors = [NSMutableSet setWithCapacity:2*[styles count]]; @@ -154,8 +166,12 @@ static NSString *POSTAMBLE = NSString *defs = [[NSString alloc] initWithFormat:@"%@\n%@", colbuf, buf]; +#if __has_feature(objc_arc) + return defs; +#else [pool drain]; return [defs autorelease]; +#endif } - (NSString*)defaultPreamble { @@ -170,7 +186,9 @@ static NSString *POSTAMBLE = - (NSString*)selectedPreambleName { return selectedPreambleName; } - (void)setSelectedPreambleName:(NSString *)sel { if (sel != selectedPreambleName) { +#if ! __has_feature(objc_arc) [selectedPreambleName release]; +#endif selectedPreambleName = [sel copy]; } } @@ -190,8 +208,10 @@ static NSString *POSTAMBLE = } - (void)setStyleManager:(StyleManager *)manager { +#if ! __has_feature(objc_arc) [manager retain]; [styleManager release]; +#endif styleManager = manager; } @@ -240,10 +260,14 @@ static NSString *POSTAMBLE = isSelected = YES; } NSString *preamble = [preambleDict objectForKey:old]; +#if ! __has_feature(objc_arc) [preamble retain]; +#endif [preambleDict removeObjectForKey:old]; [preambleDict setObject:preamble forKey:new]; +#if ! __has_feature(objc_arc) [preamble release]; +#endif if (isSelected) { [self setSelectedPreambleName:new]; } @@ -254,11 +278,15 @@ static NSString *POSTAMBLE = if ([name isEqualToString:@"default"]) return NO; // "name" may be held only by being the selected preamble... +#if ! __has_feature(objc_arc) [name retain]; +#endif if ([name isEqualToString:selectedPreambleName]) [self setSelectedPreambleName:nil]; [preambleDict removeObjectForKey:name]; +#if ! __has_feature(objc_arc) [name release]; +#endif return YES; } diff --git a/tikzit/src/common/PropertyHolder.m b/tikzit/src/common/PropertyHolder.m index 2b3442f..6aaf125 100644 --- a/tikzit/src/common/PropertyHolder.m +++ b/tikzit/src/common/PropertyHolder.m @@ -63,8 +63,10 @@ } - (void)dealloc { +#if ! __has_feature(objc_arc) [notificationName release]; [super dealloc]; +#endif } @end diff --git a/tikzit/src/common/Shape.m b/tikzit/src/common/Shape.m index 5dc25e3..e887688 100644 --- a/tikzit/src/common/Shape.m +++ b/tikzit/src/common/Shape.m @@ -61,8 +61,12 @@ - (NSSet*)paths {return paths;} - (void)setPaths:(NSSet *)p { if (paths != p) { +#if __has_feature(objc_arc) + paths = p; +#else [paths release]; paths = [p retain]; +#endif [self calcBoundingRect]; } } @@ -79,9 +83,11 @@ } - (void)dealloc { +#if ! __has_feature(objc_arc) [paths release]; [styleTikz release]; [super dealloc]; +#endif } NSDictionary *shapeDictionary = nil; @@ -101,7 +107,9 @@ NSDictionary *shapeDictionary = nil; [shapeDir stringByAppendingPathComponent:f]]; if (sh != nil) { [shapeDict setObject:sh forKey:nm]; +#if ! __has_feature(objc_arc) [sh release]; +#endif } } } @@ -122,7 +130,9 @@ NSDictionary *shapeDictionary = nil; shapes[3], SHAPE_UP_TRIANGLE, shapes[4], SHAPE_DOWN_TRIANGLE, nil]; +#if ! __has_feature(objc_arc) for (int i = 0; i<5; ++i) [shapes[i] release]; +#endif NSString *systemShapeDir = [[SupportDir systemSupportDir] stringByAppendingPathComponent:@"shapes"]; NSString *userShapeDir = [[SupportDir userSupportDir] stringByAppendingPathComponent:@"shapes"]; @@ -137,7 +147,9 @@ NSDictionary *shapeDictionary = nil; postNotificationName:@"ShapeDictionaryReplaced" object:self]; +#if ! __has_feature(objc_arc) [oldShapeDictionary release]; +#endif } + (NSDictionary*)shapeDictionary { @@ -147,7 +159,11 @@ NSDictionary *shapeDictionary = nil; + (Shape*)shapeForName:(NSString*)shapeName { Shape *s = [[[self shapeDictionary] objectForKey:shapeName] copy]; +#if __has_feature(objc_arc) + return s; +#else return [s autorelease]; +#endif } @end diff --git a/tikzit/src/common/StyleManager.m b/tikzit/src/common/StyleManager.m index ae0d488..05c6c86 100644 --- a/tikzit/src/common/StyleManager.m +++ b/tikzit/src/common/StyleManager.m @@ -90,7 +90,11 @@ } + (StyleManager*) manager { +#if __has_feature(objc_arc) + return [[self alloc] init]; +#else return [[[self alloc] init] autorelease]; +#endif } - (id) init { @@ -107,15 +111,18 @@ - (void) dealloc { [[NSNotificationCenter defaultCenter] removeObserver:self]; - +#if ! __has_feature(objc_arc) [nodeStyles release]; [edgeStyles release]; [super dealloc]; +#endif } - (void) loadDefaultEdgeStyles { +#if ! __has_feature(objc_arc) [edgeStyles release]; +#endif edgeStyles = [[NSMutableArray alloc] initWithCapacity:3]; EdgeStyle *simple = [EdgeStyle defaultEdgeStyleWithName:@"simple"]; @@ -138,7 +145,9 @@ } - (void) loadDefaultNodeStyles { +#if ! __has_feature(objc_arc) [nodeStyles release]; +#endif nodeStyles = [[NSMutableArray alloc] initWithCapacity:3]; NodeStyle *rn = [NodeStyle defaultNodeStyleWithName:@"rn"]; @@ -212,8 +221,10 @@ - (void) _setNodeStyles:(NSMutableArray*)styles { [self ignoreAllNodeStyles]; +#if ! __has_feature(objc_arc) [nodeStyles release]; [styles retain]; +#endif nodeStyles = styles; for (NodeStyle *style in styles) { [self listenToNodeStyle:style]; @@ -223,8 +234,10 @@ - (void) _setEdgeStyles:(NSMutableArray*)styles { [self ignoreAllEdgeStyles]; +#if ! __has_feature(objc_arc) [edgeStyles release]; [styles retain]; +#endif edgeStyles = styles; for (EdgeStyle *style in styles) { [self listenToEdgeStyle:style]; @@ -257,10 +270,14 @@ } [self ignoreNodeStyle:style]; +#if ! __has_feature(objc_arc) [style retain]; +#endif [nodeStyles removeObject:style]; [self postNodeStyleRemoved:style]; +#if ! __has_feature(objc_arc) [style release]; +#endif } - (EdgeStyle*) edgeStyleForName:(NSString*)name { @@ -288,10 +305,14 @@ } [self ignoreEdgeStyle:style]; +#if ! __has_feature(objc_arc) [style retain]; +#endif [edgeStyles removeObject:style]; [self postEdgeStyleRemoved:style]; +#if ! __has_feature(objc_arc) [style release]; +#endif } - (void) updateFromManager:(StyleManager*)m { @@ -302,7 +323,11 @@ [currentStyle updateFromStyle:style]; [ns addObject:currentStyle]; } else { +#if __has_feature(objc_arc) + [ns addObject:[style copy]]; +#else [ns addObject:[[style copy] autorelease]]; +#endif } } NSMutableArray *es = [NSMutableArray arrayWithCapacity:[[m edgeStyles] count]]; @@ -312,8 +337,12 @@ [currentStyle updateFromStyle:style]; [es addObject:currentStyle]; } else { - [es addObject:[[style copy] autorelease]]; - } +#if __has_feature(objc_arc) + [es addObject:[style copy]]; +#else + [es addObject:[[style copy] autorelease]]; +#endif + } } [self _setNodeStyles:ns]; [self _setEdgeStyles:es]; @@ -324,11 +353,19 @@ NSMutableArray *ns = [NSMutableArray arrayWithCapacity:[nodeStyles count]]; for (NodeStyle *style in nodeStyles) { - [ns addObject:[[style copyWithZone:zone] autorelease]]; +#if __has_feature(objc_arc) + [ns addObject:[style copyWithZone:zone]]; +#else + [ns addObject:[[style copyWithZone:zone] autorelease]]; +#endif } NSMutableArray *es = [NSMutableArray arrayWithCapacity:[edgeStyles count]]; for (EdgeStyle *style in edgeStyles) { - [es addObject:[[style copyWithZone:zone] autorelease]]; +#if __has_feature(objc_arc) + [es addObject:[style copyWithZone:zone]]; +#else + [es addObject:[[style copyWithZone:zone] autorelease]]; +#endif } [m _setNodeStyles:ns]; [m _setEdgeStyles:es]; diff --git a/tikzit/src/common/TikzGraphAssembler.m b/tikzit/src/common/TikzGraphAssembler.m index 380b71c..c5d2811 100644 --- a/tikzit/src/common/TikzGraphAssembler.m +++ b/tikzit/src/common/TikzGraphAssembler.m @@ -31,14 +31,20 @@ @implementation TikzGraphAssembler - (id)init { +#if ! __has_feature(objc_arc) [self release]; +#endif return nil; } - (id)initWithGraph:(Graph*)g { self = [super init]; if (self) { +#if __has_feature(objc_arc) + graph = g; +#else graph = [g retain]; +#endif nodeMap = [[NSMutableDictionary alloc] init]; yylex_init (&scanner); yyset_extra(self, scanner); @@ -47,29 +53,39 @@ } - (void)dealloc { +#if ! __has_feature(objc_arc) [graph release]; [nodeMap release]; [lastError release]; yylex_destroy (scanner); [super dealloc]; +#endif } - (BOOL) parseTikz:(NSString*)t error:(NSError**)error { +#if ! __has_feature(objc_arc) NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; +#endif tikzStr = [t UTF8String]; yy_scan_string(tikzStr, scanner); int result = yyparse(scanner); tikzStr = NULL; +#if ! __has_feature(objc_arc) [pool drain]; +#endif if (result == 0) { return YES; } else { if (error) { if (lastError) { +#if __has_feature(objc_arc) + *error = lastError; +#else *error = [[lastError retain] autorelease]; +#endif } else if (result == 1) { *error = [NSError errorWithMessage:@"Syntax error" code:TZ_ERR_PARSE]; @@ -91,10 +107,16 @@ + (Graph*) parseTikz:(NSString*)tikz error:(NSError**)e { Graph *gr = [[Graph alloc] init]; if ([self parseTikz:tikz forGraph:gr error:e]) { +#if __has_feature(objc_arc) + return gr; +#else return [gr autorelease]; +#endif } else { +#if ! __has_feature(objc_arc) [gr release]; - return nil; +#endif + return nil; } } + (Graph*) parseTikz:(NSString*)tikz { @@ -109,8 +131,10 @@ TikzGraphAssembler *assembler = [[self alloc] initWithGraph:gr]; BOOL success = [assembler parseTikz:tikz error:error]; +#if ! __has_feature(objc_arc) [assembler release]; - return success; +#endif + return success; } + (BOOL)validateTikzPropertyNameOrValue:(NSString*)tikz { @@ -171,8 +195,10 @@ } - (void) setLastError:(NSError*)error { +#if ! __has_feature(objc_arc) [error retain]; [lastError release]; +#endif lastError = error; } diff --git a/tikzit/src/common/TikzShape.m b/tikzit/src/common/TikzShape.m index c07c61e..555a7df 100644 --- a/tikzit/src/common/TikzShape.m +++ b/tikzit/src/common/TikzShape.m @@ -55,7 +55,11 @@ -NSMidY(bds)); [t setOrigin:shift]; [graph applyTransformer:t]; +#if __has_feature(objc_arc) + paths = [graph pathCover]; +#else paths = [[graph pathCover] retain]; +#endif } return self; } diff --git a/tikzit/src/common/Transformer.m b/tikzit/src/common/Transformer.m index 403ae87..2b56813 100644 --- a/tikzit/src/common/Transformer.m +++ b/tikzit/src/common/Transformer.m @@ -28,11 +28,19 @@ float const PIXELS_PER_UNIT = 50; @implementation Transformer + (Transformer*)transformer { - return [[[Transformer alloc] init] autorelease]; +#if __has_feature(objc_arc) + return [[Transformer alloc] init]; +#else + return [[[Transformer alloc] init] autorelease]; +#endif } + (Transformer*)transformerWithTransformer:(Transformer*)t { - return [[t copy] autorelease]; +#if __has_feature(objc_arc) + return [t copy]; +#else + return [[t copy] autorelease]; +#endif } + (Transformer*)transformerWithOrigin:(NSPoint)o andScale:(float)scale { diff --git a/tikzit/src/common/tikzparserdefs.h b/tikzit/src/common/tikzparserdefs.h index 587bcd6..cde3345 100644 --- a/tikzit/src/common/tikzparserdefs.h +++ b/tikzit/src/common/tikzparserdefs.h @@ -37,8 +37,13 @@ @class Node; struct noderef { - Node *node; - NSString *anchor; +#if __has_feature(objc_arc) + __unsafe_unretained Node *node; + __unsafe_unretained NSString *anchor; +#else + Node *node; + NSString *anchor; +#endif }; // vi:ft=objc:noet:ts=4:sts=4:sw=4 -- cgit v1.2.3 From e29f8204df052ddd634e04053ac9144cee64df08 Mon Sep 17 00:00:00 2001 From: Johan Paulsson Date: Thu, 12 Mar 2015 12:55:07 -0700 Subject: Reverted flex/bison files together with TikzGraphAssembler to be compiled with no ARC --- tikzit/TikZiT.xcodeproj/project.pbxproj | 12 ++++++------ tikzit/src/common/tikzlexer.lm | 1 + tikzit/src/common/tikzparser.ym | 14 +++++++++----- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/tikzit/TikZiT.xcodeproj/project.pbxproj b/tikzit/TikZiT.xcodeproj/project.pbxproj index feba845..04a7f3f 100644 --- a/tikzit/TikZiT.xcodeproj/project.pbxproj +++ b/tikzit/TikZiT.xcodeproj/project.pbxproj @@ -59,7 +59,7 @@ 5573B98811DA377C00B5DC5D /* text-x-script.png in Resources */ = {isa = PBXBuildFile; fileRef = 5573B98711DA377C00B5DC5D /* text-x-script.png */; }; 5573BDCB11DB4D2600B5DC5D /* Preambles+Coder.m in Sources */ = {isa = PBXBuildFile; fileRef = 5573BDCA11DB4D2600B5DC5D /* Preambles+Coder.m */; }; 5585E5C2117F681800124513 /* NodeStyle+Coder.m in Sources */ = {isa = PBXBuildFile; fileRef = 5585E5C1117F681800124513 /* NodeStyle+Coder.m */; }; - 5589A9FF11C51E780064D310 /* TikzGraphAssembler.m in Sources */ = {isa = PBXBuildFile; fileRef = 5589A9FE11C51E780064D310 /* TikzGraphAssembler.m */; }; + 5589A9FF11C51E780064D310 /* TikzGraphAssembler.m in Sources */ = {isa = PBXBuildFile; fileRef = 5589A9FE11C51E780064D310 /* TikzGraphAssembler.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 5589AA6C11C542D30064D310 /* TikzGraphAssembler.m in Sources */ = {isa = PBXBuildFile; fileRef = 5589A9FE11C51E780064D310 /* TikzGraphAssembler.m */; }; 5589AA6D11C542D30064D310 /* tikzlexer.lm in Sources */ = {isa = PBXBuildFile; fileRef = 5589A9AA11C500060064D310 /* tikzlexer.lm */; }; 5589AA6E11C542D30064D310 /* tikzparser.ym in Sources */ = {isa = PBXBuildFile; fileRef = 5589A9AB11C500060064D310 /* tikzparser.ym */; }; @@ -131,8 +131,8 @@ 7F6E2C8C16B00ABA00BFE20D /* SFBInspectors.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 55CA98D412EF8FCE008F0368 /* SFBInspectors.framework */; }; 7F73438A184AC559002897D0 /* DraggablePDFView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F734389184AC559002897D0 /* DraggablePDFView.m */; }; 7F781C1A16B5DE1400239826 /* ParseErrorView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F781C1916B5DE1400239826 /* ParseErrorView.m */; }; - 7F7B6DED18DE0C9E004F6CA8 /* tikzlexer.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F7B6DEA18DE0C9E004F6CA8 /* tikzlexer.m */; }; - 7F7B6DEE18DE0C9E004F6CA8 /* tikzparser.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F7B6DEC18DE0C9E004F6CA8 /* tikzparser.m */; }; + 7F7B6DED18DE0C9E004F6CA8 /* tikzlexer.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F7B6DEA18DE0C9E004F6CA8 /* tikzlexer.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 7F7B6DEE18DE0C9E004F6CA8 /* tikzparser.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F7B6DEC18DE0C9E004F6CA8 /* tikzparser.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 7F7B6DF418DE0D7A004F6CA8 /* CustomNodeCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F7B6DF118DE0D7A004F6CA8 /* CustomNodeCellView.m */; }; 7F7B6DF518DE0D7A004F6CA8 /* CustomNodeController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F7B6DF318DE0D7A004F6CA8 /* CustomNodeController.m */; }; 7F90E88616DD29600069EBCD /* NSString+Tikz.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F90E88516DD29600069EBCD /* NSString+Tikz.m */; }; @@ -645,9 +645,9 @@ 55D2E0B11186ED950060B4EC /* Graph+Coder.m */, 558F18BD117B031C009863B2 /* GraphChange.h */, 558F18BE117B031C009863B2 /* GraphChange.m */, - 558F18BF117B031C009863B2 /* GraphElementData.h */, 7FEED45516B1A7C400B056CB /* StyleManager.h */, 7FEED45616B1A7C500B056CB /* StyleManager.m */, + 558F18BF117B031C009863B2 /* GraphElementData.h */, 558F18C0117B031C009863B2 /* GraphElementData.m */, 558F18C1117B031C009863B2 /* Node.h */, 558F18C2117B031C009863B2 /* Node.m */, @@ -987,13 +987,14 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 7F7B6DEE18DE0C9E004F6CA8 /* tikzparser.m in Sources */, + 7F7B6DED18DE0C9E004F6CA8 /* tikzlexer.m in Sources */, 558F18C5117B031C009863B2 /* Edge.m in Sources */, 558F18C6117B031C009863B2 /* Graph.m in Sources */, 558F18C7117B031C009863B2 /* GraphChange.m in Sources */, 7F7B6DF418DE0D7A004F6CA8 /* CustomNodeCellView.m in Sources */, 558F18C8117B031C009863B2 /* GraphElementData.m in Sources */, 558F18C9117B031C009863B2 /* Node.m in Sources */, - 7F7B6DEE18DE0C9E004F6CA8 /* tikzparser.m in Sources */, 558F18CA117B031C009863B2 /* NodeStyle.m in Sources */, 558F18CE117B03DD009863B2 /* main.m in Sources */, 558F18CF117B03DD009863B2 /* util.m in Sources */, @@ -1013,7 +1014,6 @@ 5585E5C2117F681800124513 /* NodeStyle+Coder.m in Sources */, 55F9585C1181B09600F99434 /* PickSupport.m in Sources */, 55F9585D1181B09600F99434 /* Transformer.m in Sources */, - 7F7B6DED18DE0C9E004F6CA8 /* tikzlexer.m in Sources */, 55D2E0B21186ED950060B4EC /* Graph+Coder.m in Sources */, 5589A9FF11C51E780064D310 /* TikzGraphAssembler.m in Sources */, 7F7B6DF518DE0D7A004F6CA8 /* CustomNodeController.m in Sources */, diff --git a/tikzit/src/common/tikzlexer.lm b/tikzit/src/common/tikzlexer.lm index 96690d2..1e92f73 100644 --- a/tikzit/src/common/tikzlexer.lm +++ b/tikzit/src/common/tikzlexer.lm @@ -37,6 +37,7 @@ %option header-file="common/tikzlexer.h" %option extra-type="TikzGraphAssembler *" + %s props %s xcoord %s ycoord diff --git a/tikzit/src/common/tikzparser.ym b/tikzit/src/common/tikzparser.ym index a6dc1ee..344e969 100644 --- a/tikzit/src/common/tikzparser.ym +++ b/tikzit/src/common/tikzparser.ym @@ -41,11 +41,11 @@ /* possible data types for semantic values */ %union { - NSPoint pt; - NSString *nsstr; - GraphElementProperty *prop; - GraphElementData *data; - Node *node; + NSString *nsstr; + GraphElementProperty *prop; + GraphElementData *data; + Node *node; + NSPoint pt; struct noderef noderef; } @@ -166,7 +166,9 @@ node: "\\node" optproperties nodename "at" COORD DELIMITEDSTRING ";" [node setLabel:$6]; [assembler addNodeToMap:node]; [[assembler graph] addNode:node]; +#if ! __has_feature(objc_arc) [node release]; +#endif }; optanchor: { $$ = nil; } | "." REFSTRING { $$ = $2; }; @@ -204,7 +206,9 @@ edge: "\\draw" optproperties noderef "to" optedgenode optnoderef ";" } [edge setAttributesFromData]; [[assembler graph] addEdge:edge]; +#if ! __has_feature(objc_arc) [edge release]; +#endif }; ignoreprop: val | val "=" val; -- cgit v1.2.3 From 49c0d2041f0aae6d08d325b7f7fc1cd707d942f8 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Wed, 25 Mar 2015 09:57:29 +0000 Subject: update anchors on edge reverse --- tikzit/src/common/Edge.m | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tikzit/src/common/Edge.m b/tikzit/src/common/Edge.m index ee0f03d..0c88e9d 100644 --- a/tikzit/src/common/Edge.m +++ b/tikzit/src/common/Edge.m @@ -692,6 +692,7 @@ - (void)reverse { Node *n; float f; + NSString *a; n = source; source = target; @@ -701,6 +702,10 @@ inAngle = outAngle; outAngle = f; + a = sourceAnchor; + sourceAnchor = targetAnchor; + targetAnchor = a; + [self setBend:-bend]; dirty = YES; -- cgit v1.2.3 From bbd141d37c444ff40fbd04c25747480020fcc07f Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Wed, 22 Jul 2015 22:14:08 +0100 Subject: Fix bison invocation --- tikzit/src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tikzit/src/Makefile.am b/tikzit/src/Makefile.am index ffd05bf..5108e9c 100644 --- a/tikzit/src/Makefile.am +++ b/tikzit/src/Makefile.am @@ -130,7 +130,7 @@ common/tikzlexer.m common/tikzlexer.h: common/tikzlexer.lm common/tikzlexer.h: common/tikzlexer.m common/tikzparser.m common/tikzparser.h: common/tikzparser.ym - $(AM_V_GEN)$(YACC) --defines=common/tikzparser.h --output-file=common/tikzparser.m $^ + $(AM_V_GEN)$(YACC) --defines=common/tikzparser.h --output=common/tikzparser.m $^ # ordering hack for parallel builds common/tikzparser.h: common/tikzparser.m -- cgit v1.2.3 From 9e4f8a6ff37161da4fa0af14604ad22d9c212fde Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Wed, 22 Jul 2015 22:22:00 +0100 Subject: v1.1 --- tikzit/NEWS | 2 +- tikzit/configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tikzit/NEWS b/tikzit/NEWS index 6840c1f..827abe7 100644 --- a/tikzit/NEWS +++ b/tikzit/NEWS @@ -1,4 +1,4 @@ -tikzit 1.1 (?) : +tikzit 1.1 (2015-07-22) : * Fix bug where copy-and-paste would lose edge anchors * Allow tikzit-specific preview code to be omitted from preambles * Holding down CTRL allows you to drag the graph diff --git a/tikzit/configure.ac b/tikzit/configure.ac index 296daa5..a86156b 100644 --- a/tikzit/configure.ac +++ b/tikzit/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.60]) -AC_INIT([TikZiT], [1.0], +AC_INIT([TikZiT], [1.1], [http://sourceforge.net/apps/trac/tikzit], [tikzit], [http://tikzit.sourceforge.net]) -- cgit v1.2.3 From 1802977b95d29198f27535b1b731d1180c083667 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Wed, 11 Jan 2017 16:33:00 +0100 Subject: made new subdir --- tikzit-1/.gitignore | 235 + tikzit-1/AH_latex_head.png | Bin 0 -> 6334 bytes tikzit-1/AH_latex_tail.png | Bin 0 -> 6324 bytes tikzit-1/AH_none.png | Bin 0 -> 6183 bytes tikzit-1/AH_plain_head.png | Bin 0 -> 6298 bytes tikzit-1/AH_plain_tail.png | Bin 0 -> 6320 bytes tikzit-1/COPYING | 340 + tikzit-1/DESIGN-GTK | 23 + tikzit-1/ED_arrow.png | Bin 0 -> 6357 bytes tikzit-1/ED_none.png | Bin 0 -> 6190 bytes tikzit-1/ED_tick.png | Bin 0 -> 6258 bytes tikzit-1/English.lproj/Credits.rtf | 18 + tikzit-1/English.lproj/CustomNodes.xib | 256 + tikzit-1/English.lproj/InfoPlist.strings | 2 + tikzit-1/English.lproj/MainMenu.xib | 453 + tikzit-1/English.lproj/Preamble.xib | 235 + tikzit-1/English.lproj/Preview.xib | 70 + tikzit-1/English.lproj/PropertyInspector.xib | 769 + tikzit-1/English.lproj/StylePalette.xib | 631 + tikzit-1/English.lproj/TikzDocument.xib | 161 + tikzit-1/English.lproj/UserDefaults.plist | 10 + .../Frameworks/SFBInspectors.framework/Headers | 1 + .../Frameworks/SFBInspectors.framework/Resources | 1 + .../SFBInspectors.framework/SFBInspectors | 1 + .../Versions/A/Headers/SFBInspectorPane.h | 31 + .../Versions/A/Headers/SFBInspectorPaneBody.h | 16 + .../Versions/A/Headers/SFBInspectorPaneHeader.h | 24 + .../Versions/A/Headers/SFBInspectorView.h | 17 + .../Versions/A/Headers/SFBViewSelector.h | 22 + .../Versions/A/Headers/SFBViewSelectorBar.h | 29 + .../Versions/A/Headers/SFBViewSelectorBarItem.h | 28 + .../A/Resources/English.lproj/InfoPlist.strings | Bin 0 -> 92 bytes .../Versions/A/Resources/Info.plist | 24 + .../Versions/A/SFBInspectors | Bin 0 -> 280648 bytes .../SFBInspectors.framework/Versions/Current | 1 + tikzit-1/Frameworks/Sparkle.framework/Headers | 1 + tikzit-1/Frameworks/Sparkle.framework/Resources | 1 + tikzit-1/Frameworks/Sparkle.framework/Sparkle | 1 + .../Versions/A/Headers/SUAppcast.h | 33 + .../Versions/A/Headers/SUAppcastItem.h | 47 + .../Versions/A/Headers/SUUpdater.h | 118 + .../A/Headers/SUVersionComparisonProtocol.h | 27 + .../Sparkle.framework/Versions/A/Headers/Sparkle.h | 21 + .../Versions/A/Resources/Info.plist | 24 + .../Versions/A/Resources/License.txt | 7 + .../Versions/A/Resources/SUModelTranslation.plist | 174 + .../Versions/A/Resources/SUStatus.nib/classes.nib | 56 + .../Versions/A/Resources/SUStatus.nib/info.nib | 20 + .../A/Resources/SUStatus.nib/keyedobjects.nib | Bin 0 -> 7344 bytes .../SUAutomaticUpdateAlert.nib/classes.nib | 50 + .../de.lproj/SUAutomaticUpdateAlert.nib/info.nib | 20 + .../SUAutomaticUpdateAlert.nib/keyedobjects.nib | Bin 0 -> 7278 bytes .../de.lproj/SUUpdateAlert.nib/classes.nib | 67 + .../Resources/de.lproj/SUUpdateAlert.nib/info.nib | 20 + .../de.lproj/SUUpdateAlert.nib/keyedobjects.nib | Bin 0 -> 10493 bytes .../SUUpdatePermissionPrompt.nib/classes.nib | 59 + .../de.lproj/SUUpdatePermissionPrompt.nib/info.nib | 20 + .../SUUpdatePermissionPrompt.nib/keyedobjects.nib | Bin 0 -> 13189 bytes .../Versions/A/Resources/de.lproj/Sparkle.strings | Bin 0 -> 9806 bytes .../SUAutomaticUpdateAlert.nib/classes.nib | 50 + .../en.lproj/SUAutomaticUpdateAlert.nib/info.nib | 20 + .../SUAutomaticUpdateAlert.nib/keyedobjects.nib | Bin 0 -> 7148 bytes .../en.lproj/SUUpdateAlert.nib/classes.nib | 67 + .../Resources/en.lproj/SUUpdateAlert.nib/info.nib | 20 + .../en.lproj/SUUpdateAlert.nib/keyedobjects.nib | Bin 0 -> 10623 bytes .../SUUpdatePermissionPrompt.nib/classes.nib | 59 + .../en.lproj/SUUpdatePermissionPrompt.nib/info.nib | 21 + .../SUUpdatePermissionPrompt.nib/keyedobjects.nib | Bin 0 -> 13263 bytes .../Versions/A/Resources/en.lproj/Sparkle.strings | Bin 0 -> 8216 bytes .../SUAutomaticUpdateAlert.nib/classes.nib | 50 + .../es.lproj/SUAutomaticUpdateAlert.nib/info.nib | 20 + .../SUAutomaticUpdateAlert.nib/keyedobjects.nib | Bin 0 -> 7273 bytes .../es.lproj/SUUpdateAlert.nib/classes.nib | 67 + .../Resources/es.lproj/SUUpdateAlert.nib/info.nib | 20 + .../es.lproj/SUUpdateAlert.nib/keyedobjects.nib | Bin 0 -> 10668 bytes .../SUUpdatePermissionPrompt.nib/classes.nib | 59 + .../es.lproj/SUUpdatePermissionPrompt.nib/info.nib | 20 + .../SUUpdatePermissionPrompt.nib/keyedobjects.nib | Bin 0 -> 13404 bytes .../Versions/A/Resources/es.lproj/Sparkle.strings | Bin 0 -> 8020 bytes .../SUAutomaticUpdateAlert.nib/classes.nib | 50 + .../fr.lproj/SUAutomaticUpdateAlert.nib/info.nib | 16 + .../SUAutomaticUpdateAlert.nib/keyedobjects.nib | Bin 0 -> 7245 bytes .../fr.lproj/SUUpdateAlert.nib/classes.nib | 67 + .../Resources/fr.lproj/SUUpdateAlert.nib/info.nib | 16 + .../fr.lproj/SUUpdateAlert.nib/keyedobjects.nib | Bin 0 -> 10338 bytes .../SUUpdatePermissionPrompt.nib/classes.nib | 59 + .../fr.lproj/SUUpdatePermissionPrompt.nib/info.nib | 16 + .../SUUpdatePermissionPrompt.nib/keyedobjects.nib | Bin 0 -> 13156 bytes .../Versions/A/Resources/fr.lproj/Sparkle.strings | Bin 0 -> 8554 bytes .../Versions/A/Resources/fr_CA.lproj | 1 + .../SUAutomaticUpdateAlert.nib/classes.nib | 50 + .../it.lproj/SUAutomaticUpdateAlert.nib/info.nib | 20 + .../SUAutomaticUpdateAlert.nib/keyedobjects.nib | Bin 0 -> 7161 bytes .../it.lproj/SUUpdateAlert.nib/classes.nib | 67 + .../Resources/it.lproj/SUUpdateAlert.nib/info.nib | 20 + .../it.lproj/SUUpdateAlert.nib/keyedobjects.nib | Bin 0 -> 10360 bytes .../SUUpdatePermissionPrompt.nib/classes.nib | 59 + .../it.lproj/SUUpdatePermissionPrompt.nib/info.nib | 20 + .../SUUpdatePermissionPrompt.nib/keyedobjects.nib | Bin 0 -> 12659 bytes .../Versions/A/Resources/it.lproj/Sparkle.strings | Bin 0 -> 8914 bytes .../SUAutomaticUpdateAlert.nib/classes.nib | 50 + .../nl.lproj/SUAutomaticUpdateAlert.nib/info.nib | 18 + .../SUAutomaticUpdateAlert.nib/keyedobjects.nib | Bin 0 -> 7234 bytes .../nl.lproj/SUUpdateAlert.nib/classes.nib | 67 + .../Resources/nl.lproj/SUUpdateAlert.nib/info.nib | 16 + .../nl.lproj/SUUpdateAlert.nib/keyedobjects.nib | Bin 0 -> 10220 bytes .../SUUpdatePermissionPrompt.nib/classes.nib | 59 + .../nl.lproj/SUUpdatePermissionPrompt.nib/info.nib | 16 + .../SUUpdatePermissionPrompt.nib/keyedobjects.nib | Bin 0 -> 12535 bytes .../Versions/A/Resources/nl.lproj/Sparkle.strings | Bin 0 -> 8514 bytes .../Versions/A/Resources/relaunch | Bin 0 -> 58924 bytes .../SUAutomaticUpdateAlert.nib/classes.nib | 50 + .../ru.lproj/SUAutomaticUpdateAlert.nib/info.nib | 20 + .../SUAutomaticUpdateAlert.nib/keyedobjects.nib | Bin 0 -> 7675 bytes .../ru.lproj/SUUpdateAlert.nib/classes.nib | 67 + .../Resources/ru.lproj/SUUpdateAlert.nib/info.nib | 20 + .../ru.lproj/SUUpdateAlert.nib/keyedobjects.nib | Bin 0 -> 10895 bytes .../SUUpdatePermissionPrompt.nib/classes.nib | 59 + .../ru.lproj/SUUpdatePermissionPrompt.nib/info.nib | 18 + .../SUUpdatePermissionPrompt.nib/keyedobjects.nib | Bin 0 -> 12898 bytes .../Versions/A/Resources/ru.lproj/Sparkle.strings | Bin 0 -> 8364 bytes .../SUAutomaticUpdateAlert.nib/classes.nib | 50 + .../sv.lproj/SUAutomaticUpdateAlert.nib/info.nib | 20 + .../SUAutomaticUpdateAlert.nib/keyedobjects.nib | Bin 0 -> 7474 bytes .../sv.lproj/SUUpdateAlert.nib/classes.nib | 39 + .../Resources/sv.lproj/SUUpdateAlert.nib/info.nib | 18 + .../sv.lproj/SUUpdateAlert.nib/keyedobjects.nib | Bin 0 -> 10180 bytes .../SUUpdatePermissionPrompt.nib/classes.nib | 59 + .../sv.lproj/SUUpdatePermissionPrompt.nib/info.nib | 20 + .../SUUpdatePermissionPrompt.nib/keyedobjects.nib | Bin 0 -> 13483 bytes .../Versions/A/Resources/sv.lproj/Sparkle.strings | Bin 0 -> 8142 bytes .../Sparkle.framework/Versions/A/Sparkle | Bin 0 -> 463812 bytes .../Frameworks/Sparkle.framework/Versions/Current | 1 + tikzit-1/INSTALL | 34 + tikzit-1/Makefile.am | 3 + tikzit-1/NEWS | 75 + tikzit-1/README | 7 + tikzit-1/README.release | 98 + tikzit-1/TODO | 15 + tikzit-1/TikZiT-Info.plist | 61 + tikzit-1/TikZiT.xcodeproj/project.pbxproj | 1322 + .../project.xcworkspace/contents.xcworkspacedata | 7 + .../xcshareddata/TikZiT.xccheckout | 37 + .../UserInterfaceState.xcuserstate | 24539 +++++++++++++++++++ .../aleks.xcuserdatad/WorkspaceSettings.xcsettings | 22 + .../xcdebugger/Breakpoints.xcbkptlist | 123 + .../aleks.xcuserdatad/xcschemes/TikZiT.xcscheme | 72 + .../aleks.xcuserdatad/xcschemes/tests.xcscheme | 72 + .../xcschemes/xcschememanagement.plist | 32 + tikzit-1/TikZiT_Prefix.pch | 30 + tikzit-1/autogen.sh | 1578 ++ tikzit-1/build/DEBIAN/control | 11 + tikzit-1/configure.ac | 141 + tikzit-1/customshape.png | Bin 0 -> 1281 bytes tikzit-1/docs/Doxyfile | 1600 ++ tikzit-1/draw-ellipse.png | Bin 0 -> 3493 bytes tikzit-1/draw-path.png | Bin 0 -> 920 bytes tikzit-1/emblem-important.png | Bin 0 -> 717 bytes tikzit-1/emblem-unreadable-grey.png | Bin 0 -> 3554 bytes tikzit-1/engine.png | Bin 0 -> 1546 bytes tikzit-1/format-indent-less.png | Bin 0 -> 767 bytes tikzit-1/m4/objc.m4 | 135 + tikzit-1/preamble.png | Bin 0 -> 851 bytes tikzit-1/scripts/generate_keys.rb | 13 + tikzit-1/scripts/prepare_release.sh | 40 + tikzit-1/scripts/sign_update.rb | 7 + tikzit-1/select-rectangular.png | Bin 0 -> 499 bytes tikzit-1/shapes/cap.tikz | 13 + tikzit-1/shapes/copants.tikz | 19 + tikzit-1/shapes/cup.tikz | 13 + tikzit-1/shapes/oval.tikz | 11 + tikzit-1/shapes/pants.tikz | 19 + tikzit-1/share/Makefile.am | 10 + tikzit-1/share/applications/tikzit.desktop | 11 + .../share/icons/hicolor/128x128/apps/tikzit.png | Bin 0 -> 9098 bytes .../hicolor/128x128/mimetypes/text-x-tikz.png | Bin 0 -> 7316 bytes tikzit-1/share/icons/hicolor/16x16/apps/tikzit.png | Bin 0 -> 882 bytes .../icons/hicolor/16x16/mimetypes/text-x-tikz.png | Bin 0 -> 564 bytes tikzit-1/share/icons/hicolor/22x22/apps/tikzit.png | Bin 0 -> 1273 bytes .../icons/hicolor/22x22/mimetypes/text-x-tikz.png | Bin 0 -> 866 bytes tikzit-1/share/icons/hicolor/24x24/apps/tikzit.png | Bin 0 -> 1406 bytes tikzit-1/share/icons/hicolor/32x32/apps/tikzit.png | Bin 0 -> 1987 bytes .../icons/hicolor/32x32/mimetypes/text-x-tikz.png | Bin 0 -> 1352 bytes tikzit-1/share/icons/hicolor/48x48/apps/tikzit.png | Bin 0 -> 3132 bytes .../icons/hicolor/48x48/mimetypes/text-x-tikz.png | Bin 0 -> 2445 bytes tikzit-1/share/icons/hicolor/64x64/apps/tikzit.png | Bin 0 -> 4315 bytes .../icons/hicolor/64x64/mimetypes/text-x-tikz.png | Bin 0 -> 3532 bytes .../share/icons/hicolor/scalable/apps/tikzit.svg | 79 + .../hicolor/scalable/mimetypes/text-x-tikz.svg | 488 + tikzit-1/share/mime/packages/tikzit.xml | 10 + tikzit-1/share/tikzit | 1 + tikzit-1/src/Makefile.am | 178 + tikzit-1/src/common/CircleShape.h | 33 + tikzit-1/src/common/CircleShape.m | 57 + tikzit-1/src/common/ColorRGB.h | 64 + tikzit-1/src/common/ColorRGB.m | 353 + tikzit-1/src/common/DiamondShape.h | 34 + tikzit-1/src/common/DiamondShape.m | 63 + tikzit-1/src/common/Edge.h | 401 + tikzit-1/src/common/Edge.m | 757 + tikzit-1/src/common/EdgeStyle.h | 71 + tikzit-1/src/common/EdgeStyle.m | 222 + tikzit-1/src/common/Graph.h | 401 + tikzit-1/src/common/Graph.m | 922 + tikzit-1/src/common/GraphChange.h | 344 + tikzit-1/src/common/GraphChange.m | 369 + tikzit-1/src/common/GraphElementData.h | 94 + tikzit-1/src/common/GraphElementData.m | 188 + tikzit-1/src/common/GraphElementProperty.h | 88 + tikzit-1/src/common/GraphElementProperty.m | 164 + tikzit-1/src/common/Grid.h | 110 + tikzit-1/src/common/Grid.m | 186 + tikzit-1/src/common/NSError+Tikzit.h | 44 + tikzit-1/src/common/NSError+Tikzit.m | 64 + tikzit-1/src/common/NSFileManager+Utils.h | 29 + tikzit-1/src/common/NSFileManager+Utils.m | 46 + tikzit-1/src/common/NSString+LatexConstants.h | 33 + tikzit-1/src/common/NSString+LatexConstants.m | 212 + tikzit-1/src/common/NSString+Tikz.h | 26 + tikzit-1/src/common/NSString+Tikz.m | 72 + tikzit-1/src/common/NSString+Util.h | 27 + tikzit-1/src/common/NSString+Util.m | 66 + tikzit-1/src/common/Node.h | 181 + tikzit-1/src/common/Node.m | 214 + tikzit-1/src/common/NodeStyle.h | 125 + tikzit-1/src/common/NodeStyle.m | 246 + tikzit-1/src/common/PickSupport.h | 164 + tikzit-1/src/common/PickSupport.m | 232 + tikzit-1/src/common/Preambles.h | 73 + tikzit-1/src/common/Preambles.m | 320 + tikzit-1/src/common/PropertyHolder.h | 36 + tikzit-1/src/common/PropertyHolder.m | 74 + tikzit-1/src/common/RColor.h | 50 + tikzit-1/src/common/RColor.m | 33 + tikzit-1/src/common/RectangleShape.h | 33 + tikzit-1/src/common/RectangleShape.m | 57 + tikzit-1/src/common/RegularPolyShape.h | 50 + tikzit-1/src/common/RegularPolyShape.m | 76 + tikzit-1/src/common/RenderContext.h | 156 + tikzit-1/src/common/Shape.h | 49 + tikzit-1/src/common/Shape.m | 171 + tikzit-1/src/common/ShapeNames.h | 27 + tikzit-1/src/common/StyleManager.h | 49 + tikzit-1/src/common/StyleManager.m | 378 + tikzit-1/src/common/SupportDir.h | 36 + tikzit-1/src/common/SupportDir.m | 65 + tikzit-1/src/common/TikzGraphAssembler+Parser.h | 36 + tikzit-1/src/common/TikzGraphAssembler.h | 115 + tikzit-1/src/common/TikzGraphAssembler.m | 310 + tikzit-1/src/common/TikzShape.h | 37 + tikzit-1/src/common/TikzShape.m | 70 + tikzit-1/src/common/Transformer.h | 154 + tikzit-1/src/common/Transformer.m | 231 + tikzit-1/src/common/test/Makefile | 14 + tikzit-1/src/common/test/color.m | 80 + tikzit-1/src/common/test/common.m | 34 + tikzit-1/src/common/test/maths.m | 562 + tikzit-1/src/common/test/parser.m | 86 + tikzit-1/src/common/test/test.h | 57 + tikzit-1/src/common/test/test.m | 175 + tikzit-1/src/common/tikzlexer.lm | 170 + tikzit-1/src/common/tikzparser.ym | 224 + tikzit-1/src/common/tikzparserdefs.h | 49 + tikzit-1/src/common/util.h | 201 + tikzit-1/src/common/util.m | 403 + tikzit-1/src/gtk/Application.h | 155 + tikzit-1/src/gtk/Application.m | 377 + tikzit-1/src/gtk/BoundingBoxTool.h | 45 + tikzit-1/src/gtk/BoundingBoxTool.m | 353 + tikzit-1/src/gtk/CairoRenderContext.h | 59 + tikzit-1/src/gtk/CairoRenderContext.m | 344 + tikzit-1/src/gtk/ColorRGB+Gtk.h | 30 + tikzit-1/src/gtk/ColorRGB+Gtk.m | 46 + tikzit-1/src/gtk/ColorRGB+IntegerListStorage.h | 32 + tikzit-1/src/gtk/ColorRGB+IntegerListStorage.m | 57 + tikzit-1/src/gtk/Configuration.h | 447 + tikzit-1/src/gtk/Configuration.m | 450 + tikzit-1/src/gtk/ContextWindow.h | 53 + tikzit-1/src/gtk/ContextWindow.m | 169 + tikzit-1/src/gtk/CreateEdgeTool.h | 45 + tikzit-1/src/gtk/CreateEdgeTool.m | 226 + tikzit-1/src/gtk/CreateNodeTool.h | 42 + tikzit-1/src/gtk/CreateNodeTool.m | 169 + tikzit-1/src/gtk/DocumentContext.h | 27 + tikzit-1/src/gtk/Edge+Render.h | 34 + tikzit-1/src/gtk/Edge+Render.m | 267 + tikzit-1/src/gtk/EdgeStyle+Gtk.h | 29 + tikzit-1/src/gtk/EdgeStyle+Gtk.m | 33 + tikzit-1/src/gtk/EdgeStyle+Storage.h | 29 + tikzit-1/src/gtk/EdgeStyle+Storage.m | 55 + tikzit-1/src/gtk/EdgeStyleEditor.h | 45 + tikzit-1/src/gtk/EdgeStyleEditor.m | 499 + tikzit-1/src/gtk/EdgeStyleSelector.h | 61 + tikzit-1/src/gtk/EdgeStyleSelector.m | 143 + tikzit-1/src/gtk/EdgeStylesModel.h | 62 + tikzit-1/src/gtk/EdgeStylesModel.m | 367 + tikzit-1/src/gtk/EdgeStylesPalette.h | 43 + tikzit-1/src/gtk/EdgeStylesPalette.m | 198 + tikzit-1/src/gtk/FileChooserDialog.h | 56 + tikzit-1/src/gtk/FileChooserDialog.m | 152 + tikzit-1/src/gtk/GraphEditorPanel.h | 53 + tikzit-1/src/gtk/GraphEditorPanel.m | 240 + tikzit-1/src/gtk/GraphRenderer.h | 84 + tikzit-1/src/gtk/GraphRenderer.m | 476 + tikzit-1/src/gtk/HandTool.h | 33 + tikzit-1/src/gtk/HandTool.m | 75 + tikzit-1/src/gtk/InputDelegate.h | 77 + tikzit-1/src/gtk/Menu.h | 86 + tikzit-1/src/gtk/Menu.m | 737 + tikzit-1/src/gtk/NSError+Glib.h | 28 + tikzit-1/src/gtk/NSError+Glib.m | 50 + tikzit-1/src/gtk/NSFileManager+Glib.h | 31 + tikzit-1/src/gtk/NSFileManager+Glib.m | 55 + tikzit-1/src/gtk/NSString+Glib.h | 50 + tikzit-1/src/gtk/NSString+Glib.m | 96 + tikzit-1/src/gtk/Node+Render.h | 44 + tikzit-1/src/gtk/Node+Render.m | 188 + tikzit-1/src/gtk/NodeStyle+Gtk.h | 31 + tikzit-1/src/gtk/NodeStyle+Gtk.m | 41 + tikzit-1/src/gtk/NodeStyle+Render.h | 30 + tikzit-1/src/gtk/NodeStyle+Storage.h | 29 + tikzit-1/src/gtk/NodeStyle+Storage.m | 62 + tikzit-1/src/gtk/NodeStyleEditor.h | 45 + tikzit-1/src/gtk/NodeStyleEditor.m | 477 + tikzit-1/src/gtk/NodeStyleSelector.h | 61 + tikzit-1/src/gtk/NodeStyleSelector.m | 135 + tikzit-1/src/gtk/NodeStylesModel.h | 62 + tikzit-1/src/gtk/NodeStylesModel.m | 381 + tikzit-1/src/gtk/NodeStylesPalette.h | 43 + tikzit-1/src/gtk/NodeStylesPalette.m | 197 + tikzit-1/src/gtk/PreambleEditor.h | 51 + tikzit-1/src/gtk/PreambleEditor.m | 568 + tikzit-1/src/gtk/Preambles+Storage.h | 29 + tikzit-1/src/gtk/Preambles+Storage.m | 84 + tikzit-1/src/gtk/PreviewRenderer.h | 48 + tikzit-1/src/gtk/PreviewRenderer.m | 250 + tikzit-1/src/gtk/PreviewWindow.h | 51 + tikzit-1/src/gtk/PreviewWindow.m | 195 + tikzit-1/src/gtk/PropertiesPane.h | 69 + tikzit-1/src/gtk/PropertiesPane.m | 763 + tikzit-1/src/gtk/PropertyListEditor.h | 65 + tikzit-1/src/gtk/PropertyListEditor.m | 501 + tikzit-1/src/gtk/RecentManager.h | 30 + tikzit-1/src/gtk/RecentManager.m | 74 + tikzit-1/src/gtk/SelectTool.h | 63 + tikzit-1/src/gtk/SelectTool.m | 590 + tikzit-1/src/gtk/SelectionPane.h | 56 + tikzit-1/src/gtk/SelectionPane.m | 432 + tikzit-1/src/gtk/SettingsDialog.h | 54 + tikzit-1/src/gtk/SettingsDialog.m | 328 + tikzit-1/src/gtk/Shape+Render.h | 29 + tikzit-1/src/gtk/Shape+Render.m | 57 + tikzit-1/src/gtk/StyleManager+Storage.h | 26 + tikzit-1/src/gtk/StyleManager+Storage.m | 82 + tikzit-1/src/gtk/Surface.h | 107 + tikzit-1/src/gtk/TZFoundation.h | 30 + tikzit-1/src/gtk/TikzDocument.h | 149 + tikzit-1/src/gtk/TikzDocument.m | 911 + tikzit-1/src/gtk/Tool.h | 41 + tikzit-1/src/gtk/ToolBox.h | 45 + tikzit-1/src/gtk/ToolBox.m | 280 + tikzit-1/src/gtk/WidgetSurface.h | 54 + tikzit-1/src/gtk/WidgetSurface.m | 630 + tikzit-1/src/gtk/Window.h | 182 + tikzit-1/src/gtk/Window.m | 991 + tikzit-1/src/gtk/cairo_helpers.h | 25 + tikzit-1/src/gtk/cairo_helpers.m | 28 + tikzit-1/src/gtk/clipboard.h | 41 + tikzit-1/src/gtk/clipboard.m | 57 + tikzit-1/src/gtk/gtkhelpers.h | 60 + tikzit-1/src/gtk/gtkhelpers.m | 275 + tikzit-1/src/gtk/logo.h | 32 + tikzit-1/src/gtk/logo.m | 64 + tikzit-1/src/gtk/main.m | 111 + tikzit-1/src/gtk/mkdtemp.h | 32 + tikzit-1/src/gtk/mkdtemp.m | 180 + tikzit-1/src/gtk/stat.h | 25 + tikzit-1/src/gtk/test/gtk.m | 27 + tikzit-1/src/gtk/test/main.m | 50 + tikzit-1/src/gtk/tzstockitems.h | 26 + tikzit-1/src/gtk/tzstockitems.m | 64 + tikzit-1/src/gtk/tztoolpalette.h | 56 + tikzit-1/src/gtk/tztoolpalette.m | 158 + tikzit-1/src/osx/AppDelegate.h | 57 + tikzit-1/src/osx/AppDelegate.m | 124 + tikzit-1/src/osx/CALayer+DrawLabel.h | 21 + tikzit-1/src/osx/CALayer+DrawLabel.m | 84 + tikzit-1/src/osx/CoreGraphicsRenderContext.h | 44 + tikzit-1/src/osx/CoreGraphicsRenderContext.m | 234 + tikzit-1/src/osx/CustomNodeCellView.h | 23 + tikzit-1/src/osx/CustomNodeCellView.m | 83 + tikzit-1/src/osx/CustomNodeController.h | 35 + tikzit-1/src/osx/CustomNodeController.m | 58 + tikzit-1/src/osx/CustomNodes.xib | 249 + tikzit-1/src/osx/DraggablePDFView.h | 28 + tikzit-1/src/osx/DraggablePDFView.m | 60 + tikzit-1/src/osx/EdgeControlLayer.h | 44 + tikzit-1/src/osx/EdgeControlLayer.m | 150 + tikzit-1/src/osx/EdgeStyle+Coder.h | 30 + tikzit-1/src/osx/EdgeStyle+Coder.m | 50 + tikzit-1/src/osx/Graph+Coder.h | 17 + tikzit-1/src/osx/Graph+Coder.m | 24 + tikzit-1/src/osx/GraphicsView.h | 129 + tikzit-1/src/osx/GraphicsView.m | 1216 + tikzit-1/src/osx/Grid.h | 48 + tikzit-1/src/osx/Grid.m | 152 + tikzit-1/src/osx/MultiCombo.h | 18 + tikzit-1/src/osx/MultiCombo.m | 38 + tikzit-1/src/osx/MultiField.h | 18 + tikzit-1/src/osx/MultiField.m | 53 + tikzit-1/src/osx/NilToEmptyStringTransformer.h | 28 + tikzit-1/src/osx/NilToEmptyStringTransformer.m | 53 + tikzit-1/src/osx/NodeLayer.h | 62 + tikzit-1/src/osx/NodeLayer.m | 238 + tikzit-1/src/osx/NodeSelectionLayer.h | 45 + tikzit-1/src/osx/NodeSelectionLayer.m | 93 + tikzit-1/src/osx/NodeStyle+Coder.h | 36 + tikzit-1/src/osx/NodeStyle+Coder.m | 91 + tikzit-1/src/osx/ParseErrorView.h | 13 + tikzit-1/src/osx/ParseErrorView.m | 40 + tikzit-1/src/osx/PreambleController.h | 57 + tikzit-1/src/osx/PreambleController.m | 168 + tikzit-1/src/osx/Preambles+Coder.h | 32 + tikzit-1/src/osx/Preambles+Coder.m | 41 + tikzit-1/src/osx/PreferenceController.h | 49 + tikzit-1/src/osx/PreferenceController.m | 133 + tikzit-1/src/osx/Preferences.xib | 1165 + tikzit-1/src/osx/PreviewController.h | 52 + tikzit-1/src/osx/PreviewController.m | 147 + tikzit-1/src/osx/PropertyInspectorController.h | 83 + tikzit-1/src/osx/PropertyInspectorController.m | 280 + tikzit-1/src/osx/SelectBoxLayer.h | 22 + tikzit-1/src/osx/SelectBoxLayer.m | 48 + tikzit-1/src/osx/SelectableCollectionViewItem.h | 33 + tikzit-1/src/osx/SelectableCollectionViewItem.m | 54 + tikzit-1/src/osx/SelectableNodeView.h | 38 + tikzit-1/src/osx/SelectableNodeView.m | 96 + tikzit-1/src/osx/StylePaletteController.h | 80 + tikzit-1/src/osx/StylePaletteController.m | 252 + tikzit-1/src/osx/TikzDocument.h | 37 + tikzit-1/src/osx/TikzDocument.m | 84 + tikzit-1/src/osx/TikzFormatter.h | 29 + tikzit-1/src/osx/TikzFormatter.m | 91 + tikzit-1/src/osx/TikzSourceController.h | 71 + tikzit-1/src/osx/TikzSourceController.m | 241 + tikzit-1/src/osx/TikzWindowController.h | 31 + tikzit-1/src/osx/TikzWindowController.m | 66 + tikzit-1/src/osx/ToolPaletteController.h | 42 + tikzit-1/src/osx/ToolPaletteController.m | 58 + tikzit-1/src/osx/UpdatePreferenceController.h | 34 + tikzit-1/src/osx/UpdatePreferenceController.m | 49 + tikzit-1/src/osx/UpdatePreferencePanel.xib | 95 + tikzit-1/src/osx/main.m | 26 + tikzit-1/src/osx/test/main.m | 56 + tikzit-1/src/osx/test/osx.m | 64 + tikzit-1/src/tikzit.rc | 24 + tikzit-1/text-x-generic.png | Bin 0 -> 744 bytes tikzit-1/text-x-script.png | Bin 0 -> 1416 bytes tikzit-1/tikzit.icns | Bin 0 -> 166599 bytes tikzit-1/tikzit.ico | Bin 0 -> 34494 bytes tikzit-1/tikzit.spec | 98 + tikzit-1/tikzit48x48.png | Bin 0 -> 2606 bytes tikzit-1/tikzit_dsa_pub.pem | 20 + tikzit-1/tikzitdoc.icns | Bin 0 -> 154929 bytes tikzit-1/transform-crop-and-resize.png | Bin 0 -> 1132 bytes tikzit-1/transform-move.png | Bin 0 -> 638 bytes tikzit-1/updates.png | Bin 0 -> 1953 bytes tikzit/.gitignore | 235 - tikzit/AH_latex_head.png | Bin 6334 -> 0 bytes tikzit/AH_latex_tail.png | Bin 6324 -> 0 bytes tikzit/AH_none.png | Bin 6183 -> 0 bytes tikzit/AH_plain_head.png | Bin 6298 -> 0 bytes tikzit/AH_plain_tail.png | Bin 6320 -> 0 bytes tikzit/COPYING | 340 - tikzit/DESIGN-GTK | 23 - tikzit/ED_arrow.png | Bin 6357 -> 0 bytes tikzit/ED_none.png | Bin 6190 -> 0 bytes tikzit/ED_tick.png | Bin 6258 -> 0 bytes tikzit/English.lproj/Credits.rtf | 18 - tikzit/English.lproj/CustomNodes.xib | 256 - tikzit/English.lproj/InfoPlist.strings | 2 - tikzit/English.lproj/MainMenu.xib | 453 - tikzit/English.lproj/Preamble.xib | 235 - tikzit/English.lproj/Preview.xib | 70 - tikzit/English.lproj/PropertyInspector.xib | 769 - tikzit/English.lproj/StylePalette.xib | 631 - tikzit/English.lproj/TikzDocument.xib | 161 - tikzit/English.lproj/UserDefaults.plist | 10 - tikzit/Frameworks/SFBInspectors.framework/Headers | 1 - .../Frameworks/SFBInspectors.framework/Resources | 1 - .../SFBInspectors.framework/SFBInspectors | 1 - .../Versions/A/Headers/SFBInspectorPane.h | 31 - .../Versions/A/Headers/SFBInspectorPaneBody.h | 16 - .../Versions/A/Headers/SFBInspectorPaneHeader.h | 24 - .../Versions/A/Headers/SFBInspectorView.h | 17 - .../Versions/A/Headers/SFBViewSelector.h | 22 - .../Versions/A/Headers/SFBViewSelectorBar.h | 29 - .../Versions/A/Headers/SFBViewSelectorBarItem.h | 28 - .../A/Resources/English.lproj/InfoPlist.strings | Bin 92 -> 0 bytes .../Versions/A/Resources/Info.plist | 24 - .../Versions/A/SFBInspectors | Bin 280648 -> 0 bytes .../SFBInspectors.framework/Versions/Current | 1 - tikzit/Frameworks/Sparkle.framework/Headers | 1 - tikzit/Frameworks/Sparkle.framework/Resources | 1 - tikzit/Frameworks/Sparkle.framework/Sparkle | 1 - .../Versions/A/Headers/SUAppcast.h | 33 - .../Versions/A/Headers/SUAppcastItem.h | 47 - .../Versions/A/Headers/SUUpdater.h | 118 - .../A/Headers/SUVersionComparisonProtocol.h | 27 - .../Sparkle.framework/Versions/A/Headers/Sparkle.h | 21 - .../Versions/A/Resources/Info.plist | 24 - .../Versions/A/Resources/License.txt | 7 - .../Versions/A/Resources/SUModelTranslation.plist | 174 - .../Versions/A/Resources/SUStatus.nib/classes.nib | 56 - .../Versions/A/Resources/SUStatus.nib/info.nib | 20 - .../A/Resources/SUStatus.nib/keyedobjects.nib | Bin 7344 -> 0 bytes .../SUAutomaticUpdateAlert.nib/classes.nib | 50 - .../de.lproj/SUAutomaticUpdateAlert.nib/info.nib | 20 - .../SUAutomaticUpdateAlert.nib/keyedobjects.nib | Bin 7278 -> 0 bytes .../de.lproj/SUUpdateAlert.nib/classes.nib | 67 - .../Resources/de.lproj/SUUpdateAlert.nib/info.nib | 20 - .../de.lproj/SUUpdateAlert.nib/keyedobjects.nib | Bin 10493 -> 0 bytes .../SUUpdatePermissionPrompt.nib/classes.nib | 59 - .../de.lproj/SUUpdatePermissionPrompt.nib/info.nib | 20 - .../SUUpdatePermissionPrompt.nib/keyedobjects.nib | Bin 13189 -> 0 bytes .../Versions/A/Resources/de.lproj/Sparkle.strings | Bin 9806 -> 0 bytes .../SUAutomaticUpdateAlert.nib/classes.nib | 50 - .../en.lproj/SUAutomaticUpdateAlert.nib/info.nib | 20 - .../SUAutomaticUpdateAlert.nib/keyedobjects.nib | Bin 7148 -> 0 bytes .../en.lproj/SUUpdateAlert.nib/classes.nib | 67 - .../Resources/en.lproj/SUUpdateAlert.nib/info.nib | 20 - .../en.lproj/SUUpdateAlert.nib/keyedobjects.nib | Bin 10623 -> 0 bytes .../SUUpdatePermissionPrompt.nib/classes.nib | 59 - .../en.lproj/SUUpdatePermissionPrompt.nib/info.nib | 21 - .../SUUpdatePermissionPrompt.nib/keyedobjects.nib | Bin 13263 -> 0 bytes .../Versions/A/Resources/en.lproj/Sparkle.strings | Bin 8216 -> 0 bytes .../SUAutomaticUpdateAlert.nib/classes.nib | 50 - .../es.lproj/SUAutomaticUpdateAlert.nib/info.nib | 20 - .../SUAutomaticUpdateAlert.nib/keyedobjects.nib | Bin 7273 -> 0 bytes .../es.lproj/SUUpdateAlert.nib/classes.nib | 67 - .../Resources/es.lproj/SUUpdateAlert.nib/info.nib | 20 - .../es.lproj/SUUpdateAlert.nib/keyedobjects.nib | Bin 10668 -> 0 bytes .../SUUpdatePermissionPrompt.nib/classes.nib | 59 - .../es.lproj/SUUpdatePermissionPrompt.nib/info.nib | 20 - .../SUUpdatePermissionPrompt.nib/keyedobjects.nib | Bin 13404 -> 0 bytes .../Versions/A/Resources/es.lproj/Sparkle.strings | Bin 8020 -> 0 bytes .../SUAutomaticUpdateAlert.nib/classes.nib | 50 - .../fr.lproj/SUAutomaticUpdateAlert.nib/info.nib | 16 - .../SUAutomaticUpdateAlert.nib/keyedobjects.nib | Bin 7245 -> 0 bytes .../fr.lproj/SUUpdateAlert.nib/classes.nib | 67 - .../Resources/fr.lproj/SUUpdateAlert.nib/info.nib | 16 - .../fr.lproj/SUUpdateAlert.nib/keyedobjects.nib | Bin 10338 -> 0 bytes .../SUUpdatePermissionPrompt.nib/classes.nib | 59 - .../fr.lproj/SUUpdatePermissionPrompt.nib/info.nib | 16 - .../SUUpdatePermissionPrompt.nib/keyedobjects.nib | Bin 13156 -> 0 bytes .../Versions/A/Resources/fr.lproj/Sparkle.strings | Bin 8554 -> 0 bytes .../Versions/A/Resources/fr_CA.lproj | 1 - .../SUAutomaticUpdateAlert.nib/classes.nib | 50 - .../it.lproj/SUAutomaticUpdateAlert.nib/info.nib | 20 - .../SUAutomaticUpdateAlert.nib/keyedobjects.nib | Bin 7161 -> 0 bytes .../it.lproj/SUUpdateAlert.nib/classes.nib | 67 - .../Resources/it.lproj/SUUpdateAlert.nib/info.nib | 20 - .../it.lproj/SUUpdateAlert.nib/keyedobjects.nib | Bin 10360 -> 0 bytes .../SUUpdatePermissionPrompt.nib/classes.nib | 59 - .../it.lproj/SUUpdatePermissionPrompt.nib/info.nib | 20 - .../SUUpdatePermissionPrompt.nib/keyedobjects.nib | Bin 12659 -> 0 bytes .../Versions/A/Resources/it.lproj/Sparkle.strings | Bin 8914 -> 0 bytes .../SUAutomaticUpdateAlert.nib/classes.nib | 50 - .../nl.lproj/SUAutomaticUpdateAlert.nib/info.nib | 18 - .../SUAutomaticUpdateAlert.nib/keyedobjects.nib | Bin 7234 -> 0 bytes .../nl.lproj/SUUpdateAlert.nib/classes.nib | 67 - .../Resources/nl.lproj/SUUpdateAlert.nib/info.nib | 16 - .../nl.lproj/SUUpdateAlert.nib/keyedobjects.nib | Bin 10220 -> 0 bytes .../SUUpdatePermissionPrompt.nib/classes.nib | 59 - .../nl.lproj/SUUpdatePermissionPrompt.nib/info.nib | 16 - .../SUUpdatePermissionPrompt.nib/keyedobjects.nib | Bin 12535 -> 0 bytes .../Versions/A/Resources/nl.lproj/Sparkle.strings | Bin 8514 -> 0 bytes .../Versions/A/Resources/relaunch | Bin 58924 -> 0 bytes .../SUAutomaticUpdateAlert.nib/classes.nib | 50 - .../ru.lproj/SUAutomaticUpdateAlert.nib/info.nib | 20 - .../SUAutomaticUpdateAlert.nib/keyedobjects.nib | Bin 7675 -> 0 bytes .../ru.lproj/SUUpdateAlert.nib/classes.nib | 67 - .../Resources/ru.lproj/SUUpdateAlert.nib/info.nib | 20 - .../ru.lproj/SUUpdateAlert.nib/keyedobjects.nib | Bin 10895 -> 0 bytes .../SUUpdatePermissionPrompt.nib/classes.nib | 59 - .../ru.lproj/SUUpdatePermissionPrompt.nib/info.nib | 18 - .../SUUpdatePermissionPrompt.nib/keyedobjects.nib | Bin 12898 -> 0 bytes .../Versions/A/Resources/ru.lproj/Sparkle.strings | Bin 8364 -> 0 bytes .../SUAutomaticUpdateAlert.nib/classes.nib | 50 - .../sv.lproj/SUAutomaticUpdateAlert.nib/info.nib | 20 - .../SUAutomaticUpdateAlert.nib/keyedobjects.nib | Bin 7474 -> 0 bytes .../sv.lproj/SUUpdateAlert.nib/classes.nib | 39 - .../Resources/sv.lproj/SUUpdateAlert.nib/info.nib | 18 - .../sv.lproj/SUUpdateAlert.nib/keyedobjects.nib | Bin 10180 -> 0 bytes .../SUUpdatePermissionPrompt.nib/classes.nib | 59 - .../sv.lproj/SUUpdatePermissionPrompt.nib/info.nib | 20 - .../SUUpdatePermissionPrompt.nib/keyedobjects.nib | Bin 13483 -> 0 bytes .../Versions/A/Resources/sv.lproj/Sparkle.strings | Bin 8142 -> 0 bytes .../Sparkle.framework/Versions/A/Sparkle | Bin 463812 -> 0 bytes .../Frameworks/Sparkle.framework/Versions/Current | 1 - tikzit/INSTALL | 34 - tikzit/Makefile.am | 3 - tikzit/NEWS | 75 - tikzit/README | 13 +- tikzit/README.release | 98 - tikzit/TODO | 15 - tikzit/TikZiT-Info.plist | 61 - tikzit/TikZiT.xcodeproj/project.pbxproj | 1322 - .../project.xcworkspace/contents.xcworkspacedata | 7 - .../xcshareddata/TikZiT.xccheckout | 37 - .../UserInterfaceState.xcuserstate | 24539 ------------------- .../aleks.xcuserdatad/WorkspaceSettings.xcsettings | 22 - .../xcdebugger/Breakpoints.xcbkptlist | 123 - .../aleks.xcuserdatad/xcschemes/TikZiT.xcscheme | 72 - .../aleks.xcuserdatad/xcschemes/tests.xcscheme | 72 - .../xcschemes/xcschememanagement.plist | 32 - tikzit/TikZiT_Prefix.pch | 30 - tikzit/autogen.sh | 1578 -- tikzit/build/DEBIAN/control | 11 - tikzit/configure.ac | 141 - tikzit/customshape.png | Bin 1281 -> 0 bytes tikzit/docs/Doxyfile | 1600 -- tikzit/draw-ellipse.png | Bin 3493 -> 0 bytes tikzit/draw-path.png | Bin 920 -> 0 bytes tikzit/emblem-important.png | Bin 717 -> 0 bytes tikzit/emblem-unreadable-grey.png | Bin 3554 -> 0 bytes tikzit/engine.png | Bin 1546 -> 0 bytes tikzit/format-indent-less.png | Bin 767 -> 0 bytes tikzit/m4/objc.m4 | 135 - tikzit/preamble.png | Bin 851 -> 0 bytes tikzit/scripts/generate_keys.rb | 13 - tikzit/scripts/prepare_release.sh | 40 - tikzit/scripts/sign_update.rb | 7 - tikzit/select-rectangular.png | Bin 499 -> 0 bytes tikzit/shapes/cap.tikz | 13 - tikzit/shapes/copants.tikz | 19 - tikzit/shapes/cup.tikz | 13 - tikzit/shapes/oval.tikz | 11 - tikzit/shapes/pants.tikz | 19 - tikzit/share/Makefile.am | 10 - tikzit/share/applications/tikzit.desktop | 11 - tikzit/share/icons/hicolor/128x128/apps/tikzit.png | Bin 9098 -> 0 bytes .../hicolor/128x128/mimetypes/text-x-tikz.png | Bin 7316 -> 0 bytes tikzit/share/icons/hicolor/16x16/apps/tikzit.png | Bin 882 -> 0 bytes .../icons/hicolor/16x16/mimetypes/text-x-tikz.png | Bin 564 -> 0 bytes tikzit/share/icons/hicolor/22x22/apps/tikzit.png | Bin 1273 -> 0 bytes .../icons/hicolor/22x22/mimetypes/text-x-tikz.png | Bin 866 -> 0 bytes tikzit/share/icons/hicolor/24x24/apps/tikzit.png | Bin 1406 -> 0 bytes tikzit/share/icons/hicolor/32x32/apps/tikzit.png | Bin 1987 -> 0 bytes .../icons/hicolor/32x32/mimetypes/text-x-tikz.png | Bin 1352 -> 0 bytes tikzit/share/icons/hicolor/48x48/apps/tikzit.png | Bin 3132 -> 0 bytes .../icons/hicolor/48x48/mimetypes/text-x-tikz.png | Bin 2445 -> 0 bytes tikzit/share/icons/hicolor/64x64/apps/tikzit.png | Bin 4315 -> 0 bytes .../icons/hicolor/64x64/mimetypes/text-x-tikz.png | Bin 3532 -> 0 bytes .../share/icons/hicolor/scalable/apps/tikzit.svg | 79 - .../hicolor/scalable/mimetypes/text-x-tikz.svg | 488 - tikzit/share/mime/packages/tikzit.xml | 10 - tikzit/share/tikzit | 1 - tikzit/src/Makefile.am | 178 - tikzit/src/common/CircleShape.h | 33 - tikzit/src/common/CircleShape.m | 57 - tikzit/src/common/ColorRGB.h | 64 - tikzit/src/common/ColorRGB.m | 353 - tikzit/src/common/DiamondShape.h | 34 - tikzit/src/common/DiamondShape.m | 63 - tikzit/src/common/Edge.h | 401 - tikzit/src/common/Edge.m | 757 - tikzit/src/common/EdgeStyle.h | 71 - tikzit/src/common/EdgeStyle.m | 222 - tikzit/src/common/Graph.h | 401 - tikzit/src/common/Graph.m | 922 - tikzit/src/common/GraphChange.h | 344 - tikzit/src/common/GraphChange.m | 369 - tikzit/src/common/GraphElementData.h | 94 - tikzit/src/common/GraphElementData.m | 188 - tikzit/src/common/GraphElementProperty.h | 88 - tikzit/src/common/GraphElementProperty.m | 164 - tikzit/src/common/Grid.h | 110 - tikzit/src/common/Grid.m | 186 - tikzit/src/common/NSError+Tikzit.h | 44 - tikzit/src/common/NSError+Tikzit.m | 64 - tikzit/src/common/NSFileManager+Utils.h | 29 - tikzit/src/common/NSFileManager+Utils.m | 46 - tikzit/src/common/NSString+LatexConstants.h | 33 - tikzit/src/common/NSString+LatexConstants.m | 212 - tikzit/src/common/NSString+Tikz.h | 26 - tikzit/src/common/NSString+Tikz.m | 72 - tikzit/src/common/NSString+Util.h | 27 - tikzit/src/common/NSString+Util.m | 66 - tikzit/src/common/Node.h | 181 - tikzit/src/common/Node.m | 214 - tikzit/src/common/NodeStyle.h | 125 - tikzit/src/common/NodeStyle.m | 246 - tikzit/src/common/PickSupport.h | 164 - tikzit/src/common/PickSupport.m | 232 - tikzit/src/common/Preambles.h | 73 - tikzit/src/common/Preambles.m | 320 - tikzit/src/common/PropertyHolder.h | 36 - tikzit/src/common/PropertyHolder.m | 74 - tikzit/src/common/RColor.h | 50 - tikzit/src/common/RColor.m | 33 - tikzit/src/common/RectangleShape.h | 33 - tikzit/src/common/RectangleShape.m | 57 - tikzit/src/common/RegularPolyShape.h | 50 - tikzit/src/common/RegularPolyShape.m | 76 - tikzit/src/common/RenderContext.h | 156 - tikzit/src/common/Shape.h | 49 - tikzit/src/common/Shape.m | 171 - tikzit/src/common/ShapeNames.h | 27 - tikzit/src/common/StyleManager.h | 49 - tikzit/src/common/StyleManager.m | 378 - tikzit/src/common/SupportDir.h | 36 - tikzit/src/common/SupportDir.m | 65 - tikzit/src/common/TikzGraphAssembler+Parser.h | 36 - tikzit/src/common/TikzGraphAssembler.h | 115 - tikzit/src/common/TikzGraphAssembler.m | 310 - tikzit/src/common/TikzShape.h | 37 - tikzit/src/common/TikzShape.m | 70 - tikzit/src/common/Transformer.h | 154 - tikzit/src/common/Transformer.m | 231 - tikzit/src/common/test/Makefile | 14 - tikzit/src/common/test/color.m | 80 - tikzit/src/common/test/common.m | 34 - tikzit/src/common/test/maths.m | 562 - tikzit/src/common/test/parser.m | 86 - tikzit/src/common/test/test.h | 57 - tikzit/src/common/test/test.m | 175 - tikzit/src/common/tikzlexer.lm | 170 - tikzit/src/common/tikzparser.ym | 224 - tikzit/src/common/tikzparserdefs.h | 49 - tikzit/src/common/util.h | 201 - tikzit/src/common/util.m | 403 - tikzit/src/gtk/Application.h | 155 - tikzit/src/gtk/Application.m | 377 - tikzit/src/gtk/BoundingBoxTool.h | 45 - tikzit/src/gtk/BoundingBoxTool.m | 353 - tikzit/src/gtk/CairoRenderContext.h | 59 - tikzit/src/gtk/CairoRenderContext.m | 344 - tikzit/src/gtk/ColorRGB+Gtk.h | 30 - tikzit/src/gtk/ColorRGB+Gtk.m | 46 - tikzit/src/gtk/ColorRGB+IntegerListStorage.h | 32 - tikzit/src/gtk/ColorRGB+IntegerListStorage.m | 57 - tikzit/src/gtk/Configuration.h | 447 - tikzit/src/gtk/Configuration.m | 450 - tikzit/src/gtk/ContextWindow.h | 53 - tikzit/src/gtk/ContextWindow.m | 169 - tikzit/src/gtk/CreateEdgeTool.h | 45 - tikzit/src/gtk/CreateEdgeTool.m | 226 - tikzit/src/gtk/CreateNodeTool.h | 42 - tikzit/src/gtk/CreateNodeTool.m | 169 - tikzit/src/gtk/DocumentContext.h | 27 - tikzit/src/gtk/Edge+Render.h | 34 - tikzit/src/gtk/Edge+Render.m | 267 - tikzit/src/gtk/EdgeStyle+Gtk.h | 29 - tikzit/src/gtk/EdgeStyle+Gtk.m | 33 - tikzit/src/gtk/EdgeStyle+Storage.h | 29 - tikzit/src/gtk/EdgeStyle+Storage.m | 55 - tikzit/src/gtk/EdgeStyleEditor.h | 45 - tikzit/src/gtk/EdgeStyleEditor.m | 499 - tikzit/src/gtk/EdgeStyleSelector.h | 61 - tikzit/src/gtk/EdgeStyleSelector.m | 143 - tikzit/src/gtk/EdgeStylesModel.h | 62 - tikzit/src/gtk/EdgeStylesModel.m | 367 - tikzit/src/gtk/EdgeStylesPalette.h | 43 - tikzit/src/gtk/EdgeStylesPalette.m | 198 - tikzit/src/gtk/FileChooserDialog.h | 56 - tikzit/src/gtk/FileChooserDialog.m | 152 - tikzit/src/gtk/GraphEditorPanel.h | 53 - tikzit/src/gtk/GraphEditorPanel.m | 240 - tikzit/src/gtk/GraphRenderer.h | 84 - tikzit/src/gtk/GraphRenderer.m | 476 - tikzit/src/gtk/HandTool.h | 33 - tikzit/src/gtk/HandTool.m | 75 - tikzit/src/gtk/InputDelegate.h | 77 - tikzit/src/gtk/Menu.h | 86 - tikzit/src/gtk/Menu.m | 737 - tikzit/src/gtk/NSError+Glib.h | 28 - tikzit/src/gtk/NSError+Glib.m | 50 - tikzit/src/gtk/NSFileManager+Glib.h | 31 - tikzit/src/gtk/NSFileManager+Glib.m | 55 - tikzit/src/gtk/NSString+Glib.h | 50 - tikzit/src/gtk/NSString+Glib.m | 96 - tikzit/src/gtk/Node+Render.h | 44 - tikzit/src/gtk/Node+Render.m | 188 - tikzit/src/gtk/NodeStyle+Gtk.h | 31 - tikzit/src/gtk/NodeStyle+Gtk.m | 41 - tikzit/src/gtk/NodeStyle+Render.h | 30 - tikzit/src/gtk/NodeStyle+Storage.h | 29 - tikzit/src/gtk/NodeStyle+Storage.m | 62 - tikzit/src/gtk/NodeStyleEditor.h | 45 - tikzit/src/gtk/NodeStyleEditor.m | 477 - tikzit/src/gtk/NodeStyleSelector.h | 61 - tikzit/src/gtk/NodeStyleSelector.m | 135 - tikzit/src/gtk/NodeStylesModel.h | 62 - tikzit/src/gtk/NodeStylesModel.m | 381 - tikzit/src/gtk/NodeStylesPalette.h | 43 - tikzit/src/gtk/NodeStylesPalette.m | 197 - tikzit/src/gtk/PreambleEditor.h | 51 - tikzit/src/gtk/PreambleEditor.m | 568 - tikzit/src/gtk/Preambles+Storage.h | 29 - tikzit/src/gtk/Preambles+Storage.m | 84 - tikzit/src/gtk/PreviewRenderer.h | 48 - tikzit/src/gtk/PreviewRenderer.m | 250 - tikzit/src/gtk/PreviewWindow.h | 51 - tikzit/src/gtk/PreviewWindow.m | 195 - tikzit/src/gtk/PropertiesPane.h | 69 - tikzit/src/gtk/PropertiesPane.m | 763 - tikzit/src/gtk/PropertyListEditor.h | 65 - tikzit/src/gtk/PropertyListEditor.m | 501 - tikzit/src/gtk/RecentManager.h | 30 - tikzit/src/gtk/RecentManager.m | 74 - tikzit/src/gtk/SelectTool.h | 63 - tikzit/src/gtk/SelectTool.m | 590 - tikzit/src/gtk/SelectionPane.h | 56 - tikzit/src/gtk/SelectionPane.m | 432 - tikzit/src/gtk/SettingsDialog.h | 54 - tikzit/src/gtk/SettingsDialog.m | 328 - tikzit/src/gtk/Shape+Render.h | 29 - tikzit/src/gtk/Shape+Render.m | 57 - tikzit/src/gtk/StyleManager+Storage.h | 26 - tikzit/src/gtk/StyleManager+Storage.m | 82 - tikzit/src/gtk/Surface.h | 107 - tikzit/src/gtk/TZFoundation.h | 30 - tikzit/src/gtk/TikzDocument.h | 149 - tikzit/src/gtk/TikzDocument.m | 911 - tikzit/src/gtk/Tool.h | 41 - tikzit/src/gtk/ToolBox.h | 45 - tikzit/src/gtk/ToolBox.m | 280 - tikzit/src/gtk/WidgetSurface.h | 54 - tikzit/src/gtk/WidgetSurface.m | 630 - tikzit/src/gtk/Window.h | 182 - tikzit/src/gtk/Window.m | 991 - tikzit/src/gtk/cairo_helpers.h | 25 - tikzit/src/gtk/cairo_helpers.m | 28 - tikzit/src/gtk/clipboard.h | 41 - tikzit/src/gtk/clipboard.m | 57 - tikzit/src/gtk/gtkhelpers.h | 60 - tikzit/src/gtk/gtkhelpers.m | 275 - tikzit/src/gtk/logo.h | 32 - tikzit/src/gtk/logo.m | 64 - tikzit/src/gtk/main.m | 111 - tikzit/src/gtk/mkdtemp.h | 32 - tikzit/src/gtk/mkdtemp.m | 180 - tikzit/src/gtk/stat.h | 25 - tikzit/src/gtk/test/gtk.m | 27 - tikzit/src/gtk/test/main.m | 50 - tikzit/src/gtk/tzstockitems.h | 26 - tikzit/src/gtk/tzstockitems.m | 64 - tikzit/src/gtk/tztoolpalette.h | 56 - tikzit/src/gtk/tztoolpalette.m | 158 - tikzit/src/osx/AppDelegate.h | 57 - tikzit/src/osx/AppDelegate.m | 124 - tikzit/src/osx/CALayer+DrawLabel.h | 21 - tikzit/src/osx/CALayer+DrawLabel.m | 84 - tikzit/src/osx/CoreGraphicsRenderContext.h | 44 - tikzit/src/osx/CoreGraphicsRenderContext.m | 234 - tikzit/src/osx/CustomNodeCellView.h | 23 - tikzit/src/osx/CustomNodeCellView.m | 83 - tikzit/src/osx/CustomNodeController.h | 35 - tikzit/src/osx/CustomNodeController.m | 58 - tikzit/src/osx/CustomNodes.xib | 249 - tikzit/src/osx/DraggablePDFView.h | 28 - tikzit/src/osx/DraggablePDFView.m | 60 - tikzit/src/osx/EdgeControlLayer.h | 44 - tikzit/src/osx/EdgeControlLayer.m | 150 - tikzit/src/osx/EdgeStyle+Coder.h | 30 - tikzit/src/osx/EdgeStyle+Coder.m | 50 - tikzit/src/osx/Graph+Coder.h | 17 - tikzit/src/osx/Graph+Coder.m | 24 - tikzit/src/osx/GraphicsView.h | 129 - tikzit/src/osx/GraphicsView.m | 1216 - tikzit/src/osx/Grid.h | 48 - tikzit/src/osx/Grid.m | 152 - tikzit/src/osx/MultiCombo.h | 18 - tikzit/src/osx/MultiCombo.m | 38 - tikzit/src/osx/MultiField.h | 18 - tikzit/src/osx/MultiField.m | 53 - tikzit/src/osx/NilToEmptyStringTransformer.h | 28 - tikzit/src/osx/NilToEmptyStringTransformer.m | 53 - tikzit/src/osx/NodeLayer.h | 62 - tikzit/src/osx/NodeLayer.m | 238 - tikzit/src/osx/NodeSelectionLayer.h | 45 - tikzit/src/osx/NodeSelectionLayer.m | 93 - tikzit/src/osx/NodeStyle+Coder.h | 36 - tikzit/src/osx/NodeStyle+Coder.m | 91 - tikzit/src/osx/ParseErrorView.h | 13 - tikzit/src/osx/ParseErrorView.m | 40 - tikzit/src/osx/PreambleController.h | 57 - tikzit/src/osx/PreambleController.m | 168 - tikzit/src/osx/Preambles+Coder.h | 32 - tikzit/src/osx/Preambles+Coder.m | 41 - tikzit/src/osx/PreferenceController.h | 49 - tikzit/src/osx/PreferenceController.m | 133 - tikzit/src/osx/Preferences.xib | 1165 - tikzit/src/osx/PreviewController.h | 52 - tikzit/src/osx/PreviewController.m | 147 - tikzit/src/osx/PropertyInspectorController.h | 83 - tikzit/src/osx/PropertyInspectorController.m | 280 - tikzit/src/osx/SelectBoxLayer.h | 22 - tikzit/src/osx/SelectBoxLayer.m | 48 - tikzit/src/osx/SelectableCollectionViewItem.h | 33 - tikzit/src/osx/SelectableCollectionViewItem.m | 54 - tikzit/src/osx/SelectableNodeView.h | 38 - tikzit/src/osx/SelectableNodeView.m | 96 - tikzit/src/osx/StylePaletteController.h | 80 - tikzit/src/osx/StylePaletteController.m | 252 - tikzit/src/osx/TikzDocument.h | 37 - tikzit/src/osx/TikzDocument.m | 84 - tikzit/src/osx/TikzFormatter.h | 29 - tikzit/src/osx/TikzFormatter.m | 91 - tikzit/src/osx/TikzSourceController.h | 71 - tikzit/src/osx/TikzSourceController.m | 241 - tikzit/src/osx/TikzWindowController.h | 31 - tikzit/src/osx/TikzWindowController.m | 66 - tikzit/src/osx/ToolPaletteController.h | 42 - tikzit/src/osx/ToolPaletteController.m | 58 - tikzit/src/osx/UpdatePreferenceController.h | 34 - tikzit/src/osx/UpdatePreferenceController.m | 49 - tikzit/src/osx/UpdatePreferencePanel.xib | 95 - tikzit/src/osx/main.m | 26 - tikzit/src/osx/test/main.m | 56 - tikzit/src/osx/test/osx.m | 64 - tikzit/src/tikzit.rc | 24 - tikzit/text-x-generic.png | Bin 744 -> 0 bytes tikzit/text-x-script.png | Bin 1416 -> 0 bytes tikzit/tikzit.icns | Bin 166599 -> 0 bytes tikzit/tikzit.ico | Bin 34494 -> 0 bytes tikzit/tikzit.spec | 98 - tikzit/tikzit48x48.png | Bin 2606 -> 0 bytes tikzit/tikzit_dsa_pub.pem | 20 - tikzit/tikzitdoc.icns | Bin 154929 -> 0 bytes tikzit/transform-crop-and-resize.png | Bin 1132 -> 0 bytes tikzit/transform-move.png | Bin 638 -> 0 bytes tikzit/updates.png | Bin 1953 -> 0 bytes 934 files changed, 74397 insertions(+), 74385 deletions(-) create mode 100644 tikzit-1/.gitignore create mode 100644 tikzit-1/AH_latex_head.png create mode 100644 tikzit-1/AH_latex_tail.png create mode 100644 tikzit-1/AH_none.png create mode 100644 tikzit-1/AH_plain_head.png create mode 100644 tikzit-1/AH_plain_tail.png create mode 100644 tikzit-1/COPYING create mode 100644 tikzit-1/DESIGN-GTK create mode 100644 tikzit-1/ED_arrow.png create mode 100644 tikzit-1/ED_none.png create mode 100644 tikzit-1/ED_tick.png create mode 100644 tikzit-1/English.lproj/Credits.rtf create mode 100644 tikzit-1/English.lproj/CustomNodes.xib create mode 100644 tikzit-1/English.lproj/InfoPlist.strings create mode 100644 tikzit-1/English.lproj/MainMenu.xib create mode 100644 tikzit-1/English.lproj/Preamble.xib create mode 100644 tikzit-1/English.lproj/Preview.xib create mode 100644 tikzit-1/English.lproj/PropertyInspector.xib create mode 100644 tikzit-1/English.lproj/StylePalette.xib create mode 100644 tikzit-1/English.lproj/TikzDocument.xib create mode 100644 tikzit-1/English.lproj/UserDefaults.plist create mode 120000 tikzit-1/Frameworks/SFBInspectors.framework/Headers create mode 120000 tikzit-1/Frameworks/SFBInspectors.framework/Resources create mode 120000 tikzit-1/Frameworks/SFBInspectors.framework/SFBInspectors create mode 100644 tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPane.h create mode 100644 tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPaneBody.h create mode 100644 tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPaneHeader.h create mode 100644 tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorView.h create mode 100644 tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelector.h create mode 100644 tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelectorBar.h create mode 100644 tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelectorBarItem.h create mode 100644 tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Resources/English.lproj/InfoPlist.strings create mode 100644 tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Resources/Info.plist create mode 100755 tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/SFBInspectors create mode 120000 tikzit-1/Frameworks/SFBInspectors.framework/Versions/Current create mode 120000 tikzit-1/Frameworks/Sparkle.framework/Headers create mode 120000 tikzit-1/Frameworks/Sparkle.framework/Resources create mode 120000 tikzit-1/Frameworks/Sparkle.framework/Sparkle create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcast.h create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Headers/SUUpdater.h create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Headers/Sparkle.h create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/Info.plist create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/License.txt create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/SUModelTranslation.plist create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/classes.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/info.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/keyedobjects.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/classes.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/info.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/classes.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/info.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/keyedobjects.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/classes.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/info.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/classes.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/info.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/classes.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/info.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/keyedobjects.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/classes.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/info.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/Sparkle.strings create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/classes.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/info.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/classes.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/info.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/keyedobjects.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/classes.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/info.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/Sparkle.strings create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/classes.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/info.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/classes.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/info.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/keyedobjects.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/classes.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/info.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/Sparkle.strings create mode 120000 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr_CA.lproj create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/classes.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/info.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/classes.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/info.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/keyedobjects.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/classes.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/info.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/Sparkle.strings create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/classes.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/info.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/classes.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/info.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/keyedobjects.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/classes.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/info.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/Sparkle.strings create mode 100755 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/relaunch create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/classes.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/info.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/classes.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/info.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/keyedobjects.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/classes.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/info.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/classes.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/info.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/classes.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/info.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/keyedobjects.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/classes.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/info.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib create mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/Sparkle.strings create mode 100755 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Sparkle create mode 120000 tikzit-1/Frameworks/Sparkle.framework/Versions/Current create mode 100644 tikzit-1/INSTALL create mode 100644 tikzit-1/Makefile.am create mode 100644 tikzit-1/NEWS create mode 100644 tikzit-1/README create mode 100644 tikzit-1/README.release create mode 100644 tikzit-1/TODO create mode 100644 tikzit-1/TikZiT-Info.plist create mode 100644 tikzit-1/TikZiT.xcodeproj/project.pbxproj create mode 100644 tikzit-1/TikZiT.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 tikzit-1/TikZiT.xcodeproj/project.xcworkspace/xcshareddata/TikZiT.xccheckout create mode 100644 tikzit-1/TikZiT.xcodeproj/project.xcworkspace/xcuserdata/aleks.xcuserdatad/UserInterfaceState.xcuserstate create mode 100644 tikzit-1/TikZiT.xcodeproj/project.xcworkspace/xcuserdata/aleks.xcuserdatad/WorkspaceSettings.xcsettings create mode 100644 tikzit-1/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist create mode 100644 tikzit-1/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/TikZiT.xcscheme create mode 100644 tikzit-1/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/tests.xcscheme create mode 100644 tikzit-1/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/xcschememanagement.plist create mode 100644 tikzit-1/TikZiT_Prefix.pch create mode 100755 tikzit-1/autogen.sh create mode 100644 tikzit-1/build/DEBIAN/control create mode 100644 tikzit-1/configure.ac create mode 100755 tikzit-1/customshape.png create mode 100644 tikzit-1/docs/Doxyfile create mode 100644 tikzit-1/draw-ellipse.png create mode 100644 tikzit-1/draw-path.png create mode 100644 tikzit-1/emblem-important.png create mode 100644 tikzit-1/emblem-unreadable-grey.png create mode 100755 tikzit-1/engine.png create mode 100644 tikzit-1/format-indent-less.png create mode 100644 tikzit-1/m4/objc.m4 create mode 100755 tikzit-1/preamble.png create mode 100755 tikzit-1/scripts/generate_keys.rb create mode 100755 tikzit-1/scripts/prepare_release.sh create mode 100755 tikzit-1/scripts/sign_update.rb create mode 100644 tikzit-1/select-rectangular.png create mode 100644 tikzit-1/shapes/cap.tikz create mode 100644 tikzit-1/shapes/copants.tikz create mode 100644 tikzit-1/shapes/cup.tikz create mode 100644 tikzit-1/shapes/oval.tikz create mode 100644 tikzit-1/shapes/pants.tikz create mode 100644 tikzit-1/share/Makefile.am create mode 100644 tikzit-1/share/applications/tikzit.desktop create mode 100644 tikzit-1/share/icons/hicolor/128x128/apps/tikzit.png create mode 100644 tikzit-1/share/icons/hicolor/128x128/mimetypes/text-x-tikz.png create mode 100644 tikzit-1/share/icons/hicolor/16x16/apps/tikzit.png create mode 100644 tikzit-1/share/icons/hicolor/16x16/mimetypes/text-x-tikz.png create mode 100644 tikzit-1/share/icons/hicolor/22x22/apps/tikzit.png create mode 100644 tikzit-1/share/icons/hicolor/22x22/mimetypes/text-x-tikz.png create mode 100644 tikzit-1/share/icons/hicolor/24x24/apps/tikzit.png create mode 100644 tikzit-1/share/icons/hicolor/32x32/apps/tikzit.png create mode 100644 tikzit-1/share/icons/hicolor/32x32/mimetypes/text-x-tikz.png create mode 100644 tikzit-1/share/icons/hicolor/48x48/apps/tikzit.png create mode 100644 tikzit-1/share/icons/hicolor/48x48/mimetypes/text-x-tikz.png create mode 100644 tikzit-1/share/icons/hicolor/64x64/apps/tikzit.png create mode 100644 tikzit-1/share/icons/hicolor/64x64/mimetypes/text-x-tikz.png create mode 100644 tikzit-1/share/icons/hicolor/scalable/apps/tikzit.svg create mode 100644 tikzit-1/share/icons/hicolor/scalable/mimetypes/text-x-tikz.svg create mode 100644 tikzit-1/share/mime/packages/tikzit.xml create mode 120000 tikzit-1/share/tikzit create mode 100644 tikzit-1/src/Makefile.am create mode 100644 tikzit-1/src/common/CircleShape.h create mode 100644 tikzit-1/src/common/CircleShape.m create mode 100644 tikzit-1/src/common/ColorRGB.h create mode 100644 tikzit-1/src/common/ColorRGB.m create mode 100644 tikzit-1/src/common/DiamondShape.h create mode 100644 tikzit-1/src/common/DiamondShape.m create mode 100644 tikzit-1/src/common/Edge.h create mode 100644 tikzit-1/src/common/Edge.m create mode 100644 tikzit-1/src/common/EdgeStyle.h create mode 100644 tikzit-1/src/common/EdgeStyle.m create mode 100644 tikzit-1/src/common/Graph.h create mode 100644 tikzit-1/src/common/Graph.m create mode 100644 tikzit-1/src/common/GraphChange.h create mode 100644 tikzit-1/src/common/GraphChange.m create mode 100644 tikzit-1/src/common/GraphElementData.h create mode 100644 tikzit-1/src/common/GraphElementData.m create mode 100644 tikzit-1/src/common/GraphElementProperty.h create mode 100644 tikzit-1/src/common/GraphElementProperty.m create mode 100644 tikzit-1/src/common/Grid.h create mode 100644 tikzit-1/src/common/Grid.m create mode 100644 tikzit-1/src/common/NSError+Tikzit.h create mode 100644 tikzit-1/src/common/NSError+Tikzit.m create mode 100644 tikzit-1/src/common/NSFileManager+Utils.h create mode 100644 tikzit-1/src/common/NSFileManager+Utils.m create mode 100644 tikzit-1/src/common/NSString+LatexConstants.h create mode 100644 tikzit-1/src/common/NSString+LatexConstants.m create mode 100644 tikzit-1/src/common/NSString+Tikz.h create mode 100644 tikzit-1/src/common/NSString+Tikz.m create mode 100644 tikzit-1/src/common/NSString+Util.h create mode 100644 tikzit-1/src/common/NSString+Util.m create mode 100644 tikzit-1/src/common/Node.h create mode 100644 tikzit-1/src/common/Node.m create mode 100644 tikzit-1/src/common/NodeStyle.h create mode 100644 tikzit-1/src/common/NodeStyle.m create mode 100644 tikzit-1/src/common/PickSupport.h create mode 100644 tikzit-1/src/common/PickSupport.m create mode 100644 tikzit-1/src/common/Preambles.h create mode 100644 tikzit-1/src/common/Preambles.m create mode 100644 tikzit-1/src/common/PropertyHolder.h create mode 100644 tikzit-1/src/common/PropertyHolder.m create mode 100644 tikzit-1/src/common/RColor.h create mode 100644 tikzit-1/src/common/RColor.m create mode 100644 tikzit-1/src/common/RectangleShape.h create mode 100644 tikzit-1/src/common/RectangleShape.m create mode 100644 tikzit-1/src/common/RegularPolyShape.h create mode 100644 tikzit-1/src/common/RegularPolyShape.m create mode 100644 tikzit-1/src/common/RenderContext.h create mode 100644 tikzit-1/src/common/Shape.h create mode 100644 tikzit-1/src/common/Shape.m create mode 100644 tikzit-1/src/common/ShapeNames.h create mode 100644 tikzit-1/src/common/StyleManager.h create mode 100644 tikzit-1/src/common/StyleManager.m create mode 100644 tikzit-1/src/common/SupportDir.h create mode 100644 tikzit-1/src/common/SupportDir.m create mode 100644 tikzit-1/src/common/TikzGraphAssembler+Parser.h create mode 100644 tikzit-1/src/common/TikzGraphAssembler.h create mode 100644 tikzit-1/src/common/TikzGraphAssembler.m create mode 100644 tikzit-1/src/common/TikzShape.h create mode 100644 tikzit-1/src/common/TikzShape.m create mode 100644 tikzit-1/src/common/Transformer.h create mode 100644 tikzit-1/src/common/Transformer.m create mode 100644 tikzit-1/src/common/test/Makefile create mode 100644 tikzit-1/src/common/test/color.m create mode 100644 tikzit-1/src/common/test/common.m create mode 100644 tikzit-1/src/common/test/maths.m create mode 100644 tikzit-1/src/common/test/parser.m create mode 100644 tikzit-1/src/common/test/test.h create mode 100644 tikzit-1/src/common/test/test.m create mode 100644 tikzit-1/src/common/tikzlexer.lm create mode 100644 tikzit-1/src/common/tikzparser.ym create mode 100644 tikzit-1/src/common/tikzparserdefs.h create mode 100644 tikzit-1/src/common/util.h create mode 100644 tikzit-1/src/common/util.m create mode 100644 tikzit-1/src/gtk/Application.h create mode 100644 tikzit-1/src/gtk/Application.m create mode 100644 tikzit-1/src/gtk/BoundingBoxTool.h create mode 100644 tikzit-1/src/gtk/BoundingBoxTool.m create mode 100644 tikzit-1/src/gtk/CairoRenderContext.h create mode 100644 tikzit-1/src/gtk/CairoRenderContext.m create mode 100644 tikzit-1/src/gtk/ColorRGB+Gtk.h create mode 100644 tikzit-1/src/gtk/ColorRGB+Gtk.m create mode 100644 tikzit-1/src/gtk/ColorRGB+IntegerListStorage.h create mode 100644 tikzit-1/src/gtk/ColorRGB+IntegerListStorage.m create mode 100644 tikzit-1/src/gtk/Configuration.h create mode 100644 tikzit-1/src/gtk/Configuration.m create mode 100644 tikzit-1/src/gtk/ContextWindow.h create mode 100644 tikzit-1/src/gtk/ContextWindow.m create mode 100644 tikzit-1/src/gtk/CreateEdgeTool.h create mode 100644 tikzit-1/src/gtk/CreateEdgeTool.m create mode 100644 tikzit-1/src/gtk/CreateNodeTool.h create mode 100644 tikzit-1/src/gtk/CreateNodeTool.m create mode 100644 tikzit-1/src/gtk/DocumentContext.h create mode 100644 tikzit-1/src/gtk/Edge+Render.h create mode 100644 tikzit-1/src/gtk/Edge+Render.m create mode 100644 tikzit-1/src/gtk/EdgeStyle+Gtk.h create mode 100644 tikzit-1/src/gtk/EdgeStyle+Gtk.m create mode 100644 tikzit-1/src/gtk/EdgeStyle+Storage.h create mode 100644 tikzit-1/src/gtk/EdgeStyle+Storage.m create mode 100644 tikzit-1/src/gtk/EdgeStyleEditor.h create mode 100644 tikzit-1/src/gtk/EdgeStyleEditor.m create mode 100644 tikzit-1/src/gtk/EdgeStyleSelector.h create mode 100644 tikzit-1/src/gtk/EdgeStyleSelector.m create mode 100644 tikzit-1/src/gtk/EdgeStylesModel.h create mode 100644 tikzit-1/src/gtk/EdgeStylesModel.m create mode 100644 tikzit-1/src/gtk/EdgeStylesPalette.h create mode 100644 tikzit-1/src/gtk/EdgeStylesPalette.m create mode 100644 tikzit-1/src/gtk/FileChooserDialog.h create mode 100644 tikzit-1/src/gtk/FileChooserDialog.m create mode 100644 tikzit-1/src/gtk/GraphEditorPanel.h create mode 100644 tikzit-1/src/gtk/GraphEditorPanel.m create mode 100644 tikzit-1/src/gtk/GraphRenderer.h create mode 100644 tikzit-1/src/gtk/GraphRenderer.m create mode 100644 tikzit-1/src/gtk/HandTool.h create mode 100644 tikzit-1/src/gtk/HandTool.m create mode 100644 tikzit-1/src/gtk/InputDelegate.h create mode 100644 tikzit-1/src/gtk/Menu.h create mode 100644 tikzit-1/src/gtk/Menu.m create mode 100644 tikzit-1/src/gtk/NSError+Glib.h create mode 100644 tikzit-1/src/gtk/NSError+Glib.m create mode 100644 tikzit-1/src/gtk/NSFileManager+Glib.h create mode 100644 tikzit-1/src/gtk/NSFileManager+Glib.m create mode 100644 tikzit-1/src/gtk/NSString+Glib.h create mode 100644 tikzit-1/src/gtk/NSString+Glib.m create mode 100644 tikzit-1/src/gtk/Node+Render.h create mode 100644 tikzit-1/src/gtk/Node+Render.m create mode 100644 tikzit-1/src/gtk/NodeStyle+Gtk.h create mode 100644 tikzit-1/src/gtk/NodeStyle+Gtk.m create mode 100644 tikzit-1/src/gtk/NodeStyle+Render.h create mode 100644 tikzit-1/src/gtk/NodeStyle+Storage.h create mode 100644 tikzit-1/src/gtk/NodeStyle+Storage.m create mode 100644 tikzit-1/src/gtk/NodeStyleEditor.h create mode 100644 tikzit-1/src/gtk/NodeStyleEditor.m create mode 100644 tikzit-1/src/gtk/NodeStyleSelector.h create mode 100644 tikzit-1/src/gtk/NodeStyleSelector.m create mode 100644 tikzit-1/src/gtk/NodeStylesModel.h create mode 100644 tikzit-1/src/gtk/NodeStylesModel.m create mode 100644 tikzit-1/src/gtk/NodeStylesPalette.h create mode 100644 tikzit-1/src/gtk/NodeStylesPalette.m create mode 100644 tikzit-1/src/gtk/PreambleEditor.h create mode 100644 tikzit-1/src/gtk/PreambleEditor.m create mode 100644 tikzit-1/src/gtk/Preambles+Storage.h create mode 100644 tikzit-1/src/gtk/Preambles+Storage.m create mode 100644 tikzit-1/src/gtk/PreviewRenderer.h create mode 100644 tikzit-1/src/gtk/PreviewRenderer.m create mode 100644 tikzit-1/src/gtk/PreviewWindow.h create mode 100644 tikzit-1/src/gtk/PreviewWindow.m create mode 100644 tikzit-1/src/gtk/PropertiesPane.h create mode 100644 tikzit-1/src/gtk/PropertiesPane.m create mode 100644 tikzit-1/src/gtk/PropertyListEditor.h create mode 100644 tikzit-1/src/gtk/PropertyListEditor.m create mode 100644 tikzit-1/src/gtk/RecentManager.h create mode 100644 tikzit-1/src/gtk/RecentManager.m create mode 100644 tikzit-1/src/gtk/SelectTool.h create mode 100644 tikzit-1/src/gtk/SelectTool.m create mode 100644 tikzit-1/src/gtk/SelectionPane.h create mode 100644 tikzit-1/src/gtk/SelectionPane.m create mode 100644 tikzit-1/src/gtk/SettingsDialog.h create mode 100644 tikzit-1/src/gtk/SettingsDialog.m create mode 100644 tikzit-1/src/gtk/Shape+Render.h create mode 100644 tikzit-1/src/gtk/Shape+Render.m create mode 100644 tikzit-1/src/gtk/StyleManager+Storage.h create mode 100644 tikzit-1/src/gtk/StyleManager+Storage.m create mode 100644 tikzit-1/src/gtk/Surface.h create mode 100644 tikzit-1/src/gtk/TZFoundation.h create mode 100644 tikzit-1/src/gtk/TikzDocument.h create mode 100644 tikzit-1/src/gtk/TikzDocument.m create mode 100644 tikzit-1/src/gtk/Tool.h create mode 100644 tikzit-1/src/gtk/ToolBox.h create mode 100644 tikzit-1/src/gtk/ToolBox.m create mode 100644 tikzit-1/src/gtk/WidgetSurface.h create mode 100644 tikzit-1/src/gtk/WidgetSurface.m create mode 100644 tikzit-1/src/gtk/Window.h create mode 100644 tikzit-1/src/gtk/Window.m create mode 100644 tikzit-1/src/gtk/cairo_helpers.h create mode 100644 tikzit-1/src/gtk/cairo_helpers.m create mode 100644 tikzit-1/src/gtk/clipboard.h create mode 100644 tikzit-1/src/gtk/clipboard.m create mode 100644 tikzit-1/src/gtk/gtkhelpers.h create mode 100644 tikzit-1/src/gtk/gtkhelpers.m create mode 100644 tikzit-1/src/gtk/logo.h create mode 100644 tikzit-1/src/gtk/logo.m create mode 100644 tikzit-1/src/gtk/main.m create mode 100644 tikzit-1/src/gtk/mkdtemp.h create mode 100644 tikzit-1/src/gtk/mkdtemp.m create mode 100644 tikzit-1/src/gtk/stat.h create mode 100644 tikzit-1/src/gtk/test/gtk.m create mode 100644 tikzit-1/src/gtk/test/main.m create mode 100644 tikzit-1/src/gtk/tzstockitems.h create mode 100644 tikzit-1/src/gtk/tzstockitems.m create mode 100644 tikzit-1/src/gtk/tztoolpalette.h create mode 100644 tikzit-1/src/gtk/tztoolpalette.m create mode 100644 tikzit-1/src/osx/AppDelegate.h create mode 100644 tikzit-1/src/osx/AppDelegate.m create mode 100644 tikzit-1/src/osx/CALayer+DrawLabel.h create mode 100644 tikzit-1/src/osx/CALayer+DrawLabel.m create mode 100644 tikzit-1/src/osx/CoreGraphicsRenderContext.h create mode 100644 tikzit-1/src/osx/CoreGraphicsRenderContext.m create mode 100644 tikzit-1/src/osx/CustomNodeCellView.h create mode 100644 tikzit-1/src/osx/CustomNodeCellView.m create mode 100644 tikzit-1/src/osx/CustomNodeController.h create mode 100644 tikzit-1/src/osx/CustomNodeController.m create mode 100644 tikzit-1/src/osx/CustomNodes.xib create mode 100644 tikzit-1/src/osx/DraggablePDFView.h create mode 100644 tikzit-1/src/osx/DraggablePDFView.m create mode 100644 tikzit-1/src/osx/EdgeControlLayer.h create mode 100644 tikzit-1/src/osx/EdgeControlLayer.m create mode 100644 tikzit-1/src/osx/EdgeStyle+Coder.h create mode 100644 tikzit-1/src/osx/EdgeStyle+Coder.m create mode 100644 tikzit-1/src/osx/Graph+Coder.h create mode 100644 tikzit-1/src/osx/Graph+Coder.m create mode 100644 tikzit-1/src/osx/GraphicsView.h create mode 100644 tikzit-1/src/osx/GraphicsView.m create mode 100644 tikzit-1/src/osx/Grid.h create mode 100644 tikzit-1/src/osx/Grid.m create mode 100644 tikzit-1/src/osx/MultiCombo.h create mode 100644 tikzit-1/src/osx/MultiCombo.m create mode 100644 tikzit-1/src/osx/MultiField.h create mode 100644 tikzit-1/src/osx/MultiField.m create mode 100644 tikzit-1/src/osx/NilToEmptyStringTransformer.h create mode 100644 tikzit-1/src/osx/NilToEmptyStringTransformer.m create mode 100644 tikzit-1/src/osx/NodeLayer.h create mode 100644 tikzit-1/src/osx/NodeLayer.m create mode 100644 tikzit-1/src/osx/NodeSelectionLayer.h create mode 100644 tikzit-1/src/osx/NodeSelectionLayer.m create mode 100644 tikzit-1/src/osx/NodeStyle+Coder.h create mode 100644 tikzit-1/src/osx/NodeStyle+Coder.m create mode 100644 tikzit-1/src/osx/ParseErrorView.h create mode 100644 tikzit-1/src/osx/ParseErrorView.m create mode 100644 tikzit-1/src/osx/PreambleController.h create mode 100644 tikzit-1/src/osx/PreambleController.m create mode 100644 tikzit-1/src/osx/Preambles+Coder.h create mode 100644 tikzit-1/src/osx/Preambles+Coder.m create mode 100644 tikzit-1/src/osx/PreferenceController.h create mode 100644 tikzit-1/src/osx/PreferenceController.m create mode 100644 tikzit-1/src/osx/Preferences.xib create mode 100644 tikzit-1/src/osx/PreviewController.h create mode 100644 tikzit-1/src/osx/PreviewController.m create mode 100644 tikzit-1/src/osx/PropertyInspectorController.h create mode 100644 tikzit-1/src/osx/PropertyInspectorController.m create mode 100644 tikzit-1/src/osx/SelectBoxLayer.h create mode 100644 tikzit-1/src/osx/SelectBoxLayer.m create mode 100644 tikzit-1/src/osx/SelectableCollectionViewItem.h create mode 100644 tikzit-1/src/osx/SelectableCollectionViewItem.m create mode 100644 tikzit-1/src/osx/SelectableNodeView.h create mode 100644 tikzit-1/src/osx/SelectableNodeView.m create mode 100644 tikzit-1/src/osx/StylePaletteController.h create mode 100644 tikzit-1/src/osx/StylePaletteController.m create mode 100644 tikzit-1/src/osx/TikzDocument.h create mode 100644 tikzit-1/src/osx/TikzDocument.m create mode 100644 tikzit-1/src/osx/TikzFormatter.h create mode 100644 tikzit-1/src/osx/TikzFormatter.m create mode 100644 tikzit-1/src/osx/TikzSourceController.h create mode 100644 tikzit-1/src/osx/TikzSourceController.m create mode 100644 tikzit-1/src/osx/TikzWindowController.h create mode 100644 tikzit-1/src/osx/TikzWindowController.m create mode 100644 tikzit-1/src/osx/ToolPaletteController.h create mode 100644 tikzit-1/src/osx/ToolPaletteController.m create mode 100644 tikzit-1/src/osx/UpdatePreferenceController.h create mode 100644 tikzit-1/src/osx/UpdatePreferenceController.m create mode 100644 tikzit-1/src/osx/UpdatePreferencePanel.xib create mode 100644 tikzit-1/src/osx/main.m create mode 100644 tikzit-1/src/osx/test/main.m create mode 100644 tikzit-1/src/osx/test/osx.m create mode 100644 tikzit-1/src/tikzit.rc create mode 100644 tikzit-1/text-x-generic.png create mode 100644 tikzit-1/text-x-script.png create mode 100644 tikzit-1/tikzit.icns create mode 100644 tikzit-1/tikzit.ico create mode 100644 tikzit-1/tikzit.spec create mode 100644 tikzit-1/tikzit48x48.png create mode 100644 tikzit-1/tikzit_dsa_pub.pem create mode 100644 tikzit-1/tikzitdoc.icns create mode 100644 tikzit-1/transform-crop-and-resize.png create mode 100644 tikzit-1/transform-move.png create mode 100755 tikzit-1/updates.png delete mode 100644 tikzit/.gitignore delete mode 100644 tikzit/AH_latex_head.png delete mode 100644 tikzit/AH_latex_tail.png delete mode 100644 tikzit/AH_none.png delete mode 100644 tikzit/AH_plain_head.png delete mode 100644 tikzit/AH_plain_tail.png delete mode 100644 tikzit/COPYING delete mode 100644 tikzit/DESIGN-GTK delete mode 100644 tikzit/ED_arrow.png delete mode 100644 tikzit/ED_none.png delete mode 100644 tikzit/ED_tick.png delete mode 100644 tikzit/English.lproj/Credits.rtf delete mode 100644 tikzit/English.lproj/CustomNodes.xib delete mode 100644 tikzit/English.lproj/InfoPlist.strings delete mode 100644 tikzit/English.lproj/MainMenu.xib delete mode 100644 tikzit/English.lproj/Preamble.xib delete mode 100644 tikzit/English.lproj/Preview.xib delete mode 100644 tikzit/English.lproj/PropertyInspector.xib delete mode 100644 tikzit/English.lproj/StylePalette.xib delete mode 100644 tikzit/English.lproj/TikzDocument.xib delete mode 100644 tikzit/English.lproj/UserDefaults.plist delete mode 120000 tikzit/Frameworks/SFBInspectors.framework/Headers delete mode 120000 tikzit/Frameworks/SFBInspectors.framework/Resources delete mode 120000 tikzit/Frameworks/SFBInspectors.framework/SFBInspectors delete mode 100644 tikzit/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPane.h delete mode 100644 tikzit/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPaneBody.h delete mode 100644 tikzit/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPaneHeader.h delete mode 100644 tikzit/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorView.h delete mode 100644 tikzit/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelector.h delete mode 100644 tikzit/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelectorBar.h delete mode 100644 tikzit/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelectorBarItem.h delete mode 100644 tikzit/Frameworks/SFBInspectors.framework/Versions/A/Resources/English.lproj/InfoPlist.strings delete mode 100644 tikzit/Frameworks/SFBInspectors.framework/Versions/A/Resources/Info.plist delete mode 100755 tikzit/Frameworks/SFBInspectors.framework/Versions/A/SFBInspectors delete mode 120000 tikzit/Frameworks/SFBInspectors.framework/Versions/Current delete mode 120000 tikzit/Frameworks/Sparkle.framework/Headers delete mode 120000 tikzit/Frameworks/Sparkle.framework/Resources delete mode 120000 tikzit/Frameworks/Sparkle.framework/Sparkle delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcast.h delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Headers/SUUpdater.h delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Headers/Sparkle.h delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/Info.plist delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/License.txt delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/SUModelTranslation.plist delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/classes.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/info.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/keyedobjects.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/classes.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/info.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/classes.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/info.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/classes.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/info.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/classes.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/info.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/classes.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/info.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/classes.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/info.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/Sparkle.strings delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/classes.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/info.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/classes.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/info.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/classes.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/info.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/Sparkle.strings delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/classes.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/info.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/classes.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/info.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/classes.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/info.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/Sparkle.strings delete mode 120000 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr_CA.lproj delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/classes.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/info.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/classes.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/info.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/classes.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/info.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/Sparkle.strings delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/classes.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/info.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/classes.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/info.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/classes.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/info.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/Sparkle.strings delete mode 100755 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/relaunch delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/classes.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/info.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/classes.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/info.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/classes.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/info.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/classes.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/info.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/classes.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/info.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/classes.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/info.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib delete mode 100644 tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/Sparkle.strings delete mode 100755 tikzit/Frameworks/Sparkle.framework/Versions/A/Sparkle delete mode 120000 tikzit/Frameworks/Sparkle.framework/Versions/Current delete mode 100644 tikzit/INSTALL delete mode 100644 tikzit/Makefile.am delete mode 100644 tikzit/NEWS delete mode 100644 tikzit/README.release delete mode 100644 tikzit/TODO delete mode 100644 tikzit/TikZiT-Info.plist delete mode 100644 tikzit/TikZiT.xcodeproj/project.pbxproj delete mode 100644 tikzit/TikZiT.xcodeproj/project.xcworkspace/contents.xcworkspacedata delete mode 100644 tikzit/TikZiT.xcodeproj/project.xcworkspace/xcshareddata/TikZiT.xccheckout delete mode 100644 tikzit/TikZiT.xcodeproj/project.xcworkspace/xcuserdata/aleks.xcuserdatad/UserInterfaceState.xcuserstate delete mode 100644 tikzit/TikZiT.xcodeproj/project.xcworkspace/xcuserdata/aleks.xcuserdatad/WorkspaceSettings.xcsettings delete mode 100644 tikzit/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist delete mode 100644 tikzit/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/TikZiT.xcscheme delete mode 100644 tikzit/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/tests.xcscheme delete mode 100644 tikzit/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/xcschememanagement.plist delete mode 100644 tikzit/TikZiT_Prefix.pch delete mode 100755 tikzit/autogen.sh delete mode 100644 tikzit/build/DEBIAN/control delete mode 100644 tikzit/configure.ac delete mode 100755 tikzit/customshape.png delete mode 100644 tikzit/docs/Doxyfile delete mode 100644 tikzit/draw-ellipse.png delete mode 100644 tikzit/draw-path.png delete mode 100644 tikzit/emblem-important.png delete mode 100644 tikzit/emblem-unreadable-grey.png delete mode 100755 tikzit/engine.png delete mode 100644 tikzit/format-indent-less.png delete mode 100644 tikzit/m4/objc.m4 delete mode 100755 tikzit/preamble.png delete mode 100755 tikzit/scripts/generate_keys.rb delete mode 100755 tikzit/scripts/prepare_release.sh delete mode 100755 tikzit/scripts/sign_update.rb delete mode 100644 tikzit/select-rectangular.png delete mode 100644 tikzit/shapes/cap.tikz delete mode 100644 tikzit/shapes/copants.tikz delete mode 100644 tikzit/shapes/cup.tikz delete mode 100644 tikzit/shapes/oval.tikz delete mode 100644 tikzit/shapes/pants.tikz delete mode 100644 tikzit/share/Makefile.am delete mode 100644 tikzit/share/applications/tikzit.desktop delete mode 100644 tikzit/share/icons/hicolor/128x128/apps/tikzit.png delete mode 100644 tikzit/share/icons/hicolor/128x128/mimetypes/text-x-tikz.png delete mode 100644 tikzit/share/icons/hicolor/16x16/apps/tikzit.png delete mode 100644 tikzit/share/icons/hicolor/16x16/mimetypes/text-x-tikz.png delete mode 100644 tikzit/share/icons/hicolor/22x22/apps/tikzit.png delete mode 100644 tikzit/share/icons/hicolor/22x22/mimetypes/text-x-tikz.png delete mode 100644 tikzit/share/icons/hicolor/24x24/apps/tikzit.png delete mode 100644 tikzit/share/icons/hicolor/32x32/apps/tikzit.png delete mode 100644 tikzit/share/icons/hicolor/32x32/mimetypes/text-x-tikz.png delete mode 100644 tikzit/share/icons/hicolor/48x48/apps/tikzit.png delete mode 100644 tikzit/share/icons/hicolor/48x48/mimetypes/text-x-tikz.png delete mode 100644 tikzit/share/icons/hicolor/64x64/apps/tikzit.png delete mode 100644 tikzit/share/icons/hicolor/64x64/mimetypes/text-x-tikz.png delete mode 100644 tikzit/share/icons/hicolor/scalable/apps/tikzit.svg delete mode 100644 tikzit/share/icons/hicolor/scalable/mimetypes/text-x-tikz.svg delete mode 100644 tikzit/share/mime/packages/tikzit.xml delete mode 120000 tikzit/share/tikzit delete mode 100644 tikzit/src/Makefile.am delete mode 100644 tikzit/src/common/CircleShape.h delete mode 100644 tikzit/src/common/CircleShape.m delete mode 100644 tikzit/src/common/ColorRGB.h delete mode 100644 tikzit/src/common/ColorRGB.m delete mode 100644 tikzit/src/common/DiamondShape.h delete mode 100644 tikzit/src/common/DiamondShape.m delete mode 100644 tikzit/src/common/Edge.h delete mode 100644 tikzit/src/common/Edge.m delete mode 100644 tikzit/src/common/EdgeStyle.h delete mode 100644 tikzit/src/common/EdgeStyle.m delete mode 100644 tikzit/src/common/Graph.h delete mode 100644 tikzit/src/common/Graph.m delete mode 100644 tikzit/src/common/GraphChange.h delete mode 100644 tikzit/src/common/GraphChange.m delete mode 100644 tikzit/src/common/GraphElementData.h delete mode 100644 tikzit/src/common/GraphElementData.m delete mode 100644 tikzit/src/common/GraphElementProperty.h delete mode 100644 tikzit/src/common/GraphElementProperty.m delete mode 100644 tikzit/src/common/Grid.h delete mode 100644 tikzit/src/common/Grid.m delete mode 100644 tikzit/src/common/NSError+Tikzit.h delete mode 100644 tikzit/src/common/NSError+Tikzit.m delete mode 100644 tikzit/src/common/NSFileManager+Utils.h delete mode 100644 tikzit/src/common/NSFileManager+Utils.m delete mode 100644 tikzit/src/common/NSString+LatexConstants.h delete mode 100644 tikzit/src/common/NSString+LatexConstants.m delete mode 100644 tikzit/src/common/NSString+Tikz.h delete mode 100644 tikzit/src/common/NSString+Tikz.m delete mode 100644 tikzit/src/common/NSString+Util.h delete mode 100644 tikzit/src/common/NSString+Util.m delete mode 100644 tikzit/src/common/Node.h delete mode 100644 tikzit/src/common/Node.m delete mode 100644 tikzit/src/common/NodeStyle.h delete mode 100644 tikzit/src/common/NodeStyle.m delete mode 100644 tikzit/src/common/PickSupport.h delete mode 100644 tikzit/src/common/PickSupport.m delete mode 100644 tikzit/src/common/Preambles.h delete mode 100644 tikzit/src/common/Preambles.m delete mode 100644 tikzit/src/common/PropertyHolder.h delete mode 100644 tikzit/src/common/PropertyHolder.m delete mode 100644 tikzit/src/common/RColor.h delete mode 100644 tikzit/src/common/RColor.m delete mode 100644 tikzit/src/common/RectangleShape.h delete mode 100644 tikzit/src/common/RectangleShape.m delete mode 100644 tikzit/src/common/RegularPolyShape.h delete mode 100644 tikzit/src/common/RegularPolyShape.m delete mode 100644 tikzit/src/common/RenderContext.h delete mode 100644 tikzit/src/common/Shape.h delete mode 100644 tikzit/src/common/Shape.m delete mode 100644 tikzit/src/common/ShapeNames.h delete mode 100644 tikzit/src/common/StyleManager.h delete mode 100644 tikzit/src/common/StyleManager.m delete mode 100644 tikzit/src/common/SupportDir.h delete mode 100644 tikzit/src/common/SupportDir.m delete mode 100644 tikzit/src/common/TikzGraphAssembler+Parser.h delete mode 100644 tikzit/src/common/TikzGraphAssembler.h delete mode 100644 tikzit/src/common/TikzGraphAssembler.m delete mode 100644 tikzit/src/common/TikzShape.h delete mode 100644 tikzit/src/common/TikzShape.m delete mode 100644 tikzit/src/common/Transformer.h delete mode 100644 tikzit/src/common/Transformer.m delete mode 100644 tikzit/src/common/test/Makefile delete mode 100644 tikzit/src/common/test/color.m delete mode 100644 tikzit/src/common/test/common.m delete mode 100644 tikzit/src/common/test/maths.m delete mode 100644 tikzit/src/common/test/parser.m delete mode 100644 tikzit/src/common/test/test.h delete mode 100644 tikzit/src/common/test/test.m delete mode 100644 tikzit/src/common/tikzlexer.lm delete mode 100644 tikzit/src/common/tikzparser.ym delete mode 100644 tikzit/src/common/tikzparserdefs.h delete mode 100644 tikzit/src/common/util.h delete mode 100644 tikzit/src/common/util.m delete mode 100644 tikzit/src/gtk/Application.h delete mode 100644 tikzit/src/gtk/Application.m delete mode 100644 tikzit/src/gtk/BoundingBoxTool.h delete mode 100644 tikzit/src/gtk/BoundingBoxTool.m delete mode 100644 tikzit/src/gtk/CairoRenderContext.h delete mode 100644 tikzit/src/gtk/CairoRenderContext.m delete mode 100644 tikzit/src/gtk/ColorRGB+Gtk.h delete mode 100644 tikzit/src/gtk/ColorRGB+Gtk.m delete mode 100644 tikzit/src/gtk/ColorRGB+IntegerListStorage.h delete mode 100644 tikzit/src/gtk/ColorRGB+IntegerListStorage.m delete mode 100644 tikzit/src/gtk/Configuration.h delete mode 100644 tikzit/src/gtk/Configuration.m delete mode 100644 tikzit/src/gtk/ContextWindow.h delete mode 100644 tikzit/src/gtk/ContextWindow.m delete mode 100644 tikzit/src/gtk/CreateEdgeTool.h delete mode 100644 tikzit/src/gtk/CreateEdgeTool.m delete mode 100644 tikzit/src/gtk/CreateNodeTool.h delete mode 100644 tikzit/src/gtk/CreateNodeTool.m delete mode 100644 tikzit/src/gtk/DocumentContext.h delete mode 100644 tikzit/src/gtk/Edge+Render.h delete mode 100644 tikzit/src/gtk/Edge+Render.m delete mode 100644 tikzit/src/gtk/EdgeStyle+Gtk.h delete mode 100644 tikzit/src/gtk/EdgeStyle+Gtk.m delete mode 100644 tikzit/src/gtk/EdgeStyle+Storage.h delete mode 100644 tikzit/src/gtk/EdgeStyle+Storage.m delete mode 100644 tikzit/src/gtk/EdgeStyleEditor.h delete mode 100644 tikzit/src/gtk/EdgeStyleEditor.m delete mode 100644 tikzit/src/gtk/EdgeStyleSelector.h delete mode 100644 tikzit/src/gtk/EdgeStyleSelector.m delete mode 100644 tikzit/src/gtk/EdgeStylesModel.h delete mode 100644 tikzit/src/gtk/EdgeStylesModel.m delete mode 100644 tikzit/src/gtk/EdgeStylesPalette.h delete mode 100644 tikzit/src/gtk/EdgeStylesPalette.m delete mode 100644 tikzit/src/gtk/FileChooserDialog.h delete mode 100644 tikzit/src/gtk/FileChooserDialog.m delete mode 100644 tikzit/src/gtk/GraphEditorPanel.h delete mode 100644 tikzit/src/gtk/GraphEditorPanel.m delete mode 100644 tikzit/src/gtk/GraphRenderer.h delete mode 100644 tikzit/src/gtk/GraphRenderer.m delete mode 100644 tikzit/src/gtk/HandTool.h delete mode 100644 tikzit/src/gtk/HandTool.m delete mode 100644 tikzit/src/gtk/InputDelegate.h delete mode 100644 tikzit/src/gtk/Menu.h delete mode 100644 tikzit/src/gtk/Menu.m delete mode 100644 tikzit/src/gtk/NSError+Glib.h delete mode 100644 tikzit/src/gtk/NSError+Glib.m delete mode 100644 tikzit/src/gtk/NSFileManager+Glib.h delete mode 100644 tikzit/src/gtk/NSFileManager+Glib.m delete mode 100644 tikzit/src/gtk/NSString+Glib.h delete mode 100644 tikzit/src/gtk/NSString+Glib.m delete mode 100644 tikzit/src/gtk/Node+Render.h delete mode 100644 tikzit/src/gtk/Node+Render.m delete mode 100644 tikzit/src/gtk/NodeStyle+Gtk.h delete mode 100644 tikzit/src/gtk/NodeStyle+Gtk.m delete mode 100644 tikzit/src/gtk/NodeStyle+Render.h delete mode 100644 tikzit/src/gtk/NodeStyle+Storage.h delete mode 100644 tikzit/src/gtk/NodeStyle+Storage.m delete mode 100644 tikzit/src/gtk/NodeStyleEditor.h delete mode 100644 tikzit/src/gtk/NodeStyleEditor.m delete mode 100644 tikzit/src/gtk/NodeStyleSelector.h delete mode 100644 tikzit/src/gtk/NodeStyleSelector.m delete mode 100644 tikzit/src/gtk/NodeStylesModel.h delete mode 100644 tikzit/src/gtk/NodeStylesModel.m delete mode 100644 tikzit/src/gtk/NodeStylesPalette.h delete mode 100644 tikzit/src/gtk/NodeStylesPalette.m delete mode 100644 tikzit/src/gtk/PreambleEditor.h delete mode 100644 tikzit/src/gtk/PreambleEditor.m delete mode 100644 tikzit/src/gtk/Preambles+Storage.h delete mode 100644 tikzit/src/gtk/Preambles+Storage.m delete mode 100644 tikzit/src/gtk/PreviewRenderer.h delete mode 100644 tikzit/src/gtk/PreviewRenderer.m delete mode 100644 tikzit/src/gtk/PreviewWindow.h delete mode 100644 tikzit/src/gtk/PreviewWindow.m delete mode 100644 tikzit/src/gtk/PropertiesPane.h delete mode 100644 tikzit/src/gtk/PropertiesPane.m delete mode 100644 tikzit/src/gtk/PropertyListEditor.h delete mode 100644 tikzit/src/gtk/PropertyListEditor.m delete mode 100644 tikzit/src/gtk/RecentManager.h delete mode 100644 tikzit/src/gtk/RecentManager.m delete mode 100644 tikzit/src/gtk/SelectTool.h delete mode 100644 tikzit/src/gtk/SelectTool.m delete mode 100644 tikzit/src/gtk/SelectionPane.h delete mode 100644 tikzit/src/gtk/SelectionPane.m delete mode 100644 tikzit/src/gtk/SettingsDialog.h delete mode 100644 tikzit/src/gtk/SettingsDialog.m delete mode 100644 tikzit/src/gtk/Shape+Render.h delete mode 100644 tikzit/src/gtk/Shape+Render.m delete mode 100644 tikzit/src/gtk/StyleManager+Storage.h delete mode 100644 tikzit/src/gtk/StyleManager+Storage.m delete mode 100644 tikzit/src/gtk/Surface.h delete mode 100644 tikzit/src/gtk/TZFoundation.h delete mode 100644 tikzit/src/gtk/TikzDocument.h delete mode 100644 tikzit/src/gtk/TikzDocument.m delete mode 100644 tikzit/src/gtk/Tool.h delete mode 100644 tikzit/src/gtk/ToolBox.h delete mode 100644 tikzit/src/gtk/ToolBox.m delete mode 100644 tikzit/src/gtk/WidgetSurface.h delete mode 100644 tikzit/src/gtk/WidgetSurface.m delete mode 100644 tikzit/src/gtk/Window.h delete mode 100644 tikzit/src/gtk/Window.m delete mode 100644 tikzit/src/gtk/cairo_helpers.h delete mode 100644 tikzit/src/gtk/cairo_helpers.m delete mode 100644 tikzit/src/gtk/clipboard.h delete mode 100644 tikzit/src/gtk/clipboard.m delete mode 100644 tikzit/src/gtk/gtkhelpers.h delete mode 100644 tikzit/src/gtk/gtkhelpers.m delete mode 100644 tikzit/src/gtk/logo.h delete mode 100644 tikzit/src/gtk/logo.m delete mode 100644 tikzit/src/gtk/main.m delete mode 100644 tikzit/src/gtk/mkdtemp.h delete mode 100644 tikzit/src/gtk/mkdtemp.m delete mode 100644 tikzit/src/gtk/stat.h delete mode 100644 tikzit/src/gtk/test/gtk.m delete mode 100644 tikzit/src/gtk/test/main.m delete mode 100644 tikzit/src/gtk/tzstockitems.h delete mode 100644 tikzit/src/gtk/tzstockitems.m delete mode 100644 tikzit/src/gtk/tztoolpalette.h delete mode 100644 tikzit/src/gtk/tztoolpalette.m delete mode 100644 tikzit/src/osx/AppDelegate.h delete mode 100644 tikzit/src/osx/AppDelegate.m delete mode 100644 tikzit/src/osx/CALayer+DrawLabel.h delete mode 100644 tikzit/src/osx/CALayer+DrawLabel.m delete mode 100644 tikzit/src/osx/CoreGraphicsRenderContext.h delete mode 100644 tikzit/src/osx/CoreGraphicsRenderContext.m delete mode 100644 tikzit/src/osx/CustomNodeCellView.h delete mode 100644 tikzit/src/osx/CustomNodeCellView.m delete mode 100644 tikzit/src/osx/CustomNodeController.h delete mode 100644 tikzit/src/osx/CustomNodeController.m delete mode 100644 tikzit/src/osx/CustomNodes.xib delete mode 100644 tikzit/src/osx/DraggablePDFView.h delete mode 100644 tikzit/src/osx/DraggablePDFView.m delete mode 100644 tikzit/src/osx/EdgeControlLayer.h delete mode 100644 tikzit/src/osx/EdgeControlLayer.m delete mode 100644 tikzit/src/osx/EdgeStyle+Coder.h delete mode 100644 tikzit/src/osx/EdgeStyle+Coder.m delete mode 100644 tikzit/src/osx/Graph+Coder.h delete mode 100644 tikzit/src/osx/Graph+Coder.m delete mode 100644 tikzit/src/osx/GraphicsView.h delete mode 100644 tikzit/src/osx/GraphicsView.m delete mode 100644 tikzit/src/osx/Grid.h delete mode 100644 tikzit/src/osx/Grid.m delete mode 100644 tikzit/src/osx/MultiCombo.h delete mode 100644 tikzit/src/osx/MultiCombo.m delete mode 100644 tikzit/src/osx/MultiField.h delete mode 100644 tikzit/src/osx/MultiField.m delete mode 100644 tikzit/src/osx/NilToEmptyStringTransformer.h delete mode 100644 tikzit/src/osx/NilToEmptyStringTransformer.m delete mode 100644 tikzit/src/osx/NodeLayer.h delete mode 100644 tikzit/src/osx/NodeLayer.m delete mode 100644 tikzit/src/osx/NodeSelectionLayer.h delete mode 100644 tikzit/src/osx/NodeSelectionLayer.m delete mode 100644 tikzit/src/osx/NodeStyle+Coder.h delete mode 100644 tikzit/src/osx/NodeStyle+Coder.m delete mode 100644 tikzit/src/osx/ParseErrorView.h delete mode 100644 tikzit/src/osx/ParseErrorView.m delete mode 100644 tikzit/src/osx/PreambleController.h delete mode 100644 tikzit/src/osx/PreambleController.m delete mode 100644 tikzit/src/osx/Preambles+Coder.h delete mode 100644 tikzit/src/osx/Preambles+Coder.m delete mode 100644 tikzit/src/osx/PreferenceController.h delete mode 100644 tikzit/src/osx/PreferenceController.m delete mode 100644 tikzit/src/osx/Preferences.xib delete mode 100644 tikzit/src/osx/PreviewController.h delete mode 100644 tikzit/src/osx/PreviewController.m delete mode 100644 tikzit/src/osx/PropertyInspectorController.h delete mode 100644 tikzit/src/osx/PropertyInspectorController.m delete mode 100644 tikzit/src/osx/SelectBoxLayer.h delete mode 100644 tikzit/src/osx/SelectBoxLayer.m delete mode 100644 tikzit/src/osx/SelectableCollectionViewItem.h delete mode 100644 tikzit/src/osx/SelectableCollectionViewItem.m delete mode 100644 tikzit/src/osx/SelectableNodeView.h delete mode 100644 tikzit/src/osx/SelectableNodeView.m delete mode 100644 tikzit/src/osx/StylePaletteController.h delete mode 100644 tikzit/src/osx/StylePaletteController.m delete mode 100644 tikzit/src/osx/TikzDocument.h delete mode 100644 tikzit/src/osx/TikzDocument.m delete mode 100644 tikzit/src/osx/TikzFormatter.h delete mode 100644 tikzit/src/osx/TikzFormatter.m delete mode 100644 tikzit/src/osx/TikzSourceController.h delete mode 100644 tikzit/src/osx/TikzSourceController.m delete mode 100644 tikzit/src/osx/TikzWindowController.h delete mode 100644 tikzit/src/osx/TikzWindowController.m delete mode 100644 tikzit/src/osx/ToolPaletteController.h delete mode 100644 tikzit/src/osx/ToolPaletteController.m delete mode 100644 tikzit/src/osx/UpdatePreferenceController.h delete mode 100644 tikzit/src/osx/UpdatePreferenceController.m delete mode 100644 tikzit/src/osx/UpdatePreferencePanel.xib delete mode 100644 tikzit/src/osx/main.m delete mode 100644 tikzit/src/osx/test/main.m delete mode 100644 tikzit/src/osx/test/osx.m delete mode 100644 tikzit/src/tikzit.rc delete mode 100644 tikzit/text-x-generic.png delete mode 100644 tikzit/text-x-script.png delete mode 100644 tikzit/tikzit.icns delete mode 100644 tikzit/tikzit.ico delete mode 100644 tikzit/tikzit.spec delete mode 100644 tikzit/tikzit48x48.png delete mode 100644 tikzit/tikzit_dsa_pub.pem delete mode 100644 tikzit/tikzitdoc.icns delete mode 100644 tikzit/transform-crop-and-resize.png delete mode 100644 tikzit/transform-move.png delete mode 100755 tikzit/updates.png diff --git a/tikzit-1/.gitignore b/tikzit-1/.gitignore new file mode 100644 index 0000000..fc1d580 --- /dev/null +++ b/tikzit-1/.gitignore @@ -0,0 +1,235 @@ +# Previous gitignore items + +*~ +*.swp +*.o +.deps +.dirstamp +Makefile +Makefile.in +/aclocal.m4 +/autom4te.cache +/config.guess +/config.log +/config.status +/config.sub +/configure +/depcomp +/install-sh +/missing +/src/tikzit +/src/tikzit.res +/src/common/tikzlexer.h +/src/common/tikzlexer.m +/src/common/tikzparser.m +/src/common/tikzparser.h +/src/gtk/icondata.m +/src/gtk/logodata.m +/src/gtk/edgedecdata.m +/tikzit-*.tar.gz +/tikzit-*.tar.bz2 +xbuild + +######################### +# .gitignore file for Xcode4 and Xcode5 Source projects +# +# Apple bugs, waiting for Apple to fix/respond: +# +# 15564624 - what does the xccheckout file in Xcode5 do? Where's the documentation? +# +# Version 2.3 +# For latest version, see: http://stackoverflow.com/questions/49478/git-ignore-file-for-xcode-projects +# +# 2014 updates: +# - appended non-standard items DISABLED by default (uncomment if you use those tools) +# - removed the edit that an SO.com moderator made without bothering to ask me +# - researched CocoaPods .lock more carefully, thanks to Gokhan Celiker +# 2013 updates: +# - fixed the broken "save personal Schemes" +# - added line-by-line explanations for EVERYTHING (some were missing) +# +# NB: if you are storing "built" products, this WILL NOT WORK, +# and you should use a different .gitignore (or none at all) +# This file is for SOURCE projects, where there are many extra +# files that we want to exclude +# +######################### + +##### +# OS X temporary files that should never be committed +# +# c.f. http://www.westwind.com/reference/os-x/invisibles.html + +.DS_Store +.Trashes +*.swp + +# +# *.lock - this is used and abused by many editors for many different things. +# For the main ones I use (e.g. Eclipse), it should be excluded +# from source-control, but YMMV. +# (lock files are usually local-only file-synchronization on the local FS that should NOT go in git) +# c.f. the "OPTIONAL" section at bottom though, for tool-specific variations! + +*.lock + + +# +# profile - REMOVED temporarily (on double-checking, I can't find it in OS X docs?) +#profile + + +#### +# Xcode temporary files that should never be committed +# +# NB: NIB/XIB files still exist even on Storyboard projects, so we want this... + +*~.nib + + +#### +# Xcode build files - +# +# NB: slash on the end, so we only remove the FOLDER, not any files that were badly named "DerivedData" + +DerivedData/ + +# NB: slash on the end, so we only remove the FOLDER, not any files that were badly named "build" + +build/ + + +##### +# Xcode private settings (window sizes, bookmarks, breakpoints, custom executables, smart groups) +# +# This is complicated: +# +# SOMETIMES you need to put this file in version control. +# Apple designed it poorly - if you use "custom executables", they are +# saved in this file. +# 99% of projects do NOT use those, so they do NOT want to version control this file. +# ..but if you're in the 1%, comment out the line "*.pbxuser" + +# .pbxuser: http://lists.apple.com/archives/xcode-users/2004/Jan/msg00193.html + +*.pbxuser + +# .mode1v3: http://lists.apple.com/archives/xcode-users/2007/Oct/msg00465.html + +*.mode1v3 + +# .mode2v3: http://lists.apple.com/archives/xcode-users/2007/Oct/msg00465.html + +*.mode2v3 + +# .perspectivev3: http://stackoverflow.com/questions/5223297/xcode-projects-what-is-a-perspectivev3-file + +*.perspectivev3 + +# NB: also, whitelist the default ones, some projects need to use these +!default.pbxuser +!default.mode1v3 +!default.mode2v3 +!default.perspectivev3 + + +#### +# Xcode 4 - semi-personal settings +# +# +# OPTION 1: --------------------------------- +# throw away ALL personal settings (including custom schemes! +# - unless they are "shared") +# +# NB: this is exclusive with OPTION 2 below +xcuserdata + +# OPTION 2: --------------------------------- +# get rid of ALL personal settings, but KEEP SOME OF THEM +# - NB: you must manually uncomment the bits you want to keep +# +# NB: this *requires* git v1.8.2 or above; you may need to upgrade to latest OS X, +# or manually install git over the top of the OS X version +# NB: this is exclusive with OPTION 1 above +# +#xcuserdata/**/* + +# (requires option 2 above): Personal Schemes +# +#!xcuserdata/**/xcschemes/* + +#### +# XCode 4 workspaces - more detailed +# +# Workspaces are important! They are a core feature of Xcode - don't exclude them :) +# +# Workspace layout is quite spammy. For reference: +# +# /(root)/ +# /(project-name).xcodeproj/ +# project.pbxproj +# /project.xcworkspace/ +# contents.xcworkspacedata +# /xcuserdata/ +# /(your name)/xcuserdatad/ +# UserInterfaceState.xcuserstate +# /xcsshareddata/ +# /xcschemes/ +# (shared scheme name).xcscheme +# /xcuserdata/ +# /(your name)/xcuserdatad/ +# (private scheme).xcscheme +# xcschememanagement.plist +# +# + +#### +# Xcode 4 - Deprecated classes +# +# Allegedly, if you manually "deprecate" your classes, they get moved here. +# +# We're using source-control, so this is a "feature" that we do not want! + +*.moved-aside + +#### +# OPTIONAL: Some well-known tools that people use side-by-side with Xcode / iOS development +# +# NB: I'd rather not include these here, but gitignore's design is weak and doesn't allow +# modular gitignore: you have to put EVERYTHING in one file. +# +# COCOAPODS: +# +# c.f. http://guides.cocoapods.org/using/using-cocoapods.html#what-is-a-podfilelock +# c.f. http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control +# +#!Podfile.lock +# +# RUBY: +# +# c.f. http://yehudakatz.com/2010/12/16/clarifying-the-roles-of-the-gemspec-and-gemfile/ +# +#!Gemfile.lock +# +# IDEA: +# +#.idea +# +# TEXTMATE: +# +# -- UNVERIFIED: c.f. http://stackoverflow.com/a/50283/153422 +# +#tm_build_errors + +#### +# UNKNOWN: recommended by others, but I can't discover what these files are +# +# Community suggestions (unverified, no evidence available - DISABLED by default) +# +# 1. Xcode 5 - VCS file +# +# "The data in this file not represent state of your project. +# If you'll leave this file in git - you will have merge conflicts during +# pull your cahnges to other's repo" +# +#*.xccheckout \ No newline at end of file diff --git a/tikzit-1/AH_latex_head.png b/tikzit-1/AH_latex_head.png new file mode 100644 index 0000000..b25cf6d Binary files /dev/null and b/tikzit-1/AH_latex_head.png differ diff --git a/tikzit-1/AH_latex_tail.png b/tikzit-1/AH_latex_tail.png new file mode 100644 index 0000000..0825cda Binary files /dev/null and b/tikzit-1/AH_latex_tail.png differ diff --git a/tikzit-1/AH_none.png b/tikzit-1/AH_none.png new file mode 100644 index 0000000..6322374 Binary files /dev/null and b/tikzit-1/AH_none.png differ diff --git a/tikzit-1/AH_plain_head.png b/tikzit-1/AH_plain_head.png new file mode 100644 index 0000000..8a398fa Binary files /dev/null and b/tikzit-1/AH_plain_head.png differ diff --git a/tikzit-1/AH_plain_tail.png b/tikzit-1/AH_plain_tail.png new file mode 100644 index 0000000..45b1876 Binary files /dev/null and b/tikzit-1/AH_plain_tail.png differ diff --git a/tikzit-1/COPYING b/tikzit-1/COPYING new file mode 100644 index 0000000..1f963da --- /dev/null +++ b/tikzit-1/COPYING @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. + diff --git a/tikzit-1/DESIGN-GTK b/tikzit-1/DESIGN-GTK new file mode 100644 index 0000000..7952a34 --- /dev/null +++ b/tikzit-1/DESIGN-GTK @@ -0,0 +1,23 @@ +Some documentation on how the GTK+ port is designed. + +State classes: + +StyleManager keeps track of what user-defined styles the application +knows about, and which one is currently "active". The active style +is used when creating new nodes. + +Preambles keeps track of the preambles used for previews. + + +GUI classes: + +MainWindow is the core class that manages the application as a whole. +It manages the main GtkWindow and is generally responsible for loading +the various UI elements. It also keeps track of the main application +configuration file, the user-defined styles (via StyleManager) and the +custom preambles (via Preambles). + +The Menu class manages the menu and toolbar for MainWindow. It uses +GtkUiManager to load these from an XML description, and deals with the +GTK+ callbacks for the various actions. + diff --git a/tikzit-1/ED_arrow.png b/tikzit-1/ED_arrow.png new file mode 100644 index 0000000..153d2e1 Binary files /dev/null and b/tikzit-1/ED_arrow.png differ diff --git a/tikzit-1/ED_none.png b/tikzit-1/ED_none.png new file mode 100644 index 0000000..f95140c Binary files /dev/null and b/tikzit-1/ED_none.png differ diff --git a/tikzit-1/ED_tick.png b/tikzit-1/ED_tick.png new file mode 100644 index 0000000..a3882fe Binary files /dev/null and b/tikzit-1/ED_tick.png differ diff --git a/tikzit-1/English.lproj/Credits.rtf b/tikzit-1/English.lproj/Credits.rtf new file mode 100644 index 0000000..708d138 --- /dev/null +++ b/tikzit-1/English.lproj/Credits.rtf @@ -0,0 +1,18 @@ +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf250 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fnil\fcharset0 LucidaSans-Typewriter;} +{\colortbl;\red255\green255\blue255;\red0\green0\blue0;} +\vieww9000\viewh8400\viewkind0 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural + +\f0\b\fs24 \cf0 TikZiT\ +\ +Copyright 2010 Aleks Kissinger. All rights reserved.\ + +\b0 \ +\pard\tx560\pardeftab560\ql\qnatural\pardirnatural + +\f1\fs22 \cf2 \CocoaLigature0 TikZiT is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\ +\ +TikZiT is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\ +\ +You should have received a copy of the GNU General Public License along with TikZiT. If not, see .} \ No newline at end of file diff --git a/tikzit-1/English.lproj/CustomNodes.xib b/tikzit-1/English.lproj/CustomNodes.xib new file mode 100644 index 0000000..33f6e3a --- /dev/null +++ b/tikzit-1/English.lproj/CustomNodes.xib @@ -0,0 +1,256 @@ + + + + + + + + + + + + + + + + + + + + name + strokeThickness + strokeColor + fillColor + strokeColorIsKnown + fillColorIsKnown + representedObject.name + shapeName + scale + @distinctUnionOfObjects.category + category + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \begin{tikzpicture} + +\end{tikzpicture} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tikzit-1/English.lproj/InfoPlist.strings b/tikzit-1/English.lproj/InfoPlist.strings new file mode 100644 index 0000000..477b28f --- /dev/null +++ b/tikzit-1/English.lproj/InfoPlist.strings @@ -0,0 +1,2 @@ +/* Localized versions of Info.plist keys */ + diff --git a/tikzit-1/English.lproj/MainMenu.xib b/tikzit-1/English.lproj/MainMenu.xib new file mode 100644 index 0000000..c7f22d7 --- /dev/null +++ b/tikzit-1/English.lproj/MainMenu.xib @@ -0,0 +1,453 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +CA + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tikzit-1/English.lproj/Preamble.xib b/tikzit-1/English.lproj/Preamble.xib new file mode 100644 index 0000000..54a4125 --- /dev/null +++ b/tikzit-1/English.lproj/Preamble.xib @@ -0,0 +1,235 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + key + + + default + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tikzit-1/English.lproj/Preview.xib b/tikzit-1/English.lproj/Preview.xib new file mode 100644 index 0000000..cb1e82c --- /dev/null +++ b/tikzit-1/English.lproj/Preview.xib @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tikzit-1/English.lproj/PropertyInspector.xib b/tikzit-1/English.lproj/PropertyInspector.xib new file mode 100644 index 0000000..9f19b5c --- /dev/null +++ b/tikzit-1/English.lproj/PropertyInspector.xib @@ -0,0 +1,769 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Multiple Values + NilToEmptyStringTransformer + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NilToEmptyStringTransformer + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NilToEmptyStringTransformer + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NilToEmptyStringTransformer + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NilToEmptyStringTransformer + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + key + value + isAtom + + + + + key + value + isAtom + + + + + key + value + isAtom + + + + + key + value + isAtom + + + + + label + + + + + + + + edgeNode + + + + + + + + + + + + + + + + + + + + + + + + + + + NilToEmptyStringTransformer + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tikzit-1/English.lproj/StylePalette.xib b/tikzit-1/English.lproj/StylePalette.xib new file mode 100644 index 0000000..6385ba8 --- /dev/null +++ b/tikzit-1/English.lproj/StylePalette.xib @@ -0,0 +1,631 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + uncategorized + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + uncategorized + + + + + + + + + name + strokeThickness + strokeColor + fillColor + strokeColorIsKnown + fillColorIsKnown + representedObject.name + shapeName + scale + @distinctUnionOfObjects.category + category + + + + + + + + @distinctUnionOfObjects.category + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + uncategorized + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + uncategorized + + + + + + + + + + + name + headStyle + tailStyle + decorationStyle + category + + + + + + + + name + headStyle + tailStyle + decorationStyle + category + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tikzit-1/English.lproj/TikzDocument.xib b/tikzit-1/English.lproj/TikzDocument.xib new file mode 100644 index 0000000..842b810 --- /dev/null +++ b/tikzit-1/English.lproj/TikzDocument.xib @@ -0,0 +1,161 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \begin{tikzpicture} + +\end{tikzpicture} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tikzit-1/English.lproj/UserDefaults.plist b/tikzit-1/English.lproj/UserDefaults.plist new file mode 100644 index 0000000..cdd5c8f --- /dev/null +++ b/tikzit-1/English.lproj/UserDefaults.plist @@ -0,0 +1,10 @@ + + + + + net.sourceforge.tikzit.pdflatexpath + /usr/texbin/pdflatex + net.sourceforge.tikzit.previewfocus + + + diff --git a/tikzit-1/Frameworks/SFBInspectors.framework/Headers b/tikzit-1/Frameworks/SFBInspectors.framework/Headers new file mode 120000 index 0000000..a177d2a --- /dev/null +++ b/tikzit-1/Frameworks/SFBInspectors.framework/Headers @@ -0,0 +1 @@ +Versions/Current/Headers \ No newline at end of file diff --git a/tikzit-1/Frameworks/SFBInspectors.framework/Resources b/tikzit-1/Frameworks/SFBInspectors.framework/Resources new file mode 120000 index 0000000..953ee36 --- /dev/null +++ b/tikzit-1/Frameworks/SFBInspectors.framework/Resources @@ -0,0 +1 @@ +Versions/Current/Resources \ No newline at end of file diff --git a/tikzit-1/Frameworks/SFBInspectors.framework/SFBInspectors b/tikzit-1/Frameworks/SFBInspectors.framework/SFBInspectors new file mode 120000 index 0000000..d0c5a0b --- /dev/null +++ b/tikzit-1/Frameworks/SFBInspectors.framework/SFBInspectors @@ -0,0 +1 @@ +Versions/Current/SFBInspectors \ No newline at end of file diff --git a/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPane.h b/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPane.h new file mode 100644 index 0000000..b50c12d --- /dev/null +++ b/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPane.h @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2009 Stephen F. Booth + * All Rights Reserved + */ + +#import + +#define INSPECTOR_PANE_HEADER_HEIGHT 17 + +@class SFBInspectorPaneHeader, SFBInspectorPaneBody; + +@interface SFBInspectorPane : NSView +{ +@private + BOOL _collapsed; + SFBInspectorPaneHeader *_headerView; + SFBInspectorPaneBody *_bodyView; +} + +@property (readonly, assign, getter=isCollapsed) BOOL collapsed; + +- (NSString *) title; +- (void) setTitle:(NSString *)title; + +- (IBAction) toggleCollapsed:(id)sender; +- (void) setCollapsed:(BOOL)collapsed animate:(BOOL)animate; + +- (SFBInspectorPaneHeader *) headerView; +- (SFBInspectorPaneBody *) bodyView; + +@end diff --git a/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPaneBody.h b/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPaneBody.h new file mode 100644 index 0000000..250f9e6 --- /dev/null +++ b/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPaneBody.h @@ -0,0 +1,16 @@ +/* + * Copyright (C) 2009 Stephen F. Booth + * All Rights Reserved + */ + +#import + +@interface SFBInspectorPaneBody : NSView +{ +@private + CGFloat _normalHeight; +} + +@property (readonly, assign) CGFloat normalHeight; + +@end diff --git a/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPaneHeader.h b/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPaneHeader.h new file mode 100644 index 0000000..3512d75 --- /dev/null +++ b/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPaneHeader.h @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2009 Stephen F. Booth + * All Rights Reserved + */ + +#import + +@class SFBInspectorPane; + +@interface SFBInspectorPaneHeader : NSView +{ +@private + BOOL _pressed; + NSButton *_disclosureButton; + NSTextField *_titleTextField; +} + +- (NSString *) title; +- (void) setTitle:(NSString *)title; + +- (NSButton *) disclosureButton; +- (NSTextField *) titleTextField; + +@end diff --git a/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorView.h b/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorView.h new file mode 100644 index 0000000..e7f4b53 --- /dev/null +++ b/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorView.h @@ -0,0 +1,17 @@ +/* + * Copyright (C) 2009 Stephen F. Booth + * All Rights Reserved + */ + +#import + +@interface SFBInspectorView : NSView +{ +@private + NSSize _initialWindowSize; +} + +- (void) addInspectorPaneController:(NSViewController *)paneController; +- (void) addInspectorPane:(NSView *)paneBody title:(NSString *)title; + +@end diff --git a/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelector.h b/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelector.h new file mode 100644 index 0000000..8645914 --- /dev/null +++ b/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelector.h @@ -0,0 +1,22 @@ +/* + * Copyright (C) 2009 Stephen F. Booth + * All Rights Reserved + */ + +#import + +#define VIEW_SELECTOR_BAR_HEIGHT 25 + +@class SFBViewSelectorBar; + +@interface SFBViewSelector : NSView +{ +@private + NSSize _initialWindowSize; + SFBViewSelectorBar *_selectorBar; + NSView *_bodyView; +} + +- (SFBViewSelectorBar *) selectorBar; + +@end diff --git a/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelectorBar.h b/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelectorBar.h new file mode 100644 index 0000000..d0c8c30 --- /dev/null +++ b/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelectorBar.h @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2009 Stephen F. Booth + * All Rights Reserved + */ + +#import + +@class SFBViewSelectorBarItem; + +@interface SFBViewSelectorBar : NSView +{ +@private + NSInteger _selectedIndex; + NSInteger _pressedIndex; + NSMutableArray *_items; +} + +@property (assign) NSInteger selectedIndex; +@property (readonly) SFBViewSelectorBarItem * selectedItem; + +- (void) addItem:(SFBViewSelectorBarItem *)item; + +- (BOOL) selectItem:(SFBViewSelectorBarItem *)item; +- (BOOL) selectItemWithIdentifer:(NSString *)itemIdentifier; + +- (SFBViewSelectorBarItem *) itemAtIndex:(NSInteger)itemIndex; +- (SFBViewSelectorBarItem *) itemWithIdentifier:(NSString *)itemIdentifier; + +@end diff --git a/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelectorBarItem.h b/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelectorBarItem.h new file mode 100644 index 0000000..c18cfb3 --- /dev/null +++ b/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelectorBarItem.h @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2009 Stephen F. Booth + * All Rights Reserved + */ + +#import + +@interface SFBViewSelectorBarItem : NSObject +{ +@private + NSString *_identifier; + NSString *_label; + NSString *_tooltip; + NSImage *_image; + NSView *_view; +} + +@property (copy) NSString * identifier; +@property (copy) NSString * label; +@property (copy) NSString * tooltip; +@property (copy) NSImage * image; +@property (retain) NSView * view; + ++ (id) itemWithIdentifier:(NSString *)identifier label:(NSString *)label tooltip:(NSString *)tooltip image:(NSImage *)image view:(NSView *)view; + +- (id) initWithIdentifier:(NSString *)identifier label:(NSString *)label tooltip:(NSString *)tooltip image:(NSImage *)image view:(NSView *)view; + +@end diff --git a/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Resources/English.lproj/InfoPlist.strings b/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Resources/English.lproj/InfoPlist.strings new file mode 100644 index 0000000..dea12de Binary files /dev/null and b/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Resources/English.lproj/InfoPlist.strings differ diff --git a/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Resources/Info.plist b/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Resources/Info.plist new file mode 100644 index 0000000..d3e80f3 --- /dev/null +++ b/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Resources/Info.plist @@ -0,0 +1,24 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + SFBInspectors + CFBundleIdentifier + org.sbooth.Inspectors + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + SFBInspectors + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1 + + diff --git a/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/SFBInspectors b/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/SFBInspectors new file mode 100755 index 0000000..6174fbb Binary files /dev/null and b/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/SFBInspectors differ diff --git a/tikzit-1/Frameworks/SFBInspectors.framework/Versions/Current b/tikzit-1/Frameworks/SFBInspectors.framework/Versions/Current new file mode 120000 index 0000000..8c7e5a6 --- /dev/null +++ b/tikzit-1/Frameworks/SFBInspectors.framework/Versions/Current @@ -0,0 +1 @@ +A \ No newline at end of file diff --git a/tikzit-1/Frameworks/Sparkle.framework/Headers b/tikzit-1/Frameworks/Sparkle.framework/Headers new file mode 120000 index 0000000..a177d2a --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Headers @@ -0,0 +1 @@ +Versions/Current/Headers \ No newline at end of file diff --git a/tikzit-1/Frameworks/Sparkle.framework/Resources b/tikzit-1/Frameworks/Sparkle.framework/Resources new file mode 120000 index 0000000..953ee36 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Resources @@ -0,0 +1 @@ +Versions/Current/Resources \ No newline at end of file diff --git a/tikzit-1/Frameworks/Sparkle.framework/Sparkle b/tikzit-1/Frameworks/Sparkle.framework/Sparkle new file mode 120000 index 0000000..b2c5273 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Sparkle @@ -0,0 +1 @@ +Versions/Current/Sparkle \ No newline at end of file diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcast.h b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcast.h new file mode 100644 index 0000000..171148a --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcast.h @@ -0,0 +1,33 @@ +// +// SUAppcast.h +// Sparkle +// +// Created by Andy Matuschak on 3/12/06. +// Copyright 2006 Andy Matuschak. All rights reserved. +// + +#ifndef SUAPPCAST_H +#define SUAPPCAST_H + +@class SUAppcastItem; +@interface SUAppcast : NSObject { + NSArray *items; + NSString *userAgentString; + id delegate; + NSMutableData *incrementalData; +} + +- (void)fetchAppcastFromURL:(NSURL *)url; +- (void)setDelegate:delegate; +- (void)setUserAgentString:(NSString *)userAgentString; + +- (NSArray *)items; + +@end + +@interface NSObject (SUAppcastDelegate) +- (void)appcastDidFinishLoading:(SUAppcast *)appcast; +- (void)appcast:(SUAppcast *)appcast failedToLoadWithError:(NSError *)error; +@end + +#endif diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h new file mode 100644 index 0000000..7f1ca65 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h @@ -0,0 +1,47 @@ +// +// SUAppcastItem.h +// Sparkle +// +// Created by Andy Matuschak on 3/12/06. +// Copyright 2006 Andy Matuschak. All rights reserved. +// + +#ifndef SUAPPCASTITEM_H +#define SUAPPCASTITEM_H + +@interface SUAppcastItem : NSObject { + NSString *title; + NSDate *date; + NSString *itemDescription; + + NSURL *releaseNotesURL; + + NSString *DSASignature; + NSString *minimumSystemVersion; + + NSURL *fileURL; + NSString *versionString; + NSString *displayVersionString; + + NSDictionary *propertiesDictionary; +} + +// Initializes with data from a dictionary provided by the RSS class. +- initWithDictionary:(NSDictionary *)dict; + +- (NSString *)title; +- (NSString *)versionString; +- (NSString *)displayVersionString; +- (NSDate *)date; +- (NSString *)itemDescription; +- (NSURL *)releaseNotesURL; +- (NSURL *)fileURL; +- (NSString *)DSASignature; +- (NSString *)minimumSystemVersion; + +// Returns the dictionary provided in initWithDictionary; this might be useful later for extensions. +- (NSDictionary *)propertiesDictionary; + +@end + +#endif diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Headers/SUUpdater.h b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Headers/SUUpdater.h new file mode 100644 index 0000000..e78c4d3 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Headers/SUUpdater.h @@ -0,0 +1,118 @@ +// +// SUUpdater.h +// Sparkle +// +// Created by Andy Matuschak on 1/4/06. +// Copyright 2006 Andy Matuschak. All rights reserved. +// + +#ifndef SUUPDATER_H +#define SUUPDATER_H + +#import + +@class SUUpdateDriver, SUAppcastItem, SUHost, SUAppcast; +@interface SUUpdater : NSObject { + NSTimer *checkTimer; + SUUpdateDriver *driver; + + SUHost *host; + IBOutlet id delegate; +} + ++ (SUUpdater *)sharedUpdater; ++ (SUUpdater *)updaterForBundle:(NSBundle *)bundle; +- (NSBundle *)hostBundle; + +- (void)setDelegate:(id)delegate; +- delegate; + +- (void)setAutomaticallyChecksForUpdates:(BOOL)automaticallyChecks; +- (BOOL)automaticallyChecksForUpdates; + +- (void)setUpdateCheckInterval:(NSTimeInterval)interval; +- (NSTimeInterval)updateCheckInterval; + +- (void)setFeedURL:(NSURL *)feedURL; +- (NSURL *)feedURL; + +- (void)setSendsSystemProfile:(BOOL)sendsSystemProfile; +- (BOOL)sendsSystemProfile; + +- (void)setAutomaticallyDownloadsUpdates:(BOOL)automaticallyDownloadsUpdates; +- (BOOL)automaticallyDownloadsUpdates; + +// This IBAction is meant for a main menu item. Hook up any menu item to this action, +// and Sparkle will check for updates and report back its findings verbosely. +- (IBAction)checkForUpdates:sender; + +// This kicks off an update meant to be programmatically initiated. That is, it will display no UI unless it actually finds an update, +// in which case it proceeds as usual. If the fully automated updating is turned on, however, this will invoke that behavior, and if an +// update is found, it will be downloaded and prepped for installation. +- (void)checkForUpdatesInBackground; + +// Date of last update check. Returns null if no check has been performed. +- (NSDate*)lastUpdateCheckDate; + +// This begins a "probing" check for updates which will not actually offer to update to that version. The delegate methods, though, +// (up to updater:didFindValidUpdate: and updaterDidNotFindUpdate:), are called, so you can use that information in your UI. +- (void)checkForUpdateInformation; + +// Call this to appropriately schedule or cancel the update checking timer according to the preferences for time interval and automatic checks. This call does not change the date of the next check, but only the internal NSTimer. +- (void)resetUpdateCycle; + +- (BOOL)updateInProgress; +@end + +@interface NSObject (SUUpdaterDelegateInformalProtocol) +// This method allows you to add extra parameters to the appcast URL, potentially based on whether or not Sparkle will also be sending along the system profile. This method should return an array of dictionaries with keys: "key", "value", "displayKey", "displayValue", the latter two being specifically for display to the user. +- (NSArray *)feedParametersForUpdater:(SUUpdater *)updater sendingSystemProfile:(BOOL)sendingProfile; + +// Use this to override the default behavior for Sparkle prompting the user about automatic update checks. +- (BOOL)updaterShouldPromptForPermissionToCheckForUpdates:(SUUpdater *)bundle; + +// Implement this if you want to do some special handling with the appcast once it finishes loading. +- (void)updater:(SUUpdater *)updater didFinishLoadingAppcast:(SUAppcast *)appcast; + +// If you're using special logic or extensions in your appcast, implement this to use your own logic for finding +// a valid update, if any, in the given appcast. +- (SUAppcastItem *)bestValidUpdateInAppcast:(SUAppcast *)appcast forUpdater:(SUUpdater *)bundle; + +// Sent when a valid update is found by the update driver. +- (void)updater:(SUUpdater *)updater didFindValidUpdate:(SUAppcastItem *)update; + +// Sent when a valid update is not found. +- (void)updaterDidNotFindUpdate:(SUUpdater *)update; + +// Sent immediately before installing the specified update. +- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)update; + +// Return YES to delay the relaunch until you do some processing; invoke the given NSInvocation to continue. +- (BOOL)updater:(SUUpdater *)updater shouldPostponeRelaunchForUpdate:(SUAppcastItem *)update untilInvoking:(NSInvocation *)invocation; + +// Called immediately before relaunching. +- (void)updaterWillRelaunchApplication:(SUUpdater *)updater; + +// This method allows you to provide a custom version comparator. +// If you don't implement this method or return nil, the standard version comparator will be used. +- (id )versionComparatorForUpdater:(SUUpdater *)updater; + +// Returns the path which is used to relaunch the client after the update is installed. By default, the path of the host bundle. +- (NSString *)pathToRelaunchForUpdater:(SUUpdater *)updater; + +@end + +// Define some minimum intervals to avoid DOS-like checking attacks. These are in seconds. +#ifdef DEBUG +#define SU_MIN_CHECK_INTERVAL 60 +#else +#define SU_MIN_CHECK_INTERVAL 60*60 +#endif + +#ifdef DEBUG +#define SU_DEFAULT_CHECK_INTERVAL 60 +#else +#define SU_DEFAULT_CHECK_INTERVAL 60*60*24 +#endif + +#endif diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h new file mode 100644 index 0000000..3d11ae8 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h @@ -0,0 +1,27 @@ +// +// SUVersionComparisonProtocol.h +// Sparkle +// +// Created by Andy Matuschak on 12/21/07. +// Copyright 2007 Andy Matuschak. All rights reserved. +// + +#ifndef SUVERSIONCOMPARISONPROTOCOL_H +#define SUVERSIONCOMPARISONPROTOCOL_H + +/*! + @protocol + @abstract Implement this protocol to provide version comparison facilities for Sparkle. +*/ +@protocol SUVersionComparison + +/*! + @method + @abstract An abstract method to compare two version strings. + @discussion Should return NSOrderedAscending if b > a, NSOrderedDescending if b < a, and NSOrderedSame if they are equivalent. +*/ +- (NSComparisonResult)compareVersion:(NSString *)versionA toVersion:(NSString *)versionB; + +@end + +#endif diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Headers/Sparkle.h b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Headers/Sparkle.h new file mode 100644 index 0000000..08dd577 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Headers/Sparkle.h @@ -0,0 +1,21 @@ +// +// Sparkle.h +// Sparkle +// +// Created by Andy Matuschak on 3/16/06. (Modified by CDHW on 23/12/07) +// Copyright 2006 Andy Matuschak. All rights reserved. +// + +#ifndef SPARKLE_H +#define SPARKLE_H + +// This list should include the shared headers. It doesn't matter if some of them aren't shared (unless +// there are name-space collisions) so we can list all of them to start with: + +#import + +#import +#import +#import + +#endif diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/Info.plist b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/Info.plist new file mode 100644 index 0000000..c7f277d --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/Info.plist @@ -0,0 +1,24 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + Sparkle + CFBundleIdentifier + org.andymatuschak.Sparkle + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + Sparkle + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.5 Beta 6 + CFBundleSignature + ???? + CFBundleVersion + 313 + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/License.txt b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/License.txt new file mode 100644 index 0000000..20466c4 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/License.txt @@ -0,0 +1,7 @@ +Copyright (c) 2006 Andy Matuschak + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/SUModelTranslation.plist b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/SUModelTranslation.plist new file mode 100644 index 0000000..92ef947 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/SUModelTranslation.plist @@ -0,0 +1,174 @@ + + + + + ADP2,1 + Developer Transition Kit + MacBook1,1 + MacBook (Core Duo) + MacBook2,1 + MacBook (Core 2 Duo) + MacBook4,1 + MacBook (Core 2 Duo Feb 2008) + MacBookAir1,1 + MacBook Air (January 2008) + MacBookPro1,1 + MacBook Pro Core Duo (15-inch) + MacBookPro1,2 + MacBook Pro Core Duo (17-inch) + MacBookPro2,1 + MacBook Pro Core 2 Duo (17-inch) + MacBookPro2,2 + MacBook Pro Core 2 Duo (15-inch) + MacBookPro3,1 + MacBook Pro Core 2 Duo (15-inch LED, Core 2 Duo) + MacBookPro3,2 + MacBook Pro Core 2 Duo (17-inch HD, Core 2 Duo) + MacBookPro4,1 + MacBook Pro (Core 2 Duo Feb 2008) + MacPro1,1 + Mac Pro (four-core) + MacPro2,1 + Mac Pro (eight-core) + MacPro3,1 + Mac Pro (January 2008 4- or 8- core "Harpertown") + Macmini1,1 + Mac Mini (Core Solo/Duo) + PowerBook1,1 + PowerBook G3 + PowerBook2,1 + iBook G3 + PowerBook2,2 + iBook G3 (FireWire) + PowerBook2,3 + iBook G3 + PowerBook2,4 + iBook G3 + PowerBook3,1 + PowerBook G3 (FireWire) + PowerBook3,2 + PowerBook G4 + PowerBook3,3 + PowerBook G4 (Gigabit Ethernet) + PowerBook3,4 + PowerBook G4 (DVI) + PowerBook3,5 + PowerBook G4 (1GHz / 867MHz) + PowerBook4,1 + iBook G3 (Dual USB, Late 2001) + PowerBook4,2 + iBook G3 (16MB VRAM) + PowerBook4,3 + iBook G3 Opaque 16MB VRAM, 32MB VRAM, Early 2003) + PowerBook5,1 + PowerBook G4 (17 inch) + PowerBook5,2 + PowerBook G4 (15 inch FW 800) + PowerBook5,3 + PowerBook G4 (17-inch 1.33GHz) + PowerBook5,4 + PowerBook G4 (15 inch 1.5/1.33GHz) + PowerBook5,5 + PowerBook G4 (17-inch 1.5GHz) + PowerBook5,6 + PowerBook G4 (15 inch 1.67GHz/1.5GHz) + PowerBook5,7 + PowerBook G4 (17-inch 1.67GHz) + PowerBook5,8 + PowerBook G4 (Double layer SD, 15 inch) + PowerBook5,9 + PowerBook G4 (Double layer SD, 17 inch) + PowerBook6,1 + PowerBook G4 (12 inch) + PowerBook6,2 + PowerBook G4 (12 inch, DVI) + PowerBook6,3 + iBook G4 + PowerBook6,4 + PowerBook G4 (12 inch 1.33GHz) + PowerBook6,5 + iBook G4 (Early-Late 2004) + PowerBook6,7 + iBook G4 (Mid 2005) + PowerBook6,8 + PowerBook G4 (12 inch 1.5GHz) + PowerMac1,1 + Power Macintosh G3 (Blue & White) + PowerMac1,2 + Power Macintosh G4 (PCI Graphics) + PowerMac10,1 + Mac Mini G4 + PowerMac10,2 + Mac Mini (Late 2005) + PowerMac11,2 + Power Macintosh G5 (Late 2005) + PowerMac12,1 + iMac G5 (iSight) + PowerMac2,1 + iMac G3 (Slot-loading CD-ROM) + PowerMac2,2 + iMac G3 (Summer 2000) + PowerMac3,1 + Power Macintosh G4 (AGP Graphics) + PowerMac3,2 + Power Macintosh G4 (AGP Graphics) + PowerMac3,3 + Power Macintosh G4 (Gigabit Ethernet) + PowerMac3,4 + Power Macintosh G4 (Digital Audio) + PowerMac3,5 + Power Macintosh G4 (Quick Silver) + PowerMac3,6 + Power Macintosh G4 (Mirrored Drive Door) + PowerMac4,1 + iMac G3 (Early/Summer 2001) + PowerMac4,2 + iMac G4 (Flat Panel) + PowerMac4,4 + eMac + PowerMac4,5 + iMac G4 (17-inch Flat Panel) + PowerMac5,1 + Power Macintosh G4 Cube + PowerMac6,1 + iMac G4 (USB 2.0) + PowerMac6,3 + iMac G4 (20-inch Flat Panel) + PowerMac6,4 + eMac (USB 2.0, 2005) + PowerMac7,2 + Power Macintosh G5 + PowerMac7,3 + Power Macintosh G5 + PowerMac8,1 + iMac G5 + PowerMac8,2 + iMac G5 (Ambient Light Sensor) + PowerMac9,1 + Power Macintosh G5 (Late 2005) + RackMac1,1 + Xserve G4 + RackMac1,2 + Xserve G4 (slot-loading, cluster node) + RackMac3,1 + Xserve G5 + Xserve1,1 + Xserve (Intel Xeon) + Xserve2,1 + Xserve (January 2008 quad-core) + iMac1,1 + iMac G3 (Rev A-D) + iMac4,1 + iMac (Core Duo) + iMac4,2 + iMac for Education (17-inch, Core Duo) + iMac5,1 + iMac (Core 2 Duo, 17 or 20 inch, SuperDrive) + iMac5,2 + iMac (Core 2 Duo, 17 inch, Combo Drive) + iMac6,1 + iMac (Core 2 Duo, 24 inch, SuperDrive) + iMac8,1 + iMac (April 2008) + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/classes.nib new file mode 100644 index 0000000..22f13f8 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/classes.nib @@ -0,0 +1,56 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + CLASS + NSApplication + LANGUAGE + ObjC + SUPERCLASS + NSResponder + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + CLASS + SUStatusController + LANGUAGE + ObjC + OUTLETS + + actionButton + NSButton + progressBar + NSProgressIndicator + + SUPERCLASS + SUWindowController + + + IBVersion + 1 + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/info.nib new file mode 100644 index 0000000..a9ac867 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 670 + IBLastKnownRelativeProjectPath + Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 6 + + IBSystem Version + 10A96 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/keyedobjects.nib new file mode 100644 index 0000000..4f1d598 Binary files /dev/null and b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/keyedobjects.nib differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/classes.nib new file mode 100644 index 0000000..4b1ab30 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/classes.nib @@ -0,0 +1,50 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + doNotInstall + id + installLater + id + installNow + id + + CLASS + SUAutomaticUpdateAlert + LANGUAGE + ObjC + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/info.nib new file mode 100644 index 0000000..2e04cfa --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 667 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 6 + + IBSystem Version + 9D34 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 0000000..6b92630 Binary files /dev/null and b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/classes.nib new file mode 100644 index 0000000..994d4c3 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/classes.nib @@ -0,0 +1,67 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + CLASS + NSApplication + LANGUAGE + ObjC + SUPERCLASS + NSResponder + + + ACTIONS + + installUpdate + id + remindMeLater + id + skipThisVersion + id + + CLASS + SUUpdateAlert + LANGUAGE + ObjC + OUTLETS + + delegate + id + description + NSTextField + releaseNotesView + WebView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/info.nib new file mode 100644 index 0000000..2e04cfa --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 667 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 6 + + IBSystem Version + 9D34 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 0000000..b4353d2 Binary files /dev/null and b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/keyedobjects.nib differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/classes.nib new file mode 100644 index 0000000..5220a22 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/classes.nib @@ -0,0 +1,59 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + finishPrompt + id + toggleMoreInfo + id + + CLASS + SUUpdatePermissionPrompt + LANGUAGE + ObjC + OUTLETS + + delegate + id + descriptionTextField + NSTextField + moreInfoButton + NSButton + moreInfoView + NSView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/info.nib new file mode 100644 index 0000000..2e04cfa --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 667 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 6 + + IBSystem Version + 9D34 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib new file mode 100644 index 0000000..b403a3e Binary files /dev/null and b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings new file mode 100644 index 0000000..b31f928 Binary files /dev/null and b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/classes.nib new file mode 100644 index 0000000..4b1ab30 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/classes.nib @@ -0,0 +1,50 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + doNotInstall + id + installLater + id + installNow + id + + CLASS + SUAutomaticUpdateAlert + LANGUAGE + ObjC + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/info.nib new file mode 100644 index 0000000..ab36d31 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 658 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 6 + + IBSystem Version + 9C7010 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 0000000..7630390 Binary files /dev/null and b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/classes.nib new file mode 100644 index 0000000..994d4c3 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/classes.nib @@ -0,0 +1,67 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + CLASS + NSApplication + LANGUAGE + ObjC + SUPERCLASS + NSResponder + + + ACTIONS + + installUpdate + id + remindMeLater + id + skipThisVersion + id + + CLASS + SUUpdateAlert + LANGUAGE + ObjC + OUTLETS + + delegate + id + description + NSTextField + releaseNotesView + WebView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/info.nib new file mode 100644 index 0000000..2fb8a83 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 670 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 18 + + IBSystem Version + 10A96 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 0000000..e7e7497 Binary files /dev/null and b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/keyedobjects.nib differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/classes.nib new file mode 100644 index 0000000..5220a22 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/classes.nib @@ -0,0 +1,59 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + finishPrompt + id + toggleMoreInfo + id + + CLASS + SUUpdatePermissionPrompt + LANGUAGE + ObjC + OUTLETS + + delegate + id + descriptionTextField + NSTextField + moreInfoButton + NSButton + moreInfoView + NSView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/info.nib new file mode 100644 index 0000000..b1cd28e --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/info.nib @@ -0,0 +1,21 @@ + + + + + IBFramework Version + 670 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 6 + 41 + + IBSystem Version + 10A96 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib new file mode 100644 index 0000000..e8dc5b8 Binary files /dev/null and b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/Sparkle.strings b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/Sparkle.strings new file mode 100644 index 0000000..16e0787 Binary files /dev/null and b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/Sparkle.strings differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/classes.nib new file mode 100644 index 0000000..4b1ab30 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/classes.nib @@ -0,0 +1,50 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + doNotInstall + id + installLater + id + installNow + id + + CLASS + SUAutomaticUpdateAlert + LANGUAGE + ObjC + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/info.nib new file mode 100644 index 0000000..2e04cfa --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 667 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 6 + + IBSystem Version + 9D34 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 0000000..6b2f938 Binary files /dev/null and b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/classes.nib new file mode 100644 index 0000000..994d4c3 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/classes.nib @@ -0,0 +1,67 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + CLASS + NSApplication + LANGUAGE + ObjC + SUPERCLASS + NSResponder + + + ACTIONS + + installUpdate + id + remindMeLater + id + skipThisVersion + id + + CLASS + SUUpdateAlert + LANGUAGE + ObjC + OUTLETS + + delegate + id + description + NSTextField + releaseNotesView + WebView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/info.nib new file mode 100644 index 0000000..2e04cfa --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 667 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 6 + + IBSystem Version + 9D34 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 0000000..c9b1e7d Binary files /dev/null and b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/keyedobjects.nib differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/classes.nib new file mode 100644 index 0000000..5220a22 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/classes.nib @@ -0,0 +1,59 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + finishPrompt + id + toggleMoreInfo + id + + CLASS + SUUpdatePermissionPrompt + LANGUAGE + ObjC + OUTLETS + + delegate + id + descriptionTextField + NSTextField + moreInfoButton + NSButton + moreInfoView + NSView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/info.nib new file mode 100644 index 0000000..3eb7f81 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 667 + IBLastKnownRelativeProjectPath + ../../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 6 + + IBSystem Version + 9D34 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib new file mode 100644 index 0000000..8c54c21 Binary files /dev/null and b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/Sparkle.strings b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/Sparkle.strings new file mode 100644 index 0000000..f83ea23 Binary files /dev/null and b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/Sparkle.strings differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/classes.nib new file mode 100644 index 0000000..4b1ab30 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/classes.nib @@ -0,0 +1,50 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + doNotInstall + id + installLater + id + installNow + id + + CLASS + SUAutomaticUpdateAlert + LANGUAGE + ObjC + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/info.nib new file mode 100644 index 0000000..33a6020 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/info.nib @@ -0,0 +1,16 @@ + + + + + IBFramework Version + 629 + IBOldestOS + 5 + IBOpenObjects + + IBSystem Version + 9D34 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 0000000..4cd529a Binary files /dev/null and b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/classes.nib new file mode 100644 index 0000000..994d4c3 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/classes.nib @@ -0,0 +1,67 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + CLASS + NSApplication + LANGUAGE + ObjC + SUPERCLASS + NSResponder + + + ACTIONS + + installUpdate + id + remindMeLater + id + skipThisVersion + id + + CLASS + SUUpdateAlert + LANGUAGE + ObjC + OUTLETS + + delegate + id + description + NSTextField + releaseNotesView + WebView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/info.nib new file mode 100644 index 0000000..d2586ea --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/info.nib @@ -0,0 +1,16 @@ + + + + + IBFramework Version + 629 + IBOldestOS + 5 + IBOpenObjects + + IBSystem Version + 9E17 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 0000000..65dfc95 Binary files /dev/null and b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/keyedobjects.nib differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/classes.nib new file mode 100644 index 0000000..5220a22 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/classes.nib @@ -0,0 +1,59 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + finishPrompt + id + toggleMoreInfo + id + + CLASS + SUUpdatePermissionPrompt + LANGUAGE + ObjC + OUTLETS + + delegate + id + descriptionTextField + NSTextField + moreInfoButton + NSButton + moreInfoView + NSView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/info.nib new file mode 100644 index 0000000..d2586ea --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/info.nib @@ -0,0 +1,16 @@ + + + + + IBFramework Version + 629 + IBOldestOS + 5 + IBOpenObjects + + IBSystem Version + 9E17 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib new file mode 100644 index 0000000..4b7cc90 Binary files /dev/null and b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/Sparkle.strings b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/Sparkle.strings new file mode 100644 index 0000000..ea175ae Binary files /dev/null and b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/Sparkle.strings differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr_CA.lproj b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr_CA.lproj new file mode 120000 index 0000000..61a7d4e --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr_CA.lproj @@ -0,0 +1 @@ +/Users/andym/Development/Build Products/Release (GC dual-mode; 10.5-only)/Sparkle.framework/Resources/fr.lproj \ No newline at end of file diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/classes.nib new file mode 100644 index 0000000..4b1ab30 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/classes.nib @@ -0,0 +1,50 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + doNotInstall + id + installLater + id + installNow + id + + CLASS + SUAutomaticUpdateAlert + LANGUAGE + ObjC + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/info.nib new file mode 100644 index 0000000..2e04cfa --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 667 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 6 + + IBSystem Version + 9D34 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 0000000..15ba8f4 Binary files /dev/null and b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/classes.nib new file mode 100644 index 0000000..994d4c3 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/classes.nib @@ -0,0 +1,67 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + CLASS + NSApplication + LANGUAGE + ObjC + SUPERCLASS + NSResponder + + + ACTIONS + + installUpdate + id + remindMeLater + id + skipThisVersion + id + + CLASS + SUUpdateAlert + LANGUAGE + ObjC + OUTLETS + + delegate + id + description + NSTextField + releaseNotesView + WebView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/info.nib new file mode 100644 index 0000000..2e04cfa --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 667 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 6 + + IBSystem Version + 9D34 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 0000000..2984064 Binary files /dev/null and b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/keyedobjects.nib differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/classes.nib new file mode 100644 index 0000000..5220a22 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/classes.nib @@ -0,0 +1,59 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + finishPrompt + id + toggleMoreInfo + id + + CLASS + SUUpdatePermissionPrompt + LANGUAGE + ObjC + OUTLETS + + delegate + id + descriptionTextField + NSTextField + moreInfoButton + NSButton + moreInfoView + NSView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/info.nib new file mode 100644 index 0000000..c493485 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 667 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 5 + + IBSystem Version + 9D34 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib new file mode 100644 index 0000000..55cc2c2 Binary files /dev/null and b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/Sparkle.strings b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/Sparkle.strings new file mode 100644 index 0000000..5c410d0 Binary files /dev/null and b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/Sparkle.strings differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/classes.nib new file mode 100644 index 0000000..4b1ab30 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/classes.nib @@ -0,0 +1,50 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + doNotInstall + id + installLater + id + installNow + id + + CLASS + SUAutomaticUpdateAlert + LANGUAGE + ObjC + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/info.nib new file mode 100644 index 0000000..3f09790 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/info.nib @@ -0,0 +1,18 @@ + + + + + IBFramework Version + 629 + IBOldestOS + 5 + IBOpenObjects + + 6 + + IBSystem Version + 9D34 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 0000000..aa38f86 Binary files /dev/null and b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/classes.nib new file mode 100644 index 0000000..994d4c3 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/classes.nib @@ -0,0 +1,67 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + CLASS + NSApplication + LANGUAGE + ObjC + SUPERCLASS + NSResponder + + + ACTIONS + + installUpdate + id + remindMeLater + id + skipThisVersion + id + + CLASS + SUUpdateAlert + LANGUAGE + ObjC + OUTLETS + + delegate + id + description + NSTextField + releaseNotesView + WebView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/info.nib new file mode 100644 index 0000000..d2586ea --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/info.nib @@ -0,0 +1,16 @@ + + + + + IBFramework Version + 629 + IBOldestOS + 5 + IBOpenObjects + + IBSystem Version + 9E17 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 0000000..c82d358 Binary files /dev/null and b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/keyedobjects.nib differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/classes.nib new file mode 100644 index 0000000..5220a22 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/classes.nib @@ -0,0 +1,59 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + finishPrompt + id + toggleMoreInfo + id + + CLASS + SUUpdatePermissionPrompt + LANGUAGE + ObjC + OUTLETS + + delegate + id + descriptionTextField + NSTextField + moreInfoButton + NSButton + moreInfoView + NSView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/info.nib new file mode 100644 index 0000000..d2586ea --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/info.nib @@ -0,0 +1,16 @@ + + + + + IBFramework Version + 629 + IBOldestOS + 5 + IBOpenObjects + + IBSystem Version + 9E17 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib new file mode 100644 index 0000000..ac298ce Binary files /dev/null and b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/Sparkle.strings b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/Sparkle.strings new file mode 100644 index 0000000..67cf535 Binary files /dev/null and b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/Sparkle.strings differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/relaunch b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/relaunch new file mode 100755 index 0000000..e7b96d6 Binary files /dev/null and b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/relaunch differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/classes.nib new file mode 100644 index 0000000..4b1ab30 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/classes.nib @@ -0,0 +1,50 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + doNotInstall + id + installLater + id + installNow + id + + CLASS + SUAutomaticUpdateAlert + LANGUAGE + ObjC + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/info.nib new file mode 100644 index 0000000..2b3d425 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 670 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 6 + + IBSystem Version + 9E17 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 0000000..1d4655c Binary files /dev/null and b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/classes.nib new file mode 100644 index 0000000..994d4c3 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/classes.nib @@ -0,0 +1,67 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + CLASS + NSApplication + LANGUAGE + ObjC + SUPERCLASS + NSResponder + + + ACTIONS + + installUpdate + id + remindMeLater + id + skipThisVersion + id + + CLASS + SUUpdateAlert + LANGUAGE + ObjC + OUTLETS + + delegate + id + description + NSTextField + releaseNotesView + WebView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/info.nib new file mode 100644 index 0000000..2b3d425 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 670 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 6 + + IBSystem Version + 9E17 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 0000000..103b1cf Binary files /dev/null and b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/keyedobjects.nib differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/classes.nib new file mode 100644 index 0000000..0f776c8 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/classes.nib @@ -0,0 +1,59 @@ + + + + + IBClasses + + + CLASS + NSObject + LANGUAGE + ObjC + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + finishPrompt + id + toggleMoreInfo + id + + CLASS + SUUpdatePermissionPrompt + LANGUAGE + ObjC + OUTLETS + + delegate + id + descriptionTextField + NSTextField + moreInfoButton + NSButton + moreInfoView + NSView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + IBVersion + 1 + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/info.nib new file mode 100644 index 0000000..5132e29 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/info.nib @@ -0,0 +1,18 @@ + + + + + IBFramework Version + 670 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + IBSystem Version + 9E17 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib new file mode 100644 index 0000000..c09d9e7 Binary files /dev/null and b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings new file mode 100644 index 0000000..f3ff9d8 Binary files /dev/null and b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/classes.nib new file mode 100644 index 0000000..4b1ab30 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/classes.nib @@ -0,0 +1,50 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + doNotInstall + id + installLater + id + installNow + id + + CLASS + SUAutomaticUpdateAlert + LANGUAGE + ObjC + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/info.nib new file mode 100644 index 0000000..c5a067e --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 670 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 6 + + IBSystem Version + 10A96 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 0000000..53cb91a Binary files /dev/null and b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/classes.nib new file mode 100644 index 0000000..018710a --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/classes.nib @@ -0,0 +1,39 @@ +{ + IBClasses = ( + { + CLASS = FirstResponder; + LANGUAGE = ObjC; + SUPERCLASS = NSObject; + }, + { + CLASS = NSApplication; + LANGUAGE = ObjC; + SUPERCLASS = NSResponder; + }, + { + CLASS = NSObject; + LANGUAGE = ObjC; + }, + { + ACTIONS = { + installUpdate = id; + remindMeLater = id; + skipThisVersion = id; + }; + CLASS = SUUpdateAlert; + LANGUAGE = ObjC; + OUTLETS = { + delegate = id; + description = NSTextField; + releaseNotesView = WebView; + }; + SUPERCLASS = SUWindowController; + }, + { + CLASS = SUWindowController; + LANGUAGE = ObjC; + SUPERCLASS = NSWindowController; + } + ); + IBVersion = 1; +} \ No newline at end of file diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/info.nib new file mode 100644 index 0000000..6b787d4 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/info.nib @@ -0,0 +1,18 @@ + + + + + IBDocumentLocation + 69 14 356 240 0 0 1280 778 + IBFramework Version + 489.0 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBSystem Version + 9D34 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 0000000..7e6d490 Binary files /dev/null and b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/keyedobjects.nib differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/classes.nib new file mode 100644 index 0000000..5220a22 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/classes.nib @@ -0,0 +1,59 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + finishPrompt + id + toggleMoreInfo + id + + CLASS + SUUpdatePermissionPrompt + LANGUAGE + ObjC + OUTLETS + + delegate + id + descriptionTextField + NSTextField + moreInfoButton + NSButton + moreInfoView + NSView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/info.nib new file mode 100644 index 0000000..c5a067e --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 670 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 6 + + IBSystem Version + 10A96 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib new file mode 100644 index 0000000..64babac Binary files /dev/null and b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/Sparkle.strings b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/Sparkle.strings new file mode 100644 index 0000000..b676a4f Binary files /dev/null and b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/Sparkle.strings differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Sparkle b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Sparkle new file mode 100755 index 0000000..2d9bb2a Binary files /dev/null and b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Sparkle differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/Current b/tikzit-1/Frameworks/Sparkle.framework/Versions/Current new file mode 120000 index 0000000..8c7e5a6 --- /dev/null +++ b/tikzit-1/Frameworks/Sparkle.framework/Versions/Current @@ -0,0 +1 @@ +A \ No newline at end of file diff --git a/tikzit-1/INSTALL b/tikzit-1/INSTALL new file mode 100644 index 0000000..b938f14 --- /dev/null +++ b/tikzit-1/INSTALL @@ -0,0 +1,34 @@ +For building on systems other than MacOS/X: + +Dependencies: + GNUstep (core libraries) >= 1.18.0 + gtk+-2.0 >= 2.18.0 + gdk-pixbuf >= 2.16.0 + poppler >= 0.10 + including glib bindings, which may be in + a separate poppler-glib package + Objective C compiler (eg: gcc with ObjC support) with + support for properties, optional protocols and + fast enumeration (eg: gcc 4.6 or clang). + pkg-config + build-time dependency only + +To install, just run: + + ./configure + make + make install + + + +To build from subversion (and for development) you will additionally need: + flex >= 2.5.34 + bison >= 2.3 + autoconf >= 2.60 + automake >= 1.10 + +and you will need to prepare the source tree by running + ./autogen.sh + + + diff --git a/tikzit-1/Makefile.am b/tikzit-1/Makefile.am new file mode 100644 index 0000000..d9793a4 --- /dev/null +++ b/tikzit-1/Makefile.am @@ -0,0 +1,3 @@ +SUBDIRS = src share +appdir = $(datarootdir)/tikzit +nobase_dist_app_DATA = shapes/*.tikz diff --git a/tikzit-1/NEWS b/tikzit-1/NEWS new file mode 100644 index 0000000..827abe7 --- /dev/null +++ b/tikzit-1/NEWS @@ -0,0 +1,75 @@ +tikzit 1.1 (2015-07-22) : + * Fix bug where copy-and-paste would lose edge anchors + * Allow tikzit-specific preview code to be omitted from preambles + * Holding down CTRL allows you to drag the graph + * Fix parsing bug where property lists would be reversed + * Better error messages when files can't be opened + +tikzit 1.0 (2013-05-07): + * GIMP-like user interface (multiple documents, separate toolboxes) + * Preferences now called Configuration, and includes node and edge styles + * Error-highlighting in the code pane + * Single-key-shortcuts for tool selection, and to update the preview + * Edge anchor support + * Option for drag-select to select nodes, edges or both + * Memory leak fixes + * Should now be impossible to use the UI to create a graph that cannot be parsed + +tikzit 0.9 (2012-08-24): + * Compilers without basic Objective C 2 support cannot be + used to compile TikZiT any more + * Add support for scale to node styles + * Add support for editing edge styles + * Add support for multiple custom preambles + * The path to pdflatex is now configurable + * Make everything look a bit better + * Edges now start from the edge of a node, not the centre, + which is what tikz does + * Edges can now have arrow heads and arrow tails + * Nodes and edges have consistent ordering, and this can be + changed with Edge->Arrange + * Edges now have colours + * Edges can now be reversed easily + * Fix various crashes + +tikzit 0.7 (2011-12-06): + * Add bounding box support + * Add support for different node shapes + * Improved error reporting + * Add scrolling support (CTRL+mouse wheel) + * Add a pan tool to move around the graph + * Add edge and graph property palettes + +tikzit 0.6 (2011-02-08): + * Fix the displaying of colours in the styles editor + * Cut, copy and paste support + * More useful buttons on the toolbar + * Improve how previewing works + * Allow custom preambles for preview generation + +tikzit 0.5 (2010-12-01): + * Hide font size commands (\small etc) in node labels + * Always output the "style" node property first + * Provide a list of recent files + * Remember the folder for Open and Save As dialogs + * Remember window dimensions + * Remember the styles list + * Add a "Node properties" pane + * Bring the separate windows into the main application window + * Improve graphics rendering / remove flicker + * Shorten the window title to something useful + +tikzit 0.4 (2010-09-19): + * Support for bounding boxes, variable-precision tikz output + * Fixed stroke width display + * Updated tikz output to handle separate edge/node layers + * Using [Graph tikz] for tikz output, attaching style after parse + * All platforms now use the same lex-based parser + * Added a menu item for showing node styles if closed + * Pre-amble support + * Added test suite + * Added preview and node labels to GTK version + +tikzit 0.3b (2010-05-11): + * Various build-system fixes on Linux + diff --git a/tikzit-1/README b/tikzit-1/README new file mode 100644 index 0000000..9b83327 --- /dev/null +++ b/tikzit-1/README @@ -0,0 +1,7 @@ +TikZit is a cross-platform application that allows the creation and modification of TeX diagrams written using the pgf/TikZ macro library. It is especially geared toward rapidly creating "dot"-diagrams for use in academic papers. + +For more info, see http://tikzit.sf.net + +On OS/X, the Cocoa framework is used. + +On other platforms, GTK+ and GNUstep are used. \ No newline at end of file diff --git a/tikzit-1/README.release b/tikzit-1/README.release new file mode 100644 index 0000000..a6f1642 --- /dev/null +++ b/tikzit-1/README.release @@ -0,0 +1,98 @@ +Notes on how to make a release +============================== + +Updating doc files +------------------ + +Put all the user-visible changes since the last release into NEWS. + +Make sure the dependency requirements in INSTALL are correct. + + + +Making the source tarballs +-------------------------- + +The version should be set in configure.ac (in AC_INIT) +and the package should be re-configured +(run ./configure). + +Then run `make dist` to create the source tarball in tar.gz format, and +`make dist-bzip2` to get it in tar.bz2 format. + + + +Uploading the source +-------------------- + +Update /www/sourceforge/README.mkd + +Log into sourceforge.net, go to +https://sourceforge.net/projects/tikzit/files/ + +Create a folder called tikzit-[version]. + +Upload README.mkd. + +Upload the tar.bz2 and tar.gz files. + +Set the tar.bz2 file as default for everything except windows and mac +(click the (i) symbol on the right for that file to do this). + + + +Updating the website +-------------------- + +Edit /www/htdocs/link.php, and update the versions. + +sftp to + [sf-username],tikzit@web.sourceforge.net + +Upload link.php into htdocs. + + + +Updating the packages +--------------------- + +Contact Gard Spreemann about the new version by sending him a message +on Launchpad (https://launchpad.net/~gspreemann). + +Update tikzit.spec (the version, the changelog and the dependencies). + +Test the spec file: +- if you don't have ~/rpmbuild, run rpmdev-setuptree +- copy the tar.bz2 file into ~/rpmbuild/SOURCES +- copy tikzit.spec into ~/rpmbuild/SPECS +- cd into ~/rpmbuild/SPECS +- run `rpmbuild -ba tikzit.spec` +- run `rpmlint ..` and check the warnings (there will be some that are + not important) + +Update the OBS packages: +- https://build.opensuse.org/package/show?package=tikzit&project=home%3Arandomguy3 +- Upload the tar.bz2 file and the tikzit.spec file. +- Wait for the build to finish + +Update the AUR package: +- http://aur.archlinux.org/packages.php?ID=37119 + + +TODO: find out how the Debian build system works + + +Publishing an OSX Update +----------------------------------------- +In OSX, the steps to publish an update are as follows. Firstly all updates are signed, so you need the private key 'tikzit_dsa_priv.pem' in the root of your working directory. This is not in the repository (for obvious reasons), so ask Aleks for a copy. Also, make sure you have ruby in your $PATH to do the actual signing. + +1. Update the SVN and note the revision number +2. In TikZiT-Info.plist, set the Bundle Version key to (MAJOR).(MINOR).(SVN REVISION + 1) +3. In the TikZiT working directory, run scripts/prepare_release.sh +4. Copy and paste the XML output into docs/web/appcast/tikzit.xml +5. Update the release notes in docs/web/appcast/rnotes.html +6. Use SFTP to upload the changed files into htdocs/appcast +7. Commit the SVN + + + diff --git a/tikzit-1/TODO b/tikzit-1/TODO new file mode 100644 index 0000000..ca1a1b9 --- /dev/null +++ b/tikzit-1/TODO @@ -0,0 +1,15 @@ +GTK port: + - Use GooCanvas for the graph display + + +OSX port: + - node properties toolbox + - support for more than one custom preamble + + +General: + - push more code up into common (make use of RenderContext) + - vi-like mode lines in tikz files + - use mode lines for preamble knowledge + - per-document preamble selection? + diff --git a/tikzit-1/TikZiT-Info.plist b/tikzit-1/TikZiT-Info.plist new file mode 100644 index 0000000..a495c5b --- /dev/null +++ b/tikzit-1/TikZiT-Info.plist @@ -0,0 +1,61 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleDocumentTypes + + + CFBundleTypeExtensions + + tikz + + CFBundleTypeIconFile + tikzitdoc.icns + CFBundleTypeMIMETypes + + text/plain + + CFBundleTypeName + DocumentType + CFBundleTypeOSTypes + + ???? + + CFBundleTypeRole + Editor + NSDocumentClass + TikzDocument + + + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIconFile + tikzit.icns + CFBundleIdentifier + net.sourceforge.tikzit.${PRODUCT_NAME:rfc1034identifier} + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + APPL + CFBundleShortVersionString + 0.8 + CFBundleSignature + ???? + CFBundleVersion + 0.8.398 + LSMinimumSystemVersion + ${MACOSX_DEPLOYMENT_TARGET} + NSMainNibFile + MainMenu + NSPrincipalClass + NSApplication + SUFeedURL + http://tikzit.sourceforge.net/appcast/tikzit.xml + SUPublicDSAKeyFile + tikzit_dsa_pub.pem + + diff --git a/tikzit-1/TikZiT.xcodeproj/project.pbxproj b/tikzit-1/TikZiT.xcodeproj/project.pbxproj new file mode 100644 index 0000000..04a7f3f --- /dev/null +++ b/tikzit-1/TikZiT.xcodeproj/project.pbxproj @@ -0,0 +1,1322 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + 1DDD582C0DA1D0D100B32029 /* TikzDocument.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD58280DA1D0D100B32029 /* TikzDocument.xib */; }; + 1DDD582D0DA1D0D100B32029 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD582A0DA1D0D100B32029 /* MainMenu.xib */; }; + 5504C82E11D23595002A1478 /* common.m in Sources */ = {isa = PBXBuildFile; fileRef = 5504C82A11D23595002A1478 /* common.m */; }; + 5504C82F11D23595002A1478 /* parser.m in Sources */ = {isa = PBXBuildFile; fileRef = 5504C82B11D23595002A1478 /* parser.m */; }; + 5504C83011D23595002A1478 /* test.m in Sources */ = {isa = PBXBuildFile; fileRef = 5504C82D11D23595002A1478 /* test.m */; }; + 5504C83211D23685002A1478 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 5504C83111D23685002A1478 /* main.m */; }; + 5504C84F11D23945002A1478 /* ColorRGB.m in Sources */ = {isa = PBXBuildFile; fileRef = 559EFB6711CB88E300D020F4 /* ColorRGB.m */; }; + 5504C93F11D39422002A1478 /* osx.m in Sources */ = {isa = PBXBuildFile; fileRef = 5504C93E11D39422002A1478 /* osx.m */; }; + 552202C4135F15FD007EA086 /* MultiField.m in Sources */ = {isa = PBXBuildFile; fileRef = 552202C3135F15FD007EA086 /* MultiField.m */; }; + 552202C5135F15FD007EA086 /* MultiField.m in Sources */ = {isa = PBXBuildFile; fileRef = 552202C3135F15FD007EA086 /* MultiField.m */; }; + 55391AF613D324FE007DBE71 /* Preview.xib in Resources */ = {isa = PBXBuildFile; fileRef = 55391AF513D324FE007DBE71 /* Preview.xib */; }; + 55391AF813D3250F007DBE71 /* Preamble.xib in Resources */ = {isa = PBXBuildFile; fileRef = 55391AF713D3250F007DBE71 /* Preamble.xib */; }; + 55391B0213D32608007DBE71 /* PropertyInspector.xib in Resources */ = {isa = PBXBuildFile; fileRef = 55391B0013D32608007DBE71 /* PropertyInspector.xib */; }; + 55391B0A13D32765007DBE71 /* PropertyInspectorController.m in Sources */ = {isa = PBXBuildFile; fileRef = 55391B0913D32765007DBE71 /* PropertyInspectorController.m */; }; + 55397C7914498C22006942FB /* EdgeStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 55397C7814498C22006942FB /* EdgeStyle.m */; }; + 55397C7C144990EA006942FB /* EdgeStyle+Coder.m in Sources */ = {isa = PBXBuildFile; fileRef = 55397C7B144990EA006942FB /* EdgeStyle+Coder.m */; }; + 55397C7F144999C4006942FB /* PropertyHolder.m in Sources */ = {isa = PBXBuildFile; fileRef = 55397C7E144999C4006942FB /* PropertyHolder.m */; }; + 55397C811449A877006942FB /* ED_arrow.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C801449A877006942FB /* ED_arrow.png */; }; + 55397C831449A8F1006942FB /* ED_tick.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C821449A8F1006942FB /* ED_tick.png */; }; + 55397C851449A9BF006942FB /* ED_none.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C841449A9BF006942FB /* ED_none.png */; }; + 55397C8A1449AB91006942FB /* AH_none.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C871449AB91006942FB /* AH_none.png */; }; + 55397C8B1449AB91006942FB /* AH_plain_tail.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C881449AB91006942FB /* AH_plain_tail.png */; }; + 55397C8D1449ABFC006942FB /* AH_latex_tail.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C8C1449ABFC006942FB /* AH_latex_tail.png */; }; + 55397C901449AC7C006942FB /* AH_latex_head.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C8E1449AC7C006942FB /* AH_latex_head.png */; }; + 55397C911449AC7C006942FB /* AH_plain_head.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C8F1449AC7C006942FB /* AH_plain_head.png */; }; + 553A4C5A144ED3D500AA6FAC /* NilToEmptyStringTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 553A4C59144ED3D500AA6FAC /* NilToEmptyStringTransformer.m */; }; + 55432E061444BF2D00401BB3 /* GraphElementProperty.m in Sources */ = {isa = PBXBuildFile; fileRef = 55432E051444BF2D00401BB3 /* GraphElementProperty.m */; }; + 55598E351635372E0023450A /* DiamondShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55598E341635372E0023450A /* DiamondShape.m */; }; + 555B30F911D8BE3300CAECF5 /* emblem-important.png in Resources */ = {isa = PBXBuildFile; fileRef = 555B30F811D8BE3300CAECF5 /* emblem-important.png */; }; + 555B313511D8C6DA00CAECF5 /* color.m in Sources */ = {isa = PBXBuildFile; fileRef = 555B313411D8C6DA00CAECF5 /* color.m */; }; + 555ECE9B1378A3AA0052DB71 /* CALayer+DrawLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 555ECE9A1378A3AA0052DB71 /* CALayer+DrawLabel.m */; }; + 55652DF913E1F2030023F4C6 /* SupportDir.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652DF813E1F2030023F4C6 /* SupportDir.m */; }; + 55652E3B13E1FAEE0023F4C6 /* CircleShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3413E1FAED0023F4C6 /* CircleShape.m */; }; + 55652E3C13E1FAEE0023F4C6 /* RectangleShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3613E1FAED0023F4C6 /* RectangleShape.m */; }; + 55652E3D13E1FAEE0023F4C6 /* RegularPolyShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3813E1FAED0023F4C6 /* RegularPolyShape.m */; }; + 55652E3E13E1FAEE0023F4C6 /* TikzShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3A13E1FAEE0023F4C6 /* TikzShape.m */; }; + 55652E4113E1FB0A0023F4C6 /* Shape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E4013E1FB0A0023F4C6 /* Shape.m */; }; + 55652E5613E1FC660023F4C6 /* cap.tikz in Copy Shapes */ = {isa = PBXBuildFile; fileRef = 55652E5113E1FC660023F4C6 /* cap.tikz */; }; + 55652E5713E1FC660023F4C6 /* copants.tikz in Copy Shapes */ = {isa = PBXBuildFile; fileRef = 55652E5213E1FC660023F4C6 /* copants.tikz */; }; + 55652E5813E1FC660023F4C6 /* cup.tikz in Copy Shapes */ = {isa = PBXBuildFile; fileRef = 55652E5313E1FC660023F4C6 /* cup.tikz */; }; + 55652E5913E1FC660023F4C6 /* oval.tikz in Copy Shapes */ = {isa = PBXBuildFile; fileRef = 55652E5413E1FC660023F4C6 /* oval.tikz */; }; + 55652E5A13E1FC660023F4C6 /* pants.tikz in Copy Shapes */ = {isa = PBXBuildFile; fileRef = 55652E5513E1FC660023F4C6 /* pants.tikz */; }; + 556979431168747B007E5703 /* StylePalette.xib in Resources */ = {isa = PBXBuildFile; fileRef = 556979421168747B007E5703 /* StylePalette.xib */; }; + 5573B8BA11D9FC8D00B5DC5D /* Quartz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5573B8B911D9FC8D00B5DC5D /* Quartz.framework */; }; + 5573B8C211D9FD3200B5DC5D /* PreviewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5573B8C111D9FD3200B5DC5D /* PreviewController.m */; }; + 5573B90F11DA231A00B5DC5D /* PreambleController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5573B90E11DA231A00B5DC5D /* PreambleController.m */; }; + 5573B92111DA259C00B5DC5D /* text-x-generic.png in Resources */ = {isa = PBXBuildFile; fileRef = 5573B92011DA259C00B5DC5D /* text-x-generic.png */; }; + 5573B92511DA273400B5DC5D /* format-indent-less.png in Resources */ = {isa = PBXBuildFile; fileRef = 5573B92411DA273400B5DC5D /* format-indent-less.png */; }; + 5573B92911DA292F00B5DC5D /* Preambles.m in Sources */ = {isa = PBXBuildFile; fileRef = 5573B92811DA292F00B5DC5D /* Preambles.m */; }; + 5573B98811DA377C00B5DC5D /* text-x-script.png in Resources */ = {isa = PBXBuildFile; fileRef = 5573B98711DA377C00B5DC5D /* text-x-script.png */; }; + 5573BDCB11DB4D2600B5DC5D /* Preambles+Coder.m in Sources */ = {isa = PBXBuildFile; fileRef = 5573BDCA11DB4D2600B5DC5D /* Preambles+Coder.m */; }; + 5585E5C2117F681800124513 /* NodeStyle+Coder.m in Sources */ = {isa = PBXBuildFile; fileRef = 5585E5C1117F681800124513 /* NodeStyle+Coder.m */; }; + 5589A9FF11C51E780064D310 /* TikzGraphAssembler.m in Sources */ = {isa = PBXBuildFile; fileRef = 5589A9FE11C51E780064D310 /* TikzGraphAssembler.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 5589AA6C11C542D30064D310 /* TikzGraphAssembler.m in Sources */ = {isa = PBXBuildFile; fileRef = 5589A9FE11C51E780064D310 /* TikzGraphAssembler.m */; }; + 5589AA6D11C542D30064D310 /* tikzlexer.lm in Sources */ = {isa = PBXBuildFile; fileRef = 5589A9AA11C500060064D310 /* tikzlexer.lm */; }; + 5589AA6E11C542D30064D310 /* tikzparser.ym in Sources */ = {isa = PBXBuildFile; fileRef = 5589A9AB11C500060064D310 /* tikzparser.ym */; }; + 5589AA7211C542E60064D310 /* Edge.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18BA117B031C009863B2 /* Edge.m */; }; + 5589AA7611C542E60064D310 /* Graph.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18BC117B031C009863B2 /* Graph.m */; }; + 5589AA7811C542E60064D310 /* GraphChange.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18BE117B031C009863B2 /* GraphChange.m */; }; + 5589AA7A11C542E60064D310 /* GraphElementData.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C0117B031C009863B2 /* GraphElementData.m */; }; + 5589AA7C11C542E60064D310 /* Node.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C2117B031C009863B2 /* Node.m */; }; + 5589AA8011C542E60064D310 /* NodeStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C4117B031C009863B2 /* NodeStyle.m */; }; + 5589AA8511C543500064D310 /* util.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18CD117B03DD009863B2 /* util.m */; }; + 5589AD4411C633EE0064D310 /* SelectBoxLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 5589AD4311C633EE0064D310 /* SelectBoxLayer.m */; }; + 558F18C5117B031C009863B2 /* Edge.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18BA117B031C009863B2 /* Edge.m */; }; + 558F18C6117B031C009863B2 /* Graph.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18BC117B031C009863B2 /* Graph.m */; }; + 558F18C7117B031C009863B2 /* GraphChange.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18BE117B031C009863B2 /* GraphChange.m */; }; + 558F18C8117B031C009863B2 /* GraphElementData.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C0117B031C009863B2 /* GraphElementData.m */; }; + 558F18C9117B031C009863B2 /* Node.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C2117B031C009863B2 /* Node.m */; }; + 558F18CA117B031C009863B2 /* NodeStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C4117B031C009863B2 /* NodeStyle.m */; }; + 558F18CE117B03DD009863B2 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18CB117B03DD009863B2 /* main.m */; }; + 558F18CF117B03DD009863B2 /* util.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18CD117B03DD009863B2 /* util.m */; }; + 558F18F7117B043C009863B2 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18DA117B043B009863B2 /* AppDelegate.m */; }; + 558F18F9117B043C009863B2 /* EdgeControlLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18DE117B043B009863B2 /* EdgeControlLayer.m */; }; + 558F18FA117B043C009863B2 /* GraphicsView.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18E0117B043B009863B2 /* GraphicsView.m */; }; + 558F18FB117B043C009863B2 /* Grid.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18E2117B043B009863B2 /* Grid.m */; }; + 558F18FC117B043C009863B2 /* NodeLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18E4117B043B009863B2 /* NodeLayer.m */; }; + 558F18FD117B043C009863B2 /* NodeSelectionLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18E6117B043B009863B2 /* NodeSelectionLayer.m */; }; + 558F18FF117B043C009863B2 /* SelectableCollectionViewItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18EA117B043B009863B2 /* SelectableCollectionViewItem.m */; }; + 558F1900117B043C009863B2 /* SelectableNodeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18EC117B043B009863B2 /* SelectableNodeView.m */; }; + 558F1901117B043C009863B2 /* StylePaletteController.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18EE117B043B009863B2 /* StylePaletteController.m */; }; + 558F1902117B043C009863B2 /* TikzDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18F0117B043B009863B2 /* TikzDocument.m */; }; + 558F1903117B043C009863B2 /* TikzSourceController.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18F2117B043B009863B2 /* TikzSourceController.m */; }; + 558F1904117B043C009863B2 /* ToolPaletteController.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18F4117B043B009863B2 /* ToolPaletteController.m */; }; + 55900AA1135FA918002DD28E /* MultiCombo.m in Sources */ = {isa = PBXBuildFile; fileRef = 55900AA0135FA918002DD28E /* MultiCombo.m */; }; + 55900AA2135FA918002DD28E /* MultiCombo.m in Sources */ = {isa = PBXBuildFile; fileRef = 55900AA0135FA918002DD28E /* MultiCombo.m */; }; + 55900AE3135FB305002DD28E /* emblem-unreadable-grey.png in Resources */ = {isa = PBXBuildFile; fileRef = 55900AE2135FB305002DD28E /* emblem-unreadable-grey.png */; }; + 559EFA4811C7D49800D020F4 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 559EFA4711C7D49800D020F4 /* Sparkle.framework */; }; + 559EFA4E11C7D4BD00D020F4 /* Sparkle.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 559EFA4711C7D49800D020F4 /* Sparkle.framework */; }; + 559EFA5711C7D95F00D020F4 /* tikzit_dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 559EFA5611C7D95F00D020F4 /* tikzit_dsa_pub.pem */; }; + 559EFB6811CB88E300D020F4 /* ColorRGB.m in Sources */ = {isa = PBXBuildFile; fileRef = 559EFB6711CB88E300D020F4 /* ColorRGB.m */; }; + 55CA98D512EF8FCE008F0368 /* SFBInspectors.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55CA98D412EF8FCE008F0368 /* SFBInspectors.framework */; }; + 55CA98DA12EF9098008F0368 /* SFBInspectors.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 55CA98D412EF8FCE008F0368 /* SFBInspectors.framework */; }; + 55CA98DD12EF910F008F0368 /* SFBInspectors.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55CA98D412EF8FCE008F0368 /* SFBInspectors.framework */; }; + 55CA997212F08281008F0368 /* TikzWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 55CA997112F08281008F0368 /* TikzWindowController.m */; }; + 55CA9AC912F831E5008F0368 /* RColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 55CA9AC812F831E5008F0368 /* RColor.m */; }; + 55CA9ACA12F831E5008F0368 /* RColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 55CA9AC812F831E5008F0368 /* RColor.m */; }; + 55D2E0B21186ED950060B4EC /* Graph+Coder.m in Sources */ = {isa = PBXBuildFile; fileRef = 55D2E0B11186ED950060B4EC /* Graph+Coder.m */; }; + 55D945721165904F0044178C /* tikzitdoc.icns in Resources */ = {isa = PBXBuildFile; fileRef = 55D945701165904F0044178C /* tikzitdoc.icns */; }; + 55D945731165904F0044178C /* tikzit.icns in Resources */ = {isa = PBXBuildFile; fileRef = 55D945711165904F0044178C /* tikzit.icns */; }; + 55D949141165D8870044178C /* draw-ellipse.png in Resources */ = {isa = PBXBuildFile; fileRef = 55D949111165D8870044178C /* draw-ellipse.png */; }; + 55D949151165D8870044178C /* draw-path.png in Resources */ = {isa = PBXBuildFile; fileRef = 55D949121165D8870044178C /* draw-path.png */; }; + 55D949161165D8870044178C /* select-rectangular.png in Resources */ = {isa = PBXBuildFile; fileRef = 55D949131165D8870044178C /* select-rectangular.png */; }; + 55E5E99E1215C8E300256F69 /* transform-crop-and-resize.png in Resources */ = {isa = PBXBuildFile; fileRef = 55E5E99D1215C8E300256F69 /* transform-crop-and-resize.png */; }; + 55F9585C1181B09600F99434 /* PickSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F958591181B09600F99434 /* PickSupport.m */; }; + 55F9585D1181B09600F99434 /* Transformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F9585B1181B09600F99434 /* Transformer.m */; }; + 55F9E04511FF54F000F5659E /* NSString+LatexConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F9E04411FF54F000F5659E /* NSString+LatexConstants.m */; }; + 7F18A321184C577000BC3081 /* UpdatePreferenceController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F18A320184C577000BC3081 /* UpdatePreferenceController.m */; }; + 7F18A323184C599100BC3081 /* UpdatePreferencePanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7F18A322184C599100BC3081 /* UpdatePreferencePanel.xib */; }; + 7F6E2C7D16B007F000BFE20D /* EdgeStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 55397C7814498C22006942FB /* EdgeStyle.m */; }; + 7F6E2C7E16B0080400BFE20D /* GraphElementProperty.m in Sources */ = {isa = PBXBuildFile; fileRef = 55432E051444BF2D00401BB3 /* GraphElementProperty.m */; }; + 7F6E2C7F16B0081D00BFE20D /* PropertyHolder.m in Sources */ = {isa = PBXBuildFile; fileRef = 55397C7E144999C4006942FB /* PropertyHolder.m */; }; + 7F6E2C8016B0083300BFE20D /* Shape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E4013E1FB0A0023F4C6 /* Shape.m */; }; + 7F6E2C8116B0084600BFE20D /* Transformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F9585B1181B09600F99434 /* Transformer.m */; }; + 7F6E2C8216B008B000BFE20D /* DiamondShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55598E341635372E0023450A /* DiamondShape.m */; }; + 7F6E2C8316B008B000BFE20D /* CircleShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3413E1FAED0023F4C6 /* CircleShape.m */; }; + 7F6E2C8416B008B000BFE20D /* RectangleShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3613E1FAED0023F4C6 /* RectangleShape.m */; }; + 7F6E2C8516B008B000BFE20D /* RegularPolyShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3813E1FAED0023F4C6 /* RegularPolyShape.m */; }; + 7F6E2C8616B008B000BFE20D /* TikzShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3A13E1FAEE0023F4C6 /* TikzShape.m */; }; + 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 */; }; + 7F73438A184AC559002897D0 /* DraggablePDFView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F734389184AC559002897D0 /* DraggablePDFView.m */; }; + 7F781C1A16B5DE1400239826 /* ParseErrorView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F781C1916B5DE1400239826 /* ParseErrorView.m */; }; + 7F7B6DED18DE0C9E004F6CA8 /* tikzlexer.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F7B6DEA18DE0C9E004F6CA8 /* tikzlexer.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 7F7B6DEE18DE0C9E004F6CA8 /* tikzparser.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F7B6DEC18DE0C9E004F6CA8 /* tikzparser.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 7F7B6DF418DE0D7A004F6CA8 /* CustomNodeCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F7B6DF118DE0D7A004F6CA8 /* CustomNodeCellView.m */; }; + 7F7B6DF518DE0D7A004F6CA8 /* CustomNodeController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F7B6DF318DE0D7A004F6CA8 /* CustomNodeController.m */; }; + 7F90E88616DD29600069EBCD /* NSString+Tikz.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F90E88516DD29600069EBCD /* NSString+Tikz.m */; }; + 7F90E88D16DD47540069EBCD /* PreferenceController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F90E88B16DD47540069EBCD /* PreferenceController.m */; }; + 7F90E88E16DD47540069EBCD /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7F90E88C16DD47540069EBCD /* Preferences.xib */; }; + 7F90E89116DD54440069EBCD /* UserDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 7F90E88F16DD54440069EBCD /* UserDefaults.plist */; }; + 7F93852E184D176E00FAED38 /* updates.png in Resources */ = {isa = PBXBuildFile; fileRef = 7F93852D184D176E00FAED38 /* updates.png */; }; + 7F938530184D178B00FAED38 /* engine.png in Resources */ = {isa = PBXBuildFile; fileRef = 7F93852F184D178B00FAED38 /* engine.png */; }; + 7F938532184D184700FAED38 /* preamble.png in Resources */ = {isa = PBXBuildFile; fileRef = 7F938531184D184700FAED38 /* preamble.png */; }; + 7FB9BFEE16B57C2E00773146 /* TikzFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FB9BFED16B57C2E00773146 /* TikzFormatter.m */; }; + 7FD5D44B18E1CB5300E2A930 /* CustomNodes.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7FD5D44918E1CB5300E2A930 /* CustomNodes.xib */; }; + 7FD5D44D18E1CC0B00E2A930 /* customshape.png in Resources */ = {isa = PBXBuildFile; fileRef = 7FD5D44C18E1CC0B00E2A930 /* customshape.png */; }; + 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 */; }; + 8D15AC340486D014006FF6A4 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A7FEA54F5311CA2CBB /* Cocoa.framework */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 5504C91A11D36CD5002A1478 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 2A37F4A9FDCFA73011CA2CEA /* Project object */; + proxyType = 1; + remoteGlobalIDString = 8D15AC270486D014006FF6A4; + remoteInfo = TikZiT; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 55652E6613E1FD080023F4C6 /* Copy Shapes */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = shapes; + dstSubfolderSpec = 7; + files = ( + 55652E5613E1FC660023F4C6 /* cap.tikz in Copy Shapes */, + 55652E5713E1FC660023F4C6 /* copants.tikz in Copy Shapes */, + 55652E5813E1FC660023F4C6 /* cup.tikz in Copy Shapes */, + 55652E5913E1FC660023F4C6 /* oval.tikz in Copy Shapes */, + 55652E5A13E1FC660023F4C6 /* pants.tikz in Copy Shapes */, + ); + name = "Copy Shapes"; + runOnlyForDeploymentPostprocessing = 0; + }; + 559EFA5511C7D4DD00D020F4 /* Copy Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 55CA98DA12EF9098008F0368 /* SFBInspectors.framework in Copy Frameworks */, + 559EFA4E11C7D4BD00D020F4 /* Sparkle.framework in Copy Frameworks */, + ); + name = "Copy Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; + 7F6E2C8B16B00A9200BFE20D /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 7F6E2C8C16B00ABA00BFE20D /* SFBInspectors.framework in CopyFiles */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 089C1660FE840EACC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; + 1058C7A7FEA54F5311CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; + 13E42FBA07B3F13500E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = ""; }; + 1DDD58290DA1D0D100B32029 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/TikzDocument.xib; sourceTree = ""; }; + 1DDD582B0DA1D0D100B32029 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = ""; }; + 2564AD2C0F5327BB00F57823 /* TikZiT_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TikZiT_Prefix.pch; sourceTree = ""; }; + 2A37F4BAFDCFA73011CA2CEA /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/Credits.rtf; sourceTree = ""; }; + 2A37F4C4FDCFA73011CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; + 2A37F4C5FDCFA73011CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; + 5504C82A11D23595002A1478 /* common.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = common.m; path = src/common/test/common.m; sourceTree = ""; }; + 5504C82B11D23595002A1478 /* parser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = parser.m; path = src/common/test/parser.m; sourceTree = ""; }; + 5504C82C11D23595002A1478 /* test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = test.h; path = src/common/test/test.h; sourceTree = ""; }; + 5504C82D11D23595002A1478 /* test.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = test.m; path = src/common/test/test.m; sourceTree = ""; }; + 5504C83111D23685002A1478 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = src/osx/test/main.m; sourceTree = ""; }; + 5504C83711D237F5002A1478 /* tests */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = tests; sourceTree = BUILT_PRODUCTS_DIR; }; + 5504C93E11D39422002A1478 /* osx.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = osx.m; path = src/osx/test/osx.m; sourceTree = ""; }; + 552202C2135F15FD007EA086 /* MultiField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MultiField.h; path = src/osx/MultiField.h; sourceTree = ""; }; + 552202C3135F15FD007EA086 /* MultiField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MultiField.m; path = src/osx/MultiField.m; sourceTree = ""; }; + 55391B0113D32608007DBE71 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/PropertyInspector.xib; sourceTree = ""; }; + 55391B0813D32765007DBE71 /* PropertyInspectorController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PropertyInspectorController.h; path = src/osx/PropertyInspectorController.h; sourceTree = ""; }; + 55391B0913D32765007DBE71 /* PropertyInspectorController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PropertyInspectorController.m; path = src/osx/PropertyInspectorController.m; sourceTree = ""; }; + 55397C7714498C21006942FB /* EdgeStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EdgeStyle.h; path = src/common/EdgeStyle.h; sourceTree = ""; }; + 55397C7814498C22006942FB /* EdgeStyle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = EdgeStyle.m; path = src/common/EdgeStyle.m; sourceTree = ""; }; + 55397C7A144990EA006942FB /* EdgeStyle+Coder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "EdgeStyle+Coder.h"; path = "src/osx/EdgeStyle+Coder.h"; sourceTree = ""; }; + 55397C7B144990EA006942FB /* EdgeStyle+Coder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "EdgeStyle+Coder.m"; path = "src/osx/EdgeStyle+Coder.m"; sourceTree = ""; }; + 55397C7D144999C4006942FB /* PropertyHolder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PropertyHolder.h; path = src/common/PropertyHolder.h; sourceTree = ""; }; + 55397C7E144999C4006942FB /* PropertyHolder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PropertyHolder.m; path = src/common/PropertyHolder.m; sourceTree = ""; }; + 55397C801449A877006942FB /* ED_arrow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ED_arrow.png; sourceTree = ""; }; + 55397C821449A8F1006942FB /* ED_tick.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ED_tick.png; sourceTree = ""; }; + 55397C841449A9BF006942FB /* ED_none.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ED_none.png; sourceTree = ""; }; + 55397C871449AB91006942FB /* AH_none.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AH_none.png; sourceTree = ""; }; + 55397C881449AB91006942FB /* AH_plain_tail.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AH_plain_tail.png; sourceTree = ""; }; + 55397C8C1449ABFC006942FB /* AH_latex_tail.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AH_latex_tail.png; sourceTree = ""; }; + 55397C8E1449AC7C006942FB /* AH_latex_head.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AH_latex_head.png; sourceTree = ""; }; + 55397C8F1449AC7C006942FB /* AH_plain_head.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AH_plain_head.png; sourceTree = ""; }; + 553A4C58144ED3D500AA6FAC /* NilToEmptyStringTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NilToEmptyStringTransformer.h; path = src/osx/NilToEmptyStringTransformer.h; sourceTree = ""; }; + 553A4C59144ED3D500AA6FAC /* NilToEmptyStringTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NilToEmptyStringTransformer.m; path = src/osx/NilToEmptyStringTransformer.m; sourceTree = ""; }; + 55432E041444BF2D00401BB3 /* GraphElementProperty.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GraphElementProperty.h; path = src/common/GraphElementProperty.h; sourceTree = ""; }; + 55432E051444BF2D00401BB3 /* GraphElementProperty.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GraphElementProperty.m; path = src/common/GraphElementProperty.m; sourceTree = ""; }; + 55598E331635372E0023450A /* DiamondShape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DiamondShape.h; path = src/common/DiamondShape.h; sourceTree = ""; }; + 55598E341635372E0023450A /* DiamondShape.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DiamondShape.m; path = src/common/DiamondShape.m; sourceTree = ""; }; + 555B30F811D8BE3300CAECF5 /* emblem-important.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emblem-important.png"; sourceTree = ""; }; + 555B313411D8C6DA00CAECF5 /* color.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = color.m; path = src/common/test/color.m; sourceTree = ""; }; + 555ECE991378A3AA0052DB71 /* CALayer+DrawLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "CALayer+DrawLabel.h"; path = "src/osx/CALayer+DrawLabel.h"; sourceTree = ""; }; + 555ECE9A1378A3AA0052DB71 /* CALayer+DrawLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "CALayer+DrawLabel.m"; path = "src/osx/CALayer+DrawLabel.m"; sourceTree = ""; }; + 555ECF361379E9F80052DB71 /* ShapeNames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ShapeNames.h; path = src/common/ShapeNames.h; sourceTree = ""; }; + 55652DF713E1F2030023F4C6 /* SupportDir.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SupportDir.h; path = src/common/SupportDir.h; sourceTree = ""; }; + 55652DF813E1F2030023F4C6 /* SupportDir.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SupportDir.m; path = src/common/SupportDir.m; sourceTree = ""; }; + 55652E3313E1FAED0023F4C6 /* CircleShape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CircleShape.h; path = src/common/CircleShape.h; sourceTree = ""; }; + 55652E3413E1FAED0023F4C6 /* CircleShape.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CircleShape.m; path = src/common/CircleShape.m; sourceTree = ""; }; + 55652E3513E1FAED0023F4C6 /* RectangleShape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RectangleShape.h; path = src/common/RectangleShape.h; sourceTree = ""; }; + 55652E3613E1FAED0023F4C6 /* RectangleShape.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RectangleShape.m; path = src/common/RectangleShape.m; sourceTree = ""; }; + 55652E3713E1FAED0023F4C6 /* RegularPolyShape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RegularPolyShape.h; path = src/common/RegularPolyShape.h; sourceTree = ""; }; + 55652E3813E1FAED0023F4C6 /* RegularPolyShape.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RegularPolyShape.m; path = src/common/RegularPolyShape.m; sourceTree = ""; }; + 55652E3913E1FAEE0023F4C6 /* TikzShape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TikzShape.h; path = src/common/TikzShape.h; sourceTree = ""; }; + 55652E3A13E1FAEE0023F4C6 /* TikzShape.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TikzShape.m; path = src/common/TikzShape.m; sourceTree = ""; }; + 55652E3F13E1FB0A0023F4C6 /* Shape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Shape.h; path = src/common/Shape.h; sourceTree = ""; }; + 55652E4013E1FB0A0023F4C6 /* Shape.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Shape.m; path = src/common/Shape.m; sourceTree = ""; }; + 55652E5113E1FC660023F4C6 /* cap.tikz */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cap.tikz; sourceTree = ""; }; + 55652E5213E1FC660023F4C6 /* copants.tikz */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = copants.tikz; sourceTree = ""; }; + 55652E5313E1FC660023F4C6 /* cup.tikz */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cup.tikz; sourceTree = ""; }; + 55652E5413E1FC660023F4C6 /* oval.tikz */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = oval.tikz; sourceTree = ""; }; + 55652E5513E1FC660023F4C6 /* pants.tikz */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = pants.tikz; sourceTree = ""; }; + 5573B8B911D9FC8D00B5DC5D /* Quartz.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quartz.framework; path = System/Library/Frameworks/Quartz.framework; sourceTree = SDKROOT; }; + 5573B8BD11D9FCD400B5DC5D /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Preview.xib; sourceTree = ""; }; + 5573B8C011D9FD3200B5DC5D /* PreviewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PreviewController.h; path = src/osx/PreviewController.h; sourceTree = ""; }; + 5573B8C111D9FD3200B5DC5D /* PreviewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PreviewController.m; path = src/osx/PreviewController.m; sourceTree = ""; }; + 5573B90D11DA231A00B5DC5D /* PreambleController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PreambleController.h; path = src/osx/PreambleController.h; sourceTree = ""; }; + 5573B90E11DA231A00B5DC5D /* PreambleController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PreambleController.m; path = src/osx/PreambleController.m; sourceTree = ""; }; + 5573B91011DA233E00B5DC5D /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Preamble.xib; sourceTree = ""; }; + 5573B92011DA259C00B5DC5D /* text-x-generic.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "text-x-generic.png"; sourceTree = ""; }; + 5573B92411DA273400B5DC5D /* format-indent-less.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "format-indent-less.png"; sourceTree = ""; }; + 5573B92711DA292F00B5DC5D /* Preambles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Preambles.h; path = src/common/Preambles.h; sourceTree = ""; }; + 5573B92811DA292F00B5DC5D /* Preambles.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Preambles.m; path = src/common/Preambles.m; sourceTree = ""; }; + 5573B98711DA377C00B5DC5D /* text-x-script.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "text-x-script.png"; sourceTree = ""; }; + 5573BDC911DB4D2600B5DC5D /* Preambles+Coder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "Preambles+Coder.h"; path = "src/osx/Preambles+Coder.h"; sourceTree = ""; }; + 5573BDCA11DB4D2600B5DC5D /* Preambles+Coder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "Preambles+Coder.m"; path = "src/osx/Preambles+Coder.m"; sourceTree = ""; }; + 5585E5C0117F681800124513 /* NodeStyle+Coder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NodeStyle+Coder.h"; path = "src/osx/NodeStyle+Coder.h"; sourceTree = ""; }; + 5585E5C1117F681800124513 /* NodeStyle+Coder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NodeStyle+Coder.m"; path = "src/osx/NodeStyle+Coder.m"; sourceTree = ""; }; + 5589A9AA11C500060064D310 /* tikzlexer.lm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.lex; name = tikzlexer.lm; path = src/common/tikzlexer.lm; sourceTree = ""; }; + 5589A9AB11C500060064D310 /* tikzparser.ym */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.yacc; name = tikzparser.ym; path = src/common/tikzparser.ym; sourceTree = ""; }; + 5589A9FD11C51E780064D310 /* TikzGraphAssembler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TikzGraphAssembler.h; path = src/common/TikzGraphAssembler.h; sourceTree = ""; }; + 5589A9FE11C51E780064D310 /* TikzGraphAssembler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TikzGraphAssembler.m; path = src/common/TikzGraphAssembler.m; sourceTree = ""; }; + 5589AD4211C633EE0064D310 /* SelectBoxLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SelectBoxLayer.h; path = src/osx/SelectBoxLayer.h; sourceTree = ""; }; + 5589AD4311C633EE0064D310 /* SelectBoxLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SelectBoxLayer.m; path = src/osx/SelectBoxLayer.m; sourceTree = ""; }; + 558F18B9117B031C009863B2 /* Edge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Edge.h; path = src/common/Edge.h; sourceTree = ""; }; + 558F18BA117B031C009863B2 /* Edge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Edge.m; path = src/common/Edge.m; sourceTree = ""; }; + 558F18BB117B031C009863B2 /* Graph.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Graph.h; path = src/common/Graph.h; sourceTree = ""; }; + 558F18BC117B031C009863B2 /* Graph.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Graph.m; path = src/common/Graph.m; sourceTree = ""; }; + 558F18BD117B031C009863B2 /* GraphChange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GraphChange.h; path = src/common/GraphChange.h; sourceTree = ""; }; + 558F18BE117B031C009863B2 /* GraphChange.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GraphChange.m; path = src/common/GraphChange.m; sourceTree = ""; }; + 558F18BF117B031C009863B2 /* GraphElementData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GraphElementData.h; path = src/common/GraphElementData.h; sourceTree = ""; }; + 558F18C0117B031C009863B2 /* GraphElementData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GraphElementData.m; path = src/common/GraphElementData.m; sourceTree = ""; }; + 558F18C1117B031C009863B2 /* Node.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Node.h; path = src/common/Node.h; sourceTree = ""; }; + 558F18C2117B031C009863B2 /* Node.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Node.m; path = src/common/Node.m; sourceTree = ""; }; + 558F18C3117B031C009863B2 /* NodeStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NodeStyle.h; path = src/common/NodeStyle.h; sourceTree = ""; }; + 558F18C4117B031C009863B2 /* NodeStyle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NodeStyle.m; path = src/common/NodeStyle.m; sourceTree = ""; }; + 558F18CB117B03DD009863B2 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = src/osx/main.m; sourceTree = ""; }; + 558F18CC117B03DD009863B2 /* util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = util.h; path = src/common/util.h; sourceTree = ""; }; + 558F18CD117B03DD009863B2 /* util.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = util.m; path = src/common/util.m; sourceTree = ""; }; + 558F18D9117B043B009863B2 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = src/osx/AppDelegate.h; sourceTree = ""; }; + 558F18DA117B043B009863B2 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = src/osx/AppDelegate.m; sourceTree = ""; }; + 558F18DD117B043B009863B2 /* EdgeControlLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EdgeControlLayer.h; path = src/osx/EdgeControlLayer.h; sourceTree = ""; }; + 558F18DE117B043B009863B2 /* EdgeControlLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = EdgeControlLayer.m; path = src/osx/EdgeControlLayer.m; sourceTree = ""; }; + 558F18DF117B043B009863B2 /* GraphicsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GraphicsView.h; path = src/osx/GraphicsView.h; sourceTree = ""; }; + 558F18E0117B043B009863B2 /* GraphicsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GraphicsView.m; path = src/osx/GraphicsView.m; sourceTree = ""; }; + 558F18E1117B043B009863B2 /* Grid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Grid.h; path = src/osx/Grid.h; sourceTree = ""; }; + 558F18E2117B043B009863B2 /* Grid.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Grid.m; path = src/osx/Grid.m; sourceTree = ""; }; + 558F18E3117B043B009863B2 /* NodeLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NodeLayer.h; path = src/osx/NodeLayer.h; sourceTree = ""; }; + 558F18E4117B043B009863B2 /* NodeLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NodeLayer.m; path = src/osx/NodeLayer.m; sourceTree = ""; }; + 558F18E5117B043B009863B2 /* NodeSelectionLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NodeSelectionLayer.h; path = src/osx/NodeSelectionLayer.h; sourceTree = ""; }; + 558F18E6117B043B009863B2 /* NodeSelectionLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NodeSelectionLayer.m; path = src/osx/NodeSelectionLayer.m; sourceTree = ""; }; + 558F18E9117B043B009863B2 /* SelectableCollectionViewItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SelectableCollectionViewItem.h; path = src/osx/SelectableCollectionViewItem.h; sourceTree = ""; }; + 558F18EA117B043B009863B2 /* SelectableCollectionViewItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SelectableCollectionViewItem.m; path = src/osx/SelectableCollectionViewItem.m; sourceTree = ""; }; + 558F18EB117B043B009863B2 /* SelectableNodeView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SelectableNodeView.h; path = src/osx/SelectableNodeView.h; sourceTree = ""; }; + 558F18EC117B043B009863B2 /* SelectableNodeView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SelectableNodeView.m; path = src/osx/SelectableNodeView.m; sourceTree = ""; }; + 558F18ED117B043B009863B2 /* StylePaletteController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StylePaletteController.h; path = src/osx/StylePaletteController.h; sourceTree = ""; }; + 558F18EE117B043B009863B2 /* StylePaletteController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = StylePaletteController.m; path = src/osx/StylePaletteController.m; sourceTree = ""; }; + 558F18EF117B043B009863B2 /* TikzDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TikzDocument.h; path = src/osx/TikzDocument.h; sourceTree = ""; }; + 558F18F0117B043B009863B2 /* TikzDocument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TikzDocument.m; path = src/osx/TikzDocument.m; sourceTree = ""; }; + 558F18F1117B043B009863B2 /* TikzSourceController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TikzSourceController.h; path = src/osx/TikzSourceController.h; sourceTree = ""; }; + 558F18F2117B043B009863B2 /* TikzSourceController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TikzSourceController.m; path = src/osx/TikzSourceController.m; sourceTree = ""; }; + 558F18F3117B043B009863B2 /* ToolPaletteController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ToolPaletteController.h; path = src/osx/ToolPaletteController.h; sourceTree = ""; }; + 558F18F4117B043B009863B2 /* ToolPaletteController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ToolPaletteController.m; path = src/osx/ToolPaletteController.m; sourceTree = ""; }; + 55900A9F135FA918002DD28E /* MultiCombo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MultiCombo.h; path = src/osx/MultiCombo.h; sourceTree = ""; }; + 55900AA0135FA918002DD28E /* MultiCombo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MultiCombo.m; path = src/osx/MultiCombo.m; sourceTree = ""; }; + 55900AE2135FB305002DD28E /* emblem-unreadable-grey.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emblem-unreadable-grey.png"; sourceTree = ""; }; + 559EFA4711C7D49800D020F4 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = Frameworks/Sparkle.framework; sourceTree = ""; }; + 559EFA5611C7D95F00D020F4 /* tikzit_dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = tikzit_dsa_pub.pem; sourceTree = ""; }; + 559EFB6611CB88E300D020F4 /* ColorRGB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ColorRGB.h; path = src/common/ColorRGB.h; sourceTree = ""; }; + 559EFB6711CB88E300D020F4 /* ColorRGB.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ColorRGB.m; path = src/common/ColorRGB.m; sourceTree = ""; }; + 55CA98D412EF8FCE008F0368 /* SFBInspectors.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SFBInspectors.framework; path = Frameworks/SFBInspectors.framework; sourceTree = ""; }; + 55CA997012F08281008F0368 /* TikzWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TikzWindowController.h; path = src/osx/TikzWindowController.h; sourceTree = ""; }; + 55CA997112F08281008F0368 /* TikzWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TikzWindowController.m; path = src/osx/TikzWindowController.m; sourceTree = ""; }; + 55CA9AC712F831E5008F0368 /* RColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RColor.h; path = src/common/RColor.h; sourceTree = ""; }; + 55CA9AC812F831E5008F0368 /* RColor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RColor.m; path = src/common/RColor.m; sourceTree = ""; }; + 55D2E0B01186ED950060B4EC /* Graph+Coder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "Graph+Coder.h"; path = "src/osx/Graph+Coder.h"; sourceTree = ""; }; + 55D2E0B11186ED950060B4EC /* Graph+Coder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "Graph+Coder.m"; path = "src/osx/Graph+Coder.m"; sourceTree = ""; }; + 55D945701165904F0044178C /* tikzitdoc.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = tikzitdoc.icns; sourceTree = ""; }; + 55D945711165904F0044178C /* tikzit.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = tikzit.icns; sourceTree = ""; }; + 55D947301165A5D40044178C /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/StylePalette.xib; sourceTree = ""; }; + 55D949111165D8870044178C /* draw-ellipse.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "draw-ellipse.png"; sourceTree = ""; }; + 55D949121165D8870044178C /* draw-path.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "draw-path.png"; sourceTree = ""; }; + 55D949131165D8870044178C /* select-rectangular.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "select-rectangular.png"; sourceTree = ""; }; + 55E5E99D1215C8E300256F69 /* transform-crop-and-resize.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "transform-crop-and-resize.png"; sourceTree = ""; }; + 55F958581181B09600F99434 /* PickSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PickSupport.h; path = src/common/PickSupport.h; sourceTree = ""; }; + 55F958591181B09600F99434 /* PickSupport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PickSupport.m; path = src/common/PickSupport.m; sourceTree = ""; }; + 55F9585A1181B09600F99434 /* Transformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Transformer.h; path = src/common/Transformer.h; sourceTree = ""; }; + 55F9585B1181B09600F99434 /* Transformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Transformer.m; path = src/common/Transformer.m; sourceTree = ""; }; + 55F9E04311FF54F000F5659E /* NSString+LatexConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSString+LatexConstants.h"; path = "src/common/NSString+LatexConstants.h"; sourceTree = ""; }; + 55F9E04411FF54F000F5659E /* NSString+LatexConstants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSString+LatexConstants.m"; path = "src/common/NSString+LatexConstants.m"; sourceTree = ""; }; + 55FF4E64116A401B000C22B4 /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = usr/lib/libicucore.dylib; sourceTree = SDKROOT; }; + 7F18A31F184C577000BC3081 /* UpdatePreferenceController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UpdatePreferenceController.h; path = src/osx/UpdatePreferenceController.h; sourceTree = ""; }; + 7F18A320184C577000BC3081 /* UpdatePreferenceController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = UpdatePreferenceController.m; path = src/osx/UpdatePreferenceController.m; sourceTree = ""; }; + 7F18A322184C599100BC3081 /* UpdatePreferencePanel.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = UpdatePreferencePanel.xib; path = src/osx/UpdatePreferencePanel.xib; sourceTree = ""; }; + 7F6E2C8716B0091300BFE20D /* maths.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = maths.m; path = src/common/test/maths.m; sourceTree = ""; }; + 7F734388184AC559002897D0 /* DraggablePDFView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DraggablePDFView.h; path = src/osx/DraggablePDFView.h; sourceTree = ""; }; + 7F734389184AC559002897D0 /* DraggablePDFView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DraggablePDFView.m; path = src/osx/DraggablePDFView.m; sourceTree = ""; }; + 7F781C1816B5DE1400239826 /* ParseErrorView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ParseErrorView.h; path = src/osx/ParseErrorView.h; sourceTree = ""; }; + 7F781C1916B5DE1400239826 /* ParseErrorView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ParseErrorView.m; path = src/osx/ParseErrorView.m; sourceTree = ""; }; + 7F7B6DE918DE0C9E004F6CA8 /* tikzlexer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tikzlexer.h; path = xbuild/TikZiT.build/Debug/TikZiT.build/DerivedSources/tikzlexer.h; sourceTree = ""; }; + 7F7B6DEA18DE0C9E004F6CA8 /* tikzlexer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = tikzlexer.m; path = xbuild/TikZiT.build/Debug/TikZiT.build/DerivedSources/tikzlexer.m; sourceTree = ""; }; + 7F7B6DEB18DE0C9E004F6CA8 /* tikzparser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tikzparser.h; path = xbuild/TikZiT.build/Debug/TikZiT.build/DerivedSources/tikzparser.h; sourceTree = ""; }; + 7F7B6DEC18DE0C9E004F6CA8 /* tikzparser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = tikzparser.m; path = xbuild/TikZiT.build/Debug/TikZiT.build/DerivedSources/tikzparser.m; sourceTree = ""; }; + 7F7B6DF018DE0D7A004F6CA8 /* CustomNodeCellView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CustomNodeCellView.h; path = src/osx/CustomNodeCellView.h; sourceTree = ""; }; + 7F7B6DF118DE0D7A004F6CA8 /* CustomNodeCellView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CustomNodeCellView.m; path = src/osx/CustomNodeCellView.m; sourceTree = ""; }; + 7F7B6DF218DE0D7A004F6CA8 /* CustomNodeController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CustomNodeController.h; path = src/osx/CustomNodeController.h; sourceTree = ""; }; + 7F7B6DF318DE0D7A004F6CA8 /* CustomNodeController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CustomNodeController.m; path = src/osx/CustomNodeController.m; sourceTree = ""; }; + 7F90E88416DD29600069EBCD /* NSString+Tikz.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSString+Tikz.h"; path = "src/common/NSString+Tikz.h"; sourceTree = ""; }; + 7F90E88516DD29600069EBCD /* NSString+Tikz.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSString+Tikz.m"; path = "src/common/NSString+Tikz.m"; sourceTree = ""; }; + 7F90E88A16DD47540069EBCD /* PreferenceController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PreferenceController.h; path = src/osx/PreferenceController.h; sourceTree = ""; }; + 7F90E88B16DD47540069EBCD /* PreferenceController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PreferenceController.m; path = src/osx/PreferenceController.m; sourceTree = ""; }; + 7F90E88C16DD47540069EBCD /* Preferences.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = Preferences.xib; path = src/osx/Preferences.xib; sourceTree = ""; }; + 7F90E89016DD54440069EBCD /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = English; path = English.lproj/UserDefaults.plist; sourceTree = ""; }; + 7F93852D184D176E00FAED38 /* updates.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = updates.png; sourceTree = ""; }; + 7F93852F184D178B00FAED38 /* engine.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = engine.png; sourceTree = ""; }; + 7F938531184D184700FAED38 /* preamble.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = preamble.png; sourceTree = ""; }; + 7FB9BFEC16B57C2E00773146 /* TikzFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TikzFormatter.h; path = src/osx/TikzFormatter.h; sourceTree = ""; }; + 7FB9BFED16B57C2E00773146 /* TikzFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TikzFormatter.m; path = src/osx/TikzFormatter.m; sourceTree = ""; }; + 7FD5D44A18E1CB5300E2A930 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/CustomNodes.xib; sourceTree = ""; }; + 7FD5D44C18E1CC0B00E2A930 /* customshape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = customshape.png; sourceTree = ""; }; + 7FEED45516B1A7C400B056CB /* StyleManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StyleManager.h; path = src/common/StyleManager.h; sourceTree = ""; }; + 7FEED45616B1A7C500B056CB /* StyleManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = StyleManager.m; path = src/common/StyleManager.m; sourceTree = ""; }; + 8D15AC360486D014006FF6A4 /* TikZiT-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "TikZiT-Info.plist"; sourceTree = ""; }; + 8D15AC370486D014006FF6A4 /* TikZiT.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TikZiT.app; sourceTree = BUILT_PRODUCTS_DIR; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 5589AA6311C5429C0064D310 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 55CA98DD12EF910F008F0368 /* SFBInspectors.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 8D15AC330486D014006FF6A4 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 8D15AC340486D014006FF6A4 /* Cocoa.framework in Frameworks */, + 559EFA4811C7D49800D020F4 /* Sparkle.framework in Frameworks */, + 5573B8BA11D9FC8D00B5DC5D /* Quartz.framework in Frameworks */, + 55CA98D512EF8FCE008F0368 /* SFBInspectors.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 1058C7A6FEA54F5311CA2CBB /* Linked Frameworks */ = { + isa = PBXGroup; + children = ( + 1058C7A7FEA54F5311CA2CBB /* Cocoa.framework */, + 55FF4E64116A401B000C22B4 /* libicucore.dylib */, + 559EFA4711C7D49800D020F4 /* Sparkle.framework */, + 55CA98D412EF8FCE008F0368 /* SFBInspectors.framework */, + ); + name = "Linked Frameworks"; + sourceTree = ""; + }; + 1058C7A8FEA54F5311CA2CBB /* Other Frameworks */ = { + isa = PBXGroup; + children = ( + 2A37F4C4FDCFA73011CA2CEA /* AppKit.framework */, + 13E42FBA07B3F13500E4EEF1 /* CoreData.framework */, + 2A37F4C5FDCFA73011CA2CEA /* Foundation.framework */, + 5573B8B911D9FC8D00B5DC5D /* Quartz.framework */, + ); + name = "Other Frameworks"; + sourceTree = ""; + }; + 19C28FB0FE9D524F11CA2CBB /* Products */ = { + isa = PBXGroup; + children = ( + 8D15AC370486D014006FF6A4 /* TikZiT.app */, + 5504C83711D237F5002A1478 /* tests */, + ); + name = Products; + sourceTree = ""; + }; + 2A37F4AAFDCFA73011CA2CEA /* TikZiT */ = { + isa = PBXGroup; + children = ( + 2A37F4ABFDCFA73011CA2CEA /* TikZiT */, + 2A37F4AFFDCFA73011CA2CEA /* Other Sources */, + 2A37F4B8FDCFA73011CA2CEA /* Resources */, + 2A37F4C3FDCFA73011CA2CEA /* Frameworks */, + 19C28FB0FE9D524F11CA2CBB /* Products */, + ); + name = TikZiT; + sourceTree = ""; + }; + 2A37F4ABFDCFA73011CA2CEA /* TikZiT */ = { + isa = PBXGroup; + children = ( + 5504C82611D23477002A1478 /* Test */, + 55D946141165924F0044178C /* Graph */, + 55D946071165922F0044178C /* Parser */, + 55D9467311659F5E0044178C /* Gui */, + 558F18D9117B043B009863B2 /* AppDelegate.h */, + 558F18DA117B043B009863B2 /* AppDelegate.m */, + 55F9E04311FF54F000F5659E /* NSString+LatexConstants.h */, + 55F9E04411FF54F000F5659E /* NSString+LatexConstants.m */, + ); + name = TikZiT; + sourceTree = ""; + }; + 2A37F4AFFDCFA73011CA2CEA /* Other Sources */ = { + isa = PBXGroup; + children = ( + 55CA9AC712F831E5008F0368 /* RColor.h */, + 55CA9AC812F831E5008F0368 /* RColor.m */, + 558F18CB117B03DD009863B2 /* main.m */, + 558F18CC117B03DD009863B2 /* util.h */, + 558F18CD117B03DD009863B2 /* util.m */, + 2564AD2C0F5327BB00F57823 /* TikZiT_Prefix.pch */, + 55652DF713E1F2030023F4C6 /* SupportDir.h */, + 55652DF813E1F2030023F4C6 /* SupportDir.m */, + ); + name = "Other Sources"; + sourceTree = ""; + }; + 2A37F4B8FDCFA73011CA2CEA /* Resources */ = { + isa = PBXGroup; + children = ( + 55397C8E1449AC7C006942FB /* AH_latex_head.png */, + 55397C8F1449AC7C006942FB /* AH_plain_head.png */, + 55397C8C1449ABFC006942FB /* AH_latex_tail.png */, + 55397C871449AB91006942FB /* AH_none.png */, + 55397C881449AB91006942FB /* AH_plain_tail.png */, + 55397C841449A9BF006942FB /* ED_none.png */, + 55397C821449A8F1006942FB /* ED_tick.png */, + 55397C801449A877006942FB /* ED_arrow.png */, + 7F93852C184D175400FAED38 /* Icons */, + 55652E5013E1FC660023F4C6 /* shapes */, + 55900AE2135FB305002DD28E /* emblem-unreadable-grey.png */, + 55E5E99D1215C8E300256F69 /* transform-crop-and-resize.png */, + 5573B98711DA377C00B5DC5D /* text-x-script.png */, + 8D15AC360486D014006FF6A4 /* TikZiT-Info.plist */, + 7F90E88F16DD54440069EBCD /* UserDefaults.plist */, + 089C165FFE840EACC02AAC07 /* InfoPlist.strings */, + 2A37F4B9FDCFA73011CA2CEA /* Credits.rtf */, + 55D949111165D8870044178C /* draw-ellipse.png */, + 55D949121165D8870044178C /* draw-path.png */, + 555B30F811D8BE3300CAECF5 /* emblem-important.png */, + 5573B92411DA273400B5DC5D /* format-indent-less.png */, + 55D949131165D8870044178C /* select-rectangular.png */, + 5573B92011DA259C00B5DC5D /* text-x-generic.png */, + 559EFA5611C7D95F00D020F4 /* tikzit_dsa_pub.pem */, + 55D945701165904F0044178C /* tikzitdoc.icns */, + 55D945711165904F0044178C /* tikzit.icns */, + 7F90E88C16DD47540069EBCD /* Preferences.xib */, + 7FD5D44918E1CB5300E2A930 /* CustomNodes.xib */, + 7F18A322184C599100BC3081 /* UpdatePreferencePanel.xib */, + 55391AF713D3250F007DBE71 /* Preamble.xib */, + 55391AF513D324FE007DBE71 /* Preview.xib */, + 55391B0013D32608007DBE71 /* PropertyInspector.xib */, + 556979421168747B007E5703 /* StylePalette.xib */, + 1DDD58280DA1D0D100B32029 /* TikzDocument.xib */, + 1DDD582A0DA1D0D100B32029 /* MainMenu.xib */, + ); + name = Resources; + sourceTree = ""; + }; + 2A37F4C3FDCFA73011CA2CEA /* Frameworks */ = { + isa = PBXGroup; + children = ( + 1058C7A6FEA54F5311CA2CBB /* Linked Frameworks */, + 1058C7A8FEA54F5311CA2CBB /* Other Frameworks */, + ); + name = Frameworks; + sourceTree = ""; + }; + 5504C82611D23477002A1478 /* Test */ = { + isa = PBXGroup; + children = ( + 555B313411D8C6DA00CAECF5 /* color.m */, + 5504C93E11D39422002A1478 /* osx.m */, + 5504C82A11D23595002A1478 /* common.m */, + 5504C83111D23685002A1478 /* main.m */, + 5504C82B11D23595002A1478 /* parser.m */, + 5504C82C11D23595002A1478 /* test.h */, + 5504C82D11D23595002A1478 /* test.m */, + 7F6E2C8716B0091300BFE20D /* maths.m */, + ); + name = Test; + sourceTree = ""; + }; + 55391B0713D326E5007DBE71 /* PropertyInspector */ = { + isa = PBXGroup; + children = ( + 552202C2135F15FD007EA086 /* MultiField.h */, + 552202C3135F15FD007EA086 /* MultiField.m */, + 55900A9F135FA918002DD28E /* MultiCombo.h */, + 55900AA0135FA918002DD28E /* MultiCombo.m */, + 55391B0813D32765007DBE71 /* PropertyInspectorController.h */, + 55391B0913D32765007DBE71 /* PropertyInspectorController.m */, + ); + name = PropertyInspector; + sourceTree = ""; + }; + 55652E5013E1FC660023F4C6 /* shapes */ = { + isa = PBXGroup; + children = ( + 55652E5113E1FC660023F4C6 /* cap.tikz */, + 55652E5213E1FC660023F4C6 /* copants.tikz */, + 55652E5313E1FC660023F4C6 /* cup.tikz */, + 55652E5413E1FC660023F4C6 /* oval.tikz */, + 55652E5513E1FC660023F4C6 /* pants.tikz */, + ); + path = shapes; + sourceTree = ""; + }; + 5573B8BF11D9FD1800B5DC5D /* Preview */ = { + isa = PBXGroup; + children = ( + 7F734388184AC559002897D0 /* DraggablePDFView.h */, + 7F734389184AC559002897D0 /* DraggablePDFView.m */, + 5573B8C011D9FD3200B5DC5D /* PreviewController.h */, + 5573B8C111D9FD3200B5DC5D /* PreviewController.m */, + ); + name = Preview; + sourceTree = ""; + }; + 5573B90C11DA22E500B5DC5D /* Preamble */ = { + isa = PBXGroup; + children = ( + 5573B92711DA292F00B5DC5D /* Preambles.h */, + 5573B92811DA292F00B5DC5D /* Preambles.m */, + 5573BDC911DB4D2600B5DC5D /* Preambles+Coder.h */, + 5573BDCA11DB4D2600B5DC5D /* Preambles+Coder.m */, + ); + name = Preamble; + sourceTree = ""; + }; + 55900AFC13605498002DD28E /* Shapes */ = { + isa = PBXGroup; + children = ( + 55598E331635372E0023450A /* DiamondShape.h */, + 55598E341635372E0023450A /* DiamondShape.m */, + 55652E3F13E1FB0A0023F4C6 /* Shape.h */, + 55652E4013E1FB0A0023F4C6 /* Shape.m */, + 55652E3313E1FAED0023F4C6 /* CircleShape.h */, + 55652E3413E1FAED0023F4C6 /* CircleShape.m */, + 55652E3513E1FAED0023F4C6 /* RectangleShape.h */, + 55652E3613E1FAED0023F4C6 /* RectangleShape.m */, + 55652E3713E1FAED0023F4C6 /* RegularPolyShape.h */, + 55652E3813E1FAED0023F4C6 /* RegularPolyShape.m */, + 55652E3913E1FAEE0023F4C6 /* TikzShape.h */, + 55652E3A13E1FAEE0023F4C6 /* TikzShape.m */, + 555ECF361379E9F80052DB71 /* ShapeNames.h */, + ); + name = Shapes; + sourceTree = ""; + }; + 55D946071165922F0044178C /* Parser */ = { + isa = PBXGroup; + children = ( + 7F7B6DE218DE0BE1004F6CA8 /* Generated sources */, + 5589A9AA11C500060064D310 /* tikzlexer.lm */, + 5589A9AB11C500060064D310 /* tikzparser.ym */, + 5589A9FD11C51E780064D310 /* TikzGraphAssembler.h */, + 5589A9FE11C51E780064D310 /* TikzGraphAssembler.m */, + ); + name = Parser; + sourceTree = ""; + }; + 55D946141165924F0044178C /* Graph */ = { + isa = PBXGroup; + children = ( + 55432E041444BF2D00401BB3 /* GraphElementProperty.h */, + 55432E051444BF2D00401BB3 /* GraphElementProperty.m */, + 559EFB6611CB88E300D020F4 /* ColorRGB.h */, + 559EFB6711CB88E300D020F4 /* ColorRGB.m */, + 558F18B9117B031C009863B2 /* Edge.h */, + 558F18BA117B031C009863B2 /* Edge.m */, + 558F18BB117B031C009863B2 /* Graph.h */, + 558F18BC117B031C009863B2 /* Graph.m */, + 55D2E0B01186ED950060B4EC /* Graph+Coder.h */, + 55D2E0B11186ED950060B4EC /* Graph+Coder.m */, + 558F18BD117B031C009863B2 /* GraphChange.h */, + 558F18BE117B031C009863B2 /* GraphChange.m */, + 7FEED45516B1A7C400B056CB /* StyleManager.h */, + 7FEED45616B1A7C500B056CB /* StyleManager.m */, + 558F18BF117B031C009863B2 /* GraphElementData.h */, + 558F18C0117B031C009863B2 /* GraphElementData.m */, + 558F18C1117B031C009863B2 /* Node.h */, + 558F18C2117B031C009863B2 /* Node.m */, + 7F90E88416DD29600069EBCD /* NSString+Tikz.h */, + 7F90E88516DD29600069EBCD /* NSString+Tikz.m */, + 558F18C3117B031C009863B2 /* NodeStyle.h */, + 558F18C4117B031C009863B2 /* NodeStyle.m */, + 5585E5C0117F681800124513 /* NodeStyle+Coder.h */, + 5585E5C1117F681800124513 /* NodeStyle+Coder.m */, + 55397C7714498C21006942FB /* EdgeStyle.h */, + 55397C7814498C22006942FB /* EdgeStyle.m */, + 55397C7A144990EA006942FB /* EdgeStyle+Coder.h */, + 55397C7B144990EA006942FB /* EdgeStyle+Coder.m */, + 55397C7D144999C4006942FB /* PropertyHolder.h */, + 55397C7E144999C4006942FB /* PropertyHolder.m */, + ); + name = Graph; + sourceTree = ""; + }; + 55D9467311659F5E0044178C /* Gui */ = { + isa = PBXGroup; + children = ( + 7FB9BFE616B54BE300773146 /* Formatter */, + 55D9468011659FD50044178C /* GraphicsView */, + 5573B90C11DA22E500B5DC5D /* Preamble */, + 5573B8BF11D9FD1800B5DC5D /* Preview */, + 55391B0713D326E5007DBE71 /* PropertyInspector */, + 55D9468D11659FF00044178C /* StylePalette */, + 558F18EF117B043B009863B2 /* TikzDocument.h */, + 7F781C1816B5DE1400239826 /* ParseErrorView.h */, + 7F781C1916B5DE1400239826 /* ParseErrorView.m */, + 558F18F0117B043B009863B2 /* TikzDocument.m */, + 558F18F1117B043B009863B2 /* TikzSourceController.h */, + 558F18F2117B043B009863B2 /* TikzSourceController.m */, + 558F18F3117B043B009863B2 /* ToolPaletteController.h */, + 558F18F4117B043B009863B2 /* ToolPaletteController.m */, + 55CA997012F08281008F0368 /* TikzWindowController.h */, + 55CA997112F08281008F0368 /* TikzWindowController.m */, + 553A4C58144ED3D500AA6FAC /* NilToEmptyStringTransformer.h */, + 553A4C59144ED3D500AA6FAC /* NilToEmptyStringTransformer.m */, + 7F18A31E184C563800BC3081 /* Preferences */, + ); + name = Gui; + sourceTree = ""; + }; + 55D9468011659FD50044178C /* GraphicsView */ = { + isa = PBXGroup; + children = ( + 55900AFC13605498002DD28E /* Shapes */, + 558F18DD117B043B009863B2 /* EdgeControlLayer.h */, + 558F18DE117B043B009863B2 /* EdgeControlLayer.m */, + 558F18DF117B043B009863B2 /* GraphicsView.h */, + 558F18E0117B043B009863B2 /* GraphicsView.m */, + 558F18E1117B043B009863B2 /* Grid.h */, + 558F18E2117B043B009863B2 /* Grid.m */, + 558F18E3117B043B009863B2 /* NodeLayer.h */, + 558F18E4117B043B009863B2 /* NodeLayer.m */, + 558F18E5117B043B009863B2 /* NodeSelectionLayer.h */, + 558F18E6117B043B009863B2 /* NodeSelectionLayer.m */, + 55F958581181B09600F99434 /* PickSupport.h */, + 55F958591181B09600F99434 /* PickSupport.m */, + 55F9585A1181B09600F99434 /* Transformer.h */, + 55F9585B1181B09600F99434 /* Transformer.m */, + 5589AD4211C633EE0064D310 /* SelectBoxLayer.h */, + 5589AD4311C633EE0064D310 /* SelectBoxLayer.m */, + 555ECE991378A3AA0052DB71 /* CALayer+DrawLabel.h */, + 555ECE9A1378A3AA0052DB71 /* CALayer+DrawLabel.m */, + ); + name = GraphicsView; + sourceTree = ""; + }; + 55D9468D11659FF00044178C /* StylePalette */ = { + isa = PBXGroup; + children = ( + 558F18E9117B043B009863B2 /* SelectableCollectionViewItem.h */, + 558F18EA117B043B009863B2 /* SelectableCollectionViewItem.m */, + 558F18EB117B043B009863B2 /* SelectableNodeView.h */, + 558F18EC117B043B009863B2 /* SelectableNodeView.m */, + 558F18ED117B043B009863B2 /* StylePaletteController.h */, + 558F18EE117B043B009863B2 /* StylePaletteController.m */, + ); + name = StylePalette; + sourceTree = ""; + }; + 7F18A31E184C563800BC3081 /* Preferences */ = { + isa = PBXGroup; + children = ( + 7F7B6DEF18DE0D70004F6CA8 /* CustomNode */, + 5573B90D11DA231A00B5DC5D /* PreambleController.h */, + 5573B90E11DA231A00B5DC5D /* PreambleController.m */, + 7F90E88A16DD47540069EBCD /* PreferenceController.h */, + 7F90E88B16DD47540069EBCD /* PreferenceController.m */, + 7F18A31F184C577000BC3081 /* UpdatePreferenceController.h */, + 7F18A320184C577000BC3081 /* UpdatePreferenceController.m */, + ); + name = Preferences; + sourceTree = ""; + }; + 7F7B6DE218DE0BE1004F6CA8 /* Generated sources */ = { + isa = PBXGroup; + children = ( + 7F7B6DE918DE0C9E004F6CA8 /* tikzlexer.h */, + 7F7B6DEA18DE0C9E004F6CA8 /* tikzlexer.m */, + 7F7B6DEB18DE0C9E004F6CA8 /* tikzparser.h */, + 7F7B6DEC18DE0C9E004F6CA8 /* tikzparser.m */, + ); + name = "Generated sources"; + sourceTree = ""; + }; + 7F7B6DEF18DE0D70004F6CA8 /* CustomNode */ = { + isa = PBXGroup; + children = ( + 7F7B6DF018DE0D7A004F6CA8 /* CustomNodeCellView.h */, + 7F7B6DF118DE0D7A004F6CA8 /* CustomNodeCellView.m */, + 7F7B6DF218DE0D7A004F6CA8 /* CustomNodeController.h */, + 7F7B6DF318DE0D7A004F6CA8 /* CustomNodeController.m */, + ); + name = CustomNode; + sourceTree = ""; + }; + 7F93852C184D175400FAED38 /* Icons */ = { + isa = PBXGroup; + children = ( + 7F93852F184D178B00FAED38 /* engine.png */, + 7F938531184D184700FAED38 /* preamble.png */, + 7FD5D44C18E1CC0B00E2A930 /* customshape.png */, + 7F93852D184D176E00FAED38 /* updates.png */, + ); + name = Icons; + sourceTree = ""; + }; + 7FB9BFE616B54BE300773146 /* Formatter */ = { + isa = PBXGroup; + children = ( + 7FB9BFEC16B57C2E00773146 /* TikzFormatter.h */, + 7FB9BFED16B57C2E00773146 /* TikzFormatter.m */, + ); + name = Formatter; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 5589AA6411C5429C0064D310 /* tests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 5589AA8311C543240064D310 /* Build configuration list for PBXNativeTarget "tests" */; + buildPhases = ( + 5589AA6211C5429C0064D310 /* Sources */, + 5589AA6311C5429C0064D310 /* Frameworks */, + 7F6E2C8B16B00A9200BFE20D /* CopyFiles */, + ); + buildRules = ( + ); + dependencies = ( + 5504C91B11D36CD5002A1478 /* PBXTargetDependency */, + ); + name = tests; + productName = testparser; + productReference = 5504C83711D237F5002A1478 /* tests */; + productType = "com.apple.product-type.tool"; + }; + 8D15AC270486D014006FF6A4 /* TikZiT */ = { + isa = PBXNativeTarget; + buildConfigurationList = C05733C708A9546B00998B17 /* Build configuration list for PBXNativeTarget "TikZiT" */; + buildPhases = ( + 559EFA5511C7D4DD00D020F4 /* Copy Frameworks */, + 8D15AC2B0486D014006FF6A4 /* Resources */, + 55652E6613E1FD080023F4C6 /* Copy Shapes */, + 7F7B6DE018DE02AC004F6CA8 /* Run Flex */, + 7F7B6DE118DE0A6E004F6CA8 /* Run Bison */, + 8D15AC300486D014006FF6A4 /* Sources */, + 8D15AC330486D014006FF6A4 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = TikZiT; + productInstallPath = "$(HOME)/Applications"; + productName = TikZiT; + productReference = 8D15AC370486D014006FF6A4 /* TikZiT.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 2A37F4A9FDCFA73011CA2CEA /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0410; + ORGANIZATIONNAME = "Aleks Kissinger"; + }; + buildConfigurationList = C05733CB08A9546B00998B17 /* Build configuration list for PBXProject "TikZiT" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 1; + knownRegions = ( + English, + Japanese, + French, + German, + ); + mainGroup = 2A37F4AAFDCFA73011CA2CEA /* TikZiT */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 8D15AC270486D014006FF6A4 /* TikZiT */, + 5589AA6411C5429C0064D310 /* tests */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 8D15AC2B0486D014006FF6A4 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 8D15AC2C0486D014006FF6A4 /* Credits.rtf in Resources */, + 8D15AC2F0486D014006FF6A4 /* InfoPlist.strings in Resources */, + 7F938532184D184700FAED38 /* preamble.png in Resources */, + 1DDD582C0DA1D0D100B32029 /* TikzDocument.xib in Resources */, + 7F938530184D178B00FAED38 /* engine.png in Resources */, + 1DDD582D0DA1D0D100B32029 /* MainMenu.xib in Resources */, + 7FD5D44D18E1CC0B00E2A930 /* customshape.png in Resources */, + 55D945721165904F0044178C /* tikzitdoc.icns in Resources */, + 55D945731165904F0044178C /* tikzit.icns in Resources */, + 556979431168747B007E5703 /* StylePalette.xib in Resources */, + 55D949141165D8870044178C /* draw-ellipse.png in Resources */, + 55D949151165D8870044178C /* draw-path.png in Resources */, + 55D949161165D8870044178C /* select-rectangular.png in Resources */, + 559EFA5711C7D95F00D020F4 /* tikzit_dsa_pub.pem in Resources */, + 7F93852E184D176E00FAED38 /* updates.png in Resources */, + 555B30F911D8BE3300CAECF5 /* emblem-important.png in Resources */, + 55391AF613D324FE007DBE71 /* Preview.xib in Resources */, + 55391AF813D3250F007DBE71 /* Preamble.xib in Resources */, + 5573B92111DA259C00B5DC5D /* text-x-generic.png in Resources */, + 5573B92511DA273400B5DC5D /* format-indent-less.png in Resources */, + 5573B98811DA377C00B5DC5D /* text-x-script.png in Resources */, + 55E5E99E1215C8E300256F69 /* transform-crop-and-resize.png in Resources */, + 55900AE3135FB305002DD28E /* emblem-unreadable-grey.png in Resources */, + 55391B0213D32608007DBE71 /* PropertyInspector.xib in Resources */, + 55397C811449A877006942FB /* ED_arrow.png in Resources */, + 55397C831449A8F1006942FB /* ED_tick.png in Resources */, + 55397C851449A9BF006942FB /* ED_none.png in Resources */, + 55397C8A1449AB91006942FB /* AH_none.png in Resources */, + 55397C8B1449AB91006942FB /* AH_plain_tail.png in Resources */, + 55397C8D1449ABFC006942FB /* AH_latex_tail.png in Resources */, + 7FD5D44B18E1CB5300E2A930 /* CustomNodes.xib in Resources */, + 55397C901449AC7C006942FB /* AH_latex_head.png in Resources */, + 55397C911449AC7C006942FB /* AH_plain_head.png in Resources */, + 7F18A323184C599100BC3081 /* UpdatePreferencePanel.xib in Resources */, + 7F90E88E16DD47540069EBCD /* Preferences.xib in Resources */, + 7F90E89116DD54440069EBCD /* UserDefaults.plist in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 7F7B6DE018DE02AC004F6CA8 /* Run Flex */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "$(SRCROOT)/src/common/tikzlexer.lm", + ); + name = "Run Flex"; + outputPaths = ( + "$(DERIVED_SOURCES_DIR)/tikzlexer.m", + "$(DERIVED_SOURCES_DIR)/tikzlexer.h", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "cd ${SRCROOT}/src/\nexport INPUT_FILE_BASE=`basename \"${SCRIPT_INPUT_FILE_0}\" .lm`\nflex -o common/${INPUT_FILE_BASE}.m common/${INPUT_FILE_BASE}.lm\nmv common/${INPUT_FILE_BASE}.m common/${INPUT_FILE_BASE}.h ${DERIVED_SOURCES_DIR}\n"; + }; + 7F7B6DE118DE0A6E004F6CA8 /* Run Bison */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "$(SRCROOT)/src/common/tikzparser.ym", + ); + name = "Run Bison"; + outputPaths = ( + "$(DERIVED_SOURCES_DIR)/tikzparser.m", + "$(DERIVED_SOURCES_DIR)/tikzparser.h", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "cd ${SRCROOT}/src/\nexport INPUT_FILE_BASE=`basename \"${SCRIPT_INPUT_FILE_0}\" .ym`\nbison --defines=common/${INPUT_FILE_BASE}.h --output=common/${INPUT_FILE_BASE}.m common/${INPUT_FILE_BASE}.ym\nmv common/${INPUT_FILE_BASE}.m common/${INPUT_FILE_BASE}.h ${DERIVED_SOURCES_DIR}"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 5589AA6211C5429C0064D310 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 5504C84F11D23945002A1478 /* ColorRGB.m in Sources */, + 5589AA8511C543500064D310 /* util.m in Sources */, + 5589AA7211C542E60064D310 /* Edge.m in Sources */, + 5589AA7611C542E60064D310 /* Graph.m in Sources */, + 5589AA7811C542E60064D310 /* GraphChange.m in Sources */, + 5589AA7A11C542E60064D310 /* GraphElementData.m in Sources */, + 5589AA7C11C542E60064D310 /* Node.m in Sources */, + 5589AA8011C542E60064D310 /* NodeStyle.m in Sources */, + 5589AA6C11C542D30064D310 /* TikzGraphAssembler.m in Sources */, + 5589AA6D11C542D30064D310 /* tikzlexer.lm in Sources */, + 7F6E2C8216B008B000BFE20D /* DiamondShape.m in Sources */, + 7F6E2C8316B008B000BFE20D /* CircleShape.m in Sources */, + 7F6E2C8A16B0096000BFE20D /* SupportDir.m in Sources */, + 7F6E2C8416B008B000BFE20D /* RectangleShape.m in Sources */, + 7F6E2C8516B008B000BFE20D /* RegularPolyShape.m in Sources */, + 7F6E2C8616B008B000BFE20D /* TikzShape.m in Sources */, + 7F6E2C8016B0083300BFE20D /* Shape.m in Sources */, + 7F6E2C8116B0084600BFE20D /* Transformer.m in Sources */, + 5589AA6E11C542D30064D310 /* tikzparser.ym in Sources */, + 5504C82E11D23595002A1478 /* common.m in Sources */, + 5504C82F11D23595002A1478 /* parser.m in Sources */, + 5504C83011D23595002A1478 /* test.m in Sources */, + 7F6E2C7F16B0081D00BFE20D /* PropertyHolder.m in Sources */, + 5504C83211D23685002A1478 /* main.m in Sources */, + 5504C93F11D39422002A1478 /* osx.m in Sources */, + 555B313511D8C6DA00CAECF5 /* color.m in Sources */, + 7F6E2C7E16B0080400BFE20D /* GraphElementProperty.m in Sources */, + 7F6E2C7D16B007F000BFE20D /* EdgeStyle.m in Sources */, + 55CA9ACA12F831E5008F0368 /* RColor.m in Sources */, + 552202C4135F15FD007EA086 /* MultiField.m in Sources */, + 55900AA1135FA918002DD28E /* MultiCombo.m in Sources */, + 7F6E2C8916B0091300BFE20D /* maths.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 8D15AC300486D014006FF6A4 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 7F7B6DEE18DE0C9E004F6CA8 /* tikzparser.m in Sources */, + 7F7B6DED18DE0C9E004F6CA8 /* tikzlexer.m in Sources */, + 558F18C5117B031C009863B2 /* Edge.m in Sources */, + 558F18C6117B031C009863B2 /* Graph.m in Sources */, + 558F18C7117B031C009863B2 /* GraphChange.m in Sources */, + 7F7B6DF418DE0D7A004F6CA8 /* CustomNodeCellView.m in Sources */, + 558F18C8117B031C009863B2 /* GraphElementData.m in Sources */, + 558F18C9117B031C009863B2 /* Node.m in Sources */, + 558F18CA117B031C009863B2 /* NodeStyle.m in Sources */, + 558F18CE117B03DD009863B2 /* main.m in Sources */, + 558F18CF117B03DD009863B2 /* util.m in Sources */, + 558F18F7117B043C009863B2 /* AppDelegate.m in Sources */, + 558F18F9117B043C009863B2 /* EdgeControlLayer.m in Sources */, + 558F18FA117B043C009863B2 /* GraphicsView.m in Sources */, + 7F73438A184AC559002897D0 /* DraggablePDFView.m in Sources */, + 558F18FB117B043C009863B2 /* Grid.m in Sources */, + 558F18FC117B043C009863B2 /* NodeLayer.m in Sources */, + 558F18FD117B043C009863B2 /* NodeSelectionLayer.m in Sources */, + 558F18FF117B043C009863B2 /* SelectableCollectionViewItem.m in Sources */, + 558F1900117B043C009863B2 /* SelectableNodeView.m in Sources */, + 558F1901117B043C009863B2 /* StylePaletteController.m in Sources */, + 558F1902117B043C009863B2 /* TikzDocument.m in Sources */, + 558F1903117B043C009863B2 /* TikzSourceController.m in Sources */, + 558F1904117B043C009863B2 /* ToolPaletteController.m in Sources */, + 5585E5C2117F681800124513 /* NodeStyle+Coder.m in Sources */, + 55F9585C1181B09600F99434 /* PickSupport.m in Sources */, + 55F9585D1181B09600F99434 /* Transformer.m in Sources */, + 55D2E0B21186ED950060B4EC /* Graph+Coder.m in Sources */, + 5589A9FF11C51E780064D310 /* TikzGraphAssembler.m in Sources */, + 7F7B6DF518DE0D7A004F6CA8 /* CustomNodeController.m in Sources */, + 5589AD4411C633EE0064D310 /* SelectBoxLayer.m in Sources */, + 559EFB6811CB88E300D020F4 /* ColorRGB.m in Sources */, + 5573B8C211D9FD3200B5DC5D /* PreviewController.m in Sources */, + 5573B90F11DA231A00B5DC5D /* PreambleController.m in Sources */, + 5573B92911DA292F00B5DC5D /* Preambles.m in Sources */, + 5573BDCB11DB4D2600B5DC5D /* Preambles+Coder.m in Sources */, + 55F9E04511FF54F000F5659E /* NSString+LatexConstants.m in Sources */, + 55CA997212F08281008F0368 /* TikzWindowController.m in Sources */, + 55CA9AC912F831E5008F0368 /* RColor.m in Sources */, + 552202C5135F15FD007EA086 /* MultiField.m in Sources */, + 55900AA2135FA918002DD28E /* MultiCombo.m in Sources */, + 555ECE9B1378A3AA0052DB71 /* CALayer+DrawLabel.m in Sources */, + 55391B0A13D32765007DBE71 /* PropertyInspectorController.m in Sources */, + 55652DF913E1F2030023F4C6 /* SupportDir.m in Sources */, + 55652E3B13E1FAEE0023F4C6 /* CircleShape.m in Sources */, + 55652E3C13E1FAEE0023F4C6 /* RectangleShape.m in Sources */, + 55652E3D13E1FAEE0023F4C6 /* RegularPolyShape.m in Sources */, + 55652E3E13E1FAEE0023F4C6 /* TikzShape.m in Sources */, + 55652E4113E1FB0A0023F4C6 /* Shape.m in Sources */, + 55432E061444BF2D00401BB3 /* GraphElementProperty.m in Sources */, + 55397C7914498C22006942FB /* EdgeStyle.m in Sources */, + 55397C7C144990EA006942FB /* EdgeStyle+Coder.m in Sources */, + 55397C7F144999C4006942FB /* PropertyHolder.m in Sources */, + 553A4C5A144ED3D500AA6FAC /* NilToEmptyStringTransformer.m in Sources */, + 55598E351635372E0023450A /* DiamondShape.m in Sources */, + 7FEED45716B1A7C500B056CB /* StyleManager.m in Sources */, + 7FB9BFEE16B57C2E00773146 /* TikzFormatter.m in Sources */, + 7F781C1A16B5DE1400239826 /* ParseErrorView.m in Sources */, + 7F90E88616DD29600069EBCD /* NSString+Tikz.m in Sources */, + 7F90E88D16DD47540069EBCD /* PreferenceController.m in Sources */, + 7F18A321184C577000BC3081 /* UpdatePreferenceController.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 5504C91B11D36CD5002A1478 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 8D15AC270486D014006FF6A4 /* TikZiT */; + targetProxy = 5504C91A11D36CD5002A1478 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + 089C165FFE840EACC02AAC07 /* InfoPlist.strings */ = { + isa = PBXVariantGroup; + children = ( + 089C1660FE840EACC02AAC07 /* English */, + ); + name = InfoPlist.strings; + sourceTree = ""; + }; + 1DDD58280DA1D0D100B32029 /* TikzDocument.xib */ = { + isa = PBXVariantGroup; + children = ( + 1DDD58290DA1D0D100B32029 /* English */, + ); + name = TikzDocument.xib; + sourceTree = ""; + }; + 1DDD582A0DA1D0D100B32029 /* MainMenu.xib */ = { + isa = PBXVariantGroup; + children = ( + 1DDD582B0DA1D0D100B32029 /* English */, + ); + name = MainMenu.xib; + sourceTree = ""; + }; + 2A37F4B9FDCFA73011CA2CEA /* Credits.rtf */ = { + isa = PBXVariantGroup; + children = ( + 2A37F4BAFDCFA73011CA2CEA /* English */, + ); + name = Credits.rtf; + sourceTree = ""; + }; + 55391AF513D324FE007DBE71 /* Preview.xib */ = { + isa = PBXVariantGroup; + children = ( + 5573B8BD11D9FCD400B5DC5D /* English */, + ); + name = Preview.xib; + sourceTree = ""; + }; + 55391AF713D3250F007DBE71 /* Preamble.xib */ = { + isa = PBXVariantGroup; + children = ( + 5573B91011DA233E00B5DC5D /* English */, + ); + name = Preamble.xib; + sourceTree = ""; + }; + 55391B0013D32608007DBE71 /* PropertyInspector.xib */ = { + isa = PBXVariantGroup; + children = ( + 55391B0113D32608007DBE71 /* English */, + ); + name = PropertyInspector.xib; + sourceTree = ""; + }; + 556979421168747B007E5703 /* StylePalette.xib */ = { + isa = PBXVariantGroup; + children = ( + 55D947301165A5D40044178C /* English */, + ); + name = StylePalette.xib; + sourceTree = ""; + }; + 7F90E88F16DD54440069EBCD /* UserDefaults.plist */ = { + isa = PBXVariantGroup; + children = ( + 7F90E89016DD54440069EBCD /* English */, + ); + name = UserDefaults.plist; + sourceTree = ""; + }; + 7FD5D44918E1CB5300E2A930 /* CustomNodes.xib */ = { + isa = PBXVariantGroup; + children = ( + 7FD5D44A18E1CB5300E2A930 /* English */, + ); + name = CustomNodes.xib; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 5589AA6711C5429E0064D310 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/Frameworks\"", + ); + GCC_DYNAMIC_NO_PIC = NO; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; + INSTALL_PATH = /usr/local/bin; + OTHER_LDFLAGS = ( + "-framework", + Foundation, + "-framework", + AppKit, + ); + PRODUCT_NAME = tests; + SDKROOT = macosx; + }; + name = Debug; + }; + 5589AA6811C5429E0064D310 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/Frameworks\"", + ); + GCC_MODEL_TUNING = G5; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; + INSTALL_PATH = /usr/local/bin; + OTHER_LDFLAGS = ( + "-framework", + Foundation, + "-framework", + AppKit, + ); + PRODUCT_NAME = tests; + SDKROOT = macosx; + ZERO_LINK = NO; + }; + name = Release; + }; + C05733C808A9546B00998B17 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CLANG_ENABLE_OBJC_ARC = YES; + COMBINE_HIDPI_IMAGES = YES; + COPY_PHASE_STRIP = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)\"", + "\"$(SRCROOT)/Frameworks\"", + ); + GCC_DYNAMIC_NO_PIC = NO; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = TikZiT_Prefix.pch; + INFOPLIST_FILE = "TikZiT-Info.plist"; + INSTALL_PATH = "$(HOME)/Applications"; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.7; + PRODUCT_NAME = TikZiT; + SDKROOT = macosx; + }; + name = Debug; + }; + C05733C908A9546B00998B17 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CLANG_ENABLE_OBJC_ARC = YES; + COMBINE_HIDPI_IMAGES = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)\"", + "\"$(SRCROOT)/Frameworks\"", + ); + GCC_MODEL_TUNING = G5; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = TikZiT_Prefix.pch; + INFOPLIST_FILE = "TikZiT-Info.plist"; + INSTALL_PATH = "$(HOME)/Applications"; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.7; + PRODUCT_NAME = TikZiT; + SDKROOT = macosx; + }; + name = Release; + }; + C05733CC08A9546B00998B17 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = ""; + MACOSX_DEPLOYMENT_TARGET = 10.5; + ONLY_ACTIVE_ARCH = YES; + PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO; + SDKROOT = macosx; + SYMROOT = xbuild; + USER_HEADER_SEARCH_PATHS = "src/osx src/common"; + VALID_ARCHS = "i386 x86_64"; + }; + name = Debug; + }; + C05733CD08A9546B00998B17 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = ""; + MACOSX_DEPLOYMENT_TARGET = 10.5; + ONLY_ACTIVE_ARCH = NO; + PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO; + SDKROOT = macosx; + SYMROOT = xbuild; + USER_HEADER_SEARCH_PATHS = "src/osx src/common"; + VALID_ARCHS = "i386 x86_64"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 5589AA8311C543240064D310 /* Build configuration list for PBXNativeTarget "tests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 5589AA6711C5429E0064D310 /* Debug */, + 5589AA6811C5429E0064D310 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + C05733C708A9546B00998B17 /* Build configuration list for PBXNativeTarget "TikZiT" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + C05733C808A9546B00998B17 /* Debug */, + C05733C908A9546B00998B17 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + C05733CB08A9546B00998B17 /* Build configuration list for PBXProject "TikZiT" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + C05733CC08A9546B00998B17 /* Debug */, + C05733CD08A9546B00998B17 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 2A37F4A9FDCFA73011CA2CEA /* Project object */; +} diff --git a/tikzit-1/TikZiT.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/tikzit-1/TikZiT.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..82f3c48 --- /dev/null +++ b/tikzit-1/TikZiT.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/tikzit-1/TikZiT.xcodeproj/project.xcworkspace/xcshareddata/TikZiT.xccheckout b/tikzit-1/TikZiT.xcodeproj/project.xcworkspace/xcshareddata/TikZiT.xccheckout new file mode 100644 index 0000000..c3ec4fe --- /dev/null +++ b/tikzit-1/TikZiT.xcodeproj/project.xcworkspace/xcshareddata/TikZiT.xccheckout @@ -0,0 +1,37 @@ + + + + + IDESourceControlProjectFavoriteDictionaryKey + + IDESourceControlProjectIdentifier + 26857C1F-E0FE-4FFB-BDAC-44158C649772 + IDESourceControlProjectOriginsDictionary + + F6FA2C351D428A0F1026539971510A626DEEFF59 + https://github.com/tikzit/tikzit.git + + IDESourceControlProjectRelativeInstallPathDictionary + + F6FA2C351D428A0F1026539971510A626DEEFF59 + TikZiT/ + + IDESourceControlProjectURL + https://github.com/tikzit/tikzit.git + IDESourceControlProjectVersion + 111 + IDESourceControlProjectWCCIdentifier + F6FA2C351D428A0F1026539971510A626DEEFF59 + IDESourceControlProjectWCConfigurations + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + F6FA2C351D428A0F1026539971510A626DEEFF59 + IDESourceControlWCCName + TikZiT + + + + diff --git a/tikzit-1/TikZiT.xcodeproj/project.xcworkspace/xcuserdata/aleks.xcuserdatad/UserInterfaceState.xcuserstate b/tikzit-1/TikZiT.xcodeproj/project.xcworkspace/xcuserdata/aleks.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000..99a5997 --- /dev/null +++ b/tikzit-1/TikZiT.xcodeproj/project.xcworkspace/xcuserdata/aleks.xcuserdatad/UserInterfaceState.xcuserstate @@ -0,0 +1,24539 @@ + + + + + $archiver + NSKeyedArchiver + $objects + + $null + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 2 + + + CF$UID + 3 + + + CF$UID + 4 + + + CF$UID + 5 + + + NS.objects + + + CF$UID + 6 + + + CF$UID + 194 + + + CF$UID + 441 + + + CF$UID + 533 + + + + 5D4A1A9F-B7F3-4B80-B1F2-42874F168C6C + FCF6616B-37CA-49A5-B7DD-7EC65F973E7D + E8D758DD-8E38-40E4-B712-F6B0919F77C9 + IDEWorkspaceDocument + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 7 + + + CF$UID + 8 + + + CF$UID + 9 + + + CF$UID + 10 + + + CF$UID + 11 + + + CF$UID + 12 + + + CF$UID + 13 + + + CF$UID + 14 + + + NS.objects + + + CF$UID + 15 + + + CF$UID + 192 + + + CF$UID + 193 + + + CF$UID + 25 + + + CF$UID + 2 + + + CF$UID + 7 + + + CF$UID + 25 + + + CF$UID + 25 + + + + IDEWorkspaceTabController_255C042C-F813-417B-AD8A-811609B9E1F2 + IDEWindowFrame + IDEOrderedWorkspaceTabControllers + IDEWindowInFullscreenMode + IDEWorkspaceWindowControllerUniqueIdentifier + IDEActiveWorkspaceTabController + IDEWindowToolbarIsVisible + IDEWindowTabBarIsVisible + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 16 + + + CF$UID + 17 + + + CF$UID + 18 + + + CF$UID + 19 + + + CF$UID + 20 + + + CF$UID + 21 + + + CF$UID + 22 + + + CF$UID + 23 + + + NS.objects + + + CF$UID + 24 + + + CF$UID + 25 + + + CF$UID + 26 + + + CF$UID + 27 + + + CF$UID + 40 + + + CF$UID + 78 + + + CF$UID + 25 + + + CF$UID + 87 + + + + IDETabLabel + IDEShowNavigator + AssistantEditorsLayout + IDEWorkspaceTabControllerUtilityAreaSplitView + IDENavigatorArea + IDEWorkspaceTabControllerDesignAreaSplitView + IDEShowUtilities + IDEEditorArea + Graph.m + + 0 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 28 + + + NS.objects + + + CF$UID + 29 + + + + DVTSplitViewItems + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 30 + + + CF$UID + 36 + + + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 33 + + + CF$UID + 34 + + + + DVTIdentifier + DVTViewMagnitude + + 127 + + $classes + + NSDictionary + NSObject + + $classname + NSDictionary + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 33 + + + CF$UID + 37 + + + + 473 + + $classes + + NSMutableArray + NSArray + NSObject + + $classname + NSMutableArray + + + $classes + + NSMutableDictionary + NSDictionary + NSObject + + $classname + NSMutableDictionary + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 41 + + + CF$UID + 42 + + + NS.objects + + + CF$UID + 42 + + + CF$UID + 43 + + + + SelectedNavigator + Xcode.IDEKit.Navigator.Structure + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 44 + + + CF$UID + 45 + + + CF$UID + 46 + + + CF$UID + 47 + + + CF$UID + 48 + + + CF$UID + 49 + + + CF$UID + 50 + + + NS.objects + + + CF$UID + 51 + + + CF$UID + 25 + + + CF$UID + 52 + + + CF$UID + 25 + + + CF$UID + 25 + + + CF$UID + 54 + + + CF$UID + 61 + + + + IDEVisibleRect + IDEUnsavedDocumentFilteringEnabled + IDENavigatorExpandedItemsBeforeFilteringSet + IDERecentDocumentFilteringEnabled + IDESCMStatusFilteringEnabled + IDESelectedObjects + IDEExpandedItemsSet + {{0, 0}, {0, 0}} + + $class + + CF$UID + 53 + + NS.objects + + + + $classes + + NSSet + NSObject + + $classname + NSSet + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 55 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 56 + + + CF$UID + 57 + + + CF$UID + 58 + + + CF$UID + 59 + + + + TikZiT + TikZiT + Graph + Graph.m + + $classes + + NSArray + NSObject + + $classname + NSArray + + + $class + + CF$UID + 53 + + NS.objects + + + CF$UID + 62 + + + CF$UID + 63 + + + CF$UID + 65 + + + CF$UID + 66 + + + CF$UID + 68 + + + CF$UID + 72 + + + CF$UID + 73 + + + CF$UID + 75 + + + CF$UID + 76 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 56 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 56 + + + CF$UID + 64 + + + + Resources + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 56 + + + CF$UID + 57 + + + CF$UID + 58 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 56 + + + CF$UID + 57 + + + CF$UID + 67 + + + + Parser + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 56 + + + CF$UID + 69 + + + CF$UID + 70 + + + CF$UID + 71 + + + + Frameworks + Linked Frameworks + SFBInspectors.framework + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 56 + + + CF$UID + 69 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 56 + + + CF$UID + 64 + + + CF$UID + 74 + + + + shapes + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 56 + + + CF$UID + 69 + + + CF$UID + 70 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 56 + + + CF$UID + 77 + + + + Other Sources + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 28 + + + NS.objects + + + CF$UID + 79 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 80 + + + CF$UID + 82 + + + CF$UID + 84 + + + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 20 + + + CF$UID + 81 + + + + 225 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 23 + + + CF$UID + 83 + + + + 815 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 85 + + + CF$UID + 86 + + + + IDEUtilitiesArea + 260 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 88 + + + CF$UID + 89 + + + CF$UID + 90 + + + CF$UID + 91 + + + CF$UID + 92 + + + CF$UID + 93 + + + CF$UID + 94 + + + CF$UID + 95 + + + NS.objects + + + CF$UID + 96 + + + CF$UID + 116 + + + CF$UID + 156 + + + CF$UID + 182 + + + CF$UID + 26 + + + CF$UID + 183 + + + CF$UID + 191 + + + CF$UID + 25 + + + + layoutTree + IDEEditorMode_Standard + IDEEDitorArea_DebugArea + IDEShowEditor + EditorMode + DebuggerSplitView + DefaultPersistentRepresentations + ShowDebuggerArea + + $class + + CF$UID + 115 + + geniusEditorContextNode + + CF$UID + 0 + + primaryEditorContextNode + + CF$UID + 97 + + rootLayoutTreeNode + + CF$UID + 112 + + + + $class + + CF$UID + 114 + + children + + CF$UID + 0 + + contentType + 1 + documentArchivableRepresentation + + CF$UID + 98 + + orientation + 0 + parent + + CF$UID + 112 + + + + $class + + CF$UID + 111 + + DocumentLocation + + CF$UID + 107 + + DomainIdentifier + + CF$UID + 99 + + IdentifierPath + + CF$UID + 100 + + IndexOfDocumentIdentifier + + CF$UID + 26 + + + Xcode.IDENavigableItemDomain.WorkspaceStructure + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 101 + + + CF$UID + 103 + + + CF$UID + 104 + + + CF$UID + 105 + + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 59 + + + + $classes + + IDEArchivableStringIndexPair + NSObject + + $classname + IDEArchivableStringIndexPair + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 58 + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 57 + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 106 + + + TikZiT + + $class + + CF$UID + 110 + + documentURL + + CF$UID + 108 + + timestamp + + CF$UID + 0 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/git/tikzit/tikzit/src/common/Graph.m + + + $classes + + NSMutableString + NSString + NSObject + + $classname + NSMutableString + + + $classes + + DVTDocumentLocation + NSObject + + $classname + DVTDocumentLocation + + + $classes + + IDENavigableItemArchivableRepresentation + NSObject + + $classname + IDENavigableItemArchivableRepresentation + + + $class + + CF$UID + 114 + + children + + CF$UID + 113 + + contentType + 0 + documentArchivableRepresentation + + CF$UID + 0 + + orientation + 0 + parent + + CF$UID + 0 + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 97 + + + + + $classes + + IDEWorkspaceTabControllerLayoutTreeNode + NSObject + + $classname + IDEWorkspaceTabControllerLayoutTreeNode + + + $classes + + IDEWorkspaceTabControllerLayoutTree + NSObject + + $classname + IDEWorkspaceTabControllerLayoutTree + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 117 + + + NS.objects + + + CF$UID + 118 + + + + EditorLayout_PersistentRepresentation + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 119 + + + NS.objects + + + CF$UID + 120 + + + + Main + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 121 + + + CF$UID + 122 + + + CF$UID + 123 + + + NS.objects + + + CF$UID + 124 + + + CF$UID + 26 + + + CF$UID + 154 + + + + EditorLayout_StateSavingStateDictionaries + EditorLayout_Selected + EditorLayout_Geometry + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 125 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 126 + + + CF$UID + 127 + + + CF$UID + 128 + + + CF$UID + 129 + + + CF$UID + 130 + + + CF$UID + 131 + + + CF$UID + 132 + + + NS.objects + + + CF$UID + 133 + + + CF$UID + 134 + + + CF$UID + 141 + + + CF$UID + 149 + + + CF$UID + 59 + + + CF$UID + 150 + + + CF$UID + 151 + + + + FileDataType + ArchivableRepresentation + EditorState + NavigableItemName + DocumentNavigableItemName + DocumentExtensionIdentifier + DocumentURL + public.objective-c-source + + $class + + CF$UID + 111 + + DocumentLocation + + CF$UID + 107 + + DomainIdentifier + + CF$UID + 99 + + IdentifierPath + + CF$UID + 135 + + IndexOfDocumentIdentifier + + CF$UID + 26 + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 136 + + + CF$UID + 137 + + + CF$UID + 138 + + + CF$UID + 139 + + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 59 + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 58 + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 57 + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 140 + + + TikZiT + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 142 + + + CF$UID + 143 + + + CF$UID + 144 + + + CF$UID + 145 + + + NS.objects + + + CF$UID + 146 + + + CF$UID + 147 + + + CF$UID + 25 + + + CF$UID + 148 + + + + PrimaryDocumentTimestamp + PrimaryDocumentVisibleCharacterRange + HideAllIssues + PrimaryDocumentSelectedCharacterRange + 381083683.77450001 + {18089, 1176} + {19467, 0} + -tikz + Xcode.IDEKit.EditorDocument.SourceCode + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 152 + + + file://localhost/Users/aleks/git/tikzit/tikzit/src/common/Graph.m + + $classes + + NSURL + NSObject + + $classname + NSURL + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 155 + + + + {{0, 0}, {600, 600}} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 157 + + + CF$UID + 158 + + + CF$UID + 159 + + + CF$UID + 160 + + + CF$UID + 161 + + + CF$UID + 162 + + + NS.objects + + + CF$UID + 163 + + + CF$UID + 164 + + + CF$UID + 166 + + + CF$UID + 163 + + + CF$UID + 168 + + + CF$UID + 176 + + + + LayoutFocusMode + console + variables + LayoutMode + IDEDebugArea_SplitView + IDEDebuggerAreaSplitView + 1 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 165 + + + NS.objects + + + CF$UID + 26 + + + + ConsoleFilterMode + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 167 + + + NS.objects + + + CF$UID + 163 + + + + VariablesViewSelectedScope + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 28 + + + NS.objects + + + CF$UID + 169 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 170 + + + CF$UID + 173 + + + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 171 + + + CF$UID + 172 + + + + VariablesView + 301 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 174 + + + CF$UID + 175 + + + + ConsoleArea + 298 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 28 + + + NS.objects + + + CF$UID + 177 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 178 + + + CF$UID + 180 + + + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 171 + + + CF$UID + 179 + + + + 301 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 174 + + + CF$UID + 181 + + + + 298 + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 28 + + + NS.objects + + + CF$UID + 184 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 185 + + + CF$UID + 188 + + + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 186 + + + CF$UID + 187 + + + + IDEEditor + 203 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 189 + + + CF$UID + 190 + + + + IDEDebuggerArea + 115 + + $class + + CF$UID + 39 + + NS.keys + + NS.objects + + + {{264, 446}, {600, 624}} + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 7 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 8 + + + CF$UID + 9 + + + CF$UID + 195 + + + CF$UID + 10 + + + CF$UID + 196 + + + CF$UID + 12 + + + CF$UID + 13 + + + CF$UID + 14 + + + NS.objects + + + CF$UID + 197 + + + CF$UID + 198 + + + CF$UID + 199 + + + CF$UID + 25 + + + CF$UID + 3 + + + CF$UID + 195 + + + CF$UID + 182 + + + CF$UID + 25 + + + + IDEWorkspaceTabController_9038AF6D-AD9C-4682-ADF8-6CB1A302CFE7 + IDEWorkspaceWindowControllerUniqueIdentifier + {{447, 347}, {1300, 786}} + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 195 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 18 + + + CF$UID + 17 + + + CF$UID + 16 + + + CF$UID + 19 + + + CF$UID + 20 + + + CF$UID + 21 + + + CF$UID + 22 + + + CF$UID + 23 + + + NS.objects + + + CF$UID + 26 + + + CF$UID + 182 + + + CF$UID + 200 + + + CF$UID + 201 + + + CF$UID + 207 + + + CF$UID + 281 + + + CF$UID + 182 + + + CF$UID + 289 + + + + Graph.m + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 28 + + + NS.objects + + + CF$UID + 202 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 203 + + + CF$UID + 205 + + + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 33 + + + CF$UID + 204 + + + + 403 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 33 + + + CF$UID + 206 + + + + 307 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 208 + + + CF$UID + 41 + + + CF$UID + 209 + + + CF$UID + 210 + + + CF$UID + 211 + + + CF$UID + 42 + + + CF$UID + 212 + + + NS.objects + + + CF$UID + 213 + + + CF$UID + 42 + + + CF$UID + 224 + + + CF$UID + 241 + + + CF$UID + 247 + + + CF$UID + 258 + + + CF$UID + 273 + + + + Xcode.IDEKit.Navigator.Symbol + Xcode.IDEKit.Navigator.Issues + Xcode.IDEKit.Navigator.Debug + Xcode.IDEKit.Navigator.Breakpoints + Xcode.IDEKit.Navigator.Logs + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 214 + + + CF$UID + 215 + + + CF$UID + 216 + + + CF$UID + 217 + + + CF$UID + 218 + + + CF$UID + 219 + + + CF$UID + 220 + + + NS.objects + + + CF$UID + 182 + + + CF$UID + 182 + + + CF$UID + 25 + + + CF$UID + 182 + + + CF$UID + 221 + + + CF$UID + 222 + + + CF$UID + 223 + + + + IDESymbolNavigatorShowWorkspaceOnly + IDESymbolNavigatorShowHierarchy + IDESymbolNavigatorShowContainersOnly + IDESymbolNavigatorShowClassesOnly + IDESymbolNamePatternString + IDESymbolNavigatorSelectedSymbols + IDEExpandedItems + + + $class + + CF$UID + 38 + + NS.objects + + + + $class + + CF$UID + 38 + + NS.objects + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 225 + + + CF$UID + 226 + + + CF$UID + 227 + + + CF$UID + 228 + + + CF$UID + 229 + + + CF$UID + 230 + + + CF$UID + 231 + + + CF$UID + 232 + + + CF$UID + 233 + + + NS.objects + + + CF$UID + 25 + + + CF$UID + 234 + + + CF$UID + 235 + + + CF$UID + 237 + + + CF$UID + 238 + + + CF$UID + 25 + + + CF$UID + 239 + + + CF$UID + 25 + + + CF$UID + 240 + + + + IDEErrorFilteringEnabled + IDEVisibleRect + IDECollapsedFiles + IDEExpandedIssues + IDESelectedNavigables + IDEShowsByType + IDECollapsedTypes + IDERecentFilteringEnabled + IDECollapsedGroups + {{0, 0}, {209, 644}} + + $class + + CF$UID + 236 + + NS.objects + + + + $classes + + NSMutableSet + NSSet + NSObject + + $classname + NSMutableSet + + + $class + + CF$UID + 236 + + NS.objects + + + + $class + + CF$UID + 38 + + NS.objects + + + + $class + + CF$UID + 236 + + NS.objects + + + + $class + + CF$UID + 236 + + NS.objects + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 242 + + + CF$UID + 243 + + + CF$UID + 244 + + + NS.objects + + + CF$UID + 245 + + + CF$UID + 246 + + + CF$UID + 25 + + + + IDEStackCompressionValue + IDEThreadOrQueueMode + IDEShowOnlyInterestingContent + 2 + 0 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 248 + + + CF$UID + 249 + + + CF$UID + 250 + + + CF$UID + 251 + + + NS.objects + + + CF$UID + 52 + + + CF$UID + 25 + + + CF$UID + 252 + + + CF$UID + 257 + + + + IDECollapsedtemsSet + IDEBreakpointNavigatorFilterOnEnabled + IDESelectedObjects + IDEVisibleRect + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 253 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 254 + + + CF$UID + 255 + + + CF$UID + 256 + + + + TikZiT + SelectableNodeView.m + -setNodeStyle: + {{0, 0}, {224, 686}} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 44 + + + CF$UID + 45 + + + CF$UID + 46 + + + CF$UID + 47 + + + CF$UID + 48 + + + CF$UID + 49 + + + CF$UID + 50 + + + NS.objects + + + CF$UID + 259 + + + CF$UID + 25 + + + CF$UID + 52 + + + CF$UID + 25 + + + CF$UID + 25 + + + CF$UID + 260 + + + CF$UID + 263 + + + + {{0, 0}, {209, 666}} + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 261 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 262 + + + CF$UID + 57 + + + CF$UID + 58 + + + CF$UID + 59 + + + + TikZiT + + $class + + CF$UID + 53 + + NS.objects + + + CF$UID + 264 + + + CF$UID + 265 + + + CF$UID + 266 + + + CF$UID + 267 + + + CF$UID + 268 + + + CF$UID + 269 + + + CF$UID + 270 + + + CF$UID + 271 + + + CF$UID + 272 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 262 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 262 + + + CF$UID + 64 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 262 + + + CF$UID + 57 + + + CF$UID + 67 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 262 + + + CF$UID + 69 + + + CF$UID + 70 + + + CF$UID + 71 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 262 + + + CF$UID + 64 + + + CF$UID + 74 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 262 + + + CF$UID + 69 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 262 + + + CF$UID + 77 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 262 + + + CF$UID + 57 + + + CF$UID + 58 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 262 + + + CF$UID + 69 + + + CF$UID + 70 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 274 + + + CF$UID + 275 + + + CF$UID + 276 + + + CF$UID + 277 + + + NS.objects + + + CF$UID + 278 + + + CF$UID + 279 + + + CF$UID + 25 + + + CF$UID + 280 + + + + IDELogNavigatorExpandedItemsStateKey + IDELogNavigatorSelectedObjectsStateKey + IDELogNavigatorRecentFilterStateKey + IDELogNavigatorVisibleRectStateKey + + $class + + CF$UID + 38 + + NS.objects + + + + $class + + CF$UID + 38 + + NS.objects + + + {{0, 0}, {464, 738}} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 28 + + + NS.objects + + + CF$UID + 282 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 283 + + + CF$UID + 285 + + + CF$UID + 287 + + + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 20 + + + CF$UID + 284 + + + + 225 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 23 + + + CF$UID + 286 + + + + 815 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 85 + + + CF$UID + 288 + + + + 260 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 95 + + + CF$UID + 89 + + + CF$UID + 90 + + + CF$UID + 91 + + + CF$UID + 92 + + + CF$UID + 290 + + + CF$UID + 93 + + + CF$UID + 94 + + + CF$UID + 291 + + + CF$UID + 88 + + + NS.objects + + + CF$UID + 182 + + + CF$UID + 292 + + + CF$UID + 314 + + + CF$UID + 182 + + + CF$UID + 26 + + + CF$UID + 329 + + + CF$UID + 368 + + + CF$UID + 374 + + + CF$UID + 375 + + + CF$UID + 430 + + + + IDEEditorMode_Version + IDEEditorMode_Genius + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 117 + + + NS.objects + + + CF$UID + 293 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 119 + + + NS.objects + + + CF$UID + 294 + + + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 121 + + + CF$UID + 122 + + + CF$UID + 123 + + + NS.objects + + + CF$UID + 295 + + + CF$UID + 26 + + + CF$UID + 312 + + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 296 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 126 + + + CF$UID + 127 + + + CF$UID + 128 + + + CF$UID + 129 + + + CF$UID + 130 + + + CF$UID + 131 + + + CF$UID + 132 + + + NS.objects + + + CF$UID + 133 + + + CF$UID + 297 + + + CF$UID + 306 + + + CF$UID + 149 + + + CF$UID + 59 + + + CF$UID + 150 + + + CF$UID + 310 + + + + + $class + + CF$UID + 111 + + DocumentLocation + + CF$UID + 305 + + DomainIdentifier + + CF$UID + 298 + + IdentifierPath + + CF$UID + 299 + + IndexOfDocumentIdentifier + + CF$UID + 26 + + + Xcode.IDENavigableItemDomain.WorkspaceStructure + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 300 + + + CF$UID + 301 + + + CF$UID + 302 + + + CF$UID + 303 + + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 59 + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 58 + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 57 + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 304 + + + TikZiT + + $class + + CF$UID + 110 + + documentURL + + CF$UID + 108 + + timestamp + + CF$UID + 0 + + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 142 + + + CF$UID + 143 + + + CF$UID + 144 + + + CF$UID + 145 + + + NS.objects + + + CF$UID + 307 + + + CF$UID + 308 + + + CF$UID + 25 + + + CF$UID + 309 + + + + 381083686.29558802 + {18344, 1251} + {19467, 0} + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 311 + + + file://localhost/Users/aleks/git/tikzit/tikzit/src/common/Graph.m + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 313 + + + + {{0, 0}, {815, 588}} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 157 + + + CF$UID + 158 + + + CF$UID + 161 + + + CF$UID + 160 + + + CF$UID + 162 + + + CF$UID + 159 + + + NS.objects + + + CF$UID + 163 + + + CF$UID + 315 + + + CF$UID + 316 + + + CF$UID + 163 + + + CF$UID + 322 + + + CF$UID + 328 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 165 + + + NS.objects + + + CF$UID + 26 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 28 + + + NS.objects + + + CF$UID + 317 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 318 + + + CF$UID + 320 + + + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 171 + + + CF$UID + 319 + + + + 389 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 174 + + + CF$UID + 321 + + + + 425 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 28 + + + NS.objects + + + CF$UID + 323 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 324 + + + CF$UID + 326 + + + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 171 + + + CF$UID + 325 + + + + 389 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 174 + + + CF$UID + 327 + + + + 425 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 167 + + + NS.objects + + + CF$UID + 26 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 330 + + + CF$UID + 331 + + + NS.objects + + + CF$UID + 246 + + + CF$UID + 332 + + + + VersionsEditorSubmode + EditorLayout_PersistentRepresentation + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 333 + + + NS.objects + + + CF$UID + 334 + + + + Main + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 335 + + + CF$UID + 336 + + + CF$UID + 337 + + + NS.objects + + + CF$UID + 338 + + + CF$UID + 246 + + + CF$UID + 366 + + + + EditorLayout_StateSavingStateDictionaries + EditorLayout_Selected + EditorLayout_Geometry + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 339 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 340 + + + CF$UID + 341 + + + CF$UID + 342 + + + CF$UID + 343 + + + CF$UID + 344 + + + CF$UID + 345 + + + CF$UID + 346 + + + NS.objects + + + CF$UID + 347 + + + CF$UID + 348 + + + CF$UID + 356 + + + CF$UID + 351 + + + CF$UID + 351 + + + CF$UID + 363 + + + CF$UID + 364 + + + + FileDataType + ArchivableRepresentation + EditorState + NavigableItemName + DocumentNavigableItemName + DocumentExtensionIdentifier + DocumentURL + com.apple.xml-property-list + + $class + + CF$UID + 111 + + DocumentLocation + + CF$UID + 354 + + DomainIdentifier + + CF$UID + 298 + + IdentifierPath + + CF$UID + 349 + + IndexOfDocumentIdentifier + + CF$UID + 26 + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 350 + + + CF$UID + 352 + + + CF$UID + 353 + + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 351 + + + TikZiT-Info.plist + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 64 + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 254 + + + + $class + + CF$UID + 110 + + documentURL + + CF$UID + 355 + + timestamp + + CF$UID + 0 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/TikZiT-Info.plist + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 357 + + + CF$UID + 358 + + + CF$UID + 359 + + + NS.objects + + + CF$UID + 360 + + + CF$UID + 361 + + + CF$UID + 362 + + + + PrimaryDocumentSelectedCharacterRange + PrimaryDocumentVisibleCharacterRange + PrimaryDocumentTimestamp + {0, 0} + {0, 1053} + 348502952.18491101 + Xcode.IDEKit.EditorDocument.SourceCode-from-Plist + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 365 + + + file://localhost/Users/aleks/svn/tikzit/tikzit/TikZiT-Info.plist + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 367 + + + + {{0, 0}, {815, 602}} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 28 + + + NS.objects + + + CF$UID + 369 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 370 + + + CF$UID + 372 + + + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 186 + + + CF$UID + 371 + + + + 610 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 189 + + + CF$UID + 373 + + + + 100 + + $class + + CF$UID + 39 + + NS.keys + + NS.objects + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 376 + + + CF$UID + 331 + + + NS.objects + + + CF$UID + 377 + + + CF$UID + 378 + + + + SplitPosition + 0.4993864893913269 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 379 + + + CF$UID + 333 + + + NS.objects + + + CF$UID + 380 + + + CF$UID + 409 + + + + Alternate + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 335 + + + CF$UID + 336 + + + CF$UID + 337 + + + NS.objects + + + CF$UID + 381 + + + CF$UID + 246 + + + CF$UID + 407 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 382 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 340 + + + CF$UID + 341 + + + CF$UID + 342 + + + CF$UID + 343 + + + CF$UID + 344 + + + CF$UID + 345 + + + CF$UID + 346 + + + NS.objects + + + CF$UID + 383 + + + CF$UID + 384 + + + CF$UID + 399 + + + CF$UID + 387 + + + CF$UID + 387 + + + CF$UID + 404 + + + CF$UID + 405 + + + + public.c-header + + $class + + CF$UID + 111 + + DocumentLocation + + CF$UID + 397 + + DomainIdentifier + + CF$UID + 0 + + IdentifierPath + + CF$UID + 385 + + IndexOfDocumentIdentifier + + CF$UID + 26 + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 386 + + + CF$UID + 388 + + + CF$UID + 390 + + + CF$UID + 391 + + + CF$UID + 394 + + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 387 + + + Graph.h + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 389 + + + Graph + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 254 + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 392 + + + CF$UID + 393 + + + NS.objects + + + CF$UID + 298 + + + CF$UID + 254 + + + + manualDomainIdentifier + navigableItem_name + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 395 + + + NS.objects + + + CF$UID + 396 + + + + identifier + Xcode.IDEKit.GeniusCategory.Manual + + $class + + CF$UID + 110 + + documentURL + + CF$UID + 398 + + timestamp + + CF$UID + 0 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/Graph.h + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 401 + + + CF$UID + 402 + + + CF$UID + 25 + + + CF$UID + 403 + + + + HideAllIssues + 348502936.56562501 + {1735, 943} + {998, 0} + Xcode.IDEKit.EditorDocument.SourceCode + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 406 + + + file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/Graph.h + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 408 + + + + {{0, 0}, {407, 602}} + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 335 + + + CF$UID + 336 + + + CF$UID + 337 + + + NS.objects + + + CF$UID + 410 + + + CF$UID + 246 + + + CF$UID + 429 + + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 411 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 340 + + + CF$UID + 341 + + + CF$UID + 342 + + + CF$UID + 343 + + + CF$UID + 344 + + + CF$UID + 345 + + + CF$UID + 346 + + + NS.objects + + + CF$UID + 347 + + + CF$UID + 412 + + + CF$UID + 419 + + + CF$UID + 351 + + + CF$UID + 351 + + + CF$UID + 427 + + + CF$UID + 428 + + + + + $class + + CF$UID + 111 + + DocumentLocation + + CF$UID + 417 + + DomainIdentifier + + CF$UID + 298 + + IdentifierPath + + CF$UID + 413 + + IndexOfDocumentIdentifier + + CF$UID + 26 + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 414 + + + CF$UID + 415 + + + CF$UID + 416 + + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 351 + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 64 + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 254 + + + + $class + + CF$UID + 110 + + documentURL + + CF$UID + 418 + + timestamp + + CF$UID + 0 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/TikZiT-Info.plist + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 420 + + + CF$UID + 421 + + + CF$UID + 422 + + + NS.objects + + + CF$UID + 423 + + + CF$UID + 425 + + + CF$UID + 426 + + + + IDE_PLIST_EDITOR_SELECTION_KEY + IDE_PLIST_EDITOR_EXPANSION_KEY + IDE_PLIST_EDITOR_VISIBLERECT_KEY + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 424 + + + + CFBundleVersion + + $class + + CF$UID + 236 + + NS.objects + + + {{0, 0}, {407, 563}} + Xcode.IDEKit.EditorDocument.PlistEditor + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 365 + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 367 + + + + + $class + + CF$UID + 115 + + geniusEditorContextNode + + CF$UID + 0 + + primaryEditorContextNode + + CF$UID + 431 + + rootLayoutTreeNode + + CF$UID + 439 + + + + $class + + CF$UID + 114 + + children + + CF$UID + 0 + + contentType + 1 + documentArchivableRepresentation + + CF$UID + 432 + + orientation + 0 + parent + + CF$UID + 439 + + + + $class + + CF$UID + 111 + + DocumentLocation + + CF$UID + 305 + + DomainIdentifier + + CF$UID + 298 + + IdentifierPath + + CF$UID + 433 + + IndexOfDocumentIdentifier + + CF$UID + 26 + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 434 + + + CF$UID + 435 + + + CF$UID + 436 + + + CF$UID + 437 + + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 59 + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 58 + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 57 + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 438 + + + TikZiT + + $class + + CF$UID + 114 + + children + + CF$UID + 440 + + contentType + 0 + documentArchivableRepresentation + + CF$UID + 0 + + orientation + 0 + parent + + CF$UID + 0 + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 431 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 8 + + + CF$UID + 9 + + + CF$UID + 442 + + + CF$UID + 10 + + + CF$UID + 11 + + + CF$UID + 12 + + + CF$UID + 13 + + + CF$UID + 14 + + + NS.objects + + + CF$UID + 443 + + + CF$UID + 444 + + + CF$UID + 445 + + + CF$UID + 25 + + + CF$UID + 4 + + + CF$UID + 442 + + + CF$UID + 25 + + + CF$UID + 25 + + + + IDEWorkspaceTabController_5BA15B20-6E8C-4183-8118-E8E43B2873EF + {{264, 446}, {600, 624}} + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 442 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 16 + + + CF$UID + 17 + + + CF$UID + 18 + + + CF$UID + 19 + + + CF$UID + 20 + + + CF$UID + 21 + + + CF$UID + 22 + + + CF$UID + 23 + + + NS.objects + + + CF$UID + 446 + + + CF$UID + 25 + + + CF$UID + 26 + + + CF$UID + 447 + + + CF$UID + 453 + + + CF$UID + 469 + + + CF$UID + 25 + + + CF$UID + 477 + + + + tikzparser.ym + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 28 + + + NS.objects + + + CF$UID + 448 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 449 + + + CF$UID + 451 + + + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 33 + + + CF$UID + 450 + + + + 127 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 33 + + + CF$UID + 452 + + + + 473 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 41 + + + CF$UID + 42 + + + NS.objects + + + CF$UID + 42 + + + CF$UID + 454 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 44 + + + CF$UID + 45 + + + CF$UID + 46 + + + CF$UID + 47 + + + CF$UID + 48 + + + CF$UID + 49 + + + CF$UID + 50 + + + NS.objects + + + CF$UID + 455 + + + CF$UID + 25 + + + CF$UID + 52 + + + CF$UID + 25 + + + CF$UID + 25 + + + CF$UID + 456 + + + CF$UID + 460 + + + + {{0, 0}, {0, 0}} + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 457 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 458 + + + CF$UID + 57 + + + CF$UID + 67 + + + CF$UID + 459 + + + + TikZiT + tikzparser.ym + + $class + + CF$UID + 53 + + NS.objects + + + CF$UID + 461 + + + CF$UID + 462 + + + CF$UID + 463 + + + CF$UID + 464 + + + CF$UID + 465 + + + CF$UID + 466 + + + CF$UID + 467 + + + CF$UID + 468 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 458 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 458 + + + CF$UID + 64 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 458 + + + CF$UID + 57 + + + CF$UID + 67 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 458 + + + CF$UID + 77 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 458 + + + CF$UID + 69 + + + CF$UID + 70 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 458 + + + CF$UID + 69 + + + CF$UID + 70 + + + CF$UID + 71 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 458 + + + CF$UID + 69 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 458 + + + CF$UID + 64 + + + CF$UID + 74 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 28 + + + NS.objects + + + CF$UID + 470 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 471 + + + CF$UID + 473 + + + CF$UID + 475 + + + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 20 + + + CF$UID + 472 + + + + 225 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 23 + + + CF$UID + 474 + + + + 815 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 85 + + + CF$UID + 476 + + + + 260 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 88 + + + CF$UID + 89 + + + CF$UID + 90 + + + CF$UID + 91 + + + CF$UID + 92 + + + CF$UID + 93 + + + CF$UID + 94 + + + CF$UID + 95 + + + NS.objects + + + CF$UID + 478 + + + CF$UID + 491 + + + CF$UID + 511 + + + CF$UID + 182 + + + CF$UID + 26 + + + CF$UID + 526 + + + CF$UID + 532 + + + CF$UID + 25 + + + + + $class + + CF$UID + 115 + + geniusEditorContextNode + + CF$UID + 0 + + primaryEditorContextNode + + CF$UID + 479 + + rootLayoutTreeNode + + CF$UID + 489 + + + + $class + + CF$UID + 114 + + children + + CF$UID + 0 + + contentType + 1 + documentArchivableRepresentation + + CF$UID + 480 + + orientation + 0 + parent + + CF$UID + 489 + + + + $class + + CF$UID + 111 + + DocumentLocation + + CF$UID + 487 + + DomainIdentifier + + CF$UID + 99 + + IdentifierPath + + CF$UID + 481 + + IndexOfDocumentIdentifier + + CF$UID + 26 + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 482 + + + CF$UID + 483 + + + CF$UID + 484 + + + CF$UID + 485 + + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 459 + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 67 + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 57 + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 486 + + + TikZiT + + $class + + CF$UID + 110 + + documentURL + + CF$UID + 488 + + timestamp + + CF$UID + 0 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/git/tikzit/tikzit/src/common/tikzparser.ym + + + $class + + CF$UID + 114 + + children + + CF$UID + 490 + + contentType + 0 + documentArchivableRepresentation + + CF$UID + 0 + + orientation + 0 + parent + + CF$UID + 0 + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 479 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 117 + + + NS.objects + + + CF$UID + 492 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 119 + + + NS.objects + + + CF$UID + 493 + + + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 121 + + + CF$UID + 122 + + + CF$UID + 123 + + + NS.objects + + + CF$UID + 494 + + + CF$UID + 26 + + + CF$UID + 509 + + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 495 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 126 + + + CF$UID + 127 + + + CF$UID + 128 + + + CF$UID + 129 + + + CF$UID + 130 + + + CF$UID + 131 + + + CF$UID + 132 + + + NS.objects + + + CF$UID + 496 + + + CF$UID + 497 + + + CF$UID + 504 + + + CF$UID + 459 + + + CF$UID + 459 + + + CF$UID + 150 + + + CF$UID + 507 + + + + public.yacc-source + + $class + + CF$UID + 111 + + DocumentLocation + + CF$UID + 487 + + DomainIdentifier + + CF$UID + 99 + + IdentifierPath + + CF$UID + 498 + + IndexOfDocumentIdentifier + + CF$UID + 26 + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 499 + + + CF$UID + 500 + + + CF$UID + 501 + + + CF$UID + 502 + + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 459 + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 67 + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 57 + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 503 + + + TikZiT + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 142 + + + CF$UID + 143 + + + CF$UID + 144 + + + CF$UID + 145 + + + NS.objects + + + CF$UID + 505 + + + CF$UID + 506 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 381079264.11013299 + {1063, 652} + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 508 + + + file://localhost/Users/aleks/git/tikzit/tikzit/src/common/tikzparser.ym + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 510 + + + + {{0, 0}, {600, 600}} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 157 + + + CF$UID + 158 + + + CF$UID + 159 + + + CF$UID + 160 + + + CF$UID + 161 + + + CF$UID + 162 + + + NS.objects + + + CF$UID + 163 + + + CF$UID + 512 + + + CF$UID + 513 + + + CF$UID + 163 + + + CF$UID + 514 + + + CF$UID + 520 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 165 + + + NS.objects + + + CF$UID + 26 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 167 + + + NS.objects + + + CF$UID + 163 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 28 + + + NS.objects + + + CF$UID + 515 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 516 + + + CF$UID + 518 + + + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 171 + + + CF$UID + 517 + + + + 301 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 174 + + + CF$UID + 519 + + + + 298 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 28 + + + NS.objects + + + CF$UID + 521 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 522 + + + CF$UID + 524 + + + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 171 + + + CF$UID + 523 + + + + 301 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 174 + + + CF$UID + 525 + + + + 298 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 28 + + + NS.objects + + + CF$UID + 527 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 528 + + + CF$UID + 530 + + + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 186 + + + CF$UID + 529 + + + + 203 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 189 + + + CF$UID + 531 + + + + 115 + + $class + + CF$UID + 39 + + NS.keys + + NS.objects + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 534 + + + CF$UID + 535 + + + CF$UID + 536 + + + CF$UID + 537 + + + CF$UID + 538 + + + CF$UID + 539 + + + CF$UID + 540 + + + CF$UID + 541 + + + CF$UID + 542 + + + CF$UID + 543 + + + CF$UID + 544 + + + NS.objects + + + CF$UID + 182 + + + CF$UID + 545 + + + CF$UID + 26 + + + CF$UID + 1624 + + + CF$UID + 1629 + + + CF$UID + 1632 + + + CF$UID + 1662 + + + CF$UID + 1663 + + + CF$UID + 1758 + + + CF$UID + 25 + + + CF$UID + 25 + + + + BreakpointsActivated + DefaultEditorStatesForURLs + DebuggingWindowBehavior + ActiveRunDestination + ActiveScheme + LastCompletedPersistentSchemeBasedActivityReport + DocumentWindows + DefaultEditorFrameSizeForURLs + RecentEditorDocumentURLs + AppFocusInMiniDebugging + MiniDebuggingConsole + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 546 + + + CF$UID + 427 + + + CF$UID + 547 + + + CF$UID + 404 + + + CF$UID + 548 + + + CF$UID + 549 + + + CF$UID + 363 + + + CF$UID + 550 + + + CF$UID + 551 + + + NS.objects + + + CF$UID + 552 + + + CF$UID + 576 + + + CF$UID + 596 + + + CF$UID + 713 + + + CF$UID + 1449 + + + CF$UID + 1466 + + + CF$UID + 1472 + + + CF$UID + 1475 + + + CF$UID + 1585 + + + + IDEQuickLookEditor.Editor + Xcode.IDEKit.CocoaIntegration.EditorDocument.Cocoa + Xcode.IDEKit.EditorDocument.SourceCodeComparisonEditor + Xcode.IDEKit.EditorDocument.SourceCode-from-NIB + Xcode.Xcode3ProjectSupport.EditorDocument.Xcode3Project + Xcode.IDEKit.EditorDocument.LogDocument + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 553 + + + CF$UID + 555 + + + CF$UID + 557 + + + NS.objects + + + CF$UID + 559 + + + CF$UID + 566 + + + CF$UID + 571 + + + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 554 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/AH_latex_tail + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 556 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/AH_latex_head.png + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 558 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/ED_none.png + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 560 + + + NS.objects + + + CF$UID + 561 + + + + SelectedDocumentLocations + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 562 + + + + + $class + + CF$UID + 565 + + IDEQuickLookPageNumber + + CF$UID + 26 + + documentURL + + CF$UID + 563 + + timestamp + + CF$UID + 564 + + + file://localhost/Users/aleks/svn/tikzit/AH_latex_tail + 340372422.96159899 + + $classes + + IDEQuickLookDocumentLocation + DVTDocumentLocation + NSObject + + $classname + IDEQuickLookDocumentLocation + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 560 + + + NS.objects + + + CF$UID + 567 + + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 568 + + + + + $class + + CF$UID + 565 + + IDEQuickLookPageNumber + + CF$UID + 26 + + documentURL + + CF$UID + 569 + + timestamp + + CF$UID + 570 + + + file://localhost/Users/aleks/svn/tikzit/AH_latex_head.png + 340372923.18815899 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 560 + + + NS.objects + + + CF$UID + 572 + + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 573 + + + + + $class + + CF$UID + 565 + + IDEQuickLookPageNumber + + CF$UID + 26 + + documentURL + + CF$UID + 574 + + timestamp + + CF$UID + 575 + + + file://localhost/Users/aleks/svn/tikzit/ED_none.png + 340371928.114389 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 577 + + + CF$UID + 579 + + + CF$UID + 581 + + + NS.objects + + + CF$UID + 583 + + + CF$UID + 587 + + + CF$UID + 592 + + + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 578 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/TikZiT-Info.plist + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 580 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/TikZiT-Info.plist + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 582 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/git/tikzit/tikzit/TikZiT-Info.plist + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 420 + + + CF$UID + 421 + + + CF$UID + 422 + + + NS.objects + + + CF$UID + 584 + + + CF$UID + 585 + + + CF$UID + 586 + + + + + $class + + CF$UID + 60 + + NS.objects + + + + $class + + CF$UID + 236 + + NS.objects + + + {{0, 0}, {743, 502}} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 420 + + + CF$UID + 422 + + + CF$UID + 421 + + + NS.objects + + + CF$UID + 588 + + + CF$UID + 590 + + + CF$UID + 591 + + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 589 + + + + CFBundleIconFile + {{0, 0}, {815, 552}} + + $class + + CF$UID + 236 + + NS.objects + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 420 + + + CF$UID + 421 + + + CF$UID + 422 + + + NS.objects + + + CF$UID + 593 + + + CF$UID + 594 + + + CF$UID + 595 + + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 589 + + + + + $class + + CF$UID + 236 + + NS.objects + + + {{0, 0}, {815, 550}} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 597 + + + CF$UID + 599 + + + CF$UID + 601 + + + CF$UID + 603 + + + CF$UID + 605 + + + CF$UID + 607 + + + CF$UID + 609 + + + CF$UID + 611 + + + CF$UID + 613 + + + CF$UID + 615 + + + NS.objects + + + CF$UID + 617 + + + CF$UID + 638 + + + CF$UID + 650 + + + CF$UID + 657 + + + CF$UID + 668 + + + CF$UID + 677 + + + CF$UID + 685 + + + CF$UID + 693 + + + CF$UID + 699 + + + CF$UID + 705 + + + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 598 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/English.lproj/PropertyInspector.xib + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 600 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/English.lproj/StylePalette.xib + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 602 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/English.lproj/PropertyInspector.xib + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 604 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/English.lproj/StylePalette.xib + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 606 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/English.lproj/TikzDocument.xib + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 608 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/English.lproj/Preview.xib + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 610 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/English.lproj/MainMenu.xib + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 612 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/English.lproj/Preamble.xib + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 614 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/English.lproj/MainMenu.xib + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 616 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/English.lproj/Preamble.xib + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 618 + + + CF$UID + 619 + + + CF$UID + 620 + + + CF$UID + 621 + + + NS.objects + + + CF$UID + 622 + + + CF$UID + 584 + + + CF$UID + 621 + + + CF$UID + 625 + + + + IBDockViewController + SelectedObjectIDs + SelectionProvider + IBCanvasViewController + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 623 + + + NS.objects + + + CF$UID + 624 + + + + LastKnownOutlineViewWidth + 224 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 626 + + + CF$UID + 627 + + + NS.objects + + + CF$UID + 628 + + + CF$UID + 637 + + + + ObjectIDToLastKnownCanvasPositionMap + EditedTopLevelObjectIDs + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 629 + + + CF$UID + 630 + + + CF$UID + 631 + + + CF$UID + 632 + + + NS.objects + + + CF$UID + 633 + + + CF$UID + 634 + + + CF$UID + 635 + + + CF$UID + 636 + + + + 301 + 185 + 461 + 361 + {46, 13} + {46, 189} + {318, 118} + {46, 385} + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 629 + + + CF$UID + 632 + + + CF$UID + 630 + + + CF$UID + 631 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 618 + + + CF$UID + 619 + + + CF$UID + 620 + + + CF$UID + 621 + + + NS.objects + + + CF$UID + 639 + + + CF$UID + 641 + + + CF$UID + 643 + + + CF$UID + 644 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 623 + + + NS.objects + + + CF$UID + 640 + + + + 224 + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 642 + + + + -2 + IBStructureViewController + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 626 + + + CF$UID + 627 + + + NS.objects + + + CF$UID + 645 + + + CF$UID + 646 + + + + + $class + + CF$UID + 39 + + NS.keys + + NS.objects + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 647 + + + CF$UID + 648 + + + CF$UID + 649 + + + + 3 + 649 + 181 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 618 + + + CF$UID + 619 + + + CF$UID + 620 + + + CF$UID + 621 + + + NS.objects + + + CF$UID + 651 + + + CF$UID + 653 + + + CF$UID + 621 + + + CF$UID + 654 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 623 + + + NS.objects + + + CF$UID + 652 + + + + 224 + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 631 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 626 + + + CF$UID + 627 + + + NS.objects + + + CF$UID + 655 + + + CF$UID + 656 + + + + + $class + + CF$UID + 39 + + NS.keys + + NS.objects + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 631 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 618 + + + CF$UID + 619 + + + CF$UID + 620 + + + CF$UID + 621 + + + NS.objects + + + CF$UID + 658 + + + CF$UID + 584 + + + CF$UID + 621 + + + CF$UID + 660 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 623 + + + NS.objects + + + CF$UID + 659 + + + + 224 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 626 + + + CF$UID + 627 + + + NS.objects + + + CF$UID + 661 + + + CF$UID + 667 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 647 + + + CF$UID + 649 + + + CF$UID + 662 + + + CF$UID + 648 + + + NS.objects + + + CF$UID + 663 + + + CF$UID + 664 + + + CF$UID + 665 + + + CF$UID + 666 + + + + 524 + {306, -2} + {71, 17} + {118, 105} + {71, 359} + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 648 + + + CF$UID + 647 + + + CF$UID + 649 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 618 + + + CF$UID + 619 + + + CF$UID + 620 + + + CF$UID + 621 + + + NS.objects + + + CF$UID + 669 + + + CF$UID + 671 + + + CF$UID + 643 + + + CF$UID + 673 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 623 + + + NS.objects + + + CF$UID + 670 + + + + 224 + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 672 + + + + 100024 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 626 + + + CF$UID + 627 + + + NS.objects + + + CF$UID + 674 + + + CF$UID + 675 + + + + + $class + + CF$UID + 39 + + NS.keys + + NS.objects + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 676 + + + + 5 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 618 + + + CF$UID + 619 + + + CF$UID + 620 + + + CF$UID + 621 + + + NS.objects + + + CF$UID + 678 + + + CF$UID + 680 + + + CF$UID + 621 + + + CF$UID + 682 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 623 + + + NS.objects + + + CF$UID + 679 + + + + 224 + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 681 + + + + 11 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 626 + + + CF$UID + 627 + + + NS.objects + + + CF$UID + 683 + + + CF$UID + 684 + + + + + $class + + CF$UID + 39 + + NS.keys + + NS.objects + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 163 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 618 + + + CF$UID + 619 + + + CF$UID + 620 + + + CF$UID + 621 + + + NS.objects + + + CF$UID + 686 + + + CF$UID + 584 + + + CF$UID + 621 + + + CF$UID + 688 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 623 + + + NS.objects + + + CF$UID + 687 + + + + 200 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 626 + + + CF$UID + 627 + + + NS.objects + + + CF$UID + 689 + + + CF$UID + 690 + + + + + $class + + CF$UID + 39 + + NS.keys + + NS.objects + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 691 + + + CF$UID + 692 + + + + 535 + 29 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 618 + + + CF$UID + 619 + + + CF$UID + 620 + + + CF$UID + 621 + + + NS.objects + + + CF$UID + 694 + + + CF$UID + 584 + + + CF$UID + 621 + + + CF$UID + 696 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 623 + + + NS.objects + + + CF$UID + 695 + + + + 224 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 626 + + + CF$UID + 627 + + + NS.objects + + + CF$UID + 697 + + + CF$UID + 698 + + + + + $class + + CF$UID + 39 + + NS.keys + + NS.objects + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 163 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 618 + + + CF$UID + 619 + + + CF$UID + 620 + + + CF$UID + 621 + + + NS.objects + + + CF$UID + 700 + + + CF$UID + 584 + + + CF$UID + 621 + + + CF$UID + 702 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 623 + + + NS.objects + + + CF$UID + 701 + + + + 224 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 626 + + + CF$UID + 627 + + + NS.objects + + + CF$UID + 703 + + + CF$UID + 704 + + + + + $class + + CF$UID + 39 + + NS.keys + + NS.objects + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 692 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 618 + + + CF$UID + 619 + + + CF$UID + 620 + + + CF$UID + 621 + + + NS.objects + + + CF$UID + 706 + + + CF$UID + 708 + + + CF$UID + 621 + + + CF$UID + 710 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 623 + + + NS.objects + + + CF$UID + 707 + + + + 200 + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 709 + + + + 27 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 626 + + + CF$UID + 627 + + + NS.objects + + + CF$UID + 711 + + + CF$UID + 712 + + + + + $class + + CF$UID + 39 + + NS.keys + + NS.objects + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 163 + + + CF$UID + 647 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 714 + + + CF$UID + 716 + + + CF$UID + 718 + + + CF$UID + 720 + + + CF$UID + 722 + + + CF$UID + 724 + + + CF$UID + 726 + + + CF$UID + 728 + + + CF$UID + 730 + + + CF$UID + 732 + + + CF$UID + 734 + + + CF$UID + 736 + + + CF$UID + 738 + + + CF$UID + 740 + + + CF$UID + 742 + + + CF$UID + 744 + + + CF$UID + 746 + + + CF$UID + 748 + + + CF$UID + 750 + + + CF$UID + 752 + + + CF$UID + 754 + + + CF$UID + 756 + + + CF$UID + 758 + + + CF$UID + 760 + + + CF$UID + 762 + + + CF$UID + 764 + + + CF$UID + 766 + + + CF$UID + 768 + + + CF$UID + 770 + + + CF$UID + 772 + + + CF$UID + 774 + + + CF$UID + 776 + + + CF$UID + 778 + + + CF$UID + 780 + + + CF$UID + 782 + + + CF$UID + 784 + + + CF$UID + 785 + + + CF$UID + 787 + + + CF$UID + 789 + + + CF$UID + 791 + + + CF$UID + 793 + + + CF$UID + 795 + + + CF$UID + 797 + + + CF$UID + 799 + + + CF$UID + 801 + + + CF$UID + 803 + + + CF$UID + 805 + + + CF$UID + 807 + + + CF$UID + 809 + + + CF$UID + 811 + + + CF$UID + 813 + + + CF$UID + 815 + + + CF$UID + 817 + + + CF$UID + 819 + + + CF$UID + 821 + + + CF$UID + 823 + + + CF$UID + 825 + + + CF$UID + 827 + + + CF$UID + 829 + + + CF$UID + 831 + + + CF$UID + 833 + + + CF$UID + 835 + + + CF$UID + 837 + + + CF$UID + 839 + + + CF$UID + 841 + + + CF$UID + 843 + + + CF$UID + 845 + + + CF$UID + 847 + + + CF$UID + 849 + + + CF$UID + 851 + + + CF$UID + 853 + + + CF$UID + 855 + + + CF$UID + 857 + + + CF$UID + 859 + + + CF$UID + 861 + + + CF$UID + 863 + + + CF$UID + 865 + + + CF$UID + 867 + + + CF$UID + 869 + + + CF$UID + 871 + + + CF$UID + 873 + + + CF$UID + 875 + + + CF$UID + 877 + + + CF$UID + 879 + + + CF$UID + 881 + + + CF$UID + 883 + + + CF$UID + 885 + + + CF$UID + 887 + + + CF$UID + 889 + + + CF$UID + 891 + + + CF$UID + 893 + + + CF$UID + 895 + + + CF$UID + 897 + + + CF$UID + 899 + + + CF$UID + 901 + + + CF$UID + 903 + + + CF$UID + 905 + + + CF$UID + 907 + + + CF$UID + 908 + + + CF$UID + 910 + + + CF$UID + 912 + + + CF$UID + 914 + + + CF$UID + 916 + + + CF$UID + 918 + + + CF$UID + 920 + + + CF$UID + 922 + + + CF$UID + 924 + + + CF$UID + 926 + + + CF$UID + 928 + + + CF$UID + 930 + + + CF$UID + 932 + + + CF$UID + 934 + + + CF$UID + 936 + + + CF$UID + 938 + + + CF$UID + 940 + + + CF$UID + 942 + + + CF$UID + 944 + + + CF$UID + 946 + + + CF$UID + 948 + + + CF$UID + 950 + + + CF$UID + 952 + + + CF$UID + 954 + + + CF$UID + 956 + + + CF$UID + 958 + + + CF$UID + 960 + + + CF$UID + 962 + + + CF$UID + 964 + + + CF$UID + 966 + + + NS.objects + + + CF$UID + 968 + + + CF$UID + 972 + + + CF$UID + 976 + + + CF$UID + 980 + + + CF$UID + 984 + + + CF$UID + 988 + + + CF$UID + 992 + + + CF$UID + 996 + + + CF$UID + 1000 + + + CF$UID + 1003 + + + CF$UID + 1007 + + + CF$UID + 1011 + + + CF$UID + 1015 + + + CF$UID + 1019 + + + CF$UID + 1022 + + + CF$UID + 1025 + + + CF$UID + 1029 + + + CF$UID + 1033 + + + CF$UID + 1037 + + + CF$UID + 1041 + + + CF$UID + 1045 + + + CF$UID + 1049 + + + CF$UID + 1053 + + + CF$UID + 1057 + + + CF$UID + 1061 + + + CF$UID + 1065 + + + CF$UID + 1069 + + + CF$UID + 1073 + + + CF$UID + 1077 + + + CF$UID + 1081 + + + CF$UID + 1085 + + + CF$UID + 1089 + + + CF$UID + 1093 + + + CF$UID + 1097 + + + CF$UID + 1101 + + + CF$UID + 1105 + + + CF$UID + 1109 + + + CF$UID + 1113 + + + CF$UID + 1117 + + + CF$UID + 1120 + + + CF$UID + 1124 + + + CF$UID + 1128 + + + CF$UID + 1132 + + + CF$UID + 1136 + + + CF$UID + 1140 + + + CF$UID + 1143 + + + CF$UID + 1147 + + + CF$UID + 1151 + + + CF$UID + 1155 + + + CF$UID + 1158 + + + CF$UID + 1162 + + + CF$UID + 1165 + + + CF$UID + 1168 + + + CF$UID + 1171 + + + CF$UID + 1175 + + + CF$UID + 1178 + + + CF$UID + 1181 + + + CF$UID + 1185 + + + CF$UID + 1189 + + + CF$UID + 1193 + + + CF$UID + 1197 + + + CF$UID + 1200 + + + CF$UID + 1204 + + + CF$UID + 1208 + + + CF$UID + 1212 + + + CF$UID + 1215 + + + CF$UID + 1218 + + + CF$UID + 1221 + + + CF$UID + 1225 + + + CF$UID + 1229 + + + CF$UID + 1233 + + + CF$UID + 1236 + + + CF$UID + 1239 + + + CF$UID + 1243 + + + CF$UID + 1247 + + + CF$UID + 1251 + + + CF$UID + 1254 + + + CF$UID + 1257 + + + CF$UID + 1261 + + + CF$UID + 1264 + + + CF$UID + 1268 + + + CF$UID + 1272 + + + CF$UID + 1276 + + + CF$UID + 1280 + + + CF$UID + 1284 + + + CF$UID + 1288 + + + CF$UID + 1292 + + + CF$UID + 1296 + + + CF$UID + 1300 + + + CF$UID + 1304 + + + CF$UID + 1308 + + + CF$UID + 1312 + + + CF$UID + 1316 + + + CF$UID + 1320 + + + CF$UID + 1324 + + + CF$UID + 1327 + + + CF$UID + 1330 + + + CF$UID + 1334 + + + CF$UID + 1338 + + + CF$UID + 1342 + + + CF$UID + 1346 + + + CF$UID + 1350 + + + CF$UID + 1354 + + + CF$UID + 1358 + + + CF$UID + 1362 + + + CF$UID + 1366 + + + CF$UID + 1370 + + + CF$UID + 1373 + + + CF$UID + 1376 + + + CF$UID + 1380 + + + CF$UID + 1384 + + + CF$UID + 1388 + + + CF$UID + 1392 + + + CF$UID + 1396 + + + CF$UID + 1400 + + + CF$UID + 1404 + + + CF$UID + 1408 + + + CF$UID + 1412 + + + CF$UID + 1415 + + + CF$UID + 1418 + + + CF$UID + 1421 + + + CF$UID + 1425 + + + CF$UID + 1429 + + + CF$UID + 1432 + + + CF$UID + 1436 + + + CF$UID + 1439 + + + CF$UID + 1443 + + + CF$UID + 1446 + + + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 715 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/GraphicsView.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 717 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/GraphicsView.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 719 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/Grid.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 721 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/git/tikzit/tikzit/src/osx/Grid.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 723 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/SelectBoxLayer.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 725 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/TikzSourceController.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 727 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/EdgeControlLayer.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 729 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/Edge.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 731 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/Edge.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 733 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/EdgeStyle+Coder.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 735 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/TikzShape.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 737 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/BasicMapTable.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 739 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/GraphChange.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 741 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/-%5BNSWindowController%20window%5D_disassembly_0x00007fff93905981.s + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 743 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/_objc_empty_vtable_disassembly_0x00007fff760e2f60.s + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 745 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/SupportDir.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 747 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/AppDelegate.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 749 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/PickSupport.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 751 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/NodeLayer.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 753 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/PropertyInspectorController.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 755 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/TikzDocument.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 757 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/EdgeStyle.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 759 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/EdgeStyle.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 761 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/NodeStyle.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 763 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/NSString+UnicharUtilities.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 765 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/Grid.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 767 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/DiffMatchPatch.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 769 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/CALayer+DrawLabel.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 771 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/NSString+UnicharUtilities.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 773 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/GraphDiff.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 775 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/contrib/DiffMatchPatch/NSString+DiffMatchPatchUtils.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 777 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/Graph.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 779 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/EdgeStyle.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 781 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/EdgeStyle.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 783 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/Graph.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 108 + + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 786 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/SelectableNodeView.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 788 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/StylePaletteController.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 790 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/PreviewController.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 792 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/Transformer.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 794 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Developer/SDKs/MacOSX10.7.sdk/System/Library/Frameworks/Foundation.framework/Versions/C/Headers/NSArray.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 796 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/DiffMatchPatchCFUtilities.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 798 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/GraphChange.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 800 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/GraphChange.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 802 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/-%5BNSObject%20performSelector:%5D_disassembly_0x00007fff8ce162e1.s + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 804 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/DiffMatchPatchCFUtilities.c + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 806 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/PreambleController.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 808 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/PreambleController.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 810 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/CGContextAddPath_disassembly_0x00007fff910e972e.s + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 812 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/contrib/DiffMatchPatch/NSString+DiffMatchPatchUtils.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 814 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/-%5BNSCustomView%20nibInstantiateWithObjectInstantiator:%5D_disassembly_0x00007fff96b86f29.s + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 816 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/COPYING.DiffMatchPatch + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 818 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/__cxa_throw_disassembly_0x00007fff933e00e9.s + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 820 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/AppDelegate.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 822 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/AppDelegate.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 824 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/SelectBoxLayer.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 826 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/PropertyHolder.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 828 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/DiffMatchPatch.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 830 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/NSString+JavaSubstring.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 832 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/Transformer.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 834 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/Node.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 836 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/EdgeStyle+Coder.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 838 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/NSMutableDictionary+DMPExtensions.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 840 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/GraphElementProperty.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 842 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/Graph+Coder.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 844 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/test/test.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 846 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/SelectableNodeView.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 848 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Developer/SDKs/MacOSX10.7.sdk/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/CoreGraphics.framework/Versions/A/Headers/CGColor.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 850 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/NilToEmptyStringTransformer.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 852 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/NodeSelectionLayer.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 854 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/auto_fatal_disassembly_0x00007fff894d9f6f.s + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 856 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/GraphElementData.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 858 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/TikzWindowController.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 860 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/NSString+UriCompatibility.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 862 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/NodeStyle.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 864 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/CABackingStoreUpdate__disassembly_0x00007fff8d778b05.s + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 866 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/test/common.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 868 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/test/main.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 870 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/main.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 872 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/scratch/SFBInspectors/SFBInspectorView.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 874 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/ToolPaletteController.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 876 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/GraphicsView.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 878 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/GraphicsView.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 880 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/git/tikzit/tikzit/src/osx/GraphicsView.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 882 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/TikZiT-Info.plist + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 884 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/TikzGraphAssembler.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 886 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/SelectableCollectionViewItem.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 888 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/SelectableCollectionViewItem.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 890 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/TikzSourceController.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 892 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/Node.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 894 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/git/tikzit/tikzit/src/common/tikzlexer.lm + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 896 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/PickSupport.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 898 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/PickSupport.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 900 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/NilToEmptyStringTransformer.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 902 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/CFRelease_disassembly_0x00007fff8cc2b07b.s + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 904 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/GraphElementData.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 906 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/NodeStyle+Coder.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 488 + + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 909 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/EdgeControlLayer.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 911 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/NodeStyle+Coder.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 913 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/Edge.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 915 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/Edge.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 917 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/git/tikzit/tikzit/src/common/Edge.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 919 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/TikzDocument.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 921 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/PropertyHolder.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 923 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/TikzGraphAssembler.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 925 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/StylePaletteController.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 927 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/StylePaletteController.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 929 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/git/tikzit/tikzit/src/common/TikzGraphAssembler.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 931 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/PropertyInspectorController.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 933 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/PropertyInspectorController.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 935 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/PreviewController.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 937 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/PreviewController.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 939 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/Graph.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 941 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/Graph.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 943 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/Graph+Coder.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 945 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/util.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 947 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/-%5BNSCollectionView%20newItemForRepresentedObject:%5D_disassembly_0x00007fff8fa0a94e.s + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 949 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/Shape.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 951 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/Shape.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 953 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Developer/SDKs/MacOSX10.7.sdk/System/Library/Frameworks/CoreFoundation.framework/Versions/A/Headers/CFString.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 955 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/TikzWindowController.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 957 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/GraphDiff.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 959 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/NodeSelectionLayer.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 961 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/GraphElementProperty.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 963 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/NodeLayer.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 965 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/NodeLayer.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 967 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/ColorRGB.m + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 969 + + + CF$UID + 970 + + + CF$UID + 25 + + + CF$UID + 971 + + + + 345762860.65236199 + {2200, 1151} + {2909, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 973 + + + CF$UID + 974 + + + CF$UID + 25 + + + CF$UID + 975 + + + + 348421987.42822403 + {2200, 1157} + {3223, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 977 + + + CF$UID + 978 + + + CF$UID + 25 + + + CF$UID + 979 + + + + 345403783.61108297 + {842, 693} + {1356, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 981 + + + CF$UID + 982 + + + CF$UID + 25 + + + CF$UID + 983 + + + + 380738928.58536297 + {2001, 1508} + {2090, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 985 + + + CF$UID + 986 + + + CF$UID + 25 + + + CF$UID + 987 + + + + 345416623.559434 + {0, 379} + {276, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 989 + + + CF$UID + 990 + + + CF$UID + 25 + + + CF$UID + 991 + + + + 345403324.869367 + {881, 944} + {1433, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 993 + + + CF$UID + 994 + + + CF$UID + 25 + + + CF$UID + 995 + + + + 345571191.17329699 + {104, 1058} + {1155, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 997 + + + CF$UID + 998 + + + CF$UID + 25 + + + CF$UID + 999 + + + + 345403538.85177398 + {943, 1136} + {9769, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1001 + + + CF$UID + 1002 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 348682214.50559098 + {1692, 820} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1004 + + + CF$UID + 1005 + + + CF$UID + 25 + + + CF$UID + 1006 + + + + 340459449.14873803 + {0, 953} + {898, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1008 + + + CF$UID + 1009 + + + CF$UID + 25 + + + CF$UID + 1010 + + + + 345404849.21465802 + {1684, 1007} + {2065, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1012 + + + CF$UID + 1013 + + + CF$UID + 25 + + + CF$UID + 1014 + + + + 345994252.86864501 + {1109, 746} + {790, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1016 + + + CF$UID + 1017 + + + CF$UID + 25 + + + CF$UID + 1018 + + + + 340625465.61212498 + {6290, 1393} + {7112, 58} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1020 + + + CF$UID + 1021 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 348348273.15865397 + {0, 2528} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1023 + + + CF$UID + 1024 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 345409605.10440803 + {0, 2496} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1026 + + + CF$UID + 1027 + + + CF$UID + 25 + + + CF$UID + 1028 + + + + 348328967.72804999 + {831, 996} + {1464, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1030 + + + CF$UID + 1031 + + + CF$UID + 25 + + + CF$UID + 1032 + + + + 345487190.58582902 + {592, 1437} + {1769, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1034 + + + CF$UID + 1035 + + + CF$UID + 25 + + + CF$UID + 1036 + + + + 348348232.74814701 + {2312, 1269} + {3305, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1038 + + + CF$UID + 1039 + + + CF$UID + 25 + + + CF$UID + 1040 + + + + 345416712.81625599 + {812, 967} + {1608, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1042 + + + CF$UID + 1043 + + + CF$UID + 25 + + + CF$UID + 1044 + + + + 345404437.01901197 + {960, 1373} + {1257, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1046 + + + CF$UID + 1047 + + + CF$UID + 25 + + + CF$UID + 1048 + + + + 340624392.15628898 + {0, 1080} + {928, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1050 + + + CF$UID + 1051 + + + CF$UID + 25 + + + CF$UID + 1052 + + + + 340473820.49560201 + {1062, 1380} + {19, 768} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1054 + + + CF$UID + 1055 + + + CF$UID + 25 + + + CF$UID + 1056 + + + + 348682101.30419898 + {0, 1156} + {811, 26} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1058 + + + CF$UID + 1059 + + + CF$UID + 25 + + + CF$UID + 1060 + + + + 345763213.21294802 + {1210, 686} + {1261, 115} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1062 + + + CF$UID + 1063 + + + CF$UID + 25 + + + CF$UID + 1064 + + + + 340632134.97458899 + {30, 1204} + {902, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1066 + + + CF$UID + 1067 + + + CF$UID + 25 + + + CF$UID + 1068 + + + + 340501555.21261299 + {97, 1322} + {976, 23} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1070 + + + CF$UID + 1071 + + + CF$UID + 25 + + + CF$UID + 1072 + + + + 340631784.15413302 + {4723, 1844} + {5843, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1074 + + + CF$UID + 1075 + + + CF$UID + 25 + + + CF$UID + 1076 + + + + 340706474.47886401 + {298, 1417} + {624, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1078 + + + CF$UID + 1079 + + + CF$UID + 25 + + + CF$UID + 1080 + + + + 340631841.98603201 + {0, 968} + {841, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1082 + + + CF$UID + 1083 + + + CF$UID + 25 + + + CF$UID + 1084 + + + + 340622423.14766902 + {0, 1050} + {947, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1086 + + + CF$UID + 1087 + + + CF$UID + 25 + + + CF$UID + 1088 + + + + 340631322.39264601 + {52, 1607} + {270, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1090 + + + CF$UID + 1091 + + + CF$UID + 25 + + + CF$UID + 1092 + + + + 340925457.76799399 + {2611, 845} + {3012, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1094 + + + CF$UID + 1095 + + + CF$UID + 25 + + + CF$UID + 1096 + + + + 340410882.75886202 + {933, 1045} + {1918, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1098 + + + CF$UID + 1099 + + + CF$UID + 25 + + + CF$UID + 1100 + + + + 348682102.890167 + {0, 1214} + {964, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1102 + + + CF$UID + 1103 + + + CF$UID + 25 + + + CF$UID + 1104 + + + + 348502930.726179 + {13299, 942} + {13697, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 142 + + + CF$UID + 143 + + + CF$UID + 144 + + + CF$UID + 145 + + + NS.objects + + + CF$UID + 1106 + + + CF$UID + 1107 + + + CF$UID + 25 + + + CF$UID + 1108 + + + + 381083509.44221699 + {18344, 1253} + {19467, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1110 + + + CF$UID + 1111 + + + CF$UID + 25 + + + CF$UID + 1112 + + + + 345488697.68925297 + {0, 1055} + {907, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1114 + + + CF$UID + 1115 + + + CF$UID + 25 + + + CF$UID + 1116 + + + + 345487787.078866 + {403, 1549} + {1655, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1118 + + + CF$UID + 1119 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 348489963.85380399 + {288, 1153} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1121 + + + CF$UID + 1122 + + + CF$UID + 25 + + + CF$UID + 1123 + + + + 340978354.92465001 + {969, 1145} + {1174, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1125 + + + CF$UID + 1126 + + + CF$UID + 25 + + + CF$UID + 1127 + + + + 340709461.72300398 + {0, 1410} + {369, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1129 + + + CF$UID + 1130 + + + CF$UID + 25 + + + CF$UID + 1131 + + + + 340632182.87597102 + {300, 1742} + {1087, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1133 + + + CF$UID + 1134 + + + CF$UID + 25 + + + CF$UID + 1135 + + + + 340625462.37954402 + {2270, 728} + {1004, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1137 + + + CF$UID + 1138 + + + CF$UID + 25 + + + CF$UID + 1139 + + + + 348419924.36261398 + {3536, 958} + {353, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1141 + + + CF$UID + 1142 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 348347980.23595798 + {0, 1071} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1144 + + + CF$UID + 1145 + + + CF$UID + 25 + + + CF$UID + 1146 + + + + 340632849.17894697 + {0, 1631} + {914, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1148 + + + CF$UID + 1149 + + + CF$UID + 25 + + + CF$UID + 1150 + + + + 345404279.50111699 + {1864, 1059} + {2502, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1152 + + + CF$UID + 1153 + + + CF$UID + 25 + + + CF$UID + 1154 + + + + 348491190.94514698 + {3485, 1369} + {4064, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1156 + + + CF$UID + 1157 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 340734505.19957298 + {0, 1949} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1159 + + + CF$UID + 1160 + + + CF$UID + 25 + + + CF$UID + 1161 + + + + 340630944.19481701 + {0, 254} + {227, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1163 + + + CF$UID + 1164 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 340715007.520365 + {3185, 2419} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1166 + + + CF$UID + 1167 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 340634798.489407 + {0, 1840} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1169 + + + CF$UID + 1170 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 340645018.90256602 + {0, 1609} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1172 + + + CF$UID + 1173 + + + CF$UID + 25 + + + CF$UID + 1174 + + + + 345487388.13644803 + {912, 1366} + {1795, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1176 + + + CF$UID + 1177 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 348348274.649975 + {784, 1230} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1179 + + + CF$UID + 1180 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 345416620.55954498 + {175, 713} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1182 + + + CF$UID + 1183 + + + CF$UID + 25 + + + CF$UID + 1184 + + + + 340588857.98394001 + {0, 1072} + {24, 767} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1186 + + + CF$UID + 1187 + + + CF$UID + 25 + + + CF$UID + 1188 + + + + 340631785.03849697 + {28409, 1632} + {29398, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1190 + + + CF$UID + 1191 + + + CF$UID + 25 + + + CF$UID + 1192 + + + + 340632146.36382198 + {0, 1162} + {1153, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1194 + + + CF$UID + 1195 + + + CF$UID + 25 + + + CF$UID + 1196 + + + + 340978419.60591 + {392, 1123} + {5521, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1198 + + + CF$UID + 1199 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 345763164.73803198 + {1306, 858} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1201 + + + CF$UID + 1202 + + + CF$UID + 25 + + + CF$UID + 1203 + + + + 340459404.56984299 + {0, 1634} + {1293, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1205 + + + CF$UID + 1206 + + + CF$UID + 25 + + + CF$UID + 1207 + + + + 340632182.02007103 + {2123, 1102} + {358, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1209 + + + CF$UID + 1210 + + + CF$UID + 25 + + + CF$UID + 1211 + + + + 345407440.14106703 + {980, 563} + {1308, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1213 + + + CF$UID + 1214 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 345570963.43227798 + {0, 307} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1216 + + + CF$UID + 1217 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 348493987.74653798 + {1400, 772} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1219 + + + CF$UID + 1220 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 345762938.27138197 + {1967, 722} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1222 + + + CF$UID + 1223 + + + CF$UID + 25 + + + CF$UID + 1224 + + + + 340715018.37839699 + {732, 1720} + {1614, 68} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1226 + + + CF$UID + 1227 + + + CF$UID + 25 + + + CF$UID + 1228 + + + + 340710896.240381 + {0, 907} + {71, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1230 + + + CF$UID + 1231 + + + CF$UID + 25 + + + CF$UID + 1232 + + + + 340978941.82531101 + {1271, 874} + {1724, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1234 + + + CF$UID + 1235 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 340743258.14034998 + {332, 2129} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1237 + + + CF$UID + 1238 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 345570916.35617101 + {1868, 787} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1240 + + + CF$UID + 1241 + + + CF$UID + 25 + + + CF$UID + 1242 + + + + 340624895.44772601 + {0, 956} + {1590, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1244 + + + CF$UID + 1245 + + + CF$UID + 25 + + + CF$UID + 1246 + + + + 340632090.00535399 + {855, 1347} + {2165, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1248 + + + CF$UID + 1249 + + + CF$UID + 25 + + + CF$UID + 1250 + + + + 345763208.75864798 + {2157, 874} + {2538, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1252 + + + CF$UID + 1253 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 340734675.59256703 + {2612, 2357} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1255 + + + CF$UID + 1256 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 348493972.20554298 + {0, 948} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1258 + + + CF$UID + 1259 + + + CF$UID + 25 + + + CF$UID + 1260 + + + + 348494575.91981101 + {202, 1322} + {1013, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1262 + + + CF$UID + 1263 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 340643026.22692502 + {0, 760} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1265 + + + CF$UID + 1266 + + + CF$UID + 25 + + + CF$UID + 1267 + + + + 345993841.814812 + {4603, 1030} + {5559, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1269 + + + CF$UID + 1270 + + + CF$UID + 25 + + + CF$UID + 1271 + + + + 345403242.32928503 + {47, 1110} + {798, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1273 + + + CF$UID + 1274 + + + CF$UID + 25 + + + CF$UID + 1275 + + + + 345994942.28171802 + {0, 1189} + {176, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1277 + + + CF$UID + 1278 + + + CF$UID + 25 + + + CF$UID + 1279 + + + + 348769524.87817502 + {27280, 1795} + {28593, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1281 + + + CF$UID + 1282 + + + CF$UID + 25 + + + CF$UID + 1283 + + + + 376240707.96911001 + {2531, 1228} + {23808, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1285 + + + CF$UID + 1286 + + + CF$UID + 25 + + + CF$UID + 1287 + + + + 348605533.47624701 + {0, 1341} + {605, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1289 + + + CF$UID + 1290 + + + CF$UID + 25 + + + CF$UID + 1291 + + + + 340567695.969051 + {0, 1207} + {830, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1293 + + + CF$UID + 1294 + + + CF$UID + 25 + + + CF$UID + 1295 + + + + 345489807.49887401 + {0, 1229} + {1146, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1297 + + + CF$UID + 1298 + + + CF$UID + 25 + + + CF$UID + 1299 + + + + 345489863.78087598 + {476, 1185} + {1510, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1301 + + + CF$UID + 1302 + + + CF$UID + 25 + + + CF$UID + 1303 + + + + 345404020.64375901 + {4401, 1141} + {5428, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1305 + + + CF$UID + 1306 + + + CF$UID + 25 + + + CF$UID + 1307 + + + + 345489170.70111698 + {709, 717} + {1130, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 142 + + + CF$UID + 143 + + + CF$UID + 144 + + + CF$UID + 145 + + + NS.objects + + + CF$UID + 1309 + + + CF$UID + 1310 + + + CF$UID + 25 + + + CF$UID + 1311 + + + + 381079266.26616299 + {1088, 2047} + {2268, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1313 + + + CF$UID + 1314 + + + CF$UID + 25 + + + CF$UID + 1315 + + + + 340715684.42909598 + {3334, 813} + {3831, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1317 + + + CF$UID + 1318 + + + CF$UID + 25 + + + CF$UID + 1319 + + + + 348348259.35793602 + {592, 833} + {3224, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1321 + + + CF$UID + 1322 + + + CF$UID + 25 + + + CF$UID + 1323 + + + + 340710918.149167 + {413, 867} + {1123, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1325 + + + CF$UID + 1326 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 340979058.26628602 + {0, 2158} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1328 + + + CF$UID + 1329 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 345763100.69483101 + {1412, 1093} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1331 + + + CF$UID + 1332 + + + CF$UID + 25 + + + CF$UID + 1333 + + + + 345401288.84783798 + {0, 1034} + {948, 79} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 142 + + + CF$UID + 143 + + + CF$UID + 144 + + + CF$UID + 145 + + + NS.objects + + + CF$UID + 1335 + + + CF$UID + 1336 + + + CF$UID + 25 + + + CF$UID + 1337 + + + + 381083143.218243 + {1711, 1286} + {2266, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1339 + + + CF$UID + 1340 + + + CF$UID + 25 + + + CF$UID + 1341 + + + + 345571135.33805102 + {3644, 993} + {4607, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1343 + + + CF$UID + 1344 + + + CF$UID + 25 + + + CF$UID + 1345 + + + + 345763340.54909998 + {1782, 1377} + {1408, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1347 + + + CF$UID + 1348 + + + CF$UID + 25 + + + CF$UID + 1349 + + + + 345403635.98861599 + {9317, 1036} + {9522, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1351 + + + CF$UID + 1352 + + + CF$UID + 25 + + + CF$UID + 1353 + + + + 348682251.432365 + {5303, 1025} + {5439, 6} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 142 + + + CF$UID + 143 + + + CF$UID + 144 + + + CF$UID + 145 + + + NS.objects + + + CF$UID + 1355 + + + CF$UID + 1356 + + + CF$UID + 25 + + + CF$UID + 1357 + + + + 381083685.054461 + {1472, 1140} + {1127, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1359 + + + CF$UID + 1360 + + + CF$UID + 25 + + + CF$UID + 1361 + + + + 345403910.70446801 + {898, 1274} + {1480, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1363 + + + CF$UID + 1364 + + + CF$UID + 25 + + + CF$UID + 1365 + + + + 340408281.394584 + {0, 1070} + {818, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1367 + + + CF$UID + 1368 + + + CF$UID + 25 + + + CF$UID + 1369 + + + + 340567709.72924697 + {111, 1169} + {2498, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1371 + + + CF$UID + 1372 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 345993841.44873297 + {6640, 969} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1374 + + + CF$UID + 1375 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 348492100.48254102 + {984, 1424} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 142 + + + CF$UID + 143 + + + CF$UID + 144 + + + CF$UID + 145 + + + NS.objects + + + CF$UID + 1377 + + + CF$UID + 1378 + + + CF$UID + 25 + + + CF$UID + 1379 + + + + 381079265.50655103 + {0, 1180} + {652, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1381 + + + CF$UID + 1382 + + + CF$UID + 25 + + + CF$UID + 1383 + + + + 345996220.58187401 + {4812, 1832} + {5468, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1385 + + + CF$UID + 1386 + + + CF$UID + 25 + + + CF$UID + 1387 + + + + 348328941.80720401 + {4812, 1747} + {5015, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1389 + + + CF$UID + 1390 + + + CF$UID + 25 + + + CF$UID + 1391 + + + + 345404215.00799 + {2896, 1165} + {3929, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1393 + + + CF$UID + 1394 + + + CF$UID + 25 + + + CF$UID + 1395 + + + + 352300514.86549997 + {1565, 1736} + {2412, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1397 + + + CF$UID + 1398 + + + CF$UID + 25 + + + CF$UID + 1399 + + + + 340724015.08366603 + {2833, 942} + {6706, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1401 + + + CF$UID + 1402 + + + CF$UID + 25 + + + CF$UID + 1403 + + + + 348425521.71969801 + {5676, 932} + {6233, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1405 + + + CF$UID + 1406 + + + CF$UID + 25 + + + CF$UID + 1407 + + + + 345570983.01814902 + {0, 528} + {521, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1409 + + + CF$UID + 1410 + + + CF$UID + 25 + + + CF$UID + 1411 + + + + 340497412.20933402 + {1831, 988} + {2427, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1413 + + + CF$UID + 1414 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 345407318.56900901 + {0, 2329} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1416 + + + CF$UID + 1417 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 345406868.72379202 + {2708, 1368} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1419 + + + CF$UID + 1420 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 348682639.65947402 + {2316, 1465} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1422 + + + CF$UID + 1423 + + + CF$UID + 25 + + + CF$UID + 1424 + + + + 340629051.56177503 + {10183, 1616} + {10616, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1426 + + + CF$UID + 1427 + + + CF$UID + 25 + + + CF$UID + 1428 + + + + 345403358.18671203 + {0, 778} + {177, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1430 + + + CF$UID + 1431 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 340628546.57123297 + {644, 1063} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1433 + + + CF$UID + 1434 + + + CF$UID + 25 + + + CF$UID + 1435 + + + + 345403253.67140001 + {106, 1057} + {1029, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1437 + + + CF$UID + 1438 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 345407415.72300202 + {798, 781} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1440 + + + CF$UID + 1441 + + + CF$UID + 25 + + + CF$UID + 1442 + + + + 345488818.74460101 + {35, 1246} + {1367, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1444 + + + CF$UID + 1445 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 348682657.38014698 + {3283, 1343} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1447 + + + CF$UID + 1448 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 340411515.847987 + {0, 1981} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 948 + + + CF$UID + 787 + + + CF$UID + 924 + + + CF$UID + 1450 + + + CF$UID + 950 + + + NS.objects + + + CF$UID + 1452 + + + CF$UID + 1456 + + + CF$UID + 1458 + + + CF$UID + 1461 + + + CF$UID + 1464 + + + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1451 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/TikZiT.xcodeproj/aleks.mode1v3 + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1453 + + + CF$UID + 1454 + + + CF$UID + 25 + + + CF$UID + 1455 + + + + 340366198.37379301 + {1726, 1368} + {1954, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 357 + + + CF$UID + 359 + + + CF$UID + 358 + + + NS.objects + + + CF$UID + 360 + + + CF$UID + 1457 + + + CF$UID + 360 + + + + 340393968.41070002 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 357 + + + CF$UID + 359 + + + CF$UID + 358 + + + NS.objects + + + CF$UID + 360 + + + CF$UID + 1459 + + + CF$UID + 1460 + + + + 340394097.732535 + {4237, 1279} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 357 + + + CF$UID + 358 + + + CF$UID + 359 + + + NS.objects + + + CF$UID + 360 + + + CF$UID + 1462 + + + CF$UID + 1463 + + + + {0, 1026} + 340539479.94429201 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1465 + + + CF$UID + 360 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 348502939.40997303 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1467 + + + NS.objects + + + CF$UID + 1469 + + + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1468 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/StylePalette-fPGoyqLn.xib + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 357 + + + CF$UID + 358 + + + CF$UID + 359 + + + NS.objects + + + CF$UID + 360 + + + CF$UID + 1470 + + + CF$UID + 1471 + + + + {89564, 1173} + 340370036.79549003 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 881 + + + NS.objects + + + CF$UID + 1473 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 357 + + + CF$UID + 358 + + + CF$UID + 359 + + + NS.objects + + + CF$UID + 360 + + + CF$UID + 361 + + + CF$UID + 1474 + + + + 348502941.57143199 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1476 + + + CF$UID + 1478 + + + CF$UID + 1480 + + + NS.objects + + + CF$UID + 1482 + + + CF$UID + 1506 + + + CF$UID + 1551 + + + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1477 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/git/tikzit/tikzit/TikZiT.xcodeproj/ + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1479 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/TikZiT.xcodeproj + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1481 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/TikZiT.xcodeproj/ + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1483 + + + CF$UID + 1484 + + + CF$UID + 1485 + + + CF$UID + 1486 + + + NS.objects + + + CF$UID + 1487 + + + CF$UID + 1496 + + + CF$UID + 1497 + + + CF$UID + 1505 + + + + Xcode3ProjectEditor.sourceList.splitview + Xcode3ProjectEditorPreviousTargetEditorClass + Xcode3ProjectEditorSelectedDocumentLocations + Xcode3ProjectEditor_Xcode3TargetEditor + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1488 + + + NS.objects + + + CF$UID + 1489 + + + + DVTSplitViewItems + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 1490 + + + CF$UID + 1494 + + + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1491 + + + CF$UID + 1492 + + + NS.objects + + + CF$UID + 221 + + + CF$UID + 1493 + + + + DVTIdentifier + DVTViewMagnitude + 170 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1491 + + + CF$UID + 1492 + + + NS.objects + + + CF$UID + 221 + + + CF$UID + 1495 + + + + 645 + Xcode3TargetEditor + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 1498 + + + + + $class + + CF$UID + 1504 + + documentURL + + CF$UID + 1499 + + selection + + CF$UID + 1501 + + timestamp + + CF$UID + 1500 + + + file://localhost/Users/aleks/git/tikzit/tikzit/TikZiT.xcodeproj/ + 380738961.54778898 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1502 + + + CF$UID + 1503 + + + NS.objects + + + CF$UID + 1496 + + + CF$UID + 254 + + + + Editor + Target + + $classes + + Xcode3ProjectDocumentLocation + DVTDocumentLocation + NSObject + + $classname + Xcode3ProjectDocumentLocation + + + $class + + CF$UID + 39 + + NS.keys + + NS.objects + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1507 + + + CF$UID + 1483 + + + CF$UID + 1484 + + + CF$UID + 1485 + + + CF$UID + 1508 + + + NS.objects + + + CF$UID + 1509 + + + CF$UID + 1510 + + + CF$UID + 1509 + + + CF$UID + 1516 + + + CF$UID + 1550 + + + + Xcode3ProjectEditorPreviousProjectEditorClass + Xcode3ProjectEditor_Xcode3BuildSettingsEditor + Xcode3BuildSettingsEditor + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1488 + + + NS.objects + + + CF$UID + 1511 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 1512 + + + CF$UID + 1514 + + + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1491 + + + CF$UID + 1492 + + + NS.objects + + + CF$UID + 221 + + + CF$UID + 1513 + + + + 170 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1491 + + + CF$UID + 1492 + + + NS.objects + + + CF$UID + 221 + + + CF$UID + 1515 + + + + 645 + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 1517 + + + + + $class + + CF$UID + 1504 + + documentURL + + CF$UID + 1518 + + selection + + CF$UID + 1520 + + timestamp + + CF$UID + 1519 + + + file://localhost/Users/aleks/svn/tikzit/TikZiT.xcodeproj/ + 345993840.88442099 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1521 + + + CF$UID + 1502 + + + CF$UID + 1522 + + + NS.objects + + + CF$UID + 254 + + + CF$UID + 1509 + + + CF$UID + 1523 + + + + Project + Xcode3BuildSettingsEditorLocations + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 1524 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1525 + + + CF$UID + 1526 + + + CF$UID + 1527 + + + CF$UID + 1528 + + + CF$UID + 1529 + + + CF$UID + 1530 + + + NS.objects + + + CF$UID + 1531 + + + CF$UID + 1548 + + + CF$UID + 246 + + + CF$UID + 246 + + + CF$UID + 163 + + + CF$UID + 163 + + + + Collapsed Build Property Categories + Selected Build Properties + Xcode3BuildSettingsEditorDisplayMode + Xcode3BuildPropertyValueDisplayMode + Xcode3BuildSettingsEditorMode + Xcode3BuildPropertyNameDisplayMode + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 1532 + + + CF$UID + 1533 + + + CF$UID + 1534 + + + CF$UID + 1535 + + + CF$UID + 1536 + + + CF$UID + 1537 + + + CF$UID + 1538 + + + CF$UID + 1539 + + + CF$UID + 1540 + + + CF$UID + 1541 + + + CF$UID + 1542 + + + CF$UID + 1543 + + + CF$UID + 1544 + + + CF$UID + 1545 + + + CF$UID + 1546 + + + CF$UID + 1547 + + + + + $class + + CF$UID + 109 + + NS.string + Architectures||ARCHS + + + $class + + CF$UID + 109 + + NS.string + Architectures||SDKROOT + + + $class + + CF$UID + 109 + + NS.string + Architectures||VALID_ARCHS + + + $class + + CF$UID + 109 + + NS.string + Build Locations||SYMROOT + + + $class + + CF$UID + 109 + + NS.string + Build Options||PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR + + + $class + + CF$UID + 109 + + NS.string + Deployment||INSTALL_PATH + + + $class + + CF$UID + 109 + + NS.string + Deployment||MACOSX_DEPLOYMENT_TARGET + + + $class + + CF$UID + 109 + + NS.string + Deployment||STRIP_INSTALLED_PRODUCT + + + $class + + CF$UID + 109 + + NS.string + Packaging||INFOPLIST_FILE + + + $class + + CF$UID + 109 + + NS.string + Packaging||PRODUCT_NAME + + + $class + + CF$UID + 109 + + NS.string + Search Paths||HEADER_SEARCH_PATHS + + + $class + + CF$UID + 109 + + NS.string + Search Paths||USER_HEADER_SEARCH_PATHS + + + $class + + CF$UID + 109 + + NS.string + LLVM GCC 4.2 - Code Generation||GCC_ENABLE_OBJC_GC + + + $class + + CF$UID + 109 + + NS.string + LLVM GCC 4.2 - Language||GCC_C_LANGUAGE_STANDARD + + + $class + + CF$UID + 109 + + NS.string + LLVM GCC 4.2 - Warnings||GCC_WARN_ABOUT_RETURN_TYPE + + + $class + + CF$UID + 109 + + NS.string + LLVM GCC 4.2 - Warnings||GCC_WARN_UNUSED_VARIABLE + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 1549 + + + + + $class + + CF$UID + 109 + + NS.string + LLVM GCC 4.2 - Code Generation||GCC_ENABLE_OBJC_GC + + + $class + + CF$UID + 39 + + NS.keys + + NS.objects + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1507 + + + CF$UID + 1483 + + + CF$UID + 1484 + + + CF$UID + 1485 + + + CF$UID + 1508 + + + NS.objects + + + CF$UID + 1509 + + + CF$UID + 1552 + + + CF$UID + 1509 + + + CF$UID + 1558 + + + CF$UID + 1584 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1488 + + + NS.objects + + + CF$UID + 1553 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 1554 + + + CF$UID + 1556 + + + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1491 + + + CF$UID + 1492 + + + NS.objects + + + CF$UID + 221 + + + CF$UID + 1555 + + + + 170 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1491 + + + CF$UID + 1492 + + + NS.objects + + + CF$UID + 221 + + + CF$UID + 1557 + + + + 645 + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 1559 + + + + + $class + + CF$UID + 1504 + + documentURL + + CF$UID + 1560 + + selection + + CF$UID + 1562 + + timestamp + + CF$UID + 1561 + + + file://localhost/Users/aleks/svn/tikzit/tikzit/TikZiT.xcodeproj/ + 348348307.809012 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1521 + + + CF$UID + 1502 + + + CF$UID + 1522 + + + NS.objects + + + CF$UID + 254 + + + CF$UID + 1509 + + + CF$UID + 1563 + + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 1564 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1530 + + + CF$UID + 1526 + + + CF$UID + 1527 + + + CF$UID + 1528 + + + CF$UID + 1529 + + + CF$UID + 1525 + + + NS.objects + + + CF$UID + 163 + + + CF$UID + 1565 + + + CF$UID + 246 + + + CF$UID + 246 + + + CF$UID + 163 + + + CF$UID + 1567 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 1566 + + + + + $class + + CF$UID + 109 + + NS.string + Architectures||VALID_ARCHS + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 1568 + + + CF$UID + 1569 + + + CF$UID + 1570 + + + CF$UID + 1571 + + + CF$UID + 1572 + + + CF$UID + 1573 + + + CF$UID + 1574 + + + CF$UID + 1575 + + + CF$UID + 1576 + + + CF$UID + 1577 + + + CF$UID + 1578 + + + CF$UID + 1579 + + + CF$UID + 1580 + + + CF$UID + 1581 + + + CF$UID + 1582 + + + CF$UID + 1583 + + + + + $class + + CF$UID + 109 + + NS.string + Architectures||ARCHS + + + $class + + CF$UID + 109 + + NS.string + Architectures||SDKROOT + + + $class + + CF$UID + 109 + + NS.string + Architectures||VALID_ARCHS + + + $class + + CF$UID + 109 + + NS.string + Build Locations||SYMROOT + + + $class + + CF$UID + 109 + + NS.string + Build Options||PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR + + + $class + + CF$UID + 109 + + NS.string + Deployment||INSTALL_PATH + + + $class + + CF$UID + 109 + + NS.string + Deployment||MACOSX_DEPLOYMENT_TARGET + + + $class + + CF$UID + 109 + + NS.string + Deployment||STRIP_INSTALLED_PRODUCT + + + $class + + CF$UID + 109 + + NS.string + Packaging||INFOPLIST_FILE + + + $class + + CF$UID + 109 + + NS.string + Packaging||PRODUCT_NAME + + + $class + + CF$UID + 109 + + NS.string + Search Paths||HEADER_SEARCH_PATHS + + + $class + + CF$UID + 109 + + NS.string + Search Paths||USER_HEADER_SEARCH_PATHS + + + $class + + CF$UID + 109 + + NS.string + LLVM GCC 4.2 - Code Generation||GCC_ENABLE_OBJC_GC + + + $class + + CF$UID + 109 + + NS.string + LLVM GCC 4.2 - Language||GCC_C_LANGUAGE_STANDARD + + + $class + + CF$UID + 109 + + NS.string + LLVM GCC 4.2 - Warnings||GCC_WARN_ABOUT_RETURN_TYPE + + + $class + + CF$UID + 109 + + NS.string + LLVM GCC 4.2 - Warnings||GCC_WARN_UNUSED_VARIABLE + + + $class + + CF$UID + 39 + + NS.keys + + NS.objects + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1586 + + + CF$UID + 1588 + + + CF$UID + 1590 + + + CF$UID + 1592 + + + CF$UID + 1594 + + + NS.objects + + + CF$UID + 1596 + + + CF$UID + 1604 + + + CF$UID + 1609 + + + CF$UID + 1614 + + + CF$UID + 1619 + + + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1587 + + + x-xcode-log://93BF0A7E-9B8F-4127-9E53-6FD4359563C8 + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1589 + + + x-xcode-log://E16FA7B2-DE55-4431-89C7-43D8A6C6BE2B + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1591 + + + x-xcode-log://541A0579-23A7-4735-AC53-0CA54C1CC926 + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1593 + + + x-xcode-log://4E6ECE08-C292-42A5-9EB8-F1D770002C74 + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1595 + + + x-xcode-log://56055AA1-9319-4181-AD73-7A2BA288B024 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 560 + + + NS.objects + + + CF$UID + 1597 + + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 1598 + + + + + $class + + CF$UID + 1603 + + documentURL + + CF$UID + 1587 + + expandTranscript + + indexPath + + CF$UID + 1599 + + timestamp + + CF$UID + 0 + + + + $class + + CF$UID + 1602 + + NSIndexPathData + + CF$UID + 1600 + + NSIndexPathLength + 2 + + + $class + + CF$UID + 1601 + + NS.data + + AEc= + + + + $classes + + NSMutableData + NSData + NSObject + + $classname + NSMutableData + + + $classes + + NSIndexPath + NSObject + + $classname + NSIndexPath + + + $classes + + IDELogDocumentLocation + DVTDocumentLocation + NSObject + + $classname + IDELogDocumentLocation + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 560 + + + NS.objects + + + CF$UID + 1605 + + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 1606 + + + + + $class + + CF$UID + 1603 + + documentURL + + CF$UID + 1589 + + expandTranscript + + indexPath + + CF$UID + 1607 + + timestamp + + CF$UID + 0 + + + + $class + + CF$UID + 1602 + + NSIndexPathData + + CF$UID + 1608 + + NSIndexPathLength + 2 + + + $class + + CF$UID + 1601 + + NS.data + + AEc= + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 560 + + + NS.objects + + + CF$UID + 1610 + + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 1611 + + + + + $class + + CF$UID + 1603 + + documentURL + + CF$UID + 1591 + + expandTranscript + + indexPath + + CF$UID + 1612 + + timestamp + + CF$UID + 0 + + + + $class + + CF$UID + 1602 + + NSIndexPathData + + CF$UID + 1613 + + NSIndexPathLength + 2 + + + $class + + CF$UID + 1601 + + NS.data + + AEc= + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 560 + + + NS.objects + + + CF$UID + 1615 + + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 1616 + + + + + $class + + CF$UID + 1603 + + documentURL + + CF$UID + 1593 + + expandTranscript + + indexPath + + CF$UID + 1617 + + timestamp + + CF$UID + 0 + + + + $class + + CF$UID + 1602 + + NSIndexPathData + + CF$UID + 1618 + + NSIndexPathLength + 2 + + + $class + + CF$UID + 1601 + + NS.data + + AEc= + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 560 + + + NS.objects + + + CF$UID + 1620 + + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 1621 + + + + + $class + + CF$UID + 1603 + + documentURL + + CF$UID + 1595 + + expandTranscript + + indexPath + + CF$UID + 1622 + + timestamp + + CF$UID + 0 + + + + $class + + CF$UID + 1602 + + NSIndexPathData + + CF$UID + 1623 + + NSIndexPathLength + 2 + + + $class + + CF$UID + 1601 + + NS.data + + AEg= + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1625 + + + CF$UID + 1626 + + + NS.objects + + + CF$UID + 1627 + + + CF$UID + 1628 + + + + IDEDeviceLocation + IDEDeviceArchitecture + dvtdevice-local-computer:localhost + i386 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1630 + + + NS.objects + + + CF$UID + 1631 + + + + IDENameString + TikZiT + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1633 + + + CF$UID + 1634 + + + CF$UID + 1635 + + + NS.objects + + + CF$UID + 1636 + + + CF$UID + 1661 + + + CF$UID + 57 + + + + IDEActivityReportCompletionSummaryStringSegments + IDEActivityReportOptions + IDEActivityReportTitle + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 1637 + + + CF$UID + 1644 + + + CF$UID + 1648 + + + CF$UID + 1652 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1638 + + + CF$UID + 1639 + + + CF$UID + 1640 + + + NS.objects + + + CF$UID + 1641 + + + CF$UID + 1642 + + + CF$UID + 1643 + + + + IDEActivityReportStringSegmentPriority + IDEActivityReportStringSegmentBackSeparator + IDEActivityReportStringSegmentStringValue + 2 + + Build + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1638 + + + CF$UID + 1639 + + + CF$UID + 1640 + + + NS.objects + + + CF$UID + 1645 + + + CF$UID + 1646 + + + CF$UID + 1647 + + + + 4 + : + TikZiT + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1638 + + + CF$UID + 1639 + + + CF$UID + 1640 + + + NS.objects + + + CF$UID + 1649 + + + CF$UID + 1650 + + + CF$UID + 1651 + + + + 1 + │ + + $class + + CF$UID + 1601 + + NS.data + + YnBsaXN0MDDUAQIDBAUGOzxYJHZlcnNpb25YJG9iamVjdHNZJGFy + Y2hpdmVyVCR0b3ASAAGGoK0HCA8QGhscJCUrMTQ3VSRudWxs0wkK + CwwNDlxOU0F0dHJpYnV0ZXNWJGNsYXNzWE5TU3RyaW5ngAOADIAC + WVN1Y2NlZWRlZNMKERITFBdXTlMua2V5c1pOUy5vYmplY3RzgAui + FRaABIAFohgZgAaACVZOU0ZvbnRXTlNDb2xvctQKHR4fICEiI1ZO + U05hbWVWTlNTaXplWE5TZkZsYWdzgAiAByNAJgAAAAAAABENEF8Q + EUx1Y2lkYUdyYW5kZS1Cb2xk0iYnKClaJGNsYXNzbmFtZVgkY2xh + c3Nlc1ZOU0ZvbnSiKCpYTlNPYmplY3TTCiwtLi8wXE5TQ29sb3JT + cGFjZVdOU1doaXRlgAoQA0IwANImJzIzV05TQ29sb3KiMirSJic1 + NlxOU0RpY3Rpb25hcnmiNSrSJic4OV8QEk5TQXR0cmlidXRlZFN0 + cmluZ6I6Kl8QEk5TQXR0cmlidXRlZFN0cmluZ18QD05TS2V5ZWRB + cmNoaXZlctE9PlRyb290gAEACAARABoAIwAtADIANwBFAEsAUgBf + AGYAbwBxAHMAdQB/AIYAjgCZAJsAngCgAKIApQCnAKkAsAC4AMEA + yADPANgA2gDcAOUA6AD8AQEBDAEVARwBHwEoAS8BPAFEAUYBSAFL + AVABWAFbAWABbQFwAXUBigGNAaIBtAG3AbwAAAAAAAACAQAAAAAA + AAA/AAAAAAAAAAAAAAAAAAABvg== + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1638 + + + CF$UID + 1653 + + + CF$UID + 1654 + + + CF$UID + 1640 + + + CF$UID + 1655 + + + CF$UID + 1656 + + + NS.objects + + + CF$UID + 1657 + + + CF$UID + 163 + + + CF$UID + 1658 + + + CF$UID + 1660 + + + CF$UID + 163 + + + CF$UID + 163 + + + + IDEActivityReportStringSegmentType + IDEActivityReportStringSegmentDate + IDEActivityReportStringSegmentDateStyle + IDEActivityReportStringSegmentTimeStyle + 3 + + $class + + CF$UID + 1659 + + NS.time + 381083546.00637001 + + + $classes + + NSDate + NSObject + + $classname + NSDate + + Today at 16:32 + 234 + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 3 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1664 + + + CF$UID + 1666 + + + CF$UID + 1668 + + + CF$UID + 1670 + + + CF$UID + 1672 + + + CF$UID + 1674 + + + CF$UID + 1676 + + + CF$UID + 1678 + + + CF$UID + 1680 + + + CF$UID + 1682 + + + CF$UID + 784 + + + CF$UID + 1684 + + + CF$UID + 1685 + + + CF$UID + 1687 + + + CF$UID + 1689 + + + CF$UID + 1691 + + + CF$UID + 1693 + + + CF$UID + 1695 + + + CF$UID + 907 + + + NS.objects + + + CF$UID + 1697 + + + CF$UID + 1702 + + + CF$UID + 1705 + + + CF$UID + 1708 + + + CF$UID + 1711 + + + CF$UID + 1714 + + + CF$UID + 1717 + + + CF$UID + 1720 + + + CF$UID + 1723 + + + CF$UID + 1726 + + + CF$UID + 1729 + + + CF$UID + 1734 + + + CF$UID + 1737 + + + CF$UID + 1740 + + + CF$UID + 1743 + + + CF$UID + 1746 + + + CF$UID + 1749 + + + CF$UID + 1752 + + + CF$UID + 1755 + + + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1665 + + + file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/GraphicsView.m + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1667 + + + file://localhost/Users/aleks/svn/tikzit/src/common/NodeStyle.m + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1669 + + + file://localhost/Users/aleks/svn/tikzit/English.lproj/TikzDocument.xib + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1671 + + + file://localhost/Users/aleks/svn/tikzit/src/common/Node.m + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1673 + + + file://localhost/Users/aleks/svn/tikzit/src/osx/PropertyInspectorController.m + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1675 + + + file://localhost/Users/aleks/git/tikzit/tikzit/src/osx/GraphicsView.m + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1677 + + + file://localhost/Users/aleks/svn/tikzit/English.lproj/StylePalette.xib + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1679 + + + file://localhost/Users/aleks/svn/tikzit/src/osx/StylePaletteController.m + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1681 + + + file://localhost/Users/aleks/git/tikzit/tikzit/src/common/Edge.m + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1683 + + + file://localhost/Users/aleks/git/tikzit/tikzit/src/osx/Grid.m + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1518 + + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1686 + + + file://localhost/Users/aleks/svn/tikzit/English.lproj/PropertyInspector.xib + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1688 + + + file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/PreviewController.m + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1690 + + + file://localhost/Users/aleks/git/tikzit/tikzit/src/common/TikzGraphAssembler.m + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1692 + + + file://localhost/Users/aleks/git/tikzit/tikzit/src/common/tikzlexer.lm + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1694 + + + file://localhost/Users/aleks/svn/tikzit/src/osx/NodeLayer.h + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1696 + + + file://localhost/Users/aleks/svn/tikzit/English.lproj/Preview.xib + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1698 + + + CF$UID + 1699 + + + NS.objects + + + CF$UID + 1700 + + + CF$UID + 1701 + + + + width + height + 600 + 600 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1698 + + + CF$UID + 1699 + + + NS.objects + + + CF$UID + 1703 + + + CF$UID + 1704 + + + + 600 + 600 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1698 + + + CF$UID + 1699 + + + NS.objects + + + CF$UID + 1706 + + + CF$UID + 1707 + + + + 600 + 600 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1698 + + + CF$UID + 1699 + + + NS.objects + + + CF$UID + 1709 + + + CF$UID + 1710 + + + + 600 + 600 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1698 + + + CF$UID + 1699 + + + NS.objects + + + CF$UID + 1712 + + + CF$UID + 1713 + + + + 600 + 600 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1698 + + + CF$UID + 1699 + + + NS.objects + + + CF$UID + 1715 + + + CF$UID + 1716 + + + + 600 + 600 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1698 + + + CF$UID + 1699 + + + NS.objects + + + CF$UID + 1718 + + + CF$UID + 1719 + + + + 1133 + 763 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1698 + + + CF$UID + 1699 + + + NS.objects + + + CF$UID + 1721 + + + CF$UID + 1722 + + + + 600 + 600 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1698 + + + CF$UID + 1699 + + + NS.objects + + + CF$UID + 1724 + + + CF$UID + 1725 + + + + 600 + 600 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1698 + + + CF$UID + 1699 + + + NS.objects + + + CF$UID + 1727 + + + CF$UID + 1728 + + + + 600 + 600 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1730 + + + CF$UID + 1731 + + + NS.objects + + + CF$UID + 1732 + + + CF$UID + 1733 + + + + width + height + 600 + 600 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1698 + + + CF$UID + 1699 + + + NS.objects + + + CF$UID + 1735 + + + CF$UID + 1736 + + + + 600 + 600 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1698 + + + CF$UID + 1699 + + + NS.objects + + + CF$UID + 1738 + + + CF$UID + 1739 + + + + 600 + 600 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1698 + + + CF$UID + 1699 + + + NS.objects + + + CF$UID + 1741 + + + CF$UID + 1742 + + + + 600 + 600 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1698 + + + CF$UID + 1699 + + + NS.objects + + + CF$UID + 1744 + + + CF$UID + 1745 + + + + 600 + 600 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1698 + + + CF$UID + 1699 + + + NS.objects + + + CF$UID + 1747 + + + CF$UID + 1748 + + + + 600 + 600 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1698 + + + CF$UID + 1699 + + + NS.objects + + + CF$UID + 1750 + + + CF$UID + 1751 + + + + 600 + 600 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1698 + + + CF$UID + 1699 + + + NS.objects + + + CF$UID + 1753 + + + CF$UID + 1754 + + + + 600 + 600 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1730 + + + CF$UID + 1731 + + + NS.objects + + + CF$UID + 1756 + + + CF$UID + 1757 + + + + 600 + 600 + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 1759 + + + CF$UID + 1761 + + + CF$UID + 1763 + + + CF$UID + 1765 + + + CF$UID + 1767 + + + CF$UID + 1769 + + + CF$UID + 1771 + + + CF$UID + 1772 + + + CF$UID + 1773 + + + CF$UID + 1774 + + + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1760 + + + file://localhost/Users/aleks/git/tikzit/tikzit/src/common/Graph.m + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1762 + + + file://localhost/Users/aleks/git/tikzit/tikzit/src/common/Edge.m + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1764 + + + file://localhost/Users/aleks/git/tikzit/tikzit/src/common/tikzparser.ym + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1766 + + + file://localhost/Users/aleks/git/tikzit/tikzit/src/common/tikzlexer.lm + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1768 + + + file://localhost/Users/aleks/git/tikzit/tikzit/src/common/TikzGraphAssembler.m + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1770 + + + file://localhost/Users/aleks/git/tikzit/tikzit/TikZiT-Info.plist + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1499 + + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1683 + + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1675 + + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 365 + + + + $top + + State + + CF$UID + 1 + + + $version + 100000 + + diff --git a/tikzit-1/TikZiT.xcodeproj/project.xcworkspace/xcuserdata/aleks.xcuserdatad/WorkspaceSettings.xcsettings b/tikzit-1/TikZiT.xcodeproj/project.xcworkspace/xcuserdata/aleks.xcuserdatad/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..c1034ce --- /dev/null +++ b/tikzit-1/TikZiT.xcodeproj/project.xcworkspace/xcuserdata/aleks.xcuserdatad/WorkspaceSettings.xcsettings @@ -0,0 +1,22 @@ + + + + + IDEWorkspaceUserSettings_BuildLocationStyle + 2 + IDEWorkspaceUserSettings_BuildSubfolderNameStyle + 0 + IDEWorkspaceUserSettings_DerivedDataLocationStyle + 0 + IDEWorkspaceUserSettings_HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges + + IDEWorkspaceUserSettings_IssueFilterStyle + 0 + IDEWorkspaceUserSettings_LiveSourceIssuesEnabled + + IDEWorkspaceUserSettings_SnapshotAutomaticallyBeforeSignificantChanges + + IDEWorkspaceUserSettings_SnapshotLocationStyle + 0 + + diff --git a/tikzit-1/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist b/tikzit-1/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist new file mode 100644 index 0000000..5a56e60 --- /dev/null +++ b/tikzit-1/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tikzit-1/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/TikZiT.xcscheme b/tikzit-1/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/TikZiT.xcscheme new file mode 100644 index 0000000..86e70a8 --- /dev/null +++ b/tikzit-1/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/TikZiT.xcscheme @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tikzit-1/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/tests.xcscheme b/tikzit-1/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/tests.xcscheme new file mode 100644 index 0000000..9e1a430 --- /dev/null +++ b/tikzit-1/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/tests.xcscheme @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tikzit-1/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/xcschememanagement.plist b/tikzit-1/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..3291a35 --- /dev/null +++ b/tikzit-1/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,32 @@ + + + + + SchemeUserState + + TikZiT.xcscheme + + orderHint + 1 + + tests.xcscheme + + orderHint + 0 + + + SuppressBuildableAutocreation + + 5589AA6411C5429C0064D310 + + primary + + + 8D15AC270486D014006FF6A4 + + primary + + + + + diff --git a/tikzit-1/TikZiT_Prefix.pch b/tikzit-1/TikZiT_Prefix.pch new file mode 100644 index 0000000..78e4d0f --- /dev/null +++ b/tikzit-1/TikZiT_Prefix.pch @@ -0,0 +1,30 @@ +// +// TikZiT_Prefix.pch +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +// +// Prefix header for all source files of the 'TikZiT' target in the 'TikZiT' project +// + +#ifdef __OBJC__ + #import +#endif diff --git a/tikzit-1/autogen.sh b/tikzit-1/autogen.sh new file mode 100755 index 0000000..132ecd0 --- /dev/null +++ b/tikzit-1/autogen.sh @@ -0,0 +1,1578 @@ +#!/bin/sh +# a u t o g e n . s h +# +# Copyright (c) 2005-2009 United States Government as represented by +# the U.S. Army Research Laboratory. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following +# disclaimer in the documentation and/or other materials provided +# with the distribution. +# +# 3. The name of the author may not be used to endorse or promote +# products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS +# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +### +# +# Script for automatically preparing the sources for compilation by +# performing the myriad of necessary steps. The script attempts to +# detect proper version support, and outputs warnings about particular +# systems that have autotool peculiarities. +# +# Basically, if everything is set up and installed correctly, the +# script will validate that minimum versions of the GNU Build System +# tools are installed, account for several common configuration +# issues, and then simply run autoreconf for you. +# +# If autoreconf fails, which can happen for many valid configurations, +# this script proceeds to run manual preparation steps effectively +# providing a POSIX shell script (mostly complete) reimplementation of +# autoreconf. +# +# The AUTORECONF, AUTOCONF, AUTOMAKE, LIBTOOLIZE, ACLOCAL, AUTOHEADER +# environment variables and corresponding _OPTIONS variables (e.g. +# AUTORECONF_OPTIONS) may be used to override the default automatic +# detection behaviors. Similarly the _VERSION variables will override +# the minimum required version numbers. +# +# Examples: +# +# To obtain help on usage: +# ./autogen.sh --help +# +# To obtain verbose output: +# ./autogen.sh --verbose +# +# To skip autoreconf and prepare manually: +# AUTORECONF=false ./autogen.sh +# +# To verbosely try running with an older (unsupported) autoconf: +# AUTOCONF_VERSION=2.50 ./autogen.sh --verbose +# +# Author: +# Christopher Sean Morrison +# +# Patches: +# Sebastian Pipping +# +###################################################################### + +# set to minimum acceptable version of autoconf +if [ "x$AUTOCONF_VERSION" = "x" ] ; then + AUTOCONF_VERSION=2.60 +fi +# set to minimum acceptable version of automake +if [ "x$AUTOMAKE_VERSION" = "x" ] ; then + AUTOMAKE_VERSION=1.6.0 +fi +# set to minimum acceptable version of libtool +if [ "x$LIBTOOL_VERSION" = "x" ] ; then + LIBTOOL_VERSION=1.4.2 +fi + + +################## +# ident function # +################## +ident ( ) { + # extract copyright from header + __copyright="`grep Copyright $AUTOGEN_SH | head -${HEAD_N}1 | awk '{print $4}'`" + if [ "x$__copyright" = "x" ] ; then + __copyright="`date +%Y`" + fi + + # extract version from CVS Id string + __id="$Id: autogen.sh 33925 2009-03-01 23:27:06Z brlcad $" + __version="`echo $__id | sed 's/.*\([0-9][0-9][0-9][0-9]\)[-\/]\([0-9][0-9]\)[-\/]\([0-9][0-9]\).*/\1\2\3/'`" + if [ "x$__version" = "x" ] ; then + __version="" + fi + + echo "autogen.sh build preparation script by Christopher Sean Morrison" + echo " + config.guess download patch by Sebastian Pipping (2008-12-03)" + echo "revised 3-clause BSD-style license, copyright (c) $__copyright" + echo "script version $__version, ISO/IEC 9945 POSIX shell script" +} + + +################## +# USAGE FUNCTION # +################## +usage ( ) { + echo "Usage: $AUTOGEN_SH [-h|--help] [-v|--verbose] [-q|--quiet] [-d|--download] [--version]" + echo " --help Help on $NAME_OF_AUTOGEN usage" + echo " --verbose Verbose progress output" + echo " --quiet Quiet suppressed progress output" + echo " --download Download the latest config.guess from gnulib" + echo " --version Only perform GNU Build System version checks" + echo + echo "Description: This script will validate that minimum versions of the" + echo "GNU Build System tools are installed and then run autoreconf for you." + echo "Should autoreconf fail, manual preparation steps will be run" + echo "potentially accounting for several common preparation issues. The" + + echo "AUTORECONF, AUTOCONF, AUTOMAKE, LIBTOOLIZE, ACLOCAL, AUTOHEADER," + echo "PROJECT, & CONFIGURE environment variables and corresponding _OPTIONS" + echo "variables (e.g. AUTORECONF_OPTIONS) may be used to override the" + echo "default automatic detection behavior." + echo + + ident + + return 0 +} + + +########################## +# VERSION_ERROR FUNCTION # +########################## +version_error ( ) { + if [ "x$1" = "x" ] ; then + echo "INTERNAL ERROR: version_error was not provided a version" + exit 1 + fi + if [ "x$2" = "x" ] ; then + echo "INTERNAL ERROR: version_error was not provided an application name" + exit 1 + fi + $ECHO + $ECHO "ERROR: To prepare the ${PROJECT} build system from scratch," + $ECHO " at least version $1 of $2 must be installed." + $ECHO + $ECHO "$NAME_OF_AUTOGEN does not need to be run on the same machine that will" + $ECHO "run configure or make. Either the GNU Autotools will need to be installed" + $ECHO "or upgraded on this system, or $NAME_OF_AUTOGEN must be run on the source" + $ECHO "code on another system and then transferred to here. -- Cheers!" + $ECHO +} + +########################## +# VERSION_CHECK FUNCTION # +########################## +version_check ( ) { + if [ "x$1" = "x" ] ; then + echo "INTERNAL ERROR: version_check was not provided a minimum version" + exit 1 + fi + _min="$1" + if [ "x$2" = "x" ] ; then + echo "INTERNAL ERROR: version check was not provided a comparison version" + exit 1 + fi + _cur="$2" + + # needed to handle versions like 1.10 and 1.4-p6 + _min="`echo ${_min}. | sed 's/[^0-9]/./g' | sed 's/\.\././g'`" + _cur="`echo ${_cur}. | sed 's/[^0-9]/./g' | sed 's/\.\././g'`" + + _min_major="`echo $_min | cut -d. -f1`" + _min_minor="`echo $_min | cut -d. -f2`" + _min_patch="`echo $_min | cut -d. -f3`" + + _cur_major="`echo $_cur | cut -d. -f1`" + _cur_minor="`echo $_cur | cut -d. -f2`" + _cur_patch="`echo $_cur | cut -d. -f3`" + + if [ "x$_min_major" = "x" ] ; then + _min_major=0 + fi + if [ "x$_min_minor" = "x" ] ; then + _min_minor=0 + fi + if [ "x$_min_patch" = "x" ] ; then + _min_patch=0 + fi + if [ "x$_cur_minor" = "x" ] ; then + _cur_major=0 + fi + if [ "x$_cur_minor" = "x" ] ; then + _cur_minor=0 + fi + if [ "x$_cur_patch" = "x" ] ; then + _cur_patch=0 + fi + + $VERBOSE_ECHO "Checking if ${_cur_major}.${_cur_minor}.${_cur_patch} is greater than ${_min_major}.${_min_minor}.${_min_patch}" + + if [ $_min_major -lt $_cur_major ] ; then + return 0 + elif [ $_min_major -eq $_cur_major ] ; then + if [ $_min_minor -lt $_cur_minor ] ; then + return 0 + elif [ $_min_minor -eq $_cur_minor ] ; then + if [ $_min_patch -lt $_cur_patch ] ; then + return 0 + elif [ $_min_patch -eq $_cur_patch ] ; then + return 0 + fi + fi + fi + return 1 +} + + +###################################### +# LOCATE_CONFIGURE_TEMPLATE FUNCTION # +###################################### +locate_configure_template ( ) { + _pwd="`pwd`" + if test -f "./configure.ac" ; then + echo "./configure.ac" + elif test -f "./configure.in" ; then + echo "./configure.in" + elif test -f "$_pwd/configure.ac" ; then + echo "$_pwd/configure.ac" + elif test -f "$_pwd/configure.in" ; then + echo "$_pwd/configure.in" + elif test -f "$PATH_TO_AUTOGEN/configure.ac" ; then + echo "$PATH_TO_AUTOGEN/configure.ac" + elif test -f "$PATH_TO_AUTOGEN/configure.in" ; then + echo "$PATH_TO_AUTOGEN/configure.in" + fi +} + + +################## +# argument check # +################## +ARGS="$*" +PATH_TO_AUTOGEN="`dirname $0`" +NAME_OF_AUTOGEN="`basename $0`" +AUTOGEN_SH="$PATH_TO_AUTOGEN/$NAME_OF_AUTOGEN" + +LIBTOOL_M4="${PATH_TO_AUTOGEN}/misc/libtool.m4" + +if [ "x$HELP" = "x" ] ; then + HELP=no +fi +if [ "x$QUIET" = "x" ] ; then + QUIET=no +fi +if [ "x$VERBOSE" = "x" ] ; then + VERBOSE=no +fi +if [ "x$VERSION_ONLY" = "x" ] ; then + VERSION_ONLY=no +fi +if [ "x$DOWNLOAD" = "x" ] ; then + DOWNLOAD=no +fi +if [ "x$AUTORECONF_OPTIONS" = "x" ] ; then + AUTORECONF_OPTIONS="-i -f" +fi +if [ "x$AUTOCONF_OPTIONS" = "x" ] ; then + AUTOCONF_OPTIONS="-f" +fi +if [ "x$AUTOMAKE_OPTIONS" = "x" ] ; then + AUTOMAKE_OPTIONS="-a -c -f" +fi +ALT_AUTOMAKE_OPTIONS="-a -c" +if [ "x$LIBTOOLIZE_OPTIONS" = "x" ] ; then + LIBTOOLIZE_OPTIONS="--automake -c -f" +fi +ALT_LIBTOOLIZE_OPTIONS="--automake --copy --force" +if [ "x$ACLOCAL_OPTIONS" = "x" ] ; then + ACLOCAL_OPTIONS="" +fi +if [ "x$AUTOHEADER_OPTIONS" = "x" ] ; then + AUTOHEADER_OPTIONS="" +fi +if [ "x$CONFIG_GUESS_URL" = "x" ] ; then + CONFIG_GUESS_URL="http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;f=build-aux/config.guess;hb=HEAD" +fi +for arg in $ARGS ; do + case "x$arg" in + x--help) HELP=yes ;; + x-[hH]) HELP=yes ;; + x--quiet) QUIET=yes ;; + x-[qQ]) QUIET=yes ;; + x--verbose) VERBOSE=yes ;; + x-[dD]) DOWNLOAD=yes ;; + x--download) DOWNLOAD=yes ;; + x-[vV]) VERBOSE=yes ;; + x--version) VERSION_ONLY=yes ;; + *) + echo "Unknown option: $arg" + echo + usage + exit 1 + ;; + esac +done + + +##################### +# environment check # +##################### + +# sanity check before recursions potentially begin +if [ ! -f "$AUTOGEN_SH" ] ; then + echo "INTERNAL ERROR: $AUTOGEN_SH does not exist" + if [ ! "x$0" = "x$AUTOGEN_SH" ] ; then + echo "INTERNAL ERROR: dirname/basename inconsistency: $0 != $AUTOGEN_SH" + fi + exit 1 +fi + +# force locale setting to C so things like date output as expected +LC_ALL=C + +# commands that this script expects +for __cmd in echo head tail pwd ; do + echo "test" | $__cmd > /dev/null 2>&1 + if [ $? != 0 ] ; then + echo "INTERNAL ERROR: '${__cmd}' command is required" + exit 2 + fi +done +echo "test" | grep "test" > /dev/null 2>&1 +if test ! x$? = x0 ; then + echo "INTERNAL ERROR: grep command is required" + exit 1 +fi +echo "test" | sed "s/test/test/" > /dev/null 2>&1 +if test ! x$? = x0 ; then + echo "INTERNAL ERROR: sed command is required" + exit 1 +fi + + +# determine the behavior of echo +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in + *c*,-n*) ECHO_N= ECHO_C=' +' ECHO_T=' ' ;; + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; + *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +esac + +# determine the behavior of head +case "x`echo 'head' | head -n 1 2>&1`" in + *xhead*) HEAD_N="n " ;; + *) HEAD_N="" ;; +esac + +# determine the behavior of tail +case "x`echo 'tail' | tail -n 1 2>&1`" in + *xtail*) TAIL_N="n " ;; + *) TAIL_N="" ;; +esac + +VERBOSE_ECHO=: +ECHO=: +if [ "x$QUIET" = "xyes" ] ; then + if [ "x$VERBOSE" = "xyes" ] ; then + echo "Verbose output quelled by quiet option. Further output disabled." + fi +else + ECHO=echo + if [ "x$VERBOSE" = "xyes" ] ; then + echo "Verbose output enabled" + VERBOSE_ECHO=echo + fi +fi + + +# allow a recursive run to disable further recursions +if [ "x$RUN_RECURSIVE" = "x" ] ; then + RUN_RECURSIVE=yes +fi + + +################################################ +# check for help arg and bypass version checks # +################################################ +if [ "x`echo $ARGS | sed 's/.*[hH][eE][lL][pP].*/help/'`" = "xhelp" ] ; then + HELP=yes +fi +if [ "x$HELP" = "xyes" ] ; then + usage + $ECHO "---" + $ECHO "Help was requested. No preparation or configuration will be performed." + exit 0 +fi + + +####################### +# set up signal traps # +####################### +untrap_abnormal ( ) { + for sig in 1 2 13 15; do + trap - $sig + done +} + +# do this cleanup whenever we exit. +trap ' + # start from the root + if test -d "$START_PATH" ; then + cd "$START_PATH" + fi + + # restore/delete backup files + if test "x$PFC_INIT" = "x1" ; then + recursive_restore + fi +' 0 + +# trap SIGHUP (1), SIGINT (2), SIGPIPE (13), SIGTERM (15) +for sig in 1 2 13 15; do + trap ' + $ECHO "" + $ECHO "Aborting $NAME_OF_AUTOGEN: caught signal '$sig'" + + # start from the root + if test -d "$START_PATH" ; then + cd "$START_PATH" + fi + + # clean up on abnormal exit + $VERBOSE_ECHO "rm -rf autom4te.cache" + rm -rf autom4te.cache + + if test -f "acinclude.m4.$$.backup" ; then + $VERBOSE_ECHO "cat acinclude.m4.$$.backup > acinclude.m4" + chmod u+w acinclude.m4 + cat acinclude.m4.$$.backup > acinclude.m4 + + $VERBOSE_ECHO "rm -f acinclude.m4.$$.backup" + rm -f acinclude.m4.$$.backup + fi + + { (exit 1); exit 1; } +' $sig +done + + +############################# +# look for a configure file # +############################# +if [ "x$CONFIGURE" = "x" ] ; then + CONFIGURE="`locate_configure_template`" + if [ ! "x$CONFIGURE" = "x" ] ; then + $VERBOSE_ECHO "Found a configure template: $CONFIGURE" + fi +else + $ECHO "Using CONFIGURE environment variable override: $CONFIGURE" +fi +if [ "x$CONFIGURE" = "x" ] ; then + if [ "x$VERSION_ONLY" = "xyes" ] ; then + CONFIGURE=/dev/null + else + $ECHO + $ECHO "A configure.ac or configure.in file could not be located implying" + $ECHO "that the GNU Build System is at least not used in this directory. In" + $ECHO "any case, there is nothing to do here without one of those files." + $ECHO + $ECHO "ERROR: No configure.in or configure.ac file found in `pwd`" + exit 1 + fi +fi + +#################### +# get project name # +#################### +if [ "x$PROJECT" = "x" ] ; then + PROJECT="`grep AC_INIT $CONFIGURE | grep -v '.*#.*AC_INIT' | tail -${TAIL_N}1 | sed 's/^[ ]*AC_INIT(\([^,)]*\).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`" + if [ "x$PROJECT" = "xAC_INIT" ] ; then + # projects might be using the older/deprecated arg-less AC_INIT .. look for AM_INIT_AUTOMAKE instead + PROJECT="`grep AM_INIT_AUTOMAKE $CONFIGURE | grep -v '.*#.*AM_INIT_AUTOMAKE' | tail -${TAIL_N}1 | sed 's/^[ ]*AM_INIT_AUTOMAKE(\([^,)]*\).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`" + fi + if [ "x$PROJECT" = "xAM_INIT_AUTOMAKE" ] ; then + PROJECT="project" + fi + if [ "x$PROJECT" = "x" ] ; then + PROJECT="project" + fi +else + $ECHO "Using PROJECT environment variable override: $PROJECT" +fi +$ECHO "Preparing the $PROJECT build system...please wait" +$ECHO + + +######################## +# check for autoreconf # +######################## +HAVE_AUTORECONF=no +if [ "x$AUTORECONF" = "x" ] ; then + for AUTORECONF in autoreconf ; do + $VERBOSE_ECHO "Checking autoreconf version: $AUTORECONF --version" + $AUTORECONF --version > /dev/null 2>&1 + if [ $? = 0 ] ; then + HAVE_AUTORECONF=yes + break + fi + done +else + HAVE_AUTORECONF=yes + $ECHO "Using AUTORECONF environment variable override: $AUTORECONF" +fi + + +########################## +# autoconf version check # +########################## +_acfound=no +if [ "x$AUTOCONF" = "x" ] ; then + for AUTOCONF in autoconf ; do + $VERBOSE_ECHO "Checking autoconf version: $AUTOCONF --version" + $AUTOCONF --version > /dev/null 2>&1 + if [ $? = 0 ] ; then + _acfound=yes + break + fi + done +else + _acfound=yes + $ECHO "Using AUTOCONF environment variable override: $AUTOCONF" +fi + +_report_error=no +if [ ! "x$_acfound" = "xyes" ] ; then + $ECHO "ERROR: Unable to locate GNU Autoconf." + _report_error=yes +else + _version="`$AUTOCONF --version | head -${HEAD_N}1 | sed 's/[^0-9]*\([0-9\.][0-9\.]*\)/\1/'`" + if [ "x$_version" = "x" ] ; then + _version="0.0.0" + fi + $ECHO "Found GNU Autoconf version $_version" + version_check "$AUTOCONF_VERSION" "$_version" + if [ $? -ne 0 ] ; then + _report_error=yes + fi +fi +if [ "x$_report_error" = "xyes" ] ; then + version_error "$AUTOCONF_VERSION" "GNU Autoconf" + exit 1 +fi + + +########################## +# automake version check # +########################## +_amfound=no +if [ "x$AUTOMAKE" = "x" ] ; then + for AUTOMAKE in automake ; do + $VERBOSE_ECHO "Checking automake version: $AUTOMAKE --version" + $AUTOMAKE --version > /dev/null 2>&1 + if [ $? = 0 ] ; then + _amfound=yes + break + fi + done +else + _amfound=yes + $ECHO "Using AUTOMAKE environment variable override: $AUTOMAKE" +fi + + +_report_error=no +if [ ! "x$_amfound" = "xyes" ] ; then + $ECHO + $ECHO "ERROR: Unable to locate GNU Automake." + _report_error=yes +else + _version="`$AUTOMAKE --version | head -${HEAD_N}1 | sed 's/[^0-9]*\([0-9\.][0-9\.]*\)/\1/'`" + if [ "x$_version" = "x" ] ; then + _version="0.0.0" + fi + $ECHO "Found GNU Automake version $_version" + version_check "$AUTOMAKE_VERSION" "$_version" + if [ $? -ne 0 ] ; then + _report_error=yes + fi +fi +if [ "x$_report_error" = "xyes" ] ; then + version_error "$AUTOMAKE_VERSION" "GNU Automake" + exit 1 +fi + + +######################## +# check for libtoolize # +######################## +HAVE_LIBTOOLIZE=yes +HAVE_ALT_LIBTOOLIZE=no +_ltfound=no +if [ "x$LIBTOOLIZE" = "x" ] ; then + LIBTOOLIZE=libtoolize + $VERBOSE_ECHO "Checking libtoolize version: $LIBTOOLIZE --version" + $LIBTOOLIZE --version > /dev/null 2>&1 + if [ ! $? = 0 ] ; then + HAVE_LIBTOOLIZE=no + $ECHO + if [ "x$HAVE_AUTORECONF" = "xno" ] ; then + $ECHO "Warning: libtoolize does not appear to be available." + else + $ECHO "Warning: libtoolize does not appear to be available. This means that" + $ECHO "the automatic build preparation via autoreconf will probably not work." + $ECHO "Preparing the build by running each step individually, however, should" + $ECHO "work and will be done automatically for you if autoreconf fails." + fi + + # look for some alternates + for tool in glibtoolize libtoolize15 libtoolize14 libtoolize13 ; do + $VERBOSE_ECHO "Checking libtoolize alternate: $tool --version" + _glibtoolize="`$tool --version > /dev/null 2>&1`" + if [ $? = 0 ] ; then + $VERBOSE_ECHO "Found $tool --version" + _glti="`which $tool`" + if [ "x$_glti" = "x" ] ; then + $VERBOSE_ECHO "Cannot find $tool with which" + continue; + fi + if test ! -f "$_glti" ; then + $VERBOSE_ECHO "Cannot use $tool, $_glti is not a file" + continue; + fi + _gltidir="`dirname $_glti`" + if [ "x$_gltidir" = "x" ] ; then + $VERBOSE_ECHO "Cannot find $tool path with dirname of $_glti" + continue; + fi + if test ! -d "$_gltidir" ; then + $VERBOSE_ECHO "Cannot use $tool, $_gltidir is not a directory" + continue; + fi + HAVE_ALT_LIBTOOLIZE=yes + LIBTOOLIZE="$tool" + $ECHO + $ECHO "Fortunately, $tool was found which means that your system may simply" + $ECHO "have a non-standard or incomplete GNU Autotools install. If you have" + $ECHO "sufficient system access, it may be possible to quell this warning by" + $ECHO "running:" + $ECHO + sudo -V > /dev/null 2>&1 + if [ $? = 0 ] ; then + $ECHO " sudo ln -s $_glti $_gltidir/libtoolize" + $ECHO + else + $ECHO " ln -s $_glti $_gltidir/libtoolize" + $ECHO + $ECHO "Run that as root or with proper permissions to the $_gltidir directory" + $ECHO + fi + _ltfound=yes + break + fi + done + else + _ltfound=yes + fi +else + _ltfound=yes + $ECHO "Using LIBTOOLIZE environment variable override: $LIBTOOLIZE" +fi + + +############################ +# libtoolize version check # +############################ +_report_error=no +if [ ! "x$_ltfound" = "xyes" ] ; then + $ECHO + $ECHO "ERROR: Unable to locate GNU Libtool." + _report_error=yes +else + _version="`$LIBTOOLIZE --version | head -${HEAD_N}1 | sed 's/[^0-9]*\([0-9\.][0-9\.]*\)/\1/'`" + if [ "x$_version" = "x" ] ; then + _version="0.0.0" + fi + $ECHO "Found GNU Libtool version $_version" + version_check "$LIBTOOL_VERSION" "$_version" + if [ $? -ne 0 ] ; then + _report_error=yes + fi +fi +if [ "x$_report_error" = "xyes" ] ; then + version_error "$LIBTOOL_VERSION" "GNU Libtool" + exit 1 +fi + + +##################### +# check for aclocal # +##################### +if [ "x$ACLOCAL" = "x" ] ; then + for ACLOCAL in aclocal ; do + $VERBOSE_ECHO "Checking aclocal version: $ACLOCAL --version" + $ACLOCAL --version > /dev/null 2>&1 + if [ $? = 0 ] ; then + break + fi + done +else + $ECHO "Using ACLOCAL environment variable override: $ACLOCAL" +fi + + +######################## +# check for autoheader # +######################## +if [ "x$AUTOHEADER" = "x" ] ; then + for AUTOHEADER in autoheader ; do + $VERBOSE_ECHO "Checking autoheader version: $AUTOHEADER --version" + $AUTOHEADER --version > /dev/null 2>&1 + if [ $? = 0 ] ; then + break + fi + done +else + $ECHO "Using AUTOHEADER environment variable override: $AUTOHEADER" +fi + + +######################### +# check if version only # +######################### +$VERBOSE_ECHO "Checking whether to only output version information" +if [ "x$VERSION_ONLY" = "xyes" ] ; then + $ECHO + ident + $ECHO "---" + $ECHO "Version requested. No preparation or configuration will be performed." + exit 0 +fi + + +################################# +# PROTECT_FROM_CLOBBER FUNCTION # +################################# +protect_from_clobber ( ) { + PFC_INIT=1 + + # protect COPYING & INSTALL from overwrite by automake. the + # automake force option will (inappropriately) ignore the existing + # contents of a COPYING and/or INSTALL files (depending on the + # version) instead of just forcing *missing* files like it does + # for AUTHORS, NEWS, and README. this is broken but extremely + # prevalent behavior, so we protect against it by keeping a backup + # of the file that can later be restored. + + for file in COPYING INSTALL ; do + if test -f ${file} ; then + if test -f ${file}.$$.protect_from_automake.backup ; then + $VERBOSE_ECHO "Already backed up ${file} in `pwd`" + else + $VERBOSE_ECHO "Backing up ${file} in `pwd`" + $VERBOSE_ECHO "cp -p ${file} ${file}.$$.protect_from_automake.backup" + cp -p ${file} ${file}.$$.protect_from_automake.backup + fi + fi + done +} + + +############################## +# RECURSIVE_PROTECT FUNCTION # +############################## +recursive_protect ( ) { + + # for projects using recursive configure, run the build + # preparation steps for the subdirectories. this function assumes + # START_PATH was set to pwd before recursion begins so that + # relative paths work. + + # git 'r done, protect COPYING and INSTALL from being clobbered + protect_from_clobber + + if test -d autom4te.cache ; then + $VERBOSE_ECHO "Found an autom4te.cache directory, deleting it" + $VERBOSE_ECHO "rm -rf autom4te.cache" + rm -rf autom4te.cache + fi + + # find configure template + _configure="`locate_configure_template`" + if [ "x$_configure" = "x" ] ; then + return + fi + # $VERBOSE_ECHO "Looking for configure template found `pwd`/$_configure" + + # look for subdirs + # $VERBOSE_ECHO "Looking for subdirs in `pwd`" + _det_config_subdirs="`grep AC_CONFIG_SUBDIRS $_configure | grep -v '.*#.*AC_CONFIG_SUBDIRS' | sed 's/^[ ]*AC_CONFIG_SUBDIRS(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`" + CHECK_DIRS="" + for dir in $_det_config_subdirs ; do + if test -d "`pwd`/$dir" ; then + CHECK_DIRS="$CHECK_DIRS \"`pwd`/$dir\"" + fi + done + + # process subdirs + if [ ! "x$CHECK_DIRS" = "x" ] ; then + $VERBOSE_ECHO "Recursively scanning the following directories:" + $VERBOSE_ECHO " $CHECK_DIRS" + for dir in $CHECK_DIRS ; do + $VERBOSE_ECHO "Protecting files from automake in $dir" + cd "$START_PATH" + eval "cd $dir" + + # recursively git 'r done + recursive_protect + done + fi +} # end of recursive_protect + + +############################# +# RESTORE_CLOBBERED FUNCION # +############################# +restore_clobbered ( ) { + + # The automake (and autoreconf by extension) -f/--force-missing + # option may overwrite COPYING and INSTALL even if they do exist. + # Here we restore the files if necessary. + + spacer=no + + for file in COPYING INSTALL ; do + if test -f ${file}.$$.protect_from_automake.backup ; then + if test -f ${file} ; then + # compare entire content, restore if needed + if test "x`cat ${file}`" != "x`cat ${file}.$$.protect_from_automake.backup`" ; then + if test "x$spacer" = "xno" ; then + $VERBOSE_ECHO + spacer=yes + fi + # restore the backup + $VERBOSE_ECHO "Restoring ${file} from backup (automake -f likely clobbered it)" + $VERBOSE_ECHO "rm -f ${file}" + rm -f ${file} + $VERBOSE_ECHO "mv ${file}.$$.protect_from_automake.backup ${file}" + mv ${file}.$$.protect_from_automake.backup ${file} + fi # check contents + elif test -f ${file}.$$.protect_from_automake.backup ; then + $VERBOSE_ECHO "mv ${file}.$$.protect_from_automake.backup ${file}" + mv ${file}.$$.protect_from_automake.backup ${file} + fi # -f ${file} + + # just in case + $VERBOSE_ECHO "rm -f ${file}.$$.protect_from_automake.backup" + rm -f ${file}.$$.protect_from_automake.backup + fi # -f ${file}.$$.protect_from_automake.backup + done + + CONFIGURE="`locate_configure_template`" + if [ "x$CONFIGURE" = "x" ] ; then + return + fi + + _aux_dir="`grep AC_CONFIG_AUX_DIR $CONFIGURE | grep -v '.*#.*AC_CONFIG_AUX_DIR' | tail -${TAIL_N}1 | sed 's/^[ ]*AC_CONFIG_AUX_DIR(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`" + if test ! -d "$_aux_dir" ; then + _aux_dir=. + fi + + for file in config.guess config.sub ltmain.sh ; do + if test -f "${_aux_dir}/${file}" ; then + $VERBOSE_ECHO "rm -f \"${_aux_dir}/${file}.backup\"" + rm -f "${_aux_dir}/${file}.backup" + fi + done +} # end of restore_clobbered + + +############################## +# RECURSIVE_RESTORE FUNCTION # +############################## +recursive_restore ( ) { + + # restore COPYING and INSTALL from backup if they were clobbered + # for each directory recursively. + + # git 'r undone + restore_clobbered + + # find configure template + _configure="`locate_configure_template`" + if [ "x$_configure" = "x" ] ; then + return + fi + + # look for subdirs + _det_config_subdirs="`grep AC_CONFIG_SUBDIRS $_configure | grep -v '.*#.*AC_CONFIG_SUBDIRS' | sed 's/^[ ]*AC_CONFIG_SUBDIRS(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`" + CHECK_DIRS="" + for dir in $_det_config_subdirs ; do + if test -d "`pwd`/$dir" ; then + CHECK_DIRS="$CHECK_DIRS \"`pwd`/$dir\"" + fi + done + + # process subdirs + if [ ! "x$CHECK_DIRS" = "x" ] ; then + $VERBOSE_ECHO "Recursively scanning the following directories:" + $VERBOSE_ECHO " $CHECK_DIRS" + for dir in $CHECK_DIRS ; do + $VERBOSE_ECHO "Checking files for automake damage in $dir" + cd "$START_PATH" + eval "cd $dir" + + # recursively git 'r undone + recursive_restore + done + fi +} # end of recursive_restore + + +####################### +# INITIALIZE FUNCTION # +####################### +initialize ( ) { + + # this routine performs a variety of directory-specific + # initializations. some are sanity checks, some are preventive, + # and some are necessary setup detection. + # + # this function sets: + # CONFIGURE + # SEARCH_DIRS + # CONFIG_SUBDIRS + + ################################## + # check for a configure template # + ################################## + CONFIGURE="`locate_configure_template`" + if [ "x$CONFIGURE" = "x" ] ; then + $ECHO + $ECHO "A configure.ac or configure.in file could not be located implying" + $ECHO "that the GNU Build System is at least not used in this directory. In" + $ECHO "any case, there is nothing to do here without one of those files." + $ECHO + $ECHO "ERROR: No configure.in or configure.ac file found in `pwd`" + exit 1 + fi + + ##################### + # detect an aux dir # + ##################### + _aux_dir="`grep AC_CONFIG_AUX_DIR $CONFIGURE | grep -v '.*#.*AC_CONFIG_AUX_DIR' | tail -${TAIL_N}1 | sed 's/^[ ]*AC_CONFIG_AUX_DIR(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`" + if test ! -d "$_aux_dir" ; then + _aux_dir=. + else + $VERBOSE_ECHO "Detected auxillary directory: $_aux_dir" + fi + + ################################ + # detect a recursive configure # + ################################ + CONFIG_SUBDIRS="" + _det_config_subdirs="`grep AC_CONFIG_SUBDIRS $CONFIGURE | grep -v '.*#.*AC_CONFIG_SUBDIRS' | sed 's/^[ ]*AC_CONFIG_SUBDIRS(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`" + for dir in $_det_config_subdirs ; do + if test -d "`pwd`/$dir" ; then + $VERBOSE_ECHO "Detected recursive configure directory: `pwd`/$dir" + CONFIG_SUBDIRS="$CONFIG_SUBDIRS `pwd`/$dir" + fi + done + + ########################################################### + # make sure certain required files exist for GNU projects # + ########################################################### + _marker_found="" + _marker_found_message_intro='Detected non-GNU marker "' + _marker_found_message_mid='" in ' + for marker in foreign cygnus ; do + _marker_found_message=${_marker_found_message_intro}${marker}${_marker_found_message_mid} + _marker_found="`grep 'AM_INIT_AUTOMAKE.*'${marker} $CONFIGURE`" + if [ ! "x$_marker_found" = "x" ] ; then + $VERBOSE_ECHO "${_marker_found_message}`basename \"$CONFIGURE\"`" + break + fi + if test -f "`dirname \"$CONFIGURE\"/Makefile.am`" ; then + _marker_found="`grep 'AUTOMAKE_OPTIONS.*'${marker} Makefile.am`" + if [ ! "x$_marker_found" = "x" ] ; then + $VERBOSE_ECHO "${_marker_found_message}Makefile.am" + break + fi + fi + done + if [ "x${_marker_found}" = "x" ] ; then + _suggest_foreign=no + for file in AUTHORS COPYING ChangeLog INSTALL NEWS README ; do + if [ ! -f $file ] ; then + $VERBOSE_ECHO "Touching ${file} since it does not exist" + _suggest_foreign=yes + touch $file + fi + done + + if [ "x${_suggest_foreign}" = "xyes" ] ; then + $ECHO + $ECHO "Warning: Several files expected of projects that conform to the GNU" + $ECHO "coding standards were not found. The files were automatically added" + $ECHO "for you since you do not have a 'foreign' declaration specified." + $ECHO + $ECHO "Considered adding 'foreign' to AM_INIT_AUTOMAKE in `basename \"$CONFIGURE\"`" + if test -f "`dirname \"$CONFIGURE\"/Makefile.am`" ; then + $ECHO "or to AUTOMAKE_OPTIONS in your top-level Makefile.am file." + fi + $ECHO + fi + fi + + ################################################## + # make sure certain generated files do not exist # + ################################################## + for file in config.guess config.sub ltmain.sh ; do + if test -f "${_aux_dir}/${file}" ; then + $VERBOSE_ECHO "mv -f \"${_aux_dir}/${file}\" \"${_aux_dir}/${file}.backup\"" + mv -f "${_aux_dir}/${file}" "${_aux_dir}/${file}.backup" + fi + done + + ############################ + # search alternate m4 dirs # + ############################ + SEARCH_DIRS="" + for dir in m4 ; do + if [ -d $dir ] ; then + $VERBOSE_ECHO "Found extra aclocal search directory: $dir" + SEARCH_DIRS="$SEARCH_DIRS -I $dir" + fi + done + + ###################################### + # remove any previous build products # + ###################################### + if test -d autom4te.cache ; then + $VERBOSE_ECHO "Found an autom4te.cache directory, deleting it" + $VERBOSE_ECHO "rm -rf autom4te.cache" + rm -rf autom4te.cache + fi +# tcl/tk (and probably others) have a customized aclocal.m4, so can't delete it +# if test -f aclocal.m4 ; then +# $VERBOSE_ECHO "Found an aclocal.m4 file, deleting it" +# $VERBOSE_ECHO "rm -f aclocal.m4" +# rm -f aclocal.m4 +# fi + +} # end of initialize() + + +############## +# initialize # +############## + +# stash path +START_PATH="`pwd`" + +# Before running autoreconf or manual steps, some prep detection work +# is necessary or useful. Only needs to occur once per directory, but +# does need to traverse the entire subconfigure hierarchy to protect +# files from being clobbered even by autoreconf. +recursive_protect + +# start from where we started +cd "$START_PATH" + +# get ready to process +initialize + + +######################################### +# DOWNLOAD_GNULIB_CONFIG_GUESS FUNCTION # +######################################### + +# TODO - should make sure wget/curl exist and/or work before trying to +# use them. + +download_gnulib_config_guess () { + # abuse gitweb to download gnulib's latest config.guess via HTTP + config_guess_temp="config.guess.$$.download" + ret=1 + for __cmd in wget curl fetch ; do + $VERBOSE_ECHO "Checking for command ${__cmd}" + ${__cmd} --version > /dev/null 2>&1 + ret=$? + if [ ! $ret = 0 ] ; then + continue + fi + + __cmd_version=`${__cmd} --version | head -n 1 | sed -e 's/^[^0-9]\+//' -e 's/ .*//'` + $VERBOSE_ECHO "Found ${__cmd} ${__cmd_version}" + + opts="" + case ${__cmd} in + wget) + opts="-O" + ;; + curl) + opts="-o" + ;; + fetch) + opts="-t 5 -f" + ;; + esac + + $VERBOSE_ECHO "Running $__cmd \"${CONFIG_GUESS_URL}\" $opts \"${config_guess_temp}\"" + eval "$__cmd \"${CONFIG_GUESS_URL}\" $opts \"${config_guess_temp}\"" > /dev/null 2>&1 + if [ $? = 0 ] ; then + mv -f "${config_guess_temp}" ${_aux_dir}/config.guess + ret=0 + break + fi + done + + if [ ! $ret = 0 ] ; then + $ECHO "Warning: config.guess download failed from: $CONFIG_GUESS_URL" + rm -f "${config_guess_temp}" + fi +} + + +############################## +# LIBTOOLIZE_NEEDED FUNCTION # +############################## +libtoolize_needed () { + ret=1 # means no, don't need libtoolize + for feature in AC_PROG_LIBTOOL AM_PROG_LIBTOOL LT_INIT ; do + $VERBOSE_ECHO "Searching for $feature in $CONFIGURE" + found="`grep \"^$feature.*\" $CONFIGURE`" + if [ ! "x$found" = "x" ] ; then + ret=0 # means yes, need to run libtoolize + break + fi + done + return ${ret} +} + + + +############################################ +# prepare build via autoreconf or manually # +############################################ +reconfigure_manually=no +if [ "x$HAVE_AUTORECONF" = "xyes" ] ; then + $ECHO + $ECHO $ECHO_N "Automatically preparing build ... $ECHO_C" + + $VERBOSE_ECHO "$AUTORECONF $SEARCH_DIRS $AUTORECONF_OPTIONS" + autoreconf_output="`$AUTORECONF $SEARCH_DIRS $AUTORECONF_OPTIONS 2>&1`" + ret=$? + $VERBOSE_ECHO "$autoreconf_output" + + if [ ! $ret = 0 ] ; then + if [ "x$HAVE_ALT_LIBTOOLIZE" = "xyes" ] ; then + if [ ! "x`echo \"$autoreconf_output\" | grep libtoolize | grep \"No such file or directory\"`" = "x" ] ; then + $ECHO + $ECHO "Warning: autoreconf failed but due to what is usually a common libtool" + $ECHO "misconfiguration issue. This problem is encountered on systems that" + $ECHO "have installed libtoolize under a different name without providing a" + $ECHO "symbolic link or without setting the LIBTOOLIZE environment variable." + $ECHO + $ECHO "Restarting the preparation steps with LIBTOOLIZE set to $LIBTOOLIZE" + + export LIBTOOLIZE + RUN_RECURSIVE=no + export RUN_RECURSIVE + untrap_abnormal + + $VERBOSE_ECHO sh $AUTOGEN_SH "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9" + sh "$AUTOGEN_SH" "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9" + exit $? + fi + fi + + $ECHO "Warning: $AUTORECONF failed" + + if test -f ltmain.sh ; then + $ECHO "libtoolize being run by autoreconf is not creating ltmain.sh in the auxillary directory like it should" + fi + + $ECHO "Attempting to run the preparation steps individually" + reconfigure_manually=yes + else + if [ "x$DOWNLOAD" = "xyes" ] ; then + if libtoolize_needed ; then + download_gnulib_config_guess + fi + fi + fi +else + reconfigure_manually=yes +fi + + +############################ +# LIBTOOL_FAILURE FUNCTION # +############################ +libtool_failure ( ) { + + # libtool is rather error-prone in comparison to the other + # autotools and this routine attempts to compensate for some + # common failures. the output after a libtoolize failure is + # parsed for an error related to AC_PROG_LIBTOOL and if found, we + # attempt to inject a project-provided libtool.m4 file. + + _autoconf_output="$1" + + if [ "x$RUN_RECURSIVE" = "xno" ] ; then + # we already tried the libtool.m4, don't try again + return 1 + fi + + if test -f "$LIBTOOL_M4" ; then + found_libtool="`$ECHO $_autoconf_output | grep AC_PROG_LIBTOOL`" + if test ! "x$found_libtool" = "x" ; then + if test -f acinclude.m4 ; then + rm -f acinclude.m4.$$.backup + $VERBOSE_ECHO "cat acinclude.m4 > acinclude.m4.$$.backup" + cat acinclude.m4 > acinclude.m4.$$.backup + fi + $VERBOSE_ECHO "cat \"$LIBTOOL_M4\" >> acinclude.m4" + chmod u+w acinclude.m4 + cat "$LIBTOOL_M4" >> acinclude.m4 + + # don't keep doing this + RUN_RECURSIVE=no + export RUN_RECURSIVE + untrap_abnormal + + $ECHO + $ECHO "Restarting the preparation steps with libtool macros in acinclude.m4" + $VERBOSE_ECHO sh $AUTOGEN_SH "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9" + sh "$AUTOGEN_SH" "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9" + exit $? + fi + fi +} + + +########################### +# MANUAL_AUTOGEN FUNCTION # +########################### +manual_autogen ( ) { + + ################################################## + # Manual preparation steps taken are as follows: # + # aclocal [-I m4] # + # libtoolize --automake -c -f # + # aclocal [-I m4] # + # autoconf -f # + # autoheader # + # automake -a -c -f # + ################################################## + + ########### + # aclocal # + ########### + $VERBOSE_ECHO "$ACLOCAL $SEARCH_DIRS $ACLOCAL_OPTIONS" + aclocal_output="`$ACLOCAL $SEARCH_DIRS $ACLOCAL_OPTIONS 2>&1`" + ret=$? + $VERBOSE_ECHO "$aclocal_output" + if [ ! $ret = 0 ] ; then $ECHO "ERROR: $ACLOCAL failed" && exit 2 ; fi + + ############## + # libtoolize # + ############## + if libtoolize_needed ; then + if [ "x$HAVE_LIBTOOLIZE" = "xyes" ] ; then + $VERBOSE_ECHO "$LIBTOOLIZE $LIBTOOLIZE_OPTIONS" + libtoolize_output="`$LIBTOOLIZE $LIBTOOLIZE_OPTIONS 2>&1`" + ret=$? + $VERBOSE_ECHO "$libtoolize_output" + + if [ ! $ret = 0 ] ; then $ECHO "ERROR: $LIBTOOLIZE failed" && exit 2 ; fi + else + if [ "x$HAVE_ALT_LIBTOOLIZE" = "xyes" ] ; then + $VERBOSE_ECHO "$LIBTOOLIZE $ALT_LIBTOOLIZE_OPTIONS" + libtoolize_output="`$LIBTOOLIZE $ALT_LIBTOOLIZE_OPTIONS 2>&1`" + ret=$? + $VERBOSE_ECHO "$libtoolize_output" + + if [ ! $ret = 0 ] ; then $ECHO "ERROR: $LIBTOOLIZE failed" && exit 2 ; fi + fi + fi + + ########### + # aclocal # + ########### + # re-run again as instructed by libtoolize + $VERBOSE_ECHO "$ACLOCAL $SEARCH_DIRS $ACLOCAL_OPTIONS" + aclocal_output="`$ACLOCAL $SEARCH_DIRS $ACLOCAL_OPTIONS 2>&1`" + ret=$? + $VERBOSE_ECHO "$aclocal_output" + + # libtoolize might put ltmain.sh in the wrong place + if test -f ltmain.sh ; then + if test ! -f "${_aux_dir}/ltmain.sh" ; then + $ECHO + $ECHO "Warning: $LIBTOOLIZE is creating ltmain.sh in the wrong directory" + $ECHO + $ECHO "Fortunately, the problem can be worked around by simply copying the" + $ECHO "file to the appropriate location (${_aux_dir}/). This has been done for you." + $ECHO + $VERBOSE_ECHO "cp -p ltmain.sh \"${_aux_dir}/ltmain.sh\"" + cp -p ltmain.sh "${_aux_dir}/ltmain.sh" + $ECHO $ECHO_N "Continuing build preparation ... $ECHO_C" + fi + fi # ltmain.sh + + if [ "x$DOWNLOAD" = "xyes" ] ; then + download_gnulib_config_guess + fi + fi # libtoolize_needed + + ############ + # autoconf # + ############ + $VERBOSE_ECHO + $VERBOSE_ECHO "$AUTOCONF $AUTOCONF_OPTIONS" + autoconf_output="`$AUTOCONF $AUTOCONF_OPTIONS 2>&1`" + ret=$? + $VERBOSE_ECHO "$autoconf_output" + + if [ ! $ret = 0 ] ; then + # retry without the -f and check for usage of macros that are too new + ac2_59_macros="AC_C_RESTRICT AC_INCLUDES_DEFAULT AC_LANG_ASSERT AC_LANG_WERROR AS_SET_CATFILE" + ac2_55_macros="AC_COMPILER_IFELSE AC_FUNC_MBRTOWC AC_HEADER_STDBOOL AC_LANG_CONFTEST AC_LANG_SOURCE AC_LANG_PROGRAM AC_LANG_CALL AC_LANG_FUNC_TRY_LINK AC_MSG_FAILURE AC_PREPROC_IFELSE" + ac2_54_macros="AC_C_BACKSLASH_A AC_CONFIG_LIBOBJ_DIR AC_GNU_SOURCE AC_PROG_EGREP AC_PROG_FGREP AC_REPLACE_FNMATCH AC_FUNC_FNMATCH_GNU AC_FUNC_REALLOC AC_TYPE_MBSTATE_T" + + macros_to_search="" + ac_major="`echo ${AUTOCONF_VERSION}. | cut -d. -f1 | sed 's/[^0-9]//g'`" + ac_minor="`echo ${AUTOCONF_VERSION}. | cut -d. -f2 | sed 's/[^0-9]//g'`" + + if [ $ac_major -lt 2 ] ; then + macros_to_search="$ac2_59_macros $ac2_55_macros $ac2_54_macros" + else + if [ $ac_minor -lt 54 ] ; then + macros_to_search="$ac2_59_macros $ac2_55_macros $ac2_54_macros" + elif [ $ac_minor -lt 55 ] ; then + macros_to_search="$ac2_59_macros $ac2_55_macros" + elif [ $ac_minor -lt 59 ] ; then + macros_to_search="$ac2_59_macros" + fi + fi + + configure_ac_macros=__none__ + for feature in $macros_to_search ; do + $VERBOSE_ECHO "Searching for $feature in $CONFIGURE" + found="`grep \"^$feature.*\" $CONFIGURE`" + if [ ! "x$found" = "x" ] ; then + if [ "x$configure_ac_macros" = "x__none__" ] ; then + configure_ac_macros="$feature" + else + configure_ac_macros="$feature $configure_ac_macros" + fi + fi + done + if [ ! "x$configure_ac_macros" = "x__none__" ] ; then + $ECHO + $ECHO "Warning: Unsupported macros were found in $CONFIGURE" + $ECHO + $ECHO "The `basename \"$CONFIGURE\"` file was scanned in order to determine if any" + $ECHO "unsupported macros are used that exceed the minimum version" + $ECHO "settings specified within this file. As such, the following macros" + $ECHO "should be removed from configure.ac or the version numbers in this" + $ECHO "file should be increased:" + $ECHO + $ECHO "$configure_ac_macros" + $ECHO + $ECHO $ECHO_N "Ignorantly continuing build preparation ... $ECHO_C" + fi + + ################### + # autoconf, retry # + ################### + $VERBOSE_ECHO + $VERBOSE_ECHO "$AUTOCONF" + autoconf_output="`$AUTOCONF 2>&1`" + ret=$? + $VERBOSE_ECHO "$autoconf_output" + + if [ ! $ret = 0 ] ; then + # test if libtool is busted + libtool_failure "$autoconf_output" + + # let the user know what went wrong + cat < +Provides: tikzit +Description: TikZiT is a GTK+ application that allows the creation and modification of TeX diagrams written using the pgf/TikZ macro library. It is especially geared toward rapidly creating "dot"-diagrams for use in academic papers. diff --git a/tikzit-1/configure.ac b/tikzit-1/configure.ac new file mode 100644 index 0000000..a86156b --- /dev/null +++ b/tikzit-1/configure.ac @@ -0,0 +1,141 @@ +# -*- Autoconf -*- +# Process this file with autoconf to produce a configure script. + +AC_PREREQ([2.60]) +AC_INIT([TikZiT], [1.1], + [http://sourceforge.net/apps/trac/tikzit], + [tikzit], + [http://tikzit.sourceforge.net]) +AM_INIT_AUTOMAKE([1.10 foreign subdir-objects -Wall -Werror]) +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +AC_OUTPUT(Makefile + src/Makefile + share/Makefile +) +AC_CONFIG_SRCDIR([src/gtk/main.m]) + +m4_include([m4/objc.m4]) + +# Checks for programs. +AC_PROG_OBJC([gcc clang objc objcc]) +AC_LANG([Objective C]) + +AC_CHECK_PROGS([FLEX], [flex lex], [flex]) +AS_IF([$FLEX --version 2>/dev/null | grep "^flex" >/dev/null 2>/dev/null],[], + [ + AC_MSG_WARN([flex not found; this may cause problems for developers]) + # in case a lex that wasn't flex was found + FLEX=flex + ]) +AM_MISSING_PROG([LEX], [$FLEX]) + +AC_CHECK_PROGS([BISON], [bison yacc], [bison]) +AS_IF([$BISON --version 2>/dev/null | grep "^bison" >/dev/null 2>/dev/null],[], + [ + AC_MSG_WARN([bison not found; this may cause problems for developers]) + # in case a yacc that wasn't bison was found + BISON=bison + ]) +AM_MISSING_PROG([YACC], [$BISON]) + +# Checks for libraries. +FOUNDATION_OBJCFLAGS=`eval "gnustep-config --objc-flags"` +AS_IF([test "x$FOUNDATION_OBJCFLAGS" = "x"], + [AC_MSG_ERROR([GNUstep not found])]) +FOUNDATION_LIBS=`eval "gnustep-config --base-libs"` +AS_IF([test "x$FOUNDATION_LIBS" = "x"], + [AC_MSG_ERROR([GNUstep not found])]) +AC_SUBST([FOUNDATION_OBJCFLAGS]) +AC_SUBST([FOUNDATION_LIBS]) + +TZ_TEST_OBJCFLAGS="$FOUNDATION_OBJCFLAGS" +TZ_TEST_LDFLAGS="$FOUNDATION_LIBS" + +TZ_OBJC_FOUNDATION +AS_IF([test "x$tz_cv_objc_foundation" != "xyes"], + [AC_MSG_ERROR([Objective C Foundation not found -- missing gnustep-base(-devel)?])]) + +AC_ARG_WITH([poppler], AS_HELP_STRING([--without-poppler], [Ignore presence of poppler, disabling preview support])) + +AS_IF([test "x$with_poppler" != "xno"], + [ + AC_MSG_CHECKING([for poppler-glib]) + PKG_CHECK_EXISTS([poppler-glib >= 0.10], + [have_poppler=yes], + [have_poppler=no]) + AS_IF([test "x$have_poppler" = "xyes"], + [ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_POPPLER, 1) + ], + [ + AC_MSG_RESULT([no]) + AS_IF([test "x$with_poppler" = "xyes"], + [AC_MSG_ERROR([poppler requested but not found (note that poppler-glib is required)])] + ) + ]) + ], + [have_poppler=no]) +AM_CONDITIONAL([HAVE_POPPLER],[test "x$have_poppler" = "xyes"]) + +# Test all the pkg-config stuff together, so that +# dependencies and duplicate flags are correctly handled +AS_IF([test "x$have_poppler" = "xyes"], + [PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.18.0 gdk-pixbuf-2.0 >= 2.16.0 pango >= 1.16 cairo >= 1.4 poppler-glib >= 0.10])], + [PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.18.0 gdk-pixbuf-2.0 >= 2.16.0 pango >= 1.16 cairo >= 1.4])]) + +# Checks for header files. +AC_FUNC_ALLOCA +AC_CHECK_HEADERS([inttypes.h libintl.h limits.h malloc.h stddef.h stdint.h stdlib.h string.h unistd.h]) + +# Checks for typedefs, structures, and compiler characteristics. +AC_TYPE_INT16_T +AC_TYPE_INT32_T +AC_TYPE_INT8_T +AC_TYPE_SIZE_T +AC_TYPE_UINT16_T +AC_TYPE_UINT32_T +AC_TYPE_UINT64_T +AC_TYPE_UINT8_T +AC_HEADER_STDBOOL +AC_HEADER_STAT +AC_CHECK_HEADERS([stdint.h inttypes.h unistd.h sys/time.h time.h]) + +# Checks for library functions. +AC_FUNC_MALLOC +AC_FUNC_REALLOC +AC_CHECK_FUNCS([floor gettimeofday memset mkdtemp sqrt strdup]) + +TZ_OBJC2_FEATURES +AS_IF([test "x$tz_cv_objc_properties$tz_cv_objc_fast_enumeration$tz_cv_objc_optional_keyword" != "xyesyesyes"], + [AC_MSG_ERROR([Your Objective C compiler does not support the required Objective C 2 features])]) + +dnl ---------------------------------------------------------------------------- +dnl +dnl platform-specific stuff. + +AC_CANONICAL_HOST +have_msw="no" +case $host_os in + + *mingw32*) + have_msw="yes" + OBJCFLAGS="$OBJCFLAGS -mwindows" + AC_SUBST([WINDOWS]) + AC_SUBST([WIN32]) + AC_SUBST([_WIN32]) + ;; + +esac + +AM_CONDITIONAL([WINDOWS],[test "x$have_msw" = "xyes"]) + +AS_IF([test "x$with_poppler" != "xno"], + [AS_IF([test "x$have_poppler" != "xyes"], + AC_MSG_WARN([poppler-glib was not found; preview support will be disabled]) + )] + ) + +AC_OUTPUT + +# vi:sts=2:sw=2:et diff --git a/tikzit-1/customshape.png b/tikzit-1/customshape.png new file mode 100755 index 0000000..cff8275 Binary files /dev/null and b/tikzit-1/customshape.png differ diff --git a/tikzit-1/docs/Doxyfile b/tikzit-1/docs/Doxyfile new file mode 100644 index 0000000..70a27f7 --- /dev/null +++ b/tikzit-1/docs/Doxyfile @@ -0,0 +1,1600 @@ +# Doxyfile 1.6.3 + +# This file describes the settings to be used by the documentation system +# doxygen (www.doxygen.org) for a project +# +# All text after a hash (#) is considered a comment and will be ignored +# The format is: +# TAG = value [value, ...] +# For lists items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (" ") + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- + +# This tag specifies the encoding used for all characters in the config file +# that follow. The default is UTF-8 which is also the encoding used for all +# text before the first occurrence of this tag. Doxygen uses libiconv (or the +# iconv built into libc) for the transcoding. See +# http://www.gnu.org/software/libiconv for the list of possible encodings. + +DOXYFILE_ENCODING = UTF-8 + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded +# by quotes) that should identify the project. + +PROJECT_NAME = TikZiT + +# The PROJECT_NUMBER tag can be used to enter a project or revision number. +# This could be handy for archiving the generated documentation or +# if some version control system is used. + +PROJECT_NUMBER = 0.3 + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) +# base path where the generated documentation will be put. +# If a relative path is entered, it will be relative to the location +# where doxygen was started. If left blank the current directory will be used. + +OUTPUT_DIRECTORY = doxygen + +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create +# 4096 sub-directories (in 2 levels) under the output directory of each output +# format and will distribute the generated files over these directories. +# Enabling this option can be useful when feeding doxygen a huge amount of +# source files, where putting all generated files in the same directory would +# otherwise cause performance problems for the file system. + +CREATE_SUBDIRS = NO + +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# The default language is English, other supported languages are: +# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, +# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, +# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English +# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, +# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, +# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. + +OUTPUT_LANGUAGE = English + +# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will +# include brief member descriptions after the members that are listed in +# the file and class documentation (similar to JavaDoc). +# Set to NO to disable this. + +BRIEF_MEMBER_DESC = YES + +# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend +# the brief description of a member or function before the detailed description. +# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# brief descriptions will be completely suppressed. + +REPEAT_BRIEF = YES + +# This tag implements a quasi-intelligent brief description abbreviator +# that is used to form the text in various listings. Each string +# in this list, if found as the leading text of the brief description, will be +# stripped from the text and the result after processing the whole list, is +# used as the annotated text. Otherwise, the brief description is used as-is. +# If left blank, the following values are used ("$name" is automatically +# replaced with the name of the entity): "The $name class" "The $name widget" +# "The $name file" "is" "provides" "specifies" "contains" +# "represents" "a" "an" "the" + +ABBREVIATE_BRIEF = "The $name class" \ + "The $name widget" \ + "The $name file" \ + is \ + provides \ + specifies \ + contains \ + represents \ + a \ + an \ + the + +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# Doxygen will generate a detailed section even if there is only a brief +# description. + +ALWAYS_DETAILED_SEC = NO + +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment +# operators of the base classes will not be shown. + +INLINE_INHERITED_MEMB = NO + +# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full +# path before files name in the file list and in the header files. If set +# to NO the shortest path that makes the file name unique will be used. + +FULL_PATH_NAMES = YES + +# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag +# can be used to strip a user-defined part of the path. Stripping is +# only done if one of the specified strings matches the left-hand part of +# the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the +# path to strip. + +STRIP_FROM_PATH = /Applications/ + +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of +# the path mentioned in the documentation of a class, which tells +# the reader which header file to include in order to use a class. +# If left blank only the name of the header file containing the class +# definition is used. Otherwise one should specify the include paths that +# are normally passed to the compiler using the -I flag. + +STRIP_FROM_INC_PATH = + +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter +# (but less readable) file names. This can be useful is your file systems +# doesn't support long names like on DOS, Mac, or CD-ROM. + +SHORT_NAMES = NO + +# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen +# will interpret the first line (until the first dot) of a JavaDoc-style +# comment as the brief description. If set to NO, the JavaDoc +# comments will behave just like regular Qt-style comments +# (thus requiring an explicit @brief command for a brief description.) + +JAVADOC_AUTOBRIEF = NO + +# If the QT_AUTOBRIEF tag is set to YES then Doxygen will +# interpret the first line (until the first dot) of a Qt-style +# comment as the brief description. If set to NO, the comments +# will behave just like regular Qt-style comments (thus requiring +# an explicit \brief command for a brief description.) + +QT_AUTOBRIEF = NO + +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen +# treat a multi-line C++ special comment block (i.e. a block of //! or /// +# comments) as a brief description. This used to be the default behaviour. +# The new default is to treat a multi-line C++ comment block as a detailed +# description. Set this tag to YES if you prefer the old behaviour instead. + +MULTILINE_CPP_IS_BRIEF = NO + +# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented +# member inherits the documentation from any documented member that it +# re-implements. + +INHERIT_DOCS = YES + +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce +# a new page for each member. If set to NO, the documentation of a member will +# be part of the file/class/namespace that contains it. + +SEPARATE_MEMBER_PAGES = NO + +# The TAB_SIZE tag can be used to set the number of spaces in a tab. +# Doxygen uses this value to replace tabs by spaces in code fragments. + +TAB_SIZE = 8 + +# This tag can be used to specify a number of aliases that acts +# as commands in the documentation. An alias has the form "name=value". +# For example adding "sideeffect=\par Side Effects:\n" will allow you to +# put the command \sideeffect (or @sideeffect) in the documentation, which +# will result in a user-defined paragraph with heading "Side Effects:". +# You can put \n's in the value part of an alias to insert newlines. + +ALIASES = + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C +# sources only. Doxygen will then generate output that is more tailored for C. +# For instance, some of the names that are used will be different. The list +# of all members will be omitted, etc. + +OPTIMIZE_OUTPUT_FOR_C = NO + +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java +# sources only. Doxygen will then generate output that is more tailored for +# Java. For instance, namespaces will be presented as packages, qualified +# scopes will look different, etc. + +OPTIMIZE_OUTPUT_JAVA = NO + +# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran +# sources only. Doxygen will then generate output that is more tailored for +# Fortran. + +OPTIMIZE_FOR_FORTRAN = NO + +# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL +# sources. Doxygen will then generate output that is tailored for +# VHDL. + +OPTIMIZE_OUTPUT_VHDL = NO + +# Doxygen selects the parser to use depending on the extension of the files it parses. +# With this tag you can assign which parser to use for a given extension. +# Doxygen has a built-in mapping, but you can override or extend it using this tag. +# The format is ext=language, where ext is a file extension, and language is one of +# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, +# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat +# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), +# use: inc=Fortran f=C. Note that for custom extensions you also need to set +# FILE_PATTERNS otherwise the files are not read by doxygen. + +EXTENSION_MAPPING = + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want +# to include (a tag file for) the STL sources as input, then you should +# set this tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. +# func(std::string) {}). This also make the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate. + +BUILTIN_STL_SUPPORT = NO + +# If you use Microsoft's C++/CLI language, you should set this option to YES to +# enable parsing support. + +CPP_CLI_SUPPORT = NO + +# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. +# Doxygen will parse them like normal C++ but will assume all classes use public +# instead of private inheritance when no explicit protection keyword is present. + +SIP_SUPPORT = NO + +# For Microsoft's IDL there are propget and propput attributes to indicate getter +# and setter methods for a property. Setting this option to YES (the default) +# will make doxygen to replace the get and set methods by a property in the +# documentation. This will only work if the methods are indeed getting or +# setting a simple type. If this is not the case, or you want to show the +# methods anyway, you should set this option to NO. + +IDL_PROPERTY_SUPPORT = YES + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default +# all members of a group must be documented explicitly. + +DISTRIBUTE_GROUP_DOC = NO + +# Set the SUBGROUPING tag to YES (the default) to allow class member groups of +# the same type (for instance a group of public functions) to be put as a +# subgroup of that type (e.g. under the Public Functions section). Set it to +# NO to prevent subgrouping. Alternatively, this can be done per class using +# the \nosubgrouping command. + +SUBGROUPING = YES + +# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum +# is documented as struct, union, or enum with the name of the typedef. So +# typedef struct TypeS {} TypeT, will appear in the documentation as a struct +# with name TypeT. When disabled the typedef will appear as a member of a file, +# namespace, or class. And the struct will be named TypeS. This can typically +# be useful for C code in case the coding convention dictates that all compound +# types are typedef'ed and only the typedef is referenced, never the tag name. + +TYPEDEF_HIDES_STRUCT = NO + +# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to +# determine which symbols to keep in memory and which to flush to disk. +# When the cache is full, less often used symbols will be written to disk. +# For small to medium size projects (<1000 input files) the default value is +# probably good enough. For larger projects a too small cache size can cause +# doxygen to be busy swapping symbols to and from disk most of the time +# causing a significant performance penality. +# If the system has enough physical memory increasing the cache will improve the +# performance by keeping more symbols in memory. Note that the value works on +# a logarithmic scale so increasing the size by one will rougly double the +# memory usage. The cache size is given by this formula: +# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, +# corresponding to a cache size of 2^16 = 65536 symbols + +SYMBOL_CACHE_SIZE = 0 + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- + +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. +# Private class members and static file members will be hidden unless +# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES + +EXTRACT_ALL = YES + +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class +# will be included in the documentation. + +EXTRACT_PRIVATE = NO + +# If the EXTRACT_STATIC tag is set to YES all static members of a file +# will be included in the documentation. + +EXTRACT_STATIC = NO + +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) +# defined locally in source files will be included in the documentation. +# If set to NO only classes defined in header files are included. + +EXTRACT_LOCAL_CLASSES = YES + +# This flag is only useful for Objective-C code. When set to YES local +# methods, which are defined in the implementation section but not in +# the interface are included in the documentation. +# If set to NO (the default) only methods in the interface are included. + +EXTRACT_LOCAL_METHODS = NO + +# If this flag is set to YES, the members of anonymous namespaces will be +# extracted and appear in the documentation as a namespace called +# 'anonymous_namespace{file}', where file will be replaced with the base +# name of the file that contains the anonymous namespace. By default +# anonymous namespace are hidden. + +EXTRACT_ANON_NSPACES = NO + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all +# undocumented members of documented classes, files or namespaces. +# If set to NO (the default) these members will be included in the +# various overviews, but no documentation section is generated. +# This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_MEMBERS = YES + +# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. +# If set to NO (the default) these classes will be included in the various +# overviews. This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_CLASSES = YES + +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all +# friend (class|struct|union) declarations. +# If set to NO (the default) these declarations will be included in the +# documentation. + +HIDE_FRIEND_COMPOUNDS = NO + +# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any +# documentation blocks found inside the body of a function. +# If set to NO (the default) these blocks will be appended to the +# function's detailed documentation block. + +HIDE_IN_BODY_DOCS = NO + +# The INTERNAL_DOCS tag determines if documentation +# that is typed after a \internal command is included. If the tag is set +# to NO (the default) then the documentation will be excluded. +# Set it to YES to include the internal documentation. + +INTERNAL_DOCS = NO + +# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate +# file names in lower-case letters. If set to YES upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows +# and Mac users are advised to set this option to NO. + +CASE_SENSE_NAMES = NO + +# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen +# will show members with their full class and namespace scopes in the +# documentation. If set to YES the scope will be hidden. + +HIDE_SCOPE_NAMES = NO + +# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen +# will put a list of the files that are included by a file in the documentation +# of that file. + +SHOW_INCLUDE_FILES = YES + +# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen +# will list include files with double quotes in the documentation +# rather than with sharp brackets. + +FORCE_LOCAL_INCLUDES = NO + +# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] +# is inserted in the documentation for inline members. + +INLINE_INFO = YES + +# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen +# will sort the (detailed) documentation of file and class members +# alphabetically by member name. If set to NO the members will appear in +# declaration order. + +SORT_MEMBER_DOCS = YES + +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the +# brief documentation of file, namespace and class members alphabetically +# by member name. If set to NO (the default) the members will appear in +# declaration order. + +SORT_BRIEF_DOCS = NO + +# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen +# will sort the (brief and detailed) documentation of class members so that +# constructors and destructors are listed first. If set to NO (the default) +# the constructors will appear in the respective orders defined by +# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. +# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO +# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO. + +SORT_MEMBERS_CTORS_1ST = NO + +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the +# hierarchy of group names into alphabetical order. If set to NO (the default) +# the group names will appear in their defined order. + +SORT_GROUP_NAMES = NO + +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be +# sorted by fully-qualified names, including namespaces. If set to +# NO (the default), the class list will be sorted only by class name, +# not including the namespace part. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option applies only to the class list, not to the +# alphabetical list. + +SORT_BY_SCOPE_NAME = NO + +# The GENERATE_TODOLIST tag can be used to enable (YES) or +# disable (NO) the todo list. This list is created by putting \todo +# commands in the documentation. + +GENERATE_TODOLIST = YES + +# The GENERATE_TESTLIST tag can be used to enable (YES) or +# disable (NO) the test list. This list is created by putting \test +# commands in the documentation. + +GENERATE_TESTLIST = YES + +# The GENERATE_BUGLIST tag can be used to enable (YES) or +# disable (NO) the bug list. This list is created by putting \bug +# commands in the documentation. + +GENERATE_BUGLIST = YES + +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or +# disable (NO) the deprecated list. This list is created by putting +# \deprecated commands in the documentation. + +GENERATE_DEPRECATEDLIST= YES + +# The ENABLED_SECTIONS tag can be used to enable conditional +# documentation sections, marked by \if sectionname ... \endif. + +ENABLED_SECTIONS = + +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines +# the initial value of a variable or define consists of for it to appear in +# the documentation. If the initializer consists of more lines than specified +# here it will be hidden. Use a value of 0 to hide initializers completely. +# The appearance of the initializer of individual variables and defines in the +# documentation can be controlled using \showinitializer or \hideinitializer +# command in the documentation regardless of this setting. + +MAX_INITIALIZER_LINES = 30 + +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated +# at the bottom of the documentation of classes and structs. If set to YES the +# list will mention the files that were used to generate the documentation. + +SHOW_USED_FILES = YES + +# If the sources in your project are distributed over multiple directories +# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy +# in the documentation. The default is NO. + +SHOW_DIRECTORIES = NO + +# Set the SHOW_FILES tag to NO to disable the generation of the Files page. +# This will remove the Files entry from the Quick Index and from the +# Folder Tree View (if specified). The default is YES. + +SHOW_FILES = YES + +# Set the SHOW_NAMESPACES tag to NO to disable the generation of the +# Namespaces page. This will remove the Namespaces entry from the Quick Index +# and from the Folder Tree View (if specified). The default is YES. + +SHOW_NAMESPACES = YES + +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from +# the version control system). Doxygen will invoke the program by executing (via +# popen()) the command , where is the value of +# the FILE_VERSION_FILTER tag, and is the name of an input file +# provided by doxygen. Whatever the program writes to standard output +# is used as the file version. See the manual for examples. + +FILE_VERSION_FILTER = + +# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by +# doxygen. The layout file controls the global structure of the generated output files +# in an output format independent way. The create the layout file that represents +# doxygen's defaults, run doxygen with the -l option. You can optionally specify a +# file name after the option, if omitted DoxygenLayout.xml will be used as the name +# of the layout file. + +LAYOUT_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +# The QUIET tag can be used to turn on/off the messages that are generated +# by doxygen. Possible values are YES and NO. If left blank NO is used. + +QUIET = NO + +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated by doxygen. Possible values are YES and NO. If left blank +# NO is used. + +WARNINGS = YES + +# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings +# for undocumented members. If EXTRACT_ALL is set to YES then this flag will +# automatically be disabled. + +WARN_IF_UNDOCUMENTED = YES + +# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some +# parameters in a documented function, or documenting parameters that +# don't exist or using markup commands wrongly. + +WARN_IF_DOC_ERROR = YES + +# This WARN_NO_PARAMDOC option can be abled to get warnings for +# functions that are documented, but have no documentation for their parameters +# or return value. If set to NO (the default) doxygen will only warn about +# wrong or incomplete parameter documentation, but not about the absence of +# documentation. + +WARN_NO_PARAMDOC = YES + +# The WARN_FORMAT tag determines the format of the warning messages that +# doxygen can produce. The string should contain the $file, $line, and $text +# tags, which will be replaced by the file and line number from which the +# warning originated and the warning text. Optionally the format may contain +# $version, which will be replaced by the version of the file (if it could +# be obtained via FILE_VERSION_FILTER) + +WARN_FORMAT = "$file:$line: $text" + +# The WARN_LOGFILE tag can be used to specify a file to which warning +# and error messages should be written. If left blank the output is written +# to stderr. + +WARN_LOGFILE = + +#--------------------------------------------------------------------------- +# configuration options related to the input files +#--------------------------------------------------------------------------- + +# The INPUT tag can be used to specify the files and/or directories that contain +# documented source files. You may enter file names like "myfile.cpp" or +# directories like "/usr/src/myproject". Separate the files or directories +# with spaces. + +INPUT = ../src + +# This tag can be used to specify the character encoding of the source files +# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is +# also the default input encoding. Doxygen uses libiconv (or the iconv built +# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for +# the list of possible encodings. + +INPUT_ENCODING = UTF-8 + +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank the following patterns are tested: +# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx +# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 + +FILE_PATTERNS = *.c \ + *.cc \ + *.cxx \ + *.cpp \ + *.c++ \ + *.d \ + *.java \ + *.ii \ + *.ixx \ + *.ipp \ + *.i++ \ + *.inl \ + *.h \ + *.hh \ + *.hxx \ + *.hpp \ + *.h++ \ + *.idl \ + *.odl \ + *.cs \ + *.php \ + *.php3 \ + *.inc \ + *.m \ + *.mm \ + *.dox \ + *.py \ + *.f90 \ + *.f \ + *.vhd \ + *.vhdl + +# The RECURSIVE tag can be used to turn specify whether or not subdirectories +# should be searched for input files as well. Possible values are YES and NO. +# If left blank NO is used. + +RECURSIVE = YES + +# The EXCLUDE tag can be used to specify files and/or directories that should +# excluded from the INPUT source files. This way you can easily exclude a +# subdirectory from a directory tree whose root is specified with the INPUT tag. + +EXCLUDE = ../src/ParseKit + +# The EXCLUDE_SYMLINKS tag can be used select whether or not files or +# directories that are symbolic links (a Unix filesystem feature) are excluded +# from the input. + +EXCLUDE_SYMLINKS = NO + +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. Note that the wildcards are matched +# against the file with absolute path, so to exclude all test directories +# for example use the pattern */test/* + +EXCLUDE_PATTERNS = + +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the +# output. The symbol name can be a fully qualified name, a word, or if the +# wildcard * is used, a substring. Examples: ANamespace, AClass, +# AClass::ANamespace, ANamespace::*Test + +EXCLUDE_SYMBOLS = + +# The EXAMPLE_PATH tag can be used to specify one or more files or +# directories that contain example code fragments that are included (see +# the \include command). + +EXAMPLE_PATH = + +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank all files are included. + +EXAMPLE_PATTERNS = * + +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude +# commands irrespective of the value of the RECURSIVE tag. +# Possible values are YES and NO. If left blank NO is used. + +EXAMPLE_RECURSIVE = NO + +# The IMAGE_PATH tag can be used to specify one or more files or +# directories that contain image that are included in the documentation (see +# the \image command). + +IMAGE_PATH = + +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command , where +# is the value of the INPUT_FILTER tag, and is the name of an +# input file. Doxygen will then use the output that the filter program writes +# to standard output. If FILTER_PATTERNS is specified, this tag will be +# ignored. + +INPUT_FILTER = + +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. The filters are a list of the form: +# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further +# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER +# is applied to all files. + +FILTER_PATTERNS = + +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will be used to filter the input files when producing source +# files to browse (i.e. when SOURCE_BROWSER is set to YES). + +FILTER_SOURCE_FILES = NO + +#--------------------------------------------------------------------------- +# configuration options related to source browsing +#--------------------------------------------------------------------------- + +# If the SOURCE_BROWSER tag is set to YES then a list of source files will +# be generated. Documented entities will be cross-referenced with these sources. +# Note: To get rid of all source code in the generated output, make sure also +# VERBATIM_HEADERS is set to NO. + +SOURCE_BROWSER = YES + +# Setting the INLINE_SOURCES tag to YES will include the body +# of functions and classes directly in the documentation. + +INLINE_SOURCES = NO + +# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct +# doxygen to hide any special comment blocks from generated source code +# fragments. Normal C and C++ comments will always remain visible. + +STRIP_CODE_COMMENTS = YES + +# If the REFERENCED_BY_RELATION tag is set to YES +# then for each documented function all documented +# functions referencing it will be listed. + +REFERENCED_BY_RELATION = NO + +# If the REFERENCES_RELATION tag is set to YES +# then for each documented function all documented entities +# called/used by that function will be listed. + +REFERENCES_RELATION = NO + +# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) +# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from +# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will +# link to the source code. Otherwise they will link to the documentation. + +REFERENCES_LINK_SOURCE = YES + +# If the USE_HTAGS tag is set to YES then the references to source code +# will point to the HTML generated by the htags(1) tool instead of doxygen +# built-in source browser. The htags tool is part of GNU's global source +# tagging system (see http://www.gnu.org/software/global/global.html). You +# will need version 4.8.6 or higher. + +USE_HTAGS = NO + +# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen +# will generate a verbatim copy of the header file for each class for +# which an include is specified. Set to NO to disable this. + +VERBATIM_HEADERS = NO + +#--------------------------------------------------------------------------- +# configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- + +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index +# of all compounds will be generated. Enable this if the project +# contains a lot of classes, structs, unions or interfaces. + +ALPHABETICAL_INDEX = NO + +# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then +# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns +# in which this list will be split (can be a number in the range [1..20]) + +COLS_IN_ALPHA_INDEX = 5 + +# In case all classes in a project start with a common prefix, all +# classes will be put under the same header in the alphabetical index. +# The IGNORE_PREFIX tag can be used to specify one or more prefixes that +# should be ignored while generating the index headers. + +IGNORE_PREFIX = + +#--------------------------------------------------------------------------- +# configuration options related to the HTML output +#--------------------------------------------------------------------------- + +# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# generate HTML output. + +GENERATE_HTML = YES + +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `html' will be used as the default path. + +HTML_OUTPUT = html + +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for +# each generated HTML page (for example: .htm,.php,.asp). If it is left blank +# doxygen will generate files with .html extension. + +HTML_FILE_EXTENSION = .html + +# The HTML_HEADER tag can be used to specify a personal HTML header for +# each generated HTML page. If it is left blank doxygen will generate a +# standard header. + +HTML_HEADER = + +# The HTML_FOOTER tag can be used to specify a personal HTML footer for +# each generated HTML page. If it is left blank doxygen will generate a +# standard footer. + +HTML_FOOTER = + +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading +# style sheet that is used by each HTML page. It can be used to +# fine-tune the look of the HTML output. If the tag is left blank doxygen +# will generate a default style sheet. Note that doxygen will try to copy +# the style sheet file to the HTML output directory, so don't put your own +# stylesheet in the HTML output directory as well, or it will be erased! + +HTML_STYLESHEET = + +# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML +# page will contain the date and time when the page was generated. Setting +# this to NO can help when comparing the output of multiple runs. + +HTML_TIMESTAMP = YES + +# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, +# files or namespaces will be aligned in HTML using tables. If set to +# NO a bullet list will be used. + +HTML_ALIGN_MEMBERS = YES + +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. For this to work a browser that supports +# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox +# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). + +HTML_DYNAMIC_SECTIONS = NO + +# If the GENERATE_DOCSET tag is set to YES, additional index files +# will be generated that can be used as input for Apple's Xcode 3 +# integrated development environment, introduced with OSX 10.5 (Leopard). +# To create a documentation set, doxygen will generate a Makefile in the +# HTML output directory. Running make will produce the docset in that +# directory and running "make install" will install the docset in +# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find +# it at startup. +# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information. + +GENERATE_DOCSET = NO + +# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the +# feed. A documentation feed provides an umbrella under which multiple +# documentation sets from a single provider (such as a company or product suite) +# can be grouped. + +DOCSET_FEEDNAME = "Doxygen generated docs" + +# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that +# should uniquely identify the documentation set bundle. This should be a +# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen +# will append .docset to the name. + +DOCSET_BUNDLE_ID = org.doxygen.Project + +# If the GENERATE_HTMLHELP tag is set to YES, additional index files +# will be generated that can be used as input for tools like the +# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) +# of the generated HTML documentation. + +GENERATE_HTMLHELP = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can +# be used to specify the file name of the resulting .chm file. You +# can add a path in front of the file if the result should not be +# written to the html output directory. + +CHM_FILE = + +# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can +# be used to specify the location (absolute path including file name) of +# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run +# the HTML help compiler on the generated index.hhp. + +HHC_LOCATION = + +# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag +# controls if a separate .chi index file is generated (YES) or that +# it should be included in the master .chm file (NO). + +GENERATE_CHI = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING +# is used to encode HtmlHelp index (hhk), content (hhc) and project file +# content. + +CHM_INDEX_ENCODING = + +# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag +# controls whether a binary table of contents is generated (YES) or a +# normal table of contents (NO) in the .chm file. + +BINARY_TOC = NO + +# The TOC_EXPAND flag can be set to YES to add extra items for group members +# to the contents of the HTML help documentation and to the tree view. + +TOC_EXPAND = NO + +# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER +# are set, an additional index file will be generated that can be used as input for +# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated +# HTML documentation. + +GENERATE_QHP = NO + +# If the QHG_LOCATION tag is specified, the QCH_FILE tag can +# be used to specify the file name of the resulting .qch file. +# The path specified is relative to the HTML output folder. + +QCH_FILE = + +# The QHP_NAMESPACE tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#namespace + +QHP_NAMESPACE = org.doxygen.Project + +# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#virtual-folders + +QHP_VIRTUAL_FOLDER = doc + +# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add. +# For more information please see +# http://doc.trolltech.com/qthelpproject.html#custom-filters + +QHP_CUST_FILTER_NAME = + +# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see +# Qt Help Project / Custom Filters. + +QHP_CUST_FILTER_ATTRS = + +# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's +# filter section matches. +# Qt Help Project / Filter Attributes. + +QHP_SECT_FILTER_ATTRS = + +# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can +# be used to specify the location of Qt's qhelpgenerator. +# If non-empty doxygen will try to run qhelpgenerator on the generated +# .qhp file. + +QHG_LOCATION = + +# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files +# will be generated, which together with the HTML files, form an Eclipse help +# plugin. To install this plugin and make it available under the help contents +# menu in Eclipse, the contents of the directory containing the HTML and XML +# files needs to be copied into the plugins directory of eclipse. The name of +# the directory within the plugins directory should be the same as +# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before +# the help appears. + +GENERATE_ECLIPSEHELP = NO + +# A unique identifier for the eclipse help plugin. When installing the plugin +# the directory name containing the HTML and XML files should also have +# this name. + +ECLIPSE_DOC_ID = org.doxygen.Project + +# The DISABLE_INDEX tag can be used to turn on/off the condensed index at +# top of each HTML page. The value NO (the default) enables the index and +# the value YES disables it. + +DISABLE_INDEX = NO + +# This tag can be used to set the number of enum values (range [1..20]) +# that doxygen will group on one line in the generated HTML documentation. + +ENUM_VALUES_PER_LINE = 4 + +# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index +# structure should be generated to display hierarchical information. +# If the tag value is set to YES, a side panel will be generated +# containing a tree-like index structure (just like the one that +# is generated for HTML Help). For this to work a browser that supports +# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). +# Windows users are probably better off using the HTML help feature. + +GENERATE_TREEVIEW = NO + +# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, +# and Class Hierarchy pages using a tree view instead of an ordered list. + +USE_INLINE_TREES = NO + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be +# used to set the initial width (in pixels) of the frame in which the tree +# is shown. + +TREEVIEW_WIDTH = 250 + +# Use this tag to change the font size of Latex formulas included +# as images in the HTML documentation. The default is 10. Note that +# when you change the font size after a successful doxygen run you need +# to manually remove any form_*.png images from the HTML output directory +# to force them to be regenerated. + +FORMULA_FONTSIZE = 10 + +# When the SEARCHENGINE tag is enabled doxygen will generate a search box +# for the HTML output. The underlying search engine uses javascript +# and DHTML and should work on any modern browser. Note that when using +# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets +# (GENERATE_DOCSET) there is already a search function so this one should +# typically be disabled. For large projects the javascript based search engine +# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. + +SEARCHENGINE = NO + +# When the SERVER_BASED_SEARCH tag is enabled the search engine will be +# implemented using a PHP enabled web server instead of at the web client +# using Javascript. Doxygen will generate the search PHP script and index +# file to put on the web server. The advantage of the server +# based approach is that it scales better to large projects and allows +# full text search. The disadvances is that it is more difficult to setup +# and does not have live searching capabilities. + +SERVER_BASED_SEARCH = NO + +#--------------------------------------------------------------------------- +# configuration options related to the LaTeX output +#--------------------------------------------------------------------------- + +# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# generate Latex output. + +GENERATE_LATEX = NO + +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `latex' will be used as the default path. + +LATEX_OUTPUT = latex + +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# invoked. If left blank `latex' will be used as the default command name. +# Note that when enabling USE_PDFLATEX this option is only used for +# generating bitmaps for formulas in the HTML output, but not in the +# Makefile that is written to the output directory. + +LATEX_CMD_NAME = latex + +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to +# generate index for LaTeX. If left blank `makeindex' will be used as the +# default command name. + +MAKEINDEX_CMD_NAME = makeindex + +# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact +# LaTeX documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_LATEX = NO + +# The PAPER_TYPE tag can be used to set the paper type that is used +# by the printer. Possible values are: a4, a4wide, letter, legal and +# executive. If left blank a4wide will be used. + +PAPER_TYPE = a4wide + +# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX +# packages that should be included in the LaTeX output. + +EXTRA_PACKAGES = + +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for +# the generated latex document. The header should contain everything until +# the first chapter. If it is left blank doxygen will generate a +# standard header. Notice: only use this tag if you know what you are doing! + +LATEX_HEADER = + +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated +# is prepared for conversion to pdf (using ps2pdf). The pdf file will +# contain links (just like the HTML output) instead of page references +# This makes the output suitable for online browsing using a pdf viewer. + +PDF_HYPERLINKS = YES + +# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of +# plain latex in the generated Makefile. Set this option to YES to get a +# higher quality PDF documentation. + +USE_PDFLATEX = YES + +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. +# command to the generated LaTeX files. This will instruct LaTeX to keep +# running if errors occur, instead of asking the user for help. +# This option is also used when generating formulas in HTML. + +LATEX_BATCHMODE = NO + +# If LATEX_HIDE_INDICES is set to YES then doxygen will not +# include the index chapters (such as File Index, Compound Index, etc.) +# in the output. + +LATEX_HIDE_INDICES = NO + +# If LATEX_SOURCE_CODE is set to YES then doxygen will include +# source code with syntax highlighting in the LaTeX output. +# Note that which sources are shown also depends on other settings +# such as SOURCE_BROWSER. + +LATEX_SOURCE_CODE = NO + +#--------------------------------------------------------------------------- +# configuration options related to the RTF output +#--------------------------------------------------------------------------- + +# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output +# The RTF output is optimized for Word 97 and may not look very pretty with +# other RTF readers or editors. + +GENERATE_RTF = NO + +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `rtf' will be used as the default path. + +RTF_OUTPUT = rtf + +# If the COMPACT_RTF tag is set to YES Doxygen generates more compact +# RTF documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_RTF = NO + +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated +# will contain hyperlink fields. The RTF file will +# contain links (just like the HTML output) instead of page references. +# This makes the output suitable for online browsing using WORD or other +# programs which support those fields. +# Note: wordpad (write) and others do not support links. + +RTF_HYPERLINKS = NO + +# Load stylesheet definitions from file. Syntax is similar to doxygen's +# config file, i.e. a series of assignments. You only have to provide +# replacements, missing definitions are set to their default value. + +RTF_STYLESHEET_FILE = + +# Set optional variables used in the generation of an rtf document. +# Syntax is similar to doxygen's config file. + +RTF_EXTENSIONS_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to the man page output +#--------------------------------------------------------------------------- + +# If the GENERATE_MAN tag is set to YES (the default) Doxygen will +# generate man pages + +GENERATE_MAN = NO + +# The MAN_OUTPUT tag is used to specify where the man pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `man' will be used as the default path. + +MAN_OUTPUT = man + +# The MAN_EXTENSION tag determines the extension that is added to +# the generated man pages (default is the subroutine's section .3) + +MAN_EXTENSION = .3 + +# If the MAN_LINKS tag is set to YES and Doxygen generates man output, +# then it will generate one additional man file for each entity +# documented in the real man page(s). These additional files +# only source the real man page, but without them the man command +# would be unable to find the correct page. The default is NO. + +MAN_LINKS = NO + +#--------------------------------------------------------------------------- +# configuration options related to the XML output +#--------------------------------------------------------------------------- + +# If the GENERATE_XML tag is set to YES Doxygen will +# generate an XML file that captures the structure of +# the code including all documentation. + +GENERATE_XML = YES + +# The XML_OUTPUT tag is used to specify where the XML pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `xml' will be used as the default path. + +XML_OUTPUT = xml + +# The XML_SCHEMA tag can be used to specify an XML schema, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_SCHEMA = + +# The XML_DTD tag can be used to specify an XML DTD, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_DTD = + +# If the XML_PROGRAMLISTING tag is set to YES Doxygen will +# dump the program listings (including syntax highlighting +# and cross-referencing information) to the XML output. Note that +# enabling this will significantly increase the size of the XML output. + +XML_PROGRAMLISTING = YES + +#--------------------------------------------------------------------------- +# configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- + +# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will +# generate an AutoGen Definitions (see autogen.sf.net) file +# that captures the structure of the code including all +# documentation. Note that this feature is still experimental +# and incomplete at the moment. + +GENERATE_AUTOGEN_DEF = NO + +#--------------------------------------------------------------------------- +# configuration options related to the Perl module output +#--------------------------------------------------------------------------- + +# If the GENERATE_PERLMOD tag is set to YES Doxygen will +# generate a Perl module file that captures the structure of +# the code including all documentation. Note that this +# feature is still experimental and incomplete at the +# moment. + +GENERATE_PERLMOD = NO + +# If the PERLMOD_LATEX tag is set to YES Doxygen will generate +# the necessary Makefile rules, Perl scripts and LaTeX code to be able +# to generate PDF and DVI output from the Perl module output. + +PERLMOD_LATEX = NO + +# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be +# nicely formatted so it can be parsed by a human reader. This is useful +# if you want to understand what is going on. On the other hand, if this +# tag is set to NO the size of the Perl module output will be much smaller +# and Perl will parse it just the same. + +PERLMOD_PRETTY = YES + +# The names of the make variables in the generated doxyrules.make file +# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. +# This is useful so different doxyrules.make files included by the same +# Makefile don't overwrite each other's variables. + +PERLMOD_MAKEVAR_PREFIX = + +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- + +# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will +# evaluate all C-preprocessor directives found in the sources and include +# files. + +ENABLE_PREPROCESSING = YES + +# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro +# names in the source code. If set to NO (the default) only conditional +# compilation will be performed. Macro expansion can be done in a controlled +# way by setting EXPAND_ONLY_PREDEF to YES. + +MACRO_EXPANSION = NO + +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES +# then the macro expansion is limited to the macros specified with the +# PREDEFINED and EXPAND_AS_DEFINED tags. + +EXPAND_ONLY_PREDEF = NO + +# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files +# in the INCLUDE_PATH (see below) will be search if a #include is found. + +SEARCH_INCLUDES = YES + +# The INCLUDE_PATH tag can be used to specify one or more directories that +# contain include files that are not input files but should be processed by +# the preprocessor. + +INCLUDE_PATH = + +# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard +# patterns (like *.h and *.hpp) to filter out the header-files in the +# directories. If left blank, the patterns specified with FILE_PATTERNS will +# be used. + +INCLUDE_FILE_PATTERNS = + +# The PREDEFINED tag can be used to specify one or more macro names that +# are defined before the preprocessor is started (similar to the -D option of +# gcc). The argument of the tag is a list of macros of the form: name +# or name=definition (no spaces). If the definition and the = are +# omitted =1 is assumed. To prevent a macro definition from being +# undefined via #undef or recursively expanded use the := operator +# instead of the = operator. + +PREDEFINED = __APPLE__ + +# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then +# this tag can be used to specify a list of macro names that should be expanded. +# The macro definition that is found in the sources will be used. +# Use the PREDEFINED tag if you want to use a different macro definition. + +EXPAND_AS_DEFINED = + +# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then +# doxygen's preprocessor will remove all function-like macros that are alone +# on a line, have an all uppercase name, and do not end with a semicolon. Such +# function macros are typically used for boiler-plate code, and will confuse +# the parser if not removed. + +SKIP_FUNCTION_MACROS = YES + +#--------------------------------------------------------------------------- +# Configuration::additions related to external references +#--------------------------------------------------------------------------- + +# The TAGFILES option can be used to specify one or more tagfiles. +# Optionally an initial location of the external documentation +# can be added for each tagfile. The format of a tag file without +# this location is as follows: +# TAGFILES = file1 file2 ... +# Adding location for the tag files is done as follows: +# TAGFILES = file1=loc1 "file2 = loc2" ... +# where "loc1" and "loc2" can be relative or absolute paths or +# URLs. If a location is present for each tag, the installdox tool +# does not have to be run to correct the links. +# Note that each tag file must have a unique name +# (where the name does NOT include the path) +# If a tag file is not located in the directory in which doxygen +# is run, you must also specify the path to the tagfile here. + +TAGFILES = + +# When a file name is specified after GENERATE_TAGFILE, doxygen will create +# a tag file that is based on the input files it reads. + +GENERATE_TAGFILE = + +# If the ALLEXTERNALS tag is set to YES all external classes will be listed +# in the class index. If set to NO only the inherited external classes +# will be listed. + +ALLEXTERNALS = NO + +# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed +# in the modules index. If set to NO, only the current project's groups will +# be listed. + +EXTERNAL_GROUPS = YES + +# The PERL_PATH should be the absolute path and name of the perl script +# interpreter (i.e. the result of `which perl'). + +PERL_PATH = /usr/bin/perl + +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- + +# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will +# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base +# or super classes. Setting the tag to NO turns the diagrams off. Note that +# this option is superseded by the HAVE_DOT option below. This is only a +# fallback. It is recommended to install and use dot, since it yields more +# powerful graphs. + +CLASS_DIAGRAMS = NO + +# You can define message sequence charts within doxygen comments using the \msc +# command. Doxygen will then run the mscgen tool (see +# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the +# documentation. The MSCGEN_PATH tag allows you to specify the directory where +# the mscgen tool resides. If left empty the tool is assumed to be found in the +# default search path. + +MSCGEN_PATH = /Applications/Doxygen.app/Contents/Resources/ + +# If set to YES, the inheritance and collaboration graphs will hide +# inheritance and usage relations if the target is undocumented +# or is not a class. + +HIDE_UNDOC_RELATIONS = YES + +# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is +# available from the path. This tool is part of Graphviz, a graph visualization +# toolkit from AT&T and Lucent Bell Labs. The other options in this section +# have no effect if this option is set to NO (the default) + +HAVE_DOT = YES + +# By default doxygen will write a font called FreeSans.ttf to the output +# directory and reference it in all dot files that doxygen generates. This +# font does not include all possible unicode characters however, so when you need +# these (or just want a differently looking font) you can specify the font name +# using DOT_FONTNAME. You need need to make sure dot is able to find the font, +# which can be done by putting it in a standard location or by setting the +# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory +# containing the font. + +DOT_FONTNAME = FreeSans + +# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. +# The default size is 10pt. + +DOT_FONTSIZE = 10 + +# By default doxygen will tell dot to use the output directory to look for the +# FreeSans.ttf font (which doxygen will put there itself). If you specify a +# different font using DOT_FONTNAME you can set the path where dot +# can find it using this tag. + +DOT_FONTPATH = + +# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect inheritance relations. Setting this tag to YES will force the +# the CLASS_DIAGRAMS tag to NO. + +CLASS_GRAPH = YES + +# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect implementation dependencies (inheritance, containment, and +# class references variables) of the class with other documented classes. + +COLLABORATION_GRAPH = YES + +# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for groups, showing the direct groups dependencies + +GROUP_GRAPHS = YES + +# If the UML_LOOK tag is set to YES doxygen will generate inheritance and +# collaboration diagrams in a style similar to the OMG's Unified Modeling +# Language. + +UML_LOOK = NO + +# If set to YES, the inheritance and collaboration graphs will show the +# relations between templates and their instances. + +TEMPLATE_RELATIONS = NO + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT +# tags are set to YES then doxygen will generate a graph for each documented +# file showing the direct and indirect include dependencies of the file with +# other documented files. + +INCLUDE_GRAPH = YES + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and +# HAVE_DOT tags are set to YES then doxygen will generate a graph for each +# documented header file showing the documented files that directly or +# indirectly include this file. + +INCLUDED_BY_GRAPH = YES + +# If the CALL_GRAPH and HAVE_DOT options are set to YES then +# doxygen will generate a call dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable call graphs +# for selected functions only using the \callgraph command. + +CALL_GRAPH = YES + +# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then +# doxygen will generate a caller dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable caller +# graphs for selected functions only using the \callergraph command. + +CALLER_GRAPH = NO + +# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen +# will graphical hierarchy of all classes instead of a textual one. + +GRAPHICAL_HIERARCHY = YES + +# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES +# then doxygen will show the dependencies a directory has on other directories +# in a graphical way. The dependency relations are determined by the #include +# relations between the files in the directories. + +DIRECTORY_GRAPH = YES + +# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images +# generated by dot. Possible values are png, jpg, or gif +# If left blank png will be used. + +DOT_IMAGE_FORMAT = png + +# The tag DOT_PATH can be used to specify the path where the dot tool can be +# found. If left blank, it is assumed the dot tool can be found in the path. + +DOT_PATH = /Applications/Doxygen.app/Contents/Resources/ + +# The DOTFILE_DIRS tag can be used to specify one or more directories that +# contain dot files that are included in the documentation (see the +# \dotfile command). + +DOTFILE_DIRS = + +# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of +# nodes that will be shown in the graph. If the number of nodes in a graph +# becomes larger than this value, doxygen will truncate the graph, which is +# visualized by representing a node as a red box. Note that doxygen if the +# number of direct children of the root node in a graph is already larger than +# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note +# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. + +DOT_GRAPH_MAX_NODES = 50 + +# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the +# graphs generated by dot. A depth value of 3 means that only nodes reachable +# from the root by following a path via at most 3 edges will be shown. Nodes +# that lay further from the root node will be omitted. Note that setting this +# option to 1 or 2 may greatly reduce the computation time needed for large +# code bases. Also note that the size of a graph can be further restricted by +# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. + +MAX_DOT_GRAPH_DEPTH = 1000 + +# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent +# background. This is disabled by default, because dot on Windows does not +# seem to support this out of the box. Warning: Depending on the platform used, +# enabling this option may lead to badly anti-aliased labels on the edges of +# a graph (i.e. they become hard to read). + +DOT_TRANSPARENT = NO + +# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output +# files in one run (i.e. multiple -o and -T options on the command line). This +# makes dot run faster, but since only newer versions of dot (>1.8.10) +# support this, this feature is disabled by default. + +DOT_MULTI_TARGETS = NO + +# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will +# generate a legend page explaining the meaning of the various boxes and +# arrows in the dot generated graphs. + +GENERATE_LEGEND = YES + +# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will +# remove the intermediate dot files that are used to generate +# the various graphs. + +DOT_CLEANUP = YES diff --git a/tikzit-1/draw-ellipse.png b/tikzit-1/draw-ellipse.png new file mode 100644 index 0000000..d8e3e6f Binary files /dev/null and b/tikzit-1/draw-ellipse.png differ diff --git a/tikzit-1/draw-path.png b/tikzit-1/draw-path.png new file mode 100644 index 0000000..ec5e691 Binary files /dev/null and b/tikzit-1/draw-path.png differ diff --git a/tikzit-1/emblem-important.png b/tikzit-1/emblem-important.png new file mode 100644 index 0000000..81e9ed2 Binary files /dev/null and b/tikzit-1/emblem-important.png differ diff --git a/tikzit-1/emblem-unreadable-grey.png b/tikzit-1/emblem-unreadable-grey.png new file mode 100644 index 0000000..09572ab Binary files /dev/null and b/tikzit-1/emblem-unreadable-grey.png differ diff --git a/tikzit-1/engine.png b/tikzit-1/engine.png new file mode 100755 index 0000000..1e45370 Binary files /dev/null and b/tikzit-1/engine.png differ diff --git a/tikzit-1/format-indent-less.png b/tikzit-1/format-indent-less.png new file mode 100644 index 0000000..7ced16f Binary files /dev/null and b/tikzit-1/format-indent-less.png differ diff --git a/tikzit-1/m4/objc.m4 b/tikzit-1/m4/objc.m4 new file mode 100644 index 0000000..8c7cc78 --- /dev/null +++ b/tikzit-1/m4/objc.m4 @@ -0,0 +1,135 @@ +# Checks for a working Foundation +# tz_cv_objc_foundation +# to either "yes" or "no" +# +AC_DEFUN([TZ_OBJC_FOUNDATION], +[ +AC_LANG_ASSERT([Objective C]) +tz_old_objcflags="$OBJCFLAGS" +OBJCFLAGS="$OBJCFLAGS $TZ_TEST_OBJCFLAGS" + +AC_CACHE_CHECK([for Objective C Foundation], + [tz_cv_objc_foundation], +[AC_COMPILE_IFELSE( + [AC_LANG_SOURCE([[ +#import + +@interface TestObj : NSObject { + int intVar; + NSObject *objVar; + NSString *strVar; +} +-(id)init; +@end + +@implementation TestObj +-(id)init { + self = [super init]; + intVar = 0; + objVar = nil; + strVar = @"Foo"; + return self; +} +@end + +int main(void) { + TestObj *obj = [[TestObj alloc] init]; + [obj release]; + return 0; +} + ]])], + [tz_cv_objc_foundation=yes], + [tz_cv_objc_foundation=no])]) + +OBJCFLAGS="$tz_old_objcflags" +]) + + +# Checks for Objective C 2 feature support +# and sets the shell variables +# tz_cv_objc_properties +# tz_cv_objc_fast_enumeration +# tz_cv_objc_optional_keyword +# to either "yes" or "no" +# +AC_DEFUN([TZ_OBJC2_FEATURES], +[ +AC_LANG_ASSERT([Objective C]) +tz_old_objcflags="$OBJCFLAGS" +OBJCFLAGS="$OBJCFLAGS $TZ_TEST_OBJCFLAGS" + +AC_CACHE_CHECK([for Objective C 2 @property support], + [tz_cv_objc_properties], +[AC_COMPILE_IFELSE( + [AC_LANG_SOURCE([[ +#import + +@interface TestObj : NSObject { + int intProp1; + NSObject *copyObjProp; + NSObject *fooProp; +} +@property (assign,nonatomic) int intProp; +@property (retain,readonly) NSObject *retainObjProp; +@property (copy,readwrite) NSObject *copyObjProp; +@property (retain,getter=foo,setter=foo1:) NSObject *fooProp; +@end + +@implementation TestObj +@synthesize intProp=intProp1; +@dynamic retainObjProp; +- (NSObject*) retainObjProp { return nil; } +@synthesize copyObjProp; +@synthesize fooProp; +@end + +int main(void) { + TestObj *obj = [[TestObj alloc] init]; + obj.intProp = 4; + NSObject *result = obj.retainObjProp; + return 0; +} + ]])], + [tz_cv_objc_properties=yes], + [tz_cv_objc_properties=no])]) + + +AC_CACHE_CHECK([for Objective C 2 fast enumeration support], + [tz_cv_objc_fast_enumeration], +[AC_COMPILE_IFELSE( + [AC_LANG_SOURCE([[ +#import + +int main(void) { + NSArray *array = [NSArray arrayWithObjects: @"One", @"Two", @"Three", @"Four", nil]; + for (NSString *element in array) { + NSLog(@"element: %@", element); + } + return 0; +} + ]])], + [tz_cv_objc_fast_enumeration=yes], + [tz_cv_objc_fast_enumeration=no])]) + +AC_CACHE_CHECK([for Objective C 2 @optional support], + [tz_cv_objc_optional_keyword], +[AC_COMPILE_IFELSE( + [AC_LANG_SOURCE([[ +#import + +@protocol Foo +@optional +- (void) foo; +@required +- (void) bar; +@end + +int main(void) { + return 0; +} + ]])], + [tz_cv_objc_optional_keyword=yes], + [tz_cv_objc_optional_keyword=no])]) + +OBJCFLAGS="$tz_old_objcflags" +]) diff --git a/tikzit-1/preamble.png b/tikzit-1/preamble.png new file mode 100755 index 0000000..d940d24 Binary files /dev/null and b/tikzit-1/preamble.png differ diff --git a/tikzit-1/scripts/generate_keys.rb b/tikzit-1/scripts/generate_keys.rb new file mode 100755 index 0000000..b22439c --- /dev/null +++ b/tikzit-1/scripts/generate_keys.rb @@ -0,0 +1,13 @@ +#!/usr/bin/ruby +["dsaparam.pem", "dsa_priv.pem", "dsa_pub.pem"].each do |file| + if File.exist? file + puts "There's already a #{file} here! Move it aside or be more careful!" + end +end +`openssl dsaparam 2048 < /dev/urandom > dsaparam.pem` +`openssl gendsa dsaparam.pem -out dsa_priv.pem` +`openssl dsa -in dsa_priv.pem -pubout -out dsa_pub.pem` +`rm dsaparam.pem` +puts "\nGenerated private and public keys: dsa_priv.pem and dsa_pub.pem.\n +BACK UP YOUR PRIVATE KEY AND KEEP IT SAFE!\n +If you lose it, your users will be unable to upgrade!\n" \ No newline at end of file diff --git a/tikzit-1/scripts/prepare_release.sh b/tikzit-1/scripts/prepare_release.sh new file mode 100755 index 0000000..5f5edfc --- /dev/null +++ b/tikzit-1/scripts/prepare_release.sh @@ -0,0 +1,40 @@ +set -o errexit + +PROJECT_NAME=TikZiT +APP_BUNDLE=xbuild/Release/$PROJECT_NAME.app + +VERSION=$(defaults read "$(pwd)/$APP_BUNDLE/Contents/Info" CFBundleVersion) +DOWNLOAD_BASE_URL="http://tikzit.sourceforge.net/appcast" +RELEASENOTES_URL="$DOWNLOAD_BASE_URL/rnotes.html" + +ARCHIVE_FILENAME="$PROJECT_NAME $VERSION.tar.bz2" +ARCHIVE_PATH="../www/htdocs/appcast/files/$ARCHIVE_FILENAME" +DOWNLOAD_URL="$DOWNLOAD_BASE_URL/files/$ARCHIVE_FILENAME" + +if [ -e "$ARCHIVE_PATH" ]; then + echo 'Archive already exists. Either remove this archive or increment version.' + exit 1 +fi + +tar cjf "$ARCHIVE_PATH" "$APP_BUNDLE" + +SIZE=$(stat -f %z "$ARCHIVE_PATH") +PUBDATE=$(LC_TIME=en_US date +"%a, %d %b %G %T %z") +SIGNATURE=$(scripts/sign_update.rb "$ARCHIVE_PATH" tikzit_dsa_priv.pem) + +cat < + Version $VERSION + + $RELEASENOTES_URL + + $PUBDATE + + +EOF diff --git a/tikzit-1/scripts/sign_update.rb b/tikzit-1/scripts/sign_update.rb new file mode 100755 index 0000000..6d03e2e --- /dev/null +++ b/tikzit-1/scripts/sign_update.rb @@ -0,0 +1,7 @@ +#!/usr/bin/ruby +if ARGV.length < 2 + puts "Usage: ruby sign_update.rb update_archive private_key" + exit +end + +puts `openssl dgst -sha1 -binary < "#{ARGV[0]}" | openssl dgst -dss1 -sign "#{ARGV[1]}" | openssl enc -base64` \ No newline at end of file diff --git a/tikzit-1/select-rectangular.png b/tikzit-1/select-rectangular.png new file mode 100644 index 0000000..866b602 Binary files /dev/null and b/tikzit-1/select-rectangular.png differ diff --git a/tikzit-1/shapes/cap.tikz b/tikzit-1/shapes/cap.tikz new file mode 100644 index 0000000..a98ff39 --- /dev/null +++ b/tikzit-1/shapes/cap.tikz @@ -0,0 +1,13 @@ +\begin{tikzpicture} + \path [use as bounding box] (-2,-2) rectangle (2,2); + \begin{pgfonlayer}{nodelayer} + \node [style=none] (0) at (0, 0.75) {}; + \node [style=none] (1) at (-0.5, 0) {}; + \node [style=none] (2) at (0.5, 0) {}; + \end{pgfonlayer} + \begin{pgfonlayer}{edgelayer} + \draw [in=0, out=90] (2.center) to (0.center); + \draw [in=270, out=-90, looseness=0.75] (1.center) to (2.center); + \draw [in=90, out=180] (0.center) to (1.center); + \end{pgfonlayer} +\end{tikzpicture} \ No newline at end of file diff --git a/tikzit-1/shapes/copants.tikz b/tikzit-1/shapes/copants.tikz new file mode 100644 index 0000000..d2b8e3c --- /dev/null +++ b/tikzit-1/shapes/copants.tikz @@ -0,0 +1,19 @@ +\begin{tikzpicture} + \path [use as bounding box] (-2,-2) rectangle (2,2); + \begin{pgfonlayer}{nodelayer} + \node [style=none] (0) at (-1.5, 1) {}; + \node [style=none] (1) at (-0.5, 1) {}; + \node [style=none] (2) at (0.5, 1) {}; + \node [style=none] (3) at (1.5, 1) {}; + \node [style=none] (4) at (-0.5, -1) {}; + \node [style=none] (5) at (0.5, -1) {}; + \end{pgfonlayer} + \begin{pgfonlayer}{edgelayer} + \draw [in=-90, out=90, looseness=0.75] (5.center) to (3.center); + \draw [in=90, out=90, looseness=0.75] (4.center) to (5.center); + \draw [in=270, out=-90, looseness=0.75] (1.center) to (0.center); + \draw [in=270, out=-90, looseness=0.75] (3.center) to (2.center); + \draw [in=-270, out=-90, looseness=0.75] (0.center) to (4.center); + \draw [in=-90, out=-90, looseness=1.75] (2.center) to (1.center); + \end{pgfonlayer} +\end{tikzpicture} \ No newline at end of file diff --git a/tikzit-1/shapes/cup.tikz b/tikzit-1/shapes/cup.tikz new file mode 100644 index 0000000..1dc1faa --- /dev/null +++ b/tikzit-1/shapes/cup.tikz @@ -0,0 +1,13 @@ +\begin{tikzpicture} + \path [use as bounding box] (-2,-2) rectangle (2,2); + \begin{pgfonlayer}{nodelayer} + \node [style=none] (0) at (-0.5, 0) {}; + \node [style=none] (1) at (0.5, 0) {}; + \node [style=none] (2) at (0, -0.75) {}; + \end{pgfonlayer} + \begin{pgfonlayer}{edgelayer} + \draw [in=0, out=-90] (1.center) to (2.center); + \draw [in=-270, out=90, looseness=0.75] (0.center) to (1.center); + \draw [in=-90, out=-180] (2.center) to (0.center); + \end{pgfonlayer} +\end{tikzpicture} \ No newline at end of file diff --git a/tikzit-1/shapes/oval.tikz b/tikzit-1/shapes/oval.tikz new file mode 100644 index 0000000..b5d2891 --- /dev/null +++ b/tikzit-1/shapes/oval.tikz @@ -0,0 +1,11 @@ +\begin{tikzpicture} + \path [use as bounding box] (-2,-2) rectangle (2,2); + \begin{pgfonlayer}{nodelayer} + \node [style=none] (0) at (-0.5, 0) {}; + \node [style=none] (1) at (0.5, 0) {}; + \end{pgfonlayer} + \begin{pgfonlayer}{edgelayer} + \draw [in=90, out=90, looseness=0.75] (0.center) to (1.center); + \draw [in=-90, out=270, looseness=0.75] (1.center) to (0.center); + \end{pgfonlayer} +\end{tikzpicture} \ No newline at end of file diff --git a/tikzit-1/shapes/pants.tikz b/tikzit-1/shapes/pants.tikz new file mode 100644 index 0000000..c2c15c2 --- /dev/null +++ b/tikzit-1/shapes/pants.tikz @@ -0,0 +1,19 @@ +\begin{tikzpicture} + \path [use as bounding box] (-2,-2) rectangle (2,2); + \begin{pgfonlayer}{nodelayer} + \node [style=none] (0) at (-0.5, 1) {}; + \node [style=none] (1) at (0.5, 1) {}; + \node [style=none] (2) at (-1.5, -1) {}; + \node [style=none] (3) at (-0.5, -1) {}; + \node [style=none] (4) at (0.5, -1) {}; + \node [style=none] (5) at (1.5, -1) {}; + \end{pgfonlayer} + \begin{pgfonlayer}{edgelayer} + \draw [in=90, out=90, looseness=1.75] (4.center) to (3.center); + \draw [in=270, out=90, looseness=0.75] (2.center) to (0.center); + \draw [in=-90, out=-90, looseness=0.75] (0.center) to (1.center); + \draw [in=90, out=-90, looseness=0.75] (1.center) to (5.center); + \draw [in=-270, out=90, looseness=0.75] (5.center) to (4.center); + \draw [in=-270, out=90, looseness=0.75] (3.center) to (2.center); + \end{pgfonlayer} +\end{tikzpicture} \ No newline at end of file diff --git a/tikzit-1/share/Makefile.am b/tikzit-1/share/Makefile.am new file mode 100644 index 0000000..658b4d9 --- /dev/null +++ b/tikzit-1/share/Makefile.am @@ -0,0 +1,10 @@ +if WINDOWS +else +sharedir = $(datarootdir) +nobase_dist_share_DATA = \ + applications/tikzit.desktop \ + mime/packages/tikzit.xml \ + icons/hicolor/*/*/*.png \ + icons/hicolor/scalable/*/*.svg +endif + diff --git a/tikzit-1/share/applications/tikzit.desktop b/tikzit-1/share/applications/tikzit.desktop new file mode 100644 index 0000000..12b6fa5 --- /dev/null +++ b/tikzit-1/share/applications/tikzit.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=TikZit +Comment=Editor for PGF/TikZ-based node-and-edge graphs for LaTeX documents +GenericName=TikZ Graph Editor +MimeType=text/x-tikz +Exec=tikzit +Icon=tikzit +Categories=GTK;Graphics;Education;Science; +StartupNotify=false diff --git a/tikzit-1/share/icons/hicolor/128x128/apps/tikzit.png b/tikzit-1/share/icons/hicolor/128x128/apps/tikzit.png new file mode 100644 index 0000000..e8ee92b Binary files /dev/null and b/tikzit-1/share/icons/hicolor/128x128/apps/tikzit.png differ diff --git a/tikzit-1/share/icons/hicolor/128x128/mimetypes/text-x-tikz.png b/tikzit-1/share/icons/hicolor/128x128/mimetypes/text-x-tikz.png new file mode 100644 index 0000000..6b3bbe6 Binary files /dev/null and b/tikzit-1/share/icons/hicolor/128x128/mimetypes/text-x-tikz.png differ diff --git a/tikzit-1/share/icons/hicolor/16x16/apps/tikzit.png b/tikzit-1/share/icons/hicolor/16x16/apps/tikzit.png new file mode 100644 index 0000000..9b7a377 Binary files /dev/null and b/tikzit-1/share/icons/hicolor/16x16/apps/tikzit.png differ diff --git a/tikzit-1/share/icons/hicolor/16x16/mimetypes/text-x-tikz.png b/tikzit-1/share/icons/hicolor/16x16/mimetypes/text-x-tikz.png new file mode 100644 index 0000000..364e831 Binary files /dev/null and b/tikzit-1/share/icons/hicolor/16x16/mimetypes/text-x-tikz.png differ diff --git a/tikzit-1/share/icons/hicolor/22x22/apps/tikzit.png b/tikzit-1/share/icons/hicolor/22x22/apps/tikzit.png new file mode 100644 index 0000000..be803da Binary files /dev/null and b/tikzit-1/share/icons/hicolor/22x22/apps/tikzit.png differ diff --git a/tikzit-1/share/icons/hicolor/22x22/mimetypes/text-x-tikz.png b/tikzit-1/share/icons/hicolor/22x22/mimetypes/text-x-tikz.png new file mode 100644 index 0000000..6436a9e Binary files /dev/null and b/tikzit-1/share/icons/hicolor/22x22/mimetypes/text-x-tikz.png differ diff --git a/tikzit-1/share/icons/hicolor/24x24/apps/tikzit.png b/tikzit-1/share/icons/hicolor/24x24/apps/tikzit.png new file mode 100644 index 0000000..478aeab Binary files /dev/null and b/tikzit-1/share/icons/hicolor/24x24/apps/tikzit.png differ diff --git a/tikzit-1/share/icons/hicolor/32x32/apps/tikzit.png b/tikzit-1/share/icons/hicolor/32x32/apps/tikzit.png new file mode 100644 index 0000000..75174e1 Binary files /dev/null and b/tikzit-1/share/icons/hicolor/32x32/apps/tikzit.png differ diff --git a/tikzit-1/share/icons/hicolor/32x32/mimetypes/text-x-tikz.png b/tikzit-1/share/icons/hicolor/32x32/mimetypes/text-x-tikz.png new file mode 100644 index 0000000..7faaded Binary files /dev/null and b/tikzit-1/share/icons/hicolor/32x32/mimetypes/text-x-tikz.png differ diff --git a/tikzit-1/share/icons/hicolor/48x48/apps/tikzit.png b/tikzit-1/share/icons/hicolor/48x48/apps/tikzit.png new file mode 100644 index 0000000..7186458 Binary files /dev/null and b/tikzit-1/share/icons/hicolor/48x48/apps/tikzit.png differ diff --git a/tikzit-1/share/icons/hicolor/48x48/mimetypes/text-x-tikz.png b/tikzit-1/share/icons/hicolor/48x48/mimetypes/text-x-tikz.png new file mode 100644 index 0000000..d061ed9 Binary files /dev/null and b/tikzit-1/share/icons/hicolor/48x48/mimetypes/text-x-tikz.png differ diff --git a/tikzit-1/share/icons/hicolor/64x64/apps/tikzit.png b/tikzit-1/share/icons/hicolor/64x64/apps/tikzit.png new file mode 100644 index 0000000..1641e85 Binary files /dev/null and b/tikzit-1/share/icons/hicolor/64x64/apps/tikzit.png differ diff --git a/tikzit-1/share/icons/hicolor/64x64/mimetypes/text-x-tikz.png b/tikzit-1/share/icons/hicolor/64x64/mimetypes/text-x-tikz.png new file mode 100644 index 0000000..2197553 Binary files /dev/null and b/tikzit-1/share/icons/hicolor/64x64/mimetypes/text-x-tikz.png differ diff --git a/tikzit-1/share/icons/hicolor/scalable/apps/tikzit.svg b/tikzit-1/share/icons/hicolor/scalable/apps/tikzit.svg new file mode 100644 index 0000000..dc5cc84 --- /dev/null +++ b/tikzit-1/share/icons/hicolor/scalable/apps/tikzit.svg @@ -0,0 +1,79 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/tikzit-1/share/icons/hicolor/scalable/mimetypes/text-x-tikz.svg b/tikzit-1/share/icons/hicolor/scalable/mimetypes/text-x-tikz.svg new file mode 100644 index 0000000..1642e87 --- /dev/null +++ b/tikzit-1/share/icons/hicolor/scalable/mimetypes/text-x-tikz.svg @@ -0,0 +1,488 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + text + plaintext + regular + script + shell + bash + python + perl + php + ruby + + + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tikzit-1/share/mime/packages/tikzit.xml b/tikzit-1/share/mime/packages/tikzit.xml new file mode 100644 index 0000000..c6e7c0c --- /dev/null +++ b/tikzit-1/share/mime/packages/tikzit.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/tikzit-1/share/tikzit b/tikzit-1/share/tikzit new file mode 120000 index 0000000..a96aa0e --- /dev/null +++ b/tikzit-1/share/tikzit @@ -0,0 +1 @@ +.. \ No newline at end of file diff --git a/tikzit-1/src/Makefile.am b/tikzit-1/src/Makefile.am new file mode 100644 index 0000000..5108e9c --- /dev/null +++ b/tikzit-1/src/Makefile.am @@ -0,0 +1,178 @@ +if WINDOWS +sharedir = ../ +else +sharedir = @datarootdir@/tikzit +endif + +AM_OBJCFLAGS = @FOUNDATION_OBJCFLAGS@ \ + @GTK_CFLAGS@ \ + -I common \ + -I gtk \ + -DTIKZITSHAREDIR=\"$(sharedir)\" \ + -std=c99 \ + -D_GNU_SOURCE +LIBS = @FOUNDATION_LIBS@ \ + @GTK_LIBS@ +AM_YFLAGS = -d +PARSERFILES = common/tikzlexer.m common/tikzlexer.h common/tikzparser.m common/tikzparser.h +ICONFILES = ../draw-ellipse.png \ + ../draw-path.png \ + ../select-rectangular.png \ + ../transform-crop-and-resize.png \ + ../transform-move.png +EDGEDECFILES = ../AH_*.png ../ED_*.png + +bin_PROGRAMS = tikzit +BUILT_SOURCES = $(PARSERFILES) +tikzit_SOURCES = gtk/Application.m \ + gtk/BoundingBoxTool.m \ + gtk/CairoRenderContext.m \ + gtk/ColorRGB+IntegerListStorage.m \ + gtk/ColorRGB+Gtk.m \ + gtk/Configuration.m \ + gtk/ContextWindow.m \ + gtk/CreateEdgeTool.m \ + gtk/CreateNodeTool.m \ + gtk/Edge+Render.m \ + gtk/EdgeStyle+Gtk.m \ + gtk/EdgeStyle+Storage.m \ + gtk/EdgeStyleEditor.m \ + gtk/EdgeStyleSelector.m \ + gtk/EdgeStylesModel.m \ + gtk/EdgeStylesPalette.m \ + gtk/FileChooserDialog.m \ + gtk/HandTool.m \ + gtk/GraphEditorPanel.m \ + gtk/GraphRenderer.m \ + gtk/Menu.m \ + gtk/Node+Render.m \ + gtk/NodeStyle+Gtk.m \ + gtk/NodeStyle+Storage.m \ + gtk/NodeStyleEditor.m \ + gtk/NodeStylesModel.m \ + gtk/NodeStyleSelector.m \ + gtk/NodeStylesPalette.m \ + gtk/NSError+Glib.m \ + gtk/NSFileManager+Glib.m \ + gtk/NSString+Glib.m \ + gtk/PropertiesPane.m \ + gtk/PropertyListEditor.m \ + gtk/RecentManager.m \ + gtk/SelectTool.m \ + gtk/SelectionPane.m \ + gtk/SettingsDialog.m \ + gtk/Shape+Render.m \ + gtk/StyleManager+Storage.m \ + gtk/TikzDocument.m \ + gtk/ToolBox.m \ + gtk/WidgetSurface.m \ + gtk/Window.m \ + gtk/cairo_helpers.m \ + gtk/clipboard.m \ + gtk/gtkhelpers.m \ + gtk/logo.m \ + gtk/mkdtemp.m \ + gtk/main.m \ + gtk/tzstockitems.m \ + gtk/tztoolpalette.m \ + common/CircleShape.m \ + common/ColorRGB.m \ + common/DiamondShape.m \ + common/Edge.m \ + common/EdgeStyle.m \ + common/GraphChange.m \ + common/GraphElementData.m \ + common/Graph.m \ + common/Grid.m \ + common/Node.m \ + common/NodeStyle.m \ + common/NSError+Tikzit.m \ + common/NSFileManager+Utils.m \ + common/NSString+LatexConstants.m \ + common/NSString+Tikz.m \ + common/NSString+Util.m \ + common/PickSupport.m \ + common/PropertyHolder.m \ + common/GraphElementProperty.m \ + common/RColor.m \ + common/RectangleShape.m \ + common/RegularPolyShape.m \ + common/Shape.m \ + common/StyleManager.m \ + common/SupportDir.m \ + common/TikzGraphAssembler.m \ + common/TikzShape.m \ + common/Transformer.m \ + common/tikzparser.m \ + common/tikzlexer.m \ + common/util.m + +if HAVE_POPPLER +tikzit_SOURCES += \ + common/Preambles.m \ + gtk/PreambleEditor.m \ + gtk/Preambles+Storage.m \ + gtk/PreviewRenderer.m \ + gtk/PreviewWindow.m +endif + +if WINDOWS +tikzit.res: tikzit.rc + $(AM_V_GEN)windres $^ -O coff -o $@ + +tikzit_LDADD = tikzit.res +CLEANFILES = tikzit.res +endif + +common/tikzlexer.m common/tikzlexer.h: common/tikzlexer.lm + $(AM_V_GEN)$(LEX) -o common/tikzlexer.m $^ +# ordering hack for parallel builds +common/tikzlexer.h: common/tikzlexer.m + +common/tikzparser.m common/tikzparser.h: common/tikzparser.ym + $(AM_V_GEN)$(YACC) --defines=common/tikzparser.h --output=common/tikzparser.m $^ +# ordering hack for parallel builds +common/tikzparser.h: common/tikzparser.m + +gtk/icondata.m: $(ICONFILES) + $(AM_V_GEN)gdk-pixbuf-csource --struct --static --raw --build-list \ + draw_ellipse ../draw-ellipse.png \ + draw_path ../draw-path.png \ + select_rectangular ../select-rectangular.png \ + transform_crop_and_resize ../transform-crop-and-resize.png \ + transform_move ../transform-move.png \ + > $@ + +gtk/logodata.m: ../share/icons/hicolor/*/apps/tikzit.png + $(AM_V_GEN)gdk-pixbuf-csource --struct --static --raw --build-list \ + logo16 ../share/icons/hicolor/16x16/apps/tikzit.png \ + logo24 ../share/icons/hicolor/24x24/apps/tikzit.png \ + logo32 ../share/icons/hicolor/32x32/apps/tikzit.png \ + logo48 ../share/icons/hicolor/48x48/apps/tikzit.png \ + logo64 ../share/icons/hicolor/64x64/apps/tikzit.png \ + logo128 ../share/icons/hicolor/128x128/apps/tikzit.png \ + > $@ + +gtk/edgedecdata.m: $(EDGEDECFILES) + $(AM_V_GEN)gdk-pixbuf-csource --struct --static --raw --build-list \ + AH_none_pixdata ../AH_none.png \ + AH_latex_head_pixdata ../AH_latex_head.png \ + AH_latex_tail_pixdata ../AH_latex_tail.png \ + AH_plain_head_pixdata ../AH_plain_head.png \ + AH_plain_tail_pixdata ../AH_plain_tail.png \ + ED_none_pixdata ../ED_none.png \ + ED_arrow_pixdata ../ED_arrow.png \ + ED_tick_pixdata ../ED_tick.png \ + > $@ + +gtk/Menu.m: gtk/icondata.m +gtk/logo.m: gtk/logodata.m +gtk/EdgeStyleEditor.m: gtk/edgedecdata.m + +EXTRA_DIST = gtk/*.h common/*.h \ + $(PARSERFILES) common/tikzlexer.lm common/tikzparser.ym \ + $(ICONFILES) gtk/icondata.m \ + gtk/logodata.m \ + $(EDGEDECFILES) gtk/edgedecdata.m \ + tikzit.rc ../tikzit.ico +MAINTAINERCLEANFILES = $(PARSERFILES) gtk/icondata.m gtk/logodata.m gtk/edgedecdata.m diff --git a/tikzit-1/src/common/CircleShape.h b/tikzit-1/src/common/CircleShape.h new file mode 100644 index 0000000..8215b92 --- /dev/null +++ b/tikzit-1/src/common/CircleShape.h @@ -0,0 +1,33 @@ +// +// CircleShape.h +// TikZiT +// +// Copyright 2011 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import "Shape.h" + +@interface CircleShape : Shape { +} + + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/CircleShape.m b/tikzit-1/src/common/CircleShape.m new file mode 100644 index 0000000..f2d1d52 --- /dev/null +++ b/tikzit-1/src/common/CircleShape.m @@ -0,0 +1,57 @@ +// +// CircleShape.m +// TikZiT +// +// Copyright 2011 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "CircleShape.h" +#import "Node.h" +#import "Edge.h" + +@implementation CircleShape + +- (id)init { + self = [super init]; + if (self) { + Node *n0,*n1,*n2,*n3; + + n0 = [Node nodeWithPoint:NSMakePoint( 0.0f, 0.2f)]; + n1 = [Node nodeWithPoint:NSMakePoint( 0.2f, 0.0f)]; + n2 = [Node nodeWithPoint:NSMakePoint( 0.0f, -0.2f)]; + n3 = [Node nodeWithPoint:NSMakePoint(-0.2f, 0.0f)]; + + Edge *e0,*e1,*e2,*e3; + + e0 = [Edge edgeWithSource:n0 andTarget:n1]; [e0 setBend:-45]; + e1 = [Edge edgeWithSource:n1 andTarget:n2]; [e1 setBend:-45]; + e2 = [Edge edgeWithSource:n2 andTarget:n3]; [e2 setBend:-45]; + e3 = [Edge edgeWithSource:n3 andTarget:n0]; [e3 setBend:-45]; + + paths = [[NSSet alloc] initWithObjects:[NSArray arrayWithObjects:e0,e1,e2,e3,nil],nil]; + + styleTikz = @"circle"; + } + return self; +} + + +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/ColorRGB.h b/tikzit-1/src/common/ColorRGB.h new file mode 100644 index 0000000..607ba64 --- /dev/null +++ b/tikzit-1/src/common/ColorRGB.h @@ -0,0 +1,64 @@ +// +// ColorRGB.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import "RColor.h" + +@interface ColorRGB : NSObject { + unsigned short red, green, blue; +} + +@property (assign) unsigned short red; +@property (assign) unsigned short green; +@property (assign) unsigned short blue; + +@property (assign) float redFloat; +@property (assign) float greenFloat; +@property (assign) float blueFloat; + +@property (readonly) NSString *name; + +- (RColor)rColor; +- (RColor)rColorWithAlpha:(CGFloat)alpha; + +- (NSString*)hexName; +- (BOOL)isEqual:(id)col; +- (float)distanceFromColor:(ColorRGB*)col; +- (int)hash; + +- (id)initWithRed:(unsigned short)r green:(unsigned short)g blue:(unsigned short)b; +- (id)initWithFloatRed:(float)r green:(float)g blue:(float)b; +- (id)initWithRColor:(RColor)color; + +- (void)setToClosestHashed; + ++ (ColorRGB*)colorWithRed:(unsigned short)r green:(unsigned short)g blue:(unsigned short)b; ++ (ColorRGB*)colorWithFloatRed:(float)r green:(float)g blue:(float)b; ++ (ColorRGB*)colorWithRColor:(RColor)color; + ++ (void)makeColorHash; ++ (void)releaseColorHash; + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/ColorRGB.m b/tikzit-1/src/common/ColorRGB.m new file mode 100644 index 0000000..840d716 --- /dev/null +++ b/tikzit-1/src/common/ColorRGB.m @@ -0,0 +1,353 @@ +// +// ColorRGB.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "ColorRGB.h" +#import "util.h" + +typedef struct { +#if __has_feature(objc_arc) + __unsafe_unretained NSString *name; +#else + NSString *name; +#endif + unsigned short r, g, b; +} ColorRGBEntry; + +static const ColorRGBEntry kColors[147] = { + { @"AliceBlue", 240, 248, 255 }, + { @"AntiqueWhite", 250, 235, 215 }, + { @"Aqua", 0, 255, 255 }, + { @"Aquamarine", 127, 255, 212 }, + { @"Azure", 240, 255, 255 }, + { @"Beige", 245, 245, 220 }, + { @"Bisque", 255, 228, 196 }, + { @"Black", 0, 0, 0 }, + { @"BlanchedAlmond", 255, 235, 205 }, + { @"Blue", 0, 0, 255 }, + { @"BlueViolet", 138, 43, 226 }, + { @"Brown", 165, 42, 42 }, + { @"BurlyWood", 222, 184, 135 }, + { @"CadetBlue", 95, 158, 160 }, + { @"Chartreuse", 127, 255, 0 }, + { @"Chocolate", 210, 105, 30 }, + { @"Coral", 255, 127, 80 }, + { @"CornflowerBlue", 100, 149, 237 }, + { @"Cornsilk", 255, 248, 220 }, + { @"Crimson", 220, 20, 60 }, + { @"Cyan", 0, 255, 255 }, + { @"DarkBlue", 0, 0, 139 }, + { @"DarkCyan", 0, 139, 139 }, + { @"DarkGoldenrod", 184, 134, 11 }, + { @"DarkGray", 169, 169, 169 }, + { @"DarkGreen", 0, 100, 0 }, + { @"DarkGrey", 169, 169, 169 }, + { @"DarkKhaki", 189, 183, 107 }, + { @"DarkMagenta", 139, 0, 139 }, + { @"DarkOliveGreen", 85, 107, 47 }, + { @"DarkOrange", 255, 140, 0 }, + { @"DarkOrchid", 153, 50, 204 }, + { @"DarkRed", 139, 0, 0 }, + { @"DarkSalmon", 233, 150, 122 }, + { @"DarkSeaGreen", 143, 188, 143 }, + { @"DarkSlateBlue", 72, 61, 139 }, + { @"DarkSlateGray", 47, 79, 79 }, + { @"DarkSlateGrey", 47, 79, 79 }, + { @"DarkTurquoise", 0, 206, 209 }, + { @"DarkViolet", 148, 0, 211 }, + { @"DeepPink", 255, 20, 147 }, + { @"DeepSkyBlue", 0, 191, 255 }, + { @"DimGray", 105, 105, 105 }, + { @"DimGrey", 105, 105, 105 }, + { @"DodgerBlue", 30, 144, 255 }, + { @"FireBrick", 178, 34, 34 }, + { @"FloralWhite", 255, 250, 240 }, + { @"ForestGreen", 34, 139, 34 }, + { @"Fuchsia", 255, 0, 255 }, + { @"Gainsboro", 220, 220, 220 }, + { @"GhostWhite", 248, 248, 255 }, + { @"Gold", 255, 215, 0 }, + { @"Goldenrod", 218, 165, 32 }, + { @"Gray", 128, 128, 128 }, + { @"Grey", 128, 128, 128 }, + { @"Green", 0, 128, 0 }, + { @"GreenYellow", 173, 255, 47 }, + { @"Honeydew", 240, 255, 240 }, + { @"HotPink", 255, 105, 180 }, + { @"IndianRed", 205, 92, 92 }, + { @"Indigo", 75, 0, 130 }, + { @"Ivory", 255, 255, 240 }, + { @"Khaki", 240, 230, 140 }, + { @"Lavender", 230, 230, 250 }, + { @"LavenderBlush", 255, 240, 245 }, + { @"LawnGreen", 124, 252, 0 }, + { @"LemonChiffon", 255, 250, 205 }, + { @"LightBlue", 173, 216, 230 }, + { @"LightCoral", 240, 128, 128 }, + { @"LightCyan", 224, 255, 255 }, + { @"LightGoldenrodYellow", 250, 250, 210 }, + { @"LightGray", 211, 211, 211 }, + { @"LightGreen", 144, 238, 144 }, + { @"LightGrey", 211, 211, 211 }, + { @"LightPink", 255, 182, 193 }, + { @"LightSalmon", 255, 160, 122 }, + { @"LightSeaGreen", 32, 178, 170 }, + { @"LightSkyBlue", 135, 206, 250 }, + { @"LightSlateGray", 119, 136, 153 }, + { @"LightSlateGrey", 119, 136, 153 }, + { @"LightSteelBlue", 176, 196, 222 }, + { @"LightYellow", 255, 255, 224 }, + { @"Lime", 0, 255, 0 }, + { @"LimeGreen", 50, 205, 50 }, + { @"Linen", 250, 240, 230 }, + { @"Magenta", 255, 0, 255 }, + { @"Maroon", 128, 0, 0 }, + { @"MediumAquamarine", 102, 205, 170 }, + { @"MediumBlue", 0, 0, 205 }, + { @"MediumOrchid", 186, 85, 211 }, + { @"MediumPurple", 147, 112, 219 }, + { @"MediumSeaGreen", 60, 179, 113 }, + { @"MediumSlateBlue", 123, 104, 238 }, + { @"MediumSpringGreen", 0, 250, 154 }, + { @"MediumTurquoise", 72, 209, 204 }, + { @"MediumVioletRed", 199, 21, 133 }, + { @"MidnightBlue", 25, 25, 112 }, + { @"MintCream", 245, 255, 250 }, + { @"MistyRose", 255, 228, 225 }, + { @"Moccasin", 255, 228, 181 }, + { @"NavajoWhite", 255, 222, 173 }, + { @"Navy", 0, 0, 128 }, + { @"OldLace", 253, 245, 230 }, + { @"Olive", 128, 128, 0 }, + { @"OliveDrab", 107, 142, 35 }, + { @"Orange", 255, 165, 0 }, + { @"OrangeRed", 255, 69, 0 }, + { @"Orchid", 218, 112, 214 }, + { @"PaleGoldenrod", 238, 232, 170 }, + { @"PaleGreen", 152, 251, 152 }, + { @"PaleTurquoise", 175, 238, 238 }, + { @"PaleVioletRed", 219, 112, 147 }, + { @"PapayaWhip", 255, 239, 213 }, + { @"PeachPuff", 255, 218, 185 }, + { @"Peru", 205, 133, 63 }, + { @"Pink", 255, 192, 203 }, + { @"Plum", 221, 160, 221 }, + { @"PowderBlue", 176, 224, 230 }, + { @"Purple", 128, 0, 128 }, + { @"Red", 255, 0, 0 }, + { @"RosyBrown", 188, 143, 143 }, + { @"RoyalBlue", 65, 105, 225 }, + { @"SaddleBrown", 139, 69, 19 }, + { @"Salmon", 250, 128, 114 }, + { @"SandyBrown", 244, 164, 96 }, + { @"SeaGreen", 46, 139, 87 }, + { @"Seashell", 255, 245, 238 }, + { @"Sienna", 160, 82, 45 }, + { @"Silver", 192, 192, 192 }, + { @"SkyBlue", 135, 206, 235 }, + { @"SlateBlue", 106, 90, 205 }, + { @"SlateGray", 112, 128, 144 }, + { @"SlateGrey", 112, 128, 144 }, + { @"Snow", 255, 250, 250 }, + { @"SpringGreen", 0, 255, 127 }, + { @"SteelBlue", 70, 130, 180 }, + { @"Tan", 210, 180, 140 }, + { @"Teal", 0, 128, 128 }, + { @"Thistle", 216, 191, 216 }, + { @"Tomato", 255, 99, 71 }, + { @"Turquoise", 64, 224, 208 }, + { @"Violet", 238, 130, 238 }, + { @"Wheat", 245, 222, 179 }, + { @"White", 255, 255, 255 }, + { @"WhiteSmoke", 245, 245, 245 }, + { @"Yellow", 255, 255, 0 }, + { @"YellowGreen", 154, 205, 50 } +}; + +static NSMapTable *colorHash = nil; + +@implementation ColorRGB + ++ (void)initialize { + [self setKeys:[NSArray arrayWithObject:@"red"] triggerChangeNotificationsForDependentKey:@"redFloat"]; + [self setKeys:[NSArray arrayWithObject:@"green"] triggerChangeNotificationsForDependentKey:@"greenFloat"]; + [self setKeys:[NSArray arrayWithObject:@"blue"] triggerChangeNotificationsForDependentKey:@"blueFloat"]; + [self setKeys:[NSArray arrayWithObjects:@"red", @"green", @"blue", nil] + triggerChangeNotificationsForDependentKey:@"name"]; +} + +@synthesize red, green, blue; + +- (float)redFloat { return ((float)red)/255.0f; } +- (void)setRedFloat:(float)r { [self setRed:round(r*255.0f)]; } +- (float)greenFloat { return ((float)green)/255.0f; } +- (void)setGreenFloat:(float)g { [self setGreen:round(g*255.0f)]; } +- (float)blueFloat { return ((float)blue)/255.0f; } +- (void)setBlueFloat:(float)b { [self setBlue:round(b*255.0f)]; } + +- (int)hash { + return (red<<4) + (green<<2) + blue; +} + +- (id)initWithRed:(unsigned short)r green:(unsigned short)g blue:(unsigned short)b { + self = [super init]; + if (self) { + red = r; + green = g; + blue = b; + } + return self; +} + +- (id)initWithFloatRed:(float)r green:(float)g blue:(float)b { + self = [super init]; + if (self) { + red = round(r*255.0f); + green = round(g*255.0f); + blue = round(b*255.0f); + } + return self; +} + +- (id) initWithRColor:(RColor)color { + return [self initWithFloatRed:color.red green:color.green blue:color.blue]; +} + +- (RColor) rColor { + return MakeSolidRColor ([self redFloat], [self greenFloat], [self blueFloat]); +} + +- (RColor) rColorWithAlpha:(CGFloat)alpha { + return MakeRColor ([self redFloat], [self greenFloat], [self blueFloat], alpha); +} + +- (NSString*)name { + if (colorHash == nil) + [ColorRGB makeColorHash]; + return [colorHash objectForKey:self]; +} + +- (NSString*)hexName { + return [NSString stringWithFormat:@"hexcolor0x%.2x%.2x%.2x", red, green, blue]; +} + +- (NSComparisonResult)compare:(ColorRGB*)col { + if (red > [col red]) return NSOrderedDescending; + else if (red < [col red]) return NSOrderedAscending; + else { + if (green > [col green]) return NSOrderedDescending; + else if (green < [col green]) return NSOrderedAscending; + else { + if (blue > [col blue]) return NSOrderedDescending; + else if (blue < [col blue]) return NSOrderedAscending; + else return NSOrderedSame; + } + } +} + +- (BOOL)isEqual:(id)col { + return [self compare:col] == NSOrderedSame; +} + +- (float)distanceFromColor:(ColorRGB *)col { + float dr = (float)(red - [col red]); + float dg = (float)(green - [col green]); + float db = (float)(blue - [col blue]); + return dr*dr + dg*dg + db*db; +} + +- (id)copyWithZone:(NSZone*)zone { + ColorRGB *col = [[ColorRGB allocWithZone:zone] initWithRed:red green:green blue:blue]; + return col; +} + ++ (ColorRGB*)colorWithRed:(unsigned short)r green:(unsigned short)g blue:(unsigned short)b { + ColorRGB *col = [[ColorRGB alloc] initWithRed:r green:g blue:b]; +#if __has_feature(objc_arc) + return col; +#else + return [col autorelease]; +#endif +} + + ++ (ColorRGB*)colorWithFloatRed:(float)r green:(float)g blue:(float)b { + ColorRGB *col = [[ColorRGB alloc] initWithFloatRed:r green:g blue:b]; +#if __has_feature(objc_arc) + return col; +#else + return [col autorelease]; +#endif +} + ++ (ColorRGB*) colorWithRColor:(RColor)color { +#if __has_feature(objc_arc) + return [[self alloc] initWithRColor:color]; +#else + return [[[self alloc] initWithRColor:color] autorelease]; +#endif +} + ++ (void)makeColorHash { + NSMapTable *h = [[NSMapTable alloc] init]; + int i; + for (i = 0; i < 147; ++i) { + ColorRGB *col = [[ColorRGB alloc] initWithRed:kColors[i].r + green:kColors[i].g + blue:kColors[i].b]; + [h setObject:kColors[i].name forKey:col]; + //NSLog(@"adding color %@ (%d)", kColors[i].name, [col hash]); +#if ! __has_feature(objc_arc) + [col release]; +#endif + } + colorHash = h; +} + ++ (void)releaseColorHash { +#if ! __has_feature(objc_arc) + [colorHash release]; +#endif +} + +- (void)setToClosestHashed { + if (colorHash == nil) + [ColorRGB makeColorHash]; + float bestDist = -1; + ColorRGB *bestColor = nil; + NSEnumerator *enumerator = [colorHash keyEnumerator]; + ColorRGB *tryColor; + while ((tryColor = [enumerator nextObject]) != nil) { + float dist = [self distanceFromColor:tryColor]; + if (bestDist<0 || dist. +// + +#import +#import "Shape.h" + +@interface DiamondShape : Shape { +} + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 + diff --git a/tikzit-1/src/common/DiamondShape.m b/tikzit-1/src/common/DiamondShape.m new file mode 100644 index 0000000..1a578b8 --- /dev/null +++ b/tikzit-1/src/common/DiamondShape.m @@ -0,0 +1,63 @@ +// +// DiamondShape.m +// TikZiT +// +// Copyright 2011 Aleks Kissinger +// Copyright 2012 Alex Merry +// All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "DiamondShape.h" + +#import "Node.h" +#import "Edge.h" + +@implementation DiamondShape + +- (id)init { + self = [super init]; + + if (!self) + return nil; + + Node *n0,*n1,*n2,*n3; + float sz = 0.25f; + + n0 = [Node nodeWithPoint:NSMakePoint(0, sz)]; + n1 = [Node nodeWithPoint:NSMakePoint(sz, 0)]; + n2 = [Node nodeWithPoint:NSMakePoint(0,-sz)]; + n3 = [Node nodeWithPoint:NSMakePoint(-sz,0)]; + + Edge *e0,*e1,*e2,*e3; + + e0 = [Edge edgeWithSource:n0 andTarget:n1]; + e1 = [Edge edgeWithSource:n1 andTarget:n2]; + e2 = [Edge edgeWithSource:n2 andTarget:n3]; + e3 = [Edge edgeWithSource:n3 andTarget:n0]; + + paths = [[NSSet alloc] initWithObjects:[NSArray arrayWithObjects:e0,e1,e2,e3,nil],nil]; + + styleTikz = @"shape=diamond"; + + return self; +} + +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/Edge.h b/tikzit-1/src/common/Edge.h new file mode 100644 index 0000000..accf38c --- /dev/null +++ b/tikzit-1/src/common/Edge.h @@ -0,0 +1,401 @@ +// +// Edge.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + + +// Edge : store the data associated with an edge. Also, lazily compute +// bezier curve control points based on bend and the coordinates of +// the endpoints. + +#import "Node.h" +#import "EdgeStyle.h" + +/*! + @typedef enum EdgeBendMode + @brief Indicates the type of edge bend. + @var EdgeBendModeBasic A basic, one-angle bend. Positive values will be interpreted + as bend left, negative as bend right. + @var EdgeBendModeInOut A two-angle bend mode, using inAngle and outAngle. + */ +typedef enum { + EdgeBendModeBasic, + EdgeBendModeInOut +} EdgeBendMode; + +/*! + @class Edge + @brief A graph edge, with associated bend and style data. + @details A graph edge, with associated bend and style data. This class + also contains methods for computing the bezier control points + and the midpoint of the curve. + */ +@interface Edge : NSObject { + Node *source; + Node *target; + Node *edgeNode; + int bend; + int inAngle, outAngle; + EdgeBendMode bendMode; + float weight; + EdgeStyle *style; + GraphElementData *data; + NSString *sourceAnchor; + NSString *targetAnchor; + + // When set to YES, lazily create the edge node, and keep it around when set + // to NO (at least until saved/loaded). + BOOL hasEdgeNode; + BOOL dirty; + + // these are all cached values computed from the above + NSPoint src; + NSPoint targ; + NSPoint head; + NSPoint tail; + NSPoint cp1; + NSPoint cp2; + NSPoint mid; + NSPoint midTan; + NSPoint headTan; + NSPoint tailTan; +} + +/*! + @property data + @brief Associated edge data. + */ +@property (copy) GraphElementData *data; + +// KVC methods +- (void) insertObject:(GraphElementProperty*)gep + inDataAtIndex:(NSUInteger)index; +- (void) removeObjectFromDataAtIndex:(NSUInteger)index; +- (void) replaceObjectInDataAtIndex:(NSUInteger)index + withObject:(GraphElementProperty*)gep; + +/*! + @property style + @brief Edge style. + */ +@property (retain) EdgeStyle *style; + +/*! + @property source + @brief Source node. + */ +@property (retain) Node *source; + +/*! + @property target + @brief Target node. + */ +@property (retain) Node *target; + +/*! + @property edgeNode + @brief A node attached to this edge, as in a label or tick. + */ +@property (retain) Node *edgeNode; + +/*! + @property sourceAnchor + @brief The source node anchor point, as in north or center. + */ +@property (copy) NSString *sourceAnchor; + +/*! + @property targetAnchor + @brief The target node anchor point, as in north or center. + */ +@property (copy) NSString *targetAnchor; + +/*! + @property hasEdgeNode + @brief A read/write property. When set to true, a new edge node is actually constructed. +*/ +@property (assign) BOOL hasEdgeNode; + +/*! + @property bend + @brief The degrees by which the edge bends. + */ +@property (assign) int bend; + +/*! + @property weight + @brief How close the edge will pass to control points. + */ +@property (assign) float weight; + +/*! + @property inAngle + @brief The angle by which the edge enters its target. + */ +@property (assign) int inAngle; + +/*! + @property outAngle + @brief The angle by which the edge leaves its target. + */ +@property (assign) int outAngle; + +/*! + @property bendMode + @brief The mode of the edge bend. Either simple bend in in/out style. + */ +@property (assign) EdgeBendMode bendMode; + +/*! + @property head + @brief The starting point of the edge. + @detail This value is computed based on the source, target and + either bend or in/out angles. It is where the edge + makes contact with the source node. + */ +@property (readonly) NSPoint head; + +/*! + @property tail + @brief The ending point of the edge. + @detail This value is computed based on the source, target and + either bend or in/out angles. It is where the edge + makes contact with the target node. + */ +@property (readonly) NSPoint tail; + +/*! + @property cp1 + @brief The first control point of the edge. + @detail This value is computed based on the source, target and + either bend or in/out angles. + */ +@property (readonly) NSPoint cp1; + +/*! + @property cp2 + @brief The second control point of the edge. + @detail This value is computed based on the source, target and + either bend or in/out angles. + */ +@property (readonly) NSPoint cp2; + +/*! + @property mid + @brief The midpoint of the curve. Computed from the source, target, and control points. + */ +@property (readonly) NSPoint mid; + +/*! + @property mid_tan + @brief The second point of a line tangent to the midpoint. (The first is the midpoint itself.) + */ +@property (readonly) NSPoint midTan; + +/*! + @property left_normal + @brief The second point in a line perp. to the edge coming from mid-point. (left side) + */ +@property (readonly) NSPoint leftNormal; + +/*! + @property left_normal + @brief The second point in a line perp. to the edge coming from mid-point. (right side) + */ +@property (readonly) NSPoint rightNormal; + +@property (readonly) NSPoint headTan; + +/*! + @property leftHeadNormal + */ +@property (readonly) NSPoint leftHeadNormal; + +/*! + @property rightHeadNormal + */ +@property (readonly) NSPoint rightHeadNormal; + +@property (readonly) NSPoint tailTan; + +/*! + @property leftTailNormal + */ +@property (readonly) NSPoint leftTailNormal; + +/*! + @property rightTailNormal + */ +@property (readonly) NSPoint rightTailNormal; + +/*! + @property isSelfLoop + @brief Returns YES if this edge is a self loop. + */ +@property (readonly) BOOL isSelfLoop; + +/*! + @property isStraight + @brief Returns YES if this edge can be drawn as a straight line (as opposed to a bezier curve). + */ +@property (readonly) BOOL isStraight; + + +/*! + @brief Construct a blank edge. + @result An edge. + */ +- (id)init; + +/*! + @brief Construct an edge with the given source and target. + @param s the source node. + @param t the target node. + @result An edge. + */ +- (id)initWithSource:(Node*)s andTarget:(Node*)t; + +/*! + @brief Force the recalculation of the derived properties. + */ +- (void)recalculateProperties; + +/*! + @brief Recompute the control points and midpoint. + */ +- (void)updateControls; + +/*! + @brief Push edge properties back into its GraphElementData. + */ +- (void)updateData; + +/*! + @brief Set edge properties from fields in GraphElementData. + */ +- (void)setAttributesFromData; + +/*! + @brief Use data.style to find and attach the EdgeStyle object from the given array. + */ +- (BOOL)attachStyleFromTable:(NSArray*)styles; + +/*! + @brief Convert the bend angle to an inAngle and outAngle. + */ +- (void)convertBendToAngles; + +/*! + @brief Set the bend angle to the average of the in and out angles. + */ +- (void)convertAnglesToBend; + +/*! + @brief Update this edge to look just like the given edge. + @param e an edge to mimic. + */ +- (void)setPropertiesFromEdge:(Edge *)e; + +/*! + @brief Get a bounding rect for this edge. + @detail Note that this may not be a tight bound. + */ +- (NSRect)boundingRect; + +/*! + @brief Moves the first control point, updating edge properties as necessary + @detail This will move a control point and adjust the weight and + bend (or outAngle) to fit. + + A courseness can be specified for both the weight and the + bend, allowing them to be constrained to certain values. For + example, passing 10 as the bend courseness will force the bend + to be a multiple of 5. Passing 0 for either of these will + cause the relevant value to be unconstrained. + @param point the new position of the control point + @param wc force the weight to be a multiple of this value (unless 0) + @param bc force the bend (or outAngle) to be a multiple of this value (unless 0) + @param link when in EdgeBendModeInOut, change both the in and out angles at once + */ +- (void) moveCp1To:(NSPoint)point withWeightCourseness:(float)wc andBendCourseness:(int)bc forceLinkControlPoints:(BOOL)link; + +/*! + @brief Moves the first control point, updating edge properties as necessary + @detail This will move a control point and adjust the weight and + bend (or outAngle) to fit. + + The same as moveCp1To:point withWeightCourseness:0.0f andBendCourseness:0 forceLinkControlPoints:No + @param point the new position of the control point + @param wc force the weight to be a multiple of this value (unless 0) + @param bc force the bend (or outAngle) to be a multiple of this value (unless 0) + @param link when in EdgeBendModeInOut, change both the in and out angles at once + */ +- (void) moveCp1To:(NSPoint)point; + +/*! + @brief Moves the first control point, updating edge properties as necessary + @detail This will move a control point and adjust the weight and + bend (or inAngle) to fit. + + A courseness can be specified for both the weight and the + bend, allowing them to be constrained to certain values. For + example, passing 10 as the bend courseness will force the bend + to be a multiple of 5. Passing 0 for either of these will + cause the relevant value to be unconstrained. + @param point the new position of the control point + @param wc force the weight to be a multiple of this value (unless 0) + @param bc force the bend (or inAngle) to be a multiple of this value (unless 0) + @param link when in EdgeBendModeInOut, change both the in and out angles at once + */ +- (void) moveCp2To:(NSPoint)point withWeightCourseness:(float)wc andBendCourseness:(int)bc forceLinkControlPoints:(BOOL)link; + +/*! + @brief Moves the first control point, updating edge properties as necessary + @detail This will move a control point and adjust the weight and + bend (or inAngle) to fit. + + The same as moveCp2To:point withWeightCourseness:0.0f andBendCourseness:0 forceLinkControlPoints:No + @param point the new position of the control point + */ +- (void) moveCp2To:(NSPoint)point; + +/*! + @brief Reverse edge direction, updating bend/inAngle/outAngle/etc + */ +- (void)reverse; + +/*! + @brief Factory method to make a blank edge. + @result An edge. + */ ++ (Edge*)edge; + +/*! + @brief Factory method to make an edge with the given source and target. + @param s a source node. + @param t a target node. + @result An edge. + */ ++ (Edge*)edgeWithSource:(Node*)s andTarget:(Node*)t; + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/Edge.m b/tikzit-1/src/common/Edge.m new file mode 100644 index 0000000..0c88e9d --- /dev/null +++ b/tikzit-1/src/common/Edge.m @@ -0,0 +1,757 @@ +// +// Edge.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "Edge.h" +#import "Shape.h" +#import "util.h" + +@implementation Edge + +- (id)init { + self = [super init]; + if (self) { + data = [[GraphElementData alloc] init]; + bend = 0; + inAngle = 135; + outAngle = 45; + bendMode = EdgeBendModeBasic; + weight = 0.4f; + dirty = YES; + source = nil; + target = nil; + edgeNode = nil; + sourceAnchor = @""; + targetAnchor = @""; + } + return self; +} + +- (id)initWithSource:(Node*)s andTarget:(Node*)t { + self = [self init]; + if (self) { + [self setSource:s]; + [self setTarget:t]; + edgeNode = nil; + + dirty = YES; + } + return self; +} + +- (BOOL)attachStyleFromTable:(NSArray*)styles { + NSString *style_name = [data propertyForKey:@"style"]; + + [self setStyle:nil]; + if (style_name == nil) return YES; + + for (EdgeStyle *s in styles) { + if ([[s name] compare:style_name]==NSOrderedSame) { + [self setStyle:s]; + return YES; + } + } + + // if we didn't find a style, fill in a default one +#if __has_feature(objc_arc) + style = [EdgeStyle defaultEdgeStyleWithName:style_name]; +#else + style = [[EdgeStyle defaultEdgeStyleWithName:style_name] retain]; +#endif + return NO; +} + +- (NSPoint) _findContactPointOn:(Node*)node at:(float)angle { + NSPoint rayStart = [node point]; + Shape *shape = [node shape]; + if (shape == nil) { + return rayStart; + } + + Transformer *shapeTrans = [node shapeTransformer]; + // rounding errors are a pain + NSRect searchArea = NSInsetRect([node boundsUsingShapeTransform:shapeTrans],-0.01,-0.01); + if (!NSPointInRect(rayStart, searchArea)) { + return rayStart; + } + + NSPoint rayEnd = findExitPointOfRay (rayStart, angle, searchArea); + + for (NSArray *path in [shape paths]) { + for (Edge *curve in path) { + NSPoint intersect; + [curve updateControls]; + if (lineSegmentIntersectsBezier (rayStart, rayEnd, + [shapeTrans toScreen:curve->tail], + [shapeTrans toScreen:curve->cp1], + [shapeTrans toScreen:curve->cp2], + [shapeTrans toScreen:curve->head], + &intersect)) { + // we just keep shortening the line + rayStart = intersect; + } + } + } + + return rayStart; +} + +- (NSPoint) _findTanFor:(NSPoint)pt usingSpanFrom:(float)t1 to:(float)t2 { + float dx = bezierInterpolate(t2, tail.x, cp1.x, cp2.x, head.x) - + bezierInterpolate(t1, tail.x, cp1.x, cp2.x, head.x); + float dy = bezierInterpolate(t2, tail.y, cp1.y, cp2.y, head.y) - + bezierInterpolate(t1, tail.y, cp1.y, cp2.y, head.y); + + // normalise + float len = sqrt(dx*dx+dy*dy); + if (len != 0) { + dx = (dx/len) * 0.1f; + dy = (dy/len) * 0.1f; + } + + return NSMakePoint (pt.x + dx, pt.y + dy); +} + +- (void)recalculateProperties { + dirty = YES; +} + +- (void)updateControls { + // check for external modification to the node locations + if (src.x != [source point].x || src.y != [source point].y || + targ.x != [target point].x || targ.y != [target point].y) + { + dirty = YES; + } + + if (dirty) { + src = [source point]; + targ = [target point]; + + float dx = (targ.x - src.x); + float dy = (targ.y - src.y); + + float angleSrc = 0.0f; + float angleTarg = 0.0f; + + if (bendMode == EdgeBendModeBasic) { + float angle = good_atan(dx, dy); + float bnd = (float)bend * (M_PI / 180.0f); + angleSrc = angle - bnd; + angleTarg = M_PI + angle + bnd; + } else if (bendMode == EdgeBendModeInOut) { + angleSrc = (float)outAngle * (M_PI / 180.0f); + angleTarg = (float)inAngle * (M_PI / 180.0f); + } + + tail = [self _findContactPointOn:source at:angleSrc]; + head = [self _findContactPointOn:target at:angleTarg]; + + // give a default distance for self-loops + float cdist = (dx==0.0f && dy==0.0f) ? weight : sqrt(dx*dx + dy*dy) * weight; + + cp1 = NSMakePoint(src.x + (cdist * cos(angleSrc)), + src.y + (cdist * sin(angleSrc))); + + cp2 = NSMakePoint(targ.x + (cdist * cos(angleTarg)), + targ.y + (cdist * sin(angleTarg))); + + mid = bezierInterpolateFull (0.5f, tail, cp1, cp2, head); + midTan = [self _findTanFor:mid usingSpanFrom:0.4f to:0.6f]; + + tailTan = [self _findTanFor:tail usingSpanFrom:0.0f to:0.1f]; + headTan = [self _findTanFor:head usingSpanFrom:1.0f to:0.9f]; + } + dirty = NO; +} + +- (void)convertBendToAngles { + float dx = (targ.x - src.x); + float dy = (targ.y - src.y); + float angle = good_atan(dx, dy); + float bnd = (float)bend * (M_PI / 180.0f); + + [self setOutAngle:round((angle - bnd) * (180.0f/M_PI))]; + [self setInAngle:round((M_PI + angle + bnd) * (180.0f/M_PI))]; + dirty = YES; +} + +- (void)convertAnglesToBend { + float dx = (targ.x - src.x); + float dy = (targ.y - src.y); + int angle = round((180.0f/M_PI) * good_atan(dx, dy)); + + // compute bend1 and bend2 to match inAngle and outAngle, resp. + int bend1, bend2; + + bend1 = outAngle - angle; + bend2 = angle - inAngle; + + [self setBend:(bend1 + bend2) / 2]; +} + +- (BOOL)isSelfLoop { + return (source == target); +} + +- (BOOL)isStraight { + return (bendMode == EdgeBendModeBasic && bend == 0); +} + +- (NSPoint)mid { + [self updateControls]; + return mid; +} + +- (NSPoint)midTan { + [self updateControls]; + return midTan; +} + +- (NSPoint)leftNormal { + [self updateControls]; + return NSMakePoint(mid.x + (mid.y - midTan.y), mid.y - (mid.x - midTan.x)); +} + +- (NSPoint)rightNormal { + [self updateControls]; + return NSMakePoint(mid.x - (mid.y - midTan.y), mid.y + (mid.x - midTan.x)); +} + +- (NSPoint)headTan { + [self updateControls]; + return headTan; +} + +- (NSPoint)leftHeadNormal { + [self updateControls]; + return NSMakePoint(headTan.x + (head.y - headTan.y), headTan.y - (head.x - headTan.x)); +} + +- (NSPoint)rightHeadNormal { + [self updateControls]; + return NSMakePoint(headTan.x - (head.y - headTan.y), headTan.y + (head.x - headTan.x)); +} + +- (NSPoint)tailTan { + [self updateControls]; + return tailTan; +} + +- (NSPoint)leftTailNormal { + [self updateControls]; + return NSMakePoint(tailTan.x + (tail.y - tailTan.y), tailTan.y - (tail.x - tailTan.x)); +} + +- (NSPoint)rightTailNormal { + [self updateControls]; + return NSMakePoint(tailTan.x - (tail.y - tailTan.y), tailTan.y + (tail.x - tailTan.x)); +} + +- (NSPoint) head { + [self updateControls]; + return head; +} + +- (NSPoint) tail { + [self updateControls]; + return tail; +} + +- (NSPoint)cp1 { + [self updateControls]; + return cp1; +} + +- (NSPoint)cp2 { + [self updateControls]; + return cp2; +} + +- (int)inAngle {return inAngle;} +- (void)setInAngle:(int)a { + inAngle = normaliseAngleDeg (a); + dirty = YES; +} + +- (int)outAngle {return outAngle;} +- (void)setOutAngle:(int)a { + outAngle = normaliseAngleDeg (a); + dirty = YES; +} + +- (EdgeBendMode)bendMode {return bendMode;} +- (void)setBendMode:(EdgeBendMode)mode { + bendMode = mode; + dirty = YES; +} + +- (int)bend {return bend;} +- (void)setBend:(int)b { + bend = normaliseAngleDeg (b); + dirty = YES; +} + +- (float)weight {return weight;} +- (void)setWeight:(float)w { +// if (source == target) weight = 1.0f; +// else weight = w; + weight = w; + dirty = YES; +} + +- (EdgeStyle*)style {return style;} +- (void)setStyle:(EdgeStyle*)s { + if (style != s) { +#if __has_feature(objc_arc) + style = s; +#else + [style release]; + style = [s retain]; +#endif + } +} + +- (Node*)source {return source;} +- (void)setSource:(Node *)s { + if (source != s) { + [source removeObserver:self + forKeyPath:@"style"]; + + if ([s style] == nil) { + [self setSourceAnchor:@"center"]; + } else if ([sourceAnchor isEqual:@"center"]) { + [self setSourceAnchor:@""]; + } + +#if __has_feature(objc_arc) + source = s; +#else + [source release]; + source = [s retain]; +#endif + + if (source==target) { + bendMode = EdgeBendModeInOut; + weight = 1.0f; + } + + [source addObserver:self + forKeyPath:@"style" + options:NSKeyValueObservingOptionNew + | NSKeyValueObservingOptionOld + context:NULL]; + + dirty = YES; + } +} + +- (Node*)target {return target;} +- (void)setTarget:(Node *)t { + if (target != t) { + [target removeObserver:self + forKeyPath:@"style"]; + + if ([t style] == nil) { + [self setTargetAnchor:@"center"]; + } else if ([targetAnchor isEqual:@"center"]) { + [self setTargetAnchor:@""]; + } + +#if __has_feature(objc_arc) + target = t; +#else + [target release]; + target = [t retain]; +#endif + + if (source==target) { + bendMode = EdgeBendModeInOut; + weight = 1.0f; + } + + [target addObserver:self + forKeyPath:@"style" + options:NSKeyValueObservingOptionNew + | NSKeyValueObservingOptionOld + context:NULL]; + + dirty = YES; + } +} + +- (void)observeValueForKeyPath:(NSString *)keyPath + ofObject:(id)object + change:(NSDictionary *)change + context:(void *)context + +{ + if ([keyPath isEqual:@"style"]) { + id oldStyle = [change objectForKey:NSKeyValueChangeOldKey]; + id newStyle = [change objectForKey:NSKeyValueChangeNewKey]; + id none = [NSNull null]; + if (object == source) { + if (oldStyle != none && newStyle == none) { + [self setSourceAnchor:@"center"]; + } else if (oldStyle == none && newStyle != none && + [sourceAnchor isEqual:@"center"]) { + [self setSourceAnchor:@""]; + } + } + if (object == target) { + if (oldStyle != none && newStyle == none) { + [self setTargetAnchor:@"center"]; + } else if (oldStyle == none && newStyle != none && + [targetAnchor isEqual:@"center"]) { + [self setTargetAnchor:@""]; + } + } + } + dirty = YES; +} + + +// edgeNode and hasEdgeNode use a bit of key-value observing to help the mac GUI keep up + +- (Node*)edgeNode {return edgeNode;} +- (void)setEdgeNode:(Node *)n { + [self willChangeValueForKey:@"edgeNode"]; + [self willChangeValueForKey:@"hasEdgeNode"]; + if (edgeNode != n) { + hasEdgeNode = (n != nil); +#if __has_feature(objc_arc) + edgeNode = n; +#else + [edgeNode release]; + edgeNode = [n retain]; +#endif + // don't set dirty bit, because control points don't need update + } + [self didChangeValueForKey:@"edgeNode"]; + [self didChangeValueForKey:@"hasEdgeNode"]; +} + +- (BOOL)hasEdgeNode { return hasEdgeNode; } +- (void)setHasEdgeNode:(BOOL)b { + [self willChangeValueForKey:@"edgeNode"]; + [self willChangeValueForKey:@"hasEdgeNode"]; + hasEdgeNode = b; + if (hasEdgeNode && edgeNode == nil) { + edgeNode = [[Node alloc] init]; + } + [self didChangeValueForKey:@"edgeNode"]; + [self didChangeValueForKey:@"hasEdgeNode"]; +} + +- (NSString*) sourceAnchor { return sourceAnchor; } +- (void)setSourceAnchor:(NSString *)_sourceAnchor{ + NSString *oldSourceAnchor = sourceAnchor; + if(_sourceAnchor != nil){ + sourceAnchor = [_sourceAnchor copy]; + }else{ + sourceAnchor = @""; + } +#if ! __has_feature(objc_arc) + [oldSourceAnchor release]; +#endif +} + +- (NSString*) targetAnchor { return targetAnchor; } +- (void)setTargetAnchor:(NSString *)_targetAnchor{ + NSString *oldTargetAnchor = targetAnchor; + if(_targetAnchor != nil){ + targetAnchor = [_targetAnchor copy]; + }else{ + targetAnchor = @""; + } +#if ! __has_feature(objc_arc) + [oldTargetAnchor release]; +#endif +} + +@synthesize data; +- (void) insertObject:(GraphElementProperty*)gep + inDataAtIndex:(NSUInteger)index { + [data insertObject:gep atIndex:index]; +} +- (void) removeObjectFromDataAtIndex:(NSUInteger)index { + [data removeObjectAtIndex:index]; +} +- (void) replaceObjectInDataAtIndex:(NSUInteger)index + withObject:(GraphElementProperty*)gep { + [data replaceObjectAtIndex:index withObject:gep]; +} + +- (void)updateData { + // unset everything to avoid redundant defs + [data unsetAtom:@"loop"]; + [data unsetProperty:@"in"]; + [data unsetProperty:@"out"]; + [data unsetAtom:@"bend left"]; + [data unsetAtom:@"bend right"]; + [data unsetProperty:@"bend left"]; + [data unsetProperty:@"bend right"]; + [data unsetProperty:@"looseness"]; + + if (style == nil) { + [data unsetProperty:@"style"]; + } else { + [data setProperty:[style name] forKey:@"style"]; + } + + if (bendMode == EdgeBendModeBasic && bend != 0) { + NSString *bendkey = @"bend right"; + int b = [self bend]; + if (b < 0) { + bendkey = @"bend left"; + b = -b; + } + + if (b == 30) { + [data setAtom:bendkey]; + } else { + [data setProperty:[NSString stringWithFormat:@"%d",b] forKey:bendkey]; + } + + } else if (bendMode == EdgeBendModeInOut) { + [data setProperty:[NSString stringWithFormat:@"%d",inAngle] + forKey:@"in"]; + [data setProperty:[NSString stringWithFormat:@"%d",outAngle] + forKey:@"out"]; + } + + // loop needs to come after in/out + if (source == target) [data setAtom:@"loop"]; + + if (![self isSelfLoop] && ![self isStraight]) + { + [data setProperty:[NSString stringWithFormat:@"%.2f",weight*2.5f] + forKey:@"looseness"]; + } +} + +- (void)setAttributesFromData { + bendMode = EdgeBendModeBasic; + + if ([data isAtomSet:@"bend left"]) { + [self setBend:-30]; + } else if ([data isAtomSet:@"bend right"]) { + [self setBend:30]; + } else if ([data propertyForKey:@"bend left"] != nil) { + NSString *bnd = [data propertyForKey:@"bend left"]; + [self setBend:-[bnd intValue]]; + } else if ([data propertyForKey:@"bend right"] != nil) { + NSString *bnd = [data propertyForKey:@"bend right"]; + [self setBend:[bnd intValue]]; + } else { + [self setBend:0]; + + if ([data propertyForKey:@"in"] != nil && [data propertyForKey:@"out"] != nil) { + bendMode = EdgeBendModeInOut; + [self setInAngle:[[data propertyForKey:@"in"] intValue]]; + [self setOutAngle:[[data propertyForKey:@"out"] intValue]]; + } + } + + if ([data propertyForKey:@"looseness"] != nil) { + weight = [[data propertyForKey:@"looseness"] floatValue] / 2.5f; + } else { + weight = ([self isSelfLoop]) ? 1.0f : 0.4f; + } +} + +- (void)setPropertiesFromEdge:(Edge*)e { + Node *en = [[e edgeNode] copy]; + [self setEdgeNode:en]; +#if ! __has_feature(objc_arc) + [en release]; +#endif + + GraphElementData *d = [[e data] copy]; + [self setData:d]; +#if ! __has_feature(objc_arc) + [d release]; +#endif + + [self setStyle:[e style]]; + [self setBend:[e bend]]; + [self setInAngle:[e inAngle]]; + [self setOutAngle:[e outAngle]]; + [self setBendMode:[e bendMode]]; + [self setWeight:[e weight]]; + + dirty = YES; // cached data will be recomputed lazily, rather than copied +} + +- (NSRect)boundingRect { + [self updateControls]; + NSRect bound = NSRectAround4Points(head, tail, cp1, cp2); + if ([self style] != nil) { + switch ([[self style] decorationStyle]) { + case ED_Arrow: + bound = NSRectWithPoint(bound, [self midTan]); + case ED_Tick: + bound = NSRectWithPoint(bound, [self leftNormal]); + bound = NSRectWithPoint(bound, [self rightNormal]); + case ED_None: + break; + } + if ([[self style] headStyle] != AH_None) { + bound = NSRectWithPoint(bound, [self leftHeadNormal]); + bound = NSRectWithPoint(bound, [self rightHeadNormal]); + } + if ([[self style] tailStyle] != AH_None) { + bound = NSRectWithPoint(bound, [self leftTailNormal]); + bound = NSRectWithPoint(bound, [self rightTailNormal]); + } + } + return bound; +} + +- (void) adjustWeight:(float)handle_dist withCourseness:(float)wcourseness { + float base_dist = NSDistanceBetweenPoints (src, targ); + if (base_dist == 0.0f) { + base_dist = 1.0f; + } + + [self setWeight:roundToNearest(wcourseness, handle_dist / base_dist)]; +} + +- (float) angleOf:(NSPoint)point relativeTo:(NSPoint)base { + float dx = point.x - base.x; + float dy = point.y - base.y; + return radiansToDegrees (good_atan(dx, dy)); +} + +- (void) moveCp1To:(NSPoint)point withWeightCourseness:(float)wc andBendCourseness:(int)bc forceLinkControlPoints:(BOOL)link { + [self updateControls]; + [self adjustWeight:NSDistanceBetweenPoints (point, src) withCourseness:wc]; + + float control_angle = [self angleOf:point relativeTo:src]; + if (bendMode == EdgeBendModeBasic) { + float base_angle = [self angleOf:targ relativeTo:src]; + int b = (int)roundToNearest (bc, base_angle - control_angle); + [self setBend:b]; + } else { + int angle = (int)roundToNearest (bc, control_angle); + if (link) { + [self setInAngle:(inAngle + angle - outAngle)]; + } + [self setOutAngle:angle]; + } +} + +- (void) moveCp1To:(NSPoint)point { + [self moveCp1To:point withWeightCourseness:0.0f andBendCourseness:0 forceLinkControlPoints:NO]; +} + +- (void) moveCp2To:(NSPoint)point withWeightCourseness:(float)wc andBendCourseness:(int)bc forceLinkControlPoints:(BOOL)link { + [self updateControls]; + + if (![self isSelfLoop]) { + [self adjustWeight:NSDistanceBetweenPoints (point, targ) withCourseness:wc]; + } + + float control_angle = [self angleOf:point relativeTo:targ]; + if (bendMode == EdgeBendModeBasic) { + float base_angle = [self angleOf:src relativeTo:targ]; + int b = (int)roundToNearest (bc, control_angle - base_angle); + [self setBend:b]; + } else { + int angle = (int)roundToNearest (bc, control_angle); + if (link) { + [self setOutAngle:(outAngle + angle - inAngle)]; + } + [self setInAngle: angle]; + } +} + +- (void) moveCp2To:(NSPoint)point { + [self moveCp2To:point withWeightCourseness:0.0f andBendCourseness:0 forceLinkControlPoints:NO]; +} + +- (void)reverse { + Node *n; + float f; + NSString *a; + + n = source; + source = target; + target = n; + + f = inAngle; + inAngle = outAngle; + outAngle = f; + + a = sourceAnchor; + sourceAnchor = targetAnchor; + targetAnchor = a; + + [self setBend:-bend]; + + dirty = YES; +} + +- (void)dealloc { + [source removeObserver:self + forKeyPath:@"style"]; + [target removeObserver:self + forKeyPath:@"style"]; +#if ! __has_feature(objc_arc) + [source release]; + [target release]; + [data release]; + [sourceAnchor release]; + [targetAnchor release]; + [super dealloc]; +#endif +} + +- (id)copyWithZone:(NSZone*)zone { + Edge *cp = [[Edge allocWithZone:zone] init]; + [cp setSource:[self source]]; + [cp setTarget:[self target]]; + [cp setSourceAnchor:[self sourceAnchor]]; + [cp setTargetAnchor:[self targetAnchor]]; + [cp setPropertiesFromEdge:self]; + return cp; +} + ++ (Edge*)edge { +#if __has_feature(objc_arc) + return [[Edge alloc] init]; +#else + return [[[Edge alloc] init] autorelease]; +#endif +} + ++ (Edge*)edgeWithSource:(Node*)s andTarget:(Node*)t { +#if __has_feature(objc_arc) + return [[Edge alloc] initWithSource:s andTarget:t]; +#else + return [[[Edge alloc] initWithSource:s andTarget:t] autorelease]; +#endif +} + +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/EdgeStyle.h b/tikzit-1/src/common/EdgeStyle.h new file mode 100644 index 0000000..a51f129 --- /dev/null +++ b/tikzit-1/src/common/EdgeStyle.h @@ -0,0 +1,71 @@ +// +// EdgeStyle.h +// TikZiT +// +// Copyright 2011 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import "PropertyHolder.h" +#import "ColorRGB.h" + +typedef enum { + AH_None = 0, + AH_Plain = 1, + AH_Latex = 2 +} ArrowHeadStyle; + +typedef enum { + ED_None = 0, + ED_Arrow = 1, + ED_Tick = 2 +} EdgeDectorationStyle; + +@interface EdgeStyle : PropertyHolder { + ArrowHeadStyle headStyle, tailStyle; + EdgeDectorationStyle decorationStyle; + float thickness; + ColorRGB *colorRGB; + NSString *name; + NSString *category; +} + +/*! + @property colorRGB + @brief The color to render the line in + */ +@property (copy) ColorRGB *colorRGB; + +@property (copy) NSString *name; +@property (copy) NSString *category; +@property (assign) ArrowHeadStyle headStyle; +@property (assign) ArrowHeadStyle tailStyle; +@property (assign) EdgeDectorationStyle decorationStyle; +@property (assign) float thickness; + +@property (readonly) NSString *tikz; + +- (id)init; +- (id)initWithName:(NSString*)nm; ++ (EdgeStyle*)defaultEdgeStyleWithName:(NSString*)nm; +- (void) updateFromStyle:(EdgeStyle*)style; + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/EdgeStyle.m b/tikzit-1/src/common/EdgeStyle.m new file mode 100644 index 0000000..c61e94a --- /dev/null +++ b/tikzit-1/src/common/EdgeStyle.m @@ -0,0 +1,222 @@ +// +// EdgeStyle.m +// TikZiT +// +// Copyright 2011 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "EdgeStyle.h" + +@implementation EdgeStyle + ++ (void)initialize { + [self setKeys:[NSArray arrayWithObjects: + @"tailStyle", + @"headStyle", + @"decorationStyle", + @"thickness", + @"colorRGB.red", + @"colorRGB.blue", + @"colorRGB.green", + @"name", + nil] + triggerChangeNotificationsForDependentKey:@"tikz"]; + [self setKeys:[NSArray arrayWithObjects: + @"colorRGB.name", + nil] + triggerChangeNotificationsForDependentKey:@"colorIsKnown"]; +} + +- (id)initWithName:(NSString*)nm { + self = [super initWithNotificationName:@"EdgeStylePropertyChanged"]; + + if (self != nil) { + headStyle = AH_None; + tailStyle = AH_None; + decorationStyle = ED_None; + colorRGB = [[ColorRGB alloc] initWithRed:0 green:0 blue:0]; + name = nm; + category = nil; + thickness = 1.0f; + } + + return self; +} + +- (id)init { + self = [self initWithName:@"new"]; + return self; +} + +- (id)copyWithZone:(NSZone*)zone { + EdgeStyle *style = [[EdgeStyle allocWithZone:zone] init]; + [style setName:[self name]]; + [style setCategory:[self category]]; + [style setHeadStyle:[self headStyle]]; + [style setTailStyle:[self tailStyle]]; + [style setDecorationStyle:[self decorationStyle]]; + [style setThickness:[self thickness]]; + [style setColorRGB:[self colorRGB]]; + return style; +} + +- (void)dealloc { +#if ! __has_feature(objc_arc) + [name release]; + [category release]; + [colorRGB release]; + [super dealloc]; +#endif +} + +- (NSString*) description { + return [NSString stringWithFormat:@"Edge style \"%@\"", name]; +} + +- (void) updateFromStyle:(EdgeStyle*)style { + [self setName:[style name]]; + [self setCategory:[style category]]; + [self setHeadStyle:[style headStyle]]; + [self setTailStyle:[style tailStyle]]; + [self setDecorationStyle:[style decorationStyle]]; + [self setThickness:[style thickness]]; + [self setColorRGB:[style colorRGB]]; +} + ++ (EdgeStyle*)defaultEdgeStyleWithName:(NSString*)nm { +#if __has_feature(objc_arc) + return [[EdgeStyle alloc] initWithName:nm]; +#else + return [[[EdgeStyle alloc] initWithName:nm] autorelease]; +#endif +} + +- (NSString*)name { return name; } +- (void)setName:(NSString *)s { + if (name != s) { + NSString *oldValue = name; + name = [s copy]; + [self postPropertyChanged:@"name" oldValue:oldValue]; +#if ! __has_feature(objc_arc) + [oldValue release]; +#endif + } +} + +- (ArrowHeadStyle)headStyle { return headStyle; } +- (void)setHeadStyle:(ArrowHeadStyle)s { + ArrowHeadStyle oldValue = headStyle; + headStyle = s; + [self postPropertyChanged:@"headStyle" oldValue:[NSNumber numberWithInt:oldValue]]; +} + +- (ArrowHeadStyle)tailStyle { return tailStyle; } +- (void)setTailStyle:(ArrowHeadStyle)s { + ArrowHeadStyle oldValue = tailStyle; + tailStyle = s; + [self postPropertyChanged:@"tailStyle" oldValue:[NSNumber numberWithInt:oldValue]]; +} + +- (EdgeDectorationStyle)decorationStyle { return decorationStyle; } +- (void)setDecorationStyle:(EdgeDectorationStyle)s { + EdgeDectorationStyle oldValue = decorationStyle; + decorationStyle = s; + [self postPropertyChanged:@"decorationStyle" oldValue:[NSNumber numberWithInt:oldValue]]; +} +- (float)thickness { return thickness; } +- (void)setThickness:(float)s { + float oldValue = thickness; + thickness = s; + [self postPropertyChanged:@"thickness" oldValue:[NSNumber numberWithFloat:oldValue]]; +} + +- (NSString*)category { + return category; +} + +- (void)setCategory:(NSString *)s { + if (category != s) { + NSString *oldValue = category; + category = [s copy]; + [self postPropertyChanged:@"category" oldValue:oldValue]; +#if ! __has_feature(objc_arc) + [oldValue release]; +#endif + } +} + +- (ColorRGB*)colorRGB { + return colorRGB; +} + +- (void)setColorRGB:(ColorRGB*)c { + if (colorRGB != c) { + ColorRGB *oldValue = colorRGB; + colorRGB = [c copy]; + [self postPropertyChanged:@"colorRGB" oldValue:oldValue]; +#if ! __has_feature(objc_arc) + [oldValue release]; +#endif + } +} + +- (NSString*)tikz { + NSMutableString *buf = [NSMutableString stringWithFormat:@"\\tikzstyle{%@}=[", name]; + + NSString *colorName = [colorRGB name]; + if (colorName == nil) + colorName = [colorRGB hexName]; + + if (tailStyle == AH_Plain) + [buf appendString:@"<"]; + else if (tailStyle == AH_Latex) + [buf appendString:@"latex"]; + + [buf appendString:@"-"]; + + if (headStyle == AH_Plain) + [buf appendString:@">"]; + else if (headStyle == AH_Latex) + [buf appendString:@"latex"]; + + if(colorName != nil){ + [buf appendString:@",draw="]; + [buf appendString:colorName]; + } + + if (decorationStyle != ED_None) { + [buf appendString:@",postaction={decorate},decoration={markings,mark="]; + if (decorationStyle == ED_Arrow) + [buf appendString:@"at position .5 with {\\arrow{>}}"]; + else if (decorationStyle == ED_Tick) + [buf appendString:@"at position .5 with {\\draw (0,-0.1) -- (0,0.1);}"]; + [buf appendString:@"}"]; + } + + if (thickness != 1.0f) { + [buf appendFormat:@",line width=%.3f", thickness]; + } + + [buf appendString:@"]"]; + return buf; +} + +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/Graph.h b/tikzit-1/src/common/Graph.h new file mode 100644 index 0000000..1f98858 --- /dev/null +++ b/tikzit-1/src/common/Graph.h @@ -0,0 +1,401 @@ +// +// Graph.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + + +/*! + + @mainpage TikZiT + TikZiT is a GUI application for drawing, editing, and parsing TikZ + diagrams. Common code is in src/common, and plaform-specific code is + in src/{osx,linux}. + + */ + + +#import "Node.h" +#import "Edge.h" +#import "GraphChange.h" +#import "Transformer.h" + +/*! + @class Graph + @brief Store a graph, output to TikZ. + @details All of the methods that change a graph return an object of type GraphChange. + Graph changes can be re-done by calling applyGraphChange. They can be undone + by calling applyGraphChange on [change inverse]. + */ +@interface Graph : NSObject { + NSRecursiveLock *graphLock; + BOOL dirty; // keep track of when inEdges and outEdges need an update + NSMutableArray *nodes; + NSMutableArray *edges; + + NSMapTable *inEdges; + NSMapTable *outEdges; + + GraphElementData *data; + NSRect boundingBox; +} + +/*! + @property data + @brief Data associated with the graph. + */ +@property (copy) GraphElementData *data; + +// KVC methods +- (void) insertObject:(GraphElementProperty*)gep + inDataAtIndex:(NSUInteger)index; +- (void) removeObjectFromDataAtIndex:(NSUInteger)index; +- (void) replaceObjectInDataAtIndex:(NSUInteger)index + withObject:(GraphElementProperty*)gep; + +/*! + @property nodes + @brief The set of nodes. + @details The node set is cached internally, so no need to lock + the graph when enumerating. + */ +@property (readonly) NSArray *nodes; + +/*! + @property edges + @brief The set of edges. + @details The edge set is cached internally, so no need to lock + the graph when enumerating. + */ +@property (readonly) NSArray *edges; + +/*! + @property boundingBox + @brief The bounding box of a graph + @details Optional data containing the bounding box, set with + \path [use as bounding box] .... + */ +@property (assign) NSRect boundingBox; + +/*! + @property hasBoundingBox + @brief Returns true if this graph has a bounding box. + */ +@property (readonly) BOOL hasBoundingBox; + + +/*! + @brief Computes graph bounds. + @result Graph bounds. + */ +- (NSRect)bounds; + +/*! + @brief Returns the set of edges incident to the given node set. + @param nds a set of nodes. + @result A set of incident edges. + */ +- (NSSet*)incidentEdgesForNodes:(NSSet*)nds; + +/*! + @brief Returns the set of in-edges for this node. + @param nd a node. + @result A set of edges. +*/ +- (NSSet*)inEdgesForNode:(Node*)nd; + +/*! + @brief Returns the set of out-edges for this node. + @param nd a node. + @result A set of edges. +*/ +- (NSSet*)outEdgesForNode:(Node*)nd; + +/*! + @brief Gives a copy of the full subgraph with the given nodes. + @param nds a set of nodes. + @result A subgraph. + */ +- (Graph*)copyOfSubgraphWithNodes:(NSSet*)nds; + +/*! + @brief Gives a copy of the full subgraph with the given nodes. + @param nds a set of nodes. + @param zone an allocation zone + @result A subgraph. + */ +- (Graph*)copyOfSubgraphWithNodes:(NSSet*)nds zone:(NSZone*)zone; + +/*! + @brief Gives a set of edge-arrays that partition all of the edges in the graph. + @result An NSet of NSArrays of edges. + */ +- (NSSet*)pathCover; + +/*! + @brief Adds a node. + @param node + @result A GraphChange recording this action. + */ +- (GraphChange*)addNode:(Node*)node; + +/*! + @brief Removes a node. + @param node + @result A GraphChange recording this action. + */ +- (GraphChange*)removeNode:(Node*)node; + +/*! + @brief Removes a set of nodes. + @param nds a set of nodes + @result A GraphChange recording this action. + */ +- (GraphChange*)removeNodes:(NSSet *)nds; + +/*! + @brief Adds an edge. + @param edge + @result A GraphChange recording this action. + */ +- (GraphChange*)addEdge:(Edge*)edge; + +/*! + @brief Removed an edge. + @param edge + @result A GraphChange recording this action. + */ +- (GraphChange*)removeEdge:(Edge*)edge; + +/*! + @brief Removes a set of edges. + @param es a set of edges. + @result A GraphChange recording this action. + */ +- (GraphChange*)removeEdges:(NSSet *)es; + +/*! + @brief Convenience function, intializes an edge with the given + source and target and adds it. + @param source the source of the edge. + @param target the target of the edge. + @result A GraphChange recording this action. + */ +- (GraphChange*)addEdgeFrom:(Node*)source to:(Node*)target; + +/*! + @brief Return the z-index for a given node (lower is farther back). + @param node a node in the graph + @result An int + */ +- (int)indexOfNode:(Node*)node; + +/*! + @brief Set the z-index for a given node (lower is farther back). + @param idx a new z-index + @param node a node in the graph + */ +- (void)setIndex:(int)idx ofNode:(Node*)node; + +/*! + @brief Bring set of nodes forward by one. + @param nodeSet a set of nodes + */ +- (GraphChange*)bringNodesForward:(NSSet*)nodeSet; + +/*! + @brief Bring set of nodes to the front. + @param nodeSet a set of nodes + */ +- (GraphChange*)bringNodesToFront:(NSSet*)nodeSet; + +/*! + @brief Bring set of edges to the front. + @param edgeSet a set of edges + */ +- (GraphChange*)bringEdgesToFront:(NSSet*)edgeSet; + +/*! + @brief Bring set of edges forward by one. + @param edgeSet a set of edges + */ +- (GraphChange*)bringEdgesForward:(NSSet*)edgeSet; + +/*! + @brief Send set of nodes backward by one. + @param nodeSet a set of nodes + */ +- (GraphChange*)sendNodesBackward:(NSSet*)nodeSet; + +/*! + @brief Send set of edges backward by one. + @param edgeSet a set of edges + */ +- (GraphChange*)sendEdgesBackward:(NSSet*)edgeSet; + +/*! + @brief Send set of nodes to back. + @param nodeSet a set of nodes + */ +- (GraphChange*)sendNodesToBack:(NSSet*)nodeSet; + +/*! + @brief Send set of edges to back. + @param edgeSet a set of edges + */ +- (GraphChange*)sendEdgesToBack:(NSSet*)edgeSet; + + +/*! + @brief Transform every node in the graph to screen space. + @param t a transformer + */ +- (void)applyTransformer:(Transformer*)t; + +/*! + @brief Shift nodes by a given distance. + @param ns a set of nodes. + @param p an x and y distance, given as an NSPoint. + @result A GraphChange recording this action. + */ +- (GraphChange*)shiftNodes:(id)ns byPoint:(NSPoint)p; + +/*! + @brief Reverse the given edges + @param es the edges to reverse + @result A GraphChange recording this action. + */ +- (GraphChange*)reverseEdges:(NSSet *)es; + +/*! + @brief Insert the given graph into this one. Used for copy + and paste. + @param g a graph. + @result A GraphChange recording this action. + */ +- (GraphChange*)insertGraph:(Graph*)g; + +/*! + @brief Flip the subgraph defined by the given node set + horizontally. + @param nds a set of nodes. + @result A GraphChange recording this action. + */ +- (GraphChange*)flipHorizontalNodes:(NSSet*)nds; + +/*! + @brief Flip the subgraph defined by the given node set + vertically. + @param nds a set of nodes. + @result A GraphChange recording this action. + */ +- (GraphChange*)flipVerticalNodes:(NSSet*)nds; + +/*! + @brief Apply a graph change. + @details An undo manager should maintain a stack of GraphChange + objects returned. To undo a GraphChange, call this method + with [change inverse] as is argument. + @param ch a graph change. + */ +- (void)applyGraphChange:(GraphChange*)ch; + +/*! + @brief The TikZ representation of this graph. + @details The TikZ representation of this graph. The TikZ code should + contain enough data to totally reconstruct the graph. + @result A string containing TikZ code. + */ +- (NSString*)tikz; + + +/*! + @brief Copy the node set and return a table of copies, whose + keys are the original nodes. This is used to save the state + of a set of nodes in a GraphChange. + @param nds a set of nodes. + @result A NSMapTable of node copies. + */ ++ (NSMapTable*)nodeTableForNodes:(NSSet*)nds; + ++ (NSMapTable*)nodeTableForNodes:(NSSet*)nds withZone:(NSZone*)zone; + +/*! + @brief Copy the edge set and return a table of copies, whose + keys are the original edges. This is used to save the state + of a set of edges in a GraphChange. + @param es a set of edges. + @result A NSMapTable of edge copies. + */ ++ (NSMapTable*)edgeTableForEdges:(NSSet*)es; + ++ (NSMapTable*)edgeTableForEdges:(NSSet*)es withZone:(NSZone*)zone; + +/*! + @brief Compute the bounds for a set of nodes. + @param nds an enumerable collection of nodes. + @result The bounds. + */ ++ (NSRect)boundsForNodes:(id)nds; + +/*! + @brief Factory method for constructing graphs. + @result An empty graph. + */ ++ (Graph*)graph; + +/** + * Initialize an empty graph + */ +- (id)init; + +/** + * Constructs a graph from the given tikz code + * + * See TikzGraphAssembler for more information about the error argument. + */ ++ (Graph*)graphFromTikz:(NSString*)tikz error:(NSError**)e; + +/** + * Constructs a graph from the given tikz code + */ ++ (Graph*)graphFromTikz:(NSString*)tikz; + +/** + * Initialize an empty graph from the given tikz code + * + * Note that this may not return the same object it was called on, + * and will return nil if parsing failed. + * + * See TikzGraphAssembler for more information about the error argument. + */ +- (id)initFromTikz:(NSString*)tikz error:(NSError**)e; + +/** + * Initialize an empty graph from the given tikz code + * + * Note that this may not return the same object it was called on, + * and will return nil if parsing failed. + */ +- (id)initFromTikz:(NSString*)tikz; + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/Graph.m b/tikzit-1/src/common/Graph.m new file mode 100644 index 0000000..cf09a69 --- /dev/null +++ b/tikzit-1/src/common/Graph.m @@ -0,0 +1,922 @@ +// +// Graph.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "Graph.h" +#import "TikzGraphAssembler.h" +#import "Shape.h" + +@interface Graph (Private) +- (void) shapeDictionaryReplaced:(NSNotification*)notification; +@end + +@implementation Graph + +- (id)init { + self = [super init]; + if (self != nil) { + data = [[GraphElementData alloc] init]; + boundingBox = NSMakeRect(0, 0, 0, 0); + graphLock = [[NSRecursiveLock alloc] init]; + nodes = [[NSMutableArray alloc] initWithCapacity:10]; + edges = [[NSMutableArray alloc] initWithCapacity:10]; + inEdges = nil; + outEdges = nil; + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(shapeDictionaryReplaced:) + name:@"ShapeDictionaryReplaced" + object:[Shape class]]; + } + return self; +} + +- (id)initFromTikz:(NSString*)tikz error:(NSError**)e { +#if __has_feature(objc_arc) + return [TikzGraphAssembler parseTikz:tikz error:e]; +#else + [self release]; + return [[TikzGraphAssembler parseTikz:tikz error:e] retain]; +#endif +} + +- (id)initFromTikz:(NSString*)tikz { + return [self initFromTikz:tikz error:NULL]; +} + +- (id) copyWithZone:(NSZone*)zone { + Graph *newGraph = [self copyOfSubgraphWithNodes:[NSSet setWithArray:nodes] zone:zone]; + [newGraph setData:[self data]]; + return newGraph; +} + +- (void)dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + + [graphLock lock]; +#if ! __has_feature(objc_arc) + [inEdges release]; + [outEdges release]; + [edges release]; + [nodes release]; + [data release]; + [graphLock unlock]; + [graphLock release]; + + [super dealloc]; +#endif +} + +- (void)sync { + [graphLock lock]; + if (dirty) { +#if ! __has_feature(objc_arc) + [inEdges release]; + [outEdges release]; +#endif + inEdges = [[NSMapTable alloc] initWithKeyOptions:NSMapTableStrongMemory valueOptions:NSMapTableStrongMemory capacity:10]; + outEdges = [[NSMapTable alloc] initWithKeyOptions:NSMapTableStrongMemory valueOptions:NSMapTableStrongMemory capacity:10]; + +#if ! __has_feature(objc_arc) + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; +#endif + + for (Edge *e in edges) { + NSMutableSet *ie = [inEdges objectForKey:[e target]]; + NSMutableSet *oe = [outEdges objectForKey:[e source]]; + + if (ie == nil) { + ie = [NSMutableSet setWithCapacity:4]; + [inEdges setObject:ie forKey:[e target]]; + } + + if (oe == nil) { + oe = [NSMutableSet setWithCapacity:4]; + [outEdges setObject:oe forKey:[e source]]; + } + + [ie addObject:e]; + [oe addObject:e]; + } + +#if ! __has_feature(objc_arc) + [pool drain]; +#endif + + dirty = NO; + } + [graphLock unlock]; +} + +@synthesize nodes; +@synthesize edges; + +@synthesize data; +- (void) insertObject:(GraphElementProperty*)gep + inDataAtIndex:(NSUInteger)index { + [data insertObject:gep atIndex:index]; +} +- (void) removeObjectFromDataAtIndex:(NSUInteger)index { + [data removeObjectAtIndex:index]; +} +- (void) replaceObjectInDataAtIndex:(NSUInteger)index + withObject:(GraphElementProperty*)gep { + [data replaceObjectAtIndex:index withObject:gep]; +} + +@synthesize boundingBox; + +- (NSRect)bounds { + [graphLock lock]; + NSRect b = [Graph boundsForNodes:nodes]; + [graphLock unlock]; + return b; +} + +- (BOOL)hasBoundingBox { + return !( + boundingBox.size.width == 0 && + boundingBox.size.height == 0 + ); +} + +- (NSSet*)inEdgesForNode:(Node*)nd { + [self sync]; +#if __has_feature(objc_arc) + return [inEdges objectForKey:nd]; +#else + return [[[inEdges objectForKey:nd] retain] autorelease]; +#endif +} + +- (NSSet*)outEdgesForNode:(Node*)nd { + [self sync]; +#if __has_feature(objc_arc) + return [outEdges objectForKey:nd]; +#else + return [[[outEdges objectForKey:nd] retain] autorelease]; +#endif +} + +- (NSSet*)incidentEdgesForNodes:(NSSet*)nds { + [self sync]; + + NSMutableSet *mset = [NSMutableSet setWithCapacity:10]; + for (Node *n in nds) { + [mset unionSet:[self inEdgesForNode:n]]; + [mset unionSet:[self outEdgesForNode:n]]; + } + + return mset; +} + +- (void)applyTransformer:(Transformer *)t { + [graphLock lock]; + for (Node *n in nodes) { + [n setPoint:[t toScreen:[n point]]]; + } + [graphLock unlock]; +} + +- (GraphChange*)addNode:(Node *)node{ + [graphLock lock]; + NSSet *addedNode; + + // addNode is a no-op if graph already contains node + if (![nodes containsObject:node]) { + [nodes addObject:node]; + dirty = YES; + addedNode = [NSSet setWithObject:node]; + } else { + addedNode = [NSSet set]; + } + [graphLock unlock]; + + return [GraphChange graphAdditionWithNodes:addedNode + edges:[NSSet set]]; +} + +- (GraphChange*)removeNode:(Node*)node { + [graphLock lock]; + NSMutableSet *affectedEdges = [NSMutableSet set]; + for (Edge *e in edges) { + if ([e source] == node || [e target] == node) { + [affectedEdges addObject:e]; + } + } + for (Edge *e in affectedEdges) { + [edges removeObject:e]; + } + [nodes removeObject:node]; + dirty = YES; + [graphLock unlock]; + + return [GraphChange graphDeletionWithNodes:[NSSet setWithObject:node] + edges:affectedEdges]; +} + +- (GraphChange*)removeNodes:(NSSet *)nds { + [graphLock lock]; + + Node *n; + Edge *e; + + NSMutableSet *affectedEdges = [NSMutableSet set]; + NSEnumerator *en = [edges objectEnumerator]; + while ((e = [en nextObject])) { + if ([nds containsObject:[e source]] || [nds containsObject:[e target]]) { + [affectedEdges addObject:e]; + } + } + + en = [affectedEdges objectEnumerator]; + while ((e = [en nextObject])) [edges removeObject:e]; + + en = [nds objectEnumerator]; + while ((n = [en nextObject])) [nodes removeObject:n]; + + dirty = YES; + [graphLock unlock]; + + return [GraphChange graphDeletionWithNodes:nds edges:affectedEdges]; +} + +- (GraphChange*)addEdge:(Edge*)edge { + [graphLock lock]; + NSSet *addedEdge; + + // addEdge is a no-op if graph already contains edge + if (![edges containsObject:edge]) { + [edges addObject:edge]; + dirty = YES; + addedEdge = [NSSet setWithObject:edge]; + } else { + addedEdge = [NSSet set]; + } + [graphLock unlock]; + + return [GraphChange graphAdditionWithNodes:[NSSet set] + edges:addedEdge]; +} + +- (GraphChange*)removeEdge:(Edge *)edge { + [graphLock lock]; + [edges removeObject:edge]; + dirty = YES; + [graphLock unlock]; + return [GraphChange graphDeletionWithNodes:[NSSet set] + edges:[NSSet setWithObject:edge]]; +} + +- (GraphChange*)removeEdges:(NSSet *)es { + [graphLock lock]; + + for (Edge *e in es) { + [edges removeObject:e]; + } + dirty = YES; + [graphLock unlock]; + return [GraphChange graphDeletionWithNodes:[NSSet set] edges:es]; +} + +- (GraphChange*)addEdgeFrom:(Node *)source to:(Node *)target { + return [self addEdge:[Edge edgeWithSource:source andTarget:target]]; +} + +- (GraphChange*)shiftNodes:(id)ns byPoint:(NSPoint)p { + NSPoint newLoc; + NSMutableSet *nodeSet = [NSMutableSet setWithCapacity:5]; + for (Node *n in ns) { + newLoc = NSMakePoint([n point].x + p.x, [n point].y + p.y); + [n setPoint:newLoc]; + [nodeSet addObject:n]; + } + return [GraphChange shiftNodes:nodeSet byPoint:p]; +} + +- (GraphChange*)reverseEdges:(NSSet *)es { + [graphLock lock]; + for (Edge *e in es) { + [e reverse]; + } + dirty = YES; + [graphLock unlock]; + return [GraphChange reverseEdges:es]; +} + +- (int)indexOfNode:(Node *)node { + return [nodes indexOfObject:node]; +} + +- (void)setIndex:(int)idx ofNode:(Node *)node { + [graphLock lock]; + + if ([nodes containsObject:node]) { + [nodes removeObject:node]; + [nodes insertObject:node atIndex:idx]; + } + + [graphLock unlock]; +} + +- (int)indexOfEdge:(Edge *)edge { + return [edges indexOfObject:edge]; +} + +- (void)setIndex:(int)idx ofEdge:(Edge *)edge { + [graphLock lock]; + + if ([edges containsObject:edge]) { + [edges removeObject:edge]; + [edges insertObject:edge atIndex:idx]; + } + + [graphLock unlock]; +} + +- (GraphChange*)bringNodesForward:(NSSet*)nodeSet { + NSArray *oldOrder = [nodes copy]; + [graphLock lock]; + // start at the top of the array and work backwards + for (int i = [nodes count]-2; i >= 0; --i) { + if ( [nodeSet containsObject:[nodes objectAtIndex:i]] && + ![nodeSet containsObject:[nodes objectAtIndex:i+1]]) + { + [self setIndex:(i+1) ofNode:[nodes objectAtIndex:i]]; + } + } + GraphChange *change = [GraphChange nodeOrderChangeFrom:oldOrder to:nodes moved:nodeSet]; + [graphLock unlock]; + +#if ! __has_feature(objc_arc) + [oldOrder release]; +#endif + + return change; +} + +- (GraphChange*)bringNodesToFront:(NSSet*)nodeSet { + NSArray *oldOrder = [nodes copy]; + int i = 0, top = [nodes count]-1; + + while (i <= top) { + if ([nodeSet containsObject:[nodes objectAtIndex:i]]) { + [self setIndex:([nodes count]-1) ofNode:[nodes objectAtIndex:i]]; + --top; + } else { + ++i; + } + } + GraphChange *change = [GraphChange nodeOrderChangeFrom:oldOrder to:nodes moved:nodeSet]; + +#if ! __has_feature(objc_arc) + [oldOrder release]; +#endif + + return change; +} + +- (GraphChange*)bringEdgesForward:(NSSet*)edgeSet { + [graphLock lock]; + NSArray *oldOrder = [edges copy]; + // start at the top of the array and work backwards + for (int i = [edges count]-2; i >= 0; --i) { + if ( [edgeSet containsObject:[edges objectAtIndex:i]] && + ![edgeSet containsObject:[edges objectAtIndex:i+1]]) + { + [self setIndex:(i+1) ofEdge:[edges objectAtIndex:i]]; + } + } + GraphChange *change = [GraphChange edgeOrderChangeFrom:oldOrder to:edges moved:edgeSet]; + [graphLock unlock]; + +#if ! __has_feature(objc_arc) + [oldOrder release]; +#endif + + return change; +} + +- (GraphChange*)bringEdgesToFront:(NSSet*)edgeSet { + NSArray *oldOrder = [edges copy]; + int i = 0, top = [edges count]-1; + + while (i <= top) { + if ([edgeSet containsObject:[edges objectAtIndex:i]]) { + [self setIndex:([edges count]-1) ofEdge:[edges objectAtIndex:i]]; + --top; + } else { + ++i; + } + } + GraphChange *change = [GraphChange edgeOrderChangeFrom:oldOrder to:edges moved:edgeSet]; + +#if ! __has_feature(objc_arc) + [oldOrder release]; +#endif + + return change; +} + +- (GraphChange*)sendNodesBackward:(NSSet*)nodeSet { + [graphLock lock]; + NSArray *oldOrder = [nodes copy]; + // start at the top of the array and work backwards + for (int i = 1; i < [nodes count]; ++i) { + if ( [nodeSet containsObject:[nodes objectAtIndex:i]] && + ![nodeSet containsObject:[nodes objectAtIndex:i-1]]) + { + [self setIndex:(i-1) ofNode:[nodes objectAtIndex:i]]; + } + } + GraphChange *change = [GraphChange nodeOrderChangeFrom:oldOrder to:nodes moved:nodeSet]; + [graphLock unlock]; + +#if ! __has_feature(objc_arc) + [oldOrder release]; +#endif + + return change; +} + +- (GraphChange*)sendEdgesBackward:(NSSet*)edgeSet { + [graphLock lock]; + NSArray *oldOrder = [edges copy]; + // start at the top of the array and work backwards + for (int i = 1; i < [edges count]; ++i) { + if ( [edgeSet containsObject:[edges objectAtIndex:i]] && + ![edgeSet containsObject:[edges objectAtIndex:i-1]]) + { + [self setIndex:(i-1) ofEdge:[edges objectAtIndex:i]]; + } + } + GraphChange *change = [GraphChange edgeOrderChangeFrom:oldOrder to:edges moved:edgeSet]; + [graphLock unlock]; + +#if ! __has_feature(objc_arc) + [oldOrder release]; +#endif + + return change; +} + +- (GraphChange*)sendNodesToBack:(NSSet*)nodeSet { + NSArray *oldOrder = [nodes copy]; + int i = [nodes count]-1, bot = 0; + + while (i >= bot) { + if ([nodeSet containsObject:[nodes objectAtIndex:i]]) { + [self setIndex:0 ofNode:[nodes objectAtIndex:i]]; + ++bot; + } else { + --i; + } + } + GraphChange *change = [GraphChange nodeOrderChangeFrom:oldOrder to:nodes moved:nodeSet]; + +#if ! __has_feature(objc_arc) + [oldOrder release]; +#endif + + return change; +} + +- (GraphChange*)sendEdgesToBack:(NSSet*)edgeSet { + NSArray *oldOrder = [edges copy]; + int i = [edges count]-1, bot = 0; + + while (i >= bot) { + if ([edgeSet containsObject:[edges objectAtIndex:i]]) { + [self setIndex:0 ofEdge:[edges objectAtIndex:i]]; + ++bot; + } else { + --i; + } + } + GraphChange *change = [GraphChange edgeOrderChangeFrom:oldOrder to:edges moved:edgeSet]; + +#if ! __has_feature(objc_arc) + [oldOrder release]; +#endif + + return change; +} + +- (GraphChange*)insertGraph:(Graph*)g { + [graphLock lock]; + + for (Node *n in [g nodes]) { + [self addNode:n]; + } + + for (Edge *e in [g edges]) { + [self addEdge:e]; + } + + dirty = YES; + + [graphLock unlock]; + + + return [GraphChange graphAdditionWithNodes:[NSSet setWithArray:[g nodes]] edges:[NSSet setWithArray:[g edges]]]; +} + +- (void)flipNodes:(NSSet*)nds horizontal:(BOOL)horiz { + [graphLock lock]; + + NSRect bds = [Graph boundsForNodes:nds]; + float ctr; + if (horiz) ctr = bds.origin.x + (bds.size.width/2); + else ctr = bds.origin.y + (bds.size.height/2); + + Node *n; + NSPoint p; + NSEnumerator *en = [nds objectEnumerator]; + while ((n = [en nextObject])) { + p = [n point]; + if (horiz) p.x = 2 * ctr - p.x; + else p.y = 2 * ctr - p.y; + [n setPoint:p]; + } + + Edge *e; + en = [edges objectEnumerator]; + while ((e = [en nextObject])) { + if ([nds containsObject:[e source]] && + [nds containsObject:[e target]]) + { + if ([e bendMode] == EdgeBendModeInOut) { + if (horiz) { + if ([e inAngle] < 0) [e setInAngle:(-180 - [e inAngle])]; + else [e setInAngle:180 - [e inAngle]]; + + if ([e outAngle] < 0) [e setOutAngle:(-180 - [e outAngle])]; + else [e setOutAngle:180 - [e outAngle]]; + } else { + [e setInAngle:-[e inAngle]]; + [e setOutAngle:-[e outAngle]]; + } + } else { + [e setBend:-[e bend]]; + } + } + } + + [graphLock unlock]; +} + +- (GraphChange*)flipHorizontalNodes:(NSSet*)nds { + [self flipNodes:nds horizontal:YES]; + return [GraphChange flipNodes:nds horizontal:YES]; +} + +- (GraphChange*)flipVerticalNodes:(NSSet*)nds { + [self flipNodes:nds horizontal:NO]; + return [GraphChange flipNodes:nds horizontal:NO]; +} + +- (Graph*)copyOfSubgraphWithNodes:(NSSet*)nds { + return [self copyOfSubgraphWithNodes:nds zone:NSDefaultMallocZone()]; +} + +- (Graph*)copyOfSubgraphWithNodes:(NSSet*)nds zone:(NSZone*)zone { + [graphLock lock]; + + NSMapTable *newNds = [Graph nodeTableForNodes:nds withZone:zone]; + Graph* newGraph = [[Graph allocWithZone:zone] init]; + + for (Node *nd in [newNds objectEnumerator]) { + [newGraph addNode:nd]; + } + + for (Edge *e in edges) { + if ([nds containsObject:[e source]] && [nds containsObject:[e target]]) { + Edge *e1 = [e copyWithZone:zone]; + [e1 setSource:[newNds objectForKey:[e source]]]; + [e1 setTarget:[newNds objectForKey:[e target]]]; + [newGraph addEdge:e1]; +#if ! __has_feature(objc_arc) + [e1 release]; // e1 belongs to newGraph +#endif + } + } + + [graphLock unlock]; + + return newGraph; +} + +- (NSSet*)pathCover { + [self sync]; + + NSMutableSet *cover = [NSMutableSet set]; +#if ! __has_feature(objc_arc) + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; +#endif + NSMutableSet *remainingEdges = [NSMutableSet setWithArray:edges]; + + while ([remainingEdges count] != 0) { + NSMutableArray *path = [[NSMutableArray alloc] init]; + NSSet *succs; + Edge *succ; + NSEnumerator *en; + + Edge *e = [remainingEdges anyObject]; + + while (e!=nil) { + [path addObject:e]; + [remainingEdges removeObject:e]; + + succs = [self outEdgesForNode:[e target]]; + en = [succs objectEnumerator]; + e = nil; + + while ((succ = [en nextObject])) { + if ([remainingEdges containsObject:succ]) e = succ; + } + } + + [cover addObject:path]; +#if ! __has_feature(objc_arc) + [path release]; +#endif + } + +#if ! __has_feature(objc_arc) + [pool drain]; +#endif + return cover; +} + +- (void)applyGraphChange:(GraphChange*)ch { + [graphLock lock]; + switch ([ch changeType]) { + case GraphAddition: + for (Node *n in [[ch affectedNodes] objectEnumerator]) { + [nodes addObject:n]; + } + + for (Edge *e in [[ch affectedEdges] objectEnumerator]) { + [edges addObject:e]; + } + + break; + case GraphDeletion: + for (Edge *e in [[ch affectedEdges] objectEnumerator]) { + [edges removeObject:e]; + } + + for (Node *n in [[ch affectedNodes] objectEnumerator]) { + [nodes removeObject:n]; + } + + break; + case NodePropertyChange: + [[ch nodeRef] setPropertiesFromNode:[ch nwNode]]; + break; + case NodesPropertyChange: + for (Node *key in [[ch nwNodeTable] keyEnumerator]) { + [key setPropertiesFromNode:[[ch nwNodeTable] objectForKey:key]]; + } + break; + case EdgePropertyChange: + [[ch edgeRef] setPropertiesFromEdge:[ch nwEdge]]; + break; + case EdgesPropertyChange: + for (Edge *key in [[ch nwEdgeTable] keyEnumerator]) { + [key setPropertiesFromEdge:[[ch nwEdgeTable] objectForKey:key]]; + } + break; + case NodesShift: + for (Node *n in [[ch affectedNodes] objectEnumerator]) { + [n setPoint:NSMakePoint([n point].x + [ch shiftPoint].x, + [n point].y + [ch shiftPoint].y)]; + } + break; + case NodesFlip: + [self flipNodes:[ch affectedNodes] horizontal:[ch horizontal]]; + break; + case EdgesReverse: + for (Edge *e in [[ch affectedEdges] objectEnumerator]) { + [e reverse]; + } + break; + case BoundingBoxChange: + [self setBoundingBox:[ch nwBoundingBox]]; + break; + case GraphPropertyChange: + [data setArray:[ch nwGraphData]]; + break; + case NodeOrderChange: + [nodes setArray:[ch nwNodeOrder]]; + break; + case EdgeOrderChange: + [edges setArray:[ch nwEdgeOrder]]; + break; + } + + dirty = YES; + [graphLock unlock]; +} + +//- (void)undoGraphChange:(GraphChange*)ch { +// [self applyGraphChange:[GraphChange inverseGraphChange:ch]]; +//} + +- (NSString*)tikz { + [graphLock lock]; + + NSMutableString *code = [NSMutableString + stringWithFormat:@"\\begin{tikzpicture}%@\n", + [[self data] tikzList]]; + + if ([self hasBoundingBox]) { + [code appendFormat:@"\t\\path [use as bounding box] (%@,%@) rectangle (%@,%@);\n", + [NSNumber numberWithFloat:boundingBox.origin.x], + [NSNumber numberWithFloat:boundingBox.origin.y], + [NSNumber numberWithFloat:boundingBox.origin.x + boundingBox.size.width], + [NSNumber numberWithFloat:boundingBox.origin.y + boundingBox.size.height]]; + } + +// NSArray *sortedNodeList = [[nodes allObjects] +// sortedArrayUsingSelector:@selector(compareTo:)]; + //NSMutableDictionary *nodeNames = [NSMutableDictionary dictionary]; + + if ([nodes count] > 0) [code appendFormat:@"\t\\begin{pgfonlayer}{nodelayer}\n"]; + + int i = 0; + for (Node *n in nodes) { + [n updateData]; + [n setName:[NSString stringWithFormat:@"%d", i]]; + [code appendFormat:@"\t\t\\node %@ (%d) at (%@, %@) {%@};\n", + [[n data] tikzList], + i, + formatFloat([n point].x, 4), + formatFloat([n point].y, 4), + [n label] + ]; + i++; + } + + if ([nodes count] > 0) [code appendFormat:@"\t\\end{pgfonlayer}\n"]; + if ([edges count] > 0) [code appendFormat:@"\t\\begin{pgfonlayer}{edgelayer}\n"]; + + NSString *nodeStr; + for (Edge *e in edges) { + [e updateData]; + + if ([e hasEdgeNode]) { + nodeStr = [NSString stringWithFormat:@"node%@{%@} ", + [[[e edgeNode] data] tikzList], + [[e edgeNode] label] + ]; + } else { + nodeStr = @""; + } + + NSString *edata = [[e data] tikzList]; + + NSString *srcAnchor; + NSString *tgtAnchor; + + if ([[e sourceAnchor] isEqual:@""]) { + srcAnchor = @""; + } else { + srcAnchor = [NSString stringWithFormat:@".%@", [e sourceAnchor]]; + } + + if ([[e targetAnchor] isEqual:@""]) { + tgtAnchor = @""; + } else { + tgtAnchor = [NSString stringWithFormat:@".%@", [e targetAnchor]]; + } + + [code appendFormat:@"\t\t\\draw%@ (%@%@) to %@(%@%@);\n", + ([edata isEqual:@""]) ? @"" : [NSString stringWithFormat:@" %@", edata], + [[e source] name], + srcAnchor, + nodeStr, + ([e source] == [e target]) ? @"" : [[e target] name], + tgtAnchor + ]; + } + + if ([edges count] > 0) [code appendFormat:@"\t\\end{pgfonlayer}\n"]; + + [code appendString:@"\\end{tikzpicture}"]; + + [graphLock unlock]; + + return code; +} + ++ (Graph*)graph { +#if __has_feature(objc_arc) + return [[self alloc] init]; +#else + return [[[self alloc] init] autorelease]; +#endif +} + ++ (Graph*)graphFromTikz:(NSString*)tikz error:(NSError**)e { + return [TikzGraphAssembler parseTikz:tikz error:e]; +} + ++ (Graph*)graphFromTikz:(NSString*)tikz { + return [self graphFromTikz:tikz error:NULL]; +} + ++ (NSMapTable*)nodeTableForNodes:(NSSet*)nds { + return [self nodeTableForNodes:nds withZone:NSDefaultMallocZone()]; +} + ++ (NSMapTable*)nodeTableForNodes:(NSSet*)nds withZone:(NSZone*)zone { + NSMapTable *tab = [[NSMapTable allocWithZone:zone] + initWithKeyOptions:NSMapTableStrongMemory + valueOptions:NSMapTableStrongMemory + capacity:[nds count]]; + for (Node *n in nds) { + Node *ncopy = [n copyWithZone:zone]; + [tab setObject:ncopy forKey:n]; +#if ! __has_feature(objc_arc) + [ncopy release]; // tab should still retain ncopy. +#endif + } +#if __has_feature(objc_arc) + return tab; +#else + return [tab autorelease]; +#endif +} + ++ (NSMapTable*)edgeTableForEdges:(NSSet*)es { + return [self edgeTableForEdges:es withZone:NSDefaultMallocZone()]; +} + ++ (NSMapTable*)edgeTableForEdges:(NSSet*)es withZone:(NSZone*)zone { + NSMapTable *tab = [[NSMapTable allocWithZone:zone] + initWithKeyOptions:NSMapTableStrongMemory + valueOptions:NSMapTableStrongMemory + capacity:[es count]]; + for (Edge *e in es) { + Edge *ecopy = [e copyWithZone:zone]; + [tab setObject:ecopy forKey:e]; +#if ! __has_feature(objc_arc) + [ecopy release]; // tab should still retain ecopy. +#endif + } + return tab; +} + + ++ (NSRect)boundsForNodes:(id)nds { + NSPoint tl, br; + NSPoint p; + BOOL hasPoints = NO; + for (Node *n in nds) { + p = [n point]; + if (!hasPoints) { + tl = p; + br = p; + hasPoints = YES; + } else { + if (p.x < tl.x) tl.x = p.x; + if (p.y > tl.y) tl.y = p.y; + if (p.x > br.x) br.x = p.x; + if (p.y < br.y) br.y = p.y; + } + } + + return (hasPoints) ? NSRectAroundPoints(tl, br) : NSMakeRect(0, 0, 0, 0); +} + +@end + +@implementation Graph (Private) +- (void) shapeDictionaryReplaced:(NSNotification*)notification { + for (Edge *e in edges) { + [e recalculateProperties]; + } +} +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/GraphChange.h b/tikzit-1/src/common/GraphChange.h new file mode 100644 index 0000000..0e71a90 --- /dev/null +++ b/tikzit-1/src/common/GraphChange.h @@ -0,0 +1,344 @@ +// +// GraphChange.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "Node.h" +#import "Edge.h" + +typedef enum { + GraphAddition, + GraphDeletion, + NodePropertyChange, + EdgePropertyChange, + NodesPropertyChange, + EdgesPropertyChange, + NodesShift, + NodesFlip, + EdgesReverse, + BoundingBoxChange, + GraphPropertyChange, + NodeOrderChange, + EdgeOrderChange +} ChangeType; + +/*! + @class GraphChange + @brief Store the data associated with a graph change. + @details All of the methods that change a graph return an object of type GraphChange. + Graph changes can be re-done by calling [graph applyGraphChange:]. They can be undone + by calling applyGraphChange on [change inverse]. This class has no public initializer, + so everything should be constructed by factory methods. + */ +@interface GraphChange : NSObject { + ChangeType changeType; + + // for addition, deletion, and shifts + NSSet *affectedNodes; + NSSet *affectedEdges; + NSPoint shiftPoint; + + // for flip + BOOL horizontal; + + // for property changes + Node *nodeRef; + Edge *edgeRef; + + Node *oldNode, *nwNode; + Edge *oldEdge, *nwEdge; + NSMapTable *oldNodeTable, *nwNodeTable; + NSMapTable *oldEdgeTable, *nwEdgeTable; + NSRect oldBoundingBox, nwBoundingBox; + GraphElementData *oldGraphData, *nwGraphData; + + NSArray *oldNodeOrder, *nwNodeOrder; + NSArray *oldEdgeOrder, *nwEdgeOrder; +} + +/*! + @property changeType + @brief Type of GraphChange. + */ +@property (assign) ChangeType changeType; + +/*! + @property shiftPoint + @brief A point storing a shifted distance. + */ +@property (assign) NSPoint shiftPoint; + +/*! + @property horizontal + @brief Flags whether nodes were flipped horizontally + */ +@property (assign) BOOL horizontal; + +/*! + @property affectedNodes + @brief A set of nodes affected by this change, may be undefined. + */ +@property (copy) NSSet *affectedNodes; + +/*! + @property affectedEdges + @brief A set of edges affected by this change, may be undefined. + */ +@property (copy) NSSet *affectedEdges; + +/*! + @property nodeRef + @brief A reference to a single node affected by this change, may be undefined. + */ +@property (retain) Node *nodeRef; + +/*! + @property oldNode + @brief A copy of the node pre-change. + */ +@property (copy) Node *oldNode; + +/*! + @property nwNode + @brief A copy of the node post-change. + */ +@property (copy) Node *nwNode; + +/*! + @property edgeRef + @brief A reference to a single edge affected by this change, may be undefined. + */ +@property (retain) Edge *edgeRef; + +/*! + @property oldEdge + @brief A copy of the edge pre-change. + */ +@property (copy) Edge *oldEdge; + +/*! + @property nwEdge + @brief A copy of the edge post-change. + */ +@property (copy) Edge *nwEdge; + +/*! + @property oldNodeTable + @brief A a table containing copies of a set of nodes pre-change. + */ +@property (retain) NSMapTable *oldNodeTable; + +/*! + @property nwNodeTable + @brief A a table containing copies of a set of nodes post-change. + */ +@property (retain) NSMapTable *nwNodeTable; + +/*! + @property oldEdgeTable + @brief A a table containing copies of a set of edges pre-change. + */ +@property (retain) NSMapTable *oldEdgeTable; + +/*! + @property nwEdgeTable + @brief A a table containing copies of a set of edges post-change. + */ +@property (retain) NSMapTable *nwEdgeTable; + +/*! + @property oldBoundingBox + @brief The old bounding box. + */ +@property (assign) NSRect oldBoundingBox; + +/*! + @property nwBoundingBox + @brief The new bounding box. + */ +@property (assign) NSRect nwBoundingBox; + +/*! + @property oldGraphData + @brief The old graph data. + */ +@property (copy) GraphElementData *oldGraphData; + +/*! + @property nwGraphData + @brief The new graph data. + */ +@property (copy) GraphElementData *nwGraphData; + +/*! + @property oldNodeOrder + @brief The old node list. + */ +@property (copy) NSArray *oldNodeOrder; + +/*! + @property nwNodeOrder + @brief The new node list. + */ +@property (copy) NSArray *nwNodeOrder; + +/*! + @property oldEdgeOrder + @brief The old edge list. + */ +@property (copy) NSArray *oldEdgeOrder; + +/*! + @property nwEdgeOrder + @brief The new edge list. + */ +@property (copy) NSArray *nwEdgeOrder; + +/*! + @brief Invert a GraphChange. + @details Invert a GraphChange. Calling [graph applyGraphChange:[[graph msg:...] invert]] + should leave the graph unchanged for any method of Graph that returns a + GraphChange. + @result The inverse of the current Graph Change. + */ +- (GraphChange*)invert; + +/*! + @brief Construct a graph addition. affectedNodes are the added nodes, + affectedEdges are the added edges. + @param ns a set of nodes. + @param es a set of edges. + @result A graph addition. + */ ++ (GraphChange*)graphAdditionWithNodes:(NSSet*)ns edges:(NSSet*)es; + +/*! + @brief Construct a graph deletion. affectedNodes are the deleted nodes, + affectedEdges are the deleted edges. + @param ns a set of nodes. + @param es a set of edges. + @result A graph deletion. + */ ++ (GraphChange*)graphDeletionWithNodes:(NSSet*)ns edges:(NSSet*)es; + +/*! + @brief Construct a property change of a single node. + @param nd the affected node. + @param old a copy of the node pre-change + @param nw a copy of the node post-change + @result A property change of a single node. + */ ++ (GraphChange*)propertyChangeOfNode:(Node*)nd fromOld:(Node*)old toNew:(Node*)nw; + +/*! + @brief Construct a property change of a single edge. + @param e the affected edge. + @param old a copy of the edge pre-change + @param nw a copy of the edge post-change + @result A property change of a single node. + */ ++ (GraphChange*)propertyChangeOfEdge:(Edge*)e fromOld:(Edge *)old toNew:(Edge *)nw; + +/*! + @brief Construct a property change of set of nodes. + @details Construct a property change of set of nodes. oldC and newC should be + constructed using the class method [Graph nodeTableForNodes:] before + and after the property change, respectively. The affected nodes are + keys(oldC) = keys(newC). + @param oldC a table of copies of nodes pre-change + @param newC a table of copies of nodes post-change + @result A property change of a set of nodes. + */ ++ (GraphChange*)propertyChangeOfNodesFromOldCopies:(NSMapTable*)oldC + toNewCopies:(NSMapTable*)newC; + +/*! + @brief Construct a property change of set of edges. + @details Construct a property change of set of edges. oldC and newC should be + constructed using the class method [Graph edgeTableForEdges:] before + and after the property change, respectively. The affected edges are + keys(oldC) = keys(newC). + @param oldC a table of copies of edges pre-change + @param newC a table of copies of edges post-change + @result A property change of a set of edges. + */ ++ (GraphChange*)propertyChangeOfEdgesFromOldCopies:(NSMapTable*)oldC + toNewCopies:(NSMapTable*)newC; + + +/*! + @brief Construct a shift of a set of nodes by a given point. + @param ns the affected nodes. + @param p a point storing (dx,dy) + @result A shift of a set of nodes. + */ ++ (GraphChange*)shiftNodes:(NSSet*)ns byPoint:(NSPoint)p; + +/*! + @brief Construct a horizontal or vertical flip of a set of nodes. + @param ns the affected nodes. + @param b flag for whether to flip horizontally + @result A flip of a set of nodes. + */ ++ (GraphChange*)flipNodes:(NSSet*)ns horizontal:(BOOL)b; + +/*! + @brief Construct a reversal of a set of edges. + @param es the affected edges. + @result A reverse of a set of edges. + */ ++ (GraphChange*)reverseEdges:(NSSet*)es; + +/*! + @brief Construct a bounding box change + @param oldBB the old bounding box + @param newBB the new bounding box + @result A bounding box change. + */ ++ (GraphChange*)changeBoundingBoxFrom:(NSRect)oldBB to:(NSRect)newBB; + +/*! + @brief Construct a graph property change + @param oldData the old graph data + @param newData the new graph data + @result A graph property change. + */ ++ (GraphChange*)propertyChangeOfGraphFrom:(GraphElementData*)oldData to:(GraphElementData*)newData; + +/*! + @brief Construct a node order change + @param old The old ordering + @param new The new ordering + @result A node order change + */ ++ (GraphChange*)nodeOrderChangeFrom:(NSArray*)old to:(NSArray*)new moved:(NSSet*)affected; + +/*! + @brief Construct an edge order change + @param old The old ordering + @param new The new ordering + @result A edge order change + */ ++ (GraphChange*)edgeOrderChangeFrom:(NSArray*)old to:(NSArray*)new moved:(NSSet*)affected; + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/GraphChange.m b/tikzit-1/src/common/GraphChange.m new file mode 100644 index 0000000..29a3939 --- /dev/null +++ b/tikzit-1/src/common/GraphChange.m @@ -0,0 +1,369 @@ +// +// GraphChange.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + + +// GraphChange : store the data associated to a single, undo-able change +// to a graph. An undo manager should maintain a stack of such changes +// and undo/redo them on request using [graph applyGraphChange:...]. + +#import "GraphChange.h" + + +@implementation GraphChange + +- (id)init { + return [super init]; +} + +- (void)dealloc { +#if ! __has_feature(objc_arc) + [affectedNodes release]; + [affectedEdges release]; + [nodeRef release]; + [edgeRef release]; + [oldNode release]; + [nwNode release]; + [oldEdge release]; + [nwEdge release]; + [oldNodeTable release]; + [nwNodeTable release]; + [oldEdgeTable release]; + [nwEdgeTable release]; + [oldGraphData release]; + [nwGraphData release]; + [oldNodeOrder release]; + [nwNodeOrder release]; + [oldEdgeOrder release]; + [nwEdgeOrder release]; + + [super dealloc]; +#endif +} + +@synthesize changeType; +@synthesize shiftPoint, horizontal; +@synthesize affectedEdges, affectedNodes; +@synthesize edgeRef, nodeRef; +@synthesize nwNode, oldNode; +@synthesize nwEdge, oldEdge; +@synthesize oldNodeTable, nwNodeTable; +@synthesize oldEdgeTable, nwEdgeTable; +@synthesize oldBoundingBox, nwBoundingBox; +@synthesize oldGraphData, nwGraphData; +@synthesize oldNodeOrder, nwNodeOrder; +@synthesize oldEdgeOrder, nwEdgeOrder; + +- (GraphChange*)invert { + GraphChange *inverse = [[GraphChange alloc] init]; + [inverse setChangeType:[self changeType]]; + switch ([self changeType]) { + case GraphAddition: + [inverse setChangeType:GraphDeletion]; +#if __has_feature(objc_arc) + inverse->affectedNodes = affectedNodes; + inverse->affectedEdges = affectedEdges; +#else + inverse->affectedNodes = [affectedNodes retain]; + inverse->affectedEdges = [affectedEdges retain]; +#endif + break; + case GraphDeletion: + [inverse setChangeType:GraphAddition]; +#if __has_feature(objc_arc) + inverse->affectedNodes = affectedNodes; + inverse->affectedEdges = affectedEdges; +#else + inverse->affectedNodes = [affectedNodes retain]; + inverse->affectedEdges = [affectedEdges retain]; +#endif + break; + case NodePropertyChange: +#if __has_feature(objc_arc) + inverse->nodeRef = nodeRef; + inverse->oldNode = nwNode; + inverse->nwNode = oldNode; +#else + inverse->nodeRef = [nodeRef retain]; + inverse->oldNode = [nwNode retain]; + inverse->nwNode = [oldNode retain]; +#endif + break; + case NodesPropertyChange: +#if __has_feature(objc_arc) + +#else + inverse->oldNodeTable = [nwNodeTable retain]; + inverse->nwNodeTable = [oldNodeTable retain]; +#endif + break; + case EdgePropertyChange: +#if __has_feature(objc_arc) + inverse->edgeRef = edgeRef; + inverse->oldEdge = nwEdge; + inverse->nwEdge = oldEdge; +#else + inverse->edgeRef = [edgeRef retain]; + inverse->oldEdge = [nwEdge retain]; + inverse->nwEdge = [oldEdge retain]; +#endif + break; + case EdgesPropertyChange: +#if __has_feature(objc_arc) + inverse->oldEdgeTable = nwEdgeTable; + inverse->nwEdgeTable = oldEdgeTable; +#else + inverse->oldEdgeTable = [nwEdgeTable retain]; + inverse->nwEdgeTable = [oldEdgeTable retain]; +#endif + break; + case NodesShift: +#if __has_feature(objc_arc) + inverse->affectedNodes = affectedNodes; +#else + inverse->affectedNodes = [affectedNodes retain]; +#endif + [inverse setShiftPoint:NSMakePoint(-[self shiftPoint].x, + -[self shiftPoint].y)]; + break; + case NodesFlip: +#if __has_feature(objc_arc) + inverse->affectedNodes = affectedNodes; +#else + inverse->affectedNodes = [affectedNodes retain]; +#endif + [inverse setHorizontal:[self horizontal]]; + break; + case EdgesReverse: +#if __has_feature(objc_arc) + inverse->affectedEdges = affectedEdges; +#else + inverse->affectedEdges = [affectedEdges retain]; +#endif + break; + case BoundingBoxChange: + inverse->oldBoundingBox = nwBoundingBox; + inverse->nwBoundingBox = oldBoundingBox; + break; + case GraphPropertyChange: +#if __has_feature(objc_arc) + inverse->oldGraphData = nwGraphData; + inverse->nwGraphData = oldGraphData; +#else + inverse->oldGraphData = [nwGraphData retain]; + inverse->nwGraphData = [oldGraphData retain]; +#endif + break; + case NodeOrderChange: +#if __has_feature(objc_arc) + inverse->affectedNodes = affectedNodes; + inverse->oldNodeOrder = nwNodeOrder; + inverse->nwNodeOrder = oldNodeOrder; +#else + inverse->affectedNodes = [affectedNodes retain]; + inverse->oldNodeOrder = [nwNodeOrder retain]; + inverse->nwNodeOrder = [oldNodeOrder retain]; +#endif + break; + case EdgeOrderChange: +#if __has_feature(objc_arc) + inverse->affectedEdges = affectedEdges; + inverse->oldEdgeOrder = nwEdgeOrder; + inverse->nwEdgeOrder = oldEdgeOrder; +#else + inverse->affectedEdges = [affectedEdges retain]; + inverse->oldEdgeOrder = [nwEdgeOrder retain]; + inverse->nwEdgeOrder = [oldEdgeOrder retain]; +#endif + break; + } +#if __has_feature(objc_arc) + return inverse; +#else + return [inverse autorelease]; +#endif +} + ++ (GraphChange*)graphAdditionWithNodes:(NSSet *)ns edges:(NSSet *)es { + GraphChange *gc = [[GraphChange alloc] init]; + [gc setChangeType:GraphAddition]; + [gc setAffectedNodes:ns]; + [gc setAffectedEdges:es]; +#if __has_feature(objc_arc) + return gc; +#else + return [gc autorelease]; +#endif +} + ++ (GraphChange*)graphDeletionWithNodes:(NSSet *)ns edges:(NSSet *)es { + GraphChange *gc = [[GraphChange alloc] init]; + [gc setChangeType:GraphDeletion]; + [gc setAffectedNodes:ns]; + [gc setAffectedEdges:es]; +#if __has_feature(objc_arc) + return gc; +#else + return [gc autorelease]; +#endif +} + ++ (GraphChange*)propertyChangeOfNode:(Node*)nd fromOld:(Node*)old toNew:(Node*)nw { + GraphChange *gc = [[GraphChange alloc] init]; + [gc setChangeType:NodePropertyChange]; + [gc setNodeRef:nd]; + [gc setOldNode:old]; + [gc setNwNode:nw]; +#if __has_feature(objc_arc) + return gc; +#else + return [gc autorelease]; +#endif +} + ++ (GraphChange*)propertyChangeOfNodesFromOldCopies:(NSMapTable*)oldC + toNewCopies:(NSMapTable*)newC { + GraphChange *gc = [[GraphChange alloc] init]; + [gc setChangeType:NodesPropertyChange]; + [gc setOldNodeTable:oldC]; + [gc setNwNodeTable:newC]; +#if __has_feature(objc_arc) + return gc; +#else + return [gc autorelease]; +#endif +} + ++ (GraphChange*)propertyChangeOfEdge:(Edge*)e fromOld:(Edge *)old toNew:(Edge *)nw { + GraphChange *gc = [[GraphChange alloc] init]; + [gc setChangeType:EdgePropertyChange]; + [gc setEdgeRef:e]; + [gc setOldEdge:old]; + [gc setNwEdge:nw]; +#if __has_feature(objc_arc) + return gc; +#else + return [gc autorelease]; +#endif +} + ++ (GraphChange*)propertyChangeOfEdgesFromOldCopies:(NSMapTable*)oldC + toNewCopies:(NSMapTable*)newC { + GraphChange *gc = [[GraphChange alloc] init]; + [gc setChangeType:EdgesPropertyChange]; + [gc setOldEdgeTable:oldC]; + [gc setNwEdgeTable:newC]; +#if __has_feature(objc_arc) + return gc; +#else + return [gc autorelease]; +#endif +} + ++ (GraphChange*)shiftNodes:(NSSet*)ns byPoint:(NSPoint)p { + GraphChange *gc = [[GraphChange alloc] init]; + [gc setChangeType:NodesShift]; + [gc setAffectedNodes:ns]; + [gc setShiftPoint:p]; +#if __has_feature(objc_arc) + return gc; +#else + return [gc autorelease]; +#endif +} + ++ (GraphChange*)flipNodes:(NSSet*)ns horizontal:(BOOL)b { + GraphChange *gc = [[GraphChange alloc] init]; + [gc setChangeType:NodesFlip]; + [gc setAffectedNodes:ns]; + [gc setHorizontal:b]; +#if __has_feature(objc_arc) + return gc; +#else + return [gc autorelease]; +#endif +} + ++ (GraphChange*)reverseEdges:(NSSet*)es { + GraphChange *gc = [[GraphChange alloc] init]; + [gc setChangeType:EdgesReverse]; + [gc setAffectedEdges:es]; +#if __has_feature(objc_arc) + return gc; +#else + return [gc autorelease]; +#endif +} + ++ (GraphChange*)changeBoundingBoxFrom:(NSRect)oldBB to:(NSRect)newBB { + GraphChange *gc = [[GraphChange alloc] init]; + [gc setChangeType:BoundingBoxChange]; + [gc setOldBoundingBox:oldBB]; + [gc setNwBoundingBox:newBB]; +#if __has_feature(objc_arc) + return gc; +#else + return [gc autorelease]; +#endif +} + ++ (GraphChange*)propertyChangeOfGraphFrom:(GraphElementData*)oldData to:(GraphElementData*)newData { + GraphChange *gc = [[GraphChange alloc] init]; + [gc setChangeType:GraphPropertyChange]; + [gc setOldGraphData:oldData]; + [gc setNwGraphData:newData]; +#if __has_feature(objc_arc) + return gc; +#else + return [gc autorelease]; +#endif +} + ++ (GraphChange*)nodeOrderChangeFrom:(NSArray*)old to:(NSArray*)new moved:(NSSet*)affected { + GraphChange *gc = [[GraphChange alloc] init]; + [gc setChangeType:NodeOrderChange]; + [gc setAffectedNodes:affected]; + [gc setOldNodeOrder:old]; + [gc setNwNodeOrder:new]; +#if __has_feature(objc_arc) + return gc; +#else + return [gc autorelease]; +#endif +} + ++ (GraphChange*)edgeOrderChangeFrom:(NSArray*)old to:(NSArray*)new moved:(NSSet*)affected { + GraphChange *gc = [[GraphChange alloc] init]; + [gc setChangeType:EdgeOrderChange]; + [gc setAffectedEdges:affected]; + [gc setOldEdgeOrder:old]; + [gc setNwEdgeOrder:new]; +#if __has_feature(objc_arc) + return gc; +#else + return [gc autorelease]; +#endif +} + +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/GraphElementData.h b/tikzit-1/src/common/GraphElementData.h new file mode 100644 index 0000000..a65e6df --- /dev/null +++ b/tikzit-1/src/common/GraphElementData.h @@ -0,0 +1,94 @@ +// +// GraphElementData.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + + +#import + +/*! + @class GraphElementData + @brief Store extra data associated with a graph, node, or edge. + @details Store the extra (style, ...) data associated with + a graph, node, or edge. This data is stored as a mutable + array of properties. It also implements hash-like accessors, + but care should be taken using these, as the list can contain + multiple occurrences of the same key. + + Convention: Getters and setters act on the *first* occurrence + of the key. 'Unsetters' remove *all* occurrences. + */ +@interface GraphElementData : NSMutableArray { + NSMutableArray *properties; +} + +- (id)init; ++ (id)data; + +/*! + @brief Set the given value for the *first* property matching this key. Add a + new property if it doesn't already exist. + @param val the value to set + @param key the key for this property + */ +- (void)setProperty:(NSString*)val forKey:(NSString*)key; + +/*! + @brief Remove *all* occurences of the property with the given key. + @param key + */ +- (void)unsetProperty:(NSString*)key; + +/*! + @brief Return the value of the *first* occurrence of the given key. + @param key + */ +- (NSString*)propertyForKey:(NSString*)key; + +/*! + @brief Add the given atom to the list, if it's not already present. + @param atom + */ +- (void)setAtom:(NSString*)atom; + +/*! + @brief Remove *all* occurrences of the given atom. + @param atom + */ +- (void)unsetAtom:(NSString*)atom; + +/*! + @brief Returns YES if the list contains at least one occurrence of + the given atom. + @param atom + @result A boolean value. + */ +- (BOOL)isAtomSet:(NSString*)atom; + +/*! + @brief Returns a TikZ-friendly string containing all of the properties. + @result A string. + */ +- (NSString*)tikzList; + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/GraphElementData.m b/tikzit-1/src/common/GraphElementData.m new file mode 100644 index 0000000..41dc9aa --- /dev/null +++ b/tikzit-1/src/common/GraphElementData.m @@ -0,0 +1,188 @@ +// +// GraphElementData.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "GraphElementData.h" +#import "GraphElementProperty.h" + + +@implementation GraphElementData + ++ (id)data { +#if __has_feature(objc_arc) + return [[self alloc] init]; +#else + return [[[self alloc] init] autorelease]; +#endif +} + +- (id)init { + self = [super init]; + if (self) { + properties = [[NSMutableArray alloc] init]; + } + return self; +} + +// all of the array messages delegate to 'properties' + +- (NSUInteger)count { return [properties count]; } +- (id)objectAtIndex:(NSUInteger)index { + return [properties objectAtIndex:index]; +} +- (NSArray*)objectsAtIndexes:(NSIndexSet*)indexes { + return [properties objectsAtIndexes:indexes]; +} + +#if __has_feature(objc_arc) +- (void) getObjects:(__unsafe_unretained id*)buffer range:(NSRange)range { +#else +- (void) getObjects:(id*)buffer range:(NSRange)range { +#endif + [properties getObjects:buffer range:range]; +} + +- (void)insertObject:(id)anObject atIndex:(NSUInteger)index { + [properties insertObject:anObject atIndex:index]; +} +- (void)removeObjectAtIndex:(NSUInteger)index { + [properties removeObjectAtIndex:index]; +} +- (void)addObject:(id)anObject { + [properties addObject:anObject]; +} +- (void)removeLastObject { + [properties removeLastObject]; +} +- (void)replaceObjectAtIndex:(NSUInteger)index withObject:(id)anObject { + [properties replaceObjectAtIndex:index withObject:anObject]; +} + +#if __has_feature(objc_arc) +- (NSUInteger) countByEnumeratingWithState:(NSFastEnumerationState *)state + objects:(__unsafe_unretained id [])stackbuf + count:(NSUInteger)len { +#else +- (NSUInteger)countByEnumeratingWithState:(NSFastEnumerationState *)state + objects:(id *)stackbuf + count:(NSUInteger)len { +#endif + return [properties countByEnumeratingWithState:state objects:stackbuf count:len]; +} + +- (void)setProperty:(NSString*)val forKey:(NSString*)key { + GraphElementProperty *m = [[GraphElementProperty alloc] initWithKeyMatching:key]; + NSInteger idx = [properties indexOfObject:m]; +#if !__has_feature(objc_arc) + [m release]; +#endif + + GraphElementProperty *p; + if (idx == NSNotFound) { + p = [[GraphElementProperty alloc] initWithPropertyValue:val forKey:key]; + [properties addObject:p]; +#if !__has_feature(objc_arc) + [p release]; +#endif + } else { + p = [properties objectAtIndex:idx]; + [p setValue:val]; + } +} + +- (void)unsetProperty:(NSString*)key { + GraphElementProperty *m = [[GraphElementProperty alloc] initWithKeyMatching:key]; + [properties removeObject:m]; +#if !__has_feature(objc_arc) + [m release]; +#endif + +} + +- (NSString*)propertyForKey:(NSString*)key { + GraphElementProperty *m = [[GraphElementProperty alloc] initWithKeyMatching:key]; + NSInteger idx = [properties indexOfObject:m]; +#if !__has_feature(objc_arc) + [m release]; +#endif + + + if (idx == NSNotFound) { + return nil; + }else { + GraphElementProperty *p = [properties objectAtIndex:idx]; + return [p value]; + } +} + +- (void)setAtom:(NSString*)atom { + GraphElementProperty *a = [[GraphElementProperty alloc] initWithAtomName:atom]; + if (![properties containsObject:a]) [properties addObject:a]; +#if !__has_feature(objc_arc) + [a release]; +#endif +} + +- (void)unsetAtom:(NSString*)atom { + GraphElementProperty *a = [[GraphElementProperty alloc] initWithAtomName:atom]; + [properties removeObject:a]; +#if !__has_feature(objc_arc) + [a release]; +#endif +} + +- (BOOL)isAtomSet:(NSString*)atom { + GraphElementProperty *a = [[GraphElementProperty alloc] initWithAtomName:atom]; + BOOL set = [properties containsObject:a]; +#if !__has_feature(objc_arc) + [a release]; +#endif + return set; +} + +- (NSString*)tikzList { + NSString *s = [properties componentsJoinedByString:@", "]; + return ([s isEqualToString:@""]) ? @"" : [NSString stringWithFormat:@"[%@]", s]; +} + +- (id)copyWithZone:(NSZone *)zone { + GraphElementData *cp = [[GraphElementData allocWithZone:zone] init]; + for (GraphElementProperty *p in properties) { + GraphElementProperty *p2 = [p copy]; + [cp addObject:p2]; +#if !__has_feature(objc_arc) + [p2 release]; +#endif + } + return cp; +} + +- (void)dealloc { +#if !__has_feature(objc_arc) + [properties release]; + [super dealloc]; +#endif +} + +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/GraphElementProperty.h b/tikzit-1/src/common/GraphElementProperty.h new file mode 100644 index 0000000..057cdbb --- /dev/null +++ b/tikzit-1/src/common/GraphElementProperty.h @@ -0,0 +1,88 @@ +// +// GraphElementProperty.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import + +/*! + @class GraphElementProperty + @brief A property. I.e. a single entry in a node's/edge's/graph's + GraphElementData table. + */ +@interface GraphElementProperty : NSObject { + NSString *key; + NSString *value; + BOOL isAtom; + BOOL isKeyMatch; +} + +@property (copy) NSString *key; +@property (copy) NSString *value; +@property (readonly) BOOL isAtom; +@property (readonly) BOOL isKeyMatch; + +/*! + @brief Initialize a new key-matching object. + @param k a key to match + @result A key-matching object. + */ +- (id)initWithKeyMatching:(NSString*)k; ++ (id)keyMatching:(NSString*)k; + +/*! + @brief Initialize a new atomic property. + @param n the atom's name + @result An atom. + */ +- (id)initWithAtomName:(NSString*)n; ++ (id)atom:(NSString*)n; + +/*! + @brief Initialize a new property. + @param v the property's value + @param k the associated key + @result A property. + */ +- (id)initWithPropertyValue:(NSString*)v forKey:(NSString*)k; ++ (id)property:(NSString*)k withValue:(NSString*)v; + +/*! + @brief A matching function for properties. + @details Two properties match iff their keys match and one of the following: + (a) they are both atomic, (b) one is a key-matching and one is a non-atomic + property, or (c) they are both non-atomic and their values match. + @param object another GraphElementProperty + @result A boolean. + */ +- (BOOL)matches:(GraphElementProperty*)object; + +/*! + @brief An alias for matches:. This allows one to use built-in methods that + filter on isEqual: for NSObjects. + @param object another GraphElementProperty + @result A boolean. + */ +- (BOOL)isEqual:(id)object; + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/GraphElementProperty.m b/tikzit-1/src/common/GraphElementProperty.m new file mode 100644 index 0000000..25e1b15 --- /dev/null +++ b/tikzit-1/src/common/GraphElementProperty.m @@ -0,0 +1,164 @@ +// +// +// GraphElementProperty.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "GraphElementProperty.h" +#import "NSString+Tikz.h" + +@implementation GraphElementProperty + ++ (id)atom:(NSString*)n { +#if __has_feature(objc_arc) + return [[self alloc] initWithAtomName:n]; +#else + return [[[self alloc] initWithAtomName:n] autorelease]; +#endif +} ++ (id)property:(NSString*)k withValue:(NSString*)v { +#if __has_feature(objc_arc) + return [[self alloc] initWithPropertyValue:v forKey:k]; +#else + return [[[self alloc] initWithPropertyValue:v forKey:k] autorelease]; +#endif +} ++ (id)keyMatching:(NSString*)k { +#if __has_feature(objc_arc) + return [[self alloc] initWithKeyMatching:k]; +#else + return [[[self alloc] initWithKeyMatching:k] autorelease]; +#endif +} + +- (id)initWithAtomName:(NSString*)n { + self = [super init]; + if (self) { + [self setKey:n]; + isAtom = YES; + } + return self; +} + +- (id)initWithPropertyValue:(NSString*)v forKey:(NSString*)k { + self = [super init]; + if (self) { + [self setKey:k]; + [self setValue:v]; + } + return self; +} + +- (id)initWithKeyMatching:(NSString*)k { + self = [super init]; + if (self) { + [self setKey:k]; + isKeyMatch = YES; + } + return self; +} + +- (void) dealloc { +#if ! __has_feature(objc_arc) + [key release]; + [value release]; + [super dealloc]; +#endif +} + +- (void)setValue:(NSString *)v { + if (value != v) { +#if ! __has_feature(objc_arc) + [value release]; +#endif + value = [v copy]; + } +} + +- (NSString*)value { + if (isAtom) { + return @"(atom)"; + } else { + return value; + } +} + + +- (void)setKey:(NSString *)k { + if (key != k) { +#if ! __has_feature(objc_arc) + [key release]; +#endif + key = [k copy]; + } + if (key == nil) + key = @""; // don't allow nil keys +} + +- (NSString*)key { + return key; +} + +- (BOOL)isAtom { return isAtom; } +- (BOOL)isKeyMatch { return isKeyMatch; } + +- (BOOL)matches:(GraphElementProperty*)object { + // properties and atoms are taken to be incomparable + if ([self isAtom] != [object isAtom]) return NO; + + // only compare keys if (a) we are both atoms, (b) i am a key match, or (c) object is a key match + if (([self isAtom] && [object isAtom]) || [self isKeyMatch] || [object isKeyMatch]) { + return [[self key] isEqual:[object key]]; + } + + // otherwise compare key and value + return [[self key] isEqual:[object key]] && [[self value] isEqual:[object value]]; +} + +- (BOOL)isEqual:(id)object { + return [self matches:object]; +} + +- (id)copyWithZone:(NSZone*)zone { + if (isAtom) { + return [[GraphElementProperty allocWithZone:zone] initWithAtomName:[self key]]; + } else if (isKeyMatch) { + return [[GraphElementProperty allocWithZone:zone] initWithKeyMatching:[self key]]; + } else { + return [[GraphElementProperty allocWithZone:zone] initWithPropertyValue:[self value] forKey:[self key]]; + } +} + +- (NSString*)description { + if ([self isAtom]) { + return [[self key] tikzEscapedString]; + } else if ([self isKeyMatch]) { + return [NSString stringWithFormat:@"%@=*", [[self key] tikzEscapedString]]; + } else { + return [NSString stringWithFormat:@"%@=%@", + [[self key] tikzEscapedString], + [[self value] tikzEscapedString]]; + } +} + +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/Grid.h b/tikzit-1/src/common/Grid.h new file mode 100644 index 0000000..b267536 --- /dev/null +++ b/tikzit-1/src/common/Grid.h @@ -0,0 +1,110 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import +#import "RenderContext.h" +#import "Transformer.h" + +/*! + * Provides a grid, which can be use for snapping points + * + * The grid is divided into cells, and each cell is further subdivided. + * These subdivisions are the snap points for the grid. + */ +@interface Grid: NSObject { + Transformer *transformer; + float spacing; + int cellSubdivisions; +} + +/*! + * The number of times to subdivide the edge of each cell + * + * Each cell will be divided into cellSubdivisions^2 squares. + */ +@property (assign) int cellSubdivisions; + +/*! + * The cell spacing + * + * Each cell will be @p cellSpacing wide and @p cellSpacing high. + */ +@property (assign) float cellSpacing; + + +/*! + * Create a new grid object. + * + * @param sp the cell spacing - this will be the width and height of each cell + * @param subs the number of cell subdivisions; the cell will end up being + * divided into subs*subs squares that are each sp/subs wide and high + * @param t the transformer to be used when snapping screen points + */ ++ (Grid*) gridWithSpacing:(float)sp subdivisions:(int)subs transformer:(Transformer*)t; +/*! + * Initialize a grid object. + * + * @param sp the cell spacing - this will be the width and height of each cell + * @param subs the number of cell subdivisions; each cell will end up being + * divided into subs*subs squares that are each sp/subs wide and high + * @param t the transformer to be used when snapping screen points + */ +- (id) initWithSpacing:(float)sp subdivisions:(int)subs transformer:(Transformer*)t; + +/*! + * Snap a point in screen co-ordinates + * + * @param p the point to snap, in screen co-ordinates + * @result @p p aligned to the nearest corner of a cell subdivision + */ +- (NSPoint) snapScreenPoint:(NSPoint)p; +/*! + * Snap a point in base co-ordinates + * + * @param p the point to snap + * @result @p p aligned to the nearest corner of a cell subdivision + */ +- (NSPoint) snapPoint:(NSPoint)p; + +/** + * Renders the grid + * + * The grid is rendered across the entire surface (subject to the context's + * clip). + * + * The internal transformer is used to convert between graph co-ordinates + * and graphics co-ordinates. + * + * @param cr the context to render in + */ +- (void) renderGridInContext:(id)cr; + +/** + * Renders the grid + * + * The grid is rendered across the entire surface (subject to the context's + * clip). + * + * @param cr the context to render in + * @param t a transformer that will be used to map graph co-ordinates + * to graphics co-ordinates + */ +- (void) renderGridInContext:(id)cr transformer:(Transformer*)t; + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/Grid.m b/tikzit-1/src/common/Grid.m new file mode 100644 index 0000000..f597a4a --- /dev/null +++ b/tikzit-1/src/common/Grid.m @@ -0,0 +1,186 @@ +/* + * Copyright 2011 Alex Merry + * Copyright 2010 Chris Heunen + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "Grid.h" +#import "util.h" + +@implementation Grid + ++ (Grid*) gridWithSpacing:(float)sp subdivisions:(int)subs transformer:(Transformer*)t { + return [[[self alloc] initWithSpacing:sp subdivisions:subs transformer:t] autorelease]; +} + +- (id) initWithSpacing:(float)sp subdivisions:(int)subs transformer:(Transformer*)t { + self = [super init]; + + if (self) { + transformer = [t retain]; + spacing = sp; + cellSubdivisions = subs; + } + + return self; +} + +- (id) copyWithZone:(NSZone*)zone { + return [[Grid allocWithZone:zone] + initWithSpacing:spacing + subdivisions:cellSubdivisions + transformer:transformer]; +} + +- (void) dealloc { + [transformer release]; + [super dealloc]; +} + +- (int) cellSubdivisions { + return cellSubdivisions; +} + +- (void) setCellSubdivisions:(int)count { + cellSubdivisions = count; +} + +- (float) cellSpacing { + return spacing; +} + +- (void) setCellSpacing:(float)sp { + spacing = sp; +} + +- (NSPoint) snapScreenPoint:(NSPoint)point { + NSPoint gridPoint = [transformer fromScreen:point]; + return [transformer toScreen:[self snapPoint:gridPoint]]; +} + +- (NSPoint) snapPoint:(NSPoint)p { + const float snapDistance = spacing/(float)cellSubdivisions; + p.x = roundToNearest (snapDistance, p.x); + p.y = roundToNearest (snapDistance, p.y); + return p; +} + +- (void) _setupLinesForContext:(id)context withSpacing:(float)offset omittingEvery:(int)omitEvery origin:(NSPoint)origin { + NSRect clip = [context clipBoundingBox]; + float clipx1 = clip.origin.x; + float clipx2 = clipx1 + clip.size.width; + float clipy1 = clip.origin.y; + float clipy2 = clipy1 + clip.size.height; + + // left of the Y axis, moving outwards + unsigned int count = 1; + float x = origin.x - offset; + while (x >= clipx1) { + if (omitEvery == 0 || (count % omitEvery != 0)) { + [context moveTo:NSMakePoint(x, clipy1)]; + [context lineTo:NSMakePoint(x, clipy2)]; + } + + x -= offset; + ++count; + } + // right of the Y axis, moving outwards + count = 1; + x = origin.x + offset; + while (x <= clipx2) { + if (omitEvery == 0 || (count % omitEvery != 0)) { + [context moveTo:NSMakePoint(x, clipy1)]; + [context lineTo:NSMakePoint(x, clipy2)]; + } + + x += offset; + ++count; + } + + // above the Y axis, moving outwards + count = 1; + float y = origin.y - offset; + while (y >= clipy1) { + if (omitEvery == 0 || (count % omitEvery != 0)) { + [context moveTo:NSMakePoint(clipx1, y)]; + [context lineTo:NSMakePoint(clipx2, y)]; + } + + y -= offset; + ++count; + } + // below the Y axis, moving outwards + count = 1; + y = origin.y + offset; + while (y <= clipy2) { + if (omitEvery == 0 || (count % omitEvery != 0)) { + [context moveTo:NSMakePoint(clipx1, y)]; + [context lineTo:NSMakePoint(clipx2, y)]; + } + + y += offset; + ++count; + } +} + +- (void) _renderSubdivisionsWithContext:(id)context origin:(NSPoint)origin cellSize:(float)cellSize { + const float offset = cellSize / cellSubdivisions; + + [self _setupLinesForContext:context withSpacing:offset omittingEvery:cellSubdivisions origin:origin]; + + [context strokePathWithColor:MakeSolidRColor (0.9, 0.9, 1.0)]; +} + +- (void) _renderCellsWithContext:(id)context origin:(NSPoint)origin cellSize:(float)cellSize { + [self _setupLinesForContext:context withSpacing:cellSize omittingEvery:0 origin:origin]; + + [context strokePathWithColor:MakeSolidRColor (0.8, 0.8, 0.9)]; +} + +- (void) _renderAxesWithContext:(id)context origin:(NSPoint)origin { + NSRect clip = [context clipBoundingBox]; + + [context moveTo:NSMakePoint(origin.x, clip.origin.y)]; + [context lineTo:NSMakePoint(origin.x, clip.origin.y + clip.size.height)]; + [context moveTo:NSMakePoint(clip.origin.x, origin.y)]; + [context lineTo:NSMakePoint(clip.origin.x + clip.size.width, origin.y)]; + + [context strokePathWithColor:MakeSolidRColor (0.6, 0.6, 0.7)]; +} + +- (void) renderGridInContext:(id)cr { + [self renderGridInContext:cr transformer:transformer]; +} + +- (void) renderGridInContext:(id)context transformer:(Transformer*)t { + const NSPoint origin = [t toScreen:NSZeroPoint]; + const float cellSize = [t scaleToScreen:spacing]; + + [context saveState]; + + // common line settings + [context setLineWidth:1.0]; + [context setAntialiasMode:AntialiasDisabled]; + + [self _renderSubdivisionsWithContext:context origin:origin cellSize:cellSize]; + [self _renderCellsWithContext:context origin:origin cellSize:cellSize]; + [self _renderAxesWithContext:context origin:origin]; + + [context restoreState]; +} + +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/NSError+Tikzit.h b/tikzit-1/src/common/NSError+Tikzit.h new file mode 100644 index 0000000..0f45fba --- /dev/null +++ b/tikzit-1/src/common/NSError+Tikzit.h @@ -0,0 +1,44 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import + +NSString* const TZErrorDomain; + +enum { + TZ_ERR_OTHER = 1, + TZ_ERR_BADSTATE, + TZ_ERR_BADFORMAT, + TZ_ERR_IO, + TZ_ERR_TOOL_FAILED, + TZ_ERR_NOTDIRECTORY, + TZ_ERR_PARSE +}; + +NSString* const TZToolOutputErrorKey; + +@interface NSError(Tikzit) ++ (NSString*)tikzitErrorDomain; ++ (id) errorWithMessage:(NSString*)message code:(NSInteger)code cause:(NSError*)cause; ++ (id) errorWithMessage:(NSString*)message code:(NSInteger)code; ++ (id) errorWithLibcError:(NSInteger)errnum; +- (NSString*)toolOutput; +@end + +void logError (NSError *error, NSString *message); + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/NSError+Tikzit.m b/tikzit-1/src/common/NSError+Tikzit.m new file mode 100644 index 0000000..6b9404b --- /dev/null +++ b/tikzit-1/src/common/NSError+Tikzit.m @@ -0,0 +1,64 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "NSError+Tikzit.h" + +NSString* const TZErrorDomain = @"tikzit"; + +NSString* const TZToolOutputErrorKey = @"tool-output"; + +@implementation NSError(Tikzit) ++ (NSString*)tikzitErrorDomain { + return TZErrorDomain; +} + ++ (id) errorWithMessage:(NSString*)message code:(NSInteger)code cause:(NSError*)cause { + NSMutableDictionary *errorDetail = [NSMutableDictionary dictionaryWithCapacity:2]; + [errorDetail setValue:message forKey:NSLocalizedDescriptionKey]; + if (cause) + [errorDetail setValue:cause forKey:NSUnderlyingErrorKey]; + return [self errorWithDomain:TZErrorDomain code:code userInfo:errorDetail]; +} + ++ (id) errorWithMessage:(NSString*)message code:(NSInteger)code { + NSMutableDictionary *errorDetail = [NSMutableDictionary dictionaryWithObject:message + forKey:NSLocalizedDescriptionKey]; + return [self errorWithDomain:TZErrorDomain code:code userInfo:errorDetail]; +} + ++ (id) errorWithLibcError:(NSInteger)errnum { + NSString *message = [NSString stringWithUTF8String:strerror(errnum)]; + NSMutableDictionary *errorDetail = [NSMutableDictionary dictionaryWithObject:message + forKey:NSLocalizedDescriptionKey]; + return [self errorWithDomain:NSPOSIXErrorDomain code:errnum userInfo:errorDetail]; +} + +- (NSString*)toolOutput { + return [[self userInfo] objectForKey:TZToolOutputErrorKey]; +} + +@end + +void logError (NSError *error, NSString *message) { + if (message == nil) { + NSLog (@"%@", [error localizedDescription]); + } else { + NSLog (@"%@: %@", message, [error localizedDescription]); + } +} + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/NSFileManager+Utils.h b/tikzit-1/src/common/NSFileManager+Utils.h new file mode 100644 index 0000000..1349919 --- /dev/null +++ b/tikzit-1/src/common/NSFileManager+Utils.h @@ -0,0 +1,29 @@ +// +// NSFileManager+Utils.h +// TikZiT +// +// Copyright 2010 Alex Merry +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import + +@interface NSFileManager(Utils) +- (BOOL) ensureDirectoryExists:(NSString*)path error:(NSError**)error; +@end + +// vi:ft=objc:sts=4:sw=4:ts=4:noet diff --git a/tikzit-1/src/common/NSFileManager+Utils.m b/tikzit-1/src/common/NSFileManager+Utils.m new file mode 100644 index 0000000..87ede95 --- /dev/null +++ b/tikzit-1/src/common/NSFileManager+Utils.m @@ -0,0 +1,46 @@ +// +// NSFileManager+Utils.h +// TikZiT +// +// Copyright 2010 Alex Merry +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import "NSError+Tikzit.h" + +@implementation NSFileManager(Utils) +- (BOOL) ensureDirectoryExists:(NSString*)directory error:(NSError**)error { + BOOL isDirectory = NO; + if (![self fileExistsAtPath:directory isDirectory:&isDirectory]) { + if (![self createDirectoryAtPath:directory withIntermediateDirectories:YES attributes:nil error:error]) { + return NO; + } + } else if (!isDirectory) { + if (error) { + NSMutableDictionary *errorDetail = [NSMutableDictionary dictionary]; + [errorDetail setValue:@"Directory is a file" forKey:NSLocalizedDescriptionKey]; + [errorDetail setValue:directory forKey:NSFilePathErrorKey]; + *error = [NSError errorWithDomain:TZErrorDomain code:TZ_ERR_NOTDIRECTORY userInfo:errorDetail]; + } + return NO; + } + return YES; +} +@end + +// vi:ft=objc:sts=4:sw=4:ts=4:noet diff --git a/tikzit-1/src/common/NSString+LatexConstants.h b/tikzit-1/src/common/NSString+LatexConstants.h new file mode 100644 index 0000000..f4b5236 --- /dev/null +++ b/tikzit-1/src/common/NSString+LatexConstants.h @@ -0,0 +1,33 @@ +// +// NSString+LatexConstants.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import + + +@interface NSString(LatexConstants) + +- (NSString*)stringByExpandingLatexConstants; + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/NSString+LatexConstants.m b/tikzit-1/src/common/NSString+LatexConstants.m new file mode 100644 index 0000000..634c189 --- /dev/null +++ b/tikzit-1/src/common/NSString+LatexConstants.m @@ -0,0 +1,212 @@ +// +// NSString+LatexConstants.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "NSString+LatexConstants.h" + +// can't use sizeof() in non-fragile ABI (eg: clang) +#define texConstantCount 63 +static NSString *texConstantNames[texConstantCount] = { + @"alpha", + @"beta", + @"gamma", + @"delta", + @"epsilon", + @"zeta", + @"eta", + @"theta", + @"iota", + @"kappa", + @"lambda", + @"mu", + @"nu", + @"xi", + @"pi", + @"rho", + @"sigma", + @"tau", + @"upsilon", + @"phi", + @"chi", + @"psi", + @"omega", + @"Gamma", + @"Delta", + @"Theta", + @"Lambda", + @"Xi", + @"Pi", + @"Sigma", + @"Upsilon", + @"Phi", + @"Psi", + @"Omega", + + @"pm", + @"to", + @"Rightarrow", + @"Leftrightarrow", + @"forall", + @"partial", + @"exists", + @"emptyset", + @"nabla", + @"in", + @"notin", + @"prod", + @"sum", + @"surd", + @"infty", + @"wedge", + @"vee", + @"cap", + @"cup", + @"int", + @"approx", + @"neq", + @"equiv", + @"leq", + @"geq", + @"subset", + @"supset", + @"cdot", + @"ldots" +}; + +static char * texConstantCodes[texConstantCount] = { + "\u03b1","\u03b2","\u03b3","\u03b4","\u03b5","\u03b6","\u03b7", + "\u03b8","\u03b9","\u03ba","\u03bb","\u03bc","\u03bd","\u03be", + "\u03c0","\u03c1","\u03c3","\u03c4","\u03c5","\u03c6","\u03c7", + "\u03c8","\u03c9","\u0393","\u0394","\u0398","\u039b","\u039e", + "\u03a0","\u03a3","\u03a5","\u03a6","\u03a8","\u03a9", + + "\u00b1","\u2192","\u21d2","\u21d4","\u2200","\u2202","\u2203", + "\u2205","\u2207","\u2208","\u2209","\u220f","\u2211","\u221a", + "\u221e","\u2227","\u2228","\u2229","\u222a","\u222b","\u2248", + "\u2260","\u2261","\u2264","\u2265","\u2282","\u2283","\u22c5", + "\u2026" +}; + +#define texModifierCount 10 +static NSString *texModifierNames[texModifierCount] = { + @"tiny", + @"scriptsize", + @"footnotesize", + @"small", + @"normalsize", + @"large", + @"Large", + @"LARGE", + @"huge", + @"Huge" +}; + +static NSDictionary *texConstants = nil; +static NSSet *texModifiers = nil; + +@implementation NSString(LatexConstants) + +- (NSString*)stringByExpandingLatexConstants { + + if (texConstants == nil) { + NSMutableDictionary *constants = [[NSMutableDictionary alloc] initWithCapacity:texConstantCount]; + for (int i = 0; i < texConstantCount; ++i) { + [constants setObject:[NSString stringWithUTF8String:texConstantCodes[i]] forKey:texConstantNames[i]]; + } + texConstants = constants; + } + if (texModifiers == nil) { + texModifiers = [[NSSet alloc] initWithObjects:texModifierNames count:texModifierCount]; + } + + NSMutableString *buf = [[NSMutableString alloc] initWithCapacity:[self length]]; + NSMutableString *wordBuf = [[NSMutableString alloc] initWithCapacity:10]; + + unichar c_a = [@"a" characterAtIndex:0]; + unichar c_z = [@"z" characterAtIndex:0]; + unichar c_A = [@"A" characterAtIndex:0]; + unichar c_Z = [@"Z" characterAtIndex:0]; + + int state = 0; + // a tiny little DFA to replace \\([\w*]) with unicode of $1 + unichar c; + NSString *code; + int i; + for (i = 0; i<[self length]; ++i) { + c = [self characterAtIndex:i]; + switch (state) { + case 0: + if (c=='\\') { + state = 1; + } else if (c!='$') { + [buf appendFormat:@"%C", c]; + } + break; + case 1: + if ((c>=c_a && c<=c_z) || (c>=c_A && c<=c_Z)) { + [wordBuf appendFormat:@"%C", c]; + } else { + code = [texConstants objectForKey:wordBuf]; + if (code != nil) { + [buf appendString:code]; + } else if (![texModifiers containsObject:wordBuf]) { + [buf appendFormat:@"\\%@", wordBuf]; + } + + [wordBuf setString:@""]; + if (c=='\\') { + state = 1; + } else { + if (c!='$') { + [buf appendFormat:@"%C", c]; + } + state = 0; + } + + } + break; + } + } + + if (state == 1) { + code = [texConstants objectForKey:wordBuf]; + if (code != nil) { + [buf appendString:code]; + } else if (![texModifiers containsObject:wordBuf]) { + [buf appendFormat:@"\\%@", wordBuf]; + } + } + + NSString *ret = [buf copy]; +#if __has_feature(objc_arc) + return ret; +#else + [buf release]; + [wordBuf release]; + + return [ret autorelease]; +#endif +} + +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/NSString+Tikz.h b/tikzit-1/src/common/NSString+Tikz.h new file mode 100644 index 0000000..ea6ea40 --- /dev/null +++ b/tikzit-1/src/common/NSString+Tikz.h @@ -0,0 +1,26 @@ +/* + * Copyright 2013 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import + +@interface NSString (Tikz) + - (NSString*) tikzEscapedString; + - (BOOL) isValidTikzPropertyNameOrValue; + - (BOOL) isValidAnchor; +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/NSString+Tikz.m b/tikzit-1/src/common/NSString+Tikz.m new file mode 100644 index 0000000..1e3073b --- /dev/null +++ b/tikzit-1/src/common/NSString+Tikz.m @@ -0,0 +1,72 @@ +/* + * Copyright 2013 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "NSString+Tikz.h" +#import "TikzGraphAssembler.h" + +@implementation NSString (Tikz) + +- (NSString*) tikzEscapedString { + static NSCharacterSet *avoid = nil; + if (avoid == nil) +#if __has_feature(objc_arc) + avoid = [[NSCharacterSet characterSetWithCharactersInString:@"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ<>-'0123456789. "] invertedSet]; +#else + avoid = [[[NSCharacterSet characterSetWithCharactersInString:@"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ<>-'0123456789. "] invertedSet] retain]; +#endif + + + if ([self rangeOfCharacterFromSet:avoid].length > 0) { + return [NSString stringWithFormat:@"{%@}", self]; + } else { +#if __has_feature(objc_arc) + return self; +#else + return [[self retain] autorelease]; +#endif + } +} + +- (BOOL) isValidTikzPropertyNameOrValue { + NSUInteger length = [self length]; + unsigned int brace_depth = 0; + unsigned int escape = 0; + for (NSUInteger i = 0; i < length; ++i) { + unichar c = [self characterAtIndex:i]; + + if (escape) { + escape = 0; + } else if (c == '\\') { + escape = 1; + } else if (c == '{') { + brace_depth++; + } else if (c == '}') { + if (brace_depth == 0) + return NO; + brace_depth--; + } + } + return !escape && brace_depth == 0; +} + +- (BOOL) isValidAnchor { + return [TikzGraphAssembler validateTikzEdgeAnchor:self]; +} + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/NSString+Util.h b/tikzit-1/src/common/NSString+Util.h new file mode 100644 index 0000000..548edb3 --- /dev/null +++ b/tikzit-1/src/common/NSString+Util.h @@ -0,0 +1,27 @@ +/* + * Copyright 2013 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import + +@interface NSString (Util) + + (NSString*) stringWithContentsOfFile:(NSString*)path + error:(NSError**)error; + - (id) initWithContentsOfFile:(NSString*)path + error:(NSError**)error; +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/NSString+Util.m b/tikzit-1/src/common/NSString+Util.m new file mode 100644 index 0000000..b18f397 --- /dev/null +++ b/tikzit-1/src/common/NSString+Util.m @@ -0,0 +1,66 @@ +/* + * Copyright 2013 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import +#import "NSString+Util.h" +#import "NSError+Tikzit.h" + +@implementation NSString (Util) ++ (NSString*) stringWithContentsOfFile:(NSString*)path + error:(NSError**)error +{ + return [[[self alloc] initWithContentsOfFile:path error:error] autorelease]; +} +- (id) initWithContentsOfFile:(NSString*)path + error:(NSError**)error +{ + // Fun fact: on GNUstep, at least, + // [stringWithContentsOfFile:usedEncoding:error:] only + // sets error objects if the decoding fails, not if file + // access fails. + // Fun fact 2: on GNUstep, trying to read a directory using + // [stringWithContentsOfFile:] causes an out-of-memory error; + // hence we do these checks *before* trying to read the file. + NSFileManager *fm = [NSFileManager defaultManager]; + BOOL isDir = NO; + NSString *msg = nil; + if (![fm fileExistsAtPath:path isDirectory:&isDir]) { + msg = [NSString stringWithFormat:@"\"%@\" does not exist", path]; + } else if (isDir) { + msg = [NSString stringWithFormat:@"\"%@\" is a directory", path]; + } else if (![fm isReadableFileAtPath:path]) { + msg = [NSString stringWithFormat:@"\"%@\" is not readable", path]; + } + if (msg != nil) { + if (error) { + *error = [NSError errorWithMessage:msg + code:TZ_ERR_IO]; + } + return nil; + } + self = [self initWithContentsOfFile:path]; + if (self == nil) { + if (error) { + *error = [NSError errorWithMessage:@"unknown error" + code:TZ_ERR_IO]; + } + } + return self; +} +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/Node.h b/tikzit-1/src/common/Node.h new file mode 100644 index 0000000..1e580ce --- /dev/null +++ b/tikzit-1/src/common/Node.h @@ -0,0 +1,181 @@ +// +// Node.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + + +// Node : store the data associated with a node. + +#import + +#import "NodeStyle.h" +#import "GraphElementData.h" + +@class GraphElementProperty; +@class Shape; +@class Transformer; + +/*! + @class Node + @brief A graph node, with associated location and style data. + */ +@interface Node : NSObject { + NSPoint point; + NodeStyle *style; + NSString *name; + NSString *label; + GraphElementData *data; +} + +/*! + @property shape + @brief The shape to use + @detail This is a convenience property that resolves the shape name + from the style, and uses a circle if there is no style. + + This property is NOT KVO-compliant + */ +@property (readonly) Shape *shape; + +/*! + @property point + @brief The point where this node is located. + */ +@property (assign) NSPoint point; + +/*! + @property style + @brief The style of this node. + */ +@property (retain) NodeStyle *style; + +/*! + @property name + @brief The name of this node. This is a temporary name and may change between + successive TikZ outputs. + */ +@property (copy) NSString *name; + +/*! + @property label + @brief The latex label that appears on this node. + */ +@property (copy) NSString *label; + +/*! + @property data + @brief Associated extra data. + */ +@property (copy) GraphElementData *data; + +// KVC methods +- (void) insertObject:(GraphElementProperty*)gep + inDataAtIndex:(NSUInteger)index; +- (void) removeObjectFromDataAtIndex:(NSUInteger)index; +- (void) replaceObjectInDataAtIndex:(NSUInteger)index + withObject:(GraphElementProperty*)gep; + +/*! + @brief Initialize a new node with the given point. + @param p a point. + @result A node. + */ +- (id)initWithPoint:(NSPoint)p; + +/*! + @brief Initialize a new node at (0,0). + @result A node. + */ +- (id)init; + +/*! + @brief Composes the shape transformer with another transformer + @param t The transform to apply before the shape transform + @result A transformer that first maps according to t, then according + to -shapeTransformer. + */ +- (Transformer*) shapeTransformerFromTransformer:(Transformer*)t; + +/*! + @brief A transformer that may be used to convert the shape to the + right position and scale + */ +- (Transformer*) shapeTransformer; + +/*! + @brief The bounding rect in the given co-ordinate system + @detail This is the bounding rect of the shape (after being + suitably translated and scaled). The label is not + considered. + @param shapeTrans The mapping from graph co-ordinates to the required + co-ordinates + @result The bounding rectangle + */ +- (NSRect) boundsUsingShapeTransform:(Transformer*)shapeTrans; + +/*! + @brief The bounding rect in graph co-ordinates + @detail This is the bounding rect of the shape (after being suitably + translated and scaled). The label is not considered. + */ +- (NSRect) boundingRect; + +/*! + @brief Try to attach a style of the correct name from the given style list. + @param styles an array of styles. + @result YES if successfully attached, NO otherwise. + */ +- (BOOL)attachStyleFromTable:(NSArray*)styles; + +/*! + @brief Set node properties from GraphElementData. + */ +- (void)updateData; + +/*! + @brief Set properties of this node to match the given node. + @param nd a node to mimic. + */ +- (void)setPropertiesFromNode:(Node *)nd; + +/*! + @brief Compare a node to another node using a lex ordering on coordinates. + @param nd another node. + @result A comparison result. + */ +- (NSComparisonResult)compareTo:(id)nd; + +/*! + @brief Factory method to construct a node with the given point. + @param p a point. + @result A node. + */ ++ (Node*)nodeWithPoint:(NSPoint)p; + +/*! + @brief Factory method to construct a node at (0,0). + @result A node. + */ ++ (Node*)node; + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/Node.m b/tikzit-1/src/common/Node.m new file mode 100644 index 0000000..c5b11d1 --- /dev/null +++ b/tikzit-1/src/common/Node.m @@ -0,0 +1,214 @@ +// +// Node.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "Node.h" + +#import "Shape.h" + + +@implementation Node + +- (id)initWithPoint:(NSPoint)p { + self = [super init]; + if (self) { + data = [[GraphElementData alloc] init]; + style = nil; + label = @""; + point = p; + } + return self; +} + +- (id)init { + return [self initWithPoint:NSMakePoint(0.0f, 0.0f)]; +} + +- (id)copyWithZone:(NSZone*)z { + Node *cp = [[Node allocWithZone:z] init]; + [cp setPropertiesFromNode:self]; + return cp; +} + +- (void)dealloc { +#if ! __has_feature(objc_arc) + [name release]; + [style release]; + [data release]; + [label release]; + [super dealloc]; +#endif +} + +- (Shape*) shape { + if (style) { + return [Shape shapeForName:[style shapeName]]; + } else { + return nil; + } +} + +- (Transformer*) shapeTransformerFromTransformer:(Transformer*)t { + // we take a copy to keep the reflection attributes +#if ! __has_feature(objc_arc) + Transformer *transformer = [[t copy] autorelease]; +#else + Transformer *transformer = [t copy]; +#endif + NSPoint screenPos = [t toScreen:point]; + [transformer setOrigin:screenPos]; + float scale = [t scale]; + if (style) { + scale *= [style scale]; + } + [transformer setScale:scale]; + return transformer; +} + +- (Transformer*) shapeTransformer { + float scale = 1.0f; + if (style) { + scale = [style scale]; + } + return [Transformer transformerWithOrigin:point andScale:scale]; +} + +- (NSRect) boundsUsingShapeTransform:(Transformer*)shapeTrans { + //if (style) { + return [shapeTrans rectToScreen:[[self shape] boundingRect]]; + /*} else { + NSRect r = NSZeroRect; + r.origin = [shapeTrans toScreen:[self point]]; + return r; + }*/ +} + +- (NSRect) boundingRect { + return [self boundsUsingShapeTransform:[self shapeTransformer]]; +} + +- (BOOL)attachStyleFromTable:(NSArray*)styles { +#if __has_feature(objc_arc) + NSString *style_name = [data propertyForKey:@"style"]; +#else + NSString *style_name = [[[data propertyForKey:@"style"] retain] autorelease]; +#endif + + [self setStyle:nil]; + + // 'none' is a reserved style + if (style_name == nil || [style_name isEqualToString:@"none"]) return YES; + + for (NodeStyle *s in styles) { + if ([[s name] compare:style_name]==NSOrderedSame) { + [self setStyle:s]; + return YES; + } + } + + // if we didn't find a style, fill in a default one + [self setStyle:[NodeStyle defaultNodeStyleWithName:style_name]]; + return NO; +} + +- (void)updateData { + if (style == nil) { + [data setProperty:@"none" forKey:@"style"]; + } else { + [data setProperty:[style name] forKey:@"style"]; + } +} + +- (void)setPropertiesFromNode:(Node*)nd { + [self setPoint:[nd point]]; + [self setStyle:[nd style]]; + [self setName:[nd name]]; + [self setData:[nd data]]; + [self setLabel:[nd label]]; +} + ++ (Node*)nodeWithPoint:(NSPoint)p { +#if __has_feature(objc_arc) + return [[Node alloc] initWithPoint:p]; +#else + return [[[Node alloc] initWithPoint:p] autorelease]; +#endif +} + ++ (Node*)node { +#if __has_feature(objc_arc) + return [[Node alloc] init]; +#else + return [[[Node alloc] init] autorelease]; +#endif +} + + +// perform a lexicographic ordering (-y, x) on coordinates. +- (NSComparisonResult)compareTo:(id)nd { + Node *node = (Node*)nd; + if (point.y > [node point].y) return NSOrderedAscending; + else if (point.y < [node point].y) return NSOrderedDescending; + else { + if (point.x < [node point].x) return NSOrderedAscending; + else if (point.x > [node point].x) return NSOrderedDescending; + else return NSOrderedSame; + } +} + +@synthesize name; +@synthesize label; +@synthesize point; + +@synthesize data; +- (void) insertObject:(GraphElementProperty*)gep + inDataAtIndex:(NSUInteger)index { + [data insertObject:gep atIndex:index]; +} +- (void) removeObjectFromDataAtIndex:(NSUInteger)index { + [data removeObjectAtIndex:index]; +} +- (void) replaceObjectInDataAtIndex:(NSUInteger)index + withObject:(GraphElementProperty*)gep { + [data replaceObjectAtIndex:index withObject:gep]; +} + +- (NodeStyle*)style { + return style; +} + +- (void)setStyle:(NodeStyle *)st { + if (style != st) { +#if __has_feature(objc_arc) + style = st; +#else + NodeStyle *oldStyle = style; + style = [st retain]; + [oldStyle release]; +#endif + } + [self updateData]; +} + +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/NodeStyle.h b/tikzit-1/src/common/NodeStyle.h new file mode 100644 index 0000000..034f95d --- /dev/null +++ b/tikzit-1/src/common/NodeStyle.h @@ -0,0 +1,125 @@ +// +// NodeStyle.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "util.h" +#import "ColorRGB.h" +#import "PropertyHolder.h" + +/*! + @class NodeStyle + @brief Store node style information. + @details Store node style information. These properties affect how a node + is displayed in TikZiT. Colors are stored in the ColorRGB struct + to avoid any Cocoa dependency. These styles should be persistant, + which should be implemented in a platform-specific category. For + OS X, this is NodeStyle+Coder. + */ +@interface NodeStyle : PropertyHolder { + int strokeThickness; + float scale; + ColorRGB *strokeColorRGB; + ColorRGB *fillColorRGB; + NSString *name; + NSString *shapeName; + NSString *category; +} + +/*! + @property strokeThickness + @brief Thickness of the stroke. + */ +@property (assign) int strokeThickness; + +/*! + @property scale + @brief Overall scale of the shape. Defaults to 1.0. + */ +@property (assign) float scale; + + +/*! + @property strokeColorRGB + @brief The stroke color used to render the node + */ +@property (copy) ColorRGB *strokeColorRGB; + +/*! + @property fillColorRGB + @brief The fill color used to render the node + */ +@property (copy) ColorRGB *fillColorRGB; + +/*! + @property name + @brief Style name. + @details Style name. This is the only thing that affects how the node + will look when the latex code is rendered. + */ +@property (copy) NSString *name; + +/*! + @property shapeName + @brief The name of the shape that will be drawn in TikZiT. + */ +@property (copy) NSString *shapeName; + +/*! + @property category + @brief ??? + */ +@property (copy) NSString *category; + +@property (readonly) NSString *tikz; +@property (readonly) BOOL strokeColorIsKnown; +@property (readonly) BOOL fillColorIsKnown; + ++ (int) defaultStrokeThickness; + +/*! + @brief Designated initializer. Construct a blank style with name 'new'. + @result A default style. + */ +- (id)init; + +/*! + @brief Create a named style. + @param nm the style name. + @result A NodeStyle with the given name. + */ +- (id)initWithName:(NSString *)nm; + +/*! + @brief Factory method for initWithName: + @param nm the style name. + @result A NodeStyle with the given name. + */ ++ (NodeStyle*)defaultNodeStyleWithName:(NSString *)nm; + +/*! + * Make this style the same as the given one + */ +- (void) updateFromStyle:(NodeStyle*)style; + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/NodeStyle.m b/tikzit-1/src/common/NodeStyle.m new file mode 100644 index 0000000..193d44d --- /dev/null +++ b/tikzit-1/src/common/NodeStyle.m @@ -0,0 +1,246 @@ +// +// NodeStyle.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "NodeStyle.h" +#import "Shape.h" +#import "ShapeNames.h" + +@implementation NodeStyle + ++ (void)initialize { + [self setKeys:[NSArray arrayWithObjects: + @"fillColorRGB.red", + @"fillColorRGB.blue", + @"fillColorRGB.green", + @"strokeColorRGB.red", + @"strokeColorRGB.blue", + @"strokeColorRGB.green", + @"strokeThickness", + @"shapeName", + @"name", + nil] + triggerChangeNotificationsForDependentKey:@"tikz"]; + [self setKeys:[NSArray arrayWithObjects: + @"fillColorRGB.name", + nil] + triggerChangeNotificationsForDependentKey:@"fillColorIsKnown"]; + [self setKeys:[NSArray arrayWithObjects: + @"strokeColorRGB.name", + nil] + triggerChangeNotificationsForDependentKey:@"strokeColorIsKnown"]; +} + ++ (int) defaultStrokeThickness { return 1; } + +- (id)initWithName:(NSString*)nm { + self = [super initWithNotificationName:@"NodeStylePropertyChanged"]; + if (self != nil) { + strokeThickness = [NodeStyle defaultStrokeThickness]; + scale = 1.0f; + strokeColorRGB = [[ColorRGB alloc] initWithRed:0 green:0 blue:0]; + fillColorRGB = [[ColorRGB alloc] initWithRed:255 green:255 blue:255]; + + name = nm; + category = nil; + shapeName = SHAPE_CIRCLE; + } + return self; +} + +- (id)init { + self = [self initWithName:@"new"]; + return self; +} + +- (id)copyWithZone:(NSZone*)zone { + NodeStyle *style = [[NodeStyle allocWithZone:zone] init]; + + [style setStrokeThickness:[self strokeThickness]]; + [style setScale:[self scale]]; + [style setStrokeColorRGB:[self strokeColorRGB]]; + [style setFillColorRGB:[self fillColorRGB]]; + [style setName:[self name]]; + [style setShapeName:[self shapeName]]; + [style setCategory:[self category]]; + + return style; +} + +- (void)dealloc { +#if ! __has_feature(objc_arc) + [name release]; + [category release]; + [shapeName release]; + [strokeColorRGB release]; + [fillColorRGB release]; + [super dealloc]; +#endif +} + +- (NSString*) description { + return [NSString stringWithFormat:@"Node style \"%@\"", name]; +} + +- (void) updateFromStyle:(NodeStyle*)style { + [self setStrokeThickness:[style strokeThickness]]; + [self setScale:[style scale]]; + [self setStrokeColorRGB:[style strokeColorRGB]]; + [self setFillColorRGB:[style fillColorRGB]]; + [self setName:[style name]]; + [self setShapeName:[style shapeName]]; + [self setCategory:[style category]]; +} + ++ (NodeStyle*)defaultNodeStyleWithName:(NSString*)nm { +#if __has_feature(objc_arc) + return [[NodeStyle alloc] initWithName:nm]; +#else + return [[[NodeStyle alloc] initWithName:nm] autorelease]; +#endif +} + +- (NSString*)name { + return name; +} + +- (void)setName:(NSString *)s { + if (name != s) { + NSString *oldValue = name; + name = [s copy]; + [self postPropertyChanged:@"name" oldValue:oldValue]; +#if ! __has_feature(objc_arc) + [oldValue release]; +#endif + } +} + +- (NSString*)shapeName { + return shapeName; +} + +- (void)setShapeName:(NSString *)s { + if (shapeName != s) { + NSString *oldValue = shapeName; + shapeName = [s copy]; + [self postPropertyChanged:@"shapeName" oldValue:oldValue]; +#if ! __has_feature(objc_arc) + [oldValue release]; +#endif + } +} + +- (NSString*)category { + return category; +} + +- (void)setCategory:(NSString *)s { + if (category != s) { + NSString *oldValue = category; + category = [s copy]; + [self postPropertyChanged:@"category" oldValue:oldValue]; +#if ! __has_feature(objc_arc) + [oldValue release]; +#endif + } +} + +- (int)strokeThickness { return strokeThickness; } +- (void)setStrokeThickness:(int)i { + int oldValue = strokeThickness; + strokeThickness = i; + [self postPropertyChanged:@"strokeThickness" oldValue:[NSNumber numberWithInt:oldValue]]; +} + +- (float)scale { return scale; } +- (void)setScale:(float)s { + float oldValue = scale; + scale = s; + [self postPropertyChanged:@"scale" oldValue:[NSNumber numberWithFloat:oldValue]]; +} + +- (ColorRGB*)strokeColorRGB { + return strokeColorRGB; +} + +- (void)setStrokeColorRGB:(ColorRGB*)c { + if (strokeColorRGB != c) { + ColorRGB *oldValue = strokeColorRGB; + strokeColorRGB = [c copy]; + [self postPropertyChanged:@"strokeColorRGB" oldValue:oldValue]; +#if ! __has_feature(objc_arc) + [oldValue release]; +#endif + } +} + +- (ColorRGB*)fillColorRGB { + return fillColorRGB; +} + +- (void)setFillColorRGB:(ColorRGB*)c { + if (fillColorRGB != c) { + ColorRGB *oldValue = fillColorRGB; + fillColorRGB = [c copy]; + [self postPropertyChanged:@"fillColorRGB" oldValue:oldValue]; +#if ! __has_feature(objc_arc) + [oldValue release]; +#endif + } +} + +- (NSString*)tikz { + NSString *fillName = [fillColorRGB name]; + NSString *strokeName = [strokeColorRGB name]; + NSString *stroke = @""; + if (strokeThickness != 1) { + stroke = [NSString stringWithFormat:@",line width=%@ pt", + [NSNumber numberWithFloat:(float)strokeThickness * 0.4f]]; + } + + // If the colors are unknown, fall back on hexnames. These should be defined as colors + // in the Preambles class. + if (fillName == nil) fillName = [fillColorRGB hexName]; + if (strokeName == nil) strokeName = [strokeColorRGB hexName]; + + NSString *shapeDesc = [[Shape shapeForName:shapeName] styleTikz]; + if (shapeDesc == nil) shapeDesc = shapeName; + + return [NSString stringWithFormat:@"\\tikzstyle{%@}=[%@,fill=%@,draw=%@%@]", + name, + shapeDesc, + fillName, + strokeName, + stroke]; +} + +- (BOOL)strokeColorIsKnown { + return ([strokeColorRGB name] != nil); +} + +- (BOOL)fillColorIsKnown { + return ([fillColorRGB name] != nil); +} + +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/PickSupport.h b/tikzit-1/src/common/PickSupport.h new file mode 100644 index 0000000..0749649 --- /dev/null +++ b/tikzit-1/src/common/PickSupport.h @@ -0,0 +1,164 @@ +// +// PickSupport.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + + +#import +#import "Node.h" +#import "Edge.h" + +/*! + @class PickSupport + @brief Maintain the selection state of nodes and edges. + @detail In addition to the notifications listed for specific methods, + whenever the node selection changes, a "NodeSelectionChanged" + signal is emitted, and whenever the edge selection changes, + an "EdgeSelectionChanged" signal is emitted. + */ +@interface PickSupport : NSObject { + NSMutableSet *selectedNodes; + NSMutableSet *selectedEdges; +} + +/*! + @property selectedNodes + @brief A set of selected nodes. + */ +@property (readonly) NSSet *selectedNodes; + +// KVC methods +- (void)addSelectedNodesObject:(Node*)node; +- (void)addSelectedNodes:(NSSet*)nodes; +- (void)removeSelectedNodesObject:(Node*)node; +- (void)removeSelectedNodes:(NSSet*)nodes; + +/*! + @property selectedEdges + @brief A set of selected edges. + */ +@property (readonly) NSSet *selectedEdges; + +// KVC methods +- (void)addSelectedEdgesObject:(Edge*)edge; +- (void)addSelectedEdges:(NSSet*)edges; +- (void)removeSelectedEdgesObject:(Edge*)edge; +- (void)removeSelectedEdges:(NSSet*)edges; + +/*! + @brief Check if a node is selected. + @param nd a node. + @result YES if nd is selected. + */ +- (BOOL)isNodeSelected:(Node*)nd; + +/*! + @brief Check if an edge is selected. + @param e an edge. + @result YES if e is selected. + */ +- (BOOL)isEdgeSelected:(Edge*)e; + +/*! + @brief Select a node. + @details Sends the "NodeSelected" notification if the node was not + already selected, with @p nd as "node" in the userInfo + @param nd a node. + */ +- (void)selectNode:(Node*)nd; + +/*! + @brief Deselect a node. + @details Sends the "NodeDeselected" notification if the node was + selected, with @p nd as "node" in the userInfo + @param nd a node. + */ +- (void)deselectNode:(Node*)nd; + +/*! + @brief Select an edge. + @details Sends the "EdgeSelected" notification if the node was not + already selected, with @p e as "edge" in the userInfo + @param e an edge. + */ +- (void)selectEdge:(Edge*)e; + +/*! + @brief Deselect an edge. + @details Sends the "EdgeDeselected" notification if the node was + selected, with @p e as "edge" in the userInfo + @param e an edge. + */ +- (void)deselectEdge:(Edge*)e; + +/*! + @brief Toggle the selected state of the given node. + @details Sends the "NodeSelected" or "NodeDeselected" notification as + appropriate, with @p nd as "node" in the userInfo + @param nd a node. + */ +- (void)toggleNodeSelected:(Node*)nd; + +/*! + @brief Select all nodes in the given set. + @details Sends the "NodeSelectionReplaced" notification if this + caused the selection to change. + + Equivalent to selectAllNodes:nodes replacingSelection:YES + @param nodes a set of nodes. + */ +- (void)selectAllNodes:(NSSet*)nodes; + +/*! + @brief Select all nodes in the given set. + @details Sends the "NodeSelectionReplaced" notification if this + caused the selection to change. + + If replace is NO, @p nodes will be added to the existing + selection, otherwise it will replace the existing selection. + @param nodes a set of nodes. + @param replace whether to replace the existing selection + */ +- (void)selectAllNodes:(NSSet*)nodes replacingSelection:(BOOL)replace; + +/*! + @brief Deselect all nodes. + @details Sends the "NodeSelectionReplaced" notification if there + were any nodes previously selected + */ +- (void)deselectAllNodes; + +/*! + @brief Deselect all edges. + @details Sends the "EdgeSelectionReplaced" notification if there + were any edges previously selected + */ +- (void)deselectAllEdges; + +/*! + @brief Factory method for getting a new PickSupport object. + @result An empty PickSupport. + */ ++ (PickSupport*)pickSupport; + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/PickSupport.m b/tikzit-1/src/common/PickSupport.m new file mode 100644 index 0000000..560fc2c --- /dev/null +++ b/tikzit-1/src/common/PickSupport.m @@ -0,0 +1,232 @@ +// +// PickSupport.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "PickSupport.h" + + +@implementation PickSupport + +- (void) postNodeSelectionChanged { + [[NSNotificationCenter defaultCenter] + postNotificationName:@"NodeSelectionChanged" + object:self]; +} + +- (void) postEdgeSelectionChanged { + [[NSNotificationCenter defaultCenter] + postNotificationName:@"EdgeSelectionChanged" + object:self]; +} + +- (id) init { + self = [super init]; + + if (self) { +#if __has_feature(objc_arc) + selectedNodes = [NSMutableSet set]; + selectedEdges = [NSMutableSet set]; +#else + selectedNodes = [[NSMutableSet set] retain]; + selectedEdges = [[NSMutableSet set] retain]; +#endif + } + + return self; +} + ++ (PickSupport*)pickSupport { +#if __has_feature(objc_arc) + return [[PickSupport alloc] init]; +#else + return [[[PickSupport alloc] init] autorelease]; +#endif +} + +@synthesize selectedNodes; +- (void)addSelectedNodesObject:(Node*)node { + return [self selectNode:node]; +} +- (void)addSelectedNodes:(NSSet*)nodes { + return [self selectAllNodes:nodes replacingSelection:NO]; +} +- (void)removeSelectedNodesObject:(Node*)node { + return [self deselectNode:node]; +} +- (void)removeSelectedNodes:(NSSet*)nodes { + if ([selectedNodes count] > 0) { + [selectedNodes minusSet:nodes]; + [[NSNotificationCenter defaultCenter] + postNotificationName:@"NodeSelectionReplaced" + object:self]; + [self postNodeSelectionChanged]; + } +} + +@synthesize selectedEdges; +- (void)addSelectedEdgesObject:(Edge*)edge { + return [self selectEdge:edge]; +} +- (void)addSelectedEdges:(NSSet*)edges { + if (selectedEdges == edges) { + return; + } + if ([edges count] == 0) { + return; + } + + [selectedEdges unionSet:edges]; + [[NSNotificationCenter defaultCenter] + postNotificationName:@"EdgeSelectionReplaced" + object:self]; + [self postEdgeSelectionChanged]; +} +- (void)removeSelectedEdgesObject:(Edge*)edge { + return [self deselectEdge:edge]; +} +- (void)removeSelectedEdges:(NSSet*)edges { + if ([selectedEdges count] > 0 && [edges count] > 0) { + [selectedEdges minusSet:edges]; + [[NSNotificationCenter defaultCenter] + postNotificationName:@"EdgeSelectionReplaced" + object:self]; + [self postEdgeSelectionChanged]; + } +} + +- (BOOL)isNodeSelected:(Node*)nd { + return [selectedNodes containsObject:nd]; +} + +- (BOOL)isEdgeSelected:(Edge*)e { + return [selectedEdges containsObject:e]; +} + +- (void)selectNode:(Node*)nd { + if (nd != nil && ![selectedNodes member:nd]) { + [selectedNodes addObject:nd]; + [[NSNotificationCenter defaultCenter] + postNotificationName:@"NodeSelected" + object:self + userInfo:[NSDictionary dictionaryWithObject:nd forKey:@"node"]]; + [self postNodeSelectionChanged]; + } +} + +- (void)deselectNode:(Node*)nd { + if (nd != nil && [selectedNodes member:nd]) { + [selectedNodes removeObject:nd]; + [[NSNotificationCenter defaultCenter] + postNotificationName:@"NodeDeselected" + object:self + userInfo:[NSDictionary dictionaryWithObject:nd forKey:@"node"]]; + [self postNodeSelectionChanged]; + } +} + +- (void)selectEdge:(Edge*)e { + if (e != nil && ![selectedEdges member:e]) { + [selectedEdges addObject:e]; + [[NSNotificationCenter defaultCenter] + postNotificationName:@"EdgeSelected" + object:self + userInfo:[NSDictionary dictionaryWithObject:e forKey:@"edge"]]; + [self postEdgeSelectionChanged]; + } +} + +- (void)deselectEdge:(Edge*)e { + if (e != nil && [selectedEdges member:e]) { + [selectedEdges removeObject:e]; + [[NSNotificationCenter defaultCenter] + postNotificationName:@"EdgeDeselected" + object:self + userInfo:[NSDictionary dictionaryWithObject:e forKey:@"edge"]]; + [self postEdgeSelectionChanged]; + } +} + +- (void)toggleNodeSelected:(Node*)nd { + if ([self isNodeSelected:nd]) + [self deselectNode:nd]; + else + [self selectNode:nd]; +} + +- (void)selectAllNodes:(NSSet*)nodes { + [self selectAllNodes:nodes replacingSelection:YES]; +} + +- (void)selectAllNodes:(NSSet*)nodes replacingSelection:(BOOL)replace { + if (selectedNodes == nodes) { + return; + } + if (!replace && [nodes count] == 0) { + return; + } + + if (replace) { +#if ! __has_feature(objc_arc) + [selectedNodes release]; +#endif + selectedNodes = [nodes mutableCopy]; + } else { + [selectedNodes unionSet:nodes]; + } + [[NSNotificationCenter defaultCenter] + postNotificationName:@"NodeSelectionReplaced" + object:self]; + [self postNodeSelectionChanged]; +} + +- (void)deselectAllNodes { + if ([selectedNodes count] > 0) { + [selectedNodes removeAllObjects]; + [[NSNotificationCenter defaultCenter] + postNotificationName:@"NodeSelectionReplaced" + object:self]; + [self postNodeSelectionChanged]; + } +} + +- (void)deselectAllEdges { + if ([selectedEdges count] > 0) { + [selectedEdges removeAllObjects]; + [[NSNotificationCenter defaultCenter] + postNotificationName:@"EdgeSelectionReplaced" + object:self]; + [self postEdgeSelectionChanged]; + } +} + +- (void)dealloc { +#if ! __has_feature(objc_arc) + [selectedNodes release]; + [selectedEdges release]; + + [super dealloc]; +#endif +} + +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/Preambles.h b/tikzit-1/src/common/Preambles.h new file mode 100644 index 0000000..2fb084a --- /dev/null +++ b/tikzit-1/src/common/Preambles.h @@ -0,0 +1,73 @@ +// +// Preambles.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// Copyright 2011 Alex Merry. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import "StyleManager.h" + +@class Graph; + +@interface Preambles : NSObject { + NSMutableDictionary *preambleDict; + NSString *selectedPreambleName; + NSArray *styles; + NSArray *edges; + StyleManager *styleManager; +} + +@property (copy) NSString *selectedPreambleName; +@property (retain) NSString *currentPreamble; +@property (retain) StyleManager *styleManager; +@property (readonly) NSMutableDictionary *preambleDict; + ++ (Preambles*)preambles; +- (id)init; +- (void)setStyles:(NSArray*)sty; +- (void)setEdges:(NSArray*)edg; + +- (NSString*)preambleForName:(NSString*)name; +- (BOOL)setPreamble:(NSString*)content forName:(NSString*)name; + +- (NSString*)addPreamble; +- (NSString*)addPreambleWithNameBase:(NSString*)name; + +- (BOOL)renamePreambleFrom:(NSString*)old to:(NSString*)new; +- (BOOL)removePreamble:(NSString*)name; + +- (NSEnumerator*)customPreambleNameEnumerator; + +- (void)removeAllPreambles; + +- (BOOL)selectedPreambleIsDefault; + +- (NSString*)styleDefinitions; +- (NSString*)defaultPreamble; +- (NSString*)defaultPreambleName; +- (NSString*)currentPostamble; + +- (NSString*)buildDocumentForTikz:(NSString*)tikz; +- (NSString*)buildDocumentForGraph:(Graph*)g; + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/Preambles.m b/tikzit-1/src/common/Preambles.m new file mode 100644 index 0000000..922fc30 --- /dev/null +++ b/tikzit-1/src/common/Preambles.m @@ -0,0 +1,320 @@ +// +// Preambles.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "Preambles.h" +#import "NodeStyle.h" +#import "EdgeStyle.h" +#import "Graph.h" + +static NSString *DEF_PREAMBLE_START = +@"\\usepackage[svgnames]{xcolor}\n" +@"\\usepackage{tikz}\n" +@"\\usetikzlibrary{decorations.markings}\n" +@"\\usetikzlibrary{shapes.geometric}\n" +@"\n" +@"\\pgfdeclarelayer{edgelayer}\n" +@"\\pgfdeclarelayer{nodelayer}\n" +@"\\pgfsetlayers{edgelayer,nodelayer,main}\n" +@"\n" +@"\\tikzstyle{none}=[inner sep=0pt]\n"; + +static NSString *PREAMBLE_TAIL = +@"\n" +@"\\pagestyle{empty}\n" +@"\\usepackage[graphics,tightpage,active]{preview}\n" +@"\\PreviewEnvironment{tikzpicture}\n" +@"\\newlength{\\imagewidth}\n" +@"\\newlength{\\imagescale}\n" +@"\n" +@"\\begin{document}\n"; + +static NSString *POSTAMBLE = +@"\n" +@"\\end{document}\n"; + +@implementation Preambles + ++ (Preambles*)preambles { +#if __has_feature(objc_arc) + return [[self alloc] init]; +#else + return [[[self alloc] init] autorelease]; +#endif +} + +- (id)init { + self = [super init]; + if (self) { + selectedPreambleName = @"default"; + preambleDict = [[NSMutableDictionary alloc] initWithCapacity:1]; + [preambleDict setObject:[self defaultPreamble] forKey:@"custom"]; + styles = nil; + edges = nil; + styleManager = nil; + } + return self; +} + +- (void)dealloc { +#if ! __has_feature(objc_arc) + [selectedPreambleName release]; + [styles release]; + [styleManager release]; + [super dealloc]; +#endif +} + +- (NSString*)preambleForName:(NSString*)name { + if ([name isEqualToString:@"default"]) + return [self defaultPreamble]; + else + return [preambleDict objectForKey:name]; +} + +- (BOOL)setPreamble:(NSString*)content forName:(NSString*)name { + if ([name isEqualToString:@"default"]) + return NO; + [preambleDict setObject:content forKey:name]; + return YES; +} + +- (void)removeAllPreambles { + [preambleDict removeAllObjects]; +} + +- (NSEnumerator*)customPreambleNameEnumerator { + return [preambleDict keyEnumerator]; +} + +- (void)setStyles:(NSArray*)sty { +#if ! __has_feature(objc_arc) + [sty retain]; + [styles release]; +#endif + styles = sty; +} + +- (void)setEdges:(NSArray*)edg { +#if ! __has_feature(objc_arc) + [edg retain]; + [edges release]; +#endif + edges = edg; +} + +- (NSString*)styleDefinitions { + if (styleManager != nil) { + [self setStyles:[styleManager nodeStyles]]; + } +#if ! __has_feature(objc_arc) + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; +#endif + NSMutableString *buf = [NSMutableString string]; + NSMutableString *colbuf = [NSMutableString string]; + NSMutableSet *colors = [NSMutableSet setWithCapacity:2*[styles count]]; + for (NodeStyle *st in styles) { + [buf appendFormat:@"%@\n", [st tikz]]; + ColorRGB *fill = [st fillColorRGB]; + ColorRGB *stroke = [st strokeColorRGB]; + if ([fill name] == nil && ![colors containsObject:fill]) { + [colors addObject:fill]; + [colbuf appendFormat:@"\\definecolor{%@}{rgb}{%.3f,%.3f,%.3f}\n", + [fill hexName], [fill redFloat], [fill greenFloat], [fill blueFloat]]; + } + + if ([stroke name] == nil && ![colors containsObject:stroke]) { + [colors addObject:stroke]; + [colbuf appendFormat:@"\\definecolor{%@}{rgb}{%.3f,%.3f,%.3f}\n", + [stroke hexName], [stroke redFloat], [stroke greenFloat], [stroke blueFloat]]; + } + } + + if (styleManager != nil) { + [self setEdges:[styleManager edgeStyles]]; + } + + [buf appendString:@"\n"]; + for (EdgeStyle *st in edges) { + [buf appendFormat:@"%@\n", [st tikz]]; + ColorRGB *color = [st colorRGB]; + if (color != nil && [color name] == nil && ![colors containsObject:color]) { + [colors addObject:color]; + [colbuf appendFormat:@"\\definecolor{%@}{rgb}{%.3f,%.3f,%.3f}\n", + [color hexName], [color redFloat], [color greenFloat], [color blueFloat]]; + } + } + + NSString *defs = [[NSString alloc] initWithFormat:@"%@\n%@", colbuf, buf]; + +#if __has_feature(objc_arc) + return defs; +#else + [pool drain]; + return [defs autorelease]; +#endif +} + +- (NSString*)defaultPreamble { + return [NSString stringWithFormat:@"%@%@", + DEF_PREAMBLE_START, [self styleDefinitions]]; +} + +- (BOOL)selectedPreambleIsDefault { + return [selectedPreambleName isEqualToString:@"default"]; +} + +- (NSString*)selectedPreambleName { return selectedPreambleName; } +- (void)setSelectedPreambleName:(NSString *)sel { + if (sel != selectedPreambleName) { +#if ! __has_feature(objc_arc) + [selectedPreambleName release]; +#endif + selectedPreambleName = [sel copy]; + } +} + +- (NSString*)currentPreamble { + NSString *pre = [self preambleForName:selectedPreambleName]; + return (pre == nil) ? [self defaultPreamble] : pre; +} + +- (void)setCurrentPreamble:(NSString*)str { + if (![selectedPreambleName isEqualToString:@"default"]) + [preambleDict setObject:str forKey:selectedPreambleName]; +} + +- (StyleManager*)styleManager { + return styleManager; +} + +- (void)setStyleManager:(StyleManager *)manager { +#if ! __has_feature(objc_arc) + [manager retain]; + [styleManager release]; +#endif + styleManager = manager; +} + +- (NSString*)currentPostamble { + return POSTAMBLE; +} + +- (NSMutableDictionary*)preambleDict { + return preambleDict; +} + +- (NSString*)defaultPreambleName { + return @"default"; +} + +- (NSString*)addPreamble { + return [self addPreambleWithNameBase:@"new preamble"]; +} + +- (NSString*)addPreambleWithNameBase:(NSString*)base { + if ([preambleDict objectForKey:base] == nil) { + [self setPreamble:[self defaultPreamble] forName:base]; + return base; + } + int i = 0; + NSString *tryName = nil; + do { + ++i; + tryName = [NSString stringWithFormat:@"%@ %d", base, i]; + } while ([preambleDict objectForKey:tryName] != nil); + + [self setPreamble:[self defaultPreamble] forName:tryName]; + return tryName; +} + +- (BOOL)renamePreambleFrom:(NSString*)old to:(NSString*)new { + if ([old isEqualToString:@"default"]) + return NO; + if ([new isEqualToString:@"default"]) + return NO; + if ([old isEqualToString:new]) + return YES; + BOOL isSelected = NO; + if ([old isEqualToString:selectedPreambleName]) { + [self setSelectedPreambleName:nil]; + isSelected = YES; + } + NSString *preamble = [preambleDict objectForKey:old]; +#if ! __has_feature(objc_arc) + [preamble retain]; +#endif + [preambleDict removeObjectForKey:old]; + [preambleDict setObject:preamble forKey:new]; +#if ! __has_feature(objc_arc) + [preamble release]; +#endif + if (isSelected) { + [self setSelectedPreambleName:new]; + } + return YES; +} + +- (BOOL)removePreamble:(NSString*)name { + if ([name isEqualToString:@"default"]) + return NO; + // "name" may be held only by being the selected preamble... +#if ! __has_feature(objc_arc) + [name retain]; +#endif + if ([name isEqualToString:selectedPreambleName]) + [self setSelectedPreambleName:nil]; + [preambleDict removeObjectForKey:name]; +#if ! __has_feature(objc_arc) + [name release]; +#endif + return YES; +} + +- (NSString*)buildDocumentForTikz:(NSString*)tikz +{ + NSString *preamble = [self currentPreamble]; + NSString *doc_head = @""; + if (![preamble hasPrefix:@"\\documentclass"]) { + doc_head = @"\\documentclass{article}\n"; + } + NSString *preamble_suffix = @""; + if ([preamble rangeOfString:@"\\begin{document}" + options:NSBackwardsSearch].length == 0) { + preamble_suffix = PREAMBLE_TAIL; + } + return [NSString stringWithFormat:@"%@%@%@%@%@", + doc_head, + [self currentPreamble], + preamble_suffix, + tikz, + POSTAMBLE]; +} + +- (NSString*)buildDocumentForGraph:(Graph*)g +{ + return [self buildDocumentForTikz:[g tikz]]; +} + +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/PropertyHolder.h b/tikzit-1/src/common/PropertyHolder.h new file mode 100644 index 0000000..ba1d825 --- /dev/null +++ b/tikzit-1/src/common/PropertyHolder.h @@ -0,0 +1,36 @@ +// +// PropertyHolder.h +// TikZiT +// +// Copyright 2011 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import + +@interface PropertyHolder : NSObject { + NSString *notificationName; +} + +- (id)initWithNotificationName:(NSString*)name; +- (void) postPropertyChanged:(NSString*)property oldValue:(id)value; +- (void) postPropertyChanged:(NSString*)property; + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/PropertyHolder.m b/tikzit-1/src/common/PropertyHolder.m new file mode 100644 index 0000000..6aaf125 --- /dev/null +++ b/tikzit-1/src/common/PropertyHolder.m @@ -0,0 +1,74 @@ +// +// PropertyHolder.m +// TikZiT +// +// Copyright 2011 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "PropertyHolder.h" + +@implementation PropertyHolder + + +- (id)init { + self = [super init]; + if (self) { + notificationName = @"UnknownPropertyChanged"; + } + return self; +} + +- (id)initWithNotificationName:(NSString*)n { + self = [super init]; + if (self) { + notificationName = [n copy]; + } + return self; +} + +- (void)postPropertyChanged:(NSString*)property oldValue:(id)value { + NSDictionary *userInfo; + if (value != nil) { + userInfo = [NSDictionary dictionaryWithObjectsAndKeys: + property, @"propertyName", + value, @"oldValue", + nil]; + } else { + userInfo = [NSDictionary dictionaryWithObject:property + forKey:@"propertyName"]; + } + [[NSNotificationCenter defaultCenter] postNotificationName:notificationName + object:self + userInfo:userInfo]; +} + +- (void)postPropertyChanged:(NSString*)property { + [self postPropertyChanged:property oldValue:nil]; +} + +- (void)dealloc { +#if ! __has_feature(objc_arc) + [notificationName release]; + [super dealloc]; +#endif +} + +@end + +// vi:ft=objc:ts=4:et:sts=4:sw=4 diff --git a/tikzit-1/src/common/RColor.h b/tikzit-1/src/common/RColor.h new file mode 100644 index 0000000..7f22547 --- /dev/null +++ b/tikzit-1/src/common/RColor.h @@ -0,0 +1,50 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import + +#ifndef CGFloat +#define CGFloat float +#endif + +/** + * A lightweight color structure used by RenderContext + * + * This is mainly to avoid the overhead of ColorRGB when + * rendering things not based on a NodeStyle + * + * All values range from 0.0f to 1.0f. + */ +typedef struct { + CGFloat red; + CGFloat green; + CGFloat blue; + CGFloat alpha; +} +RColor; + +/** Solid white */ +static const RColor WhiteRColor __attribute__((unused)) = {1.0, 1.0, 1.0, 1.0}; +/** Solid black */ +static const RColor BlackRColor __attribute__((unused)) = {0.0, 0.0, 0.0, 1.0}; + +/** Create a color with alpha set to 1.0 */ +RColor MakeSolidRColor (CGFloat red, CGFloat green, CGFloat blue); +/** Create a color */ +RColor MakeRColor (CGFloat red, CGFloat green, CGFloat blue, CGFloat alpha); + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/RColor.m b/tikzit-1/src/common/RColor.m new file mode 100644 index 0000000..49914fe --- /dev/null +++ b/tikzit-1/src/common/RColor.m @@ -0,0 +1,33 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "RColor.h" + +RColor MakeSolidRColor (CGFloat red, CGFloat green, CGFloat blue) { + return MakeRColor (red, green, blue, 1.0); +} + +RColor MakeRColor (CGFloat red, CGFloat green, CGFloat blue, CGFloat alpha) { + RColor color; + color.red = red; + color.green = green; + color.blue = blue; + color.alpha = alpha; + return color; +} + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/RectangleShape.h b/tikzit-1/src/common/RectangleShape.h new file mode 100644 index 0000000..3fa0f31 --- /dev/null +++ b/tikzit-1/src/common/RectangleShape.h @@ -0,0 +1,33 @@ +// +// RectangleShape.h +// TikZiT +// +// Copyright 2011 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import "Shape.h" + + +@interface RectangleShape : Shape { +} + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/RectangleShape.m b/tikzit-1/src/common/RectangleShape.m new file mode 100644 index 0000000..db9c803 --- /dev/null +++ b/tikzit-1/src/common/RectangleShape.m @@ -0,0 +1,57 @@ +// +// RectangleShape.m +// TikZiT +// +// Copyright 2011 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "RectangleShape.h" +#import "Node.h" +#import "Edge.h" + +@implementation RectangleShape + +- (id)init { + self = [super init]; + if (self) { + Node *n0,*n1,*n2,*n3; + float sz = 0.2f; + + n0 = [Node nodeWithPoint:NSMakePoint(-sz, sz)]; + n1 = [Node nodeWithPoint:NSMakePoint( sz, sz)]; + n2 = [Node nodeWithPoint:NSMakePoint( sz,-sz)]; + n3 = [Node nodeWithPoint:NSMakePoint(-sz,-sz)]; + + Edge *e0,*e1,*e2,*e3; + + e0 = [Edge edgeWithSource:n0 andTarget:n1]; + e1 = [Edge edgeWithSource:n1 andTarget:n2]; + e2 = [Edge edgeWithSource:n2 andTarget:n3]; + e3 = [Edge edgeWithSource:n3 andTarget:n0]; + + paths = [[NSSet alloc] initWithObjects:[NSArray arrayWithObjects:e0,e1,e2,e3,nil],nil]; + + styleTikz = @"rectangle"; + } + return self; +} + +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/RegularPolyShape.h b/tikzit-1/src/common/RegularPolyShape.h new file mode 100644 index 0000000..1fd8f1e --- /dev/null +++ b/tikzit-1/src/common/RegularPolyShape.h @@ -0,0 +1,50 @@ +// +// RegularPolyShape.h +// TikZiT +// +// Copyright 2011 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import "Shape.h" + +/** + * A regular polygon + * + * Matches the "regular polygon" shape in the shapes.geometric + * PGF/TikZ library. + */ +@interface RegularPolyShape : Shape { +} + +/** + * Initialise a regular polygon + * + * A rotation of 0 will produce a polygon with one + * edge flat along the bottom (just like PGF/TikZ + * does it). + * + * @param sides the number of sides the polygon should have + * @param rotation the rotation of the polygon, in degrees + */ +- (id)initWithSides:(int)sides rotation:(int)rotation; + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/RegularPolyShape.m b/tikzit-1/src/common/RegularPolyShape.m new file mode 100644 index 0000000..3555115 --- /dev/null +++ b/tikzit-1/src/common/RegularPolyShape.m @@ -0,0 +1,76 @@ +// +// RegularPolyShape.m +// TikZiT +// +// Copyright 2011 Aleks Kissinger +// Copyright 2012 Alex Merry +// All rights reserved. +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "RegularPolyShape.h" +#import "Node.h" +#import "Edge.h" +#import "util.h" + +@implementation RegularPolyShape + +- (id)initWithSides:(int)sides rotation:(int)rotation { + self = [super init]; + if (self == nil) + return nil; + + // TikZ draws regular polygons using a radius inscribed + // _inside_ the shape (touching middles of edges), not + // outside (touching points) + const float innerRadius = 0.2f; + + NSMutableArray *nodes = [NSMutableArray arrayWithCapacity:sides]; + NSMutableArray *edges = [NSMutableArray arrayWithCapacity:sides]; + + float dtheta = (M_PI * 2.0f) / ((float)sides); + float theta = (dtheta/2.0f) - (M_PI / 2.0f); + theta += degreesToRadians(rotation); + // radius of the outer circle + float radius = ABS(innerRadius / cos(dtheta)); + + for (int i = 0; i < sides; ++i) { + NSPoint p; + p.x = radius * cos(theta); + p.y = radius * sin(theta); + + [nodes addObject:[Node nodeWithPoint:p]]; + theta += dtheta; + } + + for (int i = 0; i < sides; ++i) { + [edges addObject:[Edge edgeWithSource:[nodes objectAtIndex:i] + andTarget:[nodes objectAtIndex:(i+1)%sides]]]; + } + + paths = [[NSSet alloc] initWithObjects:edges,nil]; + + styleTikz = [[NSString alloc] initWithFormat: + @"regular polygon,regular polygon sides=%d,shape border rotate=%d", + sides, rotation]; + + return self; +} + +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/RenderContext.h b/tikzit-1/src/common/RenderContext.h new file mode 100644 index 0000000..8633944 --- /dev/null +++ b/tikzit-1/src/common/RenderContext.h @@ -0,0 +1,156 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import +#import "RColor.h" + +typedef enum { + AntialiasDisabled, + AntialiasDefault +} AntialiasMode; + +// encapsulates a CTLine on OSX and +// a PangoLayout in GTK+ +@protocol TextLayout +@property (readonly) NSSize size; +@property (readonly) NSString *text; +- (void) showTextAt:(NSPoint)topLeft withColor:(RColor)color; +@end + +@protocol RenderContext +- (void) saveState; +- (void) restoreState; + +- (NSRect) clipBoundingBox; +- (BOOL) strokeIncludesPoint:(NSPoint)p; +- (BOOL) fillIncludesPoint:(NSPoint)p; +- (id) layoutText:(NSString*)text withSize:(CGFloat)fontSize; + +// this may not affect text rendering +- (void) setAntialiasMode:(AntialiasMode)mode; +- (void) setLineWidth:(CGFloat)width; +// setting to 0 will unset the dash +- (void) setLineDash:(CGFloat)dashLength; + +/** + * Clear the current path, including all subpaths + */ +- (void) startPath; +/** + * Close the current subpath + */ +- (void) closeSubPath; +/** + * Start a new subpath, and set the current point. + * + * The point will be the current point and the starting point + * for the subpath. + */ +- (void) moveTo:(NSPoint)p; +/** + * Add a cubic bezier curve to the current subpath. + * + * The curve will start at the current point, terminate at end and + * be defined by cp1 and cp2. + */ +- (void) curveTo:(NSPoint)end withCp1:(NSPoint)cp1 andCp2:(NSPoint)cp2; +/** + * Add a straight line to the current subpath. + * + * The line will start at the current point, and terminate at end. + */ +- (void) lineTo:(NSPoint)end; +/** + * Add a new rectangular subpath. + * + * The current point is undefined after this call. + */ +- (void) rect:(NSRect)rect; +/** + * Add a new circular subpath. + * + * The current point is undefined after this call. + */ +- (void) circleAt:(NSPoint)c withRadius:(CGFloat)r; + +/** + * Paint along the current path. + * + * The current line width and dash style will be used, + * and the colour is given by color. + * + * The path will be cleared by this call, as though + * startPath had been called. + */ +- (void) strokePathWithColor:(RColor)color; +/** + * Paint inside the current path. + * + * The fill colour is given by color. + * + * The path will be cleared by this call, as though + * startPath had been called. + */ +- (void) fillPathWithColor:(RColor)color; +/** + * Paint along and inside the current path. + * + * The current line width and dash style will be used, + * and the colour is given by color. + * + * The path will be cleared by this call, as though + * startPath had been called. + * + * Note that the fill and stroke may overlap, although + * the stroke is always painted on top, so this is only + * relevant when the stroke colour has an alpha channel + * other than 1.0f. + */ +- (void) strokePathWithColor:(RColor)scolor + andFillWithColor:(RColor)fcolor; +/** + * Paint along and inside the current path using an alpha channel. + * + * The current line width and dash style will be used, + * and the colour is given by color. + * + * The path will be cleared by this call, as though + * startPath had been called. + * + * Note that the fill and stroke may overlap, although + * the stroke is always painted on top, so this is only + * relevant when the stroke colour has an alpha channel + * other than 1.0f. + */ +- (void) strokePathWithColor:(RColor)scolor + andFillWithColor:(RColor)fcolor + usingAlpha:(CGFloat)alpha; +/** + * Set the clip to the current path. + * + * The path will be cleared by this call, as though + * startPath had been called. + */ +- (void) clipToPath; + +/** + * Paint everywhere within the clip. + */ +- (void) paintWithColor:(RColor)color; +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/Shape.h b/tikzit-1/src/common/Shape.h new file mode 100644 index 0000000..b401a87 --- /dev/null +++ b/tikzit-1/src/common/Shape.h @@ -0,0 +1,49 @@ +// +// Shape.h +// TikZiT +// +// Copyright 2011 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import "Transformer.h" + +@interface Shape : NSObject { + NSSet *paths; + NSRect boundingRect; // cache + NSString *styleTikz; +} + +@property (retain) NSSet *paths; +@property (readonly) NSRect boundingRect; +/** + * The tikz code to use in style properties for this shape + * + * This can return nil, in which case the shape name should be used + */ +@property (retain) NSString *styleTikz; + +- (id)init; ++ (void)refreshShapeDictionary; ++ (NSDictionary*)shapeDictionary; ++ (Shape*)shapeForName:(NSString*)shapeName; + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/Shape.m b/tikzit-1/src/common/Shape.m new file mode 100644 index 0000000..e887688 --- /dev/null +++ b/tikzit-1/src/common/Shape.m @@ -0,0 +1,171 @@ +// +// Shape.m +// TikZiT +// +// Copyright 2011 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "Shape.h" + +#import "Edge.h" +#import "SupportDir.h" +#import "ShapeNames.h" + +#import "CircleShape.h" +#import "DiamondShape.h" +#import "RectangleShape.h" +#import "RegularPolyShape.h" +#import "TikzShape.h" + +#import "util.h" + +@implementation Shape + +- (void)calcBoundingRect { + boundingRect = NSZeroRect; + + if (paths == nil) + return; + + for (NSArray *arr in paths) { + for (Edge *e in arr) { + boundingRect = NSUnionRect(boundingRect, [e boundingRect]); + } + } +} + +- (id)init { + self = [super init]; + if (self) { + paths = nil; + } + return self; +} + +- (NSSet*)paths {return paths;} +- (void)setPaths:(NSSet *)p { + if (paths != p) { +#if __has_feature(objc_arc) + paths = p; +#else + [paths release]; + paths = [p retain]; +#endif + [self calcBoundingRect]; + } +} + +- (NSRect)boundingRect { return boundingRect; } + +@synthesize styleTikz; + +- (id)copyWithZone:(NSZone*)zone { + Shape *cp = [[[self class] allocWithZone:zone] init]; + [cp setPaths:paths]; + [cp setStyleTikz:styleTikz]; + return cp; +} + +- (void)dealloc { +#if ! __has_feature(objc_arc) + [paths release]; + [styleTikz release]; + [super dealloc]; +#endif +} + +NSDictionary *shapeDictionary = nil; + ++ (void)addShapesInDir:(NSString*)shapeDir to:(NSMutableDictionary*)shapeDict { + NSFileManager *fileManager = [NSFileManager defaultManager]; + NSError *err = nil; + NSArray *files = [fileManager contentsOfDirectoryAtPath:shapeDir error:&err]; + + if (files != nil) { + NSString *nm; + for (NSString *f in files) { + if ([f hasSuffix:@".tikz"]) { + nm = [f substringToIndex:[f length]-5]; + TikzShape *sh = + [[TikzShape alloc] initWithTikzFile: + [shapeDir stringByAppendingPathComponent:f]]; + if (sh != nil) { + [shapeDict setObject:sh forKey:nm]; +#if ! __has_feature(objc_arc) + [sh release]; +#endif + } + } + } + } +} + ++ (void)refreshShapeDictionary { + Shape *shapes[5] = { + [[CircleShape alloc] init], + [[RectangleShape alloc] init], + [[DiamondShape alloc] init], + [[RegularPolyShape alloc] initWithSides:3 rotation:0], + [[RegularPolyShape alloc] initWithSides:3 rotation:180]}; + NSMutableDictionary *shapeDict = [[NSMutableDictionary alloc] initWithObjectsAndKeys: + shapes[0], SHAPE_CIRCLE, + shapes[1], SHAPE_RECTANGLE, + shapes[2], SHAPE_DIAMOND, + shapes[3], SHAPE_UP_TRIANGLE, + shapes[4], SHAPE_DOWN_TRIANGLE, + nil]; +#if ! __has_feature(objc_arc) + for (int i = 0; i<5; ++i) [shapes[i] release]; +#endif + + NSString *systemShapeDir = [[SupportDir systemSupportDir] stringByAppendingPathComponent:@"shapes"]; + NSString *userShapeDir = [[SupportDir userSupportDir] stringByAppendingPathComponent:@"shapes"]; + + [Shape addShapesInDir:systemShapeDir to:shapeDict]; + [Shape addShapesInDir:userShapeDir to:shapeDict]; + + NSDictionary *oldShapeDictionary = shapeDictionary; + shapeDictionary = shapeDict; + + [[NSNotificationCenter defaultCenter] + postNotificationName:@"ShapeDictionaryReplaced" + object:self]; + +#if ! __has_feature(objc_arc) + [oldShapeDictionary release]; +#endif +} + ++ (NSDictionary*)shapeDictionary { + if (shapeDictionary == nil) [Shape refreshShapeDictionary]; + return shapeDictionary; +} + ++ (Shape*)shapeForName:(NSString*)shapeName { + Shape *s = [[[self shapeDictionary] objectForKey:shapeName] copy]; +#if __has_feature(objc_arc) + return s; +#else + return [s autorelease]; +#endif +} + +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/ShapeNames.h b/tikzit-1/src/common/ShapeNames.h new file mode 100644 index 0000000..66ecfb1 --- /dev/null +++ b/tikzit-1/src/common/ShapeNames.h @@ -0,0 +1,27 @@ +// +// ShapeNames.h +// TikZiT +// +// Copyright 2011 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// + +#define SHAPE_CIRCLE @"circle" +#define SHAPE_RECTANGLE @"rectangle" +#define SHAPE_UP_TRIANGLE @"up triangle" +#define SHAPE_DOWN_TRIANGLE @"down triangle" +#define SHAPE_DIAMOND @"diamond" + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/StyleManager.h b/tikzit-1/src/common/StyleManager.h new file mode 100644 index 0000000..bc920e7 --- /dev/null +++ b/tikzit-1/src/common/StyleManager.h @@ -0,0 +1,49 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import +#import "NodeStyle.h" +#import "EdgeStyle.h" + +@interface StyleManager: NSObject { + NSMutableArray *nodeStyles; + NSMutableArray *edgeStyles; +} + ++ (StyleManager*) manager; +- (id) init; + +@property (readonly) NSArray *nodeStyles; +@property (readonly) NSArray *edgeStyles; + +// only for use by loading code +- (void) _setNodeStyles:(NSMutableArray*)styles; +- (void) _setEdgeStyles:(NSMutableArray*)styles; + +- (NodeStyle*) nodeStyleForName:(NSString*)name; +- (EdgeStyle*) edgeStyleForName:(NSString*)name; + +- (void) addNodeStyle:(NodeStyle*)style; +- (void) removeNodeStyle:(NodeStyle*)style; +- (void) addEdgeStyle:(EdgeStyle*)style; +- (void) removeEdgeStyle:(EdgeStyle*)style; + +- (void) updateFromManager:(StyleManager*)manager; + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/StyleManager.m b/tikzit-1/src/common/StyleManager.m new file mode 100644 index 0000000..05c6c86 --- /dev/null +++ b/tikzit-1/src/common/StyleManager.m @@ -0,0 +1,378 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "StyleManager.h" + +@implementation StyleManager + +- (void) nodeStylePropertyChanged:(NSNotification*)n { + if ([[[n userInfo] objectForKey:@"propertyName"] isEqual:@"name"]) { + NSDictionary *userInfo; + userInfo = [NSDictionary dictionaryWithObjectsAndKeys: + [n object], @"style", + [[n userInfo] objectForKey:@"oldValue"], @"oldName", + nil]; + [[NSNotificationCenter defaultCenter] postNotificationName:@"NodeStyleRenamed" + object:self + userInfo:userInfo]; + } +} + +- (void) ignoreAllNodeStyles { + [[NSNotificationCenter defaultCenter] + removeObserver:self + name:@"NodeStylePropertyChanged" + object:nil]; +} + +- (void) ignoreNodeStyle:(NodeStyle*)style { + [[NSNotificationCenter defaultCenter] + removeObserver:self + name:@"NodeStylePropertyChanged" + object:style]; +} + +- (void) listenToNodeStyle:(NodeStyle*)style { + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(nodeStylePropertyChanged:) + name:@"NodeStylePropertyChanged" + object:style]; +} + +- (void) edgeStylePropertyChanged:(NSNotification*)n { + if ([[[n userInfo] objectForKey:@"propertyName"] isEqual:@"name"]) { + NSDictionary *userInfo; + userInfo = [NSDictionary dictionaryWithObjectsAndKeys: + [n object], @"style", + [[n userInfo] objectForKey:@"oldValue"], @"oldName", + nil]; + [[NSNotificationCenter defaultCenter] postNotificationName:@"EdgeStyleRenamed" + object:self + userInfo:userInfo]; + } +} + +- (void) ignoreAllEdgeStyles { + [[NSNotificationCenter defaultCenter] + removeObserver:self + name:@"EdgeStylePropertyChanged" + object:nil]; +} + +- (void) ignoreEdgeStyle:(EdgeStyle*)style { + [[NSNotificationCenter defaultCenter] + removeObserver:self + name:@"EdgeStylePropertyChanged" + object:style]; +} + +- (void) listenToEdgeStyle:(EdgeStyle*)style { + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(edgeStylePropertyChanged:) + name:@"EdgeStylePropertyChanged" + object:style]; +} + ++ (StyleManager*) manager { +#if __has_feature(objc_arc) + return [[self alloc] init]; +#else + return [[[self alloc] init] autorelease]; +#endif +} + +- (id) init { + self = [super init]; + + if (self) { + // we lazily load the default styles, since they may not be needed + nodeStyles = nil; + edgeStyles = nil; + } + + return self; +} + +- (void) dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; +#if ! __has_feature(objc_arc) + [nodeStyles release]; + [edgeStyles release]; + + [super dealloc]; +#endif +} + +- (void) loadDefaultEdgeStyles { +#if ! __has_feature(objc_arc) + [edgeStyles release]; +#endif + edgeStyles = [[NSMutableArray alloc] initWithCapacity:3]; + + EdgeStyle *simple = [EdgeStyle defaultEdgeStyleWithName:@"simple"]; + [simple setThickness:2.0f]; + [self listenToEdgeStyle:simple]; + + EdgeStyle *arrow = [EdgeStyle defaultEdgeStyleWithName:@"arrow"]; + [arrow setThickness:2.0f]; + [arrow setDecorationStyle:ED_Arrow]; + [self listenToEdgeStyle:arrow]; + + EdgeStyle *tick = [EdgeStyle defaultEdgeStyleWithName:@"tick"]; + [tick setThickness:2.0f]; + [tick setDecorationStyle:ED_Tick]; + [self listenToEdgeStyle:tick]; + + [edgeStyles addObject:simple]; + [edgeStyles addObject:arrow]; + [edgeStyles addObject:tick]; +} + +- (void) loadDefaultNodeStyles { +#if ! __has_feature(objc_arc) + [nodeStyles release]; +#endif + nodeStyles = [[NSMutableArray alloc] initWithCapacity:3]; + + NodeStyle *rn = [NodeStyle defaultNodeStyleWithName:@"rn"]; + [rn setStrokeThickness:2]; + [rn setStrokeColorRGB:[ColorRGB colorWithFloatRed:0 green:0 blue:0]]; + [rn setFillColorRGB:[ColorRGB colorWithFloatRed:1 green:0 blue:0]]; + [self listenToNodeStyle:rn]; + + NodeStyle *gn = [NodeStyle defaultNodeStyleWithName:@"gn"]; + [gn setStrokeThickness:2]; + [gn setStrokeColorRGB:[ColorRGB colorWithFloatRed:0 green:0 blue:0]]; + [gn setFillColorRGB:[ColorRGB colorWithFloatRed:0 green:1 blue:0]]; + [self listenToNodeStyle:gn]; + + NodeStyle *yn = [NodeStyle defaultNodeStyleWithName:@"yn"]; + [yn setStrokeThickness:2]; + [yn setStrokeColorRGB:[ColorRGB colorWithFloatRed:0 green:0 blue:0]]; + [yn setFillColorRGB:[ColorRGB colorWithFloatRed:1 green:1 blue:0]]; + [self listenToNodeStyle:yn]; + + [nodeStyles addObject:rn]; + [nodeStyles addObject:gn]; + [nodeStyles addObject:yn]; +} + +- (void) postNodeStyleAdded:(NodeStyle*)style { + [[NSNotificationCenter defaultCenter] postNotificationName:@"NodeStyleAdded" + object:self + userInfo:[NSDictionary dictionaryWithObject:style forKey:@"style"]]; +} + +- (void) postNodeStyleRemoved:(NodeStyle*)style { + [[NSNotificationCenter defaultCenter] postNotificationName:@"NodeStyleRemoved" + object:self + userInfo:[NSDictionary dictionaryWithObject:style forKey:@"style"]]; +} + +- (void) postEdgeStyleAdded:(EdgeStyle*)style { + [[NSNotificationCenter defaultCenter] postNotificationName:@"EdgeStyleAdded" + object:self + userInfo:[NSDictionary dictionaryWithObject:style forKey:@"style"]]; +} + +- (void) postEdgeStyleRemoved:(EdgeStyle*)style { + [[NSNotificationCenter defaultCenter] postNotificationName:@"EdgeStyleRemoved" + object:self + userInfo:[NSDictionary dictionaryWithObject:style forKey:@"style"]]; +} + +- (void) postNodeStylesReplaced { + [[NSNotificationCenter defaultCenter] postNotificationName:@"NodeStylesReplaced" object:self]; +} + +- (void) postEdgeStylesReplaced { + [[NSNotificationCenter defaultCenter] postNotificationName:@"EdgeStylesReplaced" object:self]; +} + +- (NSArray*) nodeStyles { + if (nodeStyles == nil) { + [self loadDefaultNodeStyles]; + } + return nodeStyles; +} + +- (NSArray*) edgeStyles { + if (edgeStyles == nil) { + [self loadDefaultEdgeStyles]; + } + return edgeStyles; +} + +- (void) _setNodeStyles:(NSMutableArray*)styles { + [self ignoreAllNodeStyles]; +#if ! __has_feature(objc_arc) + [nodeStyles release]; + [styles retain]; +#endif + nodeStyles = styles; + for (NodeStyle *style in styles) { + [self listenToNodeStyle:style]; + } + [self postNodeStylesReplaced]; +} + +- (void) _setEdgeStyles:(NSMutableArray*)styles { + [self ignoreAllEdgeStyles]; +#if ! __has_feature(objc_arc) + [edgeStyles release]; + [styles retain]; +#endif + edgeStyles = styles; + for (EdgeStyle *style in styles) { + [self listenToEdgeStyle:style]; + } + [self postEdgeStylesReplaced]; +} + +- (NodeStyle*) nodeStyleForName:(NSString*)name { + for (NodeStyle *s in nodeStyles) { + if ([[s name] isEqualToString:name]) { + return s; + } + } + + return nil; +} + +- (void) addNodeStyle:(NodeStyle*)style { + if (nodeStyles == nil) { + [self loadDefaultNodeStyles]; + } + [nodeStyles addObject:style]; + [self listenToNodeStyle:style]; + [self postNodeStyleAdded:style]; +} + +- (void) removeNodeStyle:(NodeStyle*)style { + if (nodeStyles == nil) { + [self loadDefaultNodeStyles]; + } + + [self ignoreNodeStyle:style]; +#if ! __has_feature(objc_arc) + [style retain]; +#endif + [nodeStyles removeObject:style]; + [self postNodeStyleRemoved:style]; +#if ! __has_feature(objc_arc) + [style release]; +#endif +} + +- (EdgeStyle*) edgeStyleForName:(NSString*)name { + for (EdgeStyle *s in edgeStyles) { + if ([[s name] isEqualToString:name]) { + return s; + } + } + + return nil; +} + +- (void) addEdgeStyle:(EdgeStyle*)style { + if (edgeStyles == nil) { + [self loadDefaultEdgeStyles]; + } + [edgeStyles addObject:style]; + [self listenToEdgeStyle:style]; + [self postEdgeStyleAdded:style]; +} + +- (void) removeEdgeStyle:(EdgeStyle*)style { + if (edgeStyles == nil) { + [self loadDefaultEdgeStyles]; + } + + [self ignoreEdgeStyle:style]; +#if ! __has_feature(objc_arc) + [style retain]; +#endif + [edgeStyles removeObject:style]; + [self postEdgeStyleRemoved:style]; +#if ! __has_feature(objc_arc) + [style release]; +#endif +} + +- (void) updateFromManager:(StyleManager*)m { + NSMutableArray *ns = [NSMutableArray arrayWithCapacity:[[m nodeStyles] count]]; + for (NodeStyle *style in [m nodeStyles]) { + NodeStyle *currentStyle = [self nodeStyleForName:[style name]]; + if (currentStyle != nil) { + [currentStyle updateFromStyle:style]; + [ns addObject:currentStyle]; + } else { +#if __has_feature(objc_arc) + [ns addObject:[style copy]]; +#else + [ns addObject:[[style copy] autorelease]]; +#endif + } + } + NSMutableArray *es = [NSMutableArray arrayWithCapacity:[[m edgeStyles] count]]; + for (EdgeStyle *style in [m edgeStyles]) { + EdgeStyle *currentStyle = [self edgeStyleForName:[style name]]; + if (currentStyle != nil) { + [currentStyle updateFromStyle:style]; + [es addObject:currentStyle]; + } else { +#if __has_feature(objc_arc) + [es addObject:[style copy]]; +#else + [es addObject:[[style copy] autorelease]]; +#endif + } + } + [self _setNodeStyles:ns]; + [self _setEdgeStyles:es]; +} + +- (id) copyWithZone:(NSZone*)zone { + StyleManager *m = [[StyleManager allocWithZone:zone] init]; + + NSMutableArray *ns = [NSMutableArray arrayWithCapacity:[nodeStyles count]]; + for (NodeStyle *style in nodeStyles) { +#if __has_feature(objc_arc) + [ns addObject:[style copyWithZone:zone]]; +#else + [ns addObject:[[style copyWithZone:zone] autorelease]]; +#endif + } + NSMutableArray *es = [NSMutableArray arrayWithCapacity:[edgeStyles count]]; + for (EdgeStyle *style in edgeStyles) { +#if __has_feature(objc_arc) + [es addObject:[style copyWithZone:zone]]; +#else + [es addObject:[[style copyWithZone:zone] autorelease]]; +#endif + } + [m _setNodeStyles:ns]; + [m _setEdgeStyles:es]; + + return m; +} + +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/SupportDir.h b/tikzit-1/src/common/SupportDir.h new file mode 100644 index 0000000..30ccbcb --- /dev/null +++ b/tikzit-1/src/common/SupportDir.h @@ -0,0 +1,36 @@ +// +// SupportDir.h +// TikZiT +// +// Copyright 2011 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import + + +@interface SupportDir : NSObject { +} + ++ (void)createUserSupportDir; ++ (NSString*)userSupportDir; ++ (NSString*)systemSupportDir; + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/SupportDir.m b/tikzit-1/src/common/SupportDir.m new file mode 100644 index 0000000..22fed1b --- /dev/null +++ b/tikzit-1/src/common/SupportDir.m @@ -0,0 +1,65 @@ +// +// SupportDir.m +// TikZiT +// +// Copyright 2011 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "SupportDir.h" + +#ifndef __APPLE__ +#import +#import "stat.h" +#endif + +@implementation SupportDir + ++ (NSString*)userSupportDir { +#ifdef __APPLE__ + return [[NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory,NSUserDomainMask,YES) + objectAtIndex:0] stringByAppendingPathComponent:@"TikZiT"]; +#else + return [NSString stringWithFormat:@"%s/tikzit", g_get_user_config_dir ()]; +#endif +} + ++ (NSString*)systemSupportDir { +#ifdef __APPLE__ + return [[NSBundle mainBundle] resourcePath]; +#else + return @TIKZITSHAREDIR; +#endif +} + ++ (void)createUserSupportDir { +#ifdef __APPLE__ + NSFileManager *fileManager = [NSFileManager defaultManager]; + [fileManager createDirectoryAtPath:[SupportDir userSupportDir] + withIntermediateDirectories:YES + attributes:nil + error:NULL]; +#else + // NSFileManager is slightly dodgy on Windows + g_mkdir_with_parents ([[SupportDir userSupportDir] UTF8String], S_IRUSR | S_IWUSR | S_IXUSR); +#endif +} + +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/TikzGraphAssembler+Parser.h b/tikzit-1/src/common/TikzGraphAssembler+Parser.h new file mode 100644 index 0000000..c9391a9 --- /dev/null +++ b/tikzit-1/src/common/TikzGraphAssembler+Parser.h @@ -0,0 +1,36 @@ +/* + * Copyright 2013 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * TikzGraphAssember+Parser.h + * + * This file exposes some TikzGraphAssembler functions + * that are only of use to the parser. + */ + +#import "TikzGraphAssembler.h" + +@interface TikzGraphAssembler (Parser) +- (Graph*) graph; +/** Store a node so that it can be looked up by name later */ +- (void) addNodeToMap:(Node*)n; +/** Get a previously-stored node by name */ +- (Node*) nodeWithName:(NSString*)name; +- (void) reportError:(const char *)message atLocation:(YYLTYPE*)yylloc; +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/TikzGraphAssembler.h b/tikzit-1/src/common/TikzGraphAssembler.h new file mode 100644 index 0000000..3403969 --- /dev/null +++ b/tikzit-1/src/common/TikzGraphAssembler.h @@ -0,0 +1,115 @@ +// +// TikzGraphAssembler.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import "Graph.h" + +/** + * Parses (a subset of) tikz code and produces the corresponding Graph + * + * A note on errors: + * If parsing fails and a non-NULL error argument is given, it will be + * populated with an error with domain TZErrorDomain and code TZ_ERR_PARSE + * (see NSError+Tikzit.h). + * + * This will have a description set, typically something like + * "syntax error, unexpected [, expecting (" + * It may also have the following keys (it will have all or none of these), + * where numbers are stored using NSNumber: + * - startLine: the line (starting at 1) containing the first character + * of the bad token + * - startColumn: the column (starting at 1; tabs count for 1) of the first + * character of the bad token + * - endLine: the line (starting at 1) containing the last character + * of the bad token + * - endColumn: the column (starting at 1; tabs count for 1) of the last + * character of the bad token + * - syntaxString: an excerpt of the input string (typically the contents + * from startLine to endLine) providing some context + * - tokenOffset: the character offset (starting at 0) of the bad token + * within syntaxString + * - tokenLength: the character length (including newlines) of the bad token + * within syntaxString + */ +@interface TikzGraphAssembler : NSObject { + const char *tikzStr; + Graph *graph; + void *scanner; + NSMutableDictionary *nodeMap; + NSError *lastError; +} + +/** + * Parse tikz and place the result in gr + * + * Note that the graph must be empty; this might be used from an init + * method, for example, although don't forget that you can return a + * different object in init methods, providing you get the allocation + * right. + * + * @param tikz the tikz string to parse + * @param gr the graph to store the result in (must be empty, non-nil) + * @param e a location to store an error if parsing fails (may be NULL) + * @return YES if parsing succeeded, NO otherwise + */ ++ (BOOL) parseTikz:(NSString*)tikz forGraph:(Graph*)gr error:(NSError**)e; +/** + * Overload for -[parseTikz:forGraph:error:] with the error set to NULL + */ ++ (BOOL) parseTikz:(NSString*)tikz forGraph:(Graph*)gr; +/** + * Parse tikz + * + * @param tikz the tikz string to parse + * @param e a location to store an error if parsing fails (may be NULL) + * @return a Graph object if parsing succeeded, nil otherwise + */ ++ (Graph*) parseTikz:(NSString*)tikz error:(NSError**)e; +/** + * Overload for -[parseTikz:error:] with the error set to NULL + */ ++ (Graph*) parseTikz:(NSString*)tikz; +/** + * Validate a property string or value + * + * Wraps the string in "{" and "}" and checks it lexes completely; in other + * words, makes sure that "{" and "}" are balanced (ignoring escaped versions). + * @param tikz the string to validate + * @return YES if the string can be used as a property name or value, NO + * otherwise + */ ++ (BOOL)validateTikzPropertyNameOrValue:(NSString*)tikz; + +/** + * Validate an edge anchor + * + * Checks that the given string will successfully lex if used as an anchor for + * and edge + * @param tikz the string to validate + * @return YES if the string can be used as an edge anchor, NO otherwise + */ ++ (BOOL)validateTikzEdgeAnchor:(NSString*)tikz; + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/TikzGraphAssembler.m b/tikzit-1/src/common/TikzGraphAssembler.m new file mode 100644 index 0000000..c5d2811 --- /dev/null +++ b/tikzit-1/src/common/TikzGraphAssembler.m @@ -0,0 +1,310 @@ +// +// TikzGraphAssembler.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "TikzGraphAssembler.h" +#import "tikzparserdefs.h" +#import "tikzparser.h" +#import "TikzGraphAssembler+Parser.h" +#import "tikzlexer.h" +#import "NSError+Tikzit.h" + +@implementation TikzGraphAssembler + +- (id)init { +#if ! __has_feature(objc_arc) + [self release]; +#endif + return nil; +} + +- (id)initWithGraph:(Graph*)g { + self = [super init]; + if (self) { +#if __has_feature(objc_arc) + graph = g; +#else + graph = [g retain]; +#endif + nodeMap = [[NSMutableDictionary alloc] init]; + yylex_init (&scanner); + yyset_extra(self, scanner); + } + return self; +} + +- (void)dealloc { +#if ! __has_feature(objc_arc) + [graph release]; + [nodeMap release]; + [lastError release]; + yylex_destroy (scanner); + [super dealloc]; +#endif +} + +- (BOOL) parseTikz:(NSString*)t error:(NSError**)error { +#if ! __has_feature(objc_arc) + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; +#endif + + tikzStr = [t UTF8String]; + yy_scan_string(tikzStr, scanner); + int result = yyparse(scanner); + tikzStr = NULL; + +#if ! __has_feature(objc_arc) + [pool drain]; +#endif + + if (result == 0) { + return YES; + } else { + if (error) { + if (lastError) { +#if __has_feature(objc_arc) + *error = lastError; +#else + *error = [[lastError retain] autorelease]; +#endif + } else if (result == 1) { + *error = [NSError errorWithMessage:@"Syntax error" + code:TZ_ERR_PARSE]; + } else if (result == 2) { + *error = [NSError errorWithMessage:@"Insufficient memory" + code:TZ_ERR_PARSE]; + } else { + *error = [NSError errorWithMessage:@"Unknown error" + code:TZ_ERR_PARSE]; + } + } + return NO; + } +} + ++ (BOOL) parseTikz:(NSString*)tikz forGraph:(Graph*)gr { + return [self parseTikz:tikz forGraph:gr error:NULL]; +} ++ (Graph*) parseTikz:(NSString*)tikz error:(NSError**)e { + Graph *gr = [[Graph alloc] init]; + if ([self parseTikz:tikz forGraph:gr error:e]) { +#if __has_feature(objc_arc) + return gr; +#else + return [gr autorelease]; +#endif + } else { +#if ! __has_feature(objc_arc) + [gr release]; +#endif + return nil; + } +} ++ (Graph*) parseTikz:(NSString*)tikz { + return [self parseTikz:tikz error:NULL]; +} + ++ (BOOL) parseTikz:(NSString*)tikz forGraph:(Graph*)gr error:(NSError**)error { + if([tikz length] == 0) { + // empty string -> empty graph + return YES; + } + + TikzGraphAssembler *assembler = [[self alloc] initWithGraph:gr]; + BOOL success = [assembler parseTikz:tikz error:error]; +#if ! __has_feature(objc_arc) + [assembler release]; +#endif + return success; +} + ++ (BOOL)validateTikzPropertyNameOrValue:(NSString*)tikz { + BOOL valid; + + NSString * testTikz = [NSString stringWithFormat: @"{%@}", tikz]; + + void *scanner; + yylex_init (&scanner); + yyset_extra(nil, scanner); + yy_scan_string([testTikz UTF8String], scanner); + YYSTYPE lval; + YYLTYPE lloc; + int result = yylex(&lval, &lloc, scanner); + valid = (result == DELIMITEDSTRING) && + (yyget_leng(scanner) == [testTikz length]); + yylex_destroy(scanner); + + return valid; +} + ++ (BOOL)validateTikzEdgeAnchor:(NSString*)tikz { + if ([tikz length] == 0) + return YES; + + BOOL valid = YES; + + NSString * testTikz = [NSString stringWithFormat: @"(1.%@)", tikz]; + + void *scanner; + yylex_init (&scanner); + yyset_extra(nil, scanner); + yy_scan_string([testTikz UTF8String], scanner); + YYSTYPE lval; + YYLTYPE lloc; + valid = valid && (yylex(&lval, &lloc, scanner) == LEFTPARENTHESIS); + valid = valid && (yylex(&lval, &lloc, scanner) == REFSTRING); + valid = valid && (yylex(&lval, &lloc, scanner) == FULLSTOP); + valid = valid && (yylex(&lval, &lloc, scanner) == REFSTRING); + valid = valid && (yylex(&lval, &lloc, scanner) == RIGHTPARENTHESIS); + valid = valid && (lloc.last_column == [testTikz length]); + yylex_destroy(scanner); + + return valid; +} + +@end + +@implementation TikzGraphAssembler (Parser) +- (Graph*)graph { return graph; } + +- (void)addNodeToMap:(Node*)n { + [nodeMap setObject:n forKey:[n name]]; +} + +- (Node*)nodeWithName:(NSString*)name { + return [nodeMap objectForKey:name]; +} + +- (void) setLastError:(NSError*)error { +#if ! __has_feature(objc_arc) + [error retain]; + [lastError release]; +#endif + lastError = error; +} + +- (void) reportError:(const char *)message atLocation:(YYLTYPE*)yylloc { + NSString *nsmsg = [NSString stringWithUTF8String:message]; + + const char *first_line_start = find_start_of_nth_line ( + tikzStr, yylloc->first_line - 1); + const char *last_line_start = find_start_of_nth_line ( + first_line_start, yylloc->last_line - yylloc->first_line); + const char *last_line_end = last_line_start; + while (*last_line_end && *last_line_end != '\n') { + // points to just after end of last line + ++last_line_end; + } + + size_t context_len = last_line_end - first_line_start; + size_t token_offset = yylloc->first_column - 1; + size_t token_len = ((last_line_start - first_line_start) + yylloc->last_column) - token_offset; + + if (token_offset + token_len > context_len) { + // error position state is corrupted + NSLog(@"Got bad error state for error \"%s\": start(%i,%i), end(%i,%i)", + message, + yylloc->first_line, + yylloc->first_column, + yylloc->last_line, + yylloc->last_column); + [self setLastError:[NSError errorWithMessage:nsmsg + code:TZ_ERR_PARSE]]; + } else { + char *context = malloc (context_len + 1); + strncpy (context, first_line_start, context_len); + *(context + context_len) = '\0'; + + NSDictionary *userInfo = + [NSDictionary dictionaryWithObjectsAndKeys: + nsmsg, + NSLocalizedDescriptionKey, + [NSNumber numberWithInt:yylloc->first_line], + @"startLine", + [NSNumber numberWithInt:yylloc->first_column], + @"startColumn", + [NSNumber numberWithInt:yylloc->last_line], + @"endLine", + [NSNumber numberWithInt:yylloc->last_column], + @"endColumn", + [NSString stringWithUTF8String:context], + @"syntaxString", + [NSNumber numberWithInt:token_offset], + @"tokenStart", + [NSNumber numberWithInt:token_len], + @"tokenLength", + nil]; + [self setLastError: + [NSError errorWithDomain:TZErrorDomain + code:TZ_ERR_PARSE + userInfo:userInfo]]; + + // we can now freely edit context string + // we only bother printing out the first line + if (yylloc->last_line > yylloc->first_line) { + char *nlp = strchr(context, '\n'); + if (nlp) { + *nlp = '\0'; + context_len = nlp - context; + NSAssert2(token_offset < context_len, @"token_offset (%lu) < context_len (%lu)", token_offset, context_len); + if (token_offset + token_len > context_len) { + token_len = context_len - token_offset; + } + } else { + NSLog(@"Didn't find any newlines in context string!"); + } + } + size_t token_col_offset = 0; + size_t token_col_len = 0; + for (int i = 0; i < token_offset; ++i) { + if (*(context + i) == '\t') + token_col_offset += 8; + else + ++token_col_offset; + } + for (int i = token_offset; i < token_offset + token_len; ++i) { + if (*(context + i) == '\t') + token_col_len += 8; + else + ++token_col_len; + } + NSString *pointerLinePadding = + [@"" stringByPaddingToLength:token_col_offset + withString:@" " + startingAtIndex:0]; + NSString *pointerLineCarets = + [@"" stringByPaddingToLength:token_col_len + withString:@"^" + startingAtIndex:0]; + NSLog(@"Parse error on line %i, starting at %i: %s\n%s\n%@%@", + yylloc->first_line, + yylloc->first_column, + message, + context, + pointerLinePadding, + pointerLineCarets); + free (context); + } +} +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/TikzShape.h b/tikzit-1/src/common/TikzShape.h new file mode 100644 index 0000000..6a91f91 --- /dev/null +++ b/tikzit-1/src/common/TikzShape.h @@ -0,0 +1,37 @@ +// +// TikzShape.h +// TikZiT +// +// Copyright 2011 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import "Shape.h" + +@interface TikzShape : Shape { + NSString *tikzSrc; +} + +@property (copy) NSString *tikzSrc; + +- (id)initWithTikzFile:(NSString*)file; + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/TikzShape.m b/tikzit-1/src/common/TikzShape.m new file mode 100644 index 0000000..555a7df --- /dev/null +++ b/tikzit-1/src/common/TikzShape.m @@ -0,0 +1,70 @@ +// +// TikzShape.m +// TikZiT +// +// Copyright 2011 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "TikzShape.h" +#import "Graph.h" + +@implementation TikzShape + +@synthesize tikzSrc; + +- (id)initWithTikzFile:(NSString*)file { + self = [super init]; + if (self) { + NSString *tikz = [NSString stringWithContentsOfFile:file + encoding:NSUTF8StringEncoding + error:NULL]; + if (tikz == nil) return nil; + + tikzSrc = [tikz copy]; + + Graph *graph = [Graph graphFromTikz:tikz]; + if (graph == nil) return nil; + + NSRect graphBounds = ([graph hasBoundingBox]) ? [graph boundingBox] : [graph bounds]; + + float sz = 0.5f; + + // the "screen" coordinate space fits in the shape bounds + Transformer *t = [Transformer transformer]; + float width_ratio = (2*sz) / graphBounds.size.width; + float height_ratio = (2*sz) / graphBounds.size.height; + [t setScale:MIN(width_ratio, height_ratio)]; + NSRect bds = [t rectToScreen:graphBounds]; + NSPoint shift = NSMakePoint(-NSMidX(bds), + -NSMidY(bds)); + [t setOrigin:shift]; + [graph applyTransformer:t]; +#if __has_feature(objc_arc) + paths = [graph pathCover]; +#else + paths = [[graph pathCover] retain]; +#endif + } + return self; +} + + +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/Transformer.h b/tikzit-1/src/common/Transformer.h new file mode 100644 index 0000000..1b0108a --- /dev/null +++ b/tikzit-1/src/common/Transformer.h @@ -0,0 +1,154 @@ +// +// Transformer.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + + +#import + +extern float const PIXELS_PER_UNIT; + +/*! + @class Transformer + @brief Do affine coordinate transforms between an abstract co-ordinate + space (such as the graph's) and the screen's. + + This currently allows zooming and panning. + */ +@interface Transformer : NSObject { + NSPoint origin; + float x_scale; + float y_scale; +} + +/*! + @brief The screen co-ordinate of the abstract space origin. + */ +@property (assign) NSPoint origin; + +/*! + @brief The scale (from abstract space to screen space) + @detail This is the size of a single unit (a distance of 1.0) + of the abstract space on the screen. + + Around 50 is a reasonable value. + */ +@property (assign) float scale; + +/*! + @brief Whether co-ordinates are flipped about the X axis + @detail TikZ considers X co-ordinates to run left to right, + which is not necessarily how the screen views + them. + */ +@property (assign,getter=isFlippedAboutXAxis) BOOL flippedAboutXAxis; + +/*! + @brief Whether co-ordinates are flipped about the Y axis + @detail TikZ considers Y co-ordinates to run up the page, + which is not necessarily how the screen views + them. + */ +@property (assign,getter=isFlippedAboutYAxis) BOOL flippedAboutYAxis; + +/*! + @brief Transform a point from screen space to abstract space. + @param p a point in screen space. + @result A point in abstract space. + */ +- (NSPoint)fromScreen:(NSPoint)p; + +/*! + @brief Transform a point from abstract space to screen space. + @param p a point in abstract space. + @result A point in screen space. + */ +- (NSPoint)toScreen:(NSPoint)p; + +/*! + @brief Scale a distance from screen space to abstract space. + @param dist a distance in screen space. + @result A distance in abstract space. + */ +- (float)scaleFromScreen:(float)dist; + +/*! + @brief Scale a distance from abstract space to screen space. + @param dist a distance in abstract space. + @result A distance in screen space. + */ +- (float)scaleToScreen:(float)dist; + +/*! + @brief Scale a rectangle from screen space to abstract space. + @param r a rectangle in screen space. + @result A rectangle in abstract space. + */ +- (NSRect)rectFromScreen:(NSRect)r; + +/*! + @brief Scale a rectangle from abstract space to screen space. + @param r a rectangle in abstract space. + @result A rectangle in screen space. + */ +- (NSRect)rectToScreen:(NSRect)r; + +/*! + @brief Factory method to get an identity transformer. + @result A transformer. + */ ++ (Transformer*)transformer; + +/*! + @brief Factory method to get a transformer identical to another + @result A transformer. + */ ++ (Transformer*)transformerWithTransformer:(Transformer*)t; + +/*! + @brief Factory method to get a transformer. + @param o The screen co-ordinate of the abstract space origin + @param scale The scale (from abstract space to screen space) + @result A transformer. + */ ++ (Transformer*)transformerWithOrigin:(NSPoint)o andScale:(float)scale; + +/*! + @brief Get a global 'actual size' transformer. + @result A transformer. + */ ++ (Transformer*)defaultTransformer; + +/*! + @brief A transformer set up from two bounding rects. + + graphRect is made as large as possible while still fitting into screenRect. + @result A transformer. + */ ++ (Transformer*)transformerToFit:(NSRect)graphRect intoScreenRect:(NSRect)screenRect flippedAboutXAxis:(BOOL)flipX flippedAboutYAxis:(BOOL)flipY; + ++ (Transformer*)transformerToFit:(NSRect)graphRect intoScreenRect:(NSRect)screenRect flippedAboutXAxis:(BOOL)flipX; ++ (Transformer*)transformerToFit:(NSRect)graphRect intoScreenRect:(NSRect)screenRect flippedAboutYAxis:(BOOL)flipY; ++ (Transformer*)transformerToFit:(NSRect)graphRect intoScreenRect:(NSRect)screenRect; + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/Transformer.m b/tikzit-1/src/common/Transformer.m new file mode 100644 index 0000000..2b56813 --- /dev/null +++ b/tikzit-1/src/common/Transformer.m @@ -0,0 +1,231 @@ +// +// Transformer.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "Transformer.h" + +float const PIXELS_PER_UNIT = 50; + +@implementation Transformer + ++ (Transformer*)transformer { +#if __has_feature(objc_arc) + return [[Transformer alloc] init]; +#else + return [[[Transformer alloc] init] autorelease]; +#endif +} + ++ (Transformer*)transformerWithTransformer:(Transformer*)t { +#if __has_feature(objc_arc) + return [t copy]; +#else + return [[t copy] autorelease]; +#endif +} + ++ (Transformer*)transformerWithOrigin:(NSPoint)o andScale:(float)scale { + Transformer *trans = [self transformer]; + [trans setOrigin:o]; + [trans setScale:scale]; + return trans; +} + ++ (Transformer*)transformerToFit:(NSRect)graphRect + intoScreenRect:(NSRect)screenRect { + return [self transformerToFit:graphRect + intoScreenRect:screenRect + flippedAboutXAxis:NO + flippedAboutYAxis:NO]; +} + ++ (Transformer*)transformerToFit:(NSRect)graphRect + intoScreenRect:(NSRect)screenRect + flippedAboutXAxis:(BOOL)flipX { + return [self transformerToFit:graphRect + intoScreenRect:screenRect + flippedAboutXAxis:flipX + flippedAboutYAxis:NO]; +} + ++ (Transformer*)transformerToFit:(NSRect)graphRect + intoScreenRect:(NSRect)screenRect + flippedAboutYAxis:(BOOL)flipY { + return [self transformerToFit:graphRect + intoScreenRect:screenRect + flippedAboutXAxis:NO + flippedAboutYAxis:flipY]; +} + ++ (Transformer*)transformerToFit:(NSRect)graphRect + intoScreenRect:(NSRect)screenRect + flippedAboutXAxis:(BOOL)flipAboutXAxis + flippedAboutYAxis:(BOOL)flipAboutYAxis { + + const float wscale = screenRect.size.width / graphRect.size.width; + const float hscale = screenRect.size.height / graphRect.size.height; + const float scale = (wscale < hscale) ? wscale : hscale; + const float xpad = (screenRect.size.width - (graphRect.size.width * scale)) / 2.0; + const float ypad = (screenRect.size.height - (graphRect.size.height * scale)) / 2.0; + + // if we are flipping, we need to calculate the origin from the opposite edge + const float gx = flipAboutYAxis ? -(graphRect.size.width + graphRect.origin.x) + : graphRect.origin.x; + const float gy = flipAboutXAxis ? -(graphRect.size.height + graphRect.origin.y) + : graphRect.origin.y; + const float origin_x = screenRect.origin.x - (gx * scale) + xpad; + const float origin_y = screenRect.origin.y - (gy * scale) + ypad; + + Transformer *trans = [self transformer]; + [trans setOrigin:NSMakePoint(origin_x, origin_y)]; + [trans setScale:scale]; + [trans setFlippedAboutXAxis:flipAboutXAxis]; + [trans setFlippedAboutYAxis:flipAboutYAxis]; + return trans; +} + +- (id) init { + self = [super init]; + + if (self) { + origin = NSZeroPoint; + x_scale = 1.0f; + y_scale = 1.0f; + } + + return self; +} + +- (id)copyWithZone:(NSZone *)zone { + Transformer *cp = [[[self class] allocWithZone:zone] init]; + if (cp) { + cp->origin = origin; + cp->x_scale = x_scale; + cp->y_scale = y_scale; + } + return cp; +} + +- (NSPoint)origin { return origin; } +- (void)setOrigin:(NSPoint)o { + origin = o; +} + +- (float)scale { return ABS(x_scale); } +- (void)setScale:(float)s { + x_scale = (x_scale < 0.0) ? -s : s; + y_scale = (y_scale < 0.0) ? -s : s; +} + +- (BOOL)isFlippedAboutXAxis { + return y_scale < 0.0; +} + +- (void)setFlippedAboutXAxis:(BOOL)flip { + if (flip != [self isFlippedAboutXAxis]) { + y_scale *= -1; + } +} + +- (BOOL)isFlippedAboutYAxis { + return x_scale < 0.0; +} + +- (void)setFlippedAboutYAxis:(BOOL)flip { + if (flip != [self isFlippedAboutYAxis]) { + x_scale *= -1; + } +} + +- (NSPoint)fromScreen:(NSPoint)p { + NSPoint trans; + trans.x = (p.x - origin.x) / x_scale; + trans.y = (p.y - origin.y) / y_scale; + return trans; +} + +- (NSPoint)toScreen:(NSPoint)p { + NSPoint trans; + trans.x = (p.x * x_scale) + origin.x; + trans.y = (p.y * y_scale) + origin.y; + return trans; +} + +- (float)scaleFromScreen:(float)dist { + return dist / ABS(x_scale); +} + +- (float)scaleToScreen:(float)dist { + return dist * ABS(x_scale); +} + +- (NSRect)rectFromScreen:(NSRect)r { + NSRect r1; + r1.origin = [self fromScreen:r.origin]; + r1.size.width = [self scaleFromScreen:r.size.width]; + r1.size.height = [self scaleFromScreen:r.size.height]; + // if we're flipped, the origin will be at a different corner + if ([self isFlippedAboutYAxis]) { + r1.origin.x -= r1.size.width; + } + if ([self isFlippedAboutXAxis]) { + r1.origin.y -= r1.size.height; + } + return r1; +} + +- (NSRect)rectToScreen:(NSRect)r { + NSPoint o = r.origin; + // if we're flipped, the origin will be at a different corner + if ([self isFlippedAboutYAxis]) { + o.x = NSMaxX(r); + } + if ([self isFlippedAboutXAxis]) { + o.y = NSMaxY(r); + } + NSRect r1; + r1.origin = [self toScreen:o]; + r1.size.width = [self scaleToScreen:r.size.width]; + r1.size.height = [self scaleToScreen:r.size.height]; + return r1; +} + +- (BOOL)isEqual:(id)object { + Transformer *t = (Transformer*)object; + return ([t origin].x == [self origin].x && + [t origin].y == [self origin].y && + [t scale] == [self scale]); +} + +Transformer *defaultTransformer = nil; + ++ (Transformer*)defaultTransformer { + if (defaultTransformer == nil) { + defaultTransformer = [[Transformer alloc] init]; + [defaultTransformer setScale:PIXELS_PER_UNIT]; + } + return defaultTransformer; +} + +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/test/Makefile b/tikzit-1/src/common/test/Makefile new file mode 100644 index 0000000..d158d16 --- /dev/null +++ b/tikzit-1/src/common/test/Makefile @@ -0,0 +1,14 @@ +OBJC = gcc -MMD -MP -DSTAND_ALONE -DGNUSTEP -DGNUSTEP_BASE_LIBRARY=1 -DGNU_RUNTIME=1 -DGNUSTEP_BASE_LIBRARY=1 -fno-strict-aliasing -fPIC -Wall -DGSWARN -DGSDIAGNOSE -Wno-import -O0 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic -fgnu-runtime -fconstant-string-class=NSConstantString -I. -I.. -I/users/alemer/GNUstep/Library/Headers -std=c99 -D_GNU_SOURCE -rdynamic -fgnu-runtime -L/users/alemer/GNUstep/Library/Libraries -L/usr/local/lib64 -L/usr/lib64 -lgnustep-base -lpthread -lobjc -lm + +maths_test_objects = test.m maths.m ../util.m +color_test_objects = test.m color.m ../ColorRGB.m ../util.m ../BasicMapTable.m ../RColor.m + +test: maths-test color-test + ./maths-test + ./color-test + +maths-test: $(maths_test_objects) + $(OBJC) $(maths_test_objects) -o $@ + +color-test: $(color_test_objects) + $(OBJC) $(color_test_objects) -o $@ diff --git a/tikzit-1/src/common/test/color.m b/tikzit-1/src/common/test/color.m new file mode 100644 index 0000000..48a6ff4 --- /dev/null +++ b/tikzit-1/src/common/test/color.m @@ -0,0 +1,80 @@ +// +// color.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// +#import "test/test.h" +#import "ColorRGB.h" + +#ifdef STAND_ALONE +void runTests() { +#else +void testColor() { +#endif + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + startTestBlock(@"color"); + + ColorRGB *red = [ColorRGB colorWithRed:255 green:0 blue:0]; + ColorRGB *lime = [ColorRGB colorWithRed:0 green:255 blue:0]; + ColorRGB *green = [ColorRGB colorWithRed:0 green:128 blue:0]; + TEST(@"Recognised red", + [red name] != nil && + [[red name] isEqualToString:@"Red"]); + TEST(@"Recognised lime", + [lime name] != nil && + [[lime name] isEqualToString:@"Lime"]); + TEST(@"Recognised green", + [green name] != nil && + [[green name] isEqualToString:@"Green"]); + + ColorRGB *floatRed = [ColorRGB colorWithFloatRed:1.0f green:0.0f blue:0.0f]; + ColorRGB *floatLime = [ColorRGB colorWithFloatRed:0.0f green:1.0f blue:0.0f]; + ColorRGB *floatGreen = [ColorRGB colorWithFloatRed:0.0f green:0.5f blue:0.0f]; + + TEST(@"Float red equal to int red", [floatRed isEqual:red]); + TEST(@"Float lime equal to int lime", [floatLime isEqual:lime]); + TEST(@"Float green equal to int green", [floatGreen isEqual:green]); + + TEST(@"Recognised float red", + [floatRed name] != nil && + [[floatRed name] isEqualToString:@"Red"]); + + TEST(@"Recognised float lime", + [floatLime name] != nil && + [[floatLime name] isEqualToString:@"Lime"]); + + TEST(@"Recognised float green", + [floatGreen name] != nil && + [[floatGreen name] isEqualToString:@"Green"]); + + [floatRed setRedFloat:0.99f]; + TEST(@"Nudged red, not recognised now", [floatRed name] == nil); + [floatRed setToClosestHashed]; + TEST(@"Set to closest hashed, reconised again", + [floatRed name] != nil && + [[floatRed name] isEqualToString:@"Red"]); + + TEST(@"Red has correct hex (ff0000)", [[red hexName] isEqualToString:@"hexcolor0xff0000"]); + TEST(@"Lime has correct hex (00ff00)", [[lime hexName] isEqualToString:@"hexcolor0x00ff00"]); + TEST(@"Green has correct hex (008000)", [[green hexName] isEqualToString:@"hexcolor0x008000"]); + + endTestBlock(@"color"); + [pool drain]; +} diff --git a/tikzit-1/src/common/test/common.m b/tikzit-1/src/common/test/common.m new file mode 100644 index 0000000..c9ac980 --- /dev/null +++ b/tikzit-1/src/common/test/common.m @@ -0,0 +1,34 @@ +// +// common.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// +#import "test/test.h" +void testParser(); +void testColor(); +void testMaths(); + +void testCommon() { + startTestBlock(@"common"); + testParser(); + testColor(); + testMaths(); + endTestBlock(@"common"); +} diff --git a/tikzit-1/src/common/test/maths.m b/tikzit-1/src/common/test/maths.m new file mode 100644 index 0000000..a11e58e --- /dev/null +++ b/tikzit-1/src/common/test/maths.m @@ -0,0 +1,562 @@ +// +// TikZiT +// +// Copyright 2011 Alex Merry +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "../util.h" + +#import "test.h" + +void testRectAroundPoints() { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + startTestBlock(@"NSRectAroundPoints"); + + NSRect rect = NSRectAroundPoints (NSZeroPoint, NSZeroPoint); + assertRectsEqual (@"(0,0) and (0,0)", rect, NSZeroRect); + + rect = NSRectAroundPoints (NSZeroPoint, NSMakePoint (1.0f, 1.0f)); + assertRectsEqual (@"(0,0) and (1,1)", rect, NSMakeRect (0.0f, 0.0f, 1.0f, 1.0f)); + + rect = NSRectAroundPoints (NSMakePoint (-1.0f, 1.0f), NSMakePoint (1.0f, -1.0f)); + assertRectsEqual (@"(-1,1) and (1,-1)", rect, NSMakeRect (-1.0f, -1.0f, 2.0f, 2.0f)); + + endTestBlock(@"NSRectAroundPoints"); + [pool drain]; +} + +void testRectAroundPointsWithPadding() { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + startTestBlock(@"NSRectAroundPointsWithPadding"); + + NSRect rect = NSRectAroundPointsWithPadding (NSZeroPoint, NSZeroPoint, 0.0f); + assertRectsEqual (@"(0,0) and (0,0); 0 padding", rect, NSZeroRect); + + rect = NSRectAroundPointsWithPadding (NSZeroPoint, NSZeroPoint, 0.2f); + assertRectsEqual (@"(0,0) and (0,0); 0.2 padding", rect, NSMakeRect (-0.2f, -0.2f, 0.4f, 0.4f)); + + rect = NSRectAroundPointsWithPadding (NSZeroPoint, NSMakePoint (1.0f, 1.0f), -0.2f); + assertRectsEqual (@"(0,0) and (1,1); -0.2 padding", rect, NSMakeRect (0.2f, 0.2f, 0.6f, 0.6f)); + + endTestBlock(@"NSRectAroundPointsWithPadding"); + [pool drain]; +} + +void testGoodAtan() { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + startTestBlock(@"good_atan"); + + assertFloatsEqual (@"0.0, 0.0", good_atan (0.0f, 0.0f), 0.0f); + assertFloatsEqual (@"0.0, 1.0", good_atan (0.0f, 1.0f), 0.5f * M_PI); + assertFloatsEqual (@"0.0, -1.0", good_atan (0.0f, -1.0f), 1.5f * M_PI); + assertFloatsEqual (@"1.0, 0.0", good_atan (1.0f, 0.0f), 0.0f); + assertFloatsEqual (@"1.0, 0.1", good_atan (1.0f, 0.1f), 0.0996687f); + + endTestBlock(@"good_atan"); + [pool drain]; +} + +void testBezierInterpolate() { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + startTestBlock(@"bezierInterpolate"); + + assertFloatsEqual (@"0.0, (0.0, 0.1, 0.2, 0.3)", bezierInterpolate (0.0f, 0.0f, 0.1f, 0.2f, 0.3f), 0.0f); + assertFloatsEqual (@"1.0, (0.0, 0.1, 0.2, 0.3)", bezierInterpolate (1.0f, 0.0f, 0.1f, 0.2f, 0.3f), 0.3f); + assertFloatsEqual (@"0.5, (0.0, 0.1, 0.2, 0.3)", bezierInterpolate (0.5f, 0.0f, 0.1f, 0.2f, 0.3f), 0.15f); + // FIXME: other tests + + endTestBlock(@"bezierInterpolate"); + [pool drain]; +} + +void testLineSegmentsIntersect() { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + startTestBlock(@"lineSegmentsIntersect"); + + BOOL result = NO; + NSPoint intersection = NSMakePoint (-1.0f, -1.0f); + + result = lineSegmentsIntersect (NSMakePoint (-1.0f, -1.0f), NSMakePoint (1.0f, 1.0f), + NSMakePoint (-1.0f, 1.0f), NSMakePoint (1.0f, -1.0f), + &intersection); + TEST (@"Cross at zero: has intersection", result); + assertPointsEqual (@"Cross at zero: intersection value", intersection, NSZeroPoint); + + result = lineSegmentsIntersect (NSMakePoint (-1.0f, -1.0f), NSMakePoint (-0.5f, -0.5f), + NSMakePoint (-1.0f, 1.0f), NSMakePoint (1.0f, -1.0f), + &intersection); + TEST (@"Fail to cross at zero", !result); + + result = lineSegmentsIntersect (NSMakePoint (1.0f, 1.0f), NSMakePoint (1.0f, -1.0f), + NSMakePoint (0.0f, 0.0f), NSMakePoint (1.0f, 0.0f), + &intersection); + TEST (@"Touch at one: has intersection", result); + assertPointsEqual (@"Touch at one: intersection value", intersection, NSMakePoint (1.0f, 0.0f)); + + endTestBlock(@"lineSegmentsIntersect"); + [pool drain]; +} + +void testLineSegmentIntersectsRect() { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + startTestBlock(@"lineSegmentIntersectsRect"); + + BOOL result = NO; + + result = lineSegmentIntersectsRect ( + NSMakePoint (-1.0f, -1.0f), + NSMakePoint (0.0f, 0.0f), + NSZeroRect); + TEST (@"Zero rect; line touches zero", result); + + result = lineSegmentIntersectsRect ( + NSMakePoint (-1.0f, -1.0f), + NSMakePoint (-0.1f, -0.1f), + NSZeroRect); + TEST (@"Zero rect; line short of zero", !result); + + NSRect rect = NSMakeRect (1.0f, 1.0f, 1.0f, 1.0f); + + result = lineSegmentIntersectsRect ( + NSMakePoint (0.0f, 0.0f), + NSMakePoint (3.0f, 1.0f), + rect); + TEST (@"Line underneath", !result); + + result = lineSegmentIntersectsRect ( + NSMakePoint (0.0f, 0.0f), + NSMakePoint (1.0f, 3.0f), + rect); + TEST (@"Line to left", !result); + + result = lineSegmentIntersectsRect ( + NSMakePoint (0.0f, 2.0f), + NSMakePoint (3.0f, 3.0f), + rect); + TEST (@"Line above", !result); + + result = lineSegmentIntersectsRect ( + NSMakePoint (2.0f, 0.0f), + NSMakePoint (3.0f, 3.0f), + rect); + TEST (@"Line to right", !result); + + result = lineSegmentIntersectsRect ( + NSMakePoint (0.0f, 0.0f), + NSMakePoint (0.9f, 0.9f), + rect); + TEST (@"Line short", !result); + + result = lineSegmentIntersectsRect ( + NSMakePoint (1.1f, 1.1f), + NSMakePoint (1.9f, 1.9f), + rect); + TEST (@"Line inside", result); + + result = lineSegmentIntersectsRect ( + NSMakePoint (0.0f, 1.5f), + NSMakePoint (3.0f, 1.5f), + rect); + TEST (@"Horizontal line through", result); + + result = lineSegmentIntersectsRect ( + NSMakePoint (1.5f, 0.0f), + NSMakePoint (1.5f, 3.0f), + rect); + TEST (@"Vertical line through", result); + + result = lineSegmentIntersectsRect ( + NSMakePoint (0.5f, 1.0f), + NSMakePoint (2.0f, 2.5f), + rect); + TEST (@"Cut top and left", result); + + result = lineSegmentIntersectsRect ( + NSMakePoint (2.0f, 0.5f), + NSMakePoint (0.5f, 2.0f), + rect); + TEST (@"Cut bottom and left", result); + + result = lineSegmentIntersectsRect ( + NSMakePoint (1.0f, 0.5f), + NSMakePoint (2.5f, 2.0f), + rect); + TEST (@"Cut bottom and right", result); + + result = lineSegmentIntersectsRect ( + NSMakePoint (0.0f, 1.0f), + NSMakePoint (2.0f, 3.0f), + rect); + TEST (@"Touch top left", result); + + result = lineSegmentIntersectsRect ( + NSMakePoint (1.0f, 0.0f), + NSMakePoint (3.0f, 2.0f), + rect); + TEST (@"Touch bottom right", result); + + result = lineSegmentIntersectsRect ( + NSMakePoint (1.0f, 0.0f), + NSMakePoint (1.0f, 3.0f), + rect); + TEST (@"Along left side", result); + + result = lineSegmentIntersectsRect ( + NSMakePoint (0.0f, 1.0f), + NSMakePoint (3.0f, 1.0f), + rect); + TEST (@"Along bottom side", result); + + endTestBlock(@"lineSegmentIntersectsRect"); + [pool drain]; +} + +struct line_bezier_test { + NSString *msg; + NSPoint lstart; + NSPoint lend; + NSPoint c0; + NSPoint c1; + NSPoint c2; + NSPoint c3; + BOOL expectedResult; + float expectedT; + NSPoint expectedIntersect; +}; + +static struct line_bezier_test line_bezier_tests[] = { + { + @"Outside box", + {0.0f, 0.0f}, + {1.0f, 0.0f}, + {0.0f, 1.0f}, + {0.0f, 2.0f}, + {1.0f, 2.0f}, + {1.0f, 1.0f}, + NO, + -1.0f, + {0.0f, 0.0f} + }, + { + @"Single intersect", + {100.0f, 20.0f}, + {195.0f, 255.0f}, + {93.0f, 163.0f}, + {40.0f, 30.0f}, + {270.0f, 115.0f}, + {219.0f, 178.0f}, + YES, + -0.4f, + {129.391693f, 92.705772f} + }, + { + @"Double intersect", + {100.0f, 20.0f}, + {195.0f, 255.0f}, + {93.0f, 163.0f}, + {40.0f, 30.0f}, + {270.0f, 115.0f}, + {154.0f, 212.0f}, + YES, + -0.909f, + {170.740646f,194.990021f} + }, + { + @"Near miss", + {100.0f, 20.0f}, + {195.0f, 255.0f}, + {93.0f, 163.0f}, + {40.0f, 30.0f}, + {176.0f, 100.0f}, + {154.0f, 212.0f}, + NO, + -1.0f, + {0.0f,0.0f} + } +}; +static unsigned int n_line_bezier_tests = sizeof (line_bezier_tests) / sizeof (line_bezier_tests[0]); + +void testLineSegmentIntersectsBezier() { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + startTestBlock(@"lineSegmentIntersectsBezier"); + + for (unsigned int i = 0; i < n_line_bezier_tests; ++i) { + NSPoint intersect; + BOOL result = lineSegmentIntersectsBezier ( + line_bezier_tests[i].lstart, + line_bezier_tests[i].lend, + line_bezier_tests[i].c0, + line_bezier_tests[i].c1, + line_bezier_tests[i].c2, + line_bezier_tests[i].c3, + &intersect); + if (result) { + if (line_bezier_tests[i].expectedT < 0.0f) { + assertPointsEqual (line_bezier_tests[i].msg, intersect, line_bezier_tests[i].expectedIntersect); + } else { + assertPointsEqual (line_bezier_tests[i].msg, intersect, + bezierInterpolateFull (line_bezier_tests[i].expectedT, line_bezier_tests[i].c0, line_bezier_tests[i].c1, line_bezier_tests[i].c2, line_bezier_tests[i].c3)); + } + } else { + if (line_bezier_tests[i].expectedResult) + fail (line_bezier_tests[i].msg); + else + pass (line_bezier_tests[i].msg); + } + } + +BOOL lineSegmentIntersectsBezier (NSPoint lstart, NSPoint lend, NSPoint c0, NSPoint c1, NSPoint c2, NSPoint c3, NSPoint *result); + endTestBlock(@"lineSegmentIntersectsBezier"); + [pool drain]; +} + +struct exit_point_test { + NSString *msg; + NSPoint rayStart; + float angle; + NSRect rect; + NSPoint expected; +}; + +static struct exit_point_test exit_point_tests[] = { + { + @"0.0 rads", + {0.0f, 0.0f}, + 0.0f, + {{-1.0f, -1.0f}, {2.0f, 2.0f}}, + {1.0f, 0.0f} + }, + { + @"pi/2 rads", + {0.0f, 0.0f}, + M_PI / 2.0f, + {{-1.0f, -1.0f}, {2.0f, 2.0f}}, + {0.0f, 1.0f} + }, + { + @"-pi/2 rads", + {0.0f, 0.0f}, + -M_PI / 2.0f, + {{-1.0f, -1.0f}, {2.0f, 2.0f}}, + {0.0f, -1.0f} + }, + { + @"pi rads", + {0.0f, 0.0f}, + M_PI, + {{-1.0f, -1.0f}, {2.0f, 2.0f}}, + {-1.0f, 0.0f} + }, + { + @"-pi rads", + {0.0f, 0.0f}, + -M_PI, + {{-1.0f, -1.0f}, {2.0f, 2.0f}}, + {-1.0f, 0.0f} + }, + { + @"pi/4 rads", + {0.0f, 0.0f}, + M_PI / 4.0f, + {{-1.0f, -1.0f}, {2.0f, 2.0f}}, + {1.0f, 1.0f} + }, + { + @"3pi/4 rads", + {0.0f, 0.0f}, + (3.0f * M_PI) / 4.0f, + {{-1.0f, -1.0f}, {2.0f, 2.0f}}, + {-1.0f, 1.0f} + }, + { + @"-pi/4 rads", + {0.0f, 0.0f}, + -M_PI / 4.0f, + {{-1.0f, -1.0f}, {2.0f, 2.0f}}, + {1.0f, -1.0f} + }, + { + @"-3pi/4 rads", + {0.0f, 0.0f}, + (-3.0f * M_PI) / 4.0f, + {{-1.0f, -1.0f}, {2.0f, 2.0f}}, + {-1.0f, -1.0f} + }, + { + @"pi/8 rads", + {0.0f, 0.0f}, + M_PI / 8.0f, + {{-1.0f, -1.0f}, {2.0f, 2.0f}}, + {1.0f, 0.414213562373095f} + }, + { + @"3pi/8 rads", + {0.0f, 0.0f}, + 3.0f * M_PI / 8.0f, + {{-1.0f, -1.0f}, {2.0f, 2.0f}}, + {0.414213562373095f, 1.0f} + }, + { + @"-5pi/8 rads", + {0.0f, 0.0f}, + -5.0f * M_PI / 8.0f, + {{-1.0f, -1.0f}, {2.0f, 2.0f}}, + {-0.414213562373095f, -1.0f} + }, + { + @"-7pi/8 rads", + {0.0f, 0.0f}, + -7.0f * M_PI / 8.0f, + {{-1.0f, -1.0f}, {2.0f, 2.0f}}, + {-1.0f, -0.414213562373095f} + }, + { + @"pi/8 rads; origin (1,1)", + {1.0f, 1.0f}, + M_PI / 8.0f, + {{0.0f, 0.0f}, {2.0f, 2.0f}}, + {2.0f, 1.414213562373095f} + }, + { + @"7pi/8 rads; origin (-2,2)", + {-2.0f, 2.0f}, + 7.0f * M_PI / 8.0f, + {{-3.0f, 1.0f}, {2.0f, 2.0f}}, + {-3.0f, 2.414213562373095f} + }, + { + @"pi/8 rads; origin (1,1); SW of box", + {1.0f, 1.0f}, + M_PI / 8.0f, + {{1.0f, 1.0f}, {1.0f, 1.0f}}, + {2.0f, 1.414213562373095f} + }, + { + @"pi/8 rads; origin (1,1); SE of box", + {1.0f, 1.0f}, + M_PI / 8.0f, + {{0.0f, 1.0f}, {1.0f, 1.0f}}, + {1.0f, 1.0f} + }, + { + @"pi/8 rads; origin (1,1); NE of box", + {1.0f, 1.0f}, + M_PI / 8.0f, + {{0.0f, 1.0f}, {1.0f, 1.0f}}, + {1.0f, 1.0f} + }, + { + @"pi/8 rads; origin (1,1); NW of box", + {1.0f, 1.0f}, + M_PI / 8.0f, + {{1.0f, 0.0f}, {1.0f, 1.0f}}, + {1.0f, 1.0f} + }, + { + @"pi/8 rads; origin (1,1); N of box", + {1.0f, 1.0f}, + M_PI / 8.0f, + {{0.5f, 0.0f}, {1.0f, 1.0f}}, + {1.0f, 1.0f} + }, + { + @"7pi/8 rads; origin (1,1); N of box", + {1.0f, 1.0f}, + 7.0f * M_PI / 8.0f, + {{0.5f, 0.0f}, {1.0f, 1.0f}}, + {1.0f, 1.0f} + }, + { + @"-pi/8 rads; origin (1,1); S of box", + {1.0f, 1.0f}, + -M_PI / 8.0f, + {{0.5f, 1.0f}, {1.0f, 1.0f}}, + {1.0f, 1.0f} + }, + { + @"-pi/8 rads; origin (1,1); E of box", + {1.0f, 1.0f}, + -M_PI / 8.0f, + {{0.0f, 0.5f}, {1.0f, 1.0f}}, + {1.0f, 1.0f} + }, + { + @"-7pi/8 rads; origin (1,1); W of box", + {1.0f, 1.0f}, + -7.0f * M_PI / 8.0f, + {{1.0f, 0.5f}, {1.0f, 1.0f}}, + {1.0f, 1.0f} + }, + { + @"7pi/8 rads; origin (1,1); W of box", + {1.0f, 1.0f}, + 7.0f * M_PI / 8.0f, + {{1.0f, 0.5f}, {1.0f, 1.0f}}, + {1.0f, 1.0f} + }, + { + @"pi/8 rads; origin (1,1); leave through top", + {1.0f, 1.0f}, + M_PI / 8.0f, + {{0.9f, 0.1f}, {1.0f, 1.0f}}, + {1.2414213562373f, 1.1f} + }, + { + @"0 rads; origin (1,1); N of box", + {1.0f, 1.0f}, + 0.0f, + {{0.5f, 0.0f}, {1.0f, 1.0f}}, + {1.5f, 1.0f} + } +}; +static unsigned int n_exit_point_tests = sizeof (exit_point_tests) / sizeof (exit_point_tests[0]); + +void testFindExitPointOfRay() { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + startTestBlock(@"findExitPointOfRay"); + + for (unsigned int i = 0; i < n_exit_point_tests; ++i) { + NSPoint exitPoint = findExitPointOfRay ( + exit_point_tests[i].rayStart, + exit_point_tests[i].angle, + exit_point_tests[i].rect); + assertPointsEqual (exit_point_tests[i].msg, exitPoint, exit_point_tests[i].expected); + } + + endTestBlock(@"findExitPointOfRay"); + [pool drain]; +} + +#ifdef STAND_ALONE +void runTests() { +#else +void testMaths() { +#endif + startTestBlock(@"maths"); + testRectAroundPoints(); + testRectAroundPointsWithPadding(); + testGoodAtan(); + testBezierInterpolate(); + testLineSegmentsIntersect(); + testLineSegmentIntersectsRect(); + testFindExitPointOfRay(); + testLineSegmentIntersectsBezier(); + endTestBlock(@"maths"); +} + +// vim:ft=objc:ts=4:sts=4:sw=4:noet diff --git a/tikzit-1/src/common/test/parser.m b/tikzit-1/src/common/test/parser.m new file mode 100644 index 0000000..3346acd --- /dev/null +++ b/tikzit-1/src/common/test/parser.m @@ -0,0 +1,86 @@ +// +// parser.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// +#import "test/test.h" +#import "TikzGraphAssembler.h" + + +#ifdef STAND_ALONE +void runTests() { +#else +void testParser() { +#endif + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + startTestBlock(@"parser"); + + [TikzGraphAssembler setup]; + + NodeStyle *rn = [NodeStyle defaultNodeStyleWithName:@"rn"]; + NSArray *styles = [NSArray arrayWithObject:rn]; + + NSString *tikz = + @"\\begin{tikzpicture}[dotpic]" + @" \\begin{pgfonlayer}{foo}" //ignored + @" \\node [style=rn] (0) at (-2,3.4) {stuff{$\\alpha$ in here}};" + @" \\node (b) at (1,1) {};" + @" \\end{pgfonlayer}" //ignored + @" \\draw [bend right=20] (0) to node[tick]{-} (b.center);" + @"\\end{tikzpicture}"; + + TikzGraphAssembler *ga = [[TikzGraphAssembler alloc] init]; + TEST(@"Parsing TikZ", [ga parseTikz:tikz]); + + Graph *g = [ga graph]; + TEST(@"Graph is non-nil", g != nil); + TEST(@"Graph has correct number of nodes", [[g nodes] count]==2); + TEST(@"Graph has correct number of edges", [[g edges] count]==1); + + NSEnumerator *en = [[g nodes] objectEnumerator]; + Node *n; + Node *n1, *n2; + while ((n=[en nextObject])) { + [n attachStyleFromTable:styles]; + if ([n style] == rn) n1 = n; + else if ([n style] == nil) n2 = n; + } + + TEST(@"Styles attached correctly", n1!=nil && n2!=nil); + + TEST(@"Nodes labeled correctly", + [[n1 label] isEqualToString:@"stuff{$\\alpha$ in here}"] && + [[n2 label] isEqualToString:@""] + ); + + Edge *e1 = [[[g edges] objectEnumerator] nextObject]; + + TEST(@"Edge has edge node", [e1 edgeNode]!=nil); + TEST(@"Edge node labeled correctly", [[[e1 edgeNode] label] isEqualToString:@"-"]); +// NSString *sty = [[[[[e1 edgeNode] data] atoms] objectEnumerator] nextObject]; +// TEST(@"Edge node styled correctly", sty!=nil && [sty isEqualToString:@"tick"]); + + PUTS(@"Source anchor: %@",[e1 sourceAnchor]); + PUTS(@"Target anchor: %@",[e1 targetAnchor]); + + endTestBlock(@"parser"); + + [pool drain]; +} diff --git a/tikzit-1/src/common/test/test.h b/tikzit-1/src/common/test/test.h new file mode 100644 index 0000000..59dcdd4 --- /dev/null +++ b/tikzit-1/src/common/test/test.h @@ -0,0 +1,57 @@ +// +// test.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// +#import + +@interface Allocator : NSObject +{} +@end + +BOOL fuzzyCompare (float f1, float f2); +BOOL fuzzyComparePoints (NSPoint p1, NSPoint p2); + +void setColorEnabled(BOOL b); + +void pass(NSString *msg); +void fail(NSString *msg); +void TEST(NSString *msg, BOOL test); +void assertRectsEqual (NSString *msg, NSRect val, NSRect exp); +void assertPointsEqual (NSString *msg, NSPoint val, NSPoint exp); +void assertFloatsEqual (NSString *msg, float val, float exp); + +void startTests(); +void endTests(); + +void startTestBlock(NSString *name); +void endTestBlock(NSString *name); + +#define PUTS(fmt, ...) { \ + NSString *_str = [[NSString alloc] initWithFormat:fmt, ##__VA_ARGS__]; \ + printf("%s\n", [_str UTF8String]); \ + [_str release]; } + +#define failFmt(fmt, ...) { \ + NSString *_fstr = [[NSString alloc] initWithFormat:fmt, ##__VA_ARGS__]; \ + fail(_fstr); \ + [_fstr release]; } + +// vim:ft=objc:ts=4:sts=4:sw=4:noet diff --git a/tikzit-1/src/common/test/test.m b/tikzit-1/src/common/test/test.m new file mode 100644 index 0000000..9afcd67 --- /dev/null +++ b/tikzit-1/src/common/test/test.m @@ -0,0 +1,175 @@ +// +// test.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// +#import "test/test.h" + +static int PASSES; +static int FAILS; + +static int ALLOC_INSTANCES = 0; + +static BOOL colorEnabled = YES; +static int depth = 0; + +static NSString *RED, *GREEN, *BLUE, *OFF; + +static NSString *indents[6] = + {@"", @" ", @" ", @" ", + @" ", @" "}; + +#define INDENT ((depth >= 6) ? indents[5] : indents[depth]) + + +@implementation Allocator + ++ (id)alloc { + ++ALLOC_INSTANCES; + return [super alloc]; +} + +- (void)dealloc { + --ALLOC_INSTANCES; + [super dealloc]; +} + ++ (Allocator*)allocator { + return [[[Allocator alloc] init] autorelease]; +} + +@end + +BOOL fuzzyCompare(float f1, float f2) { + return (ABS(f1 - f2) <= 0.00001f * MAX(1.0f,MIN(ABS(f1), ABS(f2)))); +} + +BOOL fuzzyComparePoints (NSPoint p1, NSPoint p2) { + return fuzzyCompare (p1.x, p2.x) && fuzzyCompare (p1.y, p2.y); +} + +void pass(NSString *msg) { + PUTS(@"%@[%@PASS%@] %@", INDENT, GREEN, OFF, msg); + ++PASSES; +} + +void fail(NSString *msg) { + PUTS(@"%@[%@FAIL%@] %@", INDENT, RED, OFF, msg); + ++FAILS; +} + +void TEST(NSString *msg, BOOL test) { + if (test) { + pass (msg); + } else { + fail (msg); + } +} + +void assertRectsEqual (NSString *msg, NSRect r1, NSRect r2) { + BOOL equal = fuzzyCompare (r1.origin.x, r2.origin.x) && + fuzzyCompare (r1.origin.y, r2.origin.y) && + fuzzyCompare (r1.size.width, r2.size.width) && + fuzzyCompare (r1.size.height, r2.size.height); + if (equal) { + pass (msg); + } else { + failFmt(@"%@ (expected (%f,%f:%fx%f) but got (%f,%f:%fx%f))", + msg, + r2.origin.x, r2.origin.y, r2.size.width, r2.size.height, + r1.origin.x, r1.origin.y, r1.size.width, r1.size.height); + } +} + +void assertPointsEqual (NSString *msg, NSPoint p1, NSPoint p2) { + BOOL equal = fuzzyCompare (p1.x, p2.x) && fuzzyCompare (p1.y, p2.y); + if (equal) { + pass (msg); + } else { + failFmt(@"%@ (expected (%f,%f) but got (%f,%f)", + msg, + p2.x, p2.y, + p1.x, p1.y); + } +} + +void assertFloatsEqual (NSString *msg, float f1, float f2) { + if (fuzzyCompare (f1, f2)) { + pass (msg); + } else { + failFmt(@"%@ (expected %f but got %f", msg, f2, f1); + } +} + +void startTests() { + PASSES = 0; + FAILS = 0; +} + +void endTests() { + PUTS(@"Done testing. %@%d%@ passed, %@%d%@ failed.", + GREEN, PASSES, OFF, + RED, FAILS, OFF); +} + +void startTestBlock(NSString *name) { + PUTS(@"%@Starting %@%@%@ tests.", INDENT, BLUE, name, OFF); + ++depth; +} + +void endTestBlock(NSString *name) { + --depth; + PUTS(@"%@Done with %@%@%@ tests.", INDENT, BLUE, name, OFF); +} + +void setColorEnabled(BOOL b) { + colorEnabled = b; + if (b) { + RED = @"\033[31;1m"; + GREEN = @"\033[32;1m"; + BLUE = @"\033[36;1m"; + OFF = @"\033[0m"; + } else { + RED = @""; + GREEN = @""; + BLUE = @""; + OFF = @""; + } +} + +#ifdef STAND_ALONE +void runTests(); + +int main() { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + setColorEnabled (NO); + startTests(); + + runTests(); + + endTests(); + + [pool drain]; + return 0; +} +#endif + +// vim:ft=objc:ts=4:sts=4:sw=4:noet diff --git a/tikzit-1/src/common/tikzlexer.lm b/tikzit-1/src/common/tikzlexer.lm new file mode 100644 index 0000000..1e92f73 --- /dev/null +++ b/tikzit-1/src/common/tikzlexer.lm @@ -0,0 +1,170 @@ +%{ +/* + * Copyright 2010 Chris Heunen + * Copyright 2010-2013 Aleks Kissinger + * Copyright 2013 K. Johan Paulsson + * Copyright 2013 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import +#import "tikzparserdefs.h" +#import "tikzparser.h" + +#define YY_USER_ACTION \ + yylloc->first_line = yylloc->last_line; \ + yylloc->first_column = yylloc->last_column + 1; \ + yylloc->last_column = yylloc->first_column + yyleng - 1; + +%} + +%option reentrant bison-bridge bison-locations 8bit +%option nounput +%option yylineno +%option noyywrap +%option header-file="common/tikzlexer.h" +%option extra-type="TikzGraphAssembler *" + + +%s props +%s xcoord +%s ycoord +%s noderef + +FLOAT \-?[0-9]*(\.[0-9]+)? + +%% + + /* whitespace is ignored, except for position counting; we don't + count formfeed and vtab as whitespace, because it's not obvious + how they should be dealt with and no-one actually uses them */ + + /* lex will take the longest-matching string */ +\r\n|\r|\n { + yylloc->first_line += 1; + yylloc->last_line = yylloc->first_line; + yylloc->first_column = yylloc->last_column = 0; +} +[\t ]+ { } + +\\begin\{tikzpicture\} { return BEGIN_TIKZPICTURE_CMD; } +\\end\{tikzpicture\} { return END_TIKZPICTURE_CMD; } +\\begin\{pgfonlayer\} { return BEGIN_PGFONLAYER_CMD; } +\\end\{pgfonlayer\} { return END_PGFONLAYER_CMD; } +\\draw { return DRAW_CMD; } +\\node { return NODE_CMD; } +\\path { return PATH_CMD; } +rectangle { return RECTANGLE; } +node { return NODE; } +at { return AT; } +to { return TO; } +; { return SEMICOLON; } + +\([ ]*{FLOAT}[ ]*,[ ]*{FLOAT}[ ]*\) { + yylloc->last_column = yylloc->first_column + 1; + yyless(1); + BEGIN(xcoord); +} +{FLOAT} { + yylval->pt.x=(float)strtod(yytext,NULL); + BEGIN(ycoord); +} +, { } +{FLOAT} { + yylval->pt.y=(float)strtod(yytext,NULL); +} +\) { + BEGIN(INITIAL); + return COORD; +} + + /* when we see "[", change parsing mode */ +\[ /*syntaxhlfix]*/ { + BEGIN(props); + return LEFTBRACKET; +} += { return EQUALS; } +, { return COMMA; } + /* technically, it is possible to have newlines in the middle of + property names or values, but in practice this is unlikely and + screws up our line counting */ +[^=,\{\] \t\n]([^=,\{\]\n]*[^=,\{\] \t\n])? { + yylval->nsstr=[NSString stringWithUTF8String:yytext]; + return PROPSTRING; +} +\] { + BEGIN(INITIAL); + return RIGHTBRACKET; +} + +\( { + BEGIN(noderef); + return LEFTPARENTHESIS; +} +\. { + return FULLSTOP; +} + /* we assume node names (and anchor names) never contain + newlines */ +[^\.\{\)\n]+ { + yylval->nsstr=[NSString stringWithUTF8String:yytext]; + return REFSTRING; +} +\) { + BEGIN(INITIAL); + return RIGHTPARENTHESIS; +} + +\{ { + NSMutableString *buf = [NSMutableString string]; + unsigned int brace_depth = 1; + unsigned int escape = 0; + while (1) { + char c = input(yyscanner); + // eof reached before closing brace + if (c == '\0' || c == EOF) { + return UNCLOSED_DELIM_STR; + } + + yylloc->last_column += 1; + yyleng += 1; + if (escape) { + escape = 0; + } else if (c == '\\') { + escape = 1; + } else if (c == '{') { + brace_depth++; + } else if (c == '}') { + brace_depth--; + if (brace_depth == 0) break; + } else if (c == '\n') { + yylloc->last_line += 1; + yylloc->last_column = 0; + } + [buf appendFormat:@"%c", c]; + } + + yylval->nsstr = buf; + return DELIMITEDSTRING; +} + +\\begin { return UNKNOWN_BEGIN_CMD; } +\\end { return UNKNOWN_END_CMD; } +\\[a-zA-Z0-9]+ { return UNKNOWN_CMD; } +[a-zA-Z0-9]+ { return UNKNOWN_STR; } +. { return UNKNOWN_STR; } + + /* vi:ft=lex:noet:ts=4:sts=4:sw=4: + */ diff --git a/tikzit-1/src/common/tikzparser.ym b/tikzit-1/src/common/tikzparser.ym new file mode 100644 index 0000000..344e969 --- /dev/null +++ b/tikzit-1/src/common/tikzparser.ym @@ -0,0 +1,224 @@ +%{ +/* + * Copyright 2010 Chris Heunen + * Copyright 2010-2013 Aleks Kissinger + * Copyright 2013 K. Johan Paulsson + * Copyright 2013 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "tikzparserdefs.h" +%} + +/* we use features added to bison 2.4 */ +%require "2.3" + +%error-verbose +/* enable maintaining locations for better error messages */ +%locations +/* the name of the header file */ +/*%defines "common/tikzparser.h"*/ +/* make it re-entrant (no global variables) */ +%pure-parser +/* We use a pure (re-entrant) lexer. This means yylex + will take a void* (opaque) type to maintain its state */ +%lex-param {void *scanner} +/* Since this parser is also pure, yyparse needs to take + that lexer state as an argument */ +%parse-param {void *scanner} + +/* possible data types for semantic values */ +%union { + NSString *nsstr; + GraphElementProperty *prop; + GraphElementData *data; + Node *node; + NSPoint pt; + struct noderef noderef; +} + +%{ +#import "GraphElementData.h" +#import "GraphElementProperty.h" +#import "Node.h" +#import "Edge.h" + +#import "tikzlexer.h" +#import "TikzGraphAssembler+Parser.h" +/* the assembler (used by this parser) is stored in the lexer + state as "extra" data */ +#define assembler yyget_extra(scanner) + +/* pass errors off to the assembler */ +void yyerror(YYLTYPE *yylloc, void *scanner, const char *str) { + [assembler reportError:str atLocation:yylloc]; +} +%} + +/* yyloc is set up with first_column = last_column = 1 by default; + however, it makes more sense to think of us being "before the + start of the line" before we parse anything */ +%initial-action { + yylloc.first_column = yylloc.last_column = 0; +} + + +%token BEGIN_TIKZPICTURE_CMD "\\begin{tikzpicture}" +%token END_TIKZPICTURE_CMD "\\end{tikzpicture}" +%token BEGIN_PGFONLAYER_CMD "\\begin{pgfonlayer}" +%token END_PGFONLAYER_CMD "\\end{pgfonlayer}" +%token DRAW_CMD "\\draw" +%token NODE_CMD "\\node" +%token PATH_CMD "\\path" +%token RECTANGLE "rectangle" +%token NODE "node" +%token AT "at" +%token TO "to" +%token SEMICOLON ";" +%token COMMA "," + +%token LEFTPARENTHESIS "(" +%token RIGHTPARENTHESIS ")" +%token LEFTBRACKET "[" +%token RIGHTBRACKET "]" +%token FULLSTOP "." +%token EQUALS "=" +%token COORD "co-ordinate" +%token PROPSTRING "key/value string" +%token REFSTRING "string" +%token DELIMITEDSTRING "{-delimited string" + +%token UNKNOWN_BEGIN_CMD "unknown \\begin command" +%token UNKNOWN_END_CMD "unknown \\end command" +%token UNKNOWN_CMD "unknown latex command" +%token UNKNOWN_STR "unknown string" +%token UNCLOSED_DELIM_STR "unclosed {-delimited string" + +%type nodename +%type optanchor +%type val +%type property +%type extraproperties +%type properties +%type optproperties +%type optedgenode +%type noderef +%type optnoderef + +%% + +tikzpicture: "\\begin{tikzpicture}" optproperties tikzcmds "\\end{tikzpicture}" + { + if ($2) { + [[assembler graph] setData:$2]; + } + }; +tikzcmds: tikzcmds tikzcmd | ; +tikzcmd: node | edge | boundingbox | ignore; + +ignore: "\\begin{pgfonlayer}" DELIMITEDSTRING | "\\end{pgfonlayer}"; + +optproperties: + "[" "]" + { $$ = nil; } + | "[" properties "]" + { $$ = $2; } + | { $$ = nil; }; +properties: extraproperties property + { + [$1 addObject:$2]; + $$ = $1; + }; +extraproperties: + extraproperties property "," + { + [$1 addObject:$2]; + $$ = $1; + } + | { $$ = [GraphElementData data]; }; +property: + val "=" val + { $$ = [GraphElementProperty property:$1 withValue:$3]; } + | val + { $$ = [GraphElementProperty atom:$1]; }; +val: PROPSTRING { $$ = $1; } | DELIMITEDSTRING { $$ = $1; }; + +nodename: "(" REFSTRING ")" { $$ = $2; }; +node: "\\node" optproperties nodename "at" COORD DELIMITEDSTRING ";" + { + Node *node = [[Node alloc] init]; + if ($2) + [node setData:$2]; + [node setName:$3]; + [node setPoint:$5]; + [node setLabel:$6]; + [assembler addNodeToMap:node]; + [[assembler graph] addNode:node]; +#if ! __has_feature(objc_arc) + [node release]; +#endif + }; + +optanchor: { $$ = nil; } | "." REFSTRING { $$ = $2; }; +noderef: "(" REFSTRING optanchor ")" + { + $$.node = [assembler nodeWithName:$2]; + $$.anchor = $3; + }; +optnoderef: + noderef { $$ = $1; } + | "(" ")" { $$.node = nil; $$.anchor = nil; } +optedgenode: + { $$ = nil; } + | "node" optproperties DELIMITEDSTRING + { + $$ = [Node node]; + if ($2) + [$$ setData:$2]; + [$$ setLabel:$3]; + } +edge: "\\draw" optproperties noderef "to" optedgenode optnoderef ";" + { + Edge *edge = [[Edge alloc] init]; + if ($2) + [edge setData:$2]; + [edge setSource:$3.node]; + [edge setSourceAnchor:$3.anchor]; + [edge setEdgeNode:$5]; + if ($6.node) { + [edge setTarget:$6.node]; + [edge setTargetAnchor:$6.anchor]; + } else { + [edge setTarget:$3.node]; + [edge setTargetAnchor:$3.anchor]; + } + [edge setAttributesFromData]; + [[assembler graph] addEdge:edge]; +#if ! __has_feature(objc_arc) + [edge release]; +#endif + }; + +ignoreprop: val | val "=" val; +ignoreprops: ignoreprop ignoreprops | ; +optignoreprops: "[" ignoreprops "]"; +boundingbox: + "\\path" optignoreprops COORD "rectangle" COORD ";" + { + [[assembler graph] setBoundingBox:NSRectAroundPoints($3, $5)]; + }; + +/* vi:ft=yacc:noet:ts=4:sts=4:sw=4 +*/ diff --git a/tikzit-1/src/common/tikzparserdefs.h b/tikzit-1/src/common/tikzparserdefs.h new file mode 100644 index 0000000..cde3345 --- /dev/null +++ b/tikzit-1/src/common/tikzparserdefs.h @@ -0,0 +1,49 @@ +/* + * Copyright 2013 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/* + * This file sets up some defs (particularly struct noderef) needed for + * the tikz parser and its users. + * + * It is needed because we wish to support bison 2.3, which is the + * version shipped with OSX. bison 2.4 onwards allows us to put this + * stuff in a "%code requires" block, where it will be put in the + * generated header file by bison. + * + * All the types used by the %union directive in tikzparser.ym should + * be declared, defined or imported here. + */ + +// Foundation has NSPoint and NSString +#import + +@class TikzGraphAssembler; +@class GraphElementData; +@class GraphElementProperty; +@class Node; + +struct noderef { +#if __has_feature(objc_arc) + __unsafe_unretained Node *node; + __unsafe_unretained NSString *anchor; +#else + Node *node; + NSString *anchor; +#endif +}; + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/util.h b/tikzit-1/src/common/util.h new file mode 100644 index 0000000..b34f25d --- /dev/null +++ b/tikzit-1/src/common/util.h @@ -0,0 +1,201 @@ +// +// util.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// + +#import + +#include + +#ifndef M_PI +#define M_PI 3.141592654 +#endif + +#ifndef MAX +#define MAX(a,b) (((a) > (b)) ? (a) : (b)) +#endif + +#ifndef MIN +#define MIN(a,b) (((a) < (b)) ? (a) : (b)) +#endif + +/*! + @brief Compute a bounding rectangle for two given points. + @param p1 a point. + @param p2 another point. + @result A bounding rectangle for p1 and p2. + */ +NSRect NSRectAroundPoints(NSPoint p1, NSPoint p2); + +/*! + @brief Compute a bounding rectangle for two given points. + @param rect the base rectangle + @param the point to ensure is included + @result A rectangle containing rect and p + */ +NSRect NSRectWithPoint(NSRect rect, NSPoint p); + +/*! + @brief Compute a bounding rectangle for two given points with a given padding. + @param p1 a point. + @param p2 another point. + @param padding a padding. + @result A bounding rectangle for p1 and p2 with padding. + */ +NSRect NSRectAroundPointsWithPadding(NSPoint p1, NSPoint p2, float padding); + +/*! + @brief Compute a bounding rectangle for four given points. + @result A bounding rectangle for p1, p2, p3 and p4. + */ +NSRect NSRectAround4Points(NSPoint p1, NSPoint p2, NSPoint p3, NSPoint p4); + +/*! + @brief Compute a bounding rectangle for four given points. + @param padding the amount to pad the rectangle + @result A bounding rectangle for p1, p2, p3 and p4 with padding + */ +NSRect NSRectAround4PointsWithPadding(NSPoint p1, NSPoint p2, NSPoint p3, NSPoint p4, float padding); + +/*! + @brief Find the distance between two points + @param p1 The first point + @param p2 The second point + @result The distance between p1 and p2 + */ +float NSDistanceBetweenPoints(NSPoint p1, NSPoint p2); + +/*! + @brief Compute the 'real' arctan for two points. Always succeeds and gives a good angle, + regardless of sign, zeroes, etc. + @param dx the x distance between points. + @param dy the y distance between points. + @result An angle in radians. + */ +float good_atan(float dx, float dy); + +/*! + @brief Interpolate along a bezier curve to the given distance. To find the x coord, + use the relavant x coordinates for c0-c3, and for y use the y's. + @param dist a distance from 0 to 1 spanning the whole curve. + @param c0 the x (resp. y) coordinate of the start point. + @param c1 the x (resp. y) coordinate of the first control point. + @param c2 the x (resp. y) coordinate of the second control point. + @param c3 the x (resp. y) coordinate of the end point. + @result The x (resp. y) coordinate of the point at 'dist'. + */ +float bezierInterpolate (float dist, float c0, float c1, float c2, float c3); + +/*! + @brief Interpolate along a bezier curve to the given distance. + @param dist a distance from 0 to 1 spanning the whole curve. + @param c0 the x start point. + @param c1 the x first control point. + @param c2 the x second control point. + @param c3 the x end point. + @result The point at 'dist'. + */ +NSPoint bezierInterpolateFull (float dist, NSPoint c0, NSPoint c1, NSPoint c2, NSPoint c3); + +/*! + * @brief Find whether two line segments intersect + * @param l1start The starting point of line segment 1 + * @param l1end The ending point of line segment 1 + * @param l2start The starting point of line segment 2 + * @param l2end The ending point of line segment 2 + * @param result A location to store the intersection point + * @result YES if they intersect, NO if they do not + */ +BOOL lineSegmentsIntersect (NSPoint l1start, NSPoint l1end, NSPoint l2start, NSPoint l2end, NSPoint *result); + +/*! + * @brief Find whether a line segment intersects a bezier curve + * @detail Always finds the intersection furthest along the line segment + * @param lstart The starting point of the line segment + * @param lend The ending point of the line segment + * @param c0 The starting point of the bezier curve + * @param c1 The first control point of the bezier curve + * @param c2 The second control point of the bezier curve + * @param c3 The ending point of the bezier curve + * @param result A location to store the intersection point + * @result YES if they intersect, NO if they do not + */ +BOOL lineSegmentIntersectsBezier (NSPoint lstart, NSPoint lend, NSPoint c0, NSPoint c1, NSPoint c2, NSPoint c3, NSPoint *result); + +/*! + * @brief Find whether a line segment enters a rectangle + * @param lineStart The starting point of the line segment + * @param lineEnd The ending point of the line segment + * @param rect The rectangle + * @result YES if they intersect, NO if they do not + */ +BOOL lineSegmentIntersectsRect (NSPoint lineStart, NSPoint lineEnd, NSRect rect); + +/*! + * @brief Find where a ray exits a rectangle + * @param rayStart The starting point of the ray; must be contained in rect + * @param angle_rads The angle of the ray, in radians + * @param rect The rectangle + * @result The point at which the ray leaves the rect + */ +NSPoint findExitPointOfRay (NSPoint rayStart, float angle_rads, NSRect rect); + +/*! + @brief Round val to nearest stepSize + @param stepSize the courseness + @param val a value to round + */ +float roundToNearest(float stepSize, float val); + +/*! + @brief Convert radians into degrees + */ +float radiansToDegrees(float radians); + +/*! + @brief Convert degrees into radians + */ +float degreesToRadians(float degrees); + +/*! + @brief Normalises an angle (in degrees) to fall between -179 and 180 + */ +int normaliseAngleDeg (int degrees); + +/*! + @brief Normalises an angle (in radians) to fall in the range (-pi,pi] + */ +float normaliseAngleRad (float rads); + +/*! + @brief Express a byte as alpha-only hex, with digits (0..16) -> (a..jA..F) + @param sh A number 0-255 + @result A string 'aa'-'FF' + */ +NSString *alphaHex(unsigned short sh); + +const char *find_start_of_nth_line (const char * string, int line); + +/*! + @brief Formats a CGFloat as a string, removing trailing zeros + @detail Unlike formatting an NSNumber, or using %g, it will never + produce scientific notation (like "2.00e2"). Unlike %f, + it will not include unnecessary trailing zeros. + */ +NSString *formatFloat(CGFloat f, int maxdps); + diff --git a/tikzit-1/src/common/util.m b/tikzit-1/src/common/util.m new file mode 100644 index 0000000..e9b8899 --- /dev/null +++ b/tikzit-1/src/common/util.m @@ -0,0 +1,403 @@ +// +// util.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// + +#import "util.h" +#import "math.h" + +static BOOL fuzzyCompare(float f1, float f2) { + return (ABS(f1 - f2) <= 0.00001f * MIN(ABS(f1), ABS(f2))); +} + +NSRect NSRectWithPoint(NSRect rect, NSPoint p) { + CGFloat minX = NSMinX(rect); + CGFloat maxX = NSMaxX(rect); + CGFloat minY = NSMinY(rect); + CGFloat maxY = NSMaxY(rect); + if (p.x < minX) { + minX = p.x; + } else if (p.x > maxX) { + maxX = p.x; + } + if (p.y < minY) { + minY = p.y; + } else if (p.y > maxY) { + maxY = p.y; + } + return NSMakeRect(minX, minY, maxX - minX, maxY - minY); +} + +NSRect NSRectAroundPointsWithPadding(NSPoint p1, NSPoint p2, float padding) { + return NSMakeRect(MIN(p1.x,p2.x)-padding, + MIN(p1.y,p2.y)-padding, + ABS(p2.x-p1.x)+(2.0f*padding), + ABS(p2.y-p1.y)+(2.0f*padding)); +} + +NSRect NSRectAroundPoints(NSPoint p1, NSPoint p2) { + return NSRectAroundPointsWithPadding(p1, p2, 0.0f); +} + +NSRect NSRectAround4PointsWithPadding(NSPoint p1, NSPoint p2, NSPoint p3, NSPoint p4, float padding) { + float leftMost = MIN(p1.x, p2.x); + leftMost = MIN(leftMost, p3.x); + leftMost = MIN(leftMost, p4.x); + float rightMost = MAX(p1.x, p2.x); + rightMost = MAX(rightMost, p3.x); + rightMost = MAX(rightMost, p4.x); + float topMost = MIN(p1.y, p2.y); + topMost = MIN(topMost, p3.y); + topMost = MIN(topMost, p4.y); + float bottomMost = MAX(p1.y, p2.y); + bottomMost = MAX(bottomMost, p3.y); + bottomMost = MAX(bottomMost, p4.y); + return NSMakeRect(leftMost-padding, + topMost-padding, + (rightMost - leftMost)+(2.0f*padding), + (bottomMost - topMost)+(2.0f*padding)); +} + +NSRect NSRectAround4Points(NSPoint p1, NSPoint p2, NSPoint p3, NSPoint p4) { + return NSRectAround4PointsWithPadding(p1, p2, p3, p4, 0.0f); +} + +float NSDistanceBetweenPoints(NSPoint p1, NSPoint p2) { + float dx = p2.x - p1.x; + float dy = p2.y - p1.y; + return sqrt(dx * dx + dy * dy); +} + +float good_atan(float dx, float dy) { + if (dx > 0) { + return atan(dy/dx); + } else if (dx < 0) { + return M_PI + atan(dy/dx); + } else { + if (dy > 0) return 0.5 * M_PI; + else if (dy < 0) return 1.5 * M_PI; + else return 0; + } +} + +// interpolate on a cubic bezier curve +float bezierInterpolate(float dist, float c0, float c1, float c2, float c3) { + float distp = 1 - dist; + return (distp*distp*distp) * c0 + + 3 * (distp*distp) * dist * c1 + + 3 * (dist*dist) * distp * c2 + + (dist*dist*dist) * c3; +} + +NSPoint bezierInterpolateFull (float dist, NSPoint c0, NSPoint c1, NSPoint c2, NSPoint c3) { + return NSMakePoint (bezierInterpolate (dist, c0.x, c1.x, c2.x, c3.x), + bezierInterpolate (dist, c0.y, c1.y, c2.y, c3.y)); +} + +static void lineCoeffsFromPoints(NSPoint p1, NSPoint p2, float *A, float *B, float *C) { + *A = p2.y - p1.y; + *B = p1.x - p2.x; + *C = (*A) * p1.x + (*B) * p1.y; +} + +static void lineCoeffsFromPointAndAngle(NSPoint p, float angle, float *A, float *B, float *C) { + *A = sin (angle); + *B = -cos (angle); + *C = (*A) * p.x + (*B) * p.y; +} + +static BOOL lineSegmentContainsPoint(NSPoint l1, NSPoint l2, float x, float y) { + float minX = MIN(l1.x, l2.x); + float maxX = MAX(l1.x, l2.x); + float minY = MIN(l1.y, l2.y); + float maxY = MAX(l1.y, l2.y); + return (x >= minX || fuzzyCompare (x, minX)) && + (x <= maxX || fuzzyCompare (x, maxX)) && + (y >= minY || fuzzyCompare (y, minY)) && + (y <= maxY || fuzzyCompare (y, maxY)); +} + +BOOL lineSegmentsIntersect(NSPoint l1start, NSPoint l1end, NSPoint l2start, NSPoint l2end, NSPoint *result) { + // Ax + By = C + float A1, B1, C1; + lineCoeffsFromPoints(l1start, l1end, &A1, &B1, &C1); + float A2, B2, C2; + lineCoeffsFromPoints(l2start, l2end, &A2, &B2, &C2); + + float det = A1*B2 - A2*B1; + if (det == 0.0f) { + // parallel + return NO; + } else { + float x = (B2*C1 - B1*C2)/det; + float y = (A1*C2 - A2*C1)/det; + + if (lineSegmentContainsPoint(l1start, l1end, x, y) && + lineSegmentContainsPoint(l2start, l2end, x, y)) { + if (result) { + (*result).x = x; + (*result).y = y; + } + return YES; + } + } + return NO; +} + +BOOL lineSegmentIntersectsBezier (NSPoint lstart, NSPoint lend, NSPoint c0, NSPoint c1, NSPoint c2, NSPoint c3, NSPoint *result) { + NSRect curveBounds = NSRectAround4Points(c0, c1, c2, c3); + if (!lineSegmentIntersectsRect(lstart, lend, curveBounds)) + return NO; + + const int divisions = 20; + const float chunkSize = 1.0f/(float)divisions; + float chunkStart = 0.0f; + BOOL found = NO; + + for (int i = 0; i < divisions; ++i) { + float chunkEnd = chunkStart + chunkSize; + + NSPoint p1 = bezierInterpolateFull (chunkStart, c0, c1, c2, c3); + NSPoint p2 = bezierInterpolateFull (chunkEnd, c0, c1, c2, c3); + + NSPoint p; + if (lineSegmentsIntersect (lstart, lend, p1, p2, &p)) { + lstart = p; + found = YES; + } + + chunkStart = chunkEnd; + } + if (found && result) { + *result = lstart; + } + return found; +} + +BOOL lineSegmentIntersectsRect(NSPoint lineStart, NSPoint lineEnd, NSRect rect) { + const float rectMaxX = NSMaxX(rect); + const float rectMinX = NSMinX(rect); + const float rectMaxY = NSMaxY(rect); + const float rectMinY = NSMinY(rect); + + // check if the segment is entirely to one side of the rect + if (lineStart.x > rectMaxX && lineEnd.x > rectMaxX) { + return NO; + } + if (lineStart.x < rectMinX && lineEnd.x < rectMinX) { + return NO; + } + if (lineStart.y > rectMaxY && lineEnd.y > rectMaxY) { + return NO; + } + if (lineStart.y < rectMinY && lineEnd.y < rectMinY) { + return NO; + } + + // Now check whether the (infinite) line intersects the rect + // (if it does, so does the segment, due to above checks) + + // Ax + By = C + float A, B, C; + lineCoeffsFromPoints(lineStart, lineEnd, &A, &B, &C); + + const float tlVal = A * rectMinX + B * rectMaxY - C; + const float trVal = A * rectMaxX + B * rectMaxY - C; + const float blVal = A * rectMinX + B * rectMinY - C; + const float brVal = A * rectMaxX + B * rectMinY - C; + + if (tlVal < 0 && trVal < 0 && blVal < 0 && brVal < 0) { + // rect below line + return NO; + } + if (tlVal > 0 && trVal > 0 && blVal > 0 && brVal > 0) { + // rect above line + return NO; + } + + return YES; +} + +NSPoint findExitPointOfRay (NSPoint p, float angle_rads, NSRect rect) { + const float rectMinX = NSMinX (rect); + const float rectMaxX = NSMaxX (rect); + const float rectMinY = NSMinY (rect); + const float rectMaxY = NSMaxY (rect); + + const float angle = normaliseAngleRad (angle_rads); + + // special case the edges + if (p.y == rectMaxY && angle > 0 && angle < M_PI) { + // along the top of the box + return p; + } + if (p.y == rectMinY && angle < 0 && angle > -M_PI) { + // along the bottom of the box + return p; + } + if (p.x == rectMaxX && angle > -M_PI/2.0f && angle < M_PI/2.0f) { + // along the right of the box + return p; + } + if (p.x == rectMinX && (angle > M_PI/2.0f || angle < -M_PI/2.0f)) { + // along the left of the box + return p; + } + + float A1, B1, C1; + lineCoeffsFromPointAndAngle(p, angle, &A1, &B1, &C1); + //NSLog(@"Ray is %fx + %fy = %f", A1, B1, C1); + + const float tlAngle = normaliseAngleRad (good_atan (rectMinX - p.x, rectMaxY - p.y)); + const float trAngle = normaliseAngleRad (good_atan (rectMaxX - p.x, rectMaxY - p.y)); + if (angle <= tlAngle && angle >= trAngle) { + // exit top + float A2, B2, C2; + lineCoeffsFromPoints(NSMakePoint (rectMinX, rectMaxY), + NSMakePoint (rectMaxX, rectMaxY), + &A2, &B2, &C2); + float det = A1*B2 - A2*B1; + NSCAssert(det != 0.0f, @"Parallel lines?"); + NSPoint intersect = NSMakePoint ((B2*C1 - B1*C2)/det, + (A1*C2 - A2*C1)/det); + return intersect; + } + + const float brAngle = normaliseAngleRad (good_atan (rectMaxX - p.x, rectMinY - p.y)); + if (angle <= trAngle && angle >= brAngle) { + // exit right + float A2, B2, C2; + lineCoeffsFromPoints(NSMakePoint (rectMaxX, rectMaxY), + NSMakePoint (rectMaxX, rectMinY), + &A2, &B2, &C2); + //NSLog(@"Edge is %fx + %fy = %f", A2, B2, C2); + float det = A1*B2 - A2*B1; + NSCAssert(det != 0.0f, @"Parallel lines?"); + NSPoint intersect = NSMakePoint ((B2*C1 - B1*C2)/det, + (A1*C2 - A2*C1)/det); + return intersect; + } + + const float blAngle = normaliseAngleRad (good_atan (rectMinX - p.x, rectMinY - p.y)); + if (angle <= brAngle && angle >= blAngle) { + // exit bottom + float A2, B2, C2; + lineCoeffsFromPoints(NSMakePoint (rectMaxX, rectMinY), + NSMakePoint (rectMinX, rectMinY), + &A2, &B2, &C2); + float det = A1*B2 - A2*B1; + NSCAssert(det != 0.0f, @"Parallel lines?"); + NSPoint intersect = NSMakePoint ((B2*C1 - B1*C2)/det, + (A1*C2 - A2*C1)/det); + return intersect; + } else { + // exit left + float A2, B2, C2; + lineCoeffsFromPoints(NSMakePoint (rectMinX, rectMaxY), + NSMakePoint (rectMinX, rectMinY), + &A2, &B2, &C2); + float det = A1*B2 - A2*B1; + NSCAssert(det != 0.0f, @"Parallel lines?"); + NSPoint intersect = NSMakePoint ((B2*C1 - B1*C2)/det, + (A1*C2 - A2*C1)/det); + return intersect; + } +} + +float roundToNearest(float stepSize, float val) { + if (stepSize==0.0f) return val; + else return round(val/stepSize)*stepSize; +} + +float radiansToDegrees (float radians) { + return (radians * 180.0f) / M_PI; +} + +float degreesToRadians(float degrees) { + return (degrees * M_PI) / 180.0f; +} + +int normaliseAngleDeg (int degrees) { + while (degrees > 180) { + degrees -= 360; + } + while (degrees <= -180) { + degrees += 360; + } + return degrees; +} + +float normaliseAngleRad (float rads) { + while (rads > M_PI) { + rads -= 2 * M_PI; + } + while (rads <= -M_PI) { + rads += 2 * M_PI; + } + return rads; +} + +static char ahex[] = +{'a','b','c','d','e','f','g','h','i','j', + 'A','B','C','D','E','F'}; + +NSString *alphaHex(unsigned short sh) { + if (sh > 255) return @"!!"; + return [NSString stringWithFormat:@"%c%c", ahex[sh/16], ahex[sh%16]]; +} + +const char *find_start_of_nth_line (const char * string, int line) { + int l = 0; + const char *lineStart = string; + while (*lineStart && l < line) { + while (*lineStart && *lineStart != '\n') { + ++lineStart; + } + if (*lineStart) { + ++l; + ++lineStart; + } + } + return lineStart; +} + +NSString *formatFloat(CGFloat f, int maxdps) { + NSMutableString *result = [NSMutableString + stringWithFormat:@"%.*f", maxdps, f]; + // delete trailing zeros + NSUInteger lastPos = [result length] - 1; + NSUInteger firstDigit = ([result characterAtIndex:0] == '-') ? 1 : 0; + while (lastPos > firstDigit) { + if ([result characterAtIndex:lastPos] == '0') { + [result deleteCharactersInRange:NSMakeRange(lastPos, 1)]; + lastPos -= 1; + } else { + break; + } + } + if ([result characterAtIndex:lastPos] == '.') { + [result deleteCharactersInRange:NSMakeRange(lastPos, 1)]; + lastPos -= 1; + } + if ([@"-0" isEqualToString:result]) + return @"0"; + else + return result; +} + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/Application.h b/tikzit-1/src/gtk/Application.h new file mode 100644 index 0000000..1b48a79 --- /dev/null +++ b/tikzit-1/src/gtk/Application.h @@ -0,0 +1,155 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import "InputDelegate.h" + +@class Application; +@class Configuration; +@class ContextWindow; +@class Preambles; +@class PreambleEditor; +@class PreviewWindow; +@class SettingsDialog; +@class StyleManager; +@class TikzDocument; +@class ToolBox; +@class Window; +@protocol Tool; + +extern Application* app; + +/** + * Manages the main application window + */ +@interface Application: NSObject { + // the main application configuration + Configuration *configFile; + // maintains the known (user-defined) styles + StyleManager *styleManager; + // maintains the preambles used for previews + Preambles *preambles; + // the last-accessed folders (for open and save dialogs) + NSString *lastOpenFolder; + NSString *lastSaveAsFolder; + + ToolBox *toolBox; + PreambleEditor *preambleWindow; + ContextWindow *contextWindow; + SettingsDialog *settingsDialog; + + // the open windows (array of Window*) + NSMutableArray *openWindows; + + // tools + id activeTool; + NSArray *tools; +} + +/** + * The main application configuration file + */ +@property (readonly) Configuration *mainConfiguration; + +/** + * The app-wide style manager instance + */ +@property (readonly) StyleManager *styleManager; + +/** + * The app-wide preambles registry + */ +@property (readonly) Preambles *preambles; + +/** + * The tools + */ +@property (readonly) NSArray *tools; + +/** + * The currently-selected tool + */ +@property (assign) id activeTool; + +/** + * The folder last actively chosen by a user for opening a file + */ +@property (copy) NSString *lastOpenFolder; + +/** + * The folder last actively chosen by a user for saving a file + */ +@property (copy) NSString *lastSaveAsFolder; + +/** + * The application instance. + */ ++ (Application*) app; + +/** + * Starts the application with a single window containing an empty file + */ +- (id) init; +/** + * Starts the application with the given files open + */ +- (id) initWithFiles:(NSArray*)files; + +/** + * Loads a new, empty document in a new window + */ +- (void) newWindow; +/** + * Loads an existing document from a file in a new window + * + * @param doc the document the new window should show + */ +- (void) newWindowWithDocument:(TikzDocument*)doc; +/** + * Quit the application, confirming with the user if there are + * changes to any open documents. + */ +- (void) quit; + +/** + * Show the dialog for editing preambles. + */ +- (void) presentPreamblesEditor; +/** + * Show the context-aware window + */ +- (void) presentContextWindow; +/** + * Show the settings dialog. + */ +- (void) presentSettingsDialog; + +/** + * Save the application configuration to permanent storage + * + * Should be called just before the application exits + */ +- (void) saveConfiguration; + +/** + * @result YES if key event was processed, NO otherwise + */ +- (BOOL) activateToolForKey:(unsigned int)keyVal withMask:(InputMask)mask; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/Application.m b/tikzit-1/src/gtk/Application.m new file mode 100644 index 0000000..e9935bd --- /dev/null +++ b/tikzit-1/src/gtk/Application.m @@ -0,0 +1,377 @@ +/* + * Copyright 2011-2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "Application.h" + +#import "Configuration.h" +#import "EdgeStylesModel.h" +#import "NodeStylesModel.h" +#import "PreambleEditor.h" +#import "ContextWindow.h" +#import "Shape.h" +#import "SettingsDialog.h" +#import "StyleManager.h" +#import "StyleManager+Storage.h" +#import "SupportDir.h" +#import "TikzDocument.h" +#import "ToolBox.h" +#import "Window.h" + +#ifdef HAVE_POPPLER +#import "Preambles.h" +#import "Preambles+Storage.h" +#endif + +#import "BoundingBoxTool.h" +#import "CreateNodeTool.h" +#import "CreateEdgeTool.h" +#import "HandTool.h" +#import "SelectTool.h" + +// used for args to g_mkdir_with_parents +#import "stat.h" + +Application* app = nil; + +@interface Application (Notifications) +- (void) windowClosed:(NSNotification*)notification; +- (void) windowGainedFocus:(NSNotification*)notification; +- (void) selectedToolChanged:(NSNotification*)notification; +- (void) windowDocumentChanged:(NSNotification*)n; +@end + +@interface Application (Private) +- (void) setActiveWindow:(Window*)window; +@end + +@implementation Application + +@synthesize mainConfiguration=configFile; +@synthesize styleManager, preambles; +@synthesize lastOpenFolder, lastSaveAsFolder; +@synthesize tools; + ++ (Application*) app { + if (app == nil) { + [[[self alloc] init] release]; + } + return app; +} + +- (id) _initCommon { + if (app != nil) { + [self release]; + self = app; + return self; + } + self = [super init]; + + if (self) { + NSError *error = nil; + configFile = [[Configuration alloc] initWithName:@"tikzit" loadError:&error]; + if (error != nil) { + logError (error, @"WARNING: Failed to load configuration"); + } + + styleManager = [[StyleManager alloc] init]; + [styleManager loadStylesUsingConfigurationName:@"styles"]; // FIXME: error message? + NodeStylesModel *nsm = [NodeStylesModel modelWithStyleManager:styleManager]; + EdgeStylesModel *esm = [EdgeStylesModel modelWithStyleManager:styleManager]; + +#ifdef HAVE_POPPLER + NSString *preamblesDir = [[SupportDir userSupportDir] stringByAppendingPathComponent:@"preambles"]; + preambles = [[Preambles alloc] initFromDirectory:preamblesDir]; // FIXME: error message? + [preambles setStyleManager:styleManager]; + NSString *selectedPreamble = [configFile stringEntry:@"selectedPreamble" inGroup:@"Preambles"]; + if (selectedPreamble != nil) { + [preambles setSelectedPreambleName:selectedPreamble]; + } +#endif + + lastOpenFolder = [[configFile stringEntry:@"lastOpenFolder" inGroup:@"Paths"] retain]; + if (lastOpenFolder == nil) + lastOpenFolder = [[configFile stringEntry:@"lastFolder" inGroup:@"Paths"] retain]; + lastSaveAsFolder = [[configFile stringEntry:@"lastSaveAsFolder" inGroup:@"Paths"] retain]; + if (lastSaveAsFolder == nil) + lastSaveAsFolder = [[configFile stringEntry:@"lastFolder" inGroup:@"Paths"] retain]; + + openWindows = [[NSMutableArray alloc] init]; + + tools = [[NSArray alloc] initWithObjects: + [SelectTool tool], + [CreateNodeTool toolWithNodeStylesModel:nsm], + [CreateEdgeTool toolWithEdgeStylesModel:esm], + [BoundingBoxTool tool], + [HandTool tool], + nil]; + activeTool = [tools objectAtIndex:0]; + for (id tool in tools) { + [tool loadConfiguration:configFile]; + } + + toolBox = [[ToolBox alloc] initWithTools:tools]; + [toolBox loadConfiguration:configFile]; + [toolBox setSelectedTool:activeTool]; + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(selectedToolChanged:) + name:@"ToolSelectionChanged" + object:toolBox]; + [toolBox show]; + + contextWindow = [[ContextWindow alloc] initWithNodeStylesModel:nsm + andEdgeStylesModel:esm]; + [contextWindow loadConfiguration:configFile]; + + app = [self retain]; + } + + return self; +} + +- (id) init { + self = [self _initCommon]; + + if (self) { + [self newWindow]; + } + + return self; +} + +- (id) initWithFiles:(NSArray*)files { + self = [self _initCommon]; + + if (self) { + int fileOpenCount = 0; + for (NSString *file in files) { + NSError *error = nil; + TikzDocument *doc = [TikzDocument documentFromFile:file styleManager:styleManager error:&error]; + if (doc != nil) { + [self newWindowWithDocument:doc]; + ++fileOpenCount; + } else { + logError(error, @"WARNING: failed to open file"); + } + } + if (fileOpenCount == 0) { + [self newWindow]; + } + } + + return self; +} + +- (void) dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + + [configFile release]; + [styleManager release]; + [preambles release]; + [lastOpenFolder release]; + [lastSaveAsFolder release]; + [preambleWindow release]; + [settingsDialog release]; + [openWindows release]; + [tools release]; + [activeTool release]; + [toolBox release]; + [contextWindow release]; + + [super dealloc]; +} + +- (id) activeTool { return activeTool; } +- (void) setActiveTool:(id)tool { + if (activeTool == tool) + return; + + activeTool = tool; + [toolBox setSelectedTool:tool]; + for (Window* window in openWindows) { + [window setActiveTool:tool]; + } +} + +- (BOOL) activateToolForKey:(unsigned int)keyVal withMask:(InputMask)mask { + // FIXME: cache the accel info, rather than reparsing it every time? + for (id tool in tools) { + guint toolKey = 0; + GdkModifierType toolMod = 0; + gtk_accelerator_parse ([[tool shortcut] UTF8String], &toolKey, &toolMod); + if (toolKey != 0 && toolKey == keyVal && (int)mask == (int)toolMod) { + [self setActiveTool:tool]; + return YES; + } + } + return NO; +} + +- (void) _addWindow:(Window*)window { + [window setActiveTool:activeTool]; + [openWindows addObject:window]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(windowClosed:) + name:@"WindowClosed" + object:window]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(windowGainedFocus:) + name:@"WindowGainedFocus" + object:window]; + if ([window hasFocus]) { + [self setActiveWindow:window]; + } +} + +- (void) newWindow { + [self _addWindow:[Window window]]; +} + +- (void) newWindowWithDocument:(TikzDocument*)doc { + [self _addWindow:[Window windowWithDocument:doc]]; +} + +- (void) quit { + NSMutableArray *unsavedDocs = [NSMutableArray arrayWithCapacity:[openWindows count]]; + for (Window *window in openWindows) { + TikzDocument *doc = [window document]; + if ([doc hasUnsavedChanges]) { + [unsavedDocs addObject:doc]; + } + } + if ([unsavedDocs count] > 0) { + // FIXME: show a dialog + return; + } + gtk_main_quit(); +} + +- (void) presentPreamblesEditor { +#ifdef HAVE_POPPLER + if (preambleWindow == nil) { + preambleWindow = [[PreambleEditor alloc] initWithPreambles:preambles]; + //[preambleWindow setParentWindow:mainWindow]; + } + [preambleWindow present]; +#endif +} + +- (void) presentContextWindow { + [contextWindow present]; +} + +- (void) presentSettingsDialog { + if (settingsDialog == nil) { + settingsDialog = [[SettingsDialog alloc] initWithConfiguration:configFile + andStyleManager:styleManager]; + //[settingsDialog setParentWindow:mainWindow]; + } + [settingsDialog present]; +} + +- (Configuration*) mainConfiguration { + return configFile; +} + +- (void) saveConfiguration { + NSError *error = nil; + +#ifdef HAVE_POPPLER + if (preambles != nil) { + NSString *preamblesDir = [[SupportDir userSupportDir] stringByAppendingPathComponent:@"preambles"]; + // NSFileManager is slightly dodgy on Windows + g_mkdir_with_parents ([preamblesDir UTF8String], S_IRUSR | S_IWUSR | S_IXUSR); + [preambles storeToDirectory:preamblesDir]; + [configFile setStringEntry:@"selectedPreamble" inGroup:@"Preambles" value:[preambles selectedPreambleName]]; + } +#endif + + [styleManager saveStylesUsingConfigurationName:@"styles"]; + + for (id tool in tools) { + [tool saveConfiguration:configFile]; + } + [toolBox saveConfiguration:configFile]; + + [contextWindow saveConfiguration:configFile]; + + if (lastOpenFolder != nil) { + [configFile setStringEntry:@"lastOpenFolder" inGroup:@"Paths" value:lastOpenFolder]; + } + if (lastSaveAsFolder != nil) { + [configFile setStringEntry:@"lastSaveAsFolder" inGroup:@"Paths" value:lastSaveAsFolder]; + } + + if (![configFile writeToStoreWithError:&error]) { + logError (error, @"Could not write config file"); + } +} + +@end + +@implementation Application (Notifications) +- (void) windowClosed:(NSNotification*)notification { + Window *window = [notification object]; + [openWindows removeObjectIdenticalTo:window]; + [[NSNotificationCenter defaultCenter] removeObserver:self + name:nil + object:window]; + if ([openWindows count] == 0) { + gtk_main_quit(); + } else { + [self setActiveWindow:[openWindows objectAtIndex:0]]; + } +} + +- (void) windowGainedFocus:(NSNotification*)notification { + Window *window = [notification object]; + [self setActiveWindow:window]; +} + +- (void) selectedToolChanged:(NSNotification*)n { + id tool = [[n userInfo] objectForKey:@"tool"]; + if (tool != nil) + [self setActiveTool:tool]; + else + NSLog(@"nil tool!"); +} + +- (void) windowDocumentChanged:(NSNotification*)n { + [contextWindow setDocument:[[n userInfo] objectForKey:@"document"]]; +} +@end + +@implementation Application (Private) +- (void) setActiveWindow:(Window*)window { + [[NSNotificationCenter defaultCenter] removeObserver:self + name:@"DocumentChanged" + object:nil]; + + [contextWindow setDocument:[window document]]; + + [contextWindow attachToWindow:window]; + [toolBox attachToWindow:window]; + + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(windowDocumentChanged:) + name:@"DocumentChanged" + object:window]; +} +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/BoundingBoxTool.h b/tikzit-1/src/gtk/BoundingBoxTool.h new file mode 100644 index 0000000..f6498b0 --- /dev/null +++ b/tikzit-1/src/gtk/BoundingBoxTool.h @@ -0,0 +1,45 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import "Tool.h" + +typedef enum { + NoHandle, + EastHandle, + SouthEastHandle, + SouthHandle, + SouthWestHandle, + WestHandle, + NorthWestHandle, + NorthHandle, + NorthEastHandle +} ResizeHandle; + +@interface BoundingBoxTool : NSObject { + GraphRenderer *renderer; + NSPoint dragOrigin; + ResizeHandle currentResizeHandle; + BOOL drawingNewBox; +} + ++ (id) tool; +- (id) init; +@end + + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/BoundingBoxTool.m b/tikzit-1/src/gtk/BoundingBoxTool.m new file mode 100644 index 0000000..483705e --- /dev/null +++ b/tikzit-1/src/gtk/BoundingBoxTool.m @@ -0,0 +1,353 @@ +/* + * Copyright 2011-2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "BoundingBoxTool.h" + +#import "GraphRenderer.h" +#import "TikzDocument.h" +#import "tzstockitems.h" + +static const float handle_size = 8.0; +float sideHandleTop(NSRect bbox) { + return (NSMinY(bbox) + NSMaxY(bbox) - handle_size)/2.0f; +} +float tbHandleLeft(NSRect bbox) { + return (NSMinX(bbox) + NSMaxX(bbox) - handle_size)/2.0f; +} + +@interface BoundingBoxTool (Private) +- (NSRect) screenBoundingBox; +- (ResizeHandle) boundingBoxResizeHandleAt:(NSPoint)p; +- (NSRect) boundingBoxResizeHandleRect:(ResizeHandle)handle; +- (void) setResizeCursorForHandle:(ResizeHandle)handle; +@end + +@implementation BoundingBoxTool +- (NSString*) name { return @"Bounding Box"; } +- (const gchar*) stockId { return TIKZIT_STOCK_BOUNDING_BOX; } +- (NSString*) helpText { return @"Set the bounding box"; } +- (NSString*) shortcut { return @"b"; } + ++ (id) tool { + return [[[self alloc] init] autorelease]; +} + +- (id) init { + self = [super init]; + + if (self) { + currentResizeHandle = NoHandle; + } + + return self; +} + +- (void) dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + + [renderer release]; + + [super dealloc]; +} + +- (GraphRenderer*) activeRenderer { return renderer; } +- (void) setActiveRenderer:(GraphRenderer*)r { + if (r == renderer) + return; + + [[renderer surface] setCursor:NormalCursor]; + + [r retain]; + [renderer release]; + renderer = r; +} + +- (GtkWidget*) configurationWidget { return NULL; } + +- (void) mousePressAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { + if (button != LeftButton) + return; + + dragOrigin = pos; + currentResizeHandle = [self boundingBoxResizeHandleAt:pos]; + [[renderer document] startChangeBoundingBox]; + if (currentResizeHandle == NoHandle) { + drawingNewBox = YES; + [[[renderer document] graph] setBoundingBox:NSZeroRect]; + } else { + drawingNewBox = NO; + } + [renderer invalidateGraph]; +} + +- (void) mouseMoveTo:(NSPoint)pos withButtons:(MouseButton)buttons andMask:(InputMask)mask { + if (!(buttons & LeftButton)) { + ResizeHandle handle = [self boundingBoxResizeHandleAt:pos]; + [self setResizeCursorForHandle:handle]; + return; + } + + Transformer *transformer = [renderer transformer]; + Grid *grid = [renderer grid]; + Graph *graph = [[renderer document] graph]; + + if (currentResizeHandle == NoHandle) { + NSRect bbox = NSRectAroundPoints( + [grid snapScreenPoint:dragOrigin], + [grid snapScreenPoint:pos] + ); + [graph setBoundingBox:[transformer rectFromScreen:bbox]]; + } else { + NSRect bbox = [transformer rectToScreen:[graph boundingBox]]; + NSPoint p2 = [grid snapScreenPoint:pos]; + + if (currentResizeHandle == NorthWestHandle || + currentResizeHandle == NorthHandle || + currentResizeHandle == NorthEastHandle) { + + float dy = p2.y - NSMinY(bbox); + if (dy < bbox.size.height) { + bbox.origin.y += dy; + bbox.size.height -= dy; + } else { + bbox.origin.y = NSMaxY(bbox); + bbox.size.height = 0; + } + + } else if (currentResizeHandle == SouthWestHandle || + currentResizeHandle == SouthHandle || + currentResizeHandle == SouthEastHandle) { + + float dy = p2.y - NSMaxY(bbox); + if (-dy < bbox.size.height) { + bbox.size.height += dy; + } else { + bbox.size.height = 0; + } + } + + if (currentResizeHandle == NorthWestHandle || + currentResizeHandle == WestHandle || + currentResizeHandle == SouthWestHandle) { + + float dx = p2.x - NSMinX(bbox); + if (dx < bbox.size.width) { + bbox.origin.x += dx; + bbox.size.width -= dx; + } else { + bbox.origin.x = NSMaxX(bbox); + bbox.size.width = 0; + } + + } else if (currentResizeHandle == NorthEastHandle || + currentResizeHandle == EastHandle || + currentResizeHandle == SouthEastHandle) { + + float dx = p2.x - NSMaxX(bbox); + if (-dx < bbox.size.width) { + bbox.size.width += dx; + } else { + bbox.size.width = 0; + } + } + [graph setBoundingBox:[transformer rectFromScreen:bbox]]; + } + [[renderer document] changeBoundingBoxCheckPoint]; + [renderer invalidateGraph]; +} + +- (void) mouseReleaseAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { + if (button != LeftButton) + return; + + [[renderer document] endChangeBoundingBox]; + drawingNewBox = NO; + [renderer invalidateGraph]; +} + +- (void) renderWithContext:(id)context onSurface:(id)surface { + if (!drawingNewBox && [[[renderer document] graph] hasBoundingBox]) { + [context saveState]; + + [context setAntialiasMode:AntialiasDisabled]; + [context setLineWidth:1.0]; + + [context startPath]; + [context rect:[self boundingBoxResizeHandleRect:EastHandle]]; + [context rect:[self boundingBoxResizeHandleRect:SouthEastHandle]]; + [context rect:[self boundingBoxResizeHandleRect:SouthHandle]]; + [context rect:[self boundingBoxResizeHandleRect:SouthWestHandle]]; + [context rect:[self boundingBoxResizeHandleRect:WestHandle]]; + [context rect:[self boundingBoxResizeHandleRect:NorthWestHandle]]; + [context rect:[self boundingBoxResizeHandleRect:NorthHandle]]; + [context rect:[self boundingBoxResizeHandleRect:NorthEastHandle]]; + [context strokePathWithColor:MakeSolidRColor (0.5, 0.5, 0.5)]; + + [context restoreState]; + } +} +- (void) loadConfiguration:(Configuration*)config {} +- (void) saveConfiguration:(Configuration*)config {} +@end + +@implementation BoundingBoxTool (Private) +- (NSRect) screenBoundingBox { + Transformer *transformer = [[renderer surface] transformer]; + Graph *graph = [[renderer document] graph]; + return [transformer rectToScreen:[graph boundingBox]]; +} + +- (ResizeHandle) boundingBoxResizeHandleAt:(NSPoint)p { + NSRect bbox = [self screenBoundingBox]; + if (p.x >= NSMaxX(bbox)) { + if (p.x <= NSMaxX(bbox) + handle_size) { + if (p.y >= NSMaxY(bbox)) { + if (p.y <= NSMaxY(bbox) + handle_size) { + return SouthEastHandle; + } + } else if (p.y <= NSMinY(bbox)) { + if (p.y >= NSMinY(bbox) - handle_size) { + return NorthEastHandle; + } + } else { + float eastHandleTop = sideHandleTop(bbox); + if (p.y >= eastHandleTop && p.y <= (eastHandleTop + handle_size)) { + return EastHandle; + } + } + } + } else if (p.x <= NSMinX(bbox)) { + if (p.x >= NSMinX(bbox) - handle_size) { + if (p.y >= NSMaxY(bbox)) { + if (p.y <= NSMaxY(bbox) + handle_size) { + return SouthWestHandle; + } + } else if (p.y <= NSMinY(bbox)) { + if (p.y >= NSMinY(bbox) - handle_size) { + return NorthWestHandle; + } + } else { + float westHandleTop = sideHandleTop(bbox); + if (p.y >= westHandleTop && p.y <= (westHandleTop + handle_size)) { + return WestHandle; + } + } + } + } else if (p.y >= NSMaxY(bbox)) { + if (p.y <= NSMaxY(bbox) + handle_size) { + float southHandleLeft = tbHandleLeft(bbox); + if (p.x >= southHandleLeft && p.x <= (southHandleLeft + handle_size)) { + return SouthHandle; + } + } + } else if (p.y <= NSMinY(bbox)) { + if (p.y >= NSMinY(bbox) - handle_size) { + float northHandleLeft = tbHandleLeft(bbox); + if (p.x >= northHandleLeft && p.x <= (northHandleLeft + handle_size)) { + return NorthHandle; + } + } + } + return NoHandle; +} + +- (NSRect) boundingBoxResizeHandleRect:(ResizeHandle)handle { + Graph *graph = [[renderer document] graph]; + if (![graph hasBoundingBox]) { + return NSZeroRect; + } + NSRect bbox = [self screenBoundingBox]; + float x; + float y; + switch (handle) { + case NorthEastHandle: + case EastHandle: + case SouthEastHandle: + x = NSMaxX(bbox); + break; + case NorthWestHandle: + case WestHandle: + case SouthWestHandle: + x = NSMinX(bbox) - handle_size; + break; + case SouthHandle: + case NorthHandle: + x = tbHandleLeft(bbox); + break; + default: + return NSZeroRect; + } + switch (handle) { + case EastHandle: + case WestHandle: + y = sideHandleTop(bbox); + break; + case SouthEastHandle: + case SouthHandle: + case SouthWestHandle: + y = NSMaxY(bbox); + break; + case NorthEastHandle: + case NorthHandle: + case NorthWestHandle: + y = NSMinY(bbox) - handle_size; + break; + default: + return NSZeroRect; + } + return NSMakeRect(x, y, handle_size, handle_size); +} + +- (void) setResizeCursorForHandle:(ResizeHandle)handle { + if (handle != currentResizeHandle) { + currentResizeHandle = handle; + Cursor c = NormalCursor; + switch (handle) { + case EastHandle: + c = ResizeRightCursor; + break; + case SouthEastHandle: + c = ResizeBottomRightCursor; + break; + case SouthHandle: + c = ResizeBottomCursor; + break; + case SouthWestHandle: + c = ResizeBottomLeftCursor; + break; + case WestHandle: + c = ResizeLeftCursor; + break; + case NorthWestHandle: + c = ResizeTopLeftCursor; + break; + case NorthHandle: + c = ResizeTopCursor; + break; + case NorthEastHandle: + c = ResizeTopRightCursor; + break; + default: + c = NormalCursor; + break; + } + [[renderer surface] setCursor:c]; + } +} +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/CairoRenderContext.h b/tikzit-1/src/gtk/CairoRenderContext.h new file mode 100644 index 0000000..ac9c5ee --- /dev/null +++ b/tikzit-1/src/gtk/CairoRenderContext.h @@ -0,0 +1,59 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import "RenderContext.h" +#import "Transformer.h" +#import +#import +#import + +@interface PangoTextLayout: NSObject { + PangoLayout *layout; + cairo_t *context; +} + ++ (PangoTextLayout*) layoutForContext:(cairo_t*)cr withFontSize:(CGFloat)fontSize; +- (id) initWithContext:(cairo_t*)cr fontSize:(CGFloat)fontSize; +- (void) setText:(NSString*)text; + +@end + +@interface CairoRenderContext: NSObject { + cairo_t *context; +} + ++ (CairoRenderContext*) contextForSurface:(cairo_surface_t*)surface; +- (id) initForSurface:(cairo_surface_t*)surface; + ++ (CairoRenderContext*) contextForWidget:(GtkWidget*)widget; +- (id) initForWidget:(GtkWidget*)widget; + ++ (CairoRenderContext*) contextForDrawable:(GdkDrawable*)d; +- (id) initForDrawable:(GdkDrawable*)d; + ++ (CairoRenderContext*) contextForPixbuf:(GdkPixbuf*)buf; +- (id) initForPixbuf:(GdkPixbuf*)buf; + +- (cairo_t*) cairoContext; +- (void) applyTransform:(Transformer*)transformer; + +- (void) clearSurface; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/CairoRenderContext.m b/tikzit-1/src/gtk/CairoRenderContext.m new file mode 100644 index 0000000..77e10b5 --- /dev/null +++ b/tikzit-1/src/gtk/CairoRenderContext.m @@ -0,0 +1,344 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "CairoRenderContext.h" + +#import "cairo_helpers.h" +#import "util.h" + +#import + +@implementation PangoTextLayout + +- (id) init { + [self release]; + return nil; +} + ++ (PangoTextLayout*) layoutForContext:(cairo_t*)cr withFontSize:(CGFloat)fontSize { + return [[[self alloc] initWithContext:cr fontSize:fontSize] autorelease]; +} + +- (id) initWithContext:(cairo_t*)cr fontSize:(CGFloat)fontSize { + self = [super init]; + + if (self) { + cairo_reference (cr); + context = cr; + layout = pango_cairo_create_layout (cr); + + PangoFontDescription *font_desc = pango_font_description_new (); + pango_font_description_set_family_static (font_desc, "Sans"); + pango_font_description_set_size (font_desc, pango_units_from_double (fontSize)); + pango_layout_set_font_description (layout, font_desc); + pango_font_description_free (font_desc); + } + + return self; +} + +- (void) setText:(NSString*)text { + pango_layout_set_text (layout, [text UTF8String], -1); +} + +- (NSSize) size { + int width, height; + pango_layout_get_size (layout, &width, &height); + return NSMakeSize (pango_units_to_double (width), pango_units_to_double (height)); +} + +- (NSString*) text { + return [NSString stringWithUTF8String:pango_layout_get_text (layout)]; +} + +- (void) showTextAt:(NSPoint)topLeft withColor:(RColor)color { + cairo_save (context); + + cairo_move_to(context, topLeft.x, topLeft.y); + cairo_set_source_rcolor (context, color); + pango_cairo_show_layout (context, layout); + + cairo_restore (context); +} + +- (void) dealloc { + if (layout) + g_object_unref (G_OBJECT (layout)); + if (context) + cairo_destroy (context); + + [super dealloc]; +} + +@end + +@implementation CairoRenderContext + +- (id) init { + [self release]; + return nil; +} + ++ (CairoRenderContext*) contextForSurface:(cairo_surface_t*)surface { + return [[[self alloc] initForSurface:surface] autorelease]; +} + +- (id) initForSurface:(cairo_surface_t*)surface { + self = [super init]; + + if (self) { + context = cairo_create (surface); + } + + return self; +} + ++ (CairoRenderContext*) contextForWidget:(GtkWidget*)widget { + return [[[self alloc] initForWidget:widget] autorelease]; +} + +- (id) initForWidget:(GtkWidget*)widget { + self = [super init]; + + if (self) { + GdkWindow *window = gtk_widget_get_window (widget); + if (window) { + context = gdk_cairo_create (window); + } else { + [self release]; + self = nil; + } + } + + return self; +} + ++ (CairoRenderContext*) contextForDrawable:(GdkDrawable*)d { + return [[[self alloc] initForDrawable:d] autorelease]; +} + +- (id) initForDrawable:(GdkDrawable*)d { + self = [super init]; + + if (self) { + context = gdk_cairo_create (d); + } + + return self; +} + ++ (CairoRenderContext*) contextForPixbuf:(GdkPixbuf*)pixbuf { + return [[[self alloc] initForPixbuf:pixbuf] autorelease]; +} + +- (id) initForPixbuf:(GdkPixbuf*)pixbuf { + self = [super init]; + + if (self) { + cairo_format_t format = -1; + + if (gdk_pixbuf_get_colorspace (pixbuf) != GDK_COLORSPACE_RGB) { + NSLog(@"Unsupported colorspace (must be RGB)"); + [self release]; + return nil; + } + if (gdk_pixbuf_get_bits_per_sample (pixbuf) != 8) { + NSLog(@"Unsupported bits per sample (must be 8)"); + [self release]; + return nil; + } + if (gdk_pixbuf_get_has_alpha (pixbuf)) { + if (gdk_pixbuf_get_n_channels (pixbuf) != 4) { + NSLog(@"Unsupported bits per sample (must be 4 for an image with alpha)"); + [self release]; + return nil; + } + format = CAIRO_FORMAT_ARGB32; + } else { + if (gdk_pixbuf_get_n_channels (pixbuf) != 3) { + NSLog(@"Unsupported bits per sample (must be 3 for an image without alpha)"); + [self release]; + return nil; + } + format = CAIRO_FORMAT_RGB24; + } + + cairo_surface_t *surface = cairo_image_surface_create_for_data( + gdk_pixbuf_get_pixels(pixbuf), + format, + gdk_pixbuf_get_width(pixbuf), + gdk_pixbuf_get_height(pixbuf), + gdk_pixbuf_get_rowstride(pixbuf)); + context = cairo_create (surface); + cairo_surface_destroy (surface); + } + + return self; +} + +- (cairo_t*) cairoContext { + return context; +} + +- (void) applyTransform:(Transformer*)transformer { + NSPoint origin = [transformer toScreen:NSZeroPoint]; + cairo_translate (context, origin.x, origin.y); + NSPoint scale = [transformer toScreen:NSMakePoint (1.0f, 1.0f)]; + scale.x -= origin.x; + scale.y -= origin.y; + cairo_scale (context, scale.x, scale.y); +} + +- (void) saveState { + cairo_save (context); +} + +- (void) restoreState { + cairo_restore (context); +} + +- (NSRect) clipBoundingBox { + double clipx1, clipx2, clipy1, clipy2; + cairo_clip_extents (context, &clipx1, &clipy1, &clipx2, &clipy2); + return NSMakeRect (clipx1, clipy1, clipx2-clipx1, clipy2-clipy1); +} + +- (BOOL) strokeIncludesPoint:(NSPoint)p { + return cairo_in_stroke (context, p.x, p.y); +} + +- (BOOL) fillIncludesPoint:(NSPoint)p { + return cairo_in_fill (context, p.x, p.y); +} + +- (id) layoutText:(NSString*)text withSize:(CGFloat)fontSize { + PangoTextLayout *layout = [PangoTextLayout layoutForContext:context withFontSize:fontSize]; + [layout setText:text]; + return layout; +} + +- (void) setAntialiasMode:(AntialiasMode)mode { + if (mode == AntialiasDisabled) { + cairo_set_antialias (context, CAIRO_ANTIALIAS_NONE); + } else { + cairo_set_antialias (context, CAIRO_ANTIALIAS_DEFAULT); + } +} + +- (void) setLineWidth:(CGFloat)width { + cairo_set_line_width (context, width); +} + +- (void) setLineDash:(CGFloat)dashLength { + if (dashLength <= 0.0) { + cairo_set_dash (context, NULL, 0, 0); + } else { + double dashes[] = { dashLength }; + cairo_set_dash (context, dashes, 1, 0); + } +} + +// paths +- (void) startPath { + cairo_new_path (context); +} + +- (void) closeSubPath { + cairo_close_path (context); +} + +- (void) moveTo:(NSPoint)p { + cairo_move_to(context, p.x, p.y); +} + +- (void) curveTo:(NSPoint)end withCp1:(NSPoint)cp1 andCp2:(NSPoint)cp2 { + cairo_curve_to (context, cp1.x, cp1.y, cp2.x, cp2.y, end.x, end.y); +} + +- (void) lineTo:(NSPoint)end { + cairo_line_to (context, end.x, end.y); +} + +- (void) rect:(NSRect)rect { + cairo_rectangle (context, rect.origin.x, rect.origin.y, rect.size.width, rect.size.height); +} + +- (void) circleAt:(NSPoint)c withRadius:(CGFloat)r { + cairo_new_sub_path (context); + cairo_arc (context, c.x, c.y, r, 0, 2 * M_PI); +} + +- (void) strokePathWithColor:(RColor)color { + cairo_set_source_rcolor (context, color); + cairo_stroke (context); +} + +- (void) fillPathWithColor:(RColor)color { + cairo_set_source_rcolor (context, color); + cairo_fill (context); +} + +- (void) strokePathWithColor:(RColor)scolor + andFillWithColor:(RColor)fcolor { + cairo_set_source_rcolor (context, fcolor); + cairo_fill_preserve (context); + cairo_set_source_rcolor (context, scolor); + cairo_stroke (context); +} + +- (void) strokePathWithColor:(RColor)scolor + andFillWithColor:(RColor)fcolor + usingAlpha:(CGFloat)alpha { + cairo_push_group (context); + cairo_set_source_rcolor (context, fcolor); + cairo_fill_preserve (context); + cairo_set_source_rcolor (context, scolor); + cairo_stroke (context); + cairo_pop_group_to_source (context); + cairo_paint_with_alpha (context, alpha); +} + +- (void) clipToPath { + cairo_clip (context); +} + +- (void) paintWithColor:(RColor)color { + cairo_set_source_rcolor (context, color); + cairo_paint (context); +} + +- (void) clearSurface { + cairo_operator_t old_op = cairo_get_operator (context); + + cairo_set_operator (context, CAIRO_OPERATOR_SOURCE); + cairo_set_source_rgba (context, 0.0, 0.0, 0.0, 0.0); + cairo_paint (context); + + cairo_set_operator (context, old_op); +} + +- (void) dealloc { + if (context) { + cairo_destroy (context); + } + + [super dealloc]; +} + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/ColorRGB+Gtk.h b/tikzit-1/src/gtk/ColorRGB+Gtk.h new file mode 100644 index 0000000..5cfb4d7 --- /dev/null +++ b/tikzit-1/src/gtk/ColorRGB+Gtk.h @@ -0,0 +1,30 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import "ColorRGB.h" +#import + +@interface ColorRGB (Gtk) + ++ (ColorRGB*) colorWithGdkColor:(GdkColor)color; +- (id) initWithGdkColor:(GdkColor)color; +- (GdkColor) gdkColor; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/ColorRGB+Gtk.m b/tikzit-1/src/gtk/ColorRGB+Gtk.m new file mode 100644 index 0000000..be5dd56 --- /dev/null +++ b/tikzit-1/src/gtk/ColorRGB+Gtk.m @@ -0,0 +1,46 @@ +/* + * Copyright 2011 Alex Merry + * Copyright 2010 Chris Heunen + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "ColorRGB+Gtk.h" + +// 257 = 65535/255 +// GdkColor values run from 0 to 65535, not from 0 to 255 +#define GDK_FACTOR 257 + +@implementation ColorRGB (Gtk) + ++ (ColorRGB*) colorWithGdkColor:(GdkColor)color { + return [ColorRGB colorWithRed:color.red/GDK_FACTOR green:color.green/GDK_FACTOR blue:color.blue/GDK_FACTOR]; +} + +- (id) initWithGdkColor:(GdkColor)color { + return [self initWithRed:color.red/GDK_FACTOR green:color.green/GDK_FACTOR blue:color.blue/GDK_FACTOR]; +} + +- (GdkColor) gdkColor { + GdkColor color; + color.pixel = 0; + color.red = GDK_FACTOR * [self red]; + color.green = GDK_FACTOR * [self green]; + color.blue = GDK_FACTOR * [self blue]; + return color; +} + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/ColorRGB+IntegerListStorage.h b/tikzit-1/src/gtk/ColorRGB+IntegerListStorage.h new file mode 100644 index 0000000..118eaee --- /dev/null +++ b/tikzit-1/src/gtk/ColorRGB+IntegerListStorage.h @@ -0,0 +1,32 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import "ColorRGB.h" + +/** + * Stores a ColorRGB as a list of short integers + */ +@interface ColorRGB (IntegerListStorage) + ++ (ColorRGB*) colorFromValueList:(NSArray*)values; +- (id) initFromValueList:(NSArray*)values; +- (NSArray*) valueList; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/ColorRGB+IntegerListStorage.m b/tikzit-1/src/gtk/ColorRGB+IntegerListStorage.m new file mode 100644 index 0000000..0103a3c --- /dev/null +++ b/tikzit-1/src/gtk/ColorRGB+IntegerListStorage.m @@ -0,0 +1,57 @@ +/* + * Copyright 2011 Alex Merry + * Copyright 2010 Chris Heunen + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "ColorRGB+IntegerListStorage.h" + +@implementation ColorRGB (IntegerListStorage) + ++ (ColorRGB*) colorFromValueList:(NSArray*)values { + if ([values count] != 3) { + return nil; + } + + unsigned short redValue = [[values objectAtIndex:0] intValue]; + unsigned short greenValue = [[values objectAtIndex:1] intValue]; + unsigned short blueValue = [[values objectAtIndex:2] intValue]; + return [ColorRGB colorWithRed:redValue green:greenValue blue:blueValue]; +} + +- (id) initFromValueList:(NSArray*)values { + if ([values count] != 3) { + [self release]; + return nil; + } + + unsigned short redValue = [[values objectAtIndex:0] intValue]; + unsigned short greenValue = [[values objectAtIndex:1] intValue]; + unsigned short blueValue = [[values objectAtIndex:2] intValue]; + + return [self initWithRed:redValue green:greenValue blue:blueValue]; +} + +- (NSArray*) valueList { + NSMutableArray *array = [NSMutableArray arrayWithCapacity:3]; + [array addObject:[NSNumber numberWithInt:[self red]]]; + [array addObject:[NSNumber numberWithInt:[self green]]]; + [array addObject:[NSNumber numberWithInt:[self blue]]]; + return array; +} + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/Configuration.h b/tikzit-1/src/gtk/Configuration.h new file mode 100644 index 0000000..6c68681 --- /dev/null +++ b/tikzit-1/src/gtk/Configuration.h @@ -0,0 +1,447 @@ +// +// Configuration.h +// TikZiT +// +// Copyright 2010 Alex Merry +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "TZFoundation.h" + +/** + * Manages configuration information in a grouped key-value format. + */ +@interface Configuration : NSObject { + NSString *name; + GKeyFile *file; +} + +/** + * Check whether there is any existing configuration. + */ ++ (BOOL) configurationExistsWithName:(NSString*)name; +/** + * Create a blank configuration with the given name, without loading + * any existing configuration information. + * + * @param name the name of the configuration + */ ++ (Configuration*) emptyConfigurationWithName:(NSString*)name; +/** + * Load an existing configuration for the given name. + * + * If there was no existing configuration, or it could not be opened, + * an empty configuration will be returned. + * + * @param name the name of the configuration + */ ++ (Configuration*) configurationWithName:(NSString*)name; +/** + * Load an existing configuration for the given name. + * + * If there was no existing configuration, or it could not be opened, + * an empty configuration will be returned. + * + * @param name the name of the configuration + * @param error this will be set if the configuration exists, but could + * not be opened. + */ ++ (Configuration*) configurationWithName:(NSString*)name loadError:(NSError**)error; + +/** + * Initialise the configuration to be empty + * + * Does not attempt to load any existing configuration data. + * + * @param name the name of the configuration + */ +- (id) initEmptyWithName:(NSString*)name; +/** + * Initialise a configuration, loading it if it had previously been stored. + * + * If there was no existing configuration, or it could not be opened, + * an empty configuration will be returned. + * + * @param name the name of the configuration + */ +- (id) initWithName:(NSString*)name; +/** + * Initialise a configuration, loading it if it had previously been stored. + * + * If there was no existing configuration, or it could not be opened, + * an empty configuration will be returned. + * + * @param name the name of the configuration + * @param error this will be set if the configuration exists, but could + * not be opened. + */ +- (id) initWithName:(NSString*)name loadError:(NSError**)error; + +/** + * The name of the configuration. + * + * Configurations with different names are stored independently. + */ +- (NSString*) name; +/** + * Set the name of the configuration. + * + * This will affect the behaviour of [-writeToStore] + * + * Configurations with different names are stored independently. + */ +- (void) setName:(NSString*)name; + +/** + * Writes the configuration to the backing store. + * + * The location the configuration is written to is determined by the + * [-name] property. + * + * @result YES if the configuration was successfully written, NO otherwise + */ +- (BOOL) writeToStore; +/** + * Writes the configuration to the backing store. + * + * The location the configuration is written to is determined by the + * [-name] property. + * + * @param error this will be set if the configuration could not be written + * to the backing store + * @result YES if the configuration was successfully written, NO otherwise + */ +- (BOOL) writeToStoreWithError:(NSError**)error; + +/** + * Check whether a particular key exists within a group + * + * @param key the key to check for + * @param group the name of the group to look in + * @result YES if the key exists, NO otherwise + */ +- (BOOL) hasKey:(NSString*)key inGroup:(NSString*)group; +/** + * Check whether a particular group exists + * + * @param group the name of the group to check for + * @result YES if the group exists, NO otherwise + */ +- (BOOL) hasGroup:(NSString*)group; +/** + * List the groups in the configuration. + * + * @result a list of group names + */ +- (NSArray*) groups; + +/** + * Get the value associated with a key as a string + * + * This is only guaranteed to work if the value was stored as a string. + * + * @param key the key to fetch the data for + * @param group the name of the group to look in + * @result the value associated with key as a string, or nil + * if no string value was associated with key + */ +- (NSString*) stringEntry:(NSString*)key inGroup:(NSString*)group; +/** + * Get the value associated with a key as a string + * + * This is only guaranteed to work if the value was stored as a string. + * + * @param key the key to fetch the data for + * @param group the name of the group to look in + * @param def the value to return if no string value was associated with key + * @result the value associated with key as a string, or default + */ +- (NSString*) stringEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSString*)def; +/** + * Get the value associated with a key as a boolean + * + * This is only guaranteed to work if the value was stored as a boolean. + * + * @param key the key to fetch the data for + * @param group the name of the group to look in + * @result the value associated with key as a boolean, or NO + * if no boolean value was associated with key + */ +- (BOOL) booleanEntry:(NSString*)key inGroup:(NSString*)group; +/** + * Get the value associated with a key as a boolean + * + * This is only guaranteed to work if the value was stored as a boolean. + * + * @param key the key to fetch the data for + * @param group the name of the group to look in + * @param def the value to return if no boolean value was associated with key + * @result the value associated with key as a boolean, or def + */ +- (BOOL) booleanEntry:(NSString*)key inGroup:(NSString*)group withDefault:(BOOL)def; +/** + * Get the value associated with a key as a integer + * + * This is only guaranteed to work if the value was stored as a integer. + * + * @param key the key to fetch the data for + * @param group the name of the group to look in + * @result the value associated with key as a integer, or 0 + * if no integer value was associated with key + */ +- (int) integerEntry:(NSString*)key inGroup:(NSString*)group; +/** + * Get the value associated with a key as a integer + * + * This is only guaranteed to work if the value was stored as a integer. + * + * @param key the key to fetch the data for + * @param group the name of the group to look in + * @param def the value to return if no integer value was associated with key + * @result the value associated with key as a integer, or def + */ +- (int) integerEntry:(NSString*)key inGroup:(NSString*)group withDefault:(int)def; +/** + * Get the value associated with a key as a double + * + * This is only guaranteed to work if the value was stored as a double. + * + * @param key the key to fetch the data for + * @param group the name of the group to look in + * @result the value associated with key as a double, or 0 + * if no double value was associated with key + */ +- (double) doubleEntry:(NSString*)key inGroup:(NSString*)group; +/** + * Get the value associated with a key as a double + * + * This is only guaranteed to work if the value was stored as a double. + * + * @param key the key to fetch the data for + * @param group the name of the group to look in + * @param def the value to return if no double value was associated with key + * @result the value associated with key as a double, or def + */ +- (double) doubleEntry:(NSString*)key inGroup:(NSString*)group withDefault:(double)def; + +/** + * Get the value associated with a key as a list of strings + * + * This is only guaranteed to work if the value was stored as a + * list of strings. + * + * @param key the key to fetch the data for + * @param group the name of the group to look in + * @result the value associated with key as a list of strings, + * or nil if no list of strings was associated with key + */ +- (NSArray*) stringListEntry:(NSString*)key inGroup:(NSString*)group; +/** + * Get the value associated with a key as a list of strings + * + * This is only guaranteed to work if the value was stored as a + * list of strings. + * + * @param key the key to fetch the data for + * @param group the name of the group to look in + * @param def the value to return if no string list value was associated with key + * @result the value associated with key as a list of strings, or def + */ +- (NSArray*) stringListEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSArray*)def; +/** + * Get the value associated with a key as a list of booleans + * + * This is only guaranteed to work if the value was stored as a + * list of booleans. + * + * @param key the key to fetch the data for + * @param group the name of the group to look in + * @result the value associated with key as a list of NSNumber + * objects, containing boolean values, or nil + */ +- (NSArray*) booleanListEntry:(NSString*)key inGroup:(NSString*)group; +/** + * Get the value associated with a key as a list of booleans + * + * This is only guaranteed to work if the value was stored as a + * list of booleans. + * + * @param key the key to fetch the data for + * @param group the name of the group to look in + * @param def the value to return if no boolean list value was associated with key + * @result the value associated with key as a list of NSNumber + * objects, containing boolean values, or def + */ +- (NSArray*) booleanListEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSArray*)def; +/** + * Get the value associated with a key as a list of integers + * + * This is only guaranteed to work if the value was stored as a + * list of integers. + * + * @param key the key to fetch the data for + * @param group the name of the group to look in + * @result the value associated with key as a list of NSNumber + * objects, containing integer values, or nil + */ +- (NSArray*) integerListEntry:(NSString*)key inGroup:(NSString*)group; +/** + * Get the value associated with a key as a list of integers + * + * This is only guaranteed to work if the value was stored as a + * list of integers. + * + * @param key the key to fetch the data for + * @param group the name of the group to look in + * @param def the value to return if no integer list value was associated with key + * @result the value associated with key as a list of NSNumber + * objects, containing integer values, or def + */ +- (NSArray*) integerListEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSArray*)def; +/** + * Get the value associated with a key as a list of doubles + * + * This is only guaranteed to work if the value was stored as a + * list of doubles. + * + * @param key the key to fetch the data for + * @param group the name of the group to look in + * @result the value associated with key as a list of NSNumber + * objects, containing double values, or nil + */ +- (NSArray*) doubleListEntry:(NSString*)key inGroup:(NSString*)group; +/** + * Get the value associated with a key as a list of doubles + * + * This is only guaranteed to work if the value was stored as a + * list of doubles. + * + * @param key the key to fetch the data for + * @param group the name of the group to look in + * @param def the value to return if no double list value was associated with key + * @result the value associated with key as a list of NSNumber + * objects, containing double values, or def + */ +- (NSArray*) doubleListEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSArray*)def; + +/** + * Associate a string value with a key. + * + * Any previous value (of any type) with the same key and group will + * be overwritten. + * + * @param key the key to associate the value with + * @param group the group to store the association in + * @param value the value to store + */ +- (void) setStringEntry:(NSString*)key inGroup:(NSString*)group value:(NSString*)value; +/** + * Associate a boolean value with a key. + * + * Any previous value (of any type) with the same key and group will + * be overwritten. + * + * @param key the key to associate the value with + * @param group the group to store the association in + * @param value the value to store + */ +- (void) setBooleanEntry:(NSString*)key inGroup:(NSString*)group value:(BOOL)value; +/** + * Associate a integer value with a key. + * + * Any previous value (of any type) with the same key and group will + * be overwritten. + * + * @param key the key to associate the value with + * @param group the group to store the association in + * @param value the value to store + */ +- (void) setIntegerEntry:(NSString*)key inGroup:(NSString*)group value:(int)value; +/** + * Associate a double value with a key. + * + * Any previous value (of any type) with the same key and group will + * be overwritten. + * + * @param key the key to associate the value with + * @param group the group to store the association in + * @param value the value to store + */ +- (void) setDoubleEntry:(NSString*)key inGroup:(NSString*)group value:(double)value; + +/** + * Associate a list of string values with a key. + * + * Any previous value (of any type) with the same key and group will + * be overwritten. + * + * @param key the key to associate the list with + * @param group the group to store the association in + * @param value the list to store, as an array of strings + */ +- (void) setStringListEntry:(NSString*)key inGroup:(NSString*)group value:(NSArray*)value; +/** + * Associate a list of boolean values with a key. + * + * Any previous value (of any type) with the same key and group will + * be overwritten. + * + * @param key the key to associate the list with + * @param group the group to store the association in + * @param value the list to store, as an array of NSNumber objects + */ +- (void) setBooleanListEntry:(NSString*)key inGroup:(NSString*)group value:(NSArray*)value; +/** + * Associate a list of integer values with a key. + * + * Any previous value (of any type) with the same key and group will + * be overwritten. + * + * @param key the key to associate the list with + * @param group the group to store the association in + * @param value the list to store, as an array of NSNumber objects + */ +- (void) setIntegerListEntry:(NSString*)key inGroup:(NSString*)group value:(NSArray*)value; +/** + * Associate a list of double values with a key. + * + * Any previous value (of any type) with the same key and group will + * be overwritten. + * + * @param key the key to associate the list with + * @param group the group to store the association in + * @param value the list to store, as an array of NSNumber objects + */ +- (void) setDoubleListEntry:(NSString*)key inGroup:(NSString*)group value:(NSArray*)value; + +/** + * Remove a group from the configuration + * + * This will remove all the groups key-value associations. + */ +- (void) removeGroup:(NSString*)group; +/** + * Remove a key from the configuration + * + * @param key the key to remove + * @param group the group to remove it from + */ +- (void) removeKey:(NSString*)key inGroup:(NSString*)group; + +@end + +// vim:ft=objc:sts=4:sw=4:et diff --git a/tikzit-1/src/gtk/Configuration.m b/tikzit-1/src/gtk/Configuration.m new file mode 100644 index 0000000..4a3ed79 --- /dev/null +++ b/tikzit-1/src/gtk/Configuration.m @@ -0,0 +1,450 @@ +// +// Configuration.h +// TikZiT +// +// Copyright 2010 Alex Merry +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "Configuration.h" +#import "SupportDir.h" + +@implementation Configuration + ++ (NSString*) _pathFromName:(NSString*)name { + return [NSString stringWithFormat:@"%@/%@.conf", [SupportDir userSupportDir], name]; +} + ++ (BOOL) configurationExistsWithName:(NSString*)name { + BOOL isDir; + BOOL exists = [[NSFileManager defaultManager] fileExistsAtPath:[self _pathFromName:name] isDirectory:&isDir]; + return exists && !isDir; +} + ++ (Configuration*) emptyConfigurationWithName:(NSString*)name + { return [[[self alloc] initEmptyWithName:name] autorelease]; } ++ (Configuration*) configurationWithName:(NSString*)name + { return [[[self alloc] initWithName:name] autorelease]; } ++ (Configuration*) configurationWithName:(NSString*)name loadError:(NSError**)error + { return [[[self alloc] initWithName:name loadError:error] autorelease]; } + +- (id) init +{ + [self release]; + return nil; +} + +- (id) initEmptyWithName:(NSString*)n +{ + self = [super init]; + if (self) { + name = [n retain]; + file = g_key_file_new (); + } + + return self; +} + +- (id) _initFromFile:(NSString*)path error:(NSError**)error +{ + self = [super init]; + if (self) { + file = g_key_file_new (); + + NSFileManager *manager = [NSFileManager defaultManager]; + if ([manager fileExistsAtPath:path]) { + gchar *filename = [path glibFilename]; + + GError *gerror = NULL; + g_key_file_load_from_file (file, + filename, + G_KEY_FILE_NONE, + &gerror); + g_free (filename); + + if (gerror) { + GErrorToNSError (gerror, error); + g_error_free (gerror); + } + } + } + + return self; +} + +- (id) initWithName:(NSString*)n { + return [self initWithName:n loadError:NULL]; +} + +- (id) initWithName:(NSString*)n loadError:(NSError**)error { + self = [self _initFromFile:[Configuration _pathFromName:n] error:error]; + + if (self) { + name = [n retain]; + } + + return self; +} + +- (BOOL) _ensureParentExists:(NSString*)path error:(NSError**)error { + NSString *directory = [path stringByDeletingLastPathComponent]; + return [[NSFileManager defaultManager] ensureDirectoryExists:directory error:error]; +} + +- (BOOL) _writeFileTo:(NSString*)path error:(NSError**)error +{ + if (![self _ensureParentExists:path error:error]) { + return NO; + } + + BOOL success = NO; + gsize length; + gchar *data = g_key_file_to_data (file, &length, NULL); // never reports an error + if (data && length) { + GError *gerror = NULL; + gchar* nativePath = [path glibFilename]; + success = g_file_set_contents (nativePath, data, length, &gerror) ? YES : NO; + g_free (data); + g_free (nativePath); + if (gerror) { + g_warning ("Failed to write file: %s\n", gerror->message); + GErrorToNSError (gerror, error); + g_error_free (gerror); + } + } else { + [[NSFileManager defaultManager] removeFileAtPath:path handler:nil]; + success = YES; + } + + return success; +} + +- (NSString*) name { + return name; +} + +- (void) setName:(NSString*)n { + [n retain]; + [name release]; + name = n; +} + +- (BOOL) writeToStore { + return [self writeToStoreWithError:NULL]; +} + +- (BOOL) writeToStoreWithError:(NSError**)error { + return [self _writeFileTo:[Configuration _pathFromName:name] error:error]; +} + +- (BOOL) hasKey:(NSString*)key inGroup:(NSString*)group +{ + gboolean result = g_key_file_has_key (file, [group UTF8String], [key UTF8String], NULL); + return result ? YES : NO; +} + +- (BOOL) hasGroup:(NSString*)group +{ + gboolean result = g_key_file_has_group (file, [group UTF8String]); + return result ? YES : NO; +} + +- (NSArray*) keys:(NSString*)group +{ + gsize length; + gchar **keys = g_key_file_get_keys (file, [group UTF8String], &length, NULL); + if (!keys) + length = 0; + + NSMutableArray *array = [NSMutableArray arrayWithCapacity:length]; + for (int i = 0; i < length; ++i) { + [array addObject:[NSString stringWithUTF8String:keys[i]]]; + } + g_strfreev (keys); + return array; +} + +- (NSArray*) groups +{ + gsize length; + gchar **groups = g_key_file_get_groups (file, &length); + NSMutableArray *array = [NSMutableArray arrayWithCapacity:length]; + for (int i = 0; i < length; ++i) { + [array addObject:[NSString stringWithUTF8String:groups[i]]]; + } + g_strfreev (groups); + return array; +} + +- (NSString*) stringEntry:(NSString*)key inGroup:(NSString*)group +{ + return [self stringEntry:key inGroup:group withDefault:nil]; +} + +- (NSString*) stringEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSString*)def +{ + NSString *result = def; + gchar *entry = g_key_file_get_string (file, [group UTF8String], [key UTF8String], NULL); + if (entry) { + result = [NSString stringWithUTF8String:entry]; + g_free (entry); + } + return result; +} + +- (BOOL) booleanEntry:(NSString*)key inGroup:(NSString*)group withDefault:(BOOL)def +{ + GError *error = NULL; + gboolean result = g_key_file_get_boolean (file, [group UTF8String], [key UTF8String], &error); + if (error != NULL) { + g_error_free (error); + return def; + } else { + return result ? YES : NO; + } +} + +- (BOOL) booleanEntry:(NSString*)key inGroup:(NSString*)group +{ + gboolean result = g_key_file_get_boolean (file, [group UTF8String], [key UTF8String], NULL); + return result ? YES : NO; +} + +- (int) integerEntry:(NSString*)key inGroup:(NSString*)group withDefault:(int)def +{ + GError *error = NULL; + int result = g_key_file_get_integer (file, [group UTF8String], [key UTF8String], &error); + if (error != NULL) { + g_error_free (error); + return def; + } else { + return result; + } +} + +- (int) integerEntry:(NSString*)key inGroup:(NSString*)group +{ + return g_key_file_get_integer (file, [group UTF8String], [key UTF8String], NULL); +} + +- (double) doubleEntry:(NSString*)key inGroup:(NSString*)group withDefault:(double)def +{ + GError *error = NULL; + double result = g_key_file_get_double (file, [group UTF8String], [key UTF8String], &error); + if (error != NULL) { + g_error_free (error); + return def; + } else { + return result; + } +} + +- (double) doubleEntry:(NSString*)key inGroup:(NSString*)group +{ + return g_key_file_get_double (file, [group UTF8String], [key UTF8String], NULL); +} + +- (NSArray*) stringListEntry:(NSString*)key inGroup:(NSString*)group +{ + return [self stringListEntry:key inGroup:group withDefault:nil]; +} + +- (NSArray*) stringListEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSArray*)def +{ + gsize length; + gchar **list = g_key_file_get_string_list (file, [group UTF8String], [key UTF8String], &length, NULL); + if (list) { + NSMutableArray *result = [NSMutableArray arrayWithCapacity:length]; + for (int i = 0; i < length; ++i) { + [result addObject:[NSString stringWithUTF8String:list[i]]]; + } + g_strfreev (list); + return result; + } else { + return def; + } +} + +- (NSArray*) booleanListEntry:(NSString*)key inGroup:(NSString*)group +{ + return [self booleanListEntry:key inGroup:group withDefault:nil]; +} + +- (NSArray*) booleanListEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSArray*)def +{ + gsize length; + gboolean *list = g_key_file_get_boolean_list (file, [group UTF8String], [key UTF8String], &length, NULL); + if (list) { + NSMutableArray *result = [NSMutableArray arrayWithCapacity:length]; + for (int i = 0; i < length; ++i) { + [result addObject:[NSNumber numberWithBool:list[i]]]; + } + g_free (list); + return result; + } else { + return def; + } +} + +- (NSArray*) integerListEntry:(NSString*)key inGroup:(NSString*)group +{ + return [self integerListEntry:key inGroup:group withDefault:nil]; +} + +- (NSArray*) integerListEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSArray*)def +{ + gsize length; + gint *list = g_key_file_get_integer_list (file, [group UTF8String], [key UTF8String], &length, NULL); + if (list) { + NSMutableArray *result = [NSMutableArray arrayWithCapacity:length]; + for (int i = 0; i < length; ++i) { + [result addObject:[NSNumber numberWithInt:list[i]]]; + } + g_free (list); + return result; + } else { + return def; + } +} + +- (NSArray*) doubleListEntry:(NSString*)key inGroup:(NSString*)group +{ + return [self doubleListEntry:key inGroup:group withDefault:nil]; +} + +- (NSArray*) doubleListEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSArray*)def +{ + gsize length; + double *list = g_key_file_get_double_list (file, [group UTF8String], [key UTF8String], &length, NULL); + if (list) { + NSMutableArray *result = [NSMutableArray arrayWithCapacity:length]; + for (int i = 0; i < length; ++i) { + [result addObject:[NSNumber numberWithDouble:list[i]]]; + } + g_free (list); + return result; + } else { + return def; + } +} + +- (void) setStringEntry:(NSString*)key inGroup:(NSString*)group value:(NSString*)value +{ + if (value == nil) { + [self removeKey:key inGroup:group]; + return; + } + g_key_file_set_string (file, [group UTF8String], [key UTF8String], [value UTF8String]); +} + +- (void) setBooleanEntry:(NSString*)key inGroup:(NSString*)group value:(BOOL)value; +{ + g_key_file_set_boolean (file, [group UTF8String], [key UTF8String], value); +} + +- (void) setIntegerEntry:(NSString*)key inGroup:(NSString*)group value:(int)value; +{ + g_key_file_set_integer (file, [group UTF8String], [key UTF8String], value); +} + +- (void) setDoubleEntry:(NSString*)key inGroup:(NSString*)group value:(double)value; +{ + g_key_file_set_double (file, [group UTF8String], [key UTF8String], value); +} + + +- (void) setStringListEntry:(NSString*)key inGroup:(NSString*)group value:(NSArray*)value +{ + if (value == nil) { + [self removeKey:key inGroup:group]; + return; + } + gsize length = [value count]; + const gchar * *list = g_new (const gchar *, length); + for (int i = 0; i < length; ++i) { + list[i] = [[value objectAtIndex:i] UTF8String]; + } + g_key_file_set_string_list (file, [group UTF8String], [key UTF8String], list, length); + g_free (list); +} + +- (void) setBooleanListEntry:(NSString*)key inGroup:(NSString*)group value:(NSArray*)value; +{ + if (value == nil) { + [self removeKey:key inGroup:group]; + return; + } + gsize length = [value count]; + gboolean *list = g_new (gboolean, length); + for (int i = 0; i < length; ++i) { + list[i] = [[value objectAtIndex:i] boolValue]; + } + g_key_file_set_boolean_list (file, [group UTF8String], [key UTF8String], list, length); + g_free (list); +} + +- (void) setIntegerListEntry:(NSString*)key inGroup:(NSString*)group value:(NSArray*)value; +{ + if (value == nil) { + [self removeKey:key inGroup:group]; + return; + } + gsize length = [value count]; + gint *list = g_new (gint, length); + for (int i = 0; i < length; ++i) { + list[i] = [[value objectAtIndex:i] intValue]; + } + g_key_file_set_integer_list (file, [group UTF8String], [key UTF8String], list, length); + g_free (list); +} + +- (void) setDoubleListEntry:(NSString*)key inGroup:(NSString*)group value:(NSArray*)value; +{ + if (value == nil) { + [self removeKey:key inGroup:group]; + return; + } + gsize length = [value count]; + gdouble *list = g_new (gdouble, length); + for (int i = 0; i < length; ++i) { + list[i] = [[value objectAtIndex:i] doubleValue]; + } + g_key_file_set_double_list (file, [group UTF8String], [key UTF8String], list, length); + g_free (list); +} + +- (void) removeGroup:(NSString*)group +{ + g_key_file_remove_group (file, [group UTF8String], NULL); +} + +- (void) removeKey:(NSString*)key inGroup:(NSString*)group; +{ + g_key_file_remove_key (file, [group UTF8String], [key UTF8String], NULL); +} + +- (void) dealloc +{ + [name release]; + g_key_file_free (file); + file = NULL; + [super dealloc]; +} + +@end + +// vim:ft=objc:sts=4:sw=4:et diff --git a/tikzit-1/src/gtk/ContextWindow.h b/tikzit-1/src/gtk/ContextWindow.h new file mode 100644 index 0000000..fcad9df --- /dev/null +++ b/tikzit-1/src/gtk/ContextWindow.h @@ -0,0 +1,53 @@ +/* + * Copyright 2011-2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import + +@class Configuration; +@class EdgeStylesModel; +@class NodeStylesModel; +@class PropertiesPane; +@class SelectionPane; +@class StyleManager; +@class TikzDocument; +@class Window; + +@interface ContextWindow: NSObject { + PropertiesPane *propsPane; + SelectionPane *selPane; + + GtkWidget *window; + GtkWidget *layout; +} + +@property (retain) TikzDocument *document; +@property (assign) BOOL visible; + +- (id) initWithStyleManager:(StyleManager*)mgr; +- (id) initWithNodeStylesModel:(NodeStylesModel*)nsm + andEdgeStylesModel:(EdgeStylesModel*)esm; + +- (void) present; +- (void) attachToWindow:(Window*)parent; + +- (void) loadConfiguration:(Configuration*)config; +- (void) saveConfiguration:(Configuration*)config; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/ContextWindow.m b/tikzit-1/src/gtk/ContextWindow.m new file mode 100644 index 0000000..d8e9d20 --- /dev/null +++ b/tikzit-1/src/gtk/ContextWindow.m @@ -0,0 +1,169 @@ +/* + * Copyright 2011-2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "ContextWindow.h" + +#import "Configuration.h" +#import "EdgeStylesModel.h" +#import "NodeStylesModel.h" +#import "PropertiesPane.h" +#import "SelectionPane.h" +#import "StyleManager.h" +#import "Window.h" + +#import "gtkhelpers.h" + +static gboolean props_window_delete_event_cb (GtkWidget *widget, GdkEvent *event, ContextWindow *window); + +@implementation ContextWindow + +- (id) init { + [self release]; + return nil; +} + +- (id) initWithStyleManager:(StyleManager*)sm { + return [self initWithNodeStylesModel:[NodeStylesModel modelWithStyleManager:sm] + andEdgeStylesModel:[EdgeStylesModel modelWithStyleManager:sm]]; +} + +- (id) initWithNodeStylesModel:(NodeStylesModel*)nsm + andEdgeStylesModel:(EdgeStylesModel*)esm { + self = [super init]; + + if (self) { + window = gtk_window_new (GTK_WINDOW_TOPLEVEL); + g_object_ref_sink (window); + gtk_window_set_title (GTK_WINDOW (window), "Context"); + gtk_window_set_role (GTK_WINDOW (window), "context"); + gtk_window_set_type_hint (GTK_WINDOW (window), + GDK_WINDOW_TYPE_HINT_UTILITY); + gtk_window_set_default_size (GTK_WINDOW (window), 200, 500); + g_signal_connect (G_OBJECT (window), + "delete-event", + G_CALLBACK (props_window_delete_event_cb), + self); + + layout = gtk_vbox_new (FALSE, 3); + g_object_ref_sink (layout); + gtk_widget_show (layout); + gtk_container_set_border_width (GTK_CONTAINER (layout), 6); + + gtk_container_add (GTK_CONTAINER (window), layout); + + propsPane = [[PropertiesPane alloc] init]; + gtk_box_pack_start (GTK_BOX (layout), [propsPane gtkWidget], + TRUE, TRUE, 0); + + GtkWidget *sep = gtk_hseparator_new (); + gtk_widget_show (sep); + gtk_box_pack_start (GTK_BOX (layout), sep, + FALSE, FALSE, 0); + + selPane = [[SelectionPane alloc] initWithNodeStylesModel:nsm + andEdgeStylesModel:esm]; + gtk_box_pack_start (GTK_BOX (layout), [selPane gtkWidget], + FALSE, FALSE, 0); + + // hack to position the context window somewhere sensible + // (upper right) + gtk_window_parse_geometry (GTK_WINDOW (window), "-0+0"); + } + + return self; +} + +- (void) dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + + g_object_unref (layout); + g_object_unref (window); + + [propsPane release]; + + [super dealloc]; +} + +- (TikzDocument*) document { + return [propsPane document]; +} + +- (void) setDocument:(TikzDocument*)doc { + [propsPane setDocument:doc]; + [selPane setDocument:doc]; +} + +- (BOOL) visible { + return gtk_widget_get_visible (window); +} + +- (void) setVisible:(BOOL)visible { + gtk_widget_set_visible (window, visible); +} + +- (void) present { + gtk_window_present (GTK_WINDOW (window)); +} + +- (void) attachToWindow:(Window*)parent { + utility_window_attach (GTK_WINDOW (window), [parent gtkWindow]); +} + +- (void) loadConfiguration:(Configuration*)config { + [propsPane loadConfiguration:config]; + [selPane loadConfiguration:config]; + + if ([config hasGroup:@"ContextWindow"]) { + tz_restore_window (GTK_WINDOW (window), + [config integerEntry:@"x" inGroup:@"ContextWindow"], + [config integerEntry:@"y" inGroup:@"ContextWindow"], + [config integerEntry:@"w" inGroup:@"ContextWindow"], + [config integerEntry:@"h" inGroup:@"ContextWindow"]); + } + [self setVisible:[config booleanEntry:@"visible" + inGroup:@"ContextWindow" + withDefault:YES]]; +} + +- (void) saveConfiguration:(Configuration*)config { + gint x, y, w, h; + + gtk_window_get_position (GTK_WINDOW (window), &x, &y); + gtk_window_get_size (GTK_WINDOW (window), &w, &h); + + [config setIntegerEntry:@"x" inGroup:@"ContextWindow" value:x]; + [config setIntegerEntry:@"y" inGroup:@"ContextWindow" value:y]; + [config setIntegerEntry:@"w" inGroup:@"ContextWindow" value:w]; + [config setIntegerEntry:@"h" inGroup:@"ContextWindow" value:h]; + [config setBooleanEntry:@"visible" + inGroup:@"ContextWindow" + value:[self visible]]; + + [propsPane saveConfiguration:config]; + [selPane saveConfiguration:config]; +} + +@end + +static gboolean props_window_delete_event_cb (GtkWidget *widget, GdkEvent *event, ContextWindow *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [window setVisible:NO]; + [pool drain]; + return TRUE; +} + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/CreateEdgeTool.h b/tikzit-1/src/gtk/CreateEdgeTool.h new file mode 100644 index 0000000..d33efce --- /dev/null +++ b/tikzit-1/src/gtk/CreateEdgeTool.h @@ -0,0 +1,45 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import "Tool.h" + +@class EdgeStyle; +@class EdgeStylesModel; +@class EdgeStyleSelector; +@class Node; +@class StyleManager; + +@interface CreateEdgeTool : NSObject { + GraphRenderer *renderer; + EdgeStyleSelector *stylePicker; + GtkWidget *configWidget; + Node *sourceNode; + NSPoint sourceNodeScreenPoint; + NSPoint halfEdgeEnd; +} + +@property (retain) EdgeStyle *activeStyle; + ++ (id) toolWithStyleManager:(StyleManager*)sm; +- (id) initWithStyleManager:(StyleManager*)sm; ++ (id) toolWithEdgeStylesModel:(EdgeStylesModel*)esm; +- (id) initWithEdgeStylesModel:(EdgeStylesModel*)esm; +@end + + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/CreateEdgeTool.m b/tikzit-1/src/gtk/CreateEdgeTool.m new file mode 100644 index 0000000..f3fb2c0 --- /dev/null +++ b/tikzit-1/src/gtk/CreateEdgeTool.m @@ -0,0 +1,226 @@ +/* + * Copyright 2011-2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "CreateEdgeTool.h" + +#import "Configuration.h" +#import "EdgeStyleSelector.h" +#import "EdgeStylesModel.h" +#import "GraphRenderer.h" +#import "TikzDocument.h" +#import "tzstockitems.h" + +static void clear_style_button_cb (GtkButton *widget, + EdgeStyleSelector *selector); + +@implementation CreateEdgeTool +- (NSString*) name { return @"Create Edge"; } +- (const gchar*) stockId { return TIKZIT_STOCK_CREATE_EDGE; } +- (NSString*) helpText { return @"Create new edges"; } +- (NSString*) shortcut { return @"e"; } +@synthesize activeRenderer=renderer; +@synthesize configurationWidget=configWidget; + ++ (id) toolWithStyleManager:(StyleManager*)sm { + return [[[self alloc] initWithStyleManager:sm] autorelease]; +} + ++ (id) toolWithEdgeStylesModel:(EdgeStylesModel*)esm { + return [[[self alloc] initWithEdgeStylesModel:esm] autorelease]; +} + +- (id) init { + [self release]; + return nil; +} + +- (id) initWithStyleManager:(StyleManager*)sm { + return [self initWithEdgeStylesModel:[EdgeStylesModel modelWithStyleManager:sm]]; +} + +- (id) initWithEdgeStylesModel:(EdgeStylesModel*)esm { + self = [super init]; + + if (self) { + stylePicker = [[EdgeStyleSelector alloc] initWithModel:esm]; + + configWidget = gtk_vbox_new (FALSE, 0); + g_object_ref_sink (configWidget); + + GtkWidget *label = gtk_label_new ("Edge style:"); + gtk_widget_show (label); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_box_pack_start (GTK_BOX (configWidget), + label, + FALSE, + FALSE, + 0); + + GtkWidget *selWindow = gtk_scrolled_window_new (NULL, NULL); + gtk_widget_show (selWindow); + gtk_container_add (GTK_CONTAINER (selWindow), + [stylePicker widget]); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (selWindow), + GTK_POLICY_NEVER, + GTK_POLICY_AUTOMATIC); + gtk_widget_show ([stylePicker widget]); + + GtkWidget *selectorFrame = gtk_frame_new (NULL); + gtk_widget_show (selectorFrame); + gtk_box_pack_start (GTK_BOX (configWidget), + selectorFrame, + TRUE, + TRUE, + 0); + gtk_container_add (GTK_CONTAINER (selectorFrame), + selWindow); + + GtkWidget *button = gtk_button_new_with_label ("No style"); + gtk_widget_show (button); + gtk_box_pack_start (GTK_BOX (configWidget), + button, + FALSE, + FALSE, + 0); + g_signal_connect (G_OBJECT (button), + "clicked", + G_CALLBACK (clear_style_button_cb), + stylePicker); + } + + return self; +} + +- (void) dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + + [renderer release]; + [stylePicker release]; + [sourceNode release]; + + g_object_unref (G_OBJECT (configWidget)); + + [super dealloc]; +} + +- (EdgeStyle*) activeStyle { + return [stylePicker selectedStyle]; +} + +- (void) setActiveStyle:(EdgeStyle*)style { + return [stylePicker setSelectedStyle:style]; +} + +- (void) invalidateHalfEdge { + NSRect invRect = NSRectAroundPoints(sourceNodeScreenPoint, halfEdgeEnd); + [renderer invalidateRect:NSInsetRect (invRect, -2.0f, -2.0f)]; +} + +- (void) mousePressAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { + if (button != LeftButton) + return; + + sourceNode = [renderer anyNodeAt:pos]; + if (sourceNode != nil) { + Transformer *transformer = [[renderer surface] transformer]; + sourceNodeScreenPoint = [transformer toScreen:[sourceNode point]]; + halfEdgeEnd = pos; + [renderer setNode:sourceNode highlighted:YES]; + } +} + +- (void) mouseMoveTo:(NSPoint)pos withButtons:(MouseButton)buttons andMask:(InputMask)mask { + if (!(buttons & LeftButton)) + return; + if (sourceNode == nil) + return; + + [self invalidateHalfEdge]; + + [renderer clearHighlightedNodes]; + [renderer setNode:sourceNode highlighted:YES]; + halfEdgeEnd = pos; + Node *targ = [renderer anyNodeAt:pos]; + if (targ != nil) { + [renderer setNode:targ highlighted:YES]; + } + + [self invalidateHalfEdge]; +} + +- (void) mouseReleaseAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { + if (button != LeftButton) + return; + if (sourceNode == nil) + return; + + [renderer clearHighlightedNodes]; + [self invalidateHalfEdge]; + + Node *targ = [renderer anyNodeAt:pos]; + if (targ != nil) { + Edge *edge = [Edge edgeWithSource:sourceNode andTarget:targ]; + [edge setStyle:[self activeStyle]]; + [[renderer document] addEdge:edge]; + [renderer invalidateEdge:edge]; + } + + sourceNode = nil; +} + +- (void) renderWithContext:(id)context onSurface:(id)surface { + if (sourceNode == nil) { + return; + } + [context saveState]; + + [context setLineWidth:1.0]; + [context startPath]; + [context moveTo:sourceNodeScreenPoint]; + [context lineTo:halfEdgeEnd]; + [context strokePathWithColor:MakeRColor (0, 0, 0, 0.5)]; + + [context restoreState]; +} + +- (StyleManager*) styleManager { + return [[stylePicker model] styleManager]; +} + +- (void) loadConfiguration:(Configuration*)config { + NSString *styleName = [config stringEntry:@"ActiveStyle" + inGroup:@"CreateEdgeTool" + withDefault:nil]; + [self setActiveStyle:[[self styleManager] edgeStyleForName:styleName]]; +} + +- (void) saveConfiguration:(Configuration*)config { + [config setStringEntry:@"ActiveStyle" + inGroup:@"CreateEdgeTool" + value:[[self activeStyle] name]]; +} +@end + +static void clear_style_button_cb (GtkButton *widget, + EdgeStyleSelector *selector) +{ + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [selector setSelectedStyle:nil]; + [pool drain]; +} + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/CreateNodeTool.h b/tikzit-1/src/gtk/CreateNodeTool.h new file mode 100644 index 0000000..94d6b31 --- /dev/null +++ b/tikzit-1/src/gtk/CreateNodeTool.h @@ -0,0 +1,42 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import +#import "Tool.h" + +@class NodeStyle; +@class NodeStyleSelector; +@class NodeStylesModel; +@class StyleManager; + +@interface CreateNodeTool : NSObject { + GraphRenderer *renderer; + NodeStyleSelector *stylePicker; + GtkWidget *configWidget; +} + +@property (retain) NodeStyle *activeStyle; + ++ (id) toolWithStyleManager:(StyleManager*)sm; +- (id) initWithStyleManager:(StyleManager*)sm; ++ (id) toolWithNodeStylesModel:(NodeStylesModel*)nsm; +- (id) initWithNodeStylesModel:(NodeStylesModel*)nsm; +@end + + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/CreateNodeTool.m b/tikzit-1/src/gtk/CreateNodeTool.m new file mode 100644 index 0000000..77b24f0 --- /dev/null +++ b/tikzit-1/src/gtk/CreateNodeTool.m @@ -0,0 +1,169 @@ +/* + * Copyright 2011-2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "CreateNodeTool.h" + +#import "Configuration.h" +#import "GraphRenderer.h" +#import "NodeStyleSelector.h" +#import "NodeStylesModel.h" +#import "TikzDocument.h" +#import "tzstockitems.h" + +static void clear_style_button_cb (GtkButton *widget, + NodeStyleSelector *selector); + +@implementation CreateNodeTool +- (NSString*) name { return @"Create Node"; } +- (const gchar*) stockId { return TIKZIT_STOCK_CREATE_NODE; } +- (NSString*) helpText { return @"Create new nodes"; } +- (NSString*) shortcut { return @"n"; } +@synthesize activeRenderer=renderer; +@synthesize configurationWidget=configWidget; + ++ (id) toolWithStyleManager:(StyleManager*)sm { + return [[[self alloc] initWithStyleManager:sm] autorelease]; +} + ++ (id) toolWithNodeStylesModel:(NodeStylesModel*)nsm { + return [[[self alloc] initWithNodeStylesModel:nsm] autorelease]; +} + +- (id) init { + [self release]; + return nil; +} + +- (id) initWithStyleManager:(StyleManager*)sm { + return [self initWithNodeStylesModel:[NodeStylesModel modelWithStyleManager:sm]]; +} + +- (id) initWithNodeStylesModel:(NodeStylesModel*)nsm { + self = [super init]; + + if (self) { + stylePicker = [[NodeStyleSelector alloc] initWithModel:nsm]; + + configWidget = gtk_vbox_new (FALSE, 0); + g_object_ref_sink (configWidget); + + GtkWidget *label = gtk_label_new ("Node style:"); + gtk_widget_show (label); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_box_pack_start (GTK_BOX (configWidget), + label, + FALSE, + FALSE, + 0); + + GtkWidget *selWindow = gtk_scrolled_window_new (NULL, NULL); + gtk_widget_show (selWindow); + gtk_container_add (GTK_CONTAINER (selWindow), + [stylePicker widget]); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (selWindow), + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); + gtk_widget_show ([stylePicker widget]); + + GtkWidget *selectorFrame = gtk_frame_new (NULL); + gtk_widget_show (selectorFrame); + gtk_box_pack_start (GTK_BOX (configWidget), + selectorFrame, + TRUE, + TRUE, + 0); + gtk_container_add (GTK_CONTAINER (selectorFrame), + selWindow); + + GtkWidget *button = gtk_button_new_with_label ("No style"); + gtk_widget_show (button); + gtk_box_pack_start (GTK_BOX (configWidget), + button, + FALSE, + FALSE, + 0); + g_signal_connect (G_OBJECT (button), + "clicked", + G_CALLBACK (clear_style_button_cb), + stylePicker); + } + + return self; +} + +- (void) dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + + [renderer release]; + [stylePicker release]; + + g_object_unref (G_OBJECT (configWidget)); + + [super dealloc]; +} + +- (NodeStyle*) activeStyle { + return [stylePicker selectedStyle]; +} + +- (void) setActiveStyle:(NodeStyle*)style { + return [stylePicker setSelectedStyle:style]; +} + +// FIXME: create node on press, and drag it around? +- (void) mousePressAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask {} + +- (void) mouseReleaseAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { + if (button != LeftButton) + return; + + Transformer *transformer = [renderer transformer]; + NSPoint nodePoint = [transformer fromScreen:[[renderer grid] snapScreenPoint:pos]]; + Node *node = [Node nodeWithPoint:nodePoint]; + [node setStyle:[self activeStyle]]; + [[renderer document] addNode:node]; +} + +- (void) renderWithContext:(id)context onSurface:(id)surface {} + +- (StyleManager*) styleManager { + return [[stylePicker model] styleManager]; +} + +- (void) loadConfiguration:(Configuration*)config { + NSString *styleName = [config stringEntry:@"ActiveStyle" + inGroup:@"CreateNodeTool" + withDefault:nil]; + [self setActiveStyle:[[self styleManager] nodeStyleForName:styleName]]; +} + +- (void) saveConfiguration:(Configuration*)config { + [config setStringEntry:@"ActiveStyle" + inGroup:@"CreateNodeTool" + value:[[self activeStyle] name]]; +} +@end + +static void clear_style_button_cb (GtkButton *widget, + NodeStyleSelector *selector) +{ + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [selector setSelectedStyle:nil]; + [pool drain]; +} + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/DocumentContext.h b/tikzit-1/src/gtk/DocumentContext.h new file mode 100644 index 0000000..e4c1065 --- /dev/null +++ b/tikzit-1/src/gtk/DocumentContext.h @@ -0,0 +1,27 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" + +@class TikzDocument; + +@interface DocumentContext { + TikzDocument *document; + GraphRenderer *renderSurface; +} + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/Edge+Render.h b/tikzit-1/src/gtk/Edge+Render.h new file mode 100644 index 0000000..e88b28a --- /dev/null +++ b/tikzit-1/src/gtk/Edge+Render.h @@ -0,0 +1,34 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import "Edge.h" +#import "RenderContext.h" +#import "Surface.h" + +@interface Edge (Render) + ++ (float) controlPointRadius; +- (void) renderControlsInContext:(id)context withTransformer:(Transformer*)transformer; +- (void) renderBasicEdgeInContext:(id)context withTransformer:(Transformer*)t selected:(BOOL)selected; +- (void) renderToSurface:(id)surface withContext:(id)context selected:(BOOL)selected; +- (NSRect) renderedBoundsWithTransformer:(Transformer*)t whenSelected:(BOOL)selected; +- (BOOL) hitByPoint:(NSPoint)p onSurface:(id)surface withFuzz:(float)fuzz; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/Edge+Render.m b/tikzit-1/src/gtk/Edge+Render.m new file mode 100644 index 0000000..3cc2a14 --- /dev/null +++ b/tikzit-1/src/gtk/Edge+Render.m @@ -0,0 +1,267 @@ +/* + * Copyright 2011 Alex Merry + * Copyright 2010 Chris Heunen + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "Edge+Render.h" +#import "Node+Render.h" +#import "../common/util.h" + +static const float edgeWidth = 2.0; +static const float cpRadius = 3.0; +static const float cpLineWidth = 1.0; + +@implementation Edge (Render) + ++ (float) controlPointRadius { + return cpRadius; +} + +- (float) controlDistance { + const float dx = (targ.x - src.x); + const float dy = (targ.y - src.y); + if (dx == 0 && dy == 0) { + return weight; + } else { + return NSDistanceBetweenPoints(src, targ) * weight; + } +} + +- (void) renderControlsInContext:(id)context withTransformer:(Transformer*)transformer { + [context saveState]; + + [self updateControls]; + + NSPoint c_source = [transformer toScreen:src]; + NSPoint c_target = [transformer toScreen:targ]; + NSPoint c_mid = [transformer toScreen:mid]; + + const float dx = (c_target.x - c_source.x); + const float dy = (c_target.y - c_source.y); + + [context setLineWidth:cpLineWidth]; + RColor fillColor = MakeRColor (1.0, 1.0, 1.0, 0.5); + + // draw a circle at the mid point + [context startPath]; + [context circleAt:c_mid withRadius:cpRadius]; + [context strokePathWithColor:MakeSolidRColor(0, 0, 1) andFillWithColor:fillColor]; + + //[context setAntialiasMode:AntialiasDisabled]; + + // size of control circles + float c_dist = 0.0f; + if (dx == 0 && dy == 0) { + c_dist = [transformer scaleToScreen:weight]; + } else { + c_dist = NSDistanceBetweenPoints(c_source, c_target) * weight; + } + + // basic bend is blue, in-out is green + RColor controlTrackColor; + if ([self bendMode] == EdgeBendModeBasic) { + controlTrackColor = MakeRColor (0.0, 0.0, 1.0, 0.4); + } else { + controlTrackColor = MakeRColor (0.0, 0.7, 0.0, 0.4); + } + + [context startPath]; + [context circleAt:c_source withRadius:c_dist]; + if (dx != 0 || dy != 0) { + [context circleAt:c_target withRadius:c_dist]; + } + [context strokePathWithColor:controlTrackColor]; + + RColor handleColor = MakeRColor (1.0, 0.0, 1.0, 0.6); + if ([self bendMode] == EdgeBendModeBasic) { + if (bend % 45 != 0) { + handleColor = MakeRColor (0.0, 0.0, 0.1, 0.4); + } + } else if ([self bendMode] == EdgeBendModeInOut) { + if (outAngle % 45 != 0) { + handleColor = MakeRColor (0.0, 0.7, 0.0, 0.4); + } + } + + NSPoint c_cp1 = [transformer toScreen:cp1]; + [context moveTo:c_source]; + [context lineTo:c_cp1]; + [context circleAt:c_cp1 withRadius:cpRadius]; + [context strokePathWithColor:handleColor]; + + if ([self bendMode] == EdgeBendModeInOut) { + // recalculate color based on inAngle + if (inAngle % 45 == 0) { + handleColor = MakeRColor (1.0, 0.0, 1.0, 0.6); + } else { + handleColor = MakeRColor (0.0, 0.7, 0.0, 0.4); + } + } + + NSPoint c_cp2 = [transformer toScreen:cp2]; + [context moveTo:c_target]; + [context lineTo:c_cp2]; + [context circleAt:c_cp2 withRadius:cpRadius]; + [context strokePathWithColor:handleColor]; + + [context restoreState]; +} + +- (void) renderArrowStrokePathInContext:(id)context withTransformer:(Transformer*)transformer color:(RColor)color { + + if ([self style] != nil) { + switch ([[self style] headStyle]) { + case AH_None: + break; + case AH_Plain: + [context startPath]; + [context moveTo:[transformer toScreen:[self leftHeadNormal]]]; + [context lineTo:[transformer toScreen:head]]; + [context lineTo:[transformer toScreen:[self rightHeadNormal]]]; + [context strokePathWithColor:color]; + break; + case AH_Latex: + [context startPath]; + [context moveTo:[transformer toScreen:[self leftHeadNormal]]]; + [context lineTo:[transformer toScreen:head]]; + [context lineTo:[transformer toScreen:[self rightHeadNormal]]]; + [context closeSubPath]; + [context strokePathWithColor:color andFillWithColor:color]; + break; + } + switch ([[self style] tailStyle]) { + case AH_None: + break; + case AH_Plain: + [context startPath]; + [context moveTo:[transformer toScreen:[self leftTailNormal]]]; + [context lineTo:[transformer toScreen:tail]]; + [context lineTo:[transformer toScreen:[self rightTailNormal]]]; + [context strokePathWithColor:color]; + break; + case AH_Latex: + [context startPath]; + [context moveTo:[transformer toScreen:[self leftTailNormal]]]; + [context lineTo:[transformer toScreen:tail]]; + [context lineTo:[transformer toScreen:[self rightTailNormal]]]; + [context closeSubPath]; + [context strokePathWithColor:color andFillWithColor:color]; + break; + } + } +} + +- (void) createStrokePathInContext:(id)context withTransformer:(Transformer*)transformer { + NSPoint c_tail = [transformer toScreen:tail]; + NSPoint c_cp1 = [transformer toScreen:cp1]; + NSPoint c_cp2 = [transformer toScreen:cp2]; + NSPoint c_head = [transformer toScreen:head]; + + [context startPath]; + [context moveTo:c_tail]; + [context curveTo:c_head withCp1:c_cp1 andCp2:c_cp2]; + + if ([self style] != nil) { + // draw edge decoration + switch ([[self style] decorationStyle]) { + case ED_None: + break; + case ED_Tick: + [context moveTo:[transformer toScreen:[self leftNormal]]]; + [context lineTo:[transformer toScreen:[self rightNormal]]]; + break; + case ED_Arrow: + [context moveTo:[transformer toScreen:[self leftNormal]]]; + [context lineTo:[transformer toScreen:[self midTan]]]; + [context lineTo:[transformer toScreen:[self rightNormal]]]; + break; + } + + } +} + +- (RColor) color { + if (style) { + return [[style colorRGB] rColor]; + } else { + return BlackRColor; + } +} + +- (void) renderBasicEdgeInContext:(id)context withTransformer:(Transformer*)t selected:(BOOL)selected { + [self updateControls]; + [context saveState]; + + const CGFloat lineWidth = style ? [style thickness] : edgeWidth; + [context setLineWidth:lineWidth]; + RColor color = [self color]; + if (selected) { + color.alpha = 0.5; + } + + [self createStrokePathInContext:context withTransformer:t]; + [context strokePathWithColor:color]; + + [self renderArrowStrokePathInContext:context withTransformer:t color:color]; + + [context restoreState]; +} + +- (void) renderToSurface:(id )surface withContext:(id)context selected:(BOOL)selected { + [self renderBasicEdgeInContext:context withTransformer:[surface transformer] selected:selected]; + + if (selected) { + [self renderControlsInContext:context withTransformer:[surface transformer]]; + } + + if ([self hasEdgeNode]) { + NSPoint labelPt = [[surface transformer] toScreen:[self mid]]; + [[self edgeNode] renderLabelAt:labelPt + withContext:context]; + } +} + +- (NSRect) renderedBoundsWithTransformer:(Transformer*)t whenSelected:(BOOL)selected { + if (selected) { + float c_dist = [self controlDistance] + cpRadius; // include handle + NSRect cp1circ = NSMakeRect (head.x - c_dist, head.y - c_dist, 2*c_dist, 2*c_dist); + NSRect cp2circ = NSMakeRect (tail.x - c_dist, tail.y - c_dist, 2*c_dist, 2*c_dist); + NSRect rect = NSUnionRect ([self boundingRect], NSUnionRect (cp1circ, cp2circ)); + return [t rectToScreen:rect]; + } else { + return [t rectToScreen:[self boundingRect]]; + } +} + +- (BOOL) hitByPoint:(NSPoint)p onSurface:(id)surface withFuzz:(float)fuzz { + [self updateControls]; + + NSRect boundingRect = [[surface transformer] rectToScreen:[self boundingRect]]; + if (!NSPointInRect(p, NSInsetRect(boundingRect, -fuzz, -fuzz))) { + return NO; + } + + id cr = [surface createRenderContext]; + + [cr setLineWidth:edgeWidth + 2 * fuzz]; + [self createStrokePathInContext:cr withTransformer:[surface transformer]]; + + return [cr strokeIncludesPoint:p]; +} + +@end + +// vim:ft=objc:ts=4:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/EdgeStyle+Gtk.h b/tikzit-1/src/gtk/EdgeStyle+Gtk.h new file mode 100644 index 0000000..4323593 --- /dev/null +++ b/tikzit-1/src/gtk/EdgeStyle+Gtk.h @@ -0,0 +1,29 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import "EdgeStyle.h" +#import + +@interface EdgeStyle (Gtk) + +- (GdkColor) color; +- (void) setColor:(GdkColor)color; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/EdgeStyle+Gtk.m b/tikzit-1/src/gtk/EdgeStyle+Gtk.m new file mode 100644 index 0000000..886329e --- /dev/null +++ b/tikzit-1/src/gtk/EdgeStyle+Gtk.m @@ -0,0 +1,33 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "EdgeStyle+Gtk.h" +#import "ColorRGB+Gtk.h" + +@implementation EdgeStyle (Gtk) + +- (GdkColor) color { + return [[self colorRGB] gdkColor]; +} + +- (void) setColor:(GdkColor)color { + [self setColorRGB:[ColorRGB colorWithGdkColor:color]]; +} + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/EdgeStyle+Storage.h b/tikzit-1/src/gtk/EdgeStyle+Storage.h new file mode 100644 index 0000000..74881f3 --- /dev/null +++ b/tikzit-1/src/gtk/EdgeStyle+Storage.h @@ -0,0 +1,29 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import "EdgeStyle.h" +#import "Configuration.h" + +@interface EdgeStyle (Storage) + +- (id) initFromConfigurationGroup:(NSString*)groupName config:(Configuration*)configFile; +- (void) storeToConfigurationGroup:(NSString*)groupName config:(Configuration*)configFile; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/EdgeStyle+Storage.m b/tikzit-1/src/gtk/EdgeStyle+Storage.m new file mode 100644 index 0000000..45e2a20 --- /dev/null +++ b/tikzit-1/src/gtk/EdgeStyle+Storage.m @@ -0,0 +1,55 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "EdgeStyle+Storage.h" +#import "ColorRGB+IntegerListStorage.h" + +@implementation EdgeStyle (Storage) + +- (id) initFromConfigurationGroup:(NSString*)groupName config:(Configuration*)configFile { + self = [self init]; + + if (self) { + [self setName:[configFile stringEntry:@"Name" inGroup:groupName withDefault:name]]; + [self setCategory:[configFile stringEntry:@"Category" inGroup:groupName withDefault:category]]; + headStyle = [configFile integerEntry:@"HeadStyle" inGroup:groupName withDefault:headStyle]; + tailStyle = [configFile integerEntry:@"TailStyle" inGroup:groupName withDefault:tailStyle]; + decorationStyle = [configFile integerEntry:@"DecorationStyle" inGroup:groupName withDefault:decorationStyle]; + thickness = [configFile doubleEntry:@"Thickness" inGroup:groupName withDefault:thickness]; + [self setColorRGB: + [ColorRGB colorFromValueList: + [configFile integerListEntry:@"Color" + inGroup:groupName + withDefault:[colorRGB valueList]]]]; + } + + return self; +} + +- (void) storeToConfigurationGroup:(NSString*)groupName config:(Configuration*)configFile { + [configFile setStringEntry:@"Name" inGroup:groupName value:name]; + [configFile setStringEntry:@"Category" inGroup:groupName value:category]; + [configFile setIntegerEntry:@"HeadStyle" inGroup:groupName value:headStyle]; + [configFile setIntegerEntry:@"TailStyle" inGroup:groupName value:tailStyle]; + [configFile setIntegerEntry:@"DecorationStyle" inGroup:groupName value:decorationStyle]; + [configFile setDoubleEntry:@"Thickness" inGroup:groupName value:thickness]; + [configFile setIntegerListEntry:@"Color" inGroup:groupName value:[[self colorRGB] valueList]]; +} + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/EdgeStyleEditor.h b/tikzit-1/src/gtk/EdgeStyleEditor.h new file mode 100644 index 0000000..2224bbb --- /dev/null +++ b/tikzit-1/src/gtk/EdgeStyleEditor.h @@ -0,0 +1,45 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import + +@class EdgeStyle; + +@interface EdgeStyleEditor: NSObject { + EdgeStyle *style; + GtkTable *table; + GtkEntry *nameEdit; + GtkComboBox *decorationCombo; + GtkComboBox *headArrowCombo; + GtkComboBox *tailArrowCombo; + GtkColorButton *colorButton; + GtkWidget *makeColorTexSafeButton; + GtkAdjustment *thicknessAdj; + BOOL blockSignals; +} + +@property (retain) EdgeStyle *style; +@property (readonly) GtkWidget *widget; + +- (id) init; + +- (void) selectNameField; + +@end + +// vim:ft=objc:ts=4:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/EdgeStyleEditor.m b/tikzit-1/src/gtk/EdgeStyleEditor.m new file mode 100644 index 0000000..c7ca8bd --- /dev/null +++ b/tikzit-1/src/gtk/EdgeStyleEditor.m @@ -0,0 +1,499 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "EdgeStyleEditor.h" + +#import "EdgeStyle.h" +#import "EdgeStyle+Gtk.h" +#import "Shape.h" + +#include + +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpointer-sign" +#import "edgedecdata.m" +#pragma GCC diagnostic pop + +// {{{ Data Types +enum { + DEC_NAME_COL = 0, + DEC_PREVIEW_COL, + DEC_VALUE_COL, + DEC_N_COLS +}; + +struct dec_info { + const gchar *name; + const GdkPixdata *pixdata; + int value; +}; +static struct dec_info ed_entries[] = { + { "None", &ED_none_pixdata, ED_None }, + { "Arrow", &ED_arrow_pixdata, ED_Arrow }, + { "Tick", &ED_tick_pixdata, ED_Tick } +}; +static guint n_ed_entries = G_N_ELEMENTS (ed_entries); +static struct dec_info ah_head_entries[] = { + { "None", &AH_none_pixdata, AH_None }, + { "Plain", &AH_plain_head_pixdata, AH_Plain }, + { "Latex", &AH_latex_head_pixdata, AH_Latex } +}; +static guint n_ah_head_entries = G_N_ELEMENTS (ah_head_entries); +static struct dec_info ah_tail_entries[] = { + { "None", &AH_none_pixdata, AH_None }, + { "Plain", &AH_plain_tail_pixdata, AH_Plain }, + { "Latex", &AH_latex_tail_pixdata, AH_Latex } +}; +static guint n_ah_tail_entries = G_N_ELEMENTS (ah_tail_entries); + +static const guint row_count = 6; + +// }}} +// {{{ Internal interfaces +// {{{ GTK+ Callbacks +static void style_name_edit_changed_cb (GtkEditable *widget, EdgeStyleEditor *editor); +static void decoration_combo_changed_cb (GtkComboBox *widget, EdgeStyleEditor *editor); +static void head_arrow_combo_changed_cb (GtkComboBox *widget, EdgeStyleEditor *editor); +static void tail_arrow_combo_changed_cb (GtkComboBox *widget, EdgeStyleEditor *editor); +static void thickness_adjustment_changed_cb (GtkAdjustment *widget, EdgeStyleEditor *editor); +static void color_changed_cb (GtkColorButton *widget, EdgeStyleEditor *editor); +static void make_color_safe_button_clicked_cb (GtkButton *widget, EdgeStyleEditor *editor); +// }}} +// {{{ Notifications + +@interface EdgeStyleEditor (Notifications) +- (void) nameChangedTo:(NSString*)value; +- (void) edgeDecorationChangedTo:(EdgeDectorationStyle)value; +- (void) headArrowChangedTo:(ArrowHeadStyle)value; +- (void) tailArrowChangedTo:(ArrowHeadStyle)value; +- (void) thicknessChangedTo:(double)value; +- (void) makeColorTexSafe; +- (void) colorChangedTo:(GdkColor)value; +@end + +// }}} +// {{{ Private + +@interface EdgeStyleEditor (Private) +- (void) load:(guint)count decorationStylesFrom:(struct dec_info*)info into:(GtkListStore*)list; +- (void) clearDecCombo:(GtkComboBox*)combo; +- (void) setDecCombo:(GtkComboBox*)combo toValue:(int)value; +@end + +// }}} +// }}} +// {{{ API + +@implementation EdgeStyleEditor + +- (void) _addWidget:(GtkWidget*)w withLabel:(gchar *)label atRow:(guint)row { + NSAssert(row < row_count, @"row_count is wrong!"); + + GtkWidget *l = gtk_label_new (label); + gtk_misc_set_alignment (GTK_MISC (l), 0, 0.5); + gtk_widget_show (l); + gtk_widget_show (w); + + gtk_table_attach (table, l, + 0, 1, row, row+1, // l, r, t, b + GTK_FILL, // x opts + GTK_FILL | GTK_EXPAND, // y opts + 5, // x padding + 0); // y padding + + gtk_table_attach (table, w, + 1, 2, row, row+1, // l, r, t, b + GTK_FILL | GTK_EXPAND, // x opts + GTK_FILL | GTK_EXPAND, // y opts + 0, // x padding + 0); // y padding +} + +- (GtkComboBox*) _createDecComboWithEntries:(struct dec_info*)entries count:(guint)n { + GtkListStore *store = gtk_list_store_new (DEC_N_COLS, G_TYPE_STRING, GDK_TYPE_PIXBUF, G_TYPE_INT); + [self load:n decorationStylesFrom:entries into:store]; + + GtkComboBox *combo = GTK_COMBO_BOX (gtk_combo_box_new_with_model (GTK_TREE_MODEL (store))); + g_object_unref (store); + GtkCellRenderer *cellRend = gtk_cell_renderer_pixbuf_new (); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), + cellRend, + TRUE); + gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo), cellRend, "pixbuf", DEC_PREVIEW_COL); + g_object_ref_sink (combo); + + return combo; +} + +- (GtkWidget*) _createMakeColorTexSafeButton { + GtkWidget *b = gtk_button_new (); + GtkWidget *icon = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_BUTTON); + gtk_widget_show (icon); + gtk_container_add (GTK_CONTAINER (b), icon); + NSString *ttip = @"The colour is not a predefined TeX colour.\nClick here to choose the nearest TeX-safe colour."; + gtk_widget_set_tooltip_text (b, [ttip UTF8String]); + return b; +} + +- (id) init { + self = [super init]; + + if (self != nil) { + style = nil; + table = GTK_TABLE (gtk_table_new (row_count, 2, FALSE)); + gtk_table_set_col_spacings (table, 6); + gtk_table_set_row_spacings (table, 6); + gtk_widget_set_sensitive (GTK_WIDGET (table), FALSE); + blockSignals = NO; + + /** + * Name + */ + nameEdit = GTK_ENTRY (gtk_entry_new ()); + g_object_ref_sink (nameEdit); + [self _addWidget:GTK_WIDGET (nameEdit) + withLabel:"Name" + atRow:0]; + g_signal_connect (G_OBJECT (nameEdit), + "changed", + G_CALLBACK (style_name_edit_changed_cb), + self); + + + /** + * Edge decoration style + */ + decorationCombo = [self _createDecComboWithEntries:ed_entries count:n_ed_entries]; + [self _addWidget:GTK_WIDGET (decorationCombo) + withLabel:"Decoration" + atRow:1]; + g_signal_connect (G_OBJECT (decorationCombo), + "changed", + G_CALLBACK (decoration_combo_changed_cb), + self); + + + /** + * Head arrow style + */ + headArrowCombo = [self _createDecComboWithEntries:ah_head_entries count:n_ah_head_entries]; + [self _addWidget:GTK_WIDGET (headArrowCombo) + withLabel:"Arrow head" + atRow:2]; + g_signal_connect (G_OBJECT (headArrowCombo), + "changed", + G_CALLBACK (head_arrow_combo_changed_cb), + self); + + + /** + * Tail arrow style + */ + tailArrowCombo = [self _createDecComboWithEntries:ah_tail_entries count:n_ah_tail_entries]; + [self _addWidget:GTK_WIDGET (tailArrowCombo) + withLabel:"Arrow tail" + atRow:3]; + g_signal_connect (G_OBJECT (tailArrowCombo), + "changed", + G_CALLBACK (tail_arrow_combo_changed_cb), + self); + + + /** + * Colour + */ + GtkWidget *colorBox = gtk_hbox_new (FALSE, 0); + [self _addWidget:colorBox + withLabel:"Colour" + atRow:4]; + colorButton = GTK_COLOR_BUTTON (gtk_color_button_new ()); + g_object_ref_sink (colorButton); + gtk_widget_show (GTK_WIDGET (colorButton)); + gtk_box_pack_start (GTK_BOX (colorBox), GTK_WIDGET (colorButton), + FALSE, FALSE, 0); + makeColorTexSafeButton = [self _createMakeColorTexSafeButton]; + g_object_ref_sink (makeColorTexSafeButton); + gtk_box_pack_start (GTK_BOX (colorBox), makeColorTexSafeButton, + FALSE, FALSE, 0); + g_signal_connect (G_OBJECT (colorButton), + "color-set", + G_CALLBACK (color_changed_cb), + self); + g_signal_connect (G_OBJECT (makeColorTexSafeButton), + "clicked", + G_CALLBACK (make_color_safe_button_clicked_cb), + self); + + + /** + * Thickness + */ + thicknessAdj = GTK_ADJUSTMENT (gtk_adjustment_new ( + 1.0, // value + 0.0, // lower + 50.0, // upper + 0.20, // step + 1.0, // page + 0.0)); // (irrelevant) + g_object_ref_sink (thicknessAdj); + GtkWidget *scaleSpin = gtk_spin_button_new (thicknessAdj, 0.0, 2); + [self _addWidget:scaleSpin + withLabel:"Thickness" + atRow:5]; + g_signal_connect (G_OBJECT (thicknessAdj), + "value-changed", + G_CALLBACK (thickness_adjustment_changed_cb), + self); + } + + return self; +} + +- (void) dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + + g_object_unref (nameEdit); + g_object_unref (decorationCombo); + g_object_unref (colorButton); + g_object_unref (makeColorTexSafeButton); + g_object_unref (thicknessAdj); + g_object_unref (table); + [style release]; + + [super dealloc]; +} + +- (EdgeStyle*) style { + return style; +} + +- (void) setStyle:(EdgeStyle*)s { + blockSignals = YES; + EdgeStyle *oldStyle = style; + style = [s retain]; + + if (style != nil) { + gtk_widget_set_sensitive (GTK_WIDGET (table), TRUE); + + gtk_entry_set_text(nameEdit, [[style name] UTF8String]); + + [self setDecCombo:decorationCombo toValue:[style decorationStyle]]; + [self setDecCombo:headArrowCombo toValue:[style headStyle]]; + [self setDecCombo:tailArrowCombo toValue:[style tailStyle]]; + + GdkColor c = [style color]; + gtk_color_button_set_color(colorButton, &c); + gtk_widget_set_visible (makeColorTexSafeButton, ([[style colorRGB] name] == nil)); + + gtk_adjustment_set_value(thicknessAdj, [style thickness]); + } else { + gtk_entry_set_text(nameEdit, ""); + [self clearDecCombo:decorationCombo]; + [self clearDecCombo:headArrowCombo]; + [self clearDecCombo:tailArrowCombo]; + gtk_widget_set_visible (makeColorTexSafeButton, FALSE); + gtk_adjustment_set_value(thicknessAdj, 1.0); + gtk_widget_set_sensitive (GTK_WIDGET (table), FALSE); + } + + [oldStyle release]; + blockSignals = NO; +} + +- (GtkWidget*) widget { + return GTK_WIDGET (table); +} + +- (void) selectNameField { + gtk_widget_grab_focus (GTK_WIDGET (nameEdit)); + gtk_editable_select_region (GTK_EDITABLE (nameEdit), 0, -1); +} + +@end + +// }}} +// {{{ Notifications + +@implementation EdgeStyleEditor (Notifications) +- (void) nameChangedTo:(NSString*)value { + [style setName:value]; +} + +- (void) edgeDecorationChangedTo:(EdgeDectorationStyle)value { + [style setDecorationStyle:value]; +} + +- (void) headArrowChangedTo:(ArrowHeadStyle)value { + [style setHeadStyle:value]; +} + +- (void) tailArrowChangedTo:(ArrowHeadStyle)value { + [style setTailStyle:value]; +} + +- (void) thicknessChangedTo:(double)value { + [style setThickness:(float)value]; +} + +- (void) colorChangedTo:(GdkColor)value { + [style setColor:value]; + gtk_widget_set_visible (makeColorTexSafeButton, + [[style colorRGB] name] == nil); +} + +- (void) makeColorTexSafe { + if (style != nil) { + [[style colorRGB] setToClosestHashed]; + GdkColor color = [style color]; + gtk_color_button_set_color(colorButton, &color); + gtk_widget_set_visible (makeColorTexSafeButton, FALSE); + } +} +@end + +// }}} +// {{{ Private + +@implementation EdgeStyleEditor (Private) +- (BOOL) signalsBlocked { return blockSignals; } + +- (void) load:(guint)count decorationStylesFrom:(struct dec_info*)info into:(GtkListStore*)list { + GtkTreeIter iter; + + for (guint i = 0; i < count; ++i) { + GdkPixbuf *buf = gdk_pixbuf_from_pixdata (info[i].pixdata, FALSE, NULL); + gtk_list_store_append (list, &iter); + gtk_list_store_set (list, &iter, + DEC_NAME_COL, info[i].name, + DEC_PREVIEW_COL, buf, + DEC_VALUE_COL, info[i].value, + -1); + g_object_unref (buf); + } +} + +- (void) clearDecCombo:(GtkComboBox*)combo { + gtk_combo_box_set_active (combo, -1); +} + +- (void) setDecCombo:(GtkComboBox*)combo toValue:(int)value { + GtkTreeModel *model = gtk_combo_box_get_model (combo); + GtkTreeIter iter; + if (gtk_tree_model_get_iter_first (model, &iter)) { + do { + int rowValue; + gtk_tree_model_get (model, &iter, DEC_VALUE_COL, &rowValue, -1); + if (rowValue == value) { + gtk_combo_box_set_active_iter (combo, &iter); + return; + } + } while (gtk_tree_model_iter_next (model, &iter)); + } +} +@end + +// }}} +// {{{ GTK+ callbacks + +static void style_name_edit_changed_cb (GtkEditable *widget, EdgeStyleEditor *editor) { + if ([editor signalsBlocked]) + return; + + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + const gchar *contents = gtk_entry_get_text (GTK_ENTRY (widget)); + [editor nameChangedTo:[NSString stringWithUTF8String:contents]]; + + [pool drain]; +} + +static void decoration_combo_changed_cb (GtkComboBox *widget, EdgeStyleEditor *editor) { + if ([editor signalsBlocked]) + return; + + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + GtkTreeIter iter; + gtk_combo_box_get_active_iter (widget, &iter); + EdgeDectorationStyle dec = ED_None; + gtk_tree_model_get (gtk_combo_box_get_model (widget), &iter, DEC_VALUE_COL, &dec, -1); + [editor edgeDecorationChangedTo:dec]; + + [pool drain]; +} + +static void head_arrow_combo_changed_cb (GtkComboBox *widget, EdgeStyleEditor *editor) { + if ([editor signalsBlocked]) + return; + + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + GtkTreeIter iter; + gtk_combo_box_get_active_iter (widget, &iter); + ArrowHeadStyle dec = AH_None; + gtk_tree_model_get (gtk_combo_box_get_model (widget), &iter, DEC_VALUE_COL, &dec, -1); + [editor headArrowChangedTo:dec]; + + [pool drain]; +} + +static void tail_arrow_combo_changed_cb (GtkComboBox *widget, EdgeStyleEditor *editor) { + if ([editor signalsBlocked]) + return; + + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + GtkTreeIter iter; + gtk_combo_box_get_active_iter (widget, &iter); + ArrowHeadStyle dec = AH_None; + gtk_tree_model_get (gtk_combo_box_get_model (widget), &iter, DEC_VALUE_COL, &dec, -1); + [editor tailArrowChangedTo:dec]; + + [pool drain]; +} + +static void thickness_adjustment_changed_cb (GtkAdjustment *adj, EdgeStyleEditor *editor) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [editor thicknessChangedTo:gtk_adjustment_get_value (adj)]; + [pool drain]; +} + +static void color_changed_cb (GtkColorButton *widget, EdgeStyleEditor *editor) { + if ([editor signalsBlocked]) + return; + + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + GdkColor color; + gtk_color_button_get_color (widget, &color); + [editor colorChangedTo:color]; + + [pool drain]; +} + +static void make_color_safe_button_clicked_cb (GtkButton *widget, EdgeStyleEditor *editor) { + if ([editor signalsBlocked]) + return; + + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [editor makeColorTexSafe]; + [pool drain]; +} + +// }}} + +// vim:ft=objc:ts=4:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/EdgeStyleSelector.h b/tikzit-1/src/gtk/EdgeStyleSelector.h new file mode 100644 index 0000000..904bd93 --- /dev/null +++ b/tikzit-1/src/gtk/EdgeStyleSelector.h @@ -0,0 +1,61 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import + +@class EdgeStyle; +@class EdgeStylesModel; +@class StyleManager; + +@interface EdgeStyleSelector: NSObject { + EdgeStylesModel *model; + GtkTreeView *view; +} + +/*! + @property widget + @brief The GTK widget + */ +@property (readonly) GtkWidget *widget; + +/*! + @property model + @brief The model to use. + */ +@property (retain) EdgeStylesModel *model; + +/*! + @property selectedStyle + @brief The selected style. + + When this changes, a SelectedStyleChanged notification will be posted + */ +@property (assign) EdgeStyle *selectedStyle; + +/*! + * Initialise with a new model for the given style manager + */ +- (id) initWithStyleManager:(StyleManager*)m; +/*! + * Initialise with the given model + */ +- (id) initWithModel:(EdgeStylesModel*)model; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/EdgeStyleSelector.m b/tikzit-1/src/gtk/EdgeStyleSelector.m new file mode 100644 index 0000000..6a9db33 --- /dev/null +++ b/tikzit-1/src/gtk/EdgeStyleSelector.m @@ -0,0 +1,143 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "EdgeStyleSelector.h" + +#import "EdgeStylesModel.h" + +// {{{ Internal interfaces +static void selection_changed_cb (GtkTreeSelection *sel, EdgeStyleSelector *mgr); +// }}} +// {{{ API + +@implementation EdgeStyleSelector + +- (id) init { + [self release]; + return nil; +} + +- (id) initWithStyleManager:(StyleManager*)m { + return [self initWithModel:[EdgeStylesModel modelWithStyleManager:m]]; +} +- (id) initWithModel:(EdgeStylesModel*)m { + self = [super init]; + + if (self) { + model = [m retain]; + + view = GTK_TREE_VIEW (gtk_tree_view_new_with_model ([m model])); + gtk_tree_view_set_headers_visible (view, FALSE); + g_object_ref (view); + + GtkCellRenderer *renderer; + GtkTreeViewColumn *column; + renderer = gtk_cell_renderer_pixbuf_new (); + column = gtk_tree_view_column_new_with_attributes ( + "Preview", + renderer, + "pixbuf", EDGE_STYLES_ICON_COL, + NULL); + gtk_tree_view_append_column (view, column); + gtk_tree_view_set_tooltip_column (view, EDGE_STYLES_NAME_COL); + + GtkTreeSelection *sel = gtk_tree_view_get_selection (view); + gtk_tree_selection_set_mode (sel, GTK_SELECTION_SINGLE); + + g_signal_connect (G_OBJECT (sel), + "changed", + G_CALLBACK (selection_changed_cb), + self); + } + + return self; +} + +- (void) dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + + g_object_unref (view); + [model release]; + + [super dealloc]; +} + +- (EdgeStylesModel*) model { + return model; +} + +- (void) setModel:(EdgeStylesModel*)m { + if (m == model) + return; + + EdgeStylesModel *oldModel = model; + model = [m retain]; + gtk_tree_view_set_model (view, [model model]); + [oldModel release]; +} + +- (GtkWidget*) widget { + return GTK_WIDGET (view); +} + +- (EdgeStyle*) selectedStyle { + GtkTreeSelection *sel = gtk_tree_view_get_selection (view); + GtkTreeIter iter; + + if (!gtk_tree_selection_get_selected (sel, NULL, &iter)) { + return nil; + } + + EdgeStyle *style = nil; + gtk_tree_model_get ([model model], &iter, EDGE_STYLES_PTR_COL, &style, -1); + + return style; +} + +- (void) setSelectedStyle:(EdgeStyle*)style { + GtkTreeSelection *sel = gtk_tree_view_get_selection (view); + + if (style == nil) { + gtk_tree_selection_unselect_all (sel); + return; + } + + GtkTreePath *path = [model pathFromStyle:style]; + if (path) { + gtk_tree_selection_unselect_all (sel); + gtk_tree_selection_select_path (sel, path); + gtk_tree_path_free (path); + } +} +@end + +// }}} +// {{{ GTK+ callbacks + +static void selection_changed_cb (GtkTreeSelection *sel, EdgeStyleSelector *mgr) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + [[NSNotificationCenter defaultCenter] + postNotificationName:@"SelectedStyleChanged" + object:mgr]; + + [pool drain]; +} +// }}} + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker + diff --git a/tikzit-1/src/gtk/EdgeStylesModel.h b/tikzit-1/src/gtk/EdgeStylesModel.h new file mode 100644 index 0000000..1166f92 --- /dev/null +++ b/tikzit-1/src/gtk/EdgeStylesModel.h @@ -0,0 +1,62 @@ +/* + * Copyright 2011-2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import + +@class EdgeStyle; +@class StyleManager; + +enum { + EDGE_STYLES_NAME_COL = 0, + EDGE_STYLES_ICON_COL, + EDGE_STYLES_PTR_COL, + EDGE_STYLES_N_COLS +}; + +@interface EdgeStylesModel: NSObject { + GtkListStore *store; + StyleManager *styleManager; +} + +/*! + @property model + @brief The GTK+ tree model + */ +@property (readonly) GtkTreeModel *model; + +/*! + @property manager + @brief The StyleManager to use. + */ +@property (retain) StyleManager *styleManager; + +/*! + * Initialise with the given style manager + */ +- (id) initWithStyleManager:(StyleManager*)m; + ++ (id) modelWithStyleManager:(StyleManager*)m; + +- (EdgeStyle*) styleFromPath:(GtkTreePath*)path; +- (GtkTreePath*) pathFromStyle:(EdgeStyle*)style; +- (EdgeStyle*) styleFromIter:(GtkTreeIter*)iter; +- (GtkTreeIter*) iterFromStyle:(EdgeStyle*)style; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/EdgeStylesModel.m b/tikzit-1/src/gtk/EdgeStylesModel.m new file mode 100644 index 0000000..2de57ed --- /dev/null +++ b/tikzit-1/src/gtk/EdgeStylesModel.m @@ -0,0 +1,367 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "EdgeStylesModel.h" + +#import "CairoRenderContext.h" +#import "Edge.h" +#import "Edge+Render.h" +#import "EdgeStyle.h" +#import "Node.h" +#import "StyleManager.h" + +#import "gtkhelpers.h" + +#import + +// {{{ Internal interfaces + +@interface EdgeStylesModel (Notifications) +- (void) edgeStylesReplaced:(NSNotification*)notification; +- (void) edgeStyleAdded:(NSNotification*)notification; +- (void) edgeStyleRemoved:(NSNotification*)notification; +- (void) observeValueForKeyPath:(NSString*)keyPath + ofObject:(id)object + change:(NSDictionary*)change + context:(void*)context; +@end + +@interface EdgeStylesModel (Private) +- (cairo_surface_t*) createEdgeIconSurface; +- (GdkPixbuf*) pixbufOfEdgeInStyle:(EdgeStyle*)style; +- (GdkPixbuf*) pixbufOfEdgeInStyle:(EdgeStyle*)style usingSurface:(cairo_surface_t*)surface; +- (void) addEdgeStyle:(EdgeStyle*)style; +- (void) addEdgeStyle:(EdgeStyle*)style usingSurface:(cairo_surface_t*)surface; +- (void) observeEdgeStyle:(EdgeStyle*)style; +- (void) stopObservingEdgeStyle:(EdgeStyle*)style; +- (void) clearEdgeStylesModel; +- (void) reloadEdgeStyles; +@end + +// }}} +// {{{ API + +@implementation EdgeStylesModel + ++ (id) modelWithStyleManager:(StyleManager*)m { + return [[[self alloc] initWithStyleManager:m] autorelease]; +} + +- (id) init { + [self release]; + return nil; +} + +- (id) initWithStyleManager:(StyleManager*)m { + self = [super init]; + + if (self) { + store = gtk_list_store_new (EDGE_STYLES_N_COLS, + G_TYPE_STRING, + GDK_TYPE_PIXBUF, + G_TYPE_POINTER); + g_object_ref_sink (store); + + [self setStyleManager:m]; + } + + return self; +} + +- (void) dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + + [self clearEdgeStylesModel]; + g_object_unref (store); + [styleManager release]; + + [super dealloc]; +} + +- (GtkTreeModel*) model { + return GTK_TREE_MODEL (store); +} + +- (StyleManager*) styleManager { + return styleManager; +} + +- (void) setStyleManager:(StyleManager*)m { + if (m == nil) { + [NSException raise:NSInvalidArgumentException format:@"Style manager cannot be nil"]; + } + [m retain]; + + [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:styleManager]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(edgeStylesReplaced:) + name:@"EdgeStylesReplaced" + object:m]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(edgeStyleAdded:) + name:@"EdgeStyleAdded" + object:m]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(edgeStyleRemoved:) + name:@"EdgeStyleRemoved" + object:m]; + + [styleManager release]; + styleManager = m; + + [self reloadEdgeStyles]; +} + +- (EdgeStyle*) styleFromPath:(GtkTreePath*)path { + GtkTreeIter iter; + gtk_tree_model_get_iter (GTK_TREE_MODEL (store), &iter, path); + EdgeStyle *style = nil; + gtk_tree_model_get (GTK_TREE_MODEL (store), &iter, EDGE_STYLES_PTR_COL, &style, -1); + return style; +} + +- (GtkTreePath*) pathFromStyle:(EdgeStyle*)style { + GtkTreeModel *m = GTK_TREE_MODEL (store); + GtkTreeIter row; + if (gtk_tree_model_get_iter_first (m, &row)) { + do { + EdgeStyle *rowStyle; + gtk_tree_model_get (m, &row, EDGE_STYLES_PTR_COL, &rowStyle, -1); + if (style == rowStyle) { + return gtk_tree_model_get_path (m, &row); + } + } while (gtk_tree_model_iter_next (m, &row)); + } + return NULL; +} + +- (EdgeStyle*) styleFromIter:(GtkTreeIter*)iter { + EdgeStyle *style = nil; + gtk_tree_model_get (GTK_TREE_MODEL (store), iter, EDGE_STYLES_PTR_COL, &style, -1); + return style; +} + +- (GtkTreeIter*) iterFromStyle:(EdgeStyle*)style { + GtkTreeModel *m = GTK_TREE_MODEL (store); + GtkTreeIter row; + if (gtk_tree_model_get_iter_first (m, &row)) { + do { + EdgeStyle *rowStyle; + gtk_tree_model_get (m, &row, EDGE_STYLES_PTR_COL, &rowStyle, -1); + if (style == rowStyle) { + return gtk_tree_iter_copy (&row); + } + } while (gtk_tree_model_iter_next (m, &row)); + } + return NULL; +} +@end + +// }}} +// {{{ Notifications + +@implementation EdgeStylesModel (Notifications) + +- (void) edgeStylesReplaced:(NSNotification*)notification { + [self reloadEdgeStyles]; +} + +- (void) edgeStyleAdded:(NSNotification*)notification { + [self addEdgeStyle:[[notification userInfo] objectForKey:@"style"]]; +} + +- (void) edgeStyleRemoved:(NSNotification*)notification { + EdgeStyle *style = [[notification userInfo] objectForKey:@"style"]; + + GtkTreeModel *model = GTK_TREE_MODEL (store); + GtkTreeIter row; + if (gtk_tree_model_get_iter_first (model, &row)) { + do { + EdgeStyle *rowStyle; + gtk_tree_model_get (model, &row, EDGE_STYLES_PTR_COL, &rowStyle, -1); + if (style == rowStyle) { + gtk_list_store_remove (store, &row); + [self stopObservingEdgeStyle:rowStyle]; + [rowStyle release]; + return; + } + } while (gtk_tree_model_iter_next (model, &row)); + } +} + +- (void) observeValueForKeyPath:(NSString*)keyPath + ofObject:(id)object + change:(NSDictionary*)change + context:(void*)context +{ + if ([object class] != [EdgeStyle class]) + return; + + EdgeStyle *style = object; + + GtkTreeModel *model = GTK_TREE_MODEL (store); + GtkTreeIter row; + if (gtk_tree_model_get_iter_first (model, &row)) { + do { + EdgeStyle *rowStyle; + gtk_tree_model_get (model, &row, EDGE_STYLES_PTR_COL, &rowStyle, -1); + if (style == rowStyle) { + if ([@"name" isEqual:keyPath]) { + gtk_list_store_set (store, &row, EDGE_STYLES_NAME_COL, [[style name] UTF8String], -1); + } else { + GdkPixbuf *pixbuf = [self pixbufOfEdgeInStyle:style]; + gtk_list_store_set (store, &row, EDGE_STYLES_ICON_COL, pixbuf, -1); + g_object_unref (pixbuf); + } + } + } while (gtk_tree_model_iter_next (model, &row)); + } +} +@end + +// }}} +// {{{ Private + +@implementation EdgeStylesModel (Private) +- (cairo_surface_t*) createEdgeIconSurface { + return cairo_image_surface_create (CAIRO_FORMAT_ARGB32, 48, 18); +} + +- (GdkPixbuf*) pixbufOfEdgeInStyle:(EdgeStyle*)style { + cairo_surface_t *surface = [self createEdgeIconSurface]; + GdkPixbuf *pixbuf = [self pixbufOfEdgeInStyle:style usingSurface:surface]; + cairo_surface_destroy (surface); + return pixbuf; +} + +- (GdkPixbuf*) pixbufOfEdgeInStyle:(EdgeStyle*)style usingSurface:(cairo_surface_t*)surface { + Transformer *transformer = [Transformer defaultTransformer]; + [transformer setFlippedAboutXAxis:YES]; + + int width = cairo_image_surface_get_width (surface); + int height = cairo_image_surface_get_height (surface); + NSRect pixbufBounds = NSMakeRect(0.0, 0.0, width, height); + NSRect graphBounds = [transformer rectFromScreen:pixbufBounds]; + + NSPoint start = NSMakePoint (NSMinX (graphBounds) + 0.1f, NSMidY (graphBounds)); + NSPoint end = NSMakePoint (NSMaxX (graphBounds) - 0.1f, NSMidY (graphBounds)); + Node *src = [Node nodeWithPoint:start]; + Node *tgt = [Node nodeWithPoint:end]; + Edge *e = [Edge edgeWithSource:src andTarget:tgt]; + [e setStyle:style]; + + CairoRenderContext *context = [[CairoRenderContext alloc] initForSurface:surface]; + [context clearSurface]; + [e renderBasicEdgeInContext:context withTransformer:transformer selected:NO]; + [context release]; + + return pixbuf_get_from_surface (surface); +} + +- (void) addEdgeStyle:(EdgeStyle*)style usingSurface:(cairo_surface_t*)surface { + GtkTreeIter iter; + gtk_list_store_append (store, &iter); + + GdkPixbuf *pixbuf = [self pixbufOfEdgeInStyle:style usingSurface:surface]; + gtk_list_store_set (store, &iter, + EDGE_STYLES_NAME_COL, [[style name] UTF8String], + EDGE_STYLES_ICON_COL, pixbuf, + EDGE_STYLES_PTR_COL, (gpointer)[style retain], + -1); + g_object_unref (pixbuf); + [self observeEdgeStyle:style]; +} + +- (void) addEdgeStyle:(EdgeStyle*)style { + cairo_surface_t *surface = [self createEdgeIconSurface]; + [self addEdgeStyle:style usingSurface:surface]; + cairo_surface_destroy (surface); +} + +- (void) observeEdgeStyle:(EdgeStyle*)style { + [style addObserver:self + forKeyPath:@"name" + options:NSKeyValueObservingOptionNew + context:NULL]; + [style addObserver:self + forKeyPath:@"thickness" + options:0 + context:NULL]; + [style addObserver:self + forKeyPath:@"headStyle" + options:0 + context:NULL]; + [style addObserver:self + forKeyPath:@"tailStyle" + options:0 + context:NULL]; + [style addObserver:self + forKeyPath:@"decorationStyle" + options:0 + context:NULL]; + [style addObserver:self + forKeyPath:@"colorRGB.red" + options:0 + context:NULL]; + [style addObserver:self + forKeyPath:@"colorRGB.green" + options:0 + context:NULL]; + [style addObserver:self + forKeyPath:@"colorRGB.blue" + options:0 + context:NULL]; +} + +- (void) stopObservingEdgeStyle:(EdgeStyle*)style { + [style removeObserver:self forKeyPath:@"name"]; + [style removeObserver:self forKeyPath:@"thickness"]; + [style removeObserver:self forKeyPath:@"headStyle"]; + [style removeObserver:self forKeyPath:@"tailStyle"]; + [style removeObserver:self forKeyPath:@"decorationStyle"]; + [style removeObserver:self forKeyPath:@"colorRGB.red"]; + [style removeObserver:self forKeyPath:@"colorRGB.green"]; + [style removeObserver:self forKeyPath:@"colorRGB.blue"]; +} + +- (void) clearEdgeStylesModel { + GtkTreeModel *model = GTK_TREE_MODEL (store); + GtkTreeIter row; + if (gtk_tree_model_get_iter_first (model, &row)) { + do { + EdgeStyle *rowStyle; + gtk_tree_model_get (model, &row, EDGE_STYLES_PTR_COL, &rowStyle, -1); + [self stopObservingEdgeStyle:rowStyle]; + [rowStyle release]; + } while (gtk_tree_model_iter_next (model, &row)); + } + gtk_list_store_clear (store); +} + +- (void) reloadEdgeStyles { + [self clearEdgeStylesModel]; + cairo_surface_t *surface = [self createEdgeIconSurface]; + for (EdgeStyle *style in [styleManager edgeStyles]) { + [self addEdgeStyle:style usingSurface:surface]; + } + cairo_surface_destroy (surface); +} +@end + +// }}} + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/EdgeStylesPalette.h b/tikzit-1/src/gtk/EdgeStylesPalette.h new file mode 100644 index 0000000..c0c6c4b --- /dev/null +++ b/tikzit-1/src/gtk/EdgeStylesPalette.h @@ -0,0 +1,43 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import + +@class StyleManager; +@class EdgeStyleSelector; +@class EdgeStyleEditor; + +@interface EdgeStylesPalette: NSObject { + EdgeStyleSelector *selector; + EdgeStyleEditor *editor; + + GtkWidget *palette; + + GtkWidget *removeStyleButton; + GtkWidget *applyStyleButton; + GtkWidget *clearStyleButton; +} + +@property (retain) StyleManager *styleManager; +@property (readonly) GtkWidget *widget; + +- (id) initWithManager:(StyleManager*)m; + +@end + +// vim:ft=objc:ts=4:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/EdgeStylesPalette.m b/tikzit-1/src/gtk/EdgeStylesPalette.m new file mode 100644 index 0000000..33264cf --- /dev/null +++ b/tikzit-1/src/gtk/EdgeStylesPalette.m @@ -0,0 +1,198 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "EdgeStylesPalette.h" + +#import "EdgeStylesModel.h" +#import "EdgeStyleSelector.h" +#import "EdgeStyleEditor.h" +#import "StyleManager.h" + +// {{{ Internal interfaces +// {{{ GTK+ Callbacks +static void add_style_button_cb (GtkButton *widget, EdgeStylesPalette *palette); +static void remove_style_button_cb (GtkButton *widget, EdgeStylesPalette *palette); +// }}} +// {{{ Notifications + +@interface EdgeStylesPalette (Notifications) +- (void) selectedStyleChanged:(NSNotification*)notification; +@end + +// }}} +// {{{ Private + +@interface EdgeStylesPalette (Private) +- (void) updateButtonState; +- (void) removeSelectedStyle; +- (void) addStyle; +@end + +// }}} +// }}} +// {{{ API + +@implementation EdgeStylesPalette + +@synthesize widget=palette; + +- (id) init { + [self release]; + return nil; +} + +- (id) initWithManager:(StyleManager*)m { + self = [super init]; + + if (self) { + selector = [[EdgeStyleSelector alloc] initWithStyleManager:m]; + editor = [[EdgeStyleEditor alloc] init]; + + palette = gtk_vbox_new (FALSE, 6); + gtk_container_set_border_width (GTK_CONTAINER (palette), 6); + g_object_ref_sink (palette); + + GtkWidget *mainBox = gtk_hbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (palette), mainBox, FALSE, FALSE, 0); + gtk_widget_show (mainBox); + + GtkWidget *selectorScroller = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (selectorScroller), + GTK_POLICY_NEVER, + GTK_POLICY_AUTOMATIC); + GtkWidget *selectorFrame = gtk_frame_new (NULL); + gtk_container_add (GTK_CONTAINER (selectorScroller), [selector widget]); + gtk_container_add (GTK_CONTAINER (selectorFrame), selectorScroller); + gtk_box_pack_start (GTK_BOX (mainBox), selectorFrame, TRUE, TRUE, 0); + gtk_widget_show (selectorScroller); + gtk_widget_show (selectorFrame); + gtk_widget_show ([selector widget]); + + gtk_box_pack_start (GTK_BOX (mainBox), [editor widget], TRUE, TRUE, 0); + gtk_widget_show ([editor widget]); + + GtkBox *buttonBox = GTK_BOX (gtk_hbox_new(FALSE, 0)); + gtk_box_pack_start (GTK_BOX (palette), GTK_WIDGET (buttonBox), FALSE, FALSE, 0); + + GtkWidget *addStyleButton = gtk_button_new (); + gtk_widget_set_tooltip_text (addStyleButton, "Add a new style"); + GtkWidget *addIcon = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON); + gtk_container_add (GTK_CONTAINER (addStyleButton), addIcon); + gtk_box_pack_start (buttonBox, addStyleButton, FALSE, FALSE, 0); + g_signal_connect (G_OBJECT (addStyleButton), + "clicked", + G_CALLBACK (add_style_button_cb), + self); + + removeStyleButton = gtk_button_new (); + g_object_ref_sink (removeStyleButton); + gtk_widget_set_tooltip_text (removeStyleButton, "Delete selected style"); + GtkWidget *removeIcon = gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_BUTTON); + gtk_container_add (GTK_CONTAINER (removeStyleButton), removeIcon); + gtk_box_pack_start (buttonBox, removeStyleButton, FALSE, FALSE, 0); + g_signal_connect (G_OBJECT (removeStyleButton), + "clicked", + G_CALLBACK (remove_style_button_cb), + self); + + gtk_widget_show_all (GTK_WIDGET (buttonBox)); + + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(selectedStyleChanged:) + name:@"SelectedStyleChanged" + object:selector]; + + [self updateButtonState]; + } + + return self; +} + +- (StyleManager*) styleManager { + return [[selector model] styleManager]; +} + +- (void) setStyleManager:(StyleManager*)m { + [[selector model] setStyleManager:m]; +} + +- (void) dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + + [editor release]; + [selector release]; + + g_object_unref (palette); + g_object_unref (removeStyleButton); + + [super dealloc]; +} + +@end + +// }}} +// {{{ Notifications + +@implementation EdgeStylesPalette (Notifications) +- (void) selectedStyleChanged:(NSNotification*)notification { + [editor setStyle:[selector selectedStyle]]; + [self updateButtonState]; +} +@end + +// }}} +// {{{ Private + +@implementation EdgeStylesPalette (Private) +- (void) updateButtonState { + gboolean hasStyleSelection = [selector selectedStyle] != nil; + gtk_widget_set_sensitive (removeStyleButton, hasStyleSelection); +} + +- (void) removeSelectedStyle { + EdgeStyle *style = [selector selectedStyle]; + if (style) + [[[selector model] styleManager] removeEdgeStyle:style]; +} + +- (void) addStyle { + EdgeStyle *newStyle = [EdgeStyle defaultEdgeStyleWithName:@"newstyle"]; + [[self styleManager] addEdgeStyle:newStyle]; + [selector setSelectedStyle:newStyle]; + [editor selectNameField]; +} + +@end + +// }}} +// {{{ GTK+ callbacks + +static void add_style_button_cb (GtkButton *widget, EdgeStylesPalette *palette) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [palette addStyle]; + [pool drain]; +} + +static void remove_style_button_cb (GtkButton *widget, EdgeStylesPalette *palette) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [palette removeSelectedStyle]; + [pool drain]; +} + +// }}} + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/FileChooserDialog.h b/tikzit-1/src/gtk/FileChooserDialog.h new file mode 100644 index 0000000..80b03f5 --- /dev/null +++ b/tikzit-1/src/gtk/FileChooserDialog.h @@ -0,0 +1,56 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import + +@interface FileChooserDialog: NSObject { + GtkFileChooser *dialog; +} + ++ (FileChooserDialog*) saveDialog; ++ (FileChooserDialog*) saveDialogWithParent:(GtkWindow*)parent; ++ (FileChooserDialog*) saveDialogWithTitle:(NSString*)title parent:(GtkWindow*)parent; ++ (FileChooserDialog*) openDialog; ++ (FileChooserDialog*) openDialogWithParent:(GtkWindow*)parent; ++ (FileChooserDialog*) openDialogWithTitle:(NSString*)title parent:(GtkWindow*)parent; + +- (id) initSaveDialog; +- (id) initSaveDialogWithParent:(GtkWindow*)parent; +- (id) initSaveDialogWithTitle:(NSString*)title parent:(GtkWindow*)parent; +- (id) initOpenDialog; +- (id) initOpenDialogWithParent:(GtkWindow*)parent; +- (id) initOpenDialogWithTitle:(NSString*)title parent:(GtkWindow*)parent; + +- (void) addStandardFilters; +- (void) addFileFilter:(NSString*)filterName withPattern:(NSString*)filePattern; +- (void) addFileFilter:(NSString*)filterName withPattern:(NSString*)filePattern setSelected:(BOOL)selected; + +- (void) setCurrentFolder:(NSString*)path; +- (NSString*) currentFolder; + +- (void) setSuggestedName:(NSString*)fileName; + +- (NSString*) filePath; + +- (BOOL) showDialog; + +- (void) destroy; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/FileChooserDialog.m b/tikzit-1/src/gtk/FileChooserDialog.m new file mode 100644 index 0000000..9498e4c --- /dev/null +++ b/tikzit-1/src/gtk/FileChooserDialog.m @@ -0,0 +1,152 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "FileChooserDialog.h" + +@implementation FileChooserDialog: NSObject + ++ (FileChooserDialog*) saveDialog { return [[[self alloc] initSaveDialog] autorelease]; } ++ (FileChooserDialog*) saveDialogWithParent:(GtkWindow*)parent + { return [[[self alloc] initSaveDialogWithParent:parent] autorelease]; } ++ (FileChooserDialog*) saveDialogWithTitle:(NSString*)title parent:(GtkWindow*)parent + { return [[[self alloc] initSaveDialogWithTitle:title parent:parent] autorelease]; } ++ (FileChooserDialog*) openDialog { return [[[self alloc] initOpenDialog] autorelease]; } ++ (FileChooserDialog*) openDialogWithParent:(GtkWindow*)parent + { return [[[self alloc] initOpenDialogWithParent:parent] autorelease]; } ++ (FileChooserDialog*) openDialogWithTitle:(NSString*)title parent:(GtkWindow*)parent + { return [[[self alloc] initOpenDialogWithTitle:title parent:parent] autorelease]; } + +- (id) initSaveDialog { return [self initSaveDialogWithParent:NULL]; } +- (id) initSaveDialogWithParent:(GtkWindow*)parent + { return [self initSaveDialogWithTitle:@"Save file" parent:parent]; } +- (id) initSaveDialogWithTitle:(NSString*)title parent:(GtkWindow*)parent { + self = [super init]; + + if (self) { + dialog = GTK_FILE_CHOOSER (gtk_file_chooser_dialog_new ( + [title UTF8String], + parent, + GTK_FILE_CHOOSER_ACTION_SAVE, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, + NULL)); + gtk_file_chooser_set_do_overwrite_confirmation (dialog, TRUE); + } + + return self; +} + +- (id) initOpenDialog { return [self initOpenDialogWithParent:NULL]; } +- (id) initOpenDialogWithParent:(GtkWindow*)parent + { return [self initOpenDialogWithTitle:@"Open file" parent:parent]; } +- (id) initOpenDialogWithTitle:(NSString*)title parent:(GtkWindow*)parent { + self = [super init]; + + if (self) { + dialog = GTK_FILE_CHOOSER (gtk_file_chooser_dialog_new ( + [title UTF8String], + parent, + GTK_FILE_CHOOSER_ACTION_OPEN, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, + NULL)); + } + + return self; +} + +- (void) addStandardFilters { + GtkFileFilter *tikzfilter = gtk_file_filter_new(); + gtk_file_filter_set_name(tikzfilter, ".tikz files"); + gtk_file_filter_add_pattern(tikzfilter, "*.tikz"); + gtk_file_chooser_add_filter(dialog, tikzfilter); + GtkFileFilter *allfilter = gtk_file_filter_new(); + gtk_file_filter_set_name(allfilter, "all files"); + gtk_file_filter_add_pattern(allfilter, "*"); + gtk_file_chooser_add_filter(dialog, allfilter); + gtk_file_chooser_set_filter(dialog, tikzfilter); +} + +- (void) addFileFilter:(NSString*)filterName withPattern:(NSString*)filePattern { + [self addFileFilter:filterName withPattern:filePattern setSelected:NO]; +} + +- (void) addFileFilter:(NSString*)filterName withPattern:(NSString*)filePattern setSelected:(BOOL)selected { + GtkFileFilter *oldFilter = selected ? NULL : gtk_file_chooser_get_filter (dialog); + GtkFileFilter *filter = gtk_file_filter_new(); + gtk_file_filter_set_name(filter, [filterName UTF8String]); + gtk_file_filter_add_pattern(filter, [filePattern UTF8String]); + gtk_file_chooser_add_filter(dialog, filter); + if (selected) { + gtk_file_chooser_set_filter (dialog, filter); + } else if (oldFilter) { + gtk_file_chooser_set_filter (dialog, oldFilter); + } +} + +- (void) setCurrentFolder:(NSString*)path { + gchar *folder = [path glibFilename]; + if (folder) { + gtk_file_chooser_set_current_folder(dialog, folder); + g_free (folder); + } +} + +- (NSString*) currentFolder { + NSString *path = nil; + gchar *folder = gtk_file_chooser_get_current_folder(dialog); + if (folder) { + path = [NSString stringWithGlibFilename:folder]; + g_free (folder); + } + return path; +} + +- (void) setSuggestedName:(NSString*)fileName { + gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), [fileName UTF8String]); +} + +- (NSString*) filePath { + NSString *path = nil; + gchar *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); + if (filename) { + path = [NSString stringWithGlibFilename:filename]; + g_free (filename); + } + return path; +} + +- (BOOL) showDialog { + return (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) ? YES : NO; +} + +- (void) destroy { + gtk_widget_destroy (GTK_WIDGET (dialog)); + dialog = NULL; +} + +- (void) dealloc { + if (dialog) { + g_warning ("Failed to destroy file chooser dialog!\n"); + gtk_widget_destroy (GTK_WIDGET (dialog)); + } + [super dealloc]; +} + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/GraphEditorPanel.h b/tikzit-1/src/gtk/GraphEditorPanel.h new file mode 100644 index 0000000..2b93259 --- /dev/null +++ b/tikzit-1/src/gtk/GraphEditorPanel.h @@ -0,0 +1,53 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import "Tool.h" +#import + +@class GraphInputHandler; +@class GraphRenderer; +@class TikzDocument; +@class WidgetSurface; + +@protocol PreviewHandler +- (void) showPreview; +@end +@interface GraphEditorPanel : NSObject { + GraphRenderer *renderer; + WidgetSurface *surface; + GraphInputHandler *inputHandler; + id previewHandler; + id tool; +} +@property (retain) TikzDocument *document; +@property (readonly) GtkWidget *widget; +@property (retain) id activeTool; +@property (assign) id previewHandler; + +- (id) init; +- (id) initWithDocument:(TikzDocument*)document; +- (void) grabTool; +- (void) zoomInAboutPoint:(NSPoint)pos; +- (void) zoomOutAboutPoint:(NSPoint)pos; +- (void) zoomIn; +- (void) zoomOut; +- (void) zoomReset; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/GraphEditorPanel.m b/tikzit-1/src/gtk/GraphEditorPanel.m new file mode 100644 index 0000000..dac52a0 --- /dev/null +++ b/tikzit-1/src/gtk/GraphEditorPanel.m @@ -0,0 +1,240 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "GraphEditorPanel.h" + +#import "Application.h" +#import "GraphRenderer.h" +#import "HandTool.h" +#import "InputDelegate.h" +#import "TikzDocument.h" +#import "WidgetSurface.h" + +#import + +@class GraphRenderer; +@class WidgetSurface; + +static const InputMask zoomPanMask = ControlMask; + +/** + * Mostly just a multiplexer, but also handles zoom and pan + * when ctrl is held + */ +@interface GraphInputHandler : NSObject { + GraphEditorPanel *panel; + NSPoint dragOrigin; + NSPoint oldGraphOrigin; + BOOL zoomPanActive; +} +- (id) initForPanel:(GraphEditorPanel*)p; +@end + +@implementation GraphEditorPanel + +@synthesize previewHandler; + +- (id) init { + return [self initWithDocument:nil]; +} +- (id) initWithDocument:(TikzDocument*)document { + self = [super init]; + if (self) { + surface = [[WidgetSurface alloc] init]; + [surface setDefaultScale:50.0f]; + [surface setKeepCentered:YES]; + [surface setCanFocus:YES]; + renderer = [[GraphRenderer alloc] initWithSurface:surface document:document]; + + inputHandler = [[GraphInputHandler alloc] initForPanel:self]; + [surface setInputDelegate:inputHandler]; + } + return self; +} + +- (void) dealloc { + [renderer release]; + [surface release]; + [inputHandler release]; + + [super dealloc]; +} + +- (GraphRenderer*) renderer { + return renderer; +} +- (TikzDocument*) document { + return [renderer document]; +} +- (void) setDocument:(TikzDocument*)doc { + [renderer setDocument:doc]; +} +- (GtkWidget*) widget { + return [surface widget]; +} +- (id) activeTool { + return tool; +} +- (void) setActiveTool:(id)t { + if (t == tool) + return; + + [[[renderer document] pickSupport] deselectAllNodes]; + [[[renderer document] pickSupport] deselectAllEdges]; + + id oldTool = tool; + BOOL weHadTool = ([oldTool activeRenderer] == renderer); + if (weHadTool) { + [oldTool setActiveRenderer:nil]; + } + + tool = [t retain]; + [oldTool release]; + + if (weHadTool) { + [self grabTool]; + } +} + +- (BOOL) hasTool { + return [tool activeRenderer] == renderer; +} + +- (void) grabTool { + if ([tool activeRenderer] != renderer) { + [[tool activeRenderer] setPostRenderer:nil]; + [tool setActiveRenderer:renderer]; + } + [renderer setPostRenderer:tool]; +} + +- (void) zoomInAboutPoint:(NSPoint)pos { [surface zoomInAboutPoint:pos]; } +- (void) zoomOutAboutPoint:(NSPoint)pos { [surface zoomOutAboutPoint:pos]; } +- (void) zoomIn { [surface zoomIn]; } +- (void) zoomOut { [surface zoomOut]; } +- (void) zoomReset { [surface zoomReset]; } + +@end + +@implementation GraphInputHandler +- (id) initForPanel:(GraphEditorPanel*)p { + self = [super init]; + if (self) { + // NB: no retention! + panel = p; + } + return self; +} +- (id) init { + [self release]; + return nil; +} +- (void) dealloc { + [super dealloc]; +} + +// FIXME: share code with HandTool? +- (void) mousePressAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { + if (mask == zoomPanMask && button == LeftButton) { + dragOrigin = pos; + oldGraphOrigin = [[[panel renderer] transformer] origin]; + zoomPanActive = YES; + } else { + zoomPanActive = NO; + [panel grabTool]; + id tool = [panel activeTool]; + if ([tool respondsToSelector:@selector(mousePressAt:withButton:andMask:)]) { + [tool mousePressAt:pos withButton:button andMask:mask]; + } + } +} + +- (void) mouseDoubleClickAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { + [panel grabTool]; + id tool = [panel activeTool]; + if ([tool respondsToSelector:@selector(mouseDoubleClickAt:withButton:andMask:)]) { + [tool mouseDoubleClickAt:pos withButton:button andMask:mask]; + } +} + +- (void) mouseReleaseAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { + if (zoomPanActive && button == LeftButton) { + zoomPanActive = NO; + } else if ([panel hasTool]) { + id tool = [panel activeTool]; + if ([tool respondsToSelector:@selector(mouseReleaseAt:withButton:andMask:)]) { + [tool mouseReleaseAt:pos withButton:button andMask:mask]; + } + } +} + +- (void) mouseMoveTo:(NSPoint)pos withButtons:(MouseButton)buttons andMask:(InputMask)mask { + if (zoomPanActive && (buttons & LeftButton)) { + NSPoint newGraphOrigin = oldGraphOrigin; + newGraphOrigin.x += pos.x - dragOrigin.x; + newGraphOrigin.y += pos.y - dragOrigin.y; + [[[panel renderer] transformer] setOrigin:newGraphOrigin]; + [[panel renderer] invalidateGraph]; + } else if ([panel hasTool]) { + id tool = [panel activeTool]; + if ([tool respondsToSelector:@selector(mouseMoveTo:withButtons:andMask:)]) { + [tool mouseMoveTo:pos withButtons:buttons andMask:mask]; + } + } +} + +- (void) mouseScrolledAt:(NSPoint)pos inDirection:(ScrollDirection)dir withMask:(InputMask)mask { + if (mask == zoomPanMask) { + if (dir == ScrollUp) { + [panel zoomInAboutPoint:pos]; + } else if (dir == ScrollDown) { + [panel zoomOutAboutPoint:pos]; + } + } else { + id tool = [panel activeTool]; + if ([panel hasTool] && [tool respondsToSelector:@selector(mouseScrolledAt:inDirection:withMask:)]) { + [tool mouseScrolledAt:pos inDirection:dir withMask:mask]; + } + } +} + +- (void) keyPressed:(unsigned int)keyVal withMask:(InputMask)mask { + if (keyVal == GDK_KEY_space && !mask) { + return; + } + if (![app activateToolForKey:keyVal withMask:mask]) { + id tool = [panel activeTool]; + if ([panel hasTool] && [tool respondsToSelector:@selector(keyPressed:withMask:)]) { + [tool keyPressed:keyVal withMask:mask]; + } + } +} + +- (void) keyReleased:(unsigned int)keyVal withMask:(InputMask)mask { + if (keyVal == GDK_KEY_space && !mask) { + [[panel previewHandler] showPreview]; + } + if (![app activateToolForKey:keyVal withMask:mask]) { + id tool = [panel activeTool]; + if ([panel hasTool] && [tool respondsToSelector:@selector(keyReleased:withMask:)]) { + [tool keyReleased:keyVal withMask:mask]; + } + } +} +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/GraphRenderer.h b/tikzit-1/src/gtk/GraphRenderer.h new file mode 100644 index 0000000..730d606 --- /dev/null +++ b/tikzit-1/src/gtk/GraphRenderer.h @@ -0,0 +1,84 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import + +// classes +#import "Graph.h" +#import "Grid.h" +#import "PickSupport.h" +#import "TikzDocument.h" + +// protocols +#import "Surface.h" + +@interface GraphRenderer: NSObject { + TikzDocument *doc; + NSObject *surface; + Grid *grid; + NSMutableSet *highlightedNodes; + id postRenderer; +} + +@property (retain) id postRenderer; + +- (id) initWithSurface:(NSObject *)surface; +- (id) initWithSurface:(NSObject *)surface document:(TikzDocument*)document; +- (void) renderWithContext:(id)context; +- (void) invalidateRect:(NSRect)rect; +- (void) invalidateGraph; +- (void) invalidateNode:(Node*)node; +- (void) invalidateEdge:(Edge*)edge; +- (void) invalidateNodesHitBy:(NSPoint)point; +- (BOOL) point:(NSPoint)p hitsNode:(Node*)node; +- (BOOL) point:(NSPoint)p hitsEdge:(Edge*)edge withFuzz:(float)fuzz; +/** + * Finds a node at the given screen location. + * + * If there is more than one node at this point (because they overlap), + * an arbitrary one is returned. + */ +- (Node*) anyNodeAt:(NSPoint)p; +/** + * Finds an edge at the given screen location. + * + * If there is more than one edge at this point (because they overlap), + * an arbitrary one is returned. + * + * @param fuzz the fuzz for detecting edges: this will pick up + * edges that are close to the point + */ +- (Edge*) anyEdgeAt:(NSPoint)p withFuzz:(float)fuzz; + +- (id) surface; +- (Transformer*) transformer; +- (Grid*) grid; +- (PickSupport*) pickSupport; + +- (Graph*) graph; + +- (TikzDocument*) document; +- (void) setDocument:(TikzDocument*)document; + +- (BOOL) isNodeHighlighted:(Node*)node; +- (void) setNode:(Node*)node highlighted:(BOOL)h; +- (void) clearHighlightedNodes; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/GraphRenderer.m b/tikzit-1/src/gtk/GraphRenderer.m new file mode 100644 index 0000000..b413d3e --- /dev/null +++ b/tikzit-1/src/gtk/GraphRenderer.m @@ -0,0 +1,476 @@ +/* + * Copyright 2011 Alex Merry + * Copyright 2010 Chris Heunen + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "GraphRenderer.h" +#import "Edge+Render.h" +#import "Node+Render.h" +#import "Shape.h" + +void graph_renderer_expose_event(GtkWidget *widget, GdkEventExpose *event); + +@interface GraphRenderer (Private) +- (enum NodeState) nodeState:(Node*)node; +- (void) renderBoundingBoxWithContext:(id)context; +- (void) nodeNeedsRefreshing:(NSNotification*)notification; +- (void) edgeNeedsRefreshing:(NSNotification*)notification; +- (void) graphNeedsRefreshing:(NSNotification*)notification; +- (void) graphChanged:(NSNotification*)notification; +- (void) nodeStylePropertyChanged:(NSNotification*)notification; +- (void) edgeStylePropertyChanged:(NSNotification*)notification; +- (void) shapeDictionaryReplaced:(NSNotification*)notification; +@end + +@implementation GraphRenderer + +- (id) initWithSurface:(NSObject *)s { + self = [super init]; + + if (self) { + surface = [s retain]; + grid = [[Grid alloc] initWithSpacing:1.0f subdivisions:4 transformer:[s transformer]]; + highlightedNodes = [[NSMutableSet alloc] initWithCapacity:10]; + [surface setRenderDelegate:self]; + + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(nodeStylePropertyChanged:) + name:@"NodeStylePropertyChanged" + object:nil]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(edgeStylePropertyChanged:) + name:@"EdgeStylePropertyChanged" + object:nil]; + } + + return self; +} + +- (id) initWithSurface:(NSObject *)s document:(TikzDocument*)document { + self = [self initWithSurface:s]; + + if (self) { + [self setDocument:document]; + } + + return self; +} + +- (void) dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + [doc release]; + [grid release]; + [highlightedNodes release]; + [surface release]; + + [super dealloc]; +} + +- (id) postRenderer { + return postRenderer; +} +- (void) setPostRenderer:(id)r { + if (r == postRenderer) + return; + + [r retain]; + [postRenderer release]; + postRenderer = r; + + [self invalidateGraph]; +} + +- (void) renderWithContext:(id)context onSurface:(id)s { + [self renderWithContext:context]; + if ([s hasFocus]) { + [s renderFocus]; + } +} + +- (void) renderWithContext:(id)context { + // blank surface + [context paintWithColor:WhiteRColor]; + + // draw grid + [grid renderGridInContext:context]; + + // draw edges + NSEnumerator *enumerator = [doc edgeEnumerator]; + Edge *edge; + while ((edge = [enumerator nextObject]) != nil) { + [edge renderToSurface:surface withContext:context selected:[doc isEdgeSelected:edge]]; + } + + // draw nodes + enumerator = [doc nodeEnumerator]; + Node *node; + while ((node = [enumerator nextObject]) != nil) { + [node renderToSurface:surface withContext:context state:[self nodeState:node]]; + } + + [self renderBoundingBoxWithContext:context]; + [postRenderer renderWithContext:context onSurface:surface]; +} + +- (void) invalidateGraph { + [surface invalidate]; +} + +- (void) invalidateRect:(NSRect)rect { + [surface invalidateRect:rect]; +} + +- (void) invalidateNodes:(NSSet*)nodes { + for (Node *node in nodes) { + [self invalidateNode:node]; + } +} + +- (void) invalidateEdges:(NSSet*)edges { + for (Edge *edge in edges) { + [self invalidateEdge:edge]; + } +} + +- (void) invalidateNode:(Node*)node { + if (node == nil) { + return; + } + NSRect nodeRect = [node renderBoundsWithLabelForSurface:surface]; + nodeRect = NSInsetRect (nodeRect, -2.0f, -2.0f); + [surface invalidateRect:nodeRect]; +} + +- (void) invalidateEdge:(Edge*)edge { + if (edge == nil) { + return; + } + BOOL selected = [doc isEdgeSelected:edge]; + NSRect edgeRect = [edge renderedBoundsWithTransformer:[surface transformer] whenSelected:selected]; + edgeRect = NSInsetRect (edgeRect, -2.0f, -2.0f); + [surface invalidateRect:edgeRect]; +} + +- (void) invalidateNodesHitBy:(NSPoint)point { + NSEnumerator *enumerator = [doc nodeEnumerator]; + Node *node = nil; + while ((node = [enumerator nextObject]) != nil) { + if ([self point:point hitsNode:node]) { + [self invalidateNode:node]; + } + } +} + +- (BOOL) point:(NSPoint)p hitsNode:(Node*)node { + return [node hitByPoint:p onSurface:surface]; +} + +- (BOOL) point:(NSPoint)p fuzzyHitsNode:(Node*)node { + NSRect bounds = [node renderBoundsForSurface:surface]; + return NSPointInRect(p, bounds); +} + +- (BOOL) point:(NSPoint)p hitsEdge:(Edge*)edge withFuzz:(float)fuzz { + return [edge hitByPoint:p onSurface:surface withFuzz:fuzz]; +} + +- (Node*) anyNodeAt:(NSPoint)p { + NSEnumerator *enumerator = [doc nodeEnumerator]; + Node *node; + while ((node = [enumerator nextObject]) != nil) { + if ([self point:p hitsNode:node]) { + return node; + } + } + return nil; +} + +- (Edge*) anyEdgeAt:(NSPoint)p withFuzz:(float)fuzz { + // FIXME: is there an efficient way to find the "nearest" edge + // if the fuzz is the reason we hit more than one? + NSEnumerator *enumerator = [doc edgeEnumerator]; + Edge *edge; + while ((edge = [enumerator nextObject]) != nil) { + if ([self point:p hitsEdge:edge withFuzz:fuzz]) { + return edge; + } + } + return nil; +} + +- (id) surface { + return surface; +} + +- (Transformer*) transformer { + return [surface transformer]; +} + +- (Grid*) grid { + return grid; +} + +- (PickSupport*) pickSupport { + return [doc pickSupport]; +} + +- (Graph*) graph { + return [doc graph]; +} + +- (TikzDocument*) document { + return doc; +} + +- (void) setDocument:(TikzDocument*)document { + if (doc == document) { + return; + } + + if (doc != nil) { + [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:doc]; + [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:[doc pickSupport]]; + } + + [document retain]; + [doc release]; + doc = document; + + if (doc != nil) { + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(graphNeedsRefreshing:) + name:@"GraphReplaced" object:doc]; + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(graphChanged:) + name:@"GraphChanged" object:doc]; + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(graphChanged:) + name:@"GraphBeingChanged" object:doc]; + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(graphChanged:) + name:@"GraphChangeCancelled" object:doc]; + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(nodeNeedsRefreshing:) + name:@"NodeSelected" object:[doc pickSupport]]; + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(nodeNeedsRefreshing:) + name:@"NodeDeselected" object:[doc pickSupport]]; + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(graphNeedsRefreshing:) + name:@"NodeSelectionReplaced" object:[doc pickSupport]]; + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(edgeNeedsRefreshing:) + name:@"EdgeSelected" object:[doc pickSupport]]; + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(edgeNeedsRefreshing:) + name:@"EdgeDeselected" object:[doc pickSupport]]; + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(graphNeedsRefreshing:) + name:@"EdgeSelectionReplaced" object:[doc pickSupport]]; + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(shapeDictionaryReplaced:) + name:@"ShapeDictionaryReplaced" + object:[Shape class]]; + } + [surface invalidate]; +} + +- (BOOL) isNodeHighlighted:(Node*)node { + return [highlightedNodes containsObject:node]; +} +- (void) setNode:(Node*)node highlighted:(BOOL)h { + if (h) { + if (![highlightedNodes containsObject:node]) { + [highlightedNodes addObject:node]; + [self invalidateNode:node]; + } + } else { + if ([highlightedNodes containsObject:node]) { + [highlightedNodes removeObject:node]; + [self invalidateNode:node]; + } + } +} +- (void) clearHighlightedNodes { + [self invalidateNodes:highlightedNodes]; + [highlightedNodes removeAllObjects]; +} + +@end + +@implementation GraphRenderer (Private) +- (enum NodeState) nodeState:(Node*)node { + if ([doc isNodeSelected:node]) { + return NodeSelected; + } else if ([self isNodeHighlighted:node]) { + return NodeHighlighted; + } else { + return NodeNormal; + } +} + +- (void) renderBoundingBoxWithContext:(id)context { + if ([[self graph] hasBoundingBox]) { + [context saveState]; + + NSRect bbox = [[surface transformer] rectToScreen:[[self graph] boundingBox]]; + + [context setAntialiasMode:AntialiasDisabled]; + [context setLineWidth:1.0]; + [context startPath]; + [context rect:bbox]; + [context strokePathWithColor:MakeSolidRColor (1.0, 0.7, 0.5)]; + + [context restoreState]; + } +} + +- (void) nodeNeedsRefreshing:(NSNotification*)notification { + [self invalidateNode:[[notification userInfo] objectForKey:@"node"]]; +} + +- (void) edgeNeedsRefreshing:(NSNotification*)notification { + Edge *edge = [[notification userInfo] objectForKey:@"edge"]; + NSRect edgeRect = [edge renderedBoundsWithTransformer:[surface transformer] whenSelected:YES]; + edgeRect = NSInsetRect (edgeRect, -2, -2); + [surface invalidateRect:edgeRect]; +} + +- (void) graphNeedsRefreshing:(NSNotification*)notification { + [self invalidateGraph]; +} + +- (void) invalidateBentIncidentEdgesForNode:(Node*)nd { + for (Edge *e in [[self graph] inEdgesForNode:nd]) { + if (![e isStraight]) { + [self invalidateEdge:e]; + } + } + for (Edge *e in [[self graph] outEdgesForNode:nd]) { + if (![e isStraight]) { + [self invalidateEdge:e]; + } + } +} + +- (void) graphChanged:(NSNotification*)notification { + GraphChange *change = [[notification userInfo] objectForKey:@"change"]; + switch ([change changeType]) { + case GraphAddition: + case GraphDeletion: + [self invalidateNodes:[change affectedNodes]]; + [self invalidateEdges:[change affectedEdges]]; + break; + case NodePropertyChange: + if (!NSEqualPoints ([[change oldNode] point], [[change nwNode] point])) { + // if the node has moved, it may be affecting edges + [surface invalidate]; + } else if ([[change oldNode] style] != [[change nwNode] style]) { + // change in style means that edges may touch at a different point, + // but this only matters for bent edges + [self invalidateBentIncidentEdgesForNode:[change nodeRef]]; + // invalide both old and new (old node may be larger) + [self invalidateNode:[change oldNode]]; + [self invalidateNode:[change nwNode]]; + } else { + // invalide both old and new (old node may be larger) + [self invalidateNode:[change oldNode]]; + [self invalidateNode:[change nwNode]]; + } + break; + case EdgePropertyChange: + // invalide both old and new (old bend may increase bounds) + [self invalidateEdge:[change oldEdge]]; + [self invalidateEdge:[change nwEdge]]; + [self invalidateEdge:[change edgeRef]]; + break; + case NodesPropertyChange: + { + NSEnumerator *enumerator = [[change oldNodeTable] keyEnumerator]; + Node *node = nil; + while ((node = [enumerator nextObject]) != nil) { + NSPoint oldPos = [[[change oldNodeTable] objectForKey:node] point]; + NSPoint newPos = [[[change nwNodeTable] objectForKey:node] point]; + NodeStyle *oldStyle = [[[change oldNodeTable] objectForKey:node] style]; + NodeStyle *newStyle = [[[change nwNodeTable] objectForKey:node] style]; + if (!NSEqualPoints (oldPos, newPos)) { + [surface invalidate]; + break; + } else if (oldStyle != newStyle) { + [self invalidateBentIncidentEdgesForNode:node]; + [self invalidateNode:[[change oldNodeTable] objectForKey:node]]; + [self invalidateNode:[[change nwNodeTable] objectForKey:node]]; + } else { + [self invalidateNode:[[change oldNodeTable] objectForKey:node]]; + [self invalidateNode:[[change nwNodeTable] objectForKey:node]]; + } + } + } + break; + case NodesShift: + case NodesFlip: + case BoundingBoxChange: + [surface invalidate]; + break; + default: + // unknown change + [surface invalidate]; + break; + }; +} + +- (void) nodeStylePropertyChanged:(NSNotification*)notification { + if (![@"name" isEqual:[[notification userInfo] objectForKey:@"propertyName"]]) { + BOOL affected = NO; + for (Node *node in [[self graph] nodes]) { + if ([node style] == [notification object]) + affected = YES; + } + if (affected) + [surface invalidate]; + } +} + +- (void) edgeStylePropertyChanged:(NSNotification*)notification { + if (![@"name" isEqual:[[notification userInfo] objectForKey:@"propertyName"]]) { + BOOL affected = NO; + for (Edge *edge in [[self graph] edges]) { + if ([edge style] == [notification object]) + affected = YES; + } + if (affected) + [surface invalidate]; + } +} + +- (void) shapeDictionaryReplaced:(NSNotification*)notification { + [surface invalidate]; +} + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/HandTool.h b/tikzit-1/src/gtk/HandTool.h new file mode 100644 index 0000000..c96de36 --- /dev/null +++ b/tikzit-1/src/gtk/HandTool.h @@ -0,0 +1,33 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import "Tool.h" + +@interface HandTool : NSObject { + GraphRenderer *renderer; + NSPoint dragOrigin; + NSPoint oldGraphOrigin; +} + + ++ (id) tool; +- (id) init; +@end + + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/HandTool.m b/tikzit-1/src/gtk/HandTool.m new file mode 100644 index 0000000..c3a0fb4 --- /dev/null +++ b/tikzit-1/src/gtk/HandTool.m @@ -0,0 +1,75 @@ +/* + * Copyright 2011-2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "HandTool.h" + +#import "GraphRenderer.h" +#import "TikzDocument.h" +#import "tzstockitems.h" + +@implementation HandTool +- (NSString*) name { return @"Drag"; } +- (const gchar*) stockId { return TIKZIT_STOCK_DRAG; } +- (NSString*) helpText { return @"Move the diagram to view different parts"; } +- (NSString*) shortcut { return @"m"; } +@synthesize activeRenderer=renderer; + ++ (id) tool { + return [[[self alloc] init] autorelease]; +} + +- (id) init { + return [super init]; +} + +- (void) dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + + [renderer release]; + + [super dealloc]; +} + +- (GtkWidget*) configurationWidget { return NULL; } + +- (void) mousePressAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { + if (button != LeftButton) + return; + + dragOrigin = pos; + oldGraphOrigin = [[renderer transformer] origin]; +} + +- (void) mouseMoveTo:(NSPoint)pos withButtons:(MouseButton)buttons andMask:(InputMask)mask { + if (!(buttons & LeftButton)) + return; + + NSPoint newGraphOrigin = oldGraphOrigin; + newGraphOrigin.x += pos.x - dragOrigin.x; + newGraphOrigin.y += pos.y - dragOrigin.y; + [[renderer transformer] setOrigin:newGraphOrigin]; + [renderer invalidateGraph]; +} + +- (void) mouseReleaseAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask {} + +- (void) renderWithContext:(id)context onSurface:(id)surface {} +- (void) loadConfiguration:(Configuration*)config {} +- (void) saveConfiguration:(Configuration*)config {} +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/InputDelegate.h b/tikzit-1/src/gtk/InputDelegate.h new file mode 100644 index 0000000..9f9b426 --- /dev/null +++ b/tikzit-1/src/gtk/InputDelegate.h @@ -0,0 +1,77 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" + +typedef enum { + LeftButton = 1, + MiddleButton = 2, + RightButton = 3, + Button4 = 4, + Button5 = 5 +} MouseButton; + +typedef enum { + ShiftMask = 1, + ControlMask = 2, + MetaMask = 4 +} InputMask; + +typedef enum { + ScrollUp = 1, + ScrollDown = 2, + ScrollLeft = 3, + ScrollRight = 4, +} ScrollDirection; + +@protocol InputDelegate +@optional +/** + * A mouse button was pressed. + */ +- (void) mousePressAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask; +/** + * A mouse button was released. + */ +- (void) mouseReleaseAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask; +/** + * A mouse button was double-clicked. + * + * Note that mouseDown and mouseUp events will still be delivered. + * This will be triggered between the second mouseDown and the second + * mouseUp. + */ +- (void) mouseDoubleClickAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask; +/** + * The mouse was moved + */ +- (void) mouseMoveTo:(NSPoint)pos withButtons:(MouseButton)button andMask:(InputMask)mask; +/** + * The mouse was scrolled + */ +- (void) mouseScrolledAt:(NSPoint)pos inDirection:(ScrollDirection)dir withMask:(InputMask)mask; +/** + * A key was pressed + */ +- (void) keyPressed:(unsigned int)keyVal withMask:(InputMask)mask; +/** + * A key was released + */ +- (void) keyReleased:(unsigned int)keyVal withMask:(InputMask)mask; +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/Menu.h b/tikzit-1/src/gtk/Menu.h new file mode 100644 index 0000000..e0f78d4 --- /dev/null +++ b/tikzit-1/src/gtk/Menu.h @@ -0,0 +1,86 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import + +@class Window; +@class PickSupport; + +/** + * Manages the menu + */ +@interface Menu: NSObject { + GtkWidget *menubar; + GtkActionGroup *appActions; + GtkActionGroup *windowActions; + GtkAction *undoAction; // no ref + GtkAction *redoAction; // no ref + GtkAction *pasteAction; // no ref + GtkAction **nodeSelBasedActions; + guint nodeSelBasedActionCount; + GtkAction **edgeSelBasedActions; + guint edgeSelBasedActionCount; + GtkAction **selBasedActions; + guint selBasedActionCount; +} + +/** + * The menubar widget, to be inserted into the window + */ +@property (readonly) GtkWidget *menubar; + +/** + * Constructs the menu for @p window + * + * @param window the window that will be acted upon + */ +- (id) initForWindow:(Window*)window; + +/** + * Enables or disables the undo action + */ +- (void) setUndoActionEnabled:(BOOL)enabled; +/** + * Sets the text that describes what action will be undone + * + * @param detail a text description of the action, or nil + */ +- (void) setUndoActionDetail:(NSString*)detail; +/** + * Enables or disables the redo action + */ +- (void) setRedoActionEnabled:(BOOL)enabled; +/** + * Sets the text that describes what action will be redone + * + * @param detail a text description of the action, or nil + */ +- (void) setRedoActionDetail:(NSString*)detail; + +/** + * Gets the paste action + */ +- (GtkAction*) pasteAction; + +/** + * Enables or disables the actions that act on a selection + */ +- (void) notifySelectionChanged:(PickSupport*)pickSupport; +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/Menu.m b/tikzit-1/src/gtk/Menu.m new file mode 100644 index 0000000..04c9c31 --- /dev/null +++ b/tikzit-1/src/gtk/Menu.m @@ -0,0 +1,737 @@ +/* + * Copyright 2011 Alex Merry + * + * Stuff stolen from glade-window.c in Glade: + * Copyright (C) 2001 Ximian, Inc. + * Copyright (C) 2007 Vincent Geddes. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "Menu.h" + +#import "Application.h" +#import "Window.h" +#import "Configuration.h" +#import "PickSupport.h" +#import "Shape.h" +#import "Tool.h" +#import "TikzDocument.h" + +#import +#ifdef _ +#undef _ +#endif +#import +#import + +#import "gtkhelpers.h" + +#import "logo.h" + +// {{{ Application actions +static void new_cb (GtkAction *action, Application *appl) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [appl newWindow]; + [pool drain]; +} + +static void refresh_shapes_cb (GtkAction *action, Application *appl) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [Shape refreshShapeDictionary]; + [pool drain]; +} + +static void show_preferences_cb (GtkAction *action, Application *appl) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [appl presentSettingsDialog]; + [pool drain]; +} + +#ifdef HAVE_POPPLER +static void show_preamble_cb (GtkAction *action, Application *appl) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [appl presentPreamblesEditor]; + [pool drain]; +} +#endif + +static void show_context_window_cb (GtkAction *action, Application *appl) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [appl presentContextWindow]; + [pool drain]; +} + +static void quit_cb (GtkAction *action, Application *appl) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [appl quit]; + [pool drain]; +} + +static void help_cb (GtkAction *action, Application *appl) { + GError *gerror = NULL; + gtk_show_uri (NULL, "http://tikzit.sourceforge.net/manual.html", GDK_CURRENT_TIME, &gerror); + if (gerror != NULL) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + logGError (gerror, @"Could not show help"); + [pool drain]; + } +} + +static void about_cb (GtkAction *action, Application *appl) { + static const gchar * const authors[] = + { "Aleks Kissinger ", + "Chris Heunen ", + "Alex Merry ", + NULL }; + + static const gchar license[] = + N_("TikZiT is free software; you can redistribute it and/or modify " + "it under the terms of the GNU General Public License as " + "published by the Free Software Foundation; either version 2 of the " + "License, or (at your option) any later version." + "\n\n" + "TikZiT is distributed in the hope that it will be useful, " + "but WITHOUT ANY WARRANTY; without even the implied warranty of " + "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the " + "GNU General Public License for more details." + "\n\n" + "You should have received a copy of the GNU General Public License " + "along with TikZiT; if not, write to the Free Software " + "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, " + "MA 02110-1301, USA."); + + static const gchar copyright[] = + "Copyright \xc2\xa9 2010-2011 Aleks Kissinger, Chris Heunen and Alex Merry."; + + GdkPixbuf *logo = get_logo (LOGO_SIZE_128); + gtk_show_about_dialog (NULL, + "program-name", PACKAGE_NAME, + "logo", logo, + "authors", authors, + "translator-credits", _("translator-credits"), + "comments", _("A graph manipulation program for pgf/tikz graphs"), + "license", _(license), + "wrap-license", TRUE, + "copyright", copyright, + "version", PACKAGE_VERSION, + "website", "http://tikzit.sourceforge.net", + NULL); + g_object_unref (logo); +} + +static GtkActionEntry app_action_entries[] = { + /* + Fields: + * action name + * stock id or name of icon for action + * label for action (mark for translation with N_) + * accelerator (as understood by gtk_accelerator_parse()) + * tooltip (mark for translation with N_) + * callback + */ + { "New", GTK_STOCK_NEW, NULL, "N", + N_("Create a new graph"), G_CALLBACK (new_cb) }, + + { "RefreshShapes", NULL, N_("_Refresh shapes"), NULL, + N_(""), G_CALLBACK (refresh_shapes_cb) }, + + { "Quit", GTK_STOCK_QUIT, NULL, "Q", + N_("Quit the program"), G_CALLBACK (quit_cb) }, + + { "Tool", NULL, N_("_Tool") }, + + { "ShowPreferences", GTK_STOCK_PREFERENCES, N_("Configure TikZiT..."), NULL, + N_("Edit the TikZiT configuration"), G_CALLBACK (show_preferences_cb) }, + +#ifdef HAVE_POPPLER + { "ShowPreamble", NULL, N_("_Edit Preambles..."), NULL, + N_("Edit the preambles used to generate the preview"), G_CALLBACK (show_preamble_cb) }, +#endif + + { "ShowContextWindow", NULL, N_("_Context Window"), NULL, + N_("Show the contextual tools window"), G_CALLBACK (show_context_window_cb) }, + + /* HelpMenu */ + { "HelpManual", GTK_STOCK_HELP, N_("_Online manual"), "F1", + N_("TikZiT manual (online)"), G_CALLBACK (help_cb) }, + + { "About", GTK_STOCK_ABOUT, NULL, NULL, + N_("About this application"), G_CALLBACK (about_cb) }, +}; +static guint n_app_action_entries = G_N_ELEMENTS (app_action_entries); +// }}} +// {{{ Window actions + +static void open_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [window openFile]; + [pool drain]; +} + +static void close_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [window close]; + [pool drain]; +} + +static void save_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [window saveActiveDocument]; + [pool drain]; +} + +static void save_as_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [window saveActiveDocumentAs]; + [pool drain]; +} + +static void save_as_shape_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [window saveActiveDocumentAsShape]; + [pool drain]; +} + +static void undo_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + TikzDocument *document = [window document]; + if ([document canUndo]) { + [document undo]; + } else { + g_warning ("Can't undo!\n"); + gtk_action_set_sensitive (action, FALSE); + } + + [pool drain]; +} + +static void redo_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + TikzDocument *document = [window document]; + if ([document canRedo]) { + [document redo]; + } else { + g_warning ("Can't redo!\n"); + gtk_action_set_sensitive (action, FALSE); + } + + [pool drain]; +} + +static void cut_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [window selectionCutToClipboard]; + [pool drain]; +} + +static void copy_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [window selectionCopyToClipboard]; + [pool drain]; +} + +static void paste_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [window pasteFromClipboard]; + [pool drain]; +} + +static void delete_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [[window document] removeSelected]; + [pool drain]; +} + +static void select_all_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + TikzDocument *document = [window document]; + [[document pickSupport] selectAllNodes:[NSSet setWithArray:[[document graph] nodes]]]; + [pool drain]; +} + +static void deselect_all_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + TikzDocument *document = [window document]; + [[document pickSupport] deselectAllNodes]; + [[document pickSupport] deselectAllEdges]; + [pool drain]; +} + +static void flip_horiz_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [[window document] flipSelectedNodesHorizontally]; + [pool drain]; +} + +static void flip_vert_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [[window document] flipSelectedNodesVertically]; + [pool drain]; +} + +static void reverse_edges_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [[window document] reverseSelectedEdges]; + [pool drain]; +} + +static void bring_forward_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [[window document] bringSelectionForward]; + [pool drain]; +} + +static void send_backward_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [[window document] sendSelectionBackward]; + [pool drain]; +} + +static void bring_to_front_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [[window document] bringSelectionToFront]; + [pool drain]; +} + +static void send_to_back_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [[window document] sendSelectionToBack]; + [pool drain]; +} + +#ifdef HAVE_POPPLER +static void show_preview_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [window presentPreview]; + [pool drain]; +} +#endif + +static void zoom_in_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [window zoomIn]; + [pool drain]; +} + +static void zoom_out_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [window zoomOut]; + [pool drain]; +} + +static void zoom_reset_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [window zoomReset]; + [pool drain]; +} + +static void recent_chooser_item_activated_cb (GtkRecentChooser *chooser, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + gchar *uri, *path; + GError *error = NULL; + + uri = gtk_recent_chooser_get_current_uri (chooser); + + path = g_filename_from_uri (uri, NULL, NULL); + if (error) { + g_warning ("Could not convert uri \"%s\" to a local path: %s", uri, error->message); + g_error_free (error); + return; + } + + [window openFileAtPath:[NSString stringWithGlibFilename:path]]; + + g_free (uri); + g_free (path); + + [pool drain]; +} + + +static GtkActionEntry window_action_entries[] = { + /* + Fields: + * action name + * stock id or name of icon for action + * label for action (mark for translation with N_) + * accelerator (as understood by gtk_accelerator_parse()) + * tooltip (mark for translation with N_) + * callback + */ + { "FileMenu", NULL, N_("_File") }, + { "EditMenu", NULL, N_("_Edit") }, + { "ViewMenu", NULL, N_("_View") }, + { "HelpMenu", NULL, N_("_Help") }, + + { "Arrange", NULL, N_("_Arrange") }, + { "Zoom", NULL, N_("_Zoom") }, + + { "Open", GTK_STOCK_OPEN, N_("_Open\342\200\246") ,"O", + N_("Open a graph"), G_CALLBACK (open_cb) }, + + { "Close", GTK_STOCK_CLOSE, NULL, "W", + N_("Close the current graph"), G_CALLBACK (close_cb) }, + + { "ZoomIn", GTK_STOCK_ZOOM_IN, NULL, "plus", + NULL, G_CALLBACK (zoom_in_cb) }, + + { "ZoomOut", GTK_STOCK_ZOOM_OUT, NULL, "minus", + NULL, G_CALLBACK (zoom_out_cb) }, + + { "ZoomReset", GTK_STOCK_ZOOM_100, N_("_Reset zoom"), "0", + NULL, G_CALLBACK (zoom_reset_cb) }, + + { "Save", GTK_STOCK_SAVE, NULL, "S", + N_("Save the current graph"), G_CALLBACK (save_cb) }, + + { "SaveAs", GTK_STOCK_SAVE_AS, N_("Save _As\342\200\246"), NULL, + N_("Save the current graph with a different name"), G_CALLBACK (save_as_cb) }, + + { "SaveAsShape", NULL, N_("Save As S_hape\342\200\246"), NULL, + N_("Save the current graph as a shape for use in styles"), G_CALLBACK (save_as_shape_cb) }, + + { "Undo", GTK_STOCK_UNDO, NULL, "Z", + N_("Undo the last action"), G_CALLBACK (undo_cb) }, + + { "Redo", GTK_STOCK_REDO, NULL, "Z", + N_("Redo the last action"), G_CALLBACK (redo_cb) }, + + { "Cut", GTK_STOCK_CUT, NULL, NULL, + N_("Cut the selection"), G_CALLBACK (cut_cb) }, + + { "Copy", GTK_STOCK_COPY, NULL, NULL, + N_("Copy the selection"), G_CALLBACK (copy_cb) }, + + { "Paste", GTK_STOCK_PASTE, NULL, NULL, + N_("Paste the clipboard"), G_CALLBACK (paste_cb) }, + + { "Delete", GTK_STOCK_DELETE, NULL, "Delete", + N_("Delete the selection"), G_CALLBACK (delete_cb) }, + + { "SelectAll", GTK_STOCK_SELECT_ALL, NULL, "A", + N_("Select all nodes on the graph"), G_CALLBACK (select_all_cb) }, + + { "DeselectAll", NULL, N_("D_eselect all"), "A", + N_("Deselect everything"), G_CALLBACK (deselect_all_cb) }, + + { "FlipHoriz", NULL, N_("Flip nodes _horizonally"), NULL, + N_("Flip the selected nodes horizontally"), G_CALLBACK (flip_horiz_cb) }, + + { "FlipVert", NULL, N_("Flip nodes _vertically"), NULL, + N_("Flip the selected nodes vertically"), G_CALLBACK (flip_vert_cb) }, + + { "ReverseEdges", NULL, N_("Rever_se edges"), NULL, + N_("Reverse the selected edges"), G_CALLBACK (reverse_edges_cb) }, + + { "SendToBack", NULL, N_("Send to _back"), NULL, + N_("Send the selected nodes and edges to the back of the graph"), G_CALLBACK (send_to_back_cb) }, + + { "SendBackward", NULL, N_("Send b_ackward"), NULL, + N_("Send the selected nodes and edges backward"), G_CALLBACK (send_backward_cb) }, + + { "BringForward", NULL, N_("Bring f_orward"), NULL, + N_("Bring the selected nodes and edges forward"), G_CALLBACK (bring_forward_cb) }, + + { "BringToFront", NULL, N_("Bring to _front"), NULL, + N_("Bring the selected nodes and edges to the front of the graph"), G_CALLBACK (bring_to_front_cb) }, + + /* ViewMenu */ +#ifdef HAVE_POPPLER + { "ShowPreview", NULL, N_("_Preview"), "L", + N_("See the graph as it will look when rendered in LaTeX"), G_CALLBACK (show_preview_cb) }, +#endif +}; +static guint n_window_action_entries = G_N_ELEMENTS (window_action_entries); + +// }}} +// {{{ UI XML + +static const gchar ui_info[] = +"" +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +#ifdef HAVE_POPPLER +" " +" " +#endif +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +/* +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +*/ +""; + + + +// }}} +// {{{ Helper methods + +static void configure_recent_chooser (GtkRecentChooser *chooser) +{ + gtk_recent_chooser_set_local_only (chooser, TRUE); + gtk_recent_chooser_set_show_icons (chooser, FALSE); + gtk_recent_chooser_set_sort_type (chooser, GTK_RECENT_SORT_MRU); + + GtkRecentFilter *filter = gtk_recent_filter_new (); + gtk_recent_filter_add_application (filter, g_get_application_name()); + gtk_recent_chooser_set_filter (chooser, filter); +} + +static void tool_cb (GtkAction *action, id tool) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [app setActiveTool:tool]; + [pool drain]; +} + + + +// }}} +// {{{ API + +@implementation Menu + +- (id) init { + [self release]; + return nil; +} + +- (id) initForWindow:(Window*)window { + self = [super init]; + if (!self) { + return nil; + } + + GError *error = NULL; + + appActions = gtk_action_group_new ("TZApp"); + //gtk_action_group_set_translation_domain (actions, GETTEXT_PACKAGE); + gtk_action_group_add_actions (appActions, + app_action_entries, + n_app_action_entries, + app); + for (id tool in [app tools]) { + NSString *tooltip = [NSString stringWithFormat: + @"%@: %@ (%@)", [tool name], [tool helpText], [tool shortcut]]; + GtkAction *action = gtk_action_new ( + [[tool name] UTF8String], + [[tool name] UTF8String], + [tooltip UTF8String], + [tool stockId]); + gtk_action_group_add_action_with_accel ( + appActions, + action, + NULL); + g_signal_connect ( + G_OBJECT (action), + "activate", + G_CALLBACK (tool_cb), + tool); + g_object_unref (action); + } + + windowActions = gtk_action_group_new ("TZWindow"); + //gtk_action_group_set_translation_domain (windowActions, GETTEXT_PACKAGE); + + gtk_action_group_add_actions (windowActions, + window_action_entries, + n_window_action_entries, + window); + + GtkAction *action = gtk_recent_action_new ("OpenRecent", N_("Open _Recent"), NULL, NULL); + g_signal_connect (G_OBJECT (action), + "item-activated", + G_CALLBACK (recent_chooser_item_activated_cb), + window); + configure_recent_chooser (GTK_RECENT_CHOOSER (action)); + gtk_action_group_add_action_with_accel (windowActions, action, NULL); + g_object_unref (action); + + /* Save refs to actions that will need to be updated */ + undoAction = gtk_action_group_get_action (windowActions, "Undo"); + redoAction = gtk_action_group_get_action (windowActions, "Redo"); + pasteAction = gtk_action_group_get_action (windowActions, "Paste"); + + nodeSelBasedActionCount = 4; + nodeSelBasedActions = g_new (GtkAction*, nodeSelBasedActionCount); + nodeSelBasedActions[0] = gtk_action_group_get_action (windowActions, "Cut"); + nodeSelBasedActions[1] = gtk_action_group_get_action (windowActions, "Copy"); + nodeSelBasedActions[2] = gtk_action_group_get_action (windowActions, "FlipHoriz"); + nodeSelBasedActions[3] = gtk_action_group_get_action (windowActions, "FlipVert"); + edgeSelBasedActionCount = 1; + edgeSelBasedActions = g_new (GtkAction*, edgeSelBasedActionCount); + edgeSelBasedActions[0] = gtk_action_group_get_action (windowActions, "ReverseEdges"); + selBasedActionCount = 2; + selBasedActions = g_new (GtkAction*, selBasedActionCount); + selBasedActions[0] = gtk_action_group_get_action (windowActions, "Delete"); + selBasedActions[1] = gtk_action_group_get_action (windowActions, "DeselectAll"); + + + GtkUIManager *ui = gtk_ui_manager_new (); + gtk_ui_manager_insert_action_group (ui, windowActions, 0); + gtk_ui_manager_insert_action_group (ui, appActions, 1); + gtk_window_add_accel_group ([window gtkWindow], gtk_ui_manager_get_accel_group (ui)); + if (!gtk_ui_manager_add_ui_from_string (ui, ui_info, -1, &error)) + { + g_message ("Building menus failed: %s", error->message); + g_error_free (error); + g_object_unref (ui); + [self release]; + return nil; + } + guint tool_merge_id = gtk_ui_manager_new_merge_id (ui); + for (id tool in [app tools]) { + gtk_ui_manager_add_ui (ui, + tool_merge_id, + "/ui/MenuBar/EditMenu/Tool", + [[tool name] UTF8String], + [[tool name] UTF8String], + GTK_UI_MANAGER_AUTO, + FALSE); + } + menubar = gtk_ui_manager_get_widget (ui, "/MenuBar"); + g_object_ref_sink (menubar); + g_object_unref (ui); + + return self; +} + +- (void) dealloc { + g_free (nodeSelBasedActions); + g_free (edgeSelBasedActions); + g_free (selBasedActions); + g_object_unref (menubar); + g_object_unref (appActions); + g_object_unref (windowActions); + + [super dealloc]; +} + +@synthesize menubar; + +- (void) setUndoActionEnabled:(BOOL)enabled { + gtk_action_set_sensitive (undoAction, enabled); +} + +- (void) setUndoActionDetail:(NSString*)detail { + gtk_action_set_detailed_label (undoAction, "_Undo", [detail UTF8String]); +} + +- (void) setRedoActionEnabled:(BOOL)enabled { + gtk_action_set_sensitive (redoAction, enabled); +} + +- (void) setRedoActionDetail:(NSString*)detail { + gtk_action_set_detailed_label (redoAction, "_Redo", [detail UTF8String]); +} + +- (GtkAction*) pasteAction { + return pasteAction; +} + +- (void) notifySelectionChanged:(PickSupport*)pickSupport { + BOOL hasSelectedNodes = [[pickSupport selectedNodes] count] > 0; + BOOL hasSelectedEdges = [[pickSupport selectedEdges] count] > 0; + for (int i = 0; i < nodeSelBasedActionCount; ++i) { + if (nodeSelBasedActions[i]) { + gtk_action_set_sensitive (nodeSelBasedActions[i], hasSelectedNodes); + } + } + for (int i = 0; i < edgeSelBasedActionCount; ++i) { + if (edgeSelBasedActions[i]) { + gtk_action_set_sensitive (edgeSelBasedActions[i], hasSelectedEdges); + } + } + for (int i = 0; i < selBasedActionCount; ++i) { + if (selBasedActions[i]) { + gtk_action_set_sensitive (selBasedActions[i], hasSelectedNodes || hasSelectedEdges); + } + } +} + +@end + +// }}} + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/NSError+Glib.h b/tikzit-1/src/gtk/NSError+Glib.h new file mode 100644 index 0000000..137977e --- /dev/null +++ b/tikzit-1/src/gtk/NSError+Glib.h @@ -0,0 +1,28 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import +#import + +@interface NSError(Glib) ++ (id) errorWithGError:(GError*)gerror; +@end + +void GErrorToNSError(GError *errorIn, NSError **errorOut); +void logGError (GError *error, NSString *message); + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/NSError+Glib.m b/tikzit-1/src/gtk/NSError+Glib.m new file mode 100644 index 0000000..f466d9e --- /dev/null +++ b/tikzit-1/src/gtk/NSError+Glib.m @@ -0,0 +1,50 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "NSError+Glib.h" +#import "TZFoundation.h" + +@implementation NSError(Glib) ++ (id) errorWithGError:(GError*)gerror { + if (!gerror) + return nil; + + NSString *message = [NSString stringWithUTF8String:gerror->message]; + NSString *domain = [NSString stringWithUTF8String:g_quark_to_string(gerror->domain)]; + + NSMutableDictionary *errorDetail = [NSMutableDictionary dictionaryWithObject:message + forKey:NSLocalizedDescriptionKey]; + return [self errorWithDomain:domain code:gerror->code userInfo:errorDetail]; +} +@end + +void GErrorToNSError(GError *errorIn, NSError **errorOut) +{ + if (errorOut && errorIn) { + *errorOut = [NSError errorWithGError:errorIn]; + } +} + +void logGError (GError *error, NSString *message) { + if (message == nil) { + NSLog (@"%s", error->message); + } else { + NSLog (@"%@: %s", message, error->message); + } +} + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/NSFileManager+Glib.h b/tikzit-1/src/gtk/NSFileManager+Glib.h new file mode 100644 index 0000000..cb49fcb --- /dev/null +++ b/tikzit-1/src/gtk/NSFileManager+Glib.h @@ -0,0 +1,31 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import + +@interface NSFileManager(Glib) +/** + * Creates a directory in the system temp directory + */ +- (NSString*) createTempDirectoryWithError:(NSError**)error; +/** + * Creates a directory in the system temp directory + */ +- (NSString*) createTempDirectory; +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/NSFileManager+Glib.m b/tikzit-1/src/gtk/NSFileManager+Glib.m new file mode 100644 index 0000000..b3e9de6 --- /dev/null +++ b/tikzit-1/src/gtk/NSFileManager+Glib.m @@ -0,0 +1,55 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "NSFileManager+Glib.h" +#import "TZFoundation.h" +#import "mkdtemp.h" + +@implementation NSFileManager(Glib) + +- (NSString*) createTempDirectoryWithError:(NSError**)error { + NSString *result = nil; +#if GLIB_CHECK_VERSION (2, 30, 0) + GError *gerror = NULL; + gchar *dir = g_dir_make_tmp ("tikzitXXXXXX", &gerror); + GErrorToNSError (gerror, error); + if (dir) + result = [NSString stringWithGlibFilename:dir]; + g_free (dir); +#else +//#if (!GLIB_CHECK_VERSION (2, 26, 0)) +#define g_mkdtemp mkdtemp +//#endif + gchar *dir = g_build_filename (g_get_tmp_dir(), "tikzitXXXXXX", NULL); + gchar *rdir = g_mkdtemp (dir); + if (rdir) { + result = [NSString stringWithGlibFilename:dir]; + } else if (error) { + *error = [NSError errorWithLibcError:errno]; + } + g_free (dir); +#endif + return result; +} + +- (NSString*) createTempDirectory { + return [self createTempDirectoryWithError:NULL]; +} + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/NSString+Glib.h b/tikzit-1/src/gtk/NSString+Glib.h new file mode 100644 index 0000000..ac59833 --- /dev/null +++ b/tikzit-1/src/gtk/NSString+Glib.h @@ -0,0 +1,50 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import +#import + +@interface NSString(Glib) +/** + * Initialise a string with a string in the GLib filename encoding + */ +- (id) initWithGlibFilename:(const gchar *)filename; +/** + * Create a string from a string in the GLib filename encoding + */ ++ (id) stringWithGlibFilename:(const gchar *)filename; +/** + * Get a copy of the string in GLib filename encoding. + * + * This will need to be freed with g_free. + */ +- (gchar*)glibFilename; +/** + * Get a copy of the string as a GLib URI + * + * This will need to be freed with g_free. + */ +- (gchar*)glibUriWithError:(NSError**)error; +/** + * Get a copy of the string as a GLib URI + * + * This will need to be freed with g_free. + */ +- (gchar*)glibUri; +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/NSString+Glib.m b/tikzit-1/src/gtk/NSString+Glib.m new file mode 100644 index 0000000..b6dc765 --- /dev/null +++ b/tikzit-1/src/gtk/NSString+Glib.m @@ -0,0 +1,96 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "NSString+Glib.h" +#import "TZFoundation.h" + +@implementation NSString(Glib) ++ (id) stringWithGlibFilename:(const gchar *)filename { + return [[[self alloc] initWithGlibFilename:filename] autorelease]; +} + +- (id) initWithGlibFilename:(const gchar *)filename { + if (self == nil) { + return nil; + } + + if (filename == NULL) { + [self release]; + return nil; + } + + GError *error = NULL; + gchar *utf8file = g_filename_to_utf8 (filename, -1, NULL, NULL, &error); + if (utf8file == NULL) { + if (error) + logGError (error, @"Failed to convert a GLib filename to UTF8"); + [self release]; + return nil; + } + + self = [self initWithUTF8String:utf8file]; + g_free (utf8file); + + return self; +} + +- (gchar*)glibFilenameWithError:(NSError**)error { + GError *gerror = NULL; + gchar *result = g_filename_from_utf8 ([self UTF8String], -1, NULL, NULL, &gerror); + GErrorToNSError (gerror, error); + if (gerror) { + logGError (gerror, @"Failed to convert a UTF8 string to a GLib filename"); + } + return result; +} + +- (gchar*)glibFilename { + return [self glibFilenameWithError:NULL]; +} + +- (gchar*)glibUriWithError:(NSError**)error { + gchar *filepath; + gchar *uri; + NSError *cause = nil; + + filepath = [self glibFilenameWithError:&cause]; + if (!filepath) { + if (error) { + NSString *message = [NSString stringWithFormat:@"Could not convert \"%@\" to the GLib filename encoding", self]; + *error = [NSError errorWithMessage:message code:TZ_ERR_OTHER cause:cause]; + } + return NULL; + } + + GError *gerror = NULL; + GError **gerrorptr = error ? &gerror : NULL; + uri = g_filename_to_uri (filepath, NULL, gerrorptr); + if (!uri && error) { + NSString *message = [NSString stringWithFormat:@"Could not convert \"%@\" to a GLib URI", self]; + *error = [NSError errorWithMessage:message code:TZ_ERR_BADFORMAT cause:[NSError errorWithGError:gerror]]; + } + g_free (filepath); + return uri; +} + +- (gchar*)glibUri { + return [self glibUriWithError:NULL]; +} + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/Node+Render.h b/tikzit-1/src/gtk/Node+Render.h new file mode 100644 index 0000000..60d2573 --- /dev/null +++ b/tikzit-1/src/gtk/Node+Render.h @@ -0,0 +1,44 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import "Node.h" +#import "RenderContext.h" +#import "Surface.h" + +enum NodeState { + NodeNormal, + NodeSelected, + NodeHighlighted +}; + +@interface Node(Render) + +- (Transformer*) shapeTransformerForSurface:(id)surface; +// the total rendered bounds, excluding label +- (NSRect) renderBoundsForSurface:(id)surface; +- (NSRect) renderBoundsWithLabelForSurface:(id)surface; +- (NSString*) renderedLabel; +- (NSSize) renderedLabelSizeInContext:(id)context; +- (void) renderLabelToSurface:(id)surface withContext:(id)context; +- (void) renderLabelAt:(NSPoint)point withContext:(id)context; +- (void) renderToSurface:(id)surface withContext:(id)context state:(enum NodeState)state; +- (BOOL) hitByPoint:(NSPoint)p onSurface:(id)surface; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/Node+Render.m b/tikzit-1/src/gtk/Node+Render.m new file mode 100644 index 0000000..907d818 --- /dev/null +++ b/tikzit-1/src/gtk/Node+Render.m @@ -0,0 +1,188 @@ +/* + * Copyright 2011 Alex Merry + * Copyright 2010 Chris Heunen + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "Node+Render.h" +#import "Shape.h" +#import "Shape+Render.h" +#import "ShapeNames.h" + +#define MAX_LABEL_LENGTH 10 +#define LABEL_PADDING_X 2 +#define LABEL_PADDING_Y 2 + +@implementation Node (Render) + +- (Shape*) shapeToRender { + if (style) { + return [Shape shapeForName:[style shapeName]]; + } else { + return [Shape shapeForName:SHAPE_CIRCLE]; + } +} + +- (Transformer*) shapeTransformerForSurface:(id)surface { + return [self shapeTransformerFromTransformer:[surface transformer]]; +} + +- (NSRect) renderBoundsUsingShapeTransform:(Transformer*)shapeTrans { + float strokeThickness = style ? [style strokeThickness] : [NodeStyle defaultStrokeThickness]; + NSRect screenBounds = [shapeTrans rectToScreen:[[self shapeToRender] boundingRect]]; + screenBounds = NSInsetRect(screenBounds, -strokeThickness, -strokeThickness); + return screenBounds; +} + +- (NSRect) renderBoundsForSurface:(id)surface { + return [self renderBoundsUsingShapeTransform:[self shapeTransformerForSurface:surface]]; +} + +- (NSRect) renderBoundsWithLabelForSurface:(id)surface { + NSRect nodeBounds = [self renderBoundsForSurface:surface]; + NSRect labelRect = NSZeroRect; + if (![label isEqual:@""]) { + id cr = [surface createRenderContext]; + labelRect.size = [self renderedLabelSizeInContext:cr]; + NSPoint nodePos = [[surface transformer] toScreen:point]; + labelRect.origin.x = nodePos.x - (labelRect.size.width / 2); + labelRect.origin.y = nodePos.y - (labelRect.size.height / 2); + } + return NSUnionRect(nodeBounds, labelRect); +} + +- (RColor) strokeColor { + if (style) { + return [[style strokeColorRGB] rColor]; + } else { + return MakeRColor (0.4, 0.4, 0.7, 0.8); + } +} + +- (RColor) fillColor { + if (style) { + return [[style fillColorRGB] rColor]; + } else { + return MakeRColor (0.4, 0.4, 0.7, 0.3); + } +} + +- (NSString*) renderedLabel { + NSString *r_label = [label stringByExpandingLatexConstants]; + if ([r_label length] > MAX_LABEL_LENGTH) { + r_label = [[[r_label substringToIndex:MAX_LABEL_LENGTH-1] stringByTrimmingSpaces] stringByAppendingString:@"..."]; + } else { + r_label = [r_label stringByTrimmingSpaces]; + } + return r_label; +} + +- (NSSize) renderedLabelSizeInContext:(id)context { + NSSize result = {0, 0}; + if (![label isEqual:@""]) { + NSString *r_label = [self renderedLabel]; + + id layout = [context layoutText:r_label withSize:9]; + + result = [layout size]; + result.width += LABEL_PADDING_X; + result.height += LABEL_PADDING_Y; + } + return result; +} + +- (void) renderLabelToSurface:(id )surface withContext:(id)context { + [self renderLabelAt:[[surface transformer] toScreen:point] withContext:context]; +} + +- (void) renderLabelAt:(NSPoint)p withContext:(id)context { + // draw latex code overlayed on node + if (![label isEqual:@""]) { + [context saveState]; + + NSString *r_label = [self renderedLabel]; + id layout = [context layoutText:r_label withSize:9]; + + NSSize labelSize = [layout size]; + + NSRect textBounds = NSMakeRect (p.x - labelSize.width/2, + p.y - labelSize.height/2, + labelSize.width, + labelSize.height); + NSRect backRect = NSInsetRect (textBounds, -LABEL_PADDING_X, -LABEL_PADDING_Y); + + [context startPath]; + [context setLineWidth:1.0]; + [context rect:backRect]; + RColor fColor = MakeRColor (1.0, 1.0, 0.5, 0.7); + RColor sColor = MakeRColor (0.5, 0.0, 0.0, 0.7); + [context strokePathWithColor:sColor andFillWithColor:fColor]; + + [layout showTextAt:textBounds.origin withColor:BlackRColor]; + + [context restoreState]; + } +} + +- (void) renderToSurface:(id )surface withContext:(id)context state:(enum NodeState)state { + Transformer *shapeTrans = [self shapeTransformerForSurface:surface]; + float strokeThickness = style ? [style strokeThickness] : [NodeStyle defaultStrokeThickness]; + + [context saveState]; + + [[self shapeToRender] drawPathWithTransform:shapeTrans andContext:context]; + + [context setLineWidth:strokeThickness]; + if (!style) { + [context setLineDash:3.0]; + } + [context strokePathWithColor:[self strokeColor] andFillWithColor:[self fillColor]]; + + if (state != NodeNormal) { + [context setLineWidth:strokeThickness + 4.0]; + [context setLineDash:0.0]; + float alpha = 0.0f; + if (state == NodeSelected) + alpha = 0.5f; + else if (state == NodeHighlighted) + alpha = 0.25f; + RColor selectionColor = MakeSolidRColor(0.61f, 0.735f, 1.0f); + + [[self shapeToRender] drawPathWithTransform:shapeTrans andContext:context]; + [context strokePathWithColor:selectionColor andFillWithColor:selectionColor usingAlpha:alpha]; + } + + [context restoreState]; + [self renderLabelToSurface:surface withContext:context]; +} + +- (BOOL) hitByPoint:(NSPoint)p onSurface:(id)surface { + Transformer *shapeTrans = [self shapeTransformerForSurface:surface]; + + NSRect screenBounds = [self renderBoundsUsingShapeTransform:shapeTrans]; + if (!NSPointInRect(p, screenBounds)) { + return NO; + } + + float strokeThickness = style ? [style strokeThickness] : [NodeStyle defaultStrokeThickness]; + id ctx = [surface createRenderContext]; + [ctx setLineWidth:strokeThickness]; + [[self shapeToRender] drawPathWithTransform:shapeTrans andContext:ctx]; + return [ctx strokeIncludesPoint:p] || [ctx fillIncludesPoint:p]; +} + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/NodeStyle+Gtk.h b/tikzit-1/src/gtk/NodeStyle+Gtk.h new file mode 100644 index 0000000..4fa5edd --- /dev/null +++ b/tikzit-1/src/gtk/NodeStyle+Gtk.h @@ -0,0 +1,31 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import "NodeStyle.h" +#import + +@interface NodeStyle (Gtk) + +- (GdkColor) strokeColor; +- (void) setStrokeColor:(GdkColor)color; +- (GdkColor) fillColor; +- (void) setFillColor:(GdkColor)color; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/NodeStyle+Gtk.m b/tikzit-1/src/gtk/NodeStyle+Gtk.m new file mode 100644 index 0000000..1954def --- /dev/null +++ b/tikzit-1/src/gtk/NodeStyle+Gtk.m @@ -0,0 +1,41 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "NodeStyle+Gtk.h" +#import "ColorRGB+Gtk.h" + +@implementation NodeStyle (Gtk) + +- (GdkColor) strokeColor { + return [[self strokeColorRGB] gdkColor]; +} + +- (void) setStrokeColor:(GdkColor)color { + [self setStrokeColorRGB:[ColorRGB colorWithGdkColor:color]]; +} + +- (GdkColor) fillColor { + return [[self fillColorRGB] gdkColor]; +} + +- (void) setFillColor:(GdkColor)color { + [self setFillColorRGB:[ColorRGB colorWithGdkColor:color]]; +} + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/NodeStyle+Render.h b/tikzit-1/src/gtk/NodeStyle+Render.h new file mode 100644 index 0000000..00edd27 --- /dev/null +++ b/tikzit-1/src/gtk/NodeStyle+Render.h @@ -0,0 +1,30 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import "NodeStyle.h" +#import "RenderContext.h" +#import "Surface.h" + +@interface NodeStyle (Render) + +- (void) renderToSurface:(id)surface withContext:(id)context at:(NSPoint)p; +- (BOOL) hitByPoint:(NSPoint)p onSurface:(id)surface; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/NodeStyle+Storage.h b/tikzit-1/src/gtk/NodeStyle+Storage.h new file mode 100644 index 0000000..7649414 --- /dev/null +++ b/tikzit-1/src/gtk/NodeStyle+Storage.h @@ -0,0 +1,29 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import "NodeStyle.h" +#import "Configuration.h" + +@interface NodeStyle (Storage) + +- (id) initFromConfigurationGroup:(NSString*)groupName config:(Configuration*)configFile; +- (void) storeToConfigurationGroup:(NSString*)groupName config:(Configuration*)configFile; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/NodeStyle+Storage.m b/tikzit-1/src/gtk/NodeStyle+Storage.m new file mode 100644 index 0000000..088b062 --- /dev/null +++ b/tikzit-1/src/gtk/NodeStyle+Storage.m @@ -0,0 +1,62 @@ +/* + * Copyright 2011 Alex Merry + * Copyright 2010 Chris Heunen + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "NodeStyle+Storage.h" +#import "ColorRGB+IntegerListStorage.h" + +@implementation NodeStyle (Storage) + +- (id) initFromConfigurationGroup:(NSString*)groupName config:(Configuration*)configFile { + self = [self init]; + + if (self) { + [self setName:[configFile stringEntry:@"Name" inGroup:groupName withDefault:name]]; + [self setCategory:[configFile stringEntry:@"Category" inGroup:groupName withDefault:category]]; + [self setShapeName:[configFile stringEntry:@"ShapeName" inGroup:groupName withDefault:shapeName]]; + [self setScale:[configFile doubleEntry:@"Scale" inGroup:groupName withDefault:scale]]; + [self setStrokeThickness:[configFile integerEntry:@"StrokeThickness" + inGroup:groupName + withDefault:strokeThickness]]; + [self setStrokeColorRGB: + [ColorRGB colorFromValueList: + [configFile integerListEntry:@"StrokeColor" + inGroup:groupName + withDefault:[strokeColorRGB valueList]]]]; + [self setFillColorRGB: + [ColorRGB colorFromValueList: + [configFile integerListEntry:@"FillColor" + inGroup:groupName + withDefault:[fillColorRGB valueList]]]]; + } + + return self; +} + +- (void) storeToConfigurationGroup:(NSString*)groupName config:(Configuration*)configFile { + [configFile setStringEntry:@"Name" inGroup:groupName value:[self name]]; + [configFile setStringEntry:@"Category" inGroup:groupName value:[self category]]; + [configFile setStringEntry:@"ShapeName" inGroup:groupName value:[self shapeName]]; + [configFile setDoubleEntry:@"Scale" inGroup:groupName value:[self scale]]; + [configFile setIntegerEntry:@"StrokeThickness" inGroup:groupName value:[self strokeThickness]]; + [configFile setIntegerListEntry:@"StrokeColor" inGroup:groupName value:[[self strokeColorRGB] valueList]]; + [configFile setIntegerListEntry:@"FillColor" inGroup:groupName value:[[self fillColorRGB] valueList]]; +} + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/NodeStyleEditor.h b/tikzit-1/src/gtk/NodeStyleEditor.h new file mode 100644 index 0000000..b45c992 --- /dev/null +++ b/tikzit-1/src/gtk/NodeStyleEditor.h @@ -0,0 +1,45 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import + +@class NodeStyle; + +@interface NodeStyleEditor: NSObject { + NodeStyle *style; + GtkTable *table; + GtkEntry *nameEdit; + GtkComboBox *shapeNameCombo; + GtkColorButton *strokeColorButton; + GtkWidget *makeStrokeTexSafeButton; + GtkColorButton *fillColorButton; + GtkWidget *makeFillTexSafeButton; + GtkAdjustment *scaleAdj; + BOOL blockSignals; +} + +@property (retain) NodeStyle *style; +@property (readonly) GtkWidget *widget; + +- (id) init; + +- (void) selectNameField; + +@end + +// vim:ft=objc:ts=4:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/NodeStyleEditor.m b/tikzit-1/src/gtk/NodeStyleEditor.m new file mode 100644 index 0000000..fcf4147 --- /dev/null +++ b/tikzit-1/src/gtk/NodeStyleEditor.m @@ -0,0 +1,477 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "NodeStyleEditor.h" +#import "NodeStyle.h" +#import "NodeStyle+Gtk.h" +#import "Shape.h" + +static const guint row_count = 5; + +// {{{ Internal interfaces +// {{{ GTK+ Callbacks +static void style_name_edit_changed_cb (GtkEditable *widget, NodeStyleEditor *editor); +static void style_shape_combo_changed_cb (GtkComboBox *widget, NodeStyleEditor *editor); +static void stroke_color_changed_cb (GtkColorButton *widget, NodeStyleEditor *editor); +static void fill_color_changed_cb (GtkColorButton *widget, NodeStyleEditor *editor); +static void make_stroke_safe_button_clicked_cb (GtkButton *widget, NodeStyleEditor *editor); +static void make_fill_safe_button_clicked_cb (GtkButton *widget, NodeStyleEditor *editor); +static void scale_adjustment_changed_cb (GtkAdjustment *widget, NodeStyleEditor *editor); +// }}} +// {{{ Notifications + +@interface NodeStyleEditor (Notifications) +- (void) shapeDictionaryReplaced:(NSNotification*)n; +- (void) nameChangedTo:(NSString*)value; +- (void) shapeNameChangedTo:(NSString*)value; +- (void) strokeColorChangedTo:(GdkColor)value; +- (void) makeStrokeColorTexSafe; +- (void) fillColorChangedTo:(GdkColor)value; +- (void) makeFillColorTexSafe; +- (void) scaleChangedTo:(double)value; +@end + +// }}} +// {{{ Private + +@interface NodeStyleEditor (Private) +- (void) loadShapeNames; +- (void) setActiveShapeName:(NSString*)name; +@end + +// }}} +// }}} +// {{{ API + +@implementation NodeStyleEditor + +- (void) _addWidget:(GtkWidget*)w withLabel:(gchar *)label atRow:(guint)row { + NSAssert(row < row_count, @"row_count is wrong!"); + + GtkWidget *l = gtk_label_new (label); + gtk_misc_set_alignment (GTK_MISC (l), 0, 0.5); + gtk_widget_show (l); + gtk_widget_show (w); + + gtk_table_attach (table, l, + 0, 1, row, row+1, // l, r, t, b + GTK_FILL, // x opts + GTK_FILL | GTK_EXPAND, // y opts + 5, // x padding + 0); // y padding + + gtk_table_attach (table, w, + 1, 2, row, row+1, // l, r, t, b + GTK_FILL | GTK_EXPAND, // x opts + GTK_FILL | GTK_EXPAND, // y opts + 0, // x padding + 0); // y padding +} + +- (GtkWidget*) _createMakeColorTexSafeButton:(NSString*)type { + GtkWidget *b = gtk_button_new (); + GtkWidget *icon = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_BUTTON); + gtk_widget_show (icon); + gtk_container_add (GTK_CONTAINER (b), icon); + NSString *ttip = [NSString stringWithFormat:@"The %@ colour is not a predefined TeX colour.\nClick here to choose the nearest TeX-safe colour.", type]; + gtk_widget_set_tooltip_text (b, [ttip UTF8String]); + return b; +} + +- (id) init { + self = [super init]; + + if (self != nil) { + style = nil; + table = GTK_TABLE (gtk_table_new (row_count, 2, FALSE)); + gtk_table_set_col_spacings (table, 6); + gtk_table_set_row_spacings (table, 6); + gtk_widget_set_sensitive (GTK_WIDGET (table), FALSE); + blockSignals = NO; + + /** + * Name + */ + nameEdit = GTK_ENTRY (gtk_entry_new ()); + g_object_ref_sink (nameEdit); + [self _addWidget:GTK_WIDGET (nameEdit) + withLabel:"Name" + atRow:0]; + g_signal_connect (G_OBJECT (nameEdit), + "changed", + G_CALLBACK (style_name_edit_changed_cb), + self); + + + /** + * Shape + */ + GtkListStore *store = gtk_list_store_new (1, G_TYPE_STRING); + shapeNameCombo = GTK_COMBO_BOX (gtk_combo_box_new_with_model (GTK_TREE_MODEL (store))); + GtkCellRenderer *cellRend = gtk_cell_renderer_text_new (); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (shapeNameCombo), + cellRend, + TRUE); + gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (shapeNameCombo), cellRend, "text", 0); + g_object_ref_sink (shapeNameCombo); + [self _addWidget:GTK_WIDGET (shapeNameCombo) + withLabel:"Shape" + atRow:1]; + g_signal_connect (G_OBJECT (shapeNameCombo), + "changed", + G_CALLBACK (style_shape_combo_changed_cb), + self); + + + /** + * Stroke colour + */ + GtkWidget *strokeBox = gtk_hbox_new (FALSE, 0); + [self _addWidget:strokeBox + withLabel:"Stroke colour" + atRow:2]; + strokeColorButton = GTK_COLOR_BUTTON (gtk_color_button_new ()); + g_object_ref_sink (strokeColorButton); + gtk_widget_show (GTK_WIDGET (strokeColorButton)); + gtk_box_pack_start (GTK_BOX (strokeBox), GTK_WIDGET (strokeColorButton), + FALSE, FALSE, 0); + makeStrokeTexSafeButton = [self _createMakeColorTexSafeButton:@"stroke"]; + g_object_ref_sink (makeStrokeTexSafeButton); + gtk_box_pack_start (GTK_BOX (strokeBox), makeStrokeTexSafeButton, + FALSE, FALSE, 0); + g_signal_connect (G_OBJECT (strokeColorButton), + "color-set", + G_CALLBACK (stroke_color_changed_cb), + self); + g_signal_connect (G_OBJECT (makeStrokeTexSafeButton), + "clicked", + G_CALLBACK (make_stroke_safe_button_clicked_cb), + self); + + + /** + * Fill colour + */ + GtkWidget *fillBox = gtk_hbox_new (FALSE, 0); + [self _addWidget:fillBox + withLabel:"Fill colour" + atRow:3]; + fillColorButton = GTK_COLOR_BUTTON (gtk_color_button_new ()); + g_object_ref_sink (fillColorButton); + gtk_widget_show (GTK_WIDGET (fillColorButton)); + gtk_box_pack_start (GTK_BOX (fillBox), GTK_WIDGET (fillColorButton), + FALSE, FALSE, 0); + makeFillTexSafeButton = [self _createMakeColorTexSafeButton:@"fill"]; + g_object_ref_sink (makeFillTexSafeButton); + gtk_box_pack_start (GTK_BOX (fillBox), makeFillTexSafeButton, + FALSE, FALSE, 0); + g_signal_connect (G_OBJECT (fillColorButton), + "color-set", + G_CALLBACK (fill_color_changed_cb), + self); + g_signal_connect (G_OBJECT (makeFillTexSafeButton), + "clicked", + G_CALLBACK (make_fill_safe_button_clicked_cb), + self); + + + /** + * Scale + */ + scaleAdj = GTK_ADJUSTMENT (gtk_adjustment_new ( + 1.0, // value + 0.0, // lower + 50.0, // upper + 0.20, // step + 1.0, // page + 0.0)); // (irrelevant) + g_object_ref_sink (scaleAdj); + GtkWidget *scaleSpin = gtk_spin_button_new (scaleAdj, 0.0, 2); + [self _addWidget:scaleSpin + withLabel:"Scale" + atRow:4]; + g_signal_connect (G_OBJECT (scaleAdj), + "value-changed", + G_CALLBACK (scale_adjustment_changed_cb), + self); + + [self loadShapeNames]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(shapeDictionaryReplaced:) + name:@"ShapeDictionaryReplaced" + object:[Shape class]]; + } + + return self; +} + +- (void) dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + + g_object_unref (nameEdit); + g_object_unref (shapeNameCombo); + g_object_unref (strokeColorButton); + g_object_unref (makeStrokeTexSafeButton); + g_object_unref (fillColorButton); + g_object_unref (makeFillTexSafeButton); + g_object_unref (scaleAdj); + g_object_unref (table); + [style release]; + + [super dealloc]; +} + +- (NodeStyle*) style { + return style; +} + +- (void) setStyle:(NodeStyle*)s { + blockSignals = YES; + NodeStyle *oldStyle = style; + style = [s retain]; + + if (style != nil) { + gtk_widget_set_sensitive (GTK_WIDGET (table), TRUE); + + gtk_entry_set_text(nameEdit, [[style name] UTF8String]); + + [self setActiveShapeName:[style shapeName]]; + + GdkColor c = [style strokeColor]; + gtk_color_button_set_color(strokeColorButton, &c); + + gtk_widget_set_visible (makeStrokeTexSafeButton, ([[style strokeColorRGB] name] == nil)); + + c = [style fillColor]; + gtk_color_button_set_color(fillColorButton, &c); + + gtk_widget_set_visible (makeFillTexSafeButton, ([[style fillColorRGB] name] == nil)); + + gtk_adjustment_set_value(scaleAdj, [style scale]); + } else { + gtk_entry_set_text(nameEdit, ""); + [self setActiveShapeName:nil]; + gtk_widget_set_visible (makeStrokeTexSafeButton, FALSE); + gtk_widget_set_visible (makeFillTexSafeButton, FALSE); + gtk_adjustment_set_value(scaleAdj, 1.0); + gtk_widget_set_sensitive (GTK_WIDGET (table), FALSE); + } + + [oldStyle release]; + blockSignals = NO; +} + +- (GtkWidget*) widget { + return GTK_WIDGET (table); +} + +- (void) selectNameField { + gtk_widget_grab_focus (GTK_WIDGET (nameEdit)); + gtk_editable_select_region (GTK_EDITABLE (nameEdit), 0, -1); +} + +@end + +// }}} +// {{{ Notifications + +@implementation NodeStyleEditor (Notifications) +- (void) shapeDictionaryReplaced:(NSNotification*)n { + blockSignals = YES; + + [self loadShapeNames]; + [self setActiveShapeName:[style shapeName]]; + + blockSignals = NO; +} + +- (void) nameChangedTo:(NSString*)value { + [style setName:value]; +} + +- (void) shapeNameChangedTo:(NSString*)value { + [style setShapeName:value]; +} + +- (void) strokeColorChangedTo:(GdkColor)value { + [style setStrokeColor:value]; + gtk_widget_set_visible (makeStrokeTexSafeButton, + [[style strokeColorRGB] name] == nil); +} + +- (void) makeStrokeColorTexSafe { + if (style != nil) { + [[style strokeColorRGB] setToClosestHashed]; + GdkColor color = [style strokeColor]; + gtk_color_button_set_color(strokeColorButton, &color); + gtk_widget_set_visible (makeStrokeTexSafeButton, FALSE); + } +} + +- (void) fillColorChangedTo:(GdkColor)value { + [style setFillColor:value]; + gtk_widget_set_visible (makeFillTexSafeButton, + [[style fillColorRGB] name] == nil); +} + +- (void) makeFillColorTexSafe { + if (style != nil) { + [[style fillColorRGB] setToClosestHashed]; + GdkColor color = [style fillColor]; + gtk_color_button_set_color(fillColorButton, &color); + gtk_widget_set_visible (makeFillTexSafeButton, FALSE); + } +} + +- (void) scaleChangedTo:(double)value { + [style setScale:value]; +} +@end + +// }}} +// {{{ Private + +@implementation NodeStyleEditor (Private) +- (BOOL) signalsBlocked { return blockSignals; } + +- (void) loadShapeNames { + blockSignals = YES; + + gtk_combo_box_set_active (shapeNameCombo, -1); + + GtkListStore *list = GTK_LIST_STORE (gtk_combo_box_get_model (shapeNameCombo)); + gtk_list_store_clear (list); + + NSEnumerator *en = [[Shape shapeDictionary] keyEnumerator]; + NSString *shapeName; + GtkTreeIter iter; + while ((shapeName = [en nextObject]) != nil) { + gtk_list_store_append (list, &iter); + gtk_list_store_set (list, &iter, 0, [shapeName UTF8String], -1); + } + + blockSignals = NO; +} + +- (void) setActiveShapeName:(NSString*)name { + if (name == nil) { + gtk_combo_box_set_active (shapeNameCombo, -1); + return; + } + const gchar *shapeName = [name UTF8String]; + + GtkTreeModel *model = gtk_combo_box_get_model (shapeNameCombo); + GtkTreeIter iter; + if (gtk_tree_model_get_iter_first (model, &iter)) { + do { + gchar *rowShapeName; + gtk_tree_model_get (model, &iter, 0, &rowShapeName, -1); + if (g_strcmp0 (shapeName, rowShapeName) == 0) { + gtk_combo_box_set_active_iter (shapeNameCombo, &iter); + g_free (rowShapeName); + return; + } + g_free (rowShapeName); + } while (gtk_tree_model_iter_next (model, &iter)); + } +} +@end + +// }}} +// {{{ GTK+ callbacks + +static void style_name_edit_changed_cb (GtkEditable *widget, NodeStyleEditor *editor) { + if ([editor signalsBlocked]) + return; + + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + const gchar *contents = gtk_entry_get_text (GTK_ENTRY (widget)); + [editor nameChangedTo:[NSString stringWithUTF8String:contents]]; + + [pool drain]; +} + +static void style_shape_combo_changed_cb (GtkComboBox *widget, NodeStyleEditor *editor) { + if ([editor signalsBlocked]) + return; + + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + GtkTreeIter iter; + gtk_combo_box_get_active_iter (widget, &iter); + gchar *shapeName = NULL; + gtk_tree_model_get (gtk_combo_box_get_model (widget), &iter, 0, &shapeName, -1); + [editor shapeNameChangedTo:[NSString stringWithUTF8String:shapeName]]; + g_free (shapeName); + + [pool drain]; +} + +static void stroke_color_changed_cb (GtkColorButton *widget, NodeStyleEditor *editor) { + if ([editor signalsBlocked]) + return; + + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + GdkColor color; + gtk_color_button_get_color (widget, &color); + [editor strokeColorChangedTo:color]; + + [pool drain]; +} + +static void fill_color_changed_cb (GtkColorButton *widget, NodeStyleEditor *editor) { + if ([editor signalsBlocked]) + return; + + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + GdkColor color; + gtk_color_button_get_color (widget, &color); + [editor fillColorChangedTo:color]; + + [pool drain]; +} + +static void make_stroke_safe_button_clicked_cb (GtkButton *widget, NodeStyleEditor *editor) { + if ([editor signalsBlocked]) + return; + + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [editor makeStrokeColorTexSafe]; + [pool drain]; +} + +static void make_fill_safe_button_clicked_cb (GtkButton *widget, NodeStyleEditor *editor) { + if ([editor signalsBlocked]) + return; + + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [editor makeFillColorTexSafe]; + [pool drain]; +} + +static void scale_adjustment_changed_cb (GtkAdjustment *adj, NodeStyleEditor *editor) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [editor scaleChangedTo:gtk_adjustment_get_value (adj)]; + [pool drain]; +} + +// }}} + +// vim:ft=objc:ts=4:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/NodeStyleSelector.h b/tikzit-1/src/gtk/NodeStyleSelector.h new file mode 100644 index 0000000..a699dc8 --- /dev/null +++ b/tikzit-1/src/gtk/NodeStyleSelector.h @@ -0,0 +1,61 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import + +@class NodeStyle; +@class NodeStylesModel; +@class StyleManager; + +@interface NodeStyleSelector: NSObject { + NodeStylesModel *model; + GtkIconView *view; +} + +/*! + @property widget + @brief The GTK widget + */ +@property (readonly) GtkWidget *widget; + +/*! + @property model + @brief The model to use. + */ +@property (retain) NodeStylesModel *model; + +/*! + @property selectedStyle + @brief The selected style. + + When this changes, a SelectedStyleChanged notification will be posted + */ +@property (assign) NodeStyle *selectedStyle; + +/*! + * Initialise with a new model for the given style manager + */ +- (id) initWithStyleManager:(StyleManager*)manager; +/*! + * Initialise with the given model + */ +- (id) initWithModel:(NodeStylesModel*)model; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/NodeStyleSelector.m b/tikzit-1/src/gtk/NodeStyleSelector.m new file mode 100644 index 0000000..14cdc75 --- /dev/null +++ b/tikzit-1/src/gtk/NodeStyleSelector.m @@ -0,0 +1,135 @@ +/* + * Copyright 2011-2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "NodeStyleSelector.h" + +#import "NodeStylesModel.h" + +// {{{ Internal interfaces +static void selection_changed_cb (GtkIconView *widget, NodeStyleSelector *mgr); +// }}} +// {{{ API + +@implementation NodeStyleSelector + +- (id) init { + [self release]; + return nil; +} + +- (id) initWithStyleManager:(StyleManager*)m { + return [self initWithModel:[NodeStylesModel modelWithStyleManager:m]]; +} +- (id) initWithModel:(NodeStylesModel*)m { + self = [super init]; + + if (self) { + model = [m retain]; + + view = GTK_ICON_VIEW (gtk_icon_view_new ()); + g_object_ref_sink (view); + + gtk_icon_view_set_model (view, [model model]); + gtk_icon_view_set_pixbuf_column (view, NODE_STYLES_ICON_COL); + gtk_icon_view_set_tooltip_column (view, NODE_STYLES_NAME_COL); + gtk_icon_view_set_selection_mode (view, GTK_SELECTION_SINGLE); + + g_signal_connect (G_OBJECT (view), + "selection-changed", + G_CALLBACK (selection_changed_cb), + self); + } + + return self; +} + +- (void) dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + + g_object_unref (view); + [model release]; + + [super dealloc]; +} + +- (NodeStylesModel*) model { + return model; +} + +- (void) setModel:(NodeStylesModel*)m { + if (m == model) + return; + + NodeStylesModel *oldModel = model; + model = [m retain]; + gtk_icon_view_set_model (view, [model model]); + [oldModel release]; +} + +- (GtkWidget*) widget { + return GTK_WIDGET (view); +} + +- (NodeStyle*) selectedStyle { + GList *list = gtk_icon_view_get_selected_items (view); + if (!list) { + return nil; + } + if (list->next != NULL) { + NSLog(@"Multiple selected items in NodeStyleSelector!"); + } + + GtkTreePath *path = (GtkTreePath*) list->data; + NodeStyle *style = [model styleFromPath:path]; + + g_list_foreach (list, (GFunc)gtk_tree_path_free, NULL); + g_list_free (list); + + return style; +} + +- (void) setSelectedStyle:(NodeStyle*)style { + if (style == nil) { + gtk_icon_view_unselect_all (view); + return; + } + + GtkTreePath *path = [model pathFromStyle:style]; + if (path) { + gtk_icon_view_unselect_all (view); + gtk_icon_view_select_path (view, path); + gtk_tree_path_free (path); + } +} + +@end + +// }}} +// {{{ GTK+ callbacks + +static void selection_changed_cb (GtkIconView *view, NodeStyleSelector *mgr) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + [[NSNotificationCenter defaultCenter] + postNotificationName:@"SelectedStyleChanged" + object:mgr]; + + [pool drain]; +} +// }}} + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/NodeStylesModel.h b/tikzit-1/src/gtk/NodeStylesModel.h new file mode 100644 index 0000000..a048560 --- /dev/null +++ b/tikzit-1/src/gtk/NodeStylesModel.h @@ -0,0 +1,62 @@ +/* + * Copyright 2011-2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import + +@class NodeStyle; +@class StyleManager; + +enum { + NODE_STYLES_NAME_COL = 0, + NODE_STYLES_ICON_COL, + NODE_STYLES_PTR_COL, + NODE_STYLES_N_COLS +}; + +@interface NodeStylesModel: NSObject { + GtkListStore *store; + StyleManager *styleManager; +} + +/*! + @property model + @brief The GTK+ tree model + */ +@property (readonly) GtkTreeModel *model; + +/*! + @property manager + @brief The StyleManager to use. + */ +@property (retain) StyleManager *styleManager; + +/*! + * Initialise with the given style manager + */ +- (id) initWithStyleManager:(StyleManager*)m; + ++ (id) modelWithStyleManager:(StyleManager*)m; + +- (NodeStyle*) styleFromPath:(GtkTreePath*)path; +- (GtkTreePath*) pathFromStyle:(NodeStyle*)style; +- (NodeStyle*) styleFromIter:(GtkTreeIter*)iter; +- (GtkTreeIter*) iterFromStyle:(NodeStyle*)style; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/NodeStylesModel.m b/tikzit-1/src/gtk/NodeStylesModel.m new file mode 100644 index 0000000..3cc5771 --- /dev/null +++ b/tikzit-1/src/gtk/NodeStylesModel.m @@ -0,0 +1,381 @@ +/* + * Copyright 2011-2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "NodeStylesModel.h" + +#import "CairoRenderContext.h" +#import "NodeStyle.h" +#import "Shape.h" +#import "Shape+Render.h" +#import "ShapeNames.h" +#import "StyleManager.h" + +#import "gtkhelpers.h" + +#import + +// {{{ Internal interfaces + +@interface NodeStylesModel (Notifications) +- (void) nodeStylesReplaced:(NSNotification*)notification; +- (void) nodeStyleAdded:(NSNotification*)notification; +- (void) nodeStyleRemoved:(NSNotification*)notification; +- (void) shapeDictionaryReplaced:(NSNotification*)n; +- (void) observeValueForKeyPath:(NSString*)keyPath + ofObject:(id)object + change:(NSDictionary*)change + context:(void*)context; +@end + +@interface NodeStylesModel (Private) +- (cairo_surface_t*) createNodeIconSurface; +- (GdkPixbuf*) pixbufOfNodeInStyle:(NodeStyle*)style; +- (GdkPixbuf*) pixbufOfNodeInStyle:(NodeStyle*)style usingSurface:(cairo_surface_t*)surface; +- (void) addNodeStyle:(NodeStyle*)style; +- (void) addNodeStyle:(NodeStyle*)style usingSurface:(cairo_surface_t*)surface; +- (void) observeNodeStyle:(NodeStyle*)style; +- (void) stopObservingNodeStyle:(NodeStyle*)style; +- (void) clearNodeStylesModel; +- (void) reloadNodeStyles; +@end + +// }}} +// {{{ API + +@implementation NodeStylesModel + ++ (id) modelWithStyleManager:(StyleManager*)m { + return [[[self alloc] initWithStyleManager:m] autorelease]; +} + +- (id) init { + [self release]; + return nil; +} + +- (id) initWithStyleManager:(StyleManager*)m { + self = [super init]; + + if (self) { + store = gtk_list_store_new (NODE_STYLES_N_COLS, + G_TYPE_STRING, + GDK_TYPE_PIXBUF, + G_TYPE_POINTER); + g_object_ref_sink (store); + + [self setStyleManager:m]; + + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(shapeDictionaryReplaced:) + name:@"ShapeDictionaryReplaced" + object:[Shape class]]; + } + + return self; +} + +- (void) dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + + [self clearNodeStylesModel]; + g_object_unref (store); + [styleManager release]; + + [super dealloc]; +} + +- (StyleManager*) styleManager { + return styleManager; +} + +- (void) setStyleManager:(StyleManager*)m { + if (m == nil) { + [NSException raise:NSInvalidArgumentException format:@"Style manager cannot be nil"]; + } + [m retain]; + + [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:styleManager]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(nodeStylesReplaced:) + name:@"NodeStylesReplaced" + object:m]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(nodeStyleAdded:) + name:@"NodeStyleAdded" + object:m]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(nodeStyleRemoved:) + name:@"NodeStyleRemoved" + object:m]; + + [styleManager release]; + styleManager = m; + + [self reloadNodeStyles]; +} + +- (GtkTreeModel*) model { + return GTK_TREE_MODEL (store); +} + +- (NodeStyle*) styleFromPath:(GtkTreePath*)path { + GtkTreeIter iter; + gtk_tree_model_get_iter (GTK_TREE_MODEL (store), &iter, path); + NodeStyle *style = nil; + gtk_tree_model_get (GTK_TREE_MODEL (store), &iter, NODE_STYLES_PTR_COL, &style, -1); + return style; +} + +- (GtkTreePath*) pathFromStyle:(NodeStyle*)style { + GtkTreeModel *m = GTK_TREE_MODEL (store); + GtkTreeIter row; + if (gtk_tree_model_get_iter_first (m, &row)) { + do { + NodeStyle *rowStyle; + gtk_tree_model_get (m, &row, NODE_STYLES_PTR_COL, &rowStyle, -1); + if (style == rowStyle) { + return gtk_tree_model_get_path (m, &row); + } + } while (gtk_tree_model_iter_next (m, &row)); + } + return NULL; +} + +- (NodeStyle*) styleFromIter:(GtkTreeIter*)iter { + NodeStyle *style = nil; + gtk_tree_model_get (GTK_TREE_MODEL (store), iter, NODE_STYLES_PTR_COL, &style, -1); + return style; +} + +- (GtkTreeIter*) iterFromStyle:(NodeStyle*)style { + GtkTreeModel *m = GTK_TREE_MODEL (store); + GtkTreeIter row; + if (gtk_tree_model_get_iter_first (m, &row)) { + do { + NodeStyle *rowStyle; + gtk_tree_model_get (m, &row, NODE_STYLES_PTR_COL, &rowStyle, -1); + if (style == rowStyle) { + return gtk_tree_iter_copy (&row); + } + } while (gtk_tree_model_iter_next (m, &row)); + } + return NULL; +} +@end + +// }}} +// {{{ Notifications + +@implementation NodeStylesModel (Notifications) + +- (void) nodeStylesReplaced:(NSNotification*)notification { + [self reloadNodeStyles]; +} + +- (void) nodeStyleAdded:(NSNotification*)notification { + [self addNodeStyle:[[notification userInfo] objectForKey:@"style"]]; +} + +- (void) nodeStyleRemoved:(NSNotification*)notification { + NodeStyle *style = [[notification userInfo] objectForKey:@"style"]; + + GtkTreeModel *model = GTK_TREE_MODEL (store); + GtkTreeIter row; + if (gtk_tree_model_get_iter_first (model, &row)) { + do { + NodeStyle *rowStyle; + gtk_tree_model_get (model, &row, NODE_STYLES_PTR_COL, &rowStyle, -1); + if (style == rowStyle) { + gtk_list_store_remove (store, &row); + [self stopObservingNodeStyle:rowStyle]; + [rowStyle release]; + return; + } + } while (gtk_tree_model_iter_next (model, &row)); + } +} + +- (void) observeValueForKeyPath:(NSString*)keyPath + ofObject:(id)object + change:(NSDictionary*)change + context:(void*)context +{ + if ([object class] == [NodeStyle class]) { + NodeStyle *style = object; + + GtkTreeModel *model = GTK_TREE_MODEL (store); + GtkTreeIter row; + if (gtk_tree_model_get_iter_first (model, &row)) { + do { + NodeStyle *rowStyle; + gtk_tree_model_get (model, &row, NODE_STYLES_PTR_COL, &rowStyle, -1); + if (style == rowStyle) { + if ([@"name" isEqual:keyPath]) { + gtk_list_store_set (store, &row, NODE_STYLES_NAME_COL, [[style name] UTF8String], -1); + } else { + GdkPixbuf *pixbuf = [self pixbufOfNodeInStyle:style]; + gtk_list_store_set (store, &row, NODE_STYLES_ICON_COL, pixbuf, -1); + g_object_unref (pixbuf); + } + } + } while (gtk_tree_model_iter_next (model, &row)); + } + } +} + +- (void) shapeDictionaryReplaced:(NSNotification*)n { + [self reloadNodeStyles]; +} +@end + +// }}} +// {{{ Private + +@implementation NodeStylesModel (Private) +- (cairo_surface_t*) createNodeIconSurface { + return cairo_image_surface_create (CAIRO_FORMAT_ARGB32, 24, 24); +} + +- (GdkPixbuf*) pixbufOfNodeInStyle:(NodeStyle*)style { + cairo_surface_t *surface = [self createNodeIconSurface]; + GdkPixbuf *pixbuf = [self pixbufOfNodeInStyle:style usingSurface:surface]; + cairo_surface_destroy (surface); + return pixbuf; +} + +- (GdkPixbuf*) pixbufOfNodeInStyle:(NodeStyle*)style usingSurface:(cairo_surface_t*)surface { + Shape *shape = [Shape shapeForName:[style shapeName]]; + + int width = cairo_image_surface_get_width (surface); + int height = cairo_image_surface_get_height (surface); + NSRect pixbufBounds = NSMakeRect(0.0, 0.0, width, height); + const CGFloat lineWidth = [style strokeThickness]; + Transformer *shapeTrans = [Transformer transformerToFit:[shape boundingRect] + intoScreenRect:NSInsetRect(pixbufBounds, lineWidth, lineWidth) + flippedAboutXAxis:YES]; + if ([style scale] < 1.0) + [shapeTrans setScale:[style scale] * [shapeTrans scale]]; + + CairoRenderContext *context = [[CairoRenderContext alloc] initForSurface:surface]; + [context clearSurface]; + [shape drawPathWithTransform:shapeTrans andContext:context]; + [context setLineWidth:lineWidth]; + [context strokePathWithColor:[[style strokeColorRGB] rColor] + andFillWithColor:[[style fillColorRGB] rColor]]; + [context release]; + + return pixbuf_get_from_surface (surface); +} + +- (void) addNodeStyle:(NodeStyle*)style usingSurface:(cairo_surface_t*)surface { + GtkTreeIter iter; + gtk_list_store_append (store, &iter); + + GdkPixbuf *pixbuf = [self pixbufOfNodeInStyle:style usingSurface:surface]; + gtk_list_store_set (store, &iter, + NODE_STYLES_NAME_COL, [[style name] UTF8String], + NODE_STYLES_ICON_COL, pixbuf, + NODE_STYLES_PTR_COL, (gpointer)[style retain], + -1); + g_object_unref (pixbuf); + [self observeNodeStyle:style]; +} + +- (void) addNodeStyle:(NodeStyle*)style { + cairo_surface_t *surface = [self createNodeIconSurface]; + [self addNodeStyle:style usingSurface:surface]; + cairo_surface_destroy (surface); +} + +- (void) observeNodeStyle:(NodeStyle*)style { + [style addObserver:self + forKeyPath:@"name" + options:NSKeyValueObservingOptionNew + context:NULL]; + [style addObserver:self + forKeyPath:@"strokeThickness" + options:0 + context:NULL]; + [style addObserver:self + forKeyPath:@"strokeColorRGB.red" + options:0 + context:NULL]; + [style addObserver:self + forKeyPath:@"strokeColorRGB.green" + options:0 + context:NULL]; + [style addObserver:self + forKeyPath:@"strokeColorRGB.blue" + options:0 + context:NULL]; + [style addObserver:self + forKeyPath:@"fillColorRGB.red" + options:0 + context:NULL]; + [style addObserver:self + forKeyPath:@"fillColorRGB.green" + options:0 + context:NULL]; + [style addObserver:self + forKeyPath:@"fillColorRGB.blue" + options:0 + context:NULL]; + [style addObserver:self + forKeyPath:@"shapeName" + options:0 + context:NULL]; +} + +- (void) stopObservingNodeStyle:(NodeStyle*)style { + [style removeObserver:self forKeyPath:@"name"]; + [style removeObserver:self forKeyPath:@"strokeThickness"]; + [style removeObserver:self forKeyPath:@"strokeColorRGB.red"]; + [style removeObserver:self forKeyPath:@"strokeColorRGB.green"]; + [style removeObserver:self forKeyPath:@"strokeColorRGB.blue"]; + [style removeObserver:self forKeyPath:@"fillColorRGB.red"]; + [style removeObserver:self forKeyPath:@"fillColorRGB.green"]; + [style removeObserver:self forKeyPath:@"fillColorRGB.blue"]; + [style removeObserver:self forKeyPath:@"shapeName"]; +} + +- (void) clearNodeStylesModel { + GtkTreeModel *model = GTK_TREE_MODEL (store); + GtkTreeIter row; + if (gtk_tree_model_get_iter_first (model, &row)) { + do { + NodeStyle *rowStyle; + gtk_tree_model_get (model, &row, NODE_STYLES_PTR_COL, &rowStyle, -1); + [self stopObservingNodeStyle:rowStyle]; + [rowStyle release]; + } while (gtk_tree_model_iter_next (model, &row)); + } + gtk_list_store_clear (store); +} + +- (void) reloadNodeStyles { + [self clearNodeStylesModel]; + cairo_surface_t *surface = [self createNodeIconSurface]; + for (NodeStyle *style in [styleManager nodeStyles]) { + [self addNodeStyle:style usingSurface:surface]; + } + cairo_surface_destroy (surface); +} +@end + +// }}} + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/NodeStylesPalette.h b/tikzit-1/src/gtk/NodeStylesPalette.h new file mode 100644 index 0000000..ac712ea --- /dev/null +++ b/tikzit-1/src/gtk/NodeStylesPalette.h @@ -0,0 +1,43 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import + +@class StyleManager; +@class NodeStyleSelector; +@class NodeStyleEditor; + +@interface NodeStylesPalette: NSObject { + NodeStyleSelector *selector; + NodeStyleEditor *editor; + + GtkWidget *palette; + + GtkWidget *removeStyleButton; + GtkWidget *applyStyleButton; + GtkWidget *clearStyleButton; +} + +@property (retain) StyleManager *styleManager; +@property (readonly) GtkWidget *widget; + +- (id) initWithManager:(StyleManager*)m; + +@end + +// vim:ft=objc:ts=4:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/NodeStylesPalette.m b/tikzit-1/src/gtk/NodeStylesPalette.m new file mode 100644 index 0000000..e28edbb --- /dev/null +++ b/tikzit-1/src/gtk/NodeStylesPalette.m @@ -0,0 +1,197 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "NodeStylesPalette.h" + +#import "NodeStyleSelector.h" +#import "NodeStyleEditor.h" +#import "NodeStylesModel.h" +#import "StyleManager.h" + +// {{{ Internal interfaces +// {{{ GTK+ Callbacks +static void add_style_button_cb (GtkButton *widget, NodeStylesPalette *palette); +static void remove_style_button_cb (GtkButton *widget, NodeStylesPalette *palette); +// }}} +// {{{ Notifications + +@interface NodeStylesPalette (Notifications) +- (void) selectedStyleChanged:(NSNotification*)notification; +@end + +// }}} +// {{{ Private + +@interface NodeStylesPalette (Private) +- (void) updateButtonState; +- (void) removeSelectedStyle; +- (void) addStyle; +@end + +// }}} +// }}} +// {{{ API + +@implementation NodeStylesPalette + +@synthesize widget=palette; + +- (id) init { + [self release]; + return nil; +} + +- (id) initWithManager:(StyleManager*)m { + self = [super init]; + + if (self) { + selector = [[NodeStyleSelector alloc] initWithStyleManager:m]; + editor = [[NodeStyleEditor alloc] init]; + + palette = gtk_vbox_new (FALSE, 6); + gtk_container_set_border_width (GTK_CONTAINER (palette), 6); + g_object_ref_sink (palette); + + GtkWidget *mainBox = gtk_hbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (palette), mainBox, FALSE, FALSE, 0); + gtk_widget_show (mainBox); + + GtkWidget *selectorScroller = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (selectorScroller), + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); + GtkWidget *selectorFrame = gtk_frame_new (NULL); + gtk_container_add (GTK_CONTAINER (selectorScroller), [selector widget]); + gtk_container_add (GTK_CONTAINER (selectorFrame), selectorScroller); + gtk_box_pack_start (GTK_BOX (mainBox), selectorFrame, TRUE, TRUE, 0); + gtk_widget_show (selectorScroller); + gtk_widget_show (selectorFrame); + gtk_widget_show ([selector widget]); + + gtk_box_pack_start (GTK_BOX (mainBox), [editor widget], TRUE, TRUE, 0); + gtk_widget_show ([editor widget]); + + GtkBox *buttonBox = GTK_BOX (gtk_hbox_new(FALSE, 0)); + gtk_box_pack_start (GTK_BOX (palette), GTK_WIDGET (buttonBox), FALSE, FALSE, 0); + + GtkWidget *addStyleButton = gtk_button_new (); + gtk_widget_set_tooltip_text (addStyleButton, "Add a new style"); + GtkWidget *addIcon = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON); + gtk_container_add (GTK_CONTAINER (addStyleButton), addIcon); + gtk_box_pack_start (buttonBox, addStyleButton, FALSE, FALSE, 0); + g_signal_connect (G_OBJECT (addStyleButton), + "clicked", + G_CALLBACK (add_style_button_cb), + self); + + removeStyleButton = gtk_button_new (); + g_object_ref_sink (removeStyleButton); + gtk_widget_set_tooltip_text (removeStyleButton, "Delete selected style"); + GtkWidget *removeIcon = gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_BUTTON); + gtk_container_add (GTK_CONTAINER (removeStyleButton), removeIcon); + gtk_box_pack_start (buttonBox, removeStyleButton, FALSE, FALSE, 0); + g_signal_connect (G_OBJECT (removeStyleButton), + "clicked", + G_CALLBACK (remove_style_button_cb), + self); + + gtk_widget_show_all (GTK_WIDGET (buttonBox)); + + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(selectedStyleChanged:) + name:@"SelectedStyleChanged" + object:selector]; + + [self updateButtonState]; + } + + return self; +} + +- (StyleManager*) styleManager { + return [[selector model] styleManager]; +} + +- (void) setStyleManager:(StyleManager*)m { + [[selector model] setStyleManager:m]; +} + +- (void) dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + [editor release]; + [selector release]; + g_object_unref (palette); + g_object_unref (removeStyleButton); + + [super dealloc]; +} + +@end + +// }}} +// {{{ Notifications + +@implementation NodeStylesPalette (Notifications) +- (void) selectedStyleChanged:(NSNotification*)notification { + [editor setStyle:[selector selectedStyle]]; + [self updateButtonState]; +} +@end + +// }}} +// {{{ Private + +@implementation NodeStylesPalette (Private) +- (void) updateButtonState { + gboolean hasStyleSelection = [selector selectedStyle] != nil; + + gtk_widget_set_sensitive (removeStyleButton, hasStyleSelection); +} + +- (void) removeSelectedStyle { + NodeStyle *style = [selector selectedStyle]; + if (style) + [[[selector model] styleManager] removeNodeStyle:style]; +} + +- (void) addStyle { + NodeStyle *newStyle = [NodeStyle defaultNodeStyleWithName:@"newstyle"]; + [[self styleManager] addNodeStyle:newStyle]; + [selector setSelectedStyle:newStyle]; + [editor selectNameField]; +} + +@end + +// }}} +// {{{ GTK+ callbacks + +static void add_style_button_cb (GtkButton *widget, NodeStylesPalette *palette) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [palette addStyle]; + [pool drain]; +} + +static void remove_style_button_cb (GtkButton *widget, NodeStylesPalette *palette) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [palette removeSelectedStyle]; + [pool drain]; +} + +// }}} + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/PreambleEditor.h b/tikzit-1/src/gtk/PreambleEditor.h new file mode 100644 index 0000000..f181446 --- /dev/null +++ b/tikzit-1/src/gtk/PreambleEditor.h @@ -0,0 +1,51 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import + +@class Preambles; + +@interface PreambleEditor: NSObject { + Preambles *preambles; + + // we don't keep any refs, as we control + // the top window + GtkWindow *parentWindow; + GtkWindow *window; + GtkListStore *preambleListStore; + GtkTreeView *preambleSelector; + GtkTextView *preambleView; + BOOL blockSignals; + BOOL adding; +} + +- (id) initWithPreambles:(Preambles*)p; + +- (void) setParentWindow:(GtkWindow*)parent; + +- (Preambles*) preambles; + +- (void) present; +- (void) show; +- (void) hide; +- (BOOL) isVisible; +- (void) setVisible:(BOOL)visible; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/PreambleEditor.m b/tikzit-1/src/gtk/PreambleEditor.m new file mode 100644 index 0000000..d1f72ee --- /dev/null +++ b/tikzit-1/src/gtk/PreambleEditor.m @@ -0,0 +1,568 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "PreambleEditor.h" + +#import "Application.h" +#import "Preambles.h" +#import + +enum { + NAME_COLUMN, + IS_CUSTOM_COLUMN, + N_COLUMNS +}; + +// {{{ Internal interfaces +// {{{ Signals +static gboolean window_delete_event_cb (GtkWidget *widget, + GdkEvent *event, + PreambleEditor *editor); +static gboolean window_focus_out_event_cb (GtkWidget *widget, + GdkEvent *event, + PreambleEditor *editor); +static void close_button_clicked_cb (GtkButton *widget, PreambleEditor *editor); +static void add_button_clicked_cb (GtkButton *widget, PreambleEditor *editor); +static void remove_button_clicked_cb (GtkButton *widget, PreambleEditor *editor); +/* +static void undo_button_clicked_cb (GtkButton *widget, PreambleEditor *editor); +static void redo_button_clicked_cb (GtkButton *widget, PreambleEditor *editor); +*/ +static void preamble_name_edited_cb (GtkCellRendererText *renderer, + gchar *path, + gchar *new_text, + PreambleEditor *editor); +static void preamble_selection_changed_cb (GtkTreeSelection *treeselection, + PreambleEditor *editor); +// }}} + +@interface PreambleEditor (Private) +- (void) loadUi; +- (void) save; +- (void) revert; +- (void) update; +- (void) fillListStore; +- (BOOL) isDefaultPreambleSelected; +- (NSString*) selectedPreambleName; +- (void) addPreamble; +- (void) deletePreamble; +- (void) renamePreambleAtPath:(gchar*)path to:(gchar*)newValue; +- (void) nodeStylePropertyChanged:(NSNotification*)notification; +- (void) edgeStylePropertyChanged:(NSNotification*)notification; +@end + +// }}} +// {{{ API + +@implementation PreambleEditor + +- (id) init { + [self release]; + return nil; +} + +- (id) initWithPreambles:(Preambles*)p { + self = [super init]; + + if (self) { + preambles = [p retain]; + parentWindow = NULL; + window = NULL; + preambleView = NULL; + preambleSelector = NULL; + blockSignals = NO; + adding = NO; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(nodeStylePropertyChanged:) + name:@"NodeStylePropertyChanged" + object:nil]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(edgeStylePropertyChanged:) + name:@"EdgeStylePropertyChanged" + object:nil]; + } + + return self; +} + +- (Preambles*) preambles { + return preambles; +} + +- (void) setParentWindow:(GtkWindow*)parent { + GtkWindow *oldParent = parentWindow; + + if (parentWindow) + g_object_ref (parentWindow); + parentWindow = parent; + if (oldParent) + g_object_unref (oldParent); + + if (window) { + gtk_window_set_transient_for (window, parentWindow); + } +} + +- (void) present { + [self loadUi]; + gtk_window_present (GTK_WINDOW (window)); + [self revert]; +} + +- (void) show { + [self loadUi]; + gtk_widget_show (GTK_WIDGET (window)); + [self revert]; +} + +- (void) hide { + if (!window) { + return; + } + [self save]; + gtk_widget_hide (GTK_WIDGET (window)); +} + +- (BOOL) isVisible { + if (!window) { + return NO; + } + gboolean visible; + g_object_get (G_OBJECT (window), "visible", &visible, NULL); + return visible ? YES : NO; +} + +- (void) setVisible:(BOOL)visible { + if (visible) { + [self show]; + } else { + [self hide]; + } +} + +- (void) dealloc { + [preambles release]; + preambles = nil; + if (window) { + gtk_widget_destroy (GTK_WIDGET (window)); + window = NULL; + } + if (parentWindow) { + g_object_ref (parentWindow); + } + + [super dealloc]; +} + +@end + +// }}} +// {{{ Private + +@implementation PreambleEditor (Private) +- (GtkWidget*) createPreambleList { + preambleListStore = gtk_list_store_new (N_COLUMNS, G_TYPE_STRING, G_TYPE_BOOLEAN); + preambleSelector = GTK_TREE_VIEW (gtk_tree_view_new_with_model ( + GTK_TREE_MODEL (preambleListStore))); + gtk_widget_set_size_request (GTK_WIDGET (preambleSelector), 150, -1); + gtk_tree_view_set_headers_visible (preambleSelector, FALSE); + + GtkCellRenderer *renderer; + GtkTreeViewColumn *column; + + renderer = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes ("Preamble", + renderer, + "text", NAME_COLUMN, + "editable", IS_CUSTOM_COLUMN, + NULL); + gtk_tree_view_append_column (preambleSelector, column); + g_signal_connect (G_OBJECT (renderer), + "edited", + G_CALLBACK (preamble_name_edited_cb), + self); + + GtkWidget *listScroller = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (listScroller), + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); + gtk_container_add (GTK_CONTAINER (listScroller), + GTK_WIDGET (preambleSelector)); + + [self fillListStore]; + + GtkTreeSelection *sel = gtk_tree_view_get_selection (preambleSelector); + gtk_tree_selection_set_mode (sel, GTK_SELECTION_BROWSE); + g_signal_connect (G_OBJECT (sel), + "changed", + G_CALLBACK (preamble_selection_changed_cb), + self); + + return listScroller; +} + +- (void) loadUi { + if (window) { + return; + } + + window = GTK_WINDOW (gtk_window_new (GTK_WINDOW_TOPLEVEL)); + gtk_window_set_title (window, "Preamble editor"); + gtk_window_set_position (window, GTK_WIN_POS_CENTER_ON_PARENT); + gtk_window_set_default_size (window, 600, 400); + gtk_window_set_type_hint (window, GDK_WINDOW_TYPE_HINT_DIALOG); + if (parentWindow) { + gtk_window_set_transient_for (window, parentWindow); + } + GdkEventMask mask; + g_object_get (G_OBJECT (window), "events", &mask, NULL); + mask |= GDK_FOCUS_CHANGE_MASK; + g_object_set (G_OBJECT (window), "events", mask, NULL); + g_signal_connect (window, + "delete-event", + G_CALLBACK (window_delete_event_cb), + self); + g_signal_connect (window, + "focus-out-event", + G_CALLBACK (window_focus_out_event_cb), + self); + + GtkWidget *mainBox = gtk_vbox_new (FALSE, 18); + gtk_container_set_border_width (GTK_CONTAINER (mainBox), 12); + gtk_container_add (GTK_CONTAINER (window), mainBox); + + GtkPaned *paned = GTK_PANED (gtk_hpaned_new ()); + gtk_box_pack_start (GTK_BOX (mainBox), + GTK_WIDGET (paned), + TRUE, TRUE, 0); + + GtkWidget *listWidget = [self createPreambleList]; + GtkWidget *listFrame = gtk_frame_new (NULL); + gtk_container_add (GTK_CONTAINER (listFrame), listWidget); + + GtkBox *listBox = GTK_BOX (gtk_vbox_new (FALSE, 6)); + gtk_box_pack_start (listBox, listFrame, TRUE, TRUE, 0); + + GtkContainer *listButtonBox = GTK_CONTAINER (gtk_hbox_new (FALSE, 6)); + gtk_box_pack_start (listBox, GTK_WIDGET (listButtonBox), FALSE, TRUE, 0); + GtkWidget *addButton = gtk_button_new_from_stock (GTK_STOCK_ADD); + g_signal_connect (addButton, + "clicked", + G_CALLBACK (add_button_clicked_cb), + self); + gtk_container_add (listButtonBox, addButton); + GtkWidget *removeButton = gtk_button_new_from_stock (GTK_STOCK_REMOVE); + g_signal_connect (removeButton, + "clicked", + G_CALLBACK (remove_button_clicked_cb), + self); + gtk_container_add (listButtonBox, removeButton); + + gtk_paned_pack1 (paned, GTK_WIDGET (listBox), FALSE, TRUE); + + preambleView = GTK_TEXT_VIEW (gtk_text_view_new ()); + gtk_text_view_set_left_margin (preambleView, 3); + gtk_text_view_set_right_margin (preambleView, 3); + GtkWidget *scroller = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroller), + GTK_POLICY_AUTOMATIC, // horiz + GTK_POLICY_ALWAYS); // vert + gtk_container_add (GTK_CONTAINER (scroller), GTK_WIDGET (preambleView)); + GtkWidget *editorFrame = gtk_frame_new (NULL); + gtk_container_add (GTK_CONTAINER (editorFrame), scroller); + gtk_paned_pack2 (paned, editorFrame, TRUE, TRUE); + + GtkContainer *buttonBox = GTK_CONTAINER (gtk_hbutton_box_new ()); + gtk_box_set_spacing (GTK_BOX (buttonBox), 6); + gtk_button_box_set_layout (GTK_BUTTON_BOX (buttonBox), GTK_BUTTONBOX_END); + gtk_box_pack_start (GTK_BOX (mainBox), + GTK_WIDGET (buttonBox), + FALSE, TRUE, 0); + GtkWidget *closeButton = gtk_button_new_from_stock (GTK_STOCK_CLOSE); + gtk_container_add (buttonBox, closeButton); + g_signal_connect (closeButton, + "clicked", + G_CALLBACK (close_button_clicked_cb), + self); + /* + GtkWidget *undoButton = gtk_button_new_from_stock (GTK_STOCK_UNDO); + gtk_container_add (buttonBox, undoButton); + gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (buttonBox), + undoButton, + TRUE); + g_signal_connect (undoButton, + "clicked", + G_CALLBACK (undo_button_clicked_cb), + self); + GtkWidget *redoButton = gtk_button_new_from_stock (GTK_STOCK_REDO); + gtk_container_add (buttonBox, redoButton); + gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (buttonBox), + redoButton, + TRUE); + g_signal_connect (redoButton, + "clicked", + G_CALLBACK (redo_button_clicked_cb), + self); + */ + [self revert]; + + gtk_widget_show_all (mainBox); +} + +- (void) save { + if (!preambleView) + return; + if ([self isDefaultPreambleSelected]) + return; + GtkTextIter start,end; + GtkTextBuffer *preambleBuffer = gtk_text_view_get_buffer (preambleView); + gtk_text_buffer_get_bounds(preambleBuffer, &start, &end); + gchar *text = gtk_text_buffer_get_text(preambleBuffer, &start, &end, FALSE); + NSString *preamble = [NSString stringWithUTF8String:text]; + g_free (text); + [preambles setCurrentPreamble:preamble]; + [app saveConfiguration]; +} + +- (void) revert { + if (!preambleView) + return; + GtkTextBuffer *preambleBuffer = gtk_text_view_get_buffer (preambleView); + gtk_text_buffer_set_text (preambleBuffer, [[preambles currentPreamble] UTF8String], -1); + gtk_text_view_set_editable (preambleView, ![self isDefaultPreambleSelected]); +} + +- (void) update { + if (!blockSignals) { + [self save]; + } + GtkTreeSelection *sel = gtk_tree_view_get_selection (preambleSelector); + GtkTreeIter row; + GtkTreeModel *model; + if (gtk_tree_selection_get_selected (sel, &model, &row)) { + gchar *name; + gtk_tree_model_get (model, &row, NAME_COLUMN, &name, -1); + NSString *preambleName = [NSString stringWithUTF8String:name]; + [preambles setSelectedPreambleName:preambleName]; + g_free (name); + } + [self revert]; +} + +- (void) fillListStore { + blockSignals = YES; + + GtkTreeIter row; + gtk_list_store_clear (preambleListStore); + + gtk_list_store_append (preambleListStore, &row); + gtk_list_store_set (preambleListStore, &row, + NAME_COLUMN, [[preambles defaultPreambleName] UTF8String], + IS_CUSTOM_COLUMN, FALSE, + -1); + GtkTreeSelection *sel = gtk_tree_view_get_selection (preambleSelector); + if ([self isDefaultPreambleSelected]) { + gtk_tree_selection_select_iter (sel, &row); + } + + NSEnumerator *en = [preambles customPreambleNameEnumerator]; + NSString *preambleName; + while ((preambleName = [en nextObject])) { + gtk_list_store_append (preambleListStore, &row); + gtk_list_store_set (preambleListStore, &row, + NAME_COLUMN, [preambleName UTF8String], + IS_CUSTOM_COLUMN, TRUE, + -1); + if ([preambleName isEqualToString:[self selectedPreambleName]]) { + gtk_tree_selection_select_iter (sel, &row); + } + } + + blockSignals = NO; +} + +- (BOOL) isDefaultPreambleSelected { + return [preambles selectedPreambleIsDefault]; +} + +- (NSString*) selectedPreambleName { + return [preambles selectedPreambleName]; +} + +- (void) addPreamble { + NSString *newName = [preambles addPreamble]; + + GtkTreeIter row; + gtk_list_store_append (preambleListStore, &row); + gtk_list_store_set (preambleListStore, &row, + NAME_COLUMN, [newName UTF8String], + IS_CUSTOM_COLUMN, TRUE, + -1); + + GtkTreeSelection *sel = gtk_tree_view_get_selection (preambleSelector); + gtk_tree_selection_select_iter (sel, &row); +} + +- (void) deletePreamble { + if ([self isDefaultPreambleSelected]) + return; + + NSString *name = [self selectedPreambleName]; + + GtkTreeIter row; + GtkTreeModel *model = GTK_TREE_MODEL (preambleListStore); + + gtk_tree_model_get_iter_first (model, &row); + // ignore first; it is the default one + gboolean found = FALSE; + while (!found && gtk_tree_model_iter_next (model, &row)) { + gchar *candidate; + gtk_tree_model_get (model, &row, NAME_COLUMN, &candidate, -1); + if (g_strcmp0 (candidate, [name UTF8String]) == 0) { + found = TRUE; + } + g_free (candidate); + } + + if (!found) + return; + + if (![preambles removePreamble:name]) + return; + + blockSignals = YES; + + gboolean had_next = gtk_list_store_remove (preambleListStore, &row); + if (!had_next) { + // select the last item + gint length = gtk_tree_model_iter_n_children (model, NULL); + gtk_tree_model_iter_nth_child (model, &row, NULL, length - 1); + } + + GtkTreeSelection *sel = gtk_tree_view_get_selection (preambleSelector); + gtk_tree_selection_select_iter (sel, &row); + + [self revert]; + + blockSignals = NO; +} + +- (void) renamePreambleAtPath:(gchar*)path to:(gchar*)newValue { + NSString *newName = [NSString stringWithUTF8String:newValue]; + + GtkTreeIter row; + GtkTreeModel *model = GTK_TREE_MODEL (preambleListStore); + + if (!gtk_tree_model_get_iter_from_string (model, &row, path)) + return; + + gchar *oldValue; + gtk_tree_model_get (model, &row, NAME_COLUMN, &oldValue, -1); + + NSString* oldName = [NSString stringWithUTF8String:oldValue]; + if ([preambles renamePreambleFrom:oldName to:newName]) { + gtk_list_store_set (preambleListStore, &row, + NAME_COLUMN, newValue, + -1); + } +} + +- (void) nodeStylePropertyChanged:(NSNotification*)notification { + if ([self isDefaultPreambleSelected]) { + [self revert]; + } +} + +- (void) edgeStylePropertyChanged:(NSNotification*)notification { + if ([self isDefaultPreambleSelected]) { + [self revert]; + } +} +@end + +// }}} +// {{{ GTK+ callbacks + +static gboolean window_delete_event_cb (GtkWidget *widget, + GdkEvent *event, + PreambleEditor *editor) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [editor hide]; + [pool drain]; + return TRUE; // we dealt with this event +} + +static gboolean window_focus_out_event_cb (GtkWidget *widget, + GdkEvent *event, + PreambleEditor *editor) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [editor save]; + [pool drain]; + return FALSE; +} + +static void close_button_clicked_cb (GtkButton *widget, PreambleEditor *editor) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [editor hide]; + [pool drain]; +} + +static void add_button_clicked_cb (GtkButton *widget, PreambleEditor *editor) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [editor addPreamble]; + [pool drain]; +} + +static void remove_button_clicked_cb (GtkButton *widget, PreambleEditor *editor) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [editor deletePreamble]; + [pool drain]; +} + +/* +static void undo_button_clicked_cb (GtkButton *widget, PreambleEditor *editor) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + NSLog(@"Undo"); + [pool drain]; +} + +static void redo_button_clicked_cb (GtkButton *widget, PreambleEditor *editor) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + NSLog(@"Redo"); + [pool drain]; +} +*/ + +static void preamble_name_edited_cb (GtkCellRendererText *renderer, + gchar *path, + gchar *new_text, + PreambleEditor *editor) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [editor renamePreambleAtPath:path to:new_text]; + [pool drain]; +} + +static void preamble_selection_changed_cb (GtkTreeSelection *treeselection, + PreambleEditor *editor) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [editor update]; + [pool drain]; +} + +// }}} + +// vim:ft=objc:ts=4:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/Preambles+Storage.h b/tikzit-1/src/gtk/Preambles+Storage.h new file mode 100644 index 0000000..76f56cc --- /dev/null +++ b/tikzit-1/src/gtk/Preambles+Storage.h @@ -0,0 +1,29 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "Preambles.h" + +@interface Preambles (Storage) + ++ (Preambles*) preamblesFromDirectory:(NSString*)directory; +- (id) initFromDirectory:(NSString*)directory; +- (void) loadFromDirectory:(NSString*)directory; +- (void) storeToDirectory:(NSString*)directory; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/Preambles+Storage.m b/tikzit-1/src/gtk/Preambles+Storage.m new file mode 100644 index 0000000..bd3ea03 --- /dev/null +++ b/tikzit-1/src/gtk/Preambles+Storage.m @@ -0,0 +1,84 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "Preambles+Storage.h" + +static NSString *ext = @"preamble"; + +@implementation Preambles (Storage) + ++ (Preambles*) preamblesFromDirectory:(NSString*)directory { + return [[[self alloc] initFromDirectory:directory] autorelease]; +} + +- (id) initFromDirectory:(NSString*)directory { + BOOL isDir = NO; + if ([[NSFileManager defaultManager] fileExistsAtPath:directory isDirectory:&isDir] && isDir) { + self = [super init]; + + if (self) { + selectedPreambleName = @"default"; + preambleDict = nil; + [self loadFromDirectory:directory]; + } + } else { + self = [self init]; + } + + return self; +} + +- (void) loadFromDirectory:(NSString*)directory { + preambleDict = [[NSMutableDictionary alloc] initWithCapacity:1]; + NSDirectoryEnumerator *en = [[NSFileManager defaultManager] enumeratorAtPath:directory]; + NSString *filename; + while ((filename = [en nextObject]) != nil) { + if ([filename hasSuffix:ext] && [[en fileAttributes] fileType] == NSFileTypeRegular) { + NSString *path = [directory stringByAppendingPathComponent:filename]; + NSString *contents = [NSString stringWithContentsOfFile:path]; + if (contents) { + [preambleDict setObject:contents forKey:[filename stringByDeletingPathExtension]]; + } + } + } +} + +- (void) storeToDirectory:(NSString*)directory { + NSDirectoryEnumerator *den = [[NSFileManager defaultManager] enumeratorAtPath:directory]; + NSString *filename; + while ((filename = [den nextObject]) != nil) { + if ([filename hasSuffix:ext] && [[den fileAttributes] fileType] == NSFileTypeRegular) { + NSString *path = [directory stringByAppendingPathComponent:filename]; + NSString *entry = [filename stringByDeletingPathExtension]; + if ([preambleDict objectForKey:entry] == nil) { + [[NSFileManager defaultManager] removeFileAtPath:path handler:nil]; + } + } + } + + NSEnumerator *en = [self customPreambleNameEnumerator]; + NSString *entry; + while ((entry = [en nextObject]) != nil) { + NSString *path = [directory stringByAppendingPathComponent:[entry stringByAppendingPathExtension:ext]]; + NSString *contents = [preambleDict objectForKey:entry]; + [contents writeToFile:path atomically:YES]; + } +} + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/PreviewRenderer.h b/tikzit-1/src/gtk/PreviewRenderer.h new file mode 100644 index 0000000..d691722 --- /dev/null +++ b/tikzit-1/src/gtk/PreviewRenderer.h @@ -0,0 +1,48 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import + +#import "Surface.h" + +@class Configuration; +@class Preambles; +@class TikzDocument; + +@interface PreviewRenderer: NSObject { + Configuration *config; + Preambles *preambles; + TikzDocument *document; + PopplerDocument *pdfDocument; + PopplerPage *pdfPage; +} + +@property (readonly) Preambles *preambles; +@property (retain) TikzDocument *document; +@property (readonly) double height; +@property (readonly) double width; + +- (id) initWithPreambles:(Preambles*)p config:(Configuration*)c; + +- (BOOL) updateWithError:(NSError**)error; +- (BOOL) update; +- (BOOL) isValid; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/PreviewRenderer.m b/tikzit-1/src/gtk/PreviewRenderer.m new file mode 100644 index 0000000..28113d6 --- /dev/null +++ b/tikzit-1/src/gtk/PreviewRenderer.m @@ -0,0 +1,250 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "PreviewRenderer.h" + +#import "CairoRenderContext.h" +#import "Configuration.h" +#import "Preambles.h" +#import "TikzDocument.h" + +@implementation PreviewRenderer + +@synthesize preambles, document; + +- (id) init { + [self release]; + return nil; +} + +- (id) initWithPreambles:(Preambles*)p config:(Configuration*)c { + self = [super init]; + + if (self) { + document = nil; + config = [c retain]; + preambles = [p retain]; + pdfDocument = NULL; + pdfPage = NULL; + } + + return self; +} + +- (void) dealloc { + [document release]; + [config release]; + [preambles release]; + + if (pdfDocument) { + g_object_unref (pdfDocument); + pdfDocument = NULL; + } + if (pdfPage) { + g_object_unref (pdfPage); + pdfPage = NULL; + } + + [super dealloc]; +} + +- (BOOL) update { + NSError *error = nil; + BOOL result = [self updateWithError:&error]; + if (error) { + logError (error, @"Could not update preview"); + if ([error code] == TZ_ERR_TOOL_FAILED) { + NSLog (@"Output: %@", [[error userInfo] objectForKey:TZToolOutputErrorKey]); + } + } + return result; +} + +- (BOOL) updateWithError:(NSError**)error { + if (document == nil) { + if (error) { + *error = [NSError errorWithMessage:@"No document given" code:TZ_ERR_BADSTATE]; + } + if (pdfDocument) { + g_object_unref (pdfDocument); + pdfDocument = NULL; + } + if (pdfPage) { + g_object_unref (pdfPage); + pdfPage = NULL; + } + return NO; + } + + NSString *tex = [preambles buildDocumentForTikz:[document tikz]]; + + NSString *tempDir = [[NSFileManager defaultManager] createTempDirectoryWithError:error]; + if (!tempDir) { + if (error) { + *error = [NSError errorWithMessage:@"Could not create temporary directory" code:TZ_ERR_IO cause:*error]; + } + return NO; + } + + // write tex code to temporary file + NSString *texFile = [NSString stringWithFormat:@"%@/tikzit.tex", tempDir]; + NSString *pdfFile = [NSString stringWithFormat:@"file://%@/tikzit.pdf", tempDir]; + [tex writeToFile:texFile atomically:YES]; + + NSTask *latexTask = [[NSTask alloc] init]; + [latexTask setCurrentDirectoryPath:tempDir]; + + // GNUStep is clever enough to use PATH + NSString *path = [config stringEntry:@"pdflatex" + inGroup:@"Previews" + withDefault:@"pdflatex"]; + [latexTask setLaunchPath:path]; + + NSArray *args = [NSArray arrayWithObjects: + @"-fmt=latex", + @"-output-format=pdf", + @"-interaction=nonstopmode", + @"-halt-on-error", + texFile, + nil]; + [latexTask setArguments:args]; + + NSPipe *pout = [NSPipe pipe]; + [latexTask setStandardOutput:pout]; + + NSFileHandle *latexOut = [pout fileHandleForReading]; + + BOOL success = NO; + + NS_DURING { + [latexTask launch]; + [latexTask waitUntilExit]; + } NS_HANDLER { + NSLog(@"Failed to run '%@'; error was: %@", path, [localException reason]); + (void)localException; + if (error) { + NSString *desc = [NSString stringWithFormat:@"Failed to run '%@'", path]; + NSMutableDictionary *errorDetail = [NSMutableDictionary dictionaryWithCapacity:2]; + [errorDetail setValue:desc forKey:NSLocalizedDescriptionKey]; + *error = [NSError errorWithDomain:TZErrorDomain code:TZ_ERR_IO userInfo:errorDetail]; + } + + // remove all temporary files + [[NSFileManager defaultManager] removeFileAtPath:tempDir handler:NULL]; + [latexTask release]; + + return NO; + } NS_ENDHANDLER + + if ([latexTask terminationStatus] != 0) { + if (error) { + NSData *data = [latexOut readDataToEndOfFile]; + NSString *str = [[NSString alloc] initWithData:data + encoding:NSUTF8StringEncoding]; + NSMutableDictionary *errorDetail = [NSMutableDictionary dictionaryWithCapacity:2]; + [errorDetail setValue:@"Generating a PDF file with pdflatex failed" forKey:NSLocalizedDescriptionKey]; + [errorDetail setValue:str forKey:TZToolOutputErrorKey]; + *error = [NSError errorWithDomain:TZErrorDomain code:TZ_ERR_TOOL_FAILED userInfo:errorDetail]; + [str release]; + } + } else { + // load pdf document + GError* gerror = NULL; + pdfDocument = poppler_document_new_from_file([pdfFile UTF8String], NULL, &gerror); + if (!pdfDocument) { + if (error) { + *error = [NSError errorWithMessage:[NSString stringWithFormat:@"Could not load PDF document", pdfFile] + code:TZ_ERR_IO + cause:[NSError errorWithGError:gerror]]; + } + g_error_free(gerror); + } else { + pdfPage = poppler_document_get_page(pdfDocument, 0); + if(!pdfPage) { + if (error) { + *error = [NSError errorWithMessage:@"Could not open first page of PDF document" + code:TZ_ERR_OTHER]; + } + g_object_unref(pdfDocument); + } else { + success = YES; + } + } + } + + // remove all temporary files + [[NSFileManager defaultManager] removeFileAtPath:tempDir handler:NULL]; + [latexTask release]; + + return success; +} + +- (BOOL) isValid { + return pdfPage ? YES : NO; +} + +- (double) width { + double w = 0.0; + if (pdfPage) + poppler_page_get_size(pdfPage, &w, NULL); + return w; +} + +- (double) height { + double h = 0.0; + if (pdfPage) + poppler_page_get_size(pdfPage, NULL, &h); + return h; +} + +- (void) renderWithContext:(id)c onSurface:(id)surface { + if (document != nil && pdfPage) { + CairoRenderContext *context = (CairoRenderContext*)c; + + double w = 0.0; + double h = 0.0; + poppler_page_get_size(pdfPage, &w, &h); + if (w==0) w = 1.0; + if (h==0) h = 1.0; + + double scale = ([surface height] / h) * 0.95; + if (w * scale > [surface width]) scale = [surface width] / w; + [[surface transformer] setScale:scale]; + + NSPoint origin; + w *= scale; + h *= scale; + origin.x = ([surface width] - w) / 2; + origin.y = ([surface height] - h) / 2; + + [[surface transformer] setOrigin:origin]; + + [context saveState]; + [context applyTransform:[surface transformer]]; + + // white-out + [context paintWithColor:WhiteRColor]; + + poppler_page_render (pdfPage, [context cairoContext]); + + [context restoreState]; + } +} + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/PreviewWindow.h b/tikzit-1/src/gtk/PreviewWindow.h new file mode 100644 index 0000000..8bcd3e5 --- /dev/null +++ b/tikzit-1/src/gtk/PreviewWindow.h @@ -0,0 +1,51 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import + +@class Configuration; +@class Preambles; +@class PreviewRenderer; +@class TikzDocument; +@class WidgetSurface; + +@interface PreviewWindow: NSObject { + PreviewRenderer *previewer; + GtkWindow *window; + WidgetSurface *surface; + GtkWindow *parent; +} + +- (id) initWithPreambles:(Preambles*)p config:(Configuration*)c; + +- (void) setParentWindow:(GtkWindow*)parent; + +- (TikzDocument*) document; +- (void) setDocument:(TikzDocument*)doc; + +- (BOOL) update; + +- (void) present; +- (void) show; +- (void) hide; +- (BOOL) isVisible; +- (void) setVisible:(BOOL)visible; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/PreviewWindow.m b/tikzit-1/src/gtk/PreviewWindow.m new file mode 100644 index 0000000..fc0e7a3 --- /dev/null +++ b/tikzit-1/src/gtk/PreviewWindow.m @@ -0,0 +1,195 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "PreviewWindow.h" + +#import "Preambles.h" +#import "PreviewRenderer.h" +#import "TikzDocument.h" +#import "WidgetSurface.h" + +#import "gtkhelpers.h" + +@interface PreviewWindow (Private) +- (BOOL) updateOrShowError; +- (void) updateDefaultSize; +@end + +// {{{ API + +@implementation PreviewWindow + +- (id) init { + [self release]; + return nil; +} + +- (id) initWithPreambles:(Preambles*)p config:(Configuration*)c { + self = [super init]; + + if (self) { + parent = NULL; + previewer = [[PreviewRenderer alloc] initWithPreambles:p config:c]; + + window = GTK_WINDOW (gtk_window_new (GTK_WINDOW_TOPLEVEL)); + gtk_window_set_title (window, "Preview"); + gtk_window_set_resizable (window, TRUE); + gtk_window_set_default_size (window, 150.0, 150.0); + g_signal_connect (G_OBJECT (window), + "delete-event", + G_CALLBACK (gtk_widget_hide_on_delete), + NULL); + + GtkWidget *pdfArea = gtk_drawing_area_new (); + gtk_container_add (GTK_CONTAINER (window), pdfArea); + gtk_widget_show (pdfArea); + surface = [[WidgetSurface alloc] initWithWidget:pdfArea]; + [surface setRenderDelegate:previewer]; + Transformer *t = [surface transformer]; + [t setFlippedAboutXAxis:![t isFlippedAboutXAxis]]; + } + + return self; +} + +- (void) setParentWindow:(GtkWindow*)p { + parent = p; + gtk_window_set_transient_for (window, p); + if (p != NULL) { + gtk_window_set_position (window, GTK_WIN_POS_CENTER_ON_PARENT); + } +} + +- (TikzDocument*) document { + return [previewer document]; +} + +- (void) setDocument:(TikzDocument*)doc { + [previewer setDocument:doc]; +} + +- (void) present { + if ([self updateOrShowError]) { + [self updateDefaultSize]; + gtk_window_present (GTK_WINDOW (window)); + [surface invalidate]; + } +} + +- (BOOL) update { + if ([self updateOrShowError]) { + [self updateDefaultSize]; + return YES; + } + + return NO; +} + +- (void) show { + if ([self updateOrShowError]) { + [self updateDefaultSize]; + gtk_widget_show (GTK_WIDGET (window)); + [surface invalidate]; + } +} + +- (void) hide { + gtk_widget_hide (GTK_WIDGET (window)); +} + +- (BOOL) isVisible { + gboolean visible; + g_object_get (G_OBJECT (window), "visible", &visible, NULL); + return visible ? YES : NO; +} + +- (void) setVisible:(BOOL)visible { + if (visible) { + [self show]; + } else { + [self hide]; + } +} + +- (void) dealloc { + gtk_widget_destroy (GTK_WIDGET (window)); + [previewer release]; + [surface release]; + + [super dealloc]; +} + +@end +// }}} + +@implementation PreviewWindow (Private) +- (BOOL) updateOrShowError { + NSError *error = nil; + if (![previewer updateWithError:&error]) { + GtkWindow *dparent = gtk_widget_get_visible (GTK_WIDGET (window)) + ? window + : parent; + GtkWidget *dialog = gtk_message_dialog_new (dparent, + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_CLOSE, + "Failed to generate the preview: %s", + [[error localizedDescription] UTF8String]); +#if GTK_CHECK_VERSION(2,22,0) + if ([error code] == TZ_ERR_TOOL_FAILED) { + GtkBox *box = GTK_BOX (gtk_message_dialog_get_message_area (GTK_MESSAGE_DIALOG (dialog))); + GtkWidget *label = gtk_label_new ("pdflatex said:"); + gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5f); + gtk_widget_show (label); + gtk_box_pack_start (box, label, FALSE, TRUE, 0); + + GtkWidget *view = gtk_text_view_new (); + GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)); + gtk_text_buffer_set_text (buffer, [[error toolOutput] UTF8String], -1); + gtk_text_view_set_editable (GTK_TEXT_VIEW (view), FALSE); + gtk_widget_show (view); + GtkWidget *scrolledView = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledView), + GTK_POLICY_NEVER, // horiz + GTK_POLICY_ALWAYS); // vert + gtk_widget_set_size_request (scrolledView, -1, 120); + gtk_container_add (GTK_CONTAINER (scrolledView), view); + gtk_widget_show (scrolledView); + gtk_box_pack_start (box, scrolledView, TRUE, TRUE, 0); + } +#endif // GTK+ 2.22.0 + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + return NO; + } + return YES; +} + +- (void) updateDefaultSize { + double width = 150; + double height = 150; + if ([previewer isValid]) { + double pWidth = [previewer width]; + double pHeight = [previewer height]; + width = (width < pWidth + 4) ? pWidth + 4 : width; + height = (height < pHeight + 4) ? pHeight + 4 : height; + } + gtk_window_set_default_size (window, width, height); +} +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/PropertiesPane.h b/tikzit-1/src/gtk/PropertiesPane.h new file mode 100644 index 0000000..c76efae --- /dev/null +++ b/tikzit-1/src/gtk/PropertiesPane.h @@ -0,0 +1,69 @@ +/* + * Copyright 2011-2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import + +@class Configuration; +@class EdgePropertyDelegate; +@class EdgeStylesModel; +@class GraphPropertyDelegate; +@class NodePropertyDelegate; +@class NodeStylesModel; +@class PropertyListEditor; +@class StyleManager; +@class TikzDocument; + +@interface PropertiesPane: NSObject { + TikzDocument *document; + BOOL blockUpdates; + + PropertyListEditor *graphProps; + PropertyListEditor *nodeProps; + PropertyListEditor *edgeProps; + PropertyListEditor *edgeNodeProps; + + GraphPropertyDelegate *graphPropDelegate; + NodePropertyDelegate *nodePropDelegate; + EdgePropertyDelegate *edgePropDelegate; + + GtkWidget *layout; + + GtkWidget *currentPropsWidget; // no ref! + + GtkWidget *graphPropsWidget; + GtkWidget *nodePropsWidget; + GtkWidget *edgePropsWidget; + + GtkEntry *nodeLabelEntry; + GtkToggleButton *edgeNodeToggle; + GtkWidget *edgeNodePropsWidget; + GtkEntry *edgeNodeLabelEntry; + GtkEntry *edgeSourceAnchorEntry; + GtkEntry *edgeTargetAnchorEntry; +} + +@property (retain) TikzDocument *document; +@property (assign) BOOL visible; +@property (readonly) GtkWidget *gtkWidget; + +- (void) loadConfiguration:(Configuration*)config; +- (void) saveConfiguration:(Configuration*)config; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/PropertiesPane.m b/tikzit-1/src/gtk/PropertiesPane.m new file mode 100644 index 0000000..ba43298 --- /dev/null +++ b/tikzit-1/src/gtk/PropertiesPane.m @@ -0,0 +1,763 @@ +/* + * Copyright 2011-2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "PropertiesPane.h" + +#import "GraphElementProperty.h" +#import "PropertyListEditor.h" +#import "TikzDocument.h" + +#import "gtkhelpers.h" + +// {{{ Internal interfaces +// {{{ GTK+ helpers +static GtkWidget *createLabelledEntry (const gchar *labelText, GtkEntry **entry); +static GtkWidget *createPropsPaneWithLabelEntry (PropertyListEditor *props, GtkEntry **labelEntry); +static GtkWidget *createBoldLabel (const gchar *text); +// }}} +// {{{ GTK+ callbacks +static void node_label_changed_cb (GtkEditable *widget, PropertiesPane *pane); +static void edge_node_label_changed_cb (GtkEditable *widget, PropertiesPane *pane); +static void edge_node_toggled_cb (GtkToggleButton *widget, PropertiesPane *pane); +static void edge_source_anchor_changed_cb (GtkEditable *widget, PropertiesPane *pane); +static void edge_target_anchor_changed_cb (GtkEditable *widget, PropertiesPane *pane); +// }}} + +@interface PropertiesPane (Notifications) +- (void) nodeSelectionChanged:(NSNotification*)n; +- (void) edgeSelectionChanged:(NSNotification*)n; +- (void) graphChanged:(NSNotification*)n; +- (void) nodeLabelEdited:(NSString*)newValue; +- (void) edgeNodeLabelEdited:(NSString*)newValue; +- (void) edgeNodeToggled:(BOOL)newValue; +- (BOOL) edgeSourceAnchorEdited:(NSString*)newValue; +- (BOOL) edgeTargetAnchorEdited:(NSString*)newValue; +@end + +@interface PropertiesPane (Private) +- (void) _updatePane; +- (void) _setDisplayedWidget:(GtkWidget*)widget; +@end + +// {{{ Delegates + +@interface GraphPropertyDelegate : NSObject { + TikzDocument *doc; +} +- (void) setDocument:(TikzDocument*)d; +@end + +@interface NodePropertyDelegate : NSObject { + TikzDocument *doc; + Node *node; +} +- (void) setDocument:(TikzDocument*)d; +- (void) setNode:(Node*)n; +@end + +@interface EdgePropertyDelegate : NSObject { + TikzDocument *doc; + Edge *edge; +} +- (void) setDocument:(TikzDocument*)d; +- (void) setEdge:(Edge*)e; +@end + +// }}} + +// }}} +// {{{ API + +@implementation PropertiesPane + +- (id) init { + self = [super init]; + + if (self) { + document = nil; + blockUpdates = NO; + + graphProps = [[PropertyListEditor alloc] init]; + graphPropDelegate = [[GraphPropertyDelegate alloc] init]; + [graphProps setDelegate:graphPropDelegate]; + + nodeProps = [[PropertyListEditor alloc] init]; + nodePropDelegate = [[NodePropertyDelegate alloc] init]; + [nodeProps setDelegate:nodePropDelegate]; + + edgeProps = [[PropertyListEditor alloc] init]; + edgePropDelegate = [[EdgePropertyDelegate alloc] init]; + [edgeProps setDelegate:edgePropDelegate]; + + edgeNodeProps = [[PropertyListEditor alloc] init]; + [edgeNodeProps setDelegate:edgePropDelegate]; + + layout = gtk_vbox_new (FALSE, 0); + g_object_ref_sink (layout); + gtk_widget_show (layout); + + /* + * Graph properties + */ + graphPropsWidget = gtk_vbox_new (FALSE, 6); + g_object_ref_sink (graphPropsWidget); + gtk_widget_show (graphPropsWidget); + + GtkWidget *label = createBoldLabel ("Graph properties"); + gtk_widget_show (label); + gtk_box_pack_start (GTK_BOX (graphPropsWidget), + label, + FALSE, FALSE, 0); + + gtk_widget_show ([graphProps widget]); + gtk_box_pack_start (GTK_BOX (graphPropsWidget), + [graphProps widget], + TRUE, TRUE, 0); + + gtk_box_pack_start (GTK_BOX (layout), + graphPropsWidget, + TRUE, TRUE, 0); + + + /* + * Node properties + */ + nodePropsWidget = gtk_vbox_new (FALSE, 6); + g_object_ref_sink (nodePropsWidget); + gtk_box_pack_start (GTK_BOX (layout), + nodePropsWidget, + TRUE, TRUE, 0); + + label = createBoldLabel ("Node properties"); + gtk_widget_show (label); + gtk_box_pack_start (GTK_BOX (nodePropsWidget), + label, + FALSE, FALSE, 0); + + GtkWidget *labelWidget = createLabelledEntry ("Label", &nodeLabelEntry); + gtk_widget_show (labelWidget); + gtk_box_pack_start (GTK_BOX (nodePropsWidget), + labelWidget, + FALSE, FALSE, 0); + + gtk_widget_show ([nodeProps widget]); + gtk_box_pack_start (GTK_BOX (nodePropsWidget), + [nodeProps widget], + TRUE, TRUE, 0); + + g_signal_connect (G_OBJECT (nodeLabelEntry), + "changed", + G_CALLBACK (node_label_changed_cb), + self); + + /* + * Edge properties + */ + edgePropsWidget = gtk_vbox_new (FALSE, 6); + g_object_ref_sink (edgePropsWidget); + gtk_box_pack_start (GTK_BOX (layout), + edgePropsWidget, + TRUE, TRUE, 0); + + label = createBoldLabel ("Edge properties"); + gtk_widget_show (label); + gtk_box_pack_start (GTK_BOX (edgePropsWidget), + label, + FALSE, FALSE, 0); + + gtk_widget_show ([edgeProps widget]); + gtk_box_pack_start (GTK_BOX (edgePropsWidget), + [edgeProps widget], + TRUE, TRUE, 0); + + GtkWidget *split = gtk_hseparator_new (); + gtk_widget_show (split); + gtk_box_pack_start (GTK_BOX (edgePropsWidget), + split, + FALSE, FALSE, 0); + + GtkWidget *anchorTable = gtk_table_new (2, 2, FALSE); + + label = gtk_label_new ("Source anchor:"); + gtk_table_attach_defaults (GTK_TABLE (anchorTable), label, + 0, 1, 0, 1); + edgeSourceAnchorEntry = GTK_ENTRY (gtk_entry_new ()); + g_object_ref_sink (edgeSourceAnchorEntry); + gtk_table_attach_defaults (GTK_TABLE (anchorTable), + GTK_WIDGET (edgeSourceAnchorEntry), + 1, 2, 0, 1); + g_signal_connect (G_OBJECT (edgeSourceAnchorEntry), + "changed", + G_CALLBACK (edge_source_anchor_changed_cb), + self); + + label = gtk_label_new ("Target anchor:"); + gtk_table_attach_defaults (GTK_TABLE (anchorTable), label, + 0, 1, 1, 2); + edgeTargetAnchorEntry = GTK_ENTRY (gtk_entry_new ()); + g_object_ref_sink (edgeTargetAnchorEntry); + gtk_table_attach_defaults (GTK_TABLE (anchorTable), + GTK_WIDGET (edgeTargetAnchorEntry), + 1, 2, 1, 2); + g_signal_connect (G_OBJECT (edgeTargetAnchorEntry), + "changed", + G_CALLBACK (edge_target_anchor_changed_cb), + self); + + gtk_widget_show_all (anchorTable); + gtk_box_pack_start (GTK_BOX (edgePropsWidget), + anchorTable, + FALSE, FALSE, 0); + + split = gtk_hseparator_new (); + gtk_widget_show (split); + gtk_box_pack_start (GTK_BOX (edgePropsWidget), + split, + FALSE, FALSE, 0); + + edgeNodeToggle = GTK_TOGGLE_BUTTON (gtk_check_button_new_with_label ("Child node")); + g_object_ref_sink (edgeNodeToggle); + gtk_widget_show (GTK_WIDGET (edgeNodeToggle)); + gtk_box_pack_start (GTK_BOX (edgePropsWidget), + GTK_WIDGET (edgeNodeToggle), + FALSE, FALSE, 0); + g_signal_connect (G_OBJECT (GTK_WIDGET (edgeNodeToggle)), + "toggled", + G_CALLBACK (edge_node_toggled_cb), + self); + + edgeNodePropsWidget = createPropsPaneWithLabelEntry(edgeNodeProps, &edgeNodeLabelEntry); + g_object_ref_sink (edgeNodePropsWidget); + g_object_ref_sink (edgeNodeLabelEntry); + gtk_box_pack_start (GTK_BOX (edgePropsWidget), + edgeNodePropsWidget, + TRUE, TRUE, 0); + g_signal_connect (G_OBJECT (edgeNodeLabelEntry), + "changed", + G_CALLBACK (edge_node_label_changed_cb), + self); + + /* + * Misc setup + */ + + [self _setDisplayedWidget:graphPropsWidget]; + } + + return self; +} + +- (void) dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + + g_object_unref (graphPropsWidget); + g_object_unref (nodePropsWidget); + g_object_unref (edgePropsWidget); + + g_object_unref (nodeLabelEntry); + g_object_unref (edgeNodeToggle); + g_object_unref (edgeNodePropsWidget); + g_object_unref (edgeNodeLabelEntry); + g_object_unref (edgeSourceAnchorEntry); + g_object_unref (edgeTargetAnchorEntry); + + g_object_unref (layout); + + [graphProps release]; + [nodeProps release]; + [edgeProps release]; + [edgeNodeProps release]; + + [graphPropDelegate release]; + [nodePropDelegate release]; + [edgePropDelegate release]; + + [document release]; + + [super dealloc]; +} + +- (TikzDocument*) document { + return document; +} + +- (void) setDocument:(TikzDocument*)doc { + if (document != nil) { + [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:document]; + [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:[document pickSupport]]; + } + + [doc retain]; + [document release]; + document = doc; + + [graphPropDelegate setDocument:doc]; + [nodePropDelegate setDocument:doc]; + [edgePropDelegate setDocument:doc]; + + if (doc != nil) { + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(nodeSelectionChanged:) + name:@"NodeSelectionChanged" object:[doc pickSupport]]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(edgeSelectionChanged:) + name:@"EdgeSelectionChanged" object:[doc pickSupport]]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(graphChanged:) + name:@"TikzChanged" object:doc]; + } + + [self _updatePane]; +} + +- (BOOL) visible { + return gtk_widget_get_visible (layout); +} + +- (void) setVisible:(BOOL)visible { + gtk_widget_set_visible (layout, visible); +} + +- (GtkWidget*) gtkWidget { + return layout; +} + +- (void) loadConfiguration:(Configuration*)config { +} + +- (void) saveConfiguration:(Configuration*)config { +} + +@end +// }}} +// {{{ Notifications + +@implementation PropertiesPane (Notifications) + +- (void) nodeSelectionChanged:(NSNotification*)n { + [self _updatePane]; +} + +- (void) edgeSelectionChanged:(NSNotification*)n { + [self _updatePane]; +} + +- (void) graphChanged:(NSNotification*)n { + [self _updatePane]; +} + +- (void) nodeLabelEdited:(NSString*)newValue { + if (blockUpdates) + return; + + NSSet *sel = [[document pickSupport] selectedNodes]; + if ([sel count] != 1) { + NSLog(@"Expected single node selected; got %lu", [sel count]); + return; + } + + if ([newValue isValidTikzPropertyNameOrValue]) { + Node *node = [sel anyObject]; + [document startModifyNode:node]; + [node setLabel:newValue]; + [document endModifyNode]; + } else { + widget_set_error (GTK_WIDGET (nodeLabelEntry)); + } +} + +- (void) edgeNodeLabelEdited:(NSString*)newValue { + if (blockUpdates) + return; + + NSSet *sel = [[document pickSupport] selectedEdges]; + if ([sel count] != 1) { + NSLog(@"Expected single edge selected; got %lu", [sel count]); + return; + } + + Edge *edge = [sel anyObject]; + if (![edge hasEdgeNode]) { + NSLog(@"Expected edge with edge node"); + return; + } + + if ([newValue isValidTikzPropertyNameOrValue]) { + [document startModifyEdge:edge]; + [[edge edgeNode] setLabel:newValue]; + [document endModifyEdge]; + } else { + widget_set_error (GTK_WIDGET (edgeNodeLabelEntry)); + } +} + +- (void) edgeNodeToggled:(BOOL)newValue { + if (blockUpdates) + return; + + NSSet *sel = [[document pickSupport] selectedEdges]; + if ([sel count] != 1) { + NSLog(@"Expected single edge selected; got %lu", [sel count]); + return; + } + + Edge *edge = [sel anyObject]; + + [document startModifyEdge:edge]; + [edge setHasEdgeNode:newValue]; + [document endModifyEdge]; +} + +- (BOOL) edgeSourceAnchorEdited:(NSString*)newValue { + if (blockUpdates) + return YES; + + NSSet *sel = [[document pickSupport] selectedEdges]; + if ([sel count] != 1) { + NSLog(@"Expected single edge selected; got %lu", [sel count]); + return YES; + } + + Edge *edge = [sel anyObject]; + if ([newValue isValidAnchor]) { + [document startModifyEdge:edge]; + [edge setSourceAnchor:newValue]; + [document endModifyEdge]; + return YES; + } else { + return NO; + } +} + +- (BOOL) edgeTargetAnchorEdited:(NSString*)newValue { + if (blockUpdates) + return YES; + + NSSet *sel = [[document pickSupport] selectedEdges]; + if ([sel count] != 1) { + NSLog(@"Expected single edge selected; got %lu", [sel count]); + return YES; + } + + Edge *edge = [sel anyObject]; + if ([newValue isValidAnchor]) { + [document startModifyEdge:edge]; + [edge setTargetAnchor:newValue]; + [document endModifyEdge]; + return YES; + } else { + return NO; + } +} + +@end +// }}} +// {{{ Private + +@implementation PropertiesPane (Private) + +- (void) _setDisplayedWidget:(GtkWidget*)widget { + if (currentPropsWidget != widget) { + if (currentPropsWidget) + gtk_widget_hide (currentPropsWidget); + currentPropsWidget = widget; + if (widget) + gtk_widget_show (widget); + } +} + +- (void) _updatePane { + blockUpdates = YES; + + BOOL editGraphProps = YES; + GraphElementData *data = [[document graph] data]; + [graphProps setData:data]; + + NSSet *nodeSel = [[document pickSupport] selectedNodes]; + if ([nodeSel count] == 1) { + Node *n = [nodeSel anyObject]; + [nodePropDelegate setNode:n]; + [nodeProps setData:[n data]]; + gtk_entry_set_text (nodeLabelEntry, [[n label] UTF8String]); + widget_clear_error (GTK_WIDGET (nodeLabelEntry)); + [self _setDisplayedWidget:nodePropsWidget]; + editGraphProps = NO; + } else { + [nodePropDelegate setNode:nil]; + [nodeProps setData:nil]; + gtk_entry_set_text (nodeLabelEntry, ""); + + NSSet *edgeSel = [[document pickSupport] selectedEdges]; + if ([edgeSel count] == 1) { + Edge *e = [edgeSel anyObject]; + [edgePropDelegate setEdge:e]; + [edgeProps setData:[e data]]; + gtk_entry_set_text (edgeSourceAnchorEntry, + [[e sourceAnchor] UTF8String]); + gtk_entry_set_text (edgeTargetAnchorEntry, + [[e targetAnchor] UTF8String]); + widget_clear_error (GTK_WIDGET (edgeSourceAnchorEntry)); + widget_clear_error (GTK_WIDGET (edgeTargetAnchorEntry)); + widget_clear_error (GTK_WIDGET (edgeNodeLabelEntry)); + if ([e hasEdgeNode]) { + gtk_toggle_button_set_active (edgeNodeToggle, TRUE); + gtk_widget_show (edgeNodePropsWidget); + gtk_entry_set_text (edgeNodeLabelEntry, [[[e edgeNode] label] UTF8String]); + [edgeNodeProps setData:[[e edgeNode] data]]; + gtk_widget_set_sensitive (edgeNodePropsWidget, TRUE); + } else { + gtk_toggle_button_set_active (edgeNodeToggle, FALSE); + gtk_widget_hide (edgeNodePropsWidget); + gtk_entry_set_text (edgeNodeLabelEntry, ""); + [edgeNodeProps setData:nil]; + gtk_widget_set_sensitive (edgeNodePropsWidget, FALSE); + } + [self _setDisplayedWidget:edgePropsWidget]; + editGraphProps = NO; + } else { + [edgePropDelegate setEdge:nil]; + [edgeProps setData:nil]; + [edgeNodeProps setData:nil]; + gtk_entry_set_text (edgeNodeLabelEntry, ""); + } + } + + if (editGraphProps) { + [self _setDisplayedWidget:graphPropsWidget]; + } + + blockUpdates = NO; +} + +@end + +// }}} +// {{{ Delegates + +@implementation GraphPropertyDelegate +- (id) init { + self = [super init]; + if (self) { + doc = nil; + } + return self; +} +- (void) dealloc { + // doc is not retained + [super dealloc]; +} +- (void) setDocument:(TikzDocument*)d { + doc = d; +} +- (BOOL)startEdit { + if ([doc graph] != nil) { + [doc startChangeGraphProperties]; + return YES; + } + return NO; +} +- (void)endEdit { + [doc endChangeGraphProperties]; +} +- (void)cancelEdit { + [doc cancelChangeGraphProperties]; +} +@end + +@implementation NodePropertyDelegate +- (id) init { + self = [super init]; + if (self) { + doc = nil; + node = nil; + } + return self; +} +- (void) dealloc { + // doc,node not retained + [super dealloc]; +} +- (void) setDocument:(TikzDocument*)d { + doc = d; + node = nil; +} +- (void) setNode:(Node*)n { + node = n; +} +- (BOOL)startEdit { + if (node != nil) { + [doc startModifyNode:node]; + return YES; + } + return NO; +} +- (void)endEdit { + [doc endModifyNode]; +} +- (void)cancelEdit { + [doc cancelModifyNode]; +} +@end + +@implementation EdgePropertyDelegate +- (id) init { + self = [super init]; + if (self) { + doc = nil; + edge = nil; + } + return self; +} +- (void) dealloc { + // doc,edge not retained + [super dealloc]; +} +- (void) setDocument:(TikzDocument*)d { + doc = d; + edge = nil; +} +- (void) setEdge:(Edge*)e { + edge = e; +} +- (BOOL)startEdit { + if (edge != nil) { + [doc startModifyEdge:edge]; + return YES; + } + return NO; +} +- (void)endEdit { + [doc endModifyEdge]; +} +- (void)cancelEdit { + [doc cancelModifyEdge]; +} +@end + +// }}} +// {{{ GTK+ helpers + +static GtkWidget *createLabelledEntry (const gchar *labelText, GtkEntry **entry) { + GtkBox *box = GTK_BOX (gtk_hbox_new (FALSE, 0)); + GtkWidget *label = gtk_label_new (labelText); + gtk_widget_show (label); + GtkWidget *entryWidget = gtk_entry_new (); + gtk_widget_show (entryWidget); + // container widget expand fill pad + gtk_box_pack_start (box, label, FALSE, TRUE, 5); + gtk_box_pack_start (box, entryWidget, TRUE, TRUE, 0); + if (entry) + *entry = GTK_ENTRY (entryWidget); + return GTK_WIDGET (box); +} + +static GtkWidget *createPropsPaneWithLabelEntry (PropertyListEditor *props, GtkEntry **labelEntry) { + GtkBox *box = GTK_BOX (gtk_vbox_new (FALSE, 6)); + + GtkWidget *labelWidget = createLabelledEntry ("Label", labelEntry); + gtk_widget_show (labelWidget); + // box widget expand fill pad + gtk_box_pack_start (box, labelWidget, FALSE, FALSE, 0); + gtk_box_pack_start (box, [props widget], TRUE, TRUE, 0); + gtk_widget_show ([props widget]); + return GTK_WIDGET (box); +} + +static GtkWidget *createBoldLabel (const gchar *text) { + GtkWidget *label = gtk_label_new (text); + label_set_bold (GTK_LABEL (label)); + return label; +} + +// }}} +// {{{ GTK+ callbacks + +static void node_label_changed_cb (GtkEditable *editable, PropertiesPane *pane) { + if (!gtk_widget_is_sensitive (GTK_WIDGET (editable))) { + // clearly wasn't the user editing + return; + } + + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + NSString *newValue = gtk_editable_get_string (editable, 0, -1); + [pane nodeLabelEdited:newValue]; + + [pool drain]; +} + +static void edge_node_label_changed_cb (GtkEditable *editable, PropertiesPane *pane) { + if (!gtk_widget_is_sensitive (GTK_WIDGET (editable))) { + // clearly wasn't the user editing + return; + } + + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + NSString *newValue = gtk_editable_get_string (editable, 0, -1); + [pane edgeNodeLabelEdited:newValue]; + + [pool drain]; +} + +static void edge_node_toggled_cb (GtkToggleButton *toggle, PropertiesPane *pane) { + if (!gtk_widget_is_sensitive (GTK_WIDGET (toggle))) { + // clearly wasn't the user editing + return; + } + + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + gboolean newValue = gtk_toggle_button_get_active (toggle); + [pane edgeNodeToggled:newValue]; + + [pool drain]; +} + +static void edge_source_anchor_changed_cb (GtkEditable *editable, PropertiesPane *pane) { + if (!gtk_widget_is_sensitive (GTK_WIDGET (editable))) { + // clearly wasn't the user editing + return; + } + + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + NSString *newValue = gtk_editable_get_string (editable, 0, -1); + if (![pane edgeSourceAnchorEdited:newValue]) + widget_set_error (GTK_WIDGET (editable)); + + [pool drain]; +} + +static void edge_target_anchor_changed_cb (GtkEditable *editable, PropertiesPane *pane) { + if (!gtk_widget_is_sensitive (GTK_WIDGET (editable))) { + // clearly wasn't the user editing + return; + } + + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + NSString *newValue = gtk_editable_get_string (editable, 0, -1); + if (![pane edgeTargetAnchorEdited:newValue]) + widget_set_error (GTK_WIDGET (editable)); + + [pool drain]; +} + +// }}} + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/PropertyListEditor.h b/tikzit-1/src/gtk/PropertyListEditor.h new file mode 100644 index 0000000..2d3166a --- /dev/null +++ b/tikzit-1/src/gtk/PropertyListEditor.h @@ -0,0 +1,65 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import +#import "GraphElementData.h" +#import "GraphElementProperty.h" + +@protocol PropertyChangeDelegate +@optional +- (BOOL)startEdit; +- (void)endEdit; +- (void)cancelEdit; +@end + +@interface PropertyListEditor: NSObject { + GraphElementData *data; + NSObject *delegate; + + GtkListStore *list; + GtkWidget *view; + GtkWidget *widget; + GtkWidget *removeButton; +} + +/*! + @property widget + @brief The widget displaying the editable list + */ +@property (readonly) GtkWidget *widget; + +/*! + @property data + @brief The GraphElementData that should be reflected in the list + */ +@property (retain) GraphElementData *data; + +/*! + @property delegate + @brief A delegate for dealing with property changes + */ +@property (retain) NSObject *delegate; + +/*! + * Reload the properties from the data store + */ +- (void) reloadProperties; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/PropertyListEditor.m b/tikzit-1/src/gtk/PropertyListEditor.m new file mode 100644 index 0000000..9760618 --- /dev/null +++ b/tikzit-1/src/gtk/PropertyListEditor.m @@ -0,0 +1,501 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "PropertyListEditor.h" +#import "gtkhelpers.h" + +// {{{ Constants + +enum { + PLM_NAME_COL = 0, + PLM_VALUE_COL, + PLM_IS_PROPERTY_COL, + PLM_PROPERTY_COL, + PLM_N_COLS +}; + +// }}} +// {{{ Internal interfaces +// {{{ Signals + +static void value_edited_cb (GtkCellRendererText *renderer, + gchar *path, + gchar *new_text, + PropertyListEditor *editor); +static void name_edited_cb (GtkCellRendererText *renderer, + gchar *path, + gchar *new_text, + PropertyListEditor *editor); +static void add_prop_clicked_cb (GtkButton *button, + PropertyListEditor *editor); +static void add_atom_clicked_cb (GtkButton *button, + PropertyListEditor *editor); +static void remove_clicked_cb (GtkButton *button, + PropertyListEditor *editor); +static void text_editing_started (GtkCellRenderer *cell, + GtkCellEditable *editable, + const gchar *path, + PropertyListEditor *editor); +static void text_changed_cb (GtkEditable *editable, + PropertyListEditor *pane); +static void selection_changed_cb (GtkTreeSelection *selection, + PropertyListEditor *pane); + +// }}} +// {{{ Private + +@interface PropertyListEditor (Private) +- (void) updatePath:(gchar*)path withValue:(NSString*)newText; +- (void) updatePath:(gchar*)path withName:(NSString*)newText; +- (void) addProperty; +- (void) addAtom; +- (void) removeSelected; +- (void) selectionCountChanged:(int)newSelectionCount; +- (void) clearStore; +@end + +// }}} +// }}} +// {{{ API + +@implementation PropertyListEditor + +- (id) init { + self = [super init]; + + if (self) { + list = gtk_list_store_new (PLM_N_COLS, + G_TYPE_STRING, + G_TYPE_STRING, + G_TYPE_BOOLEAN, + G_TYPE_POINTER); + g_object_ref_sink (G_OBJECT (list)); + view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (list)); + g_object_ref_sink (G_OBJECT (view)); + GtkWidget *scrolledview = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledview), + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); + gtk_container_add (GTK_CONTAINER (scrolledview), view); + gtk_widget_set_size_request (view, -1, 150); + data = nil; + delegate = nil; + + GtkCellRenderer *renderer; + GtkTreeViewColumn *column; + + renderer = gtk_cell_renderer_text_new (); + g_object_set (G_OBJECT (renderer), + "editable", TRUE, + NULL); + column = gtk_tree_view_column_new_with_attributes ("Key/Atom", + renderer, + "text", PLM_NAME_COL, + NULL); + gtk_tree_view_append_column (GTK_TREE_VIEW (view), column); + g_signal_connect (G_OBJECT (renderer), + "editing-started", + G_CALLBACK (text_editing_started), + self); + g_signal_connect (G_OBJECT (renderer), + "edited", + G_CALLBACK (name_edited_cb), + self); + + renderer = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes ("Value", + renderer, + "text", PLM_VALUE_COL, + "editable", PLM_IS_PROPERTY_COL, + "sensitive", PLM_IS_PROPERTY_COL, + NULL); + gtk_tree_view_append_column (GTK_TREE_VIEW (view), column); + g_signal_connect (G_OBJECT (renderer), + "edited", + G_CALLBACK (value_edited_cb), + self); + + widget = gtk_vbox_new (FALSE, 0); + gtk_box_set_spacing (GTK_BOX (widget), 6); + g_object_ref_sink (G_OBJECT (widget)); + + GtkWidget *listFrame = gtk_frame_new (NULL); + gtk_container_add (GTK_CONTAINER (listFrame), scrolledview); + gtk_widget_show (listFrame); + gtk_container_add (GTK_CONTAINER (widget), listFrame); + + GtkBox *buttonBox = GTK_BOX (gtk_hbox_new(FALSE, 0)); + gtk_box_pack_start (GTK_BOX (widget), GTK_WIDGET (buttonBox), FALSE, FALSE, 0); + + GtkWidget *addPropButton = gtk_button_new (); + //gtk_widget_set_size_request (addPropButton, 27, 27); + gtk_widget_set_tooltip_text (addPropButton, "Add property"); + GtkWidget *addPropContents = gtk_hbox_new(FALSE, 0); + GtkWidget *addPropIcon = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON); + gtk_container_add (GTK_CONTAINER (addPropContents), addPropIcon); + gtk_container_add (GTK_CONTAINER (addPropContents), gtk_label_new ("P")); + gtk_container_add (GTK_CONTAINER (addPropButton), addPropContents); + gtk_box_pack_start (buttonBox, addPropButton, FALSE, FALSE, 0); + g_signal_connect (G_OBJECT (addPropButton), + "clicked", + G_CALLBACK (add_prop_clicked_cb), + self); + + GtkWidget *addAtomButton = gtk_button_new (); + //gtk_widget_set_size_request (addAtomButton, 27, 27); + gtk_widget_set_tooltip_text (addAtomButton, "Add atom"); + GtkWidget *addAtomContents = gtk_hbox_new(FALSE, 0); + GtkWidget *addAtomIcon = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON); + gtk_container_add (GTK_CONTAINER (addAtomContents), addAtomIcon); + gtk_container_add (GTK_CONTAINER (addAtomContents), gtk_label_new ("A")); + gtk_container_add (GTK_CONTAINER (addAtomButton), addAtomContents); + gtk_box_pack_start (buttonBox, addAtomButton, FALSE, FALSE, 0); + g_signal_connect (G_OBJECT (addAtomButton), + "clicked", + G_CALLBACK (add_atom_clicked_cb), + self); + + removeButton = gtk_button_new (); + g_object_ref_sink (G_OBJECT (removeButton)); + gtk_widget_set_sensitive (removeButton, FALSE); + //gtk_widget_set_size_request (removeButton, 27, 27); + gtk_widget_set_tooltip_text (removeButton, "Remove selected"); + GtkWidget *removeIcon = gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_BUTTON); + gtk_container_add (GTK_CONTAINER (removeButton), removeIcon); + gtk_box_pack_start (buttonBox, removeButton, FALSE, FALSE, 0); + g_signal_connect (G_OBJECT (removeButton), + "clicked", + G_CALLBACK (remove_clicked_cb), + self); + + GtkTreeSelection *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view)); + g_signal_connect (G_OBJECT (selection), + "changed", + G_CALLBACK (selection_changed_cb), + self); + + gtk_widget_show_all (GTK_WIDGET (buttonBox)); + gtk_widget_show_all (scrolledview); + + gtk_widget_set_sensitive (widget, FALSE); + } + + return self; +} + +- (void) dealloc { + [self clearStore]; + + [data release]; + [delegate release]; + + g_object_unref (list); + g_object_unref (view); + g_object_unref (widget); + g_object_unref (removeButton); + + [super dealloc]; +} + +@synthesize widget, delegate; + +- (GraphElementData*) data { return data; } +- (void) setData:(GraphElementData*)d { + [d retain]; + [data release]; + data = d; + [self reloadProperties]; + gtk_widget_set_sensitive (widget, data != nil); +} + +- (void) reloadProperties { + [self clearStore]; + int pos = 0; + for (GraphElementProperty *p in data) { + GtkTreeIter iter; + [p retain]; + gtk_list_store_insert_with_values (list, &iter, pos, + PLM_NAME_COL, [[p key] UTF8String], + PLM_VALUE_COL, [[p value] UTF8String], + PLM_IS_PROPERTY_COL, ![p isAtom], + PLM_PROPERTY_COL, (void *)p, + -1); + ++pos; + } +} + +@end + +// }}} +// {{{ Private + +@implementation PropertyListEditor (Private) +- (void) updatePath:(gchar*)pathStr withValue:(NSString*)newText { + if (![newText isValidTikzPropertyNameOrValue]) + return; + + GtkTreeIter iter; + GtkTreePath *path = gtk_tree_path_new_from_string (pathStr); + + if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (list), &iter, path)) { + gtk_tree_path_free (path); + return; + } + + void *propPtr; + gtk_tree_model_get (GTK_TREE_MODEL (list), &iter, + PLM_PROPERTY_COL, &propPtr, + -1); + GraphElementProperty *prop = (GraphElementProperty*)propPtr; + + if (![prop isAtom]) { + if (![delegate respondsToSelector:@selector(startEdit)] || [delegate startEdit]) { + [prop setValue:newText]; + gtk_list_store_set (list, &iter, + PLM_VALUE_COL, [newText UTF8String], + -1); + [delegate endEdit]; + } + } + + gtk_tree_path_free (path); +} + +- (void) updatePath:(gchar*)pathStr withName:(NSString*)newText { + if (![newText isValidTikzPropertyNameOrValue]) + return; + + GtkTreeIter iter; + GtkTreePath *path = gtk_tree_path_new_from_string (pathStr); + + if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (list), &iter, path)) { + gtk_tree_path_free (path); + return; + } + + void *propPtr; + gtk_tree_model_get (GTK_TREE_MODEL (list), &iter, + PLM_PROPERTY_COL, &propPtr, + -1); + GraphElementProperty *prop = (GraphElementProperty*)propPtr; + + if (![delegate respondsToSelector:@selector(startEdit)] || [delegate startEdit]) { + if ([newText isEqualToString:@""]) { + [data removeObjectIdenticalTo:prop]; + gtk_list_store_remove (list, &iter); + [prop release]; + } else { + [prop setKey:newText]; + gtk_list_store_set (list, &iter, + PLM_NAME_COL, [newText UTF8String], + -1); + } + [delegate endEdit]; + } + + gtk_tree_path_free (path); +} + +- (void) addProperty { + GtkTreeIter iter; + GraphElementProperty *p = [[GraphElementProperty alloc] initWithPropertyValue:@"" forKey:@"new property"]; + if (![delegate respondsToSelector:@selector(startEdit)] || [delegate startEdit]) { + [data addObject:p]; + gint pos = [data count] - 1; + gtk_list_store_insert_with_values (list, &iter, pos, + PLM_NAME_COL, "new property", + PLM_VALUE_COL, "", + PLM_IS_PROPERTY_COL, TRUE, + PLM_PROPERTY_COL, (void *)p, + -1); + [delegate endEdit]; + } else { + [p release]; + } +} + +- (void) addAtom { + GtkTreeIter iter; + GraphElementProperty *p = [[GraphElementProperty alloc] initWithAtomName:@"new atom"]; + if (![delegate respondsToSelector:@selector(startEdit)] || [delegate startEdit]) { + [data addObject:p]; + gint pos = [data count] - 1; + gtk_list_store_insert_with_values (list, &iter, pos, + PLM_NAME_COL, "new atom", + PLM_VALUE_COL, [[p value] UTF8String], + PLM_IS_PROPERTY_COL, FALSE, + PLM_PROPERTY_COL, (void *)p, + -1); + [delegate endEdit]; + } else { + [p release]; + } +} + +- (void) removeSelected { + GtkTreeSelection *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view)); + GList *selPaths = gtk_tree_selection_get_selected_rows (selection, NULL); + GList *selIters = NULL; + + // Convert to iters, as GtkListStore has persistent iters + GList *curr = selPaths; + while (curr != NULL) { + GtkTreeIter iter; + gtk_tree_model_get_iter (GTK_TREE_MODEL (list), + &iter, + (GtkTreePath*)curr->data); + selIters = g_list_prepend (selIters, gtk_tree_iter_copy (&iter)); + curr = g_list_next (curr); + } + + // remove all iters + curr = selIters; + while (curr != NULL) { + GtkTreeIter *iter = (GtkTreeIter*)curr->data; + void *propPtr; + gtk_tree_model_get (GTK_TREE_MODEL (list), iter, + PLM_PROPERTY_COL, &propPtr, + -1); + GraphElementProperty *prop = (GraphElementProperty*)propPtr; + if (![delegate respondsToSelector:@selector(startEdit)] || [delegate startEdit]) { + [data removeObjectIdenticalTo:prop]; + gtk_list_store_remove (list, iter); + [prop release]; + [delegate endEdit]; + } + curr = g_list_next (curr); + } + + g_list_foreach (selIters, (GFunc) gtk_tree_iter_free, NULL); + g_list_free (selIters); + g_list_foreach (selPaths, (GFunc) gtk_tree_path_free, NULL); + g_list_free (selPaths); +} + +- (void) selectionCountChanged:(int)count { + gtk_widget_set_sensitive (removeButton, count > 0); +} + +- (void) clearStore { + GtkTreeIter iter; + if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list), &iter)) { + do { + void *prop; + gtk_tree_model_get (GTK_TREE_MODEL (list), &iter, + PLM_PROPERTY_COL, &prop, + -1); + [(id)prop release]; + } while (gtk_tree_model_iter_next (GTK_TREE_MODEL (list), &iter)); + gtk_list_store_clear (list); + } +} +@end + +// }}} +// {{{ GTK+ callbacks + +static void value_edited_cb (GtkCellRendererText *renderer, + gchar *path, + gchar *new_text, + PropertyListEditor *editor) +{ + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [editor updatePath:path withValue:[NSString stringWithUTF8String:new_text]]; + [pool drain]; +} + +static void name_edited_cb (GtkCellRendererText *renderer, + gchar *path, + gchar *new_text, + PropertyListEditor *editor) +{ + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [editor updatePath:path withName:[NSString stringWithUTF8String:new_text]]; + [pool drain]; +} + +static void add_prop_clicked_cb (GtkButton *button, + PropertyListEditor *editor) +{ + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [editor addProperty]; + [pool drain]; +} + +static void add_atom_clicked_cb (GtkButton *button, + PropertyListEditor *editor) +{ + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [editor addAtom]; + [pool drain]; +} + +static void remove_clicked_cb (GtkButton *button, + PropertyListEditor *editor) +{ + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [editor removeSelected]; + [pool drain]; +} + +static void text_editing_started (GtkCellRenderer *cell, + GtkCellEditable *editable, + const gchar *path, + PropertyListEditor *editor) +{ + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + if (GTK_IS_EDITABLE (editable) && GTK_IS_WIDGET (editable)) { + g_signal_handlers_disconnect_by_func (G_OBJECT (editable), + G_CALLBACK (text_changed_cb), + editor); + widget_clear_error (GTK_WIDGET (editable)); + g_signal_connect (G_OBJECT (editable), + "changed", + G_CALLBACK (text_changed_cb), + editor); + } + + [pool drain]; +} + +static void text_changed_cb (GtkEditable *editable, PropertyListEditor *pane) +{ + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + NSString *newValue = gtk_editable_get_string (editable, 0, -1); + if (![newValue isValidTikzPropertyNameOrValue]) { + widget_set_error (GTK_WIDGET (editable)); + } else { + widget_clear_error (GTK_WIDGET (editable)); + } + + [pool drain]; +} + +static void selection_changed_cb (GtkTreeSelection *selection, + PropertyListEditor *pane) +{ + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + int selcount = gtk_tree_selection_count_selected_rows (selection); + [pane selectionCountChanged:selcount]; + [pool drain]; +} + +// }}} + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/RecentManager.h b/tikzit-1/src/gtk/RecentManager.h new file mode 100644 index 0000000..e2c2793 --- /dev/null +++ b/tikzit-1/src/gtk/RecentManager.h @@ -0,0 +1,30 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" + +@interface RecentManager: NSObject { +} + ++ (RecentManager*) defaultManager; + +- (void)addRecentFile:(NSString*)path; +- (void)removeRecentFile:(NSString*)path; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/RecentManager.m b/tikzit-1/src/gtk/RecentManager.m new file mode 100644 index 0000000..c6074c6 --- /dev/null +++ b/tikzit-1/src/gtk/RecentManager.m @@ -0,0 +1,74 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "RecentManager.h" +#import + +static RecentManager *defMan = nil; + +@implementation RecentManager +- (id) init { + self = [super init]; + return self; +} + ++ (RecentManager*) defaultManager { + if (defMan == nil) { + defMan = [[self alloc] init]; + } + return defMan; +} + +- (void)addRecentFile:(NSString*)path { + NSError *error = nil; + gchar *uri = [path glibUriWithError:&error]; + if (error) { + logError (error, @"Could not add recent file"); + return; + } + + GtkRecentData recent_data; + recent_data.display_name = NULL; + recent_data.description = NULL; + recent_data.mime_type = "text/x-tikz"; + recent_data.app_name = (gchar *) g_get_application_name (); + recent_data.app_exec = g_strjoin (" ", g_get_prgname (), "%u", NULL); + recent_data.groups = NULL; + recent_data.is_private = FALSE; + + gtk_recent_manager_add_full (gtk_recent_manager_get_default(), uri, &recent_data); + + g_free (uri); + g_free (recent_data.app_exec); +} + +- (void)removeRecentFile:(NSString*)path { + NSError *error = nil; + gchar *uri = [path glibUriWithError:&error]; + if (error) { + logError (error, @"Could not remove recent file"); + return; + } + + gtk_recent_manager_remove_item (gtk_recent_manager_get_default(), uri, NULL); + + g_free (uri); +} + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/SelectTool.h b/tikzit-1/src/gtk/SelectTool.h new file mode 100644 index 0000000..65f511a --- /dev/null +++ b/tikzit-1/src/gtk/SelectTool.h @@ -0,0 +1,63 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import "Tool.h" + +@class Edge; +@class Node; + +// FIXME: replace this with delegates +typedef enum { + QuietState, + SelectBoxState, + ToggleSelectState, + MoveSelectedNodesState, + DragEdgeControlPoint1, + DragEdgeControlPoint2 +} SelectToolState; + +typedef enum { + DragSelectsNodes = 1, + DragSelectsEdges = 2, + DragSelectsBoth = DragSelectsNodes | DragSelectsEdges +} DragSelectMode; + +@interface SelectTool : NSObject { + GraphRenderer *renderer; + SelectToolState state; + float edgeFuzz; + DragSelectMode dragSelectMode; + NSPoint dragOrigin; + Node *leaderNode; + NSPoint oldLeaderPos; + Edge *modifyEdge; + NSRect selectionBox; + NSMutableSet *selectionBoxContents; + + GtkWidget *configWidget; + GSList *dragSelectModeButtons; +} + +@property (assign) float edgeFuzz; +@property (assign) DragSelectMode dragSelectMode; + +- (id) init; ++ (id) tool; +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/SelectTool.m b/tikzit-1/src/gtk/SelectTool.m new file mode 100644 index 0000000..b3121ae --- /dev/null +++ b/tikzit-1/src/gtk/SelectTool.m @@ -0,0 +1,590 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "SelectTool.h" + +#import "Configuration.h" +#import "Edge+Render.h" +#import "GraphRenderer.h" +#import "TikzDocument.h" +#import "tzstockitems.h" + +#import + +#define DRAG_SELECT_MODE_KEY "tikzit-drag-select-mode" + +static const InputMask unionSelectMask = ShiftMask; + +static void drag_select_mode_cb (GtkToggleButton *button, SelectTool *tool); + +@interface SelectTool (Private) +- (TikzDocument*) doc; +- (void) shiftNodesByMovingLeader:(Node*)leader to:(NSPoint)to; +- (void) deselectAllNodes; +- (void) deselectAllEdges; +- (void) deselectAll; +- (BOOL) circleWithCenter:(NSPoint)c andRadius:(float)r containsPoint:(NSPoint)p; +- (void) lookForControlPointAt:(NSPoint)pos; +- (void) setSelectionBox:(NSRect)box; +- (void) clearSelectionBox; +- (BOOL) selectionBoxContainsNode:(Node*)node; +@end + +@implementation SelectTool +- (NSString*) name { return @"Select"; } +- (const gchar*) stockId { return TIKZIT_STOCK_SELECT; } +- (NSString*) helpText { return @"Select, move and edit nodes and edges"; } +- (NSString*) shortcut { return @"s"; } +@synthesize configurationWidget=configWidget; +@synthesize edgeFuzz; + ++ (id) tool { + return [[[self alloc] init] autorelease]; +} + +- (id) init { + self = [super init]; + + if (self) { + state = QuietState; + edgeFuzz = 3.0f; + dragSelectMode = DragSelectsNodes; + + configWidget = gtk_vbox_new (FALSE, 0); + g_object_ref_sink (configWidget); + + GtkWidget *label = gtk_label_new ("Drag selects:"); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_box_pack_start (GTK_BOX (configWidget), + label, + FALSE, + FALSE, + 0); + + GtkWidget *nodeOpt = gtk_radio_button_new_with_label (NULL, "nodes (N)"); + g_object_set_data (G_OBJECT (nodeOpt), + DRAG_SELECT_MODE_KEY, + (gpointer)DragSelectsNodes); + gtk_box_pack_start (GTK_BOX (configWidget), + nodeOpt, + FALSE, + FALSE, + 0); + g_signal_connect (G_OBJECT (nodeOpt), + "toggled", + G_CALLBACK (drag_select_mode_cb), + self); + + GtkWidget *edgeOpt = gtk_radio_button_new_with_label ( + gtk_radio_button_get_group (GTK_RADIO_BUTTON (nodeOpt)), + "edges (E)"); + g_object_set_data (G_OBJECT (edgeOpt), + DRAG_SELECT_MODE_KEY, + (gpointer)DragSelectsEdges); + gtk_box_pack_start (GTK_BOX (configWidget), + edgeOpt, + FALSE, + FALSE, + 0); + g_signal_connect (G_OBJECT (edgeOpt), + "toggled", + G_CALLBACK (drag_select_mode_cb), + self); + + GtkWidget *bothOpt = gtk_radio_button_new_with_label ( + gtk_radio_button_get_group (GTK_RADIO_BUTTON (edgeOpt)), + "both (B)"); + g_object_set_data (G_OBJECT (bothOpt), + DRAG_SELECT_MODE_KEY, + (gpointer)DragSelectsBoth); + gtk_box_pack_start (GTK_BOX (configWidget), + bothOpt, + FALSE, + FALSE, + 0); + g_signal_connect (G_OBJECT (bothOpt), + "toggled", + G_CALLBACK (drag_select_mode_cb), + self); + dragSelectModeButtons = gtk_radio_button_get_group (GTK_RADIO_BUTTON (bothOpt)); + + gtk_widget_show_all (configWidget); + } + + return self; +} + +- (void) dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + + [renderer release]; + [leaderNode release]; + [modifyEdge release]; + + g_object_unref (G_OBJECT (configWidget)); + + [super dealloc]; +} + +- (DragSelectMode) dragSelectMode { + return dragSelectMode; +} + +- (void) setDragSelectMode:(DragSelectMode)mode { + if (dragSelectMode == mode) + return; + + dragSelectMode = mode; + + GSList *entry = dragSelectModeButtons; + while (entry) { + GtkToggleButton *button = GTK_TOGGLE_BUTTON (entry->data); + DragSelectMode buttonMode = + (DragSelectMode) g_object_get_data ( + G_OBJECT (button), + DRAG_SELECT_MODE_KEY); + if (buttonMode == dragSelectMode) { + gtk_toggle_button_set_active (button, TRUE); + break; + } + + entry = g_slist_next (entry); + } +} + +- (GraphRenderer*) activeRenderer { return renderer; } +- (void) setActiveRenderer:(GraphRenderer*)r { + if (r == renderer) + return; + + [r retain]; + [renderer release]; + renderer = r; + + state = QuietState; +} + +- (void) mousePressAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { + if (button != LeftButton) + return; + + dragOrigin = pos; + + // we should already be in a quiet state, but no harm in making sure + state = QuietState; + + modifyEdge = nil; + [self lookForControlPointAt:pos]; + + if (modifyEdge == nil) { + // we didn't find a control point + + BOOL unionSelect = (mask & unionSelectMask); + + leaderNode = [renderer anyNodeAt:pos]; + // if we hit a node, deselect other nodes (if Shift is up) and go to move mode + if (leaderNode != nil) { + BOOL alreadySelected = [[self doc] isNodeSelected:leaderNode]; + if (!unionSelect && !alreadySelected) { + [self deselectAll]; + } + if (unionSelect && alreadySelected) { + state = ToggleSelectState; + } else { + [[[self doc] pickSupport] selectNode:leaderNode]; + state = MoveSelectedNodesState; + oldLeaderPos = [leaderNode point]; + [[self doc] startShiftNodes:[[[self doc] pickSupport] selectedNodes]]; + } + } + + // if mouse did not hit a node, check if mouse hit an edge + if (leaderNode == nil) { + Edge *edge = [renderer anyEdgeAt:pos withFuzz:edgeFuzz]; + if (edge != nil) { + BOOL alreadySelected = [[self doc] isEdgeSelected:edge]; + if (!unionSelect) { + [self deselectAll]; + } + if (unionSelect && alreadySelected) { + [[[self doc] pickSupport] deselectEdge:edge]; + } else { + [[[self doc] pickSupport] selectEdge:edge]; + } + } else { + // if mouse did not hit anything, put us in box mode + if (!unionSelect) { + [self deselectAll]; + } + [renderer clearHighlightedNodes]; + state = SelectBoxState; + } + } + } +} + +- (void) mouseMoveTo:(NSPoint)pos withButtons:(MouseButton)buttons andMask:(InputMask)mask { + if (!(buttons & LeftButton)) + return; + + Transformer *transformer = [renderer transformer]; + + if (state == ToggleSelectState) { + state = MoveSelectedNodesState; + oldLeaderPos = [leaderNode point]; + [[self doc] startShiftNodes:[[[self doc] pickSupport] selectedNodes]]; + } + + if (state == SelectBoxState) { + [self setSelectionBox:NSRectAroundPoints(dragOrigin, pos)]; + + NSEnumerator *enumerator = [[self doc] nodeEnumerator]; + Node *node; + while ((node = [enumerator nextObject]) != nil) { + NSPoint nodePos = [transformer toScreen:[node point]]; + if (NSPointInRect(nodePos, selectionBox)) { + [renderer setNode:node highlighted:YES]; + } else { + [renderer setNode:node highlighted:NO]; + } + } + } else if (state == MoveSelectedNodesState) { + if (leaderNode != nil) { + [self shiftNodesByMovingLeader:leaderNode to:pos]; + NSPoint shiftSoFar; + shiftSoFar.x = [leaderNode point].x - oldLeaderPos.x; + shiftSoFar.y = [leaderNode point].y - oldLeaderPos.y; + [[self doc] shiftNodesUpdate:shiftSoFar]; + } + } else if (state == DragEdgeControlPoint1 || state == DragEdgeControlPoint2) { + // invalidate once before we start changing it: we may be shrinking + // the control circles + [[self doc] modifyEdgeCheckPoint]; + if (state == DragEdgeControlPoint1) { + [modifyEdge moveCp1To:[transformer fromScreen:pos] + withWeightCourseness:0.1f + andBendCourseness:15 + forceLinkControlPoints:(mask & ControlMask)]; + } else { + [modifyEdge moveCp2To:[transformer fromScreen:pos] + withWeightCourseness:0.1f + andBendCourseness:15 + forceLinkControlPoints:(mask & ControlMask)]; + } + [[self doc] modifyEdgeCheckPoint]; + } +} + +- (void) mouseReleaseAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { + if (button != LeftButton) + return; + + if (state == SelectBoxState) { + PickSupport *ps = [[self doc] pickSupport]; + Transformer *transformer = [renderer transformer]; + + if (!(mask & unionSelectMask)) { + [ps deselectAllNodes]; + [ps deselectAllEdges]; + } + + Graph *graph = [[self doc] graph]; + if (dragSelectMode & DragSelectsNodes) { + for (Node *node in [graph nodes]) { + NSPoint nodePos = [transformer toScreen:[node point]]; + if (NSPointInRect(nodePos, selectionBox)) { + [ps selectNode:node]; + } + } + } + if (dragSelectMode & DragSelectsEdges) { + for (Edge *edge in [graph edges]) { + NSPoint edgePos = [transformer toScreen:[edge mid]]; + if (NSPointInRect(edgePos, selectionBox)) { + [ps selectEdge:edge]; + } + } + } + + [self clearSelectionBox]; + } else if (state == ToggleSelectState) { + [[[self doc] pickSupport] deselectNode:leaderNode]; + leaderNode = nil; + } else if (state == MoveSelectedNodesState) { + if (NSEqualPoints (oldLeaderPos, [leaderNode point])) { + [[self doc] cancelShiftNodes]; + } else { + [[self doc] endShiftNodes]; + } + leaderNode = nil; + } else if (state == DragEdgeControlPoint1 || state == DragEdgeControlPoint2) { + // FIXME: check if there was any real change + [[self doc] endModifyEdge]; + } + + state = QuietState; +} + +- (void) mouseDoubleClickAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { + if (button != LeftButton) + return; + + if (state != QuietState) { + return; + } + // convert bend mode on edge under mouse cursor + Edge *edge = [renderer anyEdgeAt:pos withFuzz:edgeFuzz]; + if (edge != nil) { + [[self doc] startModifyEdge:edge]; + if ([edge bendMode]==EdgeBendModeBasic) { + [edge convertBendToAngles]; + [edge setBendMode:EdgeBendModeInOut]; + } else { + [edge setBendMode:EdgeBendModeBasic]; + } + [[self doc] endModifyEdge]; + + [self deselectAllEdges]; + [[[self doc] pickSupport] selectEdge:edge]; + } +} + +- (void) keyPressed:(unsigned int)keyVal withMask:(InputMask)mask { + if (keyVal == GDK_KEY_N && mask == ShiftMask) { + [self setDragSelectMode:DragSelectsNodes]; + } else if (keyVal == GDK_KEY_E && mask == ShiftMask) { + [self setDragSelectMode:DragSelectsEdges]; + } else if (keyVal == GDK_KEY_B && mask == ShiftMask) { + [self setDragSelectMode:DragSelectsBoth]; + } else if (keyVal == GDK_KEY_D && (!mask || mask == ShiftMask)) { + PickSupport *ps = [[self doc] pickSupport]; + for (Node* node in [ps selectedNodes]) { + NSRect b = [node boundingRect]; + NSLog(@"%@ @ (%f,%f) {style=%@, label=%@, data=%@, bounds=(%f,%f),(%fx%f)}", + [node name], + [node point].x, + [node point].y, + [[node style] name], + [node label], + [[node data] tikzList], + b.origin.x, b.origin.y, b.size.width, b.size.height); + } + for (Edge* edge in [ps selectedEdges]) { + NSRect b = [edge boundingRect]; + NSLog(@"%@:%@->%@:%@ {\n" + @" style=%@, data=%@,\n" + @" bend=%d, weight=%f, inAngle=%d, outAngle=%d, bendMode=%d,\n" + @" head=(%f,%f), headTan=(%f,%f) leftHeadNormal=(%f,%f), rightHeadNormal=(%f,%f),\n" + @" cp1=(%f,%f),\n" + @" mid=(%f,%f), midTan=(%f,%f), leftNormal=(%f,%f), rightNormal=(%f,%f)\n" + @" cp2=(%f,%f),\n" + @" tail=(%f,%f), tailTan=(%f,%f), leftTailNormal=(%f,%f), rightTailNormal=(%f,%f),\n" + @" isSelfLoop=%s, isStraight=%s,\n" + @" bounds=(%f,%f),(%fx%f)\n" + @"}", + [[edge source] name], + [edge sourceAnchor], + [[edge target] name], + [edge targetAnchor], + [[edge style] name], + [[edge data] tikzList], + [edge bend], + [edge weight], + [edge inAngle], + [edge outAngle], + [edge bendMode], + [edge head].x, + [edge head].y, + [edge headTan].x, + [edge headTan].y, + [edge leftHeadNormal].x, + [edge leftHeadNormal].y, + [edge rightHeadNormal].x, + [edge rightHeadNormal].y, + [edge cp1].x, + [edge cp1].y, + [edge mid].x, + [edge mid].y, + [edge midTan].x, + [edge midTan].y, + [edge leftNormal].x, + [edge leftNormal].y, + [edge rightNormal].x, + [edge rightNormal].y, + [edge cp2].x, + [edge cp2].y, + [edge tail].x, + [edge tail].y, + [edge tailTan].x, + [edge tailTan].y, + [edge leftTailNormal].x, + [edge leftTailNormal].y, + [edge rightTailNormal].x, + [edge rightTailNormal].y, + [edge isSelfLoop] ? "yes" : "no", + [edge isStraight] ? "yes" : "no", + b.origin.x, b.origin.y, b.size.width, b.size.height); + } + } +} + +- (void) renderWithContext:(id)context onSurface:(id)surface { + if (!NSIsEmptyRect (selectionBox)) { + [context saveState]; + + [context setAntialiasMode:AntialiasDisabled]; + [context setLineWidth:1.0]; + [context startPath]; + [context rect:selectionBox]; + RColor fColor = MakeRColor (0.8, 0.8, 0.8, 0.2); + RColor sColor = MakeSolidRColor (0.6, 0.6, 0.6); + [context strokePathWithColor:sColor andFillWithColor:fColor]; + + [context restoreState]; + } +} + +- (void) loadConfiguration:(Configuration*)config { + NSString *mode = [config stringEntry:@"Drag select mode" + inGroup:@"SelectTool"]; + if ([mode isEqualToString:@"nodes"]) { + [self setDragSelectMode:DragSelectsNodes]; + } else if ([mode isEqualToString:@"edges"]) { + [self setDragSelectMode:DragSelectsEdges]; + } else if ([mode isEqualToString:@"both"]) { + [self setDragSelectMode:DragSelectsBoth]; + } +} + +- (void) saveConfiguration:(Configuration*)config { + switch (dragSelectMode) { + case DragSelectsNodes: + [config setStringEntry:@"Drag select mode" + inGroup:@"SelectTool" + value:@"nodes"]; + break; + case DragSelectsEdges: + [config setStringEntry:@"Drag select mode" + inGroup:@"SelectTool" + value:@"edges"]; + break; + case DragSelectsBoth: + [config setStringEntry:@"Drag select mode" + inGroup:@"SelectTool" + value:@"both"]; + break; + } +} + +@end + +@implementation SelectTool (Private) +- (TikzDocument*) doc { + return [renderer document]; +} + +- (void) shiftNodesByMovingLeader:(Node*)leader to:(NSPoint)to { + Transformer *transformer = [renderer transformer]; + + NSPoint from = [transformer toScreen:[leader point]]; + to = [[renderer grid] snapScreenPoint:to]; + float dx = to.x - from.x; + float dy = to.y - from.y; + + for (Node *node in [[[self doc] pickSupport] selectedNodes]) { + NSPoint p = [transformer toScreen:[node point]]; + p.x += dx; + p.y += dy; + [node setPoint:[transformer fromScreen:p]]; + } +} + +- (void) deselectAllNodes { + [[[self doc] pickSupport] deselectAllNodes]; +} + +- (void) deselectAllEdges { + [[[self doc] pickSupport] deselectAllEdges]; +} + +- (void) deselectAll { + [[[self doc] pickSupport] deselectAllNodes]; + [[[self doc] pickSupport] deselectAllEdges]; +} + +- (BOOL) circleWithCenter:(NSPoint)c andRadius:(float)r containsPoint:(NSPoint)p { + return (NSDistanceBetweenPoints(c, p) <= r); +} + +- (void) lookForControlPointAt:(NSPoint)pos { + const float cpr = [Edge controlPointRadius]; + for (Edge *e in [[[self doc] pickSupport] selectedEdges]) { + NSPoint cp1 = [[renderer transformer] toScreen:[e cp1]]; + if ([self circleWithCenter:cp1 andRadius:cpr containsPoint:pos]) { + state = DragEdgeControlPoint1; + modifyEdge = e; + [[self doc] startModifyEdge:e]; + return; + } + NSPoint cp2 = [[renderer transformer] toScreen:[e cp2]]; + if ([self circleWithCenter:cp2 andRadius:cpr containsPoint:pos]) { + state = DragEdgeControlPoint2; + modifyEdge = e; + [[self doc] startModifyEdge:e]; + return; + } + } +} + +- (void) setSelectionBox:(NSRect)box { + NSRect invRect = NSUnionRect (selectionBox, box); + selectionBox = box; + [renderer invalidateRect:NSInsetRect (invRect, -2, -2)]; +} + +- (void) clearSelectionBox { + NSRect oldRect = selectionBox; + + selectionBox = NSZeroRect; + + [renderer invalidateRect:NSInsetRect (oldRect, -2, -2)]; + [renderer clearHighlightedNodes]; +} + +- (BOOL) selectionBoxContainsNode:(Node*)node { + if (!NSIsEmptyRect (selectionBox)) + return NO; + + Transformer *transf = [[renderer surface] transformer]; + NSPoint screenPt = [transf toScreen:[node point]]; + return NSPointInRect(screenPt, selectionBox); +} +@end + +static void drag_select_mode_cb (GtkToggleButton *button, SelectTool *tool) { + if (gtk_toggle_button_get_active (button)) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + DragSelectMode buttonMode = + (DragSelectMode) g_object_get_data ( + G_OBJECT (button), + DRAG_SELECT_MODE_KEY); + [tool setDragSelectMode:buttonMode]; + [pool drain]; + } +} + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/SelectionPane.h b/tikzit-1/src/gtk/SelectionPane.h new file mode 100644 index 0000000..57a766a --- /dev/null +++ b/tikzit-1/src/gtk/SelectionPane.h @@ -0,0 +1,56 @@ +/* + * Copyright 2011-2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import + +@class Configuration; +@class EdgeStylesModel; +@class NodeStylesModel; +@class StyleManager; +@class TikzDocument; + +@interface SelectionPane: NSObject { + TikzDocument *document; + + NodeStylesModel *nodeStylesModel; + EdgeStylesModel *edgeStylesModel; + + GtkWidget *layout; + + GtkWidget *nodeStyleCombo; + GtkWidget *applyNodeStyleButton; + GtkWidget *clearNodeStyleButton; + GtkWidget *edgeStyleCombo; + GtkWidget *applyEdgeStyleButton; + GtkWidget *clearEdgeStyleButton; +} + +@property (retain) TikzDocument *document; +@property (assign) BOOL visible; +@property (readonly) GtkWidget *gtkWidget; + +- (id) initWithStyleManager:(StyleManager*)mgr; +- (id) initWithNodeStylesModel:(NodeStylesModel*)nsm + andEdgeStylesModel:(EdgeStylesModel*)esm; + +- (void) loadConfiguration:(Configuration*)config; +- (void) saveConfiguration:(Configuration*)config; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/SelectionPane.m b/tikzit-1/src/gtk/SelectionPane.m new file mode 100644 index 0000000..2931258 --- /dev/null +++ b/tikzit-1/src/gtk/SelectionPane.m @@ -0,0 +1,432 @@ +/* + * Copyright 2011-2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "SelectionPane.h" + +#import "Configuration.h" +#import "EdgeStylesModel.h" +#import "NodeStylesModel.h" +#import "TikzDocument.h" + +#import "gtkhelpers.h" + +// {{{ Internal interfaces + +static void node_style_changed_cb (GtkComboBox *widget, SelectionPane *pane); +static void apply_node_style_button_cb (GtkButton *widget, SelectionPane *pane); +static void clear_node_style_button_cb (GtkButton *widget, SelectionPane *pane); +static void edge_style_changed_cb (GtkComboBox *widget, SelectionPane *pane); +static void apply_edge_style_button_cb (GtkButton *widget, SelectionPane *pane); +static void clear_edge_style_button_cb (GtkButton *widget, SelectionPane *pane); + +static void setup_style_cell_layout (GtkCellLayout *cell_layout, gint pixbuf_col, gint name_col); + +@interface SelectionPane (Notifications) +- (void) nodeSelectionChanged:(NSNotification*)n; +- (void) edgeSelectionChanged:(NSNotification*)n; +@end + +@interface SelectionPane (Private) +- (void) _updateNodeStyleButtons; +- (void) _updateEdgeStyleButtons; +- (NodeStyle*) _selectedNodeStyle; +- (EdgeStyle*) _selectedEdgeStyle; +- (void) _applyNodeStyle; +- (void) _clearNodeStyle; +- (void) _applyEdgeStyle; +- (void) _clearEdgeStyle; +@end + +// }}} +// {{{ API + +@implementation SelectionPane + +- (id) init { + [self release]; + return nil; +} + +- (id) initWithStyleManager:(StyleManager*)sm { + return [self initWithNodeStylesModel:[NodeStylesModel modelWithStyleManager:sm] + andEdgeStylesModel:[EdgeStylesModel modelWithStyleManager:sm]]; +} + +- (id) initWithNodeStylesModel:(NodeStylesModel*)nsm + andEdgeStylesModel:(EdgeStylesModel*)esm { + self = [super init]; + + if (self) { + nodeStylesModel = [nsm retain]; + edgeStylesModel = [esm retain]; + + layout = gtk_vbox_new (FALSE, 0); + g_object_ref_sink (layout); + gtk_widget_show (layout); + + GtkWidget *label = gtk_label_new ("Selection"); + label_set_bold (GTK_LABEL (label)); + gtk_widget_show (label); + gtk_box_pack_start (GTK_BOX (layout), label, + FALSE, FALSE, 0); + + GtkWidget *lvl1_box = gtk_vbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (layout), lvl1_box, + FALSE, FALSE, 3); + + nodeStyleCombo = gtk_combo_box_new_with_model ([nodeStylesModel model]); + g_object_ref_sink (nodeStyleCombo); + setup_style_cell_layout (GTK_CELL_LAYOUT (nodeStyleCombo), + NODE_STYLES_ICON_COL, + NODE_STYLES_NAME_COL); + g_signal_connect (G_OBJECT (nodeStyleCombo), + "changed", + G_CALLBACK (node_style_changed_cb), + self); + gtk_box_pack_start (GTK_BOX (lvl1_box), nodeStyleCombo, + FALSE, FALSE, 0); + + GtkWidget *lvl2_box = gtk_hbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (lvl1_box), lvl2_box, + FALSE, FALSE, 0); + + applyNodeStyleButton = gtk_button_new_with_label ("Apply"); + g_object_ref_sink (applyNodeStyleButton); + gtk_widget_set_tooltip_text (applyNodeStyleButton, "Apply style to selected nodes"); + gtk_widget_set_sensitive (applyNodeStyleButton, FALSE); + g_signal_connect (G_OBJECT (applyNodeStyleButton), + "clicked", + G_CALLBACK (apply_node_style_button_cb), + self); + gtk_box_pack_start (GTK_BOX (lvl2_box), applyNodeStyleButton, + FALSE, FALSE, 0); + + clearNodeStyleButton = gtk_button_new_with_label ("Clear"); + g_object_ref_sink (clearNodeStyleButton); + gtk_widget_set_tooltip_text (clearNodeStyleButton, "Clear style from selected nodes"); + gtk_widget_set_sensitive (clearNodeStyleButton, FALSE); + g_signal_connect (G_OBJECT (clearNodeStyleButton), + "clicked", + G_CALLBACK (clear_node_style_button_cb), + self); + gtk_box_pack_start (GTK_BOX (lvl2_box), clearNodeStyleButton, + FALSE, FALSE, 0); + + lvl1_box = gtk_vbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (layout), lvl1_box, + FALSE, FALSE, 3); + + edgeStyleCombo = gtk_combo_box_new_with_model ([edgeStylesModel model]); + g_object_ref_sink (edgeStyleCombo); + setup_style_cell_layout (GTK_CELL_LAYOUT (edgeStyleCombo), + EDGE_STYLES_ICON_COL, + EDGE_STYLES_NAME_COL); + g_signal_connect (G_OBJECT (edgeStyleCombo), + "changed", + G_CALLBACK (edge_style_changed_cb), + self); + gtk_box_pack_start (GTK_BOX (lvl1_box), edgeStyleCombo, + FALSE, FALSE, 0); + + lvl2_box = gtk_hbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (lvl1_box), lvl2_box, + FALSE, FALSE, 0); + + applyEdgeStyleButton = gtk_button_new_with_label ("Apply"); + g_object_ref_sink (applyEdgeStyleButton); + gtk_widget_set_tooltip_text (applyEdgeStyleButton, "Apply style to selected edges"); + gtk_widget_set_sensitive (applyEdgeStyleButton, FALSE); + g_signal_connect (G_OBJECT (applyEdgeStyleButton), + "clicked", + G_CALLBACK (apply_edge_style_button_cb), + self); + gtk_box_pack_start (GTK_BOX (lvl2_box), applyEdgeStyleButton, + FALSE, FALSE, 0); + + clearEdgeStyleButton = gtk_button_new_with_label ("Clear"); + g_object_ref_sink (clearEdgeStyleButton); + gtk_widget_set_tooltip_text (clearEdgeStyleButton, "Clear style from selected edges"); + gtk_widget_set_sensitive (clearEdgeStyleButton, FALSE); + g_signal_connect (G_OBJECT (clearEdgeStyleButton), + "clicked", + G_CALLBACK (clear_edge_style_button_cb), + self); + gtk_box_pack_start (GTK_BOX (lvl2_box), clearEdgeStyleButton, + FALSE, FALSE, 0); + + gtk_widget_show_all (layout); + } + + return self; +} + +- (void) dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + + g_object_unref (nodeStyleCombo); + g_object_unref (applyNodeStyleButton); + g_object_unref (clearNodeStyleButton); + g_object_unref (edgeStyleCombo); + g_object_unref (applyEdgeStyleButton); + g_object_unref (clearEdgeStyleButton); + + g_object_unref (layout); + + [nodeStylesModel release]; + [edgeStylesModel release]; + + [document release]; + + [super dealloc]; +} + +- (TikzDocument*) document { + return document; +} + +- (void) setDocument:(TikzDocument*)doc { + if (document != nil) { + [[NSNotificationCenter defaultCenter] + removeObserver:self + name:nil + object:[document pickSupport]]; + } + + [doc retain]; + [document release]; + document = doc; + + if (doc != nil) { + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(nodeSelectionChanged:) + name:@"NodeSelectionChanged" object:[doc pickSupport]]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(edgeSelectionChanged:) + name:@"EdgeSelectionChanged" object:[doc pickSupport]]; + } + + [self _updateNodeStyleButtons]; + [self _updateEdgeStyleButtons]; +} + +- (BOOL) visible { + return gtk_widget_get_visible (layout); +} + +- (void) setVisible:(BOOL)visible { + gtk_widget_set_visible (layout, visible); +} + +- (GtkWidget*) gtkWidget { + return layout; +} + +- (void) loadConfiguration:(Configuration*)config { + NSString *nodeStyleName = [config stringEntry:@"SelectedNodeStyle" + inGroup:@"SelectionPane" + withDefault:nil]; + NodeStyle *nodeStyle = [[nodeStylesModel styleManager] nodeStyleForName:nodeStyleName]; + if (nodeStyle == nil) { + gtk_combo_box_set_active (GTK_COMBO_BOX (nodeStyleCombo), -1); + } else { + GtkTreeIter *iter = [nodeStylesModel iterFromStyle:nodeStyle]; + if (iter) { + gtk_combo_box_set_active_iter (GTK_COMBO_BOX (nodeStyleCombo), iter); + gtk_tree_iter_free (iter); + } + } + + NSString *edgeStyleName = [config stringEntry:@"SelectedEdgeStyle" + inGroup:@"SelectionPane" + withDefault:nil]; + EdgeStyle *edgeStyle = [[edgeStylesModel styleManager] edgeStyleForName:edgeStyleName]; + if (edgeStyle == nil) { + gtk_combo_box_set_active (GTK_COMBO_BOX (edgeStyleCombo), -1); + } else { + GtkTreeIter *iter = [edgeStylesModel iterFromStyle:edgeStyle]; + if (iter) { + gtk_combo_box_set_active_iter (GTK_COMBO_BOX (edgeStyleCombo), iter); + gtk_tree_iter_free (iter); + } + } +} + +- (void) saveConfiguration:(Configuration*)config { + [config setStringEntry:@"SelectedNodeStyle" + inGroup:@"SelectionPane" + value:[[self _selectedNodeStyle] name]]; + [config setStringEntry:@"SelectedEdgeStyle" + inGroup:@"SelectionPane" + value:[[self _selectedEdgeStyle] name]]; +} + +@end + +// }}} +// {{{ Notifications + +@implementation SelectionPane (Notifications) +- (void) nodeSelectionChanged:(NSNotification*)n { + [self _updateNodeStyleButtons]; +} + +- (void) edgeSelectionChanged:(NSNotification*)n { + [self _updateEdgeStyleButtons]; +} +@end + +// }}} +// {{{ Private + +@implementation SelectionPane (Private) +- (void) _updateNodeStyleButtons { + gboolean hasNodeSelection = [[[document pickSupport] selectedNodes] count] > 0; + + gtk_widget_set_sensitive (applyNodeStyleButton, + hasNodeSelection && [self _selectedNodeStyle] != nil); + gtk_widget_set_sensitive (clearNodeStyleButton, hasNodeSelection); +} + +- (void) _updateEdgeStyleButtons { + gboolean hasEdgeSelection = [[[document pickSupport] selectedEdges] count] > 0; + + gtk_widget_set_sensitive (applyEdgeStyleButton, + hasEdgeSelection && [self _selectedEdgeStyle] != nil); + gtk_widget_set_sensitive (clearEdgeStyleButton, hasEdgeSelection); +} + +- (NodeStyle*) _selectedNodeStyle { + GtkTreeIter iter; + if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (nodeStyleCombo), &iter)) { + return [nodeStylesModel styleFromIter:&iter]; + } else { + return nil; + } +} + +- (EdgeStyle*) _selectedEdgeStyle { + GtkTreeIter iter; + if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (edgeStyleCombo), &iter)) { + return [edgeStylesModel styleFromIter:&iter]; + } else { + return nil; + } +} + +- (void) _applyNodeStyle { + [document startModifyNodes:[[document pickSupport] selectedNodes]]; + + NodeStyle *style = [self _selectedNodeStyle]; + for (Node *node in [[document pickSupport] selectedNodes]) { + [node setStyle:style]; + } + + [document endModifyNodes]; +} + +- (void) _clearNodeStyle { + [document startModifyNodes:[[document pickSupport] selectedNodes]]; + + for (Node *node in [[document pickSupport] selectedNodes]) { + [node setStyle:nil]; + } + + [document endModifyNodes]; +} + +- (void) _applyEdgeStyle { + [document startModifyEdges:[[document pickSupport] selectedEdges]]; + + EdgeStyle *style = [self _selectedEdgeStyle]; + for (Edge *edge in [[document pickSupport] selectedEdges]) { + [edge setStyle:style]; + } + + [document endModifyEdges]; +} + +- (void) _clearEdgeStyle { + [document startModifyEdges:[[document pickSupport] selectedEdges]]; + + for (Edge *edge in [[document pickSupport] selectedEdges]) { + [edge setStyle:nil]; + } + + [document endModifyEdges]; +} +@end + +// }}} +// {{{ GTK+ callbacks + +static void node_style_changed_cb (GtkComboBox *widget, SelectionPane *pane) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [pane _updateNodeStyleButtons]; + [pool drain]; +} + +static void apply_node_style_button_cb (GtkButton *widget, SelectionPane *pane) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [pane _applyNodeStyle]; + [pool drain]; +} + +static void clear_node_style_button_cb (GtkButton *widget, SelectionPane *pane) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [pane _clearNodeStyle]; + [pool drain]; +} + +static void edge_style_changed_cb (GtkComboBox *widget, SelectionPane *pane) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [pane _updateEdgeStyleButtons]; + [pool drain]; +} + +static void apply_edge_style_button_cb (GtkButton *widget, SelectionPane *pane) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [pane _applyEdgeStyle]; + [pool drain]; +} + +static void clear_edge_style_button_cb (GtkButton *widget, SelectionPane *pane) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [pane _clearEdgeStyle]; + [pool drain]; +} + +// }}} +// +static void setup_style_cell_layout (GtkCellLayout *cell_layout, gint pixbuf_col, gint name_col) { + gtk_cell_layout_clear (cell_layout); + GtkCellRenderer *pixbuf_renderer = gtk_cell_renderer_pixbuf_new (); + gtk_cell_layout_pack_start (cell_layout, pixbuf_renderer, FALSE); + gtk_cell_layout_set_attributes ( + cell_layout, + pixbuf_renderer, + "pixbuf", pixbuf_col, + NULL); + GtkCellRenderer *text_renderer = gtk_cell_renderer_text_new (); + gtk_cell_layout_pack_start (cell_layout, text_renderer, FALSE); + gtk_cell_layout_set_attributes ( + cell_layout, + text_renderer, + "text", name_col, + NULL); +} + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/SettingsDialog.h b/tikzit-1/src/gtk/SettingsDialog.h new file mode 100644 index 0000000..0f687b3 --- /dev/null +++ b/tikzit-1/src/gtk/SettingsDialog.h @@ -0,0 +1,54 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import + +@class Configuration; +@class EdgeStylesPalette; +@class NodeStylesPalette; +@class StyleManager; + +@interface SettingsDialog: NSObject { + Configuration *configuration; + StyleManager *styleManager; + StyleManager *tempStyleManager; + NodeStylesPalette *nodePalette; + EdgeStylesPalette *edgePalette; + + GtkWindow *parentWindow; + GtkWindow *window; + + // we don't keep any refs, as we control + // the top window + GtkEntry *pdflatexPathEntry; +} + +@property (retain) Configuration *configuration; +@property (retain) StyleManager *styleManager; +@property (assign) GtkWindow *parentWindow; +@property (assign,getter=isVisible) BOOL visible; + +- (id) initWithConfiguration:(Configuration*)c andStyleManager:(StyleManager*)m; + +- (void) present; +- (void) show; +- (void) hide; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/SettingsDialog.m b/tikzit-1/src/gtk/SettingsDialog.m new file mode 100644 index 0000000..bdb5db6 --- /dev/null +++ b/tikzit-1/src/gtk/SettingsDialog.m @@ -0,0 +1,328 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "SettingsDialog.h" + +#import "Application.h" +#import "Configuration.h" +#import "EdgeStylesPalette.h" +#import "NodeStylesPalette.h" +#import "StyleManager.h" + +// {{{ Internal interfaces +// {{{ Signals +static gboolean window_delete_event_cb (GtkWidget *widget, + GdkEvent *event, + SettingsDialog *dialog); +static void ok_button_clicked_cb (GtkButton *widget, SettingsDialog *dialog); +static void cancel_button_clicked_cb (GtkButton *widget, SettingsDialog *dialog); +// }}} + +@interface SettingsDialog (Private) +- (void) loadUi; +- (void) save; +- (void) revert; +@end + +// }}} +// {{{ API + +@implementation SettingsDialog + +- (id) init { + [self release]; + return nil; +} + +- (id) initWithConfiguration:(Configuration*)c andStyleManager:(StyleManager*)m { + self = [super init]; + + if (self) { + configuration = [c retain]; + styleManager = [m retain]; + tempStyleManager = [m copy]; + } + + return self; +} + +- (void) dealloc { + if (window) { + gtk_widget_destroy (GTK_WIDGET (window)); + } + if (parentWindow) { + g_object_unref (parentWindow); + } + + [configuration release]; + [tempStyleManager release]; + [styleManager release]; + [nodePalette release]; + [edgePalette release]; + + [super dealloc]; +} + +- (Configuration*) configuration { + return configuration; +} + +- (void) setConfiguration:(Configuration*)c { + [c retain]; + [configuration release]; + configuration = c; + [self revert]; +} + +- (StyleManager*) styleManager { + return styleManager; +} + +- (void) setStyleManager:(StyleManager*)m { + [m retain]; + [styleManager release]; + styleManager = m; +} + +- (GtkWindow*) parentWindow { + return parentWindow; +} + +- (void) setParentWindow:(GtkWindow*)parent { + GtkWindow *oldParent = parentWindow; + + if (parent) + g_object_ref (parent); + parentWindow = parent; + if (oldParent) + g_object_unref (oldParent); + + if (window) { + gtk_window_set_transient_for (window, parentWindow); + } +} + +- (void) present { + [self loadUi]; + [self revert]; + gtk_window_present (GTK_WINDOW (window)); +} + +- (void) show { + [self loadUi]; + [self revert]; + gtk_widget_show (GTK_WIDGET (window)); +} + +- (void) hide { + if (!window) { + return; + } + gtk_widget_hide (GTK_WIDGET (window)); +} + +- (BOOL) isVisible { + if (!window) { + return NO; + } + gboolean visible; + g_object_get (G_OBJECT (window), "visible", &visible, NULL); + return visible ? YES : NO; +} + +- (void) setVisible:(BOOL)visible { + if (visible) { + [self show]; + } else { + [self hide]; + } +} + +@end + +// }}} +// {{{ Private + +@implementation SettingsDialog (Private) +- (void) loadUi { + if (window) { + return; + } + + nodePalette = [[NodeStylesPalette alloc] initWithManager:tempStyleManager]; + edgePalette = [[EdgeStylesPalette alloc] initWithManager:tempStyleManager]; + + window = GTK_WINDOW (gtk_window_new (GTK_WINDOW_TOPLEVEL)); + gtk_window_set_default_size (window, 570, -1); + gtk_window_set_title (window, "TikZiT Configuration"); + gtk_window_set_modal (window, TRUE); + gtk_window_set_position (window, GTK_WIN_POS_CENTER_ON_PARENT); + gtk_window_set_type_hint (window, GDK_WINDOW_TYPE_HINT_DIALOG); + if (parentWindow) { + gtk_window_set_transient_for (window, parentWindow); + } + g_signal_connect (window, + "delete-event", + G_CALLBACK (window_delete_event_cb), + self); + + GtkWidget *mainBox = gtk_vbox_new (FALSE, 18); + gtk_container_set_border_width (GTK_CONTAINER (mainBox), 12); + gtk_container_add (GTK_CONTAINER (window), mainBox); + gtk_widget_show (mainBox); + +#ifdef HAVE_POPPLER + /* + * Path for pdflatex + */ + + GtkWidget *pdflatexFrame = gtk_frame_new ("Previews"); + gtk_box_pack_start (GTK_BOX (mainBox), pdflatexFrame, TRUE, TRUE, 0); + + GtkBox *pdflatexBox = GTK_BOX (gtk_hbox_new (FALSE, 6)); + gtk_container_add (GTK_CONTAINER (pdflatexFrame), GTK_WIDGET (pdflatexBox)); + gtk_container_set_border_width (GTK_CONTAINER (pdflatexBox), 6); + + GtkWidget *pdflatexLabel = gtk_label_new ("Path to pdflatex:"); + gtk_misc_set_alignment (GTK_MISC (pdflatexLabel), 0, 0.5); + gtk_box_pack_start (pdflatexBox, + pdflatexLabel, + FALSE, TRUE, 0); + + pdflatexPathEntry = GTK_ENTRY (gtk_entry_new ()); + gtk_box_pack_start (pdflatexBox, + GTK_WIDGET (pdflatexPathEntry), + TRUE, TRUE, 0); + + gtk_widget_show_all (pdflatexFrame); +#else + pdflatexPathEntry = NULL; +#endif + + /* + * Node styles + */ + GtkWidget *nodeStylesFrame = gtk_frame_new ("Node Styles"); + gtk_widget_show (nodeStylesFrame); + gtk_box_pack_start (GTK_BOX (mainBox), nodeStylesFrame, TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (nodeStylesFrame), + GTK_WIDGET ([nodePalette widget])); + gtk_widget_show ([nodePalette widget]); + + + /* + * Edge styles + */ + GtkWidget *edgeStylesFrame = gtk_frame_new ("Edge Styles"); + gtk_widget_show (edgeStylesFrame); + gtk_box_pack_start (GTK_BOX (mainBox), edgeStylesFrame, TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (edgeStylesFrame), + GTK_WIDGET ([edgePalette widget])); + gtk_widget_show ([edgePalette widget]); + + + /* + * Bottom buttons + */ + + GtkContainer *buttonBox = GTK_CONTAINER (gtk_hbutton_box_new ()); + gtk_box_set_spacing (GTK_BOX (buttonBox), 6); + gtk_button_box_set_layout (GTK_BUTTON_BOX (buttonBox), GTK_BUTTONBOX_END); + gtk_box_pack_start (GTK_BOX (mainBox), + GTK_WIDGET (buttonBox), + FALSE, TRUE, 0); + + GtkWidget *okButton = gtk_button_new_from_stock (GTK_STOCK_OK); + gtk_container_add (buttonBox, okButton); + g_signal_connect (okButton, + "clicked", + G_CALLBACK (ok_button_clicked_cb), + self); + + GtkWidget *cancelButton = gtk_button_new_from_stock (GTK_STOCK_CANCEL); + gtk_container_add (buttonBox, cancelButton); + g_signal_connect (cancelButton, + "clicked", + G_CALLBACK (cancel_button_clicked_cb), + self); + + gtk_widget_show_all (GTK_WIDGET (buttonBox)); + + [self revert]; +} + +- (void) save { + if (!window) + return; + +#ifdef HAVE_POPPLER + const gchar *path = gtk_entry_get_text (pdflatexPathEntry); + if (path && *path) { + [configuration setStringEntry:@"pdflatex" + inGroup:@"Previews" + value:[NSString stringWithUTF8String:path]]; + } +#endif + + [styleManager updateFromManager:tempStyleManager]; + + [app saveConfiguration]; +} + +- (void) revert { + if (!window) + return; + +#ifdef HAVE_POPPLER + NSString *path = [configuration stringEntry:@"pdflatex" + inGroup:@"Previews" + withDefault:@"pdflatex"]; + gtk_entry_set_text (pdflatexPathEntry, [path UTF8String]); +#endif + + [tempStyleManager updateFromManager:styleManager]; +} +@end + +// }}} +// {{{ GTK+ callbacks + +static gboolean window_delete_event_cb (GtkWidget *widget, + GdkEvent *event, + SettingsDialog *dialog) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [dialog hide]; + [pool drain]; + return TRUE; // we dealt with this event +} + +static void ok_button_clicked_cb (GtkButton *widget, SettingsDialog *dialog) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [dialog save]; + [dialog hide]; + [pool drain]; +} + +static void cancel_button_clicked_cb (GtkButton *widget, SettingsDialog *dialog) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [dialog hide]; + [pool drain]; +} + +// }}} + +// vim:ft=objc:ts=4:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/Shape+Render.h b/tikzit-1/src/gtk/Shape+Render.h new file mode 100644 index 0000000..a744c77 --- /dev/null +++ b/tikzit-1/src/gtk/Shape+Render.h @@ -0,0 +1,29 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import "Shape.h" +#import "RenderContext.h" +#import "Surface.h" + +@interface Shape (Render) + +- (void) drawPathWithTransform:(Transformer*)transform andContext:(id)context; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/Shape+Render.m b/tikzit-1/src/gtk/Shape+Render.m new file mode 100644 index 0000000..924bb24 --- /dev/null +++ b/tikzit-1/src/gtk/Shape+Render.m @@ -0,0 +1,57 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "Shape+Render.h" + +#import "Edge.h" + +// we use cairo for finding the bounding box etc. +#import + +@implementation Shape (Render) + +- (void) drawPathWithTransform:(Transformer*)transform andContext:(id)context { + [context startPath]; + + for (NSArray *arr in [self paths]) { + BOOL fst = YES; + NSPoint p, cp1, cp2; + + for (Edge *e in arr) { + if (fst) { + fst = NO; + p = [transform toScreen:[[e source] point]]; + [context moveTo:p]; + } + + p = [transform toScreen:[[e target] point]]; + if ([e isStraight]) { + [context lineTo:p]; + } else { + cp1 = [transform toScreen:[e cp1]]; + cp2 = [transform toScreen:[e cp2]]; + [context curveTo:p withCp1:cp1 andCp2:cp2]; + } + } + + [context closeSubPath]; + } +} + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/StyleManager+Storage.h b/tikzit-1/src/gtk/StyleManager+Storage.h new file mode 100644 index 0000000..1727786 --- /dev/null +++ b/tikzit-1/src/gtk/StyleManager+Storage.h @@ -0,0 +1,26 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import "StyleManager.h" + +@interface StyleManager (Storage) +- (void) loadStylesUsingConfigurationName:(NSString*)name; +- (void) saveStylesUsingConfigurationName:(NSString*)name; +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/StyleManager+Storage.m b/tikzit-1/src/gtk/StyleManager+Storage.m new file mode 100644 index 0000000..f4c8232 --- /dev/null +++ b/tikzit-1/src/gtk/StyleManager+Storage.m @@ -0,0 +1,82 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "StyleManager+Storage.h" +#import "Configuration.h" +#import "NodeStyle+Storage.h" +#import "EdgeStyle+Storage.h" + +static NSString *nodeStyleGroupPrefix = @"Style "; +static NSString *edgeStyleGroupPrefix = @"EdgeStyle "; + +@implementation StyleManager (Storage) + +- (void) loadStylesUsingConfigurationName:(NSString*)name { + if (![Configuration configurationExistsWithName:name]) { + NSLog(@"No styles config found"); + return; + } + NSError *error = nil; + Configuration *stylesConfig = [Configuration configurationWithName:name loadError:&error]; + if (error != nil) { + logError (error, @"Could not load styles configuration"); + // stick with the default config + return; + } + NSArray *groups = [stylesConfig groups]; + NSMutableArray *ns = [NSMutableArray arrayWithCapacity:[groups count]]; + NSMutableArray *es = [NSMutableArray arrayWithCapacity:[groups count]]; + + for (NSString *groupName in groups) { + if ([groupName hasPrefix:nodeStyleGroupPrefix]) { + NodeStyle *style = [[NodeStyle alloc] initFromConfigurationGroup:groupName config:stylesConfig]; + [ns addObject:style]; + } else if ([groupName hasPrefix:edgeStyleGroupPrefix]) { + EdgeStyle *style = [[EdgeStyle alloc] initFromConfigurationGroup:groupName config:stylesConfig]; + [es addObject:style]; + } + } + + [self _setNodeStyles:ns]; + [self _setEdgeStyles:es]; +} + +- (void) saveStylesUsingConfigurationName:(NSString*)name { + NSError *error = nil; + Configuration *stylesConfig = [Configuration emptyConfigurationWithName:name]; + NSArray *ns = [self nodeStyles]; + NSArray *es = [self edgeStyles]; + NSUInteger length = [ns count]; + for (int i = 0; i < length; ++i) { + NodeStyle *style = [ns objectAtIndex:i]; + NSString *groupName = [NSString stringWithFormat:@"%@%d", nodeStyleGroupPrefix, i]; + [style storeToConfigurationGroup:groupName config:stylesConfig]; + } + length = [es count]; + for (int i = 0; i < length; ++i) { + EdgeStyle *style = [es objectAtIndex:i]; + NSString *groupName = [NSString stringWithFormat:@"%@%d", edgeStyleGroupPrefix, i]; + [style storeToConfigurationGroup:groupName config:stylesConfig]; + } + if (![stylesConfig writeToStoreWithError:&error]) { + logError (error, @"Could not write styles configuration"); + } +} + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/Surface.h b/tikzit-1/src/gtk/Surface.h new file mode 100644 index 0000000..db4288e --- /dev/null +++ b/tikzit-1/src/gtk/Surface.h @@ -0,0 +1,107 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import "RenderContext.h" +#import "Transformer.h" + +typedef enum { + NormalCursor, + ResizeRightCursor, + ResizeBottomRightCursor, + ResizeBottomCursor, + ResizeBottomLeftCursor, + ResizeLeftCursor, + ResizeTopLeftCursor, + ResizeTopCursor, + ResizeTopRightCursor +} Cursor; + +@protocol Surface; + +@protocol RenderDelegate +- (void) renderWithContext:(id)context onSurface:(id)surface; +@end + +/** + * Represents a surface that can be rendered to + * + * This protocol should be implemented by drawing surfaces. It + * provides geometry information and methods to invalidate + * regions of the surface, triggering a redraw. + * + * The surface should send a "SurfaceSizeChanged" notification + * when the width or height changes. + */ +@protocol Surface + +/** + * The width of the surface, in surface units + * + * The surface should send a "SurfaceSizeChanged" notification + * when this property changes. + */ +@property (readonly) int width; +/** + * The height of the surface, in surface units + * + * The surface should send a "SurfaceSizeChanged" notification + * when this property changes. + */ +@property (readonly) int height; +/** + * The transformer that converts between graph units and surface units + */ +@property (readonly) Transformer *transformer; +/** + * The render delegate. + * + * This will be used to redraw (parts of) the surface when necessary. + */ +@property (assign) id renderDelegate; + +/** + * Create a render context for the surface. + */ +- (id) createRenderContext; +/** + * Invalidate a portion of the surface. + * + * This will request that part of the surface be redrawn. + */ +- (void) invalidateRect:(NSRect)rect; +/** + * Invalidate the whole surface. + * + * This will request that the whole surface be redrawn. + */ +- (void) invalidate; + +- (void) zoomIn; +- (void) zoomOut; +- (void) zoomReset; +- (void) zoomInAboutPoint:(NSPoint)p; +- (void) zoomOutAboutPoint:(NSPoint)p; +- (void) zoomResetAboutPoint:(NSPoint)p; + +- (void) setCursor:(Cursor)c; + +- (BOOL) hasFocus; +- (void) renderFocus; +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/TZFoundation.h b/tikzit-1/src/gtk/TZFoundation.h new file mode 100644 index 0000000..2ff20ca --- /dev/null +++ b/tikzit-1/src/gtk/TZFoundation.h @@ -0,0 +1,30 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import +#import + +#import "NSError+Glib.h" +#import "NSError+Tikzit.h" +#import "NSFileManager+Glib.h" +#import "NSFileManager+Utils.h" +#import "NSString+Glib.h" +#import "NSString+LatexConstants.h" +#import "NSString+Tikz.h" +#import "NSString+Util.h" + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/TikzDocument.h b/tikzit-1/src/gtk/TikzDocument.h new file mode 100644 index 0000000..5d15d13 --- /dev/null +++ b/tikzit-1/src/gtk/TikzDocument.h @@ -0,0 +1,149 @@ +// +// TikzDocument.h +// TikZiT +// +// Copyright 2010 Chris Heunen +// Copyright 2010 Alex Merry +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "TZFoundation.h" +#import +#import "PickSupport.h" +#import "StyleManager.h" + +@interface TikzDocument : NSObject { + StyleManager *styleManager; + Graph *graph; + PickSupport *pickSupport; + NSUndoManager *undoManager; + NSString *tikz; + NSString *path; + NSSet *nodesetBeingModified; + NSMapTable *nodesetBeingModifiedOldCopy; + NSSet *edgesetBeingModified; + NSMapTable *edgesetBeingModifiedOldCopy; + NSPoint currentNodeShift; + Node *nodeBeingModified; + Node *nodeBeingModifiedOldCopy; + Edge *edgeBeingModified; + Edge *edgeBeingModifiedOldCopy; + NSRect oldGraphBounds; + GraphElementData *oldGraphData; + BOOL hasChanges; +} + ++ (TikzDocument*) documentWithStyleManager:(StyleManager*)manager; ++ (TikzDocument*) documentWithGraph:(Graph*)g styleManager:(StyleManager*)manager; ++ (TikzDocument*) documentWithTikz:(NSString*)t styleManager:(StyleManager*)manager error:(NSError**)error; ++ (TikzDocument*) documentFromFile:(NSString*)path styleManager:(StyleManager*)manager error:(NSError**)error; + +- (id) initWithStyleManager:(StyleManager*)manager; +- (id) initWithGraph:(Graph*)g styleManager:(StyleManager*)manager; +- (id) initWithTikz:(NSString*)t styleManager:(StyleManager*)manager error:(NSError**)error; +- (id) initFromFile:(NSString*)path styleManager:(StyleManager*)manager error:(NSError**)error; + +@property (readonly) Graph *graph; +@property (readonly) PickSupport *pickSupport; +@property (readonly) NSString *path; +@property (readonly) NSString *name; +@property (readonly) NSString *suggestedFileName; +@property (readonly) BOOL hasUnsavedChanges; +@property (retain) StyleManager *styleManager; +@property (readonly) NSString *tikz; +@property (readonly) BOOL canUndo; +@property (readonly) BOOL canRedo; +@property (readonly) NSString *undoName; +@property (readonly) NSString *redoName; + +- (BOOL) updateTikz:(NSString*)t error:(NSError**)error; + +- (Graph*) selectionCut; +- (Graph*) selectionCopy; +- (void) paste:(Graph*)graph; +- (void) pasteFromTikz:(NSString*)tikz; + +// some convenience methods: +- (BOOL) isNodeSelected:(Node*)node; +- (BOOL) isEdgeSelected:(Edge*)edge; +- (NSEnumerator*) nodeEnumerator; +- (NSEnumerator*) edgeEnumerator; + +- (void) undo; +- (void) redo; + +- (void) startUndoGroup; +- (void) nameAndEndUndoGroup:(NSString*)nm; +- (void) endUndoGroup; + +- (void) startModifyNode:(Node*)node; +- (void) modifyNodeCheckPoint; +- (void) endModifyNode; +- (void) cancelModifyNode; + +- (void) startModifyNodes:(NSSet*)nodes; +- (void) modifyNodesCheckPoint; +- (void) endModifyNodes; +- (void) cancelModifyNodes; + +- (void) startShiftNodes:(NSSet*)nodes; +- (void) shiftNodesUpdate:(NSPoint)shiftChange; +- (void) endShiftNodes; +- (void) cancelShiftNodes; + +- (void) startModifyEdge:(Edge*)edge; +- (void) modifyEdgeCheckPoint; +- (void) endModifyEdge; +- (void) cancelModifyEdge; + +- (void) startModifyEdges:(NSSet*)edges; +- (void) modifyEdgesCheckPoint; +- (void) endModifyEdges; +- (void) cancelModifyEdges; + +- (void) startChangeBoundingBox; +- (void) changeBoundingBoxCheckPoint; +- (void) endChangeBoundingBox; +- (void) cancelChangeBoundingBox; + +- (void) startChangeGraphProperties; +- (void) changeGraphPropertiesCheckPoint; +- (void) endChangeGraphProperties; +- (void) cancelChangeGraphProperties; + +- (void) removeSelected; +- (void) addNode:(Node*)node; +- (void) removeNode:(Node*)node; +- (void) addEdge:(Edge*)edge; +- (void) removeEdge:(Edge*)edge; +- (void) shiftSelectedNodesByPoint:(NSPoint)offset; +- (void) insertGraph:(Graph*)g; +- (void) flipSelectedNodesHorizontally; +- (void) flipSelectedNodesVertically; +- (void) reverseSelectedEdges; +- (void) bringSelectionForward; +- (void) bringSelectionToFront; +- (void) sendSelectionBackward; +- (void) sendSelectionToBack; + +- (BOOL) saveCopyToPath: (NSString*)path error: (NSError**)error; +- (BOOL) saveToPath: (NSString*)path error: (NSError**)error; +- (BOOL) save: (NSError**)error; + +@end + +// vim:ft=objc:sts=4:sw=4:et diff --git a/tikzit-1/src/gtk/TikzDocument.m b/tikzit-1/src/gtk/TikzDocument.m new file mode 100644 index 0000000..bff5a2e --- /dev/null +++ b/tikzit-1/src/gtk/TikzDocument.m @@ -0,0 +1,911 @@ +// +// TikzDocument.h +// TikZiT +// +// Copyright 2010 Chris Heunen +// Copyright 2010 Alex Merry +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "TikzDocument.h" + +@interface TikzDocument (Private) +- (void) styleRenamed:(NSNotification*)n; + +- (void) setPath:(NSString*)path; +- (void) setGraph:(Graph*)g; + +- (void) registerUndoForChange:(GraphChange*)change; +- (void) registerUndoGroupForChange:(GraphChange*)change withName:(NSString*)name; +- (void) undoGraphChange:(GraphChange*)change; +- (void) completedGraphChange:(GraphChange*)change withName:(NSString*)name; +- (void) attachStylesToGraph:(Graph*)g; + +- (void) regenerateTikz; +@end + +@implementation TikzDocument + ++ (TikzDocument*) documentWithStyleManager:(StyleManager*)manager +{ + return [[[TikzDocument alloc] initWithStyleManager:manager] autorelease]; +} + ++ (TikzDocument*) documentWithGraph:(Graph*)g + styleManager:(StyleManager*)manager +{ + return [[[TikzDocument alloc] initWithGraph:g + styleManager:manager] autorelease]; +} + ++ (TikzDocument*) documentWithTikz:(NSString*)t + styleManager:(StyleManager*)manager + error:(NSError**)error +{ + return [[[TikzDocument alloc] initWithTikz:t + styleManager:manager + error:error] autorelease]; +} + ++ (TikzDocument*) documentFromFile:(NSString*)pth + styleManager:(StyleManager*)manager + error:(NSError**)error +{ + return [[[TikzDocument alloc] initFromFile:pth + styleManager:manager + error:error] autorelease]; +} + + +- (id) initWithStyleManager:(StyleManager*)manager { + self = [self initWithGraph:[Graph graph] styleManager:manager]; + return self; +} + +- (id) initWithGraph:(Graph*)g styleManager:(StyleManager*)manager { + self = [super init]; + + if (self) { + graph = nil; + styleManager = [manager retain]; + pickSupport = [[PickSupport alloc] init]; + undoManager = [[NSUndoManager alloc] init]; + [undoManager setGroupsByEvent:NO]; + tikz = nil; + path = nil; + nodesetBeingModified = nil; + nodesetBeingModifiedOldCopy = nil; + nodeBeingModified = nil; + nodeBeingModifiedOldCopy = nil; + edgeBeingModified = nil; + edgeBeingModifiedOldCopy = nil; + + [undoManager disableUndoRegistration]; + [self setGraph:g]; + [undoManager enableUndoRegistration]; + + hasChanges = NO; + + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(styleRenamed:) + name:@"NodeStyleRenamed" + object:styleManager]; + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(styleRenamed:) + name:@"EdgeStyleRenamed" + object:styleManager]; + } + + return self; +} + +- (id) initWithTikz:(NSString*)t + styleManager:(StyleManager*)manager + error:(NSError**)error +{ + self = [self initWithStyleManager:manager]; + + if (self) { + [undoManager disableUndoRegistration]; + BOOL success = [self updateTikz:t error:error]; + if (!success) { + [self release]; + return nil; + } + [undoManager enableUndoRegistration]; + hasChanges = NO; + } + + return self; +} + +- (id) initFromFile:(NSString*)pth + styleManager:(StyleManager*)manager + error:(NSError**)error +{ + NSString *t = [NSString stringWithContentsOfFile:pth error:error]; + if (t == nil) { + [self release]; + return nil; + } + + self = [self initWithTikz:t styleManager:manager error:error]; + + if (self) { + [self setPath:pth]; + } + return self; +} + +- (void) dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + + [styleManager release]; + [graph release]; + [pickSupport release]; + [undoManager release]; + [tikz release]; + [path release]; + [nodesetBeingModified release]; + [nodesetBeingModifiedOldCopy release]; + [nodeBeingModified release]; + [nodeBeingModifiedOldCopy release]; + [edgeBeingModified release]; + [edgeBeingModifiedOldCopy release]; + [oldGraphData release]; + [super dealloc]; +} + +@synthesize graph, pickSupport, path; + +- (NSString*) name { + if (path) { + return [[NSFileManager defaultManager] displayNameAtPath: path]; + } else { + return @"Untitled"; + } +} + +- (NSString*) suggestedFileName { + if (path) { + return [path lastPathComponent]; + } else { + return @"untitled.tikz"; + } +} + +- (BOOL) hasUnsavedChanges { + return hasChanges; +} + +- (StyleManager*) styleManager { + return styleManager; +} + +- (void) setStyleManager:(StyleManager*)manager { + StyleManager *oldManager = styleManager; + [[NSNotificationCenter defaultCenter] + removeObserver:self + name:nil + object:oldManager]; + + styleManager = [manager retain]; + + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(styleRenamed:) + name:@"NodeStyleRenamed" + object:styleManager]; + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(styleRenamed:) + name:@"EdgeStyleRenamed" + object:styleManager]; + + [self attachStylesToGraph:graph]; + [oldManager release]; +} + +- (void) postGraphReplaced { + [[NSNotificationCenter defaultCenter] postNotificationName:@"GraphReplaced" object:self]; +} + +- (void) postGraphChange:(GraphChange*)change { + NSDictionary *info = [NSDictionary dictionaryWithObject:change forKey:@"change"]; + [[NSNotificationCenter defaultCenter] postNotificationName:@"GraphChanged" object:self userInfo:info]; +} + +- (void) postIncompleteGraphChange:(GraphChange*)change { + NSDictionary *info = [NSDictionary dictionaryWithObject:change forKey:@"change"]; + [[NSNotificationCenter defaultCenter] postNotificationName:@"GraphBeingChanged" object:self userInfo:info]; +} + +- (void) postCancelledGraphChange:(GraphChange*)change { + NSDictionary *info = [NSDictionary dictionaryWithObject:change forKey:@"change"]; + [[NSNotificationCenter defaultCenter] postNotificationName:@"GraphChangeCancelled" object:self userInfo:info]; +} + +- (void) postTikzChanged { + [[NSNotificationCenter defaultCenter] postNotificationName:@"TikzChanged" object:self]; +} + +- (void) postUndoStackChanged { + [[NSNotificationCenter defaultCenter] postNotificationName:@"UndoStackChanged" object:self]; +} + +- (NSString*) tikz { + return tikz; +} + +- (BOOL) updateTikz:(NSString*)t error:(NSError**)error { + if (t == nil) { + t = [NSString string]; + } + if (t == tikz || [t isEqual:tikz]) { + return YES; + } + + Graph *g = [Graph graphFromTikz:t error:error]; + if (g) { + // updateTikz actually generates a graph from the tikz, + // and generates the final tikz from that + [self startUndoGroup]; + [self setGraph:g]; + [self nameAndEndUndoGroup:@"Update tikz"]; + return YES; + } + + return NO; +} + +- (Graph*) selectionCut { + Graph *selection = [self selectionCopy]; + [self startUndoGroup]; + [self removeSelected]; + [self nameAndEndUndoGroup:@"Cut"]; + return selection; +} + +- (Graph*) selectionCopy { + return [[graph copyOfSubgraphWithNodes:[pickSupport selectedNodes]] autorelease]; +} + +- (void) paste:(Graph*)g { + if (g == nil || [[g nodes] count] == 0) { + // nothing to paste + return; + } + + // place to the right of the existing graph + NSRect bounds = [graph bounds]; + NSRect gBounds = [g bounds]; + float dx = NSMaxX (bounds) - gBounds.origin.x + 0.5f; + [g shiftNodes:[g nodes] byPoint:NSMakePoint (dx, 0)]; + + GraphChange *change = [graph insertGraph:g]; + [self completedGraphChange:change withName:@"Paste"]; + + // select everything from the clipboard + [pickSupport deselectAllEdges]; + [pickSupport selectAllNodes:[NSSet setWithArray:[g nodes]] replacingSelection:YES]; +} + +- (void) pasteFromTikz:(NSString*)t { + Graph *clipboard = [Graph graphFromTikz:t]; + if (clipboard) { + [self attachStylesToGraph:clipboard]; + [self paste:clipboard]; + } +} + +- (BOOL) isNodeSelected:(Node*)node { + return [pickSupport isNodeSelected:node]; +} + +- (BOOL) isEdgeSelected:(Edge*)edge { + return [pickSupport isEdgeSelected:edge]; +} + +- (NSEnumerator*) nodeEnumerator { + return [[graph nodes] objectEnumerator]; +} + +- (NSEnumerator*) edgeEnumerator { + return [[graph edges] objectEnumerator]; +} + +- (BOOL) canUndo { + return [undoManager canUndo]; +} + +- (void) undo { + [undoManager undo]; + [self postUndoStackChanged]; +} + +- (BOOL) canRedo { + return [undoManager canRedo]; +} + +- (void) redo { + [undoManager redo]; + [self postUndoStackChanged]; +} + +- (NSString*) undoName { + return [undoManager undoActionName]; +} + +- (NSString*) redoName { + return [undoManager redoActionName]; +} + +- (void) startUndoGroup { + [undoManager beginUndoGrouping]; +} + +- (void) nameAndEndUndoGroup:(NSString*)nm { + [undoManager setActionName:nm]; + [undoManager endUndoGrouping]; + [self postUndoStackChanged]; +} + +- (void) endUndoGroup { + [undoManager endUndoGrouping]; + [self postUndoStackChanged]; +} + +- (void) startModifyNode:(Node*)node { + if (nodeBeingModified != nil) { + [NSException raise:@"NSInternalInconsistencyException" format:@"Already modifying a node"]; + } + nodeBeingModified = [node retain]; + nodeBeingModifiedOldCopy = [node copy]; +} + +- (void) modifyNodeCheckPoint { + [self regenerateTikz]; + GraphChange *change = [GraphChange propertyChangeOfNode:nodeBeingModified + fromOld:nodeBeingModifiedOldCopy + toNew:[[nodeBeingModified copy] autorelease]]; + [self postIncompleteGraphChange:change]; +} + +- (void) _finishModifySequence:(GraphChange*)change withName:(NSString*)chName cancelled:(BOOL)cancelled { + if (cancelled) { + change = [change invert]; + [graph applyGraphChange:change]; + [self regenerateTikz]; + [self postCancelledGraphChange:change]; + } else { + [self registerUndoGroupForChange:change withName:chName]; + [self regenerateTikz]; + [self postGraphChange:change]; + } +} + +- (void) _finishModifyNodeCancelled:(BOOL)cancelled { + if (nodeBeingModified == nil) { + [NSException raise:@"NSInternalInconsistencyException" format:@"Not modifying a node"]; + } + + GraphChange *change = [GraphChange propertyChangeOfNode:nodeBeingModified + fromOld:nodeBeingModifiedOldCopy + toNew:[[nodeBeingModified copy] autorelease]]; + [self _finishModifySequence:change withName:@"Modify node" cancelled:cancelled]; + + [nodeBeingModified release]; + nodeBeingModified = nil; + [nodeBeingModifiedOldCopy release]; + nodeBeingModifiedOldCopy = nil; +} + +- (void) endModifyNode { [self _finishModifyNodeCancelled:NO]; } +- (void) cancelModifyNode { [self _finishModifyNodeCancelled:YES]; } + +- (void) startModifyNodes:(NSSet*)nodes { + if (nodesetBeingModified != nil) { + [NSException raise:@"NSInternalInconsistencyException" format:@"Already modifying a node set"]; + } + + nodesetBeingModified = [nodes copy]; + nodesetBeingModifiedOldCopy = [[Graph nodeTableForNodes:nodes] retain]; +} + +- (void) modifyNodesCheckPoint { + [self regenerateTikz]; + GraphChange *change = [GraphChange propertyChangeOfNodesFromOldCopies:nodesetBeingModifiedOldCopy + toNewCopies:[Graph nodeTableForNodes:nodesetBeingModified]]; + [self postIncompleteGraphChange:change]; +} + +- (void) _finishModifyNodes:(BOOL)cancelled { + if (nodesetBeingModified == nil) { + [NSException raise:@"NSInternalInconsistencyException" format:@"Not modifying a node set"]; + } + + GraphChange *change = [GraphChange propertyChangeOfNodesFromOldCopies:nodesetBeingModifiedOldCopy + toNewCopies:[Graph nodeTableForNodes:nodesetBeingModified]]; + [self _finishModifySequence:change withName:@"Modify nodes" cancelled:cancelled]; + + [nodesetBeingModified release]; + nodesetBeingModified = nil; + [nodesetBeingModifiedOldCopy release]; + nodesetBeingModifiedOldCopy = nil; +} + +- (void) endModifyNodes { [self _finishModifyNodes:NO]; } +- (void) cancelModifyNodes { [self _finishModifyNodes:YES]; } + +- (void) startShiftNodes:(NSSet*)nodes { + if (nodesetBeingModified != nil) { + [NSException raise:@"NSInternalInconsistencyException" format:@"Already modifying a node set"]; + } + + nodesetBeingModified = [nodes copy]; + currentNodeShift = NSZeroPoint; +} + +- (void) shiftNodesUpdate:(NSPoint)currentShift { + if (nodesetBeingModified == nil) { + [NSException raise:@"NSInternalInconsistencyException" format:@"Not modifying a node set"]; + } + + currentNodeShift = currentShift; + [self regenerateTikz]; + GraphChange *change = [GraphChange shiftNodes:nodesetBeingModified + byPoint:currentNodeShift]; + [self postIncompleteGraphChange:change]; +} + +- (void) _finishShiftNodesCancelled:(BOOL)cancelled { + if (nodesetBeingModified == nil) { + [NSException raise:@"NSInternalInconsistencyException" format:@"Not modifying a node set"]; + } + + if (!NSEqualPoints (currentNodeShift, NSZeroPoint)) { + GraphChange *change = [GraphChange shiftNodes:nodesetBeingModified + byPoint:currentNodeShift]; + [self _finishModifySequence:change withName:@"Move nodes" cancelled:cancelled]; + } + + [nodesetBeingModified release]; + nodesetBeingModified = nil; +} + +- (void) endShiftNodes { [self _finishShiftNodesCancelled:NO]; } +- (void) cancelShiftNodes { [self _finishShiftNodesCancelled:YES]; } + +- (void) startModifyEdge:(Edge*)edge { + if (edgeBeingModified != nil) { + [NSException raise:@"NSInternalInconsistencyException" format:@"Already modifying an edge"]; + } + edgeBeingModified = [edge retain]; + edgeBeingModifiedOldCopy = [edge copy]; +} + +- (void) modifyEdgeCheckPoint { + [self regenerateTikz]; + GraphChange *change = [GraphChange propertyChangeOfEdge:edgeBeingModified + fromOld:edgeBeingModifiedOldCopy + toNew:[[edgeBeingModified copy] autorelease]]; + [self postIncompleteGraphChange:change]; +} + +- (void) _finishModifyEdgeCancelled:(BOOL)cancelled { + if (edgeBeingModified == nil) { + [NSException raise:@"NSInternalInconsistencyException" format:@"Not modifying an edge"]; + } + + GraphChange *change = [GraphChange propertyChangeOfEdge:edgeBeingModified + fromOld:edgeBeingModifiedOldCopy + toNew:[[edgeBeingModified copy] autorelease]]; + [self _finishModifySequence:change withName:@"Modify edge" cancelled:cancelled]; + + [edgeBeingModified release]; + edgeBeingModified = nil; + [edgeBeingModifiedOldCopy release]; + edgeBeingModifiedOldCopy = nil; +} + +- (void) endModifyEdge { [self _finishModifyEdgeCancelled:NO]; } +- (void) cancelModifyEdge { [self _finishModifyEdgeCancelled:YES]; } + +- (void) startModifyEdges:(NSSet*)edges { + if (edgesetBeingModified != nil) { + [NSException raise:@"NSInternalInconsistencyException" format:@"Already modifying an edge set"]; + } + + edgesetBeingModified = [edges copy]; + edgesetBeingModifiedOldCopy = [[Graph edgeTableForEdges:edges] retain]; +} + +- (void) modifyEdgesCheckPoint { + [self regenerateTikz]; + GraphChange *change = [GraphChange propertyChangeOfEdgesFromOldCopies:edgesetBeingModifiedOldCopy + toNewCopies:[Graph edgeTableForEdges:edgesetBeingModified]]; + [self postIncompleteGraphChange:change]; +} + +- (void) _finishModifyEdgesCancelled:(BOOL)cancelled { + if (edgesetBeingModified == nil) { + [NSException raise:@"NSInternalInconsistencyException" format:@"Not modifying an edge"]; + } + + GraphChange *change = [GraphChange propertyChangeOfEdgesFromOldCopies:edgesetBeingModifiedOldCopy + toNewCopies:[Graph edgeTableForEdges:edgesetBeingModified]]; + [self _finishModifySequence:change withName:@"Modify edges" cancelled:cancelled]; + + [edgesetBeingModified release]; + edgesetBeingModified = nil; + [edgesetBeingModifiedOldCopy release]; + edgesetBeingModifiedOldCopy = nil; +} + +- (void) endModifyEdges { [self _finishModifyEdgesCancelled:NO]; } +- (void) cancelModifyEdges { [self _finishModifyEdgesCancelled:YES]; } + +- (void) startChangeBoundingBox { + oldGraphBounds = [graph boundingBox]; +} + +- (void) changeBoundingBoxCheckPoint { + [self regenerateTikz]; + GraphChange *change = [GraphChange changeBoundingBoxFrom:oldGraphBounds + to:[graph boundingBox]]; + [self postIncompleteGraphChange:change]; +} + +- (void) _finishChangeBoundingBoxCancelled:(BOOL)cancelled { + GraphChange *change = [GraphChange changeBoundingBoxFrom:oldGraphBounds + to:[graph boundingBox]]; + [self _finishModifySequence:change withName:@"Set bounding box" cancelled:cancelled]; +} +- (void) endChangeBoundingBox { [self _finishChangeBoundingBoxCancelled:NO]; } +- (void) cancelChangeBoundingBox { [self _finishChangeBoundingBoxCancelled:YES]; } + +- (void) startChangeGraphProperties { + oldGraphData = [[graph data] copy]; +} + +- (void) changeGraphPropertiesCheckPoint { + [self regenerateTikz]; + GraphChange *change = [GraphChange propertyChangeOfGraphFrom:oldGraphData + to:[graph data]]; + [self postIncompleteGraphChange:change]; +} + +- (void) _finishChangeGraphPropertiesCancelled:(BOOL)cancelled { + GraphChange *change = [GraphChange propertyChangeOfGraphFrom:oldGraphData + to:[graph data]]; + [self _finishModifySequence:change withName:@"Change graph properties" cancelled:cancelled]; + [oldGraphData release]; + oldGraphData = nil; +} +- (void) endChangeGraphProperties { [self _finishChangeGraphPropertiesCancelled:NO]; } +- (void) cancelChangeGraphProperties { [self _finishChangeGraphPropertiesCancelled:YES]; } + +- (void) removeSelected { + NSUInteger selEdges = [[pickSupport selectedEdges] count]; + NSUInteger selNodes = [[pickSupport selectedNodes] count]; + + if (selEdges == 0 && selNodes == 0) { + return; + } + + NSString *actionName = @"Remove selection"; + + [self startUndoGroup]; + if (selEdges > 0) { + GraphChange *change = [graph removeEdges:[pickSupport selectedEdges]]; + [self registerUndoForChange:change]; + [pickSupport deselectAllEdges]; + [self postGraphChange:change]; + } else { + actionName = (selNodes == 1 ? @"Remove node" : @"Remove nodes"); + } + if (selNodes > 0) { + GraphChange *change = [graph removeNodes:[pickSupport selectedNodes]]; + [self registerUndoForChange:change]; + [pickSupport deselectAllNodes]; + [self postGraphChange:change]; + } else { + actionName = (selEdges == 1 ? @"Remove edge" : @"Remove edges"); + } + [self nameAndEndUndoGroup:actionName]; + [self regenerateTikz]; +} + +- (void) addNode:(Node*)node { + GraphChange *change = [graph addNode:node]; + [self completedGraphChange:change withName:@"Add node"]; +} + +- (void) removeNode:(Node*)node { + [pickSupport deselectNode:node]; + GraphChange *change = [graph removeNode:node]; + [self completedGraphChange:change withName:@"Remove node"]; +} + +- (void) addEdge:(Edge*)edge { + GraphChange *change = [graph addEdge:edge]; + [self completedGraphChange:change withName:@"Add edge"]; +} + +- (void) removeEdge:(Edge*)edge { + [pickSupport deselectEdge:edge]; + GraphChange *change = [graph removeEdge:edge]; + [self completedGraphChange:change withName:@"Remove edge"]; +} + +- (void) shiftSelectedNodesByPoint:(NSPoint)offset { + if ([[pickSupport selectedNodes] count] > 0) { + GraphChange *change = [graph shiftNodes:[pickSupport selectedNodes] byPoint:offset]; + [self completedGraphChange:change withName:@"Move nodes"]; + } +} + +- (void) insertGraph:(Graph*)g { + GraphChange *change = [graph insertGraph:g]; + [self completedGraphChange:change withName:@"Insert graph"]; +} + +- (void) flipSelectedNodesHorizontally { + if ([[pickSupport selectedNodes] count] > 0) { + GraphChange *change = [graph flipHorizontalNodes:[pickSupport selectedNodes]]; + [self completedGraphChange:change withName:@"Flip nodes horizontally"]; + } +} + +- (void) flipSelectedNodesVertically { + if ([[pickSupport selectedNodes] count] > 0) { + GraphChange *change = [graph flipVerticalNodes:[pickSupport selectedNodes]]; + [self completedGraphChange:change withName:@"Flip nodes vertically"]; + } +} + +- (void) reverseSelectedEdges { + if ([[pickSupport selectedEdges] count] > 0) { + GraphChange *change = [graph reverseEdges:[pickSupport selectedEdges]]; + [self completedGraphChange:change withName:@"Reverse edges"]; + } +} + +- (void) bringSelectionForward { + BOOL hasNodeSelection = [[pickSupport selectedNodes] count] > 0; + BOOL hasEdgeSelection = [[pickSupport selectedEdges] count] > 0; + if (!hasNodeSelection && !hasEdgeSelection) + return; + + [self startUndoGroup]; + GraphChange *nodeChange; + GraphChange *edgeChange; + if (hasNodeSelection) { + nodeChange = [graph bringNodesForward:[pickSupport selectedNodes]]; + [self registerUndoForChange:nodeChange]; + } + if (hasEdgeSelection) { + edgeChange = [graph bringEdgesForward:[pickSupport selectedEdges]]; + [self registerUndoForChange:edgeChange]; + } + [self nameAndEndUndoGroup:@"Bring forward"]; + [self regenerateTikz]; + if (hasNodeSelection) + [self postGraphChange:nodeChange]; + if (hasEdgeSelection) + [self postGraphChange:edgeChange]; +} + +- (void) bringSelectionToFront { + BOOL hasNodeSelection = [[pickSupport selectedNodes] count] > 0; + BOOL hasEdgeSelection = [[pickSupport selectedEdges] count] > 0; + if (!hasNodeSelection && !hasEdgeSelection) + return; + + [self startUndoGroup]; + GraphChange *nodeChange; + GraphChange *edgeChange; + if (hasNodeSelection) { + nodeChange = [graph bringNodesToFront:[pickSupport selectedNodes]]; + [self registerUndoForChange:nodeChange]; + } + if (hasEdgeSelection) { + edgeChange = [graph bringEdgesToFront:[pickSupport selectedEdges]]; + [self registerUndoForChange:edgeChange]; + } + [self nameAndEndUndoGroup:@"Bring to front"]; + [self regenerateTikz]; + if (hasNodeSelection) + [self postGraphChange:nodeChange]; + if (hasEdgeSelection) + [self postGraphChange:edgeChange]; +} + +- (void) sendSelectionBackward { + BOOL hasNodeSelection = [[pickSupport selectedNodes] count] > 0; + BOOL hasEdgeSelection = [[pickSupport selectedEdges] count] > 0; + if (!hasNodeSelection && !hasEdgeSelection) + return; + + [self startUndoGroup]; + GraphChange *nodeChange; + GraphChange *edgeChange; + if (hasNodeSelection) { + nodeChange = [graph sendNodesBackward:[pickSupport selectedNodes]]; + [self registerUndoForChange:nodeChange]; + } + if (hasEdgeSelection) { + edgeChange = [graph sendNodesBackward:[pickSupport selectedEdges]]; + [self registerUndoForChange:edgeChange]; + } + [self nameAndEndUndoGroup:@"Send backward"]; + [self regenerateTikz]; + if (hasNodeSelection) + [self postGraphChange:nodeChange]; + if (hasEdgeSelection) + [self postGraphChange:edgeChange]; +} + +- (void) sendSelectionToBack { + BOOL hasNodeSelection = [[pickSupport selectedNodes] count] > 0; + BOOL hasEdgeSelection = [[pickSupport selectedEdges] count] > 0; + if (!hasNodeSelection && !hasEdgeSelection) + return; + + [self startUndoGroup]; + GraphChange *nodeChange; + GraphChange *edgeChange; + if (hasNodeSelection) { + nodeChange = [graph sendNodesToBack:[pickSupport selectedNodes]]; + [self registerUndoForChange:nodeChange]; + } + if (hasEdgeSelection) { + edgeChange = [graph sendNodesToBack:[pickSupport selectedEdges]]; + [self registerUndoForChange:edgeChange]; + } + [self nameAndEndUndoGroup:@"Send to back"]; + [self regenerateTikz]; + if (hasNodeSelection) + [self postGraphChange:nodeChange]; + if (hasEdgeSelection) + [self postGraphChange:edgeChange]; +} + +- (BOOL) saveCopyToPath: (NSString*)p error: (NSError**)error { + if (!p) { + [NSException raise:@"No document path" format:@"No path given"]; + } + // we use glib for writing the file, because GNUStep sucks in this regard + // (older versions don't have -[NSString writeToFile:atomically:encoding:error:]) + GError *gerror = NULL; + gchar *filename = [p glibFilename]; + BOOL success = g_file_set_contents (filename, [tikz UTF8String], -1, &gerror) ? YES : NO; + if (gerror) { + GErrorToNSError (gerror, error); + g_error_free (gerror); + } + g_free (filename); + return success; +} + +- (BOOL) saveToPath: (NSString*)p error: (NSError**)error { + BOOL success = [self saveCopyToPath:p error:error]; + if (success) { + [self setPath:p]; + hasChanges = NO; + } + return success; +} + +- (BOOL) save: (NSError**)error { + if (!path) { + [NSException raise:@"No document path" format:@"Tried to save a document when there was no path"]; + } + return [self saveToPath:path error:error]; +} + +@end + +@implementation TikzDocument (Private) +- (void) styleRenamed:(NSNotification*)n { + [self regenerateTikz]; +} + +- (void) setPath:(NSString*)p { + [p retain]; + [path release]; + path = p; +} + +- (void) setGraph:(Graph*)g { + if (g == nil) { + g = [Graph graph]; + } + if (g == graph) { + return; + } + + [pickSupport deselectAllNodes]; + [pickSupport deselectAllEdges]; + + [self startUndoGroup]; + [undoManager registerUndoWithTarget:self selector:@selector(setGraph:) object:graph]; + [g retain]; + [graph release]; + graph = g; + + [self attachStylesToGraph:graph]; + + [self regenerateTikz]; + [self postGraphReplaced]; + [self nameAndEndUndoGroup:@"Replace graph"]; +} + +- (void) registerUndoForChange:(GraphChange*)change { + [undoManager registerUndoWithTarget:self + selector:@selector(undoGraphChange:) + object:change]; +} + +- (void) registerUndoGroupForChange:(GraphChange*)change withName:(NSString*)nm { + [self startUndoGroup]; + [self registerUndoForChange:change]; + [self nameAndEndUndoGroup:nm]; +} + +- (void) undoGraphChange:(GraphChange*)change { + GraphChange *inverse = [change invert]; + [graph applyGraphChange:inverse]; + [self startUndoGroup]; + [undoManager registerUndoWithTarget:self + selector:@selector(undoGraphChange:) + object:inverse]; + [self endUndoGroup]; + [self regenerateTikz]; + [self postGraphChange:change]; +} + +- (void) completedGraphChange:(GraphChange*)change withName:(NSString*)name { + if (change == nil) { + NSLog(@"No graph change given for change %@", name); + return; + } + [self registerUndoGroupForChange:change withName:name]; + [self regenerateTikz]; + [self postGraphChange:change]; +} + +- (void) attachStylesToGraph:(Graph*)g { + for (Node *n in [g nodes]) { + [n attachStyleFromTable:[styleManager nodeStyles]]; + } + for (Edge *e in [g edges]) { + [e attachStyleFromTable:[styleManager edgeStyles]]; + } +} + +- (void) regenerateTikz { + [tikz release]; + tikz = [[graph tikz] retain]; + hasChanges = YES; + [self postTikzChanged]; +} +@end + +// vim:ft=objc:sts=4:sw=4:et diff --git a/tikzit-1/src/gtk/Tool.h b/tikzit-1/src/gtk/Tool.h new file mode 100644 index 0000000..22c983e --- /dev/null +++ b/tikzit-1/src/gtk/Tool.h @@ -0,0 +1,41 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import "InputDelegate.h" +#import "Surface.h" + +#import +#import + +@class Configuration; +@class GraphRenderer; +@protocol InputDelegate; +@protocol RenderDelegate; + +@protocol Tool +@property (readonly) NSString *name; +@property (readonly) const gchar *stockId; +@property (readonly) NSString *helpText; +@property (readonly) NSString *shortcut; +@property (retain) GraphRenderer *activeRenderer; +@property (readonly) GtkWidget *configurationWidget; +- (void) loadConfiguration:(Configuration*)config; +- (void) saveConfiguration:(Configuration*)config; +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/ToolBox.h b/tikzit-1/src/gtk/ToolBox.h new file mode 100644 index 0000000..60074c1 --- /dev/null +++ b/tikzit-1/src/gtk/ToolBox.h @@ -0,0 +1,45 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import + +@class Configuration; +@class Window; +@protocol Tool; + +@interface ToolBox : NSObject { + GtkWidget *window; + GtkToolItemGroup *toolGroup; + GtkWidget *titleLabel; + GtkWidget *configWidgetContainer; + GtkWidget *configWidget; +} + +@property (assign) id selectedTool; + +- (id) initWithTools:(NSArray*)tools; + +- (void) show; +- (void) present; +- (void) attachToWindow:(Window*)parent; + +- (void) loadConfiguration:(Configuration*)config; +- (void) saveConfiguration:(Configuration*)config; +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/ToolBox.m b/tikzit-1/src/gtk/ToolBox.m new file mode 100644 index 0000000..c6d2ccf --- /dev/null +++ b/tikzit-1/src/gtk/ToolBox.m @@ -0,0 +1,280 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "ToolBox.h" + +#import "Application.h" +#import "Configuration.h" +#import "Tool.h" +#import "Window.h" + +#import "gtkhelpers.h" +#import "tztoolpalette.h" + +static void tool_button_toggled_cb (GtkWidget *widget, ToolBox *toolBox); + +#define TOOL_DATA_KEY "tikzit-tool" + +@implementation ToolBox + +- (id) init { + [self release]; + return nil; +} + +- (id) initWithTools:(NSArray*)tools { + self = [super init]; + + if (self) { + window = gtk_window_new (GTK_WINDOW_TOPLEVEL); + g_object_ref_sink (window); + gtk_window_set_title (GTK_WINDOW (window), "Toolbox"); + gtk_window_set_role (GTK_WINDOW (window), "toolbox"); + gtk_window_set_type_hint (GTK_WINDOW (window), + GDK_WINDOW_TYPE_HINT_UTILITY); + gtk_window_set_deletable (GTK_WINDOW (window), FALSE); + + GtkWidget *mainLayout = gtk_vbox_new (FALSE, 5); + gtk_widget_show (mainLayout); + gtk_container_add (GTK_CONTAINER (window), mainLayout); + + GtkWidget *toolPalette = tz_tool_palette_new (); + gtk_widget_show (toolPalette); + gtk_box_pack_start (GTK_BOX (mainLayout), + toolPalette, + FALSE, + FALSE, + 0); + gtk_tool_palette_set_style (GTK_TOOL_PALETTE (toolPalette), + GTK_TOOLBAR_ICONS); + + toolGroup = GTK_TOOL_ITEM_GROUP (gtk_tool_item_group_new ("Tools")); + g_object_ref_sink (G_OBJECT (toolGroup)); + gtk_tool_item_group_set_label_widget ( + toolGroup, + NULL); + gtk_container_add (GTK_CONTAINER (toolPalette), GTK_WIDGET (toolGroup)); + gtk_widget_show (GTK_WIDGET (toolGroup)); + + GSList *item_group = NULL; + for (id tool in tools) { + NSString *tooltip = [NSString stringWithFormat: + @"%@: %@ (%@)", + [tool name], [tool helpText], [tool shortcut]]; + GtkToolItem *item = gtk_radio_tool_button_new_from_stock ( + item_group, + [tool stockId]); + gtk_tool_item_set_tooltip_text (item, [tooltip UTF8String]); + item_group = gtk_radio_tool_button_get_group ( + GTK_RADIO_TOOL_BUTTON (item)); + gtk_tool_item_group_insert ( + toolGroup, + item, + -1); + gtk_widget_show (GTK_WIDGET (item)); + g_object_set_data_full ( + G_OBJECT(item), + TOOL_DATA_KEY, + [tool retain], + release_obj); + + g_signal_connect (item, "toggled", + G_CALLBACK (tool_button_toggled_cb), + self); + } + + GtkWidget *sep = gtk_hseparator_new (); + gtk_widget_show (sep); + gtk_box_pack_start (GTK_BOX (mainLayout), + sep, + FALSE, + FALSE, + 0); + + titleLabel = gtk_label_new (""); + g_object_ref_sink (titleLabel); + gtk_widget_show (titleLabel); + + PangoAttrList *attrs = pango_attr_list_new (); + pango_attr_list_insert (attrs, + pango_attr_weight_new (PANGO_WEIGHT_SEMIBOLD)); + gtk_label_set_attributes (GTK_LABEL (titleLabel), attrs); + pango_attr_list_unref (attrs); + + gtk_box_pack_start (GTK_BOX (mainLayout), + titleLabel, + FALSE, + FALSE, + 0); + + configWidgetContainer = gtk_alignment_new (0.5, 0.5, 1.0, 1.0); + g_object_ref_sink (configWidgetContainer); + gtk_widget_show (configWidgetContainer); + gtk_box_pack_start (GTK_BOX (mainLayout), + configWidgetContainer, + TRUE, + TRUE, + 0); + gtk_alignment_set_padding (GTK_ALIGNMENT (configWidgetContainer), + 5, 5, 5, 5); + + gint button_width; + gint button_height; + + if (tz_tool_palette_get_button_size (TZ_TOOL_PALETTE (toolPalette), + &button_width, &button_height)) + { + GdkGeometry geometry; + + geometry.min_width = 2 * button_width; + geometry.min_height = -1; + geometry.base_width = button_width; + geometry.base_height = 0; + geometry.width_inc = button_width; + geometry.height_inc = 1; + + gtk_window_set_geometry_hints (GTK_WINDOW (window), + NULL, + &geometry, + GDK_HINT_MIN_SIZE | + GDK_HINT_BASE_SIZE | + GDK_HINT_RESIZE_INC | + GDK_HINT_USER_POS); + } + gtk_window_set_default_size (GTK_WINDOW (window), button_width * 5, 500); + + // hack to position the toolbox window somewhere sensible + // (upper left) + gtk_window_parse_geometry (GTK_WINDOW (window), "+0+0"); + } + + return self; +} + +- (void) dealloc { + if (window) { + g_object_unref (G_OBJECT (toolGroup)); + g_object_unref (G_OBJECT (titleLabel)); + g_object_unref (G_OBJECT (configWidgetContainer)); + if (configWidget) + g_object_unref (G_OBJECT (configWidget)); + gtk_widget_destroy (window); + g_object_unref (G_OBJECT (window)); + } + + [super dealloc]; +} + +- (id) selectedTool { + guint count = gtk_tool_item_group_get_n_items (toolGroup); + for (guint i = 0; i < count; ++i) { + GtkToolItem *item = gtk_tool_item_group_get_nth_item (toolGroup, i); + if (gtk_toggle_tool_button_get_active (GTK_TOGGLE_TOOL_BUTTON (item))) { + return (id)g_object_get_data (G_OBJECT (item), TOOL_DATA_KEY); + } + } + return nil; +} + +- (void) _setToolWidget:(GtkWidget*)widget { + if (configWidget) { + gtk_widget_hide (configWidget); + gtk_container_remove (GTK_CONTAINER (configWidgetContainer), + configWidget); + g_object_unref (configWidget); + } + configWidget = widget; + if (configWidget) { + g_object_ref (configWidget); + gtk_container_add (GTK_CONTAINER (configWidgetContainer), + configWidget); + gtk_widget_show (configWidget); + } +} + +- (void) setSelectedTool:(id)tool { + guint count = gtk_tool_item_group_get_n_items (toolGroup); + for (guint i = 0; i < count; ++i) { + GtkToolItem *item = gtk_tool_item_group_get_nth_item (toolGroup, i); + id data = (id)g_object_get_data (G_OBJECT (item), TOOL_DATA_KEY); + if (data == tool) { + gtk_toggle_tool_button_set_active ( + GTK_TOGGLE_TOOL_BUTTON (item), + TRUE); + break; + } + } + gtk_label_set_label (GTK_LABEL (titleLabel), + [[tool name] UTF8String]); + [self _setToolWidget:[tool configurationWidget]]; +} + +- (void) show { + gtk_widget_show (window); +} + +- (void) present { + gtk_window_present (GTK_WINDOW (window)); +} + +- (void) attachToWindow:(Window*)parent { + utility_window_attach (GTK_WINDOW (window), [parent gtkWindow]); +} + +- (void) loadConfiguration:(Configuration*)config { + if ([config hasGroup:@"ToolBox"]) { + tz_restore_window (GTK_WINDOW (window), + [config integerEntry:@"x" inGroup:@"ToolBox"], + [config integerEntry:@"y" inGroup:@"ToolBox"], + [config integerEntry:@"w" inGroup:@"ToolBox"], + [config integerEntry:@"h" inGroup:@"ToolBox"]); + } +} + +- (void) saveConfiguration:(Configuration*)config { + gint x, y, w, h; + + gtk_window_get_position (GTK_WINDOW (window), &x, &y); + gtk_window_get_size (GTK_WINDOW (window), &w, &h); + + [config setIntegerEntry:@"x" inGroup:@"ToolBox" value:x]; + [config setIntegerEntry:@"y" inGroup:@"ToolBox" value:y]; + [config setIntegerEntry:@"w" inGroup:@"ToolBox" value:w]; + [config setIntegerEntry:@"h" inGroup:@"ToolBox" value:h]; +} + +@end + +static void tool_button_toggled_cb (GtkWidget *widget, ToolBox *toolBox) { + if (gtk_toggle_tool_button_get_active (GTK_TOGGLE_TOOL_BUTTON (widget))) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + id tool = (id)g_object_get_data (G_OBJECT(widget), TOOL_DATA_KEY); + [app setActiveTool:tool]; + NSDictionary *userInfo = [NSDictionary + dictionaryWithObject:tool + forKey:@"tool"]; + [[NSNotificationCenter defaultCenter] + postNotificationName:@"ToolSelectionChanged" + object:toolBox + userInfo:userInfo]; + + [pool drain]; + } +} + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/WidgetSurface.h b/tikzit-1/src/gtk/WidgetSurface.h new file mode 100644 index 0000000..667749f --- /dev/null +++ b/tikzit-1/src/gtk/WidgetSurface.h @@ -0,0 +1,54 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import +#import +#import + +/** + * Provides a surface for rendering to a widget. + */ +@interface WidgetSurface: NSObject { + GtkWidget *widget; + Transformer *transformer; + id renderDelegate; + id inputDelegate; + BOOL keepCentered; + BOOL buttonPressesRequired; + CGFloat defaultScale; + NSSize lastKnownSize; +} + +@property (assign) BOOL canFocus; +@property (assign) BOOL keepCentered; +@property (assign) CGFloat defaultScale; + +- (id) initWithWidget:(GtkWidget*)widget; +- (GtkWidget*) widget; + +- (id) inputDelegate; +- (void) setInputDelegate:(id)delegate; + +/** + * Set the minimum size that this widget wants + */ +- (void) setSizeRequestWidth:(double)width height:(double)height; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/WidgetSurface.m b/tikzit-1/src/gtk/WidgetSurface.m new file mode 100644 index 0000000..004e722 --- /dev/null +++ b/tikzit-1/src/gtk/WidgetSurface.m @@ -0,0 +1,630 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "WidgetSurface.h" +#import "gtkhelpers.h" +#import "InputDelegate.h" +#import "CairoRenderContext.h" + +// {{{ Internal interfaces +// {{{ GTK+ callbacks +static gboolean configure_event_cb (GtkWidget *widget, GdkEventConfigure *event, WidgetSurface *surface); +static void realize_cb (GtkWidget *widget, WidgetSurface *surface); +static gboolean expose_event_cb (GtkWidget *widget, GdkEventExpose *event, WidgetSurface *surface); +static gboolean button_press_event_cb (GtkWidget *widget, GdkEventButton *event, WidgetSurface *surface); +static gboolean button_release_event_cb (GtkWidget *widget, GdkEventButton *event, WidgetSurface *surface); +static gboolean motion_notify_event_cb (GtkWidget *widget, GdkEventMotion *event, WidgetSurface *surface); +static gboolean key_press_event_cb (GtkWidget *widget, GdkEventKey *event, WidgetSurface *surface); +static gboolean key_release_event_cb (GtkWidget *widget, GdkEventKey *event, WidgetSurface *surface); +static gboolean scroll_event_cb (GtkWidget *widget, GdkEventScroll *event, WidgetSurface *surface); +static void set_cursor (GtkWidget *widget, GdkCursor *cursor); +static void unref_cursor (gpointer cursor, GClosure *closure); +// }}} + +@interface WidgetSurface (Private) +- (void) updateTransformer; +- (void) widgetSizeChanged:(NSNotification*)notification; +- (void) handleExposeEvent:(GdkEventExpose*)event; +- (void) updateLastKnownSize; +- (void) zoomTo:(CGFloat)scale aboutPoint:(NSPoint)p; +- (void) zoomTo:(CGFloat)scale; +- (void) addToEventMask:(GdkEventMask)values; +- (void) removeFromEventMask:(GdkEventMask)values; +@end +// }}} +// {{{ API +@implementation WidgetSurface + +- (id) init { + return [self initWithWidget:gtk_drawing_area_new ()]; +} + +- (id) initWithWidget:(GtkWidget*)w { + self = [super init]; + + if (self) { + widget = w; + g_object_ref_sink (G_OBJECT (widget)); + defaultScale = 1.0f; + transformer = [[Transformer alloc] init]; + [transformer setFlippedAboutXAxis:YES]; + [self updateLastKnownSize]; + g_object_set (G_OBJECT (widget), "events", GDK_STRUCTURE_MASK, NULL); + g_signal_connect (widget, "expose-event", G_CALLBACK (expose_event_cb), self); + g_signal_connect (widget, "configure-event", G_CALLBACK (configure_event_cb), self); + g_signal_connect (widget, "realize", G_CALLBACK (realize_cb), self); + g_signal_connect (widget, "button-press-event", G_CALLBACK (button_press_event_cb), self); + g_signal_connect (widget, "button-release-event", G_CALLBACK (button_release_event_cb), self); + g_signal_connect (widget, "motion-notify-event", G_CALLBACK (motion_notify_event_cb), self); + g_signal_connect (widget, "key-press-event", G_CALLBACK (key_press_event_cb), self); + g_signal_connect (widget, "key-release-event", G_CALLBACK (key_release_event_cb), self); + g_signal_connect (widget, "scroll-event", G_CALLBACK (scroll_event_cb), self); + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(widgetSizeChanged:) + name:@"SurfaceSizeChanged" + object:self]; + if ([self canFocus]) { + [self addToEventMask:GDK_BUTTON_PRESS_MASK]; + } else { + [self removeFromEventMask:GDK_BUTTON_PRESS_MASK]; + } + } + + return self; +} + +- (void) dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + [transformer release]; + g_object_unref (G_OBJECT (widget)); + + [super dealloc]; +} + +- (void) invalidateRect:(NSRect)rect { + if (!NSIsEmptyRect (rect)) { + GdkWindow *window = gtk_widget_get_window (widget); + if (window) { + GdkRectangle g_rect = gdk_rectangle_from_ns_rect (rect); + gdk_window_invalidate_rect (window, &g_rect, TRUE); + } + } +} + +- (void) invalidate { + GdkWindow *window = gtk_widget_get_window (widget); + if (window) { + GdkRegion *visible = gdk_drawable_get_visible_region (GDK_DRAWABLE (window)); + gdk_window_invalidate_region (window, visible, TRUE); + gdk_region_destroy (visible); + } +} + +- (id) createRenderContext { + return [CairoRenderContext contextForWidget:widget]; +} + +- (int) width { + int width = 0; + GdkWindow *window = gtk_widget_get_window (widget); + if (window) { + gdk_drawable_get_size (window, &width, NULL); + } + return width; +} + +- (int) height { + int height = 0; + GdkWindow *window = gtk_widget_get_window (widget); + if (window) { + gdk_drawable_get_size (window, NULL, &height); + } + return height; +} + +- (void) setSizeRequestWidth:(double)width height:(double)height { + gtk_widget_set_size_request (widget, width, height); +} + +- (Transformer*) transformer { + return transformer; +} + +- (GtkWidget*) widget { + return widget; +} + +- (void) setRenderDelegate:(id )delegate { + // NB: no retention! + renderDelegate = delegate; + if (renderDelegate == nil) { + [self removeFromEventMask:GDK_EXPOSURE_MASK]; + } else { + [self addToEventMask:GDK_EXPOSURE_MASK]; + } +} + +- (id) inputDelegate { + return inputDelegate; +} + +- (void) setInputDelegate:(id)delegate { + if (delegate == inputDelegate) { + return; + } + buttonPressesRequired = NO; + if (inputDelegate != nil) { + [self removeFromEventMask:GDK_POINTER_MOTION_MASK + | GDK_BUTTON_PRESS_MASK + | GDK_BUTTON_RELEASE_MASK + | GDK_KEY_PRESS_MASK + | GDK_KEY_RELEASE_MASK]; + } + inputDelegate = delegate; + if (delegate != nil) { + GdkEventMask mask = 0; + if ([delegate respondsToSelector:@selector(mousePressAt:withButton:andMask:)]) { + buttonPressesRequired = YES; + mask |= GDK_BUTTON_PRESS_MASK; + } + if ([delegate respondsToSelector:@selector(mouseReleaseAt:withButton:andMask:)]) { + mask |= GDK_BUTTON_RELEASE_MASK; + } + if ([delegate respondsToSelector:@selector(mouseDoubleClickAt:withButton:andMask:)]) { + buttonPressesRequired = YES; + mask |= GDK_BUTTON_PRESS_MASK; + } + if ([delegate respondsToSelector:@selector(mouseMoveTo:withButtons:andMask:)]) { + mask |= GDK_POINTER_MOTION_MASK; + } + if ([delegate respondsToSelector:@selector(keyPressed:withMask:)]) { + mask |= GDK_KEY_PRESS_MASK; + } + if ([delegate respondsToSelector:@selector(keyReleased:withMask:)]) { + mask |= GDK_KEY_RELEASE_MASK; + } + [self addToEventMask:mask]; + } +} + +- (id ) renderDelegate { + return renderDelegate; +} + +- (void) setKeepCentered:(BOOL)centered { + keepCentered = centered; + [self updateTransformer]; +} + +- (BOOL) keepCentered { + return keepCentered; +} + +- (BOOL) canFocus { + return gtk_widget_get_can_focus (widget); +} + +- (void) setCanFocus:(BOOL)focus { + gtk_widget_set_can_focus (widget, focus); + if (focus) { + [self addToEventMask:GDK_BUTTON_PRESS_MASK]; + } else if (!buttonPressesRequired) { + [self removeFromEventMask:GDK_BUTTON_PRESS_MASK]; + } +} + +- (BOOL) hasFocus { + return gtk_widget_has_focus (widget); +} + +- (void) renderFocus { + GdkWindow *window = gtk_widget_get_window (widget); + if (window) { + int width = 0; + int height = 0; + gdk_drawable_get_size (window, &width, &height); + gtk_paint_focus (gtk_widget_get_style (widget), + window, + GTK_STATE_NORMAL, + NULL, + widget, + NULL, + 0, + 0, + width, + height + ); + } +} + +- (CGFloat) defaultScale { + return defaultScale; +} + +- (void) setDefaultScale:(CGFloat)newDefault { + if (defaultScale != newDefault) { + CGFloat oldDefault = defaultScale; + defaultScale = newDefault; + + CGFloat scale = [transformer scale]; + scale *= (newDefault / oldDefault); + [transformer setScale:scale]; + [self invalidate]; + } +} + +- (void) zoomIn { + CGFloat scale = [transformer scale]; + scale *= 1.2f; + [self zoomTo:scale]; +} + +- (void) zoomOut { + CGFloat scale = [transformer scale]; + scale /= 1.2f; + [self zoomTo:scale]; +} + +- (void) zoomReset { + [self zoomTo:defaultScale]; +} + +- (void) zoomInAboutPoint:(NSPoint)p { + CGFloat scale = [transformer scale]; + scale *= 1.2f; + [self zoomTo:scale aboutPoint:p]; +} + +- (void) zoomOutAboutPoint:(NSPoint)p { + CGFloat scale = [transformer scale]; + scale /= 1.2f; + [self zoomTo:scale aboutPoint:p]; +} + +- (void) zoomResetAboutPoint:(NSPoint)p { + [self zoomTo:defaultScale aboutPoint:p]; +} + +- (void) setCursor:(Cursor)c { + GdkCursor *cursor = NULL; + switch (c) { + case ResizeRightCursor: + cursor = gdk_cursor_new (GDK_RIGHT_SIDE); + break; + case ResizeBottomRightCursor: + cursor = gdk_cursor_new (GDK_BOTTOM_RIGHT_CORNER); + break; + case ResizeBottomCursor: + cursor = gdk_cursor_new (GDK_BOTTOM_SIDE); + break; + case ResizeBottomLeftCursor: + cursor = gdk_cursor_new (GDK_BOTTOM_LEFT_CORNER); + break; + case ResizeLeftCursor: + cursor = gdk_cursor_new (GDK_LEFT_SIDE); + break; + case ResizeTopLeftCursor: + cursor = gdk_cursor_new (GDK_TOP_LEFT_CORNER); + break; + case ResizeTopCursor: + cursor = gdk_cursor_new (GDK_TOP_SIDE); + break; + case ResizeTopRightCursor: + cursor = gdk_cursor_new (GDK_TOP_RIGHT_CORNER); + break; + default: break; + } + GdkWindow *window = gtk_widget_get_window (widget); + g_signal_handlers_disconnect_matched (window, + G_SIGNAL_MATCH_FUNC, 0, 0, NULL, + G_CALLBACK (set_cursor), NULL); + if (window) { + gdk_window_set_cursor (window, cursor); + if (cursor != NULL) { + gdk_cursor_unref (cursor); + } + } else { + g_signal_connect_data (widget, + "realize", G_CALLBACK (set_cursor), cursor, + unref_cursor, 0); + } +} + +@end +// }}} +// {{{ Private +@implementation WidgetSurface (Private) +- (void) widgetSizeChanged:(NSNotification*)notification { + [self updateTransformer]; + [self updateLastKnownSize]; +} + +- (void) updateTransformer { + if (keepCentered) { + GdkWindow *window = gtk_widget_get_window (widget); + if (window) { + int width = 0; + int height = 0; + gdk_drawable_get_size (window, &width, &height); + NSPoint origin; + if (lastKnownSize.width < 1 || lastKnownSize.height < 1) { + origin.x = (float)width / 2.0f; + origin.y = (float)height / 2.0f; + } else { + origin = [transformer origin]; + origin.x += ((float)width - lastKnownSize.width) / 2.0f; + origin.y += ((float)height - lastKnownSize.height) / 2.0f; + } + [transformer setOrigin:origin]; + } + } +} + +- (void) handleExposeEvent:(GdkEventExpose*)event { + if (renderDelegate != nil) { + NSRect area = gdk_rectangle_to_ns_rect (event->area); + + id context = [CairoRenderContext contextForWidget:widget]; + [context rect:area]; + [context clipToPath]; + [renderDelegate renderWithContext:context onSurface:self]; + } +} + +- (void) updateLastKnownSize { + GdkWindow *window = gtk_widget_get_window (widget); + if (window) { + int width = 0; + int height = 0; + gdk_drawable_get_size (window, &width, &height); + lastKnownSize.width = (float)width; + lastKnownSize.height = (float)height; + } else { + lastKnownSize = NSZeroSize; + } +} + +- (void) zoomTo:(CGFloat)scale aboutPoint:(NSPoint)p { + NSPoint graphP = [transformer fromScreen:p]; + + [transformer setScale:scale]; + + NSPoint newP = [transformer toScreen:graphP]; + NSPoint origin = [transformer origin]; + origin.x += p.x - newP.x; + origin.y += p.y - newP.y; + [transformer setOrigin:origin]; + + [self invalidate]; +} + +- (void) zoomTo:(CGFloat)scale { + NSPoint centre = NSMakePoint (lastKnownSize.width/2.0f, lastKnownSize.height/2.0f); + [self zoomTo:scale aboutPoint:centre]; +} + +- (void) addToEventMask:(GdkEventMask)values { + GdkEventMask mask; + g_object_get (G_OBJECT (widget), "events", &mask, NULL); + mask |= values; + g_object_set (G_OBJECT (widget), "events", mask, NULL); +} + +- (void) removeFromEventMask:(GdkEventMask)values { + GdkEventMask mask; + g_object_get (G_OBJECT (widget), "events", &mask, NULL); + mask ^= values; + if (buttonPressesRequired || [self canFocus]) { + mask |= GDK_BUTTON_PRESS_MASK; + } + g_object_set (G_OBJECT (widget), "events", mask, NULL); +} + +@end +// }}} +// {{{ GTK+ callbacks +static gboolean configure_event_cb(GtkWidget *widget, GdkEventConfigure *event, WidgetSurface *surface) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [[NSNotificationCenter defaultCenter] postNotificationName:@"SurfaceSizeChanged" object:surface]; + [pool drain]; + return FALSE; +} + +static void realize_cb (GtkWidget *widget, WidgetSurface *surface) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [surface updateTransformer]; + [pool drain]; +} + +static gboolean expose_event_cb(GtkWidget *widget, GdkEventExpose *event, WidgetSurface *surface) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [surface handleExposeEvent:event]; + [pool drain]; + return FALSE; +} + +InputMask mask_from_gdk_modifier_state (GdkModifierType state) { + InputMask mask = 0; + if (state & GDK_SHIFT_MASK) { + mask |= ShiftMask; + } + if (state & GDK_CONTROL_MASK) { + mask |= ControlMask; + } + if (state & GDK_META_MASK) { + mask |= MetaMask; + } + return mask; +} + +ScrollDirection scroll_dir_from_gdk_scroll_dir (GdkScrollDirection dir) { + switch (dir) { + case GDK_SCROLL_UP: return ScrollUp; + case GDK_SCROLL_DOWN: return ScrollDown; + case GDK_SCROLL_LEFT: return ScrollLeft; + case GDK_SCROLL_RIGHT: return ScrollRight; + default: NSLog(@"Invalid scroll direction %i", (int)dir); return ScrollDown; + } +} + +MouseButton buttons_from_gdk_modifier_state (GdkModifierType state) { + MouseButton buttons = 0; + if (state & GDK_BUTTON1_MASK) { + buttons |= LeftButton; + } + if (state & GDK_BUTTON2_MASK) { + buttons |= MiddleButton; + } + if (state & GDK_BUTTON3_MASK) { + buttons |= RightButton; + } + if (state & GDK_BUTTON4_MASK) { + buttons |= Button4; + } + if (state & GDK_BUTTON5_MASK) { + buttons |= Button5; + } + return buttons; +} + +static gboolean button_press_event_cb(GtkWidget *widget, GdkEventButton *event, WidgetSurface *surface) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + if ([surface canFocus]) { + if (!gtk_widget_has_focus (widget)) { + gtk_widget_grab_focus (widget); + } + } + + id delegate = [surface inputDelegate]; + if (delegate != nil) { + NSPoint pos = NSMakePoint (event->x, event->y); + MouseButton button = (MouseButton)event->button; + InputMask mask = mask_from_gdk_modifier_state (event->state); + if (event->type == GDK_BUTTON_PRESS && [delegate respondsToSelector:@selector(mousePressAt:withButton:andMask:)]) { + [delegate mousePressAt:pos withButton:button andMask:mask]; + } + if (event->type == GDK_2BUTTON_PRESS && [delegate respondsToSelector:@selector(mouseDoubleClickAt:withButton:andMask:)]) { + [delegate mouseDoubleClickAt:pos withButton:button andMask:mask]; + } + } + + [pool drain]; + return FALSE; +} + +static gboolean button_release_event_cb(GtkWidget *widget, GdkEventButton *event, WidgetSurface *surface) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + id delegate = [surface inputDelegate]; + if (delegate != nil) { + if ([delegate respondsToSelector:@selector(mouseReleaseAt:withButton:andMask:)]) { + NSPoint pos = NSMakePoint (event->x, event->y); + MouseButton button = (MouseButton)event->button; + InputMask mask = mask_from_gdk_modifier_state (event->state); + [delegate mouseReleaseAt:pos withButton:button andMask:mask]; + } + } + + [pool drain]; + return FALSE; +} + +static gboolean motion_notify_event_cb(GtkWidget *widget, GdkEventMotion *event, WidgetSurface *surface) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + id delegate = [surface inputDelegate]; + if (delegate != nil) { + if ([delegate respondsToSelector:@selector(mouseMoveTo:withButtons:andMask:)]) { + NSPoint pos = NSMakePoint (event->x, event->y); + MouseButton buttons = buttons_from_gdk_modifier_state (event->state); + InputMask mask = mask_from_gdk_modifier_state (event->state); + [delegate mouseMoveTo:pos withButtons:buttons andMask:mask]; + } + } + + [pool drain]; + return FALSE; +} + +static gboolean key_press_event_cb(GtkWidget *widget, GdkEventKey *event, WidgetSurface *surface) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + id delegate = [surface inputDelegate]; + if (delegate != nil) { + if ([delegate respondsToSelector:@selector(keyPressed:withMask:)]) { + InputMask mask = mask_from_gdk_modifier_state (event->state); + [delegate keyPressed:event->keyval withMask:mask]; + } + } + + [pool drain]; + return FALSE; +} + +static gboolean key_release_event_cb(GtkWidget *widget, GdkEventKey *event, WidgetSurface *surface) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + id delegate = [surface inputDelegate]; + if (delegate != nil) { + if ([delegate respondsToSelector:@selector(keyReleased:withMask:)]) { + InputMask mask = mask_from_gdk_modifier_state (event->state); + [delegate keyReleased:event->keyval withMask:mask]; + } + } + + [pool drain]; + return FALSE; +} + +static gboolean scroll_event_cb (GtkWidget *widget, GdkEventScroll *event, WidgetSurface *surface) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + id delegate = [surface inputDelegate]; + if (delegate != nil) { + if ([delegate respondsToSelector:@selector(mouseScrolledAt:inDirection:withMask:)]) { + NSPoint pos = NSMakePoint (event->x, event->y); + InputMask mask = mask_from_gdk_modifier_state (event->state); + ScrollDirection dir = scroll_dir_from_gdk_scroll_dir (event->direction); + [delegate mouseScrolledAt:pos + inDirection:dir + withMask:mask]; + } + } + + [pool drain]; + return FALSE; +} + +static void unref_cursor (gpointer cursor, GClosure *closure) { + if (cursor != NULL) { + gdk_cursor_unref ((GdkCursor*)cursor); + } +} + +static void set_cursor (GtkWidget *widget, GdkCursor *cursor) { + GdkWindow *window = gtk_widget_get_window (widget); + if (window) { + gdk_window_set_cursor (window, cursor); + if (cursor != NULL) { + gdk_cursor_unref (cursor); + } + } +} +// }}} + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/Window.h b/tikzit-1/src/gtk/Window.h new file mode 100644 index 0000000..a3ce8a4 --- /dev/null +++ b/tikzit-1/src/gtk/Window.h @@ -0,0 +1,182 @@ +/* + * Copyright 2011-2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import + +@class GraphEditorPanel; +@class Menu; +@class PropertyPane; +@class Preambles; +@class PreambleEditor; +@class PreviewWindow; +@class SettingsDialog; +@class StyleManager; +@class StylesPane; +@class TikzDocument; +@protocol Tool; + +/** + * Manages a document window + */ +@interface Window: NSObject { + // GTK+ widgets + GtkWindow *window; + GtkTextBuffer *tikzBuffer; + GtkStatusbar *statusBar; + GtkPaned *tikzPaneSplitter; + GtkWidget *tikzPane; + + gulong clipboard_handler_id; + GtkTextTag *errorHighlightTag; // owned by tikzBuffer + + // Classes that manage parts of the window + Menu *menu; + GraphEditorPanel *graphPanel; + + PreviewWindow *previewWindow; + + // state variables + BOOL suppressTikzUpdates; + BOOL hasParseError; + + // the document displayed by the window + TikzDocument *document; +} + +/** + * The document displayed by the window + */ +@property (retain) TikzDocument *document; +@property (readonly) BOOL hasFocus; +@property (readonly) GtkWindow *gtkWindow; + +/** + * Create a window with an empty document + */ +- (id) init; ++ (id) window; + +/** + * Create a window with the given document + */ +- (id) initWithDocument:(TikzDocument*)doc; ++ (id) windowWithDocument:(TikzDocument*)doc; + +/** + * Present the window to the user + */ +- (void) present; + +/** + * Open a file, asking the user which file to open + */ +- (void) openFile; +/** + * Open a file + */ +- (BOOL) openFileAtPath:(NSString*)path; +/** + * Save the active document to the path it was opened from + * or last saved to, or ask the user where to save it. + */ +- (BOOL) saveActiveDocument; +/** + * Save the active document, asking the user where to save it. + */ +- (BOOL) saveActiveDocumentAs; +/** + * Save the active document as a shape, asking the user what to name it. + */ +- (void) saveActiveDocumentAsShape; + +/** + * Close the window. + * + * May terminate the application if this is the last window. + * + * Will ask for user confirmation if the document is not saved. + */ +- (void) close; + +/** + * Cut the current selection to the clipboard. + */ +- (void) selectionCutToClipboard; +/** + * Copy the current selection to the clipboard. + */ +- (void) selectionCopyToClipboard; +/** + * Paste from the clipboard to the appropriate place. + */ +- (void) pasteFromClipboard; + +/** + * The GTK+ window that this class manages. + */ +- (GtkWindow*) gtkWindow; +/** + * The menu for the window. + */ +- (Menu*) menu; + +/** + * Present an error to the user + * + * @param error the error to present + */ +- (void) presentError:(NSError*)error; +/** + * Present an error to the user + * + * @param error the error to present + * @param message a message to display with the error + */ +- (void) presentError:(NSError*)error withMessage:(NSString*)message; +/** + * Present an error to the user + * + * @param error the error to present + */ +- (void) presentGError:(GError*)error; +/** + * Present an error to the user + * + * @param error the error to present + * @param message a message to display with the error + */ +- (void) presentGError:(GError*)error withMessage:(NSString*)message; + +- (void) setActiveTool:(id)tool; + +- (void) zoomIn; +- (void) zoomOut; +- (void) zoomReset; + +/** + * Show or update the preview window. + */ +- (void) presentPreview; +/** + * Show or update the preview window without it grabbing focus + */ +- (void) updatePreview; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/Window.m b/tikzit-1/src/gtk/Window.m new file mode 100644 index 0000000..2d9e63a --- /dev/null +++ b/tikzit-1/src/gtk/Window.m @@ -0,0 +1,991 @@ +/* + * Copyright 2011-2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "Window.h" + +#import +#import "gtkhelpers.h" +#import "clipboard.h" + +#import "Application.h" +#import "Configuration.h" +#import "FileChooserDialog.h" +#import "GraphEditorPanel.h" +#import "Menu.h" +#import "RecentManager.h" +#import "Shape.h" +#import "SupportDir.h" +#import "TikzDocument.h" + +#ifdef HAVE_POPPLER +#import "PreviewWindow.h" +#endif + +enum { + GraphInfoStatus, + ParseStatus +}; + +// {{{ Internal interfaces +// {{{ Clipboard support + +static void clipboard_provide_data (GtkClipboard *clipboard, + GtkSelectionData *selection_data, + guint info, + gpointer clipboard_graph_data); +static void clipboard_release_data (GtkClipboard *clipboard, gpointer clipboard_graph_data); +static void clipboard_check_targets (GtkClipboard *clipboard, + GdkAtom *atoms, + gint n_atoms, + gpointer action); +static void clipboard_paste_contents (GtkClipboard *clipboard, + GtkSelectionData *selection_data, + gpointer document); + +// }}} +// {{{ Signals + +static void window_toplevel_focus_changed_cb (GObject *gobject, GParamSpec *pspec, Window *window); +static void graph_divider_position_changed_cb (GObject *gobject, GParamSpec *pspec, Window *window); +static void tikz_buffer_changed_cb (GtkTextBuffer *buffer, Window *window); +static gboolean main_window_delete_event_cb (GtkWidget *widget, GdkEvent *event, Window *window); +static void main_window_destroy_cb (GtkWidget *widget, Window *window); +static gboolean main_window_configure_event_cb (GtkWidget *widget, GdkEventConfigure *event, Window *window); +static void update_paste_action (GtkClipboard *clipboard, GdkEvent *event, GtkAction *action); + +// }}} + +@interface Window (Notifications) +- (void) tikzBufferChanged; +- (void) windowSizeChangedWidth:(int)width height:(int)height; +- (void) documentTikzChanged:(NSNotification*)notification; +- (void) documentSelectionChanged:(NSNotification*)notification; +- (void) undoStackChanged:(NSNotification*)notification; +@end + +@interface Window (InitHelpers) +- (void) _loadUi; +- (void) _restoreUiState; +- (void) _connectSignals; +@end + +@interface Window (Private) +- (BOOL) _askCanClose; +/** Open a document, dealing with errors as necessary */ +- (TikzDocument*) _openDocument:(NSString*)path; +- (void) _placeGraphOnClipboard:(Graph*)graph; +- (void) _clearParseError; +- (void) _setParseError:(NSError*)error; +/** Update the window title. */ +- (void) _updateTitle; +/** Update the window status bar default text. */ +- (void) _updateStatus; +/** Update the displayed tikz code to match the active document. */ +- (void) _updateTikz; +/** Update the undo and redo actions to match the active document's + * undo stack. */ +- (void) _updateUndoActions; +- (void) showPreview; +@end + +// }}} +// {{{ API + +@implementation Window + +@synthesize gtkWindow=window; + +- (id) init { + return [self initWithDocument:[TikzDocument documentWithStyleManager:[app styleManager]]]; +} ++ (id) window { + return [[[self alloc] init] autorelease]; +} +- (id) initWithDocument:(TikzDocument*)doc { + self = [super init]; + + if (self) { + [self _loadUi]; + [self _restoreUiState]; + [self _connectSignals]; + + [self setDocument:doc]; + + gtk_widget_show (GTK_WIDGET (window)); + } + + return self; +} ++ (id) windowWithDocument:(TikzDocument*)doc { + return [[[self alloc] initWithDocument:doc] autorelease]; +} + +- (void) dealloc { + // The GTK+ window has already been destroyed at this point + + [[NSNotificationCenter defaultCenter] removeObserver:self]; + g_signal_handler_disconnect ( + gtk_clipboard_get (GDK_SELECTION_CLIPBOARD), + clipboard_handler_id); + + [previewWindow release]; + [menu release]; + [graphPanel release]; + [document release]; + + g_object_unref (tikzBuffer); + g_object_unref (tikzPane); + g_object_unref (tikzPaneSplitter); + g_object_unref (statusBar); + g_object_unref (window); + + [super dealloc]; +} + +- (TikzDocument*) document { + return document; +} +- (void) setDocument:(TikzDocument*)newDoc { + [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:[document pickSupport]]; + [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:document]; + + TikzDocument *oldDoc = document; + document = [newDoc retain]; + + [graphPanel setDocument:document]; + [previewWindow setDocument:document]; + [self _updateTikz]; + [self _updateTitle]; + [self _updateStatus]; + [self _updateUndoActions]; + [menu notifySelectionChanged:[document pickSupport]]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(documentTikzChanged:) + name:@"TikzChanged" object:document]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(undoStackChanged:) + name:@"UndoStackChanged" object:document]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(documentSelectionChanged:) + name:@"NodeSelectionChanged" object:[document pickSupport]]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(documentSelectionChanged:) + name:@"EdgeSelectionChanged" object:[document pickSupport]]; + + if ([document path] != nil) { + [[RecentManager defaultManager] addRecentFile:[document path]]; + } + + NSDictionary *userInfo; + userInfo = [NSDictionary dictionaryWithObjectsAndKeys: + document, @"document", + oldDoc, @"oldDocument", + nil]; + [[NSNotificationCenter defaultCenter] + postNotificationName:@"DocumentChanged" + object:self + userInfo:userInfo]; + [oldDoc release]; +} + +- (BOOL) hasFocus { + return gtk_window_has_toplevel_focus (GTK_WINDOW (window)); +} + +- (void) present { + gtk_window_present (GTK_WINDOW (window)); +} + +- (void) openFile { + FileChooserDialog *dialog = [FileChooserDialog openDialogWithParent:window]; + [dialog addStandardFilters]; + if ([document path]) { + [dialog setCurrentFolder:[[document path] stringByDeletingLastPathComponent]]; + } else if ([app lastOpenFolder]) { + [dialog setCurrentFolder:[app lastOpenFolder]]; + } + + if ([dialog showDialog]) { + if ([self openFileAtPath:[dialog filePath]]) { + [app setLastOpenFolder:[dialog currentFolder]]; + } + } + [dialog destroy]; +} + +- (BOOL) openFileAtPath:(NSString*)path { + TikzDocument *doc = [self _openDocument:path]; + if (doc != nil) { + if (![document hasUnsavedChanges] && [document path] == nil) { + // we just have a fresh, untitled document - replace it + [self setDocument:doc]; + } else { + [app newWindowWithDocument:doc]; + } + return YES; + } + return NO; +} + +- (BOOL) saveActiveDocument { + if ([document path] == nil) { + return [self saveActiveDocumentAs]; + } else { + NSError *error = nil; + if (![document save:&error]) { + [self presentError:error]; + return NO; + } else { + [self _updateTitle]; + return YES; + } + } +} + +- (BOOL) saveActiveDocumentAs { + FileChooserDialog *dialog = [FileChooserDialog saveDialogWithParent:window]; + [dialog addStandardFilters]; + if ([document path] != nil) { + [dialog setCurrentFolder:[[document path] stringByDeletingLastPathComponent]]; + } else if ([app lastSaveAsFolder] != nil) { + [dialog setCurrentFolder:[app lastSaveAsFolder]]; + } + [dialog setSuggestedName:[document suggestedFileName]]; + + BOOL saved = NO; + if ([dialog showDialog]) { + NSString *nfile = [dialog filePath]; + + NSError *error = nil; + if (![document saveToPath:nfile error:&error]) { + [self presentError:error]; + } else { + [self _updateTitle]; + [[RecentManager defaultManager] addRecentFile:nfile]; + [app setLastSaveAsFolder:[dialog currentFolder]]; + saved = YES; + } + } + [dialog destroy]; + return saved; +} + +- (void) saveActiveDocumentAsShape { + GtkWidget *dialog = gtk_dialog_new_with_buttons ( + "Save as shape", + window, + GTK_DIALOG_MODAL, + GTK_STOCK_OK, + GTK_RESPONSE_ACCEPT, + GTK_STOCK_CANCEL, + GTK_RESPONSE_REJECT, + NULL); + GtkBox *content = GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))); + GtkWidget *label1 = gtk_label_new ("Please choose a name for the shape"); + GtkWidget *label2 = gtk_label_new ("Name:"); + GtkWidget *input = gtk_entry_new (); + GtkBox *hbox = GTK_BOX (gtk_hbox_new (FALSE, 5)); + gtk_box_pack_start (hbox, label2, FALSE, TRUE, 0); + gtk_box_pack_start (hbox, input, TRUE, TRUE, 0); + gtk_box_pack_start (content, label1, TRUE, TRUE, 5); + gtk_box_pack_start (content, GTK_WIDGET (hbox), TRUE, TRUE, 5); + gtk_widget_show_all (GTK_WIDGET (content)); + gint response = gtk_dialog_run (GTK_DIALOG (dialog)); + while (response == GTK_RESPONSE_ACCEPT) { + response = GTK_RESPONSE_NONE; + NSDictionary *shapeDict = [Shape shapeDictionary]; + const gchar *dialogInput = gtk_entry_get_text (GTK_ENTRY (input)); + NSString *shapeName = [NSString stringWithUTF8String:dialogInput]; + BOOL doSave = NO; + if ([shapeName isEqual:@""]) { + GtkWidget *emptyStrDialog = gtk_message_dialog_new (window, + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_CLOSE, + "You must specify a shape name"); + gtk_dialog_run (GTK_DIALOG (emptyStrDialog)); + gtk_widget_destroy (emptyStrDialog); + response = gtk_dialog_run (GTK_DIALOG (dialog)); + } else if ([shapeDict objectForKey:shapeName] != nil) { + GtkWidget *overwriteDialog = gtk_message_dialog_new (window, + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_QUESTION, + GTK_BUTTONS_YES_NO, + "Do you want to replace the existing shape named '%s'?", + dialogInput); + gint overwriteResp = gtk_dialog_run (GTK_DIALOG (overwriteDialog)); + gtk_widget_destroy (overwriteDialog); + + if (overwriteResp == GTK_RESPONSE_YES) { + doSave = YES; + } else { + response = gtk_dialog_run (GTK_DIALOG (dialog)); + } + } else { + doSave = YES; + } + if (doSave) { + NSError *error = nil; + NSString *userShapeDir = [[SupportDir userSupportDir] stringByAppendingPathComponent:@"shapes"]; + NSString *file = [NSString stringWithFormat:@"%@/%@.tikz", userShapeDir, shapeName]; + if (![[NSFileManager defaultManager] ensureDirectoryExists:userShapeDir error:&error]) { + [self presentError:error withMessage:@"Could not create user shape directory"]; + } else { + if (![document saveCopyToPath:file error:&error]) { + [self presentError:error withMessage:@"Could not save shape file"]; + } else { + [Shape refreshShapeDictionary]; + } + } + } + } + gtk_widget_destroy (dialog); +} + +- (void) close { + if ([self _askCanClose]) { + gtk_widget_destroy (GTK_WIDGET (window)); + } +} + +- (void) selectionCutToClipboard { + if ([[[document pickSupport] selectedNodes] count] > 0) { + [self _placeGraphOnClipboard:[document selectionCut]]; + } +} + +- (void) selectionCopyToClipboard { + if ([[[document pickSupport] selectedNodes] count] > 0) { + [self _placeGraphOnClipboard:[document selectionCopy]]; + } +} + +- (void) pasteFromClipboard { + gtk_clipboard_request_contents (gtk_clipboard_get (GDK_SELECTION_CLIPBOARD), + tikzit_picture_atom, + clipboard_paste_contents, + document); +} + +- (GtkWindow*) gtkWindow { + return window; +} + +- (Configuration*) mainConfiguration { + return [app mainConfiguration]; +} + +- (Menu*) menu { + return menu; +} + +- (void) presentError:(NSError*)error { + const gchar *errorDesc = "unknown error"; + if (error && [error localizedDescription]) { + errorDesc = [[error localizedDescription] UTF8String]; + } + GtkWidget *dialog = gtk_message_dialog_new (window, + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_CLOSE, + "%s", + errorDesc); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); +} + +- (void) presentError:(NSError*)error withMessage:(NSString*)message { + const gchar *errorDesc = "unknown error"; + if (error && [error localizedDescription]) { + errorDesc = [[error localizedDescription] UTF8String]; + } + GtkWidget *dialog = gtk_message_dialog_new (window, + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_CLOSE, + "%s: %s", + [message UTF8String], + errorDesc); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); +} + +- (void) presentGError:(GError*)error { + const gchar *errorDesc = "unknown error"; + if (error && error->message) { + errorDesc = error->message; + } + GtkWidget *dialog = gtk_message_dialog_new (window, + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_CLOSE, + "%s", + errorDesc); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); +} + +- (void) presentGError:(GError*)error withMessage:(NSString*)message { + const gchar *errorDesc = "unknown error"; + if (error && error->message) { + errorDesc = error->message; + } + GtkWidget *dialog = gtk_message_dialog_new (window, + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_CLOSE, + "%s: %s", + [message UTF8String], + errorDesc); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); +} + +- (void) setActiveTool:(id)tool { + [graphPanel setActiveTool:tool]; + gboolean hasfocus; + g_object_get (G_OBJECT (window), "has-toplevel-focus", &hasfocus, NULL); + if (hasfocus) { + [graphPanel grabTool]; + } +} + +- (void) zoomIn { + [graphPanel zoomIn]; +} + +- (void) zoomOut { + [graphPanel zoomOut]; +} + +- (void) zoomReset { + [graphPanel zoomReset]; +} + +- (void) presentPreview { +#ifdef HAVE_POPPLER + if (previewWindow == nil) { + previewWindow = [[PreviewWindow alloc] initWithPreambles:[app preambles] + config:[app mainConfiguration]]; + //[previewWindow setParentWindow:self]; + [previewWindow setDocument:document]; + } + [previewWindow present]; +#endif +} + +- (void) updatePreview { +#ifdef HAVE_POPPLER + if (previewWindow == nil) { + previewWindow = [[PreviewWindow alloc] initWithPreambles:[app preambles] + config:[app mainConfiguration]]; + //[previewWindow setParentWindow:self]; + [previewWindow setDocument:document]; + } + [previewWindow show]; +#endif +} + +@end + +// }}} +// {{{ Notifications + +@implementation Window (Notifications) +- (void) graphHeightChanged:(int)newHeight { + [[app mainConfiguration] setIntegerEntry:@"graphHeight" + inGroup:@"window" + value:newHeight]; +} + +- (void) tikzBufferChanged { + if (!suppressTikzUpdates) { + suppressTikzUpdates = TRUE; + + GtkTextIter start, end; + gtk_text_buffer_get_bounds (tikzBuffer, &start, &end); + gchar *text = gtk_text_buffer_get_text (tikzBuffer, &start, &end, FALSE); + + NSError *error = nil; + BOOL success = [document updateTikz:[NSString stringWithUTF8String:text] error:&error]; + if (success) + [self _clearParseError]; + else + [self _setParseError:error]; + + g_free (text); + + suppressTikzUpdates = FALSE; + } +} + +- (void) windowSizeChangedWidth:(int)width height:(int)height { + if (width > 0 && height > 0) { + NSNumber *w = [NSNumber numberWithInt:width]; + NSNumber *h = [NSNumber numberWithInt:height]; + NSMutableArray *size = [NSMutableArray arrayWithCapacity:2]; + [size addObject:w]; + [size addObject:h]; + [[app mainConfiguration] setIntegerListEntry:@"windowSize" + inGroup:@"window" + value:size]; + } +} + +- (void) documentTikzChanged:(NSNotification*)notification { + [self _updateTitle]; + [self _updateTikz]; +} + +- (void) documentSelectionChanged:(NSNotification*)notification { + [self _updateStatus]; + [menu notifySelectionChanged:[document pickSupport]]; +} + +- (void) undoStackChanged:(NSNotification*)notification { + [self _updateUndoActions]; +} +@end + +// }}} +// {{{ InitHelpers + +@implementation Window (InitHelpers) + +- (void) _loadUi { + window = GTK_WINDOW (gtk_window_new (GTK_WINDOW_TOPLEVEL)); + g_object_ref_sink (window); + gtk_window_set_title (window, "TikZiT"); + gtk_window_set_default_size (window, 700, 400); + + GtkBox *mainLayout = GTK_BOX (gtk_vbox_new (FALSE, 0)); + gtk_widget_show (GTK_WIDGET (mainLayout)); + gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (mainLayout)); + + menu = [[Menu alloc] initForWindow:self]; + + GtkWidget *menubar = [menu menubar]; + gtk_box_pack_start (mainLayout, menubar, FALSE, TRUE, 0); + gtk_box_reorder_child (mainLayout, menubar, 0); + gtk_widget_show (menubar); + + tikzPaneSplitter = GTK_PANED (gtk_vpaned_new ()); + g_object_ref_sink (tikzPaneSplitter); + gtk_widget_show (GTK_WIDGET (tikzPaneSplitter)); + gtk_box_pack_start (mainLayout, GTK_WIDGET (tikzPaneSplitter), TRUE, TRUE, 0); + + graphPanel = [[GraphEditorPanel alloc] initWithDocument:document]; + [graphPanel setPreviewHandler:self]; + GtkWidget *graphEditorWidget = [graphPanel widget]; + gtk_widget_show (graphEditorWidget); + GtkWidget *graphFrame = gtk_frame_new (NULL); + gtk_container_add (GTK_CONTAINER (graphFrame), graphEditorWidget); + gtk_widget_show (graphFrame); + gtk_paned_pack1 (tikzPaneSplitter, graphFrame, TRUE, TRUE); + + tikzBuffer = gtk_text_buffer_new (NULL); + g_object_ref_sink (tikzBuffer); + errorHighlightTag = gtk_text_buffer_create_tag ( + tikzBuffer, NULL, + "foreground", "#d40000", + "foreground-set", TRUE, + "weight", PANGO_WEIGHT_SEMIBOLD, + "weight-set", TRUE, + NULL); + GtkWidget *tikzScroller = gtk_scrolled_window_new (NULL, NULL); + gtk_widget_show (tikzScroller); + + tikzPane = gtk_text_view_new_with_buffer (tikzBuffer); + gtk_text_view_set_left_margin (GTK_TEXT_VIEW (tikzPane), 3); + gtk_text_view_set_right_margin (GTK_TEXT_VIEW (tikzPane), 3); + g_object_ref_sink (tikzPane); + gtk_widget_show (tikzPane); + gtk_container_add (GTK_CONTAINER (tikzScroller), tikzPane); + GtkWidget *tikzFrame = gtk_frame_new (NULL); + gtk_container_add (GTK_CONTAINER (tikzFrame), tikzScroller); + gtk_widget_show (tikzFrame); + gtk_paned_pack2 (tikzPaneSplitter, tikzFrame, FALSE, TRUE); + + statusBar = GTK_STATUSBAR (gtk_statusbar_new ()); + g_object_ref_sink (statusBar); + gtk_widget_show (GTK_WIDGET (statusBar)); + gtk_box_pack_start (mainLayout, GTK_WIDGET (statusBar), FALSE, TRUE, 0); + + GtkClipboard *clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); + update_paste_action (clipboard, NULL, [menu pasteAction]); +} + +- (void) _restoreUiState { + Configuration *config = [app mainConfiguration]; + NSArray *windowSize = [config integerListEntry:@"windowSize" + inGroup:@"window"]; + if (windowSize && [windowSize count] == 2) { + gint width = [[windowSize objectAtIndex:0] intValue]; + gint height = [[windowSize objectAtIndex:1] intValue]; + if (width > 0 && height > 0) { + gtk_window_set_default_size (window, width, height); + } + } + int panePos = [config integerEntry:@"graphHeight" + inGroup:@"window"]; + if (panePos > 0) { + gtk_paned_set_position (tikzPaneSplitter, panePos); + } +} + +- (void) _connectSignals { + GtkClipboard *clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); + clipboard_handler_id = + g_signal_connect (G_OBJECT (clipboard), + "owner-change", + G_CALLBACK (update_paste_action), + [menu pasteAction]); + g_signal_connect (G_OBJECT (window), + "key-press-event", + G_CALLBACK (tz_hijack_key_press), + NULL); + g_signal_connect (G_OBJECT (window), + "notify::has-toplevel-focus", + G_CALLBACK (window_toplevel_focus_changed_cb), + self); + g_signal_connect (G_OBJECT (tikzPaneSplitter), + "notify::position", + G_CALLBACK (graph_divider_position_changed_cb), + self); + g_signal_connect (G_OBJECT (tikzBuffer), + "changed", + G_CALLBACK (tikz_buffer_changed_cb), + self); + g_signal_connect (G_OBJECT (window), + "delete-event", + G_CALLBACK (main_window_delete_event_cb), + self); + g_signal_connect (G_OBJECT (window), + "destroy", + G_CALLBACK (main_window_destroy_cb), + self); + g_signal_connect (G_OBJECT (window), + "configure-event", + G_CALLBACK (main_window_configure_event_cb), + self); +} +@end + +// }}} +// {{{ Private + +@implementation Window (Private) + +- (BOOL) _askCanClose { + if ([document hasUnsavedChanges]) { + GtkWidget *dialog = gtk_message_dialog_new (window, + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_QUESTION, + GTK_BUTTONS_NONE, + "Save changes to the document \"%s\" before closing?", + [[document name] UTF8String]); + gtk_dialog_add_buttons (GTK_DIALOG (dialog), + "Save", GTK_RESPONSE_YES, + "Don't save", GTK_RESPONSE_NO, + "Cancel", GTK_RESPONSE_CANCEL, + NULL); + gint result = gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + if (result == GTK_RESPONSE_YES) { + return [self saveActiveDocument]; + } else { + return result == GTK_RESPONSE_NO; + } + } else { + return YES; + } +} + +- (TikzDocument*) _openDocument:(NSString*)path { + NSError *error = nil; + TikzDocument *d = [TikzDocument documentFromFile:path + styleManager:[app styleManager] + error:&error]; + if (d != nil) { + return d; + } else { + if ([error code] == TZ_ERR_PARSE) { + [self presentError:error withMessage:@"Invalid file"]; + } else { + [self presentError:error withMessage:@"Could not open file"]; + } + [[RecentManager defaultManager] removeRecentFile:path]; + return nil; + } +} + +- (void) _placeGraphOnClipboard:(Graph*)graph { + GtkClipboard *clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); + + static const GtkTargetEntry targets[] = { + { "TIKZITPICTURE", 0, TARGET_TIKZIT_PICTURE }, + { "UTF8_STRING", 0, TARGET_UTF8_STRING } }; + + gtk_clipboard_set_with_data (clipboard, + targets, G_N_ELEMENTS (targets), + clipboard_provide_data, + clipboard_release_data, + clipboard_graph_data_new (graph)); +} + +- (void) _clearParseError { + if (!hasParseError) + return; + gtk_statusbar_pop (statusBar, ParseStatus); + text_buffer_clear_tag (tikzBuffer, errorHighlightTag); + widget_clear_error (tikzPane); + hasParseError = NO; +} + +- (void) _setParseError:(NSError*)error { + if (!hasParseError) { + widget_set_error (tikzPane); + hasParseError = YES; + } + NSString *message = [NSString stringWithFormat:@"Parse error: %@", [error localizedDescription]]; + gtk_statusbar_pop (statusBar, ParseStatus); + gtk_statusbar_push (statusBar, ParseStatus, [message UTF8String]); + + text_buffer_clear_tag (tikzBuffer, errorHighlightTag); + + NSDictionary *errorInfo = [error userInfo]; + if ([errorInfo objectForKey:@"startLine"] != nil) { + GtkTextIter symbolStart; + GtkTextIter symbolEnd; + gtk_text_buffer_get_iter_at_line_index (tikzBuffer, &symbolStart, + [[errorInfo objectForKey:@"startLine"] intValue] - 1, + [[errorInfo objectForKey:@"startColumn"] intValue] - 1); + gtk_text_buffer_get_iter_at_line_index (tikzBuffer, &symbolEnd, + [[errorInfo objectForKey:@"endLine"] intValue] - 1, + [[errorInfo objectForKey:@"endColumn"] intValue]); + gtk_text_buffer_apply_tag (tikzBuffer, errorHighlightTag, + &symbolStart, &symbolEnd); + } +} + +- (void) _updateUndoActions { + [menu setUndoActionEnabled:[document canUndo]]; + [menu setUndoActionDetail:[document undoName]]; + + [menu setRedoActionEnabled:[document canRedo]]; + [menu setRedoActionDetail:[document redoName]]; +} + +- (void) _updateTitle { + NSString *title = [NSString stringWithFormat:@"TikZiT - %@%s", + [document name], + ([document hasUnsavedChanges] ? "*" : "")]; + gtk_window_set_title(window, [title UTF8String]); +} + +- (void) _updateStatus { + // FIXME: show tooltips or something instead + GString *buffer = g_string_sized_new (30); + gchar *nextNode = 0; + + for (Node *n in [[document pickSupport] selectedNodes]) { + if (nextNode) { + if (buffer->len == 0) { + g_string_printf(buffer, "Nodes %s", nextNode); + } else { + g_string_append_printf(buffer, ", %s", nextNode); + } + } + nextNode = (gchar *)[[n name] UTF8String]; + } + if (nextNode) { + if (buffer->len == 0) { + g_string_printf(buffer, "Node %s is selected", nextNode); + } else { + g_string_append_printf(buffer, " and %s are selected", nextNode); + } + } + + if (buffer->len == 0) { + int nrNodes = [[[document graph] nodes] count]; + int nrEdges = [[[document graph] edges] count]; + g_string_printf(buffer, "Graph has %d node%s and %d edge%s", + nrNodes, + nrNodes!=1 ? "s" : "", + nrEdges, + nrEdges!=1 ? "s" : ""); + } + gtk_statusbar_pop(statusBar, GraphInfoStatus); + gtk_statusbar_push(statusBar, GraphInfoStatus, buffer->str); + + g_string_free (buffer, TRUE); +} + +- (void) _updateTikz { + if (document != nil && !suppressTikzUpdates) { + suppressTikzUpdates = TRUE; + + if (document != nil) { + const char *tikzString = [[document tikz] UTF8String]; + gtk_text_buffer_set_text (tikzBuffer, tikzString, -1); + } else { + gtk_text_buffer_set_text (tikzBuffer, "", -1); + } + [self _clearParseError]; + + suppressTikzUpdates = FALSE; + } +} + +- (GraphEditorPanel*) _graphPanel { + return graphPanel; +} + +- (void) showPreview { + [self updatePreview]; +} + +@end + +// }}} +// {{{ GTK+ callbacks + +static void window_toplevel_focus_changed_cb (GObject *gobject, GParamSpec *pspec, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + gboolean hasfocus; + g_object_get (gobject, "has-toplevel-focus", &hasfocus, NULL); + if (hasfocus) { + [[NSNotificationCenter defaultCenter] + postNotificationName:@"WindowGainedFocus" + object:window]; + [[window _graphPanel] grabTool]; + } else { + [[NSNotificationCenter defaultCenter] + postNotificationName:@"WindowLostFocus" + object:window]; + } + [pool drain]; +} + +static void graph_divider_position_changed_cb (GObject *gobject, GParamSpec *pspec, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + gint position; + g_object_get (gobject, "position", &position, NULL); + [window graphHeightChanged:position]; + [pool drain]; +} + +static void tikz_buffer_changed_cb (GtkTextBuffer *buffer, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [window tikzBufferChanged]; + [pool drain]; +} + +static gboolean main_window_delete_event_cb (GtkWidget *widget, GdkEvent *event, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [window close]; + [pool drain]; + return TRUE; +} + +static void main_window_destroy_cb (GtkWidget *widget, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [[NSNotificationCenter defaultCenter] postNotificationName:@"WindowClosed" + object:window]; + [pool drain]; +} + +static gboolean main_window_configure_event_cb (GtkWidget *widget, GdkEventConfigure *event, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [window windowSizeChangedWidth:event->width height:event->height]; + [pool drain]; + return FALSE; +} + +static void clipboard_provide_data (GtkClipboard *clipboard, + GtkSelectionData *selection_data, + guint info, + gpointer clipboard_graph_data) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + ClipboardGraphData *data = (ClipboardGraphData*)clipboard_graph_data; + if (info == TARGET_UTF8_STRING || info == TARGET_TIKZIT_PICTURE) { + clipboard_graph_data_convert (data); + GdkAtom target = (info == TARGET_UTF8_STRING) ? utf8_atom : tikzit_picture_atom; + gtk_selection_data_set (selection_data, + target, + 8*sizeof(gchar), + (guchar*)data->tikz, + data->tikz_length); + } + + [pool drain]; +} + +static void clipboard_release_data (GtkClipboard *clipboard, gpointer data) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + clipboard_graph_data_free ((ClipboardGraphData*)data); + [pool drain]; +} + +static void clipboard_check_targets (GtkClipboard *clipboard, + GdkAtom *atoms, + gint n_atoms, + gpointer action) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + gboolean found = FALSE; + for (gint i = 0; i < n_atoms; ++i) { + if (atoms[i] == tikzit_picture_atom) { + found = TRUE; + break; + } + } + gtk_action_set_sensitive (GTK_ACTION (action), found); + + [pool drain]; +} + +static void update_paste_action (GtkClipboard *clipboard, GdkEvent *event, GtkAction *action) { + gtk_action_set_sensitive (action, FALSE); + gtk_clipboard_request_targets (clipboard, clipboard_check_targets, action); +} + +static void clipboard_paste_contents (GtkClipboard *clipboard, + GtkSelectionData *selection_data, + gpointer document) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + TikzDocument *doc = (TikzDocument*)document; + gint length = gtk_selection_data_get_length (selection_data); + if (length >= 0) { + const guchar *raw_data = gtk_selection_data_get_data (selection_data); + gchar *data = g_new (gchar, length+1); + g_strlcpy (data, (const gchar *)raw_data, length+1); + NSString *tikz = [NSString stringWithUTF8String:data]; + if (tikz != nil) { + [doc pasteFromTikz:tikz]; + } + g_free (data); + } + + [pool drain]; +} + +// }}} + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/cairo_helpers.h b/tikzit-1/src/gtk/cairo_helpers.h new file mode 100644 index 0000000..e95357b --- /dev/null +++ b/tikzit-1/src/gtk/cairo_helpers.h @@ -0,0 +1,25 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import "RColor.h" +#import + +void cairo_ns_rectangle (cairo_t* cr, NSRect rect); +void cairo_set_source_rcolor (cairo_t* cr, RColor color); + +// vim:ft=objc:sts=4:sw=4:et diff --git a/tikzit-1/src/gtk/cairo_helpers.m b/tikzit-1/src/gtk/cairo_helpers.m new file mode 100644 index 0000000..104e686 --- /dev/null +++ b/tikzit-1/src/gtk/cairo_helpers.m @@ -0,0 +1,28 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "cairo_helpers.h" + +void cairo_ns_rectangle (cairo_t* cr, NSRect rect) { + cairo_rectangle (cr, rect.origin.x, rect.origin.y, rect.size.width, rect.size.height); +} + +void cairo_set_source_rcolor (cairo_t* cr, RColor color) { + cairo_set_source_rgba (cr, color.red, color.green, color.blue, color.alpha); +} + +// vim:ft=objc:sts=4:sw=4:et diff --git a/tikzit-1/src/gtk/clipboard.h b/tikzit-1/src/gtk/clipboard.h new file mode 100644 index 0000000..568fc50 --- /dev/null +++ b/tikzit-1/src/gtk/clipboard.h @@ -0,0 +1,41 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import +#import + +enum { + TARGET_UTF8_STRING, + TARGET_TIKZIT_PICTURE +}; +typedef struct +{ + Graph *graph; + gchar *tikz; + gint tikz_length; +} ClipboardGraphData; + +extern GdkAtom utf8_atom; +extern GdkAtom tikzit_picture_atom; + +void clipboard_init (); +ClipboardGraphData *clipboard_graph_data_new (Graph *graph); +void clipboard_graph_data_free (ClipboardGraphData *data); +void clipboard_graph_data_convert (ClipboardGraphData *data); + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/clipboard.m b/tikzit-1/src/gtk/clipboard.m new file mode 100644 index 0000000..7001717 --- /dev/null +++ b/tikzit-1/src/gtk/clipboard.m @@ -0,0 +1,57 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "clipboard.h" + +GdkAtom utf8_atom; +GdkAtom tikzit_picture_atom; + +void clipboard_init () { + if (utf8_atom == GDK_NONE) { + utf8_atom = gdk_atom_intern ("UTF8_STRING", FALSE); + } + if (tikzit_picture_atom == GDK_NONE) { + tikzit_picture_atom = gdk_atom_intern ("TIKZITPICTURE", FALSE); + } +} + +ClipboardGraphData *clipboard_graph_data_new (Graph *graph) { + ClipboardGraphData *data = g_new (ClipboardGraphData, 1); + data->graph = [graph retain]; + data->tikz = NULL; + data->tikz_length = 0; + return data; +} + +void clipboard_graph_data_free (ClipboardGraphData *data) { + [data->graph release]; + if (data->tikz) { + g_free (data->tikz); + } + g_free (data); +} + +void clipboard_graph_data_convert (ClipboardGraphData *data) { + if (data->graph != nil && !data->tikz) { + data->tikz = g_strdup ([[data->graph tikz] UTF8String]); + data->tikz_length = strlen (data->tikz); + [data->graph release]; + data->graph = nil; + } +} + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/gtkhelpers.h b/tikzit-1/src/gtk/gtkhelpers.h new file mode 100644 index 0000000..e4b79b8 --- /dev/null +++ b/tikzit-1/src/gtk/gtkhelpers.h @@ -0,0 +1,60 @@ +// +// gtkhelpers.h +// TikZiT +// +// Copyright 2010 Alex Merry. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// +#import "TZFoundation.h" +#include +#import + +/** + * Releases the Objective-C object pointed to by data + * + * Intended for use as a cleanup function in Glib/GObject-based + * code. + */ +void release_obj (gpointer data); + +NSString * gtk_editable_get_string (GtkEditable *editable, gint start, gint end); + +GdkRectangle gdk_rectangle_from_ns_rect (NSRect rect); +NSRect gdk_rectangle_to_ns_rect (GdkRectangle rect); + +void gtk_action_set_detailed_label (GtkAction *action, const gchar *baseLabel, const gchar *actionName); + +gint tz_hijack_key_press (GtkWindow *win, + GdkEventKey *event, + gpointer user_data); + +// Equivalent of GTK+3's gdk_pixbuf_get_from_surface() +GdkPixbuf * pixbuf_get_from_surface(cairo_surface_t *surface); + +void tz_restore_window (GtkWindow *window, gint x, gint y, gint w, gint h); + +void label_set_bold (GtkLabel *label); + +void widget_set_error (GtkWidget *widget); +void widget_clear_error (GtkWidget *widget); + +void text_buffer_clear_tag (GtkTextBuffer *buffer, GtkTextTag *tag); + +void utility_window_attach (GtkWindow *util_win, GtkWindow *parent_win); + +// vim:ft=objc:sts=2:sw=2:et diff --git a/tikzit-1/src/gtk/gtkhelpers.m b/tikzit-1/src/gtk/gtkhelpers.m new file mode 100644 index 0000000..9d26af5 --- /dev/null +++ b/tikzit-1/src/gtk/gtkhelpers.m @@ -0,0 +1,275 @@ +// +// gtkhelpers.h +// TikZiT +// +// Copyright 2010 Alex Merry. All rights reserved. +// +// Some code from Glade: +// Copyright 2001 Ximian, Inc. +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// +#import "gtkhelpers.h" +#import + +void release_obj (gpointer data) { + id obj = (id)data; + [obj release]; +} + +NSString * gtk_editable_get_string (GtkEditable *editable, gint start, gint end) +{ + gchar *text = gtk_editable_get_chars (editable, start, end); + NSString *string = [NSString stringWithUTF8String:text]; + g_free (text); + return string; +} + +GdkRectangle gdk_rectangle_from_ns_rect (NSRect box) { + GdkRectangle rect; + rect.x = box.origin.x; + rect.y = box.origin.y; + rect.width = box.size.width; + rect.height = box.size.height; + return rect; +} + +NSRect gdk_rectangle_to_ns_rect (GdkRectangle rect) { + NSRect result; + result.origin.x = rect.x; + result.origin.y = rect.y; + result.size.width = rect.width; + result.size.height = rect.height; + return result; +} + +void gtk_action_set_detailed_label (GtkAction *action, const gchar *baseLabel, const gchar *actionName) { + if (actionName == NULL || *actionName == '\0') { + gtk_action_set_label (action, baseLabel); + } else { + GString *label = g_string_sized_new (30); + g_string_printf(label, "%s: %s", baseLabel, actionName); + gtk_action_set_label (action, label->str); + g_string_free (label, TRUE); + } +} + +/** + * tz_hijack_key_press: + * @win: a #GtkWindow + * event: the GdkEventKey + * user_data: unused + * + * This function is meant to be attached to key-press-event of a toplevel, + * it simply allows the window contents to treat key events /before/ + * accelerator keys come into play (this way widgets dont get deleted + * when cutting text in an entry etc.). + * + * Returns: whether the event was handled + */ +gint +tz_hijack_key_press (GtkWindow *win, + GdkEventKey *event, + gpointer user_data) +{ + GtkWidget *focus_widget; + + focus_widget = gtk_window_get_focus (win); + if (focus_widget && + (event->keyval == GDK_Delete || /* Filter Delete from accelerator keys */ + ((event->state & GDK_CONTROL_MASK) && /* CTRL keys... */ + ((event->keyval == GDK_c || event->keyval == GDK_C) || /* CTRL-C (copy) */ + (event->keyval == GDK_x || event->keyval == GDK_X) || /* CTRL-X (cut) */ + (event->keyval == GDK_v || event->keyval == GDK_V) || /* CTRL-V (paste) */ + (event->keyval == GDK_a || event->keyval == GDK_A) || /* CTRL-A (select-all) */ + (event->keyval == GDK_n || event->keyval == GDK_N))))) /* CTRL-N (new document) ?? */ + { + return gtk_widget_event (focus_widget, + (GdkEvent *)event); + } + return FALSE; +} + +GdkPixbuf * pixbuf_get_from_surface(cairo_surface_t *surface) { + cairo_surface_flush (surface); + + int width = cairo_image_surface_get_width (surface); + int height = cairo_image_surface_get_height (surface); + int stride = cairo_image_surface_get_stride (surface); + unsigned char *data = cairo_image_surface_get_data (surface); + + GdkPixbuf *pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, + TRUE, + 8, + width, + height); + unsigned char *pbdata = gdk_pixbuf_get_pixels (pixbuf); + int pbstride = gdk_pixbuf_get_rowstride (pixbuf); + + for (int y = 0; y < height; ++y) { + uint32_t *line = (uint32_t*)(data + y*stride); + unsigned char *pbline = pbdata + (y*pbstride); + for (int x = 0; x < width; ++x) { + uint32_t pixel = *(line + x); + unsigned char *pbpixel = pbline + (x*4); + // NB: We should un-pre-mult the alpha here. + // However, in our world, alpha is always + // on or off, so it doesn't really matter + pbpixel[3] = ((pixel & 0xff000000) >> 24); + pbpixel[0] = ((pixel & 0x00ff0000) >> 16); + pbpixel[1] = ((pixel & 0x0000ff00) >> 8); + pbpixel[2] = (pixel & 0x000000ff); + } + } + + return pixbuf; +} + +/* This function mostly lifted from + * gtk+/gdk/gdkscreen.c:gdk_screen_get_monitor_at_window() + */ +static gint +get_appropriate_monitor (GdkScreen *screen, + gint x, + gint y, + gint w, + gint h) +{ + GdkRectangle rect; + gint area = 0; + gint monitor = -1; + gint num_monitors; + gint i; + + rect.x = x; + rect.y = y; + rect.width = w; + rect.height = h; + + num_monitors = gdk_screen_get_n_monitors (screen); + + for (i = 0; i < num_monitors; i++) + { + GdkRectangle geometry; + + gdk_screen_get_monitor_geometry (screen, i, &geometry); + + if (gdk_rectangle_intersect (&rect, &geometry, &geometry) && + geometry.width * geometry.height > area) + { + area = geometry.width * geometry.height; + monitor = i; + } + } + + if (monitor >= 0) + return monitor; + else + return gdk_screen_get_monitor_at_point (screen, + rect.x + rect.width / 2, + rect.y + rect.height / 2); +} + +/* This function mostly lifted from gimp_session_info_apply_geometry + * in gimp-2.6/app/widgets/gimpsessioninfo.c + */ +void tz_restore_window (GtkWindow *window, gint x, gint y, gint w, gint h) +{ + gint forced_w = w; + gint forced_h = h; + if (w <= 0 || h <= 0) { + gtk_window_get_default_size (window, &w, &h); + } + if (w <= 0 || h <= 0) { + gtk_window_get_size (window, &w, &h); + } + + GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET (window)); + + gint monitor = 0; + if (w > 0 && h > 0) { + monitor = get_appropriate_monitor (screen, x, y, w, h); + } else { + monitor = gdk_screen_get_monitor_at_point (screen, x, y); + } + + GdkRectangle rect; + gdk_screen_get_monitor_geometry (screen, monitor, &rect); + + x = CLAMP (x, + rect.x, + rect.x + rect.width - (w > 0 ? w : 128)); + y = CLAMP (y, + rect.y, + rect.y + rect.height - (h > 0 ? h : 128)); + + gchar geom[32]; + g_snprintf (geom, sizeof (geom), "%+d%+d", x, y); + + gtk_window_parse_geometry (window, geom); + + if (forced_w > 0 && forced_h > 0) { + gtk_window_set_default_size (window, forced_w, forced_h); + } +} + +void label_set_bold (GtkLabel *label) { + PangoAttrList *attrs = pango_attr_list_new (); + pango_attr_list_insert (attrs, + pango_attr_weight_new (PANGO_WEIGHT_SEMIBOLD)); + gtk_label_set_attributes (label, attrs); + pango_attr_list_unref (attrs); +} + +void widget_set_error (GtkWidget *widget) { + GdkColor color = {0, 65535, 61184, 61184}; + gtk_widget_modify_base (widget, GTK_STATE_NORMAL, &color); +} + +void widget_clear_error (GtkWidget *widget) { + gtk_widget_modify_base (widget, GTK_STATE_NORMAL, NULL); +} + +void text_buffer_clear_tag (GtkTextBuffer *buffer, GtkTextTag *tag) { + GtkTextIter start; + GtkTextIter end; + gtk_text_buffer_get_start_iter (buffer, &start); + gtk_text_buffer_get_end_iter (buffer, &end); + gtk_text_buffer_remove_tag (buffer, tag, &start, &end); +} + +void utility_window_attach (GtkWindow *util_win, GtkWindow *parent_win) { + if (parent_win == gtk_window_get_transient_for (util_win)) + return; + + // HACK: X window managers tend to move windows around when they are + // unmapped and mapped again, so we save the position + gint x, y; + gtk_window_get_position (util_win, &x, &y); + + // HACK: Altering WM_TRANSIENT_FOR on a non-hidden but unmapped window + // (eg: when you have minimised the original parent window) can + // cause the window to be lost forever, so we hide it first + gtk_widget_hide (GTK_WIDGET (util_win)); + gtk_window_set_focus_on_map (util_win, FALSE); + gtk_window_set_transient_for (util_win, parent_win); + gtk_widget_show (GTK_WIDGET (util_win)); + + // HACK: see above + gtk_window_move (util_win, x, y); +} + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/logo.h b/tikzit-1/src/gtk/logo.h new file mode 100644 index 0000000..e778da9 --- /dev/null +++ b/tikzit-1/src/gtk/logo.h @@ -0,0 +1,32 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include + +typedef enum { + LOGO_SIZE_16, + LOGO_SIZE_24, + LOGO_SIZE_32, + LOGO_SIZE_48, + LOGO_SIZE_64, + LOGO_SIZE_128, + LOGO_SIZE_COUNT +} LogoSize; + +GdkPixbuf *get_logo (LogoSize size); + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/logo.m b/tikzit-1/src/gtk/logo.m new file mode 100644 index 0000000..57533c7 --- /dev/null +++ b/tikzit-1/src/gtk/logo.m @@ -0,0 +1,64 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "logo.h" +#include + +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpointer-sign" +#import "logodata.m" +#pragma GCC diagnostic pop + +static GdkPixbuf *pixbufCache[LOGO_SIZE_COUNT]; + +GdkPixbuf *get_logo (LogoSize size) { + const GdkPixdata *data = NULL; + switch (size) { + case LOGO_SIZE_16: + data = &logo16; + break; + case LOGO_SIZE_24: + data = &logo24; + break; + case LOGO_SIZE_32: + data = &logo32; + break; + case LOGO_SIZE_48: + data = &logo48; + break; + case LOGO_SIZE_64: + data = &logo64; + break; + case LOGO_SIZE_128: + data = &logo128; + break; + default: + return NULL; + }; + if (pixbufCache[size]) { + g_object_ref (pixbufCache[size]); + return pixbufCache[size]; + } else { + GdkPixbuf *buf = gdk_pixbuf_from_pixdata (data, FALSE, NULL); + pixbufCache[size] = buf; + g_object_add_weak_pointer (G_OBJECT (buf), (void**)(&(pixbufCache[size]))); + return buf; + } +} + +// vim:ft=objc:ts=8:et:sts=4:sw=4 + diff --git a/tikzit-1/src/gtk/main.m b/tikzit-1/src/gtk/main.m new file mode 100644 index 0000000..5d9f4a4 --- /dev/null +++ b/tikzit-1/src/gtk/main.m @@ -0,0 +1,111 @@ +// +// main.m +// TikZiT +// +// Copyright 2010 Chris Heunen. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "TZFoundation.h" +#import +#import "clipboard.h" +#import "logo.h" +#import "tzstockitems.h" + +#import "Application.h" + +static GOptionEntry entries[] = +{ + //{ "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose, "Be verbose", NULL }, + { NULL } +}; + +void onUncaughtException(NSException* exception) +{ + NSString *joinStr = @"\n "; + NSLog(@"uncaught exception: %@\n backtrace: %@", + [exception description], + [[exception callStackSymbols] componentsJoinedByString:joinStr]); +} + +int main (int argc, char *argv[]) { + NSSetUncaughtExceptionHandler(&onUncaughtException); + + [[NSAutoreleasePool alloc] init]; + + GError *error = NULL; + GOptionContext *context; + context = g_option_context_new ("[FILES] - PGF/TikZ-based graph editor"); + g_option_context_add_main_entries (context, entries, NULL); + g_option_context_add_group (context, gtk_get_option_group (TRUE)); + if (!g_option_context_parse (context, &argc, &argv, &error)) + { + if (error->domain == G_OPTION_ERROR) { + g_print ("%s\nUse --help to see available options\n", error->message); + } else { + g_print ("Unexpected error parsing options: %s\n", error->message); + } + exit (1); + } + g_option_context_free (context); + +#ifndef WINDOWS + GList *icon_list = NULL; + icon_list = g_list_prepend (icon_list, get_logo(LOGO_SIZE_128)); + icon_list = g_list_prepend (icon_list, get_logo(LOGO_SIZE_64)); + icon_list = g_list_prepend (icon_list, get_logo(LOGO_SIZE_48)); + icon_list = g_list_prepend (icon_list, get_logo(LOGO_SIZE_32)); + icon_list = g_list_prepend (icon_list, get_logo(LOGO_SIZE_24)); + icon_list = g_list_prepend (icon_list, get_logo(LOGO_SIZE_16)); + gtk_window_set_default_icon_list (icon_list); + GList *list_head = icon_list; + while (list_head) { + g_object_unref ((GObject*)list_head->data); + list_head = list_head->next; + } +#endif + + NSAutoreleasePool *initPool = [[NSAutoreleasePool alloc] init]; + + tz_register_stock_items(); + clipboard_init(); + + Application *app = nil; + if (argc > 1) { + NSMutableArray *files = [NSMutableArray arrayWithCapacity:argc-1]; + for (int i = 1; i < argc; ++i) { + [files insertObject:[NSString stringWithGlibFilename:argv[i]] + atIndex:i-1]; + } + NSLog(@"Files: %@", files); + app = [[Application alloc] initWithFiles:files]; + } else { + app = [[Application alloc] init]; + } + + [initPool drain]; + + gtk_main (); + + [app saveConfiguration]; + [app release]; + + return 0; +} + +// vim:ft=objc:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/mkdtemp.h b/tikzit-1/src/gtk/mkdtemp.h new file mode 100644 index 0000000..65ee99e --- /dev/null +++ b/tikzit-1/src/gtk/mkdtemp.h @@ -0,0 +1,32 @@ +/* Creating a private temporary directory. + Copyright (C) 2001-2002 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#if HAVE_MKDTEMP + +/* Get mkdtemp() declaration. */ +#include + +#else + +/* Create a unique temporary directory from TEMPLATE. + The last six characters of TEMPLATE must be "XXXXXX"; + they are replaced with a string that makes the directory name unique. + Returns TEMPLATE, or a null pointer if it cannot get a unique name. + The directory is created mode 700. */ +extern char * mkdtemp (char *template); + +#endif diff --git a/tikzit-1/src/gtk/mkdtemp.m b/tikzit-1/src/gtk/mkdtemp.m new file mode 100644 index 0000000..ee3cd7c --- /dev/null +++ b/tikzit-1/src/gtk/mkdtemp.m @@ -0,0 +1,180 @@ +/* Copyright (C) 1999, 2001-2003 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + see . + */ + +/* Extracted from misc/mkdtemp.c and sysdeps/posix/tempname.c. */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +/* Specification. */ +#include "mkdtemp.h" + +#include +#ifndef __set_errno +# define __set_errno(Val) errno = (Val) +#endif + +#include +#include +#include + +#include +#ifndef TMP_MAX +# define TMP_MAX 238328 +#endif + +#if HAVE_STDINT_H || _LIBC +# include +#endif +#if HAVE_INTTYPES_H +# include +#endif + +#if HAVE_UNISTD_H || _LIBC +# include +#endif + +#if HAVE_GETTIMEOFDAY || _LIBC +# if HAVE_SYS_TIME_H || _LIBC +# include +# endif +#else +# if HAVE_TIME_H || _LIBC +# include +# endif +#endif + +#include "stat.h" + +#ifdef __MINGW32__ +/* mingw's mkdir() function has 1 argument, but we pass 2 arguments. + Therefore we have to disable the argument count checking. */ +# define mkdir ((int (*)()) mkdir) +#endif + +#if !_LIBC +# define __getpid getpid +# define __gettimeofday gettimeofday +# define __mkdir mkdir +#endif + +/* Use the widest available unsigned type if uint64_t is not + available. The algorithm below extracts a number less than 62**6 + (approximately 2**35.725) from uint64_t, so ancient hosts where + uintmax_t is only 32 bits lose about 3.725 bits of randomness, + which is better than not having mkstemp at all. */ +#if !defined UINT64_MAX && !defined uint64_t +# define uint64_t uintmax_t +#endif + +/* These are the characters used in temporary filenames. */ +static const char letters[] = +"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; + +/* Generate a temporary file name based on TMPL. TMPL must match the + rules for mk[s]temp (i.e. end in "XXXXXX"). The name constructed + does not exist at the time of the call to __gen_tempname. TMPL is + overwritten with the result. + + KIND is: + __GT_DIR: create a directory, which will be mode 0700. + + We use a clever algorithm to get hard-to-predict names. */ +static int +gen_tempname (char *tmpl) +{ + int len; + char *XXXXXX; + static uint64_t value; + uint64_t random_time_bits; + int count, fd = -1; + int save_errno = errno; + + len = strlen (tmpl); + if (len < 6 || strcmp (&tmpl[len - 6], "XXXXXX")) + { + __set_errno (EINVAL); + return -1; + } + + /* This is where the Xs start. */ + XXXXXX = &tmpl[len - 6]; + + /* Get some more or less random data. */ +#ifdef RANDOM_BITS + RANDOM_BITS (random_time_bits); +#else +# if HAVE_GETTIMEOFDAY || _LIBC + { + struct timeval tv; + __gettimeofday (&tv, NULL); + random_time_bits = ((uint64_t) tv.tv_usec << 16) ^ tv.tv_sec; + } +# else + random_time_bits = time (NULL); +# endif +#endif + value += random_time_bits ^ __getpid (); + + for (count = 0; count < TMP_MAX; value += 7777, ++count) + { + uint64_t v = value; + + /* Fill in the random bits. */ + XXXXXX[0] = letters[v % 62]; + v /= 62; + XXXXXX[1] = letters[v % 62]; + v /= 62; + XXXXXX[2] = letters[v % 62]; + v /= 62; + XXXXXX[3] = letters[v % 62]; + v /= 62; + XXXXXX[4] = letters[v % 62]; + v /= 62; + XXXXXX[5] = letters[v % 62]; + + fd = __mkdir (tmpl, S_IRUSR | S_IWUSR | S_IXUSR); + + if (fd >= 0) + { + __set_errno (save_errno); + return fd; + } + else if (errno != EEXIST) + return -1; + } + + /* We got out of the loop because we ran out of combinations to try. */ + __set_errno (EEXIST); + return -1; +} + +/* Generate a unique temporary directory from TEMPLATE. + The last six characters of TEMPLATE must be "XXXXXX"; + they are replaced with a string that makes the filename unique. + The directory is created, mode 700, and its name is returned. + (This function comes from OpenBSD.) */ +char * +mkdtemp (char *template) +{ + if (gen_tempname (template)) + return NULL; + else + return template; +} diff --git a/tikzit-1/src/gtk/stat.h b/tikzit-1/src/gtk/stat.h new file mode 100644 index 0000000..a9829ae --- /dev/null +++ b/tikzit-1/src/gtk/stat.h @@ -0,0 +1,25 @@ +#include +#if STAT_MACROS_BROKEN +# undef S_ISDIR +#endif +#if !defined S_ISDIR && defined S_IFDIR +# define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR) +#endif +#if !S_IRUSR && S_IREAD +# define S_IRUSR S_IREAD +#endif +#if !S_IRUSR +# define S_IRUSR 00400 +#endif +#if !S_IWUSR && S_IWRITE +# define S_IWUSR S_IWRITE +#endif +#if !S_IWUSR +# define S_IWUSR 00200 +#endif +#if !S_IXUSR && S_IEXEC +# define S_IXUSR S_IEXEC +#endif +#if !S_IXUSR +# define S_IXUSR 00100 +#endif diff --git a/tikzit-1/src/gtk/test/gtk.m b/tikzit-1/src/gtk/test/gtk.m new file mode 100644 index 0000000..aabb0f2 --- /dev/null +++ b/tikzit-1/src/gtk/test/gtk.m @@ -0,0 +1,27 @@ +// +// linux.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// +#import "test/test.h" + +void testGtk() { + +} diff --git a/tikzit-1/src/gtk/test/main.m b/tikzit-1/src/gtk/test/main.m new file mode 100644 index 0000000..639a335 --- /dev/null +++ b/tikzit-1/src/gtk/test/main.m @@ -0,0 +1,50 @@ +// +// main.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// +#include "config.h" +#import "test/test.h" +#include +void testCommon(); + +int main(int argc, char **argv) { + if (argc == 2 && strcmp(argv[1], "--disable-color")==0) { + setColorEnabled(NO); + } else { + setColorEnabled(YES); + } + + PUTS(@""); + PUTS(@"**********************************************"); + PUTS(@"TikZiT TESTS, LINUX VERSION %@", VERSION); + PUTS(@"**********************************************"); + PUTS(@""); + + startTests(); + testCommon(); + testLinux(); + + PUTS(@""); + PUTS(@"**********************************************"); + endTests(); + PUTS(@"**********************************************"); + PUTS(@""); +} diff --git a/tikzit-1/src/gtk/tzstockitems.h b/tikzit-1/src/gtk/tzstockitems.h new file mode 100644 index 0000000..5ad0da9 --- /dev/null +++ b/tikzit-1/src/gtk/tzstockitems.h @@ -0,0 +1,26 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#define TIKZIT_STOCK_SELECT "tikzit-select" +#define TIKZIT_STOCK_CREATE_NODE "tikzit-create-node" +#define TIKZIT_STOCK_CREATE_EDGE "tikzit-create-edge" +#define TIKZIT_STOCK_BOUNDING_BOX "tikzit-bounding-box" +#define TIKZIT_STOCK_DRAG "tikzit-drag" + +void tz_register_stock_items(); + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/tzstockitems.m b/tikzit-1/src/gtk/tzstockitems.m new file mode 100644 index 0000000..5eba912 --- /dev/null +++ b/tikzit-1/src/gtk/tzstockitems.m @@ -0,0 +1,64 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "tzstockitems.h" +#include +#include + +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpointer-sign" +#import "icondata.m" +#pragma GCC diagnostic pop + +static GtkStockItem stock_items[] = { + // gchar *stock_id; + // gchar *label; + // GdkModifierType modifier; + // guint keyval; + // gchar *translation_domain; + { TIKZIT_STOCK_SELECT, "Select", 0, 0, NULL }, + { TIKZIT_STOCK_CREATE_NODE, "Create Node", 0, 0, NULL }, + { TIKZIT_STOCK_CREATE_EDGE, "Create Edge", 0, 0, NULL }, + { TIKZIT_STOCK_BOUNDING_BOX, "Bounding Box", 0, 0, NULL }, + { TIKZIT_STOCK_DRAG, "Drag", 0, 0, NULL }, +}; +static guint n_stock_items = G_N_ELEMENTS (stock_items); + +static void icon_factory_add_pixdata (GtkIconFactory *factory, + const gchar *stock_id, + const GdkPixdata *image_data) { + + GdkPixbuf *buf = gdk_pixbuf_from_pixdata (image_data, FALSE, NULL); + GtkIconSet *icon_set = gtk_icon_set_new_from_pixbuf (buf); + gtk_icon_factory_add (factory, stock_id, icon_set); + gtk_icon_set_unref (icon_set); + g_object_unref (G_OBJECT (buf)); +} + +void tz_register_stock_items() { + gtk_stock_add_static (stock_items, n_stock_items); + + GtkIconFactory *factory = gtk_icon_factory_new (); + icon_factory_add_pixdata (factory, TIKZIT_STOCK_SELECT, &select_rectangular); + icon_factory_add_pixdata (factory, TIKZIT_STOCK_CREATE_NODE, &draw_ellipse); + icon_factory_add_pixdata (factory, TIKZIT_STOCK_CREATE_EDGE, &draw_path); + icon_factory_add_pixdata (factory, TIKZIT_STOCK_BOUNDING_BOX, &transform_crop_and_resize); + icon_factory_add_pixdata (factory, TIKZIT_STOCK_DRAG, &transform_move); + gtk_icon_factory_add_default (factory); +} + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/tztoolpalette.h b/tikzit-1/src/gtk/tztoolpalette.h new file mode 100644 index 0000000..45ec2ac --- /dev/null +++ b/tikzit-1/src/gtk/tztoolpalette.h @@ -0,0 +1,56 @@ +/* GIMP - The GNU Image Manipulation Program + * Copyright (C) 1995 Spencer Kimball and Peter Mattis + * + * tztoolpalette.h, based on gimptoolpalette.h + * Copyright (C) 2010 Michael Natterer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef __TZ_TOOL_PALETTE_H__ +#define __TZ_TOOL_PALETTE_H__ + + +#define TZ_TYPE_TOOL_PALETTE (tz_tool_palette_get_type ()) +#define TZ_TOOL_PALETTE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TZ_TYPE_TOOL_PALETTE, TzToolPalette)) +#define TZ_TOOL_PALETTE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TZ_TYPE_TOOL_PALETTE, TzToolPaletteClass)) +#define TZ_IS_TOOL_PALETTE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TZ_TYPE_TOOL_PALETTE)) +#define TZ_IS_TOOL_PALETTE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TZ_TYPE_TOOL_PALETTE)) +#define TZ_TOOL_PALETTE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TZ_TYPE_TOOL_PALETTE, TzToolPaletteClass)) + + +typedef struct _TzToolPaletteClass TzToolPaletteClass; +typedef struct _TzToolPalette TzToolPalette; + +struct _TzToolPalette +{ + GtkToolPalette parent_instance; +}; + +struct _TzToolPaletteClass +{ + GtkToolPaletteClass parent_class; +}; + + +GType tz_tool_palette_get_type (void) G_GNUC_CONST; + +GtkWidget * tz_tool_palette_new (void); + +gboolean tz_tool_palette_get_button_size (TzToolPalette *widget, + gint *width, + gint *height); + + +#endif /* __TZ_TOOL_PALETTE_H__ */ diff --git a/tikzit-1/src/gtk/tztoolpalette.m b/tikzit-1/src/gtk/tztoolpalette.m new file mode 100644 index 0000000..a948127 --- /dev/null +++ b/tikzit-1/src/gtk/tztoolpalette.m @@ -0,0 +1,158 @@ +/* GIMP - The GNU Image Manipulation Program + * Copyright (C) 1995 Spencer Kimball and Peter Mattis + * + * tztoolpalette.c, based on gimptoolpalette.c + * Copyright (C) 2010 Michael Natterer + * Copyright (C) 2012 Alex Merry + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include + +#include "tztoolpalette.h" + + +#define DEFAULT_TOOL_ICON_SIZE GTK_ICON_SIZE_BUTTON +#define DEFAULT_BUTTON_RELIEF GTK_RELIEF_NONE + +#define TOOL_BUTTON_DATA_KEY "tz-tool-palette-item" +#define TOOL_INFO_DATA_KEY "tz-tool-info" + + +typedef struct _TzToolPalettePrivate TzToolPalettePrivate; + +struct _TzToolPalettePrivate +{ + gint tool_rows; + gint tool_columns; +}; + +#define GET_PRIVATE(p) G_TYPE_INSTANCE_GET_PRIVATE (p, \ + TZ_TYPE_TOOL_PALETTE, \ + TzToolPalettePrivate) + + +static void tz_tool_palette_size_allocate (GtkWidget *widget, + GtkAllocation *allocation); + + +G_DEFINE_TYPE (TzToolPalette, tz_tool_palette, GTK_TYPE_TOOL_PALETTE) + +#define parent_class tz_tool_palette_parent_class + + +static void +tz_tool_palette_class_init (TzToolPaletteClass *klass) +{ + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); + + widget_class->size_allocate = tz_tool_palette_size_allocate; + + g_type_class_add_private (klass, sizeof (TzToolPalettePrivate)); +} + +static void +tz_tool_palette_init (TzToolPalette *palette) +{ +} + +static GtkToolItemGroup * +tz_tool_palette_tool_group (TzToolPalette *palette) +{ + GList *children; + GtkToolItemGroup *group; + + children = gtk_container_get_children (GTK_CONTAINER (palette)); + g_return_val_if_fail (children, NULL); + group = GTK_TOOL_ITEM_GROUP (children->data); + g_list_free (children); + + return group; +} + +gboolean +tz_tool_palette_get_button_size (TzToolPalette *palette, + gint *width, + gint *height) +{ + g_return_val_if_fail (width || height, FALSE); + + GtkToolItemGroup *group = tz_tool_palette_tool_group (palette); + g_return_val_if_fail (group, FALSE); + + guint tool_count = gtk_tool_item_group_get_n_items (group); + if (tool_count > 0) + { + GtkWidget *tool_button; + GtkRequisition button_requisition; + + tool_button = GTK_WIDGET (gtk_tool_item_group_get_nth_item (group, 0)); + gtk_widget_size_request (tool_button, &button_requisition); + if (width) + *width = button_requisition.width; + if (height) + *height = button_requisition.height; + return TRUE; + } + return FALSE; +} + +static void +tz_tool_palette_size_allocate (GtkWidget *widget, + GtkAllocation *allocation) +{ + TzToolPalettePrivate *private = GET_PRIVATE (widget); + GtkToolItemGroup *group = tz_tool_palette_tool_group (TZ_TOOL_PALETTE (widget)); + + g_return_if_fail (group); + + GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation); + + guint tool_count = gtk_tool_item_group_get_n_items (group); + if (tool_count > 0) + { + GtkWidget *tool_button; + GtkRequisition button_requisition; + gint tool_rows; + gint tool_columns; + + tool_button = GTK_WIDGET (gtk_tool_item_group_get_nth_item (group, 0)); + gtk_widget_size_request (tool_button, &button_requisition); + + tool_columns = MAX (1, (allocation->width / button_requisition.width)); + tool_rows = tool_count / tool_columns; + + if (tool_count % tool_columns) + tool_rows++; + + if (private->tool_rows != tool_rows || + private->tool_columns != tool_columns) + { + private->tool_rows = tool_rows; + private->tool_columns = tool_columns; + + gtk_widget_set_size_request (widget, -1, + tool_rows * button_requisition.height); + } + } +} + +GtkWidget * +tz_tool_palette_new (void) +{ + return g_object_new (TZ_TYPE_TOOL_PALETTE, NULL); +} + +// vim:ft=objc:ts=8:et:sts=2:sw=2:foldmethod=marker diff --git a/tikzit-1/src/osx/AppDelegate.h b/tikzit-1/src/osx/AppDelegate.h new file mode 100644 index 0000000..92d9add --- /dev/null +++ b/tikzit-1/src/osx/AppDelegate.h @@ -0,0 +1,57 @@ +// +// AppDelegate.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import "StylePaletteController.h" +#import "ToolPaletteController.h" +#import "PropertyInspectorController.h" +#import "PreambleController.h" +#import "PreviewController.h" +#import "GraphicsView.h" +#import "PreferenceController.h" + +@interface AppDelegate : NSObject { + NSMapTable *table; + StylePaletteController *stylePaletteController; + PropertyInspectorController *propertyInspectorController; + PreambleController *preambleController; + PreviewController *previewController; + PreferenceController *preferenceController; + ToolPaletteController *toolPaletteController; + IBOutlet GraphicsView *graphicsView; + NSString *tempDir; +} + +@property IBOutlet StylePaletteController *stylePaletteController; +@property (strong) IBOutlet ToolPaletteController *toolPaletteController; + +- (void)awakeFromNib; ++ (void)setDefaults; +- (void)applicationWillTerminate:(NSNotification *)notification; +- (IBAction)toggleStyleInspector:(id)sender; +- (IBAction)togglePropertyInspector:(id)sender; +- (IBAction)togglePreamble:(id)sender; +- (IBAction)togglePreferences:(id)sender; +- (IBAction)refreshShapes:(id)sender; + +@end diff --git a/tikzit-1/src/osx/AppDelegate.m b/tikzit-1/src/osx/AppDelegate.m new file mode 100644 index 0000000..94f5507 --- /dev/null +++ b/tikzit-1/src/osx/AppDelegate.m @@ -0,0 +1,124 @@ +// +// AppDelegate.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "AppDelegate.h" +#import "TikzDocument.h" +#import "Shape.h" +#import "SupportDir.h" + +@implementation AppDelegate + +@synthesize stylePaletteController, toolPaletteController; + ++(void)initialize{ + [self setDefaults]; +} + +- (void)awakeFromNib { + [SupportDir createUserSupportDir]; + NSString *supportDir = [SupportDir userSupportDir]; + //NSLog(stylePlist); + stylePaletteController = + [[StylePaletteController alloc] initWithWindowNibName:@"StylePalette" + supportDir:supportDir]; + + propertyInspectorController = + [[PropertyInspectorController alloc] initWithWindowNibName:@"PropertyInspector"]; + + [propertyInspectorController setStylePaletteController:stylePaletteController]; + + NSString *preamblePlist = [supportDir stringByAppendingPathComponent:@"preambles.plist"]; + preambleController = + [[PreambleController alloc] initWithNibName:@"Preamble" + plist:preamblePlist + styles:[stylePaletteController nodeStyles] + edges:[stylePaletteController edgeStyles]]; + + + char template[] = "/tmp/tikzit_tmp_XXXXXXX"; + char *dir = mkdtemp(template); + tempDir = [NSString stringWithUTF8String:dir]; + + NSLog(@"created temp dir: %@", tempDir); + NSLog(@"system support dir: %@", [SupportDir systemSupportDir]); + + previewController = + [[PreviewController alloc] initWithWindowNibName:@"Preview" + preambleController:preambleController + tempDir:tempDir]; + + preferenceController = [[PreferenceController alloc] initWithWindowNibName:@"Preferences" preambleController:preambleController]; + + // each application has one global preview controller + [PreviewController setDefaultPreviewController:previewController]; +} + ++ (void)setDefaults{ + NSString *userDefaultsValuesPath; + NSDictionary *userDefaultsValuesDict; + + userDefaultsValuesPath=[[NSBundle mainBundle] pathForResource:@"UserDefaults" + ofType:@"plist"]; + userDefaultsValuesDict=[NSDictionary dictionaryWithContentsOfFile:userDefaultsValuesPath]; + + [[NSUserDefaults standardUserDefaults] registerDefaults:userDefaultsValuesDict]; +} + +- (void)applicationWillTerminate:(NSNotification *)notification { + NSString *supportDir = [SupportDir userSupportDir]; + [stylePaletteController saveStyles:supportDir]; + [preambleController savePreambles:[supportDir stringByAppendingPathComponent:@"preambles.plist"]]; + + NSLog(@"wiping temp dir: %@", tempDir); + [[NSFileManager defaultManager] removeItemAtPath:tempDir error:NULL]; +} + +- (void)toggleController:(NSWindowController*)c { + if ([[c window] isVisible]) { + [c close]; + } else { + [c showWindow:self]; + } +} + +- (IBAction)toggleStyleInspector:(id)sender { + [self toggleController:stylePaletteController]; +} + +- (IBAction)togglePropertyInspector:(id)sender { + [self toggleController:propertyInspectorController]; +} + +- (IBAction)togglePreamble:(id)sender { + [self toggleController:(NSWindowController *) preambleController]; +} + +- (IBAction)togglePreferences:(id)sender { + [self toggleController:preferenceController]; +} + +- (IBAction)refreshShapes:(id)sender { + [Shape refreshShapeDictionary]; +} + +@end diff --git a/tikzit-1/src/osx/CALayer+DrawLabel.h b/tikzit-1/src/osx/CALayer+DrawLabel.h new file mode 100644 index 0000000..32282d9 --- /dev/null +++ b/tikzit-1/src/osx/CALayer+DrawLabel.h @@ -0,0 +1,21 @@ +// +// CALayer+DrawLabel.h +// TikZiT +// +// Created by Aleks Kissinger on 09/05/2011. +// Copyright 2011 Aleks Kissinger. All rights reserved. +// + +#import +#import + +@class Transformer; + +@interface CALayer(DrawLabel) + +- (void)drawLabel:(NSString*)label + atPoint:(NSPoint)pt + inContext:(CGContextRef)context + usingTrans:(Transformer*)t; + +@end diff --git a/tikzit-1/src/osx/CALayer+DrawLabel.m b/tikzit-1/src/osx/CALayer+DrawLabel.m new file mode 100644 index 0000000..4860a3c --- /dev/null +++ b/tikzit-1/src/osx/CALayer+DrawLabel.m @@ -0,0 +1,84 @@ +// +// CALayer+DrawLabel.m +// TikZiT +// +// Created by Aleks Kissinger on 09/05/2011. +// Copyright 2011 Aleks Kissinger. All rights reserved. +// + +#import "CALayer+DrawLabel.h" +#import "Transformer.h" + +@implementation CALayer(DrawLabel) + +- (void)drawLabel:(NSString*)label + atPoint:(NSPoint)pt + inContext:(CGContextRef)context + usingTrans:(Transformer*)t { + + CGContextSaveGState(context); + + if ([label length] > 15) { + label = [[label substringToIndex:12] stringByAppendingString:@"..."]; + } + + float fontSize = [t scaleToScreen:0.18f]; // size 9 @ 100% + if (fontSize > 18.0f) fontSize = 18.0f; + + // Prepare font + CTFontRef font = CTFontCreateWithName(CFSTR("Monaco"), fontSize, NULL); + + // Create an attributed string + CFStringRef keys[] = { kCTFontAttributeName }; + CFTypeRef values[] = { font }; + CFDictionaryRef attr = CFDictionaryCreate(NULL, + (const void **)&keys, + (const void **)&values, + sizeof(keys) / sizeof(keys[0]), + &kCFTypeDictionaryKeyCallBacks, + &kCFTypeDictionaryValueCallBacks); + CFAttributedStringRef attrString = + CFAttributedStringCreate(NULL, (CFStringRef)label, attr); + CFRelease(attr); + + // Draw the string + CTLineRef line = CTLineCreateWithAttributedString(attrString); + CGContextSetTextMatrix(context, CGAffineTransformIdentity); + CGContextSetTextPosition(context, 0, 0); + + CGRect labelBounds = CGRectIntegral(CTLineGetImageBounds(line, context)); + //int shiftx = round(labelBounds.size.width / 2); + + CGContextSetTextPosition(context, + round(pt.x - (labelBounds.size.width/2)), + round(pt.y - (0.9*labelBounds.size.height/2))); + + labelBounds = CGRectIntegral(CTLineGetImageBounds(line, context)); + labelBounds.origin.x -= 2; + labelBounds.origin.y -= 2; + labelBounds.size.width += 4; + labelBounds.size.height += 4; + + CGContextSetShouldAntialias(context, NO); + + CGContextSetRGBFillColor(context, 1.0f, 1.0f, 0.5f, 0.7f); + CGContextSetRGBStrokeColor(context, 0.5f, 0.0f, 0.0f, 0.7f); + + CGContextFillRect(context, labelBounds); + CGContextStrokeRect(context, labelBounds); + + CGContextSetShouldAntialias(context, YES); + + CGContextSetRGBFillColor(context, 0.3f, 0.3f, 0.3f, 0.7f); + + CTLineDraw(line, context); + + // Clean up + CFRelease(line); + CFRelease(attrString); + CFRelease(font); + + CGContextRestoreGState(context); +} + +@end diff --git a/tikzit-1/src/osx/CoreGraphicsRenderContext.h b/tikzit-1/src/osx/CoreGraphicsRenderContext.h new file mode 100644 index 0000000..7b00484 --- /dev/null +++ b/tikzit-1/src/osx/CoreGraphicsRenderContext.h @@ -0,0 +1,44 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import +#import "RenderContext.h" + +@interface CoreTextLayout: NSObject { + CFAttributedStringRef attrString; + CTFontRef font; + CTLineRef line; + CGContextRef ctx; +} + ++ (CoreTextLayout*) layoutForContext:(CGContextRef)c withString:(NSString*)string fontSize:(CGFloat)fontSize; +- (id) initWithContext:(CGContextRef)cr withString:(NSString*)string fontSize:(CGFloat)fontSize; + +@end + +@interface CoreGraphicsRenderContext: NSObject { + CGContextRef ctx; +} + ++ (CoreGraphicsRenderContext*) contextWithCGContext:(CGContextRef)c; ++ (id) initWithCGContext:(CGContextRef)c; + +- (CGContextRef) ctx; + +@end + +// vim:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/osx/CoreGraphicsRenderContext.m b/tikzit-1/src/osx/CoreGraphicsRenderContext.m new file mode 100644 index 0000000..1cb0daf --- /dev/null +++ b/tikzit-1/src/osx/CoreGraphicsRenderContext.m @@ -0,0 +1,234 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import +#import "RenderContext.h" + +@implementation CoreTextLayout + ++ (CoreTextLayout*) layoutForContext:(CGContextRef)c withString:(NSString*)string fontSize:(CGFloat)fontSize { + return [[[self alloc] initWithContext:c withString:string fontSize:fontSize] autorelease]; +} + +- (id) initWithContext:(CGContextRef)cr withString:(NSString*)string fontSize:(CGFloat)fontSize { + self = [super init]; + + if (self == nil) { + return nil; + } + + CGContextRetain (cr); + ctx = cr; + font = CTFontCreateWithName(CFSTR("Monaco"), fontSize, NULL); + + // Create an attributed string + CFStringRef keys[] = { kCTFontAttributeName }; + CFTypeRef values[] = { font }; + CFDictionaryRef attr = CFDictionaryCreate(NULL, + (const void **)&keys, + (const void **)&values, + sizeof(keys) / sizeof(keys[0]), + &kCFTypeDictionaryKeyCallBacks, + &kCFTypeDictionaryValueCallBacks); + attrString = CFAttributedStringCreate(NULL, (CFStringRef)lab, attr); + CFRelease(attr); + line = CTLineCreateWithAttributedString(attrString); + + return self; +} + +- (NSSize) size { + CGRect labelBounds = CGRectIntegral(CTLineGetImageBounds(line, ctx)); + return labelBounds.size; +} + +- (NSString*) text { + return CFAttributedStringGetString (attrString); +} + +- (void) showTextAt:(NSPoint)topLeft withColor:(RColor)color { + CGContextSaveGState(ctx); + + CGContextSetRGBFillColor(ctx, color.red, color.green, color.blue, color.alpha); + CGContextSetRGBStrokeColor(ctx, color.red, color.green, color.blue, color.alpha); + CGContextSetShouldAntialias(ctx, YES); + + CGContextSetTextMatrix(ctx, CGAffineTransformIdentity); + CGContextSetTextPosition(ctx, 0, 0); + CGRect bounds = CGRectIntegral(CTLineGetImageBounds(line, ctx)); + CGContextSetTextPosition(ctx, topLeft.x - bounds.x, topLeft.y - bounds.y); + + CTLineDraw(line, ctx); + + CGContextRestoreGState(ctx); +} + +- (void) dealloc { + CFRelease(line); + CFRelease(attrString); + CFRelease(font); + CGContextRelease (ctx); + + [super dealloc]; +} + +@end + +@implementation CoreGraphicsRenderContext + ++ (CoreGraphicsRenderContext*) contextWithCGContext:(CGContextRef)c { + return [[[self alloc] initWithCGContext:c] autorelease]; +} + ++ (id) initWithCGContext:(CGContextRef)c { + self = [super init]; + + if (self) { + ctx = c; + CGContextRetain (ctx); + } + + return self; +} + +- (void) dealloc { + CGContextRelease (ctx); + + [super dealloc]; +} + +- (CGContextRef) ctx { + return ctx; +} + +- (void) saveState { + CGContextSaveGState(ctx); +} + +- (void) restoreState { + CGContextRestoreGState(ctx); +} + +- (NSRect) clipBoundingBox { + return CGContextGetClipBoundingBox (ctx); +} + +- (BOOL) strokeIncludesPoint:(NSPoint)p { + return CGContextPathContainsPoint(ctx, NSPointToCGPoint(p), kCGPathStroke); +} + +- (BOOL) fillIncludesPoint:(NSPoint)p { + return CGContextPathContainsPoint(ctx, NSPointToCGPoint(p), kCGPathFill); +} + +- (id) layoutText:(NSString*)text withSize:(CGFloat)fontSize { + return [CoreTextLayout layoutForContext:ctx withString:text fontSize:fontSize]; +} + +// this may not affect text rendering +- (void) setAntialiasMode:(AntialiasMode)mode { + CGContextSetShouldAntialias(ctx, mode != AntialiasDisabled); +} + +- (void) setLineWidth:(CGFloat)width { + CGContextSetLineWidth(ctx, width); +} + +// setting to 0 will unset the dash +- (void) setLineDash:(CGFloat)dashLength { + if (dashLength <= 0.0f) { + CGContextSetLineDash(ctx, 0.0f, NULL, 0); + } else { + const CGFloat dash[] = {dashLength, dashLength}; + CGContextSetLineDash(ctx, 0.0f, dash, 2); + } +} + +// paths +- (void) startPath { + CGContextBeginPath (ctx); +} + +- (void) closeSubPath { + CGContextClosePath (ctx); +} + +- (void) moveTo:(NSPoint)p { + CGContextMoveToPoint (ctx, p.x, p.y); +} + +- (void) curveTo:(NSPoint)end withCp1:(NSPoint)cp1 andCp2:(NSPoint)cp2 { + CGContextAddCurveToPoint(ctx, cp1.x, cp1.y, cp2.x, cp2.y, end.x, end.y); +} + +- (void) lineTo:(NSPoint)end { + CGContextAddLineToPoint(ctx, end.x, end.y); +} + +- (void) rect:(NSRect)rect { + CGContextAddRect (ctx, rect); +} + +- (void) circleAt:(NSPoint)c withRadius:(CGFloat)r { + CGContextMoveToPoint (ctx, c.x + r, c.y); + CGContextAddArc (ctx, c.x, c.y, r, 0.0f, M_PI, 1); +} + +// these methods clear the path +- (void) strokePathWithColor:(RColor)color { + CGContextSetRGBStrokeColor(ctx, color.red, color.green, color.blue, color.alpha); + CGContextDrawPath (ctx, kCGPathStroke); +} + +- (void) fillPathWithColor:(RColor)color { + CGContextSetRGBFillColor(ctx, color.red, color.green, color.blue, color.alpha); + CGContextDrawPath (ctx, kCGPathFill); +} + +- (void) strokePathWithColor:(RColor)scolor + andFillWithColor:(RColor)fcolor { + CGContextSetRGBFillColor(ctx, color.red, color.green, color.blue, color.alpha); + CGContextSetRGBStrokeColor(ctx, color.red, color.green, color.blue, color.alpha); + CGContextDrawPath (ctx, kCGPathFillStroke); +} + +- (void) strokePathWithColor:(RColor)scolor + andFillWithColor:(RColor)fcolor + usingAlpha:(CGFloat)alpha { + CGContextSetRGBFillColor(ctx, color.red, color.green, color.blue, color.alpha * alpha); + CGContextSetRGBStrokeColor(ctx, color.red, color.green, color.blue, color.alpha * alpha); + CGContextDrawPath (ctx, kCGPathFillStroke); +} + +- (void) clipToPath { + CGContextClip (ctx); +} + +// paint everywhere within the clip +- (void) paintWithColor:(RColor)color { + CGContextSetRGBFillColor(ctx, color.red, color.green, color.blue, color.alpha); + CGRect r = CGContextGetClipBoundingBox (ctx); + r.origin.x -= 1; + r.origin.y -= 1; + r.size.width += 2; + r.size.height += 2; + CGContextFillRect(context, r); +} + +@end + +// vim:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/osx/CustomNodeCellView.h b/tikzit-1/src/osx/CustomNodeCellView.h new file mode 100644 index 0000000..22606d7 --- /dev/null +++ b/tikzit-1/src/osx/CustomNodeCellView.h @@ -0,0 +1,23 @@ +// +// CustomNodeCellView.h +// TikZiT +// +// Created by Johan Paulsson on 12/12/13. +// Copyright (c) 2013 Aleks Kissinger. All rights reserved. +// + +#import + +#import "NodeLayer.h" +#import "NodeStyle.h" +#import "NodeStyle+Coder.h" + +@interface CustomNodeCellView : NSTableCellView{ + NodeLayer *nodeLayer; + NodeStyle *nodeStyle; + BOOL selected; +} + +@property (strong) id objectValue; + +@end diff --git a/tikzit-1/src/osx/CustomNodeCellView.m b/tikzit-1/src/osx/CustomNodeCellView.m new file mode 100644 index 0000000..612394b --- /dev/null +++ b/tikzit-1/src/osx/CustomNodeCellView.m @@ -0,0 +1,83 @@ +// +// CustomNodeCellView.m +// TikZiT +// +// Created by Johan Paulsson on 12/12/13. +// Copyright (c) 2013 Aleks Kissinger. All rights reserved. +// + +#import "CustomNodeCellView.h" + +@implementation CustomNodeCellView + +- (id)initWithFrame:(NSRect)frame +{ + self = [super initWithFrame:frame]; + if (self) { + // Initialization code here. + } + return self; +} + +- (void)drawRect:(NSRect)dirtyRect +{ + [super drawRect:dirtyRect]; + + // Drawing code here. +} + +- (id) objectValue{ + return [super objectValue]; +} + +-(void)drawLayer:(CALayer *)layer inContext:(CGContextRef)context { + if (nodeLayer!=nil) { + if (![[[self layer] sublayers] containsObject:nodeLayer]) { + [[self layer] addSublayer:nodeLayer]; + NSPoint c = NSMakePoint((CGRectGetMinX([[self layer] frame])+CGRectGetWidth([nodeLayer bounds])/2), + CGRectGetMidY([[self layer] frame])); + //c = NSMakePoint(-16.5,-16.5); + [nodeLayer setCenter:c andAnimateWhen:NO]; + [[self textField] setFrame:NSMakeRect(CGRectGetWidth([nodeLayer bounds]), CGRectGetMidY([[self layer] frame]), CGRectGetWidth([[self textField] frame]), CGRectGetHeight([[self textField] frame]))]; + } + + if (selected){ + [nodeStyle setStrokeColor:[NSColor whiteColor]]; + [[nodeLayer node] setStyle:nodeStyle]; + }else{ + [nodeStyle setStrokeColor:[NSColor blackColor]]; + [[nodeLayer node] setStyle:nodeStyle]; + } + + [nodeLayer updateFrame]; + } +} + +- (void) setObjectValue:(id)objectValue{ + if(objectValue == nil) + return; + + nodeStyle = (NodeStyle *)objectValue; + [[self textField] setStringValue:[nodeStyle shapeName]]; + + if (nodeLayer == nil) { + nodeLayer = [[NodeLayer alloc] initWithNode:[Node node] + transformer:[Transformer defaultTransformer]]; + [nodeLayer setRescale:NO]; + } + [nodeStyle setName:[nodeStyle shapeName]]; + + [[nodeLayer node] setStyle:nodeStyle]; + [nodeLayer updateFrame]; + + NSLog(@"asd"); +} + +- (void)setBackgroundStyle:(NSBackgroundStyle)backgroundStyle { + [super setBackgroundStyle:backgroundStyle]; + + selected = (backgroundStyle == NSBackgroundStyleDark); + [self setNeedsDisplay:YES]; +} + +@end diff --git a/tikzit-1/src/osx/CustomNodeController.h b/tikzit-1/src/osx/CustomNodeController.h new file mode 100644 index 0000000..67adf0b --- /dev/null +++ b/tikzit-1/src/osx/CustomNodeController.h @@ -0,0 +1,35 @@ +// +// CustomNodeController.h +// TikZiT +// +// Created by Johan Paulsson on 12/4/13. +// Copyright (c) 2013 Aleks Kissinger. All rights reserved. +// + +#import +#import "Shape.h" +#import "TikzShape.h" + +#import "GraphicsView.h" +#import "TikzSourceController.h" + +#import "SupportDir.h" + +@interface CustomNodeController : NSViewController { + NSDictionary *nodeStyles; + NSMutableArray* customNodeStyles; + + GraphicsView *__weak graphicsView; + TikzSourceController *__weak tikzSourceController; + NSTableView *customNodeTable; +} + +@property NSDictionary *nodeStyles; +@property NSMutableArray* customNodeStyles; + +@property IBOutlet NSTableView *customNodeTable; + +@property (weak) IBOutlet GraphicsView *graphicsView; +@property (weak) IBOutlet TikzSourceController *tikzSourceController; + +@end diff --git a/tikzit-1/src/osx/CustomNodeController.m b/tikzit-1/src/osx/CustomNodeController.m new file mode 100644 index 0000000..4f46acc --- /dev/null +++ b/tikzit-1/src/osx/CustomNodeController.m @@ -0,0 +1,58 @@ +// +// CustomNodeController.m +// TikZiT +// +// Created by Johan Paulsson on 12/4/13. +// Copyright (c) 2013 Aleks Kissinger. All rights reserved. +// + +#import "CustomNodeController.h" +#import "NodeStyle.h" + +@interface CustomNodeController () + +@end + +@implementation CustomNodeController + +@synthesize nodeStyles, customNodeStyles; +@synthesize graphicsView, tikzSourceController; +@synthesize customNodeTable; + +- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil +{ + if (self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]) { + nodeStyles = [Shape shapeDictionary]; + customNodeStyles = [NSMutableArray array]; + + for(id key in nodeStyles) { + Shape *value = [nodeStyles objectForKey:key]; + + if([value isKindOfClass:[TikzShape class]]){ + NodeStyle *newNodeStyle = [[NodeStyle alloc] init]; + [newNodeStyle setShapeName:key]; + + [customNodeStyles addObject:newNodeStyle]; + } + } + } + + return self; +} + +- (void)tableViewSelectionDidChange:(NSNotification *)aNotification{ + NSInteger selectedRow = [customNodeTable selectedRow]; + + NodeStyle* selectedNodeStyle = [customNodeStyles objectAtIndex:selectedRow]; + TikzShape *tikzshape = (TikzShape *) [nodeStyles objectForKey:[selectedNodeStyle shapeName]]; + + [[tikzSourceController graphicsView] setEnabled:NO]; + [tikzSourceController setTikz:[tikzshape tikzSrc]]; + [tikzSourceController parseTikz:self]; +} + +- (id)valueForUndefinedKey:(NSString *)key{ + return nil; +} + +@end diff --git a/tikzit-1/src/osx/CustomNodes.xib b/tikzit-1/src/osx/CustomNodes.xib new file mode 100644 index 0000000..1cc8db2 --- /dev/null +++ b/tikzit-1/src/osx/CustomNodes.xib @@ -0,0 +1,249 @@ + + + + + + + + + + + + + + + + + + + name + strokeThickness + strokeColor + fillColor + strokeColorIsKnown + fillColorIsKnown + representedObject.name + shapeName + scale + @distinctUnionOfObjects.category + category + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \begin{tikzpicture} + +\end{tikzpicture} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tikzit-1/src/osx/DraggablePDFView.h b/tikzit-1/src/osx/DraggablePDFView.h new file mode 100644 index 0000000..9e53c44 --- /dev/null +++ b/tikzit-1/src/osx/DraggablePDFView.h @@ -0,0 +1,28 @@ +// +// PreviewController.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import + +@interface DraggablePDFView : PDFView + +@end diff --git a/tikzit-1/src/osx/DraggablePDFView.m b/tikzit-1/src/osx/DraggablePDFView.m new file mode 100644 index 0000000..ce393c7 --- /dev/null +++ b/tikzit-1/src/osx/DraggablePDFView.m @@ -0,0 +1,60 @@ +// +// PreviewController.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "DraggablePDFView.h" + +@implementation DraggablePDFView + +- (id)initWithFrame:(NSRect)frame +{ + self = [super initWithFrame:frame]; + return self; +} + +- (void)drawRect:(NSRect)dirtyRect +{ + [super drawRect:dirtyRect]; +} + +- (void)mouseDown:(NSEvent *)theEvent +{ + NSRect pageBox = [[[self document] pageAtIndex:0] boundsForBox:kPDFDisplayBoxMediaBox]; + NSRect pageRect= [self convertRect:pageBox fromPage:[[self document] pageAtIndex:0]]; + + NSArray *fileList = [NSArray arrayWithObjects:[[[self document] documentURL] path], nil]; + NSPasteboard *pboard = [NSPasteboard pasteboardWithName:NSDragPboard]; + [pboard declareTypes:[NSArray arrayWithObject:NSFilenamesPboardType] owner:nil]; + [pboard setPropertyList:fileList forType:NSFilenamesPboardType]; + + [self dragImage:[[NSImage alloc] initWithData:[[self document] dataRepresentation]] + at:pageRect.origin + offset:pageRect.size + event:theEvent + pasteboard:pboard + source:self + slideBack:YES]; + + return; +} + +@end diff --git a/tikzit-1/src/osx/EdgeControlLayer.h b/tikzit-1/src/osx/EdgeControlLayer.h new file mode 100644 index 0000000..4cdf8bc --- /dev/null +++ b/tikzit-1/src/osx/EdgeControlLayer.h @@ -0,0 +1,44 @@ +// +// EdgeControlLayer.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import +#import "Edge.h" +#import "Transformer.h" + + +@interface EdgeControlLayer : CALayer { + Edge *edge; + Transformer *transformer; + BOOL selected; +} + +- (id)initWithEdge:(Edge*)e andTransformer:(Transformer*)t; +- (void)highlight; +- (void)unhighlight; +- (void)select; +- (void)deselect; + ++ (float)handleRadius; + +@end diff --git a/tikzit-1/src/osx/EdgeControlLayer.m b/tikzit-1/src/osx/EdgeControlLayer.m new file mode 100644 index 0000000..facdd84 --- /dev/null +++ b/tikzit-1/src/osx/EdgeControlLayer.m @@ -0,0 +1,150 @@ +// +// EdgeControlLayer.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "EdgeControlLayer.h" +#import "util.h" + + +@implementation EdgeControlLayer + + +- (id)initWithEdge:(Edge*)e andTransformer:(Transformer*)t { + if (!(self = [super init])) return nil; + transformer = t; + edge = e; + self.opacity = 0.0f; + return self; +} + +- (void)select { + selected = YES; + self.opacity = 1.0f; +} + +- (void)deselect { + selected = NO; + self.opacity = 0.0f; +} + +- (void)highlight { + if (!selected) { + self.opacity = 0.5f; + } +} + +- (void)unhighlight { + if (!selected) { + self.opacity = 0.0f; + } +} + +- (void)drawInContext:(CGContextRef)ctx { + CGContextSaveGState(ctx); + + [edge updateControls]; + CGPoint source = NSPointToCGPoint([transformer toScreen:[[edge source] point]]); + CGPoint target = NSPointToCGPoint([transformer toScreen:[[edge target] point]]); + CGPoint mid = NSPointToCGPoint([transformer toScreen:[edge mid]]); + CGPoint cp1 = NSPointToCGPoint([transformer toScreen:[edge cp1]]); + CGPoint cp2 = NSPointToCGPoint([transformer toScreen:[edge cp2]]); + + float dx = (target.x - source.x); + float dy = (target.y - source.y); + + // draw a circle at the midpoint + CGRect mid_rect = CGRectMake(mid.x-3.0f, mid.y-3.0f, 6.0f, 6.0f); + CGContextAddEllipseInRect(ctx, mid_rect); + CGContextSetLineWidth(ctx, 1.0f); + CGContextSetRGBFillColor(ctx, 1.0f, 1.0f, 1.0f, 0.5f); + CGContextSetRGBStrokeColor(ctx, 0.0f, 0.0f, 1.0f, 0.5f); + CGContextDrawPath(ctx, kCGPathFillStroke); + + + CGContextSetShouldAntialias(ctx, YES); + + // compute size of control circles + float cdist; + if (dx == 0 && dy == 0) cdist = [transformer scaleToScreen:edge.weight]; + else cdist = sqrt(dx*dx + dy*dy) * edge.weight; + + // if basic bend, draw blue, if inout, draw green + if ([edge bendMode] == EdgeBendModeBasic) CGContextSetRGBStrokeColor(ctx, 0, 0, 1, 0.4f); + else CGContextSetRGBStrokeColor(ctx, 0, 0.7f, 0, 0.4f); + + // draw source control circle + CGRect ellipse1 = CGRectMake(source.x-cdist, source.y-cdist, cdist*2.0f, cdist*2.0f); + CGContextAddEllipseInRect(ctx, ellipse1); + if (dx!=0 || dy!=0) { + CGRect ellipse2 = CGRectMake(target.x-cdist, target.y-cdist, cdist*2.0f, cdist*2.0f); + CGContextAddEllipseInRect(ctx, ellipse2); + } + + CGContextStrokePath(ctx); + + float handleRad = [EdgeControlLayer handleRadius]; + + // handles + CGRect ctrl1 = CGRectMake(cp1.x-handleRad, cp1.y-handleRad, 2*handleRad, 2*handleRad); + CGRect ctrl2 = CGRectMake(cp2.x-handleRad, cp2.y-handleRad, 2*handleRad, 2*handleRad); + + CGContextSetRGBFillColor(ctx, 1.0f, 1.0f, 1.0f, 0.8f); + + // draw a line from source vertex to first handle + if ([edge bendMode] == EdgeBendModeInOut) { + if ([edge outAngle] % 45 == 0) CGContextSetRGBStrokeColor(ctx, 1, 0, 1, 0.6f); + else CGContextSetRGBStrokeColor(ctx, 0, 0.7f, 0, 0.4f); + } else { + if ([edge bend] % 45 == 0) CGContextSetRGBStrokeColor(ctx, 1, 0, 1, 0.6f); + else CGContextSetRGBStrokeColor(ctx, 0, 0, 1, 0.4f); + } + + CGContextMoveToPoint(ctx, source.x, source.y); + CGContextAddLineToPoint(ctx, cp1.x, cp1.y); + CGContextStrokePath(ctx); + + CGContextAddEllipseInRect(ctx, ctrl1); + CGContextDrawPath(ctx, kCGPathFillStroke); + + + // draw a line from target vertex to second handle + if ([edge bendMode] == EdgeBendModeInOut) { + if ([edge inAngle] % 45 == 0) CGContextSetRGBStrokeColor(ctx, 1, 0, 1, 0.6f); + else CGContextSetRGBStrokeColor(ctx, 0, 0.7f, 0, 0.4f); + } else { + if ([edge bend] % 45 == 0) CGContextSetRGBStrokeColor(ctx, 1, 0, 1, 0.6f); + else CGContextSetRGBStrokeColor(ctx, 0, 0, 1, 0.4f); + } + + CGContextMoveToPoint(ctx, target.x, target.y); + CGContextAddLineToPoint(ctx, cp2.x, cp2.y); + CGContextStrokePath(ctx); + + CGContextAddEllipseInRect(ctx, ctrl2); + CGContextDrawPath(ctx, kCGPathFillStroke); + + CGContextRestoreGState(ctx); +} + ++ (float)handleRadius { return 4.0f; } + +@end diff --git a/tikzit-1/src/osx/EdgeStyle+Coder.h b/tikzit-1/src/osx/EdgeStyle+Coder.h new file mode 100644 index 0000000..e35c18f --- /dev/null +++ b/tikzit-1/src/osx/EdgeStyle+Coder.h @@ -0,0 +1,30 @@ +// +// EdgeStyle+Coder.h +// TikZiT +// +// Copyright 2011 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import "EdgeStyle.h" + +@interface EdgeStyle (Coder) +- (id)initWithCoder:(NSCoder*)coder; +- (void)encodeWithCoder:(NSCoder*)coder; +@end diff --git a/tikzit-1/src/osx/EdgeStyle+Coder.m b/tikzit-1/src/osx/EdgeStyle+Coder.m new file mode 100644 index 0000000..039344d --- /dev/null +++ b/tikzit-1/src/osx/EdgeStyle+Coder.m @@ -0,0 +1,50 @@ +// +// EdgeStyle+Coder.m +// TikZiT +// +// Copyright 2011 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "EdgeStyle+Coder.h" + +@implementation EdgeStyle (Coder) + +- (id)initWithCoder:(NSCoder*)coder { + if (!(self = [super init])) return nil; + + name = [coder decodeObjectForKey:@"name"]; + category = [coder decodeObjectForKey:@"category"]; + headStyle = [coder decodeIntForKey:@"headStyle"]; + tailStyle = [coder decodeIntForKey:@"tailStyle"]; + decorationStyle = [coder decodeIntForKey:@"decorationStyle"]; + thickness = [coder decodeFloatForKey:@"thickness"]; + + return self; +} + +- (void)encodeWithCoder:(NSCoder*)coder { + [coder encodeObject:name forKey:@"name"]; + [coder encodeObject:category forKey:@"category"]; + [coder encodeInt:headStyle forKey:@"headStyle"]; + [coder encodeInt:tailStyle forKey:@"tailStyle"]; + [coder encodeInt:decorationStyle forKey:@"decorationStyle"]; + [coder encodeFloat:thickness forKey:@"thickness"]; +} + +@end diff --git a/tikzit-1/src/osx/Graph+Coder.h b/tikzit-1/src/osx/Graph+Coder.h new file mode 100644 index 0000000..1404fc2 --- /dev/null +++ b/tikzit-1/src/osx/Graph+Coder.h @@ -0,0 +1,17 @@ +// +// Graph+Coder.h +// TikZiT +// +// Created by Aleks Kissinger on 27/04/2010. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import +#import "Graph.h" + +@interface Graph (Coder) + +- (id)initWithCoder:(NSCoder*)coder; +- (void)encodeWithCoder:(NSCoder*)coder; + +@end diff --git a/tikzit-1/src/osx/Graph+Coder.m b/tikzit-1/src/osx/Graph+Coder.m new file mode 100644 index 0000000..7d3787e --- /dev/null +++ b/tikzit-1/src/osx/Graph+Coder.m @@ -0,0 +1,24 @@ +// +// Graph+Coder.m +// TikZiT +// +// Created by Aleks Kissinger on 27/04/2010. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import "Graph+Coder.h" +#import "TikzGraphAssembler.h" + +@implementation Graph(Coder) + +- (id)initWithCoder:(NSCoder*)coder { + NSString *tikz = [coder decodeObject]; + [TikzGraphAssembler parseTikz:tikz forGraph:self]; + return self; +} + +- (void)encodeWithCoder:(NSCoder*)coder { + [coder encodeObject:[self tikz]]; +} + +@end diff --git a/tikzit-1/src/osx/GraphicsView.h b/tikzit-1/src/osx/GraphicsView.h new file mode 100644 index 0000000..329b1e5 --- /dev/null +++ b/tikzit-1/src/osx/GraphicsView.h @@ -0,0 +1,129 @@ +// +// GraphicsView.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import +#import "PickSupport.h" +#import "Grid.h" +#import "Transformer.h" +#import "Graph.h" +#import "NodeStyle.h" +#import "StylePaletteController.h" +#import "ToolPaletteController.h" +#import "SelectBoxLayer.h" + +// mouse modes, corresponding to different tools. format: (tool)[sub-mode]Mode +typedef enum { + SelectMode = 0x10, + SelectBoxMode = 0x11, + SelectMoveMode = 0x12, + SelectEdgeBendMode = 0x14, + + NodeMode = 0x20, + + EdgeMode = 0x40, + EdgeDragMode = 0x41, + + CropMode = 0x80, + CropDragMode = 0x81 +} MouseMode; + +@class TikzSourceController; + +@interface GraphicsView : NSView { + BOOL enabled; + + IBOutlet NSApplication *application; + StylePaletteController *stylePaletteController; + ToolPaletteController *toolPaletteController; + + BOOL frameMoveMode; + + Graph *graph; + NSString *graphTikzOnMouseDown; + PickSupport *pickSupport; + //NSMapTable *nodeSelectionLayers; + NSMapTable *edgeControlLayers; + NSMapTable *nodeLayers; + NSPoint dragOrigin; + NSPoint dragTarget; + NSPoint oldTransformerOrigin; + NSPoint oldMainOrigin; + NSRect oldBounds; + //NSRect selectionBox; + Transformer *transformer; + + CALayer *mainLayer; + CALayer *gridLayer; + CALayer *graphLayer; + CALayer *hudLayer; + SelectBoxLayer *selectionLayer; + + MouseMode mouseMode; + Node *leaderNode; + Grid *grid; + + Edge *modifyEdge; + BOOL firstControlPoint; + + int bboxLeftRight; + int bboxBottomTop; + + NSUndoManager *documentUndoManager; + NSPoint startPoint; + + TikzSourceController *tikzSourceController; +} + +@property BOOL enabled; +@property (weak) Graph *graph; +@property IBOutlet TikzSourceController *tikzSourceController; +@property (readonly) Transformer *transformer; +@property (readonly) PickSupport *pickSupport; + +- (void)setDocumentUndoManager:(NSUndoManager*)um; +- (void)applyStyleToSelectedNodes:(NodeStyle*)style; +- (void)applyStyleToSelectedEdges:(EdgeStyle*)style; + +- (void)updateMouseMode; +- (void)refreshLayers; + +//- (void)registerUndo:(GraphChange *)change withActionName:(NSString*)name; +- (void)registerUndo:(NSString*)oldTikz withActionName:(NSString*)name; +//- (void)undoGraphChange:(GraphChange *)change; +- (void)undoGraphChange:(NSString*)oldTikz; +- (void)postGraphChange; +- (void)postSelectionChange; + +- (void)deselectAll:(id)sender; +- (void)selectAll:(id)sender; +- (void)cut:(id)sender; +- (void)copy:(id)sender; +- (void)paste:(id)sender; +- (void)delete:(id)sender; +- (void)bringForward:(id)sender; +- (void)flipHorizonal:(id)sender; +- (void)flipVertical:(id)sender; +- (void)reverseEdgeDirection:(id)sender; + +@end diff --git a/tikzit-1/src/osx/GraphicsView.m b/tikzit-1/src/osx/GraphicsView.m new file mode 100644 index 0000000..efa7ecb --- /dev/null +++ b/tikzit-1/src/osx/GraphicsView.m @@ -0,0 +1,1216 @@ +// +// GraphicsView.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "GraphicsView.h" +#import "util.h" +#import "CALayer+DrawLabel.h" + +#import "NodeSelectionLayer.h" +#import "NodeLayer.h" +#import "EdgeControlLayer.h" +#import "AppDelegate.h" +#import "TikzGraphAssembler.h" +#import "TikzSourceController.h" + +@interface GraphicsView (Private) +- (void)setupLayers; +- (void)addNodeLayers:(Node*)n; +- (void)addEdgeLayers:(Edge*)e; +- (void)removeNodeLayers:(Node*)n; +- (void)resetMainOrigin; +- (void)setMainOrigin:(NSPoint)o; +@end + +static CGColorRef cgGrayColor, cgWhiteColor, cgClearColor = nil; + + +@implementation GraphicsView + +@synthesize enabled, transformer, pickSupport, tikzSourceController; + +- (void)postGraphChange { + [[NSNotificationCenter defaultCenter] postNotificationName:@"GraphChanged" + object:self]; + [self postSelectionChange]; +} + +- (void)postSelectionChange { + [[NSNotificationCenter defaultCenter] postNotificationName:@"SelectionChanged" + object:self]; +} + +- (id)initWithFrame:(NSRect)frame { + self = [super initWithFrame:frame]; + if (self) { + if (cgClearColor == nil) { + cgClearColor = CGColorGetConstantColor(kCGColorClear); + cgGrayColor = CGColorCreateGenericGray(0.5f, 0.5f); + cgWhiteColor = CGColorCreateGenericRGB(1, 1, 1, 1); + } + + transformer = [[Transformer alloc] init]; + mouseMode = SelectMode; + grid = [Grid gridWithSpacing:1.0f + subdivisions:4 + transformer:transformer]; + [grid setSize:NSSizeFromCGSize([gridLayer bounds].size)]; + [transformer setScale:PIXELS_PER_UNIT]; + + [self setupLayers]; + + leaderNode = nil; + pickSupport = [[PickSupport alloc] init]; + frameMoveMode = NO; + + enabled = YES; + [self setGraph:[Graph graph]]; + } + return self; +} + +- (void)awakeFromNib { + AppDelegate *del = [application delegate]; + stylePaletteController = [del stylePaletteController]; + toolPaletteController = [del toolPaletteController]; + [self refreshLayers]; + [self postGraphChange]; +} + +- (void)setupLayers { + mainLayer = [CALayer layer]; + [mainLayer setBackgroundColor:cgWhiteColor]; + [mainLayer setFrame:CGRectIntegral(NSRectToCGRect([self bounds]))]; + [mainLayer setOpacity:1.0f]; + [self setLayer:mainLayer]; + [self resetMainOrigin]; + + gridLayer = [CALayer layer]; + [gridLayer setDelegate:grid]; + [gridLayer setOpacity:0.3f]; + [mainLayer addSublayer:gridLayer]; + + graphLayer = [CALayer layer]; + [graphLayer setDelegate:self]; + [mainLayer addSublayer:graphLayer]; + + hudLayer = [CALayer layer]; + [mainLayer addSublayer:hudLayer]; + + selectionLayer = [SelectBoxLayer layer]; + [mainLayer addSublayer:selectionLayer]; + + [transformer setOrigin:NSMakePoint(NSMidX([self bounds]),NSMidY([self bounds]))]; + oldBounds = [self bounds]; + [self refreshLayers]; +} + +// Lion resume feature +//- (void)encodeRestorableStateWithCoder:(NSCoder*)coder { +// NSLog(@"got encode request"); +//} +//- (void)restoreStateWithCoder:(NSCoder*)coder { +// NSLog(@"got decode request"); +//} + +- (void)registerUndo:(NSString*)oldTikz withActionName:(NSString*)nm { + [documentUndoManager registerUndoWithTarget:self + selector:@selector(undoGraphChange:) + object:oldTikz]; + [documentUndoManager setActionName:nm]; +} + +- (void)revertToTikz:(NSString*)tikz { + [tikzSourceController setTikz:tikz]; + [tikzSourceController tryParseTikz]; + [self refreshLayers]; + [self postGraphChange]; +} + + +- (void)undoGraphChange:(NSString*)oldTikz { + NSString *currentTikz = [graph tikz]; + [self revertToTikz:oldTikz]; + [documentUndoManager registerUndoWithTarget:self + selector:@selector(undoGraphChange:) + object:currentTikz]; +} + +- (void)setGraph:(Graph*)gr { + graph = gr; + + NSEnumerator *e; + CALayer *layer; + + e = [edgeControlLayers objectEnumerator]; + while (layer = [e nextObject]) [layer removeFromSuperlayer]; + edgeControlLayers = [NSMapTable mapTableWithStrongToStrongObjects]; + + + e = [nodeLayers objectEnumerator]; + while (layer = [e nextObject]) [layer removeFromSuperlayer]; + nodeLayers = [NSMapTable mapTableWithStrongToStrongObjects]; + + for (Node *n in [graph nodes]) { + [n attachStyleFromTable:[stylePaletteController nodeStyles]]; + [self addNodeLayers:n]; + } + + for (Edge *e in [graph edges]) { + [e setAttributesFromData]; + [e attachStyleFromTable:[stylePaletteController edgeStyles]]; + [self addEdgeLayers:e]; + } +} + +- (Graph*)graph { return graph; } + +- (void)setMainOrigin:(NSPoint)o { + o.x = round(o.x); + o.y = round(o.y); + CGRect rect = [mainLayer frame]; + rect.origin = NSPointToCGPoint(o); + [mainLayer setFrame:rect]; +} + +- (void)resetMainOrigin { + NSRect bds = [self bounds]; + bds.origin.x -= bds.size.width; + bds.origin.y -= bds.size.height; + bds.size.width *= 3; + bds.size.height *= 3; + [mainLayer setFrame:NSRectToCGRect([self bounds])]; +} + +- (void)refreshLayers { + [gridLayer setFrame:[mainLayer frame]]; + [graphLayer setFrame:[mainLayer frame]]; + [hudLayer setFrame:[mainLayer frame]]; + [selectionLayer setFrame:[mainLayer frame]]; + + if (enabled) { + [hudLayer setBackgroundColor:cgClearColor]; + } else { + [hudLayer setBackgroundColor:cgGrayColor]; + } + + [grid setSize:NSSizeFromCGSize([gridLayer bounds].size)]; + [gridLayer setNeedsDisplay]; + [graphLayer setNeedsDisplay]; + [hudLayer setNeedsDisplay]; + + NSEnumerator *e = [edgeControlLayers objectEnumerator]; + CALayer *layer; + while (layer = [e nextObject]) { + [layer setFrame:[graphLayer frame]]; + [layer setNeedsDisplay]; + } +} + + +- (void)viewDidEndLiveResize { + [super viewDidEndLiveResize]; + NSPoint o = [transformer origin]; + o.x += round(([self bounds].size.width - oldBounds.size.width)/2.0f); + o.y += round(([self bounds].size.height - oldBounds.size.height)/2.0f); + [transformer setOrigin:o]; + oldBounds = [self bounds]; + [self refreshLayers]; +} + +- (void)applyStyleToSelectedNodes:(NodeStyle*)style { + NSString *oldTikz = [graph tikz]; + + for (Node *n in [pickSupport selectedNodes]) { + [n setStyle:style]; + [[nodeLayers objectForKey:n] setNeedsDisplay]; + } + + [self registerUndo:oldTikz withActionName:@"Apply Style to Nodes"]; + [self refreshLayers]; + [self postGraphChange]; +} + +- (void)applyStyleToSelectedEdges:(EdgeStyle*)style { + NSString *oldTikz = [graph tikz]; + + for (Edge *e in [pickSupport selectedEdges]) { + [e setStyle:style]; + } + + [self registerUndo:oldTikz withActionName:@"Apply Style to Edges"]; + [self refreshLayers]; + [self postGraphChange]; +} + +- (void)addNodeLayers:(Node*)n { + // add a node to the graph + [graph addNode:n]; + + NSPoint pt = [transformer toScreen:[n point]]; + + // add a node layer + NodeLayer *nl = [[NodeLayer alloc] initWithNode:n transformer:transformer]; + [nl setCenter:pt]; + [nodeLayers setObject:nl forKey:n]; + [graphLayer addSublayer:nl]; + [nl setNeedsDisplay]; +} + +- (void)removeNodeLayers:(Node*)n { + [[nodeLayers objectForKey:n] removeFromSuperlayer]; + [nodeLayers removeObjectForKey:n]; +} + +- (void)addEdgeLayers:(Edge *)e { + [graph addEdge:e]; + EdgeControlLayer *ecl = [[EdgeControlLayer alloc] initWithEdge:e andTransformer:transformer]; + [edgeControlLayers setObject:ecl forKey:e]; + [ecl setFrame:CGRectMake(10, 10, 100, 100)]; + [hudLayer addSublayer:ecl]; + [ecl setNeedsDisplay]; +} + +- (void)removeEdgeLayers:(Edge*)e { + [[edgeControlLayers objectForKey:e] removeFromSuperlayer]; + [edgeControlLayers removeObjectForKey:e]; + [self refreshLayers]; +} + +- (BOOL)circleWithCenter:(NSPoint)center andRadius:(float)radius containsPoint:(NSPoint)p { + float dx = center.x - p.x; + float dy = center.y - p.y; + return (dx*dx + dy*dy) <= radius*radius; +} + +- (BOOL)node:(Node*)node containsPoint:(NSPoint)p { + NodeLayer *nl = [nodeLayers objectForKey:node]; + return [nl nodeContainsPoint:p]; +} + +- (BOOL)edge:(Edge*)edge containsPoint:(NSPoint)p { +// NSPoint center = [transformer toScreen:edge.mid]; +// float dx = center.x - p.x; +// float dy = center.y - p.y; +// float radius = 5.0f; // tolerence for clicks +// return (dx*dx + dy*dy) <= radius*radius; + + CGContextRef ctx = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort]; + + // Save the graphics state before doing the hit detection. + CGContextSaveGState(ctx); + + NSPoint src = [transformer toScreen:[edge tail]]; + NSPoint targ = [transformer toScreen:[edge head]]; + NSPoint cp1 = [transformer toScreen:[edge cp1]]; + NSPoint cp2 = [transformer toScreen:[edge cp2]]; + + CGContextSetLineWidth(ctx, 8.0f); + + CGContextMoveToPoint(ctx, src.x, src.y); + CGContextAddCurveToPoint(ctx, cp1.x, cp1.y, cp2.x, cp2.y, targ.x, targ.y); + + BOOL containsPoint = CGContextPathContainsPoint(ctx, NSPointToCGPoint(p), kCGPathStroke); + + CGContextSetRGBStrokeColor(ctx, 0, 0, 0, 0); + + CGContextStrokePath(ctx); + //CGContextFlush(ctx); + CGContextRestoreGState(ctx); + + return containsPoint; +} + +- (void)shiftNodes:(NSSet*)set from:(NSPoint)source to:(NSPoint)dest { + float dx = dest.x - source.x; + float dy = dest.y - source.y; + + for (Node *n in set) { + NSPoint p = [transformer toScreen:[n point]]; + p = [grid snapScreenPoint:NSMakePoint(p.x+dx, p.y+dy)]; + [n setPoint:[transformer fromScreen:p]]; + } +} + + +- (void)mouseDown:(NSEvent*)theEvent { + if (!enabled) return; + + [self updateMouseMode]; + + dragOrigin = [self convertPoint:[theEvent locationInWindow] fromView:nil]; + dragTarget = dragOrigin; + + graphTikzOnMouseDown = [graph tikz]; + + if ([theEvent modifierFlags] & NSCommandKeyMask) { + oldTransformerOrigin = [transformer origin]; + oldMainOrigin = [self frame].origin; + frameMoveMode = YES; + return; + } + + if (mouseMode == SelectMode) { + [selectionLayer setActive:YES]; + [selectionLayer setSelectBox:NSRectAroundPoints(dragOrigin, dragOrigin)]; + [selectionLayer setNeedsDisplay]; + + modifyEdge = nil; + NSPoint cp1, cp2; + for (Edge *e in [pickSupport selectedEdges]) { + cp1 = [transformer toScreen:[e cp1]]; + cp2 = [transformer toScreen:[e cp2]]; + if ([self circleWithCenter:cp1 + andRadius:[EdgeControlLayer handleRadius] + containsPoint:dragOrigin]) + { + mouseMode = SelectEdgeBendMode; + modifyEdge = e; + firstControlPoint = YES; + break; + } else if ([self circleWithCenter:cp2 + andRadius:[EdgeControlLayer handleRadius] + containsPoint:dragOrigin]) + { + mouseMode = SelectEdgeBendMode; + modifyEdge = e; + firstControlPoint = NO; + break; + } + } + + if (modifyEdge == nil) { // skip all the rest if we're modifying an edge + + leaderNode = nil; + + // in first pass, try to find a leader node, under the mouse + for (Node* n in [graph nodes]) { + if ([self node:n containsPoint:dragOrigin]) { + leaderNode = n; + [gridLayer setOpacity:1.0f]; + break; + } + } + + // if we found one, deselect the others (if appropriate) and go to move mode + if (leaderNode != nil) { + startPoint = [leaderNode point]; + + // if we select a node, we should always deselect all edges: + for (Edge *e in [graph edges]) [[edgeControlLayers objectForKey:e] deselect]; + [pickSupport deselectAllEdges]; + + BOOL shouldDeselect = + !([theEvent modifierFlags] & NSShiftKeyMask) + && ![pickSupport isNodeSelected:leaderNode]; + for (Node *n in [graph nodes]) { + if (n != leaderNode && shouldDeselect) { + [pickSupport deselectNode:n]; + [[[nodeLayers objectForKey:n] selection] deselect]; + } + } + + // ensure the leader node is actually selected + if (![pickSupport isNodeSelected:leaderNode]) { + [pickSupport selectNode:leaderNode]; + [[[nodeLayers objectForKey:leaderNode] selection] select]; + } + + + // put us in move mode + mouseMode = SelectMoveMode; + } else { + mouseMode = SelectBoxMode; + + // if we didn't select a node, start hunting for an edge to select + BOOL shouldDeselect = !([theEvent modifierFlags] & NSShiftKeyMask); + + if (shouldDeselect) { + [pickSupport deselectAllEdges]; + for (Edge *e in graph.edges) [[edgeControlLayers objectForKey:e] deselect]; + } + + for (Edge* e in [graph edges]) { + // find the first node under the pointer, select it, show its controls + // and deselect all others if shift isn't down + if ([self edge:e containsPoint:dragOrigin]) { + for (Node *n in [pickSupport selectedNodes]) [[[nodeLayers objectForKey:n] selection] deselect]; + + [pickSupport deselectAllNodes]; + [pickSupport selectEdge:e]; + [[edgeControlLayers objectForKey:e] select]; + break; + } + } // end for e in [graph edges] + } // end if leaderNode == nil + } // end if modifyEdge == nil + + } else if (mouseMode == NodeMode) { + // do nothing... + } else if (mouseMode == EdgeMode) { + for (Node *n in [graph nodes]) { + if ([self node:n containsPoint:dragOrigin]) { + [[[nodeLayers objectForKey:n] selection] highlight]; + } + } + mouseMode = EdgeDragMode; + } else if (mouseMode == CropMode) { + if ([graph hasBoundingBox]) { + float fudge = 3; + + NSRect bb = [graph boundingBox]; + NSPoint bl = [transformer toScreen:bb.origin]; + NSPoint tr = [transformer + toScreen:NSMakePoint(bb.origin.x+bb.size.width, + bb.origin.y+bb.size.height)]; + if (dragOrigin.x > bl.x-fudge && dragOrigin.x < tr.x+fudge && + dragOrigin.y > tr.y-fudge && dragOrigin.y < tr.y+fudge) + { + bboxBottomTop = 1; + } else if (dragOrigin.x > bl.x-fudge && dragOrigin.x < tr.x+fudge && + dragOrigin.y > bl.y-fudge && dragOrigin.y < bl.y+fudge) + { + bboxBottomTop = -1; + } else { + bboxBottomTop = 0; + } + + if (dragOrigin.y > bl.y-fudge && dragOrigin.y < tr.y+fudge && + dragOrigin.x > tr.x-fudge && dragOrigin.x < tr.x+fudge) + { + bboxLeftRight = 1; + } else if (dragOrigin.y > bl.y-fudge && dragOrigin.y < tr.y+fudge && + dragOrigin.x > bl.x-fudge && dragOrigin.x < bl.x+fudge) + { + bboxLeftRight = -1; + } else { + bboxLeftRight = 0; + } + + if (bboxBottomTop != 0 || bboxLeftRight != 0) { + mouseMode = CropDragMode; + } + } + } else { + printf("WARNING: MOUSE DOWN IN INVALID MODE.\n"); + } + + [self refreshLayers]; +} + +- (void)mouseDragged:(NSEvent *)theEvent { + if (!enabled) return; + dragTarget = [self convertPoint:[theEvent locationInWindow] fromView:nil]; + + if (frameMoveMode) { + NSPoint newTransOrigin, newMainOrigin; + NSPoint diff = NSMakePoint(dragTarget.x - dragOrigin.x, dragTarget.y - dragOrigin.y); + newTransOrigin.x = oldTransformerOrigin.x + diff.x; + newTransOrigin.y = oldTransformerOrigin.y + diff.y; + newMainOrigin.x = oldMainOrigin.x + diff.x; + newMainOrigin.y = oldMainOrigin.y + diff.y; + + [CATransaction begin]; + [CATransaction setValue:(id)kCFBooleanTrue forKey:kCATransactionDisableActions]; + [self setMainOrigin:newMainOrigin]; + [CATransaction commit]; + + [transformer setOrigin:newTransOrigin]; + return; + } + + if (mouseMode == SelectBoxMode) { + [selectionLayer setSelectBox:NSRectAroundPoints(dragOrigin, dragTarget)]; + [selectionLayer setNeedsDisplay]; + + for (Node* n in [graph nodes]) { + if (NSPointInRect([transformer toScreen:[n point]], [selectionLayer selectBox])) { + [[[nodeLayers objectForKey:n] selection] highlight]; + } else if (!([theEvent modifierFlags] & NSShiftKeyMask)) { + [[[nodeLayers objectForKey:n] selection] unhighlight]; + } + } + } else if (mouseMode == SelectMoveMode) { + if (leaderNode != nil) { + [self shiftNodes:[pickSupport selectedNodes] + from:[transformer toScreen:[leaderNode point]] + to:dragTarget]; + } else { + printf("WARNING: LEADER NODE SHOULD NOT BE NIL.\n"); + } + + [self refreshLayers]; + } else if (mouseMode == SelectEdgeBendMode) { + NSPoint src = [transformer toScreen:[[modifyEdge source] point]]; + NSPoint targ = [transformer toScreen:[[modifyEdge target] point]]; + float dx1 = targ.x - src.x; + float dy1 = targ.y - src.y; + float dx2, dy2; + if (firstControlPoint) { + dx2 = dragTarget.x - src.x; + dy2 = dragTarget.y - src.y; + } else { + dx2 = dragTarget.x - targ.x; + dy2 = dragTarget.y - targ.y; + } + float base_dist = sqrt(dx1*dx1 + dy1*dy1); + float handle_dist = sqrt(dx2*dx2 + dy2*dy2); + float wcourseness = 0.1f; + + if (![modifyEdge isSelfLoop]) { + if (base_dist != 0) { + [modifyEdge setWeight:roundToNearest(wcourseness, handle_dist/base_dist)]; + //round(handle_dist / (base_dist*wcourseness)) * wcourseness; + } else { + [modifyEdge setWeight: + roundToNearest(wcourseness, [transformer scaleFromScreen:handle_dist])]; + } + } + + + float control_angle = good_atan(dx2, dy2); + + int bcourseness = 15; + + if ([modifyEdge bendMode] == EdgeBendModeBasic) { + float bnd; + float base_angle = good_atan(dx1, dy1); + if (firstControlPoint) { + bnd = base_angle - control_angle; + } else { + bnd = control_angle - base_angle + pi; + if (bnd > pi) bnd -= 2*pi; + } + + [modifyEdge setBend:round(bnd * (180.0f / pi) * + (1.0f / (float)bcourseness)) * + bcourseness]; + } else { + int bnd = round(control_angle * (180.0f / pi) * + (1.0f / (float)bcourseness)) * + bcourseness; + if (firstControlPoint) { + if ([theEvent modifierFlags] & NSAlternateKeyMask) { + if ([modifyEdge isSelfLoop]) { + [modifyEdge setInAngle:[modifyEdge inAngle] + + (bnd - [modifyEdge outAngle])]; + } else { + [modifyEdge setInAngle:[modifyEdge inAngle] - + (bnd - [modifyEdge outAngle])]; + } + } + + [modifyEdge setOutAngle:bnd]; + } else { + if (theEvent.modifierFlags & NSAlternateKeyMask) { + if ([modifyEdge isSelfLoop]) { + [modifyEdge setOutAngle:[modifyEdge outAngle] + + (bnd - [modifyEdge inAngle])]; + } else { + [modifyEdge setOutAngle:[modifyEdge outAngle] - + (bnd - [modifyEdge inAngle])]; + } + } + + [modifyEdge setInAngle:bnd]; + } + } + + [self refreshLayers]; + } else if (mouseMode == NodeMode) { + // do nothing... + } else if (mouseMode == EdgeDragMode) { + for (Node *n in [graph nodes]) { + if ([self node:n containsPoint:dragOrigin] || + [self node:n containsPoint:dragTarget]) + { + [[[nodeLayers objectForKey:n] selection] highlight]; + } else { + [[[nodeLayers objectForKey:n] selection] unhighlight]; + } + } + + [self refreshLayers]; + } else if (mouseMode == CropMode || mouseMode == CropDragMode) { + NSPoint p1 = [transformer fromScreen:[grid snapScreenPoint:dragOrigin]]; + NSPoint p2 = [transformer fromScreen:[grid snapScreenPoint:dragTarget]]; + + NSRect bbox; + if (mouseMode == CropDragMode) { + bbox = [graph boundingBox]; + if (bboxBottomTop == -1) { + float dy = p2.y - bbox.origin.y; + bbox.origin.y += dy; + bbox.size.height -= dy; + } else if (bboxBottomTop == 1) { + float dy = p2.y - (bbox.origin.y + bbox.size.height); + bbox.size.height += dy; + } + + if (bboxLeftRight == -1) { + float dx = p2.x - bbox.origin.x; + bbox.origin.x += dx; + bbox.size.width -= dx; + } else if (bboxLeftRight == 1) { + float dx = p2.x - (bbox.origin.x + bbox.size.width); + bbox.size.width += dx; + } + } else { + bbox = NSRectAroundPoints(p1, p2); + } + + [graph setBoundingBox:bbox]; + [self postGraphChange]; + [self refreshLayers]; + } else { + printf("WARNING: MOUSE DRAGGED IN INVALID MODE.\n"); + } +} + +- (void)mouseUp:(NSEvent*)theEvent { + if (!enabled) return; + + if (frameMoveMode) { + [CATransaction begin]; + [CATransaction setValue:(id)kCFBooleanTrue forKey:kCATransactionDisableActions]; + [self resetMainOrigin]; + [self refreshLayers]; + [CATransaction commit]; + frameMoveMode = NO; + return; + } + + dragTarget = [self convertPoint:[theEvent locationInWindow] fromView:nil]; + + if ((mouseMode & SelectMode) == SelectMode && [theEvent clickCount] == 2) { + for (Edge *e in [graph edges]) { + if ([self edge:e containsPoint:dragTarget]) { + if ([e bendMode] == EdgeBendModeBasic) { + [e convertBendToAngles]; + [e setBendMode:EdgeBendModeInOut]; + } else { + [e convertAnglesToBend]; + [e setBendMode:EdgeBendModeBasic]; + } + + [self registerUndo:graphTikzOnMouseDown withActionName:@"Change Edge Mode"]; + [self postGraphChange]; + break; + } + } + } + + if (mouseMode == SelectBoxMode) { + for (Node* n in [graph nodes]) { + if (NSPointInRect([transformer toScreen:[n point]], [selectionLayer selectBox])) { + [pickSupport selectNode:n]; + [[[nodeLayers objectForKey:n] selection] select]; + } else if (!([theEvent modifierFlags] & NSShiftKeyMask)) { + [pickSupport deselectNode:n]; + [[[nodeLayers objectForKey:n] selection] deselect]; + } + } + + [selectionLayer setActive:NO]; + [selectionLayer setNeedsDisplay]; + [self postSelectionChange]; + + mouseMode = SelectMode; + } else if (mouseMode == SelectMoveMode) { + [gridLayer setOpacity:0.3f]; + + if (dragTarget.x != dragOrigin.x || dragTarget.y != dragOrigin.y) { + [self registerUndo:graphTikzOnMouseDown withActionName:@"Shift Nodes"]; + } + + leaderNode = nil; + + [self postGraphChange]; + mouseMode = SelectMode; + } else if (mouseMode == SelectEdgeBendMode) { + [self registerUndo:graphTikzOnMouseDown withActionName:@"Adjust Edge"]; + [self postGraphChange]; + mouseMode = SelectMode; + modifyEdge = nil; + } else if (mouseMode == NodeMode) { + NSPoint coords = [transformer fromScreen:[grid snapScreenPoint:dragTarget]]; + Node *n = [Node nodeWithPoint:coords]; + [n setStyle:[stylePaletteController activeNodeStyle]]; + [graph addNode:n]; + + [self registerUndo:graphTikzOnMouseDown withActionName:@"Add Node"]; + + [self addNodeLayers:n]; + [self postGraphChange]; + } else if (mouseMode == EdgeDragMode) { + Node *src = nil; + Node *targ = nil; + BOOL found = NO; // don't break the loop until everything is unhighlighted + for (Node *n in [graph nodes]) { + [[[nodeLayers objectForKey:n] selection] unhighlight]; + if (!found) { + if ([self node:n containsPoint:dragOrigin]) src = n; + if ([self node:n containsPoint:dragTarget]) targ = n; + if (src != nil && targ != nil) { + Edge *e = [Edge edgeWithSource:src andTarget:targ]; + [e setStyle:[stylePaletteController activeEdgeStyle]]; + [graph addEdge:e]; + [self registerUndo:graphTikzOnMouseDown withActionName:@"Add Edge"]; + [self addEdgeLayers:e]; + found = YES; + } + } + } + + [self postGraphChange]; + mouseMode = EdgeMode; + } else if (mouseMode == CropMode || mouseMode == CropDragMode) { + if (dragOrigin.x == dragTarget.x && dragOrigin.y == dragTarget.y) { + [graph setBoundingBox:NSMakeRect(0, 0, 0, 0)]; + [self registerUndo:graphTikzOnMouseDown withActionName:@"Clear Bounding Box"]; + [self postGraphChange]; + } else { + [self registerUndo:graphTikzOnMouseDown withActionName:@"Change Bounding Box"]; + } + + mouseMode = CropMode; + } else { + if (! ([theEvent modifierFlags] & NSCommandKeyMask)) + printf("WARNING: MOUSE UP IN INVALID MODE.\n"); + } + + [self refreshLayers]; +} + +- (void)drawNode:(Node*)nd onLayer:(CALayer*)layer inContext:(CGContextRef)context { + NSPoint pt = [transformer toScreen:[nd point]]; + + NodeLayer *nl = [nodeLayers objectForKey:nd]; + //[nl setStrokeWidth:2.0f]; + [nl setCenter:pt andAnimateWhen:(mouseMode != SelectMoveMode)]; +} + +- (void)drawEdge:(Edge*)e onLayer:(CALayer*)layer inContext:(CGContextRef)context { + CGContextSaveGState(context); + NSPoint src = [transformer toScreen:[e tail]]; + NSPoint targ = [transformer toScreen:[e head]]; + NSPoint cp1 = [transformer toScreen:[e cp1]]; + NSPoint cp2 = [transformer toScreen:[e cp2]]; + + // all nodes have the same radius. this will need to be fixed + float sradius = 0;//(slayer.ghost) ? 0 : slayer.radius; + float tradius = 0;//(tlayer.ghost) ? 0 : tlayer.radius; + + float sdx = cp1.x - src.x; + float sdy = cp1.y - src.y; + float sdist = sqrt(sdx*sdx + sdy*sdy); + float sshortx = (sdist==0) ? 0 : sdx/sdist * sradius; + float sshorty = (sdist==0) ? 0 : sdy/sdist * sradius; + + float tdx = cp2.x - targ.x; + float tdy = cp2.y - targ.y; + float tdist = sqrt(tdx*tdx + tdy*tdy); + float tshortx = (tdist==0) ? 0 : tdx/tdist * tradius; + float tshorty = (tdist==0) ? 0 : tdy/tdist * tradius; + + CGContextMoveToPoint(context, src.x+sshortx, src.y+sshorty); + CGContextAddCurveToPoint(context, cp1.x, cp1.y, cp2.x, cp2.y, targ.x+tshortx, targ.y+tshorty); + + + float lineWidth = [transformer scaleToScreen:0.04f]; + + CGContextSetLineWidth(context, lineWidth); + CGContextSetRGBStrokeColor(context, 0, 0, 0, 1); + CGContextSetRGBFillColor(context, 0, 0, 0, 1); + CGContextStrokePath(context); + + if ([e style] != nil) { + NSPoint p1,p2,p3; + + // draw edge decoration + switch ([[e style] decorationStyle]) { + case ED_None: + break; + case ED_Tick: + p1 = [transformer toScreen:[e leftNormal]]; + p2 = [transformer toScreen:[e rightNormal]]; + CGContextMoveToPoint(context, p1.x, p1.y); + CGContextAddLineToPoint(context, p2.x, p2.y); + CGContextStrokePath(context); + break; + case ED_Arrow: + p1 = [transformer toScreen:[e leftNormal]]; + p2 = [transformer toScreen:[e midTan]]; + p3 = [transformer toScreen:[e rightNormal]]; + CGContextMoveToPoint(context, p1.x, p1.y); + CGContextAddLineToPoint(context, p2.x, p2.y); + CGContextAddLineToPoint(context, p3.x, p3.y); + CGContextStrokePath(context); + break; + } + + // draw arrow head + switch ([[e style] headStyle]) { + case AH_None: + break; + case AH_Plain: + p1 = [transformer toScreen:[e leftHeadNormal]]; + p2 = [transformer toScreen:[e head]]; + p3 = [transformer toScreen:[e rightHeadNormal]]; + CGContextMoveToPoint(context, p1.x, p1.y); + CGContextAddLineToPoint(context, p2.x, p2.y); + CGContextAddLineToPoint(context, p3.x, p3.y); + CGContextStrokePath(context); + break; + case AH_Latex: + p1 = [transformer toScreen:[e leftHeadNormal]]; + p2 = [transformer toScreen:[e head]]; + p3 = [transformer toScreen:[e rightHeadNormal]]; + CGContextMoveToPoint(context, p1.x, p1.y); + CGContextAddLineToPoint(context, p2.x, p2.y); + CGContextAddLineToPoint(context, p3.x, p3.y); + CGContextClosePath(context); + CGContextFillPath(context); + break; + } + + // draw arrow tail + switch ([[e style] tailStyle]) { + case AH_None: + break; + case AH_Plain: + p1 = [transformer toScreen:[e leftTailNormal]]; + p2 = [transformer toScreen:[e tail]]; + p3 = [transformer toScreen:[e rightTailNormal]]; + CGContextMoveToPoint(context, p1.x, p1.y); + CGContextAddLineToPoint(context, p2.x, p2.y); + CGContextAddLineToPoint(context, p3.x, p3.y); + CGContextStrokePath(context); + break; + case AH_Latex: + p1 = [transformer toScreen:[e leftTailNormal]]; + p2 = [transformer toScreen:[e tail]]; + p3 = [transformer toScreen:[e rightTailNormal]]; + CGContextMoveToPoint(context, p1.x, p1.y); + CGContextAddLineToPoint(context, p2.x, p2.y); + CGContextAddLineToPoint(context, p3.x, p3.y); + CGContextClosePath(context); + CGContextFillPath(context); + break; + } + } + + + CGContextRestoreGState(context); + + if ([e hasEdgeNode]) { + Node *en = [e edgeNode]; + NSPoint mid = [transformer toScreen:[e mid]]; + if (![[en label] isEqual:@""]) { + [layer drawLabel:[en label] + atPoint:mid + inContext:context + usingTrans:transformer]; + } + } + + EdgeControlLayer *ecl = [edgeControlLayers objectForKey:e]; + [ecl setNeedsDisplay]; +} + + +// draw the graph layer +-(void)drawLayer:(CALayer *)layer inContext:(CGContextRef)context { + for (Edge* e in [graph edges]) [self drawEdge:e onLayer:layer inContext:context]; + + for (Node* n in [graph nodes]) [self drawNode:n onLayer:layer inContext:context]; + + if ([graph hasBoundingBox]) { + CGRect bbox = NSRectToCGRect(NSIntegralRect( + [transformer rectToScreen:[graph boundingBox]])); + CGContextSetRGBStrokeColor(context, 1.0f, 0.7f, 0.5f, 1.0f); + CGContextSetLineWidth(context, 1.0f); + CGContextSetShouldAntialias(context, NO); + CGContextStrokeRect(context, bbox); + CGContextSetShouldAntialias(context, YES); + } + + if (mouseMode == EdgeDragMode) { + CGContextMoveToPoint(context, dragOrigin.x, dragOrigin.y); + CGContextAddLineToPoint(context, dragTarget.x, dragTarget.y); + CGContextSetLineWidth(context, 2); + CGContextSetRGBStrokeColor(context, 0, 0, 1, 1); + CGContextStrokePath(context); + } +} + +// if enabled, suppress the default "bonk" behaviour on key presses +- (void)keyDown:(NSEvent *)theEvent { + if (!enabled) [super keyDown:theEvent]; +} + +- (void)delete:(id)sender { + BOOL didDelete = NO; + NSString *oldTikz = [graph tikz]; + + if ([[pickSupport selectedNodes] count] != 0) { + GraphChange *change = [graph removeNodes:[pickSupport selectedNodes]]; + for (Node *n in [change affectedNodes]) [self removeNodeLayers:n]; + for (Edge *e in [change affectedEdges]) [self removeEdgeLayers:e]; + + [self refreshLayers]; + [self postGraphChange]; + didDelete = YES; + } + + if ([[pickSupport selectedEdges] count] != 0) { + [graph removeEdges:[pickSupport selectedEdges]]; + for (Edge *e in [pickSupport selectedEdges]) [self removeEdgeLayers:e]; + [self refreshLayers]; + [self postGraphChange]; + didDelete = YES; + } + + [pickSupport deselectAllNodes]; + [pickSupport deselectAllEdges]; + + if (didDelete) [self registerUndo:oldTikz withActionName:@"Delete Nodes or Edges"]; +} + +- (void)keyUp:(NSEvent *)theEvent { + if (!enabled) return; + + id sender = self; + switch ([theEvent keyCode]) { + case 51: // delete + [self delete:sender]; // "self" is the sender + break; + case 1: // S + [toolPaletteController setSelectedTool:TikzToolSelect]; + break; + case 45: // N + case 9: // V + [toolPaletteController setSelectedTool:TikzToolNode]; + break; + case 14: // E + [toolPaletteController setSelectedTool:TikzToolEdge]; + //[self updateMouseMode]; + break; + case 40: // K + [toolPaletteController setSelectedTool:TikzToolCrop]; + break; + } + [self refreshLayers]; +} + + +- (void)deselectAll:(id)sender { + [pickSupport deselectAllNodes]; + [pickSupport deselectAllEdges]; + + for (Node *n in [graph nodes]) { + [[[nodeLayers objectForKey:n] selection] deselect]; + } + + for (Edge *e in [graph edges]) { + [[edgeControlLayers objectForKey:e] deselect]; + } + + [self postSelectionChange]; +} + +- (void)selectAll:(id)sender { + [pickSupport selectAllNodes:[NSSet setWithArray:[graph nodes]]]; + + for (Node *n in [graph nodes]) { + [[[nodeLayers objectForKey:n] selection] select]; + } + + [self postSelectionChange]; +} + + +- (void)updateMouseMode { + switch (toolPaletteController.selectedTool) { + case TikzToolSelect: + mouseMode = SelectMode; + break; + case TikzToolNode: + mouseMode = NodeMode; + break; + case TikzToolEdge: + mouseMode = EdgeMode; + break; + case TikzToolCrop: + mouseMode = CropMode; + break; + } +} + +- (void)setDocumentUndoManager:(NSUndoManager *)um { + documentUndoManager = um; +} + +- (void)copy:(id)sender { + if ([[pickSupport selectedNodes] count] != 0) { + Graph *clip = [graph copyOfSubgraphWithNodes:[pickSupport selectedNodes]]; + NSString *tikz = [clip tikz]; + NSData *data = [tikz dataUsingEncoding:NSUTF8StringEncoding]; + //NSLog(@"about to copy: %@", tikz); + NSPasteboard *cb = [NSPasteboard generalPasteboard]; + [cb declareTypes:[NSArray arrayWithObject:@"tikzpicture"] owner:self]; + [cb setData:data forType:@"tikzpicture"]; + } +} + +- (void)cut:(id)sender { + if ([[pickSupport selectedNodes] count] != 0) { + [self copy:sender]; + [self delete:sender]; + + // otherwise, menu will say "Undo Delete Graph" + [documentUndoManager setActionName:@"Cut Graph"]; + } +} + +- (void)paste:(id)sender { + NSPasteboard *cb = [NSPasteboard generalPasteboard]; + NSString *type = [cb availableTypeFromArray:[NSArray arrayWithObject:@"tikzpicture"]]; + if (type) { + NSData *data = [cb dataForType:type]; + NSString *tikz = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]; + //NSLog(@"pasting tikz:\n%@",tikz); + Graph *clip = [TikzGraphAssembler parseTikz:tikz]; + if (clip) { + //NSLog(@"tikz pasted:\n%@",tikz); + NSRect graphBounds = [graph bounds]; + NSRect clipBounds = [clip bounds]; + float dx = graphBounds.origin.x + + graphBounds.size.width - + clipBounds.origin.x + 0.5f; + [clip shiftNodes:[clip nodes] byPoint:NSMakePoint(dx, 0)]; + + if ([[clip nodes] count] != 0) { + NSString *oldTikz = [graph tikz]; + [self deselectAll:self]; + + // select everything from the clipboard + for (Node *n in [clip nodes]) { + [n attachStyleFromTable:[stylePaletteController nodeStyles]]; + [self addNodeLayers:n]; + [pickSupport selectNode:n]; + [[[nodeLayers objectForKey:n] selection] select]; + } + + for (Edge *e in [clip edges]) { + [e attachStyleFromTable:[stylePaletteController edgeStyles]]; + [self addEdgeLayers:e]; + } + + [graph insertGraph:clip]; + + [self registerUndo:oldTikz withActionName:@"Paste Graph"]; + [self refreshLayers]; + [self postGraphChange]; + } + } else { + NSLog(@"Error: couldn't parse tikz picture from clipboard."); + } + + } +} + +- (void)bringForward:(id)sender { + NSString *oldTikz = [graph tikz]; + [graph bringNodesForward:[pickSupport selectedNodes]]; + [graph bringEdgesForward:[pickSupport selectedEdges]]; + [self registerUndo:oldTikz withActionName:@"Bring Forward"]; + [self postGraphChange]; + [self refreshLayers]; +} + +- (void)sendBackward:(id)sender { + NSString *oldTikz = [graph tikz]; + [graph sendNodesBackward:[pickSupport selectedNodes]]; + [graph sendEdgesBackward:[pickSupport selectedEdges]]; + [self registerUndo:oldTikz withActionName:@"Send Backward"]; + [self postGraphChange]; + [self refreshLayers]; +} + +- (void)bringToFront:(id)sender { + NSString *oldTikz = [graph tikz]; + [graph bringNodesToFront:[pickSupport selectedNodes]]; + [graph bringEdgesToFront:[pickSupport selectedEdges]]; + [self registerUndo:oldTikz withActionName:@"Bring to Front"]; + [self postGraphChange]; + [self refreshLayers]; +} + +- (void)sendToBack:(id)sender { + NSString *oldTikz = [graph tikz]; + [graph sendNodesToBack:[pickSupport selectedNodes]]; + [graph sendEdgesToBack:[pickSupport selectedEdges]]; + [self registerUndo:oldTikz withActionName:@"Send to Back"]; + [self postGraphChange]; + [self refreshLayers]; +} + +- (void)flipHorizonal:(id)sender { + NSString *oldTikz = [graph tikz]; + [graph flipHorizontalNodes:[pickSupport selectedNodes]]; + [self registerUndo:oldTikz withActionName:@"Flip Horizontal"]; + [self postGraphChange]; + [self refreshLayers]; +} + +- (void)flipVertical:(id)sender { + NSString *oldTikz = [graph tikz]; + [graph flipVerticalNodes:[pickSupport selectedNodes]]; + [self registerUndo:oldTikz withActionName:@"Flip Vertical"]; + [self postGraphChange]; + [self refreshLayers]; +} + +- (void)reverseEdgeDirection:(id)sender { + NSString *oldTikz = [graph tikz]; + + NSSet *es; + if ([[pickSupport selectedEdges] count] != 0) { + es = [pickSupport selectedEdges]; + } else { + es = [graph incidentEdgesForNodes:[pickSupport selectedNodes]]; + } + + for (Edge *e in es) [e reverse]; + + [self registerUndo:oldTikz withActionName:@"Flip Edge Direction"]; + [self postGraphChange]; + [self refreshLayers]; +} + +- (BOOL)acceptsFirstResponder { return YES; } +- (BOOL)acceptsFirstMouse:(NSEvent *)theEvent { return YES; } +- (BOOL)canBecomeKeyView { return YES; } + + +@end diff --git a/tikzit-1/src/osx/Grid.h b/tikzit-1/src/osx/Grid.h new file mode 100644 index 0000000..76826e2 --- /dev/null +++ b/tikzit-1/src/osx/Grid.h @@ -0,0 +1,48 @@ +// +// Grid.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import "Transformer.h" + +@interface Grid : NSObject { + float gridX, gridY; + //float gridCellX, gridCellY; + int subdivisions; + Transformer *transformer; + NSSize size; +} + +@property NSSize size; + +- (id)initWithSpacing:(float)spacing subdivisions:(int)subs transformer:(Transformer*)t; ++ (Grid*)gridWithSpacing:(float)spacing subdivisions:(int)subs transformer:(Transformer*)t; +- (NSPoint)snapScreenPoint:(NSPoint)p; +- (float)gridX; +- (float)gridY; +- (int)subdivisions; +- (void)setSubdivisions:(int)subs; + +// Grid can also draw itself on a layer +- (void)drawLayer:(CALayer *)layer inContext:(CGContextRef)ctx; + +@end diff --git a/tikzit-1/src/osx/Grid.m b/tikzit-1/src/osx/Grid.m new file mode 100644 index 0000000..aa35c1f --- /dev/null +++ b/tikzit-1/src/osx/Grid.m @@ -0,0 +1,152 @@ +// +// Grid.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "Grid.h" + + +@implementation Grid + +@synthesize size; + +- (id)initWithSpacing:(float)spacing + subdivisions:(int)subs + transformer:(Transformer*)t +{ + if (!(self = [super init])) return nil; + gridX = spacing; + gridY = spacing; + subdivisions = subs; + size.width = 0; + size.height = 0; + transformer = t; + return self; +} + ++ (Grid*)gridWithSpacing:(float)spacing + subdivisions:(int)subs + transformer:(Transformer*)t +{ + return [[Grid alloc] initWithSpacing:spacing + subdivisions:subs + transformer:t]; +} + +- (float)gridX { + return gridX; +} + +- (float)gridY { + return gridY; +} + +- (int)subdivisions { + return subdivisions; +} + +- (void)setSubdivisions:(int)subs { + subdivisions = subs; +} + +- (NSPoint)snapScreenPoint:(NSPoint)p { + NSPoint snap; + + float gridCellX = [transformer scaleToScreen:gridX] / (float)subdivisions; + float gridCellY = [transformer scaleToScreen:gridY] / (float)subdivisions; + + // snap along grid lines, relative to the origin + snap.x = floor(((p.x-[transformer origin].x)/gridCellX)+0.5)*gridCellX + [transformer origin].x; + snap.y = floor(((p.y-[transformer origin].y)/gridCellY)+0.5)*gridCellY + [transformer origin].y; + return snap; +} + +-(void)drawLayer:(CALayer *)layer inContext:(CGContextRef)context +{ + CGContextSaveGState(context); + + CGContextSetShouldAntialias(context, NO); + + float x,y; + float grX = [transformer scaleToScreen:gridX]; + float grY = [transformer scaleToScreen:gridY]; + + float gridCellX = grX / (float)subdivisions; + float gridCellY = grY / (float)subdivisions; + + for (x = [transformer origin].x + gridCellX; x < size.width; x += gridCellX) { + CGContextMoveToPoint(context, x, 0); + CGContextAddLineToPoint(context, x, size.height); + } + + for (x = [transformer origin].x - gridCellX; x > 0; x -= gridCellX) { + CGContextMoveToPoint(context, x, 0); + CGContextAddLineToPoint(context, x, size.height); + } + + for (y = [transformer origin].y + gridCellY; y < size.height; y += gridCellY) { + CGContextMoveToPoint(context, 0, y); + CGContextAddLineToPoint(context, size.width, y); + } + + for (y = [transformer origin].y - gridCellY; y > 0; y -= gridCellY) { + CGContextMoveToPoint(context, 0, y); + CGContextAddLineToPoint(context, size.width, y); + } + + CGContextSetRGBStrokeColor(context, 0.9, 0.9, 1, 1); + CGContextStrokePath(context); + + for (x = [transformer origin].x + grX; x < size.width; x += grX) { + CGContextMoveToPoint(context, x, 0); + CGContextAddLineToPoint(context, x, size.height); + } + + for (x = [transformer origin].x - grX; x > 0; x -= grX) { + CGContextMoveToPoint(context, x, 0); + CGContextAddLineToPoint(context, x, size.height); + } + + for (y = [transformer origin].y + grY; y < size.height; y += grY) { + CGContextMoveToPoint(context, 0, y); + CGContextAddLineToPoint(context, size.width, y); + } + + for (y = [transformer origin].y + grY; y > 0; y -= grY) { + CGContextMoveToPoint(context, 0, y); + CGContextAddLineToPoint(context, size.width, y); + } + + CGContextSetRGBStrokeColor(context, 0.8, 0.8, 0.9, 1); + CGContextStrokePath(context); + + CGContextMoveToPoint(context, [transformer origin].x, 0); + CGContextAddLineToPoint(context, [transformer origin].x, size.height); + CGContextMoveToPoint(context, 0, [transformer origin].y); + CGContextAddLineToPoint(context, size.width, [transformer origin].y); + + CGContextSetRGBStrokeColor(context, 0.6, 0.6, 0.7, 1); + CGContextStrokePath(context); + + CGContextRestoreGState(context); +} + +@end diff --git a/tikzit-1/src/osx/MultiCombo.h b/tikzit-1/src/osx/MultiCombo.h new file mode 100644 index 0000000..c8ec769 --- /dev/null +++ b/tikzit-1/src/osx/MultiCombo.h @@ -0,0 +1,18 @@ +// +// MultiCombo.h +// TikZiT +// +// Created by Aleks Kissinger on 21/04/2011. +// Copyright 2011 __MyCompanyName__. All rights reserved. +// + +#import + + +@interface MultiCombo : NSComboBox { + BOOL multi; +} + +@property (readwrite,assign) BOOL multi; + +@end diff --git a/tikzit-1/src/osx/MultiCombo.m b/tikzit-1/src/osx/MultiCombo.m new file mode 100644 index 0000000..8930460 --- /dev/null +++ b/tikzit-1/src/osx/MultiCombo.m @@ -0,0 +1,38 @@ +// +// MultiCombo.m +// TikZiT +// +// Created by Aleks Kissinger on 21/04/2011. +// Copyright 2011 __MyCompanyName__. All rights reserved. +// + +#import "MultiCombo.h" + + +@implementation MultiCombo + +- (void)textDidChange:(NSNotification *)notification { + [super textDidChange:notification]; + [self setMulti:NO]; +} + +- (void)setMulti:(BOOL)m { + multi = m; + if (multi) { + [self setTextColor:[NSColor grayColor]]; + [self setStringValue:@"multiple values"]; + } +} + +- (BOOL)multi { return multi; } + +- (BOOL)becomeFirstResponder { + [super becomeFirstResponder]; + if ([self multi]) { + [self setTextColor:[NSColor blackColor]]; + [self setStringValue:@""]; + } + return YES; +} + +@end diff --git a/tikzit-1/src/osx/MultiField.h b/tikzit-1/src/osx/MultiField.h new file mode 100644 index 0000000..39eeefa --- /dev/null +++ b/tikzit-1/src/osx/MultiField.h @@ -0,0 +1,18 @@ +// +// LabelField.h +// TikZiT +// +// Created by Aleks Kissinger on 20/04/2011. +// Copyright 2011 __MyCompanyName__. All rights reserved. +// + +#import + + +@interface MultiField : NSTextField { + BOOL multi; +} + +@property (readwrite,assign) BOOL multi; + +@end diff --git a/tikzit-1/src/osx/MultiField.m b/tikzit-1/src/osx/MultiField.m new file mode 100644 index 0000000..7c5aac3 --- /dev/null +++ b/tikzit-1/src/osx/MultiField.m @@ -0,0 +1,53 @@ +// +// LabelField.m +// TikZiT +// +// Created by Aleks Kissinger on 20/04/2011. +// Copyright 2011 __MyCompanyName__. All rights reserved. +// + +#import "MultiField.h" + + +@implementation MultiField + +- (void)textDidChange:(NSNotification *)notification { + [super textDidChange:notification]; + [self setMulti:NO]; +} + +- (void)setMulti:(BOOL)m { + multi = m; + if (multi) { + [self setTextColor:[NSColor grayColor]]; + [self setStringValue:@"multiple values"]; + } +} + +- (BOOL)multi { return multi; } + +- (BOOL)becomeFirstResponder { + [super becomeFirstResponder]; + if ([self multi]) { + [self setTextColor:[NSColor blackColor]]; + [self setStringValue:@""]; + } + return YES; +} + +//- (BOOL)textShouldBeginEditing:(NSText *)textObject { +// [super textShouldBeginEditing:textObject]; +// NSLog(@"about to type"); +// return YES; +//} + +//- (void)textDidEndEditing:(NSNotification *)obj { +// [super textDidEndEditing:obj]; +// +// NSLog(@"focus lost"); +// if ([self multi]) { +// [self setMulti:YES]; +// } +//} + +@end diff --git a/tikzit-1/src/osx/NilToEmptyStringTransformer.h b/tikzit-1/src/osx/NilToEmptyStringTransformer.h new file mode 100644 index 0000000..1445a94 --- /dev/null +++ b/tikzit-1/src/osx/NilToEmptyStringTransformer.h @@ -0,0 +1,28 @@ +// +// NilToEmptyStringTransformer.h +// TikZiT +// +// Copyright 2011 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import + +@interface NilToEmptyStringTransformer : NSValueTransformer + +@end diff --git a/tikzit-1/src/osx/NilToEmptyStringTransformer.m b/tikzit-1/src/osx/NilToEmptyStringTransformer.m new file mode 100644 index 0000000..413f404 --- /dev/null +++ b/tikzit-1/src/osx/NilToEmptyStringTransformer.m @@ -0,0 +1,53 @@ +// +// NilToEmptyStringTransformer.m +// TikZiT +// +// Copyright 2011 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "NilToEmptyStringTransformer.h" + +@implementation NilToEmptyStringTransformer + +- (id)init { + if (!(self = [super init])) return nil; + return self; +} + ++ (Class)transformedValueClass { + return [NSString class]; +} + ++ (BOOL)allowsReverseTransformation { + return YES; +} + +- (id)transformedValue:(id)value { + if (value == nil) { + return @""; + } else { + return value; + } +} + +- (id)reverseTransformedValue:(id)value { + return [self transformedValue:value]; +} + +@end diff --git a/tikzit-1/src/osx/NodeLayer.h b/tikzit-1/src/osx/NodeLayer.h new file mode 100644 index 0000000..dbcdac5 --- /dev/null +++ b/tikzit-1/src/osx/NodeLayer.h @@ -0,0 +1,62 @@ +// +// NodeLayer.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import +#import "Transformer.h" +#import "Shape.h" +#import "Node.h" +#import "NodeStyle+Coder.h" +#import "NodeSelectionLayer.h" + +@interface NodeLayer : CALayer { + Node *node; + Shape *shape; + CGMutablePathRef path; + float textwidth; + NSPoint center; + Transformer *transformer; + Transformer *localTrans; + NodeSelectionLayer *selection; + BOOL rescale; + BOOL dirty; // need to rebuild CGBezierPath of the shape +} + +@property (strong) Node *node; +@property (assign) NSPoint center; +@property (assign) BOOL rescale; +@property (strong) NodeSelectionLayer *selection; +@property (readonly) CGMutablePathRef path; + +- (id)initWithNode:(Node*)n transformer:(Transformer*)t; +- (NSColor*)strokeColor; +- (NSColor*)fillColor; +- (float)strokeWidth; + +- (void)setCenter:(NSPoint)ctr andAnimateWhen:(BOOL)anim; +- (void)updateFrame; +- (BOOL)nodeContainsPoint:(NSPoint)p; + +- (void)drawInContext:(CGContextRef)context; + +@end diff --git a/tikzit-1/src/osx/NodeLayer.m b/tikzit-1/src/osx/NodeLayer.m new file mode 100644 index 0000000..5d15585 --- /dev/null +++ b/tikzit-1/src/osx/NodeLayer.m @@ -0,0 +1,238 @@ +// +// NodeLayer.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "NodeLayer.h" +#import "CALayer+DrawLabel.h" +#import "NSString+LatexConstants.h" +#import "Shape.h" +#import "ShapeNames.h" +#import "Node.h" +#import "Edge.h" + +@implementation NodeLayer + +@synthesize node, selection, rescale; + +- (id)initWithNode:(Node *)n transformer:(Transformer*)t { + if (!(self = [super init])) return nil; + node = n; + selection = [[NodeSelectionLayer alloc] init]; + [selection setNodeLayer:self]; + localTrans = [[Transformer alloc] init]; + + [self addSublayer:selection]; + textwidth = 0.0f; + center = NSMakePoint(0.0f, 0.0f); + transformer = t; + + path = NULL; + rescale = YES; + dirty = YES; + + [self updateFrame]; + return self; +} + +- (NSColor*)strokeColor { + if ([node style] != nil) { + return [[[node style] strokeColor] colorUsingColorSpace:[NSColorSpace deviceRGBColorSpace]]; + } else { + return nil; + } +} + +- (NSColor*)fillColor { + if ([node style] != nil) { + return [[[node style] fillColor] colorUsingColorSpace:[NSColorSpace deviceRGBColorSpace]]; + } else { + return nil; + } +} + +- (float)strokeWidth { + if ([node style] != nil) { + return [node.style strokeThickness]; + } else { + return [NodeStyle defaultStrokeThickness]; + } +} + +- (NSPoint)center { return center; } + +- (void)setCenter:(NSPoint)ctr { + center.x = round(ctr.x); + center.y = round(ctr.y); + [self updateFrame]; +} + +- (void)setCenter:(NSPoint)ctr andAnimateWhen:(BOOL)anim { + [CATransaction begin]; + if (!anim) { + [CATransaction setValue:(id)kCFBooleanTrue forKey:kCATransactionDisableActions]; + } + [self setCenter:ctr]; + [CATransaction commit]; +} + +- (void)updateShape { + Shape *s = ([node style] != nil) ? + [Shape shapeForName:[[node style] shapeName]] : + [Shape shapeForName:SHAPE_CIRCLE]; + if (s != shape) { // straight pointer comparison + shape = s; + dirty = YES; + } +} + +- (void)updateLocalTrans { + float scale = ([node style] != nil) ? [[node style] scale] : 1.0f; + + Transformer *t = [Transformer transformer]; + float rad = ([transformer scaleToScreen:scale] / 2.0f) + 8.0f; + [t setOrigin:NSMakePoint(rad, rad)]; + [t setScale:[transformer scale]*((rescale)?scale:0.8f)]; + + if (![localTrans isEqual:t]) { + dirty = YES; + localTrans = t; + } +} + +- (void)updateFrame { + [self updateLocalTrans]; + [self updateShape]; + float rad = [localTrans origin].x; + [self setFrame:CGRectIntegral(CGRectMake(center.x - rad, center.y - rad, 2*rad, 2*rad))]; + NSRect bds = NSMakeRect(0, 0, 2*rad, 2*rad); + [selection setFrame:NSRectToCGRect(bds)]; + + [self setNeedsDisplay]; + [selection setNeedsDisplay]; +} + +- (CGMutablePathRef)path { + if (dirty) { + CGMutablePathRef pth = CGPathCreateMutable(); + NSPoint p, cp1, cp2; + for (NSArray *arr in [shape paths]) { + BOOL fst = YES; + for (Edge *e in arr) { + if (fst) { + fst = NO; + p = [localTrans toScreen:[[e source] point]]; + CGPathMoveToPoint(pth, nil, p.x, p.y); + } + + p = [localTrans toScreen:[[e target] point]]; + if ([e isStraight]) { + CGPathAddLineToPoint(pth, nil, p.x, p.y); + } else { + cp1 = [localTrans toScreen:[e cp1]]; + cp2 = [localTrans toScreen:[e cp2]]; + CGPathAddCurveToPoint(pth, nil, cp1.x, cp1.y, cp2.x, cp2.y, p.x, p.y); + } + } + + CGPathCloseSubpath(pth); + } + + if (path != NULL) CFRelease(path); + path = pth; + dirty = NO; + } + + + return path; +} + +- (BOOL)nodeContainsPoint:(NSPoint)p { + CGPoint p1 = CGPointMake(p.x - [self frame].origin.x, p.y - [self frame].origin.y); + return CGPathContainsPoint([self path],nil,p1,NO); +} + + +- (void)drawInContext:(CGContextRef)context { + CGContextSaveGState(context); + + + if ([node style] == nil) { + CGContextSetRGBStrokeColor(context, 0.4f, 0.4f, 0.7f, 1.0f); + CGContextSetRGBFillColor(context, 0.4f, 0.4f, 0.7f, 1.0f); + //CGRect fr = [self frame]; + CGRect bds = NSRectToCGRect([localTrans rectToScreen:NSMakeRect(-0.5, -0.5, 1, 1)]); + CGRect pt = CGRectMake(CGRectGetMidX(bds)-1.0f, CGRectGetMidY(bds)-1.0f, 2.0f, 2.0f); + CGContextSetLineWidth(context, 0); + CGContextAddEllipseInRect(context, pt); + CGContextFillPath(context); + + // HACK: for some reason, CGFloat isn't getting typedef'ed properly + +#ifdef __x86_64__ + const double dash[2] = {2.0,2.0}; +#else + const float dash[2] = {2.0,2.0}; +#endif + CGContextSetLineDash(context, 0.0, dash, 2); + CGContextSetLineWidth(context, 1); + CGContextAddPath(context, [self path]); + CGContextStrokePath(context); + } else { + NSColor *stroke = [self strokeColor]; + NSColor *fill = [self fillColor]; + + CGContextSetRGBStrokeColor(context, + [stroke redComponent], + [stroke greenComponent], + [stroke blueComponent], + [stroke alphaComponent]); + + CGContextSetLineWidth(context, [self strokeWidth]); + + CGContextSetRGBFillColor(context, + [fill redComponent], + [fill greenComponent], + [fill blueComponent], + [fill alphaComponent]); + + + CGContextSetLineWidth(context, [self strokeWidth]); + CGContextAddPath(context, [self path]); + CGContextDrawPath(context, kCGPathFillStroke); + } + + if (!([node label] == nil || [[node label] isEqual:@""])) { + NSPoint labelPt = NSMakePoint([self frame].size.width/2, [self frame].size.height/2); + [self drawLabel:[[node label] stringByExpandingLatexConstants] + atPoint:labelPt + inContext:context + usingTrans:transformer]; + } + + CGContextRestoreGState(context); +} + +- (void)dealloc { + if (path != NULL) CFRelease(path); +} + +@end diff --git a/tikzit-1/src/osx/NodeSelectionLayer.h b/tikzit-1/src/osx/NodeSelectionLayer.h new file mode 100644 index 0000000..99ee75f --- /dev/null +++ b/tikzit-1/src/osx/NodeSelectionLayer.h @@ -0,0 +1,45 @@ +// +// NodeSelectionLayer.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import +#import "Shape.h" + +@class NodeLayer; + +@interface NodeSelectionLayer : CALayer { + BOOL selected; + CGMutablePathRef path; + NSLock *drawLock; + NodeLayer *nodeLayer; +} + +@property NodeLayer *nodeLayer; + +- (id)init; +- (void)select; +- (void)deselect; +- (void)highlight; +- (void)unhighlight; + +@end diff --git a/tikzit-1/src/osx/NodeSelectionLayer.m b/tikzit-1/src/osx/NodeSelectionLayer.m new file mode 100644 index 0000000..02b8ac2 --- /dev/null +++ b/tikzit-1/src/osx/NodeSelectionLayer.m @@ -0,0 +1,93 @@ +// +// NodeSelectionLayer.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "NodeSelectionLayer.h" +#import "NodeLayer.h" +#import "CircleShape.h" + +@implementation NodeSelectionLayer + +@synthesize nodeLayer; + +- (id)init { + if (!(self = [super init])) return nil; + selected = NO; + drawLock = [[NSLock alloc] init]; + nodeLayer = nil; + [self setOpacity:0.0f]; + return self; +} + + +- (void)select { + selected = YES; + [self setOpacity:0.5f]; +} + +- (void)deselect { + selected = NO; + [self setOpacity:0.0f]; +} + +- (void)highlight { + if (!selected) { + [self setOpacity:0.25f]; + } +} + +- (void)unhighlight { + if (!selected) { + [self setOpacity:0.0f]; + } +} + +//- (CGMutablePathRef)path { +// return path; +//} +// +//- (void)setPath:(CGMutablePathRef)p { +// path = CGPathCreateMutableCopy(p); +// CFMakeCollectable(path); +//} + +- (void)drawInContext:(CGContextRef)context { + [drawLock lock]; + CGContextSaveGState(context); + + //CGContextSetRGBStrokeColor(context, 0.61f, 0.735f, 1.0f, 1.0f); + CGContextSetRGBStrokeColor(context, 0.61f, 0.735f, 1.0f, 1.0f); + CGContextSetRGBFillColor(context, 0.61f, 0.735f, 1.0f, 1.0f); + CGContextSetLineWidth(context, 6.0f); + + if (nodeLayer != nil) { + CGContextAddPath(context, [nodeLayer path]); + } else { + NSLog(@"WARNING: attempting to draw selection with path = nil."); + } + CGContextDrawPath(context, kCGPathFillStroke); + + CGContextRestoreGState(context); + [drawLock unlock]; +} + +@end diff --git a/tikzit-1/src/osx/NodeStyle+Coder.h b/tikzit-1/src/osx/NodeStyle+Coder.h new file mode 100644 index 0000000..b6443af --- /dev/null +++ b/tikzit-1/src/osx/NodeStyle+Coder.h @@ -0,0 +1,36 @@ +// +// NodeStyle+Coder.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import "NodeStyle.h" + + +@interface NodeStyle(Coder) + +@property (copy) NSColor *fillColor; +@property (copy) NSColor *strokeColor; + +- (id)initWithCoder:(NSCoder *)coder; +- (void)encodeWithCoder:(NSCoder *)coder; + +@end diff --git a/tikzit-1/src/osx/NodeStyle+Coder.m b/tikzit-1/src/osx/NodeStyle+Coder.m new file mode 100644 index 0000000..d3623f5 --- /dev/null +++ b/tikzit-1/src/osx/NodeStyle+Coder.m @@ -0,0 +1,91 @@ +// +// NodeStyle+Coder.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "NodeStyle+Coder.h" +#import "ShapeNames.h" + +@implementation NodeStyle(Coder) + +- (NSColor*)fillColor { + return [NSColor colorWithDeviceRed:fillColorRGB.redFloat + green:fillColorRGB.greenFloat + blue:fillColorRGB.blueFloat + alpha:1.0f]; +} + +- (void)setFillColor:(NSColor*)c { + NSColor *c1 = [c colorUsingColorSpaceName:NSDeviceRGBColorSpace]; + [self willChangeValueForKey:@"fillColorIsKnown"]; + fillColorRGB = [ColorRGB colorWithFloatRed:c1.redComponent + green:c1.greenComponent + blue:c1.blueComponent]; + [self didChangeValueForKey:@"fillColorIsKnown"]; +} + +- (NSColor*)strokeColor { + return [NSColor colorWithDeviceRed:strokeColorRGB.redFloat + green:strokeColorRGB.greenFloat + blue:strokeColorRGB.blueFloat + alpha:1.0f]; +} + +- (void)setStrokeColor:(NSColor*)c { + NSColor *c1 = [c colorUsingColorSpaceName:NSDeviceRGBColorSpace]; + [self willChangeValueForKey:@"strokeColorIsKnown"]; + strokeColorRGB = [ColorRGB colorWithFloatRed:c1.redComponent + green:c1.greenComponent + blue:c1.blueComponent]; + [self didChangeValueForKey:@"strokeColorIsKnown"]; +} + +- (id)initWithCoder:(NSCoder *)coder { + if (!(self = [super init])) return nil; + + // decode keys + name = [coder decodeObjectForKey:@"name"]; + [self setStrokeColor:[coder decodeObjectForKey:@"strokeColor"]]; + [self setFillColor:[coder decodeObjectForKey:@"fillColor"]]; + strokeThickness = [coder decodeIntForKey:@"strokeThickness"]; + shapeName = [coder decodeObjectForKey:@"shapeName"]; + category = [coder decodeObjectForKey:@"category"]; + scale = [coder decodeFloatForKey:@"scale"]; + + // apply defaults + if (scale == 0.0f) scale = 1.0f; + if (shapeName == nil) shapeName = SHAPE_CIRCLE; + + return self; +} + +- (void)encodeWithCoder:(NSCoder *)coder { + [coder encodeObject:name forKey:@"name"]; + [coder encodeObject:[self strokeColor] forKey:@"strokeColor"]; + [coder encodeObject:[self fillColor] forKey:@"fillColor"]; + [coder encodeInt:strokeThickness forKey:@"strokeThickness"]; + [coder encodeObject:shapeName forKey:@"shapeName"]; + [coder encodeObject:category forKey:@"category"]; + [coder encodeFloat:scale forKey:@"scale"]; +} + + +@end diff --git a/tikzit-1/src/osx/ParseErrorView.h b/tikzit-1/src/osx/ParseErrorView.h new file mode 100644 index 0000000..bb6141f --- /dev/null +++ b/tikzit-1/src/osx/ParseErrorView.h @@ -0,0 +1,13 @@ +// +// ParseErrorView.h +// TikZiT +// +// Created by Karl Johan Paulsson on 27/01/2013. +// Copyright (c) 2013 Aleks Kissinger. All rights reserved. +// + +#import + +@interface ParseErrorView : NSView + +@end diff --git a/tikzit-1/src/osx/ParseErrorView.m b/tikzit-1/src/osx/ParseErrorView.m new file mode 100644 index 0000000..83383f0 --- /dev/null +++ b/tikzit-1/src/osx/ParseErrorView.m @@ -0,0 +1,40 @@ +// +// ParseErrorView.m +// TikZiT +// +// Created by Karl Johan Paulsson on 27/01/2013. +// Copyright (c) 2013 Aleks Kissinger. All rights reserved. +// + +#import "ParseErrorView.h" + +@implementation ParseErrorView + +- (id)initWithFrame:(NSRect)frame +{ + self = [super initWithFrame:frame]; + if (self) { + // Initialization code here. + } + + return self; +} + +- (void)drawRect:(NSRect)dirtyRect +{ + // Drawing code here. +} + +- (void)awakeFromNib{ + self.layer = [CALayer layer]; + self.wantsLayer = YES; + CALayer *newLayer = [CALayer layer]; + self.layer.backgroundColor = [[NSColor controlColor] CGColor]; + //CGColorCreate(CGColorSpaceCreateDeviceRGB(), (CGFloat[]){ 1, .9, .64, 1 }); +// newLayer.backgroundColor = [NSColor redColor].CGColor; + newLayer.frame = CGRectMake(100,100,100,100);//NSMakeRect(0,0,image.size.width,image.size.height); + newLayer.position = CGPointMake(20,20); + //[self.layer addSublayer:newLayer]; +} + +@end diff --git a/tikzit-1/src/osx/PreambleController.h b/tikzit-1/src/osx/PreambleController.h new file mode 100644 index 0000000..5b0931d --- /dev/null +++ b/tikzit-1/src/osx/PreambleController.h @@ -0,0 +1,57 @@ +// +// PreambleController.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import "Preambles.h" +#import "Preambles+Coder.h" + +@interface PreambleController : NSViewController { + Preambles *preambles; + IBOutlet NSTextView *textView; + IBOutlet NSDictionaryController *preambleDictionaryController; + + NSDictionary *textAttrs; + NSAttributedString *preambleText; + NSColor *ghostColor; + NSIndexSet *selectionIndexes; +} + +@property (readonly) BOOL useDefaultPreamble; +@property (readonly) Preambles *preambles; +@property (strong) NSAttributedString *preambleText; +@property (strong) NSIndexSet *selectionIndexes; + +- (id)initWithNibName:(NSString *)nibName plist:(NSString*)plist styles:(NSArray*)sty edges:(NSArray*)edg; +- (void)savePreambles:(NSString*)plist; +- (NSString*)currentPreamble; +- (NSString*)currentPostamble; +- (NSString*)buildDocumentForTikz:(NSString*)tikz; + +- (IBAction)setPreambleToDefault:(id)sender; +- (IBAction)setPreamble:(id)sender; +- (IBAction)insertDefaultStyles:(id)sender; + +- (IBAction)addPreamble:(id)sender; +- (IBAction)duplicatePreamble:(id)sender; + +@end diff --git a/tikzit-1/src/osx/PreambleController.m b/tikzit-1/src/osx/PreambleController.m new file mode 100644 index 0000000..206bb30 --- /dev/null +++ b/tikzit-1/src/osx/PreambleController.m @@ -0,0 +1,168 @@ +// +// PreambleController.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "PreambleController.h" + + +@implementation PreambleController + +@synthesize preambleText, preambles; + +- (id)initWithNibName:(NSString *)nibName plist:(NSString*)plist styles:(NSArray*)sty edges:(NSArray*)edg { + if (!(self = [super initWithNibName:nibName bundle:Nil])) return nil; + + preambles = (Preambles*)[NSKeyedUnarchiver unarchiveObjectWithFile:plist]; + [preambles setStyles:sty]; + [preambles setEdges:edg]; + if (preambles == nil) preambles = [[Preambles alloc] init]; + + preambleText = nil; + + NSFont *font = [NSFont userFixedPitchFontOfSize:11.0f]; + textAttrs = [NSDictionary dictionaryWithObject:font forKey:NSFontAttributeName]; + ghostColor = [NSColor colorWithDeviceRed:0.9f green:0.9f blue:0.9f alpha:1.0f]; + + + + return self; +} + +- (void)awakeFromNib { + NSArray *arr = [preambleDictionaryController arrangedObjects]; + NSString *current = [preambles selectedPreambleName]; + + if (current != nil && ![current isEqual:@"default"]) { + for (int i = 0; i < [arr count]; ++i) { + if ([[[arr objectAtIndex:i] key] isEqual:current]) { + [self setSelectionIndexes:[NSIndexSet indexSetWithIndex:i]]; + break; + } + } + } +} + +- (BOOL)useDefaultPreamble { + return [[preambles selectedPreambleName] isEqualToString:@"default"]; +} + +- (void)flushText { + if (preambleText != nil && ![self useDefaultPreamble]) { + [preambles setCurrentPreamble:[preambleText string]]; + } +} + +- (void)setCurrentPreamble:(NSString*)current { + [self flushText]; + + [self willChangeValueForKey:@"useDefaultPreamble"]; + [preambles setSelectedPreambleName:current]; + [self didChangeValueForKey:@"useDefaultPreamble"]; + + [self setPreambleText: + [[NSAttributedString alloc] initWithString:[preambles currentPreamble] + attributes:textAttrs]]; +} + +- (void)savePreambles:(NSString*)plist { + [self flushText]; + [NSKeyedArchiver archiveRootObject:preambles toFile:plist]; +} + +- (NSString*)currentPreamble { + [self flushText]; + return [preambles currentPreamble]; +} + +- (NSString*)currentPostamble { + return [preambles currentPostamble]; +} + +- (NSString*)buildDocumentForTikz:(NSString*)tikz { + [self flushText]; + return [preambles buildDocumentForTikz:tikz]; +} + +- (void)setSelectionIndexes:(NSIndexSet *)idx { + [self willChangeValueForKey:@"selectionIndexes"]; + selectionIndexes = idx; + [self didChangeValueForKey:@"selectionIndexes"]; + + [self setPreamble:self]; +} + +- (NSIndexSet*)selectionIndexes { + return selectionIndexes; +} + +- (IBAction)setPreambleToDefault:(id)sender{ + [self setCurrentPreamble:@"default"]; + [textView setBackgroundColor:ghostColor]; +} + +- (IBAction)setPreamble:(id)sender { + //if ([[toolbar selectedItemIdentifier] isEqualToString:[defaultToolbarItem itemIdentifier]]) { + // [self setCurrentPreamble:@"default"]; + // [textView setBackgroundColor:ghostColor]; + //} else if ([[toolbar selectedItemIdentifier] isEqualToString:[customToolbarItem itemIdentifier]]) { + NSString *key = nil; + if ([selectionIndexes count]==1) { + int i = [selectionIndexes firstIndex]; + key = [[[preambleDictionaryController arrangedObjects] objectAtIndex:i] key]; + } + if (key != nil) { + [self setCurrentPreamble:key]; + //NSLog(@"preamble set to %@", key); + } else { + [self setCurrentPreamble:@"custom"]; + //NSLog(@"preamble set to custom"); + } + [textView setBackgroundColor:[NSColor whiteColor]]; + //} +} + +- (IBAction)insertDefaultStyles:(id)sender { + [textView insertText:[preambles styleDefinitions]]; +} + +- (IBAction)addPreamble:(id)sender { + [preambleDictionaryController setInitialKey:@"new preamble"]; + [preambleDictionaryController setInitialValue:[preambles defaultPreamble]]; + [preambleDictionaryController add:sender]; +} + +- (void)controlTextDidEndEditing:(NSNotification *)obj { + //NSLog(@"got a text change"); + [self setPreamble:[obj object]]; +} + + +// NOT IMPLEMENTED +- (IBAction)duplicatePreamble:(id)sender { +// NSLog(@"set text to: %@", [preambles currentPreamble]); +// [preambleDictionaryController setInitialKey:[preambles selectedPreambleName]]; +// [preambleDictionaryController setInitialValue:[preambles currentPreamble]]; +// [preambleDictionaryController add:sender]; +} + + +@end diff --git a/tikzit-1/src/osx/Preambles+Coder.h b/tikzit-1/src/osx/Preambles+Coder.h new file mode 100644 index 0000000..5a270c5 --- /dev/null +++ b/tikzit-1/src/osx/Preambles+Coder.h @@ -0,0 +1,32 @@ +// +// Preambles+Coder.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "Preambles.h" +#import + +@interface Preambles (Coder) + +- (id)initWithCoder:(NSCoder *)coder; +- (void)encodeWithCoder:(NSCoder *)coder; + +@end diff --git a/tikzit-1/src/osx/Preambles+Coder.m b/tikzit-1/src/osx/Preambles+Coder.m new file mode 100644 index 0000000..5e468b2 --- /dev/null +++ b/tikzit-1/src/osx/Preambles+Coder.m @@ -0,0 +1,41 @@ +// +// Preambles+Coder.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "Preambles+Coder.h" + + +@implementation Preambles (Coder) + +- (id)initWithCoder:(NSCoder *)coder { + if (!(self = [super init])) return nil; + selectedPreambleName = [coder decodeObjectForKey:@"selectedPreamble"]; + preambleDict = [coder decodeObjectForKey:@"preambles"]; + return self; +} + +- (void)encodeWithCoder:(NSCoder *)coder { + [coder encodeObject:selectedPreambleName forKey:@"selectedPreamble"]; + [coder encodeObject:preambleDict forKey:@"preambles"]; +} + +@end diff --git a/tikzit-1/src/osx/PreferenceController.h b/tikzit-1/src/osx/PreferenceController.h new file mode 100644 index 0000000..b2b23f3 --- /dev/null +++ b/tikzit-1/src/osx/PreferenceController.h @@ -0,0 +1,49 @@ +// +// PreferenceController.h +// TikZiT +// +// Created by Karl Johan Paulsson on 26/02/2013. +// Copyright (c) 2013 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import "UpdatePreferenceController.h" +#import "PreambleController.h" +#import "CustomNodeController.h" + +@interface PreferenceController : NSWindowController{ + + IBOutlet NSView *engineView; + IBOutlet NSView *generalView; + IBOutlet NSView *updateView; + IBOutlet NSView *preambleView; + IBOutlet NSView *customNodeView; + + UpdatePreferenceController *updateController; + PreambleController *preambleController; + CustomNodeController *customNodeController; + + int currentViewTag; +} + +- (id)initWithWindowNibName:(NSString *)windowNibName preambleController:(PreambleController *)pc; + +- (IBAction)switchView:(id)sender; + +@end diff --git a/tikzit-1/src/osx/PreferenceController.m b/tikzit-1/src/osx/PreferenceController.m new file mode 100644 index 0000000..e785358 --- /dev/null +++ b/tikzit-1/src/osx/PreferenceController.m @@ -0,0 +1,133 @@ +// +// PreferenceController.m +// TikZiT +// +// Created by Karl Johan Paulsson on 26/02/2013. +// Copyright (c) 2013 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "PreferenceController.h" + +@interface PreferenceController () + +@end + +@implementation PreferenceController + +- (id)initWithWindowNibName:(NSString *)windowNibName preambleController:(PreambleController *)pc{ + if (!(self = [super initWithWindowNibName:windowNibName])) return nil; + + preambleController = pc; + + return self; +} + +- (NSRect)newFrameForNewContentView:(NSView*)view { + NSWindow *window = [self window]; + NSRect newFrameRect = [window frameRectForContentRect:[view frame]]; + NSRect oldFrameRect = [window frame]; + NSSize newSize = newFrameRect.size; + NSSize oldSize = oldFrameRect.size; + + NSRect frame = [window frame]; + frame.size = newSize; + frame.origin.y -= (newSize.height - oldSize.height); + + return frame; +} + +- (NSView *)viewForTag:(int)tag { + + NSView *view = nil; + switch (tag) { + default: + case 0: + view = generalView; + break; + case 1: + view = engineView; + break; + case 2: + view = updateView; + break; + case 3: + view = preambleView; + break; + case 4: + view = customNodeView; + break; + } + + return view; +} + +- (BOOL)validateToolbarItem:(NSToolbarItem *)item { + + if ([item tag] == currentViewTag) return NO; + else return YES; + +} + +- (void)awakeFromNib { + + [[self window] setContentSize:[generalView frame].size]; + [[[self window] contentView] addSubview:generalView]; + [[[self window] contentView] setWantsLayer:YES]; + + updateController = [[UpdatePreferenceController alloc] initWithNibName:@"UpdatePreferencePanel" bundle:nil]; + [[updateController view] setFrame:[updateView frame]]; + [[[self window] contentView] replaceSubview:updateView with:[updateController view]]; + updateView = [updateController view]; + + [[preambleController view] setFrame:[preambleView frame]]; + [[[self window] contentView] replaceSubview:preambleView with:[preambleController view]]; + preambleView = [preambleController view]; + + customNodeController = [[CustomNodeController alloc] initWithNibName:@"CustomNodes" bundle:nil]; + [[customNodeController view] setFrame:[customNodeView frame]]; + [[[self window] contentView] replaceSubview:customNodeView with:[customNodeController view]]; + customNodeView = [customNodeController view]; + + [[self window] setContentSize:[engineView frame].size]; + [[[self window] contentView] addSubview:engineView]; + currentViewTag = 1; +} + +- (IBAction)switchView:(id)sender { + + int tag = [sender tag]; + NSView *view = [self viewForTag:tag]; + NSView *previousView = [self viewForTag:currentViewTag]; + currentViewTag = tag; + + NSRect newFrame = [self newFrameForNewContentView:view]; + + [NSAnimationContext beginGrouping]; + + if ([[NSApp currentEvent] modifierFlags] & NSShiftKeyMask) + [[NSAnimationContext currentContext] setDuration:1.0]; + + [[[[self window] contentView] animator] replaceSubview:previousView with:view]; + [[[self window] animator] setFrame:newFrame display:YES]; + + [NSAnimationContext endGrouping]; + +} + +@end diff --git a/tikzit-1/src/osx/Preferences.xib b/tikzit-1/src/osx/Preferences.xib new file mode 100644 index 0000000..1be3f9f --- /dev/null +++ b/tikzit-1/src/osx/Preferences.xib @@ -0,0 +1,1165 @@ + + + + 1070 + 13C64 + 5053 + 1265.19 + 697.40 + + com.apple.InterfaceBuilder.CocoaPlugin + 5053 + + + IBNSLayoutConstraint + NSButton + NSButtonCell + NSCustomObject + NSCustomView + NSTextField + NSTextFieldCell + NSToolbar + NSToolbarItem + NSUserDefaultsController + NSView + NSWindowTemplate + + + com.apple.InterfaceBuilder.CocoaPlugin + + + PluginDependencyRecalculationVersion + + + + + PreferenceController + + + FirstResponder + + + NSApplication + + + 7 + 2 + {{196, 240}, {480, 270}} + 544736256 + Preferences + NSWindow + + + C1747407-DC9A-4297-9C1C-0A5010984E6C + + + YES + YES + NO + NO + 1 + 1 + + + + 197F9408-AFB0-404B-B2B6-4DB1250B0A80 + + Updates + Updates + + + + NSImage + updates + + + + {0, 0} + {0, 0} + YES + YES + 2 + YES + 0 + + + + A3DDD070-5637-444B-92C6-905084CAC389 + + General + General + + + + NSImage + NSPreferencesGeneral + + + + {0, 0} + {0, 0} + YES + YES + 1 + YES + 0 + + + + A96DC4D4-2171-4D05-8C08-8D01B3829158 + + Preamble + Preamble + + + + NSImage + preamble + + + + {0, 0} + {0, 0} + YES + YES + 3 + YES + 0 + + + + CBA2626C-DD4C-4ADD-BD5D-26D21216D9A8 + + Custom Nodes + Custom Nodes + + + + NSImage + customshape + + + + {0, 0} + {0, 0} + YES + YES + 4 + YES + 0 + + + + F85FE7C2-9847-4E58-8BF6-BE334E918CA7 + + Engine + Engine + + + + NSImage + engine + + + + {0, 0} + {0, 0} + YES + YES + 1 + YES + 0 + + + + + + + + + + + + + + + + + + + + + {480, 270} + + + + + {{0, 0}, {1680, 1028}} + {10000000000000, 10000000000000} + YES + + + + 268 + + + + 268 + {{18, 106}, {219, 18}} + + + + _NS:9 + YES + + -2080374784 + 268435456 + Keep inspector windows on top + + .LucidaGrandeUI + 13 + 1044 + + _NS:9 + + 1211912448 + 2 + + NSImage + NSSwitch + + + NSSwitch + + + + 200 + 25 + + NO + + + + 268 + {{18, 126}, {168, 18}} + + + + _NS:9 + YES + + -2080374784 + 268435456 + Autocomplete brackets + + _NS:9 + + 1211912448 + 2 + + + + + 200 + 25 + + NO + + + + 268 + {{18, 18}, {214, 18}} + + + + _NS:9 + YES + + -2080374784 + 268435456 + Bring preview window to focus + + _NS:9 + + 1211912448 + 2 + + + + + 200 + 25 + + NO + + + + 268 + {{20, 42}, {440, 22}} + + + + _NS:9 + YES + + -1804599231 + 272630784 + + + _NS:9 + + YES + + 6 + System + textBackgroundColor + + 3 + MQA + + + + 6 + System + textColor + + 3 + MAA + + + + NO + 1 + + + + 268 + {{18, 72}, {140, 17}} + + + + _NS:1535 + YES + + 68157504 + 272630784 + pdfLaTeX source path + + _NS:1535 + + + 6 + System + controlColor + + 3 + MC42NjY2NjY2NjY3AA + + + + 6 + System + controlTextColor + + + + NO + 1 + + + {480, 162} + + + + _NS:9 + NSView + + + + 268 + + {480, 96} + + + + _NS:9 + NSView + + + + 12 + + {480, 115} + + + + _NS:9 + NSView + + + + 12 + + {557, 354} + + + + _NS:9 + NSView + + + + 12 + + {557, 354} + + + + _NS:9 + NSView + + + YES + + + + + + + window + + + + 3 + + + + engineView + + + + 23 + + + + generalView + + + + 25 + + + + switchView: + + + + 26 + + + + switchView: + + + + 27 + + + + switchView: + + + + 116 + + + + updateView + + + + 117 + + + + switchView: + + + + 120 + + + + preambleView + + + + 121 + + + + customNodeView + + + + 123 + + + + switchView: + + + + 125 + + + + delegate + + + + 4 + + + + value: values.net.sourceforge.tikzit.pdflatexpath + + + + + + value: values.net.sourceforge.tikzit.pdflatexpath + value + values.net.sourceforge.tikzit.pdflatexpath + 2 + + + 54 + + + + value: values.net.sourceforge.tikzit.previewfocus + + + + + + value: values.net.sourceforge.tikzit.previewfocus + value + values.net.sourceforge.tikzit.previewfocus + 2 + + + 62 + + + + value: values.net.sourceforge.tikzit.autocomplete + + + + + + value: values.net.sourceforge.tikzit.autocomplete + value + values.net.sourceforge.tikzit.autocomplete + 2 + + + 149 + + + + value: values.net.sourceforge.tikzit.inspectorsontop + + + + + + value: values.net.sourceforge.tikzit.inspectorsontop + value + values.net.sourceforge.tikzit.inspectorsontop + 2 + + + 150 + + + + + + 0 + + + + + + -2 + + + File's Owner + + + -1 + + + First Responder + + + -3 + + + Application + + + 1 + + + + + + + + + 2 + + + + + 5 + + + + + + + + + + + + 11 + + + + + 12 + + + + + 13 + + + + + 4 + 0 + + 4 + 1 + 1 + + 20 + + 1000 + + 8 + 23 + 3 + NO + + + + 3 + 0 + + 4 + 1 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + NO + + + + 5 + 0 + + 5 + 1 + 1 + + 20 + + 1000 + + 0 + 29 + 3 + NO + + + + 6 + 0 + + 6 + 1 + 1 + + 20 + + 1000 + + 0 + 29 + 3 + NO + + + + 3 + 0 + + 4 + 1 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + NO + + + + 5 + 0 + + 5 + 1 + 1 + + 20 + + 1000 + + 0 + 29 + 3 + NO + + + + 5 + 0 + + 5 + 1 + 1 + + 20 + + 1000 + + 0 + 29 + 3 + NO + + + + 5 + 0 + + 5 + 1 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + NO + + + + 3 + 0 + + 4 + 1 + 1 + + 6 + + 1000 + + 6 + 24 + 3 + NO + + + + 5 + 0 + + 5 + 1 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + NO + + + + 3 + 0 + + 3 + 1 + 1 + + 20 + + 1000 + + 8 + 23 + 3 + NO + + + + + + + + + + + 14 + + + + + + 15 + + + + + + + + 16 + + + + + 30 + + + + + 32 + + + + + + + + 33 + + + + + 36 + + + + + 39 + + + + + 55 + + + + + 56 + + + + + 57 + + + + + + + + 58 + + + + + 59 + + + + + 60 + + + + + 64 + + + + + + 115 + + + + + 118 + + + + + 119 + + + + + 122 + + + + + 124 + + + + + 126 + + + + + 127 + + + + + + + + 128 + + + + + 130 + + + + + 131 + + + + + + + + 132 + + + + + 134 + + + + + 135 + + + + + 153 + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + {{357, 418}, {480, 270}} + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + 153 + + + + + PreferenceController + NSWindowController + + switchView: + id + + + switchView: + + switchView: + id + + + + NSView + NSView + NSView + NSView + NSView + + + + customNodeView + NSView + + + engineView + NSView + + + generalView + NSView + + + preambleView + NSView + + + updateView + NSView + + + + IBProjectSource + ./Classes/PreferenceController.h + + + + + 0 + IBCocoaFramework + YES + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + + + YES + 3 + + {32, 32} + {15, 15} + {32, 32} + {32, 32} + {32, 32} + {32, 32} + + YES + + diff --git a/tikzit-1/src/osx/PreviewController.h b/tikzit-1/src/osx/PreviewController.h new file mode 100644 index 0000000..6c51a23 --- /dev/null +++ b/tikzit-1/src/osx/PreviewController.h @@ -0,0 +1,52 @@ +// +// PreviewController.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + + +#import +#import "DraggablePDFView.h" + +@class PDFView; +@class PreambleController; + +@interface PreviewController : NSWindowController { + IBOutlet DraggablePDFView *pdfView; + IBOutlet NSProgressIndicator *progressIndicator; + IBOutlet NSScrollView *errorTextView; + IBOutlet NSTextView *errorText; + PreambleController *preambleController; + NSString *tempDir; + NSLock *latexLock; + int typesetCount; +} + + +- (id)initWithWindowNibName:(NSString*)nib + preambleController:(PreambleController*)pc + tempDir:(NSString*)dir; + +- (void)buildTikz:(NSString*)tikz; + ++ (void)setDefaultPreviewController:(PreviewController*)pc; ++ (PreviewController*)defaultPreviewController; + +@end diff --git a/tikzit-1/src/osx/PreviewController.m b/tikzit-1/src/osx/PreviewController.m new file mode 100644 index 0000000..cf069b1 --- /dev/null +++ b/tikzit-1/src/osx/PreviewController.m @@ -0,0 +1,147 @@ +// +// PreviewController.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "PreviewController.h" +#import "AppDelegate.h" +#import "PreambleController.h" +#import + +@implementation PreviewController + +static PreviewController *preview = nil; + +- (id)initWithWindowNibName:(NSString*)nib + preambleController:(PreambleController*)pc + tempDir:(NSString*)dir { + if (!(self = [super initWithWindowNibName:nib])) return nil; + tempDir = [dir copy]; + typesetCount = 0; + preambleController = pc; + latexLock = [[NSLock alloc] init]; + return self; +} + +- (void)runLatex:(id)tikz { + // Only build one tex file at a time, so we don't get funky results. + //[latexLock lock]; + [progressIndicator startAnimation:self]; + + if([[NSUserDefaults standardUserDefaults] boolForKey:@"net.sourceforge.tikzit.previewfocus"]){ + [[preview window] makeKeyAndOrderFront:self]; + } + + int fnum = typesetCount++; + + NSString *tex = [preambleController buildDocumentForTikz:tikz]; + + NSString *texFile = [NSString stringWithFormat:@"%@/tikzit_%d.tex", tempDir, fnum]; + NSString *pdfFile = [NSString stringWithFormat:@"%@/tikzit_%d.pdf", tempDir, fnum]; + + [tex writeToFile:texFile atomically:NO encoding:NSUTF8StringEncoding error:NULL]; + + NSString *pdflatexPath = [[NSUserDefaults standardUserDefaults] stringForKey:@"net.sourceforge.tikzit.pdflatexpath"]; + + // We run pdflatex in a bash shell to have easy access to the setup from unix-land + NSTask *latexTask = [[NSTask alloc] init]; + [latexTask setCurrentDirectoryPath:tempDir]; + [latexTask setLaunchPath:@"/bin/bash"]; + + // This assumes the user has $PATH set up to find pdflatex in either .profile + // or .bashrc. This should be improved to take other path setups into account + // and to be customisable. + NSString *latexCmd = + [NSString stringWithFormat: + @"if [ -e ~/.profile ]; then source ~/.profile; fi\n" + @"if [ -e ~/.bashrc ]; then source ~/.bashrc; fi\n" + @"%@ -interaction=nonstopmode -output-format=pdf -halt-on-error '%@'\n", pdflatexPath, texFile]; + + NSLog(@"Telling bash: %@", latexCmd); + + NSPipe *pout = [NSPipe pipe]; + NSPipe *pin = [NSPipe pipe]; + [latexTask setStandardOutput:pout]; + [latexTask setStandardInput:pin]; + + NSFileHandle *latexIn = [pin fileHandleForWriting]; + NSFileHandle *latexOut = [pout fileHandleForReading]; + + [latexTask launch]; + [latexIn writeData:[latexCmd dataUsingEncoding:NSUTF8StringEncoding]]; + [latexIn closeFile]; + + + NSData *data = [latexOut readDataToEndOfFile]; + NSString *str = [[NSString alloc] initWithData:data + encoding:NSUTF8StringEncoding]; + + [latexTask waitUntilExit]; + if ([latexTask terminationStatus] != 0) { + if ([latexTask terminationStatus] == 127) { + [errorTextView setHidden:YES]; + [errorText setString:@"\nCouldn't find pdflatex, change settings and try again."]; + [errorTextView setHidden:NO]; + }else{ + [errorTextView setHidden:YES]; + [errorText setString:[@"\nAN ERROR HAS OCCURRED, PDFLATEX SAID:\n\n" stringByAppendingString:str]]; + [errorTextView setHidden:NO]; + } + } else { + [errorText setString:@""]; + [errorTextView setHidden:YES]; + + PDFDocument *doc = [[PDFDocument alloc] initWithURL:[[NSURL alloc] initFileURLWithPath:pdfFile]]; + + // pad the PDF by a couple of pixels + if ([doc pageCount] >= 1) { + PDFPage *page = [doc pageAtIndex:0]; + NSRect box = [page boundsForBox:kPDFDisplayBoxCropBox]; + box.origin.x -= 2.0f; + box.origin.y -= 2.0f; + box.size.width += 4.0f; + box.size.height += 4.0f; + [page setBounds:box forBox:kPDFDisplayBoxCropBox]; + [page setBounds:box forBox:kPDFDisplayBoxMediaBox]; + } + + [pdfView setDocument:doc]; + } + + [progressIndicator stopAnimation:self]; + //[latexLock unlock]; +} + +- (void)buildTikz:(NSString*)tikz { + // Build on a separate thread to keep the interface responsive. + [NSThread detachNewThreadSelector:@selector(runLatex:) toTarget:self withObject:tikz]; +} + ++ (void)setDefaultPreviewController:(PreviewController*)pc { + preview = pc; +} + ++ (PreviewController*)defaultPreviewController { + return preview; +} + + +@end diff --git a/tikzit-1/src/osx/PropertyInspectorController.h b/tikzit-1/src/osx/PropertyInspectorController.h new file mode 100644 index 0000000..663ee4a --- /dev/null +++ b/tikzit-1/src/osx/PropertyInspectorController.h @@ -0,0 +1,83 @@ +// +// PropertyInspectorController.h +// TikZiT +// +// Created by Aleks Kissinger on 17/07/2011. +// Copyright 2011 Aleks Kissinger. All rights reserved. +// + +#import +#import "NodeStyle.h" +#import "GraphElementData.h" + +@class SFBInspectorView; +@class StylePaletteController; + +@interface PropertyInspectorController : NSWindowController { + IBOutlet SFBInspectorView *propertyInspectorView; + IBOutlet NSView *nodePropertiesView; + IBOutlet NSView *graphPropertiesView; + IBOutlet NSView *edgePropertiesView; + IBOutlet NSComboBox *sourceAnchorComboBox; + IBOutlet NSComboBox *targetAnchorComboBox; + IBOutlet NSTextField *edgeNodeLabelField; + IBOutlet NSButton *edgeNodeCheckbox; + IBOutlet NSArrayController *nodeDataArrayController; + IBOutlet NSArrayController *graphDataArrayController; + IBOutlet NSArrayController *edgeDataArrayController; + IBOutlet NSArrayController *edgeNodeDataArrayController; + + NSMutableArray *sourceAnchorNames; + IBOutlet NSArrayController *sourceAnchorNamesArrayController; + + NSMutableArray *targetAnchorNames; + IBOutlet NSArrayController *targetAnchorNamesArrayController; + + NSMutableArray *selectedNodes; + IBOutlet NSArrayController *selectedNodesArrayController; + + NSMutableArray *selectedEdges; + IBOutlet NSArrayController *selectedEdgesArrayController; + + // this data lists exists solely for displaying messages in disabled data tables + GraphElementData *noSelection; + GraphElementData *multipleSelection; + GraphElementData *noEdgeNode; + GraphElementData *noGraph; + + + // used to get access to the global style table + StylePaletteController *stylePaletteController; +} + +//@property (readonly) BOOL enableNodeDataControls; +//@property (readonly) BOOL enableEdgeDataControls; +@property (strong) NSMutableArray *selectedNodes; +@property (strong) NSMutableArray *selectedEdges; +@property (strong) NSMutableArray *sourceAnchorNames; +@property (strong) NSMutableArray *targetAnchorNames; +@property (strong) StylePaletteController *stylePaletteController; + +- (id)initWithWindowNibName:(NSString *)windowNibName; +- (void)graphSelectionChanged:(NSNotification*)notification; + +- (IBAction)addNodeProperty:(id)sender; +- (IBAction)addNodeAtom:(id)sender; +- (IBAction)removeNodeProperty:(id)sender; + +- (IBAction)addGraphProperty:(id)sender; +- (IBAction)addGraphAtom:(id)sender; +- (IBAction)removeGraphProperty:(id)sender; + +- (IBAction)addEdgeProperty:(id)sender; +- (IBAction)addEdgeAtom:(id)sender; +- (IBAction)removeEdgeProperty:(id)sender; + +- (IBAction)addEdgeNodeProperty:(id)sender; +- (IBAction)addEdgeNodeAtom:(id)sender; +- (IBAction)removeEdgeNodeProperty:(id)sender; + +//- (IBAction)addRemoveChildNode:(id)sender; +- (IBAction)refreshDocument:(id)sender; + +@end diff --git a/tikzit-1/src/osx/PropertyInspectorController.m b/tikzit-1/src/osx/PropertyInspectorController.m new file mode 100644 index 0000000..039a30f --- /dev/null +++ b/tikzit-1/src/osx/PropertyInspectorController.m @@ -0,0 +1,280 @@ +// +// PropertyInspectorController.m +// TikZiT +// +// Created by Aleks Kissinger on 17/07/2011. +// Copyright 2011 Aleks Kissinger. All rights reserved. +// + +#import "PropertyInspectorController.h" +#import "StylePaletteController.h" +#import "TikzDocument.h" +#import "SFBInspectors/SFBInspectorView.h" +#import "PickSupport.h" +#import "Node.h" +#import "Edge.h" +#import "NodeStyle.h" +#import "GraphicsView.h" +#import "GraphElementProperty.h" +#import "Shape.h" + +@implementation PropertyInspectorController + +@synthesize stylePaletteController; +@synthesize selectedNodes, selectedEdges; +@synthesize sourceAnchorNames, targetAnchorNames; + +- (id)initWithWindowNibName:(NSString *)windowNibName { + if (!(self = [super initWithWindowNibName:windowNibName])) return nil; + + noSelection = [[GraphElementData alloc] init]; + [noSelection setProperty:@"" forKey:@"No Selection"]; + multipleSelection = [[GraphElementData alloc] init]; + [multipleSelection setProperty:@"" forKey:@"Mult. Selection"]; + noEdgeNode = [[GraphElementData alloc] init]; + [noEdgeNode setProperty:@"" forKey:@"No Child"]; + noGraph = [[GraphElementData alloc] init]; + [noGraph setProperty:@"" forKey:@"No Graph"]; + + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(graphSelectionChanged:) + name:@"SelectionChanged" + object:nil]; + +// [[NSDocumentController sharedDocumentController] addObserver:self +// forKeyPath:@"currentDocument" +// options:NSKeyValueObservingOptionNew +// context:NULL]; + + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(graphSelectionChanged:) + name:@"NSWindowDidBecomeMainNotification" + object:nil]; + + [self setSourceAnchorNames: [[NSMutableArray alloc] initWithArray: [@"north south west east" componentsSeparatedByString:@" "]]]; + + [self setTargetAnchorNames: [[NSMutableArray alloc] initWithArray:[@"north south west east" componentsSeparatedByString:@" "]]]; + + + if ([[NSUserDefaults standardUserDefaults] boolForKey:@"net.sourceforge.tikzit.inspectorsontop"] == YES) { + [[self window] setLevel:NSFloatingWindowLevel]; + } else { + [[self window] setLevel:NSNormalWindowLevel]; + } + + [self showWindow:self]; + return self; +} + +- (void)observeValueForKeyPath:(NSString*)keyPath + ofObject:(id)object + change:(NSDictionary*)change + context:(void*)context { + [self graphSelectionChanged:nil]; +} + +//- (void)willChangeValueForKey:(NSString *)key { +// [super willChangeValueForKey:key]; +// NSLog(@"will: %@",key); +//} +// +//- (void)didChangeValueForKey:(NSString *)key { +// [super didChangeValueForKey:key]; +// NSLog(@"did: %@",key); +//} + +- (void)windowDidLoad { + [[self window] setMovableByWindowBackground:YES]; + + [propertyInspectorView addInspectorPane:graphPropertiesView + title:@"Graph Properties"]; + [propertyInspectorView addInspectorPane:nodePropertiesView + title:@"Node Properties"]; + [propertyInspectorView addInspectorPane:edgePropertiesView + title:@"Edge Properties"]; + [super windowDidLoad]; +} + +- (IBAction)refreshDocument:(id)sender { + NSDocumentController *dc = [NSDocumentController sharedDocumentController]; + TikzDocument *doc = (TikzDocument*)[dc currentDocument]; + + if (doc != nil) { + [[doc graphicsView] postGraphChange]; + [[doc graphicsView] refreshLayers]; + } +} + + +- (void)updateGraphFields { + NSDocumentController *dc = [NSDocumentController sharedDocumentController]; + TikzDocument *doc = (TikzDocument*)[dc currentDocument]; + + if (doc != nil) { + [graphDataArrayController setContent:[[[doc graphicsView] graph] data]]; + [graphDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; + [graphDataArrayController setEditable:YES]; + } else { + [graphDataArrayController setContent:noGraph]; + [graphDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; + [graphDataArrayController setEditable:NO]; + } +} + +- (void)updateNodeFields { + NSDocumentController *dc = [NSDocumentController sharedDocumentController]; + TikzDocument *doc = (TikzDocument*)[dc currentDocument]; + if (doc != nil) { + NSSet *sel = [[[doc graphicsView] pickSupport] selectedNodes]; + [self setSelectedNodes:[[sel allObjects] mutableCopy]]; + [selectedNodesArrayController setSelectedObjects:selectedNodes]; + if ([sel count] == 1) { + Node *n = [sel anyObject]; + [nodeDataArrayController setContent:[n data]]; + [nodeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; + [nodeDataArrayController setEditable:YES]; + } else if ([sel count] == 0) { + [nodeDataArrayController setContent:noSelection]; + [nodeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; + [nodeDataArrayController setEditable:NO]; + } else { + [nodeDataArrayController setContent:multipleSelection]; + [nodeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; + [nodeDataArrayController setEditable:NO]; + } + } else { + [nodeDataArrayController setContent:noGraph]; + [nodeDataArrayController setEditable:NO]; + } +} + +- (void)updateEdgeFields { + NSDocumentController *dc = [NSDocumentController sharedDocumentController]; + TikzDocument *doc = (TikzDocument*)[dc currentDocument]; + + if (doc != nil) { + NSSet *sel = [[[doc graphicsView] pickSupport] selectedEdges]; + [self setSelectedEdges:[[sel allObjects] mutableCopy]]; + [selectedEdgesArrayController setSelectedObjects:selectedEdges]; + if ([sel count] == 1) { + Edge *e = [sel anyObject]; + [edgeDataArrayController setContent:[e data]]; + [edgeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; + [edgeDataArrayController setEditable:YES]; + if ([e hasEdgeNode]) { + Node *n = [e edgeNode]; + [edgeNodeDataArrayController setContent:[n data]]; + [edgeNodeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; + [edgeNodeDataArrayController setEditable:YES]; + } else { + [edgeNodeDataArrayController setContent:noEdgeNode]; + [edgeNodeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; + [edgeNodeDataArrayController setEditable:NO]; + } + } else if ([sel count] == 0) { + [edgeDataArrayController setContent:noSelection]; + [edgeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; + [edgeDataArrayController setEditable:NO]; + [edgeNodeDataArrayController setContent:noSelection]; + [edgeNodeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; + [edgeNodeDataArrayController setEditable:NO]; + } else { + [edgeDataArrayController setContent:multipleSelection]; + [edgeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; + [edgeDataArrayController setEditable:NO]; + [edgeNodeDataArrayController setContent:multipleSelection]; + [edgeNodeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; + [edgeNodeDataArrayController setEditable:NO]; + } + } else { + [edgeDataArrayController setContent:noGraph]; + [edgeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; + [edgeDataArrayController setEditable:NO]; + [edgeNodeDataArrayController setContent:noGraph]; + [edgeNodeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; + [edgeNodeDataArrayController setEditable:NO]; + } +} + +- (void)graphSelectionChanged:(NSNotification*)notification { + [self updateNodeFields]; + [self updateEdgeFields]; + [self updateGraphFields]; +} + +- (void)controlTextDidEndEditing:(NSNotification*)notification { + NSDocumentController *dc = [NSDocumentController sharedDocumentController]; + TikzDocument *doc = (TikzDocument*)[dc currentDocument]; + if (doc != nil) { + PickSupport *pick = [[doc graphicsView] pickSupport]; + for (Node *n in [pick selectedNodes]) { + [n attachStyleFromTable:[stylePaletteController nodeStyles]]; + } + + for (Edge *e in [pick selectedEdges]) { + [e attachStyleFromTable:[stylePaletteController edgeStyles]]; + } + } + + [self refreshDocument:[notification object]]; +} + +- (void)addPropertyToAC:(NSArrayController*)ac { + [ac addObject:[[GraphElementProperty alloc] initWithPropertyValue:@"val" forKey:@"new_property"]]; + [self refreshDocument:nil]; +} + +- (void)addAtomToAC:(NSArrayController*)ac { + [ac addObject:[[GraphElementProperty alloc] initWithAtomName:@"new_atom"]]; + [self refreshDocument:nil]; +} + +- (void)removeFromAC:(NSArrayController*)ac { + [ac remove:nil]; + [self refreshDocument:nil]; +} + +- (IBAction)addNodeProperty:(id)sender { [self addPropertyToAC:nodeDataArrayController]; } +- (IBAction)addNodeAtom:(id)sender { [self addAtomToAC:nodeDataArrayController]; } +- (IBAction)removeNodeProperty:(id)sender { [self removeFromAC:nodeDataArrayController]; } + +- (IBAction)addGraphProperty:(id)sender { [self addPropertyToAC:graphDataArrayController]; } +- (IBAction)addGraphAtom:(id)sender { [self addAtomToAC:graphDataArrayController]; } +- (IBAction)removeGraphProperty:(id)sender { [self removeFromAC:graphDataArrayController]; } + +- (IBAction)addEdgeProperty:(id)sender { [self addPropertyToAC:edgeDataArrayController]; } +- (IBAction)addEdgeAtom:(id)sender { [self addAtomToAC:edgeDataArrayController]; } +- (IBAction)removeEdgeProperty:(id)sender { [self removeFromAC:edgeDataArrayController]; } + +- (IBAction)addEdgeNodeProperty:(id)sender { [self addPropertyToAC:edgeNodeDataArrayController]; } +- (IBAction)addEdgeNodeAtom:(id)sender { [self addAtomToAC:edgeNodeDataArrayController]; } +- (IBAction)removeEdgeNodeProperty:(id)sender { [self removeFromAC:edgeNodeDataArrayController]; } + +//- (BOOL)enableEdgeDataControls { +// NSDocumentController *dc = [NSDocumentController sharedDocumentController]; +// TikzDocument *doc = (TikzDocument*)[dc currentDocument]; +// +// if (doc != nil) { +// return ([[[[doc graphicsView] pickSupport] selectedEdges] count] == 1); +// } else { +// return NO; +// } +//} +// +//- (BOOL)enableEdgeNodeDataControls { +// NSDocumentController *dc = [NSDocumentController sharedDocumentController]; +// TikzDocument *doc = (TikzDocument*)[dc currentDocument]; +// +// if (doc != nil) { +// PickSupport *pick = [[doc graphicsView] pickSupport]; +// if ([[pick selectedEdges] count] == 1) { +// return ([[[pick selectedEdges] anyObject] hasEdgeNode]); +// } else { +// return NO; +// } +// } else { +// return NO; +// } +//} + +@end diff --git a/tikzit-1/src/osx/SelectBoxLayer.h b/tikzit-1/src/osx/SelectBoxLayer.h new file mode 100644 index 0000000..45b43c7 --- /dev/null +++ b/tikzit-1/src/osx/SelectBoxLayer.h @@ -0,0 +1,22 @@ +// +// SelectBoxLayer.h +// TikZiT +// +// Created by Aleks Kissinger on 14/06/2010. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import +#import + +@interface SelectBoxLayer : CALayer { + BOOL active; + CGRect box; +} + +@property (assign) BOOL active; +@property (assign) NSRect selectBox; + ++ (SelectBoxLayer*)layer; + +@end diff --git a/tikzit-1/src/osx/SelectBoxLayer.m b/tikzit-1/src/osx/SelectBoxLayer.m new file mode 100644 index 0000000..a7abe33 --- /dev/null +++ b/tikzit-1/src/osx/SelectBoxLayer.m @@ -0,0 +1,48 @@ +// +// SelectBoxLayer.m +// TikZiT +// +// Created by Aleks Kissinger on 14/06/2010. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import "SelectBoxLayer.h" + + +@implementation SelectBoxLayer + +@synthesize active; + +- (id)init { + if (!(self = [super init])) return nil; + box = CGRectMake(0.0f, 0.0f, 0.0f, 0.0f); + active = NO; + return self; +} + +- (void)setSelectBox:(NSRect)r { + box = NSRectToCGRect(r); +} + +- (NSRect)selectBox { + return NSRectFromCGRect(box); +} + +- (void)drawInContext:(CGContextRef)context { + if (active) { + CGContextAddRect(context, box); + + CGContextSetRGBStrokeColor(context, 0.6, 0.6, 0.6, 1); + CGContextSetRGBFillColor(context, 0.8, 0.8, 0.8, 0.2); + CGContextSetLineWidth(context, 1); + + CGContextSetShouldAntialias(context, NO); + CGContextDrawPath(context, kCGPathFillStroke); + } +} + ++ (SelectBoxLayer*)layer { + return [[SelectBoxLayer alloc] init]; +} + +@end diff --git a/tikzit-1/src/osx/SelectableCollectionViewItem.h b/tikzit-1/src/osx/SelectableCollectionViewItem.h new file mode 100644 index 0000000..4a2c571 --- /dev/null +++ b/tikzit-1/src/osx/SelectableCollectionViewItem.h @@ -0,0 +1,33 @@ +// +// SelectableCollectionViewItem.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import "StylePaletteController.h" + +@interface SelectableCollectionViewItem : NSCollectionViewItem { + IBOutlet StylePaletteController *stylePaletteController; +} + +- (void)setStylePaletteController:(StylePaletteController*)spc; + +@end diff --git a/tikzit-1/src/osx/SelectableCollectionViewItem.m b/tikzit-1/src/osx/SelectableCollectionViewItem.m new file mode 100644 index 0000000..880c37b --- /dev/null +++ b/tikzit-1/src/osx/SelectableCollectionViewItem.m @@ -0,0 +1,54 @@ +// +// SelectableCollectionViewItem.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "SelectableCollectionViewItem.h" +#import "SelectableNodeView.h" + +@implementation SelectableCollectionViewItem + +- (id)copyWithZone:(NSZone *)zone { + SelectableCollectionViewItem *item = [super copyWithZone:zone]; + [item setStylePaletteController:stylePaletteController]; + return (id)item; +} + +- (void)setSelected:(BOOL)flag { + [super setSelected:flag]; + [(SelectableNodeView*)[self view] setSelected:flag]; + + // only fire this event from the view that lost selection + //if (flag == NO) [stylePaletteController selectionDidChange]; + + [[self view] setNeedsDisplay:YES]; +} + +- (void)setRepresentedObject:(id)object { + [super setRepresentedObject:object]; + [(SelectableNodeView*)[self view] setNodeStyle:(NodeStyle*)object]; +} + +- (void)setStylePaletteController:(StylePaletteController*)spc { + stylePaletteController = spc; +} + +@end diff --git a/tikzit-1/src/osx/SelectableNodeView.h b/tikzit-1/src/osx/SelectableNodeView.h new file mode 100644 index 0000000..6b0841d --- /dev/null +++ b/tikzit-1/src/osx/SelectableNodeView.h @@ -0,0 +1,38 @@ +// +// SelectableView.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import "NodeLayer.h" +#import "NodeStyle.h" +#import "NodeStyle+Coder.h" + +@interface SelectableNodeView : NSView { + BOOL selected; + NodeLayer *nodeLayer; +} + +@property (assign) BOOL selected; +@property (strong) NodeStyle *nodeStyle; + + +@end diff --git a/tikzit-1/src/osx/SelectableNodeView.m b/tikzit-1/src/osx/SelectableNodeView.m new file mode 100644 index 0000000..797a137 --- /dev/null +++ b/tikzit-1/src/osx/SelectableNodeView.m @@ -0,0 +1,96 @@ +// +// SelectableView.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "SelectableNodeView.h" +#import "Shape.h" +#import "Transformer.h" + +@implementation SelectableNodeView + +@synthesize selected; + +- (id)initWithFrame:(NSRect)frameRect { + if (!(self = [super initWithFrame:frameRect])) return nil; + nodeLayer = nil; + return self; +} + +-(void)drawLayer:(CALayer *)layer inContext:(CGContextRef)context { +// NSLog(@"got draw"); +// CGContextSaveGState(context); +// +// if (selected) { +// CGContextSetRGBStrokeColor(context, 0.61f, 0.735f, 1.0f, 1.0f); +// CGContextSetRGBFillColor(context, 0.61f, 0.735f, 1.0f, 0.5f); +// CGContextSetLineWidth(context, 1.0f); +// +// CGRect box = CGRectMake([layer frame].origin.x + 2, +// [layer frame].origin.y + 2, +// [layer frame].size.width - 4, +// [layer frame].size.height - 4); +// +// //CGContextAddRect(context, box); +// CGContextDrawPath(context, kCGPathFillStroke); +// } +// +// CGContextRestoreGState(context); + + if (nodeLayer!=nil) { + if (![[[self layer] sublayers] containsObject:nodeLayer]) { + [[self layer] addSublayer:nodeLayer]; + NSPoint c = NSMakePoint(CGRectGetMidX([[self layer] frame]), + CGRectGetMidY([[self layer] frame])); + [nodeLayer setCenter:c andAnimateWhen:NO]; + } + + if (selected) [[nodeLayer selection] select]; + else [[nodeLayer selection] deselect]; + + [nodeLayer updateFrame]; + } +} + +- (void)drawRect:(NSRect)rect { + [super drawRect:rect]; +} + +- (BOOL)acceptsFirstMouse:(NSEvent *)theEvent { return YES; } + +- (void)setNodeStyle:(NodeStyle *)sty { + if (nodeLayer == nil) { + nodeLayer = [[NodeLayer alloc] initWithNode:[Node node] + transformer:[Transformer defaultTransformer]]; + [nodeLayer setRescale:NO]; + } + + [[nodeLayer node] setStyle:sty]; + [nodeLayer updateFrame]; +} + +- (NodeStyle*)nodeStyle { + if (nodeLayer != nil) return [[nodeLayer node] style]; + else return nil; +} + + +@end diff --git a/tikzit-1/src/osx/StylePaletteController.h b/tikzit-1/src/osx/StylePaletteController.h new file mode 100644 index 0000000..05f0684 --- /dev/null +++ b/tikzit-1/src/osx/StylePaletteController.h @@ -0,0 +1,80 @@ +// +// StylePaletteController.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import "NodeStyle.h" +#import "EdgeStyle.h" + +@class SFBInspectorView; + +@interface StylePaletteController : NSWindowController { + NSMutableArray *nodeStyles; + NSMutableArray *edgeStyles; + IBOutlet NSArrayController *nodeStyleArrayController; + IBOutlet NSArrayController *filteredNodeStyleArrayController; + IBOutlet NSArrayController *edgeStyleArrayController; + IBOutlet NSArrayController *filteredEdgeStyleArrayController; + IBOutlet NSCollectionView *collectionView; + IBOutlet SFBInspectorView *nodeStyleInspectorView; + IBOutlet NSView *nodeStyleView; + IBOutlet NSView *edgeStyleView; + IBOutlet NSPopUpButton *shapeDropdown; + NSString *displayedNodeStyleCategory; + NSString *displayedEdgeStyleCategory; +} + +@property (strong) NSMutableArray *nodeStyles; +@property (strong) NSMutableArray *edgeStyles; +@property (readonly) BOOL documentActive; +@property (strong) NodeStyle *activeNodeStyle; +@property (strong) EdgeStyle *activeEdgeStyle; +@property (copy) NSString *displayedNodeStyleCategory; +@property (copy) NSString *displayedEdgeStyleCategory; +@property (readonly) NSPredicate *displayedNodeStylePredicate; +@property (readonly) NSPredicate *displayedEdgeStylePredicate; + +//@property NSString *nodeLabel; + +- (id)initWithWindowNibName:(NSString *)windowNibName + supportDir:(NSString*)supportDir; +- (void)saveStyles:(NSString *)plist; + +- (IBAction)refreshCollection:(id)sender; + +- (IBAction)applyActiveNodeStyle:(id)sender; +- (IBAction)clearActiveNodeStyle:(id)sender; +- (IBAction)addNodeStyle:(id)sender; + +- (IBAction)appleActiveEdgeStyle:(id)sender; +- (IBAction)clearActiveEdgeStyle:(id)sender; +- (IBAction)addEdgeStyle:(id)sender; +- (void)setActiveEdgeStyle:(EdgeStyle*)style; + +- (IBAction)setFillToClosestHashed:(id)sender; +- (IBAction)setStrokeToClosestHashed:(id)sender; + + +//- (IBAction)changeShape:(id)sender; + + +@end diff --git a/tikzit-1/src/osx/StylePaletteController.m b/tikzit-1/src/osx/StylePaletteController.m new file mode 100644 index 0000000..4fe46be --- /dev/null +++ b/tikzit-1/src/osx/StylePaletteController.m @@ -0,0 +1,252 @@ +// +// StylePaletteController.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "StylePaletteController.h" +#import "TikzDocument.h" +#import "SFBInspectors/SFBInspectorView.h" +#import "PickSupport.h" +#import "Node.h" +#import "Edge.h" +#import "NodeStyle.h" +#import "GraphicsView.h" +#import "GraphElementProperty.h" +#import "Shape.h" + +@implementation StylePaletteController + +@synthesize nodeStyles, edgeStyles; + +- (id)initWithWindowNibName:(NSString *)windowNibName + supportDir:(NSString*)supportDir +{ + if (self = [super initWithWindowNibName:windowNibName]) { + NSString *ns = [supportDir stringByAppendingPathComponent:@"nodeStyles.plist"]; + NSString *es = [supportDir stringByAppendingPathComponent:@"edgeStyles.plist"]; + nodeStyles = (NSMutableArray*)[NSKeyedUnarchiver + unarchiveObjectWithFile:ns]; + edgeStyles = (NSMutableArray*)[NSKeyedUnarchiver + unarchiveObjectWithFile:es]; + + if (nodeStyles == nil) nodeStyles = [NSMutableArray array]; + if (edgeStyles == nil) edgeStyles = [NSMutableArray array]; + + if ([[NSUserDefaults standardUserDefaults] boolForKey:@"net.sourceforge.tikzit.inspectorsontop"] == YES) { + [[self window] setLevel:NSFloatingWindowLevel]; + } else { + [[self window] setLevel:NSNormalWindowLevel]; + } + + [self showWindow:self]; + } + + return self; +} + +- (void)windowDidLoad { + [[self window] setMovableByWindowBackground:YES]; + [shapeDropdown addItemsWithTitles:[[Shape shapeDictionary] allKeys]]; + if ([self activeNodeStyle] != nil) { + [shapeDropdown setTitle:[[self activeNodeStyle] shapeName]]; + } + + [nodeStyleInspectorView addInspectorPane:nodeStyleView + title:@"Node Styles"]; + + [nodeStyleInspectorView addInspectorPane:edgeStyleView + title:@"Edge Styles"]; + + [super windowDidLoad]; +} + +- (void)saveStyles:(NSString*)supportDir { + NSString *ns = [supportDir stringByAppendingPathComponent:@"nodeStyles.plist"]; + NSString *es = [supportDir stringByAppendingPathComponent:@"edgeStyles.plist"]; + [NSKeyedArchiver archiveRootObject:nodeStyles toFile:ns]; + [NSKeyedArchiver archiveRootObject:edgeStyles toFile:es]; +} + +- (IBAction)refreshCollection:(id)sender { + [collectionView setNeedsDisplay:YES]; +} + + +- (BOOL)documentActive { + NSDocumentController *dc = [NSDocumentController sharedDocumentController]; + return dc.currentDocument != nil; +} + +-(BOOL)collectionView:(NSCollectionView*)collectionView canDragItemsAtIndexes:(NSIndexSet*)indexes withEvent:(NSEvent*)event { + return YES; +} + + +//=========================== +//= setting SVG-safe colors = +//=========================== +- (IBAction)setFillToClosestHashed:(id)sender { + NSArray *sel = [nodeStyleArrayController selectedObjects]; + if ([sel count] != 0) { + NodeStyle *sty = [sel objectAtIndex:0]; + [sty willChangeValueForKey:@"fillColor"]; + [sty willChangeValueForKey:@"fillColorIsKnown"]; + [sty.fillColorRGB setToClosestHashed]; + [sty didChangeValueForKey:@"fillColor"]; + [sty didChangeValueForKey:@"fillColorIsKnown"]; + } +} + +- (IBAction)setStrokeToClosestHashed:(id)sender { + NSArray *sel = [nodeStyleArrayController selectedObjects]; + if ([sel count] != 0) { + NodeStyle *sty = [sel objectAtIndex:0]; + [sty willChangeValueForKey:@"strokeColor"]; + [sty willChangeValueForKey:@"strokeColorIsKnown"]; + [sty.strokeColorRGB setToClosestHashed]; + [sty didChangeValueForKey:@"strokeColor"]; + [sty didChangeValueForKey:@"strokeColorIsKnown"]; + } +} + +//================================================= +//= setting filter predicates for nodes and edges = +//================================================= +- (NSString*)displayedNodeStyleCategory { + return displayedNodeStyleCategory; +} + +- (void)setDisplayedNodeStyleCategory:(NSString *)cat { + [self willChangeValueForKey:@"displayedNodeStylePredicate"]; + displayedNodeStyleCategory = cat; + [self didChangeValueForKey:@"displayedNodeStylePredicate"]; +} + +- (NSString*)displayedEdgeStyleCategory { + return displayedEdgeStyleCategory; +} + +- (void)setDisplayedEdgeStyleCategory:(NSString *)cat { + [self willChangeValueForKey:@"displayedEdgeStylePredicate"]; + displayedEdgeStyleCategory = cat; + [self didChangeValueForKey:@"displayedEdgeStylePredicate"]; +} + +- (NSPredicate*)displayedNodeStylePredicate { + return [NSPredicate predicateWithFormat:@"category == %@", displayedNodeStyleCategory]; +} + +- (NSPredicate*)displayedEdgeStylePredicate { + return [NSPredicate predicateWithFormat:@"category == %@", displayedEdgeStyleCategory]; +} + + +//============================== +//= getting and setting styles = +//============================== + +- (IBAction)applyActiveNodeStyle:(id)sender { + NSDocumentController *dc = [NSDocumentController sharedDocumentController]; + TikzDocument *doc = (TikzDocument*)[dc currentDocument]; + + if (doc != nil) { + [[doc graphicsView] applyStyleToSelectedNodes:[self activeNodeStyle]]; + } + + [[doc graphicsView] postSelectionChange]; +} + +- (IBAction)clearActiveNodeStyle:(id)sender { + [self setActiveNodeStyle:nil]; + + NSDocumentController *dc = [NSDocumentController sharedDocumentController]; + TikzDocument *doc = (TikzDocument*)[dc currentDocument]; + + if (doc != nil) { + [[doc graphicsView] applyStyleToSelectedNodes:nil]; + } + + [[doc graphicsView] postSelectionChange]; +} + +- (NodeStyle*)activeNodeStyle { + NSArray *sel = [filteredNodeStyleArrayController selectedObjects]; + if ([sel count] == 0) return nil; + else return [sel objectAtIndex:0]; +} + +- (void)setActiveNodeStyle:(NodeStyle*)style { + if ([nodeStyles containsObject:style]) { + [filteredNodeStyleArrayController setSelectedObjects:[NSArray arrayWithObject:style]]; + } else { + [filteredNodeStyleArrayController setSelectedObjects:[NSArray array]]; + } +} + +- (IBAction)appleActiveEdgeStyle:(id)sender { + NSDocumentController *dc = [NSDocumentController sharedDocumentController]; + TikzDocument *doc = (TikzDocument*)[dc currentDocument]; + + if (doc != nil) { + [[doc graphicsView] applyStyleToSelectedEdges:[self activeEdgeStyle]]; + } +} + +- (IBAction)clearActiveEdgeStyle:(id)sender { + [self setActiveEdgeStyle:nil]; + [self appleActiveEdgeStyle:sender]; +} + +- (EdgeStyle*)activeEdgeStyle { + NSArray *sel = [filteredEdgeStyleArrayController selectedObjects]; + if ([sel count] == 0) return nil; + else return [sel objectAtIndex:0]; +} + +- (void)setActiveEdgeStyle:(EdgeStyle*)style { + if ([edgeStyles containsObject:style]) { + [filteredEdgeStyleArrayController setSelectedObjects:[NSArray arrayWithObject:style]]; + } else { + [filteredEdgeStyleArrayController setSelectedObjects:[NSArray array]]; + } +} + + +//================= +//= adding styles = +//================= + +- (IBAction)addEdgeStyle:(id)sender { + EdgeStyle *sty = [[EdgeStyle alloc] init]; + [sty setCategory:displayedEdgeStyleCategory]; + [edgeStyleArrayController addObject:sty]; + [self setActiveEdgeStyle:sty]; +} + +- (IBAction)addNodeStyle:(id)sender { + NodeStyle *sty = [[NodeStyle alloc] init]; + [sty setCategory:displayedNodeStyleCategory]; + [nodeStyleArrayController addObject:sty]; + [self setActiveNodeStyle:sty]; +} + + +@end diff --git a/tikzit-1/src/osx/TikzDocument.h b/tikzit-1/src/osx/TikzDocument.h new file mode 100644 index 0000000..1881994 --- /dev/null +++ b/tikzit-1/src/osx/TikzDocument.h @@ -0,0 +1,37 @@ +// +// TikzDocument.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import "GraphicsView.h" +#import "TikzSourceController.h" +#import "PreviewController.h" +#import "GraphicsView.h" + +@interface TikzDocument : NSDocument { + NSString *tikz; +} + +@property (readonly) NSString *tikz; +@property (weak, readonly) GraphicsView *graphicsView; + +@end diff --git a/tikzit-1/src/osx/TikzDocument.m b/tikzit-1/src/osx/TikzDocument.m new file mode 100644 index 0000000..ef5908d --- /dev/null +++ b/tikzit-1/src/osx/TikzDocument.m @@ -0,0 +1,84 @@ +// +// TikzDocument.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "TikzDocument.h" +#import "TikzWindowController.h" + +@implementation TikzDocument + +@synthesize tikz; + +- (id)init { + self = [super init]; + if (self) { + tikz = nil; + } + return self; +} + +//- (NSString *)windowNibName { +// // Override returning the nib file name of the document +// // If you need to use a subclass of NSWindowController or if your document supports multiple NSWindowControllers, you should remove this method and override -makeWindowControllers instead. +// return @"TikzDocument"; +//} + +- (void)makeWindowControllers { + TikzWindowController *wc = [[TikzWindowController alloc] initWithDocument:self]; + [self addWindowController:wc]; +} + +- (void)windowControllerDidLoadNib:(NSWindowController *) aController { + [super windowControllerDidLoadNib:aController]; + [[self graphicsView] refreshLayers]; + // Add any code here that needs to be executed once the windowController has loaded the document's window. +} + +- (NSData *)dataOfType:(NSString *)typeName error:(NSError **)outError { + TikzWindowController *wc = + (TikzWindowController*)[[self windowControllers] objectAtIndex:0]; + NSData *outData = [[[wc tikzSourceController] tikz] dataUsingEncoding:NSUTF8StringEncoding]; + + if ( outError != NULL ) { + *outError = [NSError errorWithDomain:NSOSStatusErrorDomain code:unimpErr userInfo:NULL]; + } + return outData; +} + +- (BOOL)readFromData:(NSData *)data ofType:(NSString *)typeName error:(NSError **)outError { + tikz = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]; + + if ( outError != NULL ) { + *outError = [NSError errorWithDomain:NSOSStatusErrorDomain code:unimpErr userInfo:NULL]; + } + + return YES; +} + +- (GraphicsView*)graphicsView { + TikzWindowController *wc = + (TikzWindowController*)[[self windowControllers] objectAtIndex:0]; + return [wc graphicsView]; +} + + +@end diff --git a/tikzit-1/src/osx/TikzFormatter.h b/tikzit-1/src/osx/TikzFormatter.h new file mode 100644 index 0000000..4d9ec04 --- /dev/null +++ b/tikzit-1/src/osx/TikzFormatter.h @@ -0,0 +1,29 @@ +// +// NSTikzFormatter.h +// TikZiT +// +// Created by Karl Johan Paulsson on 27/01/2013. +// Copyright (c) 2013 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import + +@interface TikzFormatter : NSFormatter + +@end diff --git a/tikzit-1/src/osx/TikzFormatter.m b/tikzit-1/src/osx/TikzFormatter.m new file mode 100644 index 0000000..cb0865d --- /dev/null +++ b/tikzit-1/src/osx/TikzFormatter.m @@ -0,0 +1,91 @@ +// +// NSTikzFormatter.m +// TikZiT +// +// Created by Karl Johan Paulsson on 27/01/2013. +// Copyright (c) 2013 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "TikzFormatter.h" +#import "TikzGraphAssembler.h" + +@implementation TikzFormatter + +- (NSString *)stringForObjectValue:(id)obj{ + if (![obj isKindOfClass:[NSString class]]) { + return @""; + } + + return [NSString stringWithString:obj]; +} + +- (BOOL)getObjectValue:(out id *)obj forString:(NSString *)string errorDescription:(out NSString **)error{ + *obj = [NSString stringWithString:string]; + + BOOL r = [TikzGraphAssembler validateTikzPropertyNameOrValue:string]; + + if (!r && error) + *error = NSLocalizedString(@"Invalid input, couldn't parse value.", @"tikz user input error"); + + return r; +} + +- (BOOL)isPartialStringValid:(NSString **)partialStringPtr proposedSelectedRange:(NSRangePointer)proposedSelRangePtr originalString:(NSString *)origString originalSelectedRange:(NSRange)origSelRange errorDescription:(NSString **)error{ + NSRange addedRange; + NSString *addedString; + + if(![[NSUserDefaults standardUserDefaults] boolForKey:@"net.sourceforge.tikzit.autocomplete"]){ + return YES; + } + + addedRange = NSMakeRange(origSelRange.location, proposedSelRangePtr->location - origSelRange.location); + addedString = [*partialStringPtr substringWithRange: addedRange]; + + if([addedString isEqualToString:@"{"]){ + NSString *s = [[NSString stringWithString:*partialStringPtr] stringByAppendingString:@"}"]; + *partialStringPtr = s; + + return NO; + } + + if([addedString isEqualToString:@"}"]){ + NSScanner *scanner = [NSScanner scannerWithString:*partialStringPtr]; + + NSCharacterSet *cs = [NSCharacterSet characterSetWithCharactersInString:@"{}"]; + NSMutableString *strippedString = [NSMutableString stringWithCapacity:[*partialStringPtr length]]; + + while ([scanner isAtEnd] == NO) { + NSString *buffer; + if ([scanner scanCharactersFromSet:cs intoString:&buffer]) { + [strippedString appendString:buffer]; + + } else { + [scanner setScanLocation:([scanner scanLocation] + 1)]; + } + } + + if([strippedString length] % 2 == 1){ + return NO; + } + } + + return YES; +} + +@end diff --git a/tikzit-1/src/osx/TikzSourceController.h b/tikzit-1/src/osx/TikzSourceController.h new file mode 100644 index 0000000..84d36da --- /dev/null +++ b/tikzit-1/src/osx/TikzSourceController.h @@ -0,0 +1,71 @@ +// +// TikzSourceController.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import + +#import "GraphicsView.h" +#import "ParseErrorView.h" + +@interface TikzSourceController : NSObject { + GraphicsView *__weak graphicsView; + NSTextView *__unsafe_unretained sourceView; + NSAttributedString *source; + NSTextField *__weak status; + NSDictionary *textAttrs; + NSColor *successColor; + NSColor *failedColor; + NSTextField *__weak errorMessage; + ParseErrorView *__weak errorNotification; + + NSUndoManager *__weak documentUndoManager; + + BOOL tikzChanged; + BOOL justUndid; + + NSError *lastError; +} + +@property BOOL tikzChanged; +@property (weak) IBOutlet GraphicsView *graphicsView; +@property (unsafe_unretained) IBOutlet NSTextView *sourceView; +@property (weak) IBOutlet NSTextField *status; +@property (weak) NSUndoManager *documentUndoManager; +@property (copy) NSAttributedString *source; +@property (copy) NSString *tikz; +@property (weak) IBOutlet ParseErrorView *errorNotification; +@property (weak) IBOutlet NSTextField *errorMessage; + +- (void)updateTikzFromGraph; +- (void)graphChanged:(NSNotification*)n; + +- (IBAction)closeParseError:(id)pId; + +// called by code, these do not register an undo +- (BOOL)tryParseTikz; +- (void)doRevertTikz; + +// called by user, these do register an undo +- (void)parseTikz:(id)sender; +- (void)revertTikz:(id)sender; + +@end diff --git a/tikzit-1/src/osx/TikzSourceController.m b/tikzit-1/src/osx/TikzSourceController.m new file mode 100644 index 0000000..84eb3a5 --- /dev/null +++ b/tikzit-1/src/osx/TikzSourceController.m @@ -0,0 +1,241 @@ +// +// TikzSourceController.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "TikzSourceController.h" +#import "TikzGraphAssembler.h" +#import "Graph.h" + +@implementation TikzSourceController + +@synthesize graphicsView, sourceView, source, status; +@synthesize documentUndoManager, tikzChanged; +@synthesize errorMessage, errorNotification; + +- (void)endEditing { + NSResponder *res = [[sourceView window] firstResponder]; + [[sourceView window] makeFirstResponder:nil]; + [[sourceView window] makeFirstResponder:res]; +} + +- (void)undoParseTikz:(Graph *)oldGraph { + [graphicsView setGraph:oldGraph]; + [graphicsView setEnabled:NO]; + [graphicsView postGraphChange]; + [graphicsView refreshLayers]; + + [documentUndoManager registerUndoWithTarget:self + selector:@selector(parseTikz:) + object:self]; + [documentUndoManager setActionName:@"Parse Tikz"]; +} + +- (void)undoRevertTikz:(NSString*)oldTikz { + [self setTikz:oldTikz]; + [graphicsView setEnabled:NO]; + [graphicsView refreshLayers]; + + [documentUndoManager registerUndoWithTarget:self + selector:@selector(revertTikz:) + object:self]; + [documentUndoManager setActionName:@"Revert Tikz"]; +} + +- (void)undoTikzChange:(id)ignore { + [graphicsView setEnabled:YES]; + [graphicsView refreshLayers]; + [self endEditing]; + [self updateTikzFromGraph]; + [documentUndoManager registerUndoWithTarget:self + selector:@selector(redoTikzChange:) + object:nil]; + [documentUndoManager setActionName:@"Tikz Change"]; +} + +- (void)redoTikzChange:(id)ignore { + [graphicsView setEnabled:NO]; + [graphicsView refreshLayers]; + [documentUndoManager registerUndoWithTarget:self + selector:@selector(undoTikzChange:) + object:nil]; + [documentUndoManager setActionName:@"Tikz Change"]; +} + + +- (void)awakeFromNib { + justUndid = NO; + successColor = [NSColor colorWithCalibratedRed:0.0f + green:0.5f + blue:0.0f + alpha:1.0f]; + failedColor = [NSColor redColor]; + + NSFont *font = [NSFont userFixedPitchFontOfSize:11.0f]; + + if (font != nil) { + textAttrs = [NSDictionary dictionaryWithObject:font + forKey:NSFontAttributeName]; + } else { + NSLog(@"WARNING: couldn't find monospaced font."); + textAttrs = [NSDictionary dictionary]; + } + + + [self graphChanged:nil]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(graphChanged:) + name:@"GraphChanged" + object:graphicsView]; +} + +- (void)setTikz:(NSString *)str { + [self willChangeValueForKey:@"source"]; + source = [[NSAttributedString alloc] initWithString:str attributes:textAttrs]; + [self didChangeValueForKey:@"source"]; +} + +- (NSString*)tikz { + return [source string]; +} + +- (void)updateTikzFromGraph { + [self setTikz:[[graphicsView graph] tikz]]; + [errorNotification setHidden:TRUE]; +} + +- (void)graphChanged:(NSNotification*)n { + if ([graphicsView enabled]) [self updateTikzFromGraph]; +} + +- (IBAction)closeParseError:(id)pId{ + [errorNotification setHidden:TRUE]; +} + +- (void)textDidBeginEditing:(NSNotification *)notification { + if ([graphicsView enabled]){ + [graphicsView setEnabled:NO]; + [graphicsView refreshLayers]; + [documentUndoManager registerUndoWithTarget:self + selector:@selector(undoTikzChange:) + object:nil]; + [documentUndoManager setActionName:@"Tikz Change"]; + } +} + +- (BOOL)tryParseTikz { + NSError *thisError; + + Graph *g = [TikzGraphAssembler parseTikz:[self tikz] + error:&thisError]; + + lastError = thisError; + + if (g) { + [graphicsView deselectAll:self]; + [graphicsView setGraph:g]; + [graphicsView refreshLayers]; + [self doRevertTikz]; + return YES; + } else { + return NO; + } +} + +- (void)doRevertTikz { + [self updateTikzFromGraph]; + [self endEditing]; + [graphicsView setEnabled:YES]; + [graphicsView refreshLayers]; + [status setStringValue:@""]; +} + +- (void)parseTikz:(id)sender { + if (![graphicsView enabled]) { + Graph *oldGraph = [graphicsView graph]; + if ([self tryParseTikz]) { + [self endEditing]; + [documentUndoManager registerUndoWithTarget:self + selector:@selector(undoParseTikz:) + object:oldGraph]; + [documentUndoManager setActionName:@"Parse Tikz"]; + + [status setStringValue:@"success"]; + [status setTextColor:successColor]; + + [errorNotification setHidden:TRUE]; + } else { + [status setStringValue:@"parse error"]; + [status setTextColor:failedColor]; + + NSDictionary *d = [lastError userInfo]; + + NSString *ts = [NSString stringWithFormat: @"Parse error on line %@: %@\n", [d valueForKey:@"startLine"], [d valueForKey:NSLocalizedDescriptionKey]]; + NSMutableAttributedString *as = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat: @"Parse error on line %@: %@\n%@\n", [d valueForKey:@"startLine"], [d valueForKey:NSLocalizedDescriptionKey], [[d valueForKey:@"syntaxString"] stringByReplacingOccurrencesOfString:@"\t" withString:@""]]]; + + NSInteger tokenLength = [[d valueForKey:@"tokenLength"] integerValue]; + // Bit of a mess, offset around to find correct position and correct for 4 characters for every one character of \t + NSInteger addedTokenStart = [[d valueForKey:@"tokenStart"] integerValue] + [ts length] - ([[[d valueForKey:@"syntaxString"] componentsSeparatedByString:@"\t"] count]-1)*4 - tokenLength; + + // Can't see if the error is a start paranthesis as only that will be underlined, underline the entire paranthesis instead + if(tokenLength == 1 && [[as string] characterAtIndex:addedTokenStart] == '('){ + tokenLength += [[[as string] substringFromIndex:addedTokenStart+1] rangeOfString:@")"].location + 1; + } + + // Same if unexpected endparanthesis + if(tokenLength == 1 && [[as string] characterAtIndex:addedTokenStart] == ')'){ + NSInteger d = addedTokenStart - [[[as string] substringToIndex:addedTokenStart] rangeOfString:@"(" options:NSBackwardsSearch].location; + + tokenLength += d; + addedTokenStart -= d; + } + + [as beginEditing]; + [as addAttributes:[NSDictionary dictionaryWithObjectsAndKeys: + [NSNumber numberWithInt:NSUnderlineStyleSingle | NSUnderlinePatternDot], NSUnderlineStyleAttributeName, + [NSColor redColor], NSUnderlineColorAttributeName, + nil] + range:NSMakeRange(addedTokenStart, tokenLength)]; + [as endEditing]; + + [errorMessage setAttributedStringValue:as]; + [errorNotification setHidden:FALSE]; + } + } +} + +- (void)revertTikz:(id)sender { + if (![graphicsView enabled]) { + NSString *oldTikz = [[self tikz] copy]; + [self doRevertTikz]; + + [documentUndoManager registerUndoWithTarget:self + selector:@selector(undoRevertTikz:) + object:oldTikz]; + [documentUndoManager setActionName:@"Revert Tikz"]; + } +} + +- (void)dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; +} + +@end diff --git a/tikzit-1/src/osx/TikzWindowController.h b/tikzit-1/src/osx/TikzWindowController.h new file mode 100644 index 0000000..eab427c --- /dev/null +++ b/tikzit-1/src/osx/TikzWindowController.h @@ -0,0 +1,31 @@ +// +// TikzWindowController.h +// TikZiT +// +// Created by Aleks Kissinger on 26/01/2011. +// Copyright 2011 __MyCompanyName__. All rights reserved. +// + +#import + +@class TikzDocument, GraphicsView, TikzSourceController; + +@interface TikzWindowController : NSWindowController { + GraphicsView *__weak graphicsView; + TikzSourceController *__weak tikzSourceController; + TikzDocument *document; +} + +@property (weak) IBOutlet GraphicsView *graphicsView; +@property (weak) IBOutlet TikzSourceController *tikzSourceController; + +- (id)initWithDocument:(TikzDocument*)doc; + +// pass these straight to the tikz source controller +- (void)parseTikz:(id)sender; +- (void)revertTikz:(id)sender; +- (void)zoomIn:(id)sender; +- (void)zoomOut:(id)sender; +- (void)zoomToActualSize:(id)sender; + +@end diff --git a/tikzit-1/src/osx/TikzWindowController.m b/tikzit-1/src/osx/TikzWindowController.m new file mode 100644 index 0000000..bfacbfb --- /dev/null +++ b/tikzit-1/src/osx/TikzWindowController.m @@ -0,0 +1,66 @@ +// +// TikzWindowController.m +// TikZiT +// +// Created by Aleks Kissinger on 26/01/2011. +// Copyright 2011 __MyCompanyName__. All rights reserved. +// + +#import "TikzWindowController.h" +#import "TikzDocument.h" +#import "GraphicsView.h" +#import "TikzSourceController.h" + +@implementation TikzWindowController + +@synthesize graphicsView, tikzSourceController; + +- (id)initWithDocument:(TikzDocument*)doc { + if (!(self = [super initWithWindowNibName:@"TikzDocument"])) return nil; + document = doc; + return self; +} + +- (void)awakeFromNib { + if ([document tikz] != nil) { + [graphicsView setEnabled:NO]; + [tikzSourceController setTikz:[document tikz]]; + [tikzSourceController parseTikz:self]; + } + + [graphicsView setDocumentUndoManager:[document undoManager]]; + [tikzSourceController setDocumentUndoManager:[document undoManager]]; +} + +- (void)parseTikz:(id)sender { + [tikzSourceController parseTikz:sender]; +} + +- (void)revertTikz:(id)sender { + [tikzSourceController revertTikz:sender]; +} + +- (void)previewTikz:(id)sender { + PreviewController *pc = [PreviewController defaultPreviewController]; + if (![[pc window] isVisible]) [pc showWindow:sender]; + [pc buildTikz:[tikzSourceController tikz]]; +} + +- (void)zoomIn:(id)sender { + float scale = [[graphicsView transformer] scale] * 1.25f; + [[graphicsView transformer] setScale:scale]; + [graphicsView refreshLayers]; +} + +- (void)zoomOut:(id)sender { + float scale = [[graphicsView transformer] scale] * 0.8f; + [[graphicsView transformer] setScale:scale]; + [graphicsView refreshLayers]; +} + +- (void)zoomToActualSize:(id)sender { + [[graphicsView transformer] setScale:50.0f]; + [graphicsView refreshLayers]; +} + +@end diff --git a/tikzit-1/src/osx/ToolPaletteController.h b/tikzit-1/src/osx/ToolPaletteController.h new file mode 100644 index 0000000..6301c6b --- /dev/null +++ b/tikzit-1/src/osx/ToolPaletteController.h @@ -0,0 +1,42 @@ +// +// ToolPaletteController.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// +#import + +typedef enum { + TikzToolSelect, + TikzToolNode, + TikzToolEdge, + TikzToolCrop +} TikzTool; + +@interface ToolPaletteController : NSObject { + NSPanel *__weak toolPalette; + NSMatrix *__weak toolMatrix; +} + +@property TikzTool selectedTool; +@property (weak) IBOutlet NSPanel *toolPalette; +@property (weak) IBOutlet NSMatrix *toolMatrix; + + +@end diff --git a/tikzit-1/src/osx/ToolPaletteController.m b/tikzit-1/src/osx/ToolPaletteController.m new file mode 100644 index 0000000..000287d --- /dev/null +++ b/tikzit-1/src/osx/ToolPaletteController.m @@ -0,0 +1,58 @@ +// +// ToolPaletteController.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "ToolPaletteController.h" + + +@implementation ToolPaletteController + +@synthesize toolPalette, toolMatrix; + +- (TikzTool)selectedTool { + switch (toolMatrix.selectedRow) { + case 0: return TikzToolSelect; + case 1: return TikzToolNode; + case 2: return TikzToolEdge; + case 3: return TikzToolCrop; + } + return TikzToolSelect; +} + +- (void)setSelectedTool:(TikzTool)tool { + switch (tool) { + case TikzToolSelect: + [toolMatrix selectCellAtRow:0 column:0]; + break; + case TikzToolNode: + [toolMatrix selectCellAtRow:1 column:0]; + break; + case TikzToolEdge: + [toolMatrix selectCellAtRow:2 column:0]; + break; + case TikzToolCrop: + [toolMatrix selectCellAtRow:3 column:0]; + break; + } +} + +@end diff --git a/tikzit-1/src/osx/UpdatePreferenceController.h b/tikzit-1/src/osx/UpdatePreferenceController.h new file mode 100644 index 0000000..816322f --- /dev/null +++ b/tikzit-1/src/osx/UpdatePreferenceController.h @@ -0,0 +1,34 @@ +// +// UpdatePreferenceController.h +// TikZiT +// +// Copyright (c) 2013 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import + +@interface UpdatePreferenceController : NSViewController{ + IBOutlet SUUpdater *sharedUpdater; + IBOutlet NSDate *lastUpdate; +} + +- (IBAction)checkForUpdates:(id)sender; + +@end diff --git a/tikzit-1/src/osx/UpdatePreferenceController.m b/tikzit-1/src/osx/UpdatePreferenceController.m new file mode 100644 index 0000000..2ff270f --- /dev/null +++ b/tikzit-1/src/osx/UpdatePreferenceController.m @@ -0,0 +1,49 @@ +// +// UpdatePreferenceController.h +// TikZiT +// +// Copyright (c) 2013 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "UpdatePreferenceController.h" + +@interface UpdatePreferenceController () + +@end + +@implementation UpdatePreferenceController + +- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil +{ + self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]; + if (self) { + sharedUpdater = [SUUpdater sharedUpdater]; + } + return self; +} + +- (IBAction)checkForUpdates:(id)sender{ + [sharedUpdater checkForUpdates:sender]; +} + +- (NSDate*)getLastUpdate{ + return [sharedUpdater lastUpdateCheckDate]; +} + +@end diff --git a/tikzit-1/src/osx/UpdatePreferencePanel.xib b/tikzit-1/src/osx/UpdatePreferencePanel.xib new file mode 100644 index 0000000..a9f57bd --- /dev/null +++ b/tikzit-1/src/osx/UpdatePreferencePanel.xib @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tikzit-1/src/osx/main.m b/tikzit-1/src/osx/main.m new file mode 100644 index 0000000..e6b4499 --- /dev/null +++ b/tikzit-1/src/osx/main.m @@ -0,0 +1,26 @@ +// +// main.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// + +#import + +int main(int argc, char *argv[]) +{ + return NSApplicationMain(argc, (const char **) argv); +} diff --git a/tikzit-1/src/osx/test/main.m b/tikzit-1/src/osx/test/main.m new file mode 100644 index 0000000..ad0c1f7 --- /dev/null +++ b/tikzit-1/src/osx/test/main.m @@ -0,0 +1,56 @@ +// +// main.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "test/test.h" +#include + +void testCommon(); +void testOSX(); + +int main(int argc, char **argv) { + if (argc == 2 && strcmp(argv[1], "--disable-color")==0) { + setColorEnabled(NO); + } else { + setColorEnabled(YES); + } + + NSBundle *bund = [NSBundle bundleWithPath:@"TikZiT.app"]; + + + PUTS(@""); + PUTS(@"**********************************************"); + PUTS(@"TikZiT TESTS, OS X BUNDLE VERSION %@", + [bund objectForInfoDictionaryKey:@"CFBundleVersion"]); + PUTS(@"**********************************************"); + PUTS(@""); + + startTests(); + testCommon(); + testOSX(); + + PUTS(@""); + PUTS(@"**********************************************"); + endTests(); + PUTS(@"**********************************************"); + PUTS(@""); +} \ No newline at end of file diff --git a/tikzit-1/src/osx/test/osx.m b/tikzit-1/src/osx/test/osx.m new file mode 100644 index 0000000..f9565ab --- /dev/null +++ b/tikzit-1/src/osx/test/osx.m @@ -0,0 +1,64 @@ +// +// osx.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// +#import "test/test.h" + +#import + +void testOSX() { +// char template[] = "/tmp/tikzit_test_tmp_XXXXXXX"; +// char *dir = mkdtemp(template); +// NSString *tempDir = [NSString stringWithUTF8String:dir]; +// +// NSString *testLatex = +// @"\\documentclass{article}\n" +// @"\\begin{document}\n" +// @"test document\n" +// @"\\end{document}\n"; +// +// NSString *texFile = [NSString stringWithFormat:@"%@/test.tex", tempDir]; +// NSString *pdfFile = [NSString stringWithFormat:@"%@/test.pdf", tempDir]; +// +// [testLatex writeToFile:texFile atomically:NO encoding:NSUTF8StringEncoding error:NULL]; +// +// NSTask *task = [[NSTask alloc] init]; +// [task setLaunchPath:@"/bin/bash"]; +// NSPipe *inpt = [NSPipe pipe]; +// NSPipe *outpt = [NSPipe pipe]; +// [task setStandardInput:inpt]; +// [task setStandardOutput:outpt]; +// +// [task launch]; +// +// NSFileHandle *wr = [inpt fileHandleForWriting]; +// NSString *cmd = +// [NSString stringWithFormat: +// @"if [ -e ~/.profile ]; then source ~/.profile; fi" +// @"if [ -e ~/.profile ]; then source ~/.profile; fi"; +// [wr writeData:[cmd dataUsingEncoding:NSUTF8StringEncoding]]; +// [wr closeFile]; +// +// NSFileHandle *rd = [outpt fileHandleForReading]; +// NSString *res = [[NSString alloc] initWithData:[rd readDataToEndOfFile] +// encoding:NSUTF8StringEncoding]; +// NSLog(@"got:\n %@", res); +} diff --git a/tikzit-1/src/tikzit.rc b/tikzit-1/src/tikzit.rc new file mode 100644 index 0000000..072f825 --- /dev/null +++ b/tikzit-1/src/tikzit.rc @@ -0,0 +1,24 @@ +1 VERSIONINFO +FILEVERSION 0,7,0,0 +PRODUCTVERSION 0,7,0,0 +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "080904E4" + BEGIN + VALUE "FileDescription", "A graph editor for LaTeX" + VALUE "FileVersion", "1.0" + VALUE "InternalName", "tikzit" + VALUE "LegalCopyright", "Aleks Kissinger, Alex Merry, Chris Heunen" + VALUE "OriginalFilename", "tikzit.exe" + VALUE "ProductName", "TikZiT" + VALUE "ProductVersion", "0.7" + END + END + + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x809, 1252 + END +END +id ICON "../tikzit.ico" diff --git a/tikzit-1/text-x-generic.png b/tikzit-1/text-x-generic.png new file mode 100644 index 0000000..928a679 Binary files /dev/null and b/tikzit-1/text-x-generic.png differ diff --git a/tikzit-1/text-x-script.png b/tikzit-1/text-x-script.png new file mode 100644 index 0000000..801dcd6 Binary files /dev/null and b/tikzit-1/text-x-script.png differ diff --git a/tikzit-1/tikzit.icns b/tikzit-1/tikzit.icns new file mode 100644 index 0000000..dc66f7f Binary files /dev/null and b/tikzit-1/tikzit.icns differ diff --git a/tikzit-1/tikzit.ico b/tikzit-1/tikzit.ico new file mode 100644 index 0000000..3132b4c Binary files /dev/null and b/tikzit-1/tikzit.ico differ diff --git a/tikzit-1/tikzit.spec b/tikzit-1/tikzit.spec new file mode 100644 index 0000000..237c543 --- /dev/null +++ b/tikzit-1/tikzit.spec @@ -0,0 +1,98 @@ +Name: tikzit +Version: 1.0 +Release: 1%{?dist} +Summary: Tool for creating and modifying PGF/TikZ-based node-and-edge graphs for LaTeX documents + +# try to choose a sensible group for this distro +%if 0%{?suse_version} +Group: Productivity/Graphics/Visualization/Graph +%else +%if 0%{?mdkversion} +Group: Sciences/Other +%else +Group: Applications/Productivity +%endif +%endif + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif +URL: http://tikzit.sourceforge.net +Source0: http://switch.dl.sourceforge.net/project/%{name}/%{name}-%{version}/%{name}-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-build + +BuildRequires: gcc-objc >= 4.6.0 +BuildRequires: gnustep-base-devel >= 1.18.0 +BuildRequires: gtk2-devel >= 2.18.0 +BuildRequires: pango-devel >= 1.16 +BuildRequires: cairo-devel >= 1.4 +%if 0%{?suse_version}%{?mdkversion} +BuildRequires: libpoppler-glib-devel >= 0.10 +%else +BuildRequires: poppler-glib-devel >= 0.10 +%endif +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%description +TikZiT is a GTK+ application that allows the creation and modification of TeX +diagrams written using the pgf/TikZ macro library. It is especially geared +toward rapidly creating "dot"-diagrams for use in academic papers. + + +%prep +%setup -q + + +%build +%configure +make %{?_smp_mflags} + + +%install +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} +%if 0%{?suse_version} +# SuSE is particularly fussy about desktop file categories +%suse_update_desktop_file %{name} -r Graphics 2DGraphics +%endif + + +%clean +rm -rf %{buildroot} + + +%files +%defattr(-,root,root,-) +%doc +%{_bindir}/tikzit +%{_datadir}/tikzit/ +%{_datadir}/applications/tikzit.desktop +%{_datadir}/icons/hicolor/* + + +%changelog +* Fri May 17 2013 Alex Merry 1.0-2 +-Fixed license on openSUSE + +* Tue May 7 2013 Alex Merry 1.0-1 +-Bumped version + +* Fri Aug 24 2012 Alex Merry 0.9-1 +-Bumped version +-Bumped requirements + +* Tue Dec 06 2011 Alex Merry 0.7-1 +-Bumped version + +* Tue Feb 08 2011 Alex Merry 0.6-1 +-Bumped version +-Added Pango and Cairo to BuildRequires +-Set minimum version for GNUStep-base + +* Thu Dec 02 2010 Alex Merry 0.5-1 +-Rewrote spec file + diff --git a/tikzit-1/tikzit48x48.png b/tikzit-1/tikzit48x48.png new file mode 100644 index 0000000..056d04b Binary files /dev/null and b/tikzit-1/tikzit48x48.png differ diff --git a/tikzit-1/tikzit_dsa_pub.pem b/tikzit-1/tikzit_dsa_pub.pem new file mode 100644 index 0000000..c97cc04 --- /dev/null +++ b/tikzit-1/tikzit_dsa_pub.pem @@ -0,0 +1,20 @@ +-----BEGIN PUBLIC KEY----- +MIIDOjCCAi0GByqGSM44BAEwggIgAoIBAQDAdRlqLgJYjdAKkDsKtZDXgVlhqwyl +OXWCILHuE/MLh24I/mAaro4hucdhj92V5td9KNdM/R19904yZ3XcLj2/SodDVD7I +lEHPGwC/y+mJd9CaMNI/ARgFbLwJ+3+l/Ia3sraa/ASGAzardJPzYdkkRbZ/1DJn +wtHh2HgmPBdOMZZrbDmw3g4lj69Vacj4Wdz+YDG7750FjAUd+IcOvaDip28B8ogj +ogVirSXGe5YLoYbw078gx92PzSw6vfOZ3b7Gqk7zilYGB0bUJXUPSLOkxa5TMSx1 +Lr2UdW+vXrudI76rBhW52B32i7f801N4/W/qUfg8tw4tUGi/Uw8n2/S5AhUA0F82 +Qxit1jmqP0mZSLAn+qIVPuUCggEAEkSBjRxMo4KRvHOSppZphdaV2RWmQ6w9mxMj +3Z4AGDNU/buQ+TWJEYGVsIXpykI7DYCfgp8XO9uhj1hporfDsU4QGNZd0rG7SLK3 +DHwSf9QTgXY+D5IRQvkBtocxYRgNpuW+mfwl886SPmrRcT3QvsiFaI7/Iw787Tr6 +Yip4D7GjqTvj+epJH6kZq1xbdnrfBEA4dKs5IrZupF75npU8d1EjcdLlTyuzxuoZ +5a3SQWoBvT4l0xvbtR4yv+Af++MB+uxdxBSYMIgtQPgoIjFWtTDRZCwFAig1RWxz +fHEI5Fk4mqGhLAVbROL/pebYYZ5UxTKt9AMjmgmuM10/L5TXbwOCAQUAAoIBAA7t +W96VBoZgbbO2EfSxt5az4EnAJmuua6DNjZzESpcb67/DR7nLd5yveZEPL+9x6c1S +FtduIk8allplryOJtwysf8KkxrPVej83XiVJ9PDLMktsYjtnVksGIk9CS3v98OgT +c3g+xgJpRbwB6dROa5ZMxvoCU100ngfI3F/RUqeYYh7PP5kEL6SfqEHG5udIf1K7 +jUmOycNzI5Fsi+IDh8qtzxoOVTjoMPlN2F4T27xuWXA0BEd/NZqtgGLIFsbww5oD +8VPQIeo9UwQkYo/Qz1/uuaXi1u2PbTbbx2FTUL+zJuqrAv3oqmG2Ktyi0RXZaUAJ +4+P+kdS46Ip2NybQbkE= +-----END PUBLIC KEY----- diff --git a/tikzit-1/tikzitdoc.icns b/tikzit-1/tikzitdoc.icns new file mode 100644 index 0000000..2f8bbcd Binary files /dev/null and b/tikzit-1/tikzitdoc.icns differ diff --git a/tikzit-1/transform-crop-and-resize.png b/tikzit-1/transform-crop-and-resize.png new file mode 100644 index 0000000..4dedd93 Binary files /dev/null and b/tikzit-1/transform-crop-and-resize.png differ diff --git a/tikzit-1/transform-move.png b/tikzit-1/transform-move.png new file mode 100644 index 0000000..ae4201b Binary files /dev/null and b/tikzit-1/transform-move.png differ diff --git a/tikzit-1/updates.png b/tikzit-1/updates.png new file mode 100755 index 0000000..469ae30 Binary files /dev/null and b/tikzit-1/updates.png differ diff --git a/tikzit/.gitignore b/tikzit/.gitignore deleted file mode 100644 index fc1d580..0000000 --- a/tikzit/.gitignore +++ /dev/null @@ -1,235 +0,0 @@ -# Previous gitignore items - -*~ -*.swp -*.o -.deps -.dirstamp -Makefile -Makefile.in -/aclocal.m4 -/autom4te.cache -/config.guess -/config.log -/config.status -/config.sub -/configure -/depcomp -/install-sh -/missing -/src/tikzit -/src/tikzit.res -/src/common/tikzlexer.h -/src/common/tikzlexer.m -/src/common/tikzparser.m -/src/common/tikzparser.h -/src/gtk/icondata.m -/src/gtk/logodata.m -/src/gtk/edgedecdata.m -/tikzit-*.tar.gz -/tikzit-*.tar.bz2 -xbuild - -######################### -# .gitignore file for Xcode4 and Xcode5 Source projects -# -# Apple bugs, waiting for Apple to fix/respond: -# -# 15564624 - what does the xccheckout file in Xcode5 do? Where's the documentation? -# -# Version 2.3 -# For latest version, see: http://stackoverflow.com/questions/49478/git-ignore-file-for-xcode-projects -# -# 2014 updates: -# - appended non-standard items DISABLED by default (uncomment if you use those tools) -# - removed the edit that an SO.com moderator made without bothering to ask me -# - researched CocoaPods .lock more carefully, thanks to Gokhan Celiker -# 2013 updates: -# - fixed the broken "save personal Schemes" -# - added line-by-line explanations for EVERYTHING (some were missing) -# -# NB: if you are storing "built" products, this WILL NOT WORK, -# and you should use a different .gitignore (or none at all) -# This file is for SOURCE projects, where there are many extra -# files that we want to exclude -# -######################### - -##### -# OS X temporary files that should never be committed -# -# c.f. http://www.westwind.com/reference/os-x/invisibles.html - -.DS_Store -.Trashes -*.swp - -# -# *.lock - this is used and abused by many editors for many different things. -# For the main ones I use (e.g. Eclipse), it should be excluded -# from source-control, but YMMV. -# (lock files are usually local-only file-synchronization on the local FS that should NOT go in git) -# c.f. the "OPTIONAL" section at bottom though, for tool-specific variations! - -*.lock - - -# -# profile - REMOVED temporarily (on double-checking, I can't find it in OS X docs?) -#profile - - -#### -# Xcode temporary files that should never be committed -# -# NB: NIB/XIB files still exist even on Storyboard projects, so we want this... - -*~.nib - - -#### -# Xcode build files - -# -# NB: slash on the end, so we only remove the FOLDER, not any files that were badly named "DerivedData" - -DerivedData/ - -# NB: slash on the end, so we only remove the FOLDER, not any files that were badly named "build" - -build/ - - -##### -# Xcode private settings (window sizes, bookmarks, breakpoints, custom executables, smart groups) -# -# This is complicated: -# -# SOMETIMES you need to put this file in version control. -# Apple designed it poorly - if you use "custom executables", they are -# saved in this file. -# 99% of projects do NOT use those, so they do NOT want to version control this file. -# ..but if you're in the 1%, comment out the line "*.pbxuser" - -# .pbxuser: http://lists.apple.com/archives/xcode-users/2004/Jan/msg00193.html - -*.pbxuser - -# .mode1v3: http://lists.apple.com/archives/xcode-users/2007/Oct/msg00465.html - -*.mode1v3 - -# .mode2v3: http://lists.apple.com/archives/xcode-users/2007/Oct/msg00465.html - -*.mode2v3 - -# .perspectivev3: http://stackoverflow.com/questions/5223297/xcode-projects-what-is-a-perspectivev3-file - -*.perspectivev3 - -# NB: also, whitelist the default ones, some projects need to use these -!default.pbxuser -!default.mode1v3 -!default.mode2v3 -!default.perspectivev3 - - -#### -# Xcode 4 - semi-personal settings -# -# -# OPTION 1: --------------------------------- -# throw away ALL personal settings (including custom schemes! -# - unless they are "shared") -# -# NB: this is exclusive with OPTION 2 below -xcuserdata - -# OPTION 2: --------------------------------- -# get rid of ALL personal settings, but KEEP SOME OF THEM -# - NB: you must manually uncomment the bits you want to keep -# -# NB: this *requires* git v1.8.2 or above; you may need to upgrade to latest OS X, -# or manually install git over the top of the OS X version -# NB: this is exclusive with OPTION 1 above -# -#xcuserdata/**/* - -# (requires option 2 above): Personal Schemes -# -#!xcuserdata/**/xcschemes/* - -#### -# XCode 4 workspaces - more detailed -# -# Workspaces are important! They are a core feature of Xcode - don't exclude them :) -# -# Workspace layout is quite spammy. For reference: -# -# /(root)/ -# /(project-name).xcodeproj/ -# project.pbxproj -# /project.xcworkspace/ -# contents.xcworkspacedata -# /xcuserdata/ -# /(your name)/xcuserdatad/ -# UserInterfaceState.xcuserstate -# /xcsshareddata/ -# /xcschemes/ -# (shared scheme name).xcscheme -# /xcuserdata/ -# /(your name)/xcuserdatad/ -# (private scheme).xcscheme -# xcschememanagement.plist -# -# - -#### -# Xcode 4 - Deprecated classes -# -# Allegedly, if you manually "deprecate" your classes, they get moved here. -# -# We're using source-control, so this is a "feature" that we do not want! - -*.moved-aside - -#### -# OPTIONAL: Some well-known tools that people use side-by-side with Xcode / iOS development -# -# NB: I'd rather not include these here, but gitignore's design is weak and doesn't allow -# modular gitignore: you have to put EVERYTHING in one file. -# -# COCOAPODS: -# -# c.f. http://guides.cocoapods.org/using/using-cocoapods.html#what-is-a-podfilelock -# c.f. http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control -# -#!Podfile.lock -# -# RUBY: -# -# c.f. http://yehudakatz.com/2010/12/16/clarifying-the-roles-of-the-gemspec-and-gemfile/ -# -#!Gemfile.lock -# -# IDEA: -# -#.idea -# -# TEXTMATE: -# -# -- UNVERIFIED: c.f. http://stackoverflow.com/a/50283/153422 -# -#tm_build_errors - -#### -# UNKNOWN: recommended by others, but I can't discover what these files are -# -# Community suggestions (unverified, no evidence available - DISABLED by default) -# -# 1. Xcode 5 - VCS file -# -# "The data in this file not represent state of your project. -# If you'll leave this file in git - you will have merge conflicts during -# pull your cahnges to other's repo" -# -#*.xccheckout \ No newline at end of file diff --git a/tikzit/AH_latex_head.png b/tikzit/AH_latex_head.png deleted file mode 100644 index b25cf6d..0000000 Binary files a/tikzit/AH_latex_head.png and /dev/null differ diff --git a/tikzit/AH_latex_tail.png b/tikzit/AH_latex_tail.png deleted file mode 100644 index 0825cda..0000000 Binary files a/tikzit/AH_latex_tail.png and /dev/null differ diff --git a/tikzit/AH_none.png b/tikzit/AH_none.png deleted file mode 100644 index 6322374..0000000 Binary files a/tikzit/AH_none.png and /dev/null differ diff --git a/tikzit/AH_plain_head.png b/tikzit/AH_plain_head.png deleted file mode 100644 index 8a398fa..0000000 Binary files a/tikzit/AH_plain_head.png and /dev/null differ diff --git a/tikzit/AH_plain_tail.png b/tikzit/AH_plain_tail.png deleted file mode 100644 index 45b1876..0000000 Binary files a/tikzit/AH_plain_tail.png and /dev/null differ diff --git a/tikzit/COPYING b/tikzit/COPYING deleted file mode 100644 index 1f963da..0000000 --- a/tikzit/COPYING +++ /dev/null @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. - diff --git a/tikzit/DESIGN-GTK b/tikzit/DESIGN-GTK deleted file mode 100644 index 7952a34..0000000 --- a/tikzit/DESIGN-GTK +++ /dev/null @@ -1,23 +0,0 @@ -Some documentation on how the GTK+ port is designed. - -State classes: - -StyleManager keeps track of what user-defined styles the application -knows about, and which one is currently "active". The active style -is used when creating new nodes. - -Preambles keeps track of the preambles used for previews. - - -GUI classes: - -MainWindow is the core class that manages the application as a whole. -It manages the main GtkWindow and is generally responsible for loading -the various UI elements. It also keeps track of the main application -configuration file, the user-defined styles (via StyleManager) and the -custom preambles (via Preambles). - -The Menu class manages the menu and toolbar for MainWindow. It uses -GtkUiManager to load these from an XML description, and deals with the -GTK+ callbacks for the various actions. - diff --git a/tikzit/ED_arrow.png b/tikzit/ED_arrow.png deleted file mode 100644 index 153d2e1..0000000 Binary files a/tikzit/ED_arrow.png and /dev/null differ diff --git a/tikzit/ED_none.png b/tikzit/ED_none.png deleted file mode 100644 index f95140c..0000000 Binary files a/tikzit/ED_none.png and /dev/null differ diff --git a/tikzit/ED_tick.png b/tikzit/ED_tick.png deleted file mode 100644 index a3882fe..0000000 Binary files a/tikzit/ED_tick.png and /dev/null differ diff --git a/tikzit/English.lproj/Credits.rtf b/tikzit/English.lproj/Credits.rtf deleted file mode 100644 index 708d138..0000000 --- a/tikzit/English.lproj/Credits.rtf +++ /dev/null @@ -1,18 +0,0 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf250 -{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fnil\fcharset0 LucidaSans-Typewriter;} -{\colortbl;\red255\green255\blue255;\red0\green0\blue0;} -\vieww9000\viewh8400\viewkind0 -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural - -\f0\b\fs24 \cf0 TikZiT\ -\ -Copyright 2010 Aleks Kissinger. All rights reserved.\ - -\b0 \ -\pard\tx560\pardeftab560\ql\qnatural\pardirnatural - -\f1\fs22 \cf2 \CocoaLigature0 TikZiT is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\ -\ -TikZiT is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\ -\ -You should have received a copy of the GNU General Public License along with TikZiT. If not, see .} \ No newline at end of file diff --git a/tikzit/English.lproj/CustomNodes.xib b/tikzit/English.lproj/CustomNodes.xib deleted file mode 100644 index 33f6e3a..0000000 --- a/tikzit/English.lproj/CustomNodes.xib +++ /dev/null @@ -1,256 +0,0 @@ - - - - - - - - - - - - - - - - - - - - name - strokeThickness - strokeColor - fillColor - strokeColorIsKnown - fillColorIsKnown - representedObject.name - shapeName - scale - @distinctUnionOfObjects.category - category - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \begin{tikzpicture} - -\end{tikzpicture} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tikzit/English.lproj/InfoPlist.strings b/tikzit/English.lproj/InfoPlist.strings deleted file mode 100644 index 477b28f..0000000 --- a/tikzit/English.lproj/InfoPlist.strings +++ /dev/null @@ -1,2 +0,0 @@ -/* Localized versions of Info.plist keys */ - diff --git a/tikzit/English.lproj/MainMenu.xib b/tikzit/English.lproj/MainMenu.xib deleted file mode 100644 index c7f22d7..0000000 --- a/tikzit/English.lproj/MainMenu.xib +++ /dev/null @@ -1,453 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -CA - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tikzit/English.lproj/Preamble.xib b/tikzit/English.lproj/Preamble.xib deleted file mode 100644 index 54a4125..0000000 --- a/tikzit/English.lproj/Preamble.xib +++ /dev/null @@ -1,235 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NSNegateBoolean - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NSNegateBoolean - - - - - - - - - - - - - - - - - - - - - - - - - - - - key - - - default - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tikzit/English.lproj/Preview.xib b/tikzit/English.lproj/Preview.xib deleted file mode 100644 index cb1e82c..0000000 --- a/tikzit/English.lproj/Preview.xib +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tikzit/English.lproj/PropertyInspector.xib b/tikzit/English.lproj/PropertyInspector.xib deleted file mode 100644 index 9f19b5c..0000000 --- a/tikzit/English.lproj/PropertyInspector.xib +++ /dev/null @@ -1,769 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Multiple Values - NilToEmptyStringTransformer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NSNegateBoolean - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NilToEmptyStringTransformer - - - - - - - - - - - - - - - - - - - - - - - NSNegateBoolean - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NilToEmptyStringTransformer - - - - - - - - - - - - - - - - - - - - - - - NSNegateBoolean - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NilToEmptyStringTransformer - - - - - - - - - - - - - - - - - - - - - - - NSNegateBoolean - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NilToEmptyStringTransformer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - key - value - isAtom - - - - - key - value - isAtom - - - - - key - value - isAtom - - - - - key - value - isAtom - - - - - label - - - - - - - - edgeNode - - - - - - - - - - - - - - - - - - - - - - - - - - - NilToEmptyStringTransformer - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tikzit/English.lproj/StylePalette.xib b/tikzit/English.lproj/StylePalette.xib deleted file mode 100644 index 6385ba8..0000000 --- a/tikzit/English.lproj/StylePalette.xib +++ /dev/null @@ -1,631 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - uncategorized - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - uncategorized - - - - - - - - - name - strokeThickness - strokeColor - fillColor - strokeColorIsKnown - fillColorIsKnown - representedObject.name - shapeName - scale - @distinctUnionOfObjects.category - category - - - - - - - - @distinctUnionOfObjects.category - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - uncategorized - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - uncategorized - - - - - - - - - - - name - headStyle - tailStyle - decorationStyle - category - - - - - - - - name - headStyle - tailStyle - decorationStyle - category - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tikzit/English.lproj/TikzDocument.xib b/tikzit/English.lproj/TikzDocument.xib deleted file mode 100644 index 842b810..0000000 --- a/tikzit/English.lproj/TikzDocument.xib +++ /dev/null @@ -1,161 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \begin{tikzpicture} - -\end{tikzpicture} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tikzit/English.lproj/UserDefaults.plist b/tikzit/English.lproj/UserDefaults.plist deleted file mode 100644 index cdd5c8f..0000000 --- a/tikzit/English.lproj/UserDefaults.plist +++ /dev/null @@ -1,10 +0,0 @@ - - - - - net.sourceforge.tikzit.pdflatexpath - /usr/texbin/pdflatex - net.sourceforge.tikzit.previewfocus - - - diff --git a/tikzit/Frameworks/SFBInspectors.framework/Headers b/tikzit/Frameworks/SFBInspectors.framework/Headers deleted file mode 120000 index a177d2a..0000000 --- a/tikzit/Frameworks/SFBInspectors.framework/Headers +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Headers \ No newline at end of file diff --git a/tikzit/Frameworks/SFBInspectors.framework/Resources b/tikzit/Frameworks/SFBInspectors.framework/Resources deleted file mode 120000 index 953ee36..0000000 --- a/tikzit/Frameworks/SFBInspectors.framework/Resources +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Resources \ No newline at end of file diff --git a/tikzit/Frameworks/SFBInspectors.framework/SFBInspectors b/tikzit/Frameworks/SFBInspectors.framework/SFBInspectors deleted file mode 120000 index d0c5a0b..0000000 --- a/tikzit/Frameworks/SFBInspectors.framework/SFBInspectors +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/SFBInspectors \ No newline at end of file diff --git a/tikzit/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPane.h b/tikzit/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPane.h deleted file mode 100644 index b50c12d..0000000 --- a/tikzit/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPane.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (C) 2009 Stephen F. Booth - * All Rights Reserved - */ - -#import - -#define INSPECTOR_PANE_HEADER_HEIGHT 17 - -@class SFBInspectorPaneHeader, SFBInspectorPaneBody; - -@interface SFBInspectorPane : NSView -{ -@private - BOOL _collapsed; - SFBInspectorPaneHeader *_headerView; - SFBInspectorPaneBody *_bodyView; -} - -@property (readonly, assign, getter=isCollapsed) BOOL collapsed; - -- (NSString *) title; -- (void) setTitle:(NSString *)title; - -- (IBAction) toggleCollapsed:(id)sender; -- (void) setCollapsed:(BOOL)collapsed animate:(BOOL)animate; - -- (SFBInspectorPaneHeader *) headerView; -- (SFBInspectorPaneBody *) bodyView; - -@end diff --git a/tikzit/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPaneBody.h b/tikzit/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPaneBody.h deleted file mode 100644 index 250f9e6..0000000 --- a/tikzit/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPaneBody.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (C) 2009 Stephen F. Booth - * All Rights Reserved - */ - -#import - -@interface SFBInspectorPaneBody : NSView -{ -@private - CGFloat _normalHeight; -} - -@property (readonly, assign) CGFloat normalHeight; - -@end diff --git a/tikzit/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPaneHeader.h b/tikzit/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPaneHeader.h deleted file mode 100644 index 3512d75..0000000 --- a/tikzit/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPaneHeader.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2009 Stephen F. Booth - * All Rights Reserved - */ - -#import - -@class SFBInspectorPane; - -@interface SFBInspectorPaneHeader : NSView -{ -@private - BOOL _pressed; - NSButton *_disclosureButton; - NSTextField *_titleTextField; -} - -- (NSString *) title; -- (void) setTitle:(NSString *)title; - -- (NSButton *) disclosureButton; -- (NSTextField *) titleTextField; - -@end diff --git a/tikzit/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorView.h b/tikzit/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorView.h deleted file mode 100644 index e7f4b53..0000000 --- a/tikzit/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorView.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (C) 2009 Stephen F. Booth - * All Rights Reserved - */ - -#import - -@interface SFBInspectorView : NSView -{ -@private - NSSize _initialWindowSize; -} - -- (void) addInspectorPaneController:(NSViewController *)paneController; -- (void) addInspectorPane:(NSView *)paneBody title:(NSString *)title; - -@end diff --git a/tikzit/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelector.h b/tikzit/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelector.h deleted file mode 100644 index 8645914..0000000 --- a/tikzit/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelector.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (C) 2009 Stephen F. Booth - * All Rights Reserved - */ - -#import - -#define VIEW_SELECTOR_BAR_HEIGHT 25 - -@class SFBViewSelectorBar; - -@interface SFBViewSelector : NSView -{ -@private - NSSize _initialWindowSize; - SFBViewSelectorBar *_selectorBar; - NSView *_bodyView; -} - -- (SFBViewSelectorBar *) selectorBar; - -@end diff --git a/tikzit/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelectorBar.h b/tikzit/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelectorBar.h deleted file mode 100644 index d0c8c30..0000000 --- a/tikzit/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelectorBar.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2009 Stephen F. Booth - * All Rights Reserved - */ - -#import - -@class SFBViewSelectorBarItem; - -@interface SFBViewSelectorBar : NSView -{ -@private - NSInteger _selectedIndex; - NSInteger _pressedIndex; - NSMutableArray *_items; -} - -@property (assign) NSInteger selectedIndex; -@property (readonly) SFBViewSelectorBarItem * selectedItem; - -- (void) addItem:(SFBViewSelectorBarItem *)item; - -- (BOOL) selectItem:(SFBViewSelectorBarItem *)item; -- (BOOL) selectItemWithIdentifer:(NSString *)itemIdentifier; - -- (SFBViewSelectorBarItem *) itemAtIndex:(NSInteger)itemIndex; -- (SFBViewSelectorBarItem *) itemWithIdentifier:(NSString *)itemIdentifier; - -@end diff --git a/tikzit/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelectorBarItem.h b/tikzit/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelectorBarItem.h deleted file mode 100644 index c18cfb3..0000000 --- a/tikzit/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelectorBarItem.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (C) 2009 Stephen F. Booth - * All Rights Reserved - */ - -#import - -@interface SFBViewSelectorBarItem : NSObject -{ -@private - NSString *_identifier; - NSString *_label; - NSString *_tooltip; - NSImage *_image; - NSView *_view; -} - -@property (copy) NSString * identifier; -@property (copy) NSString * label; -@property (copy) NSString * tooltip; -@property (copy) NSImage * image; -@property (retain) NSView * view; - -+ (id) itemWithIdentifier:(NSString *)identifier label:(NSString *)label tooltip:(NSString *)tooltip image:(NSImage *)image view:(NSView *)view; - -- (id) initWithIdentifier:(NSString *)identifier label:(NSString *)label tooltip:(NSString *)tooltip image:(NSImage *)image view:(NSView *)view; - -@end diff --git a/tikzit/Frameworks/SFBInspectors.framework/Versions/A/Resources/English.lproj/InfoPlist.strings b/tikzit/Frameworks/SFBInspectors.framework/Versions/A/Resources/English.lproj/InfoPlist.strings deleted file mode 100644 index dea12de..0000000 Binary files a/tikzit/Frameworks/SFBInspectors.framework/Versions/A/Resources/English.lproj/InfoPlist.strings and /dev/null differ diff --git a/tikzit/Frameworks/SFBInspectors.framework/Versions/A/Resources/Info.plist b/tikzit/Frameworks/SFBInspectors.framework/Versions/A/Resources/Info.plist deleted file mode 100644 index d3e80f3..0000000 --- a/tikzit/Frameworks/SFBInspectors.framework/Versions/A/Resources/Info.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - SFBInspectors - CFBundleIdentifier - org.sbooth.Inspectors - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - SFBInspectors - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - - diff --git a/tikzit/Frameworks/SFBInspectors.framework/Versions/A/SFBInspectors b/tikzit/Frameworks/SFBInspectors.framework/Versions/A/SFBInspectors deleted file mode 100755 index 6174fbb..0000000 Binary files a/tikzit/Frameworks/SFBInspectors.framework/Versions/A/SFBInspectors and /dev/null differ diff --git a/tikzit/Frameworks/SFBInspectors.framework/Versions/Current b/tikzit/Frameworks/SFBInspectors.framework/Versions/Current deleted file mode 120000 index 8c7e5a6..0000000 --- a/tikzit/Frameworks/SFBInspectors.framework/Versions/Current +++ /dev/null @@ -1 +0,0 @@ -A \ No newline at end of file diff --git a/tikzit/Frameworks/Sparkle.framework/Headers b/tikzit/Frameworks/Sparkle.framework/Headers deleted file mode 120000 index a177d2a..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Headers +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Headers \ No newline at end of file diff --git a/tikzit/Frameworks/Sparkle.framework/Resources b/tikzit/Frameworks/Sparkle.framework/Resources deleted file mode 120000 index 953ee36..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Resources +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Resources \ No newline at end of file diff --git a/tikzit/Frameworks/Sparkle.framework/Sparkle b/tikzit/Frameworks/Sparkle.framework/Sparkle deleted file mode 120000 index b2c5273..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Sparkle +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Sparkle \ No newline at end of file diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcast.h b/tikzit/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcast.h deleted file mode 100644 index 171148a..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcast.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// SUAppcast.h -// Sparkle -// -// Created by Andy Matuschak on 3/12/06. -// Copyright 2006 Andy Matuschak. All rights reserved. -// - -#ifndef SUAPPCAST_H -#define SUAPPCAST_H - -@class SUAppcastItem; -@interface SUAppcast : NSObject { - NSArray *items; - NSString *userAgentString; - id delegate; - NSMutableData *incrementalData; -} - -- (void)fetchAppcastFromURL:(NSURL *)url; -- (void)setDelegate:delegate; -- (void)setUserAgentString:(NSString *)userAgentString; - -- (NSArray *)items; - -@end - -@interface NSObject (SUAppcastDelegate) -- (void)appcastDidFinishLoading:(SUAppcast *)appcast; -- (void)appcast:(SUAppcast *)appcast failedToLoadWithError:(NSError *)error; -@end - -#endif diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h b/tikzit/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h deleted file mode 100644 index 7f1ca65..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h +++ /dev/null @@ -1,47 +0,0 @@ -// -// SUAppcastItem.h -// Sparkle -// -// Created by Andy Matuschak on 3/12/06. -// Copyright 2006 Andy Matuschak. All rights reserved. -// - -#ifndef SUAPPCASTITEM_H -#define SUAPPCASTITEM_H - -@interface SUAppcastItem : NSObject { - NSString *title; - NSDate *date; - NSString *itemDescription; - - NSURL *releaseNotesURL; - - NSString *DSASignature; - NSString *minimumSystemVersion; - - NSURL *fileURL; - NSString *versionString; - NSString *displayVersionString; - - NSDictionary *propertiesDictionary; -} - -// Initializes with data from a dictionary provided by the RSS class. -- initWithDictionary:(NSDictionary *)dict; - -- (NSString *)title; -- (NSString *)versionString; -- (NSString *)displayVersionString; -- (NSDate *)date; -- (NSString *)itemDescription; -- (NSURL *)releaseNotesURL; -- (NSURL *)fileURL; -- (NSString *)DSASignature; -- (NSString *)minimumSystemVersion; - -// Returns the dictionary provided in initWithDictionary; this might be useful later for extensions. -- (NSDictionary *)propertiesDictionary; - -@end - -#endif diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Headers/SUUpdater.h b/tikzit/Frameworks/Sparkle.framework/Versions/A/Headers/SUUpdater.h deleted file mode 100644 index e78c4d3..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Headers/SUUpdater.h +++ /dev/null @@ -1,118 +0,0 @@ -// -// SUUpdater.h -// Sparkle -// -// Created by Andy Matuschak on 1/4/06. -// Copyright 2006 Andy Matuschak. All rights reserved. -// - -#ifndef SUUPDATER_H -#define SUUPDATER_H - -#import - -@class SUUpdateDriver, SUAppcastItem, SUHost, SUAppcast; -@interface SUUpdater : NSObject { - NSTimer *checkTimer; - SUUpdateDriver *driver; - - SUHost *host; - IBOutlet id delegate; -} - -+ (SUUpdater *)sharedUpdater; -+ (SUUpdater *)updaterForBundle:(NSBundle *)bundle; -- (NSBundle *)hostBundle; - -- (void)setDelegate:(id)delegate; -- delegate; - -- (void)setAutomaticallyChecksForUpdates:(BOOL)automaticallyChecks; -- (BOOL)automaticallyChecksForUpdates; - -- (void)setUpdateCheckInterval:(NSTimeInterval)interval; -- (NSTimeInterval)updateCheckInterval; - -- (void)setFeedURL:(NSURL *)feedURL; -- (NSURL *)feedURL; - -- (void)setSendsSystemProfile:(BOOL)sendsSystemProfile; -- (BOOL)sendsSystemProfile; - -- (void)setAutomaticallyDownloadsUpdates:(BOOL)automaticallyDownloadsUpdates; -- (BOOL)automaticallyDownloadsUpdates; - -// This IBAction is meant for a main menu item. Hook up any menu item to this action, -// and Sparkle will check for updates and report back its findings verbosely. -- (IBAction)checkForUpdates:sender; - -// This kicks off an update meant to be programmatically initiated. That is, it will display no UI unless it actually finds an update, -// in which case it proceeds as usual. If the fully automated updating is turned on, however, this will invoke that behavior, and if an -// update is found, it will be downloaded and prepped for installation. -- (void)checkForUpdatesInBackground; - -// Date of last update check. Returns null if no check has been performed. -- (NSDate*)lastUpdateCheckDate; - -// This begins a "probing" check for updates which will not actually offer to update to that version. The delegate methods, though, -// (up to updater:didFindValidUpdate: and updaterDidNotFindUpdate:), are called, so you can use that information in your UI. -- (void)checkForUpdateInformation; - -// Call this to appropriately schedule or cancel the update checking timer according to the preferences for time interval and automatic checks. This call does not change the date of the next check, but only the internal NSTimer. -- (void)resetUpdateCycle; - -- (BOOL)updateInProgress; -@end - -@interface NSObject (SUUpdaterDelegateInformalProtocol) -// This method allows you to add extra parameters to the appcast URL, potentially based on whether or not Sparkle will also be sending along the system profile. This method should return an array of dictionaries with keys: "key", "value", "displayKey", "displayValue", the latter two being specifically for display to the user. -- (NSArray *)feedParametersForUpdater:(SUUpdater *)updater sendingSystemProfile:(BOOL)sendingProfile; - -// Use this to override the default behavior for Sparkle prompting the user about automatic update checks. -- (BOOL)updaterShouldPromptForPermissionToCheckForUpdates:(SUUpdater *)bundle; - -// Implement this if you want to do some special handling with the appcast once it finishes loading. -- (void)updater:(SUUpdater *)updater didFinishLoadingAppcast:(SUAppcast *)appcast; - -// If you're using special logic or extensions in your appcast, implement this to use your own logic for finding -// a valid update, if any, in the given appcast. -- (SUAppcastItem *)bestValidUpdateInAppcast:(SUAppcast *)appcast forUpdater:(SUUpdater *)bundle; - -// Sent when a valid update is found by the update driver. -- (void)updater:(SUUpdater *)updater didFindValidUpdate:(SUAppcastItem *)update; - -// Sent when a valid update is not found. -- (void)updaterDidNotFindUpdate:(SUUpdater *)update; - -// Sent immediately before installing the specified update. -- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)update; - -// Return YES to delay the relaunch until you do some processing; invoke the given NSInvocation to continue. -- (BOOL)updater:(SUUpdater *)updater shouldPostponeRelaunchForUpdate:(SUAppcastItem *)update untilInvoking:(NSInvocation *)invocation; - -// Called immediately before relaunching. -- (void)updaterWillRelaunchApplication:(SUUpdater *)updater; - -// This method allows you to provide a custom version comparator. -// If you don't implement this method or return nil, the standard version comparator will be used. -- (id )versionComparatorForUpdater:(SUUpdater *)updater; - -// Returns the path which is used to relaunch the client after the update is installed. By default, the path of the host bundle. -- (NSString *)pathToRelaunchForUpdater:(SUUpdater *)updater; - -@end - -// Define some minimum intervals to avoid DOS-like checking attacks. These are in seconds. -#ifdef DEBUG -#define SU_MIN_CHECK_INTERVAL 60 -#else -#define SU_MIN_CHECK_INTERVAL 60*60 -#endif - -#ifdef DEBUG -#define SU_DEFAULT_CHECK_INTERVAL 60 -#else -#define SU_DEFAULT_CHECK_INTERVAL 60*60*24 -#endif - -#endif diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h b/tikzit/Frameworks/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h deleted file mode 100644 index 3d11ae8..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h +++ /dev/null @@ -1,27 +0,0 @@ -// -// SUVersionComparisonProtocol.h -// Sparkle -// -// Created by Andy Matuschak on 12/21/07. -// Copyright 2007 Andy Matuschak. All rights reserved. -// - -#ifndef SUVERSIONCOMPARISONPROTOCOL_H -#define SUVERSIONCOMPARISONPROTOCOL_H - -/*! - @protocol - @abstract Implement this protocol to provide version comparison facilities for Sparkle. -*/ -@protocol SUVersionComparison - -/*! - @method - @abstract An abstract method to compare two version strings. - @discussion Should return NSOrderedAscending if b > a, NSOrderedDescending if b < a, and NSOrderedSame if they are equivalent. -*/ -- (NSComparisonResult)compareVersion:(NSString *)versionA toVersion:(NSString *)versionB; - -@end - -#endif diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Headers/Sparkle.h b/tikzit/Frameworks/Sparkle.framework/Versions/A/Headers/Sparkle.h deleted file mode 100644 index 08dd577..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Headers/Sparkle.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// Sparkle.h -// Sparkle -// -// Created by Andy Matuschak on 3/16/06. (Modified by CDHW on 23/12/07) -// Copyright 2006 Andy Matuschak. All rights reserved. -// - -#ifndef SPARKLE_H -#define SPARKLE_H - -// This list should include the shared headers. It doesn't matter if some of them aren't shared (unless -// there are name-space collisions) so we can list all of them to start with: - -#import - -#import -#import -#import - -#endif diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/Info.plist b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/Info.plist deleted file mode 100644 index c7f277d..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/Info.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - Sparkle - CFBundleIdentifier - org.andymatuschak.Sparkle - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - Sparkle - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.5 Beta 6 - CFBundleSignature - ???? - CFBundleVersion - 313 - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/License.txt b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/License.txt deleted file mode 100644 index 20466c4..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/License.txt +++ /dev/null @@ -1,7 +0,0 @@ -Copyright (c) 2006 Andy Matuschak - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/SUModelTranslation.plist b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/SUModelTranslation.plist deleted file mode 100644 index 92ef947..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/SUModelTranslation.plist +++ /dev/null @@ -1,174 +0,0 @@ - - - - - ADP2,1 - Developer Transition Kit - MacBook1,1 - MacBook (Core Duo) - MacBook2,1 - MacBook (Core 2 Duo) - MacBook4,1 - MacBook (Core 2 Duo Feb 2008) - MacBookAir1,1 - MacBook Air (January 2008) - MacBookPro1,1 - MacBook Pro Core Duo (15-inch) - MacBookPro1,2 - MacBook Pro Core Duo (17-inch) - MacBookPro2,1 - MacBook Pro Core 2 Duo (17-inch) - MacBookPro2,2 - MacBook Pro Core 2 Duo (15-inch) - MacBookPro3,1 - MacBook Pro Core 2 Duo (15-inch LED, Core 2 Duo) - MacBookPro3,2 - MacBook Pro Core 2 Duo (17-inch HD, Core 2 Duo) - MacBookPro4,1 - MacBook Pro (Core 2 Duo Feb 2008) - MacPro1,1 - Mac Pro (four-core) - MacPro2,1 - Mac Pro (eight-core) - MacPro3,1 - Mac Pro (January 2008 4- or 8- core "Harpertown") - Macmini1,1 - Mac Mini (Core Solo/Duo) - PowerBook1,1 - PowerBook G3 - PowerBook2,1 - iBook G3 - PowerBook2,2 - iBook G3 (FireWire) - PowerBook2,3 - iBook G3 - PowerBook2,4 - iBook G3 - PowerBook3,1 - PowerBook G3 (FireWire) - PowerBook3,2 - PowerBook G4 - PowerBook3,3 - PowerBook G4 (Gigabit Ethernet) - PowerBook3,4 - PowerBook G4 (DVI) - PowerBook3,5 - PowerBook G4 (1GHz / 867MHz) - PowerBook4,1 - iBook G3 (Dual USB, Late 2001) - PowerBook4,2 - iBook G3 (16MB VRAM) - PowerBook4,3 - iBook G3 Opaque 16MB VRAM, 32MB VRAM, Early 2003) - PowerBook5,1 - PowerBook G4 (17 inch) - PowerBook5,2 - PowerBook G4 (15 inch FW 800) - PowerBook5,3 - PowerBook G4 (17-inch 1.33GHz) - PowerBook5,4 - PowerBook G4 (15 inch 1.5/1.33GHz) - PowerBook5,5 - PowerBook G4 (17-inch 1.5GHz) - PowerBook5,6 - PowerBook G4 (15 inch 1.67GHz/1.5GHz) - PowerBook5,7 - PowerBook G4 (17-inch 1.67GHz) - PowerBook5,8 - PowerBook G4 (Double layer SD, 15 inch) - PowerBook5,9 - PowerBook G4 (Double layer SD, 17 inch) - PowerBook6,1 - PowerBook G4 (12 inch) - PowerBook6,2 - PowerBook G4 (12 inch, DVI) - PowerBook6,3 - iBook G4 - PowerBook6,4 - PowerBook G4 (12 inch 1.33GHz) - PowerBook6,5 - iBook G4 (Early-Late 2004) - PowerBook6,7 - iBook G4 (Mid 2005) - PowerBook6,8 - PowerBook G4 (12 inch 1.5GHz) - PowerMac1,1 - Power Macintosh G3 (Blue & White) - PowerMac1,2 - Power Macintosh G4 (PCI Graphics) - PowerMac10,1 - Mac Mini G4 - PowerMac10,2 - Mac Mini (Late 2005) - PowerMac11,2 - Power Macintosh G5 (Late 2005) - PowerMac12,1 - iMac G5 (iSight) - PowerMac2,1 - iMac G3 (Slot-loading CD-ROM) - PowerMac2,2 - iMac G3 (Summer 2000) - PowerMac3,1 - Power Macintosh G4 (AGP Graphics) - PowerMac3,2 - Power Macintosh G4 (AGP Graphics) - PowerMac3,3 - Power Macintosh G4 (Gigabit Ethernet) - PowerMac3,4 - Power Macintosh G4 (Digital Audio) - PowerMac3,5 - Power Macintosh G4 (Quick Silver) - PowerMac3,6 - Power Macintosh G4 (Mirrored Drive Door) - PowerMac4,1 - iMac G3 (Early/Summer 2001) - PowerMac4,2 - iMac G4 (Flat Panel) - PowerMac4,4 - eMac - PowerMac4,5 - iMac G4 (17-inch Flat Panel) - PowerMac5,1 - Power Macintosh G4 Cube - PowerMac6,1 - iMac G4 (USB 2.0) - PowerMac6,3 - iMac G4 (20-inch Flat Panel) - PowerMac6,4 - eMac (USB 2.0, 2005) - PowerMac7,2 - Power Macintosh G5 - PowerMac7,3 - Power Macintosh G5 - PowerMac8,1 - iMac G5 - PowerMac8,2 - iMac G5 (Ambient Light Sensor) - PowerMac9,1 - Power Macintosh G5 (Late 2005) - RackMac1,1 - Xserve G4 - RackMac1,2 - Xserve G4 (slot-loading, cluster node) - RackMac3,1 - Xserve G5 - Xserve1,1 - Xserve (Intel Xeon) - Xserve2,1 - Xserve (January 2008 quad-core) - iMac1,1 - iMac G3 (Rev A-D) - iMac4,1 - iMac (Core Duo) - iMac4,2 - iMac for Education (17-inch, Core Duo) - iMac5,1 - iMac (Core 2 Duo, 17 or 20 inch, SuperDrive) - iMac5,2 - iMac (Core 2 Duo, 17 inch, Combo Drive) - iMac6,1 - iMac (Core 2 Duo, 24 inch, SuperDrive) - iMac8,1 - iMac (April 2008) - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/classes.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/classes.nib deleted file mode 100644 index 22f13f8..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/classes.nib +++ /dev/null @@ -1,56 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - CLASS - NSApplication - LANGUAGE - ObjC - SUPERCLASS - NSResponder - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - CLASS - SUStatusController - LANGUAGE - ObjC - OUTLETS - - actionButton - NSButton - progressBar - NSProgressIndicator - - SUPERCLASS - SUWindowController - - - IBVersion - 1 - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/info.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/info.nib deleted file mode 100644 index a9ac867..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 670 - IBLastKnownRelativeProjectPath - Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 10A96 - targetFramework - IBCocoaFramework - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/keyedobjects.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/keyedobjects.nib deleted file mode 100644 index 4f1d598..0000000 Binary files a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/classes.nib deleted file mode 100644 index 4b1ab30..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,50 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - doNotInstall - id - installLater - id - installNow - id - - CLASS - SUAutomaticUpdateAlert - LANGUAGE - ObjC - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/info.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/info.nib deleted file mode 100644 index 2e04cfa..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 667 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 9D34 - targetFramework - IBCocoaFramework - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index 6b92630..0000000 Binary files a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/classes.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/classes.nib deleted file mode 100644 index 994d4c3..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,67 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - CLASS - NSApplication - LANGUAGE - ObjC - SUPERCLASS - NSResponder - - - ACTIONS - - installUpdate - id - remindMeLater - id - skipThisVersion - id - - CLASS - SUUpdateAlert - LANGUAGE - ObjC - OUTLETS - - delegate - id - description - NSTextField - releaseNotesView - WebView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/info.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/info.nib deleted file mode 100644 index 2e04cfa..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 667 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 9D34 - targetFramework - IBCocoaFramework - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/keyedobjects.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index b4353d2..0000000 Binary files a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/classes.nib deleted file mode 100644 index 5220a22..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/classes.nib +++ /dev/null @@ -1,59 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - finishPrompt - id - toggleMoreInfo - id - - CLASS - SUUpdatePermissionPrompt - LANGUAGE - ObjC - OUTLETS - - delegate - id - descriptionTextField - NSTextField - moreInfoButton - NSButton - moreInfoView - NSView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/info.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/info.nib deleted file mode 100644 index 2e04cfa..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 667 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 9D34 - targetFramework - IBCocoaFramework - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib deleted file mode 100644 index b403a3e..0000000 Binary files a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings deleted file mode 100644 index b31f928..0000000 Binary files a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings and /dev/null differ diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/classes.nib deleted file mode 100644 index 4b1ab30..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,50 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - doNotInstall - id - installLater - id - installNow - id - - CLASS - SUAutomaticUpdateAlert - LANGUAGE - ObjC - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/info.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/info.nib deleted file mode 100644 index ab36d31..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 658 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 9C7010 - targetFramework - IBCocoaFramework - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index 7630390..0000000 Binary files a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/classes.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/classes.nib deleted file mode 100644 index 994d4c3..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,67 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - CLASS - NSApplication - LANGUAGE - ObjC - SUPERCLASS - NSResponder - - - ACTIONS - - installUpdate - id - remindMeLater - id - skipThisVersion - id - - CLASS - SUUpdateAlert - LANGUAGE - ObjC - OUTLETS - - delegate - id - description - NSTextField - releaseNotesView - WebView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/info.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/info.nib deleted file mode 100644 index 2fb8a83..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 670 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 18 - - IBSystem Version - 10A96 - targetFramework - IBCocoaFramework - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/keyedobjects.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index e7e7497..0000000 Binary files a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/classes.nib deleted file mode 100644 index 5220a22..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/classes.nib +++ /dev/null @@ -1,59 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - finishPrompt - id - toggleMoreInfo - id - - CLASS - SUUpdatePermissionPrompt - LANGUAGE - ObjC - OUTLETS - - delegate - id - descriptionTextField - NSTextField - moreInfoButton - NSButton - moreInfoView - NSView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/info.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/info.nib deleted file mode 100644 index b1cd28e..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/info.nib +++ /dev/null @@ -1,21 +0,0 @@ - - - - - IBFramework Version - 670 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - 41 - - IBSystem Version - 10A96 - targetFramework - IBCocoaFramework - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib deleted file mode 100644 index e8dc5b8..0000000 Binary files a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/Sparkle.strings b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/Sparkle.strings deleted file mode 100644 index 16e0787..0000000 Binary files a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/Sparkle.strings and /dev/null differ diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/classes.nib deleted file mode 100644 index 4b1ab30..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,50 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - doNotInstall - id - installLater - id - installNow - id - - CLASS - SUAutomaticUpdateAlert - LANGUAGE - ObjC - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/info.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/info.nib deleted file mode 100644 index 2e04cfa..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 667 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 9D34 - targetFramework - IBCocoaFramework - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index 6b2f938..0000000 Binary files a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/classes.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/classes.nib deleted file mode 100644 index 994d4c3..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,67 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - CLASS - NSApplication - LANGUAGE - ObjC - SUPERCLASS - NSResponder - - - ACTIONS - - installUpdate - id - remindMeLater - id - skipThisVersion - id - - CLASS - SUUpdateAlert - LANGUAGE - ObjC - OUTLETS - - delegate - id - description - NSTextField - releaseNotesView - WebView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/info.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/info.nib deleted file mode 100644 index 2e04cfa..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 667 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 9D34 - targetFramework - IBCocoaFramework - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/keyedobjects.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index c9b1e7d..0000000 Binary files a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/classes.nib deleted file mode 100644 index 5220a22..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/classes.nib +++ /dev/null @@ -1,59 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - finishPrompt - id - toggleMoreInfo - id - - CLASS - SUUpdatePermissionPrompt - LANGUAGE - ObjC - OUTLETS - - delegate - id - descriptionTextField - NSTextField - moreInfoButton - NSButton - moreInfoView - NSView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/info.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/info.nib deleted file mode 100644 index 3eb7f81..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 667 - IBLastKnownRelativeProjectPath - ../../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 9D34 - targetFramework - IBCocoaFramework - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib deleted file mode 100644 index 8c54c21..0000000 Binary files a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/Sparkle.strings b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/Sparkle.strings deleted file mode 100644 index f83ea23..0000000 Binary files a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/Sparkle.strings and /dev/null differ diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/classes.nib deleted file mode 100644 index 4b1ab30..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,50 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - doNotInstall - id - installLater - id - installNow - id - - CLASS - SUAutomaticUpdateAlert - LANGUAGE - ObjC - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/info.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/info.nib deleted file mode 100644 index 33a6020..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/info.nib +++ /dev/null @@ -1,16 +0,0 @@ - - - - - IBFramework Version - 629 - IBOldestOS - 5 - IBOpenObjects - - IBSystem Version - 9D34 - targetFramework - IBCocoaFramework - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index 4cd529a..0000000 Binary files a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/classes.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/classes.nib deleted file mode 100644 index 994d4c3..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,67 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - CLASS - NSApplication - LANGUAGE - ObjC - SUPERCLASS - NSResponder - - - ACTIONS - - installUpdate - id - remindMeLater - id - skipThisVersion - id - - CLASS - SUUpdateAlert - LANGUAGE - ObjC - OUTLETS - - delegate - id - description - NSTextField - releaseNotesView - WebView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/info.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/info.nib deleted file mode 100644 index d2586ea..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/info.nib +++ /dev/null @@ -1,16 +0,0 @@ - - - - - IBFramework Version - 629 - IBOldestOS - 5 - IBOpenObjects - - IBSystem Version - 9E17 - targetFramework - IBCocoaFramework - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/keyedobjects.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index 65dfc95..0000000 Binary files a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/classes.nib deleted file mode 100644 index 5220a22..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/classes.nib +++ /dev/null @@ -1,59 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - finishPrompt - id - toggleMoreInfo - id - - CLASS - SUUpdatePermissionPrompt - LANGUAGE - ObjC - OUTLETS - - delegate - id - descriptionTextField - NSTextField - moreInfoButton - NSButton - moreInfoView - NSView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/info.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/info.nib deleted file mode 100644 index d2586ea..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/info.nib +++ /dev/null @@ -1,16 +0,0 @@ - - - - - IBFramework Version - 629 - IBOldestOS - 5 - IBOpenObjects - - IBSystem Version - 9E17 - targetFramework - IBCocoaFramework - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib deleted file mode 100644 index 4b7cc90..0000000 Binary files a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/Sparkle.strings b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/Sparkle.strings deleted file mode 100644 index ea175ae..0000000 Binary files a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/Sparkle.strings and /dev/null differ diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr_CA.lproj b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr_CA.lproj deleted file mode 120000 index 61a7d4e..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/fr_CA.lproj +++ /dev/null @@ -1 +0,0 @@ -/Users/andym/Development/Build Products/Release (GC dual-mode; 10.5-only)/Sparkle.framework/Resources/fr.lproj \ No newline at end of file diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/classes.nib deleted file mode 100644 index 4b1ab30..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,50 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - doNotInstall - id - installLater - id - installNow - id - - CLASS - SUAutomaticUpdateAlert - LANGUAGE - ObjC - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/info.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/info.nib deleted file mode 100644 index 2e04cfa..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 667 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 9D34 - targetFramework - IBCocoaFramework - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index 15ba8f4..0000000 Binary files a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/classes.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/classes.nib deleted file mode 100644 index 994d4c3..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,67 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - CLASS - NSApplication - LANGUAGE - ObjC - SUPERCLASS - NSResponder - - - ACTIONS - - installUpdate - id - remindMeLater - id - skipThisVersion - id - - CLASS - SUUpdateAlert - LANGUAGE - ObjC - OUTLETS - - delegate - id - description - NSTextField - releaseNotesView - WebView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/info.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/info.nib deleted file mode 100644 index 2e04cfa..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 667 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 9D34 - targetFramework - IBCocoaFramework - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/keyedobjects.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index 2984064..0000000 Binary files a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/classes.nib deleted file mode 100644 index 5220a22..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/classes.nib +++ /dev/null @@ -1,59 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - finishPrompt - id - toggleMoreInfo - id - - CLASS - SUUpdatePermissionPrompt - LANGUAGE - ObjC - OUTLETS - - delegate - id - descriptionTextField - NSTextField - moreInfoButton - NSButton - moreInfoView - NSView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/info.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/info.nib deleted file mode 100644 index c493485..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 667 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 5 - - IBSystem Version - 9D34 - targetFramework - IBCocoaFramework - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib deleted file mode 100644 index 55cc2c2..0000000 Binary files a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/Sparkle.strings b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/Sparkle.strings deleted file mode 100644 index 5c410d0..0000000 Binary files a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/Sparkle.strings and /dev/null differ diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/classes.nib deleted file mode 100644 index 4b1ab30..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,50 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - doNotInstall - id - installLater - id - installNow - id - - CLASS - SUAutomaticUpdateAlert - LANGUAGE - ObjC - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/info.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/info.nib deleted file mode 100644 index 3f09790..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/info.nib +++ /dev/null @@ -1,18 +0,0 @@ - - - - - IBFramework Version - 629 - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 9D34 - targetFramework - IBCocoaFramework - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index aa38f86..0000000 Binary files a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/classes.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/classes.nib deleted file mode 100644 index 994d4c3..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,67 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - CLASS - NSApplication - LANGUAGE - ObjC - SUPERCLASS - NSResponder - - - ACTIONS - - installUpdate - id - remindMeLater - id - skipThisVersion - id - - CLASS - SUUpdateAlert - LANGUAGE - ObjC - OUTLETS - - delegate - id - description - NSTextField - releaseNotesView - WebView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/info.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/info.nib deleted file mode 100644 index d2586ea..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/info.nib +++ /dev/null @@ -1,16 +0,0 @@ - - - - - IBFramework Version - 629 - IBOldestOS - 5 - IBOpenObjects - - IBSystem Version - 9E17 - targetFramework - IBCocoaFramework - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/keyedobjects.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index c82d358..0000000 Binary files a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/classes.nib deleted file mode 100644 index 5220a22..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/classes.nib +++ /dev/null @@ -1,59 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - finishPrompt - id - toggleMoreInfo - id - - CLASS - SUUpdatePermissionPrompt - LANGUAGE - ObjC - OUTLETS - - delegate - id - descriptionTextField - NSTextField - moreInfoButton - NSButton - moreInfoView - NSView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/info.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/info.nib deleted file mode 100644 index d2586ea..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/info.nib +++ /dev/null @@ -1,16 +0,0 @@ - - - - - IBFramework Version - 629 - IBOldestOS - 5 - IBOpenObjects - - IBSystem Version - 9E17 - targetFramework - IBCocoaFramework - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib deleted file mode 100644 index ac298ce..0000000 Binary files a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/Sparkle.strings b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/Sparkle.strings deleted file mode 100644 index 67cf535..0000000 Binary files a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/Sparkle.strings and /dev/null differ diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/relaunch b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/relaunch deleted file mode 100755 index e7b96d6..0000000 Binary files a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/relaunch and /dev/null differ diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/classes.nib deleted file mode 100644 index 4b1ab30..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,50 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - doNotInstall - id - installLater - id - installNow - id - - CLASS - SUAutomaticUpdateAlert - LANGUAGE - ObjC - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/info.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/info.nib deleted file mode 100644 index 2b3d425..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 670 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 9E17 - targetFramework - IBCocoaFramework - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index 1d4655c..0000000 Binary files a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/classes.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/classes.nib deleted file mode 100644 index 994d4c3..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,67 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - CLASS - NSApplication - LANGUAGE - ObjC - SUPERCLASS - NSResponder - - - ACTIONS - - installUpdate - id - remindMeLater - id - skipThisVersion - id - - CLASS - SUUpdateAlert - LANGUAGE - ObjC - OUTLETS - - delegate - id - description - NSTextField - releaseNotesView - WebView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/info.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/info.nib deleted file mode 100644 index 2b3d425..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 670 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 9E17 - targetFramework - IBCocoaFramework - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/keyedobjects.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index 103b1cf..0000000 Binary files a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/classes.nib deleted file mode 100644 index 0f776c8..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/classes.nib +++ /dev/null @@ -1,59 +0,0 @@ - - - - - IBClasses - - - CLASS - NSObject - LANGUAGE - ObjC - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - finishPrompt - id - toggleMoreInfo - id - - CLASS - SUUpdatePermissionPrompt - LANGUAGE - ObjC - OUTLETS - - delegate - id - descriptionTextField - NSTextField - moreInfoButton - NSButton - moreInfoView - NSView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - IBVersion - 1 - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/info.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/info.nib deleted file mode 100644 index 5132e29..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/info.nib +++ /dev/null @@ -1,18 +0,0 @@ - - - - - IBFramework Version - 670 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - IBSystem Version - 9E17 - targetFramework - IBCocoaFramework - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib deleted file mode 100644 index c09d9e7..0000000 Binary files a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings deleted file mode 100644 index f3ff9d8..0000000 Binary files a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings and /dev/null differ diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/classes.nib deleted file mode 100644 index 4b1ab30..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,50 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - doNotInstall - id - installLater - id - installNow - id - - CLASS - SUAutomaticUpdateAlert - LANGUAGE - ObjC - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/info.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/info.nib deleted file mode 100644 index c5a067e..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 670 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 10A96 - targetFramework - IBCocoaFramework - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index 53cb91a..0000000 Binary files a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/classes.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/classes.nib deleted file mode 100644 index 018710a..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,39 +0,0 @@ -{ - IBClasses = ( - { - CLASS = FirstResponder; - LANGUAGE = ObjC; - SUPERCLASS = NSObject; - }, - { - CLASS = NSApplication; - LANGUAGE = ObjC; - SUPERCLASS = NSResponder; - }, - { - CLASS = NSObject; - LANGUAGE = ObjC; - }, - { - ACTIONS = { - installUpdate = id; - remindMeLater = id; - skipThisVersion = id; - }; - CLASS = SUUpdateAlert; - LANGUAGE = ObjC; - OUTLETS = { - delegate = id; - description = NSTextField; - releaseNotesView = WebView; - }; - SUPERCLASS = SUWindowController; - }, - { - CLASS = SUWindowController; - LANGUAGE = ObjC; - SUPERCLASS = NSWindowController; - } - ); - IBVersion = 1; -} \ No newline at end of file diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/info.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/info.nib deleted file mode 100644 index 6b787d4..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/info.nib +++ /dev/null @@ -1,18 +0,0 @@ - - - - - IBDocumentLocation - 69 14 356 240 0 0 1280 778 - IBFramework Version - 489.0 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBSystem Version - 9D34 - targetFramework - IBCocoaFramework - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/keyedobjects.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index 7e6d490..0000000 Binary files a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/classes.nib deleted file mode 100644 index 5220a22..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/classes.nib +++ /dev/null @@ -1,59 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - finishPrompt - id - toggleMoreInfo - id - - CLASS - SUUpdatePermissionPrompt - LANGUAGE - ObjC - OUTLETS - - delegate - id - descriptionTextField - NSTextField - moreInfoButton - NSButton - moreInfoView - NSView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/info.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/info.nib deleted file mode 100644 index c5a067e..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 670 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 10A96 - targetFramework - IBCocoaFramework - - diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib deleted file mode 100644 index 64babac..0000000 Binary files a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/Sparkle.strings b/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/Sparkle.strings deleted file mode 100644 index b676a4f..0000000 Binary files a/tikzit/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/Sparkle.strings and /dev/null differ diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/A/Sparkle b/tikzit/Frameworks/Sparkle.framework/Versions/A/Sparkle deleted file mode 100755 index 2d9bb2a..0000000 Binary files a/tikzit/Frameworks/Sparkle.framework/Versions/A/Sparkle and /dev/null differ diff --git a/tikzit/Frameworks/Sparkle.framework/Versions/Current b/tikzit/Frameworks/Sparkle.framework/Versions/Current deleted file mode 120000 index 8c7e5a6..0000000 --- a/tikzit/Frameworks/Sparkle.framework/Versions/Current +++ /dev/null @@ -1 +0,0 @@ -A \ No newline at end of file diff --git a/tikzit/INSTALL b/tikzit/INSTALL deleted file mode 100644 index b938f14..0000000 --- a/tikzit/INSTALL +++ /dev/null @@ -1,34 +0,0 @@ -For building on systems other than MacOS/X: - -Dependencies: - GNUstep (core libraries) >= 1.18.0 - gtk+-2.0 >= 2.18.0 - gdk-pixbuf >= 2.16.0 - poppler >= 0.10 - including glib bindings, which may be in - a separate poppler-glib package - Objective C compiler (eg: gcc with ObjC support) with - support for properties, optional protocols and - fast enumeration (eg: gcc 4.6 or clang). - pkg-config - build-time dependency only - -To install, just run: - - ./configure - make - make install - - - -To build from subversion (and for development) you will additionally need: - flex >= 2.5.34 - bison >= 2.3 - autoconf >= 2.60 - automake >= 1.10 - -and you will need to prepare the source tree by running - ./autogen.sh - - - diff --git a/tikzit/Makefile.am b/tikzit/Makefile.am deleted file mode 100644 index d9793a4..0000000 --- a/tikzit/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -SUBDIRS = src share -appdir = $(datarootdir)/tikzit -nobase_dist_app_DATA = shapes/*.tikz diff --git a/tikzit/NEWS b/tikzit/NEWS deleted file mode 100644 index 827abe7..0000000 --- a/tikzit/NEWS +++ /dev/null @@ -1,75 +0,0 @@ -tikzit 1.1 (2015-07-22) : - * Fix bug where copy-and-paste would lose edge anchors - * Allow tikzit-specific preview code to be omitted from preambles - * Holding down CTRL allows you to drag the graph - * Fix parsing bug where property lists would be reversed - * Better error messages when files can't be opened - -tikzit 1.0 (2013-05-07): - * GIMP-like user interface (multiple documents, separate toolboxes) - * Preferences now called Configuration, and includes node and edge styles - * Error-highlighting in the code pane - * Single-key-shortcuts for tool selection, and to update the preview - * Edge anchor support - * Option for drag-select to select nodes, edges or both - * Memory leak fixes - * Should now be impossible to use the UI to create a graph that cannot be parsed - -tikzit 0.9 (2012-08-24): - * Compilers without basic Objective C 2 support cannot be - used to compile TikZiT any more - * Add support for scale to node styles - * Add support for editing edge styles - * Add support for multiple custom preambles - * The path to pdflatex is now configurable - * Make everything look a bit better - * Edges now start from the edge of a node, not the centre, - which is what tikz does - * Edges can now have arrow heads and arrow tails - * Nodes and edges have consistent ordering, and this can be - changed with Edge->Arrange - * Edges now have colours - * Edges can now be reversed easily - * Fix various crashes - -tikzit 0.7 (2011-12-06): - * Add bounding box support - * Add support for different node shapes - * Improved error reporting - * Add scrolling support (CTRL+mouse wheel) - * Add a pan tool to move around the graph - * Add edge and graph property palettes - -tikzit 0.6 (2011-02-08): - * Fix the displaying of colours in the styles editor - * Cut, copy and paste support - * More useful buttons on the toolbar - * Improve how previewing works - * Allow custom preambles for preview generation - -tikzit 0.5 (2010-12-01): - * Hide font size commands (\small etc) in node labels - * Always output the "style" node property first - * Provide a list of recent files - * Remember the folder for Open and Save As dialogs - * Remember window dimensions - * Remember the styles list - * Add a "Node properties" pane - * Bring the separate windows into the main application window - * Improve graphics rendering / remove flicker - * Shorten the window title to something useful - -tikzit 0.4 (2010-09-19): - * Support for bounding boxes, variable-precision tikz output - * Fixed stroke width display - * Updated tikz output to handle separate edge/node layers - * Using [Graph tikz] for tikz output, attaching style after parse - * All platforms now use the same lex-based parser - * Added a menu item for showing node styles if closed - * Pre-amble support - * Added test suite - * Added preview and node labels to GTK version - -tikzit 0.3b (2010-05-11): - * Various build-system fixes on Linux - diff --git a/tikzit/README b/tikzit/README index 9b83327..ecd6713 100644 --- a/tikzit/README +++ b/tikzit/README @@ -1,7 +1,12 @@ -TikZit is a cross-platform application that allows the creation and modification of TeX diagrams written using the pgf/TikZ macro library. It is especially geared toward rapidly creating "dot"-diagrams for use in academic papers. +Building on OSX: -For more info, see http://tikzit.sf.net +You'll need QT5 and poppler with QT5 bindings. QT5 can be installed with Homebrew: + +$ brew install qt5 + +whereas poppler should be built from source to get the QT5 bindings. To compile, clang needs to have C++11 features enabled. I built using: + +$ CXXFLAGS="-std=c++11" ./configure +$ CXXFLAGS="-std=c++11" make -On OS/X, the Cocoa framework is used. -On other platforms, GTK+ and GNUstep are used. \ No newline at end of file diff --git a/tikzit/README.release b/tikzit/README.release deleted file mode 100644 index a6f1642..0000000 --- a/tikzit/README.release +++ /dev/null @@ -1,98 +0,0 @@ -Notes on how to make a release -============================== - -Updating doc files ------------------- - -Put all the user-visible changes since the last release into NEWS. - -Make sure the dependency requirements in INSTALL are correct. - - - -Making the source tarballs --------------------------- - -The version should be set in configure.ac (in AC_INIT) -and the package should be re-configured -(run ./configure). - -Then run `make dist` to create the source tarball in tar.gz format, and -`make dist-bzip2` to get it in tar.bz2 format. - - - -Uploading the source --------------------- - -Update /www/sourceforge/README.mkd - -Log into sourceforge.net, go to -https://sourceforge.net/projects/tikzit/files/ - -Create a folder called tikzit-[version]. - -Upload README.mkd. - -Upload the tar.bz2 and tar.gz files. - -Set the tar.bz2 file as default for everything except windows and mac -(click the (i) symbol on the right for that file to do this). - - - -Updating the website --------------------- - -Edit /www/htdocs/link.php, and update the versions. - -sftp to - [sf-username],tikzit@web.sourceforge.net - -Upload link.php into htdocs. - - - -Updating the packages ---------------------- - -Contact Gard Spreemann about the new version by sending him a message -on Launchpad (https://launchpad.net/~gspreemann). - -Update tikzit.spec (the version, the changelog and the dependencies). - -Test the spec file: -- if you don't have ~/rpmbuild, run rpmdev-setuptree -- copy the tar.bz2 file into ~/rpmbuild/SOURCES -- copy tikzit.spec into ~/rpmbuild/SPECS -- cd into ~/rpmbuild/SPECS -- run `rpmbuild -ba tikzit.spec` -- run `rpmlint ..` and check the warnings (there will be some that are - not important) - -Update the OBS packages: -- https://build.opensuse.org/package/show?package=tikzit&project=home%3Arandomguy3 -- Upload the tar.bz2 file and the tikzit.spec file. -- Wait for the build to finish - -Update the AUR package: -- http://aur.archlinux.org/packages.php?ID=37119 - - -TODO: find out how the Debian build system works - - -Publishing an OSX Update ------------------------------------------ -In OSX, the steps to publish an update are as follows. Firstly all updates are signed, so you need the private key 'tikzit_dsa_priv.pem' in the root of your working directory. This is not in the repository (for obvious reasons), so ask Aleks for a copy. Also, make sure you have ruby in your $PATH to do the actual signing. - -1. Update the SVN and note the revision number -2. In TikZiT-Info.plist, set the Bundle Version key to (MAJOR).(MINOR).(SVN REVISION + 1) -3. In the TikZiT working directory, run scripts/prepare_release.sh -4. Copy and paste the XML output into docs/web/appcast/tikzit.xml -5. Update the release notes in docs/web/appcast/rnotes.html -6. Use SFTP to upload the changed files into htdocs/appcast -7. Commit the SVN - - - diff --git a/tikzit/TODO b/tikzit/TODO deleted file mode 100644 index ca1a1b9..0000000 --- a/tikzit/TODO +++ /dev/null @@ -1,15 +0,0 @@ -GTK port: - - Use GooCanvas for the graph display - - -OSX port: - - node properties toolbox - - support for more than one custom preamble - - -General: - - push more code up into common (make use of RenderContext) - - vi-like mode lines in tikz files - - use mode lines for preamble knowledge - - per-document preamble selection? - diff --git a/tikzit/TikZiT-Info.plist b/tikzit/TikZiT-Info.plist deleted file mode 100644 index a495c5b..0000000 --- a/tikzit/TikZiT-Info.plist +++ /dev/null @@ -1,61 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleDocumentTypes - - - CFBundleTypeExtensions - - tikz - - CFBundleTypeIconFile - tikzitdoc.icns - CFBundleTypeMIMETypes - - text/plain - - CFBundleTypeName - DocumentType - CFBundleTypeOSTypes - - ???? - - CFBundleTypeRole - Editor - NSDocumentClass - TikzDocument - - - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIconFile - tikzit.icns - CFBundleIdentifier - net.sourceforge.tikzit.${PRODUCT_NAME:rfc1034identifier} - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - APPL - CFBundleShortVersionString - 0.8 - CFBundleSignature - ???? - CFBundleVersion - 0.8.398 - LSMinimumSystemVersion - ${MACOSX_DEPLOYMENT_TARGET} - NSMainNibFile - MainMenu - NSPrincipalClass - NSApplication - SUFeedURL - http://tikzit.sourceforge.net/appcast/tikzit.xml - SUPublicDSAKeyFile - tikzit_dsa_pub.pem - - diff --git a/tikzit/TikZiT.xcodeproj/project.pbxproj b/tikzit/TikZiT.xcodeproj/project.pbxproj deleted file mode 100644 index 04a7f3f..0000000 --- a/tikzit/TikZiT.xcodeproj/project.pbxproj +++ /dev/null @@ -1,1322 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 46; - objects = { - -/* Begin PBXBuildFile section */ - 1DDD582C0DA1D0D100B32029 /* TikzDocument.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD58280DA1D0D100B32029 /* TikzDocument.xib */; }; - 1DDD582D0DA1D0D100B32029 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD582A0DA1D0D100B32029 /* MainMenu.xib */; }; - 5504C82E11D23595002A1478 /* common.m in Sources */ = {isa = PBXBuildFile; fileRef = 5504C82A11D23595002A1478 /* common.m */; }; - 5504C82F11D23595002A1478 /* parser.m in Sources */ = {isa = PBXBuildFile; fileRef = 5504C82B11D23595002A1478 /* parser.m */; }; - 5504C83011D23595002A1478 /* test.m in Sources */ = {isa = PBXBuildFile; fileRef = 5504C82D11D23595002A1478 /* test.m */; }; - 5504C83211D23685002A1478 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 5504C83111D23685002A1478 /* main.m */; }; - 5504C84F11D23945002A1478 /* ColorRGB.m in Sources */ = {isa = PBXBuildFile; fileRef = 559EFB6711CB88E300D020F4 /* ColorRGB.m */; }; - 5504C93F11D39422002A1478 /* osx.m in Sources */ = {isa = PBXBuildFile; fileRef = 5504C93E11D39422002A1478 /* osx.m */; }; - 552202C4135F15FD007EA086 /* MultiField.m in Sources */ = {isa = PBXBuildFile; fileRef = 552202C3135F15FD007EA086 /* MultiField.m */; }; - 552202C5135F15FD007EA086 /* MultiField.m in Sources */ = {isa = PBXBuildFile; fileRef = 552202C3135F15FD007EA086 /* MultiField.m */; }; - 55391AF613D324FE007DBE71 /* Preview.xib in Resources */ = {isa = PBXBuildFile; fileRef = 55391AF513D324FE007DBE71 /* Preview.xib */; }; - 55391AF813D3250F007DBE71 /* Preamble.xib in Resources */ = {isa = PBXBuildFile; fileRef = 55391AF713D3250F007DBE71 /* Preamble.xib */; }; - 55391B0213D32608007DBE71 /* PropertyInspector.xib in Resources */ = {isa = PBXBuildFile; fileRef = 55391B0013D32608007DBE71 /* PropertyInspector.xib */; }; - 55391B0A13D32765007DBE71 /* PropertyInspectorController.m in Sources */ = {isa = PBXBuildFile; fileRef = 55391B0913D32765007DBE71 /* PropertyInspectorController.m */; }; - 55397C7914498C22006942FB /* EdgeStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 55397C7814498C22006942FB /* EdgeStyle.m */; }; - 55397C7C144990EA006942FB /* EdgeStyle+Coder.m in Sources */ = {isa = PBXBuildFile; fileRef = 55397C7B144990EA006942FB /* EdgeStyle+Coder.m */; }; - 55397C7F144999C4006942FB /* PropertyHolder.m in Sources */ = {isa = PBXBuildFile; fileRef = 55397C7E144999C4006942FB /* PropertyHolder.m */; }; - 55397C811449A877006942FB /* ED_arrow.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C801449A877006942FB /* ED_arrow.png */; }; - 55397C831449A8F1006942FB /* ED_tick.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C821449A8F1006942FB /* ED_tick.png */; }; - 55397C851449A9BF006942FB /* ED_none.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C841449A9BF006942FB /* ED_none.png */; }; - 55397C8A1449AB91006942FB /* AH_none.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C871449AB91006942FB /* AH_none.png */; }; - 55397C8B1449AB91006942FB /* AH_plain_tail.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C881449AB91006942FB /* AH_plain_tail.png */; }; - 55397C8D1449ABFC006942FB /* AH_latex_tail.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C8C1449ABFC006942FB /* AH_latex_tail.png */; }; - 55397C901449AC7C006942FB /* AH_latex_head.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C8E1449AC7C006942FB /* AH_latex_head.png */; }; - 55397C911449AC7C006942FB /* AH_plain_head.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C8F1449AC7C006942FB /* AH_plain_head.png */; }; - 553A4C5A144ED3D500AA6FAC /* NilToEmptyStringTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 553A4C59144ED3D500AA6FAC /* NilToEmptyStringTransformer.m */; }; - 55432E061444BF2D00401BB3 /* GraphElementProperty.m in Sources */ = {isa = PBXBuildFile; fileRef = 55432E051444BF2D00401BB3 /* GraphElementProperty.m */; }; - 55598E351635372E0023450A /* DiamondShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55598E341635372E0023450A /* DiamondShape.m */; }; - 555B30F911D8BE3300CAECF5 /* emblem-important.png in Resources */ = {isa = PBXBuildFile; fileRef = 555B30F811D8BE3300CAECF5 /* emblem-important.png */; }; - 555B313511D8C6DA00CAECF5 /* color.m in Sources */ = {isa = PBXBuildFile; fileRef = 555B313411D8C6DA00CAECF5 /* color.m */; }; - 555ECE9B1378A3AA0052DB71 /* CALayer+DrawLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 555ECE9A1378A3AA0052DB71 /* CALayer+DrawLabel.m */; }; - 55652DF913E1F2030023F4C6 /* SupportDir.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652DF813E1F2030023F4C6 /* SupportDir.m */; }; - 55652E3B13E1FAEE0023F4C6 /* CircleShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3413E1FAED0023F4C6 /* CircleShape.m */; }; - 55652E3C13E1FAEE0023F4C6 /* RectangleShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3613E1FAED0023F4C6 /* RectangleShape.m */; }; - 55652E3D13E1FAEE0023F4C6 /* RegularPolyShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3813E1FAED0023F4C6 /* RegularPolyShape.m */; }; - 55652E3E13E1FAEE0023F4C6 /* TikzShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3A13E1FAEE0023F4C6 /* TikzShape.m */; }; - 55652E4113E1FB0A0023F4C6 /* Shape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E4013E1FB0A0023F4C6 /* Shape.m */; }; - 55652E5613E1FC660023F4C6 /* cap.tikz in Copy Shapes */ = {isa = PBXBuildFile; fileRef = 55652E5113E1FC660023F4C6 /* cap.tikz */; }; - 55652E5713E1FC660023F4C6 /* copants.tikz in Copy Shapes */ = {isa = PBXBuildFile; fileRef = 55652E5213E1FC660023F4C6 /* copants.tikz */; }; - 55652E5813E1FC660023F4C6 /* cup.tikz in Copy Shapes */ = {isa = PBXBuildFile; fileRef = 55652E5313E1FC660023F4C6 /* cup.tikz */; }; - 55652E5913E1FC660023F4C6 /* oval.tikz in Copy Shapes */ = {isa = PBXBuildFile; fileRef = 55652E5413E1FC660023F4C6 /* oval.tikz */; }; - 55652E5A13E1FC660023F4C6 /* pants.tikz in Copy Shapes */ = {isa = PBXBuildFile; fileRef = 55652E5513E1FC660023F4C6 /* pants.tikz */; }; - 556979431168747B007E5703 /* StylePalette.xib in Resources */ = {isa = PBXBuildFile; fileRef = 556979421168747B007E5703 /* StylePalette.xib */; }; - 5573B8BA11D9FC8D00B5DC5D /* Quartz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5573B8B911D9FC8D00B5DC5D /* Quartz.framework */; }; - 5573B8C211D9FD3200B5DC5D /* PreviewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5573B8C111D9FD3200B5DC5D /* PreviewController.m */; }; - 5573B90F11DA231A00B5DC5D /* PreambleController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5573B90E11DA231A00B5DC5D /* PreambleController.m */; }; - 5573B92111DA259C00B5DC5D /* text-x-generic.png in Resources */ = {isa = PBXBuildFile; fileRef = 5573B92011DA259C00B5DC5D /* text-x-generic.png */; }; - 5573B92511DA273400B5DC5D /* format-indent-less.png in Resources */ = {isa = PBXBuildFile; fileRef = 5573B92411DA273400B5DC5D /* format-indent-less.png */; }; - 5573B92911DA292F00B5DC5D /* Preambles.m in Sources */ = {isa = PBXBuildFile; fileRef = 5573B92811DA292F00B5DC5D /* Preambles.m */; }; - 5573B98811DA377C00B5DC5D /* text-x-script.png in Resources */ = {isa = PBXBuildFile; fileRef = 5573B98711DA377C00B5DC5D /* text-x-script.png */; }; - 5573BDCB11DB4D2600B5DC5D /* Preambles+Coder.m in Sources */ = {isa = PBXBuildFile; fileRef = 5573BDCA11DB4D2600B5DC5D /* Preambles+Coder.m */; }; - 5585E5C2117F681800124513 /* NodeStyle+Coder.m in Sources */ = {isa = PBXBuildFile; fileRef = 5585E5C1117F681800124513 /* NodeStyle+Coder.m */; }; - 5589A9FF11C51E780064D310 /* TikzGraphAssembler.m in Sources */ = {isa = PBXBuildFile; fileRef = 5589A9FE11C51E780064D310 /* TikzGraphAssembler.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 5589AA6C11C542D30064D310 /* TikzGraphAssembler.m in Sources */ = {isa = PBXBuildFile; fileRef = 5589A9FE11C51E780064D310 /* TikzGraphAssembler.m */; }; - 5589AA6D11C542D30064D310 /* tikzlexer.lm in Sources */ = {isa = PBXBuildFile; fileRef = 5589A9AA11C500060064D310 /* tikzlexer.lm */; }; - 5589AA6E11C542D30064D310 /* tikzparser.ym in Sources */ = {isa = PBXBuildFile; fileRef = 5589A9AB11C500060064D310 /* tikzparser.ym */; }; - 5589AA7211C542E60064D310 /* Edge.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18BA117B031C009863B2 /* Edge.m */; }; - 5589AA7611C542E60064D310 /* Graph.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18BC117B031C009863B2 /* Graph.m */; }; - 5589AA7811C542E60064D310 /* GraphChange.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18BE117B031C009863B2 /* GraphChange.m */; }; - 5589AA7A11C542E60064D310 /* GraphElementData.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C0117B031C009863B2 /* GraphElementData.m */; }; - 5589AA7C11C542E60064D310 /* Node.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C2117B031C009863B2 /* Node.m */; }; - 5589AA8011C542E60064D310 /* NodeStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C4117B031C009863B2 /* NodeStyle.m */; }; - 5589AA8511C543500064D310 /* util.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18CD117B03DD009863B2 /* util.m */; }; - 5589AD4411C633EE0064D310 /* SelectBoxLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 5589AD4311C633EE0064D310 /* SelectBoxLayer.m */; }; - 558F18C5117B031C009863B2 /* Edge.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18BA117B031C009863B2 /* Edge.m */; }; - 558F18C6117B031C009863B2 /* Graph.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18BC117B031C009863B2 /* Graph.m */; }; - 558F18C7117B031C009863B2 /* GraphChange.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18BE117B031C009863B2 /* GraphChange.m */; }; - 558F18C8117B031C009863B2 /* GraphElementData.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C0117B031C009863B2 /* GraphElementData.m */; }; - 558F18C9117B031C009863B2 /* Node.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C2117B031C009863B2 /* Node.m */; }; - 558F18CA117B031C009863B2 /* NodeStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C4117B031C009863B2 /* NodeStyle.m */; }; - 558F18CE117B03DD009863B2 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18CB117B03DD009863B2 /* main.m */; }; - 558F18CF117B03DD009863B2 /* util.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18CD117B03DD009863B2 /* util.m */; }; - 558F18F7117B043C009863B2 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18DA117B043B009863B2 /* AppDelegate.m */; }; - 558F18F9117B043C009863B2 /* EdgeControlLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18DE117B043B009863B2 /* EdgeControlLayer.m */; }; - 558F18FA117B043C009863B2 /* GraphicsView.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18E0117B043B009863B2 /* GraphicsView.m */; }; - 558F18FB117B043C009863B2 /* Grid.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18E2117B043B009863B2 /* Grid.m */; }; - 558F18FC117B043C009863B2 /* NodeLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18E4117B043B009863B2 /* NodeLayer.m */; }; - 558F18FD117B043C009863B2 /* NodeSelectionLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18E6117B043B009863B2 /* NodeSelectionLayer.m */; }; - 558F18FF117B043C009863B2 /* SelectableCollectionViewItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18EA117B043B009863B2 /* SelectableCollectionViewItem.m */; }; - 558F1900117B043C009863B2 /* SelectableNodeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18EC117B043B009863B2 /* SelectableNodeView.m */; }; - 558F1901117B043C009863B2 /* StylePaletteController.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18EE117B043B009863B2 /* StylePaletteController.m */; }; - 558F1902117B043C009863B2 /* TikzDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18F0117B043B009863B2 /* TikzDocument.m */; }; - 558F1903117B043C009863B2 /* TikzSourceController.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18F2117B043B009863B2 /* TikzSourceController.m */; }; - 558F1904117B043C009863B2 /* ToolPaletteController.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18F4117B043B009863B2 /* ToolPaletteController.m */; }; - 55900AA1135FA918002DD28E /* MultiCombo.m in Sources */ = {isa = PBXBuildFile; fileRef = 55900AA0135FA918002DD28E /* MultiCombo.m */; }; - 55900AA2135FA918002DD28E /* MultiCombo.m in Sources */ = {isa = PBXBuildFile; fileRef = 55900AA0135FA918002DD28E /* MultiCombo.m */; }; - 55900AE3135FB305002DD28E /* emblem-unreadable-grey.png in Resources */ = {isa = PBXBuildFile; fileRef = 55900AE2135FB305002DD28E /* emblem-unreadable-grey.png */; }; - 559EFA4811C7D49800D020F4 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 559EFA4711C7D49800D020F4 /* Sparkle.framework */; }; - 559EFA4E11C7D4BD00D020F4 /* Sparkle.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 559EFA4711C7D49800D020F4 /* Sparkle.framework */; }; - 559EFA5711C7D95F00D020F4 /* tikzit_dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 559EFA5611C7D95F00D020F4 /* tikzit_dsa_pub.pem */; }; - 559EFB6811CB88E300D020F4 /* ColorRGB.m in Sources */ = {isa = PBXBuildFile; fileRef = 559EFB6711CB88E300D020F4 /* ColorRGB.m */; }; - 55CA98D512EF8FCE008F0368 /* SFBInspectors.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55CA98D412EF8FCE008F0368 /* SFBInspectors.framework */; }; - 55CA98DA12EF9098008F0368 /* SFBInspectors.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 55CA98D412EF8FCE008F0368 /* SFBInspectors.framework */; }; - 55CA98DD12EF910F008F0368 /* SFBInspectors.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55CA98D412EF8FCE008F0368 /* SFBInspectors.framework */; }; - 55CA997212F08281008F0368 /* TikzWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 55CA997112F08281008F0368 /* TikzWindowController.m */; }; - 55CA9AC912F831E5008F0368 /* RColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 55CA9AC812F831E5008F0368 /* RColor.m */; }; - 55CA9ACA12F831E5008F0368 /* RColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 55CA9AC812F831E5008F0368 /* RColor.m */; }; - 55D2E0B21186ED950060B4EC /* Graph+Coder.m in Sources */ = {isa = PBXBuildFile; fileRef = 55D2E0B11186ED950060B4EC /* Graph+Coder.m */; }; - 55D945721165904F0044178C /* tikzitdoc.icns in Resources */ = {isa = PBXBuildFile; fileRef = 55D945701165904F0044178C /* tikzitdoc.icns */; }; - 55D945731165904F0044178C /* tikzit.icns in Resources */ = {isa = PBXBuildFile; fileRef = 55D945711165904F0044178C /* tikzit.icns */; }; - 55D949141165D8870044178C /* draw-ellipse.png in Resources */ = {isa = PBXBuildFile; fileRef = 55D949111165D8870044178C /* draw-ellipse.png */; }; - 55D949151165D8870044178C /* draw-path.png in Resources */ = {isa = PBXBuildFile; fileRef = 55D949121165D8870044178C /* draw-path.png */; }; - 55D949161165D8870044178C /* select-rectangular.png in Resources */ = {isa = PBXBuildFile; fileRef = 55D949131165D8870044178C /* select-rectangular.png */; }; - 55E5E99E1215C8E300256F69 /* transform-crop-and-resize.png in Resources */ = {isa = PBXBuildFile; fileRef = 55E5E99D1215C8E300256F69 /* transform-crop-and-resize.png */; }; - 55F9585C1181B09600F99434 /* PickSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F958591181B09600F99434 /* PickSupport.m */; }; - 55F9585D1181B09600F99434 /* Transformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F9585B1181B09600F99434 /* Transformer.m */; }; - 55F9E04511FF54F000F5659E /* NSString+LatexConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F9E04411FF54F000F5659E /* NSString+LatexConstants.m */; }; - 7F18A321184C577000BC3081 /* UpdatePreferenceController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F18A320184C577000BC3081 /* UpdatePreferenceController.m */; }; - 7F18A323184C599100BC3081 /* UpdatePreferencePanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7F18A322184C599100BC3081 /* UpdatePreferencePanel.xib */; }; - 7F6E2C7D16B007F000BFE20D /* EdgeStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 55397C7814498C22006942FB /* EdgeStyle.m */; }; - 7F6E2C7E16B0080400BFE20D /* GraphElementProperty.m in Sources */ = {isa = PBXBuildFile; fileRef = 55432E051444BF2D00401BB3 /* GraphElementProperty.m */; }; - 7F6E2C7F16B0081D00BFE20D /* PropertyHolder.m in Sources */ = {isa = PBXBuildFile; fileRef = 55397C7E144999C4006942FB /* PropertyHolder.m */; }; - 7F6E2C8016B0083300BFE20D /* Shape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E4013E1FB0A0023F4C6 /* Shape.m */; }; - 7F6E2C8116B0084600BFE20D /* Transformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F9585B1181B09600F99434 /* Transformer.m */; }; - 7F6E2C8216B008B000BFE20D /* DiamondShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55598E341635372E0023450A /* DiamondShape.m */; }; - 7F6E2C8316B008B000BFE20D /* CircleShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3413E1FAED0023F4C6 /* CircleShape.m */; }; - 7F6E2C8416B008B000BFE20D /* RectangleShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3613E1FAED0023F4C6 /* RectangleShape.m */; }; - 7F6E2C8516B008B000BFE20D /* RegularPolyShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3813E1FAED0023F4C6 /* RegularPolyShape.m */; }; - 7F6E2C8616B008B000BFE20D /* TikzShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3A13E1FAEE0023F4C6 /* TikzShape.m */; }; - 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 */; }; - 7F73438A184AC559002897D0 /* DraggablePDFView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F734389184AC559002897D0 /* DraggablePDFView.m */; }; - 7F781C1A16B5DE1400239826 /* ParseErrorView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F781C1916B5DE1400239826 /* ParseErrorView.m */; }; - 7F7B6DED18DE0C9E004F6CA8 /* tikzlexer.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F7B6DEA18DE0C9E004F6CA8 /* tikzlexer.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 7F7B6DEE18DE0C9E004F6CA8 /* tikzparser.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F7B6DEC18DE0C9E004F6CA8 /* tikzparser.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 7F7B6DF418DE0D7A004F6CA8 /* CustomNodeCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F7B6DF118DE0D7A004F6CA8 /* CustomNodeCellView.m */; }; - 7F7B6DF518DE0D7A004F6CA8 /* CustomNodeController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F7B6DF318DE0D7A004F6CA8 /* CustomNodeController.m */; }; - 7F90E88616DD29600069EBCD /* NSString+Tikz.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F90E88516DD29600069EBCD /* NSString+Tikz.m */; }; - 7F90E88D16DD47540069EBCD /* PreferenceController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F90E88B16DD47540069EBCD /* PreferenceController.m */; }; - 7F90E88E16DD47540069EBCD /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7F90E88C16DD47540069EBCD /* Preferences.xib */; }; - 7F90E89116DD54440069EBCD /* UserDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 7F90E88F16DD54440069EBCD /* UserDefaults.plist */; }; - 7F93852E184D176E00FAED38 /* updates.png in Resources */ = {isa = PBXBuildFile; fileRef = 7F93852D184D176E00FAED38 /* updates.png */; }; - 7F938530184D178B00FAED38 /* engine.png in Resources */ = {isa = PBXBuildFile; fileRef = 7F93852F184D178B00FAED38 /* engine.png */; }; - 7F938532184D184700FAED38 /* preamble.png in Resources */ = {isa = PBXBuildFile; fileRef = 7F938531184D184700FAED38 /* preamble.png */; }; - 7FB9BFEE16B57C2E00773146 /* TikzFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FB9BFED16B57C2E00773146 /* TikzFormatter.m */; }; - 7FD5D44B18E1CB5300E2A930 /* CustomNodes.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7FD5D44918E1CB5300E2A930 /* CustomNodes.xib */; }; - 7FD5D44D18E1CC0B00E2A930 /* customshape.png in Resources */ = {isa = PBXBuildFile; fileRef = 7FD5D44C18E1CC0B00E2A930 /* customshape.png */; }; - 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 */; }; - 8D15AC340486D014006FF6A4 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A7FEA54F5311CA2CBB /* Cocoa.framework */; }; -/* End PBXBuildFile section */ - -/* Begin PBXContainerItemProxy section */ - 5504C91A11D36CD5002A1478 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 2A37F4A9FDCFA73011CA2CEA /* Project object */; - proxyType = 1; - remoteGlobalIDString = 8D15AC270486D014006FF6A4; - remoteInfo = TikZiT; - }; -/* End PBXContainerItemProxy section */ - -/* Begin PBXCopyFilesBuildPhase section */ - 55652E6613E1FD080023F4C6 /* Copy Shapes */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = shapes; - dstSubfolderSpec = 7; - files = ( - 55652E5613E1FC660023F4C6 /* cap.tikz in Copy Shapes */, - 55652E5713E1FC660023F4C6 /* copants.tikz in Copy Shapes */, - 55652E5813E1FC660023F4C6 /* cup.tikz in Copy Shapes */, - 55652E5913E1FC660023F4C6 /* oval.tikz in Copy Shapes */, - 55652E5A13E1FC660023F4C6 /* pants.tikz in Copy Shapes */, - ); - name = "Copy Shapes"; - runOnlyForDeploymentPostprocessing = 0; - }; - 559EFA5511C7D4DD00D020F4 /* Copy Frameworks */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - 55CA98DA12EF9098008F0368 /* SFBInspectors.framework in Copy Frameworks */, - 559EFA4E11C7D4BD00D020F4 /* Sparkle.framework in Copy Frameworks */, - ); - name = "Copy Frameworks"; - runOnlyForDeploymentPostprocessing = 0; - }; - 7F6E2C8B16B00A9200BFE20D /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - 7F6E2C8C16B00ABA00BFE20D /* SFBInspectors.framework in CopyFiles */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - 089C1660FE840EACC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; - 1058C7A7FEA54F5311CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; - 13E42FBA07B3F13500E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = ""; }; - 1DDD58290DA1D0D100B32029 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/TikzDocument.xib; sourceTree = ""; }; - 1DDD582B0DA1D0D100B32029 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = ""; }; - 2564AD2C0F5327BB00F57823 /* TikZiT_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TikZiT_Prefix.pch; sourceTree = ""; }; - 2A37F4BAFDCFA73011CA2CEA /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/Credits.rtf; sourceTree = ""; }; - 2A37F4C4FDCFA73011CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; - 2A37F4C5FDCFA73011CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; - 5504C82A11D23595002A1478 /* common.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = common.m; path = src/common/test/common.m; sourceTree = ""; }; - 5504C82B11D23595002A1478 /* parser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = parser.m; path = src/common/test/parser.m; sourceTree = ""; }; - 5504C82C11D23595002A1478 /* test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = test.h; path = src/common/test/test.h; sourceTree = ""; }; - 5504C82D11D23595002A1478 /* test.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = test.m; path = src/common/test/test.m; sourceTree = ""; }; - 5504C83111D23685002A1478 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = src/osx/test/main.m; sourceTree = ""; }; - 5504C83711D237F5002A1478 /* tests */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = tests; sourceTree = BUILT_PRODUCTS_DIR; }; - 5504C93E11D39422002A1478 /* osx.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = osx.m; path = src/osx/test/osx.m; sourceTree = ""; }; - 552202C2135F15FD007EA086 /* MultiField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MultiField.h; path = src/osx/MultiField.h; sourceTree = ""; }; - 552202C3135F15FD007EA086 /* MultiField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MultiField.m; path = src/osx/MultiField.m; sourceTree = ""; }; - 55391B0113D32608007DBE71 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/PropertyInspector.xib; sourceTree = ""; }; - 55391B0813D32765007DBE71 /* PropertyInspectorController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PropertyInspectorController.h; path = src/osx/PropertyInspectorController.h; sourceTree = ""; }; - 55391B0913D32765007DBE71 /* PropertyInspectorController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PropertyInspectorController.m; path = src/osx/PropertyInspectorController.m; sourceTree = ""; }; - 55397C7714498C21006942FB /* EdgeStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EdgeStyle.h; path = src/common/EdgeStyle.h; sourceTree = ""; }; - 55397C7814498C22006942FB /* EdgeStyle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = EdgeStyle.m; path = src/common/EdgeStyle.m; sourceTree = ""; }; - 55397C7A144990EA006942FB /* EdgeStyle+Coder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "EdgeStyle+Coder.h"; path = "src/osx/EdgeStyle+Coder.h"; sourceTree = ""; }; - 55397C7B144990EA006942FB /* EdgeStyle+Coder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "EdgeStyle+Coder.m"; path = "src/osx/EdgeStyle+Coder.m"; sourceTree = ""; }; - 55397C7D144999C4006942FB /* PropertyHolder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PropertyHolder.h; path = src/common/PropertyHolder.h; sourceTree = ""; }; - 55397C7E144999C4006942FB /* PropertyHolder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PropertyHolder.m; path = src/common/PropertyHolder.m; sourceTree = ""; }; - 55397C801449A877006942FB /* ED_arrow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ED_arrow.png; sourceTree = ""; }; - 55397C821449A8F1006942FB /* ED_tick.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ED_tick.png; sourceTree = ""; }; - 55397C841449A9BF006942FB /* ED_none.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ED_none.png; sourceTree = ""; }; - 55397C871449AB91006942FB /* AH_none.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AH_none.png; sourceTree = ""; }; - 55397C881449AB91006942FB /* AH_plain_tail.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AH_plain_tail.png; sourceTree = ""; }; - 55397C8C1449ABFC006942FB /* AH_latex_tail.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AH_latex_tail.png; sourceTree = ""; }; - 55397C8E1449AC7C006942FB /* AH_latex_head.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AH_latex_head.png; sourceTree = ""; }; - 55397C8F1449AC7C006942FB /* AH_plain_head.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AH_plain_head.png; sourceTree = ""; }; - 553A4C58144ED3D500AA6FAC /* NilToEmptyStringTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NilToEmptyStringTransformer.h; path = src/osx/NilToEmptyStringTransformer.h; sourceTree = ""; }; - 553A4C59144ED3D500AA6FAC /* NilToEmptyStringTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NilToEmptyStringTransformer.m; path = src/osx/NilToEmptyStringTransformer.m; sourceTree = ""; }; - 55432E041444BF2D00401BB3 /* GraphElementProperty.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GraphElementProperty.h; path = src/common/GraphElementProperty.h; sourceTree = ""; }; - 55432E051444BF2D00401BB3 /* GraphElementProperty.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GraphElementProperty.m; path = src/common/GraphElementProperty.m; sourceTree = ""; }; - 55598E331635372E0023450A /* DiamondShape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DiamondShape.h; path = src/common/DiamondShape.h; sourceTree = ""; }; - 55598E341635372E0023450A /* DiamondShape.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DiamondShape.m; path = src/common/DiamondShape.m; sourceTree = ""; }; - 555B30F811D8BE3300CAECF5 /* emblem-important.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emblem-important.png"; sourceTree = ""; }; - 555B313411D8C6DA00CAECF5 /* color.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = color.m; path = src/common/test/color.m; sourceTree = ""; }; - 555ECE991378A3AA0052DB71 /* CALayer+DrawLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "CALayer+DrawLabel.h"; path = "src/osx/CALayer+DrawLabel.h"; sourceTree = ""; }; - 555ECE9A1378A3AA0052DB71 /* CALayer+DrawLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "CALayer+DrawLabel.m"; path = "src/osx/CALayer+DrawLabel.m"; sourceTree = ""; }; - 555ECF361379E9F80052DB71 /* ShapeNames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ShapeNames.h; path = src/common/ShapeNames.h; sourceTree = ""; }; - 55652DF713E1F2030023F4C6 /* SupportDir.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SupportDir.h; path = src/common/SupportDir.h; sourceTree = ""; }; - 55652DF813E1F2030023F4C6 /* SupportDir.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SupportDir.m; path = src/common/SupportDir.m; sourceTree = ""; }; - 55652E3313E1FAED0023F4C6 /* CircleShape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CircleShape.h; path = src/common/CircleShape.h; sourceTree = ""; }; - 55652E3413E1FAED0023F4C6 /* CircleShape.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CircleShape.m; path = src/common/CircleShape.m; sourceTree = ""; }; - 55652E3513E1FAED0023F4C6 /* RectangleShape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RectangleShape.h; path = src/common/RectangleShape.h; sourceTree = ""; }; - 55652E3613E1FAED0023F4C6 /* RectangleShape.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RectangleShape.m; path = src/common/RectangleShape.m; sourceTree = ""; }; - 55652E3713E1FAED0023F4C6 /* RegularPolyShape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RegularPolyShape.h; path = src/common/RegularPolyShape.h; sourceTree = ""; }; - 55652E3813E1FAED0023F4C6 /* RegularPolyShape.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RegularPolyShape.m; path = src/common/RegularPolyShape.m; sourceTree = ""; }; - 55652E3913E1FAEE0023F4C6 /* TikzShape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TikzShape.h; path = src/common/TikzShape.h; sourceTree = ""; }; - 55652E3A13E1FAEE0023F4C6 /* TikzShape.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TikzShape.m; path = src/common/TikzShape.m; sourceTree = ""; }; - 55652E3F13E1FB0A0023F4C6 /* Shape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Shape.h; path = src/common/Shape.h; sourceTree = ""; }; - 55652E4013E1FB0A0023F4C6 /* Shape.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Shape.m; path = src/common/Shape.m; sourceTree = ""; }; - 55652E5113E1FC660023F4C6 /* cap.tikz */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cap.tikz; sourceTree = ""; }; - 55652E5213E1FC660023F4C6 /* copants.tikz */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = copants.tikz; sourceTree = ""; }; - 55652E5313E1FC660023F4C6 /* cup.tikz */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cup.tikz; sourceTree = ""; }; - 55652E5413E1FC660023F4C6 /* oval.tikz */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = oval.tikz; sourceTree = ""; }; - 55652E5513E1FC660023F4C6 /* pants.tikz */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = pants.tikz; sourceTree = ""; }; - 5573B8B911D9FC8D00B5DC5D /* Quartz.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quartz.framework; path = System/Library/Frameworks/Quartz.framework; sourceTree = SDKROOT; }; - 5573B8BD11D9FCD400B5DC5D /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Preview.xib; sourceTree = ""; }; - 5573B8C011D9FD3200B5DC5D /* PreviewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PreviewController.h; path = src/osx/PreviewController.h; sourceTree = ""; }; - 5573B8C111D9FD3200B5DC5D /* PreviewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PreviewController.m; path = src/osx/PreviewController.m; sourceTree = ""; }; - 5573B90D11DA231A00B5DC5D /* PreambleController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PreambleController.h; path = src/osx/PreambleController.h; sourceTree = ""; }; - 5573B90E11DA231A00B5DC5D /* PreambleController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PreambleController.m; path = src/osx/PreambleController.m; sourceTree = ""; }; - 5573B91011DA233E00B5DC5D /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Preamble.xib; sourceTree = ""; }; - 5573B92011DA259C00B5DC5D /* text-x-generic.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "text-x-generic.png"; sourceTree = ""; }; - 5573B92411DA273400B5DC5D /* format-indent-less.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "format-indent-less.png"; sourceTree = ""; }; - 5573B92711DA292F00B5DC5D /* Preambles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Preambles.h; path = src/common/Preambles.h; sourceTree = ""; }; - 5573B92811DA292F00B5DC5D /* Preambles.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Preambles.m; path = src/common/Preambles.m; sourceTree = ""; }; - 5573B98711DA377C00B5DC5D /* text-x-script.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "text-x-script.png"; sourceTree = ""; }; - 5573BDC911DB4D2600B5DC5D /* Preambles+Coder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "Preambles+Coder.h"; path = "src/osx/Preambles+Coder.h"; sourceTree = ""; }; - 5573BDCA11DB4D2600B5DC5D /* Preambles+Coder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "Preambles+Coder.m"; path = "src/osx/Preambles+Coder.m"; sourceTree = ""; }; - 5585E5C0117F681800124513 /* NodeStyle+Coder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NodeStyle+Coder.h"; path = "src/osx/NodeStyle+Coder.h"; sourceTree = ""; }; - 5585E5C1117F681800124513 /* NodeStyle+Coder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NodeStyle+Coder.m"; path = "src/osx/NodeStyle+Coder.m"; sourceTree = ""; }; - 5589A9AA11C500060064D310 /* tikzlexer.lm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.lex; name = tikzlexer.lm; path = src/common/tikzlexer.lm; sourceTree = ""; }; - 5589A9AB11C500060064D310 /* tikzparser.ym */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.yacc; name = tikzparser.ym; path = src/common/tikzparser.ym; sourceTree = ""; }; - 5589A9FD11C51E780064D310 /* TikzGraphAssembler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TikzGraphAssembler.h; path = src/common/TikzGraphAssembler.h; sourceTree = ""; }; - 5589A9FE11C51E780064D310 /* TikzGraphAssembler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TikzGraphAssembler.m; path = src/common/TikzGraphAssembler.m; sourceTree = ""; }; - 5589AD4211C633EE0064D310 /* SelectBoxLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SelectBoxLayer.h; path = src/osx/SelectBoxLayer.h; sourceTree = ""; }; - 5589AD4311C633EE0064D310 /* SelectBoxLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SelectBoxLayer.m; path = src/osx/SelectBoxLayer.m; sourceTree = ""; }; - 558F18B9117B031C009863B2 /* Edge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Edge.h; path = src/common/Edge.h; sourceTree = ""; }; - 558F18BA117B031C009863B2 /* Edge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Edge.m; path = src/common/Edge.m; sourceTree = ""; }; - 558F18BB117B031C009863B2 /* Graph.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Graph.h; path = src/common/Graph.h; sourceTree = ""; }; - 558F18BC117B031C009863B2 /* Graph.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Graph.m; path = src/common/Graph.m; sourceTree = ""; }; - 558F18BD117B031C009863B2 /* GraphChange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GraphChange.h; path = src/common/GraphChange.h; sourceTree = ""; }; - 558F18BE117B031C009863B2 /* GraphChange.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GraphChange.m; path = src/common/GraphChange.m; sourceTree = ""; }; - 558F18BF117B031C009863B2 /* GraphElementData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GraphElementData.h; path = src/common/GraphElementData.h; sourceTree = ""; }; - 558F18C0117B031C009863B2 /* GraphElementData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GraphElementData.m; path = src/common/GraphElementData.m; sourceTree = ""; }; - 558F18C1117B031C009863B2 /* Node.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Node.h; path = src/common/Node.h; sourceTree = ""; }; - 558F18C2117B031C009863B2 /* Node.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Node.m; path = src/common/Node.m; sourceTree = ""; }; - 558F18C3117B031C009863B2 /* NodeStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NodeStyle.h; path = src/common/NodeStyle.h; sourceTree = ""; }; - 558F18C4117B031C009863B2 /* NodeStyle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NodeStyle.m; path = src/common/NodeStyle.m; sourceTree = ""; }; - 558F18CB117B03DD009863B2 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = src/osx/main.m; sourceTree = ""; }; - 558F18CC117B03DD009863B2 /* util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = util.h; path = src/common/util.h; sourceTree = ""; }; - 558F18CD117B03DD009863B2 /* util.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = util.m; path = src/common/util.m; sourceTree = ""; }; - 558F18D9117B043B009863B2 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = src/osx/AppDelegate.h; sourceTree = ""; }; - 558F18DA117B043B009863B2 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = src/osx/AppDelegate.m; sourceTree = ""; }; - 558F18DD117B043B009863B2 /* EdgeControlLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EdgeControlLayer.h; path = src/osx/EdgeControlLayer.h; sourceTree = ""; }; - 558F18DE117B043B009863B2 /* EdgeControlLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = EdgeControlLayer.m; path = src/osx/EdgeControlLayer.m; sourceTree = ""; }; - 558F18DF117B043B009863B2 /* GraphicsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GraphicsView.h; path = src/osx/GraphicsView.h; sourceTree = ""; }; - 558F18E0117B043B009863B2 /* GraphicsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GraphicsView.m; path = src/osx/GraphicsView.m; sourceTree = ""; }; - 558F18E1117B043B009863B2 /* Grid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Grid.h; path = src/osx/Grid.h; sourceTree = ""; }; - 558F18E2117B043B009863B2 /* Grid.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Grid.m; path = src/osx/Grid.m; sourceTree = ""; }; - 558F18E3117B043B009863B2 /* NodeLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NodeLayer.h; path = src/osx/NodeLayer.h; sourceTree = ""; }; - 558F18E4117B043B009863B2 /* NodeLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NodeLayer.m; path = src/osx/NodeLayer.m; sourceTree = ""; }; - 558F18E5117B043B009863B2 /* NodeSelectionLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NodeSelectionLayer.h; path = src/osx/NodeSelectionLayer.h; sourceTree = ""; }; - 558F18E6117B043B009863B2 /* NodeSelectionLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NodeSelectionLayer.m; path = src/osx/NodeSelectionLayer.m; sourceTree = ""; }; - 558F18E9117B043B009863B2 /* SelectableCollectionViewItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SelectableCollectionViewItem.h; path = src/osx/SelectableCollectionViewItem.h; sourceTree = ""; }; - 558F18EA117B043B009863B2 /* SelectableCollectionViewItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SelectableCollectionViewItem.m; path = src/osx/SelectableCollectionViewItem.m; sourceTree = ""; }; - 558F18EB117B043B009863B2 /* SelectableNodeView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SelectableNodeView.h; path = src/osx/SelectableNodeView.h; sourceTree = ""; }; - 558F18EC117B043B009863B2 /* SelectableNodeView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SelectableNodeView.m; path = src/osx/SelectableNodeView.m; sourceTree = ""; }; - 558F18ED117B043B009863B2 /* StylePaletteController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StylePaletteController.h; path = src/osx/StylePaletteController.h; sourceTree = ""; }; - 558F18EE117B043B009863B2 /* StylePaletteController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = StylePaletteController.m; path = src/osx/StylePaletteController.m; sourceTree = ""; }; - 558F18EF117B043B009863B2 /* TikzDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TikzDocument.h; path = src/osx/TikzDocument.h; sourceTree = ""; }; - 558F18F0117B043B009863B2 /* TikzDocument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TikzDocument.m; path = src/osx/TikzDocument.m; sourceTree = ""; }; - 558F18F1117B043B009863B2 /* TikzSourceController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TikzSourceController.h; path = src/osx/TikzSourceController.h; sourceTree = ""; }; - 558F18F2117B043B009863B2 /* TikzSourceController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TikzSourceController.m; path = src/osx/TikzSourceController.m; sourceTree = ""; }; - 558F18F3117B043B009863B2 /* ToolPaletteController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ToolPaletteController.h; path = src/osx/ToolPaletteController.h; sourceTree = ""; }; - 558F18F4117B043B009863B2 /* ToolPaletteController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ToolPaletteController.m; path = src/osx/ToolPaletteController.m; sourceTree = ""; }; - 55900A9F135FA918002DD28E /* MultiCombo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MultiCombo.h; path = src/osx/MultiCombo.h; sourceTree = ""; }; - 55900AA0135FA918002DD28E /* MultiCombo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MultiCombo.m; path = src/osx/MultiCombo.m; sourceTree = ""; }; - 55900AE2135FB305002DD28E /* emblem-unreadable-grey.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emblem-unreadable-grey.png"; sourceTree = ""; }; - 559EFA4711C7D49800D020F4 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = Frameworks/Sparkle.framework; sourceTree = ""; }; - 559EFA5611C7D95F00D020F4 /* tikzit_dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = tikzit_dsa_pub.pem; sourceTree = ""; }; - 559EFB6611CB88E300D020F4 /* ColorRGB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ColorRGB.h; path = src/common/ColorRGB.h; sourceTree = ""; }; - 559EFB6711CB88E300D020F4 /* ColorRGB.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ColorRGB.m; path = src/common/ColorRGB.m; sourceTree = ""; }; - 55CA98D412EF8FCE008F0368 /* SFBInspectors.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SFBInspectors.framework; path = Frameworks/SFBInspectors.framework; sourceTree = ""; }; - 55CA997012F08281008F0368 /* TikzWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TikzWindowController.h; path = src/osx/TikzWindowController.h; sourceTree = ""; }; - 55CA997112F08281008F0368 /* TikzWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TikzWindowController.m; path = src/osx/TikzWindowController.m; sourceTree = ""; }; - 55CA9AC712F831E5008F0368 /* RColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RColor.h; path = src/common/RColor.h; sourceTree = ""; }; - 55CA9AC812F831E5008F0368 /* RColor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RColor.m; path = src/common/RColor.m; sourceTree = ""; }; - 55D2E0B01186ED950060B4EC /* Graph+Coder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "Graph+Coder.h"; path = "src/osx/Graph+Coder.h"; sourceTree = ""; }; - 55D2E0B11186ED950060B4EC /* Graph+Coder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "Graph+Coder.m"; path = "src/osx/Graph+Coder.m"; sourceTree = ""; }; - 55D945701165904F0044178C /* tikzitdoc.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = tikzitdoc.icns; sourceTree = ""; }; - 55D945711165904F0044178C /* tikzit.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = tikzit.icns; sourceTree = ""; }; - 55D947301165A5D40044178C /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/StylePalette.xib; sourceTree = ""; }; - 55D949111165D8870044178C /* draw-ellipse.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "draw-ellipse.png"; sourceTree = ""; }; - 55D949121165D8870044178C /* draw-path.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "draw-path.png"; sourceTree = ""; }; - 55D949131165D8870044178C /* select-rectangular.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "select-rectangular.png"; sourceTree = ""; }; - 55E5E99D1215C8E300256F69 /* transform-crop-and-resize.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "transform-crop-and-resize.png"; sourceTree = ""; }; - 55F958581181B09600F99434 /* PickSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PickSupport.h; path = src/common/PickSupport.h; sourceTree = ""; }; - 55F958591181B09600F99434 /* PickSupport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PickSupport.m; path = src/common/PickSupport.m; sourceTree = ""; }; - 55F9585A1181B09600F99434 /* Transformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Transformer.h; path = src/common/Transformer.h; sourceTree = ""; }; - 55F9585B1181B09600F99434 /* Transformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Transformer.m; path = src/common/Transformer.m; sourceTree = ""; }; - 55F9E04311FF54F000F5659E /* NSString+LatexConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSString+LatexConstants.h"; path = "src/common/NSString+LatexConstants.h"; sourceTree = ""; }; - 55F9E04411FF54F000F5659E /* NSString+LatexConstants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSString+LatexConstants.m"; path = "src/common/NSString+LatexConstants.m"; sourceTree = ""; }; - 55FF4E64116A401B000C22B4 /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = usr/lib/libicucore.dylib; sourceTree = SDKROOT; }; - 7F18A31F184C577000BC3081 /* UpdatePreferenceController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UpdatePreferenceController.h; path = src/osx/UpdatePreferenceController.h; sourceTree = ""; }; - 7F18A320184C577000BC3081 /* UpdatePreferenceController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = UpdatePreferenceController.m; path = src/osx/UpdatePreferenceController.m; sourceTree = ""; }; - 7F18A322184C599100BC3081 /* UpdatePreferencePanel.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = UpdatePreferencePanel.xib; path = src/osx/UpdatePreferencePanel.xib; sourceTree = ""; }; - 7F6E2C8716B0091300BFE20D /* maths.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = maths.m; path = src/common/test/maths.m; sourceTree = ""; }; - 7F734388184AC559002897D0 /* DraggablePDFView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DraggablePDFView.h; path = src/osx/DraggablePDFView.h; sourceTree = ""; }; - 7F734389184AC559002897D0 /* DraggablePDFView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DraggablePDFView.m; path = src/osx/DraggablePDFView.m; sourceTree = ""; }; - 7F781C1816B5DE1400239826 /* ParseErrorView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ParseErrorView.h; path = src/osx/ParseErrorView.h; sourceTree = ""; }; - 7F781C1916B5DE1400239826 /* ParseErrorView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ParseErrorView.m; path = src/osx/ParseErrorView.m; sourceTree = ""; }; - 7F7B6DE918DE0C9E004F6CA8 /* tikzlexer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tikzlexer.h; path = xbuild/TikZiT.build/Debug/TikZiT.build/DerivedSources/tikzlexer.h; sourceTree = ""; }; - 7F7B6DEA18DE0C9E004F6CA8 /* tikzlexer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = tikzlexer.m; path = xbuild/TikZiT.build/Debug/TikZiT.build/DerivedSources/tikzlexer.m; sourceTree = ""; }; - 7F7B6DEB18DE0C9E004F6CA8 /* tikzparser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tikzparser.h; path = xbuild/TikZiT.build/Debug/TikZiT.build/DerivedSources/tikzparser.h; sourceTree = ""; }; - 7F7B6DEC18DE0C9E004F6CA8 /* tikzparser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = tikzparser.m; path = xbuild/TikZiT.build/Debug/TikZiT.build/DerivedSources/tikzparser.m; sourceTree = ""; }; - 7F7B6DF018DE0D7A004F6CA8 /* CustomNodeCellView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CustomNodeCellView.h; path = src/osx/CustomNodeCellView.h; sourceTree = ""; }; - 7F7B6DF118DE0D7A004F6CA8 /* CustomNodeCellView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CustomNodeCellView.m; path = src/osx/CustomNodeCellView.m; sourceTree = ""; }; - 7F7B6DF218DE0D7A004F6CA8 /* CustomNodeController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CustomNodeController.h; path = src/osx/CustomNodeController.h; sourceTree = ""; }; - 7F7B6DF318DE0D7A004F6CA8 /* CustomNodeController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CustomNodeController.m; path = src/osx/CustomNodeController.m; sourceTree = ""; }; - 7F90E88416DD29600069EBCD /* NSString+Tikz.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSString+Tikz.h"; path = "src/common/NSString+Tikz.h"; sourceTree = ""; }; - 7F90E88516DD29600069EBCD /* NSString+Tikz.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSString+Tikz.m"; path = "src/common/NSString+Tikz.m"; sourceTree = ""; }; - 7F90E88A16DD47540069EBCD /* PreferenceController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PreferenceController.h; path = src/osx/PreferenceController.h; sourceTree = ""; }; - 7F90E88B16DD47540069EBCD /* PreferenceController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PreferenceController.m; path = src/osx/PreferenceController.m; sourceTree = ""; }; - 7F90E88C16DD47540069EBCD /* Preferences.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = Preferences.xib; path = src/osx/Preferences.xib; sourceTree = ""; }; - 7F90E89016DD54440069EBCD /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = English; path = English.lproj/UserDefaults.plist; sourceTree = ""; }; - 7F93852D184D176E00FAED38 /* updates.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = updates.png; sourceTree = ""; }; - 7F93852F184D178B00FAED38 /* engine.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = engine.png; sourceTree = ""; }; - 7F938531184D184700FAED38 /* preamble.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = preamble.png; sourceTree = ""; }; - 7FB9BFEC16B57C2E00773146 /* TikzFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TikzFormatter.h; path = src/osx/TikzFormatter.h; sourceTree = ""; }; - 7FB9BFED16B57C2E00773146 /* TikzFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TikzFormatter.m; path = src/osx/TikzFormatter.m; sourceTree = ""; }; - 7FD5D44A18E1CB5300E2A930 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/CustomNodes.xib; sourceTree = ""; }; - 7FD5D44C18E1CC0B00E2A930 /* customshape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = customshape.png; sourceTree = ""; }; - 7FEED45516B1A7C400B056CB /* StyleManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StyleManager.h; path = src/common/StyleManager.h; sourceTree = ""; }; - 7FEED45616B1A7C500B056CB /* StyleManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = StyleManager.m; path = src/common/StyleManager.m; sourceTree = ""; }; - 8D15AC360486D014006FF6A4 /* TikZiT-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "TikZiT-Info.plist"; sourceTree = ""; }; - 8D15AC370486D014006FF6A4 /* TikZiT.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TikZiT.app; sourceTree = BUILT_PRODUCTS_DIR; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 5589AA6311C5429C0064D310 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 55CA98DD12EF910F008F0368 /* SFBInspectors.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 8D15AC330486D014006FF6A4 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 8D15AC340486D014006FF6A4 /* Cocoa.framework in Frameworks */, - 559EFA4811C7D49800D020F4 /* Sparkle.framework in Frameworks */, - 5573B8BA11D9FC8D00B5DC5D /* Quartz.framework in Frameworks */, - 55CA98D512EF8FCE008F0368 /* SFBInspectors.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 1058C7A6FEA54F5311CA2CBB /* Linked Frameworks */ = { - isa = PBXGroup; - children = ( - 1058C7A7FEA54F5311CA2CBB /* Cocoa.framework */, - 55FF4E64116A401B000C22B4 /* libicucore.dylib */, - 559EFA4711C7D49800D020F4 /* Sparkle.framework */, - 55CA98D412EF8FCE008F0368 /* SFBInspectors.framework */, - ); - name = "Linked Frameworks"; - sourceTree = ""; - }; - 1058C7A8FEA54F5311CA2CBB /* Other Frameworks */ = { - isa = PBXGroup; - children = ( - 2A37F4C4FDCFA73011CA2CEA /* AppKit.framework */, - 13E42FBA07B3F13500E4EEF1 /* CoreData.framework */, - 2A37F4C5FDCFA73011CA2CEA /* Foundation.framework */, - 5573B8B911D9FC8D00B5DC5D /* Quartz.framework */, - ); - name = "Other Frameworks"; - sourceTree = ""; - }; - 19C28FB0FE9D524F11CA2CBB /* Products */ = { - isa = PBXGroup; - children = ( - 8D15AC370486D014006FF6A4 /* TikZiT.app */, - 5504C83711D237F5002A1478 /* tests */, - ); - name = Products; - sourceTree = ""; - }; - 2A37F4AAFDCFA73011CA2CEA /* TikZiT */ = { - isa = PBXGroup; - children = ( - 2A37F4ABFDCFA73011CA2CEA /* TikZiT */, - 2A37F4AFFDCFA73011CA2CEA /* Other Sources */, - 2A37F4B8FDCFA73011CA2CEA /* Resources */, - 2A37F4C3FDCFA73011CA2CEA /* Frameworks */, - 19C28FB0FE9D524F11CA2CBB /* Products */, - ); - name = TikZiT; - sourceTree = ""; - }; - 2A37F4ABFDCFA73011CA2CEA /* TikZiT */ = { - isa = PBXGroup; - children = ( - 5504C82611D23477002A1478 /* Test */, - 55D946141165924F0044178C /* Graph */, - 55D946071165922F0044178C /* Parser */, - 55D9467311659F5E0044178C /* Gui */, - 558F18D9117B043B009863B2 /* AppDelegate.h */, - 558F18DA117B043B009863B2 /* AppDelegate.m */, - 55F9E04311FF54F000F5659E /* NSString+LatexConstants.h */, - 55F9E04411FF54F000F5659E /* NSString+LatexConstants.m */, - ); - name = TikZiT; - sourceTree = ""; - }; - 2A37F4AFFDCFA73011CA2CEA /* Other Sources */ = { - isa = PBXGroup; - children = ( - 55CA9AC712F831E5008F0368 /* RColor.h */, - 55CA9AC812F831E5008F0368 /* RColor.m */, - 558F18CB117B03DD009863B2 /* main.m */, - 558F18CC117B03DD009863B2 /* util.h */, - 558F18CD117B03DD009863B2 /* util.m */, - 2564AD2C0F5327BB00F57823 /* TikZiT_Prefix.pch */, - 55652DF713E1F2030023F4C6 /* SupportDir.h */, - 55652DF813E1F2030023F4C6 /* SupportDir.m */, - ); - name = "Other Sources"; - sourceTree = ""; - }; - 2A37F4B8FDCFA73011CA2CEA /* Resources */ = { - isa = PBXGroup; - children = ( - 55397C8E1449AC7C006942FB /* AH_latex_head.png */, - 55397C8F1449AC7C006942FB /* AH_plain_head.png */, - 55397C8C1449ABFC006942FB /* AH_latex_tail.png */, - 55397C871449AB91006942FB /* AH_none.png */, - 55397C881449AB91006942FB /* AH_plain_tail.png */, - 55397C841449A9BF006942FB /* ED_none.png */, - 55397C821449A8F1006942FB /* ED_tick.png */, - 55397C801449A877006942FB /* ED_arrow.png */, - 7F93852C184D175400FAED38 /* Icons */, - 55652E5013E1FC660023F4C6 /* shapes */, - 55900AE2135FB305002DD28E /* emblem-unreadable-grey.png */, - 55E5E99D1215C8E300256F69 /* transform-crop-and-resize.png */, - 5573B98711DA377C00B5DC5D /* text-x-script.png */, - 8D15AC360486D014006FF6A4 /* TikZiT-Info.plist */, - 7F90E88F16DD54440069EBCD /* UserDefaults.plist */, - 089C165FFE840EACC02AAC07 /* InfoPlist.strings */, - 2A37F4B9FDCFA73011CA2CEA /* Credits.rtf */, - 55D949111165D8870044178C /* draw-ellipse.png */, - 55D949121165D8870044178C /* draw-path.png */, - 555B30F811D8BE3300CAECF5 /* emblem-important.png */, - 5573B92411DA273400B5DC5D /* format-indent-less.png */, - 55D949131165D8870044178C /* select-rectangular.png */, - 5573B92011DA259C00B5DC5D /* text-x-generic.png */, - 559EFA5611C7D95F00D020F4 /* tikzit_dsa_pub.pem */, - 55D945701165904F0044178C /* tikzitdoc.icns */, - 55D945711165904F0044178C /* tikzit.icns */, - 7F90E88C16DD47540069EBCD /* Preferences.xib */, - 7FD5D44918E1CB5300E2A930 /* CustomNodes.xib */, - 7F18A322184C599100BC3081 /* UpdatePreferencePanel.xib */, - 55391AF713D3250F007DBE71 /* Preamble.xib */, - 55391AF513D324FE007DBE71 /* Preview.xib */, - 55391B0013D32608007DBE71 /* PropertyInspector.xib */, - 556979421168747B007E5703 /* StylePalette.xib */, - 1DDD58280DA1D0D100B32029 /* TikzDocument.xib */, - 1DDD582A0DA1D0D100B32029 /* MainMenu.xib */, - ); - name = Resources; - sourceTree = ""; - }; - 2A37F4C3FDCFA73011CA2CEA /* Frameworks */ = { - isa = PBXGroup; - children = ( - 1058C7A6FEA54F5311CA2CBB /* Linked Frameworks */, - 1058C7A8FEA54F5311CA2CBB /* Other Frameworks */, - ); - name = Frameworks; - sourceTree = ""; - }; - 5504C82611D23477002A1478 /* Test */ = { - isa = PBXGroup; - children = ( - 555B313411D8C6DA00CAECF5 /* color.m */, - 5504C93E11D39422002A1478 /* osx.m */, - 5504C82A11D23595002A1478 /* common.m */, - 5504C83111D23685002A1478 /* main.m */, - 5504C82B11D23595002A1478 /* parser.m */, - 5504C82C11D23595002A1478 /* test.h */, - 5504C82D11D23595002A1478 /* test.m */, - 7F6E2C8716B0091300BFE20D /* maths.m */, - ); - name = Test; - sourceTree = ""; - }; - 55391B0713D326E5007DBE71 /* PropertyInspector */ = { - isa = PBXGroup; - children = ( - 552202C2135F15FD007EA086 /* MultiField.h */, - 552202C3135F15FD007EA086 /* MultiField.m */, - 55900A9F135FA918002DD28E /* MultiCombo.h */, - 55900AA0135FA918002DD28E /* MultiCombo.m */, - 55391B0813D32765007DBE71 /* PropertyInspectorController.h */, - 55391B0913D32765007DBE71 /* PropertyInspectorController.m */, - ); - name = PropertyInspector; - sourceTree = ""; - }; - 55652E5013E1FC660023F4C6 /* shapes */ = { - isa = PBXGroup; - children = ( - 55652E5113E1FC660023F4C6 /* cap.tikz */, - 55652E5213E1FC660023F4C6 /* copants.tikz */, - 55652E5313E1FC660023F4C6 /* cup.tikz */, - 55652E5413E1FC660023F4C6 /* oval.tikz */, - 55652E5513E1FC660023F4C6 /* pants.tikz */, - ); - path = shapes; - sourceTree = ""; - }; - 5573B8BF11D9FD1800B5DC5D /* Preview */ = { - isa = PBXGroup; - children = ( - 7F734388184AC559002897D0 /* DraggablePDFView.h */, - 7F734389184AC559002897D0 /* DraggablePDFView.m */, - 5573B8C011D9FD3200B5DC5D /* PreviewController.h */, - 5573B8C111D9FD3200B5DC5D /* PreviewController.m */, - ); - name = Preview; - sourceTree = ""; - }; - 5573B90C11DA22E500B5DC5D /* Preamble */ = { - isa = PBXGroup; - children = ( - 5573B92711DA292F00B5DC5D /* Preambles.h */, - 5573B92811DA292F00B5DC5D /* Preambles.m */, - 5573BDC911DB4D2600B5DC5D /* Preambles+Coder.h */, - 5573BDCA11DB4D2600B5DC5D /* Preambles+Coder.m */, - ); - name = Preamble; - sourceTree = ""; - }; - 55900AFC13605498002DD28E /* Shapes */ = { - isa = PBXGroup; - children = ( - 55598E331635372E0023450A /* DiamondShape.h */, - 55598E341635372E0023450A /* DiamondShape.m */, - 55652E3F13E1FB0A0023F4C6 /* Shape.h */, - 55652E4013E1FB0A0023F4C6 /* Shape.m */, - 55652E3313E1FAED0023F4C6 /* CircleShape.h */, - 55652E3413E1FAED0023F4C6 /* CircleShape.m */, - 55652E3513E1FAED0023F4C6 /* RectangleShape.h */, - 55652E3613E1FAED0023F4C6 /* RectangleShape.m */, - 55652E3713E1FAED0023F4C6 /* RegularPolyShape.h */, - 55652E3813E1FAED0023F4C6 /* RegularPolyShape.m */, - 55652E3913E1FAEE0023F4C6 /* TikzShape.h */, - 55652E3A13E1FAEE0023F4C6 /* TikzShape.m */, - 555ECF361379E9F80052DB71 /* ShapeNames.h */, - ); - name = Shapes; - sourceTree = ""; - }; - 55D946071165922F0044178C /* Parser */ = { - isa = PBXGroup; - children = ( - 7F7B6DE218DE0BE1004F6CA8 /* Generated sources */, - 5589A9AA11C500060064D310 /* tikzlexer.lm */, - 5589A9AB11C500060064D310 /* tikzparser.ym */, - 5589A9FD11C51E780064D310 /* TikzGraphAssembler.h */, - 5589A9FE11C51E780064D310 /* TikzGraphAssembler.m */, - ); - name = Parser; - sourceTree = ""; - }; - 55D946141165924F0044178C /* Graph */ = { - isa = PBXGroup; - children = ( - 55432E041444BF2D00401BB3 /* GraphElementProperty.h */, - 55432E051444BF2D00401BB3 /* GraphElementProperty.m */, - 559EFB6611CB88E300D020F4 /* ColorRGB.h */, - 559EFB6711CB88E300D020F4 /* ColorRGB.m */, - 558F18B9117B031C009863B2 /* Edge.h */, - 558F18BA117B031C009863B2 /* Edge.m */, - 558F18BB117B031C009863B2 /* Graph.h */, - 558F18BC117B031C009863B2 /* Graph.m */, - 55D2E0B01186ED950060B4EC /* Graph+Coder.h */, - 55D2E0B11186ED950060B4EC /* Graph+Coder.m */, - 558F18BD117B031C009863B2 /* GraphChange.h */, - 558F18BE117B031C009863B2 /* GraphChange.m */, - 7FEED45516B1A7C400B056CB /* StyleManager.h */, - 7FEED45616B1A7C500B056CB /* StyleManager.m */, - 558F18BF117B031C009863B2 /* GraphElementData.h */, - 558F18C0117B031C009863B2 /* GraphElementData.m */, - 558F18C1117B031C009863B2 /* Node.h */, - 558F18C2117B031C009863B2 /* Node.m */, - 7F90E88416DD29600069EBCD /* NSString+Tikz.h */, - 7F90E88516DD29600069EBCD /* NSString+Tikz.m */, - 558F18C3117B031C009863B2 /* NodeStyle.h */, - 558F18C4117B031C009863B2 /* NodeStyle.m */, - 5585E5C0117F681800124513 /* NodeStyle+Coder.h */, - 5585E5C1117F681800124513 /* NodeStyle+Coder.m */, - 55397C7714498C21006942FB /* EdgeStyle.h */, - 55397C7814498C22006942FB /* EdgeStyle.m */, - 55397C7A144990EA006942FB /* EdgeStyle+Coder.h */, - 55397C7B144990EA006942FB /* EdgeStyle+Coder.m */, - 55397C7D144999C4006942FB /* PropertyHolder.h */, - 55397C7E144999C4006942FB /* PropertyHolder.m */, - ); - name = Graph; - sourceTree = ""; - }; - 55D9467311659F5E0044178C /* Gui */ = { - isa = PBXGroup; - children = ( - 7FB9BFE616B54BE300773146 /* Formatter */, - 55D9468011659FD50044178C /* GraphicsView */, - 5573B90C11DA22E500B5DC5D /* Preamble */, - 5573B8BF11D9FD1800B5DC5D /* Preview */, - 55391B0713D326E5007DBE71 /* PropertyInspector */, - 55D9468D11659FF00044178C /* StylePalette */, - 558F18EF117B043B009863B2 /* TikzDocument.h */, - 7F781C1816B5DE1400239826 /* ParseErrorView.h */, - 7F781C1916B5DE1400239826 /* ParseErrorView.m */, - 558F18F0117B043B009863B2 /* TikzDocument.m */, - 558F18F1117B043B009863B2 /* TikzSourceController.h */, - 558F18F2117B043B009863B2 /* TikzSourceController.m */, - 558F18F3117B043B009863B2 /* ToolPaletteController.h */, - 558F18F4117B043B009863B2 /* ToolPaletteController.m */, - 55CA997012F08281008F0368 /* TikzWindowController.h */, - 55CA997112F08281008F0368 /* TikzWindowController.m */, - 553A4C58144ED3D500AA6FAC /* NilToEmptyStringTransformer.h */, - 553A4C59144ED3D500AA6FAC /* NilToEmptyStringTransformer.m */, - 7F18A31E184C563800BC3081 /* Preferences */, - ); - name = Gui; - sourceTree = ""; - }; - 55D9468011659FD50044178C /* GraphicsView */ = { - isa = PBXGroup; - children = ( - 55900AFC13605498002DD28E /* Shapes */, - 558F18DD117B043B009863B2 /* EdgeControlLayer.h */, - 558F18DE117B043B009863B2 /* EdgeControlLayer.m */, - 558F18DF117B043B009863B2 /* GraphicsView.h */, - 558F18E0117B043B009863B2 /* GraphicsView.m */, - 558F18E1117B043B009863B2 /* Grid.h */, - 558F18E2117B043B009863B2 /* Grid.m */, - 558F18E3117B043B009863B2 /* NodeLayer.h */, - 558F18E4117B043B009863B2 /* NodeLayer.m */, - 558F18E5117B043B009863B2 /* NodeSelectionLayer.h */, - 558F18E6117B043B009863B2 /* NodeSelectionLayer.m */, - 55F958581181B09600F99434 /* PickSupport.h */, - 55F958591181B09600F99434 /* PickSupport.m */, - 55F9585A1181B09600F99434 /* Transformer.h */, - 55F9585B1181B09600F99434 /* Transformer.m */, - 5589AD4211C633EE0064D310 /* SelectBoxLayer.h */, - 5589AD4311C633EE0064D310 /* SelectBoxLayer.m */, - 555ECE991378A3AA0052DB71 /* CALayer+DrawLabel.h */, - 555ECE9A1378A3AA0052DB71 /* CALayer+DrawLabel.m */, - ); - name = GraphicsView; - sourceTree = ""; - }; - 55D9468D11659FF00044178C /* StylePalette */ = { - isa = PBXGroup; - children = ( - 558F18E9117B043B009863B2 /* SelectableCollectionViewItem.h */, - 558F18EA117B043B009863B2 /* SelectableCollectionViewItem.m */, - 558F18EB117B043B009863B2 /* SelectableNodeView.h */, - 558F18EC117B043B009863B2 /* SelectableNodeView.m */, - 558F18ED117B043B009863B2 /* StylePaletteController.h */, - 558F18EE117B043B009863B2 /* StylePaletteController.m */, - ); - name = StylePalette; - sourceTree = ""; - }; - 7F18A31E184C563800BC3081 /* Preferences */ = { - isa = PBXGroup; - children = ( - 7F7B6DEF18DE0D70004F6CA8 /* CustomNode */, - 5573B90D11DA231A00B5DC5D /* PreambleController.h */, - 5573B90E11DA231A00B5DC5D /* PreambleController.m */, - 7F90E88A16DD47540069EBCD /* PreferenceController.h */, - 7F90E88B16DD47540069EBCD /* PreferenceController.m */, - 7F18A31F184C577000BC3081 /* UpdatePreferenceController.h */, - 7F18A320184C577000BC3081 /* UpdatePreferenceController.m */, - ); - name = Preferences; - sourceTree = ""; - }; - 7F7B6DE218DE0BE1004F6CA8 /* Generated sources */ = { - isa = PBXGroup; - children = ( - 7F7B6DE918DE0C9E004F6CA8 /* tikzlexer.h */, - 7F7B6DEA18DE0C9E004F6CA8 /* tikzlexer.m */, - 7F7B6DEB18DE0C9E004F6CA8 /* tikzparser.h */, - 7F7B6DEC18DE0C9E004F6CA8 /* tikzparser.m */, - ); - name = "Generated sources"; - sourceTree = ""; - }; - 7F7B6DEF18DE0D70004F6CA8 /* CustomNode */ = { - isa = PBXGroup; - children = ( - 7F7B6DF018DE0D7A004F6CA8 /* CustomNodeCellView.h */, - 7F7B6DF118DE0D7A004F6CA8 /* CustomNodeCellView.m */, - 7F7B6DF218DE0D7A004F6CA8 /* CustomNodeController.h */, - 7F7B6DF318DE0D7A004F6CA8 /* CustomNodeController.m */, - ); - name = CustomNode; - sourceTree = ""; - }; - 7F93852C184D175400FAED38 /* Icons */ = { - isa = PBXGroup; - children = ( - 7F93852F184D178B00FAED38 /* engine.png */, - 7F938531184D184700FAED38 /* preamble.png */, - 7FD5D44C18E1CC0B00E2A930 /* customshape.png */, - 7F93852D184D176E00FAED38 /* updates.png */, - ); - name = Icons; - sourceTree = ""; - }; - 7FB9BFE616B54BE300773146 /* Formatter */ = { - isa = PBXGroup; - children = ( - 7FB9BFEC16B57C2E00773146 /* TikzFormatter.h */, - 7FB9BFED16B57C2E00773146 /* TikzFormatter.m */, - ); - name = Formatter; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 5589AA6411C5429C0064D310 /* tests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 5589AA8311C543240064D310 /* Build configuration list for PBXNativeTarget "tests" */; - buildPhases = ( - 5589AA6211C5429C0064D310 /* Sources */, - 5589AA6311C5429C0064D310 /* Frameworks */, - 7F6E2C8B16B00A9200BFE20D /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - 5504C91B11D36CD5002A1478 /* PBXTargetDependency */, - ); - name = tests; - productName = testparser; - productReference = 5504C83711D237F5002A1478 /* tests */; - productType = "com.apple.product-type.tool"; - }; - 8D15AC270486D014006FF6A4 /* TikZiT */ = { - isa = PBXNativeTarget; - buildConfigurationList = C05733C708A9546B00998B17 /* Build configuration list for PBXNativeTarget "TikZiT" */; - buildPhases = ( - 559EFA5511C7D4DD00D020F4 /* Copy Frameworks */, - 8D15AC2B0486D014006FF6A4 /* Resources */, - 55652E6613E1FD080023F4C6 /* Copy Shapes */, - 7F7B6DE018DE02AC004F6CA8 /* Run Flex */, - 7F7B6DE118DE0A6E004F6CA8 /* Run Bison */, - 8D15AC300486D014006FF6A4 /* Sources */, - 8D15AC330486D014006FF6A4 /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = TikZiT; - productInstallPath = "$(HOME)/Applications"; - productName = TikZiT; - productReference = 8D15AC370486D014006FF6A4 /* TikZiT.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 2A37F4A9FDCFA73011CA2CEA /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 0410; - ORGANIZATIONNAME = "Aleks Kissinger"; - }; - buildConfigurationList = C05733CB08A9546B00998B17 /* Build configuration list for PBXProject "TikZiT" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; - hasScannedForEncodings = 1; - knownRegions = ( - English, - Japanese, - French, - German, - ); - mainGroup = 2A37F4AAFDCFA73011CA2CEA /* TikZiT */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 8D15AC270486D014006FF6A4 /* TikZiT */, - 5589AA6411C5429C0064D310 /* tests */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 8D15AC2B0486D014006FF6A4 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 8D15AC2C0486D014006FF6A4 /* Credits.rtf in Resources */, - 8D15AC2F0486D014006FF6A4 /* InfoPlist.strings in Resources */, - 7F938532184D184700FAED38 /* preamble.png in Resources */, - 1DDD582C0DA1D0D100B32029 /* TikzDocument.xib in Resources */, - 7F938530184D178B00FAED38 /* engine.png in Resources */, - 1DDD582D0DA1D0D100B32029 /* MainMenu.xib in Resources */, - 7FD5D44D18E1CC0B00E2A930 /* customshape.png in Resources */, - 55D945721165904F0044178C /* tikzitdoc.icns in Resources */, - 55D945731165904F0044178C /* tikzit.icns in Resources */, - 556979431168747B007E5703 /* StylePalette.xib in Resources */, - 55D949141165D8870044178C /* draw-ellipse.png in Resources */, - 55D949151165D8870044178C /* draw-path.png in Resources */, - 55D949161165D8870044178C /* select-rectangular.png in Resources */, - 559EFA5711C7D95F00D020F4 /* tikzit_dsa_pub.pem in Resources */, - 7F93852E184D176E00FAED38 /* updates.png in Resources */, - 555B30F911D8BE3300CAECF5 /* emblem-important.png in Resources */, - 55391AF613D324FE007DBE71 /* Preview.xib in Resources */, - 55391AF813D3250F007DBE71 /* Preamble.xib in Resources */, - 5573B92111DA259C00B5DC5D /* text-x-generic.png in Resources */, - 5573B92511DA273400B5DC5D /* format-indent-less.png in Resources */, - 5573B98811DA377C00B5DC5D /* text-x-script.png in Resources */, - 55E5E99E1215C8E300256F69 /* transform-crop-and-resize.png in Resources */, - 55900AE3135FB305002DD28E /* emblem-unreadable-grey.png in Resources */, - 55391B0213D32608007DBE71 /* PropertyInspector.xib in Resources */, - 55397C811449A877006942FB /* ED_arrow.png in Resources */, - 55397C831449A8F1006942FB /* ED_tick.png in Resources */, - 55397C851449A9BF006942FB /* ED_none.png in Resources */, - 55397C8A1449AB91006942FB /* AH_none.png in Resources */, - 55397C8B1449AB91006942FB /* AH_plain_tail.png in Resources */, - 55397C8D1449ABFC006942FB /* AH_latex_tail.png in Resources */, - 7FD5D44B18E1CB5300E2A930 /* CustomNodes.xib in Resources */, - 55397C901449AC7C006942FB /* AH_latex_head.png in Resources */, - 55397C911449AC7C006942FB /* AH_plain_head.png in Resources */, - 7F18A323184C599100BC3081 /* UpdatePreferencePanel.xib in Resources */, - 7F90E88E16DD47540069EBCD /* Preferences.xib in Resources */, - 7F90E89116DD54440069EBCD /* UserDefaults.plist in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXShellScriptBuildPhase section */ - 7F7B6DE018DE02AC004F6CA8 /* Run Flex */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "$(SRCROOT)/src/common/tikzlexer.lm", - ); - name = "Run Flex"; - outputPaths = ( - "$(DERIVED_SOURCES_DIR)/tikzlexer.m", - "$(DERIVED_SOURCES_DIR)/tikzlexer.h", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "cd ${SRCROOT}/src/\nexport INPUT_FILE_BASE=`basename \"${SCRIPT_INPUT_FILE_0}\" .lm`\nflex -o common/${INPUT_FILE_BASE}.m common/${INPUT_FILE_BASE}.lm\nmv common/${INPUT_FILE_BASE}.m common/${INPUT_FILE_BASE}.h ${DERIVED_SOURCES_DIR}\n"; - }; - 7F7B6DE118DE0A6E004F6CA8 /* Run Bison */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "$(SRCROOT)/src/common/tikzparser.ym", - ); - name = "Run Bison"; - outputPaths = ( - "$(DERIVED_SOURCES_DIR)/tikzparser.m", - "$(DERIVED_SOURCES_DIR)/tikzparser.h", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "cd ${SRCROOT}/src/\nexport INPUT_FILE_BASE=`basename \"${SCRIPT_INPUT_FILE_0}\" .ym`\nbison --defines=common/${INPUT_FILE_BASE}.h --output=common/${INPUT_FILE_BASE}.m common/${INPUT_FILE_BASE}.ym\nmv common/${INPUT_FILE_BASE}.m common/${INPUT_FILE_BASE}.h ${DERIVED_SOURCES_DIR}"; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 5589AA6211C5429C0064D310 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 5504C84F11D23945002A1478 /* ColorRGB.m in Sources */, - 5589AA8511C543500064D310 /* util.m in Sources */, - 5589AA7211C542E60064D310 /* Edge.m in Sources */, - 5589AA7611C542E60064D310 /* Graph.m in Sources */, - 5589AA7811C542E60064D310 /* GraphChange.m in Sources */, - 5589AA7A11C542E60064D310 /* GraphElementData.m in Sources */, - 5589AA7C11C542E60064D310 /* Node.m in Sources */, - 5589AA8011C542E60064D310 /* NodeStyle.m in Sources */, - 5589AA6C11C542D30064D310 /* TikzGraphAssembler.m in Sources */, - 5589AA6D11C542D30064D310 /* tikzlexer.lm in Sources */, - 7F6E2C8216B008B000BFE20D /* DiamondShape.m in Sources */, - 7F6E2C8316B008B000BFE20D /* CircleShape.m in Sources */, - 7F6E2C8A16B0096000BFE20D /* SupportDir.m in Sources */, - 7F6E2C8416B008B000BFE20D /* RectangleShape.m in Sources */, - 7F6E2C8516B008B000BFE20D /* RegularPolyShape.m in Sources */, - 7F6E2C8616B008B000BFE20D /* TikzShape.m in Sources */, - 7F6E2C8016B0083300BFE20D /* Shape.m in Sources */, - 7F6E2C8116B0084600BFE20D /* Transformer.m in Sources */, - 5589AA6E11C542D30064D310 /* tikzparser.ym in Sources */, - 5504C82E11D23595002A1478 /* common.m in Sources */, - 5504C82F11D23595002A1478 /* parser.m in Sources */, - 5504C83011D23595002A1478 /* test.m in Sources */, - 7F6E2C7F16B0081D00BFE20D /* PropertyHolder.m in Sources */, - 5504C83211D23685002A1478 /* main.m in Sources */, - 5504C93F11D39422002A1478 /* osx.m in Sources */, - 555B313511D8C6DA00CAECF5 /* color.m in Sources */, - 7F6E2C7E16B0080400BFE20D /* GraphElementProperty.m in Sources */, - 7F6E2C7D16B007F000BFE20D /* EdgeStyle.m in Sources */, - 55CA9ACA12F831E5008F0368 /* RColor.m in Sources */, - 552202C4135F15FD007EA086 /* MultiField.m in Sources */, - 55900AA1135FA918002DD28E /* MultiCombo.m in Sources */, - 7F6E2C8916B0091300BFE20D /* maths.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 8D15AC300486D014006FF6A4 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 7F7B6DEE18DE0C9E004F6CA8 /* tikzparser.m in Sources */, - 7F7B6DED18DE0C9E004F6CA8 /* tikzlexer.m in Sources */, - 558F18C5117B031C009863B2 /* Edge.m in Sources */, - 558F18C6117B031C009863B2 /* Graph.m in Sources */, - 558F18C7117B031C009863B2 /* GraphChange.m in Sources */, - 7F7B6DF418DE0D7A004F6CA8 /* CustomNodeCellView.m in Sources */, - 558F18C8117B031C009863B2 /* GraphElementData.m in Sources */, - 558F18C9117B031C009863B2 /* Node.m in Sources */, - 558F18CA117B031C009863B2 /* NodeStyle.m in Sources */, - 558F18CE117B03DD009863B2 /* main.m in Sources */, - 558F18CF117B03DD009863B2 /* util.m in Sources */, - 558F18F7117B043C009863B2 /* AppDelegate.m in Sources */, - 558F18F9117B043C009863B2 /* EdgeControlLayer.m in Sources */, - 558F18FA117B043C009863B2 /* GraphicsView.m in Sources */, - 7F73438A184AC559002897D0 /* DraggablePDFView.m in Sources */, - 558F18FB117B043C009863B2 /* Grid.m in Sources */, - 558F18FC117B043C009863B2 /* NodeLayer.m in Sources */, - 558F18FD117B043C009863B2 /* NodeSelectionLayer.m in Sources */, - 558F18FF117B043C009863B2 /* SelectableCollectionViewItem.m in Sources */, - 558F1900117B043C009863B2 /* SelectableNodeView.m in Sources */, - 558F1901117B043C009863B2 /* StylePaletteController.m in Sources */, - 558F1902117B043C009863B2 /* TikzDocument.m in Sources */, - 558F1903117B043C009863B2 /* TikzSourceController.m in Sources */, - 558F1904117B043C009863B2 /* ToolPaletteController.m in Sources */, - 5585E5C2117F681800124513 /* NodeStyle+Coder.m in Sources */, - 55F9585C1181B09600F99434 /* PickSupport.m in Sources */, - 55F9585D1181B09600F99434 /* Transformer.m in Sources */, - 55D2E0B21186ED950060B4EC /* Graph+Coder.m in Sources */, - 5589A9FF11C51E780064D310 /* TikzGraphAssembler.m in Sources */, - 7F7B6DF518DE0D7A004F6CA8 /* CustomNodeController.m in Sources */, - 5589AD4411C633EE0064D310 /* SelectBoxLayer.m in Sources */, - 559EFB6811CB88E300D020F4 /* ColorRGB.m in Sources */, - 5573B8C211D9FD3200B5DC5D /* PreviewController.m in Sources */, - 5573B90F11DA231A00B5DC5D /* PreambleController.m in Sources */, - 5573B92911DA292F00B5DC5D /* Preambles.m in Sources */, - 5573BDCB11DB4D2600B5DC5D /* Preambles+Coder.m in Sources */, - 55F9E04511FF54F000F5659E /* NSString+LatexConstants.m in Sources */, - 55CA997212F08281008F0368 /* TikzWindowController.m in Sources */, - 55CA9AC912F831E5008F0368 /* RColor.m in Sources */, - 552202C5135F15FD007EA086 /* MultiField.m in Sources */, - 55900AA2135FA918002DD28E /* MultiCombo.m in Sources */, - 555ECE9B1378A3AA0052DB71 /* CALayer+DrawLabel.m in Sources */, - 55391B0A13D32765007DBE71 /* PropertyInspectorController.m in Sources */, - 55652DF913E1F2030023F4C6 /* SupportDir.m in Sources */, - 55652E3B13E1FAEE0023F4C6 /* CircleShape.m in Sources */, - 55652E3C13E1FAEE0023F4C6 /* RectangleShape.m in Sources */, - 55652E3D13E1FAEE0023F4C6 /* RegularPolyShape.m in Sources */, - 55652E3E13E1FAEE0023F4C6 /* TikzShape.m in Sources */, - 55652E4113E1FB0A0023F4C6 /* Shape.m in Sources */, - 55432E061444BF2D00401BB3 /* GraphElementProperty.m in Sources */, - 55397C7914498C22006942FB /* EdgeStyle.m in Sources */, - 55397C7C144990EA006942FB /* EdgeStyle+Coder.m in Sources */, - 55397C7F144999C4006942FB /* PropertyHolder.m in Sources */, - 553A4C5A144ED3D500AA6FAC /* NilToEmptyStringTransformer.m in Sources */, - 55598E351635372E0023450A /* DiamondShape.m in Sources */, - 7FEED45716B1A7C500B056CB /* StyleManager.m in Sources */, - 7FB9BFEE16B57C2E00773146 /* TikzFormatter.m in Sources */, - 7F781C1A16B5DE1400239826 /* ParseErrorView.m in Sources */, - 7F90E88616DD29600069EBCD /* NSString+Tikz.m in Sources */, - 7F90E88D16DD47540069EBCD /* PreferenceController.m in Sources */, - 7F18A321184C577000BC3081 /* UpdatePreferenceController.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXTargetDependency section */ - 5504C91B11D36CD5002A1478 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 8D15AC270486D014006FF6A4 /* TikZiT */; - targetProxy = 5504C91A11D36CD5002A1478 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - -/* Begin PBXVariantGroup section */ - 089C165FFE840EACC02AAC07 /* InfoPlist.strings */ = { - isa = PBXVariantGroup; - children = ( - 089C1660FE840EACC02AAC07 /* English */, - ); - name = InfoPlist.strings; - sourceTree = ""; - }; - 1DDD58280DA1D0D100B32029 /* TikzDocument.xib */ = { - isa = PBXVariantGroup; - children = ( - 1DDD58290DA1D0D100B32029 /* English */, - ); - name = TikzDocument.xib; - sourceTree = ""; - }; - 1DDD582A0DA1D0D100B32029 /* MainMenu.xib */ = { - isa = PBXVariantGroup; - children = ( - 1DDD582B0DA1D0D100B32029 /* English */, - ); - name = MainMenu.xib; - sourceTree = ""; - }; - 2A37F4B9FDCFA73011CA2CEA /* Credits.rtf */ = { - isa = PBXVariantGroup; - children = ( - 2A37F4BAFDCFA73011CA2CEA /* English */, - ); - name = Credits.rtf; - sourceTree = ""; - }; - 55391AF513D324FE007DBE71 /* Preview.xib */ = { - isa = PBXVariantGroup; - children = ( - 5573B8BD11D9FCD400B5DC5D /* English */, - ); - name = Preview.xib; - sourceTree = ""; - }; - 55391AF713D3250F007DBE71 /* Preamble.xib */ = { - isa = PBXVariantGroup; - children = ( - 5573B91011DA233E00B5DC5D /* English */, - ); - name = Preamble.xib; - sourceTree = ""; - }; - 55391B0013D32608007DBE71 /* PropertyInspector.xib */ = { - isa = PBXVariantGroup; - children = ( - 55391B0113D32608007DBE71 /* English */, - ); - name = PropertyInspector.xib; - sourceTree = ""; - }; - 556979421168747B007E5703 /* StylePalette.xib */ = { - isa = PBXVariantGroup; - children = ( - 55D947301165A5D40044178C /* English */, - ); - name = StylePalette.xib; - sourceTree = ""; - }; - 7F90E88F16DD54440069EBCD /* UserDefaults.plist */ = { - isa = PBXVariantGroup; - children = ( - 7F90E89016DD54440069EBCD /* English */, - ); - name = UserDefaults.plist; - sourceTree = ""; - }; - 7FD5D44918E1CB5300E2A930 /* CustomNodes.xib */ = { - isa = PBXVariantGroup; - children = ( - 7FD5D44A18E1CB5300E2A930 /* English */, - ); - name = CustomNodes.xib; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - -/* Begin XCBuildConfiguration section */ - 5589AA6711C5429E0064D310 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/Frameworks\"", - ); - GCC_DYNAMIC_NO_PIC = NO; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; - INSTALL_PATH = /usr/local/bin; - OTHER_LDFLAGS = ( - "-framework", - Foundation, - "-framework", - AppKit, - ); - PRODUCT_NAME = tests; - SDKROOT = macosx; - }; - name = Debug; - }; - 5589AA6811C5429E0064D310 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/Frameworks\"", - ); - GCC_MODEL_TUNING = G5; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; - INSTALL_PATH = /usr/local/bin; - OTHER_LDFLAGS = ( - "-framework", - Foundation, - "-framework", - AppKit, - ); - PRODUCT_NAME = tests; - SDKROOT = macosx; - ZERO_LINK = NO; - }; - name = Release; - }; - C05733C808A9546B00998B17 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; - CLANG_ENABLE_OBJC_ARC = YES; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)\"", - "\"$(SRCROOT)/Frameworks\"", - ); - GCC_DYNAMIC_NO_PIC = NO; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = TikZiT_Prefix.pch; - INFOPLIST_FILE = "TikZiT-Info.plist"; - INSTALL_PATH = "$(HOME)/Applications"; - LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.7; - PRODUCT_NAME = TikZiT; - SDKROOT = macosx; - }; - name = Debug; - }; - C05733C908A9546B00998B17 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; - CLANG_ENABLE_OBJC_ARC = YES; - COMBINE_HIDPI_IMAGES = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)\"", - "\"$(SRCROOT)/Frameworks\"", - ); - GCC_MODEL_TUNING = G5; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = TikZiT_Prefix.pch; - INFOPLIST_FILE = "TikZiT-Info.plist"; - INSTALL_PATH = "$(HOME)/Applications"; - LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.7; - PRODUCT_NAME = TikZiT; - SDKROOT = macosx; - }; - name = Release; - }; - C05733CC08A9546B00998B17 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.5; - ONLY_ACTIVE_ARCH = YES; - PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO; - SDKROOT = macosx; - SYMROOT = xbuild; - USER_HEADER_SEARCH_PATHS = "src/osx src/common"; - VALID_ARCHS = "i386 x86_64"; - }; - name = Debug; - }; - C05733CD08A9546B00998B17 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.5; - ONLY_ACTIVE_ARCH = NO; - PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO; - SDKROOT = macosx; - SYMROOT = xbuild; - USER_HEADER_SEARCH_PATHS = "src/osx src/common"; - VALID_ARCHS = "i386 x86_64"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 5589AA8311C543240064D310 /* Build configuration list for PBXNativeTarget "tests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 5589AA6711C5429E0064D310 /* Debug */, - 5589AA6811C5429E0064D310 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - C05733C708A9546B00998B17 /* Build configuration list for PBXNativeTarget "TikZiT" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - C05733C808A9546B00998B17 /* Debug */, - C05733C908A9546B00998B17 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - C05733CB08A9546B00998B17 /* Build configuration list for PBXProject "TikZiT" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - C05733CC08A9546B00998B17 /* Debug */, - C05733CD08A9546B00998B17 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 2A37F4A9FDCFA73011CA2CEA /* Project object */; -} diff --git a/tikzit/TikZiT.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/tikzit/TikZiT.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 82f3c48..0000000 --- a/tikzit/TikZiT.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/tikzit/TikZiT.xcodeproj/project.xcworkspace/xcshareddata/TikZiT.xccheckout b/tikzit/TikZiT.xcodeproj/project.xcworkspace/xcshareddata/TikZiT.xccheckout deleted file mode 100644 index c3ec4fe..0000000 --- a/tikzit/TikZiT.xcodeproj/project.xcworkspace/xcshareddata/TikZiT.xccheckout +++ /dev/null @@ -1,37 +0,0 @@ - - - - - IDESourceControlProjectFavoriteDictionaryKey - - IDESourceControlProjectIdentifier - 26857C1F-E0FE-4FFB-BDAC-44158C649772 - IDESourceControlProjectOriginsDictionary - - F6FA2C351D428A0F1026539971510A626DEEFF59 - https://github.com/tikzit/tikzit.git - - IDESourceControlProjectRelativeInstallPathDictionary - - F6FA2C351D428A0F1026539971510A626DEEFF59 - TikZiT/ - - IDESourceControlProjectURL - https://github.com/tikzit/tikzit.git - IDESourceControlProjectVersion - 111 - IDESourceControlProjectWCCIdentifier - F6FA2C351D428A0F1026539971510A626DEEFF59 - IDESourceControlProjectWCConfigurations - - - IDESourceControlRepositoryExtensionIdentifierKey - public.vcs.git - IDESourceControlWCCIdentifierKey - F6FA2C351D428A0F1026539971510A626DEEFF59 - IDESourceControlWCCName - TikZiT - - - - diff --git a/tikzit/TikZiT.xcodeproj/project.xcworkspace/xcuserdata/aleks.xcuserdatad/UserInterfaceState.xcuserstate b/tikzit/TikZiT.xcodeproj/project.xcworkspace/xcuserdata/aleks.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index 99a5997..0000000 --- a/tikzit/TikZiT.xcodeproj/project.xcworkspace/xcuserdata/aleks.xcuserdatad/UserInterfaceState.xcuserstate +++ /dev/null @@ -1,24539 +0,0 @@ - - - - - $archiver - NSKeyedArchiver - $objects - - $null - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 2 - - - CF$UID - 3 - - - CF$UID - 4 - - - CF$UID - 5 - - - NS.objects - - - CF$UID - 6 - - - CF$UID - 194 - - - CF$UID - 441 - - - CF$UID - 533 - - - - 5D4A1A9F-B7F3-4B80-B1F2-42874F168C6C - FCF6616B-37CA-49A5-B7DD-7EC65F973E7D - E8D758DD-8E38-40E4-B712-F6B0919F77C9 - IDEWorkspaceDocument - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 7 - - - CF$UID - 8 - - - CF$UID - 9 - - - CF$UID - 10 - - - CF$UID - 11 - - - CF$UID - 12 - - - CF$UID - 13 - - - CF$UID - 14 - - - NS.objects - - - CF$UID - 15 - - - CF$UID - 192 - - - CF$UID - 193 - - - CF$UID - 25 - - - CF$UID - 2 - - - CF$UID - 7 - - - CF$UID - 25 - - - CF$UID - 25 - - - - IDEWorkspaceTabController_255C042C-F813-417B-AD8A-811609B9E1F2 - IDEWindowFrame - IDEOrderedWorkspaceTabControllers - IDEWindowInFullscreenMode - IDEWorkspaceWindowControllerUniqueIdentifier - IDEActiveWorkspaceTabController - IDEWindowToolbarIsVisible - IDEWindowTabBarIsVisible - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 16 - - - CF$UID - 17 - - - CF$UID - 18 - - - CF$UID - 19 - - - CF$UID - 20 - - - CF$UID - 21 - - - CF$UID - 22 - - - CF$UID - 23 - - - NS.objects - - - CF$UID - 24 - - - CF$UID - 25 - - - CF$UID - 26 - - - CF$UID - 27 - - - CF$UID - 40 - - - CF$UID - 78 - - - CF$UID - 25 - - - CF$UID - 87 - - - - IDETabLabel - IDEShowNavigator - AssistantEditorsLayout - IDEWorkspaceTabControllerUtilityAreaSplitView - IDENavigatorArea - IDEWorkspaceTabControllerDesignAreaSplitView - IDEShowUtilities - IDEEditorArea - Graph.m - - 0 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 29 - - - - DVTSplitViewItems - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 30 - - - CF$UID - 36 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 33 - - - CF$UID - 34 - - - - DVTIdentifier - DVTViewMagnitude - - 127 - - $classes - - NSDictionary - NSObject - - $classname - NSDictionary - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 33 - - - CF$UID - 37 - - - - 473 - - $classes - - NSMutableArray - NSArray - NSObject - - $classname - NSMutableArray - - - $classes - - NSMutableDictionary - NSDictionary - NSObject - - $classname - NSMutableDictionary - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 41 - - - CF$UID - 42 - - - NS.objects - - - CF$UID - 42 - - - CF$UID - 43 - - - - SelectedNavigator - Xcode.IDEKit.Navigator.Structure - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 44 - - - CF$UID - 45 - - - CF$UID - 46 - - - CF$UID - 47 - - - CF$UID - 48 - - - CF$UID - 49 - - - CF$UID - 50 - - - NS.objects - - - CF$UID - 51 - - - CF$UID - 25 - - - CF$UID - 52 - - - CF$UID - 25 - - - CF$UID - 25 - - - CF$UID - 54 - - - CF$UID - 61 - - - - IDEVisibleRect - IDEUnsavedDocumentFilteringEnabled - IDENavigatorExpandedItemsBeforeFilteringSet - IDERecentDocumentFilteringEnabled - IDESCMStatusFilteringEnabled - IDESelectedObjects - IDEExpandedItemsSet - {{0, 0}, {0, 0}} - - $class - - CF$UID - 53 - - NS.objects - - - - $classes - - NSSet - NSObject - - $classname - NSSet - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 55 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 56 - - - CF$UID - 57 - - - CF$UID - 58 - - - CF$UID - 59 - - - - TikZiT - TikZiT - Graph - Graph.m - - $classes - - NSArray - NSObject - - $classname - NSArray - - - $class - - CF$UID - 53 - - NS.objects - - - CF$UID - 62 - - - CF$UID - 63 - - - CF$UID - 65 - - - CF$UID - 66 - - - CF$UID - 68 - - - CF$UID - 72 - - - CF$UID - 73 - - - CF$UID - 75 - - - CF$UID - 76 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 56 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 56 - - - CF$UID - 64 - - - - Resources - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 56 - - - CF$UID - 57 - - - CF$UID - 58 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 56 - - - CF$UID - 57 - - - CF$UID - 67 - - - - Parser - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 56 - - - CF$UID - 69 - - - CF$UID - 70 - - - CF$UID - 71 - - - - Frameworks - Linked Frameworks - SFBInspectors.framework - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 56 - - - CF$UID - 69 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 56 - - - CF$UID - 64 - - - CF$UID - 74 - - - - shapes - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 56 - - - CF$UID - 69 - - - CF$UID - 70 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 56 - - - CF$UID - 77 - - - - Other Sources - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 79 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 80 - - - CF$UID - 82 - - - CF$UID - 84 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 20 - - - CF$UID - 81 - - - - 225 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 23 - - - CF$UID - 83 - - - - 815 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 85 - - - CF$UID - 86 - - - - IDEUtilitiesArea - 260 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 88 - - - CF$UID - 89 - - - CF$UID - 90 - - - CF$UID - 91 - - - CF$UID - 92 - - - CF$UID - 93 - - - CF$UID - 94 - - - CF$UID - 95 - - - NS.objects - - - CF$UID - 96 - - - CF$UID - 116 - - - CF$UID - 156 - - - CF$UID - 182 - - - CF$UID - 26 - - - CF$UID - 183 - - - CF$UID - 191 - - - CF$UID - 25 - - - - layoutTree - IDEEditorMode_Standard - IDEEDitorArea_DebugArea - IDEShowEditor - EditorMode - DebuggerSplitView - DefaultPersistentRepresentations - ShowDebuggerArea - - $class - - CF$UID - 115 - - geniusEditorContextNode - - CF$UID - 0 - - primaryEditorContextNode - - CF$UID - 97 - - rootLayoutTreeNode - - CF$UID - 112 - - - - $class - - CF$UID - 114 - - children - - CF$UID - 0 - - contentType - 1 - documentArchivableRepresentation - - CF$UID - 98 - - orientation - 0 - parent - - CF$UID - 112 - - - - $class - - CF$UID - 111 - - DocumentLocation - - CF$UID - 107 - - DomainIdentifier - - CF$UID - 99 - - IdentifierPath - - CF$UID - 100 - - IndexOfDocumentIdentifier - - CF$UID - 26 - - - Xcode.IDENavigableItemDomain.WorkspaceStructure - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 101 - - - CF$UID - 103 - - - CF$UID - 104 - - - CF$UID - 105 - - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 59 - - - - $classes - - IDEArchivableStringIndexPair - NSObject - - $classname - IDEArchivableStringIndexPair - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 58 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 57 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 106 - - - TikZiT - - $class - - CF$UID - 110 - - documentURL - - CF$UID - 108 - - timestamp - - CF$UID - 0 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/Graph.m - - - $classes - - NSMutableString - NSString - NSObject - - $classname - NSMutableString - - - $classes - - DVTDocumentLocation - NSObject - - $classname - DVTDocumentLocation - - - $classes - - IDENavigableItemArchivableRepresentation - NSObject - - $classname - IDENavigableItemArchivableRepresentation - - - $class - - CF$UID - 114 - - children - - CF$UID - 113 - - contentType - 0 - documentArchivableRepresentation - - CF$UID - 0 - - orientation - 0 - parent - - CF$UID - 0 - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 97 - - - - - $classes - - IDEWorkspaceTabControllerLayoutTreeNode - NSObject - - $classname - IDEWorkspaceTabControllerLayoutTreeNode - - - $classes - - IDEWorkspaceTabControllerLayoutTree - NSObject - - $classname - IDEWorkspaceTabControllerLayoutTree - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 117 - - - NS.objects - - - CF$UID - 118 - - - - EditorLayout_PersistentRepresentation - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 119 - - - NS.objects - - - CF$UID - 120 - - - - Main - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 121 - - - CF$UID - 122 - - - CF$UID - 123 - - - NS.objects - - - CF$UID - 124 - - - CF$UID - 26 - - - CF$UID - 154 - - - - EditorLayout_StateSavingStateDictionaries - EditorLayout_Selected - EditorLayout_Geometry - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 125 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 126 - - - CF$UID - 127 - - - CF$UID - 128 - - - CF$UID - 129 - - - CF$UID - 130 - - - CF$UID - 131 - - - CF$UID - 132 - - - NS.objects - - - CF$UID - 133 - - - CF$UID - 134 - - - CF$UID - 141 - - - CF$UID - 149 - - - CF$UID - 59 - - - CF$UID - 150 - - - CF$UID - 151 - - - - FileDataType - ArchivableRepresentation - EditorState - NavigableItemName - DocumentNavigableItemName - DocumentExtensionIdentifier - DocumentURL - public.objective-c-source - - $class - - CF$UID - 111 - - DocumentLocation - - CF$UID - 107 - - DomainIdentifier - - CF$UID - 99 - - IdentifierPath - - CF$UID - 135 - - IndexOfDocumentIdentifier - - CF$UID - 26 - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 136 - - - CF$UID - 137 - - - CF$UID - 138 - - - CF$UID - 139 - - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 59 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 58 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 57 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 140 - - - TikZiT - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 142 - - - CF$UID - 143 - - - CF$UID - 144 - - - CF$UID - 145 - - - NS.objects - - - CF$UID - 146 - - - CF$UID - 147 - - - CF$UID - 25 - - - CF$UID - 148 - - - - PrimaryDocumentTimestamp - PrimaryDocumentVisibleCharacterRange - HideAllIssues - PrimaryDocumentSelectedCharacterRange - 381083683.77450001 - {18089, 1176} - {19467, 0} - -tikz - Xcode.IDEKit.EditorDocument.SourceCode - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 152 - - - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/Graph.m - - $classes - - NSURL - NSObject - - $classname - NSURL - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 155 - - - - {{0, 0}, {600, 600}} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 157 - - - CF$UID - 158 - - - CF$UID - 159 - - - CF$UID - 160 - - - CF$UID - 161 - - - CF$UID - 162 - - - NS.objects - - - CF$UID - 163 - - - CF$UID - 164 - - - CF$UID - 166 - - - CF$UID - 163 - - - CF$UID - 168 - - - CF$UID - 176 - - - - LayoutFocusMode - console - variables - LayoutMode - IDEDebugArea_SplitView - IDEDebuggerAreaSplitView - 1 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 165 - - - NS.objects - - - CF$UID - 26 - - - - ConsoleFilterMode - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 167 - - - NS.objects - - - CF$UID - 163 - - - - VariablesViewSelectedScope - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 169 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 170 - - - CF$UID - 173 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 171 - - - CF$UID - 172 - - - - VariablesView - 301 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 174 - - - CF$UID - 175 - - - - ConsoleArea - 298 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 177 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 178 - - - CF$UID - 180 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 171 - - - CF$UID - 179 - - - - 301 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 174 - - - CF$UID - 181 - - - - 298 - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 184 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 185 - - - CF$UID - 188 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 186 - - - CF$UID - 187 - - - - IDEEditor - 203 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 189 - - - CF$UID - 190 - - - - IDEDebuggerArea - 115 - - $class - - CF$UID - 39 - - NS.keys - - NS.objects - - - {{264, 446}, {600, 624}} - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 7 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 8 - - - CF$UID - 9 - - - CF$UID - 195 - - - CF$UID - 10 - - - CF$UID - 196 - - - CF$UID - 12 - - - CF$UID - 13 - - - CF$UID - 14 - - - NS.objects - - - CF$UID - 197 - - - CF$UID - 198 - - - CF$UID - 199 - - - CF$UID - 25 - - - CF$UID - 3 - - - CF$UID - 195 - - - CF$UID - 182 - - - CF$UID - 25 - - - - IDEWorkspaceTabController_9038AF6D-AD9C-4682-ADF8-6CB1A302CFE7 - IDEWorkspaceWindowControllerUniqueIdentifier - {{447, 347}, {1300, 786}} - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 195 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 18 - - - CF$UID - 17 - - - CF$UID - 16 - - - CF$UID - 19 - - - CF$UID - 20 - - - CF$UID - 21 - - - CF$UID - 22 - - - CF$UID - 23 - - - NS.objects - - - CF$UID - 26 - - - CF$UID - 182 - - - CF$UID - 200 - - - CF$UID - 201 - - - CF$UID - 207 - - - CF$UID - 281 - - - CF$UID - 182 - - - CF$UID - 289 - - - - Graph.m - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 202 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 203 - - - CF$UID - 205 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 33 - - - CF$UID - 204 - - - - 403 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 33 - - - CF$UID - 206 - - - - 307 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 208 - - - CF$UID - 41 - - - CF$UID - 209 - - - CF$UID - 210 - - - CF$UID - 211 - - - CF$UID - 42 - - - CF$UID - 212 - - - NS.objects - - - CF$UID - 213 - - - CF$UID - 42 - - - CF$UID - 224 - - - CF$UID - 241 - - - CF$UID - 247 - - - CF$UID - 258 - - - CF$UID - 273 - - - - Xcode.IDEKit.Navigator.Symbol - Xcode.IDEKit.Navigator.Issues - Xcode.IDEKit.Navigator.Debug - Xcode.IDEKit.Navigator.Breakpoints - Xcode.IDEKit.Navigator.Logs - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 214 - - - CF$UID - 215 - - - CF$UID - 216 - - - CF$UID - 217 - - - CF$UID - 218 - - - CF$UID - 219 - - - CF$UID - 220 - - - NS.objects - - - CF$UID - 182 - - - CF$UID - 182 - - - CF$UID - 25 - - - CF$UID - 182 - - - CF$UID - 221 - - - CF$UID - 222 - - - CF$UID - 223 - - - - IDESymbolNavigatorShowWorkspaceOnly - IDESymbolNavigatorShowHierarchy - IDESymbolNavigatorShowContainersOnly - IDESymbolNavigatorShowClassesOnly - IDESymbolNamePatternString - IDESymbolNavigatorSelectedSymbols - IDEExpandedItems - - - $class - - CF$UID - 38 - - NS.objects - - - - $class - - CF$UID - 38 - - NS.objects - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 225 - - - CF$UID - 226 - - - CF$UID - 227 - - - CF$UID - 228 - - - CF$UID - 229 - - - CF$UID - 230 - - - CF$UID - 231 - - - CF$UID - 232 - - - CF$UID - 233 - - - NS.objects - - - CF$UID - 25 - - - CF$UID - 234 - - - CF$UID - 235 - - - CF$UID - 237 - - - CF$UID - 238 - - - CF$UID - 25 - - - CF$UID - 239 - - - CF$UID - 25 - - - CF$UID - 240 - - - - IDEErrorFilteringEnabled - IDEVisibleRect - IDECollapsedFiles - IDEExpandedIssues - IDESelectedNavigables - IDEShowsByType - IDECollapsedTypes - IDERecentFilteringEnabled - IDECollapsedGroups - {{0, 0}, {209, 644}} - - $class - - CF$UID - 236 - - NS.objects - - - - $classes - - NSMutableSet - NSSet - NSObject - - $classname - NSMutableSet - - - $class - - CF$UID - 236 - - NS.objects - - - - $class - - CF$UID - 38 - - NS.objects - - - - $class - - CF$UID - 236 - - NS.objects - - - - $class - - CF$UID - 236 - - NS.objects - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 242 - - - CF$UID - 243 - - - CF$UID - 244 - - - NS.objects - - - CF$UID - 245 - - - CF$UID - 246 - - - CF$UID - 25 - - - - IDEStackCompressionValue - IDEThreadOrQueueMode - IDEShowOnlyInterestingContent - 2 - 0 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 248 - - - CF$UID - 249 - - - CF$UID - 250 - - - CF$UID - 251 - - - NS.objects - - - CF$UID - 52 - - - CF$UID - 25 - - - CF$UID - 252 - - - CF$UID - 257 - - - - IDECollapsedtemsSet - IDEBreakpointNavigatorFilterOnEnabled - IDESelectedObjects - IDEVisibleRect - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 253 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 254 - - - CF$UID - 255 - - - CF$UID - 256 - - - - TikZiT - SelectableNodeView.m - -setNodeStyle: - {{0, 0}, {224, 686}} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 44 - - - CF$UID - 45 - - - CF$UID - 46 - - - CF$UID - 47 - - - CF$UID - 48 - - - CF$UID - 49 - - - CF$UID - 50 - - - NS.objects - - - CF$UID - 259 - - - CF$UID - 25 - - - CF$UID - 52 - - - CF$UID - 25 - - - CF$UID - 25 - - - CF$UID - 260 - - - CF$UID - 263 - - - - {{0, 0}, {209, 666}} - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 261 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 262 - - - CF$UID - 57 - - - CF$UID - 58 - - - CF$UID - 59 - - - - TikZiT - - $class - - CF$UID - 53 - - NS.objects - - - CF$UID - 264 - - - CF$UID - 265 - - - CF$UID - 266 - - - CF$UID - 267 - - - CF$UID - 268 - - - CF$UID - 269 - - - CF$UID - 270 - - - CF$UID - 271 - - - CF$UID - 272 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 262 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 262 - - - CF$UID - 64 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 262 - - - CF$UID - 57 - - - CF$UID - 67 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 262 - - - CF$UID - 69 - - - CF$UID - 70 - - - CF$UID - 71 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 262 - - - CF$UID - 64 - - - CF$UID - 74 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 262 - - - CF$UID - 69 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 262 - - - CF$UID - 77 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 262 - - - CF$UID - 57 - - - CF$UID - 58 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 262 - - - CF$UID - 69 - - - CF$UID - 70 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 274 - - - CF$UID - 275 - - - CF$UID - 276 - - - CF$UID - 277 - - - NS.objects - - - CF$UID - 278 - - - CF$UID - 279 - - - CF$UID - 25 - - - CF$UID - 280 - - - - IDELogNavigatorExpandedItemsStateKey - IDELogNavigatorSelectedObjectsStateKey - IDELogNavigatorRecentFilterStateKey - IDELogNavigatorVisibleRectStateKey - - $class - - CF$UID - 38 - - NS.objects - - - - $class - - CF$UID - 38 - - NS.objects - - - {{0, 0}, {464, 738}} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 282 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 283 - - - CF$UID - 285 - - - CF$UID - 287 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 20 - - - CF$UID - 284 - - - - 225 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 23 - - - CF$UID - 286 - - - - 815 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 85 - - - CF$UID - 288 - - - - 260 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 95 - - - CF$UID - 89 - - - CF$UID - 90 - - - CF$UID - 91 - - - CF$UID - 92 - - - CF$UID - 290 - - - CF$UID - 93 - - - CF$UID - 94 - - - CF$UID - 291 - - - CF$UID - 88 - - - NS.objects - - - CF$UID - 182 - - - CF$UID - 292 - - - CF$UID - 314 - - - CF$UID - 182 - - - CF$UID - 26 - - - CF$UID - 329 - - - CF$UID - 368 - - - CF$UID - 374 - - - CF$UID - 375 - - - CF$UID - 430 - - - - IDEEditorMode_Version - IDEEditorMode_Genius - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 117 - - - NS.objects - - - CF$UID - 293 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 119 - - - NS.objects - - - CF$UID - 294 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 121 - - - CF$UID - 122 - - - CF$UID - 123 - - - NS.objects - - - CF$UID - 295 - - - CF$UID - 26 - - - CF$UID - 312 - - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 296 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 126 - - - CF$UID - 127 - - - CF$UID - 128 - - - CF$UID - 129 - - - CF$UID - 130 - - - CF$UID - 131 - - - CF$UID - 132 - - - NS.objects - - - CF$UID - 133 - - - CF$UID - 297 - - - CF$UID - 306 - - - CF$UID - 149 - - - CF$UID - 59 - - - CF$UID - 150 - - - CF$UID - 310 - - - - - $class - - CF$UID - 111 - - DocumentLocation - - CF$UID - 305 - - DomainIdentifier - - CF$UID - 298 - - IdentifierPath - - CF$UID - 299 - - IndexOfDocumentIdentifier - - CF$UID - 26 - - - Xcode.IDENavigableItemDomain.WorkspaceStructure - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 300 - - - CF$UID - 301 - - - CF$UID - 302 - - - CF$UID - 303 - - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 59 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 58 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 57 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 304 - - - TikZiT - - $class - - CF$UID - 110 - - documentURL - - CF$UID - 108 - - timestamp - - CF$UID - 0 - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 142 - - - CF$UID - 143 - - - CF$UID - 144 - - - CF$UID - 145 - - - NS.objects - - - CF$UID - 307 - - - CF$UID - 308 - - - CF$UID - 25 - - - CF$UID - 309 - - - - 381083686.29558802 - {18344, 1251} - {19467, 0} - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 311 - - - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/Graph.m - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 313 - - - - {{0, 0}, {815, 588}} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 157 - - - CF$UID - 158 - - - CF$UID - 161 - - - CF$UID - 160 - - - CF$UID - 162 - - - CF$UID - 159 - - - NS.objects - - - CF$UID - 163 - - - CF$UID - 315 - - - CF$UID - 316 - - - CF$UID - 163 - - - CF$UID - 322 - - - CF$UID - 328 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 165 - - - NS.objects - - - CF$UID - 26 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 317 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 318 - - - CF$UID - 320 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 171 - - - CF$UID - 319 - - - - 389 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 174 - - - CF$UID - 321 - - - - 425 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 323 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 324 - - - CF$UID - 326 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 171 - - - CF$UID - 325 - - - - 389 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 174 - - - CF$UID - 327 - - - - 425 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 167 - - - NS.objects - - - CF$UID - 26 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 330 - - - CF$UID - 331 - - - NS.objects - - - CF$UID - 246 - - - CF$UID - 332 - - - - VersionsEditorSubmode - EditorLayout_PersistentRepresentation - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 333 - - - NS.objects - - - CF$UID - 334 - - - - Main - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 335 - - - CF$UID - 336 - - - CF$UID - 337 - - - NS.objects - - - CF$UID - 338 - - - CF$UID - 246 - - - CF$UID - 366 - - - - EditorLayout_StateSavingStateDictionaries - EditorLayout_Selected - EditorLayout_Geometry - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 339 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 340 - - - CF$UID - 341 - - - CF$UID - 342 - - - CF$UID - 343 - - - CF$UID - 344 - - - CF$UID - 345 - - - CF$UID - 346 - - - NS.objects - - - CF$UID - 347 - - - CF$UID - 348 - - - CF$UID - 356 - - - CF$UID - 351 - - - CF$UID - 351 - - - CF$UID - 363 - - - CF$UID - 364 - - - - FileDataType - ArchivableRepresentation - EditorState - NavigableItemName - DocumentNavigableItemName - DocumentExtensionIdentifier - DocumentURL - com.apple.xml-property-list - - $class - - CF$UID - 111 - - DocumentLocation - - CF$UID - 354 - - DomainIdentifier - - CF$UID - 298 - - IdentifierPath - - CF$UID - 349 - - IndexOfDocumentIdentifier - - CF$UID - 26 - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 350 - - - CF$UID - 352 - - - CF$UID - 353 - - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 351 - - - TikZiT-Info.plist - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 64 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 254 - - - - $class - - CF$UID - 110 - - documentURL - - CF$UID - 355 - - timestamp - - CF$UID - 0 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/TikZiT-Info.plist - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 357 - - - CF$UID - 358 - - - CF$UID - 359 - - - NS.objects - - - CF$UID - 360 - - - CF$UID - 361 - - - CF$UID - 362 - - - - PrimaryDocumentSelectedCharacterRange - PrimaryDocumentVisibleCharacterRange - PrimaryDocumentTimestamp - {0, 0} - {0, 1053} - 348502952.18491101 - Xcode.IDEKit.EditorDocument.SourceCode-from-Plist - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 365 - - - file://localhost/Users/aleks/svn/tikzit/tikzit/TikZiT-Info.plist - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 367 - - - - {{0, 0}, {815, 602}} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 369 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 370 - - - CF$UID - 372 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 186 - - - CF$UID - 371 - - - - 610 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 189 - - - CF$UID - 373 - - - - 100 - - $class - - CF$UID - 39 - - NS.keys - - NS.objects - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 376 - - - CF$UID - 331 - - - NS.objects - - - CF$UID - 377 - - - CF$UID - 378 - - - - SplitPosition - 0.4993864893913269 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 379 - - - CF$UID - 333 - - - NS.objects - - - CF$UID - 380 - - - CF$UID - 409 - - - - Alternate - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 335 - - - CF$UID - 336 - - - CF$UID - 337 - - - NS.objects - - - CF$UID - 381 - - - CF$UID - 246 - - - CF$UID - 407 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 382 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 340 - - - CF$UID - 341 - - - CF$UID - 342 - - - CF$UID - 343 - - - CF$UID - 344 - - - CF$UID - 345 - - - CF$UID - 346 - - - NS.objects - - - CF$UID - 383 - - - CF$UID - 384 - - - CF$UID - 399 - - - CF$UID - 387 - - - CF$UID - 387 - - - CF$UID - 404 - - - CF$UID - 405 - - - - public.c-header - - $class - - CF$UID - 111 - - DocumentLocation - - CF$UID - 397 - - DomainIdentifier - - CF$UID - 0 - - IdentifierPath - - CF$UID - 385 - - IndexOfDocumentIdentifier - - CF$UID - 26 - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 386 - - - CF$UID - 388 - - - CF$UID - 390 - - - CF$UID - 391 - - - CF$UID - 394 - - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 387 - - - Graph.h - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 389 - - - Graph - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 254 - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 392 - - - CF$UID - 393 - - - NS.objects - - - CF$UID - 298 - - - CF$UID - 254 - - - - manualDomainIdentifier - navigableItem_name - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 395 - - - NS.objects - - - CF$UID - 396 - - - - identifier - Xcode.IDEKit.GeniusCategory.Manual - - $class - - CF$UID - 110 - - documentURL - - CF$UID - 398 - - timestamp - - CF$UID - 0 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/Graph.h - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 401 - - - CF$UID - 402 - - - CF$UID - 25 - - - CF$UID - 403 - - - - HideAllIssues - 348502936.56562501 - {1735, 943} - {998, 0} - Xcode.IDEKit.EditorDocument.SourceCode - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 406 - - - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/Graph.h - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 408 - - - - {{0, 0}, {407, 602}} - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 335 - - - CF$UID - 336 - - - CF$UID - 337 - - - NS.objects - - - CF$UID - 410 - - - CF$UID - 246 - - - CF$UID - 429 - - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 411 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 340 - - - CF$UID - 341 - - - CF$UID - 342 - - - CF$UID - 343 - - - CF$UID - 344 - - - CF$UID - 345 - - - CF$UID - 346 - - - NS.objects - - - CF$UID - 347 - - - CF$UID - 412 - - - CF$UID - 419 - - - CF$UID - 351 - - - CF$UID - 351 - - - CF$UID - 427 - - - CF$UID - 428 - - - - - $class - - CF$UID - 111 - - DocumentLocation - - CF$UID - 417 - - DomainIdentifier - - CF$UID - 298 - - IdentifierPath - - CF$UID - 413 - - IndexOfDocumentIdentifier - - CF$UID - 26 - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 414 - - - CF$UID - 415 - - - CF$UID - 416 - - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 351 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 64 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 254 - - - - $class - - CF$UID - 110 - - documentURL - - CF$UID - 418 - - timestamp - - CF$UID - 0 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/TikZiT-Info.plist - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 420 - - - CF$UID - 421 - - - CF$UID - 422 - - - NS.objects - - - CF$UID - 423 - - - CF$UID - 425 - - - CF$UID - 426 - - - - IDE_PLIST_EDITOR_SELECTION_KEY - IDE_PLIST_EDITOR_EXPANSION_KEY - IDE_PLIST_EDITOR_VISIBLERECT_KEY - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 424 - - - - CFBundleVersion - - $class - - CF$UID - 236 - - NS.objects - - - {{0, 0}, {407, 563}} - Xcode.IDEKit.EditorDocument.PlistEditor - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 365 - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 367 - - - - - $class - - CF$UID - 115 - - geniusEditorContextNode - - CF$UID - 0 - - primaryEditorContextNode - - CF$UID - 431 - - rootLayoutTreeNode - - CF$UID - 439 - - - - $class - - CF$UID - 114 - - children - - CF$UID - 0 - - contentType - 1 - documentArchivableRepresentation - - CF$UID - 432 - - orientation - 0 - parent - - CF$UID - 439 - - - - $class - - CF$UID - 111 - - DocumentLocation - - CF$UID - 305 - - DomainIdentifier - - CF$UID - 298 - - IdentifierPath - - CF$UID - 433 - - IndexOfDocumentIdentifier - - CF$UID - 26 - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 434 - - - CF$UID - 435 - - - CF$UID - 436 - - - CF$UID - 437 - - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 59 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 58 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 57 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 438 - - - TikZiT - - $class - - CF$UID - 114 - - children - - CF$UID - 440 - - contentType - 0 - documentArchivableRepresentation - - CF$UID - 0 - - orientation - 0 - parent - - CF$UID - 0 - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 431 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 8 - - - CF$UID - 9 - - - CF$UID - 442 - - - CF$UID - 10 - - - CF$UID - 11 - - - CF$UID - 12 - - - CF$UID - 13 - - - CF$UID - 14 - - - NS.objects - - - CF$UID - 443 - - - CF$UID - 444 - - - CF$UID - 445 - - - CF$UID - 25 - - - CF$UID - 4 - - - CF$UID - 442 - - - CF$UID - 25 - - - CF$UID - 25 - - - - IDEWorkspaceTabController_5BA15B20-6E8C-4183-8118-E8E43B2873EF - {{264, 446}, {600, 624}} - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 442 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 16 - - - CF$UID - 17 - - - CF$UID - 18 - - - CF$UID - 19 - - - CF$UID - 20 - - - CF$UID - 21 - - - CF$UID - 22 - - - CF$UID - 23 - - - NS.objects - - - CF$UID - 446 - - - CF$UID - 25 - - - CF$UID - 26 - - - CF$UID - 447 - - - CF$UID - 453 - - - CF$UID - 469 - - - CF$UID - 25 - - - CF$UID - 477 - - - - tikzparser.ym - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 448 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 449 - - - CF$UID - 451 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 33 - - - CF$UID - 450 - - - - 127 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 33 - - - CF$UID - 452 - - - - 473 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 41 - - - CF$UID - 42 - - - NS.objects - - - CF$UID - 42 - - - CF$UID - 454 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 44 - - - CF$UID - 45 - - - CF$UID - 46 - - - CF$UID - 47 - - - CF$UID - 48 - - - CF$UID - 49 - - - CF$UID - 50 - - - NS.objects - - - CF$UID - 455 - - - CF$UID - 25 - - - CF$UID - 52 - - - CF$UID - 25 - - - CF$UID - 25 - - - CF$UID - 456 - - - CF$UID - 460 - - - - {{0, 0}, {0, 0}} - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 457 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 458 - - - CF$UID - 57 - - - CF$UID - 67 - - - CF$UID - 459 - - - - TikZiT - tikzparser.ym - - $class - - CF$UID - 53 - - NS.objects - - - CF$UID - 461 - - - CF$UID - 462 - - - CF$UID - 463 - - - CF$UID - 464 - - - CF$UID - 465 - - - CF$UID - 466 - - - CF$UID - 467 - - - CF$UID - 468 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 458 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 458 - - - CF$UID - 64 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 458 - - - CF$UID - 57 - - - CF$UID - 67 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 458 - - - CF$UID - 77 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 458 - - - CF$UID - 69 - - - CF$UID - 70 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 458 - - - CF$UID - 69 - - - CF$UID - 70 - - - CF$UID - 71 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 458 - - - CF$UID - 69 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 458 - - - CF$UID - 64 - - - CF$UID - 74 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 470 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 471 - - - CF$UID - 473 - - - CF$UID - 475 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 20 - - - CF$UID - 472 - - - - 225 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 23 - - - CF$UID - 474 - - - - 815 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 85 - - - CF$UID - 476 - - - - 260 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 88 - - - CF$UID - 89 - - - CF$UID - 90 - - - CF$UID - 91 - - - CF$UID - 92 - - - CF$UID - 93 - - - CF$UID - 94 - - - CF$UID - 95 - - - NS.objects - - - CF$UID - 478 - - - CF$UID - 491 - - - CF$UID - 511 - - - CF$UID - 182 - - - CF$UID - 26 - - - CF$UID - 526 - - - CF$UID - 532 - - - CF$UID - 25 - - - - - $class - - CF$UID - 115 - - geniusEditorContextNode - - CF$UID - 0 - - primaryEditorContextNode - - CF$UID - 479 - - rootLayoutTreeNode - - CF$UID - 489 - - - - $class - - CF$UID - 114 - - children - - CF$UID - 0 - - contentType - 1 - documentArchivableRepresentation - - CF$UID - 480 - - orientation - 0 - parent - - CF$UID - 489 - - - - $class - - CF$UID - 111 - - DocumentLocation - - CF$UID - 487 - - DomainIdentifier - - CF$UID - 99 - - IdentifierPath - - CF$UID - 481 - - IndexOfDocumentIdentifier - - CF$UID - 26 - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 482 - - - CF$UID - 483 - - - CF$UID - 484 - - - CF$UID - 485 - - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 459 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 67 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 57 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 486 - - - TikZiT - - $class - - CF$UID - 110 - - documentURL - - CF$UID - 488 - - timestamp - - CF$UID - 0 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/tikzparser.ym - - - $class - - CF$UID - 114 - - children - - CF$UID - 490 - - contentType - 0 - documentArchivableRepresentation - - CF$UID - 0 - - orientation - 0 - parent - - CF$UID - 0 - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 479 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 117 - - - NS.objects - - - CF$UID - 492 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 119 - - - NS.objects - - - CF$UID - 493 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 121 - - - CF$UID - 122 - - - CF$UID - 123 - - - NS.objects - - - CF$UID - 494 - - - CF$UID - 26 - - - CF$UID - 509 - - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 495 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 126 - - - CF$UID - 127 - - - CF$UID - 128 - - - CF$UID - 129 - - - CF$UID - 130 - - - CF$UID - 131 - - - CF$UID - 132 - - - NS.objects - - - CF$UID - 496 - - - CF$UID - 497 - - - CF$UID - 504 - - - CF$UID - 459 - - - CF$UID - 459 - - - CF$UID - 150 - - - CF$UID - 507 - - - - public.yacc-source - - $class - - CF$UID - 111 - - DocumentLocation - - CF$UID - 487 - - DomainIdentifier - - CF$UID - 99 - - IdentifierPath - - CF$UID - 498 - - IndexOfDocumentIdentifier - - CF$UID - 26 - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 499 - - - CF$UID - 500 - - - CF$UID - 501 - - - CF$UID - 502 - - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 459 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 67 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 57 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 503 - - - TikZiT - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 142 - - - CF$UID - 143 - - - CF$UID - 144 - - - CF$UID - 145 - - - NS.objects - - - CF$UID - 505 - - - CF$UID - 506 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 381079264.11013299 - {1063, 652} - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 508 - - - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/tikzparser.ym - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 510 - - - - {{0, 0}, {600, 600}} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 157 - - - CF$UID - 158 - - - CF$UID - 159 - - - CF$UID - 160 - - - CF$UID - 161 - - - CF$UID - 162 - - - NS.objects - - - CF$UID - 163 - - - CF$UID - 512 - - - CF$UID - 513 - - - CF$UID - 163 - - - CF$UID - 514 - - - CF$UID - 520 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 165 - - - NS.objects - - - CF$UID - 26 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 167 - - - NS.objects - - - CF$UID - 163 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 515 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 516 - - - CF$UID - 518 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 171 - - - CF$UID - 517 - - - - 301 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 174 - - - CF$UID - 519 - - - - 298 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 521 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 522 - - - CF$UID - 524 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 171 - - - CF$UID - 523 - - - - 301 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 174 - - - CF$UID - 525 - - - - 298 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 527 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 528 - - - CF$UID - 530 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 186 - - - CF$UID - 529 - - - - 203 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 189 - - - CF$UID - 531 - - - - 115 - - $class - - CF$UID - 39 - - NS.keys - - NS.objects - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 534 - - - CF$UID - 535 - - - CF$UID - 536 - - - CF$UID - 537 - - - CF$UID - 538 - - - CF$UID - 539 - - - CF$UID - 540 - - - CF$UID - 541 - - - CF$UID - 542 - - - CF$UID - 543 - - - CF$UID - 544 - - - NS.objects - - - CF$UID - 182 - - - CF$UID - 545 - - - CF$UID - 26 - - - CF$UID - 1624 - - - CF$UID - 1629 - - - CF$UID - 1632 - - - CF$UID - 1662 - - - CF$UID - 1663 - - - CF$UID - 1758 - - - CF$UID - 25 - - - CF$UID - 25 - - - - BreakpointsActivated - DefaultEditorStatesForURLs - DebuggingWindowBehavior - ActiveRunDestination - ActiveScheme - LastCompletedPersistentSchemeBasedActivityReport - DocumentWindows - DefaultEditorFrameSizeForURLs - RecentEditorDocumentURLs - AppFocusInMiniDebugging - MiniDebuggingConsole - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 546 - - - CF$UID - 427 - - - CF$UID - 547 - - - CF$UID - 404 - - - CF$UID - 548 - - - CF$UID - 549 - - - CF$UID - 363 - - - CF$UID - 550 - - - CF$UID - 551 - - - NS.objects - - - CF$UID - 552 - - - CF$UID - 576 - - - CF$UID - 596 - - - CF$UID - 713 - - - CF$UID - 1449 - - - CF$UID - 1466 - - - CF$UID - 1472 - - - CF$UID - 1475 - - - CF$UID - 1585 - - - - IDEQuickLookEditor.Editor - Xcode.IDEKit.CocoaIntegration.EditorDocument.Cocoa - Xcode.IDEKit.EditorDocument.SourceCodeComparisonEditor - Xcode.IDEKit.EditorDocument.SourceCode-from-NIB - Xcode.Xcode3ProjectSupport.EditorDocument.Xcode3Project - Xcode.IDEKit.EditorDocument.LogDocument - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 553 - - - CF$UID - 555 - - - CF$UID - 557 - - - NS.objects - - - CF$UID - 559 - - - CF$UID - 566 - - - CF$UID - 571 - - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 554 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/AH_latex_tail - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 556 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/AH_latex_head.png - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 558 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/ED_none.png - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 560 - - - NS.objects - - - CF$UID - 561 - - - - SelectedDocumentLocations - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 562 - - - - - $class - - CF$UID - 565 - - IDEQuickLookPageNumber - - CF$UID - 26 - - documentURL - - CF$UID - 563 - - timestamp - - CF$UID - 564 - - - file://localhost/Users/aleks/svn/tikzit/AH_latex_tail - 340372422.96159899 - - $classes - - IDEQuickLookDocumentLocation - DVTDocumentLocation - NSObject - - $classname - IDEQuickLookDocumentLocation - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 560 - - - NS.objects - - - CF$UID - 567 - - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 568 - - - - - $class - - CF$UID - 565 - - IDEQuickLookPageNumber - - CF$UID - 26 - - documentURL - - CF$UID - 569 - - timestamp - - CF$UID - 570 - - - file://localhost/Users/aleks/svn/tikzit/AH_latex_head.png - 340372923.18815899 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 560 - - - NS.objects - - - CF$UID - 572 - - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 573 - - - - - $class - - CF$UID - 565 - - IDEQuickLookPageNumber - - CF$UID - 26 - - documentURL - - CF$UID - 574 - - timestamp - - CF$UID - 575 - - - file://localhost/Users/aleks/svn/tikzit/ED_none.png - 340371928.114389 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 577 - - - CF$UID - 579 - - - CF$UID - 581 - - - NS.objects - - - CF$UID - 583 - - - CF$UID - 587 - - - CF$UID - 592 - - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 578 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/TikZiT-Info.plist - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 580 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/TikZiT-Info.plist - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 582 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/git/tikzit/tikzit/TikZiT-Info.plist - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 420 - - - CF$UID - 421 - - - CF$UID - 422 - - - NS.objects - - - CF$UID - 584 - - - CF$UID - 585 - - - CF$UID - 586 - - - - - $class - - CF$UID - 60 - - NS.objects - - - - $class - - CF$UID - 236 - - NS.objects - - - {{0, 0}, {743, 502}} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 420 - - - CF$UID - 422 - - - CF$UID - 421 - - - NS.objects - - - CF$UID - 588 - - - CF$UID - 590 - - - CF$UID - 591 - - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 589 - - - - CFBundleIconFile - {{0, 0}, {815, 552}} - - $class - - CF$UID - 236 - - NS.objects - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 420 - - - CF$UID - 421 - - - CF$UID - 422 - - - NS.objects - - - CF$UID - 593 - - - CF$UID - 594 - - - CF$UID - 595 - - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 589 - - - - - $class - - CF$UID - 236 - - NS.objects - - - {{0, 0}, {815, 550}} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 597 - - - CF$UID - 599 - - - CF$UID - 601 - - - CF$UID - 603 - - - CF$UID - 605 - - - CF$UID - 607 - - - CF$UID - 609 - - - CF$UID - 611 - - - CF$UID - 613 - - - CF$UID - 615 - - - NS.objects - - - CF$UID - 617 - - - CF$UID - 638 - - - CF$UID - 650 - - - CF$UID - 657 - - - CF$UID - 668 - - - CF$UID - 677 - - - CF$UID - 685 - - - CF$UID - 693 - - - CF$UID - 699 - - - CF$UID - 705 - - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 598 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/English.lproj/PropertyInspector.xib - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 600 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/English.lproj/StylePalette.xib - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 602 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/English.lproj/PropertyInspector.xib - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 604 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/English.lproj/StylePalette.xib - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 606 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/English.lproj/TikzDocument.xib - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 608 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/English.lproj/Preview.xib - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 610 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/English.lproj/MainMenu.xib - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 612 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/English.lproj/Preamble.xib - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 614 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/English.lproj/MainMenu.xib - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 616 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/English.lproj/Preamble.xib - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 618 - - - CF$UID - 619 - - - CF$UID - 620 - - - CF$UID - 621 - - - NS.objects - - - CF$UID - 622 - - - CF$UID - 584 - - - CF$UID - 621 - - - CF$UID - 625 - - - - IBDockViewController - SelectedObjectIDs - SelectionProvider - IBCanvasViewController - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 623 - - - NS.objects - - - CF$UID - 624 - - - - LastKnownOutlineViewWidth - 224 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 626 - - - CF$UID - 627 - - - NS.objects - - - CF$UID - 628 - - - CF$UID - 637 - - - - ObjectIDToLastKnownCanvasPositionMap - EditedTopLevelObjectIDs - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 629 - - - CF$UID - 630 - - - CF$UID - 631 - - - CF$UID - 632 - - - NS.objects - - - CF$UID - 633 - - - CF$UID - 634 - - - CF$UID - 635 - - - CF$UID - 636 - - - - 301 - 185 - 461 - 361 - {46, 13} - {46, 189} - {318, 118} - {46, 385} - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 629 - - - CF$UID - 632 - - - CF$UID - 630 - - - CF$UID - 631 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 618 - - - CF$UID - 619 - - - CF$UID - 620 - - - CF$UID - 621 - - - NS.objects - - - CF$UID - 639 - - - CF$UID - 641 - - - CF$UID - 643 - - - CF$UID - 644 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 623 - - - NS.objects - - - CF$UID - 640 - - - - 224 - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 642 - - - - -2 - IBStructureViewController - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 626 - - - CF$UID - 627 - - - NS.objects - - - CF$UID - 645 - - - CF$UID - 646 - - - - - $class - - CF$UID - 39 - - NS.keys - - NS.objects - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 647 - - - CF$UID - 648 - - - CF$UID - 649 - - - - 3 - 649 - 181 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 618 - - - CF$UID - 619 - - - CF$UID - 620 - - - CF$UID - 621 - - - NS.objects - - - CF$UID - 651 - - - CF$UID - 653 - - - CF$UID - 621 - - - CF$UID - 654 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 623 - - - NS.objects - - - CF$UID - 652 - - - - 224 - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 631 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 626 - - - CF$UID - 627 - - - NS.objects - - - CF$UID - 655 - - - CF$UID - 656 - - - - - $class - - CF$UID - 39 - - NS.keys - - NS.objects - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 631 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 618 - - - CF$UID - 619 - - - CF$UID - 620 - - - CF$UID - 621 - - - NS.objects - - - CF$UID - 658 - - - CF$UID - 584 - - - CF$UID - 621 - - - CF$UID - 660 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 623 - - - NS.objects - - - CF$UID - 659 - - - - 224 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 626 - - - CF$UID - 627 - - - NS.objects - - - CF$UID - 661 - - - CF$UID - 667 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 647 - - - CF$UID - 649 - - - CF$UID - 662 - - - CF$UID - 648 - - - NS.objects - - - CF$UID - 663 - - - CF$UID - 664 - - - CF$UID - 665 - - - CF$UID - 666 - - - - 524 - {306, -2} - {71, 17} - {118, 105} - {71, 359} - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 648 - - - CF$UID - 647 - - - CF$UID - 649 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 618 - - - CF$UID - 619 - - - CF$UID - 620 - - - CF$UID - 621 - - - NS.objects - - - CF$UID - 669 - - - CF$UID - 671 - - - CF$UID - 643 - - - CF$UID - 673 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 623 - - - NS.objects - - - CF$UID - 670 - - - - 224 - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 672 - - - - 100024 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 626 - - - CF$UID - 627 - - - NS.objects - - - CF$UID - 674 - - - CF$UID - 675 - - - - - $class - - CF$UID - 39 - - NS.keys - - NS.objects - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 676 - - - - 5 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 618 - - - CF$UID - 619 - - - CF$UID - 620 - - - CF$UID - 621 - - - NS.objects - - - CF$UID - 678 - - - CF$UID - 680 - - - CF$UID - 621 - - - CF$UID - 682 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 623 - - - NS.objects - - - CF$UID - 679 - - - - 224 - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 681 - - - - 11 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 626 - - - CF$UID - 627 - - - NS.objects - - - CF$UID - 683 - - - CF$UID - 684 - - - - - $class - - CF$UID - 39 - - NS.keys - - NS.objects - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 163 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 618 - - - CF$UID - 619 - - - CF$UID - 620 - - - CF$UID - 621 - - - NS.objects - - - CF$UID - 686 - - - CF$UID - 584 - - - CF$UID - 621 - - - CF$UID - 688 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 623 - - - NS.objects - - - CF$UID - 687 - - - - 200 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 626 - - - CF$UID - 627 - - - NS.objects - - - CF$UID - 689 - - - CF$UID - 690 - - - - - $class - - CF$UID - 39 - - NS.keys - - NS.objects - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 691 - - - CF$UID - 692 - - - - 535 - 29 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 618 - - - CF$UID - 619 - - - CF$UID - 620 - - - CF$UID - 621 - - - NS.objects - - - CF$UID - 694 - - - CF$UID - 584 - - - CF$UID - 621 - - - CF$UID - 696 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 623 - - - NS.objects - - - CF$UID - 695 - - - - 224 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 626 - - - CF$UID - 627 - - - NS.objects - - - CF$UID - 697 - - - CF$UID - 698 - - - - - $class - - CF$UID - 39 - - NS.keys - - NS.objects - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 163 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 618 - - - CF$UID - 619 - - - CF$UID - 620 - - - CF$UID - 621 - - - NS.objects - - - CF$UID - 700 - - - CF$UID - 584 - - - CF$UID - 621 - - - CF$UID - 702 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 623 - - - NS.objects - - - CF$UID - 701 - - - - 224 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 626 - - - CF$UID - 627 - - - NS.objects - - - CF$UID - 703 - - - CF$UID - 704 - - - - - $class - - CF$UID - 39 - - NS.keys - - NS.objects - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 692 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 618 - - - CF$UID - 619 - - - CF$UID - 620 - - - CF$UID - 621 - - - NS.objects - - - CF$UID - 706 - - - CF$UID - 708 - - - CF$UID - 621 - - - CF$UID - 710 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 623 - - - NS.objects - - - CF$UID - 707 - - - - 200 - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 709 - - - - 27 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 626 - - - CF$UID - 627 - - - NS.objects - - - CF$UID - 711 - - - CF$UID - 712 - - - - - $class - - CF$UID - 39 - - NS.keys - - NS.objects - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 163 - - - CF$UID - 647 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 714 - - - CF$UID - 716 - - - CF$UID - 718 - - - CF$UID - 720 - - - CF$UID - 722 - - - CF$UID - 724 - - - CF$UID - 726 - - - CF$UID - 728 - - - CF$UID - 730 - - - CF$UID - 732 - - - CF$UID - 734 - - - CF$UID - 736 - - - CF$UID - 738 - - - CF$UID - 740 - - - CF$UID - 742 - - - CF$UID - 744 - - - CF$UID - 746 - - - CF$UID - 748 - - - CF$UID - 750 - - - CF$UID - 752 - - - CF$UID - 754 - - - CF$UID - 756 - - - CF$UID - 758 - - - CF$UID - 760 - - - CF$UID - 762 - - - CF$UID - 764 - - - CF$UID - 766 - - - CF$UID - 768 - - - CF$UID - 770 - - - CF$UID - 772 - - - CF$UID - 774 - - - CF$UID - 776 - - - CF$UID - 778 - - - CF$UID - 780 - - - CF$UID - 782 - - - CF$UID - 784 - - - CF$UID - 785 - - - CF$UID - 787 - - - CF$UID - 789 - - - CF$UID - 791 - - - CF$UID - 793 - - - CF$UID - 795 - - - CF$UID - 797 - - - CF$UID - 799 - - - CF$UID - 801 - - - CF$UID - 803 - - - CF$UID - 805 - - - CF$UID - 807 - - - CF$UID - 809 - - - CF$UID - 811 - - - CF$UID - 813 - - - CF$UID - 815 - - - CF$UID - 817 - - - CF$UID - 819 - - - CF$UID - 821 - - - CF$UID - 823 - - - CF$UID - 825 - - - CF$UID - 827 - - - CF$UID - 829 - - - CF$UID - 831 - - - CF$UID - 833 - - - CF$UID - 835 - - - CF$UID - 837 - - - CF$UID - 839 - - - CF$UID - 841 - - - CF$UID - 843 - - - CF$UID - 845 - - - CF$UID - 847 - - - CF$UID - 849 - - - CF$UID - 851 - - - CF$UID - 853 - - - CF$UID - 855 - - - CF$UID - 857 - - - CF$UID - 859 - - - CF$UID - 861 - - - CF$UID - 863 - - - CF$UID - 865 - - - CF$UID - 867 - - - CF$UID - 869 - - - CF$UID - 871 - - - CF$UID - 873 - - - CF$UID - 875 - - - CF$UID - 877 - - - CF$UID - 879 - - - CF$UID - 881 - - - CF$UID - 883 - - - CF$UID - 885 - - - CF$UID - 887 - - - CF$UID - 889 - - - CF$UID - 891 - - - CF$UID - 893 - - - CF$UID - 895 - - - CF$UID - 897 - - - CF$UID - 899 - - - CF$UID - 901 - - - CF$UID - 903 - - - CF$UID - 905 - - - CF$UID - 907 - - - CF$UID - 908 - - - CF$UID - 910 - - - CF$UID - 912 - - - CF$UID - 914 - - - CF$UID - 916 - - - CF$UID - 918 - - - CF$UID - 920 - - - CF$UID - 922 - - - CF$UID - 924 - - - CF$UID - 926 - - - CF$UID - 928 - - - CF$UID - 930 - - - CF$UID - 932 - - - CF$UID - 934 - - - CF$UID - 936 - - - CF$UID - 938 - - - CF$UID - 940 - - - CF$UID - 942 - - - CF$UID - 944 - - - CF$UID - 946 - - - CF$UID - 948 - - - CF$UID - 950 - - - CF$UID - 952 - - - CF$UID - 954 - - - CF$UID - 956 - - - CF$UID - 958 - - - CF$UID - 960 - - - CF$UID - 962 - - - CF$UID - 964 - - - CF$UID - 966 - - - NS.objects - - - CF$UID - 968 - - - CF$UID - 972 - - - CF$UID - 976 - - - CF$UID - 980 - - - CF$UID - 984 - - - CF$UID - 988 - - - CF$UID - 992 - - - CF$UID - 996 - - - CF$UID - 1000 - - - CF$UID - 1003 - - - CF$UID - 1007 - - - CF$UID - 1011 - - - CF$UID - 1015 - - - CF$UID - 1019 - - - CF$UID - 1022 - - - CF$UID - 1025 - - - CF$UID - 1029 - - - CF$UID - 1033 - - - CF$UID - 1037 - - - CF$UID - 1041 - - - CF$UID - 1045 - - - CF$UID - 1049 - - - CF$UID - 1053 - - - CF$UID - 1057 - - - CF$UID - 1061 - - - CF$UID - 1065 - - - CF$UID - 1069 - - - CF$UID - 1073 - - - CF$UID - 1077 - - - CF$UID - 1081 - - - CF$UID - 1085 - - - CF$UID - 1089 - - - CF$UID - 1093 - - - CF$UID - 1097 - - - CF$UID - 1101 - - - CF$UID - 1105 - - - CF$UID - 1109 - - - CF$UID - 1113 - - - CF$UID - 1117 - - - CF$UID - 1120 - - - CF$UID - 1124 - - - CF$UID - 1128 - - - CF$UID - 1132 - - - CF$UID - 1136 - - - CF$UID - 1140 - - - CF$UID - 1143 - - - CF$UID - 1147 - - - CF$UID - 1151 - - - CF$UID - 1155 - - - CF$UID - 1158 - - - CF$UID - 1162 - - - CF$UID - 1165 - - - CF$UID - 1168 - - - CF$UID - 1171 - - - CF$UID - 1175 - - - CF$UID - 1178 - - - CF$UID - 1181 - - - CF$UID - 1185 - - - CF$UID - 1189 - - - CF$UID - 1193 - - - CF$UID - 1197 - - - CF$UID - 1200 - - - CF$UID - 1204 - - - CF$UID - 1208 - - - CF$UID - 1212 - - - CF$UID - 1215 - - - CF$UID - 1218 - - - CF$UID - 1221 - - - CF$UID - 1225 - - - CF$UID - 1229 - - - CF$UID - 1233 - - - CF$UID - 1236 - - - CF$UID - 1239 - - - CF$UID - 1243 - - - CF$UID - 1247 - - - CF$UID - 1251 - - - CF$UID - 1254 - - - CF$UID - 1257 - - - CF$UID - 1261 - - - CF$UID - 1264 - - - CF$UID - 1268 - - - CF$UID - 1272 - - - CF$UID - 1276 - - - CF$UID - 1280 - - - CF$UID - 1284 - - - CF$UID - 1288 - - - CF$UID - 1292 - - - CF$UID - 1296 - - - CF$UID - 1300 - - - CF$UID - 1304 - - - CF$UID - 1308 - - - CF$UID - 1312 - - - CF$UID - 1316 - - - CF$UID - 1320 - - - CF$UID - 1324 - - - CF$UID - 1327 - - - CF$UID - 1330 - - - CF$UID - 1334 - - - CF$UID - 1338 - - - CF$UID - 1342 - - - CF$UID - 1346 - - - CF$UID - 1350 - - - CF$UID - 1354 - - - CF$UID - 1358 - - - CF$UID - 1362 - - - CF$UID - 1366 - - - CF$UID - 1370 - - - CF$UID - 1373 - - - CF$UID - 1376 - - - CF$UID - 1380 - - - CF$UID - 1384 - - - CF$UID - 1388 - - - CF$UID - 1392 - - - CF$UID - 1396 - - - CF$UID - 1400 - - - CF$UID - 1404 - - - CF$UID - 1408 - - - CF$UID - 1412 - - - CF$UID - 1415 - - - CF$UID - 1418 - - - CF$UID - 1421 - - - CF$UID - 1425 - - - CF$UID - 1429 - - - CF$UID - 1432 - - - CF$UID - 1436 - - - CF$UID - 1439 - - - CF$UID - 1443 - - - CF$UID - 1446 - - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 715 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/GraphicsView.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 717 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/GraphicsView.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 719 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/Grid.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 721 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/git/tikzit/tikzit/src/osx/Grid.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 723 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/SelectBoxLayer.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 725 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/TikzSourceController.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 727 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/EdgeControlLayer.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 729 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/Edge.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 731 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/Edge.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 733 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/EdgeStyle+Coder.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 735 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/TikzShape.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 737 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/BasicMapTable.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 739 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/GraphChange.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 741 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/-%5BNSWindowController%20window%5D_disassembly_0x00007fff93905981.s - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 743 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/_objc_empty_vtable_disassembly_0x00007fff760e2f60.s - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 745 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/SupportDir.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 747 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/AppDelegate.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 749 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/PickSupport.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 751 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/NodeLayer.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 753 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/PropertyInspectorController.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 755 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/TikzDocument.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 757 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/EdgeStyle.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 759 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/EdgeStyle.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 761 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/NodeStyle.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 763 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/NSString+UnicharUtilities.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 765 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/Grid.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 767 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/DiffMatchPatch.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 769 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/CALayer+DrawLabel.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 771 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/NSString+UnicharUtilities.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 773 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/GraphDiff.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 775 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/contrib/DiffMatchPatch/NSString+DiffMatchPatchUtils.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 777 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/Graph.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 779 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/EdgeStyle.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 781 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/EdgeStyle.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 783 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/Graph.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 108 - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 786 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/SelectableNodeView.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 788 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/StylePaletteController.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 790 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/PreviewController.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 792 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/Transformer.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 794 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Developer/SDKs/MacOSX10.7.sdk/System/Library/Frameworks/Foundation.framework/Versions/C/Headers/NSArray.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 796 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/DiffMatchPatchCFUtilities.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 798 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/GraphChange.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 800 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/GraphChange.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 802 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/-%5BNSObject%20performSelector:%5D_disassembly_0x00007fff8ce162e1.s - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 804 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/DiffMatchPatchCFUtilities.c - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 806 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/PreambleController.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 808 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/PreambleController.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 810 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/CGContextAddPath_disassembly_0x00007fff910e972e.s - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 812 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/contrib/DiffMatchPatch/NSString+DiffMatchPatchUtils.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 814 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/-%5BNSCustomView%20nibInstantiateWithObjectInstantiator:%5D_disassembly_0x00007fff96b86f29.s - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 816 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/COPYING.DiffMatchPatch - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 818 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/__cxa_throw_disassembly_0x00007fff933e00e9.s - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 820 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/AppDelegate.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 822 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/AppDelegate.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 824 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/SelectBoxLayer.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 826 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/PropertyHolder.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 828 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/DiffMatchPatch.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 830 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/NSString+JavaSubstring.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 832 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/Transformer.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 834 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/Node.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 836 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/EdgeStyle+Coder.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 838 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/NSMutableDictionary+DMPExtensions.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 840 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/GraphElementProperty.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 842 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/Graph+Coder.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 844 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/test/test.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 846 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/SelectableNodeView.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 848 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Developer/SDKs/MacOSX10.7.sdk/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/CoreGraphics.framework/Versions/A/Headers/CGColor.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 850 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/NilToEmptyStringTransformer.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 852 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/NodeSelectionLayer.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 854 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/auto_fatal_disassembly_0x00007fff894d9f6f.s - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 856 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/GraphElementData.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 858 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/TikzWindowController.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 860 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/NSString+UriCompatibility.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 862 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/NodeStyle.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 864 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/CABackingStoreUpdate__disassembly_0x00007fff8d778b05.s - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 866 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/test/common.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 868 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/test/main.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 870 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/main.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 872 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/scratch/SFBInspectors/SFBInspectorView.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 874 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/ToolPaletteController.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 876 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/GraphicsView.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 878 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/GraphicsView.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 880 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/git/tikzit/tikzit/src/osx/GraphicsView.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 882 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/TikZiT-Info.plist - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 884 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/TikzGraphAssembler.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 886 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/SelectableCollectionViewItem.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 888 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/SelectableCollectionViewItem.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 890 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/TikzSourceController.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 892 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/Node.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 894 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/tikzlexer.lm - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 896 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/PickSupport.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 898 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/PickSupport.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 900 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/NilToEmptyStringTransformer.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 902 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/CFRelease_disassembly_0x00007fff8cc2b07b.s - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 904 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/GraphElementData.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 906 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/NodeStyle+Coder.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 488 - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 909 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/EdgeControlLayer.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 911 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/NodeStyle+Coder.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 913 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/Edge.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 915 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/Edge.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 917 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/Edge.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 919 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/TikzDocument.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 921 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/PropertyHolder.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 923 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/TikzGraphAssembler.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 925 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/StylePaletteController.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 927 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/StylePaletteController.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 929 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/TikzGraphAssembler.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 931 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/PropertyInspectorController.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 933 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/PropertyInspectorController.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 935 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/PreviewController.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 937 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/PreviewController.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 939 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/Graph.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 941 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/Graph.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 943 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/Graph+Coder.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 945 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/util.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 947 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/-%5BNSCollectionView%20newItemForRepresentedObject:%5D_disassembly_0x00007fff8fa0a94e.s - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 949 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/Shape.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 951 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/Shape.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 953 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Developer/SDKs/MacOSX10.7.sdk/System/Library/Frameworks/CoreFoundation.framework/Versions/A/Headers/CFString.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 955 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/TikzWindowController.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 957 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/GraphDiff.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 959 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/NodeSelectionLayer.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 961 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/GraphElementProperty.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 963 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/NodeLayer.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 965 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/NodeLayer.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 967 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/ColorRGB.m - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 969 - - - CF$UID - 970 - - - CF$UID - 25 - - - CF$UID - 971 - - - - 345762860.65236199 - {2200, 1151} - {2909, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 973 - - - CF$UID - 974 - - - CF$UID - 25 - - - CF$UID - 975 - - - - 348421987.42822403 - {2200, 1157} - {3223, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 977 - - - CF$UID - 978 - - - CF$UID - 25 - - - CF$UID - 979 - - - - 345403783.61108297 - {842, 693} - {1356, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 981 - - - CF$UID - 982 - - - CF$UID - 25 - - - CF$UID - 983 - - - - 380738928.58536297 - {2001, 1508} - {2090, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 985 - - - CF$UID - 986 - - - CF$UID - 25 - - - CF$UID - 987 - - - - 345416623.559434 - {0, 379} - {276, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 989 - - - CF$UID - 990 - - - CF$UID - 25 - - - CF$UID - 991 - - - - 345403324.869367 - {881, 944} - {1433, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 993 - - - CF$UID - 994 - - - CF$UID - 25 - - - CF$UID - 995 - - - - 345571191.17329699 - {104, 1058} - {1155, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 997 - - - CF$UID - 998 - - - CF$UID - 25 - - - CF$UID - 999 - - - - 345403538.85177398 - {943, 1136} - {9769, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1001 - - - CF$UID - 1002 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 348682214.50559098 - {1692, 820} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1004 - - - CF$UID - 1005 - - - CF$UID - 25 - - - CF$UID - 1006 - - - - 340459449.14873803 - {0, 953} - {898, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1008 - - - CF$UID - 1009 - - - CF$UID - 25 - - - CF$UID - 1010 - - - - 345404849.21465802 - {1684, 1007} - {2065, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1012 - - - CF$UID - 1013 - - - CF$UID - 25 - - - CF$UID - 1014 - - - - 345994252.86864501 - {1109, 746} - {790, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1016 - - - CF$UID - 1017 - - - CF$UID - 25 - - - CF$UID - 1018 - - - - 340625465.61212498 - {6290, 1393} - {7112, 58} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1020 - - - CF$UID - 1021 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 348348273.15865397 - {0, 2528} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1023 - - - CF$UID - 1024 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 345409605.10440803 - {0, 2496} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1026 - - - CF$UID - 1027 - - - CF$UID - 25 - - - CF$UID - 1028 - - - - 348328967.72804999 - {831, 996} - {1464, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1030 - - - CF$UID - 1031 - - - CF$UID - 25 - - - CF$UID - 1032 - - - - 345487190.58582902 - {592, 1437} - {1769, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1034 - - - CF$UID - 1035 - - - CF$UID - 25 - - - CF$UID - 1036 - - - - 348348232.74814701 - {2312, 1269} - {3305, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1038 - - - CF$UID - 1039 - - - CF$UID - 25 - - - CF$UID - 1040 - - - - 345416712.81625599 - {812, 967} - {1608, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1042 - - - CF$UID - 1043 - - - CF$UID - 25 - - - CF$UID - 1044 - - - - 345404437.01901197 - {960, 1373} - {1257, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1046 - - - CF$UID - 1047 - - - CF$UID - 25 - - - CF$UID - 1048 - - - - 340624392.15628898 - {0, 1080} - {928, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1050 - - - CF$UID - 1051 - - - CF$UID - 25 - - - CF$UID - 1052 - - - - 340473820.49560201 - {1062, 1380} - {19, 768} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1054 - - - CF$UID - 1055 - - - CF$UID - 25 - - - CF$UID - 1056 - - - - 348682101.30419898 - {0, 1156} - {811, 26} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1058 - - - CF$UID - 1059 - - - CF$UID - 25 - - - CF$UID - 1060 - - - - 345763213.21294802 - {1210, 686} - {1261, 115} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1062 - - - CF$UID - 1063 - - - CF$UID - 25 - - - CF$UID - 1064 - - - - 340632134.97458899 - {30, 1204} - {902, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1066 - - - CF$UID - 1067 - - - CF$UID - 25 - - - CF$UID - 1068 - - - - 340501555.21261299 - {97, 1322} - {976, 23} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1070 - - - CF$UID - 1071 - - - CF$UID - 25 - - - CF$UID - 1072 - - - - 340631784.15413302 - {4723, 1844} - {5843, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1074 - - - CF$UID - 1075 - - - CF$UID - 25 - - - CF$UID - 1076 - - - - 340706474.47886401 - {298, 1417} - {624, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1078 - - - CF$UID - 1079 - - - CF$UID - 25 - - - CF$UID - 1080 - - - - 340631841.98603201 - {0, 968} - {841, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1082 - - - CF$UID - 1083 - - - CF$UID - 25 - - - CF$UID - 1084 - - - - 340622423.14766902 - {0, 1050} - {947, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1086 - - - CF$UID - 1087 - - - CF$UID - 25 - - - CF$UID - 1088 - - - - 340631322.39264601 - {52, 1607} - {270, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1090 - - - CF$UID - 1091 - - - CF$UID - 25 - - - CF$UID - 1092 - - - - 340925457.76799399 - {2611, 845} - {3012, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1094 - - - CF$UID - 1095 - - - CF$UID - 25 - - - CF$UID - 1096 - - - - 340410882.75886202 - {933, 1045} - {1918, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1098 - - - CF$UID - 1099 - - - CF$UID - 25 - - - CF$UID - 1100 - - - - 348682102.890167 - {0, 1214} - {964, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1102 - - - CF$UID - 1103 - - - CF$UID - 25 - - - CF$UID - 1104 - - - - 348502930.726179 - {13299, 942} - {13697, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 142 - - - CF$UID - 143 - - - CF$UID - 144 - - - CF$UID - 145 - - - NS.objects - - - CF$UID - 1106 - - - CF$UID - 1107 - - - CF$UID - 25 - - - CF$UID - 1108 - - - - 381083509.44221699 - {18344, 1253} - {19467, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1110 - - - CF$UID - 1111 - - - CF$UID - 25 - - - CF$UID - 1112 - - - - 345488697.68925297 - {0, 1055} - {907, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1114 - - - CF$UID - 1115 - - - CF$UID - 25 - - - CF$UID - 1116 - - - - 345487787.078866 - {403, 1549} - {1655, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1118 - - - CF$UID - 1119 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 348489963.85380399 - {288, 1153} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1121 - - - CF$UID - 1122 - - - CF$UID - 25 - - - CF$UID - 1123 - - - - 340978354.92465001 - {969, 1145} - {1174, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1125 - - - CF$UID - 1126 - - - CF$UID - 25 - - - CF$UID - 1127 - - - - 340709461.72300398 - {0, 1410} - {369, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1129 - - - CF$UID - 1130 - - - CF$UID - 25 - - - CF$UID - 1131 - - - - 340632182.87597102 - {300, 1742} - {1087, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1133 - - - CF$UID - 1134 - - - CF$UID - 25 - - - CF$UID - 1135 - - - - 340625462.37954402 - {2270, 728} - {1004, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1137 - - - CF$UID - 1138 - - - CF$UID - 25 - - - CF$UID - 1139 - - - - 348419924.36261398 - {3536, 958} - {353, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1141 - - - CF$UID - 1142 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 348347980.23595798 - {0, 1071} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1144 - - - CF$UID - 1145 - - - CF$UID - 25 - - - CF$UID - 1146 - - - - 340632849.17894697 - {0, 1631} - {914, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1148 - - - CF$UID - 1149 - - - CF$UID - 25 - - - CF$UID - 1150 - - - - 345404279.50111699 - {1864, 1059} - {2502, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1152 - - - CF$UID - 1153 - - - CF$UID - 25 - - - CF$UID - 1154 - - - - 348491190.94514698 - {3485, 1369} - {4064, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1156 - - - CF$UID - 1157 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 340734505.19957298 - {0, 1949} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1159 - - - CF$UID - 1160 - - - CF$UID - 25 - - - CF$UID - 1161 - - - - 340630944.19481701 - {0, 254} - {227, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1163 - - - CF$UID - 1164 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 340715007.520365 - {3185, 2419} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1166 - - - CF$UID - 1167 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 340634798.489407 - {0, 1840} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1169 - - - CF$UID - 1170 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 340645018.90256602 - {0, 1609} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1172 - - - CF$UID - 1173 - - - CF$UID - 25 - - - CF$UID - 1174 - - - - 345487388.13644803 - {912, 1366} - {1795, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1176 - - - CF$UID - 1177 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 348348274.649975 - {784, 1230} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1179 - - - CF$UID - 1180 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 345416620.55954498 - {175, 713} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1182 - - - CF$UID - 1183 - - - CF$UID - 25 - - - CF$UID - 1184 - - - - 340588857.98394001 - {0, 1072} - {24, 767} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1186 - - - CF$UID - 1187 - - - CF$UID - 25 - - - CF$UID - 1188 - - - - 340631785.03849697 - {28409, 1632} - {29398, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1190 - - - CF$UID - 1191 - - - CF$UID - 25 - - - CF$UID - 1192 - - - - 340632146.36382198 - {0, 1162} - {1153, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1194 - - - CF$UID - 1195 - - - CF$UID - 25 - - - CF$UID - 1196 - - - - 340978419.60591 - {392, 1123} - {5521, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1198 - - - CF$UID - 1199 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 345763164.73803198 - {1306, 858} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1201 - - - CF$UID - 1202 - - - CF$UID - 25 - - - CF$UID - 1203 - - - - 340459404.56984299 - {0, 1634} - {1293, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1205 - - - CF$UID - 1206 - - - CF$UID - 25 - - - CF$UID - 1207 - - - - 340632182.02007103 - {2123, 1102} - {358, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1209 - - - CF$UID - 1210 - - - CF$UID - 25 - - - CF$UID - 1211 - - - - 345407440.14106703 - {980, 563} - {1308, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1213 - - - CF$UID - 1214 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 345570963.43227798 - {0, 307} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1216 - - - CF$UID - 1217 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 348493987.74653798 - {1400, 772} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1219 - - - CF$UID - 1220 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 345762938.27138197 - {1967, 722} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1222 - - - CF$UID - 1223 - - - CF$UID - 25 - - - CF$UID - 1224 - - - - 340715018.37839699 - {732, 1720} - {1614, 68} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1226 - - - CF$UID - 1227 - - - CF$UID - 25 - - - CF$UID - 1228 - - - - 340710896.240381 - {0, 907} - {71, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1230 - - - CF$UID - 1231 - - - CF$UID - 25 - - - CF$UID - 1232 - - - - 340978941.82531101 - {1271, 874} - {1724, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1234 - - - CF$UID - 1235 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 340743258.14034998 - {332, 2129} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1237 - - - CF$UID - 1238 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 345570916.35617101 - {1868, 787} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1240 - - - CF$UID - 1241 - - - CF$UID - 25 - - - CF$UID - 1242 - - - - 340624895.44772601 - {0, 956} - {1590, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1244 - - - CF$UID - 1245 - - - CF$UID - 25 - - - CF$UID - 1246 - - - - 340632090.00535399 - {855, 1347} - {2165, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1248 - - - CF$UID - 1249 - - - CF$UID - 25 - - - CF$UID - 1250 - - - - 345763208.75864798 - {2157, 874} - {2538, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1252 - - - CF$UID - 1253 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 340734675.59256703 - {2612, 2357} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1255 - - - CF$UID - 1256 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 348493972.20554298 - {0, 948} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1258 - - - CF$UID - 1259 - - - CF$UID - 25 - - - CF$UID - 1260 - - - - 348494575.91981101 - {202, 1322} - {1013, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1262 - - - CF$UID - 1263 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 340643026.22692502 - {0, 760} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1265 - - - CF$UID - 1266 - - - CF$UID - 25 - - - CF$UID - 1267 - - - - 345993841.814812 - {4603, 1030} - {5559, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1269 - - - CF$UID - 1270 - - - CF$UID - 25 - - - CF$UID - 1271 - - - - 345403242.32928503 - {47, 1110} - {798, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1273 - - - CF$UID - 1274 - - - CF$UID - 25 - - - CF$UID - 1275 - - - - 345994942.28171802 - {0, 1189} - {176, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1277 - - - CF$UID - 1278 - - - CF$UID - 25 - - - CF$UID - 1279 - - - - 348769524.87817502 - {27280, 1795} - {28593, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1281 - - - CF$UID - 1282 - - - CF$UID - 25 - - - CF$UID - 1283 - - - - 376240707.96911001 - {2531, 1228} - {23808, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1285 - - - CF$UID - 1286 - - - CF$UID - 25 - - - CF$UID - 1287 - - - - 348605533.47624701 - {0, 1341} - {605, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1289 - - - CF$UID - 1290 - - - CF$UID - 25 - - - CF$UID - 1291 - - - - 340567695.969051 - {0, 1207} - {830, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1293 - - - CF$UID - 1294 - - - CF$UID - 25 - - - CF$UID - 1295 - - - - 345489807.49887401 - {0, 1229} - {1146, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1297 - - - CF$UID - 1298 - - - CF$UID - 25 - - - CF$UID - 1299 - - - - 345489863.78087598 - {476, 1185} - {1510, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1301 - - - CF$UID - 1302 - - - CF$UID - 25 - - - CF$UID - 1303 - - - - 345404020.64375901 - {4401, 1141} - {5428, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1305 - - - CF$UID - 1306 - - - CF$UID - 25 - - - CF$UID - 1307 - - - - 345489170.70111698 - {709, 717} - {1130, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 142 - - - CF$UID - 143 - - - CF$UID - 144 - - - CF$UID - 145 - - - NS.objects - - - CF$UID - 1309 - - - CF$UID - 1310 - - - CF$UID - 25 - - - CF$UID - 1311 - - - - 381079266.26616299 - {1088, 2047} - {2268, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1313 - - - CF$UID - 1314 - - - CF$UID - 25 - - - CF$UID - 1315 - - - - 340715684.42909598 - {3334, 813} - {3831, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1317 - - - CF$UID - 1318 - - - CF$UID - 25 - - - CF$UID - 1319 - - - - 348348259.35793602 - {592, 833} - {3224, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1321 - - - CF$UID - 1322 - - - CF$UID - 25 - - - CF$UID - 1323 - - - - 340710918.149167 - {413, 867} - {1123, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1325 - - - CF$UID - 1326 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 340979058.26628602 - {0, 2158} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1328 - - - CF$UID - 1329 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 345763100.69483101 - {1412, 1093} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1331 - - - CF$UID - 1332 - - - CF$UID - 25 - - - CF$UID - 1333 - - - - 345401288.84783798 - {0, 1034} - {948, 79} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 142 - - - CF$UID - 143 - - - CF$UID - 144 - - - CF$UID - 145 - - - NS.objects - - - CF$UID - 1335 - - - CF$UID - 1336 - - - CF$UID - 25 - - - CF$UID - 1337 - - - - 381083143.218243 - {1711, 1286} - {2266, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1339 - - - CF$UID - 1340 - - - CF$UID - 25 - - - CF$UID - 1341 - - - - 345571135.33805102 - {3644, 993} - {4607, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1343 - - - CF$UID - 1344 - - - CF$UID - 25 - - - CF$UID - 1345 - - - - 345763340.54909998 - {1782, 1377} - {1408, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1347 - - - CF$UID - 1348 - - - CF$UID - 25 - - - CF$UID - 1349 - - - - 345403635.98861599 - {9317, 1036} - {9522, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1351 - - - CF$UID - 1352 - - - CF$UID - 25 - - - CF$UID - 1353 - - - - 348682251.432365 - {5303, 1025} - {5439, 6} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 142 - - - CF$UID - 143 - - - CF$UID - 144 - - - CF$UID - 145 - - - NS.objects - - - CF$UID - 1355 - - - CF$UID - 1356 - - - CF$UID - 25 - - - CF$UID - 1357 - - - - 381083685.054461 - {1472, 1140} - {1127, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1359 - - - CF$UID - 1360 - - - CF$UID - 25 - - - CF$UID - 1361 - - - - 345403910.70446801 - {898, 1274} - {1480, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1363 - - - CF$UID - 1364 - - - CF$UID - 25 - - - CF$UID - 1365 - - - - 340408281.394584 - {0, 1070} - {818, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1367 - - - CF$UID - 1368 - - - CF$UID - 25 - - - CF$UID - 1369 - - - - 340567709.72924697 - {111, 1169} - {2498, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1371 - - - CF$UID - 1372 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 345993841.44873297 - {6640, 969} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1374 - - - CF$UID - 1375 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 348492100.48254102 - {984, 1424} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 142 - - - CF$UID - 143 - - - CF$UID - 144 - - - CF$UID - 145 - - - NS.objects - - - CF$UID - 1377 - - - CF$UID - 1378 - - - CF$UID - 25 - - - CF$UID - 1379 - - - - 381079265.50655103 - {0, 1180} - {652, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1381 - - - CF$UID - 1382 - - - CF$UID - 25 - - - CF$UID - 1383 - - - - 345996220.58187401 - {4812, 1832} - {5468, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1385 - - - CF$UID - 1386 - - - CF$UID - 25 - - - CF$UID - 1387 - - - - 348328941.80720401 - {4812, 1747} - {5015, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1389 - - - CF$UID - 1390 - - - CF$UID - 25 - - - CF$UID - 1391 - - - - 345404215.00799 - {2896, 1165} - {3929, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1393 - - - CF$UID - 1394 - - - CF$UID - 25 - - - CF$UID - 1395 - - - - 352300514.86549997 - {1565, 1736} - {2412, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1397 - - - CF$UID - 1398 - - - CF$UID - 25 - - - CF$UID - 1399 - - - - 340724015.08366603 - {2833, 942} - {6706, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1401 - - - CF$UID - 1402 - - - CF$UID - 25 - - - CF$UID - 1403 - - - - 348425521.71969801 - {5676, 932} - {6233, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1405 - - - CF$UID - 1406 - - - CF$UID - 25 - - - CF$UID - 1407 - - - - 345570983.01814902 - {0, 528} - {521, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1409 - - - CF$UID - 1410 - - - CF$UID - 25 - - - CF$UID - 1411 - - - - 340497412.20933402 - {1831, 988} - {2427, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1413 - - - CF$UID - 1414 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 345407318.56900901 - {0, 2329} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1416 - - - CF$UID - 1417 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 345406868.72379202 - {2708, 1368} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1419 - - - CF$UID - 1420 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 348682639.65947402 - {2316, 1465} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1422 - - - CF$UID - 1423 - - - CF$UID - 25 - - - CF$UID - 1424 - - - - 340629051.56177503 - {10183, 1616} - {10616, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1426 - - - CF$UID - 1427 - - - CF$UID - 25 - - - CF$UID - 1428 - - - - 345403358.18671203 - {0, 778} - {177, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1430 - - - CF$UID - 1431 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 340628546.57123297 - {644, 1063} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1433 - - - CF$UID - 1434 - - - CF$UID - 25 - - - CF$UID - 1435 - - - - 345403253.67140001 - {106, 1057} - {1029, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1437 - - - CF$UID - 1438 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 345407415.72300202 - {798, 781} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1440 - - - CF$UID - 1441 - - - CF$UID - 25 - - - CF$UID - 1442 - - - - 345488818.74460101 - {35, 1246} - {1367, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1444 - - - CF$UID - 1445 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 348682657.38014698 - {3283, 1343} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1447 - - - CF$UID - 1448 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 340411515.847987 - {0, 1981} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 948 - - - CF$UID - 787 - - - CF$UID - 924 - - - CF$UID - 1450 - - - CF$UID - 950 - - - NS.objects - - - CF$UID - 1452 - - - CF$UID - 1456 - - - CF$UID - 1458 - - - CF$UID - 1461 - - - CF$UID - 1464 - - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1451 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/TikZiT.xcodeproj/aleks.mode1v3 - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1453 - - - CF$UID - 1454 - - - CF$UID - 25 - - - CF$UID - 1455 - - - - 340366198.37379301 - {1726, 1368} - {1954, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 357 - - - CF$UID - 359 - - - CF$UID - 358 - - - NS.objects - - - CF$UID - 360 - - - CF$UID - 1457 - - - CF$UID - 360 - - - - 340393968.41070002 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 357 - - - CF$UID - 359 - - - CF$UID - 358 - - - NS.objects - - - CF$UID - 360 - - - CF$UID - 1459 - - - CF$UID - 1460 - - - - 340394097.732535 - {4237, 1279} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 357 - - - CF$UID - 358 - - - CF$UID - 359 - - - NS.objects - - - CF$UID - 360 - - - CF$UID - 1462 - - - CF$UID - 1463 - - - - {0, 1026} - 340539479.94429201 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1465 - - - CF$UID - 360 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 348502939.40997303 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1467 - - - NS.objects - - - CF$UID - 1469 - - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1468 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/StylePalette-fPGoyqLn.xib - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 357 - - - CF$UID - 358 - - - CF$UID - 359 - - - NS.objects - - - CF$UID - 360 - - - CF$UID - 1470 - - - CF$UID - 1471 - - - - {89564, 1173} - 340370036.79549003 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 881 - - - NS.objects - - - CF$UID - 1473 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 357 - - - CF$UID - 358 - - - CF$UID - 359 - - - NS.objects - - - CF$UID - 360 - - - CF$UID - 361 - - - CF$UID - 1474 - - - - 348502941.57143199 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1476 - - - CF$UID - 1478 - - - CF$UID - 1480 - - - NS.objects - - - CF$UID - 1482 - - - CF$UID - 1506 - - - CF$UID - 1551 - - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1477 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/git/tikzit/tikzit/TikZiT.xcodeproj/ - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1479 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/TikZiT.xcodeproj - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1481 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/TikZiT.xcodeproj/ - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1483 - - - CF$UID - 1484 - - - CF$UID - 1485 - - - CF$UID - 1486 - - - NS.objects - - - CF$UID - 1487 - - - CF$UID - 1496 - - - CF$UID - 1497 - - - CF$UID - 1505 - - - - Xcode3ProjectEditor.sourceList.splitview - Xcode3ProjectEditorPreviousTargetEditorClass - Xcode3ProjectEditorSelectedDocumentLocations - Xcode3ProjectEditor_Xcode3TargetEditor - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1488 - - - NS.objects - - - CF$UID - 1489 - - - - DVTSplitViewItems - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 1490 - - - CF$UID - 1494 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1491 - - - CF$UID - 1492 - - - NS.objects - - - CF$UID - 221 - - - CF$UID - 1493 - - - - DVTIdentifier - DVTViewMagnitude - 170 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1491 - - - CF$UID - 1492 - - - NS.objects - - - CF$UID - 221 - - - CF$UID - 1495 - - - - 645 - Xcode3TargetEditor - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 1498 - - - - - $class - - CF$UID - 1504 - - documentURL - - CF$UID - 1499 - - selection - - CF$UID - 1501 - - timestamp - - CF$UID - 1500 - - - file://localhost/Users/aleks/git/tikzit/tikzit/TikZiT.xcodeproj/ - 380738961.54778898 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1502 - - - CF$UID - 1503 - - - NS.objects - - - CF$UID - 1496 - - - CF$UID - 254 - - - - Editor - Target - - $classes - - Xcode3ProjectDocumentLocation - DVTDocumentLocation - NSObject - - $classname - Xcode3ProjectDocumentLocation - - - $class - - CF$UID - 39 - - NS.keys - - NS.objects - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1507 - - - CF$UID - 1483 - - - CF$UID - 1484 - - - CF$UID - 1485 - - - CF$UID - 1508 - - - NS.objects - - - CF$UID - 1509 - - - CF$UID - 1510 - - - CF$UID - 1509 - - - CF$UID - 1516 - - - CF$UID - 1550 - - - - Xcode3ProjectEditorPreviousProjectEditorClass - Xcode3ProjectEditor_Xcode3BuildSettingsEditor - Xcode3BuildSettingsEditor - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1488 - - - NS.objects - - - CF$UID - 1511 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 1512 - - - CF$UID - 1514 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1491 - - - CF$UID - 1492 - - - NS.objects - - - CF$UID - 221 - - - CF$UID - 1513 - - - - 170 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1491 - - - CF$UID - 1492 - - - NS.objects - - - CF$UID - 221 - - - CF$UID - 1515 - - - - 645 - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 1517 - - - - - $class - - CF$UID - 1504 - - documentURL - - CF$UID - 1518 - - selection - - CF$UID - 1520 - - timestamp - - CF$UID - 1519 - - - file://localhost/Users/aleks/svn/tikzit/TikZiT.xcodeproj/ - 345993840.88442099 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1521 - - - CF$UID - 1502 - - - CF$UID - 1522 - - - NS.objects - - - CF$UID - 254 - - - CF$UID - 1509 - - - CF$UID - 1523 - - - - Project - Xcode3BuildSettingsEditorLocations - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 1524 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1525 - - - CF$UID - 1526 - - - CF$UID - 1527 - - - CF$UID - 1528 - - - CF$UID - 1529 - - - CF$UID - 1530 - - - NS.objects - - - CF$UID - 1531 - - - CF$UID - 1548 - - - CF$UID - 246 - - - CF$UID - 246 - - - CF$UID - 163 - - - CF$UID - 163 - - - - Collapsed Build Property Categories - Selected Build Properties - Xcode3BuildSettingsEditorDisplayMode - Xcode3BuildPropertyValueDisplayMode - Xcode3BuildSettingsEditorMode - Xcode3BuildPropertyNameDisplayMode - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 1532 - - - CF$UID - 1533 - - - CF$UID - 1534 - - - CF$UID - 1535 - - - CF$UID - 1536 - - - CF$UID - 1537 - - - CF$UID - 1538 - - - CF$UID - 1539 - - - CF$UID - 1540 - - - CF$UID - 1541 - - - CF$UID - 1542 - - - CF$UID - 1543 - - - CF$UID - 1544 - - - CF$UID - 1545 - - - CF$UID - 1546 - - - CF$UID - 1547 - - - - - $class - - CF$UID - 109 - - NS.string - Architectures||ARCHS - - - $class - - CF$UID - 109 - - NS.string - Architectures||SDKROOT - - - $class - - CF$UID - 109 - - NS.string - Architectures||VALID_ARCHS - - - $class - - CF$UID - 109 - - NS.string - Build Locations||SYMROOT - - - $class - - CF$UID - 109 - - NS.string - Build Options||PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR - - - $class - - CF$UID - 109 - - NS.string - Deployment||INSTALL_PATH - - - $class - - CF$UID - 109 - - NS.string - Deployment||MACOSX_DEPLOYMENT_TARGET - - - $class - - CF$UID - 109 - - NS.string - Deployment||STRIP_INSTALLED_PRODUCT - - - $class - - CF$UID - 109 - - NS.string - Packaging||INFOPLIST_FILE - - - $class - - CF$UID - 109 - - NS.string - Packaging||PRODUCT_NAME - - - $class - - CF$UID - 109 - - NS.string - Search Paths||HEADER_SEARCH_PATHS - - - $class - - CF$UID - 109 - - NS.string - Search Paths||USER_HEADER_SEARCH_PATHS - - - $class - - CF$UID - 109 - - NS.string - LLVM GCC 4.2 - Code Generation||GCC_ENABLE_OBJC_GC - - - $class - - CF$UID - 109 - - NS.string - LLVM GCC 4.2 - Language||GCC_C_LANGUAGE_STANDARD - - - $class - - CF$UID - 109 - - NS.string - LLVM GCC 4.2 - Warnings||GCC_WARN_ABOUT_RETURN_TYPE - - - $class - - CF$UID - 109 - - NS.string - LLVM GCC 4.2 - Warnings||GCC_WARN_UNUSED_VARIABLE - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 1549 - - - - - $class - - CF$UID - 109 - - NS.string - LLVM GCC 4.2 - Code Generation||GCC_ENABLE_OBJC_GC - - - $class - - CF$UID - 39 - - NS.keys - - NS.objects - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1507 - - - CF$UID - 1483 - - - CF$UID - 1484 - - - CF$UID - 1485 - - - CF$UID - 1508 - - - NS.objects - - - CF$UID - 1509 - - - CF$UID - 1552 - - - CF$UID - 1509 - - - CF$UID - 1558 - - - CF$UID - 1584 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1488 - - - NS.objects - - - CF$UID - 1553 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 1554 - - - CF$UID - 1556 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1491 - - - CF$UID - 1492 - - - NS.objects - - - CF$UID - 221 - - - CF$UID - 1555 - - - - 170 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1491 - - - CF$UID - 1492 - - - NS.objects - - - CF$UID - 221 - - - CF$UID - 1557 - - - - 645 - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 1559 - - - - - $class - - CF$UID - 1504 - - documentURL - - CF$UID - 1560 - - selection - - CF$UID - 1562 - - timestamp - - CF$UID - 1561 - - - file://localhost/Users/aleks/svn/tikzit/tikzit/TikZiT.xcodeproj/ - 348348307.809012 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1521 - - - CF$UID - 1502 - - - CF$UID - 1522 - - - NS.objects - - - CF$UID - 254 - - - CF$UID - 1509 - - - CF$UID - 1563 - - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 1564 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1530 - - - CF$UID - 1526 - - - CF$UID - 1527 - - - CF$UID - 1528 - - - CF$UID - 1529 - - - CF$UID - 1525 - - - NS.objects - - - CF$UID - 163 - - - CF$UID - 1565 - - - CF$UID - 246 - - - CF$UID - 246 - - - CF$UID - 163 - - - CF$UID - 1567 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 1566 - - - - - $class - - CF$UID - 109 - - NS.string - Architectures||VALID_ARCHS - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 1568 - - - CF$UID - 1569 - - - CF$UID - 1570 - - - CF$UID - 1571 - - - CF$UID - 1572 - - - CF$UID - 1573 - - - CF$UID - 1574 - - - CF$UID - 1575 - - - CF$UID - 1576 - - - CF$UID - 1577 - - - CF$UID - 1578 - - - CF$UID - 1579 - - - CF$UID - 1580 - - - CF$UID - 1581 - - - CF$UID - 1582 - - - CF$UID - 1583 - - - - - $class - - CF$UID - 109 - - NS.string - Architectures||ARCHS - - - $class - - CF$UID - 109 - - NS.string - Architectures||SDKROOT - - - $class - - CF$UID - 109 - - NS.string - Architectures||VALID_ARCHS - - - $class - - CF$UID - 109 - - NS.string - Build Locations||SYMROOT - - - $class - - CF$UID - 109 - - NS.string - Build Options||PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR - - - $class - - CF$UID - 109 - - NS.string - Deployment||INSTALL_PATH - - - $class - - CF$UID - 109 - - NS.string - Deployment||MACOSX_DEPLOYMENT_TARGET - - - $class - - CF$UID - 109 - - NS.string - Deployment||STRIP_INSTALLED_PRODUCT - - - $class - - CF$UID - 109 - - NS.string - Packaging||INFOPLIST_FILE - - - $class - - CF$UID - 109 - - NS.string - Packaging||PRODUCT_NAME - - - $class - - CF$UID - 109 - - NS.string - Search Paths||HEADER_SEARCH_PATHS - - - $class - - CF$UID - 109 - - NS.string - Search Paths||USER_HEADER_SEARCH_PATHS - - - $class - - CF$UID - 109 - - NS.string - LLVM GCC 4.2 - Code Generation||GCC_ENABLE_OBJC_GC - - - $class - - CF$UID - 109 - - NS.string - LLVM GCC 4.2 - Language||GCC_C_LANGUAGE_STANDARD - - - $class - - CF$UID - 109 - - NS.string - LLVM GCC 4.2 - Warnings||GCC_WARN_ABOUT_RETURN_TYPE - - - $class - - CF$UID - 109 - - NS.string - LLVM GCC 4.2 - Warnings||GCC_WARN_UNUSED_VARIABLE - - - $class - - CF$UID - 39 - - NS.keys - - NS.objects - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1586 - - - CF$UID - 1588 - - - CF$UID - 1590 - - - CF$UID - 1592 - - - CF$UID - 1594 - - - NS.objects - - - CF$UID - 1596 - - - CF$UID - 1604 - - - CF$UID - 1609 - - - CF$UID - 1614 - - - CF$UID - 1619 - - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1587 - - - x-xcode-log://93BF0A7E-9B8F-4127-9E53-6FD4359563C8 - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1589 - - - x-xcode-log://E16FA7B2-DE55-4431-89C7-43D8A6C6BE2B - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1591 - - - x-xcode-log://541A0579-23A7-4735-AC53-0CA54C1CC926 - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1593 - - - x-xcode-log://4E6ECE08-C292-42A5-9EB8-F1D770002C74 - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1595 - - - x-xcode-log://56055AA1-9319-4181-AD73-7A2BA288B024 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 560 - - - NS.objects - - - CF$UID - 1597 - - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 1598 - - - - - $class - - CF$UID - 1603 - - documentURL - - CF$UID - 1587 - - expandTranscript - - indexPath - - CF$UID - 1599 - - timestamp - - CF$UID - 0 - - - - $class - - CF$UID - 1602 - - NSIndexPathData - - CF$UID - 1600 - - NSIndexPathLength - 2 - - - $class - - CF$UID - 1601 - - NS.data - - AEc= - - - - $classes - - NSMutableData - NSData - NSObject - - $classname - NSMutableData - - - $classes - - NSIndexPath - NSObject - - $classname - NSIndexPath - - - $classes - - IDELogDocumentLocation - DVTDocumentLocation - NSObject - - $classname - IDELogDocumentLocation - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 560 - - - NS.objects - - - CF$UID - 1605 - - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 1606 - - - - - $class - - CF$UID - 1603 - - documentURL - - CF$UID - 1589 - - expandTranscript - - indexPath - - CF$UID - 1607 - - timestamp - - CF$UID - 0 - - - - $class - - CF$UID - 1602 - - NSIndexPathData - - CF$UID - 1608 - - NSIndexPathLength - 2 - - - $class - - CF$UID - 1601 - - NS.data - - AEc= - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 560 - - - NS.objects - - - CF$UID - 1610 - - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 1611 - - - - - $class - - CF$UID - 1603 - - documentURL - - CF$UID - 1591 - - expandTranscript - - indexPath - - CF$UID - 1612 - - timestamp - - CF$UID - 0 - - - - $class - - CF$UID - 1602 - - NSIndexPathData - - CF$UID - 1613 - - NSIndexPathLength - 2 - - - $class - - CF$UID - 1601 - - NS.data - - AEc= - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 560 - - - NS.objects - - - CF$UID - 1615 - - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 1616 - - - - - $class - - CF$UID - 1603 - - documentURL - - CF$UID - 1593 - - expandTranscript - - indexPath - - CF$UID - 1617 - - timestamp - - CF$UID - 0 - - - - $class - - CF$UID - 1602 - - NSIndexPathData - - CF$UID - 1618 - - NSIndexPathLength - 2 - - - $class - - CF$UID - 1601 - - NS.data - - AEc= - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 560 - - - NS.objects - - - CF$UID - 1620 - - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 1621 - - - - - $class - - CF$UID - 1603 - - documentURL - - CF$UID - 1595 - - expandTranscript - - indexPath - - CF$UID - 1622 - - timestamp - - CF$UID - 0 - - - - $class - - CF$UID - 1602 - - NSIndexPathData - - CF$UID - 1623 - - NSIndexPathLength - 2 - - - $class - - CF$UID - 1601 - - NS.data - - AEg= - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1625 - - - CF$UID - 1626 - - - NS.objects - - - CF$UID - 1627 - - - CF$UID - 1628 - - - - IDEDeviceLocation - IDEDeviceArchitecture - dvtdevice-local-computer:localhost - i386 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1630 - - - NS.objects - - - CF$UID - 1631 - - - - IDENameString - TikZiT - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1633 - - - CF$UID - 1634 - - - CF$UID - 1635 - - - NS.objects - - - CF$UID - 1636 - - - CF$UID - 1661 - - - CF$UID - 57 - - - - IDEActivityReportCompletionSummaryStringSegments - IDEActivityReportOptions - IDEActivityReportTitle - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 1637 - - - CF$UID - 1644 - - - CF$UID - 1648 - - - CF$UID - 1652 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1638 - - - CF$UID - 1639 - - - CF$UID - 1640 - - - NS.objects - - - CF$UID - 1641 - - - CF$UID - 1642 - - - CF$UID - 1643 - - - - IDEActivityReportStringSegmentPriority - IDEActivityReportStringSegmentBackSeparator - IDEActivityReportStringSegmentStringValue - 2 - - Build - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1638 - - - CF$UID - 1639 - - - CF$UID - 1640 - - - NS.objects - - - CF$UID - 1645 - - - CF$UID - 1646 - - - CF$UID - 1647 - - - - 4 - : - TikZiT - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1638 - - - CF$UID - 1639 - - - CF$UID - 1640 - - - NS.objects - - - CF$UID - 1649 - - - CF$UID - 1650 - - - CF$UID - 1651 - - - - 1 - │ - - $class - - CF$UID - 1601 - - NS.data - - YnBsaXN0MDDUAQIDBAUGOzxYJHZlcnNpb25YJG9iamVjdHNZJGFy - Y2hpdmVyVCR0b3ASAAGGoK0HCA8QGhscJCUrMTQ3VSRudWxs0wkK - CwwNDlxOU0F0dHJpYnV0ZXNWJGNsYXNzWE5TU3RyaW5ngAOADIAC - WVN1Y2NlZWRlZNMKERITFBdXTlMua2V5c1pOUy5vYmplY3RzgAui - FRaABIAFohgZgAaACVZOU0ZvbnRXTlNDb2xvctQKHR4fICEiI1ZO - U05hbWVWTlNTaXplWE5TZkZsYWdzgAiAByNAJgAAAAAAABENEF8Q - EUx1Y2lkYUdyYW5kZS1Cb2xk0iYnKClaJGNsYXNzbmFtZVgkY2xh - c3Nlc1ZOU0ZvbnSiKCpYTlNPYmplY3TTCiwtLi8wXE5TQ29sb3JT - cGFjZVdOU1doaXRlgAoQA0IwANImJzIzV05TQ29sb3KiMirSJic1 - NlxOU0RpY3Rpb25hcnmiNSrSJic4OV8QEk5TQXR0cmlidXRlZFN0 - cmluZ6I6Kl8QEk5TQXR0cmlidXRlZFN0cmluZ18QD05TS2V5ZWRB - cmNoaXZlctE9PlRyb290gAEACAARABoAIwAtADIANwBFAEsAUgBf - AGYAbwBxAHMAdQB/AIYAjgCZAJsAngCgAKIApQCnAKkAsAC4AMEA - yADPANgA2gDcAOUA6AD8AQEBDAEVARwBHwEoAS8BPAFEAUYBSAFL - AVABWAFbAWABbQFwAXUBigGNAaIBtAG3AbwAAAAAAAACAQAAAAAA - AAA/AAAAAAAAAAAAAAAAAAABvg== - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1638 - - - CF$UID - 1653 - - - CF$UID - 1654 - - - CF$UID - 1640 - - - CF$UID - 1655 - - - CF$UID - 1656 - - - NS.objects - - - CF$UID - 1657 - - - CF$UID - 163 - - - CF$UID - 1658 - - - CF$UID - 1660 - - - CF$UID - 163 - - - CF$UID - 163 - - - - IDEActivityReportStringSegmentType - IDEActivityReportStringSegmentDate - IDEActivityReportStringSegmentDateStyle - IDEActivityReportStringSegmentTimeStyle - 3 - - $class - - CF$UID - 1659 - - NS.time - 381083546.00637001 - - - $classes - - NSDate - NSObject - - $classname - NSDate - - Today at 16:32 - 234 - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 3 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1664 - - - CF$UID - 1666 - - - CF$UID - 1668 - - - CF$UID - 1670 - - - CF$UID - 1672 - - - CF$UID - 1674 - - - CF$UID - 1676 - - - CF$UID - 1678 - - - CF$UID - 1680 - - - CF$UID - 1682 - - - CF$UID - 784 - - - CF$UID - 1684 - - - CF$UID - 1685 - - - CF$UID - 1687 - - - CF$UID - 1689 - - - CF$UID - 1691 - - - CF$UID - 1693 - - - CF$UID - 1695 - - - CF$UID - 907 - - - NS.objects - - - CF$UID - 1697 - - - CF$UID - 1702 - - - CF$UID - 1705 - - - CF$UID - 1708 - - - CF$UID - 1711 - - - CF$UID - 1714 - - - CF$UID - 1717 - - - CF$UID - 1720 - - - CF$UID - 1723 - - - CF$UID - 1726 - - - CF$UID - 1729 - - - CF$UID - 1734 - - - CF$UID - 1737 - - - CF$UID - 1740 - - - CF$UID - 1743 - - - CF$UID - 1746 - - - CF$UID - 1749 - - - CF$UID - 1752 - - - CF$UID - 1755 - - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1665 - - - file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/GraphicsView.m - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1667 - - - file://localhost/Users/aleks/svn/tikzit/src/common/NodeStyle.m - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1669 - - - file://localhost/Users/aleks/svn/tikzit/English.lproj/TikzDocument.xib - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1671 - - - file://localhost/Users/aleks/svn/tikzit/src/common/Node.m - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1673 - - - file://localhost/Users/aleks/svn/tikzit/src/osx/PropertyInspectorController.m - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1675 - - - file://localhost/Users/aleks/git/tikzit/tikzit/src/osx/GraphicsView.m - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1677 - - - file://localhost/Users/aleks/svn/tikzit/English.lproj/StylePalette.xib - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1679 - - - file://localhost/Users/aleks/svn/tikzit/src/osx/StylePaletteController.m - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1681 - - - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/Edge.m - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1683 - - - file://localhost/Users/aleks/git/tikzit/tikzit/src/osx/Grid.m - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1518 - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1686 - - - file://localhost/Users/aleks/svn/tikzit/English.lproj/PropertyInspector.xib - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1688 - - - file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/PreviewController.m - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1690 - - - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/TikzGraphAssembler.m - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1692 - - - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/tikzlexer.lm - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1694 - - - file://localhost/Users/aleks/svn/tikzit/src/osx/NodeLayer.h - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1696 - - - file://localhost/Users/aleks/svn/tikzit/English.lproj/Preview.xib - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1700 - - - CF$UID - 1701 - - - - width - height - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1703 - - - CF$UID - 1704 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1706 - - - CF$UID - 1707 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1709 - - - CF$UID - 1710 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1712 - - - CF$UID - 1713 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1715 - - - CF$UID - 1716 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1718 - - - CF$UID - 1719 - - - - 1133 - 763 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1721 - - - CF$UID - 1722 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1724 - - - CF$UID - 1725 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1727 - - - CF$UID - 1728 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1730 - - - CF$UID - 1731 - - - NS.objects - - - CF$UID - 1732 - - - CF$UID - 1733 - - - - width - height - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1735 - - - CF$UID - 1736 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1738 - - - CF$UID - 1739 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1741 - - - CF$UID - 1742 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1744 - - - CF$UID - 1745 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1747 - - - CF$UID - 1748 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1750 - - - CF$UID - 1751 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1753 - - - CF$UID - 1754 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1730 - - - CF$UID - 1731 - - - NS.objects - - - CF$UID - 1756 - - - CF$UID - 1757 - - - - 600 - 600 - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 1759 - - - CF$UID - 1761 - - - CF$UID - 1763 - - - CF$UID - 1765 - - - CF$UID - 1767 - - - CF$UID - 1769 - - - CF$UID - 1771 - - - CF$UID - 1772 - - - CF$UID - 1773 - - - CF$UID - 1774 - - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1760 - - - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/Graph.m - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1762 - - - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/Edge.m - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1764 - - - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/tikzparser.ym - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1766 - - - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/tikzlexer.lm - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1768 - - - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/TikzGraphAssembler.m - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1770 - - - file://localhost/Users/aleks/git/tikzit/tikzit/TikZiT-Info.plist - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1499 - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1683 - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1675 - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 365 - - - - $top - - State - - CF$UID - 1 - - - $version - 100000 - - diff --git a/tikzit/TikZiT.xcodeproj/project.xcworkspace/xcuserdata/aleks.xcuserdatad/WorkspaceSettings.xcsettings b/tikzit/TikZiT.xcodeproj/project.xcworkspace/xcuserdata/aleks.xcuserdatad/WorkspaceSettings.xcsettings deleted file mode 100644 index c1034ce..0000000 --- a/tikzit/TikZiT.xcodeproj/project.xcworkspace/xcuserdata/aleks.xcuserdatad/WorkspaceSettings.xcsettings +++ /dev/null @@ -1,22 +0,0 @@ - - - - - IDEWorkspaceUserSettings_BuildLocationStyle - 2 - IDEWorkspaceUserSettings_BuildSubfolderNameStyle - 0 - IDEWorkspaceUserSettings_DerivedDataLocationStyle - 0 - IDEWorkspaceUserSettings_HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges - - IDEWorkspaceUserSettings_IssueFilterStyle - 0 - IDEWorkspaceUserSettings_LiveSourceIssuesEnabled - - IDEWorkspaceUserSettings_SnapshotAutomaticallyBeforeSignificantChanges - - IDEWorkspaceUserSettings_SnapshotLocationStyle - 0 - - diff --git a/tikzit/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist b/tikzit/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist deleted file mode 100644 index 5a56e60..0000000 --- a/tikzit/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tikzit/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/TikZiT.xcscheme b/tikzit/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/TikZiT.xcscheme deleted file mode 100644 index 86e70a8..0000000 --- a/tikzit/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/TikZiT.xcscheme +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tikzit/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/tests.xcscheme b/tikzit/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/tests.xcscheme deleted file mode 100644 index 9e1a430..0000000 --- a/tikzit/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/tests.xcscheme +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tikzit/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/xcschememanagement.plist b/tikzit/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/xcschememanagement.plist deleted file mode 100644 index 3291a35..0000000 --- a/tikzit/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/xcschememanagement.plist +++ /dev/null @@ -1,32 +0,0 @@ - - - - - SchemeUserState - - TikZiT.xcscheme - - orderHint - 1 - - tests.xcscheme - - orderHint - 0 - - - SuppressBuildableAutocreation - - 5589AA6411C5429C0064D310 - - primary - - - 8D15AC270486D014006FF6A4 - - primary - - - - - diff --git a/tikzit/TikZiT_Prefix.pch b/tikzit/TikZiT_Prefix.pch deleted file mode 100644 index 78e4d0f..0000000 --- a/tikzit/TikZiT_Prefix.pch +++ /dev/null @@ -1,30 +0,0 @@ -// -// TikZiT_Prefix.pch -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -// -// Prefix header for all source files of the 'TikZiT' target in the 'TikZiT' project -// - -#ifdef __OBJC__ - #import -#endif diff --git a/tikzit/autogen.sh b/tikzit/autogen.sh deleted file mode 100755 index 132ecd0..0000000 --- a/tikzit/autogen.sh +++ /dev/null @@ -1,1578 +0,0 @@ -#!/bin/sh -# a u t o g e n . s h -# -# Copyright (c) 2005-2009 United States Government as represented by -# the U.S. Army Research Laboratory. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following -# disclaimer in the documentation and/or other materials provided -# with the distribution. -# -# 3. The name of the author may not be used to endorse or promote -# products derived from this software without specific prior written -# permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS -# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -### -# -# Script for automatically preparing the sources for compilation by -# performing the myriad of necessary steps. The script attempts to -# detect proper version support, and outputs warnings about particular -# systems that have autotool peculiarities. -# -# Basically, if everything is set up and installed correctly, the -# script will validate that minimum versions of the GNU Build System -# tools are installed, account for several common configuration -# issues, and then simply run autoreconf for you. -# -# If autoreconf fails, which can happen for many valid configurations, -# this script proceeds to run manual preparation steps effectively -# providing a POSIX shell script (mostly complete) reimplementation of -# autoreconf. -# -# The AUTORECONF, AUTOCONF, AUTOMAKE, LIBTOOLIZE, ACLOCAL, AUTOHEADER -# environment variables and corresponding _OPTIONS variables (e.g. -# AUTORECONF_OPTIONS) may be used to override the default automatic -# detection behaviors. Similarly the _VERSION variables will override -# the minimum required version numbers. -# -# Examples: -# -# To obtain help on usage: -# ./autogen.sh --help -# -# To obtain verbose output: -# ./autogen.sh --verbose -# -# To skip autoreconf and prepare manually: -# AUTORECONF=false ./autogen.sh -# -# To verbosely try running with an older (unsupported) autoconf: -# AUTOCONF_VERSION=2.50 ./autogen.sh --verbose -# -# Author: -# Christopher Sean Morrison -# -# Patches: -# Sebastian Pipping -# -###################################################################### - -# set to minimum acceptable version of autoconf -if [ "x$AUTOCONF_VERSION" = "x" ] ; then - AUTOCONF_VERSION=2.60 -fi -# set to minimum acceptable version of automake -if [ "x$AUTOMAKE_VERSION" = "x" ] ; then - AUTOMAKE_VERSION=1.6.0 -fi -# set to minimum acceptable version of libtool -if [ "x$LIBTOOL_VERSION" = "x" ] ; then - LIBTOOL_VERSION=1.4.2 -fi - - -################## -# ident function # -################## -ident ( ) { - # extract copyright from header - __copyright="`grep Copyright $AUTOGEN_SH | head -${HEAD_N}1 | awk '{print $4}'`" - if [ "x$__copyright" = "x" ] ; then - __copyright="`date +%Y`" - fi - - # extract version from CVS Id string - __id="$Id: autogen.sh 33925 2009-03-01 23:27:06Z brlcad $" - __version="`echo $__id | sed 's/.*\([0-9][0-9][0-9][0-9]\)[-\/]\([0-9][0-9]\)[-\/]\([0-9][0-9]\).*/\1\2\3/'`" - if [ "x$__version" = "x" ] ; then - __version="" - fi - - echo "autogen.sh build preparation script by Christopher Sean Morrison" - echo " + config.guess download patch by Sebastian Pipping (2008-12-03)" - echo "revised 3-clause BSD-style license, copyright (c) $__copyright" - echo "script version $__version, ISO/IEC 9945 POSIX shell script" -} - - -################## -# USAGE FUNCTION # -################## -usage ( ) { - echo "Usage: $AUTOGEN_SH [-h|--help] [-v|--verbose] [-q|--quiet] [-d|--download] [--version]" - echo " --help Help on $NAME_OF_AUTOGEN usage" - echo " --verbose Verbose progress output" - echo " --quiet Quiet suppressed progress output" - echo " --download Download the latest config.guess from gnulib" - echo " --version Only perform GNU Build System version checks" - echo - echo "Description: This script will validate that minimum versions of the" - echo "GNU Build System tools are installed and then run autoreconf for you." - echo "Should autoreconf fail, manual preparation steps will be run" - echo "potentially accounting for several common preparation issues. The" - - echo "AUTORECONF, AUTOCONF, AUTOMAKE, LIBTOOLIZE, ACLOCAL, AUTOHEADER," - echo "PROJECT, & CONFIGURE environment variables and corresponding _OPTIONS" - echo "variables (e.g. AUTORECONF_OPTIONS) may be used to override the" - echo "default automatic detection behavior." - echo - - ident - - return 0 -} - - -########################## -# VERSION_ERROR FUNCTION # -########################## -version_error ( ) { - if [ "x$1" = "x" ] ; then - echo "INTERNAL ERROR: version_error was not provided a version" - exit 1 - fi - if [ "x$2" = "x" ] ; then - echo "INTERNAL ERROR: version_error was not provided an application name" - exit 1 - fi - $ECHO - $ECHO "ERROR: To prepare the ${PROJECT} build system from scratch," - $ECHO " at least version $1 of $2 must be installed." - $ECHO - $ECHO "$NAME_OF_AUTOGEN does not need to be run on the same machine that will" - $ECHO "run configure or make. Either the GNU Autotools will need to be installed" - $ECHO "or upgraded on this system, or $NAME_OF_AUTOGEN must be run on the source" - $ECHO "code on another system and then transferred to here. -- Cheers!" - $ECHO -} - -########################## -# VERSION_CHECK FUNCTION # -########################## -version_check ( ) { - if [ "x$1" = "x" ] ; then - echo "INTERNAL ERROR: version_check was not provided a minimum version" - exit 1 - fi - _min="$1" - if [ "x$2" = "x" ] ; then - echo "INTERNAL ERROR: version check was not provided a comparison version" - exit 1 - fi - _cur="$2" - - # needed to handle versions like 1.10 and 1.4-p6 - _min="`echo ${_min}. | sed 's/[^0-9]/./g' | sed 's/\.\././g'`" - _cur="`echo ${_cur}. | sed 's/[^0-9]/./g' | sed 's/\.\././g'`" - - _min_major="`echo $_min | cut -d. -f1`" - _min_minor="`echo $_min | cut -d. -f2`" - _min_patch="`echo $_min | cut -d. -f3`" - - _cur_major="`echo $_cur | cut -d. -f1`" - _cur_minor="`echo $_cur | cut -d. -f2`" - _cur_patch="`echo $_cur | cut -d. -f3`" - - if [ "x$_min_major" = "x" ] ; then - _min_major=0 - fi - if [ "x$_min_minor" = "x" ] ; then - _min_minor=0 - fi - if [ "x$_min_patch" = "x" ] ; then - _min_patch=0 - fi - if [ "x$_cur_minor" = "x" ] ; then - _cur_major=0 - fi - if [ "x$_cur_minor" = "x" ] ; then - _cur_minor=0 - fi - if [ "x$_cur_patch" = "x" ] ; then - _cur_patch=0 - fi - - $VERBOSE_ECHO "Checking if ${_cur_major}.${_cur_minor}.${_cur_patch} is greater than ${_min_major}.${_min_minor}.${_min_patch}" - - if [ $_min_major -lt $_cur_major ] ; then - return 0 - elif [ $_min_major -eq $_cur_major ] ; then - if [ $_min_minor -lt $_cur_minor ] ; then - return 0 - elif [ $_min_minor -eq $_cur_minor ] ; then - if [ $_min_patch -lt $_cur_patch ] ; then - return 0 - elif [ $_min_patch -eq $_cur_patch ] ; then - return 0 - fi - fi - fi - return 1 -} - - -###################################### -# LOCATE_CONFIGURE_TEMPLATE FUNCTION # -###################################### -locate_configure_template ( ) { - _pwd="`pwd`" - if test -f "./configure.ac" ; then - echo "./configure.ac" - elif test -f "./configure.in" ; then - echo "./configure.in" - elif test -f "$_pwd/configure.ac" ; then - echo "$_pwd/configure.ac" - elif test -f "$_pwd/configure.in" ; then - echo "$_pwd/configure.in" - elif test -f "$PATH_TO_AUTOGEN/configure.ac" ; then - echo "$PATH_TO_AUTOGEN/configure.ac" - elif test -f "$PATH_TO_AUTOGEN/configure.in" ; then - echo "$PATH_TO_AUTOGEN/configure.in" - fi -} - - -################## -# argument check # -################## -ARGS="$*" -PATH_TO_AUTOGEN="`dirname $0`" -NAME_OF_AUTOGEN="`basename $0`" -AUTOGEN_SH="$PATH_TO_AUTOGEN/$NAME_OF_AUTOGEN" - -LIBTOOL_M4="${PATH_TO_AUTOGEN}/misc/libtool.m4" - -if [ "x$HELP" = "x" ] ; then - HELP=no -fi -if [ "x$QUIET" = "x" ] ; then - QUIET=no -fi -if [ "x$VERBOSE" = "x" ] ; then - VERBOSE=no -fi -if [ "x$VERSION_ONLY" = "x" ] ; then - VERSION_ONLY=no -fi -if [ "x$DOWNLOAD" = "x" ] ; then - DOWNLOAD=no -fi -if [ "x$AUTORECONF_OPTIONS" = "x" ] ; then - AUTORECONF_OPTIONS="-i -f" -fi -if [ "x$AUTOCONF_OPTIONS" = "x" ] ; then - AUTOCONF_OPTIONS="-f" -fi -if [ "x$AUTOMAKE_OPTIONS" = "x" ] ; then - AUTOMAKE_OPTIONS="-a -c -f" -fi -ALT_AUTOMAKE_OPTIONS="-a -c" -if [ "x$LIBTOOLIZE_OPTIONS" = "x" ] ; then - LIBTOOLIZE_OPTIONS="--automake -c -f" -fi -ALT_LIBTOOLIZE_OPTIONS="--automake --copy --force" -if [ "x$ACLOCAL_OPTIONS" = "x" ] ; then - ACLOCAL_OPTIONS="" -fi -if [ "x$AUTOHEADER_OPTIONS" = "x" ] ; then - AUTOHEADER_OPTIONS="" -fi -if [ "x$CONFIG_GUESS_URL" = "x" ] ; then - CONFIG_GUESS_URL="http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;f=build-aux/config.guess;hb=HEAD" -fi -for arg in $ARGS ; do - case "x$arg" in - x--help) HELP=yes ;; - x-[hH]) HELP=yes ;; - x--quiet) QUIET=yes ;; - x-[qQ]) QUIET=yes ;; - x--verbose) VERBOSE=yes ;; - x-[dD]) DOWNLOAD=yes ;; - x--download) DOWNLOAD=yes ;; - x-[vV]) VERBOSE=yes ;; - x--version) VERSION_ONLY=yes ;; - *) - echo "Unknown option: $arg" - echo - usage - exit 1 - ;; - esac -done - - -##################### -# environment check # -##################### - -# sanity check before recursions potentially begin -if [ ! -f "$AUTOGEN_SH" ] ; then - echo "INTERNAL ERROR: $AUTOGEN_SH does not exist" - if [ ! "x$0" = "x$AUTOGEN_SH" ] ; then - echo "INTERNAL ERROR: dirname/basename inconsistency: $0 != $AUTOGEN_SH" - fi - exit 1 -fi - -# force locale setting to C so things like date output as expected -LC_ALL=C - -# commands that this script expects -for __cmd in echo head tail pwd ; do - echo "test" | $__cmd > /dev/null 2>&1 - if [ $? != 0 ] ; then - echo "INTERNAL ERROR: '${__cmd}' command is required" - exit 2 - fi -done -echo "test" | grep "test" > /dev/null 2>&1 -if test ! x$? = x0 ; then - echo "INTERNAL ERROR: grep command is required" - exit 1 -fi -echo "test" | sed "s/test/test/" > /dev/null 2>&1 -if test ! x$? = x0 ; then - echo "INTERNAL ERROR: sed command is required" - exit 1 -fi - - -# determine the behavior of echo -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -esac - -# determine the behavior of head -case "x`echo 'head' | head -n 1 2>&1`" in - *xhead*) HEAD_N="n " ;; - *) HEAD_N="" ;; -esac - -# determine the behavior of tail -case "x`echo 'tail' | tail -n 1 2>&1`" in - *xtail*) TAIL_N="n " ;; - *) TAIL_N="" ;; -esac - -VERBOSE_ECHO=: -ECHO=: -if [ "x$QUIET" = "xyes" ] ; then - if [ "x$VERBOSE" = "xyes" ] ; then - echo "Verbose output quelled by quiet option. Further output disabled." - fi -else - ECHO=echo - if [ "x$VERBOSE" = "xyes" ] ; then - echo "Verbose output enabled" - VERBOSE_ECHO=echo - fi -fi - - -# allow a recursive run to disable further recursions -if [ "x$RUN_RECURSIVE" = "x" ] ; then - RUN_RECURSIVE=yes -fi - - -################################################ -# check for help arg and bypass version checks # -################################################ -if [ "x`echo $ARGS | sed 's/.*[hH][eE][lL][pP].*/help/'`" = "xhelp" ] ; then - HELP=yes -fi -if [ "x$HELP" = "xyes" ] ; then - usage - $ECHO "---" - $ECHO "Help was requested. No preparation or configuration will be performed." - exit 0 -fi - - -####################### -# set up signal traps # -####################### -untrap_abnormal ( ) { - for sig in 1 2 13 15; do - trap - $sig - done -} - -# do this cleanup whenever we exit. -trap ' - # start from the root - if test -d "$START_PATH" ; then - cd "$START_PATH" - fi - - # restore/delete backup files - if test "x$PFC_INIT" = "x1" ; then - recursive_restore - fi -' 0 - -# trap SIGHUP (1), SIGINT (2), SIGPIPE (13), SIGTERM (15) -for sig in 1 2 13 15; do - trap ' - $ECHO "" - $ECHO "Aborting $NAME_OF_AUTOGEN: caught signal '$sig'" - - # start from the root - if test -d "$START_PATH" ; then - cd "$START_PATH" - fi - - # clean up on abnormal exit - $VERBOSE_ECHO "rm -rf autom4te.cache" - rm -rf autom4te.cache - - if test -f "acinclude.m4.$$.backup" ; then - $VERBOSE_ECHO "cat acinclude.m4.$$.backup > acinclude.m4" - chmod u+w acinclude.m4 - cat acinclude.m4.$$.backup > acinclude.m4 - - $VERBOSE_ECHO "rm -f acinclude.m4.$$.backup" - rm -f acinclude.m4.$$.backup - fi - - { (exit 1); exit 1; } -' $sig -done - - -############################# -# look for a configure file # -############################# -if [ "x$CONFIGURE" = "x" ] ; then - CONFIGURE="`locate_configure_template`" - if [ ! "x$CONFIGURE" = "x" ] ; then - $VERBOSE_ECHO "Found a configure template: $CONFIGURE" - fi -else - $ECHO "Using CONFIGURE environment variable override: $CONFIGURE" -fi -if [ "x$CONFIGURE" = "x" ] ; then - if [ "x$VERSION_ONLY" = "xyes" ] ; then - CONFIGURE=/dev/null - else - $ECHO - $ECHO "A configure.ac or configure.in file could not be located implying" - $ECHO "that the GNU Build System is at least not used in this directory. In" - $ECHO "any case, there is nothing to do here without one of those files." - $ECHO - $ECHO "ERROR: No configure.in or configure.ac file found in `pwd`" - exit 1 - fi -fi - -#################### -# get project name # -#################### -if [ "x$PROJECT" = "x" ] ; then - PROJECT="`grep AC_INIT $CONFIGURE | grep -v '.*#.*AC_INIT' | tail -${TAIL_N}1 | sed 's/^[ ]*AC_INIT(\([^,)]*\).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`" - if [ "x$PROJECT" = "xAC_INIT" ] ; then - # projects might be using the older/deprecated arg-less AC_INIT .. look for AM_INIT_AUTOMAKE instead - PROJECT="`grep AM_INIT_AUTOMAKE $CONFIGURE | grep -v '.*#.*AM_INIT_AUTOMAKE' | tail -${TAIL_N}1 | sed 's/^[ ]*AM_INIT_AUTOMAKE(\([^,)]*\).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`" - fi - if [ "x$PROJECT" = "xAM_INIT_AUTOMAKE" ] ; then - PROJECT="project" - fi - if [ "x$PROJECT" = "x" ] ; then - PROJECT="project" - fi -else - $ECHO "Using PROJECT environment variable override: $PROJECT" -fi -$ECHO "Preparing the $PROJECT build system...please wait" -$ECHO - - -######################## -# check for autoreconf # -######################## -HAVE_AUTORECONF=no -if [ "x$AUTORECONF" = "x" ] ; then - for AUTORECONF in autoreconf ; do - $VERBOSE_ECHO "Checking autoreconf version: $AUTORECONF --version" - $AUTORECONF --version > /dev/null 2>&1 - if [ $? = 0 ] ; then - HAVE_AUTORECONF=yes - break - fi - done -else - HAVE_AUTORECONF=yes - $ECHO "Using AUTORECONF environment variable override: $AUTORECONF" -fi - - -########################## -# autoconf version check # -########################## -_acfound=no -if [ "x$AUTOCONF" = "x" ] ; then - for AUTOCONF in autoconf ; do - $VERBOSE_ECHO "Checking autoconf version: $AUTOCONF --version" - $AUTOCONF --version > /dev/null 2>&1 - if [ $? = 0 ] ; then - _acfound=yes - break - fi - done -else - _acfound=yes - $ECHO "Using AUTOCONF environment variable override: $AUTOCONF" -fi - -_report_error=no -if [ ! "x$_acfound" = "xyes" ] ; then - $ECHO "ERROR: Unable to locate GNU Autoconf." - _report_error=yes -else - _version="`$AUTOCONF --version | head -${HEAD_N}1 | sed 's/[^0-9]*\([0-9\.][0-9\.]*\)/\1/'`" - if [ "x$_version" = "x" ] ; then - _version="0.0.0" - fi - $ECHO "Found GNU Autoconf version $_version" - version_check "$AUTOCONF_VERSION" "$_version" - if [ $? -ne 0 ] ; then - _report_error=yes - fi -fi -if [ "x$_report_error" = "xyes" ] ; then - version_error "$AUTOCONF_VERSION" "GNU Autoconf" - exit 1 -fi - - -########################## -# automake version check # -########################## -_amfound=no -if [ "x$AUTOMAKE" = "x" ] ; then - for AUTOMAKE in automake ; do - $VERBOSE_ECHO "Checking automake version: $AUTOMAKE --version" - $AUTOMAKE --version > /dev/null 2>&1 - if [ $? = 0 ] ; then - _amfound=yes - break - fi - done -else - _amfound=yes - $ECHO "Using AUTOMAKE environment variable override: $AUTOMAKE" -fi - - -_report_error=no -if [ ! "x$_amfound" = "xyes" ] ; then - $ECHO - $ECHO "ERROR: Unable to locate GNU Automake." - _report_error=yes -else - _version="`$AUTOMAKE --version | head -${HEAD_N}1 | sed 's/[^0-9]*\([0-9\.][0-9\.]*\)/\1/'`" - if [ "x$_version" = "x" ] ; then - _version="0.0.0" - fi - $ECHO "Found GNU Automake version $_version" - version_check "$AUTOMAKE_VERSION" "$_version" - if [ $? -ne 0 ] ; then - _report_error=yes - fi -fi -if [ "x$_report_error" = "xyes" ] ; then - version_error "$AUTOMAKE_VERSION" "GNU Automake" - exit 1 -fi - - -######################## -# check for libtoolize # -######################## -HAVE_LIBTOOLIZE=yes -HAVE_ALT_LIBTOOLIZE=no -_ltfound=no -if [ "x$LIBTOOLIZE" = "x" ] ; then - LIBTOOLIZE=libtoolize - $VERBOSE_ECHO "Checking libtoolize version: $LIBTOOLIZE --version" - $LIBTOOLIZE --version > /dev/null 2>&1 - if [ ! $? = 0 ] ; then - HAVE_LIBTOOLIZE=no - $ECHO - if [ "x$HAVE_AUTORECONF" = "xno" ] ; then - $ECHO "Warning: libtoolize does not appear to be available." - else - $ECHO "Warning: libtoolize does not appear to be available. This means that" - $ECHO "the automatic build preparation via autoreconf will probably not work." - $ECHO "Preparing the build by running each step individually, however, should" - $ECHO "work and will be done automatically for you if autoreconf fails." - fi - - # look for some alternates - for tool in glibtoolize libtoolize15 libtoolize14 libtoolize13 ; do - $VERBOSE_ECHO "Checking libtoolize alternate: $tool --version" - _glibtoolize="`$tool --version > /dev/null 2>&1`" - if [ $? = 0 ] ; then - $VERBOSE_ECHO "Found $tool --version" - _glti="`which $tool`" - if [ "x$_glti" = "x" ] ; then - $VERBOSE_ECHO "Cannot find $tool with which" - continue; - fi - if test ! -f "$_glti" ; then - $VERBOSE_ECHO "Cannot use $tool, $_glti is not a file" - continue; - fi - _gltidir="`dirname $_glti`" - if [ "x$_gltidir" = "x" ] ; then - $VERBOSE_ECHO "Cannot find $tool path with dirname of $_glti" - continue; - fi - if test ! -d "$_gltidir" ; then - $VERBOSE_ECHO "Cannot use $tool, $_gltidir is not a directory" - continue; - fi - HAVE_ALT_LIBTOOLIZE=yes - LIBTOOLIZE="$tool" - $ECHO - $ECHO "Fortunately, $tool was found which means that your system may simply" - $ECHO "have a non-standard or incomplete GNU Autotools install. If you have" - $ECHO "sufficient system access, it may be possible to quell this warning by" - $ECHO "running:" - $ECHO - sudo -V > /dev/null 2>&1 - if [ $? = 0 ] ; then - $ECHO " sudo ln -s $_glti $_gltidir/libtoolize" - $ECHO - else - $ECHO " ln -s $_glti $_gltidir/libtoolize" - $ECHO - $ECHO "Run that as root or with proper permissions to the $_gltidir directory" - $ECHO - fi - _ltfound=yes - break - fi - done - else - _ltfound=yes - fi -else - _ltfound=yes - $ECHO "Using LIBTOOLIZE environment variable override: $LIBTOOLIZE" -fi - - -############################ -# libtoolize version check # -############################ -_report_error=no -if [ ! "x$_ltfound" = "xyes" ] ; then - $ECHO - $ECHO "ERROR: Unable to locate GNU Libtool." - _report_error=yes -else - _version="`$LIBTOOLIZE --version | head -${HEAD_N}1 | sed 's/[^0-9]*\([0-9\.][0-9\.]*\)/\1/'`" - if [ "x$_version" = "x" ] ; then - _version="0.0.0" - fi - $ECHO "Found GNU Libtool version $_version" - version_check "$LIBTOOL_VERSION" "$_version" - if [ $? -ne 0 ] ; then - _report_error=yes - fi -fi -if [ "x$_report_error" = "xyes" ] ; then - version_error "$LIBTOOL_VERSION" "GNU Libtool" - exit 1 -fi - - -##################### -# check for aclocal # -##################### -if [ "x$ACLOCAL" = "x" ] ; then - for ACLOCAL in aclocal ; do - $VERBOSE_ECHO "Checking aclocal version: $ACLOCAL --version" - $ACLOCAL --version > /dev/null 2>&1 - if [ $? = 0 ] ; then - break - fi - done -else - $ECHO "Using ACLOCAL environment variable override: $ACLOCAL" -fi - - -######################## -# check for autoheader # -######################## -if [ "x$AUTOHEADER" = "x" ] ; then - for AUTOHEADER in autoheader ; do - $VERBOSE_ECHO "Checking autoheader version: $AUTOHEADER --version" - $AUTOHEADER --version > /dev/null 2>&1 - if [ $? = 0 ] ; then - break - fi - done -else - $ECHO "Using AUTOHEADER environment variable override: $AUTOHEADER" -fi - - -######################### -# check if version only # -######################### -$VERBOSE_ECHO "Checking whether to only output version information" -if [ "x$VERSION_ONLY" = "xyes" ] ; then - $ECHO - ident - $ECHO "---" - $ECHO "Version requested. No preparation or configuration will be performed." - exit 0 -fi - - -################################# -# PROTECT_FROM_CLOBBER FUNCTION # -################################# -protect_from_clobber ( ) { - PFC_INIT=1 - - # protect COPYING & INSTALL from overwrite by automake. the - # automake force option will (inappropriately) ignore the existing - # contents of a COPYING and/or INSTALL files (depending on the - # version) instead of just forcing *missing* files like it does - # for AUTHORS, NEWS, and README. this is broken but extremely - # prevalent behavior, so we protect against it by keeping a backup - # of the file that can later be restored. - - for file in COPYING INSTALL ; do - if test -f ${file} ; then - if test -f ${file}.$$.protect_from_automake.backup ; then - $VERBOSE_ECHO "Already backed up ${file} in `pwd`" - else - $VERBOSE_ECHO "Backing up ${file} in `pwd`" - $VERBOSE_ECHO "cp -p ${file} ${file}.$$.protect_from_automake.backup" - cp -p ${file} ${file}.$$.protect_from_automake.backup - fi - fi - done -} - - -############################## -# RECURSIVE_PROTECT FUNCTION # -############################## -recursive_protect ( ) { - - # for projects using recursive configure, run the build - # preparation steps for the subdirectories. this function assumes - # START_PATH was set to pwd before recursion begins so that - # relative paths work. - - # git 'r done, protect COPYING and INSTALL from being clobbered - protect_from_clobber - - if test -d autom4te.cache ; then - $VERBOSE_ECHO "Found an autom4te.cache directory, deleting it" - $VERBOSE_ECHO "rm -rf autom4te.cache" - rm -rf autom4te.cache - fi - - # find configure template - _configure="`locate_configure_template`" - if [ "x$_configure" = "x" ] ; then - return - fi - # $VERBOSE_ECHO "Looking for configure template found `pwd`/$_configure" - - # look for subdirs - # $VERBOSE_ECHO "Looking for subdirs in `pwd`" - _det_config_subdirs="`grep AC_CONFIG_SUBDIRS $_configure | grep -v '.*#.*AC_CONFIG_SUBDIRS' | sed 's/^[ ]*AC_CONFIG_SUBDIRS(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`" - CHECK_DIRS="" - for dir in $_det_config_subdirs ; do - if test -d "`pwd`/$dir" ; then - CHECK_DIRS="$CHECK_DIRS \"`pwd`/$dir\"" - fi - done - - # process subdirs - if [ ! "x$CHECK_DIRS" = "x" ] ; then - $VERBOSE_ECHO "Recursively scanning the following directories:" - $VERBOSE_ECHO " $CHECK_DIRS" - for dir in $CHECK_DIRS ; do - $VERBOSE_ECHO "Protecting files from automake in $dir" - cd "$START_PATH" - eval "cd $dir" - - # recursively git 'r done - recursive_protect - done - fi -} # end of recursive_protect - - -############################# -# RESTORE_CLOBBERED FUNCION # -############################# -restore_clobbered ( ) { - - # The automake (and autoreconf by extension) -f/--force-missing - # option may overwrite COPYING and INSTALL even if they do exist. - # Here we restore the files if necessary. - - spacer=no - - for file in COPYING INSTALL ; do - if test -f ${file}.$$.protect_from_automake.backup ; then - if test -f ${file} ; then - # compare entire content, restore if needed - if test "x`cat ${file}`" != "x`cat ${file}.$$.protect_from_automake.backup`" ; then - if test "x$spacer" = "xno" ; then - $VERBOSE_ECHO - spacer=yes - fi - # restore the backup - $VERBOSE_ECHO "Restoring ${file} from backup (automake -f likely clobbered it)" - $VERBOSE_ECHO "rm -f ${file}" - rm -f ${file} - $VERBOSE_ECHO "mv ${file}.$$.protect_from_automake.backup ${file}" - mv ${file}.$$.protect_from_automake.backup ${file} - fi # check contents - elif test -f ${file}.$$.protect_from_automake.backup ; then - $VERBOSE_ECHO "mv ${file}.$$.protect_from_automake.backup ${file}" - mv ${file}.$$.protect_from_automake.backup ${file} - fi # -f ${file} - - # just in case - $VERBOSE_ECHO "rm -f ${file}.$$.protect_from_automake.backup" - rm -f ${file}.$$.protect_from_automake.backup - fi # -f ${file}.$$.protect_from_automake.backup - done - - CONFIGURE="`locate_configure_template`" - if [ "x$CONFIGURE" = "x" ] ; then - return - fi - - _aux_dir="`grep AC_CONFIG_AUX_DIR $CONFIGURE | grep -v '.*#.*AC_CONFIG_AUX_DIR' | tail -${TAIL_N}1 | sed 's/^[ ]*AC_CONFIG_AUX_DIR(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`" - if test ! -d "$_aux_dir" ; then - _aux_dir=. - fi - - for file in config.guess config.sub ltmain.sh ; do - if test -f "${_aux_dir}/${file}" ; then - $VERBOSE_ECHO "rm -f \"${_aux_dir}/${file}.backup\"" - rm -f "${_aux_dir}/${file}.backup" - fi - done -} # end of restore_clobbered - - -############################## -# RECURSIVE_RESTORE FUNCTION # -############################## -recursive_restore ( ) { - - # restore COPYING and INSTALL from backup if they were clobbered - # for each directory recursively. - - # git 'r undone - restore_clobbered - - # find configure template - _configure="`locate_configure_template`" - if [ "x$_configure" = "x" ] ; then - return - fi - - # look for subdirs - _det_config_subdirs="`grep AC_CONFIG_SUBDIRS $_configure | grep -v '.*#.*AC_CONFIG_SUBDIRS' | sed 's/^[ ]*AC_CONFIG_SUBDIRS(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`" - CHECK_DIRS="" - for dir in $_det_config_subdirs ; do - if test -d "`pwd`/$dir" ; then - CHECK_DIRS="$CHECK_DIRS \"`pwd`/$dir\"" - fi - done - - # process subdirs - if [ ! "x$CHECK_DIRS" = "x" ] ; then - $VERBOSE_ECHO "Recursively scanning the following directories:" - $VERBOSE_ECHO " $CHECK_DIRS" - for dir in $CHECK_DIRS ; do - $VERBOSE_ECHO "Checking files for automake damage in $dir" - cd "$START_PATH" - eval "cd $dir" - - # recursively git 'r undone - recursive_restore - done - fi -} # end of recursive_restore - - -####################### -# INITIALIZE FUNCTION # -####################### -initialize ( ) { - - # this routine performs a variety of directory-specific - # initializations. some are sanity checks, some are preventive, - # and some are necessary setup detection. - # - # this function sets: - # CONFIGURE - # SEARCH_DIRS - # CONFIG_SUBDIRS - - ################################## - # check for a configure template # - ################################## - CONFIGURE="`locate_configure_template`" - if [ "x$CONFIGURE" = "x" ] ; then - $ECHO - $ECHO "A configure.ac or configure.in file could not be located implying" - $ECHO "that the GNU Build System is at least not used in this directory. In" - $ECHO "any case, there is nothing to do here without one of those files." - $ECHO - $ECHO "ERROR: No configure.in or configure.ac file found in `pwd`" - exit 1 - fi - - ##################### - # detect an aux dir # - ##################### - _aux_dir="`grep AC_CONFIG_AUX_DIR $CONFIGURE | grep -v '.*#.*AC_CONFIG_AUX_DIR' | tail -${TAIL_N}1 | sed 's/^[ ]*AC_CONFIG_AUX_DIR(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`" - if test ! -d "$_aux_dir" ; then - _aux_dir=. - else - $VERBOSE_ECHO "Detected auxillary directory: $_aux_dir" - fi - - ################################ - # detect a recursive configure # - ################################ - CONFIG_SUBDIRS="" - _det_config_subdirs="`grep AC_CONFIG_SUBDIRS $CONFIGURE | grep -v '.*#.*AC_CONFIG_SUBDIRS' | sed 's/^[ ]*AC_CONFIG_SUBDIRS(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`" - for dir in $_det_config_subdirs ; do - if test -d "`pwd`/$dir" ; then - $VERBOSE_ECHO "Detected recursive configure directory: `pwd`/$dir" - CONFIG_SUBDIRS="$CONFIG_SUBDIRS `pwd`/$dir" - fi - done - - ########################################################### - # make sure certain required files exist for GNU projects # - ########################################################### - _marker_found="" - _marker_found_message_intro='Detected non-GNU marker "' - _marker_found_message_mid='" in ' - for marker in foreign cygnus ; do - _marker_found_message=${_marker_found_message_intro}${marker}${_marker_found_message_mid} - _marker_found="`grep 'AM_INIT_AUTOMAKE.*'${marker} $CONFIGURE`" - if [ ! "x$_marker_found" = "x" ] ; then - $VERBOSE_ECHO "${_marker_found_message}`basename \"$CONFIGURE\"`" - break - fi - if test -f "`dirname \"$CONFIGURE\"/Makefile.am`" ; then - _marker_found="`grep 'AUTOMAKE_OPTIONS.*'${marker} Makefile.am`" - if [ ! "x$_marker_found" = "x" ] ; then - $VERBOSE_ECHO "${_marker_found_message}Makefile.am" - break - fi - fi - done - if [ "x${_marker_found}" = "x" ] ; then - _suggest_foreign=no - for file in AUTHORS COPYING ChangeLog INSTALL NEWS README ; do - if [ ! -f $file ] ; then - $VERBOSE_ECHO "Touching ${file} since it does not exist" - _suggest_foreign=yes - touch $file - fi - done - - if [ "x${_suggest_foreign}" = "xyes" ] ; then - $ECHO - $ECHO "Warning: Several files expected of projects that conform to the GNU" - $ECHO "coding standards were not found. The files were automatically added" - $ECHO "for you since you do not have a 'foreign' declaration specified." - $ECHO - $ECHO "Considered adding 'foreign' to AM_INIT_AUTOMAKE in `basename \"$CONFIGURE\"`" - if test -f "`dirname \"$CONFIGURE\"/Makefile.am`" ; then - $ECHO "or to AUTOMAKE_OPTIONS in your top-level Makefile.am file." - fi - $ECHO - fi - fi - - ################################################## - # make sure certain generated files do not exist # - ################################################## - for file in config.guess config.sub ltmain.sh ; do - if test -f "${_aux_dir}/${file}" ; then - $VERBOSE_ECHO "mv -f \"${_aux_dir}/${file}\" \"${_aux_dir}/${file}.backup\"" - mv -f "${_aux_dir}/${file}" "${_aux_dir}/${file}.backup" - fi - done - - ############################ - # search alternate m4 dirs # - ############################ - SEARCH_DIRS="" - for dir in m4 ; do - if [ -d $dir ] ; then - $VERBOSE_ECHO "Found extra aclocal search directory: $dir" - SEARCH_DIRS="$SEARCH_DIRS -I $dir" - fi - done - - ###################################### - # remove any previous build products # - ###################################### - if test -d autom4te.cache ; then - $VERBOSE_ECHO "Found an autom4te.cache directory, deleting it" - $VERBOSE_ECHO "rm -rf autom4te.cache" - rm -rf autom4te.cache - fi -# tcl/tk (and probably others) have a customized aclocal.m4, so can't delete it -# if test -f aclocal.m4 ; then -# $VERBOSE_ECHO "Found an aclocal.m4 file, deleting it" -# $VERBOSE_ECHO "rm -f aclocal.m4" -# rm -f aclocal.m4 -# fi - -} # end of initialize() - - -############## -# initialize # -############## - -# stash path -START_PATH="`pwd`" - -# Before running autoreconf or manual steps, some prep detection work -# is necessary or useful. Only needs to occur once per directory, but -# does need to traverse the entire subconfigure hierarchy to protect -# files from being clobbered even by autoreconf. -recursive_protect - -# start from where we started -cd "$START_PATH" - -# get ready to process -initialize - - -######################################### -# DOWNLOAD_GNULIB_CONFIG_GUESS FUNCTION # -######################################### - -# TODO - should make sure wget/curl exist and/or work before trying to -# use them. - -download_gnulib_config_guess () { - # abuse gitweb to download gnulib's latest config.guess via HTTP - config_guess_temp="config.guess.$$.download" - ret=1 - for __cmd in wget curl fetch ; do - $VERBOSE_ECHO "Checking for command ${__cmd}" - ${__cmd} --version > /dev/null 2>&1 - ret=$? - if [ ! $ret = 0 ] ; then - continue - fi - - __cmd_version=`${__cmd} --version | head -n 1 | sed -e 's/^[^0-9]\+//' -e 's/ .*//'` - $VERBOSE_ECHO "Found ${__cmd} ${__cmd_version}" - - opts="" - case ${__cmd} in - wget) - opts="-O" - ;; - curl) - opts="-o" - ;; - fetch) - opts="-t 5 -f" - ;; - esac - - $VERBOSE_ECHO "Running $__cmd \"${CONFIG_GUESS_URL}\" $opts \"${config_guess_temp}\"" - eval "$__cmd \"${CONFIG_GUESS_URL}\" $opts \"${config_guess_temp}\"" > /dev/null 2>&1 - if [ $? = 0 ] ; then - mv -f "${config_guess_temp}" ${_aux_dir}/config.guess - ret=0 - break - fi - done - - if [ ! $ret = 0 ] ; then - $ECHO "Warning: config.guess download failed from: $CONFIG_GUESS_URL" - rm -f "${config_guess_temp}" - fi -} - - -############################## -# LIBTOOLIZE_NEEDED FUNCTION # -############################## -libtoolize_needed () { - ret=1 # means no, don't need libtoolize - for feature in AC_PROG_LIBTOOL AM_PROG_LIBTOOL LT_INIT ; do - $VERBOSE_ECHO "Searching for $feature in $CONFIGURE" - found="`grep \"^$feature.*\" $CONFIGURE`" - if [ ! "x$found" = "x" ] ; then - ret=0 # means yes, need to run libtoolize - break - fi - done - return ${ret} -} - - - -############################################ -# prepare build via autoreconf or manually # -############################################ -reconfigure_manually=no -if [ "x$HAVE_AUTORECONF" = "xyes" ] ; then - $ECHO - $ECHO $ECHO_N "Automatically preparing build ... $ECHO_C" - - $VERBOSE_ECHO "$AUTORECONF $SEARCH_DIRS $AUTORECONF_OPTIONS" - autoreconf_output="`$AUTORECONF $SEARCH_DIRS $AUTORECONF_OPTIONS 2>&1`" - ret=$? - $VERBOSE_ECHO "$autoreconf_output" - - if [ ! $ret = 0 ] ; then - if [ "x$HAVE_ALT_LIBTOOLIZE" = "xyes" ] ; then - if [ ! "x`echo \"$autoreconf_output\" | grep libtoolize | grep \"No such file or directory\"`" = "x" ] ; then - $ECHO - $ECHO "Warning: autoreconf failed but due to what is usually a common libtool" - $ECHO "misconfiguration issue. This problem is encountered on systems that" - $ECHO "have installed libtoolize under a different name without providing a" - $ECHO "symbolic link or without setting the LIBTOOLIZE environment variable." - $ECHO - $ECHO "Restarting the preparation steps with LIBTOOLIZE set to $LIBTOOLIZE" - - export LIBTOOLIZE - RUN_RECURSIVE=no - export RUN_RECURSIVE - untrap_abnormal - - $VERBOSE_ECHO sh $AUTOGEN_SH "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9" - sh "$AUTOGEN_SH" "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9" - exit $? - fi - fi - - $ECHO "Warning: $AUTORECONF failed" - - if test -f ltmain.sh ; then - $ECHO "libtoolize being run by autoreconf is not creating ltmain.sh in the auxillary directory like it should" - fi - - $ECHO "Attempting to run the preparation steps individually" - reconfigure_manually=yes - else - if [ "x$DOWNLOAD" = "xyes" ] ; then - if libtoolize_needed ; then - download_gnulib_config_guess - fi - fi - fi -else - reconfigure_manually=yes -fi - - -############################ -# LIBTOOL_FAILURE FUNCTION # -############################ -libtool_failure ( ) { - - # libtool is rather error-prone in comparison to the other - # autotools and this routine attempts to compensate for some - # common failures. the output after a libtoolize failure is - # parsed for an error related to AC_PROG_LIBTOOL and if found, we - # attempt to inject a project-provided libtool.m4 file. - - _autoconf_output="$1" - - if [ "x$RUN_RECURSIVE" = "xno" ] ; then - # we already tried the libtool.m4, don't try again - return 1 - fi - - if test -f "$LIBTOOL_M4" ; then - found_libtool="`$ECHO $_autoconf_output | grep AC_PROG_LIBTOOL`" - if test ! "x$found_libtool" = "x" ; then - if test -f acinclude.m4 ; then - rm -f acinclude.m4.$$.backup - $VERBOSE_ECHO "cat acinclude.m4 > acinclude.m4.$$.backup" - cat acinclude.m4 > acinclude.m4.$$.backup - fi - $VERBOSE_ECHO "cat \"$LIBTOOL_M4\" >> acinclude.m4" - chmod u+w acinclude.m4 - cat "$LIBTOOL_M4" >> acinclude.m4 - - # don't keep doing this - RUN_RECURSIVE=no - export RUN_RECURSIVE - untrap_abnormal - - $ECHO - $ECHO "Restarting the preparation steps with libtool macros in acinclude.m4" - $VERBOSE_ECHO sh $AUTOGEN_SH "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9" - sh "$AUTOGEN_SH" "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9" - exit $? - fi - fi -} - - -########################### -# MANUAL_AUTOGEN FUNCTION # -########################### -manual_autogen ( ) { - - ################################################## - # Manual preparation steps taken are as follows: # - # aclocal [-I m4] # - # libtoolize --automake -c -f # - # aclocal [-I m4] # - # autoconf -f # - # autoheader # - # automake -a -c -f # - ################################################## - - ########### - # aclocal # - ########### - $VERBOSE_ECHO "$ACLOCAL $SEARCH_DIRS $ACLOCAL_OPTIONS" - aclocal_output="`$ACLOCAL $SEARCH_DIRS $ACLOCAL_OPTIONS 2>&1`" - ret=$? - $VERBOSE_ECHO "$aclocal_output" - if [ ! $ret = 0 ] ; then $ECHO "ERROR: $ACLOCAL failed" && exit 2 ; fi - - ############## - # libtoolize # - ############## - if libtoolize_needed ; then - if [ "x$HAVE_LIBTOOLIZE" = "xyes" ] ; then - $VERBOSE_ECHO "$LIBTOOLIZE $LIBTOOLIZE_OPTIONS" - libtoolize_output="`$LIBTOOLIZE $LIBTOOLIZE_OPTIONS 2>&1`" - ret=$? - $VERBOSE_ECHO "$libtoolize_output" - - if [ ! $ret = 0 ] ; then $ECHO "ERROR: $LIBTOOLIZE failed" && exit 2 ; fi - else - if [ "x$HAVE_ALT_LIBTOOLIZE" = "xyes" ] ; then - $VERBOSE_ECHO "$LIBTOOLIZE $ALT_LIBTOOLIZE_OPTIONS" - libtoolize_output="`$LIBTOOLIZE $ALT_LIBTOOLIZE_OPTIONS 2>&1`" - ret=$? - $VERBOSE_ECHO "$libtoolize_output" - - if [ ! $ret = 0 ] ; then $ECHO "ERROR: $LIBTOOLIZE failed" && exit 2 ; fi - fi - fi - - ########### - # aclocal # - ########### - # re-run again as instructed by libtoolize - $VERBOSE_ECHO "$ACLOCAL $SEARCH_DIRS $ACLOCAL_OPTIONS" - aclocal_output="`$ACLOCAL $SEARCH_DIRS $ACLOCAL_OPTIONS 2>&1`" - ret=$? - $VERBOSE_ECHO "$aclocal_output" - - # libtoolize might put ltmain.sh in the wrong place - if test -f ltmain.sh ; then - if test ! -f "${_aux_dir}/ltmain.sh" ; then - $ECHO - $ECHO "Warning: $LIBTOOLIZE is creating ltmain.sh in the wrong directory" - $ECHO - $ECHO "Fortunately, the problem can be worked around by simply copying the" - $ECHO "file to the appropriate location (${_aux_dir}/). This has been done for you." - $ECHO - $VERBOSE_ECHO "cp -p ltmain.sh \"${_aux_dir}/ltmain.sh\"" - cp -p ltmain.sh "${_aux_dir}/ltmain.sh" - $ECHO $ECHO_N "Continuing build preparation ... $ECHO_C" - fi - fi # ltmain.sh - - if [ "x$DOWNLOAD" = "xyes" ] ; then - download_gnulib_config_guess - fi - fi # libtoolize_needed - - ############ - # autoconf # - ############ - $VERBOSE_ECHO - $VERBOSE_ECHO "$AUTOCONF $AUTOCONF_OPTIONS" - autoconf_output="`$AUTOCONF $AUTOCONF_OPTIONS 2>&1`" - ret=$? - $VERBOSE_ECHO "$autoconf_output" - - if [ ! $ret = 0 ] ; then - # retry without the -f and check for usage of macros that are too new - ac2_59_macros="AC_C_RESTRICT AC_INCLUDES_DEFAULT AC_LANG_ASSERT AC_LANG_WERROR AS_SET_CATFILE" - ac2_55_macros="AC_COMPILER_IFELSE AC_FUNC_MBRTOWC AC_HEADER_STDBOOL AC_LANG_CONFTEST AC_LANG_SOURCE AC_LANG_PROGRAM AC_LANG_CALL AC_LANG_FUNC_TRY_LINK AC_MSG_FAILURE AC_PREPROC_IFELSE" - ac2_54_macros="AC_C_BACKSLASH_A AC_CONFIG_LIBOBJ_DIR AC_GNU_SOURCE AC_PROG_EGREP AC_PROG_FGREP AC_REPLACE_FNMATCH AC_FUNC_FNMATCH_GNU AC_FUNC_REALLOC AC_TYPE_MBSTATE_T" - - macros_to_search="" - ac_major="`echo ${AUTOCONF_VERSION}. | cut -d. -f1 | sed 's/[^0-9]//g'`" - ac_minor="`echo ${AUTOCONF_VERSION}. | cut -d. -f2 | sed 's/[^0-9]//g'`" - - if [ $ac_major -lt 2 ] ; then - macros_to_search="$ac2_59_macros $ac2_55_macros $ac2_54_macros" - else - if [ $ac_minor -lt 54 ] ; then - macros_to_search="$ac2_59_macros $ac2_55_macros $ac2_54_macros" - elif [ $ac_minor -lt 55 ] ; then - macros_to_search="$ac2_59_macros $ac2_55_macros" - elif [ $ac_minor -lt 59 ] ; then - macros_to_search="$ac2_59_macros" - fi - fi - - configure_ac_macros=__none__ - for feature in $macros_to_search ; do - $VERBOSE_ECHO "Searching for $feature in $CONFIGURE" - found="`grep \"^$feature.*\" $CONFIGURE`" - if [ ! "x$found" = "x" ] ; then - if [ "x$configure_ac_macros" = "x__none__" ] ; then - configure_ac_macros="$feature" - else - configure_ac_macros="$feature $configure_ac_macros" - fi - fi - done - if [ ! "x$configure_ac_macros" = "x__none__" ] ; then - $ECHO - $ECHO "Warning: Unsupported macros were found in $CONFIGURE" - $ECHO - $ECHO "The `basename \"$CONFIGURE\"` file was scanned in order to determine if any" - $ECHO "unsupported macros are used that exceed the minimum version" - $ECHO "settings specified within this file. As such, the following macros" - $ECHO "should be removed from configure.ac or the version numbers in this" - $ECHO "file should be increased:" - $ECHO - $ECHO "$configure_ac_macros" - $ECHO - $ECHO $ECHO_N "Ignorantly continuing build preparation ... $ECHO_C" - fi - - ################### - # autoconf, retry # - ################### - $VERBOSE_ECHO - $VERBOSE_ECHO "$AUTOCONF" - autoconf_output="`$AUTOCONF 2>&1`" - ret=$? - $VERBOSE_ECHO "$autoconf_output" - - if [ ! $ret = 0 ] ; then - # test if libtool is busted - libtool_failure "$autoconf_output" - - # let the user know what went wrong - cat < -Provides: tikzit -Description: TikZiT is a GTK+ application that allows the creation and modification of TeX diagrams written using the pgf/TikZ macro library. It is especially geared toward rapidly creating "dot"-diagrams for use in academic papers. diff --git a/tikzit/configure.ac b/tikzit/configure.ac deleted file mode 100644 index a86156b..0000000 --- a/tikzit/configure.ac +++ /dev/null @@ -1,141 +0,0 @@ -# -*- Autoconf -*- -# Process this file with autoconf to produce a configure script. - -AC_PREREQ([2.60]) -AC_INIT([TikZiT], [1.1], - [http://sourceforge.net/apps/trac/tikzit], - [tikzit], - [http://tikzit.sourceforge.net]) -AM_INIT_AUTOMAKE([1.10 foreign subdir-objects -Wall -Werror]) -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -AC_OUTPUT(Makefile - src/Makefile - share/Makefile -) -AC_CONFIG_SRCDIR([src/gtk/main.m]) - -m4_include([m4/objc.m4]) - -# Checks for programs. -AC_PROG_OBJC([gcc clang objc objcc]) -AC_LANG([Objective C]) - -AC_CHECK_PROGS([FLEX], [flex lex], [flex]) -AS_IF([$FLEX --version 2>/dev/null | grep "^flex" >/dev/null 2>/dev/null],[], - [ - AC_MSG_WARN([flex not found; this may cause problems for developers]) - # in case a lex that wasn't flex was found - FLEX=flex - ]) -AM_MISSING_PROG([LEX], [$FLEX]) - -AC_CHECK_PROGS([BISON], [bison yacc], [bison]) -AS_IF([$BISON --version 2>/dev/null | grep "^bison" >/dev/null 2>/dev/null],[], - [ - AC_MSG_WARN([bison not found; this may cause problems for developers]) - # in case a yacc that wasn't bison was found - BISON=bison - ]) -AM_MISSING_PROG([YACC], [$BISON]) - -# Checks for libraries. -FOUNDATION_OBJCFLAGS=`eval "gnustep-config --objc-flags"` -AS_IF([test "x$FOUNDATION_OBJCFLAGS" = "x"], - [AC_MSG_ERROR([GNUstep not found])]) -FOUNDATION_LIBS=`eval "gnustep-config --base-libs"` -AS_IF([test "x$FOUNDATION_LIBS" = "x"], - [AC_MSG_ERROR([GNUstep not found])]) -AC_SUBST([FOUNDATION_OBJCFLAGS]) -AC_SUBST([FOUNDATION_LIBS]) - -TZ_TEST_OBJCFLAGS="$FOUNDATION_OBJCFLAGS" -TZ_TEST_LDFLAGS="$FOUNDATION_LIBS" - -TZ_OBJC_FOUNDATION -AS_IF([test "x$tz_cv_objc_foundation" != "xyes"], - [AC_MSG_ERROR([Objective C Foundation not found -- missing gnustep-base(-devel)?])]) - -AC_ARG_WITH([poppler], AS_HELP_STRING([--without-poppler], [Ignore presence of poppler, disabling preview support])) - -AS_IF([test "x$with_poppler" != "xno"], - [ - AC_MSG_CHECKING([for poppler-glib]) - PKG_CHECK_EXISTS([poppler-glib >= 0.10], - [have_poppler=yes], - [have_poppler=no]) - AS_IF([test "x$have_poppler" = "xyes"], - [ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_POPPLER, 1) - ], - [ - AC_MSG_RESULT([no]) - AS_IF([test "x$with_poppler" = "xyes"], - [AC_MSG_ERROR([poppler requested but not found (note that poppler-glib is required)])] - ) - ]) - ], - [have_poppler=no]) -AM_CONDITIONAL([HAVE_POPPLER],[test "x$have_poppler" = "xyes"]) - -# Test all the pkg-config stuff together, so that -# dependencies and duplicate flags are correctly handled -AS_IF([test "x$have_poppler" = "xyes"], - [PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.18.0 gdk-pixbuf-2.0 >= 2.16.0 pango >= 1.16 cairo >= 1.4 poppler-glib >= 0.10])], - [PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.18.0 gdk-pixbuf-2.0 >= 2.16.0 pango >= 1.16 cairo >= 1.4])]) - -# Checks for header files. -AC_FUNC_ALLOCA -AC_CHECK_HEADERS([inttypes.h libintl.h limits.h malloc.h stddef.h stdint.h stdlib.h string.h unistd.h]) - -# Checks for typedefs, structures, and compiler characteristics. -AC_TYPE_INT16_T -AC_TYPE_INT32_T -AC_TYPE_INT8_T -AC_TYPE_SIZE_T -AC_TYPE_UINT16_T -AC_TYPE_UINT32_T -AC_TYPE_UINT64_T -AC_TYPE_UINT8_T -AC_HEADER_STDBOOL -AC_HEADER_STAT -AC_CHECK_HEADERS([stdint.h inttypes.h unistd.h sys/time.h time.h]) - -# Checks for library functions. -AC_FUNC_MALLOC -AC_FUNC_REALLOC -AC_CHECK_FUNCS([floor gettimeofday memset mkdtemp sqrt strdup]) - -TZ_OBJC2_FEATURES -AS_IF([test "x$tz_cv_objc_properties$tz_cv_objc_fast_enumeration$tz_cv_objc_optional_keyword" != "xyesyesyes"], - [AC_MSG_ERROR([Your Objective C compiler does not support the required Objective C 2 features])]) - -dnl ---------------------------------------------------------------------------- -dnl -dnl platform-specific stuff. - -AC_CANONICAL_HOST -have_msw="no" -case $host_os in - - *mingw32*) - have_msw="yes" - OBJCFLAGS="$OBJCFLAGS -mwindows" - AC_SUBST([WINDOWS]) - AC_SUBST([WIN32]) - AC_SUBST([_WIN32]) - ;; - -esac - -AM_CONDITIONAL([WINDOWS],[test "x$have_msw" = "xyes"]) - -AS_IF([test "x$with_poppler" != "xno"], - [AS_IF([test "x$have_poppler" != "xyes"], - AC_MSG_WARN([poppler-glib was not found; preview support will be disabled]) - )] - ) - -AC_OUTPUT - -# vi:sts=2:sw=2:et diff --git a/tikzit/customshape.png b/tikzit/customshape.png deleted file mode 100755 index cff8275..0000000 Binary files a/tikzit/customshape.png and /dev/null differ diff --git a/tikzit/docs/Doxyfile b/tikzit/docs/Doxyfile deleted file mode 100644 index 70a27f7..0000000 --- a/tikzit/docs/Doxyfile +++ /dev/null @@ -1,1600 +0,0 @@ -# Doxyfile 1.6.3 - -# This file describes the settings to be used by the documentation system -# doxygen (www.doxygen.org) for a project -# -# All text after a hash (#) is considered a comment and will be ignored -# The format is: -# TAG = value [value, ...] -# For lists items can also be appended using: -# TAG += value [value, ...] -# Values that contain spaces should be placed between quotes (" ") - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- - -# This tag specifies the encoding used for all characters in the config file -# that follow. The default is UTF-8 which is also the encoding used for all -# text before the first occurrence of this tag. Doxygen uses libiconv (or the -# iconv built into libc) for the transcoding. See -# http://www.gnu.org/software/libiconv for the list of possible encodings. - -DOXYFILE_ENCODING = UTF-8 - -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded -# by quotes) that should identify the project. - -PROJECT_NAME = TikZiT - -# The PROJECT_NUMBER tag can be used to enter a project or revision number. -# This could be handy for archiving the generated documentation or -# if some version control system is used. - -PROJECT_NUMBER = 0.3 - -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) -# base path where the generated documentation will be put. -# If a relative path is entered, it will be relative to the location -# where doxygen was started. If left blank the current directory will be used. - -OUTPUT_DIRECTORY = doxygen - -# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create -# 4096 sub-directories (in 2 levels) under the output directory of each output -# format and will distribute the generated files over these directories. -# Enabling this option can be useful when feeding doxygen a huge amount of -# source files, where putting all generated files in the same directory would -# otherwise cause performance problems for the file system. - -CREATE_SUBDIRS = NO - -# The OUTPUT_LANGUAGE tag is used to specify the language in which all -# documentation generated by doxygen is written. Doxygen will use this -# information to generate all constant output in the proper language. -# The default language is English, other supported languages are: -# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, -# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, -# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English -# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, -# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, -# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. - -OUTPUT_LANGUAGE = English - -# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will -# include brief member descriptions after the members that are listed in -# the file and class documentation (similar to JavaDoc). -# Set to NO to disable this. - -BRIEF_MEMBER_DESC = YES - -# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend -# the brief description of a member or function before the detailed description. -# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the -# brief descriptions will be completely suppressed. - -REPEAT_BRIEF = YES - -# This tag implements a quasi-intelligent brief description abbreviator -# that is used to form the text in various listings. Each string -# in this list, if found as the leading text of the brief description, will be -# stripped from the text and the result after processing the whole list, is -# used as the annotated text. Otherwise, the brief description is used as-is. -# If left blank, the following values are used ("$name" is automatically -# replaced with the name of the entity): "The $name class" "The $name widget" -# "The $name file" "is" "provides" "specifies" "contains" -# "represents" "a" "an" "the" - -ABBREVIATE_BRIEF = "The $name class" \ - "The $name widget" \ - "The $name file" \ - is \ - provides \ - specifies \ - contains \ - represents \ - a \ - an \ - the - -# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# Doxygen will generate a detailed section even if there is only a brief -# description. - -ALWAYS_DETAILED_SEC = NO - -# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all -# inherited members of a class in the documentation of that class as if those -# members were ordinary class members. Constructors, destructors and assignment -# operators of the base classes will not be shown. - -INLINE_INHERITED_MEMB = NO - -# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full -# path before files name in the file list and in the header files. If set -# to NO the shortest path that makes the file name unique will be used. - -FULL_PATH_NAMES = YES - -# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag -# can be used to strip a user-defined part of the path. Stripping is -# only done if one of the specified strings matches the left-hand part of -# the path. The tag can be used to show relative paths in the file list. -# If left blank the directory from which doxygen is run is used as the -# path to strip. - -STRIP_FROM_PATH = /Applications/ - -# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of -# the path mentioned in the documentation of a class, which tells -# the reader which header file to include in order to use a class. -# If left blank only the name of the header file containing the class -# definition is used. Otherwise one should specify the include paths that -# are normally passed to the compiler using the -I flag. - -STRIP_FROM_INC_PATH = - -# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter -# (but less readable) file names. This can be useful is your file systems -# doesn't support long names like on DOS, Mac, or CD-ROM. - -SHORT_NAMES = NO - -# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen -# will interpret the first line (until the first dot) of a JavaDoc-style -# comment as the brief description. If set to NO, the JavaDoc -# comments will behave just like regular Qt-style comments -# (thus requiring an explicit @brief command for a brief description.) - -JAVADOC_AUTOBRIEF = NO - -# If the QT_AUTOBRIEF tag is set to YES then Doxygen will -# interpret the first line (until the first dot) of a Qt-style -# comment as the brief description. If set to NO, the comments -# will behave just like regular Qt-style comments (thus requiring -# an explicit \brief command for a brief description.) - -QT_AUTOBRIEF = NO - -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen -# treat a multi-line C++ special comment block (i.e. a block of //! or /// -# comments) as a brief description. This used to be the default behaviour. -# The new default is to treat a multi-line C++ comment block as a detailed -# description. Set this tag to YES if you prefer the old behaviour instead. - -MULTILINE_CPP_IS_BRIEF = NO - -# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented -# member inherits the documentation from any documented member that it -# re-implements. - -INHERIT_DOCS = YES - -# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce -# a new page for each member. If set to NO, the documentation of a member will -# be part of the file/class/namespace that contains it. - -SEPARATE_MEMBER_PAGES = NO - -# The TAB_SIZE tag can be used to set the number of spaces in a tab. -# Doxygen uses this value to replace tabs by spaces in code fragments. - -TAB_SIZE = 8 - -# This tag can be used to specify a number of aliases that acts -# as commands in the documentation. An alias has the form "name=value". -# For example adding "sideeffect=\par Side Effects:\n" will allow you to -# put the command \sideeffect (or @sideeffect) in the documentation, which -# will result in a user-defined paragraph with heading "Side Effects:". -# You can put \n's in the value part of an alias to insert newlines. - -ALIASES = - -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C -# sources only. Doxygen will then generate output that is more tailored for C. -# For instance, some of the names that are used will be different. The list -# of all members will be omitted, etc. - -OPTIMIZE_OUTPUT_FOR_C = NO - -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java -# sources only. Doxygen will then generate output that is more tailored for -# Java. For instance, namespaces will be presented as packages, qualified -# scopes will look different, etc. - -OPTIMIZE_OUTPUT_JAVA = NO - -# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran -# sources only. Doxygen will then generate output that is more tailored for -# Fortran. - -OPTIMIZE_FOR_FORTRAN = NO - -# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL -# sources. Doxygen will then generate output that is tailored for -# VHDL. - -OPTIMIZE_OUTPUT_VHDL = NO - -# Doxygen selects the parser to use depending on the extension of the files it parses. -# With this tag you can assign which parser to use for a given extension. -# Doxygen has a built-in mapping, but you can override or extend it using this tag. -# The format is ext=language, where ext is a file extension, and language is one of -# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, -# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat -# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), -# use: inc=Fortran f=C. Note that for custom extensions you also need to set -# FILE_PATTERNS otherwise the files are not read by doxygen. - -EXTENSION_MAPPING = - -# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want -# to include (a tag file for) the STL sources as input, then you should -# set this tag to YES in order to let doxygen match functions declarations and -# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. -# func(std::string) {}). This also make the inheritance and collaboration -# diagrams that involve STL classes more complete and accurate. - -BUILTIN_STL_SUPPORT = NO - -# If you use Microsoft's C++/CLI language, you should set this option to YES to -# enable parsing support. - -CPP_CLI_SUPPORT = NO - -# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. -# Doxygen will parse them like normal C++ but will assume all classes use public -# instead of private inheritance when no explicit protection keyword is present. - -SIP_SUPPORT = NO - -# For Microsoft's IDL there are propget and propput attributes to indicate getter -# and setter methods for a property. Setting this option to YES (the default) -# will make doxygen to replace the get and set methods by a property in the -# documentation. This will only work if the methods are indeed getting or -# setting a simple type. If this is not the case, or you want to show the -# methods anyway, you should set this option to NO. - -IDL_PROPERTY_SUPPORT = YES - -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES, then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default -# all members of a group must be documented explicitly. - -DISTRIBUTE_GROUP_DOC = NO - -# Set the SUBGROUPING tag to YES (the default) to allow class member groups of -# the same type (for instance a group of public functions) to be put as a -# subgroup of that type (e.g. under the Public Functions section). Set it to -# NO to prevent subgrouping. Alternatively, this can be done per class using -# the \nosubgrouping command. - -SUBGROUPING = YES - -# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum -# is documented as struct, union, or enum with the name of the typedef. So -# typedef struct TypeS {} TypeT, will appear in the documentation as a struct -# with name TypeT. When disabled the typedef will appear as a member of a file, -# namespace, or class. And the struct will be named TypeS. This can typically -# be useful for C code in case the coding convention dictates that all compound -# types are typedef'ed and only the typedef is referenced, never the tag name. - -TYPEDEF_HIDES_STRUCT = NO - -# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to -# determine which symbols to keep in memory and which to flush to disk. -# When the cache is full, less often used symbols will be written to disk. -# For small to medium size projects (<1000 input files) the default value is -# probably good enough. For larger projects a too small cache size can cause -# doxygen to be busy swapping symbols to and from disk most of the time -# causing a significant performance penality. -# If the system has enough physical memory increasing the cache will improve the -# performance by keeping more symbols in memory. Note that the value works on -# a logarithmic scale so increasing the size by one will rougly double the -# memory usage. The cache size is given by this formula: -# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, -# corresponding to a cache size of 2^16 = 65536 symbols - -SYMBOL_CACHE_SIZE = 0 - -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- - -# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in -# documentation are documented, even if no documentation was available. -# Private class members and static file members will be hidden unless -# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES - -EXTRACT_ALL = YES - -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class -# will be included in the documentation. - -EXTRACT_PRIVATE = NO - -# If the EXTRACT_STATIC tag is set to YES all static members of a file -# will be included in the documentation. - -EXTRACT_STATIC = NO - -# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) -# defined locally in source files will be included in the documentation. -# If set to NO only classes defined in header files are included. - -EXTRACT_LOCAL_CLASSES = YES - -# This flag is only useful for Objective-C code. When set to YES local -# methods, which are defined in the implementation section but not in -# the interface are included in the documentation. -# If set to NO (the default) only methods in the interface are included. - -EXTRACT_LOCAL_METHODS = NO - -# If this flag is set to YES, the members of anonymous namespaces will be -# extracted and appear in the documentation as a namespace called -# 'anonymous_namespace{file}', where file will be replaced with the base -# name of the file that contains the anonymous namespace. By default -# anonymous namespace are hidden. - -EXTRACT_ANON_NSPACES = NO - -# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all -# undocumented members of documented classes, files or namespaces. -# If set to NO (the default) these members will be included in the -# various overviews, but no documentation section is generated. -# This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_MEMBERS = YES - -# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. -# If set to NO (the default) these classes will be included in the various -# overviews. This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_CLASSES = YES - -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all -# friend (class|struct|union) declarations. -# If set to NO (the default) these declarations will be included in the -# documentation. - -HIDE_FRIEND_COMPOUNDS = NO - -# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any -# documentation blocks found inside the body of a function. -# If set to NO (the default) these blocks will be appended to the -# function's detailed documentation block. - -HIDE_IN_BODY_DOCS = NO - -# The INTERNAL_DOCS tag determines if documentation -# that is typed after a \internal command is included. If the tag is set -# to NO (the default) then the documentation will be excluded. -# Set it to YES to include the internal documentation. - -INTERNAL_DOCS = NO - -# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate -# file names in lower-case letters. If set to YES upper-case letters are also -# allowed. This is useful if you have classes or files whose names only differ -# in case and if your file system supports case sensitive file names. Windows -# and Mac users are advised to set this option to NO. - -CASE_SENSE_NAMES = NO - -# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen -# will show members with their full class and namespace scopes in the -# documentation. If set to YES the scope will be hidden. - -HIDE_SCOPE_NAMES = NO - -# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen -# will put a list of the files that are included by a file in the documentation -# of that file. - -SHOW_INCLUDE_FILES = YES - -# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen -# will list include files with double quotes in the documentation -# rather than with sharp brackets. - -FORCE_LOCAL_INCLUDES = NO - -# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] -# is inserted in the documentation for inline members. - -INLINE_INFO = YES - -# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen -# will sort the (detailed) documentation of file and class members -# alphabetically by member name. If set to NO the members will appear in -# declaration order. - -SORT_MEMBER_DOCS = YES - -# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the -# brief documentation of file, namespace and class members alphabetically -# by member name. If set to NO (the default) the members will appear in -# declaration order. - -SORT_BRIEF_DOCS = NO - -# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen -# will sort the (brief and detailed) documentation of class members so that -# constructors and destructors are listed first. If set to NO (the default) -# the constructors will appear in the respective orders defined by -# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. -# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO -# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO. - -SORT_MEMBERS_CTORS_1ST = NO - -# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the -# hierarchy of group names into alphabetical order. If set to NO (the default) -# the group names will appear in their defined order. - -SORT_GROUP_NAMES = NO - -# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be -# sorted by fully-qualified names, including namespaces. If set to -# NO (the default), the class list will be sorted only by class name, -# not including the namespace part. -# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. -# Note: This option applies only to the class list, not to the -# alphabetical list. - -SORT_BY_SCOPE_NAME = NO - -# The GENERATE_TODOLIST tag can be used to enable (YES) or -# disable (NO) the todo list. This list is created by putting \todo -# commands in the documentation. - -GENERATE_TODOLIST = YES - -# The GENERATE_TESTLIST tag can be used to enable (YES) or -# disable (NO) the test list. This list is created by putting \test -# commands in the documentation. - -GENERATE_TESTLIST = YES - -# The GENERATE_BUGLIST tag can be used to enable (YES) or -# disable (NO) the bug list. This list is created by putting \bug -# commands in the documentation. - -GENERATE_BUGLIST = YES - -# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or -# disable (NO) the deprecated list. This list is created by putting -# \deprecated commands in the documentation. - -GENERATE_DEPRECATEDLIST= YES - -# The ENABLED_SECTIONS tag can be used to enable conditional -# documentation sections, marked by \if sectionname ... \endif. - -ENABLED_SECTIONS = - -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines -# the initial value of a variable or define consists of for it to appear in -# the documentation. If the initializer consists of more lines than specified -# here it will be hidden. Use a value of 0 to hide initializers completely. -# The appearance of the initializer of individual variables and defines in the -# documentation can be controlled using \showinitializer or \hideinitializer -# command in the documentation regardless of this setting. - -MAX_INITIALIZER_LINES = 30 - -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated -# at the bottom of the documentation of classes and structs. If set to YES the -# list will mention the files that were used to generate the documentation. - -SHOW_USED_FILES = YES - -# If the sources in your project are distributed over multiple directories -# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy -# in the documentation. The default is NO. - -SHOW_DIRECTORIES = NO - -# Set the SHOW_FILES tag to NO to disable the generation of the Files page. -# This will remove the Files entry from the Quick Index and from the -# Folder Tree View (if specified). The default is YES. - -SHOW_FILES = YES - -# Set the SHOW_NAMESPACES tag to NO to disable the generation of the -# Namespaces page. This will remove the Namespaces entry from the Quick Index -# and from the Folder Tree View (if specified). The default is YES. - -SHOW_NAMESPACES = YES - -# The FILE_VERSION_FILTER tag can be used to specify a program or script that -# doxygen should invoke to get the current version for each file (typically from -# the version control system). Doxygen will invoke the program by executing (via -# popen()) the command , where is the value of -# the FILE_VERSION_FILTER tag, and is the name of an input file -# provided by doxygen. Whatever the program writes to standard output -# is used as the file version. See the manual for examples. - -FILE_VERSION_FILTER = - -# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by -# doxygen. The layout file controls the global structure of the generated output files -# in an output format independent way. The create the layout file that represents -# doxygen's defaults, run doxygen with the -l option. You can optionally specify a -# file name after the option, if omitted DoxygenLayout.xml will be used as the name -# of the layout file. - -LAYOUT_FILE = - -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- - -# The QUIET tag can be used to turn on/off the messages that are generated -# by doxygen. Possible values are YES and NO. If left blank NO is used. - -QUIET = NO - -# The WARNINGS tag can be used to turn on/off the warning messages that are -# generated by doxygen. Possible values are YES and NO. If left blank -# NO is used. - -WARNINGS = YES - -# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings -# for undocumented members. If EXTRACT_ALL is set to YES then this flag will -# automatically be disabled. - -WARN_IF_UNDOCUMENTED = YES - -# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as not documenting some -# parameters in a documented function, or documenting parameters that -# don't exist or using markup commands wrongly. - -WARN_IF_DOC_ERROR = YES - -# This WARN_NO_PARAMDOC option can be abled to get warnings for -# functions that are documented, but have no documentation for their parameters -# or return value. If set to NO (the default) doxygen will only warn about -# wrong or incomplete parameter documentation, but not about the absence of -# documentation. - -WARN_NO_PARAMDOC = YES - -# The WARN_FORMAT tag determines the format of the warning messages that -# doxygen can produce. The string should contain the $file, $line, and $text -# tags, which will be replaced by the file and line number from which the -# warning originated and the warning text. Optionally the format may contain -# $version, which will be replaced by the version of the file (if it could -# be obtained via FILE_VERSION_FILTER) - -WARN_FORMAT = "$file:$line: $text" - -# The WARN_LOGFILE tag can be used to specify a file to which warning -# and error messages should be written. If left blank the output is written -# to stderr. - -WARN_LOGFILE = - -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- - -# The INPUT tag can be used to specify the files and/or directories that contain -# documented source files. You may enter file names like "myfile.cpp" or -# directories like "/usr/src/myproject". Separate the files or directories -# with spaces. - -INPUT = ../src - -# This tag can be used to specify the character encoding of the source files -# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is -# also the default input encoding. Doxygen uses libiconv (or the iconv built -# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for -# the list of possible encodings. - -INPUT_ENCODING = UTF-8 - -# If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank the following patterns are tested: -# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx -# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 - -FILE_PATTERNS = *.c \ - *.cc \ - *.cxx \ - *.cpp \ - *.c++ \ - *.d \ - *.java \ - *.ii \ - *.ixx \ - *.ipp \ - *.i++ \ - *.inl \ - *.h \ - *.hh \ - *.hxx \ - *.hpp \ - *.h++ \ - *.idl \ - *.odl \ - *.cs \ - *.php \ - *.php3 \ - *.inc \ - *.m \ - *.mm \ - *.dox \ - *.py \ - *.f90 \ - *.f \ - *.vhd \ - *.vhdl - -# The RECURSIVE tag can be used to turn specify whether or not subdirectories -# should be searched for input files as well. Possible values are YES and NO. -# If left blank NO is used. - -RECURSIVE = YES - -# The EXCLUDE tag can be used to specify files and/or directories that should -# excluded from the INPUT source files. This way you can easily exclude a -# subdirectory from a directory tree whose root is specified with the INPUT tag. - -EXCLUDE = ../src/ParseKit - -# The EXCLUDE_SYMLINKS tag can be used select whether or not files or -# directories that are symbolic links (a Unix filesystem feature) are excluded -# from the input. - -EXCLUDE_SYMLINKS = NO - -# If the value of the INPUT tag contains directories, you can use the -# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. Note that the wildcards are matched -# against the file with absolute path, so to exclude all test directories -# for example use the pattern */test/* - -EXCLUDE_PATTERNS = - -# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names -# (namespaces, classes, functions, etc.) that should be excluded from the -# output. The symbol name can be a fully qualified name, a word, or if the -# wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test - -EXCLUDE_SYMBOLS = - -# The EXAMPLE_PATH tag can be used to specify one or more files or -# directories that contain example code fragments that are included (see -# the \include command). - -EXAMPLE_PATH = - -# If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank all files are included. - -EXAMPLE_PATTERNS = * - -# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be -# searched for input files to be used with the \include or \dontinclude -# commands irrespective of the value of the RECURSIVE tag. -# Possible values are YES and NO. If left blank NO is used. - -EXAMPLE_RECURSIVE = NO - -# The IMAGE_PATH tag can be used to specify one or more files or -# directories that contain image that are included in the documentation (see -# the \image command). - -IMAGE_PATH = - -# The INPUT_FILTER tag can be used to specify a program that doxygen should -# invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command , where -# is the value of the INPUT_FILTER tag, and is the name of an -# input file. Doxygen will then use the output that the filter program writes -# to standard output. If FILTER_PATTERNS is specified, this tag will be -# ignored. - -INPUT_FILTER = - -# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern -# basis. Doxygen will compare the file name with each pattern and apply the -# filter if there is a match. The filters are a list of the form: -# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further -# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER -# is applied to all files. - -FILTER_PATTERNS = - -# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER) will be used to filter the input files when producing source -# files to browse (i.e. when SOURCE_BROWSER is set to YES). - -FILTER_SOURCE_FILES = NO - -#--------------------------------------------------------------------------- -# configuration options related to source browsing -#--------------------------------------------------------------------------- - -# If the SOURCE_BROWSER tag is set to YES then a list of source files will -# be generated. Documented entities will be cross-referenced with these sources. -# Note: To get rid of all source code in the generated output, make sure also -# VERBATIM_HEADERS is set to NO. - -SOURCE_BROWSER = YES - -# Setting the INLINE_SOURCES tag to YES will include the body -# of functions and classes directly in the documentation. - -INLINE_SOURCES = NO - -# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct -# doxygen to hide any special comment blocks from generated source code -# fragments. Normal C and C++ comments will always remain visible. - -STRIP_CODE_COMMENTS = YES - -# If the REFERENCED_BY_RELATION tag is set to YES -# then for each documented function all documented -# functions referencing it will be listed. - -REFERENCED_BY_RELATION = NO - -# If the REFERENCES_RELATION tag is set to YES -# then for each documented function all documented entities -# called/used by that function will be listed. - -REFERENCES_RELATION = NO - -# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) -# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from -# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will -# link to the source code. Otherwise they will link to the documentation. - -REFERENCES_LINK_SOURCE = YES - -# If the USE_HTAGS tag is set to YES then the references to source code -# will point to the HTML generated by the htags(1) tool instead of doxygen -# built-in source browser. The htags tool is part of GNU's global source -# tagging system (see http://www.gnu.org/software/global/global.html). You -# will need version 4.8.6 or higher. - -USE_HTAGS = NO - -# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen -# will generate a verbatim copy of the header file for each class for -# which an include is specified. Set to NO to disable this. - -VERBATIM_HEADERS = NO - -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- - -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index -# of all compounds will be generated. Enable this if the project -# contains a lot of classes, structs, unions or interfaces. - -ALPHABETICAL_INDEX = NO - -# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then -# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns -# in which this list will be split (can be a number in the range [1..20]) - -COLS_IN_ALPHA_INDEX = 5 - -# In case all classes in a project start with a common prefix, all -# classes will be put under the same header in the alphabetical index. -# The IGNORE_PREFIX tag can be used to specify one or more prefixes that -# should be ignored while generating the index headers. - -IGNORE_PREFIX = - -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- - -# If the GENERATE_HTML tag is set to YES (the default) Doxygen will -# generate HTML output. - -GENERATE_HTML = YES - -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `html' will be used as the default path. - -HTML_OUTPUT = html - -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for -# each generated HTML page (for example: .htm,.php,.asp). If it is left blank -# doxygen will generate files with .html extension. - -HTML_FILE_EXTENSION = .html - -# The HTML_HEADER tag can be used to specify a personal HTML header for -# each generated HTML page. If it is left blank doxygen will generate a -# standard header. - -HTML_HEADER = - -# The HTML_FOOTER tag can be used to specify a personal HTML footer for -# each generated HTML page. If it is left blank doxygen will generate a -# standard footer. - -HTML_FOOTER = - -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading -# style sheet that is used by each HTML page. It can be used to -# fine-tune the look of the HTML output. If the tag is left blank doxygen -# will generate a default style sheet. Note that doxygen will try to copy -# the style sheet file to the HTML output directory, so don't put your own -# stylesheet in the HTML output directory as well, or it will be erased! - -HTML_STYLESHEET = - -# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML -# page will contain the date and time when the page was generated. Setting -# this to NO can help when comparing the output of multiple runs. - -HTML_TIMESTAMP = YES - -# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, -# files or namespaces will be aligned in HTML using tables. If set to -# NO a bullet list will be used. - -HTML_ALIGN_MEMBERS = YES - -# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML -# documentation will contain sections that can be hidden and shown after the -# page has loaded. For this to work a browser that supports -# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox -# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). - -HTML_DYNAMIC_SECTIONS = NO - -# If the GENERATE_DOCSET tag is set to YES, additional index files -# will be generated that can be used as input for Apple's Xcode 3 -# integrated development environment, introduced with OSX 10.5 (Leopard). -# To create a documentation set, doxygen will generate a Makefile in the -# HTML output directory. Running make will produce the docset in that -# directory and running "make install" will install the docset in -# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find -# it at startup. -# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information. - -GENERATE_DOCSET = NO - -# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the -# feed. A documentation feed provides an umbrella under which multiple -# documentation sets from a single provider (such as a company or product suite) -# can be grouped. - -DOCSET_FEEDNAME = "Doxygen generated docs" - -# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that -# should uniquely identify the documentation set bundle. This should be a -# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen -# will append .docset to the name. - -DOCSET_BUNDLE_ID = org.doxygen.Project - -# If the GENERATE_HTMLHELP tag is set to YES, additional index files -# will be generated that can be used as input for tools like the -# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) -# of the generated HTML documentation. - -GENERATE_HTMLHELP = NO - -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can -# be used to specify the file name of the resulting .chm file. You -# can add a path in front of the file if the result should not be -# written to the html output directory. - -CHM_FILE = - -# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can -# be used to specify the location (absolute path including file name) of -# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run -# the HTML help compiler on the generated index.hhp. - -HHC_LOCATION = - -# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag -# controls if a separate .chi index file is generated (YES) or that -# it should be included in the master .chm file (NO). - -GENERATE_CHI = NO - -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING -# is used to encode HtmlHelp index (hhk), content (hhc) and project file -# content. - -CHM_INDEX_ENCODING = - -# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag -# controls whether a binary table of contents is generated (YES) or a -# normal table of contents (NO) in the .chm file. - -BINARY_TOC = NO - -# The TOC_EXPAND flag can be set to YES to add extra items for group members -# to the contents of the HTML help documentation and to the tree view. - -TOC_EXPAND = NO - -# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER -# are set, an additional index file will be generated that can be used as input for -# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated -# HTML documentation. - -GENERATE_QHP = NO - -# If the QHG_LOCATION tag is specified, the QCH_FILE tag can -# be used to specify the file name of the resulting .qch file. -# The path specified is relative to the HTML output folder. - -QCH_FILE = - -# The QHP_NAMESPACE tag specifies the namespace to use when generating -# Qt Help Project output. For more information please see -# http://doc.trolltech.com/qthelpproject.html#namespace - -QHP_NAMESPACE = org.doxygen.Project - -# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating -# Qt Help Project output. For more information please see -# http://doc.trolltech.com/qthelpproject.html#virtual-folders - -QHP_VIRTUAL_FOLDER = doc - -# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add. -# For more information please see -# http://doc.trolltech.com/qthelpproject.html#custom-filters - -QHP_CUST_FILTER_NAME = - -# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see -# Qt Help Project / Custom Filters. - -QHP_CUST_FILTER_ATTRS = - -# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's -# filter section matches. -# Qt Help Project / Filter Attributes. - -QHP_SECT_FILTER_ATTRS = - -# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can -# be used to specify the location of Qt's qhelpgenerator. -# If non-empty doxygen will try to run qhelpgenerator on the generated -# .qhp file. - -QHG_LOCATION = - -# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files -# will be generated, which together with the HTML files, form an Eclipse help -# plugin. To install this plugin and make it available under the help contents -# menu in Eclipse, the contents of the directory containing the HTML and XML -# files needs to be copied into the plugins directory of eclipse. The name of -# the directory within the plugins directory should be the same as -# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before -# the help appears. - -GENERATE_ECLIPSEHELP = NO - -# A unique identifier for the eclipse help plugin. When installing the plugin -# the directory name containing the HTML and XML files should also have -# this name. - -ECLIPSE_DOC_ID = org.doxygen.Project - -# The DISABLE_INDEX tag can be used to turn on/off the condensed index at -# top of each HTML page. The value NO (the default) enables the index and -# the value YES disables it. - -DISABLE_INDEX = NO - -# This tag can be used to set the number of enum values (range [1..20]) -# that doxygen will group on one line in the generated HTML documentation. - -ENUM_VALUES_PER_LINE = 4 - -# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index -# structure should be generated to display hierarchical information. -# If the tag value is set to YES, a side panel will be generated -# containing a tree-like index structure (just like the one that -# is generated for HTML Help). For this to work a browser that supports -# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). -# Windows users are probably better off using the HTML help feature. - -GENERATE_TREEVIEW = NO - -# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, -# and Class Hierarchy pages using a tree view instead of an ordered list. - -USE_INLINE_TREES = NO - -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be -# used to set the initial width (in pixels) of the frame in which the tree -# is shown. - -TREEVIEW_WIDTH = 250 - -# Use this tag to change the font size of Latex formulas included -# as images in the HTML documentation. The default is 10. Note that -# when you change the font size after a successful doxygen run you need -# to manually remove any form_*.png images from the HTML output directory -# to force them to be regenerated. - -FORMULA_FONTSIZE = 10 - -# When the SEARCHENGINE tag is enabled doxygen will generate a search box -# for the HTML output. The underlying search engine uses javascript -# and DHTML and should work on any modern browser. Note that when using -# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets -# (GENERATE_DOCSET) there is already a search function so this one should -# typically be disabled. For large projects the javascript based search engine -# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. - -SEARCHENGINE = NO - -# When the SERVER_BASED_SEARCH tag is enabled the search engine will be -# implemented using a PHP enabled web server instead of at the web client -# using Javascript. Doxygen will generate the search PHP script and index -# file to put on the web server. The advantage of the server -# based approach is that it scales better to large projects and allows -# full text search. The disadvances is that it is more difficult to setup -# and does not have live searching capabilities. - -SERVER_BASED_SEARCH = NO - -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- - -# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will -# generate Latex output. - -GENERATE_LATEX = NO - -# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `latex' will be used as the default path. - -LATEX_OUTPUT = latex - -# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be -# invoked. If left blank `latex' will be used as the default command name. -# Note that when enabling USE_PDFLATEX this option is only used for -# generating bitmaps for formulas in the HTML output, but not in the -# Makefile that is written to the output directory. - -LATEX_CMD_NAME = latex - -# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to -# generate index for LaTeX. If left blank `makeindex' will be used as the -# default command name. - -MAKEINDEX_CMD_NAME = makeindex - -# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact -# LaTeX documents. This may be useful for small projects and may help to -# save some trees in general. - -COMPACT_LATEX = NO - -# The PAPER_TYPE tag can be used to set the paper type that is used -# by the printer. Possible values are: a4, a4wide, letter, legal and -# executive. If left blank a4wide will be used. - -PAPER_TYPE = a4wide - -# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX -# packages that should be included in the LaTeX output. - -EXTRA_PACKAGES = - -# The LATEX_HEADER tag can be used to specify a personal LaTeX header for -# the generated latex document. The header should contain everything until -# the first chapter. If it is left blank doxygen will generate a -# standard header. Notice: only use this tag if you know what you are doing! - -LATEX_HEADER = - -# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated -# is prepared for conversion to pdf (using ps2pdf). The pdf file will -# contain links (just like the HTML output) instead of page references -# This makes the output suitable for online browsing using a pdf viewer. - -PDF_HYPERLINKS = YES - -# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of -# plain latex in the generated Makefile. Set this option to YES to get a -# higher quality PDF documentation. - -USE_PDFLATEX = YES - -# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. -# command to the generated LaTeX files. This will instruct LaTeX to keep -# running if errors occur, instead of asking the user for help. -# This option is also used when generating formulas in HTML. - -LATEX_BATCHMODE = NO - -# If LATEX_HIDE_INDICES is set to YES then doxygen will not -# include the index chapters (such as File Index, Compound Index, etc.) -# in the output. - -LATEX_HIDE_INDICES = NO - -# If LATEX_SOURCE_CODE is set to YES then doxygen will include -# source code with syntax highlighting in the LaTeX output. -# Note that which sources are shown also depends on other settings -# such as SOURCE_BROWSER. - -LATEX_SOURCE_CODE = NO - -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- - -# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output -# The RTF output is optimized for Word 97 and may not look very pretty with -# other RTF readers or editors. - -GENERATE_RTF = NO - -# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `rtf' will be used as the default path. - -RTF_OUTPUT = rtf - -# If the COMPACT_RTF tag is set to YES Doxygen generates more compact -# RTF documents. This may be useful for small projects and may help to -# save some trees in general. - -COMPACT_RTF = NO - -# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated -# will contain hyperlink fields. The RTF file will -# contain links (just like the HTML output) instead of page references. -# This makes the output suitable for online browsing using WORD or other -# programs which support those fields. -# Note: wordpad (write) and others do not support links. - -RTF_HYPERLINKS = NO - -# Load stylesheet definitions from file. Syntax is similar to doxygen's -# config file, i.e. a series of assignments. You only have to provide -# replacements, missing definitions are set to their default value. - -RTF_STYLESHEET_FILE = - -# Set optional variables used in the generation of an rtf document. -# Syntax is similar to doxygen's config file. - -RTF_EXTENSIONS_FILE = - -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- - -# If the GENERATE_MAN tag is set to YES (the default) Doxygen will -# generate man pages - -GENERATE_MAN = NO - -# The MAN_OUTPUT tag is used to specify where the man pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `man' will be used as the default path. - -MAN_OUTPUT = man - -# The MAN_EXTENSION tag determines the extension that is added to -# the generated man pages (default is the subroutine's section .3) - -MAN_EXTENSION = .3 - -# If the MAN_LINKS tag is set to YES and Doxygen generates man output, -# then it will generate one additional man file for each entity -# documented in the real man page(s). These additional files -# only source the real man page, but without them the man command -# would be unable to find the correct page. The default is NO. - -MAN_LINKS = NO - -#--------------------------------------------------------------------------- -# configuration options related to the XML output -#--------------------------------------------------------------------------- - -# If the GENERATE_XML tag is set to YES Doxygen will -# generate an XML file that captures the structure of -# the code including all documentation. - -GENERATE_XML = YES - -# The XML_OUTPUT tag is used to specify where the XML pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `xml' will be used as the default path. - -XML_OUTPUT = xml - -# The XML_SCHEMA tag can be used to specify an XML schema, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_SCHEMA = - -# The XML_DTD tag can be used to specify an XML DTD, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_DTD = - -# If the XML_PROGRAMLISTING tag is set to YES Doxygen will -# dump the program listings (including syntax highlighting -# and cross-referencing information) to the XML output. Note that -# enabling this will significantly increase the size of the XML output. - -XML_PROGRAMLISTING = YES - -#--------------------------------------------------------------------------- -# configuration options for the AutoGen Definitions output -#--------------------------------------------------------------------------- - -# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will -# generate an AutoGen Definitions (see autogen.sf.net) file -# that captures the structure of the code including all -# documentation. Note that this feature is still experimental -# and incomplete at the moment. - -GENERATE_AUTOGEN_DEF = NO - -#--------------------------------------------------------------------------- -# configuration options related to the Perl module output -#--------------------------------------------------------------------------- - -# If the GENERATE_PERLMOD tag is set to YES Doxygen will -# generate a Perl module file that captures the structure of -# the code including all documentation. Note that this -# feature is still experimental and incomplete at the -# moment. - -GENERATE_PERLMOD = NO - -# If the PERLMOD_LATEX tag is set to YES Doxygen will generate -# the necessary Makefile rules, Perl scripts and LaTeX code to be able -# to generate PDF and DVI output from the Perl module output. - -PERLMOD_LATEX = NO - -# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be -# nicely formatted so it can be parsed by a human reader. This is useful -# if you want to understand what is going on. On the other hand, if this -# tag is set to NO the size of the Perl module output will be much smaller -# and Perl will parse it just the same. - -PERLMOD_PRETTY = YES - -# The names of the make variables in the generated doxyrules.make file -# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. -# This is useful so different doxyrules.make files included by the same -# Makefile don't overwrite each other's variables. - -PERLMOD_MAKEVAR_PREFIX = - -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- - -# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will -# evaluate all C-preprocessor directives found in the sources and include -# files. - -ENABLE_PREPROCESSING = YES - -# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro -# names in the source code. If set to NO (the default) only conditional -# compilation will be performed. Macro expansion can be done in a controlled -# way by setting EXPAND_ONLY_PREDEF to YES. - -MACRO_EXPANSION = NO - -# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES -# then the macro expansion is limited to the macros specified with the -# PREDEFINED and EXPAND_AS_DEFINED tags. - -EXPAND_ONLY_PREDEF = NO - -# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files -# in the INCLUDE_PATH (see below) will be search if a #include is found. - -SEARCH_INCLUDES = YES - -# The INCLUDE_PATH tag can be used to specify one or more directories that -# contain include files that are not input files but should be processed by -# the preprocessor. - -INCLUDE_PATH = - -# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard -# patterns (like *.h and *.hpp) to filter out the header-files in the -# directories. If left blank, the patterns specified with FILE_PATTERNS will -# be used. - -INCLUDE_FILE_PATTERNS = - -# The PREDEFINED tag can be used to specify one or more macro names that -# are defined before the preprocessor is started (similar to the -D option of -# gcc). The argument of the tag is a list of macros of the form: name -# or name=definition (no spaces). If the definition and the = are -# omitted =1 is assumed. To prevent a macro definition from being -# undefined via #undef or recursively expanded use the := operator -# instead of the = operator. - -PREDEFINED = __APPLE__ - -# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then -# this tag can be used to specify a list of macro names that should be expanded. -# The macro definition that is found in the sources will be used. -# Use the PREDEFINED tag if you want to use a different macro definition. - -EXPAND_AS_DEFINED = - -# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then -# doxygen's preprocessor will remove all function-like macros that are alone -# on a line, have an all uppercase name, and do not end with a semicolon. Such -# function macros are typically used for boiler-plate code, and will confuse -# the parser if not removed. - -SKIP_FUNCTION_MACROS = YES - -#--------------------------------------------------------------------------- -# Configuration::additions related to external references -#--------------------------------------------------------------------------- - -# The TAGFILES option can be used to specify one or more tagfiles. -# Optionally an initial location of the external documentation -# can be added for each tagfile. The format of a tag file without -# this location is as follows: -# TAGFILES = file1 file2 ... -# Adding location for the tag files is done as follows: -# TAGFILES = file1=loc1 "file2 = loc2" ... -# where "loc1" and "loc2" can be relative or absolute paths or -# URLs. If a location is present for each tag, the installdox tool -# does not have to be run to correct the links. -# Note that each tag file must have a unique name -# (where the name does NOT include the path) -# If a tag file is not located in the directory in which doxygen -# is run, you must also specify the path to the tagfile here. - -TAGFILES = - -# When a file name is specified after GENERATE_TAGFILE, doxygen will create -# a tag file that is based on the input files it reads. - -GENERATE_TAGFILE = - -# If the ALLEXTERNALS tag is set to YES all external classes will be listed -# in the class index. If set to NO only the inherited external classes -# will be listed. - -ALLEXTERNALS = NO - -# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed -# in the modules index. If set to NO, only the current project's groups will -# be listed. - -EXTERNAL_GROUPS = YES - -# The PERL_PATH should be the absolute path and name of the perl script -# interpreter (i.e. the result of `which perl'). - -PERL_PATH = /usr/bin/perl - -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- - -# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will -# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base -# or super classes. Setting the tag to NO turns the diagrams off. Note that -# this option is superseded by the HAVE_DOT option below. This is only a -# fallback. It is recommended to install and use dot, since it yields more -# powerful graphs. - -CLASS_DIAGRAMS = NO - -# You can define message sequence charts within doxygen comments using the \msc -# command. Doxygen will then run the mscgen tool (see -# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the -# documentation. The MSCGEN_PATH tag allows you to specify the directory where -# the mscgen tool resides. If left empty the tool is assumed to be found in the -# default search path. - -MSCGEN_PATH = /Applications/Doxygen.app/Contents/Resources/ - -# If set to YES, the inheritance and collaboration graphs will hide -# inheritance and usage relations if the target is undocumented -# or is not a class. - -HIDE_UNDOC_RELATIONS = YES - -# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is -# available from the path. This tool is part of Graphviz, a graph visualization -# toolkit from AT&T and Lucent Bell Labs. The other options in this section -# have no effect if this option is set to NO (the default) - -HAVE_DOT = YES - -# By default doxygen will write a font called FreeSans.ttf to the output -# directory and reference it in all dot files that doxygen generates. This -# font does not include all possible unicode characters however, so when you need -# these (or just want a differently looking font) you can specify the font name -# using DOT_FONTNAME. You need need to make sure dot is able to find the font, -# which can be done by putting it in a standard location or by setting the -# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory -# containing the font. - -DOT_FONTNAME = FreeSans - -# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. -# The default size is 10pt. - -DOT_FONTSIZE = 10 - -# By default doxygen will tell dot to use the output directory to look for the -# FreeSans.ttf font (which doxygen will put there itself). If you specify a -# different font using DOT_FONTNAME you can set the path where dot -# can find it using this tag. - -DOT_FONTPATH = - -# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect inheritance relations. Setting this tag to YES will force the -# the CLASS_DIAGRAMS tag to NO. - -CLASS_GRAPH = YES - -# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect implementation dependencies (inheritance, containment, and -# class references variables) of the class with other documented classes. - -COLLABORATION_GRAPH = YES - -# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for groups, showing the direct groups dependencies - -GROUP_GRAPHS = YES - -# If the UML_LOOK tag is set to YES doxygen will generate inheritance and -# collaboration diagrams in a style similar to the OMG's Unified Modeling -# Language. - -UML_LOOK = NO - -# If set to YES, the inheritance and collaboration graphs will show the -# relations between templates and their instances. - -TEMPLATE_RELATIONS = NO - -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT -# tags are set to YES then doxygen will generate a graph for each documented -# file showing the direct and indirect include dependencies of the file with -# other documented files. - -INCLUDE_GRAPH = YES - -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and -# HAVE_DOT tags are set to YES then doxygen will generate a graph for each -# documented header file showing the documented files that directly or -# indirectly include this file. - -INCLUDED_BY_GRAPH = YES - -# If the CALL_GRAPH and HAVE_DOT options are set to YES then -# doxygen will generate a call dependency graph for every global function -# or class method. Note that enabling this option will significantly increase -# the time of a run. So in most cases it will be better to enable call graphs -# for selected functions only using the \callgraph command. - -CALL_GRAPH = YES - -# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then -# doxygen will generate a caller dependency graph for every global function -# or class method. Note that enabling this option will significantly increase -# the time of a run. So in most cases it will be better to enable caller -# graphs for selected functions only using the \callergraph command. - -CALLER_GRAPH = NO - -# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen -# will graphical hierarchy of all classes instead of a textual one. - -GRAPHICAL_HIERARCHY = YES - -# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES -# then doxygen will show the dependencies a directory has on other directories -# in a graphical way. The dependency relations are determined by the #include -# relations between the files in the directories. - -DIRECTORY_GRAPH = YES - -# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images -# generated by dot. Possible values are png, jpg, or gif -# If left blank png will be used. - -DOT_IMAGE_FORMAT = png - -# The tag DOT_PATH can be used to specify the path where the dot tool can be -# found. If left blank, it is assumed the dot tool can be found in the path. - -DOT_PATH = /Applications/Doxygen.app/Contents/Resources/ - -# The DOTFILE_DIRS tag can be used to specify one or more directories that -# contain dot files that are included in the documentation (see the -# \dotfile command). - -DOTFILE_DIRS = - -# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of -# nodes that will be shown in the graph. If the number of nodes in a graph -# becomes larger than this value, doxygen will truncate the graph, which is -# visualized by representing a node as a red box. Note that doxygen if the -# number of direct children of the root node in a graph is already larger than -# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note -# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. - -DOT_GRAPH_MAX_NODES = 50 - -# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the -# graphs generated by dot. A depth value of 3 means that only nodes reachable -# from the root by following a path via at most 3 edges will be shown. Nodes -# that lay further from the root node will be omitted. Note that setting this -# option to 1 or 2 may greatly reduce the computation time needed for large -# code bases. Also note that the size of a graph can be further restricted by -# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. - -MAX_DOT_GRAPH_DEPTH = 1000 - -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not -# seem to support this out of the box. Warning: Depending on the platform used, -# enabling this option may lead to badly anti-aliased labels on the edges of -# a graph (i.e. they become hard to read). - -DOT_TRANSPARENT = NO - -# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output -# files in one run (i.e. multiple -o and -T options on the command line). This -# makes dot run faster, but since only newer versions of dot (>1.8.10) -# support this, this feature is disabled by default. - -DOT_MULTI_TARGETS = NO - -# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will -# generate a legend page explaining the meaning of the various boxes and -# arrows in the dot generated graphs. - -GENERATE_LEGEND = YES - -# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will -# remove the intermediate dot files that are used to generate -# the various graphs. - -DOT_CLEANUP = YES diff --git a/tikzit/draw-ellipse.png b/tikzit/draw-ellipse.png deleted file mode 100644 index d8e3e6f..0000000 Binary files a/tikzit/draw-ellipse.png and /dev/null differ diff --git a/tikzit/draw-path.png b/tikzit/draw-path.png deleted file mode 100644 index ec5e691..0000000 Binary files a/tikzit/draw-path.png and /dev/null differ diff --git a/tikzit/emblem-important.png b/tikzit/emblem-important.png deleted file mode 100644 index 81e9ed2..0000000 Binary files a/tikzit/emblem-important.png and /dev/null differ diff --git a/tikzit/emblem-unreadable-grey.png b/tikzit/emblem-unreadable-grey.png deleted file mode 100644 index 09572ab..0000000 Binary files a/tikzit/emblem-unreadable-grey.png and /dev/null differ diff --git a/tikzit/engine.png b/tikzit/engine.png deleted file mode 100755 index 1e45370..0000000 Binary files a/tikzit/engine.png and /dev/null differ diff --git a/tikzit/format-indent-less.png b/tikzit/format-indent-less.png deleted file mode 100644 index 7ced16f..0000000 Binary files a/tikzit/format-indent-less.png and /dev/null differ diff --git a/tikzit/m4/objc.m4 b/tikzit/m4/objc.m4 deleted file mode 100644 index 8c7cc78..0000000 --- a/tikzit/m4/objc.m4 +++ /dev/null @@ -1,135 +0,0 @@ -# Checks for a working Foundation -# tz_cv_objc_foundation -# to either "yes" or "no" -# -AC_DEFUN([TZ_OBJC_FOUNDATION], -[ -AC_LANG_ASSERT([Objective C]) -tz_old_objcflags="$OBJCFLAGS" -OBJCFLAGS="$OBJCFLAGS $TZ_TEST_OBJCFLAGS" - -AC_CACHE_CHECK([for Objective C Foundation], - [tz_cv_objc_foundation], -[AC_COMPILE_IFELSE( - [AC_LANG_SOURCE([[ -#import - -@interface TestObj : NSObject { - int intVar; - NSObject *objVar; - NSString *strVar; -} --(id)init; -@end - -@implementation TestObj --(id)init { - self = [super init]; - intVar = 0; - objVar = nil; - strVar = @"Foo"; - return self; -} -@end - -int main(void) { - TestObj *obj = [[TestObj alloc] init]; - [obj release]; - return 0; -} - ]])], - [tz_cv_objc_foundation=yes], - [tz_cv_objc_foundation=no])]) - -OBJCFLAGS="$tz_old_objcflags" -]) - - -# Checks for Objective C 2 feature support -# and sets the shell variables -# tz_cv_objc_properties -# tz_cv_objc_fast_enumeration -# tz_cv_objc_optional_keyword -# to either "yes" or "no" -# -AC_DEFUN([TZ_OBJC2_FEATURES], -[ -AC_LANG_ASSERT([Objective C]) -tz_old_objcflags="$OBJCFLAGS" -OBJCFLAGS="$OBJCFLAGS $TZ_TEST_OBJCFLAGS" - -AC_CACHE_CHECK([for Objective C 2 @property support], - [tz_cv_objc_properties], -[AC_COMPILE_IFELSE( - [AC_LANG_SOURCE([[ -#import - -@interface TestObj : NSObject { - int intProp1; - NSObject *copyObjProp; - NSObject *fooProp; -} -@property (assign,nonatomic) int intProp; -@property (retain,readonly) NSObject *retainObjProp; -@property (copy,readwrite) NSObject *copyObjProp; -@property (retain,getter=foo,setter=foo1:) NSObject *fooProp; -@end - -@implementation TestObj -@synthesize intProp=intProp1; -@dynamic retainObjProp; -- (NSObject*) retainObjProp { return nil; } -@synthesize copyObjProp; -@synthesize fooProp; -@end - -int main(void) { - TestObj *obj = [[TestObj alloc] init]; - obj.intProp = 4; - NSObject *result = obj.retainObjProp; - return 0; -} - ]])], - [tz_cv_objc_properties=yes], - [tz_cv_objc_properties=no])]) - - -AC_CACHE_CHECK([for Objective C 2 fast enumeration support], - [tz_cv_objc_fast_enumeration], -[AC_COMPILE_IFELSE( - [AC_LANG_SOURCE([[ -#import - -int main(void) { - NSArray *array = [NSArray arrayWithObjects: @"One", @"Two", @"Three", @"Four", nil]; - for (NSString *element in array) { - NSLog(@"element: %@", element); - } - return 0; -} - ]])], - [tz_cv_objc_fast_enumeration=yes], - [tz_cv_objc_fast_enumeration=no])]) - -AC_CACHE_CHECK([for Objective C 2 @optional support], - [tz_cv_objc_optional_keyword], -[AC_COMPILE_IFELSE( - [AC_LANG_SOURCE([[ -#import - -@protocol Foo -@optional -- (void) foo; -@required -- (void) bar; -@end - -int main(void) { - return 0; -} - ]])], - [tz_cv_objc_optional_keyword=yes], - [tz_cv_objc_optional_keyword=no])]) - -OBJCFLAGS="$tz_old_objcflags" -]) diff --git a/tikzit/preamble.png b/tikzit/preamble.png deleted file mode 100755 index d940d24..0000000 Binary files a/tikzit/preamble.png and /dev/null differ diff --git a/tikzit/scripts/generate_keys.rb b/tikzit/scripts/generate_keys.rb deleted file mode 100755 index b22439c..0000000 --- a/tikzit/scripts/generate_keys.rb +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/ruby -["dsaparam.pem", "dsa_priv.pem", "dsa_pub.pem"].each do |file| - if File.exist? file - puts "There's already a #{file} here! Move it aside or be more careful!" - end -end -`openssl dsaparam 2048 < /dev/urandom > dsaparam.pem` -`openssl gendsa dsaparam.pem -out dsa_priv.pem` -`openssl dsa -in dsa_priv.pem -pubout -out dsa_pub.pem` -`rm dsaparam.pem` -puts "\nGenerated private and public keys: dsa_priv.pem and dsa_pub.pem.\n -BACK UP YOUR PRIVATE KEY AND KEEP IT SAFE!\n -If you lose it, your users will be unable to upgrade!\n" \ No newline at end of file diff --git a/tikzit/scripts/prepare_release.sh b/tikzit/scripts/prepare_release.sh deleted file mode 100755 index 5f5edfc..0000000 --- a/tikzit/scripts/prepare_release.sh +++ /dev/null @@ -1,40 +0,0 @@ -set -o errexit - -PROJECT_NAME=TikZiT -APP_BUNDLE=xbuild/Release/$PROJECT_NAME.app - -VERSION=$(defaults read "$(pwd)/$APP_BUNDLE/Contents/Info" CFBundleVersion) -DOWNLOAD_BASE_URL="http://tikzit.sourceforge.net/appcast" -RELEASENOTES_URL="$DOWNLOAD_BASE_URL/rnotes.html" - -ARCHIVE_FILENAME="$PROJECT_NAME $VERSION.tar.bz2" -ARCHIVE_PATH="../www/htdocs/appcast/files/$ARCHIVE_FILENAME" -DOWNLOAD_URL="$DOWNLOAD_BASE_URL/files/$ARCHIVE_FILENAME" - -if [ -e "$ARCHIVE_PATH" ]; then - echo 'Archive already exists. Either remove this archive or increment version.' - exit 1 -fi - -tar cjf "$ARCHIVE_PATH" "$APP_BUNDLE" - -SIZE=$(stat -f %z "$ARCHIVE_PATH") -PUBDATE=$(LC_TIME=en_US date +"%a, %d %b %G %T %z") -SIGNATURE=$(scripts/sign_update.rb "$ARCHIVE_PATH" tikzit_dsa_priv.pem) - -cat < - Version $VERSION - - $RELEASENOTES_URL - - $PUBDATE - - -EOF diff --git a/tikzit/scripts/sign_update.rb b/tikzit/scripts/sign_update.rb deleted file mode 100755 index 6d03e2e..0000000 --- a/tikzit/scripts/sign_update.rb +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/ruby -if ARGV.length < 2 - puts "Usage: ruby sign_update.rb update_archive private_key" - exit -end - -puts `openssl dgst -sha1 -binary < "#{ARGV[0]}" | openssl dgst -dss1 -sign "#{ARGV[1]}" | openssl enc -base64` \ No newline at end of file diff --git a/tikzit/select-rectangular.png b/tikzit/select-rectangular.png deleted file mode 100644 index 866b602..0000000 Binary files a/tikzit/select-rectangular.png and /dev/null differ diff --git a/tikzit/shapes/cap.tikz b/tikzit/shapes/cap.tikz deleted file mode 100644 index a98ff39..0000000 --- a/tikzit/shapes/cap.tikz +++ /dev/null @@ -1,13 +0,0 @@ -\begin{tikzpicture} - \path [use as bounding box] (-2,-2) rectangle (2,2); - \begin{pgfonlayer}{nodelayer} - \node [style=none] (0) at (0, 0.75) {}; - \node [style=none] (1) at (-0.5, 0) {}; - \node [style=none] (2) at (0.5, 0) {}; - \end{pgfonlayer} - \begin{pgfonlayer}{edgelayer} - \draw [in=0, out=90] (2.center) to (0.center); - \draw [in=270, out=-90, looseness=0.75] (1.center) to (2.center); - \draw [in=90, out=180] (0.center) to (1.center); - \end{pgfonlayer} -\end{tikzpicture} \ No newline at end of file diff --git a/tikzit/shapes/copants.tikz b/tikzit/shapes/copants.tikz deleted file mode 100644 index d2b8e3c..0000000 --- a/tikzit/shapes/copants.tikz +++ /dev/null @@ -1,19 +0,0 @@ -\begin{tikzpicture} - \path [use as bounding box] (-2,-2) rectangle (2,2); - \begin{pgfonlayer}{nodelayer} - \node [style=none] (0) at (-1.5, 1) {}; - \node [style=none] (1) at (-0.5, 1) {}; - \node [style=none] (2) at (0.5, 1) {}; - \node [style=none] (3) at (1.5, 1) {}; - \node [style=none] (4) at (-0.5, -1) {}; - \node [style=none] (5) at (0.5, -1) {}; - \end{pgfonlayer} - \begin{pgfonlayer}{edgelayer} - \draw [in=-90, out=90, looseness=0.75] (5.center) to (3.center); - \draw [in=90, out=90, looseness=0.75] (4.center) to (5.center); - \draw [in=270, out=-90, looseness=0.75] (1.center) to (0.center); - \draw [in=270, out=-90, looseness=0.75] (3.center) to (2.center); - \draw [in=-270, out=-90, looseness=0.75] (0.center) to (4.center); - \draw [in=-90, out=-90, looseness=1.75] (2.center) to (1.center); - \end{pgfonlayer} -\end{tikzpicture} \ No newline at end of file diff --git a/tikzit/shapes/cup.tikz b/tikzit/shapes/cup.tikz deleted file mode 100644 index 1dc1faa..0000000 --- a/tikzit/shapes/cup.tikz +++ /dev/null @@ -1,13 +0,0 @@ -\begin{tikzpicture} - \path [use as bounding box] (-2,-2) rectangle (2,2); - \begin{pgfonlayer}{nodelayer} - \node [style=none] (0) at (-0.5, 0) {}; - \node [style=none] (1) at (0.5, 0) {}; - \node [style=none] (2) at (0, -0.75) {}; - \end{pgfonlayer} - \begin{pgfonlayer}{edgelayer} - \draw [in=0, out=-90] (1.center) to (2.center); - \draw [in=-270, out=90, looseness=0.75] (0.center) to (1.center); - \draw [in=-90, out=-180] (2.center) to (0.center); - \end{pgfonlayer} -\end{tikzpicture} \ No newline at end of file diff --git a/tikzit/shapes/oval.tikz b/tikzit/shapes/oval.tikz deleted file mode 100644 index b5d2891..0000000 --- a/tikzit/shapes/oval.tikz +++ /dev/null @@ -1,11 +0,0 @@ -\begin{tikzpicture} - \path [use as bounding box] (-2,-2) rectangle (2,2); - \begin{pgfonlayer}{nodelayer} - \node [style=none] (0) at (-0.5, 0) {}; - \node [style=none] (1) at (0.5, 0) {}; - \end{pgfonlayer} - \begin{pgfonlayer}{edgelayer} - \draw [in=90, out=90, looseness=0.75] (0.center) to (1.center); - \draw [in=-90, out=270, looseness=0.75] (1.center) to (0.center); - \end{pgfonlayer} -\end{tikzpicture} \ No newline at end of file diff --git a/tikzit/shapes/pants.tikz b/tikzit/shapes/pants.tikz deleted file mode 100644 index c2c15c2..0000000 --- a/tikzit/shapes/pants.tikz +++ /dev/null @@ -1,19 +0,0 @@ -\begin{tikzpicture} - \path [use as bounding box] (-2,-2) rectangle (2,2); - \begin{pgfonlayer}{nodelayer} - \node [style=none] (0) at (-0.5, 1) {}; - \node [style=none] (1) at (0.5, 1) {}; - \node [style=none] (2) at (-1.5, -1) {}; - \node [style=none] (3) at (-0.5, -1) {}; - \node [style=none] (4) at (0.5, -1) {}; - \node [style=none] (5) at (1.5, -1) {}; - \end{pgfonlayer} - \begin{pgfonlayer}{edgelayer} - \draw [in=90, out=90, looseness=1.75] (4.center) to (3.center); - \draw [in=270, out=90, looseness=0.75] (2.center) to (0.center); - \draw [in=-90, out=-90, looseness=0.75] (0.center) to (1.center); - \draw [in=90, out=-90, looseness=0.75] (1.center) to (5.center); - \draw [in=-270, out=90, looseness=0.75] (5.center) to (4.center); - \draw [in=-270, out=90, looseness=0.75] (3.center) to (2.center); - \end{pgfonlayer} -\end{tikzpicture} \ No newline at end of file diff --git a/tikzit/share/Makefile.am b/tikzit/share/Makefile.am deleted file mode 100644 index 658b4d9..0000000 --- a/tikzit/share/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -if WINDOWS -else -sharedir = $(datarootdir) -nobase_dist_share_DATA = \ - applications/tikzit.desktop \ - mime/packages/tikzit.xml \ - icons/hicolor/*/*/*.png \ - icons/hicolor/scalable/*/*.svg -endif - diff --git a/tikzit/share/applications/tikzit.desktop b/tikzit/share/applications/tikzit.desktop deleted file mode 100644 index 12b6fa5..0000000 --- a/tikzit/share/applications/tikzit.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Name=TikZit -Comment=Editor for PGF/TikZ-based node-and-edge graphs for LaTeX documents -GenericName=TikZ Graph Editor -MimeType=text/x-tikz -Exec=tikzit -Icon=tikzit -Categories=GTK;Graphics;Education;Science; -StartupNotify=false diff --git a/tikzit/share/icons/hicolor/128x128/apps/tikzit.png b/tikzit/share/icons/hicolor/128x128/apps/tikzit.png deleted file mode 100644 index e8ee92b..0000000 Binary files a/tikzit/share/icons/hicolor/128x128/apps/tikzit.png and /dev/null differ diff --git a/tikzit/share/icons/hicolor/128x128/mimetypes/text-x-tikz.png b/tikzit/share/icons/hicolor/128x128/mimetypes/text-x-tikz.png deleted file mode 100644 index 6b3bbe6..0000000 Binary files a/tikzit/share/icons/hicolor/128x128/mimetypes/text-x-tikz.png and /dev/null differ diff --git a/tikzit/share/icons/hicolor/16x16/apps/tikzit.png b/tikzit/share/icons/hicolor/16x16/apps/tikzit.png deleted file mode 100644 index 9b7a377..0000000 Binary files a/tikzit/share/icons/hicolor/16x16/apps/tikzit.png and /dev/null differ diff --git a/tikzit/share/icons/hicolor/16x16/mimetypes/text-x-tikz.png b/tikzit/share/icons/hicolor/16x16/mimetypes/text-x-tikz.png deleted file mode 100644 index 364e831..0000000 Binary files a/tikzit/share/icons/hicolor/16x16/mimetypes/text-x-tikz.png and /dev/null differ diff --git a/tikzit/share/icons/hicolor/22x22/apps/tikzit.png b/tikzit/share/icons/hicolor/22x22/apps/tikzit.png deleted file mode 100644 index be803da..0000000 Binary files a/tikzit/share/icons/hicolor/22x22/apps/tikzit.png and /dev/null differ diff --git a/tikzit/share/icons/hicolor/22x22/mimetypes/text-x-tikz.png b/tikzit/share/icons/hicolor/22x22/mimetypes/text-x-tikz.png deleted file mode 100644 index 6436a9e..0000000 Binary files a/tikzit/share/icons/hicolor/22x22/mimetypes/text-x-tikz.png and /dev/null differ diff --git a/tikzit/share/icons/hicolor/24x24/apps/tikzit.png b/tikzit/share/icons/hicolor/24x24/apps/tikzit.png deleted file mode 100644 index 478aeab..0000000 Binary files a/tikzit/share/icons/hicolor/24x24/apps/tikzit.png and /dev/null differ diff --git a/tikzit/share/icons/hicolor/32x32/apps/tikzit.png b/tikzit/share/icons/hicolor/32x32/apps/tikzit.png deleted file mode 100644 index 75174e1..0000000 Binary files a/tikzit/share/icons/hicolor/32x32/apps/tikzit.png and /dev/null differ diff --git a/tikzit/share/icons/hicolor/32x32/mimetypes/text-x-tikz.png b/tikzit/share/icons/hicolor/32x32/mimetypes/text-x-tikz.png deleted file mode 100644 index 7faaded..0000000 Binary files a/tikzit/share/icons/hicolor/32x32/mimetypes/text-x-tikz.png and /dev/null differ diff --git a/tikzit/share/icons/hicolor/48x48/apps/tikzit.png b/tikzit/share/icons/hicolor/48x48/apps/tikzit.png deleted file mode 100644 index 7186458..0000000 Binary files a/tikzit/share/icons/hicolor/48x48/apps/tikzit.png and /dev/null differ diff --git a/tikzit/share/icons/hicolor/48x48/mimetypes/text-x-tikz.png b/tikzit/share/icons/hicolor/48x48/mimetypes/text-x-tikz.png deleted file mode 100644 index d061ed9..0000000 Binary files a/tikzit/share/icons/hicolor/48x48/mimetypes/text-x-tikz.png and /dev/null differ diff --git a/tikzit/share/icons/hicolor/64x64/apps/tikzit.png b/tikzit/share/icons/hicolor/64x64/apps/tikzit.png deleted file mode 100644 index 1641e85..0000000 Binary files a/tikzit/share/icons/hicolor/64x64/apps/tikzit.png and /dev/null differ diff --git a/tikzit/share/icons/hicolor/64x64/mimetypes/text-x-tikz.png b/tikzit/share/icons/hicolor/64x64/mimetypes/text-x-tikz.png deleted file mode 100644 index 2197553..0000000 Binary files a/tikzit/share/icons/hicolor/64x64/mimetypes/text-x-tikz.png and /dev/null differ diff --git a/tikzit/share/icons/hicolor/scalable/apps/tikzit.svg b/tikzit/share/icons/hicolor/scalable/apps/tikzit.svg deleted file mode 100644 index dc5cc84..0000000 --- a/tikzit/share/icons/hicolor/scalable/apps/tikzit.svg +++ /dev/null @@ -1,79 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/tikzit/share/icons/hicolor/scalable/mimetypes/text-x-tikz.svg b/tikzit/share/icons/hicolor/scalable/mimetypes/text-x-tikz.svg deleted file mode 100644 index 1642e87..0000000 --- a/tikzit/share/icons/hicolor/scalable/mimetypes/text-x-tikz.svg +++ /dev/null @@ -1,488 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - text - plaintext - regular - script - shell - bash - python - perl - php - ruby - - - - - - Jakub Steiner - - - http://jimmac.musichall.cz - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tikzit/share/mime/packages/tikzit.xml b/tikzit/share/mime/packages/tikzit.xml deleted file mode 100644 index c6e7c0c..0000000 --- a/tikzit/share/mime/packages/tikzit.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/tikzit/share/tikzit b/tikzit/share/tikzit deleted file mode 120000 index a96aa0e..0000000 --- a/tikzit/share/tikzit +++ /dev/null @@ -1 +0,0 @@ -.. \ No newline at end of file diff --git a/tikzit/src/Makefile.am b/tikzit/src/Makefile.am deleted file mode 100644 index 5108e9c..0000000 --- a/tikzit/src/Makefile.am +++ /dev/null @@ -1,178 +0,0 @@ -if WINDOWS -sharedir = ../ -else -sharedir = @datarootdir@/tikzit -endif - -AM_OBJCFLAGS = @FOUNDATION_OBJCFLAGS@ \ - @GTK_CFLAGS@ \ - -I common \ - -I gtk \ - -DTIKZITSHAREDIR=\"$(sharedir)\" \ - -std=c99 \ - -D_GNU_SOURCE -LIBS = @FOUNDATION_LIBS@ \ - @GTK_LIBS@ -AM_YFLAGS = -d -PARSERFILES = common/tikzlexer.m common/tikzlexer.h common/tikzparser.m common/tikzparser.h -ICONFILES = ../draw-ellipse.png \ - ../draw-path.png \ - ../select-rectangular.png \ - ../transform-crop-and-resize.png \ - ../transform-move.png -EDGEDECFILES = ../AH_*.png ../ED_*.png - -bin_PROGRAMS = tikzit -BUILT_SOURCES = $(PARSERFILES) -tikzit_SOURCES = gtk/Application.m \ - gtk/BoundingBoxTool.m \ - gtk/CairoRenderContext.m \ - gtk/ColorRGB+IntegerListStorage.m \ - gtk/ColorRGB+Gtk.m \ - gtk/Configuration.m \ - gtk/ContextWindow.m \ - gtk/CreateEdgeTool.m \ - gtk/CreateNodeTool.m \ - gtk/Edge+Render.m \ - gtk/EdgeStyle+Gtk.m \ - gtk/EdgeStyle+Storage.m \ - gtk/EdgeStyleEditor.m \ - gtk/EdgeStyleSelector.m \ - gtk/EdgeStylesModel.m \ - gtk/EdgeStylesPalette.m \ - gtk/FileChooserDialog.m \ - gtk/HandTool.m \ - gtk/GraphEditorPanel.m \ - gtk/GraphRenderer.m \ - gtk/Menu.m \ - gtk/Node+Render.m \ - gtk/NodeStyle+Gtk.m \ - gtk/NodeStyle+Storage.m \ - gtk/NodeStyleEditor.m \ - gtk/NodeStylesModel.m \ - gtk/NodeStyleSelector.m \ - gtk/NodeStylesPalette.m \ - gtk/NSError+Glib.m \ - gtk/NSFileManager+Glib.m \ - gtk/NSString+Glib.m \ - gtk/PropertiesPane.m \ - gtk/PropertyListEditor.m \ - gtk/RecentManager.m \ - gtk/SelectTool.m \ - gtk/SelectionPane.m \ - gtk/SettingsDialog.m \ - gtk/Shape+Render.m \ - gtk/StyleManager+Storage.m \ - gtk/TikzDocument.m \ - gtk/ToolBox.m \ - gtk/WidgetSurface.m \ - gtk/Window.m \ - gtk/cairo_helpers.m \ - gtk/clipboard.m \ - gtk/gtkhelpers.m \ - gtk/logo.m \ - gtk/mkdtemp.m \ - gtk/main.m \ - gtk/tzstockitems.m \ - gtk/tztoolpalette.m \ - common/CircleShape.m \ - common/ColorRGB.m \ - common/DiamondShape.m \ - common/Edge.m \ - common/EdgeStyle.m \ - common/GraphChange.m \ - common/GraphElementData.m \ - common/Graph.m \ - common/Grid.m \ - common/Node.m \ - common/NodeStyle.m \ - common/NSError+Tikzit.m \ - common/NSFileManager+Utils.m \ - common/NSString+LatexConstants.m \ - common/NSString+Tikz.m \ - common/NSString+Util.m \ - common/PickSupport.m \ - common/PropertyHolder.m \ - common/GraphElementProperty.m \ - common/RColor.m \ - common/RectangleShape.m \ - common/RegularPolyShape.m \ - common/Shape.m \ - common/StyleManager.m \ - common/SupportDir.m \ - common/TikzGraphAssembler.m \ - common/TikzShape.m \ - common/Transformer.m \ - common/tikzparser.m \ - common/tikzlexer.m \ - common/util.m - -if HAVE_POPPLER -tikzit_SOURCES += \ - common/Preambles.m \ - gtk/PreambleEditor.m \ - gtk/Preambles+Storage.m \ - gtk/PreviewRenderer.m \ - gtk/PreviewWindow.m -endif - -if WINDOWS -tikzit.res: tikzit.rc - $(AM_V_GEN)windres $^ -O coff -o $@ - -tikzit_LDADD = tikzit.res -CLEANFILES = tikzit.res -endif - -common/tikzlexer.m common/tikzlexer.h: common/tikzlexer.lm - $(AM_V_GEN)$(LEX) -o common/tikzlexer.m $^ -# ordering hack for parallel builds -common/tikzlexer.h: common/tikzlexer.m - -common/tikzparser.m common/tikzparser.h: common/tikzparser.ym - $(AM_V_GEN)$(YACC) --defines=common/tikzparser.h --output=common/tikzparser.m $^ -# ordering hack for parallel builds -common/tikzparser.h: common/tikzparser.m - -gtk/icondata.m: $(ICONFILES) - $(AM_V_GEN)gdk-pixbuf-csource --struct --static --raw --build-list \ - draw_ellipse ../draw-ellipse.png \ - draw_path ../draw-path.png \ - select_rectangular ../select-rectangular.png \ - transform_crop_and_resize ../transform-crop-and-resize.png \ - transform_move ../transform-move.png \ - > $@ - -gtk/logodata.m: ../share/icons/hicolor/*/apps/tikzit.png - $(AM_V_GEN)gdk-pixbuf-csource --struct --static --raw --build-list \ - logo16 ../share/icons/hicolor/16x16/apps/tikzit.png \ - logo24 ../share/icons/hicolor/24x24/apps/tikzit.png \ - logo32 ../share/icons/hicolor/32x32/apps/tikzit.png \ - logo48 ../share/icons/hicolor/48x48/apps/tikzit.png \ - logo64 ../share/icons/hicolor/64x64/apps/tikzit.png \ - logo128 ../share/icons/hicolor/128x128/apps/tikzit.png \ - > $@ - -gtk/edgedecdata.m: $(EDGEDECFILES) - $(AM_V_GEN)gdk-pixbuf-csource --struct --static --raw --build-list \ - AH_none_pixdata ../AH_none.png \ - AH_latex_head_pixdata ../AH_latex_head.png \ - AH_latex_tail_pixdata ../AH_latex_tail.png \ - AH_plain_head_pixdata ../AH_plain_head.png \ - AH_plain_tail_pixdata ../AH_plain_tail.png \ - ED_none_pixdata ../ED_none.png \ - ED_arrow_pixdata ../ED_arrow.png \ - ED_tick_pixdata ../ED_tick.png \ - > $@ - -gtk/Menu.m: gtk/icondata.m -gtk/logo.m: gtk/logodata.m -gtk/EdgeStyleEditor.m: gtk/edgedecdata.m - -EXTRA_DIST = gtk/*.h common/*.h \ - $(PARSERFILES) common/tikzlexer.lm common/tikzparser.ym \ - $(ICONFILES) gtk/icondata.m \ - gtk/logodata.m \ - $(EDGEDECFILES) gtk/edgedecdata.m \ - tikzit.rc ../tikzit.ico -MAINTAINERCLEANFILES = $(PARSERFILES) gtk/icondata.m gtk/logodata.m gtk/edgedecdata.m diff --git a/tikzit/src/common/CircleShape.h b/tikzit/src/common/CircleShape.h deleted file mode 100644 index 8215b92..0000000 --- a/tikzit/src/common/CircleShape.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// CircleShape.h -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "Shape.h" - -@interface CircleShape : Shape { -} - - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit/src/common/CircleShape.m b/tikzit/src/common/CircleShape.m deleted file mode 100644 index f2d1d52..0000000 --- a/tikzit/src/common/CircleShape.m +++ /dev/null @@ -1,57 +0,0 @@ -// -// CircleShape.m -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "CircleShape.h" -#import "Node.h" -#import "Edge.h" - -@implementation CircleShape - -- (id)init { - self = [super init]; - if (self) { - Node *n0,*n1,*n2,*n3; - - n0 = [Node nodeWithPoint:NSMakePoint( 0.0f, 0.2f)]; - n1 = [Node nodeWithPoint:NSMakePoint( 0.2f, 0.0f)]; - n2 = [Node nodeWithPoint:NSMakePoint( 0.0f, -0.2f)]; - n3 = [Node nodeWithPoint:NSMakePoint(-0.2f, 0.0f)]; - - Edge *e0,*e1,*e2,*e3; - - e0 = [Edge edgeWithSource:n0 andTarget:n1]; [e0 setBend:-45]; - e1 = [Edge edgeWithSource:n1 andTarget:n2]; [e1 setBend:-45]; - e2 = [Edge edgeWithSource:n2 andTarget:n3]; [e2 setBend:-45]; - e3 = [Edge edgeWithSource:n3 andTarget:n0]; [e3 setBend:-45]; - - paths = [[NSSet alloc] initWithObjects:[NSArray arrayWithObjects:e0,e1,e2,e3,nil],nil]; - - styleTikz = @"circle"; - } - return self; -} - - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit/src/common/ColorRGB.h b/tikzit/src/common/ColorRGB.h deleted file mode 100644 index 607ba64..0000000 --- a/tikzit/src/common/ColorRGB.h +++ /dev/null @@ -1,64 +0,0 @@ -// -// ColorRGB.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "RColor.h" - -@interface ColorRGB : NSObject { - unsigned short red, green, blue; -} - -@property (assign) unsigned short red; -@property (assign) unsigned short green; -@property (assign) unsigned short blue; - -@property (assign) float redFloat; -@property (assign) float greenFloat; -@property (assign) float blueFloat; - -@property (readonly) NSString *name; - -- (RColor)rColor; -- (RColor)rColorWithAlpha:(CGFloat)alpha; - -- (NSString*)hexName; -- (BOOL)isEqual:(id)col; -- (float)distanceFromColor:(ColorRGB*)col; -- (int)hash; - -- (id)initWithRed:(unsigned short)r green:(unsigned short)g blue:(unsigned short)b; -- (id)initWithFloatRed:(float)r green:(float)g blue:(float)b; -- (id)initWithRColor:(RColor)color; - -- (void)setToClosestHashed; - -+ (ColorRGB*)colorWithRed:(unsigned short)r green:(unsigned short)g blue:(unsigned short)b; -+ (ColorRGB*)colorWithFloatRed:(float)r green:(float)g blue:(float)b; -+ (ColorRGB*)colorWithRColor:(RColor)color; - -+ (void)makeColorHash; -+ (void)releaseColorHash; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit/src/common/ColorRGB.m b/tikzit/src/common/ColorRGB.m deleted file mode 100644 index 840d716..0000000 --- a/tikzit/src/common/ColorRGB.m +++ /dev/null @@ -1,353 +0,0 @@ -// -// ColorRGB.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "ColorRGB.h" -#import "util.h" - -typedef struct { -#if __has_feature(objc_arc) - __unsafe_unretained NSString *name; -#else - NSString *name; -#endif - unsigned short r, g, b; -} ColorRGBEntry; - -static const ColorRGBEntry kColors[147] = { - { @"AliceBlue", 240, 248, 255 }, - { @"AntiqueWhite", 250, 235, 215 }, - { @"Aqua", 0, 255, 255 }, - { @"Aquamarine", 127, 255, 212 }, - { @"Azure", 240, 255, 255 }, - { @"Beige", 245, 245, 220 }, - { @"Bisque", 255, 228, 196 }, - { @"Black", 0, 0, 0 }, - { @"BlanchedAlmond", 255, 235, 205 }, - { @"Blue", 0, 0, 255 }, - { @"BlueViolet", 138, 43, 226 }, - { @"Brown", 165, 42, 42 }, - { @"BurlyWood", 222, 184, 135 }, - { @"CadetBlue", 95, 158, 160 }, - { @"Chartreuse", 127, 255, 0 }, - { @"Chocolate", 210, 105, 30 }, - { @"Coral", 255, 127, 80 }, - { @"CornflowerBlue", 100, 149, 237 }, - { @"Cornsilk", 255, 248, 220 }, - { @"Crimson", 220, 20, 60 }, - { @"Cyan", 0, 255, 255 }, - { @"DarkBlue", 0, 0, 139 }, - { @"DarkCyan", 0, 139, 139 }, - { @"DarkGoldenrod", 184, 134, 11 }, - { @"DarkGray", 169, 169, 169 }, - { @"DarkGreen", 0, 100, 0 }, - { @"DarkGrey", 169, 169, 169 }, - { @"DarkKhaki", 189, 183, 107 }, - { @"DarkMagenta", 139, 0, 139 }, - { @"DarkOliveGreen", 85, 107, 47 }, - { @"DarkOrange", 255, 140, 0 }, - { @"DarkOrchid", 153, 50, 204 }, - { @"DarkRed", 139, 0, 0 }, - { @"DarkSalmon", 233, 150, 122 }, - { @"DarkSeaGreen", 143, 188, 143 }, - { @"DarkSlateBlue", 72, 61, 139 }, - { @"DarkSlateGray", 47, 79, 79 }, - { @"DarkSlateGrey", 47, 79, 79 }, - { @"DarkTurquoise", 0, 206, 209 }, - { @"DarkViolet", 148, 0, 211 }, - { @"DeepPink", 255, 20, 147 }, - { @"DeepSkyBlue", 0, 191, 255 }, - { @"DimGray", 105, 105, 105 }, - { @"DimGrey", 105, 105, 105 }, - { @"DodgerBlue", 30, 144, 255 }, - { @"FireBrick", 178, 34, 34 }, - { @"FloralWhite", 255, 250, 240 }, - { @"ForestGreen", 34, 139, 34 }, - { @"Fuchsia", 255, 0, 255 }, - { @"Gainsboro", 220, 220, 220 }, - { @"GhostWhite", 248, 248, 255 }, - { @"Gold", 255, 215, 0 }, - { @"Goldenrod", 218, 165, 32 }, - { @"Gray", 128, 128, 128 }, - { @"Grey", 128, 128, 128 }, - { @"Green", 0, 128, 0 }, - { @"GreenYellow", 173, 255, 47 }, - { @"Honeydew", 240, 255, 240 }, - { @"HotPink", 255, 105, 180 }, - { @"IndianRed", 205, 92, 92 }, - { @"Indigo", 75, 0, 130 }, - { @"Ivory", 255, 255, 240 }, - { @"Khaki", 240, 230, 140 }, - { @"Lavender", 230, 230, 250 }, - { @"LavenderBlush", 255, 240, 245 }, - { @"LawnGreen", 124, 252, 0 }, - { @"LemonChiffon", 255, 250, 205 }, - { @"LightBlue", 173, 216, 230 }, - { @"LightCoral", 240, 128, 128 }, - { @"LightCyan", 224, 255, 255 }, - { @"LightGoldenrodYellow", 250, 250, 210 }, - { @"LightGray", 211, 211, 211 }, - { @"LightGreen", 144, 238, 144 }, - { @"LightGrey", 211, 211, 211 }, - { @"LightPink", 255, 182, 193 }, - { @"LightSalmon", 255, 160, 122 }, - { @"LightSeaGreen", 32, 178, 170 }, - { @"LightSkyBlue", 135, 206, 250 }, - { @"LightSlateGray", 119, 136, 153 }, - { @"LightSlateGrey", 119, 136, 153 }, - { @"LightSteelBlue", 176, 196, 222 }, - { @"LightYellow", 255, 255, 224 }, - { @"Lime", 0, 255, 0 }, - { @"LimeGreen", 50, 205, 50 }, - { @"Linen", 250, 240, 230 }, - { @"Magenta", 255, 0, 255 }, - { @"Maroon", 128, 0, 0 }, - { @"MediumAquamarine", 102, 205, 170 }, - { @"MediumBlue", 0, 0, 205 }, - { @"MediumOrchid", 186, 85, 211 }, - { @"MediumPurple", 147, 112, 219 }, - { @"MediumSeaGreen", 60, 179, 113 }, - { @"MediumSlateBlue", 123, 104, 238 }, - { @"MediumSpringGreen", 0, 250, 154 }, - { @"MediumTurquoise", 72, 209, 204 }, - { @"MediumVioletRed", 199, 21, 133 }, - { @"MidnightBlue", 25, 25, 112 }, - { @"MintCream", 245, 255, 250 }, - { @"MistyRose", 255, 228, 225 }, - { @"Moccasin", 255, 228, 181 }, - { @"NavajoWhite", 255, 222, 173 }, - { @"Navy", 0, 0, 128 }, - { @"OldLace", 253, 245, 230 }, - { @"Olive", 128, 128, 0 }, - { @"OliveDrab", 107, 142, 35 }, - { @"Orange", 255, 165, 0 }, - { @"OrangeRed", 255, 69, 0 }, - { @"Orchid", 218, 112, 214 }, - { @"PaleGoldenrod", 238, 232, 170 }, - { @"PaleGreen", 152, 251, 152 }, - { @"PaleTurquoise", 175, 238, 238 }, - { @"PaleVioletRed", 219, 112, 147 }, - { @"PapayaWhip", 255, 239, 213 }, - { @"PeachPuff", 255, 218, 185 }, - { @"Peru", 205, 133, 63 }, - { @"Pink", 255, 192, 203 }, - { @"Plum", 221, 160, 221 }, - { @"PowderBlue", 176, 224, 230 }, - { @"Purple", 128, 0, 128 }, - { @"Red", 255, 0, 0 }, - { @"RosyBrown", 188, 143, 143 }, - { @"RoyalBlue", 65, 105, 225 }, - { @"SaddleBrown", 139, 69, 19 }, - { @"Salmon", 250, 128, 114 }, - { @"SandyBrown", 244, 164, 96 }, - { @"SeaGreen", 46, 139, 87 }, - { @"Seashell", 255, 245, 238 }, - { @"Sienna", 160, 82, 45 }, - { @"Silver", 192, 192, 192 }, - { @"SkyBlue", 135, 206, 235 }, - { @"SlateBlue", 106, 90, 205 }, - { @"SlateGray", 112, 128, 144 }, - { @"SlateGrey", 112, 128, 144 }, - { @"Snow", 255, 250, 250 }, - { @"SpringGreen", 0, 255, 127 }, - { @"SteelBlue", 70, 130, 180 }, - { @"Tan", 210, 180, 140 }, - { @"Teal", 0, 128, 128 }, - { @"Thistle", 216, 191, 216 }, - { @"Tomato", 255, 99, 71 }, - { @"Turquoise", 64, 224, 208 }, - { @"Violet", 238, 130, 238 }, - { @"Wheat", 245, 222, 179 }, - { @"White", 255, 255, 255 }, - { @"WhiteSmoke", 245, 245, 245 }, - { @"Yellow", 255, 255, 0 }, - { @"YellowGreen", 154, 205, 50 } -}; - -static NSMapTable *colorHash = nil; - -@implementation ColorRGB - -+ (void)initialize { - [self setKeys:[NSArray arrayWithObject:@"red"] triggerChangeNotificationsForDependentKey:@"redFloat"]; - [self setKeys:[NSArray arrayWithObject:@"green"] triggerChangeNotificationsForDependentKey:@"greenFloat"]; - [self setKeys:[NSArray arrayWithObject:@"blue"] triggerChangeNotificationsForDependentKey:@"blueFloat"]; - [self setKeys:[NSArray arrayWithObjects:@"red", @"green", @"blue", nil] - triggerChangeNotificationsForDependentKey:@"name"]; -} - -@synthesize red, green, blue; - -- (float)redFloat { return ((float)red)/255.0f; } -- (void)setRedFloat:(float)r { [self setRed:round(r*255.0f)]; } -- (float)greenFloat { return ((float)green)/255.0f; } -- (void)setGreenFloat:(float)g { [self setGreen:round(g*255.0f)]; } -- (float)blueFloat { return ((float)blue)/255.0f; } -- (void)setBlueFloat:(float)b { [self setBlue:round(b*255.0f)]; } - -- (int)hash { - return (red<<4) + (green<<2) + blue; -} - -- (id)initWithRed:(unsigned short)r green:(unsigned short)g blue:(unsigned short)b { - self = [super init]; - if (self) { - red = r; - green = g; - blue = b; - } - return self; -} - -- (id)initWithFloatRed:(float)r green:(float)g blue:(float)b { - self = [super init]; - if (self) { - red = round(r*255.0f); - green = round(g*255.0f); - blue = round(b*255.0f); - } - return self; -} - -- (id) initWithRColor:(RColor)color { - return [self initWithFloatRed:color.red green:color.green blue:color.blue]; -} - -- (RColor) rColor { - return MakeSolidRColor ([self redFloat], [self greenFloat], [self blueFloat]); -} - -- (RColor) rColorWithAlpha:(CGFloat)alpha { - return MakeRColor ([self redFloat], [self greenFloat], [self blueFloat], alpha); -} - -- (NSString*)name { - if (colorHash == nil) - [ColorRGB makeColorHash]; - return [colorHash objectForKey:self]; -} - -- (NSString*)hexName { - return [NSString stringWithFormat:@"hexcolor0x%.2x%.2x%.2x", red, green, blue]; -} - -- (NSComparisonResult)compare:(ColorRGB*)col { - if (red > [col red]) return NSOrderedDescending; - else if (red < [col red]) return NSOrderedAscending; - else { - if (green > [col green]) return NSOrderedDescending; - else if (green < [col green]) return NSOrderedAscending; - else { - if (blue > [col blue]) return NSOrderedDescending; - else if (blue < [col blue]) return NSOrderedAscending; - else return NSOrderedSame; - } - } -} - -- (BOOL)isEqual:(id)col { - return [self compare:col] == NSOrderedSame; -} - -- (float)distanceFromColor:(ColorRGB *)col { - float dr = (float)(red - [col red]); - float dg = (float)(green - [col green]); - float db = (float)(blue - [col blue]); - return dr*dr + dg*dg + db*db; -} - -- (id)copyWithZone:(NSZone*)zone { - ColorRGB *col = [[ColorRGB allocWithZone:zone] initWithRed:red green:green blue:blue]; - return col; -} - -+ (ColorRGB*)colorWithRed:(unsigned short)r green:(unsigned short)g blue:(unsigned short)b { - ColorRGB *col = [[ColorRGB alloc] initWithRed:r green:g blue:b]; -#if __has_feature(objc_arc) - return col; -#else - return [col autorelease]; -#endif -} - - -+ (ColorRGB*)colorWithFloatRed:(float)r green:(float)g blue:(float)b { - ColorRGB *col = [[ColorRGB alloc] initWithFloatRed:r green:g blue:b]; -#if __has_feature(objc_arc) - return col; -#else - return [col autorelease]; -#endif -} - -+ (ColorRGB*) colorWithRColor:(RColor)color { -#if __has_feature(objc_arc) - return [[self alloc] initWithRColor:color]; -#else - return [[[self alloc] initWithRColor:color] autorelease]; -#endif -} - -+ (void)makeColorHash { - NSMapTable *h = [[NSMapTable alloc] init]; - int i; - for (i = 0; i < 147; ++i) { - ColorRGB *col = [[ColorRGB alloc] initWithRed:kColors[i].r - green:kColors[i].g - blue:kColors[i].b]; - [h setObject:kColors[i].name forKey:col]; - //NSLog(@"adding color %@ (%d)", kColors[i].name, [col hash]); -#if ! __has_feature(objc_arc) - [col release]; -#endif - } - colorHash = h; -} - -+ (void)releaseColorHash { -#if ! __has_feature(objc_arc) - [colorHash release]; -#endif -} - -- (void)setToClosestHashed { - if (colorHash == nil) - [ColorRGB makeColorHash]; - float bestDist = -1; - ColorRGB *bestColor = nil; - NSEnumerator *enumerator = [colorHash keyEnumerator]; - ColorRGB *tryColor; - while ((tryColor = [enumerator nextObject]) != nil) { - float dist = [self distanceFromColor:tryColor]; - if (bestDist<0 || dist. -// - -#import -#import "Shape.h" - -@interface DiamondShape : Shape { -} - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 - diff --git a/tikzit/src/common/DiamondShape.m b/tikzit/src/common/DiamondShape.m deleted file mode 100644 index 1a578b8..0000000 --- a/tikzit/src/common/DiamondShape.m +++ /dev/null @@ -1,63 +0,0 @@ -// -// DiamondShape.m -// TikZiT -// -// Copyright 2011 Aleks Kissinger -// Copyright 2012 Alex Merry -// All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "DiamondShape.h" - -#import "Node.h" -#import "Edge.h" - -@implementation DiamondShape - -- (id)init { - self = [super init]; - - if (!self) - return nil; - - Node *n0,*n1,*n2,*n3; - float sz = 0.25f; - - n0 = [Node nodeWithPoint:NSMakePoint(0, sz)]; - n1 = [Node nodeWithPoint:NSMakePoint(sz, 0)]; - n2 = [Node nodeWithPoint:NSMakePoint(0,-sz)]; - n3 = [Node nodeWithPoint:NSMakePoint(-sz,0)]; - - Edge *e0,*e1,*e2,*e3; - - e0 = [Edge edgeWithSource:n0 andTarget:n1]; - e1 = [Edge edgeWithSource:n1 andTarget:n2]; - e2 = [Edge edgeWithSource:n2 andTarget:n3]; - e3 = [Edge edgeWithSource:n3 andTarget:n0]; - - paths = [[NSSet alloc] initWithObjects:[NSArray arrayWithObjects:e0,e1,e2,e3,nil],nil]; - - styleTikz = @"shape=diamond"; - - return self; -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit/src/common/Edge.h b/tikzit/src/common/Edge.h deleted file mode 100644 index accf38c..0000000 --- a/tikzit/src/common/Edge.h +++ /dev/null @@ -1,401 +0,0 @@ -// -// Edge.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - - -// Edge : store the data associated with an edge. Also, lazily compute -// bezier curve control points based on bend and the coordinates of -// the endpoints. - -#import "Node.h" -#import "EdgeStyle.h" - -/*! - @typedef enum EdgeBendMode - @brief Indicates the type of edge bend. - @var EdgeBendModeBasic A basic, one-angle bend. Positive values will be interpreted - as bend left, negative as bend right. - @var EdgeBendModeInOut A two-angle bend mode, using inAngle and outAngle. - */ -typedef enum { - EdgeBendModeBasic, - EdgeBendModeInOut -} EdgeBendMode; - -/*! - @class Edge - @brief A graph edge, with associated bend and style data. - @details A graph edge, with associated bend and style data. This class - also contains methods for computing the bezier control points - and the midpoint of the curve. - */ -@interface Edge : NSObject { - Node *source; - Node *target; - Node *edgeNode; - int bend; - int inAngle, outAngle; - EdgeBendMode bendMode; - float weight; - EdgeStyle *style; - GraphElementData *data; - NSString *sourceAnchor; - NSString *targetAnchor; - - // When set to YES, lazily create the edge node, and keep it around when set - // to NO (at least until saved/loaded). - BOOL hasEdgeNode; - BOOL dirty; - - // these are all cached values computed from the above - NSPoint src; - NSPoint targ; - NSPoint head; - NSPoint tail; - NSPoint cp1; - NSPoint cp2; - NSPoint mid; - NSPoint midTan; - NSPoint headTan; - NSPoint tailTan; -} - -/*! - @property data - @brief Associated edge data. - */ -@property (copy) GraphElementData *data; - -// KVC methods -- (void) insertObject:(GraphElementProperty*)gep - inDataAtIndex:(NSUInteger)index; -- (void) removeObjectFromDataAtIndex:(NSUInteger)index; -- (void) replaceObjectInDataAtIndex:(NSUInteger)index - withObject:(GraphElementProperty*)gep; - -/*! - @property style - @brief Edge style. - */ -@property (retain) EdgeStyle *style; - -/*! - @property source - @brief Source node. - */ -@property (retain) Node *source; - -/*! - @property target - @brief Target node. - */ -@property (retain) Node *target; - -/*! - @property edgeNode - @brief A node attached to this edge, as in a label or tick. - */ -@property (retain) Node *edgeNode; - -/*! - @property sourceAnchor - @brief The source node anchor point, as in north or center. - */ -@property (copy) NSString *sourceAnchor; - -/*! - @property targetAnchor - @brief The target node anchor point, as in north or center. - */ -@property (copy) NSString *targetAnchor; - -/*! - @property hasEdgeNode - @brief A read/write property. When set to true, a new edge node is actually constructed. -*/ -@property (assign) BOOL hasEdgeNode; - -/*! - @property bend - @brief The degrees by which the edge bends. - */ -@property (assign) int bend; - -/*! - @property weight - @brief How close the edge will pass to control points. - */ -@property (assign) float weight; - -/*! - @property inAngle - @brief The angle by which the edge enters its target. - */ -@property (assign) int inAngle; - -/*! - @property outAngle - @brief The angle by which the edge leaves its target. - */ -@property (assign) int outAngle; - -/*! - @property bendMode - @brief The mode of the edge bend. Either simple bend in in/out style. - */ -@property (assign) EdgeBendMode bendMode; - -/*! - @property head - @brief The starting point of the edge. - @detail This value is computed based on the source, target and - either bend or in/out angles. It is where the edge - makes contact with the source node. - */ -@property (readonly) NSPoint head; - -/*! - @property tail - @brief The ending point of the edge. - @detail This value is computed based on the source, target and - either bend or in/out angles. It is where the edge - makes contact with the target node. - */ -@property (readonly) NSPoint tail; - -/*! - @property cp1 - @brief The first control point of the edge. - @detail This value is computed based on the source, target and - either bend or in/out angles. - */ -@property (readonly) NSPoint cp1; - -/*! - @property cp2 - @brief The second control point of the edge. - @detail This value is computed based on the source, target and - either bend or in/out angles. - */ -@property (readonly) NSPoint cp2; - -/*! - @property mid - @brief The midpoint of the curve. Computed from the source, target, and control points. - */ -@property (readonly) NSPoint mid; - -/*! - @property mid_tan - @brief The second point of a line tangent to the midpoint. (The first is the midpoint itself.) - */ -@property (readonly) NSPoint midTan; - -/*! - @property left_normal - @brief The second point in a line perp. to the edge coming from mid-point. (left side) - */ -@property (readonly) NSPoint leftNormal; - -/*! - @property left_normal - @brief The second point in a line perp. to the edge coming from mid-point. (right side) - */ -@property (readonly) NSPoint rightNormal; - -@property (readonly) NSPoint headTan; - -/*! - @property leftHeadNormal - */ -@property (readonly) NSPoint leftHeadNormal; - -/*! - @property rightHeadNormal - */ -@property (readonly) NSPoint rightHeadNormal; - -@property (readonly) NSPoint tailTan; - -/*! - @property leftTailNormal - */ -@property (readonly) NSPoint leftTailNormal; - -/*! - @property rightTailNormal - */ -@property (readonly) NSPoint rightTailNormal; - -/*! - @property isSelfLoop - @brief Returns YES if this edge is a self loop. - */ -@property (readonly) BOOL isSelfLoop; - -/*! - @property isStraight - @brief Returns YES if this edge can be drawn as a straight line (as opposed to a bezier curve). - */ -@property (readonly) BOOL isStraight; - - -/*! - @brief Construct a blank edge. - @result An edge. - */ -- (id)init; - -/*! - @brief Construct an edge with the given source and target. - @param s the source node. - @param t the target node. - @result An edge. - */ -- (id)initWithSource:(Node*)s andTarget:(Node*)t; - -/*! - @brief Force the recalculation of the derived properties. - */ -- (void)recalculateProperties; - -/*! - @brief Recompute the control points and midpoint. - */ -- (void)updateControls; - -/*! - @brief Push edge properties back into its GraphElementData. - */ -- (void)updateData; - -/*! - @brief Set edge properties from fields in GraphElementData. - */ -- (void)setAttributesFromData; - -/*! - @brief Use data.style to find and attach the EdgeStyle object from the given array. - */ -- (BOOL)attachStyleFromTable:(NSArray*)styles; - -/*! - @brief Convert the bend angle to an inAngle and outAngle. - */ -- (void)convertBendToAngles; - -/*! - @brief Set the bend angle to the average of the in and out angles. - */ -- (void)convertAnglesToBend; - -/*! - @brief Update this edge to look just like the given edge. - @param e an edge to mimic. - */ -- (void)setPropertiesFromEdge:(Edge *)e; - -/*! - @brief Get a bounding rect for this edge. - @detail Note that this may not be a tight bound. - */ -- (NSRect)boundingRect; - -/*! - @brief Moves the first control point, updating edge properties as necessary - @detail This will move a control point and adjust the weight and - bend (or outAngle) to fit. - - A courseness can be specified for both the weight and the - bend, allowing them to be constrained to certain values. For - example, passing 10 as the bend courseness will force the bend - to be a multiple of 5. Passing 0 for either of these will - cause the relevant value to be unconstrained. - @param point the new position of the control point - @param wc force the weight to be a multiple of this value (unless 0) - @param bc force the bend (or outAngle) to be a multiple of this value (unless 0) - @param link when in EdgeBendModeInOut, change both the in and out angles at once - */ -- (void) moveCp1To:(NSPoint)point withWeightCourseness:(float)wc andBendCourseness:(int)bc forceLinkControlPoints:(BOOL)link; - -/*! - @brief Moves the first control point, updating edge properties as necessary - @detail This will move a control point and adjust the weight and - bend (or outAngle) to fit. - - The same as moveCp1To:point withWeightCourseness:0.0f andBendCourseness:0 forceLinkControlPoints:No - @param point the new position of the control point - @param wc force the weight to be a multiple of this value (unless 0) - @param bc force the bend (or outAngle) to be a multiple of this value (unless 0) - @param link when in EdgeBendModeInOut, change both the in and out angles at once - */ -- (void) moveCp1To:(NSPoint)point; - -/*! - @brief Moves the first control point, updating edge properties as necessary - @detail This will move a control point and adjust the weight and - bend (or inAngle) to fit. - - A courseness can be specified for both the weight and the - bend, allowing them to be constrained to certain values. For - example, passing 10 as the bend courseness will force the bend - to be a multiple of 5. Passing 0 for either of these will - cause the relevant value to be unconstrained. - @param point the new position of the control point - @param wc force the weight to be a multiple of this value (unless 0) - @param bc force the bend (or inAngle) to be a multiple of this value (unless 0) - @param link when in EdgeBendModeInOut, change both the in and out angles at once - */ -- (void) moveCp2To:(NSPoint)point withWeightCourseness:(float)wc andBendCourseness:(int)bc forceLinkControlPoints:(BOOL)link; - -/*! - @brief Moves the first control point, updating edge properties as necessary - @detail This will move a control point and adjust the weight and - bend (or inAngle) to fit. - - The same as moveCp2To:point withWeightCourseness:0.0f andBendCourseness:0 forceLinkControlPoints:No - @param point the new position of the control point - */ -- (void) moveCp2To:(NSPoint)point; - -/*! - @brief Reverse edge direction, updating bend/inAngle/outAngle/etc - */ -- (void)reverse; - -/*! - @brief Factory method to make a blank edge. - @result An edge. - */ -+ (Edge*)edge; - -/*! - @brief Factory method to make an edge with the given source and target. - @param s a source node. - @param t a target node. - @result An edge. - */ -+ (Edge*)edgeWithSource:(Node*)s andTarget:(Node*)t; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit/src/common/Edge.m b/tikzit/src/common/Edge.m deleted file mode 100644 index 0c88e9d..0000000 --- a/tikzit/src/common/Edge.m +++ /dev/null @@ -1,757 +0,0 @@ -// -// Edge.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "Edge.h" -#import "Shape.h" -#import "util.h" - -@implementation Edge - -- (id)init { - self = [super init]; - if (self) { - data = [[GraphElementData alloc] init]; - bend = 0; - inAngle = 135; - outAngle = 45; - bendMode = EdgeBendModeBasic; - weight = 0.4f; - dirty = YES; - source = nil; - target = nil; - edgeNode = nil; - sourceAnchor = @""; - targetAnchor = @""; - } - return self; -} - -- (id)initWithSource:(Node*)s andTarget:(Node*)t { - self = [self init]; - if (self) { - [self setSource:s]; - [self setTarget:t]; - edgeNode = nil; - - dirty = YES; - } - return self; -} - -- (BOOL)attachStyleFromTable:(NSArray*)styles { - NSString *style_name = [data propertyForKey:@"style"]; - - [self setStyle:nil]; - if (style_name == nil) return YES; - - for (EdgeStyle *s in styles) { - if ([[s name] compare:style_name]==NSOrderedSame) { - [self setStyle:s]; - return YES; - } - } - - // if we didn't find a style, fill in a default one -#if __has_feature(objc_arc) - style = [EdgeStyle defaultEdgeStyleWithName:style_name]; -#else - style = [[EdgeStyle defaultEdgeStyleWithName:style_name] retain]; -#endif - return NO; -} - -- (NSPoint) _findContactPointOn:(Node*)node at:(float)angle { - NSPoint rayStart = [node point]; - Shape *shape = [node shape]; - if (shape == nil) { - return rayStart; - } - - Transformer *shapeTrans = [node shapeTransformer]; - // rounding errors are a pain - NSRect searchArea = NSInsetRect([node boundsUsingShapeTransform:shapeTrans],-0.01,-0.01); - if (!NSPointInRect(rayStart, searchArea)) { - return rayStart; - } - - NSPoint rayEnd = findExitPointOfRay (rayStart, angle, searchArea); - - for (NSArray *path in [shape paths]) { - for (Edge *curve in path) { - NSPoint intersect; - [curve updateControls]; - if (lineSegmentIntersectsBezier (rayStart, rayEnd, - [shapeTrans toScreen:curve->tail], - [shapeTrans toScreen:curve->cp1], - [shapeTrans toScreen:curve->cp2], - [shapeTrans toScreen:curve->head], - &intersect)) { - // we just keep shortening the line - rayStart = intersect; - } - } - } - - return rayStart; -} - -- (NSPoint) _findTanFor:(NSPoint)pt usingSpanFrom:(float)t1 to:(float)t2 { - float dx = bezierInterpolate(t2, tail.x, cp1.x, cp2.x, head.x) - - bezierInterpolate(t1, tail.x, cp1.x, cp2.x, head.x); - float dy = bezierInterpolate(t2, tail.y, cp1.y, cp2.y, head.y) - - bezierInterpolate(t1, tail.y, cp1.y, cp2.y, head.y); - - // normalise - float len = sqrt(dx*dx+dy*dy); - if (len != 0) { - dx = (dx/len) * 0.1f; - dy = (dy/len) * 0.1f; - } - - return NSMakePoint (pt.x + dx, pt.y + dy); -} - -- (void)recalculateProperties { - dirty = YES; -} - -- (void)updateControls { - // check for external modification to the node locations - if (src.x != [source point].x || src.y != [source point].y || - targ.x != [target point].x || targ.y != [target point].y) - { - dirty = YES; - } - - if (dirty) { - src = [source point]; - targ = [target point]; - - float dx = (targ.x - src.x); - float dy = (targ.y - src.y); - - float angleSrc = 0.0f; - float angleTarg = 0.0f; - - if (bendMode == EdgeBendModeBasic) { - float angle = good_atan(dx, dy); - float bnd = (float)bend * (M_PI / 180.0f); - angleSrc = angle - bnd; - angleTarg = M_PI + angle + bnd; - } else if (bendMode == EdgeBendModeInOut) { - angleSrc = (float)outAngle * (M_PI / 180.0f); - angleTarg = (float)inAngle * (M_PI / 180.0f); - } - - tail = [self _findContactPointOn:source at:angleSrc]; - head = [self _findContactPointOn:target at:angleTarg]; - - // give a default distance for self-loops - float cdist = (dx==0.0f && dy==0.0f) ? weight : sqrt(dx*dx + dy*dy) * weight; - - cp1 = NSMakePoint(src.x + (cdist * cos(angleSrc)), - src.y + (cdist * sin(angleSrc))); - - cp2 = NSMakePoint(targ.x + (cdist * cos(angleTarg)), - targ.y + (cdist * sin(angleTarg))); - - mid = bezierInterpolateFull (0.5f, tail, cp1, cp2, head); - midTan = [self _findTanFor:mid usingSpanFrom:0.4f to:0.6f]; - - tailTan = [self _findTanFor:tail usingSpanFrom:0.0f to:0.1f]; - headTan = [self _findTanFor:head usingSpanFrom:1.0f to:0.9f]; - } - dirty = NO; -} - -- (void)convertBendToAngles { - float dx = (targ.x - src.x); - float dy = (targ.y - src.y); - float angle = good_atan(dx, dy); - float bnd = (float)bend * (M_PI / 180.0f); - - [self setOutAngle:round((angle - bnd) * (180.0f/M_PI))]; - [self setInAngle:round((M_PI + angle + bnd) * (180.0f/M_PI))]; - dirty = YES; -} - -- (void)convertAnglesToBend { - float dx = (targ.x - src.x); - float dy = (targ.y - src.y); - int angle = round((180.0f/M_PI) * good_atan(dx, dy)); - - // compute bend1 and bend2 to match inAngle and outAngle, resp. - int bend1, bend2; - - bend1 = outAngle - angle; - bend2 = angle - inAngle; - - [self setBend:(bend1 + bend2) / 2]; -} - -- (BOOL)isSelfLoop { - return (source == target); -} - -- (BOOL)isStraight { - return (bendMode == EdgeBendModeBasic && bend == 0); -} - -- (NSPoint)mid { - [self updateControls]; - return mid; -} - -- (NSPoint)midTan { - [self updateControls]; - return midTan; -} - -- (NSPoint)leftNormal { - [self updateControls]; - return NSMakePoint(mid.x + (mid.y - midTan.y), mid.y - (mid.x - midTan.x)); -} - -- (NSPoint)rightNormal { - [self updateControls]; - return NSMakePoint(mid.x - (mid.y - midTan.y), mid.y + (mid.x - midTan.x)); -} - -- (NSPoint)headTan { - [self updateControls]; - return headTan; -} - -- (NSPoint)leftHeadNormal { - [self updateControls]; - return NSMakePoint(headTan.x + (head.y - headTan.y), headTan.y - (head.x - headTan.x)); -} - -- (NSPoint)rightHeadNormal { - [self updateControls]; - return NSMakePoint(headTan.x - (head.y - headTan.y), headTan.y + (head.x - headTan.x)); -} - -- (NSPoint)tailTan { - [self updateControls]; - return tailTan; -} - -- (NSPoint)leftTailNormal { - [self updateControls]; - return NSMakePoint(tailTan.x + (tail.y - tailTan.y), tailTan.y - (tail.x - tailTan.x)); -} - -- (NSPoint)rightTailNormal { - [self updateControls]; - return NSMakePoint(tailTan.x - (tail.y - tailTan.y), tailTan.y + (tail.x - tailTan.x)); -} - -- (NSPoint) head { - [self updateControls]; - return head; -} - -- (NSPoint) tail { - [self updateControls]; - return tail; -} - -- (NSPoint)cp1 { - [self updateControls]; - return cp1; -} - -- (NSPoint)cp2 { - [self updateControls]; - return cp2; -} - -- (int)inAngle {return inAngle;} -- (void)setInAngle:(int)a { - inAngle = normaliseAngleDeg (a); - dirty = YES; -} - -- (int)outAngle {return outAngle;} -- (void)setOutAngle:(int)a { - outAngle = normaliseAngleDeg (a); - dirty = YES; -} - -- (EdgeBendMode)bendMode {return bendMode;} -- (void)setBendMode:(EdgeBendMode)mode { - bendMode = mode; - dirty = YES; -} - -- (int)bend {return bend;} -- (void)setBend:(int)b { - bend = normaliseAngleDeg (b); - dirty = YES; -} - -- (float)weight {return weight;} -- (void)setWeight:(float)w { -// if (source == target) weight = 1.0f; -// else weight = w; - weight = w; - dirty = YES; -} - -- (EdgeStyle*)style {return style;} -- (void)setStyle:(EdgeStyle*)s { - if (style != s) { -#if __has_feature(objc_arc) - style = s; -#else - [style release]; - style = [s retain]; -#endif - } -} - -- (Node*)source {return source;} -- (void)setSource:(Node *)s { - if (source != s) { - [source removeObserver:self - forKeyPath:@"style"]; - - if ([s style] == nil) { - [self setSourceAnchor:@"center"]; - } else if ([sourceAnchor isEqual:@"center"]) { - [self setSourceAnchor:@""]; - } - -#if __has_feature(objc_arc) - source = s; -#else - [source release]; - source = [s retain]; -#endif - - if (source==target) { - bendMode = EdgeBendModeInOut; - weight = 1.0f; - } - - [source addObserver:self - forKeyPath:@"style" - options:NSKeyValueObservingOptionNew - | NSKeyValueObservingOptionOld - context:NULL]; - - dirty = YES; - } -} - -- (Node*)target {return target;} -- (void)setTarget:(Node *)t { - if (target != t) { - [target removeObserver:self - forKeyPath:@"style"]; - - if ([t style] == nil) { - [self setTargetAnchor:@"center"]; - } else if ([targetAnchor isEqual:@"center"]) { - [self setTargetAnchor:@""]; - } - -#if __has_feature(objc_arc) - target = t; -#else - [target release]; - target = [t retain]; -#endif - - if (source==target) { - bendMode = EdgeBendModeInOut; - weight = 1.0f; - } - - [target addObserver:self - forKeyPath:@"style" - options:NSKeyValueObservingOptionNew - | NSKeyValueObservingOptionOld - context:NULL]; - - dirty = YES; - } -} - -- (void)observeValueForKeyPath:(NSString *)keyPath - ofObject:(id)object - change:(NSDictionary *)change - context:(void *)context - -{ - if ([keyPath isEqual:@"style"]) { - id oldStyle = [change objectForKey:NSKeyValueChangeOldKey]; - id newStyle = [change objectForKey:NSKeyValueChangeNewKey]; - id none = [NSNull null]; - if (object == source) { - if (oldStyle != none && newStyle == none) { - [self setSourceAnchor:@"center"]; - } else if (oldStyle == none && newStyle != none && - [sourceAnchor isEqual:@"center"]) { - [self setSourceAnchor:@""]; - } - } - if (object == target) { - if (oldStyle != none && newStyle == none) { - [self setTargetAnchor:@"center"]; - } else if (oldStyle == none && newStyle != none && - [targetAnchor isEqual:@"center"]) { - [self setTargetAnchor:@""]; - } - } - } - dirty = YES; -} - - -// edgeNode and hasEdgeNode use a bit of key-value observing to help the mac GUI keep up - -- (Node*)edgeNode {return edgeNode;} -- (void)setEdgeNode:(Node *)n { - [self willChangeValueForKey:@"edgeNode"]; - [self willChangeValueForKey:@"hasEdgeNode"]; - if (edgeNode != n) { - hasEdgeNode = (n != nil); -#if __has_feature(objc_arc) - edgeNode = n; -#else - [edgeNode release]; - edgeNode = [n retain]; -#endif - // don't set dirty bit, because control points don't need update - } - [self didChangeValueForKey:@"edgeNode"]; - [self didChangeValueForKey:@"hasEdgeNode"]; -} - -- (BOOL)hasEdgeNode { return hasEdgeNode; } -- (void)setHasEdgeNode:(BOOL)b { - [self willChangeValueForKey:@"edgeNode"]; - [self willChangeValueForKey:@"hasEdgeNode"]; - hasEdgeNode = b; - if (hasEdgeNode && edgeNode == nil) { - edgeNode = [[Node alloc] init]; - } - [self didChangeValueForKey:@"edgeNode"]; - [self didChangeValueForKey:@"hasEdgeNode"]; -} - -- (NSString*) sourceAnchor { return sourceAnchor; } -- (void)setSourceAnchor:(NSString *)_sourceAnchor{ - NSString *oldSourceAnchor = sourceAnchor; - if(_sourceAnchor != nil){ - sourceAnchor = [_sourceAnchor copy]; - }else{ - sourceAnchor = @""; - } -#if ! __has_feature(objc_arc) - [oldSourceAnchor release]; -#endif -} - -- (NSString*) targetAnchor { return targetAnchor; } -- (void)setTargetAnchor:(NSString *)_targetAnchor{ - NSString *oldTargetAnchor = targetAnchor; - if(_targetAnchor != nil){ - targetAnchor = [_targetAnchor copy]; - }else{ - targetAnchor = @""; - } -#if ! __has_feature(objc_arc) - [oldTargetAnchor release]; -#endif -} - -@synthesize data; -- (void) insertObject:(GraphElementProperty*)gep - inDataAtIndex:(NSUInteger)index { - [data insertObject:gep atIndex:index]; -} -- (void) removeObjectFromDataAtIndex:(NSUInteger)index { - [data removeObjectAtIndex:index]; -} -- (void) replaceObjectInDataAtIndex:(NSUInteger)index - withObject:(GraphElementProperty*)gep { - [data replaceObjectAtIndex:index withObject:gep]; -} - -- (void)updateData { - // unset everything to avoid redundant defs - [data unsetAtom:@"loop"]; - [data unsetProperty:@"in"]; - [data unsetProperty:@"out"]; - [data unsetAtom:@"bend left"]; - [data unsetAtom:@"bend right"]; - [data unsetProperty:@"bend left"]; - [data unsetProperty:@"bend right"]; - [data unsetProperty:@"looseness"]; - - if (style == nil) { - [data unsetProperty:@"style"]; - } else { - [data setProperty:[style name] forKey:@"style"]; - } - - if (bendMode == EdgeBendModeBasic && bend != 0) { - NSString *bendkey = @"bend right"; - int b = [self bend]; - if (b < 0) { - bendkey = @"bend left"; - b = -b; - } - - if (b == 30) { - [data setAtom:bendkey]; - } else { - [data setProperty:[NSString stringWithFormat:@"%d",b] forKey:bendkey]; - } - - } else if (bendMode == EdgeBendModeInOut) { - [data setProperty:[NSString stringWithFormat:@"%d",inAngle] - forKey:@"in"]; - [data setProperty:[NSString stringWithFormat:@"%d",outAngle] - forKey:@"out"]; - } - - // loop needs to come after in/out - if (source == target) [data setAtom:@"loop"]; - - if (![self isSelfLoop] && ![self isStraight]) - { - [data setProperty:[NSString stringWithFormat:@"%.2f",weight*2.5f] - forKey:@"looseness"]; - } -} - -- (void)setAttributesFromData { - bendMode = EdgeBendModeBasic; - - if ([data isAtomSet:@"bend left"]) { - [self setBend:-30]; - } else if ([data isAtomSet:@"bend right"]) { - [self setBend:30]; - } else if ([data propertyForKey:@"bend left"] != nil) { - NSString *bnd = [data propertyForKey:@"bend left"]; - [self setBend:-[bnd intValue]]; - } else if ([data propertyForKey:@"bend right"] != nil) { - NSString *bnd = [data propertyForKey:@"bend right"]; - [self setBend:[bnd intValue]]; - } else { - [self setBend:0]; - - if ([data propertyForKey:@"in"] != nil && [data propertyForKey:@"out"] != nil) { - bendMode = EdgeBendModeInOut; - [self setInAngle:[[data propertyForKey:@"in"] intValue]]; - [self setOutAngle:[[data propertyForKey:@"out"] intValue]]; - } - } - - if ([data propertyForKey:@"looseness"] != nil) { - weight = [[data propertyForKey:@"looseness"] floatValue] / 2.5f; - } else { - weight = ([self isSelfLoop]) ? 1.0f : 0.4f; - } -} - -- (void)setPropertiesFromEdge:(Edge*)e { - Node *en = [[e edgeNode] copy]; - [self setEdgeNode:en]; -#if ! __has_feature(objc_arc) - [en release]; -#endif - - GraphElementData *d = [[e data] copy]; - [self setData:d]; -#if ! __has_feature(objc_arc) - [d release]; -#endif - - [self setStyle:[e style]]; - [self setBend:[e bend]]; - [self setInAngle:[e inAngle]]; - [self setOutAngle:[e outAngle]]; - [self setBendMode:[e bendMode]]; - [self setWeight:[e weight]]; - - dirty = YES; // cached data will be recomputed lazily, rather than copied -} - -- (NSRect)boundingRect { - [self updateControls]; - NSRect bound = NSRectAround4Points(head, tail, cp1, cp2); - if ([self style] != nil) { - switch ([[self style] decorationStyle]) { - case ED_Arrow: - bound = NSRectWithPoint(bound, [self midTan]); - case ED_Tick: - bound = NSRectWithPoint(bound, [self leftNormal]); - bound = NSRectWithPoint(bound, [self rightNormal]); - case ED_None: - break; - } - if ([[self style] headStyle] != AH_None) { - bound = NSRectWithPoint(bound, [self leftHeadNormal]); - bound = NSRectWithPoint(bound, [self rightHeadNormal]); - } - if ([[self style] tailStyle] != AH_None) { - bound = NSRectWithPoint(bound, [self leftTailNormal]); - bound = NSRectWithPoint(bound, [self rightTailNormal]); - } - } - return bound; -} - -- (void) adjustWeight:(float)handle_dist withCourseness:(float)wcourseness { - float base_dist = NSDistanceBetweenPoints (src, targ); - if (base_dist == 0.0f) { - base_dist = 1.0f; - } - - [self setWeight:roundToNearest(wcourseness, handle_dist / base_dist)]; -} - -- (float) angleOf:(NSPoint)point relativeTo:(NSPoint)base { - float dx = point.x - base.x; - float dy = point.y - base.y; - return radiansToDegrees (good_atan(dx, dy)); -} - -- (void) moveCp1To:(NSPoint)point withWeightCourseness:(float)wc andBendCourseness:(int)bc forceLinkControlPoints:(BOOL)link { - [self updateControls]; - [self adjustWeight:NSDistanceBetweenPoints (point, src) withCourseness:wc]; - - float control_angle = [self angleOf:point relativeTo:src]; - if (bendMode == EdgeBendModeBasic) { - float base_angle = [self angleOf:targ relativeTo:src]; - int b = (int)roundToNearest (bc, base_angle - control_angle); - [self setBend:b]; - } else { - int angle = (int)roundToNearest (bc, control_angle); - if (link) { - [self setInAngle:(inAngle + angle - outAngle)]; - } - [self setOutAngle:angle]; - } -} - -- (void) moveCp1To:(NSPoint)point { - [self moveCp1To:point withWeightCourseness:0.0f andBendCourseness:0 forceLinkControlPoints:NO]; -} - -- (void) moveCp2To:(NSPoint)point withWeightCourseness:(float)wc andBendCourseness:(int)bc forceLinkControlPoints:(BOOL)link { - [self updateControls]; - - if (![self isSelfLoop]) { - [self adjustWeight:NSDistanceBetweenPoints (point, targ) withCourseness:wc]; - } - - float control_angle = [self angleOf:point relativeTo:targ]; - if (bendMode == EdgeBendModeBasic) { - float base_angle = [self angleOf:src relativeTo:targ]; - int b = (int)roundToNearest (bc, control_angle - base_angle); - [self setBend:b]; - } else { - int angle = (int)roundToNearest (bc, control_angle); - if (link) { - [self setOutAngle:(outAngle + angle - inAngle)]; - } - [self setInAngle: angle]; - } -} - -- (void) moveCp2To:(NSPoint)point { - [self moveCp2To:point withWeightCourseness:0.0f andBendCourseness:0 forceLinkControlPoints:NO]; -} - -- (void)reverse { - Node *n; - float f; - NSString *a; - - n = source; - source = target; - target = n; - - f = inAngle; - inAngle = outAngle; - outAngle = f; - - a = sourceAnchor; - sourceAnchor = targetAnchor; - targetAnchor = a; - - [self setBend:-bend]; - - dirty = YES; -} - -- (void)dealloc { - [source removeObserver:self - forKeyPath:@"style"]; - [target removeObserver:self - forKeyPath:@"style"]; -#if ! __has_feature(objc_arc) - [source release]; - [target release]; - [data release]; - [sourceAnchor release]; - [targetAnchor release]; - [super dealloc]; -#endif -} - -- (id)copyWithZone:(NSZone*)zone { - Edge *cp = [[Edge allocWithZone:zone] init]; - [cp setSource:[self source]]; - [cp setTarget:[self target]]; - [cp setSourceAnchor:[self sourceAnchor]]; - [cp setTargetAnchor:[self targetAnchor]]; - [cp setPropertiesFromEdge:self]; - return cp; -} - -+ (Edge*)edge { -#if __has_feature(objc_arc) - return [[Edge alloc] init]; -#else - return [[[Edge alloc] init] autorelease]; -#endif -} - -+ (Edge*)edgeWithSource:(Node*)s andTarget:(Node*)t { -#if __has_feature(objc_arc) - return [[Edge alloc] initWithSource:s andTarget:t]; -#else - return [[[Edge alloc] initWithSource:s andTarget:t] autorelease]; -#endif -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit/src/common/EdgeStyle.h b/tikzit/src/common/EdgeStyle.h deleted file mode 100644 index a51f129..0000000 --- a/tikzit/src/common/EdgeStyle.h +++ /dev/null @@ -1,71 +0,0 @@ -// -// EdgeStyle.h -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "PropertyHolder.h" -#import "ColorRGB.h" - -typedef enum { - AH_None = 0, - AH_Plain = 1, - AH_Latex = 2 -} ArrowHeadStyle; - -typedef enum { - ED_None = 0, - ED_Arrow = 1, - ED_Tick = 2 -} EdgeDectorationStyle; - -@interface EdgeStyle : PropertyHolder { - ArrowHeadStyle headStyle, tailStyle; - EdgeDectorationStyle decorationStyle; - float thickness; - ColorRGB *colorRGB; - NSString *name; - NSString *category; -} - -/*! - @property colorRGB - @brief The color to render the line in - */ -@property (copy) ColorRGB *colorRGB; - -@property (copy) NSString *name; -@property (copy) NSString *category; -@property (assign) ArrowHeadStyle headStyle; -@property (assign) ArrowHeadStyle tailStyle; -@property (assign) EdgeDectorationStyle decorationStyle; -@property (assign) float thickness; - -@property (readonly) NSString *tikz; - -- (id)init; -- (id)initWithName:(NSString*)nm; -+ (EdgeStyle*)defaultEdgeStyleWithName:(NSString*)nm; -- (void) updateFromStyle:(EdgeStyle*)style; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit/src/common/EdgeStyle.m b/tikzit/src/common/EdgeStyle.m deleted file mode 100644 index c61e94a..0000000 --- a/tikzit/src/common/EdgeStyle.m +++ /dev/null @@ -1,222 +0,0 @@ -// -// EdgeStyle.m -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "EdgeStyle.h" - -@implementation EdgeStyle - -+ (void)initialize { - [self setKeys:[NSArray arrayWithObjects: - @"tailStyle", - @"headStyle", - @"decorationStyle", - @"thickness", - @"colorRGB.red", - @"colorRGB.blue", - @"colorRGB.green", - @"name", - nil] - triggerChangeNotificationsForDependentKey:@"tikz"]; - [self setKeys:[NSArray arrayWithObjects: - @"colorRGB.name", - nil] - triggerChangeNotificationsForDependentKey:@"colorIsKnown"]; -} - -- (id)initWithName:(NSString*)nm { - self = [super initWithNotificationName:@"EdgeStylePropertyChanged"]; - - if (self != nil) { - headStyle = AH_None; - tailStyle = AH_None; - decorationStyle = ED_None; - colorRGB = [[ColorRGB alloc] initWithRed:0 green:0 blue:0]; - name = nm; - category = nil; - thickness = 1.0f; - } - - return self; -} - -- (id)init { - self = [self initWithName:@"new"]; - return self; -} - -- (id)copyWithZone:(NSZone*)zone { - EdgeStyle *style = [[EdgeStyle allocWithZone:zone] init]; - [style setName:[self name]]; - [style setCategory:[self category]]; - [style setHeadStyle:[self headStyle]]; - [style setTailStyle:[self tailStyle]]; - [style setDecorationStyle:[self decorationStyle]]; - [style setThickness:[self thickness]]; - [style setColorRGB:[self colorRGB]]; - return style; -} - -- (void)dealloc { -#if ! __has_feature(objc_arc) - [name release]; - [category release]; - [colorRGB release]; - [super dealloc]; -#endif -} - -- (NSString*) description { - return [NSString stringWithFormat:@"Edge style \"%@\"", name]; -} - -- (void) updateFromStyle:(EdgeStyle*)style { - [self setName:[style name]]; - [self setCategory:[style category]]; - [self setHeadStyle:[style headStyle]]; - [self setTailStyle:[style tailStyle]]; - [self setDecorationStyle:[style decorationStyle]]; - [self setThickness:[style thickness]]; - [self setColorRGB:[style colorRGB]]; -} - -+ (EdgeStyle*)defaultEdgeStyleWithName:(NSString*)nm { -#if __has_feature(objc_arc) - return [[EdgeStyle alloc] initWithName:nm]; -#else - return [[[EdgeStyle alloc] initWithName:nm] autorelease]; -#endif -} - -- (NSString*)name { return name; } -- (void)setName:(NSString *)s { - if (name != s) { - NSString *oldValue = name; - name = [s copy]; - [self postPropertyChanged:@"name" oldValue:oldValue]; -#if ! __has_feature(objc_arc) - [oldValue release]; -#endif - } -} - -- (ArrowHeadStyle)headStyle { return headStyle; } -- (void)setHeadStyle:(ArrowHeadStyle)s { - ArrowHeadStyle oldValue = headStyle; - headStyle = s; - [self postPropertyChanged:@"headStyle" oldValue:[NSNumber numberWithInt:oldValue]]; -} - -- (ArrowHeadStyle)tailStyle { return tailStyle; } -- (void)setTailStyle:(ArrowHeadStyle)s { - ArrowHeadStyle oldValue = tailStyle; - tailStyle = s; - [self postPropertyChanged:@"tailStyle" oldValue:[NSNumber numberWithInt:oldValue]]; -} - -- (EdgeDectorationStyle)decorationStyle { return decorationStyle; } -- (void)setDecorationStyle:(EdgeDectorationStyle)s { - EdgeDectorationStyle oldValue = decorationStyle; - decorationStyle = s; - [self postPropertyChanged:@"decorationStyle" oldValue:[NSNumber numberWithInt:oldValue]]; -} -- (float)thickness { return thickness; } -- (void)setThickness:(float)s { - float oldValue = thickness; - thickness = s; - [self postPropertyChanged:@"thickness" oldValue:[NSNumber numberWithFloat:oldValue]]; -} - -- (NSString*)category { - return category; -} - -- (void)setCategory:(NSString *)s { - if (category != s) { - NSString *oldValue = category; - category = [s copy]; - [self postPropertyChanged:@"category" oldValue:oldValue]; -#if ! __has_feature(objc_arc) - [oldValue release]; -#endif - } -} - -- (ColorRGB*)colorRGB { - return colorRGB; -} - -- (void)setColorRGB:(ColorRGB*)c { - if (colorRGB != c) { - ColorRGB *oldValue = colorRGB; - colorRGB = [c copy]; - [self postPropertyChanged:@"colorRGB" oldValue:oldValue]; -#if ! __has_feature(objc_arc) - [oldValue release]; -#endif - } -} - -- (NSString*)tikz { - NSMutableString *buf = [NSMutableString stringWithFormat:@"\\tikzstyle{%@}=[", name]; - - NSString *colorName = [colorRGB name]; - if (colorName == nil) - colorName = [colorRGB hexName]; - - if (tailStyle == AH_Plain) - [buf appendString:@"<"]; - else if (tailStyle == AH_Latex) - [buf appendString:@"latex"]; - - [buf appendString:@"-"]; - - if (headStyle == AH_Plain) - [buf appendString:@">"]; - else if (headStyle == AH_Latex) - [buf appendString:@"latex"]; - - if(colorName != nil){ - [buf appendString:@",draw="]; - [buf appendString:colorName]; - } - - if (decorationStyle != ED_None) { - [buf appendString:@",postaction={decorate},decoration={markings,mark="]; - if (decorationStyle == ED_Arrow) - [buf appendString:@"at position .5 with {\\arrow{>}}"]; - else if (decorationStyle == ED_Tick) - [buf appendString:@"at position .5 with {\\draw (0,-0.1) -- (0,0.1);}"]; - [buf appendString:@"}"]; - } - - if (thickness != 1.0f) { - [buf appendFormat:@",line width=%.3f", thickness]; - } - - [buf appendString:@"]"]; - return buf; -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit/src/common/Graph.h b/tikzit/src/common/Graph.h deleted file mode 100644 index 1f98858..0000000 --- a/tikzit/src/common/Graph.h +++ /dev/null @@ -1,401 +0,0 @@ -// -// Graph.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - - -/*! - - @mainpage TikZiT - TikZiT is a GUI application for drawing, editing, and parsing TikZ - diagrams. Common code is in src/common, and plaform-specific code is - in src/{osx,linux}. - - */ - - -#import "Node.h" -#import "Edge.h" -#import "GraphChange.h" -#import "Transformer.h" - -/*! - @class Graph - @brief Store a graph, output to TikZ. - @details All of the methods that change a graph return an object of type GraphChange. - Graph changes can be re-done by calling applyGraphChange. They can be undone - by calling applyGraphChange on [change inverse]. - */ -@interface Graph : NSObject { - NSRecursiveLock *graphLock; - BOOL dirty; // keep track of when inEdges and outEdges need an update - NSMutableArray *nodes; - NSMutableArray *edges; - - NSMapTable *inEdges; - NSMapTable *outEdges; - - GraphElementData *data; - NSRect boundingBox; -} - -/*! - @property data - @brief Data associated with the graph. - */ -@property (copy) GraphElementData *data; - -// KVC methods -- (void) insertObject:(GraphElementProperty*)gep - inDataAtIndex:(NSUInteger)index; -- (void) removeObjectFromDataAtIndex:(NSUInteger)index; -- (void) replaceObjectInDataAtIndex:(NSUInteger)index - withObject:(GraphElementProperty*)gep; - -/*! - @property nodes - @brief The set of nodes. - @details The node set is cached internally, so no need to lock - the graph when enumerating. - */ -@property (readonly) NSArray *nodes; - -/*! - @property edges - @brief The set of edges. - @details The edge set is cached internally, so no need to lock - the graph when enumerating. - */ -@property (readonly) NSArray *edges; - -/*! - @property boundingBox - @brief The bounding box of a graph - @details Optional data containing the bounding box, set with - \path [use as bounding box] .... - */ -@property (assign) NSRect boundingBox; - -/*! - @property hasBoundingBox - @brief Returns true if this graph has a bounding box. - */ -@property (readonly) BOOL hasBoundingBox; - - -/*! - @brief Computes graph bounds. - @result Graph bounds. - */ -- (NSRect)bounds; - -/*! - @brief Returns the set of edges incident to the given node set. - @param nds a set of nodes. - @result A set of incident edges. - */ -- (NSSet*)incidentEdgesForNodes:(NSSet*)nds; - -/*! - @brief Returns the set of in-edges for this node. - @param nd a node. - @result A set of edges. -*/ -- (NSSet*)inEdgesForNode:(Node*)nd; - -/*! - @brief Returns the set of out-edges for this node. - @param nd a node. - @result A set of edges. -*/ -- (NSSet*)outEdgesForNode:(Node*)nd; - -/*! - @brief Gives a copy of the full subgraph with the given nodes. - @param nds a set of nodes. - @result A subgraph. - */ -- (Graph*)copyOfSubgraphWithNodes:(NSSet*)nds; - -/*! - @brief Gives a copy of the full subgraph with the given nodes. - @param nds a set of nodes. - @param zone an allocation zone - @result A subgraph. - */ -- (Graph*)copyOfSubgraphWithNodes:(NSSet*)nds zone:(NSZone*)zone; - -/*! - @brief Gives a set of edge-arrays that partition all of the edges in the graph. - @result An NSet of NSArrays of edges. - */ -- (NSSet*)pathCover; - -/*! - @brief Adds a node. - @param node - @result A GraphChange recording this action. - */ -- (GraphChange*)addNode:(Node*)node; - -/*! - @brief Removes a node. - @param node - @result A GraphChange recording this action. - */ -- (GraphChange*)removeNode:(Node*)node; - -/*! - @brief Removes a set of nodes. - @param nds a set of nodes - @result A GraphChange recording this action. - */ -- (GraphChange*)removeNodes:(NSSet *)nds; - -/*! - @brief Adds an edge. - @param edge - @result A GraphChange recording this action. - */ -- (GraphChange*)addEdge:(Edge*)edge; - -/*! - @brief Removed an edge. - @param edge - @result A GraphChange recording this action. - */ -- (GraphChange*)removeEdge:(Edge*)edge; - -/*! - @brief Removes a set of edges. - @param es a set of edges. - @result A GraphChange recording this action. - */ -- (GraphChange*)removeEdges:(NSSet *)es; - -/*! - @brief Convenience function, intializes an edge with the given - source and target and adds it. - @param source the source of the edge. - @param target the target of the edge. - @result A GraphChange recording this action. - */ -- (GraphChange*)addEdgeFrom:(Node*)source to:(Node*)target; - -/*! - @brief Return the z-index for a given node (lower is farther back). - @param node a node in the graph - @result An int - */ -- (int)indexOfNode:(Node*)node; - -/*! - @brief Set the z-index for a given node (lower is farther back). - @param idx a new z-index - @param node a node in the graph - */ -- (void)setIndex:(int)idx ofNode:(Node*)node; - -/*! - @brief Bring set of nodes forward by one. - @param nodeSet a set of nodes - */ -- (GraphChange*)bringNodesForward:(NSSet*)nodeSet; - -/*! - @brief Bring set of nodes to the front. - @param nodeSet a set of nodes - */ -- (GraphChange*)bringNodesToFront:(NSSet*)nodeSet; - -/*! - @brief Bring set of edges to the front. - @param edgeSet a set of edges - */ -- (GraphChange*)bringEdgesToFront:(NSSet*)edgeSet; - -/*! - @brief Bring set of edges forward by one. - @param edgeSet a set of edges - */ -- (GraphChange*)bringEdgesForward:(NSSet*)edgeSet; - -/*! - @brief Send set of nodes backward by one. - @param nodeSet a set of nodes - */ -- (GraphChange*)sendNodesBackward:(NSSet*)nodeSet; - -/*! - @brief Send set of edges backward by one. - @param edgeSet a set of edges - */ -- (GraphChange*)sendEdgesBackward:(NSSet*)edgeSet; - -/*! - @brief Send set of nodes to back. - @param nodeSet a set of nodes - */ -- (GraphChange*)sendNodesToBack:(NSSet*)nodeSet; - -/*! - @brief Send set of edges to back. - @param edgeSet a set of edges - */ -- (GraphChange*)sendEdgesToBack:(NSSet*)edgeSet; - - -/*! - @brief Transform every node in the graph to screen space. - @param t a transformer - */ -- (void)applyTransformer:(Transformer*)t; - -/*! - @brief Shift nodes by a given distance. - @param ns a set of nodes. - @param p an x and y distance, given as an NSPoint. - @result A GraphChange recording this action. - */ -- (GraphChange*)shiftNodes:(id)ns byPoint:(NSPoint)p; - -/*! - @brief Reverse the given edges - @param es the edges to reverse - @result A GraphChange recording this action. - */ -- (GraphChange*)reverseEdges:(NSSet *)es; - -/*! - @brief Insert the given graph into this one. Used for copy - and paste. - @param g a graph. - @result A GraphChange recording this action. - */ -- (GraphChange*)insertGraph:(Graph*)g; - -/*! - @brief Flip the subgraph defined by the given node set - horizontally. - @param nds a set of nodes. - @result A GraphChange recording this action. - */ -- (GraphChange*)flipHorizontalNodes:(NSSet*)nds; - -/*! - @brief Flip the subgraph defined by the given node set - vertically. - @param nds a set of nodes. - @result A GraphChange recording this action. - */ -- (GraphChange*)flipVerticalNodes:(NSSet*)nds; - -/*! - @brief Apply a graph change. - @details An undo manager should maintain a stack of GraphChange - objects returned. To undo a GraphChange, call this method - with [change inverse] as is argument. - @param ch a graph change. - */ -- (void)applyGraphChange:(GraphChange*)ch; - -/*! - @brief The TikZ representation of this graph. - @details The TikZ representation of this graph. The TikZ code should - contain enough data to totally reconstruct the graph. - @result A string containing TikZ code. - */ -- (NSString*)tikz; - - -/*! - @brief Copy the node set and return a table of copies, whose - keys are the original nodes. This is used to save the state - of a set of nodes in a GraphChange. - @param nds a set of nodes. - @result A NSMapTable of node copies. - */ -+ (NSMapTable*)nodeTableForNodes:(NSSet*)nds; - -+ (NSMapTable*)nodeTableForNodes:(NSSet*)nds withZone:(NSZone*)zone; - -/*! - @brief Copy the edge set and return a table of copies, whose - keys are the original edges. This is used to save the state - of a set of edges in a GraphChange. - @param es a set of edges. - @result A NSMapTable of edge copies. - */ -+ (NSMapTable*)edgeTableForEdges:(NSSet*)es; - -+ (NSMapTable*)edgeTableForEdges:(NSSet*)es withZone:(NSZone*)zone; - -/*! - @brief Compute the bounds for a set of nodes. - @param nds an enumerable collection of nodes. - @result The bounds. - */ -+ (NSRect)boundsForNodes:(id)nds; - -/*! - @brief Factory method for constructing graphs. - @result An empty graph. - */ -+ (Graph*)graph; - -/** - * Initialize an empty graph - */ -- (id)init; - -/** - * Constructs a graph from the given tikz code - * - * See TikzGraphAssembler for more information about the error argument. - */ -+ (Graph*)graphFromTikz:(NSString*)tikz error:(NSError**)e; - -/** - * Constructs a graph from the given tikz code - */ -+ (Graph*)graphFromTikz:(NSString*)tikz; - -/** - * Initialize an empty graph from the given tikz code - * - * Note that this may not return the same object it was called on, - * and will return nil if parsing failed. - * - * See TikzGraphAssembler for more information about the error argument. - */ -- (id)initFromTikz:(NSString*)tikz error:(NSError**)e; - -/** - * Initialize an empty graph from the given tikz code - * - * Note that this may not return the same object it was called on, - * and will return nil if parsing failed. - */ -- (id)initFromTikz:(NSString*)tikz; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit/src/common/Graph.m b/tikzit/src/common/Graph.m deleted file mode 100644 index cf09a69..0000000 --- a/tikzit/src/common/Graph.m +++ /dev/null @@ -1,922 +0,0 @@ -// -// Graph.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "Graph.h" -#import "TikzGraphAssembler.h" -#import "Shape.h" - -@interface Graph (Private) -- (void) shapeDictionaryReplaced:(NSNotification*)notification; -@end - -@implementation Graph - -- (id)init { - self = [super init]; - if (self != nil) { - data = [[GraphElementData alloc] init]; - boundingBox = NSMakeRect(0, 0, 0, 0); - graphLock = [[NSRecursiveLock alloc] init]; - nodes = [[NSMutableArray alloc] initWithCapacity:10]; - edges = [[NSMutableArray alloc] initWithCapacity:10]; - inEdges = nil; - outEdges = nil; - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(shapeDictionaryReplaced:) - name:@"ShapeDictionaryReplaced" - object:[Shape class]]; - } - return self; -} - -- (id)initFromTikz:(NSString*)tikz error:(NSError**)e { -#if __has_feature(objc_arc) - return [TikzGraphAssembler parseTikz:tikz error:e]; -#else - [self release]; - return [[TikzGraphAssembler parseTikz:tikz error:e] retain]; -#endif -} - -- (id)initFromTikz:(NSString*)tikz { - return [self initFromTikz:tikz error:NULL]; -} - -- (id) copyWithZone:(NSZone*)zone { - Graph *newGraph = [self copyOfSubgraphWithNodes:[NSSet setWithArray:nodes] zone:zone]; - [newGraph setData:[self data]]; - return newGraph; -} - -- (void)dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - [graphLock lock]; -#if ! __has_feature(objc_arc) - [inEdges release]; - [outEdges release]; - [edges release]; - [nodes release]; - [data release]; - [graphLock unlock]; - [graphLock release]; - - [super dealloc]; -#endif -} - -- (void)sync { - [graphLock lock]; - if (dirty) { -#if ! __has_feature(objc_arc) - [inEdges release]; - [outEdges release]; -#endif - inEdges = [[NSMapTable alloc] initWithKeyOptions:NSMapTableStrongMemory valueOptions:NSMapTableStrongMemory capacity:10]; - outEdges = [[NSMapTable alloc] initWithKeyOptions:NSMapTableStrongMemory valueOptions:NSMapTableStrongMemory capacity:10]; - -#if ! __has_feature(objc_arc) - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; -#endif - - for (Edge *e in edges) { - NSMutableSet *ie = [inEdges objectForKey:[e target]]; - NSMutableSet *oe = [outEdges objectForKey:[e source]]; - - if (ie == nil) { - ie = [NSMutableSet setWithCapacity:4]; - [inEdges setObject:ie forKey:[e target]]; - } - - if (oe == nil) { - oe = [NSMutableSet setWithCapacity:4]; - [outEdges setObject:oe forKey:[e source]]; - } - - [ie addObject:e]; - [oe addObject:e]; - } - -#if ! __has_feature(objc_arc) - [pool drain]; -#endif - - dirty = NO; - } - [graphLock unlock]; -} - -@synthesize nodes; -@synthesize edges; - -@synthesize data; -- (void) insertObject:(GraphElementProperty*)gep - inDataAtIndex:(NSUInteger)index { - [data insertObject:gep atIndex:index]; -} -- (void) removeObjectFromDataAtIndex:(NSUInteger)index { - [data removeObjectAtIndex:index]; -} -- (void) replaceObjectInDataAtIndex:(NSUInteger)index - withObject:(GraphElementProperty*)gep { - [data replaceObjectAtIndex:index withObject:gep]; -} - -@synthesize boundingBox; - -- (NSRect)bounds { - [graphLock lock]; - NSRect b = [Graph boundsForNodes:nodes]; - [graphLock unlock]; - return b; -} - -- (BOOL)hasBoundingBox { - return !( - boundingBox.size.width == 0 && - boundingBox.size.height == 0 - ); -} - -- (NSSet*)inEdgesForNode:(Node*)nd { - [self sync]; -#if __has_feature(objc_arc) - return [inEdges objectForKey:nd]; -#else - return [[[inEdges objectForKey:nd] retain] autorelease]; -#endif -} - -- (NSSet*)outEdgesForNode:(Node*)nd { - [self sync]; -#if __has_feature(objc_arc) - return [outEdges objectForKey:nd]; -#else - return [[[outEdges objectForKey:nd] retain] autorelease]; -#endif -} - -- (NSSet*)incidentEdgesForNodes:(NSSet*)nds { - [self sync]; - - NSMutableSet *mset = [NSMutableSet setWithCapacity:10]; - for (Node *n in nds) { - [mset unionSet:[self inEdgesForNode:n]]; - [mset unionSet:[self outEdgesForNode:n]]; - } - - return mset; -} - -- (void)applyTransformer:(Transformer *)t { - [graphLock lock]; - for (Node *n in nodes) { - [n setPoint:[t toScreen:[n point]]]; - } - [graphLock unlock]; -} - -- (GraphChange*)addNode:(Node *)node{ - [graphLock lock]; - NSSet *addedNode; - - // addNode is a no-op if graph already contains node - if (![nodes containsObject:node]) { - [nodes addObject:node]; - dirty = YES; - addedNode = [NSSet setWithObject:node]; - } else { - addedNode = [NSSet set]; - } - [graphLock unlock]; - - return [GraphChange graphAdditionWithNodes:addedNode - edges:[NSSet set]]; -} - -- (GraphChange*)removeNode:(Node*)node { - [graphLock lock]; - NSMutableSet *affectedEdges = [NSMutableSet set]; - for (Edge *e in edges) { - if ([e source] == node || [e target] == node) { - [affectedEdges addObject:e]; - } - } - for (Edge *e in affectedEdges) { - [edges removeObject:e]; - } - [nodes removeObject:node]; - dirty = YES; - [graphLock unlock]; - - return [GraphChange graphDeletionWithNodes:[NSSet setWithObject:node] - edges:affectedEdges]; -} - -- (GraphChange*)removeNodes:(NSSet *)nds { - [graphLock lock]; - - Node *n; - Edge *e; - - NSMutableSet *affectedEdges = [NSMutableSet set]; - NSEnumerator *en = [edges objectEnumerator]; - while ((e = [en nextObject])) { - if ([nds containsObject:[e source]] || [nds containsObject:[e target]]) { - [affectedEdges addObject:e]; - } - } - - en = [affectedEdges objectEnumerator]; - while ((e = [en nextObject])) [edges removeObject:e]; - - en = [nds objectEnumerator]; - while ((n = [en nextObject])) [nodes removeObject:n]; - - dirty = YES; - [graphLock unlock]; - - return [GraphChange graphDeletionWithNodes:nds edges:affectedEdges]; -} - -- (GraphChange*)addEdge:(Edge*)edge { - [graphLock lock]; - NSSet *addedEdge; - - // addEdge is a no-op if graph already contains edge - if (![edges containsObject:edge]) { - [edges addObject:edge]; - dirty = YES; - addedEdge = [NSSet setWithObject:edge]; - } else { - addedEdge = [NSSet set]; - } - [graphLock unlock]; - - return [GraphChange graphAdditionWithNodes:[NSSet set] - edges:addedEdge]; -} - -- (GraphChange*)removeEdge:(Edge *)edge { - [graphLock lock]; - [edges removeObject:edge]; - dirty = YES; - [graphLock unlock]; - return [GraphChange graphDeletionWithNodes:[NSSet set] - edges:[NSSet setWithObject:edge]]; -} - -- (GraphChange*)removeEdges:(NSSet *)es { - [graphLock lock]; - - for (Edge *e in es) { - [edges removeObject:e]; - } - dirty = YES; - [graphLock unlock]; - return [GraphChange graphDeletionWithNodes:[NSSet set] edges:es]; -} - -- (GraphChange*)addEdgeFrom:(Node *)source to:(Node *)target { - return [self addEdge:[Edge edgeWithSource:source andTarget:target]]; -} - -- (GraphChange*)shiftNodes:(id)ns byPoint:(NSPoint)p { - NSPoint newLoc; - NSMutableSet *nodeSet = [NSMutableSet setWithCapacity:5]; - for (Node *n in ns) { - newLoc = NSMakePoint([n point].x + p.x, [n point].y + p.y); - [n setPoint:newLoc]; - [nodeSet addObject:n]; - } - return [GraphChange shiftNodes:nodeSet byPoint:p]; -} - -- (GraphChange*)reverseEdges:(NSSet *)es { - [graphLock lock]; - for (Edge *e in es) { - [e reverse]; - } - dirty = YES; - [graphLock unlock]; - return [GraphChange reverseEdges:es]; -} - -- (int)indexOfNode:(Node *)node { - return [nodes indexOfObject:node]; -} - -- (void)setIndex:(int)idx ofNode:(Node *)node { - [graphLock lock]; - - if ([nodes containsObject:node]) { - [nodes removeObject:node]; - [nodes insertObject:node atIndex:idx]; - } - - [graphLock unlock]; -} - -- (int)indexOfEdge:(Edge *)edge { - return [edges indexOfObject:edge]; -} - -- (void)setIndex:(int)idx ofEdge:(Edge *)edge { - [graphLock lock]; - - if ([edges containsObject:edge]) { - [edges removeObject:edge]; - [edges insertObject:edge atIndex:idx]; - } - - [graphLock unlock]; -} - -- (GraphChange*)bringNodesForward:(NSSet*)nodeSet { - NSArray *oldOrder = [nodes copy]; - [graphLock lock]; - // start at the top of the array and work backwards - for (int i = [nodes count]-2; i >= 0; --i) { - if ( [nodeSet containsObject:[nodes objectAtIndex:i]] && - ![nodeSet containsObject:[nodes objectAtIndex:i+1]]) - { - [self setIndex:(i+1) ofNode:[nodes objectAtIndex:i]]; - } - } - GraphChange *change = [GraphChange nodeOrderChangeFrom:oldOrder to:nodes moved:nodeSet]; - [graphLock unlock]; - -#if ! __has_feature(objc_arc) - [oldOrder release]; -#endif - - return change; -} - -- (GraphChange*)bringNodesToFront:(NSSet*)nodeSet { - NSArray *oldOrder = [nodes copy]; - int i = 0, top = [nodes count]-1; - - while (i <= top) { - if ([nodeSet containsObject:[nodes objectAtIndex:i]]) { - [self setIndex:([nodes count]-1) ofNode:[nodes objectAtIndex:i]]; - --top; - } else { - ++i; - } - } - GraphChange *change = [GraphChange nodeOrderChangeFrom:oldOrder to:nodes moved:nodeSet]; - -#if ! __has_feature(objc_arc) - [oldOrder release]; -#endif - - return change; -} - -- (GraphChange*)bringEdgesForward:(NSSet*)edgeSet { - [graphLock lock]; - NSArray *oldOrder = [edges copy]; - // start at the top of the array and work backwards - for (int i = [edges count]-2; i >= 0; --i) { - if ( [edgeSet containsObject:[edges objectAtIndex:i]] && - ![edgeSet containsObject:[edges objectAtIndex:i+1]]) - { - [self setIndex:(i+1) ofEdge:[edges objectAtIndex:i]]; - } - } - GraphChange *change = [GraphChange edgeOrderChangeFrom:oldOrder to:edges moved:edgeSet]; - [graphLock unlock]; - -#if ! __has_feature(objc_arc) - [oldOrder release]; -#endif - - return change; -} - -- (GraphChange*)bringEdgesToFront:(NSSet*)edgeSet { - NSArray *oldOrder = [edges copy]; - int i = 0, top = [edges count]-1; - - while (i <= top) { - if ([edgeSet containsObject:[edges objectAtIndex:i]]) { - [self setIndex:([edges count]-1) ofEdge:[edges objectAtIndex:i]]; - --top; - } else { - ++i; - } - } - GraphChange *change = [GraphChange edgeOrderChangeFrom:oldOrder to:edges moved:edgeSet]; - -#if ! __has_feature(objc_arc) - [oldOrder release]; -#endif - - return change; -} - -- (GraphChange*)sendNodesBackward:(NSSet*)nodeSet { - [graphLock lock]; - NSArray *oldOrder = [nodes copy]; - // start at the top of the array and work backwards - for (int i = 1; i < [nodes count]; ++i) { - if ( [nodeSet containsObject:[nodes objectAtIndex:i]] && - ![nodeSet containsObject:[nodes objectAtIndex:i-1]]) - { - [self setIndex:(i-1) ofNode:[nodes objectAtIndex:i]]; - } - } - GraphChange *change = [GraphChange nodeOrderChangeFrom:oldOrder to:nodes moved:nodeSet]; - [graphLock unlock]; - -#if ! __has_feature(objc_arc) - [oldOrder release]; -#endif - - return change; -} - -- (GraphChange*)sendEdgesBackward:(NSSet*)edgeSet { - [graphLock lock]; - NSArray *oldOrder = [edges copy]; - // start at the top of the array and work backwards - for (int i = 1; i < [edges count]; ++i) { - if ( [edgeSet containsObject:[edges objectAtIndex:i]] && - ![edgeSet containsObject:[edges objectAtIndex:i-1]]) - { - [self setIndex:(i-1) ofEdge:[edges objectAtIndex:i]]; - } - } - GraphChange *change = [GraphChange edgeOrderChangeFrom:oldOrder to:edges moved:edgeSet]; - [graphLock unlock]; - -#if ! __has_feature(objc_arc) - [oldOrder release]; -#endif - - return change; -} - -- (GraphChange*)sendNodesToBack:(NSSet*)nodeSet { - NSArray *oldOrder = [nodes copy]; - int i = [nodes count]-1, bot = 0; - - while (i >= bot) { - if ([nodeSet containsObject:[nodes objectAtIndex:i]]) { - [self setIndex:0 ofNode:[nodes objectAtIndex:i]]; - ++bot; - } else { - --i; - } - } - GraphChange *change = [GraphChange nodeOrderChangeFrom:oldOrder to:nodes moved:nodeSet]; - -#if ! __has_feature(objc_arc) - [oldOrder release]; -#endif - - return change; -} - -- (GraphChange*)sendEdgesToBack:(NSSet*)edgeSet { - NSArray *oldOrder = [edges copy]; - int i = [edges count]-1, bot = 0; - - while (i >= bot) { - if ([edgeSet containsObject:[edges objectAtIndex:i]]) { - [self setIndex:0 ofEdge:[edges objectAtIndex:i]]; - ++bot; - } else { - --i; - } - } - GraphChange *change = [GraphChange edgeOrderChangeFrom:oldOrder to:edges moved:edgeSet]; - -#if ! __has_feature(objc_arc) - [oldOrder release]; -#endif - - return change; -} - -- (GraphChange*)insertGraph:(Graph*)g { - [graphLock lock]; - - for (Node *n in [g nodes]) { - [self addNode:n]; - } - - for (Edge *e in [g edges]) { - [self addEdge:e]; - } - - dirty = YES; - - [graphLock unlock]; - - - return [GraphChange graphAdditionWithNodes:[NSSet setWithArray:[g nodes]] edges:[NSSet setWithArray:[g edges]]]; -} - -- (void)flipNodes:(NSSet*)nds horizontal:(BOOL)horiz { - [graphLock lock]; - - NSRect bds = [Graph boundsForNodes:nds]; - float ctr; - if (horiz) ctr = bds.origin.x + (bds.size.width/2); - else ctr = bds.origin.y + (bds.size.height/2); - - Node *n; - NSPoint p; - NSEnumerator *en = [nds objectEnumerator]; - while ((n = [en nextObject])) { - p = [n point]; - if (horiz) p.x = 2 * ctr - p.x; - else p.y = 2 * ctr - p.y; - [n setPoint:p]; - } - - Edge *e; - en = [edges objectEnumerator]; - while ((e = [en nextObject])) { - if ([nds containsObject:[e source]] && - [nds containsObject:[e target]]) - { - if ([e bendMode] == EdgeBendModeInOut) { - if (horiz) { - if ([e inAngle] < 0) [e setInAngle:(-180 - [e inAngle])]; - else [e setInAngle:180 - [e inAngle]]; - - if ([e outAngle] < 0) [e setOutAngle:(-180 - [e outAngle])]; - else [e setOutAngle:180 - [e outAngle]]; - } else { - [e setInAngle:-[e inAngle]]; - [e setOutAngle:-[e outAngle]]; - } - } else { - [e setBend:-[e bend]]; - } - } - } - - [graphLock unlock]; -} - -- (GraphChange*)flipHorizontalNodes:(NSSet*)nds { - [self flipNodes:nds horizontal:YES]; - return [GraphChange flipNodes:nds horizontal:YES]; -} - -- (GraphChange*)flipVerticalNodes:(NSSet*)nds { - [self flipNodes:nds horizontal:NO]; - return [GraphChange flipNodes:nds horizontal:NO]; -} - -- (Graph*)copyOfSubgraphWithNodes:(NSSet*)nds { - return [self copyOfSubgraphWithNodes:nds zone:NSDefaultMallocZone()]; -} - -- (Graph*)copyOfSubgraphWithNodes:(NSSet*)nds zone:(NSZone*)zone { - [graphLock lock]; - - NSMapTable *newNds = [Graph nodeTableForNodes:nds withZone:zone]; - Graph* newGraph = [[Graph allocWithZone:zone] init]; - - for (Node *nd in [newNds objectEnumerator]) { - [newGraph addNode:nd]; - } - - for (Edge *e in edges) { - if ([nds containsObject:[e source]] && [nds containsObject:[e target]]) { - Edge *e1 = [e copyWithZone:zone]; - [e1 setSource:[newNds objectForKey:[e source]]]; - [e1 setTarget:[newNds objectForKey:[e target]]]; - [newGraph addEdge:e1]; -#if ! __has_feature(objc_arc) - [e1 release]; // e1 belongs to newGraph -#endif - } - } - - [graphLock unlock]; - - return newGraph; -} - -- (NSSet*)pathCover { - [self sync]; - - NSMutableSet *cover = [NSMutableSet set]; -#if ! __has_feature(objc_arc) - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; -#endif - NSMutableSet *remainingEdges = [NSMutableSet setWithArray:edges]; - - while ([remainingEdges count] != 0) { - NSMutableArray *path = [[NSMutableArray alloc] init]; - NSSet *succs; - Edge *succ; - NSEnumerator *en; - - Edge *e = [remainingEdges anyObject]; - - while (e!=nil) { - [path addObject:e]; - [remainingEdges removeObject:e]; - - succs = [self outEdgesForNode:[e target]]; - en = [succs objectEnumerator]; - e = nil; - - while ((succ = [en nextObject])) { - if ([remainingEdges containsObject:succ]) e = succ; - } - } - - [cover addObject:path]; -#if ! __has_feature(objc_arc) - [path release]; -#endif - } - -#if ! __has_feature(objc_arc) - [pool drain]; -#endif - return cover; -} - -- (void)applyGraphChange:(GraphChange*)ch { - [graphLock lock]; - switch ([ch changeType]) { - case GraphAddition: - for (Node *n in [[ch affectedNodes] objectEnumerator]) { - [nodes addObject:n]; - } - - for (Edge *e in [[ch affectedEdges] objectEnumerator]) { - [edges addObject:e]; - } - - break; - case GraphDeletion: - for (Edge *e in [[ch affectedEdges] objectEnumerator]) { - [edges removeObject:e]; - } - - for (Node *n in [[ch affectedNodes] objectEnumerator]) { - [nodes removeObject:n]; - } - - break; - case NodePropertyChange: - [[ch nodeRef] setPropertiesFromNode:[ch nwNode]]; - break; - case NodesPropertyChange: - for (Node *key in [[ch nwNodeTable] keyEnumerator]) { - [key setPropertiesFromNode:[[ch nwNodeTable] objectForKey:key]]; - } - break; - case EdgePropertyChange: - [[ch edgeRef] setPropertiesFromEdge:[ch nwEdge]]; - break; - case EdgesPropertyChange: - for (Edge *key in [[ch nwEdgeTable] keyEnumerator]) { - [key setPropertiesFromEdge:[[ch nwEdgeTable] objectForKey:key]]; - } - break; - case NodesShift: - for (Node *n in [[ch affectedNodes] objectEnumerator]) { - [n setPoint:NSMakePoint([n point].x + [ch shiftPoint].x, - [n point].y + [ch shiftPoint].y)]; - } - break; - case NodesFlip: - [self flipNodes:[ch affectedNodes] horizontal:[ch horizontal]]; - break; - case EdgesReverse: - for (Edge *e in [[ch affectedEdges] objectEnumerator]) { - [e reverse]; - } - break; - case BoundingBoxChange: - [self setBoundingBox:[ch nwBoundingBox]]; - break; - case GraphPropertyChange: - [data setArray:[ch nwGraphData]]; - break; - case NodeOrderChange: - [nodes setArray:[ch nwNodeOrder]]; - break; - case EdgeOrderChange: - [edges setArray:[ch nwEdgeOrder]]; - break; - } - - dirty = YES; - [graphLock unlock]; -} - -//- (void)undoGraphChange:(GraphChange*)ch { -// [self applyGraphChange:[GraphChange inverseGraphChange:ch]]; -//} - -- (NSString*)tikz { - [graphLock lock]; - - NSMutableString *code = [NSMutableString - stringWithFormat:@"\\begin{tikzpicture}%@\n", - [[self data] tikzList]]; - - if ([self hasBoundingBox]) { - [code appendFormat:@"\t\\path [use as bounding box] (%@,%@) rectangle (%@,%@);\n", - [NSNumber numberWithFloat:boundingBox.origin.x], - [NSNumber numberWithFloat:boundingBox.origin.y], - [NSNumber numberWithFloat:boundingBox.origin.x + boundingBox.size.width], - [NSNumber numberWithFloat:boundingBox.origin.y + boundingBox.size.height]]; - } - -// NSArray *sortedNodeList = [[nodes allObjects] -// sortedArrayUsingSelector:@selector(compareTo:)]; - //NSMutableDictionary *nodeNames = [NSMutableDictionary dictionary]; - - if ([nodes count] > 0) [code appendFormat:@"\t\\begin{pgfonlayer}{nodelayer}\n"]; - - int i = 0; - for (Node *n in nodes) { - [n updateData]; - [n setName:[NSString stringWithFormat:@"%d", i]]; - [code appendFormat:@"\t\t\\node %@ (%d) at (%@, %@) {%@};\n", - [[n data] tikzList], - i, - formatFloat([n point].x, 4), - formatFloat([n point].y, 4), - [n label] - ]; - i++; - } - - if ([nodes count] > 0) [code appendFormat:@"\t\\end{pgfonlayer}\n"]; - if ([edges count] > 0) [code appendFormat:@"\t\\begin{pgfonlayer}{edgelayer}\n"]; - - NSString *nodeStr; - for (Edge *e in edges) { - [e updateData]; - - if ([e hasEdgeNode]) { - nodeStr = [NSString stringWithFormat:@"node%@{%@} ", - [[[e edgeNode] data] tikzList], - [[e edgeNode] label] - ]; - } else { - nodeStr = @""; - } - - NSString *edata = [[e data] tikzList]; - - NSString *srcAnchor; - NSString *tgtAnchor; - - if ([[e sourceAnchor] isEqual:@""]) { - srcAnchor = @""; - } else { - srcAnchor = [NSString stringWithFormat:@".%@", [e sourceAnchor]]; - } - - if ([[e targetAnchor] isEqual:@""]) { - tgtAnchor = @""; - } else { - tgtAnchor = [NSString stringWithFormat:@".%@", [e targetAnchor]]; - } - - [code appendFormat:@"\t\t\\draw%@ (%@%@) to %@(%@%@);\n", - ([edata isEqual:@""]) ? @"" : [NSString stringWithFormat:@" %@", edata], - [[e source] name], - srcAnchor, - nodeStr, - ([e source] == [e target]) ? @"" : [[e target] name], - tgtAnchor - ]; - } - - if ([edges count] > 0) [code appendFormat:@"\t\\end{pgfonlayer}\n"]; - - [code appendString:@"\\end{tikzpicture}"]; - - [graphLock unlock]; - - return code; -} - -+ (Graph*)graph { -#if __has_feature(objc_arc) - return [[self alloc] init]; -#else - return [[[self alloc] init] autorelease]; -#endif -} - -+ (Graph*)graphFromTikz:(NSString*)tikz error:(NSError**)e { - return [TikzGraphAssembler parseTikz:tikz error:e]; -} - -+ (Graph*)graphFromTikz:(NSString*)tikz { - return [self graphFromTikz:tikz error:NULL]; -} - -+ (NSMapTable*)nodeTableForNodes:(NSSet*)nds { - return [self nodeTableForNodes:nds withZone:NSDefaultMallocZone()]; -} - -+ (NSMapTable*)nodeTableForNodes:(NSSet*)nds withZone:(NSZone*)zone { - NSMapTable *tab = [[NSMapTable allocWithZone:zone] - initWithKeyOptions:NSMapTableStrongMemory - valueOptions:NSMapTableStrongMemory - capacity:[nds count]]; - for (Node *n in nds) { - Node *ncopy = [n copyWithZone:zone]; - [tab setObject:ncopy forKey:n]; -#if ! __has_feature(objc_arc) - [ncopy release]; // tab should still retain ncopy. -#endif - } -#if __has_feature(objc_arc) - return tab; -#else - return [tab autorelease]; -#endif -} - -+ (NSMapTable*)edgeTableForEdges:(NSSet*)es { - return [self edgeTableForEdges:es withZone:NSDefaultMallocZone()]; -} - -+ (NSMapTable*)edgeTableForEdges:(NSSet*)es withZone:(NSZone*)zone { - NSMapTable *tab = [[NSMapTable allocWithZone:zone] - initWithKeyOptions:NSMapTableStrongMemory - valueOptions:NSMapTableStrongMemory - capacity:[es count]]; - for (Edge *e in es) { - Edge *ecopy = [e copyWithZone:zone]; - [tab setObject:ecopy forKey:e]; -#if ! __has_feature(objc_arc) - [ecopy release]; // tab should still retain ecopy. -#endif - } - return tab; -} - - -+ (NSRect)boundsForNodes:(id)nds { - NSPoint tl, br; - NSPoint p; - BOOL hasPoints = NO; - for (Node *n in nds) { - p = [n point]; - if (!hasPoints) { - tl = p; - br = p; - hasPoints = YES; - } else { - if (p.x < tl.x) tl.x = p.x; - if (p.y > tl.y) tl.y = p.y; - if (p.x > br.x) br.x = p.x; - if (p.y < br.y) br.y = p.y; - } - } - - return (hasPoints) ? NSRectAroundPoints(tl, br) : NSMakeRect(0, 0, 0, 0); -} - -@end - -@implementation Graph (Private) -- (void) shapeDictionaryReplaced:(NSNotification*)notification { - for (Edge *e in edges) { - [e recalculateProperties]; - } -} -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit/src/common/GraphChange.h b/tikzit/src/common/GraphChange.h deleted file mode 100644 index 0e71a90..0000000 --- a/tikzit/src/common/GraphChange.h +++ /dev/null @@ -1,344 +0,0 @@ -// -// GraphChange.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "Node.h" -#import "Edge.h" - -typedef enum { - GraphAddition, - GraphDeletion, - NodePropertyChange, - EdgePropertyChange, - NodesPropertyChange, - EdgesPropertyChange, - NodesShift, - NodesFlip, - EdgesReverse, - BoundingBoxChange, - GraphPropertyChange, - NodeOrderChange, - EdgeOrderChange -} ChangeType; - -/*! - @class GraphChange - @brief Store the data associated with a graph change. - @details All of the methods that change a graph return an object of type GraphChange. - Graph changes can be re-done by calling [graph applyGraphChange:]. They can be undone - by calling applyGraphChange on [change inverse]. This class has no public initializer, - so everything should be constructed by factory methods. - */ -@interface GraphChange : NSObject { - ChangeType changeType; - - // for addition, deletion, and shifts - NSSet *affectedNodes; - NSSet *affectedEdges; - NSPoint shiftPoint; - - // for flip - BOOL horizontal; - - // for property changes - Node *nodeRef; - Edge *edgeRef; - - Node *oldNode, *nwNode; - Edge *oldEdge, *nwEdge; - NSMapTable *oldNodeTable, *nwNodeTable; - NSMapTable *oldEdgeTable, *nwEdgeTable; - NSRect oldBoundingBox, nwBoundingBox; - GraphElementData *oldGraphData, *nwGraphData; - - NSArray *oldNodeOrder, *nwNodeOrder; - NSArray *oldEdgeOrder, *nwEdgeOrder; -} - -/*! - @property changeType - @brief Type of GraphChange. - */ -@property (assign) ChangeType changeType; - -/*! - @property shiftPoint - @brief A point storing a shifted distance. - */ -@property (assign) NSPoint shiftPoint; - -/*! - @property horizontal - @brief Flags whether nodes were flipped horizontally - */ -@property (assign) BOOL horizontal; - -/*! - @property affectedNodes - @brief A set of nodes affected by this change, may be undefined. - */ -@property (copy) NSSet *affectedNodes; - -/*! - @property affectedEdges - @brief A set of edges affected by this change, may be undefined. - */ -@property (copy) NSSet *affectedEdges; - -/*! - @property nodeRef - @brief A reference to a single node affected by this change, may be undefined. - */ -@property (retain) Node *nodeRef; - -/*! - @property oldNode - @brief A copy of the node pre-change. - */ -@property (copy) Node *oldNode; - -/*! - @property nwNode - @brief A copy of the node post-change. - */ -@property (copy) Node *nwNode; - -/*! - @property edgeRef - @brief A reference to a single edge affected by this change, may be undefined. - */ -@property (retain) Edge *edgeRef; - -/*! - @property oldEdge - @brief A copy of the edge pre-change. - */ -@property (copy) Edge *oldEdge; - -/*! - @property nwEdge - @brief A copy of the edge post-change. - */ -@property (copy) Edge *nwEdge; - -/*! - @property oldNodeTable - @brief A a table containing copies of a set of nodes pre-change. - */ -@property (retain) NSMapTable *oldNodeTable; - -/*! - @property nwNodeTable - @brief A a table containing copies of a set of nodes post-change. - */ -@property (retain) NSMapTable *nwNodeTable; - -/*! - @property oldEdgeTable - @brief A a table containing copies of a set of edges pre-change. - */ -@property (retain) NSMapTable *oldEdgeTable; - -/*! - @property nwEdgeTable - @brief A a table containing copies of a set of edges post-change. - */ -@property (retain) NSMapTable *nwEdgeTable; - -/*! - @property oldBoundingBox - @brief The old bounding box. - */ -@property (assign) NSRect oldBoundingBox; - -/*! - @property nwBoundingBox - @brief The new bounding box. - */ -@property (assign) NSRect nwBoundingBox; - -/*! - @property oldGraphData - @brief The old graph data. - */ -@property (copy) GraphElementData *oldGraphData; - -/*! - @property nwGraphData - @brief The new graph data. - */ -@property (copy) GraphElementData *nwGraphData; - -/*! - @property oldNodeOrder - @brief The old node list. - */ -@property (copy) NSArray *oldNodeOrder; - -/*! - @property nwNodeOrder - @brief The new node list. - */ -@property (copy) NSArray *nwNodeOrder; - -/*! - @property oldEdgeOrder - @brief The old edge list. - */ -@property (copy) NSArray *oldEdgeOrder; - -/*! - @property nwEdgeOrder - @brief The new edge list. - */ -@property (copy) NSArray *nwEdgeOrder; - -/*! - @brief Invert a GraphChange. - @details Invert a GraphChange. Calling [graph applyGraphChange:[[graph msg:...] invert]] - should leave the graph unchanged for any method of Graph that returns a - GraphChange. - @result The inverse of the current Graph Change. - */ -- (GraphChange*)invert; - -/*! - @brief Construct a graph addition. affectedNodes are the added nodes, - affectedEdges are the added edges. - @param ns a set of nodes. - @param es a set of edges. - @result A graph addition. - */ -+ (GraphChange*)graphAdditionWithNodes:(NSSet*)ns edges:(NSSet*)es; - -/*! - @brief Construct a graph deletion. affectedNodes are the deleted nodes, - affectedEdges are the deleted edges. - @param ns a set of nodes. - @param es a set of edges. - @result A graph deletion. - */ -+ (GraphChange*)graphDeletionWithNodes:(NSSet*)ns edges:(NSSet*)es; - -/*! - @brief Construct a property change of a single node. - @param nd the affected node. - @param old a copy of the node pre-change - @param nw a copy of the node post-change - @result A property change of a single node. - */ -+ (GraphChange*)propertyChangeOfNode:(Node*)nd fromOld:(Node*)old toNew:(Node*)nw; - -/*! - @brief Construct a property change of a single edge. - @param e the affected edge. - @param old a copy of the edge pre-change - @param nw a copy of the edge post-change - @result A property change of a single node. - */ -+ (GraphChange*)propertyChangeOfEdge:(Edge*)e fromOld:(Edge *)old toNew:(Edge *)nw; - -/*! - @brief Construct a property change of set of nodes. - @details Construct a property change of set of nodes. oldC and newC should be - constructed using the class method [Graph nodeTableForNodes:] before - and after the property change, respectively. The affected nodes are - keys(oldC) = keys(newC). - @param oldC a table of copies of nodes pre-change - @param newC a table of copies of nodes post-change - @result A property change of a set of nodes. - */ -+ (GraphChange*)propertyChangeOfNodesFromOldCopies:(NSMapTable*)oldC - toNewCopies:(NSMapTable*)newC; - -/*! - @brief Construct a property change of set of edges. - @details Construct a property change of set of edges. oldC and newC should be - constructed using the class method [Graph edgeTableForEdges:] before - and after the property change, respectively. The affected edges are - keys(oldC) = keys(newC). - @param oldC a table of copies of edges pre-change - @param newC a table of copies of edges post-change - @result A property change of a set of edges. - */ -+ (GraphChange*)propertyChangeOfEdgesFromOldCopies:(NSMapTable*)oldC - toNewCopies:(NSMapTable*)newC; - - -/*! - @brief Construct a shift of a set of nodes by a given point. - @param ns the affected nodes. - @param p a point storing (dx,dy) - @result A shift of a set of nodes. - */ -+ (GraphChange*)shiftNodes:(NSSet*)ns byPoint:(NSPoint)p; - -/*! - @brief Construct a horizontal or vertical flip of a set of nodes. - @param ns the affected nodes. - @param b flag for whether to flip horizontally - @result A flip of a set of nodes. - */ -+ (GraphChange*)flipNodes:(NSSet*)ns horizontal:(BOOL)b; - -/*! - @brief Construct a reversal of a set of edges. - @param es the affected edges. - @result A reverse of a set of edges. - */ -+ (GraphChange*)reverseEdges:(NSSet*)es; - -/*! - @brief Construct a bounding box change - @param oldBB the old bounding box - @param newBB the new bounding box - @result A bounding box change. - */ -+ (GraphChange*)changeBoundingBoxFrom:(NSRect)oldBB to:(NSRect)newBB; - -/*! - @brief Construct a graph property change - @param oldData the old graph data - @param newData the new graph data - @result A graph property change. - */ -+ (GraphChange*)propertyChangeOfGraphFrom:(GraphElementData*)oldData to:(GraphElementData*)newData; - -/*! - @brief Construct a node order change - @param old The old ordering - @param new The new ordering - @result A node order change - */ -+ (GraphChange*)nodeOrderChangeFrom:(NSArray*)old to:(NSArray*)new moved:(NSSet*)affected; - -/*! - @brief Construct an edge order change - @param old The old ordering - @param new The new ordering - @result A edge order change - */ -+ (GraphChange*)edgeOrderChangeFrom:(NSArray*)old to:(NSArray*)new moved:(NSSet*)affected; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit/src/common/GraphChange.m b/tikzit/src/common/GraphChange.m deleted file mode 100644 index 29a3939..0000000 --- a/tikzit/src/common/GraphChange.m +++ /dev/null @@ -1,369 +0,0 @@ -// -// GraphChange.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - - -// GraphChange : store the data associated to a single, undo-able change -// to a graph. An undo manager should maintain a stack of such changes -// and undo/redo them on request using [graph applyGraphChange:...]. - -#import "GraphChange.h" - - -@implementation GraphChange - -- (id)init { - return [super init]; -} - -- (void)dealloc { -#if ! __has_feature(objc_arc) - [affectedNodes release]; - [affectedEdges release]; - [nodeRef release]; - [edgeRef release]; - [oldNode release]; - [nwNode release]; - [oldEdge release]; - [nwEdge release]; - [oldNodeTable release]; - [nwNodeTable release]; - [oldEdgeTable release]; - [nwEdgeTable release]; - [oldGraphData release]; - [nwGraphData release]; - [oldNodeOrder release]; - [nwNodeOrder release]; - [oldEdgeOrder release]; - [nwEdgeOrder release]; - - [super dealloc]; -#endif -} - -@synthesize changeType; -@synthesize shiftPoint, horizontal; -@synthesize affectedEdges, affectedNodes; -@synthesize edgeRef, nodeRef; -@synthesize nwNode, oldNode; -@synthesize nwEdge, oldEdge; -@synthesize oldNodeTable, nwNodeTable; -@synthesize oldEdgeTable, nwEdgeTable; -@synthesize oldBoundingBox, nwBoundingBox; -@synthesize oldGraphData, nwGraphData; -@synthesize oldNodeOrder, nwNodeOrder; -@synthesize oldEdgeOrder, nwEdgeOrder; - -- (GraphChange*)invert { - GraphChange *inverse = [[GraphChange alloc] init]; - [inverse setChangeType:[self changeType]]; - switch ([self changeType]) { - case GraphAddition: - [inverse setChangeType:GraphDeletion]; -#if __has_feature(objc_arc) - inverse->affectedNodes = affectedNodes; - inverse->affectedEdges = affectedEdges; -#else - inverse->affectedNodes = [affectedNodes retain]; - inverse->affectedEdges = [affectedEdges retain]; -#endif - break; - case GraphDeletion: - [inverse setChangeType:GraphAddition]; -#if __has_feature(objc_arc) - inverse->affectedNodes = affectedNodes; - inverse->affectedEdges = affectedEdges; -#else - inverse->affectedNodes = [affectedNodes retain]; - inverse->affectedEdges = [affectedEdges retain]; -#endif - break; - case NodePropertyChange: -#if __has_feature(objc_arc) - inverse->nodeRef = nodeRef; - inverse->oldNode = nwNode; - inverse->nwNode = oldNode; -#else - inverse->nodeRef = [nodeRef retain]; - inverse->oldNode = [nwNode retain]; - inverse->nwNode = [oldNode retain]; -#endif - break; - case NodesPropertyChange: -#if __has_feature(objc_arc) - -#else - inverse->oldNodeTable = [nwNodeTable retain]; - inverse->nwNodeTable = [oldNodeTable retain]; -#endif - break; - case EdgePropertyChange: -#if __has_feature(objc_arc) - inverse->edgeRef = edgeRef; - inverse->oldEdge = nwEdge; - inverse->nwEdge = oldEdge; -#else - inverse->edgeRef = [edgeRef retain]; - inverse->oldEdge = [nwEdge retain]; - inverse->nwEdge = [oldEdge retain]; -#endif - break; - case EdgesPropertyChange: -#if __has_feature(objc_arc) - inverse->oldEdgeTable = nwEdgeTable; - inverse->nwEdgeTable = oldEdgeTable; -#else - inverse->oldEdgeTable = [nwEdgeTable retain]; - inverse->nwEdgeTable = [oldEdgeTable retain]; -#endif - break; - case NodesShift: -#if __has_feature(objc_arc) - inverse->affectedNodes = affectedNodes; -#else - inverse->affectedNodes = [affectedNodes retain]; -#endif - [inverse setShiftPoint:NSMakePoint(-[self shiftPoint].x, - -[self shiftPoint].y)]; - break; - case NodesFlip: -#if __has_feature(objc_arc) - inverse->affectedNodes = affectedNodes; -#else - inverse->affectedNodes = [affectedNodes retain]; -#endif - [inverse setHorizontal:[self horizontal]]; - break; - case EdgesReverse: -#if __has_feature(objc_arc) - inverse->affectedEdges = affectedEdges; -#else - inverse->affectedEdges = [affectedEdges retain]; -#endif - break; - case BoundingBoxChange: - inverse->oldBoundingBox = nwBoundingBox; - inverse->nwBoundingBox = oldBoundingBox; - break; - case GraphPropertyChange: -#if __has_feature(objc_arc) - inverse->oldGraphData = nwGraphData; - inverse->nwGraphData = oldGraphData; -#else - inverse->oldGraphData = [nwGraphData retain]; - inverse->nwGraphData = [oldGraphData retain]; -#endif - break; - case NodeOrderChange: -#if __has_feature(objc_arc) - inverse->affectedNodes = affectedNodes; - inverse->oldNodeOrder = nwNodeOrder; - inverse->nwNodeOrder = oldNodeOrder; -#else - inverse->affectedNodes = [affectedNodes retain]; - inverse->oldNodeOrder = [nwNodeOrder retain]; - inverse->nwNodeOrder = [oldNodeOrder retain]; -#endif - break; - case EdgeOrderChange: -#if __has_feature(objc_arc) - inverse->affectedEdges = affectedEdges; - inverse->oldEdgeOrder = nwEdgeOrder; - inverse->nwEdgeOrder = oldEdgeOrder; -#else - inverse->affectedEdges = [affectedEdges retain]; - inverse->oldEdgeOrder = [nwEdgeOrder retain]; - inverse->nwEdgeOrder = [oldEdgeOrder retain]; -#endif - break; - } -#if __has_feature(objc_arc) - return inverse; -#else - return [inverse autorelease]; -#endif -} - -+ (GraphChange*)graphAdditionWithNodes:(NSSet *)ns edges:(NSSet *)es { - GraphChange *gc = [[GraphChange alloc] init]; - [gc setChangeType:GraphAddition]; - [gc setAffectedNodes:ns]; - [gc setAffectedEdges:es]; -#if __has_feature(objc_arc) - return gc; -#else - return [gc autorelease]; -#endif -} - -+ (GraphChange*)graphDeletionWithNodes:(NSSet *)ns edges:(NSSet *)es { - GraphChange *gc = [[GraphChange alloc] init]; - [gc setChangeType:GraphDeletion]; - [gc setAffectedNodes:ns]; - [gc setAffectedEdges:es]; -#if __has_feature(objc_arc) - return gc; -#else - return [gc autorelease]; -#endif -} - -+ (GraphChange*)propertyChangeOfNode:(Node*)nd fromOld:(Node*)old toNew:(Node*)nw { - GraphChange *gc = [[GraphChange alloc] init]; - [gc setChangeType:NodePropertyChange]; - [gc setNodeRef:nd]; - [gc setOldNode:old]; - [gc setNwNode:nw]; -#if __has_feature(objc_arc) - return gc; -#else - return [gc autorelease]; -#endif -} - -+ (GraphChange*)propertyChangeOfNodesFromOldCopies:(NSMapTable*)oldC - toNewCopies:(NSMapTable*)newC { - GraphChange *gc = [[GraphChange alloc] init]; - [gc setChangeType:NodesPropertyChange]; - [gc setOldNodeTable:oldC]; - [gc setNwNodeTable:newC]; -#if __has_feature(objc_arc) - return gc; -#else - return [gc autorelease]; -#endif -} - -+ (GraphChange*)propertyChangeOfEdge:(Edge*)e fromOld:(Edge *)old toNew:(Edge *)nw { - GraphChange *gc = [[GraphChange alloc] init]; - [gc setChangeType:EdgePropertyChange]; - [gc setEdgeRef:e]; - [gc setOldEdge:old]; - [gc setNwEdge:nw]; -#if __has_feature(objc_arc) - return gc; -#else - return [gc autorelease]; -#endif -} - -+ (GraphChange*)propertyChangeOfEdgesFromOldCopies:(NSMapTable*)oldC - toNewCopies:(NSMapTable*)newC { - GraphChange *gc = [[GraphChange alloc] init]; - [gc setChangeType:EdgesPropertyChange]; - [gc setOldEdgeTable:oldC]; - [gc setNwEdgeTable:newC]; -#if __has_feature(objc_arc) - return gc; -#else - return [gc autorelease]; -#endif -} - -+ (GraphChange*)shiftNodes:(NSSet*)ns byPoint:(NSPoint)p { - GraphChange *gc = [[GraphChange alloc] init]; - [gc setChangeType:NodesShift]; - [gc setAffectedNodes:ns]; - [gc setShiftPoint:p]; -#if __has_feature(objc_arc) - return gc; -#else - return [gc autorelease]; -#endif -} - -+ (GraphChange*)flipNodes:(NSSet*)ns horizontal:(BOOL)b { - GraphChange *gc = [[GraphChange alloc] init]; - [gc setChangeType:NodesFlip]; - [gc setAffectedNodes:ns]; - [gc setHorizontal:b]; -#if __has_feature(objc_arc) - return gc; -#else - return [gc autorelease]; -#endif -} - -+ (GraphChange*)reverseEdges:(NSSet*)es { - GraphChange *gc = [[GraphChange alloc] init]; - [gc setChangeType:EdgesReverse]; - [gc setAffectedEdges:es]; -#if __has_feature(objc_arc) - return gc; -#else - return [gc autorelease]; -#endif -} - -+ (GraphChange*)changeBoundingBoxFrom:(NSRect)oldBB to:(NSRect)newBB { - GraphChange *gc = [[GraphChange alloc] init]; - [gc setChangeType:BoundingBoxChange]; - [gc setOldBoundingBox:oldBB]; - [gc setNwBoundingBox:newBB]; -#if __has_feature(objc_arc) - return gc; -#else - return [gc autorelease]; -#endif -} - -+ (GraphChange*)propertyChangeOfGraphFrom:(GraphElementData*)oldData to:(GraphElementData*)newData { - GraphChange *gc = [[GraphChange alloc] init]; - [gc setChangeType:GraphPropertyChange]; - [gc setOldGraphData:oldData]; - [gc setNwGraphData:newData]; -#if __has_feature(objc_arc) - return gc; -#else - return [gc autorelease]; -#endif -} - -+ (GraphChange*)nodeOrderChangeFrom:(NSArray*)old to:(NSArray*)new moved:(NSSet*)affected { - GraphChange *gc = [[GraphChange alloc] init]; - [gc setChangeType:NodeOrderChange]; - [gc setAffectedNodes:affected]; - [gc setOldNodeOrder:old]; - [gc setNwNodeOrder:new]; -#if __has_feature(objc_arc) - return gc; -#else - return [gc autorelease]; -#endif -} - -+ (GraphChange*)edgeOrderChangeFrom:(NSArray*)old to:(NSArray*)new moved:(NSSet*)affected { - GraphChange *gc = [[GraphChange alloc] init]; - [gc setChangeType:EdgeOrderChange]; - [gc setAffectedEdges:affected]; - [gc setOldEdgeOrder:old]; - [gc setNwEdgeOrder:new]; -#if __has_feature(objc_arc) - return gc; -#else - return [gc autorelease]; -#endif -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit/src/common/GraphElementData.h b/tikzit/src/common/GraphElementData.h deleted file mode 100644 index a65e6df..0000000 --- a/tikzit/src/common/GraphElementData.h +++ /dev/null @@ -1,94 +0,0 @@ -// -// GraphElementData.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - - -#import - -/*! - @class GraphElementData - @brief Store extra data associated with a graph, node, or edge. - @details Store the extra (style, ...) data associated with - a graph, node, or edge. This data is stored as a mutable - array of properties. It also implements hash-like accessors, - but care should be taken using these, as the list can contain - multiple occurrences of the same key. - - Convention: Getters and setters act on the *first* occurrence - of the key. 'Unsetters' remove *all* occurrences. - */ -@interface GraphElementData : NSMutableArray { - NSMutableArray *properties; -} - -- (id)init; -+ (id)data; - -/*! - @brief Set the given value for the *first* property matching this key. Add a - new property if it doesn't already exist. - @param val the value to set - @param key the key for this property - */ -- (void)setProperty:(NSString*)val forKey:(NSString*)key; - -/*! - @brief Remove *all* occurences of the property with the given key. - @param key - */ -- (void)unsetProperty:(NSString*)key; - -/*! - @brief Return the value of the *first* occurrence of the given key. - @param key - */ -- (NSString*)propertyForKey:(NSString*)key; - -/*! - @brief Add the given atom to the list, if it's not already present. - @param atom - */ -- (void)setAtom:(NSString*)atom; - -/*! - @brief Remove *all* occurrences of the given atom. - @param atom - */ -- (void)unsetAtom:(NSString*)atom; - -/*! - @brief Returns YES if the list contains at least one occurrence of - the given atom. - @param atom - @result A boolean value. - */ -- (BOOL)isAtomSet:(NSString*)atom; - -/*! - @brief Returns a TikZ-friendly string containing all of the properties. - @result A string. - */ -- (NSString*)tikzList; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit/src/common/GraphElementData.m b/tikzit/src/common/GraphElementData.m deleted file mode 100644 index 41dc9aa..0000000 --- a/tikzit/src/common/GraphElementData.m +++ /dev/null @@ -1,188 +0,0 @@ -// -// GraphElementData.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "GraphElementData.h" -#import "GraphElementProperty.h" - - -@implementation GraphElementData - -+ (id)data { -#if __has_feature(objc_arc) - return [[self alloc] init]; -#else - return [[[self alloc] init] autorelease]; -#endif -} - -- (id)init { - self = [super init]; - if (self) { - properties = [[NSMutableArray alloc] init]; - } - return self; -} - -// all of the array messages delegate to 'properties' - -- (NSUInteger)count { return [properties count]; } -- (id)objectAtIndex:(NSUInteger)index { - return [properties objectAtIndex:index]; -} -- (NSArray*)objectsAtIndexes:(NSIndexSet*)indexes { - return [properties objectsAtIndexes:indexes]; -} - -#if __has_feature(objc_arc) -- (void) getObjects:(__unsafe_unretained id*)buffer range:(NSRange)range { -#else -- (void) getObjects:(id*)buffer range:(NSRange)range { -#endif - [properties getObjects:buffer range:range]; -} - -- (void)insertObject:(id)anObject atIndex:(NSUInteger)index { - [properties insertObject:anObject atIndex:index]; -} -- (void)removeObjectAtIndex:(NSUInteger)index { - [properties removeObjectAtIndex:index]; -} -- (void)addObject:(id)anObject { - [properties addObject:anObject]; -} -- (void)removeLastObject { - [properties removeLastObject]; -} -- (void)replaceObjectAtIndex:(NSUInteger)index withObject:(id)anObject { - [properties replaceObjectAtIndex:index withObject:anObject]; -} - -#if __has_feature(objc_arc) -- (NSUInteger) countByEnumeratingWithState:(NSFastEnumerationState *)state - objects:(__unsafe_unretained id [])stackbuf - count:(NSUInteger)len { -#else -- (NSUInteger)countByEnumeratingWithState:(NSFastEnumerationState *)state - objects:(id *)stackbuf - count:(NSUInteger)len { -#endif - return [properties countByEnumeratingWithState:state objects:stackbuf count:len]; -} - -- (void)setProperty:(NSString*)val forKey:(NSString*)key { - GraphElementProperty *m = [[GraphElementProperty alloc] initWithKeyMatching:key]; - NSInteger idx = [properties indexOfObject:m]; -#if !__has_feature(objc_arc) - [m release]; -#endif - - GraphElementProperty *p; - if (idx == NSNotFound) { - p = [[GraphElementProperty alloc] initWithPropertyValue:val forKey:key]; - [properties addObject:p]; -#if !__has_feature(objc_arc) - [p release]; -#endif - } else { - p = [properties objectAtIndex:idx]; - [p setValue:val]; - } -} - -- (void)unsetProperty:(NSString*)key { - GraphElementProperty *m = [[GraphElementProperty alloc] initWithKeyMatching:key]; - [properties removeObject:m]; -#if !__has_feature(objc_arc) - [m release]; -#endif - -} - -- (NSString*)propertyForKey:(NSString*)key { - GraphElementProperty *m = [[GraphElementProperty alloc] initWithKeyMatching:key]; - NSInteger idx = [properties indexOfObject:m]; -#if !__has_feature(objc_arc) - [m release]; -#endif - - - if (idx == NSNotFound) { - return nil; - }else { - GraphElementProperty *p = [properties objectAtIndex:idx]; - return [p value]; - } -} - -- (void)setAtom:(NSString*)atom { - GraphElementProperty *a = [[GraphElementProperty alloc] initWithAtomName:atom]; - if (![properties containsObject:a]) [properties addObject:a]; -#if !__has_feature(objc_arc) - [a release]; -#endif -} - -- (void)unsetAtom:(NSString*)atom { - GraphElementProperty *a = [[GraphElementProperty alloc] initWithAtomName:atom]; - [properties removeObject:a]; -#if !__has_feature(objc_arc) - [a release]; -#endif -} - -- (BOOL)isAtomSet:(NSString*)atom { - GraphElementProperty *a = [[GraphElementProperty alloc] initWithAtomName:atom]; - BOOL set = [properties containsObject:a]; -#if !__has_feature(objc_arc) - [a release]; -#endif - return set; -} - -- (NSString*)tikzList { - NSString *s = [properties componentsJoinedByString:@", "]; - return ([s isEqualToString:@""]) ? @"" : [NSString stringWithFormat:@"[%@]", s]; -} - -- (id)copyWithZone:(NSZone *)zone { - GraphElementData *cp = [[GraphElementData allocWithZone:zone] init]; - for (GraphElementProperty *p in properties) { - GraphElementProperty *p2 = [p copy]; - [cp addObject:p2]; -#if !__has_feature(objc_arc) - [p2 release]; -#endif - } - return cp; -} - -- (void)dealloc { -#if !__has_feature(objc_arc) - [properties release]; - [super dealloc]; -#endif -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit/src/common/GraphElementProperty.h b/tikzit/src/common/GraphElementProperty.h deleted file mode 100644 index 057cdbb..0000000 --- a/tikzit/src/common/GraphElementProperty.h +++ /dev/null @@ -1,88 +0,0 @@ -// -// GraphElementProperty.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import - -/*! - @class GraphElementProperty - @brief A property. I.e. a single entry in a node's/edge's/graph's - GraphElementData table. - */ -@interface GraphElementProperty : NSObject { - NSString *key; - NSString *value; - BOOL isAtom; - BOOL isKeyMatch; -} - -@property (copy) NSString *key; -@property (copy) NSString *value; -@property (readonly) BOOL isAtom; -@property (readonly) BOOL isKeyMatch; - -/*! - @brief Initialize a new key-matching object. - @param k a key to match - @result A key-matching object. - */ -- (id)initWithKeyMatching:(NSString*)k; -+ (id)keyMatching:(NSString*)k; - -/*! - @brief Initialize a new atomic property. - @param n the atom's name - @result An atom. - */ -- (id)initWithAtomName:(NSString*)n; -+ (id)atom:(NSString*)n; - -/*! - @brief Initialize a new property. - @param v the property's value - @param k the associated key - @result A property. - */ -- (id)initWithPropertyValue:(NSString*)v forKey:(NSString*)k; -+ (id)property:(NSString*)k withValue:(NSString*)v; - -/*! - @brief A matching function for properties. - @details Two properties match iff their keys match and one of the following: - (a) they are both atomic, (b) one is a key-matching and one is a non-atomic - property, or (c) they are both non-atomic and their values match. - @param object another GraphElementProperty - @result A boolean. - */ -- (BOOL)matches:(GraphElementProperty*)object; - -/*! - @brief An alias for matches:. This allows one to use built-in methods that - filter on isEqual: for NSObjects. - @param object another GraphElementProperty - @result A boolean. - */ -- (BOOL)isEqual:(id)object; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit/src/common/GraphElementProperty.m b/tikzit/src/common/GraphElementProperty.m deleted file mode 100644 index 25e1b15..0000000 --- a/tikzit/src/common/GraphElementProperty.m +++ /dev/null @@ -1,164 +0,0 @@ -// -// -// GraphElementProperty.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "GraphElementProperty.h" -#import "NSString+Tikz.h" - -@implementation GraphElementProperty - -+ (id)atom:(NSString*)n { -#if __has_feature(objc_arc) - return [[self alloc] initWithAtomName:n]; -#else - return [[[self alloc] initWithAtomName:n] autorelease]; -#endif -} -+ (id)property:(NSString*)k withValue:(NSString*)v { -#if __has_feature(objc_arc) - return [[self alloc] initWithPropertyValue:v forKey:k]; -#else - return [[[self alloc] initWithPropertyValue:v forKey:k] autorelease]; -#endif -} -+ (id)keyMatching:(NSString*)k { -#if __has_feature(objc_arc) - return [[self alloc] initWithKeyMatching:k]; -#else - return [[[self alloc] initWithKeyMatching:k] autorelease]; -#endif -} - -- (id)initWithAtomName:(NSString*)n { - self = [super init]; - if (self) { - [self setKey:n]; - isAtom = YES; - } - return self; -} - -- (id)initWithPropertyValue:(NSString*)v forKey:(NSString*)k { - self = [super init]; - if (self) { - [self setKey:k]; - [self setValue:v]; - } - return self; -} - -- (id)initWithKeyMatching:(NSString*)k { - self = [super init]; - if (self) { - [self setKey:k]; - isKeyMatch = YES; - } - return self; -} - -- (void) dealloc { -#if ! __has_feature(objc_arc) - [key release]; - [value release]; - [super dealloc]; -#endif -} - -- (void)setValue:(NSString *)v { - if (value != v) { -#if ! __has_feature(objc_arc) - [value release]; -#endif - value = [v copy]; - } -} - -- (NSString*)value { - if (isAtom) { - return @"(atom)"; - } else { - return value; - } -} - - -- (void)setKey:(NSString *)k { - if (key != k) { -#if ! __has_feature(objc_arc) - [key release]; -#endif - key = [k copy]; - } - if (key == nil) - key = @""; // don't allow nil keys -} - -- (NSString*)key { - return key; -} - -- (BOOL)isAtom { return isAtom; } -- (BOOL)isKeyMatch { return isKeyMatch; } - -- (BOOL)matches:(GraphElementProperty*)object { - // properties and atoms are taken to be incomparable - if ([self isAtom] != [object isAtom]) return NO; - - // only compare keys if (a) we are both atoms, (b) i am a key match, or (c) object is a key match - if (([self isAtom] && [object isAtom]) || [self isKeyMatch] || [object isKeyMatch]) { - return [[self key] isEqual:[object key]]; - } - - // otherwise compare key and value - return [[self key] isEqual:[object key]] && [[self value] isEqual:[object value]]; -} - -- (BOOL)isEqual:(id)object { - return [self matches:object]; -} - -- (id)copyWithZone:(NSZone*)zone { - if (isAtom) { - return [[GraphElementProperty allocWithZone:zone] initWithAtomName:[self key]]; - } else if (isKeyMatch) { - return [[GraphElementProperty allocWithZone:zone] initWithKeyMatching:[self key]]; - } else { - return [[GraphElementProperty allocWithZone:zone] initWithPropertyValue:[self value] forKey:[self key]]; - } -} - -- (NSString*)description { - if ([self isAtom]) { - return [[self key] tikzEscapedString]; - } else if ([self isKeyMatch]) { - return [NSString stringWithFormat:@"%@=*", [[self key] tikzEscapedString]]; - } else { - return [NSString stringWithFormat:@"%@=%@", - [[self key] tikzEscapedString], - [[self value] tikzEscapedString]]; - } -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit/src/common/Grid.h b/tikzit/src/common/Grid.h deleted file mode 100644 index b267536..0000000 --- a/tikzit/src/common/Grid.h +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import -#import "RenderContext.h" -#import "Transformer.h" - -/*! - * Provides a grid, which can be use for snapping points - * - * The grid is divided into cells, and each cell is further subdivided. - * These subdivisions are the snap points for the grid. - */ -@interface Grid: NSObject { - Transformer *transformer; - float spacing; - int cellSubdivisions; -} - -/*! - * The number of times to subdivide the edge of each cell - * - * Each cell will be divided into cellSubdivisions^2 squares. - */ -@property (assign) int cellSubdivisions; - -/*! - * The cell spacing - * - * Each cell will be @p cellSpacing wide and @p cellSpacing high. - */ -@property (assign) float cellSpacing; - - -/*! - * Create a new grid object. - * - * @param sp the cell spacing - this will be the width and height of each cell - * @param subs the number of cell subdivisions; the cell will end up being - * divided into subs*subs squares that are each sp/subs wide and high - * @param t the transformer to be used when snapping screen points - */ -+ (Grid*) gridWithSpacing:(float)sp subdivisions:(int)subs transformer:(Transformer*)t; -/*! - * Initialize a grid object. - * - * @param sp the cell spacing - this will be the width and height of each cell - * @param subs the number of cell subdivisions; each cell will end up being - * divided into subs*subs squares that are each sp/subs wide and high - * @param t the transformer to be used when snapping screen points - */ -- (id) initWithSpacing:(float)sp subdivisions:(int)subs transformer:(Transformer*)t; - -/*! - * Snap a point in screen co-ordinates - * - * @param p the point to snap, in screen co-ordinates - * @result @p p aligned to the nearest corner of a cell subdivision - */ -- (NSPoint) snapScreenPoint:(NSPoint)p; -/*! - * Snap a point in base co-ordinates - * - * @param p the point to snap - * @result @p p aligned to the nearest corner of a cell subdivision - */ -- (NSPoint) snapPoint:(NSPoint)p; - -/** - * Renders the grid - * - * The grid is rendered across the entire surface (subject to the context's - * clip). - * - * The internal transformer is used to convert between graph co-ordinates - * and graphics co-ordinates. - * - * @param cr the context to render in - */ -- (void) renderGridInContext:(id)cr; - -/** - * Renders the grid - * - * The grid is rendered across the entire surface (subject to the context's - * clip). - * - * @param cr the context to render in - * @param t a transformer that will be used to map graph co-ordinates - * to graphics co-ordinates - */ -- (void) renderGridInContext:(id)cr transformer:(Transformer*)t; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit/src/common/Grid.m b/tikzit/src/common/Grid.m deleted file mode 100644 index f597a4a..0000000 --- a/tikzit/src/common/Grid.m +++ /dev/null @@ -1,186 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * Copyright 2010 Chris Heunen - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "Grid.h" -#import "util.h" - -@implementation Grid - -+ (Grid*) gridWithSpacing:(float)sp subdivisions:(int)subs transformer:(Transformer*)t { - return [[[self alloc] initWithSpacing:sp subdivisions:subs transformer:t] autorelease]; -} - -- (id) initWithSpacing:(float)sp subdivisions:(int)subs transformer:(Transformer*)t { - self = [super init]; - - if (self) { - transformer = [t retain]; - spacing = sp; - cellSubdivisions = subs; - } - - return self; -} - -- (id) copyWithZone:(NSZone*)zone { - return [[Grid allocWithZone:zone] - initWithSpacing:spacing - subdivisions:cellSubdivisions - transformer:transformer]; -} - -- (void) dealloc { - [transformer release]; - [super dealloc]; -} - -- (int) cellSubdivisions { - return cellSubdivisions; -} - -- (void) setCellSubdivisions:(int)count { - cellSubdivisions = count; -} - -- (float) cellSpacing { - return spacing; -} - -- (void) setCellSpacing:(float)sp { - spacing = sp; -} - -- (NSPoint) snapScreenPoint:(NSPoint)point { - NSPoint gridPoint = [transformer fromScreen:point]; - return [transformer toScreen:[self snapPoint:gridPoint]]; -} - -- (NSPoint) snapPoint:(NSPoint)p { - const float snapDistance = spacing/(float)cellSubdivisions; - p.x = roundToNearest (snapDistance, p.x); - p.y = roundToNearest (snapDistance, p.y); - return p; -} - -- (void) _setupLinesForContext:(id)context withSpacing:(float)offset omittingEvery:(int)omitEvery origin:(NSPoint)origin { - NSRect clip = [context clipBoundingBox]; - float clipx1 = clip.origin.x; - float clipx2 = clipx1 + clip.size.width; - float clipy1 = clip.origin.y; - float clipy2 = clipy1 + clip.size.height; - - // left of the Y axis, moving outwards - unsigned int count = 1; - float x = origin.x - offset; - while (x >= clipx1) { - if (omitEvery == 0 || (count % omitEvery != 0)) { - [context moveTo:NSMakePoint(x, clipy1)]; - [context lineTo:NSMakePoint(x, clipy2)]; - } - - x -= offset; - ++count; - } - // right of the Y axis, moving outwards - count = 1; - x = origin.x + offset; - while (x <= clipx2) { - if (omitEvery == 0 || (count % omitEvery != 0)) { - [context moveTo:NSMakePoint(x, clipy1)]; - [context lineTo:NSMakePoint(x, clipy2)]; - } - - x += offset; - ++count; - } - - // above the Y axis, moving outwards - count = 1; - float y = origin.y - offset; - while (y >= clipy1) { - if (omitEvery == 0 || (count % omitEvery != 0)) { - [context moveTo:NSMakePoint(clipx1, y)]; - [context lineTo:NSMakePoint(clipx2, y)]; - } - - y -= offset; - ++count; - } - // below the Y axis, moving outwards - count = 1; - y = origin.y + offset; - while (y <= clipy2) { - if (omitEvery == 0 || (count % omitEvery != 0)) { - [context moveTo:NSMakePoint(clipx1, y)]; - [context lineTo:NSMakePoint(clipx2, y)]; - } - - y += offset; - ++count; - } -} - -- (void) _renderSubdivisionsWithContext:(id)context origin:(NSPoint)origin cellSize:(float)cellSize { - const float offset = cellSize / cellSubdivisions; - - [self _setupLinesForContext:context withSpacing:offset omittingEvery:cellSubdivisions origin:origin]; - - [context strokePathWithColor:MakeSolidRColor (0.9, 0.9, 1.0)]; -} - -- (void) _renderCellsWithContext:(id)context origin:(NSPoint)origin cellSize:(float)cellSize { - [self _setupLinesForContext:context withSpacing:cellSize omittingEvery:0 origin:origin]; - - [context strokePathWithColor:MakeSolidRColor (0.8, 0.8, 0.9)]; -} - -- (void) _renderAxesWithContext:(id)context origin:(NSPoint)origin { - NSRect clip = [context clipBoundingBox]; - - [context moveTo:NSMakePoint(origin.x, clip.origin.y)]; - [context lineTo:NSMakePoint(origin.x, clip.origin.y + clip.size.height)]; - [context moveTo:NSMakePoint(clip.origin.x, origin.y)]; - [context lineTo:NSMakePoint(clip.origin.x + clip.size.width, origin.y)]; - - [context strokePathWithColor:MakeSolidRColor (0.6, 0.6, 0.7)]; -} - -- (void) renderGridInContext:(id)cr { - [self renderGridInContext:cr transformer:transformer]; -} - -- (void) renderGridInContext:(id)context transformer:(Transformer*)t { - const NSPoint origin = [t toScreen:NSZeroPoint]; - const float cellSize = [t scaleToScreen:spacing]; - - [context saveState]; - - // common line settings - [context setLineWidth:1.0]; - [context setAntialiasMode:AntialiasDisabled]; - - [self _renderSubdivisionsWithContext:context origin:origin cellSize:cellSize]; - [self _renderCellsWithContext:context origin:origin cellSize:cellSize]; - [self _renderAxesWithContext:context origin:origin]; - - [context restoreState]; -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit/src/common/NSError+Tikzit.h b/tikzit/src/common/NSError+Tikzit.h deleted file mode 100644 index 0f45fba..0000000 --- a/tikzit/src/common/NSError+Tikzit.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import - -NSString* const TZErrorDomain; - -enum { - TZ_ERR_OTHER = 1, - TZ_ERR_BADSTATE, - TZ_ERR_BADFORMAT, - TZ_ERR_IO, - TZ_ERR_TOOL_FAILED, - TZ_ERR_NOTDIRECTORY, - TZ_ERR_PARSE -}; - -NSString* const TZToolOutputErrorKey; - -@interface NSError(Tikzit) -+ (NSString*)tikzitErrorDomain; -+ (id) errorWithMessage:(NSString*)message code:(NSInteger)code cause:(NSError*)cause; -+ (id) errorWithMessage:(NSString*)message code:(NSInteger)code; -+ (id) errorWithLibcError:(NSInteger)errnum; -- (NSString*)toolOutput; -@end - -void logError (NSError *error, NSString *message); - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit/src/common/NSError+Tikzit.m b/tikzit/src/common/NSError+Tikzit.m deleted file mode 100644 index 6b9404b..0000000 --- a/tikzit/src/common/NSError+Tikzit.m +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "NSError+Tikzit.h" - -NSString* const TZErrorDomain = @"tikzit"; - -NSString* const TZToolOutputErrorKey = @"tool-output"; - -@implementation NSError(Tikzit) -+ (NSString*)tikzitErrorDomain { - return TZErrorDomain; -} - -+ (id) errorWithMessage:(NSString*)message code:(NSInteger)code cause:(NSError*)cause { - NSMutableDictionary *errorDetail = [NSMutableDictionary dictionaryWithCapacity:2]; - [errorDetail setValue:message forKey:NSLocalizedDescriptionKey]; - if (cause) - [errorDetail setValue:cause forKey:NSUnderlyingErrorKey]; - return [self errorWithDomain:TZErrorDomain code:code userInfo:errorDetail]; -} - -+ (id) errorWithMessage:(NSString*)message code:(NSInteger)code { - NSMutableDictionary *errorDetail = [NSMutableDictionary dictionaryWithObject:message - forKey:NSLocalizedDescriptionKey]; - return [self errorWithDomain:TZErrorDomain code:code userInfo:errorDetail]; -} - -+ (id) errorWithLibcError:(NSInteger)errnum { - NSString *message = [NSString stringWithUTF8String:strerror(errnum)]; - NSMutableDictionary *errorDetail = [NSMutableDictionary dictionaryWithObject:message - forKey:NSLocalizedDescriptionKey]; - return [self errorWithDomain:NSPOSIXErrorDomain code:errnum userInfo:errorDetail]; -} - -- (NSString*)toolOutput { - return [[self userInfo] objectForKey:TZToolOutputErrorKey]; -} - -@end - -void logError (NSError *error, NSString *message) { - if (message == nil) { - NSLog (@"%@", [error localizedDescription]); - } else { - NSLog (@"%@: %@", message, [error localizedDescription]); - } -} - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit/src/common/NSFileManager+Utils.h b/tikzit/src/common/NSFileManager+Utils.h deleted file mode 100644 index 1349919..0000000 --- a/tikzit/src/common/NSFileManager+Utils.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// NSFileManager+Utils.h -// TikZiT -// -// Copyright 2010 Alex Merry -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import - -@interface NSFileManager(Utils) -- (BOOL) ensureDirectoryExists:(NSString*)path error:(NSError**)error; -@end - -// vi:ft=objc:sts=4:sw=4:ts=4:noet diff --git a/tikzit/src/common/NSFileManager+Utils.m b/tikzit/src/common/NSFileManager+Utils.m deleted file mode 100644 index 87ede95..0000000 --- a/tikzit/src/common/NSFileManager+Utils.m +++ /dev/null @@ -1,46 +0,0 @@ -// -// NSFileManager+Utils.h -// TikZiT -// -// Copyright 2010 Alex Merry -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "NSError+Tikzit.h" - -@implementation NSFileManager(Utils) -- (BOOL) ensureDirectoryExists:(NSString*)directory error:(NSError**)error { - BOOL isDirectory = NO; - if (![self fileExistsAtPath:directory isDirectory:&isDirectory]) { - if (![self createDirectoryAtPath:directory withIntermediateDirectories:YES attributes:nil error:error]) { - return NO; - } - } else if (!isDirectory) { - if (error) { - NSMutableDictionary *errorDetail = [NSMutableDictionary dictionary]; - [errorDetail setValue:@"Directory is a file" forKey:NSLocalizedDescriptionKey]; - [errorDetail setValue:directory forKey:NSFilePathErrorKey]; - *error = [NSError errorWithDomain:TZErrorDomain code:TZ_ERR_NOTDIRECTORY userInfo:errorDetail]; - } - return NO; - } - return YES; -} -@end - -// vi:ft=objc:sts=4:sw=4:ts=4:noet diff --git a/tikzit/src/common/NSString+LatexConstants.h b/tikzit/src/common/NSString+LatexConstants.h deleted file mode 100644 index f4b5236..0000000 --- a/tikzit/src/common/NSString+LatexConstants.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// NSString+LatexConstants.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import - - -@interface NSString(LatexConstants) - -- (NSString*)stringByExpandingLatexConstants; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit/src/common/NSString+LatexConstants.m b/tikzit/src/common/NSString+LatexConstants.m deleted file mode 100644 index 634c189..0000000 --- a/tikzit/src/common/NSString+LatexConstants.m +++ /dev/null @@ -1,212 +0,0 @@ -// -// NSString+LatexConstants.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "NSString+LatexConstants.h" - -// can't use sizeof() in non-fragile ABI (eg: clang) -#define texConstantCount 63 -static NSString *texConstantNames[texConstantCount] = { - @"alpha", - @"beta", - @"gamma", - @"delta", - @"epsilon", - @"zeta", - @"eta", - @"theta", - @"iota", - @"kappa", - @"lambda", - @"mu", - @"nu", - @"xi", - @"pi", - @"rho", - @"sigma", - @"tau", - @"upsilon", - @"phi", - @"chi", - @"psi", - @"omega", - @"Gamma", - @"Delta", - @"Theta", - @"Lambda", - @"Xi", - @"Pi", - @"Sigma", - @"Upsilon", - @"Phi", - @"Psi", - @"Omega", - - @"pm", - @"to", - @"Rightarrow", - @"Leftrightarrow", - @"forall", - @"partial", - @"exists", - @"emptyset", - @"nabla", - @"in", - @"notin", - @"prod", - @"sum", - @"surd", - @"infty", - @"wedge", - @"vee", - @"cap", - @"cup", - @"int", - @"approx", - @"neq", - @"equiv", - @"leq", - @"geq", - @"subset", - @"supset", - @"cdot", - @"ldots" -}; - -static char * texConstantCodes[texConstantCount] = { - "\u03b1","\u03b2","\u03b3","\u03b4","\u03b5","\u03b6","\u03b7", - "\u03b8","\u03b9","\u03ba","\u03bb","\u03bc","\u03bd","\u03be", - "\u03c0","\u03c1","\u03c3","\u03c4","\u03c5","\u03c6","\u03c7", - "\u03c8","\u03c9","\u0393","\u0394","\u0398","\u039b","\u039e", - "\u03a0","\u03a3","\u03a5","\u03a6","\u03a8","\u03a9", - - "\u00b1","\u2192","\u21d2","\u21d4","\u2200","\u2202","\u2203", - "\u2205","\u2207","\u2208","\u2209","\u220f","\u2211","\u221a", - "\u221e","\u2227","\u2228","\u2229","\u222a","\u222b","\u2248", - "\u2260","\u2261","\u2264","\u2265","\u2282","\u2283","\u22c5", - "\u2026" -}; - -#define texModifierCount 10 -static NSString *texModifierNames[texModifierCount] = { - @"tiny", - @"scriptsize", - @"footnotesize", - @"small", - @"normalsize", - @"large", - @"Large", - @"LARGE", - @"huge", - @"Huge" -}; - -static NSDictionary *texConstants = nil; -static NSSet *texModifiers = nil; - -@implementation NSString(LatexConstants) - -- (NSString*)stringByExpandingLatexConstants { - - if (texConstants == nil) { - NSMutableDictionary *constants = [[NSMutableDictionary alloc] initWithCapacity:texConstantCount]; - for (int i = 0; i < texConstantCount; ++i) { - [constants setObject:[NSString stringWithUTF8String:texConstantCodes[i]] forKey:texConstantNames[i]]; - } - texConstants = constants; - } - if (texModifiers == nil) { - texModifiers = [[NSSet alloc] initWithObjects:texModifierNames count:texModifierCount]; - } - - NSMutableString *buf = [[NSMutableString alloc] initWithCapacity:[self length]]; - NSMutableString *wordBuf = [[NSMutableString alloc] initWithCapacity:10]; - - unichar c_a = [@"a" characterAtIndex:0]; - unichar c_z = [@"z" characterAtIndex:0]; - unichar c_A = [@"A" characterAtIndex:0]; - unichar c_Z = [@"Z" characterAtIndex:0]; - - int state = 0; - // a tiny little DFA to replace \\([\w*]) with unicode of $1 - unichar c; - NSString *code; - int i; - for (i = 0; i<[self length]; ++i) { - c = [self characterAtIndex:i]; - switch (state) { - case 0: - if (c=='\\') { - state = 1; - } else if (c!='$') { - [buf appendFormat:@"%C", c]; - } - break; - case 1: - if ((c>=c_a && c<=c_z) || (c>=c_A && c<=c_Z)) { - [wordBuf appendFormat:@"%C", c]; - } else { - code = [texConstants objectForKey:wordBuf]; - if (code != nil) { - [buf appendString:code]; - } else if (![texModifiers containsObject:wordBuf]) { - [buf appendFormat:@"\\%@", wordBuf]; - } - - [wordBuf setString:@""]; - if (c=='\\') { - state = 1; - } else { - if (c!='$') { - [buf appendFormat:@"%C", c]; - } - state = 0; - } - - } - break; - } - } - - if (state == 1) { - code = [texConstants objectForKey:wordBuf]; - if (code != nil) { - [buf appendString:code]; - } else if (![texModifiers containsObject:wordBuf]) { - [buf appendFormat:@"\\%@", wordBuf]; - } - } - - NSString *ret = [buf copy]; -#if __has_feature(objc_arc) - return ret; -#else - [buf release]; - [wordBuf release]; - - return [ret autorelease]; -#endif -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit/src/common/NSString+Tikz.h b/tikzit/src/common/NSString+Tikz.h deleted file mode 100644 index ea6ea40..0000000 --- a/tikzit/src/common/NSString+Tikz.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2013 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import - -@interface NSString (Tikz) - - (NSString*) tikzEscapedString; - - (BOOL) isValidTikzPropertyNameOrValue; - - (BOOL) isValidAnchor; -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit/src/common/NSString+Tikz.m b/tikzit/src/common/NSString+Tikz.m deleted file mode 100644 index 1e3073b..0000000 --- a/tikzit/src/common/NSString+Tikz.m +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright 2013 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "NSString+Tikz.h" -#import "TikzGraphAssembler.h" - -@implementation NSString (Tikz) - -- (NSString*) tikzEscapedString { - static NSCharacterSet *avoid = nil; - if (avoid == nil) -#if __has_feature(objc_arc) - avoid = [[NSCharacterSet characterSetWithCharactersInString:@"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ<>-'0123456789. "] invertedSet]; -#else - avoid = [[[NSCharacterSet characterSetWithCharactersInString:@"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ<>-'0123456789. "] invertedSet] retain]; -#endif - - - if ([self rangeOfCharacterFromSet:avoid].length > 0) { - return [NSString stringWithFormat:@"{%@}", self]; - } else { -#if __has_feature(objc_arc) - return self; -#else - return [[self retain] autorelease]; -#endif - } -} - -- (BOOL) isValidTikzPropertyNameOrValue { - NSUInteger length = [self length]; - unsigned int brace_depth = 0; - unsigned int escape = 0; - for (NSUInteger i = 0; i < length; ++i) { - unichar c = [self characterAtIndex:i]; - - if (escape) { - escape = 0; - } else if (c == '\\') { - escape = 1; - } else if (c == '{') { - brace_depth++; - } else if (c == '}') { - if (brace_depth == 0) - return NO; - brace_depth--; - } - } - return !escape && brace_depth == 0; -} - -- (BOOL) isValidAnchor { - return [TikzGraphAssembler validateTikzEdgeAnchor:self]; -} - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit/src/common/NSString+Util.h b/tikzit/src/common/NSString+Util.h deleted file mode 100644 index 548edb3..0000000 --- a/tikzit/src/common/NSString+Util.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2013 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import - -@interface NSString (Util) - + (NSString*) stringWithContentsOfFile:(NSString*)path - error:(NSError**)error; - - (id) initWithContentsOfFile:(NSString*)path - error:(NSError**)error; -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit/src/common/NSString+Util.m b/tikzit/src/common/NSString+Util.m deleted file mode 100644 index b18f397..0000000 --- a/tikzit/src/common/NSString+Util.m +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright 2013 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import -#import "NSString+Util.h" -#import "NSError+Tikzit.h" - -@implementation NSString (Util) -+ (NSString*) stringWithContentsOfFile:(NSString*)path - error:(NSError**)error -{ - return [[[self alloc] initWithContentsOfFile:path error:error] autorelease]; -} -- (id) initWithContentsOfFile:(NSString*)path - error:(NSError**)error -{ - // Fun fact: on GNUstep, at least, - // [stringWithContentsOfFile:usedEncoding:error:] only - // sets error objects if the decoding fails, not if file - // access fails. - // Fun fact 2: on GNUstep, trying to read a directory using - // [stringWithContentsOfFile:] causes an out-of-memory error; - // hence we do these checks *before* trying to read the file. - NSFileManager *fm = [NSFileManager defaultManager]; - BOOL isDir = NO; - NSString *msg = nil; - if (![fm fileExistsAtPath:path isDirectory:&isDir]) { - msg = [NSString stringWithFormat:@"\"%@\" does not exist", path]; - } else if (isDir) { - msg = [NSString stringWithFormat:@"\"%@\" is a directory", path]; - } else if (![fm isReadableFileAtPath:path]) { - msg = [NSString stringWithFormat:@"\"%@\" is not readable", path]; - } - if (msg != nil) { - if (error) { - *error = [NSError errorWithMessage:msg - code:TZ_ERR_IO]; - } - return nil; - } - self = [self initWithContentsOfFile:path]; - if (self == nil) { - if (error) { - *error = [NSError errorWithMessage:@"unknown error" - code:TZ_ERR_IO]; - } - } - return self; -} -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit/src/common/Node.h b/tikzit/src/common/Node.h deleted file mode 100644 index 1e580ce..0000000 --- a/tikzit/src/common/Node.h +++ /dev/null @@ -1,181 +0,0 @@ -// -// Node.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - - -// Node : store the data associated with a node. - -#import - -#import "NodeStyle.h" -#import "GraphElementData.h" - -@class GraphElementProperty; -@class Shape; -@class Transformer; - -/*! - @class Node - @brief A graph node, with associated location and style data. - */ -@interface Node : NSObject { - NSPoint point; - NodeStyle *style; - NSString *name; - NSString *label; - GraphElementData *data; -} - -/*! - @property shape - @brief The shape to use - @detail This is a convenience property that resolves the shape name - from the style, and uses a circle if there is no style. - - This property is NOT KVO-compliant - */ -@property (readonly) Shape *shape; - -/*! - @property point - @brief The point where this node is located. - */ -@property (assign) NSPoint point; - -/*! - @property style - @brief The style of this node. - */ -@property (retain) NodeStyle *style; - -/*! - @property name - @brief The name of this node. This is a temporary name and may change between - successive TikZ outputs. - */ -@property (copy) NSString *name; - -/*! - @property label - @brief The latex label that appears on this node. - */ -@property (copy) NSString *label; - -/*! - @property data - @brief Associated extra data. - */ -@property (copy) GraphElementData *data; - -// KVC methods -- (void) insertObject:(GraphElementProperty*)gep - inDataAtIndex:(NSUInteger)index; -- (void) removeObjectFromDataAtIndex:(NSUInteger)index; -- (void) replaceObjectInDataAtIndex:(NSUInteger)index - withObject:(GraphElementProperty*)gep; - -/*! - @brief Initialize a new node with the given point. - @param p a point. - @result A node. - */ -- (id)initWithPoint:(NSPoint)p; - -/*! - @brief Initialize a new node at (0,0). - @result A node. - */ -- (id)init; - -/*! - @brief Composes the shape transformer with another transformer - @param t The transform to apply before the shape transform - @result A transformer that first maps according to t, then according - to -shapeTransformer. - */ -- (Transformer*) shapeTransformerFromTransformer:(Transformer*)t; - -/*! - @brief A transformer that may be used to convert the shape to the - right position and scale - */ -- (Transformer*) shapeTransformer; - -/*! - @brief The bounding rect in the given co-ordinate system - @detail This is the bounding rect of the shape (after being - suitably translated and scaled). The label is not - considered. - @param shapeTrans The mapping from graph co-ordinates to the required - co-ordinates - @result The bounding rectangle - */ -- (NSRect) boundsUsingShapeTransform:(Transformer*)shapeTrans; - -/*! - @brief The bounding rect in graph co-ordinates - @detail This is the bounding rect of the shape (after being suitably - translated and scaled). The label is not considered. - */ -- (NSRect) boundingRect; - -/*! - @brief Try to attach a style of the correct name from the given style list. - @param styles an array of styles. - @result YES if successfully attached, NO otherwise. - */ -- (BOOL)attachStyleFromTable:(NSArray*)styles; - -/*! - @brief Set node properties from GraphElementData. - */ -- (void)updateData; - -/*! - @brief Set properties of this node to match the given node. - @param nd a node to mimic. - */ -- (void)setPropertiesFromNode:(Node *)nd; - -/*! - @brief Compare a node to another node using a lex ordering on coordinates. - @param nd another node. - @result A comparison result. - */ -- (NSComparisonResult)compareTo:(id)nd; - -/*! - @brief Factory method to construct a node with the given point. - @param p a point. - @result A node. - */ -+ (Node*)nodeWithPoint:(NSPoint)p; - -/*! - @brief Factory method to construct a node at (0,0). - @result A node. - */ -+ (Node*)node; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit/src/common/Node.m b/tikzit/src/common/Node.m deleted file mode 100644 index c5b11d1..0000000 --- a/tikzit/src/common/Node.m +++ /dev/null @@ -1,214 +0,0 @@ -// -// Node.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "Node.h" - -#import "Shape.h" - - -@implementation Node - -- (id)initWithPoint:(NSPoint)p { - self = [super init]; - if (self) { - data = [[GraphElementData alloc] init]; - style = nil; - label = @""; - point = p; - } - return self; -} - -- (id)init { - return [self initWithPoint:NSMakePoint(0.0f, 0.0f)]; -} - -- (id)copyWithZone:(NSZone*)z { - Node *cp = [[Node allocWithZone:z] init]; - [cp setPropertiesFromNode:self]; - return cp; -} - -- (void)dealloc { -#if ! __has_feature(objc_arc) - [name release]; - [style release]; - [data release]; - [label release]; - [super dealloc]; -#endif -} - -- (Shape*) shape { - if (style) { - return [Shape shapeForName:[style shapeName]]; - } else { - return nil; - } -} - -- (Transformer*) shapeTransformerFromTransformer:(Transformer*)t { - // we take a copy to keep the reflection attributes -#if ! __has_feature(objc_arc) - Transformer *transformer = [[t copy] autorelease]; -#else - Transformer *transformer = [t copy]; -#endif - NSPoint screenPos = [t toScreen:point]; - [transformer setOrigin:screenPos]; - float scale = [t scale]; - if (style) { - scale *= [style scale]; - } - [transformer setScale:scale]; - return transformer; -} - -- (Transformer*) shapeTransformer { - float scale = 1.0f; - if (style) { - scale = [style scale]; - } - return [Transformer transformerWithOrigin:point andScale:scale]; -} - -- (NSRect) boundsUsingShapeTransform:(Transformer*)shapeTrans { - //if (style) { - return [shapeTrans rectToScreen:[[self shape] boundingRect]]; - /*} else { - NSRect r = NSZeroRect; - r.origin = [shapeTrans toScreen:[self point]]; - return r; - }*/ -} - -- (NSRect) boundingRect { - return [self boundsUsingShapeTransform:[self shapeTransformer]]; -} - -- (BOOL)attachStyleFromTable:(NSArray*)styles { -#if __has_feature(objc_arc) - NSString *style_name = [data propertyForKey:@"style"]; -#else - NSString *style_name = [[[data propertyForKey:@"style"] retain] autorelease]; -#endif - - [self setStyle:nil]; - - // 'none' is a reserved style - if (style_name == nil || [style_name isEqualToString:@"none"]) return YES; - - for (NodeStyle *s in styles) { - if ([[s name] compare:style_name]==NSOrderedSame) { - [self setStyle:s]; - return YES; - } - } - - // if we didn't find a style, fill in a default one - [self setStyle:[NodeStyle defaultNodeStyleWithName:style_name]]; - return NO; -} - -- (void)updateData { - if (style == nil) { - [data setProperty:@"none" forKey:@"style"]; - } else { - [data setProperty:[style name] forKey:@"style"]; - } -} - -- (void)setPropertiesFromNode:(Node*)nd { - [self setPoint:[nd point]]; - [self setStyle:[nd style]]; - [self setName:[nd name]]; - [self setData:[nd data]]; - [self setLabel:[nd label]]; -} - -+ (Node*)nodeWithPoint:(NSPoint)p { -#if __has_feature(objc_arc) - return [[Node alloc] initWithPoint:p]; -#else - return [[[Node alloc] initWithPoint:p] autorelease]; -#endif -} - -+ (Node*)node { -#if __has_feature(objc_arc) - return [[Node alloc] init]; -#else - return [[[Node alloc] init] autorelease]; -#endif -} - - -// perform a lexicographic ordering (-y, x) on coordinates. -- (NSComparisonResult)compareTo:(id)nd { - Node *node = (Node*)nd; - if (point.y > [node point].y) return NSOrderedAscending; - else if (point.y < [node point].y) return NSOrderedDescending; - else { - if (point.x < [node point].x) return NSOrderedAscending; - else if (point.x > [node point].x) return NSOrderedDescending; - else return NSOrderedSame; - } -} - -@synthesize name; -@synthesize label; -@synthesize point; - -@synthesize data; -- (void) insertObject:(GraphElementProperty*)gep - inDataAtIndex:(NSUInteger)index { - [data insertObject:gep atIndex:index]; -} -- (void) removeObjectFromDataAtIndex:(NSUInteger)index { - [data removeObjectAtIndex:index]; -} -- (void) replaceObjectInDataAtIndex:(NSUInteger)index - withObject:(GraphElementProperty*)gep { - [data replaceObjectAtIndex:index withObject:gep]; -} - -- (NodeStyle*)style { - return style; -} - -- (void)setStyle:(NodeStyle *)st { - if (style != st) { -#if __has_feature(objc_arc) - style = st; -#else - NodeStyle *oldStyle = style; - style = [st retain]; - [oldStyle release]; -#endif - } - [self updateData]; -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit/src/common/NodeStyle.h b/tikzit/src/common/NodeStyle.h deleted file mode 100644 index 034f95d..0000000 --- a/tikzit/src/common/NodeStyle.h +++ /dev/null @@ -1,125 +0,0 @@ -// -// NodeStyle.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "util.h" -#import "ColorRGB.h" -#import "PropertyHolder.h" - -/*! - @class NodeStyle - @brief Store node style information. - @details Store node style information. These properties affect how a node - is displayed in TikZiT. Colors are stored in the ColorRGB struct - to avoid any Cocoa dependency. These styles should be persistant, - which should be implemented in a platform-specific category. For - OS X, this is NodeStyle+Coder. - */ -@interface NodeStyle : PropertyHolder { - int strokeThickness; - float scale; - ColorRGB *strokeColorRGB; - ColorRGB *fillColorRGB; - NSString *name; - NSString *shapeName; - NSString *category; -} - -/*! - @property strokeThickness - @brief Thickness of the stroke. - */ -@property (assign) int strokeThickness; - -/*! - @property scale - @brief Overall scale of the shape. Defaults to 1.0. - */ -@property (assign) float scale; - - -/*! - @property strokeColorRGB - @brief The stroke color used to render the node - */ -@property (copy) ColorRGB *strokeColorRGB; - -/*! - @property fillColorRGB - @brief The fill color used to render the node - */ -@property (copy) ColorRGB *fillColorRGB; - -/*! - @property name - @brief Style name. - @details Style name. This is the only thing that affects how the node - will look when the latex code is rendered. - */ -@property (copy) NSString *name; - -/*! - @property shapeName - @brief The name of the shape that will be drawn in TikZiT. - */ -@property (copy) NSString *shapeName; - -/*! - @property category - @brief ??? - */ -@property (copy) NSString *category; - -@property (readonly) NSString *tikz; -@property (readonly) BOOL strokeColorIsKnown; -@property (readonly) BOOL fillColorIsKnown; - -+ (int) defaultStrokeThickness; - -/*! - @brief Designated initializer. Construct a blank style with name 'new'. - @result A default style. - */ -- (id)init; - -/*! - @brief Create a named style. - @param nm the style name. - @result A NodeStyle with the given name. - */ -- (id)initWithName:(NSString *)nm; - -/*! - @brief Factory method for initWithName: - @param nm the style name. - @result A NodeStyle with the given name. - */ -+ (NodeStyle*)defaultNodeStyleWithName:(NSString *)nm; - -/*! - * Make this style the same as the given one - */ -- (void) updateFromStyle:(NodeStyle*)style; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit/src/common/NodeStyle.m b/tikzit/src/common/NodeStyle.m deleted file mode 100644 index 193d44d..0000000 --- a/tikzit/src/common/NodeStyle.m +++ /dev/null @@ -1,246 +0,0 @@ -// -// NodeStyle.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "NodeStyle.h" -#import "Shape.h" -#import "ShapeNames.h" - -@implementation NodeStyle - -+ (void)initialize { - [self setKeys:[NSArray arrayWithObjects: - @"fillColorRGB.red", - @"fillColorRGB.blue", - @"fillColorRGB.green", - @"strokeColorRGB.red", - @"strokeColorRGB.blue", - @"strokeColorRGB.green", - @"strokeThickness", - @"shapeName", - @"name", - nil] - triggerChangeNotificationsForDependentKey:@"tikz"]; - [self setKeys:[NSArray arrayWithObjects: - @"fillColorRGB.name", - nil] - triggerChangeNotificationsForDependentKey:@"fillColorIsKnown"]; - [self setKeys:[NSArray arrayWithObjects: - @"strokeColorRGB.name", - nil] - triggerChangeNotificationsForDependentKey:@"strokeColorIsKnown"]; -} - -+ (int) defaultStrokeThickness { return 1; } - -- (id)initWithName:(NSString*)nm { - self = [super initWithNotificationName:@"NodeStylePropertyChanged"]; - if (self != nil) { - strokeThickness = [NodeStyle defaultStrokeThickness]; - scale = 1.0f; - strokeColorRGB = [[ColorRGB alloc] initWithRed:0 green:0 blue:0]; - fillColorRGB = [[ColorRGB alloc] initWithRed:255 green:255 blue:255]; - - name = nm; - category = nil; - shapeName = SHAPE_CIRCLE; - } - return self; -} - -- (id)init { - self = [self initWithName:@"new"]; - return self; -} - -- (id)copyWithZone:(NSZone*)zone { - NodeStyle *style = [[NodeStyle allocWithZone:zone] init]; - - [style setStrokeThickness:[self strokeThickness]]; - [style setScale:[self scale]]; - [style setStrokeColorRGB:[self strokeColorRGB]]; - [style setFillColorRGB:[self fillColorRGB]]; - [style setName:[self name]]; - [style setShapeName:[self shapeName]]; - [style setCategory:[self category]]; - - return style; -} - -- (void)dealloc { -#if ! __has_feature(objc_arc) - [name release]; - [category release]; - [shapeName release]; - [strokeColorRGB release]; - [fillColorRGB release]; - [super dealloc]; -#endif -} - -- (NSString*) description { - return [NSString stringWithFormat:@"Node style \"%@\"", name]; -} - -- (void) updateFromStyle:(NodeStyle*)style { - [self setStrokeThickness:[style strokeThickness]]; - [self setScale:[style scale]]; - [self setStrokeColorRGB:[style strokeColorRGB]]; - [self setFillColorRGB:[style fillColorRGB]]; - [self setName:[style name]]; - [self setShapeName:[style shapeName]]; - [self setCategory:[style category]]; -} - -+ (NodeStyle*)defaultNodeStyleWithName:(NSString*)nm { -#if __has_feature(objc_arc) - return [[NodeStyle alloc] initWithName:nm]; -#else - return [[[NodeStyle alloc] initWithName:nm] autorelease]; -#endif -} - -- (NSString*)name { - return name; -} - -- (void)setName:(NSString *)s { - if (name != s) { - NSString *oldValue = name; - name = [s copy]; - [self postPropertyChanged:@"name" oldValue:oldValue]; -#if ! __has_feature(objc_arc) - [oldValue release]; -#endif - } -} - -- (NSString*)shapeName { - return shapeName; -} - -- (void)setShapeName:(NSString *)s { - if (shapeName != s) { - NSString *oldValue = shapeName; - shapeName = [s copy]; - [self postPropertyChanged:@"shapeName" oldValue:oldValue]; -#if ! __has_feature(objc_arc) - [oldValue release]; -#endif - } -} - -- (NSString*)category { - return category; -} - -- (void)setCategory:(NSString *)s { - if (category != s) { - NSString *oldValue = category; - category = [s copy]; - [self postPropertyChanged:@"category" oldValue:oldValue]; -#if ! __has_feature(objc_arc) - [oldValue release]; -#endif - } -} - -- (int)strokeThickness { return strokeThickness; } -- (void)setStrokeThickness:(int)i { - int oldValue = strokeThickness; - strokeThickness = i; - [self postPropertyChanged:@"strokeThickness" oldValue:[NSNumber numberWithInt:oldValue]]; -} - -- (float)scale { return scale; } -- (void)setScale:(float)s { - float oldValue = scale; - scale = s; - [self postPropertyChanged:@"scale" oldValue:[NSNumber numberWithFloat:oldValue]]; -} - -- (ColorRGB*)strokeColorRGB { - return strokeColorRGB; -} - -- (void)setStrokeColorRGB:(ColorRGB*)c { - if (strokeColorRGB != c) { - ColorRGB *oldValue = strokeColorRGB; - strokeColorRGB = [c copy]; - [self postPropertyChanged:@"strokeColorRGB" oldValue:oldValue]; -#if ! __has_feature(objc_arc) - [oldValue release]; -#endif - } -} - -- (ColorRGB*)fillColorRGB { - return fillColorRGB; -} - -- (void)setFillColorRGB:(ColorRGB*)c { - if (fillColorRGB != c) { - ColorRGB *oldValue = fillColorRGB; - fillColorRGB = [c copy]; - [self postPropertyChanged:@"fillColorRGB" oldValue:oldValue]; -#if ! __has_feature(objc_arc) - [oldValue release]; -#endif - } -} - -- (NSString*)tikz { - NSString *fillName = [fillColorRGB name]; - NSString *strokeName = [strokeColorRGB name]; - NSString *stroke = @""; - if (strokeThickness != 1) { - stroke = [NSString stringWithFormat:@",line width=%@ pt", - [NSNumber numberWithFloat:(float)strokeThickness * 0.4f]]; - } - - // If the colors are unknown, fall back on hexnames. These should be defined as colors - // in the Preambles class. - if (fillName == nil) fillName = [fillColorRGB hexName]; - if (strokeName == nil) strokeName = [strokeColorRGB hexName]; - - NSString *shapeDesc = [[Shape shapeForName:shapeName] styleTikz]; - if (shapeDesc == nil) shapeDesc = shapeName; - - return [NSString stringWithFormat:@"\\tikzstyle{%@}=[%@,fill=%@,draw=%@%@]", - name, - shapeDesc, - fillName, - strokeName, - stroke]; -} - -- (BOOL)strokeColorIsKnown { - return ([strokeColorRGB name] != nil); -} - -- (BOOL)fillColorIsKnown { - return ([fillColorRGB name] != nil); -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit/src/common/PickSupport.h b/tikzit/src/common/PickSupport.h deleted file mode 100644 index 0749649..0000000 --- a/tikzit/src/common/PickSupport.h +++ /dev/null @@ -1,164 +0,0 @@ -// -// PickSupport.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - - -#import -#import "Node.h" -#import "Edge.h" - -/*! - @class PickSupport - @brief Maintain the selection state of nodes and edges. - @detail In addition to the notifications listed for specific methods, - whenever the node selection changes, a "NodeSelectionChanged" - signal is emitted, and whenever the edge selection changes, - an "EdgeSelectionChanged" signal is emitted. - */ -@interface PickSupport : NSObject { - NSMutableSet *selectedNodes; - NSMutableSet *selectedEdges; -} - -/*! - @property selectedNodes - @brief A set of selected nodes. - */ -@property (readonly) NSSet *selectedNodes; - -// KVC methods -- (void)addSelectedNodesObject:(Node*)node; -- (void)addSelectedNodes:(NSSet*)nodes; -- (void)removeSelectedNodesObject:(Node*)node; -- (void)removeSelectedNodes:(NSSet*)nodes; - -/*! - @property selectedEdges - @brief A set of selected edges. - */ -@property (readonly) NSSet *selectedEdges; - -// KVC methods -- (void)addSelectedEdgesObject:(Edge*)edge; -- (void)addSelectedEdges:(NSSet*)edges; -- (void)removeSelectedEdgesObject:(Edge*)edge; -- (void)removeSelectedEdges:(NSSet*)edges; - -/*! - @brief Check if a node is selected. - @param nd a node. - @result YES if nd is selected. - */ -- (BOOL)isNodeSelected:(Node*)nd; - -/*! - @brief Check if an edge is selected. - @param e an edge. - @result YES if e is selected. - */ -- (BOOL)isEdgeSelected:(Edge*)e; - -/*! - @brief Select a node. - @details Sends the "NodeSelected" notification if the node was not - already selected, with @p nd as "node" in the userInfo - @param nd a node. - */ -- (void)selectNode:(Node*)nd; - -/*! - @brief Deselect a node. - @details Sends the "NodeDeselected" notification if the node was - selected, with @p nd as "node" in the userInfo - @param nd a node. - */ -- (void)deselectNode:(Node*)nd; - -/*! - @brief Select an edge. - @details Sends the "EdgeSelected" notification if the node was not - already selected, with @p e as "edge" in the userInfo - @param e an edge. - */ -- (void)selectEdge:(Edge*)e; - -/*! - @brief Deselect an edge. - @details Sends the "EdgeDeselected" notification if the node was - selected, with @p e as "edge" in the userInfo - @param e an edge. - */ -- (void)deselectEdge:(Edge*)e; - -/*! - @brief Toggle the selected state of the given node. - @details Sends the "NodeSelected" or "NodeDeselected" notification as - appropriate, with @p nd as "node" in the userInfo - @param nd a node. - */ -- (void)toggleNodeSelected:(Node*)nd; - -/*! - @brief Select all nodes in the given set. - @details Sends the "NodeSelectionReplaced" notification if this - caused the selection to change. - - Equivalent to selectAllNodes:nodes replacingSelection:YES - @param nodes a set of nodes. - */ -- (void)selectAllNodes:(NSSet*)nodes; - -/*! - @brief Select all nodes in the given set. - @details Sends the "NodeSelectionReplaced" notification if this - caused the selection to change. - - If replace is NO, @p nodes will be added to the existing - selection, otherwise it will replace the existing selection. - @param nodes a set of nodes. - @param replace whether to replace the existing selection - */ -- (void)selectAllNodes:(NSSet*)nodes replacingSelection:(BOOL)replace; - -/*! - @brief Deselect all nodes. - @details Sends the "NodeSelectionReplaced" notification if there - were any nodes previously selected - */ -- (void)deselectAllNodes; - -/*! - @brief Deselect all edges. - @details Sends the "EdgeSelectionReplaced" notification if there - were any edges previously selected - */ -- (void)deselectAllEdges; - -/*! - @brief Factory method for getting a new PickSupport object. - @result An empty PickSupport. - */ -+ (PickSupport*)pickSupport; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit/src/common/PickSupport.m b/tikzit/src/common/PickSupport.m deleted file mode 100644 index 560fc2c..0000000 --- a/tikzit/src/common/PickSupport.m +++ /dev/null @@ -1,232 +0,0 @@ -// -// PickSupport.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "PickSupport.h" - - -@implementation PickSupport - -- (void) postNodeSelectionChanged { - [[NSNotificationCenter defaultCenter] - postNotificationName:@"NodeSelectionChanged" - object:self]; -} - -- (void) postEdgeSelectionChanged { - [[NSNotificationCenter defaultCenter] - postNotificationName:@"EdgeSelectionChanged" - object:self]; -} - -- (id) init { - self = [super init]; - - if (self) { -#if __has_feature(objc_arc) - selectedNodes = [NSMutableSet set]; - selectedEdges = [NSMutableSet set]; -#else - selectedNodes = [[NSMutableSet set] retain]; - selectedEdges = [[NSMutableSet set] retain]; -#endif - } - - return self; -} - -+ (PickSupport*)pickSupport { -#if __has_feature(objc_arc) - return [[PickSupport alloc] init]; -#else - return [[[PickSupport alloc] init] autorelease]; -#endif -} - -@synthesize selectedNodes; -- (void)addSelectedNodesObject:(Node*)node { - return [self selectNode:node]; -} -- (void)addSelectedNodes:(NSSet*)nodes { - return [self selectAllNodes:nodes replacingSelection:NO]; -} -- (void)removeSelectedNodesObject:(Node*)node { - return [self deselectNode:node]; -} -- (void)removeSelectedNodes:(NSSet*)nodes { - if ([selectedNodes count] > 0) { - [selectedNodes minusSet:nodes]; - [[NSNotificationCenter defaultCenter] - postNotificationName:@"NodeSelectionReplaced" - object:self]; - [self postNodeSelectionChanged]; - } -} - -@synthesize selectedEdges; -- (void)addSelectedEdgesObject:(Edge*)edge { - return [self selectEdge:edge]; -} -- (void)addSelectedEdges:(NSSet*)edges { - if (selectedEdges == edges) { - return; - } - if ([edges count] == 0) { - return; - } - - [selectedEdges unionSet:edges]; - [[NSNotificationCenter defaultCenter] - postNotificationName:@"EdgeSelectionReplaced" - object:self]; - [self postEdgeSelectionChanged]; -} -- (void)removeSelectedEdgesObject:(Edge*)edge { - return [self deselectEdge:edge]; -} -- (void)removeSelectedEdges:(NSSet*)edges { - if ([selectedEdges count] > 0 && [edges count] > 0) { - [selectedEdges minusSet:edges]; - [[NSNotificationCenter defaultCenter] - postNotificationName:@"EdgeSelectionReplaced" - object:self]; - [self postEdgeSelectionChanged]; - } -} - -- (BOOL)isNodeSelected:(Node*)nd { - return [selectedNodes containsObject:nd]; -} - -- (BOOL)isEdgeSelected:(Edge*)e { - return [selectedEdges containsObject:e]; -} - -- (void)selectNode:(Node*)nd { - if (nd != nil && ![selectedNodes member:nd]) { - [selectedNodes addObject:nd]; - [[NSNotificationCenter defaultCenter] - postNotificationName:@"NodeSelected" - object:self - userInfo:[NSDictionary dictionaryWithObject:nd forKey:@"node"]]; - [self postNodeSelectionChanged]; - } -} - -- (void)deselectNode:(Node*)nd { - if (nd != nil && [selectedNodes member:nd]) { - [selectedNodes removeObject:nd]; - [[NSNotificationCenter defaultCenter] - postNotificationName:@"NodeDeselected" - object:self - userInfo:[NSDictionary dictionaryWithObject:nd forKey:@"node"]]; - [self postNodeSelectionChanged]; - } -} - -- (void)selectEdge:(Edge*)e { - if (e != nil && ![selectedEdges member:e]) { - [selectedEdges addObject:e]; - [[NSNotificationCenter defaultCenter] - postNotificationName:@"EdgeSelected" - object:self - userInfo:[NSDictionary dictionaryWithObject:e forKey:@"edge"]]; - [self postEdgeSelectionChanged]; - } -} - -- (void)deselectEdge:(Edge*)e { - if (e != nil && [selectedEdges member:e]) { - [selectedEdges removeObject:e]; - [[NSNotificationCenter defaultCenter] - postNotificationName:@"EdgeDeselected" - object:self - userInfo:[NSDictionary dictionaryWithObject:e forKey:@"edge"]]; - [self postEdgeSelectionChanged]; - } -} - -- (void)toggleNodeSelected:(Node*)nd { - if ([self isNodeSelected:nd]) - [self deselectNode:nd]; - else - [self selectNode:nd]; -} - -- (void)selectAllNodes:(NSSet*)nodes { - [self selectAllNodes:nodes replacingSelection:YES]; -} - -- (void)selectAllNodes:(NSSet*)nodes replacingSelection:(BOOL)replace { - if (selectedNodes == nodes) { - return; - } - if (!replace && [nodes count] == 0) { - return; - } - - if (replace) { -#if ! __has_feature(objc_arc) - [selectedNodes release]; -#endif - selectedNodes = [nodes mutableCopy]; - } else { - [selectedNodes unionSet:nodes]; - } - [[NSNotificationCenter defaultCenter] - postNotificationName:@"NodeSelectionReplaced" - object:self]; - [self postNodeSelectionChanged]; -} - -- (void)deselectAllNodes { - if ([selectedNodes count] > 0) { - [selectedNodes removeAllObjects]; - [[NSNotificationCenter defaultCenter] - postNotificationName:@"NodeSelectionReplaced" - object:self]; - [self postNodeSelectionChanged]; - } -} - -- (void)deselectAllEdges { - if ([selectedEdges count] > 0) { - [selectedEdges removeAllObjects]; - [[NSNotificationCenter defaultCenter] - postNotificationName:@"EdgeSelectionReplaced" - object:self]; - [self postEdgeSelectionChanged]; - } -} - -- (void)dealloc { -#if ! __has_feature(objc_arc) - [selectedNodes release]; - [selectedEdges release]; - - [super dealloc]; -#endif -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit/src/common/Preambles.h b/tikzit/src/common/Preambles.h deleted file mode 100644 index 2fb084a..0000000 --- a/tikzit/src/common/Preambles.h +++ /dev/null @@ -1,73 +0,0 @@ -// -// Preambles.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// Copyright 2011 Alex Merry. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "StyleManager.h" - -@class Graph; - -@interface Preambles : NSObject { - NSMutableDictionary *preambleDict; - NSString *selectedPreambleName; - NSArray *styles; - NSArray *edges; - StyleManager *styleManager; -} - -@property (copy) NSString *selectedPreambleName; -@property (retain) NSString *currentPreamble; -@property (retain) StyleManager *styleManager; -@property (readonly) NSMutableDictionary *preambleDict; - -+ (Preambles*)preambles; -- (id)init; -- (void)setStyles:(NSArray*)sty; -- (void)setEdges:(NSArray*)edg; - -- (NSString*)preambleForName:(NSString*)name; -- (BOOL)setPreamble:(NSString*)content forName:(NSString*)name; - -- (NSString*)addPreamble; -- (NSString*)addPreambleWithNameBase:(NSString*)name; - -- (BOOL)renamePreambleFrom:(NSString*)old to:(NSString*)new; -- (BOOL)removePreamble:(NSString*)name; - -- (NSEnumerator*)customPreambleNameEnumerator; - -- (void)removeAllPreambles; - -- (BOOL)selectedPreambleIsDefault; - -- (NSString*)styleDefinitions; -- (NSString*)defaultPreamble; -- (NSString*)defaultPreambleName; -- (NSString*)currentPostamble; - -- (NSString*)buildDocumentForTikz:(NSString*)tikz; -- (NSString*)buildDocumentForGraph:(Graph*)g; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit/src/common/Preambles.m b/tikzit/src/common/Preambles.m deleted file mode 100644 index 922fc30..0000000 --- a/tikzit/src/common/Preambles.m +++ /dev/null @@ -1,320 +0,0 @@ -// -// Preambles.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "Preambles.h" -#import "NodeStyle.h" -#import "EdgeStyle.h" -#import "Graph.h" - -static NSString *DEF_PREAMBLE_START = -@"\\usepackage[svgnames]{xcolor}\n" -@"\\usepackage{tikz}\n" -@"\\usetikzlibrary{decorations.markings}\n" -@"\\usetikzlibrary{shapes.geometric}\n" -@"\n" -@"\\pgfdeclarelayer{edgelayer}\n" -@"\\pgfdeclarelayer{nodelayer}\n" -@"\\pgfsetlayers{edgelayer,nodelayer,main}\n" -@"\n" -@"\\tikzstyle{none}=[inner sep=0pt]\n"; - -static NSString *PREAMBLE_TAIL = -@"\n" -@"\\pagestyle{empty}\n" -@"\\usepackage[graphics,tightpage,active]{preview}\n" -@"\\PreviewEnvironment{tikzpicture}\n" -@"\\newlength{\\imagewidth}\n" -@"\\newlength{\\imagescale}\n" -@"\n" -@"\\begin{document}\n"; - -static NSString *POSTAMBLE = -@"\n" -@"\\end{document}\n"; - -@implementation Preambles - -+ (Preambles*)preambles { -#if __has_feature(objc_arc) - return [[self alloc] init]; -#else - return [[[self alloc] init] autorelease]; -#endif -} - -- (id)init { - self = [super init]; - if (self) { - selectedPreambleName = @"default"; - preambleDict = [[NSMutableDictionary alloc] initWithCapacity:1]; - [preambleDict setObject:[self defaultPreamble] forKey:@"custom"]; - styles = nil; - edges = nil; - styleManager = nil; - } - return self; -} - -- (void)dealloc { -#if ! __has_feature(objc_arc) - [selectedPreambleName release]; - [styles release]; - [styleManager release]; - [super dealloc]; -#endif -} - -- (NSString*)preambleForName:(NSString*)name { - if ([name isEqualToString:@"default"]) - return [self defaultPreamble]; - else - return [preambleDict objectForKey:name]; -} - -- (BOOL)setPreamble:(NSString*)content forName:(NSString*)name { - if ([name isEqualToString:@"default"]) - return NO; - [preambleDict setObject:content forKey:name]; - return YES; -} - -- (void)removeAllPreambles { - [preambleDict removeAllObjects]; -} - -- (NSEnumerator*)customPreambleNameEnumerator { - return [preambleDict keyEnumerator]; -} - -- (void)setStyles:(NSArray*)sty { -#if ! __has_feature(objc_arc) - [sty retain]; - [styles release]; -#endif - styles = sty; -} - -- (void)setEdges:(NSArray*)edg { -#if ! __has_feature(objc_arc) - [edg retain]; - [edges release]; -#endif - edges = edg; -} - -- (NSString*)styleDefinitions { - if (styleManager != nil) { - [self setStyles:[styleManager nodeStyles]]; - } -#if ! __has_feature(objc_arc) - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; -#endif - NSMutableString *buf = [NSMutableString string]; - NSMutableString *colbuf = [NSMutableString string]; - NSMutableSet *colors = [NSMutableSet setWithCapacity:2*[styles count]]; - for (NodeStyle *st in styles) { - [buf appendFormat:@"%@\n", [st tikz]]; - ColorRGB *fill = [st fillColorRGB]; - ColorRGB *stroke = [st strokeColorRGB]; - if ([fill name] == nil && ![colors containsObject:fill]) { - [colors addObject:fill]; - [colbuf appendFormat:@"\\definecolor{%@}{rgb}{%.3f,%.3f,%.3f}\n", - [fill hexName], [fill redFloat], [fill greenFloat], [fill blueFloat]]; - } - - if ([stroke name] == nil && ![colors containsObject:stroke]) { - [colors addObject:stroke]; - [colbuf appendFormat:@"\\definecolor{%@}{rgb}{%.3f,%.3f,%.3f}\n", - [stroke hexName], [stroke redFloat], [stroke greenFloat], [stroke blueFloat]]; - } - } - - if (styleManager != nil) { - [self setEdges:[styleManager edgeStyles]]; - } - - [buf appendString:@"\n"]; - for (EdgeStyle *st in edges) { - [buf appendFormat:@"%@\n", [st tikz]]; - ColorRGB *color = [st colorRGB]; - if (color != nil && [color name] == nil && ![colors containsObject:color]) { - [colors addObject:color]; - [colbuf appendFormat:@"\\definecolor{%@}{rgb}{%.3f,%.3f,%.3f}\n", - [color hexName], [color redFloat], [color greenFloat], [color blueFloat]]; - } - } - - NSString *defs = [[NSString alloc] initWithFormat:@"%@\n%@", colbuf, buf]; - -#if __has_feature(objc_arc) - return defs; -#else - [pool drain]; - return [defs autorelease]; -#endif -} - -- (NSString*)defaultPreamble { - return [NSString stringWithFormat:@"%@%@", - DEF_PREAMBLE_START, [self styleDefinitions]]; -} - -- (BOOL)selectedPreambleIsDefault { - return [selectedPreambleName isEqualToString:@"default"]; -} - -- (NSString*)selectedPreambleName { return selectedPreambleName; } -- (void)setSelectedPreambleName:(NSString *)sel { - if (sel != selectedPreambleName) { -#if ! __has_feature(objc_arc) - [selectedPreambleName release]; -#endif - selectedPreambleName = [sel copy]; - } -} - -- (NSString*)currentPreamble { - NSString *pre = [self preambleForName:selectedPreambleName]; - return (pre == nil) ? [self defaultPreamble] : pre; -} - -- (void)setCurrentPreamble:(NSString*)str { - if (![selectedPreambleName isEqualToString:@"default"]) - [preambleDict setObject:str forKey:selectedPreambleName]; -} - -- (StyleManager*)styleManager { - return styleManager; -} - -- (void)setStyleManager:(StyleManager *)manager { -#if ! __has_feature(objc_arc) - [manager retain]; - [styleManager release]; -#endif - styleManager = manager; -} - -- (NSString*)currentPostamble { - return POSTAMBLE; -} - -- (NSMutableDictionary*)preambleDict { - return preambleDict; -} - -- (NSString*)defaultPreambleName { - return @"default"; -} - -- (NSString*)addPreamble { - return [self addPreambleWithNameBase:@"new preamble"]; -} - -- (NSString*)addPreambleWithNameBase:(NSString*)base { - if ([preambleDict objectForKey:base] == nil) { - [self setPreamble:[self defaultPreamble] forName:base]; - return base; - } - int i = 0; - NSString *tryName = nil; - do { - ++i; - tryName = [NSString stringWithFormat:@"%@ %d", base, i]; - } while ([preambleDict objectForKey:tryName] != nil); - - [self setPreamble:[self defaultPreamble] forName:tryName]; - return tryName; -} - -- (BOOL)renamePreambleFrom:(NSString*)old to:(NSString*)new { - if ([old isEqualToString:@"default"]) - return NO; - if ([new isEqualToString:@"default"]) - return NO; - if ([old isEqualToString:new]) - return YES; - BOOL isSelected = NO; - if ([old isEqualToString:selectedPreambleName]) { - [self setSelectedPreambleName:nil]; - isSelected = YES; - } - NSString *preamble = [preambleDict objectForKey:old]; -#if ! __has_feature(objc_arc) - [preamble retain]; -#endif - [preambleDict removeObjectForKey:old]; - [preambleDict setObject:preamble forKey:new]; -#if ! __has_feature(objc_arc) - [preamble release]; -#endif - if (isSelected) { - [self setSelectedPreambleName:new]; - } - return YES; -} - -- (BOOL)removePreamble:(NSString*)name { - if ([name isEqualToString:@"default"]) - return NO; - // "name" may be held only by being the selected preamble... -#if ! __has_feature(objc_arc) - [name retain]; -#endif - if ([name isEqualToString:selectedPreambleName]) - [self setSelectedPreambleName:nil]; - [preambleDict removeObjectForKey:name]; -#if ! __has_feature(objc_arc) - [name release]; -#endif - return YES; -} - -- (NSString*)buildDocumentForTikz:(NSString*)tikz -{ - NSString *preamble = [self currentPreamble]; - NSString *doc_head = @""; - if (![preamble hasPrefix:@"\\documentclass"]) { - doc_head = @"\\documentclass{article}\n"; - } - NSString *preamble_suffix = @""; - if ([preamble rangeOfString:@"\\begin{document}" - options:NSBackwardsSearch].length == 0) { - preamble_suffix = PREAMBLE_TAIL; - } - return [NSString stringWithFormat:@"%@%@%@%@%@", - doc_head, - [self currentPreamble], - preamble_suffix, - tikz, - POSTAMBLE]; -} - -- (NSString*)buildDocumentForGraph:(Graph*)g -{ - return [self buildDocumentForTikz:[g tikz]]; -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit/src/common/PropertyHolder.h b/tikzit/src/common/PropertyHolder.h deleted file mode 100644 index ba1d825..0000000 --- a/tikzit/src/common/PropertyHolder.h +++ /dev/null @@ -1,36 +0,0 @@ -// -// PropertyHolder.h -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import - -@interface PropertyHolder : NSObject { - NSString *notificationName; -} - -- (id)initWithNotificationName:(NSString*)name; -- (void) postPropertyChanged:(NSString*)property oldValue:(id)value; -- (void) postPropertyChanged:(NSString*)property; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit/src/common/PropertyHolder.m b/tikzit/src/common/PropertyHolder.m deleted file mode 100644 index 6aaf125..0000000 --- a/tikzit/src/common/PropertyHolder.m +++ /dev/null @@ -1,74 +0,0 @@ -// -// PropertyHolder.m -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "PropertyHolder.h" - -@implementation PropertyHolder - - -- (id)init { - self = [super init]; - if (self) { - notificationName = @"UnknownPropertyChanged"; - } - return self; -} - -- (id)initWithNotificationName:(NSString*)n { - self = [super init]; - if (self) { - notificationName = [n copy]; - } - return self; -} - -- (void)postPropertyChanged:(NSString*)property oldValue:(id)value { - NSDictionary *userInfo; - if (value != nil) { - userInfo = [NSDictionary dictionaryWithObjectsAndKeys: - property, @"propertyName", - value, @"oldValue", - nil]; - } else { - userInfo = [NSDictionary dictionaryWithObject:property - forKey:@"propertyName"]; - } - [[NSNotificationCenter defaultCenter] postNotificationName:notificationName - object:self - userInfo:userInfo]; -} - -- (void)postPropertyChanged:(NSString*)property { - [self postPropertyChanged:property oldValue:nil]; -} - -- (void)dealloc { -#if ! __has_feature(objc_arc) - [notificationName release]; - [super dealloc]; -#endif -} - -@end - -// vi:ft=objc:ts=4:et:sts=4:sw=4 diff --git a/tikzit/src/common/RColor.h b/tikzit/src/common/RColor.h deleted file mode 100644 index 7f22547..0000000 --- a/tikzit/src/common/RColor.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import - -#ifndef CGFloat -#define CGFloat float -#endif - -/** - * A lightweight color structure used by RenderContext - * - * This is mainly to avoid the overhead of ColorRGB when - * rendering things not based on a NodeStyle - * - * All values range from 0.0f to 1.0f. - */ -typedef struct { - CGFloat red; - CGFloat green; - CGFloat blue; - CGFloat alpha; -} -RColor; - -/** Solid white */ -static const RColor WhiteRColor __attribute__((unused)) = {1.0, 1.0, 1.0, 1.0}; -/** Solid black */ -static const RColor BlackRColor __attribute__((unused)) = {0.0, 0.0, 0.0, 1.0}; - -/** Create a color with alpha set to 1.0 */ -RColor MakeSolidRColor (CGFloat red, CGFloat green, CGFloat blue); -/** Create a color */ -RColor MakeRColor (CGFloat red, CGFloat green, CGFloat blue, CGFloat alpha); - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit/src/common/RColor.m b/tikzit/src/common/RColor.m deleted file mode 100644 index 49914fe..0000000 --- a/tikzit/src/common/RColor.m +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "RColor.h" - -RColor MakeSolidRColor (CGFloat red, CGFloat green, CGFloat blue) { - return MakeRColor (red, green, blue, 1.0); -} - -RColor MakeRColor (CGFloat red, CGFloat green, CGFloat blue, CGFloat alpha) { - RColor color; - color.red = red; - color.green = green; - color.blue = blue; - color.alpha = alpha; - return color; -} - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit/src/common/RectangleShape.h b/tikzit/src/common/RectangleShape.h deleted file mode 100644 index 3fa0f31..0000000 --- a/tikzit/src/common/RectangleShape.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// RectangleShape.h -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "Shape.h" - - -@interface RectangleShape : Shape { -} - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit/src/common/RectangleShape.m b/tikzit/src/common/RectangleShape.m deleted file mode 100644 index db9c803..0000000 --- a/tikzit/src/common/RectangleShape.m +++ /dev/null @@ -1,57 +0,0 @@ -// -// RectangleShape.m -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "RectangleShape.h" -#import "Node.h" -#import "Edge.h" - -@implementation RectangleShape - -- (id)init { - self = [super init]; - if (self) { - Node *n0,*n1,*n2,*n3; - float sz = 0.2f; - - n0 = [Node nodeWithPoint:NSMakePoint(-sz, sz)]; - n1 = [Node nodeWithPoint:NSMakePoint( sz, sz)]; - n2 = [Node nodeWithPoint:NSMakePoint( sz,-sz)]; - n3 = [Node nodeWithPoint:NSMakePoint(-sz,-sz)]; - - Edge *e0,*e1,*e2,*e3; - - e0 = [Edge edgeWithSource:n0 andTarget:n1]; - e1 = [Edge edgeWithSource:n1 andTarget:n2]; - e2 = [Edge edgeWithSource:n2 andTarget:n3]; - e3 = [Edge edgeWithSource:n3 andTarget:n0]; - - paths = [[NSSet alloc] initWithObjects:[NSArray arrayWithObjects:e0,e1,e2,e3,nil],nil]; - - styleTikz = @"rectangle"; - } - return self; -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit/src/common/RegularPolyShape.h b/tikzit/src/common/RegularPolyShape.h deleted file mode 100644 index 1fd8f1e..0000000 --- a/tikzit/src/common/RegularPolyShape.h +++ /dev/null @@ -1,50 +0,0 @@ -// -// RegularPolyShape.h -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "Shape.h" - -/** - * A regular polygon - * - * Matches the "regular polygon" shape in the shapes.geometric - * PGF/TikZ library. - */ -@interface RegularPolyShape : Shape { -} - -/** - * Initialise a regular polygon - * - * A rotation of 0 will produce a polygon with one - * edge flat along the bottom (just like PGF/TikZ - * does it). - * - * @param sides the number of sides the polygon should have - * @param rotation the rotation of the polygon, in degrees - */ -- (id)initWithSides:(int)sides rotation:(int)rotation; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit/src/common/RegularPolyShape.m b/tikzit/src/common/RegularPolyShape.m deleted file mode 100644 index 3555115..0000000 --- a/tikzit/src/common/RegularPolyShape.m +++ /dev/null @@ -1,76 +0,0 @@ -// -// RegularPolyShape.m -// TikZiT -// -// Copyright 2011 Aleks Kissinger -// Copyright 2012 Alex Merry -// All rights reserved. -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "RegularPolyShape.h" -#import "Node.h" -#import "Edge.h" -#import "util.h" - -@implementation RegularPolyShape - -- (id)initWithSides:(int)sides rotation:(int)rotation { - self = [super init]; - if (self == nil) - return nil; - - // TikZ draws regular polygons using a radius inscribed - // _inside_ the shape (touching middles of edges), not - // outside (touching points) - const float innerRadius = 0.2f; - - NSMutableArray *nodes = [NSMutableArray arrayWithCapacity:sides]; - NSMutableArray *edges = [NSMutableArray arrayWithCapacity:sides]; - - float dtheta = (M_PI * 2.0f) / ((float)sides); - float theta = (dtheta/2.0f) - (M_PI / 2.0f); - theta += degreesToRadians(rotation); - // radius of the outer circle - float radius = ABS(innerRadius / cos(dtheta)); - - for (int i = 0; i < sides; ++i) { - NSPoint p; - p.x = radius * cos(theta); - p.y = radius * sin(theta); - - [nodes addObject:[Node nodeWithPoint:p]]; - theta += dtheta; - } - - for (int i = 0; i < sides; ++i) { - [edges addObject:[Edge edgeWithSource:[nodes objectAtIndex:i] - andTarget:[nodes objectAtIndex:(i+1)%sides]]]; - } - - paths = [[NSSet alloc] initWithObjects:edges,nil]; - - styleTikz = [[NSString alloc] initWithFormat: - @"regular polygon,regular polygon sides=%d,shape border rotate=%d", - sides, rotation]; - - return self; -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit/src/common/RenderContext.h b/tikzit/src/common/RenderContext.h deleted file mode 100644 index 8633944..0000000 --- a/tikzit/src/common/RenderContext.h +++ /dev/null @@ -1,156 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import -#import "RColor.h" - -typedef enum { - AntialiasDisabled, - AntialiasDefault -} AntialiasMode; - -// encapsulates a CTLine on OSX and -// a PangoLayout in GTK+ -@protocol TextLayout -@property (readonly) NSSize size; -@property (readonly) NSString *text; -- (void) showTextAt:(NSPoint)topLeft withColor:(RColor)color; -@end - -@protocol RenderContext -- (void) saveState; -- (void) restoreState; - -- (NSRect) clipBoundingBox; -- (BOOL) strokeIncludesPoint:(NSPoint)p; -- (BOOL) fillIncludesPoint:(NSPoint)p; -- (id) layoutText:(NSString*)text withSize:(CGFloat)fontSize; - -// this may not affect text rendering -- (void) setAntialiasMode:(AntialiasMode)mode; -- (void) setLineWidth:(CGFloat)width; -// setting to 0 will unset the dash -- (void) setLineDash:(CGFloat)dashLength; - -/** - * Clear the current path, including all subpaths - */ -- (void) startPath; -/** - * Close the current subpath - */ -- (void) closeSubPath; -/** - * Start a new subpath, and set the current point. - * - * The point will be the current point and the starting point - * for the subpath. - */ -- (void) moveTo:(NSPoint)p; -/** - * Add a cubic bezier curve to the current subpath. - * - * The curve will start at the current point, terminate at end and - * be defined by cp1 and cp2. - */ -- (void) curveTo:(NSPoint)end withCp1:(NSPoint)cp1 andCp2:(NSPoint)cp2; -/** - * Add a straight line to the current subpath. - * - * The line will start at the current point, and terminate at end. - */ -- (void) lineTo:(NSPoint)end; -/** - * Add a new rectangular subpath. - * - * The current point is undefined after this call. - */ -- (void) rect:(NSRect)rect; -/** - * Add a new circular subpath. - * - * The current point is undefined after this call. - */ -- (void) circleAt:(NSPoint)c withRadius:(CGFloat)r; - -/** - * Paint along the current path. - * - * The current line width and dash style will be used, - * and the colour is given by color. - * - * The path will be cleared by this call, as though - * startPath had been called. - */ -- (void) strokePathWithColor:(RColor)color; -/** - * Paint inside the current path. - * - * The fill colour is given by color. - * - * The path will be cleared by this call, as though - * startPath had been called. - */ -- (void) fillPathWithColor:(RColor)color; -/** - * Paint along and inside the current path. - * - * The current line width and dash style will be used, - * and the colour is given by color. - * - * The path will be cleared by this call, as though - * startPath had been called. - * - * Note that the fill and stroke may overlap, although - * the stroke is always painted on top, so this is only - * relevant when the stroke colour has an alpha channel - * other than 1.0f. - */ -- (void) strokePathWithColor:(RColor)scolor - andFillWithColor:(RColor)fcolor; -/** - * Paint along and inside the current path using an alpha channel. - * - * The current line width and dash style will be used, - * and the colour is given by color. - * - * The path will be cleared by this call, as though - * startPath had been called. - * - * Note that the fill and stroke may overlap, although - * the stroke is always painted on top, so this is only - * relevant when the stroke colour has an alpha channel - * other than 1.0f. - */ -- (void) strokePathWithColor:(RColor)scolor - andFillWithColor:(RColor)fcolor - usingAlpha:(CGFloat)alpha; -/** - * Set the clip to the current path. - * - * The path will be cleared by this call, as though - * startPath had been called. - */ -- (void) clipToPath; - -/** - * Paint everywhere within the clip. - */ -- (void) paintWithColor:(RColor)color; -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit/src/common/Shape.h b/tikzit/src/common/Shape.h deleted file mode 100644 index b401a87..0000000 --- a/tikzit/src/common/Shape.h +++ /dev/null @@ -1,49 +0,0 @@ -// -// Shape.h -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "Transformer.h" - -@interface Shape : NSObject { - NSSet *paths; - NSRect boundingRect; // cache - NSString *styleTikz; -} - -@property (retain) NSSet *paths; -@property (readonly) NSRect boundingRect; -/** - * The tikz code to use in style properties for this shape - * - * This can return nil, in which case the shape name should be used - */ -@property (retain) NSString *styleTikz; - -- (id)init; -+ (void)refreshShapeDictionary; -+ (NSDictionary*)shapeDictionary; -+ (Shape*)shapeForName:(NSString*)shapeName; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit/src/common/Shape.m b/tikzit/src/common/Shape.m deleted file mode 100644 index e887688..0000000 --- a/tikzit/src/common/Shape.m +++ /dev/null @@ -1,171 +0,0 @@ -// -// Shape.m -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "Shape.h" - -#import "Edge.h" -#import "SupportDir.h" -#import "ShapeNames.h" - -#import "CircleShape.h" -#import "DiamondShape.h" -#import "RectangleShape.h" -#import "RegularPolyShape.h" -#import "TikzShape.h" - -#import "util.h" - -@implementation Shape - -- (void)calcBoundingRect { - boundingRect = NSZeroRect; - - if (paths == nil) - return; - - for (NSArray *arr in paths) { - for (Edge *e in arr) { - boundingRect = NSUnionRect(boundingRect, [e boundingRect]); - } - } -} - -- (id)init { - self = [super init]; - if (self) { - paths = nil; - } - return self; -} - -- (NSSet*)paths {return paths;} -- (void)setPaths:(NSSet *)p { - if (paths != p) { -#if __has_feature(objc_arc) - paths = p; -#else - [paths release]; - paths = [p retain]; -#endif - [self calcBoundingRect]; - } -} - -- (NSRect)boundingRect { return boundingRect; } - -@synthesize styleTikz; - -- (id)copyWithZone:(NSZone*)zone { - Shape *cp = [[[self class] allocWithZone:zone] init]; - [cp setPaths:paths]; - [cp setStyleTikz:styleTikz]; - return cp; -} - -- (void)dealloc { -#if ! __has_feature(objc_arc) - [paths release]; - [styleTikz release]; - [super dealloc]; -#endif -} - -NSDictionary *shapeDictionary = nil; - -+ (void)addShapesInDir:(NSString*)shapeDir to:(NSMutableDictionary*)shapeDict { - NSFileManager *fileManager = [NSFileManager defaultManager]; - NSError *err = nil; - NSArray *files = [fileManager contentsOfDirectoryAtPath:shapeDir error:&err]; - - if (files != nil) { - NSString *nm; - for (NSString *f in files) { - if ([f hasSuffix:@".tikz"]) { - nm = [f substringToIndex:[f length]-5]; - TikzShape *sh = - [[TikzShape alloc] initWithTikzFile: - [shapeDir stringByAppendingPathComponent:f]]; - if (sh != nil) { - [shapeDict setObject:sh forKey:nm]; -#if ! __has_feature(objc_arc) - [sh release]; -#endif - } - } - } - } -} - -+ (void)refreshShapeDictionary { - Shape *shapes[5] = { - [[CircleShape alloc] init], - [[RectangleShape alloc] init], - [[DiamondShape alloc] init], - [[RegularPolyShape alloc] initWithSides:3 rotation:0], - [[RegularPolyShape alloc] initWithSides:3 rotation:180]}; - NSMutableDictionary *shapeDict = [[NSMutableDictionary alloc] initWithObjectsAndKeys: - shapes[0], SHAPE_CIRCLE, - shapes[1], SHAPE_RECTANGLE, - shapes[2], SHAPE_DIAMOND, - shapes[3], SHAPE_UP_TRIANGLE, - shapes[4], SHAPE_DOWN_TRIANGLE, - nil]; -#if ! __has_feature(objc_arc) - for (int i = 0; i<5; ++i) [shapes[i] release]; -#endif - - NSString *systemShapeDir = [[SupportDir systemSupportDir] stringByAppendingPathComponent:@"shapes"]; - NSString *userShapeDir = [[SupportDir userSupportDir] stringByAppendingPathComponent:@"shapes"]; - - [Shape addShapesInDir:systemShapeDir to:shapeDict]; - [Shape addShapesInDir:userShapeDir to:shapeDict]; - - NSDictionary *oldShapeDictionary = shapeDictionary; - shapeDictionary = shapeDict; - - [[NSNotificationCenter defaultCenter] - postNotificationName:@"ShapeDictionaryReplaced" - object:self]; - -#if ! __has_feature(objc_arc) - [oldShapeDictionary release]; -#endif -} - -+ (NSDictionary*)shapeDictionary { - if (shapeDictionary == nil) [Shape refreshShapeDictionary]; - return shapeDictionary; -} - -+ (Shape*)shapeForName:(NSString*)shapeName { - Shape *s = [[[self shapeDictionary] objectForKey:shapeName] copy]; -#if __has_feature(objc_arc) - return s; -#else - return [s autorelease]; -#endif -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit/src/common/ShapeNames.h b/tikzit/src/common/ShapeNames.h deleted file mode 100644 index 66ecfb1..0000000 --- a/tikzit/src/common/ShapeNames.h +++ /dev/null @@ -1,27 +0,0 @@ -// -// ShapeNames.h -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// - -#define SHAPE_CIRCLE @"circle" -#define SHAPE_RECTANGLE @"rectangle" -#define SHAPE_UP_TRIANGLE @"up triangle" -#define SHAPE_DOWN_TRIANGLE @"down triangle" -#define SHAPE_DIAMOND @"diamond" - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit/src/common/StyleManager.h b/tikzit/src/common/StyleManager.h deleted file mode 100644 index bc920e7..0000000 --- a/tikzit/src/common/StyleManager.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import -#import "NodeStyle.h" -#import "EdgeStyle.h" - -@interface StyleManager: NSObject { - NSMutableArray *nodeStyles; - NSMutableArray *edgeStyles; -} - -+ (StyleManager*) manager; -- (id) init; - -@property (readonly) NSArray *nodeStyles; -@property (readonly) NSArray *edgeStyles; - -// only for use by loading code -- (void) _setNodeStyles:(NSMutableArray*)styles; -- (void) _setEdgeStyles:(NSMutableArray*)styles; - -- (NodeStyle*) nodeStyleForName:(NSString*)name; -- (EdgeStyle*) edgeStyleForName:(NSString*)name; - -- (void) addNodeStyle:(NodeStyle*)style; -- (void) removeNodeStyle:(NodeStyle*)style; -- (void) addEdgeStyle:(EdgeStyle*)style; -- (void) removeEdgeStyle:(EdgeStyle*)style; - -- (void) updateFromManager:(StyleManager*)manager; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit/src/common/StyleManager.m b/tikzit/src/common/StyleManager.m deleted file mode 100644 index 05c6c86..0000000 --- a/tikzit/src/common/StyleManager.m +++ /dev/null @@ -1,378 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "StyleManager.h" - -@implementation StyleManager - -- (void) nodeStylePropertyChanged:(NSNotification*)n { - if ([[[n userInfo] objectForKey:@"propertyName"] isEqual:@"name"]) { - NSDictionary *userInfo; - userInfo = [NSDictionary dictionaryWithObjectsAndKeys: - [n object], @"style", - [[n userInfo] objectForKey:@"oldValue"], @"oldName", - nil]; - [[NSNotificationCenter defaultCenter] postNotificationName:@"NodeStyleRenamed" - object:self - userInfo:userInfo]; - } -} - -- (void) ignoreAllNodeStyles { - [[NSNotificationCenter defaultCenter] - removeObserver:self - name:@"NodeStylePropertyChanged" - object:nil]; -} - -- (void) ignoreNodeStyle:(NodeStyle*)style { - [[NSNotificationCenter defaultCenter] - removeObserver:self - name:@"NodeStylePropertyChanged" - object:style]; -} - -- (void) listenToNodeStyle:(NodeStyle*)style { - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(nodeStylePropertyChanged:) - name:@"NodeStylePropertyChanged" - object:style]; -} - -- (void) edgeStylePropertyChanged:(NSNotification*)n { - if ([[[n userInfo] objectForKey:@"propertyName"] isEqual:@"name"]) { - NSDictionary *userInfo; - userInfo = [NSDictionary dictionaryWithObjectsAndKeys: - [n object], @"style", - [[n userInfo] objectForKey:@"oldValue"], @"oldName", - nil]; - [[NSNotificationCenter defaultCenter] postNotificationName:@"EdgeStyleRenamed" - object:self - userInfo:userInfo]; - } -} - -- (void) ignoreAllEdgeStyles { - [[NSNotificationCenter defaultCenter] - removeObserver:self - name:@"EdgeStylePropertyChanged" - object:nil]; -} - -- (void) ignoreEdgeStyle:(EdgeStyle*)style { - [[NSNotificationCenter defaultCenter] - removeObserver:self - name:@"EdgeStylePropertyChanged" - object:style]; -} - -- (void) listenToEdgeStyle:(EdgeStyle*)style { - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(edgeStylePropertyChanged:) - name:@"EdgeStylePropertyChanged" - object:style]; -} - -+ (StyleManager*) manager { -#if __has_feature(objc_arc) - return [[self alloc] init]; -#else - return [[[self alloc] init] autorelease]; -#endif -} - -- (id) init { - self = [super init]; - - if (self) { - // we lazily load the default styles, since they may not be needed - nodeStyles = nil; - edgeStyles = nil; - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; -#if ! __has_feature(objc_arc) - [nodeStyles release]; - [edgeStyles release]; - - [super dealloc]; -#endif -} - -- (void) loadDefaultEdgeStyles { -#if ! __has_feature(objc_arc) - [edgeStyles release]; -#endif - edgeStyles = [[NSMutableArray alloc] initWithCapacity:3]; - - EdgeStyle *simple = [EdgeStyle defaultEdgeStyleWithName:@"simple"]; - [simple setThickness:2.0f]; - [self listenToEdgeStyle:simple]; - - EdgeStyle *arrow = [EdgeStyle defaultEdgeStyleWithName:@"arrow"]; - [arrow setThickness:2.0f]; - [arrow setDecorationStyle:ED_Arrow]; - [self listenToEdgeStyle:arrow]; - - EdgeStyle *tick = [EdgeStyle defaultEdgeStyleWithName:@"tick"]; - [tick setThickness:2.0f]; - [tick setDecorationStyle:ED_Tick]; - [self listenToEdgeStyle:tick]; - - [edgeStyles addObject:simple]; - [edgeStyles addObject:arrow]; - [edgeStyles addObject:tick]; -} - -- (void) loadDefaultNodeStyles { -#if ! __has_feature(objc_arc) - [nodeStyles release]; -#endif - nodeStyles = [[NSMutableArray alloc] initWithCapacity:3]; - - NodeStyle *rn = [NodeStyle defaultNodeStyleWithName:@"rn"]; - [rn setStrokeThickness:2]; - [rn setStrokeColorRGB:[ColorRGB colorWithFloatRed:0 green:0 blue:0]]; - [rn setFillColorRGB:[ColorRGB colorWithFloatRed:1 green:0 blue:0]]; - [self listenToNodeStyle:rn]; - - NodeStyle *gn = [NodeStyle defaultNodeStyleWithName:@"gn"]; - [gn setStrokeThickness:2]; - [gn setStrokeColorRGB:[ColorRGB colorWithFloatRed:0 green:0 blue:0]]; - [gn setFillColorRGB:[ColorRGB colorWithFloatRed:0 green:1 blue:0]]; - [self listenToNodeStyle:gn]; - - NodeStyle *yn = [NodeStyle defaultNodeStyleWithName:@"yn"]; - [yn setStrokeThickness:2]; - [yn setStrokeColorRGB:[ColorRGB colorWithFloatRed:0 green:0 blue:0]]; - [yn setFillColorRGB:[ColorRGB colorWithFloatRed:1 green:1 blue:0]]; - [self listenToNodeStyle:yn]; - - [nodeStyles addObject:rn]; - [nodeStyles addObject:gn]; - [nodeStyles addObject:yn]; -} - -- (void) postNodeStyleAdded:(NodeStyle*)style { - [[NSNotificationCenter defaultCenter] postNotificationName:@"NodeStyleAdded" - object:self - userInfo:[NSDictionary dictionaryWithObject:style forKey:@"style"]]; -} - -- (void) postNodeStyleRemoved:(NodeStyle*)style { - [[NSNotificationCenter defaultCenter] postNotificationName:@"NodeStyleRemoved" - object:self - userInfo:[NSDictionary dictionaryWithObject:style forKey:@"style"]]; -} - -- (void) postEdgeStyleAdded:(EdgeStyle*)style { - [[NSNotificationCenter defaultCenter] postNotificationName:@"EdgeStyleAdded" - object:self - userInfo:[NSDictionary dictionaryWithObject:style forKey:@"style"]]; -} - -- (void) postEdgeStyleRemoved:(EdgeStyle*)style { - [[NSNotificationCenter defaultCenter] postNotificationName:@"EdgeStyleRemoved" - object:self - userInfo:[NSDictionary dictionaryWithObject:style forKey:@"style"]]; -} - -- (void) postNodeStylesReplaced { - [[NSNotificationCenter defaultCenter] postNotificationName:@"NodeStylesReplaced" object:self]; -} - -- (void) postEdgeStylesReplaced { - [[NSNotificationCenter defaultCenter] postNotificationName:@"EdgeStylesReplaced" object:self]; -} - -- (NSArray*) nodeStyles { - if (nodeStyles == nil) { - [self loadDefaultNodeStyles]; - } - return nodeStyles; -} - -- (NSArray*) edgeStyles { - if (edgeStyles == nil) { - [self loadDefaultEdgeStyles]; - } - return edgeStyles; -} - -- (void) _setNodeStyles:(NSMutableArray*)styles { - [self ignoreAllNodeStyles]; -#if ! __has_feature(objc_arc) - [nodeStyles release]; - [styles retain]; -#endif - nodeStyles = styles; - for (NodeStyle *style in styles) { - [self listenToNodeStyle:style]; - } - [self postNodeStylesReplaced]; -} - -- (void) _setEdgeStyles:(NSMutableArray*)styles { - [self ignoreAllEdgeStyles]; -#if ! __has_feature(objc_arc) - [edgeStyles release]; - [styles retain]; -#endif - edgeStyles = styles; - for (EdgeStyle *style in styles) { - [self listenToEdgeStyle:style]; - } - [self postEdgeStylesReplaced]; -} - -- (NodeStyle*) nodeStyleForName:(NSString*)name { - for (NodeStyle *s in nodeStyles) { - if ([[s name] isEqualToString:name]) { - return s; - } - } - - return nil; -} - -- (void) addNodeStyle:(NodeStyle*)style { - if (nodeStyles == nil) { - [self loadDefaultNodeStyles]; - } - [nodeStyles addObject:style]; - [self listenToNodeStyle:style]; - [self postNodeStyleAdded:style]; -} - -- (void) removeNodeStyle:(NodeStyle*)style { - if (nodeStyles == nil) { - [self loadDefaultNodeStyles]; - } - - [self ignoreNodeStyle:style]; -#if ! __has_feature(objc_arc) - [style retain]; -#endif - [nodeStyles removeObject:style]; - [self postNodeStyleRemoved:style]; -#if ! __has_feature(objc_arc) - [style release]; -#endif -} - -- (EdgeStyle*) edgeStyleForName:(NSString*)name { - for (EdgeStyle *s in edgeStyles) { - if ([[s name] isEqualToString:name]) { - return s; - } - } - - return nil; -} - -- (void) addEdgeStyle:(EdgeStyle*)style { - if (edgeStyles == nil) { - [self loadDefaultEdgeStyles]; - } - [edgeStyles addObject:style]; - [self listenToEdgeStyle:style]; - [self postEdgeStyleAdded:style]; -} - -- (void) removeEdgeStyle:(EdgeStyle*)style { - if (edgeStyles == nil) { - [self loadDefaultEdgeStyles]; - } - - [self ignoreEdgeStyle:style]; -#if ! __has_feature(objc_arc) - [style retain]; -#endif - [edgeStyles removeObject:style]; - [self postEdgeStyleRemoved:style]; -#if ! __has_feature(objc_arc) - [style release]; -#endif -} - -- (void) updateFromManager:(StyleManager*)m { - NSMutableArray *ns = [NSMutableArray arrayWithCapacity:[[m nodeStyles] count]]; - for (NodeStyle *style in [m nodeStyles]) { - NodeStyle *currentStyle = [self nodeStyleForName:[style name]]; - if (currentStyle != nil) { - [currentStyle updateFromStyle:style]; - [ns addObject:currentStyle]; - } else { -#if __has_feature(objc_arc) - [ns addObject:[style copy]]; -#else - [ns addObject:[[style copy] autorelease]]; -#endif - } - } - NSMutableArray *es = [NSMutableArray arrayWithCapacity:[[m edgeStyles] count]]; - for (EdgeStyle *style in [m edgeStyles]) { - EdgeStyle *currentStyle = [self edgeStyleForName:[style name]]; - if (currentStyle != nil) { - [currentStyle updateFromStyle:style]; - [es addObject:currentStyle]; - } else { -#if __has_feature(objc_arc) - [es addObject:[style copy]]; -#else - [es addObject:[[style copy] autorelease]]; -#endif - } - } - [self _setNodeStyles:ns]; - [self _setEdgeStyles:es]; -} - -- (id) copyWithZone:(NSZone*)zone { - StyleManager *m = [[StyleManager allocWithZone:zone] init]; - - NSMutableArray *ns = [NSMutableArray arrayWithCapacity:[nodeStyles count]]; - for (NodeStyle *style in nodeStyles) { -#if __has_feature(objc_arc) - [ns addObject:[style copyWithZone:zone]]; -#else - [ns addObject:[[style copyWithZone:zone] autorelease]]; -#endif - } - NSMutableArray *es = [NSMutableArray arrayWithCapacity:[edgeStyles count]]; - for (EdgeStyle *style in edgeStyles) { -#if __has_feature(objc_arc) - [es addObject:[style copyWithZone:zone]]; -#else - [es addObject:[[style copyWithZone:zone] autorelease]]; -#endif - } - [m _setNodeStyles:ns]; - [m _setEdgeStyles:es]; - - return m; -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit/src/common/SupportDir.h b/tikzit/src/common/SupportDir.h deleted file mode 100644 index 30ccbcb..0000000 --- a/tikzit/src/common/SupportDir.h +++ /dev/null @@ -1,36 +0,0 @@ -// -// SupportDir.h -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import - - -@interface SupportDir : NSObject { -} - -+ (void)createUserSupportDir; -+ (NSString*)userSupportDir; -+ (NSString*)systemSupportDir; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit/src/common/SupportDir.m b/tikzit/src/common/SupportDir.m deleted file mode 100644 index 22fed1b..0000000 --- a/tikzit/src/common/SupportDir.m +++ /dev/null @@ -1,65 +0,0 @@ -// -// SupportDir.m -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "SupportDir.h" - -#ifndef __APPLE__ -#import -#import "stat.h" -#endif - -@implementation SupportDir - -+ (NSString*)userSupportDir { -#ifdef __APPLE__ - return [[NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory,NSUserDomainMask,YES) - objectAtIndex:0] stringByAppendingPathComponent:@"TikZiT"]; -#else - return [NSString stringWithFormat:@"%s/tikzit", g_get_user_config_dir ()]; -#endif -} - -+ (NSString*)systemSupportDir { -#ifdef __APPLE__ - return [[NSBundle mainBundle] resourcePath]; -#else - return @TIKZITSHAREDIR; -#endif -} - -+ (void)createUserSupportDir { -#ifdef __APPLE__ - NSFileManager *fileManager = [NSFileManager defaultManager]; - [fileManager createDirectoryAtPath:[SupportDir userSupportDir] - withIntermediateDirectories:YES - attributes:nil - error:NULL]; -#else - // NSFileManager is slightly dodgy on Windows - g_mkdir_with_parents ([[SupportDir userSupportDir] UTF8String], S_IRUSR | S_IWUSR | S_IXUSR); -#endif -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit/src/common/TikzGraphAssembler+Parser.h b/tikzit/src/common/TikzGraphAssembler+Parser.h deleted file mode 100644 index c9391a9..0000000 --- a/tikzit/src/common/TikzGraphAssembler+Parser.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2013 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * TikzGraphAssember+Parser.h - * - * This file exposes some TikzGraphAssembler functions - * that are only of use to the parser. - */ - -#import "TikzGraphAssembler.h" - -@interface TikzGraphAssembler (Parser) -- (Graph*) graph; -/** Store a node so that it can be looked up by name later */ -- (void) addNodeToMap:(Node*)n; -/** Get a previously-stored node by name */ -- (Node*) nodeWithName:(NSString*)name; -- (void) reportError:(const char *)message atLocation:(YYLTYPE*)yylloc; -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit/src/common/TikzGraphAssembler.h b/tikzit/src/common/TikzGraphAssembler.h deleted file mode 100644 index 3403969..0000000 --- a/tikzit/src/common/TikzGraphAssembler.h +++ /dev/null @@ -1,115 +0,0 @@ -// -// TikzGraphAssembler.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "Graph.h" - -/** - * Parses (a subset of) tikz code and produces the corresponding Graph - * - * A note on errors: - * If parsing fails and a non-NULL error argument is given, it will be - * populated with an error with domain TZErrorDomain and code TZ_ERR_PARSE - * (see NSError+Tikzit.h). - * - * This will have a description set, typically something like - * "syntax error, unexpected [, expecting (" - * It may also have the following keys (it will have all or none of these), - * where numbers are stored using NSNumber: - * - startLine: the line (starting at 1) containing the first character - * of the bad token - * - startColumn: the column (starting at 1; tabs count for 1) of the first - * character of the bad token - * - endLine: the line (starting at 1) containing the last character - * of the bad token - * - endColumn: the column (starting at 1; tabs count for 1) of the last - * character of the bad token - * - syntaxString: an excerpt of the input string (typically the contents - * from startLine to endLine) providing some context - * - tokenOffset: the character offset (starting at 0) of the bad token - * within syntaxString - * - tokenLength: the character length (including newlines) of the bad token - * within syntaxString - */ -@interface TikzGraphAssembler : NSObject { - const char *tikzStr; - Graph *graph; - void *scanner; - NSMutableDictionary *nodeMap; - NSError *lastError; -} - -/** - * Parse tikz and place the result in gr - * - * Note that the graph must be empty; this might be used from an init - * method, for example, although don't forget that you can return a - * different object in init methods, providing you get the allocation - * right. - * - * @param tikz the tikz string to parse - * @param gr the graph to store the result in (must be empty, non-nil) - * @param e a location to store an error if parsing fails (may be NULL) - * @return YES if parsing succeeded, NO otherwise - */ -+ (BOOL) parseTikz:(NSString*)tikz forGraph:(Graph*)gr error:(NSError**)e; -/** - * Overload for -[parseTikz:forGraph:error:] with the error set to NULL - */ -+ (BOOL) parseTikz:(NSString*)tikz forGraph:(Graph*)gr; -/** - * Parse tikz - * - * @param tikz the tikz string to parse - * @param e a location to store an error if parsing fails (may be NULL) - * @return a Graph object if parsing succeeded, nil otherwise - */ -+ (Graph*) parseTikz:(NSString*)tikz error:(NSError**)e; -/** - * Overload for -[parseTikz:error:] with the error set to NULL - */ -+ (Graph*) parseTikz:(NSString*)tikz; -/** - * Validate a property string or value - * - * Wraps the string in "{" and "}" and checks it lexes completely; in other - * words, makes sure that "{" and "}" are balanced (ignoring escaped versions). - * @param tikz the string to validate - * @return YES if the string can be used as a property name or value, NO - * otherwise - */ -+ (BOOL)validateTikzPropertyNameOrValue:(NSString*)tikz; - -/** - * Validate an edge anchor - * - * Checks that the given string will successfully lex if used as an anchor for - * and edge - * @param tikz the string to validate - * @return YES if the string can be used as an edge anchor, NO otherwise - */ -+ (BOOL)validateTikzEdgeAnchor:(NSString*)tikz; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit/src/common/TikzGraphAssembler.m b/tikzit/src/common/TikzGraphAssembler.m deleted file mode 100644 index c5d2811..0000000 --- a/tikzit/src/common/TikzGraphAssembler.m +++ /dev/null @@ -1,310 +0,0 @@ -// -// TikzGraphAssembler.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "TikzGraphAssembler.h" -#import "tikzparserdefs.h" -#import "tikzparser.h" -#import "TikzGraphAssembler+Parser.h" -#import "tikzlexer.h" -#import "NSError+Tikzit.h" - -@implementation TikzGraphAssembler - -- (id)init { -#if ! __has_feature(objc_arc) - [self release]; -#endif - return nil; -} - -- (id)initWithGraph:(Graph*)g { - self = [super init]; - if (self) { -#if __has_feature(objc_arc) - graph = g; -#else - graph = [g retain]; -#endif - nodeMap = [[NSMutableDictionary alloc] init]; - yylex_init (&scanner); - yyset_extra(self, scanner); - } - return self; -} - -- (void)dealloc { -#if ! __has_feature(objc_arc) - [graph release]; - [nodeMap release]; - [lastError release]; - yylex_destroy (scanner); - [super dealloc]; -#endif -} - -- (BOOL) parseTikz:(NSString*)t error:(NSError**)error { -#if ! __has_feature(objc_arc) - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; -#endif - - tikzStr = [t UTF8String]; - yy_scan_string(tikzStr, scanner); - int result = yyparse(scanner); - tikzStr = NULL; - -#if ! __has_feature(objc_arc) - [pool drain]; -#endif - - if (result == 0) { - return YES; - } else { - if (error) { - if (lastError) { -#if __has_feature(objc_arc) - *error = lastError; -#else - *error = [[lastError retain] autorelease]; -#endif - } else if (result == 1) { - *error = [NSError errorWithMessage:@"Syntax error" - code:TZ_ERR_PARSE]; - } else if (result == 2) { - *error = [NSError errorWithMessage:@"Insufficient memory" - code:TZ_ERR_PARSE]; - } else { - *error = [NSError errorWithMessage:@"Unknown error" - code:TZ_ERR_PARSE]; - } - } - return NO; - } -} - -+ (BOOL) parseTikz:(NSString*)tikz forGraph:(Graph*)gr { - return [self parseTikz:tikz forGraph:gr error:NULL]; -} -+ (Graph*) parseTikz:(NSString*)tikz error:(NSError**)e { - Graph *gr = [[Graph alloc] init]; - if ([self parseTikz:tikz forGraph:gr error:e]) { -#if __has_feature(objc_arc) - return gr; -#else - return [gr autorelease]; -#endif - } else { -#if ! __has_feature(objc_arc) - [gr release]; -#endif - return nil; - } -} -+ (Graph*) parseTikz:(NSString*)tikz { - return [self parseTikz:tikz error:NULL]; -} - -+ (BOOL) parseTikz:(NSString*)tikz forGraph:(Graph*)gr error:(NSError**)error { - if([tikz length] == 0) { - // empty string -> empty graph - return YES; - } - - TikzGraphAssembler *assembler = [[self alloc] initWithGraph:gr]; - BOOL success = [assembler parseTikz:tikz error:error]; -#if ! __has_feature(objc_arc) - [assembler release]; -#endif - return success; -} - -+ (BOOL)validateTikzPropertyNameOrValue:(NSString*)tikz { - BOOL valid; - - NSString * testTikz = [NSString stringWithFormat: @"{%@}", tikz]; - - void *scanner; - yylex_init (&scanner); - yyset_extra(nil, scanner); - yy_scan_string([testTikz UTF8String], scanner); - YYSTYPE lval; - YYLTYPE lloc; - int result = yylex(&lval, &lloc, scanner); - valid = (result == DELIMITEDSTRING) && - (yyget_leng(scanner) == [testTikz length]); - yylex_destroy(scanner); - - return valid; -} - -+ (BOOL)validateTikzEdgeAnchor:(NSString*)tikz { - if ([tikz length] == 0) - return YES; - - BOOL valid = YES; - - NSString * testTikz = [NSString stringWithFormat: @"(1.%@)", tikz]; - - void *scanner; - yylex_init (&scanner); - yyset_extra(nil, scanner); - yy_scan_string([testTikz UTF8String], scanner); - YYSTYPE lval; - YYLTYPE lloc; - valid = valid && (yylex(&lval, &lloc, scanner) == LEFTPARENTHESIS); - valid = valid && (yylex(&lval, &lloc, scanner) == REFSTRING); - valid = valid && (yylex(&lval, &lloc, scanner) == FULLSTOP); - valid = valid && (yylex(&lval, &lloc, scanner) == REFSTRING); - valid = valid && (yylex(&lval, &lloc, scanner) == RIGHTPARENTHESIS); - valid = valid && (lloc.last_column == [testTikz length]); - yylex_destroy(scanner); - - return valid; -} - -@end - -@implementation TikzGraphAssembler (Parser) -- (Graph*)graph { return graph; } - -- (void)addNodeToMap:(Node*)n { - [nodeMap setObject:n forKey:[n name]]; -} - -- (Node*)nodeWithName:(NSString*)name { - return [nodeMap objectForKey:name]; -} - -- (void) setLastError:(NSError*)error { -#if ! __has_feature(objc_arc) - [error retain]; - [lastError release]; -#endif - lastError = error; -} - -- (void) reportError:(const char *)message atLocation:(YYLTYPE*)yylloc { - NSString *nsmsg = [NSString stringWithUTF8String:message]; - - const char *first_line_start = find_start_of_nth_line ( - tikzStr, yylloc->first_line - 1); - const char *last_line_start = find_start_of_nth_line ( - first_line_start, yylloc->last_line - yylloc->first_line); - const char *last_line_end = last_line_start; - while (*last_line_end && *last_line_end != '\n') { - // points to just after end of last line - ++last_line_end; - } - - size_t context_len = last_line_end - first_line_start; - size_t token_offset = yylloc->first_column - 1; - size_t token_len = ((last_line_start - first_line_start) + yylloc->last_column) - token_offset; - - if (token_offset + token_len > context_len) { - // error position state is corrupted - NSLog(@"Got bad error state for error \"%s\": start(%i,%i), end(%i,%i)", - message, - yylloc->first_line, - yylloc->first_column, - yylloc->last_line, - yylloc->last_column); - [self setLastError:[NSError errorWithMessage:nsmsg - code:TZ_ERR_PARSE]]; - } else { - char *context = malloc (context_len + 1); - strncpy (context, first_line_start, context_len); - *(context + context_len) = '\0'; - - NSDictionary *userInfo = - [NSDictionary dictionaryWithObjectsAndKeys: - nsmsg, - NSLocalizedDescriptionKey, - [NSNumber numberWithInt:yylloc->first_line], - @"startLine", - [NSNumber numberWithInt:yylloc->first_column], - @"startColumn", - [NSNumber numberWithInt:yylloc->last_line], - @"endLine", - [NSNumber numberWithInt:yylloc->last_column], - @"endColumn", - [NSString stringWithUTF8String:context], - @"syntaxString", - [NSNumber numberWithInt:token_offset], - @"tokenStart", - [NSNumber numberWithInt:token_len], - @"tokenLength", - nil]; - [self setLastError: - [NSError errorWithDomain:TZErrorDomain - code:TZ_ERR_PARSE - userInfo:userInfo]]; - - // we can now freely edit context string - // we only bother printing out the first line - if (yylloc->last_line > yylloc->first_line) { - char *nlp = strchr(context, '\n'); - if (nlp) { - *nlp = '\0'; - context_len = nlp - context; - NSAssert2(token_offset < context_len, @"token_offset (%lu) < context_len (%lu)", token_offset, context_len); - if (token_offset + token_len > context_len) { - token_len = context_len - token_offset; - } - } else { - NSLog(@"Didn't find any newlines in context string!"); - } - } - size_t token_col_offset = 0; - size_t token_col_len = 0; - for (int i = 0; i < token_offset; ++i) { - if (*(context + i) == '\t') - token_col_offset += 8; - else - ++token_col_offset; - } - for (int i = token_offset; i < token_offset + token_len; ++i) { - if (*(context + i) == '\t') - token_col_len += 8; - else - ++token_col_len; - } - NSString *pointerLinePadding = - [@"" stringByPaddingToLength:token_col_offset - withString:@" " - startingAtIndex:0]; - NSString *pointerLineCarets = - [@"" stringByPaddingToLength:token_col_len - withString:@"^" - startingAtIndex:0]; - NSLog(@"Parse error on line %i, starting at %i: %s\n%s\n%@%@", - yylloc->first_line, - yylloc->first_column, - message, - context, - pointerLinePadding, - pointerLineCarets); - free (context); - } -} -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit/src/common/TikzShape.h b/tikzit/src/common/TikzShape.h deleted file mode 100644 index 6a91f91..0000000 --- a/tikzit/src/common/TikzShape.h +++ /dev/null @@ -1,37 +0,0 @@ -// -// TikzShape.h -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "Shape.h" - -@interface TikzShape : Shape { - NSString *tikzSrc; -} - -@property (copy) NSString *tikzSrc; - -- (id)initWithTikzFile:(NSString*)file; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit/src/common/TikzShape.m b/tikzit/src/common/TikzShape.m deleted file mode 100644 index 555a7df..0000000 --- a/tikzit/src/common/TikzShape.m +++ /dev/null @@ -1,70 +0,0 @@ -// -// TikzShape.m -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "TikzShape.h" -#import "Graph.h" - -@implementation TikzShape - -@synthesize tikzSrc; - -- (id)initWithTikzFile:(NSString*)file { - self = [super init]; - if (self) { - NSString *tikz = [NSString stringWithContentsOfFile:file - encoding:NSUTF8StringEncoding - error:NULL]; - if (tikz == nil) return nil; - - tikzSrc = [tikz copy]; - - Graph *graph = [Graph graphFromTikz:tikz]; - if (graph == nil) return nil; - - NSRect graphBounds = ([graph hasBoundingBox]) ? [graph boundingBox] : [graph bounds]; - - float sz = 0.5f; - - // the "screen" coordinate space fits in the shape bounds - Transformer *t = [Transformer transformer]; - float width_ratio = (2*sz) / graphBounds.size.width; - float height_ratio = (2*sz) / graphBounds.size.height; - [t setScale:MIN(width_ratio, height_ratio)]; - NSRect bds = [t rectToScreen:graphBounds]; - NSPoint shift = NSMakePoint(-NSMidX(bds), - -NSMidY(bds)); - [t setOrigin:shift]; - [graph applyTransformer:t]; -#if __has_feature(objc_arc) - paths = [graph pathCover]; -#else - paths = [[graph pathCover] retain]; -#endif - } - return self; -} - - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit/src/common/Transformer.h b/tikzit/src/common/Transformer.h deleted file mode 100644 index 1b0108a..0000000 --- a/tikzit/src/common/Transformer.h +++ /dev/null @@ -1,154 +0,0 @@ -// -// Transformer.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - - -#import - -extern float const PIXELS_PER_UNIT; - -/*! - @class Transformer - @brief Do affine coordinate transforms between an abstract co-ordinate - space (such as the graph's) and the screen's. - - This currently allows zooming and panning. - */ -@interface Transformer : NSObject { - NSPoint origin; - float x_scale; - float y_scale; -} - -/*! - @brief The screen co-ordinate of the abstract space origin. - */ -@property (assign) NSPoint origin; - -/*! - @brief The scale (from abstract space to screen space) - @detail This is the size of a single unit (a distance of 1.0) - of the abstract space on the screen. - - Around 50 is a reasonable value. - */ -@property (assign) float scale; - -/*! - @brief Whether co-ordinates are flipped about the X axis - @detail TikZ considers X co-ordinates to run left to right, - which is not necessarily how the screen views - them. - */ -@property (assign,getter=isFlippedAboutXAxis) BOOL flippedAboutXAxis; - -/*! - @brief Whether co-ordinates are flipped about the Y axis - @detail TikZ considers Y co-ordinates to run up the page, - which is not necessarily how the screen views - them. - */ -@property (assign,getter=isFlippedAboutYAxis) BOOL flippedAboutYAxis; - -/*! - @brief Transform a point from screen space to abstract space. - @param p a point in screen space. - @result A point in abstract space. - */ -- (NSPoint)fromScreen:(NSPoint)p; - -/*! - @brief Transform a point from abstract space to screen space. - @param p a point in abstract space. - @result A point in screen space. - */ -- (NSPoint)toScreen:(NSPoint)p; - -/*! - @brief Scale a distance from screen space to abstract space. - @param dist a distance in screen space. - @result A distance in abstract space. - */ -- (float)scaleFromScreen:(float)dist; - -/*! - @brief Scale a distance from abstract space to screen space. - @param dist a distance in abstract space. - @result A distance in screen space. - */ -- (float)scaleToScreen:(float)dist; - -/*! - @brief Scale a rectangle from screen space to abstract space. - @param r a rectangle in screen space. - @result A rectangle in abstract space. - */ -- (NSRect)rectFromScreen:(NSRect)r; - -/*! - @brief Scale a rectangle from abstract space to screen space. - @param r a rectangle in abstract space. - @result A rectangle in screen space. - */ -- (NSRect)rectToScreen:(NSRect)r; - -/*! - @brief Factory method to get an identity transformer. - @result A transformer. - */ -+ (Transformer*)transformer; - -/*! - @brief Factory method to get a transformer identical to another - @result A transformer. - */ -+ (Transformer*)transformerWithTransformer:(Transformer*)t; - -/*! - @brief Factory method to get a transformer. - @param o The screen co-ordinate of the abstract space origin - @param scale The scale (from abstract space to screen space) - @result A transformer. - */ -+ (Transformer*)transformerWithOrigin:(NSPoint)o andScale:(float)scale; - -/*! - @brief Get a global 'actual size' transformer. - @result A transformer. - */ -+ (Transformer*)defaultTransformer; - -/*! - @brief A transformer set up from two bounding rects. - - graphRect is made as large as possible while still fitting into screenRect. - @result A transformer. - */ -+ (Transformer*)transformerToFit:(NSRect)graphRect intoScreenRect:(NSRect)screenRect flippedAboutXAxis:(BOOL)flipX flippedAboutYAxis:(BOOL)flipY; - -+ (Transformer*)transformerToFit:(NSRect)graphRect intoScreenRect:(NSRect)screenRect flippedAboutXAxis:(BOOL)flipX; -+ (Transformer*)transformerToFit:(NSRect)graphRect intoScreenRect:(NSRect)screenRect flippedAboutYAxis:(BOOL)flipY; -+ (Transformer*)transformerToFit:(NSRect)graphRect intoScreenRect:(NSRect)screenRect; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit/src/common/Transformer.m b/tikzit/src/common/Transformer.m deleted file mode 100644 index 2b56813..0000000 --- a/tikzit/src/common/Transformer.m +++ /dev/null @@ -1,231 +0,0 @@ -// -// Transformer.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "Transformer.h" - -float const PIXELS_PER_UNIT = 50; - -@implementation Transformer - -+ (Transformer*)transformer { -#if __has_feature(objc_arc) - return [[Transformer alloc] init]; -#else - return [[[Transformer alloc] init] autorelease]; -#endif -} - -+ (Transformer*)transformerWithTransformer:(Transformer*)t { -#if __has_feature(objc_arc) - return [t copy]; -#else - return [[t copy] autorelease]; -#endif -} - -+ (Transformer*)transformerWithOrigin:(NSPoint)o andScale:(float)scale { - Transformer *trans = [self transformer]; - [trans setOrigin:o]; - [trans setScale:scale]; - return trans; -} - -+ (Transformer*)transformerToFit:(NSRect)graphRect - intoScreenRect:(NSRect)screenRect { - return [self transformerToFit:graphRect - intoScreenRect:screenRect - flippedAboutXAxis:NO - flippedAboutYAxis:NO]; -} - -+ (Transformer*)transformerToFit:(NSRect)graphRect - intoScreenRect:(NSRect)screenRect - flippedAboutXAxis:(BOOL)flipX { - return [self transformerToFit:graphRect - intoScreenRect:screenRect - flippedAboutXAxis:flipX - flippedAboutYAxis:NO]; -} - -+ (Transformer*)transformerToFit:(NSRect)graphRect - intoScreenRect:(NSRect)screenRect - flippedAboutYAxis:(BOOL)flipY { - return [self transformerToFit:graphRect - intoScreenRect:screenRect - flippedAboutXAxis:NO - flippedAboutYAxis:flipY]; -} - -+ (Transformer*)transformerToFit:(NSRect)graphRect - intoScreenRect:(NSRect)screenRect - flippedAboutXAxis:(BOOL)flipAboutXAxis - flippedAboutYAxis:(BOOL)flipAboutYAxis { - - const float wscale = screenRect.size.width / graphRect.size.width; - const float hscale = screenRect.size.height / graphRect.size.height; - const float scale = (wscale < hscale) ? wscale : hscale; - const float xpad = (screenRect.size.width - (graphRect.size.width * scale)) / 2.0; - const float ypad = (screenRect.size.height - (graphRect.size.height * scale)) / 2.0; - - // if we are flipping, we need to calculate the origin from the opposite edge - const float gx = flipAboutYAxis ? -(graphRect.size.width + graphRect.origin.x) - : graphRect.origin.x; - const float gy = flipAboutXAxis ? -(graphRect.size.height + graphRect.origin.y) - : graphRect.origin.y; - const float origin_x = screenRect.origin.x - (gx * scale) + xpad; - const float origin_y = screenRect.origin.y - (gy * scale) + ypad; - - Transformer *trans = [self transformer]; - [trans setOrigin:NSMakePoint(origin_x, origin_y)]; - [trans setScale:scale]; - [trans setFlippedAboutXAxis:flipAboutXAxis]; - [trans setFlippedAboutYAxis:flipAboutYAxis]; - return trans; -} - -- (id) init { - self = [super init]; - - if (self) { - origin = NSZeroPoint; - x_scale = 1.0f; - y_scale = 1.0f; - } - - return self; -} - -- (id)copyWithZone:(NSZone *)zone { - Transformer *cp = [[[self class] allocWithZone:zone] init]; - if (cp) { - cp->origin = origin; - cp->x_scale = x_scale; - cp->y_scale = y_scale; - } - return cp; -} - -- (NSPoint)origin { return origin; } -- (void)setOrigin:(NSPoint)o { - origin = o; -} - -- (float)scale { return ABS(x_scale); } -- (void)setScale:(float)s { - x_scale = (x_scale < 0.0) ? -s : s; - y_scale = (y_scale < 0.0) ? -s : s; -} - -- (BOOL)isFlippedAboutXAxis { - return y_scale < 0.0; -} - -- (void)setFlippedAboutXAxis:(BOOL)flip { - if (flip != [self isFlippedAboutXAxis]) { - y_scale *= -1; - } -} - -- (BOOL)isFlippedAboutYAxis { - return x_scale < 0.0; -} - -- (void)setFlippedAboutYAxis:(BOOL)flip { - if (flip != [self isFlippedAboutYAxis]) { - x_scale *= -1; - } -} - -- (NSPoint)fromScreen:(NSPoint)p { - NSPoint trans; - trans.x = (p.x - origin.x) / x_scale; - trans.y = (p.y - origin.y) / y_scale; - return trans; -} - -- (NSPoint)toScreen:(NSPoint)p { - NSPoint trans; - trans.x = (p.x * x_scale) + origin.x; - trans.y = (p.y * y_scale) + origin.y; - return trans; -} - -- (float)scaleFromScreen:(float)dist { - return dist / ABS(x_scale); -} - -- (float)scaleToScreen:(float)dist { - return dist * ABS(x_scale); -} - -- (NSRect)rectFromScreen:(NSRect)r { - NSRect r1; - r1.origin = [self fromScreen:r.origin]; - r1.size.width = [self scaleFromScreen:r.size.width]; - r1.size.height = [self scaleFromScreen:r.size.height]; - // if we're flipped, the origin will be at a different corner - if ([self isFlippedAboutYAxis]) { - r1.origin.x -= r1.size.width; - } - if ([self isFlippedAboutXAxis]) { - r1.origin.y -= r1.size.height; - } - return r1; -} - -- (NSRect)rectToScreen:(NSRect)r { - NSPoint o = r.origin; - // if we're flipped, the origin will be at a different corner - if ([self isFlippedAboutYAxis]) { - o.x = NSMaxX(r); - } - if ([self isFlippedAboutXAxis]) { - o.y = NSMaxY(r); - } - NSRect r1; - r1.origin = [self toScreen:o]; - r1.size.width = [self scaleToScreen:r.size.width]; - r1.size.height = [self scaleToScreen:r.size.height]; - return r1; -} - -- (BOOL)isEqual:(id)object { - Transformer *t = (Transformer*)object; - return ([t origin].x == [self origin].x && - [t origin].y == [self origin].y && - [t scale] == [self scale]); -} - -Transformer *defaultTransformer = nil; - -+ (Transformer*)defaultTransformer { - if (defaultTransformer == nil) { - defaultTransformer = [[Transformer alloc] init]; - [defaultTransformer setScale:PIXELS_PER_UNIT]; - } - return defaultTransformer; -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit/src/common/test/Makefile b/tikzit/src/common/test/Makefile deleted file mode 100644 index d158d16..0000000 --- a/tikzit/src/common/test/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -OBJC = gcc -MMD -MP -DSTAND_ALONE -DGNUSTEP -DGNUSTEP_BASE_LIBRARY=1 -DGNU_RUNTIME=1 -DGNUSTEP_BASE_LIBRARY=1 -fno-strict-aliasing -fPIC -Wall -DGSWARN -DGSDIAGNOSE -Wno-import -O0 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic -fgnu-runtime -fconstant-string-class=NSConstantString -I. -I.. -I/users/alemer/GNUstep/Library/Headers -std=c99 -D_GNU_SOURCE -rdynamic -fgnu-runtime -L/users/alemer/GNUstep/Library/Libraries -L/usr/local/lib64 -L/usr/lib64 -lgnustep-base -lpthread -lobjc -lm - -maths_test_objects = test.m maths.m ../util.m -color_test_objects = test.m color.m ../ColorRGB.m ../util.m ../BasicMapTable.m ../RColor.m - -test: maths-test color-test - ./maths-test - ./color-test - -maths-test: $(maths_test_objects) - $(OBJC) $(maths_test_objects) -o $@ - -color-test: $(color_test_objects) - $(OBJC) $(color_test_objects) -o $@ diff --git a/tikzit/src/common/test/color.m b/tikzit/src/common/test/color.m deleted file mode 100644 index 48a6ff4..0000000 --- a/tikzit/src/common/test/color.m +++ /dev/null @@ -1,80 +0,0 @@ -// -// color.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// -#import "test/test.h" -#import "ColorRGB.h" - -#ifdef STAND_ALONE -void runTests() { -#else -void testColor() { -#endif - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - startTestBlock(@"color"); - - ColorRGB *red = [ColorRGB colorWithRed:255 green:0 blue:0]; - ColorRGB *lime = [ColorRGB colorWithRed:0 green:255 blue:0]; - ColorRGB *green = [ColorRGB colorWithRed:0 green:128 blue:0]; - TEST(@"Recognised red", - [red name] != nil && - [[red name] isEqualToString:@"Red"]); - TEST(@"Recognised lime", - [lime name] != nil && - [[lime name] isEqualToString:@"Lime"]); - TEST(@"Recognised green", - [green name] != nil && - [[green name] isEqualToString:@"Green"]); - - ColorRGB *floatRed = [ColorRGB colorWithFloatRed:1.0f green:0.0f blue:0.0f]; - ColorRGB *floatLime = [ColorRGB colorWithFloatRed:0.0f green:1.0f blue:0.0f]; - ColorRGB *floatGreen = [ColorRGB colorWithFloatRed:0.0f green:0.5f blue:0.0f]; - - TEST(@"Float red equal to int red", [floatRed isEqual:red]); - TEST(@"Float lime equal to int lime", [floatLime isEqual:lime]); - TEST(@"Float green equal to int green", [floatGreen isEqual:green]); - - TEST(@"Recognised float red", - [floatRed name] != nil && - [[floatRed name] isEqualToString:@"Red"]); - - TEST(@"Recognised float lime", - [floatLime name] != nil && - [[floatLime name] isEqualToString:@"Lime"]); - - TEST(@"Recognised float green", - [floatGreen name] != nil && - [[floatGreen name] isEqualToString:@"Green"]); - - [floatRed setRedFloat:0.99f]; - TEST(@"Nudged red, not recognised now", [floatRed name] == nil); - [floatRed setToClosestHashed]; - TEST(@"Set to closest hashed, reconised again", - [floatRed name] != nil && - [[floatRed name] isEqualToString:@"Red"]); - - TEST(@"Red has correct hex (ff0000)", [[red hexName] isEqualToString:@"hexcolor0xff0000"]); - TEST(@"Lime has correct hex (00ff00)", [[lime hexName] isEqualToString:@"hexcolor0x00ff00"]); - TEST(@"Green has correct hex (008000)", [[green hexName] isEqualToString:@"hexcolor0x008000"]); - - endTestBlock(@"color"); - [pool drain]; -} diff --git a/tikzit/src/common/test/common.m b/tikzit/src/common/test/common.m deleted file mode 100644 index c9ac980..0000000 --- a/tikzit/src/common/test/common.m +++ /dev/null @@ -1,34 +0,0 @@ -// -// common.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// -#import "test/test.h" -void testParser(); -void testColor(); -void testMaths(); - -void testCommon() { - startTestBlock(@"common"); - testParser(); - testColor(); - testMaths(); - endTestBlock(@"common"); -} diff --git a/tikzit/src/common/test/maths.m b/tikzit/src/common/test/maths.m deleted file mode 100644 index a11e58e..0000000 --- a/tikzit/src/common/test/maths.m +++ /dev/null @@ -1,562 +0,0 @@ -// -// TikZiT -// -// Copyright 2011 Alex Merry -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "../util.h" - -#import "test.h" - -void testRectAroundPoints() { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - startTestBlock(@"NSRectAroundPoints"); - - NSRect rect = NSRectAroundPoints (NSZeroPoint, NSZeroPoint); - assertRectsEqual (@"(0,0) and (0,0)", rect, NSZeroRect); - - rect = NSRectAroundPoints (NSZeroPoint, NSMakePoint (1.0f, 1.0f)); - assertRectsEqual (@"(0,0) and (1,1)", rect, NSMakeRect (0.0f, 0.0f, 1.0f, 1.0f)); - - rect = NSRectAroundPoints (NSMakePoint (-1.0f, 1.0f), NSMakePoint (1.0f, -1.0f)); - assertRectsEqual (@"(-1,1) and (1,-1)", rect, NSMakeRect (-1.0f, -1.0f, 2.0f, 2.0f)); - - endTestBlock(@"NSRectAroundPoints"); - [pool drain]; -} - -void testRectAroundPointsWithPadding() { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - startTestBlock(@"NSRectAroundPointsWithPadding"); - - NSRect rect = NSRectAroundPointsWithPadding (NSZeroPoint, NSZeroPoint, 0.0f); - assertRectsEqual (@"(0,0) and (0,0); 0 padding", rect, NSZeroRect); - - rect = NSRectAroundPointsWithPadding (NSZeroPoint, NSZeroPoint, 0.2f); - assertRectsEqual (@"(0,0) and (0,0); 0.2 padding", rect, NSMakeRect (-0.2f, -0.2f, 0.4f, 0.4f)); - - rect = NSRectAroundPointsWithPadding (NSZeroPoint, NSMakePoint (1.0f, 1.0f), -0.2f); - assertRectsEqual (@"(0,0) and (1,1); -0.2 padding", rect, NSMakeRect (0.2f, 0.2f, 0.6f, 0.6f)); - - endTestBlock(@"NSRectAroundPointsWithPadding"); - [pool drain]; -} - -void testGoodAtan() { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - startTestBlock(@"good_atan"); - - assertFloatsEqual (@"0.0, 0.0", good_atan (0.0f, 0.0f), 0.0f); - assertFloatsEqual (@"0.0, 1.0", good_atan (0.0f, 1.0f), 0.5f * M_PI); - assertFloatsEqual (@"0.0, -1.0", good_atan (0.0f, -1.0f), 1.5f * M_PI); - assertFloatsEqual (@"1.0, 0.0", good_atan (1.0f, 0.0f), 0.0f); - assertFloatsEqual (@"1.0, 0.1", good_atan (1.0f, 0.1f), 0.0996687f); - - endTestBlock(@"good_atan"); - [pool drain]; -} - -void testBezierInterpolate() { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - startTestBlock(@"bezierInterpolate"); - - assertFloatsEqual (@"0.0, (0.0, 0.1, 0.2, 0.3)", bezierInterpolate (0.0f, 0.0f, 0.1f, 0.2f, 0.3f), 0.0f); - assertFloatsEqual (@"1.0, (0.0, 0.1, 0.2, 0.3)", bezierInterpolate (1.0f, 0.0f, 0.1f, 0.2f, 0.3f), 0.3f); - assertFloatsEqual (@"0.5, (0.0, 0.1, 0.2, 0.3)", bezierInterpolate (0.5f, 0.0f, 0.1f, 0.2f, 0.3f), 0.15f); - // FIXME: other tests - - endTestBlock(@"bezierInterpolate"); - [pool drain]; -} - -void testLineSegmentsIntersect() { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - startTestBlock(@"lineSegmentsIntersect"); - - BOOL result = NO; - NSPoint intersection = NSMakePoint (-1.0f, -1.0f); - - result = lineSegmentsIntersect (NSMakePoint (-1.0f, -1.0f), NSMakePoint (1.0f, 1.0f), - NSMakePoint (-1.0f, 1.0f), NSMakePoint (1.0f, -1.0f), - &intersection); - TEST (@"Cross at zero: has intersection", result); - assertPointsEqual (@"Cross at zero: intersection value", intersection, NSZeroPoint); - - result = lineSegmentsIntersect (NSMakePoint (-1.0f, -1.0f), NSMakePoint (-0.5f, -0.5f), - NSMakePoint (-1.0f, 1.0f), NSMakePoint (1.0f, -1.0f), - &intersection); - TEST (@"Fail to cross at zero", !result); - - result = lineSegmentsIntersect (NSMakePoint (1.0f, 1.0f), NSMakePoint (1.0f, -1.0f), - NSMakePoint (0.0f, 0.0f), NSMakePoint (1.0f, 0.0f), - &intersection); - TEST (@"Touch at one: has intersection", result); - assertPointsEqual (@"Touch at one: intersection value", intersection, NSMakePoint (1.0f, 0.0f)); - - endTestBlock(@"lineSegmentsIntersect"); - [pool drain]; -} - -void testLineSegmentIntersectsRect() { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - startTestBlock(@"lineSegmentIntersectsRect"); - - BOOL result = NO; - - result = lineSegmentIntersectsRect ( - NSMakePoint (-1.0f, -1.0f), - NSMakePoint (0.0f, 0.0f), - NSZeroRect); - TEST (@"Zero rect; line touches zero", result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (-1.0f, -1.0f), - NSMakePoint (-0.1f, -0.1f), - NSZeroRect); - TEST (@"Zero rect; line short of zero", !result); - - NSRect rect = NSMakeRect (1.0f, 1.0f, 1.0f, 1.0f); - - result = lineSegmentIntersectsRect ( - NSMakePoint (0.0f, 0.0f), - NSMakePoint (3.0f, 1.0f), - rect); - TEST (@"Line underneath", !result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (0.0f, 0.0f), - NSMakePoint (1.0f, 3.0f), - rect); - TEST (@"Line to left", !result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (0.0f, 2.0f), - NSMakePoint (3.0f, 3.0f), - rect); - TEST (@"Line above", !result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (2.0f, 0.0f), - NSMakePoint (3.0f, 3.0f), - rect); - TEST (@"Line to right", !result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (0.0f, 0.0f), - NSMakePoint (0.9f, 0.9f), - rect); - TEST (@"Line short", !result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (1.1f, 1.1f), - NSMakePoint (1.9f, 1.9f), - rect); - TEST (@"Line inside", result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (0.0f, 1.5f), - NSMakePoint (3.0f, 1.5f), - rect); - TEST (@"Horizontal line through", result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (1.5f, 0.0f), - NSMakePoint (1.5f, 3.0f), - rect); - TEST (@"Vertical line through", result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (0.5f, 1.0f), - NSMakePoint (2.0f, 2.5f), - rect); - TEST (@"Cut top and left", result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (2.0f, 0.5f), - NSMakePoint (0.5f, 2.0f), - rect); - TEST (@"Cut bottom and left", result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (1.0f, 0.5f), - NSMakePoint (2.5f, 2.0f), - rect); - TEST (@"Cut bottom and right", result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (0.0f, 1.0f), - NSMakePoint (2.0f, 3.0f), - rect); - TEST (@"Touch top left", result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (1.0f, 0.0f), - NSMakePoint (3.0f, 2.0f), - rect); - TEST (@"Touch bottom right", result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (1.0f, 0.0f), - NSMakePoint (1.0f, 3.0f), - rect); - TEST (@"Along left side", result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (0.0f, 1.0f), - NSMakePoint (3.0f, 1.0f), - rect); - TEST (@"Along bottom side", result); - - endTestBlock(@"lineSegmentIntersectsRect"); - [pool drain]; -} - -struct line_bezier_test { - NSString *msg; - NSPoint lstart; - NSPoint lend; - NSPoint c0; - NSPoint c1; - NSPoint c2; - NSPoint c3; - BOOL expectedResult; - float expectedT; - NSPoint expectedIntersect; -}; - -static struct line_bezier_test line_bezier_tests[] = { - { - @"Outside box", - {0.0f, 0.0f}, - {1.0f, 0.0f}, - {0.0f, 1.0f}, - {0.0f, 2.0f}, - {1.0f, 2.0f}, - {1.0f, 1.0f}, - NO, - -1.0f, - {0.0f, 0.0f} - }, - { - @"Single intersect", - {100.0f, 20.0f}, - {195.0f, 255.0f}, - {93.0f, 163.0f}, - {40.0f, 30.0f}, - {270.0f, 115.0f}, - {219.0f, 178.0f}, - YES, - -0.4f, - {129.391693f, 92.705772f} - }, - { - @"Double intersect", - {100.0f, 20.0f}, - {195.0f, 255.0f}, - {93.0f, 163.0f}, - {40.0f, 30.0f}, - {270.0f, 115.0f}, - {154.0f, 212.0f}, - YES, - -0.909f, - {170.740646f,194.990021f} - }, - { - @"Near miss", - {100.0f, 20.0f}, - {195.0f, 255.0f}, - {93.0f, 163.0f}, - {40.0f, 30.0f}, - {176.0f, 100.0f}, - {154.0f, 212.0f}, - NO, - -1.0f, - {0.0f,0.0f} - } -}; -static unsigned int n_line_bezier_tests = sizeof (line_bezier_tests) / sizeof (line_bezier_tests[0]); - -void testLineSegmentIntersectsBezier() { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - startTestBlock(@"lineSegmentIntersectsBezier"); - - for (unsigned int i = 0; i < n_line_bezier_tests; ++i) { - NSPoint intersect; - BOOL result = lineSegmentIntersectsBezier ( - line_bezier_tests[i].lstart, - line_bezier_tests[i].lend, - line_bezier_tests[i].c0, - line_bezier_tests[i].c1, - line_bezier_tests[i].c2, - line_bezier_tests[i].c3, - &intersect); - if (result) { - if (line_bezier_tests[i].expectedT < 0.0f) { - assertPointsEqual (line_bezier_tests[i].msg, intersect, line_bezier_tests[i].expectedIntersect); - } else { - assertPointsEqual (line_bezier_tests[i].msg, intersect, - bezierInterpolateFull (line_bezier_tests[i].expectedT, line_bezier_tests[i].c0, line_bezier_tests[i].c1, line_bezier_tests[i].c2, line_bezier_tests[i].c3)); - } - } else { - if (line_bezier_tests[i].expectedResult) - fail (line_bezier_tests[i].msg); - else - pass (line_bezier_tests[i].msg); - } - } - -BOOL lineSegmentIntersectsBezier (NSPoint lstart, NSPoint lend, NSPoint c0, NSPoint c1, NSPoint c2, NSPoint c3, NSPoint *result); - endTestBlock(@"lineSegmentIntersectsBezier"); - [pool drain]; -} - -struct exit_point_test { - NSString *msg; - NSPoint rayStart; - float angle; - NSRect rect; - NSPoint expected; -}; - -static struct exit_point_test exit_point_tests[] = { - { - @"0.0 rads", - {0.0f, 0.0f}, - 0.0f, - {{-1.0f, -1.0f}, {2.0f, 2.0f}}, - {1.0f, 0.0f} - }, - { - @"pi/2 rads", - {0.0f, 0.0f}, - M_PI / 2.0f, - {{-1.0f, -1.0f}, {2.0f, 2.0f}}, - {0.0f, 1.0f} - }, - { - @"-pi/2 rads", - {0.0f, 0.0f}, - -M_PI / 2.0f, - {{-1.0f, -1.0f}, {2.0f, 2.0f}}, - {0.0f, -1.0f} - }, - { - @"pi rads", - {0.0f, 0.0f}, - M_PI, - {{-1.0f, -1.0f}, {2.0f, 2.0f}}, - {-1.0f, 0.0f} - }, - { - @"-pi rads", - {0.0f, 0.0f}, - -M_PI, - {{-1.0f, -1.0f}, {2.0f, 2.0f}}, - {-1.0f, 0.0f} - }, - { - @"pi/4 rads", - {0.0f, 0.0f}, - M_PI / 4.0f, - {{-1.0f, -1.0f}, {2.0f, 2.0f}}, - {1.0f, 1.0f} - }, - { - @"3pi/4 rads", - {0.0f, 0.0f}, - (3.0f * M_PI) / 4.0f, - {{-1.0f, -1.0f}, {2.0f, 2.0f}}, - {-1.0f, 1.0f} - }, - { - @"-pi/4 rads", - {0.0f, 0.0f}, - -M_PI / 4.0f, - {{-1.0f, -1.0f}, {2.0f, 2.0f}}, - {1.0f, -1.0f} - }, - { - @"-3pi/4 rads", - {0.0f, 0.0f}, - (-3.0f * M_PI) / 4.0f, - {{-1.0f, -1.0f}, {2.0f, 2.0f}}, - {-1.0f, -1.0f} - }, - { - @"pi/8 rads", - {0.0f, 0.0f}, - M_PI / 8.0f, - {{-1.0f, -1.0f}, {2.0f, 2.0f}}, - {1.0f, 0.414213562373095f} - }, - { - @"3pi/8 rads", - {0.0f, 0.0f}, - 3.0f * M_PI / 8.0f, - {{-1.0f, -1.0f}, {2.0f, 2.0f}}, - {0.414213562373095f, 1.0f} - }, - { - @"-5pi/8 rads", - {0.0f, 0.0f}, - -5.0f * M_PI / 8.0f, - {{-1.0f, -1.0f}, {2.0f, 2.0f}}, - {-0.414213562373095f, -1.0f} - }, - { - @"-7pi/8 rads", - {0.0f, 0.0f}, - -7.0f * M_PI / 8.0f, - {{-1.0f, -1.0f}, {2.0f, 2.0f}}, - {-1.0f, -0.414213562373095f} - }, - { - @"pi/8 rads; origin (1,1)", - {1.0f, 1.0f}, - M_PI / 8.0f, - {{0.0f, 0.0f}, {2.0f, 2.0f}}, - {2.0f, 1.414213562373095f} - }, - { - @"7pi/8 rads; origin (-2,2)", - {-2.0f, 2.0f}, - 7.0f * M_PI / 8.0f, - {{-3.0f, 1.0f}, {2.0f, 2.0f}}, - {-3.0f, 2.414213562373095f} - }, - { - @"pi/8 rads; origin (1,1); SW of box", - {1.0f, 1.0f}, - M_PI / 8.0f, - {{1.0f, 1.0f}, {1.0f, 1.0f}}, - {2.0f, 1.414213562373095f} - }, - { - @"pi/8 rads; origin (1,1); SE of box", - {1.0f, 1.0f}, - M_PI / 8.0f, - {{0.0f, 1.0f}, {1.0f, 1.0f}}, - {1.0f, 1.0f} - }, - { - @"pi/8 rads; origin (1,1); NE of box", - {1.0f, 1.0f}, - M_PI / 8.0f, - {{0.0f, 1.0f}, {1.0f, 1.0f}}, - {1.0f, 1.0f} - }, - { - @"pi/8 rads; origin (1,1); NW of box", - {1.0f, 1.0f}, - M_PI / 8.0f, - {{1.0f, 0.0f}, {1.0f, 1.0f}}, - {1.0f, 1.0f} - }, - { - @"pi/8 rads; origin (1,1); N of box", - {1.0f, 1.0f}, - M_PI / 8.0f, - {{0.5f, 0.0f}, {1.0f, 1.0f}}, - {1.0f, 1.0f} - }, - { - @"7pi/8 rads; origin (1,1); N of box", - {1.0f, 1.0f}, - 7.0f * M_PI / 8.0f, - {{0.5f, 0.0f}, {1.0f, 1.0f}}, - {1.0f, 1.0f} - }, - { - @"-pi/8 rads; origin (1,1); S of box", - {1.0f, 1.0f}, - -M_PI / 8.0f, - {{0.5f, 1.0f}, {1.0f, 1.0f}}, - {1.0f, 1.0f} - }, - { - @"-pi/8 rads; origin (1,1); E of box", - {1.0f, 1.0f}, - -M_PI / 8.0f, - {{0.0f, 0.5f}, {1.0f, 1.0f}}, - {1.0f, 1.0f} - }, - { - @"-7pi/8 rads; origin (1,1); W of box", - {1.0f, 1.0f}, - -7.0f * M_PI / 8.0f, - {{1.0f, 0.5f}, {1.0f, 1.0f}}, - {1.0f, 1.0f} - }, - { - @"7pi/8 rads; origin (1,1); W of box", - {1.0f, 1.0f}, - 7.0f * M_PI / 8.0f, - {{1.0f, 0.5f}, {1.0f, 1.0f}}, - {1.0f, 1.0f} - }, - { - @"pi/8 rads; origin (1,1); leave through top", - {1.0f, 1.0f}, - M_PI / 8.0f, - {{0.9f, 0.1f}, {1.0f, 1.0f}}, - {1.2414213562373f, 1.1f} - }, - { - @"0 rads; origin (1,1); N of box", - {1.0f, 1.0f}, - 0.0f, - {{0.5f, 0.0f}, {1.0f, 1.0f}}, - {1.5f, 1.0f} - } -}; -static unsigned int n_exit_point_tests = sizeof (exit_point_tests) / sizeof (exit_point_tests[0]); - -void testFindExitPointOfRay() { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - startTestBlock(@"findExitPointOfRay"); - - for (unsigned int i = 0; i < n_exit_point_tests; ++i) { - NSPoint exitPoint = findExitPointOfRay ( - exit_point_tests[i].rayStart, - exit_point_tests[i].angle, - exit_point_tests[i].rect); - assertPointsEqual (exit_point_tests[i].msg, exitPoint, exit_point_tests[i].expected); - } - - endTestBlock(@"findExitPointOfRay"); - [pool drain]; -} - -#ifdef STAND_ALONE -void runTests() { -#else -void testMaths() { -#endif - startTestBlock(@"maths"); - testRectAroundPoints(); - testRectAroundPointsWithPadding(); - testGoodAtan(); - testBezierInterpolate(); - testLineSegmentsIntersect(); - testLineSegmentIntersectsRect(); - testFindExitPointOfRay(); - testLineSegmentIntersectsBezier(); - endTestBlock(@"maths"); -} - -// vim:ft=objc:ts=4:sts=4:sw=4:noet diff --git a/tikzit/src/common/test/parser.m b/tikzit/src/common/test/parser.m deleted file mode 100644 index 3346acd..0000000 --- a/tikzit/src/common/test/parser.m +++ /dev/null @@ -1,86 +0,0 @@ -// -// parser.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// -#import "test/test.h" -#import "TikzGraphAssembler.h" - - -#ifdef STAND_ALONE -void runTests() { -#else -void testParser() { -#endif - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - startTestBlock(@"parser"); - - [TikzGraphAssembler setup]; - - NodeStyle *rn = [NodeStyle defaultNodeStyleWithName:@"rn"]; - NSArray *styles = [NSArray arrayWithObject:rn]; - - NSString *tikz = - @"\\begin{tikzpicture}[dotpic]" - @" \\begin{pgfonlayer}{foo}" //ignored - @" \\node [style=rn] (0) at (-2,3.4) {stuff{$\\alpha$ in here}};" - @" \\node (b) at (1,1) {};" - @" \\end{pgfonlayer}" //ignored - @" \\draw [bend right=20] (0) to node[tick]{-} (b.center);" - @"\\end{tikzpicture}"; - - TikzGraphAssembler *ga = [[TikzGraphAssembler alloc] init]; - TEST(@"Parsing TikZ", [ga parseTikz:tikz]); - - Graph *g = [ga graph]; - TEST(@"Graph is non-nil", g != nil); - TEST(@"Graph has correct number of nodes", [[g nodes] count]==2); - TEST(@"Graph has correct number of edges", [[g edges] count]==1); - - NSEnumerator *en = [[g nodes] objectEnumerator]; - Node *n; - Node *n1, *n2; - while ((n=[en nextObject])) { - [n attachStyleFromTable:styles]; - if ([n style] == rn) n1 = n; - else if ([n style] == nil) n2 = n; - } - - TEST(@"Styles attached correctly", n1!=nil && n2!=nil); - - TEST(@"Nodes labeled correctly", - [[n1 label] isEqualToString:@"stuff{$\\alpha$ in here}"] && - [[n2 label] isEqualToString:@""] - ); - - Edge *e1 = [[[g edges] objectEnumerator] nextObject]; - - TEST(@"Edge has edge node", [e1 edgeNode]!=nil); - TEST(@"Edge node labeled correctly", [[[e1 edgeNode] label] isEqualToString:@"-"]); -// NSString *sty = [[[[[e1 edgeNode] data] atoms] objectEnumerator] nextObject]; -// TEST(@"Edge node styled correctly", sty!=nil && [sty isEqualToString:@"tick"]); - - PUTS(@"Source anchor: %@",[e1 sourceAnchor]); - PUTS(@"Target anchor: %@",[e1 targetAnchor]); - - endTestBlock(@"parser"); - - [pool drain]; -} diff --git a/tikzit/src/common/test/test.h b/tikzit/src/common/test/test.h deleted file mode 100644 index 59dcdd4..0000000 --- a/tikzit/src/common/test/test.h +++ /dev/null @@ -1,57 +0,0 @@ -// -// test.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// -#import - -@interface Allocator : NSObject -{} -@end - -BOOL fuzzyCompare (float f1, float f2); -BOOL fuzzyComparePoints (NSPoint p1, NSPoint p2); - -void setColorEnabled(BOOL b); - -void pass(NSString *msg); -void fail(NSString *msg); -void TEST(NSString *msg, BOOL test); -void assertRectsEqual (NSString *msg, NSRect val, NSRect exp); -void assertPointsEqual (NSString *msg, NSPoint val, NSPoint exp); -void assertFloatsEqual (NSString *msg, float val, float exp); - -void startTests(); -void endTests(); - -void startTestBlock(NSString *name); -void endTestBlock(NSString *name); - -#define PUTS(fmt, ...) { \ - NSString *_str = [[NSString alloc] initWithFormat:fmt, ##__VA_ARGS__]; \ - printf("%s\n", [_str UTF8String]); \ - [_str release]; } - -#define failFmt(fmt, ...) { \ - NSString *_fstr = [[NSString alloc] initWithFormat:fmt, ##__VA_ARGS__]; \ - fail(_fstr); \ - [_fstr release]; } - -// vim:ft=objc:ts=4:sts=4:sw=4:noet diff --git a/tikzit/src/common/test/test.m b/tikzit/src/common/test/test.m deleted file mode 100644 index 9afcd67..0000000 --- a/tikzit/src/common/test/test.m +++ /dev/null @@ -1,175 +0,0 @@ -// -// test.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// -#import "test/test.h" - -static int PASSES; -static int FAILS; - -static int ALLOC_INSTANCES = 0; - -static BOOL colorEnabled = YES; -static int depth = 0; - -static NSString *RED, *GREEN, *BLUE, *OFF; - -static NSString *indents[6] = - {@"", @" ", @" ", @" ", - @" ", @" "}; - -#define INDENT ((depth >= 6) ? indents[5] : indents[depth]) - - -@implementation Allocator - -+ (id)alloc { - ++ALLOC_INSTANCES; - return [super alloc]; -} - -- (void)dealloc { - --ALLOC_INSTANCES; - [super dealloc]; -} - -+ (Allocator*)allocator { - return [[[Allocator alloc] init] autorelease]; -} - -@end - -BOOL fuzzyCompare(float f1, float f2) { - return (ABS(f1 - f2) <= 0.00001f * MAX(1.0f,MIN(ABS(f1), ABS(f2)))); -} - -BOOL fuzzyComparePoints (NSPoint p1, NSPoint p2) { - return fuzzyCompare (p1.x, p2.x) && fuzzyCompare (p1.y, p2.y); -} - -void pass(NSString *msg) { - PUTS(@"%@[%@PASS%@] %@", INDENT, GREEN, OFF, msg); - ++PASSES; -} - -void fail(NSString *msg) { - PUTS(@"%@[%@FAIL%@] %@", INDENT, RED, OFF, msg); - ++FAILS; -} - -void TEST(NSString *msg, BOOL test) { - if (test) { - pass (msg); - } else { - fail (msg); - } -} - -void assertRectsEqual (NSString *msg, NSRect r1, NSRect r2) { - BOOL equal = fuzzyCompare (r1.origin.x, r2.origin.x) && - fuzzyCompare (r1.origin.y, r2.origin.y) && - fuzzyCompare (r1.size.width, r2.size.width) && - fuzzyCompare (r1.size.height, r2.size.height); - if (equal) { - pass (msg); - } else { - failFmt(@"%@ (expected (%f,%f:%fx%f) but got (%f,%f:%fx%f))", - msg, - r2.origin.x, r2.origin.y, r2.size.width, r2.size.height, - r1.origin.x, r1.origin.y, r1.size.width, r1.size.height); - } -} - -void assertPointsEqual (NSString *msg, NSPoint p1, NSPoint p2) { - BOOL equal = fuzzyCompare (p1.x, p2.x) && fuzzyCompare (p1.y, p2.y); - if (equal) { - pass (msg); - } else { - failFmt(@"%@ (expected (%f,%f) but got (%f,%f)", - msg, - p2.x, p2.y, - p1.x, p1.y); - } -} - -void assertFloatsEqual (NSString *msg, float f1, float f2) { - if (fuzzyCompare (f1, f2)) { - pass (msg); - } else { - failFmt(@"%@ (expected %f but got %f", msg, f2, f1); - } -} - -void startTests() { - PASSES = 0; - FAILS = 0; -} - -void endTests() { - PUTS(@"Done testing. %@%d%@ passed, %@%d%@ failed.", - GREEN, PASSES, OFF, - RED, FAILS, OFF); -} - -void startTestBlock(NSString *name) { - PUTS(@"%@Starting %@%@%@ tests.", INDENT, BLUE, name, OFF); - ++depth; -} - -void endTestBlock(NSString *name) { - --depth; - PUTS(@"%@Done with %@%@%@ tests.", INDENT, BLUE, name, OFF); -} - -void setColorEnabled(BOOL b) { - colorEnabled = b; - if (b) { - RED = @"\033[31;1m"; - GREEN = @"\033[32;1m"; - BLUE = @"\033[36;1m"; - OFF = @"\033[0m"; - } else { - RED = @""; - GREEN = @""; - BLUE = @""; - OFF = @""; - } -} - -#ifdef STAND_ALONE -void runTests(); - -int main() { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - setColorEnabled (NO); - startTests(); - - runTests(); - - endTests(); - - [pool drain]; - return 0; -} -#endif - -// vim:ft=objc:ts=4:sts=4:sw=4:noet diff --git a/tikzit/src/common/tikzlexer.lm b/tikzit/src/common/tikzlexer.lm deleted file mode 100644 index 1e92f73..0000000 --- a/tikzit/src/common/tikzlexer.lm +++ /dev/null @@ -1,170 +0,0 @@ -%{ -/* - * Copyright 2010 Chris Heunen - * Copyright 2010-2013 Aleks Kissinger - * Copyright 2013 K. Johan Paulsson - * Copyright 2013 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import -#import "tikzparserdefs.h" -#import "tikzparser.h" - -#define YY_USER_ACTION \ - yylloc->first_line = yylloc->last_line; \ - yylloc->first_column = yylloc->last_column + 1; \ - yylloc->last_column = yylloc->first_column + yyleng - 1; - -%} - -%option reentrant bison-bridge bison-locations 8bit -%option nounput -%option yylineno -%option noyywrap -%option header-file="common/tikzlexer.h" -%option extra-type="TikzGraphAssembler *" - - -%s props -%s xcoord -%s ycoord -%s noderef - -FLOAT \-?[0-9]*(\.[0-9]+)? - -%% - - /* whitespace is ignored, except for position counting; we don't - count formfeed and vtab as whitespace, because it's not obvious - how they should be dealt with and no-one actually uses them */ - - /* lex will take the longest-matching string */ -\r\n|\r|\n { - yylloc->first_line += 1; - yylloc->last_line = yylloc->first_line; - yylloc->first_column = yylloc->last_column = 0; -} -[\t ]+ { } - -\\begin\{tikzpicture\} { return BEGIN_TIKZPICTURE_CMD; } -\\end\{tikzpicture\} { return END_TIKZPICTURE_CMD; } -\\begin\{pgfonlayer\} { return BEGIN_PGFONLAYER_CMD; } -\\end\{pgfonlayer\} { return END_PGFONLAYER_CMD; } -\\draw { return DRAW_CMD; } -\\node { return NODE_CMD; } -\\path { return PATH_CMD; } -rectangle { return RECTANGLE; } -node { return NODE; } -at { return AT; } -to { return TO; } -; { return SEMICOLON; } - -\([ ]*{FLOAT}[ ]*,[ ]*{FLOAT}[ ]*\) { - yylloc->last_column = yylloc->first_column + 1; - yyless(1); - BEGIN(xcoord); -} -{FLOAT} { - yylval->pt.x=(float)strtod(yytext,NULL); - BEGIN(ycoord); -} -, { } -{FLOAT} { - yylval->pt.y=(float)strtod(yytext,NULL); -} -\) { - BEGIN(INITIAL); - return COORD; -} - - /* when we see "[", change parsing mode */ -\[ /*syntaxhlfix]*/ { - BEGIN(props); - return LEFTBRACKET; -} -= { return EQUALS; } -, { return COMMA; } - /* technically, it is possible to have newlines in the middle of - property names or values, but in practice this is unlikely and - screws up our line counting */ -[^=,\{\] \t\n]([^=,\{\]\n]*[^=,\{\] \t\n])? { - yylval->nsstr=[NSString stringWithUTF8String:yytext]; - return PROPSTRING; -} -\] { - BEGIN(INITIAL); - return RIGHTBRACKET; -} - -\( { - BEGIN(noderef); - return LEFTPARENTHESIS; -} -\. { - return FULLSTOP; -} - /* we assume node names (and anchor names) never contain - newlines */ -[^\.\{\)\n]+ { - yylval->nsstr=[NSString stringWithUTF8String:yytext]; - return REFSTRING; -} -\) { - BEGIN(INITIAL); - return RIGHTPARENTHESIS; -} - -\{ { - NSMutableString *buf = [NSMutableString string]; - unsigned int brace_depth = 1; - unsigned int escape = 0; - while (1) { - char c = input(yyscanner); - // eof reached before closing brace - if (c == '\0' || c == EOF) { - return UNCLOSED_DELIM_STR; - } - - yylloc->last_column += 1; - yyleng += 1; - if (escape) { - escape = 0; - } else if (c == '\\') { - escape = 1; - } else if (c == '{') { - brace_depth++; - } else if (c == '}') { - brace_depth--; - if (brace_depth == 0) break; - } else if (c == '\n') { - yylloc->last_line += 1; - yylloc->last_column = 0; - } - [buf appendFormat:@"%c", c]; - } - - yylval->nsstr = buf; - return DELIMITEDSTRING; -} - -\\begin { return UNKNOWN_BEGIN_CMD; } -\\end { return UNKNOWN_END_CMD; } -\\[a-zA-Z0-9]+ { return UNKNOWN_CMD; } -[a-zA-Z0-9]+ { return UNKNOWN_STR; } -. { return UNKNOWN_STR; } - - /* vi:ft=lex:noet:ts=4:sts=4:sw=4: - */ diff --git a/tikzit/src/common/tikzparser.ym b/tikzit/src/common/tikzparser.ym deleted file mode 100644 index 344e969..0000000 --- a/tikzit/src/common/tikzparser.ym +++ /dev/null @@ -1,224 +0,0 @@ -%{ -/* - * Copyright 2010 Chris Heunen - * Copyright 2010-2013 Aleks Kissinger - * Copyright 2013 K. Johan Paulsson - * Copyright 2013 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "tikzparserdefs.h" -%} - -/* we use features added to bison 2.4 */ -%require "2.3" - -%error-verbose -/* enable maintaining locations for better error messages */ -%locations -/* the name of the header file */ -/*%defines "common/tikzparser.h"*/ -/* make it re-entrant (no global variables) */ -%pure-parser -/* We use a pure (re-entrant) lexer. This means yylex - will take a void* (opaque) type to maintain its state */ -%lex-param {void *scanner} -/* Since this parser is also pure, yyparse needs to take - that lexer state as an argument */ -%parse-param {void *scanner} - -/* possible data types for semantic values */ -%union { - NSString *nsstr; - GraphElementProperty *prop; - GraphElementData *data; - Node *node; - NSPoint pt; - struct noderef noderef; -} - -%{ -#import "GraphElementData.h" -#import "GraphElementProperty.h" -#import "Node.h" -#import "Edge.h" - -#import "tikzlexer.h" -#import "TikzGraphAssembler+Parser.h" -/* the assembler (used by this parser) is stored in the lexer - state as "extra" data */ -#define assembler yyget_extra(scanner) - -/* pass errors off to the assembler */ -void yyerror(YYLTYPE *yylloc, void *scanner, const char *str) { - [assembler reportError:str atLocation:yylloc]; -} -%} - -/* yyloc is set up with first_column = last_column = 1 by default; - however, it makes more sense to think of us being "before the - start of the line" before we parse anything */ -%initial-action { - yylloc.first_column = yylloc.last_column = 0; -} - - -%token BEGIN_TIKZPICTURE_CMD "\\begin{tikzpicture}" -%token END_TIKZPICTURE_CMD "\\end{tikzpicture}" -%token BEGIN_PGFONLAYER_CMD "\\begin{pgfonlayer}" -%token END_PGFONLAYER_CMD "\\end{pgfonlayer}" -%token DRAW_CMD "\\draw" -%token NODE_CMD "\\node" -%token PATH_CMD "\\path" -%token RECTANGLE "rectangle" -%token NODE "node" -%token AT "at" -%token TO "to" -%token SEMICOLON ";" -%token COMMA "," - -%token LEFTPARENTHESIS "(" -%token RIGHTPARENTHESIS ")" -%token LEFTBRACKET "[" -%token RIGHTBRACKET "]" -%token FULLSTOP "." -%token EQUALS "=" -%token COORD "co-ordinate" -%token PROPSTRING "key/value string" -%token REFSTRING "string" -%token DELIMITEDSTRING "{-delimited string" - -%token UNKNOWN_BEGIN_CMD "unknown \\begin command" -%token UNKNOWN_END_CMD "unknown \\end command" -%token UNKNOWN_CMD "unknown latex command" -%token UNKNOWN_STR "unknown string" -%token UNCLOSED_DELIM_STR "unclosed {-delimited string" - -%type nodename -%type optanchor -%type val -%type property -%type extraproperties -%type properties -%type optproperties -%type optedgenode -%type noderef -%type optnoderef - -%% - -tikzpicture: "\\begin{tikzpicture}" optproperties tikzcmds "\\end{tikzpicture}" - { - if ($2) { - [[assembler graph] setData:$2]; - } - }; -tikzcmds: tikzcmds tikzcmd | ; -tikzcmd: node | edge | boundingbox | ignore; - -ignore: "\\begin{pgfonlayer}" DELIMITEDSTRING | "\\end{pgfonlayer}"; - -optproperties: - "[" "]" - { $$ = nil; } - | "[" properties "]" - { $$ = $2; } - | { $$ = nil; }; -properties: extraproperties property - { - [$1 addObject:$2]; - $$ = $1; - }; -extraproperties: - extraproperties property "," - { - [$1 addObject:$2]; - $$ = $1; - } - | { $$ = [GraphElementData data]; }; -property: - val "=" val - { $$ = [GraphElementProperty property:$1 withValue:$3]; } - | val - { $$ = [GraphElementProperty atom:$1]; }; -val: PROPSTRING { $$ = $1; } | DELIMITEDSTRING { $$ = $1; }; - -nodename: "(" REFSTRING ")" { $$ = $2; }; -node: "\\node" optproperties nodename "at" COORD DELIMITEDSTRING ";" - { - Node *node = [[Node alloc] init]; - if ($2) - [node setData:$2]; - [node setName:$3]; - [node setPoint:$5]; - [node setLabel:$6]; - [assembler addNodeToMap:node]; - [[assembler graph] addNode:node]; -#if ! __has_feature(objc_arc) - [node release]; -#endif - }; - -optanchor: { $$ = nil; } | "." REFSTRING { $$ = $2; }; -noderef: "(" REFSTRING optanchor ")" - { - $$.node = [assembler nodeWithName:$2]; - $$.anchor = $3; - }; -optnoderef: - noderef { $$ = $1; } - | "(" ")" { $$.node = nil; $$.anchor = nil; } -optedgenode: - { $$ = nil; } - | "node" optproperties DELIMITEDSTRING - { - $$ = [Node node]; - if ($2) - [$$ setData:$2]; - [$$ setLabel:$3]; - } -edge: "\\draw" optproperties noderef "to" optedgenode optnoderef ";" - { - Edge *edge = [[Edge alloc] init]; - if ($2) - [edge setData:$2]; - [edge setSource:$3.node]; - [edge setSourceAnchor:$3.anchor]; - [edge setEdgeNode:$5]; - if ($6.node) { - [edge setTarget:$6.node]; - [edge setTargetAnchor:$6.anchor]; - } else { - [edge setTarget:$3.node]; - [edge setTargetAnchor:$3.anchor]; - } - [edge setAttributesFromData]; - [[assembler graph] addEdge:edge]; -#if ! __has_feature(objc_arc) - [edge release]; -#endif - }; - -ignoreprop: val | val "=" val; -ignoreprops: ignoreprop ignoreprops | ; -optignoreprops: "[" ignoreprops "]"; -boundingbox: - "\\path" optignoreprops COORD "rectangle" COORD ";" - { - [[assembler graph] setBoundingBox:NSRectAroundPoints($3, $5)]; - }; - -/* vi:ft=yacc:noet:ts=4:sts=4:sw=4 -*/ diff --git a/tikzit/src/common/tikzparserdefs.h b/tikzit/src/common/tikzparserdefs.h deleted file mode 100644 index cde3345..0000000 --- a/tikzit/src/common/tikzparserdefs.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright 2013 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/* - * This file sets up some defs (particularly struct noderef) needed for - * the tikz parser and its users. - * - * It is needed because we wish to support bison 2.3, which is the - * version shipped with OSX. bison 2.4 onwards allows us to put this - * stuff in a "%code requires" block, where it will be put in the - * generated header file by bison. - * - * All the types used by the %union directive in tikzparser.ym should - * be declared, defined or imported here. - */ - -// Foundation has NSPoint and NSString -#import - -@class TikzGraphAssembler; -@class GraphElementData; -@class GraphElementProperty; -@class Node; - -struct noderef { -#if __has_feature(objc_arc) - __unsafe_unretained Node *node; - __unsafe_unretained NSString *anchor; -#else - Node *node; - NSString *anchor; -#endif -}; - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit/src/common/util.h b/tikzit/src/common/util.h deleted file mode 100644 index b34f25d..0000000 --- a/tikzit/src/common/util.h +++ /dev/null @@ -1,201 +0,0 @@ -// -// util.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// - -#import - -#include - -#ifndef M_PI -#define M_PI 3.141592654 -#endif - -#ifndef MAX -#define MAX(a,b) (((a) > (b)) ? (a) : (b)) -#endif - -#ifndef MIN -#define MIN(a,b) (((a) < (b)) ? (a) : (b)) -#endif - -/*! - @brief Compute a bounding rectangle for two given points. - @param p1 a point. - @param p2 another point. - @result A bounding rectangle for p1 and p2. - */ -NSRect NSRectAroundPoints(NSPoint p1, NSPoint p2); - -/*! - @brief Compute a bounding rectangle for two given points. - @param rect the base rectangle - @param the point to ensure is included - @result A rectangle containing rect and p - */ -NSRect NSRectWithPoint(NSRect rect, NSPoint p); - -/*! - @brief Compute a bounding rectangle for two given points with a given padding. - @param p1 a point. - @param p2 another point. - @param padding a padding. - @result A bounding rectangle for p1 and p2 with padding. - */ -NSRect NSRectAroundPointsWithPadding(NSPoint p1, NSPoint p2, float padding); - -/*! - @brief Compute a bounding rectangle for four given points. - @result A bounding rectangle for p1, p2, p3 and p4. - */ -NSRect NSRectAround4Points(NSPoint p1, NSPoint p2, NSPoint p3, NSPoint p4); - -/*! - @brief Compute a bounding rectangle for four given points. - @param padding the amount to pad the rectangle - @result A bounding rectangle for p1, p2, p3 and p4 with padding - */ -NSRect NSRectAround4PointsWithPadding(NSPoint p1, NSPoint p2, NSPoint p3, NSPoint p4, float padding); - -/*! - @brief Find the distance between two points - @param p1 The first point - @param p2 The second point - @result The distance between p1 and p2 - */ -float NSDistanceBetweenPoints(NSPoint p1, NSPoint p2); - -/*! - @brief Compute the 'real' arctan for two points. Always succeeds and gives a good angle, - regardless of sign, zeroes, etc. - @param dx the x distance between points. - @param dy the y distance between points. - @result An angle in radians. - */ -float good_atan(float dx, float dy); - -/*! - @brief Interpolate along a bezier curve to the given distance. To find the x coord, - use the relavant x coordinates for c0-c3, and for y use the y's. - @param dist a distance from 0 to 1 spanning the whole curve. - @param c0 the x (resp. y) coordinate of the start point. - @param c1 the x (resp. y) coordinate of the first control point. - @param c2 the x (resp. y) coordinate of the second control point. - @param c3 the x (resp. y) coordinate of the end point. - @result The x (resp. y) coordinate of the point at 'dist'. - */ -float bezierInterpolate (float dist, float c0, float c1, float c2, float c3); - -/*! - @brief Interpolate along a bezier curve to the given distance. - @param dist a distance from 0 to 1 spanning the whole curve. - @param c0 the x start point. - @param c1 the x first control point. - @param c2 the x second control point. - @param c3 the x end point. - @result The point at 'dist'. - */ -NSPoint bezierInterpolateFull (float dist, NSPoint c0, NSPoint c1, NSPoint c2, NSPoint c3); - -/*! - * @brief Find whether two line segments intersect - * @param l1start The starting point of line segment 1 - * @param l1end The ending point of line segment 1 - * @param l2start The starting point of line segment 2 - * @param l2end The ending point of line segment 2 - * @param result A location to store the intersection point - * @result YES if they intersect, NO if they do not - */ -BOOL lineSegmentsIntersect (NSPoint l1start, NSPoint l1end, NSPoint l2start, NSPoint l2end, NSPoint *result); - -/*! - * @brief Find whether a line segment intersects a bezier curve - * @detail Always finds the intersection furthest along the line segment - * @param lstart The starting point of the line segment - * @param lend The ending point of the line segment - * @param c0 The starting point of the bezier curve - * @param c1 The first control point of the bezier curve - * @param c2 The second control point of the bezier curve - * @param c3 The ending point of the bezier curve - * @param result A location to store the intersection point - * @result YES if they intersect, NO if they do not - */ -BOOL lineSegmentIntersectsBezier (NSPoint lstart, NSPoint lend, NSPoint c0, NSPoint c1, NSPoint c2, NSPoint c3, NSPoint *result); - -/*! - * @brief Find whether a line segment enters a rectangle - * @param lineStart The starting point of the line segment - * @param lineEnd The ending point of the line segment - * @param rect The rectangle - * @result YES if they intersect, NO if they do not - */ -BOOL lineSegmentIntersectsRect (NSPoint lineStart, NSPoint lineEnd, NSRect rect); - -/*! - * @brief Find where a ray exits a rectangle - * @param rayStart The starting point of the ray; must be contained in rect - * @param angle_rads The angle of the ray, in radians - * @param rect The rectangle - * @result The point at which the ray leaves the rect - */ -NSPoint findExitPointOfRay (NSPoint rayStart, float angle_rads, NSRect rect); - -/*! - @brief Round val to nearest stepSize - @param stepSize the courseness - @param val a value to round - */ -float roundToNearest(float stepSize, float val); - -/*! - @brief Convert radians into degrees - */ -float radiansToDegrees(float radians); - -/*! - @brief Convert degrees into radians - */ -float degreesToRadians(float degrees); - -/*! - @brief Normalises an angle (in degrees) to fall between -179 and 180 - */ -int normaliseAngleDeg (int degrees); - -/*! - @brief Normalises an angle (in radians) to fall in the range (-pi,pi] - */ -float normaliseAngleRad (float rads); - -/*! - @brief Express a byte as alpha-only hex, with digits (0..16) -> (a..jA..F) - @param sh A number 0-255 - @result A string 'aa'-'FF' - */ -NSString *alphaHex(unsigned short sh); - -const char *find_start_of_nth_line (const char * string, int line); - -/*! - @brief Formats a CGFloat as a string, removing trailing zeros - @detail Unlike formatting an NSNumber, or using %g, it will never - produce scientific notation (like "2.00e2"). Unlike %f, - it will not include unnecessary trailing zeros. - */ -NSString *formatFloat(CGFloat f, int maxdps); - diff --git a/tikzit/src/common/util.m b/tikzit/src/common/util.m deleted file mode 100644 index e9b8899..0000000 --- a/tikzit/src/common/util.m +++ /dev/null @@ -1,403 +0,0 @@ -// -// util.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// - -#import "util.h" -#import "math.h" - -static BOOL fuzzyCompare(float f1, float f2) { - return (ABS(f1 - f2) <= 0.00001f * MIN(ABS(f1), ABS(f2))); -} - -NSRect NSRectWithPoint(NSRect rect, NSPoint p) { - CGFloat minX = NSMinX(rect); - CGFloat maxX = NSMaxX(rect); - CGFloat minY = NSMinY(rect); - CGFloat maxY = NSMaxY(rect); - if (p.x < minX) { - minX = p.x; - } else if (p.x > maxX) { - maxX = p.x; - } - if (p.y < minY) { - minY = p.y; - } else if (p.y > maxY) { - maxY = p.y; - } - return NSMakeRect(minX, minY, maxX - minX, maxY - minY); -} - -NSRect NSRectAroundPointsWithPadding(NSPoint p1, NSPoint p2, float padding) { - return NSMakeRect(MIN(p1.x,p2.x)-padding, - MIN(p1.y,p2.y)-padding, - ABS(p2.x-p1.x)+(2.0f*padding), - ABS(p2.y-p1.y)+(2.0f*padding)); -} - -NSRect NSRectAroundPoints(NSPoint p1, NSPoint p2) { - return NSRectAroundPointsWithPadding(p1, p2, 0.0f); -} - -NSRect NSRectAround4PointsWithPadding(NSPoint p1, NSPoint p2, NSPoint p3, NSPoint p4, float padding) { - float leftMost = MIN(p1.x, p2.x); - leftMost = MIN(leftMost, p3.x); - leftMost = MIN(leftMost, p4.x); - float rightMost = MAX(p1.x, p2.x); - rightMost = MAX(rightMost, p3.x); - rightMost = MAX(rightMost, p4.x); - float topMost = MIN(p1.y, p2.y); - topMost = MIN(topMost, p3.y); - topMost = MIN(topMost, p4.y); - float bottomMost = MAX(p1.y, p2.y); - bottomMost = MAX(bottomMost, p3.y); - bottomMost = MAX(bottomMost, p4.y); - return NSMakeRect(leftMost-padding, - topMost-padding, - (rightMost - leftMost)+(2.0f*padding), - (bottomMost - topMost)+(2.0f*padding)); -} - -NSRect NSRectAround4Points(NSPoint p1, NSPoint p2, NSPoint p3, NSPoint p4) { - return NSRectAround4PointsWithPadding(p1, p2, p3, p4, 0.0f); -} - -float NSDistanceBetweenPoints(NSPoint p1, NSPoint p2) { - float dx = p2.x - p1.x; - float dy = p2.y - p1.y; - return sqrt(dx * dx + dy * dy); -} - -float good_atan(float dx, float dy) { - if (dx > 0) { - return atan(dy/dx); - } else if (dx < 0) { - return M_PI + atan(dy/dx); - } else { - if (dy > 0) return 0.5 * M_PI; - else if (dy < 0) return 1.5 * M_PI; - else return 0; - } -} - -// interpolate on a cubic bezier curve -float bezierInterpolate(float dist, float c0, float c1, float c2, float c3) { - float distp = 1 - dist; - return (distp*distp*distp) * c0 + - 3 * (distp*distp) * dist * c1 + - 3 * (dist*dist) * distp * c2 + - (dist*dist*dist) * c3; -} - -NSPoint bezierInterpolateFull (float dist, NSPoint c0, NSPoint c1, NSPoint c2, NSPoint c3) { - return NSMakePoint (bezierInterpolate (dist, c0.x, c1.x, c2.x, c3.x), - bezierInterpolate (dist, c0.y, c1.y, c2.y, c3.y)); -} - -static void lineCoeffsFromPoints(NSPoint p1, NSPoint p2, float *A, float *B, float *C) { - *A = p2.y - p1.y; - *B = p1.x - p2.x; - *C = (*A) * p1.x + (*B) * p1.y; -} - -static void lineCoeffsFromPointAndAngle(NSPoint p, float angle, float *A, float *B, float *C) { - *A = sin (angle); - *B = -cos (angle); - *C = (*A) * p.x + (*B) * p.y; -} - -static BOOL lineSegmentContainsPoint(NSPoint l1, NSPoint l2, float x, float y) { - float minX = MIN(l1.x, l2.x); - float maxX = MAX(l1.x, l2.x); - float minY = MIN(l1.y, l2.y); - float maxY = MAX(l1.y, l2.y); - return (x >= minX || fuzzyCompare (x, minX)) && - (x <= maxX || fuzzyCompare (x, maxX)) && - (y >= minY || fuzzyCompare (y, minY)) && - (y <= maxY || fuzzyCompare (y, maxY)); -} - -BOOL lineSegmentsIntersect(NSPoint l1start, NSPoint l1end, NSPoint l2start, NSPoint l2end, NSPoint *result) { - // Ax + By = C - float A1, B1, C1; - lineCoeffsFromPoints(l1start, l1end, &A1, &B1, &C1); - float A2, B2, C2; - lineCoeffsFromPoints(l2start, l2end, &A2, &B2, &C2); - - float det = A1*B2 - A2*B1; - if (det == 0.0f) { - // parallel - return NO; - } else { - float x = (B2*C1 - B1*C2)/det; - float y = (A1*C2 - A2*C1)/det; - - if (lineSegmentContainsPoint(l1start, l1end, x, y) && - lineSegmentContainsPoint(l2start, l2end, x, y)) { - if (result) { - (*result).x = x; - (*result).y = y; - } - return YES; - } - } - return NO; -} - -BOOL lineSegmentIntersectsBezier (NSPoint lstart, NSPoint lend, NSPoint c0, NSPoint c1, NSPoint c2, NSPoint c3, NSPoint *result) { - NSRect curveBounds = NSRectAround4Points(c0, c1, c2, c3); - if (!lineSegmentIntersectsRect(lstart, lend, curveBounds)) - return NO; - - const int divisions = 20; - const float chunkSize = 1.0f/(float)divisions; - float chunkStart = 0.0f; - BOOL found = NO; - - for (int i = 0; i < divisions; ++i) { - float chunkEnd = chunkStart + chunkSize; - - NSPoint p1 = bezierInterpolateFull (chunkStart, c0, c1, c2, c3); - NSPoint p2 = bezierInterpolateFull (chunkEnd, c0, c1, c2, c3); - - NSPoint p; - if (lineSegmentsIntersect (lstart, lend, p1, p2, &p)) { - lstart = p; - found = YES; - } - - chunkStart = chunkEnd; - } - if (found && result) { - *result = lstart; - } - return found; -} - -BOOL lineSegmentIntersectsRect(NSPoint lineStart, NSPoint lineEnd, NSRect rect) { - const float rectMaxX = NSMaxX(rect); - const float rectMinX = NSMinX(rect); - const float rectMaxY = NSMaxY(rect); - const float rectMinY = NSMinY(rect); - - // check if the segment is entirely to one side of the rect - if (lineStart.x > rectMaxX && lineEnd.x > rectMaxX) { - return NO; - } - if (lineStart.x < rectMinX && lineEnd.x < rectMinX) { - return NO; - } - if (lineStart.y > rectMaxY && lineEnd.y > rectMaxY) { - return NO; - } - if (lineStart.y < rectMinY && lineEnd.y < rectMinY) { - return NO; - } - - // Now check whether the (infinite) line intersects the rect - // (if it does, so does the segment, due to above checks) - - // Ax + By = C - float A, B, C; - lineCoeffsFromPoints(lineStart, lineEnd, &A, &B, &C); - - const float tlVal = A * rectMinX + B * rectMaxY - C; - const float trVal = A * rectMaxX + B * rectMaxY - C; - const float blVal = A * rectMinX + B * rectMinY - C; - const float brVal = A * rectMaxX + B * rectMinY - C; - - if (tlVal < 0 && trVal < 0 && blVal < 0 && brVal < 0) { - // rect below line - return NO; - } - if (tlVal > 0 && trVal > 0 && blVal > 0 && brVal > 0) { - // rect above line - return NO; - } - - return YES; -} - -NSPoint findExitPointOfRay (NSPoint p, float angle_rads, NSRect rect) { - const float rectMinX = NSMinX (rect); - const float rectMaxX = NSMaxX (rect); - const float rectMinY = NSMinY (rect); - const float rectMaxY = NSMaxY (rect); - - const float angle = normaliseAngleRad (angle_rads); - - // special case the edges - if (p.y == rectMaxY && angle > 0 && angle < M_PI) { - // along the top of the box - return p; - } - if (p.y == rectMinY && angle < 0 && angle > -M_PI) { - // along the bottom of the box - return p; - } - if (p.x == rectMaxX && angle > -M_PI/2.0f && angle < M_PI/2.0f) { - // along the right of the box - return p; - } - if (p.x == rectMinX && (angle > M_PI/2.0f || angle < -M_PI/2.0f)) { - // along the left of the box - return p; - } - - float A1, B1, C1; - lineCoeffsFromPointAndAngle(p, angle, &A1, &B1, &C1); - //NSLog(@"Ray is %fx + %fy = %f", A1, B1, C1); - - const float tlAngle = normaliseAngleRad (good_atan (rectMinX - p.x, rectMaxY - p.y)); - const float trAngle = normaliseAngleRad (good_atan (rectMaxX - p.x, rectMaxY - p.y)); - if (angle <= tlAngle && angle >= trAngle) { - // exit top - float A2, B2, C2; - lineCoeffsFromPoints(NSMakePoint (rectMinX, rectMaxY), - NSMakePoint (rectMaxX, rectMaxY), - &A2, &B2, &C2); - float det = A1*B2 - A2*B1; - NSCAssert(det != 0.0f, @"Parallel lines?"); - NSPoint intersect = NSMakePoint ((B2*C1 - B1*C2)/det, - (A1*C2 - A2*C1)/det); - return intersect; - } - - const float brAngle = normaliseAngleRad (good_atan (rectMaxX - p.x, rectMinY - p.y)); - if (angle <= trAngle && angle >= brAngle) { - // exit right - float A2, B2, C2; - lineCoeffsFromPoints(NSMakePoint (rectMaxX, rectMaxY), - NSMakePoint (rectMaxX, rectMinY), - &A2, &B2, &C2); - //NSLog(@"Edge is %fx + %fy = %f", A2, B2, C2); - float det = A1*B2 - A2*B1; - NSCAssert(det != 0.0f, @"Parallel lines?"); - NSPoint intersect = NSMakePoint ((B2*C1 - B1*C2)/det, - (A1*C2 - A2*C1)/det); - return intersect; - } - - const float blAngle = normaliseAngleRad (good_atan (rectMinX - p.x, rectMinY - p.y)); - if (angle <= brAngle && angle >= blAngle) { - // exit bottom - float A2, B2, C2; - lineCoeffsFromPoints(NSMakePoint (rectMaxX, rectMinY), - NSMakePoint (rectMinX, rectMinY), - &A2, &B2, &C2); - float det = A1*B2 - A2*B1; - NSCAssert(det != 0.0f, @"Parallel lines?"); - NSPoint intersect = NSMakePoint ((B2*C1 - B1*C2)/det, - (A1*C2 - A2*C1)/det); - return intersect; - } else { - // exit left - float A2, B2, C2; - lineCoeffsFromPoints(NSMakePoint (rectMinX, rectMaxY), - NSMakePoint (rectMinX, rectMinY), - &A2, &B2, &C2); - float det = A1*B2 - A2*B1; - NSCAssert(det != 0.0f, @"Parallel lines?"); - NSPoint intersect = NSMakePoint ((B2*C1 - B1*C2)/det, - (A1*C2 - A2*C1)/det); - return intersect; - } -} - -float roundToNearest(float stepSize, float val) { - if (stepSize==0.0f) return val; - else return round(val/stepSize)*stepSize; -} - -float radiansToDegrees (float radians) { - return (radians * 180.0f) / M_PI; -} - -float degreesToRadians(float degrees) { - return (degrees * M_PI) / 180.0f; -} - -int normaliseAngleDeg (int degrees) { - while (degrees > 180) { - degrees -= 360; - } - while (degrees <= -180) { - degrees += 360; - } - return degrees; -} - -float normaliseAngleRad (float rads) { - while (rads > M_PI) { - rads -= 2 * M_PI; - } - while (rads <= -M_PI) { - rads += 2 * M_PI; - } - return rads; -} - -static char ahex[] = -{'a','b','c','d','e','f','g','h','i','j', - 'A','B','C','D','E','F'}; - -NSString *alphaHex(unsigned short sh) { - if (sh > 255) return @"!!"; - return [NSString stringWithFormat:@"%c%c", ahex[sh/16], ahex[sh%16]]; -} - -const char *find_start_of_nth_line (const char * string, int line) { - int l = 0; - const char *lineStart = string; - while (*lineStart && l < line) { - while (*lineStart && *lineStart != '\n') { - ++lineStart; - } - if (*lineStart) { - ++l; - ++lineStart; - } - } - return lineStart; -} - -NSString *formatFloat(CGFloat f, int maxdps) { - NSMutableString *result = [NSMutableString - stringWithFormat:@"%.*f", maxdps, f]; - // delete trailing zeros - NSUInteger lastPos = [result length] - 1; - NSUInteger firstDigit = ([result characterAtIndex:0] == '-') ? 1 : 0; - while (lastPos > firstDigit) { - if ([result characterAtIndex:lastPos] == '0') { - [result deleteCharactersInRange:NSMakeRange(lastPos, 1)]; - lastPos -= 1; - } else { - break; - } - } - if ([result characterAtIndex:lastPos] == '.') { - [result deleteCharactersInRange:NSMakeRange(lastPos, 1)]; - lastPos -= 1; - } - if ([@"-0" isEqualToString:result]) - return @"0"; - else - return result; -} - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit/src/gtk/Application.h b/tikzit/src/gtk/Application.h deleted file mode 100644 index 1b48a79..0000000 --- a/tikzit/src/gtk/Application.h +++ /dev/null @@ -1,155 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "InputDelegate.h" - -@class Application; -@class Configuration; -@class ContextWindow; -@class Preambles; -@class PreambleEditor; -@class PreviewWindow; -@class SettingsDialog; -@class StyleManager; -@class TikzDocument; -@class ToolBox; -@class Window; -@protocol Tool; - -extern Application* app; - -/** - * Manages the main application window - */ -@interface Application: NSObject { - // the main application configuration - Configuration *configFile; - // maintains the known (user-defined) styles - StyleManager *styleManager; - // maintains the preambles used for previews - Preambles *preambles; - // the last-accessed folders (for open and save dialogs) - NSString *lastOpenFolder; - NSString *lastSaveAsFolder; - - ToolBox *toolBox; - PreambleEditor *preambleWindow; - ContextWindow *contextWindow; - SettingsDialog *settingsDialog; - - // the open windows (array of Window*) - NSMutableArray *openWindows; - - // tools - id activeTool; - NSArray *tools; -} - -/** - * The main application configuration file - */ -@property (readonly) Configuration *mainConfiguration; - -/** - * The app-wide style manager instance - */ -@property (readonly) StyleManager *styleManager; - -/** - * The app-wide preambles registry - */ -@property (readonly) Preambles *preambles; - -/** - * The tools - */ -@property (readonly) NSArray *tools; - -/** - * The currently-selected tool - */ -@property (assign) id activeTool; - -/** - * The folder last actively chosen by a user for opening a file - */ -@property (copy) NSString *lastOpenFolder; - -/** - * The folder last actively chosen by a user for saving a file - */ -@property (copy) NSString *lastSaveAsFolder; - -/** - * The application instance. - */ -+ (Application*) app; - -/** - * Starts the application with a single window containing an empty file - */ -- (id) init; -/** - * Starts the application with the given files open - */ -- (id) initWithFiles:(NSArray*)files; - -/** - * Loads a new, empty document in a new window - */ -- (void) newWindow; -/** - * Loads an existing document from a file in a new window - * - * @param doc the document the new window should show - */ -- (void) newWindowWithDocument:(TikzDocument*)doc; -/** - * Quit the application, confirming with the user if there are - * changes to any open documents. - */ -- (void) quit; - -/** - * Show the dialog for editing preambles. - */ -- (void) presentPreamblesEditor; -/** - * Show the context-aware window - */ -- (void) presentContextWindow; -/** - * Show the settings dialog. - */ -- (void) presentSettingsDialog; - -/** - * Save the application configuration to permanent storage - * - * Should be called just before the application exits - */ -- (void) saveConfiguration; - -/** - * @result YES if key event was processed, NO otherwise - */ -- (BOOL) activateToolForKey:(unsigned int)keyVal withMask:(InputMask)mask; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/Application.m b/tikzit/src/gtk/Application.m deleted file mode 100644 index e9935bd..0000000 --- a/tikzit/src/gtk/Application.m +++ /dev/null @@ -1,377 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "Application.h" - -#import "Configuration.h" -#import "EdgeStylesModel.h" -#import "NodeStylesModel.h" -#import "PreambleEditor.h" -#import "ContextWindow.h" -#import "Shape.h" -#import "SettingsDialog.h" -#import "StyleManager.h" -#import "StyleManager+Storage.h" -#import "SupportDir.h" -#import "TikzDocument.h" -#import "ToolBox.h" -#import "Window.h" - -#ifdef HAVE_POPPLER -#import "Preambles.h" -#import "Preambles+Storage.h" -#endif - -#import "BoundingBoxTool.h" -#import "CreateNodeTool.h" -#import "CreateEdgeTool.h" -#import "HandTool.h" -#import "SelectTool.h" - -// used for args to g_mkdir_with_parents -#import "stat.h" - -Application* app = nil; - -@interface Application (Notifications) -- (void) windowClosed:(NSNotification*)notification; -- (void) windowGainedFocus:(NSNotification*)notification; -- (void) selectedToolChanged:(NSNotification*)notification; -- (void) windowDocumentChanged:(NSNotification*)n; -@end - -@interface Application (Private) -- (void) setActiveWindow:(Window*)window; -@end - -@implementation Application - -@synthesize mainConfiguration=configFile; -@synthesize styleManager, preambles; -@synthesize lastOpenFolder, lastSaveAsFolder; -@synthesize tools; - -+ (Application*) app { - if (app == nil) { - [[[self alloc] init] release]; - } - return app; -} - -- (id) _initCommon { - if (app != nil) { - [self release]; - self = app; - return self; - } - self = [super init]; - - if (self) { - NSError *error = nil; - configFile = [[Configuration alloc] initWithName:@"tikzit" loadError:&error]; - if (error != nil) { - logError (error, @"WARNING: Failed to load configuration"); - } - - styleManager = [[StyleManager alloc] init]; - [styleManager loadStylesUsingConfigurationName:@"styles"]; // FIXME: error message? - NodeStylesModel *nsm = [NodeStylesModel modelWithStyleManager:styleManager]; - EdgeStylesModel *esm = [EdgeStylesModel modelWithStyleManager:styleManager]; - -#ifdef HAVE_POPPLER - NSString *preamblesDir = [[SupportDir userSupportDir] stringByAppendingPathComponent:@"preambles"]; - preambles = [[Preambles alloc] initFromDirectory:preamblesDir]; // FIXME: error message? - [preambles setStyleManager:styleManager]; - NSString *selectedPreamble = [configFile stringEntry:@"selectedPreamble" inGroup:@"Preambles"]; - if (selectedPreamble != nil) { - [preambles setSelectedPreambleName:selectedPreamble]; - } -#endif - - lastOpenFolder = [[configFile stringEntry:@"lastOpenFolder" inGroup:@"Paths"] retain]; - if (lastOpenFolder == nil) - lastOpenFolder = [[configFile stringEntry:@"lastFolder" inGroup:@"Paths"] retain]; - lastSaveAsFolder = [[configFile stringEntry:@"lastSaveAsFolder" inGroup:@"Paths"] retain]; - if (lastSaveAsFolder == nil) - lastSaveAsFolder = [[configFile stringEntry:@"lastFolder" inGroup:@"Paths"] retain]; - - openWindows = [[NSMutableArray alloc] init]; - - tools = [[NSArray alloc] initWithObjects: - [SelectTool tool], - [CreateNodeTool toolWithNodeStylesModel:nsm], - [CreateEdgeTool toolWithEdgeStylesModel:esm], - [BoundingBoxTool tool], - [HandTool tool], - nil]; - activeTool = [tools objectAtIndex:0]; - for (id tool in tools) { - [tool loadConfiguration:configFile]; - } - - toolBox = [[ToolBox alloc] initWithTools:tools]; - [toolBox loadConfiguration:configFile]; - [toolBox setSelectedTool:activeTool]; - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(selectedToolChanged:) - name:@"ToolSelectionChanged" - object:toolBox]; - [toolBox show]; - - contextWindow = [[ContextWindow alloc] initWithNodeStylesModel:nsm - andEdgeStylesModel:esm]; - [contextWindow loadConfiguration:configFile]; - - app = [self retain]; - } - - return self; -} - -- (id) init { - self = [self _initCommon]; - - if (self) { - [self newWindow]; - } - - return self; -} - -- (id) initWithFiles:(NSArray*)files { - self = [self _initCommon]; - - if (self) { - int fileOpenCount = 0; - for (NSString *file in files) { - NSError *error = nil; - TikzDocument *doc = [TikzDocument documentFromFile:file styleManager:styleManager error:&error]; - if (doc != nil) { - [self newWindowWithDocument:doc]; - ++fileOpenCount; - } else { - logError(error, @"WARNING: failed to open file"); - } - } - if (fileOpenCount == 0) { - [self newWindow]; - } - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - [configFile release]; - [styleManager release]; - [preambles release]; - [lastOpenFolder release]; - [lastSaveAsFolder release]; - [preambleWindow release]; - [settingsDialog release]; - [openWindows release]; - [tools release]; - [activeTool release]; - [toolBox release]; - [contextWindow release]; - - [super dealloc]; -} - -- (id) activeTool { return activeTool; } -- (void) setActiveTool:(id)tool { - if (activeTool == tool) - return; - - activeTool = tool; - [toolBox setSelectedTool:tool]; - for (Window* window in openWindows) { - [window setActiveTool:tool]; - } -} - -- (BOOL) activateToolForKey:(unsigned int)keyVal withMask:(InputMask)mask { - // FIXME: cache the accel info, rather than reparsing it every time? - for (id tool in tools) { - guint toolKey = 0; - GdkModifierType toolMod = 0; - gtk_accelerator_parse ([[tool shortcut] UTF8String], &toolKey, &toolMod); - if (toolKey != 0 && toolKey == keyVal && (int)mask == (int)toolMod) { - [self setActiveTool:tool]; - return YES; - } - } - return NO; -} - -- (void) _addWindow:(Window*)window { - [window setActiveTool:activeTool]; - [openWindows addObject:window]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(windowClosed:) - name:@"WindowClosed" - object:window]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(windowGainedFocus:) - name:@"WindowGainedFocus" - object:window]; - if ([window hasFocus]) { - [self setActiveWindow:window]; - } -} - -- (void) newWindow { - [self _addWindow:[Window window]]; -} - -- (void) newWindowWithDocument:(TikzDocument*)doc { - [self _addWindow:[Window windowWithDocument:doc]]; -} - -- (void) quit { - NSMutableArray *unsavedDocs = [NSMutableArray arrayWithCapacity:[openWindows count]]; - for (Window *window in openWindows) { - TikzDocument *doc = [window document]; - if ([doc hasUnsavedChanges]) { - [unsavedDocs addObject:doc]; - } - } - if ([unsavedDocs count] > 0) { - // FIXME: show a dialog - return; - } - gtk_main_quit(); -} - -- (void) presentPreamblesEditor { -#ifdef HAVE_POPPLER - if (preambleWindow == nil) { - preambleWindow = [[PreambleEditor alloc] initWithPreambles:preambles]; - //[preambleWindow setParentWindow:mainWindow]; - } - [preambleWindow present]; -#endif -} - -- (void) presentContextWindow { - [contextWindow present]; -} - -- (void) presentSettingsDialog { - if (settingsDialog == nil) { - settingsDialog = [[SettingsDialog alloc] initWithConfiguration:configFile - andStyleManager:styleManager]; - //[settingsDialog setParentWindow:mainWindow]; - } - [settingsDialog present]; -} - -- (Configuration*) mainConfiguration { - return configFile; -} - -- (void) saveConfiguration { - NSError *error = nil; - -#ifdef HAVE_POPPLER - if (preambles != nil) { - NSString *preamblesDir = [[SupportDir userSupportDir] stringByAppendingPathComponent:@"preambles"]; - // NSFileManager is slightly dodgy on Windows - g_mkdir_with_parents ([preamblesDir UTF8String], S_IRUSR | S_IWUSR | S_IXUSR); - [preambles storeToDirectory:preamblesDir]; - [configFile setStringEntry:@"selectedPreamble" inGroup:@"Preambles" value:[preambles selectedPreambleName]]; - } -#endif - - [styleManager saveStylesUsingConfigurationName:@"styles"]; - - for (id tool in tools) { - [tool saveConfiguration:configFile]; - } - [toolBox saveConfiguration:configFile]; - - [contextWindow saveConfiguration:configFile]; - - if (lastOpenFolder != nil) { - [configFile setStringEntry:@"lastOpenFolder" inGroup:@"Paths" value:lastOpenFolder]; - } - if (lastSaveAsFolder != nil) { - [configFile setStringEntry:@"lastSaveAsFolder" inGroup:@"Paths" value:lastSaveAsFolder]; - } - - if (![configFile writeToStoreWithError:&error]) { - logError (error, @"Could not write config file"); - } -} - -@end - -@implementation Application (Notifications) -- (void) windowClosed:(NSNotification*)notification { - Window *window = [notification object]; - [openWindows removeObjectIdenticalTo:window]; - [[NSNotificationCenter defaultCenter] removeObserver:self - name:nil - object:window]; - if ([openWindows count] == 0) { - gtk_main_quit(); - } else { - [self setActiveWindow:[openWindows objectAtIndex:0]]; - } -} - -- (void) windowGainedFocus:(NSNotification*)notification { - Window *window = [notification object]; - [self setActiveWindow:window]; -} - -- (void) selectedToolChanged:(NSNotification*)n { - id tool = [[n userInfo] objectForKey:@"tool"]; - if (tool != nil) - [self setActiveTool:tool]; - else - NSLog(@"nil tool!"); -} - -- (void) windowDocumentChanged:(NSNotification*)n { - [contextWindow setDocument:[[n userInfo] objectForKey:@"document"]]; -} -@end - -@implementation Application (Private) -- (void) setActiveWindow:(Window*)window { - [[NSNotificationCenter defaultCenter] removeObserver:self - name:@"DocumentChanged" - object:nil]; - - [contextWindow setDocument:[window document]]; - - [contextWindow attachToWindow:window]; - [toolBox attachToWindow:window]; - - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(windowDocumentChanged:) - name:@"DocumentChanged" - object:window]; -} -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit/src/gtk/BoundingBoxTool.h b/tikzit/src/gtk/BoundingBoxTool.h deleted file mode 100644 index f6498b0..0000000 --- a/tikzit/src/gtk/BoundingBoxTool.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "Tool.h" - -typedef enum { - NoHandle, - EastHandle, - SouthEastHandle, - SouthHandle, - SouthWestHandle, - WestHandle, - NorthWestHandle, - NorthHandle, - NorthEastHandle -} ResizeHandle; - -@interface BoundingBoxTool : NSObject { - GraphRenderer *renderer; - NSPoint dragOrigin; - ResizeHandle currentResizeHandle; - BOOL drawingNewBox; -} - -+ (id) tool; -- (id) init; -@end - - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/BoundingBoxTool.m b/tikzit/src/gtk/BoundingBoxTool.m deleted file mode 100644 index 483705e..0000000 --- a/tikzit/src/gtk/BoundingBoxTool.m +++ /dev/null @@ -1,353 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "BoundingBoxTool.h" - -#import "GraphRenderer.h" -#import "TikzDocument.h" -#import "tzstockitems.h" - -static const float handle_size = 8.0; -float sideHandleTop(NSRect bbox) { - return (NSMinY(bbox) + NSMaxY(bbox) - handle_size)/2.0f; -} -float tbHandleLeft(NSRect bbox) { - return (NSMinX(bbox) + NSMaxX(bbox) - handle_size)/2.0f; -} - -@interface BoundingBoxTool (Private) -- (NSRect) screenBoundingBox; -- (ResizeHandle) boundingBoxResizeHandleAt:(NSPoint)p; -- (NSRect) boundingBoxResizeHandleRect:(ResizeHandle)handle; -- (void) setResizeCursorForHandle:(ResizeHandle)handle; -@end - -@implementation BoundingBoxTool -- (NSString*) name { return @"Bounding Box"; } -- (const gchar*) stockId { return TIKZIT_STOCK_BOUNDING_BOX; } -- (NSString*) helpText { return @"Set the bounding box"; } -- (NSString*) shortcut { return @"b"; } - -+ (id) tool { - return [[[self alloc] init] autorelease]; -} - -- (id) init { - self = [super init]; - - if (self) { - currentResizeHandle = NoHandle; - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - [renderer release]; - - [super dealloc]; -} - -- (GraphRenderer*) activeRenderer { return renderer; } -- (void) setActiveRenderer:(GraphRenderer*)r { - if (r == renderer) - return; - - [[renderer surface] setCursor:NormalCursor]; - - [r retain]; - [renderer release]; - renderer = r; -} - -- (GtkWidget*) configurationWidget { return NULL; } - -- (void) mousePressAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { - if (button != LeftButton) - return; - - dragOrigin = pos; - currentResizeHandle = [self boundingBoxResizeHandleAt:pos]; - [[renderer document] startChangeBoundingBox]; - if (currentResizeHandle == NoHandle) { - drawingNewBox = YES; - [[[renderer document] graph] setBoundingBox:NSZeroRect]; - } else { - drawingNewBox = NO; - } - [renderer invalidateGraph]; -} - -- (void) mouseMoveTo:(NSPoint)pos withButtons:(MouseButton)buttons andMask:(InputMask)mask { - if (!(buttons & LeftButton)) { - ResizeHandle handle = [self boundingBoxResizeHandleAt:pos]; - [self setResizeCursorForHandle:handle]; - return; - } - - Transformer *transformer = [renderer transformer]; - Grid *grid = [renderer grid]; - Graph *graph = [[renderer document] graph]; - - if (currentResizeHandle == NoHandle) { - NSRect bbox = NSRectAroundPoints( - [grid snapScreenPoint:dragOrigin], - [grid snapScreenPoint:pos] - ); - [graph setBoundingBox:[transformer rectFromScreen:bbox]]; - } else { - NSRect bbox = [transformer rectToScreen:[graph boundingBox]]; - NSPoint p2 = [grid snapScreenPoint:pos]; - - if (currentResizeHandle == NorthWestHandle || - currentResizeHandle == NorthHandle || - currentResizeHandle == NorthEastHandle) { - - float dy = p2.y - NSMinY(bbox); - if (dy < bbox.size.height) { - bbox.origin.y += dy; - bbox.size.height -= dy; - } else { - bbox.origin.y = NSMaxY(bbox); - bbox.size.height = 0; - } - - } else if (currentResizeHandle == SouthWestHandle || - currentResizeHandle == SouthHandle || - currentResizeHandle == SouthEastHandle) { - - float dy = p2.y - NSMaxY(bbox); - if (-dy < bbox.size.height) { - bbox.size.height += dy; - } else { - bbox.size.height = 0; - } - } - - if (currentResizeHandle == NorthWestHandle || - currentResizeHandle == WestHandle || - currentResizeHandle == SouthWestHandle) { - - float dx = p2.x - NSMinX(bbox); - if (dx < bbox.size.width) { - bbox.origin.x += dx; - bbox.size.width -= dx; - } else { - bbox.origin.x = NSMaxX(bbox); - bbox.size.width = 0; - } - - } else if (currentResizeHandle == NorthEastHandle || - currentResizeHandle == EastHandle || - currentResizeHandle == SouthEastHandle) { - - float dx = p2.x - NSMaxX(bbox); - if (-dx < bbox.size.width) { - bbox.size.width += dx; - } else { - bbox.size.width = 0; - } - } - [graph setBoundingBox:[transformer rectFromScreen:bbox]]; - } - [[renderer document] changeBoundingBoxCheckPoint]; - [renderer invalidateGraph]; -} - -- (void) mouseReleaseAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { - if (button != LeftButton) - return; - - [[renderer document] endChangeBoundingBox]; - drawingNewBox = NO; - [renderer invalidateGraph]; -} - -- (void) renderWithContext:(id)context onSurface:(id)surface { - if (!drawingNewBox && [[[renderer document] graph] hasBoundingBox]) { - [context saveState]; - - [context setAntialiasMode:AntialiasDisabled]; - [context setLineWidth:1.0]; - - [context startPath]; - [context rect:[self boundingBoxResizeHandleRect:EastHandle]]; - [context rect:[self boundingBoxResizeHandleRect:SouthEastHandle]]; - [context rect:[self boundingBoxResizeHandleRect:SouthHandle]]; - [context rect:[self boundingBoxResizeHandleRect:SouthWestHandle]]; - [context rect:[self boundingBoxResizeHandleRect:WestHandle]]; - [context rect:[self boundingBoxResizeHandleRect:NorthWestHandle]]; - [context rect:[self boundingBoxResizeHandleRect:NorthHandle]]; - [context rect:[self boundingBoxResizeHandleRect:NorthEastHandle]]; - [context strokePathWithColor:MakeSolidRColor (0.5, 0.5, 0.5)]; - - [context restoreState]; - } -} -- (void) loadConfiguration:(Configuration*)config {} -- (void) saveConfiguration:(Configuration*)config {} -@end - -@implementation BoundingBoxTool (Private) -- (NSRect) screenBoundingBox { - Transformer *transformer = [[renderer surface] transformer]; - Graph *graph = [[renderer document] graph]; - return [transformer rectToScreen:[graph boundingBox]]; -} - -- (ResizeHandle) boundingBoxResizeHandleAt:(NSPoint)p { - NSRect bbox = [self screenBoundingBox]; - if (p.x >= NSMaxX(bbox)) { - if (p.x <= NSMaxX(bbox) + handle_size) { - if (p.y >= NSMaxY(bbox)) { - if (p.y <= NSMaxY(bbox) + handle_size) { - return SouthEastHandle; - } - } else if (p.y <= NSMinY(bbox)) { - if (p.y >= NSMinY(bbox) - handle_size) { - return NorthEastHandle; - } - } else { - float eastHandleTop = sideHandleTop(bbox); - if (p.y >= eastHandleTop && p.y <= (eastHandleTop + handle_size)) { - return EastHandle; - } - } - } - } else if (p.x <= NSMinX(bbox)) { - if (p.x >= NSMinX(bbox) - handle_size) { - if (p.y >= NSMaxY(bbox)) { - if (p.y <= NSMaxY(bbox) + handle_size) { - return SouthWestHandle; - } - } else if (p.y <= NSMinY(bbox)) { - if (p.y >= NSMinY(bbox) - handle_size) { - return NorthWestHandle; - } - } else { - float westHandleTop = sideHandleTop(bbox); - if (p.y >= westHandleTop && p.y <= (westHandleTop + handle_size)) { - return WestHandle; - } - } - } - } else if (p.y >= NSMaxY(bbox)) { - if (p.y <= NSMaxY(bbox) + handle_size) { - float southHandleLeft = tbHandleLeft(bbox); - if (p.x >= southHandleLeft && p.x <= (southHandleLeft + handle_size)) { - return SouthHandle; - } - } - } else if (p.y <= NSMinY(bbox)) { - if (p.y >= NSMinY(bbox) - handle_size) { - float northHandleLeft = tbHandleLeft(bbox); - if (p.x >= northHandleLeft && p.x <= (northHandleLeft + handle_size)) { - return NorthHandle; - } - } - } - return NoHandle; -} - -- (NSRect) boundingBoxResizeHandleRect:(ResizeHandle)handle { - Graph *graph = [[renderer document] graph]; - if (![graph hasBoundingBox]) { - return NSZeroRect; - } - NSRect bbox = [self screenBoundingBox]; - float x; - float y; - switch (handle) { - case NorthEastHandle: - case EastHandle: - case SouthEastHandle: - x = NSMaxX(bbox); - break; - case NorthWestHandle: - case WestHandle: - case SouthWestHandle: - x = NSMinX(bbox) - handle_size; - break; - case SouthHandle: - case NorthHandle: - x = tbHandleLeft(bbox); - break; - default: - return NSZeroRect; - } - switch (handle) { - case EastHandle: - case WestHandle: - y = sideHandleTop(bbox); - break; - case SouthEastHandle: - case SouthHandle: - case SouthWestHandle: - y = NSMaxY(bbox); - break; - case NorthEastHandle: - case NorthHandle: - case NorthWestHandle: - y = NSMinY(bbox) - handle_size; - break; - default: - return NSZeroRect; - } - return NSMakeRect(x, y, handle_size, handle_size); -} - -- (void) setResizeCursorForHandle:(ResizeHandle)handle { - if (handle != currentResizeHandle) { - currentResizeHandle = handle; - Cursor c = NormalCursor; - switch (handle) { - case EastHandle: - c = ResizeRightCursor; - break; - case SouthEastHandle: - c = ResizeBottomRightCursor; - break; - case SouthHandle: - c = ResizeBottomCursor; - break; - case SouthWestHandle: - c = ResizeBottomLeftCursor; - break; - case WestHandle: - c = ResizeLeftCursor; - break; - case NorthWestHandle: - c = ResizeTopLeftCursor; - break; - case NorthHandle: - c = ResizeTopCursor; - break; - case NorthEastHandle: - c = ResizeTopRightCursor; - break; - default: - c = NormalCursor; - break; - } - [[renderer surface] setCursor:c]; - } -} -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/CairoRenderContext.h b/tikzit/src/gtk/CairoRenderContext.h deleted file mode 100644 index ac9c5ee..0000000 --- a/tikzit/src/gtk/CairoRenderContext.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "RenderContext.h" -#import "Transformer.h" -#import -#import -#import - -@interface PangoTextLayout: NSObject { - PangoLayout *layout; - cairo_t *context; -} - -+ (PangoTextLayout*) layoutForContext:(cairo_t*)cr withFontSize:(CGFloat)fontSize; -- (id) initWithContext:(cairo_t*)cr fontSize:(CGFloat)fontSize; -- (void) setText:(NSString*)text; - -@end - -@interface CairoRenderContext: NSObject { - cairo_t *context; -} - -+ (CairoRenderContext*) contextForSurface:(cairo_surface_t*)surface; -- (id) initForSurface:(cairo_surface_t*)surface; - -+ (CairoRenderContext*) contextForWidget:(GtkWidget*)widget; -- (id) initForWidget:(GtkWidget*)widget; - -+ (CairoRenderContext*) contextForDrawable:(GdkDrawable*)d; -- (id) initForDrawable:(GdkDrawable*)d; - -+ (CairoRenderContext*) contextForPixbuf:(GdkPixbuf*)buf; -- (id) initForPixbuf:(GdkPixbuf*)buf; - -- (cairo_t*) cairoContext; -- (void) applyTransform:(Transformer*)transformer; - -- (void) clearSurface; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/CairoRenderContext.m b/tikzit/src/gtk/CairoRenderContext.m deleted file mode 100644 index 77e10b5..0000000 --- a/tikzit/src/gtk/CairoRenderContext.m +++ /dev/null @@ -1,344 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "CairoRenderContext.h" - -#import "cairo_helpers.h" -#import "util.h" - -#import - -@implementation PangoTextLayout - -- (id) init { - [self release]; - return nil; -} - -+ (PangoTextLayout*) layoutForContext:(cairo_t*)cr withFontSize:(CGFloat)fontSize { - return [[[self alloc] initWithContext:cr fontSize:fontSize] autorelease]; -} - -- (id) initWithContext:(cairo_t*)cr fontSize:(CGFloat)fontSize { - self = [super init]; - - if (self) { - cairo_reference (cr); - context = cr; - layout = pango_cairo_create_layout (cr); - - PangoFontDescription *font_desc = pango_font_description_new (); - pango_font_description_set_family_static (font_desc, "Sans"); - pango_font_description_set_size (font_desc, pango_units_from_double (fontSize)); - pango_layout_set_font_description (layout, font_desc); - pango_font_description_free (font_desc); - } - - return self; -} - -- (void) setText:(NSString*)text { - pango_layout_set_text (layout, [text UTF8String], -1); -} - -- (NSSize) size { - int width, height; - pango_layout_get_size (layout, &width, &height); - return NSMakeSize (pango_units_to_double (width), pango_units_to_double (height)); -} - -- (NSString*) text { - return [NSString stringWithUTF8String:pango_layout_get_text (layout)]; -} - -- (void) showTextAt:(NSPoint)topLeft withColor:(RColor)color { - cairo_save (context); - - cairo_move_to(context, topLeft.x, topLeft.y); - cairo_set_source_rcolor (context, color); - pango_cairo_show_layout (context, layout); - - cairo_restore (context); -} - -- (void) dealloc { - if (layout) - g_object_unref (G_OBJECT (layout)); - if (context) - cairo_destroy (context); - - [super dealloc]; -} - -@end - -@implementation CairoRenderContext - -- (id) init { - [self release]; - return nil; -} - -+ (CairoRenderContext*) contextForSurface:(cairo_surface_t*)surface { - return [[[self alloc] initForSurface:surface] autorelease]; -} - -- (id) initForSurface:(cairo_surface_t*)surface { - self = [super init]; - - if (self) { - context = cairo_create (surface); - } - - return self; -} - -+ (CairoRenderContext*) contextForWidget:(GtkWidget*)widget { - return [[[self alloc] initForWidget:widget] autorelease]; -} - -- (id) initForWidget:(GtkWidget*)widget { - self = [super init]; - - if (self) { - GdkWindow *window = gtk_widget_get_window (widget); - if (window) { - context = gdk_cairo_create (window); - } else { - [self release]; - self = nil; - } - } - - return self; -} - -+ (CairoRenderContext*) contextForDrawable:(GdkDrawable*)d { - return [[[self alloc] initForDrawable:d] autorelease]; -} - -- (id) initForDrawable:(GdkDrawable*)d { - self = [super init]; - - if (self) { - context = gdk_cairo_create (d); - } - - return self; -} - -+ (CairoRenderContext*) contextForPixbuf:(GdkPixbuf*)pixbuf { - return [[[self alloc] initForPixbuf:pixbuf] autorelease]; -} - -- (id) initForPixbuf:(GdkPixbuf*)pixbuf { - self = [super init]; - - if (self) { - cairo_format_t format = -1; - - if (gdk_pixbuf_get_colorspace (pixbuf) != GDK_COLORSPACE_RGB) { - NSLog(@"Unsupported colorspace (must be RGB)"); - [self release]; - return nil; - } - if (gdk_pixbuf_get_bits_per_sample (pixbuf) != 8) { - NSLog(@"Unsupported bits per sample (must be 8)"); - [self release]; - return nil; - } - if (gdk_pixbuf_get_has_alpha (pixbuf)) { - if (gdk_pixbuf_get_n_channels (pixbuf) != 4) { - NSLog(@"Unsupported bits per sample (must be 4 for an image with alpha)"); - [self release]; - return nil; - } - format = CAIRO_FORMAT_ARGB32; - } else { - if (gdk_pixbuf_get_n_channels (pixbuf) != 3) { - NSLog(@"Unsupported bits per sample (must be 3 for an image without alpha)"); - [self release]; - return nil; - } - format = CAIRO_FORMAT_RGB24; - } - - cairo_surface_t *surface = cairo_image_surface_create_for_data( - gdk_pixbuf_get_pixels(pixbuf), - format, - gdk_pixbuf_get_width(pixbuf), - gdk_pixbuf_get_height(pixbuf), - gdk_pixbuf_get_rowstride(pixbuf)); - context = cairo_create (surface); - cairo_surface_destroy (surface); - } - - return self; -} - -- (cairo_t*) cairoContext { - return context; -} - -- (void) applyTransform:(Transformer*)transformer { - NSPoint origin = [transformer toScreen:NSZeroPoint]; - cairo_translate (context, origin.x, origin.y); - NSPoint scale = [transformer toScreen:NSMakePoint (1.0f, 1.0f)]; - scale.x -= origin.x; - scale.y -= origin.y; - cairo_scale (context, scale.x, scale.y); -} - -- (void) saveState { - cairo_save (context); -} - -- (void) restoreState { - cairo_restore (context); -} - -- (NSRect) clipBoundingBox { - double clipx1, clipx2, clipy1, clipy2; - cairo_clip_extents (context, &clipx1, &clipy1, &clipx2, &clipy2); - return NSMakeRect (clipx1, clipy1, clipx2-clipx1, clipy2-clipy1); -} - -- (BOOL) strokeIncludesPoint:(NSPoint)p { - return cairo_in_stroke (context, p.x, p.y); -} - -- (BOOL) fillIncludesPoint:(NSPoint)p { - return cairo_in_fill (context, p.x, p.y); -} - -- (id) layoutText:(NSString*)text withSize:(CGFloat)fontSize { - PangoTextLayout *layout = [PangoTextLayout layoutForContext:context withFontSize:fontSize]; - [layout setText:text]; - return layout; -} - -- (void) setAntialiasMode:(AntialiasMode)mode { - if (mode == AntialiasDisabled) { - cairo_set_antialias (context, CAIRO_ANTIALIAS_NONE); - } else { - cairo_set_antialias (context, CAIRO_ANTIALIAS_DEFAULT); - } -} - -- (void) setLineWidth:(CGFloat)width { - cairo_set_line_width (context, width); -} - -- (void) setLineDash:(CGFloat)dashLength { - if (dashLength <= 0.0) { - cairo_set_dash (context, NULL, 0, 0); - } else { - double dashes[] = { dashLength }; - cairo_set_dash (context, dashes, 1, 0); - } -} - -// paths -- (void) startPath { - cairo_new_path (context); -} - -- (void) closeSubPath { - cairo_close_path (context); -} - -- (void) moveTo:(NSPoint)p { - cairo_move_to(context, p.x, p.y); -} - -- (void) curveTo:(NSPoint)end withCp1:(NSPoint)cp1 andCp2:(NSPoint)cp2 { - cairo_curve_to (context, cp1.x, cp1.y, cp2.x, cp2.y, end.x, end.y); -} - -- (void) lineTo:(NSPoint)end { - cairo_line_to (context, end.x, end.y); -} - -- (void) rect:(NSRect)rect { - cairo_rectangle (context, rect.origin.x, rect.origin.y, rect.size.width, rect.size.height); -} - -- (void) circleAt:(NSPoint)c withRadius:(CGFloat)r { - cairo_new_sub_path (context); - cairo_arc (context, c.x, c.y, r, 0, 2 * M_PI); -} - -- (void) strokePathWithColor:(RColor)color { - cairo_set_source_rcolor (context, color); - cairo_stroke (context); -} - -- (void) fillPathWithColor:(RColor)color { - cairo_set_source_rcolor (context, color); - cairo_fill (context); -} - -- (void) strokePathWithColor:(RColor)scolor - andFillWithColor:(RColor)fcolor { - cairo_set_source_rcolor (context, fcolor); - cairo_fill_preserve (context); - cairo_set_source_rcolor (context, scolor); - cairo_stroke (context); -} - -- (void) strokePathWithColor:(RColor)scolor - andFillWithColor:(RColor)fcolor - usingAlpha:(CGFloat)alpha { - cairo_push_group (context); - cairo_set_source_rcolor (context, fcolor); - cairo_fill_preserve (context); - cairo_set_source_rcolor (context, scolor); - cairo_stroke (context); - cairo_pop_group_to_source (context); - cairo_paint_with_alpha (context, alpha); -} - -- (void) clipToPath { - cairo_clip (context); -} - -- (void) paintWithColor:(RColor)color { - cairo_set_source_rcolor (context, color); - cairo_paint (context); -} - -- (void) clearSurface { - cairo_operator_t old_op = cairo_get_operator (context); - - cairo_set_operator (context, CAIRO_OPERATOR_SOURCE); - cairo_set_source_rgba (context, 0.0, 0.0, 0.0, 0.0); - cairo_paint (context); - - cairo_set_operator (context, old_op); -} - -- (void) dealloc { - if (context) { - cairo_destroy (context); - } - - [super dealloc]; -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/ColorRGB+Gtk.h b/tikzit/src/gtk/ColorRGB+Gtk.h deleted file mode 100644 index 5cfb4d7..0000000 --- a/tikzit/src/gtk/ColorRGB+Gtk.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "ColorRGB.h" -#import - -@interface ColorRGB (Gtk) - -+ (ColorRGB*) colorWithGdkColor:(GdkColor)color; -- (id) initWithGdkColor:(GdkColor)color; -- (GdkColor) gdkColor; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/ColorRGB+Gtk.m b/tikzit/src/gtk/ColorRGB+Gtk.m deleted file mode 100644 index be5dd56..0000000 --- a/tikzit/src/gtk/ColorRGB+Gtk.m +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * Copyright 2010 Chris Heunen - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "ColorRGB+Gtk.h" - -// 257 = 65535/255 -// GdkColor values run from 0 to 65535, not from 0 to 255 -#define GDK_FACTOR 257 - -@implementation ColorRGB (Gtk) - -+ (ColorRGB*) colorWithGdkColor:(GdkColor)color { - return [ColorRGB colorWithRed:color.red/GDK_FACTOR green:color.green/GDK_FACTOR blue:color.blue/GDK_FACTOR]; -} - -- (id) initWithGdkColor:(GdkColor)color { - return [self initWithRed:color.red/GDK_FACTOR green:color.green/GDK_FACTOR blue:color.blue/GDK_FACTOR]; -} - -- (GdkColor) gdkColor { - GdkColor color; - color.pixel = 0; - color.red = GDK_FACTOR * [self red]; - color.green = GDK_FACTOR * [self green]; - color.blue = GDK_FACTOR * [self blue]; - return color; -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/ColorRGB+IntegerListStorage.h b/tikzit/src/gtk/ColorRGB+IntegerListStorage.h deleted file mode 100644 index 118eaee..0000000 --- a/tikzit/src/gtk/ColorRGB+IntegerListStorage.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "ColorRGB.h" - -/** - * Stores a ColorRGB as a list of short integers - */ -@interface ColorRGB (IntegerListStorage) - -+ (ColorRGB*) colorFromValueList:(NSArray*)values; -- (id) initFromValueList:(NSArray*)values; -- (NSArray*) valueList; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/ColorRGB+IntegerListStorage.m b/tikzit/src/gtk/ColorRGB+IntegerListStorage.m deleted file mode 100644 index 0103a3c..0000000 --- a/tikzit/src/gtk/ColorRGB+IntegerListStorage.m +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * Copyright 2010 Chris Heunen - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "ColorRGB+IntegerListStorage.h" - -@implementation ColorRGB (IntegerListStorage) - -+ (ColorRGB*) colorFromValueList:(NSArray*)values { - if ([values count] != 3) { - return nil; - } - - unsigned short redValue = [[values objectAtIndex:0] intValue]; - unsigned short greenValue = [[values objectAtIndex:1] intValue]; - unsigned short blueValue = [[values objectAtIndex:2] intValue]; - return [ColorRGB colorWithRed:redValue green:greenValue blue:blueValue]; -} - -- (id) initFromValueList:(NSArray*)values { - if ([values count] != 3) { - [self release]; - return nil; - } - - unsigned short redValue = [[values objectAtIndex:0] intValue]; - unsigned short greenValue = [[values objectAtIndex:1] intValue]; - unsigned short blueValue = [[values objectAtIndex:2] intValue]; - - return [self initWithRed:redValue green:greenValue blue:blueValue]; -} - -- (NSArray*) valueList { - NSMutableArray *array = [NSMutableArray arrayWithCapacity:3]; - [array addObject:[NSNumber numberWithInt:[self red]]]; - [array addObject:[NSNumber numberWithInt:[self green]]]; - [array addObject:[NSNumber numberWithInt:[self blue]]]; - return array; -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/Configuration.h b/tikzit/src/gtk/Configuration.h deleted file mode 100644 index 6c68681..0000000 --- a/tikzit/src/gtk/Configuration.h +++ /dev/null @@ -1,447 +0,0 @@ -// -// Configuration.h -// TikZiT -// -// Copyright 2010 Alex Merry -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "TZFoundation.h" - -/** - * Manages configuration information in a grouped key-value format. - */ -@interface Configuration : NSObject { - NSString *name; - GKeyFile *file; -} - -/** - * Check whether there is any existing configuration. - */ -+ (BOOL) configurationExistsWithName:(NSString*)name; -/** - * Create a blank configuration with the given name, without loading - * any existing configuration information. - * - * @param name the name of the configuration - */ -+ (Configuration*) emptyConfigurationWithName:(NSString*)name; -/** - * Load an existing configuration for the given name. - * - * If there was no existing configuration, or it could not be opened, - * an empty configuration will be returned. - * - * @param name the name of the configuration - */ -+ (Configuration*) configurationWithName:(NSString*)name; -/** - * Load an existing configuration for the given name. - * - * If there was no existing configuration, or it could not be opened, - * an empty configuration will be returned. - * - * @param name the name of the configuration - * @param error this will be set if the configuration exists, but could - * not be opened. - */ -+ (Configuration*) configurationWithName:(NSString*)name loadError:(NSError**)error; - -/** - * Initialise the configuration to be empty - * - * Does not attempt to load any existing configuration data. - * - * @param name the name of the configuration - */ -- (id) initEmptyWithName:(NSString*)name; -/** - * Initialise a configuration, loading it if it had previously been stored. - * - * If there was no existing configuration, or it could not be opened, - * an empty configuration will be returned. - * - * @param name the name of the configuration - */ -- (id) initWithName:(NSString*)name; -/** - * Initialise a configuration, loading it if it had previously been stored. - * - * If there was no existing configuration, or it could not be opened, - * an empty configuration will be returned. - * - * @param name the name of the configuration - * @param error this will be set if the configuration exists, but could - * not be opened. - */ -- (id) initWithName:(NSString*)name loadError:(NSError**)error; - -/** - * The name of the configuration. - * - * Configurations with different names are stored independently. - */ -- (NSString*) name; -/** - * Set the name of the configuration. - * - * This will affect the behaviour of [-writeToStore] - * - * Configurations with different names are stored independently. - */ -- (void) setName:(NSString*)name; - -/** - * Writes the configuration to the backing store. - * - * The location the configuration is written to is determined by the - * [-name] property. - * - * @result YES if the configuration was successfully written, NO otherwise - */ -- (BOOL) writeToStore; -/** - * Writes the configuration to the backing store. - * - * The location the configuration is written to is determined by the - * [-name] property. - * - * @param error this will be set if the configuration could not be written - * to the backing store - * @result YES if the configuration was successfully written, NO otherwise - */ -- (BOOL) writeToStoreWithError:(NSError**)error; - -/** - * Check whether a particular key exists within a group - * - * @param key the key to check for - * @param group the name of the group to look in - * @result YES if the key exists, NO otherwise - */ -- (BOOL) hasKey:(NSString*)key inGroup:(NSString*)group; -/** - * Check whether a particular group exists - * - * @param group the name of the group to check for - * @result YES if the group exists, NO otherwise - */ -- (BOOL) hasGroup:(NSString*)group; -/** - * List the groups in the configuration. - * - * @result a list of group names - */ -- (NSArray*) groups; - -/** - * Get the value associated with a key as a string - * - * This is only guaranteed to work if the value was stored as a string. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @result the value associated with key as a string, or nil - * if no string value was associated with key - */ -- (NSString*) stringEntry:(NSString*)key inGroup:(NSString*)group; -/** - * Get the value associated with a key as a string - * - * This is only guaranteed to work if the value was stored as a string. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @param def the value to return if no string value was associated with key - * @result the value associated with key as a string, or default - */ -- (NSString*) stringEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSString*)def; -/** - * Get the value associated with a key as a boolean - * - * This is only guaranteed to work if the value was stored as a boolean. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @result the value associated with key as a boolean, or NO - * if no boolean value was associated with key - */ -- (BOOL) booleanEntry:(NSString*)key inGroup:(NSString*)group; -/** - * Get the value associated with a key as a boolean - * - * This is only guaranteed to work if the value was stored as a boolean. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @param def the value to return if no boolean value was associated with key - * @result the value associated with key as a boolean, or def - */ -- (BOOL) booleanEntry:(NSString*)key inGroup:(NSString*)group withDefault:(BOOL)def; -/** - * Get the value associated with a key as a integer - * - * This is only guaranteed to work if the value was stored as a integer. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @result the value associated with key as a integer, or 0 - * if no integer value was associated with key - */ -- (int) integerEntry:(NSString*)key inGroup:(NSString*)group; -/** - * Get the value associated with a key as a integer - * - * This is only guaranteed to work if the value was stored as a integer. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @param def the value to return if no integer value was associated with key - * @result the value associated with key as a integer, or def - */ -- (int) integerEntry:(NSString*)key inGroup:(NSString*)group withDefault:(int)def; -/** - * Get the value associated with a key as a double - * - * This is only guaranteed to work if the value was stored as a double. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @result the value associated with key as a double, or 0 - * if no double value was associated with key - */ -- (double) doubleEntry:(NSString*)key inGroup:(NSString*)group; -/** - * Get the value associated with a key as a double - * - * This is only guaranteed to work if the value was stored as a double. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @param def the value to return if no double value was associated with key - * @result the value associated with key as a double, or def - */ -- (double) doubleEntry:(NSString*)key inGroup:(NSString*)group withDefault:(double)def; - -/** - * Get the value associated with a key as a list of strings - * - * This is only guaranteed to work if the value was stored as a - * list of strings. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @result the value associated with key as a list of strings, - * or nil if no list of strings was associated with key - */ -- (NSArray*) stringListEntry:(NSString*)key inGroup:(NSString*)group; -/** - * Get the value associated with a key as a list of strings - * - * This is only guaranteed to work if the value was stored as a - * list of strings. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @param def the value to return if no string list value was associated with key - * @result the value associated with key as a list of strings, or def - */ -- (NSArray*) stringListEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSArray*)def; -/** - * Get the value associated with a key as a list of booleans - * - * This is only guaranteed to work if the value was stored as a - * list of booleans. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @result the value associated with key as a list of NSNumber - * objects, containing boolean values, or nil - */ -- (NSArray*) booleanListEntry:(NSString*)key inGroup:(NSString*)group; -/** - * Get the value associated with a key as a list of booleans - * - * This is only guaranteed to work if the value was stored as a - * list of booleans. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @param def the value to return if no boolean list value was associated with key - * @result the value associated with key as a list of NSNumber - * objects, containing boolean values, or def - */ -- (NSArray*) booleanListEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSArray*)def; -/** - * Get the value associated with a key as a list of integers - * - * This is only guaranteed to work if the value was stored as a - * list of integers. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @result the value associated with key as a list of NSNumber - * objects, containing integer values, or nil - */ -- (NSArray*) integerListEntry:(NSString*)key inGroup:(NSString*)group; -/** - * Get the value associated with a key as a list of integers - * - * This is only guaranteed to work if the value was stored as a - * list of integers. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @param def the value to return if no integer list value was associated with key - * @result the value associated with key as a list of NSNumber - * objects, containing integer values, or def - */ -- (NSArray*) integerListEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSArray*)def; -/** - * Get the value associated with a key as a list of doubles - * - * This is only guaranteed to work if the value was stored as a - * list of doubles. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @result the value associated with key as a list of NSNumber - * objects, containing double values, or nil - */ -- (NSArray*) doubleListEntry:(NSString*)key inGroup:(NSString*)group; -/** - * Get the value associated with a key as a list of doubles - * - * This is only guaranteed to work if the value was stored as a - * list of doubles. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @param def the value to return if no double list value was associated with key - * @result the value associated with key as a list of NSNumber - * objects, containing double values, or def - */ -- (NSArray*) doubleListEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSArray*)def; - -/** - * Associate a string value with a key. - * - * Any previous value (of any type) with the same key and group will - * be overwritten. - * - * @param key the key to associate the value with - * @param group the group to store the association in - * @param value the value to store - */ -- (void) setStringEntry:(NSString*)key inGroup:(NSString*)group value:(NSString*)value; -/** - * Associate a boolean value with a key. - * - * Any previous value (of any type) with the same key and group will - * be overwritten. - * - * @param key the key to associate the value with - * @param group the group to store the association in - * @param value the value to store - */ -- (void) setBooleanEntry:(NSString*)key inGroup:(NSString*)group value:(BOOL)value; -/** - * Associate a integer value with a key. - * - * Any previous value (of any type) with the same key and group will - * be overwritten. - * - * @param key the key to associate the value with - * @param group the group to store the association in - * @param value the value to store - */ -- (void) setIntegerEntry:(NSString*)key inGroup:(NSString*)group value:(int)value; -/** - * Associate a double value with a key. - * - * Any previous value (of any type) with the same key and group will - * be overwritten. - * - * @param key the key to associate the value with - * @param group the group to store the association in - * @param value the value to store - */ -- (void) setDoubleEntry:(NSString*)key inGroup:(NSString*)group value:(double)value; - -/** - * Associate a list of string values with a key. - * - * Any previous value (of any type) with the same key and group will - * be overwritten. - * - * @param key the key to associate the list with - * @param group the group to store the association in - * @param value the list to store, as an array of strings - */ -- (void) setStringListEntry:(NSString*)key inGroup:(NSString*)group value:(NSArray*)value; -/** - * Associate a list of boolean values with a key. - * - * Any previous value (of any type) with the same key and group will - * be overwritten. - * - * @param key the key to associate the list with - * @param group the group to store the association in - * @param value the list to store, as an array of NSNumber objects - */ -- (void) setBooleanListEntry:(NSString*)key inGroup:(NSString*)group value:(NSArray*)value; -/** - * Associate a list of integer values with a key. - * - * Any previous value (of any type) with the same key and group will - * be overwritten. - * - * @param key the key to associate the list with - * @param group the group to store the association in - * @param value the list to store, as an array of NSNumber objects - */ -- (void) setIntegerListEntry:(NSString*)key inGroup:(NSString*)group value:(NSArray*)value; -/** - * Associate a list of double values with a key. - * - * Any previous value (of any type) with the same key and group will - * be overwritten. - * - * @param key the key to associate the list with - * @param group the group to store the association in - * @param value the list to store, as an array of NSNumber objects - */ -- (void) setDoubleListEntry:(NSString*)key inGroup:(NSString*)group value:(NSArray*)value; - -/** - * Remove a group from the configuration - * - * This will remove all the groups key-value associations. - */ -- (void) removeGroup:(NSString*)group; -/** - * Remove a key from the configuration - * - * @param key the key to remove - * @param group the group to remove it from - */ -- (void) removeKey:(NSString*)key inGroup:(NSString*)group; - -@end - -// vim:ft=objc:sts=4:sw=4:et diff --git a/tikzit/src/gtk/Configuration.m b/tikzit/src/gtk/Configuration.m deleted file mode 100644 index 4a3ed79..0000000 --- a/tikzit/src/gtk/Configuration.m +++ /dev/null @@ -1,450 +0,0 @@ -// -// Configuration.h -// TikZiT -// -// Copyright 2010 Alex Merry -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "Configuration.h" -#import "SupportDir.h" - -@implementation Configuration - -+ (NSString*) _pathFromName:(NSString*)name { - return [NSString stringWithFormat:@"%@/%@.conf", [SupportDir userSupportDir], name]; -} - -+ (BOOL) configurationExistsWithName:(NSString*)name { - BOOL isDir; - BOOL exists = [[NSFileManager defaultManager] fileExistsAtPath:[self _pathFromName:name] isDirectory:&isDir]; - return exists && !isDir; -} - -+ (Configuration*) emptyConfigurationWithName:(NSString*)name - { return [[[self alloc] initEmptyWithName:name] autorelease]; } -+ (Configuration*) configurationWithName:(NSString*)name - { return [[[self alloc] initWithName:name] autorelease]; } -+ (Configuration*) configurationWithName:(NSString*)name loadError:(NSError**)error - { return [[[self alloc] initWithName:name loadError:error] autorelease]; } - -- (id) init -{ - [self release]; - return nil; -} - -- (id) initEmptyWithName:(NSString*)n -{ - self = [super init]; - if (self) { - name = [n retain]; - file = g_key_file_new (); - } - - return self; -} - -- (id) _initFromFile:(NSString*)path error:(NSError**)error -{ - self = [super init]; - if (self) { - file = g_key_file_new (); - - NSFileManager *manager = [NSFileManager defaultManager]; - if ([manager fileExistsAtPath:path]) { - gchar *filename = [path glibFilename]; - - GError *gerror = NULL; - g_key_file_load_from_file (file, - filename, - G_KEY_FILE_NONE, - &gerror); - g_free (filename); - - if (gerror) { - GErrorToNSError (gerror, error); - g_error_free (gerror); - } - } - } - - return self; -} - -- (id) initWithName:(NSString*)n { - return [self initWithName:n loadError:NULL]; -} - -- (id) initWithName:(NSString*)n loadError:(NSError**)error { - self = [self _initFromFile:[Configuration _pathFromName:n] error:error]; - - if (self) { - name = [n retain]; - } - - return self; -} - -- (BOOL) _ensureParentExists:(NSString*)path error:(NSError**)error { - NSString *directory = [path stringByDeletingLastPathComponent]; - return [[NSFileManager defaultManager] ensureDirectoryExists:directory error:error]; -} - -- (BOOL) _writeFileTo:(NSString*)path error:(NSError**)error -{ - if (![self _ensureParentExists:path error:error]) { - return NO; - } - - BOOL success = NO; - gsize length; - gchar *data = g_key_file_to_data (file, &length, NULL); // never reports an error - if (data && length) { - GError *gerror = NULL; - gchar* nativePath = [path glibFilename]; - success = g_file_set_contents (nativePath, data, length, &gerror) ? YES : NO; - g_free (data); - g_free (nativePath); - if (gerror) { - g_warning ("Failed to write file: %s\n", gerror->message); - GErrorToNSError (gerror, error); - g_error_free (gerror); - } - } else { - [[NSFileManager defaultManager] removeFileAtPath:path handler:nil]; - success = YES; - } - - return success; -} - -- (NSString*) name { - return name; -} - -- (void) setName:(NSString*)n { - [n retain]; - [name release]; - name = n; -} - -- (BOOL) writeToStore { - return [self writeToStoreWithError:NULL]; -} - -- (BOOL) writeToStoreWithError:(NSError**)error { - return [self _writeFileTo:[Configuration _pathFromName:name] error:error]; -} - -- (BOOL) hasKey:(NSString*)key inGroup:(NSString*)group -{ - gboolean result = g_key_file_has_key (file, [group UTF8String], [key UTF8String], NULL); - return result ? YES : NO; -} - -- (BOOL) hasGroup:(NSString*)group -{ - gboolean result = g_key_file_has_group (file, [group UTF8String]); - return result ? YES : NO; -} - -- (NSArray*) keys:(NSString*)group -{ - gsize length; - gchar **keys = g_key_file_get_keys (file, [group UTF8String], &length, NULL); - if (!keys) - length = 0; - - NSMutableArray *array = [NSMutableArray arrayWithCapacity:length]; - for (int i = 0; i < length; ++i) { - [array addObject:[NSString stringWithUTF8String:keys[i]]]; - } - g_strfreev (keys); - return array; -} - -- (NSArray*) groups -{ - gsize length; - gchar **groups = g_key_file_get_groups (file, &length); - NSMutableArray *array = [NSMutableArray arrayWithCapacity:length]; - for (int i = 0; i < length; ++i) { - [array addObject:[NSString stringWithUTF8String:groups[i]]]; - } - g_strfreev (groups); - return array; -} - -- (NSString*) stringEntry:(NSString*)key inGroup:(NSString*)group -{ - return [self stringEntry:key inGroup:group withDefault:nil]; -} - -- (NSString*) stringEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSString*)def -{ - NSString *result = def; - gchar *entry = g_key_file_get_string (file, [group UTF8String], [key UTF8String], NULL); - if (entry) { - result = [NSString stringWithUTF8String:entry]; - g_free (entry); - } - return result; -} - -- (BOOL) booleanEntry:(NSString*)key inGroup:(NSString*)group withDefault:(BOOL)def -{ - GError *error = NULL; - gboolean result = g_key_file_get_boolean (file, [group UTF8String], [key UTF8String], &error); - if (error != NULL) { - g_error_free (error); - return def; - } else { - return result ? YES : NO; - } -} - -- (BOOL) booleanEntry:(NSString*)key inGroup:(NSString*)group -{ - gboolean result = g_key_file_get_boolean (file, [group UTF8String], [key UTF8String], NULL); - return result ? YES : NO; -} - -- (int) integerEntry:(NSString*)key inGroup:(NSString*)group withDefault:(int)def -{ - GError *error = NULL; - int result = g_key_file_get_integer (file, [group UTF8String], [key UTF8String], &error); - if (error != NULL) { - g_error_free (error); - return def; - } else { - return result; - } -} - -- (int) integerEntry:(NSString*)key inGroup:(NSString*)group -{ - return g_key_file_get_integer (file, [group UTF8String], [key UTF8String], NULL); -} - -- (double) doubleEntry:(NSString*)key inGroup:(NSString*)group withDefault:(double)def -{ - GError *error = NULL; - double result = g_key_file_get_double (file, [group UTF8String], [key UTF8String], &error); - if (error != NULL) { - g_error_free (error); - return def; - } else { - return result; - } -} - -- (double) doubleEntry:(NSString*)key inGroup:(NSString*)group -{ - return g_key_file_get_double (file, [group UTF8String], [key UTF8String], NULL); -} - -- (NSArray*) stringListEntry:(NSString*)key inGroup:(NSString*)group -{ - return [self stringListEntry:key inGroup:group withDefault:nil]; -} - -- (NSArray*) stringListEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSArray*)def -{ - gsize length; - gchar **list = g_key_file_get_string_list (file, [group UTF8String], [key UTF8String], &length, NULL); - if (list) { - NSMutableArray *result = [NSMutableArray arrayWithCapacity:length]; - for (int i = 0; i < length; ++i) { - [result addObject:[NSString stringWithUTF8String:list[i]]]; - } - g_strfreev (list); - return result; - } else { - return def; - } -} - -- (NSArray*) booleanListEntry:(NSString*)key inGroup:(NSString*)group -{ - return [self booleanListEntry:key inGroup:group withDefault:nil]; -} - -- (NSArray*) booleanListEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSArray*)def -{ - gsize length; - gboolean *list = g_key_file_get_boolean_list (file, [group UTF8String], [key UTF8String], &length, NULL); - if (list) { - NSMutableArray *result = [NSMutableArray arrayWithCapacity:length]; - for (int i = 0; i < length; ++i) { - [result addObject:[NSNumber numberWithBool:list[i]]]; - } - g_free (list); - return result; - } else { - return def; - } -} - -- (NSArray*) integerListEntry:(NSString*)key inGroup:(NSString*)group -{ - return [self integerListEntry:key inGroup:group withDefault:nil]; -} - -- (NSArray*) integerListEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSArray*)def -{ - gsize length; - gint *list = g_key_file_get_integer_list (file, [group UTF8String], [key UTF8String], &length, NULL); - if (list) { - NSMutableArray *result = [NSMutableArray arrayWithCapacity:length]; - for (int i = 0; i < length; ++i) { - [result addObject:[NSNumber numberWithInt:list[i]]]; - } - g_free (list); - return result; - } else { - return def; - } -} - -- (NSArray*) doubleListEntry:(NSString*)key inGroup:(NSString*)group -{ - return [self doubleListEntry:key inGroup:group withDefault:nil]; -} - -- (NSArray*) doubleListEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSArray*)def -{ - gsize length; - double *list = g_key_file_get_double_list (file, [group UTF8String], [key UTF8String], &length, NULL); - if (list) { - NSMutableArray *result = [NSMutableArray arrayWithCapacity:length]; - for (int i = 0; i < length; ++i) { - [result addObject:[NSNumber numberWithDouble:list[i]]]; - } - g_free (list); - return result; - } else { - return def; - } -} - -- (void) setStringEntry:(NSString*)key inGroup:(NSString*)group value:(NSString*)value -{ - if (value == nil) { - [self removeKey:key inGroup:group]; - return; - } - g_key_file_set_string (file, [group UTF8String], [key UTF8String], [value UTF8String]); -} - -- (void) setBooleanEntry:(NSString*)key inGroup:(NSString*)group value:(BOOL)value; -{ - g_key_file_set_boolean (file, [group UTF8String], [key UTF8String], value); -} - -- (void) setIntegerEntry:(NSString*)key inGroup:(NSString*)group value:(int)value; -{ - g_key_file_set_integer (file, [group UTF8String], [key UTF8String], value); -} - -- (void) setDoubleEntry:(NSString*)key inGroup:(NSString*)group value:(double)value; -{ - g_key_file_set_double (file, [group UTF8String], [key UTF8String], value); -} - - -- (void) setStringListEntry:(NSString*)key inGroup:(NSString*)group value:(NSArray*)value -{ - if (value == nil) { - [self removeKey:key inGroup:group]; - return; - } - gsize length = [value count]; - const gchar * *list = g_new (const gchar *, length); - for (int i = 0; i < length; ++i) { - list[i] = [[value objectAtIndex:i] UTF8String]; - } - g_key_file_set_string_list (file, [group UTF8String], [key UTF8String], list, length); - g_free (list); -} - -- (void) setBooleanListEntry:(NSString*)key inGroup:(NSString*)group value:(NSArray*)value; -{ - if (value == nil) { - [self removeKey:key inGroup:group]; - return; - } - gsize length = [value count]; - gboolean *list = g_new (gboolean, length); - for (int i = 0; i < length; ++i) { - list[i] = [[value objectAtIndex:i] boolValue]; - } - g_key_file_set_boolean_list (file, [group UTF8String], [key UTF8String], list, length); - g_free (list); -} - -- (void) setIntegerListEntry:(NSString*)key inGroup:(NSString*)group value:(NSArray*)value; -{ - if (value == nil) { - [self removeKey:key inGroup:group]; - return; - } - gsize length = [value count]; - gint *list = g_new (gint, length); - for (int i = 0; i < length; ++i) { - list[i] = [[value objectAtIndex:i] intValue]; - } - g_key_file_set_integer_list (file, [group UTF8String], [key UTF8String], list, length); - g_free (list); -} - -- (void) setDoubleListEntry:(NSString*)key inGroup:(NSString*)group value:(NSArray*)value; -{ - if (value == nil) { - [self removeKey:key inGroup:group]; - return; - } - gsize length = [value count]; - gdouble *list = g_new (gdouble, length); - for (int i = 0; i < length; ++i) { - list[i] = [[value objectAtIndex:i] doubleValue]; - } - g_key_file_set_double_list (file, [group UTF8String], [key UTF8String], list, length); - g_free (list); -} - -- (void) removeGroup:(NSString*)group -{ - g_key_file_remove_group (file, [group UTF8String], NULL); -} - -- (void) removeKey:(NSString*)key inGroup:(NSString*)group; -{ - g_key_file_remove_key (file, [group UTF8String], [key UTF8String], NULL); -} - -- (void) dealloc -{ - [name release]; - g_key_file_free (file); - file = NULL; - [super dealloc]; -} - -@end - -// vim:ft=objc:sts=4:sw=4:et diff --git a/tikzit/src/gtk/ContextWindow.h b/tikzit/src/gtk/ContextWindow.h deleted file mode 100644 index fcad9df..0000000 --- a/tikzit/src/gtk/ContextWindow.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class Configuration; -@class EdgeStylesModel; -@class NodeStylesModel; -@class PropertiesPane; -@class SelectionPane; -@class StyleManager; -@class TikzDocument; -@class Window; - -@interface ContextWindow: NSObject { - PropertiesPane *propsPane; - SelectionPane *selPane; - - GtkWidget *window; - GtkWidget *layout; -} - -@property (retain) TikzDocument *document; -@property (assign) BOOL visible; - -- (id) initWithStyleManager:(StyleManager*)mgr; -- (id) initWithNodeStylesModel:(NodeStylesModel*)nsm - andEdgeStylesModel:(EdgeStylesModel*)esm; - -- (void) present; -- (void) attachToWindow:(Window*)parent; - -- (void) loadConfiguration:(Configuration*)config; -- (void) saveConfiguration:(Configuration*)config; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit/src/gtk/ContextWindow.m b/tikzit/src/gtk/ContextWindow.m deleted file mode 100644 index d8e9d20..0000000 --- a/tikzit/src/gtk/ContextWindow.m +++ /dev/null @@ -1,169 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "ContextWindow.h" - -#import "Configuration.h" -#import "EdgeStylesModel.h" -#import "NodeStylesModel.h" -#import "PropertiesPane.h" -#import "SelectionPane.h" -#import "StyleManager.h" -#import "Window.h" - -#import "gtkhelpers.h" - -static gboolean props_window_delete_event_cb (GtkWidget *widget, GdkEvent *event, ContextWindow *window); - -@implementation ContextWindow - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithStyleManager:(StyleManager*)sm { - return [self initWithNodeStylesModel:[NodeStylesModel modelWithStyleManager:sm] - andEdgeStylesModel:[EdgeStylesModel modelWithStyleManager:sm]]; -} - -- (id) initWithNodeStylesModel:(NodeStylesModel*)nsm - andEdgeStylesModel:(EdgeStylesModel*)esm { - self = [super init]; - - if (self) { - window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - g_object_ref_sink (window); - gtk_window_set_title (GTK_WINDOW (window), "Context"); - gtk_window_set_role (GTK_WINDOW (window), "context"); - gtk_window_set_type_hint (GTK_WINDOW (window), - GDK_WINDOW_TYPE_HINT_UTILITY); - gtk_window_set_default_size (GTK_WINDOW (window), 200, 500); - g_signal_connect (G_OBJECT (window), - "delete-event", - G_CALLBACK (props_window_delete_event_cb), - self); - - layout = gtk_vbox_new (FALSE, 3); - g_object_ref_sink (layout); - gtk_widget_show (layout); - gtk_container_set_border_width (GTK_CONTAINER (layout), 6); - - gtk_container_add (GTK_CONTAINER (window), layout); - - propsPane = [[PropertiesPane alloc] init]; - gtk_box_pack_start (GTK_BOX (layout), [propsPane gtkWidget], - TRUE, TRUE, 0); - - GtkWidget *sep = gtk_hseparator_new (); - gtk_widget_show (sep); - gtk_box_pack_start (GTK_BOX (layout), sep, - FALSE, FALSE, 0); - - selPane = [[SelectionPane alloc] initWithNodeStylesModel:nsm - andEdgeStylesModel:esm]; - gtk_box_pack_start (GTK_BOX (layout), [selPane gtkWidget], - FALSE, FALSE, 0); - - // hack to position the context window somewhere sensible - // (upper right) - gtk_window_parse_geometry (GTK_WINDOW (window), "-0+0"); - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - g_object_unref (layout); - g_object_unref (window); - - [propsPane release]; - - [super dealloc]; -} - -- (TikzDocument*) document { - return [propsPane document]; -} - -- (void) setDocument:(TikzDocument*)doc { - [propsPane setDocument:doc]; - [selPane setDocument:doc]; -} - -- (BOOL) visible { - return gtk_widget_get_visible (window); -} - -- (void) setVisible:(BOOL)visible { - gtk_widget_set_visible (window, visible); -} - -- (void) present { - gtk_window_present (GTK_WINDOW (window)); -} - -- (void) attachToWindow:(Window*)parent { - utility_window_attach (GTK_WINDOW (window), [parent gtkWindow]); -} - -- (void) loadConfiguration:(Configuration*)config { - [propsPane loadConfiguration:config]; - [selPane loadConfiguration:config]; - - if ([config hasGroup:@"ContextWindow"]) { - tz_restore_window (GTK_WINDOW (window), - [config integerEntry:@"x" inGroup:@"ContextWindow"], - [config integerEntry:@"y" inGroup:@"ContextWindow"], - [config integerEntry:@"w" inGroup:@"ContextWindow"], - [config integerEntry:@"h" inGroup:@"ContextWindow"]); - } - [self setVisible:[config booleanEntry:@"visible" - inGroup:@"ContextWindow" - withDefault:YES]]; -} - -- (void) saveConfiguration:(Configuration*)config { - gint x, y, w, h; - - gtk_window_get_position (GTK_WINDOW (window), &x, &y); - gtk_window_get_size (GTK_WINDOW (window), &w, &h); - - [config setIntegerEntry:@"x" inGroup:@"ContextWindow" value:x]; - [config setIntegerEntry:@"y" inGroup:@"ContextWindow" value:y]; - [config setIntegerEntry:@"w" inGroup:@"ContextWindow" value:w]; - [config setIntegerEntry:@"h" inGroup:@"ContextWindow" value:h]; - [config setBooleanEntry:@"visible" - inGroup:@"ContextWindow" - value:[self visible]]; - - [propsPane saveConfiguration:config]; - [selPane saveConfiguration:config]; -} - -@end - -static gboolean props_window_delete_event_cb (GtkWidget *widget, GdkEvent *event, ContextWindow *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window setVisible:NO]; - [pool drain]; - return TRUE; -} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit/src/gtk/CreateEdgeTool.h b/tikzit/src/gtk/CreateEdgeTool.h deleted file mode 100644 index d33efce..0000000 --- a/tikzit/src/gtk/CreateEdgeTool.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "Tool.h" - -@class EdgeStyle; -@class EdgeStylesModel; -@class EdgeStyleSelector; -@class Node; -@class StyleManager; - -@interface CreateEdgeTool : NSObject { - GraphRenderer *renderer; - EdgeStyleSelector *stylePicker; - GtkWidget *configWidget; - Node *sourceNode; - NSPoint sourceNodeScreenPoint; - NSPoint halfEdgeEnd; -} - -@property (retain) EdgeStyle *activeStyle; - -+ (id) toolWithStyleManager:(StyleManager*)sm; -- (id) initWithStyleManager:(StyleManager*)sm; -+ (id) toolWithEdgeStylesModel:(EdgeStylesModel*)esm; -- (id) initWithEdgeStylesModel:(EdgeStylesModel*)esm; -@end - - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/CreateEdgeTool.m b/tikzit/src/gtk/CreateEdgeTool.m deleted file mode 100644 index f3fb2c0..0000000 --- a/tikzit/src/gtk/CreateEdgeTool.m +++ /dev/null @@ -1,226 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "CreateEdgeTool.h" - -#import "Configuration.h" -#import "EdgeStyleSelector.h" -#import "EdgeStylesModel.h" -#import "GraphRenderer.h" -#import "TikzDocument.h" -#import "tzstockitems.h" - -static void clear_style_button_cb (GtkButton *widget, - EdgeStyleSelector *selector); - -@implementation CreateEdgeTool -- (NSString*) name { return @"Create Edge"; } -- (const gchar*) stockId { return TIKZIT_STOCK_CREATE_EDGE; } -- (NSString*) helpText { return @"Create new edges"; } -- (NSString*) shortcut { return @"e"; } -@synthesize activeRenderer=renderer; -@synthesize configurationWidget=configWidget; - -+ (id) toolWithStyleManager:(StyleManager*)sm { - return [[[self alloc] initWithStyleManager:sm] autorelease]; -} - -+ (id) toolWithEdgeStylesModel:(EdgeStylesModel*)esm { - return [[[self alloc] initWithEdgeStylesModel:esm] autorelease]; -} - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithStyleManager:(StyleManager*)sm { - return [self initWithEdgeStylesModel:[EdgeStylesModel modelWithStyleManager:sm]]; -} - -- (id) initWithEdgeStylesModel:(EdgeStylesModel*)esm { - self = [super init]; - - if (self) { - stylePicker = [[EdgeStyleSelector alloc] initWithModel:esm]; - - configWidget = gtk_vbox_new (FALSE, 0); - g_object_ref_sink (configWidget); - - GtkWidget *label = gtk_label_new ("Edge style:"); - gtk_widget_show (label); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_box_pack_start (GTK_BOX (configWidget), - label, - FALSE, - FALSE, - 0); - - GtkWidget *selWindow = gtk_scrolled_window_new (NULL, NULL); - gtk_widget_show (selWindow); - gtk_container_add (GTK_CONTAINER (selWindow), - [stylePicker widget]); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (selWindow), - GTK_POLICY_NEVER, - GTK_POLICY_AUTOMATIC); - gtk_widget_show ([stylePicker widget]); - - GtkWidget *selectorFrame = gtk_frame_new (NULL); - gtk_widget_show (selectorFrame); - gtk_box_pack_start (GTK_BOX (configWidget), - selectorFrame, - TRUE, - TRUE, - 0); - gtk_container_add (GTK_CONTAINER (selectorFrame), - selWindow); - - GtkWidget *button = gtk_button_new_with_label ("No style"); - gtk_widget_show (button); - gtk_box_pack_start (GTK_BOX (configWidget), - button, - FALSE, - FALSE, - 0); - g_signal_connect (G_OBJECT (button), - "clicked", - G_CALLBACK (clear_style_button_cb), - stylePicker); - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - [renderer release]; - [stylePicker release]; - [sourceNode release]; - - g_object_unref (G_OBJECT (configWidget)); - - [super dealloc]; -} - -- (EdgeStyle*) activeStyle { - return [stylePicker selectedStyle]; -} - -- (void) setActiveStyle:(EdgeStyle*)style { - return [stylePicker setSelectedStyle:style]; -} - -- (void) invalidateHalfEdge { - NSRect invRect = NSRectAroundPoints(sourceNodeScreenPoint, halfEdgeEnd); - [renderer invalidateRect:NSInsetRect (invRect, -2.0f, -2.0f)]; -} - -- (void) mousePressAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { - if (button != LeftButton) - return; - - sourceNode = [renderer anyNodeAt:pos]; - if (sourceNode != nil) { - Transformer *transformer = [[renderer surface] transformer]; - sourceNodeScreenPoint = [transformer toScreen:[sourceNode point]]; - halfEdgeEnd = pos; - [renderer setNode:sourceNode highlighted:YES]; - } -} - -- (void) mouseMoveTo:(NSPoint)pos withButtons:(MouseButton)buttons andMask:(InputMask)mask { - if (!(buttons & LeftButton)) - return; - if (sourceNode == nil) - return; - - [self invalidateHalfEdge]; - - [renderer clearHighlightedNodes]; - [renderer setNode:sourceNode highlighted:YES]; - halfEdgeEnd = pos; - Node *targ = [renderer anyNodeAt:pos]; - if (targ != nil) { - [renderer setNode:targ highlighted:YES]; - } - - [self invalidateHalfEdge]; -} - -- (void) mouseReleaseAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { - if (button != LeftButton) - return; - if (sourceNode == nil) - return; - - [renderer clearHighlightedNodes]; - [self invalidateHalfEdge]; - - Node *targ = [renderer anyNodeAt:pos]; - if (targ != nil) { - Edge *edge = [Edge edgeWithSource:sourceNode andTarget:targ]; - [edge setStyle:[self activeStyle]]; - [[renderer document] addEdge:edge]; - [renderer invalidateEdge:edge]; - } - - sourceNode = nil; -} - -- (void) renderWithContext:(id)context onSurface:(id)surface { - if (sourceNode == nil) { - return; - } - [context saveState]; - - [context setLineWidth:1.0]; - [context startPath]; - [context moveTo:sourceNodeScreenPoint]; - [context lineTo:halfEdgeEnd]; - [context strokePathWithColor:MakeRColor (0, 0, 0, 0.5)]; - - [context restoreState]; -} - -- (StyleManager*) styleManager { - return [[stylePicker model] styleManager]; -} - -- (void) loadConfiguration:(Configuration*)config { - NSString *styleName = [config stringEntry:@"ActiveStyle" - inGroup:@"CreateEdgeTool" - withDefault:nil]; - [self setActiveStyle:[[self styleManager] edgeStyleForName:styleName]]; -} - -- (void) saveConfiguration:(Configuration*)config { - [config setStringEntry:@"ActiveStyle" - inGroup:@"CreateEdgeTool" - value:[[self activeStyle] name]]; -} -@end - -static void clear_style_button_cb (GtkButton *widget, - EdgeStyleSelector *selector) -{ - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [selector setSelectedStyle:nil]; - [pool drain]; -} - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/CreateNodeTool.h b/tikzit/src/gtk/CreateNodeTool.h deleted file mode 100644 index 94d6b31..0000000 --- a/tikzit/src/gtk/CreateNodeTool.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import -#import "Tool.h" - -@class NodeStyle; -@class NodeStyleSelector; -@class NodeStylesModel; -@class StyleManager; - -@interface CreateNodeTool : NSObject { - GraphRenderer *renderer; - NodeStyleSelector *stylePicker; - GtkWidget *configWidget; -} - -@property (retain) NodeStyle *activeStyle; - -+ (id) toolWithStyleManager:(StyleManager*)sm; -- (id) initWithStyleManager:(StyleManager*)sm; -+ (id) toolWithNodeStylesModel:(NodeStylesModel*)nsm; -- (id) initWithNodeStylesModel:(NodeStylesModel*)nsm; -@end - - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/CreateNodeTool.m b/tikzit/src/gtk/CreateNodeTool.m deleted file mode 100644 index 77b24f0..0000000 --- a/tikzit/src/gtk/CreateNodeTool.m +++ /dev/null @@ -1,169 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "CreateNodeTool.h" - -#import "Configuration.h" -#import "GraphRenderer.h" -#import "NodeStyleSelector.h" -#import "NodeStylesModel.h" -#import "TikzDocument.h" -#import "tzstockitems.h" - -static void clear_style_button_cb (GtkButton *widget, - NodeStyleSelector *selector); - -@implementation CreateNodeTool -- (NSString*) name { return @"Create Node"; } -- (const gchar*) stockId { return TIKZIT_STOCK_CREATE_NODE; } -- (NSString*) helpText { return @"Create new nodes"; } -- (NSString*) shortcut { return @"n"; } -@synthesize activeRenderer=renderer; -@synthesize configurationWidget=configWidget; - -+ (id) toolWithStyleManager:(StyleManager*)sm { - return [[[self alloc] initWithStyleManager:sm] autorelease]; -} - -+ (id) toolWithNodeStylesModel:(NodeStylesModel*)nsm { - return [[[self alloc] initWithNodeStylesModel:nsm] autorelease]; -} - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithStyleManager:(StyleManager*)sm { - return [self initWithNodeStylesModel:[NodeStylesModel modelWithStyleManager:sm]]; -} - -- (id) initWithNodeStylesModel:(NodeStylesModel*)nsm { - self = [super init]; - - if (self) { - stylePicker = [[NodeStyleSelector alloc] initWithModel:nsm]; - - configWidget = gtk_vbox_new (FALSE, 0); - g_object_ref_sink (configWidget); - - GtkWidget *label = gtk_label_new ("Node style:"); - gtk_widget_show (label); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_box_pack_start (GTK_BOX (configWidget), - label, - FALSE, - FALSE, - 0); - - GtkWidget *selWindow = gtk_scrolled_window_new (NULL, NULL); - gtk_widget_show (selWindow); - gtk_container_add (GTK_CONTAINER (selWindow), - [stylePicker widget]); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (selWindow), - GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); - gtk_widget_show ([stylePicker widget]); - - GtkWidget *selectorFrame = gtk_frame_new (NULL); - gtk_widget_show (selectorFrame); - gtk_box_pack_start (GTK_BOX (configWidget), - selectorFrame, - TRUE, - TRUE, - 0); - gtk_container_add (GTK_CONTAINER (selectorFrame), - selWindow); - - GtkWidget *button = gtk_button_new_with_label ("No style"); - gtk_widget_show (button); - gtk_box_pack_start (GTK_BOX (configWidget), - button, - FALSE, - FALSE, - 0); - g_signal_connect (G_OBJECT (button), - "clicked", - G_CALLBACK (clear_style_button_cb), - stylePicker); - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - [renderer release]; - [stylePicker release]; - - g_object_unref (G_OBJECT (configWidget)); - - [super dealloc]; -} - -- (NodeStyle*) activeStyle { - return [stylePicker selectedStyle]; -} - -- (void) setActiveStyle:(NodeStyle*)style { - return [stylePicker setSelectedStyle:style]; -} - -// FIXME: create node on press, and drag it around? -- (void) mousePressAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask {} - -- (void) mouseReleaseAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { - if (button != LeftButton) - return; - - Transformer *transformer = [renderer transformer]; - NSPoint nodePoint = [transformer fromScreen:[[renderer grid] snapScreenPoint:pos]]; - Node *node = [Node nodeWithPoint:nodePoint]; - [node setStyle:[self activeStyle]]; - [[renderer document] addNode:node]; -} - -- (void) renderWithContext:(id)context onSurface:(id)surface {} - -- (StyleManager*) styleManager { - return [[stylePicker model] styleManager]; -} - -- (void) loadConfiguration:(Configuration*)config { - NSString *styleName = [config stringEntry:@"ActiveStyle" - inGroup:@"CreateNodeTool" - withDefault:nil]; - [self setActiveStyle:[[self styleManager] nodeStyleForName:styleName]]; -} - -- (void) saveConfiguration:(Configuration*)config { - [config setStringEntry:@"ActiveStyle" - inGroup:@"CreateNodeTool" - value:[[self activeStyle] name]]; -} -@end - -static void clear_style_button_cb (GtkButton *widget, - NodeStyleSelector *selector) -{ - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [selector setSelectedStyle:nil]; - [pool drain]; -} - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/DocumentContext.h b/tikzit/src/gtk/DocumentContext.h deleted file mode 100644 index e4c1065..0000000 --- a/tikzit/src/gtk/DocumentContext.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" - -@class TikzDocument; - -@interface DocumentContext { - TikzDocument *document; - GraphRenderer *renderSurface; -} - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/Edge+Render.h b/tikzit/src/gtk/Edge+Render.h deleted file mode 100644 index e88b28a..0000000 --- a/tikzit/src/gtk/Edge+Render.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "Edge.h" -#import "RenderContext.h" -#import "Surface.h" - -@interface Edge (Render) - -+ (float) controlPointRadius; -- (void) renderControlsInContext:(id)context withTransformer:(Transformer*)transformer; -- (void) renderBasicEdgeInContext:(id)context withTransformer:(Transformer*)t selected:(BOOL)selected; -- (void) renderToSurface:(id)surface withContext:(id)context selected:(BOOL)selected; -- (NSRect) renderedBoundsWithTransformer:(Transformer*)t whenSelected:(BOOL)selected; -- (BOOL) hitByPoint:(NSPoint)p onSurface:(id)surface withFuzz:(float)fuzz; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/Edge+Render.m b/tikzit/src/gtk/Edge+Render.m deleted file mode 100644 index 3cc2a14..0000000 --- a/tikzit/src/gtk/Edge+Render.m +++ /dev/null @@ -1,267 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * Copyright 2010 Chris Heunen - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "Edge+Render.h" -#import "Node+Render.h" -#import "../common/util.h" - -static const float edgeWidth = 2.0; -static const float cpRadius = 3.0; -static const float cpLineWidth = 1.0; - -@implementation Edge (Render) - -+ (float) controlPointRadius { - return cpRadius; -} - -- (float) controlDistance { - const float dx = (targ.x - src.x); - const float dy = (targ.y - src.y); - if (dx == 0 && dy == 0) { - return weight; - } else { - return NSDistanceBetweenPoints(src, targ) * weight; - } -} - -- (void) renderControlsInContext:(id)context withTransformer:(Transformer*)transformer { - [context saveState]; - - [self updateControls]; - - NSPoint c_source = [transformer toScreen:src]; - NSPoint c_target = [transformer toScreen:targ]; - NSPoint c_mid = [transformer toScreen:mid]; - - const float dx = (c_target.x - c_source.x); - const float dy = (c_target.y - c_source.y); - - [context setLineWidth:cpLineWidth]; - RColor fillColor = MakeRColor (1.0, 1.0, 1.0, 0.5); - - // draw a circle at the mid point - [context startPath]; - [context circleAt:c_mid withRadius:cpRadius]; - [context strokePathWithColor:MakeSolidRColor(0, 0, 1) andFillWithColor:fillColor]; - - //[context setAntialiasMode:AntialiasDisabled]; - - // size of control circles - float c_dist = 0.0f; - if (dx == 0 && dy == 0) { - c_dist = [transformer scaleToScreen:weight]; - } else { - c_dist = NSDistanceBetweenPoints(c_source, c_target) * weight; - } - - // basic bend is blue, in-out is green - RColor controlTrackColor; - if ([self bendMode] == EdgeBendModeBasic) { - controlTrackColor = MakeRColor (0.0, 0.0, 1.0, 0.4); - } else { - controlTrackColor = MakeRColor (0.0, 0.7, 0.0, 0.4); - } - - [context startPath]; - [context circleAt:c_source withRadius:c_dist]; - if (dx != 0 || dy != 0) { - [context circleAt:c_target withRadius:c_dist]; - } - [context strokePathWithColor:controlTrackColor]; - - RColor handleColor = MakeRColor (1.0, 0.0, 1.0, 0.6); - if ([self bendMode] == EdgeBendModeBasic) { - if (bend % 45 != 0) { - handleColor = MakeRColor (0.0, 0.0, 0.1, 0.4); - } - } else if ([self bendMode] == EdgeBendModeInOut) { - if (outAngle % 45 != 0) { - handleColor = MakeRColor (0.0, 0.7, 0.0, 0.4); - } - } - - NSPoint c_cp1 = [transformer toScreen:cp1]; - [context moveTo:c_source]; - [context lineTo:c_cp1]; - [context circleAt:c_cp1 withRadius:cpRadius]; - [context strokePathWithColor:handleColor]; - - if ([self bendMode] == EdgeBendModeInOut) { - // recalculate color based on inAngle - if (inAngle % 45 == 0) { - handleColor = MakeRColor (1.0, 0.0, 1.0, 0.6); - } else { - handleColor = MakeRColor (0.0, 0.7, 0.0, 0.4); - } - } - - NSPoint c_cp2 = [transformer toScreen:cp2]; - [context moveTo:c_target]; - [context lineTo:c_cp2]; - [context circleAt:c_cp2 withRadius:cpRadius]; - [context strokePathWithColor:handleColor]; - - [context restoreState]; -} - -- (void) renderArrowStrokePathInContext:(id)context withTransformer:(Transformer*)transformer color:(RColor)color { - - if ([self style] != nil) { - switch ([[self style] headStyle]) { - case AH_None: - break; - case AH_Plain: - [context startPath]; - [context moveTo:[transformer toScreen:[self leftHeadNormal]]]; - [context lineTo:[transformer toScreen:head]]; - [context lineTo:[transformer toScreen:[self rightHeadNormal]]]; - [context strokePathWithColor:color]; - break; - case AH_Latex: - [context startPath]; - [context moveTo:[transformer toScreen:[self leftHeadNormal]]]; - [context lineTo:[transformer toScreen:head]]; - [context lineTo:[transformer toScreen:[self rightHeadNormal]]]; - [context closeSubPath]; - [context strokePathWithColor:color andFillWithColor:color]; - break; - } - switch ([[self style] tailStyle]) { - case AH_None: - break; - case AH_Plain: - [context startPath]; - [context moveTo:[transformer toScreen:[self leftTailNormal]]]; - [context lineTo:[transformer toScreen:tail]]; - [context lineTo:[transformer toScreen:[self rightTailNormal]]]; - [context strokePathWithColor:color]; - break; - case AH_Latex: - [context startPath]; - [context moveTo:[transformer toScreen:[self leftTailNormal]]]; - [context lineTo:[transformer toScreen:tail]]; - [context lineTo:[transformer toScreen:[self rightTailNormal]]]; - [context closeSubPath]; - [context strokePathWithColor:color andFillWithColor:color]; - break; - } - } -} - -- (void) createStrokePathInContext:(id)context withTransformer:(Transformer*)transformer { - NSPoint c_tail = [transformer toScreen:tail]; - NSPoint c_cp1 = [transformer toScreen:cp1]; - NSPoint c_cp2 = [transformer toScreen:cp2]; - NSPoint c_head = [transformer toScreen:head]; - - [context startPath]; - [context moveTo:c_tail]; - [context curveTo:c_head withCp1:c_cp1 andCp2:c_cp2]; - - if ([self style] != nil) { - // draw edge decoration - switch ([[self style] decorationStyle]) { - case ED_None: - break; - case ED_Tick: - [context moveTo:[transformer toScreen:[self leftNormal]]]; - [context lineTo:[transformer toScreen:[self rightNormal]]]; - break; - case ED_Arrow: - [context moveTo:[transformer toScreen:[self leftNormal]]]; - [context lineTo:[transformer toScreen:[self midTan]]]; - [context lineTo:[transformer toScreen:[self rightNormal]]]; - break; - } - - } -} - -- (RColor) color { - if (style) { - return [[style colorRGB] rColor]; - } else { - return BlackRColor; - } -} - -- (void) renderBasicEdgeInContext:(id)context withTransformer:(Transformer*)t selected:(BOOL)selected { - [self updateControls]; - [context saveState]; - - const CGFloat lineWidth = style ? [style thickness] : edgeWidth; - [context setLineWidth:lineWidth]; - RColor color = [self color]; - if (selected) { - color.alpha = 0.5; - } - - [self createStrokePathInContext:context withTransformer:t]; - [context strokePathWithColor:color]; - - [self renderArrowStrokePathInContext:context withTransformer:t color:color]; - - [context restoreState]; -} - -- (void) renderToSurface:(id )surface withContext:(id)context selected:(BOOL)selected { - [self renderBasicEdgeInContext:context withTransformer:[surface transformer] selected:selected]; - - if (selected) { - [self renderControlsInContext:context withTransformer:[surface transformer]]; - } - - if ([self hasEdgeNode]) { - NSPoint labelPt = [[surface transformer] toScreen:[self mid]]; - [[self edgeNode] renderLabelAt:labelPt - withContext:context]; - } -} - -- (NSRect) renderedBoundsWithTransformer:(Transformer*)t whenSelected:(BOOL)selected { - if (selected) { - float c_dist = [self controlDistance] + cpRadius; // include handle - NSRect cp1circ = NSMakeRect (head.x - c_dist, head.y - c_dist, 2*c_dist, 2*c_dist); - NSRect cp2circ = NSMakeRect (tail.x - c_dist, tail.y - c_dist, 2*c_dist, 2*c_dist); - NSRect rect = NSUnionRect ([self boundingRect], NSUnionRect (cp1circ, cp2circ)); - return [t rectToScreen:rect]; - } else { - return [t rectToScreen:[self boundingRect]]; - } -} - -- (BOOL) hitByPoint:(NSPoint)p onSurface:(id)surface withFuzz:(float)fuzz { - [self updateControls]; - - NSRect boundingRect = [[surface transformer] rectToScreen:[self boundingRect]]; - if (!NSPointInRect(p, NSInsetRect(boundingRect, -fuzz, -fuzz))) { - return NO; - } - - id cr = [surface createRenderContext]; - - [cr setLineWidth:edgeWidth + 2 * fuzz]; - [self createStrokePathInContext:cr withTransformer:[surface transformer]]; - - return [cr strokeIncludesPoint:p]; -} - -@end - -// vim:ft=objc:ts=4:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/EdgeStyle+Gtk.h b/tikzit/src/gtk/EdgeStyle+Gtk.h deleted file mode 100644 index 4323593..0000000 --- a/tikzit/src/gtk/EdgeStyle+Gtk.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "EdgeStyle.h" -#import - -@interface EdgeStyle (Gtk) - -- (GdkColor) color; -- (void) setColor:(GdkColor)color; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/EdgeStyle+Gtk.m b/tikzit/src/gtk/EdgeStyle+Gtk.m deleted file mode 100644 index 886329e..0000000 --- a/tikzit/src/gtk/EdgeStyle+Gtk.m +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "EdgeStyle+Gtk.h" -#import "ColorRGB+Gtk.h" - -@implementation EdgeStyle (Gtk) - -- (GdkColor) color { - return [[self colorRGB] gdkColor]; -} - -- (void) setColor:(GdkColor)color { - [self setColorRGB:[ColorRGB colorWithGdkColor:color]]; -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/EdgeStyle+Storage.h b/tikzit/src/gtk/EdgeStyle+Storage.h deleted file mode 100644 index 74881f3..0000000 --- a/tikzit/src/gtk/EdgeStyle+Storage.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "EdgeStyle.h" -#import "Configuration.h" - -@interface EdgeStyle (Storage) - -- (id) initFromConfigurationGroup:(NSString*)groupName config:(Configuration*)configFile; -- (void) storeToConfigurationGroup:(NSString*)groupName config:(Configuration*)configFile; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/EdgeStyle+Storage.m b/tikzit/src/gtk/EdgeStyle+Storage.m deleted file mode 100644 index 45e2a20..0000000 --- a/tikzit/src/gtk/EdgeStyle+Storage.m +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "EdgeStyle+Storage.h" -#import "ColorRGB+IntegerListStorage.h" - -@implementation EdgeStyle (Storage) - -- (id) initFromConfigurationGroup:(NSString*)groupName config:(Configuration*)configFile { - self = [self init]; - - if (self) { - [self setName:[configFile stringEntry:@"Name" inGroup:groupName withDefault:name]]; - [self setCategory:[configFile stringEntry:@"Category" inGroup:groupName withDefault:category]]; - headStyle = [configFile integerEntry:@"HeadStyle" inGroup:groupName withDefault:headStyle]; - tailStyle = [configFile integerEntry:@"TailStyle" inGroup:groupName withDefault:tailStyle]; - decorationStyle = [configFile integerEntry:@"DecorationStyle" inGroup:groupName withDefault:decorationStyle]; - thickness = [configFile doubleEntry:@"Thickness" inGroup:groupName withDefault:thickness]; - [self setColorRGB: - [ColorRGB colorFromValueList: - [configFile integerListEntry:@"Color" - inGroup:groupName - withDefault:[colorRGB valueList]]]]; - } - - return self; -} - -- (void) storeToConfigurationGroup:(NSString*)groupName config:(Configuration*)configFile { - [configFile setStringEntry:@"Name" inGroup:groupName value:name]; - [configFile setStringEntry:@"Category" inGroup:groupName value:category]; - [configFile setIntegerEntry:@"HeadStyle" inGroup:groupName value:headStyle]; - [configFile setIntegerEntry:@"TailStyle" inGroup:groupName value:tailStyle]; - [configFile setIntegerEntry:@"DecorationStyle" inGroup:groupName value:decorationStyle]; - [configFile setDoubleEntry:@"Thickness" inGroup:groupName value:thickness]; - [configFile setIntegerListEntry:@"Color" inGroup:groupName value:[[self colorRGB] valueList]]; -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/EdgeStyleEditor.h b/tikzit/src/gtk/EdgeStyleEditor.h deleted file mode 100644 index 2224bbb..0000000 --- a/tikzit/src/gtk/EdgeStyleEditor.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class EdgeStyle; - -@interface EdgeStyleEditor: NSObject { - EdgeStyle *style; - GtkTable *table; - GtkEntry *nameEdit; - GtkComboBox *decorationCombo; - GtkComboBox *headArrowCombo; - GtkComboBox *tailArrowCombo; - GtkColorButton *colorButton; - GtkWidget *makeColorTexSafeButton; - GtkAdjustment *thicknessAdj; - BOOL blockSignals; -} - -@property (retain) EdgeStyle *style; -@property (readonly) GtkWidget *widget; - -- (id) init; - -- (void) selectNameField; - -@end - -// vim:ft=objc:ts=4:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit/src/gtk/EdgeStyleEditor.m b/tikzit/src/gtk/EdgeStyleEditor.m deleted file mode 100644 index c7ca8bd..0000000 --- a/tikzit/src/gtk/EdgeStyleEditor.m +++ /dev/null @@ -1,499 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "EdgeStyleEditor.h" - -#import "EdgeStyle.h" -#import "EdgeStyle+Gtk.h" -#import "Shape.h" - -#include - -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wpointer-sign" -#import "edgedecdata.m" -#pragma GCC diagnostic pop - -// {{{ Data Types -enum { - DEC_NAME_COL = 0, - DEC_PREVIEW_COL, - DEC_VALUE_COL, - DEC_N_COLS -}; - -struct dec_info { - const gchar *name; - const GdkPixdata *pixdata; - int value; -}; -static struct dec_info ed_entries[] = { - { "None", &ED_none_pixdata, ED_None }, - { "Arrow", &ED_arrow_pixdata, ED_Arrow }, - { "Tick", &ED_tick_pixdata, ED_Tick } -}; -static guint n_ed_entries = G_N_ELEMENTS (ed_entries); -static struct dec_info ah_head_entries[] = { - { "None", &AH_none_pixdata, AH_None }, - { "Plain", &AH_plain_head_pixdata, AH_Plain }, - { "Latex", &AH_latex_head_pixdata, AH_Latex } -}; -static guint n_ah_head_entries = G_N_ELEMENTS (ah_head_entries); -static struct dec_info ah_tail_entries[] = { - { "None", &AH_none_pixdata, AH_None }, - { "Plain", &AH_plain_tail_pixdata, AH_Plain }, - { "Latex", &AH_latex_tail_pixdata, AH_Latex } -}; -static guint n_ah_tail_entries = G_N_ELEMENTS (ah_tail_entries); - -static const guint row_count = 6; - -// }}} -// {{{ Internal interfaces -// {{{ GTK+ Callbacks -static void style_name_edit_changed_cb (GtkEditable *widget, EdgeStyleEditor *editor); -static void decoration_combo_changed_cb (GtkComboBox *widget, EdgeStyleEditor *editor); -static void head_arrow_combo_changed_cb (GtkComboBox *widget, EdgeStyleEditor *editor); -static void tail_arrow_combo_changed_cb (GtkComboBox *widget, EdgeStyleEditor *editor); -static void thickness_adjustment_changed_cb (GtkAdjustment *widget, EdgeStyleEditor *editor); -static void color_changed_cb (GtkColorButton *widget, EdgeStyleEditor *editor); -static void make_color_safe_button_clicked_cb (GtkButton *widget, EdgeStyleEditor *editor); -// }}} -// {{{ Notifications - -@interface EdgeStyleEditor (Notifications) -- (void) nameChangedTo:(NSString*)value; -- (void) edgeDecorationChangedTo:(EdgeDectorationStyle)value; -- (void) headArrowChangedTo:(ArrowHeadStyle)value; -- (void) tailArrowChangedTo:(ArrowHeadStyle)value; -- (void) thicknessChangedTo:(double)value; -- (void) makeColorTexSafe; -- (void) colorChangedTo:(GdkColor)value; -@end - -// }}} -// {{{ Private - -@interface EdgeStyleEditor (Private) -- (void) load:(guint)count decorationStylesFrom:(struct dec_info*)info into:(GtkListStore*)list; -- (void) clearDecCombo:(GtkComboBox*)combo; -- (void) setDecCombo:(GtkComboBox*)combo toValue:(int)value; -@end - -// }}} -// }}} -// {{{ API - -@implementation EdgeStyleEditor - -- (void) _addWidget:(GtkWidget*)w withLabel:(gchar *)label atRow:(guint)row { - NSAssert(row < row_count, @"row_count is wrong!"); - - GtkWidget *l = gtk_label_new (label); - gtk_misc_set_alignment (GTK_MISC (l), 0, 0.5); - gtk_widget_show (l); - gtk_widget_show (w); - - gtk_table_attach (table, l, - 0, 1, row, row+1, // l, r, t, b - GTK_FILL, // x opts - GTK_FILL | GTK_EXPAND, // y opts - 5, // x padding - 0); // y padding - - gtk_table_attach (table, w, - 1, 2, row, row+1, // l, r, t, b - GTK_FILL | GTK_EXPAND, // x opts - GTK_FILL | GTK_EXPAND, // y opts - 0, // x padding - 0); // y padding -} - -- (GtkComboBox*) _createDecComboWithEntries:(struct dec_info*)entries count:(guint)n { - GtkListStore *store = gtk_list_store_new (DEC_N_COLS, G_TYPE_STRING, GDK_TYPE_PIXBUF, G_TYPE_INT); - [self load:n decorationStylesFrom:entries into:store]; - - GtkComboBox *combo = GTK_COMBO_BOX (gtk_combo_box_new_with_model (GTK_TREE_MODEL (store))); - g_object_unref (store); - GtkCellRenderer *cellRend = gtk_cell_renderer_pixbuf_new (); - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), - cellRend, - TRUE); - gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo), cellRend, "pixbuf", DEC_PREVIEW_COL); - g_object_ref_sink (combo); - - return combo; -} - -- (GtkWidget*) _createMakeColorTexSafeButton { - GtkWidget *b = gtk_button_new (); - GtkWidget *icon = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_BUTTON); - gtk_widget_show (icon); - gtk_container_add (GTK_CONTAINER (b), icon); - NSString *ttip = @"The colour is not a predefined TeX colour.\nClick here to choose the nearest TeX-safe colour."; - gtk_widget_set_tooltip_text (b, [ttip UTF8String]); - return b; -} - -- (id) init { - self = [super init]; - - if (self != nil) { - style = nil; - table = GTK_TABLE (gtk_table_new (row_count, 2, FALSE)); - gtk_table_set_col_spacings (table, 6); - gtk_table_set_row_spacings (table, 6); - gtk_widget_set_sensitive (GTK_WIDGET (table), FALSE); - blockSignals = NO; - - /** - * Name - */ - nameEdit = GTK_ENTRY (gtk_entry_new ()); - g_object_ref_sink (nameEdit); - [self _addWidget:GTK_WIDGET (nameEdit) - withLabel:"Name" - atRow:0]; - g_signal_connect (G_OBJECT (nameEdit), - "changed", - G_CALLBACK (style_name_edit_changed_cb), - self); - - - /** - * Edge decoration style - */ - decorationCombo = [self _createDecComboWithEntries:ed_entries count:n_ed_entries]; - [self _addWidget:GTK_WIDGET (decorationCombo) - withLabel:"Decoration" - atRow:1]; - g_signal_connect (G_OBJECT (decorationCombo), - "changed", - G_CALLBACK (decoration_combo_changed_cb), - self); - - - /** - * Head arrow style - */ - headArrowCombo = [self _createDecComboWithEntries:ah_head_entries count:n_ah_head_entries]; - [self _addWidget:GTK_WIDGET (headArrowCombo) - withLabel:"Arrow head" - atRow:2]; - g_signal_connect (G_OBJECT (headArrowCombo), - "changed", - G_CALLBACK (head_arrow_combo_changed_cb), - self); - - - /** - * Tail arrow style - */ - tailArrowCombo = [self _createDecComboWithEntries:ah_tail_entries count:n_ah_tail_entries]; - [self _addWidget:GTK_WIDGET (tailArrowCombo) - withLabel:"Arrow tail" - atRow:3]; - g_signal_connect (G_OBJECT (tailArrowCombo), - "changed", - G_CALLBACK (tail_arrow_combo_changed_cb), - self); - - - /** - * Colour - */ - GtkWidget *colorBox = gtk_hbox_new (FALSE, 0); - [self _addWidget:colorBox - withLabel:"Colour" - atRow:4]; - colorButton = GTK_COLOR_BUTTON (gtk_color_button_new ()); - g_object_ref_sink (colorButton); - gtk_widget_show (GTK_WIDGET (colorButton)); - gtk_box_pack_start (GTK_BOX (colorBox), GTK_WIDGET (colorButton), - FALSE, FALSE, 0); - makeColorTexSafeButton = [self _createMakeColorTexSafeButton]; - g_object_ref_sink (makeColorTexSafeButton); - gtk_box_pack_start (GTK_BOX (colorBox), makeColorTexSafeButton, - FALSE, FALSE, 0); - g_signal_connect (G_OBJECT (colorButton), - "color-set", - G_CALLBACK (color_changed_cb), - self); - g_signal_connect (G_OBJECT (makeColorTexSafeButton), - "clicked", - G_CALLBACK (make_color_safe_button_clicked_cb), - self); - - - /** - * Thickness - */ - thicknessAdj = GTK_ADJUSTMENT (gtk_adjustment_new ( - 1.0, // value - 0.0, // lower - 50.0, // upper - 0.20, // step - 1.0, // page - 0.0)); // (irrelevant) - g_object_ref_sink (thicknessAdj); - GtkWidget *scaleSpin = gtk_spin_button_new (thicknessAdj, 0.0, 2); - [self _addWidget:scaleSpin - withLabel:"Thickness" - atRow:5]; - g_signal_connect (G_OBJECT (thicknessAdj), - "value-changed", - G_CALLBACK (thickness_adjustment_changed_cb), - self); - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - g_object_unref (nameEdit); - g_object_unref (decorationCombo); - g_object_unref (colorButton); - g_object_unref (makeColorTexSafeButton); - g_object_unref (thicknessAdj); - g_object_unref (table); - [style release]; - - [super dealloc]; -} - -- (EdgeStyle*) style { - return style; -} - -- (void) setStyle:(EdgeStyle*)s { - blockSignals = YES; - EdgeStyle *oldStyle = style; - style = [s retain]; - - if (style != nil) { - gtk_widget_set_sensitive (GTK_WIDGET (table), TRUE); - - gtk_entry_set_text(nameEdit, [[style name] UTF8String]); - - [self setDecCombo:decorationCombo toValue:[style decorationStyle]]; - [self setDecCombo:headArrowCombo toValue:[style headStyle]]; - [self setDecCombo:tailArrowCombo toValue:[style tailStyle]]; - - GdkColor c = [style color]; - gtk_color_button_set_color(colorButton, &c); - gtk_widget_set_visible (makeColorTexSafeButton, ([[style colorRGB] name] == nil)); - - gtk_adjustment_set_value(thicknessAdj, [style thickness]); - } else { - gtk_entry_set_text(nameEdit, ""); - [self clearDecCombo:decorationCombo]; - [self clearDecCombo:headArrowCombo]; - [self clearDecCombo:tailArrowCombo]; - gtk_widget_set_visible (makeColorTexSafeButton, FALSE); - gtk_adjustment_set_value(thicknessAdj, 1.0); - gtk_widget_set_sensitive (GTK_WIDGET (table), FALSE); - } - - [oldStyle release]; - blockSignals = NO; -} - -- (GtkWidget*) widget { - return GTK_WIDGET (table); -} - -- (void) selectNameField { - gtk_widget_grab_focus (GTK_WIDGET (nameEdit)); - gtk_editable_select_region (GTK_EDITABLE (nameEdit), 0, -1); -} - -@end - -// }}} -// {{{ Notifications - -@implementation EdgeStyleEditor (Notifications) -- (void) nameChangedTo:(NSString*)value { - [style setName:value]; -} - -- (void) edgeDecorationChangedTo:(EdgeDectorationStyle)value { - [style setDecorationStyle:value]; -} - -- (void) headArrowChangedTo:(ArrowHeadStyle)value { - [style setHeadStyle:value]; -} - -- (void) tailArrowChangedTo:(ArrowHeadStyle)value { - [style setTailStyle:value]; -} - -- (void) thicknessChangedTo:(double)value { - [style setThickness:(float)value]; -} - -- (void) colorChangedTo:(GdkColor)value { - [style setColor:value]; - gtk_widget_set_visible (makeColorTexSafeButton, - [[style colorRGB] name] == nil); -} - -- (void) makeColorTexSafe { - if (style != nil) { - [[style colorRGB] setToClosestHashed]; - GdkColor color = [style color]; - gtk_color_button_set_color(colorButton, &color); - gtk_widget_set_visible (makeColorTexSafeButton, FALSE); - } -} -@end - -// }}} -// {{{ Private - -@implementation EdgeStyleEditor (Private) -- (BOOL) signalsBlocked { return blockSignals; } - -- (void) load:(guint)count decorationStylesFrom:(struct dec_info*)info into:(GtkListStore*)list { - GtkTreeIter iter; - - for (guint i = 0; i < count; ++i) { - GdkPixbuf *buf = gdk_pixbuf_from_pixdata (info[i].pixdata, FALSE, NULL); - gtk_list_store_append (list, &iter); - gtk_list_store_set (list, &iter, - DEC_NAME_COL, info[i].name, - DEC_PREVIEW_COL, buf, - DEC_VALUE_COL, info[i].value, - -1); - g_object_unref (buf); - } -} - -- (void) clearDecCombo:(GtkComboBox*)combo { - gtk_combo_box_set_active (combo, -1); -} - -- (void) setDecCombo:(GtkComboBox*)combo toValue:(int)value { - GtkTreeModel *model = gtk_combo_box_get_model (combo); - GtkTreeIter iter; - if (gtk_tree_model_get_iter_first (model, &iter)) { - do { - int rowValue; - gtk_tree_model_get (model, &iter, DEC_VALUE_COL, &rowValue, -1); - if (rowValue == value) { - gtk_combo_box_set_active_iter (combo, &iter); - return; - } - } while (gtk_tree_model_iter_next (model, &iter)); - } -} -@end - -// }}} -// {{{ GTK+ callbacks - -static void style_name_edit_changed_cb (GtkEditable *widget, EdgeStyleEditor *editor) { - if ([editor signalsBlocked]) - return; - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - const gchar *contents = gtk_entry_get_text (GTK_ENTRY (widget)); - [editor nameChangedTo:[NSString stringWithUTF8String:contents]]; - - [pool drain]; -} - -static void decoration_combo_changed_cb (GtkComboBox *widget, EdgeStyleEditor *editor) { - if ([editor signalsBlocked]) - return; - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - GtkTreeIter iter; - gtk_combo_box_get_active_iter (widget, &iter); - EdgeDectorationStyle dec = ED_None; - gtk_tree_model_get (gtk_combo_box_get_model (widget), &iter, DEC_VALUE_COL, &dec, -1); - [editor edgeDecorationChangedTo:dec]; - - [pool drain]; -} - -static void head_arrow_combo_changed_cb (GtkComboBox *widget, EdgeStyleEditor *editor) { - if ([editor signalsBlocked]) - return; - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - GtkTreeIter iter; - gtk_combo_box_get_active_iter (widget, &iter); - ArrowHeadStyle dec = AH_None; - gtk_tree_model_get (gtk_combo_box_get_model (widget), &iter, DEC_VALUE_COL, &dec, -1); - [editor headArrowChangedTo:dec]; - - [pool drain]; -} - -static void tail_arrow_combo_changed_cb (GtkComboBox *widget, EdgeStyleEditor *editor) { - if ([editor signalsBlocked]) - return; - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - GtkTreeIter iter; - gtk_combo_box_get_active_iter (widget, &iter); - ArrowHeadStyle dec = AH_None; - gtk_tree_model_get (gtk_combo_box_get_model (widget), &iter, DEC_VALUE_COL, &dec, -1); - [editor tailArrowChangedTo:dec]; - - [pool drain]; -} - -static void thickness_adjustment_changed_cb (GtkAdjustment *adj, EdgeStyleEditor *editor) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor thicknessChangedTo:gtk_adjustment_get_value (adj)]; - [pool drain]; -} - -static void color_changed_cb (GtkColorButton *widget, EdgeStyleEditor *editor) { - if ([editor signalsBlocked]) - return; - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - GdkColor color; - gtk_color_button_get_color (widget, &color); - [editor colorChangedTo:color]; - - [pool drain]; -} - -static void make_color_safe_button_clicked_cb (GtkButton *widget, EdgeStyleEditor *editor) { - if ([editor signalsBlocked]) - return; - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor makeColorTexSafe]; - [pool drain]; -} - -// }}} - -// vim:ft=objc:ts=4:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit/src/gtk/EdgeStyleSelector.h b/tikzit/src/gtk/EdgeStyleSelector.h deleted file mode 100644 index 904bd93..0000000 --- a/tikzit/src/gtk/EdgeStyleSelector.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class EdgeStyle; -@class EdgeStylesModel; -@class StyleManager; - -@interface EdgeStyleSelector: NSObject { - EdgeStylesModel *model; - GtkTreeView *view; -} - -/*! - @property widget - @brief The GTK widget - */ -@property (readonly) GtkWidget *widget; - -/*! - @property model - @brief The model to use. - */ -@property (retain) EdgeStylesModel *model; - -/*! - @property selectedStyle - @brief The selected style. - - When this changes, a SelectedStyleChanged notification will be posted - */ -@property (assign) EdgeStyle *selectedStyle; - -/*! - * Initialise with a new model for the given style manager - */ -- (id) initWithStyleManager:(StyleManager*)m; -/*! - * Initialise with the given model - */ -- (id) initWithModel:(EdgeStylesModel*)model; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit/src/gtk/EdgeStyleSelector.m b/tikzit/src/gtk/EdgeStyleSelector.m deleted file mode 100644 index 6a9db33..0000000 --- a/tikzit/src/gtk/EdgeStyleSelector.m +++ /dev/null @@ -1,143 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "EdgeStyleSelector.h" - -#import "EdgeStylesModel.h" - -// {{{ Internal interfaces -static void selection_changed_cb (GtkTreeSelection *sel, EdgeStyleSelector *mgr); -// }}} -// {{{ API - -@implementation EdgeStyleSelector - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithStyleManager:(StyleManager*)m { - return [self initWithModel:[EdgeStylesModel modelWithStyleManager:m]]; -} -- (id) initWithModel:(EdgeStylesModel*)m { - self = [super init]; - - if (self) { - model = [m retain]; - - view = GTK_TREE_VIEW (gtk_tree_view_new_with_model ([m model])); - gtk_tree_view_set_headers_visible (view, FALSE); - g_object_ref (view); - - GtkCellRenderer *renderer; - GtkTreeViewColumn *column; - renderer = gtk_cell_renderer_pixbuf_new (); - column = gtk_tree_view_column_new_with_attributes ( - "Preview", - renderer, - "pixbuf", EDGE_STYLES_ICON_COL, - NULL); - gtk_tree_view_append_column (view, column); - gtk_tree_view_set_tooltip_column (view, EDGE_STYLES_NAME_COL); - - GtkTreeSelection *sel = gtk_tree_view_get_selection (view); - gtk_tree_selection_set_mode (sel, GTK_SELECTION_SINGLE); - - g_signal_connect (G_OBJECT (sel), - "changed", - G_CALLBACK (selection_changed_cb), - self); - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - g_object_unref (view); - [model release]; - - [super dealloc]; -} - -- (EdgeStylesModel*) model { - return model; -} - -- (void) setModel:(EdgeStylesModel*)m { - if (m == model) - return; - - EdgeStylesModel *oldModel = model; - model = [m retain]; - gtk_tree_view_set_model (view, [model model]); - [oldModel release]; -} - -- (GtkWidget*) widget { - return GTK_WIDGET (view); -} - -- (EdgeStyle*) selectedStyle { - GtkTreeSelection *sel = gtk_tree_view_get_selection (view); - GtkTreeIter iter; - - if (!gtk_tree_selection_get_selected (sel, NULL, &iter)) { - return nil; - } - - EdgeStyle *style = nil; - gtk_tree_model_get ([model model], &iter, EDGE_STYLES_PTR_COL, &style, -1); - - return style; -} - -- (void) setSelectedStyle:(EdgeStyle*)style { - GtkTreeSelection *sel = gtk_tree_view_get_selection (view); - - if (style == nil) { - gtk_tree_selection_unselect_all (sel); - return; - } - - GtkTreePath *path = [model pathFromStyle:style]; - if (path) { - gtk_tree_selection_unselect_all (sel); - gtk_tree_selection_select_path (sel, path); - gtk_tree_path_free (path); - } -} -@end - -// }}} -// {{{ GTK+ callbacks - -static void selection_changed_cb (GtkTreeSelection *sel, EdgeStyleSelector *mgr) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - [[NSNotificationCenter defaultCenter] - postNotificationName:@"SelectedStyleChanged" - object:mgr]; - - [pool drain]; -} -// }}} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker - diff --git a/tikzit/src/gtk/EdgeStylesModel.h b/tikzit/src/gtk/EdgeStylesModel.h deleted file mode 100644 index 1166f92..0000000 --- a/tikzit/src/gtk/EdgeStylesModel.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class EdgeStyle; -@class StyleManager; - -enum { - EDGE_STYLES_NAME_COL = 0, - EDGE_STYLES_ICON_COL, - EDGE_STYLES_PTR_COL, - EDGE_STYLES_N_COLS -}; - -@interface EdgeStylesModel: NSObject { - GtkListStore *store; - StyleManager *styleManager; -} - -/*! - @property model - @brief The GTK+ tree model - */ -@property (readonly) GtkTreeModel *model; - -/*! - @property manager - @brief The StyleManager to use. - */ -@property (retain) StyleManager *styleManager; - -/*! - * Initialise with the given style manager - */ -- (id) initWithStyleManager:(StyleManager*)m; - -+ (id) modelWithStyleManager:(StyleManager*)m; - -- (EdgeStyle*) styleFromPath:(GtkTreePath*)path; -- (GtkTreePath*) pathFromStyle:(EdgeStyle*)style; -- (EdgeStyle*) styleFromIter:(GtkTreeIter*)iter; -- (GtkTreeIter*) iterFromStyle:(EdgeStyle*)style; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/EdgeStylesModel.m b/tikzit/src/gtk/EdgeStylesModel.m deleted file mode 100644 index 2de57ed..0000000 --- a/tikzit/src/gtk/EdgeStylesModel.m +++ /dev/null @@ -1,367 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "EdgeStylesModel.h" - -#import "CairoRenderContext.h" -#import "Edge.h" -#import "Edge+Render.h" -#import "EdgeStyle.h" -#import "Node.h" -#import "StyleManager.h" - -#import "gtkhelpers.h" - -#import - -// {{{ Internal interfaces - -@interface EdgeStylesModel (Notifications) -- (void) edgeStylesReplaced:(NSNotification*)notification; -- (void) edgeStyleAdded:(NSNotification*)notification; -- (void) edgeStyleRemoved:(NSNotification*)notification; -- (void) observeValueForKeyPath:(NSString*)keyPath - ofObject:(id)object - change:(NSDictionary*)change - context:(void*)context; -@end - -@interface EdgeStylesModel (Private) -- (cairo_surface_t*) createEdgeIconSurface; -- (GdkPixbuf*) pixbufOfEdgeInStyle:(EdgeStyle*)style; -- (GdkPixbuf*) pixbufOfEdgeInStyle:(EdgeStyle*)style usingSurface:(cairo_surface_t*)surface; -- (void) addEdgeStyle:(EdgeStyle*)style; -- (void) addEdgeStyle:(EdgeStyle*)style usingSurface:(cairo_surface_t*)surface; -- (void) observeEdgeStyle:(EdgeStyle*)style; -- (void) stopObservingEdgeStyle:(EdgeStyle*)style; -- (void) clearEdgeStylesModel; -- (void) reloadEdgeStyles; -@end - -// }}} -// {{{ API - -@implementation EdgeStylesModel - -+ (id) modelWithStyleManager:(StyleManager*)m { - return [[[self alloc] initWithStyleManager:m] autorelease]; -} - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithStyleManager:(StyleManager*)m { - self = [super init]; - - if (self) { - store = gtk_list_store_new (EDGE_STYLES_N_COLS, - G_TYPE_STRING, - GDK_TYPE_PIXBUF, - G_TYPE_POINTER); - g_object_ref_sink (store); - - [self setStyleManager:m]; - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - [self clearEdgeStylesModel]; - g_object_unref (store); - [styleManager release]; - - [super dealloc]; -} - -- (GtkTreeModel*) model { - return GTK_TREE_MODEL (store); -} - -- (StyleManager*) styleManager { - return styleManager; -} - -- (void) setStyleManager:(StyleManager*)m { - if (m == nil) { - [NSException raise:NSInvalidArgumentException format:@"Style manager cannot be nil"]; - } - [m retain]; - - [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:styleManager]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(edgeStylesReplaced:) - name:@"EdgeStylesReplaced" - object:m]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(edgeStyleAdded:) - name:@"EdgeStyleAdded" - object:m]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(edgeStyleRemoved:) - name:@"EdgeStyleRemoved" - object:m]; - - [styleManager release]; - styleManager = m; - - [self reloadEdgeStyles]; -} - -- (EdgeStyle*) styleFromPath:(GtkTreePath*)path { - GtkTreeIter iter; - gtk_tree_model_get_iter (GTK_TREE_MODEL (store), &iter, path); - EdgeStyle *style = nil; - gtk_tree_model_get (GTK_TREE_MODEL (store), &iter, EDGE_STYLES_PTR_COL, &style, -1); - return style; -} - -- (GtkTreePath*) pathFromStyle:(EdgeStyle*)style { - GtkTreeModel *m = GTK_TREE_MODEL (store); - GtkTreeIter row; - if (gtk_tree_model_get_iter_first (m, &row)) { - do { - EdgeStyle *rowStyle; - gtk_tree_model_get (m, &row, EDGE_STYLES_PTR_COL, &rowStyle, -1); - if (style == rowStyle) { - return gtk_tree_model_get_path (m, &row); - } - } while (gtk_tree_model_iter_next (m, &row)); - } - return NULL; -} - -- (EdgeStyle*) styleFromIter:(GtkTreeIter*)iter { - EdgeStyle *style = nil; - gtk_tree_model_get (GTK_TREE_MODEL (store), iter, EDGE_STYLES_PTR_COL, &style, -1); - return style; -} - -- (GtkTreeIter*) iterFromStyle:(EdgeStyle*)style { - GtkTreeModel *m = GTK_TREE_MODEL (store); - GtkTreeIter row; - if (gtk_tree_model_get_iter_first (m, &row)) { - do { - EdgeStyle *rowStyle; - gtk_tree_model_get (m, &row, EDGE_STYLES_PTR_COL, &rowStyle, -1); - if (style == rowStyle) { - return gtk_tree_iter_copy (&row); - } - } while (gtk_tree_model_iter_next (m, &row)); - } - return NULL; -} -@end - -// }}} -// {{{ Notifications - -@implementation EdgeStylesModel (Notifications) - -- (void) edgeStylesReplaced:(NSNotification*)notification { - [self reloadEdgeStyles]; -} - -- (void) edgeStyleAdded:(NSNotification*)notification { - [self addEdgeStyle:[[notification userInfo] objectForKey:@"style"]]; -} - -- (void) edgeStyleRemoved:(NSNotification*)notification { - EdgeStyle *style = [[notification userInfo] objectForKey:@"style"]; - - GtkTreeModel *model = GTK_TREE_MODEL (store); - GtkTreeIter row; - if (gtk_tree_model_get_iter_first (model, &row)) { - do { - EdgeStyle *rowStyle; - gtk_tree_model_get (model, &row, EDGE_STYLES_PTR_COL, &rowStyle, -1); - if (style == rowStyle) { - gtk_list_store_remove (store, &row); - [self stopObservingEdgeStyle:rowStyle]; - [rowStyle release]; - return; - } - } while (gtk_tree_model_iter_next (model, &row)); - } -} - -- (void) observeValueForKeyPath:(NSString*)keyPath - ofObject:(id)object - change:(NSDictionary*)change - context:(void*)context -{ - if ([object class] != [EdgeStyle class]) - return; - - EdgeStyle *style = object; - - GtkTreeModel *model = GTK_TREE_MODEL (store); - GtkTreeIter row; - if (gtk_tree_model_get_iter_first (model, &row)) { - do { - EdgeStyle *rowStyle; - gtk_tree_model_get (model, &row, EDGE_STYLES_PTR_COL, &rowStyle, -1); - if (style == rowStyle) { - if ([@"name" isEqual:keyPath]) { - gtk_list_store_set (store, &row, EDGE_STYLES_NAME_COL, [[style name] UTF8String], -1); - } else { - GdkPixbuf *pixbuf = [self pixbufOfEdgeInStyle:style]; - gtk_list_store_set (store, &row, EDGE_STYLES_ICON_COL, pixbuf, -1); - g_object_unref (pixbuf); - } - } - } while (gtk_tree_model_iter_next (model, &row)); - } -} -@end - -// }}} -// {{{ Private - -@implementation EdgeStylesModel (Private) -- (cairo_surface_t*) createEdgeIconSurface { - return cairo_image_surface_create (CAIRO_FORMAT_ARGB32, 48, 18); -} - -- (GdkPixbuf*) pixbufOfEdgeInStyle:(EdgeStyle*)style { - cairo_surface_t *surface = [self createEdgeIconSurface]; - GdkPixbuf *pixbuf = [self pixbufOfEdgeInStyle:style usingSurface:surface]; - cairo_surface_destroy (surface); - return pixbuf; -} - -- (GdkPixbuf*) pixbufOfEdgeInStyle:(EdgeStyle*)style usingSurface:(cairo_surface_t*)surface { - Transformer *transformer = [Transformer defaultTransformer]; - [transformer setFlippedAboutXAxis:YES]; - - int width = cairo_image_surface_get_width (surface); - int height = cairo_image_surface_get_height (surface); - NSRect pixbufBounds = NSMakeRect(0.0, 0.0, width, height); - NSRect graphBounds = [transformer rectFromScreen:pixbufBounds]; - - NSPoint start = NSMakePoint (NSMinX (graphBounds) + 0.1f, NSMidY (graphBounds)); - NSPoint end = NSMakePoint (NSMaxX (graphBounds) - 0.1f, NSMidY (graphBounds)); - Node *src = [Node nodeWithPoint:start]; - Node *tgt = [Node nodeWithPoint:end]; - Edge *e = [Edge edgeWithSource:src andTarget:tgt]; - [e setStyle:style]; - - CairoRenderContext *context = [[CairoRenderContext alloc] initForSurface:surface]; - [context clearSurface]; - [e renderBasicEdgeInContext:context withTransformer:transformer selected:NO]; - [context release]; - - return pixbuf_get_from_surface (surface); -} - -- (void) addEdgeStyle:(EdgeStyle*)style usingSurface:(cairo_surface_t*)surface { - GtkTreeIter iter; - gtk_list_store_append (store, &iter); - - GdkPixbuf *pixbuf = [self pixbufOfEdgeInStyle:style usingSurface:surface]; - gtk_list_store_set (store, &iter, - EDGE_STYLES_NAME_COL, [[style name] UTF8String], - EDGE_STYLES_ICON_COL, pixbuf, - EDGE_STYLES_PTR_COL, (gpointer)[style retain], - -1); - g_object_unref (pixbuf); - [self observeEdgeStyle:style]; -} - -- (void) addEdgeStyle:(EdgeStyle*)style { - cairo_surface_t *surface = [self createEdgeIconSurface]; - [self addEdgeStyle:style usingSurface:surface]; - cairo_surface_destroy (surface); -} - -- (void) observeEdgeStyle:(EdgeStyle*)style { - [style addObserver:self - forKeyPath:@"name" - options:NSKeyValueObservingOptionNew - context:NULL]; - [style addObserver:self - forKeyPath:@"thickness" - options:0 - context:NULL]; - [style addObserver:self - forKeyPath:@"headStyle" - options:0 - context:NULL]; - [style addObserver:self - forKeyPath:@"tailStyle" - options:0 - context:NULL]; - [style addObserver:self - forKeyPath:@"decorationStyle" - options:0 - context:NULL]; - [style addObserver:self - forKeyPath:@"colorRGB.red" - options:0 - context:NULL]; - [style addObserver:self - forKeyPath:@"colorRGB.green" - options:0 - context:NULL]; - [style addObserver:self - forKeyPath:@"colorRGB.blue" - options:0 - context:NULL]; -} - -- (void) stopObservingEdgeStyle:(EdgeStyle*)style { - [style removeObserver:self forKeyPath:@"name"]; - [style removeObserver:self forKeyPath:@"thickness"]; - [style removeObserver:self forKeyPath:@"headStyle"]; - [style removeObserver:self forKeyPath:@"tailStyle"]; - [style removeObserver:self forKeyPath:@"decorationStyle"]; - [style removeObserver:self forKeyPath:@"colorRGB.red"]; - [style removeObserver:self forKeyPath:@"colorRGB.green"]; - [style removeObserver:self forKeyPath:@"colorRGB.blue"]; -} - -- (void) clearEdgeStylesModel { - GtkTreeModel *model = GTK_TREE_MODEL (store); - GtkTreeIter row; - if (gtk_tree_model_get_iter_first (model, &row)) { - do { - EdgeStyle *rowStyle; - gtk_tree_model_get (model, &row, EDGE_STYLES_PTR_COL, &rowStyle, -1); - [self stopObservingEdgeStyle:rowStyle]; - [rowStyle release]; - } while (gtk_tree_model_iter_next (model, &row)); - } - gtk_list_store_clear (store); -} - -- (void) reloadEdgeStyles { - [self clearEdgeStylesModel]; - cairo_surface_t *surface = [self createEdgeIconSurface]; - for (EdgeStyle *style in [styleManager edgeStyles]) { - [self addEdgeStyle:style usingSurface:surface]; - } - cairo_surface_destroy (surface); -} -@end - -// }}} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit/src/gtk/EdgeStylesPalette.h b/tikzit/src/gtk/EdgeStylesPalette.h deleted file mode 100644 index c0c6c4b..0000000 --- a/tikzit/src/gtk/EdgeStylesPalette.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class StyleManager; -@class EdgeStyleSelector; -@class EdgeStyleEditor; - -@interface EdgeStylesPalette: NSObject { - EdgeStyleSelector *selector; - EdgeStyleEditor *editor; - - GtkWidget *palette; - - GtkWidget *removeStyleButton; - GtkWidget *applyStyleButton; - GtkWidget *clearStyleButton; -} - -@property (retain) StyleManager *styleManager; -@property (readonly) GtkWidget *widget; - -- (id) initWithManager:(StyleManager*)m; - -@end - -// vim:ft=objc:ts=4:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit/src/gtk/EdgeStylesPalette.m b/tikzit/src/gtk/EdgeStylesPalette.m deleted file mode 100644 index 33264cf..0000000 --- a/tikzit/src/gtk/EdgeStylesPalette.m +++ /dev/null @@ -1,198 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "EdgeStylesPalette.h" - -#import "EdgeStylesModel.h" -#import "EdgeStyleSelector.h" -#import "EdgeStyleEditor.h" -#import "StyleManager.h" - -// {{{ Internal interfaces -// {{{ GTK+ Callbacks -static void add_style_button_cb (GtkButton *widget, EdgeStylesPalette *palette); -static void remove_style_button_cb (GtkButton *widget, EdgeStylesPalette *palette); -// }}} -// {{{ Notifications - -@interface EdgeStylesPalette (Notifications) -- (void) selectedStyleChanged:(NSNotification*)notification; -@end - -// }}} -// {{{ Private - -@interface EdgeStylesPalette (Private) -- (void) updateButtonState; -- (void) removeSelectedStyle; -- (void) addStyle; -@end - -// }}} -// }}} -// {{{ API - -@implementation EdgeStylesPalette - -@synthesize widget=palette; - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithManager:(StyleManager*)m { - self = [super init]; - - if (self) { - selector = [[EdgeStyleSelector alloc] initWithStyleManager:m]; - editor = [[EdgeStyleEditor alloc] init]; - - palette = gtk_vbox_new (FALSE, 6); - gtk_container_set_border_width (GTK_CONTAINER (palette), 6); - g_object_ref_sink (palette); - - GtkWidget *mainBox = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (palette), mainBox, FALSE, FALSE, 0); - gtk_widget_show (mainBox); - - GtkWidget *selectorScroller = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (selectorScroller), - GTK_POLICY_NEVER, - GTK_POLICY_AUTOMATIC); - GtkWidget *selectorFrame = gtk_frame_new (NULL); - gtk_container_add (GTK_CONTAINER (selectorScroller), [selector widget]); - gtk_container_add (GTK_CONTAINER (selectorFrame), selectorScroller); - gtk_box_pack_start (GTK_BOX (mainBox), selectorFrame, TRUE, TRUE, 0); - gtk_widget_show (selectorScroller); - gtk_widget_show (selectorFrame); - gtk_widget_show ([selector widget]); - - gtk_box_pack_start (GTK_BOX (mainBox), [editor widget], TRUE, TRUE, 0); - gtk_widget_show ([editor widget]); - - GtkBox *buttonBox = GTK_BOX (gtk_hbox_new(FALSE, 0)); - gtk_box_pack_start (GTK_BOX (palette), GTK_WIDGET (buttonBox), FALSE, FALSE, 0); - - GtkWidget *addStyleButton = gtk_button_new (); - gtk_widget_set_tooltip_text (addStyleButton, "Add a new style"); - GtkWidget *addIcon = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON); - gtk_container_add (GTK_CONTAINER (addStyleButton), addIcon); - gtk_box_pack_start (buttonBox, addStyleButton, FALSE, FALSE, 0); - g_signal_connect (G_OBJECT (addStyleButton), - "clicked", - G_CALLBACK (add_style_button_cb), - self); - - removeStyleButton = gtk_button_new (); - g_object_ref_sink (removeStyleButton); - gtk_widget_set_tooltip_text (removeStyleButton, "Delete selected style"); - GtkWidget *removeIcon = gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_BUTTON); - gtk_container_add (GTK_CONTAINER (removeStyleButton), removeIcon); - gtk_box_pack_start (buttonBox, removeStyleButton, FALSE, FALSE, 0); - g_signal_connect (G_OBJECT (removeStyleButton), - "clicked", - G_CALLBACK (remove_style_button_cb), - self); - - gtk_widget_show_all (GTK_WIDGET (buttonBox)); - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(selectedStyleChanged:) - name:@"SelectedStyleChanged" - object:selector]; - - [self updateButtonState]; - } - - return self; -} - -- (StyleManager*) styleManager { - return [[selector model] styleManager]; -} - -- (void) setStyleManager:(StyleManager*)m { - [[selector model] setStyleManager:m]; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - [editor release]; - [selector release]; - - g_object_unref (palette); - g_object_unref (removeStyleButton); - - [super dealloc]; -} - -@end - -// }}} -// {{{ Notifications - -@implementation EdgeStylesPalette (Notifications) -- (void) selectedStyleChanged:(NSNotification*)notification { - [editor setStyle:[selector selectedStyle]]; - [self updateButtonState]; -} -@end - -// }}} -// {{{ Private - -@implementation EdgeStylesPalette (Private) -- (void) updateButtonState { - gboolean hasStyleSelection = [selector selectedStyle] != nil; - gtk_widget_set_sensitive (removeStyleButton, hasStyleSelection); -} - -- (void) removeSelectedStyle { - EdgeStyle *style = [selector selectedStyle]; - if (style) - [[[selector model] styleManager] removeEdgeStyle:style]; -} - -- (void) addStyle { - EdgeStyle *newStyle = [EdgeStyle defaultEdgeStyleWithName:@"newstyle"]; - [[self styleManager] addEdgeStyle:newStyle]; - [selector setSelectedStyle:newStyle]; - [editor selectNameField]; -} - -@end - -// }}} -// {{{ GTK+ callbacks - -static void add_style_button_cb (GtkButton *widget, EdgeStylesPalette *palette) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [palette addStyle]; - [pool drain]; -} - -static void remove_style_button_cb (GtkButton *widget, EdgeStylesPalette *palette) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [palette removeSelectedStyle]; - [pool drain]; -} - -// }}} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit/src/gtk/FileChooserDialog.h b/tikzit/src/gtk/FileChooserDialog.h deleted file mode 100644 index 80b03f5..0000000 --- a/tikzit/src/gtk/FileChooserDialog.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@interface FileChooserDialog: NSObject { - GtkFileChooser *dialog; -} - -+ (FileChooserDialog*) saveDialog; -+ (FileChooserDialog*) saveDialogWithParent:(GtkWindow*)parent; -+ (FileChooserDialog*) saveDialogWithTitle:(NSString*)title parent:(GtkWindow*)parent; -+ (FileChooserDialog*) openDialog; -+ (FileChooserDialog*) openDialogWithParent:(GtkWindow*)parent; -+ (FileChooserDialog*) openDialogWithTitle:(NSString*)title parent:(GtkWindow*)parent; - -- (id) initSaveDialog; -- (id) initSaveDialogWithParent:(GtkWindow*)parent; -- (id) initSaveDialogWithTitle:(NSString*)title parent:(GtkWindow*)parent; -- (id) initOpenDialog; -- (id) initOpenDialogWithParent:(GtkWindow*)parent; -- (id) initOpenDialogWithTitle:(NSString*)title parent:(GtkWindow*)parent; - -- (void) addStandardFilters; -- (void) addFileFilter:(NSString*)filterName withPattern:(NSString*)filePattern; -- (void) addFileFilter:(NSString*)filterName withPattern:(NSString*)filePattern setSelected:(BOOL)selected; - -- (void) setCurrentFolder:(NSString*)path; -- (NSString*) currentFolder; - -- (void) setSuggestedName:(NSString*)fileName; - -- (NSString*) filePath; - -- (BOOL) showDialog; - -- (void) destroy; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/FileChooserDialog.m b/tikzit/src/gtk/FileChooserDialog.m deleted file mode 100644 index 9498e4c..0000000 --- a/tikzit/src/gtk/FileChooserDialog.m +++ /dev/null @@ -1,152 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "FileChooserDialog.h" - -@implementation FileChooserDialog: NSObject - -+ (FileChooserDialog*) saveDialog { return [[[self alloc] initSaveDialog] autorelease]; } -+ (FileChooserDialog*) saveDialogWithParent:(GtkWindow*)parent - { return [[[self alloc] initSaveDialogWithParent:parent] autorelease]; } -+ (FileChooserDialog*) saveDialogWithTitle:(NSString*)title parent:(GtkWindow*)parent - { return [[[self alloc] initSaveDialogWithTitle:title parent:parent] autorelease]; } -+ (FileChooserDialog*) openDialog { return [[[self alloc] initOpenDialog] autorelease]; } -+ (FileChooserDialog*) openDialogWithParent:(GtkWindow*)parent - { return [[[self alloc] initOpenDialogWithParent:parent] autorelease]; } -+ (FileChooserDialog*) openDialogWithTitle:(NSString*)title parent:(GtkWindow*)parent - { return [[[self alloc] initOpenDialogWithTitle:title parent:parent] autorelease]; } - -- (id) initSaveDialog { return [self initSaveDialogWithParent:NULL]; } -- (id) initSaveDialogWithParent:(GtkWindow*)parent - { return [self initSaveDialogWithTitle:@"Save file" parent:parent]; } -- (id) initSaveDialogWithTitle:(NSString*)title parent:(GtkWindow*)parent { - self = [super init]; - - if (self) { - dialog = GTK_FILE_CHOOSER (gtk_file_chooser_dialog_new ( - [title UTF8String], - parent, - GTK_FILE_CHOOSER_ACTION_SAVE, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, - NULL)); - gtk_file_chooser_set_do_overwrite_confirmation (dialog, TRUE); - } - - return self; -} - -- (id) initOpenDialog { return [self initOpenDialogWithParent:NULL]; } -- (id) initOpenDialogWithParent:(GtkWindow*)parent - { return [self initOpenDialogWithTitle:@"Open file" parent:parent]; } -- (id) initOpenDialogWithTitle:(NSString*)title parent:(GtkWindow*)parent { - self = [super init]; - - if (self) { - dialog = GTK_FILE_CHOOSER (gtk_file_chooser_dialog_new ( - [title UTF8String], - parent, - GTK_FILE_CHOOSER_ACTION_OPEN, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, - NULL)); - } - - return self; -} - -- (void) addStandardFilters { - GtkFileFilter *tikzfilter = gtk_file_filter_new(); - gtk_file_filter_set_name(tikzfilter, ".tikz files"); - gtk_file_filter_add_pattern(tikzfilter, "*.tikz"); - gtk_file_chooser_add_filter(dialog, tikzfilter); - GtkFileFilter *allfilter = gtk_file_filter_new(); - gtk_file_filter_set_name(allfilter, "all files"); - gtk_file_filter_add_pattern(allfilter, "*"); - gtk_file_chooser_add_filter(dialog, allfilter); - gtk_file_chooser_set_filter(dialog, tikzfilter); -} - -- (void) addFileFilter:(NSString*)filterName withPattern:(NSString*)filePattern { - [self addFileFilter:filterName withPattern:filePattern setSelected:NO]; -} - -- (void) addFileFilter:(NSString*)filterName withPattern:(NSString*)filePattern setSelected:(BOOL)selected { - GtkFileFilter *oldFilter = selected ? NULL : gtk_file_chooser_get_filter (dialog); - GtkFileFilter *filter = gtk_file_filter_new(); - gtk_file_filter_set_name(filter, [filterName UTF8String]); - gtk_file_filter_add_pattern(filter, [filePattern UTF8String]); - gtk_file_chooser_add_filter(dialog, filter); - if (selected) { - gtk_file_chooser_set_filter (dialog, filter); - } else if (oldFilter) { - gtk_file_chooser_set_filter (dialog, oldFilter); - } -} - -- (void) setCurrentFolder:(NSString*)path { - gchar *folder = [path glibFilename]; - if (folder) { - gtk_file_chooser_set_current_folder(dialog, folder); - g_free (folder); - } -} - -- (NSString*) currentFolder { - NSString *path = nil; - gchar *folder = gtk_file_chooser_get_current_folder(dialog); - if (folder) { - path = [NSString stringWithGlibFilename:folder]; - g_free (folder); - } - return path; -} - -- (void) setSuggestedName:(NSString*)fileName { - gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), [fileName UTF8String]); -} - -- (NSString*) filePath { - NSString *path = nil; - gchar *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); - if (filename) { - path = [NSString stringWithGlibFilename:filename]; - g_free (filename); - } - return path; -} - -- (BOOL) showDialog { - return (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) ? YES : NO; -} - -- (void) destroy { - gtk_widget_destroy (GTK_WIDGET (dialog)); - dialog = NULL; -} - -- (void) dealloc { - if (dialog) { - g_warning ("Failed to destroy file chooser dialog!\n"); - gtk_widget_destroy (GTK_WIDGET (dialog)); - } - [super dealloc]; -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/GraphEditorPanel.h b/tikzit/src/gtk/GraphEditorPanel.h deleted file mode 100644 index 2b93259..0000000 --- a/tikzit/src/gtk/GraphEditorPanel.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "Tool.h" -#import - -@class GraphInputHandler; -@class GraphRenderer; -@class TikzDocument; -@class WidgetSurface; - -@protocol PreviewHandler -- (void) showPreview; -@end -@interface GraphEditorPanel : NSObject { - GraphRenderer *renderer; - WidgetSurface *surface; - GraphInputHandler *inputHandler; - id previewHandler; - id tool; -} -@property (retain) TikzDocument *document; -@property (readonly) GtkWidget *widget; -@property (retain) id activeTool; -@property (assign) id previewHandler; - -- (id) init; -- (id) initWithDocument:(TikzDocument*)document; -- (void) grabTool; -- (void) zoomInAboutPoint:(NSPoint)pos; -- (void) zoomOutAboutPoint:(NSPoint)pos; -- (void) zoomIn; -- (void) zoomOut; -- (void) zoomReset; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/GraphEditorPanel.m b/tikzit/src/gtk/GraphEditorPanel.m deleted file mode 100644 index dac52a0..0000000 --- a/tikzit/src/gtk/GraphEditorPanel.m +++ /dev/null @@ -1,240 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "GraphEditorPanel.h" - -#import "Application.h" -#import "GraphRenderer.h" -#import "HandTool.h" -#import "InputDelegate.h" -#import "TikzDocument.h" -#import "WidgetSurface.h" - -#import - -@class GraphRenderer; -@class WidgetSurface; - -static const InputMask zoomPanMask = ControlMask; - -/** - * Mostly just a multiplexer, but also handles zoom and pan - * when ctrl is held - */ -@interface GraphInputHandler : NSObject { - GraphEditorPanel *panel; - NSPoint dragOrigin; - NSPoint oldGraphOrigin; - BOOL zoomPanActive; -} -- (id) initForPanel:(GraphEditorPanel*)p; -@end - -@implementation GraphEditorPanel - -@synthesize previewHandler; - -- (id) init { - return [self initWithDocument:nil]; -} -- (id) initWithDocument:(TikzDocument*)document { - self = [super init]; - if (self) { - surface = [[WidgetSurface alloc] init]; - [surface setDefaultScale:50.0f]; - [surface setKeepCentered:YES]; - [surface setCanFocus:YES]; - renderer = [[GraphRenderer alloc] initWithSurface:surface document:document]; - - inputHandler = [[GraphInputHandler alloc] initForPanel:self]; - [surface setInputDelegate:inputHandler]; - } - return self; -} - -- (void) dealloc { - [renderer release]; - [surface release]; - [inputHandler release]; - - [super dealloc]; -} - -- (GraphRenderer*) renderer { - return renderer; -} -- (TikzDocument*) document { - return [renderer document]; -} -- (void) setDocument:(TikzDocument*)doc { - [renderer setDocument:doc]; -} -- (GtkWidget*) widget { - return [surface widget]; -} -- (id) activeTool { - return tool; -} -- (void) setActiveTool:(id)t { - if (t == tool) - return; - - [[[renderer document] pickSupport] deselectAllNodes]; - [[[renderer document] pickSupport] deselectAllEdges]; - - id oldTool = tool; - BOOL weHadTool = ([oldTool activeRenderer] == renderer); - if (weHadTool) { - [oldTool setActiveRenderer:nil]; - } - - tool = [t retain]; - [oldTool release]; - - if (weHadTool) { - [self grabTool]; - } -} - -- (BOOL) hasTool { - return [tool activeRenderer] == renderer; -} - -- (void) grabTool { - if ([tool activeRenderer] != renderer) { - [[tool activeRenderer] setPostRenderer:nil]; - [tool setActiveRenderer:renderer]; - } - [renderer setPostRenderer:tool]; -} - -- (void) zoomInAboutPoint:(NSPoint)pos { [surface zoomInAboutPoint:pos]; } -- (void) zoomOutAboutPoint:(NSPoint)pos { [surface zoomOutAboutPoint:pos]; } -- (void) zoomIn { [surface zoomIn]; } -- (void) zoomOut { [surface zoomOut]; } -- (void) zoomReset { [surface zoomReset]; } - -@end - -@implementation GraphInputHandler -- (id) initForPanel:(GraphEditorPanel*)p { - self = [super init]; - if (self) { - // NB: no retention! - panel = p; - } - return self; -} -- (id) init { - [self release]; - return nil; -} -- (void) dealloc { - [super dealloc]; -} - -// FIXME: share code with HandTool? -- (void) mousePressAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { - if (mask == zoomPanMask && button == LeftButton) { - dragOrigin = pos; - oldGraphOrigin = [[[panel renderer] transformer] origin]; - zoomPanActive = YES; - } else { - zoomPanActive = NO; - [panel grabTool]; - id tool = [panel activeTool]; - if ([tool respondsToSelector:@selector(mousePressAt:withButton:andMask:)]) { - [tool mousePressAt:pos withButton:button andMask:mask]; - } - } -} - -- (void) mouseDoubleClickAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { - [panel grabTool]; - id tool = [panel activeTool]; - if ([tool respondsToSelector:@selector(mouseDoubleClickAt:withButton:andMask:)]) { - [tool mouseDoubleClickAt:pos withButton:button andMask:mask]; - } -} - -- (void) mouseReleaseAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { - if (zoomPanActive && button == LeftButton) { - zoomPanActive = NO; - } else if ([panel hasTool]) { - id tool = [panel activeTool]; - if ([tool respondsToSelector:@selector(mouseReleaseAt:withButton:andMask:)]) { - [tool mouseReleaseAt:pos withButton:button andMask:mask]; - } - } -} - -- (void) mouseMoveTo:(NSPoint)pos withButtons:(MouseButton)buttons andMask:(InputMask)mask { - if (zoomPanActive && (buttons & LeftButton)) { - NSPoint newGraphOrigin = oldGraphOrigin; - newGraphOrigin.x += pos.x - dragOrigin.x; - newGraphOrigin.y += pos.y - dragOrigin.y; - [[[panel renderer] transformer] setOrigin:newGraphOrigin]; - [[panel renderer] invalidateGraph]; - } else if ([panel hasTool]) { - id tool = [panel activeTool]; - if ([tool respondsToSelector:@selector(mouseMoveTo:withButtons:andMask:)]) { - [tool mouseMoveTo:pos withButtons:buttons andMask:mask]; - } - } -} - -- (void) mouseScrolledAt:(NSPoint)pos inDirection:(ScrollDirection)dir withMask:(InputMask)mask { - if (mask == zoomPanMask) { - if (dir == ScrollUp) { - [panel zoomInAboutPoint:pos]; - } else if (dir == ScrollDown) { - [panel zoomOutAboutPoint:pos]; - } - } else { - id tool = [panel activeTool]; - if ([panel hasTool] && [tool respondsToSelector:@selector(mouseScrolledAt:inDirection:withMask:)]) { - [tool mouseScrolledAt:pos inDirection:dir withMask:mask]; - } - } -} - -- (void) keyPressed:(unsigned int)keyVal withMask:(InputMask)mask { - if (keyVal == GDK_KEY_space && !mask) { - return; - } - if (![app activateToolForKey:keyVal withMask:mask]) { - id tool = [panel activeTool]; - if ([panel hasTool] && [tool respondsToSelector:@selector(keyPressed:withMask:)]) { - [tool keyPressed:keyVal withMask:mask]; - } - } -} - -- (void) keyReleased:(unsigned int)keyVal withMask:(InputMask)mask { - if (keyVal == GDK_KEY_space && !mask) { - [[panel previewHandler] showPreview]; - } - if (![app activateToolForKey:keyVal withMask:mask]) { - id tool = [panel activeTool]; - if ([panel hasTool] && [tool respondsToSelector:@selector(keyReleased:withMask:)]) { - [tool keyReleased:keyVal withMask:mask]; - } - } -} -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/GraphRenderer.h b/tikzit/src/gtk/GraphRenderer.h deleted file mode 100644 index 730d606..0000000 --- a/tikzit/src/gtk/GraphRenderer.h +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -// classes -#import "Graph.h" -#import "Grid.h" -#import "PickSupport.h" -#import "TikzDocument.h" - -// protocols -#import "Surface.h" - -@interface GraphRenderer: NSObject { - TikzDocument *doc; - NSObject *surface; - Grid *grid; - NSMutableSet *highlightedNodes; - id postRenderer; -} - -@property (retain) id postRenderer; - -- (id) initWithSurface:(NSObject *)surface; -- (id) initWithSurface:(NSObject *)surface document:(TikzDocument*)document; -- (void) renderWithContext:(id)context; -- (void) invalidateRect:(NSRect)rect; -- (void) invalidateGraph; -- (void) invalidateNode:(Node*)node; -- (void) invalidateEdge:(Edge*)edge; -- (void) invalidateNodesHitBy:(NSPoint)point; -- (BOOL) point:(NSPoint)p hitsNode:(Node*)node; -- (BOOL) point:(NSPoint)p hitsEdge:(Edge*)edge withFuzz:(float)fuzz; -/** - * Finds a node at the given screen location. - * - * If there is more than one node at this point (because they overlap), - * an arbitrary one is returned. - */ -- (Node*) anyNodeAt:(NSPoint)p; -/** - * Finds an edge at the given screen location. - * - * If there is more than one edge at this point (because they overlap), - * an arbitrary one is returned. - * - * @param fuzz the fuzz for detecting edges: this will pick up - * edges that are close to the point - */ -- (Edge*) anyEdgeAt:(NSPoint)p withFuzz:(float)fuzz; - -- (id) surface; -- (Transformer*) transformer; -- (Grid*) grid; -- (PickSupport*) pickSupport; - -- (Graph*) graph; - -- (TikzDocument*) document; -- (void) setDocument:(TikzDocument*)document; - -- (BOOL) isNodeHighlighted:(Node*)node; -- (void) setNode:(Node*)node highlighted:(BOOL)h; -- (void) clearHighlightedNodes; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/GraphRenderer.m b/tikzit/src/gtk/GraphRenderer.m deleted file mode 100644 index b413d3e..0000000 --- a/tikzit/src/gtk/GraphRenderer.m +++ /dev/null @@ -1,476 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * Copyright 2010 Chris Heunen - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "GraphRenderer.h" -#import "Edge+Render.h" -#import "Node+Render.h" -#import "Shape.h" - -void graph_renderer_expose_event(GtkWidget *widget, GdkEventExpose *event); - -@interface GraphRenderer (Private) -- (enum NodeState) nodeState:(Node*)node; -- (void) renderBoundingBoxWithContext:(id)context; -- (void) nodeNeedsRefreshing:(NSNotification*)notification; -- (void) edgeNeedsRefreshing:(NSNotification*)notification; -- (void) graphNeedsRefreshing:(NSNotification*)notification; -- (void) graphChanged:(NSNotification*)notification; -- (void) nodeStylePropertyChanged:(NSNotification*)notification; -- (void) edgeStylePropertyChanged:(NSNotification*)notification; -- (void) shapeDictionaryReplaced:(NSNotification*)notification; -@end - -@implementation GraphRenderer - -- (id) initWithSurface:(NSObject *)s { - self = [super init]; - - if (self) { - surface = [s retain]; - grid = [[Grid alloc] initWithSpacing:1.0f subdivisions:4 transformer:[s transformer]]; - highlightedNodes = [[NSMutableSet alloc] initWithCapacity:10]; - [surface setRenderDelegate:self]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(nodeStylePropertyChanged:) - name:@"NodeStylePropertyChanged" - object:nil]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(edgeStylePropertyChanged:) - name:@"EdgeStylePropertyChanged" - object:nil]; - } - - return self; -} - -- (id) initWithSurface:(NSObject *)s document:(TikzDocument*)document { - self = [self initWithSurface:s]; - - if (self) { - [self setDocument:document]; - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - [doc release]; - [grid release]; - [highlightedNodes release]; - [surface release]; - - [super dealloc]; -} - -- (id) postRenderer { - return postRenderer; -} -- (void) setPostRenderer:(id)r { - if (r == postRenderer) - return; - - [r retain]; - [postRenderer release]; - postRenderer = r; - - [self invalidateGraph]; -} - -- (void) renderWithContext:(id)context onSurface:(id)s { - [self renderWithContext:context]; - if ([s hasFocus]) { - [s renderFocus]; - } -} - -- (void) renderWithContext:(id)context { - // blank surface - [context paintWithColor:WhiteRColor]; - - // draw grid - [grid renderGridInContext:context]; - - // draw edges - NSEnumerator *enumerator = [doc edgeEnumerator]; - Edge *edge; - while ((edge = [enumerator nextObject]) != nil) { - [edge renderToSurface:surface withContext:context selected:[doc isEdgeSelected:edge]]; - } - - // draw nodes - enumerator = [doc nodeEnumerator]; - Node *node; - while ((node = [enumerator nextObject]) != nil) { - [node renderToSurface:surface withContext:context state:[self nodeState:node]]; - } - - [self renderBoundingBoxWithContext:context]; - [postRenderer renderWithContext:context onSurface:surface]; -} - -- (void) invalidateGraph { - [surface invalidate]; -} - -- (void) invalidateRect:(NSRect)rect { - [surface invalidateRect:rect]; -} - -- (void) invalidateNodes:(NSSet*)nodes { - for (Node *node in nodes) { - [self invalidateNode:node]; - } -} - -- (void) invalidateEdges:(NSSet*)edges { - for (Edge *edge in edges) { - [self invalidateEdge:edge]; - } -} - -- (void) invalidateNode:(Node*)node { - if (node == nil) { - return; - } - NSRect nodeRect = [node renderBoundsWithLabelForSurface:surface]; - nodeRect = NSInsetRect (nodeRect, -2.0f, -2.0f); - [surface invalidateRect:nodeRect]; -} - -- (void) invalidateEdge:(Edge*)edge { - if (edge == nil) { - return; - } - BOOL selected = [doc isEdgeSelected:edge]; - NSRect edgeRect = [edge renderedBoundsWithTransformer:[surface transformer] whenSelected:selected]; - edgeRect = NSInsetRect (edgeRect, -2.0f, -2.0f); - [surface invalidateRect:edgeRect]; -} - -- (void) invalidateNodesHitBy:(NSPoint)point { - NSEnumerator *enumerator = [doc nodeEnumerator]; - Node *node = nil; - while ((node = [enumerator nextObject]) != nil) { - if ([self point:point hitsNode:node]) { - [self invalidateNode:node]; - } - } -} - -- (BOOL) point:(NSPoint)p hitsNode:(Node*)node { - return [node hitByPoint:p onSurface:surface]; -} - -- (BOOL) point:(NSPoint)p fuzzyHitsNode:(Node*)node { - NSRect bounds = [node renderBoundsForSurface:surface]; - return NSPointInRect(p, bounds); -} - -- (BOOL) point:(NSPoint)p hitsEdge:(Edge*)edge withFuzz:(float)fuzz { - return [edge hitByPoint:p onSurface:surface withFuzz:fuzz]; -} - -- (Node*) anyNodeAt:(NSPoint)p { - NSEnumerator *enumerator = [doc nodeEnumerator]; - Node *node; - while ((node = [enumerator nextObject]) != nil) { - if ([self point:p hitsNode:node]) { - return node; - } - } - return nil; -} - -- (Edge*) anyEdgeAt:(NSPoint)p withFuzz:(float)fuzz { - // FIXME: is there an efficient way to find the "nearest" edge - // if the fuzz is the reason we hit more than one? - NSEnumerator *enumerator = [doc edgeEnumerator]; - Edge *edge; - while ((edge = [enumerator nextObject]) != nil) { - if ([self point:p hitsEdge:edge withFuzz:fuzz]) { - return edge; - } - } - return nil; -} - -- (id) surface { - return surface; -} - -- (Transformer*) transformer { - return [surface transformer]; -} - -- (Grid*) grid { - return grid; -} - -- (PickSupport*) pickSupport { - return [doc pickSupport]; -} - -- (Graph*) graph { - return [doc graph]; -} - -- (TikzDocument*) document { - return doc; -} - -- (void) setDocument:(TikzDocument*)document { - if (doc == document) { - return; - } - - if (doc != nil) { - [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:doc]; - [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:[doc pickSupport]]; - } - - [document retain]; - [doc release]; - doc = document; - - if (doc != nil) { - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(graphNeedsRefreshing:) - name:@"GraphReplaced" object:doc]; - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(graphChanged:) - name:@"GraphChanged" object:doc]; - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(graphChanged:) - name:@"GraphBeingChanged" object:doc]; - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(graphChanged:) - name:@"GraphChangeCancelled" object:doc]; - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(nodeNeedsRefreshing:) - name:@"NodeSelected" object:[doc pickSupport]]; - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(nodeNeedsRefreshing:) - name:@"NodeDeselected" object:[doc pickSupport]]; - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(graphNeedsRefreshing:) - name:@"NodeSelectionReplaced" object:[doc pickSupport]]; - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(edgeNeedsRefreshing:) - name:@"EdgeSelected" object:[doc pickSupport]]; - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(edgeNeedsRefreshing:) - name:@"EdgeDeselected" object:[doc pickSupport]]; - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(graphNeedsRefreshing:) - name:@"EdgeSelectionReplaced" object:[doc pickSupport]]; - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(shapeDictionaryReplaced:) - name:@"ShapeDictionaryReplaced" - object:[Shape class]]; - } - [surface invalidate]; -} - -- (BOOL) isNodeHighlighted:(Node*)node { - return [highlightedNodes containsObject:node]; -} -- (void) setNode:(Node*)node highlighted:(BOOL)h { - if (h) { - if (![highlightedNodes containsObject:node]) { - [highlightedNodes addObject:node]; - [self invalidateNode:node]; - } - } else { - if ([highlightedNodes containsObject:node]) { - [highlightedNodes removeObject:node]; - [self invalidateNode:node]; - } - } -} -- (void) clearHighlightedNodes { - [self invalidateNodes:highlightedNodes]; - [highlightedNodes removeAllObjects]; -} - -@end - -@implementation GraphRenderer (Private) -- (enum NodeState) nodeState:(Node*)node { - if ([doc isNodeSelected:node]) { - return NodeSelected; - } else if ([self isNodeHighlighted:node]) { - return NodeHighlighted; - } else { - return NodeNormal; - } -} - -- (void) renderBoundingBoxWithContext:(id)context { - if ([[self graph] hasBoundingBox]) { - [context saveState]; - - NSRect bbox = [[surface transformer] rectToScreen:[[self graph] boundingBox]]; - - [context setAntialiasMode:AntialiasDisabled]; - [context setLineWidth:1.0]; - [context startPath]; - [context rect:bbox]; - [context strokePathWithColor:MakeSolidRColor (1.0, 0.7, 0.5)]; - - [context restoreState]; - } -} - -- (void) nodeNeedsRefreshing:(NSNotification*)notification { - [self invalidateNode:[[notification userInfo] objectForKey:@"node"]]; -} - -- (void) edgeNeedsRefreshing:(NSNotification*)notification { - Edge *edge = [[notification userInfo] objectForKey:@"edge"]; - NSRect edgeRect = [edge renderedBoundsWithTransformer:[surface transformer] whenSelected:YES]; - edgeRect = NSInsetRect (edgeRect, -2, -2); - [surface invalidateRect:edgeRect]; -} - -- (void) graphNeedsRefreshing:(NSNotification*)notification { - [self invalidateGraph]; -} - -- (void) invalidateBentIncidentEdgesForNode:(Node*)nd { - for (Edge *e in [[self graph] inEdgesForNode:nd]) { - if (![e isStraight]) { - [self invalidateEdge:e]; - } - } - for (Edge *e in [[self graph] outEdgesForNode:nd]) { - if (![e isStraight]) { - [self invalidateEdge:e]; - } - } -} - -- (void) graphChanged:(NSNotification*)notification { - GraphChange *change = [[notification userInfo] objectForKey:@"change"]; - switch ([change changeType]) { - case GraphAddition: - case GraphDeletion: - [self invalidateNodes:[change affectedNodes]]; - [self invalidateEdges:[change affectedEdges]]; - break; - case NodePropertyChange: - if (!NSEqualPoints ([[change oldNode] point], [[change nwNode] point])) { - // if the node has moved, it may be affecting edges - [surface invalidate]; - } else if ([[change oldNode] style] != [[change nwNode] style]) { - // change in style means that edges may touch at a different point, - // but this only matters for bent edges - [self invalidateBentIncidentEdgesForNode:[change nodeRef]]; - // invalide both old and new (old node may be larger) - [self invalidateNode:[change oldNode]]; - [self invalidateNode:[change nwNode]]; - } else { - // invalide both old and new (old node may be larger) - [self invalidateNode:[change oldNode]]; - [self invalidateNode:[change nwNode]]; - } - break; - case EdgePropertyChange: - // invalide both old and new (old bend may increase bounds) - [self invalidateEdge:[change oldEdge]]; - [self invalidateEdge:[change nwEdge]]; - [self invalidateEdge:[change edgeRef]]; - break; - case NodesPropertyChange: - { - NSEnumerator *enumerator = [[change oldNodeTable] keyEnumerator]; - Node *node = nil; - while ((node = [enumerator nextObject]) != nil) { - NSPoint oldPos = [[[change oldNodeTable] objectForKey:node] point]; - NSPoint newPos = [[[change nwNodeTable] objectForKey:node] point]; - NodeStyle *oldStyle = [[[change oldNodeTable] objectForKey:node] style]; - NodeStyle *newStyle = [[[change nwNodeTable] objectForKey:node] style]; - if (!NSEqualPoints (oldPos, newPos)) { - [surface invalidate]; - break; - } else if (oldStyle != newStyle) { - [self invalidateBentIncidentEdgesForNode:node]; - [self invalidateNode:[[change oldNodeTable] objectForKey:node]]; - [self invalidateNode:[[change nwNodeTable] objectForKey:node]]; - } else { - [self invalidateNode:[[change oldNodeTable] objectForKey:node]]; - [self invalidateNode:[[change nwNodeTable] objectForKey:node]]; - } - } - } - break; - case NodesShift: - case NodesFlip: - case BoundingBoxChange: - [surface invalidate]; - break; - default: - // unknown change - [surface invalidate]; - break; - }; -} - -- (void) nodeStylePropertyChanged:(NSNotification*)notification { - if (![@"name" isEqual:[[notification userInfo] objectForKey:@"propertyName"]]) { - BOOL affected = NO; - for (Node *node in [[self graph] nodes]) { - if ([node style] == [notification object]) - affected = YES; - } - if (affected) - [surface invalidate]; - } -} - -- (void) edgeStylePropertyChanged:(NSNotification*)notification { - if (![@"name" isEqual:[[notification userInfo] objectForKey:@"propertyName"]]) { - BOOL affected = NO; - for (Edge *edge in [[self graph] edges]) { - if ([edge style] == [notification object]) - affected = YES; - } - if (affected) - [surface invalidate]; - } -} - -- (void) shapeDictionaryReplaced:(NSNotification*)notification { - [surface invalidate]; -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/HandTool.h b/tikzit/src/gtk/HandTool.h deleted file mode 100644 index c96de36..0000000 --- a/tikzit/src/gtk/HandTool.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "Tool.h" - -@interface HandTool : NSObject { - GraphRenderer *renderer; - NSPoint dragOrigin; - NSPoint oldGraphOrigin; -} - - -+ (id) tool; -- (id) init; -@end - - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/HandTool.m b/tikzit/src/gtk/HandTool.m deleted file mode 100644 index c3a0fb4..0000000 --- a/tikzit/src/gtk/HandTool.m +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "HandTool.h" - -#import "GraphRenderer.h" -#import "TikzDocument.h" -#import "tzstockitems.h" - -@implementation HandTool -- (NSString*) name { return @"Drag"; } -- (const gchar*) stockId { return TIKZIT_STOCK_DRAG; } -- (NSString*) helpText { return @"Move the diagram to view different parts"; } -- (NSString*) shortcut { return @"m"; } -@synthesize activeRenderer=renderer; - -+ (id) tool { - return [[[self alloc] init] autorelease]; -} - -- (id) init { - return [super init]; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - [renderer release]; - - [super dealloc]; -} - -- (GtkWidget*) configurationWidget { return NULL; } - -- (void) mousePressAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { - if (button != LeftButton) - return; - - dragOrigin = pos; - oldGraphOrigin = [[renderer transformer] origin]; -} - -- (void) mouseMoveTo:(NSPoint)pos withButtons:(MouseButton)buttons andMask:(InputMask)mask { - if (!(buttons & LeftButton)) - return; - - NSPoint newGraphOrigin = oldGraphOrigin; - newGraphOrigin.x += pos.x - dragOrigin.x; - newGraphOrigin.y += pos.y - dragOrigin.y; - [[renderer transformer] setOrigin:newGraphOrigin]; - [renderer invalidateGraph]; -} - -- (void) mouseReleaseAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask {} - -- (void) renderWithContext:(id)context onSurface:(id)surface {} -- (void) loadConfiguration:(Configuration*)config {} -- (void) saveConfiguration:(Configuration*)config {} -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/InputDelegate.h b/tikzit/src/gtk/InputDelegate.h deleted file mode 100644 index 9f9b426..0000000 --- a/tikzit/src/gtk/InputDelegate.h +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" - -typedef enum { - LeftButton = 1, - MiddleButton = 2, - RightButton = 3, - Button4 = 4, - Button5 = 5 -} MouseButton; - -typedef enum { - ShiftMask = 1, - ControlMask = 2, - MetaMask = 4 -} InputMask; - -typedef enum { - ScrollUp = 1, - ScrollDown = 2, - ScrollLeft = 3, - ScrollRight = 4, -} ScrollDirection; - -@protocol InputDelegate -@optional -/** - * A mouse button was pressed. - */ -- (void) mousePressAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask; -/** - * A mouse button was released. - */ -- (void) mouseReleaseAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask; -/** - * A mouse button was double-clicked. - * - * Note that mouseDown and mouseUp events will still be delivered. - * This will be triggered between the second mouseDown and the second - * mouseUp. - */ -- (void) mouseDoubleClickAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask; -/** - * The mouse was moved - */ -- (void) mouseMoveTo:(NSPoint)pos withButtons:(MouseButton)button andMask:(InputMask)mask; -/** - * The mouse was scrolled - */ -- (void) mouseScrolledAt:(NSPoint)pos inDirection:(ScrollDirection)dir withMask:(InputMask)mask; -/** - * A key was pressed - */ -- (void) keyPressed:(unsigned int)keyVal withMask:(InputMask)mask; -/** - * A key was released - */ -- (void) keyReleased:(unsigned int)keyVal withMask:(InputMask)mask; -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/Menu.h b/tikzit/src/gtk/Menu.h deleted file mode 100644 index e0f78d4..0000000 --- a/tikzit/src/gtk/Menu.h +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class Window; -@class PickSupport; - -/** - * Manages the menu - */ -@interface Menu: NSObject { - GtkWidget *menubar; - GtkActionGroup *appActions; - GtkActionGroup *windowActions; - GtkAction *undoAction; // no ref - GtkAction *redoAction; // no ref - GtkAction *pasteAction; // no ref - GtkAction **nodeSelBasedActions; - guint nodeSelBasedActionCount; - GtkAction **edgeSelBasedActions; - guint edgeSelBasedActionCount; - GtkAction **selBasedActions; - guint selBasedActionCount; -} - -/** - * The menubar widget, to be inserted into the window - */ -@property (readonly) GtkWidget *menubar; - -/** - * Constructs the menu for @p window - * - * @param window the window that will be acted upon - */ -- (id) initForWindow:(Window*)window; - -/** - * Enables or disables the undo action - */ -- (void) setUndoActionEnabled:(BOOL)enabled; -/** - * Sets the text that describes what action will be undone - * - * @param detail a text description of the action, or nil - */ -- (void) setUndoActionDetail:(NSString*)detail; -/** - * Enables or disables the redo action - */ -- (void) setRedoActionEnabled:(BOOL)enabled; -/** - * Sets the text that describes what action will be redone - * - * @param detail a text description of the action, or nil - */ -- (void) setRedoActionDetail:(NSString*)detail; - -/** - * Gets the paste action - */ -- (GtkAction*) pasteAction; - -/** - * Enables or disables the actions that act on a selection - */ -- (void) notifySelectionChanged:(PickSupport*)pickSupport; -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/Menu.m b/tikzit/src/gtk/Menu.m deleted file mode 100644 index 04c9c31..0000000 --- a/tikzit/src/gtk/Menu.m +++ /dev/null @@ -1,737 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * Stuff stolen from glade-window.c in Glade: - * Copyright (C) 2001 Ximian, Inc. - * Copyright (C) 2007 Vincent Geddes. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "Menu.h" - -#import "Application.h" -#import "Window.h" -#import "Configuration.h" -#import "PickSupport.h" -#import "Shape.h" -#import "Tool.h" -#import "TikzDocument.h" - -#import -#ifdef _ -#undef _ -#endif -#import -#import - -#import "gtkhelpers.h" - -#import "logo.h" - -// {{{ Application actions -static void new_cb (GtkAction *action, Application *appl) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [appl newWindow]; - [pool drain]; -} - -static void refresh_shapes_cb (GtkAction *action, Application *appl) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [Shape refreshShapeDictionary]; - [pool drain]; -} - -static void show_preferences_cb (GtkAction *action, Application *appl) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [appl presentSettingsDialog]; - [pool drain]; -} - -#ifdef HAVE_POPPLER -static void show_preamble_cb (GtkAction *action, Application *appl) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [appl presentPreamblesEditor]; - [pool drain]; -} -#endif - -static void show_context_window_cb (GtkAction *action, Application *appl) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [appl presentContextWindow]; - [pool drain]; -} - -static void quit_cb (GtkAction *action, Application *appl) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [appl quit]; - [pool drain]; -} - -static void help_cb (GtkAction *action, Application *appl) { - GError *gerror = NULL; - gtk_show_uri (NULL, "http://tikzit.sourceforge.net/manual.html", GDK_CURRENT_TIME, &gerror); - if (gerror != NULL) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - logGError (gerror, @"Could not show help"); - [pool drain]; - } -} - -static void about_cb (GtkAction *action, Application *appl) { - static const gchar * const authors[] = - { "Aleks Kissinger ", - "Chris Heunen ", - "Alex Merry ", - NULL }; - - static const gchar license[] = - N_("TikZiT is free software; you can redistribute it and/or modify " - "it under the terms of the GNU General Public License as " - "published by the Free Software Foundation; either version 2 of the " - "License, or (at your option) any later version." - "\n\n" - "TikZiT is distributed in the hope that it will be useful, " - "but WITHOUT ANY WARRANTY; without even the implied warranty of " - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the " - "GNU General Public License for more details." - "\n\n" - "You should have received a copy of the GNU General Public License " - "along with TikZiT; if not, write to the Free Software " - "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, " - "MA 02110-1301, USA."); - - static const gchar copyright[] = - "Copyright \xc2\xa9 2010-2011 Aleks Kissinger, Chris Heunen and Alex Merry."; - - GdkPixbuf *logo = get_logo (LOGO_SIZE_128); - gtk_show_about_dialog (NULL, - "program-name", PACKAGE_NAME, - "logo", logo, - "authors", authors, - "translator-credits", _("translator-credits"), - "comments", _("A graph manipulation program for pgf/tikz graphs"), - "license", _(license), - "wrap-license", TRUE, - "copyright", copyright, - "version", PACKAGE_VERSION, - "website", "http://tikzit.sourceforge.net", - NULL); - g_object_unref (logo); -} - -static GtkActionEntry app_action_entries[] = { - /* - Fields: - * action name - * stock id or name of icon for action - * label for action (mark for translation with N_) - * accelerator (as understood by gtk_accelerator_parse()) - * tooltip (mark for translation with N_) - * callback - */ - { "New", GTK_STOCK_NEW, NULL, "N", - N_("Create a new graph"), G_CALLBACK (new_cb) }, - - { "RefreshShapes", NULL, N_("_Refresh shapes"), NULL, - N_(""), G_CALLBACK (refresh_shapes_cb) }, - - { "Quit", GTK_STOCK_QUIT, NULL, "Q", - N_("Quit the program"), G_CALLBACK (quit_cb) }, - - { "Tool", NULL, N_("_Tool") }, - - { "ShowPreferences", GTK_STOCK_PREFERENCES, N_("Configure TikZiT..."), NULL, - N_("Edit the TikZiT configuration"), G_CALLBACK (show_preferences_cb) }, - -#ifdef HAVE_POPPLER - { "ShowPreamble", NULL, N_("_Edit Preambles..."), NULL, - N_("Edit the preambles used to generate the preview"), G_CALLBACK (show_preamble_cb) }, -#endif - - { "ShowContextWindow", NULL, N_("_Context Window"), NULL, - N_("Show the contextual tools window"), G_CALLBACK (show_context_window_cb) }, - - /* HelpMenu */ - { "HelpManual", GTK_STOCK_HELP, N_("_Online manual"), "F1", - N_("TikZiT manual (online)"), G_CALLBACK (help_cb) }, - - { "About", GTK_STOCK_ABOUT, NULL, NULL, - N_("About this application"), G_CALLBACK (about_cb) }, -}; -static guint n_app_action_entries = G_N_ELEMENTS (app_action_entries); -// }}} -// {{{ Window actions - -static void open_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window openFile]; - [pool drain]; -} - -static void close_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window close]; - [pool drain]; -} - -static void save_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window saveActiveDocument]; - [pool drain]; -} - -static void save_as_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window saveActiveDocumentAs]; - [pool drain]; -} - -static void save_as_shape_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window saveActiveDocumentAsShape]; - [pool drain]; -} - -static void undo_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - TikzDocument *document = [window document]; - if ([document canUndo]) { - [document undo]; - } else { - g_warning ("Can't undo!\n"); - gtk_action_set_sensitive (action, FALSE); - } - - [pool drain]; -} - -static void redo_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - TikzDocument *document = [window document]; - if ([document canRedo]) { - [document redo]; - } else { - g_warning ("Can't redo!\n"); - gtk_action_set_sensitive (action, FALSE); - } - - [pool drain]; -} - -static void cut_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window selectionCutToClipboard]; - [pool drain]; -} - -static void copy_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window selectionCopyToClipboard]; - [pool drain]; -} - -static void paste_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window pasteFromClipboard]; - [pool drain]; -} - -static void delete_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [[window document] removeSelected]; - [pool drain]; -} - -static void select_all_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - TikzDocument *document = [window document]; - [[document pickSupport] selectAllNodes:[NSSet setWithArray:[[document graph] nodes]]]; - [pool drain]; -} - -static void deselect_all_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - TikzDocument *document = [window document]; - [[document pickSupport] deselectAllNodes]; - [[document pickSupport] deselectAllEdges]; - [pool drain]; -} - -static void flip_horiz_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [[window document] flipSelectedNodesHorizontally]; - [pool drain]; -} - -static void flip_vert_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [[window document] flipSelectedNodesVertically]; - [pool drain]; -} - -static void reverse_edges_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [[window document] reverseSelectedEdges]; - [pool drain]; -} - -static void bring_forward_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [[window document] bringSelectionForward]; - [pool drain]; -} - -static void send_backward_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [[window document] sendSelectionBackward]; - [pool drain]; -} - -static void bring_to_front_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [[window document] bringSelectionToFront]; - [pool drain]; -} - -static void send_to_back_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [[window document] sendSelectionToBack]; - [pool drain]; -} - -#ifdef HAVE_POPPLER -static void show_preview_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window presentPreview]; - [pool drain]; -} -#endif - -static void zoom_in_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window zoomIn]; - [pool drain]; -} - -static void zoom_out_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window zoomOut]; - [pool drain]; -} - -static void zoom_reset_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window zoomReset]; - [pool drain]; -} - -static void recent_chooser_item_activated_cb (GtkRecentChooser *chooser, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - gchar *uri, *path; - GError *error = NULL; - - uri = gtk_recent_chooser_get_current_uri (chooser); - - path = g_filename_from_uri (uri, NULL, NULL); - if (error) { - g_warning ("Could not convert uri \"%s\" to a local path: %s", uri, error->message); - g_error_free (error); - return; - } - - [window openFileAtPath:[NSString stringWithGlibFilename:path]]; - - g_free (uri); - g_free (path); - - [pool drain]; -} - - -static GtkActionEntry window_action_entries[] = { - /* - Fields: - * action name - * stock id or name of icon for action - * label for action (mark for translation with N_) - * accelerator (as understood by gtk_accelerator_parse()) - * tooltip (mark for translation with N_) - * callback - */ - { "FileMenu", NULL, N_("_File") }, - { "EditMenu", NULL, N_("_Edit") }, - { "ViewMenu", NULL, N_("_View") }, - { "HelpMenu", NULL, N_("_Help") }, - - { "Arrange", NULL, N_("_Arrange") }, - { "Zoom", NULL, N_("_Zoom") }, - - { "Open", GTK_STOCK_OPEN, N_("_Open\342\200\246") ,"O", - N_("Open a graph"), G_CALLBACK (open_cb) }, - - { "Close", GTK_STOCK_CLOSE, NULL, "W", - N_("Close the current graph"), G_CALLBACK (close_cb) }, - - { "ZoomIn", GTK_STOCK_ZOOM_IN, NULL, "plus", - NULL, G_CALLBACK (zoom_in_cb) }, - - { "ZoomOut", GTK_STOCK_ZOOM_OUT, NULL, "minus", - NULL, G_CALLBACK (zoom_out_cb) }, - - { "ZoomReset", GTK_STOCK_ZOOM_100, N_("_Reset zoom"), "0", - NULL, G_CALLBACK (zoom_reset_cb) }, - - { "Save", GTK_STOCK_SAVE, NULL, "S", - N_("Save the current graph"), G_CALLBACK (save_cb) }, - - { "SaveAs", GTK_STOCK_SAVE_AS, N_("Save _As\342\200\246"), NULL, - N_("Save the current graph with a different name"), G_CALLBACK (save_as_cb) }, - - { "SaveAsShape", NULL, N_("Save As S_hape\342\200\246"), NULL, - N_("Save the current graph as a shape for use in styles"), G_CALLBACK (save_as_shape_cb) }, - - { "Undo", GTK_STOCK_UNDO, NULL, "Z", - N_("Undo the last action"), G_CALLBACK (undo_cb) }, - - { "Redo", GTK_STOCK_REDO, NULL, "Z", - N_("Redo the last action"), G_CALLBACK (redo_cb) }, - - { "Cut", GTK_STOCK_CUT, NULL, NULL, - N_("Cut the selection"), G_CALLBACK (cut_cb) }, - - { "Copy", GTK_STOCK_COPY, NULL, NULL, - N_("Copy the selection"), G_CALLBACK (copy_cb) }, - - { "Paste", GTK_STOCK_PASTE, NULL, NULL, - N_("Paste the clipboard"), G_CALLBACK (paste_cb) }, - - { "Delete", GTK_STOCK_DELETE, NULL, "Delete", - N_("Delete the selection"), G_CALLBACK (delete_cb) }, - - { "SelectAll", GTK_STOCK_SELECT_ALL, NULL, "A", - N_("Select all nodes on the graph"), G_CALLBACK (select_all_cb) }, - - { "DeselectAll", NULL, N_("D_eselect all"), "A", - N_("Deselect everything"), G_CALLBACK (deselect_all_cb) }, - - { "FlipHoriz", NULL, N_("Flip nodes _horizonally"), NULL, - N_("Flip the selected nodes horizontally"), G_CALLBACK (flip_horiz_cb) }, - - { "FlipVert", NULL, N_("Flip nodes _vertically"), NULL, - N_("Flip the selected nodes vertically"), G_CALLBACK (flip_vert_cb) }, - - { "ReverseEdges", NULL, N_("Rever_se edges"), NULL, - N_("Reverse the selected edges"), G_CALLBACK (reverse_edges_cb) }, - - { "SendToBack", NULL, N_("Send to _back"), NULL, - N_("Send the selected nodes and edges to the back of the graph"), G_CALLBACK (send_to_back_cb) }, - - { "SendBackward", NULL, N_("Send b_ackward"), NULL, - N_("Send the selected nodes and edges backward"), G_CALLBACK (send_backward_cb) }, - - { "BringForward", NULL, N_("Bring f_orward"), NULL, - N_("Bring the selected nodes and edges forward"), G_CALLBACK (bring_forward_cb) }, - - { "BringToFront", NULL, N_("Bring to _front"), NULL, - N_("Bring the selected nodes and edges to the front of the graph"), G_CALLBACK (bring_to_front_cb) }, - - /* ViewMenu */ -#ifdef HAVE_POPPLER - { "ShowPreview", NULL, N_("_Preview"), "L", - N_("See the graph as it will look when rendered in LaTeX"), G_CALLBACK (show_preview_cb) }, -#endif -}; -static guint n_window_action_entries = G_N_ELEMENTS (window_action_entries); - -// }}} -// {{{ UI XML - -static const gchar ui_info[] = -"" -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -#ifdef HAVE_POPPLER -" " -" " -#endif -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -/* -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -*/ -""; - - - -// }}} -// {{{ Helper methods - -static void configure_recent_chooser (GtkRecentChooser *chooser) -{ - gtk_recent_chooser_set_local_only (chooser, TRUE); - gtk_recent_chooser_set_show_icons (chooser, FALSE); - gtk_recent_chooser_set_sort_type (chooser, GTK_RECENT_SORT_MRU); - - GtkRecentFilter *filter = gtk_recent_filter_new (); - gtk_recent_filter_add_application (filter, g_get_application_name()); - gtk_recent_chooser_set_filter (chooser, filter); -} - -static void tool_cb (GtkAction *action, id tool) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [app setActiveTool:tool]; - [pool drain]; -} - - - -// }}} -// {{{ API - -@implementation Menu - -- (id) init { - [self release]; - return nil; -} - -- (id) initForWindow:(Window*)window { - self = [super init]; - if (!self) { - return nil; - } - - GError *error = NULL; - - appActions = gtk_action_group_new ("TZApp"); - //gtk_action_group_set_translation_domain (actions, GETTEXT_PACKAGE); - gtk_action_group_add_actions (appActions, - app_action_entries, - n_app_action_entries, - app); - for (id tool in [app tools]) { - NSString *tooltip = [NSString stringWithFormat: - @"%@: %@ (%@)", [tool name], [tool helpText], [tool shortcut]]; - GtkAction *action = gtk_action_new ( - [[tool name] UTF8String], - [[tool name] UTF8String], - [tooltip UTF8String], - [tool stockId]); - gtk_action_group_add_action_with_accel ( - appActions, - action, - NULL); - g_signal_connect ( - G_OBJECT (action), - "activate", - G_CALLBACK (tool_cb), - tool); - g_object_unref (action); - } - - windowActions = gtk_action_group_new ("TZWindow"); - //gtk_action_group_set_translation_domain (windowActions, GETTEXT_PACKAGE); - - gtk_action_group_add_actions (windowActions, - window_action_entries, - n_window_action_entries, - window); - - GtkAction *action = gtk_recent_action_new ("OpenRecent", N_("Open _Recent"), NULL, NULL); - g_signal_connect (G_OBJECT (action), - "item-activated", - G_CALLBACK (recent_chooser_item_activated_cb), - window); - configure_recent_chooser (GTK_RECENT_CHOOSER (action)); - gtk_action_group_add_action_with_accel (windowActions, action, NULL); - g_object_unref (action); - - /* Save refs to actions that will need to be updated */ - undoAction = gtk_action_group_get_action (windowActions, "Undo"); - redoAction = gtk_action_group_get_action (windowActions, "Redo"); - pasteAction = gtk_action_group_get_action (windowActions, "Paste"); - - nodeSelBasedActionCount = 4; - nodeSelBasedActions = g_new (GtkAction*, nodeSelBasedActionCount); - nodeSelBasedActions[0] = gtk_action_group_get_action (windowActions, "Cut"); - nodeSelBasedActions[1] = gtk_action_group_get_action (windowActions, "Copy"); - nodeSelBasedActions[2] = gtk_action_group_get_action (windowActions, "FlipHoriz"); - nodeSelBasedActions[3] = gtk_action_group_get_action (windowActions, "FlipVert"); - edgeSelBasedActionCount = 1; - edgeSelBasedActions = g_new (GtkAction*, edgeSelBasedActionCount); - edgeSelBasedActions[0] = gtk_action_group_get_action (windowActions, "ReverseEdges"); - selBasedActionCount = 2; - selBasedActions = g_new (GtkAction*, selBasedActionCount); - selBasedActions[0] = gtk_action_group_get_action (windowActions, "Delete"); - selBasedActions[1] = gtk_action_group_get_action (windowActions, "DeselectAll"); - - - GtkUIManager *ui = gtk_ui_manager_new (); - gtk_ui_manager_insert_action_group (ui, windowActions, 0); - gtk_ui_manager_insert_action_group (ui, appActions, 1); - gtk_window_add_accel_group ([window gtkWindow], gtk_ui_manager_get_accel_group (ui)); - if (!gtk_ui_manager_add_ui_from_string (ui, ui_info, -1, &error)) - { - g_message ("Building menus failed: %s", error->message); - g_error_free (error); - g_object_unref (ui); - [self release]; - return nil; - } - guint tool_merge_id = gtk_ui_manager_new_merge_id (ui); - for (id tool in [app tools]) { - gtk_ui_manager_add_ui (ui, - tool_merge_id, - "/ui/MenuBar/EditMenu/Tool", - [[tool name] UTF8String], - [[tool name] UTF8String], - GTK_UI_MANAGER_AUTO, - FALSE); - } - menubar = gtk_ui_manager_get_widget (ui, "/MenuBar"); - g_object_ref_sink (menubar); - g_object_unref (ui); - - return self; -} - -- (void) dealloc { - g_free (nodeSelBasedActions); - g_free (edgeSelBasedActions); - g_free (selBasedActions); - g_object_unref (menubar); - g_object_unref (appActions); - g_object_unref (windowActions); - - [super dealloc]; -} - -@synthesize menubar; - -- (void) setUndoActionEnabled:(BOOL)enabled { - gtk_action_set_sensitive (undoAction, enabled); -} - -- (void) setUndoActionDetail:(NSString*)detail { - gtk_action_set_detailed_label (undoAction, "_Undo", [detail UTF8String]); -} - -- (void) setRedoActionEnabled:(BOOL)enabled { - gtk_action_set_sensitive (redoAction, enabled); -} - -- (void) setRedoActionDetail:(NSString*)detail { - gtk_action_set_detailed_label (redoAction, "_Redo", [detail UTF8String]); -} - -- (GtkAction*) pasteAction { - return pasteAction; -} - -- (void) notifySelectionChanged:(PickSupport*)pickSupport { - BOOL hasSelectedNodes = [[pickSupport selectedNodes] count] > 0; - BOOL hasSelectedEdges = [[pickSupport selectedEdges] count] > 0; - for (int i = 0; i < nodeSelBasedActionCount; ++i) { - if (nodeSelBasedActions[i]) { - gtk_action_set_sensitive (nodeSelBasedActions[i], hasSelectedNodes); - } - } - for (int i = 0; i < edgeSelBasedActionCount; ++i) { - if (edgeSelBasedActions[i]) { - gtk_action_set_sensitive (edgeSelBasedActions[i], hasSelectedEdges); - } - } - for (int i = 0; i < selBasedActionCount; ++i) { - if (selBasedActions[i]) { - gtk_action_set_sensitive (selBasedActions[i], hasSelectedNodes || hasSelectedEdges); - } - } -} - -@end - -// }}} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit/src/gtk/NSError+Glib.h b/tikzit/src/gtk/NSError+Glib.h deleted file mode 100644 index 137977e..0000000 --- a/tikzit/src/gtk/NSError+Glib.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import -#import - -@interface NSError(Glib) -+ (id) errorWithGError:(GError*)gerror; -@end - -void GErrorToNSError(GError *errorIn, NSError **errorOut); -void logGError (GError *error, NSString *message); - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/NSError+Glib.m b/tikzit/src/gtk/NSError+Glib.m deleted file mode 100644 index f466d9e..0000000 --- a/tikzit/src/gtk/NSError+Glib.m +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "NSError+Glib.h" -#import "TZFoundation.h" - -@implementation NSError(Glib) -+ (id) errorWithGError:(GError*)gerror { - if (!gerror) - return nil; - - NSString *message = [NSString stringWithUTF8String:gerror->message]; - NSString *domain = [NSString stringWithUTF8String:g_quark_to_string(gerror->domain)]; - - NSMutableDictionary *errorDetail = [NSMutableDictionary dictionaryWithObject:message - forKey:NSLocalizedDescriptionKey]; - return [self errorWithDomain:domain code:gerror->code userInfo:errorDetail]; -} -@end - -void GErrorToNSError(GError *errorIn, NSError **errorOut) -{ - if (errorOut && errorIn) { - *errorOut = [NSError errorWithGError:errorIn]; - } -} - -void logGError (GError *error, NSString *message) { - if (message == nil) { - NSLog (@"%s", error->message); - } else { - NSLog (@"%@: %s", message, error->message); - } -} - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/NSFileManager+Glib.h b/tikzit/src/gtk/NSFileManager+Glib.h deleted file mode 100644 index cb49fcb..0000000 --- a/tikzit/src/gtk/NSFileManager+Glib.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import - -@interface NSFileManager(Glib) -/** - * Creates a directory in the system temp directory - */ -- (NSString*) createTempDirectoryWithError:(NSError**)error; -/** - * Creates a directory in the system temp directory - */ -- (NSString*) createTempDirectory; -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/NSFileManager+Glib.m b/tikzit/src/gtk/NSFileManager+Glib.m deleted file mode 100644 index b3e9de6..0000000 --- a/tikzit/src/gtk/NSFileManager+Glib.m +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "NSFileManager+Glib.h" -#import "TZFoundation.h" -#import "mkdtemp.h" - -@implementation NSFileManager(Glib) - -- (NSString*) createTempDirectoryWithError:(NSError**)error { - NSString *result = nil; -#if GLIB_CHECK_VERSION (2, 30, 0) - GError *gerror = NULL; - gchar *dir = g_dir_make_tmp ("tikzitXXXXXX", &gerror); - GErrorToNSError (gerror, error); - if (dir) - result = [NSString stringWithGlibFilename:dir]; - g_free (dir); -#else -//#if (!GLIB_CHECK_VERSION (2, 26, 0)) -#define g_mkdtemp mkdtemp -//#endif - gchar *dir = g_build_filename (g_get_tmp_dir(), "tikzitXXXXXX", NULL); - gchar *rdir = g_mkdtemp (dir); - if (rdir) { - result = [NSString stringWithGlibFilename:dir]; - } else if (error) { - *error = [NSError errorWithLibcError:errno]; - } - g_free (dir); -#endif - return result; -} - -- (NSString*) createTempDirectory { - return [self createTempDirectoryWithError:NULL]; -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/NSString+Glib.h b/tikzit/src/gtk/NSString+Glib.h deleted file mode 100644 index ac59833..0000000 --- a/tikzit/src/gtk/NSString+Glib.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import -#import - -@interface NSString(Glib) -/** - * Initialise a string with a string in the GLib filename encoding - */ -- (id) initWithGlibFilename:(const gchar *)filename; -/** - * Create a string from a string in the GLib filename encoding - */ -+ (id) stringWithGlibFilename:(const gchar *)filename; -/** - * Get a copy of the string in GLib filename encoding. - * - * This will need to be freed with g_free. - */ -- (gchar*)glibFilename; -/** - * Get a copy of the string as a GLib URI - * - * This will need to be freed with g_free. - */ -- (gchar*)glibUriWithError:(NSError**)error; -/** - * Get a copy of the string as a GLib URI - * - * This will need to be freed with g_free. - */ -- (gchar*)glibUri; -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/NSString+Glib.m b/tikzit/src/gtk/NSString+Glib.m deleted file mode 100644 index b6dc765..0000000 --- a/tikzit/src/gtk/NSString+Glib.m +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "NSString+Glib.h" -#import "TZFoundation.h" - -@implementation NSString(Glib) -+ (id) stringWithGlibFilename:(const gchar *)filename { - return [[[self alloc] initWithGlibFilename:filename] autorelease]; -} - -- (id) initWithGlibFilename:(const gchar *)filename { - if (self == nil) { - return nil; - } - - if (filename == NULL) { - [self release]; - return nil; - } - - GError *error = NULL; - gchar *utf8file = g_filename_to_utf8 (filename, -1, NULL, NULL, &error); - if (utf8file == NULL) { - if (error) - logGError (error, @"Failed to convert a GLib filename to UTF8"); - [self release]; - return nil; - } - - self = [self initWithUTF8String:utf8file]; - g_free (utf8file); - - return self; -} - -- (gchar*)glibFilenameWithError:(NSError**)error { - GError *gerror = NULL; - gchar *result = g_filename_from_utf8 ([self UTF8String], -1, NULL, NULL, &gerror); - GErrorToNSError (gerror, error); - if (gerror) { - logGError (gerror, @"Failed to convert a UTF8 string to a GLib filename"); - } - return result; -} - -- (gchar*)glibFilename { - return [self glibFilenameWithError:NULL]; -} - -- (gchar*)glibUriWithError:(NSError**)error { - gchar *filepath; - gchar *uri; - NSError *cause = nil; - - filepath = [self glibFilenameWithError:&cause]; - if (!filepath) { - if (error) { - NSString *message = [NSString stringWithFormat:@"Could not convert \"%@\" to the GLib filename encoding", self]; - *error = [NSError errorWithMessage:message code:TZ_ERR_OTHER cause:cause]; - } - return NULL; - } - - GError *gerror = NULL; - GError **gerrorptr = error ? &gerror : NULL; - uri = g_filename_to_uri (filepath, NULL, gerrorptr); - if (!uri && error) { - NSString *message = [NSString stringWithFormat:@"Could not convert \"%@\" to a GLib URI", self]; - *error = [NSError errorWithMessage:message code:TZ_ERR_BADFORMAT cause:[NSError errorWithGError:gerror]]; - } - g_free (filepath); - return uri; -} - -- (gchar*)glibUri { - return [self glibUriWithError:NULL]; -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/Node+Render.h b/tikzit/src/gtk/Node+Render.h deleted file mode 100644 index 60d2573..0000000 --- a/tikzit/src/gtk/Node+Render.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "Node.h" -#import "RenderContext.h" -#import "Surface.h" - -enum NodeState { - NodeNormal, - NodeSelected, - NodeHighlighted -}; - -@interface Node(Render) - -- (Transformer*) shapeTransformerForSurface:(id)surface; -// the total rendered bounds, excluding label -- (NSRect) renderBoundsForSurface:(id)surface; -- (NSRect) renderBoundsWithLabelForSurface:(id)surface; -- (NSString*) renderedLabel; -- (NSSize) renderedLabelSizeInContext:(id)context; -- (void) renderLabelToSurface:(id)surface withContext:(id)context; -- (void) renderLabelAt:(NSPoint)point withContext:(id)context; -- (void) renderToSurface:(id)surface withContext:(id)context state:(enum NodeState)state; -- (BOOL) hitByPoint:(NSPoint)p onSurface:(id)surface; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/Node+Render.m b/tikzit/src/gtk/Node+Render.m deleted file mode 100644 index 907d818..0000000 --- a/tikzit/src/gtk/Node+Render.m +++ /dev/null @@ -1,188 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * Copyright 2010 Chris Heunen - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "Node+Render.h" -#import "Shape.h" -#import "Shape+Render.h" -#import "ShapeNames.h" - -#define MAX_LABEL_LENGTH 10 -#define LABEL_PADDING_X 2 -#define LABEL_PADDING_Y 2 - -@implementation Node (Render) - -- (Shape*) shapeToRender { - if (style) { - return [Shape shapeForName:[style shapeName]]; - } else { - return [Shape shapeForName:SHAPE_CIRCLE]; - } -} - -- (Transformer*) shapeTransformerForSurface:(id)surface { - return [self shapeTransformerFromTransformer:[surface transformer]]; -} - -- (NSRect) renderBoundsUsingShapeTransform:(Transformer*)shapeTrans { - float strokeThickness = style ? [style strokeThickness] : [NodeStyle defaultStrokeThickness]; - NSRect screenBounds = [shapeTrans rectToScreen:[[self shapeToRender] boundingRect]]; - screenBounds = NSInsetRect(screenBounds, -strokeThickness, -strokeThickness); - return screenBounds; -} - -- (NSRect) renderBoundsForSurface:(id)surface { - return [self renderBoundsUsingShapeTransform:[self shapeTransformerForSurface:surface]]; -} - -- (NSRect) renderBoundsWithLabelForSurface:(id)surface { - NSRect nodeBounds = [self renderBoundsForSurface:surface]; - NSRect labelRect = NSZeroRect; - if (![label isEqual:@""]) { - id cr = [surface createRenderContext]; - labelRect.size = [self renderedLabelSizeInContext:cr]; - NSPoint nodePos = [[surface transformer] toScreen:point]; - labelRect.origin.x = nodePos.x - (labelRect.size.width / 2); - labelRect.origin.y = nodePos.y - (labelRect.size.height / 2); - } - return NSUnionRect(nodeBounds, labelRect); -} - -- (RColor) strokeColor { - if (style) { - return [[style strokeColorRGB] rColor]; - } else { - return MakeRColor (0.4, 0.4, 0.7, 0.8); - } -} - -- (RColor) fillColor { - if (style) { - return [[style fillColorRGB] rColor]; - } else { - return MakeRColor (0.4, 0.4, 0.7, 0.3); - } -} - -- (NSString*) renderedLabel { - NSString *r_label = [label stringByExpandingLatexConstants]; - if ([r_label length] > MAX_LABEL_LENGTH) { - r_label = [[[r_label substringToIndex:MAX_LABEL_LENGTH-1] stringByTrimmingSpaces] stringByAppendingString:@"..."]; - } else { - r_label = [r_label stringByTrimmingSpaces]; - } - return r_label; -} - -- (NSSize) renderedLabelSizeInContext:(id)context { - NSSize result = {0, 0}; - if (![label isEqual:@""]) { - NSString *r_label = [self renderedLabel]; - - id layout = [context layoutText:r_label withSize:9]; - - result = [layout size]; - result.width += LABEL_PADDING_X; - result.height += LABEL_PADDING_Y; - } - return result; -} - -- (void) renderLabelToSurface:(id )surface withContext:(id)context { - [self renderLabelAt:[[surface transformer] toScreen:point] withContext:context]; -} - -- (void) renderLabelAt:(NSPoint)p withContext:(id)context { - // draw latex code overlayed on node - if (![label isEqual:@""]) { - [context saveState]; - - NSString *r_label = [self renderedLabel]; - id layout = [context layoutText:r_label withSize:9]; - - NSSize labelSize = [layout size]; - - NSRect textBounds = NSMakeRect (p.x - labelSize.width/2, - p.y - labelSize.height/2, - labelSize.width, - labelSize.height); - NSRect backRect = NSInsetRect (textBounds, -LABEL_PADDING_X, -LABEL_PADDING_Y); - - [context startPath]; - [context setLineWidth:1.0]; - [context rect:backRect]; - RColor fColor = MakeRColor (1.0, 1.0, 0.5, 0.7); - RColor sColor = MakeRColor (0.5, 0.0, 0.0, 0.7); - [context strokePathWithColor:sColor andFillWithColor:fColor]; - - [layout showTextAt:textBounds.origin withColor:BlackRColor]; - - [context restoreState]; - } -} - -- (void) renderToSurface:(id )surface withContext:(id)context state:(enum NodeState)state { - Transformer *shapeTrans = [self shapeTransformerForSurface:surface]; - float strokeThickness = style ? [style strokeThickness] : [NodeStyle defaultStrokeThickness]; - - [context saveState]; - - [[self shapeToRender] drawPathWithTransform:shapeTrans andContext:context]; - - [context setLineWidth:strokeThickness]; - if (!style) { - [context setLineDash:3.0]; - } - [context strokePathWithColor:[self strokeColor] andFillWithColor:[self fillColor]]; - - if (state != NodeNormal) { - [context setLineWidth:strokeThickness + 4.0]; - [context setLineDash:0.0]; - float alpha = 0.0f; - if (state == NodeSelected) - alpha = 0.5f; - else if (state == NodeHighlighted) - alpha = 0.25f; - RColor selectionColor = MakeSolidRColor(0.61f, 0.735f, 1.0f); - - [[self shapeToRender] drawPathWithTransform:shapeTrans andContext:context]; - [context strokePathWithColor:selectionColor andFillWithColor:selectionColor usingAlpha:alpha]; - } - - [context restoreState]; - [self renderLabelToSurface:surface withContext:context]; -} - -- (BOOL) hitByPoint:(NSPoint)p onSurface:(id)surface { - Transformer *shapeTrans = [self shapeTransformerForSurface:surface]; - - NSRect screenBounds = [self renderBoundsUsingShapeTransform:shapeTrans]; - if (!NSPointInRect(p, screenBounds)) { - return NO; - } - - float strokeThickness = style ? [style strokeThickness] : [NodeStyle defaultStrokeThickness]; - id ctx = [surface createRenderContext]; - [ctx setLineWidth:strokeThickness]; - [[self shapeToRender] drawPathWithTransform:shapeTrans andContext:ctx]; - return [ctx strokeIncludesPoint:p] || [ctx fillIncludesPoint:p]; -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/NodeStyle+Gtk.h b/tikzit/src/gtk/NodeStyle+Gtk.h deleted file mode 100644 index 4fa5edd..0000000 --- a/tikzit/src/gtk/NodeStyle+Gtk.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "NodeStyle.h" -#import - -@interface NodeStyle (Gtk) - -- (GdkColor) strokeColor; -- (void) setStrokeColor:(GdkColor)color; -- (GdkColor) fillColor; -- (void) setFillColor:(GdkColor)color; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/NodeStyle+Gtk.m b/tikzit/src/gtk/NodeStyle+Gtk.m deleted file mode 100644 index 1954def..0000000 --- a/tikzit/src/gtk/NodeStyle+Gtk.m +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "NodeStyle+Gtk.h" -#import "ColorRGB+Gtk.h" - -@implementation NodeStyle (Gtk) - -- (GdkColor) strokeColor { - return [[self strokeColorRGB] gdkColor]; -} - -- (void) setStrokeColor:(GdkColor)color { - [self setStrokeColorRGB:[ColorRGB colorWithGdkColor:color]]; -} - -- (GdkColor) fillColor { - return [[self fillColorRGB] gdkColor]; -} - -- (void) setFillColor:(GdkColor)color { - [self setFillColorRGB:[ColorRGB colorWithGdkColor:color]]; -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/NodeStyle+Render.h b/tikzit/src/gtk/NodeStyle+Render.h deleted file mode 100644 index 00edd27..0000000 --- a/tikzit/src/gtk/NodeStyle+Render.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "NodeStyle.h" -#import "RenderContext.h" -#import "Surface.h" - -@interface NodeStyle (Render) - -- (void) renderToSurface:(id)surface withContext:(id)context at:(NSPoint)p; -- (BOOL) hitByPoint:(NSPoint)p onSurface:(id)surface; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/NodeStyle+Storage.h b/tikzit/src/gtk/NodeStyle+Storage.h deleted file mode 100644 index 7649414..0000000 --- a/tikzit/src/gtk/NodeStyle+Storage.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "NodeStyle.h" -#import "Configuration.h" - -@interface NodeStyle (Storage) - -- (id) initFromConfigurationGroup:(NSString*)groupName config:(Configuration*)configFile; -- (void) storeToConfigurationGroup:(NSString*)groupName config:(Configuration*)configFile; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/NodeStyle+Storage.m b/tikzit/src/gtk/NodeStyle+Storage.m deleted file mode 100644 index 088b062..0000000 --- a/tikzit/src/gtk/NodeStyle+Storage.m +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * Copyright 2010 Chris Heunen - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "NodeStyle+Storage.h" -#import "ColorRGB+IntegerListStorage.h" - -@implementation NodeStyle (Storage) - -- (id) initFromConfigurationGroup:(NSString*)groupName config:(Configuration*)configFile { - self = [self init]; - - if (self) { - [self setName:[configFile stringEntry:@"Name" inGroup:groupName withDefault:name]]; - [self setCategory:[configFile stringEntry:@"Category" inGroup:groupName withDefault:category]]; - [self setShapeName:[configFile stringEntry:@"ShapeName" inGroup:groupName withDefault:shapeName]]; - [self setScale:[configFile doubleEntry:@"Scale" inGroup:groupName withDefault:scale]]; - [self setStrokeThickness:[configFile integerEntry:@"StrokeThickness" - inGroup:groupName - withDefault:strokeThickness]]; - [self setStrokeColorRGB: - [ColorRGB colorFromValueList: - [configFile integerListEntry:@"StrokeColor" - inGroup:groupName - withDefault:[strokeColorRGB valueList]]]]; - [self setFillColorRGB: - [ColorRGB colorFromValueList: - [configFile integerListEntry:@"FillColor" - inGroup:groupName - withDefault:[fillColorRGB valueList]]]]; - } - - return self; -} - -- (void) storeToConfigurationGroup:(NSString*)groupName config:(Configuration*)configFile { - [configFile setStringEntry:@"Name" inGroup:groupName value:[self name]]; - [configFile setStringEntry:@"Category" inGroup:groupName value:[self category]]; - [configFile setStringEntry:@"ShapeName" inGroup:groupName value:[self shapeName]]; - [configFile setDoubleEntry:@"Scale" inGroup:groupName value:[self scale]]; - [configFile setIntegerEntry:@"StrokeThickness" inGroup:groupName value:[self strokeThickness]]; - [configFile setIntegerListEntry:@"StrokeColor" inGroup:groupName value:[[self strokeColorRGB] valueList]]; - [configFile setIntegerListEntry:@"FillColor" inGroup:groupName value:[[self fillColorRGB] valueList]]; -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/NodeStyleEditor.h b/tikzit/src/gtk/NodeStyleEditor.h deleted file mode 100644 index b45c992..0000000 --- a/tikzit/src/gtk/NodeStyleEditor.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class NodeStyle; - -@interface NodeStyleEditor: NSObject { - NodeStyle *style; - GtkTable *table; - GtkEntry *nameEdit; - GtkComboBox *shapeNameCombo; - GtkColorButton *strokeColorButton; - GtkWidget *makeStrokeTexSafeButton; - GtkColorButton *fillColorButton; - GtkWidget *makeFillTexSafeButton; - GtkAdjustment *scaleAdj; - BOOL blockSignals; -} - -@property (retain) NodeStyle *style; -@property (readonly) GtkWidget *widget; - -- (id) init; - -- (void) selectNameField; - -@end - -// vim:ft=objc:ts=4:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit/src/gtk/NodeStyleEditor.m b/tikzit/src/gtk/NodeStyleEditor.m deleted file mode 100644 index fcf4147..0000000 --- a/tikzit/src/gtk/NodeStyleEditor.m +++ /dev/null @@ -1,477 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "NodeStyleEditor.h" -#import "NodeStyle.h" -#import "NodeStyle+Gtk.h" -#import "Shape.h" - -static const guint row_count = 5; - -// {{{ Internal interfaces -// {{{ GTK+ Callbacks -static void style_name_edit_changed_cb (GtkEditable *widget, NodeStyleEditor *editor); -static void style_shape_combo_changed_cb (GtkComboBox *widget, NodeStyleEditor *editor); -static void stroke_color_changed_cb (GtkColorButton *widget, NodeStyleEditor *editor); -static void fill_color_changed_cb (GtkColorButton *widget, NodeStyleEditor *editor); -static void make_stroke_safe_button_clicked_cb (GtkButton *widget, NodeStyleEditor *editor); -static void make_fill_safe_button_clicked_cb (GtkButton *widget, NodeStyleEditor *editor); -static void scale_adjustment_changed_cb (GtkAdjustment *widget, NodeStyleEditor *editor); -// }}} -// {{{ Notifications - -@interface NodeStyleEditor (Notifications) -- (void) shapeDictionaryReplaced:(NSNotification*)n; -- (void) nameChangedTo:(NSString*)value; -- (void) shapeNameChangedTo:(NSString*)value; -- (void) strokeColorChangedTo:(GdkColor)value; -- (void) makeStrokeColorTexSafe; -- (void) fillColorChangedTo:(GdkColor)value; -- (void) makeFillColorTexSafe; -- (void) scaleChangedTo:(double)value; -@end - -// }}} -// {{{ Private - -@interface NodeStyleEditor (Private) -- (void) loadShapeNames; -- (void) setActiveShapeName:(NSString*)name; -@end - -// }}} -// }}} -// {{{ API - -@implementation NodeStyleEditor - -- (void) _addWidget:(GtkWidget*)w withLabel:(gchar *)label atRow:(guint)row { - NSAssert(row < row_count, @"row_count is wrong!"); - - GtkWidget *l = gtk_label_new (label); - gtk_misc_set_alignment (GTK_MISC (l), 0, 0.5); - gtk_widget_show (l); - gtk_widget_show (w); - - gtk_table_attach (table, l, - 0, 1, row, row+1, // l, r, t, b - GTK_FILL, // x opts - GTK_FILL | GTK_EXPAND, // y opts - 5, // x padding - 0); // y padding - - gtk_table_attach (table, w, - 1, 2, row, row+1, // l, r, t, b - GTK_FILL | GTK_EXPAND, // x opts - GTK_FILL | GTK_EXPAND, // y opts - 0, // x padding - 0); // y padding -} - -- (GtkWidget*) _createMakeColorTexSafeButton:(NSString*)type { - GtkWidget *b = gtk_button_new (); - GtkWidget *icon = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_BUTTON); - gtk_widget_show (icon); - gtk_container_add (GTK_CONTAINER (b), icon); - NSString *ttip = [NSString stringWithFormat:@"The %@ colour is not a predefined TeX colour.\nClick here to choose the nearest TeX-safe colour.", type]; - gtk_widget_set_tooltip_text (b, [ttip UTF8String]); - return b; -} - -- (id) init { - self = [super init]; - - if (self != nil) { - style = nil; - table = GTK_TABLE (gtk_table_new (row_count, 2, FALSE)); - gtk_table_set_col_spacings (table, 6); - gtk_table_set_row_spacings (table, 6); - gtk_widget_set_sensitive (GTK_WIDGET (table), FALSE); - blockSignals = NO; - - /** - * Name - */ - nameEdit = GTK_ENTRY (gtk_entry_new ()); - g_object_ref_sink (nameEdit); - [self _addWidget:GTK_WIDGET (nameEdit) - withLabel:"Name" - atRow:0]; - g_signal_connect (G_OBJECT (nameEdit), - "changed", - G_CALLBACK (style_name_edit_changed_cb), - self); - - - /** - * Shape - */ - GtkListStore *store = gtk_list_store_new (1, G_TYPE_STRING); - shapeNameCombo = GTK_COMBO_BOX (gtk_combo_box_new_with_model (GTK_TREE_MODEL (store))); - GtkCellRenderer *cellRend = gtk_cell_renderer_text_new (); - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (shapeNameCombo), - cellRend, - TRUE); - gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (shapeNameCombo), cellRend, "text", 0); - g_object_ref_sink (shapeNameCombo); - [self _addWidget:GTK_WIDGET (shapeNameCombo) - withLabel:"Shape" - atRow:1]; - g_signal_connect (G_OBJECT (shapeNameCombo), - "changed", - G_CALLBACK (style_shape_combo_changed_cb), - self); - - - /** - * Stroke colour - */ - GtkWidget *strokeBox = gtk_hbox_new (FALSE, 0); - [self _addWidget:strokeBox - withLabel:"Stroke colour" - atRow:2]; - strokeColorButton = GTK_COLOR_BUTTON (gtk_color_button_new ()); - g_object_ref_sink (strokeColorButton); - gtk_widget_show (GTK_WIDGET (strokeColorButton)); - gtk_box_pack_start (GTK_BOX (strokeBox), GTK_WIDGET (strokeColorButton), - FALSE, FALSE, 0); - makeStrokeTexSafeButton = [self _createMakeColorTexSafeButton:@"stroke"]; - g_object_ref_sink (makeStrokeTexSafeButton); - gtk_box_pack_start (GTK_BOX (strokeBox), makeStrokeTexSafeButton, - FALSE, FALSE, 0); - g_signal_connect (G_OBJECT (strokeColorButton), - "color-set", - G_CALLBACK (stroke_color_changed_cb), - self); - g_signal_connect (G_OBJECT (makeStrokeTexSafeButton), - "clicked", - G_CALLBACK (make_stroke_safe_button_clicked_cb), - self); - - - /** - * Fill colour - */ - GtkWidget *fillBox = gtk_hbox_new (FALSE, 0); - [self _addWidget:fillBox - withLabel:"Fill colour" - atRow:3]; - fillColorButton = GTK_COLOR_BUTTON (gtk_color_button_new ()); - g_object_ref_sink (fillColorButton); - gtk_widget_show (GTK_WIDGET (fillColorButton)); - gtk_box_pack_start (GTK_BOX (fillBox), GTK_WIDGET (fillColorButton), - FALSE, FALSE, 0); - makeFillTexSafeButton = [self _createMakeColorTexSafeButton:@"fill"]; - g_object_ref_sink (makeFillTexSafeButton); - gtk_box_pack_start (GTK_BOX (fillBox), makeFillTexSafeButton, - FALSE, FALSE, 0); - g_signal_connect (G_OBJECT (fillColorButton), - "color-set", - G_CALLBACK (fill_color_changed_cb), - self); - g_signal_connect (G_OBJECT (makeFillTexSafeButton), - "clicked", - G_CALLBACK (make_fill_safe_button_clicked_cb), - self); - - - /** - * Scale - */ - scaleAdj = GTK_ADJUSTMENT (gtk_adjustment_new ( - 1.0, // value - 0.0, // lower - 50.0, // upper - 0.20, // step - 1.0, // page - 0.0)); // (irrelevant) - g_object_ref_sink (scaleAdj); - GtkWidget *scaleSpin = gtk_spin_button_new (scaleAdj, 0.0, 2); - [self _addWidget:scaleSpin - withLabel:"Scale" - atRow:4]; - g_signal_connect (G_OBJECT (scaleAdj), - "value-changed", - G_CALLBACK (scale_adjustment_changed_cb), - self); - - [self loadShapeNames]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(shapeDictionaryReplaced:) - name:@"ShapeDictionaryReplaced" - object:[Shape class]]; - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - g_object_unref (nameEdit); - g_object_unref (shapeNameCombo); - g_object_unref (strokeColorButton); - g_object_unref (makeStrokeTexSafeButton); - g_object_unref (fillColorButton); - g_object_unref (makeFillTexSafeButton); - g_object_unref (scaleAdj); - g_object_unref (table); - [style release]; - - [super dealloc]; -} - -- (NodeStyle*) style { - return style; -} - -- (void) setStyle:(NodeStyle*)s { - blockSignals = YES; - NodeStyle *oldStyle = style; - style = [s retain]; - - if (style != nil) { - gtk_widget_set_sensitive (GTK_WIDGET (table), TRUE); - - gtk_entry_set_text(nameEdit, [[style name] UTF8String]); - - [self setActiveShapeName:[style shapeName]]; - - GdkColor c = [style strokeColor]; - gtk_color_button_set_color(strokeColorButton, &c); - - gtk_widget_set_visible (makeStrokeTexSafeButton, ([[style strokeColorRGB] name] == nil)); - - c = [style fillColor]; - gtk_color_button_set_color(fillColorButton, &c); - - gtk_widget_set_visible (makeFillTexSafeButton, ([[style fillColorRGB] name] == nil)); - - gtk_adjustment_set_value(scaleAdj, [style scale]); - } else { - gtk_entry_set_text(nameEdit, ""); - [self setActiveShapeName:nil]; - gtk_widget_set_visible (makeStrokeTexSafeButton, FALSE); - gtk_widget_set_visible (makeFillTexSafeButton, FALSE); - gtk_adjustment_set_value(scaleAdj, 1.0); - gtk_widget_set_sensitive (GTK_WIDGET (table), FALSE); - } - - [oldStyle release]; - blockSignals = NO; -} - -- (GtkWidget*) widget { - return GTK_WIDGET (table); -} - -- (void) selectNameField { - gtk_widget_grab_focus (GTK_WIDGET (nameEdit)); - gtk_editable_select_region (GTK_EDITABLE (nameEdit), 0, -1); -} - -@end - -// }}} -// {{{ Notifications - -@implementation NodeStyleEditor (Notifications) -- (void) shapeDictionaryReplaced:(NSNotification*)n { - blockSignals = YES; - - [self loadShapeNames]; - [self setActiveShapeName:[style shapeName]]; - - blockSignals = NO; -} - -- (void) nameChangedTo:(NSString*)value { - [style setName:value]; -} - -- (void) shapeNameChangedTo:(NSString*)value { - [style setShapeName:value]; -} - -- (void) strokeColorChangedTo:(GdkColor)value { - [style setStrokeColor:value]; - gtk_widget_set_visible (makeStrokeTexSafeButton, - [[style strokeColorRGB] name] == nil); -} - -- (void) makeStrokeColorTexSafe { - if (style != nil) { - [[style strokeColorRGB] setToClosestHashed]; - GdkColor color = [style strokeColor]; - gtk_color_button_set_color(strokeColorButton, &color); - gtk_widget_set_visible (makeStrokeTexSafeButton, FALSE); - } -} - -- (void) fillColorChangedTo:(GdkColor)value { - [style setFillColor:value]; - gtk_widget_set_visible (makeFillTexSafeButton, - [[style fillColorRGB] name] == nil); -} - -- (void) makeFillColorTexSafe { - if (style != nil) { - [[style fillColorRGB] setToClosestHashed]; - GdkColor color = [style fillColor]; - gtk_color_button_set_color(fillColorButton, &color); - gtk_widget_set_visible (makeFillTexSafeButton, FALSE); - } -} - -- (void) scaleChangedTo:(double)value { - [style setScale:value]; -} -@end - -// }}} -// {{{ Private - -@implementation NodeStyleEditor (Private) -- (BOOL) signalsBlocked { return blockSignals; } - -- (void) loadShapeNames { - blockSignals = YES; - - gtk_combo_box_set_active (shapeNameCombo, -1); - - GtkListStore *list = GTK_LIST_STORE (gtk_combo_box_get_model (shapeNameCombo)); - gtk_list_store_clear (list); - - NSEnumerator *en = [[Shape shapeDictionary] keyEnumerator]; - NSString *shapeName; - GtkTreeIter iter; - while ((shapeName = [en nextObject]) != nil) { - gtk_list_store_append (list, &iter); - gtk_list_store_set (list, &iter, 0, [shapeName UTF8String], -1); - } - - blockSignals = NO; -} - -- (void) setActiveShapeName:(NSString*)name { - if (name == nil) { - gtk_combo_box_set_active (shapeNameCombo, -1); - return; - } - const gchar *shapeName = [name UTF8String]; - - GtkTreeModel *model = gtk_combo_box_get_model (shapeNameCombo); - GtkTreeIter iter; - if (gtk_tree_model_get_iter_first (model, &iter)) { - do { - gchar *rowShapeName; - gtk_tree_model_get (model, &iter, 0, &rowShapeName, -1); - if (g_strcmp0 (shapeName, rowShapeName) == 0) { - gtk_combo_box_set_active_iter (shapeNameCombo, &iter); - g_free (rowShapeName); - return; - } - g_free (rowShapeName); - } while (gtk_tree_model_iter_next (model, &iter)); - } -} -@end - -// }}} -// {{{ GTK+ callbacks - -static void style_name_edit_changed_cb (GtkEditable *widget, NodeStyleEditor *editor) { - if ([editor signalsBlocked]) - return; - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - const gchar *contents = gtk_entry_get_text (GTK_ENTRY (widget)); - [editor nameChangedTo:[NSString stringWithUTF8String:contents]]; - - [pool drain]; -} - -static void style_shape_combo_changed_cb (GtkComboBox *widget, NodeStyleEditor *editor) { - if ([editor signalsBlocked]) - return; - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - GtkTreeIter iter; - gtk_combo_box_get_active_iter (widget, &iter); - gchar *shapeName = NULL; - gtk_tree_model_get (gtk_combo_box_get_model (widget), &iter, 0, &shapeName, -1); - [editor shapeNameChangedTo:[NSString stringWithUTF8String:shapeName]]; - g_free (shapeName); - - [pool drain]; -} - -static void stroke_color_changed_cb (GtkColorButton *widget, NodeStyleEditor *editor) { - if ([editor signalsBlocked]) - return; - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - GdkColor color; - gtk_color_button_get_color (widget, &color); - [editor strokeColorChangedTo:color]; - - [pool drain]; -} - -static void fill_color_changed_cb (GtkColorButton *widget, NodeStyleEditor *editor) { - if ([editor signalsBlocked]) - return; - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - GdkColor color; - gtk_color_button_get_color (widget, &color); - [editor fillColorChangedTo:color]; - - [pool drain]; -} - -static void make_stroke_safe_button_clicked_cb (GtkButton *widget, NodeStyleEditor *editor) { - if ([editor signalsBlocked]) - return; - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor makeStrokeColorTexSafe]; - [pool drain]; -} - -static void make_fill_safe_button_clicked_cb (GtkButton *widget, NodeStyleEditor *editor) { - if ([editor signalsBlocked]) - return; - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor makeFillColorTexSafe]; - [pool drain]; -} - -static void scale_adjustment_changed_cb (GtkAdjustment *adj, NodeStyleEditor *editor) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor scaleChangedTo:gtk_adjustment_get_value (adj)]; - [pool drain]; -} - -// }}} - -// vim:ft=objc:ts=4:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit/src/gtk/NodeStyleSelector.h b/tikzit/src/gtk/NodeStyleSelector.h deleted file mode 100644 index a699dc8..0000000 --- a/tikzit/src/gtk/NodeStyleSelector.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class NodeStyle; -@class NodeStylesModel; -@class StyleManager; - -@interface NodeStyleSelector: NSObject { - NodeStylesModel *model; - GtkIconView *view; -} - -/*! - @property widget - @brief The GTK widget - */ -@property (readonly) GtkWidget *widget; - -/*! - @property model - @brief The model to use. - */ -@property (retain) NodeStylesModel *model; - -/*! - @property selectedStyle - @brief The selected style. - - When this changes, a SelectedStyleChanged notification will be posted - */ -@property (assign) NodeStyle *selectedStyle; - -/*! - * Initialise with a new model for the given style manager - */ -- (id) initWithStyleManager:(StyleManager*)manager; -/*! - * Initialise with the given model - */ -- (id) initWithModel:(NodeStylesModel*)model; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/NodeStyleSelector.m b/tikzit/src/gtk/NodeStyleSelector.m deleted file mode 100644 index 14cdc75..0000000 --- a/tikzit/src/gtk/NodeStyleSelector.m +++ /dev/null @@ -1,135 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "NodeStyleSelector.h" - -#import "NodeStylesModel.h" - -// {{{ Internal interfaces -static void selection_changed_cb (GtkIconView *widget, NodeStyleSelector *mgr); -// }}} -// {{{ API - -@implementation NodeStyleSelector - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithStyleManager:(StyleManager*)m { - return [self initWithModel:[NodeStylesModel modelWithStyleManager:m]]; -} -- (id) initWithModel:(NodeStylesModel*)m { - self = [super init]; - - if (self) { - model = [m retain]; - - view = GTK_ICON_VIEW (gtk_icon_view_new ()); - g_object_ref_sink (view); - - gtk_icon_view_set_model (view, [model model]); - gtk_icon_view_set_pixbuf_column (view, NODE_STYLES_ICON_COL); - gtk_icon_view_set_tooltip_column (view, NODE_STYLES_NAME_COL); - gtk_icon_view_set_selection_mode (view, GTK_SELECTION_SINGLE); - - g_signal_connect (G_OBJECT (view), - "selection-changed", - G_CALLBACK (selection_changed_cb), - self); - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - g_object_unref (view); - [model release]; - - [super dealloc]; -} - -- (NodeStylesModel*) model { - return model; -} - -- (void) setModel:(NodeStylesModel*)m { - if (m == model) - return; - - NodeStylesModel *oldModel = model; - model = [m retain]; - gtk_icon_view_set_model (view, [model model]); - [oldModel release]; -} - -- (GtkWidget*) widget { - return GTK_WIDGET (view); -} - -- (NodeStyle*) selectedStyle { - GList *list = gtk_icon_view_get_selected_items (view); - if (!list) { - return nil; - } - if (list->next != NULL) { - NSLog(@"Multiple selected items in NodeStyleSelector!"); - } - - GtkTreePath *path = (GtkTreePath*) list->data; - NodeStyle *style = [model styleFromPath:path]; - - g_list_foreach (list, (GFunc)gtk_tree_path_free, NULL); - g_list_free (list); - - return style; -} - -- (void) setSelectedStyle:(NodeStyle*)style { - if (style == nil) { - gtk_icon_view_unselect_all (view); - return; - } - - GtkTreePath *path = [model pathFromStyle:style]; - if (path) { - gtk_icon_view_unselect_all (view); - gtk_icon_view_select_path (view, path); - gtk_tree_path_free (path); - } -} - -@end - -// }}} -// {{{ GTK+ callbacks - -static void selection_changed_cb (GtkIconView *view, NodeStyleSelector *mgr) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - [[NSNotificationCenter defaultCenter] - postNotificationName:@"SelectedStyleChanged" - object:mgr]; - - [pool drain]; -} -// }}} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit/src/gtk/NodeStylesModel.h b/tikzit/src/gtk/NodeStylesModel.h deleted file mode 100644 index a048560..0000000 --- a/tikzit/src/gtk/NodeStylesModel.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class NodeStyle; -@class StyleManager; - -enum { - NODE_STYLES_NAME_COL = 0, - NODE_STYLES_ICON_COL, - NODE_STYLES_PTR_COL, - NODE_STYLES_N_COLS -}; - -@interface NodeStylesModel: NSObject { - GtkListStore *store; - StyleManager *styleManager; -} - -/*! - @property model - @brief The GTK+ tree model - */ -@property (readonly) GtkTreeModel *model; - -/*! - @property manager - @brief The StyleManager to use. - */ -@property (retain) StyleManager *styleManager; - -/*! - * Initialise with the given style manager - */ -- (id) initWithStyleManager:(StyleManager*)m; - -+ (id) modelWithStyleManager:(StyleManager*)m; - -- (NodeStyle*) styleFromPath:(GtkTreePath*)path; -- (GtkTreePath*) pathFromStyle:(NodeStyle*)style; -- (NodeStyle*) styleFromIter:(GtkTreeIter*)iter; -- (GtkTreeIter*) iterFromStyle:(NodeStyle*)style; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/NodeStylesModel.m b/tikzit/src/gtk/NodeStylesModel.m deleted file mode 100644 index 3cc5771..0000000 --- a/tikzit/src/gtk/NodeStylesModel.m +++ /dev/null @@ -1,381 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "NodeStylesModel.h" - -#import "CairoRenderContext.h" -#import "NodeStyle.h" -#import "Shape.h" -#import "Shape+Render.h" -#import "ShapeNames.h" -#import "StyleManager.h" - -#import "gtkhelpers.h" - -#import - -// {{{ Internal interfaces - -@interface NodeStylesModel (Notifications) -- (void) nodeStylesReplaced:(NSNotification*)notification; -- (void) nodeStyleAdded:(NSNotification*)notification; -- (void) nodeStyleRemoved:(NSNotification*)notification; -- (void) shapeDictionaryReplaced:(NSNotification*)n; -- (void) observeValueForKeyPath:(NSString*)keyPath - ofObject:(id)object - change:(NSDictionary*)change - context:(void*)context; -@end - -@interface NodeStylesModel (Private) -- (cairo_surface_t*) createNodeIconSurface; -- (GdkPixbuf*) pixbufOfNodeInStyle:(NodeStyle*)style; -- (GdkPixbuf*) pixbufOfNodeInStyle:(NodeStyle*)style usingSurface:(cairo_surface_t*)surface; -- (void) addNodeStyle:(NodeStyle*)style; -- (void) addNodeStyle:(NodeStyle*)style usingSurface:(cairo_surface_t*)surface; -- (void) observeNodeStyle:(NodeStyle*)style; -- (void) stopObservingNodeStyle:(NodeStyle*)style; -- (void) clearNodeStylesModel; -- (void) reloadNodeStyles; -@end - -// }}} -// {{{ API - -@implementation NodeStylesModel - -+ (id) modelWithStyleManager:(StyleManager*)m { - return [[[self alloc] initWithStyleManager:m] autorelease]; -} - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithStyleManager:(StyleManager*)m { - self = [super init]; - - if (self) { - store = gtk_list_store_new (NODE_STYLES_N_COLS, - G_TYPE_STRING, - GDK_TYPE_PIXBUF, - G_TYPE_POINTER); - g_object_ref_sink (store); - - [self setStyleManager:m]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(shapeDictionaryReplaced:) - name:@"ShapeDictionaryReplaced" - object:[Shape class]]; - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - [self clearNodeStylesModel]; - g_object_unref (store); - [styleManager release]; - - [super dealloc]; -} - -- (StyleManager*) styleManager { - return styleManager; -} - -- (void) setStyleManager:(StyleManager*)m { - if (m == nil) { - [NSException raise:NSInvalidArgumentException format:@"Style manager cannot be nil"]; - } - [m retain]; - - [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:styleManager]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(nodeStylesReplaced:) - name:@"NodeStylesReplaced" - object:m]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(nodeStyleAdded:) - name:@"NodeStyleAdded" - object:m]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(nodeStyleRemoved:) - name:@"NodeStyleRemoved" - object:m]; - - [styleManager release]; - styleManager = m; - - [self reloadNodeStyles]; -} - -- (GtkTreeModel*) model { - return GTK_TREE_MODEL (store); -} - -- (NodeStyle*) styleFromPath:(GtkTreePath*)path { - GtkTreeIter iter; - gtk_tree_model_get_iter (GTK_TREE_MODEL (store), &iter, path); - NodeStyle *style = nil; - gtk_tree_model_get (GTK_TREE_MODEL (store), &iter, NODE_STYLES_PTR_COL, &style, -1); - return style; -} - -- (GtkTreePath*) pathFromStyle:(NodeStyle*)style { - GtkTreeModel *m = GTK_TREE_MODEL (store); - GtkTreeIter row; - if (gtk_tree_model_get_iter_first (m, &row)) { - do { - NodeStyle *rowStyle; - gtk_tree_model_get (m, &row, NODE_STYLES_PTR_COL, &rowStyle, -1); - if (style == rowStyle) { - return gtk_tree_model_get_path (m, &row); - } - } while (gtk_tree_model_iter_next (m, &row)); - } - return NULL; -} - -- (NodeStyle*) styleFromIter:(GtkTreeIter*)iter { - NodeStyle *style = nil; - gtk_tree_model_get (GTK_TREE_MODEL (store), iter, NODE_STYLES_PTR_COL, &style, -1); - return style; -} - -- (GtkTreeIter*) iterFromStyle:(NodeStyle*)style { - GtkTreeModel *m = GTK_TREE_MODEL (store); - GtkTreeIter row; - if (gtk_tree_model_get_iter_first (m, &row)) { - do { - NodeStyle *rowStyle; - gtk_tree_model_get (m, &row, NODE_STYLES_PTR_COL, &rowStyle, -1); - if (style == rowStyle) { - return gtk_tree_iter_copy (&row); - } - } while (gtk_tree_model_iter_next (m, &row)); - } - return NULL; -} -@end - -// }}} -// {{{ Notifications - -@implementation NodeStylesModel (Notifications) - -- (void) nodeStylesReplaced:(NSNotification*)notification { - [self reloadNodeStyles]; -} - -- (void) nodeStyleAdded:(NSNotification*)notification { - [self addNodeStyle:[[notification userInfo] objectForKey:@"style"]]; -} - -- (void) nodeStyleRemoved:(NSNotification*)notification { - NodeStyle *style = [[notification userInfo] objectForKey:@"style"]; - - GtkTreeModel *model = GTK_TREE_MODEL (store); - GtkTreeIter row; - if (gtk_tree_model_get_iter_first (model, &row)) { - do { - NodeStyle *rowStyle; - gtk_tree_model_get (model, &row, NODE_STYLES_PTR_COL, &rowStyle, -1); - if (style == rowStyle) { - gtk_list_store_remove (store, &row); - [self stopObservingNodeStyle:rowStyle]; - [rowStyle release]; - return; - } - } while (gtk_tree_model_iter_next (model, &row)); - } -} - -- (void) observeValueForKeyPath:(NSString*)keyPath - ofObject:(id)object - change:(NSDictionary*)change - context:(void*)context -{ - if ([object class] == [NodeStyle class]) { - NodeStyle *style = object; - - GtkTreeModel *model = GTK_TREE_MODEL (store); - GtkTreeIter row; - if (gtk_tree_model_get_iter_first (model, &row)) { - do { - NodeStyle *rowStyle; - gtk_tree_model_get (model, &row, NODE_STYLES_PTR_COL, &rowStyle, -1); - if (style == rowStyle) { - if ([@"name" isEqual:keyPath]) { - gtk_list_store_set (store, &row, NODE_STYLES_NAME_COL, [[style name] UTF8String], -1); - } else { - GdkPixbuf *pixbuf = [self pixbufOfNodeInStyle:style]; - gtk_list_store_set (store, &row, NODE_STYLES_ICON_COL, pixbuf, -1); - g_object_unref (pixbuf); - } - } - } while (gtk_tree_model_iter_next (model, &row)); - } - } -} - -- (void) shapeDictionaryReplaced:(NSNotification*)n { - [self reloadNodeStyles]; -} -@end - -// }}} -// {{{ Private - -@implementation NodeStylesModel (Private) -- (cairo_surface_t*) createNodeIconSurface { - return cairo_image_surface_create (CAIRO_FORMAT_ARGB32, 24, 24); -} - -- (GdkPixbuf*) pixbufOfNodeInStyle:(NodeStyle*)style { - cairo_surface_t *surface = [self createNodeIconSurface]; - GdkPixbuf *pixbuf = [self pixbufOfNodeInStyle:style usingSurface:surface]; - cairo_surface_destroy (surface); - return pixbuf; -} - -- (GdkPixbuf*) pixbufOfNodeInStyle:(NodeStyle*)style usingSurface:(cairo_surface_t*)surface { - Shape *shape = [Shape shapeForName:[style shapeName]]; - - int width = cairo_image_surface_get_width (surface); - int height = cairo_image_surface_get_height (surface); - NSRect pixbufBounds = NSMakeRect(0.0, 0.0, width, height); - const CGFloat lineWidth = [style strokeThickness]; - Transformer *shapeTrans = [Transformer transformerToFit:[shape boundingRect] - intoScreenRect:NSInsetRect(pixbufBounds, lineWidth, lineWidth) - flippedAboutXAxis:YES]; - if ([style scale] < 1.0) - [shapeTrans setScale:[style scale] * [shapeTrans scale]]; - - CairoRenderContext *context = [[CairoRenderContext alloc] initForSurface:surface]; - [context clearSurface]; - [shape drawPathWithTransform:shapeTrans andContext:context]; - [context setLineWidth:lineWidth]; - [context strokePathWithColor:[[style strokeColorRGB] rColor] - andFillWithColor:[[style fillColorRGB] rColor]]; - [context release]; - - return pixbuf_get_from_surface (surface); -} - -- (void) addNodeStyle:(NodeStyle*)style usingSurface:(cairo_surface_t*)surface { - GtkTreeIter iter; - gtk_list_store_append (store, &iter); - - GdkPixbuf *pixbuf = [self pixbufOfNodeInStyle:style usingSurface:surface]; - gtk_list_store_set (store, &iter, - NODE_STYLES_NAME_COL, [[style name] UTF8String], - NODE_STYLES_ICON_COL, pixbuf, - NODE_STYLES_PTR_COL, (gpointer)[style retain], - -1); - g_object_unref (pixbuf); - [self observeNodeStyle:style]; -} - -- (void) addNodeStyle:(NodeStyle*)style { - cairo_surface_t *surface = [self createNodeIconSurface]; - [self addNodeStyle:style usingSurface:surface]; - cairo_surface_destroy (surface); -} - -- (void) observeNodeStyle:(NodeStyle*)style { - [style addObserver:self - forKeyPath:@"name" - options:NSKeyValueObservingOptionNew - context:NULL]; - [style addObserver:self - forKeyPath:@"strokeThickness" - options:0 - context:NULL]; - [style addObserver:self - forKeyPath:@"strokeColorRGB.red" - options:0 - context:NULL]; - [style addObserver:self - forKeyPath:@"strokeColorRGB.green" - options:0 - context:NULL]; - [style addObserver:self - forKeyPath:@"strokeColorRGB.blue" - options:0 - context:NULL]; - [style addObserver:self - forKeyPath:@"fillColorRGB.red" - options:0 - context:NULL]; - [style addObserver:self - forKeyPath:@"fillColorRGB.green" - options:0 - context:NULL]; - [style addObserver:self - forKeyPath:@"fillColorRGB.blue" - options:0 - context:NULL]; - [style addObserver:self - forKeyPath:@"shapeName" - options:0 - context:NULL]; -} - -- (void) stopObservingNodeStyle:(NodeStyle*)style { - [style removeObserver:self forKeyPath:@"name"]; - [style removeObserver:self forKeyPath:@"strokeThickness"]; - [style removeObserver:self forKeyPath:@"strokeColorRGB.red"]; - [style removeObserver:self forKeyPath:@"strokeColorRGB.green"]; - [style removeObserver:self forKeyPath:@"strokeColorRGB.blue"]; - [style removeObserver:self forKeyPath:@"fillColorRGB.red"]; - [style removeObserver:self forKeyPath:@"fillColorRGB.green"]; - [style removeObserver:self forKeyPath:@"fillColorRGB.blue"]; - [style removeObserver:self forKeyPath:@"shapeName"]; -} - -- (void) clearNodeStylesModel { - GtkTreeModel *model = GTK_TREE_MODEL (store); - GtkTreeIter row; - if (gtk_tree_model_get_iter_first (model, &row)) { - do { - NodeStyle *rowStyle; - gtk_tree_model_get (model, &row, NODE_STYLES_PTR_COL, &rowStyle, -1); - [self stopObservingNodeStyle:rowStyle]; - [rowStyle release]; - } while (gtk_tree_model_iter_next (model, &row)); - } - gtk_list_store_clear (store); -} - -- (void) reloadNodeStyles { - [self clearNodeStylesModel]; - cairo_surface_t *surface = [self createNodeIconSurface]; - for (NodeStyle *style in [styleManager nodeStyles]) { - [self addNodeStyle:style usingSurface:surface]; - } - cairo_surface_destroy (surface); -} -@end - -// }}} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit/src/gtk/NodeStylesPalette.h b/tikzit/src/gtk/NodeStylesPalette.h deleted file mode 100644 index ac712ea..0000000 --- a/tikzit/src/gtk/NodeStylesPalette.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class StyleManager; -@class NodeStyleSelector; -@class NodeStyleEditor; - -@interface NodeStylesPalette: NSObject { - NodeStyleSelector *selector; - NodeStyleEditor *editor; - - GtkWidget *palette; - - GtkWidget *removeStyleButton; - GtkWidget *applyStyleButton; - GtkWidget *clearStyleButton; -} - -@property (retain) StyleManager *styleManager; -@property (readonly) GtkWidget *widget; - -- (id) initWithManager:(StyleManager*)m; - -@end - -// vim:ft=objc:ts=4:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit/src/gtk/NodeStylesPalette.m b/tikzit/src/gtk/NodeStylesPalette.m deleted file mode 100644 index e28edbb..0000000 --- a/tikzit/src/gtk/NodeStylesPalette.m +++ /dev/null @@ -1,197 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "NodeStylesPalette.h" - -#import "NodeStyleSelector.h" -#import "NodeStyleEditor.h" -#import "NodeStylesModel.h" -#import "StyleManager.h" - -// {{{ Internal interfaces -// {{{ GTK+ Callbacks -static void add_style_button_cb (GtkButton *widget, NodeStylesPalette *palette); -static void remove_style_button_cb (GtkButton *widget, NodeStylesPalette *palette); -// }}} -// {{{ Notifications - -@interface NodeStylesPalette (Notifications) -- (void) selectedStyleChanged:(NSNotification*)notification; -@end - -// }}} -// {{{ Private - -@interface NodeStylesPalette (Private) -- (void) updateButtonState; -- (void) removeSelectedStyle; -- (void) addStyle; -@end - -// }}} -// }}} -// {{{ API - -@implementation NodeStylesPalette - -@synthesize widget=palette; - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithManager:(StyleManager*)m { - self = [super init]; - - if (self) { - selector = [[NodeStyleSelector alloc] initWithStyleManager:m]; - editor = [[NodeStyleEditor alloc] init]; - - palette = gtk_vbox_new (FALSE, 6); - gtk_container_set_border_width (GTK_CONTAINER (palette), 6); - g_object_ref_sink (palette); - - GtkWidget *mainBox = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (palette), mainBox, FALSE, FALSE, 0); - gtk_widget_show (mainBox); - - GtkWidget *selectorScroller = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (selectorScroller), - GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); - GtkWidget *selectorFrame = gtk_frame_new (NULL); - gtk_container_add (GTK_CONTAINER (selectorScroller), [selector widget]); - gtk_container_add (GTK_CONTAINER (selectorFrame), selectorScroller); - gtk_box_pack_start (GTK_BOX (mainBox), selectorFrame, TRUE, TRUE, 0); - gtk_widget_show (selectorScroller); - gtk_widget_show (selectorFrame); - gtk_widget_show ([selector widget]); - - gtk_box_pack_start (GTK_BOX (mainBox), [editor widget], TRUE, TRUE, 0); - gtk_widget_show ([editor widget]); - - GtkBox *buttonBox = GTK_BOX (gtk_hbox_new(FALSE, 0)); - gtk_box_pack_start (GTK_BOX (palette), GTK_WIDGET (buttonBox), FALSE, FALSE, 0); - - GtkWidget *addStyleButton = gtk_button_new (); - gtk_widget_set_tooltip_text (addStyleButton, "Add a new style"); - GtkWidget *addIcon = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON); - gtk_container_add (GTK_CONTAINER (addStyleButton), addIcon); - gtk_box_pack_start (buttonBox, addStyleButton, FALSE, FALSE, 0); - g_signal_connect (G_OBJECT (addStyleButton), - "clicked", - G_CALLBACK (add_style_button_cb), - self); - - removeStyleButton = gtk_button_new (); - g_object_ref_sink (removeStyleButton); - gtk_widget_set_tooltip_text (removeStyleButton, "Delete selected style"); - GtkWidget *removeIcon = gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_BUTTON); - gtk_container_add (GTK_CONTAINER (removeStyleButton), removeIcon); - gtk_box_pack_start (buttonBox, removeStyleButton, FALSE, FALSE, 0); - g_signal_connect (G_OBJECT (removeStyleButton), - "clicked", - G_CALLBACK (remove_style_button_cb), - self); - - gtk_widget_show_all (GTK_WIDGET (buttonBox)); - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(selectedStyleChanged:) - name:@"SelectedStyleChanged" - object:selector]; - - [self updateButtonState]; - } - - return self; -} - -- (StyleManager*) styleManager { - return [[selector model] styleManager]; -} - -- (void) setStyleManager:(StyleManager*)m { - [[selector model] setStyleManager:m]; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - [editor release]; - [selector release]; - g_object_unref (palette); - g_object_unref (removeStyleButton); - - [super dealloc]; -} - -@end - -// }}} -// {{{ Notifications - -@implementation NodeStylesPalette (Notifications) -- (void) selectedStyleChanged:(NSNotification*)notification { - [editor setStyle:[selector selectedStyle]]; - [self updateButtonState]; -} -@end - -// }}} -// {{{ Private - -@implementation NodeStylesPalette (Private) -- (void) updateButtonState { - gboolean hasStyleSelection = [selector selectedStyle] != nil; - - gtk_widget_set_sensitive (removeStyleButton, hasStyleSelection); -} - -- (void) removeSelectedStyle { - NodeStyle *style = [selector selectedStyle]; - if (style) - [[[selector model] styleManager] removeNodeStyle:style]; -} - -- (void) addStyle { - NodeStyle *newStyle = [NodeStyle defaultNodeStyleWithName:@"newstyle"]; - [[self styleManager] addNodeStyle:newStyle]; - [selector setSelectedStyle:newStyle]; - [editor selectNameField]; -} - -@end - -// }}} -// {{{ GTK+ callbacks - -static void add_style_button_cb (GtkButton *widget, NodeStylesPalette *palette) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [palette addStyle]; - [pool drain]; -} - -static void remove_style_button_cb (GtkButton *widget, NodeStylesPalette *palette) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [palette removeSelectedStyle]; - [pool drain]; -} - -// }}} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit/src/gtk/PreambleEditor.h b/tikzit/src/gtk/PreambleEditor.h deleted file mode 100644 index f181446..0000000 --- a/tikzit/src/gtk/PreambleEditor.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class Preambles; - -@interface PreambleEditor: NSObject { - Preambles *preambles; - - // we don't keep any refs, as we control - // the top window - GtkWindow *parentWindow; - GtkWindow *window; - GtkListStore *preambleListStore; - GtkTreeView *preambleSelector; - GtkTextView *preambleView; - BOOL blockSignals; - BOOL adding; -} - -- (id) initWithPreambles:(Preambles*)p; - -- (void) setParentWindow:(GtkWindow*)parent; - -- (Preambles*) preambles; - -- (void) present; -- (void) show; -- (void) hide; -- (BOOL) isVisible; -- (void) setVisible:(BOOL)visible; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit/src/gtk/PreambleEditor.m b/tikzit/src/gtk/PreambleEditor.m deleted file mode 100644 index d1f72ee..0000000 --- a/tikzit/src/gtk/PreambleEditor.m +++ /dev/null @@ -1,568 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "PreambleEditor.h" - -#import "Application.h" -#import "Preambles.h" -#import - -enum { - NAME_COLUMN, - IS_CUSTOM_COLUMN, - N_COLUMNS -}; - -// {{{ Internal interfaces -// {{{ Signals -static gboolean window_delete_event_cb (GtkWidget *widget, - GdkEvent *event, - PreambleEditor *editor); -static gboolean window_focus_out_event_cb (GtkWidget *widget, - GdkEvent *event, - PreambleEditor *editor); -static void close_button_clicked_cb (GtkButton *widget, PreambleEditor *editor); -static void add_button_clicked_cb (GtkButton *widget, PreambleEditor *editor); -static void remove_button_clicked_cb (GtkButton *widget, PreambleEditor *editor); -/* -static void undo_button_clicked_cb (GtkButton *widget, PreambleEditor *editor); -static void redo_button_clicked_cb (GtkButton *widget, PreambleEditor *editor); -*/ -static void preamble_name_edited_cb (GtkCellRendererText *renderer, - gchar *path, - gchar *new_text, - PreambleEditor *editor); -static void preamble_selection_changed_cb (GtkTreeSelection *treeselection, - PreambleEditor *editor); -// }}} - -@interface PreambleEditor (Private) -- (void) loadUi; -- (void) save; -- (void) revert; -- (void) update; -- (void) fillListStore; -- (BOOL) isDefaultPreambleSelected; -- (NSString*) selectedPreambleName; -- (void) addPreamble; -- (void) deletePreamble; -- (void) renamePreambleAtPath:(gchar*)path to:(gchar*)newValue; -- (void) nodeStylePropertyChanged:(NSNotification*)notification; -- (void) edgeStylePropertyChanged:(NSNotification*)notification; -@end - -// }}} -// {{{ API - -@implementation PreambleEditor - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithPreambles:(Preambles*)p { - self = [super init]; - - if (self) { - preambles = [p retain]; - parentWindow = NULL; - window = NULL; - preambleView = NULL; - preambleSelector = NULL; - blockSignals = NO; - adding = NO; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(nodeStylePropertyChanged:) - name:@"NodeStylePropertyChanged" - object:nil]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(edgeStylePropertyChanged:) - name:@"EdgeStylePropertyChanged" - object:nil]; - } - - return self; -} - -- (Preambles*) preambles { - return preambles; -} - -- (void) setParentWindow:(GtkWindow*)parent { - GtkWindow *oldParent = parentWindow; - - if (parentWindow) - g_object_ref (parentWindow); - parentWindow = parent; - if (oldParent) - g_object_unref (oldParent); - - if (window) { - gtk_window_set_transient_for (window, parentWindow); - } -} - -- (void) present { - [self loadUi]; - gtk_window_present (GTK_WINDOW (window)); - [self revert]; -} - -- (void) show { - [self loadUi]; - gtk_widget_show (GTK_WIDGET (window)); - [self revert]; -} - -- (void) hide { - if (!window) { - return; - } - [self save]; - gtk_widget_hide (GTK_WIDGET (window)); -} - -- (BOOL) isVisible { - if (!window) { - return NO; - } - gboolean visible; - g_object_get (G_OBJECT (window), "visible", &visible, NULL); - return visible ? YES : NO; -} - -- (void) setVisible:(BOOL)visible { - if (visible) { - [self show]; - } else { - [self hide]; - } -} - -- (void) dealloc { - [preambles release]; - preambles = nil; - if (window) { - gtk_widget_destroy (GTK_WIDGET (window)); - window = NULL; - } - if (parentWindow) { - g_object_ref (parentWindow); - } - - [super dealloc]; -} - -@end - -// }}} -// {{{ Private - -@implementation PreambleEditor (Private) -- (GtkWidget*) createPreambleList { - preambleListStore = gtk_list_store_new (N_COLUMNS, G_TYPE_STRING, G_TYPE_BOOLEAN); - preambleSelector = GTK_TREE_VIEW (gtk_tree_view_new_with_model ( - GTK_TREE_MODEL (preambleListStore))); - gtk_widget_set_size_request (GTK_WIDGET (preambleSelector), 150, -1); - gtk_tree_view_set_headers_visible (preambleSelector, FALSE); - - GtkCellRenderer *renderer; - GtkTreeViewColumn *column; - - renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes ("Preamble", - renderer, - "text", NAME_COLUMN, - "editable", IS_CUSTOM_COLUMN, - NULL); - gtk_tree_view_append_column (preambleSelector, column); - g_signal_connect (G_OBJECT (renderer), - "edited", - G_CALLBACK (preamble_name_edited_cb), - self); - - GtkWidget *listScroller = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (listScroller), - GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); - gtk_container_add (GTK_CONTAINER (listScroller), - GTK_WIDGET (preambleSelector)); - - [self fillListStore]; - - GtkTreeSelection *sel = gtk_tree_view_get_selection (preambleSelector); - gtk_tree_selection_set_mode (sel, GTK_SELECTION_BROWSE); - g_signal_connect (G_OBJECT (sel), - "changed", - G_CALLBACK (preamble_selection_changed_cb), - self); - - return listScroller; -} - -- (void) loadUi { - if (window) { - return; - } - - window = GTK_WINDOW (gtk_window_new (GTK_WINDOW_TOPLEVEL)); - gtk_window_set_title (window, "Preamble editor"); - gtk_window_set_position (window, GTK_WIN_POS_CENTER_ON_PARENT); - gtk_window_set_default_size (window, 600, 400); - gtk_window_set_type_hint (window, GDK_WINDOW_TYPE_HINT_DIALOG); - if (parentWindow) { - gtk_window_set_transient_for (window, parentWindow); - } - GdkEventMask mask; - g_object_get (G_OBJECT (window), "events", &mask, NULL); - mask |= GDK_FOCUS_CHANGE_MASK; - g_object_set (G_OBJECT (window), "events", mask, NULL); - g_signal_connect (window, - "delete-event", - G_CALLBACK (window_delete_event_cb), - self); - g_signal_connect (window, - "focus-out-event", - G_CALLBACK (window_focus_out_event_cb), - self); - - GtkWidget *mainBox = gtk_vbox_new (FALSE, 18); - gtk_container_set_border_width (GTK_CONTAINER (mainBox), 12); - gtk_container_add (GTK_CONTAINER (window), mainBox); - - GtkPaned *paned = GTK_PANED (gtk_hpaned_new ()); - gtk_box_pack_start (GTK_BOX (mainBox), - GTK_WIDGET (paned), - TRUE, TRUE, 0); - - GtkWidget *listWidget = [self createPreambleList]; - GtkWidget *listFrame = gtk_frame_new (NULL); - gtk_container_add (GTK_CONTAINER (listFrame), listWidget); - - GtkBox *listBox = GTK_BOX (gtk_vbox_new (FALSE, 6)); - gtk_box_pack_start (listBox, listFrame, TRUE, TRUE, 0); - - GtkContainer *listButtonBox = GTK_CONTAINER (gtk_hbox_new (FALSE, 6)); - gtk_box_pack_start (listBox, GTK_WIDGET (listButtonBox), FALSE, TRUE, 0); - GtkWidget *addButton = gtk_button_new_from_stock (GTK_STOCK_ADD); - g_signal_connect (addButton, - "clicked", - G_CALLBACK (add_button_clicked_cb), - self); - gtk_container_add (listButtonBox, addButton); - GtkWidget *removeButton = gtk_button_new_from_stock (GTK_STOCK_REMOVE); - g_signal_connect (removeButton, - "clicked", - G_CALLBACK (remove_button_clicked_cb), - self); - gtk_container_add (listButtonBox, removeButton); - - gtk_paned_pack1 (paned, GTK_WIDGET (listBox), FALSE, TRUE); - - preambleView = GTK_TEXT_VIEW (gtk_text_view_new ()); - gtk_text_view_set_left_margin (preambleView, 3); - gtk_text_view_set_right_margin (preambleView, 3); - GtkWidget *scroller = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroller), - GTK_POLICY_AUTOMATIC, // horiz - GTK_POLICY_ALWAYS); // vert - gtk_container_add (GTK_CONTAINER (scroller), GTK_WIDGET (preambleView)); - GtkWidget *editorFrame = gtk_frame_new (NULL); - gtk_container_add (GTK_CONTAINER (editorFrame), scroller); - gtk_paned_pack2 (paned, editorFrame, TRUE, TRUE); - - GtkContainer *buttonBox = GTK_CONTAINER (gtk_hbutton_box_new ()); - gtk_box_set_spacing (GTK_BOX (buttonBox), 6); - gtk_button_box_set_layout (GTK_BUTTON_BOX (buttonBox), GTK_BUTTONBOX_END); - gtk_box_pack_start (GTK_BOX (mainBox), - GTK_WIDGET (buttonBox), - FALSE, TRUE, 0); - GtkWidget *closeButton = gtk_button_new_from_stock (GTK_STOCK_CLOSE); - gtk_container_add (buttonBox, closeButton); - g_signal_connect (closeButton, - "clicked", - G_CALLBACK (close_button_clicked_cb), - self); - /* - GtkWidget *undoButton = gtk_button_new_from_stock (GTK_STOCK_UNDO); - gtk_container_add (buttonBox, undoButton); - gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (buttonBox), - undoButton, - TRUE); - g_signal_connect (undoButton, - "clicked", - G_CALLBACK (undo_button_clicked_cb), - self); - GtkWidget *redoButton = gtk_button_new_from_stock (GTK_STOCK_REDO); - gtk_container_add (buttonBox, redoButton); - gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (buttonBox), - redoButton, - TRUE); - g_signal_connect (redoButton, - "clicked", - G_CALLBACK (redo_button_clicked_cb), - self); - */ - [self revert]; - - gtk_widget_show_all (mainBox); -} - -- (void) save { - if (!preambleView) - return; - if ([self isDefaultPreambleSelected]) - return; - GtkTextIter start,end; - GtkTextBuffer *preambleBuffer = gtk_text_view_get_buffer (preambleView); - gtk_text_buffer_get_bounds(preambleBuffer, &start, &end); - gchar *text = gtk_text_buffer_get_text(preambleBuffer, &start, &end, FALSE); - NSString *preamble = [NSString stringWithUTF8String:text]; - g_free (text); - [preambles setCurrentPreamble:preamble]; - [app saveConfiguration]; -} - -- (void) revert { - if (!preambleView) - return; - GtkTextBuffer *preambleBuffer = gtk_text_view_get_buffer (preambleView); - gtk_text_buffer_set_text (preambleBuffer, [[preambles currentPreamble] UTF8String], -1); - gtk_text_view_set_editable (preambleView, ![self isDefaultPreambleSelected]); -} - -- (void) update { - if (!blockSignals) { - [self save]; - } - GtkTreeSelection *sel = gtk_tree_view_get_selection (preambleSelector); - GtkTreeIter row; - GtkTreeModel *model; - if (gtk_tree_selection_get_selected (sel, &model, &row)) { - gchar *name; - gtk_tree_model_get (model, &row, NAME_COLUMN, &name, -1); - NSString *preambleName = [NSString stringWithUTF8String:name]; - [preambles setSelectedPreambleName:preambleName]; - g_free (name); - } - [self revert]; -} - -- (void) fillListStore { - blockSignals = YES; - - GtkTreeIter row; - gtk_list_store_clear (preambleListStore); - - gtk_list_store_append (preambleListStore, &row); - gtk_list_store_set (preambleListStore, &row, - NAME_COLUMN, [[preambles defaultPreambleName] UTF8String], - IS_CUSTOM_COLUMN, FALSE, - -1); - GtkTreeSelection *sel = gtk_tree_view_get_selection (preambleSelector); - if ([self isDefaultPreambleSelected]) { - gtk_tree_selection_select_iter (sel, &row); - } - - NSEnumerator *en = [preambles customPreambleNameEnumerator]; - NSString *preambleName; - while ((preambleName = [en nextObject])) { - gtk_list_store_append (preambleListStore, &row); - gtk_list_store_set (preambleListStore, &row, - NAME_COLUMN, [preambleName UTF8String], - IS_CUSTOM_COLUMN, TRUE, - -1); - if ([preambleName isEqualToString:[self selectedPreambleName]]) { - gtk_tree_selection_select_iter (sel, &row); - } - } - - blockSignals = NO; -} - -- (BOOL) isDefaultPreambleSelected { - return [preambles selectedPreambleIsDefault]; -} - -- (NSString*) selectedPreambleName { - return [preambles selectedPreambleName]; -} - -- (void) addPreamble { - NSString *newName = [preambles addPreamble]; - - GtkTreeIter row; - gtk_list_store_append (preambleListStore, &row); - gtk_list_store_set (preambleListStore, &row, - NAME_COLUMN, [newName UTF8String], - IS_CUSTOM_COLUMN, TRUE, - -1); - - GtkTreeSelection *sel = gtk_tree_view_get_selection (preambleSelector); - gtk_tree_selection_select_iter (sel, &row); -} - -- (void) deletePreamble { - if ([self isDefaultPreambleSelected]) - return; - - NSString *name = [self selectedPreambleName]; - - GtkTreeIter row; - GtkTreeModel *model = GTK_TREE_MODEL (preambleListStore); - - gtk_tree_model_get_iter_first (model, &row); - // ignore first; it is the default one - gboolean found = FALSE; - while (!found && gtk_tree_model_iter_next (model, &row)) { - gchar *candidate; - gtk_tree_model_get (model, &row, NAME_COLUMN, &candidate, -1); - if (g_strcmp0 (candidate, [name UTF8String]) == 0) { - found = TRUE; - } - g_free (candidate); - } - - if (!found) - return; - - if (![preambles removePreamble:name]) - return; - - blockSignals = YES; - - gboolean had_next = gtk_list_store_remove (preambleListStore, &row); - if (!had_next) { - // select the last item - gint length = gtk_tree_model_iter_n_children (model, NULL); - gtk_tree_model_iter_nth_child (model, &row, NULL, length - 1); - } - - GtkTreeSelection *sel = gtk_tree_view_get_selection (preambleSelector); - gtk_tree_selection_select_iter (sel, &row); - - [self revert]; - - blockSignals = NO; -} - -- (void) renamePreambleAtPath:(gchar*)path to:(gchar*)newValue { - NSString *newName = [NSString stringWithUTF8String:newValue]; - - GtkTreeIter row; - GtkTreeModel *model = GTK_TREE_MODEL (preambleListStore); - - if (!gtk_tree_model_get_iter_from_string (model, &row, path)) - return; - - gchar *oldValue; - gtk_tree_model_get (model, &row, NAME_COLUMN, &oldValue, -1); - - NSString* oldName = [NSString stringWithUTF8String:oldValue]; - if ([preambles renamePreambleFrom:oldName to:newName]) { - gtk_list_store_set (preambleListStore, &row, - NAME_COLUMN, newValue, - -1); - } -} - -- (void) nodeStylePropertyChanged:(NSNotification*)notification { - if ([self isDefaultPreambleSelected]) { - [self revert]; - } -} - -- (void) edgeStylePropertyChanged:(NSNotification*)notification { - if ([self isDefaultPreambleSelected]) { - [self revert]; - } -} -@end - -// }}} -// {{{ GTK+ callbacks - -static gboolean window_delete_event_cb (GtkWidget *widget, - GdkEvent *event, - PreambleEditor *editor) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor hide]; - [pool drain]; - return TRUE; // we dealt with this event -} - -static gboolean window_focus_out_event_cb (GtkWidget *widget, - GdkEvent *event, - PreambleEditor *editor) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor save]; - [pool drain]; - return FALSE; -} - -static void close_button_clicked_cb (GtkButton *widget, PreambleEditor *editor) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor hide]; - [pool drain]; -} - -static void add_button_clicked_cb (GtkButton *widget, PreambleEditor *editor) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor addPreamble]; - [pool drain]; -} - -static void remove_button_clicked_cb (GtkButton *widget, PreambleEditor *editor) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor deletePreamble]; - [pool drain]; -} - -/* -static void undo_button_clicked_cb (GtkButton *widget, PreambleEditor *editor) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - NSLog(@"Undo"); - [pool drain]; -} - -static void redo_button_clicked_cb (GtkButton *widget, PreambleEditor *editor) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - NSLog(@"Redo"); - [pool drain]; -} -*/ - -static void preamble_name_edited_cb (GtkCellRendererText *renderer, - gchar *path, - gchar *new_text, - PreambleEditor *editor) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor renamePreambleAtPath:path to:new_text]; - [pool drain]; -} - -static void preamble_selection_changed_cb (GtkTreeSelection *treeselection, - PreambleEditor *editor) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor update]; - [pool drain]; -} - -// }}} - -// vim:ft=objc:ts=4:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit/src/gtk/Preambles+Storage.h b/tikzit/src/gtk/Preambles+Storage.h deleted file mode 100644 index 76f56cc..0000000 --- a/tikzit/src/gtk/Preambles+Storage.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "Preambles.h" - -@interface Preambles (Storage) - -+ (Preambles*) preamblesFromDirectory:(NSString*)directory; -- (id) initFromDirectory:(NSString*)directory; -- (void) loadFromDirectory:(NSString*)directory; -- (void) storeToDirectory:(NSString*)directory; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/Preambles+Storage.m b/tikzit/src/gtk/Preambles+Storage.m deleted file mode 100644 index bd3ea03..0000000 --- a/tikzit/src/gtk/Preambles+Storage.m +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "Preambles+Storage.h" - -static NSString *ext = @"preamble"; - -@implementation Preambles (Storage) - -+ (Preambles*) preamblesFromDirectory:(NSString*)directory { - return [[[self alloc] initFromDirectory:directory] autorelease]; -} - -- (id) initFromDirectory:(NSString*)directory { - BOOL isDir = NO; - if ([[NSFileManager defaultManager] fileExistsAtPath:directory isDirectory:&isDir] && isDir) { - self = [super init]; - - if (self) { - selectedPreambleName = @"default"; - preambleDict = nil; - [self loadFromDirectory:directory]; - } - } else { - self = [self init]; - } - - return self; -} - -- (void) loadFromDirectory:(NSString*)directory { - preambleDict = [[NSMutableDictionary alloc] initWithCapacity:1]; - NSDirectoryEnumerator *en = [[NSFileManager defaultManager] enumeratorAtPath:directory]; - NSString *filename; - while ((filename = [en nextObject]) != nil) { - if ([filename hasSuffix:ext] && [[en fileAttributes] fileType] == NSFileTypeRegular) { - NSString *path = [directory stringByAppendingPathComponent:filename]; - NSString *contents = [NSString stringWithContentsOfFile:path]; - if (contents) { - [preambleDict setObject:contents forKey:[filename stringByDeletingPathExtension]]; - } - } - } -} - -- (void) storeToDirectory:(NSString*)directory { - NSDirectoryEnumerator *den = [[NSFileManager defaultManager] enumeratorAtPath:directory]; - NSString *filename; - while ((filename = [den nextObject]) != nil) { - if ([filename hasSuffix:ext] && [[den fileAttributes] fileType] == NSFileTypeRegular) { - NSString *path = [directory stringByAppendingPathComponent:filename]; - NSString *entry = [filename stringByDeletingPathExtension]; - if ([preambleDict objectForKey:entry] == nil) { - [[NSFileManager defaultManager] removeFileAtPath:path handler:nil]; - } - } - } - - NSEnumerator *en = [self customPreambleNameEnumerator]; - NSString *entry; - while ((entry = [en nextObject]) != nil) { - NSString *path = [directory stringByAppendingPathComponent:[entry stringByAppendingPathExtension:ext]]; - NSString *contents = [preambleDict objectForKey:entry]; - [contents writeToFile:path atomically:YES]; - } -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/PreviewRenderer.h b/tikzit/src/gtk/PreviewRenderer.h deleted file mode 100644 index d691722..0000000 --- a/tikzit/src/gtk/PreviewRenderer.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -#import "Surface.h" - -@class Configuration; -@class Preambles; -@class TikzDocument; - -@interface PreviewRenderer: NSObject { - Configuration *config; - Preambles *preambles; - TikzDocument *document; - PopplerDocument *pdfDocument; - PopplerPage *pdfPage; -} - -@property (readonly) Preambles *preambles; -@property (retain) TikzDocument *document; -@property (readonly) double height; -@property (readonly) double width; - -- (id) initWithPreambles:(Preambles*)p config:(Configuration*)c; - -- (BOOL) updateWithError:(NSError**)error; -- (BOOL) update; -- (BOOL) isValid; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/PreviewRenderer.m b/tikzit/src/gtk/PreviewRenderer.m deleted file mode 100644 index 28113d6..0000000 --- a/tikzit/src/gtk/PreviewRenderer.m +++ /dev/null @@ -1,250 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "PreviewRenderer.h" - -#import "CairoRenderContext.h" -#import "Configuration.h" -#import "Preambles.h" -#import "TikzDocument.h" - -@implementation PreviewRenderer - -@synthesize preambles, document; - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithPreambles:(Preambles*)p config:(Configuration*)c { - self = [super init]; - - if (self) { - document = nil; - config = [c retain]; - preambles = [p retain]; - pdfDocument = NULL; - pdfPage = NULL; - } - - return self; -} - -- (void) dealloc { - [document release]; - [config release]; - [preambles release]; - - if (pdfDocument) { - g_object_unref (pdfDocument); - pdfDocument = NULL; - } - if (pdfPage) { - g_object_unref (pdfPage); - pdfPage = NULL; - } - - [super dealloc]; -} - -- (BOOL) update { - NSError *error = nil; - BOOL result = [self updateWithError:&error]; - if (error) { - logError (error, @"Could not update preview"); - if ([error code] == TZ_ERR_TOOL_FAILED) { - NSLog (@"Output: %@", [[error userInfo] objectForKey:TZToolOutputErrorKey]); - } - } - return result; -} - -- (BOOL) updateWithError:(NSError**)error { - if (document == nil) { - if (error) { - *error = [NSError errorWithMessage:@"No document given" code:TZ_ERR_BADSTATE]; - } - if (pdfDocument) { - g_object_unref (pdfDocument); - pdfDocument = NULL; - } - if (pdfPage) { - g_object_unref (pdfPage); - pdfPage = NULL; - } - return NO; - } - - NSString *tex = [preambles buildDocumentForTikz:[document tikz]]; - - NSString *tempDir = [[NSFileManager defaultManager] createTempDirectoryWithError:error]; - if (!tempDir) { - if (error) { - *error = [NSError errorWithMessage:@"Could not create temporary directory" code:TZ_ERR_IO cause:*error]; - } - return NO; - } - - // write tex code to temporary file - NSString *texFile = [NSString stringWithFormat:@"%@/tikzit.tex", tempDir]; - NSString *pdfFile = [NSString stringWithFormat:@"file://%@/tikzit.pdf", tempDir]; - [tex writeToFile:texFile atomically:YES]; - - NSTask *latexTask = [[NSTask alloc] init]; - [latexTask setCurrentDirectoryPath:tempDir]; - - // GNUStep is clever enough to use PATH - NSString *path = [config stringEntry:@"pdflatex" - inGroup:@"Previews" - withDefault:@"pdflatex"]; - [latexTask setLaunchPath:path]; - - NSArray *args = [NSArray arrayWithObjects: - @"-fmt=latex", - @"-output-format=pdf", - @"-interaction=nonstopmode", - @"-halt-on-error", - texFile, - nil]; - [latexTask setArguments:args]; - - NSPipe *pout = [NSPipe pipe]; - [latexTask setStandardOutput:pout]; - - NSFileHandle *latexOut = [pout fileHandleForReading]; - - BOOL success = NO; - - NS_DURING { - [latexTask launch]; - [latexTask waitUntilExit]; - } NS_HANDLER { - NSLog(@"Failed to run '%@'; error was: %@", path, [localException reason]); - (void)localException; - if (error) { - NSString *desc = [NSString stringWithFormat:@"Failed to run '%@'", path]; - NSMutableDictionary *errorDetail = [NSMutableDictionary dictionaryWithCapacity:2]; - [errorDetail setValue:desc forKey:NSLocalizedDescriptionKey]; - *error = [NSError errorWithDomain:TZErrorDomain code:TZ_ERR_IO userInfo:errorDetail]; - } - - // remove all temporary files - [[NSFileManager defaultManager] removeFileAtPath:tempDir handler:NULL]; - [latexTask release]; - - return NO; - } NS_ENDHANDLER - - if ([latexTask terminationStatus] != 0) { - if (error) { - NSData *data = [latexOut readDataToEndOfFile]; - NSString *str = [[NSString alloc] initWithData:data - encoding:NSUTF8StringEncoding]; - NSMutableDictionary *errorDetail = [NSMutableDictionary dictionaryWithCapacity:2]; - [errorDetail setValue:@"Generating a PDF file with pdflatex failed" forKey:NSLocalizedDescriptionKey]; - [errorDetail setValue:str forKey:TZToolOutputErrorKey]; - *error = [NSError errorWithDomain:TZErrorDomain code:TZ_ERR_TOOL_FAILED userInfo:errorDetail]; - [str release]; - } - } else { - // load pdf document - GError* gerror = NULL; - pdfDocument = poppler_document_new_from_file([pdfFile UTF8String], NULL, &gerror); - if (!pdfDocument) { - if (error) { - *error = [NSError errorWithMessage:[NSString stringWithFormat:@"Could not load PDF document", pdfFile] - code:TZ_ERR_IO - cause:[NSError errorWithGError:gerror]]; - } - g_error_free(gerror); - } else { - pdfPage = poppler_document_get_page(pdfDocument, 0); - if(!pdfPage) { - if (error) { - *error = [NSError errorWithMessage:@"Could not open first page of PDF document" - code:TZ_ERR_OTHER]; - } - g_object_unref(pdfDocument); - } else { - success = YES; - } - } - } - - // remove all temporary files - [[NSFileManager defaultManager] removeFileAtPath:tempDir handler:NULL]; - [latexTask release]; - - return success; -} - -- (BOOL) isValid { - return pdfPage ? YES : NO; -} - -- (double) width { - double w = 0.0; - if (pdfPage) - poppler_page_get_size(pdfPage, &w, NULL); - return w; -} - -- (double) height { - double h = 0.0; - if (pdfPage) - poppler_page_get_size(pdfPage, NULL, &h); - return h; -} - -- (void) renderWithContext:(id)c onSurface:(id)surface { - if (document != nil && pdfPage) { - CairoRenderContext *context = (CairoRenderContext*)c; - - double w = 0.0; - double h = 0.0; - poppler_page_get_size(pdfPage, &w, &h); - if (w==0) w = 1.0; - if (h==0) h = 1.0; - - double scale = ([surface height] / h) * 0.95; - if (w * scale > [surface width]) scale = [surface width] / w; - [[surface transformer] setScale:scale]; - - NSPoint origin; - w *= scale; - h *= scale; - origin.x = ([surface width] - w) / 2; - origin.y = ([surface height] - h) / 2; - - [[surface transformer] setOrigin:origin]; - - [context saveState]; - [context applyTransform:[surface transformer]]; - - // white-out - [context paintWithColor:WhiteRColor]; - - poppler_page_render (pdfPage, [context cairoContext]); - - [context restoreState]; - } -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/PreviewWindow.h b/tikzit/src/gtk/PreviewWindow.h deleted file mode 100644 index 8bcd3e5..0000000 --- a/tikzit/src/gtk/PreviewWindow.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class Configuration; -@class Preambles; -@class PreviewRenderer; -@class TikzDocument; -@class WidgetSurface; - -@interface PreviewWindow: NSObject { - PreviewRenderer *previewer; - GtkWindow *window; - WidgetSurface *surface; - GtkWindow *parent; -} - -- (id) initWithPreambles:(Preambles*)p config:(Configuration*)c; - -- (void) setParentWindow:(GtkWindow*)parent; - -- (TikzDocument*) document; -- (void) setDocument:(TikzDocument*)doc; - -- (BOOL) update; - -- (void) present; -- (void) show; -- (void) hide; -- (BOOL) isVisible; -- (void) setVisible:(BOOL)visible; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/PreviewWindow.m b/tikzit/src/gtk/PreviewWindow.m deleted file mode 100644 index fc0e7a3..0000000 --- a/tikzit/src/gtk/PreviewWindow.m +++ /dev/null @@ -1,195 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "PreviewWindow.h" - -#import "Preambles.h" -#import "PreviewRenderer.h" -#import "TikzDocument.h" -#import "WidgetSurface.h" - -#import "gtkhelpers.h" - -@interface PreviewWindow (Private) -- (BOOL) updateOrShowError; -- (void) updateDefaultSize; -@end - -// {{{ API - -@implementation PreviewWindow - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithPreambles:(Preambles*)p config:(Configuration*)c { - self = [super init]; - - if (self) { - parent = NULL; - previewer = [[PreviewRenderer alloc] initWithPreambles:p config:c]; - - window = GTK_WINDOW (gtk_window_new (GTK_WINDOW_TOPLEVEL)); - gtk_window_set_title (window, "Preview"); - gtk_window_set_resizable (window, TRUE); - gtk_window_set_default_size (window, 150.0, 150.0); - g_signal_connect (G_OBJECT (window), - "delete-event", - G_CALLBACK (gtk_widget_hide_on_delete), - NULL); - - GtkWidget *pdfArea = gtk_drawing_area_new (); - gtk_container_add (GTK_CONTAINER (window), pdfArea); - gtk_widget_show (pdfArea); - surface = [[WidgetSurface alloc] initWithWidget:pdfArea]; - [surface setRenderDelegate:previewer]; - Transformer *t = [surface transformer]; - [t setFlippedAboutXAxis:![t isFlippedAboutXAxis]]; - } - - return self; -} - -- (void) setParentWindow:(GtkWindow*)p { - parent = p; - gtk_window_set_transient_for (window, p); - if (p != NULL) { - gtk_window_set_position (window, GTK_WIN_POS_CENTER_ON_PARENT); - } -} - -- (TikzDocument*) document { - return [previewer document]; -} - -- (void) setDocument:(TikzDocument*)doc { - [previewer setDocument:doc]; -} - -- (void) present { - if ([self updateOrShowError]) { - [self updateDefaultSize]; - gtk_window_present (GTK_WINDOW (window)); - [surface invalidate]; - } -} - -- (BOOL) update { - if ([self updateOrShowError]) { - [self updateDefaultSize]; - return YES; - } - - return NO; -} - -- (void) show { - if ([self updateOrShowError]) { - [self updateDefaultSize]; - gtk_widget_show (GTK_WIDGET (window)); - [surface invalidate]; - } -} - -- (void) hide { - gtk_widget_hide (GTK_WIDGET (window)); -} - -- (BOOL) isVisible { - gboolean visible; - g_object_get (G_OBJECT (window), "visible", &visible, NULL); - return visible ? YES : NO; -} - -- (void) setVisible:(BOOL)visible { - if (visible) { - [self show]; - } else { - [self hide]; - } -} - -- (void) dealloc { - gtk_widget_destroy (GTK_WIDGET (window)); - [previewer release]; - [surface release]; - - [super dealloc]; -} - -@end -// }}} - -@implementation PreviewWindow (Private) -- (BOOL) updateOrShowError { - NSError *error = nil; - if (![previewer updateWithError:&error]) { - GtkWindow *dparent = gtk_widget_get_visible (GTK_WIDGET (window)) - ? window - : parent; - GtkWidget *dialog = gtk_message_dialog_new (dparent, - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_CLOSE, - "Failed to generate the preview: %s", - [[error localizedDescription] UTF8String]); -#if GTK_CHECK_VERSION(2,22,0) - if ([error code] == TZ_ERR_TOOL_FAILED) { - GtkBox *box = GTK_BOX (gtk_message_dialog_get_message_area (GTK_MESSAGE_DIALOG (dialog))); - GtkWidget *label = gtk_label_new ("pdflatex said:"); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5f); - gtk_widget_show (label); - gtk_box_pack_start (box, label, FALSE, TRUE, 0); - - GtkWidget *view = gtk_text_view_new (); - GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)); - gtk_text_buffer_set_text (buffer, [[error toolOutput] UTF8String], -1); - gtk_text_view_set_editable (GTK_TEXT_VIEW (view), FALSE); - gtk_widget_show (view); - GtkWidget *scrolledView = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledView), - GTK_POLICY_NEVER, // horiz - GTK_POLICY_ALWAYS); // vert - gtk_widget_set_size_request (scrolledView, -1, 120); - gtk_container_add (GTK_CONTAINER (scrolledView), view); - gtk_widget_show (scrolledView); - gtk_box_pack_start (box, scrolledView, TRUE, TRUE, 0); - } -#endif // GTK+ 2.22.0 - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - return NO; - } - return YES; -} - -- (void) updateDefaultSize { - double width = 150; - double height = 150; - if ([previewer isValid]) { - double pWidth = [previewer width]; - double pHeight = [previewer height]; - width = (width < pWidth + 4) ? pWidth + 4 : width; - height = (height < pHeight + 4) ? pHeight + 4 : height; - } - gtk_window_set_default_size (window, width, height); -} -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/PropertiesPane.h b/tikzit/src/gtk/PropertiesPane.h deleted file mode 100644 index c76efae..0000000 --- a/tikzit/src/gtk/PropertiesPane.h +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class Configuration; -@class EdgePropertyDelegate; -@class EdgeStylesModel; -@class GraphPropertyDelegate; -@class NodePropertyDelegate; -@class NodeStylesModel; -@class PropertyListEditor; -@class StyleManager; -@class TikzDocument; - -@interface PropertiesPane: NSObject { - TikzDocument *document; - BOOL blockUpdates; - - PropertyListEditor *graphProps; - PropertyListEditor *nodeProps; - PropertyListEditor *edgeProps; - PropertyListEditor *edgeNodeProps; - - GraphPropertyDelegate *graphPropDelegate; - NodePropertyDelegate *nodePropDelegate; - EdgePropertyDelegate *edgePropDelegate; - - GtkWidget *layout; - - GtkWidget *currentPropsWidget; // no ref! - - GtkWidget *graphPropsWidget; - GtkWidget *nodePropsWidget; - GtkWidget *edgePropsWidget; - - GtkEntry *nodeLabelEntry; - GtkToggleButton *edgeNodeToggle; - GtkWidget *edgeNodePropsWidget; - GtkEntry *edgeNodeLabelEntry; - GtkEntry *edgeSourceAnchorEntry; - GtkEntry *edgeTargetAnchorEntry; -} - -@property (retain) TikzDocument *document; -@property (assign) BOOL visible; -@property (readonly) GtkWidget *gtkWidget; - -- (void) loadConfiguration:(Configuration*)config; -- (void) saveConfiguration:(Configuration*)config; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit/src/gtk/PropertiesPane.m b/tikzit/src/gtk/PropertiesPane.m deleted file mode 100644 index ba43298..0000000 --- a/tikzit/src/gtk/PropertiesPane.m +++ /dev/null @@ -1,763 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "PropertiesPane.h" - -#import "GraphElementProperty.h" -#import "PropertyListEditor.h" -#import "TikzDocument.h" - -#import "gtkhelpers.h" - -// {{{ Internal interfaces -// {{{ GTK+ helpers -static GtkWidget *createLabelledEntry (const gchar *labelText, GtkEntry **entry); -static GtkWidget *createPropsPaneWithLabelEntry (PropertyListEditor *props, GtkEntry **labelEntry); -static GtkWidget *createBoldLabel (const gchar *text); -// }}} -// {{{ GTK+ callbacks -static void node_label_changed_cb (GtkEditable *widget, PropertiesPane *pane); -static void edge_node_label_changed_cb (GtkEditable *widget, PropertiesPane *pane); -static void edge_node_toggled_cb (GtkToggleButton *widget, PropertiesPane *pane); -static void edge_source_anchor_changed_cb (GtkEditable *widget, PropertiesPane *pane); -static void edge_target_anchor_changed_cb (GtkEditable *widget, PropertiesPane *pane); -// }}} - -@interface PropertiesPane (Notifications) -- (void) nodeSelectionChanged:(NSNotification*)n; -- (void) edgeSelectionChanged:(NSNotification*)n; -- (void) graphChanged:(NSNotification*)n; -- (void) nodeLabelEdited:(NSString*)newValue; -- (void) edgeNodeLabelEdited:(NSString*)newValue; -- (void) edgeNodeToggled:(BOOL)newValue; -- (BOOL) edgeSourceAnchorEdited:(NSString*)newValue; -- (BOOL) edgeTargetAnchorEdited:(NSString*)newValue; -@end - -@interface PropertiesPane (Private) -- (void) _updatePane; -- (void) _setDisplayedWidget:(GtkWidget*)widget; -@end - -// {{{ Delegates - -@interface GraphPropertyDelegate : NSObject { - TikzDocument *doc; -} -- (void) setDocument:(TikzDocument*)d; -@end - -@interface NodePropertyDelegate : NSObject { - TikzDocument *doc; - Node *node; -} -- (void) setDocument:(TikzDocument*)d; -- (void) setNode:(Node*)n; -@end - -@interface EdgePropertyDelegate : NSObject { - TikzDocument *doc; - Edge *edge; -} -- (void) setDocument:(TikzDocument*)d; -- (void) setEdge:(Edge*)e; -@end - -// }}} - -// }}} -// {{{ API - -@implementation PropertiesPane - -- (id) init { - self = [super init]; - - if (self) { - document = nil; - blockUpdates = NO; - - graphProps = [[PropertyListEditor alloc] init]; - graphPropDelegate = [[GraphPropertyDelegate alloc] init]; - [graphProps setDelegate:graphPropDelegate]; - - nodeProps = [[PropertyListEditor alloc] init]; - nodePropDelegate = [[NodePropertyDelegate alloc] init]; - [nodeProps setDelegate:nodePropDelegate]; - - edgeProps = [[PropertyListEditor alloc] init]; - edgePropDelegate = [[EdgePropertyDelegate alloc] init]; - [edgeProps setDelegate:edgePropDelegate]; - - edgeNodeProps = [[PropertyListEditor alloc] init]; - [edgeNodeProps setDelegate:edgePropDelegate]; - - layout = gtk_vbox_new (FALSE, 0); - g_object_ref_sink (layout); - gtk_widget_show (layout); - - /* - * Graph properties - */ - graphPropsWidget = gtk_vbox_new (FALSE, 6); - g_object_ref_sink (graphPropsWidget); - gtk_widget_show (graphPropsWidget); - - GtkWidget *label = createBoldLabel ("Graph properties"); - gtk_widget_show (label); - gtk_box_pack_start (GTK_BOX (graphPropsWidget), - label, - FALSE, FALSE, 0); - - gtk_widget_show ([graphProps widget]); - gtk_box_pack_start (GTK_BOX (graphPropsWidget), - [graphProps widget], - TRUE, TRUE, 0); - - gtk_box_pack_start (GTK_BOX (layout), - graphPropsWidget, - TRUE, TRUE, 0); - - - /* - * Node properties - */ - nodePropsWidget = gtk_vbox_new (FALSE, 6); - g_object_ref_sink (nodePropsWidget); - gtk_box_pack_start (GTK_BOX (layout), - nodePropsWidget, - TRUE, TRUE, 0); - - label = createBoldLabel ("Node properties"); - gtk_widget_show (label); - gtk_box_pack_start (GTK_BOX (nodePropsWidget), - label, - FALSE, FALSE, 0); - - GtkWidget *labelWidget = createLabelledEntry ("Label", &nodeLabelEntry); - gtk_widget_show (labelWidget); - gtk_box_pack_start (GTK_BOX (nodePropsWidget), - labelWidget, - FALSE, FALSE, 0); - - gtk_widget_show ([nodeProps widget]); - gtk_box_pack_start (GTK_BOX (nodePropsWidget), - [nodeProps widget], - TRUE, TRUE, 0); - - g_signal_connect (G_OBJECT (nodeLabelEntry), - "changed", - G_CALLBACK (node_label_changed_cb), - self); - - /* - * Edge properties - */ - edgePropsWidget = gtk_vbox_new (FALSE, 6); - g_object_ref_sink (edgePropsWidget); - gtk_box_pack_start (GTK_BOX (layout), - edgePropsWidget, - TRUE, TRUE, 0); - - label = createBoldLabel ("Edge properties"); - gtk_widget_show (label); - gtk_box_pack_start (GTK_BOX (edgePropsWidget), - label, - FALSE, FALSE, 0); - - gtk_widget_show ([edgeProps widget]); - gtk_box_pack_start (GTK_BOX (edgePropsWidget), - [edgeProps widget], - TRUE, TRUE, 0); - - GtkWidget *split = gtk_hseparator_new (); - gtk_widget_show (split); - gtk_box_pack_start (GTK_BOX (edgePropsWidget), - split, - FALSE, FALSE, 0); - - GtkWidget *anchorTable = gtk_table_new (2, 2, FALSE); - - label = gtk_label_new ("Source anchor:"); - gtk_table_attach_defaults (GTK_TABLE (anchorTable), label, - 0, 1, 0, 1); - edgeSourceAnchorEntry = GTK_ENTRY (gtk_entry_new ()); - g_object_ref_sink (edgeSourceAnchorEntry); - gtk_table_attach_defaults (GTK_TABLE (anchorTable), - GTK_WIDGET (edgeSourceAnchorEntry), - 1, 2, 0, 1); - g_signal_connect (G_OBJECT (edgeSourceAnchorEntry), - "changed", - G_CALLBACK (edge_source_anchor_changed_cb), - self); - - label = gtk_label_new ("Target anchor:"); - gtk_table_attach_defaults (GTK_TABLE (anchorTable), label, - 0, 1, 1, 2); - edgeTargetAnchorEntry = GTK_ENTRY (gtk_entry_new ()); - g_object_ref_sink (edgeTargetAnchorEntry); - gtk_table_attach_defaults (GTK_TABLE (anchorTable), - GTK_WIDGET (edgeTargetAnchorEntry), - 1, 2, 1, 2); - g_signal_connect (G_OBJECT (edgeTargetAnchorEntry), - "changed", - G_CALLBACK (edge_target_anchor_changed_cb), - self); - - gtk_widget_show_all (anchorTable); - gtk_box_pack_start (GTK_BOX (edgePropsWidget), - anchorTable, - FALSE, FALSE, 0); - - split = gtk_hseparator_new (); - gtk_widget_show (split); - gtk_box_pack_start (GTK_BOX (edgePropsWidget), - split, - FALSE, FALSE, 0); - - edgeNodeToggle = GTK_TOGGLE_BUTTON (gtk_check_button_new_with_label ("Child node")); - g_object_ref_sink (edgeNodeToggle); - gtk_widget_show (GTK_WIDGET (edgeNodeToggle)); - gtk_box_pack_start (GTK_BOX (edgePropsWidget), - GTK_WIDGET (edgeNodeToggle), - FALSE, FALSE, 0); - g_signal_connect (G_OBJECT (GTK_WIDGET (edgeNodeToggle)), - "toggled", - G_CALLBACK (edge_node_toggled_cb), - self); - - edgeNodePropsWidget = createPropsPaneWithLabelEntry(edgeNodeProps, &edgeNodeLabelEntry); - g_object_ref_sink (edgeNodePropsWidget); - g_object_ref_sink (edgeNodeLabelEntry); - gtk_box_pack_start (GTK_BOX (edgePropsWidget), - edgeNodePropsWidget, - TRUE, TRUE, 0); - g_signal_connect (G_OBJECT (edgeNodeLabelEntry), - "changed", - G_CALLBACK (edge_node_label_changed_cb), - self); - - /* - * Misc setup - */ - - [self _setDisplayedWidget:graphPropsWidget]; - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - g_object_unref (graphPropsWidget); - g_object_unref (nodePropsWidget); - g_object_unref (edgePropsWidget); - - g_object_unref (nodeLabelEntry); - g_object_unref (edgeNodeToggle); - g_object_unref (edgeNodePropsWidget); - g_object_unref (edgeNodeLabelEntry); - g_object_unref (edgeSourceAnchorEntry); - g_object_unref (edgeTargetAnchorEntry); - - g_object_unref (layout); - - [graphProps release]; - [nodeProps release]; - [edgeProps release]; - [edgeNodeProps release]; - - [graphPropDelegate release]; - [nodePropDelegate release]; - [edgePropDelegate release]; - - [document release]; - - [super dealloc]; -} - -- (TikzDocument*) document { - return document; -} - -- (void) setDocument:(TikzDocument*)doc { - if (document != nil) { - [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:document]; - [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:[document pickSupport]]; - } - - [doc retain]; - [document release]; - document = doc; - - [graphPropDelegate setDocument:doc]; - [nodePropDelegate setDocument:doc]; - [edgePropDelegate setDocument:doc]; - - if (doc != nil) { - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(nodeSelectionChanged:) - name:@"NodeSelectionChanged" object:[doc pickSupport]]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(edgeSelectionChanged:) - name:@"EdgeSelectionChanged" object:[doc pickSupport]]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(graphChanged:) - name:@"TikzChanged" object:doc]; - } - - [self _updatePane]; -} - -- (BOOL) visible { - return gtk_widget_get_visible (layout); -} - -- (void) setVisible:(BOOL)visible { - gtk_widget_set_visible (layout, visible); -} - -- (GtkWidget*) gtkWidget { - return layout; -} - -- (void) loadConfiguration:(Configuration*)config { -} - -- (void) saveConfiguration:(Configuration*)config { -} - -@end -// }}} -// {{{ Notifications - -@implementation PropertiesPane (Notifications) - -- (void) nodeSelectionChanged:(NSNotification*)n { - [self _updatePane]; -} - -- (void) edgeSelectionChanged:(NSNotification*)n { - [self _updatePane]; -} - -- (void) graphChanged:(NSNotification*)n { - [self _updatePane]; -} - -- (void) nodeLabelEdited:(NSString*)newValue { - if (blockUpdates) - return; - - NSSet *sel = [[document pickSupport] selectedNodes]; - if ([sel count] != 1) { - NSLog(@"Expected single node selected; got %lu", [sel count]); - return; - } - - if ([newValue isValidTikzPropertyNameOrValue]) { - Node *node = [sel anyObject]; - [document startModifyNode:node]; - [node setLabel:newValue]; - [document endModifyNode]; - } else { - widget_set_error (GTK_WIDGET (nodeLabelEntry)); - } -} - -- (void) edgeNodeLabelEdited:(NSString*)newValue { - if (blockUpdates) - return; - - NSSet *sel = [[document pickSupport] selectedEdges]; - if ([sel count] != 1) { - NSLog(@"Expected single edge selected; got %lu", [sel count]); - return; - } - - Edge *edge = [sel anyObject]; - if (![edge hasEdgeNode]) { - NSLog(@"Expected edge with edge node"); - return; - } - - if ([newValue isValidTikzPropertyNameOrValue]) { - [document startModifyEdge:edge]; - [[edge edgeNode] setLabel:newValue]; - [document endModifyEdge]; - } else { - widget_set_error (GTK_WIDGET (edgeNodeLabelEntry)); - } -} - -- (void) edgeNodeToggled:(BOOL)newValue { - if (blockUpdates) - return; - - NSSet *sel = [[document pickSupport] selectedEdges]; - if ([sel count] != 1) { - NSLog(@"Expected single edge selected; got %lu", [sel count]); - return; - } - - Edge *edge = [sel anyObject]; - - [document startModifyEdge:edge]; - [edge setHasEdgeNode:newValue]; - [document endModifyEdge]; -} - -- (BOOL) edgeSourceAnchorEdited:(NSString*)newValue { - if (blockUpdates) - return YES; - - NSSet *sel = [[document pickSupport] selectedEdges]; - if ([sel count] != 1) { - NSLog(@"Expected single edge selected; got %lu", [sel count]); - return YES; - } - - Edge *edge = [sel anyObject]; - if ([newValue isValidAnchor]) { - [document startModifyEdge:edge]; - [edge setSourceAnchor:newValue]; - [document endModifyEdge]; - return YES; - } else { - return NO; - } -} - -- (BOOL) edgeTargetAnchorEdited:(NSString*)newValue { - if (blockUpdates) - return YES; - - NSSet *sel = [[document pickSupport] selectedEdges]; - if ([sel count] != 1) { - NSLog(@"Expected single edge selected; got %lu", [sel count]); - return YES; - } - - Edge *edge = [sel anyObject]; - if ([newValue isValidAnchor]) { - [document startModifyEdge:edge]; - [edge setTargetAnchor:newValue]; - [document endModifyEdge]; - return YES; - } else { - return NO; - } -} - -@end -// }}} -// {{{ Private - -@implementation PropertiesPane (Private) - -- (void) _setDisplayedWidget:(GtkWidget*)widget { - if (currentPropsWidget != widget) { - if (currentPropsWidget) - gtk_widget_hide (currentPropsWidget); - currentPropsWidget = widget; - if (widget) - gtk_widget_show (widget); - } -} - -- (void) _updatePane { - blockUpdates = YES; - - BOOL editGraphProps = YES; - GraphElementData *data = [[document graph] data]; - [graphProps setData:data]; - - NSSet *nodeSel = [[document pickSupport] selectedNodes]; - if ([nodeSel count] == 1) { - Node *n = [nodeSel anyObject]; - [nodePropDelegate setNode:n]; - [nodeProps setData:[n data]]; - gtk_entry_set_text (nodeLabelEntry, [[n label] UTF8String]); - widget_clear_error (GTK_WIDGET (nodeLabelEntry)); - [self _setDisplayedWidget:nodePropsWidget]; - editGraphProps = NO; - } else { - [nodePropDelegate setNode:nil]; - [nodeProps setData:nil]; - gtk_entry_set_text (nodeLabelEntry, ""); - - NSSet *edgeSel = [[document pickSupport] selectedEdges]; - if ([edgeSel count] == 1) { - Edge *e = [edgeSel anyObject]; - [edgePropDelegate setEdge:e]; - [edgeProps setData:[e data]]; - gtk_entry_set_text (edgeSourceAnchorEntry, - [[e sourceAnchor] UTF8String]); - gtk_entry_set_text (edgeTargetAnchorEntry, - [[e targetAnchor] UTF8String]); - widget_clear_error (GTK_WIDGET (edgeSourceAnchorEntry)); - widget_clear_error (GTK_WIDGET (edgeTargetAnchorEntry)); - widget_clear_error (GTK_WIDGET (edgeNodeLabelEntry)); - if ([e hasEdgeNode]) { - gtk_toggle_button_set_active (edgeNodeToggle, TRUE); - gtk_widget_show (edgeNodePropsWidget); - gtk_entry_set_text (edgeNodeLabelEntry, [[[e edgeNode] label] UTF8String]); - [edgeNodeProps setData:[[e edgeNode] data]]; - gtk_widget_set_sensitive (edgeNodePropsWidget, TRUE); - } else { - gtk_toggle_button_set_active (edgeNodeToggle, FALSE); - gtk_widget_hide (edgeNodePropsWidget); - gtk_entry_set_text (edgeNodeLabelEntry, ""); - [edgeNodeProps setData:nil]; - gtk_widget_set_sensitive (edgeNodePropsWidget, FALSE); - } - [self _setDisplayedWidget:edgePropsWidget]; - editGraphProps = NO; - } else { - [edgePropDelegate setEdge:nil]; - [edgeProps setData:nil]; - [edgeNodeProps setData:nil]; - gtk_entry_set_text (edgeNodeLabelEntry, ""); - } - } - - if (editGraphProps) { - [self _setDisplayedWidget:graphPropsWidget]; - } - - blockUpdates = NO; -} - -@end - -// }}} -// {{{ Delegates - -@implementation GraphPropertyDelegate -- (id) init { - self = [super init]; - if (self) { - doc = nil; - } - return self; -} -- (void) dealloc { - // doc is not retained - [super dealloc]; -} -- (void) setDocument:(TikzDocument*)d { - doc = d; -} -- (BOOL)startEdit { - if ([doc graph] != nil) { - [doc startChangeGraphProperties]; - return YES; - } - return NO; -} -- (void)endEdit { - [doc endChangeGraphProperties]; -} -- (void)cancelEdit { - [doc cancelChangeGraphProperties]; -} -@end - -@implementation NodePropertyDelegate -- (id) init { - self = [super init]; - if (self) { - doc = nil; - node = nil; - } - return self; -} -- (void) dealloc { - // doc,node not retained - [super dealloc]; -} -- (void) setDocument:(TikzDocument*)d { - doc = d; - node = nil; -} -- (void) setNode:(Node*)n { - node = n; -} -- (BOOL)startEdit { - if (node != nil) { - [doc startModifyNode:node]; - return YES; - } - return NO; -} -- (void)endEdit { - [doc endModifyNode]; -} -- (void)cancelEdit { - [doc cancelModifyNode]; -} -@end - -@implementation EdgePropertyDelegate -- (id) init { - self = [super init]; - if (self) { - doc = nil; - edge = nil; - } - return self; -} -- (void) dealloc { - // doc,edge not retained - [super dealloc]; -} -- (void) setDocument:(TikzDocument*)d { - doc = d; - edge = nil; -} -- (void) setEdge:(Edge*)e { - edge = e; -} -- (BOOL)startEdit { - if (edge != nil) { - [doc startModifyEdge:edge]; - return YES; - } - return NO; -} -- (void)endEdit { - [doc endModifyEdge]; -} -- (void)cancelEdit { - [doc cancelModifyEdge]; -} -@end - -// }}} -// {{{ GTK+ helpers - -static GtkWidget *createLabelledEntry (const gchar *labelText, GtkEntry **entry) { - GtkBox *box = GTK_BOX (gtk_hbox_new (FALSE, 0)); - GtkWidget *label = gtk_label_new (labelText); - gtk_widget_show (label); - GtkWidget *entryWidget = gtk_entry_new (); - gtk_widget_show (entryWidget); - // container widget expand fill pad - gtk_box_pack_start (box, label, FALSE, TRUE, 5); - gtk_box_pack_start (box, entryWidget, TRUE, TRUE, 0); - if (entry) - *entry = GTK_ENTRY (entryWidget); - return GTK_WIDGET (box); -} - -static GtkWidget *createPropsPaneWithLabelEntry (PropertyListEditor *props, GtkEntry **labelEntry) { - GtkBox *box = GTK_BOX (gtk_vbox_new (FALSE, 6)); - - GtkWidget *labelWidget = createLabelledEntry ("Label", labelEntry); - gtk_widget_show (labelWidget); - // box widget expand fill pad - gtk_box_pack_start (box, labelWidget, FALSE, FALSE, 0); - gtk_box_pack_start (box, [props widget], TRUE, TRUE, 0); - gtk_widget_show ([props widget]); - return GTK_WIDGET (box); -} - -static GtkWidget *createBoldLabel (const gchar *text) { - GtkWidget *label = gtk_label_new (text); - label_set_bold (GTK_LABEL (label)); - return label; -} - -// }}} -// {{{ GTK+ callbacks - -static void node_label_changed_cb (GtkEditable *editable, PropertiesPane *pane) { - if (!gtk_widget_is_sensitive (GTK_WIDGET (editable))) { - // clearly wasn't the user editing - return; - } - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - NSString *newValue = gtk_editable_get_string (editable, 0, -1); - [pane nodeLabelEdited:newValue]; - - [pool drain]; -} - -static void edge_node_label_changed_cb (GtkEditable *editable, PropertiesPane *pane) { - if (!gtk_widget_is_sensitive (GTK_WIDGET (editable))) { - // clearly wasn't the user editing - return; - } - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - NSString *newValue = gtk_editable_get_string (editable, 0, -1); - [pane edgeNodeLabelEdited:newValue]; - - [pool drain]; -} - -static void edge_node_toggled_cb (GtkToggleButton *toggle, PropertiesPane *pane) { - if (!gtk_widget_is_sensitive (GTK_WIDGET (toggle))) { - // clearly wasn't the user editing - return; - } - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - gboolean newValue = gtk_toggle_button_get_active (toggle); - [pane edgeNodeToggled:newValue]; - - [pool drain]; -} - -static void edge_source_anchor_changed_cb (GtkEditable *editable, PropertiesPane *pane) { - if (!gtk_widget_is_sensitive (GTK_WIDGET (editable))) { - // clearly wasn't the user editing - return; - } - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - NSString *newValue = gtk_editable_get_string (editable, 0, -1); - if (![pane edgeSourceAnchorEdited:newValue]) - widget_set_error (GTK_WIDGET (editable)); - - [pool drain]; -} - -static void edge_target_anchor_changed_cb (GtkEditable *editable, PropertiesPane *pane) { - if (!gtk_widget_is_sensitive (GTK_WIDGET (editable))) { - // clearly wasn't the user editing - return; - } - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - NSString *newValue = gtk_editable_get_string (editable, 0, -1); - if (![pane edgeTargetAnchorEdited:newValue]) - widget_set_error (GTK_WIDGET (editable)); - - [pool drain]; -} - -// }}} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit/src/gtk/PropertyListEditor.h b/tikzit/src/gtk/PropertyListEditor.h deleted file mode 100644 index 2d3166a..0000000 --- a/tikzit/src/gtk/PropertyListEditor.h +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import -#import "GraphElementData.h" -#import "GraphElementProperty.h" - -@protocol PropertyChangeDelegate -@optional -- (BOOL)startEdit; -- (void)endEdit; -- (void)cancelEdit; -@end - -@interface PropertyListEditor: NSObject { - GraphElementData *data; - NSObject *delegate; - - GtkListStore *list; - GtkWidget *view; - GtkWidget *widget; - GtkWidget *removeButton; -} - -/*! - @property widget - @brief The widget displaying the editable list - */ -@property (readonly) GtkWidget *widget; - -/*! - @property data - @brief The GraphElementData that should be reflected in the list - */ -@property (retain) GraphElementData *data; - -/*! - @property delegate - @brief A delegate for dealing with property changes - */ -@property (retain) NSObject *delegate; - -/*! - * Reload the properties from the data store - */ -- (void) reloadProperties; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/PropertyListEditor.m b/tikzit/src/gtk/PropertyListEditor.m deleted file mode 100644 index 9760618..0000000 --- a/tikzit/src/gtk/PropertyListEditor.m +++ /dev/null @@ -1,501 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "PropertyListEditor.h" -#import "gtkhelpers.h" - -// {{{ Constants - -enum { - PLM_NAME_COL = 0, - PLM_VALUE_COL, - PLM_IS_PROPERTY_COL, - PLM_PROPERTY_COL, - PLM_N_COLS -}; - -// }}} -// {{{ Internal interfaces -// {{{ Signals - -static void value_edited_cb (GtkCellRendererText *renderer, - gchar *path, - gchar *new_text, - PropertyListEditor *editor); -static void name_edited_cb (GtkCellRendererText *renderer, - gchar *path, - gchar *new_text, - PropertyListEditor *editor); -static void add_prop_clicked_cb (GtkButton *button, - PropertyListEditor *editor); -static void add_atom_clicked_cb (GtkButton *button, - PropertyListEditor *editor); -static void remove_clicked_cb (GtkButton *button, - PropertyListEditor *editor); -static void text_editing_started (GtkCellRenderer *cell, - GtkCellEditable *editable, - const gchar *path, - PropertyListEditor *editor); -static void text_changed_cb (GtkEditable *editable, - PropertyListEditor *pane); -static void selection_changed_cb (GtkTreeSelection *selection, - PropertyListEditor *pane); - -// }}} -// {{{ Private - -@interface PropertyListEditor (Private) -- (void) updatePath:(gchar*)path withValue:(NSString*)newText; -- (void) updatePath:(gchar*)path withName:(NSString*)newText; -- (void) addProperty; -- (void) addAtom; -- (void) removeSelected; -- (void) selectionCountChanged:(int)newSelectionCount; -- (void) clearStore; -@end - -// }}} -// }}} -// {{{ API - -@implementation PropertyListEditor - -- (id) init { - self = [super init]; - - if (self) { - list = gtk_list_store_new (PLM_N_COLS, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_BOOLEAN, - G_TYPE_POINTER); - g_object_ref_sink (G_OBJECT (list)); - view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (list)); - g_object_ref_sink (G_OBJECT (view)); - GtkWidget *scrolledview = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledview), - GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); - gtk_container_add (GTK_CONTAINER (scrolledview), view); - gtk_widget_set_size_request (view, -1, 150); - data = nil; - delegate = nil; - - GtkCellRenderer *renderer; - GtkTreeViewColumn *column; - - renderer = gtk_cell_renderer_text_new (); - g_object_set (G_OBJECT (renderer), - "editable", TRUE, - NULL); - column = gtk_tree_view_column_new_with_attributes ("Key/Atom", - renderer, - "text", PLM_NAME_COL, - NULL); - gtk_tree_view_append_column (GTK_TREE_VIEW (view), column); - g_signal_connect (G_OBJECT (renderer), - "editing-started", - G_CALLBACK (text_editing_started), - self); - g_signal_connect (G_OBJECT (renderer), - "edited", - G_CALLBACK (name_edited_cb), - self); - - renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes ("Value", - renderer, - "text", PLM_VALUE_COL, - "editable", PLM_IS_PROPERTY_COL, - "sensitive", PLM_IS_PROPERTY_COL, - NULL); - gtk_tree_view_append_column (GTK_TREE_VIEW (view), column); - g_signal_connect (G_OBJECT (renderer), - "edited", - G_CALLBACK (value_edited_cb), - self); - - widget = gtk_vbox_new (FALSE, 0); - gtk_box_set_spacing (GTK_BOX (widget), 6); - g_object_ref_sink (G_OBJECT (widget)); - - GtkWidget *listFrame = gtk_frame_new (NULL); - gtk_container_add (GTK_CONTAINER (listFrame), scrolledview); - gtk_widget_show (listFrame); - gtk_container_add (GTK_CONTAINER (widget), listFrame); - - GtkBox *buttonBox = GTK_BOX (gtk_hbox_new(FALSE, 0)); - gtk_box_pack_start (GTK_BOX (widget), GTK_WIDGET (buttonBox), FALSE, FALSE, 0); - - GtkWidget *addPropButton = gtk_button_new (); - //gtk_widget_set_size_request (addPropButton, 27, 27); - gtk_widget_set_tooltip_text (addPropButton, "Add property"); - GtkWidget *addPropContents = gtk_hbox_new(FALSE, 0); - GtkWidget *addPropIcon = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON); - gtk_container_add (GTK_CONTAINER (addPropContents), addPropIcon); - gtk_container_add (GTK_CONTAINER (addPropContents), gtk_label_new ("P")); - gtk_container_add (GTK_CONTAINER (addPropButton), addPropContents); - gtk_box_pack_start (buttonBox, addPropButton, FALSE, FALSE, 0); - g_signal_connect (G_OBJECT (addPropButton), - "clicked", - G_CALLBACK (add_prop_clicked_cb), - self); - - GtkWidget *addAtomButton = gtk_button_new (); - //gtk_widget_set_size_request (addAtomButton, 27, 27); - gtk_widget_set_tooltip_text (addAtomButton, "Add atom"); - GtkWidget *addAtomContents = gtk_hbox_new(FALSE, 0); - GtkWidget *addAtomIcon = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON); - gtk_container_add (GTK_CONTAINER (addAtomContents), addAtomIcon); - gtk_container_add (GTK_CONTAINER (addAtomContents), gtk_label_new ("A")); - gtk_container_add (GTK_CONTAINER (addAtomButton), addAtomContents); - gtk_box_pack_start (buttonBox, addAtomButton, FALSE, FALSE, 0); - g_signal_connect (G_OBJECT (addAtomButton), - "clicked", - G_CALLBACK (add_atom_clicked_cb), - self); - - removeButton = gtk_button_new (); - g_object_ref_sink (G_OBJECT (removeButton)); - gtk_widget_set_sensitive (removeButton, FALSE); - //gtk_widget_set_size_request (removeButton, 27, 27); - gtk_widget_set_tooltip_text (removeButton, "Remove selected"); - GtkWidget *removeIcon = gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_BUTTON); - gtk_container_add (GTK_CONTAINER (removeButton), removeIcon); - gtk_box_pack_start (buttonBox, removeButton, FALSE, FALSE, 0); - g_signal_connect (G_OBJECT (removeButton), - "clicked", - G_CALLBACK (remove_clicked_cb), - self); - - GtkTreeSelection *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view)); - g_signal_connect (G_OBJECT (selection), - "changed", - G_CALLBACK (selection_changed_cb), - self); - - gtk_widget_show_all (GTK_WIDGET (buttonBox)); - gtk_widget_show_all (scrolledview); - - gtk_widget_set_sensitive (widget, FALSE); - } - - return self; -} - -- (void) dealloc { - [self clearStore]; - - [data release]; - [delegate release]; - - g_object_unref (list); - g_object_unref (view); - g_object_unref (widget); - g_object_unref (removeButton); - - [super dealloc]; -} - -@synthesize widget, delegate; - -- (GraphElementData*) data { return data; } -- (void) setData:(GraphElementData*)d { - [d retain]; - [data release]; - data = d; - [self reloadProperties]; - gtk_widget_set_sensitive (widget, data != nil); -} - -- (void) reloadProperties { - [self clearStore]; - int pos = 0; - for (GraphElementProperty *p in data) { - GtkTreeIter iter; - [p retain]; - gtk_list_store_insert_with_values (list, &iter, pos, - PLM_NAME_COL, [[p key] UTF8String], - PLM_VALUE_COL, [[p value] UTF8String], - PLM_IS_PROPERTY_COL, ![p isAtom], - PLM_PROPERTY_COL, (void *)p, - -1); - ++pos; - } -} - -@end - -// }}} -// {{{ Private - -@implementation PropertyListEditor (Private) -- (void) updatePath:(gchar*)pathStr withValue:(NSString*)newText { - if (![newText isValidTikzPropertyNameOrValue]) - return; - - GtkTreeIter iter; - GtkTreePath *path = gtk_tree_path_new_from_string (pathStr); - - if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (list), &iter, path)) { - gtk_tree_path_free (path); - return; - } - - void *propPtr; - gtk_tree_model_get (GTK_TREE_MODEL (list), &iter, - PLM_PROPERTY_COL, &propPtr, - -1); - GraphElementProperty *prop = (GraphElementProperty*)propPtr; - - if (![prop isAtom]) { - if (![delegate respondsToSelector:@selector(startEdit)] || [delegate startEdit]) { - [prop setValue:newText]; - gtk_list_store_set (list, &iter, - PLM_VALUE_COL, [newText UTF8String], - -1); - [delegate endEdit]; - } - } - - gtk_tree_path_free (path); -} - -- (void) updatePath:(gchar*)pathStr withName:(NSString*)newText { - if (![newText isValidTikzPropertyNameOrValue]) - return; - - GtkTreeIter iter; - GtkTreePath *path = gtk_tree_path_new_from_string (pathStr); - - if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (list), &iter, path)) { - gtk_tree_path_free (path); - return; - } - - void *propPtr; - gtk_tree_model_get (GTK_TREE_MODEL (list), &iter, - PLM_PROPERTY_COL, &propPtr, - -1); - GraphElementProperty *prop = (GraphElementProperty*)propPtr; - - if (![delegate respondsToSelector:@selector(startEdit)] || [delegate startEdit]) { - if ([newText isEqualToString:@""]) { - [data removeObjectIdenticalTo:prop]; - gtk_list_store_remove (list, &iter); - [prop release]; - } else { - [prop setKey:newText]; - gtk_list_store_set (list, &iter, - PLM_NAME_COL, [newText UTF8String], - -1); - } - [delegate endEdit]; - } - - gtk_tree_path_free (path); -} - -- (void) addProperty { - GtkTreeIter iter; - GraphElementProperty *p = [[GraphElementProperty alloc] initWithPropertyValue:@"" forKey:@"new property"]; - if (![delegate respondsToSelector:@selector(startEdit)] || [delegate startEdit]) { - [data addObject:p]; - gint pos = [data count] - 1; - gtk_list_store_insert_with_values (list, &iter, pos, - PLM_NAME_COL, "new property", - PLM_VALUE_COL, "", - PLM_IS_PROPERTY_COL, TRUE, - PLM_PROPERTY_COL, (void *)p, - -1); - [delegate endEdit]; - } else { - [p release]; - } -} - -- (void) addAtom { - GtkTreeIter iter; - GraphElementProperty *p = [[GraphElementProperty alloc] initWithAtomName:@"new atom"]; - if (![delegate respondsToSelector:@selector(startEdit)] || [delegate startEdit]) { - [data addObject:p]; - gint pos = [data count] - 1; - gtk_list_store_insert_with_values (list, &iter, pos, - PLM_NAME_COL, "new atom", - PLM_VALUE_COL, [[p value] UTF8String], - PLM_IS_PROPERTY_COL, FALSE, - PLM_PROPERTY_COL, (void *)p, - -1); - [delegate endEdit]; - } else { - [p release]; - } -} - -- (void) removeSelected { - GtkTreeSelection *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view)); - GList *selPaths = gtk_tree_selection_get_selected_rows (selection, NULL); - GList *selIters = NULL; - - // Convert to iters, as GtkListStore has persistent iters - GList *curr = selPaths; - while (curr != NULL) { - GtkTreeIter iter; - gtk_tree_model_get_iter (GTK_TREE_MODEL (list), - &iter, - (GtkTreePath*)curr->data); - selIters = g_list_prepend (selIters, gtk_tree_iter_copy (&iter)); - curr = g_list_next (curr); - } - - // remove all iters - curr = selIters; - while (curr != NULL) { - GtkTreeIter *iter = (GtkTreeIter*)curr->data; - void *propPtr; - gtk_tree_model_get (GTK_TREE_MODEL (list), iter, - PLM_PROPERTY_COL, &propPtr, - -1); - GraphElementProperty *prop = (GraphElementProperty*)propPtr; - if (![delegate respondsToSelector:@selector(startEdit)] || [delegate startEdit]) { - [data removeObjectIdenticalTo:prop]; - gtk_list_store_remove (list, iter); - [prop release]; - [delegate endEdit]; - } - curr = g_list_next (curr); - } - - g_list_foreach (selIters, (GFunc) gtk_tree_iter_free, NULL); - g_list_free (selIters); - g_list_foreach (selPaths, (GFunc) gtk_tree_path_free, NULL); - g_list_free (selPaths); -} - -- (void) selectionCountChanged:(int)count { - gtk_widget_set_sensitive (removeButton, count > 0); -} - -- (void) clearStore { - GtkTreeIter iter; - if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list), &iter)) { - do { - void *prop; - gtk_tree_model_get (GTK_TREE_MODEL (list), &iter, - PLM_PROPERTY_COL, &prop, - -1); - [(id)prop release]; - } while (gtk_tree_model_iter_next (GTK_TREE_MODEL (list), &iter)); - gtk_list_store_clear (list); - } -} -@end - -// }}} -// {{{ GTK+ callbacks - -static void value_edited_cb (GtkCellRendererText *renderer, - gchar *path, - gchar *new_text, - PropertyListEditor *editor) -{ - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor updatePath:path withValue:[NSString stringWithUTF8String:new_text]]; - [pool drain]; -} - -static void name_edited_cb (GtkCellRendererText *renderer, - gchar *path, - gchar *new_text, - PropertyListEditor *editor) -{ - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor updatePath:path withName:[NSString stringWithUTF8String:new_text]]; - [pool drain]; -} - -static void add_prop_clicked_cb (GtkButton *button, - PropertyListEditor *editor) -{ - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor addProperty]; - [pool drain]; -} - -static void add_atom_clicked_cb (GtkButton *button, - PropertyListEditor *editor) -{ - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor addAtom]; - [pool drain]; -} - -static void remove_clicked_cb (GtkButton *button, - PropertyListEditor *editor) -{ - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor removeSelected]; - [pool drain]; -} - -static void text_editing_started (GtkCellRenderer *cell, - GtkCellEditable *editable, - const gchar *path, - PropertyListEditor *editor) -{ - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - if (GTK_IS_EDITABLE (editable) && GTK_IS_WIDGET (editable)) { - g_signal_handlers_disconnect_by_func (G_OBJECT (editable), - G_CALLBACK (text_changed_cb), - editor); - widget_clear_error (GTK_WIDGET (editable)); - g_signal_connect (G_OBJECT (editable), - "changed", - G_CALLBACK (text_changed_cb), - editor); - } - - [pool drain]; -} - -static void text_changed_cb (GtkEditable *editable, PropertyListEditor *pane) -{ - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - NSString *newValue = gtk_editable_get_string (editable, 0, -1); - if (![newValue isValidTikzPropertyNameOrValue]) { - widget_set_error (GTK_WIDGET (editable)); - } else { - widget_clear_error (GTK_WIDGET (editable)); - } - - [pool drain]; -} - -static void selection_changed_cb (GtkTreeSelection *selection, - PropertyListEditor *pane) -{ - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - int selcount = gtk_tree_selection_count_selected_rows (selection); - [pane selectionCountChanged:selcount]; - [pool drain]; -} - -// }}} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit/src/gtk/RecentManager.h b/tikzit/src/gtk/RecentManager.h deleted file mode 100644 index e2c2793..0000000 --- a/tikzit/src/gtk/RecentManager.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" - -@interface RecentManager: NSObject { -} - -+ (RecentManager*) defaultManager; - -- (void)addRecentFile:(NSString*)path; -- (void)removeRecentFile:(NSString*)path; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/RecentManager.m b/tikzit/src/gtk/RecentManager.m deleted file mode 100644 index c6074c6..0000000 --- a/tikzit/src/gtk/RecentManager.m +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "RecentManager.h" -#import - -static RecentManager *defMan = nil; - -@implementation RecentManager -- (id) init { - self = [super init]; - return self; -} - -+ (RecentManager*) defaultManager { - if (defMan == nil) { - defMan = [[self alloc] init]; - } - return defMan; -} - -- (void)addRecentFile:(NSString*)path { - NSError *error = nil; - gchar *uri = [path glibUriWithError:&error]; - if (error) { - logError (error, @"Could not add recent file"); - return; - } - - GtkRecentData recent_data; - recent_data.display_name = NULL; - recent_data.description = NULL; - recent_data.mime_type = "text/x-tikz"; - recent_data.app_name = (gchar *) g_get_application_name (); - recent_data.app_exec = g_strjoin (" ", g_get_prgname (), "%u", NULL); - recent_data.groups = NULL; - recent_data.is_private = FALSE; - - gtk_recent_manager_add_full (gtk_recent_manager_get_default(), uri, &recent_data); - - g_free (uri); - g_free (recent_data.app_exec); -} - -- (void)removeRecentFile:(NSString*)path { - NSError *error = nil; - gchar *uri = [path glibUriWithError:&error]; - if (error) { - logError (error, @"Could not remove recent file"); - return; - } - - gtk_recent_manager_remove_item (gtk_recent_manager_get_default(), uri, NULL); - - g_free (uri); -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/SelectTool.h b/tikzit/src/gtk/SelectTool.h deleted file mode 100644 index 65f511a..0000000 --- a/tikzit/src/gtk/SelectTool.h +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "Tool.h" - -@class Edge; -@class Node; - -// FIXME: replace this with delegates -typedef enum { - QuietState, - SelectBoxState, - ToggleSelectState, - MoveSelectedNodesState, - DragEdgeControlPoint1, - DragEdgeControlPoint2 -} SelectToolState; - -typedef enum { - DragSelectsNodes = 1, - DragSelectsEdges = 2, - DragSelectsBoth = DragSelectsNodes | DragSelectsEdges -} DragSelectMode; - -@interface SelectTool : NSObject { - GraphRenderer *renderer; - SelectToolState state; - float edgeFuzz; - DragSelectMode dragSelectMode; - NSPoint dragOrigin; - Node *leaderNode; - NSPoint oldLeaderPos; - Edge *modifyEdge; - NSRect selectionBox; - NSMutableSet *selectionBoxContents; - - GtkWidget *configWidget; - GSList *dragSelectModeButtons; -} - -@property (assign) float edgeFuzz; -@property (assign) DragSelectMode dragSelectMode; - -- (id) init; -+ (id) tool; -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/SelectTool.m b/tikzit/src/gtk/SelectTool.m deleted file mode 100644 index b3121ae..0000000 --- a/tikzit/src/gtk/SelectTool.m +++ /dev/null @@ -1,590 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "SelectTool.h" - -#import "Configuration.h" -#import "Edge+Render.h" -#import "GraphRenderer.h" -#import "TikzDocument.h" -#import "tzstockitems.h" - -#import - -#define DRAG_SELECT_MODE_KEY "tikzit-drag-select-mode" - -static const InputMask unionSelectMask = ShiftMask; - -static void drag_select_mode_cb (GtkToggleButton *button, SelectTool *tool); - -@interface SelectTool (Private) -- (TikzDocument*) doc; -- (void) shiftNodesByMovingLeader:(Node*)leader to:(NSPoint)to; -- (void) deselectAllNodes; -- (void) deselectAllEdges; -- (void) deselectAll; -- (BOOL) circleWithCenter:(NSPoint)c andRadius:(float)r containsPoint:(NSPoint)p; -- (void) lookForControlPointAt:(NSPoint)pos; -- (void) setSelectionBox:(NSRect)box; -- (void) clearSelectionBox; -- (BOOL) selectionBoxContainsNode:(Node*)node; -@end - -@implementation SelectTool -- (NSString*) name { return @"Select"; } -- (const gchar*) stockId { return TIKZIT_STOCK_SELECT; } -- (NSString*) helpText { return @"Select, move and edit nodes and edges"; } -- (NSString*) shortcut { return @"s"; } -@synthesize configurationWidget=configWidget; -@synthesize edgeFuzz; - -+ (id) tool { - return [[[self alloc] init] autorelease]; -} - -- (id) init { - self = [super init]; - - if (self) { - state = QuietState; - edgeFuzz = 3.0f; - dragSelectMode = DragSelectsNodes; - - configWidget = gtk_vbox_new (FALSE, 0); - g_object_ref_sink (configWidget); - - GtkWidget *label = gtk_label_new ("Drag selects:"); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_box_pack_start (GTK_BOX (configWidget), - label, - FALSE, - FALSE, - 0); - - GtkWidget *nodeOpt = gtk_radio_button_new_with_label (NULL, "nodes (N)"); - g_object_set_data (G_OBJECT (nodeOpt), - DRAG_SELECT_MODE_KEY, - (gpointer)DragSelectsNodes); - gtk_box_pack_start (GTK_BOX (configWidget), - nodeOpt, - FALSE, - FALSE, - 0); - g_signal_connect (G_OBJECT (nodeOpt), - "toggled", - G_CALLBACK (drag_select_mode_cb), - self); - - GtkWidget *edgeOpt = gtk_radio_button_new_with_label ( - gtk_radio_button_get_group (GTK_RADIO_BUTTON (nodeOpt)), - "edges (E)"); - g_object_set_data (G_OBJECT (edgeOpt), - DRAG_SELECT_MODE_KEY, - (gpointer)DragSelectsEdges); - gtk_box_pack_start (GTK_BOX (configWidget), - edgeOpt, - FALSE, - FALSE, - 0); - g_signal_connect (G_OBJECT (edgeOpt), - "toggled", - G_CALLBACK (drag_select_mode_cb), - self); - - GtkWidget *bothOpt = gtk_radio_button_new_with_label ( - gtk_radio_button_get_group (GTK_RADIO_BUTTON (edgeOpt)), - "both (B)"); - g_object_set_data (G_OBJECT (bothOpt), - DRAG_SELECT_MODE_KEY, - (gpointer)DragSelectsBoth); - gtk_box_pack_start (GTK_BOX (configWidget), - bothOpt, - FALSE, - FALSE, - 0); - g_signal_connect (G_OBJECT (bothOpt), - "toggled", - G_CALLBACK (drag_select_mode_cb), - self); - dragSelectModeButtons = gtk_radio_button_get_group (GTK_RADIO_BUTTON (bothOpt)); - - gtk_widget_show_all (configWidget); - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - [renderer release]; - [leaderNode release]; - [modifyEdge release]; - - g_object_unref (G_OBJECT (configWidget)); - - [super dealloc]; -} - -- (DragSelectMode) dragSelectMode { - return dragSelectMode; -} - -- (void) setDragSelectMode:(DragSelectMode)mode { - if (dragSelectMode == mode) - return; - - dragSelectMode = mode; - - GSList *entry = dragSelectModeButtons; - while (entry) { - GtkToggleButton *button = GTK_TOGGLE_BUTTON (entry->data); - DragSelectMode buttonMode = - (DragSelectMode) g_object_get_data ( - G_OBJECT (button), - DRAG_SELECT_MODE_KEY); - if (buttonMode == dragSelectMode) { - gtk_toggle_button_set_active (button, TRUE); - break; - } - - entry = g_slist_next (entry); - } -} - -- (GraphRenderer*) activeRenderer { return renderer; } -- (void) setActiveRenderer:(GraphRenderer*)r { - if (r == renderer) - return; - - [r retain]; - [renderer release]; - renderer = r; - - state = QuietState; -} - -- (void) mousePressAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { - if (button != LeftButton) - return; - - dragOrigin = pos; - - // we should already be in a quiet state, but no harm in making sure - state = QuietState; - - modifyEdge = nil; - [self lookForControlPointAt:pos]; - - if (modifyEdge == nil) { - // we didn't find a control point - - BOOL unionSelect = (mask & unionSelectMask); - - leaderNode = [renderer anyNodeAt:pos]; - // if we hit a node, deselect other nodes (if Shift is up) and go to move mode - if (leaderNode != nil) { - BOOL alreadySelected = [[self doc] isNodeSelected:leaderNode]; - if (!unionSelect && !alreadySelected) { - [self deselectAll]; - } - if (unionSelect && alreadySelected) { - state = ToggleSelectState; - } else { - [[[self doc] pickSupport] selectNode:leaderNode]; - state = MoveSelectedNodesState; - oldLeaderPos = [leaderNode point]; - [[self doc] startShiftNodes:[[[self doc] pickSupport] selectedNodes]]; - } - } - - // if mouse did not hit a node, check if mouse hit an edge - if (leaderNode == nil) { - Edge *edge = [renderer anyEdgeAt:pos withFuzz:edgeFuzz]; - if (edge != nil) { - BOOL alreadySelected = [[self doc] isEdgeSelected:edge]; - if (!unionSelect) { - [self deselectAll]; - } - if (unionSelect && alreadySelected) { - [[[self doc] pickSupport] deselectEdge:edge]; - } else { - [[[self doc] pickSupport] selectEdge:edge]; - } - } else { - // if mouse did not hit anything, put us in box mode - if (!unionSelect) { - [self deselectAll]; - } - [renderer clearHighlightedNodes]; - state = SelectBoxState; - } - } - } -} - -- (void) mouseMoveTo:(NSPoint)pos withButtons:(MouseButton)buttons andMask:(InputMask)mask { - if (!(buttons & LeftButton)) - return; - - Transformer *transformer = [renderer transformer]; - - if (state == ToggleSelectState) { - state = MoveSelectedNodesState; - oldLeaderPos = [leaderNode point]; - [[self doc] startShiftNodes:[[[self doc] pickSupport] selectedNodes]]; - } - - if (state == SelectBoxState) { - [self setSelectionBox:NSRectAroundPoints(dragOrigin, pos)]; - - NSEnumerator *enumerator = [[self doc] nodeEnumerator]; - Node *node; - while ((node = [enumerator nextObject]) != nil) { - NSPoint nodePos = [transformer toScreen:[node point]]; - if (NSPointInRect(nodePos, selectionBox)) { - [renderer setNode:node highlighted:YES]; - } else { - [renderer setNode:node highlighted:NO]; - } - } - } else if (state == MoveSelectedNodesState) { - if (leaderNode != nil) { - [self shiftNodesByMovingLeader:leaderNode to:pos]; - NSPoint shiftSoFar; - shiftSoFar.x = [leaderNode point].x - oldLeaderPos.x; - shiftSoFar.y = [leaderNode point].y - oldLeaderPos.y; - [[self doc] shiftNodesUpdate:shiftSoFar]; - } - } else if (state == DragEdgeControlPoint1 || state == DragEdgeControlPoint2) { - // invalidate once before we start changing it: we may be shrinking - // the control circles - [[self doc] modifyEdgeCheckPoint]; - if (state == DragEdgeControlPoint1) { - [modifyEdge moveCp1To:[transformer fromScreen:pos] - withWeightCourseness:0.1f - andBendCourseness:15 - forceLinkControlPoints:(mask & ControlMask)]; - } else { - [modifyEdge moveCp2To:[transformer fromScreen:pos] - withWeightCourseness:0.1f - andBendCourseness:15 - forceLinkControlPoints:(mask & ControlMask)]; - } - [[self doc] modifyEdgeCheckPoint]; - } -} - -- (void) mouseReleaseAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { - if (button != LeftButton) - return; - - if (state == SelectBoxState) { - PickSupport *ps = [[self doc] pickSupport]; - Transformer *transformer = [renderer transformer]; - - if (!(mask & unionSelectMask)) { - [ps deselectAllNodes]; - [ps deselectAllEdges]; - } - - Graph *graph = [[self doc] graph]; - if (dragSelectMode & DragSelectsNodes) { - for (Node *node in [graph nodes]) { - NSPoint nodePos = [transformer toScreen:[node point]]; - if (NSPointInRect(nodePos, selectionBox)) { - [ps selectNode:node]; - } - } - } - if (dragSelectMode & DragSelectsEdges) { - for (Edge *edge in [graph edges]) { - NSPoint edgePos = [transformer toScreen:[edge mid]]; - if (NSPointInRect(edgePos, selectionBox)) { - [ps selectEdge:edge]; - } - } - } - - [self clearSelectionBox]; - } else if (state == ToggleSelectState) { - [[[self doc] pickSupport] deselectNode:leaderNode]; - leaderNode = nil; - } else if (state == MoveSelectedNodesState) { - if (NSEqualPoints (oldLeaderPos, [leaderNode point])) { - [[self doc] cancelShiftNodes]; - } else { - [[self doc] endShiftNodes]; - } - leaderNode = nil; - } else if (state == DragEdgeControlPoint1 || state == DragEdgeControlPoint2) { - // FIXME: check if there was any real change - [[self doc] endModifyEdge]; - } - - state = QuietState; -} - -- (void) mouseDoubleClickAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { - if (button != LeftButton) - return; - - if (state != QuietState) { - return; - } - // convert bend mode on edge under mouse cursor - Edge *edge = [renderer anyEdgeAt:pos withFuzz:edgeFuzz]; - if (edge != nil) { - [[self doc] startModifyEdge:edge]; - if ([edge bendMode]==EdgeBendModeBasic) { - [edge convertBendToAngles]; - [edge setBendMode:EdgeBendModeInOut]; - } else { - [edge setBendMode:EdgeBendModeBasic]; - } - [[self doc] endModifyEdge]; - - [self deselectAllEdges]; - [[[self doc] pickSupport] selectEdge:edge]; - } -} - -- (void) keyPressed:(unsigned int)keyVal withMask:(InputMask)mask { - if (keyVal == GDK_KEY_N && mask == ShiftMask) { - [self setDragSelectMode:DragSelectsNodes]; - } else if (keyVal == GDK_KEY_E && mask == ShiftMask) { - [self setDragSelectMode:DragSelectsEdges]; - } else if (keyVal == GDK_KEY_B && mask == ShiftMask) { - [self setDragSelectMode:DragSelectsBoth]; - } else if (keyVal == GDK_KEY_D && (!mask || mask == ShiftMask)) { - PickSupport *ps = [[self doc] pickSupport]; - for (Node* node in [ps selectedNodes]) { - NSRect b = [node boundingRect]; - NSLog(@"%@ @ (%f,%f) {style=%@, label=%@, data=%@, bounds=(%f,%f),(%fx%f)}", - [node name], - [node point].x, - [node point].y, - [[node style] name], - [node label], - [[node data] tikzList], - b.origin.x, b.origin.y, b.size.width, b.size.height); - } - for (Edge* edge in [ps selectedEdges]) { - NSRect b = [edge boundingRect]; - NSLog(@"%@:%@->%@:%@ {\n" - @" style=%@, data=%@,\n" - @" bend=%d, weight=%f, inAngle=%d, outAngle=%d, bendMode=%d,\n" - @" head=(%f,%f), headTan=(%f,%f) leftHeadNormal=(%f,%f), rightHeadNormal=(%f,%f),\n" - @" cp1=(%f,%f),\n" - @" mid=(%f,%f), midTan=(%f,%f), leftNormal=(%f,%f), rightNormal=(%f,%f)\n" - @" cp2=(%f,%f),\n" - @" tail=(%f,%f), tailTan=(%f,%f), leftTailNormal=(%f,%f), rightTailNormal=(%f,%f),\n" - @" isSelfLoop=%s, isStraight=%s,\n" - @" bounds=(%f,%f),(%fx%f)\n" - @"}", - [[edge source] name], - [edge sourceAnchor], - [[edge target] name], - [edge targetAnchor], - [[edge style] name], - [[edge data] tikzList], - [edge bend], - [edge weight], - [edge inAngle], - [edge outAngle], - [edge bendMode], - [edge head].x, - [edge head].y, - [edge headTan].x, - [edge headTan].y, - [edge leftHeadNormal].x, - [edge leftHeadNormal].y, - [edge rightHeadNormal].x, - [edge rightHeadNormal].y, - [edge cp1].x, - [edge cp1].y, - [edge mid].x, - [edge mid].y, - [edge midTan].x, - [edge midTan].y, - [edge leftNormal].x, - [edge leftNormal].y, - [edge rightNormal].x, - [edge rightNormal].y, - [edge cp2].x, - [edge cp2].y, - [edge tail].x, - [edge tail].y, - [edge tailTan].x, - [edge tailTan].y, - [edge leftTailNormal].x, - [edge leftTailNormal].y, - [edge rightTailNormal].x, - [edge rightTailNormal].y, - [edge isSelfLoop] ? "yes" : "no", - [edge isStraight] ? "yes" : "no", - b.origin.x, b.origin.y, b.size.width, b.size.height); - } - } -} - -- (void) renderWithContext:(id)context onSurface:(id)surface { - if (!NSIsEmptyRect (selectionBox)) { - [context saveState]; - - [context setAntialiasMode:AntialiasDisabled]; - [context setLineWidth:1.0]; - [context startPath]; - [context rect:selectionBox]; - RColor fColor = MakeRColor (0.8, 0.8, 0.8, 0.2); - RColor sColor = MakeSolidRColor (0.6, 0.6, 0.6); - [context strokePathWithColor:sColor andFillWithColor:fColor]; - - [context restoreState]; - } -} - -- (void) loadConfiguration:(Configuration*)config { - NSString *mode = [config stringEntry:@"Drag select mode" - inGroup:@"SelectTool"]; - if ([mode isEqualToString:@"nodes"]) { - [self setDragSelectMode:DragSelectsNodes]; - } else if ([mode isEqualToString:@"edges"]) { - [self setDragSelectMode:DragSelectsEdges]; - } else if ([mode isEqualToString:@"both"]) { - [self setDragSelectMode:DragSelectsBoth]; - } -} - -- (void) saveConfiguration:(Configuration*)config { - switch (dragSelectMode) { - case DragSelectsNodes: - [config setStringEntry:@"Drag select mode" - inGroup:@"SelectTool" - value:@"nodes"]; - break; - case DragSelectsEdges: - [config setStringEntry:@"Drag select mode" - inGroup:@"SelectTool" - value:@"edges"]; - break; - case DragSelectsBoth: - [config setStringEntry:@"Drag select mode" - inGroup:@"SelectTool" - value:@"both"]; - break; - } -} - -@end - -@implementation SelectTool (Private) -- (TikzDocument*) doc { - return [renderer document]; -} - -- (void) shiftNodesByMovingLeader:(Node*)leader to:(NSPoint)to { - Transformer *transformer = [renderer transformer]; - - NSPoint from = [transformer toScreen:[leader point]]; - to = [[renderer grid] snapScreenPoint:to]; - float dx = to.x - from.x; - float dy = to.y - from.y; - - for (Node *node in [[[self doc] pickSupport] selectedNodes]) { - NSPoint p = [transformer toScreen:[node point]]; - p.x += dx; - p.y += dy; - [node setPoint:[transformer fromScreen:p]]; - } -} - -- (void) deselectAllNodes { - [[[self doc] pickSupport] deselectAllNodes]; -} - -- (void) deselectAllEdges { - [[[self doc] pickSupport] deselectAllEdges]; -} - -- (void) deselectAll { - [[[self doc] pickSupport] deselectAllNodes]; - [[[self doc] pickSupport] deselectAllEdges]; -} - -- (BOOL) circleWithCenter:(NSPoint)c andRadius:(float)r containsPoint:(NSPoint)p { - return (NSDistanceBetweenPoints(c, p) <= r); -} - -- (void) lookForControlPointAt:(NSPoint)pos { - const float cpr = [Edge controlPointRadius]; - for (Edge *e in [[[self doc] pickSupport] selectedEdges]) { - NSPoint cp1 = [[renderer transformer] toScreen:[e cp1]]; - if ([self circleWithCenter:cp1 andRadius:cpr containsPoint:pos]) { - state = DragEdgeControlPoint1; - modifyEdge = e; - [[self doc] startModifyEdge:e]; - return; - } - NSPoint cp2 = [[renderer transformer] toScreen:[e cp2]]; - if ([self circleWithCenter:cp2 andRadius:cpr containsPoint:pos]) { - state = DragEdgeControlPoint2; - modifyEdge = e; - [[self doc] startModifyEdge:e]; - return; - } - } -} - -- (void) setSelectionBox:(NSRect)box { - NSRect invRect = NSUnionRect (selectionBox, box); - selectionBox = box; - [renderer invalidateRect:NSInsetRect (invRect, -2, -2)]; -} - -- (void) clearSelectionBox { - NSRect oldRect = selectionBox; - - selectionBox = NSZeroRect; - - [renderer invalidateRect:NSInsetRect (oldRect, -2, -2)]; - [renderer clearHighlightedNodes]; -} - -- (BOOL) selectionBoxContainsNode:(Node*)node { - if (!NSIsEmptyRect (selectionBox)) - return NO; - - Transformer *transf = [[renderer surface] transformer]; - NSPoint screenPt = [transf toScreen:[node point]]; - return NSPointInRect(screenPt, selectionBox); -} -@end - -static void drag_select_mode_cb (GtkToggleButton *button, SelectTool *tool) { - if (gtk_toggle_button_get_active (button)) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - DragSelectMode buttonMode = - (DragSelectMode) g_object_get_data ( - G_OBJECT (button), - DRAG_SELECT_MODE_KEY); - [tool setDragSelectMode:buttonMode]; - [pool drain]; - } -} - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/SelectionPane.h b/tikzit/src/gtk/SelectionPane.h deleted file mode 100644 index 57a766a..0000000 --- a/tikzit/src/gtk/SelectionPane.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class Configuration; -@class EdgeStylesModel; -@class NodeStylesModel; -@class StyleManager; -@class TikzDocument; - -@interface SelectionPane: NSObject { - TikzDocument *document; - - NodeStylesModel *nodeStylesModel; - EdgeStylesModel *edgeStylesModel; - - GtkWidget *layout; - - GtkWidget *nodeStyleCombo; - GtkWidget *applyNodeStyleButton; - GtkWidget *clearNodeStyleButton; - GtkWidget *edgeStyleCombo; - GtkWidget *applyEdgeStyleButton; - GtkWidget *clearEdgeStyleButton; -} - -@property (retain) TikzDocument *document; -@property (assign) BOOL visible; -@property (readonly) GtkWidget *gtkWidget; - -- (id) initWithStyleManager:(StyleManager*)mgr; -- (id) initWithNodeStylesModel:(NodeStylesModel*)nsm - andEdgeStylesModel:(EdgeStylesModel*)esm; - -- (void) loadConfiguration:(Configuration*)config; -- (void) saveConfiguration:(Configuration*)config; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit/src/gtk/SelectionPane.m b/tikzit/src/gtk/SelectionPane.m deleted file mode 100644 index 2931258..0000000 --- a/tikzit/src/gtk/SelectionPane.m +++ /dev/null @@ -1,432 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "SelectionPane.h" - -#import "Configuration.h" -#import "EdgeStylesModel.h" -#import "NodeStylesModel.h" -#import "TikzDocument.h" - -#import "gtkhelpers.h" - -// {{{ Internal interfaces - -static void node_style_changed_cb (GtkComboBox *widget, SelectionPane *pane); -static void apply_node_style_button_cb (GtkButton *widget, SelectionPane *pane); -static void clear_node_style_button_cb (GtkButton *widget, SelectionPane *pane); -static void edge_style_changed_cb (GtkComboBox *widget, SelectionPane *pane); -static void apply_edge_style_button_cb (GtkButton *widget, SelectionPane *pane); -static void clear_edge_style_button_cb (GtkButton *widget, SelectionPane *pane); - -static void setup_style_cell_layout (GtkCellLayout *cell_layout, gint pixbuf_col, gint name_col); - -@interface SelectionPane (Notifications) -- (void) nodeSelectionChanged:(NSNotification*)n; -- (void) edgeSelectionChanged:(NSNotification*)n; -@end - -@interface SelectionPane (Private) -- (void) _updateNodeStyleButtons; -- (void) _updateEdgeStyleButtons; -- (NodeStyle*) _selectedNodeStyle; -- (EdgeStyle*) _selectedEdgeStyle; -- (void) _applyNodeStyle; -- (void) _clearNodeStyle; -- (void) _applyEdgeStyle; -- (void) _clearEdgeStyle; -@end - -// }}} -// {{{ API - -@implementation SelectionPane - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithStyleManager:(StyleManager*)sm { - return [self initWithNodeStylesModel:[NodeStylesModel modelWithStyleManager:sm] - andEdgeStylesModel:[EdgeStylesModel modelWithStyleManager:sm]]; -} - -- (id) initWithNodeStylesModel:(NodeStylesModel*)nsm - andEdgeStylesModel:(EdgeStylesModel*)esm { - self = [super init]; - - if (self) { - nodeStylesModel = [nsm retain]; - edgeStylesModel = [esm retain]; - - layout = gtk_vbox_new (FALSE, 0); - g_object_ref_sink (layout); - gtk_widget_show (layout); - - GtkWidget *label = gtk_label_new ("Selection"); - label_set_bold (GTK_LABEL (label)); - gtk_widget_show (label); - gtk_box_pack_start (GTK_BOX (layout), label, - FALSE, FALSE, 0); - - GtkWidget *lvl1_box = gtk_vbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (layout), lvl1_box, - FALSE, FALSE, 3); - - nodeStyleCombo = gtk_combo_box_new_with_model ([nodeStylesModel model]); - g_object_ref_sink (nodeStyleCombo); - setup_style_cell_layout (GTK_CELL_LAYOUT (nodeStyleCombo), - NODE_STYLES_ICON_COL, - NODE_STYLES_NAME_COL); - g_signal_connect (G_OBJECT (nodeStyleCombo), - "changed", - G_CALLBACK (node_style_changed_cb), - self); - gtk_box_pack_start (GTK_BOX (lvl1_box), nodeStyleCombo, - FALSE, FALSE, 0); - - GtkWidget *lvl2_box = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (lvl1_box), lvl2_box, - FALSE, FALSE, 0); - - applyNodeStyleButton = gtk_button_new_with_label ("Apply"); - g_object_ref_sink (applyNodeStyleButton); - gtk_widget_set_tooltip_text (applyNodeStyleButton, "Apply style to selected nodes"); - gtk_widget_set_sensitive (applyNodeStyleButton, FALSE); - g_signal_connect (G_OBJECT (applyNodeStyleButton), - "clicked", - G_CALLBACK (apply_node_style_button_cb), - self); - gtk_box_pack_start (GTK_BOX (lvl2_box), applyNodeStyleButton, - FALSE, FALSE, 0); - - clearNodeStyleButton = gtk_button_new_with_label ("Clear"); - g_object_ref_sink (clearNodeStyleButton); - gtk_widget_set_tooltip_text (clearNodeStyleButton, "Clear style from selected nodes"); - gtk_widget_set_sensitive (clearNodeStyleButton, FALSE); - g_signal_connect (G_OBJECT (clearNodeStyleButton), - "clicked", - G_CALLBACK (clear_node_style_button_cb), - self); - gtk_box_pack_start (GTK_BOX (lvl2_box), clearNodeStyleButton, - FALSE, FALSE, 0); - - lvl1_box = gtk_vbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (layout), lvl1_box, - FALSE, FALSE, 3); - - edgeStyleCombo = gtk_combo_box_new_with_model ([edgeStylesModel model]); - g_object_ref_sink (edgeStyleCombo); - setup_style_cell_layout (GTK_CELL_LAYOUT (edgeStyleCombo), - EDGE_STYLES_ICON_COL, - EDGE_STYLES_NAME_COL); - g_signal_connect (G_OBJECT (edgeStyleCombo), - "changed", - G_CALLBACK (edge_style_changed_cb), - self); - gtk_box_pack_start (GTK_BOX (lvl1_box), edgeStyleCombo, - FALSE, FALSE, 0); - - lvl2_box = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (lvl1_box), lvl2_box, - FALSE, FALSE, 0); - - applyEdgeStyleButton = gtk_button_new_with_label ("Apply"); - g_object_ref_sink (applyEdgeStyleButton); - gtk_widget_set_tooltip_text (applyEdgeStyleButton, "Apply style to selected edges"); - gtk_widget_set_sensitive (applyEdgeStyleButton, FALSE); - g_signal_connect (G_OBJECT (applyEdgeStyleButton), - "clicked", - G_CALLBACK (apply_edge_style_button_cb), - self); - gtk_box_pack_start (GTK_BOX (lvl2_box), applyEdgeStyleButton, - FALSE, FALSE, 0); - - clearEdgeStyleButton = gtk_button_new_with_label ("Clear"); - g_object_ref_sink (clearEdgeStyleButton); - gtk_widget_set_tooltip_text (clearEdgeStyleButton, "Clear style from selected edges"); - gtk_widget_set_sensitive (clearEdgeStyleButton, FALSE); - g_signal_connect (G_OBJECT (clearEdgeStyleButton), - "clicked", - G_CALLBACK (clear_edge_style_button_cb), - self); - gtk_box_pack_start (GTK_BOX (lvl2_box), clearEdgeStyleButton, - FALSE, FALSE, 0); - - gtk_widget_show_all (layout); - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - g_object_unref (nodeStyleCombo); - g_object_unref (applyNodeStyleButton); - g_object_unref (clearNodeStyleButton); - g_object_unref (edgeStyleCombo); - g_object_unref (applyEdgeStyleButton); - g_object_unref (clearEdgeStyleButton); - - g_object_unref (layout); - - [nodeStylesModel release]; - [edgeStylesModel release]; - - [document release]; - - [super dealloc]; -} - -- (TikzDocument*) document { - return document; -} - -- (void) setDocument:(TikzDocument*)doc { - if (document != nil) { - [[NSNotificationCenter defaultCenter] - removeObserver:self - name:nil - object:[document pickSupport]]; - } - - [doc retain]; - [document release]; - document = doc; - - if (doc != nil) { - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(nodeSelectionChanged:) - name:@"NodeSelectionChanged" object:[doc pickSupport]]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(edgeSelectionChanged:) - name:@"EdgeSelectionChanged" object:[doc pickSupport]]; - } - - [self _updateNodeStyleButtons]; - [self _updateEdgeStyleButtons]; -} - -- (BOOL) visible { - return gtk_widget_get_visible (layout); -} - -- (void) setVisible:(BOOL)visible { - gtk_widget_set_visible (layout, visible); -} - -- (GtkWidget*) gtkWidget { - return layout; -} - -- (void) loadConfiguration:(Configuration*)config { - NSString *nodeStyleName = [config stringEntry:@"SelectedNodeStyle" - inGroup:@"SelectionPane" - withDefault:nil]; - NodeStyle *nodeStyle = [[nodeStylesModel styleManager] nodeStyleForName:nodeStyleName]; - if (nodeStyle == nil) { - gtk_combo_box_set_active (GTK_COMBO_BOX (nodeStyleCombo), -1); - } else { - GtkTreeIter *iter = [nodeStylesModel iterFromStyle:nodeStyle]; - if (iter) { - gtk_combo_box_set_active_iter (GTK_COMBO_BOX (nodeStyleCombo), iter); - gtk_tree_iter_free (iter); - } - } - - NSString *edgeStyleName = [config stringEntry:@"SelectedEdgeStyle" - inGroup:@"SelectionPane" - withDefault:nil]; - EdgeStyle *edgeStyle = [[edgeStylesModel styleManager] edgeStyleForName:edgeStyleName]; - if (edgeStyle == nil) { - gtk_combo_box_set_active (GTK_COMBO_BOX (edgeStyleCombo), -1); - } else { - GtkTreeIter *iter = [edgeStylesModel iterFromStyle:edgeStyle]; - if (iter) { - gtk_combo_box_set_active_iter (GTK_COMBO_BOX (edgeStyleCombo), iter); - gtk_tree_iter_free (iter); - } - } -} - -- (void) saveConfiguration:(Configuration*)config { - [config setStringEntry:@"SelectedNodeStyle" - inGroup:@"SelectionPane" - value:[[self _selectedNodeStyle] name]]; - [config setStringEntry:@"SelectedEdgeStyle" - inGroup:@"SelectionPane" - value:[[self _selectedEdgeStyle] name]]; -} - -@end - -// }}} -// {{{ Notifications - -@implementation SelectionPane (Notifications) -- (void) nodeSelectionChanged:(NSNotification*)n { - [self _updateNodeStyleButtons]; -} - -- (void) edgeSelectionChanged:(NSNotification*)n { - [self _updateEdgeStyleButtons]; -} -@end - -// }}} -// {{{ Private - -@implementation SelectionPane (Private) -- (void) _updateNodeStyleButtons { - gboolean hasNodeSelection = [[[document pickSupport] selectedNodes] count] > 0; - - gtk_widget_set_sensitive (applyNodeStyleButton, - hasNodeSelection && [self _selectedNodeStyle] != nil); - gtk_widget_set_sensitive (clearNodeStyleButton, hasNodeSelection); -} - -- (void) _updateEdgeStyleButtons { - gboolean hasEdgeSelection = [[[document pickSupport] selectedEdges] count] > 0; - - gtk_widget_set_sensitive (applyEdgeStyleButton, - hasEdgeSelection && [self _selectedEdgeStyle] != nil); - gtk_widget_set_sensitive (clearEdgeStyleButton, hasEdgeSelection); -} - -- (NodeStyle*) _selectedNodeStyle { - GtkTreeIter iter; - if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (nodeStyleCombo), &iter)) { - return [nodeStylesModel styleFromIter:&iter]; - } else { - return nil; - } -} - -- (EdgeStyle*) _selectedEdgeStyle { - GtkTreeIter iter; - if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (edgeStyleCombo), &iter)) { - return [edgeStylesModel styleFromIter:&iter]; - } else { - return nil; - } -} - -- (void) _applyNodeStyle { - [document startModifyNodes:[[document pickSupport] selectedNodes]]; - - NodeStyle *style = [self _selectedNodeStyle]; - for (Node *node in [[document pickSupport] selectedNodes]) { - [node setStyle:style]; - } - - [document endModifyNodes]; -} - -- (void) _clearNodeStyle { - [document startModifyNodes:[[document pickSupport] selectedNodes]]; - - for (Node *node in [[document pickSupport] selectedNodes]) { - [node setStyle:nil]; - } - - [document endModifyNodes]; -} - -- (void) _applyEdgeStyle { - [document startModifyEdges:[[document pickSupport] selectedEdges]]; - - EdgeStyle *style = [self _selectedEdgeStyle]; - for (Edge *edge in [[document pickSupport] selectedEdges]) { - [edge setStyle:style]; - } - - [document endModifyEdges]; -} - -- (void) _clearEdgeStyle { - [document startModifyEdges:[[document pickSupport] selectedEdges]]; - - for (Edge *edge in [[document pickSupport] selectedEdges]) { - [edge setStyle:nil]; - } - - [document endModifyEdges]; -} -@end - -// }}} -// {{{ GTK+ callbacks - -static void node_style_changed_cb (GtkComboBox *widget, SelectionPane *pane) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [pane _updateNodeStyleButtons]; - [pool drain]; -} - -static void apply_node_style_button_cb (GtkButton *widget, SelectionPane *pane) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [pane _applyNodeStyle]; - [pool drain]; -} - -static void clear_node_style_button_cb (GtkButton *widget, SelectionPane *pane) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [pane _clearNodeStyle]; - [pool drain]; -} - -static void edge_style_changed_cb (GtkComboBox *widget, SelectionPane *pane) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [pane _updateEdgeStyleButtons]; - [pool drain]; -} - -static void apply_edge_style_button_cb (GtkButton *widget, SelectionPane *pane) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [pane _applyEdgeStyle]; - [pool drain]; -} - -static void clear_edge_style_button_cb (GtkButton *widget, SelectionPane *pane) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [pane _clearEdgeStyle]; - [pool drain]; -} - -// }}} -// -static void setup_style_cell_layout (GtkCellLayout *cell_layout, gint pixbuf_col, gint name_col) { - gtk_cell_layout_clear (cell_layout); - GtkCellRenderer *pixbuf_renderer = gtk_cell_renderer_pixbuf_new (); - gtk_cell_layout_pack_start (cell_layout, pixbuf_renderer, FALSE); - gtk_cell_layout_set_attributes ( - cell_layout, - pixbuf_renderer, - "pixbuf", pixbuf_col, - NULL); - GtkCellRenderer *text_renderer = gtk_cell_renderer_text_new (); - gtk_cell_layout_pack_start (cell_layout, text_renderer, FALSE); - gtk_cell_layout_set_attributes ( - cell_layout, - text_renderer, - "text", name_col, - NULL); -} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit/src/gtk/SettingsDialog.h b/tikzit/src/gtk/SettingsDialog.h deleted file mode 100644 index 0f687b3..0000000 --- a/tikzit/src/gtk/SettingsDialog.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class Configuration; -@class EdgeStylesPalette; -@class NodeStylesPalette; -@class StyleManager; - -@interface SettingsDialog: NSObject { - Configuration *configuration; - StyleManager *styleManager; - StyleManager *tempStyleManager; - NodeStylesPalette *nodePalette; - EdgeStylesPalette *edgePalette; - - GtkWindow *parentWindow; - GtkWindow *window; - - // we don't keep any refs, as we control - // the top window - GtkEntry *pdflatexPathEntry; -} - -@property (retain) Configuration *configuration; -@property (retain) StyleManager *styleManager; -@property (assign) GtkWindow *parentWindow; -@property (assign,getter=isVisible) BOOL visible; - -- (id) initWithConfiguration:(Configuration*)c andStyleManager:(StyleManager*)m; - -- (void) present; -- (void) show; -- (void) hide; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit/src/gtk/SettingsDialog.m b/tikzit/src/gtk/SettingsDialog.m deleted file mode 100644 index bdb5db6..0000000 --- a/tikzit/src/gtk/SettingsDialog.m +++ /dev/null @@ -1,328 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "SettingsDialog.h" - -#import "Application.h" -#import "Configuration.h" -#import "EdgeStylesPalette.h" -#import "NodeStylesPalette.h" -#import "StyleManager.h" - -// {{{ Internal interfaces -// {{{ Signals -static gboolean window_delete_event_cb (GtkWidget *widget, - GdkEvent *event, - SettingsDialog *dialog); -static void ok_button_clicked_cb (GtkButton *widget, SettingsDialog *dialog); -static void cancel_button_clicked_cb (GtkButton *widget, SettingsDialog *dialog); -// }}} - -@interface SettingsDialog (Private) -- (void) loadUi; -- (void) save; -- (void) revert; -@end - -// }}} -// {{{ API - -@implementation SettingsDialog - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithConfiguration:(Configuration*)c andStyleManager:(StyleManager*)m { - self = [super init]; - - if (self) { - configuration = [c retain]; - styleManager = [m retain]; - tempStyleManager = [m copy]; - } - - return self; -} - -- (void) dealloc { - if (window) { - gtk_widget_destroy (GTK_WIDGET (window)); - } - if (parentWindow) { - g_object_unref (parentWindow); - } - - [configuration release]; - [tempStyleManager release]; - [styleManager release]; - [nodePalette release]; - [edgePalette release]; - - [super dealloc]; -} - -- (Configuration*) configuration { - return configuration; -} - -- (void) setConfiguration:(Configuration*)c { - [c retain]; - [configuration release]; - configuration = c; - [self revert]; -} - -- (StyleManager*) styleManager { - return styleManager; -} - -- (void) setStyleManager:(StyleManager*)m { - [m retain]; - [styleManager release]; - styleManager = m; -} - -- (GtkWindow*) parentWindow { - return parentWindow; -} - -- (void) setParentWindow:(GtkWindow*)parent { - GtkWindow *oldParent = parentWindow; - - if (parent) - g_object_ref (parent); - parentWindow = parent; - if (oldParent) - g_object_unref (oldParent); - - if (window) { - gtk_window_set_transient_for (window, parentWindow); - } -} - -- (void) present { - [self loadUi]; - [self revert]; - gtk_window_present (GTK_WINDOW (window)); -} - -- (void) show { - [self loadUi]; - [self revert]; - gtk_widget_show (GTK_WIDGET (window)); -} - -- (void) hide { - if (!window) { - return; - } - gtk_widget_hide (GTK_WIDGET (window)); -} - -- (BOOL) isVisible { - if (!window) { - return NO; - } - gboolean visible; - g_object_get (G_OBJECT (window), "visible", &visible, NULL); - return visible ? YES : NO; -} - -- (void) setVisible:(BOOL)visible { - if (visible) { - [self show]; - } else { - [self hide]; - } -} - -@end - -// }}} -// {{{ Private - -@implementation SettingsDialog (Private) -- (void) loadUi { - if (window) { - return; - } - - nodePalette = [[NodeStylesPalette alloc] initWithManager:tempStyleManager]; - edgePalette = [[EdgeStylesPalette alloc] initWithManager:tempStyleManager]; - - window = GTK_WINDOW (gtk_window_new (GTK_WINDOW_TOPLEVEL)); - gtk_window_set_default_size (window, 570, -1); - gtk_window_set_title (window, "TikZiT Configuration"); - gtk_window_set_modal (window, TRUE); - gtk_window_set_position (window, GTK_WIN_POS_CENTER_ON_PARENT); - gtk_window_set_type_hint (window, GDK_WINDOW_TYPE_HINT_DIALOG); - if (parentWindow) { - gtk_window_set_transient_for (window, parentWindow); - } - g_signal_connect (window, - "delete-event", - G_CALLBACK (window_delete_event_cb), - self); - - GtkWidget *mainBox = gtk_vbox_new (FALSE, 18); - gtk_container_set_border_width (GTK_CONTAINER (mainBox), 12); - gtk_container_add (GTK_CONTAINER (window), mainBox); - gtk_widget_show (mainBox); - -#ifdef HAVE_POPPLER - /* - * Path for pdflatex - */ - - GtkWidget *pdflatexFrame = gtk_frame_new ("Previews"); - gtk_box_pack_start (GTK_BOX (mainBox), pdflatexFrame, TRUE, TRUE, 0); - - GtkBox *pdflatexBox = GTK_BOX (gtk_hbox_new (FALSE, 6)); - gtk_container_add (GTK_CONTAINER (pdflatexFrame), GTK_WIDGET (pdflatexBox)); - gtk_container_set_border_width (GTK_CONTAINER (pdflatexBox), 6); - - GtkWidget *pdflatexLabel = gtk_label_new ("Path to pdflatex:"); - gtk_misc_set_alignment (GTK_MISC (pdflatexLabel), 0, 0.5); - gtk_box_pack_start (pdflatexBox, - pdflatexLabel, - FALSE, TRUE, 0); - - pdflatexPathEntry = GTK_ENTRY (gtk_entry_new ()); - gtk_box_pack_start (pdflatexBox, - GTK_WIDGET (pdflatexPathEntry), - TRUE, TRUE, 0); - - gtk_widget_show_all (pdflatexFrame); -#else - pdflatexPathEntry = NULL; -#endif - - /* - * Node styles - */ - GtkWidget *nodeStylesFrame = gtk_frame_new ("Node Styles"); - gtk_widget_show (nodeStylesFrame); - gtk_box_pack_start (GTK_BOX (mainBox), nodeStylesFrame, TRUE, TRUE, 0); - gtk_container_add (GTK_CONTAINER (nodeStylesFrame), - GTK_WIDGET ([nodePalette widget])); - gtk_widget_show ([nodePalette widget]); - - - /* - * Edge styles - */ - GtkWidget *edgeStylesFrame = gtk_frame_new ("Edge Styles"); - gtk_widget_show (edgeStylesFrame); - gtk_box_pack_start (GTK_BOX (mainBox), edgeStylesFrame, TRUE, TRUE, 0); - gtk_container_add (GTK_CONTAINER (edgeStylesFrame), - GTK_WIDGET ([edgePalette widget])); - gtk_widget_show ([edgePalette widget]); - - - /* - * Bottom buttons - */ - - GtkContainer *buttonBox = GTK_CONTAINER (gtk_hbutton_box_new ()); - gtk_box_set_spacing (GTK_BOX (buttonBox), 6); - gtk_button_box_set_layout (GTK_BUTTON_BOX (buttonBox), GTK_BUTTONBOX_END); - gtk_box_pack_start (GTK_BOX (mainBox), - GTK_WIDGET (buttonBox), - FALSE, TRUE, 0); - - GtkWidget *okButton = gtk_button_new_from_stock (GTK_STOCK_OK); - gtk_container_add (buttonBox, okButton); - g_signal_connect (okButton, - "clicked", - G_CALLBACK (ok_button_clicked_cb), - self); - - GtkWidget *cancelButton = gtk_button_new_from_stock (GTK_STOCK_CANCEL); - gtk_container_add (buttonBox, cancelButton); - g_signal_connect (cancelButton, - "clicked", - G_CALLBACK (cancel_button_clicked_cb), - self); - - gtk_widget_show_all (GTK_WIDGET (buttonBox)); - - [self revert]; -} - -- (void) save { - if (!window) - return; - -#ifdef HAVE_POPPLER - const gchar *path = gtk_entry_get_text (pdflatexPathEntry); - if (path && *path) { - [configuration setStringEntry:@"pdflatex" - inGroup:@"Previews" - value:[NSString stringWithUTF8String:path]]; - } -#endif - - [styleManager updateFromManager:tempStyleManager]; - - [app saveConfiguration]; -} - -- (void) revert { - if (!window) - return; - -#ifdef HAVE_POPPLER - NSString *path = [configuration stringEntry:@"pdflatex" - inGroup:@"Previews" - withDefault:@"pdflatex"]; - gtk_entry_set_text (pdflatexPathEntry, [path UTF8String]); -#endif - - [tempStyleManager updateFromManager:styleManager]; -} -@end - -// }}} -// {{{ GTK+ callbacks - -static gboolean window_delete_event_cb (GtkWidget *widget, - GdkEvent *event, - SettingsDialog *dialog) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [dialog hide]; - [pool drain]; - return TRUE; // we dealt with this event -} - -static void ok_button_clicked_cb (GtkButton *widget, SettingsDialog *dialog) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [dialog save]; - [dialog hide]; - [pool drain]; -} - -static void cancel_button_clicked_cb (GtkButton *widget, SettingsDialog *dialog) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [dialog hide]; - [pool drain]; -} - -// }}} - -// vim:ft=objc:ts=4:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit/src/gtk/Shape+Render.h b/tikzit/src/gtk/Shape+Render.h deleted file mode 100644 index a744c77..0000000 --- a/tikzit/src/gtk/Shape+Render.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "Shape.h" -#import "RenderContext.h" -#import "Surface.h" - -@interface Shape (Render) - -- (void) drawPathWithTransform:(Transformer*)transform andContext:(id)context; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/Shape+Render.m b/tikzit/src/gtk/Shape+Render.m deleted file mode 100644 index 924bb24..0000000 --- a/tikzit/src/gtk/Shape+Render.m +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "Shape+Render.h" - -#import "Edge.h" - -// we use cairo for finding the bounding box etc. -#import - -@implementation Shape (Render) - -- (void) drawPathWithTransform:(Transformer*)transform andContext:(id)context { - [context startPath]; - - for (NSArray *arr in [self paths]) { - BOOL fst = YES; - NSPoint p, cp1, cp2; - - for (Edge *e in arr) { - if (fst) { - fst = NO; - p = [transform toScreen:[[e source] point]]; - [context moveTo:p]; - } - - p = [transform toScreen:[[e target] point]]; - if ([e isStraight]) { - [context lineTo:p]; - } else { - cp1 = [transform toScreen:[e cp1]]; - cp2 = [transform toScreen:[e cp2]]; - [context curveTo:p withCp1:cp1 andCp2:cp2]; - } - } - - [context closeSubPath]; - } -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/StyleManager+Storage.h b/tikzit/src/gtk/StyleManager+Storage.h deleted file mode 100644 index 1727786..0000000 --- a/tikzit/src/gtk/StyleManager+Storage.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "StyleManager.h" - -@interface StyleManager (Storage) -- (void) loadStylesUsingConfigurationName:(NSString*)name; -- (void) saveStylesUsingConfigurationName:(NSString*)name; -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/StyleManager+Storage.m b/tikzit/src/gtk/StyleManager+Storage.m deleted file mode 100644 index f4c8232..0000000 --- a/tikzit/src/gtk/StyleManager+Storage.m +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "StyleManager+Storage.h" -#import "Configuration.h" -#import "NodeStyle+Storage.h" -#import "EdgeStyle+Storage.h" - -static NSString *nodeStyleGroupPrefix = @"Style "; -static NSString *edgeStyleGroupPrefix = @"EdgeStyle "; - -@implementation StyleManager (Storage) - -- (void) loadStylesUsingConfigurationName:(NSString*)name { - if (![Configuration configurationExistsWithName:name]) { - NSLog(@"No styles config found"); - return; - } - NSError *error = nil; - Configuration *stylesConfig = [Configuration configurationWithName:name loadError:&error]; - if (error != nil) { - logError (error, @"Could not load styles configuration"); - // stick with the default config - return; - } - NSArray *groups = [stylesConfig groups]; - NSMutableArray *ns = [NSMutableArray arrayWithCapacity:[groups count]]; - NSMutableArray *es = [NSMutableArray arrayWithCapacity:[groups count]]; - - for (NSString *groupName in groups) { - if ([groupName hasPrefix:nodeStyleGroupPrefix]) { - NodeStyle *style = [[NodeStyle alloc] initFromConfigurationGroup:groupName config:stylesConfig]; - [ns addObject:style]; - } else if ([groupName hasPrefix:edgeStyleGroupPrefix]) { - EdgeStyle *style = [[EdgeStyle alloc] initFromConfigurationGroup:groupName config:stylesConfig]; - [es addObject:style]; - } - } - - [self _setNodeStyles:ns]; - [self _setEdgeStyles:es]; -} - -- (void) saveStylesUsingConfigurationName:(NSString*)name { - NSError *error = nil; - Configuration *stylesConfig = [Configuration emptyConfigurationWithName:name]; - NSArray *ns = [self nodeStyles]; - NSArray *es = [self edgeStyles]; - NSUInteger length = [ns count]; - for (int i = 0; i < length; ++i) { - NodeStyle *style = [ns objectAtIndex:i]; - NSString *groupName = [NSString stringWithFormat:@"%@%d", nodeStyleGroupPrefix, i]; - [style storeToConfigurationGroup:groupName config:stylesConfig]; - } - length = [es count]; - for (int i = 0; i < length; ++i) { - EdgeStyle *style = [es objectAtIndex:i]; - NSString *groupName = [NSString stringWithFormat:@"%@%d", edgeStyleGroupPrefix, i]; - [style storeToConfigurationGroup:groupName config:stylesConfig]; - } - if (![stylesConfig writeToStoreWithError:&error]) { - logError (error, @"Could not write styles configuration"); - } -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/Surface.h b/tikzit/src/gtk/Surface.h deleted file mode 100644 index db4288e..0000000 --- a/tikzit/src/gtk/Surface.h +++ /dev/null @@ -1,107 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "RenderContext.h" -#import "Transformer.h" - -typedef enum { - NormalCursor, - ResizeRightCursor, - ResizeBottomRightCursor, - ResizeBottomCursor, - ResizeBottomLeftCursor, - ResizeLeftCursor, - ResizeTopLeftCursor, - ResizeTopCursor, - ResizeTopRightCursor -} Cursor; - -@protocol Surface; - -@protocol RenderDelegate -- (void) renderWithContext:(id)context onSurface:(id)surface; -@end - -/** - * Represents a surface that can be rendered to - * - * This protocol should be implemented by drawing surfaces. It - * provides geometry information and methods to invalidate - * regions of the surface, triggering a redraw. - * - * The surface should send a "SurfaceSizeChanged" notification - * when the width or height changes. - */ -@protocol Surface - -/** - * The width of the surface, in surface units - * - * The surface should send a "SurfaceSizeChanged" notification - * when this property changes. - */ -@property (readonly) int width; -/** - * The height of the surface, in surface units - * - * The surface should send a "SurfaceSizeChanged" notification - * when this property changes. - */ -@property (readonly) int height; -/** - * The transformer that converts between graph units and surface units - */ -@property (readonly) Transformer *transformer; -/** - * The render delegate. - * - * This will be used to redraw (parts of) the surface when necessary. - */ -@property (assign) id renderDelegate; - -/** - * Create a render context for the surface. - */ -- (id) createRenderContext; -/** - * Invalidate a portion of the surface. - * - * This will request that part of the surface be redrawn. - */ -- (void) invalidateRect:(NSRect)rect; -/** - * Invalidate the whole surface. - * - * This will request that the whole surface be redrawn. - */ -- (void) invalidate; - -- (void) zoomIn; -- (void) zoomOut; -- (void) zoomReset; -- (void) zoomInAboutPoint:(NSPoint)p; -- (void) zoomOutAboutPoint:(NSPoint)p; -- (void) zoomResetAboutPoint:(NSPoint)p; - -- (void) setCursor:(Cursor)c; - -- (BOOL) hasFocus; -- (void) renderFocus; -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/TZFoundation.h b/tikzit/src/gtk/TZFoundation.h deleted file mode 100644 index 2ff20ca..0000000 --- a/tikzit/src/gtk/TZFoundation.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import -#import - -#import "NSError+Glib.h" -#import "NSError+Tikzit.h" -#import "NSFileManager+Glib.h" -#import "NSFileManager+Utils.h" -#import "NSString+Glib.h" -#import "NSString+LatexConstants.h" -#import "NSString+Tikz.h" -#import "NSString+Util.h" - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/TikzDocument.h b/tikzit/src/gtk/TikzDocument.h deleted file mode 100644 index 5d15d13..0000000 --- a/tikzit/src/gtk/TikzDocument.h +++ /dev/null @@ -1,149 +0,0 @@ -// -// TikzDocument.h -// TikZiT -// -// Copyright 2010 Chris Heunen -// Copyright 2010 Alex Merry -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "TZFoundation.h" -#import -#import "PickSupport.h" -#import "StyleManager.h" - -@interface TikzDocument : NSObject { - StyleManager *styleManager; - Graph *graph; - PickSupport *pickSupport; - NSUndoManager *undoManager; - NSString *tikz; - NSString *path; - NSSet *nodesetBeingModified; - NSMapTable *nodesetBeingModifiedOldCopy; - NSSet *edgesetBeingModified; - NSMapTable *edgesetBeingModifiedOldCopy; - NSPoint currentNodeShift; - Node *nodeBeingModified; - Node *nodeBeingModifiedOldCopy; - Edge *edgeBeingModified; - Edge *edgeBeingModifiedOldCopy; - NSRect oldGraphBounds; - GraphElementData *oldGraphData; - BOOL hasChanges; -} - -+ (TikzDocument*) documentWithStyleManager:(StyleManager*)manager; -+ (TikzDocument*) documentWithGraph:(Graph*)g styleManager:(StyleManager*)manager; -+ (TikzDocument*) documentWithTikz:(NSString*)t styleManager:(StyleManager*)manager error:(NSError**)error; -+ (TikzDocument*) documentFromFile:(NSString*)path styleManager:(StyleManager*)manager error:(NSError**)error; - -- (id) initWithStyleManager:(StyleManager*)manager; -- (id) initWithGraph:(Graph*)g styleManager:(StyleManager*)manager; -- (id) initWithTikz:(NSString*)t styleManager:(StyleManager*)manager error:(NSError**)error; -- (id) initFromFile:(NSString*)path styleManager:(StyleManager*)manager error:(NSError**)error; - -@property (readonly) Graph *graph; -@property (readonly) PickSupport *pickSupport; -@property (readonly) NSString *path; -@property (readonly) NSString *name; -@property (readonly) NSString *suggestedFileName; -@property (readonly) BOOL hasUnsavedChanges; -@property (retain) StyleManager *styleManager; -@property (readonly) NSString *tikz; -@property (readonly) BOOL canUndo; -@property (readonly) BOOL canRedo; -@property (readonly) NSString *undoName; -@property (readonly) NSString *redoName; - -- (BOOL) updateTikz:(NSString*)t error:(NSError**)error; - -- (Graph*) selectionCut; -- (Graph*) selectionCopy; -- (void) paste:(Graph*)graph; -- (void) pasteFromTikz:(NSString*)tikz; - -// some convenience methods: -- (BOOL) isNodeSelected:(Node*)node; -- (BOOL) isEdgeSelected:(Edge*)edge; -- (NSEnumerator*) nodeEnumerator; -- (NSEnumerator*) edgeEnumerator; - -- (void) undo; -- (void) redo; - -- (void) startUndoGroup; -- (void) nameAndEndUndoGroup:(NSString*)nm; -- (void) endUndoGroup; - -- (void) startModifyNode:(Node*)node; -- (void) modifyNodeCheckPoint; -- (void) endModifyNode; -- (void) cancelModifyNode; - -- (void) startModifyNodes:(NSSet*)nodes; -- (void) modifyNodesCheckPoint; -- (void) endModifyNodes; -- (void) cancelModifyNodes; - -- (void) startShiftNodes:(NSSet*)nodes; -- (void) shiftNodesUpdate:(NSPoint)shiftChange; -- (void) endShiftNodes; -- (void) cancelShiftNodes; - -- (void) startModifyEdge:(Edge*)edge; -- (void) modifyEdgeCheckPoint; -- (void) endModifyEdge; -- (void) cancelModifyEdge; - -- (void) startModifyEdges:(NSSet*)edges; -- (void) modifyEdgesCheckPoint; -- (void) endModifyEdges; -- (void) cancelModifyEdges; - -- (void) startChangeBoundingBox; -- (void) changeBoundingBoxCheckPoint; -- (void) endChangeBoundingBox; -- (void) cancelChangeBoundingBox; - -- (void) startChangeGraphProperties; -- (void) changeGraphPropertiesCheckPoint; -- (void) endChangeGraphProperties; -- (void) cancelChangeGraphProperties; - -- (void) removeSelected; -- (void) addNode:(Node*)node; -- (void) removeNode:(Node*)node; -- (void) addEdge:(Edge*)edge; -- (void) removeEdge:(Edge*)edge; -- (void) shiftSelectedNodesByPoint:(NSPoint)offset; -- (void) insertGraph:(Graph*)g; -- (void) flipSelectedNodesHorizontally; -- (void) flipSelectedNodesVertically; -- (void) reverseSelectedEdges; -- (void) bringSelectionForward; -- (void) bringSelectionToFront; -- (void) sendSelectionBackward; -- (void) sendSelectionToBack; - -- (BOOL) saveCopyToPath: (NSString*)path error: (NSError**)error; -- (BOOL) saveToPath: (NSString*)path error: (NSError**)error; -- (BOOL) save: (NSError**)error; - -@end - -// vim:ft=objc:sts=4:sw=4:et diff --git a/tikzit/src/gtk/TikzDocument.m b/tikzit/src/gtk/TikzDocument.m deleted file mode 100644 index bff5a2e..0000000 --- a/tikzit/src/gtk/TikzDocument.m +++ /dev/null @@ -1,911 +0,0 @@ -// -// TikzDocument.h -// TikZiT -// -// Copyright 2010 Chris Heunen -// Copyright 2010 Alex Merry -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "TikzDocument.h" - -@interface TikzDocument (Private) -- (void) styleRenamed:(NSNotification*)n; - -- (void) setPath:(NSString*)path; -- (void) setGraph:(Graph*)g; - -- (void) registerUndoForChange:(GraphChange*)change; -- (void) registerUndoGroupForChange:(GraphChange*)change withName:(NSString*)name; -- (void) undoGraphChange:(GraphChange*)change; -- (void) completedGraphChange:(GraphChange*)change withName:(NSString*)name; -- (void) attachStylesToGraph:(Graph*)g; - -- (void) regenerateTikz; -@end - -@implementation TikzDocument - -+ (TikzDocument*) documentWithStyleManager:(StyleManager*)manager -{ - return [[[TikzDocument alloc] initWithStyleManager:manager] autorelease]; -} - -+ (TikzDocument*) documentWithGraph:(Graph*)g - styleManager:(StyleManager*)manager -{ - return [[[TikzDocument alloc] initWithGraph:g - styleManager:manager] autorelease]; -} - -+ (TikzDocument*) documentWithTikz:(NSString*)t - styleManager:(StyleManager*)manager - error:(NSError**)error -{ - return [[[TikzDocument alloc] initWithTikz:t - styleManager:manager - error:error] autorelease]; -} - -+ (TikzDocument*) documentFromFile:(NSString*)pth - styleManager:(StyleManager*)manager - error:(NSError**)error -{ - return [[[TikzDocument alloc] initFromFile:pth - styleManager:manager - error:error] autorelease]; -} - - -- (id) initWithStyleManager:(StyleManager*)manager { - self = [self initWithGraph:[Graph graph] styleManager:manager]; - return self; -} - -- (id) initWithGraph:(Graph*)g styleManager:(StyleManager*)manager { - self = [super init]; - - if (self) { - graph = nil; - styleManager = [manager retain]; - pickSupport = [[PickSupport alloc] init]; - undoManager = [[NSUndoManager alloc] init]; - [undoManager setGroupsByEvent:NO]; - tikz = nil; - path = nil; - nodesetBeingModified = nil; - nodesetBeingModifiedOldCopy = nil; - nodeBeingModified = nil; - nodeBeingModifiedOldCopy = nil; - edgeBeingModified = nil; - edgeBeingModifiedOldCopy = nil; - - [undoManager disableUndoRegistration]; - [self setGraph:g]; - [undoManager enableUndoRegistration]; - - hasChanges = NO; - - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(styleRenamed:) - name:@"NodeStyleRenamed" - object:styleManager]; - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(styleRenamed:) - name:@"EdgeStyleRenamed" - object:styleManager]; - } - - return self; -} - -- (id) initWithTikz:(NSString*)t - styleManager:(StyleManager*)manager - error:(NSError**)error -{ - self = [self initWithStyleManager:manager]; - - if (self) { - [undoManager disableUndoRegistration]; - BOOL success = [self updateTikz:t error:error]; - if (!success) { - [self release]; - return nil; - } - [undoManager enableUndoRegistration]; - hasChanges = NO; - } - - return self; -} - -- (id) initFromFile:(NSString*)pth - styleManager:(StyleManager*)manager - error:(NSError**)error -{ - NSString *t = [NSString stringWithContentsOfFile:pth error:error]; - if (t == nil) { - [self release]; - return nil; - } - - self = [self initWithTikz:t styleManager:manager error:error]; - - if (self) { - [self setPath:pth]; - } - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - [styleManager release]; - [graph release]; - [pickSupport release]; - [undoManager release]; - [tikz release]; - [path release]; - [nodesetBeingModified release]; - [nodesetBeingModifiedOldCopy release]; - [nodeBeingModified release]; - [nodeBeingModifiedOldCopy release]; - [edgeBeingModified release]; - [edgeBeingModifiedOldCopy release]; - [oldGraphData release]; - [super dealloc]; -} - -@synthesize graph, pickSupport, path; - -- (NSString*) name { - if (path) { - return [[NSFileManager defaultManager] displayNameAtPath: path]; - } else { - return @"Untitled"; - } -} - -- (NSString*) suggestedFileName { - if (path) { - return [path lastPathComponent]; - } else { - return @"untitled.tikz"; - } -} - -- (BOOL) hasUnsavedChanges { - return hasChanges; -} - -- (StyleManager*) styleManager { - return styleManager; -} - -- (void) setStyleManager:(StyleManager*)manager { - StyleManager *oldManager = styleManager; - [[NSNotificationCenter defaultCenter] - removeObserver:self - name:nil - object:oldManager]; - - styleManager = [manager retain]; - - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(styleRenamed:) - name:@"NodeStyleRenamed" - object:styleManager]; - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(styleRenamed:) - name:@"EdgeStyleRenamed" - object:styleManager]; - - [self attachStylesToGraph:graph]; - [oldManager release]; -} - -- (void) postGraphReplaced { - [[NSNotificationCenter defaultCenter] postNotificationName:@"GraphReplaced" object:self]; -} - -- (void) postGraphChange:(GraphChange*)change { - NSDictionary *info = [NSDictionary dictionaryWithObject:change forKey:@"change"]; - [[NSNotificationCenter defaultCenter] postNotificationName:@"GraphChanged" object:self userInfo:info]; -} - -- (void) postIncompleteGraphChange:(GraphChange*)change { - NSDictionary *info = [NSDictionary dictionaryWithObject:change forKey:@"change"]; - [[NSNotificationCenter defaultCenter] postNotificationName:@"GraphBeingChanged" object:self userInfo:info]; -} - -- (void) postCancelledGraphChange:(GraphChange*)change { - NSDictionary *info = [NSDictionary dictionaryWithObject:change forKey:@"change"]; - [[NSNotificationCenter defaultCenter] postNotificationName:@"GraphChangeCancelled" object:self userInfo:info]; -} - -- (void) postTikzChanged { - [[NSNotificationCenter defaultCenter] postNotificationName:@"TikzChanged" object:self]; -} - -- (void) postUndoStackChanged { - [[NSNotificationCenter defaultCenter] postNotificationName:@"UndoStackChanged" object:self]; -} - -- (NSString*) tikz { - return tikz; -} - -- (BOOL) updateTikz:(NSString*)t error:(NSError**)error { - if (t == nil) { - t = [NSString string]; - } - if (t == tikz || [t isEqual:tikz]) { - return YES; - } - - Graph *g = [Graph graphFromTikz:t error:error]; - if (g) { - // updateTikz actually generates a graph from the tikz, - // and generates the final tikz from that - [self startUndoGroup]; - [self setGraph:g]; - [self nameAndEndUndoGroup:@"Update tikz"]; - return YES; - } - - return NO; -} - -- (Graph*) selectionCut { - Graph *selection = [self selectionCopy]; - [self startUndoGroup]; - [self removeSelected]; - [self nameAndEndUndoGroup:@"Cut"]; - return selection; -} - -- (Graph*) selectionCopy { - return [[graph copyOfSubgraphWithNodes:[pickSupport selectedNodes]] autorelease]; -} - -- (void) paste:(Graph*)g { - if (g == nil || [[g nodes] count] == 0) { - // nothing to paste - return; - } - - // place to the right of the existing graph - NSRect bounds = [graph bounds]; - NSRect gBounds = [g bounds]; - float dx = NSMaxX (bounds) - gBounds.origin.x + 0.5f; - [g shiftNodes:[g nodes] byPoint:NSMakePoint (dx, 0)]; - - GraphChange *change = [graph insertGraph:g]; - [self completedGraphChange:change withName:@"Paste"]; - - // select everything from the clipboard - [pickSupport deselectAllEdges]; - [pickSupport selectAllNodes:[NSSet setWithArray:[g nodes]] replacingSelection:YES]; -} - -- (void) pasteFromTikz:(NSString*)t { - Graph *clipboard = [Graph graphFromTikz:t]; - if (clipboard) { - [self attachStylesToGraph:clipboard]; - [self paste:clipboard]; - } -} - -- (BOOL) isNodeSelected:(Node*)node { - return [pickSupport isNodeSelected:node]; -} - -- (BOOL) isEdgeSelected:(Edge*)edge { - return [pickSupport isEdgeSelected:edge]; -} - -- (NSEnumerator*) nodeEnumerator { - return [[graph nodes] objectEnumerator]; -} - -- (NSEnumerator*) edgeEnumerator { - return [[graph edges] objectEnumerator]; -} - -- (BOOL) canUndo { - return [undoManager canUndo]; -} - -- (void) undo { - [undoManager undo]; - [self postUndoStackChanged]; -} - -- (BOOL) canRedo { - return [undoManager canRedo]; -} - -- (void) redo { - [undoManager redo]; - [self postUndoStackChanged]; -} - -- (NSString*) undoName { - return [undoManager undoActionName]; -} - -- (NSString*) redoName { - return [undoManager redoActionName]; -} - -- (void) startUndoGroup { - [undoManager beginUndoGrouping]; -} - -- (void) nameAndEndUndoGroup:(NSString*)nm { - [undoManager setActionName:nm]; - [undoManager endUndoGrouping]; - [self postUndoStackChanged]; -} - -- (void) endUndoGroup { - [undoManager endUndoGrouping]; - [self postUndoStackChanged]; -} - -- (void) startModifyNode:(Node*)node { - if (nodeBeingModified != nil) { - [NSException raise:@"NSInternalInconsistencyException" format:@"Already modifying a node"]; - } - nodeBeingModified = [node retain]; - nodeBeingModifiedOldCopy = [node copy]; -} - -- (void) modifyNodeCheckPoint { - [self regenerateTikz]; - GraphChange *change = [GraphChange propertyChangeOfNode:nodeBeingModified - fromOld:nodeBeingModifiedOldCopy - toNew:[[nodeBeingModified copy] autorelease]]; - [self postIncompleteGraphChange:change]; -} - -- (void) _finishModifySequence:(GraphChange*)change withName:(NSString*)chName cancelled:(BOOL)cancelled { - if (cancelled) { - change = [change invert]; - [graph applyGraphChange:change]; - [self regenerateTikz]; - [self postCancelledGraphChange:change]; - } else { - [self registerUndoGroupForChange:change withName:chName]; - [self regenerateTikz]; - [self postGraphChange:change]; - } -} - -- (void) _finishModifyNodeCancelled:(BOOL)cancelled { - if (nodeBeingModified == nil) { - [NSException raise:@"NSInternalInconsistencyException" format:@"Not modifying a node"]; - } - - GraphChange *change = [GraphChange propertyChangeOfNode:nodeBeingModified - fromOld:nodeBeingModifiedOldCopy - toNew:[[nodeBeingModified copy] autorelease]]; - [self _finishModifySequence:change withName:@"Modify node" cancelled:cancelled]; - - [nodeBeingModified release]; - nodeBeingModified = nil; - [nodeBeingModifiedOldCopy release]; - nodeBeingModifiedOldCopy = nil; -} - -- (void) endModifyNode { [self _finishModifyNodeCancelled:NO]; } -- (void) cancelModifyNode { [self _finishModifyNodeCancelled:YES]; } - -- (void) startModifyNodes:(NSSet*)nodes { - if (nodesetBeingModified != nil) { - [NSException raise:@"NSInternalInconsistencyException" format:@"Already modifying a node set"]; - } - - nodesetBeingModified = [nodes copy]; - nodesetBeingModifiedOldCopy = [[Graph nodeTableForNodes:nodes] retain]; -} - -- (void) modifyNodesCheckPoint { - [self regenerateTikz]; - GraphChange *change = [GraphChange propertyChangeOfNodesFromOldCopies:nodesetBeingModifiedOldCopy - toNewCopies:[Graph nodeTableForNodes:nodesetBeingModified]]; - [self postIncompleteGraphChange:change]; -} - -- (void) _finishModifyNodes:(BOOL)cancelled { - if (nodesetBeingModified == nil) { - [NSException raise:@"NSInternalInconsistencyException" format:@"Not modifying a node set"]; - } - - GraphChange *change = [GraphChange propertyChangeOfNodesFromOldCopies:nodesetBeingModifiedOldCopy - toNewCopies:[Graph nodeTableForNodes:nodesetBeingModified]]; - [self _finishModifySequence:change withName:@"Modify nodes" cancelled:cancelled]; - - [nodesetBeingModified release]; - nodesetBeingModified = nil; - [nodesetBeingModifiedOldCopy release]; - nodesetBeingModifiedOldCopy = nil; -} - -- (void) endModifyNodes { [self _finishModifyNodes:NO]; } -- (void) cancelModifyNodes { [self _finishModifyNodes:YES]; } - -- (void) startShiftNodes:(NSSet*)nodes { - if (nodesetBeingModified != nil) { - [NSException raise:@"NSInternalInconsistencyException" format:@"Already modifying a node set"]; - } - - nodesetBeingModified = [nodes copy]; - currentNodeShift = NSZeroPoint; -} - -- (void) shiftNodesUpdate:(NSPoint)currentShift { - if (nodesetBeingModified == nil) { - [NSException raise:@"NSInternalInconsistencyException" format:@"Not modifying a node set"]; - } - - currentNodeShift = currentShift; - [self regenerateTikz]; - GraphChange *change = [GraphChange shiftNodes:nodesetBeingModified - byPoint:currentNodeShift]; - [self postIncompleteGraphChange:change]; -} - -- (void) _finishShiftNodesCancelled:(BOOL)cancelled { - if (nodesetBeingModified == nil) { - [NSException raise:@"NSInternalInconsistencyException" format:@"Not modifying a node set"]; - } - - if (!NSEqualPoints (currentNodeShift, NSZeroPoint)) { - GraphChange *change = [GraphChange shiftNodes:nodesetBeingModified - byPoint:currentNodeShift]; - [self _finishModifySequence:change withName:@"Move nodes" cancelled:cancelled]; - } - - [nodesetBeingModified release]; - nodesetBeingModified = nil; -} - -- (void) endShiftNodes { [self _finishShiftNodesCancelled:NO]; } -- (void) cancelShiftNodes { [self _finishShiftNodesCancelled:YES]; } - -- (void) startModifyEdge:(Edge*)edge { - if (edgeBeingModified != nil) { - [NSException raise:@"NSInternalInconsistencyException" format:@"Already modifying an edge"]; - } - edgeBeingModified = [edge retain]; - edgeBeingModifiedOldCopy = [edge copy]; -} - -- (void) modifyEdgeCheckPoint { - [self regenerateTikz]; - GraphChange *change = [GraphChange propertyChangeOfEdge:edgeBeingModified - fromOld:edgeBeingModifiedOldCopy - toNew:[[edgeBeingModified copy] autorelease]]; - [self postIncompleteGraphChange:change]; -} - -- (void) _finishModifyEdgeCancelled:(BOOL)cancelled { - if (edgeBeingModified == nil) { - [NSException raise:@"NSInternalInconsistencyException" format:@"Not modifying an edge"]; - } - - GraphChange *change = [GraphChange propertyChangeOfEdge:edgeBeingModified - fromOld:edgeBeingModifiedOldCopy - toNew:[[edgeBeingModified copy] autorelease]]; - [self _finishModifySequence:change withName:@"Modify edge" cancelled:cancelled]; - - [edgeBeingModified release]; - edgeBeingModified = nil; - [edgeBeingModifiedOldCopy release]; - edgeBeingModifiedOldCopy = nil; -} - -- (void) endModifyEdge { [self _finishModifyEdgeCancelled:NO]; } -- (void) cancelModifyEdge { [self _finishModifyEdgeCancelled:YES]; } - -- (void) startModifyEdges:(NSSet*)edges { - if (edgesetBeingModified != nil) { - [NSException raise:@"NSInternalInconsistencyException" format:@"Already modifying an edge set"]; - } - - edgesetBeingModified = [edges copy]; - edgesetBeingModifiedOldCopy = [[Graph edgeTableForEdges:edges] retain]; -} - -- (void) modifyEdgesCheckPoint { - [self regenerateTikz]; - GraphChange *change = [GraphChange propertyChangeOfEdgesFromOldCopies:edgesetBeingModifiedOldCopy - toNewCopies:[Graph edgeTableForEdges:edgesetBeingModified]]; - [self postIncompleteGraphChange:change]; -} - -- (void) _finishModifyEdgesCancelled:(BOOL)cancelled { - if (edgesetBeingModified == nil) { - [NSException raise:@"NSInternalInconsistencyException" format:@"Not modifying an edge"]; - } - - GraphChange *change = [GraphChange propertyChangeOfEdgesFromOldCopies:edgesetBeingModifiedOldCopy - toNewCopies:[Graph edgeTableForEdges:edgesetBeingModified]]; - [self _finishModifySequence:change withName:@"Modify edges" cancelled:cancelled]; - - [edgesetBeingModified release]; - edgesetBeingModified = nil; - [edgesetBeingModifiedOldCopy release]; - edgesetBeingModifiedOldCopy = nil; -} - -- (void) endModifyEdges { [self _finishModifyEdgesCancelled:NO]; } -- (void) cancelModifyEdges { [self _finishModifyEdgesCancelled:YES]; } - -- (void) startChangeBoundingBox { - oldGraphBounds = [graph boundingBox]; -} - -- (void) changeBoundingBoxCheckPoint { - [self regenerateTikz]; - GraphChange *change = [GraphChange changeBoundingBoxFrom:oldGraphBounds - to:[graph boundingBox]]; - [self postIncompleteGraphChange:change]; -} - -- (void) _finishChangeBoundingBoxCancelled:(BOOL)cancelled { - GraphChange *change = [GraphChange changeBoundingBoxFrom:oldGraphBounds - to:[graph boundingBox]]; - [self _finishModifySequence:change withName:@"Set bounding box" cancelled:cancelled]; -} -- (void) endChangeBoundingBox { [self _finishChangeBoundingBoxCancelled:NO]; } -- (void) cancelChangeBoundingBox { [self _finishChangeBoundingBoxCancelled:YES]; } - -- (void) startChangeGraphProperties { - oldGraphData = [[graph data] copy]; -} - -- (void) changeGraphPropertiesCheckPoint { - [self regenerateTikz]; - GraphChange *change = [GraphChange propertyChangeOfGraphFrom:oldGraphData - to:[graph data]]; - [self postIncompleteGraphChange:change]; -} - -- (void) _finishChangeGraphPropertiesCancelled:(BOOL)cancelled { - GraphChange *change = [GraphChange propertyChangeOfGraphFrom:oldGraphData - to:[graph data]]; - [self _finishModifySequence:change withName:@"Change graph properties" cancelled:cancelled]; - [oldGraphData release]; - oldGraphData = nil; -} -- (void) endChangeGraphProperties { [self _finishChangeGraphPropertiesCancelled:NO]; } -- (void) cancelChangeGraphProperties { [self _finishChangeGraphPropertiesCancelled:YES]; } - -- (void) removeSelected { - NSUInteger selEdges = [[pickSupport selectedEdges] count]; - NSUInteger selNodes = [[pickSupport selectedNodes] count]; - - if (selEdges == 0 && selNodes == 0) { - return; - } - - NSString *actionName = @"Remove selection"; - - [self startUndoGroup]; - if (selEdges > 0) { - GraphChange *change = [graph removeEdges:[pickSupport selectedEdges]]; - [self registerUndoForChange:change]; - [pickSupport deselectAllEdges]; - [self postGraphChange:change]; - } else { - actionName = (selNodes == 1 ? @"Remove node" : @"Remove nodes"); - } - if (selNodes > 0) { - GraphChange *change = [graph removeNodes:[pickSupport selectedNodes]]; - [self registerUndoForChange:change]; - [pickSupport deselectAllNodes]; - [self postGraphChange:change]; - } else { - actionName = (selEdges == 1 ? @"Remove edge" : @"Remove edges"); - } - [self nameAndEndUndoGroup:actionName]; - [self regenerateTikz]; -} - -- (void) addNode:(Node*)node { - GraphChange *change = [graph addNode:node]; - [self completedGraphChange:change withName:@"Add node"]; -} - -- (void) removeNode:(Node*)node { - [pickSupport deselectNode:node]; - GraphChange *change = [graph removeNode:node]; - [self completedGraphChange:change withName:@"Remove node"]; -} - -- (void) addEdge:(Edge*)edge { - GraphChange *change = [graph addEdge:edge]; - [self completedGraphChange:change withName:@"Add edge"]; -} - -- (void) removeEdge:(Edge*)edge { - [pickSupport deselectEdge:edge]; - GraphChange *change = [graph removeEdge:edge]; - [self completedGraphChange:change withName:@"Remove edge"]; -} - -- (void) shiftSelectedNodesByPoint:(NSPoint)offset { - if ([[pickSupport selectedNodes] count] > 0) { - GraphChange *change = [graph shiftNodes:[pickSupport selectedNodes] byPoint:offset]; - [self completedGraphChange:change withName:@"Move nodes"]; - } -} - -- (void) insertGraph:(Graph*)g { - GraphChange *change = [graph insertGraph:g]; - [self completedGraphChange:change withName:@"Insert graph"]; -} - -- (void) flipSelectedNodesHorizontally { - if ([[pickSupport selectedNodes] count] > 0) { - GraphChange *change = [graph flipHorizontalNodes:[pickSupport selectedNodes]]; - [self completedGraphChange:change withName:@"Flip nodes horizontally"]; - } -} - -- (void) flipSelectedNodesVertically { - if ([[pickSupport selectedNodes] count] > 0) { - GraphChange *change = [graph flipVerticalNodes:[pickSupport selectedNodes]]; - [self completedGraphChange:change withName:@"Flip nodes vertically"]; - } -} - -- (void) reverseSelectedEdges { - if ([[pickSupport selectedEdges] count] > 0) { - GraphChange *change = [graph reverseEdges:[pickSupport selectedEdges]]; - [self completedGraphChange:change withName:@"Reverse edges"]; - } -} - -- (void) bringSelectionForward { - BOOL hasNodeSelection = [[pickSupport selectedNodes] count] > 0; - BOOL hasEdgeSelection = [[pickSupport selectedEdges] count] > 0; - if (!hasNodeSelection && !hasEdgeSelection) - return; - - [self startUndoGroup]; - GraphChange *nodeChange; - GraphChange *edgeChange; - if (hasNodeSelection) { - nodeChange = [graph bringNodesForward:[pickSupport selectedNodes]]; - [self registerUndoForChange:nodeChange]; - } - if (hasEdgeSelection) { - edgeChange = [graph bringEdgesForward:[pickSupport selectedEdges]]; - [self registerUndoForChange:edgeChange]; - } - [self nameAndEndUndoGroup:@"Bring forward"]; - [self regenerateTikz]; - if (hasNodeSelection) - [self postGraphChange:nodeChange]; - if (hasEdgeSelection) - [self postGraphChange:edgeChange]; -} - -- (void) bringSelectionToFront { - BOOL hasNodeSelection = [[pickSupport selectedNodes] count] > 0; - BOOL hasEdgeSelection = [[pickSupport selectedEdges] count] > 0; - if (!hasNodeSelection && !hasEdgeSelection) - return; - - [self startUndoGroup]; - GraphChange *nodeChange; - GraphChange *edgeChange; - if (hasNodeSelection) { - nodeChange = [graph bringNodesToFront:[pickSupport selectedNodes]]; - [self registerUndoForChange:nodeChange]; - } - if (hasEdgeSelection) { - edgeChange = [graph bringEdgesToFront:[pickSupport selectedEdges]]; - [self registerUndoForChange:edgeChange]; - } - [self nameAndEndUndoGroup:@"Bring to front"]; - [self regenerateTikz]; - if (hasNodeSelection) - [self postGraphChange:nodeChange]; - if (hasEdgeSelection) - [self postGraphChange:edgeChange]; -} - -- (void) sendSelectionBackward { - BOOL hasNodeSelection = [[pickSupport selectedNodes] count] > 0; - BOOL hasEdgeSelection = [[pickSupport selectedEdges] count] > 0; - if (!hasNodeSelection && !hasEdgeSelection) - return; - - [self startUndoGroup]; - GraphChange *nodeChange; - GraphChange *edgeChange; - if (hasNodeSelection) { - nodeChange = [graph sendNodesBackward:[pickSupport selectedNodes]]; - [self registerUndoForChange:nodeChange]; - } - if (hasEdgeSelection) { - edgeChange = [graph sendNodesBackward:[pickSupport selectedEdges]]; - [self registerUndoForChange:edgeChange]; - } - [self nameAndEndUndoGroup:@"Send backward"]; - [self regenerateTikz]; - if (hasNodeSelection) - [self postGraphChange:nodeChange]; - if (hasEdgeSelection) - [self postGraphChange:edgeChange]; -} - -- (void) sendSelectionToBack { - BOOL hasNodeSelection = [[pickSupport selectedNodes] count] > 0; - BOOL hasEdgeSelection = [[pickSupport selectedEdges] count] > 0; - if (!hasNodeSelection && !hasEdgeSelection) - return; - - [self startUndoGroup]; - GraphChange *nodeChange; - GraphChange *edgeChange; - if (hasNodeSelection) { - nodeChange = [graph sendNodesToBack:[pickSupport selectedNodes]]; - [self registerUndoForChange:nodeChange]; - } - if (hasEdgeSelection) { - edgeChange = [graph sendNodesToBack:[pickSupport selectedEdges]]; - [self registerUndoForChange:edgeChange]; - } - [self nameAndEndUndoGroup:@"Send to back"]; - [self regenerateTikz]; - if (hasNodeSelection) - [self postGraphChange:nodeChange]; - if (hasEdgeSelection) - [self postGraphChange:edgeChange]; -} - -- (BOOL) saveCopyToPath: (NSString*)p error: (NSError**)error { - if (!p) { - [NSException raise:@"No document path" format:@"No path given"]; - } - // we use glib for writing the file, because GNUStep sucks in this regard - // (older versions don't have -[NSString writeToFile:atomically:encoding:error:]) - GError *gerror = NULL; - gchar *filename = [p glibFilename]; - BOOL success = g_file_set_contents (filename, [tikz UTF8String], -1, &gerror) ? YES : NO; - if (gerror) { - GErrorToNSError (gerror, error); - g_error_free (gerror); - } - g_free (filename); - return success; -} - -- (BOOL) saveToPath: (NSString*)p error: (NSError**)error { - BOOL success = [self saveCopyToPath:p error:error]; - if (success) { - [self setPath:p]; - hasChanges = NO; - } - return success; -} - -- (BOOL) save: (NSError**)error { - if (!path) { - [NSException raise:@"No document path" format:@"Tried to save a document when there was no path"]; - } - return [self saveToPath:path error:error]; -} - -@end - -@implementation TikzDocument (Private) -- (void) styleRenamed:(NSNotification*)n { - [self regenerateTikz]; -} - -- (void) setPath:(NSString*)p { - [p retain]; - [path release]; - path = p; -} - -- (void) setGraph:(Graph*)g { - if (g == nil) { - g = [Graph graph]; - } - if (g == graph) { - return; - } - - [pickSupport deselectAllNodes]; - [pickSupport deselectAllEdges]; - - [self startUndoGroup]; - [undoManager registerUndoWithTarget:self selector:@selector(setGraph:) object:graph]; - [g retain]; - [graph release]; - graph = g; - - [self attachStylesToGraph:graph]; - - [self regenerateTikz]; - [self postGraphReplaced]; - [self nameAndEndUndoGroup:@"Replace graph"]; -} - -- (void) registerUndoForChange:(GraphChange*)change { - [undoManager registerUndoWithTarget:self - selector:@selector(undoGraphChange:) - object:change]; -} - -- (void) registerUndoGroupForChange:(GraphChange*)change withName:(NSString*)nm { - [self startUndoGroup]; - [self registerUndoForChange:change]; - [self nameAndEndUndoGroup:nm]; -} - -- (void) undoGraphChange:(GraphChange*)change { - GraphChange *inverse = [change invert]; - [graph applyGraphChange:inverse]; - [self startUndoGroup]; - [undoManager registerUndoWithTarget:self - selector:@selector(undoGraphChange:) - object:inverse]; - [self endUndoGroup]; - [self regenerateTikz]; - [self postGraphChange:change]; -} - -- (void) completedGraphChange:(GraphChange*)change withName:(NSString*)name { - if (change == nil) { - NSLog(@"No graph change given for change %@", name); - return; - } - [self registerUndoGroupForChange:change withName:name]; - [self regenerateTikz]; - [self postGraphChange:change]; -} - -- (void) attachStylesToGraph:(Graph*)g { - for (Node *n in [g nodes]) { - [n attachStyleFromTable:[styleManager nodeStyles]]; - } - for (Edge *e in [g edges]) { - [e attachStyleFromTable:[styleManager edgeStyles]]; - } -} - -- (void) regenerateTikz { - [tikz release]; - tikz = [[graph tikz] retain]; - hasChanges = YES; - [self postTikzChanged]; -} -@end - -// vim:ft=objc:sts=4:sw=4:et diff --git a/tikzit/src/gtk/Tool.h b/tikzit/src/gtk/Tool.h deleted file mode 100644 index 22c983e..0000000 --- a/tikzit/src/gtk/Tool.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "InputDelegate.h" -#import "Surface.h" - -#import -#import - -@class Configuration; -@class GraphRenderer; -@protocol InputDelegate; -@protocol RenderDelegate; - -@protocol Tool -@property (readonly) NSString *name; -@property (readonly) const gchar *stockId; -@property (readonly) NSString *helpText; -@property (readonly) NSString *shortcut; -@property (retain) GraphRenderer *activeRenderer; -@property (readonly) GtkWidget *configurationWidget; -- (void) loadConfiguration:(Configuration*)config; -- (void) saveConfiguration:(Configuration*)config; -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/ToolBox.h b/tikzit/src/gtk/ToolBox.h deleted file mode 100644 index 60074c1..0000000 --- a/tikzit/src/gtk/ToolBox.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class Configuration; -@class Window; -@protocol Tool; - -@interface ToolBox : NSObject { - GtkWidget *window; - GtkToolItemGroup *toolGroup; - GtkWidget *titleLabel; - GtkWidget *configWidgetContainer; - GtkWidget *configWidget; -} - -@property (assign) id selectedTool; - -- (id) initWithTools:(NSArray*)tools; - -- (void) show; -- (void) present; -- (void) attachToWindow:(Window*)parent; - -- (void) loadConfiguration:(Configuration*)config; -- (void) saveConfiguration:(Configuration*)config; -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/ToolBox.m b/tikzit/src/gtk/ToolBox.m deleted file mode 100644 index c6d2ccf..0000000 --- a/tikzit/src/gtk/ToolBox.m +++ /dev/null @@ -1,280 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "ToolBox.h" - -#import "Application.h" -#import "Configuration.h" -#import "Tool.h" -#import "Window.h" - -#import "gtkhelpers.h" -#import "tztoolpalette.h" - -static void tool_button_toggled_cb (GtkWidget *widget, ToolBox *toolBox); - -#define TOOL_DATA_KEY "tikzit-tool" - -@implementation ToolBox - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithTools:(NSArray*)tools { - self = [super init]; - - if (self) { - window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - g_object_ref_sink (window); - gtk_window_set_title (GTK_WINDOW (window), "Toolbox"); - gtk_window_set_role (GTK_WINDOW (window), "toolbox"); - gtk_window_set_type_hint (GTK_WINDOW (window), - GDK_WINDOW_TYPE_HINT_UTILITY); - gtk_window_set_deletable (GTK_WINDOW (window), FALSE); - - GtkWidget *mainLayout = gtk_vbox_new (FALSE, 5); - gtk_widget_show (mainLayout); - gtk_container_add (GTK_CONTAINER (window), mainLayout); - - GtkWidget *toolPalette = tz_tool_palette_new (); - gtk_widget_show (toolPalette); - gtk_box_pack_start (GTK_BOX (mainLayout), - toolPalette, - FALSE, - FALSE, - 0); - gtk_tool_palette_set_style (GTK_TOOL_PALETTE (toolPalette), - GTK_TOOLBAR_ICONS); - - toolGroup = GTK_TOOL_ITEM_GROUP (gtk_tool_item_group_new ("Tools")); - g_object_ref_sink (G_OBJECT (toolGroup)); - gtk_tool_item_group_set_label_widget ( - toolGroup, - NULL); - gtk_container_add (GTK_CONTAINER (toolPalette), GTK_WIDGET (toolGroup)); - gtk_widget_show (GTK_WIDGET (toolGroup)); - - GSList *item_group = NULL; - for (id tool in tools) { - NSString *tooltip = [NSString stringWithFormat: - @"%@: %@ (%@)", - [tool name], [tool helpText], [tool shortcut]]; - GtkToolItem *item = gtk_radio_tool_button_new_from_stock ( - item_group, - [tool stockId]); - gtk_tool_item_set_tooltip_text (item, [tooltip UTF8String]); - item_group = gtk_radio_tool_button_get_group ( - GTK_RADIO_TOOL_BUTTON (item)); - gtk_tool_item_group_insert ( - toolGroup, - item, - -1); - gtk_widget_show (GTK_WIDGET (item)); - g_object_set_data_full ( - G_OBJECT(item), - TOOL_DATA_KEY, - [tool retain], - release_obj); - - g_signal_connect (item, "toggled", - G_CALLBACK (tool_button_toggled_cb), - self); - } - - GtkWidget *sep = gtk_hseparator_new (); - gtk_widget_show (sep); - gtk_box_pack_start (GTK_BOX (mainLayout), - sep, - FALSE, - FALSE, - 0); - - titleLabel = gtk_label_new (""); - g_object_ref_sink (titleLabel); - gtk_widget_show (titleLabel); - - PangoAttrList *attrs = pango_attr_list_new (); - pango_attr_list_insert (attrs, - pango_attr_weight_new (PANGO_WEIGHT_SEMIBOLD)); - gtk_label_set_attributes (GTK_LABEL (titleLabel), attrs); - pango_attr_list_unref (attrs); - - gtk_box_pack_start (GTK_BOX (mainLayout), - titleLabel, - FALSE, - FALSE, - 0); - - configWidgetContainer = gtk_alignment_new (0.5, 0.5, 1.0, 1.0); - g_object_ref_sink (configWidgetContainer); - gtk_widget_show (configWidgetContainer); - gtk_box_pack_start (GTK_BOX (mainLayout), - configWidgetContainer, - TRUE, - TRUE, - 0); - gtk_alignment_set_padding (GTK_ALIGNMENT (configWidgetContainer), - 5, 5, 5, 5); - - gint button_width; - gint button_height; - - if (tz_tool_palette_get_button_size (TZ_TOOL_PALETTE (toolPalette), - &button_width, &button_height)) - { - GdkGeometry geometry; - - geometry.min_width = 2 * button_width; - geometry.min_height = -1; - geometry.base_width = button_width; - geometry.base_height = 0; - geometry.width_inc = button_width; - geometry.height_inc = 1; - - gtk_window_set_geometry_hints (GTK_WINDOW (window), - NULL, - &geometry, - GDK_HINT_MIN_SIZE | - GDK_HINT_BASE_SIZE | - GDK_HINT_RESIZE_INC | - GDK_HINT_USER_POS); - } - gtk_window_set_default_size (GTK_WINDOW (window), button_width * 5, 500); - - // hack to position the toolbox window somewhere sensible - // (upper left) - gtk_window_parse_geometry (GTK_WINDOW (window), "+0+0"); - } - - return self; -} - -- (void) dealloc { - if (window) { - g_object_unref (G_OBJECT (toolGroup)); - g_object_unref (G_OBJECT (titleLabel)); - g_object_unref (G_OBJECT (configWidgetContainer)); - if (configWidget) - g_object_unref (G_OBJECT (configWidget)); - gtk_widget_destroy (window); - g_object_unref (G_OBJECT (window)); - } - - [super dealloc]; -} - -- (id) selectedTool { - guint count = gtk_tool_item_group_get_n_items (toolGroup); - for (guint i = 0; i < count; ++i) { - GtkToolItem *item = gtk_tool_item_group_get_nth_item (toolGroup, i); - if (gtk_toggle_tool_button_get_active (GTK_TOGGLE_TOOL_BUTTON (item))) { - return (id)g_object_get_data (G_OBJECT (item), TOOL_DATA_KEY); - } - } - return nil; -} - -- (void) _setToolWidget:(GtkWidget*)widget { - if (configWidget) { - gtk_widget_hide (configWidget); - gtk_container_remove (GTK_CONTAINER (configWidgetContainer), - configWidget); - g_object_unref (configWidget); - } - configWidget = widget; - if (configWidget) { - g_object_ref (configWidget); - gtk_container_add (GTK_CONTAINER (configWidgetContainer), - configWidget); - gtk_widget_show (configWidget); - } -} - -- (void) setSelectedTool:(id)tool { - guint count = gtk_tool_item_group_get_n_items (toolGroup); - for (guint i = 0; i < count; ++i) { - GtkToolItem *item = gtk_tool_item_group_get_nth_item (toolGroup, i); - id data = (id)g_object_get_data (G_OBJECT (item), TOOL_DATA_KEY); - if (data == tool) { - gtk_toggle_tool_button_set_active ( - GTK_TOGGLE_TOOL_BUTTON (item), - TRUE); - break; - } - } - gtk_label_set_label (GTK_LABEL (titleLabel), - [[tool name] UTF8String]); - [self _setToolWidget:[tool configurationWidget]]; -} - -- (void) show { - gtk_widget_show (window); -} - -- (void) present { - gtk_window_present (GTK_WINDOW (window)); -} - -- (void) attachToWindow:(Window*)parent { - utility_window_attach (GTK_WINDOW (window), [parent gtkWindow]); -} - -- (void) loadConfiguration:(Configuration*)config { - if ([config hasGroup:@"ToolBox"]) { - tz_restore_window (GTK_WINDOW (window), - [config integerEntry:@"x" inGroup:@"ToolBox"], - [config integerEntry:@"y" inGroup:@"ToolBox"], - [config integerEntry:@"w" inGroup:@"ToolBox"], - [config integerEntry:@"h" inGroup:@"ToolBox"]); - } -} - -- (void) saveConfiguration:(Configuration*)config { - gint x, y, w, h; - - gtk_window_get_position (GTK_WINDOW (window), &x, &y); - gtk_window_get_size (GTK_WINDOW (window), &w, &h); - - [config setIntegerEntry:@"x" inGroup:@"ToolBox" value:x]; - [config setIntegerEntry:@"y" inGroup:@"ToolBox" value:y]; - [config setIntegerEntry:@"w" inGroup:@"ToolBox" value:w]; - [config setIntegerEntry:@"h" inGroup:@"ToolBox" value:h]; -} - -@end - -static void tool_button_toggled_cb (GtkWidget *widget, ToolBox *toolBox) { - if (gtk_toggle_tool_button_get_active (GTK_TOGGLE_TOOL_BUTTON (widget))) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - id tool = (id)g_object_get_data (G_OBJECT(widget), TOOL_DATA_KEY); - [app setActiveTool:tool]; - NSDictionary *userInfo = [NSDictionary - dictionaryWithObject:tool - forKey:@"tool"]; - [[NSNotificationCenter defaultCenter] - postNotificationName:@"ToolSelectionChanged" - object:toolBox - userInfo:userInfo]; - - [pool drain]; - } -} - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/WidgetSurface.h b/tikzit/src/gtk/WidgetSurface.h deleted file mode 100644 index 667749f..0000000 --- a/tikzit/src/gtk/WidgetSurface.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import -#import -#import - -/** - * Provides a surface for rendering to a widget. - */ -@interface WidgetSurface: NSObject { - GtkWidget *widget; - Transformer *transformer; - id renderDelegate; - id inputDelegate; - BOOL keepCentered; - BOOL buttonPressesRequired; - CGFloat defaultScale; - NSSize lastKnownSize; -} - -@property (assign) BOOL canFocus; -@property (assign) BOOL keepCentered; -@property (assign) CGFloat defaultScale; - -- (id) initWithWidget:(GtkWidget*)widget; -- (GtkWidget*) widget; - -- (id) inputDelegate; -- (void) setInputDelegate:(id)delegate; - -/** - * Set the minimum size that this widget wants - */ -- (void) setSizeRequestWidth:(double)width height:(double)height; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/WidgetSurface.m b/tikzit/src/gtk/WidgetSurface.m deleted file mode 100644 index 004e722..0000000 --- a/tikzit/src/gtk/WidgetSurface.m +++ /dev/null @@ -1,630 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "WidgetSurface.h" -#import "gtkhelpers.h" -#import "InputDelegate.h" -#import "CairoRenderContext.h" - -// {{{ Internal interfaces -// {{{ GTK+ callbacks -static gboolean configure_event_cb (GtkWidget *widget, GdkEventConfigure *event, WidgetSurface *surface); -static void realize_cb (GtkWidget *widget, WidgetSurface *surface); -static gboolean expose_event_cb (GtkWidget *widget, GdkEventExpose *event, WidgetSurface *surface); -static gboolean button_press_event_cb (GtkWidget *widget, GdkEventButton *event, WidgetSurface *surface); -static gboolean button_release_event_cb (GtkWidget *widget, GdkEventButton *event, WidgetSurface *surface); -static gboolean motion_notify_event_cb (GtkWidget *widget, GdkEventMotion *event, WidgetSurface *surface); -static gboolean key_press_event_cb (GtkWidget *widget, GdkEventKey *event, WidgetSurface *surface); -static gboolean key_release_event_cb (GtkWidget *widget, GdkEventKey *event, WidgetSurface *surface); -static gboolean scroll_event_cb (GtkWidget *widget, GdkEventScroll *event, WidgetSurface *surface); -static void set_cursor (GtkWidget *widget, GdkCursor *cursor); -static void unref_cursor (gpointer cursor, GClosure *closure); -// }}} - -@interface WidgetSurface (Private) -- (void) updateTransformer; -- (void) widgetSizeChanged:(NSNotification*)notification; -- (void) handleExposeEvent:(GdkEventExpose*)event; -- (void) updateLastKnownSize; -- (void) zoomTo:(CGFloat)scale aboutPoint:(NSPoint)p; -- (void) zoomTo:(CGFloat)scale; -- (void) addToEventMask:(GdkEventMask)values; -- (void) removeFromEventMask:(GdkEventMask)values; -@end -// }}} -// {{{ API -@implementation WidgetSurface - -- (id) init { - return [self initWithWidget:gtk_drawing_area_new ()]; -} - -- (id) initWithWidget:(GtkWidget*)w { - self = [super init]; - - if (self) { - widget = w; - g_object_ref_sink (G_OBJECT (widget)); - defaultScale = 1.0f; - transformer = [[Transformer alloc] init]; - [transformer setFlippedAboutXAxis:YES]; - [self updateLastKnownSize]; - g_object_set (G_OBJECT (widget), "events", GDK_STRUCTURE_MASK, NULL); - g_signal_connect (widget, "expose-event", G_CALLBACK (expose_event_cb), self); - g_signal_connect (widget, "configure-event", G_CALLBACK (configure_event_cb), self); - g_signal_connect (widget, "realize", G_CALLBACK (realize_cb), self); - g_signal_connect (widget, "button-press-event", G_CALLBACK (button_press_event_cb), self); - g_signal_connect (widget, "button-release-event", G_CALLBACK (button_release_event_cb), self); - g_signal_connect (widget, "motion-notify-event", G_CALLBACK (motion_notify_event_cb), self); - g_signal_connect (widget, "key-press-event", G_CALLBACK (key_press_event_cb), self); - g_signal_connect (widget, "key-release-event", G_CALLBACK (key_release_event_cb), self); - g_signal_connect (widget, "scroll-event", G_CALLBACK (scroll_event_cb), self); - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(widgetSizeChanged:) - name:@"SurfaceSizeChanged" - object:self]; - if ([self canFocus]) { - [self addToEventMask:GDK_BUTTON_PRESS_MASK]; - } else { - [self removeFromEventMask:GDK_BUTTON_PRESS_MASK]; - } - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - [transformer release]; - g_object_unref (G_OBJECT (widget)); - - [super dealloc]; -} - -- (void) invalidateRect:(NSRect)rect { - if (!NSIsEmptyRect (rect)) { - GdkWindow *window = gtk_widget_get_window (widget); - if (window) { - GdkRectangle g_rect = gdk_rectangle_from_ns_rect (rect); - gdk_window_invalidate_rect (window, &g_rect, TRUE); - } - } -} - -- (void) invalidate { - GdkWindow *window = gtk_widget_get_window (widget); - if (window) { - GdkRegion *visible = gdk_drawable_get_visible_region (GDK_DRAWABLE (window)); - gdk_window_invalidate_region (window, visible, TRUE); - gdk_region_destroy (visible); - } -} - -- (id) createRenderContext { - return [CairoRenderContext contextForWidget:widget]; -} - -- (int) width { - int width = 0; - GdkWindow *window = gtk_widget_get_window (widget); - if (window) { - gdk_drawable_get_size (window, &width, NULL); - } - return width; -} - -- (int) height { - int height = 0; - GdkWindow *window = gtk_widget_get_window (widget); - if (window) { - gdk_drawable_get_size (window, NULL, &height); - } - return height; -} - -- (void) setSizeRequestWidth:(double)width height:(double)height { - gtk_widget_set_size_request (widget, width, height); -} - -- (Transformer*) transformer { - return transformer; -} - -- (GtkWidget*) widget { - return widget; -} - -- (void) setRenderDelegate:(id )delegate { - // NB: no retention! - renderDelegate = delegate; - if (renderDelegate == nil) { - [self removeFromEventMask:GDK_EXPOSURE_MASK]; - } else { - [self addToEventMask:GDK_EXPOSURE_MASK]; - } -} - -- (id) inputDelegate { - return inputDelegate; -} - -- (void) setInputDelegate:(id)delegate { - if (delegate == inputDelegate) { - return; - } - buttonPressesRequired = NO; - if (inputDelegate != nil) { - [self removeFromEventMask:GDK_POINTER_MOTION_MASK - | GDK_BUTTON_PRESS_MASK - | GDK_BUTTON_RELEASE_MASK - | GDK_KEY_PRESS_MASK - | GDK_KEY_RELEASE_MASK]; - } - inputDelegate = delegate; - if (delegate != nil) { - GdkEventMask mask = 0; - if ([delegate respondsToSelector:@selector(mousePressAt:withButton:andMask:)]) { - buttonPressesRequired = YES; - mask |= GDK_BUTTON_PRESS_MASK; - } - if ([delegate respondsToSelector:@selector(mouseReleaseAt:withButton:andMask:)]) { - mask |= GDK_BUTTON_RELEASE_MASK; - } - if ([delegate respondsToSelector:@selector(mouseDoubleClickAt:withButton:andMask:)]) { - buttonPressesRequired = YES; - mask |= GDK_BUTTON_PRESS_MASK; - } - if ([delegate respondsToSelector:@selector(mouseMoveTo:withButtons:andMask:)]) { - mask |= GDK_POINTER_MOTION_MASK; - } - if ([delegate respondsToSelector:@selector(keyPressed:withMask:)]) { - mask |= GDK_KEY_PRESS_MASK; - } - if ([delegate respondsToSelector:@selector(keyReleased:withMask:)]) { - mask |= GDK_KEY_RELEASE_MASK; - } - [self addToEventMask:mask]; - } -} - -- (id ) renderDelegate { - return renderDelegate; -} - -- (void) setKeepCentered:(BOOL)centered { - keepCentered = centered; - [self updateTransformer]; -} - -- (BOOL) keepCentered { - return keepCentered; -} - -- (BOOL) canFocus { - return gtk_widget_get_can_focus (widget); -} - -- (void) setCanFocus:(BOOL)focus { - gtk_widget_set_can_focus (widget, focus); - if (focus) { - [self addToEventMask:GDK_BUTTON_PRESS_MASK]; - } else if (!buttonPressesRequired) { - [self removeFromEventMask:GDK_BUTTON_PRESS_MASK]; - } -} - -- (BOOL) hasFocus { - return gtk_widget_has_focus (widget); -} - -- (void) renderFocus { - GdkWindow *window = gtk_widget_get_window (widget); - if (window) { - int width = 0; - int height = 0; - gdk_drawable_get_size (window, &width, &height); - gtk_paint_focus (gtk_widget_get_style (widget), - window, - GTK_STATE_NORMAL, - NULL, - widget, - NULL, - 0, - 0, - width, - height - ); - } -} - -- (CGFloat) defaultScale { - return defaultScale; -} - -- (void) setDefaultScale:(CGFloat)newDefault { - if (defaultScale != newDefault) { - CGFloat oldDefault = defaultScale; - defaultScale = newDefault; - - CGFloat scale = [transformer scale]; - scale *= (newDefault / oldDefault); - [transformer setScale:scale]; - [self invalidate]; - } -} - -- (void) zoomIn { - CGFloat scale = [transformer scale]; - scale *= 1.2f; - [self zoomTo:scale]; -} - -- (void) zoomOut { - CGFloat scale = [transformer scale]; - scale /= 1.2f; - [self zoomTo:scale]; -} - -- (void) zoomReset { - [self zoomTo:defaultScale]; -} - -- (void) zoomInAboutPoint:(NSPoint)p { - CGFloat scale = [transformer scale]; - scale *= 1.2f; - [self zoomTo:scale aboutPoint:p]; -} - -- (void) zoomOutAboutPoint:(NSPoint)p { - CGFloat scale = [transformer scale]; - scale /= 1.2f; - [self zoomTo:scale aboutPoint:p]; -} - -- (void) zoomResetAboutPoint:(NSPoint)p { - [self zoomTo:defaultScale aboutPoint:p]; -} - -- (void) setCursor:(Cursor)c { - GdkCursor *cursor = NULL; - switch (c) { - case ResizeRightCursor: - cursor = gdk_cursor_new (GDK_RIGHT_SIDE); - break; - case ResizeBottomRightCursor: - cursor = gdk_cursor_new (GDK_BOTTOM_RIGHT_CORNER); - break; - case ResizeBottomCursor: - cursor = gdk_cursor_new (GDK_BOTTOM_SIDE); - break; - case ResizeBottomLeftCursor: - cursor = gdk_cursor_new (GDK_BOTTOM_LEFT_CORNER); - break; - case ResizeLeftCursor: - cursor = gdk_cursor_new (GDK_LEFT_SIDE); - break; - case ResizeTopLeftCursor: - cursor = gdk_cursor_new (GDK_TOP_LEFT_CORNER); - break; - case ResizeTopCursor: - cursor = gdk_cursor_new (GDK_TOP_SIDE); - break; - case ResizeTopRightCursor: - cursor = gdk_cursor_new (GDK_TOP_RIGHT_CORNER); - break; - default: break; - } - GdkWindow *window = gtk_widget_get_window (widget); - g_signal_handlers_disconnect_matched (window, - G_SIGNAL_MATCH_FUNC, 0, 0, NULL, - G_CALLBACK (set_cursor), NULL); - if (window) { - gdk_window_set_cursor (window, cursor); - if (cursor != NULL) { - gdk_cursor_unref (cursor); - } - } else { - g_signal_connect_data (widget, - "realize", G_CALLBACK (set_cursor), cursor, - unref_cursor, 0); - } -} - -@end -// }}} -// {{{ Private -@implementation WidgetSurface (Private) -- (void) widgetSizeChanged:(NSNotification*)notification { - [self updateTransformer]; - [self updateLastKnownSize]; -} - -- (void) updateTransformer { - if (keepCentered) { - GdkWindow *window = gtk_widget_get_window (widget); - if (window) { - int width = 0; - int height = 0; - gdk_drawable_get_size (window, &width, &height); - NSPoint origin; - if (lastKnownSize.width < 1 || lastKnownSize.height < 1) { - origin.x = (float)width / 2.0f; - origin.y = (float)height / 2.0f; - } else { - origin = [transformer origin]; - origin.x += ((float)width - lastKnownSize.width) / 2.0f; - origin.y += ((float)height - lastKnownSize.height) / 2.0f; - } - [transformer setOrigin:origin]; - } - } -} - -- (void) handleExposeEvent:(GdkEventExpose*)event { - if (renderDelegate != nil) { - NSRect area = gdk_rectangle_to_ns_rect (event->area); - - id context = [CairoRenderContext contextForWidget:widget]; - [context rect:area]; - [context clipToPath]; - [renderDelegate renderWithContext:context onSurface:self]; - } -} - -- (void) updateLastKnownSize { - GdkWindow *window = gtk_widget_get_window (widget); - if (window) { - int width = 0; - int height = 0; - gdk_drawable_get_size (window, &width, &height); - lastKnownSize.width = (float)width; - lastKnownSize.height = (float)height; - } else { - lastKnownSize = NSZeroSize; - } -} - -- (void) zoomTo:(CGFloat)scale aboutPoint:(NSPoint)p { - NSPoint graphP = [transformer fromScreen:p]; - - [transformer setScale:scale]; - - NSPoint newP = [transformer toScreen:graphP]; - NSPoint origin = [transformer origin]; - origin.x += p.x - newP.x; - origin.y += p.y - newP.y; - [transformer setOrigin:origin]; - - [self invalidate]; -} - -- (void) zoomTo:(CGFloat)scale { - NSPoint centre = NSMakePoint (lastKnownSize.width/2.0f, lastKnownSize.height/2.0f); - [self zoomTo:scale aboutPoint:centre]; -} - -- (void) addToEventMask:(GdkEventMask)values { - GdkEventMask mask; - g_object_get (G_OBJECT (widget), "events", &mask, NULL); - mask |= values; - g_object_set (G_OBJECT (widget), "events", mask, NULL); -} - -- (void) removeFromEventMask:(GdkEventMask)values { - GdkEventMask mask; - g_object_get (G_OBJECT (widget), "events", &mask, NULL); - mask ^= values; - if (buttonPressesRequired || [self canFocus]) { - mask |= GDK_BUTTON_PRESS_MASK; - } - g_object_set (G_OBJECT (widget), "events", mask, NULL); -} - -@end -// }}} -// {{{ GTK+ callbacks -static gboolean configure_event_cb(GtkWidget *widget, GdkEventConfigure *event, WidgetSurface *surface) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [[NSNotificationCenter defaultCenter] postNotificationName:@"SurfaceSizeChanged" object:surface]; - [pool drain]; - return FALSE; -} - -static void realize_cb (GtkWidget *widget, WidgetSurface *surface) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [surface updateTransformer]; - [pool drain]; -} - -static gboolean expose_event_cb(GtkWidget *widget, GdkEventExpose *event, WidgetSurface *surface) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [surface handleExposeEvent:event]; - [pool drain]; - return FALSE; -} - -InputMask mask_from_gdk_modifier_state (GdkModifierType state) { - InputMask mask = 0; - if (state & GDK_SHIFT_MASK) { - mask |= ShiftMask; - } - if (state & GDK_CONTROL_MASK) { - mask |= ControlMask; - } - if (state & GDK_META_MASK) { - mask |= MetaMask; - } - return mask; -} - -ScrollDirection scroll_dir_from_gdk_scroll_dir (GdkScrollDirection dir) { - switch (dir) { - case GDK_SCROLL_UP: return ScrollUp; - case GDK_SCROLL_DOWN: return ScrollDown; - case GDK_SCROLL_LEFT: return ScrollLeft; - case GDK_SCROLL_RIGHT: return ScrollRight; - default: NSLog(@"Invalid scroll direction %i", (int)dir); return ScrollDown; - } -} - -MouseButton buttons_from_gdk_modifier_state (GdkModifierType state) { - MouseButton buttons = 0; - if (state & GDK_BUTTON1_MASK) { - buttons |= LeftButton; - } - if (state & GDK_BUTTON2_MASK) { - buttons |= MiddleButton; - } - if (state & GDK_BUTTON3_MASK) { - buttons |= RightButton; - } - if (state & GDK_BUTTON4_MASK) { - buttons |= Button4; - } - if (state & GDK_BUTTON5_MASK) { - buttons |= Button5; - } - return buttons; -} - -static gboolean button_press_event_cb(GtkWidget *widget, GdkEventButton *event, WidgetSurface *surface) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - if ([surface canFocus]) { - if (!gtk_widget_has_focus (widget)) { - gtk_widget_grab_focus (widget); - } - } - - id delegate = [surface inputDelegate]; - if (delegate != nil) { - NSPoint pos = NSMakePoint (event->x, event->y); - MouseButton button = (MouseButton)event->button; - InputMask mask = mask_from_gdk_modifier_state (event->state); - if (event->type == GDK_BUTTON_PRESS && [delegate respondsToSelector:@selector(mousePressAt:withButton:andMask:)]) { - [delegate mousePressAt:pos withButton:button andMask:mask]; - } - if (event->type == GDK_2BUTTON_PRESS && [delegate respondsToSelector:@selector(mouseDoubleClickAt:withButton:andMask:)]) { - [delegate mouseDoubleClickAt:pos withButton:button andMask:mask]; - } - } - - [pool drain]; - return FALSE; -} - -static gboolean button_release_event_cb(GtkWidget *widget, GdkEventButton *event, WidgetSurface *surface) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - id delegate = [surface inputDelegate]; - if (delegate != nil) { - if ([delegate respondsToSelector:@selector(mouseReleaseAt:withButton:andMask:)]) { - NSPoint pos = NSMakePoint (event->x, event->y); - MouseButton button = (MouseButton)event->button; - InputMask mask = mask_from_gdk_modifier_state (event->state); - [delegate mouseReleaseAt:pos withButton:button andMask:mask]; - } - } - - [pool drain]; - return FALSE; -} - -static gboolean motion_notify_event_cb(GtkWidget *widget, GdkEventMotion *event, WidgetSurface *surface) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - id delegate = [surface inputDelegate]; - if (delegate != nil) { - if ([delegate respondsToSelector:@selector(mouseMoveTo:withButtons:andMask:)]) { - NSPoint pos = NSMakePoint (event->x, event->y); - MouseButton buttons = buttons_from_gdk_modifier_state (event->state); - InputMask mask = mask_from_gdk_modifier_state (event->state); - [delegate mouseMoveTo:pos withButtons:buttons andMask:mask]; - } - } - - [pool drain]; - return FALSE; -} - -static gboolean key_press_event_cb(GtkWidget *widget, GdkEventKey *event, WidgetSurface *surface) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - id delegate = [surface inputDelegate]; - if (delegate != nil) { - if ([delegate respondsToSelector:@selector(keyPressed:withMask:)]) { - InputMask mask = mask_from_gdk_modifier_state (event->state); - [delegate keyPressed:event->keyval withMask:mask]; - } - } - - [pool drain]; - return FALSE; -} - -static gboolean key_release_event_cb(GtkWidget *widget, GdkEventKey *event, WidgetSurface *surface) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - id delegate = [surface inputDelegate]; - if (delegate != nil) { - if ([delegate respondsToSelector:@selector(keyReleased:withMask:)]) { - InputMask mask = mask_from_gdk_modifier_state (event->state); - [delegate keyReleased:event->keyval withMask:mask]; - } - } - - [pool drain]; - return FALSE; -} - -static gboolean scroll_event_cb (GtkWidget *widget, GdkEventScroll *event, WidgetSurface *surface) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - id delegate = [surface inputDelegate]; - if (delegate != nil) { - if ([delegate respondsToSelector:@selector(mouseScrolledAt:inDirection:withMask:)]) { - NSPoint pos = NSMakePoint (event->x, event->y); - InputMask mask = mask_from_gdk_modifier_state (event->state); - ScrollDirection dir = scroll_dir_from_gdk_scroll_dir (event->direction); - [delegate mouseScrolledAt:pos - inDirection:dir - withMask:mask]; - } - } - - [pool drain]; - return FALSE; -} - -static void unref_cursor (gpointer cursor, GClosure *closure) { - if (cursor != NULL) { - gdk_cursor_unref ((GdkCursor*)cursor); - } -} - -static void set_cursor (GtkWidget *widget, GdkCursor *cursor) { - GdkWindow *window = gtk_widget_get_window (widget); - if (window) { - gdk_window_set_cursor (window, cursor); - if (cursor != NULL) { - gdk_cursor_unref (cursor); - } - } -} -// }}} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit/src/gtk/Window.h b/tikzit/src/gtk/Window.h deleted file mode 100644 index a3ce8a4..0000000 --- a/tikzit/src/gtk/Window.h +++ /dev/null @@ -1,182 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class GraphEditorPanel; -@class Menu; -@class PropertyPane; -@class Preambles; -@class PreambleEditor; -@class PreviewWindow; -@class SettingsDialog; -@class StyleManager; -@class StylesPane; -@class TikzDocument; -@protocol Tool; - -/** - * Manages a document window - */ -@interface Window: NSObject { - // GTK+ widgets - GtkWindow *window; - GtkTextBuffer *tikzBuffer; - GtkStatusbar *statusBar; - GtkPaned *tikzPaneSplitter; - GtkWidget *tikzPane; - - gulong clipboard_handler_id; - GtkTextTag *errorHighlightTag; // owned by tikzBuffer - - // Classes that manage parts of the window - Menu *menu; - GraphEditorPanel *graphPanel; - - PreviewWindow *previewWindow; - - // state variables - BOOL suppressTikzUpdates; - BOOL hasParseError; - - // the document displayed by the window - TikzDocument *document; -} - -/** - * The document displayed by the window - */ -@property (retain) TikzDocument *document; -@property (readonly) BOOL hasFocus; -@property (readonly) GtkWindow *gtkWindow; - -/** - * Create a window with an empty document - */ -- (id) init; -+ (id) window; - -/** - * Create a window with the given document - */ -- (id) initWithDocument:(TikzDocument*)doc; -+ (id) windowWithDocument:(TikzDocument*)doc; - -/** - * Present the window to the user - */ -- (void) present; - -/** - * Open a file, asking the user which file to open - */ -- (void) openFile; -/** - * Open a file - */ -- (BOOL) openFileAtPath:(NSString*)path; -/** - * Save the active document to the path it was opened from - * or last saved to, or ask the user where to save it. - */ -- (BOOL) saveActiveDocument; -/** - * Save the active document, asking the user where to save it. - */ -- (BOOL) saveActiveDocumentAs; -/** - * Save the active document as a shape, asking the user what to name it. - */ -- (void) saveActiveDocumentAsShape; - -/** - * Close the window. - * - * May terminate the application if this is the last window. - * - * Will ask for user confirmation if the document is not saved. - */ -- (void) close; - -/** - * Cut the current selection to the clipboard. - */ -- (void) selectionCutToClipboard; -/** - * Copy the current selection to the clipboard. - */ -- (void) selectionCopyToClipboard; -/** - * Paste from the clipboard to the appropriate place. - */ -- (void) pasteFromClipboard; - -/** - * The GTK+ window that this class manages. - */ -- (GtkWindow*) gtkWindow; -/** - * The menu for the window. - */ -- (Menu*) menu; - -/** - * Present an error to the user - * - * @param error the error to present - */ -- (void) presentError:(NSError*)error; -/** - * Present an error to the user - * - * @param error the error to present - * @param message a message to display with the error - */ -- (void) presentError:(NSError*)error withMessage:(NSString*)message; -/** - * Present an error to the user - * - * @param error the error to present - */ -- (void) presentGError:(GError*)error; -/** - * Present an error to the user - * - * @param error the error to present - * @param message a message to display with the error - */ -- (void) presentGError:(GError*)error withMessage:(NSString*)message; - -- (void) setActiveTool:(id)tool; - -- (void) zoomIn; -- (void) zoomOut; -- (void) zoomReset; - -/** - * Show or update the preview window. - */ -- (void) presentPreview; -/** - * Show or update the preview window without it grabbing focus - */ -- (void) updatePreview; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/Window.m b/tikzit/src/gtk/Window.m deleted file mode 100644 index 2d9e63a..0000000 --- a/tikzit/src/gtk/Window.m +++ /dev/null @@ -1,991 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "Window.h" - -#import -#import "gtkhelpers.h" -#import "clipboard.h" - -#import "Application.h" -#import "Configuration.h" -#import "FileChooserDialog.h" -#import "GraphEditorPanel.h" -#import "Menu.h" -#import "RecentManager.h" -#import "Shape.h" -#import "SupportDir.h" -#import "TikzDocument.h" - -#ifdef HAVE_POPPLER -#import "PreviewWindow.h" -#endif - -enum { - GraphInfoStatus, - ParseStatus -}; - -// {{{ Internal interfaces -// {{{ Clipboard support - -static void clipboard_provide_data (GtkClipboard *clipboard, - GtkSelectionData *selection_data, - guint info, - gpointer clipboard_graph_data); -static void clipboard_release_data (GtkClipboard *clipboard, gpointer clipboard_graph_data); -static void clipboard_check_targets (GtkClipboard *clipboard, - GdkAtom *atoms, - gint n_atoms, - gpointer action); -static void clipboard_paste_contents (GtkClipboard *clipboard, - GtkSelectionData *selection_data, - gpointer document); - -// }}} -// {{{ Signals - -static void window_toplevel_focus_changed_cb (GObject *gobject, GParamSpec *pspec, Window *window); -static void graph_divider_position_changed_cb (GObject *gobject, GParamSpec *pspec, Window *window); -static void tikz_buffer_changed_cb (GtkTextBuffer *buffer, Window *window); -static gboolean main_window_delete_event_cb (GtkWidget *widget, GdkEvent *event, Window *window); -static void main_window_destroy_cb (GtkWidget *widget, Window *window); -static gboolean main_window_configure_event_cb (GtkWidget *widget, GdkEventConfigure *event, Window *window); -static void update_paste_action (GtkClipboard *clipboard, GdkEvent *event, GtkAction *action); - -// }}} - -@interface Window (Notifications) -- (void) tikzBufferChanged; -- (void) windowSizeChangedWidth:(int)width height:(int)height; -- (void) documentTikzChanged:(NSNotification*)notification; -- (void) documentSelectionChanged:(NSNotification*)notification; -- (void) undoStackChanged:(NSNotification*)notification; -@end - -@interface Window (InitHelpers) -- (void) _loadUi; -- (void) _restoreUiState; -- (void) _connectSignals; -@end - -@interface Window (Private) -- (BOOL) _askCanClose; -/** Open a document, dealing with errors as necessary */ -- (TikzDocument*) _openDocument:(NSString*)path; -- (void) _placeGraphOnClipboard:(Graph*)graph; -- (void) _clearParseError; -- (void) _setParseError:(NSError*)error; -/** Update the window title. */ -- (void) _updateTitle; -/** Update the window status bar default text. */ -- (void) _updateStatus; -/** Update the displayed tikz code to match the active document. */ -- (void) _updateTikz; -/** Update the undo and redo actions to match the active document's - * undo stack. */ -- (void) _updateUndoActions; -- (void) showPreview; -@end - -// }}} -// {{{ API - -@implementation Window - -@synthesize gtkWindow=window; - -- (id) init { - return [self initWithDocument:[TikzDocument documentWithStyleManager:[app styleManager]]]; -} -+ (id) window { - return [[[self alloc] init] autorelease]; -} -- (id) initWithDocument:(TikzDocument*)doc { - self = [super init]; - - if (self) { - [self _loadUi]; - [self _restoreUiState]; - [self _connectSignals]; - - [self setDocument:doc]; - - gtk_widget_show (GTK_WIDGET (window)); - } - - return self; -} -+ (id) windowWithDocument:(TikzDocument*)doc { - return [[[self alloc] initWithDocument:doc] autorelease]; -} - -- (void) dealloc { - // The GTK+ window has already been destroyed at this point - - [[NSNotificationCenter defaultCenter] removeObserver:self]; - g_signal_handler_disconnect ( - gtk_clipboard_get (GDK_SELECTION_CLIPBOARD), - clipboard_handler_id); - - [previewWindow release]; - [menu release]; - [graphPanel release]; - [document release]; - - g_object_unref (tikzBuffer); - g_object_unref (tikzPane); - g_object_unref (tikzPaneSplitter); - g_object_unref (statusBar); - g_object_unref (window); - - [super dealloc]; -} - -- (TikzDocument*) document { - return document; -} -- (void) setDocument:(TikzDocument*)newDoc { - [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:[document pickSupport]]; - [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:document]; - - TikzDocument *oldDoc = document; - document = [newDoc retain]; - - [graphPanel setDocument:document]; - [previewWindow setDocument:document]; - [self _updateTikz]; - [self _updateTitle]; - [self _updateStatus]; - [self _updateUndoActions]; - [menu notifySelectionChanged:[document pickSupport]]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(documentTikzChanged:) - name:@"TikzChanged" object:document]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(undoStackChanged:) - name:@"UndoStackChanged" object:document]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(documentSelectionChanged:) - name:@"NodeSelectionChanged" object:[document pickSupport]]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(documentSelectionChanged:) - name:@"EdgeSelectionChanged" object:[document pickSupport]]; - - if ([document path] != nil) { - [[RecentManager defaultManager] addRecentFile:[document path]]; - } - - NSDictionary *userInfo; - userInfo = [NSDictionary dictionaryWithObjectsAndKeys: - document, @"document", - oldDoc, @"oldDocument", - nil]; - [[NSNotificationCenter defaultCenter] - postNotificationName:@"DocumentChanged" - object:self - userInfo:userInfo]; - [oldDoc release]; -} - -- (BOOL) hasFocus { - return gtk_window_has_toplevel_focus (GTK_WINDOW (window)); -} - -- (void) present { - gtk_window_present (GTK_WINDOW (window)); -} - -- (void) openFile { - FileChooserDialog *dialog = [FileChooserDialog openDialogWithParent:window]; - [dialog addStandardFilters]; - if ([document path]) { - [dialog setCurrentFolder:[[document path] stringByDeletingLastPathComponent]]; - } else if ([app lastOpenFolder]) { - [dialog setCurrentFolder:[app lastOpenFolder]]; - } - - if ([dialog showDialog]) { - if ([self openFileAtPath:[dialog filePath]]) { - [app setLastOpenFolder:[dialog currentFolder]]; - } - } - [dialog destroy]; -} - -- (BOOL) openFileAtPath:(NSString*)path { - TikzDocument *doc = [self _openDocument:path]; - if (doc != nil) { - if (![document hasUnsavedChanges] && [document path] == nil) { - // we just have a fresh, untitled document - replace it - [self setDocument:doc]; - } else { - [app newWindowWithDocument:doc]; - } - return YES; - } - return NO; -} - -- (BOOL) saveActiveDocument { - if ([document path] == nil) { - return [self saveActiveDocumentAs]; - } else { - NSError *error = nil; - if (![document save:&error]) { - [self presentError:error]; - return NO; - } else { - [self _updateTitle]; - return YES; - } - } -} - -- (BOOL) saveActiveDocumentAs { - FileChooserDialog *dialog = [FileChooserDialog saveDialogWithParent:window]; - [dialog addStandardFilters]; - if ([document path] != nil) { - [dialog setCurrentFolder:[[document path] stringByDeletingLastPathComponent]]; - } else if ([app lastSaveAsFolder] != nil) { - [dialog setCurrentFolder:[app lastSaveAsFolder]]; - } - [dialog setSuggestedName:[document suggestedFileName]]; - - BOOL saved = NO; - if ([dialog showDialog]) { - NSString *nfile = [dialog filePath]; - - NSError *error = nil; - if (![document saveToPath:nfile error:&error]) { - [self presentError:error]; - } else { - [self _updateTitle]; - [[RecentManager defaultManager] addRecentFile:nfile]; - [app setLastSaveAsFolder:[dialog currentFolder]]; - saved = YES; - } - } - [dialog destroy]; - return saved; -} - -- (void) saveActiveDocumentAsShape { - GtkWidget *dialog = gtk_dialog_new_with_buttons ( - "Save as shape", - window, - GTK_DIALOG_MODAL, - GTK_STOCK_OK, - GTK_RESPONSE_ACCEPT, - GTK_STOCK_CANCEL, - GTK_RESPONSE_REJECT, - NULL); - GtkBox *content = GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))); - GtkWidget *label1 = gtk_label_new ("Please choose a name for the shape"); - GtkWidget *label2 = gtk_label_new ("Name:"); - GtkWidget *input = gtk_entry_new (); - GtkBox *hbox = GTK_BOX (gtk_hbox_new (FALSE, 5)); - gtk_box_pack_start (hbox, label2, FALSE, TRUE, 0); - gtk_box_pack_start (hbox, input, TRUE, TRUE, 0); - gtk_box_pack_start (content, label1, TRUE, TRUE, 5); - gtk_box_pack_start (content, GTK_WIDGET (hbox), TRUE, TRUE, 5); - gtk_widget_show_all (GTK_WIDGET (content)); - gint response = gtk_dialog_run (GTK_DIALOG (dialog)); - while (response == GTK_RESPONSE_ACCEPT) { - response = GTK_RESPONSE_NONE; - NSDictionary *shapeDict = [Shape shapeDictionary]; - const gchar *dialogInput = gtk_entry_get_text (GTK_ENTRY (input)); - NSString *shapeName = [NSString stringWithUTF8String:dialogInput]; - BOOL doSave = NO; - if ([shapeName isEqual:@""]) { - GtkWidget *emptyStrDialog = gtk_message_dialog_new (window, - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_CLOSE, - "You must specify a shape name"); - gtk_dialog_run (GTK_DIALOG (emptyStrDialog)); - gtk_widget_destroy (emptyStrDialog); - response = gtk_dialog_run (GTK_DIALOG (dialog)); - } else if ([shapeDict objectForKey:shapeName] != nil) { - GtkWidget *overwriteDialog = gtk_message_dialog_new (window, - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_QUESTION, - GTK_BUTTONS_YES_NO, - "Do you want to replace the existing shape named '%s'?", - dialogInput); - gint overwriteResp = gtk_dialog_run (GTK_DIALOG (overwriteDialog)); - gtk_widget_destroy (overwriteDialog); - - if (overwriteResp == GTK_RESPONSE_YES) { - doSave = YES; - } else { - response = gtk_dialog_run (GTK_DIALOG (dialog)); - } - } else { - doSave = YES; - } - if (doSave) { - NSError *error = nil; - NSString *userShapeDir = [[SupportDir userSupportDir] stringByAppendingPathComponent:@"shapes"]; - NSString *file = [NSString stringWithFormat:@"%@/%@.tikz", userShapeDir, shapeName]; - if (![[NSFileManager defaultManager] ensureDirectoryExists:userShapeDir error:&error]) { - [self presentError:error withMessage:@"Could not create user shape directory"]; - } else { - if (![document saveCopyToPath:file error:&error]) { - [self presentError:error withMessage:@"Could not save shape file"]; - } else { - [Shape refreshShapeDictionary]; - } - } - } - } - gtk_widget_destroy (dialog); -} - -- (void) close { - if ([self _askCanClose]) { - gtk_widget_destroy (GTK_WIDGET (window)); - } -} - -- (void) selectionCutToClipboard { - if ([[[document pickSupport] selectedNodes] count] > 0) { - [self _placeGraphOnClipboard:[document selectionCut]]; - } -} - -- (void) selectionCopyToClipboard { - if ([[[document pickSupport] selectedNodes] count] > 0) { - [self _placeGraphOnClipboard:[document selectionCopy]]; - } -} - -- (void) pasteFromClipboard { - gtk_clipboard_request_contents (gtk_clipboard_get (GDK_SELECTION_CLIPBOARD), - tikzit_picture_atom, - clipboard_paste_contents, - document); -} - -- (GtkWindow*) gtkWindow { - return window; -} - -- (Configuration*) mainConfiguration { - return [app mainConfiguration]; -} - -- (Menu*) menu { - return menu; -} - -- (void) presentError:(NSError*)error { - const gchar *errorDesc = "unknown error"; - if (error && [error localizedDescription]) { - errorDesc = [[error localizedDescription] UTF8String]; - } - GtkWidget *dialog = gtk_message_dialog_new (window, - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_CLOSE, - "%s", - errorDesc); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); -} - -- (void) presentError:(NSError*)error withMessage:(NSString*)message { - const gchar *errorDesc = "unknown error"; - if (error && [error localizedDescription]) { - errorDesc = [[error localizedDescription] UTF8String]; - } - GtkWidget *dialog = gtk_message_dialog_new (window, - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_CLOSE, - "%s: %s", - [message UTF8String], - errorDesc); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); -} - -- (void) presentGError:(GError*)error { - const gchar *errorDesc = "unknown error"; - if (error && error->message) { - errorDesc = error->message; - } - GtkWidget *dialog = gtk_message_dialog_new (window, - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_CLOSE, - "%s", - errorDesc); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); -} - -- (void) presentGError:(GError*)error withMessage:(NSString*)message { - const gchar *errorDesc = "unknown error"; - if (error && error->message) { - errorDesc = error->message; - } - GtkWidget *dialog = gtk_message_dialog_new (window, - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_CLOSE, - "%s: %s", - [message UTF8String], - errorDesc); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); -} - -- (void) setActiveTool:(id)tool { - [graphPanel setActiveTool:tool]; - gboolean hasfocus; - g_object_get (G_OBJECT (window), "has-toplevel-focus", &hasfocus, NULL); - if (hasfocus) { - [graphPanel grabTool]; - } -} - -- (void) zoomIn { - [graphPanel zoomIn]; -} - -- (void) zoomOut { - [graphPanel zoomOut]; -} - -- (void) zoomReset { - [graphPanel zoomReset]; -} - -- (void) presentPreview { -#ifdef HAVE_POPPLER - if (previewWindow == nil) { - previewWindow = [[PreviewWindow alloc] initWithPreambles:[app preambles] - config:[app mainConfiguration]]; - //[previewWindow setParentWindow:self]; - [previewWindow setDocument:document]; - } - [previewWindow present]; -#endif -} - -- (void) updatePreview { -#ifdef HAVE_POPPLER - if (previewWindow == nil) { - previewWindow = [[PreviewWindow alloc] initWithPreambles:[app preambles] - config:[app mainConfiguration]]; - //[previewWindow setParentWindow:self]; - [previewWindow setDocument:document]; - } - [previewWindow show]; -#endif -} - -@end - -// }}} -// {{{ Notifications - -@implementation Window (Notifications) -- (void) graphHeightChanged:(int)newHeight { - [[app mainConfiguration] setIntegerEntry:@"graphHeight" - inGroup:@"window" - value:newHeight]; -} - -- (void) tikzBufferChanged { - if (!suppressTikzUpdates) { - suppressTikzUpdates = TRUE; - - GtkTextIter start, end; - gtk_text_buffer_get_bounds (tikzBuffer, &start, &end); - gchar *text = gtk_text_buffer_get_text (tikzBuffer, &start, &end, FALSE); - - NSError *error = nil; - BOOL success = [document updateTikz:[NSString stringWithUTF8String:text] error:&error]; - if (success) - [self _clearParseError]; - else - [self _setParseError:error]; - - g_free (text); - - suppressTikzUpdates = FALSE; - } -} - -- (void) windowSizeChangedWidth:(int)width height:(int)height { - if (width > 0 && height > 0) { - NSNumber *w = [NSNumber numberWithInt:width]; - NSNumber *h = [NSNumber numberWithInt:height]; - NSMutableArray *size = [NSMutableArray arrayWithCapacity:2]; - [size addObject:w]; - [size addObject:h]; - [[app mainConfiguration] setIntegerListEntry:@"windowSize" - inGroup:@"window" - value:size]; - } -} - -- (void) documentTikzChanged:(NSNotification*)notification { - [self _updateTitle]; - [self _updateTikz]; -} - -- (void) documentSelectionChanged:(NSNotification*)notification { - [self _updateStatus]; - [menu notifySelectionChanged:[document pickSupport]]; -} - -- (void) undoStackChanged:(NSNotification*)notification { - [self _updateUndoActions]; -} -@end - -// }}} -// {{{ InitHelpers - -@implementation Window (InitHelpers) - -- (void) _loadUi { - window = GTK_WINDOW (gtk_window_new (GTK_WINDOW_TOPLEVEL)); - g_object_ref_sink (window); - gtk_window_set_title (window, "TikZiT"); - gtk_window_set_default_size (window, 700, 400); - - GtkBox *mainLayout = GTK_BOX (gtk_vbox_new (FALSE, 0)); - gtk_widget_show (GTK_WIDGET (mainLayout)); - gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (mainLayout)); - - menu = [[Menu alloc] initForWindow:self]; - - GtkWidget *menubar = [menu menubar]; - gtk_box_pack_start (mainLayout, menubar, FALSE, TRUE, 0); - gtk_box_reorder_child (mainLayout, menubar, 0); - gtk_widget_show (menubar); - - tikzPaneSplitter = GTK_PANED (gtk_vpaned_new ()); - g_object_ref_sink (tikzPaneSplitter); - gtk_widget_show (GTK_WIDGET (tikzPaneSplitter)); - gtk_box_pack_start (mainLayout, GTK_WIDGET (tikzPaneSplitter), TRUE, TRUE, 0); - - graphPanel = [[GraphEditorPanel alloc] initWithDocument:document]; - [graphPanel setPreviewHandler:self]; - GtkWidget *graphEditorWidget = [graphPanel widget]; - gtk_widget_show (graphEditorWidget); - GtkWidget *graphFrame = gtk_frame_new (NULL); - gtk_container_add (GTK_CONTAINER (graphFrame), graphEditorWidget); - gtk_widget_show (graphFrame); - gtk_paned_pack1 (tikzPaneSplitter, graphFrame, TRUE, TRUE); - - tikzBuffer = gtk_text_buffer_new (NULL); - g_object_ref_sink (tikzBuffer); - errorHighlightTag = gtk_text_buffer_create_tag ( - tikzBuffer, NULL, - "foreground", "#d40000", - "foreground-set", TRUE, - "weight", PANGO_WEIGHT_SEMIBOLD, - "weight-set", TRUE, - NULL); - GtkWidget *tikzScroller = gtk_scrolled_window_new (NULL, NULL); - gtk_widget_show (tikzScroller); - - tikzPane = gtk_text_view_new_with_buffer (tikzBuffer); - gtk_text_view_set_left_margin (GTK_TEXT_VIEW (tikzPane), 3); - gtk_text_view_set_right_margin (GTK_TEXT_VIEW (tikzPane), 3); - g_object_ref_sink (tikzPane); - gtk_widget_show (tikzPane); - gtk_container_add (GTK_CONTAINER (tikzScroller), tikzPane); - GtkWidget *tikzFrame = gtk_frame_new (NULL); - gtk_container_add (GTK_CONTAINER (tikzFrame), tikzScroller); - gtk_widget_show (tikzFrame); - gtk_paned_pack2 (tikzPaneSplitter, tikzFrame, FALSE, TRUE); - - statusBar = GTK_STATUSBAR (gtk_statusbar_new ()); - g_object_ref_sink (statusBar); - gtk_widget_show (GTK_WIDGET (statusBar)); - gtk_box_pack_start (mainLayout, GTK_WIDGET (statusBar), FALSE, TRUE, 0); - - GtkClipboard *clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); - update_paste_action (clipboard, NULL, [menu pasteAction]); -} - -- (void) _restoreUiState { - Configuration *config = [app mainConfiguration]; - NSArray *windowSize = [config integerListEntry:@"windowSize" - inGroup:@"window"]; - if (windowSize && [windowSize count] == 2) { - gint width = [[windowSize objectAtIndex:0] intValue]; - gint height = [[windowSize objectAtIndex:1] intValue]; - if (width > 0 && height > 0) { - gtk_window_set_default_size (window, width, height); - } - } - int panePos = [config integerEntry:@"graphHeight" - inGroup:@"window"]; - if (panePos > 0) { - gtk_paned_set_position (tikzPaneSplitter, panePos); - } -} - -- (void) _connectSignals { - GtkClipboard *clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); - clipboard_handler_id = - g_signal_connect (G_OBJECT (clipboard), - "owner-change", - G_CALLBACK (update_paste_action), - [menu pasteAction]); - g_signal_connect (G_OBJECT (window), - "key-press-event", - G_CALLBACK (tz_hijack_key_press), - NULL); - g_signal_connect (G_OBJECT (window), - "notify::has-toplevel-focus", - G_CALLBACK (window_toplevel_focus_changed_cb), - self); - g_signal_connect (G_OBJECT (tikzPaneSplitter), - "notify::position", - G_CALLBACK (graph_divider_position_changed_cb), - self); - g_signal_connect (G_OBJECT (tikzBuffer), - "changed", - G_CALLBACK (tikz_buffer_changed_cb), - self); - g_signal_connect (G_OBJECT (window), - "delete-event", - G_CALLBACK (main_window_delete_event_cb), - self); - g_signal_connect (G_OBJECT (window), - "destroy", - G_CALLBACK (main_window_destroy_cb), - self); - g_signal_connect (G_OBJECT (window), - "configure-event", - G_CALLBACK (main_window_configure_event_cb), - self); -} -@end - -// }}} -// {{{ Private - -@implementation Window (Private) - -- (BOOL) _askCanClose { - if ([document hasUnsavedChanges]) { - GtkWidget *dialog = gtk_message_dialog_new (window, - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_QUESTION, - GTK_BUTTONS_NONE, - "Save changes to the document \"%s\" before closing?", - [[document name] UTF8String]); - gtk_dialog_add_buttons (GTK_DIALOG (dialog), - "Save", GTK_RESPONSE_YES, - "Don't save", GTK_RESPONSE_NO, - "Cancel", GTK_RESPONSE_CANCEL, - NULL); - gint result = gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - if (result == GTK_RESPONSE_YES) { - return [self saveActiveDocument]; - } else { - return result == GTK_RESPONSE_NO; - } - } else { - return YES; - } -} - -- (TikzDocument*) _openDocument:(NSString*)path { - NSError *error = nil; - TikzDocument *d = [TikzDocument documentFromFile:path - styleManager:[app styleManager] - error:&error]; - if (d != nil) { - return d; - } else { - if ([error code] == TZ_ERR_PARSE) { - [self presentError:error withMessage:@"Invalid file"]; - } else { - [self presentError:error withMessage:@"Could not open file"]; - } - [[RecentManager defaultManager] removeRecentFile:path]; - return nil; - } -} - -- (void) _placeGraphOnClipboard:(Graph*)graph { - GtkClipboard *clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); - - static const GtkTargetEntry targets[] = { - { "TIKZITPICTURE", 0, TARGET_TIKZIT_PICTURE }, - { "UTF8_STRING", 0, TARGET_UTF8_STRING } }; - - gtk_clipboard_set_with_data (clipboard, - targets, G_N_ELEMENTS (targets), - clipboard_provide_data, - clipboard_release_data, - clipboard_graph_data_new (graph)); -} - -- (void) _clearParseError { - if (!hasParseError) - return; - gtk_statusbar_pop (statusBar, ParseStatus); - text_buffer_clear_tag (tikzBuffer, errorHighlightTag); - widget_clear_error (tikzPane); - hasParseError = NO; -} - -- (void) _setParseError:(NSError*)error { - if (!hasParseError) { - widget_set_error (tikzPane); - hasParseError = YES; - } - NSString *message = [NSString stringWithFormat:@"Parse error: %@", [error localizedDescription]]; - gtk_statusbar_pop (statusBar, ParseStatus); - gtk_statusbar_push (statusBar, ParseStatus, [message UTF8String]); - - text_buffer_clear_tag (tikzBuffer, errorHighlightTag); - - NSDictionary *errorInfo = [error userInfo]; - if ([errorInfo objectForKey:@"startLine"] != nil) { - GtkTextIter symbolStart; - GtkTextIter symbolEnd; - gtk_text_buffer_get_iter_at_line_index (tikzBuffer, &symbolStart, - [[errorInfo objectForKey:@"startLine"] intValue] - 1, - [[errorInfo objectForKey:@"startColumn"] intValue] - 1); - gtk_text_buffer_get_iter_at_line_index (tikzBuffer, &symbolEnd, - [[errorInfo objectForKey:@"endLine"] intValue] - 1, - [[errorInfo objectForKey:@"endColumn"] intValue]); - gtk_text_buffer_apply_tag (tikzBuffer, errorHighlightTag, - &symbolStart, &symbolEnd); - } -} - -- (void) _updateUndoActions { - [menu setUndoActionEnabled:[document canUndo]]; - [menu setUndoActionDetail:[document undoName]]; - - [menu setRedoActionEnabled:[document canRedo]]; - [menu setRedoActionDetail:[document redoName]]; -} - -- (void) _updateTitle { - NSString *title = [NSString stringWithFormat:@"TikZiT - %@%s", - [document name], - ([document hasUnsavedChanges] ? "*" : "")]; - gtk_window_set_title(window, [title UTF8String]); -} - -- (void) _updateStatus { - // FIXME: show tooltips or something instead - GString *buffer = g_string_sized_new (30); - gchar *nextNode = 0; - - for (Node *n in [[document pickSupport] selectedNodes]) { - if (nextNode) { - if (buffer->len == 0) { - g_string_printf(buffer, "Nodes %s", nextNode); - } else { - g_string_append_printf(buffer, ", %s", nextNode); - } - } - nextNode = (gchar *)[[n name] UTF8String]; - } - if (nextNode) { - if (buffer->len == 0) { - g_string_printf(buffer, "Node %s is selected", nextNode); - } else { - g_string_append_printf(buffer, " and %s are selected", nextNode); - } - } - - if (buffer->len == 0) { - int nrNodes = [[[document graph] nodes] count]; - int nrEdges = [[[document graph] edges] count]; - g_string_printf(buffer, "Graph has %d node%s and %d edge%s", - nrNodes, - nrNodes!=1 ? "s" : "", - nrEdges, - nrEdges!=1 ? "s" : ""); - } - gtk_statusbar_pop(statusBar, GraphInfoStatus); - gtk_statusbar_push(statusBar, GraphInfoStatus, buffer->str); - - g_string_free (buffer, TRUE); -} - -- (void) _updateTikz { - if (document != nil && !suppressTikzUpdates) { - suppressTikzUpdates = TRUE; - - if (document != nil) { - const char *tikzString = [[document tikz] UTF8String]; - gtk_text_buffer_set_text (tikzBuffer, tikzString, -1); - } else { - gtk_text_buffer_set_text (tikzBuffer, "", -1); - } - [self _clearParseError]; - - suppressTikzUpdates = FALSE; - } -} - -- (GraphEditorPanel*) _graphPanel { - return graphPanel; -} - -- (void) showPreview { - [self updatePreview]; -} - -@end - -// }}} -// {{{ GTK+ callbacks - -static void window_toplevel_focus_changed_cb (GObject *gobject, GParamSpec *pspec, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - gboolean hasfocus; - g_object_get (gobject, "has-toplevel-focus", &hasfocus, NULL); - if (hasfocus) { - [[NSNotificationCenter defaultCenter] - postNotificationName:@"WindowGainedFocus" - object:window]; - [[window _graphPanel] grabTool]; - } else { - [[NSNotificationCenter defaultCenter] - postNotificationName:@"WindowLostFocus" - object:window]; - } - [pool drain]; -} - -static void graph_divider_position_changed_cb (GObject *gobject, GParamSpec *pspec, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - gint position; - g_object_get (gobject, "position", &position, NULL); - [window graphHeightChanged:position]; - [pool drain]; -} - -static void tikz_buffer_changed_cb (GtkTextBuffer *buffer, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window tikzBufferChanged]; - [pool drain]; -} - -static gboolean main_window_delete_event_cb (GtkWidget *widget, GdkEvent *event, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window close]; - [pool drain]; - return TRUE; -} - -static void main_window_destroy_cb (GtkWidget *widget, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [[NSNotificationCenter defaultCenter] postNotificationName:@"WindowClosed" - object:window]; - [pool drain]; -} - -static gboolean main_window_configure_event_cb (GtkWidget *widget, GdkEventConfigure *event, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window windowSizeChangedWidth:event->width height:event->height]; - [pool drain]; - return FALSE; -} - -static void clipboard_provide_data (GtkClipboard *clipboard, - GtkSelectionData *selection_data, - guint info, - gpointer clipboard_graph_data) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - ClipboardGraphData *data = (ClipboardGraphData*)clipboard_graph_data; - if (info == TARGET_UTF8_STRING || info == TARGET_TIKZIT_PICTURE) { - clipboard_graph_data_convert (data); - GdkAtom target = (info == TARGET_UTF8_STRING) ? utf8_atom : tikzit_picture_atom; - gtk_selection_data_set (selection_data, - target, - 8*sizeof(gchar), - (guchar*)data->tikz, - data->tikz_length); - } - - [pool drain]; -} - -static void clipboard_release_data (GtkClipboard *clipboard, gpointer data) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - clipboard_graph_data_free ((ClipboardGraphData*)data); - [pool drain]; -} - -static void clipboard_check_targets (GtkClipboard *clipboard, - GdkAtom *atoms, - gint n_atoms, - gpointer action) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - gboolean found = FALSE; - for (gint i = 0; i < n_atoms; ++i) { - if (atoms[i] == tikzit_picture_atom) { - found = TRUE; - break; - } - } - gtk_action_set_sensitive (GTK_ACTION (action), found); - - [pool drain]; -} - -static void update_paste_action (GtkClipboard *clipboard, GdkEvent *event, GtkAction *action) { - gtk_action_set_sensitive (action, FALSE); - gtk_clipboard_request_targets (clipboard, clipboard_check_targets, action); -} - -static void clipboard_paste_contents (GtkClipboard *clipboard, - GtkSelectionData *selection_data, - gpointer document) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - TikzDocument *doc = (TikzDocument*)document; - gint length = gtk_selection_data_get_length (selection_data); - if (length >= 0) { - const guchar *raw_data = gtk_selection_data_get_data (selection_data); - gchar *data = g_new (gchar, length+1); - g_strlcpy (data, (const gchar *)raw_data, length+1); - NSString *tikz = [NSString stringWithUTF8String:data]; - if (tikz != nil) { - [doc pasteFromTikz:tikz]; - } - g_free (data); - } - - [pool drain]; -} - -// }}} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit/src/gtk/cairo_helpers.h b/tikzit/src/gtk/cairo_helpers.h deleted file mode 100644 index e95357b..0000000 --- a/tikzit/src/gtk/cairo_helpers.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "RColor.h" -#import - -void cairo_ns_rectangle (cairo_t* cr, NSRect rect); -void cairo_set_source_rcolor (cairo_t* cr, RColor color); - -// vim:ft=objc:sts=4:sw=4:et diff --git a/tikzit/src/gtk/cairo_helpers.m b/tikzit/src/gtk/cairo_helpers.m deleted file mode 100644 index 104e686..0000000 --- a/tikzit/src/gtk/cairo_helpers.m +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "cairo_helpers.h" - -void cairo_ns_rectangle (cairo_t* cr, NSRect rect) { - cairo_rectangle (cr, rect.origin.x, rect.origin.y, rect.size.width, rect.size.height); -} - -void cairo_set_source_rcolor (cairo_t* cr, RColor color) { - cairo_set_source_rgba (cr, color.red, color.green, color.blue, color.alpha); -} - -// vim:ft=objc:sts=4:sw=4:et diff --git a/tikzit/src/gtk/clipboard.h b/tikzit/src/gtk/clipboard.h deleted file mode 100644 index 568fc50..0000000 --- a/tikzit/src/gtk/clipboard.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import -#import - -enum { - TARGET_UTF8_STRING, - TARGET_TIKZIT_PICTURE -}; -typedef struct -{ - Graph *graph; - gchar *tikz; - gint tikz_length; -} ClipboardGraphData; - -extern GdkAtom utf8_atom; -extern GdkAtom tikzit_picture_atom; - -void clipboard_init (); -ClipboardGraphData *clipboard_graph_data_new (Graph *graph); -void clipboard_graph_data_free (ClipboardGraphData *data); -void clipboard_graph_data_convert (ClipboardGraphData *data); - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit/src/gtk/clipboard.m b/tikzit/src/gtk/clipboard.m deleted file mode 100644 index 7001717..0000000 --- a/tikzit/src/gtk/clipboard.m +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "clipboard.h" - -GdkAtom utf8_atom; -GdkAtom tikzit_picture_atom; - -void clipboard_init () { - if (utf8_atom == GDK_NONE) { - utf8_atom = gdk_atom_intern ("UTF8_STRING", FALSE); - } - if (tikzit_picture_atom == GDK_NONE) { - tikzit_picture_atom = gdk_atom_intern ("TIKZITPICTURE", FALSE); - } -} - -ClipboardGraphData *clipboard_graph_data_new (Graph *graph) { - ClipboardGraphData *data = g_new (ClipboardGraphData, 1); - data->graph = [graph retain]; - data->tikz = NULL; - data->tikz_length = 0; - return data; -} - -void clipboard_graph_data_free (ClipboardGraphData *data) { - [data->graph release]; - if (data->tikz) { - g_free (data->tikz); - } - g_free (data); -} - -void clipboard_graph_data_convert (ClipboardGraphData *data) { - if (data->graph != nil && !data->tikz) { - data->tikz = g_strdup ([[data->graph tikz] UTF8String]); - data->tikz_length = strlen (data->tikz); - [data->graph release]; - data->graph = nil; - } -} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit/src/gtk/gtkhelpers.h b/tikzit/src/gtk/gtkhelpers.h deleted file mode 100644 index e4b79b8..0000000 --- a/tikzit/src/gtk/gtkhelpers.h +++ /dev/null @@ -1,60 +0,0 @@ -// -// gtkhelpers.h -// TikZiT -// -// Copyright 2010 Alex Merry. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// -#import "TZFoundation.h" -#include -#import - -/** - * Releases the Objective-C object pointed to by data - * - * Intended for use as a cleanup function in Glib/GObject-based - * code. - */ -void release_obj (gpointer data); - -NSString * gtk_editable_get_string (GtkEditable *editable, gint start, gint end); - -GdkRectangle gdk_rectangle_from_ns_rect (NSRect rect); -NSRect gdk_rectangle_to_ns_rect (GdkRectangle rect); - -void gtk_action_set_detailed_label (GtkAction *action, const gchar *baseLabel, const gchar *actionName); - -gint tz_hijack_key_press (GtkWindow *win, - GdkEventKey *event, - gpointer user_data); - -// Equivalent of GTK+3's gdk_pixbuf_get_from_surface() -GdkPixbuf * pixbuf_get_from_surface(cairo_surface_t *surface); - -void tz_restore_window (GtkWindow *window, gint x, gint y, gint w, gint h); - -void label_set_bold (GtkLabel *label); - -void widget_set_error (GtkWidget *widget); -void widget_clear_error (GtkWidget *widget); - -void text_buffer_clear_tag (GtkTextBuffer *buffer, GtkTextTag *tag); - -void utility_window_attach (GtkWindow *util_win, GtkWindow *parent_win); - -// vim:ft=objc:sts=2:sw=2:et diff --git a/tikzit/src/gtk/gtkhelpers.m b/tikzit/src/gtk/gtkhelpers.m deleted file mode 100644 index 9d26af5..0000000 --- a/tikzit/src/gtk/gtkhelpers.m +++ /dev/null @@ -1,275 +0,0 @@ -// -// gtkhelpers.h -// TikZiT -// -// Copyright 2010 Alex Merry. All rights reserved. -// -// Some code from Glade: -// Copyright 2001 Ximian, Inc. -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// -#import "gtkhelpers.h" -#import - -void release_obj (gpointer data) { - id obj = (id)data; - [obj release]; -} - -NSString * gtk_editable_get_string (GtkEditable *editable, gint start, gint end) -{ - gchar *text = gtk_editable_get_chars (editable, start, end); - NSString *string = [NSString stringWithUTF8String:text]; - g_free (text); - return string; -} - -GdkRectangle gdk_rectangle_from_ns_rect (NSRect box) { - GdkRectangle rect; - rect.x = box.origin.x; - rect.y = box.origin.y; - rect.width = box.size.width; - rect.height = box.size.height; - return rect; -} - -NSRect gdk_rectangle_to_ns_rect (GdkRectangle rect) { - NSRect result; - result.origin.x = rect.x; - result.origin.y = rect.y; - result.size.width = rect.width; - result.size.height = rect.height; - return result; -} - -void gtk_action_set_detailed_label (GtkAction *action, const gchar *baseLabel, const gchar *actionName) { - if (actionName == NULL || *actionName == '\0') { - gtk_action_set_label (action, baseLabel); - } else { - GString *label = g_string_sized_new (30); - g_string_printf(label, "%s: %s", baseLabel, actionName); - gtk_action_set_label (action, label->str); - g_string_free (label, TRUE); - } -} - -/** - * tz_hijack_key_press: - * @win: a #GtkWindow - * event: the GdkEventKey - * user_data: unused - * - * This function is meant to be attached to key-press-event of a toplevel, - * it simply allows the window contents to treat key events /before/ - * accelerator keys come into play (this way widgets dont get deleted - * when cutting text in an entry etc.). - * - * Returns: whether the event was handled - */ -gint -tz_hijack_key_press (GtkWindow *win, - GdkEventKey *event, - gpointer user_data) -{ - GtkWidget *focus_widget; - - focus_widget = gtk_window_get_focus (win); - if (focus_widget && - (event->keyval == GDK_Delete || /* Filter Delete from accelerator keys */ - ((event->state & GDK_CONTROL_MASK) && /* CTRL keys... */ - ((event->keyval == GDK_c || event->keyval == GDK_C) || /* CTRL-C (copy) */ - (event->keyval == GDK_x || event->keyval == GDK_X) || /* CTRL-X (cut) */ - (event->keyval == GDK_v || event->keyval == GDK_V) || /* CTRL-V (paste) */ - (event->keyval == GDK_a || event->keyval == GDK_A) || /* CTRL-A (select-all) */ - (event->keyval == GDK_n || event->keyval == GDK_N))))) /* CTRL-N (new document) ?? */ - { - return gtk_widget_event (focus_widget, - (GdkEvent *)event); - } - return FALSE; -} - -GdkPixbuf * pixbuf_get_from_surface(cairo_surface_t *surface) { - cairo_surface_flush (surface); - - int width = cairo_image_surface_get_width (surface); - int height = cairo_image_surface_get_height (surface); - int stride = cairo_image_surface_get_stride (surface); - unsigned char *data = cairo_image_surface_get_data (surface); - - GdkPixbuf *pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, - TRUE, - 8, - width, - height); - unsigned char *pbdata = gdk_pixbuf_get_pixels (pixbuf); - int pbstride = gdk_pixbuf_get_rowstride (pixbuf); - - for (int y = 0; y < height; ++y) { - uint32_t *line = (uint32_t*)(data + y*stride); - unsigned char *pbline = pbdata + (y*pbstride); - for (int x = 0; x < width; ++x) { - uint32_t pixel = *(line + x); - unsigned char *pbpixel = pbline + (x*4); - // NB: We should un-pre-mult the alpha here. - // However, in our world, alpha is always - // on or off, so it doesn't really matter - pbpixel[3] = ((pixel & 0xff000000) >> 24); - pbpixel[0] = ((pixel & 0x00ff0000) >> 16); - pbpixel[1] = ((pixel & 0x0000ff00) >> 8); - pbpixel[2] = (pixel & 0x000000ff); - } - } - - return pixbuf; -} - -/* This function mostly lifted from - * gtk+/gdk/gdkscreen.c:gdk_screen_get_monitor_at_window() - */ -static gint -get_appropriate_monitor (GdkScreen *screen, - gint x, - gint y, - gint w, - gint h) -{ - GdkRectangle rect; - gint area = 0; - gint monitor = -1; - gint num_monitors; - gint i; - - rect.x = x; - rect.y = y; - rect.width = w; - rect.height = h; - - num_monitors = gdk_screen_get_n_monitors (screen); - - for (i = 0; i < num_monitors; i++) - { - GdkRectangle geometry; - - gdk_screen_get_monitor_geometry (screen, i, &geometry); - - if (gdk_rectangle_intersect (&rect, &geometry, &geometry) && - geometry.width * geometry.height > area) - { - area = geometry.width * geometry.height; - monitor = i; - } - } - - if (monitor >= 0) - return monitor; - else - return gdk_screen_get_monitor_at_point (screen, - rect.x + rect.width / 2, - rect.y + rect.height / 2); -} - -/* This function mostly lifted from gimp_session_info_apply_geometry - * in gimp-2.6/app/widgets/gimpsessioninfo.c - */ -void tz_restore_window (GtkWindow *window, gint x, gint y, gint w, gint h) -{ - gint forced_w = w; - gint forced_h = h; - if (w <= 0 || h <= 0) { - gtk_window_get_default_size (window, &w, &h); - } - if (w <= 0 || h <= 0) { - gtk_window_get_size (window, &w, &h); - } - - GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET (window)); - - gint monitor = 0; - if (w > 0 && h > 0) { - monitor = get_appropriate_monitor (screen, x, y, w, h); - } else { - monitor = gdk_screen_get_monitor_at_point (screen, x, y); - } - - GdkRectangle rect; - gdk_screen_get_monitor_geometry (screen, monitor, &rect); - - x = CLAMP (x, - rect.x, - rect.x + rect.width - (w > 0 ? w : 128)); - y = CLAMP (y, - rect.y, - rect.y + rect.height - (h > 0 ? h : 128)); - - gchar geom[32]; - g_snprintf (geom, sizeof (geom), "%+d%+d", x, y); - - gtk_window_parse_geometry (window, geom); - - if (forced_w > 0 && forced_h > 0) { - gtk_window_set_default_size (window, forced_w, forced_h); - } -} - -void label_set_bold (GtkLabel *label) { - PangoAttrList *attrs = pango_attr_list_new (); - pango_attr_list_insert (attrs, - pango_attr_weight_new (PANGO_WEIGHT_SEMIBOLD)); - gtk_label_set_attributes (label, attrs); - pango_attr_list_unref (attrs); -} - -void widget_set_error (GtkWidget *widget) { - GdkColor color = {0, 65535, 61184, 61184}; - gtk_widget_modify_base (widget, GTK_STATE_NORMAL, &color); -} - -void widget_clear_error (GtkWidget *widget) { - gtk_widget_modify_base (widget, GTK_STATE_NORMAL, NULL); -} - -void text_buffer_clear_tag (GtkTextBuffer *buffer, GtkTextTag *tag) { - GtkTextIter start; - GtkTextIter end; - gtk_text_buffer_get_start_iter (buffer, &start); - gtk_text_buffer_get_end_iter (buffer, &end); - gtk_text_buffer_remove_tag (buffer, tag, &start, &end); -} - -void utility_window_attach (GtkWindow *util_win, GtkWindow *parent_win) { - if (parent_win == gtk_window_get_transient_for (util_win)) - return; - - // HACK: X window managers tend to move windows around when they are - // unmapped and mapped again, so we save the position - gint x, y; - gtk_window_get_position (util_win, &x, &y); - - // HACK: Altering WM_TRANSIENT_FOR on a non-hidden but unmapped window - // (eg: when you have minimised the original parent window) can - // cause the window to be lost forever, so we hide it first - gtk_widget_hide (GTK_WIDGET (util_win)); - gtk_window_set_focus_on_map (util_win, FALSE); - gtk_window_set_transient_for (util_win, parent_win); - gtk_widget_show (GTK_WIDGET (util_win)); - - // HACK: see above - gtk_window_move (util_win, x, y); -} - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/logo.h b/tikzit/src/gtk/logo.h deleted file mode 100644 index e778da9..0000000 --- a/tikzit/src/gtk/logo.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include - -typedef enum { - LOGO_SIZE_16, - LOGO_SIZE_24, - LOGO_SIZE_32, - LOGO_SIZE_48, - LOGO_SIZE_64, - LOGO_SIZE_128, - LOGO_SIZE_COUNT -} LogoSize; - -GdkPixbuf *get_logo (LogoSize size); - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/logo.m b/tikzit/src/gtk/logo.m deleted file mode 100644 index 57533c7..0000000 --- a/tikzit/src/gtk/logo.m +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "logo.h" -#include - -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wpointer-sign" -#import "logodata.m" -#pragma GCC diagnostic pop - -static GdkPixbuf *pixbufCache[LOGO_SIZE_COUNT]; - -GdkPixbuf *get_logo (LogoSize size) { - const GdkPixdata *data = NULL; - switch (size) { - case LOGO_SIZE_16: - data = &logo16; - break; - case LOGO_SIZE_24: - data = &logo24; - break; - case LOGO_SIZE_32: - data = &logo32; - break; - case LOGO_SIZE_48: - data = &logo48; - break; - case LOGO_SIZE_64: - data = &logo64; - break; - case LOGO_SIZE_128: - data = &logo128; - break; - default: - return NULL; - }; - if (pixbufCache[size]) { - g_object_ref (pixbufCache[size]); - return pixbufCache[size]; - } else { - GdkPixbuf *buf = gdk_pixbuf_from_pixdata (data, FALSE, NULL); - pixbufCache[size] = buf; - g_object_add_weak_pointer (G_OBJECT (buf), (void**)(&(pixbufCache[size]))); - return buf; - } -} - -// vim:ft=objc:ts=8:et:sts=4:sw=4 - diff --git a/tikzit/src/gtk/main.m b/tikzit/src/gtk/main.m deleted file mode 100644 index 5d9f4a4..0000000 --- a/tikzit/src/gtk/main.m +++ /dev/null @@ -1,111 +0,0 @@ -// -// main.m -// TikZiT -// -// Copyright 2010 Chris Heunen. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "TZFoundation.h" -#import -#import "clipboard.h" -#import "logo.h" -#import "tzstockitems.h" - -#import "Application.h" - -static GOptionEntry entries[] = -{ - //{ "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose, "Be verbose", NULL }, - { NULL } -}; - -void onUncaughtException(NSException* exception) -{ - NSString *joinStr = @"\n "; - NSLog(@"uncaught exception: %@\n backtrace: %@", - [exception description], - [[exception callStackSymbols] componentsJoinedByString:joinStr]); -} - -int main (int argc, char *argv[]) { - NSSetUncaughtExceptionHandler(&onUncaughtException); - - [[NSAutoreleasePool alloc] init]; - - GError *error = NULL; - GOptionContext *context; - context = g_option_context_new ("[FILES] - PGF/TikZ-based graph editor"); - g_option_context_add_main_entries (context, entries, NULL); - g_option_context_add_group (context, gtk_get_option_group (TRUE)); - if (!g_option_context_parse (context, &argc, &argv, &error)) - { - if (error->domain == G_OPTION_ERROR) { - g_print ("%s\nUse --help to see available options\n", error->message); - } else { - g_print ("Unexpected error parsing options: %s\n", error->message); - } - exit (1); - } - g_option_context_free (context); - -#ifndef WINDOWS - GList *icon_list = NULL; - icon_list = g_list_prepend (icon_list, get_logo(LOGO_SIZE_128)); - icon_list = g_list_prepend (icon_list, get_logo(LOGO_SIZE_64)); - icon_list = g_list_prepend (icon_list, get_logo(LOGO_SIZE_48)); - icon_list = g_list_prepend (icon_list, get_logo(LOGO_SIZE_32)); - icon_list = g_list_prepend (icon_list, get_logo(LOGO_SIZE_24)); - icon_list = g_list_prepend (icon_list, get_logo(LOGO_SIZE_16)); - gtk_window_set_default_icon_list (icon_list); - GList *list_head = icon_list; - while (list_head) { - g_object_unref ((GObject*)list_head->data); - list_head = list_head->next; - } -#endif - - NSAutoreleasePool *initPool = [[NSAutoreleasePool alloc] init]; - - tz_register_stock_items(); - clipboard_init(); - - Application *app = nil; - if (argc > 1) { - NSMutableArray *files = [NSMutableArray arrayWithCapacity:argc-1]; - for (int i = 1; i < argc; ++i) { - [files insertObject:[NSString stringWithGlibFilename:argv[i]] - atIndex:i-1]; - } - NSLog(@"Files: %@", files); - app = [[Application alloc] initWithFiles:files]; - } else { - app = [[Application alloc] init]; - } - - [initPool drain]; - - gtk_main (); - - [app saveConfiguration]; - [app release]; - - return 0; -} - -// vim:ft=objc:et:sts=4:sw=4 diff --git a/tikzit/src/gtk/mkdtemp.h b/tikzit/src/gtk/mkdtemp.h deleted file mode 100644 index 65ee99e..0000000 --- a/tikzit/src/gtk/mkdtemp.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Creating a private temporary directory. - Copyright (C) 2001-2002 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - -#if HAVE_MKDTEMP - -/* Get mkdtemp() declaration. */ -#include - -#else - -/* Create a unique temporary directory from TEMPLATE. - The last six characters of TEMPLATE must be "XXXXXX"; - they are replaced with a string that makes the directory name unique. - Returns TEMPLATE, or a null pointer if it cannot get a unique name. - The directory is created mode 700. */ -extern char * mkdtemp (char *template); - -#endif diff --git a/tikzit/src/gtk/mkdtemp.m b/tikzit/src/gtk/mkdtemp.m deleted file mode 100644 index ee3cd7c..0000000 --- a/tikzit/src/gtk/mkdtemp.m +++ /dev/null @@ -1,180 +0,0 @@ -/* Copyright (C) 1999, 2001-2003 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - see . - */ - -/* Extracted from misc/mkdtemp.c and sysdeps/posix/tempname.c. */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -/* Specification. */ -#include "mkdtemp.h" - -#include -#ifndef __set_errno -# define __set_errno(Val) errno = (Val) -#endif - -#include -#include -#include - -#include -#ifndef TMP_MAX -# define TMP_MAX 238328 -#endif - -#if HAVE_STDINT_H || _LIBC -# include -#endif -#if HAVE_INTTYPES_H -# include -#endif - -#if HAVE_UNISTD_H || _LIBC -# include -#endif - -#if HAVE_GETTIMEOFDAY || _LIBC -# if HAVE_SYS_TIME_H || _LIBC -# include -# endif -#else -# if HAVE_TIME_H || _LIBC -# include -# endif -#endif - -#include "stat.h" - -#ifdef __MINGW32__ -/* mingw's mkdir() function has 1 argument, but we pass 2 arguments. - Therefore we have to disable the argument count checking. */ -# define mkdir ((int (*)()) mkdir) -#endif - -#if !_LIBC -# define __getpid getpid -# define __gettimeofday gettimeofday -# define __mkdir mkdir -#endif - -/* Use the widest available unsigned type if uint64_t is not - available. The algorithm below extracts a number less than 62**6 - (approximately 2**35.725) from uint64_t, so ancient hosts where - uintmax_t is only 32 bits lose about 3.725 bits of randomness, - which is better than not having mkstemp at all. */ -#if !defined UINT64_MAX && !defined uint64_t -# define uint64_t uintmax_t -#endif - -/* These are the characters used in temporary filenames. */ -static const char letters[] = -"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; - -/* Generate a temporary file name based on TMPL. TMPL must match the - rules for mk[s]temp (i.e. end in "XXXXXX"). The name constructed - does not exist at the time of the call to __gen_tempname. TMPL is - overwritten with the result. - - KIND is: - __GT_DIR: create a directory, which will be mode 0700. - - We use a clever algorithm to get hard-to-predict names. */ -static int -gen_tempname (char *tmpl) -{ - int len; - char *XXXXXX; - static uint64_t value; - uint64_t random_time_bits; - int count, fd = -1; - int save_errno = errno; - - len = strlen (tmpl); - if (len < 6 || strcmp (&tmpl[len - 6], "XXXXXX")) - { - __set_errno (EINVAL); - return -1; - } - - /* This is where the Xs start. */ - XXXXXX = &tmpl[len - 6]; - - /* Get some more or less random data. */ -#ifdef RANDOM_BITS - RANDOM_BITS (random_time_bits); -#else -# if HAVE_GETTIMEOFDAY || _LIBC - { - struct timeval tv; - __gettimeofday (&tv, NULL); - random_time_bits = ((uint64_t) tv.tv_usec << 16) ^ tv.tv_sec; - } -# else - random_time_bits = time (NULL); -# endif -#endif - value += random_time_bits ^ __getpid (); - - for (count = 0; count < TMP_MAX; value += 7777, ++count) - { - uint64_t v = value; - - /* Fill in the random bits. */ - XXXXXX[0] = letters[v % 62]; - v /= 62; - XXXXXX[1] = letters[v % 62]; - v /= 62; - XXXXXX[2] = letters[v % 62]; - v /= 62; - XXXXXX[3] = letters[v % 62]; - v /= 62; - XXXXXX[4] = letters[v % 62]; - v /= 62; - XXXXXX[5] = letters[v % 62]; - - fd = __mkdir (tmpl, S_IRUSR | S_IWUSR | S_IXUSR); - - if (fd >= 0) - { - __set_errno (save_errno); - return fd; - } - else if (errno != EEXIST) - return -1; - } - - /* We got out of the loop because we ran out of combinations to try. */ - __set_errno (EEXIST); - return -1; -} - -/* Generate a unique temporary directory from TEMPLATE. - The last six characters of TEMPLATE must be "XXXXXX"; - they are replaced with a string that makes the filename unique. - The directory is created, mode 700, and its name is returned. - (This function comes from OpenBSD.) */ -char * -mkdtemp (char *template) -{ - if (gen_tempname (template)) - return NULL; - else - return template; -} diff --git a/tikzit/src/gtk/stat.h b/tikzit/src/gtk/stat.h deleted file mode 100644 index a9829ae..0000000 --- a/tikzit/src/gtk/stat.h +++ /dev/null @@ -1,25 +0,0 @@ -#include -#if STAT_MACROS_BROKEN -# undef S_ISDIR -#endif -#if !defined S_ISDIR && defined S_IFDIR -# define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR) -#endif -#if !S_IRUSR && S_IREAD -# define S_IRUSR S_IREAD -#endif -#if !S_IRUSR -# define S_IRUSR 00400 -#endif -#if !S_IWUSR && S_IWRITE -# define S_IWUSR S_IWRITE -#endif -#if !S_IWUSR -# define S_IWUSR 00200 -#endif -#if !S_IXUSR && S_IEXEC -# define S_IXUSR S_IEXEC -#endif -#if !S_IXUSR -# define S_IXUSR 00100 -#endif diff --git a/tikzit/src/gtk/test/gtk.m b/tikzit/src/gtk/test/gtk.m deleted file mode 100644 index aabb0f2..0000000 --- a/tikzit/src/gtk/test/gtk.m +++ /dev/null @@ -1,27 +0,0 @@ -// -// linux.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// -#import "test/test.h" - -void testGtk() { - -} diff --git a/tikzit/src/gtk/test/main.m b/tikzit/src/gtk/test/main.m deleted file mode 100644 index 639a335..0000000 --- a/tikzit/src/gtk/test/main.m +++ /dev/null @@ -1,50 +0,0 @@ -// -// main.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// -#include "config.h" -#import "test/test.h" -#include -void testCommon(); - -int main(int argc, char **argv) { - if (argc == 2 && strcmp(argv[1], "--disable-color")==0) { - setColorEnabled(NO); - } else { - setColorEnabled(YES); - } - - PUTS(@""); - PUTS(@"**********************************************"); - PUTS(@"TikZiT TESTS, LINUX VERSION %@", VERSION); - PUTS(@"**********************************************"); - PUTS(@""); - - startTests(); - testCommon(); - testLinux(); - - PUTS(@""); - PUTS(@"**********************************************"); - endTests(); - PUTS(@"**********************************************"); - PUTS(@""); -} diff --git a/tikzit/src/gtk/tzstockitems.h b/tikzit/src/gtk/tzstockitems.h deleted file mode 100644 index 5ad0da9..0000000 --- a/tikzit/src/gtk/tzstockitems.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#define TIKZIT_STOCK_SELECT "tikzit-select" -#define TIKZIT_STOCK_CREATE_NODE "tikzit-create-node" -#define TIKZIT_STOCK_CREATE_EDGE "tikzit-create-edge" -#define TIKZIT_STOCK_BOUNDING_BOX "tikzit-bounding-box" -#define TIKZIT_STOCK_DRAG "tikzit-drag" - -void tz_register_stock_items(); - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit/src/gtk/tzstockitems.m b/tikzit/src/gtk/tzstockitems.m deleted file mode 100644 index 5eba912..0000000 --- a/tikzit/src/gtk/tzstockitems.m +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "tzstockitems.h" -#include -#include - -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wpointer-sign" -#import "icondata.m" -#pragma GCC diagnostic pop - -static GtkStockItem stock_items[] = { - // gchar *stock_id; - // gchar *label; - // GdkModifierType modifier; - // guint keyval; - // gchar *translation_domain; - { TIKZIT_STOCK_SELECT, "Select", 0, 0, NULL }, - { TIKZIT_STOCK_CREATE_NODE, "Create Node", 0, 0, NULL }, - { TIKZIT_STOCK_CREATE_EDGE, "Create Edge", 0, 0, NULL }, - { TIKZIT_STOCK_BOUNDING_BOX, "Bounding Box", 0, 0, NULL }, - { TIKZIT_STOCK_DRAG, "Drag", 0, 0, NULL }, -}; -static guint n_stock_items = G_N_ELEMENTS (stock_items); - -static void icon_factory_add_pixdata (GtkIconFactory *factory, - const gchar *stock_id, - const GdkPixdata *image_data) { - - GdkPixbuf *buf = gdk_pixbuf_from_pixdata (image_data, FALSE, NULL); - GtkIconSet *icon_set = gtk_icon_set_new_from_pixbuf (buf); - gtk_icon_factory_add (factory, stock_id, icon_set); - gtk_icon_set_unref (icon_set); - g_object_unref (G_OBJECT (buf)); -} - -void tz_register_stock_items() { - gtk_stock_add_static (stock_items, n_stock_items); - - GtkIconFactory *factory = gtk_icon_factory_new (); - icon_factory_add_pixdata (factory, TIKZIT_STOCK_SELECT, &select_rectangular); - icon_factory_add_pixdata (factory, TIKZIT_STOCK_CREATE_NODE, &draw_ellipse); - icon_factory_add_pixdata (factory, TIKZIT_STOCK_CREATE_EDGE, &draw_path); - icon_factory_add_pixdata (factory, TIKZIT_STOCK_BOUNDING_BOX, &transform_crop_and_resize); - icon_factory_add_pixdata (factory, TIKZIT_STOCK_DRAG, &transform_move); - gtk_icon_factory_add_default (factory); -} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit/src/gtk/tztoolpalette.h b/tikzit/src/gtk/tztoolpalette.h deleted file mode 100644 index 45ec2ac..0000000 --- a/tikzit/src/gtk/tztoolpalette.h +++ /dev/null @@ -1,56 +0,0 @@ -/* GIMP - The GNU Image Manipulation Program - * Copyright (C) 1995 Spencer Kimball and Peter Mattis - * - * tztoolpalette.h, based on gimptoolpalette.h - * Copyright (C) 2010 Michael Natterer - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef __TZ_TOOL_PALETTE_H__ -#define __TZ_TOOL_PALETTE_H__ - - -#define TZ_TYPE_TOOL_PALETTE (tz_tool_palette_get_type ()) -#define TZ_TOOL_PALETTE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TZ_TYPE_TOOL_PALETTE, TzToolPalette)) -#define TZ_TOOL_PALETTE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TZ_TYPE_TOOL_PALETTE, TzToolPaletteClass)) -#define TZ_IS_TOOL_PALETTE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TZ_TYPE_TOOL_PALETTE)) -#define TZ_IS_TOOL_PALETTE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TZ_TYPE_TOOL_PALETTE)) -#define TZ_TOOL_PALETTE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TZ_TYPE_TOOL_PALETTE, TzToolPaletteClass)) - - -typedef struct _TzToolPaletteClass TzToolPaletteClass; -typedef struct _TzToolPalette TzToolPalette; - -struct _TzToolPalette -{ - GtkToolPalette parent_instance; -}; - -struct _TzToolPaletteClass -{ - GtkToolPaletteClass parent_class; -}; - - -GType tz_tool_palette_get_type (void) G_GNUC_CONST; - -GtkWidget * tz_tool_palette_new (void); - -gboolean tz_tool_palette_get_button_size (TzToolPalette *widget, - gint *width, - gint *height); - - -#endif /* __TZ_TOOL_PALETTE_H__ */ diff --git a/tikzit/src/gtk/tztoolpalette.m b/tikzit/src/gtk/tztoolpalette.m deleted file mode 100644 index a948127..0000000 --- a/tikzit/src/gtk/tztoolpalette.m +++ /dev/null @@ -1,158 +0,0 @@ -/* GIMP - The GNU Image Manipulation Program - * Copyright (C) 1995 Spencer Kimball and Peter Mattis - * - * tztoolpalette.c, based on gimptoolpalette.c - * Copyright (C) 2010 Michael Natterer - * Copyright (C) 2012 Alex Merry - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include - -#include "tztoolpalette.h" - - -#define DEFAULT_TOOL_ICON_SIZE GTK_ICON_SIZE_BUTTON -#define DEFAULT_BUTTON_RELIEF GTK_RELIEF_NONE - -#define TOOL_BUTTON_DATA_KEY "tz-tool-palette-item" -#define TOOL_INFO_DATA_KEY "tz-tool-info" - - -typedef struct _TzToolPalettePrivate TzToolPalettePrivate; - -struct _TzToolPalettePrivate -{ - gint tool_rows; - gint tool_columns; -}; - -#define GET_PRIVATE(p) G_TYPE_INSTANCE_GET_PRIVATE (p, \ - TZ_TYPE_TOOL_PALETTE, \ - TzToolPalettePrivate) - - -static void tz_tool_palette_size_allocate (GtkWidget *widget, - GtkAllocation *allocation); - - -G_DEFINE_TYPE (TzToolPalette, tz_tool_palette, GTK_TYPE_TOOL_PALETTE) - -#define parent_class tz_tool_palette_parent_class - - -static void -tz_tool_palette_class_init (TzToolPaletteClass *klass) -{ - GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); - - widget_class->size_allocate = tz_tool_palette_size_allocate; - - g_type_class_add_private (klass, sizeof (TzToolPalettePrivate)); -} - -static void -tz_tool_palette_init (TzToolPalette *palette) -{ -} - -static GtkToolItemGroup * -tz_tool_palette_tool_group (TzToolPalette *palette) -{ - GList *children; - GtkToolItemGroup *group; - - children = gtk_container_get_children (GTK_CONTAINER (palette)); - g_return_val_if_fail (children, NULL); - group = GTK_TOOL_ITEM_GROUP (children->data); - g_list_free (children); - - return group; -} - -gboolean -tz_tool_palette_get_button_size (TzToolPalette *palette, - gint *width, - gint *height) -{ - g_return_val_if_fail (width || height, FALSE); - - GtkToolItemGroup *group = tz_tool_palette_tool_group (palette); - g_return_val_if_fail (group, FALSE); - - guint tool_count = gtk_tool_item_group_get_n_items (group); - if (tool_count > 0) - { - GtkWidget *tool_button; - GtkRequisition button_requisition; - - tool_button = GTK_WIDGET (gtk_tool_item_group_get_nth_item (group, 0)); - gtk_widget_size_request (tool_button, &button_requisition); - if (width) - *width = button_requisition.width; - if (height) - *height = button_requisition.height; - return TRUE; - } - return FALSE; -} - -static void -tz_tool_palette_size_allocate (GtkWidget *widget, - GtkAllocation *allocation) -{ - TzToolPalettePrivate *private = GET_PRIVATE (widget); - GtkToolItemGroup *group = tz_tool_palette_tool_group (TZ_TOOL_PALETTE (widget)); - - g_return_if_fail (group); - - GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation); - - guint tool_count = gtk_tool_item_group_get_n_items (group); - if (tool_count > 0) - { - GtkWidget *tool_button; - GtkRequisition button_requisition; - gint tool_rows; - gint tool_columns; - - tool_button = GTK_WIDGET (gtk_tool_item_group_get_nth_item (group, 0)); - gtk_widget_size_request (tool_button, &button_requisition); - - tool_columns = MAX (1, (allocation->width / button_requisition.width)); - tool_rows = tool_count / tool_columns; - - if (tool_count % tool_columns) - tool_rows++; - - if (private->tool_rows != tool_rows || - private->tool_columns != tool_columns) - { - private->tool_rows = tool_rows; - private->tool_columns = tool_columns; - - gtk_widget_set_size_request (widget, -1, - tool_rows * button_requisition.height); - } - } -} - -GtkWidget * -tz_tool_palette_new (void) -{ - return g_object_new (TZ_TYPE_TOOL_PALETTE, NULL); -} - -// vim:ft=objc:ts=8:et:sts=2:sw=2:foldmethod=marker diff --git a/tikzit/src/osx/AppDelegate.h b/tikzit/src/osx/AppDelegate.h deleted file mode 100644 index 92d9add..0000000 --- a/tikzit/src/osx/AppDelegate.h +++ /dev/null @@ -1,57 +0,0 @@ -// -// AppDelegate.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "StylePaletteController.h" -#import "ToolPaletteController.h" -#import "PropertyInspectorController.h" -#import "PreambleController.h" -#import "PreviewController.h" -#import "GraphicsView.h" -#import "PreferenceController.h" - -@interface AppDelegate : NSObject { - NSMapTable *table; - StylePaletteController *stylePaletteController; - PropertyInspectorController *propertyInspectorController; - PreambleController *preambleController; - PreviewController *previewController; - PreferenceController *preferenceController; - ToolPaletteController *toolPaletteController; - IBOutlet GraphicsView *graphicsView; - NSString *tempDir; -} - -@property IBOutlet StylePaletteController *stylePaletteController; -@property (strong) IBOutlet ToolPaletteController *toolPaletteController; - -- (void)awakeFromNib; -+ (void)setDefaults; -- (void)applicationWillTerminate:(NSNotification *)notification; -- (IBAction)toggleStyleInspector:(id)sender; -- (IBAction)togglePropertyInspector:(id)sender; -- (IBAction)togglePreamble:(id)sender; -- (IBAction)togglePreferences:(id)sender; -- (IBAction)refreshShapes:(id)sender; - -@end diff --git a/tikzit/src/osx/AppDelegate.m b/tikzit/src/osx/AppDelegate.m deleted file mode 100644 index 94f5507..0000000 --- a/tikzit/src/osx/AppDelegate.m +++ /dev/null @@ -1,124 +0,0 @@ -// -// AppDelegate.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "AppDelegate.h" -#import "TikzDocument.h" -#import "Shape.h" -#import "SupportDir.h" - -@implementation AppDelegate - -@synthesize stylePaletteController, toolPaletteController; - -+(void)initialize{ - [self setDefaults]; -} - -- (void)awakeFromNib { - [SupportDir createUserSupportDir]; - NSString *supportDir = [SupportDir userSupportDir]; - //NSLog(stylePlist); - stylePaletteController = - [[StylePaletteController alloc] initWithWindowNibName:@"StylePalette" - supportDir:supportDir]; - - propertyInspectorController = - [[PropertyInspectorController alloc] initWithWindowNibName:@"PropertyInspector"]; - - [propertyInspectorController setStylePaletteController:stylePaletteController]; - - NSString *preamblePlist = [supportDir stringByAppendingPathComponent:@"preambles.plist"]; - preambleController = - [[PreambleController alloc] initWithNibName:@"Preamble" - plist:preamblePlist - styles:[stylePaletteController nodeStyles] - edges:[stylePaletteController edgeStyles]]; - - - char template[] = "/tmp/tikzit_tmp_XXXXXXX"; - char *dir = mkdtemp(template); - tempDir = [NSString stringWithUTF8String:dir]; - - NSLog(@"created temp dir: %@", tempDir); - NSLog(@"system support dir: %@", [SupportDir systemSupportDir]); - - previewController = - [[PreviewController alloc] initWithWindowNibName:@"Preview" - preambleController:preambleController - tempDir:tempDir]; - - preferenceController = [[PreferenceController alloc] initWithWindowNibName:@"Preferences" preambleController:preambleController]; - - // each application has one global preview controller - [PreviewController setDefaultPreviewController:previewController]; -} - -+ (void)setDefaults{ - NSString *userDefaultsValuesPath; - NSDictionary *userDefaultsValuesDict; - - userDefaultsValuesPath=[[NSBundle mainBundle] pathForResource:@"UserDefaults" - ofType:@"plist"]; - userDefaultsValuesDict=[NSDictionary dictionaryWithContentsOfFile:userDefaultsValuesPath]; - - [[NSUserDefaults standardUserDefaults] registerDefaults:userDefaultsValuesDict]; -} - -- (void)applicationWillTerminate:(NSNotification *)notification { - NSString *supportDir = [SupportDir userSupportDir]; - [stylePaletteController saveStyles:supportDir]; - [preambleController savePreambles:[supportDir stringByAppendingPathComponent:@"preambles.plist"]]; - - NSLog(@"wiping temp dir: %@", tempDir); - [[NSFileManager defaultManager] removeItemAtPath:tempDir error:NULL]; -} - -- (void)toggleController:(NSWindowController*)c { - if ([[c window] isVisible]) { - [c close]; - } else { - [c showWindow:self]; - } -} - -- (IBAction)toggleStyleInspector:(id)sender { - [self toggleController:stylePaletteController]; -} - -- (IBAction)togglePropertyInspector:(id)sender { - [self toggleController:propertyInspectorController]; -} - -- (IBAction)togglePreamble:(id)sender { - [self toggleController:(NSWindowController *) preambleController]; -} - -- (IBAction)togglePreferences:(id)sender { - [self toggleController:preferenceController]; -} - -- (IBAction)refreshShapes:(id)sender { - [Shape refreshShapeDictionary]; -} - -@end diff --git a/tikzit/src/osx/CALayer+DrawLabel.h b/tikzit/src/osx/CALayer+DrawLabel.h deleted file mode 100644 index 32282d9..0000000 --- a/tikzit/src/osx/CALayer+DrawLabel.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// CALayer+DrawLabel.h -// TikZiT -// -// Created by Aleks Kissinger on 09/05/2011. -// Copyright 2011 Aleks Kissinger. All rights reserved. -// - -#import -#import - -@class Transformer; - -@interface CALayer(DrawLabel) - -- (void)drawLabel:(NSString*)label - atPoint:(NSPoint)pt - inContext:(CGContextRef)context - usingTrans:(Transformer*)t; - -@end diff --git a/tikzit/src/osx/CALayer+DrawLabel.m b/tikzit/src/osx/CALayer+DrawLabel.m deleted file mode 100644 index 4860a3c..0000000 --- a/tikzit/src/osx/CALayer+DrawLabel.m +++ /dev/null @@ -1,84 +0,0 @@ -// -// CALayer+DrawLabel.m -// TikZiT -// -// Created by Aleks Kissinger on 09/05/2011. -// Copyright 2011 Aleks Kissinger. All rights reserved. -// - -#import "CALayer+DrawLabel.h" -#import "Transformer.h" - -@implementation CALayer(DrawLabel) - -- (void)drawLabel:(NSString*)label - atPoint:(NSPoint)pt - inContext:(CGContextRef)context - usingTrans:(Transformer*)t { - - CGContextSaveGState(context); - - if ([label length] > 15) { - label = [[label substringToIndex:12] stringByAppendingString:@"..."]; - } - - float fontSize = [t scaleToScreen:0.18f]; // size 9 @ 100% - if (fontSize > 18.0f) fontSize = 18.0f; - - // Prepare font - CTFontRef font = CTFontCreateWithName(CFSTR("Monaco"), fontSize, NULL); - - // Create an attributed string - CFStringRef keys[] = { kCTFontAttributeName }; - CFTypeRef values[] = { font }; - CFDictionaryRef attr = CFDictionaryCreate(NULL, - (const void **)&keys, - (const void **)&values, - sizeof(keys) / sizeof(keys[0]), - &kCFTypeDictionaryKeyCallBacks, - &kCFTypeDictionaryValueCallBacks); - CFAttributedStringRef attrString = - CFAttributedStringCreate(NULL, (CFStringRef)label, attr); - CFRelease(attr); - - // Draw the string - CTLineRef line = CTLineCreateWithAttributedString(attrString); - CGContextSetTextMatrix(context, CGAffineTransformIdentity); - CGContextSetTextPosition(context, 0, 0); - - CGRect labelBounds = CGRectIntegral(CTLineGetImageBounds(line, context)); - //int shiftx = round(labelBounds.size.width / 2); - - CGContextSetTextPosition(context, - round(pt.x - (labelBounds.size.width/2)), - round(pt.y - (0.9*labelBounds.size.height/2))); - - labelBounds = CGRectIntegral(CTLineGetImageBounds(line, context)); - labelBounds.origin.x -= 2; - labelBounds.origin.y -= 2; - labelBounds.size.width += 4; - labelBounds.size.height += 4; - - CGContextSetShouldAntialias(context, NO); - - CGContextSetRGBFillColor(context, 1.0f, 1.0f, 0.5f, 0.7f); - CGContextSetRGBStrokeColor(context, 0.5f, 0.0f, 0.0f, 0.7f); - - CGContextFillRect(context, labelBounds); - CGContextStrokeRect(context, labelBounds); - - CGContextSetShouldAntialias(context, YES); - - CGContextSetRGBFillColor(context, 0.3f, 0.3f, 0.3f, 0.7f); - - CTLineDraw(line, context); - - // Clean up - CFRelease(line); - CFRelease(attrString); - CFRelease(font); - - CGContextRestoreGState(context); -} - -@end diff --git a/tikzit/src/osx/CoreGraphicsRenderContext.h b/tikzit/src/osx/CoreGraphicsRenderContext.h deleted file mode 100644 index 7b00484..0000000 --- a/tikzit/src/osx/CoreGraphicsRenderContext.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import -#import "RenderContext.h" - -@interface CoreTextLayout: NSObject { - CFAttributedStringRef attrString; - CTFontRef font; - CTLineRef line; - CGContextRef ctx; -} - -+ (CoreTextLayout*) layoutForContext:(CGContextRef)c withString:(NSString*)string fontSize:(CGFloat)fontSize; -- (id) initWithContext:(CGContextRef)cr withString:(NSString*)string fontSize:(CGFloat)fontSize; - -@end - -@interface CoreGraphicsRenderContext: NSObject { - CGContextRef ctx; -} - -+ (CoreGraphicsRenderContext*) contextWithCGContext:(CGContextRef)c; -+ (id) initWithCGContext:(CGContextRef)c; - -- (CGContextRef) ctx; - -@end - -// vim:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit/src/osx/CoreGraphicsRenderContext.m b/tikzit/src/osx/CoreGraphicsRenderContext.m deleted file mode 100644 index 1cb0daf..0000000 --- a/tikzit/src/osx/CoreGraphicsRenderContext.m +++ /dev/null @@ -1,234 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import -#import "RenderContext.h" - -@implementation CoreTextLayout - -+ (CoreTextLayout*) layoutForContext:(CGContextRef)c withString:(NSString*)string fontSize:(CGFloat)fontSize { - return [[[self alloc] initWithContext:c withString:string fontSize:fontSize] autorelease]; -} - -- (id) initWithContext:(CGContextRef)cr withString:(NSString*)string fontSize:(CGFloat)fontSize { - self = [super init]; - - if (self == nil) { - return nil; - } - - CGContextRetain (cr); - ctx = cr; - font = CTFontCreateWithName(CFSTR("Monaco"), fontSize, NULL); - - // Create an attributed string - CFStringRef keys[] = { kCTFontAttributeName }; - CFTypeRef values[] = { font }; - CFDictionaryRef attr = CFDictionaryCreate(NULL, - (const void **)&keys, - (const void **)&values, - sizeof(keys) / sizeof(keys[0]), - &kCFTypeDictionaryKeyCallBacks, - &kCFTypeDictionaryValueCallBacks); - attrString = CFAttributedStringCreate(NULL, (CFStringRef)lab, attr); - CFRelease(attr); - line = CTLineCreateWithAttributedString(attrString); - - return self; -} - -- (NSSize) size { - CGRect labelBounds = CGRectIntegral(CTLineGetImageBounds(line, ctx)); - return labelBounds.size; -} - -- (NSString*) text { - return CFAttributedStringGetString (attrString); -} - -- (void) showTextAt:(NSPoint)topLeft withColor:(RColor)color { - CGContextSaveGState(ctx); - - CGContextSetRGBFillColor(ctx, color.red, color.green, color.blue, color.alpha); - CGContextSetRGBStrokeColor(ctx, color.red, color.green, color.blue, color.alpha); - CGContextSetShouldAntialias(ctx, YES); - - CGContextSetTextMatrix(ctx, CGAffineTransformIdentity); - CGContextSetTextPosition(ctx, 0, 0); - CGRect bounds = CGRectIntegral(CTLineGetImageBounds(line, ctx)); - CGContextSetTextPosition(ctx, topLeft.x - bounds.x, topLeft.y - bounds.y); - - CTLineDraw(line, ctx); - - CGContextRestoreGState(ctx); -} - -- (void) dealloc { - CFRelease(line); - CFRelease(attrString); - CFRelease(font); - CGContextRelease (ctx); - - [super dealloc]; -} - -@end - -@implementation CoreGraphicsRenderContext - -+ (CoreGraphicsRenderContext*) contextWithCGContext:(CGContextRef)c { - return [[[self alloc] initWithCGContext:c] autorelease]; -} - -+ (id) initWithCGContext:(CGContextRef)c { - self = [super init]; - - if (self) { - ctx = c; - CGContextRetain (ctx); - } - - return self; -} - -- (void) dealloc { - CGContextRelease (ctx); - - [super dealloc]; -} - -- (CGContextRef) ctx { - return ctx; -} - -- (void) saveState { - CGContextSaveGState(ctx); -} - -- (void) restoreState { - CGContextRestoreGState(ctx); -} - -- (NSRect) clipBoundingBox { - return CGContextGetClipBoundingBox (ctx); -} - -- (BOOL) strokeIncludesPoint:(NSPoint)p { - return CGContextPathContainsPoint(ctx, NSPointToCGPoint(p), kCGPathStroke); -} - -- (BOOL) fillIncludesPoint:(NSPoint)p { - return CGContextPathContainsPoint(ctx, NSPointToCGPoint(p), kCGPathFill); -} - -- (id) layoutText:(NSString*)text withSize:(CGFloat)fontSize { - return [CoreTextLayout layoutForContext:ctx withString:text fontSize:fontSize]; -} - -// this may not affect text rendering -- (void) setAntialiasMode:(AntialiasMode)mode { - CGContextSetShouldAntialias(ctx, mode != AntialiasDisabled); -} - -- (void) setLineWidth:(CGFloat)width { - CGContextSetLineWidth(ctx, width); -} - -// setting to 0 will unset the dash -- (void) setLineDash:(CGFloat)dashLength { - if (dashLength <= 0.0f) { - CGContextSetLineDash(ctx, 0.0f, NULL, 0); - } else { - const CGFloat dash[] = {dashLength, dashLength}; - CGContextSetLineDash(ctx, 0.0f, dash, 2); - } -} - -// paths -- (void) startPath { - CGContextBeginPath (ctx); -} - -- (void) closeSubPath { - CGContextClosePath (ctx); -} - -- (void) moveTo:(NSPoint)p { - CGContextMoveToPoint (ctx, p.x, p.y); -} - -- (void) curveTo:(NSPoint)end withCp1:(NSPoint)cp1 andCp2:(NSPoint)cp2 { - CGContextAddCurveToPoint(ctx, cp1.x, cp1.y, cp2.x, cp2.y, end.x, end.y); -} - -- (void) lineTo:(NSPoint)end { - CGContextAddLineToPoint(ctx, end.x, end.y); -} - -- (void) rect:(NSRect)rect { - CGContextAddRect (ctx, rect); -} - -- (void) circleAt:(NSPoint)c withRadius:(CGFloat)r { - CGContextMoveToPoint (ctx, c.x + r, c.y); - CGContextAddArc (ctx, c.x, c.y, r, 0.0f, M_PI, 1); -} - -// these methods clear the path -- (void) strokePathWithColor:(RColor)color { - CGContextSetRGBStrokeColor(ctx, color.red, color.green, color.blue, color.alpha); - CGContextDrawPath (ctx, kCGPathStroke); -} - -- (void) fillPathWithColor:(RColor)color { - CGContextSetRGBFillColor(ctx, color.red, color.green, color.blue, color.alpha); - CGContextDrawPath (ctx, kCGPathFill); -} - -- (void) strokePathWithColor:(RColor)scolor - andFillWithColor:(RColor)fcolor { - CGContextSetRGBFillColor(ctx, color.red, color.green, color.blue, color.alpha); - CGContextSetRGBStrokeColor(ctx, color.red, color.green, color.blue, color.alpha); - CGContextDrawPath (ctx, kCGPathFillStroke); -} - -- (void) strokePathWithColor:(RColor)scolor - andFillWithColor:(RColor)fcolor - usingAlpha:(CGFloat)alpha { - CGContextSetRGBFillColor(ctx, color.red, color.green, color.blue, color.alpha * alpha); - CGContextSetRGBStrokeColor(ctx, color.red, color.green, color.blue, color.alpha * alpha); - CGContextDrawPath (ctx, kCGPathFillStroke); -} - -- (void) clipToPath { - CGContextClip (ctx); -} - -// paint everywhere within the clip -- (void) paintWithColor:(RColor)color { - CGContextSetRGBFillColor(ctx, color.red, color.green, color.blue, color.alpha); - CGRect r = CGContextGetClipBoundingBox (ctx); - r.origin.x -= 1; - r.origin.y -= 1; - r.size.width += 2; - r.size.height += 2; - CGContextFillRect(context, r); -} - -@end - -// vim:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit/src/osx/CustomNodeCellView.h b/tikzit/src/osx/CustomNodeCellView.h deleted file mode 100644 index 22606d7..0000000 --- a/tikzit/src/osx/CustomNodeCellView.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// CustomNodeCellView.h -// TikZiT -// -// Created by Johan Paulsson on 12/12/13. -// Copyright (c) 2013 Aleks Kissinger. All rights reserved. -// - -#import - -#import "NodeLayer.h" -#import "NodeStyle.h" -#import "NodeStyle+Coder.h" - -@interface CustomNodeCellView : NSTableCellView{ - NodeLayer *nodeLayer; - NodeStyle *nodeStyle; - BOOL selected; -} - -@property (strong) id objectValue; - -@end diff --git a/tikzit/src/osx/CustomNodeCellView.m b/tikzit/src/osx/CustomNodeCellView.m deleted file mode 100644 index 612394b..0000000 --- a/tikzit/src/osx/CustomNodeCellView.m +++ /dev/null @@ -1,83 +0,0 @@ -// -// CustomNodeCellView.m -// TikZiT -// -// Created by Johan Paulsson on 12/12/13. -// Copyright (c) 2013 Aleks Kissinger. All rights reserved. -// - -#import "CustomNodeCellView.h" - -@implementation CustomNodeCellView - -- (id)initWithFrame:(NSRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - // Initialization code here. - } - return self; -} - -- (void)drawRect:(NSRect)dirtyRect -{ - [super drawRect:dirtyRect]; - - // Drawing code here. -} - -- (id) objectValue{ - return [super objectValue]; -} - --(void)drawLayer:(CALayer *)layer inContext:(CGContextRef)context { - if (nodeLayer!=nil) { - if (![[[self layer] sublayers] containsObject:nodeLayer]) { - [[self layer] addSublayer:nodeLayer]; - NSPoint c = NSMakePoint((CGRectGetMinX([[self layer] frame])+CGRectGetWidth([nodeLayer bounds])/2), - CGRectGetMidY([[self layer] frame])); - //c = NSMakePoint(-16.5,-16.5); - [nodeLayer setCenter:c andAnimateWhen:NO]; - [[self textField] setFrame:NSMakeRect(CGRectGetWidth([nodeLayer bounds]), CGRectGetMidY([[self layer] frame]), CGRectGetWidth([[self textField] frame]), CGRectGetHeight([[self textField] frame]))]; - } - - if (selected){ - [nodeStyle setStrokeColor:[NSColor whiteColor]]; - [[nodeLayer node] setStyle:nodeStyle]; - }else{ - [nodeStyle setStrokeColor:[NSColor blackColor]]; - [[nodeLayer node] setStyle:nodeStyle]; - } - - [nodeLayer updateFrame]; - } -} - -- (void) setObjectValue:(id)objectValue{ - if(objectValue == nil) - return; - - nodeStyle = (NodeStyle *)objectValue; - [[self textField] setStringValue:[nodeStyle shapeName]]; - - if (nodeLayer == nil) { - nodeLayer = [[NodeLayer alloc] initWithNode:[Node node] - transformer:[Transformer defaultTransformer]]; - [nodeLayer setRescale:NO]; - } - [nodeStyle setName:[nodeStyle shapeName]]; - - [[nodeLayer node] setStyle:nodeStyle]; - [nodeLayer updateFrame]; - - NSLog(@"asd"); -} - -- (void)setBackgroundStyle:(NSBackgroundStyle)backgroundStyle { - [super setBackgroundStyle:backgroundStyle]; - - selected = (backgroundStyle == NSBackgroundStyleDark); - [self setNeedsDisplay:YES]; -} - -@end diff --git a/tikzit/src/osx/CustomNodeController.h b/tikzit/src/osx/CustomNodeController.h deleted file mode 100644 index 67adf0b..0000000 --- a/tikzit/src/osx/CustomNodeController.h +++ /dev/null @@ -1,35 +0,0 @@ -// -// CustomNodeController.h -// TikZiT -// -// Created by Johan Paulsson on 12/4/13. -// Copyright (c) 2013 Aleks Kissinger. All rights reserved. -// - -#import -#import "Shape.h" -#import "TikzShape.h" - -#import "GraphicsView.h" -#import "TikzSourceController.h" - -#import "SupportDir.h" - -@interface CustomNodeController : NSViewController { - NSDictionary *nodeStyles; - NSMutableArray* customNodeStyles; - - GraphicsView *__weak graphicsView; - TikzSourceController *__weak tikzSourceController; - NSTableView *customNodeTable; -} - -@property NSDictionary *nodeStyles; -@property NSMutableArray* customNodeStyles; - -@property IBOutlet NSTableView *customNodeTable; - -@property (weak) IBOutlet GraphicsView *graphicsView; -@property (weak) IBOutlet TikzSourceController *tikzSourceController; - -@end diff --git a/tikzit/src/osx/CustomNodeController.m b/tikzit/src/osx/CustomNodeController.m deleted file mode 100644 index 4f46acc..0000000 --- a/tikzit/src/osx/CustomNodeController.m +++ /dev/null @@ -1,58 +0,0 @@ -// -// CustomNodeController.m -// TikZiT -// -// Created by Johan Paulsson on 12/4/13. -// Copyright (c) 2013 Aleks Kissinger. All rights reserved. -// - -#import "CustomNodeController.h" -#import "NodeStyle.h" - -@interface CustomNodeController () - -@end - -@implementation CustomNodeController - -@synthesize nodeStyles, customNodeStyles; -@synthesize graphicsView, tikzSourceController; -@synthesize customNodeTable; - -- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil -{ - if (self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]) { - nodeStyles = [Shape shapeDictionary]; - customNodeStyles = [NSMutableArray array]; - - for(id key in nodeStyles) { - Shape *value = [nodeStyles objectForKey:key]; - - if([value isKindOfClass:[TikzShape class]]){ - NodeStyle *newNodeStyle = [[NodeStyle alloc] init]; - [newNodeStyle setShapeName:key]; - - [customNodeStyles addObject:newNodeStyle]; - } - } - } - - return self; -} - -- (void)tableViewSelectionDidChange:(NSNotification *)aNotification{ - NSInteger selectedRow = [customNodeTable selectedRow]; - - NodeStyle* selectedNodeStyle = [customNodeStyles objectAtIndex:selectedRow]; - TikzShape *tikzshape = (TikzShape *) [nodeStyles objectForKey:[selectedNodeStyle shapeName]]; - - [[tikzSourceController graphicsView] setEnabled:NO]; - [tikzSourceController setTikz:[tikzshape tikzSrc]]; - [tikzSourceController parseTikz:self]; -} - -- (id)valueForUndefinedKey:(NSString *)key{ - return nil; -} - -@end diff --git a/tikzit/src/osx/CustomNodes.xib b/tikzit/src/osx/CustomNodes.xib deleted file mode 100644 index 1cc8db2..0000000 --- a/tikzit/src/osx/CustomNodes.xib +++ /dev/null @@ -1,249 +0,0 @@ - - - - - - - - - - - - - - - - - - - name - strokeThickness - strokeColor - fillColor - strokeColorIsKnown - fillColorIsKnown - representedObject.name - shapeName - scale - @distinctUnionOfObjects.category - category - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \begin{tikzpicture} - -\end{tikzpicture} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tikzit/src/osx/DraggablePDFView.h b/tikzit/src/osx/DraggablePDFView.h deleted file mode 100644 index 9e53c44..0000000 --- a/tikzit/src/osx/DraggablePDFView.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// PreviewController.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import - -@interface DraggablePDFView : PDFView - -@end diff --git a/tikzit/src/osx/DraggablePDFView.m b/tikzit/src/osx/DraggablePDFView.m deleted file mode 100644 index ce393c7..0000000 --- a/tikzit/src/osx/DraggablePDFView.m +++ /dev/null @@ -1,60 +0,0 @@ -// -// PreviewController.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "DraggablePDFView.h" - -@implementation DraggablePDFView - -- (id)initWithFrame:(NSRect)frame -{ - self = [super initWithFrame:frame]; - return self; -} - -- (void)drawRect:(NSRect)dirtyRect -{ - [super drawRect:dirtyRect]; -} - -- (void)mouseDown:(NSEvent *)theEvent -{ - NSRect pageBox = [[[self document] pageAtIndex:0] boundsForBox:kPDFDisplayBoxMediaBox]; - NSRect pageRect= [self convertRect:pageBox fromPage:[[self document] pageAtIndex:0]]; - - NSArray *fileList = [NSArray arrayWithObjects:[[[self document] documentURL] path], nil]; - NSPasteboard *pboard = [NSPasteboard pasteboardWithName:NSDragPboard]; - [pboard declareTypes:[NSArray arrayWithObject:NSFilenamesPboardType] owner:nil]; - [pboard setPropertyList:fileList forType:NSFilenamesPboardType]; - - [self dragImage:[[NSImage alloc] initWithData:[[self document] dataRepresentation]] - at:pageRect.origin - offset:pageRect.size - event:theEvent - pasteboard:pboard - source:self - slideBack:YES]; - - return; -} - -@end diff --git a/tikzit/src/osx/EdgeControlLayer.h b/tikzit/src/osx/EdgeControlLayer.h deleted file mode 100644 index 4cdf8bc..0000000 --- a/tikzit/src/osx/EdgeControlLayer.h +++ /dev/null @@ -1,44 +0,0 @@ -// -// EdgeControlLayer.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import -#import "Edge.h" -#import "Transformer.h" - - -@interface EdgeControlLayer : CALayer { - Edge *edge; - Transformer *transformer; - BOOL selected; -} - -- (id)initWithEdge:(Edge*)e andTransformer:(Transformer*)t; -- (void)highlight; -- (void)unhighlight; -- (void)select; -- (void)deselect; - -+ (float)handleRadius; - -@end diff --git a/tikzit/src/osx/EdgeControlLayer.m b/tikzit/src/osx/EdgeControlLayer.m deleted file mode 100644 index facdd84..0000000 --- a/tikzit/src/osx/EdgeControlLayer.m +++ /dev/null @@ -1,150 +0,0 @@ -// -// EdgeControlLayer.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "EdgeControlLayer.h" -#import "util.h" - - -@implementation EdgeControlLayer - - -- (id)initWithEdge:(Edge*)e andTransformer:(Transformer*)t { - if (!(self = [super init])) return nil; - transformer = t; - edge = e; - self.opacity = 0.0f; - return self; -} - -- (void)select { - selected = YES; - self.opacity = 1.0f; -} - -- (void)deselect { - selected = NO; - self.opacity = 0.0f; -} - -- (void)highlight { - if (!selected) { - self.opacity = 0.5f; - } -} - -- (void)unhighlight { - if (!selected) { - self.opacity = 0.0f; - } -} - -- (void)drawInContext:(CGContextRef)ctx { - CGContextSaveGState(ctx); - - [edge updateControls]; - CGPoint source = NSPointToCGPoint([transformer toScreen:[[edge source] point]]); - CGPoint target = NSPointToCGPoint([transformer toScreen:[[edge target] point]]); - CGPoint mid = NSPointToCGPoint([transformer toScreen:[edge mid]]); - CGPoint cp1 = NSPointToCGPoint([transformer toScreen:[edge cp1]]); - CGPoint cp2 = NSPointToCGPoint([transformer toScreen:[edge cp2]]); - - float dx = (target.x - source.x); - float dy = (target.y - source.y); - - // draw a circle at the midpoint - CGRect mid_rect = CGRectMake(mid.x-3.0f, mid.y-3.0f, 6.0f, 6.0f); - CGContextAddEllipseInRect(ctx, mid_rect); - CGContextSetLineWidth(ctx, 1.0f); - CGContextSetRGBFillColor(ctx, 1.0f, 1.0f, 1.0f, 0.5f); - CGContextSetRGBStrokeColor(ctx, 0.0f, 0.0f, 1.0f, 0.5f); - CGContextDrawPath(ctx, kCGPathFillStroke); - - - CGContextSetShouldAntialias(ctx, YES); - - // compute size of control circles - float cdist; - if (dx == 0 && dy == 0) cdist = [transformer scaleToScreen:edge.weight]; - else cdist = sqrt(dx*dx + dy*dy) * edge.weight; - - // if basic bend, draw blue, if inout, draw green - if ([edge bendMode] == EdgeBendModeBasic) CGContextSetRGBStrokeColor(ctx, 0, 0, 1, 0.4f); - else CGContextSetRGBStrokeColor(ctx, 0, 0.7f, 0, 0.4f); - - // draw source control circle - CGRect ellipse1 = CGRectMake(source.x-cdist, source.y-cdist, cdist*2.0f, cdist*2.0f); - CGContextAddEllipseInRect(ctx, ellipse1); - if (dx!=0 || dy!=0) { - CGRect ellipse2 = CGRectMake(target.x-cdist, target.y-cdist, cdist*2.0f, cdist*2.0f); - CGContextAddEllipseInRect(ctx, ellipse2); - } - - CGContextStrokePath(ctx); - - float handleRad = [EdgeControlLayer handleRadius]; - - // handles - CGRect ctrl1 = CGRectMake(cp1.x-handleRad, cp1.y-handleRad, 2*handleRad, 2*handleRad); - CGRect ctrl2 = CGRectMake(cp2.x-handleRad, cp2.y-handleRad, 2*handleRad, 2*handleRad); - - CGContextSetRGBFillColor(ctx, 1.0f, 1.0f, 1.0f, 0.8f); - - // draw a line from source vertex to first handle - if ([edge bendMode] == EdgeBendModeInOut) { - if ([edge outAngle] % 45 == 0) CGContextSetRGBStrokeColor(ctx, 1, 0, 1, 0.6f); - else CGContextSetRGBStrokeColor(ctx, 0, 0.7f, 0, 0.4f); - } else { - if ([edge bend] % 45 == 0) CGContextSetRGBStrokeColor(ctx, 1, 0, 1, 0.6f); - else CGContextSetRGBStrokeColor(ctx, 0, 0, 1, 0.4f); - } - - CGContextMoveToPoint(ctx, source.x, source.y); - CGContextAddLineToPoint(ctx, cp1.x, cp1.y); - CGContextStrokePath(ctx); - - CGContextAddEllipseInRect(ctx, ctrl1); - CGContextDrawPath(ctx, kCGPathFillStroke); - - - // draw a line from target vertex to second handle - if ([edge bendMode] == EdgeBendModeInOut) { - if ([edge inAngle] % 45 == 0) CGContextSetRGBStrokeColor(ctx, 1, 0, 1, 0.6f); - else CGContextSetRGBStrokeColor(ctx, 0, 0.7f, 0, 0.4f); - } else { - if ([edge bend] % 45 == 0) CGContextSetRGBStrokeColor(ctx, 1, 0, 1, 0.6f); - else CGContextSetRGBStrokeColor(ctx, 0, 0, 1, 0.4f); - } - - CGContextMoveToPoint(ctx, target.x, target.y); - CGContextAddLineToPoint(ctx, cp2.x, cp2.y); - CGContextStrokePath(ctx); - - CGContextAddEllipseInRect(ctx, ctrl2); - CGContextDrawPath(ctx, kCGPathFillStroke); - - CGContextRestoreGState(ctx); -} - -+ (float)handleRadius { return 4.0f; } - -@end diff --git a/tikzit/src/osx/EdgeStyle+Coder.h b/tikzit/src/osx/EdgeStyle+Coder.h deleted file mode 100644 index e35c18f..0000000 --- a/tikzit/src/osx/EdgeStyle+Coder.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// EdgeStyle+Coder.h -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "EdgeStyle.h" - -@interface EdgeStyle (Coder) -- (id)initWithCoder:(NSCoder*)coder; -- (void)encodeWithCoder:(NSCoder*)coder; -@end diff --git a/tikzit/src/osx/EdgeStyle+Coder.m b/tikzit/src/osx/EdgeStyle+Coder.m deleted file mode 100644 index 039344d..0000000 --- a/tikzit/src/osx/EdgeStyle+Coder.m +++ /dev/null @@ -1,50 +0,0 @@ -// -// EdgeStyle+Coder.m -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "EdgeStyle+Coder.h" - -@implementation EdgeStyle (Coder) - -- (id)initWithCoder:(NSCoder*)coder { - if (!(self = [super init])) return nil; - - name = [coder decodeObjectForKey:@"name"]; - category = [coder decodeObjectForKey:@"category"]; - headStyle = [coder decodeIntForKey:@"headStyle"]; - tailStyle = [coder decodeIntForKey:@"tailStyle"]; - decorationStyle = [coder decodeIntForKey:@"decorationStyle"]; - thickness = [coder decodeFloatForKey:@"thickness"]; - - return self; -} - -- (void)encodeWithCoder:(NSCoder*)coder { - [coder encodeObject:name forKey:@"name"]; - [coder encodeObject:category forKey:@"category"]; - [coder encodeInt:headStyle forKey:@"headStyle"]; - [coder encodeInt:tailStyle forKey:@"tailStyle"]; - [coder encodeInt:decorationStyle forKey:@"decorationStyle"]; - [coder encodeFloat:thickness forKey:@"thickness"]; -} - -@end diff --git a/tikzit/src/osx/Graph+Coder.h b/tikzit/src/osx/Graph+Coder.h deleted file mode 100644 index 1404fc2..0000000 --- a/tikzit/src/osx/Graph+Coder.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// Graph+Coder.h -// TikZiT -// -// Created by Aleks Kissinger on 27/04/2010. -// Copyright 2010 __MyCompanyName__. All rights reserved. -// - -#import -#import "Graph.h" - -@interface Graph (Coder) - -- (id)initWithCoder:(NSCoder*)coder; -- (void)encodeWithCoder:(NSCoder*)coder; - -@end diff --git a/tikzit/src/osx/Graph+Coder.m b/tikzit/src/osx/Graph+Coder.m deleted file mode 100644 index 7d3787e..0000000 --- a/tikzit/src/osx/Graph+Coder.m +++ /dev/null @@ -1,24 +0,0 @@ -// -// Graph+Coder.m -// TikZiT -// -// Created by Aleks Kissinger on 27/04/2010. -// Copyright 2010 __MyCompanyName__. All rights reserved. -// - -#import "Graph+Coder.h" -#import "TikzGraphAssembler.h" - -@implementation Graph(Coder) - -- (id)initWithCoder:(NSCoder*)coder { - NSString *tikz = [coder decodeObject]; - [TikzGraphAssembler parseTikz:tikz forGraph:self]; - return self; -} - -- (void)encodeWithCoder:(NSCoder*)coder { - [coder encodeObject:[self tikz]]; -} - -@end diff --git a/tikzit/src/osx/GraphicsView.h b/tikzit/src/osx/GraphicsView.h deleted file mode 100644 index 329b1e5..0000000 --- a/tikzit/src/osx/GraphicsView.h +++ /dev/null @@ -1,129 +0,0 @@ -// -// GraphicsView.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import -#import "PickSupport.h" -#import "Grid.h" -#import "Transformer.h" -#import "Graph.h" -#import "NodeStyle.h" -#import "StylePaletteController.h" -#import "ToolPaletteController.h" -#import "SelectBoxLayer.h" - -// mouse modes, corresponding to different tools. format: (tool)[sub-mode]Mode -typedef enum { - SelectMode = 0x10, - SelectBoxMode = 0x11, - SelectMoveMode = 0x12, - SelectEdgeBendMode = 0x14, - - NodeMode = 0x20, - - EdgeMode = 0x40, - EdgeDragMode = 0x41, - - CropMode = 0x80, - CropDragMode = 0x81 -} MouseMode; - -@class TikzSourceController; - -@interface GraphicsView : NSView { - BOOL enabled; - - IBOutlet NSApplication *application; - StylePaletteController *stylePaletteController; - ToolPaletteController *toolPaletteController; - - BOOL frameMoveMode; - - Graph *graph; - NSString *graphTikzOnMouseDown; - PickSupport *pickSupport; - //NSMapTable *nodeSelectionLayers; - NSMapTable *edgeControlLayers; - NSMapTable *nodeLayers; - NSPoint dragOrigin; - NSPoint dragTarget; - NSPoint oldTransformerOrigin; - NSPoint oldMainOrigin; - NSRect oldBounds; - //NSRect selectionBox; - Transformer *transformer; - - CALayer *mainLayer; - CALayer *gridLayer; - CALayer *graphLayer; - CALayer *hudLayer; - SelectBoxLayer *selectionLayer; - - MouseMode mouseMode; - Node *leaderNode; - Grid *grid; - - Edge *modifyEdge; - BOOL firstControlPoint; - - int bboxLeftRight; - int bboxBottomTop; - - NSUndoManager *documentUndoManager; - NSPoint startPoint; - - TikzSourceController *tikzSourceController; -} - -@property BOOL enabled; -@property (weak) Graph *graph; -@property IBOutlet TikzSourceController *tikzSourceController; -@property (readonly) Transformer *transformer; -@property (readonly) PickSupport *pickSupport; - -- (void)setDocumentUndoManager:(NSUndoManager*)um; -- (void)applyStyleToSelectedNodes:(NodeStyle*)style; -- (void)applyStyleToSelectedEdges:(EdgeStyle*)style; - -- (void)updateMouseMode; -- (void)refreshLayers; - -//- (void)registerUndo:(GraphChange *)change withActionName:(NSString*)name; -- (void)registerUndo:(NSString*)oldTikz withActionName:(NSString*)name; -//- (void)undoGraphChange:(GraphChange *)change; -- (void)undoGraphChange:(NSString*)oldTikz; -- (void)postGraphChange; -- (void)postSelectionChange; - -- (void)deselectAll:(id)sender; -- (void)selectAll:(id)sender; -- (void)cut:(id)sender; -- (void)copy:(id)sender; -- (void)paste:(id)sender; -- (void)delete:(id)sender; -- (void)bringForward:(id)sender; -- (void)flipHorizonal:(id)sender; -- (void)flipVertical:(id)sender; -- (void)reverseEdgeDirection:(id)sender; - -@end diff --git a/tikzit/src/osx/GraphicsView.m b/tikzit/src/osx/GraphicsView.m deleted file mode 100644 index efa7ecb..0000000 --- a/tikzit/src/osx/GraphicsView.m +++ /dev/null @@ -1,1216 +0,0 @@ -// -// GraphicsView.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "GraphicsView.h" -#import "util.h" -#import "CALayer+DrawLabel.h" - -#import "NodeSelectionLayer.h" -#import "NodeLayer.h" -#import "EdgeControlLayer.h" -#import "AppDelegate.h" -#import "TikzGraphAssembler.h" -#import "TikzSourceController.h" - -@interface GraphicsView (Private) -- (void)setupLayers; -- (void)addNodeLayers:(Node*)n; -- (void)addEdgeLayers:(Edge*)e; -- (void)removeNodeLayers:(Node*)n; -- (void)resetMainOrigin; -- (void)setMainOrigin:(NSPoint)o; -@end - -static CGColorRef cgGrayColor, cgWhiteColor, cgClearColor = nil; - - -@implementation GraphicsView - -@synthesize enabled, transformer, pickSupport, tikzSourceController; - -- (void)postGraphChange { - [[NSNotificationCenter defaultCenter] postNotificationName:@"GraphChanged" - object:self]; - [self postSelectionChange]; -} - -- (void)postSelectionChange { - [[NSNotificationCenter defaultCenter] postNotificationName:@"SelectionChanged" - object:self]; -} - -- (id)initWithFrame:(NSRect)frame { - self = [super initWithFrame:frame]; - if (self) { - if (cgClearColor == nil) { - cgClearColor = CGColorGetConstantColor(kCGColorClear); - cgGrayColor = CGColorCreateGenericGray(0.5f, 0.5f); - cgWhiteColor = CGColorCreateGenericRGB(1, 1, 1, 1); - } - - transformer = [[Transformer alloc] init]; - mouseMode = SelectMode; - grid = [Grid gridWithSpacing:1.0f - subdivisions:4 - transformer:transformer]; - [grid setSize:NSSizeFromCGSize([gridLayer bounds].size)]; - [transformer setScale:PIXELS_PER_UNIT]; - - [self setupLayers]; - - leaderNode = nil; - pickSupport = [[PickSupport alloc] init]; - frameMoveMode = NO; - - enabled = YES; - [self setGraph:[Graph graph]]; - } - return self; -} - -- (void)awakeFromNib { - AppDelegate *del = [application delegate]; - stylePaletteController = [del stylePaletteController]; - toolPaletteController = [del toolPaletteController]; - [self refreshLayers]; - [self postGraphChange]; -} - -- (void)setupLayers { - mainLayer = [CALayer layer]; - [mainLayer setBackgroundColor:cgWhiteColor]; - [mainLayer setFrame:CGRectIntegral(NSRectToCGRect([self bounds]))]; - [mainLayer setOpacity:1.0f]; - [self setLayer:mainLayer]; - [self resetMainOrigin]; - - gridLayer = [CALayer layer]; - [gridLayer setDelegate:grid]; - [gridLayer setOpacity:0.3f]; - [mainLayer addSublayer:gridLayer]; - - graphLayer = [CALayer layer]; - [graphLayer setDelegate:self]; - [mainLayer addSublayer:graphLayer]; - - hudLayer = [CALayer layer]; - [mainLayer addSublayer:hudLayer]; - - selectionLayer = [SelectBoxLayer layer]; - [mainLayer addSublayer:selectionLayer]; - - [transformer setOrigin:NSMakePoint(NSMidX([self bounds]),NSMidY([self bounds]))]; - oldBounds = [self bounds]; - [self refreshLayers]; -} - -// Lion resume feature -//- (void)encodeRestorableStateWithCoder:(NSCoder*)coder { -// NSLog(@"got encode request"); -//} -//- (void)restoreStateWithCoder:(NSCoder*)coder { -// NSLog(@"got decode request"); -//} - -- (void)registerUndo:(NSString*)oldTikz withActionName:(NSString*)nm { - [documentUndoManager registerUndoWithTarget:self - selector:@selector(undoGraphChange:) - object:oldTikz]; - [documentUndoManager setActionName:nm]; -} - -- (void)revertToTikz:(NSString*)tikz { - [tikzSourceController setTikz:tikz]; - [tikzSourceController tryParseTikz]; - [self refreshLayers]; - [self postGraphChange]; -} - - -- (void)undoGraphChange:(NSString*)oldTikz { - NSString *currentTikz = [graph tikz]; - [self revertToTikz:oldTikz]; - [documentUndoManager registerUndoWithTarget:self - selector:@selector(undoGraphChange:) - object:currentTikz]; -} - -- (void)setGraph:(Graph*)gr { - graph = gr; - - NSEnumerator *e; - CALayer *layer; - - e = [edgeControlLayers objectEnumerator]; - while (layer = [e nextObject]) [layer removeFromSuperlayer]; - edgeControlLayers = [NSMapTable mapTableWithStrongToStrongObjects]; - - - e = [nodeLayers objectEnumerator]; - while (layer = [e nextObject]) [layer removeFromSuperlayer]; - nodeLayers = [NSMapTable mapTableWithStrongToStrongObjects]; - - for (Node *n in [graph nodes]) { - [n attachStyleFromTable:[stylePaletteController nodeStyles]]; - [self addNodeLayers:n]; - } - - for (Edge *e in [graph edges]) { - [e setAttributesFromData]; - [e attachStyleFromTable:[stylePaletteController edgeStyles]]; - [self addEdgeLayers:e]; - } -} - -- (Graph*)graph { return graph; } - -- (void)setMainOrigin:(NSPoint)o { - o.x = round(o.x); - o.y = round(o.y); - CGRect rect = [mainLayer frame]; - rect.origin = NSPointToCGPoint(o); - [mainLayer setFrame:rect]; -} - -- (void)resetMainOrigin { - NSRect bds = [self bounds]; - bds.origin.x -= bds.size.width; - bds.origin.y -= bds.size.height; - bds.size.width *= 3; - bds.size.height *= 3; - [mainLayer setFrame:NSRectToCGRect([self bounds])]; -} - -- (void)refreshLayers { - [gridLayer setFrame:[mainLayer frame]]; - [graphLayer setFrame:[mainLayer frame]]; - [hudLayer setFrame:[mainLayer frame]]; - [selectionLayer setFrame:[mainLayer frame]]; - - if (enabled) { - [hudLayer setBackgroundColor:cgClearColor]; - } else { - [hudLayer setBackgroundColor:cgGrayColor]; - } - - [grid setSize:NSSizeFromCGSize([gridLayer bounds].size)]; - [gridLayer setNeedsDisplay]; - [graphLayer setNeedsDisplay]; - [hudLayer setNeedsDisplay]; - - NSEnumerator *e = [edgeControlLayers objectEnumerator]; - CALayer *layer; - while (layer = [e nextObject]) { - [layer setFrame:[graphLayer frame]]; - [layer setNeedsDisplay]; - } -} - - -- (void)viewDidEndLiveResize { - [super viewDidEndLiveResize]; - NSPoint o = [transformer origin]; - o.x += round(([self bounds].size.width - oldBounds.size.width)/2.0f); - o.y += round(([self bounds].size.height - oldBounds.size.height)/2.0f); - [transformer setOrigin:o]; - oldBounds = [self bounds]; - [self refreshLayers]; -} - -- (void)applyStyleToSelectedNodes:(NodeStyle*)style { - NSString *oldTikz = [graph tikz]; - - for (Node *n in [pickSupport selectedNodes]) { - [n setStyle:style]; - [[nodeLayers objectForKey:n] setNeedsDisplay]; - } - - [self registerUndo:oldTikz withActionName:@"Apply Style to Nodes"]; - [self refreshLayers]; - [self postGraphChange]; -} - -- (void)applyStyleToSelectedEdges:(EdgeStyle*)style { - NSString *oldTikz = [graph tikz]; - - for (Edge *e in [pickSupport selectedEdges]) { - [e setStyle:style]; - } - - [self registerUndo:oldTikz withActionName:@"Apply Style to Edges"]; - [self refreshLayers]; - [self postGraphChange]; -} - -- (void)addNodeLayers:(Node*)n { - // add a node to the graph - [graph addNode:n]; - - NSPoint pt = [transformer toScreen:[n point]]; - - // add a node layer - NodeLayer *nl = [[NodeLayer alloc] initWithNode:n transformer:transformer]; - [nl setCenter:pt]; - [nodeLayers setObject:nl forKey:n]; - [graphLayer addSublayer:nl]; - [nl setNeedsDisplay]; -} - -- (void)removeNodeLayers:(Node*)n { - [[nodeLayers objectForKey:n] removeFromSuperlayer]; - [nodeLayers removeObjectForKey:n]; -} - -- (void)addEdgeLayers:(Edge *)e { - [graph addEdge:e]; - EdgeControlLayer *ecl = [[EdgeControlLayer alloc] initWithEdge:e andTransformer:transformer]; - [edgeControlLayers setObject:ecl forKey:e]; - [ecl setFrame:CGRectMake(10, 10, 100, 100)]; - [hudLayer addSublayer:ecl]; - [ecl setNeedsDisplay]; -} - -- (void)removeEdgeLayers:(Edge*)e { - [[edgeControlLayers objectForKey:e] removeFromSuperlayer]; - [edgeControlLayers removeObjectForKey:e]; - [self refreshLayers]; -} - -- (BOOL)circleWithCenter:(NSPoint)center andRadius:(float)radius containsPoint:(NSPoint)p { - float dx = center.x - p.x; - float dy = center.y - p.y; - return (dx*dx + dy*dy) <= radius*radius; -} - -- (BOOL)node:(Node*)node containsPoint:(NSPoint)p { - NodeLayer *nl = [nodeLayers objectForKey:node]; - return [nl nodeContainsPoint:p]; -} - -- (BOOL)edge:(Edge*)edge containsPoint:(NSPoint)p { -// NSPoint center = [transformer toScreen:edge.mid]; -// float dx = center.x - p.x; -// float dy = center.y - p.y; -// float radius = 5.0f; // tolerence for clicks -// return (dx*dx + dy*dy) <= radius*radius; - - CGContextRef ctx = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort]; - - // Save the graphics state before doing the hit detection. - CGContextSaveGState(ctx); - - NSPoint src = [transformer toScreen:[edge tail]]; - NSPoint targ = [transformer toScreen:[edge head]]; - NSPoint cp1 = [transformer toScreen:[edge cp1]]; - NSPoint cp2 = [transformer toScreen:[edge cp2]]; - - CGContextSetLineWidth(ctx, 8.0f); - - CGContextMoveToPoint(ctx, src.x, src.y); - CGContextAddCurveToPoint(ctx, cp1.x, cp1.y, cp2.x, cp2.y, targ.x, targ.y); - - BOOL containsPoint = CGContextPathContainsPoint(ctx, NSPointToCGPoint(p), kCGPathStroke); - - CGContextSetRGBStrokeColor(ctx, 0, 0, 0, 0); - - CGContextStrokePath(ctx); - //CGContextFlush(ctx); - CGContextRestoreGState(ctx); - - return containsPoint; -} - -- (void)shiftNodes:(NSSet*)set from:(NSPoint)source to:(NSPoint)dest { - float dx = dest.x - source.x; - float dy = dest.y - source.y; - - for (Node *n in set) { - NSPoint p = [transformer toScreen:[n point]]; - p = [grid snapScreenPoint:NSMakePoint(p.x+dx, p.y+dy)]; - [n setPoint:[transformer fromScreen:p]]; - } -} - - -- (void)mouseDown:(NSEvent*)theEvent { - if (!enabled) return; - - [self updateMouseMode]; - - dragOrigin = [self convertPoint:[theEvent locationInWindow] fromView:nil]; - dragTarget = dragOrigin; - - graphTikzOnMouseDown = [graph tikz]; - - if ([theEvent modifierFlags] & NSCommandKeyMask) { - oldTransformerOrigin = [transformer origin]; - oldMainOrigin = [self frame].origin; - frameMoveMode = YES; - return; - } - - if (mouseMode == SelectMode) { - [selectionLayer setActive:YES]; - [selectionLayer setSelectBox:NSRectAroundPoints(dragOrigin, dragOrigin)]; - [selectionLayer setNeedsDisplay]; - - modifyEdge = nil; - NSPoint cp1, cp2; - for (Edge *e in [pickSupport selectedEdges]) { - cp1 = [transformer toScreen:[e cp1]]; - cp2 = [transformer toScreen:[e cp2]]; - if ([self circleWithCenter:cp1 - andRadius:[EdgeControlLayer handleRadius] - containsPoint:dragOrigin]) - { - mouseMode = SelectEdgeBendMode; - modifyEdge = e; - firstControlPoint = YES; - break; - } else if ([self circleWithCenter:cp2 - andRadius:[EdgeControlLayer handleRadius] - containsPoint:dragOrigin]) - { - mouseMode = SelectEdgeBendMode; - modifyEdge = e; - firstControlPoint = NO; - break; - } - } - - if (modifyEdge == nil) { // skip all the rest if we're modifying an edge - - leaderNode = nil; - - // in first pass, try to find a leader node, under the mouse - for (Node* n in [graph nodes]) { - if ([self node:n containsPoint:dragOrigin]) { - leaderNode = n; - [gridLayer setOpacity:1.0f]; - break; - } - } - - // if we found one, deselect the others (if appropriate) and go to move mode - if (leaderNode != nil) { - startPoint = [leaderNode point]; - - // if we select a node, we should always deselect all edges: - for (Edge *e in [graph edges]) [[edgeControlLayers objectForKey:e] deselect]; - [pickSupport deselectAllEdges]; - - BOOL shouldDeselect = - !([theEvent modifierFlags] & NSShiftKeyMask) - && ![pickSupport isNodeSelected:leaderNode]; - for (Node *n in [graph nodes]) { - if (n != leaderNode && shouldDeselect) { - [pickSupport deselectNode:n]; - [[[nodeLayers objectForKey:n] selection] deselect]; - } - } - - // ensure the leader node is actually selected - if (![pickSupport isNodeSelected:leaderNode]) { - [pickSupport selectNode:leaderNode]; - [[[nodeLayers objectForKey:leaderNode] selection] select]; - } - - - // put us in move mode - mouseMode = SelectMoveMode; - } else { - mouseMode = SelectBoxMode; - - // if we didn't select a node, start hunting for an edge to select - BOOL shouldDeselect = !([theEvent modifierFlags] & NSShiftKeyMask); - - if (shouldDeselect) { - [pickSupport deselectAllEdges]; - for (Edge *e in graph.edges) [[edgeControlLayers objectForKey:e] deselect]; - } - - for (Edge* e in [graph edges]) { - // find the first node under the pointer, select it, show its controls - // and deselect all others if shift isn't down - if ([self edge:e containsPoint:dragOrigin]) { - for (Node *n in [pickSupport selectedNodes]) [[[nodeLayers objectForKey:n] selection] deselect]; - - [pickSupport deselectAllNodes]; - [pickSupport selectEdge:e]; - [[edgeControlLayers objectForKey:e] select]; - break; - } - } // end for e in [graph edges] - } // end if leaderNode == nil - } // end if modifyEdge == nil - - } else if (mouseMode == NodeMode) { - // do nothing... - } else if (mouseMode == EdgeMode) { - for (Node *n in [graph nodes]) { - if ([self node:n containsPoint:dragOrigin]) { - [[[nodeLayers objectForKey:n] selection] highlight]; - } - } - mouseMode = EdgeDragMode; - } else if (mouseMode == CropMode) { - if ([graph hasBoundingBox]) { - float fudge = 3; - - NSRect bb = [graph boundingBox]; - NSPoint bl = [transformer toScreen:bb.origin]; - NSPoint tr = [transformer - toScreen:NSMakePoint(bb.origin.x+bb.size.width, - bb.origin.y+bb.size.height)]; - if (dragOrigin.x > bl.x-fudge && dragOrigin.x < tr.x+fudge && - dragOrigin.y > tr.y-fudge && dragOrigin.y < tr.y+fudge) - { - bboxBottomTop = 1; - } else if (dragOrigin.x > bl.x-fudge && dragOrigin.x < tr.x+fudge && - dragOrigin.y > bl.y-fudge && dragOrigin.y < bl.y+fudge) - { - bboxBottomTop = -1; - } else { - bboxBottomTop = 0; - } - - if (dragOrigin.y > bl.y-fudge && dragOrigin.y < tr.y+fudge && - dragOrigin.x > tr.x-fudge && dragOrigin.x < tr.x+fudge) - { - bboxLeftRight = 1; - } else if (dragOrigin.y > bl.y-fudge && dragOrigin.y < tr.y+fudge && - dragOrigin.x > bl.x-fudge && dragOrigin.x < bl.x+fudge) - { - bboxLeftRight = -1; - } else { - bboxLeftRight = 0; - } - - if (bboxBottomTop != 0 || bboxLeftRight != 0) { - mouseMode = CropDragMode; - } - } - } else { - printf("WARNING: MOUSE DOWN IN INVALID MODE.\n"); - } - - [self refreshLayers]; -} - -- (void)mouseDragged:(NSEvent *)theEvent { - if (!enabled) return; - dragTarget = [self convertPoint:[theEvent locationInWindow] fromView:nil]; - - if (frameMoveMode) { - NSPoint newTransOrigin, newMainOrigin; - NSPoint diff = NSMakePoint(dragTarget.x - dragOrigin.x, dragTarget.y - dragOrigin.y); - newTransOrigin.x = oldTransformerOrigin.x + diff.x; - newTransOrigin.y = oldTransformerOrigin.y + diff.y; - newMainOrigin.x = oldMainOrigin.x + diff.x; - newMainOrigin.y = oldMainOrigin.y + diff.y; - - [CATransaction begin]; - [CATransaction setValue:(id)kCFBooleanTrue forKey:kCATransactionDisableActions]; - [self setMainOrigin:newMainOrigin]; - [CATransaction commit]; - - [transformer setOrigin:newTransOrigin]; - return; - } - - if (mouseMode == SelectBoxMode) { - [selectionLayer setSelectBox:NSRectAroundPoints(dragOrigin, dragTarget)]; - [selectionLayer setNeedsDisplay]; - - for (Node* n in [graph nodes]) { - if (NSPointInRect([transformer toScreen:[n point]], [selectionLayer selectBox])) { - [[[nodeLayers objectForKey:n] selection] highlight]; - } else if (!([theEvent modifierFlags] & NSShiftKeyMask)) { - [[[nodeLayers objectForKey:n] selection] unhighlight]; - } - } - } else if (mouseMode == SelectMoveMode) { - if (leaderNode != nil) { - [self shiftNodes:[pickSupport selectedNodes] - from:[transformer toScreen:[leaderNode point]] - to:dragTarget]; - } else { - printf("WARNING: LEADER NODE SHOULD NOT BE NIL.\n"); - } - - [self refreshLayers]; - } else if (mouseMode == SelectEdgeBendMode) { - NSPoint src = [transformer toScreen:[[modifyEdge source] point]]; - NSPoint targ = [transformer toScreen:[[modifyEdge target] point]]; - float dx1 = targ.x - src.x; - float dy1 = targ.y - src.y; - float dx2, dy2; - if (firstControlPoint) { - dx2 = dragTarget.x - src.x; - dy2 = dragTarget.y - src.y; - } else { - dx2 = dragTarget.x - targ.x; - dy2 = dragTarget.y - targ.y; - } - float base_dist = sqrt(dx1*dx1 + dy1*dy1); - float handle_dist = sqrt(dx2*dx2 + dy2*dy2); - float wcourseness = 0.1f; - - if (![modifyEdge isSelfLoop]) { - if (base_dist != 0) { - [modifyEdge setWeight:roundToNearest(wcourseness, handle_dist/base_dist)]; - //round(handle_dist / (base_dist*wcourseness)) * wcourseness; - } else { - [modifyEdge setWeight: - roundToNearest(wcourseness, [transformer scaleFromScreen:handle_dist])]; - } - } - - - float control_angle = good_atan(dx2, dy2); - - int bcourseness = 15; - - if ([modifyEdge bendMode] == EdgeBendModeBasic) { - float bnd; - float base_angle = good_atan(dx1, dy1); - if (firstControlPoint) { - bnd = base_angle - control_angle; - } else { - bnd = control_angle - base_angle + pi; - if (bnd > pi) bnd -= 2*pi; - } - - [modifyEdge setBend:round(bnd * (180.0f / pi) * - (1.0f / (float)bcourseness)) * - bcourseness]; - } else { - int bnd = round(control_angle * (180.0f / pi) * - (1.0f / (float)bcourseness)) * - bcourseness; - if (firstControlPoint) { - if ([theEvent modifierFlags] & NSAlternateKeyMask) { - if ([modifyEdge isSelfLoop]) { - [modifyEdge setInAngle:[modifyEdge inAngle] + - (bnd - [modifyEdge outAngle])]; - } else { - [modifyEdge setInAngle:[modifyEdge inAngle] - - (bnd - [modifyEdge outAngle])]; - } - } - - [modifyEdge setOutAngle:bnd]; - } else { - if (theEvent.modifierFlags & NSAlternateKeyMask) { - if ([modifyEdge isSelfLoop]) { - [modifyEdge setOutAngle:[modifyEdge outAngle] + - (bnd - [modifyEdge inAngle])]; - } else { - [modifyEdge setOutAngle:[modifyEdge outAngle] - - (bnd - [modifyEdge inAngle])]; - } - } - - [modifyEdge setInAngle:bnd]; - } - } - - [self refreshLayers]; - } else if (mouseMode == NodeMode) { - // do nothing... - } else if (mouseMode == EdgeDragMode) { - for (Node *n in [graph nodes]) { - if ([self node:n containsPoint:dragOrigin] || - [self node:n containsPoint:dragTarget]) - { - [[[nodeLayers objectForKey:n] selection] highlight]; - } else { - [[[nodeLayers objectForKey:n] selection] unhighlight]; - } - } - - [self refreshLayers]; - } else if (mouseMode == CropMode || mouseMode == CropDragMode) { - NSPoint p1 = [transformer fromScreen:[grid snapScreenPoint:dragOrigin]]; - NSPoint p2 = [transformer fromScreen:[grid snapScreenPoint:dragTarget]]; - - NSRect bbox; - if (mouseMode == CropDragMode) { - bbox = [graph boundingBox]; - if (bboxBottomTop == -1) { - float dy = p2.y - bbox.origin.y; - bbox.origin.y += dy; - bbox.size.height -= dy; - } else if (bboxBottomTop == 1) { - float dy = p2.y - (bbox.origin.y + bbox.size.height); - bbox.size.height += dy; - } - - if (bboxLeftRight == -1) { - float dx = p2.x - bbox.origin.x; - bbox.origin.x += dx; - bbox.size.width -= dx; - } else if (bboxLeftRight == 1) { - float dx = p2.x - (bbox.origin.x + bbox.size.width); - bbox.size.width += dx; - } - } else { - bbox = NSRectAroundPoints(p1, p2); - } - - [graph setBoundingBox:bbox]; - [self postGraphChange]; - [self refreshLayers]; - } else { - printf("WARNING: MOUSE DRAGGED IN INVALID MODE.\n"); - } -} - -- (void)mouseUp:(NSEvent*)theEvent { - if (!enabled) return; - - if (frameMoveMode) { - [CATransaction begin]; - [CATransaction setValue:(id)kCFBooleanTrue forKey:kCATransactionDisableActions]; - [self resetMainOrigin]; - [self refreshLayers]; - [CATransaction commit]; - frameMoveMode = NO; - return; - } - - dragTarget = [self convertPoint:[theEvent locationInWindow] fromView:nil]; - - if ((mouseMode & SelectMode) == SelectMode && [theEvent clickCount] == 2) { - for (Edge *e in [graph edges]) { - if ([self edge:e containsPoint:dragTarget]) { - if ([e bendMode] == EdgeBendModeBasic) { - [e convertBendToAngles]; - [e setBendMode:EdgeBendModeInOut]; - } else { - [e convertAnglesToBend]; - [e setBendMode:EdgeBendModeBasic]; - } - - [self registerUndo:graphTikzOnMouseDown withActionName:@"Change Edge Mode"]; - [self postGraphChange]; - break; - } - } - } - - if (mouseMode == SelectBoxMode) { - for (Node* n in [graph nodes]) { - if (NSPointInRect([transformer toScreen:[n point]], [selectionLayer selectBox])) { - [pickSupport selectNode:n]; - [[[nodeLayers objectForKey:n] selection] select]; - } else if (!([theEvent modifierFlags] & NSShiftKeyMask)) { - [pickSupport deselectNode:n]; - [[[nodeLayers objectForKey:n] selection] deselect]; - } - } - - [selectionLayer setActive:NO]; - [selectionLayer setNeedsDisplay]; - [self postSelectionChange]; - - mouseMode = SelectMode; - } else if (mouseMode == SelectMoveMode) { - [gridLayer setOpacity:0.3f]; - - if (dragTarget.x != dragOrigin.x || dragTarget.y != dragOrigin.y) { - [self registerUndo:graphTikzOnMouseDown withActionName:@"Shift Nodes"]; - } - - leaderNode = nil; - - [self postGraphChange]; - mouseMode = SelectMode; - } else if (mouseMode == SelectEdgeBendMode) { - [self registerUndo:graphTikzOnMouseDown withActionName:@"Adjust Edge"]; - [self postGraphChange]; - mouseMode = SelectMode; - modifyEdge = nil; - } else if (mouseMode == NodeMode) { - NSPoint coords = [transformer fromScreen:[grid snapScreenPoint:dragTarget]]; - Node *n = [Node nodeWithPoint:coords]; - [n setStyle:[stylePaletteController activeNodeStyle]]; - [graph addNode:n]; - - [self registerUndo:graphTikzOnMouseDown withActionName:@"Add Node"]; - - [self addNodeLayers:n]; - [self postGraphChange]; - } else if (mouseMode == EdgeDragMode) { - Node *src = nil; - Node *targ = nil; - BOOL found = NO; // don't break the loop until everything is unhighlighted - for (Node *n in [graph nodes]) { - [[[nodeLayers objectForKey:n] selection] unhighlight]; - if (!found) { - if ([self node:n containsPoint:dragOrigin]) src = n; - if ([self node:n containsPoint:dragTarget]) targ = n; - if (src != nil && targ != nil) { - Edge *e = [Edge edgeWithSource:src andTarget:targ]; - [e setStyle:[stylePaletteController activeEdgeStyle]]; - [graph addEdge:e]; - [self registerUndo:graphTikzOnMouseDown withActionName:@"Add Edge"]; - [self addEdgeLayers:e]; - found = YES; - } - } - } - - [self postGraphChange]; - mouseMode = EdgeMode; - } else if (mouseMode == CropMode || mouseMode == CropDragMode) { - if (dragOrigin.x == dragTarget.x && dragOrigin.y == dragTarget.y) { - [graph setBoundingBox:NSMakeRect(0, 0, 0, 0)]; - [self registerUndo:graphTikzOnMouseDown withActionName:@"Clear Bounding Box"]; - [self postGraphChange]; - } else { - [self registerUndo:graphTikzOnMouseDown withActionName:@"Change Bounding Box"]; - } - - mouseMode = CropMode; - } else { - if (! ([theEvent modifierFlags] & NSCommandKeyMask)) - printf("WARNING: MOUSE UP IN INVALID MODE.\n"); - } - - [self refreshLayers]; -} - -- (void)drawNode:(Node*)nd onLayer:(CALayer*)layer inContext:(CGContextRef)context { - NSPoint pt = [transformer toScreen:[nd point]]; - - NodeLayer *nl = [nodeLayers objectForKey:nd]; - //[nl setStrokeWidth:2.0f]; - [nl setCenter:pt andAnimateWhen:(mouseMode != SelectMoveMode)]; -} - -- (void)drawEdge:(Edge*)e onLayer:(CALayer*)layer inContext:(CGContextRef)context { - CGContextSaveGState(context); - NSPoint src = [transformer toScreen:[e tail]]; - NSPoint targ = [transformer toScreen:[e head]]; - NSPoint cp1 = [transformer toScreen:[e cp1]]; - NSPoint cp2 = [transformer toScreen:[e cp2]]; - - // all nodes have the same radius. this will need to be fixed - float sradius = 0;//(slayer.ghost) ? 0 : slayer.radius; - float tradius = 0;//(tlayer.ghost) ? 0 : tlayer.radius; - - float sdx = cp1.x - src.x; - float sdy = cp1.y - src.y; - float sdist = sqrt(sdx*sdx + sdy*sdy); - float sshortx = (sdist==0) ? 0 : sdx/sdist * sradius; - float sshorty = (sdist==0) ? 0 : sdy/sdist * sradius; - - float tdx = cp2.x - targ.x; - float tdy = cp2.y - targ.y; - float tdist = sqrt(tdx*tdx + tdy*tdy); - float tshortx = (tdist==0) ? 0 : tdx/tdist * tradius; - float tshorty = (tdist==0) ? 0 : tdy/tdist * tradius; - - CGContextMoveToPoint(context, src.x+sshortx, src.y+sshorty); - CGContextAddCurveToPoint(context, cp1.x, cp1.y, cp2.x, cp2.y, targ.x+tshortx, targ.y+tshorty); - - - float lineWidth = [transformer scaleToScreen:0.04f]; - - CGContextSetLineWidth(context, lineWidth); - CGContextSetRGBStrokeColor(context, 0, 0, 0, 1); - CGContextSetRGBFillColor(context, 0, 0, 0, 1); - CGContextStrokePath(context); - - if ([e style] != nil) { - NSPoint p1,p2,p3; - - // draw edge decoration - switch ([[e style] decorationStyle]) { - case ED_None: - break; - case ED_Tick: - p1 = [transformer toScreen:[e leftNormal]]; - p2 = [transformer toScreen:[e rightNormal]]; - CGContextMoveToPoint(context, p1.x, p1.y); - CGContextAddLineToPoint(context, p2.x, p2.y); - CGContextStrokePath(context); - break; - case ED_Arrow: - p1 = [transformer toScreen:[e leftNormal]]; - p2 = [transformer toScreen:[e midTan]]; - p3 = [transformer toScreen:[e rightNormal]]; - CGContextMoveToPoint(context, p1.x, p1.y); - CGContextAddLineToPoint(context, p2.x, p2.y); - CGContextAddLineToPoint(context, p3.x, p3.y); - CGContextStrokePath(context); - break; - } - - // draw arrow head - switch ([[e style] headStyle]) { - case AH_None: - break; - case AH_Plain: - p1 = [transformer toScreen:[e leftHeadNormal]]; - p2 = [transformer toScreen:[e head]]; - p3 = [transformer toScreen:[e rightHeadNormal]]; - CGContextMoveToPoint(context, p1.x, p1.y); - CGContextAddLineToPoint(context, p2.x, p2.y); - CGContextAddLineToPoint(context, p3.x, p3.y); - CGContextStrokePath(context); - break; - case AH_Latex: - p1 = [transformer toScreen:[e leftHeadNormal]]; - p2 = [transformer toScreen:[e head]]; - p3 = [transformer toScreen:[e rightHeadNormal]]; - CGContextMoveToPoint(context, p1.x, p1.y); - CGContextAddLineToPoint(context, p2.x, p2.y); - CGContextAddLineToPoint(context, p3.x, p3.y); - CGContextClosePath(context); - CGContextFillPath(context); - break; - } - - // draw arrow tail - switch ([[e style] tailStyle]) { - case AH_None: - break; - case AH_Plain: - p1 = [transformer toScreen:[e leftTailNormal]]; - p2 = [transformer toScreen:[e tail]]; - p3 = [transformer toScreen:[e rightTailNormal]]; - CGContextMoveToPoint(context, p1.x, p1.y); - CGContextAddLineToPoint(context, p2.x, p2.y); - CGContextAddLineToPoint(context, p3.x, p3.y); - CGContextStrokePath(context); - break; - case AH_Latex: - p1 = [transformer toScreen:[e leftTailNormal]]; - p2 = [transformer toScreen:[e tail]]; - p3 = [transformer toScreen:[e rightTailNormal]]; - CGContextMoveToPoint(context, p1.x, p1.y); - CGContextAddLineToPoint(context, p2.x, p2.y); - CGContextAddLineToPoint(context, p3.x, p3.y); - CGContextClosePath(context); - CGContextFillPath(context); - break; - } - } - - - CGContextRestoreGState(context); - - if ([e hasEdgeNode]) { - Node *en = [e edgeNode]; - NSPoint mid = [transformer toScreen:[e mid]]; - if (![[en label] isEqual:@""]) { - [layer drawLabel:[en label] - atPoint:mid - inContext:context - usingTrans:transformer]; - } - } - - EdgeControlLayer *ecl = [edgeControlLayers objectForKey:e]; - [ecl setNeedsDisplay]; -} - - -// draw the graph layer --(void)drawLayer:(CALayer *)layer inContext:(CGContextRef)context { - for (Edge* e in [graph edges]) [self drawEdge:e onLayer:layer inContext:context]; - - for (Node* n in [graph nodes]) [self drawNode:n onLayer:layer inContext:context]; - - if ([graph hasBoundingBox]) { - CGRect bbox = NSRectToCGRect(NSIntegralRect( - [transformer rectToScreen:[graph boundingBox]])); - CGContextSetRGBStrokeColor(context, 1.0f, 0.7f, 0.5f, 1.0f); - CGContextSetLineWidth(context, 1.0f); - CGContextSetShouldAntialias(context, NO); - CGContextStrokeRect(context, bbox); - CGContextSetShouldAntialias(context, YES); - } - - if (mouseMode == EdgeDragMode) { - CGContextMoveToPoint(context, dragOrigin.x, dragOrigin.y); - CGContextAddLineToPoint(context, dragTarget.x, dragTarget.y); - CGContextSetLineWidth(context, 2); - CGContextSetRGBStrokeColor(context, 0, 0, 1, 1); - CGContextStrokePath(context); - } -} - -// if enabled, suppress the default "bonk" behaviour on key presses -- (void)keyDown:(NSEvent *)theEvent { - if (!enabled) [super keyDown:theEvent]; -} - -- (void)delete:(id)sender { - BOOL didDelete = NO; - NSString *oldTikz = [graph tikz]; - - if ([[pickSupport selectedNodes] count] != 0) { - GraphChange *change = [graph removeNodes:[pickSupport selectedNodes]]; - for (Node *n in [change affectedNodes]) [self removeNodeLayers:n]; - for (Edge *e in [change affectedEdges]) [self removeEdgeLayers:e]; - - [self refreshLayers]; - [self postGraphChange]; - didDelete = YES; - } - - if ([[pickSupport selectedEdges] count] != 0) { - [graph removeEdges:[pickSupport selectedEdges]]; - for (Edge *e in [pickSupport selectedEdges]) [self removeEdgeLayers:e]; - [self refreshLayers]; - [self postGraphChange]; - didDelete = YES; - } - - [pickSupport deselectAllNodes]; - [pickSupport deselectAllEdges]; - - if (didDelete) [self registerUndo:oldTikz withActionName:@"Delete Nodes or Edges"]; -} - -- (void)keyUp:(NSEvent *)theEvent { - if (!enabled) return; - - id sender = self; - switch ([theEvent keyCode]) { - case 51: // delete - [self delete:sender]; // "self" is the sender - break; - case 1: // S - [toolPaletteController setSelectedTool:TikzToolSelect]; - break; - case 45: // N - case 9: // V - [toolPaletteController setSelectedTool:TikzToolNode]; - break; - case 14: // E - [toolPaletteController setSelectedTool:TikzToolEdge]; - //[self updateMouseMode]; - break; - case 40: // K - [toolPaletteController setSelectedTool:TikzToolCrop]; - break; - } - [self refreshLayers]; -} - - -- (void)deselectAll:(id)sender { - [pickSupport deselectAllNodes]; - [pickSupport deselectAllEdges]; - - for (Node *n in [graph nodes]) { - [[[nodeLayers objectForKey:n] selection] deselect]; - } - - for (Edge *e in [graph edges]) { - [[edgeControlLayers objectForKey:e] deselect]; - } - - [self postSelectionChange]; -} - -- (void)selectAll:(id)sender { - [pickSupport selectAllNodes:[NSSet setWithArray:[graph nodes]]]; - - for (Node *n in [graph nodes]) { - [[[nodeLayers objectForKey:n] selection] select]; - } - - [self postSelectionChange]; -} - - -- (void)updateMouseMode { - switch (toolPaletteController.selectedTool) { - case TikzToolSelect: - mouseMode = SelectMode; - break; - case TikzToolNode: - mouseMode = NodeMode; - break; - case TikzToolEdge: - mouseMode = EdgeMode; - break; - case TikzToolCrop: - mouseMode = CropMode; - break; - } -} - -- (void)setDocumentUndoManager:(NSUndoManager *)um { - documentUndoManager = um; -} - -- (void)copy:(id)sender { - if ([[pickSupport selectedNodes] count] != 0) { - Graph *clip = [graph copyOfSubgraphWithNodes:[pickSupport selectedNodes]]; - NSString *tikz = [clip tikz]; - NSData *data = [tikz dataUsingEncoding:NSUTF8StringEncoding]; - //NSLog(@"about to copy: %@", tikz); - NSPasteboard *cb = [NSPasteboard generalPasteboard]; - [cb declareTypes:[NSArray arrayWithObject:@"tikzpicture"] owner:self]; - [cb setData:data forType:@"tikzpicture"]; - } -} - -- (void)cut:(id)sender { - if ([[pickSupport selectedNodes] count] != 0) { - [self copy:sender]; - [self delete:sender]; - - // otherwise, menu will say "Undo Delete Graph" - [documentUndoManager setActionName:@"Cut Graph"]; - } -} - -- (void)paste:(id)sender { - NSPasteboard *cb = [NSPasteboard generalPasteboard]; - NSString *type = [cb availableTypeFromArray:[NSArray arrayWithObject:@"tikzpicture"]]; - if (type) { - NSData *data = [cb dataForType:type]; - NSString *tikz = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]; - //NSLog(@"pasting tikz:\n%@",tikz); - Graph *clip = [TikzGraphAssembler parseTikz:tikz]; - if (clip) { - //NSLog(@"tikz pasted:\n%@",tikz); - NSRect graphBounds = [graph bounds]; - NSRect clipBounds = [clip bounds]; - float dx = graphBounds.origin.x + - graphBounds.size.width - - clipBounds.origin.x + 0.5f; - [clip shiftNodes:[clip nodes] byPoint:NSMakePoint(dx, 0)]; - - if ([[clip nodes] count] != 0) { - NSString *oldTikz = [graph tikz]; - [self deselectAll:self]; - - // select everything from the clipboard - for (Node *n in [clip nodes]) { - [n attachStyleFromTable:[stylePaletteController nodeStyles]]; - [self addNodeLayers:n]; - [pickSupport selectNode:n]; - [[[nodeLayers objectForKey:n] selection] select]; - } - - for (Edge *e in [clip edges]) { - [e attachStyleFromTable:[stylePaletteController edgeStyles]]; - [self addEdgeLayers:e]; - } - - [graph insertGraph:clip]; - - [self registerUndo:oldTikz withActionName:@"Paste Graph"]; - [self refreshLayers]; - [self postGraphChange]; - } - } else { - NSLog(@"Error: couldn't parse tikz picture from clipboard."); - } - - } -} - -- (void)bringForward:(id)sender { - NSString *oldTikz = [graph tikz]; - [graph bringNodesForward:[pickSupport selectedNodes]]; - [graph bringEdgesForward:[pickSupport selectedEdges]]; - [self registerUndo:oldTikz withActionName:@"Bring Forward"]; - [self postGraphChange]; - [self refreshLayers]; -} - -- (void)sendBackward:(id)sender { - NSString *oldTikz = [graph tikz]; - [graph sendNodesBackward:[pickSupport selectedNodes]]; - [graph sendEdgesBackward:[pickSupport selectedEdges]]; - [self registerUndo:oldTikz withActionName:@"Send Backward"]; - [self postGraphChange]; - [self refreshLayers]; -} - -- (void)bringToFront:(id)sender { - NSString *oldTikz = [graph tikz]; - [graph bringNodesToFront:[pickSupport selectedNodes]]; - [graph bringEdgesToFront:[pickSupport selectedEdges]]; - [self registerUndo:oldTikz withActionName:@"Bring to Front"]; - [self postGraphChange]; - [self refreshLayers]; -} - -- (void)sendToBack:(id)sender { - NSString *oldTikz = [graph tikz]; - [graph sendNodesToBack:[pickSupport selectedNodes]]; - [graph sendEdgesToBack:[pickSupport selectedEdges]]; - [self registerUndo:oldTikz withActionName:@"Send to Back"]; - [self postGraphChange]; - [self refreshLayers]; -} - -- (void)flipHorizonal:(id)sender { - NSString *oldTikz = [graph tikz]; - [graph flipHorizontalNodes:[pickSupport selectedNodes]]; - [self registerUndo:oldTikz withActionName:@"Flip Horizontal"]; - [self postGraphChange]; - [self refreshLayers]; -} - -- (void)flipVertical:(id)sender { - NSString *oldTikz = [graph tikz]; - [graph flipVerticalNodes:[pickSupport selectedNodes]]; - [self registerUndo:oldTikz withActionName:@"Flip Vertical"]; - [self postGraphChange]; - [self refreshLayers]; -} - -- (void)reverseEdgeDirection:(id)sender { - NSString *oldTikz = [graph tikz]; - - NSSet *es; - if ([[pickSupport selectedEdges] count] != 0) { - es = [pickSupport selectedEdges]; - } else { - es = [graph incidentEdgesForNodes:[pickSupport selectedNodes]]; - } - - for (Edge *e in es) [e reverse]; - - [self registerUndo:oldTikz withActionName:@"Flip Edge Direction"]; - [self postGraphChange]; - [self refreshLayers]; -} - -- (BOOL)acceptsFirstResponder { return YES; } -- (BOOL)acceptsFirstMouse:(NSEvent *)theEvent { return YES; } -- (BOOL)canBecomeKeyView { return YES; } - - -@end diff --git a/tikzit/src/osx/Grid.h b/tikzit/src/osx/Grid.h deleted file mode 100644 index 76826e2..0000000 --- a/tikzit/src/osx/Grid.h +++ /dev/null @@ -1,48 +0,0 @@ -// -// Grid.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "Transformer.h" - -@interface Grid : NSObject { - float gridX, gridY; - //float gridCellX, gridCellY; - int subdivisions; - Transformer *transformer; - NSSize size; -} - -@property NSSize size; - -- (id)initWithSpacing:(float)spacing subdivisions:(int)subs transformer:(Transformer*)t; -+ (Grid*)gridWithSpacing:(float)spacing subdivisions:(int)subs transformer:(Transformer*)t; -- (NSPoint)snapScreenPoint:(NSPoint)p; -- (float)gridX; -- (float)gridY; -- (int)subdivisions; -- (void)setSubdivisions:(int)subs; - -// Grid can also draw itself on a layer -- (void)drawLayer:(CALayer *)layer inContext:(CGContextRef)ctx; - -@end diff --git a/tikzit/src/osx/Grid.m b/tikzit/src/osx/Grid.m deleted file mode 100644 index aa35c1f..0000000 --- a/tikzit/src/osx/Grid.m +++ /dev/null @@ -1,152 +0,0 @@ -// -// Grid.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "Grid.h" - - -@implementation Grid - -@synthesize size; - -- (id)initWithSpacing:(float)spacing - subdivisions:(int)subs - transformer:(Transformer*)t -{ - if (!(self = [super init])) return nil; - gridX = spacing; - gridY = spacing; - subdivisions = subs; - size.width = 0; - size.height = 0; - transformer = t; - return self; -} - -+ (Grid*)gridWithSpacing:(float)spacing - subdivisions:(int)subs - transformer:(Transformer*)t -{ - return [[Grid alloc] initWithSpacing:spacing - subdivisions:subs - transformer:t]; -} - -- (float)gridX { - return gridX; -} - -- (float)gridY { - return gridY; -} - -- (int)subdivisions { - return subdivisions; -} - -- (void)setSubdivisions:(int)subs { - subdivisions = subs; -} - -- (NSPoint)snapScreenPoint:(NSPoint)p { - NSPoint snap; - - float gridCellX = [transformer scaleToScreen:gridX] / (float)subdivisions; - float gridCellY = [transformer scaleToScreen:gridY] / (float)subdivisions; - - // snap along grid lines, relative to the origin - snap.x = floor(((p.x-[transformer origin].x)/gridCellX)+0.5)*gridCellX + [transformer origin].x; - snap.y = floor(((p.y-[transformer origin].y)/gridCellY)+0.5)*gridCellY + [transformer origin].y; - return snap; -} - --(void)drawLayer:(CALayer *)layer inContext:(CGContextRef)context -{ - CGContextSaveGState(context); - - CGContextSetShouldAntialias(context, NO); - - float x,y; - float grX = [transformer scaleToScreen:gridX]; - float grY = [transformer scaleToScreen:gridY]; - - float gridCellX = grX / (float)subdivisions; - float gridCellY = grY / (float)subdivisions; - - for (x = [transformer origin].x + gridCellX; x < size.width; x += gridCellX) { - CGContextMoveToPoint(context, x, 0); - CGContextAddLineToPoint(context, x, size.height); - } - - for (x = [transformer origin].x - gridCellX; x > 0; x -= gridCellX) { - CGContextMoveToPoint(context, x, 0); - CGContextAddLineToPoint(context, x, size.height); - } - - for (y = [transformer origin].y + gridCellY; y < size.height; y += gridCellY) { - CGContextMoveToPoint(context, 0, y); - CGContextAddLineToPoint(context, size.width, y); - } - - for (y = [transformer origin].y - gridCellY; y > 0; y -= gridCellY) { - CGContextMoveToPoint(context, 0, y); - CGContextAddLineToPoint(context, size.width, y); - } - - CGContextSetRGBStrokeColor(context, 0.9, 0.9, 1, 1); - CGContextStrokePath(context); - - for (x = [transformer origin].x + grX; x < size.width; x += grX) { - CGContextMoveToPoint(context, x, 0); - CGContextAddLineToPoint(context, x, size.height); - } - - for (x = [transformer origin].x - grX; x > 0; x -= grX) { - CGContextMoveToPoint(context, x, 0); - CGContextAddLineToPoint(context, x, size.height); - } - - for (y = [transformer origin].y + grY; y < size.height; y += grY) { - CGContextMoveToPoint(context, 0, y); - CGContextAddLineToPoint(context, size.width, y); - } - - for (y = [transformer origin].y + grY; y > 0; y -= grY) { - CGContextMoveToPoint(context, 0, y); - CGContextAddLineToPoint(context, size.width, y); - } - - CGContextSetRGBStrokeColor(context, 0.8, 0.8, 0.9, 1); - CGContextStrokePath(context); - - CGContextMoveToPoint(context, [transformer origin].x, 0); - CGContextAddLineToPoint(context, [transformer origin].x, size.height); - CGContextMoveToPoint(context, 0, [transformer origin].y); - CGContextAddLineToPoint(context, size.width, [transformer origin].y); - - CGContextSetRGBStrokeColor(context, 0.6, 0.6, 0.7, 1); - CGContextStrokePath(context); - - CGContextRestoreGState(context); -} - -@end diff --git a/tikzit/src/osx/MultiCombo.h b/tikzit/src/osx/MultiCombo.h deleted file mode 100644 index c8ec769..0000000 --- a/tikzit/src/osx/MultiCombo.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// MultiCombo.h -// TikZiT -// -// Created by Aleks Kissinger on 21/04/2011. -// Copyright 2011 __MyCompanyName__. All rights reserved. -// - -#import - - -@interface MultiCombo : NSComboBox { - BOOL multi; -} - -@property (readwrite,assign) BOOL multi; - -@end diff --git a/tikzit/src/osx/MultiCombo.m b/tikzit/src/osx/MultiCombo.m deleted file mode 100644 index 8930460..0000000 --- a/tikzit/src/osx/MultiCombo.m +++ /dev/null @@ -1,38 +0,0 @@ -// -// MultiCombo.m -// TikZiT -// -// Created by Aleks Kissinger on 21/04/2011. -// Copyright 2011 __MyCompanyName__. All rights reserved. -// - -#import "MultiCombo.h" - - -@implementation MultiCombo - -- (void)textDidChange:(NSNotification *)notification { - [super textDidChange:notification]; - [self setMulti:NO]; -} - -- (void)setMulti:(BOOL)m { - multi = m; - if (multi) { - [self setTextColor:[NSColor grayColor]]; - [self setStringValue:@"multiple values"]; - } -} - -- (BOOL)multi { return multi; } - -- (BOOL)becomeFirstResponder { - [super becomeFirstResponder]; - if ([self multi]) { - [self setTextColor:[NSColor blackColor]]; - [self setStringValue:@""]; - } - return YES; -} - -@end diff --git a/tikzit/src/osx/MultiField.h b/tikzit/src/osx/MultiField.h deleted file mode 100644 index 39eeefa..0000000 --- a/tikzit/src/osx/MultiField.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// LabelField.h -// TikZiT -// -// Created by Aleks Kissinger on 20/04/2011. -// Copyright 2011 __MyCompanyName__. All rights reserved. -// - -#import - - -@interface MultiField : NSTextField { - BOOL multi; -} - -@property (readwrite,assign) BOOL multi; - -@end diff --git a/tikzit/src/osx/MultiField.m b/tikzit/src/osx/MultiField.m deleted file mode 100644 index 7c5aac3..0000000 --- a/tikzit/src/osx/MultiField.m +++ /dev/null @@ -1,53 +0,0 @@ -// -// LabelField.m -// TikZiT -// -// Created by Aleks Kissinger on 20/04/2011. -// Copyright 2011 __MyCompanyName__. All rights reserved. -// - -#import "MultiField.h" - - -@implementation MultiField - -- (void)textDidChange:(NSNotification *)notification { - [super textDidChange:notification]; - [self setMulti:NO]; -} - -- (void)setMulti:(BOOL)m { - multi = m; - if (multi) { - [self setTextColor:[NSColor grayColor]]; - [self setStringValue:@"multiple values"]; - } -} - -- (BOOL)multi { return multi; } - -- (BOOL)becomeFirstResponder { - [super becomeFirstResponder]; - if ([self multi]) { - [self setTextColor:[NSColor blackColor]]; - [self setStringValue:@""]; - } - return YES; -} - -//- (BOOL)textShouldBeginEditing:(NSText *)textObject { -// [super textShouldBeginEditing:textObject]; -// NSLog(@"about to type"); -// return YES; -//} - -//- (void)textDidEndEditing:(NSNotification *)obj { -// [super textDidEndEditing:obj]; -// -// NSLog(@"focus lost"); -// if ([self multi]) { -// [self setMulti:YES]; -// } -//} - -@end diff --git a/tikzit/src/osx/NilToEmptyStringTransformer.h b/tikzit/src/osx/NilToEmptyStringTransformer.h deleted file mode 100644 index 1445a94..0000000 --- a/tikzit/src/osx/NilToEmptyStringTransformer.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// NilToEmptyStringTransformer.h -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import - -@interface NilToEmptyStringTransformer : NSValueTransformer - -@end diff --git a/tikzit/src/osx/NilToEmptyStringTransformer.m b/tikzit/src/osx/NilToEmptyStringTransformer.m deleted file mode 100644 index 413f404..0000000 --- a/tikzit/src/osx/NilToEmptyStringTransformer.m +++ /dev/null @@ -1,53 +0,0 @@ -// -// NilToEmptyStringTransformer.m -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "NilToEmptyStringTransformer.h" - -@implementation NilToEmptyStringTransformer - -- (id)init { - if (!(self = [super init])) return nil; - return self; -} - -+ (Class)transformedValueClass { - return [NSString class]; -} - -+ (BOOL)allowsReverseTransformation { - return YES; -} - -- (id)transformedValue:(id)value { - if (value == nil) { - return @""; - } else { - return value; - } -} - -- (id)reverseTransformedValue:(id)value { - return [self transformedValue:value]; -} - -@end diff --git a/tikzit/src/osx/NodeLayer.h b/tikzit/src/osx/NodeLayer.h deleted file mode 100644 index dbcdac5..0000000 --- a/tikzit/src/osx/NodeLayer.h +++ /dev/null @@ -1,62 +0,0 @@ -// -// NodeLayer.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import -#import "Transformer.h" -#import "Shape.h" -#import "Node.h" -#import "NodeStyle+Coder.h" -#import "NodeSelectionLayer.h" - -@interface NodeLayer : CALayer { - Node *node; - Shape *shape; - CGMutablePathRef path; - float textwidth; - NSPoint center; - Transformer *transformer; - Transformer *localTrans; - NodeSelectionLayer *selection; - BOOL rescale; - BOOL dirty; // need to rebuild CGBezierPath of the shape -} - -@property (strong) Node *node; -@property (assign) NSPoint center; -@property (assign) BOOL rescale; -@property (strong) NodeSelectionLayer *selection; -@property (readonly) CGMutablePathRef path; - -- (id)initWithNode:(Node*)n transformer:(Transformer*)t; -- (NSColor*)strokeColor; -- (NSColor*)fillColor; -- (float)strokeWidth; - -- (void)setCenter:(NSPoint)ctr andAnimateWhen:(BOOL)anim; -- (void)updateFrame; -- (BOOL)nodeContainsPoint:(NSPoint)p; - -- (void)drawInContext:(CGContextRef)context; - -@end diff --git a/tikzit/src/osx/NodeLayer.m b/tikzit/src/osx/NodeLayer.m deleted file mode 100644 index 5d15585..0000000 --- a/tikzit/src/osx/NodeLayer.m +++ /dev/null @@ -1,238 +0,0 @@ -// -// NodeLayer.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "NodeLayer.h" -#import "CALayer+DrawLabel.h" -#import "NSString+LatexConstants.h" -#import "Shape.h" -#import "ShapeNames.h" -#import "Node.h" -#import "Edge.h" - -@implementation NodeLayer - -@synthesize node, selection, rescale; - -- (id)initWithNode:(Node *)n transformer:(Transformer*)t { - if (!(self = [super init])) return nil; - node = n; - selection = [[NodeSelectionLayer alloc] init]; - [selection setNodeLayer:self]; - localTrans = [[Transformer alloc] init]; - - [self addSublayer:selection]; - textwidth = 0.0f; - center = NSMakePoint(0.0f, 0.0f); - transformer = t; - - path = NULL; - rescale = YES; - dirty = YES; - - [self updateFrame]; - return self; -} - -- (NSColor*)strokeColor { - if ([node style] != nil) { - return [[[node style] strokeColor] colorUsingColorSpace:[NSColorSpace deviceRGBColorSpace]]; - } else { - return nil; - } -} - -- (NSColor*)fillColor { - if ([node style] != nil) { - return [[[node style] fillColor] colorUsingColorSpace:[NSColorSpace deviceRGBColorSpace]]; - } else { - return nil; - } -} - -- (float)strokeWidth { - if ([node style] != nil) { - return [node.style strokeThickness]; - } else { - return [NodeStyle defaultStrokeThickness]; - } -} - -- (NSPoint)center { return center; } - -- (void)setCenter:(NSPoint)ctr { - center.x = round(ctr.x); - center.y = round(ctr.y); - [self updateFrame]; -} - -- (void)setCenter:(NSPoint)ctr andAnimateWhen:(BOOL)anim { - [CATransaction begin]; - if (!anim) { - [CATransaction setValue:(id)kCFBooleanTrue forKey:kCATransactionDisableActions]; - } - [self setCenter:ctr]; - [CATransaction commit]; -} - -- (void)updateShape { - Shape *s = ([node style] != nil) ? - [Shape shapeForName:[[node style] shapeName]] : - [Shape shapeForName:SHAPE_CIRCLE]; - if (s != shape) { // straight pointer comparison - shape = s; - dirty = YES; - } -} - -- (void)updateLocalTrans { - float scale = ([node style] != nil) ? [[node style] scale] : 1.0f; - - Transformer *t = [Transformer transformer]; - float rad = ([transformer scaleToScreen:scale] / 2.0f) + 8.0f; - [t setOrigin:NSMakePoint(rad, rad)]; - [t setScale:[transformer scale]*((rescale)?scale:0.8f)]; - - if (![localTrans isEqual:t]) { - dirty = YES; - localTrans = t; - } -} - -- (void)updateFrame { - [self updateLocalTrans]; - [self updateShape]; - float rad = [localTrans origin].x; - [self setFrame:CGRectIntegral(CGRectMake(center.x - rad, center.y - rad, 2*rad, 2*rad))]; - NSRect bds = NSMakeRect(0, 0, 2*rad, 2*rad); - [selection setFrame:NSRectToCGRect(bds)]; - - [self setNeedsDisplay]; - [selection setNeedsDisplay]; -} - -- (CGMutablePathRef)path { - if (dirty) { - CGMutablePathRef pth = CGPathCreateMutable(); - NSPoint p, cp1, cp2; - for (NSArray *arr in [shape paths]) { - BOOL fst = YES; - for (Edge *e in arr) { - if (fst) { - fst = NO; - p = [localTrans toScreen:[[e source] point]]; - CGPathMoveToPoint(pth, nil, p.x, p.y); - } - - p = [localTrans toScreen:[[e target] point]]; - if ([e isStraight]) { - CGPathAddLineToPoint(pth, nil, p.x, p.y); - } else { - cp1 = [localTrans toScreen:[e cp1]]; - cp2 = [localTrans toScreen:[e cp2]]; - CGPathAddCurveToPoint(pth, nil, cp1.x, cp1.y, cp2.x, cp2.y, p.x, p.y); - } - } - - CGPathCloseSubpath(pth); - } - - if (path != NULL) CFRelease(path); - path = pth; - dirty = NO; - } - - - return path; -} - -- (BOOL)nodeContainsPoint:(NSPoint)p { - CGPoint p1 = CGPointMake(p.x - [self frame].origin.x, p.y - [self frame].origin.y); - return CGPathContainsPoint([self path],nil,p1,NO); -} - - -- (void)drawInContext:(CGContextRef)context { - CGContextSaveGState(context); - - - if ([node style] == nil) { - CGContextSetRGBStrokeColor(context, 0.4f, 0.4f, 0.7f, 1.0f); - CGContextSetRGBFillColor(context, 0.4f, 0.4f, 0.7f, 1.0f); - //CGRect fr = [self frame]; - CGRect bds = NSRectToCGRect([localTrans rectToScreen:NSMakeRect(-0.5, -0.5, 1, 1)]); - CGRect pt = CGRectMake(CGRectGetMidX(bds)-1.0f, CGRectGetMidY(bds)-1.0f, 2.0f, 2.0f); - CGContextSetLineWidth(context, 0); - CGContextAddEllipseInRect(context, pt); - CGContextFillPath(context); - - // HACK: for some reason, CGFloat isn't getting typedef'ed properly - -#ifdef __x86_64__ - const double dash[2] = {2.0,2.0}; -#else - const float dash[2] = {2.0,2.0}; -#endif - CGContextSetLineDash(context, 0.0, dash, 2); - CGContextSetLineWidth(context, 1); - CGContextAddPath(context, [self path]); - CGContextStrokePath(context); - } else { - NSColor *stroke = [self strokeColor]; - NSColor *fill = [self fillColor]; - - CGContextSetRGBStrokeColor(context, - [stroke redComponent], - [stroke greenComponent], - [stroke blueComponent], - [stroke alphaComponent]); - - CGContextSetLineWidth(context, [self strokeWidth]); - - CGContextSetRGBFillColor(context, - [fill redComponent], - [fill greenComponent], - [fill blueComponent], - [fill alphaComponent]); - - - CGContextSetLineWidth(context, [self strokeWidth]); - CGContextAddPath(context, [self path]); - CGContextDrawPath(context, kCGPathFillStroke); - } - - if (!([node label] == nil || [[node label] isEqual:@""])) { - NSPoint labelPt = NSMakePoint([self frame].size.width/2, [self frame].size.height/2); - [self drawLabel:[[node label] stringByExpandingLatexConstants] - atPoint:labelPt - inContext:context - usingTrans:transformer]; - } - - CGContextRestoreGState(context); -} - -- (void)dealloc { - if (path != NULL) CFRelease(path); -} - -@end diff --git a/tikzit/src/osx/NodeSelectionLayer.h b/tikzit/src/osx/NodeSelectionLayer.h deleted file mode 100644 index 99ee75f..0000000 --- a/tikzit/src/osx/NodeSelectionLayer.h +++ /dev/null @@ -1,45 +0,0 @@ -// -// NodeSelectionLayer.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import -#import "Shape.h" - -@class NodeLayer; - -@interface NodeSelectionLayer : CALayer { - BOOL selected; - CGMutablePathRef path; - NSLock *drawLock; - NodeLayer *nodeLayer; -} - -@property NodeLayer *nodeLayer; - -- (id)init; -- (void)select; -- (void)deselect; -- (void)highlight; -- (void)unhighlight; - -@end diff --git a/tikzit/src/osx/NodeSelectionLayer.m b/tikzit/src/osx/NodeSelectionLayer.m deleted file mode 100644 index 02b8ac2..0000000 --- a/tikzit/src/osx/NodeSelectionLayer.m +++ /dev/null @@ -1,93 +0,0 @@ -// -// NodeSelectionLayer.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "NodeSelectionLayer.h" -#import "NodeLayer.h" -#import "CircleShape.h" - -@implementation NodeSelectionLayer - -@synthesize nodeLayer; - -- (id)init { - if (!(self = [super init])) return nil; - selected = NO; - drawLock = [[NSLock alloc] init]; - nodeLayer = nil; - [self setOpacity:0.0f]; - return self; -} - - -- (void)select { - selected = YES; - [self setOpacity:0.5f]; -} - -- (void)deselect { - selected = NO; - [self setOpacity:0.0f]; -} - -- (void)highlight { - if (!selected) { - [self setOpacity:0.25f]; - } -} - -- (void)unhighlight { - if (!selected) { - [self setOpacity:0.0f]; - } -} - -//- (CGMutablePathRef)path { -// return path; -//} -// -//- (void)setPath:(CGMutablePathRef)p { -// path = CGPathCreateMutableCopy(p); -// CFMakeCollectable(path); -//} - -- (void)drawInContext:(CGContextRef)context { - [drawLock lock]; - CGContextSaveGState(context); - - //CGContextSetRGBStrokeColor(context, 0.61f, 0.735f, 1.0f, 1.0f); - CGContextSetRGBStrokeColor(context, 0.61f, 0.735f, 1.0f, 1.0f); - CGContextSetRGBFillColor(context, 0.61f, 0.735f, 1.0f, 1.0f); - CGContextSetLineWidth(context, 6.0f); - - if (nodeLayer != nil) { - CGContextAddPath(context, [nodeLayer path]); - } else { - NSLog(@"WARNING: attempting to draw selection with path = nil."); - } - CGContextDrawPath(context, kCGPathFillStroke); - - CGContextRestoreGState(context); - [drawLock unlock]; -} - -@end diff --git a/tikzit/src/osx/NodeStyle+Coder.h b/tikzit/src/osx/NodeStyle+Coder.h deleted file mode 100644 index b6443af..0000000 --- a/tikzit/src/osx/NodeStyle+Coder.h +++ /dev/null @@ -1,36 +0,0 @@ -// -// NodeStyle+Coder.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "NodeStyle.h" - - -@interface NodeStyle(Coder) - -@property (copy) NSColor *fillColor; -@property (copy) NSColor *strokeColor; - -- (id)initWithCoder:(NSCoder *)coder; -- (void)encodeWithCoder:(NSCoder *)coder; - -@end diff --git a/tikzit/src/osx/NodeStyle+Coder.m b/tikzit/src/osx/NodeStyle+Coder.m deleted file mode 100644 index d3623f5..0000000 --- a/tikzit/src/osx/NodeStyle+Coder.m +++ /dev/null @@ -1,91 +0,0 @@ -// -// NodeStyle+Coder.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "NodeStyle+Coder.h" -#import "ShapeNames.h" - -@implementation NodeStyle(Coder) - -- (NSColor*)fillColor { - return [NSColor colorWithDeviceRed:fillColorRGB.redFloat - green:fillColorRGB.greenFloat - blue:fillColorRGB.blueFloat - alpha:1.0f]; -} - -- (void)setFillColor:(NSColor*)c { - NSColor *c1 = [c colorUsingColorSpaceName:NSDeviceRGBColorSpace]; - [self willChangeValueForKey:@"fillColorIsKnown"]; - fillColorRGB = [ColorRGB colorWithFloatRed:c1.redComponent - green:c1.greenComponent - blue:c1.blueComponent]; - [self didChangeValueForKey:@"fillColorIsKnown"]; -} - -- (NSColor*)strokeColor { - return [NSColor colorWithDeviceRed:strokeColorRGB.redFloat - green:strokeColorRGB.greenFloat - blue:strokeColorRGB.blueFloat - alpha:1.0f]; -} - -- (void)setStrokeColor:(NSColor*)c { - NSColor *c1 = [c colorUsingColorSpaceName:NSDeviceRGBColorSpace]; - [self willChangeValueForKey:@"strokeColorIsKnown"]; - strokeColorRGB = [ColorRGB colorWithFloatRed:c1.redComponent - green:c1.greenComponent - blue:c1.blueComponent]; - [self didChangeValueForKey:@"strokeColorIsKnown"]; -} - -- (id)initWithCoder:(NSCoder *)coder { - if (!(self = [super init])) return nil; - - // decode keys - name = [coder decodeObjectForKey:@"name"]; - [self setStrokeColor:[coder decodeObjectForKey:@"strokeColor"]]; - [self setFillColor:[coder decodeObjectForKey:@"fillColor"]]; - strokeThickness = [coder decodeIntForKey:@"strokeThickness"]; - shapeName = [coder decodeObjectForKey:@"shapeName"]; - category = [coder decodeObjectForKey:@"category"]; - scale = [coder decodeFloatForKey:@"scale"]; - - // apply defaults - if (scale == 0.0f) scale = 1.0f; - if (shapeName == nil) shapeName = SHAPE_CIRCLE; - - return self; -} - -- (void)encodeWithCoder:(NSCoder *)coder { - [coder encodeObject:name forKey:@"name"]; - [coder encodeObject:[self strokeColor] forKey:@"strokeColor"]; - [coder encodeObject:[self fillColor] forKey:@"fillColor"]; - [coder encodeInt:strokeThickness forKey:@"strokeThickness"]; - [coder encodeObject:shapeName forKey:@"shapeName"]; - [coder encodeObject:category forKey:@"category"]; - [coder encodeFloat:scale forKey:@"scale"]; -} - - -@end diff --git a/tikzit/src/osx/ParseErrorView.h b/tikzit/src/osx/ParseErrorView.h deleted file mode 100644 index bb6141f..0000000 --- a/tikzit/src/osx/ParseErrorView.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// ParseErrorView.h -// TikZiT -// -// Created by Karl Johan Paulsson on 27/01/2013. -// Copyright (c) 2013 Aleks Kissinger. All rights reserved. -// - -#import - -@interface ParseErrorView : NSView - -@end diff --git a/tikzit/src/osx/ParseErrorView.m b/tikzit/src/osx/ParseErrorView.m deleted file mode 100644 index 83383f0..0000000 --- a/tikzit/src/osx/ParseErrorView.m +++ /dev/null @@ -1,40 +0,0 @@ -// -// ParseErrorView.m -// TikZiT -// -// Created by Karl Johan Paulsson on 27/01/2013. -// Copyright (c) 2013 Aleks Kissinger. All rights reserved. -// - -#import "ParseErrorView.h" - -@implementation ParseErrorView - -- (id)initWithFrame:(NSRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - // Initialization code here. - } - - return self; -} - -- (void)drawRect:(NSRect)dirtyRect -{ - // Drawing code here. -} - -- (void)awakeFromNib{ - self.layer = [CALayer layer]; - self.wantsLayer = YES; - CALayer *newLayer = [CALayer layer]; - self.layer.backgroundColor = [[NSColor controlColor] CGColor]; - //CGColorCreate(CGColorSpaceCreateDeviceRGB(), (CGFloat[]){ 1, .9, .64, 1 }); -// newLayer.backgroundColor = [NSColor redColor].CGColor; - newLayer.frame = CGRectMake(100,100,100,100);//NSMakeRect(0,0,image.size.width,image.size.height); - newLayer.position = CGPointMake(20,20); - //[self.layer addSublayer:newLayer]; -} - -@end diff --git a/tikzit/src/osx/PreambleController.h b/tikzit/src/osx/PreambleController.h deleted file mode 100644 index 5b0931d..0000000 --- a/tikzit/src/osx/PreambleController.h +++ /dev/null @@ -1,57 +0,0 @@ -// -// PreambleController.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "Preambles.h" -#import "Preambles+Coder.h" - -@interface PreambleController : NSViewController { - Preambles *preambles; - IBOutlet NSTextView *textView; - IBOutlet NSDictionaryController *preambleDictionaryController; - - NSDictionary *textAttrs; - NSAttributedString *preambleText; - NSColor *ghostColor; - NSIndexSet *selectionIndexes; -} - -@property (readonly) BOOL useDefaultPreamble; -@property (readonly) Preambles *preambles; -@property (strong) NSAttributedString *preambleText; -@property (strong) NSIndexSet *selectionIndexes; - -- (id)initWithNibName:(NSString *)nibName plist:(NSString*)plist styles:(NSArray*)sty edges:(NSArray*)edg; -- (void)savePreambles:(NSString*)plist; -- (NSString*)currentPreamble; -- (NSString*)currentPostamble; -- (NSString*)buildDocumentForTikz:(NSString*)tikz; - -- (IBAction)setPreambleToDefault:(id)sender; -- (IBAction)setPreamble:(id)sender; -- (IBAction)insertDefaultStyles:(id)sender; - -- (IBAction)addPreamble:(id)sender; -- (IBAction)duplicatePreamble:(id)sender; - -@end diff --git a/tikzit/src/osx/PreambleController.m b/tikzit/src/osx/PreambleController.m deleted file mode 100644 index 206bb30..0000000 --- a/tikzit/src/osx/PreambleController.m +++ /dev/null @@ -1,168 +0,0 @@ -// -// PreambleController.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "PreambleController.h" - - -@implementation PreambleController - -@synthesize preambleText, preambles; - -- (id)initWithNibName:(NSString *)nibName plist:(NSString*)plist styles:(NSArray*)sty edges:(NSArray*)edg { - if (!(self = [super initWithNibName:nibName bundle:Nil])) return nil; - - preambles = (Preambles*)[NSKeyedUnarchiver unarchiveObjectWithFile:plist]; - [preambles setStyles:sty]; - [preambles setEdges:edg]; - if (preambles == nil) preambles = [[Preambles alloc] init]; - - preambleText = nil; - - NSFont *font = [NSFont userFixedPitchFontOfSize:11.0f]; - textAttrs = [NSDictionary dictionaryWithObject:font forKey:NSFontAttributeName]; - ghostColor = [NSColor colorWithDeviceRed:0.9f green:0.9f blue:0.9f alpha:1.0f]; - - - - return self; -} - -- (void)awakeFromNib { - NSArray *arr = [preambleDictionaryController arrangedObjects]; - NSString *current = [preambles selectedPreambleName]; - - if (current != nil && ![current isEqual:@"default"]) { - for (int i = 0; i < [arr count]; ++i) { - if ([[[arr objectAtIndex:i] key] isEqual:current]) { - [self setSelectionIndexes:[NSIndexSet indexSetWithIndex:i]]; - break; - } - } - } -} - -- (BOOL)useDefaultPreamble { - return [[preambles selectedPreambleName] isEqualToString:@"default"]; -} - -- (void)flushText { - if (preambleText != nil && ![self useDefaultPreamble]) { - [preambles setCurrentPreamble:[preambleText string]]; - } -} - -- (void)setCurrentPreamble:(NSString*)current { - [self flushText]; - - [self willChangeValueForKey:@"useDefaultPreamble"]; - [preambles setSelectedPreambleName:current]; - [self didChangeValueForKey:@"useDefaultPreamble"]; - - [self setPreambleText: - [[NSAttributedString alloc] initWithString:[preambles currentPreamble] - attributes:textAttrs]]; -} - -- (void)savePreambles:(NSString*)plist { - [self flushText]; - [NSKeyedArchiver archiveRootObject:preambles toFile:plist]; -} - -- (NSString*)currentPreamble { - [self flushText]; - return [preambles currentPreamble]; -} - -- (NSString*)currentPostamble { - return [preambles currentPostamble]; -} - -- (NSString*)buildDocumentForTikz:(NSString*)tikz { - [self flushText]; - return [preambles buildDocumentForTikz:tikz]; -} - -- (void)setSelectionIndexes:(NSIndexSet *)idx { - [self willChangeValueForKey:@"selectionIndexes"]; - selectionIndexes = idx; - [self didChangeValueForKey:@"selectionIndexes"]; - - [self setPreamble:self]; -} - -- (NSIndexSet*)selectionIndexes { - return selectionIndexes; -} - -- (IBAction)setPreambleToDefault:(id)sender{ - [self setCurrentPreamble:@"default"]; - [textView setBackgroundColor:ghostColor]; -} - -- (IBAction)setPreamble:(id)sender { - //if ([[toolbar selectedItemIdentifier] isEqualToString:[defaultToolbarItem itemIdentifier]]) { - // [self setCurrentPreamble:@"default"]; - // [textView setBackgroundColor:ghostColor]; - //} else if ([[toolbar selectedItemIdentifier] isEqualToString:[customToolbarItem itemIdentifier]]) { - NSString *key = nil; - if ([selectionIndexes count]==1) { - int i = [selectionIndexes firstIndex]; - key = [[[preambleDictionaryController arrangedObjects] objectAtIndex:i] key]; - } - if (key != nil) { - [self setCurrentPreamble:key]; - //NSLog(@"preamble set to %@", key); - } else { - [self setCurrentPreamble:@"custom"]; - //NSLog(@"preamble set to custom"); - } - [textView setBackgroundColor:[NSColor whiteColor]]; - //} -} - -- (IBAction)insertDefaultStyles:(id)sender { - [textView insertText:[preambles styleDefinitions]]; -} - -- (IBAction)addPreamble:(id)sender { - [preambleDictionaryController setInitialKey:@"new preamble"]; - [preambleDictionaryController setInitialValue:[preambles defaultPreamble]]; - [preambleDictionaryController add:sender]; -} - -- (void)controlTextDidEndEditing:(NSNotification *)obj { - //NSLog(@"got a text change"); - [self setPreamble:[obj object]]; -} - - -// NOT IMPLEMENTED -- (IBAction)duplicatePreamble:(id)sender { -// NSLog(@"set text to: %@", [preambles currentPreamble]); -// [preambleDictionaryController setInitialKey:[preambles selectedPreambleName]]; -// [preambleDictionaryController setInitialValue:[preambles currentPreamble]]; -// [preambleDictionaryController add:sender]; -} - - -@end diff --git a/tikzit/src/osx/Preambles+Coder.h b/tikzit/src/osx/Preambles+Coder.h deleted file mode 100644 index 5a270c5..0000000 --- a/tikzit/src/osx/Preambles+Coder.h +++ /dev/null @@ -1,32 +0,0 @@ -// -// Preambles+Coder.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "Preambles.h" -#import - -@interface Preambles (Coder) - -- (id)initWithCoder:(NSCoder *)coder; -- (void)encodeWithCoder:(NSCoder *)coder; - -@end diff --git a/tikzit/src/osx/Preambles+Coder.m b/tikzit/src/osx/Preambles+Coder.m deleted file mode 100644 index 5e468b2..0000000 --- a/tikzit/src/osx/Preambles+Coder.m +++ /dev/null @@ -1,41 +0,0 @@ -// -// Preambles+Coder.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "Preambles+Coder.h" - - -@implementation Preambles (Coder) - -- (id)initWithCoder:(NSCoder *)coder { - if (!(self = [super init])) return nil; - selectedPreambleName = [coder decodeObjectForKey:@"selectedPreamble"]; - preambleDict = [coder decodeObjectForKey:@"preambles"]; - return self; -} - -- (void)encodeWithCoder:(NSCoder *)coder { - [coder encodeObject:selectedPreambleName forKey:@"selectedPreamble"]; - [coder encodeObject:preambleDict forKey:@"preambles"]; -} - -@end diff --git a/tikzit/src/osx/PreferenceController.h b/tikzit/src/osx/PreferenceController.h deleted file mode 100644 index b2b23f3..0000000 --- a/tikzit/src/osx/PreferenceController.h +++ /dev/null @@ -1,49 +0,0 @@ -// -// PreferenceController.h -// TikZiT -// -// Created by Karl Johan Paulsson on 26/02/2013. -// Copyright (c) 2013 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "UpdatePreferenceController.h" -#import "PreambleController.h" -#import "CustomNodeController.h" - -@interface PreferenceController : NSWindowController{ - - IBOutlet NSView *engineView; - IBOutlet NSView *generalView; - IBOutlet NSView *updateView; - IBOutlet NSView *preambleView; - IBOutlet NSView *customNodeView; - - UpdatePreferenceController *updateController; - PreambleController *preambleController; - CustomNodeController *customNodeController; - - int currentViewTag; -} - -- (id)initWithWindowNibName:(NSString *)windowNibName preambleController:(PreambleController *)pc; - -- (IBAction)switchView:(id)sender; - -@end diff --git a/tikzit/src/osx/PreferenceController.m b/tikzit/src/osx/PreferenceController.m deleted file mode 100644 index e785358..0000000 --- a/tikzit/src/osx/PreferenceController.m +++ /dev/null @@ -1,133 +0,0 @@ -// -// PreferenceController.m -// TikZiT -// -// Created by Karl Johan Paulsson on 26/02/2013. -// Copyright (c) 2013 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "PreferenceController.h" - -@interface PreferenceController () - -@end - -@implementation PreferenceController - -- (id)initWithWindowNibName:(NSString *)windowNibName preambleController:(PreambleController *)pc{ - if (!(self = [super initWithWindowNibName:windowNibName])) return nil; - - preambleController = pc; - - return self; -} - -- (NSRect)newFrameForNewContentView:(NSView*)view { - NSWindow *window = [self window]; - NSRect newFrameRect = [window frameRectForContentRect:[view frame]]; - NSRect oldFrameRect = [window frame]; - NSSize newSize = newFrameRect.size; - NSSize oldSize = oldFrameRect.size; - - NSRect frame = [window frame]; - frame.size = newSize; - frame.origin.y -= (newSize.height - oldSize.height); - - return frame; -} - -- (NSView *)viewForTag:(int)tag { - - NSView *view = nil; - switch (tag) { - default: - case 0: - view = generalView; - break; - case 1: - view = engineView; - break; - case 2: - view = updateView; - break; - case 3: - view = preambleView; - break; - case 4: - view = customNodeView; - break; - } - - return view; -} - -- (BOOL)validateToolbarItem:(NSToolbarItem *)item { - - if ([item tag] == currentViewTag) return NO; - else return YES; - -} - -- (void)awakeFromNib { - - [[self window] setContentSize:[generalView frame].size]; - [[[self window] contentView] addSubview:generalView]; - [[[self window] contentView] setWantsLayer:YES]; - - updateController = [[UpdatePreferenceController alloc] initWithNibName:@"UpdatePreferencePanel" bundle:nil]; - [[updateController view] setFrame:[updateView frame]]; - [[[self window] contentView] replaceSubview:updateView with:[updateController view]]; - updateView = [updateController view]; - - [[preambleController view] setFrame:[preambleView frame]]; - [[[self window] contentView] replaceSubview:preambleView with:[preambleController view]]; - preambleView = [preambleController view]; - - customNodeController = [[CustomNodeController alloc] initWithNibName:@"CustomNodes" bundle:nil]; - [[customNodeController view] setFrame:[customNodeView frame]]; - [[[self window] contentView] replaceSubview:customNodeView with:[customNodeController view]]; - customNodeView = [customNodeController view]; - - [[self window] setContentSize:[engineView frame].size]; - [[[self window] contentView] addSubview:engineView]; - currentViewTag = 1; -} - -- (IBAction)switchView:(id)sender { - - int tag = [sender tag]; - NSView *view = [self viewForTag:tag]; - NSView *previousView = [self viewForTag:currentViewTag]; - currentViewTag = tag; - - NSRect newFrame = [self newFrameForNewContentView:view]; - - [NSAnimationContext beginGrouping]; - - if ([[NSApp currentEvent] modifierFlags] & NSShiftKeyMask) - [[NSAnimationContext currentContext] setDuration:1.0]; - - [[[[self window] contentView] animator] replaceSubview:previousView with:view]; - [[[self window] animator] setFrame:newFrame display:YES]; - - [NSAnimationContext endGrouping]; - -} - -@end diff --git a/tikzit/src/osx/Preferences.xib b/tikzit/src/osx/Preferences.xib deleted file mode 100644 index 1be3f9f..0000000 --- a/tikzit/src/osx/Preferences.xib +++ /dev/null @@ -1,1165 +0,0 @@ - - - - 1070 - 13C64 - 5053 - 1265.19 - 697.40 - - com.apple.InterfaceBuilder.CocoaPlugin - 5053 - - - IBNSLayoutConstraint - NSButton - NSButtonCell - NSCustomObject - NSCustomView - NSTextField - NSTextFieldCell - NSToolbar - NSToolbarItem - NSUserDefaultsController - NSView - NSWindowTemplate - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - PreferenceController - - - FirstResponder - - - NSApplication - - - 7 - 2 - {{196, 240}, {480, 270}} - 544736256 - Preferences - NSWindow - - - C1747407-DC9A-4297-9C1C-0A5010984E6C - - - YES - YES - NO - NO - 1 - 1 - - - - 197F9408-AFB0-404B-B2B6-4DB1250B0A80 - - Updates - Updates - - - - NSImage - updates - - - - {0, 0} - {0, 0} - YES - YES - 2 - YES - 0 - - - - A3DDD070-5637-444B-92C6-905084CAC389 - - General - General - - - - NSImage - NSPreferencesGeneral - - - - {0, 0} - {0, 0} - YES - YES - 1 - YES - 0 - - - - A96DC4D4-2171-4D05-8C08-8D01B3829158 - - Preamble - Preamble - - - - NSImage - preamble - - - - {0, 0} - {0, 0} - YES - YES - 3 - YES - 0 - - - - CBA2626C-DD4C-4ADD-BD5D-26D21216D9A8 - - Custom Nodes - Custom Nodes - - - - NSImage - customshape - - - - {0, 0} - {0, 0} - YES - YES - 4 - YES - 0 - - - - F85FE7C2-9847-4E58-8BF6-BE334E918CA7 - - Engine - Engine - - - - NSImage - engine - - - - {0, 0} - {0, 0} - YES - YES - 1 - YES - 0 - - - - - - - - - - - - - - - - - - - - - {480, 270} - - - - - {{0, 0}, {1680, 1028}} - {10000000000000, 10000000000000} - YES - - - - 268 - - - - 268 - {{18, 106}, {219, 18}} - - - - _NS:9 - YES - - -2080374784 - 268435456 - Keep inspector windows on top - - .LucidaGrandeUI - 13 - 1044 - - _NS:9 - - 1211912448 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 - - NO - - - - 268 - {{18, 126}, {168, 18}} - - - - _NS:9 - YES - - -2080374784 - 268435456 - Autocomplete brackets - - _NS:9 - - 1211912448 - 2 - - - - - 200 - 25 - - NO - - - - 268 - {{18, 18}, {214, 18}} - - - - _NS:9 - YES - - -2080374784 - 268435456 - Bring preview window to focus - - _NS:9 - - 1211912448 - 2 - - - - - 200 - 25 - - NO - - - - 268 - {{20, 42}, {440, 22}} - - - - _NS:9 - YES - - -1804599231 - 272630784 - - - _NS:9 - - YES - - 6 - System - textBackgroundColor - - 3 - MQA - - - - 6 - System - textColor - - 3 - MAA - - - - NO - 1 - - - - 268 - {{18, 72}, {140, 17}} - - - - _NS:1535 - YES - - 68157504 - 272630784 - pdfLaTeX source path - - _NS:1535 - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - - - NO - 1 - - - {480, 162} - - - - _NS:9 - NSView - - - - 268 - - {480, 96} - - - - _NS:9 - NSView - - - - 12 - - {480, 115} - - - - _NS:9 - NSView - - - - 12 - - {557, 354} - - - - _NS:9 - NSView - - - - 12 - - {557, 354} - - - - _NS:9 - NSView - - - YES - - - - - - - window - - - - 3 - - - - engineView - - - - 23 - - - - generalView - - - - 25 - - - - switchView: - - - - 26 - - - - switchView: - - - - 27 - - - - switchView: - - - - 116 - - - - updateView - - - - 117 - - - - switchView: - - - - 120 - - - - preambleView - - - - 121 - - - - customNodeView - - - - 123 - - - - switchView: - - - - 125 - - - - delegate - - - - 4 - - - - value: values.net.sourceforge.tikzit.pdflatexpath - - - - - - value: values.net.sourceforge.tikzit.pdflatexpath - value - values.net.sourceforge.tikzit.pdflatexpath - 2 - - - 54 - - - - value: values.net.sourceforge.tikzit.previewfocus - - - - - - value: values.net.sourceforge.tikzit.previewfocus - value - values.net.sourceforge.tikzit.previewfocus - 2 - - - 62 - - - - value: values.net.sourceforge.tikzit.autocomplete - - - - - - value: values.net.sourceforge.tikzit.autocomplete - value - values.net.sourceforge.tikzit.autocomplete - 2 - - - 149 - - - - value: values.net.sourceforge.tikzit.inspectorsontop - - - - - - value: values.net.sourceforge.tikzit.inspectorsontop - value - values.net.sourceforge.tikzit.inspectorsontop - 2 - - - 150 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 1 - - - - - - - - - 2 - - - - - 5 - - - - - - - - - - - - 11 - - - - - 12 - - - - - 13 - - - - - 4 - 0 - - 4 - 1 - 1 - - 20 - - 1000 - - 8 - 23 - 3 - NO - - - - 3 - 0 - - 4 - 1 - 1 - - 8 - - 1000 - - 6 - 24 - 3 - NO - - - - 5 - 0 - - 5 - 1 - 1 - - 20 - - 1000 - - 0 - 29 - 3 - NO - - - - 6 - 0 - - 6 - 1 - 1 - - 20 - - 1000 - - 0 - 29 - 3 - NO - - - - 3 - 0 - - 4 - 1 - 1 - - 8 - - 1000 - - 6 - 24 - 3 - NO - - - - 5 - 0 - - 5 - 1 - 1 - - 20 - - 1000 - - 0 - 29 - 3 - NO - - - - 5 - 0 - - 5 - 1 - 1 - - 20 - - 1000 - - 0 - 29 - 3 - NO - - - - 5 - 0 - - 5 - 1 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - NO - - - - 3 - 0 - - 4 - 1 - 1 - - 6 - - 1000 - - 6 - 24 - 3 - NO - - - - 5 - 0 - - 5 - 1 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - NO - - - - 3 - 0 - - 3 - 1 - 1 - - 20 - - 1000 - - 8 - 23 - 3 - NO - - - - - - - - - - - 14 - - - - - - 15 - - - - - - - - 16 - - - - - 30 - - - - - 32 - - - - - - - - 33 - - - - - 36 - - - - - 39 - - - - - 55 - - - - - 56 - - - - - 57 - - - - - - - - 58 - - - - - 59 - - - - - 60 - - - - - 64 - - - - - - 115 - - - - - 118 - - - - - 119 - - - - - 122 - - - - - 124 - - - - - 126 - - - - - 127 - - - - - - - - 128 - - - - - 130 - - - - - 131 - - - - - - - - 132 - - - - - 134 - - - - - 135 - - - - - 153 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{357, 418}, {480, 270}} - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - - - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - 153 - - - - - PreferenceController - NSWindowController - - switchView: - id - - - switchView: - - switchView: - id - - - - NSView - NSView - NSView - NSView - NSView - - - - customNodeView - NSView - - - engineView - NSView - - - generalView - NSView - - - preambleView - NSView - - - updateView - NSView - - - - IBProjectSource - ./Classes/PreferenceController.h - - - - - 0 - IBCocoaFramework - YES - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES - 3 - - {32, 32} - {15, 15} - {32, 32} - {32, 32} - {32, 32} - {32, 32} - - YES - - diff --git a/tikzit/src/osx/PreviewController.h b/tikzit/src/osx/PreviewController.h deleted file mode 100644 index 6c51a23..0000000 --- a/tikzit/src/osx/PreviewController.h +++ /dev/null @@ -1,52 +0,0 @@ -// -// PreviewController.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - - -#import -#import "DraggablePDFView.h" - -@class PDFView; -@class PreambleController; - -@interface PreviewController : NSWindowController { - IBOutlet DraggablePDFView *pdfView; - IBOutlet NSProgressIndicator *progressIndicator; - IBOutlet NSScrollView *errorTextView; - IBOutlet NSTextView *errorText; - PreambleController *preambleController; - NSString *tempDir; - NSLock *latexLock; - int typesetCount; -} - - -- (id)initWithWindowNibName:(NSString*)nib - preambleController:(PreambleController*)pc - tempDir:(NSString*)dir; - -- (void)buildTikz:(NSString*)tikz; - -+ (void)setDefaultPreviewController:(PreviewController*)pc; -+ (PreviewController*)defaultPreviewController; - -@end diff --git a/tikzit/src/osx/PreviewController.m b/tikzit/src/osx/PreviewController.m deleted file mode 100644 index cf069b1..0000000 --- a/tikzit/src/osx/PreviewController.m +++ /dev/null @@ -1,147 +0,0 @@ -// -// PreviewController.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "PreviewController.h" -#import "AppDelegate.h" -#import "PreambleController.h" -#import - -@implementation PreviewController - -static PreviewController *preview = nil; - -- (id)initWithWindowNibName:(NSString*)nib - preambleController:(PreambleController*)pc - tempDir:(NSString*)dir { - if (!(self = [super initWithWindowNibName:nib])) return nil; - tempDir = [dir copy]; - typesetCount = 0; - preambleController = pc; - latexLock = [[NSLock alloc] init]; - return self; -} - -- (void)runLatex:(id)tikz { - // Only build one tex file at a time, so we don't get funky results. - //[latexLock lock]; - [progressIndicator startAnimation:self]; - - if([[NSUserDefaults standardUserDefaults] boolForKey:@"net.sourceforge.tikzit.previewfocus"]){ - [[preview window] makeKeyAndOrderFront:self]; - } - - int fnum = typesetCount++; - - NSString *tex = [preambleController buildDocumentForTikz:tikz]; - - NSString *texFile = [NSString stringWithFormat:@"%@/tikzit_%d.tex", tempDir, fnum]; - NSString *pdfFile = [NSString stringWithFormat:@"%@/tikzit_%d.pdf", tempDir, fnum]; - - [tex writeToFile:texFile atomically:NO encoding:NSUTF8StringEncoding error:NULL]; - - NSString *pdflatexPath = [[NSUserDefaults standardUserDefaults] stringForKey:@"net.sourceforge.tikzit.pdflatexpath"]; - - // We run pdflatex in a bash shell to have easy access to the setup from unix-land - NSTask *latexTask = [[NSTask alloc] init]; - [latexTask setCurrentDirectoryPath:tempDir]; - [latexTask setLaunchPath:@"/bin/bash"]; - - // This assumes the user has $PATH set up to find pdflatex in either .profile - // or .bashrc. This should be improved to take other path setups into account - // and to be customisable. - NSString *latexCmd = - [NSString stringWithFormat: - @"if [ -e ~/.profile ]; then source ~/.profile; fi\n" - @"if [ -e ~/.bashrc ]; then source ~/.bashrc; fi\n" - @"%@ -interaction=nonstopmode -output-format=pdf -halt-on-error '%@'\n", pdflatexPath, texFile]; - - NSLog(@"Telling bash: %@", latexCmd); - - NSPipe *pout = [NSPipe pipe]; - NSPipe *pin = [NSPipe pipe]; - [latexTask setStandardOutput:pout]; - [latexTask setStandardInput:pin]; - - NSFileHandle *latexIn = [pin fileHandleForWriting]; - NSFileHandle *latexOut = [pout fileHandleForReading]; - - [latexTask launch]; - [latexIn writeData:[latexCmd dataUsingEncoding:NSUTF8StringEncoding]]; - [latexIn closeFile]; - - - NSData *data = [latexOut readDataToEndOfFile]; - NSString *str = [[NSString alloc] initWithData:data - encoding:NSUTF8StringEncoding]; - - [latexTask waitUntilExit]; - if ([latexTask terminationStatus] != 0) { - if ([latexTask terminationStatus] == 127) { - [errorTextView setHidden:YES]; - [errorText setString:@"\nCouldn't find pdflatex, change settings and try again."]; - [errorTextView setHidden:NO]; - }else{ - [errorTextView setHidden:YES]; - [errorText setString:[@"\nAN ERROR HAS OCCURRED, PDFLATEX SAID:\n\n" stringByAppendingString:str]]; - [errorTextView setHidden:NO]; - } - } else { - [errorText setString:@""]; - [errorTextView setHidden:YES]; - - PDFDocument *doc = [[PDFDocument alloc] initWithURL:[[NSURL alloc] initFileURLWithPath:pdfFile]]; - - // pad the PDF by a couple of pixels - if ([doc pageCount] >= 1) { - PDFPage *page = [doc pageAtIndex:0]; - NSRect box = [page boundsForBox:kPDFDisplayBoxCropBox]; - box.origin.x -= 2.0f; - box.origin.y -= 2.0f; - box.size.width += 4.0f; - box.size.height += 4.0f; - [page setBounds:box forBox:kPDFDisplayBoxCropBox]; - [page setBounds:box forBox:kPDFDisplayBoxMediaBox]; - } - - [pdfView setDocument:doc]; - } - - [progressIndicator stopAnimation:self]; - //[latexLock unlock]; -} - -- (void)buildTikz:(NSString*)tikz { - // Build on a separate thread to keep the interface responsive. - [NSThread detachNewThreadSelector:@selector(runLatex:) toTarget:self withObject:tikz]; -} - -+ (void)setDefaultPreviewController:(PreviewController*)pc { - preview = pc; -} - -+ (PreviewController*)defaultPreviewController { - return preview; -} - - -@end diff --git a/tikzit/src/osx/PropertyInspectorController.h b/tikzit/src/osx/PropertyInspectorController.h deleted file mode 100644 index 663ee4a..0000000 --- a/tikzit/src/osx/PropertyInspectorController.h +++ /dev/null @@ -1,83 +0,0 @@ -// -// PropertyInspectorController.h -// TikZiT -// -// Created by Aleks Kissinger on 17/07/2011. -// Copyright 2011 Aleks Kissinger. All rights reserved. -// - -#import -#import "NodeStyle.h" -#import "GraphElementData.h" - -@class SFBInspectorView; -@class StylePaletteController; - -@interface PropertyInspectorController : NSWindowController { - IBOutlet SFBInspectorView *propertyInspectorView; - IBOutlet NSView *nodePropertiesView; - IBOutlet NSView *graphPropertiesView; - IBOutlet NSView *edgePropertiesView; - IBOutlet NSComboBox *sourceAnchorComboBox; - IBOutlet NSComboBox *targetAnchorComboBox; - IBOutlet NSTextField *edgeNodeLabelField; - IBOutlet NSButton *edgeNodeCheckbox; - IBOutlet NSArrayController *nodeDataArrayController; - IBOutlet NSArrayController *graphDataArrayController; - IBOutlet NSArrayController *edgeDataArrayController; - IBOutlet NSArrayController *edgeNodeDataArrayController; - - NSMutableArray *sourceAnchorNames; - IBOutlet NSArrayController *sourceAnchorNamesArrayController; - - NSMutableArray *targetAnchorNames; - IBOutlet NSArrayController *targetAnchorNamesArrayController; - - NSMutableArray *selectedNodes; - IBOutlet NSArrayController *selectedNodesArrayController; - - NSMutableArray *selectedEdges; - IBOutlet NSArrayController *selectedEdgesArrayController; - - // this data lists exists solely for displaying messages in disabled data tables - GraphElementData *noSelection; - GraphElementData *multipleSelection; - GraphElementData *noEdgeNode; - GraphElementData *noGraph; - - - // used to get access to the global style table - StylePaletteController *stylePaletteController; -} - -//@property (readonly) BOOL enableNodeDataControls; -//@property (readonly) BOOL enableEdgeDataControls; -@property (strong) NSMutableArray *selectedNodes; -@property (strong) NSMutableArray *selectedEdges; -@property (strong) NSMutableArray *sourceAnchorNames; -@property (strong) NSMutableArray *targetAnchorNames; -@property (strong) StylePaletteController *stylePaletteController; - -- (id)initWithWindowNibName:(NSString *)windowNibName; -- (void)graphSelectionChanged:(NSNotification*)notification; - -- (IBAction)addNodeProperty:(id)sender; -- (IBAction)addNodeAtom:(id)sender; -- (IBAction)removeNodeProperty:(id)sender; - -- (IBAction)addGraphProperty:(id)sender; -- (IBAction)addGraphAtom:(id)sender; -- (IBAction)removeGraphProperty:(id)sender; - -- (IBAction)addEdgeProperty:(id)sender; -- (IBAction)addEdgeAtom:(id)sender; -- (IBAction)removeEdgeProperty:(id)sender; - -- (IBAction)addEdgeNodeProperty:(id)sender; -- (IBAction)addEdgeNodeAtom:(id)sender; -- (IBAction)removeEdgeNodeProperty:(id)sender; - -//- (IBAction)addRemoveChildNode:(id)sender; -- (IBAction)refreshDocument:(id)sender; - -@end diff --git a/tikzit/src/osx/PropertyInspectorController.m b/tikzit/src/osx/PropertyInspectorController.m deleted file mode 100644 index 039a30f..0000000 --- a/tikzit/src/osx/PropertyInspectorController.m +++ /dev/null @@ -1,280 +0,0 @@ -// -// PropertyInspectorController.m -// TikZiT -// -// Created by Aleks Kissinger on 17/07/2011. -// Copyright 2011 Aleks Kissinger. All rights reserved. -// - -#import "PropertyInspectorController.h" -#import "StylePaletteController.h" -#import "TikzDocument.h" -#import "SFBInspectors/SFBInspectorView.h" -#import "PickSupport.h" -#import "Node.h" -#import "Edge.h" -#import "NodeStyle.h" -#import "GraphicsView.h" -#import "GraphElementProperty.h" -#import "Shape.h" - -@implementation PropertyInspectorController - -@synthesize stylePaletteController; -@synthesize selectedNodes, selectedEdges; -@synthesize sourceAnchorNames, targetAnchorNames; - -- (id)initWithWindowNibName:(NSString *)windowNibName { - if (!(self = [super initWithWindowNibName:windowNibName])) return nil; - - noSelection = [[GraphElementData alloc] init]; - [noSelection setProperty:@"" forKey:@"No Selection"]; - multipleSelection = [[GraphElementData alloc] init]; - [multipleSelection setProperty:@"" forKey:@"Mult. Selection"]; - noEdgeNode = [[GraphElementData alloc] init]; - [noEdgeNode setProperty:@"" forKey:@"No Child"]; - noGraph = [[GraphElementData alloc] init]; - [noGraph setProperty:@"" forKey:@"No Graph"]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(graphSelectionChanged:) - name:@"SelectionChanged" - object:nil]; - -// [[NSDocumentController sharedDocumentController] addObserver:self -// forKeyPath:@"currentDocument" -// options:NSKeyValueObservingOptionNew -// context:NULL]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(graphSelectionChanged:) - name:@"NSWindowDidBecomeMainNotification" - object:nil]; - - [self setSourceAnchorNames: [[NSMutableArray alloc] initWithArray: [@"north south west east" componentsSeparatedByString:@" "]]]; - - [self setTargetAnchorNames: [[NSMutableArray alloc] initWithArray:[@"north south west east" componentsSeparatedByString:@" "]]]; - - - if ([[NSUserDefaults standardUserDefaults] boolForKey:@"net.sourceforge.tikzit.inspectorsontop"] == YES) { - [[self window] setLevel:NSFloatingWindowLevel]; - } else { - [[self window] setLevel:NSNormalWindowLevel]; - } - - [self showWindow:self]; - return self; -} - -- (void)observeValueForKeyPath:(NSString*)keyPath - ofObject:(id)object - change:(NSDictionary*)change - context:(void*)context { - [self graphSelectionChanged:nil]; -} - -//- (void)willChangeValueForKey:(NSString *)key { -// [super willChangeValueForKey:key]; -// NSLog(@"will: %@",key); -//} -// -//- (void)didChangeValueForKey:(NSString *)key { -// [super didChangeValueForKey:key]; -// NSLog(@"did: %@",key); -//} - -- (void)windowDidLoad { - [[self window] setMovableByWindowBackground:YES]; - - [propertyInspectorView addInspectorPane:graphPropertiesView - title:@"Graph Properties"]; - [propertyInspectorView addInspectorPane:nodePropertiesView - title:@"Node Properties"]; - [propertyInspectorView addInspectorPane:edgePropertiesView - title:@"Edge Properties"]; - [super windowDidLoad]; -} - -- (IBAction)refreshDocument:(id)sender { - NSDocumentController *dc = [NSDocumentController sharedDocumentController]; - TikzDocument *doc = (TikzDocument*)[dc currentDocument]; - - if (doc != nil) { - [[doc graphicsView] postGraphChange]; - [[doc graphicsView] refreshLayers]; - } -} - - -- (void)updateGraphFields { - NSDocumentController *dc = [NSDocumentController sharedDocumentController]; - TikzDocument *doc = (TikzDocument*)[dc currentDocument]; - - if (doc != nil) { - [graphDataArrayController setContent:[[[doc graphicsView] graph] data]]; - [graphDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; - [graphDataArrayController setEditable:YES]; - } else { - [graphDataArrayController setContent:noGraph]; - [graphDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; - [graphDataArrayController setEditable:NO]; - } -} - -- (void)updateNodeFields { - NSDocumentController *dc = [NSDocumentController sharedDocumentController]; - TikzDocument *doc = (TikzDocument*)[dc currentDocument]; - if (doc != nil) { - NSSet *sel = [[[doc graphicsView] pickSupport] selectedNodes]; - [self setSelectedNodes:[[sel allObjects] mutableCopy]]; - [selectedNodesArrayController setSelectedObjects:selectedNodes]; - if ([sel count] == 1) { - Node *n = [sel anyObject]; - [nodeDataArrayController setContent:[n data]]; - [nodeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; - [nodeDataArrayController setEditable:YES]; - } else if ([sel count] == 0) { - [nodeDataArrayController setContent:noSelection]; - [nodeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; - [nodeDataArrayController setEditable:NO]; - } else { - [nodeDataArrayController setContent:multipleSelection]; - [nodeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; - [nodeDataArrayController setEditable:NO]; - } - } else { - [nodeDataArrayController setContent:noGraph]; - [nodeDataArrayController setEditable:NO]; - } -} - -- (void)updateEdgeFields { - NSDocumentController *dc = [NSDocumentController sharedDocumentController]; - TikzDocument *doc = (TikzDocument*)[dc currentDocument]; - - if (doc != nil) { - NSSet *sel = [[[doc graphicsView] pickSupport] selectedEdges]; - [self setSelectedEdges:[[sel allObjects] mutableCopy]]; - [selectedEdgesArrayController setSelectedObjects:selectedEdges]; - if ([sel count] == 1) { - Edge *e = [sel anyObject]; - [edgeDataArrayController setContent:[e data]]; - [edgeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; - [edgeDataArrayController setEditable:YES]; - if ([e hasEdgeNode]) { - Node *n = [e edgeNode]; - [edgeNodeDataArrayController setContent:[n data]]; - [edgeNodeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; - [edgeNodeDataArrayController setEditable:YES]; - } else { - [edgeNodeDataArrayController setContent:noEdgeNode]; - [edgeNodeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; - [edgeNodeDataArrayController setEditable:NO]; - } - } else if ([sel count] == 0) { - [edgeDataArrayController setContent:noSelection]; - [edgeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; - [edgeDataArrayController setEditable:NO]; - [edgeNodeDataArrayController setContent:noSelection]; - [edgeNodeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; - [edgeNodeDataArrayController setEditable:NO]; - } else { - [edgeDataArrayController setContent:multipleSelection]; - [edgeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; - [edgeDataArrayController setEditable:NO]; - [edgeNodeDataArrayController setContent:multipleSelection]; - [edgeNodeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; - [edgeNodeDataArrayController setEditable:NO]; - } - } else { - [edgeDataArrayController setContent:noGraph]; - [edgeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; - [edgeDataArrayController setEditable:NO]; - [edgeNodeDataArrayController setContent:noGraph]; - [edgeNodeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; - [edgeNodeDataArrayController setEditable:NO]; - } -} - -- (void)graphSelectionChanged:(NSNotification*)notification { - [self updateNodeFields]; - [self updateEdgeFields]; - [self updateGraphFields]; -} - -- (void)controlTextDidEndEditing:(NSNotification*)notification { - NSDocumentController *dc = [NSDocumentController sharedDocumentController]; - TikzDocument *doc = (TikzDocument*)[dc currentDocument]; - if (doc != nil) { - PickSupport *pick = [[doc graphicsView] pickSupport]; - for (Node *n in [pick selectedNodes]) { - [n attachStyleFromTable:[stylePaletteController nodeStyles]]; - } - - for (Edge *e in [pick selectedEdges]) { - [e attachStyleFromTable:[stylePaletteController edgeStyles]]; - } - } - - [self refreshDocument:[notification object]]; -} - -- (void)addPropertyToAC:(NSArrayController*)ac { - [ac addObject:[[GraphElementProperty alloc] initWithPropertyValue:@"val" forKey:@"new_property"]]; - [self refreshDocument:nil]; -} - -- (void)addAtomToAC:(NSArrayController*)ac { - [ac addObject:[[GraphElementProperty alloc] initWithAtomName:@"new_atom"]]; - [self refreshDocument:nil]; -} - -- (void)removeFromAC:(NSArrayController*)ac { - [ac remove:nil]; - [self refreshDocument:nil]; -} - -- (IBAction)addNodeProperty:(id)sender { [self addPropertyToAC:nodeDataArrayController]; } -- (IBAction)addNodeAtom:(id)sender { [self addAtomToAC:nodeDataArrayController]; } -- (IBAction)removeNodeProperty:(id)sender { [self removeFromAC:nodeDataArrayController]; } - -- (IBAction)addGraphProperty:(id)sender { [self addPropertyToAC:graphDataArrayController]; } -- (IBAction)addGraphAtom:(id)sender { [self addAtomToAC:graphDataArrayController]; } -- (IBAction)removeGraphProperty:(id)sender { [self removeFromAC:graphDataArrayController]; } - -- (IBAction)addEdgeProperty:(id)sender { [self addPropertyToAC:edgeDataArrayController]; } -- (IBAction)addEdgeAtom:(id)sender { [self addAtomToAC:edgeDataArrayController]; } -- (IBAction)removeEdgeProperty:(id)sender { [self removeFromAC:edgeDataArrayController]; } - -- (IBAction)addEdgeNodeProperty:(id)sender { [self addPropertyToAC:edgeNodeDataArrayController]; } -- (IBAction)addEdgeNodeAtom:(id)sender { [self addAtomToAC:edgeNodeDataArrayController]; } -- (IBAction)removeEdgeNodeProperty:(id)sender { [self removeFromAC:edgeNodeDataArrayController]; } - -//- (BOOL)enableEdgeDataControls { -// NSDocumentController *dc = [NSDocumentController sharedDocumentController]; -// TikzDocument *doc = (TikzDocument*)[dc currentDocument]; -// -// if (doc != nil) { -// return ([[[[doc graphicsView] pickSupport] selectedEdges] count] == 1); -// } else { -// return NO; -// } -//} -// -//- (BOOL)enableEdgeNodeDataControls { -// NSDocumentController *dc = [NSDocumentController sharedDocumentController]; -// TikzDocument *doc = (TikzDocument*)[dc currentDocument]; -// -// if (doc != nil) { -// PickSupport *pick = [[doc graphicsView] pickSupport]; -// if ([[pick selectedEdges] count] == 1) { -// return ([[[pick selectedEdges] anyObject] hasEdgeNode]); -// } else { -// return NO; -// } -// } else { -// return NO; -// } -//} - -@end diff --git a/tikzit/src/osx/SelectBoxLayer.h b/tikzit/src/osx/SelectBoxLayer.h deleted file mode 100644 index 45b43c7..0000000 --- a/tikzit/src/osx/SelectBoxLayer.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// SelectBoxLayer.h -// TikZiT -// -// Created by Aleks Kissinger on 14/06/2010. -// Copyright 2010 __MyCompanyName__. All rights reserved. -// - -#import -#import - -@interface SelectBoxLayer : CALayer { - BOOL active; - CGRect box; -} - -@property (assign) BOOL active; -@property (assign) NSRect selectBox; - -+ (SelectBoxLayer*)layer; - -@end diff --git a/tikzit/src/osx/SelectBoxLayer.m b/tikzit/src/osx/SelectBoxLayer.m deleted file mode 100644 index a7abe33..0000000 --- a/tikzit/src/osx/SelectBoxLayer.m +++ /dev/null @@ -1,48 +0,0 @@ -// -// SelectBoxLayer.m -// TikZiT -// -// Created by Aleks Kissinger on 14/06/2010. -// Copyright 2010 __MyCompanyName__. All rights reserved. -// - -#import "SelectBoxLayer.h" - - -@implementation SelectBoxLayer - -@synthesize active; - -- (id)init { - if (!(self = [super init])) return nil; - box = CGRectMake(0.0f, 0.0f, 0.0f, 0.0f); - active = NO; - return self; -} - -- (void)setSelectBox:(NSRect)r { - box = NSRectToCGRect(r); -} - -- (NSRect)selectBox { - return NSRectFromCGRect(box); -} - -- (void)drawInContext:(CGContextRef)context { - if (active) { - CGContextAddRect(context, box); - - CGContextSetRGBStrokeColor(context, 0.6, 0.6, 0.6, 1); - CGContextSetRGBFillColor(context, 0.8, 0.8, 0.8, 0.2); - CGContextSetLineWidth(context, 1); - - CGContextSetShouldAntialias(context, NO); - CGContextDrawPath(context, kCGPathFillStroke); - } -} - -+ (SelectBoxLayer*)layer { - return [[SelectBoxLayer alloc] init]; -} - -@end diff --git a/tikzit/src/osx/SelectableCollectionViewItem.h b/tikzit/src/osx/SelectableCollectionViewItem.h deleted file mode 100644 index 4a2c571..0000000 --- a/tikzit/src/osx/SelectableCollectionViewItem.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// SelectableCollectionViewItem.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "StylePaletteController.h" - -@interface SelectableCollectionViewItem : NSCollectionViewItem { - IBOutlet StylePaletteController *stylePaletteController; -} - -- (void)setStylePaletteController:(StylePaletteController*)spc; - -@end diff --git a/tikzit/src/osx/SelectableCollectionViewItem.m b/tikzit/src/osx/SelectableCollectionViewItem.m deleted file mode 100644 index 880c37b..0000000 --- a/tikzit/src/osx/SelectableCollectionViewItem.m +++ /dev/null @@ -1,54 +0,0 @@ -// -// SelectableCollectionViewItem.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "SelectableCollectionViewItem.h" -#import "SelectableNodeView.h" - -@implementation SelectableCollectionViewItem - -- (id)copyWithZone:(NSZone *)zone { - SelectableCollectionViewItem *item = [super copyWithZone:zone]; - [item setStylePaletteController:stylePaletteController]; - return (id)item; -} - -- (void)setSelected:(BOOL)flag { - [super setSelected:flag]; - [(SelectableNodeView*)[self view] setSelected:flag]; - - // only fire this event from the view that lost selection - //if (flag == NO) [stylePaletteController selectionDidChange]; - - [[self view] setNeedsDisplay:YES]; -} - -- (void)setRepresentedObject:(id)object { - [super setRepresentedObject:object]; - [(SelectableNodeView*)[self view] setNodeStyle:(NodeStyle*)object]; -} - -- (void)setStylePaletteController:(StylePaletteController*)spc { - stylePaletteController = spc; -} - -@end diff --git a/tikzit/src/osx/SelectableNodeView.h b/tikzit/src/osx/SelectableNodeView.h deleted file mode 100644 index 6b0841d..0000000 --- a/tikzit/src/osx/SelectableNodeView.h +++ /dev/null @@ -1,38 +0,0 @@ -// -// SelectableView.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "NodeLayer.h" -#import "NodeStyle.h" -#import "NodeStyle+Coder.h" - -@interface SelectableNodeView : NSView { - BOOL selected; - NodeLayer *nodeLayer; -} - -@property (assign) BOOL selected; -@property (strong) NodeStyle *nodeStyle; - - -@end diff --git a/tikzit/src/osx/SelectableNodeView.m b/tikzit/src/osx/SelectableNodeView.m deleted file mode 100644 index 797a137..0000000 --- a/tikzit/src/osx/SelectableNodeView.m +++ /dev/null @@ -1,96 +0,0 @@ -// -// SelectableView.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "SelectableNodeView.h" -#import "Shape.h" -#import "Transformer.h" - -@implementation SelectableNodeView - -@synthesize selected; - -- (id)initWithFrame:(NSRect)frameRect { - if (!(self = [super initWithFrame:frameRect])) return nil; - nodeLayer = nil; - return self; -} - --(void)drawLayer:(CALayer *)layer inContext:(CGContextRef)context { -// NSLog(@"got draw"); -// CGContextSaveGState(context); -// -// if (selected) { -// CGContextSetRGBStrokeColor(context, 0.61f, 0.735f, 1.0f, 1.0f); -// CGContextSetRGBFillColor(context, 0.61f, 0.735f, 1.0f, 0.5f); -// CGContextSetLineWidth(context, 1.0f); -// -// CGRect box = CGRectMake([layer frame].origin.x + 2, -// [layer frame].origin.y + 2, -// [layer frame].size.width - 4, -// [layer frame].size.height - 4); -// -// //CGContextAddRect(context, box); -// CGContextDrawPath(context, kCGPathFillStroke); -// } -// -// CGContextRestoreGState(context); - - if (nodeLayer!=nil) { - if (![[[self layer] sublayers] containsObject:nodeLayer]) { - [[self layer] addSublayer:nodeLayer]; - NSPoint c = NSMakePoint(CGRectGetMidX([[self layer] frame]), - CGRectGetMidY([[self layer] frame])); - [nodeLayer setCenter:c andAnimateWhen:NO]; - } - - if (selected) [[nodeLayer selection] select]; - else [[nodeLayer selection] deselect]; - - [nodeLayer updateFrame]; - } -} - -- (void)drawRect:(NSRect)rect { - [super drawRect:rect]; -} - -- (BOOL)acceptsFirstMouse:(NSEvent *)theEvent { return YES; } - -- (void)setNodeStyle:(NodeStyle *)sty { - if (nodeLayer == nil) { - nodeLayer = [[NodeLayer alloc] initWithNode:[Node node] - transformer:[Transformer defaultTransformer]]; - [nodeLayer setRescale:NO]; - } - - [[nodeLayer node] setStyle:sty]; - [nodeLayer updateFrame]; -} - -- (NodeStyle*)nodeStyle { - if (nodeLayer != nil) return [[nodeLayer node] style]; - else return nil; -} - - -@end diff --git a/tikzit/src/osx/StylePaletteController.h b/tikzit/src/osx/StylePaletteController.h deleted file mode 100644 index 05f0684..0000000 --- a/tikzit/src/osx/StylePaletteController.h +++ /dev/null @@ -1,80 +0,0 @@ -// -// StylePaletteController.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "NodeStyle.h" -#import "EdgeStyle.h" - -@class SFBInspectorView; - -@interface StylePaletteController : NSWindowController { - NSMutableArray *nodeStyles; - NSMutableArray *edgeStyles; - IBOutlet NSArrayController *nodeStyleArrayController; - IBOutlet NSArrayController *filteredNodeStyleArrayController; - IBOutlet NSArrayController *edgeStyleArrayController; - IBOutlet NSArrayController *filteredEdgeStyleArrayController; - IBOutlet NSCollectionView *collectionView; - IBOutlet SFBInspectorView *nodeStyleInspectorView; - IBOutlet NSView *nodeStyleView; - IBOutlet NSView *edgeStyleView; - IBOutlet NSPopUpButton *shapeDropdown; - NSString *displayedNodeStyleCategory; - NSString *displayedEdgeStyleCategory; -} - -@property (strong) NSMutableArray *nodeStyles; -@property (strong) NSMutableArray *edgeStyles; -@property (readonly) BOOL documentActive; -@property (strong) NodeStyle *activeNodeStyle; -@property (strong) EdgeStyle *activeEdgeStyle; -@property (copy) NSString *displayedNodeStyleCategory; -@property (copy) NSString *displayedEdgeStyleCategory; -@property (readonly) NSPredicate *displayedNodeStylePredicate; -@property (readonly) NSPredicate *displayedEdgeStylePredicate; - -//@property NSString *nodeLabel; - -- (id)initWithWindowNibName:(NSString *)windowNibName - supportDir:(NSString*)supportDir; -- (void)saveStyles:(NSString *)plist; - -- (IBAction)refreshCollection:(id)sender; - -- (IBAction)applyActiveNodeStyle:(id)sender; -- (IBAction)clearActiveNodeStyle:(id)sender; -- (IBAction)addNodeStyle:(id)sender; - -- (IBAction)appleActiveEdgeStyle:(id)sender; -- (IBAction)clearActiveEdgeStyle:(id)sender; -- (IBAction)addEdgeStyle:(id)sender; -- (void)setActiveEdgeStyle:(EdgeStyle*)style; - -- (IBAction)setFillToClosestHashed:(id)sender; -- (IBAction)setStrokeToClosestHashed:(id)sender; - - -//- (IBAction)changeShape:(id)sender; - - -@end diff --git a/tikzit/src/osx/StylePaletteController.m b/tikzit/src/osx/StylePaletteController.m deleted file mode 100644 index 4fe46be..0000000 --- a/tikzit/src/osx/StylePaletteController.m +++ /dev/null @@ -1,252 +0,0 @@ -// -// StylePaletteController.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "StylePaletteController.h" -#import "TikzDocument.h" -#import "SFBInspectors/SFBInspectorView.h" -#import "PickSupport.h" -#import "Node.h" -#import "Edge.h" -#import "NodeStyle.h" -#import "GraphicsView.h" -#import "GraphElementProperty.h" -#import "Shape.h" - -@implementation StylePaletteController - -@synthesize nodeStyles, edgeStyles; - -- (id)initWithWindowNibName:(NSString *)windowNibName - supportDir:(NSString*)supportDir -{ - if (self = [super initWithWindowNibName:windowNibName]) { - NSString *ns = [supportDir stringByAppendingPathComponent:@"nodeStyles.plist"]; - NSString *es = [supportDir stringByAppendingPathComponent:@"edgeStyles.plist"]; - nodeStyles = (NSMutableArray*)[NSKeyedUnarchiver - unarchiveObjectWithFile:ns]; - edgeStyles = (NSMutableArray*)[NSKeyedUnarchiver - unarchiveObjectWithFile:es]; - - if (nodeStyles == nil) nodeStyles = [NSMutableArray array]; - if (edgeStyles == nil) edgeStyles = [NSMutableArray array]; - - if ([[NSUserDefaults standardUserDefaults] boolForKey:@"net.sourceforge.tikzit.inspectorsontop"] == YES) { - [[self window] setLevel:NSFloatingWindowLevel]; - } else { - [[self window] setLevel:NSNormalWindowLevel]; - } - - [self showWindow:self]; - } - - return self; -} - -- (void)windowDidLoad { - [[self window] setMovableByWindowBackground:YES]; - [shapeDropdown addItemsWithTitles:[[Shape shapeDictionary] allKeys]]; - if ([self activeNodeStyle] != nil) { - [shapeDropdown setTitle:[[self activeNodeStyle] shapeName]]; - } - - [nodeStyleInspectorView addInspectorPane:nodeStyleView - title:@"Node Styles"]; - - [nodeStyleInspectorView addInspectorPane:edgeStyleView - title:@"Edge Styles"]; - - [super windowDidLoad]; -} - -- (void)saveStyles:(NSString*)supportDir { - NSString *ns = [supportDir stringByAppendingPathComponent:@"nodeStyles.plist"]; - NSString *es = [supportDir stringByAppendingPathComponent:@"edgeStyles.plist"]; - [NSKeyedArchiver archiveRootObject:nodeStyles toFile:ns]; - [NSKeyedArchiver archiveRootObject:edgeStyles toFile:es]; -} - -- (IBAction)refreshCollection:(id)sender { - [collectionView setNeedsDisplay:YES]; -} - - -- (BOOL)documentActive { - NSDocumentController *dc = [NSDocumentController sharedDocumentController]; - return dc.currentDocument != nil; -} - --(BOOL)collectionView:(NSCollectionView*)collectionView canDragItemsAtIndexes:(NSIndexSet*)indexes withEvent:(NSEvent*)event { - return YES; -} - - -//=========================== -//= setting SVG-safe colors = -//=========================== -- (IBAction)setFillToClosestHashed:(id)sender { - NSArray *sel = [nodeStyleArrayController selectedObjects]; - if ([sel count] != 0) { - NodeStyle *sty = [sel objectAtIndex:0]; - [sty willChangeValueForKey:@"fillColor"]; - [sty willChangeValueForKey:@"fillColorIsKnown"]; - [sty.fillColorRGB setToClosestHashed]; - [sty didChangeValueForKey:@"fillColor"]; - [sty didChangeValueForKey:@"fillColorIsKnown"]; - } -} - -- (IBAction)setStrokeToClosestHashed:(id)sender { - NSArray *sel = [nodeStyleArrayController selectedObjects]; - if ([sel count] != 0) { - NodeStyle *sty = [sel objectAtIndex:0]; - [sty willChangeValueForKey:@"strokeColor"]; - [sty willChangeValueForKey:@"strokeColorIsKnown"]; - [sty.strokeColorRGB setToClosestHashed]; - [sty didChangeValueForKey:@"strokeColor"]; - [sty didChangeValueForKey:@"strokeColorIsKnown"]; - } -} - -//================================================= -//= setting filter predicates for nodes and edges = -//================================================= -- (NSString*)displayedNodeStyleCategory { - return displayedNodeStyleCategory; -} - -- (void)setDisplayedNodeStyleCategory:(NSString *)cat { - [self willChangeValueForKey:@"displayedNodeStylePredicate"]; - displayedNodeStyleCategory = cat; - [self didChangeValueForKey:@"displayedNodeStylePredicate"]; -} - -- (NSString*)displayedEdgeStyleCategory { - return displayedEdgeStyleCategory; -} - -- (void)setDisplayedEdgeStyleCategory:(NSString *)cat { - [self willChangeValueForKey:@"displayedEdgeStylePredicate"]; - displayedEdgeStyleCategory = cat; - [self didChangeValueForKey:@"displayedEdgeStylePredicate"]; -} - -- (NSPredicate*)displayedNodeStylePredicate { - return [NSPredicate predicateWithFormat:@"category == %@", displayedNodeStyleCategory]; -} - -- (NSPredicate*)displayedEdgeStylePredicate { - return [NSPredicate predicateWithFormat:@"category == %@", displayedEdgeStyleCategory]; -} - - -//============================== -//= getting and setting styles = -//============================== - -- (IBAction)applyActiveNodeStyle:(id)sender { - NSDocumentController *dc = [NSDocumentController sharedDocumentController]; - TikzDocument *doc = (TikzDocument*)[dc currentDocument]; - - if (doc != nil) { - [[doc graphicsView] applyStyleToSelectedNodes:[self activeNodeStyle]]; - } - - [[doc graphicsView] postSelectionChange]; -} - -- (IBAction)clearActiveNodeStyle:(id)sender { - [self setActiveNodeStyle:nil]; - - NSDocumentController *dc = [NSDocumentController sharedDocumentController]; - TikzDocument *doc = (TikzDocument*)[dc currentDocument]; - - if (doc != nil) { - [[doc graphicsView] applyStyleToSelectedNodes:nil]; - } - - [[doc graphicsView] postSelectionChange]; -} - -- (NodeStyle*)activeNodeStyle { - NSArray *sel = [filteredNodeStyleArrayController selectedObjects]; - if ([sel count] == 0) return nil; - else return [sel objectAtIndex:0]; -} - -- (void)setActiveNodeStyle:(NodeStyle*)style { - if ([nodeStyles containsObject:style]) { - [filteredNodeStyleArrayController setSelectedObjects:[NSArray arrayWithObject:style]]; - } else { - [filteredNodeStyleArrayController setSelectedObjects:[NSArray array]]; - } -} - -- (IBAction)appleActiveEdgeStyle:(id)sender { - NSDocumentController *dc = [NSDocumentController sharedDocumentController]; - TikzDocument *doc = (TikzDocument*)[dc currentDocument]; - - if (doc != nil) { - [[doc graphicsView] applyStyleToSelectedEdges:[self activeEdgeStyle]]; - } -} - -- (IBAction)clearActiveEdgeStyle:(id)sender { - [self setActiveEdgeStyle:nil]; - [self appleActiveEdgeStyle:sender]; -} - -- (EdgeStyle*)activeEdgeStyle { - NSArray *sel = [filteredEdgeStyleArrayController selectedObjects]; - if ([sel count] == 0) return nil; - else return [sel objectAtIndex:0]; -} - -- (void)setActiveEdgeStyle:(EdgeStyle*)style { - if ([edgeStyles containsObject:style]) { - [filteredEdgeStyleArrayController setSelectedObjects:[NSArray arrayWithObject:style]]; - } else { - [filteredEdgeStyleArrayController setSelectedObjects:[NSArray array]]; - } -} - - -//================= -//= adding styles = -//================= - -- (IBAction)addEdgeStyle:(id)sender { - EdgeStyle *sty = [[EdgeStyle alloc] init]; - [sty setCategory:displayedEdgeStyleCategory]; - [edgeStyleArrayController addObject:sty]; - [self setActiveEdgeStyle:sty]; -} - -- (IBAction)addNodeStyle:(id)sender { - NodeStyle *sty = [[NodeStyle alloc] init]; - [sty setCategory:displayedNodeStyleCategory]; - [nodeStyleArrayController addObject:sty]; - [self setActiveNodeStyle:sty]; -} - - -@end diff --git a/tikzit/src/osx/TikzDocument.h b/tikzit/src/osx/TikzDocument.h deleted file mode 100644 index 1881994..0000000 --- a/tikzit/src/osx/TikzDocument.h +++ /dev/null @@ -1,37 +0,0 @@ -// -// TikzDocument.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "GraphicsView.h" -#import "TikzSourceController.h" -#import "PreviewController.h" -#import "GraphicsView.h" - -@interface TikzDocument : NSDocument { - NSString *tikz; -} - -@property (readonly) NSString *tikz; -@property (weak, readonly) GraphicsView *graphicsView; - -@end diff --git a/tikzit/src/osx/TikzDocument.m b/tikzit/src/osx/TikzDocument.m deleted file mode 100644 index ef5908d..0000000 --- a/tikzit/src/osx/TikzDocument.m +++ /dev/null @@ -1,84 +0,0 @@ -// -// TikzDocument.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "TikzDocument.h" -#import "TikzWindowController.h" - -@implementation TikzDocument - -@synthesize tikz; - -- (id)init { - self = [super init]; - if (self) { - tikz = nil; - } - return self; -} - -//- (NSString *)windowNibName { -// // Override returning the nib file name of the document -// // If you need to use a subclass of NSWindowController or if your document supports multiple NSWindowControllers, you should remove this method and override -makeWindowControllers instead. -// return @"TikzDocument"; -//} - -- (void)makeWindowControllers { - TikzWindowController *wc = [[TikzWindowController alloc] initWithDocument:self]; - [self addWindowController:wc]; -} - -- (void)windowControllerDidLoadNib:(NSWindowController *) aController { - [super windowControllerDidLoadNib:aController]; - [[self graphicsView] refreshLayers]; - // Add any code here that needs to be executed once the windowController has loaded the document's window. -} - -- (NSData *)dataOfType:(NSString *)typeName error:(NSError **)outError { - TikzWindowController *wc = - (TikzWindowController*)[[self windowControllers] objectAtIndex:0]; - NSData *outData = [[[wc tikzSourceController] tikz] dataUsingEncoding:NSUTF8StringEncoding]; - - if ( outError != NULL ) { - *outError = [NSError errorWithDomain:NSOSStatusErrorDomain code:unimpErr userInfo:NULL]; - } - return outData; -} - -- (BOOL)readFromData:(NSData *)data ofType:(NSString *)typeName error:(NSError **)outError { - tikz = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]; - - if ( outError != NULL ) { - *outError = [NSError errorWithDomain:NSOSStatusErrorDomain code:unimpErr userInfo:NULL]; - } - - return YES; -} - -- (GraphicsView*)graphicsView { - TikzWindowController *wc = - (TikzWindowController*)[[self windowControllers] objectAtIndex:0]; - return [wc graphicsView]; -} - - -@end diff --git a/tikzit/src/osx/TikzFormatter.h b/tikzit/src/osx/TikzFormatter.h deleted file mode 100644 index 4d9ec04..0000000 --- a/tikzit/src/osx/TikzFormatter.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// NSTikzFormatter.h -// TikZiT -// -// Created by Karl Johan Paulsson on 27/01/2013. -// Copyright (c) 2013 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import - -@interface TikzFormatter : NSFormatter - -@end diff --git a/tikzit/src/osx/TikzFormatter.m b/tikzit/src/osx/TikzFormatter.m deleted file mode 100644 index cb0865d..0000000 --- a/tikzit/src/osx/TikzFormatter.m +++ /dev/null @@ -1,91 +0,0 @@ -// -// NSTikzFormatter.m -// TikZiT -// -// Created by Karl Johan Paulsson on 27/01/2013. -// Copyright (c) 2013 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "TikzFormatter.h" -#import "TikzGraphAssembler.h" - -@implementation TikzFormatter - -- (NSString *)stringForObjectValue:(id)obj{ - if (![obj isKindOfClass:[NSString class]]) { - return @""; - } - - return [NSString stringWithString:obj]; -} - -- (BOOL)getObjectValue:(out id *)obj forString:(NSString *)string errorDescription:(out NSString **)error{ - *obj = [NSString stringWithString:string]; - - BOOL r = [TikzGraphAssembler validateTikzPropertyNameOrValue:string]; - - if (!r && error) - *error = NSLocalizedString(@"Invalid input, couldn't parse value.", @"tikz user input error"); - - return r; -} - -- (BOOL)isPartialStringValid:(NSString **)partialStringPtr proposedSelectedRange:(NSRangePointer)proposedSelRangePtr originalString:(NSString *)origString originalSelectedRange:(NSRange)origSelRange errorDescription:(NSString **)error{ - NSRange addedRange; - NSString *addedString; - - if(![[NSUserDefaults standardUserDefaults] boolForKey:@"net.sourceforge.tikzit.autocomplete"]){ - return YES; - } - - addedRange = NSMakeRange(origSelRange.location, proposedSelRangePtr->location - origSelRange.location); - addedString = [*partialStringPtr substringWithRange: addedRange]; - - if([addedString isEqualToString:@"{"]){ - NSString *s = [[NSString stringWithString:*partialStringPtr] stringByAppendingString:@"}"]; - *partialStringPtr = s; - - return NO; - } - - if([addedString isEqualToString:@"}"]){ - NSScanner *scanner = [NSScanner scannerWithString:*partialStringPtr]; - - NSCharacterSet *cs = [NSCharacterSet characterSetWithCharactersInString:@"{}"]; - NSMutableString *strippedString = [NSMutableString stringWithCapacity:[*partialStringPtr length]]; - - while ([scanner isAtEnd] == NO) { - NSString *buffer; - if ([scanner scanCharactersFromSet:cs intoString:&buffer]) { - [strippedString appendString:buffer]; - - } else { - [scanner setScanLocation:([scanner scanLocation] + 1)]; - } - } - - if([strippedString length] % 2 == 1){ - return NO; - } - } - - return YES; -} - -@end diff --git a/tikzit/src/osx/TikzSourceController.h b/tikzit/src/osx/TikzSourceController.h deleted file mode 100644 index 84d36da..0000000 --- a/tikzit/src/osx/TikzSourceController.h +++ /dev/null @@ -1,71 +0,0 @@ -// -// TikzSourceController.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import - -#import "GraphicsView.h" -#import "ParseErrorView.h" - -@interface TikzSourceController : NSObject { - GraphicsView *__weak graphicsView; - NSTextView *__unsafe_unretained sourceView; - NSAttributedString *source; - NSTextField *__weak status; - NSDictionary *textAttrs; - NSColor *successColor; - NSColor *failedColor; - NSTextField *__weak errorMessage; - ParseErrorView *__weak errorNotification; - - NSUndoManager *__weak documentUndoManager; - - BOOL tikzChanged; - BOOL justUndid; - - NSError *lastError; -} - -@property BOOL tikzChanged; -@property (weak) IBOutlet GraphicsView *graphicsView; -@property (unsafe_unretained) IBOutlet NSTextView *sourceView; -@property (weak) IBOutlet NSTextField *status; -@property (weak) NSUndoManager *documentUndoManager; -@property (copy) NSAttributedString *source; -@property (copy) NSString *tikz; -@property (weak) IBOutlet ParseErrorView *errorNotification; -@property (weak) IBOutlet NSTextField *errorMessage; - -- (void)updateTikzFromGraph; -- (void)graphChanged:(NSNotification*)n; - -- (IBAction)closeParseError:(id)pId; - -// called by code, these do not register an undo -- (BOOL)tryParseTikz; -- (void)doRevertTikz; - -// called by user, these do register an undo -- (void)parseTikz:(id)sender; -- (void)revertTikz:(id)sender; - -@end diff --git a/tikzit/src/osx/TikzSourceController.m b/tikzit/src/osx/TikzSourceController.m deleted file mode 100644 index 84eb3a5..0000000 --- a/tikzit/src/osx/TikzSourceController.m +++ /dev/null @@ -1,241 +0,0 @@ -// -// TikzSourceController.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "TikzSourceController.h" -#import "TikzGraphAssembler.h" -#import "Graph.h" - -@implementation TikzSourceController - -@synthesize graphicsView, sourceView, source, status; -@synthesize documentUndoManager, tikzChanged; -@synthesize errorMessage, errorNotification; - -- (void)endEditing { - NSResponder *res = [[sourceView window] firstResponder]; - [[sourceView window] makeFirstResponder:nil]; - [[sourceView window] makeFirstResponder:res]; -} - -- (void)undoParseTikz:(Graph *)oldGraph { - [graphicsView setGraph:oldGraph]; - [graphicsView setEnabled:NO]; - [graphicsView postGraphChange]; - [graphicsView refreshLayers]; - - [documentUndoManager registerUndoWithTarget:self - selector:@selector(parseTikz:) - object:self]; - [documentUndoManager setActionName:@"Parse Tikz"]; -} - -- (void)undoRevertTikz:(NSString*)oldTikz { - [self setTikz:oldTikz]; - [graphicsView setEnabled:NO]; - [graphicsView refreshLayers]; - - [documentUndoManager registerUndoWithTarget:self - selector:@selector(revertTikz:) - object:self]; - [documentUndoManager setActionName:@"Revert Tikz"]; -} - -- (void)undoTikzChange:(id)ignore { - [graphicsView setEnabled:YES]; - [graphicsView refreshLayers]; - [self endEditing]; - [self updateTikzFromGraph]; - [documentUndoManager registerUndoWithTarget:self - selector:@selector(redoTikzChange:) - object:nil]; - [documentUndoManager setActionName:@"Tikz Change"]; -} - -- (void)redoTikzChange:(id)ignore { - [graphicsView setEnabled:NO]; - [graphicsView refreshLayers]; - [documentUndoManager registerUndoWithTarget:self - selector:@selector(undoTikzChange:) - object:nil]; - [documentUndoManager setActionName:@"Tikz Change"]; -} - - -- (void)awakeFromNib { - justUndid = NO; - successColor = [NSColor colorWithCalibratedRed:0.0f - green:0.5f - blue:0.0f - alpha:1.0f]; - failedColor = [NSColor redColor]; - - NSFont *font = [NSFont userFixedPitchFontOfSize:11.0f]; - - if (font != nil) { - textAttrs = [NSDictionary dictionaryWithObject:font - forKey:NSFontAttributeName]; - } else { - NSLog(@"WARNING: couldn't find monospaced font."); - textAttrs = [NSDictionary dictionary]; - } - - - [self graphChanged:nil]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(graphChanged:) - name:@"GraphChanged" - object:graphicsView]; -} - -- (void)setTikz:(NSString *)str { - [self willChangeValueForKey:@"source"]; - source = [[NSAttributedString alloc] initWithString:str attributes:textAttrs]; - [self didChangeValueForKey:@"source"]; -} - -- (NSString*)tikz { - return [source string]; -} - -- (void)updateTikzFromGraph { - [self setTikz:[[graphicsView graph] tikz]]; - [errorNotification setHidden:TRUE]; -} - -- (void)graphChanged:(NSNotification*)n { - if ([graphicsView enabled]) [self updateTikzFromGraph]; -} - -- (IBAction)closeParseError:(id)pId{ - [errorNotification setHidden:TRUE]; -} - -- (void)textDidBeginEditing:(NSNotification *)notification { - if ([graphicsView enabled]){ - [graphicsView setEnabled:NO]; - [graphicsView refreshLayers]; - [documentUndoManager registerUndoWithTarget:self - selector:@selector(undoTikzChange:) - object:nil]; - [documentUndoManager setActionName:@"Tikz Change"]; - } -} - -- (BOOL)tryParseTikz { - NSError *thisError; - - Graph *g = [TikzGraphAssembler parseTikz:[self tikz] - error:&thisError]; - - lastError = thisError; - - if (g) { - [graphicsView deselectAll:self]; - [graphicsView setGraph:g]; - [graphicsView refreshLayers]; - [self doRevertTikz]; - return YES; - } else { - return NO; - } -} - -- (void)doRevertTikz { - [self updateTikzFromGraph]; - [self endEditing]; - [graphicsView setEnabled:YES]; - [graphicsView refreshLayers]; - [status setStringValue:@""]; -} - -- (void)parseTikz:(id)sender { - if (![graphicsView enabled]) { - Graph *oldGraph = [graphicsView graph]; - if ([self tryParseTikz]) { - [self endEditing]; - [documentUndoManager registerUndoWithTarget:self - selector:@selector(undoParseTikz:) - object:oldGraph]; - [documentUndoManager setActionName:@"Parse Tikz"]; - - [status setStringValue:@"success"]; - [status setTextColor:successColor]; - - [errorNotification setHidden:TRUE]; - } else { - [status setStringValue:@"parse error"]; - [status setTextColor:failedColor]; - - NSDictionary *d = [lastError userInfo]; - - NSString *ts = [NSString stringWithFormat: @"Parse error on line %@: %@\n", [d valueForKey:@"startLine"], [d valueForKey:NSLocalizedDescriptionKey]]; - NSMutableAttributedString *as = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat: @"Parse error on line %@: %@\n%@\n", [d valueForKey:@"startLine"], [d valueForKey:NSLocalizedDescriptionKey], [[d valueForKey:@"syntaxString"] stringByReplacingOccurrencesOfString:@"\t" withString:@""]]]; - - NSInteger tokenLength = [[d valueForKey:@"tokenLength"] integerValue]; - // Bit of a mess, offset around to find correct position and correct for 4 characters for every one character of \t - NSInteger addedTokenStart = [[d valueForKey:@"tokenStart"] integerValue] + [ts length] - ([[[d valueForKey:@"syntaxString"] componentsSeparatedByString:@"\t"] count]-1)*4 - tokenLength; - - // Can't see if the error is a start paranthesis as only that will be underlined, underline the entire paranthesis instead - if(tokenLength == 1 && [[as string] characterAtIndex:addedTokenStart] == '('){ - tokenLength += [[[as string] substringFromIndex:addedTokenStart+1] rangeOfString:@")"].location + 1; - } - - // Same if unexpected endparanthesis - if(tokenLength == 1 && [[as string] characterAtIndex:addedTokenStart] == ')'){ - NSInteger d = addedTokenStart - [[[as string] substringToIndex:addedTokenStart] rangeOfString:@"(" options:NSBackwardsSearch].location; - - tokenLength += d; - addedTokenStart -= d; - } - - [as beginEditing]; - [as addAttributes:[NSDictionary dictionaryWithObjectsAndKeys: - [NSNumber numberWithInt:NSUnderlineStyleSingle | NSUnderlinePatternDot], NSUnderlineStyleAttributeName, - [NSColor redColor], NSUnderlineColorAttributeName, - nil] - range:NSMakeRange(addedTokenStart, tokenLength)]; - [as endEditing]; - - [errorMessage setAttributedStringValue:as]; - [errorNotification setHidden:FALSE]; - } - } -} - -- (void)revertTikz:(id)sender { - if (![graphicsView enabled]) { - NSString *oldTikz = [[self tikz] copy]; - [self doRevertTikz]; - - [documentUndoManager registerUndoWithTarget:self - selector:@selector(undoRevertTikz:) - object:oldTikz]; - [documentUndoManager setActionName:@"Revert Tikz"]; - } -} - -- (void)dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; -} - -@end diff --git a/tikzit/src/osx/TikzWindowController.h b/tikzit/src/osx/TikzWindowController.h deleted file mode 100644 index eab427c..0000000 --- a/tikzit/src/osx/TikzWindowController.h +++ /dev/null @@ -1,31 +0,0 @@ -// -// TikzWindowController.h -// TikZiT -// -// Created by Aleks Kissinger on 26/01/2011. -// Copyright 2011 __MyCompanyName__. All rights reserved. -// - -#import - -@class TikzDocument, GraphicsView, TikzSourceController; - -@interface TikzWindowController : NSWindowController { - GraphicsView *__weak graphicsView; - TikzSourceController *__weak tikzSourceController; - TikzDocument *document; -} - -@property (weak) IBOutlet GraphicsView *graphicsView; -@property (weak) IBOutlet TikzSourceController *tikzSourceController; - -- (id)initWithDocument:(TikzDocument*)doc; - -// pass these straight to the tikz source controller -- (void)parseTikz:(id)sender; -- (void)revertTikz:(id)sender; -- (void)zoomIn:(id)sender; -- (void)zoomOut:(id)sender; -- (void)zoomToActualSize:(id)sender; - -@end diff --git a/tikzit/src/osx/TikzWindowController.m b/tikzit/src/osx/TikzWindowController.m deleted file mode 100644 index bfacbfb..0000000 --- a/tikzit/src/osx/TikzWindowController.m +++ /dev/null @@ -1,66 +0,0 @@ -// -// TikzWindowController.m -// TikZiT -// -// Created by Aleks Kissinger on 26/01/2011. -// Copyright 2011 __MyCompanyName__. All rights reserved. -// - -#import "TikzWindowController.h" -#import "TikzDocument.h" -#import "GraphicsView.h" -#import "TikzSourceController.h" - -@implementation TikzWindowController - -@synthesize graphicsView, tikzSourceController; - -- (id)initWithDocument:(TikzDocument*)doc { - if (!(self = [super initWithWindowNibName:@"TikzDocument"])) return nil; - document = doc; - return self; -} - -- (void)awakeFromNib { - if ([document tikz] != nil) { - [graphicsView setEnabled:NO]; - [tikzSourceController setTikz:[document tikz]]; - [tikzSourceController parseTikz:self]; - } - - [graphicsView setDocumentUndoManager:[document undoManager]]; - [tikzSourceController setDocumentUndoManager:[document undoManager]]; -} - -- (void)parseTikz:(id)sender { - [tikzSourceController parseTikz:sender]; -} - -- (void)revertTikz:(id)sender { - [tikzSourceController revertTikz:sender]; -} - -- (void)previewTikz:(id)sender { - PreviewController *pc = [PreviewController defaultPreviewController]; - if (![[pc window] isVisible]) [pc showWindow:sender]; - [pc buildTikz:[tikzSourceController tikz]]; -} - -- (void)zoomIn:(id)sender { - float scale = [[graphicsView transformer] scale] * 1.25f; - [[graphicsView transformer] setScale:scale]; - [graphicsView refreshLayers]; -} - -- (void)zoomOut:(id)sender { - float scale = [[graphicsView transformer] scale] * 0.8f; - [[graphicsView transformer] setScale:scale]; - [graphicsView refreshLayers]; -} - -- (void)zoomToActualSize:(id)sender { - [[graphicsView transformer] setScale:50.0f]; - [graphicsView refreshLayers]; -} - -@end diff --git a/tikzit/src/osx/ToolPaletteController.h b/tikzit/src/osx/ToolPaletteController.h deleted file mode 100644 index 6301c6b..0000000 --- a/tikzit/src/osx/ToolPaletteController.h +++ /dev/null @@ -1,42 +0,0 @@ -// -// ToolPaletteController.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// -#import - -typedef enum { - TikzToolSelect, - TikzToolNode, - TikzToolEdge, - TikzToolCrop -} TikzTool; - -@interface ToolPaletteController : NSObject { - NSPanel *__weak toolPalette; - NSMatrix *__weak toolMatrix; -} - -@property TikzTool selectedTool; -@property (weak) IBOutlet NSPanel *toolPalette; -@property (weak) IBOutlet NSMatrix *toolMatrix; - - -@end diff --git a/tikzit/src/osx/ToolPaletteController.m b/tikzit/src/osx/ToolPaletteController.m deleted file mode 100644 index 000287d..0000000 --- a/tikzit/src/osx/ToolPaletteController.m +++ /dev/null @@ -1,58 +0,0 @@ -// -// ToolPaletteController.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "ToolPaletteController.h" - - -@implementation ToolPaletteController - -@synthesize toolPalette, toolMatrix; - -- (TikzTool)selectedTool { - switch (toolMatrix.selectedRow) { - case 0: return TikzToolSelect; - case 1: return TikzToolNode; - case 2: return TikzToolEdge; - case 3: return TikzToolCrop; - } - return TikzToolSelect; -} - -- (void)setSelectedTool:(TikzTool)tool { - switch (tool) { - case TikzToolSelect: - [toolMatrix selectCellAtRow:0 column:0]; - break; - case TikzToolNode: - [toolMatrix selectCellAtRow:1 column:0]; - break; - case TikzToolEdge: - [toolMatrix selectCellAtRow:2 column:0]; - break; - case TikzToolCrop: - [toolMatrix selectCellAtRow:3 column:0]; - break; - } -} - -@end diff --git a/tikzit/src/osx/UpdatePreferenceController.h b/tikzit/src/osx/UpdatePreferenceController.h deleted file mode 100644 index 816322f..0000000 --- a/tikzit/src/osx/UpdatePreferenceController.h +++ /dev/null @@ -1,34 +0,0 @@ -// -// UpdatePreferenceController.h -// TikZiT -// -// Copyright (c) 2013 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import - -@interface UpdatePreferenceController : NSViewController{ - IBOutlet SUUpdater *sharedUpdater; - IBOutlet NSDate *lastUpdate; -} - -- (IBAction)checkForUpdates:(id)sender; - -@end diff --git a/tikzit/src/osx/UpdatePreferenceController.m b/tikzit/src/osx/UpdatePreferenceController.m deleted file mode 100644 index 2ff270f..0000000 --- a/tikzit/src/osx/UpdatePreferenceController.m +++ /dev/null @@ -1,49 +0,0 @@ -// -// UpdatePreferenceController.h -// TikZiT -// -// Copyright (c) 2013 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "UpdatePreferenceController.h" - -@interface UpdatePreferenceController () - -@end - -@implementation UpdatePreferenceController - -- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil -{ - self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]; - if (self) { - sharedUpdater = [SUUpdater sharedUpdater]; - } - return self; -} - -- (IBAction)checkForUpdates:(id)sender{ - [sharedUpdater checkForUpdates:sender]; -} - -- (NSDate*)getLastUpdate{ - return [sharedUpdater lastUpdateCheckDate]; -} - -@end diff --git a/tikzit/src/osx/UpdatePreferencePanel.xib b/tikzit/src/osx/UpdatePreferencePanel.xib deleted file mode 100644 index a9f57bd..0000000 --- a/tikzit/src/osx/UpdatePreferencePanel.xib +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tikzit/src/osx/main.m b/tikzit/src/osx/main.m deleted file mode 100644 index e6b4499..0000000 --- a/tikzit/src/osx/main.m +++ /dev/null @@ -1,26 +0,0 @@ -// -// main.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// - -#import - -int main(int argc, char *argv[]) -{ - return NSApplicationMain(argc, (const char **) argv); -} diff --git a/tikzit/src/osx/test/main.m b/tikzit/src/osx/test/main.m deleted file mode 100644 index ad0c1f7..0000000 --- a/tikzit/src/osx/test/main.m +++ /dev/null @@ -1,56 +0,0 @@ -// -// main.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "test/test.h" -#include - -void testCommon(); -void testOSX(); - -int main(int argc, char **argv) { - if (argc == 2 && strcmp(argv[1], "--disable-color")==0) { - setColorEnabled(NO); - } else { - setColorEnabled(YES); - } - - NSBundle *bund = [NSBundle bundleWithPath:@"TikZiT.app"]; - - - PUTS(@""); - PUTS(@"**********************************************"); - PUTS(@"TikZiT TESTS, OS X BUNDLE VERSION %@", - [bund objectForInfoDictionaryKey:@"CFBundleVersion"]); - PUTS(@"**********************************************"); - PUTS(@""); - - startTests(); - testCommon(); - testOSX(); - - PUTS(@""); - PUTS(@"**********************************************"); - endTests(); - PUTS(@"**********************************************"); - PUTS(@""); -} \ No newline at end of file diff --git a/tikzit/src/osx/test/osx.m b/tikzit/src/osx/test/osx.m deleted file mode 100644 index f9565ab..0000000 --- a/tikzit/src/osx/test/osx.m +++ /dev/null @@ -1,64 +0,0 @@ -// -// osx.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// -#import "test/test.h" - -#import - -void testOSX() { -// char template[] = "/tmp/tikzit_test_tmp_XXXXXXX"; -// char *dir = mkdtemp(template); -// NSString *tempDir = [NSString stringWithUTF8String:dir]; -// -// NSString *testLatex = -// @"\\documentclass{article}\n" -// @"\\begin{document}\n" -// @"test document\n" -// @"\\end{document}\n"; -// -// NSString *texFile = [NSString stringWithFormat:@"%@/test.tex", tempDir]; -// NSString *pdfFile = [NSString stringWithFormat:@"%@/test.pdf", tempDir]; -// -// [testLatex writeToFile:texFile atomically:NO encoding:NSUTF8StringEncoding error:NULL]; -// -// NSTask *task = [[NSTask alloc] init]; -// [task setLaunchPath:@"/bin/bash"]; -// NSPipe *inpt = [NSPipe pipe]; -// NSPipe *outpt = [NSPipe pipe]; -// [task setStandardInput:inpt]; -// [task setStandardOutput:outpt]; -// -// [task launch]; -// -// NSFileHandle *wr = [inpt fileHandleForWriting]; -// NSString *cmd = -// [NSString stringWithFormat: -// @"if [ -e ~/.profile ]; then source ~/.profile; fi" -// @"if [ -e ~/.profile ]; then source ~/.profile; fi"; -// [wr writeData:[cmd dataUsingEncoding:NSUTF8StringEncoding]]; -// [wr closeFile]; -// -// NSFileHandle *rd = [outpt fileHandleForReading]; -// NSString *res = [[NSString alloc] initWithData:[rd readDataToEndOfFile] -// encoding:NSUTF8StringEncoding]; -// NSLog(@"got:\n %@", res); -} diff --git a/tikzit/src/tikzit.rc b/tikzit/src/tikzit.rc deleted file mode 100644 index 072f825..0000000 --- a/tikzit/src/tikzit.rc +++ /dev/null @@ -1,24 +0,0 @@ -1 VERSIONINFO -FILEVERSION 0,7,0,0 -PRODUCTVERSION 0,7,0,0 -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "080904E4" - BEGIN - VALUE "FileDescription", "A graph editor for LaTeX" - VALUE "FileVersion", "1.0" - VALUE "InternalName", "tikzit" - VALUE "LegalCopyright", "Aleks Kissinger, Alex Merry, Chris Heunen" - VALUE "OriginalFilename", "tikzit.exe" - VALUE "ProductName", "TikZiT" - VALUE "ProductVersion", "0.7" - END - END - - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x809, 1252 - END -END -id ICON "../tikzit.ico" diff --git a/tikzit/text-x-generic.png b/tikzit/text-x-generic.png deleted file mode 100644 index 928a679..0000000 Binary files a/tikzit/text-x-generic.png and /dev/null differ diff --git a/tikzit/text-x-script.png b/tikzit/text-x-script.png deleted file mode 100644 index 801dcd6..0000000 Binary files a/tikzit/text-x-script.png and /dev/null differ diff --git a/tikzit/tikzit.icns b/tikzit/tikzit.icns deleted file mode 100644 index dc66f7f..0000000 Binary files a/tikzit/tikzit.icns and /dev/null differ diff --git a/tikzit/tikzit.ico b/tikzit/tikzit.ico deleted file mode 100644 index 3132b4c..0000000 Binary files a/tikzit/tikzit.ico and /dev/null differ diff --git a/tikzit/tikzit.spec b/tikzit/tikzit.spec deleted file mode 100644 index 237c543..0000000 --- a/tikzit/tikzit.spec +++ /dev/null @@ -1,98 +0,0 @@ -Name: tikzit -Version: 1.0 -Release: 1%{?dist} -Summary: Tool for creating and modifying PGF/TikZ-based node-and-edge graphs for LaTeX documents - -# try to choose a sensible group for this distro -%if 0%{?suse_version} -Group: Productivity/Graphics/Visualization/Graph -%else -%if 0%{?mdkversion} -Group: Sciences/Other -%else -Group: Applications/Productivity -%endif -%endif - -%if 0%{?suse_version} -License: GPL-2.0+ -%else -License: GPLv2+ -%endif -URL: http://tikzit.sourceforge.net -Source0: http://switch.dl.sourceforge.net/project/%{name}/%{name}-%{version}/%{name}-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-build - -BuildRequires: gcc-objc >= 4.6.0 -BuildRequires: gnustep-base-devel >= 1.18.0 -BuildRequires: gtk2-devel >= 2.18.0 -BuildRequires: pango-devel >= 1.16 -BuildRequires: cairo-devel >= 1.4 -%if 0%{?suse_version}%{?mdkversion} -BuildRequires: libpoppler-glib-devel >= 0.10 -%else -BuildRequires: poppler-glib-devel >= 0.10 -%endif -%if 0%{?suse_version} -BuildRequires: update-desktop-files -%endif - -%description -TikZiT is a GTK+ application that allows the creation and modification of TeX -diagrams written using the pgf/TikZ macro library. It is especially geared -toward rapidly creating "dot"-diagrams for use in academic papers. - - -%prep -%setup -q - - -%build -%configure -make %{?_smp_mflags} - - -%install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} -%if 0%{?suse_version} -# SuSE is particularly fussy about desktop file categories -%suse_update_desktop_file %{name} -r Graphics 2DGraphics -%endif - - -%clean -rm -rf %{buildroot} - - -%files -%defattr(-,root,root,-) -%doc -%{_bindir}/tikzit -%{_datadir}/tikzit/ -%{_datadir}/applications/tikzit.desktop -%{_datadir}/icons/hicolor/* - - -%changelog -* Fri May 17 2013 Alex Merry 1.0-2 --Fixed license on openSUSE - -* Tue May 7 2013 Alex Merry 1.0-1 --Bumped version - -* Fri Aug 24 2012 Alex Merry 0.9-1 --Bumped version --Bumped requirements - -* Tue Dec 06 2011 Alex Merry 0.7-1 --Bumped version - -* Tue Feb 08 2011 Alex Merry 0.6-1 --Bumped version --Added Pango and Cairo to BuildRequires --Set minimum version for GNUStep-base - -* Thu Dec 02 2010 Alex Merry 0.5-1 --Rewrote spec file - diff --git a/tikzit/tikzit48x48.png b/tikzit/tikzit48x48.png deleted file mode 100644 index 056d04b..0000000 Binary files a/tikzit/tikzit48x48.png and /dev/null differ diff --git a/tikzit/tikzit_dsa_pub.pem b/tikzit/tikzit_dsa_pub.pem deleted file mode 100644 index c97cc04..0000000 --- a/tikzit/tikzit_dsa_pub.pem +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN PUBLIC KEY----- -MIIDOjCCAi0GByqGSM44BAEwggIgAoIBAQDAdRlqLgJYjdAKkDsKtZDXgVlhqwyl -OXWCILHuE/MLh24I/mAaro4hucdhj92V5td9KNdM/R19904yZ3XcLj2/SodDVD7I -lEHPGwC/y+mJd9CaMNI/ARgFbLwJ+3+l/Ia3sraa/ASGAzardJPzYdkkRbZ/1DJn -wtHh2HgmPBdOMZZrbDmw3g4lj69Vacj4Wdz+YDG7750FjAUd+IcOvaDip28B8ogj -ogVirSXGe5YLoYbw078gx92PzSw6vfOZ3b7Gqk7zilYGB0bUJXUPSLOkxa5TMSx1 -Lr2UdW+vXrudI76rBhW52B32i7f801N4/W/qUfg8tw4tUGi/Uw8n2/S5AhUA0F82 -Qxit1jmqP0mZSLAn+qIVPuUCggEAEkSBjRxMo4KRvHOSppZphdaV2RWmQ6w9mxMj -3Z4AGDNU/buQ+TWJEYGVsIXpykI7DYCfgp8XO9uhj1hporfDsU4QGNZd0rG7SLK3 -DHwSf9QTgXY+D5IRQvkBtocxYRgNpuW+mfwl886SPmrRcT3QvsiFaI7/Iw787Tr6 -Yip4D7GjqTvj+epJH6kZq1xbdnrfBEA4dKs5IrZupF75npU8d1EjcdLlTyuzxuoZ -5a3SQWoBvT4l0xvbtR4yv+Af++MB+uxdxBSYMIgtQPgoIjFWtTDRZCwFAig1RWxz -fHEI5Fk4mqGhLAVbROL/pebYYZ5UxTKt9AMjmgmuM10/L5TXbwOCAQUAAoIBAA7t -W96VBoZgbbO2EfSxt5az4EnAJmuua6DNjZzESpcb67/DR7nLd5yveZEPL+9x6c1S -FtduIk8allplryOJtwysf8KkxrPVej83XiVJ9PDLMktsYjtnVksGIk9CS3v98OgT -c3g+xgJpRbwB6dROa5ZMxvoCU100ngfI3F/RUqeYYh7PP5kEL6SfqEHG5udIf1K7 -jUmOycNzI5Fsi+IDh8qtzxoOVTjoMPlN2F4T27xuWXA0BEd/NZqtgGLIFsbww5oD -8VPQIeo9UwQkYo/Qz1/uuaXi1u2PbTbbx2FTUL+zJuqrAv3oqmG2Ktyi0RXZaUAJ -4+P+kdS46Ip2NybQbkE= ------END PUBLIC KEY----- diff --git a/tikzit/tikzitdoc.icns b/tikzit/tikzitdoc.icns deleted file mode 100644 index 2f8bbcd..0000000 Binary files a/tikzit/tikzitdoc.icns and /dev/null differ diff --git a/tikzit/transform-crop-and-resize.png b/tikzit/transform-crop-and-resize.png deleted file mode 100644 index 4dedd93..0000000 Binary files a/tikzit/transform-crop-and-resize.png and /dev/null differ diff --git a/tikzit/transform-move.png b/tikzit/transform-move.png deleted file mode 100644 index ae4201b..0000000 Binary files a/tikzit/transform-move.png and /dev/null differ diff --git a/tikzit/updates.png b/tikzit/updates.png deleted file mode 100755 index 469ae30..0000000 Binary files a/tikzit/updates.png and /dev/null differ -- cgit v1.2.3 From dd95fa3ce7a94c1fce9e084071af4031b2bd50e9 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Wed, 11 Jan 2017 17:31:47 +0100 Subject: boilerplate --- tikzit/main.cpp | 11 ++ tikzit/mainwindow.cpp | 14 +++ tikzit/mainwindow.h | 22 ++++ tikzit/mainwindow.ui | 24 ++++ tikzit/tikzit.pro | 31 +++++ tikzit/tikzit.pro.user | 333 +++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 435 insertions(+) create mode 100644 tikzit/main.cpp create mode 100644 tikzit/mainwindow.cpp create mode 100644 tikzit/mainwindow.h create mode 100644 tikzit/mainwindow.ui create mode 100644 tikzit/tikzit.pro create mode 100644 tikzit/tikzit.pro.user diff --git a/tikzit/main.cpp b/tikzit/main.cpp new file mode 100644 index 0000000..b48f94e --- /dev/null +++ b/tikzit/main.cpp @@ -0,0 +1,11 @@ +#include "mainwindow.h" +#include + +int main(int argc, char *argv[]) +{ + QApplication a(argc, argv); + MainWindow w; + w.show(); + + return a.exec(); +} diff --git a/tikzit/mainwindow.cpp b/tikzit/mainwindow.cpp new file mode 100644 index 0000000..49d64fc --- /dev/null +++ b/tikzit/mainwindow.cpp @@ -0,0 +1,14 @@ +#include "mainwindow.h" +#include "ui_mainwindow.h" + +MainWindow::MainWindow(QWidget *parent) : + QMainWindow(parent), + ui(new Ui::MainWindow) +{ + ui->setupUi(this); +} + +MainWindow::~MainWindow() +{ + delete ui; +} diff --git a/tikzit/mainwindow.h b/tikzit/mainwindow.h new file mode 100644 index 0000000..a3948a9 --- /dev/null +++ b/tikzit/mainwindow.h @@ -0,0 +1,22 @@ +#ifndef MAINWINDOW_H +#define MAINWINDOW_H + +#include + +namespace Ui { +class MainWindow; +} + +class MainWindow : public QMainWindow +{ + Q_OBJECT + +public: + explicit MainWindow(QWidget *parent = 0); + ~MainWindow(); + +private: + Ui::MainWindow *ui; +}; + +#endif // MAINWINDOW_H diff --git a/tikzit/mainwindow.ui b/tikzit/mainwindow.ui new file mode 100644 index 0000000..6050363 --- /dev/null +++ b/tikzit/mainwindow.ui @@ -0,0 +1,24 @@ + + MainWindow + + + + 0 + 0 + 400 + 300 + + + + MainWindow + + + + + + + + + + + diff --git a/tikzit/tikzit.pro b/tikzit/tikzit.pro new file mode 100644 index 0000000..95942b2 --- /dev/null +++ b/tikzit/tikzit.pro @@ -0,0 +1,31 @@ +#------------------------------------------------- +# +# Project created by QtCreator 2017-01-11T17:30:16 +# +#------------------------------------------------- + +QT += core gui + +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets + +TARGET = tikzit +TEMPLATE = app + +# The following define makes your compiler emit warnings if you use +# any feature of Qt which as been marked as deprecated (the exact warnings +# depend on your compiler). Please consult the documentation of the +# deprecated API in order to know how to port your code away from it. +DEFINES += QT_DEPRECATED_WARNINGS + +# You can also make your code fail to compile if you use deprecated APIs. +# In order to do so, uncomment the following line. +# You can also select to disable deprecated APIs only up to a certain version of Qt. +#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 + + +SOURCES += main.cpp\ + mainwindow.cpp + +HEADERS += mainwindow.h + +FORMS += mainwindow.ui diff --git a/tikzit/tikzit.pro.user b/tikzit/tikzit.pro.user new file mode 100644 index 0000000..29e90ba --- /dev/null +++ b/tikzit/tikzit.pro.user @@ -0,0 +1,333 @@ + + + + + + EnvironmentId + {9ea8f4d8-ca0f-4a38-b3dc-69a42bafa117} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.7.1 clang 64bit + Desktop Qt 5.7.1 clang 64bit + qt.57.clang_64_kit + 0 + 0 + 0 + + /Users/alek/git/tikzit/build-tikzit-Desktop_Qt_5_7_1_clang_64bit-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + /Users/alek/git/tikzit/build-tikzit-Desktop_Qt_5_7_1_clang_64bit-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + /Users/alek/git/tikzit/build-tikzit-Desktop_Qt_5_7_1_clang_64bit-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy locally + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + -1 + + + + %{buildDir} + Custom Executable + + ProjectExplorer.CustomExecutableRunConfiguration + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.TargetCount + 1 + + + ProjectExplorer.Project.Updater.FileVersion + 18 + + + Version + 18 + + -- cgit v1.2.3 From 3947a6b0fd38af964f5a09bd919d5d7f317697db Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Fri, 13 Jan 2017 23:10:25 +0100 Subject: tool palette --- tikzit/images/AH_latex_head.png | Bin 0 -> 6334 bytes tikzit/images/AH_latex_tail.png | Bin 0 -> 6324 bytes tikzit/images/AH_none.png | Bin 0 -> 6183 bytes tikzit/images/AH_plain_head.png | Bin 0 -> 6298 bytes tikzit/images/AH_plain_tail.png | Bin 0 -> 6320 bytes tikzit/images/ED_arrow.png | Bin 0 -> 6357 bytes tikzit/images/ED_none.png | Bin 0 -> 6190 bytes tikzit/images/ED_tick.png | Bin 0 -> 6258 bytes tikzit/images/customshape.png | Bin 0 -> 1281 bytes tikzit/images/draw-ellipse.png | Bin 0 -> 3493 bytes tikzit/images/draw-path.png | Bin 0 -> 920 bytes tikzit/images/emblem-important.png | Bin 0 -> 717 bytes tikzit/images/emblem-unreadable-grey.png | Bin 0 -> 3554 bytes tikzit/images/engine.png | Bin 0 -> 1546 bytes tikzit/images/format-indent-less.png | Bin 0 -> 767 bytes tikzit/images/preamble.png | Bin 0 -> 851 bytes tikzit/images/select-rectangular.png | Bin 0 -> 499 bytes tikzit/images/text-x-generic.png | Bin 0 -> 744 bytes tikzit/images/text-x-script.png | Bin 0 -> 1416 bytes tikzit/images/tikzit48x48.png | Bin 0 -> 2606 bytes tikzit/images/transform-crop-and-resize.png | Bin 0 -> 1132 bytes tikzit/images/transform-move.png | Bin 0 -> 638 bytes tikzit/images/updates.png | Bin 0 -> 1953 bytes tikzit/main.cpp | 8 ++++-- tikzit/mainwindow.cpp | 15 ++++++---- tikzit/mainwindow.h | 11 ++++---- tikzit/mainwindow.ui | 42 ++++++++++++++++++++-------- tikzit/tikzit.pro | 13 +++++++-- tikzit/tikzit.pro.user | 17 ++++++----- tikzit/tikzit.qrc | 8 ++++++ tikzit/tikzscene.cpp | 6 ++++ tikzit/tikzscene.h | 13 +++++++++ tikzit/toolpalette.cpp | 38 +++++++++++++++++++++++++ tikzit/toolpalette.h | 22 +++++++++++++++ 34 files changed, 159 insertions(+), 34 deletions(-) create mode 100644 tikzit/images/AH_latex_head.png create mode 100644 tikzit/images/AH_latex_tail.png create mode 100644 tikzit/images/AH_none.png create mode 100644 tikzit/images/AH_plain_head.png create mode 100644 tikzit/images/AH_plain_tail.png create mode 100644 tikzit/images/ED_arrow.png create mode 100644 tikzit/images/ED_none.png create mode 100644 tikzit/images/ED_tick.png create mode 100644 tikzit/images/customshape.png create mode 100644 tikzit/images/draw-ellipse.png create mode 100644 tikzit/images/draw-path.png create mode 100644 tikzit/images/emblem-important.png create mode 100644 tikzit/images/emblem-unreadable-grey.png create mode 100644 tikzit/images/engine.png create mode 100644 tikzit/images/format-indent-less.png create mode 100644 tikzit/images/preamble.png create mode 100644 tikzit/images/select-rectangular.png create mode 100644 tikzit/images/text-x-generic.png create mode 100644 tikzit/images/text-x-script.png create mode 100644 tikzit/images/tikzit48x48.png create mode 100644 tikzit/images/transform-crop-and-resize.png create mode 100644 tikzit/images/transform-move.png create mode 100644 tikzit/images/updates.png create mode 100644 tikzit/tikzit.qrc create mode 100644 tikzit/tikzscene.cpp create mode 100644 tikzit/tikzscene.h create mode 100644 tikzit/toolpalette.cpp create mode 100644 tikzit/toolpalette.h diff --git a/tikzit/images/AH_latex_head.png b/tikzit/images/AH_latex_head.png new file mode 100644 index 0000000..b25cf6d Binary files /dev/null and b/tikzit/images/AH_latex_head.png differ diff --git a/tikzit/images/AH_latex_tail.png b/tikzit/images/AH_latex_tail.png new file mode 100644 index 0000000..0825cda Binary files /dev/null and b/tikzit/images/AH_latex_tail.png differ diff --git a/tikzit/images/AH_none.png b/tikzit/images/AH_none.png new file mode 100644 index 0000000..6322374 Binary files /dev/null and b/tikzit/images/AH_none.png differ diff --git a/tikzit/images/AH_plain_head.png b/tikzit/images/AH_plain_head.png new file mode 100644 index 0000000..8a398fa Binary files /dev/null and b/tikzit/images/AH_plain_head.png differ diff --git a/tikzit/images/AH_plain_tail.png b/tikzit/images/AH_plain_tail.png new file mode 100644 index 0000000..45b1876 Binary files /dev/null and b/tikzit/images/AH_plain_tail.png differ diff --git a/tikzit/images/ED_arrow.png b/tikzit/images/ED_arrow.png new file mode 100644 index 0000000..153d2e1 Binary files /dev/null and b/tikzit/images/ED_arrow.png differ diff --git a/tikzit/images/ED_none.png b/tikzit/images/ED_none.png new file mode 100644 index 0000000..f95140c Binary files /dev/null and b/tikzit/images/ED_none.png differ diff --git a/tikzit/images/ED_tick.png b/tikzit/images/ED_tick.png new file mode 100644 index 0000000..a3882fe Binary files /dev/null and b/tikzit/images/ED_tick.png differ diff --git a/tikzit/images/customshape.png b/tikzit/images/customshape.png new file mode 100644 index 0000000..cff8275 Binary files /dev/null and b/tikzit/images/customshape.png differ diff --git a/tikzit/images/draw-ellipse.png b/tikzit/images/draw-ellipse.png new file mode 100644 index 0000000..d8e3e6f Binary files /dev/null and b/tikzit/images/draw-ellipse.png differ diff --git a/tikzit/images/draw-path.png b/tikzit/images/draw-path.png new file mode 100644 index 0000000..ec5e691 Binary files /dev/null and b/tikzit/images/draw-path.png differ diff --git a/tikzit/images/emblem-important.png b/tikzit/images/emblem-important.png new file mode 100644 index 0000000..81e9ed2 Binary files /dev/null and b/tikzit/images/emblem-important.png differ diff --git a/tikzit/images/emblem-unreadable-grey.png b/tikzit/images/emblem-unreadable-grey.png new file mode 100644 index 0000000..09572ab Binary files /dev/null and b/tikzit/images/emblem-unreadable-grey.png differ diff --git a/tikzit/images/engine.png b/tikzit/images/engine.png new file mode 100644 index 0000000..1e45370 Binary files /dev/null and b/tikzit/images/engine.png differ diff --git a/tikzit/images/format-indent-less.png b/tikzit/images/format-indent-less.png new file mode 100644 index 0000000..7ced16f Binary files /dev/null and b/tikzit/images/format-indent-less.png differ diff --git a/tikzit/images/preamble.png b/tikzit/images/preamble.png new file mode 100644 index 0000000..d940d24 Binary files /dev/null and b/tikzit/images/preamble.png differ diff --git a/tikzit/images/select-rectangular.png b/tikzit/images/select-rectangular.png new file mode 100644 index 0000000..866b602 Binary files /dev/null and b/tikzit/images/select-rectangular.png differ diff --git a/tikzit/images/text-x-generic.png b/tikzit/images/text-x-generic.png new file mode 100644 index 0000000..928a679 Binary files /dev/null and b/tikzit/images/text-x-generic.png differ diff --git a/tikzit/images/text-x-script.png b/tikzit/images/text-x-script.png new file mode 100644 index 0000000..801dcd6 Binary files /dev/null and b/tikzit/images/text-x-script.png differ diff --git a/tikzit/images/tikzit48x48.png b/tikzit/images/tikzit48x48.png new file mode 100644 index 0000000..056d04b Binary files /dev/null and b/tikzit/images/tikzit48x48.png differ diff --git a/tikzit/images/transform-crop-and-resize.png b/tikzit/images/transform-crop-and-resize.png new file mode 100644 index 0000000..4dedd93 Binary files /dev/null and b/tikzit/images/transform-crop-and-resize.png differ diff --git a/tikzit/images/transform-move.png b/tikzit/images/transform-move.png new file mode 100644 index 0000000..ae4201b Binary files /dev/null and b/tikzit/images/transform-move.png differ diff --git a/tikzit/images/updates.png b/tikzit/images/updates.png new file mode 100644 index 0000000..469ae30 Binary files /dev/null and b/tikzit/images/updates.png differ diff --git a/tikzit/main.cpp b/tikzit/main.cpp index b48f94e..7ece416 100644 --- a/tikzit/main.cpp +++ b/tikzit/main.cpp @@ -1,11 +1,15 @@ #include "mainwindow.h" +#include "toolpalette.h" #include int main(int argc, char *argv[]) { QApplication a(argc, argv); - MainWindow w; - w.show(); + MainWindow *w = new MainWindow(); + w->show(); + + ToolPalette *tp = new ToolPalette(); + tp->show(); return a.exec(); } diff --git a/tikzit/mainwindow.cpp b/tikzit/mainwindow.cpp index 49d64fc..cbb0f60 100644 --- a/tikzit/mainwindow.cpp +++ b/tikzit/mainwindow.cpp @@ -1,14 +1,17 @@ #include "mainwindow.h" -#include "ui_mainwindow.h" -MainWindow::MainWindow(QWidget *parent) : - QMainWindow(parent), - ui(new Ui::MainWindow) +#include + +MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) { - ui->setupUi(this); + setAttribute(Qt::WA_DeleteOnClose); + tikzScene = new TikzScene(this); + tikzView = new QGraphicsView(tikzScene); + setCentralWidget(tikzView); + resize(700, 500); } MainWindow::~MainWindow() { - delete ui; + qDebug() << "~MainWindow"; } diff --git a/tikzit/mainwindow.h b/tikzit/mainwindow.h index a3948a9..167707a 100644 --- a/tikzit/mainwindow.h +++ b/tikzit/mainwindow.h @@ -1,11 +1,10 @@ #ifndef MAINWINDOW_H #define MAINWINDOW_H -#include +#include "tikzscene.h" -namespace Ui { -class MainWindow; -} +#include +#include class MainWindow : public QMainWindow { @@ -14,9 +13,9 @@ class MainWindow : public QMainWindow public: explicit MainWindow(QWidget *parent = 0); ~MainWindow(); - private: - Ui::MainWindow *ui; + TikzScene *tikzScene; + QGraphicsView *tikzView; }; #endif // MAINWINDOW_H diff --git a/tikzit/mainwindow.ui b/tikzit/mainwindow.ui index 6050363..d04e8e9 100644 --- a/tikzit/mainwindow.ui +++ b/tikzit/mainwindow.ui @@ -1,24 +1,44 @@ + MainWindow - - + + 0 0 - 400 - 300 + 476 + 378 - + MainWindow - - - - + + + + + 0 + 0 + 476 + 22 + + + + + File + + + + + + + + + New... + + - - + diff --git a/tikzit/tikzit.pro b/tikzit/tikzit.pro index 95942b2..3301c1a 100644 --- a/tikzit/tikzit.pro +++ b/tikzit/tikzit.pro @@ -24,8 +24,17 @@ DEFINES += QT_DEPRECATED_WARNINGS SOURCES += main.cpp\ - mainwindow.cpp + mainwindow.cpp \ + toolpalette.cpp \ + tikzscene.cpp -HEADERS += mainwindow.h +HEADERS += mainwindow.h \ + toolpalette.h \ + tikzscene.h FORMS += mainwindow.ui + +DISTFILES += + +RESOURCES += \ + tikzit.qrc diff --git a/tikzit/tikzit.pro.user b/tikzit/tikzit.pro.user index 29e90ba..5f8dab8 100644 --- a/tikzit/tikzit.pro.user +++ b/tikzit/tikzit.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -300,14 +300,17 @@ 13 14 - -1 + 2 - - - %{buildDir} - Custom Executable + tikzit - ProjectExplorer.CustomExecutableRunConfiguration + Qt4ProjectManager.Qt4RunConfiguration:/Users/alek/git/tikzit/tikzit/tikzit.pro + true + + tikzit.pro + false + + /Users/alek/git/tikzit/build-tikzit-Desktop_Qt_5_7_1_clang_64bit-Debug/tikzit.app/Contents/MacOS 3768 false true diff --git a/tikzit/tikzit.qrc b/tikzit/tikzit.qrc new file mode 100644 index 0000000..9f98a38 --- /dev/null +++ b/tikzit/tikzit.qrc @@ -0,0 +1,8 @@ + + + images/draw-ellipse.png + images/draw-path.png + images/select-rectangular.png + images/transform-crop-and-resize.png + + diff --git a/tikzit/tikzscene.cpp b/tikzit/tikzscene.cpp new file mode 100644 index 0000000..60939dd --- /dev/null +++ b/tikzit/tikzscene.cpp @@ -0,0 +1,6 @@ +#include "tikzscene.h" + +TikzScene::TikzScene(QObject *parent) : QGraphicsScene(parent) +{ + +} diff --git a/tikzit/tikzscene.h b/tikzit/tikzscene.h new file mode 100644 index 0000000..dd3cba7 --- /dev/null +++ b/tikzit/tikzscene.h @@ -0,0 +1,13 @@ +#ifndef TIKZSCENE_H +#define TIKZSCENE_H + +#include +#include + +class TikzScene : public QGraphicsScene +{ +public: + TikzScene(QObject *parent); +}; + +#endif // TIKZSCENE_H diff --git a/tikzit/toolpalette.cpp b/tikzit/toolpalette.cpp new file mode 100644 index 0000000..cd939c2 --- /dev/null +++ b/tikzit/toolpalette.cpp @@ -0,0 +1,38 @@ +#include "toolpalette.h" + +#include +#include +#include + +ToolPalette::ToolPalette() +{ + setWindowFlags(Qt::Window + | Qt::WindowTitleHint + | Qt::WindowStaysOnTopHint + | Qt::CustomizeWindowHint); + setOrientation(Qt::Vertical); + setFocusPolicy(Qt::NoFocus); + + tools = new QActionGroup(this); + + select = new QAction(QIcon(":/images/select-rectangular.png"), "Select"); + vertex = new QAction(QIcon(":/images/draw-ellipse.png"), "Add Vertex"); + edge = new QAction(QIcon(":/images/draw-path.png"), "Add Edge"); + crop = new QAction(QIcon(":/images/transform-crop-and-resize.png"), "Bounding Box"); + + tools->addAction(select); + tools->addAction(vertex); + tools->addAction(edge); + tools->addAction(crop); + + select->setCheckable(true); + vertex->setCheckable(true); + edge->setCheckable(true); + crop->setCheckable(true); + select->setChecked(true); + + addAction(select); + addAction(vertex); + addAction(edge); + addAction(crop); +} diff --git a/tikzit/toolpalette.h b/tikzit/toolpalette.h new file mode 100644 index 0000000..158f76c --- /dev/null +++ b/tikzit/toolpalette.h @@ -0,0 +1,22 @@ +#ifndef TOOLPALETTE_H +#define TOOLPALETTE_H + +#include +#include +#include +#include + +class ToolPalette : public QToolBar +{ + Q_OBJECT +public: + ToolPalette(); +private: + QActionGroup *tools; + QAction *select; + QAction *vertex; + QAction *edge; + QAction *crop; +}; + +#endif // TOOLPALETTE_H -- cgit v1.2.3 From 716aadc00c1a03e43c246a72be4758fcdf809fe0 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Sun, 15 Jan 2017 18:45:15 +0100 Subject: working on parser --- tikzit/edge.cpp | 19 ++++ tikzit/edge.h | 26 +++++ tikzit/graph.cpp | 30 ++++++ tikzit/graph.h | 32 ++++++ tikzit/graphelementdata.cpp | 37 +++++++ tikzit/graphelementdata.h | 24 +++++ tikzit/graphelementproperty.cpp | 34 ++++++ tikzit/graphelementproperty.h | 35 ++++++ tikzit/main.cpp | 9 +- tikzit/mainwindow.cpp | 14 ++- tikzit/mainwindow.h | 6 +- tikzit/mainwindow.ui | 36 ++++++- tikzit/node.cpp | 43 ++++++++ tikzit/node.h | 34 ++++++ tikzit/tikzgraphassembler.cpp | 9 ++ tikzit/tikzgraphassembler.h | 25 +++++ tikzit/tikzit.pro | 16 ++- tikzit/tikzit.pro.user | 4 +- tikzit/tikzlexer.lpp | 171 ++++++++++++++++++++++++++++++ tikzit/tikzparser.ypp | 228 ++++++++++++++++++++++++++++++++++++++++ tikzit/tikzparserdefs.h | 2 + tikzit/toolpalette.cpp | 7 +- tikzit/toolpalette.h | 2 +- 23 files changed, 827 insertions(+), 16 deletions(-) create mode 100644 tikzit/edge.cpp create mode 100644 tikzit/edge.h create mode 100644 tikzit/graph.cpp create mode 100644 tikzit/graph.h create mode 100644 tikzit/graphelementdata.cpp create mode 100644 tikzit/graphelementdata.h create mode 100644 tikzit/graphelementproperty.cpp create mode 100644 tikzit/graphelementproperty.h create mode 100644 tikzit/node.cpp create mode 100644 tikzit/node.h create mode 100644 tikzit/tikzgraphassembler.cpp create mode 100644 tikzit/tikzgraphassembler.h create mode 100644 tikzit/tikzlexer.lpp create mode 100644 tikzit/tikzparser.ypp create mode 100644 tikzit/tikzparserdefs.h diff --git a/tikzit/edge.cpp b/tikzit/edge.cpp new file mode 100644 index 0000000..bea96b8 --- /dev/null +++ b/tikzit/edge.cpp @@ -0,0 +1,19 @@ +#include "edge.h" + +Edge::Edge(Node *s, Node *t, QObject *parent) : + QObject(parent), _source(s), _target(t) +{ + +} + +Node *Edge::source() const +{ + return _source; +} + +Node *Edge::target() const +{ + return _target; +} + + diff --git a/tikzit/edge.h b/tikzit/edge.h new file mode 100644 index 0000000..2153f30 --- /dev/null +++ b/tikzit/edge.h @@ -0,0 +1,26 @@ +#ifndef EDGE_H +#define EDGE_H + +#include + +class Node; + +class Edge : public QObject +{ + Q_OBJECT +public: + explicit Edge(Node *s, Node *t, QObject *parent = 0); + + Node *source() const; + Node *target() const; + +signals: + +public slots: + +private: + Node *_source; + Node *_target; +}; + +#endif // EDGE_H diff --git a/tikzit/graph.cpp b/tikzit/graph.cpp new file mode 100644 index 0000000..0db20e1 --- /dev/null +++ b/tikzit/graph.cpp @@ -0,0 +1,30 @@ +#include "graph.h" + +Graph::Graph(QObject *parent) : QObject(parent) +{ + +} + +void Graph::removeNode(Node *n) { + nodes.removeAll(n); + inEdges.remove(n); + outEdges.remove(n); +} + +Edge *Graph::addEdge(Node *s, Node *t) +{ + +} + +void Graph::removeEdge(Edge *e) +{ + +} + +Node *Graph::addNode() { + Node *n = new Node(this); + nodes << n; + return n; +} + + diff --git a/tikzit/graph.h b/tikzit/graph.h new file mode 100644 index 0000000..f55b3c9 --- /dev/null +++ b/tikzit/graph.h @@ -0,0 +1,32 @@ +#ifndef GRAPH_H +#define GRAPH_H + +#include "node.h" +#include "edge.h" + +#include +#include +#include + +class Graph : public QObject +{ + Q_OBJECT +public: + explicit Graph(QObject *parent = 0); + Node *addNode(); + void removeNode(Node *n); + Edge *addEdge(Node *s, Node*t); + void removeEdge(Edge *e); + +signals: + +public slots: + +private: + QVector nodes; + QVector edges; + QMultiHash inEdges; + QMultiHash outEdges; +}; + +#endif // GRAPH_H diff --git a/tikzit/graphelementdata.cpp b/tikzit/graphelementdata.cpp new file mode 100644 index 0000000..7240ea8 --- /dev/null +++ b/tikzit/graphelementdata.cpp @@ -0,0 +1,37 @@ +#include "graphelementdata.h" + +GraphElementData::GraphElementData(QObject *parent) : QObject(parent) +{ + +} + +void GraphElementData::setProperty(QString key, QString value) +{ + +} + +void GraphElementData::unsetProperty(QString key) +{ + +} + +void GraphElementData::setAtom(QString atom) +{ + +} + +void GraphElementData::unsetAtom(QString atom) +{ + +} + +QString GraphElementData::property(QString key) +{ + +} + +QString GraphElementData::atom(QString atom) +{ + +} + diff --git a/tikzit/graphelementdata.h b/tikzit/graphelementdata.h new file mode 100644 index 0000000..e67d740 --- /dev/null +++ b/tikzit/graphelementdata.h @@ -0,0 +1,24 @@ +#ifndef GRAPHELEMENTDATA_H +#define GRAPHELEMENTDATA_H + +#include +#include + +class GraphElementData : public QObject +{ + Q_OBJECT +public: + explicit GraphElementData(QObject *parent = 0); + void setProperty(QString key, QString value); + void unsetProperty(QString key); + void setAtom(QString atom); + void unsetAtom(QString atom); + QString property(QString key); + QString atom(QString atom); + +signals: + +public slots: +}; + +#endif // GRAPHELEMENTDATA_H diff --git a/tikzit/graphelementproperty.cpp b/tikzit/graphelementproperty.cpp new file mode 100644 index 0000000..7602b1c --- /dev/null +++ b/tikzit/graphelementproperty.cpp @@ -0,0 +1,34 @@ +#include "graphelementproperty.h" + +GraphElementProperty::GraphElementProperty(QString key, QString value, + bool atom, bool keyMatch, QObject *parent) : + QObject(parent), _key(key), _value(value), _atom(atom), _keyMatch(keyMatch) +{} + +GraphElementProperty::GraphElementProperty(QString key, QString value, QObject *parent) : + QObject(parent), _key(key), _value(value), _atom(false), _keyMatch(false) +{} + +GraphElementProperty::GraphElementProperty(QString key, QObject *parent) : + QObject(parent), _key(key), _value(""), _atom(true), _keyMatch(false) +{} + +QString GraphElementProperty::key() const +{ return _key; } + +QString GraphElementProperty::value() const +{ return _value; } + +bool GraphElementProperty::atom() const +{ return _atom; } + +bool GraphElementProperty::keyMatch() const +{ return _keyMatch; } + +bool GraphElementProperty::matches(GraphElementProperty *p) +{ + if (p->atom()) return _atom && _key == p->key(); + if (p->keyMatch()) return !_atom && _key == p->key(); + if (_keyMatch) return !p->atom() && _key == p->key(); + return !_atom && _key == p->key() && _value == p->value(); +} diff --git a/tikzit/graphelementproperty.h b/tikzit/graphelementproperty.h new file mode 100644 index 0000000..56d20e9 --- /dev/null +++ b/tikzit/graphelementproperty.h @@ -0,0 +1,35 @@ +#ifndef GRAPHELEMENTPROPERTY_H +#define GRAPHELEMENTPROPERTY_H + +#include + +class GraphElementProperty : public QObject +{ + Q_OBJECT +public: + GraphElementProperty(QString key, QString value, bool atom, bool keyMatch, QObject *parent = 0); + + // construct a property + GraphElementProperty(QString key, QString value, QObject *parent = 0); + + // construct an atom + GraphElementProperty(QString key, QObject *parent = 0); + + QString key() const; + QString value() const; + bool atom() const; + bool keyMatch() const; + + bool matches(GraphElementProperty *p); +signals: + +public slots: + +private: + QString _key; + QString _value; + bool _atom; + bool _keyMatch; +}; + +#endif // GRAPHELEMENTPROPERTY_H diff --git a/tikzit/main.cpp b/tikzit/main.cpp index 7ece416..50c6978 100644 --- a/tikzit/main.cpp +++ b/tikzit/main.cpp @@ -1,5 +1,7 @@ #include "mainwindow.h" #include "toolpalette.h" +#include "graph.h" + #include int main(int argc, char *argv[]) @@ -8,8 +10,13 @@ int main(int argc, char *argv[]) MainWindow *w = new MainWindow(); w->show(); - ToolPalette *tp = new ToolPalette(); + ToolPalette *tp = new ToolPalette(new QMainWindow()); tp->show(); + //w->addToolBar(Qt::LeftToolBarArea, tp); + + Graph *g = new Graph; + Node *n = g->addNode(); + delete g; return a.exec(); } diff --git a/tikzit/mainwindow.cpp b/tikzit/mainwindow.cpp index cbb0f60..ef73a20 100644 --- a/tikzit/mainwindow.cpp +++ b/tikzit/mainwindow.cpp @@ -1,14 +1,20 @@ #include "mainwindow.h" +#include "ui_mainwindow.h" #include -MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) +MainWindow::MainWindow(QWidget *parent) : + QMainWindow(parent), + ui(new Ui::MainWindow) { + ui->setupUi(this); setAttribute(Qt::WA_DeleteOnClose); tikzScene = new TikzScene(this); - tikzView = new QGraphicsView(tikzScene); - setCentralWidget(tikzView); - resize(700, 500); + ui->tikzView->setScene(tikzScene); + //tikzView = new QGraphicsView(tikzScene); + //setCentralWidget(tikzView); + //resize(700, 500); + // badger? } MainWindow::~MainWindow() diff --git a/tikzit/mainwindow.h b/tikzit/mainwindow.h index 167707a..d33a89d 100644 --- a/tikzit/mainwindow.h +++ b/tikzit/mainwindow.h @@ -6,6 +6,10 @@ #include #include +namespace Ui { +class MainWindow; +} + class MainWindow : public QMainWindow { Q_OBJECT @@ -15,7 +19,7 @@ public: ~MainWindow(); private: TikzScene *tikzScene; - QGraphicsView *tikzView; + Ui::MainWindow *ui; }; #endif // MAINWINDOW_H diff --git a/tikzit/mainwindow.ui b/tikzit/mainwindow.ui index d04e8e9..6439ee8 100644 --- a/tikzit/mainwindow.ui +++ b/tikzit/mainwindow.ui @@ -11,9 +11,41 @@ - MainWindow + TikZiT - + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Qt::Vertical + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'.SF NS Text'; font-size:13pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Stuff written here</p></body></html> + + + + + + diff --git a/tikzit/node.cpp b/tikzit/node.cpp new file mode 100644 index 0000000..2c1c7ee --- /dev/null +++ b/tikzit/node.cpp @@ -0,0 +1,43 @@ +#include "node.h" + +#include + +Node::Node(QObject *parent) : QObject(parent) +{ + qDebug() << "Node()"; +} + +Node::~Node() +{ + qDebug() << "~Node()"; +} + +QPointF Node::pos() const +{ + return _pos; +} + +void Node::setPos(const QPointF &pos) +{ + _pos = pos; +} + +QString Node::name() const +{ + return _name; +} + +void Node::setName(const QString &name) +{ + _name = name; +} + +QString Node::label() const +{ + return _label; +} + +void Node::setLabel(const QString &label) +{ + _label = label; +} diff --git a/tikzit/node.h b/tikzit/node.h new file mode 100644 index 0000000..8eae520 --- /dev/null +++ b/tikzit/node.h @@ -0,0 +1,34 @@ +#ifndef NODE_H +#define NODE_H + +#include +#include +#include + +class Node : public QObject +{ + Q_OBJECT +public: + explicit Node(QObject *parent = 0); + ~Node(); + + QPointF pos() const; + void setPos(const QPointF &pos); + + QString name() const; + void setName(const QString &name); + + QString label() const; + void setLabel(const QString &label); + +signals: + +public slots: + +private: + QPointF _pos; + QString _name; + QString _label; +}; + +#endif // NODE_H diff --git a/tikzit/tikzgraphassembler.cpp b/tikzit/tikzgraphassembler.cpp new file mode 100644 index 0000000..a785d85 --- /dev/null +++ b/tikzit/tikzgraphassembler.cpp @@ -0,0 +1,9 @@ +#include "tikzgraphassembler.h" + +TikzGraphAssembler::TikzGraphAssembler(QObject *parent) : QObject(parent) +{ + +} + +void TikzGraphAssembler::addNodeToMap(Node *n) { _nodeMap.insert(n->name(), n); } +Node *TikzGraphAssembler::nodeWithName(QString name) { return _nodeMap[name]; } diff --git a/tikzit/tikzgraphassembler.h b/tikzit/tikzgraphassembler.h new file mode 100644 index 0000000..5869d95 --- /dev/null +++ b/tikzit/tikzgraphassembler.h @@ -0,0 +1,25 @@ +#ifndef TIKZGRAPHASSEMBLER_H +#define TIKZGRAPHASSEMBLER_H + +#include "node.h" + +#include +#include + +class TikzGraphAssembler : public QObject +{ + Q_OBJECT +public: + explicit TikzGraphAssembler(QObject *parent = 0); + void addNodeToMap(Node *n); + Node *nodeWithName(QString name); + +signals: + +public slots: + +private: + QHash _nodeMap; +}; + +#endif // TIKZGRAPHASSEMBLER_H diff --git a/tikzit/tikzit.pro b/tikzit/tikzit.pro index 3301c1a..2762908 100644 --- a/tikzit/tikzit.pro +++ b/tikzit/tikzit.pro @@ -26,11 +26,23 @@ DEFINES += QT_DEPRECATED_WARNINGS SOURCES += main.cpp\ mainwindow.cpp \ toolpalette.cpp \ - tikzscene.cpp + tikzscene.cpp \ + graph.cpp \ + node.cpp \ + edge.cpp \ + tikzgraphassembler.cpp \ + graphelementdata.cpp \ + graphelementproperty.cpp HEADERS += mainwindow.h \ toolpalette.h \ - tikzscene.h + tikzscene.h \ + graph.h \ + node.h \ + edge.h \ + tikzgraphassembler.h \ + graphelementdata.h \ + graphelementproperty.h FORMS += mainwindow.ui diff --git a/tikzit/tikzit.pro.user b/tikzit/tikzit.pro.user index 5f8dab8..f8495a5 100644 --- a/tikzit/tikzit.pro.user +++ b/tikzit/tikzit.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -19,7 +19,7 @@ Cpp - CppGlobal + qt diff --git a/tikzit/tikzlexer.lpp b/tikzit/tikzlexer.lpp new file mode 100644 index 0000000..19c4d85 --- /dev/null +++ b/tikzit/tikzlexer.lpp @@ -0,0 +1,171 @@ +%{ +/* + * Copyright 2010 Chris Heunen + * Copyright 2010-2013 Aleks Kissinger + * Copyright 2013 K. Johan Paulsson + * Copyright 2013 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "tikzparserdefs.h" +#include "tikzparser.h" + +#include + +#define YY_USER_ACTION \ + yylloc->first_line = yylloc->last_line; \ + yylloc->first_column = yylloc->last_column + 1; \ + yylloc->last_column = yylloc->first_column + yyleng - 1; + +%} + +%option reentrant bison-bridge bison-locations 8bit +%option nounput +%option yylineno +%option noyywrap +%option header-file="common/tikzlexer.h" +%option extra-type="TikzGraphAssembler *" + + +%s props +%s xcoord +%s ycoord +%s noderef + +FLOAT \-?[0-9]*(\.[0-9]+)? + +%% + + /* whitespace is ignored, except for position counting; we don't + count formfeed and vtab as whitespace, because it's not obvious + how they should be dealt with and no-one actually uses them */ + + /* lex will take the longest-matching string */ +\r\n|\r|\n { + yylloc->first_line += 1; + yylloc->last_line = yylloc->first_line; + yylloc->first_column = yylloc->last_column = 0; +} +[\t ]+ { } + +\\begin\{tikzpicture\} { return BEGIN_TIKZPICTURE_CMD; } +\\end\{tikzpicture\} { return END_TIKZPICTURE_CMD; } +\\begin\{pgfonlayer\} { return BEGIN_PGFONLAYER_CMD; } +\\end\{pgfonlayer\} { return END_PGFONLAYER_CMD; } +\\draw { return DRAW_CMD; } +\\node { return NODE_CMD; } +\\path { return PATH_CMD; } +rectangle { return RECTANGLE; } +node { return NODE; } +at { return AT; } +to { return TO; } +; { return SEMICOLON; } + +\([ ]*{FLOAT}[ ]*,[ ]*{FLOAT}[ ]*\) { + yylloc->last_column = yylloc->first_column + 1; + yyless(1); + BEGIN(xcoord); +} +{FLOAT} { + yylval->pt.x=(float)strtod(yytext,NULL); + BEGIN(ycoord); +} +, { } +{FLOAT} { + yylval->pt.y=(float)strtod(yytext,NULL); +} +\) { + BEGIN(INITIAL); + return COORD; +} + + /* when we see "[", change parsing mode */ +\[ /*syntaxhlfix]*/ { + BEGIN(props); + return LEFTBRACKET; +} += { return EQUALS; } +, { return COMMA; } + /* technically, it is possible to have newlines in the middle of + property names or values, but in practice this is unlikely and + screws up our line counting */ +[^=,\{\] \t\n]([^=,\{\]\n]*[^=,\{\] \t\n])? { + yylval->nsstr=[NSString stringWithUTF8String:yytext]; + return PROPSTRING; +} +\] { + BEGIN(INITIAL); + return RIGHTBRACKET; +} + +\( { + BEGIN(noderef); + return LEFTPARENTHESIS; +} +\. { + return FULLSTOP; +} + /* we assume node names (and anchor names) never contain + newlines */ +[^\.\{\)\n]+ { + yylval->nsstr=[NSString stringWithUTF8String:yytext]; + return REFSTRING; +} +\) { + BEGIN(INITIAL); + return RIGHTPARENTHESIS; +} + +\{ { + NSMutableString *buf = [NSMutableString string]; + unsigned int brace_depth = 1; + unsigned int escape = 0; + while (1) { + char c = input(yyscanner); + // eof reached before closing brace + if (c == '\0' || c == EOF) { + return UNCLOSED_DELIM_STR; + } + + yylloc->last_column += 1; + yyleng += 1; + if (escape) { + escape = 0; + } else if (c == '\\') { + escape = 1; + } else if (c == '{') { + brace_depth++; + } else if (c == '}') { + brace_depth--; + if (brace_depth == 0) break; + } else if (c == '\n') { + yylloc->last_line += 1; + yylloc->last_column = 0; + } + [buf appendFormat:@"%c", c]; + } + + yylval->nsstr = buf; + return DELIMITEDSTRING; +} + +\\begin { return UNKNOWN_BEGIN_CMD; } +\\end { return UNKNOWN_END_CMD; } +\\[a-zA-Z0-9]+ { return UNKNOWN_CMD; } +[a-zA-Z0-9]+ { return UNKNOWN_STR; } +. { return UNKNOWN_STR; } + + /* vi:ft=lex:noet:ts=4:sts=4:sw=4: + */ diff --git a/tikzit/tikzparser.ypp b/tikzit/tikzparser.ypp new file mode 100644 index 0000000..e97b1c7 --- /dev/null +++ b/tikzit/tikzparser.ypp @@ -0,0 +1,228 @@ +%{ +/* + * Copyright 2010 Chris Heunen + * Copyright 2010-2013 Aleks Kissinger + * Copyright 2013 K. Johan Paulsson + * Copyright 2013 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "tikzparserdefs.h" +%} + +/* we use features added to bison 2.4 */ +%require "2.3" + +%error-verbose +/* enable maintaining locations for better error messages */ +%locations +/* the name of the header file */ +/*%defines "common/tikzparser.h"*/ +/* make it re-entrant (no global variables) */ +%pure-parser +/* We use a pure (re-entrant) lexer. This means yylex + will take a void* (opaque) type to maintain its state */ +%lex-param {void *scanner} +/* Since this parser is also pure, yyparse needs to take + that lexer state as an argument */ +%parse-param {void *scanner} + +/* possible data types for semantic values */ +%union { + QString qstr; + GraphElementProperty *prop; + GraphElementData *data; + Node *node; + QPointF pt; + struct noderef noderef; +} + +%{ +#include "node.h" +#include "edge.h" + #include "graphelementdata.h" +#include "graphelementproperty.h" + +#include "tikzlexer.h" +#import "tikzgraphassembler.h" +/* the assembler (used by this parser) is stored in the lexer + state as "extra" data */ +#define assembler yyget_extra(scanner) + +/* pass errors off to the assembler */ +void yyerror(YYLTYPE *yylloc, void *scanner, const char *str) { + // TODO: implement reportError() + //assembler->reportError(str, yylloc); +} +%} + +/* yyloc is set up with first_column = last_column = 1 by default; + however, it makes more sense to think of us being "before the + start of the line" before we parse anything */ +%initial-action { + yylloc.first_column = yylloc.last_column = 0; +} + + +%token BEGIN_TIKZPICTURE_CMD "\\begin{tikzpicture}" +%token END_TIKZPICTURE_CMD "\\end{tikzpicture}" +%token BEGIN_PGFONLAYER_CMD "\\begin{pgfonlayer}" +%token END_PGFONLAYER_CMD "\\end{pgfonlayer}" +%token DRAW_CMD "\\draw" +%token NODE_CMD "\\node" +%token PATH_CMD "\\path" +%token RECTANGLE "rectangle" +%token NODE "node" +%token AT "at" +%token TO "to" +%token SEMICOLON ";" +%token COMMA "," + +%token LEFTPARENTHESIS "(" +%token RIGHTPARENTHESIS ")" +%token LEFTBRACKET "[" +%token RIGHTBRACKET "]" +%token FULLSTOP "." +%token EQUALS "=" +%token COORD "co-ordinate" +%token PROPSTRING "key/value string" +%token REFSTRING "string" +%token DELIMITEDSTRING "{-delimited string" + +%token UNKNOWN_BEGIN_CMD "unknown \\begin command" +%token UNKNOWN_END_CMD "unknown \\end command" +%token UNKNOWN_CMD "unknown latex command" +%token UNKNOWN_STR "unknown string" +%token UNCLOSED_DELIM_STR "unclosed {-delimited string" + +%type nodename +%type optanchor +%type val +%type property +%type extraproperties +%type properties +%type optproperties +%type optedgenode +%type noderef +%type optnoderef + +%% + +tikzpicture: "\\begin{tikzpicture}" optproperties tikzcmds "\\end{tikzpicture}" + { + if ($2) { + assembler->graph()->setData($2); + } + }; +tikzcmds: tikzcmds tikzcmd | ; +tikzcmd: node | edge | boundingbox | ignore; + +ignore: "\\begin{pgfonlayer}" DELIMITEDSTRING | "\\end{pgfonlayer}"; + +optproperties: + "[" "]" + { $$ = 0; } + | "[" properties "]" + { $$ = $2; } + | { $$ = 0; }; +properties: extraproperties property + { + [$1 addObject:$2]; + $$ = $1; + }; +extraproperties: + extraproperties property "," + { + [$1 addObject:$2]; + $$ = $1; + } + | { $$ = [GraphElementData data]; }; +property: + val "=" val + { $$ = [GraphElementProperty property:$1 withValue:$3]; } + | val + { $$ = [GraphElementProperty atom:$1]; }; +val: PROPSTRING { $$ = $1; } | DELIMITEDSTRING { $$ = $1; }; + +nodename: "(" REFSTRING ")" { $$ = $2; }; +node: "\\node" optproperties nodename "at" COORD DELIMITEDSTRING ";" + { + Node *node = assembler->graph()->addNode(); + if ($2) + node->setData($2); + node->setName($3); + node->setPoint($5); + node->setLabel($6); + assembler->addNodeToMap(node); + }; + +optanchor: { $$ = 0; } | "." REFSTRING { $$ = $2; }; +noderef: "(" REFSTRING optanchor ")" + { + $$.node = assembler->nodeWithName($2); + $$.anchor = $3; + }; +optnoderef: + noderef { $$ = $1; } + | "(" ")" { $$.node = 0; $$.anchor = 0; } +optedgenode: + { $$ = 0; } + | "node" optproperties DELIMITEDSTRING + { + // TODO: implement edge-nodes + // $$ = [Node node]; + // if ($2) + // [$$ setData:$2]; + // [$$ setLabel:$3]; + } +edge: "\\draw" optproperties noderef "to" optedgenode optnoderef ";" + { + Node *s; + Node *t; + Node *en; + + // TODO: anchors and edge nodes + + s = $3.node; + if ($6.node) { + t = $6.node; + //[edge setTargetAnchor:$6.anchor]; + } else { + t = $3.node; + //[edge setTargetAnchor:$3.anchor]; + } + + Edge *edge = assembler->graph()->addEdge(s, t); + if ($2) + edge->setData($2); + + // [edge setSourceAnchor:$3.anchor]; + // [edge setEdgeNode:$5]; + + // [edge setAttributesFromData]; + }; + +ignoreprop: val | val "=" val; +ignoreprops: ignoreprop ignoreprops | ; +optignoreprops: "[" ignoreprops "]"; +boundingbox: + "\\path" optignoreprops COORD "rectangle" COORD ";" + { + // TODO: bounding box + //[[assembler graph] setBoundingBox:NSRectAroundPoints($3, $5)]; + }; + +/* vi:ft=yacc:noet:ts=4:sts=4:sw=4 +*/ diff --git a/tikzit/tikzparserdefs.h b/tikzit/tikzparserdefs.h new file mode 100644 index 0000000..f721ba5 --- /dev/null +++ b/tikzit/tikzparserdefs.h @@ -0,0 +1,2 @@ +// nothing here + diff --git a/tikzit/toolpalette.cpp b/tikzit/toolpalette.cpp index cd939c2..fd06730 100644 --- a/tikzit/toolpalette.cpp +++ b/tikzit/toolpalette.cpp @@ -4,12 +4,13 @@ #include #include -ToolPalette::ToolPalette() +ToolPalette::ToolPalette(QWidget *parent) : + QToolBar(parent) { setWindowFlags(Qt::Window - | Qt::WindowTitleHint | Qt::WindowStaysOnTopHint - | Qt::CustomizeWindowHint); + | Qt::CustomizeWindowHint + | Qt::WindowDoesNotAcceptFocus); setOrientation(Qt::Vertical); setFocusPolicy(Qt::NoFocus); diff --git a/tikzit/toolpalette.h b/tikzit/toolpalette.h index 158f76c..05b2e12 100644 --- a/tikzit/toolpalette.h +++ b/tikzit/toolpalette.h @@ -10,7 +10,7 @@ class ToolPalette : public QToolBar { Q_OBJECT public: - ToolPalette(); + ToolPalette(QWidget *parent = 0); private: QActionGroup *tools; QAction *select; -- cgit v1.2.3 From 36ccd03c70c305e155e00e663da725546f8f2fd9 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Fri, 20 Jan 2017 11:05:36 +0100 Subject: added GraphElementProperty --- tikzit/graphelementdata.cpp | 110 +++++++++++++++++++++++++++++++++++++--- tikzit/graphelementdata.h | 43 ++++++++++++++-- tikzit/graphelementproperty.cpp | 35 ++++++++----- tikzit/graphelementproperty.h | 17 ++++--- tikzit/main.cpp | 6 +-- tikzit/propertypalette.cpp | 26 ++++++++++ tikzit/propertypalette.h | 22 ++++++++ tikzit/propertypalette.ui | 30 +++++++++++ tikzit/tikzit.pro | 9 ++-- 9 files changed, 264 insertions(+), 34 deletions(-) create mode 100644 tikzit/propertypalette.cpp create mode 100644 tikzit/propertypalette.h create mode 100644 tikzit/propertypalette.ui diff --git a/tikzit/graphelementdata.cpp b/tikzit/graphelementdata.cpp index 7240ea8..04c7760 100644 --- a/tikzit/graphelementdata.cpp +++ b/tikzit/graphelementdata.cpp @@ -1,37 +1,135 @@ #include "graphelementdata.h" -GraphElementData::GraphElementData(QObject *parent) : QObject(parent) +#include + +GraphElementData::GraphElementData(QObject *parent) : QAbstractItemModel(parent) { + root = new GraphElementProperty(); +} +GraphElementData::~GraphElementData() +{ + delete root; } void GraphElementData::setProperty(QString key, QString value) { - + GraphElementProperty m(key, true); + int i = _properties.indexOf(m); + if (i != -1) { + _properties[i].setValue(value); + } else { + GraphElementProperty p(key, value); + _properties << p; + } } void GraphElementData::unsetProperty(QString key) { - + GraphElementProperty m(key, true); + int i = _properties.indexOf(m); + if (i != -1) + _properties.remove(i); } void GraphElementData::setAtom(QString atom) { - + GraphElementProperty a(atom); + int i = _properties.indexOf(a); + if (i == -1) + _properties << a; } void GraphElementData::unsetAtom(QString atom) { - + GraphElementProperty a(atom); + int i = _properties.indexOf(a); + if (i != -1) + _properties.remove(i); } QString GraphElementData::property(QString key) { + GraphElementProperty m(key, true); + int i = _properties.indexOf(m); + if (i != -1) { + return _properties[i].value(); + } else { + return 0; + } +} + +bool GraphElementData::atom(QString atom) +{ + GraphElementProperty a(atom); + return (_properties.indexOf(a) != -1); +} + +QVariant GraphElementData::data(const QModelIndex &index, int role) const +{ + if (role != Qt::DisplayRole) + return QVariant(); + + if (index.row() >= 0 && index.row() < _properties.length()) { + const GraphElementProperty &p = _properties[index.row()]; + QString s = (index.column() == 0) ? p.key() : p.value(); + return QVariant(s); + } +} + +QVariant GraphElementData::headerData(int section, Qt::Orientation orientation, int role) const +{ + if (orientation == Qt::Horizontal && role == Qt::DisplayRole) { + if (section == 0) return QVariant("Key/Atom"); + else return QVariant("Value"); + } + return QVariant(); } -QString GraphElementData::atom(QString atom) +QModelIndex GraphElementData::index(int row, int column, const QModelIndex &parent) const { + return createIndex(row, column, (void*)0); +} +QModelIndex GraphElementData::parent(const QModelIndex &index) const +{ + GraphElementProperty *p = static_cast(index.internalPointer()); + if (p == root) return QModelIndex(); + else return createIndex(0,0,static_cast(root)); +} + +int GraphElementData::rowCount(const QModelIndex &parent) const +{ + if (parent.isValid()) { + return 0; + } else { + return _properties.size(); + } } +int GraphElementData::columnCount(const QModelIndex &parent) const +{ + return 2; +} + +Qt::ItemFlags GraphElementData::flags(const QModelIndex &index) const +{ + return QAbstractItemModel::flags(index); +} + +//bool GraphElementData::setData(const QModelIndex &index, const QVariant &value, int role) +//{ + +//} + +//bool GraphElementData::insertRows(int position, int rows, const QModelIndex &parent) +//{ + +//} + +//bool GraphElementData::removeRows(int position, int rows, const QModelIndex &parent) +//{ + +//} + diff --git a/tikzit/graphelementdata.h b/tikzit/graphelementdata.h index e67d740..fee65e7 100644 --- a/tikzit/graphelementdata.h +++ b/tikzit/graphelementdata.h @@ -1,24 +1,61 @@ #ifndef GRAPHELEMENTDATA_H #define GRAPHELEMENTDATA_H -#include +#include "graphelementproperty.h" + +#include #include +#include +#include +#include -class GraphElementData : public QObject +class GraphElementData : public QAbstractItemModel { Q_OBJECT public: explicit GraphElementData(QObject *parent = 0); + ~GraphElementData(); void setProperty(QString key, QString value); void unsetProperty(QString key); void setAtom(QString atom); void unsetAtom(QString atom); QString property(QString key); - QString atom(QString atom); + bool atom(QString atom); + + QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE; + QVariant headerData(int section, Qt::Orientation orientation, + int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + + QModelIndex index(int row, int column, + const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + QModelIndex parent(const QModelIndex &index) const Q_DECL_OVERRIDE; + + int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + + Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; + +// bool setData(const QModelIndex &index, const QVariant &value, +// int role = Qt::EditRole) Q_DECL_OVERRIDE; +// bool setHeaderData(int section, Qt::Orientation orientation, +// const QVariant &value, int role = Qt::EditRole) Q_DECL_OVERRIDE; + +// bool insertColumns(int position, int columns, +// const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; +// bool removeColumns(int position, int columns, +// const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; +// bool insertRows(int position, int rows, +// const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; +// bool removeRows(int position, int rows, +// const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; signals: public slots: + +private: + QVector _properties; + GraphElementProperty *root; }; #endif // GRAPHELEMENTDATA_H diff --git a/tikzit/graphelementproperty.cpp b/tikzit/graphelementproperty.cpp index 7602b1c..9cc6b00 100644 --- a/tikzit/graphelementproperty.cpp +++ b/tikzit/graphelementproperty.cpp @@ -1,16 +1,19 @@ #include "graphelementproperty.h" -GraphElementProperty::GraphElementProperty(QString key, QString value, - bool atom, bool keyMatch, QObject *parent) : - QObject(parent), _key(key), _value(value), _atom(atom), _keyMatch(keyMatch) +GraphElementProperty::GraphElementProperty (): + _key(""), _value(""), _atom(false), _keyMatch(false) {} -GraphElementProperty::GraphElementProperty(QString key, QString value, QObject *parent) : - QObject(parent), _key(key), _value(value), _atom(false), _keyMatch(false) +GraphElementProperty::GraphElementProperty(QString key, QString value, bool atom, bool keyMatch) : + _key(key), _value(value), _atom(atom), _keyMatch(keyMatch) {} -GraphElementProperty::GraphElementProperty(QString key, QObject *parent) : - QObject(parent), _key(key), _value(""), _atom(true), _keyMatch(false) +GraphElementProperty::GraphElementProperty(QString key, QString value) : + _key(key), _value(value), _atom(false), _keyMatch(false) +{} + +GraphElementProperty::GraphElementProperty(QString key, bool keyMatch) : + _key(key), _value(""), _atom(!keyMatch), _keyMatch(keyMatch) {} QString GraphElementProperty::key() const @@ -19,16 +22,24 @@ QString GraphElementProperty::key() const QString GraphElementProperty::value() const { return _value; } +void GraphElementProperty::setValue(const QString &value) +{ _value = value; } + bool GraphElementProperty::atom() const { return _atom; } bool GraphElementProperty::keyMatch() const { return _keyMatch; } -bool GraphElementProperty::matches(GraphElementProperty *p) +bool GraphElementProperty::matches(const GraphElementProperty &p) +{ + if (p.atom()) return _atom && _key == p.key(); + if (p.keyMatch()) return !_atom && _key == p.key(); + if (_keyMatch) return !p.atom() && _key == p.key(); + return !_atom && _key == p.key() && _value == p.value(); +} + +bool GraphElementProperty::operator==(const GraphElementProperty &p) { - if (p->atom()) return _atom && _key == p->key(); - if (p->keyMatch()) return !_atom && _key == p->key(); - if (_keyMatch) return !p->atom() && _key == p->key(); - return !_atom && _key == p->key() && _value == p->value(); + return matches(p); } diff --git a/tikzit/graphelementproperty.h b/tikzit/graphelementproperty.h index 56d20e9..4e8bbd1 100644 --- a/tikzit/graphelementproperty.h +++ b/tikzit/graphelementproperty.h @@ -3,24 +3,27 @@ #include -class GraphElementProperty : public QObject +class GraphElementProperty { - Q_OBJECT public: - GraphElementProperty(QString key, QString value, bool atom, bool keyMatch, QObject *parent = 0); + GraphElementProperty(); + GraphElementProperty(QString key, QString value, bool atom, bool keyMatch); // construct a property - GraphElementProperty(QString key, QString value, QObject *parent = 0); + GraphElementProperty(QString key, QString value); - // construct an atom - GraphElementProperty(QString key, QObject *parent = 0); + // construct an atom or keymatch + GraphElementProperty(QString key, bool keyMatch = false); QString key() const; QString value() const; + void setValue(const QString &value); bool atom() const; bool keyMatch() const; - bool matches(GraphElementProperty *p); + bool matches(const GraphElementProperty &p); + bool operator==(const GraphElementProperty &p); + signals: public slots: diff --git a/tikzit/main.cpp b/tikzit/main.cpp index 50c6978..c6b6ecd 100644 --- a/tikzit/main.cpp +++ b/tikzit/main.cpp @@ -1,5 +1,6 @@ #include "mainwindow.h" #include "toolpalette.h" +#include "propertypalette.h" #include "graph.h" #include @@ -14,9 +15,8 @@ int main(int argc, char *argv[]) tp->show(); //w->addToolBar(Qt::LeftToolBarArea, tp); - Graph *g = new Graph; - Node *n = g->addNode(); - delete g; + PropertyPalette *pp = new PropertyPalette; + pp->show(); return a.exec(); } diff --git a/tikzit/propertypalette.cpp b/tikzit/propertypalette.cpp new file mode 100644 index 0000000..6fc9ef9 --- /dev/null +++ b/tikzit/propertypalette.cpp @@ -0,0 +1,26 @@ +#include "propertypalette.h" +#include "graphelementdata.h" +#include "ui_propertypalette.h" + +#include +#include + +PropertyPalette::PropertyPalette(QWidget *parent) : + QDockWidget(parent), + ui(new Ui::PropertyPalette) +{ + ui->setupUi(this); + GraphElementData *d = new GraphElementData(); + d->setProperty("key 1", "value 1"); + d->setAtom("atom 1"); + d->setProperty("key 2", "value 2"); + + QModelIndex i = d->index(0,0); + qDebug() << "data: " << i.data(); + ui->treeView->setModel(d); +} + +PropertyPalette::~PropertyPalette() +{ + delete ui; +} diff --git a/tikzit/propertypalette.h b/tikzit/propertypalette.h new file mode 100644 index 0000000..8e8e5b3 --- /dev/null +++ b/tikzit/propertypalette.h @@ -0,0 +1,22 @@ +#ifndef PROPERTYPALETTE_H +#define PROPERTYPALETTE_H + +#include + +namespace Ui { +class PropertyPalette; +} + +class PropertyPalette : public QDockWidget +{ + Q_OBJECT + +public: + explicit PropertyPalette(QWidget *parent = 0); + ~PropertyPalette(); + +private: + Ui::PropertyPalette *ui; +}; + +#endif // PROPERTYPALETTE_H diff --git a/tikzit/propertypalette.ui b/tikzit/propertypalette.ui new file mode 100644 index 0000000..83d586e --- /dev/null +++ b/tikzit/propertypalette.ui @@ -0,0 +1,30 @@ + + + PropertyPalette + + + + 0 + 0 + 194 + 341 + + + + Properties + + + + + + + 0 + + + + + + + + + diff --git a/tikzit/tikzit.pro b/tikzit/tikzit.pro index 2762908..fd70729 100644 --- a/tikzit/tikzit.pro +++ b/tikzit/tikzit.pro @@ -32,7 +32,8 @@ SOURCES += main.cpp\ edge.cpp \ tikzgraphassembler.cpp \ graphelementdata.cpp \ - graphelementproperty.cpp + graphelementproperty.cpp \ + propertypalette.cpp HEADERS += mainwindow.h \ toolpalette.h \ @@ -42,9 +43,11 @@ HEADERS += mainwindow.h \ edge.h \ tikzgraphassembler.h \ graphelementdata.h \ - graphelementproperty.h + graphelementproperty.h \ + propertypalette.h -FORMS += mainwindow.ui +FORMS += mainwindow.ui \ + propertypalette.ui DISTFILES += -- cgit v1.2.3 From b4f6b3997ba1d1355a42e6d2cd90e7715a9f9114 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Fri, 20 Jan 2017 11:25:28 +0100 Subject: directory structure --- tikzit/edge.cpp | 19 --- tikzit/edge.h | 26 ---- tikzit/graph.cpp | 30 ---- tikzit/graph.h | 32 ----- tikzit/graphelementdata.cpp | 135 ------------------ tikzit/graphelementdata.h | 61 --------- tikzit/graphelementproperty.cpp | 45 ------ tikzit/graphelementproperty.h | 38 ------ tikzit/main.cpp | 22 --- tikzit/mainwindow.cpp | 23 ---- tikzit/mainwindow.h | 25 ---- tikzit/mainwindow.ui | 76 ----------- tikzit/node.cpp | 43 ------ tikzit/node.h | 34 ----- tikzit/propertypalette.cpp | 26 ---- tikzit/propertypalette.h | 22 --- tikzit/propertypalette.ui | 30 ---- tikzit/src/data/edge.cpp | 19 +++ tikzit/src/data/edge.h | 26 ++++ tikzit/src/data/graph.cpp | 30 ++++ tikzit/src/data/graph.h | 32 +++++ tikzit/src/data/graphelementdata.cpp | 135 ++++++++++++++++++ tikzit/src/data/graphelementdata.h | 61 +++++++++ tikzit/src/data/graphelementproperty.cpp | 45 ++++++ tikzit/src/data/graphelementproperty.h | 38 ++++++ tikzit/src/data/node.cpp | 43 ++++++ tikzit/src/data/node.h | 34 +++++ tikzit/src/data/tikzgraphassembler.cpp | 9 ++ tikzit/src/data/tikzgraphassembler.h | 25 ++++ tikzit/src/data/tikzlexer.lpp | 171 +++++++++++++++++++++++ tikzit/src/data/tikzparser.ypp | 228 +++++++++++++++++++++++++++++++ tikzit/src/data/tikzparserdefs.h | 2 + tikzit/src/gui/mainwindow.cpp | 23 ++++ tikzit/src/gui/mainwindow.h | 25 ++++ tikzit/src/gui/mainwindow.ui | 76 +++++++++++ tikzit/src/gui/propertypalette.cpp | 26 ++++ tikzit/src/gui/propertypalette.h | 22 +++ tikzit/src/gui/propertypalette.ui | 30 ++++ tikzit/src/gui/tikzscene.cpp | 6 + tikzit/src/gui/tikzscene.h | 13 ++ tikzit/src/gui/toolpalette.cpp | 39 ++++++ tikzit/src/gui/toolpalette.h | 22 +++ tikzit/src/main.cpp | 23 ++++ tikzit/tikzgraphassembler.cpp | 9 -- tikzit/tikzgraphassembler.h | 25 ---- tikzit/tikzit.pro | 52 +++---- tikzit/tikzlexer.lpp | 171 ----------------------- tikzit/tikzparser.ypp | 228 ------------------------------- tikzit/tikzparserdefs.h | 2 - tikzit/tikzscene.cpp | 6 - tikzit/tikzscene.h | 13 -- tikzit/toolpalette.cpp | 39 ------ tikzit/toolpalette.h | 22 --- 53 files changed, 1230 insertions(+), 1227 deletions(-) delete mode 100644 tikzit/edge.cpp delete mode 100644 tikzit/edge.h delete mode 100644 tikzit/graph.cpp delete mode 100644 tikzit/graph.h delete mode 100644 tikzit/graphelementdata.cpp delete mode 100644 tikzit/graphelementdata.h delete mode 100644 tikzit/graphelementproperty.cpp delete mode 100644 tikzit/graphelementproperty.h delete mode 100644 tikzit/main.cpp delete mode 100644 tikzit/mainwindow.cpp delete mode 100644 tikzit/mainwindow.h delete mode 100644 tikzit/mainwindow.ui delete mode 100644 tikzit/node.cpp delete mode 100644 tikzit/node.h delete mode 100644 tikzit/propertypalette.cpp delete mode 100644 tikzit/propertypalette.h delete mode 100644 tikzit/propertypalette.ui create mode 100644 tikzit/src/data/edge.cpp create mode 100644 tikzit/src/data/edge.h create mode 100644 tikzit/src/data/graph.cpp create mode 100644 tikzit/src/data/graph.h create mode 100644 tikzit/src/data/graphelementdata.cpp create mode 100644 tikzit/src/data/graphelementdata.h create mode 100644 tikzit/src/data/graphelementproperty.cpp create mode 100644 tikzit/src/data/graphelementproperty.h create mode 100644 tikzit/src/data/node.cpp create mode 100644 tikzit/src/data/node.h create mode 100644 tikzit/src/data/tikzgraphassembler.cpp create mode 100644 tikzit/src/data/tikzgraphassembler.h create mode 100644 tikzit/src/data/tikzlexer.lpp create mode 100644 tikzit/src/data/tikzparser.ypp create mode 100644 tikzit/src/data/tikzparserdefs.h create mode 100644 tikzit/src/gui/mainwindow.cpp create mode 100644 tikzit/src/gui/mainwindow.h create mode 100644 tikzit/src/gui/mainwindow.ui create mode 100644 tikzit/src/gui/propertypalette.cpp create mode 100644 tikzit/src/gui/propertypalette.h create mode 100644 tikzit/src/gui/propertypalette.ui create mode 100644 tikzit/src/gui/tikzscene.cpp create mode 100644 tikzit/src/gui/tikzscene.h create mode 100644 tikzit/src/gui/toolpalette.cpp create mode 100644 tikzit/src/gui/toolpalette.h create mode 100644 tikzit/src/main.cpp delete mode 100644 tikzit/tikzgraphassembler.cpp delete mode 100644 tikzit/tikzgraphassembler.h delete mode 100644 tikzit/tikzlexer.lpp delete mode 100644 tikzit/tikzparser.ypp delete mode 100644 tikzit/tikzparserdefs.h delete mode 100644 tikzit/tikzscene.cpp delete mode 100644 tikzit/tikzscene.h delete mode 100644 tikzit/toolpalette.cpp delete mode 100644 tikzit/toolpalette.h diff --git a/tikzit/edge.cpp b/tikzit/edge.cpp deleted file mode 100644 index bea96b8..0000000 --- a/tikzit/edge.cpp +++ /dev/null @@ -1,19 +0,0 @@ -#include "edge.h" - -Edge::Edge(Node *s, Node *t, QObject *parent) : - QObject(parent), _source(s), _target(t) -{ - -} - -Node *Edge::source() const -{ - return _source; -} - -Node *Edge::target() const -{ - return _target; -} - - diff --git a/tikzit/edge.h b/tikzit/edge.h deleted file mode 100644 index 2153f30..0000000 --- a/tikzit/edge.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef EDGE_H -#define EDGE_H - -#include - -class Node; - -class Edge : public QObject -{ - Q_OBJECT -public: - explicit Edge(Node *s, Node *t, QObject *parent = 0); - - Node *source() const; - Node *target() const; - -signals: - -public slots: - -private: - Node *_source; - Node *_target; -}; - -#endif // EDGE_H diff --git a/tikzit/graph.cpp b/tikzit/graph.cpp deleted file mode 100644 index 0db20e1..0000000 --- a/tikzit/graph.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include "graph.h" - -Graph::Graph(QObject *parent) : QObject(parent) -{ - -} - -void Graph::removeNode(Node *n) { - nodes.removeAll(n); - inEdges.remove(n); - outEdges.remove(n); -} - -Edge *Graph::addEdge(Node *s, Node *t) -{ - -} - -void Graph::removeEdge(Edge *e) -{ - -} - -Node *Graph::addNode() { - Node *n = new Node(this); - nodes << n; - return n; -} - - diff --git a/tikzit/graph.h b/tikzit/graph.h deleted file mode 100644 index f55b3c9..0000000 --- a/tikzit/graph.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef GRAPH_H -#define GRAPH_H - -#include "node.h" -#include "edge.h" - -#include -#include -#include - -class Graph : public QObject -{ - Q_OBJECT -public: - explicit Graph(QObject *parent = 0); - Node *addNode(); - void removeNode(Node *n); - Edge *addEdge(Node *s, Node*t); - void removeEdge(Edge *e); - -signals: - -public slots: - -private: - QVector nodes; - QVector edges; - QMultiHash inEdges; - QMultiHash outEdges; -}; - -#endif // GRAPH_H diff --git a/tikzit/graphelementdata.cpp b/tikzit/graphelementdata.cpp deleted file mode 100644 index 04c7760..0000000 --- a/tikzit/graphelementdata.cpp +++ /dev/null @@ -1,135 +0,0 @@ -#include "graphelementdata.h" - -#include - -GraphElementData::GraphElementData(QObject *parent) : QAbstractItemModel(parent) -{ - root = new GraphElementProperty(); -} - -GraphElementData::~GraphElementData() -{ - delete root; -} - -void GraphElementData::setProperty(QString key, QString value) -{ - GraphElementProperty m(key, true); - int i = _properties.indexOf(m); - if (i != -1) { - _properties[i].setValue(value); - } else { - GraphElementProperty p(key, value); - _properties << p; - } -} - -void GraphElementData::unsetProperty(QString key) -{ - GraphElementProperty m(key, true); - int i = _properties.indexOf(m); - if (i != -1) - _properties.remove(i); -} - -void GraphElementData::setAtom(QString atom) -{ - GraphElementProperty a(atom); - int i = _properties.indexOf(a); - if (i == -1) - _properties << a; -} - -void GraphElementData::unsetAtom(QString atom) -{ - GraphElementProperty a(atom); - int i = _properties.indexOf(a); - if (i != -1) - _properties.remove(i); -} - -QString GraphElementData::property(QString key) -{ - GraphElementProperty m(key, true); - int i = _properties.indexOf(m); - if (i != -1) { - return _properties[i].value(); - } else { - return 0; - } -} - -bool GraphElementData::atom(QString atom) -{ - GraphElementProperty a(atom); - return (_properties.indexOf(a) != -1); -} - -QVariant GraphElementData::data(const QModelIndex &index, int role) const -{ - if (role != Qt::DisplayRole) - return QVariant(); - - if (index.row() >= 0 && index.row() < _properties.length()) { - const GraphElementProperty &p = _properties[index.row()]; - QString s = (index.column() == 0) ? p.key() : p.value(); - return QVariant(s); - } -} - -QVariant GraphElementData::headerData(int section, Qt::Orientation orientation, int role) const -{ - if (orientation == Qt::Horizontal && role == Qt::DisplayRole) { - if (section == 0) return QVariant("Key/Atom"); - else return QVariant("Value"); - } - - return QVariant(); -} - -QModelIndex GraphElementData::index(int row, int column, const QModelIndex &parent) const -{ - return createIndex(row, column, (void*)0); -} - -QModelIndex GraphElementData::parent(const QModelIndex &index) const -{ - GraphElementProperty *p = static_cast(index.internalPointer()); - if (p == root) return QModelIndex(); - else return createIndex(0,0,static_cast(root)); -} - -int GraphElementData::rowCount(const QModelIndex &parent) const -{ - if (parent.isValid()) { - return 0; - } else { - return _properties.size(); - } -} - -int GraphElementData::columnCount(const QModelIndex &parent) const -{ - return 2; -} - -Qt::ItemFlags GraphElementData::flags(const QModelIndex &index) const -{ - return QAbstractItemModel::flags(index); -} - -//bool GraphElementData::setData(const QModelIndex &index, const QVariant &value, int role) -//{ - -//} - -//bool GraphElementData::insertRows(int position, int rows, const QModelIndex &parent) -//{ - -//} - -//bool GraphElementData::removeRows(int position, int rows, const QModelIndex &parent) -//{ - -//} - diff --git a/tikzit/graphelementdata.h b/tikzit/graphelementdata.h deleted file mode 100644 index fee65e7..0000000 --- a/tikzit/graphelementdata.h +++ /dev/null @@ -1,61 +0,0 @@ -#ifndef GRAPHELEMENTDATA_H -#define GRAPHELEMENTDATA_H - -#include "graphelementproperty.h" - -#include -#include -#include -#include -#include - -class GraphElementData : public QAbstractItemModel -{ - Q_OBJECT -public: - explicit GraphElementData(QObject *parent = 0); - ~GraphElementData(); - void setProperty(QString key, QString value); - void unsetProperty(QString key); - void setAtom(QString atom); - void unsetAtom(QString atom); - QString property(QString key); - bool atom(QString atom); - - QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE; - QVariant headerData(int section, Qt::Orientation orientation, - int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; - - QModelIndex index(int row, int column, - const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - QModelIndex parent(const QModelIndex &index) const Q_DECL_OVERRIDE; - - int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - - Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; - -// bool setData(const QModelIndex &index, const QVariant &value, -// int role = Qt::EditRole) Q_DECL_OVERRIDE; -// bool setHeaderData(int section, Qt::Orientation orientation, -// const QVariant &value, int role = Qt::EditRole) Q_DECL_OVERRIDE; - -// bool insertColumns(int position, int columns, -// const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; -// bool removeColumns(int position, int columns, -// const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; -// bool insertRows(int position, int rows, -// const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; -// bool removeRows(int position, int rows, -// const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; - -signals: - -public slots: - -private: - QVector _properties; - GraphElementProperty *root; -}; - -#endif // GRAPHELEMENTDATA_H diff --git a/tikzit/graphelementproperty.cpp b/tikzit/graphelementproperty.cpp deleted file mode 100644 index 9cc6b00..0000000 --- a/tikzit/graphelementproperty.cpp +++ /dev/null @@ -1,45 +0,0 @@ -#include "graphelementproperty.h" - -GraphElementProperty::GraphElementProperty (): - _key(""), _value(""), _atom(false), _keyMatch(false) -{} - -GraphElementProperty::GraphElementProperty(QString key, QString value, bool atom, bool keyMatch) : - _key(key), _value(value), _atom(atom), _keyMatch(keyMatch) -{} - -GraphElementProperty::GraphElementProperty(QString key, QString value) : - _key(key), _value(value), _atom(false), _keyMatch(false) -{} - -GraphElementProperty::GraphElementProperty(QString key, bool keyMatch) : - _key(key), _value(""), _atom(!keyMatch), _keyMatch(keyMatch) -{} - -QString GraphElementProperty::key() const -{ return _key; } - -QString GraphElementProperty::value() const -{ return _value; } - -void GraphElementProperty::setValue(const QString &value) -{ _value = value; } - -bool GraphElementProperty::atom() const -{ return _atom; } - -bool GraphElementProperty::keyMatch() const -{ return _keyMatch; } - -bool GraphElementProperty::matches(const GraphElementProperty &p) -{ - if (p.atom()) return _atom && _key == p.key(); - if (p.keyMatch()) return !_atom && _key == p.key(); - if (_keyMatch) return !p.atom() && _key == p.key(); - return !_atom && _key == p.key() && _value == p.value(); -} - -bool GraphElementProperty::operator==(const GraphElementProperty &p) -{ - return matches(p); -} diff --git a/tikzit/graphelementproperty.h b/tikzit/graphelementproperty.h deleted file mode 100644 index 4e8bbd1..0000000 --- a/tikzit/graphelementproperty.h +++ /dev/null @@ -1,38 +0,0 @@ -#ifndef GRAPHELEMENTPROPERTY_H -#define GRAPHELEMENTPROPERTY_H - -#include - -class GraphElementProperty -{ -public: - GraphElementProperty(); - GraphElementProperty(QString key, QString value, bool atom, bool keyMatch); - - // construct a property - GraphElementProperty(QString key, QString value); - - // construct an atom or keymatch - GraphElementProperty(QString key, bool keyMatch = false); - - QString key() const; - QString value() const; - void setValue(const QString &value); - bool atom() const; - bool keyMatch() const; - - bool matches(const GraphElementProperty &p); - bool operator==(const GraphElementProperty &p); - -signals: - -public slots: - -private: - QString _key; - QString _value; - bool _atom; - bool _keyMatch; -}; - -#endif // GRAPHELEMENTPROPERTY_H diff --git a/tikzit/main.cpp b/tikzit/main.cpp deleted file mode 100644 index c6b6ecd..0000000 --- a/tikzit/main.cpp +++ /dev/null @@ -1,22 +0,0 @@ -#include "mainwindow.h" -#include "toolpalette.h" -#include "propertypalette.h" -#include "graph.h" - -#include - -int main(int argc, char *argv[]) -{ - QApplication a(argc, argv); - MainWindow *w = new MainWindow(); - w->show(); - - ToolPalette *tp = new ToolPalette(new QMainWindow()); - tp->show(); - //w->addToolBar(Qt::LeftToolBarArea, tp); - - PropertyPalette *pp = new PropertyPalette; - pp->show(); - - return a.exec(); -} diff --git a/tikzit/mainwindow.cpp b/tikzit/mainwindow.cpp deleted file mode 100644 index ef73a20..0000000 --- a/tikzit/mainwindow.cpp +++ /dev/null @@ -1,23 +0,0 @@ -#include "mainwindow.h" -#include "ui_mainwindow.h" - -#include - -MainWindow::MainWindow(QWidget *parent) : - QMainWindow(parent), - ui(new Ui::MainWindow) -{ - ui->setupUi(this); - setAttribute(Qt::WA_DeleteOnClose); - tikzScene = new TikzScene(this); - ui->tikzView->setScene(tikzScene); - //tikzView = new QGraphicsView(tikzScene); - //setCentralWidget(tikzView); - //resize(700, 500); - // badger? -} - -MainWindow::~MainWindow() -{ - qDebug() << "~MainWindow"; -} diff --git a/tikzit/mainwindow.h b/tikzit/mainwindow.h deleted file mode 100644 index d33a89d..0000000 --- a/tikzit/mainwindow.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef MAINWINDOW_H -#define MAINWINDOW_H - -#include "tikzscene.h" - -#include -#include - -namespace Ui { -class MainWindow; -} - -class MainWindow : public QMainWindow -{ - Q_OBJECT - -public: - explicit MainWindow(QWidget *parent = 0); - ~MainWindow(); -private: - TikzScene *tikzScene; - Ui::MainWindow *ui; -}; - -#endif // MAINWINDOW_H diff --git a/tikzit/mainwindow.ui b/tikzit/mainwindow.ui deleted file mode 100644 index 6439ee8..0000000 --- a/tikzit/mainwindow.ui +++ /dev/null @@ -1,76 +0,0 @@ - - - MainWindow - - - - 0 - 0 - 476 - 378 - - - - TikZiT - - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Qt::Vertical - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'.SF NS Text'; font-size:13pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Stuff written here</p></body></html> - - - - - - - - - - 0 - 0 - 476 - 22 - - - - - File - - - - - - - - - New... - - - - - - - diff --git a/tikzit/node.cpp b/tikzit/node.cpp deleted file mode 100644 index 2c1c7ee..0000000 --- a/tikzit/node.cpp +++ /dev/null @@ -1,43 +0,0 @@ -#include "node.h" - -#include - -Node::Node(QObject *parent) : QObject(parent) -{ - qDebug() << "Node()"; -} - -Node::~Node() -{ - qDebug() << "~Node()"; -} - -QPointF Node::pos() const -{ - return _pos; -} - -void Node::setPos(const QPointF &pos) -{ - _pos = pos; -} - -QString Node::name() const -{ - return _name; -} - -void Node::setName(const QString &name) -{ - _name = name; -} - -QString Node::label() const -{ - return _label; -} - -void Node::setLabel(const QString &label) -{ - _label = label; -} diff --git a/tikzit/node.h b/tikzit/node.h deleted file mode 100644 index 8eae520..0000000 --- a/tikzit/node.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef NODE_H -#define NODE_H - -#include -#include -#include - -class Node : public QObject -{ - Q_OBJECT -public: - explicit Node(QObject *parent = 0); - ~Node(); - - QPointF pos() const; - void setPos(const QPointF &pos); - - QString name() const; - void setName(const QString &name); - - QString label() const; - void setLabel(const QString &label); - -signals: - -public slots: - -private: - QPointF _pos; - QString _name; - QString _label; -}; - -#endif // NODE_H diff --git a/tikzit/propertypalette.cpp b/tikzit/propertypalette.cpp deleted file mode 100644 index 6fc9ef9..0000000 --- a/tikzit/propertypalette.cpp +++ /dev/null @@ -1,26 +0,0 @@ -#include "propertypalette.h" -#include "graphelementdata.h" -#include "ui_propertypalette.h" - -#include -#include - -PropertyPalette::PropertyPalette(QWidget *parent) : - QDockWidget(parent), - ui(new Ui::PropertyPalette) -{ - ui->setupUi(this); - GraphElementData *d = new GraphElementData(); - d->setProperty("key 1", "value 1"); - d->setAtom("atom 1"); - d->setProperty("key 2", "value 2"); - - QModelIndex i = d->index(0,0); - qDebug() << "data: " << i.data(); - ui->treeView->setModel(d); -} - -PropertyPalette::~PropertyPalette() -{ - delete ui; -} diff --git a/tikzit/propertypalette.h b/tikzit/propertypalette.h deleted file mode 100644 index 8e8e5b3..0000000 --- a/tikzit/propertypalette.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef PROPERTYPALETTE_H -#define PROPERTYPALETTE_H - -#include - -namespace Ui { -class PropertyPalette; -} - -class PropertyPalette : public QDockWidget -{ - Q_OBJECT - -public: - explicit PropertyPalette(QWidget *parent = 0); - ~PropertyPalette(); - -private: - Ui::PropertyPalette *ui; -}; - -#endif // PROPERTYPALETTE_H diff --git a/tikzit/propertypalette.ui b/tikzit/propertypalette.ui deleted file mode 100644 index 83d586e..0000000 --- a/tikzit/propertypalette.ui +++ /dev/null @@ -1,30 +0,0 @@ - - - PropertyPalette - - - - 0 - 0 - 194 - 341 - - - - Properties - - - - - - - 0 - - - - - - - - - diff --git a/tikzit/src/data/edge.cpp b/tikzit/src/data/edge.cpp new file mode 100644 index 0000000..bea96b8 --- /dev/null +++ b/tikzit/src/data/edge.cpp @@ -0,0 +1,19 @@ +#include "edge.h" + +Edge::Edge(Node *s, Node *t, QObject *parent) : + QObject(parent), _source(s), _target(t) +{ + +} + +Node *Edge::source() const +{ + return _source; +} + +Node *Edge::target() const +{ + return _target; +} + + diff --git a/tikzit/src/data/edge.h b/tikzit/src/data/edge.h new file mode 100644 index 0000000..2153f30 --- /dev/null +++ b/tikzit/src/data/edge.h @@ -0,0 +1,26 @@ +#ifndef EDGE_H +#define EDGE_H + +#include + +class Node; + +class Edge : public QObject +{ + Q_OBJECT +public: + explicit Edge(Node *s, Node *t, QObject *parent = 0); + + Node *source() const; + Node *target() const; + +signals: + +public slots: + +private: + Node *_source; + Node *_target; +}; + +#endif // EDGE_H diff --git a/tikzit/src/data/graph.cpp b/tikzit/src/data/graph.cpp new file mode 100644 index 0000000..0db20e1 --- /dev/null +++ b/tikzit/src/data/graph.cpp @@ -0,0 +1,30 @@ +#include "graph.h" + +Graph::Graph(QObject *parent) : QObject(parent) +{ + +} + +void Graph::removeNode(Node *n) { + nodes.removeAll(n); + inEdges.remove(n); + outEdges.remove(n); +} + +Edge *Graph::addEdge(Node *s, Node *t) +{ + +} + +void Graph::removeEdge(Edge *e) +{ + +} + +Node *Graph::addNode() { + Node *n = new Node(this); + nodes << n; + return n; +} + + diff --git a/tikzit/src/data/graph.h b/tikzit/src/data/graph.h new file mode 100644 index 0000000..f55b3c9 --- /dev/null +++ b/tikzit/src/data/graph.h @@ -0,0 +1,32 @@ +#ifndef GRAPH_H +#define GRAPH_H + +#include "node.h" +#include "edge.h" + +#include +#include +#include + +class Graph : public QObject +{ + Q_OBJECT +public: + explicit Graph(QObject *parent = 0); + Node *addNode(); + void removeNode(Node *n); + Edge *addEdge(Node *s, Node*t); + void removeEdge(Edge *e); + +signals: + +public slots: + +private: + QVector nodes; + QVector edges; + QMultiHash inEdges; + QMultiHash outEdges; +}; + +#endif // GRAPH_H diff --git a/tikzit/src/data/graphelementdata.cpp b/tikzit/src/data/graphelementdata.cpp new file mode 100644 index 0000000..04c7760 --- /dev/null +++ b/tikzit/src/data/graphelementdata.cpp @@ -0,0 +1,135 @@ +#include "graphelementdata.h" + +#include + +GraphElementData::GraphElementData(QObject *parent) : QAbstractItemModel(parent) +{ + root = new GraphElementProperty(); +} + +GraphElementData::~GraphElementData() +{ + delete root; +} + +void GraphElementData::setProperty(QString key, QString value) +{ + GraphElementProperty m(key, true); + int i = _properties.indexOf(m); + if (i != -1) { + _properties[i].setValue(value); + } else { + GraphElementProperty p(key, value); + _properties << p; + } +} + +void GraphElementData::unsetProperty(QString key) +{ + GraphElementProperty m(key, true); + int i = _properties.indexOf(m); + if (i != -1) + _properties.remove(i); +} + +void GraphElementData::setAtom(QString atom) +{ + GraphElementProperty a(atom); + int i = _properties.indexOf(a); + if (i == -1) + _properties << a; +} + +void GraphElementData::unsetAtom(QString atom) +{ + GraphElementProperty a(atom); + int i = _properties.indexOf(a); + if (i != -1) + _properties.remove(i); +} + +QString GraphElementData::property(QString key) +{ + GraphElementProperty m(key, true); + int i = _properties.indexOf(m); + if (i != -1) { + return _properties[i].value(); + } else { + return 0; + } +} + +bool GraphElementData::atom(QString atom) +{ + GraphElementProperty a(atom); + return (_properties.indexOf(a) != -1); +} + +QVariant GraphElementData::data(const QModelIndex &index, int role) const +{ + if (role != Qt::DisplayRole) + return QVariant(); + + if (index.row() >= 0 && index.row() < _properties.length()) { + const GraphElementProperty &p = _properties[index.row()]; + QString s = (index.column() == 0) ? p.key() : p.value(); + return QVariant(s); + } +} + +QVariant GraphElementData::headerData(int section, Qt::Orientation orientation, int role) const +{ + if (orientation == Qt::Horizontal && role == Qt::DisplayRole) { + if (section == 0) return QVariant("Key/Atom"); + else return QVariant("Value"); + } + + return QVariant(); +} + +QModelIndex GraphElementData::index(int row, int column, const QModelIndex &parent) const +{ + return createIndex(row, column, (void*)0); +} + +QModelIndex GraphElementData::parent(const QModelIndex &index) const +{ + GraphElementProperty *p = static_cast(index.internalPointer()); + if (p == root) return QModelIndex(); + else return createIndex(0,0,static_cast(root)); +} + +int GraphElementData::rowCount(const QModelIndex &parent) const +{ + if (parent.isValid()) { + return 0; + } else { + return _properties.size(); + } +} + +int GraphElementData::columnCount(const QModelIndex &parent) const +{ + return 2; +} + +Qt::ItemFlags GraphElementData::flags(const QModelIndex &index) const +{ + return QAbstractItemModel::flags(index); +} + +//bool GraphElementData::setData(const QModelIndex &index, const QVariant &value, int role) +//{ + +//} + +//bool GraphElementData::insertRows(int position, int rows, const QModelIndex &parent) +//{ + +//} + +//bool GraphElementData::removeRows(int position, int rows, const QModelIndex &parent) +//{ + +//} + diff --git a/tikzit/src/data/graphelementdata.h b/tikzit/src/data/graphelementdata.h new file mode 100644 index 0000000..fee65e7 --- /dev/null +++ b/tikzit/src/data/graphelementdata.h @@ -0,0 +1,61 @@ +#ifndef GRAPHELEMENTDATA_H +#define GRAPHELEMENTDATA_H + +#include "graphelementproperty.h" + +#include +#include +#include +#include +#include + +class GraphElementData : public QAbstractItemModel +{ + Q_OBJECT +public: + explicit GraphElementData(QObject *parent = 0); + ~GraphElementData(); + void setProperty(QString key, QString value); + void unsetProperty(QString key); + void setAtom(QString atom); + void unsetAtom(QString atom); + QString property(QString key); + bool atom(QString atom); + + QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE; + QVariant headerData(int section, Qt::Orientation orientation, + int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + + QModelIndex index(int row, int column, + const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + QModelIndex parent(const QModelIndex &index) const Q_DECL_OVERRIDE; + + int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + + Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; + +// bool setData(const QModelIndex &index, const QVariant &value, +// int role = Qt::EditRole) Q_DECL_OVERRIDE; +// bool setHeaderData(int section, Qt::Orientation orientation, +// const QVariant &value, int role = Qt::EditRole) Q_DECL_OVERRIDE; + +// bool insertColumns(int position, int columns, +// const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; +// bool removeColumns(int position, int columns, +// const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; +// bool insertRows(int position, int rows, +// const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; +// bool removeRows(int position, int rows, +// const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; + +signals: + +public slots: + +private: + QVector _properties; + GraphElementProperty *root; +}; + +#endif // GRAPHELEMENTDATA_H diff --git a/tikzit/src/data/graphelementproperty.cpp b/tikzit/src/data/graphelementproperty.cpp new file mode 100644 index 0000000..9cc6b00 --- /dev/null +++ b/tikzit/src/data/graphelementproperty.cpp @@ -0,0 +1,45 @@ +#include "graphelementproperty.h" + +GraphElementProperty::GraphElementProperty (): + _key(""), _value(""), _atom(false), _keyMatch(false) +{} + +GraphElementProperty::GraphElementProperty(QString key, QString value, bool atom, bool keyMatch) : + _key(key), _value(value), _atom(atom), _keyMatch(keyMatch) +{} + +GraphElementProperty::GraphElementProperty(QString key, QString value) : + _key(key), _value(value), _atom(false), _keyMatch(false) +{} + +GraphElementProperty::GraphElementProperty(QString key, bool keyMatch) : + _key(key), _value(""), _atom(!keyMatch), _keyMatch(keyMatch) +{} + +QString GraphElementProperty::key() const +{ return _key; } + +QString GraphElementProperty::value() const +{ return _value; } + +void GraphElementProperty::setValue(const QString &value) +{ _value = value; } + +bool GraphElementProperty::atom() const +{ return _atom; } + +bool GraphElementProperty::keyMatch() const +{ return _keyMatch; } + +bool GraphElementProperty::matches(const GraphElementProperty &p) +{ + if (p.atom()) return _atom && _key == p.key(); + if (p.keyMatch()) return !_atom && _key == p.key(); + if (_keyMatch) return !p.atom() && _key == p.key(); + return !_atom && _key == p.key() && _value == p.value(); +} + +bool GraphElementProperty::operator==(const GraphElementProperty &p) +{ + return matches(p); +} diff --git a/tikzit/src/data/graphelementproperty.h b/tikzit/src/data/graphelementproperty.h new file mode 100644 index 0000000..4e8bbd1 --- /dev/null +++ b/tikzit/src/data/graphelementproperty.h @@ -0,0 +1,38 @@ +#ifndef GRAPHELEMENTPROPERTY_H +#define GRAPHELEMENTPROPERTY_H + +#include + +class GraphElementProperty +{ +public: + GraphElementProperty(); + GraphElementProperty(QString key, QString value, bool atom, bool keyMatch); + + // construct a property + GraphElementProperty(QString key, QString value); + + // construct an atom or keymatch + GraphElementProperty(QString key, bool keyMatch = false); + + QString key() const; + QString value() const; + void setValue(const QString &value); + bool atom() const; + bool keyMatch() const; + + bool matches(const GraphElementProperty &p); + bool operator==(const GraphElementProperty &p); + +signals: + +public slots: + +private: + QString _key; + QString _value; + bool _atom; + bool _keyMatch; +}; + +#endif // GRAPHELEMENTPROPERTY_H diff --git a/tikzit/src/data/node.cpp b/tikzit/src/data/node.cpp new file mode 100644 index 0000000..2c1c7ee --- /dev/null +++ b/tikzit/src/data/node.cpp @@ -0,0 +1,43 @@ +#include "node.h" + +#include + +Node::Node(QObject *parent) : QObject(parent) +{ + qDebug() << "Node()"; +} + +Node::~Node() +{ + qDebug() << "~Node()"; +} + +QPointF Node::pos() const +{ + return _pos; +} + +void Node::setPos(const QPointF &pos) +{ + _pos = pos; +} + +QString Node::name() const +{ + return _name; +} + +void Node::setName(const QString &name) +{ + _name = name; +} + +QString Node::label() const +{ + return _label; +} + +void Node::setLabel(const QString &label) +{ + _label = label; +} diff --git a/tikzit/src/data/node.h b/tikzit/src/data/node.h new file mode 100644 index 0000000..8eae520 --- /dev/null +++ b/tikzit/src/data/node.h @@ -0,0 +1,34 @@ +#ifndef NODE_H +#define NODE_H + +#include +#include +#include + +class Node : public QObject +{ + Q_OBJECT +public: + explicit Node(QObject *parent = 0); + ~Node(); + + QPointF pos() const; + void setPos(const QPointF &pos); + + QString name() const; + void setName(const QString &name); + + QString label() const; + void setLabel(const QString &label); + +signals: + +public slots: + +private: + QPointF _pos; + QString _name; + QString _label; +}; + +#endif // NODE_H diff --git a/tikzit/src/data/tikzgraphassembler.cpp b/tikzit/src/data/tikzgraphassembler.cpp new file mode 100644 index 0000000..a785d85 --- /dev/null +++ b/tikzit/src/data/tikzgraphassembler.cpp @@ -0,0 +1,9 @@ +#include "tikzgraphassembler.h" + +TikzGraphAssembler::TikzGraphAssembler(QObject *parent) : QObject(parent) +{ + +} + +void TikzGraphAssembler::addNodeToMap(Node *n) { _nodeMap.insert(n->name(), n); } +Node *TikzGraphAssembler::nodeWithName(QString name) { return _nodeMap[name]; } diff --git a/tikzit/src/data/tikzgraphassembler.h b/tikzit/src/data/tikzgraphassembler.h new file mode 100644 index 0000000..5869d95 --- /dev/null +++ b/tikzit/src/data/tikzgraphassembler.h @@ -0,0 +1,25 @@ +#ifndef TIKZGRAPHASSEMBLER_H +#define TIKZGRAPHASSEMBLER_H + +#include "node.h" + +#include +#include + +class TikzGraphAssembler : public QObject +{ + Q_OBJECT +public: + explicit TikzGraphAssembler(QObject *parent = 0); + void addNodeToMap(Node *n); + Node *nodeWithName(QString name); + +signals: + +public slots: + +private: + QHash _nodeMap; +}; + +#endif // TIKZGRAPHASSEMBLER_H diff --git a/tikzit/src/data/tikzlexer.lpp b/tikzit/src/data/tikzlexer.lpp new file mode 100644 index 0000000..19c4d85 --- /dev/null +++ b/tikzit/src/data/tikzlexer.lpp @@ -0,0 +1,171 @@ +%{ +/* + * Copyright 2010 Chris Heunen + * Copyright 2010-2013 Aleks Kissinger + * Copyright 2013 K. Johan Paulsson + * Copyright 2013 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "tikzparserdefs.h" +#include "tikzparser.h" + +#include + +#define YY_USER_ACTION \ + yylloc->first_line = yylloc->last_line; \ + yylloc->first_column = yylloc->last_column + 1; \ + yylloc->last_column = yylloc->first_column + yyleng - 1; + +%} + +%option reentrant bison-bridge bison-locations 8bit +%option nounput +%option yylineno +%option noyywrap +%option header-file="common/tikzlexer.h" +%option extra-type="TikzGraphAssembler *" + + +%s props +%s xcoord +%s ycoord +%s noderef + +FLOAT \-?[0-9]*(\.[0-9]+)? + +%% + + /* whitespace is ignored, except for position counting; we don't + count formfeed and vtab as whitespace, because it's not obvious + how they should be dealt with and no-one actually uses them */ + + /* lex will take the longest-matching string */ +\r\n|\r|\n { + yylloc->first_line += 1; + yylloc->last_line = yylloc->first_line; + yylloc->first_column = yylloc->last_column = 0; +} +[\t ]+ { } + +\\begin\{tikzpicture\} { return BEGIN_TIKZPICTURE_CMD; } +\\end\{tikzpicture\} { return END_TIKZPICTURE_CMD; } +\\begin\{pgfonlayer\} { return BEGIN_PGFONLAYER_CMD; } +\\end\{pgfonlayer\} { return END_PGFONLAYER_CMD; } +\\draw { return DRAW_CMD; } +\\node { return NODE_CMD; } +\\path { return PATH_CMD; } +rectangle { return RECTANGLE; } +node { return NODE; } +at { return AT; } +to { return TO; } +; { return SEMICOLON; } + +\([ ]*{FLOAT}[ ]*,[ ]*{FLOAT}[ ]*\) { + yylloc->last_column = yylloc->first_column + 1; + yyless(1); + BEGIN(xcoord); +} +{FLOAT} { + yylval->pt.x=(float)strtod(yytext,NULL); + BEGIN(ycoord); +} +, { } +{FLOAT} { + yylval->pt.y=(float)strtod(yytext,NULL); +} +\) { + BEGIN(INITIAL); + return COORD; +} + + /* when we see "[", change parsing mode */ +\[ /*syntaxhlfix]*/ { + BEGIN(props); + return LEFTBRACKET; +} += { return EQUALS; } +, { return COMMA; } + /* technically, it is possible to have newlines in the middle of + property names or values, but in practice this is unlikely and + screws up our line counting */ +[^=,\{\] \t\n]([^=,\{\]\n]*[^=,\{\] \t\n])? { + yylval->nsstr=[NSString stringWithUTF8String:yytext]; + return PROPSTRING; +} +\] { + BEGIN(INITIAL); + return RIGHTBRACKET; +} + +\( { + BEGIN(noderef); + return LEFTPARENTHESIS; +} +\. { + return FULLSTOP; +} + /* we assume node names (and anchor names) never contain + newlines */ +[^\.\{\)\n]+ { + yylval->nsstr=[NSString stringWithUTF8String:yytext]; + return REFSTRING; +} +\) { + BEGIN(INITIAL); + return RIGHTPARENTHESIS; +} + +\{ { + NSMutableString *buf = [NSMutableString string]; + unsigned int brace_depth = 1; + unsigned int escape = 0; + while (1) { + char c = input(yyscanner); + // eof reached before closing brace + if (c == '\0' || c == EOF) { + return UNCLOSED_DELIM_STR; + } + + yylloc->last_column += 1; + yyleng += 1; + if (escape) { + escape = 0; + } else if (c == '\\') { + escape = 1; + } else if (c == '{') { + brace_depth++; + } else if (c == '}') { + brace_depth--; + if (brace_depth == 0) break; + } else if (c == '\n') { + yylloc->last_line += 1; + yylloc->last_column = 0; + } + [buf appendFormat:@"%c", c]; + } + + yylval->nsstr = buf; + return DELIMITEDSTRING; +} + +\\begin { return UNKNOWN_BEGIN_CMD; } +\\end { return UNKNOWN_END_CMD; } +\\[a-zA-Z0-9]+ { return UNKNOWN_CMD; } +[a-zA-Z0-9]+ { return UNKNOWN_STR; } +. { return UNKNOWN_STR; } + + /* vi:ft=lex:noet:ts=4:sts=4:sw=4: + */ diff --git a/tikzit/src/data/tikzparser.ypp b/tikzit/src/data/tikzparser.ypp new file mode 100644 index 0000000..e97b1c7 --- /dev/null +++ b/tikzit/src/data/tikzparser.ypp @@ -0,0 +1,228 @@ +%{ +/* + * Copyright 2010 Chris Heunen + * Copyright 2010-2013 Aleks Kissinger + * Copyright 2013 K. Johan Paulsson + * Copyright 2013 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "tikzparserdefs.h" +%} + +/* we use features added to bison 2.4 */ +%require "2.3" + +%error-verbose +/* enable maintaining locations for better error messages */ +%locations +/* the name of the header file */ +/*%defines "common/tikzparser.h"*/ +/* make it re-entrant (no global variables) */ +%pure-parser +/* We use a pure (re-entrant) lexer. This means yylex + will take a void* (opaque) type to maintain its state */ +%lex-param {void *scanner} +/* Since this parser is also pure, yyparse needs to take + that lexer state as an argument */ +%parse-param {void *scanner} + +/* possible data types for semantic values */ +%union { + QString qstr; + GraphElementProperty *prop; + GraphElementData *data; + Node *node; + QPointF pt; + struct noderef noderef; +} + +%{ +#include "node.h" +#include "edge.h" + #include "graphelementdata.h" +#include "graphelementproperty.h" + +#include "tikzlexer.h" +#import "tikzgraphassembler.h" +/* the assembler (used by this parser) is stored in the lexer + state as "extra" data */ +#define assembler yyget_extra(scanner) + +/* pass errors off to the assembler */ +void yyerror(YYLTYPE *yylloc, void *scanner, const char *str) { + // TODO: implement reportError() + //assembler->reportError(str, yylloc); +} +%} + +/* yyloc is set up with first_column = last_column = 1 by default; + however, it makes more sense to think of us being "before the + start of the line" before we parse anything */ +%initial-action { + yylloc.first_column = yylloc.last_column = 0; +} + + +%token BEGIN_TIKZPICTURE_CMD "\\begin{tikzpicture}" +%token END_TIKZPICTURE_CMD "\\end{tikzpicture}" +%token BEGIN_PGFONLAYER_CMD "\\begin{pgfonlayer}" +%token END_PGFONLAYER_CMD "\\end{pgfonlayer}" +%token DRAW_CMD "\\draw" +%token NODE_CMD "\\node" +%token PATH_CMD "\\path" +%token RECTANGLE "rectangle" +%token NODE "node" +%token AT "at" +%token TO "to" +%token SEMICOLON ";" +%token COMMA "," + +%token LEFTPARENTHESIS "(" +%token RIGHTPARENTHESIS ")" +%token LEFTBRACKET "[" +%token RIGHTBRACKET "]" +%token FULLSTOP "." +%token EQUALS "=" +%token COORD "co-ordinate" +%token PROPSTRING "key/value string" +%token REFSTRING "string" +%token DELIMITEDSTRING "{-delimited string" + +%token UNKNOWN_BEGIN_CMD "unknown \\begin command" +%token UNKNOWN_END_CMD "unknown \\end command" +%token UNKNOWN_CMD "unknown latex command" +%token UNKNOWN_STR "unknown string" +%token UNCLOSED_DELIM_STR "unclosed {-delimited string" + +%type nodename +%type optanchor +%type val +%type property +%type extraproperties +%type properties +%type optproperties +%type optedgenode +%type noderef +%type optnoderef + +%% + +tikzpicture: "\\begin{tikzpicture}" optproperties tikzcmds "\\end{tikzpicture}" + { + if ($2) { + assembler->graph()->setData($2); + } + }; +tikzcmds: tikzcmds tikzcmd | ; +tikzcmd: node | edge | boundingbox | ignore; + +ignore: "\\begin{pgfonlayer}" DELIMITEDSTRING | "\\end{pgfonlayer}"; + +optproperties: + "[" "]" + { $$ = 0; } + | "[" properties "]" + { $$ = $2; } + | { $$ = 0; }; +properties: extraproperties property + { + [$1 addObject:$2]; + $$ = $1; + }; +extraproperties: + extraproperties property "," + { + [$1 addObject:$2]; + $$ = $1; + } + | { $$ = [GraphElementData data]; }; +property: + val "=" val + { $$ = [GraphElementProperty property:$1 withValue:$3]; } + | val + { $$ = [GraphElementProperty atom:$1]; }; +val: PROPSTRING { $$ = $1; } | DELIMITEDSTRING { $$ = $1; }; + +nodename: "(" REFSTRING ")" { $$ = $2; }; +node: "\\node" optproperties nodename "at" COORD DELIMITEDSTRING ";" + { + Node *node = assembler->graph()->addNode(); + if ($2) + node->setData($2); + node->setName($3); + node->setPoint($5); + node->setLabel($6); + assembler->addNodeToMap(node); + }; + +optanchor: { $$ = 0; } | "." REFSTRING { $$ = $2; }; +noderef: "(" REFSTRING optanchor ")" + { + $$.node = assembler->nodeWithName($2); + $$.anchor = $3; + }; +optnoderef: + noderef { $$ = $1; } + | "(" ")" { $$.node = 0; $$.anchor = 0; } +optedgenode: + { $$ = 0; } + | "node" optproperties DELIMITEDSTRING + { + // TODO: implement edge-nodes + // $$ = [Node node]; + // if ($2) + // [$$ setData:$2]; + // [$$ setLabel:$3]; + } +edge: "\\draw" optproperties noderef "to" optedgenode optnoderef ";" + { + Node *s; + Node *t; + Node *en; + + // TODO: anchors and edge nodes + + s = $3.node; + if ($6.node) { + t = $6.node; + //[edge setTargetAnchor:$6.anchor]; + } else { + t = $3.node; + //[edge setTargetAnchor:$3.anchor]; + } + + Edge *edge = assembler->graph()->addEdge(s, t); + if ($2) + edge->setData($2); + + // [edge setSourceAnchor:$3.anchor]; + // [edge setEdgeNode:$5]; + + // [edge setAttributesFromData]; + }; + +ignoreprop: val | val "=" val; +ignoreprops: ignoreprop ignoreprops | ; +optignoreprops: "[" ignoreprops "]"; +boundingbox: + "\\path" optignoreprops COORD "rectangle" COORD ";" + { + // TODO: bounding box + //[[assembler graph] setBoundingBox:NSRectAroundPoints($3, $5)]; + }; + +/* vi:ft=yacc:noet:ts=4:sts=4:sw=4 +*/ diff --git a/tikzit/src/data/tikzparserdefs.h b/tikzit/src/data/tikzparserdefs.h new file mode 100644 index 0000000..f721ba5 --- /dev/null +++ b/tikzit/src/data/tikzparserdefs.h @@ -0,0 +1,2 @@ +// nothing here + diff --git a/tikzit/src/gui/mainwindow.cpp b/tikzit/src/gui/mainwindow.cpp new file mode 100644 index 0000000..ef73a20 --- /dev/null +++ b/tikzit/src/gui/mainwindow.cpp @@ -0,0 +1,23 @@ +#include "mainwindow.h" +#include "ui_mainwindow.h" + +#include + +MainWindow::MainWindow(QWidget *parent) : + QMainWindow(parent), + ui(new Ui::MainWindow) +{ + ui->setupUi(this); + setAttribute(Qt::WA_DeleteOnClose); + tikzScene = new TikzScene(this); + ui->tikzView->setScene(tikzScene); + //tikzView = new QGraphicsView(tikzScene); + //setCentralWidget(tikzView); + //resize(700, 500); + // badger? +} + +MainWindow::~MainWindow() +{ + qDebug() << "~MainWindow"; +} diff --git a/tikzit/src/gui/mainwindow.h b/tikzit/src/gui/mainwindow.h new file mode 100644 index 0000000..d33a89d --- /dev/null +++ b/tikzit/src/gui/mainwindow.h @@ -0,0 +1,25 @@ +#ifndef MAINWINDOW_H +#define MAINWINDOW_H + +#include "tikzscene.h" + +#include +#include + +namespace Ui { +class MainWindow; +} + +class MainWindow : public QMainWindow +{ + Q_OBJECT + +public: + explicit MainWindow(QWidget *parent = 0); + ~MainWindow(); +private: + TikzScene *tikzScene; + Ui::MainWindow *ui; +}; + +#endif // MAINWINDOW_H diff --git a/tikzit/src/gui/mainwindow.ui b/tikzit/src/gui/mainwindow.ui new file mode 100644 index 0000000..6439ee8 --- /dev/null +++ b/tikzit/src/gui/mainwindow.ui @@ -0,0 +1,76 @@ + + + MainWindow + + + + 0 + 0 + 476 + 378 + + + + TikZiT + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Qt::Vertical + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'.SF NS Text'; font-size:13pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Stuff written here</p></body></html> + + + + + + + + + + 0 + 0 + 476 + 22 + + + + + File + + + + + + + + + New... + + + + + + + diff --git a/tikzit/src/gui/propertypalette.cpp b/tikzit/src/gui/propertypalette.cpp new file mode 100644 index 0000000..6fc9ef9 --- /dev/null +++ b/tikzit/src/gui/propertypalette.cpp @@ -0,0 +1,26 @@ +#include "propertypalette.h" +#include "graphelementdata.h" +#include "ui_propertypalette.h" + +#include +#include + +PropertyPalette::PropertyPalette(QWidget *parent) : + QDockWidget(parent), + ui(new Ui::PropertyPalette) +{ + ui->setupUi(this); + GraphElementData *d = new GraphElementData(); + d->setProperty("key 1", "value 1"); + d->setAtom("atom 1"); + d->setProperty("key 2", "value 2"); + + QModelIndex i = d->index(0,0); + qDebug() << "data: " << i.data(); + ui->treeView->setModel(d); +} + +PropertyPalette::~PropertyPalette() +{ + delete ui; +} diff --git a/tikzit/src/gui/propertypalette.h b/tikzit/src/gui/propertypalette.h new file mode 100644 index 0000000..8e8e5b3 --- /dev/null +++ b/tikzit/src/gui/propertypalette.h @@ -0,0 +1,22 @@ +#ifndef PROPERTYPALETTE_H +#define PROPERTYPALETTE_H + +#include + +namespace Ui { +class PropertyPalette; +} + +class PropertyPalette : public QDockWidget +{ + Q_OBJECT + +public: + explicit PropertyPalette(QWidget *parent = 0); + ~PropertyPalette(); + +private: + Ui::PropertyPalette *ui; +}; + +#endif // PROPERTYPALETTE_H diff --git a/tikzit/src/gui/propertypalette.ui b/tikzit/src/gui/propertypalette.ui new file mode 100644 index 0000000..83d586e --- /dev/null +++ b/tikzit/src/gui/propertypalette.ui @@ -0,0 +1,30 @@ + + + PropertyPalette + + + + 0 + 0 + 194 + 341 + + + + Properties + + + + + + + 0 + + + + + + + + + diff --git a/tikzit/src/gui/tikzscene.cpp b/tikzit/src/gui/tikzscene.cpp new file mode 100644 index 0000000..60939dd --- /dev/null +++ b/tikzit/src/gui/tikzscene.cpp @@ -0,0 +1,6 @@ +#include "tikzscene.h" + +TikzScene::TikzScene(QObject *parent) : QGraphicsScene(parent) +{ + +} diff --git a/tikzit/src/gui/tikzscene.h b/tikzit/src/gui/tikzscene.h new file mode 100644 index 0000000..dd3cba7 --- /dev/null +++ b/tikzit/src/gui/tikzscene.h @@ -0,0 +1,13 @@ +#ifndef TIKZSCENE_H +#define TIKZSCENE_H + +#include +#include + +class TikzScene : public QGraphicsScene +{ +public: + TikzScene(QObject *parent); +}; + +#endif // TIKZSCENE_H diff --git a/tikzit/src/gui/toolpalette.cpp b/tikzit/src/gui/toolpalette.cpp new file mode 100644 index 0000000..fd06730 --- /dev/null +++ b/tikzit/src/gui/toolpalette.cpp @@ -0,0 +1,39 @@ +#include "toolpalette.h" + +#include +#include +#include + +ToolPalette::ToolPalette(QWidget *parent) : + QToolBar(parent) +{ + setWindowFlags(Qt::Window + | Qt::WindowStaysOnTopHint + | Qt::CustomizeWindowHint + | Qt::WindowDoesNotAcceptFocus); + setOrientation(Qt::Vertical); + setFocusPolicy(Qt::NoFocus); + + tools = new QActionGroup(this); + + select = new QAction(QIcon(":/images/select-rectangular.png"), "Select"); + vertex = new QAction(QIcon(":/images/draw-ellipse.png"), "Add Vertex"); + edge = new QAction(QIcon(":/images/draw-path.png"), "Add Edge"); + crop = new QAction(QIcon(":/images/transform-crop-and-resize.png"), "Bounding Box"); + + tools->addAction(select); + tools->addAction(vertex); + tools->addAction(edge); + tools->addAction(crop); + + select->setCheckable(true); + vertex->setCheckable(true); + edge->setCheckable(true); + crop->setCheckable(true); + select->setChecked(true); + + addAction(select); + addAction(vertex); + addAction(edge); + addAction(crop); +} diff --git a/tikzit/src/gui/toolpalette.h b/tikzit/src/gui/toolpalette.h new file mode 100644 index 0000000..05b2e12 --- /dev/null +++ b/tikzit/src/gui/toolpalette.h @@ -0,0 +1,22 @@ +#ifndef TOOLPALETTE_H +#define TOOLPALETTE_H + +#include +#include +#include +#include + +class ToolPalette : public QToolBar +{ + Q_OBJECT +public: + ToolPalette(QWidget *parent = 0); +private: + QActionGroup *tools; + QAction *select; + QAction *vertex; + QAction *edge; + QAction *crop; +}; + +#endif // TOOLPALETTE_H diff --git a/tikzit/src/main.cpp b/tikzit/src/main.cpp new file mode 100644 index 0000000..0de5fd8 --- /dev/null +++ b/tikzit/src/main.cpp @@ -0,0 +1,23 @@ + +#include "mainwindow.h" +#include "toolpalette.h" +#include "propertypalette.h" +#include "graph.h" + +#include + +int main(int argc, char *argv[]) +{ + QApplication a(argc, argv); + MainWindow *w = new MainWindow(); + w->show(); + + ToolPalette *tp = new ToolPalette(new QMainWindow()); + tp->show(); + //w->addToolBar(Qt::LeftToolBarArea, tp); + + PropertyPalette *pp = new PropertyPalette; + pp->show(); + + return a.exec(); +} diff --git a/tikzit/tikzgraphassembler.cpp b/tikzit/tikzgraphassembler.cpp deleted file mode 100644 index a785d85..0000000 --- a/tikzit/tikzgraphassembler.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include "tikzgraphassembler.h" - -TikzGraphAssembler::TikzGraphAssembler(QObject *parent) : QObject(parent) -{ - -} - -void TikzGraphAssembler::addNodeToMap(Node *n) { _nodeMap.insert(n->name(), n); } -Node *TikzGraphAssembler::nodeWithName(QString name) { return _nodeMap[name]; } diff --git a/tikzit/tikzgraphassembler.h b/tikzit/tikzgraphassembler.h deleted file mode 100644 index 5869d95..0000000 --- a/tikzit/tikzgraphassembler.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef TIKZGRAPHASSEMBLER_H -#define TIKZGRAPHASSEMBLER_H - -#include "node.h" - -#include -#include - -class TikzGraphAssembler : public QObject -{ - Q_OBJECT -public: - explicit TikzGraphAssembler(QObject *parent = 0); - void addNodeToMap(Node *n); - Node *nodeWithName(QString name); - -signals: - -public slots: - -private: - QHash _nodeMap; -}; - -#endif // TIKZGRAPHASSEMBLER_H diff --git a/tikzit/tikzit.pro b/tikzit/tikzit.pro index fd70729..15a8c29 100644 --- a/tikzit/tikzit.pro +++ b/tikzit/tikzit.pro @@ -23,31 +23,33 @@ DEFINES += QT_DEPRECATED_WARNINGS #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 -SOURCES += main.cpp\ - mainwindow.cpp \ - toolpalette.cpp \ - tikzscene.cpp \ - graph.cpp \ - node.cpp \ - edge.cpp \ - tikzgraphassembler.cpp \ - graphelementdata.cpp \ - graphelementproperty.cpp \ - propertypalette.cpp - -HEADERS += mainwindow.h \ - toolpalette.h \ - tikzscene.h \ - graph.h \ - node.h \ - edge.h \ - tikzgraphassembler.h \ - graphelementdata.h \ - graphelementproperty.h \ - propertypalette.h - -FORMS += mainwindow.ui \ - propertypalette.ui +SOURCES += src/main.cpp\ + src/gui/mainwindow.cpp \ + src/gui/toolpalette.cpp \ + src/gui/tikzscene.cpp \ + src/data/graph.cpp \ + src/data/node.cpp \ + src/data/edge.cpp \ + src/data/tikzgraphassembler.cpp \ + src/data/graphelementdata.cpp \ + src/data/graphelementproperty.cpp \ + src/gui/propertypalette.cpp + +HEADERS += src/gui/mainwindow.h \ + src/gui/toolpalette.h \ + src/gui/tikzscene.h \ + src/data/graph.h \ + src/data/node.h \ + src/data/edge.h \ + src/data/tikzgraphassembler.h \ + src/data/graphelementdata.h \ + src/data/graphelementproperty.h \ + src/gui/propertypalette.h + +FORMS += src/gui/mainwindow.ui \ + src/gui/propertypalette.ui + +INCLUDEPATH += src src/gui src/data DISTFILES += diff --git a/tikzit/tikzlexer.lpp b/tikzit/tikzlexer.lpp deleted file mode 100644 index 19c4d85..0000000 --- a/tikzit/tikzlexer.lpp +++ /dev/null @@ -1,171 +0,0 @@ -%{ -/* - * Copyright 2010 Chris Heunen - * Copyright 2010-2013 Aleks Kissinger - * Copyright 2013 K. Johan Paulsson - * Copyright 2013 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "tikzparserdefs.h" -#include "tikzparser.h" - -#include - -#define YY_USER_ACTION \ - yylloc->first_line = yylloc->last_line; \ - yylloc->first_column = yylloc->last_column + 1; \ - yylloc->last_column = yylloc->first_column + yyleng - 1; - -%} - -%option reentrant bison-bridge bison-locations 8bit -%option nounput -%option yylineno -%option noyywrap -%option header-file="common/tikzlexer.h" -%option extra-type="TikzGraphAssembler *" - - -%s props -%s xcoord -%s ycoord -%s noderef - -FLOAT \-?[0-9]*(\.[0-9]+)? - -%% - - /* whitespace is ignored, except for position counting; we don't - count formfeed and vtab as whitespace, because it's not obvious - how they should be dealt with and no-one actually uses them */ - - /* lex will take the longest-matching string */ -\r\n|\r|\n { - yylloc->first_line += 1; - yylloc->last_line = yylloc->first_line; - yylloc->first_column = yylloc->last_column = 0; -} -[\t ]+ { } - -\\begin\{tikzpicture\} { return BEGIN_TIKZPICTURE_CMD; } -\\end\{tikzpicture\} { return END_TIKZPICTURE_CMD; } -\\begin\{pgfonlayer\} { return BEGIN_PGFONLAYER_CMD; } -\\end\{pgfonlayer\} { return END_PGFONLAYER_CMD; } -\\draw { return DRAW_CMD; } -\\node { return NODE_CMD; } -\\path { return PATH_CMD; } -rectangle { return RECTANGLE; } -node { return NODE; } -at { return AT; } -to { return TO; } -; { return SEMICOLON; } - -\([ ]*{FLOAT}[ ]*,[ ]*{FLOAT}[ ]*\) { - yylloc->last_column = yylloc->first_column + 1; - yyless(1); - BEGIN(xcoord); -} -{FLOAT} { - yylval->pt.x=(float)strtod(yytext,NULL); - BEGIN(ycoord); -} -, { } -{FLOAT} { - yylval->pt.y=(float)strtod(yytext,NULL); -} -\) { - BEGIN(INITIAL); - return COORD; -} - - /* when we see "[", change parsing mode */ -\[ /*syntaxhlfix]*/ { - BEGIN(props); - return LEFTBRACKET; -} -= { return EQUALS; } -, { return COMMA; } - /* technically, it is possible to have newlines in the middle of - property names or values, but in practice this is unlikely and - screws up our line counting */ -[^=,\{\] \t\n]([^=,\{\]\n]*[^=,\{\] \t\n])? { - yylval->nsstr=[NSString stringWithUTF8String:yytext]; - return PROPSTRING; -} -\] { - BEGIN(INITIAL); - return RIGHTBRACKET; -} - -\( { - BEGIN(noderef); - return LEFTPARENTHESIS; -} -\. { - return FULLSTOP; -} - /* we assume node names (and anchor names) never contain - newlines */ -[^\.\{\)\n]+ { - yylval->nsstr=[NSString stringWithUTF8String:yytext]; - return REFSTRING; -} -\) { - BEGIN(INITIAL); - return RIGHTPARENTHESIS; -} - -\{ { - NSMutableString *buf = [NSMutableString string]; - unsigned int brace_depth = 1; - unsigned int escape = 0; - while (1) { - char c = input(yyscanner); - // eof reached before closing brace - if (c == '\0' || c == EOF) { - return UNCLOSED_DELIM_STR; - } - - yylloc->last_column += 1; - yyleng += 1; - if (escape) { - escape = 0; - } else if (c == '\\') { - escape = 1; - } else if (c == '{') { - brace_depth++; - } else if (c == '}') { - brace_depth--; - if (brace_depth == 0) break; - } else if (c == '\n') { - yylloc->last_line += 1; - yylloc->last_column = 0; - } - [buf appendFormat:@"%c", c]; - } - - yylval->nsstr = buf; - return DELIMITEDSTRING; -} - -\\begin { return UNKNOWN_BEGIN_CMD; } -\\end { return UNKNOWN_END_CMD; } -\\[a-zA-Z0-9]+ { return UNKNOWN_CMD; } -[a-zA-Z0-9]+ { return UNKNOWN_STR; } -. { return UNKNOWN_STR; } - - /* vi:ft=lex:noet:ts=4:sts=4:sw=4: - */ diff --git a/tikzit/tikzparser.ypp b/tikzit/tikzparser.ypp deleted file mode 100644 index e97b1c7..0000000 --- a/tikzit/tikzparser.ypp +++ /dev/null @@ -1,228 +0,0 @@ -%{ -/* - * Copyright 2010 Chris Heunen - * Copyright 2010-2013 Aleks Kissinger - * Copyright 2013 K. Johan Paulsson - * Copyright 2013 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "tikzparserdefs.h" -%} - -/* we use features added to bison 2.4 */ -%require "2.3" - -%error-verbose -/* enable maintaining locations for better error messages */ -%locations -/* the name of the header file */ -/*%defines "common/tikzparser.h"*/ -/* make it re-entrant (no global variables) */ -%pure-parser -/* We use a pure (re-entrant) lexer. This means yylex - will take a void* (opaque) type to maintain its state */ -%lex-param {void *scanner} -/* Since this parser is also pure, yyparse needs to take - that lexer state as an argument */ -%parse-param {void *scanner} - -/* possible data types for semantic values */ -%union { - QString qstr; - GraphElementProperty *prop; - GraphElementData *data; - Node *node; - QPointF pt; - struct noderef noderef; -} - -%{ -#include "node.h" -#include "edge.h" - #include "graphelementdata.h" -#include "graphelementproperty.h" - -#include "tikzlexer.h" -#import "tikzgraphassembler.h" -/* the assembler (used by this parser) is stored in the lexer - state as "extra" data */ -#define assembler yyget_extra(scanner) - -/* pass errors off to the assembler */ -void yyerror(YYLTYPE *yylloc, void *scanner, const char *str) { - // TODO: implement reportError() - //assembler->reportError(str, yylloc); -} -%} - -/* yyloc is set up with first_column = last_column = 1 by default; - however, it makes more sense to think of us being "before the - start of the line" before we parse anything */ -%initial-action { - yylloc.first_column = yylloc.last_column = 0; -} - - -%token BEGIN_TIKZPICTURE_CMD "\\begin{tikzpicture}" -%token END_TIKZPICTURE_CMD "\\end{tikzpicture}" -%token BEGIN_PGFONLAYER_CMD "\\begin{pgfonlayer}" -%token END_PGFONLAYER_CMD "\\end{pgfonlayer}" -%token DRAW_CMD "\\draw" -%token NODE_CMD "\\node" -%token PATH_CMD "\\path" -%token RECTANGLE "rectangle" -%token NODE "node" -%token AT "at" -%token TO "to" -%token SEMICOLON ";" -%token COMMA "," - -%token LEFTPARENTHESIS "(" -%token RIGHTPARENTHESIS ")" -%token LEFTBRACKET "[" -%token RIGHTBRACKET "]" -%token FULLSTOP "." -%token EQUALS "=" -%token COORD "co-ordinate" -%token PROPSTRING "key/value string" -%token REFSTRING "string" -%token DELIMITEDSTRING "{-delimited string" - -%token UNKNOWN_BEGIN_CMD "unknown \\begin command" -%token UNKNOWN_END_CMD "unknown \\end command" -%token UNKNOWN_CMD "unknown latex command" -%token UNKNOWN_STR "unknown string" -%token UNCLOSED_DELIM_STR "unclosed {-delimited string" - -%type nodename -%type optanchor -%type val -%type property -%type extraproperties -%type properties -%type optproperties -%type optedgenode -%type noderef -%type optnoderef - -%% - -tikzpicture: "\\begin{tikzpicture}" optproperties tikzcmds "\\end{tikzpicture}" - { - if ($2) { - assembler->graph()->setData($2); - } - }; -tikzcmds: tikzcmds tikzcmd | ; -tikzcmd: node | edge | boundingbox | ignore; - -ignore: "\\begin{pgfonlayer}" DELIMITEDSTRING | "\\end{pgfonlayer}"; - -optproperties: - "[" "]" - { $$ = 0; } - | "[" properties "]" - { $$ = $2; } - | { $$ = 0; }; -properties: extraproperties property - { - [$1 addObject:$2]; - $$ = $1; - }; -extraproperties: - extraproperties property "," - { - [$1 addObject:$2]; - $$ = $1; - } - | { $$ = [GraphElementData data]; }; -property: - val "=" val - { $$ = [GraphElementProperty property:$1 withValue:$3]; } - | val - { $$ = [GraphElementProperty atom:$1]; }; -val: PROPSTRING { $$ = $1; } | DELIMITEDSTRING { $$ = $1; }; - -nodename: "(" REFSTRING ")" { $$ = $2; }; -node: "\\node" optproperties nodename "at" COORD DELIMITEDSTRING ";" - { - Node *node = assembler->graph()->addNode(); - if ($2) - node->setData($2); - node->setName($3); - node->setPoint($5); - node->setLabel($6); - assembler->addNodeToMap(node); - }; - -optanchor: { $$ = 0; } | "." REFSTRING { $$ = $2; }; -noderef: "(" REFSTRING optanchor ")" - { - $$.node = assembler->nodeWithName($2); - $$.anchor = $3; - }; -optnoderef: - noderef { $$ = $1; } - | "(" ")" { $$.node = 0; $$.anchor = 0; } -optedgenode: - { $$ = 0; } - | "node" optproperties DELIMITEDSTRING - { - // TODO: implement edge-nodes - // $$ = [Node node]; - // if ($2) - // [$$ setData:$2]; - // [$$ setLabel:$3]; - } -edge: "\\draw" optproperties noderef "to" optedgenode optnoderef ";" - { - Node *s; - Node *t; - Node *en; - - // TODO: anchors and edge nodes - - s = $3.node; - if ($6.node) { - t = $6.node; - //[edge setTargetAnchor:$6.anchor]; - } else { - t = $3.node; - //[edge setTargetAnchor:$3.anchor]; - } - - Edge *edge = assembler->graph()->addEdge(s, t); - if ($2) - edge->setData($2); - - // [edge setSourceAnchor:$3.anchor]; - // [edge setEdgeNode:$5]; - - // [edge setAttributesFromData]; - }; - -ignoreprop: val | val "=" val; -ignoreprops: ignoreprop ignoreprops | ; -optignoreprops: "[" ignoreprops "]"; -boundingbox: - "\\path" optignoreprops COORD "rectangle" COORD ";" - { - // TODO: bounding box - //[[assembler graph] setBoundingBox:NSRectAroundPoints($3, $5)]; - }; - -/* vi:ft=yacc:noet:ts=4:sts=4:sw=4 -*/ diff --git a/tikzit/tikzparserdefs.h b/tikzit/tikzparserdefs.h deleted file mode 100644 index f721ba5..0000000 --- a/tikzit/tikzparserdefs.h +++ /dev/null @@ -1,2 +0,0 @@ -// nothing here - diff --git a/tikzit/tikzscene.cpp b/tikzit/tikzscene.cpp deleted file mode 100644 index 60939dd..0000000 --- a/tikzit/tikzscene.cpp +++ /dev/null @@ -1,6 +0,0 @@ -#include "tikzscene.h" - -TikzScene::TikzScene(QObject *parent) : QGraphicsScene(parent) -{ - -} diff --git a/tikzit/tikzscene.h b/tikzit/tikzscene.h deleted file mode 100644 index dd3cba7..0000000 --- a/tikzit/tikzscene.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef TIKZSCENE_H -#define TIKZSCENE_H - -#include -#include - -class TikzScene : public QGraphicsScene -{ -public: - TikzScene(QObject *parent); -}; - -#endif // TIKZSCENE_H diff --git a/tikzit/toolpalette.cpp b/tikzit/toolpalette.cpp deleted file mode 100644 index fd06730..0000000 --- a/tikzit/toolpalette.cpp +++ /dev/null @@ -1,39 +0,0 @@ -#include "toolpalette.h" - -#include -#include -#include - -ToolPalette::ToolPalette(QWidget *parent) : - QToolBar(parent) -{ - setWindowFlags(Qt::Window - | Qt::WindowStaysOnTopHint - | Qt::CustomizeWindowHint - | Qt::WindowDoesNotAcceptFocus); - setOrientation(Qt::Vertical); - setFocusPolicy(Qt::NoFocus); - - tools = new QActionGroup(this); - - select = new QAction(QIcon(":/images/select-rectangular.png"), "Select"); - vertex = new QAction(QIcon(":/images/draw-ellipse.png"), "Add Vertex"); - edge = new QAction(QIcon(":/images/draw-path.png"), "Add Edge"); - crop = new QAction(QIcon(":/images/transform-crop-and-resize.png"), "Bounding Box"); - - tools->addAction(select); - tools->addAction(vertex); - tools->addAction(edge); - tools->addAction(crop); - - select->setCheckable(true); - vertex->setCheckable(true); - edge->setCheckable(true); - crop->setCheckable(true); - select->setChecked(true); - - addAction(select); - addAction(vertex); - addAction(edge); - addAction(crop); -} diff --git a/tikzit/toolpalette.h b/tikzit/toolpalette.h deleted file mode 100644 index 05b2e12..0000000 --- a/tikzit/toolpalette.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef TOOLPALETTE_H -#define TOOLPALETTE_H - -#include -#include -#include -#include - -class ToolPalette : public QToolBar -{ - Q_OBJECT -public: - ToolPalette(QWidget *parent = 0); -private: - QActionGroup *tools; - QAction *select; - QAction *vertex; - QAction *edge; - QAction *crop; -}; - -#endif // TOOLPALETTE_H -- cgit v1.2.3 From da45cb6f70f72d804e0a9ed58562e94455672359 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Fri, 20 Jan 2017 12:30:31 +0100 Subject: parsing --- tikzit/src/data/graphelementdata.cpp | 5 +++++ tikzit/src/data/graphelementdata.h | 1 + tikzit/src/data/tikzlexer.lpp | 9 +++++---- tikzit/src/data/tikzparser.ypp | 12 ++++++------ tikzit/src/gui/propertypalette.cpp | 11 +++++++++++ tikzit/src/gui/propertypalette.h | 2 ++ tikzit/src/gui/toolpalette.cpp | 1 + tikzit/tikzit.pro | 5 ++++- tikzit/tikzit.pro.user | 2 +- 9 files changed, 36 insertions(+), 12 deletions(-) diff --git a/tikzit/src/data/graphelementdata.cpp b/tikzit/src/data/graphelementdata.cpp index 04c7760..8e4a7cc 100644 --- a/tikzit/src/data/graphelementdata.cpp +++ b/tikzit/src/data/graphelementdata.cpp @@ -32,6 +32,11 @@ void GraphElementData::unsetProperty(QString key) _properties.remove(i); } +void GraphElementData::operator <<(GraphElementProperty p) +{ + _properties << p; +} + void GraphElementData::setAtom(QString atom) { GraphElementProperty a(atom); diff --git a/tikzit/src/data/graphelementdata.h b/tikzit/src/data/graphelementdata.h index fee65e7..e3d7a68 100644 --- a/tikzit/src/data/graphelementdata.h +++ b/tikzit/src/data/graphelementdata.h @@ -49,6 +49,7 @@ public: // bool removeRows(int position, int rows, // const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; + void operator <<(GraphElementProperty p); signals: public slots: diff --git a/tikzit/src/data/tikzlexer.lpp b/tikzit/src/data/tikzlexer.lpp index 19c4d85..7040d52 100644 --- a/tikzit/src/data/tikzlexer.lpp +++ b/tikzit/src/data/tikzlexer.lpp @@ -23,6 +23,7 @@ #include "tikzparser.h" #include +#include #define YY_USER_ACTION \ yylloc->first_line = yylloc->last_line; \ @@ -120,7 +121,7 @@ to { return TO; } /* we assume node names (and anchor names) never contain newlines */ [^\.\{\)\n]+ { - yylval->nsstr=[NSString stringWithUTF8String:yytext]; + yylval->qstr=QString(yytext); return REFSTRING; } \) { @@ -129,7 +130,7 @@ to { return TO; } } \{ { - NSMutableString *buf = [NSMutableString string]; + std::stringstream buf; unsigned int brace_depth = 1; unsigned int escape = 0; while (1) { @@ -154,10 +155,10 @@ to { return TO; } yylloc->last_line += 1; yylloc->last_column = 0; } - [buf appendFormat:@"%c", c]; + buf << c; } - yylval->nsstr = buf; + yylval->qstr = QString(buf.str()); return DELIMITEDSTRING; } diff --git a/tikzit/src/data/tikzparser.ypp b/tikzit/src/data/tikzparser.ypp index e97b1c7..ca3b4e4 100644 --- a/tikzit/src/data/tikzparser.ypp +++ b/tikzit/src/data/tikzparser.ypp @@ -52,7 +52,7 @@ %{ #include "node.h" #include "edge.h" - #include "graphelementdata.h" +#include "graphelementdata.h" #include "graphelementproperty.h" #include "tikzlexer.h" @@ -139,21 +139,21 @@ optproperties: | { $$ = 0; }; properties: extraproperties property { - [$1 addObject:$2]; + $1 << $2; $$ = $1; }; extraproperties: extraproperties property "," { - [$1 addObject:$2]; + $1 << $2; $$ = $1; } - | { $$ = [GraphElementData data]; }; + | { $$ = GraphElementData(); }; property: val "=" val - { $$ = [GraphElementProperty property:$1 withValue:$3]; } + { $$ = GraphElementProperty($1,$3); } | val - { $$ = [GraphElementProperty atom:$1]; }; + { $$ = GraphElementProperty($1); }; val: PROPSTRING { $$ = $1; } | DELIMITEDSTRING { $$ = $1; }; nodename: "(" REFSTRING ")" { $$ = $2; }; diff --git a/tikzit/src/gui/propertypalette.cpp b/tikzit/src/gui/propertypalette.cpp index 6fc9ef9..e3eec17 100644 --- a/tikzit/src/gui/propertypalette.cpp +++ b/tikzit/src/gui/propertypalette.cpp @@ -4,6 +4,8 @@ #include #include +#include +#include PropertyPalette::PropertyPalette(QWidget *parent) : QDockWidget(parent), @@ -18,9 +20,18 @@ PropertyPalette::PropertyPalette(QWidget *parent) : QModelIndex i = d->index(0,0); qDebug() << "data: " << i.data(); ui->treeView->setModel(d); + + QSettings settings("tikzit", "tikzit"); + restoreGeometry(settings.value("property-palette-geometry").toByteArray()); } PropertyPalette::~PropertyPalette() { delete ui; } + +void PropertyPalette::closeEvent(QCloseEvent *event) { + QSettings settings("tikzit", "tikzit"); + settings.setValue("property-palette-geometry", saveGeometry()); + QDockWidget::closeEvent(event); +} diff --git a/tikzit/src/gui/propertypalette.h b/tikzit/src/gui/propertypalette.h index 8e8e5b3..f2f1955 100644 --- a/tikzit/src/gui/propertypalette.h +++ b/tikzit/src/gui/propertypalette.h @@ -15,6 +15,8 @@ public: explicit PropertyPalette(QWidget *parent = 0); ~PropertyPalette(); +protected: + void closeEvent(QCloseEvent *event); private: Ui::PropertyPalette *ui; }; diff --git a/tikzit/src/gui/toolpalette.cpp b/tikzit/src/gui/toolpalette.cpp index fd06730..fbbc8fd 100644 --- a/tikzit/src/gui/toolpalette.cpp +++ b/tikzit/src/gui/toolpalette.cpp @@ -13,6 +13,7 @@ ToolPalette::ToolPalette(QWidget *parent) : | Qt::WindowDoesNotAcceptFocus); setOrientation(Qt::Vertical); setFocusPolicy(Qt::NoFocus); + setGeometry(100,200,30,195); tools = new QActionGroup(this); diff --git a/tikzit/tikzit.pro b/tikzit/tikzit.pro index 15a8c29..fce1860 100644 --- a/tikzit/tikzit.pro +++ b/tikzit/tikzit.pro @@ -44,7 +44,10 @@ HEADERS += src/gui/mainwindow.h \ src/data/tikzgraphassembler.h \ src/data/graphelementdata.h \ src/data/graphelementproperty.h \ - src/gui/propertypalette.h + src/gui/propertypalette.h \ + src/data/tikzlexer.lpp \ + src/data/tikzparser.ypp \ + src/data/tikzparserdefs.h FORMS += src/gui/mainwindow.ui \ src/gui/propertypalette.ui diff --git a/tikzit/tikzit.pro.user b/tikzit/tikzit.pro.user index f8495a5..058f7ba 100644 --- a/tikzit/tikzit.pro.user +++ b/tikzit/tikzit.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId -- cgit v1.2.3 From 80f27ac9acaca00524fdac87c80889cd86feb708 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Fri, 20 Jan 2017 12:30:57 +0100 Subject: standard lex yacc names --- tikzit/src/data/tikzlexer.l | 172 +++++++++++++++++++++++++++++++ tikzit/src/data/tikzlexer.lpp | 172 ------------------------------- tikzit/src/data/tikzparser.y | 228 +++++++++++++++++++++++++++++++++++++++++ tikzit/src/data/tikzparser.ypp | 228 ----------------------------------------- 4 files changed, 400 insertions(+), 400 deletions(-) create mode 100644 tikzit/src/data/tikzlexer.l delete mode 100644 tikzit/src/data/tikzlexer.lpp create mode 100644 tikzit/src/data/tikzparser.y delete mode 100644 tikzit/src/data/tikzparser.ypp diff --git a/tikzit/src/data/tikzlexer.l b/tikzit/src/data/tikzlexer.l new file mode 100644 index 0000000..7040d52 --- /dev/null +++ b/tikzit/src/data/tikzlexer.l @@ -0,0 +1,172 @@ +%{ +/* + * Copyright 2010 Chris Heunen + * Copyright 2010-2013 Aleks Kissinger + * Copyright 2013 K. Johan Paulsson + * Copyright 2013 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "tikzparserdefs.h" +#include "tikzparser.h" + +#include +#include + +#define YY_USER_ACTION \ + yylloc->first_line = yylloc->last_line; \ + yylloc->first_column = yylloc->last_column + 1; \ + yylloc->last_column = yylloc->first_column + yyleng - 1; + +%} + +%option reentrant bison-bridge bison-locations 8bit +%option nounput +%option yylineno +%option noyywrap +%option header-file="common/tikzlexer.h" +%option extra-type="TikzGraphAssembler *" + + +%s props +%s xcoord +%s ycoord +%s noderef + +FLOAT \-?[0-9]*(\.[0-9]+)? + +%% + + /* whitespace is ignored, except for position counting; we don't + count formfeed and vtab as whitespace, because it's not obvious + how they should be dealt with and no-one actually uses them */ + + /* lex will take the longest-matching string */ +\r\n|\r|\n { + yylloc->first_line += 1; + yylloc->last_line = yylloc->first_line; + yylloc->first_column = yylloc->last_column = 0; +} +[\t ]+ { } + +\\begin\{tikzpicture\} { return BEGIN_TIKZPICTURE_CMD; } +\\end\{tikzpicture\} { return END_TIKZPICTURE_CMD; } +\\begin\{pgfonlayer\} { return BEGIN_PGFONLAYER_CMD; } +\\end\{pgfonlayer\} { return END_PGFONLAYER_CMD; } +\\draw { return DRAW_CMD; } +\\node { return NODE_CMD; } +\\path { return PATH_CMD; } +rectangle { return RECTANGLE; } +node { return NODE; } +at { return AT; } +to { return TO; } +; { return SEMICOLON; } + +\([ ]*{FLOAT}[ ]*,[ ]*{FLOAT}[ ]*\) { + yylloc->last_column = yylloc->first_column + 1; + yyless(1); + BEGIN(xcoord); +} +{FLOAT} { + yylval->pt.x=(float)strtod(yytext,NULL); + BEGIN(ycoord); +} +, { } +{FLOAT} { + yylval->pt.y=(float)strtod(yytext,NULL); +} +\) { + BEGIN(INITIAL); + return COORD; +} + + /* when we see "[", change parsing mode */ +\[ /*syntaxhlfix]*/ { + BEGIN(props); + return LEFTBRACKET; +} += { return EQUALS; } +, { return COMMA; } + /* technically, it is possible to have newlines in the middle of + property names or values, but in practice this is unlikely and + screws up our line counting */ +[^=,\{\] \t\n]([^=,\{\]\n]*[^=,\{\] \t\n])? { + yylval->nsstr=[NSString stringWithUTF8String:yytext]; + return PROPSTRING; +} +\] { + BEGIN(INITIAL); + return RIGHTBRACKET; +} + +\( { + BEGIN(noderef); + return LEFTPARENTHESIS; +} +\. { + return FULLSTOP; +} + /* we assume node names (and anchor names) never contain + newlines */ +[^\.\{\)\n]+ { + yylval->qstr=QString(yytext); + return REFSTRING; +} +\) { + BEGIN(INITIAL); + return RIGHTPARENTHESIS; +} + +\{ { + std::stringstream buf; + unsigned int brace_depth = 1; + unsigned int escape = 0; + while (1) { + char c = input(yyscanner); + // eof reached before closing brace + if (c == '\0' || c == EOF) { + return UNCLOSED_DELIM_STR; + } + + yylloc->last_column += 1; + yyleng += 1; + if (escape) { + escape = 0; + } else if (c == '\\') { + escape = 1; + } else if (c == '{') { + brace_depth++; + } else if (c == '}') { + brace_depth--; + if (brace_depth == 0) break; + } else if (c == '\n') { + yylloc->last_line += 1; + yylloc->last_column = 0; + } + buf << c; + } + + yylval->qstr = QString(buf.str()); + return DELIMITEDSTRING; +} + +\\begin { return UNKNOWN_BEGIN_CMD; } +\\end { return UNKNOWN_END_CMD; } +\\[a-zA-Z0-9]+ { return UNKNOWN_CMD; } +[a-zA-Z0-9]+ { return UNKNOWN_STR; } +. { return UNKNOWN_STR; } + + /* vi:ft=lex:noet:ts=4:sts=4:sw=4: + */ diff --git a/tikzit/src/data/tikzlexer.lpp b/tikzit/src/data/tikzlexer.lpp deleted file mode 100644 index 7040d52..0000000 --- a/tikzit/src/data/tikzlexer.lpp +++ /dev/null @@ -1,172 +0,0 @@ -%{ -/* - * Copyright 2010 Chris Heunen - * Copyright 2010-2013 Aleks Kissinger - * Copyright 2013 K. Johan Paulsson - * Copyright 2013 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "tikzparserdefs.h" -#include "tikzparser.h" - -#include -#include - -#define YY_USER_ACTION \ - yylloc->first_line = yylloc->last_line; \ - yylloc->first_column = yylloc->last_column + 1; \ - yylloc->last_column = yylloc->first_column + yyleng - 1; - -%} - -%option reentrant bison-bridge bison-locations 8bit -%option nounput -%option yylineno -%option noyywrap -%option header-file="common/tikzlexer.h" -%option extra-type="TikzGraphAssembler *" - - -%s props -%s xcoord -%s ycoord -%s noderef - -FLOAT \-?[0-9]*(\.[0-9]+)? - -%% - - /* whitespace is ignored, except for position counting; we don't - count formfeed and vtab as whitespace, because it's not obvious - how they should be dealt with and no-one actually uses them */ - - /* lex will take the longest-matching string */ -\r\n|\r|\n { - yylloc->first_line += 1; - yylloc->last_line = yylloc->first_line; - yylloc->first_column = yylloc->last_column = 0; -} -[\t ]+ { } - -\\begin\{tikzpicture\} { return BEGIN_TIKZPICTURE_CMD; } -\\end\{tikzpicture\} { return END_TIKZPICTURE_CMD; } -\\begin\{pgfonlayer\} { return BEGIN_PGFONLAYER_CMD; } -\\end\{pgfonlayer\} { return END_PGFONLAYER_CMD; } -\\draw { return DRAW_CMD; } -\\node { return NODE_CMD; } -\\path { return PATH_CMD; } -rectangle { return RECTANGLE; } -node { return NODE; } -at { return AT; } -to { return TO; } -; { return SEMICOLON; } - -\([ ]*{FLOAT}[ ]*,[ ]*{FLOAT}[ ]*\) { - yylloc->last_column = yylloc->first_column + 1; - yyless(1); - BEGIN(xcoord); -} -{FLOAT} { - yylval->pt.x=(float)strtod(yytext,NULL); - BEGIN(ycoord); -} -, { } -{FLOAT} { - yylval->pt.y=(float)strtod(yytext,NULL); -} -\) { - BEGIN(INITIAL); - return COORD; -} - - /* when we see "[", change parsing mode */ -\[ /*syntaxhlfix]*/ { - BEGIN(props); - return LEFTBRACKET; -} -= { return EQUALS; } -, { return COMMA; } - /* technically, it is possible to have newlines in the middle of - property names or values, but in practice this is unlikely and - screws up our line counting */ -[^=,\{\] \t\n]([^=,\{\]\n]*[^=,\{\] \t\n])? { - yylval->nsstr=[NSString stringWithUTF8String:yytext]; - return PROPSTRING; -} -\] { - BEGIN(INITIAL); - return RIGHTBRACKET; -} - -\( { - BEGIN(noderef); - return LEFTPARENTHESIS; -} -\. { - return FULLSTOP; -} - /* we assume node names (and anchor names) never contain - newlines */ -[^\.\{\)\n]+ { - yylval->qstr=QString(yytext); - return REFSTRING; -} -\) { - BEGIN(INITIAL); - return RIGHTPARENTHESIS; -} - -\{ { - std::stringstream buf; - unsigned int brace_depth = 1; - unsigned int escape = 0; - while (1) { - char c = input(yyscanner); - // eof reached before closing brace - if (c == '\0' || c == EOF) { - return UNCLOSED_DELIM_STR; - } - - yylloc->last_column += 1; - yyleng += 1; - if (escape) { - escape = 0; - } else if (c == '\\') { - escape = 1; - } else if (c == '{') { - brace_depth++; - } else if (c == '}') { - brace_depth--; - if (brace_depth == 0) break; - } else if (c == '\n') { - yylloc->last_line += 1; - yylloc->last_column = 0; - } - buf << c; - } - - yylval->qstr = QString(buf.str()); - return DELIMITEDSTRING; -} - -\\begin { return UNKNOWN_BEGIN_CMD; } -\\end { return UNKNOWN_END_CMD; } -\\[a-zA-Z0-9]+ { return UNKNOWN_CMD; } -[a-zA-Z0-9]+ { return UNKNOWN_STR; } -. { return UNKNOWN_STR; } - - /* vi:ft=lex:noet:ts=4:sts=4:sw=4: - */ diff --git a/tikzit/src/data/tikzparser.y b/tikzit/src/data/tikzparser.y new file mode 100644 index 0000000..ca3b4e4 --- /dev/null +++ b/tikzit/src/data/tikzparser.y @@ -0,0 +1,228 @@ +%{ +/* + * Copyright 2010 Chris Heunen + * Copyright 2010-2013 Aleks Kissinger + * Copyright 2013 K. Johan Paulsson + * Copyright 2013 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "tikzparserdefs.h" +%} + +/* we use features added to bison 2.4 */ +%require "2.3" + +%error-verbose +/* enable maintaining locations for better error messages */ +%locations +/* the name of the header file */ +/*%defines "common/tikzparser.h"*/ +/* make it re-entrant (no global variables) */ +%pure-parser +/* We use a pure (re-entrant) lexer. This means yylex + will take a void* (opaque) type to maintain its state */ +%lex-param {void *scanner} +/* Since this parser is also pure, yyparse needs to take + that lexer state as an argument */ +%parse-param {void *scanner} + +/* possible data types for semantic values */ +%union { + QString qstr; + GraphElementProperty *prop; + GraphElementData *data; + Node *node; + QPointF pt; + struct noderef noderef; +} + +%{ +#include "node.h" +#include "edge.h" +#include "graphelementdata.h" +#include "graphelementproperty.h" + +#include "tikzlexer.h" +#import "tikzgraphassembler.h" +/* the assembler (used by this parser) is stored in the lexer + state as "extra" data */ +#define assembler yyget_extra(scanner) + +/* pass errors off to the assembler */ +void yyerror(YYLTYPE *yylloc, void *scanner, const char *str) { + // TODO: implement reportError() + //assembler->reportError(str, yylloc); +} +%} + +/* yyloc is set up with first_column = last_column = 1 by default; + however, it makes more sense to think of us being "before the + start of the line" before we parse anything */ +%initial-action { + yylloc.first_column = yylloc.last_column = 0; +} + + +%token BEGIN_TIKZPICTURE_CMD "\\begin{tikzpicture}" +%token END_TIKZPICTURE_CMD "\\end{tikzpicture}" +%token BEGIN_PGFONLAYER_CMD "\\begin{pgfonlayer}" +%token END_PGFONLAYER_CMD "\\end{pgfonlayer}" +%token DRAW_CMD "\\draw" +%token NODE_CMD "\\node" +%token PATH_CMD "\\path" +%token RECTANGLE "rectangle" +%token NODE "node" +%token AT "at" +%token TO "to" +%token SEMICOLON ";" +%token COMMA "," + +%token LEFTPARENTHESIS "(" +%token RIGHTPARENTHESIS ")" +%token LEFTBRACKET "[" +%token RIGHTBRACKET "]" +%token FULLSTOP "." +%token EQUALS "=" +%token COORD "co-ordinate" +%token PROPSTRING "key/value string" +%token REFSTRING "string" +%token DELIMITEDSTRING "{-delimited string" + +%token UNKNOWN_BEGIN_CMD "unknown \\begin command" +%token UNKNOWN_END_CMD "unknown \\end command" +%token UNKNOWN_CMD "unknown latex command" +%token UNKNOWN_STR "unknown string" +%token UNCLOSED_DELIM_STR "unclosed {-delimited string" + +%type nodename +%type optanchor +%type val +%type property +%type extraproperties +%type properties +%type optproperties +%type optedgenode +%type noderef +%type optnoderef + +%% + +tikzpicture: "\\begin{tikzpicture}" optproperties tikzcmds "\\end{tikzpicture}" + { + if ($2) { + assembler->graph()->setData($2); + } + }; +tikzcmds: tikzcmds tikzcmd | ; +tikzcmd: node | edge | boundingbox | ignore; + +ignore: "\\begin{pgfonlayer}" DELIMITEDSTRING | "\\end{pgfonlayer}"; + +optproperties: + "[" "]" + { $$ = 0; } + | "[" properties "]" + { $$ = $2; } + | { $$ = 0; }; +properties: extraproperties property + { + $1 << $2; + $$ = $1; + }; +extraproperties: + extraproperties property "," + { + $1 << $2; + $$ = $1; + } + | { $$ = GraphElementData(); }; +property: + val "=" val + { $$ = GraphElementProperty($1,$3); } + | val + { $$ = GraphElementProperty($1); }; +val: PROPSTRING { $$ = $1; } | DELIMITEDSTRING { $$ = $1; }; + +nodename: "(" REFSTRING ")" { $$ = $2; }; +node: "\\node" optproperties nodename "at" COORD DELIMITEDSTRING ";" + { + Node *node = assembler->graph()->addNode(); + if ($2) + node->setData($2); + node->setName($3); + node->setPoint($5); + node->setLabel($6); + assembler->addNodeToMap(node); + }; + +optanchor: { $$ = 0; } | "." REFSTRING { $$ = $2; }; +noderef: "(" REFSTRING optanchor ")" + { + $$.node = assembler->nodeWithName($2); + $$.anchor = $3; + }; +optnoderef: + noderef { $$ = $1; } + | "(" ")" { $$.node = 0; $$.anchor = 0; } +optedgenode: + { $$ = 0; } + | "node" optproperties DELIMITEDSTRING + { + // TODO: implement edge-nodes + // $$ = [Node node]; + // if ($2) + // [$$ setData:$2]; + // [$$ setLabel:$3]; + } +edge: "\\draw" optproperties noderef "to" optedgenode optnoderef ";" + { + Node *s; + Node *t; + Node *en; + + // TODO: anchors and edge nodes + + s = $3.node; + if ($6.node) { + t = $6.node; + //[edge setTargetAnchor:$6.anchor]; + } else { + t = $3.node; + //[edge setTargetAnchor:$3.anchor]; + } + + Edge *edge = assembler->graph()->addEdge(s, t); + if ($2) + edge->setData($2); + + // [edge setSourceAnchor:$3.anchor]; + // [edge setEdgeNode:$5]; + + // [edge setAttributesFromData]; + }; + +ignoreprop: val | val "=" val; +ignoreprops: ignoreprop ignoreprops | ; +optignoreprops: "[" ignoreprops "]"; +boundingbox: + "\\path" optignoreprops COORD "rectangle" COORD ";" + { + // TODO: bounding box + //[[assembler graph] setBoundingBox:NSRectAroundPoints($3, $5)]; + }; + +/* vi:ft=yacc:noet:ts=4:sts=4:sw=4 +*/ diff --git a/tikzit/src/data/tikzparser.ypp b/tikzit/src/data/tikzparser.ypp deleted file mode 100644 index ca3b4e4..0000000 --- a/tikzit/src/data/tikzparser.ypp +++ /dev/null @@ -1,228 +0,0 @@ -%{ -/* - * Copyright 2010 Chris Heunen - * Copyright 2010-2013 Aleks Kissinger - * Copyright 2013 K. Johan Paulsson - * Copyright 2013 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "tikzparserdefs.h" -%} - -/* we use features added to bison 2.4 */ -%require "2.3" - -%error-verbose -/* enable maintaining locations for better error messages */ -%locations -/* the name of the header file */ -/*%defines "common/tikzparser.h"*/ -/* make it re-entrant (no global variables) */ -%pure-parser -/* We use a pure (re-entrant) lexer. This means yylex - will take a void* (opaque) type to maintain its state */ -%lex-param {void *scanner} -/* Since this parser is also pure, yyparse needs to take - that lexer state as an argument */ -%parse-param {void *scanner} - -/* possible data types for semantic values */ -%union { - QString qstr; - GraphElementProperty *prop; - GraphElementData *data; - Node *node; - QPointF pt; - struct noderef noderef; -} - -%{ -#include "node.h" -#include "edge.h" -#include "graphelementdata.h" -#include "graphelementproperty.h" - -#include "tikzlexer.h" -#import "tikzgraphassembler.h" -/* the assembler (used by this parser) is stored in the lexer - state as "extra" data */ -#define assembler yyget_extra(scanner) - -/* pass errors off to the assembler */ -void yyerror(YYLTYPE *yylloc, void *scanner, const char *str) { - // TODO: implement reportError() - //assembler->reportError(str, yylloc); -} -%} - -/* yyloc is set up with first_column = last_column = 1 by default; - however, it makes more sense to think of us being "before the - start of the line" before we parse anything */ -%initial-action { - yylloc.first_column = yylloc.last_column = 0; -} - - -%token BEGIN_TIKZPICTURE_CMD "\\begin{tikzpicture}" -%token END_TIKZPICTURE_CMD "\\end{tikzpicture}" -%token BEGIN_PGFONLAYER_CMD "\\begin{pgfonlayer}" -%token END_PGFONLAYER_CMD "\\end{pgfonlayer}" -%token DRAW_CMD "\\draw" -%token NODE_CMD "\\node" -%token PATH_CMD "\\path" -%token RECTANGLE "rectangle" -%token NODE "node" -%token AT "at" -%token TO "to" -%token SEMICOLON ";" -%token COMMA "," - -%token LEFTPARENTHESIS "(" -%token RIGHTPARENTHESIS ")" -%token LEFTBRACKET "[" -%token RIGHTBRACKET "]" -%token FULLSTOP "." -%token EQUALS "=" -%token COORD "co-ordinate" -%token PROPSTRING "key/value string" -%token REFSTRING "string" -%token DELIMITEDSTRING "{-delimited string" - -%token UNKNOWN_BEGIN_CMD "unknown \\begin command" -%token UNKNOWN_END_CMD "unknown \\end command" -%token UNKNOWN_CMD "unknown latex command" -%token UNKNOWN_STR "unknown string" -%token UNCLOSED_DELIM_STR "unclosed {-delimited string" - -%type nodename -%type optanchor -%type val -%type property -%type extraproperties -%type properties -%type optproperties -%type optedgenode -%type noderef -%type optnoderef - -%% - -tikzpicture: "\\begin{tikzpicture}" optproperties tikzcmds "\\end{tikzpicture}" - { - if ($2) { - assembler->graph()->setData($2); - } - }; -tikzcmds: tikzcmds tikzcmd | ; -tikzcmd: node | edge | boundingbox | ignore; - -ignore: "\\begin{pgfonlayer}" DELIMITEDSTRING | "\\end{pgfonlayer}"; - -optproperties: - "[" "]" - { $$ = 0; } - | "[" properties "]" - { $$ = $2; } - | { $$ = 0; }; -properties: extraproperties property - { - $1 << $2; - $$ = $1; - }; -extraproperties: - extraproperties property "," - { - $1 << $2; - $$ = $1; - } - | { $$ = GraphElementData(); }; -property: - val "=" val - { $$ = GraphElementProperty($1,$3); } - | val - { $$ = GraphElementProperty($1); }; -val: PROPSTRING { $$ = $1; } | DELIMITEDSTRING { $$ = $1; }; - -nodename: "(" REFSTRING ")" { $$ = $2; }; -node: "\\node" optproperties nodename "at" COORD DELIMITEDSTRING ";" - { - Node *node = assembler->graph()->addNode(); - if ($2) - node->setData($2); - node->setName($3); - node->setPoint($5); - node->setLabel($6); - assembler->addNodeToMap(node); - }; - -optanchor: { $$ = 0; } | "." REFSTRING { $$ = $2; }; -noderef: "(" REFSTRING optanchor ")" - { - $$.node = assembler->nodeWithName($2); - $$.anchor = $3; - }; -optnoderef: - noderef { $$ = $1; } - | "(" ")" { $$.node = 0; $$.anchor = 0; } -optedgenode: - { $$ = 0; } - | "node" optproperties DELIMITEDSTRING - { - // TODO: implement edge-nodes - // $$ = [Node node]; - // if ($2) - // [$$ setData:$2]; - // [$$ setLabel:$3]; - } -edge: "\\draw" optproperties noderef "to" optedgenode optnoderef ";" - { - Node *s; - Node *t; - Node *en; - - // TODO: anchors and edge nodes - - s = $3.node; - if ($6.node) { - t = $6.node; - //[edge setTargetAnchor:$6.anchor]; - } else { - t = $3.node; - //[edge setTargetAnchor:$3.anchor]; - } - - Edge *edge = assembler->graph()->addEdge(s, t); - if ($2) - edge->setData($2); - - // [edge setSourceAnchor:$3.anchor]; - // [edge setEdgeNode:$5]; - - // [edge setAttributesFromData]; - }; - -ignoreprop: val | val "=" val; -ignoreprops: ignoreprop ignoreprops | ; -optignoreprops: "[" ignoreprops "]"; -boundingbox: - "\\path" optignoreprops COORD "rectangle" COORD ";" - { - // TODO: bounding box - //[[assembler graph] setBoundingBox:NSRectAroundPoints($3, $5)]; - }; - -/* vi:ft=yacc:noet:ts=4:sts=4:sw=4 -*/ -- cgit v1.2.3 From b70be76db70730f42250bc066a578710aa4a3038 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Fri, 20 Jan 2017 12:39:26 +0100 Subject: added flex yacc to project --- tikzit/bison.pri | 14 ++++++++++++++ tikzit/flex.pri | 8 ++++++++ tikzit/src/data/tikzlexer.l | 2 +- tikzit/tikzit.pro | 5 +++++ 4 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 tikzit/bison.pri create mode 100644 tikzit/flex.pri diff --git a/tikzit/bison.pri b/tikzit/bison.pri new file mode 100644 index 0000000..3fcfc36 --- /dev/null +++ b/tikzit/bison.pri @@ -0,0 +1,14 @@ +bison.name = Bison ${QMAKE_FILE_IN} +bison.input = BISONSOURCES +bison.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.parser.cpp +bison.commands = bison -d -o ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.parser.cpp ${QMAKE_FILE_IN} +bison.CONFIG += target_predeps +bison.variable_out = GENERATED_SOURCES +silent:bison.commands = @echo Bison ${QMAKE_FILE_IN} && $$bison.commands +QMAKE_EXTRA_COMPILERS += bison +bison_header.input = BISONSOURCES +bison_header.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.parser.hpp +bison_header.commands = bison -d -o ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.parser.cpp ${QMAKE_FILE_IN} +bison_header.CONFIG += target_predeps no_link +silent:bison_header.commands = @echo Bison ${QMAKE_FILE_IN} && $$bison.commands +QMAKE_EXTRA_COMPILERS += bison_header diff --git a/tikzit/flex.pri b/tikzit/flex.pri new file mode 100644 index 0000000..0cddec6 --- /dev/null +++ b/tikzit/flex.pri @@ -0,0 +1,8 @@ +flex.name = Flex ${QMAKE_FILE_IN} +flex.input = FLEXSOURCES +flex.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.lexer.cpp +flex.commands = flex -o ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.lexer.cpp ${QMAKE_FILE_IN} +flex.CONFIG += target_predeps +flex.variable_out = GENERATED_SOURCES +silent:flex.commands = @echo Lex ${QMAKE_FILE_IN} && $$flex.commands +QMAKE_EXTRA_COMPILERS += flex diff --git a/tikzit/src/data/tikzlexer.l b/tikzit/src/data/tikzlexer.l index 7040d52..0a5ca6f 100644 --- a/tikzit/src/data/tikzlexer.l +++ b/tikzit/src/data/tikzlexer.l @@ -36,7 +36,7 @@ %option nounput %option yylineno %option noyywrap -%option header-file="common/tikzlexer.h" +%option header-file="tikzlexer.h" %option extra-type="TikzGraphAssembler *" diff --git a/tikzit/tikzit.pro b/tikzit/tikzit.pro index fce1860..0c8feb5 100644 --- a/tikzit/tikzit.pro +++ b/tikzit/tikzit.pro @@ -4,6 +4,9 @@ # #------------------------------------------------- +include(flex.pri) +include(bison.pri) + QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets @@ -22,6 +25,8 @@ DEFINES += QT_DEPRECATED_WARNINGS # You can also select to disable deprecated APIs only up to a certain version of Qt. #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 +FLEXSOURCES = src/data/tikzlexer.l +BISONSOURCES = src/data/tikzparser.y SOURCES += src/main.cpp\ src/gui/mainwindow.cpp \ -- cgit v1.2.3 From 48e69ae28bb8b40d5a2281f0ea26141220b3bf5e Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Sat, 21 Jan 2017 11:18:41 +0100 Subject: added testing --- tikzit/bison.pri | 2 +- tikzit/src/data/edge.cpp | 36 +++++++++++++++++++ tikzit/src/data/edge.h | 15 ++++++++ tikzit/src/data/graph.cpp | 16 +++++++++ tikzit/src/data/graph.h | 6 ++++ tikzit/src/data/graphelementdata.cpp | 7 +++- tikzit/src/data/graphelementdata.h | 1 + tikzit/src/data/node.cpp | 24 +++++++++---- tikzit/src/data/node.h | 14 ++++++-- tikzit/src/data/tikzgraphassembler.cpp | 9 ++++- tikzit/src/data/tikzgraphassembler.h | 6 +++- tikzit/src/data/tikzlexer.l | 20 ++++++----- tikzit/src/data/tikzparser.y | 63 +++++++++++++++++++++------------- tikzit/src/data/tikzparserdefs.h | 16 ++++++++- tikzit/src/test/testtest.cpp | 17 +++++++++ tikzit/tikzit.pro | 12 +++---- 16 files changed, 212 insertions(+), 52 deletions(-) create mode 100644 tikzit/src/test/testtest.cpp diff --git a/tikzit/bison.pri b/tikzit/bison.pri index 3fcfc36..b5d30da 100644 --- a/tikzit/bison.pri +++ b/tikzit/bison.pri @@ -7,7 +7,7 @@ bison.variable_out = GENERATED_SOURCES silent:bison.commands = @echo Bison ${QMAKE_FILE_IN} && $$bison.commands QMAKE_EXTRA_COMPILERS += bison bison_header.input = BISONSOURCES -bison_header.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.parser.hpp +bison_header.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.parser.h bison_header.commands = bison -d -o ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.parser.cpp ${QMAKE_FILE_IN} bison_header.CONFIG += target_predeps no_link silent:bison_header.commands = @echo Bison ${QMAKE_FILE_IN} && $$bison.commands diff --git a/tikzit/src/data/edge.cpp b/tikzit/src/data/edge.cpp index bea96b8..c8d1cfc 100644 --- a/tikzit/src/data/edge.cpp +++ b/tikzit/src/data/edge.cpp @@ -3,7 +3,12 @@ Edge::Edge(Node *s, Node *t, QObject *parent) : QObject(parent), _source(s), _target(t) { + _data = new GraphElementData(); +} +Edge::~Edge() +{ + delete _data; } Node *Edge::source() const @@ -16,4 +21,35 @@ Node *Edge::target() const return _target; } +GraphElementData *Edge::data() const +{ + return _data; +} + +void Edge::setData(GraphElementData *data) +{ + delete _data; + _data = data; +} + +QString Edge::sourceAnchor() const +{ + return _sourceAnchor; +} + +void Edge::setSourceAnchor(const QString &sourceAnchor) +{ + _sourceAnchor = sourceAnchor; +} + +QString Edge::targetAnchor() const +{ + return _targetAnchor; +} + +void Edge::setTargetAnchor(const QString &targetAnchor) +{ + _targetAnchor = targetAnchor; +} + diff --git a/tikzit/src/data/edge.h b/tikzit/src/data/edge.h index 2153f30..5884b90 100644 --- a/tikzit/src/data/edge.h +++ b/tikzit/src/data/edge.h @@ -1,6 +1,8 @@ #ifndef EDGE_H #define EDGE_H +#include "graphelementdata.h" + #include class Node; @@ -10,10 +12,20 @@ class Edge : public QObject Q_OBJECT public: explicit Edge(Node *s, Node *t, QObject *parent = 0); + ~Edge(); Node *source() const; Node *target() const; + GraphElementData *data() const; + void setData(GraphElementData *data); + + QString sourceAnchor() const; + void setSourceAnchor(const QString &sourceAnchor); + + QString targetAnchor() const; + void setTargetAnchor(const QString &targetAnchor); + signals: public slots: @@ -21,6 +33,9 @@ public slots: private: Node *_source; Node *_target; + GraphElementData *_data; + QString _sourceAnchor; + QString _targetAnchor; }; #endif // EDGE_H diff --git a/tikzit/src/data/graph.cpp b/tikzit/src/data/graph.cpp index 0db20e1..8a995d2 100644 --- a/tikzit/src/data/graph.cpp +++ b/tikzit/src/data/graph.cpp @@ -2,7 +2,12 @@ Graph::Graph(QObject *parent) : QObject(parent) { + _data = new GraphElementData(); +} +Graph::~Graph() +{ + delete _data; } void Graph::removeNode(Node *n) { @@ -21,6 +26,17 @@ void Graph::removeEdge(Edge *e) } +GraphElementData *Graph::data() const +{ + return _data; +} + +void Graph::setData(GraphElementData *data) +{ + delete _data; + _data = data; +} + Node *Graph::addNode() { Node *n = new Node(this); nodes << n; diff --git a/tikzit/src/data/graph.h b/tikzit/src/data/graph.h index f55b3c9..1f26486 100644 --- a/tikzit/src/data/graph.h +++ b/tikzit/src/data/graph.h @@ -3,6 +3,7 @@ #include "node.h" #include "edge.h" +#include "graphelementdata.h" #include #include @@ -13,11 +14,15 @@ class Graph : public QObject Q_OBJECT public: explicit Graph(QObject *parent = 0); + ~Graph(); Node *addNode(); void removeNode(Node *n); Edge *addEdge(Node *s, Node*t); void removeEdge(Edge *e); + GraphElementData *data() const; + void setData(GraphElementData *data); + signals: public slots: @@ -27,6 +32,7 @@ private: QVector edges; QMultiHash inEdges; QMultiHash outEdges; + GraphElementData *_data; }; #endif // GRAPH_H diff --git a/tikzit/src/data/graphelementdata.cpp b/tikzit/src/data/graphelementdata.cpp index 8e4a7cc..8f81e31 100644 --- a/tikzit/src/data/graphelementdata.cpp +++ b/tikzit/src/data/graphelementdata.cpp @@ -32,11 +32,16 @@ void GraphElementData::unsetProperty(QString key) _properties.remove(i); } -void GraphElementData::operator <<(GraphElementProperty p) +void GraphElementData::add(GraphElementProperty p) { _properties << p; } +void GraphElementData::operator <<(GraphElementProperty p) +{ + add(p); +} + void GraphElementData::setAtom(QString atom) { GraphElementProperty a(atom); diff --git a/tikzit/src/data/graphelementdata.h b/tikzit/src/data/graphelementdata.h index e3d7a68..82279cf 100644 --- a/tikzit/src/data/graphelementdata.h +++ b/tikzit/src/data/graphelementdata.h @@ -50,6 +50,7 @@ public: // const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; void operator <<(GraphElementProperty p); + void add(GraphElementProperty p); signals: public slots: diff --git a/tikzit/src/data/node.cpp b/tikzit/src/data/node.cpp index 2c1c7ee..b3b2155 100644 --- a/tikzit/src/data/node.cpp +++ b/tikzit/src/data/node.cpp @@ -4,22 +4,22 @@ Node::Node(QObject *parent) : QObject(parent) { - qDebug() << "Node()"; + _data = new GraphElementData(); } Node::~Node() { - qDebug() << "~Node()"; + delete _data; } -QPointF Node::pos() const +QPointF Node::point() const { - return _pos; + return _point; } -void Node::setPos(const QPointF &pos) +void Node::setPoint(const QPointF &point) { - _pos = pos; + _point = point; } QString Node::name() const @@ -41,3 +41,15 @@ void Node::setLabel(const QString &label) { _label = label; } + +GraphElementData *Node::data() const +{ + return _data; +} + +void Node::setData(GraphElementData *data) +{ + delete _data; + _data = data; +} + diff --git a/tikzit/src/data/node.h b/tikzit/src/data/node.h index 8eae520..6205732 100644 --- a/tikzit/src/data/node.h +++ b/tikzit/src/data/node.h @@ -1,6 +1,8 @@ #ifndef NODE_H #define NODE_H +#include "graphelementdata.h" + #include #include #include @@ -12,8 +14,8 @@ public: explicit Node(QObject *parent = 0); ~Node(); - QPointF pos() const; - void setPos(const QPointF &pos); + QPointF point() const; + void setPoint(const QPointF &point); QString name() const; void setName(const QString &name); @@ -21,14 +23,20 @@ public: QString label() const; void setLabel(const QString &label); + + + GraphElementData *data() const; + void setData(GraphElementData *data); + signals: public slots: private: - QPointF _pos; + QPointF _point; QString _name; QString _label; + GraphElementData *_data; }; #endif // NODE_H diff --git a/tikzit/src/data/tikzgraphassembler.cpp b/tikzit/src/data/tikzgraphassembler.cpp index a785d85..d8e3963 100644 --- a/tikzit/src/data/tikzgraphassembler.cpp +++ b/tikzit/src/data/tikzgraphassembler.cpp @@ -1,9 +1,16 @@ #include "tikzgraphassembler.h" -TikzGraphAssembler::TikzGraphAssembler(QObject *parent) : QObject(parent) +TikzGraphAssembler::TikzGraphAssembler(Graph *graph, QObject *parent) : + _graph(graph), QObject(parent) { } void TikzGraphAssembler::addNodeToMap(Node *n) { _nodeMap.insert(n->name(), n); } Node *TikzGraphAssembler::nodeWithName(QString name) { return _nodeMap[name]; } + +Graph *TikzGraphAssembler::graph() const +{ + return _graph; +} + diff --git a/tikzit/src/data/tikzgraphassembler.h b/tikzit/src/data/tikzgraphassembler.h index 5869d95..2ae42fd 100644 --- a/tikzit/src/data/tikzgraphassembler.h +++ b/tikzit/src/data/tikzgraphassembler.h @@ -2,6 +2,7 @@ #define TIKZGRAPHASSEMBLER_H #include "node.h" +#include "graph.h" #include #include @@ -10,16 +11,19 @@ class TikzGraphAssembler : public QObject { Q_OBJECT public: - explicit TikzGraphAssembler(QObject *parent = 0); + explicit TikzGraphAssembler(Graph *graph, QObject *parent = 0); void addNodeToMap(Node *n); Node *nodeWithName(QString name); + Graph *graph() const; + signals: public slots: private: QHash _nodeMap; + Graph *_graph; }; #endif // TIKZGRAPHASSEMBLER_H diff --git a/tikzit/src/data/tikzlexer.l b/tikzit/src/data/tikzlexer.l index 0a5ca6f..adb6fef 100644 --- a/tikzit/src/data/tikzlexer.l +++ b/tikzit/src/data/tikzlexer.l @@ -20,10 +20,10 @@ */ #include "tikzparserdefs.h" -#include "tikzparser.h" +#include "tikzparser.parser.hpp" + +#include -#include -#include #define YY_USER_ACTION \ yylloc->first_line = yylloc->last_line; \ @@ -80,12 +80,12 @@ to { return TO; } BEGIN(xcoord); } {FLOAT} { - yylval->pt.x=(float)strtod(yytext,NULL); + yylval->pt->setX(strtod(yytext,NULL)); BEGIN(ycoord); } , { } {FLOAT} { - yylval->pt.y=(float)strtod(yytext,NULL); + yylval->pt->setY(strtod(yytext,NULL)); } \) { BEGIN(INITIAL); @@ -103,7 +103,7 @@ to { return TO; } property names or values, but in practice this is unlikely and screws up our line counting */ [^=,\{\] \t\n]([^=,\{\]\n]*[^=,\{\] \t\n])? { - yylval->nsstr=[NSString stringWithUTF8String:yytext]; + yylval->qstr= new QString(yytext); return PROPSTRING; } \] { @@ -121,7 +121,7 @@ to { return TO; } /* we assume node names (and anchor names) never contain newlines */ [^\.\{\)\n]+ { - yylval->qstr=QString(yytext); + yylval->qstr = new QString(yytext); return REFSTRING; } \) { @@ -134,7 +134,7 @@ to { return TO; } unsigned int brace_depth = 1; unsigned int escape = 0; while (1) { - char c = input(yyscanner); + char c = yyinput(yyscanner); // eof reached before closing brace if (c == '\0' || c == EOF) { return UNCLOSED_DELIM_STR; @@ -157,8 +157,10 @@ to { return TO; } } buf << c; } + + - yylval->qstr = QString(buf.str()); + yylval->qstr = new QString(QString::fromStdString(buf.str())); return DELIMITEDSTRING; } diff --git a/tikzit/src/data/tikzparser.y b/tikzit/src/data/tikzparser.y index ca3b4e4..39d89c6 100644 --- a/tikzit/src/data/tikzparser.y +++ b/tikzit/src/data/tikzparser.y @@ -41,12 +41,12 @@ /* possible data types for semantic values */ %union { - QString qstr; + QString *qstr; GraphElementProperty *prop; GraphElementData *data; Node *node; - QPointF pt; - struct noderef noderef; + QPointF *pt; + struct noderef noderef; } %{ @@ -123,7 +123,7 @@ void yyerror(YYLTYPE *yylloc, void *scanner, const char *str) { tikzpicture: "\\begin{tikzpicture}" optproperties tikzcmds "\\end{tikzpicture}" { if ($2) { - assembler->graph()->setData($2); + assembler->graph()->setData($2); } }; tikzcmds: tikzcmds tikzcmd | ; @@ -139,40 +139,53 @@ optproperties: | { $$ = 0; }; properties: extraproperties property { - $1 << $2; + $1->add(*$2); + delete $2; $$ = $1; }; extraproperties: extraproperties property "," { - $1 << $2; + $1->add(*$2); + delete $2; $$ = $1; } - | { $$ = GraphElementData(); }; + | { $$ = new GraphElementData(); }; property: val "=" val - { $$ = GraphElementProperty($1,$3); } + { + GraphElementProperty *p = new GraphElementProperty(*$1,*$3); + delete $1, $3; + $$ = p; + } | val - { $$ = GraphElementProperty($1); }; + { + GraphElementProperty *a = new GraphElementProperty(*$1); + delete $1; + $$ = a; + }; val: PROPSTRING { $$ = $1; } | DELIMITEDSTRING { $$ = $1; }; nodename: "(" REFSTRING ")" { $$ = $2; }; node: "\\node" optproperties nodename "at" COORD DELIMITEDSTRING ";" { Node *node = assembler->graph()->addNode(); - if ($2) - node->setData($2); - node->setName($3); - node->setPoint($5); - node->setLabel($6); + if ($2) { + node->setData($2); + } + node->setName(*$3); + node->setPoint(*$5); + node->setLabel(*$6); + delete $3, $5, $6; assembler->addNodeToMap(node); }; optanchor: { $$ = 0; } | "." REFSTRING { $$ = $2; }; noderef: "(" REFSTRING optanchor ")" { - $$.node = assembler->nodeWithName($2); - $$.anchor = $3; + $$.node = assembler->nodeWithName(*$2); + delete $2; + $$.anchor = $3; }; optnoderef: noderef { $$ = $1; } @@ -193,25 +206,29 @@ edge: "\\draw" optproperties noderef "to" optedgenode optnoderef ";" Node *t; Node *en; + QString sa; + QString ta; + // TODO: anchors and edge nodes s = $3.node; + sa = *$3.anchor; + delete $3.anchor; if ($6.node) { t = $6.node; - //[edge setTargetAnchor:$6.anchor]; + ta = *$6.anchor; + delete $6.anchor; } else { - t = $3.node; - //[edge setTargetAnchor:$3.anchor]; + t = s; + ta = sa; } Edge *edge = assembler->graph()->addEdge(s, t); if ($2) edge->setData($2); - // [edge setSourceAnchor:$3.anchor]; - // [edge setEdgeNode:$5]; - - // [edge setAttributesFromData]; + edge->setSourceAnchor(sa); + edge->setTargetAnchor(ta); }; ignoreprop: val | val "=" val; diff --git a/tikzit/src/data/tikzparserdefs.h b/tikzit/src/data/tikzparserdefs.h index f721ba5..7ba5bc5 100644 --- a/tikzit/src/data/tikzparserdefs.h +++ b/tikzit/src/data/tikzparserdefs.h @@ -1,2 +1,16 @@ -// nothing here +#ifndef TIKZPARSERDEFS_H +#define TIKZPARSERDEFS_H +#include "graphelementproperty.h" +#include "graphelementdata.h" +#include "node.h" +#include "tikzgraphassembler.h" + +#include + +struct noderef { + Node *node; + QString *anchor; +}; + +#endif // TIKZPARSERDEFS_H diff --git a/tikzit/src/test/testtest.cpp b/tikzit/src/test/testtest.cpp new file mode 100644 index 0000000..c6de586 --- /dev/null +++ b/tikzit/src/test/testtest.cpp @@ -0,0 +1,17 @@ +#include +#include + +class TestTest: public QObject +{ + Q_OBJECT +private slots: + void initTestCase() + { qDebug("initialising test"); } + void myFirstTest() + { QVERIFY(1 == 1); } + void mySecondTest() + { QVERIFY(1 != 2); } + void cleanupTestCase() + { qDebug("cleaning up test"); } +}; + diff --git a/tikzit/tikzit.pro b/tikzit/tikzit.pro index 0c8feb5..846fd73 100644 --- a/tikzit/tikzit.pro +++ b/tikzit/tikzit.pro @@ -7,11 +7,12 @@ include(flex.pri) include(bison.pri) -QT += core gui +QT += core gui testlib +CONFIG += testcase greaterThan(QT_MAJOR_VERSION, 4): QT += widgets -TARGET = tikzit +TARGET = tikzit TEMPLATE = app # The following define makes your compiler emit warnings if you use @@ -29,7 +30,7 @@ FLEXSOURCES = src/data/tikzlexer.l BISONSOURCES = src/data/tikzparser.y SOURCES += src/main.cpp\ - src/gui/mainwindow.cpp \ + src/gui/mainwindow.cpp \ src/gui/toolpalette.cpp \ src/gui/tikzscene.cpp \ src/data/graph.cpp \ @@ -38,7 +39,8 @@ SOURCES += src/main.cpp\ src/data/tikzgraphassembler.cpp \ src/data/graphelementdata.cpp \ src/data/graphelementproperty.cpp \ - src/gui/propertypalette.cpp + src/gui/propertypalette.cpp \ + src/test/testtest.cpp HEADERS += src/gui/mainwindow.h \ src/gui/toolpalette.h \ @@ -50,8 +52,6 @@ HEADERS += src/gui/mainwindow.h \ src/data/graphelementdata.h \ src/data/graphelementproperty.h \ src/gui/propertypalette.h \ - src/data/tikzlexer.lpp \ - src/data/tikzparser.ypp \ src/data/tikzparserdefs.h FORMS += src/gui/mainwindow.ui \ -- cgit v1.2.3 From df9f92b955ceb18a89b68dacdc3a2ab820a36123 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Sun, 22 Jan 2017 14:19:41 +0100 Subject: parsing --- tikzit/bison.pri | 2 +- tikzit/flex.pri | 2 +- tikzit/src/data/edge.cpp | 15 +++++ tikzit/src/data/edge.h | 14 ++++- tikzit/src/data/graph.cpp | 24 ++++++-- tikzit/src/data/graph.h | 7 ++- tikzit/src/data/tikzgraphassembler.cpp | 21 ++++++- tikzit/src/data/tikzgraphassembler.h | 2 + tikzit/src/data/tikzlexer.l | 21 ++++--- tikzit/src/data/tikzparser.y | 109 ++++++++++++++++++--------------- tikzit/src/data/tikzparserdefs.h | 3 +- tikzit/src/test/testmain.cpp | 19 ++++++ tikzit/src/test/testparser.cpp | 73 ++++++++++++++++++++++ tikzit/src/test/testparser.h | 17 +++++ tikzit/src/test/testtest.cpp | 19 ++---- tikzit/src/test/testtest.h | 17 +++++ tikzit/tikzit.pro | 27 +++++--- tikzit/tikzit.pro.user | 66 +++++++++++++++++++- 18 files changed, 363 insertions(+), 95 deletions(-) create mode 100644 tikzit/src/test/testmain.cpp create mode 100644 tikzit/src/test/testparser.cpp create mode 100644 tikzit/src/test/testparser.h create mode 100644 tikzit/src/test/testtest.h diff --git a/tikzit/bison.pri b/tikzit/bison.pri index b5d30da..3fcfc36 100644 --- a/tikzit/bison.pri +++ b/tikzit/bison.pri @@ -7,7 +7,7 @@ bison.variable_out = GENERATED_SOURCES silent:bison.commands = @echo Bison ${QMAKE_FILE_IN} && $$bison.commands QMAKE_EXTRA_COMPILERS += bison bison_header.input = BISONSOURCES -bison_header.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.parser.h +bison_header.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.parser.hpp bison_header.commands = bison -d -o ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.parser.cpp ${QMAKE_FILE_IN} bison_header.CONFIG += target_predeps no_link silent:bison_header.commands = @echo Bison ${QMAKE_FILE_IN} && $$bison.commands diff --git a/tikzit/flex.pri b/tikzit/flex.pri index 0cddec6..6a42c0f 100644 --- a/tikzit/flex.pri +++ b/tikzit/flex.pri @@ -1,7 +1,7 @@ flex.name = Flex ${QMAKE_FILE_IN} flex.input = FLEXSOURCES flex.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.lexer.cpp -flex.commands = flex -o ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.lexer.cpp ${QMAKE_FILE_IN} +flex.commands = flex --header-file -o ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.lexer.cpp ${QMAKE_FILE_IN} flex.CONFIG += target_predeps flex.variable_out = GENERATED_SOURCES silent:flex.commands = @echo Lex ${QMAKE_FILE_IN} && $$flex.commands diff --git a/tikzit/src/data/edge.cpp b/tikzit/src/data/edge.cpp index c8d1cfc..67e2061 100644 --- a/tikzit/src/data/edge.cpp +++ b/tikzit/src/data/edge.cpp @@ -1,14 +1,18 @@ #include "edge.h" +#include + Edge::Edge(Node *s, Node *t, QObject *parent) : QObject(parent), _source(s), _target(t) { _data = new GraphElementData(); + _edgeNode = 0; } Edge::~Edge() { delete _data; + delete _edgeNode; } Node *Edge::source() const @@ -52,4 +56,15 @@ void Edge::setTargetAnchor(const QString &targetAnchor) _targetAnchor = targetAnchor; } +Node *Edge::edgeNode() const +{ + return _edgeNode; +} + +void Edge::setEdgeNode(Node *edgeNode) +{ + if (_edgeNode != 0) delete _edgeNode; + _edgeNode = edgeNode; +} + diff --git a/tikzit/src/data/edge.h b/tikzit/src/data/edge.h index 5884b90..90e624e 100644 --- a/tikzit/src/data/edge.h +++ b/tikzit/src/data/edge.h @@ -26,16 +26,24 @@ public: QString targetAnchor() const; void setTargetAnchor(const QString &targetAnchor); + Node *edgeNode() const; + void setEdgeNode(Node *edgeNode); + signals: public slots: private: - Node *_source; - Node *_target; - GraphElementData *_data; QString _sourceAnchor; QString _targetAnchor; + + // owned + Node *_edgeNode; + GraphElementData *_data; + + // referenced + Node *_source; + Node *_target; }; #endif // EDGE_H diff --git a/tikzit/src/data/graph.cpp b/tikzit/src/data/graph.cpp index 8a995d2..9307d62 100644 --- a/tikzit/src/data/graph.cpp +++ b/tikzit/src/data/graph.cpp @@ -11,19 +11,25 @@ Graph::~Graph() } void Graph::removeNode(Node *n) { - nodes.removeAll(n); + _nodes.removeAll(n); inEdges.remove(n); outEdges.remove(n); } Edge *Graph::addEdge(Node *s, Node *t) { - + Edge *e = new Edge(s, t, this); + _edges << e; + outEdges.insert(s, e); + inEdges.insert(t, e); + return e; } void Graph::removeEdge(Edge *e) { - + _edges.removeAll(e); + outEdges.remove(e->source(), e); + inEdges.remove(e->target(), e); } GraphElementData *Graph::data() const @@ -37,9 +43,19 @@ void Graph::setData(GraphElementData *data) _data = data; } +const QVector &Graph::nodes() +{ + return _nodes; +} + +const QVector &Graph::edges() +{ + return _edges; +} + Node *Graph::addNode() { Node *n = new Node(this); - nodes << n; + _nodes << n; return n; } diff --git a/tikzit/src/data/graph.h b/tikzit/src/data/graph.h index 1f26486..8f466a2 100644 --- a/tikzit/src/data/graph.h +++ b/tikzit/src/data/graph.h @@ -23,13 +23,16 @@ public: GraphElementData *data() const; void setData(GraphElementData *data); + const QVector &nodes(); + const QVector &edges(); + signals: public slots: private: - QVector nodes; - QVector edges; + QVector _nodes; + QVector _edges; QMultiHash inEdges; QMultiHash outEdges; GraphElementData *_data; diff --git a/tikzit/src/data/tikzgraphassembler.cpp b/tikzit/src/data/tikzgraphassembler.cpp index d8e3963..c05a5c8 100644 --- a/tikzit/src/data/tikzgraphassembler.cpp +++ b/tikzit/src/data/tikzgraphassembler.cpp @@ -1,14 +1,31 @@ #include "tikzgraphassembler.h" +#include "tikzparserdefs.h" +#include "tikzparser.parser.hpp" +#include "tikzlexer.h" + +int yyparse(void *scanner); + + TikzGraphAssembler::TikzGraphAssembler(Graph *graph, QObject *parent) : - _graph(graph), QObject(parent) + QObject(parent), _graph(graph) { - + yylex_init(&scanner); + yyset_extra(this, scanner); } void TikzGraphAssembler::addNodeToMap(Node *n) { _nodeMap.insert(n->name(), n); } Node *TikzGraphAssembler::nodeWithName(QString name) { return _nodeMap[name]; } +bool TikzGraphAssembler::parse(const QString &tikz) +{ + yy_scan_string(tikz.toLatin1().data(), scanner); + int result = yyparse(scanner); + + if (result == 0) return true; + else return false; +} + Graph *TikzGraphAssembler::graph() const { return _graph; diff --git a/tikzit/src/data/tikzgraphassembler.h b/tikzit/src/data/tikzgraphassembler.h index 2ae42fd..79b89b0 100644 --- a/tikzit/src/data/tikzgraphassembler.h +++ b/tikzit/src/data/tikzgraphassembler.h @@ -14,6 +14,7 @@ public: explicit TikzGraphAssembler(Graph *graph, QObject *parent = 0); void addNodeToMap(Node *n); Node *nodeWithName(QString name); + bool parse(const QString &tikz); Graph *graph() const; @@ -24,6 +25,7 @@ public slots: private: QHash _nodeMap; Graph *_graph; + void *scanner; }; #endif // TIKZGRAPHASSEMBLER_H diff --git a/tikzit/src/data/tikzlexer.l b/tikzit/src/data/tikzlexer.l index adb6fef..8dd23c6 100644 --- a/tikzit/src/data/tikzlexer.l +++ b/tikzit/src/data/tikzlexer.l @@ -39,7 +39,6 @@ %option header-file="tikzlexer.h" %option extra-type="TikzGraphAssembler *" - %s props %s xcoord %s ycoord @@ -80,6 +79,7 @@ to { return TO; } BEGIN(xcoord); } {FLOAT} { + yylval->pt = new QPointF(); yylval->pt->setX(strtod(yytext,NULL)); BEGIN(ycoord); } @@ -103,7 +103,9 @@ to { return TO; } property names or values, but in practice this is unlikely and screws up our line counting */ [^=,\{\] \t\n]([^=,\{\]\n]*[^=,\{\] \t\n])? { - yylval->qstr= new QString(yytext); + char *str = (char*)malloc(sizeof(char)*yyleng + 1); + strncpy(str, yytext, yyleng + 1); + yylval->str = str; return PROPSTRING; } \] { @@ -121,7 +123,10 @@ to { return TO; } /* we assume node names (and anchor names) never contain newlines */ [^\.\{\)\n]+ { - yylval->qstr = new QString(yytext); + //qDebug() << "nodename: " << yytext << " size: " << strlen(yytext); + char *str = (char*)malloc(sizeof(char)*yyleng + 1); + strncpy(str, yytext, yyleng+1); + yylval->str = str; return REFSTRING; } \) { @@ -132,7 +137,7 @@ to { return TO; } \{ { std::stringstream buf; unsigned int brace_depth = 1; - unsigned int escape = 0; + unsigned int escape = 0; while (1) { char c = yyinput(yyscanner); // eof reached before closing brace @@ -158,9 +163,11 @@ to { return TO; } buf << c; } - - - yylval->qstr = new QString(QString::fromStdString(buf.str())); + char *str = (char*)malloc(sizeof(char) * yyleng + 1); + strncpy(str, buf.str().c_str(), yyleng + 1); + //str[len] = 0; + yylval->str = str; + //qDebug() << "got delim string: " << str; return DELIMITEDSTRING; } diff --git a/tikzit/src/data/tikzparser.y b/tikzit/src/data/tikzparser.y index 39d89c6..970f5b4 100644 --- a/tikzit/src/data/tikzparser.y +++ b/tikzit/src/data/tikzparser.y @@ -41,7 +41,7 @@ /* possible data types for semantic values */ %union { - QString *qstr; + char *str; GraphElementProperty *prop; GraphElementData *data; Node *node; @@ -65,6 +65,7 @@ void yyerror(YYLTYPE *yylloc, void *scanner, const char *str) { // TODO: implement reportError() //assembler->reportError(str, yylloc); + qDebug() << "parse error: " << str; } %} @@ -97,9 +98,9 @@ void yyerror(YYLTYPE *yylloc, void *scanner, const char *str) { %token FULLSTOP "." %token EQUALS "=" %token COORD "co-ordinate" -%token PROPSTRING "key/value string" -%token REFSTRING "string" -%token DELIMITEDSTRING "{-delimited string" +%token PROPSTRING "key/value string" +%token REFSTRING "string" +%token DELIMITEDSTRING "{-delimited string" %token UNKNOWN_BEGIN_CMD "unknown \\begin command" %token UNKNOWN_END_CMD "unknown \\end command" @@ -107,9 +108,9 @@ void yyerror(YYLTYPE *yylloc, void *scanner, const char *str) { %token UNKNOWN_STR "unknown string" %token UNCLOSED_DELIM_STR "unclosed {-delimited string" -%type nodename -%type optanchor -%type val +%type nodename +%type optanchor +%type val %type property %type extraproperties %type properties @@ -121,8 +122,8 @@ void yyerror(YYLTYPE *yylloc, void *scanner, const char *str) { %% tikzpicture: "\\begin{tikzpicture}" optproperties tikzcmds "\\end{tikzpicture}" - { - if ($2) { + { + if ($2) { assembler->graph()->setData($2); } }; @@ -141,27 +142,28 @@ properties: extraproperties property { $1->add(*$2); delete $2; - $$ = $1; + $$ = $1; }; extraproperties: extraproperties property "," { $1->add(*$2); delete $2; - $$ = $1; + $$ = $1; } | { $$ = new GraphElementData(); }; property: val "=" val { - GraphElementProperty *p = new GraphElementProperty(*$1,*$3); - delete $1, $3; + GraphElementProperty *p = new GraphElementProperty(QString($1),QString($3)); + free($1); + free($3); $$ = p; } | val { - GraphElementProperty *a = new GraphElementProperty(*$1); - delete $1; + GraphElementProperty *a = new GraphElementProperty(QString($1)); + free($1); $$ = a; }; val: PROPSTRING { $$ = $1; } | DELIMITEDSTRING { $$ = $1; }; @@ -173,18 +175,23 @@ node: "\\node" optproperties nodename "at" COORD DELIMITEDSTRING ";" if ($2) { node->setData($2); } - node->setName(*$3); + //qDebug() << "node name: " << $3; + node->setName(QString($3)); + node->setLabel(QString($6)); + free($3); + free($6); + node->setPoint(*$5); - node->setLabel(*$6); - delete $3, $5, $6; - assembler->addNodeToMap(node); + delete $5; + + assembler->addNodeToMap(node); }; optanchor: { $$ = 0; } | "." REFSTRING { $$ = $2; }; noderef: "(" REFSTRING optanchor ")" { - $$.node = assembler->nodeWithName(*$2); - delete $2; + $$.node = assembler->nodeWithName(QString($2)); + free($2); $$.anchor = $3; }; optnoderef: @@ -193,42 +200,44 @@ optnoderef: optedgenode: { $$ = 0; } | "node" optproperties DELIMITEDSTRING - { - // TODO: implement edge-nodes - // $$ = [Node node]; - // if ($2) - // [$$ setData:$2]; - // [$$ setLabel:$3]; + { + $$ = new Node(); + if ($2) + $$->setData($2); + $$->setLabel(QString($3)); + free($3); } edge: "\\draw" optproperties noderef "to" optedgenode optnoderef ";" { - Node *s; - Node *t; - Node *en; - - QString sa; - QString ta; - - // TODO: anchors and edge nodes + Node *s; + Node *t; - s = $3.node; - sa = *$3.anchor; - delete $3.anchor; - if ($6.node) { - t = $6.node; - ta = *$6.anchor; - delete $6.anchor; - } else { + s = $3.node; + + if ($6.node) { + t = $6.node; + } else { t = s; - ta = sa; - } + } - Edge *edge = assembler->graph()->addEdge(s, t); - if ($2) - edge->setData($2); + Edge *edge = assembler->graph()->addEdge(s, t); + if ($2) + edge->setData($2); + if ($5) + edge->setEdgeNode($5); + if ($3.anchor) { + edge->setSourceAnchor(QString($3.anchor)); + free($3.anchor); + } - edge->setSourceAnchor(sa); - edge->setTargetAnchor(ta); + if ($6.node) { + if ($6.anchor) { + edge->setTargetAnchor(QString($6.anchor)); + free($6.anchor); + } + } else { + edge->setTargetAnchor(edge->sourceAnchor()); + } }; ignoreprop: val | val "=" val; diff --git a/tikzit/src/data/tikzparserdefs.h b/tikzit/src/data/tikzparserdefs.h index 7ba5bc5..b6a904b 100644 --- a/tikzit/src/data/tikzparserdefs.h +++ b/tikzit/src/data/tikzparserdefs.h @@ -7,10 +7,11 @@ #include "tikzgraphassembler.h" #include +#include struct noderef { Node *node; - QString *anchor; + char *anchor; }; #endif // TIKZPARSERDEFS_H diff --git a/tikzit/src/test/testmain.cpp b/tikzit/src/test/testmain.cpp new file mode 100644 index 0000000..613be7a --- /dev/null +++ b/tikzit/src/test/testmain.cpp @@ -0,0 +1,19 @@ +#include "testtest.h" +#include "testparser.h" + +#include +#include +#include + +int main(int argc, char *argv[]) +{ + TestTest test; + TestParser parser; + int r = QTest::qExec(&test, argc, argv) | + QTest::qExec(&parser, argc, argv); + + if (r == 0) std::cout << "***************** All tests passed! *****************\n"; + else std::cout << "***************** Some tests failed. *****************\n"; + + return r; +} diff --git a/tikzit/src/test/testparser.cpp b/tikzit/src/test/testparser.cpp new file mode 100644 index 0000000..e978892 --- /dev/null +++ b/tikzit/src/test/testparser.cpp @@ -0,0 +1,73 @@ +#include "testparser.h" +#include "graph.h" +#include "tikzgraphassembler.h" + +#include +#include + +//void TestParser::initTestCase() +//{ + +//} + +//void TestParser::cleanupTestCase() +//{ + +//} + +void TestParser::parseEmptyGraph() +{ + Graph *g = new Graph(); + TikzGraphAssembler ga(g); + bool res = ga.parse("\\begin{tikzpicture}\n\\end{tikzpicture}"); + QVERIFY(res); + QVERIFY(g->nodes().size() == 0); + QVERIFY(g->edges().size() == 0); + delete g; +} + +void TestParser::parseNodeGraph() +{ + Graph *g = new Graph(); + TikzGraphAssembler ga(g); + bool res = ga.parse( + "\\begin{tikzpicture}\n" + " \\node (node0) at (1.1, -2.2) {};\n" + " \\node (node1) at (3, 4) {test};\n" + "\\end{tikzpicture}"); + QVERIFY(res); + QVERIFY(g->nodes().size() == 2); + QVERIFY(g->edges().size() == 0); + QVERIFY(g->nodes()[0]->name() == "node0"); + QVERIFY(g->nodes()[0]->label() == ""); + QVERIFY(g->nodes()[0]->point() == QPointF(1.1,-2.2)); + QVERIFY(g->nodes()[1]->name() == "node1"); + QVERIFY(g->nodes()[1]->label() == "test"); + QVERIFY(g->nodes()[1]->point() == QPointF(3,4)); + delete g; +} + +void TestParser::parseEdgeGraph() +{ + Graph *g = new Graph(); + TikzGraphAssembler ga(g); + bool res = ga.parse( + "\\begin{tikzpicture}\n" + " \\begin{pgfonlayer}{nodelayer}\n" + " \\node [style=none] (0) at (-1, -1) {};\n" + " \\node [style=none] (1) at (0, 1) {};\n" + " \\node [style=none] (2) at (1, -1) {};\n" + " \\end{pgfonlayer}\n" + " \\begin{pgfonlayer}{edgelayer}\n" + " \\draw [style=diredge] (1.center) to (2.center);\n" + " \\draw [style=diredge] (2.center) to (0.center);\n" + " \\draw [style=diredge] (0.center) to (1.center);\n" + " \\end{pgfonlayer}\n" + "\\end{tikzpicture}\n"); + QVERIFY(res); + QVERIFY(g->nodes().size() == 3); + QVERIFY(g->edges().size() == 3); + delete g; +} + + diff --git a/tikzit/src/test/testparser.h b/tikzit/src/test/testparser.h new file mode 100644 index 0000000..8e2e589 --- /dev/null +++ b/tikzit/src/test/testparser.h @@ -0,0 +1,17 @@ +#ifndef TESTPARSER_H +#define TESTPARSER_H + +#include + +class TestParser : public QObject +{ + Q_OBJECT +private slots: + //void initTestCase(); + void parseEmptyGraph(); + void parseNodeGraph(); + void parseEdgeGraph(); + //void cleanupTestCase(); +}; + +#endif // TESTPARSER_H diff --git a/tikzit/src/test/testtest.cpp b/tikzit/src/test/testtest.cpp index c6de586..59173c0 100644 --- a/tikzit/src/test/testtest.cpp +++ b/tikzit/src/test/testtest.cpp @@ -1,17 +1,10 @@ +#include "testtest.h" + #include #include -class TestTest: public QObject -{ - Q_OBJECT -private slots: - void initTestCase() - { qDebug("initialising test"); } - void myFirstTest() - { QVERIFY(1 == 1); } - void mySecondTest() - { QVERIFY(1 != 2); } - void cleanupTestCase() - { qDebug("cleaning up test"); } -}; +void TestTest::initTestCase() { qDebug("initialising test"); } +void TestTest::myFirstTest() { QVERIFY(1 == 1); } +void TestTest::mySecondTest() { QVERIFY(1 != 2); } +void TestTest::cleanupTestCase() { qDebug("cleaning up test"); } diff --git a/tikzit/src/test/testtest.h b/tikzit/src/test/testtest.h new file mode 100644 index 0000000..69a0bc8 --- /dev/null +++ b/tikzit/src/test/testtest.h @@ -0,0 +1,17 @@ +#ifndef TESTTEST_H +#define TESTTEST_H + +#include +#include + +class TestTest: public QObject +{ + Q_OBJECT +private slots: + void initTestCase(); + void myFirstTest(); + void mySecondTest(); + void cleanupTestCase(); +}; + +#endif // TESTTEST_H diff --git a/tikzit/tikzit.pro b/tikzit/tikzit.pro index 846fd73..3574bfd 100644 --- a/tikzit/tikzit.pro +++ b/tikzit/tikzit.pro @@ -4,10 +4,7 @@ # #------------------------------------------------- -include(flex.pri) -include(bison.pri) - -QT += core gui testlib +QT += core gui CONFIG += testcase greaterThan(QT_MAJOR_VERSION, 4): QT += widgets @@ -29,8 +26,10 @@ DEFINES += QT_DEPRECATED_WARNINGS FLEXSOURCES = src/data/tikzlexer.l BISONSOURCES = src/data/tikzparser.y -SOURCES += src/main.cpp\ - src/gui/mainwindow.cpp \ +include(flex.pri) +include(bison.pri) + +SOURCES += src/gui/mainwindow.cpp \ src/gui/toolpalette.cpp \ src/gui/tikzscene.cpp \ src/data/graph.cpp \ @@ -39,8 +38,7 @@ SOURCES += src/main.cpp\ src/data/tikzgraphassembler.cpp \ src/data/graphelementdata.cpp \ src/data/graphelementproperty.cpp \ - src/gui/propertypalette.cpp \ - src/test/testtest.cpp + src/gui/propertypalette.cpp HEADERS += src/gui/mainwindow.h \ src/gui/toolpalette.h \ @@ -63,3 +61,16 @@ DISTFILES += RESOURCES += \ tikzit.qrc + +test { + QT += testlib + TARGET = UnitTests + SOURCES -= src/main.cpp + HEADERS += src/test/testtest.h \ + src/test/testparser.h + SOURCES += src/test/testmain.cpp \ + src/test/testtest.cpp \ + src/test/testparser.cpp +} else { + SOURCES += src/main.cpp +} diff --git a/tikzit/tikzit.pro.user b/tikzit/tikzit.pro.user index 058f7ba..397eee1 100644 --- a/tikzit/tikzit.pro.user +++ b/tikzit/tikzit.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -62,7 +62,7 @@ Desktop Qt 5.7.1 clang 64bit Desktop Qt 5.7.1 clang 64bit qt.57.clang_64_kit - 0 + 3 0 0 @@ -245,7 +245,67 @@ 0 true - 3 + + /Users/alek/git/tikzit/build-tikzit-Desktop_Qt_5_7_1_clang_64bit-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + "CONFIG += test" + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Test + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + 4 0 -- cgit v1.2.3 From bd6c301c136ca7dd8f0bc89a90ad85e0f01be01b Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Sun, 22 Jan 2017 17:05:37 +0100 Subject: tikz output --- tikzit/src/data/edge.h | 3 +- tikzit/src/data/graph.cpp | 110 +++++++++++++++++++++++++++++++ tikzit/src/data/graph.h | 9 +++ tikzit/src/data/graphelementdata.cpp | 20 ++++++ tikzit/src/data/graphelementdata.h | 2 + tikzit/src/data/graphelementproperty.cpp | 14 ++++ tikzit/src/data/graphelementproperty.h | 2 + tikzit/src/data/node.h | 2 - tikzit/src/data/tikzparser.y | 5 +- tikzit/src/data/tikzparserdefs.h | 1 + tikzit/src/test/testmain.cpp | 5 +- tikzit/src/test/testparser.cpp | 71 ++++++++++++++++++-- tikzit/src/test/testparser.h | 4 +- tikzit/src/test/testtikzoutput.cpp | 40 +++++++++++ tikzit/src/test/testtikzoutput.h | 14 ++++ tikzit/tikzit.pro | 6 +- 16 files changed, 291 insertions(+), 17 deletions(-) create mode 100644 tikzit/src/test/testtikzoutput.cpp create mode 100644 tikzit/src/test/testtikzoutput.h diff --git a/tikzit/src/data/edge.h b/tikzit/src/data/edge.h index 90e624e..fba30a3 100644 --- a/tikzit/src/data/edge.h +++ b/tikzit/src/data/edge.h @@ -2,11 +2,10 @@ #define EDGE_H #include "graphelementdata.h" +#include "node.h" #include -class Node; - class Edge : public QObject { Q_OBJECT diff --git a/tikzit/src/data/graph.cpp b/tikzit/src/data/graph.cpp index 9307d62..2480507 100644 --- a/tikzit/src/data/graph.cpp +++ b/tikzit/src/data/graph.cpp @@ -1,8 +1,11 @@ #include "graph.h" +#include + Graph::Graph(QObject *parent) : QObject(parent) { _data = new GraphElementData(); + _bbox = QRectF(0,0,0,0); } Graph::~Graph() @@ -53,6 +56,113 @@ const QVector &Graph::edges() return _edges; } +QRectF Graph::bbox() const +{ + return _bbox; +} + +bool Graph::hasBbox() { + return !(_bbox == QRectF(0,0,0,0)); +} + +void Graph::clearBbox() { + _bbox = QRectF(0,0,0,0); +} + +QString Graph::tikz() +{ + QString str; + QTextStream code(&str); +// [NSMutableString +// stringWithFormat:@"\\begin{tikzpicture}%@\n", +// [[self data] tikzList]]; + +// if ([self hasBoundingBox]) { +// [code appendFormat:@"\t\\path [use as bounding box] (%@,%@) rectangle (%@,%@);\n", +// [NSNumber numberWithFloat:boundingBox.origin.x], +// [NSNumber numberWithFloat:boundingBox.origin.y], +// [NSNumber numberWithFloat:boundingBox.origin.x + boundingBox.size.width], +// [NSNumber numberWithFloat:boundingBox.origin.y + boundingBox.size.height]]; +// } + +// // NSArray *sortedNodeList = [[nodes allObjects] +// // sortedArrayUsingSelector:@selector(compareTo:)]; +// //NSMutableDictionary *nodeNames = [NSMutableDictionary dictionary]; + +// if ([nodes count] > 0) [code appendFormat:@"\t\\begin{pgfonlayer}{nodelayer}\n"]; + +// int i = 0; +// for (Node *n in nodes) { +// [n updateData]; +// [n setName:[NSString stringWithFormat:@"%d", i]]; +// [code appendFormat:@"\t\t\\node %@ (%d) at (%@, %@) {%@};\n", +// [[n data] tikzList], +// i, +// formatFloat([n point].x, 4), +// formatFloat([n point].y, 4), +// [n label] +// ]; +// i++; +// } + +// if ([nodes count] > 0) [code appendFormat:@"\t\\end{pgfonlayer}\n"]; +// if ([edges count] > 0) [code appendFormat:@"\t\\begin{pgfonlayer}{edgelayer}\n"]; + +// NSString *nodeStr; +// for (Edge *e in edges) { +// [e updateData]; + +// if ([e hasEdgeNode]) { +// nodeStr = [NSString stringWithFormat:@"node%@{%@} ", +// [[[e edgeNode] data] tikzList], +// [[e edgeNode] label] +// ]; +// } else { +// nodeStr = @""; +// } + +// NSString *edata = [[e data] tikzList]; + +// NSString *srcAnchor; +// NSString *tgtAnchor; + +// if ([[e sourceAnchor] isEqual:@""]) { +// srcAnchor = @""; +// } else { +// srcAnchor = [NSString stringWithFormat:@".%@", [e sourceAnchor]]; +// } + +// if ([[e targetAnchor] isEqual:@""]) { +// tgtAnchor = @""; +// } else { +// tgtAnchor = [NSString stringWithFormat:@".%@", [e targetAnchor]]; +// } + +// [code appendFormat:@"\t\t\\draw%@ (%@%@) to %@(%@%@);\n", +// ([edata isEqual:@""]) ? @"" : [NSString stringWithFormat:@" %@", edata], +// [[e source] name], +// srcAnchor, +// nodeStr, +// ([e source] == [e target]) ? @"" : [[e target] name], +// tgtAnchor +// ]; +// } + +// if ([edges count] > 0) [code appendFormat:@"\t\\end{pgfonlayer}\n"]; + +// [code appendString:@"\\end{tikzpicture}"]; + +// [graphLock unlock]; + +// return code; + return str; +} + +void Graph::setBbox(const QRectF &bbox) +{ + _bbox = bbox; +} + Node *Graph::addNode() { Node *n = new Node(this); _nodes << n; diff --git a/tikzit/src/data/graph.h b/tikzit/src/data/graph.h index 8f466a2..37bbff9 100644 --- a/tikzit/src/data/graph.h +++ b/tikzit/src/data/graph.h @@ -8,6 +8,8 @@ #include #include #include +#include +#include class Graph : public QObject { @@ -26,6 +28,12 @@ public: const QVector &nodes(); const QVector &edges(); + QRectF bbox() const; + void setBbox(const QRectF &bbox); + bool hasBbox(); + void clearBbox(); + + QString tikz(); signals: public slots: @@ -36,6 +44,7 @@ private: QMultiHash inEdges; QMultiHash outEdges; GraphElementData *_data; + QRectF _bbox; }; #endif // GRAPH_H diff --git a/tikzit/src/data/graphelementdata.cpp b/tikzit/src/data/graphelementdata.cpp index 8f81e31..ef16be2 100644 --- a/tikzit/src/data/graphelementdata.cpp +++ b/tikzit/src/data/graphelementdata.cpp @@ -1,6 +1,7 @@ #include "graphelementdata.h" #include +#include GraphElementData::GraphElementData(QObject *parent) : QAbstractItemModel(parent) { @@ -143,3 +144,22 @@ Qt::ItemFlags GraphElementData::flags(const QModelIndex &index) const //} +QString GraphElementData::tikz() { + if (_properties.length() == 0) return ""; + QString str; + QTextStream code(&str); + code << "["; + + GraphElementProperty p; + bool first = true; + foreach(p, _properties) { + if (!first) code << ", "; + code << p.tikz(); + first = false; + } + + code << "]"; + + code.flush(); + return str; +} diff --git a/tikzit/src/data/graphelementdata.h b/tikzit/src/data/graphelementdata.h index 82279cf..42f63ba 100644 --- a/tikzit/src/data/graphelementdata.h +++ b/tikzit/src/data/graphelementdata.h @@ -51,6 +51,8 @@ public: void operator <<(GraphElementProperty p); void add(GraphElementProperty p); + + QString tikz(); signals: public slots: diff --git a/tikzit/src/data/graphelementproperty.cpp b/tikzit/src/data/graphelementproperty.cpp index 9cc6b00..a50af58 100644 --- a/tikzit/src/data/graphelementproperty.cpp +++ b/tikzit/src/data/graphelementproperty.cpp @@ -1,5 +1,7 @@ #include "graphelementproperty.h" +#include + GraphElementProperty::GraphElementProperty (): _key(""), _value(""), _atom(false), _keyMatch(false) {} @@ -43,3 +45,15 @@ bool GraphElementProperty::operator==(const GraphElementProperty &p) { return matches(p); } + +QString GraphElementProperty::tikzEscape(QString str) +{ + QRegExp re("[0-9a-zA-Z<> \\-'.]*"); + if (re.exactMatch(str)) return str; + else return "{" + str + "}"; +} + +QString GraphElementProperty::tikz() { + if (_atom) return tikzEscape(_key); + return tikzEscape(_key) + "=" + tikzEscape(_value); +} diff --git a/tikzit/src/data/graphelementproperty.h b/tikzit/src/data/graphelementproperty.h index 4e8bbd1..01b6e5a 100644 --- a/tikzit/src/data/graphelementproperty.h +++ b/tikzit/src/data/graphelementproperty.h @@ -24,6 +24,8 @@ public: bool matches(const GraphElementProperty &p); bool operator==(const GraphElementProperty &p); + static QString tikzEscape(QString str); + QString tikz(); signals: public slots: diff --git a/tikzit/src/data/node.h b/tikzit/src/data/node.h index 6205732..e72e9a7 100644 --- a/tikzit/src/data/node.h +++ b/tikzit/src/data/node.h @@ -23,8 +23,6 @@ public: QString label() const; void setLabel(const QString &label); - - GraphElementData *data() const; void setData(GraphElementData *data); diff --git a/tikzit/src/data/tikzparser.y b/tikzit/src/data/tikzparser.y index 970f5b4..b5bca35 100644 --- a/tikzit/src/data/tikzparser.y +++ b/tikzit/src/data/tikzparser.y @@ -246,8 +246,9 @@ optignoreprops: "[" ignoreprops "]"; boundingbox: "\\path" optignoreprops COORD "rectangle" COORD ";" { - // TODO: bounding box - //[[assembler graph] setBoundingBox:NSRectAroundPoints($3, $5)]; + assembler->graph()->setBbox(QRectF(*$3, *$5)); + delete $3; + delete $5; }; /* vi:ft=yacc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit/src/data/tikzparserdefs.h b/tikzit/src/data/tikzparserdefs.h index b6a904b..9d4bfe8 100644 --- a/tikzit/src/data/tikzparserdefs.h +++ b/tikzit/src/data/tikzparserdefs.h @@ -7,6 +7,7 @@ #include "tikzgraphassembler.h" #include +#include #include struct noderef { diff --git a/tikzit/src/test/testmain.cpp b/tikzit/src/test/testmain.cpp index 613be7a..56491ed 100644 --- a/tikzit/src/test/testmain.cpp +++ b/tikzit/src/test/testmain.cpp @@ -1,5 +1,6 @@ #include "testtest.h" #include "testparser.h" +#include "testtikzoutput.h" #include #include @@ -9,8 +10,10 @@ int main(int argc, char *argv[]) { TestTest test; TestParser parser; + TestTikzOutput tikzOutput; int r = QTest::qExec(&test, argc, argv) | - QTest::qExec(&parser, argc, argv); + QTest::qExec(&parser, argc, argv) | + QTest::qExec(&tikzOutput, argc, argv); if (r == 0) std::cout << "***************** All tests passed! *****************\n"; else std::cout << "***************** Some tests failed. *****************\n"; diff --git a/tikzit/src/test/testparser.cpp b/tikzit/src/test/testparser.cpp index e978892..bbc90cf 100644 --- a/tikzit/src/test/testparser.cpp +++ b/tikzit/src/test/testparser.cpp @@ -54,19 +54,78 @@ void TestParser::parseEdgeGraph() bool res = ga.parse( "\\begin{tikzpicture}\n" " \\begin{pgfonlayer}{nodelayer}\n" - " \\node [style=none] (0) at (-1, -1) {};\n" - " \\node [style=none] (1) at (0, 1) {};\n" - " \\node [style=none] (2) at (1, -1) {};\n" + " \\node [style=x, {foo++}] (0) at (-1, -1) {};\n" + " \\node [style=y] (1) at (0, 1) {};\n" + " \\node [style=z] (2) at (1, -1) {};\n" " \\end{pgfonlayer}\n" " \\begin{pgfonlayer}{edgelayer}\n" - " \\draw [style=diredge] (1.center) to (2.center);\n" - " \\draw [style=diredge] (2.center) to (0.center);\n" - " \\draw [style=diredge] (0.center) to (1.center);\n" + " \\draw [style=a] (1.center) to (2);\n" + " \\draw [style=b, foo] (2) to (0.west);\n" + " \\draw [style=c] (0) to (1);\n" " \\end{pgfonlayer}\n" "\\end{tikzpicture}\n"); QVERIFY(res); QVERIFY(g->nodes().size() == 3); QVERIFY(g->edges().size() == 3); + QVERIFY(g->nodes()[0]->data()->atom("foo++")); + QVERIFY(g->edges()[0]->data()->property("style") == "a"); + QVERIFY(!g->edges()[0]->data()->atom("foo")); + QVERIFY(g->edges()[1]->data()->property("style") == "b"); + QVERIFY(g->edges()[1]->data()->atom("foo")); + QVERIFY(g->edges()[2]->data()->property("style") == "c"); + Node *en = g->edges()[0]->edgeNode(); + QVERIFY(en == 0); + delete g; +} + +void TestParser::parseEdgeNode() +{ + Graph *g = new Graph(); + TikzGraphAssembler ga(g); + bool res = ga.parse( + "\\begin{tikzpicture}\n" + " \\begin{pgfonlayer}{nodelayer}\n" + " \\node [style=none] (0) at (-1, 0) {};\n" + " \\node [style=none] (1) at (1, 0) {};\n" + " \\end{pgfonlayer}\n" + " \\begin{pgfonlayer}{edgelayer}\n" + " \\draw [style=diredge] (0.center) to node[foo, bar=baz baz]{test} (1.center);\n" + " \\end{pgfonlayer}\n" + "\\end{tikzpicture}\n"); + QVERIFY(res); + QVERIFY(g->nodes().size() == 2); + QVERIFY(g->edges().size() == 1); + Node *en = g->edges()[0]->edgeNode(); + QVERIFY(en != 0); + QVERIFY(en->label() == "test"); + QVERIFY(en->data()->atom("foo")); + QVERIFY(en->data()->property("bar") == "baz baz"); + delete g; +} + +void TestParser::parseBbox() +{ + Graph *g = new Graph(); + TikzGraphAssembler ga(g); + bool res = ga.parse( + "\\begin{tikzpicture}\n" + " \\path [use as bounding box] (-1.5,-1.5) rectangle (1.5,1.5);\n" + " \\begin{pgfonlayer}{nodelayer}\n" + " \\node [style=white dot] (0) at (-1, -1) {};\n" + " \\node [style=white dot] (1) at (0, 1) {};\n" + " \\node [style=white dot] (2) at (1, -1) {};\n" + " \\end{pgfonlayer}\n" + " \\begin{pgfonlayer}{edgelayer}\n" + " \\draw [style=diredge] (1) to (2);\n" + " \\draw [style=diredge] (2) to (0);\n" + " \\draw [style=diredge] (0) to (1);\n" + " \\end{pgfonlayer}\n" + "\\end{tikzpicture}\n"); + QVERIFY(g->nodes().size() == 3); + QVERIFY(g->edges().size() == 3); + QVERIFY(g->hasBbox()); + QVERIFY(g->bbox() == QRectF(QPointF(-1.5,-1.5), QPointF(1.5,1.5))); + delete g; } diff --git a/tikzit/src/test/testparser.h b/tikzit/src/test/testparser.h index 8e2e589..69dc965 100644 --- a/tikzit/src/test/testparser.h +++ b/tikzit/src/test/testparser.h @@ -7,11 +7,11 @@ class TestParser : public QObject { Q_OBJECT private slots: - //void initTestCase(); void parseEmptyGraph(); void parseNodeGraph(); void parseEdgeGraph(); - //void cleanupTestCase(); + void parseEdgeNode(); + void parseBbox(); }; #endif // TESTPARSER_H diff --git a/tikzit/src/test/testtikzoutput.cpp b/tikzit/src/test/testtikzoutput.cpp new file mode 100644 index 0000000..8b14bd3 --- /dev/null +++ b/tikzit/src/test/testtikzoutput.cpp @@ -0,0 +1,40 @@ +#include "testtikzoutput.h" +#include "graphelementproperty.h" +#include "graphelementdata.h" + +#include + +void TestTikzOutput::escape() +{ + QVERIFY(GraphElementProperty::tikzEscape("foo") == "foo"); + QVERIFY(GraphElementProperty::tikzEscape("foo'") == "foo'"); + QVERIFY(GraphElementProperty::tikzEscape("foo bar") == "foo bar"); + QVERIFY(GraphElementProperty::tikzEscape("foo.bar") == "foo.bar"); + QVERIFY(GraphElementProperty::tikzEscape("foo-bar") == "foo-bar"); + QVERIFY(GraphElementProperty::tikzEscape("foo >") == "foo >"); + QVERIFY(GraphElementProperty::tikzEscape("foo <") == "foo <"); + QVERIFY(GraphElementProperty::tikzEscape("foo+") == "{foo+}"); + QVERIFY(GraphElementProperty::tikzEscape("foo{bar}") == "{foo{bar}}"); +} + +void TestTikzOutput::data() +{ + GraphElementData d; + QVERIFY(d.tikz() == ""); + d.setAtom("foo"); + QVERIFY(d.tikz() == "[foo]"); + d.setAtom("bar"); + QVERIFY(d.tikz() == "[foo, bar]"); + d.setProperty("foo","bar"); + QVERIFY(d.tikz() == "[foo, bar, foo=bar]"); + d.setAtom("foo+"); + QVERIFY(d.tikz() == "[foo, bar, foo=bar, {foo+}]"); + d.unsetAtom("foo"); + QVERIFY(d.tikz() == "[bar, foo=bar, {foo+}]"); + d.unsetProperty("foo"); + QVERIFY(d.tikz() == "[bar, {foo+}]"); + d.unsetAtom("foo+"); + QVERIFY(d.tikz() == "[bar]"); + d.unsetAtom("bar"); + QVERIFY(d.tikz() == ""); +} diff --git a/tikzit/src/test/testtikzoutput.h b/tikzit/src/test/testtikzoutput.h new file mode 100644 index 0000000..24c594e --- /dev/null +++ b/tikzit/src/test/testtikzoutput.h @@ -0,0 +1,14 @@ +#ifndef TESTTIKZOUTPUT_H +#define TESTTIKZOUTPUT_H + +#include + +class TestTikzOutput : public QObject +{ + Q_OBJECT +private slots: + void escape(); + void data(); +}; + +#endif // TESTTIKZOUTPUT_H diff --git a/tikzit/tikzit.pro b/tikzit/tikzit.pro index 3574bfd..2e7d463 100644 --- a/tikzit/tikzit.pro +++ b/tikzit/tikzit.pro @@ -67,10 +67,12 @@ test { TARGET = UnitTests SOURCES -= src/main.cpp HEADERS += src/test/testtest.h \ - src/test/testparser.h + src/test/testparser.h \ + src/test/testtikzoutput.h SOURCES += src/test/testmain.cpp \ src/test/testtest.cpp \ - src/test/testparser.cpp + src/test/testparser.cpp \ + src/test/testtikzoutput.cpp } else { SOURCES += src/main.cpp } -- cgit v1.2.3 From b392859bb192a2e02aec09f2eacf5ecdf44fdfe4 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Sun, 22 Jan 2017 17:59:44 +0100 Subject: tikz output done --- tikzit/src/data/edge.cpp | 5 ++ tikzit/src/data/edge.h | 1 + tikzit/src/data/graph.cpp | 151 ++++++++++++++++------------------- tikzit/src/data/graphelementdata.cpp | 5 ++ tikzit/src/data/graphelementdata.h | 1 + tikzit/src/test/testtikzoutput.cpp | 57 +++++++++++++ tikzit/src/test/testtikzoutput.h | 3 + 7 files changed, 141 insertions(+), 82 deletions(-) diff --git a/tikzit/src/data/edge.cpp b/tikzit/src/data/edge.cpp index 67e2061..9068a1c 100644 --- a/tikzit/src/data/edge.cpp +++ b/tikzit/src/data/edge.cpp @@ -67,4 +67,9 @@ void Edge::setEdgeNode(Node *edgeNode) _edgeNode = edgeNode; } +bool Edge::hasEdgeNode() +{ + return _edgeNode != 0; +} + diff --git a/tikzit/src/data/edge.h b/tikzit/src/data/edge.h index fba30a3..9655e98 100644 --- a/tikzit/src/data/edge.h +++ b/tikzit/src/data/edge.h @@ -27,6 +27,7 @@ public: Node *edgeNode() const; void setEdgeNode(Node *edgeNode); + bool hasEdgeNode(); signals: diff --git a/tikzit/src/data/graph.cpp b/tikzit/src/data/graph.cpp index 2480507..1985f8a 100644 --- a/tikzit/src/data/graph.cpp +++ b/tikzit/src/data/graph.cpp @@ -73,88 +73,75 @@ QString Graph::tikz() { QString str; QTextStream code(&str); -// [NSMutableString -// stringWithFormat:@"\\begin{tikzpicture}%@\n", -// [[self data] tikzList]]; - -// if ([self hasBoundingBox]) { -// [code appendFormat:@"\t\\path [use as bounding box] (%@,%@) rectangle (%@,%@);\n", -// [NSNumber numberWithFloat:boundingBox.origin.x], -// [NSNumber numberWithFloat:boundingBox.origin.y], -// [NSNumber numberWithFloat:boundingBox.origin.x + boundingBox.size.width], -// [NSNumber numberWithFloat:boundingBox.origin.y + boundingBox.size.height]]; -// } - -// // NSArray *sortedNodeList = [[nodes allObjects] -// // sortedArrayUsingSelector:@selector(compareTo:)]; -// //NSMutableDictionary *nodeNames = [NSMutableDictionary dictionary]; - -// if ([nodes count] > 0) [code appendFormat:@"\t\\begin{pgfonlayer}{nodelayer}\n"]; - -// int i = 0; -// for (Node *n in nodes) { -// [n updateData]; -// [n setName:[NSString stringWithFormat:@"%d", i]]; -// [code appendFormat:@"\t\t\\node %@ (%d) at (%@, %@) {%@};\n", -// [[n data] tikzList], -// i, -// formatFloat([n point].x, 4), -// formatFloat([n point].y, 4), -// [n label] -// ]; -// i++; -// } - -// if ([nodes count] > 0) [code appendFormat:@"\t\\end{pgfonlayer}\n"]; -// if ([edges count] > 0) [code appendFormat:@"\t\\begin{pgfonlayer}{edgelayer}\n"]; - -// NSString *nodeStr; -// for (Edge *e in edges) { -// [e updateData]; - -// if ([e hasEdgeNode]) { -// nodeStr = [NSString stringWithFormat:@"node%@{%@} ", -// [[[e edgeNode] data] tikzList], -// [[e edgeNode] label] -// ]; -// } else { -// nodeStr = @""; -// } - -// NSString *edata = [[e data] tikzList]; - -// NSString *srcAnchor; -// NSString *tgtAnchor; - -// if ([[e sourceAnchor] isEqual:@""]) { -// srcAnchor = @""; -// } else { -// srcAnchor = [NSString stringWithFormat:@".%@", [e sourceAnchor]]; -// } - -// if ([[e targetAnchor] isEqual:@""]) { -// tgtAnchor = @""; -// } else { -// tgtAnchor = [NSString stringWithFormat:@".%@", [e targetAnchor]]; -// } - -// [code appendFormat:@"\t\t\\draw%@ (%@%@) to %@(%@%@);\n", -// ([edata isEqual:@""]) ? @"" : [NSString stringWithFormat:@" %@", edata], -// [[e source] name], -// srcAnchor, -// nodeStr, -// ([e source] == [e target]) ? @"" : [[e target] name], -// tgtAnchor -// ]; -// } - -// if ([edges count] > 0) [code appendFormat:@"\t\\end{pgfonlayer}\n"]; - -// [code appendString:@"\\end{tikzpicture}"]; - -// [graphLock unlock]; - -// return code; + + code << "\\begin{tikzpicture}" << _data->tikz() << "\n"; + if (hasBbox()) { + code << "\t\\path [use as bounding box] (" + << _bbox.topLeft().x() << "," << _bbox.topLeft().y() + << ") rectangle (" + << _bbox.bottomRight().x() << "," << _bbox.bottomRight().y() + << ");\n"; + } + + if (!_nodes.isEmpty()) + code << "\t\\begin{pgfonlayer}{nodelayer}\n"; + + Node *n; + foreach (n, _nodes) { + code << "\t\t\\node "; + + if (!n->data()->isEmpty()) + code << n->data()->tikz() << " "; + + code << "(" << n->name() << ") at (" + << n->point().x() << ", " << n->point().y() + << ") {" << n->label() << "};\n"; + } + + if (!_nodes.isEmpty()) + code << "\t\\end{pgfonlayer}\n"; + + if (!_edges.isEmpty()) + code << "\t\\begin{pgfonlayer}{edgelayer}\n"; + + + Edge *e; + foreach (e, _edges) { + code << "\t\t\\draw "; + + if (!e->data()->isEmpty()) + code << e->data()->tikz() << " "; + + code << "(" << e->source()->name(); + if (e->sourceAnchor() != "") + code << "." << e->sourceAnchor(); + code << ") to "; + + if (e->hasEdgeNode()) { + code << "node "; + if (!e->edgeNode()->data()->isEmpty()) + code << e->edgeNode()->data()->tikz() << " "; + code << "{" << e->edgeNode()->label() << "} "; + } + + if (e->source() == e->target()) { + code << "()"; + } else { + code << "(" << e->target()->name(); + if (e->targetAnchor() != "") + code << "." << e->targetAnchor(); + code << ")"; + } + + code << ";\n"; + } + + if (!_edges.isEmpty()) + code << "\t\\end{pgfonlayer}\n"; + + code << "\\end{tikzpicture}\n"; + + code.flush(); return str; } diff --git a/tikzit/src/data/graphelementdata.cpp b/tikzit/src/data/graphelementdata.cpp index ef16be2..3ce72c7 100644 --- a/tikzit/src/data/graphelementdata.cpp +++ b/tikzit/src/data/graphelementdata.cpp @@ -163,3 +163,8 @@ QString GraphElementData::tikz() { code.flush(); return str; } + +bool GraphElementData::isEmpty() +{ + return _properties.isEmpty(); +} diff --git a/tikzit/src/data/graphelementdata.h b/tikzit/src/data/graphelementdata.h index 42f63ba..1139a00 100644 --- a/tikzit/src/data/graphelementdata.h +++ b/tikzit/src/data/graphelementdata.h @@ -53,6 +53,7 @@ public: void add(GraphElementProperty p); QString tikz(); + bool isEmpty(); signals: public slots: diff --git a/tikzit/src/test/testtikzoutput.cpp b/tikzit/src/test/testtikzoutput.cpp index 8b14bd3..f086786 100644 --- a/tikzit/src/test/testtikzoutput.cpp +++ b/tikzit/src/test/testtikzoutput.cpp @@ -1,8 +1,12 @@ #include "testtikzoutput.h" #include "graphelementproperty.h" #include "graphelementdata.h" +#include "graph.h" +#include "tikzgraphassembler.h" #include +#include +#include void TestTikzOutput::escape() { @@ -38,3 +42,56 @@ void TestTikzOutput::data() d.unsetAtom("bar"); QVERIFY(d.tikz() == ""); } + +void TestTikzOutput::graphEmpty() +{ + Graph *g = new Graph(); + + QString tikz = + "\\begin{tikzpicture}\n" + "\\end{tikzpicture}\n"; + QVERIFY(g->tikz() == tikz); + + delete g; +} + +void TestTikzOutput::graphFromTikz() +{ + Graph *g = new Graph(); + TikzGraphAssembler ga(g); + + QString tikz = + "\\begin{tikzpicture}\n" + "\t\\path [use as bounding box] (-1.5,-1.5) rectangle (1.5,1.5);\n" + "\t\\begin{pgfonlayer}{nodelayer}\n" + "\t\t\\node [style=white dot] (0) at (-1, -1) {};\n" + "\t\t\\node [style=white dot] (1) at (0, 1) {};\n" + "\t\t\\node [style=white dot] (2) at (1, -1) {};\n" + "\t\\end{pgfonlayer}\n" + "\t\\begin{pgfonlayer}{edgelayer}\n" + "\t\t\\draw [style=diredge] (1) to (2);\n" + "\t\t\\draw [style=diredge] (2.center) to (0);\n" + "\t\t\\draw [style=diredge] (0) to ();\n" + "\t\\end{pgfonlayer}\n" + "\\end{tikzpicture}\n"; + bool res = ga.parse(tikz); + QVERIFY2(res, "parsed successfully"); + QVERIFY2(g->tikz() == tikz, "produced matching tikz"); + + delete g; +} + +void TestTikzOutput::graphBbox() +{ + Graph *g = new Graph(); + g->setBbox(QRectF(QPointF(-0.75, -0.5), QPointF(0.25, 1))); + + QString tikz = + "\\begin{tikzpicture}\n" + "\t\\path [use as bounding box] (-0.75,-0.5) rectangle (0.25,1);\n" + "\\end{tikzpicture}\n"; + QVERIFY(g->tikz() == tikz); + + + delete g; +} diff --git a/tikzit/src/test/testtikzoutput.h b/tikzit/src/test/testtikzoutput.h index 24c594e..dff1db1 100644 --- a/tikzit/src/test/testtikzoutput.h +++ b/tikzit/src/test/testtikzoutput.h @@ -9,6 +9,9 @@ class TestTikzOutput : public QObject private slots: void escape(); void data(); + void graphBbox(); + void graphEmpty(); + void graphFromTikz(); }; #endif // TESTTIKZOUTPUT_H -- cgit v1.2.3 From e1756ba69dd626073e22fd0a4f4c5fda42c88829 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Fri, 3 Feb 2017 16:11:29 +0100 Subject: drawing grid --- tikzit/src/gui/mainwindow.cpp | 89 ++++++++++++++++-- tikzit/src/gui/mainwindow.h | 12 +++ tikzit/src/gui/mainwindow.ui | 184 ++++++++++++++++++++++++++++++++++++- tikzit/src/gui/nodeitem.cpp | 17 ++++ tikzit/src/gui/nodeitem.h | 18 ++++ tikzit/src/gui/propertypalette.cpp | 10 +- tikzit/src/gui/tikzscene.cpp | 78 +++++++++++++++- tikzit/src/gui/tikzscene.h | 21 ++++- tikzit/src/gui/tikzview.cpp | 20 ++++ tikzit/src/gui/tikzview.h | 22 +++++ tikzit/src/gui/toolpalette.cpp | 2 + tikzit/src/main.cpp | 6 +- tikzit/tikzit.pro | 8 +- tikzit/tikzit.pro.user | 4 +- 14 files changed, 472 insertions(+), 19 deletions(-) create mode 100644 tikzit/src/gui/nodeitem.cpp create mode 100644 tikzit/src/gui/nodeitem.h create mode 100644 tikzit/src/gui/tikzview.cpp create mode 100644 tikzit/src/gui/tikzview.h diff --git a/tikzit/src/gui/mainwindow.cpp b/tikzit/src/gui/mainwindow.cpp index ef73a20..f7357ec 100644 --- a/tikzit/src/gui/mainwindow.cpp +++ b/tikzit/src/gui/mainwindow.cpp @@ -1,23 +1,100 @@ #include "mainwindow.h" #include "ui_mainwindow.h" +#include "tikzgraphassembler.h" #include +#include +#include +#include +#include +#include + +int MainWindow::_numWindows = 0; MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) { + _numWindows++; ui->setupUi(this); setAttribute(Qt::WA_DeleteOnClose); - tikzScene = new TikzScene(this); + _graph = new Graph(this); + tikzScene = new TikzScene(_graph, this); ui->tikzView->setScene(tikzScene); - //tikzView = new QGraphicsView(tikzScene); - //setCentralWidget(tikzView); - //resize(700, 500); - // badger? + _fileName = ""; + _pristine = true; + + // initially, the source view should be collapsed + QList sz = ui->splitter->sizes(); + sz[0] = sz[0] + sz[1]; + sz[1] = 0; + ui->splitter->setSizes(sz); } MainWindow::~MainWindow() { - qDebug() << "~MainWindow"; + //qDebug() << "~MainWindow"; +} + +void MainWindow::open(QString fileName) +{ + _fileName = fileName; + _pristine = false; + QFile file(fileName); + QFileInfo fi(file); + QSettings settings("tikzit", "tikzit"); + settings.setValue("previous-file-path", fi.absolutePath()); + + if (!file.open(QIODevice::ReadOnly)) { + QMessageBox::critical(this, tr("Error"), + tr("Could not open file")); + return; + } + + QTextStream in(&file); + QString tikz = in.readAll(); + file.close(); + + ui->tikzSource->setText(tikz); + + Graph *newGraph = new Graph(this); + TikzGraphAssembler ass(newGraph); + if (ass.parse(tikz)) { + statusBar()->showMessage("TiKZ parsed successfully", 2000); + tikzScene->setGraph(newGraph); + delete _graph; + _graph = newGraph; + } else { + statusBar()->showMessage("Cannot read TiKZ source"); + delete newGraph; + } + } + +void MainWindow::closeEvent(QCloseEvent *event) +{ + //qDebug() << "got close event"; + QMainWindow::closeEvent(event); +} + +void MainWindow::on_actionOpen_triggered() +{ + QSettings settings("tikzit", "tikzit"); + QString fileName = QFileDialog::getOpenFileName( + this, + tr("Open File"), + settings.value("previous-file-path").toString(), + tr("TiKZ Files (*.tikz)")); + + if (!fileName.isEmpty()) { + if (_pristine) { + open(fileName); + } else { + MainWindow *w = new MainWindow(); + w->show(); + w->open(fileName); + } + } +} + + diff --git a/tikzit/src/gui/mainwindow.h b/tikzit/src/gui/mainwindow.h index d33a89d..f48fd64 100644 --- a/tikzit/src/gui/mainwindow.h +++ b/tikzit/src/gui/mainwindow.h @@ -2,6 +2,7 @@ #define MAINWINDOW_H #include "tikzscene.h" +#include "graph.h" #include #include @@ -17,9 +18,20 @@ class MainWindow : public QMainWindow public: explicit MainWindow(QWidget *parent = 0); ~MainWindow(); + + void open(QString fileName); + +protected: + void closeEvent(QCloseEvent *event); private: TikzScene *tikzScene; Ui::MainWindow *ui; + Graph *_graph; + QString _fileName; + bool _pristine; + static int _numWindows; +public slots: + void on_actionOpen_triggered(); }; #endif // MAINWINDOW_H diff --git a/tikzit/src/gui/mainwindow.ui b/tikzit/src/gui/mainwindow.ui index 6439ee8..a2655e6 100644 --- a/tikzit/src/gui/mainwindow.ui +++ b/tikzit/src/gui/mainwindow.ui @@ -32,14 +32,26 @@ Qt::Vertical - + + + + Courier New + 10 + + + + QTextEdit::NoWrap + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'.SF NS Text'; font-size:13pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Stuff written here</p></body></html> +</style></head><body style=" font-family:'Courier New'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'.SF NS Text'; font-size:13pt;"><br /></p></body></html> + + + 20 @@ -60,8 +72,44 @@ p, li { white-space: pre-wrap; } File + + + + + + + + + Edit + + + + + + + + + + + + + + + Tikz + + + + + + View + + + + + + @@ -69,8 +117,136 @@ p, li { white-space: pre-wrap; } New... + + + Open... + + + + + Close + + + + + Save + + + + + Save As... + + + + + Undo + + + + + Redo + + + + + Cut + + + + + Copy + + + + + Paste + + + + + Delete + + + + + Select All + + + + + Deselect All + + + + + Parse + + + Ctrl+T + + + + + Zoom In + + + Ctrl+= + + + + + Zoom Out + + + Ctrl+- + + + + + TikzView + QGraphicsView +
tikzview.h
+ + zoomIn() + zoomOut() + + + - + + + actionZoom_In + triggered() + tikzView + zoomIn() + + + -1 + -1 + + + 237 + 103 + + + + + actionZoom_Out + triggered() + tikzView + zoomOut() + + + -1 + -1 + + + 237 + 103 + + + + diff --git a/tikzit/src/gui/nodeitem.cpp b/tikzit/src/gui/nodeitem.cpp new file mode 100644 index 0000000..e817d98 --- /dev/null +++ b/tikzit/src/gui/nodeitem.cpp @@ -0,0 +1,17 @@ +#include "nodeitem.h" + +#include +#include + +NodeItem::NodeItem(Node *node) +{ + _node = node; + setPen(QPen(Qt::black)); + setBrush(QBrush(Qt::white)); + syncPos(); +} + +void NodeItem::syncPos() +{ + setRect(80*_node->point().x() - 8, -80*_node->point().y() - 8, 16, 16); +} diff --git a/tikzit/src/gui/nodeitem.h b/tikzit/src/gui/nodeitem.h new file mode 100644 index 0000000..60b2c05 --- /dev/null +++ b/tikzit/src/gui/nodeitem.h @@ -0,0 +1,18 @@ +#ifndef NODEITEM_H +#define NODEITEM_H + +#include "node.h" + +#include +#include + +class NodeItem : public QGraphicsEllipseItem +{ +public: + NodeItem(Node *node); + void syncPos(); +private: + Node *_node; +}; + +#endif // NODEITEM_H diff --git a/tikzit/src/gui/propertypalette.cpp b/tikzit/src/gui/propertypalette.cpp index e3eec17..ea0e90e 100644 --- a/tikzit/src/gui/propertypalette.cpp +++ b/tikzit/src/gui/propertypalette.cpp @@ -11,6 +11,11 @@ PropertyPalette::PropertyPalette(QWidget *parent) : QDockWidget(parent), ui(new Ui::PropertyPalette) { + setWindowFlags(Qt::Window + | Qt::WindowStaysOnTopHint + | Qt::CustomizeWindowHint + | Qt::WindowTitleHint); + //setFocusPolicy(Qt::NoFocus); ui->setupUi(this); GraphElementData *d = new GraphElementData(); d->setProperty("key 1", "value 1"); @@ -22,7 +27,10 @@ PropertyPalette::PropertyPalette(QWidget *parent) : ui->treeView->setModel(d); QSettings settings("tikzit", "tikzit"); - restoreGeometry(settings.value("property-palette-geometry").toByteArray()); + QVariant geom = settings.value("property-palette-geometry"); + if (geom != QVariant()) { + restoreGeometry(geom.toByteArray()); + } } PropertyPalette::~PropertyPalette() diff --git a/tikzit/src/gui/tikzscene.cpp b/tikzit/src/gui/tikzscene.cpp index 60939dd..11d5a72 100644 --- a/tikzit/src/gui/tikzscene.cpp +++ b/tikzit/src/gui/tikzscene.cpp @@ -1,6 +1,82 @@ #include "tikzscene.h" -TikzScene::TikzScene(QObject *parent) : QGraphicsScene(parent) +#include +#include + +TikzScene::TikzScene(Graph *graph, QObject *parent) : + QGraphicsScene(parent), _graph(graph) +{ + +} + +Graph *TikzScene::graph() const +{ + return _graph; +} + +void TikzScene::setGraph(Graph *graph) +{ + _graph = graph; + graphReplaced(); +} + +void TikzScene::graphReplaced() { + foreach (NodeItem *ni, nodeItems) { + removeItem(ni); + delete ni; + } + nodeItems.clear(); + + QPen blackPen(Qt::black); + QBrush redBrush(Qt::red); + + foreach (Node *n, _graph->nodes()) { + NodeItem *ni = new NodeItem(n); + nodeItems << ni; + addItem(ni); + } +} + +void TikzScene::drawBackground(QPainter *painter, const QRectF &rect) +{ + // draw the grid + int step = 10; + + QPen pen; + pen.setWidth(2); + pen.setCosmetic(true); + pen.setColor(QColor(245,245,255)); + + painter->setPen(pen); + for (int x = step; x < rect.right(); x += step) { + if (x % (step * 8) != 0) { + painter->drawLine(x, rect.top(), x, rect.bottom()); + painter->drawLine(-x, rect.top(), -x, rect.bottom()); + } + } + + for (int y = step; y < rect.bottom(); y += step) { + if (y % (step * 8) != 0) { + painter->drawLine(rect.left(), y, rect.right(), y); + painter->drawLine(rect.left(), -y, rect.right(), -y); + } + } + + pen.setColor(QColor(240,240,245)); + painter->setPen(pen); + for (int x = step*8; x < rect.right(); x += step*8) { + painter->drawLine(x, rect.top(), x, rect.bottom()); + painter->drawLine(-x, rect.top(), -x, rect.bottom()); + } + + for (int y = step*8; y < rect.bottom(); y += step*8) { + painter->drawLine(rect.left(), y, rect.right(), y); + painter->drawLine(rect.left(), -y, rect.right(), -y); + } + pen.setColor(QColor(230,230,240)); + painter->setPen(pen); + painter->drawLine(rect.left(), 0, rect.right(), 0); + painter->drawLine(0, rect.top(), 0, rect.bottom()); } diff --git a/tikzit/src/gui/tikzscene.h b/tikzit/src/gui/tikzscene.h index dd3cba7..c7039e6 100644 --- a/tikzit/src/gui/tikzscene.h +++ b/tikzit/src/gui/tikzscene.h @@ -1,13 +1,32 @@ #ifndef TIKZSCENE_H #define TIKZSCENE_H +#include "graph.h" +#include "nodeitem.h" + #include #include +#include +#include +#include +#include class TikzScene : public QGraphicsScene { + Q_OBJECT public: - TikzScene(QObject *parent); + TikzScene(Graph *graph, QObject *parent); + Graph *graph() const; + void setGraph(Graph *graph); +public slots: + void graphReplaced(); + +private: + Graph *_graph; + QVector nodeItems; + +protected: + void drawBackground(QPainter *painter, const QRectF &rect); }; #endif // TIKZSCENE_H diff --git a/tikzit/src/gui/tikzview.cpp b/tikzit/src/gui/tikzview.cpp new file mode 100644 index 0000000..d2a769c --- /dev/null +++ b/tikzit/src/gui/tikzview.cpp @@ -0,0 +1,20 @@ +#include "tikzview.h" + +#include + +TikzView::TikzView(QWidget *parent) : QGraphicsView(parent) +{ + setRenderHint(QPainter::Antialiasing); + qDebug() << "TikzView()"; +} + +void TikzView::zoomIn() +{ + scale(1.6,1.6); +} + +void TikzView::zoomOut() +{ + scale(0.625,0.625); +} + diff --git a/tikzit/src/gui/tikzview.h b/tikzit/src/gui/tikzview.h new file mode 100644 index 0000000..032b9c4 --- /dev/null +++ b/tikzit/src/gui/tikzview.h @@ -0,0 +1,22 @@ +#ifndef TIKZVIEW_H +#define TIKZVIEW_H + +#include +#include +#include +#include +#include +#include +#include + +class TikzView : public QGraphicsView +{ + Q_OBJECT +public: + explicit TikzView(QWidget *parent = 0); +public slots: + void zoomIn(); + void zoomOut(); +}; + +#endif // TIKZVIEW_H diff --git a/tikzit/src/gui/toolpalette.cpp b/tikzit/src/gui/toolpalette.cpp index fbbc8fd..61b6cbf 100644 --- a/tikzit/src/gui/toolpalette.cpp +++ b/tikzit/src/gui/toolpalette.cpp @@ -3,6 +3,7 @@ #include #include #include +#include ToolPalette::ToolPalette(QWidget *parent) : QToolBar(parent) @@ -38,3 +39,4 @@ ToolPalette::ToolPalette(QWidget *parent) : addAction(edge); addAction(crop); } + diff --git a/tikzit/src/main.cpp b/tikzit/src/main.cpp index 0de5fd8..e004529 100644 --- a/tikzit/src/main.cpp +++ b/tikzit/src/main.cpp @@ -6,11 +6,10 @@ #include + int main(int argc, char *argv[]) { QApplication a(argc, argv); - MainWindow *w = new MainWindow(); - w->show(); ToolPalette *tp = new ToolPalette(new QMainWindow()); tp->show(); @@ -19,5 +18,8 @@ int main(int argc, char *argv[]) PropertyPalette *pp = new PropertyPalette; pp->show(); + MainWindow *w = new MainWindow(); + w->show(); + return a.exec(); } diff --git a/tikzit/tikzit.pro b/tikzit/tikzit.pro index 2e7d463..41bc6a3 100644 --- a/tikzit/tikzit.pro +++ b/tikzit/tikzit.pro @@ -38,7 +38,9 @@ SOURCES += src/gui/mainwindow.cpp \ src/data/tikzgraphassembler.cpp \ src/data/graphelementdata.cpp \ src/data/graphelementproperty.cpp \ - src/gui/propertypalette.cpp + src/gui/propertypalette.cpp \ + src/gui/tikzview.cpp \ + src/gui/nodeitem.cpp HEADERS += src/gui/mainwindow.h \ src/gui/toolpalette.h \ @@ -50,7 +52,9 @@ HEADERS += src/gui/mainwindow.h \ src/data/graphelementdata.h \ src/data/graphelementproperty.h \ src/gui/propertypalette.h \ - src/data/tikzparserdefs.h + src/data/tikzparserdefs.h \ + src/gui/tikzview.h \ + src/gui/nodeitem.h FORMS += src/gui/mainwindow.ui \ src/gui/propertypalette.ui diff --git a/tikzit/tikzit.pro.user b/tikzit/tikzit.pro.user index 397eee1..6d72c88 100644 --- a/tikzit/tikzit.pro.user +++ b/tikzit/tikzit.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -62,7 +62,7 @@ Desktop Qt 5.7.1 clang 64bit Desktop Qt 5.7.1 clang 64bit qt.57.clang_64_kit - 3 + 0 0 0 -- cgit v1.2.3 From cb322a3acee9debf40c48ad1e3fb4458b0f51b7f Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 28 Feb 2017 14:46:39 +0100 Subject: generic nodes --- tikzit/src/data/edge.cpp | 211 +++++++++++++++++++++++++++++++++++++ tikzit/src/data/edge.h | 35 ++++++ tikzit/src/data/node.cpp | 25 +++++ tikzit/src/data/node.h | 9 ++ tikzit/src/data/nodestyle.cpp | 30 ++++++ tikzit/src/data/nodestyle.h | 26 +++++ tikzit/src/gui/edgeitem.cpp | 89 ++++++++++++++++ tikzit/src/gui/edgeitem.h | 28 +++++ tikzit/src/gui/mainwindow.cpp | 57 ++++++---- tikzit/src/gui/mainwindow.h | 11 +- tikzit/src/gui/mainwindow.ui | 55 +--------- tikzit/src/gui/nodeitem.cpp | 82 +++++++++++++- tikzit/src/gui/nodeitem.h | 9 +- tikzit/src/gui/propertypalette.cpp | 1 - tikzit/src/gui/tikzscene.cpp | 64 +++++------ tikzit/src/gui/tikzscene.h | 10 +- tikzit/src/gui/tikzview.cpp | 65 +++++++++++- tikzit/src/gui/tikzview.h | 5 + tikzit/src/gui/toolpalette.cpp | 1 - tikzit/src/main.cpp | 19 +--- tikzit/src/test/testparser.cpp | 31 ++++++ tikzit/src/test/testparser.h | 1 + tikzit/src/tikzit.cpp | 132 +++++++++++++++++++++++ tikzit/src/tikzit.h | 73 +++++++++++++ tikzit/tikzit.pro | 16 ++- tikzit/tikzit.pro.user | 2 +- 26 files changed, 938 insertions(+), 149 deletions(-) create mode 100644 tikzit/src/data/nodestyle.cpp create mode 100644 tikzit/src/data/nodestyle.h create mode 100644 tikzit/src/gui/edgeitem.cpp create mode 100644 tikzit/src/gui/edgeitem.h create mode 100644 tikzit/src/tikzit.cpp create mode 100644 tikzit/src/tikzit.h diff --git a/tikzit/src/data/edge.cpp b/tikzit/src/data/edge.cpp index 9068a1c..b999f8a 100644 --- a/tikzit/src/data/edge.cpp +++ b/tikzit/src/data/edge.cpp @@ -1,12 +1,22 @@ #include "edge.h" +#include "tikzit.h" #include +#include +#include Edge::Edge(Node *s, Node *t, QObject *parent) : QObject(parent), _source(s), _target(t) { _data = new GraphElementData(); _edgeNode = 0; + _dirty = true; + _basicBendMode = true; + _bend = 0; + _inAngle = 0; + _outAngle = 0; + _weight = 0.4f; + updateControls(); } Edge::~Edge() @@ -25,6 +35,16 @@ Node *Edge::target() const return _target; } +bool Edge::isSelfLoop() +{ + return (_source == _target); +} + +bool Edge::isStraight() +{ + return (_basicBendMode && _bend == 0); +} + GraphElementData *Edge::data() const { return _data; @@ -34,6 +54,7 @@ void Edge::setData(GraphElementData *data) { delete _data; _data = data; + setAttributesFromData(); } QString Edge::sourceAnchor() const @@ -72,4 +93,194 @@ bool Edge::hasEdgeNode() return _edgeNode != 0; } +void Edge::updateControls() { + //if (_dirty) { + QPointF src = _source->point(); + QPointF targ = _target->point(); + + float dx = (targ.x() - src.x()); + float dy = (targ.y() - src.y()); + + float outAngleR = 0.0f; + float inAngleR = 0.0f; + + if (_basicBendMode) { + float angle = std::atan2(dy, dx); + float bnd = (float)_bend * (M_PI / 180.0f); + outAngleR = angle - bnd; + inAngleR = M_PI + angle + bnd; + _outAngle = outAngleR * (180.f / M_PI); + _inAngle = inAngleR * (180.f / M_PI); + } else { + outAngleR = (float)_outAngle * (M_PI / 180.0f); + inAngleR = (float)_inAngle * (M_PI / 180.0f); + } + + // TODO: calculate head and tail properly, not just for circles + if (_source->style().isNone()) { + _tail = src; + } else { + _tail = QPointF(src.x() + std::cos(outAngleR) * 0.1, + src.y() + std::sin(outAngleR) * 0.1); + } + + if (_target->style().isNone()) { + _head = targ; + } else { + _head = QPointF(targ.x() + std::cos(inAngleR) * 0.1, + targ.y() + std::sin(inAngleR) * 0.1); + } + + // give a default distance for self-loops + _cpDist = (dx==0.0f && dy==0.0f) ? _weight : std::sqrt(dx*dx + dy*dy) * _weight; + + _cp1 = QPointF(src.x() + (_cpDist * std::cos(outAngleR)), + src.y() + (_cpDist * std::sin(outAngleR))); + + _cp2 = QPointF(targ.x() + (_cpDist * std::cos(inAngleR)), + targ.y() + (_cpDist * std::sin(inAngleR))); + + _mid = bezierInterpolateFull (0.5f, _tail, _cp1, _cp2, _head); +// midTan = [self _findTanFor:mid usingSpanFrom:0.4f to:0.6f]; + +// tailTan = [self _findTanFor:tail usingSpanFrom:0.0f to:0.1f]; +// headTan = [self _findTanFor:head usingSpanFrom:1.0f to:0.9f]; + //_dirty = false; + //} +} + +void Edge::setAttributesFromData() +{ + _basicBendMode = true; + bool ok = true; + + if (_data->atom("bend left")) { + _bend = -30; + } else if (_data->atom("bend right")) { + _bend = 30; + } else if (_data->property("bend left") != 0) { + _bend = -_data->property("bend left").toInt(&ok); + if (!ok) _bend = -30; + } else if (_data->property("bend right") != 0) { + _bend = _data->property("bend right").toInt(&ok); + if (!ok) _bend = 30; + } else { + _bend = 0; + + if (_data->property("in") != 0 && _data->property("out") != 0) { + _basicBendMode = false; + _inAngle = _data->property("in").toInt(&ok); + if (!ok) _inAngle = 0; + _outAngle = _data->property("out").toInt(&ok); + if (!ok) _outAngle = 180; + } + } + + if (_data->property("looseness") != 0) { + _weight = _data->property("looseness").toFloat(&ok) / 2.5f; + if (!ok) _weight = 0.4f; + } else { + _weight = (isSelfLoop()) ? 1.0f : 0.4f; + } + + //qDebug() << "bend: " << _bend << " in: " << _inAngle << " out: " << _outAngle; + _dirty = true; +} + +void Edge::updateData() +{ + _data->unsetAtom("loop"); + _data->unsetProperty("in"); + _data->unsetProperty("out"); + _data->unsetAtom("bend left"); + _data->unsetAtom("bend right"); + _data->unsetProperty("bend left"); + _data->unsetProperty("bend right"); + _data->unsetProperty("looseness"); + + // TODO: style handling? + + if (_basicBendMode && _bend != 0) { + QString bendKey; + int b; + if (_bend < 0) { + bendKey = "bend left"; + b = -_bend; + } else { + bendKey = "bend right"; + b = _bend; + } + + if (b == 30) { + _data->setAtom(bendKey); + } else { + _data->setProperty(bendKey, QString::number(b)); + } + } else { + _data->setProperty("in", QString::number(_inAngle)); + _data->setProperty("out", QString::number(_outAngle)); + } + + if (_source == _target) _data->setAtom("loop"); + if (!isSelfLoop() && !isStraight() && _weight != 0.4f) + _data->setProperty("looseness", QString::number(_weight*2.5f, 'f', 2)); + +} + + +QPointF Edge::head() const +{ + return _head; +} + +QPointF Edge::tail() const +{ + return _tail; +} + +QPointF Edge::cp1() const +{ + return _cp1; +} + +QPointF Edge::cp2() const +{ + return _cp2; +} + +int Edge::bend() const +{ + return _bend; +} + +int Edge::inAngle() const +{ + return _inAngle; +} + +int Edge::outAngle() const +{ + return _outAngle; +} + +float Edge::weight() const +{ + return _weight; +} + +bool Edge::basicBendMode() const +{ + return _basicBendMode; +} + +float Edge::cpDist() const +{ + return _cpDist; +} + +QPointF Edge::mid() const +{ + return _mid; +} + diff --git a/tikzit/src/data/edge.h b/tikzit/src/data/edge.h index 9655e98..e392c56 100644 --- a/tikzit/src/data/edge.h +++ b/tikzit/src/data/edge.h @@ -5,6 +5,7 @@ #include "node.h" #include +#include class Edge : public QObject { @@ -16,6 +17,9 @@ public: Node *source() const; Node *target() const; + bool isSelfLoop(); + bool isStraight(); + GraphElementData *data() const; void setData(GraphElementData *data); @@ -29,6 +33,23 @@ public: void setEdgeNode(Node *edgeNode); bool hasEdgeNode(); + void updateControls(); + void setAttributesFromData(); + void updateData(); + + QPointF head() const; + QPointF tail() const; + QPointF cp1() const; + QPointF cp2() const; + QPointF mid() const; + + int bend() const; + int inAngle() const; + int outAngle() const; + float weight() const; + bool basicBendMode() const; + float cpDist() const; + signals: public slots: @@ -44,6 +65,20 @@ private: // referenced Node *_source; Node *_target; + + bool _dirty; + bool _basicBendMode; + int _bend; + int _inAngle; + int _outAngle; + float _weight; + float _cpDist; + + QPointF _head; + QPointF _tail; + QPointF _cp1; + QPointF _cp2; + QPointF _mid; }; #endif // EDGE_H diff --git a/tikzit/src/data/node.cpp b/tikzit/src/data/node.cpp index b3b2155..1b8ccf8 100644 --- a/tikzit/src/data/node.cpp +++ b/tikzit/src/data/node.cpp @@ -1,10 +1,13 @@ #include "node.h" +#include "tikzit.h" #include Node::Node(QObject *parent) : QObject(parent) { _data = new GraphElementData(); + _style = NodeStyle(); + _styleName = "none"; } Node::~Node() @@ -51,5 +54,27 @@ void Node::setData(GraphElementData *data) { delete _data; _data = data; + if (_data->property("style") != 0) _styleName = _data->property("style"); +} + +QString Node::styleName() const +{ + return _styleName; +} + +void Node::setStyleName(const QString &styleName) +{ + _styleName = styleName; +} + +void Node::attachStyle() +{ + if (_styleName == "none") _style = NodeStyle(); + else _style = tikzit->nodeStyle(_styleName); +} + +NodeStyle Node::style() const +{ + return _style; } diff --git a/tikzit/src/data/node.h b/tikzit/src/data/node.h index e72e9a7..91b1725 100644 --- a/tikzit/src/data/node.h +++ b/tikzit/src/data/node.h @@ -2,6 +2,7 @@ #define NODE_H #include "graphelementdata.h" +#include "nodestyle.h" #include #include @@ -26,6 +27,12 @@ public: GraphElementData *data() const; void setData(GraphElementData *data); + QString styleName() const; + void setStyleName(const QString &styleName); + + void attachStyle(); + NodeStyle style() const; + signals: public slots: @@ -34,6 +41,8 @@ private: QPointF _point; QString _name; QString _label; + QString _styleName; + NodeStyle _style; GraphElementData *_data; }; diff --git a/tikzit/src/data/nodestyle.cpp b/tikzit/src/data/nodestyle.cpp new file mode 100644 index 0000000..109e2af --- /dev/null +++ b/tikzit/src/data/nodestyle.cpp @@ -0,0 +1,30 @@ +#include "nodestyle.h" + +NodeStyle::NodeStyle() +{ + name = "none"; + shape = NodeShape::Circle; + fillColor = Qt::white; + strokeColor = Qt::black; + strokeThickness = 1; +} + +NodeStyle::NodeStyle(QString nm, NodeShape sh, QColor fillCol) +{ + name = nm; + shape = sh; + fillColor = fillCol; + strokeColor = Qt::black; + strokeThickness = 1; +} + +NodeStyle::NodeStyle(QString nm, NodeShape sh, QColor fillCol, QColor strokeCol, int strokeThick) +{ + name = nm; + shape = sh; + fillColor = fillCol; + strokeColor = strokeCol; + strokeThickness = strokeThick; +} + +bool NodeStyle::isNone() { return name == "none"; } diff --git a/tikzit/src/data/nodestyle.h b/tikzit/src/data/nodestyle.h new file mode 100644 index 0000000..baf967c --- /dev/null +++ b/tikzit/src/data/nodestyle.h @@ -0,0 +1,26 @@ +#ifndef NODESTYLE_H +#define NODESTYLE_H + +#include + +enum NodeShape { + Square, UpTriangle, DownTriangle, Circle +}; + +class NodeStyle +{ +public: + NodeStyle(); + NodeStyle(QString nm, NodeShape sh, QColor fillCol); + NodeStyle(QString nm, NodeShape sh, QColor fillCol, QColor strokeCol, int strokeThick); + bool isNone(); + QString name; + NodeShape shape; + QColor fillColor; + QColor strokeColor; + int strokeThickness; +}; + +extern NodeStyle noneStyle; + +#endif // NODESTYLE_H diff --git a/tikzit/src/gui/edgeitem.cpp b/tikzit/src/gui/edgeitem.cpp new file mode 100644 index 0000000..f45493d --- /dev/null +++ b/tikzit/src/gui/edgeitem.cpp @@ -0,0 +1,89 @@ +#include "tikzit.h" +#include "edgeitem.h" + +#include +#include + +EdgeItem::EdgeItem(Edge *edge) +{ + _edge = edge; + setFlag(QGraphicsItem::ItemIsSelectable); + + QPen pen(Qt::black); + pen.setWidth(2); + setPen(pen); + _cp1Item = new QGraphicsEllipseItem(this); + _cp1Item->setParentItem(this); + _cp2Item = new QGraphicsEllipseItem(this); + _cp2Item->setParentItem(this); + syncPos(); +} + +void EdgeItem::syncPos() +{ + _edge->setAttributesFromData(); + _edge->updateControls(); + QPainterPath path; + + path.moveTo (toScreen(_edge->tail())); + path.cubicTo(toScreen(_edge->cp1()), + toScreen(_edge->cp2()), + toScreen(_edge->head())); + setPath(path); + + float r = GLOBAL_SCALEF * 0.05; + //painter->drawEllipse(toScreen(_edge->cp1()), r, r); + //painter->drawEllipse(toScreen(_edge->cp2()), r, r); +} + +void EdgeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) +{ + //QGraphicsPathItem::paint(painter, option, widget); + painter->setPen(pen()); + painter->setBrush(Qt::NoBrush); + painter->drawPath(path()); + + + + if (isSelected()) { + QColor draw; + QColor draw1; + QColor fill; + + if (_edge->basicBendMode()) { + draw = Qt::blue; + draw1 = QColor(100,100,255,100); + fill = QColor(200,200,255,50); + } else { + draw = Qt::darkGreen; + draw1 = QColor(0, 150, 0, 50); + fill = QColor(200,255,200,150); + } + + painter->setPen(QPen(draw1)); + + float r = GLOBAL_SCALEF * _edge->cpDist(); + painter->drawEllipse(toScreen(_edge->source()->point()), r, r); + painter->drawEllipse(toScreen(_edge->target()->point()), r, r); + + painter->setPen(QPen(draw)); + painter->setBrush(QBrush(fill)); + + painter->drawLine(toScreen(_edge->tail()), toScreen(_edge->cp1())); + painter->drawLine(toScreen(_edge->head()), toScreen(_edge->cp2())); + + r = GLOBAL_SCALEF * 0.05; + painter->drawEllipse(toScreen(_edge->cp1()), r, r); + painter->drawEllipse(toScreen(_edge->cp2()), r, r); + + painter->setPen(QPen(Qt::black)); + painter->setBrush(QBrush(QColor(255,255,255,200))); + painter->drawEllipse(toScreen(_edge->mid()), r, r); + } +} + +QRectF EdgeItem::boundingRect() const +{ + float r = GLOBAL_SCALEF * (_edge->cpDist() + 0.2); + return QGraphicsPathItem::boundingRect().adjusted(-r,-r,r,r); +} diff --git a/tikzit/src/gui/edgeitem.h b/tikzit/src/gui/edgeitem.h new file mode 100644 index 0000000..935138b --- /dev/null +++ b/tikzit/src/gui/edgeitem.h @@ -0,0 +1,28 @@ +#ifndef EDGEITEM_H +#define EDGEITEM_H + +#include "edge.h" + +#include +#include +#include +#include +#include +#include + +class EdgeItem : public QGraphicsPathItem +{ +public: + EdgeItem(Edge *edge); + void syncPos(); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, + QWidget *widget); + QRectF boundingRect() const; + +private: + Edge *_edge; + QGraphicsEllipseItem *_cp1Item; + QGraphicsEllipseItem *_cp2Item; +}; + +#endif // EDGEITEM_H diff --git a/tikzit/src/gui/mainwindow.cpp b/tikzit/src/gui/mainwindow.cpp index f7357ec..7d7ab04 100644 --- a/tikzit/src/gui/mainwindow.cpp +++ b/tikzit/src/gui/mainwindow.cpp @@ -1,6 +1,8 @@ #include "mainwindow.h" #include "ui_mainwindow.h" #include "tikzgraphassembler.h" +#include "toolpalette.h" +#include "tikzit.h" #include #include @@ -15,12 +17,13 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) { + _windowId = _numWindows; _numWindows++; ui->setupUi(this); - setAttribute(Qt::WA_DeleteOnClose); + setAttribute(Qt::WA_DeleteOnClose, true); _graph = new Graph(this); - tikzScene = new TikzScene(_graph, this); - ui->tikzView->setScene(tikzScene); + _tikzScene = new TikzScene(_graph, this); + ui->tikzView->setScene(_tikzScene); _fileName = ""; _pristine = true; @@ -33,7 +36,7 @@ MainWindow::MainWindow(QWidget *parent) : MainWindow::~MainWindow() { - //qDebug() << "~MainWindow"; + tikzit->removeWindow(this); } void MainWindow::open(QString fileName) @@ -45,6 +48,8 @@ void MainWindow::open(QString fileName) QSettings settings("tikzit", "tikzit"); settings.setValue("previous-file-path", fi.absolutePath()); + setWindowTitle("TiKZiT - " + fi.fileName()); + if (!file.open(QIODevice::ReadOnly)) { QMessageBox::critical(this, tr("Error"), tr("Could not open file")); @@ -61,9 +66,11 @@ void MainWindow::open(QString fileName) TikzGraphAssembler ass(newGraph); if (ass.parse(tikz)) { statusBar()->showMessage("TiKZ parsed successfully", 2000); - tikzScene->setGraph(newGraph); delete _graph; _graph = newGraph; + foreach (Node *n, _graph->nodes()) n->attachStyle(); + foreach (Edge *e, _graph->edges()) e->updateControls(); + _tikzScene->setGraph(_graph); } else { statusBar()->showMessage("Cannot read TiKZ source"); delete newGraph; @@ -77,24 +84,32 @@ void MainWindow::closeEvent(QCloseEvent *event) QMainWindow::closeEvent(event); } -void MainWindow::on_actionOpen_triggered() +void MainWindow::changeEvent(QEvent *event) { - QSettings settings("tikzit", "tikzit"); - QString fileName = QFileDialog::getOpenFileName( - this, - tr("Open File"), - settings.value("previous-file-path").toString(), - tr("TiKZ Files (*.tikz)")); - - if (!fileName.isEmpty()) { - if (_pristine) { - open(fileName); - } else { - MainWindow *w = new MainWindow(); - w->show(); - w->open(fileName); - } + if (event->type() == QEvent::ActivationChange && isActiveWindow()) { + tikzit->setActiveWindow(this); } + QMainWindow::changeEvent(event); +} + +TikzScene *MainWindow::tikzScene() const +{ + return _tikzScene; +} + +int MainWindow::windowId() const +{ + return _windowId; +} + +TikzView *MainWindow::tikzView() const +{ + return ui->tikzView; +} + +bool MainWindow::pristine() const +{ + return _pristine; } diff --git a/tikzit/src/gui/mainwindow.h b/tikzit/src/gui/mainwindow.h index f48fd64..2e52cd5 100644 --- a/tikzit/src/gui/mainwindow.h +++ b/tikzit/src/gui/mainwindow.h @@ -2,6 +2,7 @@ #define MAINWINDOW_H #include "tikzscene.h" +#include "tikzview.h" #include "graph.h" #include @@ -20,18 +21,22 @@ public: ~MainWindow(); void open(QString fileName); + bool pristine() const; + int windowId() const; + TikzView *tikzView() const; + TikzScene *tikzScene() const; protected: void closeEvent(QCloseEvent *event); + void changeEvent(QEvent *event); private: - TikzScene *tikzScene; + TikzScene *_tikzScene; Ui::MainWindow *ui; Graph *_graph; QString _fileName; bool _pristine; + int _windowId; static int _numWindows; -public slots: - void on_actionOpen_triggered(); }; #endif // MAINWINDOW_H diff --git a/tikzit/src/gui/mainwindow.ui b/tikzit/src/gui/mainwindow.ui index a2655e6..8c7e8ae 100644 --- a/tikzit/src/gui/mainwindow.ui +++ b/tikzit/src/gui/mainwindow.ui @@ -11,7 +11,7 @@ - TikZiT + TikZiT - untitled @@ -58,59 +58,6 @@ p, li { white-space: pre-wrap; } - - - - 0 - 0 - 476 - 22 - - - - - File - - - - - - - - - - - Edit - - - - - - - - - - - - - - - Tikz - - - - - - View - - - - - - - - - diff --git a/tikzit/src/gui/nodeitem.cpp b/tikzit/src/gui/nodeitem.cpp index e817d98..d91bfd6 100644 --- a/tikzit/src/gui/nodeitem.cpp +++ b/tikzit/src/gui/nodeitem.cpp @@ -1,17 +1,93 @@ +#include "tikzit.h" #include "nodeitem.h" #include #include +#include +#include +#include +#include NodeItem::NodeItem(Node *node) { _node = node; - setPen(QPen(Qt::black)); - setBrush(QBrush(Qt::white)); + setFlag(QGraphicsItem::ItemIsSelectable); + setFlag(QGraphicsItem::ItemIsMovable); syncPos(); } void NodeItem::syncPos() { - setRect(80*_node->point().x() - 8, -80*_node->point().y() - 8, 16, 16); + setPos(toScreen(_node->point())); +} + + +void NodeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) +{ + if (_node->style().isNone()) { + QColor c(180,180,200); + painter->setPen(QPen(c)); + painter->setBrush(QBrush(c)); + painter->drawEllipse(QPointF(0,0), 1,1); + + QPen pen(QColor(180,180,220)); + QVector p; + p << 2.0 << 2.0; + pen.setDashPattern(p); + painter->setPen(pen); + painter->setBrush(Qt::NoBrush); + painter->drawPath(shape()); + } else { + QPen pen(_node->style().strokeColor); + pen.setWidth(_node->style().strokeThickness); + painter->setPen(pen); + painter->setBrush(QBrush(_node->style().fillColor)); + painter->drawPath(shape()); + } + + if (_node->label() != "") { + QString label = _node->label(); + QFont f("Monaco", 9); + QFontMetrics fm(f); + int w = fm.width(label) + 4; + int h = fm.height() + 2; + + QRectF rect = fm.boundingRect(label); + rect.adjust(-2,-2,2,2); + rect.moveCenter(QPointF(0,0)); + QPen pen(QColor(200,0,0,120)); + QVector d; + d << 2.0 << 2.0; + pen.setDashPattern(d); + painter->setPen(pen); + painter->setBrush(QBrush(QColor(255,255,100,120))); + painter->drawRect(rect); + + painter->setPen(QPen(Qt::black)); + painter->setFont(f); + painter->drawText(rect, Qt::AlignCenter, _node->label()); + } + + if (isSelected()) { + QPainterPath sh = shape(); + QPainterPathStroker stroker; + stroker.setWidth(4); + QPainterPath outline = (stroker.createStroke(sh) + sh).simplified(); + painter->setPen(Qt::NoPen); + painter->setBrush(QBrush(QColor(150,200,255,100))); + painter->drawPath(outline); + } + +} + +QPainterPath NodeItem::shape() const +{ + QPainterPath path; + path.addEllipse(QPointF(0,0), GLOBAL_SCALEF * 0.1, GLOBAL_SCALEF * 0.1); + return path; +} + +QRectF NodeItem::boundingRect() const +{ + return shape().boundingRect().adjusted(-4,-4,4,4); } diff --git a/tikzit/src/gui/nodeitem.h b/tikzit/src/gui/nodeitem.h index 60b2c05..867d8a3 100644 --- a/tikzit/src/gui/nodeitem.h +++ b/tikzit/src/gui/nodeitem.h @@ -4,13 +4,18 @@ #include "node.h" #include -#include +#include +#include +#include -class NodeItem : public QGraphicsEllipseItem +class NodeItem : public QGraphicsItem { public: NodeItem(Node *node); void syncPos(); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); + QPainterPath shape() const; + QRectF boundingRect() const; private: Node *_node; }; diff --git a/tikzit/src/gui/propertypalette.cpp b/tikzit/src/gui/propertypalette.cpp index ea0e90e..ea906a7 100644 --- a/tikzit/src/gui/propertypalette.cpp +++ b/tikzit/src/gui/propertypalette.cpp @@ -23,7 +23,6 @@ PropertyPalette::PropertyPalette(QWidget *parent) : d->setProperty("key 2", "value 2"); QModelIndex i = d->index(0,0); - qDebug() << "data: " << i.data(); ui->treeView->setModel(d); QSettings settings("tikzit", "tikzit"); diff --git a/tikzit/src/gui/tikzscene.cpp b/tikzit/src/gui/tikzscene.cpp index 11d5a72..cf7cde5 100644 --- a/tikzit/src/gui/tikzscene.cpp +++ b/tikzit/src/gui/tikzscene.cpp @@ -1,7 +1,10 @@ +#include "tikzit.h" #include "tikzscene.h" #include #include +#include + TikzScene::TikzScene(Graph *graph, QObject *parent) : QGraphicsScene(parent), _graph(graph) @@ -28,8 +31,17 @@ void TikzScene::graphReplaced() } nodeItems.clear(); - QPen blackPen(Qt::black); - QBrush redBrush(Qt::red); + foreach (EdgeItem *ei, edgeItems) { + removeItem(ei); + delete ei; + } + edgeItems.clear(); + + foreach (Edge *e, _graph->edges()) { + EdgeItem *ei = new EdgeItem(e); + edgeItems << ei; + addItem(ei); + } foreach (Node *n, _graph->nodes()) { NodeItem *ni = new NodeItem(n); @@ -38,45 +50,19 @@ void TikzScene::graphReplaced() } } -void TikzScene::drawBackground(QPainter *painter, const QRectF &rect) +void TikzScene::mousePressEvent(QGraphicsSceneMouseEvent *event) { - // draw the grid - int step = 10; + // TODO: check if we grabbed a control point - QPen pen; - pen.setWidth(2); - pen.setCosmetic(true); - pen.setColor(QColor(245,245,255)); - - painter->setPen(pen); - for (int x = step; x < rect.right(); x += step) { - if (x % (step * 8) != 0) { - painter->drawLine(x, rect.top(), x, rect.bottom()); - painter->drawLine(-x, rect.top(), -x, rect.bottom()); - } - } - - for (int y = step; y < rect.bottom(); y += step) { - if (y % (step * 8) != 0) { - painter->drawLine(rect.left(), y, rect.right(), y); - painter->drawLine(rect.left(), -y, rect.right(), -y); - } - } - - pen.setColor(QColor(240,240,245)); - painter->setPen(pen); - for (int x = step*8; x < rect.right(); x += step*8) { - painter->drawLine(x, rect.top(), x, rect.bottom()); - painter->drawLine(-x, rect.top(), -x, rect.bottom()); - } + QGraphicsScene::mousePressEvent(event); +} - for (int y = step*8; y < rect.bottom(); y += step*8) { - painter->drawLine(rect.left(), y, rect.right(), y); - painter->drawLine(rect.left(), -y, rect.right(), -y); - } +void TikzScene::mouseMoveEvent(QGraphicsSceneMouseEvent *event) +{ + QGraphicsScene::mouseMoveEvent(event); +} - pen.setColor(QColor(230,230,240)); - painter->setPen(pen); - painter->drawLine(rect.left(), 0, rect.right(), 0); - painter->drawLine(0, rect.top(), 0, rect.bottom()); +void TikzScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) +{ + QGraphicsScene::mouseReleaseEvent(event); } diff --git a/tikzit/src/gui/tikzscene.h b/tikzit/src/gui/tikzscene.h index c7039e6..2c77389 100644 --- a/tikzit/src/gui/tikzscene.h +++ b/tikzit/src/gui/tikzscene.h @@ -3,6 +3,7 @@ #include "graph.h" #include "nodeitem.h" +#include "edgeitem.h" #include #include @@ -10,6 +11,7 @@ #include #include #include +#include class TikzScene : public QGraphicsScene { @@ -20,13 +22,15 @@ public: void setGraph(Graph *graph); public slots: void graphReplaced(); - +protected: + void mousePressEvent(QGraphicsSceneMouseEvent *event); + void mouseMoveEvent(QGraphicsSceneMouseEvent *event); + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); private: Graph *_graph; QVector nodeItems; + QVector edgeItems; -protected: - void drawBackground(QPainter *painter, const QRectF &rect); }; #endif // TIKZSCENE_H diff --git a/tikzit/src/gui/tikzview.cpp b/tikzit/src/gui/tikzview.cpp index d2a769c..a83c9ec 100644 --- a/tikzit/src/gui/tikzview.cpp +++ b/tikzit/src/gui/tikzview.cpp @@ -1,20 +1,83 @@ #include "tikzview.h" +#include "tikzit.h" #include TikzView::TikzView(QWidget *parent) : QGraphicsView(parent) { setRenderHint(QPainter::Antialiasing); - qDebug() << "TikzView()"; + setDragMode(QGraphicsView::RubberBandDrag); + _scale = 1.0f; } void TikzView::zoomIn() { + _scale *= 1.6f; scale(1.6,1.6); } void TikzView::zoomOut() { + _scale *= 0.625f; scale(0.625,0.625); } +void TikzView::drawBackground(QPainter *painter, const QRectF &rect) +{ + // draw the grid + int step = GLOBAL_SCALE / 8; + + QPen pen1; + pen1.setWidth(1); + pen1.setCosmetic(true); + pen1.setColor(QColor(230,230,230)); + + QPen pen2 = pen1; + pen2.setColor(QColor(200,200,200)); + + QPen pen3 = pen1; + pen3.setColor(QColor(160,160,160)); + + painter->setPen(pen1); + + if (_scale > 0.2f) { + for (int x = -step; x > rect.left(); x -= step) { + if (x % (step * 8) != 0) painter->drawLine(x, rect.top(), x, rect.bottom()); + } + + for (int x = step; x < rect.right(); x += step) { + if (x % (step * 8) != 0) painter->drawLine(x, rect.top(), x, rect.bottom()); + } + + for (int y = -step; y > rect.top(); y -= step) { + if (y % (step * 8) != 0) painter->drawLine(rect.left(), y, rect.right(), y); + } + + for (int y = step; y < rect.bottom(); y += step) { + if (y % (step * 8) != 0) painter->drawLine(rect.left(), y, rect.right(), y); + } + } + + painter->setPen(pen2); + + for (int x = -step*8; x > rect.left(); x -= step*8) { + painter->drawLine(x, rect.top(), x, rect.bottom()); + } + + for (int x = step*8; x < rect.right(); x += step*8) { + painter->drawLine(x, rect.top(), x, rect.bottom()); + } + + for (int y = -step*8; y > rect.top(); y -= step*8) { + painter->drawLine(rect.left(), y, rect.right(), y); + } + + for (int y = step*8; y < rect.bottom(); y += step*8) { + painter->drawLine(rect.left(), y, rect.right(), y); + } + + painter->setPen(pen3); + painter->drawLine(rect.left(), 0, rect.right(), 0); + painter->drawLine(0, rect.top(), 0, rect.bottom()); +} + diff --git a/tikzit/src/gui/tikzview.h b/tikzit/src/gui/tikzview.h index 032b9c4..b16e0df 100644 --- a/tikzit/src/gui/tikzview.h +++ b/tikzit/src/gui/tikzview.h @@ -8,6 +8,7 @@ #include #include #include +#include class TikzView : public QGraphicsView { @@ -17,6 +18,10 @@ public: public slots: void zoomIn(); void zoomOut(); +protected: + void drawBackground(QPainter *painter, const QRectF &rect); +private: + float _scale; }; #endif // TIKZVIEW_H diff --git a/tikzit/src/gui/toolpalette.cpp b/tikzit/src/gui/toolpalette.cpp index 61b6cbf..3ee2106 100644 --- a/tikzit/src/gui/toolpalette.cpp +++ b/tikzit/src/gui/toolpalette.cpp @@ -9,7 +9,6 @@ ToolPalette::ToolPalette(QWidget *parent) : QToolBar(parent) { setWindowFlags(Qt::Window - | Qt::WindowStaysOnTopHint | Qt::CustomizeWindowHint | Qt::WindowDoesNotAcceptFocus); setOrientation(Qt::Vertical); diff --git a/tikzit/src/main.cpp b/tikzit/src/main.cpp index e004529..b676211 100644 --- a/tikzit/src/main.cpp +++ b/tikzit/src/main.cpp @@ -1,25 +1,14 @@ - -#include "mainwindow.h" -#include "toolpalette.h" -#include "propertypalette.h" -#include "graph.h" +#include "tikzit.h" #include +#include int main(int argc, char *argv[]) { QApplication a(argc, argv); - - ToolPalette *tp = new ToolPalette(new QMainWindow()); - tp->show(); - //w->addToolBar(Qt::LeftToolBarArea, tp); - - PropertyPalette *pp = new PropertyPalette; - pp->show(); - - MainWindow *w = new MainWindow(); - w->show(); + a.setQuitOnLastWindowClosed(false); + tikzit = new Tikzit(); return a.exec(); } diff --git a/tikzit/src/test/testparser.cpp b/tikzit/src/test/testparser.cpp index bbc90cf..e220e2e 100644 --- a/tikzit/src/test/testparser.cpp +++ b/tikzit/src/test/testparser.cpp @@ -103,6 +103,36 @@ void TestParser::parseEdgeNode() delete g; } +void TestParser::parseEdgeBends() +{ + Graph *g = new Graph(); + TikzGraphAssembler ga(g); + bool res = ga.parse( + "\\begin{tikzpicture}\n" + " \\begin{pgfonlayer}{nodelayer}\n" + " \\node [style=white] (0) at (-1, 0) {};\n" + " \\node [style=black] (1) at (1, 0) {};\n" + " \\end{pgfonlayer}\n" + " \\begin{pgfonlayer}{edgelayer}\n" + " \\draw [style=diredge,bend left] (0) to (1);\n" + " \\draw [style=diredge,bend right] (0) to (1);\n" + " \\draw [style=diredge,bend left=20] (0) to (1);\n" + " \\draw [style=diredge,bend right=80] (0) to (1);\n" + " \\draw [style=diredge,in=10,out=150,looseness=2] (0) to (1);\n" + " \\end{pgfonlayer}\n" + "\\end{tikzpicture}\n"); + QVERIFY(res); + QVERIFY(g->nodes().size() == 2); + QVERIFY(g->edges().size() == 5); + QVERIFY(g->edges()[0]->bend() == -30); + QVERIFY(g->edges()[1]->bend() == 30); + QVERIFY(g->edges()[2]->bend() == -20); + QVERIFY(g->edges()[3]->bend() == 80); + QVERIFY(g->edges()[4]->inAngle() == 10); + QVERIFY(g->edges()[4]->outAngle() == 150); + QVERIFY(g->edges()[4]->weight() == 2.0f/2.5f); +} + void TestParser::parseBbox() { Graph *g = new Graph(); @@ -121,6 +151,7 @@ void TestParser::parseBbox() " \\draw [style=diredge] (0) to (1);\n" " \\end{pgfonlayer}\n" "\\end{tikzpicture}\n"); + QVERIFY(res); QVERIFY(g->nodes().size() == 3); QVERIFY(g->edges().size() == 3); QVERIFY(g->hasBbox()); diff --git a/tikzit/src/test/testparser.h b/tikzit/src/test/testparser.h index 69dc965..a40a58f 100644 --- a/tikzit/src/test/testparser.h +++ b/tikzit/src/test/testparser.h @@ -11,6 +11,7 @@ private slots: void parseNodeGraph(); void parseEdgeGraph(); void parseEdgeNode(); + void parseEdgeBends(); void parseBbox(); }; diff --git a/tikzit/src/tikzit.cpp b/tikzit/src/tikzit.cpp new file mode 100644 index 0000000..9abf33e --- /dev/null +++ b/tikzit/src/tikzit.cpp @@ -0,0 +1,132 @@ +#include "tikzit.h" + +#include +#include + +// application-level instance of Tikzit +Tikzit *tikzit; + +Tikzit::Tikzit() +{ + _activeWindow = 0; + QMainWindow *dummy = new QMainWindow(); + + _toolPalette = new ToolPalette(dummy); + _propertyPalette = new PropertyPalette(dummy); + + createMenu(); + loadStyles(); + + _toolPalette->show(); + _propertyPalette->show(); + + _windows << new MainWindow(); + _windows[0]->show(); +} + +QMenuBar *Tikzit::mainMenu() const +{ + return _mainMenu; +} + +ToolPalette *Tikzit::toolPalette() const +{ + return _toolPalette; +} + +PropertyPalette *Tikzit::propertyPalette() const +{ + return _propertyPalette; +} + +void Tikzit::createMenu() +{ + _mainMenu = new QMenuBar(0); + QMenu *file = _mainMenu->addMenu(tr("&File")); + QAction *aNew = file->addAction(tr("&New")); + aNew->setShortcut(QKeySequence::New); + QAction *aOpen = file->addAction(tr("&Open")); + aOpen->setShortcut(QKeySequence::Open); + + QMenu *view = _mainMenu->addMenu(tr("&View")); + QAction *aZoomIn = view->addAction(tr("Zoom &In")); + aZoomIn->setShortcut(QKeySequence::ZoomIn); + QAction *aZoomOut = view->addAction(tr("Zoom &Out")); + aZoomOut->setShortcut(QKeySequence::ZoomOut); + + connect(aNew, SIGNAL(triggered()), this, SLOT(newDoc())); + connect(aOpen, SIGNAL(triggered()), this, SLOT(open())); + connect(aZoomIn, SIGNAL(triggered()), this, SLOT(zoomIn())); + connect(aZoomOut, SIGNAL(triggered()), this, SLOT(zoomOut())); +} + +void Tikzit::loadStyles() +{ + _nodeStyles << NodeStyle("black dot", NodeShape::Circle, Qt::black, Qt::black, 1); + _nodeStyles << NodeStyle("white dot", NodeShape::Circle, Qt::white, Qt::black, 1); + _nodeStyles << NodeStyle("gray dot", NodeShape::Circle, Qt::gray, Qt::black, 1); +} + +void Tikzit::newDoc() +{ + MainWindow *w = new MainWindow(); + w->show(); + _windows << w; +} + +MainWindow *Tikzit::activeWindow() const +{ + return _activeWindow; +} + +void Tikzit::setActiveWindow(MainWindow *activeWindow) +{ + _activeWindow = activeWindow; +} + +void Tikzit::removeWindow(MainWindow *w) +{ + _windows.removeAll(w); + if (_activeWindow == w) { + if (_windows.isEmpty()) _activeWindow = 0; + else _activeWindow = _windows[0]; + } +} + +NodeStyle Tikzit::nodeStyle(QString name) +{ + foreach (NodeStyle s , _nodeStyles) + if (s.name == name) return s; + return NodeStyle(name, NodeShape::Circle, Qt::white); +} + +void Tikzit::open() +{ + QSettings settings("tikzit", "tikzit"); + QString fileName = QFileDialog::getOpenFileName(0, + tr("Open File"), + settings.value("previous-file-path").toString(), + tr("TiKZ Files (*.tikz)")); + + if (!fileName.isEmpty()) { + if (_windows.size() == 1 && _windows[0]->pristine()) { + _windows[0]->open(fileName); + _windows[0]->show(); + } else { + MainWindow *w = new MainWindow(); + w->show(); + w->open(fileName); + _windows << w; + } + } +} + +void Tikzit::zoomIn() +{ + if (_activeWindow != 0) _activeWindow->tikzView()->zoomIn(); +} + +void Tikzit::zoomOut() +{ + if (_activeWindow != 0) _activeWindow->tikzView()->zoomOut(); +} diff --git a/tikzit/src/tikzit.h b/tikzit/src/tikzit.h new file mode 100644 index 0000000..74a7ea6 --- /dev/null +++ b/tikzit/src/tikzit.h @@ -0,0 +1,73 @@ +#ifndef TIKZIT_H +#define TIKZIT_H + +#include "mainwindow.h" +#include "toolpalette.h" +#include "propertypalette.h" +#include "nodestyle.h" + +#include +#include +#include +#include +#include + +// Number of pixels between (0,0) and (1,0) at 100% zoom level. This should be +// divisible by 8 to avoid rounding errors with e.g. grid-snapping. +#define GLOBAL_SCALE 80 +#define GLOBAL_SCALEF 80.0f + +inline QPointF toScreen(QPointF src) +{ src.setY(-src.y()); src *= GLOBAL_SCALEF; return src; } + +inline QPointF fromScreen(QPointF src) +{ src.setY(-src.y()); src /= GLOBAL_SCALEF; return src; } + +// interpolate on a cubic bezier curve +inline float bezierInterpolate(float dist, float c0, float c1, float c2, float c3) { + float distp = 1 - dist; + return (distp*distp*distp) * c0 + + 3 * (distp*distp) * dist * c1 + + 3 * (dist*dist) * distp * c2 + + (dist*dist*dist) * c3; +} + +inline QPointF bezierInterpolateFull (float dist, QPointF c0, QPointF c1, QPointF c2, QPointF c3) { + return QPointF(bezierInterpolate (dist, c0.x(), c1.x(), c2.x(), c3.x()), + bezierInterpolate (dist, c0.y(), c1.y(), c2.y(), c3.y())); +} + +class Tikzit : public QObject { + Q_OBJECT +public: + Tikzit(); + QMenuBar *mainMenu() const; + ToolPalette *toolPalette() const; + PropertyPalette *propertyPalette() const; + + MainWindow *activeWindow() const; + void setActiveWindow(MainWindow *activeWindow); + void removeWindow(MainWindow *w); + NodeStyle nodeStyle(QString name); + +private: + void createMenu(); + void loadStyles(); + + QMenuBar *_mainMenu; + ToolPalette *_toolPalette; + PropertyPalette *_propertyPalette; + QVector _windows; + MainWindow *_activeWindow; + QVector _nodeStyles; + +public slots: + void newDoc(); + void open(); + void zoomIn(); + void zoomOut(); +}; + +extern Tikzit *tikzit; + +#endif // TIKZIT_H diff --git a/tikzit/tikzit.pro b/tikzit/tikzit.pro index 41bc6a3..cf0756f 100644 --- a/tikzit/tikzit.pro +++ b/tikzit/tikzit.pro @@ -40,7 +40,10 @@ SOURCES += src/gui/mainwindow.cpp \ src/data/graphelementproperty.cpp \ src/gui/propertypalette.cpp \ src/gui/tikzview.cpp \ - src/gui/nodeitem.cpp + src/gui/nodeitem.cpp \ + src/gui/edgeitem.cpp \ + src/tikzit.cpp \ + src/data/nodestyle.cpp HEADERS += src/gui/mainwindow.h \ src/gui/toolpalette.h \ @@ -54,17 +57,20 @@ HEADERS += src/gui/mainwindow.h \ src/gui/propertypalette.h \ src/data/tikzparserdefs.h \ src/gui/tikzview.h \ - src/gui/nodeitem.h + src/gui/nodeitem.h \ + src/tikzit.h \ + src/gui/edgeitem.h \ + src/data/nodestyle.h FORMS += src/gui/mainwindow.ui \ - src/gui/propertypalette.ui + src/gui/propertypalette.ui \ + src/gui/mainmenu.ui INCLUDEPATH += src src/gui src/data DISTFILES += -RESOURCES += \ - tikzit.qrc +RESOURCES += tikzit.qrc test { QT += testlib diff --git a/tikzit/tikzit.pro.user b/tikzit/tikzit.pro.user index 6d72c88..aca5fe8 100644 --- a/tikzit/tikzit.pro.user +++ b/tikzit/tikzit.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId -- cgit v1.2.3 From 5816cd5d5e3edf7ee7a7273c7c3a3d907dc54a4a Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 5 Dec 2017 17:55:04 +0000 Subject: Qt --- tikzit/Makefile | 1139 +++++++++++++++ tikzit/src/data/tikzdocument.cpp | 75 + tikzit/src/data/tikzdocument.h | 36 + tikzit/src/data/tikzlexer.lexer.cpp | 2535 +++++++++++++++++++++++++++++++++ tikzit/src/data/tikzparser.parser.cpp | 1931 +++++++++++++++++++++++++ tikzit/src/data/tikzparser.parser.hpp | 139 ++ tikzit/src/gui/commands.cpp | 0 tikzit/src/gui/commands.h | 4 + tikzit/src/gui/edgeitem.cpp | 39 +- tikzit/src/gui/edgeitem.h | 1 + tikzit/src/gui/mainmenu.ui | 146 ++ tikzit/src/gui/mainwindow.cpp | 36 +- tikzit/src/gui/mainwindow.h | 3 +- tikzit/src/gui/nodeitem.cpp | 18 + tikzit/src/gui/nodeitem.h | 1 + tikzit/src/gui/propertypalette.cpp | 1 - tikzit/src/gui/tikzscene.cpp | 6 + tikzit/target_wrapper.sh | 6 + tikzit/tikzit.pro | 8 +- tikzit/tikzit.pro.user | 13 +- tikzit/tikzlexer.h | 345 +++++ 21 files changed, 6438 insertions(+), 44 deletions(-) create mode 100644 tikzit/Makefile create mode 100644 tikzit/src/data/tikzdocument.cpp create mode 100644 tikzit/src/data/tikzdocument.h create mode 100644 tikzit/src/data/tikzlexer.lexer.cpp create mode 100644 tikzit/src/data/tikzparser.parser.cpp create mode 100644 tikzit/src/data/tikzparser.parser.hpp create mode 100644 tikzit/src/gui/commands.cpp create mode 100644 tikzit/src/gui/commands.h create mode 100644 tikzit/src/gui/mainmenu.ui create mode 100755 tikzit/target_wrapper.sh create mode 100644 tikzit/tikzlexer.h diff --git a/tikzit/Makefile b/tikzit/Makefile new file mode 100644 index 0000000..ff6108f --- /dev/null +++ b/tikzit/Makefile @@ -0,0 +1,1139 @@ +############################################################################# +# Makefile for building: tikzit.app/Contents/MacOS/tikzit +# Generated by qmake (3.0) (Qt 5.7.1) +# Project: tikzit.pro +# Template: app +# Command: /usr/local/bin/qmake -o Makefile tikzit.pro +############################################################################# + +MAKEFILE = Makefile + +####### Compiler, tools and options + +CC = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang +CXX = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++ +DEFINES = -DQT_DEPRECATED_WARNINGS -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB +CFLAGS = -pipe -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -mmacosx-version-min=10.8 -O2 -Wall -W -fPIC $(DEFINES) +CXXFLAGS = -pipe -stdlib=libc++ -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -mmacosx-version-min=10.8 -O2 -std=gnu++11 -Wall -W -fPIC $(DEFINES) +INCPATH = -I. -Isrc -Isrc/gui -Isrc/data -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers -I. -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/OpenGL.framework/Headers -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/AGL.framework/Headers -I. -I/usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang -F/usr/local/Cellar/qt5/5.7.1_1/lib +QMAKE = /usr/local/bin/qmake +DEL_FILE = rm -f +CHK_DIR_EXISTS= test -d +MKDIR = mkdir -p +COPY = cp -f +COPY_FILE = cp -f +COPY_DIR = cp -f -R +INSTALL_FILE = install -m 644 -p +INSTALL_PROGRAM = install -m 755 -p +INSTALL_DIR = cp -f -R +DEL_FILE = rm -f +SYMLINK = ln -f -s +DEL_DIR = rmdir +MOVE = mv -f +TAR = tar -cf +COMPRESS = gzip -9f +DISTNAME = tikzit1.0.0 +DISTDIR = /Users/alek/git/tikzit/tikzit/.tmp/tikzit1.0.0 +LINK = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++ +LFLAGS = -headerpad_max_install_names -stdlib=libc++ -Wl,-syslibroot,/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -mmacosx-version-min=10.8 +LIBS = $(SUBLIBS) -F/usr/local/Cellar/qt5/5.7.1_1/lib -framework QtWidgets -framework QtGui -framework QtCore -framework DiskArbitration -framework IOKit -framework OpenGL -framework AGL +AR = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ar cq +RANLIB = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib -s +SED = sed +STRIP = strip + +####### Output directory + +OBJECTS_DIR = ./ + +####### Files + +SOURCES = src/gui/mainwindow.cpp \ + src/gui/toolpalette.cpp \ + src/gui/tikzscene.cpp \ + src/data/graph.cpp \ + src/data/node.cpp \ + src/data/edge.cpp \ + src/data/tikzgraphassembler.cpp \ + src/data/graphelementdata.cpp \ + src/data/graphelementproperty.cpp \ + src/gui/propertypalette.cpp \ + src/main.cpp src/data/tikzlexer.lexer.cpp \ + src/data/tikzparser.parser.cpp \ + qrc_tikzit.cpp \ + moc_mainwindow.cpp \ + moc_toolpalette.cpp \ + moc_graph.cpp \ + moc_node.cpp \ + moc_edge.cpp \ + moc_tikzgraphassembler.cpp \ + moc_graphelementdata.cpp \ + moc_propertypalette.cpp +OBJECTS = mainwindow.o \ + toolpalette.o \ + tikzscene.o \ + graph.o \ + node.o \ + edge.o \ + tikzgraphassembler.o \ + graphelementdata.o \ + graphelementproperty.o \ + propertypalette.o \ + main.o \ + tikzlexer.lexer.o \ + tikzparser.parser.o \ + qrc_tikzit.o \ + moc_mainwindow.o \ + moc_toolpalette.o \ + moc_graph.o \ + moc_node.o \ + moc_edge.o \ + moc_tikzgraphassembler.o \ + moc_graphelementdata.o \ + moc_propertypalette.o +DIST = /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/spec_pre.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/qdevice.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/device_config.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/unix.conf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/mac.conf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/macx.conf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/sanitize.conf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/gcc-base.conf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/gcc-base-mac.conf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/clang.conf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/clang-mac.conf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/qconfig.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dcore.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dcore_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dextras.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dextras_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dinput.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dinput_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dlogic.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dlogic_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquick.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquick_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickextras.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickextras_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickinput.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickinput_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickrender.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickrender_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3drender.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3drender_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_bluetooth.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_bluetooth_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_bootstrap_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_charts.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_charts_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_clucene_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_concurrent.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_concurrent_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_core.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_core_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_datavisualization.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_datavisualization_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_designer.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_designer_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_designercomponents_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gamepad.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gamepad_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gui.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gui_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_help.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_help_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_location.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_location_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_macextras.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_macextras_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimedia.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimedia_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimediawidgets.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimediawidgets_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_network.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_network_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_nfc.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_nfc_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_opengl.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_opengl_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_openglextensions.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_openglextensions_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_packetprotocol_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_platformsupport_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_positioning.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_positioning_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_printsupport.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_printsupport_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_purchasing.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_purchasing_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qml.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qml_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmldebug_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmldevtools_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmltest.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmltest_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quick.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quick_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickcontrols2.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickcontrols2_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickparticles_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quicktemplates2_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickwidgets.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickwidgets_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_script.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_script_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scripttools.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scripttools_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scxml.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scxml_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sensors.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sensors_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialbus.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialbus_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialport.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialport_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sql.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sql_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_svg.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_svg_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_testlib.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_testlib_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_uiplugin.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_uitools.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_uitools_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webchannel.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webchannel_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webengine.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webengine_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginecore.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginecore_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginecoreheaders_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginewidgets.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginewidgets_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_websockets.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_websockets_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webview.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webview_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_widgets.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_widgets_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xml.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xml_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xmlpatterns.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xmlpatterns_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/qt_functions.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/qt_config.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang/qmake.conf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/spec_post.prf \ + .qmake.stash \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/exclusive_builds.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/sdk.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/toolchain.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/toolchain.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/default_pre.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/default_pre.prf \ + flex.pri \ + bison.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/resolve_config.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/default_post.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/default_post.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/objective_c.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/resolve_target.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/testcase.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/warn_on.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/qt.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/resources.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/moc.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/unix/opengl.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/uic.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/unix/thread.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/file_copies.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/rez.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/asset_catalogs.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/testcase_targets.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/exceptions.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/yacc.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/lex.prf \ + tikzit.pro src/gui/mainwindow.h \ + src/gui/toolpalette.h \ + src/gui/tikzscene.h \ + src/data/graph.h \ + src/data/node.h \ + src/data/edge.h \ + src/data/tikzgraphassembler.h \ + src/data/graphelementdata.h \ + src/data/graphelementproperty.h \ + src/gui/propertypalette.h \ + src/data/tikzparserdefs.h src/gui/mainwindow.cpp \ + src/gui/toolpalette.cpp \ + src/gui/tikzscene.cpp \ + src/data/graph.cpp \ + src/data/node.cpp \ + src/data/edge.cpp \ + src/data/tikzgraphassembler.cpp \ + src/data/graphelementdata.cpp \ + src/data/graphelementproperty.cpp \ + src/gui/propertypalette.cpp \ + src/main.cpp +QMAKE_TARGET = tikzit +DESTDIR = +TARGET = tikzit.app/Contents/MacOS/tikzit + + +first: all +####### Build rules + +$(TARGET): src/data/tikzlexer.lexer.cpp src/data/tikzparser.parser.cpp src/data/tikzparser.parser.hpp ui_mainwindow.h ui_propertypalette.h $(OBJECTS) + @test -d tikzit.app/Contents/MacOS/ || mkdir -p tikzit.app/Contents/MacOS/ + $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) + +Makefile: tikzit.pro /usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang/qmake.conf /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/spec_pre.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/qdevice.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/device_config.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/unix.conf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/mac.conf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/macx.conf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/sanitize.conf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/gcc-base.conf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/gcc-base-mac.conf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/clang.conf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/clang-mac.conf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/qconfig.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dcore.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dcore_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dextras.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dextras_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dinput.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dinput_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dlogic.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dlogic_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquick.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquick_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickextras.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickextras_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickinput.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickinput_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickrender.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickrender_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3drender.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3drender_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_bluetooth.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_bluetooth_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_bootstrap_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_charts.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_charts_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_clucene_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_concurrent.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_concurrent_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_core.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_core_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_datavisualization.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_datavisualization_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_designer.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_designer_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_designercomponents_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gamepad.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gamepad_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gui.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gui_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_help.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_help_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_location.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_location_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_macextras.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_macextras_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimedia.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimedia_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimediawidgets.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimediawidgets_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_network.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_network_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_nfc.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_nfc_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_opengl.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_opengl_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_openglextensions.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_openglextensions_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_packetprotocol_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_platformsupport_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_positioning.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_positioning_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_printsupport.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_printsupport_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_purchasing.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_purchasing_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qml.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qml_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmldebug_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmldevtools_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmltest.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmltest_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quick.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quick_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickcontrols2.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickcontrols2_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickparticles_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quicktemplates2_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickwidgets.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickwidgets_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_script.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_script_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scripttools.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scripttools_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scxml.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scxml_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sensors.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sensors_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialbus.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialbus_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialport.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialport_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sql.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sql_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_svg.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_svg_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_testlib.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_testlib_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_uiplugin.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_uitools.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_uitools_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webchannel.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webchannel_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webengine.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webengine_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginecore.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginecore_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginecoreheaders_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginewidgets.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginewidgets_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_websockets.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_websockets_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webview.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webview_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_widgets.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_widgets_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xml.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xml_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xmlpatterns.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xmlpatterns_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/qt_functions.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/qt_config.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang/qmake.conf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/spec_post.prf \ + .qmake.stash \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/exclusive_builds.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/sdk.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/toolchain.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/toolchain.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/default_pre.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/default_pre.prf \ + flex.pri \ + bison.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/resolve_config.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/default_post.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/default_post.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/objective_c.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/resolve_target.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/testcase.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/warn_on.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/qt.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/resources.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/moc.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/unix/opengl.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/uic.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/unix/thread.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/file_copies.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/rez.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/asset_catalogs.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/testcase_targets.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/exceptions.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/yacc.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/lex.prf \ + tikzit.pro \ + tikzit.qrc \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/QtWidgets.prl \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/QtGui.prl \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/QtCore.prl + $(QMAKE) -o Makefile tikzit.pro +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/spec_pre.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/qdevice.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/device_config.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/unix.conf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/mac.conf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/macx.conf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/sanitize.conf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/gcc-base.conf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/gcc-base-mac.conf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/clang.conf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/clang-mac.conf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/qconfig.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dcore.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dcore_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dextras.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dextras_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dinput.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dinput_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dlogic.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dlogic_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquick.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquick_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickextras.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickextras_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickinput.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickinput_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickrender.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickrender_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3drender.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3drender_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_bluetooth.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_bluetooth_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_bootstrap_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_charts.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_charts_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_clucene_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_concurrent.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_concurrent_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_core.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_core_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_datavisualization.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_datavisualization_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_designer.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_designer_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_designercomponents_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gamepad.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gamepad_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gui.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gui_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_help.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_help_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_location.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_location_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_macextras.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_macextras_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimedia.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimedia_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimediawidgets.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimediawidgets_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_network.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_network_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_nfc.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_nfc_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_opengl.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_opengl_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_openglextensions.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_openglextensions_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_packetprotocol_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_platformsupport_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_positioning.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_positioning_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_printsupport.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_printsupport_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_purchasing.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_purchasing_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qml.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qml_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmldebug_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmldevtools_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmltest.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmltest_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quick.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quick_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickcontrols2.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickcontrols2_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickparticles_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quicktemplates2_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickwidgets.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickwidgets_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_script.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_script_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scripttools.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scripttools_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scxml.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scxml_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sensors.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sensors_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialbus.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialbus_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialport.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialport_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sql.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sql_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_svg.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_svg_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_testlib.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_testlib_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_uiplugin.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_uitools.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_uitools_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webchannel.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webchannel_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webengine.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webengine_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginecore.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginecore_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginecoreheaders_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginewidgets.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginewidgets_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_websockets.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_websockets_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webview.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webview_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_widgets.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_widgets_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xml.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xml_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xmlpatterns.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xmlpatterns_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/qt_functions.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/qt_config.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang/qmake.conf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/spec_post.prf: +.qmake.stash: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/exclusive_builds.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/sdk.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/toolchain.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/toolchain.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/default_pre.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/default_pre.prf: +flex.pri: +bison.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/resolve_config.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/default_post.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/default_post.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/objective_c.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/resolve_target.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/testcase.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/warn_on.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/qt.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/resources.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/moc.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/unix/opengl.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/uic.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/unix/thread.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/file_copies.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/rez.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/asset_catalogs.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/testcase_targets.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/exceptions.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/yacc.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/lex.prf: +tikzit.pro: +tikzit.qrc: +/usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/QtWidgets.prl: +/usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/QtGui.prl: +/usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/QtCore.prl: +qmake: FORCE + @$(QMAKE) -o Makefile tikzit.pro + +qmake_all: FORCE + +tikzit.app/Contents/PkgInfo: + @test -d tikzit.app/Contents || mkdir -p tikzit.app/Contents + @$(DEL_FILE) tikzit.app/Contents/PkgInfo + @echo "APPL????" > tikzit.app/Contents/PkgInfo +tikzit.app/Contents/Resources/empty.lproj: + @test -d tikzit.app/Contents/Resources || mkdir -p tikzit.app/Contents/Resources + @touch tikzit.app/Contents/Resources/empty.lproj + +tikzit.app/Contents/Info.plist: + @test -d tikzit.app/Contents || mkdir -p tikzit.app/Contents + @$(DEL_FILE) tikzit.app/Contents/Info.plist + @sed -e "s,@SHORT_VERSION@,1.0,g" -e "s,@FULL_VERSION@,1.0.0,g" -e "s,@TYPEINFO@,????,g" -e "s,@BUNDLEIDENTIFIER@,com.yourcompany.tikzit,g" -e "s,@ICON@,,g" -e "s,@EXECUTABLE@,tikzit,g" -e "s,@LIBRARY@,tikzit,g" -e "s,@TYPEINFO@,????,g" /usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang/Info.plist.app >tikzit.app/Contents/Info.plist + +all: Makefile \ + tikzit.app/Contents/PkgInfo \ + tikzit.app/Contents/Resources/empty.lproj \ + tikzit.app/Contents/Info.plist $(TARGET) + +dist: distdir FORCE + (cd `dirname $(DISTDIR)` && $(TAR) $(DISTNAME).tar $(DISTNAME) && $(COMPRESS) $(DISTNAME).tar) && $(MOVE) `dirname $(DISTDIR)`/$(DISTNAME).tar.gz . && $(DEL_FILE) -r $(DISTDIR) + +distdir: FORCE + @test -d $(DISTDIR) || mkdir -p $(DISTDIR) + $(COPY_FILE) --parents $(DIST) $(DISTDIR)/ + $(COPY_FILE) --parents src/data/tikzlexer.l $(DISTDIR)/ + $(COPY_FILE) --parents src/data/tikzparser.y $(DISTDIR)/ + $(COPY_FILE) --parents src/data/tikzparser.y $(DISTDIR)/ + $(COPY_FILE) --parents tikzit.qrc $(DISTDIR)/ + $(COPY_FILE) --parents src/gui/mainwindow.h src/gui/toolpalette.h src/gui/tikzscene.h src/data/graph.h src/data/node.h src/data/edge.h src/data/tikzgraphassembler.h src/data/graphelementdata.h src/data/graphelementproperty.h src/gui/propertypalette.h src/data/tikzparserdefs.h $(DISTDIR)/ + $(COPY_FILE) --parents src/gui/mainwindow.cpp src/gui/toolpalette.cpp src/gui/tikzscene.cpp src/data/graph.cpp src/data/node.cpp src/data/edge.cpp src/data/tikzgraphassembler.cpp src/data/graphelementdata.cpp src/data/graphelementproperty.cpp src/gui/propertypalette.cpp src/main.cpp $(DISTDIR)/ + $(COPY_FILE) --parents src/gui/mainwindow.ui src/gui/propertypalette.ui $(DISTDIR)/ + + +clean: compiler_clean + -$(DEL_FILE) $(OBJECTS) + -$(DEL_FILE) *~ core *.core + + +distclean: clean + -$(DEL_FILE) -r tikzit.app + -$(DEL_FILE) /Users/alek/git/tikzit/tikzit/target_wrapper.sh .qmake.stash + -$(DEL_FILE) Makefile + + +####### Sub-libraries + +check: first + /Users/alek/git/tikzit/tikzit/target_wrapper.sh $(TESTRUNNER) ./$(QMAKE_TARGET).app/Contents/MacOS/$(QMAKE_TARGET) $(TESTARGS) + +mocclean: compiler_moc_header_clean compiler_moc_source_clean + +mocables: compiler_moc_header_make_all compiler_moc_source_make_all + +benchmark: first + +compiler_flex_make_all: src/data/tikzlexer.lexer.cpp +compiler_flex_clean: + -$(DEL_FILE) src/data/tikzlexer.lexer.cpp +src/data/tikzlexer.lexer.cpp: src/data/tikzlexer.l + flex --header-file -o src/data/tikzlexer.lexer.cpp src/data/tikzlexer.l + +compiler_bison_make_all: src/data/tikzparser.parser.cpp +compiler_bison_clean: + -$(DEL_FILE) src/data/tikzparser.parser.cpp +src/data/tikzparser.parser.cpp: src/data/tikzparser.y + bison -d -o src/data/tikzparser.parser.cpp src/data/tikzparser.y + +compiler_bison_header_make_all: src/data/tikzparser.parser.hpp +compiler_bison_header_clean: + -$(DEL_FILE) src/data/tikzparser.parser.hpp +src/data/tikzparser.parser.hpp: src/data/tikzparser.y + bison -d -o src/data/tikzparser.parser.cpp src/data/tikzparser.y + +compiler_rcc_make_all: qrc_tikzit.cpp +compiler_rcc_clean: + -$(DEL_FILE) qrc_tikzit.cpp +qrc_tikzit.cpp: tikzit.qrc \ + /usr/local/Cellar/qt5/5.7.1_1/bin/rcc \ + images/draw-ellipse.png \ + images/transform-crop-and-resize.png \ + images/draw-path.png \ + images/select-rectangular.png + /usr/local/Cellar/qt5/5.7.1_1/bin/rcc -name tikzit tikzit.qrc -o qrc_tikzit.cpp + +compiler_moc_header_make_all: moc_mainwindow.cpp moc_toolpalette.cpp moc_graph.cpp moc_node.cpp moc_edge.cpp moc_tikzgraphassembler.cpp moc_graphelementdata.cpp moc_propertypalette.cpp +compiler_moc_header_clean: + -$(DEL_FILE) moc_mainwindow.cpp moc_toolpalette.cpp moc_graph.cpp moc_node.cpp moc_edge.cpp moc_tikzgraphassembler.cpp moc_graphelementdata.cpp moc_propertypalette.cpp +moc_mainwindow.cpp: src/gui/tikzscene.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QWidget \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qwidget.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QGraphicsScene \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qgraphicsscene.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QMainWindow \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qmainwindow.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QGraphicsView \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qgraphicsview.h \ + src/gui/mainwindow.h \ + /usr/local/Cellar/qt5/5.7.1_1/bin/moc + /usr/local/Cellar/qt5/5.7.1_1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -D__APPLE_CC__ -I/usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang -I/Users/alek/git/tikzit/tikzit -I/Users/alek/git/tikzit/tikzit/src -I/Users/alek/git/tikzit/tikzit/src/gui -I/Users/alek/git/tikzit/tikzit/src/data -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/8.0.0/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include -F/usr/local/Cellar/qt5/5.7.1_1/lib src/gui/mainwindow.h -o moc_mainwindow.cpp + +moc_toolpalette.cpp: /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QToolBar \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qtoolbar.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QAction \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qaction.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QActionGroup \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qactiongroup.h \ + src/gui/toolpalette.h \ + /usr/local/Cellar/qt5/5.7.1_1/bin/moc + /usr/local/Cellar/qt5/5.7.1_1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -D__APPLE_CC__ -I/usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang -I/Users/alek/git/tikzit/tikzit -I/Users/alek/git/tikzit/tikzit/src -I/Users/alek/git/tikzit/tikzit/src/gui -I/Users/alek/git/tikzit/tikzit/src/data -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/8.0.0/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include -F/usr/local/Cellar/qt5/5.7.1_1/lib src/gui/toolpalette.h -o moc_toolpalette.cpp + +moc_graph.cpp: src/data/node.h \ + src/data/graphelementdata.h \ + src/data/graphelementproperty.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QPointF \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qpoint.h \ + src/data/edge.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QMultiHash \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qhash.h \ + src/data/graph.h \ + /usr/local/Cellar/qt5/5.7.1_1/bin/moc + /usr/local/Cellar/qt5/5.7.1_1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -D__APPLE_CC__ -I/usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang -I/Users/alek/git/tikzit/tikzit -I/Users/alek/git/tikzit/tikzit/src -I/Users/alek/git/tikzit/tikzit/src/gui -I/Users/alek/git/tikzit/tikzit/src/data -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/8.0.0/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include -F/usr/local/Cellar/qt5/5.7.1_1/lib src/data/graph.h -o moc_graph.cpp + +moc_node.cpp: src/data/graphelementdata.h \ + src/data/graphelementproperty.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QPointF \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qpoint.h \ + src/data/node.h \ + /usr/local/Cellar/qt5/5.7.1_1/bin/moc + /usr/local/Cellar/qt5/5.7.1_1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -D__APPLE_CC__ -I/usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang -I/Users/alek/git/tikzit/tikzit -I/Users/alek/git/tikzit/tikzit/src -I/Users/alek/git/tikzit/tikzit/src/gui -I/Users/alek/git/tikzit/tikzit/src/data -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/8.0.0/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include -F/usr/local/Cellar/qt5/5.7.1_1/lib src/data/node.h -o moc_node.cpp + +moc_edge.cpp: src/data/graphelementdata.h \ + src/data/graphelementproperty.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ + src/data/edge.h \ + /usr/local/Cellar/qt5/5.7.1_1/bin/moc + /usr/local/Cellar/qt5/5.7.1_1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -D__APPLE_CC__ -I/usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang -I/Users/alek/git/tikzit/tikzit -I/Users/alek/git/tikzit/tikzit/src -I/Users/alek/git/tikzit/tikzit/src/gui -I/Users/alek/git/tikzit/tikzit/src/data -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/8.0.0/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include -F/usr/local/Cellar/qt5/5.7.1_1/lib src/data/edge.h -o moc_edge.cpp + +moc_tikzgraphassembler.cpp: src/data/node.h \ + src/data/graphelementdata.h \ + src/data/graphelementproperty.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QPointF \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qpoint.h \ + src/data/graph.h \ + src/data/edge.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QMultiHash \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qhash.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QHash \ + src/data/tikzgraphassembler.h \ + /usr/local/Cellar/qt5/5.7.1_1/bin/moc + /usr/local/Cellar/qt5/5.7.1_1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -D__APPLE_CC__ -I/usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang -I/Users/alek/git/tikzit/tikzit -I/Users/alek/git/tikzit/tikzit/src -I/Users/alek/git/tikzit/tikzit/src/gui -I/Users/alek/git/tikzit/tikzit/src/data -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/8.0.0/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include -F/usr/local/Cellar/qt5/5.7.1_1/lib src/data/tikzgraphassembler.h -o moc_tikzgraphassembler.cpp + +moc_graphelementdata.cpp: src/data/graphelementproperty.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ + src/data/graphelementdata.h \ + /usr/local/Cellar/qt5/5.7.1_1/bin/moc + /usr/local/Cellar/qt5/5.7.1_1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -D__APPLE_CC__ -I/usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang -I/Users/alek/git/tikzit/tikzit -I/Users/alek/git/tikzit/tikzit/src -I/Users/alek/git/tikzit/tikzit/src/gui -I/Users/alek/git/tikzit/tikzit/src/data -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/8.0.0/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include -F/usr/local/Cellar/qt5/5.7.1_1/lib src/data/graphelementdata.h -o moc_graphelementdata.cpp + +moc_propertypalette.cpp: /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QDockWidget \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qdockwidget.h \ + src/gui/propertypalette.h \ + /usr/local/Cellar/qt5/5.7.1_1/bin/moc + /usr/local/Cellar/qt5/5.7.1_1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -D__APPLE_CC__ -I/usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang -I/Users/alek/git/tikzit/tikzit -I/Users/alek/git/tikzit/tikzit/src -I/Users/alek/git/tikzit/tikzit/src/gui -I/Users/alek/git/tikzit/tikzit/src/data -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/8.0.0/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include -F/usr/local/Cellar/qt5/5.7.1_1/lib src/gui/propertypalette.h -o moc_propertypalette.cpp + +compiler_moc_source_make_all: +compiler_moc_source_clean: +compiler_uic_make_all: ui_mainwindow.h ui_propertypalette.h +compiler_uic_clean: + -$(DEL_FILE) ui_mainwindow.h ui_propertypalette.h +ui_mainwindow.h: src/gui/mainwindow.ui \ + /usr/local/Cellar/qt5/5.7.1_1/bin/uic + /usr/local/Cellar/qt5/5.7.1_1/bin/uic src/gui/mainwindow.ui -o ui_mainwindow.h + +ui_propertypalette.h: src/gui/propertypalette.ui \ + /usr/local/Cellar/qt5/5.7.1_1/bin/uic + /usr/local/Cellar/qt5/5.7.1_1/bin/uic src/gui/propertypalette.ui -o ui_propertypalette.h + +compiler_rez_source_make_all: +compiler_rez_source_clean: +compiler_yacc_decl_make_all: +compiler_yacc_decl_clean: +compiler_yacc_impl_make_all: +compiler_yacc_impl_clean: +compiler_lex_make_all: +compiler_lex_clean: +compiler_clean: compiler_flex_clean compiler_bison_clean compiler_bison_header_clean compiler_rcc_clean compiler_moc_header_clean compiler_uic_clean + +####### Compile + +mainwindow.o: src/gui/mainwindow.cpp src/gui/mainwindow.h \ + src/gui/tikzscene.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QWidget \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qwidget.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QGraphicsScene \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qgraphicsscene.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QMainWindow \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qmainwindow.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QGraphicsView \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qgraphicsview.h \ + ui_mainwindow.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QDebug \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qdebug.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o mainwindow.o src/gui/mainwindow.cpp + +toolpalette.o: src/gui/toolpalette.cpp src/gui/toolpalette.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QToolBar \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qtoolbar.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QAction \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qaction.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QActionGroup \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qactiongroup.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QLayout \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qlayout.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QVBoxLayout \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qboxlayout.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o toolpalette.o src/gui/toolpalette.cpp + +tikzscene.o: src/gui/tikzscene.cpp src/gui/tikzscene.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QWidget \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qwidget.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QGraphicsScene \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qgraphicsscene.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o tikzscene.o src/gui/tikzscene.cpp + +graph.o: src/data/graph.cpp src/data/graph.h \ + src/data/node.h \ + src/data/graphelementdata.h \ + src/data/graphelementproperty.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QPointF \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qpoint.h \ + src/data/edge.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QMultiHash \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qhash.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o graph.o src/data/graph.cpp + +node.o: src/data/node.cpp src/data/node.h \ + src/data/graphelementdata.h \ + src/data/graphelementproperty.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QPointF \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qpoint.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QDebug \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qdebug.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o node.o src/data/node.cpp + +edge.o: src/data/edge.cpp src/data/edge.h \ + src/data/graphelementdata.h \ + src/data/graphelementproperty.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o edge.o src/data/edge.cpp + +tikzgraphassembler.o: src/data/tikzgraphassembler.cpp src/data/tikzgraphassembler.h \ + src/data/node.h \ + src/data/graphelementdata.h \ + src/data/graphelementproperty.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QPointF \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qpoint.h \ + src/data/graph.h \ + src/data/edge.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QMultiHash \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qhash.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QHash + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o tikzgraphassembler.o src/data/tikzgraphassembler.cpp + +graphelementdata.o: src/data/graphelementdata.cpp src/data/graphelementdata.h \ + src/data/graphelementproperty.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QDebug \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qdebug.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o graphelementdata.o src/data/graphelementdata.cpp + +graphelementproperty.o: src/data/graphelementproperty.cpp src/data/graphelementproperty.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o graphelementproperty.o src/data/graphelementproperty.cpp + +propertypalette.o: src/gui/propertypalette.cpp src/gui/propertypalette.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QDockWidget \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qdockwidget.h \ + src/data/graphelementdata.h \ + src/data/graphelementproperty.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ + ui_propertypalette.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QDebug \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qdebug.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers/QCloseEvent \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers/qevent.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QSettings \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qsettings.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o propertypalette.o src/gui/propertypalette.cpp + +main.o: src/main.cpp src/gui/mainwindow.h \ + src/gui/tikzscene.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QWidget \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qwidget.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QGraphicsScene \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qgraphicsscene.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QMainWindow \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qmainwindow.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QGraphicsView \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qgraphicsview.h \ + src/gui/toolpalette.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QToolBar \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qtoolbar.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QAction \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qaction.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QActionGroup \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qactiongroup.h \ + src/gui/propertypalette.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QDockWidget \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qdockwidget.h \ + src/data/graph.h \ + src/data/node.h \ + src/data/graphelementdata.h \ + src/data/graphelementproperty.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QPointF \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qpoint.h \ + src/data/edge.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QMultiHash \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qhash.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QApplication \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qapplication.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o src/main.cpp + +tikzlexer.lexer.o: src/data/tikzlexer.lexer.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o tikzlexer.lexer.o src/data/tikzlexer.lexer.cpp + +tikzparser.parser.o: src/data/tikzparser.parser.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o tikzparser.parser.o src/data/tikzparser.parser.cpp + +qrc_tikzit.o: qrc_tikzit.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o qrc_tikzit.o qrc_tikzit.cpp + +moc_mainwindow.o: moc_mainwindow.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_mainwindow.o moc_mainwindow.cpp + +moc_toolpalette.o: moc_toolpalette.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_toolpalette.o moc_toolpalette.cpp + +moc_graph.o: moc_graph.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_graph.o moc_graph.cpp + +moc_node.o: moc_node.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_node.o moc_node.cpp + +moc_edge.o: moc_edge.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_edge.o moc_edge.cpp + +moc_tikzgraphassembler.o: moc_tikzgraphassembler.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_tikzgraphassembler.o moc_tikzgraphassembler.cpp + +moc_graphelementdata.o: moc_graphelementdata.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_graphelementdata.o moc_graphelementdata.cpp + +moc_propertypalette.o: moc_propertypalette.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_propertypalette.o moc_propertypalette.cpp + +####### Install + +install_target: first FORCE + @test -d $(INSTALL_ROOT)/usr/local/Cellar/qt5/5.7.1_1/tests/tikzit || mkdir -p $(INSTALL_ROOT)/usr/local/Cellar/qt5/5.7.1_1/tests/tikzit + $(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/Cellar/qt5/5.7.1_1/tests/tikzit/tikzit.app + + -$(INSTALL_DIR) tikzit.app $(INSTALL_ROOT)/usr/local/Cellar/qt5/5.7.1_1/tests/tikzit/tikzit.app + -$(STRIP) $(INSTALL_ROOT)/usr/local/Cellar/qt5/5.7.1_1/tests/tikzit/tikzit.app/Contents/MacOS/$(QMAKE_TARGET) + +uninstall_target: FORCE + -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/Cellar/qt5/5.7.1_1/tests/tikzit/tikzit.app + -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/Cellar/qt5/5.7.1_1/tests/tikzit/ + + +install: install_target FORCE + +uninstall: uninstall_target FORCE + +FORCE: + diff --git a/tikzit/src/data/tikzdocument.cpp b/tikzit/src/data/tikzdocument.cpp new file mode 100644 index 0000000..c8d4ce9 --- /dev/null +++ b/tikzit/src/data/tikzdocument.cpp @@ -0,0 +1,75 @@ +#include +#include +#include +#include +#include + +#include "tikzdocument.h" +#include "tikzgraphassembler.h" + +TikzDocument::TikzDocument(QObject *parent) : QObject(parent) +{ + _graph = new Graph(this); + _parseSuccess = true; + _fileName = ""; + _shortName = ""; +} + +QUndoStack *TikzDocument::undoStack() const +{ + return _undoStack; +} + +Graph *TikzDocument::graph() const +{ + return _graph; +} + +QString TikzDocument::tikz() const +{ + return _tikz; +} + +void TikzDocument::open(QString fileName) +{ + _fileName = fileName; + QFile file(fileName); + QFileInfo fi(file); + _shortName = fi.fileName(); + QSettings settings("tikzit", "tikzit"); + settings.setValue("previous-file-path", fi.absolutePath()); + + if (!file.open(QIODevice::ReadOnly)) { +// QMessageBox::critical(this, tr("Error"), +// tr("Could not open file")); + _parseSuccess = false; + return; + } + + QTextStream in(&file); + _tikz = in.readAll(); + file.close(); + + Graph *newGraph = new Graph(this); + TikzGraphAssembler ass(newGraph); + if (ass.parse(_tikz)) { + delete _graph; + _graph = newGraph; + foreach (Node *n, _graph->nodes()) n->attachStyle(); + foreach (Edge *e, _graph->edges()) e->updateControls(); + _parseSuccess = true; + } else { + delete newGraph; + _parseSuccess = false; + } +} + +QString TikzDocument::shortName() const +{ + return _shortName; +} + +bool TikzDocument::parseSuccess() const +{ + return _parseSuccess; +} diff --git a/tikzit/src/data/tikzdocument.h b/tikzit/src/data/tikzdocument.h new file mode 100644 index 0000000..0e97b13 --- /dev/null +++ b/tikzit/src/data/tikzdocument.h @@ -0,0 +1,36 @@ +#ifndef TIKZDOCUMENT_H +#define TIKZDOCUMENT_H + +#include "graph.h" + +#include +#include + +class TikzDocument : public QObject +{ + Q_OBJECT +public: + explicit TikzDocument(QObject *parent = 0); + Graph *graph() const; + QString tikz() const; + QUndoStack *undoStack() const; + bool parseSuccess() const; + + void open(QString fileName); + + QString shortName() const; + +private: + Graph *_graph; + QString _tikz; + QString _fileName; + QString _shortName; + QUndoStack *_undoStack; + bool _parseSuccess; + +signals: + +public slots: +}; + +#endif // TIKZDOCUMENT_H diff --git a/tikzit/src/data/tikzlexer.lexer.cpp b/tikzit/src/data/tikzlexer.lexer.cpp new file mode 100644 index 0000000..7ff1d18 --- /dev/null +++ b/tikzit/src/data/tikzlexer.lexer.cpp @@ -0,0 +1,2535 @@ +#line 2 "../tikzit/src/data/tikzlexer.lexer.cpp" + +#line 4 "../tikzit/src/data/tikzlexer.lexer.cpp" + +#define YY_INT_ALIGNED short int + +/* A lexical scanner generated by flex */ + +#define FLEX_SCANNER +#define YY_FLEX_MAJOR_VERSION 2 +#define YY_FLEX_MINOR_VERSION 5 +#define YY_FLEX_SUBMINOR_VERSION 35 +#if YY_FLEX_SUBMINOR_VERSION > 0 +#define FLEX_BETA +#endif + +/* First, we deal with platform-specific or compiler-specific issues. */ + +/* begin standard C headers. */ +#include +#include +#include +#include + +/* end standard C headers. */ + +/* flex integer type definitions */ + +#ifndef FLEXINT_H +#define FLEXINT_H + +/* C99 systems have . Non-C99 systems may or may not. */ + +#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L + +/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, + * if you want the limit (max/min) macros for int types. + */ +#ifndef __STDC_LIMIT_MACROS +#define __STDC_LIMIT_MACROS 1 +#endif + +#include +typedef int8_t flex_int8_t; +typedef uint8_t flex_uint8_t; +typedef int16_t flex_int16_t; +typedef uint16_t flex_uint16_t; +typedef int32_t flex_int32_t; +typedef uint32_t flex_uint32_t; +typedef uint64_t flex_uint64_t; +#else +typedef signed char flex_int8_t; +typedef short int flex_int16_t; +typedef int flex_int32_t; +typedef unsigned char flex_uint8_t; +typedef unsigned short int flex_uint16_t; +typedef unsigned int flex_uint32_t; +#endif /* ! C99 */ + +/* Limits of integral types. */ +#ifndef INT8_MIN +#define INT8_MIN (-128) +#endif +#ifndef INT16_MIN +#define INT16_MIN (-32767-1) +#endif +#ifndef INT32_MIN +#define INT32_MIN (-2147483647-1) +#endif +#ifndef INT8_MAX +#define INT8_MAX (127) +#endif +#ifndef INT16_MAX +#define INT16_MAX (32767) +#endif +#ifndef INT32_MAX +#define INT32_MAX (2147483647) +#endif +#ifndef UINT8_MAX +#define UINT8_MAX (255U) +#endif +#ifndef UINT16_MAX +#define UINT16_MAX (65535U) +#endif +#ifndef UINT32_MAX +#define UINT32_MAX (4294967295U) +#endif + +#endif /* ! FLEXINT_H */ + +#ifdef __cplusplus + +/* The "const" storage-class-modifier is valid. */ +#define YY_USE_CONST + +#else /* ! __cplusplus */ + +/* C99 requires __STDC__ to be defined as 1. */ +#if defined (__STDC__) + +#define YY_USE_CONST + +#endif /* defined (__STDC__) */ +#endif /* ! __cplusplus */ + +#ifdef YY_USE_CONST +#define yyconst const +#else +#define yyconst +#endif + +/* Returned upon end-of-file. */ +#define YY_NULL 0 + +/* Promotes a possibly negative, possibly signed char to an unsigned + * integer for use as an array index. If the signed char is negative, + * we want to instead treat it as an 8-bit unsigned char, hence the + * double cast. + */ +#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) + +/* An opaque pointer. */ +#ifndef YY_TYPEDEF_YY_SCANNER_T +#define YY_TYPEDEF_YY_SCANNER_T +typedef void* yyscan_t; +#endif + +/* For convenience, these vars (plus the bison vars far below) + are macros in the reentrant scanner. */ +#define yyin yyg->yyin_r +#define yyout yyg->yyout_r +#define yyextra yyg->yyextra_r +#define yyleng yyg->yyleng_r +#define yytext yyg->yytext_r +#define yylineno (YY_CURRENT_BUFFER_LVALUE->yy_bs_lineno) +#define yycolumn (YY_CURRENT_BUFFER_LVALUE->yy_bs_column) +#define yy_flex_debug yyg->yy_flex_debug_r + +/* Enter a start condition. This macro really ought to take a parameter, + * but we do it the disgusting crufty way forced on us by the ()-less + * definition of BEGIN. + */ +#define BEGIN yyg->yy_start = 1 + 2 * + +/* Translate the current start state into a value that can be later handed + * to BEGIN to return to the state. The YYSTATE alias is for lex + * compatibility. + */ +#define YY_START ((yyg->yy_start - 1) / 2) +#define YYSTATE YY_START + +/* Action number for EOF rule of a given start state. */ +#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) + +/* Special action meaning "start processing a new file". */ +#define YY_NEW_FILE yyrestart(yyin ,yyscanner ) + +#define YY_END_OF_BUFFER_CHAR 0 + +/* Size of default input buffer. */ +#ifndef YY_BUF_SIZE +#define YY_BUF_SIZE 16384 +#endif + +/* The state buf must be large enough to hold one state per character in the main buffer. + */ +#define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type)) + +#ifndef YY_TYPEDEF_YY_BUFFER_STATE +#define YY_TYPEDEF_YY_BUFFER_STATE +typedef struct yy_buffer_state *YY_BUFFER_STATE; +#endif + +#ifndef YY_TYPEDEF_YY_SIZE_T +#define YY_TYPEDEF_YY_SIZE_T +typedef size_t yy_size_t; +#endif + +#define EOB_ACT_CONTINUE_SCAN 0 +#define EOB_ACT_END_OF_FILE 1 +#define EOB_ACT_LAST_MATCH 2 + + /* Note: We specifically omit the test for yy_rule_can_match_eol because it requires + * access to the local variable yy_act. Since yyless() is a macro, it would break + * existing scanners that call yyless() from OUTSIDE yylex. + * One obvious solution it to make yy_act a global. I tried that, and saw + * a 5% performance hit in a non-yylineno scanner, because yy_act is + * normally declared as a register variable-- so it is not worth it. + */ + #define YY_LESS_LINENO(n) \ + do { \ + yy_size_t yyl;\ + for ( yyl = n; yyl < yyleng; ++yyl )\ + if ( yytext[yyl] == '\n' )\ + --yylineno;\ + }while(0) + +/* Return all but the first "n" matched characters back to the input stream. */ +#define yyless(n) \ + do \ + { \ + /* Undo effects of setting up yytext. */ \ + int yyless_macro_arg = (n); \ + YY_LESS_LINENO(yyless_macro_arg);\ + *yy_cp = yyg->yy_hold_char; \ + YY_RESTORE_YY_MORE_OFFSET \ + yyg->yy_c_buf_p = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \ + YY_DO_BEFORE_ACTION; /* set up yytext again */ \ + } \ + while ( 0 ) + +#define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner ) + +#ifndef YY_STRUCT_YY_BUFFER_STATE +#define YY_STRUCT_YY_BUFFER_STATE +struct yy_buffer_state + { + FILE *yy_input_file; + + char *yy_ch_buf; /* input buffer */ + char *yy_buf_pos; /* current position in input buffer */ + + /* Size of input buffer in bytes, not including room for EOB + * characters. + */ + yy_size_t yy_buf_size; + + /* Number of characters read into yy_ch_buf, not including EOB + * characters. + */ + yy_size_t yy_n_chars; + + /* Whether we "own" the buffer - i.e., we know we created it, + * and can realloc() it to grow it, and should free() it to + * delete it. + */ + int yy_is_our_buffer; + + /* Whether this is an "interactive" input source; if so, and + * if we're using stdio for input, then we want to use getc() + * instead of fread(), to make sure we stop fetching input after + * each newline. + */ + int yy_is_interactive; + + /* Whether we're considered to be at the beginning of a line. + * If so, '^' rules will be active on the next match, otherwise + * not. + */ + int yy_at_bol; + + int yy_bs_lineno; /**< The line count. */ + int yy_bs_column; /**< The column count. */ + + /* Whether to try to fill the input buffer when we reach the + * end of it. + */ + int yy_fill_buffer; + + int yy_buffer_status; + +#define YY_BUFFER_NEW 0 +#define YY_BUFFER_NORMAL 1 + /* When an EOF's been seen but there's still some text to process + * then we mark the buffer as YY_EOF_PENDING, to indicate that we + * shouldn't try reading from the input source any more. We might + * still have a bunch of tokens to match, though, because of + * possible backing-up. + * + * When we actually see the EOF, we change the status to "new" + * (via yyrestart()), so that the user can continue scanning by + * just pointing yyin at a new input file. + */ +#define YY_BUFFER_EOF_PENDING 2 + + }; +#endif /* !YY_STRUCT_YY_BUFFER_STATE */ + +/* We provide macros for accessing buffer states in case in the + * future we want to put the buffer states in a more general + * "scanner state". + * + * Returns the top of the stack, or NULL. + */ +#define YY_CURRENT_BUFFER ( yyg->yy_buffer_stack \ + ? yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] \ + : NULL) + +/* Same as previous macro, but useful when we know that the buffer stack is not + * NULL or when we need an lvalue. For internal use only. + */ +#define YY_CURRENT_BUFFER_LVALUE yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] + +void yyrestart (FILE *input_file ,yyscan_t yyscanner ); +void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); +YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ,yyscan_t yyscanner ); +void yy_delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); +void yy_flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); +void yypush_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); +void yypop_buffer_state (yyscan_t yyscanner ); + +static void yyensure_buffer_stack (yyscan_t yyscanner ); +static void yy_load_buffer_state (yyscan_t yyscanner ); +static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file ,yyscan_t yyscanner ); + +#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER ,yyscanner) + +YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ,yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len ,yyscan_t yyscanner ); + +void *yyalloc (yy_size_t ,yyscan_t yyscanner ); +void *yyrealloc (void *,yy_size_t ,yyscan_t yyscanner ); +void yyfree (void * ,yyscan_t yyscanner ); + +#define yy_new_buffer yy_create_buffer + +#define yy_set_interactive(is_interactive) \ + { \ + if ( ! YY_CURRENT_BUFFER ){ \ + yyensure_buffer_stack (yyscanner); \ + YY_CURRENT_BUFFER_LVALUE = \ + yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \ + } \ + YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ + } + +#define yy_set_bol(at_bol) \ + { \ + if ( ! YY_CURRENT_BUFFER ){\ + yyensure_buffer_stack (yyscanner); \ + YY_CURRENT_BUFFER_LVALUE = \ + yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \ + } \ + YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ + } + +#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) + +#define yywrap(n) 1 +#define YY_SKIP_YYWRAP + +typedef unsigned char YY_CHAR; + +typedef int yy_state_type; + +#define yytext_ptr yytext_r + +static yy_state_type yy_get_previous_state (yyscan_t yyscanner ); +static yy_state_type yy_try_NUL_trans (yy_state_type current_state ,yyscan_t yyscanner); +static int yy_get_next_buffer (yyscan_t yyscanner ); +static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner ); + +/* Done after the current pattern has been matched and before the + * corresponding action - sets up yytext. + */ +#define YY_DO_BEFORE_ACTION \ + yyg->yytext_ptr = yy_bp; \ + yyleng = (yy_size_t) (yy_cp - yy_bp); \ + yyg->yy_hold_char = *yy_cp; \ + *yy_cp = '\0'; \ + yyg->yy_c_buf_p = yy_cp; + +#define YY_NUM_RULES 35 +#define YY_END_OF_BUFFER 36 +/* This struct is not used in this scanner, + but its presence is necessary. */ +struct yy_trans_info + { + flex_int32_t yy_verify; + flex_int32_t yy_nxt; + }; +static yyconst flex_int16_t yy_accept[259] = + { 0, + 0, 0, 0, 0, 16, 16, 18, 18, 0, 0, + 36, 34, 2, 1, 1, 25, 33, 14, 20, 34, + 33, 33, 33, 33, 29, 23, 1, 23, 22, 23, + 14, 21, 20, 23, 24, 23, 23, 23, 23, 16, + 34, 16, 19, 17, 18, 34, 18, 27, 2, 1, + 25, 28, 26, 27, 14, 20, 27, 27, 27, 27, + 27, 2, 1, 0, 0, 0, 0, 0, 33, 32, + 32, 32, 32, 32, 32, 12, 33, 33, 13, 23, + 0, 0, 23, 23, 23, 23, 23, 23, 23, 23, + 23, 23, 12, 23, 23, 13, 0, 16, 16, 16, + + 0, 18, 18, 18, 27, 2, 27, 27, 27, 27, + 27, 27, 27, 27, 27, 27, 27, 12, 27, 27, + 13, 0, 15, 0, 0, 0, 0, 0, 32, 32, + 32, 32, 32, 33, 33, 0, 23, 23, 23, 23, + 23, 23, 23, 23, 27, 27, 27, 27, 27, 27, + 27, 27, 27, 27, 27, 0, 0, 32, 32, 31, + 32, 32, 11, 33, 23, 23, 23, 23, 23, 11, + 23, 27, 27, 27, 27, 27, 27, 11, 27, 32, + 7, 0, 8, 9, 33, 23, 7, 8, 9, 23, + 27, 7, 8, 9, 27, 30, 0, 0, 33, 23, + + 23, 27, 27, 0, 0, 0, 33, 23, 27, 0, + 0, 0, 0, 33, 23, 27, 0, 0, 0, 0, + 10, 10, 10, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, + 0, 0, 0, 4, 5, 0, 3, 0 + } ; + +static yyconst flex_int32_t yy_ec[256] = + { 0, + 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, + 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 5, 1, 1, 1, 1, 1, 1, 1, 6, + 7, 1, 1, 8, 9, 10, 1, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 1, 12, 1, + 13, 1, 1, 1, 14, 14, 14, 14, 14, 14, + 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, + 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, + 15, 16, 17, 1, 1, 1, 18, 19, 20, 21, + + 22, 23, 24, 25, 26, 14, 27, 28, 14, 29, + 30, 31, 14, 32, 14, 33, 34, 14, 35, 14, + 36, 37, 38, 1, 39, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1 + } ; + +static yyconst flex_int32_t yy_meta[40] = + { 0, + 1, 1, 2, 1, 1, 1, 3, 4, 1, 3, + 5, 1, 4, 5, 1, 1, 4, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 2, 1 + } ; + +static yyconst flex_int16_t yy_base[265] = + { 0, + 0, 0, 39, 0, 70, 73, 105, 137, 175, 0, + 694, 896, 83, 896, 688, 81, 0, 896, 896, 74, + 655, 656, 663, 653, 896, 92, 96, 213, 896, 224, + 102, 896, 104, 263, 896, 302, 87, 88, 89, 113, + 671, 115, 896, 896, 117, 670, 119, 0, 129, 675, + 127, 896, 896, 341, 0, 0, 380, 419, 109, 118, + 119, 148, 896, 149, 156, 163, 664, 227, 0, 0, + 651, 639, 641, 639, 650, 0, 646, 646, 0, 167, + 214, 457, 239, 240, 250, 630, 294, 300, 450, 305, + 464, 478, 627, 233, 67, 625, 645, 145, 643, 246, + + 642, 322, 639, 327, 0, 215, 354, 361, 368, 432, + 613, 425, 482, 495, 499, 512, 526, 609, 238, 319, + 607, 549, 896, 450, 628, 556, 238, 440, 614, 614, + 600, 599, 585, 586, 574, 468, 527, 549, 563, 543, + 567, 580, 318, 573, 605, 612, 619, 369, 612, 626, + 606, 630, 643, 322, 572, 157, 473, 578, 568, 562, + 575, 570, 0, 575, 658, 671, 688, 682, 708, 558, + 100, 323, 721, 734, 751, 693, 771, 557, 287, 558, + 0, 336, 0, 0, 554, 745, 756, 776, 782, 247, + 787, 793, 798, 804, 354, 541, 553, 550, 551, 817, + + 229, 837, 277, 408, 546, 526, 524, 405, 459, 527, + 524, 519, 509, 518, 396, 431, 516, 510, 507, 494, + 0, 490, 489, 489, 478, 484, 484, 479, 475, 487, + 482, 470, 465, 454, 456, 470, 457, 453, 440, 427, + 417, 417, 398, 404, 388, 351, 353, 329, 328, 896, + 309, 209, 205, 896, 896, 131, 896, 896, 136, 97, + 875, 880, 885, 890 + } ; + +static yyconst flex_int16_t yy_def[265] = + { 0, + 258, 1, 258, 3, 1, 1, 1, 1, 258, 9, + 258, 258, 258, 258, 258, 258, 259, 258, 258, 260, + 259, 259, 259, 259, 258, 261, 261, 261, 258, 262, + 261, 258, 261, 258, 258, 262, 36, 36, 36, 258, + 258, 259, 258, 258, 258, 258, 259, 263, 263, 263, + 263, 258, 258, 264, 263, 263, 258, 264, 58, 58, + 58, 258, 258, 258, 258, 258, 258, 258, 259, 260, + 260, 260, 260, 260, 260, 259, 259, 259, 259, 261, + 261, 261, 261, 261, 261, 36, 34, 34, 34, 34, + 34, 34, 36, 36, 36, 36, 258, 258, 258, 259, + + 258, 258, 258, 259, 263, 263, 263, 263, 263, 263, + 58, 57, 57, 57, 57, 57, 57, 58, 58, 58, + 58, 258, 258, 258, 258, 258, 258, 258, 260, 260, + 260, 260, 260, 259, 259, 261, 261, 34, 34, 34, + 34, 34, 36, 36, 263, 263, 263, 263, 57, 57, + 57, 57, 57, 58, 58, 258, 258, 260, 260, 260, + 260, 260, 259, 259, 34, 34, 34, 34, 34, 36, + 36, 263, 57, 57, 57, 57, 57, 58, 58, 260, + 260, 258, 260, 260, 259, 34, 34, 34, 34, 36, + 57, 57, 57, 57, 58, 260, 258, 258, 259, 34, + + 36, 57, 58, 258, 258, 258, 259, 36, 58, 258, + 258, 258, 258, 259, 36, 58, 258, 258, 258, 258, + 259, 36, 58, 258, 258, 258, 258, 258, 258, 258, + 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, + 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, + 258, 258, 258, 258, 258, 258, 258, 0, 258, 258, + 258, 258, 258, 258 + } ; + +static yyconst flex_int16_t yy_nxt[936] = + { 0, + 12, 13, 14, 15, 13, 16, 12, 12, 12, 12, + 17, 18, 12, 17, 19, 20, 12, 21, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 22, 17, + 17, 23, 24, 17, 17, 17, 17, 25, 12, 26, + 13, 14, 27, 13, 28, 26, 29, 26, 26, 30, + 31, 32, 30, 33, 34, 35, 36, 30, 30, 30, + 30, 30, 30, 30, 30, 30, 30, 37, 30, 30, + 38, 39, 30, 30, 30, 30, 25, 26, 40, 41, + 42, 40, 41, 42, 62, 64, 144, 62, 65, 66, + 67, 68, 71, 81, 72, 73, 81, 81, 63, 86, + + 81, 70, 74, 81, 75, 81, 81, 12, 81, 95, + 12, 43, 44, 45, 46, 47, 94, 190, 96, 86, + 86, 86, 97, 98, 97, 100, 101, 102, 101, 104, + 106, 107, 86, 106, 108, 109, 67, 110, 119, 120, + 69, 111, 12, 43, 44, 45, 46, 47, 121, 62, + 111, 111, 62, 64, 97, 98, 65, 66, 67, 68, + 122, 156, 123, 123, 124, 125, 126, 127, 81, 257, + 65, 81, 67, 68, 12, 48, 49, 14, 50, 49, + 51, 52, 48, 48, 53, 54, 55, 48, 54, 56, + 57, 48, 58, 54, 54, 54, 54, 54, 54, 54, + + 54, 54, 54, 59, 54, 54, 60, 61, 54, 54, + 54, 54, 12, 48, 81, 81, 106, 82, 81, 106, + 65, 83, 84, 85, 80, 81, 256, 80, 81, 80, + 80, 127, 80, 80, 65, 80, 67, 68, 80, 80, + 81, 81, 127, 136, 81, 65, 65, 255, 84, 85, + 137, 81, 208, 143, 136, 97, 100, 65, 154, 84, + 85, 86, 80, 80, 81, 86, 80, 81, 80, 80, + 111, 80, 80, 87, 80, 201, 87, 80, 80, 86, + 87, 88, 87, 89, 90, 87, 87, 87, 87, 87, + 87, 91, 87, 92, 87, 87, 87, 87, 87, 87, + + 209, 80, 80, 81, 195, 80, 81, 80, 80, 111, + 80, 80, 87, 80, 87, 87, 80, 80, 87, 111, + 87, 138, 87, 87, 87, 87, 87, 172, 87, 123, + 87, 101, 102, 140, 93, 87, 101, 104, 155, 170, + 80, 105, 105, 178, 105, 105, 105, 254, 105, 105, + 86, 111, 105, 105, 111, 105, 105, 105, 107, 253, + 252, 108, 109, 67, 110, 145, 197, 123, 198, 146, + 125, 147, 148, 148, 251, 108, 108, 67, 110, 105, + 105, 105, 203, 105, 105, 105, 111, 105, 105, 250, + 112, 105, 105, 112, 105, 105, 105, 112, 113, 112, + + 114, 115, 112, 112, 112, 112, 112, 112, 116, 112, + 117, 112, 112, 112, 112, 112, 112, 222, 105, 105, + 105, 249, 105, 105, 105, 248, 105, 105, 86, 247, + 105, 105, 215, 105, 105, 105, 148, 86, 210, 108, + 211, 67, 110, 112, 127, 112, 112, 65, 246, 245, + 128, 118, 223, 112, 156, 112, 123, 105, 81, 125, + 126, 82, 244, 111, 65, 83, 84, 85, 87, 81, + 87, 87, 136, 243, 242, 65, 241, 156, 87, 123, + 87, 139, 87, 157, 87, 87, 216, 240, 239, 238, + 237, 111, 87, 141, 87, 142, 87, 236, 87, 87, + + 112, 235, 112, 149, 234, 233, 87, 232, 87, 231, + 112, 230, 112, 112, 229, 112, 112, 112, 228, 112, + 112, 111, 86, 112, 227, 112, 150, 151, 81, 112, + 112, 136, 112, 112, 65, 226, 225, 137, 224, 221, + 112, 152, 112, 153, 112, 220, 112, 112, 219, 218, + 217, 214, 213, 122, 112, 123, 112, 124, 125, 126, + 156, 87, 123, 167, 87, 125, 126, 87, 212, 87, + 87, 87, 165, 87, 207, 206, 205, 87, 204, 87, + 166, 87, 199, 87, 87, 87, 196, 168, 87, 111, + 86, 87, 185, 87, 184, 87, 183, 87, 87, 182, + + 87, 87, 181, 180, 179, 171, 164, 163, 87, 145, + 87, 123, 169, 146, 125, 147, 172, 162, 123, 161, + 160, 125, 147, 172, 112, 123, 175, 112, 125, 147, + 112, 159, 112, 112, 112, 173, 112, 158, 157, 111, + 112, 111, 112, 174, 112, 111, 112, 112, 112, 103, + 176, 112, 103, 99, 112, 99, 112, 86, 112, 86, + 112, 112, 86, 112, 112, 135, 134, 133, 132, 131, + 130, 112, 129, 112, 128, 177, 87, 63, 87, 87, + 103, 99, 79, 186, 78, 77, 87, 76, 87, 87, + 63, 87, 87, 258, 258, 258, 258, 258, 258, 87, + + 87, 87, 87, 188, 258, 187, 87, 258, 87, 87, + 87, 112, 87, 112, 193, 258, 87, 258, 87, 258, + 258, 112, 258, 112, 258, 182, 87, 258, 87, 87, + 258, 258, 189, 258, 258, 258, 87, 258, 87, 112, + 258, 112, 112, 258, 258, 258, 191, 258, 258, 112, + 258, 112, 112, 258, 112, 112, 258, 258, 258, 258, + 258, 258, 112, 87, 112, 87, 87, 258, 192, 112, + 258, 112, 112, 200, 87, 87, 87, 87, 258, 112, + 258, 112, 258, 258, 87, 258, 87, 258, 182, 112, + 258, 112, 112, 258, 87, 194, 87, 87, 258, 112, + + 87, 112, 87, 87, 87, 112, 87, 112, 112, 258, + 87, 112, 87, 112, 112, 202, 112, 112, 112, 112, + 258, 112, 112, 112, 112, 112, 112, 258, 112, 258, + 258, 258, 112, 258, 112, 87, 258, 87, 87, 258, + 258, 258, 258, 258, 258, 87, 258, 87, 258, 258, + 258, 258, 258, 258, 204, 112, 258, 112, 112, 258, + 258, 258, 258, 258, 258, 112, 258, 112, 258, 258, + 258, 258, 258, 258, 204, 80, 258, 80, 258, 80, + 86, 258, 86, 258, 86, 105, 258, 258, 105, 105, + 111, 258, 258, 111, 111, 11, 258, 258, 258, 258, + + 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, + 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, + 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, + 258, 258, 258, 258, 258 + } ; + +static yyconst flex_int16_t yy_chk[936] = + { 0, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 5, 5, + 5, 6, 6, 6, 13, 16, 95, 13, 16, 16, + 16, 16, 20, 26, 20, 20, 26, 27, 27, 95, + + 27, 260, 20, 31, 20, 33, 31, 5, 33, 38, + 6, 7, 7, 7, 7, 7, 37, 171, 39, 37, + 38, 39, 40, 40, 42, 42, 45, 45, 47, 47, + 49, 51, 171, 49, 51, 51, 51, 51, 59, 60, + 259, 59, 7, 8, 8, 8, 8, 8, 61, 62, + 60, 61, 62, 64, 98, 98, 64, 64, 64, 64, + 65, 156, 65, 156, 65, 65, 65, 66, 80, 256, + 66, 80, 66, 66, 8, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 28, 81, 106, 28, 81, 106, + 28, 28, 28, 28, 30, 30, 253, 30, 30, 30, + 30, 68, 30, 30, 68, 30, 68, 68, 30, 30, + 83, 84, 127, 83, 84, 127, 83, 252, 83, 83, + 84, 85, 201, 94, 85, 100, 100, 85, 119, 85, + 85, 201, 30, 34, 34, 94, 34, 34, 34, 34, + 119, 34, 34, 34, 34, 190, 34, 34, 34, 190, + 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, + 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, + + 203, 34, 36, 36, 179, 36, 36, 36, 36, 203, + 36, 36, 87, 36, 87, 87, 36, 36, 88, 179, + 88, 88, 87, 90, 87, 90, 90, 172, 88, 172, + 88, 102, 102, 90, 36, 90, 104, 104, 120, 143, + 36, 54, 54, 154, 54, 54, 54, 251, 54, 54, + 143, 120, 54, 54, 154, 54, 54, 54, 107, 249, + 248, 107, 107, 107, 107, 108, 182, 108, 182, 108, + 108, 108, 109, 148, 247, 109, 148, 109, 109, 54, + 57, 57, 195, 57, 57, 57, 195, 57, 57, 246, + 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, + + 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, + 57, 57, 57, 57, 57, 57, 57, 215, 57, 58, + 58, 245, 58, 58, 58, 244, 58, 58, 215, 243, + 58, 58, 208, 58, 58, 58, 110, 208, 204, 110, + 204, 110, 110, 112, 128, 112, 112, 128, 242, 241, + 128, 58, 216, 112, 124, 112, 124, 58, 82, 124, + 124, 82, 240, 216, 82, 82, 82, 82, 89, 136, + 89, 89, 136, 239, 238, 136, 237, 157, 89, 157, + 89, 89, 91, 157, 91, 91, 209, 236, 235, 234, + 233, 209, 91, 91, 91, 92, 92, 232, 92, 92, + + 113, 231, 113, 113, 230, 229, 92, 228, 92, 227, + 113, 226, 113, 114, 225, 114, 114, 115, 224, 115, + 115, 223, 222, 114, 220, 114, 114, 115, 137, 115, + 116, 137, 116, 116, 137, 219, 218, 137, 217, 214, + 116, 116, 116, 117, 117, 213, 117, 117, 212, 211, + 210, 207, 206, 122, 117, 122, 117, 122, 122, 122, + 126, 140, 126, 140, 140, 126, 126, 138, 205, 138, + 138, 140, 138, 140, 199, 198, 197, 138, 196, 138, + 139, 139, 185, 139, 139, 141, 180, 141, 141, 178, + 170, 139, 164, 139, 162, 141, 161, 141, 142, 160, + + 142, 142, 159, 158, 155, 144, 135, 134, 142, 145, + 142, 145, 142, 145, 145, 145, 146, 133, 146, 132, + 131, 146, 146, 147, 151, 147, 151, 151, 147, 147, + 149, 130, 149, 149, 151, 149, 151, 129, 125, 121, + 149, 118, 149, 150, 150, 111, 150, 150, 152, 103, + 152, 152, 101, 99, 150, 97, 150, 96, 152, 93, + 152, 153, 86, 153, 153, 78, 77, 75, 74, 73, + 72, 153, 71, 153, 67, 153, 165, 50, 165, 165, + 46, 41, 24, 165, 23, 22, 165, 21, 165, 166, + 15, 166, 166, 11, 0, 0, 0, 0, 0, 166, + + 168, 166, 168, 168, 0, 166, 167, 0, 167, 167, + 168, 176, 168, 176, 176, 0, 167, 0, 167, 0, + 0, 176, 0, 176, 0, 167, 169, 0, 169, 169, + 0, 0, 169, 0, 0, 0, 169, 0, 169, 173, + 0, 173, 173, 0, 0, 0, 173, 0, 0, 173, + 0, 173, 174, 0, 174, 174, 0, 0, 0, 0, + 0, 0, 174, 186, 174, 186, 186, 0, 174, 175, + 0, 175, 175, 186, 187, 186, 187, 187, 0, 175, + 0, 175, 0, 0, 187, 0, 187, 0, 175, 177, + 0, 177, 177, 0, 188, 177, 188, 188, 0, 177, + + 189, 177, 189, 189, 188, 191, 188, 191, 191, 0, + 189, 192, 189, 192, 192, 191, 193, 191, 193, 193, + 0, 192, 194, 192, 194, 194, 193, 0, 193, 0, + 0, 0, 194, 0, 194, 200, 0, 200, 200, 0, + 0, 0, 0, 0, 0, 200, 0, 200, 0, 0, + 0, 0, 0, 0, 200, 202, 0, 202, 202, 0, + 0, 0, 0, 0, 0, 202, 0, 202, 0, 0, + 0, 0, 0, 0, 202, 261, 0, 261, 0, 261, + 262, 0, 262, 0, 262, 263, 0, 0, 263, 263, + 264, 0, 0, 264, 264, 258, 258, 258, 258, 258, + + 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, + 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, + 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, + 258, 258, 258, 258, 258 + } ; + +/* Table of booleans, true if rule could match eol. */ +static yyconst flex_int32_t yy_rule_can_match_eol[36] = + { 0, +1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; + +/* The intent behind this definition is that it'll catch + * any uses of REJECT which flex missed. + */ +#define REJECT reject_used_but_not_detected +#define yymore() yymore_used_but_not_detected +#define YY_MORE_ADJ 0 +#define YY_RESTORE_YY_MORE_OFFSET +#line 1 "../tikzit/src/data/tikzlexer.l" +#line 2 "../tikzit/src/data/tikzlexer.l" +/* + * Copyright 2010 Chris Heunen + * Copyright 2010-2013 Aleks Kissinger + * Copyright 2013 K. Johan Paulsson + * Copyright 2013 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "tikzparserdefs.h" +#include "tikzparser.parser.hpp" + +#include + + +#define YY_USER_ACTION \ + yylloc->first_line = yylloc->last_line; \ + yylloc->first_column = yylloc->last_column + 1; \ + yylloc->last_column = yylloc->first_column + yyleng - 1; + + + + + +#line 776 "../tikzit/src/data/tikzlexer.lexer.cpp" + +#define INITIAL 0 +#define props 1 +#define xcoord 2 +#define ycoord 3 +#define noderef 4 + +#ifndef YY_NO_UNISTD_H +/* Special case for "unistd.h", since it is non-ANSI. We include it way + * down here because we want the user's section 1 to have been scanned first. + * The user has a chance to override it with an option. + */ +#include +#endif + +#define YY_EXTRA_TYPE TikzGraphAssembler * + +/* Holds the entire state of the reentrant scanner. */ +struct yyguts_t + { + + /* User-defined. Not touched by flex. */ + YY_EXTRA_TYPE yyextra_r; + + /* The rest are the same as the globals declared in the non-reentrant scanner. */ + FILE *yyin_r, *yyout_r; + size_t yy_buffer_stack_top; /**< index of top of stack. */ + size_t yy_buffer_stack_max; /**< capacity of stack. */ + YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */ + char yy_hold_char; + yy_size_t yy_n_chars; + yy_size_t yyleng_r; + char *yy_c_buf_p; + int yy_init; + int yy_start; + int yy_did_buffer_switch_on_eof; + int yy_start_stack_ptr; + int yy_start_stack_depth; + int *yy_start_stack; + yy_state_type yy_last_accepting_state; + char* yy_last_accepting_cpos; + + int yylineno_r; + int yy_flex_debug_r; + + char *yytext_r; + int yy_more_flag; + int yy_more_len; + + YYSTYPE * yylval_r; + + YYLTYPE * yylloc_r; + + }; /* end struct yyguts_t */ + +static int yy_init_globals (yyscan_t yyscanner ); + + /* This must go here because YYSTYPE and YYLTYPE are included + * from bison output in section 1.*/ + # define yylval yyg->yylval_r + + # define yylloc yyg->yylloc_r + +int yylex_init (yyscan_t* scanner); + +int yylex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner); + +/* Accessor methods to globals. + These are made visible to non-reentrant scanners for convenience. */ + +int yylex_destroy (yyscan_t yyscanner ); + +int yyget_debug (yyscan_t yyscanner ); + +void yyset_debug (int debug_flag ,yyscan_t yyscanner ); + +YY_EXTRA_TYPE yyget_extra (yyscan_t yyscanner ); + +void yyset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner ); + +FILE *yyget_in (yyscan_t yyscanner ); + +void yyset_in (FILE * in_str ,yyscan_t yyscanner ); + +FILE *yyget_out (yyscan_t yyscanner ); + +void yyset_out (FILE * out_str ,yyscan_t yyscanner ); + +yy_size_t yyget_leng (yyscan_t yyscanner ); + +char *yyget_text (yyscan_t yyscanner ); + +int yyget_lineno (yyscan_t yyscanner ); + +void yyset_lineno (int line_number ,yyscan_t yyscanner ); + +YYSTYPE * yyget_lval (yyscan_t yyscanner ); + +void yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner ); + + YYLTYPE *yyget_lloc (yyscan_t yyscanner ); + + void yyset_lloc (YYLTYPE * yylloc_param ,yyscan_t yyscanner ); + +/* Macros after this point can all be overridden by user definitions in + * section 1. + */ + +#ifndef YY_SKIP_YYWRAP +#ifdef __cplusplus +extern "C" int yywrap (yyscan_t yyscanner ); +#else +extern int yywrap (yyscan_t yyscanner ); +#endif +#endif + +#ifndef yytext_ptr +static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner); +#endif + +#ifdef YY_NEED_STRLEN +static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner); +#endif + +#ifndef YY_NO_INPUT + +#ifdef __cplusplus +static int yyinput (yyscan_t yyscanner ); +#else +static int input (yyscan_t yyscanner ); +#endif + +#endif + +/* Amount of stuff to slurp up with each read. */ +#ifndef YY_READ_BUF_SIZE +#define YY_READ_BUF_SIZE 8192 +#endif + +/* Copy whatever the last rule matched to the standard output. */ +#ifndef ECHO +/* This used to be an fputs(), but since the string might contain NUL's, + * we now use fwrite(). + */ +#define ECHO fwrite( yytext, yyleng, 1, yyout ) +#endif + +/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, + * is returned in "result". + */ +#ifndef YY_INPUT +#define YY_INPUT(buf,result,max_size) \ + if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ + { \ + int c = '*'; \ + yy_size_t n; \ + for ( n = 0; n < max_size && \ + (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ + buf[n] = (char) c; \ + if ( c == '\n' ) \ + buf[n++] = (char) c; \ + if ( c == EOF && ferror( yyin ) ) \ + YY_FATAL_ERROR( "input in flex scanner failed" ); \ + result = n; \ + } \ + else \ + { \ + errno=0; \ + while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \ + { \ + if( errno != EINTR) \ + { \ + YY_FATAL_ERROR( "input in flex scanner failed" ); \ + break; \ + } \ + errno=0; \ + clearerr(yyin); \ + } \ + }\ +\ + +#endif + +/* No semi-colon after return; correct usage is to write "yyterminate();" - + * we don't want an extra ';' after the "return" because that will cause + * some compilers to complain about unreachable statements. + */ +#ifndef yyterminate +#define yyterminate() return YY_NULL +#endif + +/* Number of entries by which start-condition stack grows. */ +#ifndef YY_START_STACK_INCR +#define YY_START_STACK_INCR 25 +#endif + +/* Report a fatal error. */ +#ifndef YY_FATAL_ERROR +#define YY_FATAL_ERROR(msg) yy_fatal_error( msg , yyscanner) +#endif + +/* end tables serialization structures and prototypes */ + +/* Default declaration of generated scanner - a define so the user can + * easily add parameters. + */ +#ifndef YY_DECL +#define YY_DECL_IS_OURS 1 + +extern int yylex \ + (YYSTYPE * yylval_param,YYLTYPE * yylloc_param ,yyscan_t yyscanner); + +#define YY_DECL int yylex \ + (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner) +#endif /* !YY_DECL */ + +/* Code executed at the beginning of each rule, after yytext and yyleng + * have been set up. + */ +#ifndef YY_USER_ACTION +#define YY_USER_ACTION +#endif + +/* Code executed at the end of each rule. */ +#ifndef YY_BREAK +#define YY_BREAK break; +#endif + +#define YY_RULE_SETUP \ + YY_USER_ACTION + +/** The main scanner function which does all the work. + */ +YY_DECL +{ + register yy_state_type yy_current_state; + register char *yy_cp, *yy_bp; + register int yy_act; + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + +#line 49 "../tikzit/src/data/tikzlexer.l" + + + /* whitespace is ignored, except for position counting; we don't + count formfeed and vtab as whitespace, because it's not obvious + how they should be dealt with and no-one actually uses them */ + + /* lex will take the longest-matching string */ +#line 1025 "../tikzit/src/data/tikzlexer.lexer.cpp" + + yylval = yylval_param; + + yylloc = yylloc_param; + + if ( !yyg->yy_init ) + { + yyg->yy_init = 1; + +#ifdef YY_USER_INIT + YY_USER_INIT; +#endif + + if ( ! yyg->yy_start ) + yyg->yy_start = 1; /* first start state */ + + if ( ! yyin ) + yyin = stdin; + + if ( ! yyout ) + yyout = stdout; + + if ( ! YY_CURRENT_BUFFER ) { + yyensure_buffer_stack (yyscanner); + YY_CURRENT_BUFFER_LVALUE = + yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); + } + + yy_load_buffer_state(yyscanner ); + } + + while ( 1 ) /* loops until end-of-file is reached */ + { + yy_cp = yyg->yy_c_buf_p; + + /* Support of yytext. */ + *yy_cp = yyg->yy_hold_char; + + /* yy_bp points to the position in yy_ch_buf of the start of + * the current run. + */ + yy_bp = yy_cp; + + yy_current_state = yyg->yy_start; +yy_match: + do + { + register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; + if ( yy_accept[yy_current_state] ) + { + yyg->yy_last_accepting_state = yy_current_state; + yyg->yy_last_accepting_cpos = yy_cp; + } + while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) + { + yy_current_state = (int) yy_def[yy_current_state]; + if ( yy_current_state >= 259 ) + yy_c = yy_meta[(unsigned int) yy_c]; + } + yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + ++yy_cp; + } + while ( yy_base[yy_current_state] != 896 ); + +yy_find_action: + yy_act = yy_accept[yy_current_state]; + if ( yy_act == 0 ) + { /* have to back up */ + yy_cp = yyg->yy_last_accepting_cpos; + yy_current_state = yyg->yy_last_accepting_state; + yy_act = yy_accept[yy_current_state]; + } + + YY_DO_BEFORE_ACTION; + + if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] ) + { + yy_size_t yyl; + for ( yyl = 0; yyl < yyleng; ++yyl ) + if ( yytext[yyl] == '\n' ) + + do{ yylineno++; + yycolumn=0; + }while(0) +; + } + +do_action: /* This label is used only to access EOF actions. */ + + switch ( yy_act ) + { /* beginning of action switch */ + case 0: /* must back up */ + /* undo the effects of YY_DO_BEFORE_ACTION */ + *yy_cp = yyg->yy_hold_char; + yy_cp = yyg->yy_last_accepting_cpos; + yy_current_state = yyg->yy_last_accepting_state; + goto yy_find_action; + +case 1: +/* rule 1 can match eol */ +YY_RULE_SETUP +#line 56 "../tikzit/src/data/tikzlexer.l" +{ + yylloc->first_line += 1; + yylloc->last_line = yylloc->first_line; + yylloc->first_column = yylloc->last_column = 0; +} + YY_BREAK +case 2: +YY_RULE_SETUP +#line 61 "../tikzit/src/data/tikzlexer.l" +{ } + YY_BREAK +case 3: +YY_RULE_SETUP +#line 63 "../tikzit/src/data/tikzlexer.l" +{ return BEGIN_TIKZPICTURE_CMD; } + YY_BREAK +case 4: +YY_RULE_SETUP +#line 64 "../tikzit/src/data/tikzlexer.l" +{ return END_TIKZPICTURE_CMD; } + YY_BREAK +case 5: +YY_RULE_SETUP +#line 65 "../tikzit/src/data/tikzlexer.l" +{ return BEGIN_PGFONLAYER_CMD; } + YY_BREAK +case 6: +YY_RULE_SETUP +#line 66 "../tikzit/src/data/tikzlexer.l" +{ return END_PGFONLAYER_CMD; } + YY_BREAK +case 7: +YY_RULE_SETUP +#line 67 "../tikzit/src/data/tikzlexer.l" +{ return DRAW_CMD; } + YY_BREAK +case 8: +YY_RULE_SETUP +#line 68 "../tikzit/src/data/tikzlexer.l" +{ return NODE_CMD; } + YY_BREAK +case 9: +YY_RULE_SETUP +#line 69 "../tikzit/src/data/tikzlexer.l" +{ return PATH_CMD; } + YY_BREAK +case 10: +YY_RULE_SETUP +#line 70 "../tikzit/src/data/tikzlexer.l" +{ return RECTANGLE; } + YY_BREAK +case 11: +YY_RULE_SETUP +#line 71 "../tikzit/src/data/tikzlexer.l" +{ return NODE; } + YY_BREAK +case 12: +YY_RULE_SETUP +#line 72 "../tikzit/src/data/tikzlexer.l" +{ return AT; } + YY_BREAK +case 13: +YY_RULE_SETUP +#line 73 "../tikzit/src/data/tikzlexer.l" +{ return TO; } + YY_BREAK +case 14: +YY_RULE_SETUP +#line 74 "../tikzit/src/data/tikzlexer.l" +{ return SEMICOLON; } + YY_BREAK +case 15: +YY_RULE_SETUP +#line 76 "../tikzit/src/data/tikzlexer.l" +{ + yylloc->last_column = yylloc->first_column + 1; + yyless(1); + BEGIN(xcoord); +} + YY_BREAK +case 16: +YY_RULE_SETUP +#line 81 "../tikzit/src/data/tikzlexer.l" +{ + yylval->pt = new QPointF(); + yylval->pt->setX(strtod(yytext,NULL)); + BEGIN(ycoord); +} + YY_BREAK +case 17: +YY_RULE_SETUP +#line 86 "../tikzit/src/data/tikzlexer.l" +{ } + YY_BREAK +case 18: +YY_RULE_SETUP +#line 87 "../tikzit/src/data/tikzlexer.l" +{ + yylval->pt->setY(strtod(yytext,NULL)); +} + YY_BREAK +case 19: +YY_RULE_SETUP +#line 90 "../tikzit/src/data/tikzlexer.l" +{ + BEGIN(INITIAL); + return COORD; +} + YY_BREAK +/* when we see "[", change parsing mode */ +case 20: +YY_RULE_SETUP +#line 96 "../tikzit/src/data/tikzlexer.l" +/*syntaxhlfix]*/ { + BEGIN(props); + return LEFTBRACKET; +} + YY_BREAK +case 21: +YY_RULE_SETUP +#line 100 "../tikzit/src/data/tikzlexer.l" +{ return EQUALS; } + YY_BREAK +case 22: +YY_RULE_SETUP +#line 101 "../tikzit/src/data/tikzlexer.l" +{ return COMMA; } + YY_BREAK +/* technically, it is possible to have newlines in the middle of + property names or values, but in practice this is unlikely and + screws up our line counting */ +case 23: +YY_RULE_SETUP +#line 105 "../tikzit/src/data/tikzlexer.l" +{ + char *str = (char*)malloc(sizeof(char)*yyleng + 1); + strncpy(str, yytext, yyleng + 1); + yylval->str = str; + return PROPSTRING; +} + YY_BREAK +case 24: +YY_RULE_SETUP +#line 111 "../tikzit/src/data/tikzlexer.l" +{ + BEGIN(INITIAL); + return RIGHTBRACKET; +} + YY_BREAK +case 25: +YY_RULE_SETUP +#line 116 "../tikzit/src/data/tikzlexer.l" +{ + BEGIN(noderef); + return LEFTPARENTHESIS; +} + YY_BREAK +case 26: +YY_RULE_SETUP +#line 120 "../tikzit/src/data/tikzlexer.l" +{ + return FULLSTOP; +} + YY_BREAK +/* we assume node names (and anchor names) never contain + newlines */ +case 27: +YY_RULE_SETUP +#line 125 "../tikzit/src/data/tikzlexer.l" +{ + //qDebug() << "nodename: " << yytext << " size: " << strlen(yytext); + char *str = (char*)malloc(sizeof(char)*yyleng + 1); + strncpy(str, yytext, yyleng+1); + yylval->str = str; + return REFSTRING; +} + YY_BREAK +case 28: +YY_RULE_SETUP +#line 132 "../tikzit/src/data/tikzlexer.l" +{ + BEGIN(INITIAL); + return RIGHTPARENTHESIS; +} + YY_BREAK +case 29: +YY_RULE_SETUP +#line 137 "../tikzit/src/data/tikzlexer.l" +{ + std::stringstream buf; + unsigned int brace_depth = 1; + unsigned int escape = 0; + while (1) { + char c = yyinput(yyscanner); + // eof reached before closing brace + if (c == '\0' || c == EOF) { + return UNCLOSED_DELIM_STR; + } + + yylloc->last_column += 1; + yyleng += 1; + if (escape) { + escape = 0; + } else if (c == '\\') { + escape = 1; + } else if (c == '{') { + brace_depth++; + } else if (c == '}') { + brace_depth--; + if (brace_depth == 0) break; + } else if (c == '\n') { + yylloc->last_line += 1; + yylloc->last_column = 0; + } + buf << c; + } + + char *str = (char*)malloc(sizeof(char) * yyleng + 1); + strncpy(str, buf.str().c_str(), yyleng + 1); + //str[len] = 0; + yylval->str = str; + //qDebug() << "got delim string: " << str; + return DELIMITEDSTRING; +} + YY_BREAK +case 30: +YY_RULE_SETUP +#line 174 "../tikzit/src/data/tikzlexer.l" +{ return UNKNOWN_BEGIN_CMD; } + YY_BREAK +case 31: +YY_RULE_SETUP +#line 175 "../tikzit/src/data/tikzlexer.l" +{ return UNKNOWN_END_CMD; } + YY_BREAK +case 32: +YY_RULE_SETUP +#line 176 "../tikzit/src/data/tikzlexer.l" +{ return UNKNOWN_CMD; } + YY_BREAK +case 33: +YY_RULE_SETUP +#line 177 "../tikzit/src/data/tikzlexer.l" +{ return UNKNOWN_STR; } + YY_BREAK +case 34: +YY_RULE_SETUP +#line 178 "../tikzit/src/data/tikzlexer.l" +{ return UNKNOWN_STR; } + YY_BREAK +/* vi:ft=lex:noet:ts=4:sts=4:sw=4: + */ +case 35: +YY_RULE_SETUP +#line 182 "../tikzit/src/data/tikzlexer.l" +ECHO; + YY_BREAK +#line 1385 "../tikzit/src/data/tikzlexer.lexer.cpp" +case YY_STATE_EOF(INITIAL): +case YY_STATE_EOF(props): +case YY_STATE_EOF(xcoord): +case YY_STATE_EOF(ycoord): +case YY_STATE_EOF(noderef): + yyterminate(); + + case YY_END_OF_BUFFER: + { + /* Amount of text matched not including the EOB char. */ + int yy_amount_of_matched_text = (int) (yy_cp - yyg->yytext_ptr) - 1; + + /* Undo the effects of YY_DO_BEFORE_ACTION. */ + *yy_cp = yyg->yy_hold_char; + YY_RESTORE_YY_MORE_OFFSET + + if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW ) + { + /* We're scanning a new file or input source. It's + * possible that this happened because the user + * just pointed yyin at a new source and called + * yylex(). If so, then we have to assure + * consistency between YY_CURRENT_BUFFER and our + * globals. Here is the right place to do so, because + * this is the first action (other than possibly a + * back-up) that will match for the new input source. + */ + yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; + YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin; + YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL; + } + + /* Note that here we test for yy_c_buf_p "<=" to the position + * of the first EOB in the buffer, since yy_c_buf_p will + * already have been incremented past the NUL character + * (since all states make transitions on EOB to the + * end-of-buffer state). Contrast this with the test + * in input(). + */ + if ( yyg->yy_c_buf_p <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] ) + { /* This was really a NUL. */ + yy_state_type yy_next_state; + + yyg->yy_c_buf_p = yyg->yytext_ptr + yy_amount_of_matched_text; + + yy_current_state = yy_get_previous_state( yyscanner ); + + /* Okay, we're now positioned to make the NUL + * transition. We couldn't have + * yy_get_previous_state() go ahead and do it + * for us because it doesn't know how to deal + * with the possibility of jamming (and we don't + * want to build jamming into it because then it + * will run more slowly). + */ + + yy_next_state = yy_try_NUL_trans( yy_current_state , yyscanner); + + yy_bp = yyg->yytext_ptr + YY_MORE_ADJ; + + if ( yy_next_state ) + { + /* Consume the NUL. */ + yy_cp = ++yyg->yy_c_buf_p; + yy_current_state = yy_next_state; + goto yy_match; + } + + else + { + yy_cp = yyg->yy_c_buf_p; + goto yy_find_action; + } + } + + else switch ( yy_get_next_buffer( yyscanner ) ) + { + case EOB_ACT_END_OF_FILE: + { + yyg->yy_did_buffer_switch_on_eof = 0; + + if ( yywrap(yyscanner ) ) + { + /* Note: because we've taken care in + * yy_get_next_buffer() to have set up + * yytext, we can now set up + * yy_c_buf_p so that if some total + * hoser (like flex itself) wants to + * call the scanner after we return the + * YY_NULL, it'll still work - another + * YY_NULL will get returned. + */ + yyg->yy_c_buf_p = yyg->yytext_ptr + YY_MORE_ADJ; + + yy_act = YY_STATE_EOF(YY_START); + goto do_action; + } + + else + { + if ( ! yyg->yy_did_buffer_switch_on_eof ) + YY_NEW_FILE; + } + break; + } + + case EOB_ACT_CONTINUE_SCAN: + yyg->yy_c_buf_p = + yyg->yytext_ptr + yy_amount_of_matched_text; + + yy_current_state = yy_get_previous_state( yyscanner ); + + yy_cp = yyg->yy_c_buf_p; + yy_bp = yyg->yytext_ptr + YY_MORE_ADJ; + goto yy_match; + + case EOB_ACT_LAST_MATCH: + yyg->yy_c_buf_p = + &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars]; + + yy_current_state = yy_get_previous_state( yyscanner ); + + yy_cp = yyg->yy_c_buf_p; + yy_bp = yyg->yytext_ptr + YY_MORE_ADJ; + goto yy_find_action; + } + break; + } + + default: + YY_FATAL_ERROR( + "fatal flex scanner internal error--no action found" ); + } /* end of action switch */ + } /* end of scanning one token */ +} /* end of yylex */ + +/* yy_get_next_buffer - try to read in a new buffer + * + * Returns a code representing an action: + * EOB_ACT_LAST_MATCH - + * EOB_ACT_CONTINUE_SCAN - continue scanning from current position + * EOB_ACT_END_OF_FILE - end of file + */ +static int yy_get_next_buffer (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; + register char *source = yyg->yytext_ptr; + register int number_to_move, i; + int ret_val; + + if ( yyg->yy_c_buf_p > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] ) + YY_FATAL_ERROR( + "fatal flex scanner internal error--end of buffer missed" ); + + if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 ) + { /* Don't try to fill the buffer, so this is an EOF. */ + if ( yyg->yy_c_buf_p - yyg->yytext_ptr - YY_MORE_ADJ == 1 ) + { + /* We matched a single character, the EOB, so + * treat this as a final EOF. + */ + return EOB_ACT_END_OF_FILE; + } + + else + { + /* We matched some text prior to the EOB, first + * process it. + */ + return EOB_ACT_LAST_MATCH; + } + } + + /* Try to read more data. */ + + /* First move last chars to start of buffer. */ + number_to_move = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr) - 1; + + for ( i = 0; i < number_to_move; ++i ) + *(dest++) = *(source++); + + if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING ) + /* don't do the read, it's not guaranteed to return an EOF, + * just force an EOF + */ + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars = 0; + + else + { + yy_size_t num_to_read = + YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; + + while ( num_to_read <= 0 ) + { /* Not enough room in the buffer - grow it. */ + + /* just a shorter name for the current buffer */ + YY_BUFFER_STATE b = YY_CURRENT_BUFFER; + + int yy_c_buf_p_offset = + (int) (yyg->yy_c_buf_p - b->yy_ch_buf); + + if ( b->yy_is_our_buffer ) + { + yy_size_t new_size = b->yy_buf_size * 2; + + if ( new_size <= 0 ) + b->yy_buf_size += b->yy_buf_size / 8; + else + b->yy_buf_size *= 2; + + b->yy_ch_buf = (char *) + /* Include room in for 2 EOB chars. */ + yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ,yyscanner ); + } + else + /* Can't grow it, we don't own it. */ + b->yy_ch_buf = 0; + + if ( ! b->yy_ch_buf ) + YY_FATAL_ERROR( + "fatal error - scanner input buffer overflow" ); + + yyg->yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset]; + + num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - + number_to_move - 1; + + } + + if ( num_to_read > YY_READ_BUF_SIZE ) + num_to_read = YY_READ_BUF_SIZE; + + /* Read in more data. */ + YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), + yyg->yy_n_chars, num_to_read ); + + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars; + } + + if ( yyg->yy_n_chars == 0 ) + { + if ( number_to_move == YY_MORE_ADJ ) + { + ret_val = EOB_ACT_END_OF_FILE; + yyrestart(yyin ,yyscanner); + } + + else + { + ret_val = EOB_ACT_LAST_MATCH; + YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = + YY_BUFFER_EOF_PENDING; + } + } + + else + ret_val = EOB_ACT_CONTINUE_SCAN; + + if ((yy_size_t) (yyg->yy_n_chars + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { + /* Extend the array by 50%, plus the number we really need. */ + yy_size_t new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1); + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ,yyscanner ); + if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) + YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); + } + + yyg->yy_n_chars += number_to_move; + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] = YY_END_OF_BUFFER_CHAR; + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR; + + yyg->yytext_ptr = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0]; + + return ret_val; +} + +/* yy_get_previous_state - get the state just before the EOB char was reached */ + + static yy_state_type yy_get_previous_state (yyscan_t yyscanner) +{ + register yy_state_type yy_current_state; + register char *yy_cp; + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + yy_current_state = yyg->yy_start; + + for ( yy_cp = yyg->yytext_ptr + YY_MORE_ADJ; yy_cp < yyg->yy_c_buf_p; ++yy_cp ) + { + register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); + if ( yy_accept[yy_current_state] ) + { + yyg->yy_last_accepting_state = yy_current_state; + yyg->yy_last_accepting_cpos = yy_cp; + } + while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) + { + yy_current_state = (int) yy_def[yy_current_state]; + if ( yy_current_state >= 259 ) + yy_c = yy_meta[(unsigned int) yy_c]; + } + yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + } + + return yy_current_state; +} + +/* yy_try_NUL_trans - try to make a transition on the NUL character + * + * synopsis + * next_state = yy_try_NUL_trans( current_state ); + */ + static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state , yyscan_t yyscanner) +{ + register int yy_is_jam; + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* This var may be unused depending upon options. */ + register char *yy_cp = yyg->yy_c_buf_p; + + register YY_CHAR yy_c = 1; + if ( yy_accept[yy_current_state] ) + { + yyg->yy_last_accepting_state = yy_current_state; + yyg->yy_last_accepting_cpos = yy_cp; + } + while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) + { + yy_current_state = (int) yy_def[yy_current_state]; + if ( yy_current_state >= 259 ) + yy_c = yy_meta[(unsigned int) yy_c]; + } + yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_is_jam = (yy_current_state == 258); + + return yy_is_jam ? 0 : yy_current_state; +} + +#ifndef YY_NO_INPUT +#ifdef __cplusplus + static int yyinput (yyscan_t yyscanner) +#else + static int input (yyscan_t yyscanner) +#endif + +{ + int c; + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + *yyg->yy_c_buf_p = yyg->yy_hold_char; + + if ( *yyg->yy_c_buf_p == YY_END_OF_BUFFER_CHAR ) + { + /* yy_c_buf_p now points to the character we want to return. + * If this occurs *before* the EOB characters, then it's a + * valid NUL; if not, then we've hit the end of the buffer. + */ + if ( yyg->yy_c_buf_p < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] ) + /* This was really a NUL. */ + *yyg->yy_c_buf_p = '\0'; + + else + { /* need more input */ + yy_size_t offset = yyg->yy_c_buf_p - yyg->yytext_ptr; + ++yyg->yy_c_buf_p; + + switch ( yy_get_next_buffer( yyscanner ) ) + { + case EOB_ACT_LAST_MATCH: + /* This happens because yy_g_n_b() + * sees that we've accumulated a + * token and flags that we need to + * try matching the token before + * proceeding. But for input(), + * there's no matching to consider. + * So convert the EOB_ACT_LAST_MATCH + * to EOB_ACT_END_OF_FILE. + */ + + /* Reset buffer status. */ + yyrestart(yyin ,yyscanner); + + /*FALLTHROUGH*/ + + case EOB_ACT_END_OF_FILE: + { + if ( yywrap(yyscanner ) ) + return 0; + + if ( ! yyg->yy_did_buffer_switch_on_eof ) + YY_NEW_FILE; +#ifdef __cplusplus + return yyinput(yyscanner); +#else + return input(yyscanner); +#endif + } + + case EOB_ACT_CONTINUE_SCAN: + yyg->yy_c_buf_p = yyg->yytext_ptr + offset; + break; + } + } + } + + c = *(unsigned char *) yyg->yy_c_buf_p; /* cast for 8-bit char's */ + *yyg->yy_c_buf_p = '\0'; /* preserve yytext */ + yyg->yy_hold_char = *++yyg->yy_c_buf_p; + + if ( c == '\n' ) + + do{ yylineno++; + yycolumn=0; + }while(0) +; + + return c; +} +#endif /* ifndef YY_NO_INPUT */ + +/** Immediately switch to a different input stream. + * @param input_file A readable stream. + * @param yyscanner The scanner object. + * @note This function does not reset the start condition to @c INITIAL . + */ + void yyrestart (FILE * input_file , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + if ( ! YY_CURRENT_BUFFER ){ + yyensure_buffer_stack (yyscanner); + YY_CURRENT_BUFFER_LVALUE = + yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); + } + + yy_init_buffer(YY_CURRENT_BUFFER,input_file ,yyscanner); + yy_load_buffer_state(yyscanner ); +} + +/** Switch to a different input buffer. + * @param new_buffer The new input buffer. + * @param yyscanner The scanner object. + */ + void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + /* TODO. We should be able to replace this entire function body + * with + * yypop_buffer_state(); + * yypush_buffer_state(new_buffer); + */ + yyensure_buffer_stack (yyscanner); + if ( YY_CURRENT_BUFFER == new_buffer ) + return; + + if ( YY_CURRENT_BUFFER ) + { + /* Flush out information for old buffer. */ + *yyg->yy_c_buf_p = yyg->yy_hold_char; + YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p; + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars; + } + + YY_CURRENT_BUFFER_LVALUE = new_buffer; + yy_load_buffer_state(yyscanner ); + + /* We don't actually know whether we did this switch during + * EOF (yywrap()) processing, but the only time this flag + * is looked at is after yywrap() is called, so it's safe + * to go ahead and always set it. + */ + yyg->yy_did_buffer_switch_on_eof = 1; +} + +static void yy_load_buffer_state (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; + yyg->yytext_ptr = yyg->yy_c_buf_p = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos; + yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file; + yyg->yy_hold_char = *yyg->yy_c_buf_p; +} + +/** Allocate and initialize an input buffer state. + * @param file A readable stream. + * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE. + * @param yyscanner The scanner object. + * @return the allocated buffer state. + */ + YY_BUFFER_STATE yy_create_buffer (FILE * file, int size , yyscan_t yyscanner) +{ + YY_BUFFER_STATE b; + + b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ,yyscanner ); + if ( ! b ) + YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); + + b->yy_buf_size = size; + + /* yy_ch_buf has to be 2 characters longer than the size given because + * we need to put in 2 end-of-buffer characters. + */ + b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2 ,yyscanner ); + if ( ! b->yy_ch_buf ) + YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); + + b->yy_is_our_buffer = 1; + + yy_init_buffer(b,file ,yyscanner); + + return b; +} + +/** Destroy the buffer. + * @param b a buffer created with yy_create_buffer() + * @param yyscanner The scanner object. + */ + void yy_delete_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + if ( ! b ) + return; + + if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */ + YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; + + if ( b->yy_is_our_buffer ) + yyfree((void *) b->yy_ch_buf ,yyscanner ); + + yyfree((void *) b ,yyscanner ); +} + +#ifndef __cplusplus +extern int isatty (int ); +#endif /* __cplusplus */ + +/* Initializes or reinitializes a buffer. + * This function is sometimes called more than once on the same buffer, + * such as during a yyrestart() or at EOF. + */ + static void yy_init_buffer (YY_BUFFER_STATE b, FILE * file , yyscan_t yyscanner) + +{ + int oerrno = errno; + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + yy_flush_buffer(b ,yyscanner); + + b->yy_input_file = file; + b->yy_fill_buffer = 1; + + /* If b is the current buffer, then yy_init_buffer was _probably_ + * called from yyrestart() or through yy_get_next_buffer. + * In that case, we don't want to reset the lineno or column. + */ + if (b != YY_CURRENT_BUFFER){ + b->yy_bs_lineno = 1; + b->yy_bs_column = 0; + } + + b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; + + errno = oerrno; +} + +/** Discard all buffered characters. On the next scan, YY_INPUT will be called. + * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. + * @param yyscanner The scanner object. + */ + void yy_flush_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + if ( ! b ) + return; + + b->yy_n_chars = 0; + + /* We always need two end-of-buffer characters. The first causes + * a transition to the end-of-buffer state. The second causes + * a jam in that state. + */ + b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR; + b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR; + + b->yy_buf_pos = &b->yy_ch_buf[0]; + + b->yy_at_bol = 1; + b->yy_buffer_status = YY_BUFFER_NEW; + + if ( b == YY_CURRENT_BUFFER ) + yy_load_buffer_state(yyscanner ); +} + +/** Pushes the new state onto the stack. The new state becomes + * the current state. This function will allocate the stack + * if necessary. + * @param new_buffer The new state. + * @param yyscanner The scanner object. + */ +void yypush_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + if (new_buffer == NULL) + return; + + yyensure_buffer_stack(yyscanner); + + /* This block is copied from yy_switch_to_buffer. */ + if ( YY_CURRENT_BUFFER ) + { + /* Flush out information for old buffer. */ + *yyg->yy_c_buf_p = yyg->yy_hold_char; + YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p; + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars; + } + + /* Only push if top exists. Otherwise, replace top. */ + if (YY_CURRENT_BUFFER) + yyg->yy_buffer_stack_top++; + YY_CURRENT_BUFFER_LVALUE = new_buffer; + + /* copied from yy_switch_to_buffer. */ + yy_load_buffer_state(yyscanner ); + yyg->yy_did_buffer_switch_on_eof = 1; +} + +/** Removes and deletes the top of the stack, if present. + * The next element becomes the new top. + * @param yyscanner The scanner object. + */ +void yypop_buffer_state (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + if (!YY_CURRENT_BUFFER) + return; + + yy_delete_buffer(YY_CURRENT_BUFFER ,yyscanner); + YY_CURRENT_BUFFER_LVALUE = NULL; + if (yyg->yy_buffer_stack_top > 0) + --yyg->yy_buffer_stack_top; + + if (YY_CURRENT_BUFFER) { + yy_load_buffer_state(yyscanner ); + yyg->yy_did_buffer_switch_on_eof = 1; + } +} + +/* Allocates the stack if it does not exist. + * Guarantees space for at least one push. + */ +static void yyensure_buffer_stack (yyscan_t yyscanner) +{ + yy_size_t num_to_alloc; + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + if (!yyg->yy_buffer_stack) { + + /* First allocation is just for 2 elements, since we don't know if this + * scanner will even need a stack. We use 2 instead of 1 to avoid an + * immediate realloc on the next call. + */ + num_to_alloc = 1; + yyg->yy_buffer_stack = (struct yy_buffer_state**)yyalloc + (num_to_alloc * sizeof(struct yy_buffer_state*) + , yyscanner); + if ( ! yyg->yy_buffer_stack ) + YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); + + memset(yyg->yy_buffer_stack, 0, num_to_alloc * sizeof(struct yy_buffer_state*)); + + yyg->yy_buffer_stack_max = num_to_alloc; + yyg->yy_buffer_stack_top = 0; + return; + } + + if (yyg->yy_buffer_stack_top >= (yyg->yy_buffer_stack_max) - 1){ + + /* Increase the buffer to prepare for a possible push. */ + int grow_size = 8 /* arbitrary grow size */; + + num_to_alloc = yyg->yy_buffer_stack_max + grow_size; + yyg->yy_buffer_stack = (struct yy_buffer_state**)yyrealloc + (yyg->yy_buffer_stack, + num_to_alloc * sizeof(struct yy_buffer_state*) + , yyscanner); + if ( ! yyg->yy_buffer_stack ) + YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); + + /* zero only the new slots.*/ + memset(yyg->yy_buffer_stack + yyg->yy_buffer_stack_max, 0, grow_size * sizeof(struct yy_buffer_state*)); + yyg->yy_buffer_stack_max = num_to_alloc; + } +} + +/** Setup the input buffer state to scan directly from a user-specified character buffer. + * @param base the character buffer + * @param size the size in bytes of the character buffer + * @param yyscanner The scanner object. + * @return the newly allocated buffer state object. + */ +YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size , yyscan_t yyscanner) +{ + YY_BUFFER_STATE b; + + if ( size < 2 || + base[size-2] != YY_END_OF_BUFFER_CHAR || + base[size-1] != YY_END_OF_BUFFER_CHAR ) + /* They forgot to leave room for the EOB's. */ + return 0; + + b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ,yyscanner ); + if ( ! b ) + YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); + + b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ + b->yy_buf_pos = b->yy_ch_buf = base; + b->yy_is_our_buffer = 0; + b->yy_input_file = 0; + b->yy_n_chars = b->yy_buf_size; + b->yy_is_interactive = 0; + b->yy_at_bol = 1; + b->yy_fill_buffer = 0; + b->yy_buffer_status = YY_BUFFER_NEW; + + yy_switch_to_buffer(b ,yyscanner ); + + return b; +} + +/** Setup the input buffer state to scan a string. The next call to yylex() will + * scan from a @e copy of @a str. + * @param yystr a NUL-terminated string to scan + * @param yyscanner The scanner object. + * @return the newly allocated buffer state object. + * @note If you want to scan bytes that may contain NUL values, then use + * yy_scan_bytes() instead. + */ +YY_BUFFER_STATE yy_scan_string (yyconst char * yystr , yyscan_t yyscanner) +{ + + return yy_scan_bytes(yystr,strlen(yystr) ,yyscanner); +} + +/** Setup the input buffer state to scan the given bytes. The next call to yylex() will + * scan from a @e copy of @a bytes. + * @param bytes the byte buffer to scan + * @param len the number of bytes in the buffer pointed to by @a bytes. + * @param yyscanner The scanner object. + * @return the newly allocated buffer state object. + */ +YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len , yyscan_t yyscanner) +{ + YY_BUFFER_STATE b; + char *buf; + yy_size_t n, i; + + /* Get memory for full buffer, including space for trailing EOB's. */ + n = _yybytes_len + 2; + buf = (char *) yyalloc(n ,yyscanner ); + if ( ! buf ) + YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); + + for ( i = 0; i < _yybytes_len; ++i ) + buf[i] = yybytes[i]; + + buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; + + b = yy_scan_buffer(buf,n ,yyscanner); + if ( ! b ) + YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); + + /* It's okay to grow etc. this buffer, and we should throw it + * away when we're done. + */ + b->yy_is_our_buffer = 1; + + return b; +} + +#ifndef YY_EXIT_FAILURE +#define YY_EXIT_FAILURE 2 +#endif + +static void yy_fatal_error (yyconst char* msg , yyscan_t yyscanner) +{ + (void) fprintf( stderr, "%s\n", msg ); + exit( YY_EXIT_FAILURE ); +} + +/* Redefine yyless() so it works in section 3 code. */ + +#undef yyless +#define yyless(n) \ + do \ + { \ + /* Undo effects of setting up yytext. */ \ + int yyless_macro_arg = (n); \ + YY_LESS_LINENO(yyless_macro_arg);\ + yytext[yyleng] = yyg->yy_hold_char; \ + yyg->yy_c_buf_p = yytext + yyless_macro_arg; \ + yyg->yy_hold_char = *yyg->yy_c_buf_p; \ + *yyg->yy_c_buf_p = '\0'; \ + yyleng = yyless_macro_arg; \ + } \ + while ( 0 ) + +/* Accessor methods (get/set functions) to struct members. */ + +/** Get the user-defined data for this scanner. + * @param yyscanner The scanner object. + */ +YY_EXTRA_TYPE yyget_extra (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + return yyextra; +} + +/** Get the current line number. + * @param yyscanner The scanner object. + */ +int yyget_lineno (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + if (! YY_CURRENT_BUFFER) + return 0; + + return yylineno; +} + +/** Get the current column number. + * @param yyscanner The scanner object. + */ +int yyget_column (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + if (! YY_CURRENT_BUFFER) + return 0; + + return yycolumn; +} + +/** Get the input stream. + * @param yyscanner The scanner object. + */ +FILE *yyget_in (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + return yyin; +} + +/** Get the output stream. + * @param yyscanner The scanner object. + */ +FILE *yyget_out (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + return yyout; +} + +/** Get the length of the current token. + * @param yyscanner The scanner object. + */ +yy_size_t yyget_leng (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + return yyleng; +} + +/** Get the current token. + * @param yyscanner The scanner object. + */ + +char *yyget_text (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + return yytext; +} + +/** Set the user-defined data. This data is never touched by the scanner. + * @param user_defined The data to be associated with this scanner. + * @param yyscanner The scanner object. + */ +void yyset_extra (YY_EXTRA_TYPE user_defined , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + yyextra = user_defined ; +} + +/** Set the current line number. + * @param line_number + * @param yyscanner The scanner object. + */ +void yyset_lineno (int line_number , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + /* lineno is only valid if an input buffer exists. */ + if (! YY_CURRENT_BUFFER ) + yy_fatal_error( "yyset_lineno called with no buffer" , yyscanner); + + yylineno = line_number; +} + +/** Set the current column. + * @param line_number + * @param yyscanner The scanner object. + */ +void yyset_column (int column_no , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + /* column is only valid if an input buffer exists. */ + if (! YY_CURRENT_BUFFER ) + yy_fatal_error( "yyset_column called with no buffer" , yyscanner); + + yycolumn = column_no; +} + +/** Set the input stream. This does not discard the current + * input buffer. + * @param in_str A readable stream. + * @param yyscanner The scanner object. + * @see yy_switch_to_buffer + */ +void yyset_in (FILE * in_str , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + yyin = in_str ; +} + +void yyset_out (FILE * out_str , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + yyout = out_str ; +} + +int yyget_debug (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + return yy_flex_debug; +} + +void yyset_debug (int bdebug , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + yy_flex_debug = bdebug ; +} + +/* Accessor methods for yylval and yylloc */ + +YYSTYPE * yyget_lval (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + return yylval; +} + +void yyset_lval (YYSTYPE * yylval_param , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + yylval = yylval_param; +} + +YYLTYPE *yyget_lloc (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + return yylloc; +} + +void yyset_lloc (YYLTYPE * yylloc_param , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + yylloc = yylloc_param; +} + +/* User-visible API */ + +/* yylex_init is special because it creates the scanner itself, so it is + * the ONLY reentrant function that doesn't take the scanner as the last argument. + * That's why we explicitly handle the declaration, instead of using our macros. + */ + +int yylex_init(yyscan_t* ptr_yy_globals) + +{ + if (ptr_yy_globals == NULL){ + errno = EINVAL; + return 1; + } + + *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), NULL ); + + if (*ptr_yy_globals == NULL){ + errno = ENOMEM; + return 1; + } + + /* By setting to 0xAA, we expose bugs in yy_init_globals. Leave at 0x00 for releases. */ + memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t)); + + return yy_init_globals ( *ptr_yy_globals ); +} + +/* yylex_init_extra has the same functionality as yylex_init, but follows the + * convention of taking the scanner as the last argument. Note however, that + * this is a *pointer* to a scanner, as it will be allocated by this call (and + * is the reason, too, why this function also must handle its own declaration). + * The user defined value in the first argument will be available to yyalloc in + * the yyextra field. + */ + +int yylex_init_extra(YY_EXTRA_TYPE yy_user_defined,yyscan_t* ptr_yy_globals ) + +{ + struct yyguts_t dummy_yyguts; + + yyset_extra (yy_user_defined, &dummy_yyguts); + + if (ptr_yy_globals == NULL){ + errno = EINVAL; + return 1; + } + + *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), &dummy_yyguts ); + + if (*ptr_yy_globals == NULL){ + errno = ENOMEM; + return 1; + } + + /* By setting to 0xAA, we expose bugs in + yy_init_globals. Leave at 0x00 for releases. */ + memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t)); + + yyset_extra (yy_user_defined, *ptr_yy_globals); + + return yy_init_globals ( *ptr_yy_globals ); +} + +static int yy_init_globals (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + /* Initialization is the same as for the non-reentrant scanner. + * This function is called from yylex_destroy(), so don't allocate here. + */ + + yyg->yy_buffer_stack = 0; + yyg->yy_buffer_stack_top = 0; + yyg->yy_buffer_stack_max = 0; + yyg->yy_c_buf_p = (char *) 0; + yyg->yy_init = 0; + yyg->yy_start = 0; + + yyg->yy_start_stack_ptr = 0; + yyg->yy_start_stack_depth = 0; + yyg->yy_start_stack = NULL; + +/* Defined in main.c */ +#ifdef YY_STDINIT + yyin = stdin; + yyout = stdout; +#else + yyin = (FILE *) 0; + yyout = (FILE *) 0; +#endif + + /* For future reference: Set errno on error, since we are called by + * yylex_init() + */ + return 0; +} + +/* yylex_destroy is for both reentrant and non-reentrant scanners. */ +int yylex_destroy (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + /* Pop the buffer stack, destroying each element. */ + while(YY_CURRENT_BUFFER){ + yy_delete_buffer(YY_CURRENT_BUFFER ,yyscanner ); + YY_CURRENT_BUFFER_LVALUE = NULL; + yypop_buffer_state(yyscanner); + } + + /* Destroy the stack itself. */ + yyfree(yyg->yy_buffer_stack ,yyscanner); + yyg->yy_buffer_stack = NULL; + + /* Destroy the start condition stack. */ + yyfree(yyg->yy_start_stack ,yyscanner ); + yyg->yy_start_stack = NULL; + + /* Reset the globals. This is important in a non-reentrant scanner so the next time + * yylex() is called, initialization will occur. */ + yy_init_globals( yyscanner); + + /* Destroy the main struct (reentrant only). */ + yyfree ( yyscanner , yyscanner ); + yyscanner = NULL; + return 0; +} + +/* + * Internal utility routines. + */ + +#ifndef yytext_ptr +static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t yyscanner) +{ + register int i; + for ( i = 0; i < n; ++i ) + s1[i] = s2[i]; +} +#endif + +#ifdef YY_NEED_STRLEN +static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner) +{ + register int n; + for ( n = 0; s[n]; ++n ) + ; + + return n; +} +#endif + +void *yyalloc (yy_size_t size , yyscan_t yyscanner) +{ + return (void *) malloc( size ); +} + +void *yyrealloc (void * ptr, yy_size_t size , yyscan_t yyscanner) +{ + /* The cast to (char *) in the following accommodates both + * implementations that use char* generic pointers, and those + * that use void* generic pointers. It works with the latter + * because both ANSI C and C++ allow castless assignment from + * any pointer type to void*, and deal with argument conversions + * as though doing an assignment. + */ + return (void *) realloc( (char *) ptr, size ); +} + +void yyfree (void * ptr , yyscan_t yyscanner) +{ + free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ +} + +#define YYTABLES_NAME "yytables" + +#line 182 "../tikzit/src/data/tikzlexer.l" diff --git a/tikzit/src/data/tikzparser.parser.cpp b/tikzit/src/data/tikzparser.parser.cpp new file mode 100644 index 0000000..53c8da7 --- /dev/null +++ b/tikzit/src/data/tikzparser.parser.cpp @@ -0,0 +1,1931 @@ +/* A Bison parser, made by GNU Bison 2.3. */ + +/* Skeleton implementation for Bison's Yacc-like parsers in C + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ + +/* As a special exception, you may create a larger work that contains + part or all of the Bison parser skeleton and distribute that work + under terms of your choice, so long as that work isn't itself a + parser generator using the skeleton or a modified version thereof + as a parser skeleton. Alternatively, if you modify or redistribute + the parser skeleton itself, you may (at your option) remove this + special exception, which will cause the skeleton and the resulting + Bison output files to be licensed under the GNU General Public + License without this special exception. + + This special exception was added by the Free Software Foundation in + version 2.2 of Bison. */ + +/* C LALR(1) parser skeleton written by Richard Stallman, by + simplifying the original so-called "semantic" parser. */ + +/* All symbols defined below should begin with yy or YY, to avoid + infringing on user name space. This should be done even for local + variables, as they might otherwise be expanded by user macros. + There are some unavoidable exceptions within include files to + define necessary library symbols; they are noted "INFRINGES ON + USER NAME SPACE" below. */ + +/* Identify Bison output. */ +#define YYBISON 1 + +/* Bison version. */ +#define YYBISON_VERSION "2.3" + +/* Skeleton name. */ +#define YYSKELETON_NAME "yacc.c" + +/* Pure parsers. */ +#define YYPURE 1 + +/* Using locations. */ +#define YYLSP_NEEDED 1 + + + +/* Tokens. */ +#ifndef YYTOKENTYPE +# define YYTOKENTYPE + /* Put the tokens into the symbol table, so that GDB and other debuggers + know about them. */ + enum yytokentype { + BEGIN_TIKZPICTURE_CMD = 258, + END_TIKZPICTURE_CMD = 259, + BEGIN_PGFONLAYER_CMD = 260, + END_PGFONLAYER_CMD = 261, + DRAW_CMD = 262, + NODE_CMD = 263, + PATH_CMD = 264, + RECTANGLE = 265, + NODE = 266, + AT = 267, + TO = 268, + SEMICOLON = 269, + COMMA = 270, + LEFTPARENTHESIS = 271, + RIGHTPARENTHESIS = 272, + LEFTBRACKET = 273, + RIGHTBRACKET = 274, + FULLSTOP = 275, + EQUALS = 276, + COORD = 277, + PROPSTRING = 278, + REFSTRING = 279, + DELIMITEDSTRING = 280, + UNKNOWN_BEGIN_CMD = 281, + UNKNOWN_END_CMD = 282, + UNKNOWN_CMD = 283, + UNKNOWN_STR = 284, + UNCLOSED_DELIM_STR = 285 + }; +#endif +/* Tokens. */ +#define BEGIN_TIKZPICTURE_CMD 258 +#define END_TIKZPICTURE_CMD 259 +#define BEGIN_PGFONLAYER_CMD 260 +#define END_PGFONLAYER_CMD 261 +#define DRAW_CMD 262 +#define NODE_CMD 263 +#define PATH_CMD 264 +#define RECTANGLE 265 +#define NODE 266 +#define AT 267 +#define TO 268 +#define SEMICOLON 269 +#define COMMA 270 +#define LEFTPARENTHESIS 271 +#define RIGHTPARENTHESIS 272 +#define LEFTBRACKET 273 +#define RIGHTBRACKET 274 +#define FULLSTOP 275 +#define EQUALS 276 +#define COORD 277 +#define PROPSTRING 278 +#define REFSTRING 279 +#define DELIMITEDSTRING 280 +#define UNKNOWN_BEGIN_CMD 281 +#define UNKNOWN_END_CMD 282 +#define UNKNOWN_CMD 283 +#define UNKNOWN_STR 284 +#define UNCLOSED_DELIM_STR 285 + + + + +/* Copy the first part of user declarations. */ +#line 1 "../tikzit/src/data/tikzparser.y" + +/* + * Copyright 2010 Chris Heunen + * Copyright 2010-2013 Aleks Kissinger + * Copyright 2013 K. Johan Paulsson + * Copyright 2013 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "tikzparserdefs.h" + + +/* Enabling traces. */ +#ifndef YYDEBUG +# define YYDEBUG 0 +#endif + +/* Enabling verbose error messages. */ +#ifdef YYERROR_VERBOSE +# undef YYERROR_VERBOSE +# define YYERROR_VERBOSE 1 +#else +# define YYERROR_VERBOSE 1 +#endif + +/* Enabling the token table. */ +#ifndef YYTOKEN_TABLE +# define YYTOKEN_TABLE 0 +#endif + +#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED +typedef union YYSTYPE +#line 43 "../tikzit/src/data/tikzparser.y" +{ + char *str; + GraphElementProperty *prop; + GraphElementData *data; + Node *node; + QPointF *pt; + struct noderef noderef; +} +/* Line 193 of yacc.c. */ +#line 189 "../tikzit/src/data/tikzparser.parser.cpp" + YYSTYPE; +# define yystype YYSTYPE /* obsolescent; will be withdrawn */ +# define YYSTYPE_IS_DECLARED 1 +# define YYSTYPE_IS_TRIVIAL 1 +#endif + +#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED +typedef struct YYLTYPE +{ + int first_line; + int first_column; + int last_line; + int last_column; +} YYLTYPE; +# define yyltype YYLTYPE /* obsolescent; will be withdrawn */ +# define YYLTYPE_IS_DECLARED 1 +# define YYLTYPE_IS_TRIVIAL 1 +#endif + + +/* Copy the second part of user declarations. */ +#line 52 "../tikzit/src/data/tikzparser.y" + +#include "node.h" +#include "edge.h" +#include "graphelementdata.h" +#include "graphelementproperty.h" + +#include "tikzlexer.h" +#import "tikzgraphassembler.h" +/* the assembler (used by this parser) is stored in the lexer + state as "extra" data */ +#define assembler yyget_extra(scanner) + +/* pass errors off to the assembler */ +void yyerror(YYLTYPE *yylloc, void *scanner, const char *str) { + // TODO: implement reportError() + //assembler->reportError(str, yylloc); + qDebug() << "parse error: " << str; +} + + +/* Line 216 of yacc.c. */ +#line 233 "../tikzit/src/data/tikzparser.parser.cpp" + +#ifdef short +# undef short +#endif + +#ifdef YYTYPE_UINT8 +typedef YYTYPE_UINT8 yytype_uint8; +#else +typedef unsigned char yytype_uint8; +#endif + +#ifdef YYTYPE_INT8 +typedef YYTYPE_INT8 yytype_int8; +#elif (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +typedef signed char yytype_int8; +#else +typedef short int yytype_int8; +#endif + +#ifdef YYTYPE_UINT16 +typedef YYTYPE_UINT16 yytype_uint16; +#else +typedef unsigned short int yytype_uint16; +#endif + +#ifdef YYTYPE_INT16 +typedef YYTYPE_INT16 yytype_int16; +#else +typedef short int yytype_int16; +#endif + +#ifndef YYSIZE_T +# ifdef __SIZE_TYPE__ +# define YYSIZE_T __SIZE_TYPE__ +# elif defined size_t +# define YYSIZE_T size_t +# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +# include /* INFRINGES ON USER NAME SPACE */ +# define YYSIZE_T size_t +# else +# define YYSIZE_T unsigned int +# endif +#endif + +#define YYSIZE_MAXIMUM ((YYSIZE_T) -1) + +#ifndef YY_ +# if defined YYENABLE_NLS && YYENABLE_NLS +# if ENABLE_NLS +# include /* INFRINGES ON USER NAME SPACE */ +# define YY_(msgid) dgettext ("bison-runtime", msgid) +# endif +# endif +# ifndef YY_ +# define YY_(msgid) msgid +# endif +#endif + +/* Suppress unused-variable warnings by "using" E. */ +#if ! defined lint || defined __GNUC__ +# define YYUSE(e) ((void) (e)) +#else +# define YYUSE(e) /* empty */ +#endif + +/* Identity function, used to suppress warnings about constant conditions. */ +#ifndef lint +# define YYID(n) (n) +#else +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static int +YYID (int i) +#else +static int +YYID (i) + int i; +#endif +{ + return i; +} +#endif + +#if ! defined yyoverflow || YYERROR_VERBOSE + +/* The parser invokes alloca or malloc; define the necessary symbols. */ + +# ifdef YYSTACK_USE_ALLOCA +# if YYSTACK_USE_ALLOCA +# ifdef __GNUC__ +# define YYSTACK_ALLOC __builtin_alloca +# elif defined __BUILTIN_VA_ARG_INCR +# include /* INFRINGES ON USER NAME SPACE */ +# elif defined _AIX +# define YYSTACK_ALLOC __alloca +# elif defined _MSC_VER +# include /* INFRINGES ON USER NAME SPACE */ +# define alloca _alloca +# else +# define YYSTACK_ALLOC alloca +# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +# include /* INFRINGES ON USER NAME SPACE */ +# ifndef _STDLIB_H +# define _STDLIB_H 1 +# endif +# endif +# endif +# endif +# endif + +# ifdef YYSTACK_ALLOC + /* Pacify GCC's `empty if-body' warning. */ +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) +# ifndef YYSTACK_ALLOC_MAXIMUM + /* The OS might guarantee only one guard page at the bottom of the stack, + and a page size can be as small as 4096 bytes. So we cannot safely + invoke alloca (N) if N exceeds 4096. Use a slightly smaller number + to allow for a few compiler-allocated temporary stack slots. */ +# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */ +# endif +# else +# define YYSTACK_ALLOC YYMALLOC +# define YYSTACK_FREE YYFREE +# ifndef YYSTACK_ALLOC_MAXIMUM +# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM +# endif +# if (defined __cplusplus && ! defined _STDLIB_H \ + && ! ((defined YYMALLOC || defined malloc) \ + && (defined YYFREE || defined free))) +# include /* INFRINGES ON USER NAME SPACE */ +# ifndef _STDLIB_H +# define _STDLIB_H 1 +# endif +# endif +# ifndef YYMALLOC +# define YYMALLOC malloc +# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ +# endif +# endif +# ifndef YYFREE +# define YYFREE free +# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +void free (void *); /* INFRINGES ON USER NAME SPACE */ +# endif +# endif +# endif +#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ + + +#if (! defined yyoverflow \ + && (! defined __cplusplus \ + || (defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL \ + && defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) + +/* A type that is properly aligned for any stack member. */ +union yyalloc +{ + yytype_int16 yyss; + YYSTYPE yyvs; + YYLTYPE yyls; +}; + +/* The size of the maximum gap between one aligned stack and the next. */ +# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) + +/* The size of an array large to enough to hold all stacks, each with + N elements. */ +# define YYSTACK_BYTES(N) \ + ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \ + + 2 * YYSTACK_GAP_MAXIMUM) + +/* Copy COUNT objects from FROM to TO. The source and destination do + not overlap. */ +# ifndef YYCOPY +# if defined __GNUC__ && 1 < __GNUC__ +# define YYCOPY(To, From, Count) \ + __builtin_memcpy (To, From, (Count) * sizeof (*(From))) +# else +# define YYCOPY(To, From, Count) \ + do \ + { \ + YYSIZE_T yyi; \ + for (yyi = 0; yyi < (Count); yyi++) \ + (To)[yyi] = (From)[yyi]; \ + } \ + while (YYID (0)) +# endif +# endif + +/* Relocate STACK from its old location to the new one. The + local variables YYSIZE and YYSTACKSIZE give the old and new number of + elements in the stack, and YYPTR gives the new location of the + stack. Advance YYPTR to a properly aligned location for the next + stack. */ +# define YYSTACK_RELOCATE(Stack) \ + do \ + { \ + YYSIZE_T yynewbytes; \ + YYCOPY (&yyptr->Stack, Stack, yysize); \ + Stack = &yyptr->Stack; \ + yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ + yyptr += yynewbytes / sizeof (*yyptr); \ + } \ + while (YYID (0)) + +#endif + +/* YYFINAL -- State number of the termination state. */ +#define YYFINAL 5 +/* YYLAST -- Last index in YYTABLE. */ +#define YYLAST 52 + +/* YYNTOKENS -- Number of terminals. */ +#define YYNTOKENS 31 +/* YYNNTS -- Number of nonterminals. */ +#define YYNNTS 21 +/* YYNRULES -- Number of rules. */ +#define YYNRULES 36 +/* YYNRULES -- Number of states. */ +#define YYNSTATES 70 + +/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ +#define YYUNDEFTOK 2 +#define YYMAXUTOK 285 + +#define YYTRANSLATE(YYX) \ + ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) + +/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ +static const yytype_uint8 yytranslate[] = +{ + 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, + 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, + 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, + 25, 26, 27, 28, 29, 30 +}; + +#if YYDEBUG +/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in + YYRHS. */ +static const yytype_uint8 yyprhs[] = +{ + 0, 0, 3, 8, 11, 12, 14, 16, 18, 20, + 23, 25, 28, 32, 33, 36, 40, 41, 45, 47, + 49, 51, 55, 63, 64, 67, 72, 74, 77, 78, + 82, 90, 92, 96, 99, 100, 104 +}; + +/* YYRHS -- A `-1'-separated list of the rules' RHS. */ +static const yytype_int8 yyrhs[] = +{ + 32, 0, -1, 3, 36, 33, 4, -1, 33, 34, + -1, -1, 42, -1, 47, -1, 51, -1, 35, -1, + 5, 25, -1, 6, -1, 18, 19, -1, 18, 37, + 19, -1, -1, 38, 39, -1, 38, 39, 15, -1, + -1, 40, 21, 40, -1, 40, -1, 23, -1, 25, + -1, 16, 24, 17, -1, 8, 36, 41, 12, 22, + 25, 14, -1, -1, 20, 24, -1, 16, 24, 43, + 17, -1, 44, -1, 16, 17, -1, -1, 11, 36, + 25, -1, 7, 36, 44, 13, 46, 45, 14, -1, + 40, -1, 40, 21, 40, -1, 48, 49, -1, -1, + 18, 49, 19, -1, 9, 50, 22, 10, 22, 14, + -1 +}; + +/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ +static const yytype_uint8 yyrline[] = +{ + 0, 124, 124, 130, 130, 131, 131, 131, 131, 133, + 133, 136, 138, 140, 141, 148, 154, 156, 163, 169, + 169, 171, 172, 190, 190, 191, 198, 199, 201, 202, + 210, 243, 243, 244, 244, 245, 247 +}; +#endif + +#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE +/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. + First, the terminals, then, starting at YYNTOKENS, nonterminals. */ +static const char *const yytname[] = +{ + "$end", "error", "$undefined", "\"\\\\begin{tikzpicture}\"", + "\"\\\\end{tikzpicture}\"", "\"\\\\begin{pgfonlayer}\"", + "\"\\\\end{pgfonlayer}\"", "\"\\\\draw\"", "\"\\\\node\"", + "\"\\\\path\"", "\"rectangle\"", "\"node\"", "\"at\"", "\"to\"", "\";\"", + "\",\"", "\"(\"", "\")\"", "\"[\"", "\"]\"", "\".\"", "\"=\"", + "\"co-ordinate\"", "\"key/value string\"", "\"string\"", + "\"{-delimited string\"", "\"unknown \\\\begin command\"", + "\"unknown \\\\end command\"", "\"unknown latex command\"", + "\"unknown string\"", "\"unclosed {-delimited string\"", "$accept", + "tikzpicture", "tikzcmds", "tikzcmd", "ignore", "optproperties", + "properties", "extraproperties", "property", "val", "nodename", "node", + "optanchor", "noderef", "optnoderef", "optedgenode", "edge", + "ignoreprop", "ignoreprops", "optignoreprops", "boundingbox", 0 +}; +#endif + +# ifdef YYPRINT +/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to + token YYLEX-NUM. */ +static const yytype_uint16 yytoknum[] = +{ + 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, + 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, + 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, + 285 +}; +# endif + +/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ +static const yytype_uint8 yyr1[] = +{ + 0, 31, 32, 33, 33, 34, 34, 34, 34, 35, + 35, 36, 36, 36, 37, 38, 38, 39, 39, 40, + 40, 41, 42, 43, 43, 44, 45, 45, 46, 46, + 47, 48, 48, 49, 49, 50, 51 +}; + +/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ +static const yytype_uint8 yyr2[] = +{ + 0, 2, 4, 2, 0, 1, 1, 1, 1, 2, + 1, 2, 3, 0, 2, 3, 0, 3, 1, 1, + 1, 3, 7, 0, 2, 4, 1, 2, 0, 3, + 7, 1, 3, 2, 0, 3, 6 +}; + +/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state + STATE-NUM when YYTABLE doesn't specify something else to do. Zero + means the default is an error. */ +static const yytype_uint8 yydefact[] = +{ + 0, 13, 0, 16, 4, 1, 11, 0, 0, 0, + 12, 19, 20, 14, 18, 2, 0, 10, 13, 13, + 0, 3, 8, 5, 6, 7, 15, 0, 9, 0, + 0, 34, 0, 17, 0, 0, 0, 0, 31, 34, + 0, 0, 23, 28, 0, 0, 0, 33, 35, 0, + 0, 0, 13, 0, 21, 0, 32, 0, 24, 25, + 0, 0, 26, 0, 0, 36, 29, 27, 30, 22 +}; + +/* YYDEFGOTO[NTERM-NUM]. */ +static const yytype_int8 yydefgoto[] = +{ + -1, 2, 9, 21, 22, 4, 7, 8, 13, 38, + 37, 23, 51, 35, 63, 53, 24, 39, 40, 32, + 25 +}; + +/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing + STATE-NUM. */ +#define YYPACT_NINF -20 +static const yytype_int8 yypact[] = +{ + 9, -4, 15, -3, -20, -20, -20, -2, -12, 0, + -20, -20, -20, 3, -1, -20, 1, -20, -4, -4, + 4, -20, -20, -20, -20, -20, -20, -12, -20, 5, + 7, -12, 2, -20, 6, 12, 8, 16, 10, -12, + 14, 17, 19, 18, 20, 21, -12, -20, -20, 22, + 23, 24, -4, 26, -20, 11, -20, 31, -20, -20, + 25, -14, -20, 32, 34, -20, -20, -20, -20, -20 +}; + +/* YYPGOTO[NTERM-NUM]. */ +static const yytype_int8 yypgoto[] = +{ + -20, -20, -20, -20, -20, -17, -20, -20, -20, -8, + -20, -20, -20, -19, -20, -20, -20, -20, 13, -20, + -20 +}; + +/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If + positive, shift that token. If negative, reduce the rule which + number is the opposite. If zero, do what YYDEFACT says. + If YYTABLE_NINF, syntax error. */ +#define YYTABLE_NINF -1 +static const yytype_uint8 yytable[] = +{ + 14, 29, 30, 67, 15, 16, 17, 18, 19, 20, + 42, 11, 1, 12, 3, 5, 6, 10, 26, 33, + 27, 34, 31, 36, 41, 43, 28, 49, 45, 52, + 42, 46, 44, 48, 62, 60, 64, 54, 56, 50, + 0, 59, 61, 55, 57, 65, 68, 58, 69, 0, + 66, 0, 47 +}; + +static const yytype_int8 yycheck[] = +{ + 8, 18, 19, 17, 4, 5, 6, 7, 8, 9, + 24, 23, 3, 25, 18, 0, 19, 19, 15, 27, + 21, 16, 18, 16, 22, 13, 25, 10, 12, 11, + 24, 21, 24, 19, 53, 52, 25, 17, 46, 20, + -1, 17, 16, 22, 22, 14, 14, 24, 14, -1, + 25, -1, 39 +}; + +/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing + symbol of state STATE-NUM. */ +static const yytype_uint8 yystos[] = +{ + 0, 3, 32, 18, 36, 0, 19, 37, 38, 33, + 19, 23, 25, 39, 40, 4, 5, 6, 7, 8, + 9, 34, 35, 42, 47, 51, 15, 21, 25, 36, + 36, 18, 50, 40, 16, 44, 16, 41, 40, 48, + 49, 22, 24, 13, 24, 12, 21, 49, 19, 10, + 20, 43, 11, 46, 17, 22, 40, 22, 24, 17, + 36, 16, 44, 45, 25, 14, 25, 17, 14, 14 +}; + +#define yyerrok (yyerrstatus = 0) +#define yyclearin (yychar = YYEMPTY) +#define YYEMPTY (-2) +#define YYEOF 0 + +#define YYACCEPT goto yyacceptlab +#define YYABORT goto yyabortlab +#define YYERROR goto yyerrorlab + + +/* Like YYERROR except do call yyerror. This remains here temporarily + to ease the transition to the new meaning of YYERROR, for GCC. + Once GCC version 2 has supplanted version 1, this can go. */ + +#define YYFAIL goto yyerrlab + +#define YYRECOVERING() (!!yyerrstatus) + +#define YYBACKUP(Token, Value) \ +do \ + if (yychar == YYEMPTY && yylen == 1) \ + { \ + yychar = (Token); \ + yylval = (Value); \ + yytoken = YYTRANSLATE (yychar); \ + YYPOPSTACK (1); \ + goto yybackup; \ + } \ + else \ + { \ + yyerror (&yylloc, scanner, YY_("syntax error: cannot back up")); \ + YYERROR; \ + } \ +while (YYID (0)) + + +#define YYTERROR 1 +#define YYERRCODE 256 + + +/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. + If N is 0, then set CURRENT to the empty location which ends + the previous symbol: RHS[0] (always defined). */ + +#define YYRHSLOC(Rhs, K) ((Rhs)[K]) +#ifndef YYLLOC_DEFAULT +# define YYLLOC_DEFAULT(Current, Rhs, N) \ + do \ + if (YYID (N)) \ + { \ + (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ + (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ + (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ + (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ + } \ + else \ + { \ + (Current).first_line = (Current).last_line = \ + YYRHSLOC (Rhs, 0).last_line; \ + (Current).first_column = (Current).last_column = \ + YYRHSLOC (Rhs, 0).last_column; \ + } \ + while (YYID (0)) +#endif + + +/* YY_LOCATION_PRINT -- Print the location on the stream. + This macro was not mandated originally: define only if we know + we won't break user code: when these are the locations we know. */ + +#ifndef YY_LOCATION_PRINT +# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL +# define YY_LOCATION_PRINT(File, Loc) \ + fprintf (File, "%d.%d-%d.%d", \ + (Loc).first_line, (Loc).first_column, \ + (Loc).last_line, (Loc).last_column) +# else +# define YY_LOCATION_PRINT(File, Loc) ((void) 0) +# endif +#endif + + +/* YYLEX -- calling `yylex' with the right arguments. */ + +#ifdef YYLEX_PARAM +# define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM) +#else +# define YYLEX yylex (&yylval, &yylloc, scanner) +#endif + +/* Enable debugging if requested. */ +#if YYDEBUG + +# ifndef YYFPRINTF +# include /* INFRINGES ON USER NAME SPACE */ +# define YYFPRINTF fprintf +# endif + +# define YYDPRINTF(Args) \ +do { \ + if (yydebug) \ + YYFPRINTF Args; \ +} while (YYID (0)) + +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ +do { \ + if (yydebug) \ + { \ + YYFPRINTF (stderr, "%s ", Title); \ + yy_symbol_print (stderr, \ + Type, Value, Location, scanner); \ + YYFPRINTF (stderr, "\n"); \ + } \ +} while (YYID (0)) + + +/*--------------------------------. +| Print this symbol on YYOUTPUT. | +`--------------------------------*/ + +/*ARGSUSED*/ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp, void *scanner) +#else +static void +yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp, scanner) + FILE *yyoutput; + int yytype; + YYSTYPE const * const yyvaluep; + YYLTYPE const * const yylocationp; + void *scanner; +#endif +{ + if (!yyvaluep) + return; + YYUSE (yylocationp); + YYUSE (scanner); +# ifdef YYPRINT + if (yytype < YYNTOKENS) + YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); +# else + YYUSE (yyoutput); +# endif + switch (yytype) + { + default: + break; + } +} + + +/*--------------------------------. +| Print this symbol on YYOUTPUT. | +`--------------------------------*/ + +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp, void *scanner) +#else +static void +yy_symbol_print (yyoutput, yytype, yyvaluep, yylocationp, scanner) + FILE *yyoutput; + int yytype; + YYSTYPE const * const yyvaluep; + YYLTYPE const * const yylocationp; + void *scanner; +#endif +{ + if (yytype < YYNTOKENS) + YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); + else + YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); + + YY_LOCATION_PRINT (yyoutput, *yylocationp); + YYFPRINTF (yyoutput, ": "); + yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp, scanner); + YYFPRINTF (yyoutput, ")"); +} + +/*------------------------------------------------------------------. +| yy_stack_print -- Print the state stack from its BOTTOM up to its | +| TOP (included). | +`------------------------------------------------------------------*/ + +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yy_stack_print (yytype_int16 *bottom, yytype_int16 *top) +#else +static void +yy_stack_print (bottom, top) + yytype_int16 *bottom; + yytype_int16 *top; +#endif +{ + YYFPRINTF (stderr, "Stack now"); + for (; bottom <= top; ++bottom) + YYFPRINTF (stderr, " %d", *bottom); + YYFPRINTF (stderr, "\n"); +} + +# define YY_STACK_PRINT(Bottom, Top) \ +do { \ + if (yydebug) \ + yy_stack_print ((Bottom), (Top)); \ +} while (YYID (0)) + + +/*------------------------------------------------. +| Report that the YYRULE is going to be reduced. | +`------------------------------------------------*/ + +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yy_reduce_print (YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule, void *scanner) +#else +static void +yy_reduce_print (yyvsp, yylsp, yyrule, scanner) + YYSTYPE *yyvsp; + YYLTYPE *yylsp; + int yyrule; + void *scanner; +#endif +{ + int yynrhs = yyr2[yyrule]; + int yyi; + unsigned long int yylno = yyrline[yyrule]; + YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", + yyrule - 1, yylno); + /* The symbols being reduced. */ + for (yyi = 0; yyi < yynrhs; yyi++) + { + fprintf (stderr, " $%d = ", yyi + 1); + yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], + &(yyvsp[(yyi + 1) - (yynrhs)]) + , &(yylsp[(yyi + 1) - (yynrhs)]) , scanner); + fprintf (stderr, "\n"); + } +} + +# define YY_REDUCE_PRINT(Rule) \ +do { \ + if (yydebug) \ + yy_reduce_print (yyvsp, yylsp, Rule, scanner); \ +} while (YYID (0)) + +/* Nonzero means print parse trace. It is left uninitialized so that + multiple parsers can coexist. */ +int yydebug; +#else /* !YYDEBUG */ +# define YYDPRINTF(Args) +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) +# define YY_STACK_PRINT(Bottom, Top) +# define YY_REDUCE_PRINT(Rule) +#endif /* !YYDEBUG */ + + +/* YYINITDEPTH -- initial size of the parser's stacks. */ +#ifndef YYINITDEPTH +# define YYINITDEPTH 200 +#endif + +/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only + if the built-in stack extension method is used). + + Do not make this value too large; the results are undefined if + YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH) + evaluated with infinite-precision integer arithmetic. */ + +#ifndef YYMAXDEPTH +# define YYMAXDEPTH 10000 +#endif + + + +#if YYERROR_VERBOSE + +# ifndef yystrlen +# if defined __GLIBC__ && defined _STRING_H +# define yystrlen strlen +# else +/* Return the length of YYSTR. */ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static YYSIZE_T +yystrlen (const char *yystr) +#else +static YYSIZE_T +yystrlen (yystr) + const char *yystr; +#endif +{ + YYSIZE_T yylen; + for (yylen = 0; yystr[yylen]; yylen++) + continue; + return yylen; +} +# endif +# endif + +# ifndef yystpcpy +# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE +# define yystpcpy stpcpy +# else +/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in + YYDEST. */ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static char * +yystpcpy (char *yydest, const char *yysrc) +#else +static char * +yystpcpy (yydest, yysrc) + char *yydest; + const char *yysrc; +#endif +{ + char *yyd = yydest; + const char *yys = yysrc; + + while ((*yyd++ = *yys++) != '\0') + continue; + + return yyd - 1; +} +# endif +# endif + +# ifndef yytnamerr +/* Copy to YYRES the contents of YYSTR after stripping away unnecessary + quotes and backslashes, so that it's suitable for yyerror. The + heuristic is that double-quoting is unnecessary unless the string + contains an apostrophe, a comma, or backslash (other than + backslash-backslash). YYSTR is taken from yytname. If YYRES is + null, do not copy; instead, return the length of what the result + would have been. */ +static YYSIZE_T +yytnamerr (char *yyres, const char *yystr) +{ + if (*yystr == '"') + { + YYSIZE_T yyn = 0; + char const *yyp = yystr; + + for (;;) + switch (*++yyp) + { + case '\'': + case ',': + goto do_not_strip_quotes; + + case '\\': + if (*++yyp != '\\') + goto do_not_strip_quotes; + /* Fall through. */ + default: + if (yyres) + yyres[yyn] = *yyp; + yyn++; + break; + + case '"': + if (yyres) + yyres[yyn] = '\0'; + return yyn; + } + do_not_strip_quotes: ; + } + + if (! yyres) + return yystrlen (yystr); + + return yystpcpy (yyres, yystr) - yyres; +} +# endif + +/* Copy into YYRESULT an error message about the unexpected token + YYCHAR while in state YYSTATE. Return the number of bytes copied, + including the terminating null byte. If YYRESULT is null, do not + copy anything; just return the number of bytes that would be + copied. As a special case, return 0 if an ordinary "syntax error" + message will do. Return YYSIZE_MAXIMUM if overflow occurs during + size calculation. */ +static YYSIZE_T +yysyntax_error (char *yyresult, int yystate, int yychar) +{ + int yyn = yypact[yystate]; + + if (! (YYPACT_NINF < yyn && yyn <= YYLAST)) + return 0; + else + { + int yytype = YYTRANSLATE (yychar); + YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]); + YYSIZE_T yysize = yysize0; + YYSIZE_T yysize1; + int yysize_overflow = 0; + enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; + char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; + int yyx; + +# if 0 + /* This is so xgettext sees the translatable formats that are + constructed on the fly. */ + YY_("syntax error, unexpected %s"); + YY_("syntax error, unexpected %s, expecting %s"); + YY_("syntax error, unexpected %s, expecting %s or %s"); + YY_("syntax error, unexpected %s, expecting %s or %s or %s"); + YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"); +# endif + char *yyfmt; + char const *yyf; + static char const yyunexpected[] = "syntax error, unexpected %s"; + static char const yyexpecting[] = ", expecting %s"; + static char const yyor[] = " or %s"; + char yyformat[sizeof yyunexpected + + sizeof yyexpecting - 1 + + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2) + * (sizeof yyor - 1))]; + char const *yyprefix = yyexpecting; + + /* Start YYX at -YYN if negative to avoid negative indexes in + YYCHECK. */ + int yyxbegin = yyn < 0 ? -yyn : 0; + + /* Stay within bounds of both yycheck and yytname. */ + int yychecklim = YYLAST - yyn + 1; + int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; + int yycount = 1; + + yyarg[0] = yytname[yytype]; + yyfmt = yystpcpy (yyformat, yyunexpected); + + for (yyx = yyxbegin; yyx < yyxend; ++yyx) + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) + { + if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) + { + yycount = 1; + yysize = yysize0; + yyformat[sizeof yyunexpected - 1] = '\0'; + break; + } + yyarg[yycount++] = yytname[yyx]; + yysize1 = yysize + yytnamerr (0, yytname[yyx]); + yysize_overflow |= (yysize1 < yysize); + yysize = yysize1; + yyfmt = yystpcpy (yyfmt, yyprefix); + yyprefix = yyor; + } + + yyf = YY_(yyformat); + yysize1 = yysize + yystrlen (yyf); + yysize_overflow |= (yysize1 < yysize); + yysize = yysize1; + + if (yysize_overflow) + return YYSIZE_MAXIMUM; + + if (yyresult) + { + /* Avoid sprintf, as that infringes on the user's name space. + Don't have undefined behavior even if the translation + produced a string with the wrong number of "%s"s. */ + char *yyp = yyresult; + int yyi = 0; + while ((*yyp = *yyf) != '\0') + { + if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) + { + yyp += yytnamerr (yyp, yyarg[yyi++]); + yyf += 2; + } + else + { + yyp++; + yyf++; + } + } + } + return yysize; + } +} +#endif /* YYERROR_VERBOSE */ + + +/*-----------------------------------------------. +| Release the memory associated to this symbol. | +`-----------------------------------------------*/ + +/*ARGSUSED*/ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp, void *scanner) +#else +static void +yydestruct (yymsg, yytype, yyvaluep, yylocationp, scanner) + const char *yymsg; + int yytype; + YYSTYPE *yyvaluep; + YYLTYPE *yylocationp; + void *scanner; +#endif +{ + YYUSE (yyvaluep); + YYUSE (yylocationp); + YYUSE (scanner); + + if (!yymsg) + yymsg = "Deleting"; + YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); + + switch (yytype) + { + + default: + break; + } +} + + +/* Prevent warnings from -Wmissing-prototypes. */ + +#ifdef YYPARSE_PARAM +#if defined __STDC__ || defined __cplusplus +int yyparse (void *YYPARSE_PARAM); +#else +int yyparse (); +#endif +#else /* ! YYPARSE_PARAM */ +#if defined __STDC__ || defined __cplusplus +int yyparse (void *scanner); +#else +int yyparse (); +#endif +#endif /* ! YYPARSE_PARAM */ + + + + + + +/*----------. +| yyparse. | +`----------*/ + +#ifdef YYPARSE_PARAM +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +int +yyparse (void *YYPARSE_PARAM) +#else +int +yyparse (YYPARSE_PARAM) + void *YYPARSE_PARAM; +#endif +#else /* ! YYPARSE_PARAM */ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +int +yyparse (void *scanner) +#else +int +yyparse (scanner) + void *scanner; +#endif +#endif +{ + /* The look-ahead symbol. */ +int yychar; + +/* The semantic value of the look-ahead symbol. */ +YYSTYPE yylval; + +/* Number of syntax errors so far. */ +int yynerrs; +/* Location data for the look-ahead symbol. */ +YYLTYPE yylloc; + + int yystate; + int yyn; + int yyresult; + /* Number of tokens to shift before error messages enabled. */ + int yyerrstatus; + /* Look-ahead token as an internal (translated) token number. */ + int yytoken = 0; +#if YYERROR_VERBOSE + /* Buffer for error messages, and its allocated size. */ + char yymsgbuf[128]; + char *yymsg = yymsgbuf; + YYSIZE_T yymsg_alloc = sizeof yymsgbuf; +#endif + + /* Three stacks and their tools: + `yyss': related to states, + `yyvs': related to semantic values, + `yyls': related to locations. + + Refer to the stacks thru separate pointers, to allow yyoverflow + to reallocate them elsewhere. */ + + /* The state stack. */ + yytype_int16 yyssa[YYINITDEPTH]; + yytype_int16 *yyss = yyssa; + yytype_int16 *yyssp; + + /* The semantic value stack. */ + YYSTYPE yyvsa[YYINITDEPTH]; + YYSTYPE *yyvs = yyvsa; + YYSTYPE *yyvsp; + + /* The location stack. */ + YYLTYPE yylsa[YYINITDEPTH]; + YYLTYPE *yyls = yylsa; + YYLTYPE *yylsp; + /* The locations where the error started and ended. */ + YYLTYPE yyerror_range[2]; + +#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N), yylsp -= (N)) + + YYSIZE_T yystacksize = YYINITDEPTH; + + /* The variables used to return semantic value and location from the + action routines. */ + YYSTYPE yyval; + YYLTYPE yyloc; + + /* The number of symbols on the RHS of the reduced rule. + Keep to zero when no symbol should be popped. */ + int yylen = 0; + + YYDPRINTF ((stderr, "Starting parse\n")); + + yystate = 0; + yyerrstatus = 0; + yynerrs = 0; + yychar = YYEMPTY; /* Cause a token to be read. */ + + /* Initialize stack pointers. + Waste one element of value and location stack + so that they stay on the same level as the state stack. + The wasted elements are never initialized. */ + + yyssp = yyss; + yyvsp = yyvs; + yylsp = yyls; +#if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL + /* Initialize the default location before parsing starts. */ + yylloc.first_line = yylloc.last_line = 1; + yylloc.first_column = yylloc.last_column = 0; +#endif + + + /* User initialization code. */ +#line 75 "../tikzit/src/data/tikzparser.y" +{ + yylloc.first_column = yylloc.last_column = 0; +} +/* Line 1078 of yacc.c. */ +#line 1337 "../tikzit/src/data/tikzparser.parser.cpp" + goto yysetstate; + +/*------------------------------------------------------------. +| yynewstate -- Push a new state, which is found in yystate. | +`------------------------------------------------------------*/ + yynewstate: + /* In all cases, when you get here, the value and location stacks + have just been pushed. So pushing a state here evens the stacks. */ + yyssp++; + + yysetstate: + *yyssp = yystate; + + if (yyss + yystacksize - 1 <= yyssp) + { + /* Get the current used size of the three stacks, in elements. */ + YYSIZE_T yysize = yyssp - yyss + 1; + +#ifdef yyoverflow + { + /* Give user a chance to reallocate the stack. Use copies of + these so that the &'s don't force the real ones into + memory. */ + YYSTYPE *yyvs1 = yyvs; + yytype_int16 *yyss1 = yyss; + YYLTYPE *yyls1 = yyls; + + /* Each stack pointer address is followed by the size of the + data in use in that stack, in bytes. This used to be a + conditional around just the two extra args, but that might + be undefined if yyoverflow is a macro. */ + yyoverflow (YY_("memory exhausted"), + &yyss1, yysize * sizeof (*yyssp), + &yyvs1, yysize * sizeof (*yyvsp), + &yyls1, yysize * sizeof (*yylsp), + &yystacksize); + yyls = yyls1; + yyss = yyss1; + yyvs = yyvs1; + } +#else /* no yyoverflow */ +# ifndef YYSTACK_RELOCATE + goto yyexhaustedlab; +# else + /* Extend the stack our own way. */ + if (YYMAXDEPTH <= yystacksize) + goto yyexhaustedlab; + yystacksize *= 2; + if (YYMAXDEPTH < yystacksize) + yystacksize = YYMAXDEPTH; + + { + yytype_int16 *yyss1 = yyss; + union yyalloc *yyptr = + (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); + if (! yyptr) + goto yyexhaustedlab; + YYSTACK_RELOCATE (yyss); + YYSTACK_RELOCATE (yyvs); + YYSTACK_RELOCATE (yyls); +# undef YYSTACK_RELOCATE + if (yyss1 != yyssa) + YYSTACK_FREE (yyss1); + } +# endif +#endif /* no yyoverflow */ + + yyssp = yyss + yysize - 1; + yyvsp = yyvs + yysize - 1; + yylsp = yyls + yysize - 1; + + YYDPRINTF ((stderr, "Stack size increased to %lu\n", + (unsigned long int) yystacksize)); + + if (yyss + yystacksize - 1 <= yyssp) + YYABORT; + } + + YYDPRINTF ((stderr, "Entering state %d\n", yystate)); + + goto yybackup; + +/*-----------. +| yybackup. | +`-----------*/ +yybackup: + + /* Do appropriate processing given the current state. Read a + look-ahead token if we need one and don't already have one. */ + + /* First try to decide what to do without reference to look-ahead token. */ + yyn = yypact[yystate]; + if (yyn == YYPACT_NINF) + goto yydefault; + + /* Not known => get a look-ahead token if don't already have one. */ + + /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */ + if (yychar == YYEMPTY) + { + YYDPRINTF ((stderr, "Reading a token: ")); + yychar = YYLEX; + } + + if (yychar <= YYEOF) + { + yychar = yytoken = YYEOF; + YYDPRINTF ((stderr, "Now at end of input.\n")); + } + else + { + yytoken = YYTRANSLATE (yychar); + YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc); + } + + /* If the proper action on seeing token YYTOKEN is to reduce or to + detect an error, take that action. */ + yyn += yytoken; + if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken) + goto yydefault; + yyn = yytable[yyn]; + if (yyn <= 0) + { + if (yyn == 0 || yyn == YYTABLE_NINF) + goto yyerrlab; + yyn = -yyn; + goto yyreduce; + } + + if (yyn == YYFINAL) + YYACCEPT; + + /* Count tokens shifted since error; after three, turn off error + status. */ + if (yyerrstatus) + yyerrstatus--; + + /* Shift the look-ahead token. */ + YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); + + /* Discard the shifted token unless it is eof. */ + if (yychar != YYEOF) + yychar = YYEMPTY; + + yystate = yyn; + *++yyvsp = yylval; + *++yylsp = yylloc; + goto yynewstate; + + +/*-----------------------------------------------------------. +| yydefault -- do the default action for the current state. | +`-----------------------------------------------------------*/ +yydefault: + yyn = yydefact[yystate]; + if (yyn == 0) + goto yyerrlab; + goto yyreduce; + + +/*-----------------------------. +| yyreduce -- Do a reduction. | +`-----------------------------*/ +yyreduce: + /* yyn is the number of a rule to reduce with. */ + yylen = yyr2[yyn]; + + /* If YYLEN is nonzero, implement the default value of the action: + `$$ = $1'. + + Otherwise, the following line sets YYVAL to garbage. + This behavior is undocumented and Bison + users should not rely upon it. Assigning to YYVAL + unconditionally makes the parser a bit smaller, and it avoids a + GCC warning that YYVAL may be used uninitialized. */ + yyval = yyvsp[1-yylen]; + + /* Default location. */ + YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen); + YY_REDUCE_PRINT (yyn); + switch (yyn) + { + case 2: +#line 125 "../tikzit/src/data/tikzparser.y" + { + if ((yyvsp[(2) - (4)].data)) { + assembler->graph()->setData((yyvsp[(2) - (4)].data)); + } + ;} + break; + + case 11: +#line 137 "../tikzit/src/data/tikzparser.y" + { (yyval.data) = 0; ;} + break; + + case 12: +#line 139 "../tikzit/src/data/tikzparser.y" + { (yyval.data) = (yyvsp[(2) - (3)].data); ;} + break; + + case 13: +#line 140 "../tikzit/src/data/tikzparser.y" + { (yyval.data) = 0; ;} + break; + + case 14: +#line 142 "../tikzit/src/data/tikzparser.y" + { + (yyvsp[(1) - (2)].data)->add(*(yyvsp[(2) - (2)].prop)); + delete (yyvsp[(2) - (2)].prop); + (yyval.data) = (yyvsp[(1) - (2)].data); + ;} + break; + + case 15: +#line 149 "../tikzit/src/data/tikzparser.y" + { + (yyvsp[(1) - (3)].data)->add(*(yyvsp[(2) - (3)].prop)); + delete (yyvsp[(2) - (3)].prop); + (yyval.data) = (yyvsp[(1) - (3)].data); + ;} + break; + + case 16: +#line 154 "../tikzit/src/data/tikzparser.y" + { (yyval.data) = new GraphElementData(); ;} + break; + + case 17: +#line 157 "../tikzit/src/data/tikzparser.y" + { + GraphElementProperty *p = new GraphElementProperty(QString((yyvsp[(1) - (3)].str)),QString((yyvsp[(3) - (3)].str))); + free((yyvsp[(1) - (3)].str)); + free((yyvsp[(3) - (3)].str)); + (yyval.prop) = p; + ;} + break; + + case 18: +#line 164 "../tikzit/src/data/tikzparser.y" + { + GraphElementProperty *a = new GraphElementProperty(QString((yyvsp[(1) - (1)].str))); + free((yyvsp[(1) - (1)].str)); + (yyval.prop) = a; + ;} + break; + + case 19: +#line 169 "../tikzit/src/data/tikzparser.y" + { (yyval.str) = (yyvsp[(1) - (1)].str); ;} + break; + + case 20: +#line 169 "../tikzit/src/data/tikzparser.y" + { (yyval.str) = (yyvsp[(1) - (1)].str); ;} + break; + + case 21: +#line 171 "../tikzit/src/data/tikzparser.y" + { (yyval.str) = (yyvsp[(2) - (3)].str); ;} + break; + + case 22: +#line 173 "../tikzit/src/data/tikzparser.y" + { + Node *node = assembler->graph()->addNode(); + if ((yyvsp[(2) - (7)].data)) { + node->setData((yyvsp[(2) - (7)].data)); + } + //qDebug() << "node name: " << $3; + node->setName(QString((yyvsp[(3) - (7)].str))); + node->setLabel(QString((yyvsp[(6) - (7)].str))); + free((yyvsp[(3) - (7)].str)); + free((yyvsp[(6) - (7)].str)); + + node->setPoint(*(yyvsp[(5) - (7)].pt)); + delete (yyvsp[(5) - (7)].pt); + + assembler->addNodeToMap(node); + ;} + break; + + case 23: +#line 190 "../tikzit/src/data/tikzparser.y" + { (yyval.str) = 0; ;} + break; + + case 24: +#line 190 "../tikzit/src/data/tikzparser.y" + { (yyval.str) = (yyvsp[(2) - (2)].str); ;} + break; + + case 25: +#line 192 "../tikzit/src/data/tikzparser.y" + { + (yyval.noderef).node = assembler->nodeWithName(QString((yyvsp[(2) - (4)].str))); + free((yyvsp[(2) - (4)].str)); + (yyval.noderef).anchor = (yyvsp[(3) - (4)].str); + ;} + break; + + case 26: +#line 198 "../tikzit/src/data/tikzparser.y" + { (yyval.noderef) = (yyvsp[(1) - (1)].noderef); ;} + break; + + case 27: +#line 199 "../tikzit/src/data/tikzparser.y" + { (yyval.noderef).node = 0; (yyval.noderef).anchor = 0; ;} + break; + + case 28: +#line 201 "../tikzit/src/data/tikzparser.y" + { (yyval.node) = 0; ;} + break; + + case 29: +#line 203 "../tikzit/src/data/tikzparser.y" + { + (yyval.node) = new Node(); + if ((yyvsp[(2) - (3)].data)) + (yyval.node)->setData((yyvsp[(2) - (3)].data)); + (yyval.node)->setLabel(QString((yyvsp[(3) - (3)].str))); + free((yyvsp[(3) - (3)].str)); + ;} + break; + + case 30: +#line 211 "../tikzit/src/data/tikzparser.y" + { + Node *s; + Node *t; + + s = (yyvsp[(3) - (7)].noderef).node; + + if ((yyvsp[(6) - (7)].noderef).node) { + t = (yyvsp[(6) - (7)].noderef).node; + } else { + t = s; + } + + Edge *edge = assembler->graph()->addEdge(s, t); + if ((yyvsp[(2) - (7)].data)) + edge->setData((yyvsp[(2) - (7)].data)); + if ((yyvsp[(5) - (7)].node)) + edge->setEdgeNode((yyvsp[(5) - (7)].node)); + if ((yyvsp[(3) - (7)].noderef).anchor) { + edge->setSourceAnchor(QString((yyvsp[(3) - (7)].noderef).anchor)); + free((yyvsp[(3) - (7)].noderef).anchor); + } + + if ((yyvsp[(6) - (7)].noderef).node) { + if ((yyvsp[(6) - (7)].noderef).anchor) { + edge->setTargetAnchor(QString((yyvsp[(6) - (7)].noderef).anchor)); + free((yyvsp[(6) - (7)].noderef).anchor); + } + } else { + edge->setTargetAnchor(edge->sourceAnchor()); + } + ;} + break; + + case 36: +#line 248 "../tikzit/src/data/tikzparser.y" + { + assembler->graph()->setBbox(QRectF(*(yyvsp[(3) - (6)].pt), *(yyvsp[(5) - (6)].pt))); + delete (yyvsp[(3) - (6)].pt); + delete (yyvsp[(5) - (6)].pt); + ;} + break; + + +/* Line 1267 of yacc.c. */ +#line 1712 "../tikzit/src/data/tikzparser.parser.cpp" + default: break; + } + YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); + + YYPOPSTACK (yylen); + yylen = 0; + YY_STACK_PRINT (yyss, yyssp); + + *++yyvsp = yyval; + *++yylsp = yyloc; + + /* Now `shift' the result of the reduction. Determine what state + that goes to, based on the state we popped back to and the rule + number reduced by. */ + + yyn = yyr1[yyn]; + + yystate = yypgoto[yyn - YYNTOKENS] + *yyssp; + if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp) + yystate = yytable[yystate]; + else + yystate = yydefgoto[yyn - YYNTOKENS]; + + goto yynewstate; + + +/*------------------------------------. +| yyerrlab -- here on detecting error | +`------------------------------------*/ +yyerrlab: + /* If not already recovering from an error, report this error. */ + if (!yyerrstatus) + { + ++yynerrs; +#if ! YYERROR_VERBOSE + yyerror (&yylloc, scanner, YY_("syntax error")); +#else + { + YYSIZE_T yysize = yysyntax_error (0, yystate, yychar); + if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM) + { + YYSIZE_T yyalloc = 2 * yysize; + if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM)) + yyalloc = YYSTACK_ALLOC_MAXIMUM; + if (yymsg != yymsgbuf) + YYSTACK_FREE (yymsg); + yymsg = (char *) YYSTACK_ALLOC (yyalloc); + if (yymsg) + yymsg_alloc = yyalloc; + else + { + yymsg = yymsgbuf; + yymsg_alloc = sizeof yymsgbuf; + } + } + + if (0 < yysize && yysize <= yymsg_alloc) + { + (void) yysyntax_error (yymsg, yystate, yychar); + yyerror (&yylloc, scanner, yymsg); + } + else + { + yyerror (&yylloc, scanner, YY_("syntax error")); + if (yysize != 0) + goto yyexhaustedlab; + } + } +#endif + } + + yyerror_range[0] = yylloc; + + if (yyerrstatus == 3) + { + /* If just tried and failed to reuse look-ahead token after an + error, discard it. */ + + if (yychar <= YYEOF) + { + /* Return failure if at end of input. */ + if (yychar == YYEOF) + YYABORT; + } + else + { + yydestruct ("Error: discarding", + yytoken, &yylval, &yylloc, scanner); + yychar = YYEMPTY; + } + } + + /* Else will try to reuse look-ahead token after shifting the error + token. */ + goto yyerrlab1; + + +/*---------------------------------------------------. +| yyerrorlab -- error raised explicitly by YYERROR. | +`---------------------------------------------------*/ +yyerrorlab: + + /* Pacify compilers like GCC when the user code never invokes + YYERROR and the label yyerrorlab therefore never appears in user + code. */ + if (/*CONSTCOND*/ 0) + goto yyerrorlab; + + yyerror_range[0] = yylsp[1-yylen]; + /* Do not reclaim the symbols of the rule which action triggered + this YYERROR. */ + YYPOPSTACK (yylen); + yylen = 0; + YY_STACK_PRINT (yyss, yyssp); + yystate = *yyssp; + goto yyerrlab1; + + +/*-------------------------------------------------------------. +| yyerrlab1 -- common code for both syntax error and YYERROR. | +`-------------------------------------------------------------*/ +yyerrlab1: + yyerrstatus = 3; /* Each real token shifted decrements this. */ + + for (;;) + { + yyn = yypact[yystate]; + if (yyn != YYPACT_NINF) + { + yyn += YYTERROR; + if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) + { + yyn = yytable[yyn]; + if (0 < yyn) + break; + } + } + + /* Pop the current state because it cannot handle the error token. */ + if (yyssp == yyss) + YYABORT; + + yyerror_range[0] = *yylsp; + yydestruct ("Error: popping", + yystos[yystate], yyvsp, yylsp, scanner); + YYPOPSTACK (1); + yystate = *yyssp; + YY_STACK_PRINT (yyss, yyssp); + } + + if (yyn == YYFINAL) + YYACCEPT; + + *++yyvsp = yylval; + + yyerror_range[1] = yylloc; + /* Using YYLLOC is tempting, but would change the location of + the look-ahead. YYLOC is available though. */ + YYLLOC_DEFAULT (yyloc, (yyerror_range - 1), 2); + *++yylsp = yyloc; + + /* Shift the error token. */ + YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); + + yystate = yyn; + goto yynewstate; + + +/*-------------------------------------. +| yyacceptlab -- YYACCEPT comes here. | +`-------------------------------------*/ +yyacceptlab: + yyresult = 0; + goto yyreturn; + +/*-----------------------------------. +| yyabortlab -- YYABORT comes here. | +`-----------------------------------*/ +yyabortlab: + yyresult = 1; + goto yyreturn; + +#ifndef yyoverflow +/*-------------------------------------------------. +| yyexhaustedlab -- memory exhaustion comes here. | +`-------------------------------------------------*/ +yyexhaustedlab: + yyerror (&yylloc, scanner, YY_("memory exhausted")); + yyresult = 2; + /* Fall through. */ +#endif + +yyreturn: + if (yychar != YYEOF && yychar != YYEMPTY) + yydestruct ("Cleanup: discarding lookahead", + yytoken, &yylval, &yylloc, scanner); + /* Do not reclaim the symbols of the rule which action triggered + this YYABORT or YYACCEPT. */ + YYPOPSTACK (yylen); + YY_STACK_PRINT (yyss, yyssp); + while (yyssp != yyss) + { + yydestruct ("Cleanup: popping", + yystos[*yyssp], yyvsp, yylsp, scanner); + YYPOPSTACK (1); + } +#ifndef yyoverflow + if (yyss != yyssa) + YYSTACK_FREE (yyss); +#endif +#if YYERROR_VERBOSE + if (yymsg != yymsgbuf) + YYSTACK_FREE (yymsg); +#endif + /* Make sure YYID is used. */ + return YYID (yyresult); +} + + + diff --git a/tikzit/src/data/tikzparser.parser.hpp b/tikzit/src/data/tikzparser.parser.hpp new file mode 100644 index 0000000..aaf0e10 --- /dev/null +++ b/tikzit/src/data/tikzparser.parser.hpp @@ -0,0 +1,139 @@ +/* A Bison parser, made by GNU Bison 2.3. */ + +/* Skeleton interface for Bison's Yacc-like parsers in C + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ + +/* As a special exception, you may create a larger work that contains + part or all of the Bison parser skeleton and distribute that work + under terms of your choice, so long as that work isn't itself a + parser generator using the skeleton or a modified version thereof + as a parser skeleton. Alternatively, if you modify or redistribute + the parser skeleton itself, you may (at your option) remove this + special exception, which will cause the skeleton and the resulting + Bison output files to be licensed under the GNU General Public + License without this special exception. + + This special exception was added by the Free Software Foundation in + version 2.2 of Bison. */ + +/* Tokens. */ +#ifndef YYTOKENTYPE +# define YYTOKENTYPE + /* Put the tokens into the symbol table, so that GDB and other debuggers + know about them. */ + enum yytokentype { + BEGIN_TIKZPICTURE_CMD = 258, + END_TIKZPICTURE_CMD = 259, + BEGIN_PGFONLAYER_CMD = 260, + END_PGFONLAYER_CMD = 261, + DRAW_CMD = 262, + NODE_CMD = 263, + PATH_CMD = 264, + RECTANGLE = 265, + NODE = 266, + AT = 267, + TO = 268, + SEMICOLON = 269, + COMMA = 270, + LEFTPARENTHESIS = 271, + RIGHTPARENTHESIS = 272, + LEFTBRACKET = 273, + RIGHTBRACKET = 274, + FULLSTOP = 275, + EQUALS = 276, + COORD = 277, + PROPSTRING = 278, + REFSTRING = 279, + DELIMITEDSTRING = 280, + UNKNOWN_BEGIN_CMD = 281, + UNKNOWN_END_CMD = 282, + UNKNOWN_CMD = 283, + UNKNOWN_STR = 284, + UNCLOSED_DELIM_STR = 285 + }; +#endif +/* Tokens. */ +#define BEGIN_TIKZPICTURE_CMD 258 +#define END_TIKZPICTURE_CMD 259 +#define BEGIN_PGFONLAYER_CMD 260 +#define END_PGFONLAYER_CMD 261 +#define DRAW_CMD 262 +#define NODE_CMD 263 +#define PATH_CMD 264 +#define RECTANGLE 265 +#define NODE 266 +#define AT 267 +#define TO 268 +#define SEMICOLON 269 +#define COMMA 270 +#define LEFTPARENTHESIS 271 +#define RIGHTPARENTHESIS 272 +#define LEFTBRACKET 273 +#define RIGHTBRACKET 274 +#define FULLSTOP 275 +#define EQUALS 276 +#define COORD 277 +#define PROPSTRING 278 +#define REFSTRING 279 +#define DELIMITEDSTRING 280 +#define UNKNOWN_BEGIN_CMD 281 +#define UNKNOWN_END_CMD 282 +#define UNKNOWN_CMD 283 +#define UNKNOWN_STR 284 +#define UNCLOSED_DELIM_STR 285 + + + + +#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED +typedef union YYSTYPE +#line 43 "../tikzit/src/data/tikzparser.y" +{ + char *str; + GraphElementProperty *prop; + GraphElementData *data; + Node *node; + QPointF *pt; + struct noderef noderef; +} +/* Line 1529 of yacc.c. */ +#line 118 "../tikzit/src/data/tikzparser.parser.hpp" + YYSTYPE; +# define yystype YYSTYPE /* obsolescent; will be withdrawn */ +# define YYSTYPE_IS_DECLARED 1 +# define YYSTYPE_IS_TRIVIAL 1 +#endif + + + +#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED +typedef struct YYLTYPE +{ + int first_line; + int first_column; + int last_line; + int last_column; +} YYLTYPE; +# define yyltype YYLTYPE /* obsolescent; will be withdrawn */ +# define YYLTYPE_IS_DECLARED 1 +# define YYLTYPE_IS_TRIVIAL 1 +#endif + + diff --git a/tikzit/src/gui/commands.cpp b/tikzit/src/gui/commands.cpp new file mode 100644 index 0000000..e69de29 diff --git a/tikzit/src/gui/commands.h b/tikzit/src/gui/commands.h new file mode 100644 index 0000000..73bfaa7 --- /dev/null +++ b/tikzit/src/gui/commands.h @@ -0,0 +1,4 @@ +#ifndef COMMANDS_H +#define COMMANDS_H + +#endif // COMMANDS_H diff --git a/tikzit/src/gui/edgeitem.cpp b/tikzit/src/gui/edgeitem.cpp index f45493d..cb275a5 100644 --- a/tikzit/src/gui/edgeitem.cpp +++ b/tikzit/src/gui/edgeitem.cpp @@ -14,8 +14,16 @@ EdgeItem::EdgeItem(Edge *edge) setPen(pen); _cp1Item = new QGraphicsEllipseItem(this); _cp1Item->setParentItem(this); + _cp1Item->setRect(GLOBAL_SCALEF * (-0.05), GLOBAL_SCALEF * (-0.05), + GLOBAL_SCALEF * 0.1, GLOBAL_SCALEF * 0.1); + _cp1Item->setVisible(false); + _cp2Item = new QGraphicsEllipseItem(this); _cp2Item->setParentItem(this); + _cp2Item->setRect(GLOBAL_SCALEF * (-0.05), GLOBAL_SCALEF * (-0.05), + GLOBAL_SCALEF * 0.1, GLOBAL_SCALEF * 0.1); + _cp2Item->setVisible(false); + syncPos(); } @@ -31,9 +39,8 @@ void EdgeItem::syncPos() toScreen(_edge->head())); setPath(path); - float r = GLOBAL_SCALEF * 0.05; - //painter->drawEllipse(toScreen(_edge->cp1()), r, r); - //painter->drawEllipse(toScreen(_edge->cp2()), r, r); + _cp1Item->setPos(toScreen(_edge->cp1())); + _cp2Item->setPos(toScreen(_edge->cp2())); } void EdgeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) @@ -43,8 +50,6 @@ void EdgeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, painter->setBrush(Qt::NoBrush); painter->drawPath(path()); - - if (isSelected()) { QColor draw; QColor draw1; @@ -72,18 +77,34 @@ void EdgeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, painter->drawLine(toScreen(_edge->tail()), toScreen(_edge->cp1())); painter->drawLine(toScreen(_edge->head()), toScreen(_edge->cp2())); - r = GLOBAL_SCALEF * 0.05; - painter->drawEllipse(toScreen(_edge->cp1()), r, r); - painter->drawEllipse(toScreen(_edge->cp2()), r, r); + //painter->drawEllipse(toScreen(_edge->cp1()), r, r); + //painter->drawEllipse(toScreen(_edge->cp2()), r, r); + + _cp1Item->setPen(QPen(draw)); + _cp1Item->setBrush(QBrush(fill)); + _cp1Item->setVisible(true); + _cp2Item->setPen(QPen(draw)); + _cp2Item->setBrush(QBrush(fill)); + _cp2Item->setVisible(true); + + r = GLOBAL_SCALEF * 0.05; painter->setPen(QPen(Qt::black)); painter->setBrush(QBrush(QColor(255,255,255,200))); painter->drawEllipse(toScreen(_edge->mid()), r, r); + } else { + _cp1Item->setVisible(false); + _cp2Item->setVisible(false); } } QRectF EdgeItem::boundingRect() const { float r = GLOBAL_SCALEF * (_edge->cpDist() + 0.2); - return QGraphicsPathItem::boundingRect().adjusted(-r,-r,r,r); + return shape().boundingRect().adjusted(-r,-r,r,r); +} + +Edge *EdgeItem::edge() const +{ + return _edge; } diff --git a/tikzit/src/gui/edgeitem.h b/tikzit/src/gui/edgeitem.h index 935138b..ed04772 100644 --- a/tikzit/src/gui/edgeitem.h +++ b/tikzit/src/gui/edgeitem.h @@ -18,6 +18,7 @@ public: void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); QRectF boundingRect() const; + Edge *edge() const; private: Edge *_edge; diff --git a/tikzit/src/gui/mainmenu.ui b/tikzit/src/gui/mainmenu.ui new file mode 100644 index 0000000..d3eed0a --- /dev/null +++ b/tikzit/src/gui/mainmenu.ui @@ -0,0 +1,146 @@ + + + MainMenu + + + + 0 + 0 + 476 + 22 + + + + + File + + + + + + + + + + + Edit + + + + + + + + + + + + + + + Tikz + + + + + + View + + + + + + + + + + + New... + + + + + Open... + + + + + Close + + + + + Save + + + + + Save As... + + + + + Undo + + + + + Redo + + + + + Cut + + + + + Copy + + + + + Paste + + + + + Delete + + + + + Select All + + + + + Deselect All + + + + + Parse + + + Ctrl+T + + + + + Zoom In + + + Ctrl+= + + + + + Zoom Out + + + Ctrl+- + + + + diff --git a/tikzit/src/gui/mainwindow.cpp b/tikzit/src/gui/mainwindow.cpp index 7d7ab04..980a312 100644 --- a/tikzit/src/gui/mainwindow.cpp +++ b/tikzit/src/gui/mainwindow.cpp @@ -21,8 +21,8 @@ MainWindow::MainWindow(QWidget *parent) : _numWindows++; ui->setupUi(this); setAttribute(Qt::WA_DeleteOnClose, true); - _graph = new Graph(this); - _tikzScene = new TikzScene(_graph, this); + _tikzDocument = new TikzDocument(this); + _tikzScene = new TikzScene(_tikzDocument->graph(), this); ui->tikzView->setScene(_tikzScene); _fileName = ""; _pristine = true; @@ -41,39 +41,17 @@ MainWindow::~MainWindow() void MainWindow::open(QString fileName) { - _fileName = fileName; _pristine = false; - QFile file(fileName); - QFileInfo fi(file); - QSettings settings("tikzit", "tikzit"); - settings.setValue("previous-file-path", fi.absolutePath()); + _tikzDocument->open(fileName); + ui->tikzSource->setText(_tikzDocument->tikz()); - setWindowTitle("TiKZiT - " + fi.fileName()); - if (!file.open(QIODevice::ReadOnly)) { - QMessageBox::critical(this, tr("Error"), - tr("Could not open file")); - return; - } - - QTextStream in(&file); - QString tikz = in.readAll(); - file.close(); - - ui->tikzSource->setText(tikz); - - Graph *newGraph = new Graph(this); - TikzGraphAssembler ass(newGraph); - if (ass.parse(tikz)) { + if (_tikzDocument->parseSuccess()) { statusBar()->showMessage("TiKZ parsed successfully", 2000); - delete _graph; - _graph = newGraph; - foreach (Node *n, _graph->nodes()) n->attachStyle(); - foreach (Edge *e, _graph->edges()) e->updateControls(); - _tikzScene->setGraph(_graph); + setWindowTitle("TiKZiT - " + _tikzDocument->shortName()); + _tikzScene->setGraph(_tikzDocument->graph()); } else { statusBar()->showMessage("Cannot read TiKZ source"); - delete newGraph; } } diff --git a/tikzit/src/gui/mainwindow.h b/tikzit/src/gui/mainwindow.h index 2e52cd5..66df23f 100644 --- a/tikzit/src/gui/mainwindow.h +++ b/tikzit/src/gui/mainwindow.h @@ -4,6 +4,7 @@ #include "tikzscene.h" #include "tikzview.h" #include "graph.h" +#include "tikzdocument.h" #include #include @@ -31,8 +32,8 @@ protected: void changeEvent(QEvent *event); private: TikzScene *_tikzScene; + TikzDocument *_tikzDocument; Ui::MainWindow *ui; - Graph *_graph; QString _fileName; bool _pristine; int _windowId; diff --git a/tikzit/src/gui/nodeitem.cpp b/tikzit/src/gui/nodeitem.cpp index d91bfd6..6e21ea4 100644 --- a/tikzit/src/gui/nodeitem.cpp +++ b/tikzit/src/gui/nodeitem.cpp @@ -1,7 +1,10 @@ #include "tikzit.h" #include "nodeitem.h" +#include "tikzscene.h" +#include #include +#include #include #include #include @@ -13,6 +16,7 @@ NodeItem::NodeItem(Node *node) _node = node; setFlag(QGraphicsItem::ItemIsSelectable); setFlag(QGraphicsItem::ItemIsMovable); + setFlag(QGraphicsItem::ItemSendsGeometryChanges); syncPos(); } @@ -91,3 +95,17 @@ QRectF NodeItem::boundingRect() const { return shape().boundingRect().adjusted(-4,-4,4,4); } + +QVariant NodeItem::itemChange(GraphicsItemChange change, const QVariant &value) +{ + if (change == ItemPositionChange) { + QPointF newPos = value.toPointF(); + int gridSize = GLOBAL_SCALE / 8; + QPointF gridPos(round(newPos.x()/gridSize)*gridSize, round(newPos.y()/gridSize)*gridSize); + _node->setPoint(fromScreen(gridPos)); + + return gridPos; + } else { + return QGraphicsItem::itemChange(change, value); + } +} diff --git a/tikzit/src/gui/nodeitem.h b/tikzit/src/gui/nodeitem.h index 867d8a3..107871e 100644 --- a/tikzit/src/gui/nodeitem.h +++ b/tikzit/src/gui/nodeitem.h @@ -14,6 +14,7 @@ public: NodeItem(Node *node); void syncPos(); void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); + QVariant itemChange(GraphicsItemChange change, const QVariant &value); QPainterPath shape() const; QRectF boundingRect() const; private: diff --git a/tikzit/src/gui/propertypalette.cpp b/tikzit/src/gui/propertypalette.cpp index ea906a7..5fc763f 100644 --- a/tikzit/src/gui/propertypalette.cpp +++ b/tikzit/src/gui/propertypalette.cpp @@ -12,7 +12,6 @@ PropertyPalette::PropertyPalette(QWidget *parent) : ui(new Ui::PropertyPalette) { setWindowFlags(Qt::Window - | Qt::WindowStaysOnTopHint | Qt::CustomizeWindowHint | Qt::WindowTitleHint); //setFocusPolicy(Qt::NoFocus); diff --git a/tikzit/src/gui/tikzscene.cpp b/tikzit/src/gui/tikzscene.cpp index cf7cde5..058835d 100644 --- a/tikzit/src/gui/tikzscene.cpp +++ b/tikzit/src/gui/tikzscene.cpp @@ -59,6 +59,12 @@ void TikzScene::mousePressEvent(QGraphicsSceneMouseEvent *event) void TikzScene::mouseMoveEvent(QGraphicsSceneMouseEvent *event) { + //foreach (Edge *e, _graph->edges()) { e->updateControls(); } + foreach (EdgeItem *ei, edgeItems) { + ei->edge()->updateControls(); + ei->syncPos(); + } + QGraphicsScene::mouseMoveEvent(event); } diff --git a/tikzit/target_wrapper.sh b/tikzit/target_wrapper.sh new file mode 100755 index 0000000..1793274 --- /dev/null +++ b/tikzit/target_wrapper.sh @@ -0,0 +1,6 @@ +#!/bin/sh +DYLD_FRAMEWORK_PATH=/usr/local/Cellar/qt5/5.7.1_1/lib${DYLD_FRAMEWORK_PATH:+:$DYLD_FRAMEWORK_PATH} +export DYLD_FRAMEWORK_PATH +QT_PLUGIN_PATH=/usr/local/Cellar/qt5/5.7.1_1/plugins${QT_PLUGIN_PATH:+:$QT_PLUGIN_PATH} +export QT_PLUGIN_PATH +exec "$@" diff --git a/tikzit/tikzit.pro b/tikzit/tikzit.pro index cf0756f..1d2a866 100644 --- a/tikzit/tikzit.pro +++ b/tikzit/tikzit.pro @@ -43,7 +43,9 @@ SOURCES += src/gui/mainwindow.cpp \ src/gui/nodeitem.cpp \ src/gui/edgeitem.cpp \ src/tikzit.cpp \ - src/data/nodestyle.cpp + src/data/nodestyle.cpp \ + src/gui/commands.cpp \ + src/data/tikzdocument.cpp HEADERS += src/gui/mainwindow.h \ src/gui/toolpalette.h \ @@ -60,7 +62,9 @@ HEADERS += src/gui/mainwindow.h \ src/gui/nodeitem.h \ src/tikzit.h \ src/gui/edgeitem.h \ - src/data/nodestyle.h + src/data/nodestyle.h \ + src/gui/commands.h \ + src/data/tikzdocument.h FORMS += src/gui/mainwindow.ui \ src/gui/propertypalette.ui \ diff --git a/tikzit/tikzit.pro.user b/tikzit/tikzit.pro.user index aca5fe8..dd7fece 100644 --- a/tikzit/tikzit.pro.user +++ b/tikzit/tikzit.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -152,7 +152,16 @@ - 2 + + true + tikzit.app + macdeployqt + %{buildDir} + Custom Process Step + + ProjectExplorer.ProcessStep + + 3 Build ProjectExplorer.BuildSteps.Build diff --git a/tikzit/tikzlexer.h b/tikzit/tikzlexer.h new file mode 100644 index 0000000..6598601 --- /dev/null +++ b/tikzit/tikzlexer.h @@ -0,0 +1,345 @@ +#ifndef yyHEADER_H +#define yyHEADER_H 1 +#define yyIN_HEADER 1 + +#line 6 "tikzlexer.h" + +#line 8 "tikzlexer.h" + +#define YY_INT_ALIGNED short int + +/* A lexical scanner generated by flex */ + +#define FLEX_SCANNER +#define YY_FLEX_MAJOR_VERSION 2 +#define YY_FLEX_MINOR_VERSION 5 +#define YY_FLEX_SUBMINOR_VERSION 35 +#if YY_FLEX_SUBMINOR_VERSION > 0 +#define FLEX_BETA +#endif + +/* First, we deal with platform-specific or compiler-specific issues. */ + +/* begin standard C headers. */ +#include +#include +#include +#include + +/* end standard C headers. */ + +/* flex integer type definitions */ + +#ifndef FLEXINT_H +#define FLEXINT_H + +/* C99 systems have . Non-C99 systems may or may not. */ + +#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L + +/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, + * if you want the limit (max/min) macros for int types. + */ +#ifndef __STDC_LIMIT_MACROS +#define __STDC_LIMIT_MACROS 1 +#endif + +#include +typedef int8_t flex_int8_t; +typedef uint8_t flex_uint8_t; +typedef int16_t flex_int16_t; +typedef uint16_t flex_uint16_t; +typedef int32_t flex_int32_t; +typedef uint32_t flex_uint32_t; +typedef uint64_t flex_uint64_t; +#else +typedef signed char flex_int8_t; +typedef short int flex_int16_t; +typedef int flex_int32_t; +typedef unsigned char flex_uint8_t; +typedef unsigned short int flex_uint16_t; +typedef unsigned int flex_uint32_t; +#endif /* ! C99 */ + +/* Limits of integral types. */ +#ifndef INT8_MIN +#define INT8_MIN (-128) +#endif +#ifndef INT16_MIN +#define INT16_MIN (-32767-1) +#endif +#ifndef INT32_MIN +#define INT32_MIN (-2147483647-1) +#endif +#ifndef INT8_MAX +#define INT8_MAX (127) +#endif +#ifndef INT16_MAX +#define INT16_MAX (32767) +#endif +#ifndef INT32_MAX +#define INT32_MAX (2147483647) +#endif +#ifndef UINT8_MAX +#define UINT8_MAX (255U) +#endif +#ifndef UINT16_MAX +#define UINT16_MAX (65535U) +#endif +#ifndef UINT32_MAX +#define UINT32_MAX (4294967295U) +#endif + +#endif /* ! FLEXINT_H */ + +#ifdef __cplusplus + +/* The "const" storage-class-modifier is valid. */ +#define YY_USE_CONST + +#else /* ! __cplusplus */ + +/* C99 requires __STDC__ to be defined as 1. */ +#if defined (__STDC__) + +#define YY_USE_CONST + +#endif /* defined (__STDC__) */ +#endif /* ! __cplusplus */ + +#ifdef YY_USE_CONST +#define yyconst const +#else +#define yyconst +#endif + +/* An opaque pointer. */ +#ifndef YY_TYPEDEF_YY_SCANNER_T +#define YY_TYPEDEF_YY_SCANNER_T +typedef void* yyscan_t; +#endif + +/* For convenience, these vars (plus the bison vars far below) + are macros in the reentrant scanner. */ +#define yyin yyg->yyin_r +#define yyout yyg->yyout_r +#define yyextra yyg->yyextra_r +#define yyleng yyg->yyleng_r +#define yytext yyg->yytext_r +#define yylineno (YY_CURRENT_BUFFER_LVALUE->yy_bs_lineno) +#define yycolumn (YY_CURRENT_BUFFER_LVALUE->yy_bs_column) +#define yy_flex_debug yyg->yy_flex_debug_r + +/* Size of default input buffer. */ +#ifndef YY_BUF_SIZE +#define YY_BUF_SIZE 16384 +#endif + +#ifndef YY_TYPEDEF_YY_BUFFER_STATE +#define YY_TYPEDEF_YY_BUFFER_STATE +typedef struct yy_buffer_state *YY_BUFFER_STATE; +#endif + +#ifndef YY_TYPEDEF_YY_SIZE_T +#define YY_TYPEDEF_YY_SIZE_T +typedef size_t yy_size_t; +#endif + +#ifndef YY_STRUCT_YY_BUFFER_STATE +#define YY_STRUCT_YY_BUFFER_STATE +struct yy_buffer_state + { + FILE *yy_input_file; + + char *yy_ch_buf; /* input buffer */ + char *yy_buf_pos; /* current position in input buffer */ + + /* Size of input buffer in bytes, not including room for EOB + * characters. + */ + yy_size_t yy_buf_size; + + /* Number of characters read into yy_ch_buf, not including EOB + * characters. + */ + yy_size_t yy_n_chars; + + /* Whether we "own" the buffer - i.e., we know we created it, + * and can realloc() it to grow it, and should free() it to + * delete it. + */ + int yy_is_our_buffer; + + /* Whether this is an "interactive" input source; if so, and + * if we're using stdio for input, then we want to use getc() + * instead of fread(), to make sure we stop fetching input after + * each newline. + */ + int yy_is_interactive; + + /* Whether we're considered to be at the beginning of a line. + * If so, '^' rules will be active on the next match, otherwise + * not. + */ + int yy_at_bol; + + int yy_bs_lineno; /**< The line count. */ + int yy_bs_column; /**< The column count. */ + + /* Whether to try to fill the input buffer when we reach the + * end of it. + */ + int yy_fill_buffer; + + int yy_buffer_status; + + }; +#endif /* !YY_STRUCT_YY_BUFFER_STATE */ + +void yyrestart (FILE *input_file ,yyscan_t yyscanner ); +void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); +YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ,yyscan_t yyscanner ); +void yy_delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); +void yy_flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); +void yypush_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); +void yypop_buffer_state (yyscan_t yyscanner ); + +YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ,yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len ,yyscan_t yyscanner ); + +void *yyalloc (yy_size_t ,yyscan_t yyscanner ); +void *yyrealloc (void *,yy_size_t ,yyscan_t yyscanner ); +void yyfree (void * ,yyscan_t yyscanner ); + +#define yywrap(n) 1 +#define YY_SKIP_YYWRAP + +#define yytext_ptr yytext_r + +#ifdef YY_HEADER_EXPORT_START_CONDITIONS +#define INITIAL 0 +#define props 1 +#define xcoord 2 +#define ycoord 3 +#define noderef 4 + +#endif + +#ifndef YY_NO_UNISTD_H +/* Special case for "unistd.h", since it is non-ANSI. We include it way + * down here because we want the user's section 1 to have been scanned first. + * The user has a chance to override it with an option. + */ +#include +#endif + +#define YY_EXTRA_TYPE TikzGraphAssembler * + +int yylex_init (yyscan_t* scanner); + +int yylex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner); + +/* Accessor methods to globals. + These are made visible to non-reentrant scanners for convenience. */ + +int yylex_destroy (yyscan_t yyscanner ); + +int yyget_debug (yyscan_t yyscanner ); + +void yyset_debug (int debug_flag ,yyscan_t yyscanner ); + +YY_EXTRA_TYPE yyget_extra (yyscan_t yyscanner ); + +void yyset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner ); + +FILE *yyget_in (yyscan_t yyscanner ); + +void yyset_in (FILE * in_str ,yyscan_t yyscanner ); + +FILE *yyget_out (yyscan_t yyscanner ); + +void yyset_out (FILE * out_str ,yyscan_t yyscanner ); + +yy_size_t yyget_leng (yyscan_t yyscanner ); + +char *yyget_text (yyscan_t yyscanner ); + +int yyget_lineno (yyscan_t yyscanner ); + +void yyset_lineno (int line_number ,yyscan_t yyscanner ); + +YYSTYPE * yyget_lval (yyscan_t yyscanner ); + +void yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner ); + + YYLTYPE *yyget_lloc (yyscan_t yyscanner ); + + void yyset_lloc (YYLTYPE * yylloc_param ,yyscan_t yyscanner ); + +/* Macros after this point can all be overridden by user definitions in + * section 1. + */ + +#ifndef YY_SKIP_YYWRAP +#ifdef __cplusplus +extern "C" int yywrap (yyscan_t yyscanner ); +#else +extern int yywrap (yyscan_t yyscanner ); +#endif +#endif + +#ifndef yytext_ptr +static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner); +#endif + +#ifdef YY_NEED_STRLEN +static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner); +#endif + +#ifndef YY_NO_INPUT + +#endif + +/* Amount of stuff to slurp up with each read. */ +#ifndef YY_READ_BUF_SIZE +#define YY_READ_BUF_SIZE 8192 +#endif + +/* Number of entries by which start-condition stack grows. */ +#ifndef YY_START_STACK_INCR +#define YY_START_STACK_INCR 25 +#endif + +/* Default declaration of generated scanner - a define so the user can + * easily add parameters. + */ +#ifndef YY_DECL +#define YY_DECL_IS_OURS 1 + +extern int yylex \ + (YYSTYPE * yylval_param,YYLTYPE * yylloc_param ,yyscan_t yyscanner); + +#define YY_DECL int yylex \ + (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner) +#endif /* !YY_DECL */ + +/* yy_get_previous_state - get the state just before the EOB char was reached */ + +#undef YY_NEW_FILE +#undef YY_FLUSH_BUFFER +#undef yy_set_bol +#undef yy_new_buffer +#undef yy_set_interactive +#undef YY_DO_BEFORE_ACTION + +#ifdef YY_DECL_IS_OURS +#undef YY_DECL_IS_OURS +#undef YY_DECL +#endif + +#line 174 "src/data/tikzlexer.l" + +#line 344 "tikzlexer.h" +#undef yyIN_HEADER +#endif /* yyHEADER_H */ -- cgit v1.2.3 From 2bf85f71dc07b2c4785b9408e3c426ccaab55b74 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Mon, 18 Dec 2017 15:29:33 +0000 Subject: introduced some comments for source navigation --- tikzit/src/data/graph.h | 4 +++ tikzit/src/data/tikzdocument.h | 4 +++ tikzit/src/gui/edgeitem.h | 4 +++ tikzit/src/gui/mainwindow.h | 4 +++ tikzit/src/gui/nodeitem.cpp | 25 ++++++++-------- tikzit/src/gui/nodeitem.h | 5 ++++ tikzit/src/gui/propertypalette.h | 4 +++ tikzit/src/gui/tikzscene.cpp | 61 ++++++++++++++++++++++++++++++++++++---- tikzit/src/gui/tikzscene.h | 3 +- tikzit/src/gui/tikzview.h | 5 ++++ tikzit/src/gui/toolpalette.cpp | 9 ++++++ tikzit/src/gui/toolpalette.h | 12 ++++++++ tikzit/src/gui/undocommands.cpp | 16 +++++++++++ tikzit/src/gui/undocommands.h | 22 +++++++++++++++ tikzit/src/tikzit.cpp | 3 ++ tikzit/src/tikzit.h | 3 ++ tikzit/tikzit.pro | 6 ++-- www/htdocs/index.html | 12 ++++---- www/htdocs/linux/index.html | 2 +- 19 files changed, 177 insertions(+), 27 deletions(-) create mode 100644 tikzit/src/gui/undocommands.cpp create mode 100644 tikzit/src/gui/undocommands.h diff --git a/tikzit/src/data/graph.h b/tikzit/src/data/graph.h index 37bbff9..952b8b4 100644 --- a/tikzit/src/data/graph.h +++ b/tikzit/src/data/graph.h @@ -1,3 +1,7 @@ +/** + * A tikz graph. This serves as the model in the MVC (Graph, TikzView, TikzScene). + */ + #ifndef GRAPH_H #define GRAPH_H diff --git a/tikzit/src/data/tikzdocument.h b/tikzit/src/data/tikzdocument.h index 0e97b13..7d81742 100644 --- a/tikzit/src/data/tikzdocument.h +++ b/tikzit/src/data/tikzdocument.h @@ -1,3 +1,7 @@ +/** + * Contains a tikz Graph, source code, file info, and undo stack. + */ + #ifndef TIKZDOCUMENT_H #define TIKZDOCUMENT_H diff --git a/tikzit/src/gui/edgeitem.h b/tikzit/src/gui/edgeitem.h index ed04772..5bdf3be 100644 --- a/tikzit/src/gui/edgeitem.h +++ b/tikzit/src/gui/edgeitem.h @@ -1,3 +1,7 @@ +/** + * A QGraphicsItem that handles drawing a single edge. + */ + #ifndef EDGEITEM_H #define EDGEITEM_H diff --git a/tikzit/src/gui/mainwindow.h b/tikzit/src/gui/mainwindow.h index 66df23f..4af3357 100644 --- a/tikzit/src/gui/mainwindow.h +++ b/tikzit/src/gui/mainwindow.h @@ -1,3 +1,7 @@ +/** + * A top-level window, which contains a single TikzDocument. + */ + #ifndef MAINWINDOW_H #define MAINWINDOW_H diff --git a/tikzit/src/gui/nodeitem.cpp b/tikzit/src/gui/nodeitem.cpp index 6e21ea4..bf4830b 100644 --- a/tikzit/src/gui/nodeitem.cpp +++ b/tikzit/src/gui/nodeitem.cpp @@ -25,6 +25,16 @@ void NodeItem::syncPos() setPos(toScreen(_node->point())); } +QRectF NodeItem::labelRect() const { + QString label = _node->label(); + //QFont f("Courier", 9); + QFontMetrics fm(Tikzit::LABEL_FONT); + + QRectF rect = fm.boundingRect(label); + //rect.adjust(-2,-2,2,2); + rect.moveCenter(QPointF(0,0)); + return rect; +} void NodeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) { @@ -50,15 +60,7 @@ void NodeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, } if (_node->label() != "") { - QString label = _node->label(); - QFont f("Monaco", 9); - QFontMetrics fm(f); - int w = fm.width(label) + 4; - int h = fm.height() + 2; - - QRectF rect = fm.boundingRect(label); - rect.adjust(-2,-2,2,2); - rect.moveCenter(QPointF(0,0)); + QRectF rect = labelRect(); QPen pen(QColor(200,0,0,120)); QVector d; d << 2.0 << 2.0; @@ -68,7 +70,7 @@ void NodeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, painter->drawRect(rect); painter->setPen(QPen(Qt::black)); - painter->setFont(f); + painter->setFont(Tikzit::LABEL_FONT); painter->drawText(rect, Qt::AlignCenter, _node->label()); } @@ -93,7 +95,8 @@ QPainterPath NodeItem::shape() const QRectF NodeItem::boundingRect() const { - return shape().boundingRect().adjusted(-4,-4,4,4); + QRectF r = labelRect(); + return r.united(shape().boundingRect()).adjusted(-4,-4,4,4); } QVariant NodeItem::itemChange(GraphicsItemChange change, const QVariant &value) diff --git a/tikzit/src/gui/nodeitem.h b/tikzit/src/gui/nodeitem.h index 107871e..2228874 100644 --- a/tikzit/src/gui/nodeitem.h +++ b/tikzit/src/gui/nodeitem.h @@ -1,3 +1,7 @@ +/** + * A QGraphicsItem that handles drawing a single node. + */ + #ifndef NODEITEM_H #define NODEITEM_H @@ -19,6 +23,7 @@ public: QRectF boundingRect() const; private: Node *_node; + QRectF labelRect() const; }; #endif // NODEITEM_H diff --git a/tikzit/src/gui/propertypalette.h b/tikzit/src/gui/propertypalette.h index f2f1955..7910d70 100644 --- a/tikzit/src/gui/propertypalette.h +++ b/tikzit/src/gui/propertypalette.h @@ -1,3 +1,7 @@ +/** + * Enables the user to edit properties of the graph, as well as the selected node/edge. + */ + #ifndef PROPERTYPALETTE_H #define PROPERTYPALETTE_H diff --git a/tikzit/src/gui/tikzscene.cpp b/tikzit/src/gui/tikzscene.cpp index 058835d..cd88f4e 100644 --- a/tikzit/src/gui/tikzscene.cpp +++ b/tikzit/src/gui/tikzscene.cpp @@ -1,3 +1,8 @@ +/** + * Manage the scene, which contains a single Graph, and respond to user input. This serves as + * the controller for the MVC (Graph, TikzView, TikzScene). + */ + #include "tikzit.h" #include "tikzscene.h" @@ -9,7 +14,9 @@ TikzScene::TikzScene(Graph *graph, QObject *parent) : QGraphicsScene(parent), _graph(graph) { +} +TikzScene::~TikzScene() { } Graph *TikzScene::graph() const @@ -52,23 +59,65 @@ void TikzScene::graphReplaced() void TikzScene::mousePressEvent(QGraphicsSceneMouseEvent *event) { - // TODO: check if we grabbed a control point + QPointF mousePos(event->buttonDownScenePos(Qt::LeftButton).x(), + event->buttonDownScenePos(Qt::LeftButton).y()); - QGraphicsScene::mousePressEvent(event); + + switch (tikzit->toolPalette()->currentTool()) { + case ToolPalette::SELECT: + // TODO: check if we grabbed a control point + QGraphicsScene::mousePressEvent(event); + if (!selectedItems().empty() && !items(mousePos).empty()) { + _oldNodePositions = new QHash(); + for (QGraphicsItem *gi : selectedItems()) { + if (NodeItem *ni = dynamic_cast(gi)) { + _oldNodePositions-> + } + } + qDebug() << "I am dragging"; + } + break; + case ToolPalette::VERTEX: + break; + case ToolPalette::EDGE: + break; + case ToolPalette::CROP: + break; + } } void TikzScene::mouseMoveEvent(QGraphicsSceneMouseEvent *event) { - //foreach (Edge *e, _graph->edges()) { e->updateControls(); } + switch (tikzit->toolPalette()->currentTool()) { + case ToolPalette::SELECT: + QGraphicsScene::mouseMoveEvent(event); + break; + case ToolPalette::VERTEX: + break; + case ToolPalette::EDGE: + break; + case ToolPalette::CROP: + break; + } + + // TODO: only sync edges that change foreach (EdgeItem *ei, edgeItems) { ei->edge()->updateControls(); ei->syncPos(); } - - QGraphicsScene::mouseMoveEvent(event); } void TikzScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { - QGraphicsScene::mouseReleaseEvent(event); + switch (tikzit->toolPalette()->currentTool()) { + case ToolPalette::SELECT: + QGraphicsScene::mouseReleaseEvent(event); + break; + case ToolPalette::VERTEX: + break; + case ToolPalette::EDGE: + break; + case ToolPalette::CROP: + break; + } } diff --git a/tikzit/src/gui/tikzscene.h b/tikzit/src/gui/tikzscene.h index 2c77389..e0e75c1 100644 --- a/tikzit/src/gui/tikzscene.h +++ b/tikzit/src/gui/tikzscene.h @@ -18,6 +18,7 @@ class TikzScene : public QGraphicsScene Q_OBJECT public: TikzScene(Graph *graph, QObject *parent); + ~TikzScene(); Graph *graph() const; void setGraph(Graph *graph); public slots: @@ -30,7 +31,7 @@ private: Graph *_graph; QVector nodeItems; QVector edgeItems; - + QHash *_oldNodePositions; }; #endif // TIKZSCENE_H diff --git a/tikzit/src/gui/tikzview.h b/tikzit/src/gui/tikzview.h index b16e0df..6d09b21 100644 --- a/tikzit/src/gui/tikzview.h +++ b/tikzit/src/gui/tikzview.h @@ -1,3 +1,8 @@ +/** + * Display a Graph, and manage any user input that purely changes the view (e.g. Zoom). This + * serves as the view in the MVC (Graph, TikzView, TikzScene). + */ + #ifndef TIKZVIEW_H #define TIKZVIEW_H diff --git a/tikzit/src/gui/toolpalette.cpp b/tikzit/src/gui/toolpalette.cpp index 3ee2106..3c08bce 100644 --- a/tikzit/src/gui/toolpalette.cpp +++ b/tikzit/src/gui/toolpalette.cpp @@ -39,3 +39,12 @@ ToolPalette::ToolPalette(QWidget *parent) : addAction(crop); } +ToolPalette::Tool ToolPalette::currentTool() const +{ + QAction *a = tools->checkedAction(); + if (a == vertex) return VERTEX; + else if (a == edge) return EDGE; + else if (a == crop) return CROP; + else return SELECT; +} + diff --git a/tikzit/src/gui/toolpalette.h b/tikzit/src/gui/toolpalette.h index 05b2e12..ba6aed5 100644 --- a/tikzit/src/gui/toolpalette.h +++ b/tikzit/src/gui/toolpalette.h @@ -1,3 +1,7 @@ +/** + * A small window that lets the user select the current editing tool. + */ + #ifndef TOOLPALETTE_H #define TOOLPALETTE_H @@ -11,6 +15,14 @@ class ToolPalette : public QToolBar Q_OBJECT public: ToolPalette(QWidget *parent = 0); + enum Tool { + SELECT, + VERTEX, + EDGE, + CROP + }; + + Tool currentTool() const; private: QActionGroup *tools; QAction *select; diff --git a/tikzit/src/gui/undocommands.cpp b/tikzit/src/gui/undocommands.cpp new file mode 100644 index 0000000..38f7569 --- /dev/null +++ b/tikzit/src/gui/undocommands.cpp @@ -0,0 +1,16 @@ +#include "undocommands.h" + +MoveCommand::MoveCommand(TikzScene *scene, QUndoCommand *parent) : QUndoCommand(parent) +{ + _scene = scene; +} + +void MoveCommand::undo() +{ + +} + +void MoveCommand::redo() +{ + +} diff --git a/tikzit/src/gui/undocommands.h b/tikzit/src/gui/undocommands.h new file mode 100644 index 0000000..bbdf6c3 --- /dev/null +++ b/tikzit/src/gui/undocommands.h @@ -0,0 +1,22 @@ +/** + * These classes store the data required to undo/redo a single UI action. + */ + +#ifndef UNDOCOMMANDS_H +#define UNDOCOMMANDS_H + +#include "tikzscene.h" + +#include + +class MoveCommand : public QUndoCommand +{ +public: + explicit MoveCommand(TikzScene *scene, QUndoCommand *parent = 0); + void undo() override; + void redo() override; +private: + TikzScene *_scene; +}; + +#endif // UNDOCOMMANDS_H diff --git a/tikzit/src/tikzit.cpp b/tikzit/src/tikzit.cpp index 9abf33e..0c9fdb1 100644 --- a/tikzit/src/tikzit.cpp +++ b/tikzit/src/tikzit.cpp @@ -6,6 +6,9 @@ // application-level instance of Tikzit Tikzit *tikzit; +// font to use for node labels +QFont Tikzit::LABEL_FONT("Courrier", 9); + Tikzit::Tikzit() { _activeWindow = 0; diff --git a/tikzit/src/tikzit.h b/tikzit/src/tikzit.h index 74a7ea6..252bf35 100644 --- a/tikzit/src/tikzit.h +++ b/tikzit/src/tikzit.h @@ -11,6 +11,7 @@ #include #include #include +#include // Number of pixels between (0,0) and (1,0) at 100% zoom level. This should be // divisible by 8 to avoid rounding errors with e.g. grid-snapping. @@ -50,6 +51,8 @@ public: void removeWindow(MainWindow *w); NodeStyle nodeStyle(QString name); + static QFont LABEL_FONT; + private: void createMenu(); void loadStyles(); diff --git a/tikzit/tikzit.pro b/tikzit/tikzit.pro index 1d2a866..aa18381 100644 --- a/tikzit/tikzit.pro +++ b/tikzit/tikzit.pro @@ -45,7 +45,8 @@ SOURCES += src/gui/mainwindow.cpp \ src/tikzit.cpp \ src/data/nodestyle.cpp \ src/gui/commands.cpp \ - src/data/tikzdocument.cpp + src/data/tikzdocument.cpp \ + src/gui/undocommands.cpp HEADERS += src/gui/mainwindow.h \ src/gui/toolpalette.h \ @@ -64,7 +65,8 @@ HEADERS += src/gui/mainwindow.h \ src/gui/edgeitem.h \ src/data/nodestyle.h \ src/gui/commands.h \ - src/data/tikzdocument.h + src/data/tikzdocument.h \ + src/gui/undocommands.h FORMS += src/gui/mainwindow.ui \ src/gui/propertypalette.ui \ diff --git a/www/htdocs/index.html b/www/htdocs/index.html index b169747..6abe9b1 100644 --- a/www/htdocs/index.html +++ b/www/htdocs/index.html @@ -9,7 +9,7 @@ TikZiT
- + Apple @@ -17,23 +17,23 @@ Linux - + Windows - + Source

- TikZiT is a graphical tool for rapidly creating an editing node-and-edge style graphs. It was originally created to aid in the typesetting of "dot" diagrams of interacting quantum observables (see arXiv:0906.4725), but can be used as a general graph editing program. Click one of the above icons to download. To comment or contribute, email me at gmail.com preceded by aleks0 and an at-sign. + TikZiT is a graphical tool for rapidly creating an editing node-and-edge style graphs. It was used, for example, to make all of the 2500+ diagrams in this book. Click one of the above icons to download. To comment or contribute, email me at gmail.com preceded by aleks0 and an at-sign.

TikZiT Manual | - Project Page | - Trak Wiki + Project Page | + Issue Tracker

diff --git a/www/htdocs/linux/index.html b/www/htdocs/linux/index.html index f2f5f95..040e3d8 100644 --- a/www/htdocs/linux/index.html +++ b/www/htdocs/linux/index.html @@ -20,7 +20,7 @@
Arch Linux
Use the AUR package.
Other
-
Build from the source.
+
Build from the source.
-- cgit v1.2.3 From 708011ca445e6096d693bde77b63b43b9de78e54 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Mon, 18 Dec 2017 17:59:56 +0000 Subject: adding node position tracking for undo --- tikzit/src/gui/nodeitem.cpp | 14 +++++++++-- tikzit/src/gui/nodeitem.h | 5 +++- tikzit/src/gui/tikzscene.cpp | 52 +++++++++++++++++++++++++++++------------ tikzit/src/gui/tikzscene.h | 15 +++++++++--- tikzit/src/gui/undocommands.cpp | 21 +++++++++++++---- tikzit/src/gui/undocommands.h | 7 +++++- 6 files changed, 88 insertions(+), 26 deletions(-) diff --git a/tikzit/src/gui/nodeitem.cpp b/tikzit/src/gui/nodeitem.cpp index bf4830b..40b4de9 100644 --- a/tikzit/src/gui/nodeitem.cpp +++ b/tikzit/src/gui/nodeitem.cpp @@ -17,14 +17,19 @@ NodeItem::NodeItem(Node *node) setFlag(QGraphicsItem::ItemIsSelectable); setFlag(QGraphicsItem::ItemIsMovable); setFlag(QGraphicsItem::ItemSendsGeometryChanges); - syncPos(); + readPos(); } -void NodeItem::syncPos() +void NodeItem::readPos() { setPos(toScreen(_node->point())); } +void NodeItem::writePos() +{ + _node->setPoint(fromScreen(pos())); +} + QRectF NodeItem::labelRect() const { QString label = _node->label(); //QFont f("Courier", 9); @@ -99,6 +104,11 @@ QRectF NodeItem::boundingRect() const return r.united(shape().boundingRect()).adjusted(-4,-4,4,4); } +Node *NodeItem::node() const +{ + return _node; +} + QVariant NodeItem::itemChange(GraphicsItemChange change, const QVariant &value) { if (change == ItemPositionChange) { diff --git a/tikzit/src/gui/nodeitem.h b/tikzit/src/gui/nodeitem.h index 2228874..d0f1e62 100644 --- a/tikzit/src/gui/nodeitem.h +++ b/tikzit/src/gui/nodeitem.h @@ -16,11 +16,14 @@ class NodeItem : public QGraphicsItem { public: NodeItem(Node *node); - void syncPos(); + void readPos(); + void writePos(); void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); QVariant itemChange(GraphicsItemChange change, const QVariant &value); QPainterPath shape() const; QRectF boundingRect() const; + Node *node() const; + private: Node *_node; QRectF labelRect() const; diff --git a/tikzit/src/gui/tikzscene.cpp b/tikzit/src/gui/tikzscene.cpp index cd88f4e..5722d0d 100644 --- a/tikzit/src/gui/tikzscene.cpp +++ b/tikzit/src/gui/tikzscene.cpp @@ -1,8 +1,3 @@ -/** - * Manage the scene, which contains a single Graph, and respond to user input. This serves as - * the controller for the MVC (Graph, TikzView, TikzScene). - */ - #include "tikzit.h" #include "tikzscene.h" @@ -32,27 +27,27 @@ void TikzScene::setGraph(Graph *graph) void TikzScene::graphReplaced() { - foreach (NodeItem *ni, nodeItems) { + foreach (NodeItem *ni, _nodeItems) { removeItem(ni); delete ni; } - nodeItems.clear(); + _nodeItems.clear(); - foreach (EdgeItem *ei, edgeItems) { + foreach (EdgeItem *ei, _edgeItems) { removeItem(ei); delete ei; } - edgeItems.clear(); + _edgeItems.clear(); foreach (Edge *e, _graph->edges()) { EdgeItem *ei = new EdgeItem(e); - edgeItems << ei; + _edgeItems << ei; addItem(ei); } foreach (Node *n, _graph->nodes()) { NodeItem *ni = new NodeItem(n); - nodeItems << ni; + _nodeItems << ni; addItem(ni); } } @@ -68,10 +63,10 @@ void TikzScene::mousePressEvent(QGraphicsSceneMouseEvent *event) // TODO: check if we grabbed a control point QGraphicsScene::mousePressEvent(event); if (!selectedItems().empty() && !items(mousePos).empty()) { - _oldNodePositions = new QHash(); - for (QGraphicsItem *gi : selectedItems()) { + _oldNodePositions.clear(); + foreach (QGraphicsItem *gi, selectedItems()) { if (NodeItem *ni = dynamic_cast(gi)) { - _oldNodePositions-> + _oldNodePositions.insert(ni->node(), ni->node()->point()); } } qDebug() << "I am dragging"; @@ -101,7 +96,7 @@ void TikzScene::mouseMoveEvent(QGraphicsSceneMouseEvent *event) } // TODO: only sync edges that change - foreach (EdgeItem *ei, edgeItems) { + foreach (EdgeItem *ei, _edgeItems) { ei->edge()->updateControls(); ei->syncPos(); } @@ -112,6 +107,23 @@ void TikzScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) switch (tikzit->toolPalette()->currentTool()) { case ToolPalette::SELECT: QGraphicsScene::mouseReleaseEvent(event); + + if (!_oldNodePositions.empty()) { + QMap newNodePositions; + + foreach (QGraphicsItem *gi, selectedItems()) { + if (NodeItem *ni = dynamic_cast(gi)) { + ni->writePos(); + newNodePositions.insert(ni->node(), ni->node()->point()); + } + } + + qDebug() << _oldNodePositions; + qDebug() << newNodePositions; + + _oldNodePositions.clear(); + } + break; case ToolPalette::VERTEX: break; @@ -121,3 +133,13 @@ void TikzScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) break; } } + +QVector TikzScene::edgeItems() const +{ + return _edgeItems; +} + +QVector TikzScene::nodeItems() const +{ + return _nodeItems; +} diff --git a/tikzit/src/gui/tikzscene.h b/tikzit/src/gui/tikzscene.h index e0e75c1..b12c749 100644 --- a/tikzit/src/gui/tikzscene.h +++ b/tikzit/src/gui/tikzscene.h @@ -1,3 +1,8 @@ +/** + * Manage the scene, which contains a single Graph, and respond to user input. This serves as + * the controller for the MVC (Graph, TikzView, TikzScene). + */ + #ifndef TIKZSCENE_H #define TIKZSCENE_H @@ -21,6 +26,10 @@ public: ~TikzScene(); Graph *graph() const; void setGraph(Graph *graph); + QVector nodeItems() const; + + QVector edgeItems() const; + public slots: void graphReplaced(); protected: @@ -29,9 +38,9 @@ protected: void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); private: Graph *_graph; - QVector nodeItems; - QVector edgeItems; - QHash *_oldNodePositions; + QVector _nodeItems; + QVector _edgeItems; + QMap _oldNodePositions; }; #endif // TIKZSCENE_H diff --git a/tikzit/src/gui/undocommands.cpp b/tikzit/src/gui/undocommands.cpp index 38f7569..6d48fc4 100644 --- a/tikzit/src/gui/undocommands.cpp +++ b/tikzit/src/gui/undocommands.cpp @@ -1,16 +1,29 @@ #include "undocommands.h" -MoveCommand::MoveCommand(TikzScene *scene, QUndoCommand *parent) : QUndoCommand(parent) +MoveCommand::MoveCommand(TikzScene *scene, + QMap oldNodePositions, + QMap newNodePositions, + QUndoCommand *parent) : + QUndoCommand(parent), + _scene(scene), + _oldNodePositions(oldNodePositions), + _newNodePositions(newNodePositions) { - _scene = scene; } + void MoveCommand::undo() { - + foreach (NodeItem *ni, _scene->nodeItems()) { + if (_oldNodePositions.contains(ni->node())) + ni->node()->setPoint(_oldNodePositions.value(ni->node())); + } } void MoveCommand::redo() { - + foreach (NodeItem *ni, _scene->nodeItems()) { + if (_newNodePositions.contains(ni->node())) + ni->node()->setPoint(_newNodePositions.value(ni->node())); + } } diff --git a/tikzit/src/gui/undocommands.h b/tikzit/src/gui/undocommands.h index bbdf6c3..bdf9ad2 100644 --- a/tikzit/src/gui/undocommands.h +++ b/tikzit/src/gui/undocommands.h @@ -12,11 +12,16 @@ class MoveCommand : public QUndoCommand { public: - explicit MoveCommand(TikzScene *scene, QUndoCommand *parent = 0); + explicit MoveCommand(TikzScene *scene, + QMap oldNodePositions, + QMap newNodePositions, + QUndoCommand *parent = 0); void undo() override; void redo() override; private: TikzScene *_scene; + QMap _oldNodePositions; + QMap _newNodePositions; }; #endif // UNDOCOMMANDS_H -- cgit v1.2.3 From 64a9f5d5bd390e3d9a4d3017abc4539d97b94b26 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Mon, 18 Dec 2017 18:00:17 +0000 Subject: added sourceforge redirect pages --- www/sourceforge/README-SOURCEFORGE.txt | 3 +++ www/sourceforge/index.html | 9 +++++++++ 2 files changed, 12 insertions(+) create mode 100644 www/sourceforge/README-SOURCEFORGE.txt create mode 100644 www/sourceforge/index.html diff --git a/www/sourceforge/README-SOURCEFORGE.txt b/www/sourceforge/README-SOURCEFORGE.txt new file mode 100644 index 0000000..9c9f3cd --- /dev/null +++ b/www/sourceforge/README-SOURCEFORGE.txt @@ -0,0 +1,3 @@ +TikZiT is no longer being hosted on Sourceforge.net. To download the latest version, +go to http://tikzit.github.io . + diff --git a/www/sourceforge/index.html b/www/sourceforge/index.html new file mode 100644 index 0000000..2d65884 --- /dev/null +++ b/www/sourceforge/index.html @@ -0,0 +1,9 @@ + + + TikZiT ... redirect + + + +

TikZiT is now being hosted at GitHub. Click here to go there.

+ + \ No newline at end of file -- cgit v1.2.3 From 9267aec984f96a508ce95d43158d7ef1eb3f57b1 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Mon, 18 Dec 2017 18:02:25 +0000 Subject: ignore Qt Creator build directories --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..99aae83 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +build-tikzit-* -- cgit v1.2.3 From 2a57f77860e0287790f643f07c1449dee45be0f9 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Mon, 18 Dec 2017 18:13:48 +0000 Subject: migrated TikzDocument into TikzScene --- tikzit/src/data/graph.h | 2 +- tikzit/src/data/tikzdocument.h | 3 ++- tikzit/src/gui/mainwindow.cpp | 4 ++-- tikzit/src/gui/tikzscene.cpp | 27 ++++++++++++++++----------- tikzit/src/gui/tikzscene.h | 11 +++++++---- tikzit/src/gui/tikzview.h | 2 +- 6 files changed, 29 insertions(+), 20 deletions(-) diff --git a/tikzit/src/data/graph.h b/tikzit/src/data/graph.h index 952b8b4..3f4e8d3 100644 --- a/tikzit/src/data/graph.h +++ b/tikzit/src/data/graph.h @@ -1,5 +1,5 @@ /** - * A tikz graph. This serves as the model in the MVC (Graph, TikzView, TikzScene). + * A graph defined by tikz code. */ #ifndef GRAPH_H diff --git a/tikzit/src/data/tikzdocument.h b/tikzit/src/data/tikzdocument.h index 7d81742..8bd4143 100644 --- a/tikzit/src/data/tikzdocument.h +++ b/tikzit/src/data/tikzdocument.h @@ -1,5 +1,6 @@ /** - * Contains a tikz Graph, source code, file info, and undo stack. + * This class contains a tikz Graph, source code, file info, and undo stack. It serves as the model + * in the MVC triple (TikzDocument, TikzView, TikzScene). */ #ifndef TIKZDOCUMENT_H diff --git a/tikzit/src/gui/mainwindow.cpp b/tikzit/src/gui/mainwindow.cpp index 980a312..0520af2 100644 --- a/tikzit/src/gui/mainwindow.cpp +++ b/tikzit/src/gui/mainwindow.cpp @@ -22,7 +22,7 @@ MainWindow::MainWindow(QWidget *parent) : ui->setupUi(this); setAttribute(Qt::WA_DeleteOnClose, true); _tikzDocument = new TikzDocument(this); - _tikzScene = new TikzScene(_tikzDocument->graph(), this); + _tikzScene = new TikzScene(_tikzDocument, this); ui->tikzView->setScene(_tikzScene); _fileName = ""; _pristine = true; @@ -49,7 +49,7 @@ void MainWindow::open(QString fileName) if (_tikzDocument->parseSuccess()) { statusBar()->showMessage("TiKZ parsed successfully", 2000); setWindowTitle("TiKZiT - " + _tikzDocument->shortName()); - _tikzScene->setGraph(_tikzDocument->graph()); + _tikzScene->setTikzDocument(_tikzDocument); } else { statusBar()->showMessage("Cannot read TiKZ source"); } diff --git a/tikzit/src/gui/tikzscene.cpp b/tikzit/src/gui/tikzscene.cpp index 5722d0d..d01ab90 100644 --- a/tikzit/src/gui/tikzscene.cpp +++ b/tikzit/src/gui/tikzscene.cpp @@ -6,8 +6,8 @@ #include -TikzScene::TikzScene(Graph *graph, QObject *parent) : - QGraphicsScene(parent), _graph(graph) +TikzScene::TikzScene(TikzDocument *tikzDocument, QObject *parent) : + QGraphicsScene(parent), _tikzDocument(tikzDocument) { } @@ -16,13 +16,7 @@ TikzScene::~TikzScene() { Graph *TikzScene::graph() const { - return _graph; -} - -void TikzScene::setGraph(Graph *graph) -{ - _graph = graph; - graphReplaced(); + return _tikzDocument->graph(); } void TikzScene::graphReplaced() @@ -39,13 +33,13 @@ void TikzScene::graphReplaced() } _edgeItems.clear(); - foreach (Edge *e, _graph->edges()) { + foreach (Edge *e, graph()->edges()) { EdgeItem *ei = new EdgeItem(e); _edgeItems << ei; addItem(ei); } - foreach (Node *n, _graph->nodes()) { + foreach (Node *n, graph()->nodes()) { NodeItem *ni = new NodeItem(n); _nodeItems << ni; addItem(ni); @@ -134,6 +128,17 @@ void TikzScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) } } +TikzDocument *TikzScene::tikzDocument() const +{ + return _tikzDocument; +} + +void TikzScene::setTikzDocument(TikzDocument *tikzDocument) +{ + _tikzDocument = tikzDocument; + graphReplaced(); +} + QVector TikzScene::edgeItems() const { return _edgeItems; diff --git a/tikzit/src/gui/tikzscene.h b/tikzit/src/gui/tikzscene.h index b12c749..9d598ad 100644 --- a/tikzit/src/gui/tikzscene.h +++ b/tikzit/src/gui/tikzscene.h @@ -1,6 +1,6 @@ /** * Manage the scene, which contains a single Graph, and respond to user input. This serves as - * the controller for the MVC (Graph, TikzView, TikzScene). + * the controller for the MVC (TikzDocument, TikzView, TikzScene). */ #ifndef TIKZSCENE_H @@ -9,6 +9,7 @@ #include "graph.h" #include "nodeitem.h" #include "edgeitem.h" +#include "tikzdocument.h" #include #include @@ -22,14 +23,16 @@ class TikzScene : public QGraphicsScene { Q_OBJECT public: - TikzScene(Graph *graph, QObject *parent); + TikzScene(TikzDocument *tikzDocument, QObject *parent); ~TikzScene(); Graph *graph() const; - void setGraph(Graph *graph); QVector nodeItems() const; QVector edgeItems() const; + TikzDocument *tikzDocument() const; + void setTikzDocument(TikzDocument *tikzDocument); + public slots: void graphReplaced(); protected: @@ -37,7 +40,7 @@ protected: void mouseMoveEvent(QGraphicsSceneMouseEvent *event); void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); private: - Graph *_graph; + TikzDocument *_tikzDocument; QVector _nodeItems; QVector _edgeItems; QMap _oldNodePositions; diff --git a/tikzit/src/gui/tikzview.h b/tikzit/src/gui/tikzview.h index 6d09b21..fc3cba4 100644 --- a/tikzit/src/gui/tikzview.h +++ b/tikzit/src/gui/tikzview.h @@ -1,6 +1,6 @@ /** * Display a Graph, and manage any user input that purely changes the view (e.g. Zoom). This - * serves as the view in the MVC (Graph, TikzView, TikzScene). + * serves as the view in the MVC (TikzDocument, TikzView, TikzScene). */ #ifndef TIKZVIEW_H -- cgit v1.2.3 From 7d099bc9a3cd3c449b3af74dd7e66b5a79695497 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Mon, 18 Dec 2017 18:50:06 +0000 Subject: pushing on to undo stack --- tikzit/src/gui/tikzscene.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tikzit/src/gui/tikzscene.cpp b/tikzit/src/gui/tikzscene.cpp index d01ab90..b12b769 100644 --- a/tikzit/src/gui/tikzscene.cpp +++ b/tikzit/src/gui/tikzscene.cpp @@ -1,5 +1,6 @@ #include "tikzit.h" #include "tikzscene.h" +#include "undocommands.h" #include #include @@ -112,9 +113,10 @@ void TikzScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) } } - qDebug() << _oldNodePositions; - qDebug() << newNodePositions; + //qDebug() << _oldNodePositions; + //qDebug() << newNodePositions; + _tikzDocument->undoStack()->push(new MoveCommand(this, _oldNodePositions, newNodePositions)); _oldNodePositions.clear(); } -- cgit v1.2.3 From 144c37b05a065126aaf6ece7f9e5a8b56ec45f45 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Mon, 18 Dec 2017 22:50:42 +0000 Subject: created proper class for main menu --- tikzit/src/data/tikzdocument.cpp | 7 ++ tikzit/src/data/tikzdocument.h | 2 + tikzit/src/gui/mainmenu.cpp | 94 ++++++++++++++++++++++++ tikzit/src/gui/mainmenu.h | 43 +++++++++++ tikzit/src/gui/mainmenu.ui | 151 +++++++++++++++++++++++++-------------- tikzit/src/gui/mainwindow.cpp | 1 + tikzit/src/tikzit.cpp | 61 +++++++--------- tikzit/src/tikzit.h | 24 ++++--- tikzit/tikzit.pro | 6 +- 9 files changed, 289 insertions(+), 100 deletions(-) create mode 100644 tikzit/src/gui/mainmenu.cpp create mode 100644 tikzit/src/gui/mainmenu.h diff --git a/tikzit/src/data/tikzdocument.cpp b/tikzit/src/data/tikzdocument.cpp index c8d4ce9..13d4c6e 100644 --- a/tikzit/src/data/tikzdocument.cpp +++ b/tikzit/src/data/tikzdocument.cpp @@ -13,6 +13,13 @@ TikzDocument::TikzDocument(QObject *parent) : QObject(parent) _parseSuccess = true; _fileName = ""; _shortName = ""; + _undoStack = new QUndoStack(); +} + +TikzDocument::~TikzDocument() +{ + delete _graph; + delete _undoStack; } QUndoStack *TikzDocument::undoStack() const diff --git a/tikzit/src/data/tikzdocument.h b/tikzit/src/data/tikzdocument.h index 8bd4143..f574f5c 100644 --- a/tikzit/src/data/tikzdocument.h +++ b/tikzit/src/data/tikzdocument.h @@ -16,6 +16,8 @@ class TikzDocument : public QObject Q_OBJECT public: explicit TikzDocument(QObject *parent = 0); + ~TikzDocument(); + Graph *graph() const; QString tikz() const; QUndoStack *undoStack() const; diff --git a/tikzit/src/gui/mainmenu.cpp b/tikzit/src/gui/mainmenu.cpp new file mode 100644 index 0000000..6c8f395 --- /dev/null +++ b/tikzit/src/gui/mainmenu.cpp @@ -0,0 +1,94 @@ +#include "mainmenu.h" +#include "tikzit.h" + +MainMenu::MainMenu() +{ + ui.setupUi(this); +} + +// File +void MainMenu::on_actionNew_triggered() +{ + tikzit->newDoc(); +} + +void MainMenu::on_actionOpen_triggered() +{ + tikzit->open(); +} + +void MainMenu::on_actionClose_triggered() +{ + // TODO +} + +void MainMenu::on_actionSave_triggered() +{ + // TODO +} + +void MainMenu::on_actionSave_As_triggered() +{ + // TODO +} + + +// Edit +void MainMenu::on_actionUndo_triggered() +{ + // TODO +} + +void MainMenu::on_actionRedo_triggered() +{ + // TODO +} + +void MainMenu::on_actionCut_triggered() +{ + // TODO +} + +void MainMenu::on_actionCopy_triggered() +{ + // TODO +} + +void MainMenu::on_actionPaste_triggered() +{ + // TODO +} + +void MainMenu::on_actionDelete_triggered() +{ + // TODO +} + +void MainMenu::on_actionSelect_All_triggered() +{ + // TODO +} + +void MainMenu::on_actionDeselect_All_triggered() +{ + // TODO +} + + +// Tikz +void MainMenu::on_actionParse_triggered() +{ + // TODO +} + + +// View +void MainMenu::on_actionZoom_In_triggered() +{ + if (tikzit->activeWindow() != 0) tikzit->activeWindow()->tikzView()->zoomIn(); +} + +void MainMenu::on_actionZoom_Out_triggered() +{ + if (tikzit->activeWindow() != 0) tikzit->activeWindow()->tikzView()->zoomOut(); +} diff --git a/tikzit/src/gui/mainmenu.h b/tikzit/src/gui/mainmenu.h new file mode 100644 index 0000000..d85e271 --- /dev/null +++ b/tikzit/src/gui/mainmenu.h @@ -0,0 +1,43 @@ +#ifndef MAINMENU_H +#define MAINMENU_H + +#include "ui_mainmenu.h" + +#include + +class MainMenu : public QMenuBar +{ + Q_OBJECT +public: + MainMenu(); + +private: + Ui::MainMenu ui; + +public slots: + // File + void on_actionNew_triggered(); + void on_actionOpen_triggered(); + void on_actionClose_triggered(); + void on_actionSave_triggered(); + void on_actionSave_As_triggered(); + + // Edit + void on_actionUndo_triggered(); + void on_actionRedo_triggered(); + void on_actionCut_triggered(); + void on_actionCopy_triggered(); + void on_actionPaste_triggered(); + void on_actionDelete_triggered(); + void on_actionSelect_All_triggered(); + void on_actionDeselect_All_triggered(); + + // Tikz + void on_actionParse_triggered(); + + // View + void on_actionZoom_In_triggered(); + void on_actionZoom_Out_triggered(); +}; + +#endif // MAINMENU_H diff --git a/tikzit/src/gui/mainmenu.ui b/tikzit/src/gui/mainmenu.ui index d3eed0a..c9b6f44 100644 --- a/tikzit/src/gui/mainmenu.ui +++ b/tikzit/src/gui/mainmenu.ui @@ -1,122 +1,157 @@ - MainMenu - - - - 0 - 0 - 476 - 22 - - - - - File - - - - - - - - - - - Edit - - - - - - - - - - - - - - - Tikz - - - - - - View - - - - - - - - + MainMenu + + + + 0 + 0 + 476 + 22 + + + + + File + + + + + + + + + + + Edit + + + + + + + + + + + + + + + Tikz + + + + + + View + + + + New... + + Ctrl+N + Open... + + Ctrl+O + Close + + Ctrl+W + Save + + Ctrl+S + Save As... + + Ctrl+Shift+S + Undo + + Ctrl+Z + Redo + + Ctrl+Shift+Z + Cut + + Ctrl+X + Copy + + Ctrl+C + - + Paste + + Ctrl+V + Delete + + Backspace + Select All + + Ctrl+A + Deselect All + + Ctrl+D + @@ -142,5 +177,11 @@ Ctrl+- - + + + + + + + diff --git a/tikzit/src/gui/mainwindow.cpp b/tikzit/src/gui/mainwindow.cpp index 0520af2..740c0eb 100644 --- a/tikzit/src/gui/mainwindow.cpp +++ b/tikzit/src/gui/mainwindow.cpp @@ -37,6 +37,7 @@ MainWindow::MainWindow(QWidget *parent) : MainWindow::~MainWindow() { tikzit->removeWindow(this); + delete ui; } void MainWindow::open(QString fileName) diff --git a/tikzit/src/tikzit.cpp b/tikzit/src/tikzit.cpp index 0c9fdb1..94fc644 100644 --- a/tikzit/src/tikzit.cpp +++ b/tikzit/src/tikzit.cpp @@ -11,13 +11,14 @@ QFont Tikzit::LABEL_FONT("Courrier", 9); Tikzit::Tikzit() { + _mainMenu = new MainMenu(); + _activeWindow = 0; QMainWindow *dummy = new QMainWindow(); _toolPalette = new ToolPalette(dummy); _propertyPalette = new PropertyPalette(dummy); - createMenu(); loadStyles(); _toolPalette->show(); @@ -27,10 +28,10 @@ Tikzit::Tikzit() _windows[0]->show(); } -QMenuBar *Tikzit::mainMenu() const -{ - return _mainMenu; -} +//QMenuBar *Tikzit::mainMenu() const +//{ +// return _mainMenu; +//} ToolPalette *Tikzit::toolPalette() const { @@ -42,26 +43,26 @@ PropertyPalette *Tikzit::propertyPalette() const return _propertyPalette; } -void Tikzit::createMenu() -{ - _mainMenu = new QMenuBar(0); - QMenu *file = _mainMenu->addMenu(tr("&File")); - QAction *aNew = file->addAction(tr("&New")); - aNew->setShortcut(QKeySequence::New); - QAction *aOpen = file->addAction(tr("&Open")); - aOpen->setShortcut(QKeySequence::Open); - - QMenu *view = _mainMenu->addMenu(tr("&View")); - QAction *aZoomIn = view->addAction(tr("Zoom &In")); - aZoomIn->setShortcut(QKeySequence::ZoomIn); - QAction *aZoomOut = view->addAction(tr("Zoom &Out")); - aZoomOut->setShortcut(QKeySequence::ZoomOut); - - connect(aNew, SIGNAL(triggered()), this, SLOT(newDoc())); - connect(aOpen, SIGNAL(triggered()), this, SLOT(open())); - connect(aZoomIn, SIGNAL(triggered()), this, SLOT(zoomIn())); - connect(aZoomOut, SIGNAL(triggered()), this, SLOT(zoomOut())); -} +//void Tikzit::createMenu() +//{ +// _mainMenu = new QMenuBar(0); +// QMenu *file = _mainMenu->addMenu(tr("&File")); +// QAction *aNew = file->addAction(tr("&New")); +// aNew->setShortcut(QKeySequence::New); +// QAction *aOpen = file->addAction(tr("&Open")); +// aOpen->setShortcut(QKeySequence::Open); + +// QMenu *view = _mainMenu->addMenu(tr("&View")); +// QAction *aZoomIn = view->addAction(tr("Zoom &In")); +// aZoomIn->setShortcut(QKeySequence::ZoomIn); +// QAction *aZoomOut = view->addAction(tr("Zoom &Out")); +// aZoomOut->setShortcut(QKeySequence::ZoomOut); + +// connect(aNew, SIGNAL(triggered()), this, SLOT(newDoc())); +// connect(aOpen, SIGNAL(triggered()), this, SLOT(open())); +// connect(aZoomIn, SIGNAL(triggered()), this, SLOT(zoomIn())); +// connect(aZoomOut, SIGNAL(triggered()), this, SLOT(zoomOut())); +//} void Tikzit::loadStyles() { @@ -123,13 +124,3 @@ void Tikzit::open() } } } - -void Tikzit::zoomIn() -{ - if (_activeWindow != 0) _activeWindow->tikzView()->zoomIn(); -} - -void Tikzit::zoomOut() -{ - if (_activeWindow != 0) _activeWindow->tikzView()->zoomOut(); -} diff --git a/tikzit/src/tikzit.h b/tikzit/src/tikzit.h index 252bf35..b0e372d 100644 --- a/tikzit/src/tikzit.h +++ b/tikzit/src/tikzit.h @@ -1,7 +1,15 @@ +/** + * Tikzit is the top-level class which maintains the global application state. For convenience, + * it also inherits the main menu. + */ + #ifndef TIKZIT_H #define TIKZIT_H #include "mainwindow.h" +#include "mainmenu.h" +#include "ui_mainmenu.h" + #include "toolpalette.h" #include "propertypalette.h" #include "nodestyle.h" @@ -38,11 +46,11 @@ inline QPointF bezierInterpolateFull (float dist, QPointF c0, QPointF c1, QPoint bezierInterpolate (dist, c0.y(), c1.y(), c2.y(), c3.y())); } + class Tikzit : public QObject { Q_OBJECT public: Tikzit(); - QMenuBar *mainMenu() const; ToolPalette *toolPalette() const; PropertyPalette *propertyPalette() const; @@ -52,23 +60,23 @@ public: NodeStyle nodeStyle(QString name); static QFont LABEL_FONT; +// Ui::MainMenu *_mainMenuUi; +// QMenuBar *_mainMenu; + + void newDoc(); + void open(); private: - void createMenu(); +// void createMenu(); void loadStyles(); - QMenuBar *_mainMenu; + MainMenu *_mainMenu; ToolPalette *_toolPalette; PropertyPalette *_propertyPalette; QVector _windows; MainWindow *_activeWindow; QVector _nodeStyles; -public slots: - void newDoc(); - void open(); - void zoomIn(); - void zoomOut(); }; extern Tikzit *tikzit; diff --git a/tikzit/tikzit.pro b/tikzit/tikzit.pro index aa18381..f1a1d54 100644 --- a/tikzit/tikzit.pro +++ b/tikzit/tikzit.pro @@ -46,7 +46,8 @@ SOURCES += src/gui/mainwindow.cpp \ src/data/nodestyle.cpp \ src/gui/commands.cpp \ src/data/tikzdocument.cpp \ - src/gui/undocommands.cpp + src/gui/undocommands.cpp \ + src/gui/mainmenu.cpp HEADERS += src/gui/mainwindow.h \ src/gui/toolpalette.h \ @@ -66,7 +67,8 @@ HEADERS += src/gui/mainwindow.h \ src/data/nodestyle.h \ src/gui/commands.h \ src/data/tikzdocument.h \ - src/gui/undocommands.h + src/gui/undocommands.h \ + src/gui/mainmenu.h FORMS += src/gui/mainwindow.ui \ src/gui/propertypalette.ui \ -- cgit v1.2.3 From 82bdd42a475d240bb08e201a47b0972d0b2862a6 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 19 Dec 2017 23:02:35 +0000 Subject: undo move works --- tikzit/src/gui/mainmenu.cpp | 6 ++++-- tikzit/src/gui/mainwindow.cpp | 5 +++++ tikzit/src/gui/mainwindow.h | 1 + tikzit/src/gui/undocommands.cpp | 18 ++++++++++++++++-- 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/tikzit/src/gui/mainmenu.cpp b/tikzit/src/gui/mainmenu.cpp index 6c8f395..c9e83ba 100644 --- a/tikzit/src/gui/mainmenu.cpp +++ b/tikzit/src/gui/mainmenu.cpp @@ -36,12 +36,14 @@ void MainMenu::on_actionSave_As_triggered() // Edit void MainMenu::on_actionUndo_triggered() { - // TODO + if (tikzit->activeWindow() != 0) + tikzit->activeWindow()->tikzDocument()->undoStack()->undo(); } void MainMenu::on_actionRedo_triggered() { - // TODO + if (tikzit->activeWindow() != 0) + tikzit->activeWindow()->tikzDocument()->undoStack()->redo(); } void MainMenu::on_actionCut_triggered() diff --git a/tikzit/src/gui/mainwindow.cpp b/tikzit/src/gui/mainwindow.cpp index 740c0eb..19b6a59 100644 --- a/tikzit/src/gui/mainwindow.cpp +++ b/tikzit/src/gui/mainwindow.cpp @@ -71,6 +71,11 @@ void MainWindow::changeEvent(QEvent *event) QMainWindow::changeEvent(event); } +TikzDocument *MainWindow::tikzDocument() const +{ + return _tikzDocument; +} + TikzScene *MainWindow::tikzScene() const { return _tikzScene; diff --git a/tikzit/src/gui/mainwindow.h b/tikzit/src/gui/mainwindow.h index 4af3357..f27677a 100644 --- a/tikzit/src/gui/mainwindow.h +++ b/tikzit/src/gui/mainwindow.h @@ -30,6 +30,7 @@ public: int windowId() const; TikzView *tikzView() const; TikzScene *tikzScene() const; + TikzDocument *tikzDocument() const; protected: void closeEvent(QCloseEvent *event); diff --git a/tikzit/src/gui/undocommands.cpp b/tikzit/src/gui/undocommands.cpp index 6d48fc4..b8a045b 100644 --- a/tikzit/src/gui/undocommands.cpp +++ b/tikzit/src/gui/undocommands.cpp @@ -15,15 +15,29 @@ MoveCommand::MoveCommand(TikzScene *scene, void MoveCommand::undo() { foreach (NodeItem *ni, _scene->nodeItems()) { - if (_oldNodePositions.contains(ni->node())) + if (_oldNodePositions.contains(ni->node())) { ni->node()->setPoint(_oldNodePositions.value(ni->node())); + ni->readPos(); + } + } + + foreach (EdgeItem *ei, _scene->edgeItems()) { + ei->edge()->updateControls(); + ei->syncPos(); } } void MoveCommand::redo() { foreach (NodeItem *ni, _scene->nodeItems()) { - if (_newNodePositions.contains(ni->node())) + if (_newNodePositions.contains(ni->node())) { ni->node()->setPoint(_newNodePositions.value(ni->node())); + ni->readPos(); + } + } + + foreach (EdgeItem *ei, _scene->edgeItems()) { + ei->edge()->updateControls(); + ei->syncPos(); } } -- cgit v1.2.3 From 9d8317cd593d47911bb6b2e6fb8ef0077e24ae36 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Thu, 21 Dec 2017 16:34:58 +0000 Subject: edge bending working --- tikzit/src/data/edge.cpp | 22 +++- tikzit/src/data/edge.h | 5 + tikzit/src/data/tikzparser.parser.cpp | 11 +- tikzit/src/data/tikzparser.y | 5 +- tikzit/src/gui/edgeitem.cpp | 27 ++++- tikzit/src/gui/edgeitem.h | 5 +- tikzit/src/gui/tikzscene.cpp | 184 +++++++++++++++++++++++++++++----- tikzit/src/gui/tikzscene.h | 4 +- tikzit/src/gui/undocommands.cpp | 10 +- tikzit/src/tikzit.h | 14 --- tikzit/src/util.cpp | 48 +++++++++ tikzit/src/util.h | 24 +++++ tikzit/tikzit.pro | 6 +- 13 files changed, 307 insertions(+), 58 deletions(-) create mode 100644 tikzit/src/util.cpp create mode 100644 tikzit/src/util.h diff --git a/tikzit/src/data/edge.cpp b/tikzit/src/data/edge.cpp index b999f8a..3ff6c6e 100644 --- a/tikzit/src/data/edge.cpp +++ b/tikzit/src/data/edge.cpp @@ -1,9 +1,9 @@ #include "edge.h" #include "tikzit.h" +#include "util.h" #include #include -#include Edge::Edge(Node *s, Node *t, QObject *parent) : QObject(parent), _source(s), _target(t) @@ -278,6 +278,26 @@ float Edge::cpDist() const return _cpDist; } +void Edge::setBend(int bend) +{ + _bend = bend; +} + +void Edge::setInAngle(int inAngle) +{ + _inAngle = inAngle; +} + +void Edge::setOutAngle(int outAngle) +{ + _outAngle = outAngle; +} + +void Edge::setWeight(float weight) +{ + _weight = weight; +} + QPointF Edge::mid() const { return _mid; diff --git a/tikzit/src/data/edge.h b/tikzit/src/data/edge.h index e392c56..d2913b8 100644 --- a/tikzit/src/data/edge.h +++ b/tikzit/src/data/edge.h @@ -50,6 +50,11 @@ public: bool basicBendMode() const; float cpDist() const; + void setBend(int bend); + void setInAngle(int inAngle); + void setOutAngle(int outAngle); + void setWeight(float weight); + signals: public slots: diff --git a/tikzit/src/data/tikzparser.parser.cpp b/tikzit/src/data/tikzparser.parser.cpp index 53c8da7..3dadb45 100644 --- a/tikzit/src/data/tikzparser.parser.cpp +++ b/tikzit/src/data/tikzparser.parser.cpp @@ -532,7 +532,7 @@ static const yytype_uint8 yyrline[] = 0, 124, 124, 130, 130, 131, 131, 131, 131, 133, 133, 136, 138, 140, 141, 148, 154, 156, 163, 169, 169, 171, 172, 190, 190, 191, 198, 199, 201, 202, - 210, 243, 243, 244, 244, 245, 247 + 210, 246, 246, 247, 247, 248, 250 }; #endif @@ -1677,8 +1677,11 @@ yyreduce: } Edge *edge = assembler->graph()->addEdge(s, t); - if ((yyvsp[(2) - (7)].data)) + if ((yyvsp[(2) - (7)].data)) { edge->setData((yyvsp[(2) - (7)].data)); + edge->setAttributesFromData(); + } + if ((yyvsp[(5) - (7)].node)) edge->setEdgeNode((yyvsp[(5) - (7)].node)); if ((yyvsp[(3) - (7)].noderef).anchor) { @@ -1698,7 +1701,7 @@ yyreduce: break; case 36: -#line 248 "../tikzit/src/data/tikzparser.y" +#line 251 "../tikzit/src/data/tikzparser.y" { assembler->graph()->setBbox(QRectF(*(yyvsp[(3) - (6)].pt), *(yyvsp[(5) - (6)].pt))); delete (yyvsp[(3) - (6)].pt); @@ -1708,7 +1711,7 @@ yyreduce: /* Line 1267 of yacc.c. */ -#line 1712 "../tikzit/src/data/tikzparser.parser.cpp" +#line 1715 "../tikzit/src/data/tikzparser.parser.cpp" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); diff --git a/tikzit/src/data/tikzparser.y b/tikzit/src/data/tikzparser.y index b5bca35..eaf09eb 100644 --- a/tikzit/src/data/tikzparser.y +++ b/tikzit/src/data/tikzparser.y @@ -221,8 +221,11 @@ edge: "\\draw" optproperties noderef "to" optedgenode optnoderef ";" } Edge *edge = assembler->graph()->addEdge(s, t); - if ($2) + if ($2) { edge->setData($2); + edge->setAttributesFromData(); + } + if ($5) edge->setEdgeNode($5); if ($3.anchor) { diff --git a/tikzit/src/gui/edgeitem.cpp b/tikzit/src/gui/edgeitem.cpp index cb275a5..497fa07 100644 --- a/tikzit/src/gui/edgeitem.cpp +++ b/tikzit/src/gui/edgeitem.cpp @@ -24,12 +24,12 @@ EdgeItem::EdgeItem(Edge *edge) GLOBAL_SCALEF * 0.1, GLOBAL_SCALEF * 0.1); _cp2Item->setVisible(false); - syncPos(); + readPos(); } -void EdgeItem::syncPos() +void EdgeItem::readPos() { - _edge->setAttributesFromData(); + //_edge->setAttributesFromData(); _edge->updateControls(); QPainterPath path; @@ -104,7 +104,28 @@ QRectF EdgeItem::boundingRect() const return shape().boundingRect().adjusted(-r,-r,r,r); } +QPainterPath EdgeItem::shape() const +{ + // get the shape of the edge, and expand a bit to make selection easier + QPainterPath oldShape = QGraphicsPathItem::shape(); + QPainterPathStroker stroker; + stroker.setWidth(5); + stroker.setJoinStyle(Qt::MiterJoin); + QPainterPath newShape = (stroker.createStroke(oldShape) + oldShape).simplified(); + return newShape; +} + Edge *EdgeItem::edge() const { return _edge; } + +QGraphicsEllipseItem *EdgeItem::cp1Item() const +{ + return _cp1Item; +} + +QGraphicsEllipseItem *EdgeItem::cp2Item() const +{ + return _cp2Item; +} diff --git a/tikzit/src/gui/edgeitem.h b/tikzit/src/gui/edgeitem.h index 5bdf3be..b017265 100644 --- a/tikzit/src/gui/edgeitem.h +++ b/tikzit/src/gui/edgeitem.h @@ -18,11 +18,14 @@ class EdgeItem : public QGraphicsPathItem { public: EdgeItem(Edge *edge); - void syncPos(); + void readPos(); void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); QRectF boundingRect() const; + QPainterPath shape() const; Edge *edge() const; + QGraphicsEllipseItem *cp1Item() const; + QGraphicsEllipseItem *cp2Item() const; private: Edge *_edge; diff --git a/tikzit/src/gui/tikzscene.cpp b/tikzit/src/gui/tikzscene.cpp index b12b769..b502f84 100644 --- a/tikzit/src/gui/tikzscene.cpp +++ b/tikzit/src/gui/tikzscene.cpp @@ -1,4 +1,5 @@ #include "tikzit.h" +#include "util.h" #include "tikzscene.h" #include "undocommands.h" @@ -10,6 +11,7 @@ TikzScene::TikzScene(TikzDocument *tikzDocument, QObject *parent) : QGraphicsScene(parent), _tikzDocument(tikzDocument) { + _modifyEdgeItem = 0; } TikzScene::~TikzScene() { @@ -49,23 +51,59 @@ void TikzScene::graphReplaced() void TikzScene::mousePressEvent(QGraphicsSceneMouseEvent *event) { + // current mouse position, in scene coordinates QPointF mousePos(event->buttonDownScenePos(Qt::LeftButton).x(), event->buttonDownScenePos(Qt::LeftButton).y()); + // radius of a control point for bezier edges, in scene coordinates + qreal cpR = GLOBAL_SCALEF * (0.05); + qreal cpR2 = cpR * cpR; switch (tikzit->toolPalette()->currentTool()) { case ToolPalette::SELECT: - // TODO: check if we grabbed a control point - QGraphicsScene::mousePressEvent(event); - if (!selectedItems().empty() && !items(mousePos).empty()) { + // check if we grabbed a control point of an edge + foreach (QGraphicsItem *gi, selectedItems()) { + if (EdgeItem *ei = dynamic_cast(gi)) { + qreal dx, dy; + + dx = ei->cp1Item()->pos().x() - mousePos.x(); + dy = ei->cp1Item()->pos().y() - mousePos.y(); + + if (dx*dx + dy*dy <= cpR2) { + _modifyEdgeItem = ei; + _firstControlPoint = true; + break; + } + + dx = ei->cp2Item()->pos().x() - mousePos.x(); + dy = ei->cp2Item()->pos().y() - mousePos.y(); + + if (dx*dx + dy*dy <= cpR2) { + _modifyEdgeItem = ei; + _firstControlPoint = false; + break; + } + } + } + + if (_modifyEdgeItem != 0) { + // disable rubber band drag, which will clear the selection + views()[0]->setDragMode(QGraphicsView::NoDrag); + qDebug() << "Got a control point"; + } else { + // since we are not dragging a control point, process the click normally + views()[0]->setDragMode(QGraphicsView::RubberBandDrag); + QGraphicsScene::mousePressEvent(event); + + // save current node positions for undo support _oldNodePositions.clear(); foreach (QGraphicsItem *gi, selectedItems()) { if (NodeItem *ni = dynamic_cast(gi)) { _oldNodePositions.insert(ni->node(), ni->node()->point()); } } - qDebug() << "I am dragging"; } + break; case ToolPalette::VERTEX: break; @@ -78,9 +116,96 @@ void TikzScene::mousePressEvent(QGraphicsSceneMouseEvent *event) void TikzScene::mouseMoveEvent(QGraphicsSceneMouseEvent *event) { + // current mouse position, in scene coordinates + + QPointF mousePos = event->scenePos(); + switch (tikzit->toolPalette()->currentTool()) { case ToolPalette::SELECT: - QGraphicsScene::mouseMoveEvent(event); + if (_modifyEdgeItem != 0) { + Edge *e = _modifyEdgeItem->edge(); + // dragging a control point + QPointF src = toScreen(e->source()->point()); + QPointF targ = toScreen(e->target()->point()); + float dx1 = targ.x() - src.x(); + float dy1 = targ.y() - src.y(); + float dx2, dy2; + if (_firstControlPoint) { + dx2 = mousePos.x() - src.x(); + dy2 = mousePos.y() - src.y(); + } else { + dx2 = mousePos.x() - targ.x(); + dy2 = mousePos.y() - targ.y(); + } + + float baseDist = sqrt(dx1*dx1 + dy1*dy1); + float handleDist = sqrt(dx2*dx2 + dy2*dy2); + float wcoarseness = 0.1f; + + if (!e->isSelfLoop()) { + if (baseDist != 0) { + e->setWeight(roundToNearest(wcoarseness, handleDist/baseDist)); + } else { + e->setWeight(roundToNearest(wcoarseness, handleDist/GLOBAL_SCALEF)); + } + } + + float control_angle = atan2(-dy2, dx2); + + int bcoarseness = 15; + + if(e->basicBendMode()) { + float bnd; + float base_angle = atan2(-dy1, dx1); + if (_firstControlPoint) { + bnd = base_angle - control_angle; + } else { + bnd = control_angle - base_angle + M_PI; + if (bnd > M_PI) bnd -= 2*M_PI; + } + + e->setBend(round(bnd * (180.0f / M_PI) * (1.0f / (float)bcoarseness)) * bcoarseness); + + } else { + int bnd = round(control_angle * (180.0f / M_PI) * + (1.0f / (float)bcoarseness)) * + bcoarseness; + if (_firstControlPoint) { + // TODO: enable moving both control points +// if ([theEvent modifierFlags] & NSAlternateKeyMask) { +// if ([modifyEdge isSelfLoop]) { +// [modifyEdge setInAngle:[modifyEdge inAngle] + +// (bnd - [modifyEdge outAngle])]; +// } else { +// [modifyEdge setInAngle:[modifyEdge inAngle] - +// (bnd - [modifyEdge outAngle])]; +// } +// } + + e->setOutAngle(bnd); + } else { +// if (theEvent.modifierFlags & NSAlternateKeyMask) { +// if ([modifyEdge isSelfLoop]) { +// [modifyEdge setOutAngle:[modifyEdge outAngle] + +// (bnd - [modifyEdge inAngle])]; +// } else { +// [modifyEdge setOutAngle:[modifyEdge outAngle] - +// (bnd - [modifyEdge inAngle])]; +// } +// } + + e->setInAngle(bnd); + } + } + + _modifyEdgeItem->readPos(); + + } else { + // otherwise, process mouse move normally + QGraphicsScene::mouseMoveEvent(event); + refreshAdjacentEdges(_oldNodePositions.keys()); + } + break; case ToolPalette::VERTEX: break; @@ -89,35 +214,37 @@ void TikzScene::mouseMoveEvent(QGraphicsSceneMouseEvent *event) case ToolPalette::CROP: break; } - - // TODO: only sync edges that change - foreach (EdgeItem *ei, _edgeItems) { - ei->edge()->updateControls(); - ei->syncPos(); - } } void TikzScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { switch (tikzit->toolPalette()->currentTool()) { case ToolPalette::SELECT: - QGraphicsScene::mouseReleaseEvent(event); + if (_modifyEdgeItem != 0) { + // finished dragging a control point + // TODO - if (!_oldNodePositions.empty()) { - QMap newNodePositions; + _modifyEdgeItem = 0; + } else { + // otherwise, process mouse move normally + QGraphicsScene::mouseReleaseEvent(event); - foreach (QGraphicsItem *gi, selectedItems()) { - if (NodeItem *ni = dynamic_cast(gi)) { - ni->writePos(); - newNodePositions.insert(ni->node(), ni->node()->point()); + if (!_oldNodePositions.empty()) { + QMap newNodePositions; + + foreach (QGraphicsItem *gi, selectedItems()) { + if (NodeItem *ni = dynamic_cast(gi)) { + ni->writePos(); + newNodePositions.insert(ni->node(), ni->node()->point()); + } } - } - //qDebug() << _oldNodePositions; - //qDebug() << newNodePositions; + //qDebug() << _oldNodePositions; + //qDebug() << newNodePositions; - _tikzDocument->undoStack()->push(new MoveCommand(this, _oldNodePositions, newNodePositions)); - _oldNodePositions.clear(); + _tikzDocument->undoStack()->push(new MoveCommand(this, _oldNodePositions, newNodePositions)); + _oldNodePositions.clear(); + } } break; @@ -146,6 +273,17 @@ QVector TikzScene::edgeItems() const return _edgeItems; } +void TikzScene::refreshAdjacentEdges(QList nodes) +{ + if (nodes.empty()) return; + foreach (EdgeItem *ei, _edgeItems) { + if (nodes.contains(ei->edge()->source()) || nodes.contains(ei->edge()->target())) { + ei->edge()->updateControls(); + ei->readPos(); + } + } +} + QVector TikzScene::nodeItems() const { return _nodeItems; diff --git a/tikzit/src/gui/tikzscene.h b/tikzit/src/gui/tikzscene.h index 9d598ad..cc7f4e4 100644 --- a/tikzit/src/gui/tikzscene.h +++ b/tikzit/src/gui/tikzscene.h @@ -27,8 +27,8 @@ public: ~TikzScene(); Graph *graph() const; QVector nodeItems() const; - QVector edgeItems() const; + void refreshAdjacentEdges(QList nodes); TikzDocument *tikzDocument() const; void setTikzDocument(TikzDocument *tikzDocument); @@ -43,6 +43,8 @@ private: TikzDocument *_tikzDocument; QVector _nodeItems; QVector _edgeItems; + EdgeItem *_modifyEdgeItem; + bool _firstControlPoint; QMap _oldNodePositions; }; diff --git a/tikzit/src/gui/undocommands.cpp b/tikzit/src/gui/undocommands.cpp index b8a045b..c28611f 100644 --- a/tikzit/src/gui/undocommands.cpp +++ b/tikzit/src/gui/undocommands.cpp @@ -21,10 +21,7 @@ void MoveCommand::undo() } } - foreach (EdgeItem *ei, _scene->edgeItems()) { - ei->edge()->updateControls(); - ei->syncPos(); - } + _scene->refreshAdjacentEdges(_oldNodePositions.keys()); } void MoveCommand::redo() @@ -36,8 +33,5 @@ void MoveCommand::redo() } } - foreach (EdgeItem *ei, _scene->edgeItems()) { - ei->edge()->updateControls(); - ei->syncPos(); - } + _scene->refreshAdjacentEdges(_newNodePositions.keys()); } diff --git a/tikzit/src/tikzit.h b/tikzit/src/tikzit.h index b0e372d..bf4f7f1 100644 --- a/tikzit/src/tikzit.h +++ b/tikzit/src/tikzit.h @@ -32,20 +32,6 @@ inline QPointF toScreen(QPointF src) inline QPointF fromScreen(QPointF src) { src.setY(-src.y()); src /= GLOBAL_SCALEF; return src; } -// interpolate on a cubic bezier curve -inline float bezierInterpolate(float dist, float c0, float c1, float c2, float c3) { - float distp = 1 - dist; - return (distp*distp*distp) * c0 + - 3 * (distp*distp) * dist * c1 + - 3 * (dist*dist) * distp * c2 + - (dist*dist*dist) * c3; -} - -inline QPointF bezierInterpolateFull (float dist, QPointF c0, QPointF c1, QPointF c2, QPointF c3) { - return QPointF(bezierInterpolate (dist, c0.x(), c1.x(), c2.x(), c3.x()), - bezierInterpolate (dist, c0.y(), c1.y(), c2.y(), c3.y())); -} - class Tikzit : public QObject { Q_OBJECT diff --git a/tikzit/src/util.cpp b/tikzit/src/util.cpp new file mode 100644 index 0000000..64716d2 --- /dev/null +++ b/tikzit/src/util.cpp @@ -0,0 +1,48 @@ +#include "util.h" + +float bezierInterpolate(float dist, float c0, float c1, float c2, float c3) { + float distp = 1 - dist; + return (distp*distp*distp) * c0 + + 3 * (distp*distp) * dist * c1 + + 3 * (dist*dist) * distp * c2 + + (dist*dist*dist) * c3; +} + +QPointF bezierInterpolateFull (float dist, QPointF c0, QPointF c1, QPointF c2, QPointF c3) { + return QPointF(bezierInterpolate (dist, c0.x(), c1.x(), c2.x(), c3.x()), + bezierInterpolate (dist, c0.y(), c1.y(), c2.y(), c3.y())); +} + + +float roundToNearest(float stepSize, float val) { + if (stepSize==0.0f) return val; + else return round(val/stepSize)*stepSize; +} + +float radiansToDegrees (float radians) { + return (radians * 180.0f) / M_PI; +} + +float degreesToRadians(float degrees) { + return (degrees * M_PI) / 180.0f; +} + +int normaliseAngleDeg (int degrees) { + while (degrees > 180) { + degrees -= 360; + } + while (degrees <= -180) { + degrees += 360; + } + return degrees; +} + +float normaliseAngleRad (float rads) { + while (rads > M_PI) { + rads -= 2 * M_PI; + } + while (rads <= -M_PI) { + rads += 2 * M_PI; + } + return rads; +} diff --git a/tikzit/src/util.h b/tikzit/src/util.h new file mode 100644 index 0000000..2952214 --- /dev/null +++ b/tikzit/src/util.h @@ -0,0 +1,24 @@ +/** + * Various utility functions, mostly for mathematical calculation. + */ + +#ifndef UTIL_H +#define UTIL_H + +#include +#include + +// interpolate on a cubic bezier curve +float bezierInterpolate(float dist, float c0, float c1, float c2, float c3); +QPointF bezierInterpolateFull (float dist, QPointF c0, QPointF c1, QPointF c2, QPointF c3); + +// rounding +float roundToNearest(float stepSize, float val); +float radiansToDegrees (float radians); + +// angles +float degreesToRadians(float degrees); +int normaliseAngleDeg (int degrees); +float normaliseAngleRad (float rads); + +#endif // UTIL_H diff --git a/tikzit/tikzit.pro b/tikzit/tikzit.pro index f1a1d54..b14822b 100644 --- a/tikzit/tikzit.pro +++ b/tikzit/tikzit.pro @@ -47,7 +47,8 @@ SOURCES += src/gui/mainwindow.cpp \ src/gui/commands.cpp \ src/data/tikzdocument.cpp \ src/gui/undocommands.cpp \ - src/gui/mainmenu.cpp + src/gui/mainmenu.cpp \ + src/util.cpp HEADERS += src/gui/mainwindow.h \ src/gui/toolpalette.h \ @@ -68,7 +69,8 @@ HEADERS += src/gui/mainwindow.h \ src/gui/commands.h \ src/data/tikzdocument.h \ src/gui/undocommands.h \ - src/gui/mainmenu.h + src/gui/mainmenu.h \ + src/util.h FORMS += src/gui/mainwindow.ui \ src/gui/propertypalette.ui \ -- cgit v1.2.3 From d8db367f6a4e49776834c82b092700dbda56cecc Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Fri, 22 Dec 2017 13:39:13 +0000 Subject: edge bend undo works --- tikzit/src/data/graph.cpp | 5 +++-- tikzit/src/gui/tikzscene.cpp | 20 +++++++++++++++++-- tikzit/src/gui/tikzscene.h | 5 +++++ tikzit/src/gui/undocommands.cpp | 43 +++++++++++++++++++++++++++++++++++++++++ tikzit/src/gui/undocommands.h | 21 ++++++++++++++++++++ 5 files changed, 90 insertions(+), 4 deletions(-) diff --git a/tikzit/src/data/graph.cpp b/tikzit/src/data/graph.cpp index 1985f8a..de3eb08 100644 --- a/tikzit/src/data/graph.cpp +++ b/tikzit/src/data/graph.cpp @@ -4,16 +4,17 @@ Graph::Graph(QObject *parent) : QObject(parent) { - _data = new GraphElementData(); + _data = new GraphElementData(this); _bbox = QRectF(0,0,0,0); } Graph::~Graph() { - delete _data; } void Graph::removeNode(Node *n) { + // the node itself is not deleted, as it may still be referenced in an undo command. It will + // be deleted when graph is, via QObject memory management. _nodes.removeAll(n); inEdges.remove(n); outEdges.remove(n); diff --git a/tikzit/src/gui/tikzscene.cpp b/tikzit/src/gui/tikzscene.cpp index b502f84..619d916 100644 --- a/tikzit/src/gui/tikzscene.cpp +++ b/tikzit/src/gui/tikzscene.cpp @@ -89,7 +89,13 @@ void TikzScene::mousePressEvent(QGraphicsSceneMouseEvent *event) if (_modifyEdgeItem != 0) { // disable rubber band drag, which will clear the selection views()[0]->setDragMode(QGraphicsView::NoDrag); - qDebug() << "Got a control point"; + + // store for undo purposes + Edge *e = _modifyEdgeItem->edge(); + _oldBend = e->bend(); + _oldInAngle = e->inAngle(); + _oldOutAngle = e->outAngle(); + _oldWeight = e->weight(); } else { // since we are not dragging a control point, process the click normally views()[0]->setDragMode(QGraphicsView::RubberBandDrag); @@ -124,6 +130,7 @@ void TikzScene::mouseMoveEvent(QGraphicsSceneMouseEvent *event) case ToolPalette::SELECT: if (_modifyEdgeItem != 0) { Edge *e = _modifyEdgeItem->edge(); + // dragging a control point QPointF src = toScreen(e->source()->point()); QPointF targ = toScreen(e->target()->point()); @@ -222,7 +229,16 @@ void TikzScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) case ToolPalette::SELECT: if (_modifyEdgeItem != 0) { // finished dragging a control point - // TODO + Edge *e = _modifyEdgeItem->edge(); + + if (_oldWeight != e->weight() || + _oldBend != e->bend() || + _oldInAngle != e->inAngle() || + _oldOutAngle != e->outAngle()) + { + EdgeBendCommand *cmd = new EdgeBendCommand(this, e, _oldWeight, _oldBend, _oldInAngle, _oldOutAngle); + _tikzDocument->undoStack()->push(cmd); + } _modifyEdgeItem = 0; } else { diff --git a/tikzit/src/gui/tikzscene.h b/tikzit/src/gui/tikzscene.h index cc7f4e4..db95d88 100644 --- a/tikzit/src/gui/tikzscene.h +++ b/tikzit/src/gui/tikzscene.h @@ -45,7 +45,12 @@ private: QVector _edgeItems; EdgeItem *_modifyEdgeItem; bool _firstControlPoint; + QMap _oldNodePositions; + float _oldWeight; + int _oldBend; + int _oldInAngle; + int _oldOutAngle; }; #endif // TIKZSCENE_H diff --git a/tikzit/src/gui/undocommands.cpp b/tikzit/src/gui/undocommands.cpp index c28611f..54741c8 100644 --- a/tikzit/src/gui/undocommands.cpp +++ b/tikzit/src/gui/undocommands.cpp @@ -35,3 +35,46 @@ void MoveCommand::redo() _scene->refreshAdjacentEdges(_newNodePositions.keys()); } + +EdgeBendCommand::EdgeBendCommand(TikzScene *scene, Edge *edge, + float oldWeight, int oldBend, + int oldInAngle, int oldOutAngle) : + _scene(scene), _edge(edge), + _oldWeight(oldWeight), _oldBend(oldBend), + _oldInAngle(oldInAngle), _oldOutAngle(oldOutAngle) +{ + _newWeight = edge->weight(); + _newBend = edge->bend(); + _newInAngle = edge->inAngle(); + _newOutAngle = edge->outAngle(); +} + +void EdgeBendCommand::undo() +{ + _edge->setWeight(_oldWeight); + _edge->setBend(_oldBend); + _edge->setInAngle(_oldInAngle); + _edge->setOutAngle(_oldOutAngle); + + foreach(EdgeItem *ei, _scene->edgeItems()) { + if (ei->edge() == _edge) { + ei->readPos(); + break; + } + } +} + +void EdgeBendCommand::redo() +{ + _edge->setWeight(_newWeight); + _edge->setBend(_newBend); + _edge->setInAngle(_newInAngle); + _edge->setOutAngle(_newOutAngle); + + foreach(EdgeItem *ei, _scene->edgeItems()) { + if (ei->edge() == _edge) { + ei->readPos(); + break; + } + } +} diff --git a/tikzit/src/gui/undocommands.h b/tikzit/src/gui/undocommands.h index bdf9ad2..bb6a8e9 100644 --- a/tikzit/src/gui/undocommands.h +++ b/tikzit/src/gui/undocommands.h @@ -24,4 +24,25 @@ private: QMap _newNodePositions; }; +class EdgeBendCommand : public QUndoCommand +{ +public: + explicit EdgeBendCommand(TikzScene *scene, Edge *edge, + float oldWeight, int oldBend, + int oldInAngle, int oldOutAngle); + void undo() override; + void redo() override; +private: + TikzScene *_scene; + Edge *_edge; + float _oldWeight; + int _oldBend; + int _oldInAngle; + int _oldOutAngle; + float _newWeight; + int _newBend; + int _newInAngle; + int _newOutAngle; +}; + #endif // UNDOCOMMANDS_H -- cgit v1.2.3 From fcc0fc080370c0c8e97a0c07043b83240d973cab Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Fri, 22 Dec 2017 16:19:28 +0000 Subject: graphs no longer allocate edges and nodes (but they do still own them) --- tikzit/src/data/graph.cpp | 15 +++++++++------ tikzit/src/data/graph.h | 4 ++-- tikzit/src/data/tikzparser.parser.cpp | 32 ++++++++++++++++++-------------- tikzit/src/data/tikzparser.y | 8 ++++++-- tikzit/src/gui/tikzscene.cpp | 15 +++++++++------ 5 files changed, 44 insertions(+), 30 deletions(-) diff --git a/tikzit/src/data/graph.cpp b/tikzit/src/data/graph.cpp index de3eb08..4329928 100644 --- a/tikzit/src/data/graph.cpp +++ b/tikzit/src/data/graph.cpp @@ -20,17 +20,19 @@ void Graph::removeNode(Node *n) { outEdges.remove(n); } -Edge *Graph::addEdge(Node *s, Node *t) +Edge *Graph::addEdge(Edge *e) { - Edge *e = new Edge(s, t, this); + e->setParent(this); _edges << e; - outEdges.insert(s, e); - inEdges.insert(t, e); + outEdges.insert(e->source(), e); + inEdges.insert(e->target(), e); return e; } void Graph::removeEdge(Edge *e) { + // the edge itself is not deleted, as it may still be referenced in an undo command. It will + // be deleted when graph is, via QObject memory management. _edges.removeAll(e); outEdges.remove(e->source(), e); inEdges.remove(e->target(), e); @@ -151,8 +153,9 @@ void Graph::setBbox(const QRectF &bbox) _bbox = bbox; } -Node *Graph::addNode() { - Node *n = new Node(this); +// add a node. The graph claims ownership. +Node *Graph::addNode(Node *n) { + n->setParent(this); _nodes << n; return n; } diff --git a/tikzit/src/data/graph.h b/tikzit/src/data/graph.h index 3f4e8d3..963def8 100644 --- a/tikzit/src/data/graph.h +++ b/tikzit/src/data/graph.h @@ -21,9 +21,9 @@ class Graph : public QObject public: explicit Graph(QObject *parent = 0); ~Graph(); - Node *addNode(); + Node *addNode(Node *n); void removeNode(Node *n); - Edge *addEdge(Node *s, Node*t); + Edge *addEdge(Edge *e); void removeEdge(Edge *e); GraphElementData *data() const; diff --git a/tikzit/src/data/tikzparser.parser.cpp b/tikzit/src/data/tikzparser.parser.cpp index 3dadb45..7d77d0c 100644 --- a/tikzit/src/data/tikzparser.parser.cpp +++ b/tikzit/src/data/tikzparser.parser.cpp @@ -531,8 +531,8 @@ static const yytype_uint8 yyrline[] = { 0, 124, 124, 130, 130, 131, 131, 131, 131, 133, 133, 136, 138, 140, 141, 148, 154, 156, 163, 169, - 169, 171, 172, 190, 190, 191, 198, 199, 201, 202, - 210, 246, 246, 247, 247, 248, 250 + 169, 171, 172, 192, 192, 193, 200, 201, 203, 204, + 212, 250, 250, 251, 251, 252, 254 }; #endif @@ -1600,7 +1600,8 @@ yyreduce: case 22: #line 173 "../tikzit/src/data/tikzparser.y" { - Node *node = assembler->graph()->addNode(); + Node *node = new Node(); + if ((yyvsp[(2) - (7)].data)) { node->setData((yyvsp[(2) - (7)].data)); } @@ -1613,22 +1614,23 @@ yyreduce: node->setPoint(*(yyvsp[(5) - (7)].pt)); delete (yyvsp[(5) - (7)].pt); + assembler->graph()->addNode(node); assembler->addNodeToMap(node); ;} break; case 23: -#line 190 "../tikzit/src/data/tikzparser.y" +#line 192 "../tikzit/src/data/tikzparser.y" { (yyval.str) = 0; ;} break; case 24: -#line 190 "../tikzit/src/data/tikzparser.y" +#line 192 "../tikzit/src/data/tikzparser.y" { (yyval.str) = (yyvsp[(2) - (2)].str); ;} break; case 25: -#line 192 "../tikzit/src/data/tikzparser.y" +#line 194 "../tikzit/src/data/tikzparser.y" { (yyval.noderef).node = assembler->nodeWithName(QString((yyvsp[(2) - (4)].str))); free((yyvsp[(2) - (4)].str)); @@ -1637,22 +1639,22 @@ yyreduce: break; case 26: -#line 198 "../tikzit/src/data/tikzparser.y" +#line 200 "../tikzit/src/data/tikzparser.y" { (yyval.noderef) = (yyvsp[(1) - (1)].noderef); ;} break; case 27: -#line 199 "../tikzit/src/data/tikzparser.y" +#line 201 "../tikzit/src/data/tikzparser.y" { (yyval.noderef).node = 0; (yyval.noderef).anchor = 0; ;} break; case 28: -#line 201 "../tikzit/src/data/tikzparser.y" +#line 203 "../tikzit/src/data/tikzparser.y" { (yyval.node) = 0; ;} break; case 29: -#line 203 "../tikzit/src/data/tikzparser.y" +#line 205 "../tikzit/src/data/tikzparser.y" { (yyval.node) = new Node(); if ((yyvsp[(2) - (3)].data)) @@ -1663,7 +1665,7 @@ yyreduce: break; case 30: -#line 211 "../tikzit/src/data/tikzparser.y" +#line 213 "../tikzit/src/data/tikzparser.y" { Node *s; Node *t; @@ -1676,7 +1678,7 @@ yyreduce: t = s; } - Edge *edge = assembler->graph()->addEdge(s, t); + Edge *edge = new Edge(s, t); if ((yyvsp[(2) - (7)].data)) { edge->setData((yyvsp[(2) - (7)].data)); edge->setAttributesFromData(); @@ -1697,11 +1699,13 @@ yyreduce: } else { edge->setTargetAnchor(edge->sourceAnchor()); } + + assembler->graph()->addEdge(edge); ;} break; case 36: -#line 251 "../tikzit/src/data/tikzparser.y" +#line 255 "../tikzit/src/data/tikzparser.y" { assembler->graph()->setBbox(QRectF(*(yyvsp[(3) - (6)].pt), *(yyvsp[(5) - (6)].pt))); delete (yyvsp[(3) - (6)].pt); @@ -1711,7 +1715,7 @@ yyreduce: /* Line 1267 of yacc.c. */ -#line 1715 "../tikzit/src/data/tikzparser.parser.cpp" +#line 1719 "../tikzit/src/data/tikzparser.parser.cpp" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); diff --git a/tikzit/src/data/tikzparser.y b/tikzit/src/data/tikzparser.y index eaf09eb..420b8a0 100644 --- a/tikzit/src/data/tikzparser.y +++ b/tikzit/src/data/tikzparser.y @@ -171,7 +171,8 @@ val: PROPSTRING { $$ = $1; } | DELIMITEDSTRING { $$ = $1; }; nodename: "(" REFSTRING ")" { $$ = $2; }; node: "\\node" optproperties nodename "at" COORD DELIMITEDSTRING ";" { - Node *node = assembler->graph()->addNode(); + Node *node = new Node(); + if ($2) { node->setData($2); } @@ -184,6 +185,7 @@ node: "\\node" optproperties nodename "at" COORD DELIMITEDSTRING ";" node->setPoint(*$5); delete $5; + assembler->graph()->addNode(node); assembler->addNodeToMap(node); }; @@ -220,7 +222,7 @@ edge: "\\draw" optproperties noderef "to" optedgenode optnoderef ";" t = s; } - Edge *edge = assembler->graph()->addEdge(s, t); + Edge *edge = new Edge(s, t); if ($2) { edge->setData($2); edge->setAttributesFromData(); @@ -241,6 +243,8 @@ edge: "\\draw" optproperties noderef "to" optedgenode optnoderef ";" } else { edge->setTargetAnchor(edge->sourceAnchor()); } + + assembler->graph()->addEdge(edge); }; ignoreprop: val | val "=" val; diff --git a/tikzit/src/gui/tikzscene.cpp b/tikzit/src/gui/tikzscene.cpp index 619d916..a900192 100644 --- a/tikzit/src/gui/tikzscene.cpp +++ b/tikzit/src/gui/tikzscene.cpp @@ -52,8 +52,11 @@ void TikzScene::graphReplaced() void TikzScene::mousePressEvent(QGraphicsSceneMouseEvent *event) { // current mouse position, in scene coordinates - QPointF mousePos(event->buttonDownScenePos(Qt::LeftButton).x(), - event->buttonDownScenePos(Qt::LeftButton).y()); + QPointF mousePos = event->scenePos(); + + // disable rubber band drag, which will clear the selection. Only re-enable it + // for the SELECT tool, and when no control point has been clicked. + views()[0]->setDragMode(QGraphicsView::NoDrag); // radius of a control point for bezier edges, in scene coordinates qreal cpR = GLOBAL_SCALEF * (0.05); @@ -87,9 +90,6 @@ void TikzScene::mousePressEvent(QGraphicsSceneMouseEvent *event) } if (_modifyEdgeItem != 0) { - // disable rubber band drag, which will clear the selection - views()[0]->setDragMode(QGraphicsView::NoDrag); - // store for undo purposes Edge *e = _modifyEdgeItem->edge(); _oldBend = e->bend(); @@ -123,7 +123,6 @@ void TikzScene::mousePressEvent(QGraphicsSceneMouseEvent *event) void TikzScene::mouseMoveEvent(QGraphicsSceneMouseEvent *event) { // current mouse position, in scene coordinates - QPointF mousePos = event->scenePos(); switch (tikzit->toolPalette()->currentTool()) { @@ -225,6 +224,9 @@ void TikzScene::mouseMoveEvent(QGraphicsSceneMouseEvent *event) void TikzScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { + // current mouse position, in scene coordinates + QPointF mousePos = event->scenePos(); + switch (tikzit->toolPalette()->currentTool()) { case ToolPalette::SELECT: if (_modifyEdgeItem != 0) { @@ -265,6 +267,7 @@ void TikzScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) break; case ToolPalette::VERTEX: + // TODO break; case ToolPalette::EDGE: break; -- cgit v1.2.3 From c63dd506beefa844ddeab587a71af94063357372 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Wed, 27 Dec 2017 23:27:20 +0000 Subject: adding and deleting nodes now works --- tikzit/src/data/edge.cpp | 4 +-- tikzit/src/data/graph.cpp | 43 +++++++++++++--------- tikzit/src/data/graph.h | 10 +++--- tikzit/src/data/node.cpp | 7 ++-- tikzit/src/data/node.h | 4 +-- tikzit/src/data/nodestyle.cpp | 2 ++ tikzit/src/data/nodestyle.h | 2 +- tikzit/src/gui/nodeitem.cpp | 10 +++--- tikzit/src/gui/nodeitem.h | 2 +- tikzit/src/gui/tikzscene.cpp | 65 +++++++++++++++++++++++++++------ tikzit/src/gui/tikzscene.h | 20 ++++++----- tikzit/src/gui/undocommands.cpp | 79 +++++++++++++++++++++++++++++++++++++++-- tikzit/src/gui/undocommands.h | 32 ++++++++++++++++- tikzit/src/tikzit.cpp | 35 ++++-------------- tikzit/src/tikzit.h | 4 +-- 15 files changed, 232 insertions(+), 87 deletions(-) diff --git a/tikzit/src/data/edge.cpp b/tikzit/src/data/edge.cpp index 3ff6c6e..6802b2d 100644 --- a/tikzit/src/data/edge.cpp +++ b/tikzit/src/data/edge.cpp @@ -117,14 +117,14 @@ void Edge::updateControls() { } // TODO: calculate head and tail properly, not just for circles - if (_source->style().isNone()) { + if (_source->style()->isNone()) { _tail = src; } else { _tail = QPointF(src.x() + std::cos(outAngleR) * 0.1, src.y() + std::sin(outAngleR) * 0.1); } - if (_target->style().isNone()) { + if (_target->style()->isNone()) { _head = targ; } else { _head = QPointF(targ.x() + std::cos(inAngleR) * 0.1, diff --git a/tikzit/src/data/graph.cpp b/tikzit/src/data/graph.cpp index 4329928..ba9a4c6 100644 --- a/tikzit/src/data/graph.cpp +++ b/tikzit/src/data/graph.cpp @@ -1,6 +1,10 @@ #include "graph.h" #include +#include +#include +#include +#include Graph::Graph(QObject *parent) : QObject(parent) { @@ -12,30 +16,42 @@ Graph::~Graph() { } +// add a node. The graph claims ownership. +void Graph::addNode(Node *n) { + n->setParent(this); + _nodes << n; +} + +void Graph::addNode(Node *n, int index) +{ + n->setParent(this); + _nodes.insert(index, n); +} + void Graph::removeNode(Node *n) { // the node itself is not deleted, as it may still be referenced in an undo command. It will // be deleted when graph is, via QObject memory management. - _nodes.removeAll(n); - inEdges.remove(n); - outEdges.remove(n); + _nodes.removeOne(n); } -Edge *Graph::addEdge(Edge *e) + +void Graph::addEdge(Edge *e) { e->setParent(this); _edges << e; - outEdges.insert(e->source(), e); - inEdges.insert(e->target(), e); - return e; +} + +void Graph::addEdge(Edge *e, int index) +{ + e->setParent(this); + _edges.insert(index, e); } void Graph::removeEdge(Edge *e) { // the edge itself is not deleted, as it may still be referenced in an undo command. It will // be deleted when graph is, via QObject memory management. - _edges.removeAll(e); - outEdges.remove(e->source(), e); - inEdges.remove(e->target(), e); + _edges.removeOne(e); } GraphElementData *Graph::data() const @@ -153,11 +169,4 @@ void Graph::setBbox(const QRectF &bbox) _bbox = bbox; } -// add a node. The graph claims ownership. -Node *Graph::addNode(Node *n) { - n->setParent(this); - _nodes << n; - return n; -} - diff --git a/tikzit/src/data/graph.h b/tikzit/src/data/graph.h index 963def8..8856e5c 100644 --- a/tikzit/src/data/graph.h +++ b/tikzit/src/data/graph.h @@ -21,9 +21,11 @@ class Graph : public QObject public: explicit Graph(QObject *parent = 0); ~Graph(); - Node *addNode(Node *n); + void addNode(Node *n); + void addNode(Node *n, int index); void removeNode(Node *n); - Edge *addEdge(Edge *e); + void addEdge(Edge *e); + void addEdge(Edge *e, int index); void removeEdge(Edge *e); GraphElementData *data() const; @@ -45,8 +47,8 @@ public slots: private: QVector _nodes; QVector _edges; - QMultiHash inEdges; - QMultiHash outEdges; + //QMultiHash inEdges; + //QMultiHash outEdges; GraphElementData *_data; QRectF _bbox; }; diff --git a/tikzit/src/data/node.cpp b/tikzit/src/data/node.cpp index 1b8ccf8..f94a3df 100644 --- a/tikzit/src/data/node.cpp +++ b/tikzit/src/data/node.cpp @@ -6,7 +6,7 @@ Node::Node(QObject *parent) : QObject(parent) { _data = new GraphElementData(); - _style = NodeStyle(); + _style = noneStyle; _styleName = "none"; } @@ -69,12 +69,11 @@ void Node::setStyleName(const QString &styleName) void Node::attachStyle() { - if (_styleName == "none") _style = NodeStyle(); + if (_styleName == "none") _style = noneStyle; else _style = tikzit->nodeStyle(_styleName); } -NodeStyle Node::style() const +NodeStyle *Node::style() const { return _style; } - diff --git a/tikzit/src/data/node.h b/tikzit/src/data/node.h index 91b1725..ee70835 100644 --- a/tikzit/src/data/node.h +++ b/tikzit/src/data/node.h @@ -31,7 +31,7 @@ public: void setStyleName(const QString &styleName); void attachStyle(); - NodeStyle style() const; + NodeStyle *style() const; signals: @@ -42,7 +42,7 @@ private: QString _name; QString _label; QString _styleName; - NodeStyle _style; + NodeStyle *_style; GraphElementData *_data; }; diff --git a/tikzit/src/data/nodestyle.cpp b/tikzit/src/data/nodestyle.cpp index 109e2af..7eca791 100644 --- a/tikzit/src/data/nodestyle.cpp +++ b/tikzit/src/data/nodestyle.cpp @@ -1,5 +1,7 @@ #include "nodestyle.h" +NodeStyle *noneStyle = new NodeStyle(); + NodeStyle::NodeStyle() { name = "none"; diff --git a/tikzit/src/data/nodestyle.h b/tikzit/src/data/nodestyle.h index baf967c..00d1b20 100644 --- a/tikzit/src/data/nodestyle.h +++ b/tikzit/src/data/nodestyle.h @@ -21,6 +21,6 @@ public: int strokeThickness; }; -extern NodeStyle noneStyle; +extern NodeStyle *noneStyle; #endif // NODESTYLE_H diff --git a/tikzit/src/gui/nodeitem.cpp b/tikzit/src/gui/nodeitem.cpp index 40b4de9..71226f3 100644 --- a/tikzit/src/gui/nodeitem.cpp +++ b/tikzit/src/gui/nodeitem.cpp @@ -41,9 +41,9 @@ QRectF NodeItem::labelRect() const { return rect; } -void NodeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) +void NodeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) { - if (_node->style().isNone()) { + if (_node->style()->isNone()) { QColor c(180,180,200); painter->setPen(QPen(c)); painter->setBrush(QBrush(c)); @@ -57,10 +57,10 @@ void NodeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, painter->setBrush(Qt::NoBrush); painter->drawPath(shape()); } else { - QPen pen(_node->style().strokeColor); - pen.setWidth(_node->style().strokeThickness); + QPen pen(_node->style()->strokeColor); + pen.setWidth(_node->style()->strokeThickness); painter->setPen(pen); - painter->setBrush(QBrush(_node->style().fillColor)); + painter->setBrush(QBrush(_node->style()->fillColor)); painter->drawPath(shape()); } diff --git a/tikzit/src/gui/nodeitem.h b/tikzit/src/gui/nodeitem.h index d0f1e62..9a3edb0 100644 --- a/tikzit/src/gui/nodeitem.h +++ b/tikzit/src/gui/nodeitem.h @@ -18,7 +18,7 @@ public: NodeItem(Node *node); void readPos(); void writePos(); - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *); QVariant itemChange(GraphicsItemChange change, const QVariant &value); QPainterPath shape() const; QRectF boundingRect() const; diff --git a/tikzit/src/gui/tikzscene.cpp b/tikzit/src/gui/tikzscene.cpp index a900192..2d9b49f 100644 --- a/tikzit/src/gui/tikzscene.cpp +++ b/tikzit/src/gui/tikzscene.cpp @@ -17,7 +17,7 @@ TikzScene::TikzScene(TikzDocument *tikzDocument, QObject *parent) : TikzScene::~TikzScene() { } -Graph *TikzScene::graph() const +Graph *TikzScene::graph() { return _tikzDocument->graph(); } @@ -38,13 +38,13 @@ void TikzScene::graphReplaced() foreach (Edge *e, graph()->edges()) { EdgeItem *ei = new EdgeItem(e); - _edgeItems << ei; + _edgeItems.insert(e, ei); addItem(ei); } foreach (Node *n, graph()->nodes()) { NodeItem *ni = new NodeItem(n); - _nodeItems << ni; + _nodeItems.insert(n, ni); addItem(ni); } } @@ -267,7 +267,14 @@ void TikzScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) break; case ToolPalette::VERTEX: - // TODO + { + int gridSize = GLOBAL_SCALE / 8; + QPointF gridPos(round(mousePos.x()/gridSize)*gridSize, round(mousePos.y()/gridSize)*gridSize); + Node *n = new Node(); + n->setPoint(fromScreen(gridPos)); + AddNodeCommand *cmd = new AddNodeCommand(this, n); + _tikzDocument->undoStack()->push(cmd); + } break; case ToolPalette::EDGE: break; @@ -276,6 +283,44 @@ void TikzScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) } } +void TikzScene::keyReleaseEvent(QKeyEvent *event) +{ + if (event->key() == Qt::Key_Backspace || event->key() == Qt::Key_Delete) { + QSet selNodes; + QSet selEdges; + getSelection(selNodes, selEdges); + + QMap deleteNodes; + QMap deleteEdges; + + for (int i = 0; i < _tikzDocument->graph()->nodes().length(); ++i) { + Node *n = _tikzDocument->graph()->nodes()[i]; + if (selNodes.contains(n)) deleteNodes.insert(i, n); + } + + for (int i = 0; i < _tikzDocument->graph()->edges().length(); ++i) { + Edge *e = _tikzDocument->graph()->edges()[i]; + if (selEdges.contains(e) || + selNodes.contains(e->source()) || + selNodes.contains(e->target())) deleteEdges.insert(i, e); + } + + //qDebug() << "nodes:" << deleteNodes; + //qDebug() << "edges:" << deleteEdges; + DeleteCommand *cmd = new DeleteCommand(this, deleteNodes, deleteEdges, selEdges); + _tikzDocument->undoStack()->push(cmd); + } +} + +void TikzScene::getSelection(QSet &selNodes, QSet &selEdges) +{ + foreach (QGraphicsItem *gi, selectedItems()) { + if (NodeItem *ni = dynamic_cast(gi)) selNodes << ni->node(); + if (EdgeItem *ei = dynamic_cast(gi)) selEdges << ei->edge(); + } +} + + TikzDocument *TikzScene::tikzDocument() const { return _tikzDocument; @@ -287,11 +332,6 @@ void TikzScene::setTikzDocument(TikzDocument *tikzDocument) graphReplaced(); } -QVector TikzScene::edgeItems() const -{ - return _edgeItems; -} - void TikzScene::refreshAdjacentEdges(QList nodes) { if (nodes.empty()) return; @@ -303,7 +343,12 @@ void TikzScene::refreshAdjacentEdges(QList nodes) } } -QVector TikzScene::nodeItems() const +QMap &TikzScene::nodeItems() { return _nodeItems; } + +QMap &TikzScene::edgeItems() +{ + return _edgeItems; +} diff --git a/tikzit/src/gui/tikzscene.h b/tikzit/src/gui/tikzscene.h index db95d88..a9af34b 100644 --- a/tikzit/src/gui/tikzscene.h +++ b/tikzit/src/gui/tikzscene.h @@ -25,9 +25,9 @@ class TikzScene : public QGraphicsScene public: TikzScene(TikzDocument *tikzDocument, QObject *parent); ~TikzScene(); - Graph *graph() const; - QVector nodeItems() const; - QVector edgeItems() const; + Graph *graph(); + QMap &nodeItems(); + QMap &edgeItems(); void refreshAdjacentEdges(QList nodes); TikzDocument *tikzDocument() const; @@ -35,14 +35,16 @@ public: public slots: void graphReplaced(); + protected: - void mousePressEvent(QGraphicsSceneMouseEvent *event); - void mouseMoveEvent(QGraphicsSceneMouseEvent *event); - void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); + void mousePressEvent(QGraphicsSceneMouseEvent *event) override; + void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; + void keyReleaseEvent(QKeyEvent *event) override; private: TikzDocument *_tikzDocument; - QVector _nodeItems; - QVector _edgeItems; + QMap _nodeItems; + QMap _edgeItems; EdgeItem *_modifyEdgeItem; bool _firstControlPoint; @@ -51,6 +53,8 @@ private: int _oldBend; int _oldInAngle; int _oldOutAngle; + + void getSelection(QSet &selNodes, QSet &selEdges); }; #endif // TIKZSCENE_H diff --git a/tikzit/src/gui/undocommands.cpp b/tikzit/src/gui/undocommands.cpp index 54741c8..997bf75 100644 --- a/tikzit/src/gui/undocommands.cpp +++ b/tikzit/src/gui/undocommands.cpp @@ -1,4 +1,6 @@ #include "undocommands.h" +#include "nodeitem.h" +#include "edgeitem.h" MoveCommand::MoveCommand(TikzScene *scene, QMap oldNodePositions, @@ -8,8 +10,7 @@ MoveCommand::MoveCommand(TikzScene *scene, _scene(scene), _oldNodePositions(oldNodePositions), _newNodePositions(newNodePositions) -{ -} +{} void MoveCommand::undo() @@ -78,3 +79,77 @@ void EdgeBendCommand::redo() } } } + +DeleteCommand::DeleteCommand(TikzScene *scene, + QMap deleteNodes, + QMap deleteEdges, + QSet selEdges) : + _scene(scene), _deleteNodes(deleteNodes), + _deleteEdges(deleteEdges), _selEdges(selEdges) +{} + +void DeleteCommand::undo() +{ + for (auto it = _deleteNodes.begin(); it != _deleteNodes.end(); ++it) { + Node *n = it.value(); + _scene->graph()->addNode(n, it.key()); + NodeItem *ni = new NodeItem(n); + _scene->nodeItems().insert(n, ni); + _scene->addItem(ni); + ni->setSelected(true); + } + + for (auto it = _deleteEdges.begin(); it != _deleteEdges.end(); ++it) { + Edge *e = it.value(); + _scene->graph()->addEdge(e, it.key()); + EdgeItem *ei = new EdgeItem(e); + _scene->edgeItems().insert(e, ei); + _scene->addItem(ei); + + if (_selEdges.contains(e)) ei->setSelected(true); + } +} + +void DeleteCommand::redo() +{ + foreach (Edge *e, _deleteEdges.values()) { + EdgeItem *ei = _scene->edgeItems()[e]; + _scene->edgeItems().remove(e); + _scene->removeItem(ei); + delete ei; + + _scene->graph()->removeEdge(e); + } + + foreach (Node *n, _deleteNodes.values()) { + NodeItem *ni = _scene->nodeItems()[n]; + _scene->nodeItems().remove(n); + _scene->removeItem(ni); + delete ni; + + _scene->graph()->removeNode(n); + } +} + +AddNodeCommand::AddNodeCommand(TikzScene *scene, Node *node) : + _scene(scene), _node(node) +{} + +void AddNodeCommand::undo() +{ + NodeItem *ni = _scene->nodeItems()[_node]; + _scene->removeItem(ni); + _scene->nodeItems().remove(_node); + delete ni; + + _scene->graph()->removeNode(_node); +} + +void AddNodeCommand::redo() +{ + // TODO: get the current style + _scene->graph()->addNode(_node); + NodeItem *ni = new NodeItem(_node); + _scene->nodeItems().insert(_node, ni); + _scene->addItem(ni); +} diff --git a/tikzit/src/gui/undocommands.h b/tikzit/src/gui/undocommands.h index bb6a8e9..c1b4910 100644 --- a/tikzit/src/gui/undocommands.h +++ b/tikzit/src/gui/undocommands.h @@ -1,5 +1,8 @@ /** - * These classes store the data required to undo/redo a single UI action. + * All changes to a TikzDocument are done via subclasses of QUndoCommand. When a controller + * (e.g. TikzScene) gets input from the user to change the document, it will push one of + * these commands onto the TikzDocument's undo stack, which automatically calls the redo() + * method of the command. */ #ifndef UNDOCOMMANDS_H @@ -45,4 +48,31 @@ private: int _newOutAngle; }; +class DeleteCommand : public QUndoCommand +{ +public: + explicit DeleteCommand(TikzScene *scene, + QMap deleteNodes, + QMap deleteEdges, + QSet selEdges); + void undo() override; + void redo() override; +private: + TikzScene *_scene; + QMap _deleteNodes; + QMap _deleteEdges; + QSet _selEdges; +}; + +class AddNodeCommand : public QUndoCommand +{ +public: + explicit AddNodeCommand(TikzScene *scene, Node *node); + void undo() override; + void redo() override; +private: + TikzScene *_scene; + Node *_node; +}; + #endif // UNDOCOMMANDS_H diff --git a/tikzit/src/tikzit.cpp b/tikzit/src/tikzit.cpp index 94fc644..42d16e8 100644 --- a/tikzit/src/tikzit.cpp +++ b/tikzit/src/tikzit.cpp @@ -43,32 +43,11 @@ PropertyPalette *Tikzit::propertyPalette() const return _propertyPalette; } -//void Tikzit::createMenu() -//{ -// _mainMenu = new QMenuBar(0); -// QMenu *file = _mainMenu->addMenu(tr("&File")); -// QAction *aNew = file->addAction(tr("&New")); -// aNew->setShortcut(QKeySequence::New); -// QAction *aOpen = file->addAction(tr("&Open")); -// aOpen->setShortcut(QKeySequence::Open); - -// QMenu *view = _mainMenu->addMenu(tr("&View")); -// QAction *aZoomIn = view->addAction(tr("Zoom &In")); -// aZoomIn->setShortcut(QKeySequence::ZoomIn); -// QAction *aZoomOut = view->addAction(tr("Zoom &Out")); -// aZoomOut->setShortcut(QKeySequence::ZoomOut); - -// connect(aNew, SIGNAL(triggered()), this, SLOT(newDoc())); -// connect(aOpen, SIGNAL(triggered()), this, SLOT(open())); -// connect(aZoomIn, SIGNAL(triggered()), this, SLOT(zoomIn())); -// connect(aZoomOut, SIGNAL(triggered()), this, SLOT(zoomOut())); -//} - void Tikzit::loadStyles() { - _nodeStyles << NodeStyle("black dot", NodeShape::Circle, Qt::black, Qt::black, 1); - _nodeStyles << NodeStyle("white dot", NodeShape::Circle, Qt::white, Qt::black, 1); - _nodeStyles << NodeStyle("gray dot", NodeShape::Circle, Qt::gray, Qt::black, 1); + _nodeStyles << new NodeStyle("black dot", NodeShape::Circle, Qt::black, Qt::black, 1); + _nodeStyles << new NodeStyle("white dot", NodeShape::Circle, Qt::white, Qt::black, 1); + _nodeStyles << new NodeStyle("gray dot", NodeShape::Circle, Qt::gray, Qt::black, 1); } void Tikzit::newDoc() @@ -97,11 +76,11 @@ void Tikzit::removeWindow(MainWindow *w) } } -NodeStyle Tikzit::nodeStyle(QString name) +NodeStyle *Tikzit::nodeStyle(QString name) { - foreach (NodeStyle s , _nodeStyles) - if (s.name == name) return s; - return NodeStyle(name, NodeShape::Circle, Qt::white); + foreach (NodeStyle *s , _nodeStyles) + if (s->name == name) return s; + return noneStyle; //NodeStyle(name, NodeShape::Circle, Qt::white); } void Tikzit::open() diff --git a/tikzit/src/tikzit.h b/tikzit/src/tikzit.h index bf4f7f1..deb683e 100644 --- a/tikzit/src/tikzit.h +++ b/tikzit/src/tikzit.h @@ -43,7 +43,7 @@ public: MainWindow *activeWindow() const; void setActiveWindow(MainWindow *activeWindow); void removeWindow(MainWindow *w); - NodeStyle nodeStyle(QString name); + NodeStyle *nodeStyle(QString name); static QFont LABEL_FONT; // Ui::MainMenu *_mainMenuUi; @@ -61,7 +61,7 @@ private: PropertyPalette *_propertyPalette; QVector _windows; MainWindow *_activeWindow; - QVector _nodeStyles; + QVector _nodeStyles; }; -- cgit v1.2.3 From 9d9bb836a1b83fab5bc408ffd7d4305e0d8b965a Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Wed, 3 Jan 2018 22:32:37 +0100 Subject: fixed jumping when nodes are added --- tikzit/src/gui/mainwindow.ui | 4 ++-- tikzit/src/gui/tikzscene.cpp | 32 +++++++++++++++++++++++++++++++- tikzit/src/gui/tikzscene.h | 2 ++ tikzit/src/gui/tikzview.cpp | 1 + tikzit/src/gui/undocommands.cpp | 13 ++++++++++--- tikzit/src/gui/undocommands.h | 4 +++- tikzit/tikzit.pro.user | 2 +- 7 files changed, 50 insertions(+), 8 deletions(-) diff --git a/tikzit/src/gui/mainwindow.ui b/tikzit/src/gui/mainwindow.ui index 8c7e8ae..56a5c2d 100644 --- a/tikzit/src/gui/mainwindow.ui +++ b/tikzit/src/gui/mainwindow.ui @@ -6,8 +6,8 @@ 0 0 - 476 - 378 + 640 + 480 diff --git a/tikzit/src/gui/tikzscene.cpp b/tikzit/src/gui/tikzscene.cpp index 2d9b49f..3431c0c 100644 --- a/tikzit/src/gui/tikzscene.cpp +++ b/tikzit/src/gui/tikzscene.cpp @@ -12,6 +12,16 @@ TikzScene::TikzScene(TikzDocument *tikzDocument, QObject *parent) : QGraphicsScene(parent), _tikzDocument(tikzDocument) { _modifyEdgeItem = 0; + _drawEdgeItem = new QGraphicsLineItem(); + setSceneRect(-310,-230,620,450); + + QPen pen; + pen.setColor(QColor::fromRgbF(0.5f, 0.0f, 0.5f)); + pen.setWidth(3); + _drawEdgeItem->setPen(pen); + _drawEdgeItem->setLine(0,0,0,0); + _drawEdgeItem->setVisible(false); + addItem(_drawEdgeItem); } TikzScene::~TikzScene() { @@ -272,7 +282,13 @@ void TikzScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) QPointF gridPos(round(mousePos.x()/gridSize)*gridSize, round(mousePos.y()/gridSize)*gridSize); Node *n = new Node(); n->setPoint(fromScreen(gridPos)); - AddNodeCommand *cmd = new AddNodeCommand(this, n); + + QRectF grow(gridPos.x() - GLOBAL_SCALEF, gridPos.y() - GLOBAL_SCALEF, 2 * GLOBAL_SCALEF, 2 * GLOBAL_SCALEF); + QRectF newBounds = sceneRect().united(grow); + qDebug() << grow; + qDebug() << newBounds; + + AddNodeCommand *cmd = new AddNodeCommand(this, n, newBounds); _tikzDocument->undoStack()->push(cmd); } break; @@ -343,6 +359,20 @@ void TikzScene::refreshAdjacentEdges(QList nodes) } } +void TikzScene::setBounds(QRectF bounds) +{ + if (bounds != sceneRect()) { + if (!views().empty()) { + QGraphicsView *v = views().first(); + QPointF c = v->mapToScene(v->viewport()->rect().center()); + setSceneRect(bounds); + v->centerOn(c); + } else { + setSceneRect(bounds); + } + } +} + QMap &TikzScene::nodeItems() { return _nodeItems; diff --git a/tikzit/src/gui/tikzscene.h b/tikzit/src/gui/tikzscene.h index a9af34b..6817792 100644 --- a/tikzit/src/gui/tikzscene.h +++ b/tikzit/src/gui/tikzscene.h @@ -29,6 +29,7 @@ public: QMap &nodeItems(); QMap &edgeItems(); void refreshAdjacentEdges(QList nodes); + void setBounds(QRectF bounds); TikzDocument *tikzDocument() const; void setTikzDocument(TikzDocument *tikzDocument); @@ -45,6 +46,7 @@ private: TikzDocument *_tikzDocument; QMap _nodeItems; QMap _edgeItems; + QGraphicsLineItem *_drawEdgeItem; EdgeItem *_modifyEdgeItem; bool _firstControlPoint; diff --git a/tikzit/src/gui/tikzview.cpp b/tikzit/src/gui/tikzview.cpp index a83c9ec..fe6c401 100644 --- a/tikzit/src/gui/tikzview.cpp +++ b/tikzit/src/gui/tikzview.cpp @@ -7,6 +7,7 @@ TikzView::TikzView(QWidget *parent) : QGraphicsView(parent) { setRenderHint(QPainter::Antialiasing); setDragMode(QGraphicsView::RubberBandDrag); + _scale = 1.0f; } diff --git a/tikzit/src/gui/undocommands.cpp b/tikzit/src/gui/undocommands.cpp index 997bf75..736c258 100644 --- a/tikzit/src/gui/undocommands.cpp +++ b/tikzit/src/gui/undocommands.cpp @@ -2,6 +2,8 @@ #include "nodeitem.h" #include "edgeitem.h" +#include + MoveCommand::MoveCommand(TikzScene *scene, QMap oldNodePositions, QMap newNodePositions, @@ -131,9 +133,10 @@ void DeleteCommand::redo() } } -AddNodeCommand::AddNodeCommand(TikzScene *scene, Node *node) : - _scene(scene), _node(node) -{} +AddNodeCommand::AddNodeCommand(TikzScene *scene, Node *node, QRectF newBounds) : + _scene(scene), _node(node), _oldBounds(_scene->sceneRect()), _newBounds(newBounds) +{ +} void AddNodeCommand::undo() { @@ -143,6 +146,8 @@ void AddNodeCommand::undo() delete ni; _scene->graph()->removeNode(_node); + + _scene->setBounds(_oldBounds); } void AddNodeCommand::redo() @@ -152,4 +157,6 @@ void AddNodeCommand::redo() NodeItem *ni = new NodeItem(_node); _scene->nodeItems().insert(_node, ni); _scene->addItem(ni); + + _scene->setBounds(_newBounds); } diff --git a/tikzit/src/gui/undocommands.h b/tikzit/src/gui/undocommands.h index c1b4910..ffff876 100644 --- a/tikzit/src/gui/undocommands.h +++ b/tikzit/src/gui/undocommands.h @@ -67,12 +67,14 @@ private: class AddNodeCommand : public QUndoCommand { public: - explicit AddNodeCommand(TikzScene *scene, Node *node); + explicit AddNodeCommand(TikzScene *scene, Node *node, QRectF newBounds); void undo() override; void redo() override; private: TikzScene *_scene; Node *_node; + QRectF _oldBounds; + QRectF _newBounds; }; #endif // UNDOCOMMANDS_H diff --git a/tikzit/tikzit.pro.user b/tikzit/tikzit.pro.user index dd7fece..a068897 100644 --- a/tikzit/tikzit.pro.user +++ b/tikzit/tikzit.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId -- cgit v1.2.3 From fecef0396026b80c5aec736171e4842df7518af9 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Thu, 4 Jan 2018 15:57:29 +0100 Subject: ignore .pro.user files --- .gitignore | 1 + tikzit/tikzit.pro.user | 405 ------------------------------------------------- 2 files changed, 1 insertion(+), 405 deletions(-) delete mode 100644 tikzit/tikzit.pro.user diff --git a/.gitignore b/.gitignore index 99aae83..6f9a00e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ build-tikzit-* +*.pro.user diff --git a/tikzit/tikzit.pro.user b/tikzit/tikzit.pro.user deleted file mode 100644 index a068897..0000000 --- a/tikzit/tikzit.pro.user +++ /dev/null @@ -1,405 +0,0 @@ - - - - - - EnvironmentId - {9ea8f4d8-ca0f-4a38-b3dc-69a42bafa117} - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - qt - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 80 - true - true - 1 - true - false - 0 - true - true - 0 - 8 - true - 1 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - - ProjectExplorer.Project.Target.0 - - Desktop Qt 5.7.1 clang 64bit - Desktop Qt 5.7.1 clang 64bit - qt.57.clang_64_kit - 0 - 0 - 0 - - /Users/alek/git/tikzit/build-tikzit-Desktop_Qt_5_7_1_clang_64bit-Debug - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - /Users/alek/git/tikzit/build-tikzit-Desktop_Qt_5_7_1_clang_64bit-Release - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - - true - tikzit.app - macdeployqt - %{buildDir} - Custom Process Step - - ProjectExplorer.ProcessStep - - 3 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - - /Users/alek/git/tikzit/build-tikzit-Desktop_Qt_5_7_1_clang_64bit-Profile - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - true - false - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - - /Users/alek/git/tikzit/build-tikzit-Desktop_Qt_5_7_1_clang_64bit-Debug - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - "CONFIG += test" - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Test - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - 4 - - - 0 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy locally - - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - tikzit - - Qt4ProjectManager.Qt4RunConfiguration:/Users/alek/git/tikzit/tikzit/tikzit.pro - true - - tikzit.pro - false - - /Users/alek/git/tikzit/build-tikzit-Desktop_Qt_5_7_1_clang_64bit-Debug/tikzit.app/Contents/MacOS - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 18 - - - Version - 18 - - -- cgit v1.2.3 From 0421a96749743868554d44585050b1b3d04864d2 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Thu, 4 Jan 2018 15:58:21 +0100 Subject: removed website --- tikzit-1/.gitignore | 235 - tikzit-1/AH_latex_head.png | Bin 6334 -> 0 bytes tikzit-1/AH_latex_tail.png | Bin 6324 -> 0 bytes tikzit-1/AH_none.png | Bin 6183 -> 0 bytes tikzit-1/AH_plain_head.png | Bin 6298 -> 0 bytes tikzit-1/AH_plain_tail.png | Bin 6320 -> 0 bytes tikzit-1/COPYING | 340 - tikzit-1/DESIGN-GTK | 23 - tikzit-1/ED_arrow.png | Bin 6357 -> 0 bytes tikzit-1/ED_none.png | Bin 6190 -> 0 bytes tikzit-1/ED_tick.png | Bin 6258 -> 0 bytes tikzit-1/English.lproj/Credits.rtf | 18 - tikzit-1/English.lproj/CustomNodes.xib | 256 - tikzit-1/English.lproj/InfoPlist.strings | 2 - tikzit-1/English.lproj/MainMenu.xib | 453 - tikzit-1/English.lproj/Preamble.xib | 235 - tikzit-1/English.lproj/Preview.xib | 70 - tikzit-1/English.lproj/PropertyInspector.xib | 769 - tikzit-1/English.lproj/StylePalette.xib | 631 - tikzit-1/English.lproj/TikzDocument.xib | 161 - tikzit-1/English.lproj/UserDefaults.plist | 10 - .../Frameworks/SFBInspectors.framework/Headers | 1 - .../Frameworks/SFBInspectors.framework/Resources | 1 - .../SFBInspectors.framework/SFBInspectors | 1 - .../Versions/A/Headers/SFBInspectorPane.h | 31 - .../Versions/A/Headers/SFBInspectorPaneBody.h | 16 - .../Versions/A/Headers/SFBInspectorPaneHeader.h | 24 - .../Versions/A/Headers/SFBInspectorView.h | 17 - .../Versions/A/Headers/SFBViewSelector.h | 22 - .../Versions/A/Headers/SFBViewSelectorBar.h | 29 - .../Versions/A/Headers/SFBViewSelectorBarItem.h | 28 - .../A/Resources/English.lproj/InfoPlist.strings | Bin 92 -> 0 bytes .../Versions/A/Resources/Info.plist | 24 - .../Versions/A/SFBInspectors | Bin 280648 -> 0 bytes .../SFBInspectors.framework/Versions/Current | 1 - tikzit-1/Frameworks/Sparkle.framework/Headers | 1 - tikzit-1/Frameworks/Sparkle.framework/Resources | 1 - tikzit-1/Frameworks/Sparkle.framework/Sparkle | 1 - .../Versions/A/Headers/SUAppcast.h | 33 - .../Versions/A/Headers/SUAppcastItem.h | 47 - .../Versions/A/Headers/SUUpdater.h | 118 - .../A/Headers/SUVersionComparisonProtocol.h | 27 - .../Sparkle.framework/Versions/A/Headers/Sparkle.h | 21 - .../Versions/A/Resources/Info.plist | 24 - .../Versions/A/Resources/License.txt | 7 - .../Versions/A/Resources/SUModelTranslation.plist | 174 - .../Versions/A/Resources/SUStatus.nib/classes.nib | 56 - .../Versions/A/Resources/SUStatus.nib/info.nib | 20 - .../A/Resources/SUStatus.nib/keyedobjects.nib | Bin 7344 -> 0 bytes .../SUAutomaticUpdateAlert.nib/classes.nib | 50 - .../de.lproj/SUAutomaticUpdateAlert.nib/info.nib | 20 - .../SUAutomaticUpdateAlert.nib/keyedobjects.nib | Bin 7278 -> 0 bytes .../de.lproj/SUUpdateAlert.nib/classes.nib | 67 - .../Resources/de.lproj/SUUpdateAlert.nib/info.nib | 20 - .../de.lproj/SUUpdateAlert.nib/keyedobjects.nib | Bin 10493 -> 0 bytes .../SUUpdatePermissionPrompt.nib/classes.nib | 59 - .../de.lproj/SUUpdatePermissionPrompt.nib/info.nib | 20 - .../SUUpdatePermissionPrompt.nib/keyedobjects.nib | Bin 13189 -> 0 bytes .../Versions/A/Resources/de.lproj/Sparkle.strings | Bin 9806 -> 0 bytes .../SUAutomaticUpdateAlert.nib/classes.nib | 50 - .../en.lproj/SUAutomaticUpdateAlert.nib/info.nib | 20 - .../SUAutomaticUpdateAlert.nib/keyedobjects.nib | Bin 7148 -> 0 bytes .../en.lproj/SUUpdateAlert.nib/classes.nib | 67 - .../Resources/en.lproj/SUUpdateAlert.nib/info.nib | 20 - .../en.lproj/SUUpdateAlert.nib/keyedobjects.nib | Bin 10623 -> 0 bytes .../SUUpdatePermissionPrompt.nib/classes.nib | 59 - .../en.lproj/SUUpdatePermissionPrompt.nib/info.nib | 21 - .../SUUpdatePermissionPrompt.nib/keyedobjects.nib | Bin 13263 -> 0 bytes .../Versions/A/Resources/en.lproj/Sparkle.strings | Bin 8216 -> 0 bytes .../SUAutomaticUpdateAlert.nib/classes.nib | 50 - .../es.lproj/SUAutomaticUpdateAlert.nib/info.nib | 20 - .../SUAutomaticUpdateAlert.nib/keyedobjects.nib | Bin 7273 -> 0 bytes .../es.lproj/SUUpdateAlert.nib/classes.nib | 67 - .../Resources/es.lproj/SUUpdateAlert.nib/info.nib | 20 - .../es.lproj/SUUpdateAlert.nib/keyedobjects.nib | Bin 10668 -> 0 bytes .../SUUpdatePermissionPrompt.nib/classes.nib | 59 - .../es.lproj/SUUpdatePermissionPrompt.nib/info.nib | 20 - .../SUUpdatePermissionPrompt.nib/keyedobjects.nib | Bin 13404 -> 0 bytes .../Versions/A/Resources/es.lproj/Sparkle.strings | Bin 8020 -> 0 bytes .../SUAutomaticUpdateAlert.nib/classes.nib | 50 - .../fr.lproj/SUAutomaticUpdateAlert.nib/info.nib | 16 - .../SUAutomaticUpdateAlert.nib/keyedobjects.nib | Bin 7245 -> 0 bytes .../fr.lproj/SUUpdateAlert.nib/classes.nib | 67 - .../Resources/fr.lproj/SUUpdateAlert.nib/info.nib | 16 - .../fr.lproj/SUUpdateAlert.nib/keyedobjects.nib | Bin 10338 -> 0 bytes .../SUUpdatePermissionPrompt.nib/classes.nib | 59 - .../fr.lproj/SUUpdatePermissionPrompt.nib/info.nib | 16 - .../SUUpdatePermissionPrompt.nib/keyedobjects.nib | Bin 13156 -> 0 bytes .../Versions/A/Resources/fr.lproj/Sparkle.strings | Bin 8554 -> 0 bytes .../Versions/A/Resources/fr_CA.lproj | 1 - .../SUAutomaticUpdateAlert.nib/classes.nib | 50 - .../it.lproj/SUAutomaticUpdateAlert.nib/info.nib | 20 - .../SUAutomaticUpdateAlert.nib/keyedobjects.nib | Bin 7161 -> 0 bytes .../it.lproj/SUUpdateAlert.nib/classes.nib | 67 - .../Resources/it.lproj/SUUpdateAlert.nib/info.nib | 20 - .../it.lproj/SUUpdateAlert.nib/keyedobjects.nib | Bin 10360 -> 0 bytes .../SUUpdatePermissionPrompt.nib/classes.nib | 59 - .../it.lproj/SUUpdatePermissionPrompt.nib/info.nib | 20 - .../SUUpdatePermissionPrompt.nib/keyedobjects.nib | Bin 12659 -> 0 bytes .../Versions/A/Resources/it.lproj/Sparkle.strings | Bin 8914 -> 0 bytes .../SUAutomaticUpdateAlert.nib/classes.nib | 50 - .../nl.lproj/SUAutomaticUpdateAlert.nib/info.nib | 18 - .../SUAutomaticUpdateAlert.nib/keyedobjects.nib | Bin 7234 -> 0 bytes .../nl.lproj/SUUpdateAlert.nib/classes.nib | 67 - .../Resources/nl.lproj/SUUpdateAlert.nib/info.nib | 16 - .../nl.lproj/SUUpdateAlert.nib/keyedobjects.nib | Bin 10220 -> 0 bytes .../SUUpdatePermissionPrompt.nib/classes.nib | 59 - .../nl.lproj/SUUpdatePermissionPrompt.nib/info.nib | 16 - .../SUUpdatePermissionPrompt.nib/keyedobjects.nib | Bin 12535 -> 0 bytes .../Versions/A/Resources/nl.lproj/Sparkle.strings | Bin 8514 -> 0 bytes .../Versions/A/Resources/relaunch | Bin 58924 -> 0 bytes .../SUAutomaticUpdateAlert.nib/classes.nib | 50 - .../ru.lproj/SUAutomaticUpdateAlert.nib/info.nib | 20 - .../SUAutomaticUpdateAlert.nib/keyedobjects.nib | Bin 7675 -> 0 bytes .../ru.lproj/SUUpdateAlert.nib/classes.nib | 67 - .../Resources/ru.lproj/SUUpdateAlert.nib/info.nib | 20 - .../ru.lproj/SUUpdateAlert.nib/keyedobjects.nib | Bin 10895 -> 0 bytes .../SUUpdatePermissionPrompt.nib/classes.nib | 59 - .../ru.lproj/SUUpdatePermissionPrompt.nib/info.nib | 18 - .../SUUpdatePermissionPrompt.nib/keyedobjects.nib | Bin 12898 -> 0 bytes .../Versions/A/Resources/ru.lproj/Sparkle.strings | Bin 8364 -> 0 bytes .../SUAutomaticUpdateAlert.nib/classes.nib | 50 - .../sv.lproj/SUAutomaticUpdateAlert.nib/info.nib | 20 - .../SUAutomaticUpdateAlert.nib/keyedobjects.nib | Bin 7474 -> 0 bytes .../sv.lproj/SUUpdateAlert.nib/classes.nib | 39 - .../Resources/sv.lproj/SUUpdateAlert.nib/info.nib | 18 - .../sv.lproj/SUUpdateAlert.nib/keyedobjects.nib | Bin 10180 -> 0 bytes .../SUUpdatePermissionPrompt.nib/classes.nib | 59 - .../sv.lproj/SUUpdatePermissionPrompt.nib/info.nib | 20 - .../SUUpdatePermissionPrompt.nib/keyedobjects.nib | Bin 13483 -> 0 bytes .../Versions/A/Resources/sv.lproj/Sparkle.strings | Bin 8142 -> 0 bytes .../Sparkle.framework/Versions/A/Sparkle | Bin 463812 -> 0 bytes .../Frameworks/Sparkle.framework/Versions/Current | 1 - tikzit-1/INSTALL | 34 - tikzit-1/Makefile.am | 3 - tikzit-1/NEWS | 75 - tikzit-1/README | 7 - tikzit-1/README.release | 98 - tikzit-1/TODO | 15 - tikzit-1/TikZiT-Info.plist | 61 - tikzit-1/TikZiT.xcodeproj/project.pbxproj | 1322 - .../project.xcworkspace/contents.xcworkspacedata | 7 - .../xcshareddata/TikZiT.xccheckout | 37 - .../UserInterfaceState.xcuserstate | 24539 ------------------- .../aleks.xcuserdatad/WorkspaceSettings.xcsettings | 22 - .../xcdebugger/Breakpoints.xcbkptlist | 123 - .../aleks.xcuserdatad/xcschemes/TikZiT.xcscheme | 72 - .../aleks.xcuserdatad/xcschemes/tests.xcscheme | 72 - .../xcschemes/xcschememanagement.plist | 32 - tikzit-1/TikZiT_Prefix.pch | 30 - tikzit-1/autogen.sh | 1578 -- tikzit-1/build/DEBIAN/control | 11 - tikzit-1/configure.ac | 141 - tikzit-1/customshape.png | Bin 1281 -> 0 bytes tikzit-1/docs/Doxyfile | 1600 -- tikzit-1/draw-ellipse.png | Bin 3493 -> 0 bytes tikzit-1/draw-path.png | Bin 920 -> 0 bytes tikzit-1/emblem-important.png | Bin 717 -> 0 bytes tikzit-1/emblem-unreadable-grey.png | Bin 3554 -> 0 bytes tikzit-1/engine.png | Bin 1546 -> 0 bytes tikzit-1/format-indent-less.png | Bin 767 -> 0 bytes tikzit-1/m4/objc.m4 | 135 - tikzit-1/preamble.png | Bin 851 -> 0 bytes tikzit-1/scripts/generate_keys.rb | 13 - tikzit-1/scripts/prepare_release.sh | 40 - tikzit-1/scripts/sign_update.rb | 7 - tikzit-1/select-rectangular.png | Bin 499 -> 0 bytes tikzit-1/shapes/cap.tikz | 13 - tikzit-1/shapes/copants.tikz | 19 - tikzit-1/shapes/cup.tikz | 13 - tikzit-1/shapes/oval.tikz | 11 - tikzit-1/shapes/pants.tikz | 19 - tikzit-1/share/Makefile.am | 10 - tikzit-1/share/applications/tikzit.desktop | 11 - .../share/icons/hicolor/128x128/apps/tikzit.png | Bin 9098 -> 0 bytes .../hicolor/128x128/mimetypes/text-x-tikz.png | Bin 7316 -> 0 bytes tikzit-1/share/icons/hicolor/16x16/apps/tikzit.png | Bin 882 -> 0 bytes .../icons/hicolor/16x16/mimetypes/text-x-tikz.png | Bin 564 -> 0 bytes tikzit-1/share/icons/hicolor/22x22/apps/tikzit.png | Bin 1273 -> 0 bytes .../icons/hicolor/22x22/mimetypes/text-x-tikz.png | Bin 866 -> 0 bytes tikzit-1/share/icons/hicolor/24x24/apps/tikzit.png | Bin 1406 -> 0 bytes tikzit-1/share/icons/hicolor/32x32/apps/tikzit.png | Bin 1987 -> 0 bytes .../icons/hicolor/32x32/mimetypes/text-x-tikz.png | Bin 1352 -> 0 bytes tikzit-1/share/icons/hicolor/48x48/apps/tikzit.png | Bin 3132 -> 0 bytes .../icons/hicolor/48x48/mimetypes/text-x-tikz.png | Bin 2445 -> 0 bytes tikzit-1/share/icons/hicolor/64x64/apps/tikzit.png | Bin 4315 -> 0 bytes .../icons/hicolor/64x64/mimetypes/text-x-tikz.png | Bin 3532 -> 0 bytes .../share/icons/hicolor/scalable/apps/tikzit.svg | 79 - .../hicolor/scalable/mimetypes/text-x-tikz.svg | 488 - tikzit-1/share/mime/packages/tikzit.xml | 10 - tikzit-1/share/tikzit | 1 - tikzit-1/src/Makefile.am | 178 - tikzit-1/src/common/CircleShape.h | 33 - tikzit-1/src/common/CircleShape.m | 57 - tikzit-1/src/common/ColorRGB.h | 64 - tikzit-1/src/common/ColorRGB.m | 353 - tikzit-1/src/common/DiamondShape.h | 34 - tikzit-1/src/common/DiamondShape.m | 63 - tikzit-1/src/common/Edge.h | 401 - tikzit-1/src/common/Edge.m | 757 - tikzit-1/src/common/EdgeStyle.h | 71 - tikzit-1/src/common/EdgeStyle.m | 222 - tikzit-1/src/common/Graph.h | 401 - tikzit-1/src/common/Graph.m | 922 - tikzit-1/src/common/GraphChange.h | 344 - tikzit-1/src/common/GraphChange.m | 369 - tikzit-1/src/common/GraphElementData.h | 94 - tikzit-1/src/common/GraphElementData.m | 188 - tikzit-1/src/common/GraphElementProperty.h | 88 - tikzit-1/src/common/GraphElementProperty.m | 164 - tikzit-1/src/common/Grid.h | 110 - tikzit-1/src/common/Grid.m | 186 - tikzit-1/src/common/NSError+Tikzit.h | 44 - tikzit-1/src/common/NSError+Tikzit.m | 64 - tikzit-1/src/common/NSFileManager+Utils.h | 29 - tikzit-1/src/common/NSFileManager+Utils.m | 46 - tikzit-1/src/common/NSString+LatexConstants.h | 33 - tikzit-1/src/common/NSString+LatexConstants.m | 212 - tikzit-1/src/common/NSString+Tikz.h | 26 - tikzit-1/src/common/NSString+Tikz.m | 72 - tikzit-1/src/common/NSString+Util.h | 27 - tikzit-1/src/common/NSString+Util.m | 66 - tikzit-1/src/common/Node.h | 181 - tikzit-1/src/common/Node.m | 214 - tikzit-1/src/common/NodeStyle.h | 125 - tikzit-1/src/common/NodeStyle.m | 246 - tikzit-1/src/common/PickSupport.h | 164 - tikzit-1/src/common/PickSupport.m | 232 - tikzit-1/src/common/Preambles.h | 73 - tikzit-1/src/common/Preambles.m | 320 - tikzit-1/src/common/PropertyHolder.h | 36 - tikzit-1/src/common/PropertyHolder.m | 74 - tikzit-1/src/common/RColor.h | 50 - tikzit-1/src/common/RColor.m | 33 - tikzit-1/src/common/RectangleShape.h | 33 - tikzit-1/src/common/RectangleShape.m | 57 - tikzit-1/src/common/RegularPolyShape.h | 50 - tikzit-1/src/common/RegularPolyShape.m | 76 - tikzit-1/src/common/RenderContext.h | 156 - tikzit-1/src/common/Shape.h | 49 - tikzit-1/src/common/Shape.m | 171 - tikzit-1/src/common/ShapeNames.h | 27 - tikzit-1/src/common/StyleManager.h | 49 - tikzit-1/src/common/StyleManager.m | 378 - tikzit-1/src/common/SupportDir.h | 36 - tikzit-1/src/common/SupportDir.m | 65 - tikzit-1/src/common/TikzGraphAssembler+Parser.h | 36 - tikzit-1/src/common/TikzGraphAssembler.h | 115 - tikzit-1/src/common/TikzGraphAssembler.m | 310 - tikzit-1/src/common/TikzShape.h | 37 - tikzit-1/src/common/TikzShape.m | 70 - tikzit-1/src/common/Transformer.h | 154 - tikzit-1/src/common/Transformer.m | 231 - tikzit-1/src/common/test/Makefile | 14 - tikzit-1/src/common/test/color.m | 80 - tikzit-1/src/common/test/common.m | 34 - tikzit-1/src/common/test/maths.m | 562 - tikzit-1/src/common/test/parser.m | 86 - tikzit-1/src/common/test/test.h | 57 - tikzit-1/src/common/test/test.m | 175 - tikzit-1/src/common/tikzlexer.lm | 170 - tikzit-1/src/common/tikzparser.ym | 224 - tikzit-1/src/common/tikzparserdefs.h | 49 - tikzit-1/src/common/util.h | 201 - tikzit-1/src/common/util.m | 403 - tikzit-1/src/gtk/Application.h | 155 - tikzit-1/src/gtk/Application.m | 377 - tikzit-1/src/gtk/BoundingBoxTool.h | 45 - tikzit-1/src/gtk/BoundingBoxTool.m | 353 - tikzit-1/src/gtk/CairoRenderContext.h | 59 - tikzit-1/src/gtk/CairoRenderContext.m | 344 - tikzit-1/src/gtk/ColorRGB+Gtk.h | 30 - tikzit-1/src/gtk/ColorRGB+Gtk.m | 46 - tikzit-1/src/gtk/ColorRGB+IntegerListStorage.h | 32 - tikzit-1/src/gtk/ColorRGB+IntegerListStorage.m | 57 - tikzit-1/src/gtk/Configuration.h | 447 - tikzit-1/src/gtk/Configuration.m | 450 - tikzit-1/src/gtk/ContextWindow.h | 53 - tikzit-1/src/gtk/ContextWindow.m | 169 - tikzit-1/src/gtk/CreateEdgeTool.h | 45 - tikzit-1/src/gtk/CreateEdgeTool.m | 226 - tikzit-1/src/gtk/CreateNodeTool.h | 42 - tikzit-1/src/gtk/CreateNodeTool.m | 169 - tikzit-1/src/gtk/DocumentContext.h | 27 - tikzit-1/src/gtk/Edge+Render.h | 34 - tikzit-1/src/gtk/Edge+Render.m | 267 - tikzit-1/src/gtk/EdgeStyle+Gtk.h | 29 - tikzit-1/src/gtk/EdgeStyle+Gtk.m | 33 - tikzit-1/src/gtk/EdgeStyle+Storage.h | 29 - tikzit-1/src/gtk/EdgeStyle+Storage.m | 55 - tikzit-1/src/gtk/EdgeStyleEditor.h | 45 - tikzit-1/src/gtk/EdgeStyleEditor.m | 499 - tikzit-1/src/gtk/EdgeStyleSelector.h | 61 - tikzit-1/src/gtk/EdgeStyleSelector.m | 143 - tikzit-1/src/gtk/EdgeStylesModel.h | 62 - tikzit-1/src/gtk/EdgeStylesModel.m | 367 - tikzit-1/src/gtk/EdgeStylesPalette.h | 43 - tikzit-1/src/gtk/EdgeStylesPalette.m | 198 - tikzit-1/src/gtk/FileChooserDialog.h | 56 - tikzit-1/src/gtk/FileChooserDialog.m | 152 - tikzit-1/src/gtk/GraphEditorPanel.h | 53 - tikzit-1/src/gtk/GraphEditorPanel.m | 240 - tikzit-1/src/gtk/GraphRenderer.h | 84 - tikzit-1/src/gtk/GraphRenderer.m | 476 - tikzit-1/src/gtk/HandTool.h | 33 - tikzit-1/src/gtk/HandTool.m | 75 - tikzit-1/src/gtk/InputDelegate.h | 77 - tikzit-1/src/gtk/Menu.h | 86 - tikzit-1/src/gtk/Menu.m | 737 - tikzit-1/src/gtk/NSError+Glib.h | 28 - tikzit-1/src/gtk/NSError+Glib.m | 50 - tikzit-1/src/gtk/NSFileManager+Glib.h | 31 - tikzit-1/src/gtk/NSFileManager+Glib.m | 55 - tikzit-1/src/gtk/NSString+Glib.h | 50 - tikzit-1/src/gtk/NSString+Glib.m | 96 - tikzit-1/src/gtk/Node+Render.h | 44 - tikzit-1/src/gtk/Node+Render.m | 188 - tikzit-1/src/gtk/NodeStyle+Gtk.h | 31 - tikzit-1/src/gtk/NodeStyle+Gtk.m | 41 - tikzit-1/src/gtk/NodeStyle+Render.h | 30 - tikzit-1/src/gtk/NodeStyle+Storage.h | 29 - tikzit-1/src/gtk/NodeStyle+Storage.m | 62 - tikzit-1/src/gtk/NodeStyleEditor.h | 45 - tikzit-1/src/gtk/NodeStyleEditor.m | 477 - tikzit-1/src/gtk/NodeStyleSelector.h | 61 - tikzit-1/src/gtk/NodeStyleSelector.m | 135 - tikzit-1/src/gtk/NodeStylesModel.h | 62 - tikzit-1/src/gtk/NodeStylesModel.m | 381 - tikzit-1/src/gtk/NodeStylesPalette.h | 43 - tikzit-1/src/gtk/NodeStylesPalette.m | 197 - tikzit-1/src/gtk/PreambleEditor.h | 51 - tikzit-1/src/gtk/PreambleEditor.m | 568 - tikzit-1/src/gtk/Preambles+Storage.h | 29 - tikzit-1/src/gtk/Preambles+Storage.m | 84 - tikzit-1/src/gtk/PreviewRenderer.h | 48 - tikzit-1/src/gtk/PreviewRenderer.m | 250 - tikzit-1/src/gtk/PreviewWindow.h | 51 - tikzit-1/src/gtk/PreviewWindow.m | 195 - tikzit-1/src/gtk/PropertiesPane.h | 69 - tikzit-1/src/gtk/PropertiesPane.m | 763 - tikzit-1/src/gtk/PropertyListEditor.h | 65 - tikzit-1/src/gtk/PropertyListEditor.m | 501 - tikzit-1/src/gtk/RecentManager.h | 30 - tikzit-1/src/gtk/RecentManager.m | 74 - tikzit-1/src/gtk/SelectTool.h | 63 - tikzit-1/src/gtk/SelectTool.m | 590 - tikzit-1/src/gtk/SelectionPane.h | 56 - tikzit-1/src/gtk/SelectionPane.m | 432 - tikzit-1/src/gtk/SettingsDialog.h | 54 - tikzit-1/src/gtk/SettingsDialog.m | 328 - tikzit-1/src/gtk/Shape+Render.h | 29 - tikzit-1/src/gtk/Shape+Render.m | 57 - tikzit-1/src/gtk/StyleManager+Storage.h | 26 - tikzit-1/src/gtk/StyleManager+Storage.m | 82 - tikzit-1/src/gtk/Surface.h | 107 - tikzit-1/src/gtk/TZFoundation.h | 30 - tikzit-1/src/gtk/TikzDocument.h | 149 - tikzit-1/src/gtk/TikzDocument.m | 911 - tikzit-1/src/gtk/Tool.h | 41 - tikzit-1/src/gtk/ToolBox.h | 45 - tikzit-1/src/gtk/ToolBox.m | 280 - tikzit-1/src/gtk/WidgetSurface.h | 54 - tikzit-1/src/gtk/WidgetSurface.m | 630 - tikzit-1/src/gtk/Window.h | 182 - tikzit-1/src/gtk/Window.m | 991 - tikzit-1/src/gtk/cairo_helpers.h | 25 - tikzit-1/src/gtk/cairo_helpers.m | 28 - tikzit-1/src/gtk/clipboard.h | 41 - tikzit-1/src/gtk/clipboard.m | 57 - tikzit-1/src/gtk/gtkhelpers.h | 60 - tikzit-1/src/gtk/gtkhelpers.m | 275 - tikzit-1/src/gtk/logo.h | 32 - tikzit-1/src/gtk/logo.m | 64 - tikzit-1/src/gtk/main.m | 111 - tikzit-1/src/gtk/mkdtemp.h | 32 - tikzit-1/src/gtk/mkdtemp.m | 180 - tikzit-1/src/gtk/stat.h | 25 - tikzit-1/src/gtk/test/gtk.m | 27 - tikzit-1/src/gtk/test/main.m | 50 - tikzit-1/src/gtk/tzstockitems.h | 26 - tikzit-1/src/gtk/tzstockitems.m | 64 - tikzit-1/src/gtk/tztoolpalette.h | 56 - tikzit-1/src/gtk/tztoolpalette.m | 158 - tikzit-1/src/osx/AppDelegate.h | 57 - tikzit-1/src/osx/AppDelegate.m | 124 - tikzit-1/src/osx/CALayer+DrawLabel.h | 21 - tikzit-1/src/osx/CALayer+DrawLabel.m | 84 - tikzit-1/src/osx/CoreGraphicsRenderContext.h | 44 - tikzit-1/src/osx/CoreGraphicsRenderContext.m | 234 - tikzit-1/src/osx/CustomNodeCellView.h | 23 - tikzit-1/src/osx/CustomNodeCellView.m | 83 - tikzit-1/src/osx/CustomNodeController.h | 35 - tikzit-1/src/osx/CustomNodeController.m | 58 - tikzit-1/src/osx/CustomNodes.xib | 249 - tikzit-1/src/osx/DraggablePDFView.h | 28 - tikzit-1/src/osx/DraggablePDFView.m | 60 - tikzit-1/src/osx/EdgeControlLayer.h | 44 - tikzit-1/src/osx/EdgeControlLayer.m | 150 - tikzit-1/src/osx/EdgeStyle+Coder.h | 30 - tikzit-1/src/osx/EdgeStyle+Coder.m | 50 - tikzit-1/src/osx/Graph+Coder.h | 17 - tikzit-1/src/osx/Graph+Coder.m | 24 - tikzit-1/src/osx/GraphicsView.h | 129 - tikzit-1/src/osx/GraphicsView.m | 1216 - tikzit-1/src/osx/Grid.h | 48 - tikzit-1/src/osx/Grid.m | 152 - tikzit-1/src/osx/MultiCombo.h | 18 - tikzit-1/src/osx/MultiCombo.m | 38 - tikzit-1/src/osx/MultiField.h | 18 - tikzit-1/src/osx/MultiField.m | 53 - tikzit-1/src/osx/NilToEmptyStringTransformer.h | 28 - tikzit-1/src/osx/NilToEmptyStringTransformer.m | 53 - tikzit-1/src/osx/NodeLayer.h | 62 - tikzit-1/src/osx/NodeLayer.m | 238 - tikzit-1/src/osx/NodeSelectionLayer.h | 45 - tikzit-1/src/osx/NodeSelectionLayer.m | 93 - tikzit-1/src/osx/NodeStyle+Coder.h | 36 - tikzit-1/src/osx/NodeStyle+Coder.m | 91 - tikzit-1/src/osx/ParseErrorView.h | 13 - tikzit-1/src/osx/ParseErrorView.m | 40 - tikzit-1/src/osx/PreambleController.h | 57 - tikzit-1/src/osx/PreambleController.m | 168 - tikzit-1/src/osx/Preambles+Coder.h | 32 - tikzit-1/src/osx/Preambles+Coder.m | 41 - tikzit-1/src/osx/PreferenceController.h | 49 - tikzit-1/src/osx/PreferenceController.m | 133 - tikzit-1/src/osx/Preferences.xib | 1165 - tikzit-1/src/osx/PreviewController.h | 52 - tikzit-1/src/osx/PreviewController.m | 147 - tikzit-1/src/osx/PropertyInspectorController.h | 83 - tikzit-1/src/osx/PropertyInspectorController.m | 280 - tikzit-1/src/osx/SelectBoxLayer.h | 22 - tikzit-1/src/osx/SelectBoxLayer.m | 48 - tikzit-1/src/osx/SelectableCollectionViewItem.h | 33 - tikzit-1/src/osx/SelectableCollectionViewItem.m | 54 - tikzit-1/src/osx/SelectableNodeView.h | 38 - tikzit-1/src/osx/SelectableNodeView.m | 96 - tikzit-1/src/osx/StylePaletteController.h | 80 - tikzit-1/src/osx/StylePaletteController.m | 252 - tikzit-1/src/osx/TikzDocument.h | 37 - tikzit-1/src/osx/TikzDocument.m | 84 - tikzit-1/src/osx/TikzFormatter.h | 29 - tikzit-1/src/osx/TikzFormatter.m | 91 - tikzit-1/src/osx/TikzSourceController.h | 71 - tikzit-1/src/osx/TikzSourceController.m | 241 - tikzit-1/src/osx/TikzWindowController.h | 31 - tikzit-1/src/osx/TikzWindowController.m | 66 - tikzit-1/src/osx/ToolPaletteController.h | 42 - tikzit-1/src/osx/ToolPaletteController.m | 58 - tikzit-1/src/osx/UpdatePreferenceController.h | 34 - tikzit-1/src/osx/UpdatePreferenceController.m | 49 - tikzit-1/src/osx/UpdatePreferencePanel.xib | 95 - tikzit-1/src/osx/main.m | 26 - tikzit-1/src/osx/test/main.m | 56 - tikzit-1/src/osx/test/osx.m | 64 - tikzit-1/src/tikzit.rc | 24 - tikzit-1/text-x-generic.png | Bin 744 -> 0 bytes tikzit-1/text-x-script.png | Bin 1416 -> 0 bytes tikzit-1/tikzit.icns | Bin 166599 -> 0 bytes tikzit-1/tikzit.ico | Bin 34494 -> 0 bytes tikzit-1/tikzit.spec | 98 - tikzit-1/tikzit48x48.png | Bin 2606 -> 0 bytes tikzit-1/tikzit_dsa_pub.pem | 20 - tikzit-1/tikzitdoc.icns | Bin 154929 -> 0 bytes tikzit-1/transform-crop-and-resize.png | Bin 1132 -> 0 bytes tikzit-1/transform-move.png | Bin 638 -> 0 bytes tikzit-1/updates.png | Bin 1953 -> 0 bytes tikzit-old/.gitignore | 235 + tikzit-old/AH_latex_head.png | Bin 0 -> 6334 bytes tikzit-old/AH_latex_tail.png | Bin 0 -> 6324 bytes tikzit-old/AH_none.png | Bin 0 -> 6183 bytes tikzit-old/AH_plain_head.png | Bin 0 -> 6298 bytes tikzit-old/AH_plain_tail.png | Bin 0 -> 6320 bytes tikzit-old/COPYING | 340 + tikzit-old/DESIGN-GTK | 23 + tikzit-old/ED_arrow.png | Bin 0 -> 6357 bytes tikzit-old/ED_none.png | Bin 0 -> 6190 bytes tikzit-old/ED_tick.png | Bin 0 -> 6258 bytes tikzit-old/English.lproj/Credits.rtf | 18 + tikzit-old/English.lproj/CustomNodes.xib | 256 + tikzit-old/English.lproj/InfoPlist.strings | 2 + tikzit-old/English.lproj/MainMenu.xib | 453 + tikzit-old/English.lproj/Preamble.xib | 235 + tikzit-old/English.lproj/Preview.xib | 70 + tikzit-old/English.lproj/PropertyInspector.xib | 769 + tikzit-old/English.lproj/StylePalette.xib | 631 + tikzit-old/English.lproj/TikzDocument.xib | 161 + tikzit-old/English.lproj/UserDefaults.plist | 10 + .../Frameworks/SFBInspectors.framework/Headers | 1 + .../Frameworks/SFBInspectors.framework/Resources | 1 + .../SFBInspectors.framework/SFBInspectors | 1 + .../Versions/A/Headers/SFBInspectorPane.h | 31 + .../Versions/A/Headers/SFBInspectorPaneBody.h | 16 + .../Versions/A/Headers/SFBInspectorPaneHeader.h | 24 + .../Versions/A/Headers/SFBInspectorView.h | 17 + .../Versions/A/Headers/SFBViewSelector.h | 22 + .../Versions/A/Headers/SFBViewSelectorBar.h | 29 + .../Versions/A/Headers/SFBViewSelectorBarItem.h | 28 + .../A/Resources/English.lproj/InfoPlist.strings | Bin 0 -> 92 bytes .../Versions/A/Resources/Info.plist | 24 + .../Versions/A/SFBInspectors | Bin 0 -> 280648 bytes .../SFBInspectors.framework/Versions/Current | 1 + tikzit-old/Frameworks/Sparkle.framework/Headers | 1 + tikzit-old/Frameworks/Sparkle.framework/Resources | 1 + tikzit-old/Frameworks/Sparkle.framework/Sparkle | 1 + .../Versions/A/Headers/SUAppcast.h | 33 + .../Versions/A/Headers/SUAppcastItem.h | 47 + .../Versions/A/Headers/SUUpdater.h | 118 + .../A/Headers/SUVersionComparisonProtocol.h | 27 + .../Sparkle.framework/Versions/A/Headers/Sparkle.h | 21 + .../Versions/A/Resources/Info.plist | 24 + .../Versions/A/Resources/License.txt | 7 + .../Versions/A/Resources/SUModelTranslation.plist | 174 + .../Versions/A/Resources/SUStatus.nib/classes.nib | 56 + .../Versions/A/Resources/SUStatus.nib/info.nib | 20 + .../A/Resources/SUStatus.nib/keyedobjects.nib | Bin 0 -> 7344 bytes .../SUAutomaticUpdateAlert.nib/classes.nib | 50 + .../de.lproj/SUAutomaticUpdateAlert.nib/info.nib | 20 + .../SUAutomaticUpdateAlert.nib/keyedobjects.nib | Bin 0 -> 7278 bytes .../de.lproj/SUUpdateAlert.nib/classes.nib | 67 + .../Resources/de.lproj/SUUpdateAlert.nib/info.nib | 20 + .../de.lproj/SUUpdateAlert.nib/keyedobjects.nib | Bin 0 -> 10493 bytes .../SUUpdatePermissionPrompt.nib/classes.nib | 59 + .../de.lproj/SUUpdatePermissionPrompt.nib/info.nib | 20 + .../SUUpdatePermissionPrompt.nib/keyedobjects.nib | Bin 0 -> 13189 bytes .../Versions/A/Resources/de.lproj/Sparkle.strings | Bin 0 -> 9806 bytes .../SUAutomaticUpdateAlert.nib/classes.nib | 50 + .../en.lproj/SUAutomaticUpdateAlert.nib/info.nib | 20 + .../SUAutomaticUpdateAlert.nib/keyedobjects.nib | Bin 0 -> 7148 bytes .../en.lproj/SUUpdateAlert.nib/classes.nib | 67 + .../Resources/en.lproj/SUUpdateAlert.nib/info.nib | 20 + .../en.lproj/SUUpdateAlert.nib/keyedobjects.nib | Bin 0 -> 10623 bytes .../SUUpdatePermissionPrompt.nib/classes.nib | 59 + .../en.lproj/SUUpdatePermissionPrompt.nib/info.nib | 21 + .../SUUpdatePermissionPrompt.nib/keyedobjects.nib | Bin 0 -> 13263 bytes .../Versions/A/Resources/en.lproj/Sparkle.strings | Bin 0 -> 8216 bytes .../SUAutomaticUpdateAlert.nib/classes.nib | 50 + .../es.lproj/SUAutomaticUpdateAlert.nib/info.nib | 20 + .../SUAutomaticUpdateAlert.nib/keyedobjects.nib | Bin 0 -> 7273 bytes .../es.lproj/SUUpdateAlert.nib/classes.nib | 67 + .../Resources/es.lproj/SUUpdateAlert.nib/info.nib | 20 + .../es.lproj/SUUpdateAlert.nib/keyedobjects.nib | Bin 0 -> 10668 bytes .../SUUpdatePermissionPrompt.nib/classes.nib | 59 + .../es.lproj/SUUpdatePermissionPrompt.nib/info.nib | 20 + .../SUUpdatePermissionPrompt.nib/keyedobjects.nib | Bin 0 -> 13404 bytes .../Versions/A/Resources/es.lproj/Sparkle.strings | Bin 0 -> 8020 bytes .../SUAutomaticUpdateAlert.nib/classes.nib | 50 + .../fr.lproj/SUAutomaticUpdateAlert.nib/info.nib | 16 + .../SUAutomaticUpdateAlert.nib/keyedobjects.nib | Bin 0 -> 7245 bytes .../fr.lproj/SUUpdateAlert.nib/classes.nib | 67 + .../Resources/fr.lproj/SUUpdateAlert.nib/info.nib | 16 + .../fr.lproj/SUUpdateAlert.nib/keyedobjects.nib | Bin 0 -> 10338 bytes .../SUUpdatePermissionPrompt.nib/classes.nib | 59 + .../fr.lproj/SUUpdatePermissionPrompt.nib/info.nib | 16 + .../SUUpdatePermissionPrompt.nib/keyedobjects.nib | Bin 0 -> 13156 bytes .../Versions/A/Resources/fr.lproj/Sparkle.strings | Bin 0 -> 8554 bytes .../Versions/A/Resources/fr_CA.lproj | 1 + .../SUAutomaticUpdateAlert.nib/classes.nib | 50 + .../it.lproj/SUAutomaticUpdateAlert.nib/info.nib | 20 + .../SUAutomaticUpdateAlert.nib/keyedobjects.nib | Bin 0 -> 7161 bytes .../it.lproj/SUUpdateAlert.nib/classes.nib | 67 + .../Resources/it.lproj/SUUpdateAlert.nib/info.nib | 20 + .../it.lproj/SUUpdateAlert.nib/keyedobjects.nib | Bin 0 -> 10360 bytes .../SUUpdatePermissionPrompt.nib/classes.nib | 59 + .../it.lproj/SUUpdatePermissionPrompt.nib/info.nib | 20 + .../SUUpdatePermissionPrompt.nib/keyedobjects.nib | Bin 0 -> 12659 bytes .../Versions/A/Resources/it.lproj/Sparkle.strings | Bin 0 -> 8914 bytes .../SUAutomaticUpdateAlert.nib/classes.nib | 50 + .../nl.lproj/SUAutomaticUpdateAlert.nib/info.nib | 18 + .../SUAutomaticUpdateAlert.nib/keyedobjects.nib | Bin 0 -> 7234 bytes .../nl.lproj/SUUpdateAlert.nib/classes.nib | 67 + .../Resources/nl.lproj/SUUpdateAlert.nib/info.nib | 16 + .../nl.lproj/SUUpdateAlert.nib/keyedobjects.nib | Bin 0 -> 10220 bytes .../SUUpdatePermissionPrompt.nib/classes.nib | 59 + .../nl.lproj/SUUpdatePermissionPrompt.nib/info.nib | 16 + .../SUUpdatePermissionPrompt.nib/keyedobjects.nib | Bin 0 -> 12535 bytes .../Versions/A/Resources/nl.lproj/Sparkle.strings | Bin 0 -> 8514 bytes .../Versions/A/Resources/relaunch | Bin 0 -> 58924 bytes .../SUAutomaticUpdateAlert.nib/classes.nib | 50 + .../ru.lproj/SUAutomaticUpdateAlert.nib/info.nib | 20 + .../SUAutomaticUpdateAlert.nib/keyedobjects.nib | Bin 0 -> 7675 bytes .../ru.lproj/SUUpdateAlert.nib/classes.nib | 67 + .../Resources/ru.lproj/SUUpdateAlert.nib/info.nib | 20 + .../ru.lproj/SUUpdateAlert.nib/keyedobjects.nib | Bin 0 -> 10895 bytes .../SUUpdatePermissionPrompt.nib/classes.nib | 59 + .../ru.lproj/SUUpdatePermissionPrompt.nib/info.nib | 18 + .../SUUpdatePermissionPrompt.nib/keyedobjects.nib | Bin 0 -> 12898 bytes .../Versions/A/Resources/ru.lproj/Sparkle.strings | Bin 0 -> 8364 bytes .../SUAutomaticUpdateAlert.nib/classes.nib | 50 + .../sv.lproj/SUAutomaticUpdateAlert.nib/info.nib | 20 + .../SUAutomaticUpdateAlert.nib/keyedobjects.nib | Bin 0 -> 7474 bytes .../sv.lproj/SUUpdateAlert.nib/classes.nib | 39 + .../Resources/sv.lproj/SUUpdateAlert.nib/info.nib | 18 + .../sv.lproj/SUUpdateAlert.nib/keyedobjects.nib | Bin 0 -> 10180 bytes .../SUUpdatePermissionPrompt.nib/classes.nib | 59 + .../sv.lproj/SUUpdatePermissionPrompt.nib/info.nib | 20 + .../SUUpdatePermissionPrompt.nib/keyedobjects.nib | Bin 0 -> 13483 bytes .../Versions/A/Resources/sv.lproj/Sparkle.strings | Bin 0 -> 8142 bytes .../Sparkle.framework/Versions/A/Sparkle | Bin 0 -> 463812 bytes .../Frameworks/Sparkle.framework/Versions/Current | 1 + tikzit-old/INSTALL | 34 + tikzit-old/Makefile.am | 3 + tikzit-old/NEWS | 75 + tikzit-old/README | 7 + tikzit-old/README.release | 98 + tikzit-old/TODO | 15 + tikzit-old/TikZiT-Info.plist | 61 + tikzit-old/TikZiT.xcodeproj/project.pbxproj | 1322 + .../project.xcworkspace/contents.xcworkspacedata | 7 + .../xcshareddata/TikZiT.xccheckout | 37 + .../UserInterfaceState.xcuserstate | 24539 +++++++++++++++++++ .../aleks.xcuserdatad/WorkspaceSettings.xcsettings | 22 + .../xcdebugger/Breakpoints.xcbkptlist | 123 + .../aleks.xcuserdatad/xcschemes/TikZiT.xcscheme | 72 + .../aleks.xcuserdatad/xcschemes/tests.xcscheme | 72 + .../xcschemes/xcschememanagement.plist | 32 + tikzit-old/TikZiT_Prefix.pch | 30 + tikzit-old/autogen.sh | 1578 ++ tikzit-old/build/DEBIAN/control | 11 + tikzit-old/configure.ac | 141 + tikzit-old/customshape.png | Bin 0 -> 1281 bytes tikzit-old/docs/Doxyfile | 1600 ++ tikzit-old/draw-ellipse.png | Bin 0 -> 3493 bytes tikzit-old/draw-path.png | Bin 0 -> 920 bytes tikzit-old/emblem-important.png | Bin 0 -> 717 bytes tikzit-old/emblem-unreadable-grey.png | Bin 0 -> 3554 bytes tikzit-old/engine.png | Bin 0 -> 1546 bytes tikzit-old/format-indent-less.png | Bin 0 -> 767 bytes tikzit-old/m4/objc.m4 | 135 + tikzit-old/preamble.png | Bin 0 -> 851 bytes tikzit-old/scripts/generate_keys.rb | 13 + tikzit-old/scripts/prepare_release.sh | 40 + tikzit-old/scripts/sign_update.rb | 7 + tikzit-old/select-rectangular.png | Bin 0 -> 499 bytes tikzit-old/shapes/cap.tikz | 13 + tikzit-old/shapes/copants.tikz | 19 + tikzit-old/shapes/cup.tikz | 13 + tikzit-old/shapes/oval.tikz | 11 + tikzit-old/shapes/pants.tikz | 19 + tikzit-old/share/Makefile.am | 10 + tikzit-old/share/applications/tikzit.desktop | 11 + .../share/icons/hicolor/128x128/apps/tikzit.png | Bin 0 -> 9098 bytes .../hicolor/128x128/mimetypes/text-x-tikz.png | Bin 0 -> 7316 bytes .../share/icons/hicolor/16x16/apps/tikzit.png | Bin 0 -> 882 bytes .../icons/hicolor/16x16/mimetypes/text-x-tikz.png | Bin 0 -> 564 bytes .../share/icons/hicolor/22x22/apps/tikzit.png | Bin 0 -> 1273 bytes .../icons/hicolor/22x22/mimetypes/text-x-tikz.png | Bin 0 -> 866 bytes .../share/icons/hicolor/24x24/apps/tikzit.png | Bin 0 -> 1406 bytes .../share/icons/hicolor/32x32/apps/tikzit.png | Bin 0 -> 1987 bytes .../icons/hicolor/32x32/mimetypes/text-x-tikz.png | Bin 0 -> 1352 bytes .../share/icons/hicolor/48x48/apps/tikzit.png | Bin 0 -> 3132 bytes .../icons/hicolor/48x48/mimetypes/text-x-tikz.png | Bin 0 -> 2445 bytes .../share/icons/hicolor/64x64/apps/tikzit.png | Bin 0 -> 4315 bytes .../icons/hicolor/64x64/mimetypes/text-x-tikz.png | Bin 0 -> 3532 bytes .../share/icons/hicolor/scalable/apps/tikzit.svg | 79 + .../hicolor/scalable/mimetypes/text-x-tikz.svg | 488 + tikzit-old/share/mime/packages/tikzit.xml | 10 + tikzit-old/share/tikzit | 1 + tikzit-old/src/Makefile.am | 178 + tikzit-old/src/common/CircleShape.h | 33 + tikzit-old/src/common/CircleShape.m | 57 + tikzit-old/src/common/ColorRGB.h | 64 + tikzit-old/src/common/ColorRGB.m | 353 + tikzit-old/src/common/DiamondShape.h | 34 + tikzit-old/src/common/DiamondShape.m | 63 + tikzit-old/src/common/Edge.h | 401 + tikzit-old/src/common/Edge.m | 757 + tikzit-old/src/common/EdgeStyle.h | 71 + tikzit-old/src/common/EdgeStyle.m | 222 + tikzit-old/src/common/Graph.h | 401 + tikzit-old/src/common/Graph.m | 922 + tikzit-old/src/common/GraphChange.h | 344 + tikzit-old/src/common/GraphChange.m | 369 + tikzit-old/src/common/GraphElementData.h | 94 + tikzit-old/src/common/GraphElementData.m | 188 + tikzit-old/src/common/GraphElementProperty.h | 88 + tikzit-old/src/common/GraphElementProperty.m | 164 + tikzit-old/src/common/Grid.h | 110 + tikzit-old/src/common/Grid.m | 186 + tikzit-old/src/common/NSError+Tikzit.h | 44 + tikzit-old/src/common/NSError+Tikzit.m | 64 + tikzit-old/src/common/NSFileManager+Utils.h | 29 + tikzit-old/src/common/NSFileManager+Utils.m | 46 + tikzit-old/src/common/NSString+LatexConstants.h | 33 + tikzit-old/src/common/NSString+LatexConstants.m | 212 + tikzit-old/src/common/NSString+Tikz.h | 26 + tikzit-old/src/common/NSString+Tikz.m | 72 + tikzit-old/src/common/NSString+Util.h | 27 + tikzit-old/src/common/NSString+Util.m | 66 + tikzit-old/src/common/Node.h | 181 + tikzit-old/src/common/Node.m | 214 + tikzit-old/src/common/NodeStyle.h | 125 + tikzit-old/src/common/NodeStyle.m | 246 + tikzit-old/src/common/PickSupport.h | 164 + tikzit-old/src/common/PickSupport.m | 232 + tikzit-old/src/common/Preambles.h | 73 + tikzit-old/src/common/Preambles.m | 320 + tikzit-old/src/common/PropertyHolder.h | 36 + tikzit-old/src/common/PropertyHolder.m | 74 + tikzit-old/src/common/RColor.h | 50 + tikzit-old/src/common/RColor.m | 33 + tikzit-old/src/common/RectangleShape.h | 33 + tikzit-old/src/common/RectangleShape.m | 57 + tikzit-old/src/common/RegularPolyShape.h | 50 + tikzit-old/src/common/RegularPolyShape.m | 76 + tikzit-old/src/common/RenderContext.h | 156 + tikzit-old/src/common/Shape.h | 49 + tikzit-old/src/common/Shape.m | 171 + tikzit-old/src/common/ShapeNames.h | 27 + tikzit-old/src/common/StyleManager.h | 49 + tikzit-old/src/common/StyleManager.m | 378 + tikzit-old/src/common/SupportDir.h | 36 + tikzit-old/src/common/SupportDir.m | 65 + tikzit-old/src/common/TikzGraphAssembler+Parser.h | 36 + tikzit-old/src/common/TikzGraphAssembler.h | 115 + tikzit-old/src/common/TikzGraphAssembler.m | 310 + tikzit-old/src/common/TikzShape.h | 37 + tikzit-old/src/common/TikzShape.m | 70 + tikzit-old/src/common/Transformer.h | 154 + tikzit-old/src/common/Transformer.m | 231 + tikzit-old/src/common/test/Makefile | 14 + tikzit-old/src/common/test/color.m | 80 + tikzit-old/src/common/test/common.m | 34 + tikzit-old/src/common/test/maths.m | 562 + tikzit-old/src/common/test/parser.m | 86 + tikzit-old/src/common/test/test.h | 57 + tikzit-old/src/common/test/test.m | 175 + tikzit-old/src/common/tikzlexer.lm | 170 + tikzit-old/src/common/tikzparser.ym | 224 + tikzit-old/src/common/tikzparserdefs.h | 49 + tikzit-old/src/common/util.h | 201 + tikzit-old/src/common/util.m | 403 + tikzit-old/src/gtk/Application.h | 155 + tikzit-old/src/gtk/Application.m | 377 + tikzit-old/src/gtk/BoundingBoxTool.h | 45 + tikzit-old/src/gtk/BoundingBoxTool.m | 353 + tikzit-old/src/gtk/CairoRenderContext.h | 59 + tikzit-old/src/gtk/CairoRenderContext.m | 344 + tikzit-old/src/gtk/ColorRGB+Gtk.h | 30 + tikzit-old/src/gtk/ColorRGB+Gtk.m | 46 + tikzit-old/src/gtk/ColorRGB+IntegerListStorage.h | 32 + tikzit-old/src/gtk/ColorRGB+IntegerListStorage.m | 57 + tikzit-old/src/gtk/Configuration.h | 447 + tikzit-old/src/gtk/Configuration.m | 450 + tikzit-old/src/gtk/ContextWindow.h | 53 + tikzit-old/src/gtk/ContextWindow.m | 169 + tikzit-old/src/gtk/CreateEdgeTool.h | 45 + tikzit-old/src/gtk/CreateEdgeTool.m | 226 + tikzit-old/src/gtk/CreateNodeTool.h | 42 + tikzit-old/src/gtk/CreateNodeTool.m | 169 + tikzit-old/src/gtk/DocumentContext.h | 27 + tikzit-old/src/gtk/Edge+Render.h | 34 + tikzit-old/src/gtk/Edge+Render.m | 267 + tikzit-old/src/gtk/EdgeStyle+Gtk.h | 29 + tikzit-old/src/gtk/EdgeStyle+Gtk.m | 33 + tikzit-old/src/gtk/EdgeStyle+Storage.h | 29 + tikzit-old/src/gtk/EdgeStyle+Storage.m | 55 + tikzit-old/src/gtk/EdgeStyleEditor.h | 45 + tikzit-old/src/gtk/EdgeStyleEditor.m | 499 + tikzit-old/src/gtk/EdgeStyleSelector.h | 61 + tikzit-old/src/gtk/EdgeStyleSelector.m | 143 + tikzit-old/src/gtk/EdgeStylesModel.h | 62 + tikzit-old/src/gtk/EdgeStylesModel.m | 367 + tikzit-old/src/gtk/EdgeStylesPalette.h | 43 + tikzit-old/src/gtk/EdgeStylesPalette.m | 198 + tikzit-old/src/gtk/FileChooserDialog.h | 56 + tikzit-old/src/gtk/FileChooserDialog.m | 152 + tikzit-old/src/gtk/GraphEditorPanel.h | 53 + tikzit-old/src/gtk/GraphEditorPanel.m | 240 + tikzit-old/src/gtk/GraphRenderer.h | 84 + tikzit-old/src/gtk/GraphRenderer.m | 476 + tikzit-old/src/gtk/HandTool.h | 33 + tikzit-old/src/gtk/HandTool.m | 75 + tikzit-old/src/gtk/InputDelegate.h | 77 + tikzit-old/src/gtk/Menu.h | 86 + tikzit-old/src/gtk/Menu.m | 737 + tikzit-old/src/gtk/NSError+Glib.h | 28 + tikzit-old/src/gtk/NSError+Glib.m | 50 + tikzit-old/src/gtk/NSFileManager+Glib.h | 31 + tikzit-old/src/gtk/NSFileManager+Glib.m | 55 + tikzit-old/src/gtk/NSString+Glib.h | 50 + tikzit-old/src/gtk/NSString+Glib.m | 96 + tikzit-old/src/gtk/Node+Render.h | 44 + tikzit-old/src/gtk/Node+Render.m | 188 + tikzit-old/src/gtk/NodeStyle+Gtk.h | 31 + tikzit-old/src/gtk/NodeStyle+Gtk.m | 41 + tikzit-old/src/gtk/NodeStyle+Render.h | 30 + tikzit-old/src/gtk/NodeStyle+Storage.h | 29 + tikzit-old/src/gtk/NodeStyle+Storage.m | 62 + tikzit-old/src/gtk/NodeStyleEditor.h | 45 + tikzit-old/src/gtk/NodeStyleEditor.m | 477 + tikzit-old/src/gtk/NodeStyleSelector.h | 61 + tikzit-old/src/gtk/NodeStyleSelector.m | 135 + tikzit-old/src/gtk/NodeStylesModel.h | 62 + tikzit-old/src/gtk/NodeStylesModel.m | 381 + tikzit-old/src/gtk/NodeStylesPalette.h | 43 + tikzit-old/src/gtk/NodeStylesPalette.m | 197 + tikzit-old/src/gtk/PreambleEditor.h | 51 + tikzit-old/src/gtk/PreambleEditor.m | 568 + tikzit-old/src/gtk/Preambles+Storage.h | 29 + tikzit-old/src/gtk/Preambles+Storage.m | 84 + tikzit-old/src/gtk/PreviewRenderer.h | 48 + tikzit-old/src/gtk/PreviewRenderer.m | 250 + tikzit-old/src/gtk/PreviewWindow.h | 51 + tikzit-old/src/gtk/PreviewWindow.m | 195 + tikzit-old/src/gtk/PropertiesPane.h | 69 + tikzit-old/src/gtk/PropertiesPane.m | 763 + tikzit-old/src/gtk/PropertyListEditor.h | 65 + tikzit-old/src/gtk/PropertyListEditor.m | 501 + tikzit-old/src/gtk/RecentManager.h | 30 + tikzit-old/src/gtk/RecentManager.m | 74 + tikzit-old/src/gtk/SelectTool.h | 63 + tikzit-old/src/gtk/SelectTool.m | 590 + tikzit-old/src/gtk/SelectionPane.h | 56 + tikzit-old/src/gtk/SelectionPane.m | 432 + tikzit-old/src/gtk/SettingsDialog.h | 54 + tikzit-old/src/gtk/SettingsDialog.m | 328 + tikzit-old/src/gtk/Shape+Render.h | 29 + tikzit-old/src/gtk/Shape+Render.m | 57 + tikzit-old/src/gtk/StyleManager+Storage.h | 26 + tikzit-old/src/gtk/StyleManager+Storage.m | 82 + tikzit-old/src/gtk/Surface.h | 107 + tikzit-old/src/gtk/TZFoundation.h | 30 + tikzit-old/src/gtk/TikzDocument.h | 149 + tikzit-old/src/gtk/TikzDocument.m | 911 + tikzit-old/src/gtk/Tool.h | 41 + tikzit-old/src/gtk/ToolBox.h | 45 + tikzit-old/src/gtk/ToolBox.m | 280 + tikzit-old/src/gtk/WidgetSurface.h | 54 + tikzit-old/src/gtk/WidgetSurface.m | 630 + tikzit-old/src/gtk/Window.h | 182 + tikzit-old/src/gtk/Window.m | 991 + tikzit-old/src/gtk/cairo_helpers.h | 25 + tikzit-old/src/gtk/cairo_helpers.m | 28 + tikzit-old/src/gtk/clipboard.h | 41 + tikzit-old/src/gtk/clipboard.m | 57 + tikzit-old/src/gtk/gtkhelpers.h | 60 + tikzit-old/src/gtk/gtkhelpers.m | 275 + tikzit-old/src/gtk/logo.h | 32 + tikzit-old/src/gtk/logo.m | 64 + tikzit-old/src/gtk/main.m | 111 + tikzit-old/src/gtk/mkdtemp.h | 32 + tikzit-old/src/gtk/mkdtemp.m | 180 + tikzit-old/src/gtk/stat.h | 25 + tikzit-old/src/gtk/test/gtk.m | 27 + tikzit-old/src/gtk/test/main.m | 50 + tikzit-old/src/gtk/tzstockitems.h | 26 + tikzit-old/src/gtk/tzstockitems.m | 64 + tikzit-old/src/gtk/tztoolpalette.h | 56 + tikzit-old/src/gtk/tztoolpalette.m | 158 + tikzit-old/src/osx/AppDelegate.h | 57 + tikzit-old/src/osx/AppDelegate.m | 124 + tikzit-old/src/osx/CALayer+DrawLabel.h | 21 + tikzit-old/src/osx/CALayer+DrawLabel.m | 84 + tikzit-old/src/osx/CoreGraphicsRenderContext.h | 44 + tikzit-old/src/osx/CoreGraphicsRenderContext.m | 234 + tikzit-old/src/osx/CustomNodeCellView.h | 23 + tikzit-old/src/osx/CustomNodeCellView.m | 83 + tikzit-old/src/osx/CustomNodeController.h | 35 + tikzit-old/src/osx/CustomNodeController.m | 58 + tikzit-old/src/osx/CustomNodes.xib | 249 + tikzit-old/src/osx/DraggablePDFView.h | 28 + tikzit-old/src/osx/DraggablePDFView.m | 60 + tikzit-old/src/osx/EdgeControlLayer.h | 44 + tikzit-old/src/osx/EdgeControlLayer.m | 150 + tikzit-old/src/osx/EdgeStyle+Coder.h | 30 + tikzit-old/src/osx/EdgeStyle+Coder.m | 50 + tikzit-old/src/osx/Graph+Coder.h | 17 + tikzit-old/src/osx/Graph+Coder.m | 24 + tikzit-old/src/osx/GraphicsView.h | 129 + tikzit-old/src/osx/GraphicsView.m | 1216 + tikzit-old/src/osx/Grid.h | 48 + tikzit-old/src/osx/Grid.m | 152 + tikzit-old/src/osx/MultiCombo.h | 18 + tikzit-old/src/osx/MultiCombo.m | 38 + tikzit-old/src/osx/MultiField.h | 18 + tikzit-old/src/osx/MultiField.m | 53 + tikzit-old/src/osx/NilToEmptyStringTransformer.h | 28 + tikzit-old/src/osx/NilToEmptyStringTransformer.m | 53 + tikzit-old/src/osx/NodeLayer.h | 62 + tikzit-old/src/osx/NodeLayer.m | 238 + tikzit-old/src/osx/NodeSelectionLayer.h | 45 + tikzit-old/src/osx/NodeSelectionLayer.m | 93 + tikzit-old/src/osx/NodeStyle+Coder.h | 36 + tikzit-old/src/osx/NodeStyle+Coder.m | 91 + tikzit-old/src/osx/ParseErrorView.h | 13 + tikzit-old/src/osx/ParseErrorView.m | 40 + tikzit-old/src/osx/PreambleController.h | 57 + tikzit-old/src/osx/PreambleController.m | 168 + tikzit-old/src/osx/Preambles+Coder.h | 32 + tikzit-old/src/osx/Preambles+Coder.m | 41 + tikzit-old/src/osx/PreferenceController.h | 49 + tikzit-old/src/osx/PreferenceController.m | 133 + tikzit-old/src/osx/Preferences.xib | 1165 + tikzit-old/src/osx/PreviewController.h | 52 + tikzit-old/src/osx/PreviewController.m | 147 + tikzit-old/src/osx/PropertyInspectorController.h | 83 + tikzit-old/src/osx/PropertyInspectorController.m | 280 + tikzit-old/src/osx/SelectBoxLayer.h | 22 + tikzit-old/src/osx/SelectBoxLayer.m | 48 + tikzit-old/src/osx/SelectableCollectionViewItem.h | 33 + tikzit-old/src/osx/SelectableCollectionViewItem.m | 54 + tikzit-old/src/osx/SelectableNodeView.h | 38 + tikzit-old/src/osx/SelectableNodeView.m | 96 + tikzit-old/src/osx/StylePaletteController.h | 80 + tikzit-old/src/osx/StylePaletteController.m | 252 + tikzit-old/src/osx/TikzDocument.h | 37 + tikzit-old/src/osx/TikzDocument.m | 84 + tikzit-old/src/osx/TikzFormatter.h | 29 + tikzit-old/src/osx/TikzFormatter.m | 91 + tikzit-old/src/osx/TikzSourceController.h | 71 + tikzit-old/src/osx/TikzSourceController.m | 241 + tikzit-old/src/osx/TikzWindowController.h | 31 + tikzit-old/src/osx/TikzWindowController.m | 66 + tikzit-old/src/osx/ToolPaletteController.h | 42 + tikzit-old/src/osx/ToolPaletteController.m | 58 + tikzit-old/src/osx/UpdatePreferenceController.h | 34 + tikzit-old/src/osx/UpdatePreferenceController.m | 49 + tikzit-old/src/osx/UpdatePreferencePanel.xib | 95 + tikzit-old/src/osx/main.m | 26 + tikzit-old/src/osx/test/main.m | 56 + tikzit-old/src/osx/test/osx.m | 64 + tikzit-old/src/tikzit.rc | 24 + tikzit-old/text-x-generic.png | Bin 0 -> 744 bytes tikzit-old/text-x-script.png | Bin 0 -> 1416 bytes tikzit-old/tikzit.icns | Bin 0 -> 166599 bytes tikzit-old/tikzit.ico | Bin 0 -> 34494 bytes tikzit-old/tikzit.spec | 98 + tikzit-old/tikzit48x48.png | Bin 0 -> 2606 bytes tikzit-old/tikzit_dsa_pub.pem | 20 + tikzit-old/tikzitdoc.icns | Bin 0 -> 154929 bytes tikzit-old/transform-crop-and-resize.png | Bin 0 -> 1132 bytes tikzit-old/transform-move.png | Bin 0 -> 638 bytes tikzit-old/updates.png | Bin 0 -> 1953 bytes www/htdocs/appcast/rnotes-release.html | 15 - www/htdocs/appcast/rnotes.css | 215 - www/htdocs/appcast/rnotes.html | 309 - www/htdocs/appcast/tikzit-release.xml | 40 - www/htdocs/appcast/tikzit.xml | 252 - www/htdocs/bnf.txt | 31 - www/htdocs/favicon.ico | Bin 62045 -> 0 bytes www/htdocs/images/apple.png | Bin 1832 -> 0 bytes www/htdocs/images/linux.png | Bin 9519 -> 0 bytes www/htdocs/images/man/bend.png | Bin 14132 -> 0 bytes www/htdocs/images/man/bezier.png | Bin 16766 -> 0 bytes www/htdocs/images/man/bounding_box.png | Bin 11588 -> 0 bytes www/htdocs/images/man/compound.png | Bin 21884 -> 0 bytes www/htdocs/images/man/new_edge.png | Bin 9807 -> 0 bytes www/htdocs/images/man/preambles.png | Bin 158991 -> 0 bytes www/htdocs/images/man/preview.png | Bin 47963 -> 0 bytes www/htdocs/images/man/property_inspector.png | Bin 79733 -> 0 bytes www/htdocs/images/man/shape.png | Bin 15140 -> 0 bytes www/htdocs/images/man/style_inspector.png | Bin 78539 -> 0 bytes www/htdocs/images/man/tools.png | Bin 11098 -> 0 bytes www/htdocs/images/source.png | Bin 3771 -> 0 bytes www/htdocs/images/ubuntu.png | Bin 3494 -> 0 bytes www/htdocs/images/web_logo.png | Bin 17156 -> 0 bytes www/htdocs/images/web_logo_linux.png | Bin 11471 -> 0 bytes www/htdocs/images/web_logo_manual.png | Bin 12341 -> 0 bytes www/htdocs/images/windows.png | Bin 8172 -> 0 bytes www/htdocs/index.html | 42 - www/htdocs/link.php | 24 - www/htdocs/linux/index.html | 34 - www/htdocs/main.css | 120 - www/htdocs/manual.html | 197 - www/images/apple.ai | 225 - www/images/source.ai | 1323 - www/images/tikzit.ai | 1563 -- www/images/tikzit.ico | Bin 62045 -> 0 bytes www/images/tikzit.svg | 176 - www/images/tikzit_bg.ai | 976 - www/images/tikzit_bg.psd | Bin 2887583 -> 0 bytes www/images/tikzit_doc.ai | 2195 -- www/images/ubuntu.ai | 274 - www/images/web_logo.ai | 1057 - www/images/web_logo_linux.ai | 1038 - www/images/web_logo_manual.ai | 1109 - www/images/windows.ai | 1435 -- www/sourceforge/README-SOURCEFORGE.txt | 3 - www/sourceforge/README.mkd | 22 - www/sourceforge/index.html | 9 - 981 files changed, 74388 insertions(+), 87072 deletions(-) delete mode 100644 tikzit-1/.gitignore delete mode 100644 tikzit-1/AH_latex_head.png delete mode 100644 tikzit-1/AH_latex_tail.png delete mode 100644 tikzit-1/AH_none.png delete mode 100644 tikzit-1/AH_plain_head.png delete mode 100644 tikzit-1/AH_plain_tail.png delete mode 100644 tikzit-1/COPYING delete mode 100644 tikzit-1/DESIGN-GTK delete mode 100644 tikzit-1/ED_arrow.png delete mode 100644 tikzit-1/ED_none.png delete mode 100644 tikzit-1/ED_tick.png delete mode 100644 tikzit-1/English.lproj/Credits.rtf delete mode 100644 tikzit-1/English.lproj/CustomNodes.xib delete mode 100644 tikzit-1/English.lproj/InfoPlist.strings delete mode 100644 tikzit-1/English.lproj/MainMenu.xib delete mode 100644 tikzit-1/English.lproj/Preamble.xib delete mode 100644 tikzit-1/English.lproj/Preview.xib delete mode 100644 tikzit-1/English.lproj/PropertyInspector.xib delete mode 100644 tikzit-1/English.lproj/StylePalette.xib delete mode 100644 tikzit-1/English.lproj/TikzDocument.xib delete mode 100644 tikzit-1/English.lproj/UserDefaults.plist delete mode 120000 tikzit-1/Frameworks/SFBInspectors.framework/Headers delete mode 120000 tikzit-1/Frameworks/SFBInspectors.framework/Resources delete mode 120000 tikzit-1/Frameworks/SFBInspectors.framework/SFBInspectors delete mode 100644 tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPane.h delete mode 100644 tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPaneBody.h delete mode 100644 tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPaneHeader.h delete mode 100644 tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorView.h delete mode 100644 tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelector.h delete mode 100644 tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelectorBar.h delete mode 100644 tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelectorBarItem.h delete mode 100644 tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Resources/English.lproj/InfoPlist.strings delete mode 100644 tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Resources/Info.plist delete mode 100755 tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/SFBInspectors delete mode 120000 tikzit-1/Frameworks/SFBInspectors.framework/Versions/Current delete mode 120000 tikzit-1/Frameworks/Sparkle.framework/Headers delete mode 120000 tikzit-1/Frameworks/Sparkle.framework/Resources delete mode 120000 tikzit-1/Frameworks/Sparkle.framework/Sparkle delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcast.h delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Headers/SUUpdater.h delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Headers/Sparkle.h delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/Info.plist delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/License.txt delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/SUModelTranslation.plist delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/classes.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/info.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/keyedobjects.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/classes.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/info.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/classes.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/info.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/classes.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/info.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/classes.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/info.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/classes.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/info.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/classes.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/info.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/Sparkle.strings delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/classes.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/info.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/classes.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/info.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/classes.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/info.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/Sparkle.strings delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/classes.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/info.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/classes.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/info.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/classes.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/info.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/Sparkle.strings delete mode 120000 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr_CA.lproj delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/classes.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/info.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/classes.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/info.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/classes.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/info.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/Sparkle.strings delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/classes.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/info.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/classes.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/info.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/classes.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/info.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/Sparkle.strings delete mode 100755 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/relaunch delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/classes.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/info.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/classes.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/info.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/classes.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/info.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/classes.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/info.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/classes.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/info.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/classes.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/info.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib delete mode 100644 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/Sparkle.strings delete mode 100755 tikzit-1/Frameworks/Sparkle.framework/Versions/A/Sparkle delete mode 120000 tikzit-1/Frameworks/Sparkle.framework/Versions/Current delete mode 100644 tikzit-1/INSTALL delete mode 100644 tikzit-1/Makefile.am delete mode 100644 tikzit-1/NEWS delete mode 100644 tikzit-1/README delete mode 100644 tikzit-1/README.release delete mode 100644 tikzit-1/TODO delete mode 100644 tikzit-1/TikZiT-Info.plist delete mode 100644 tikzit-1/TikZiT.xcodeproj/project.pbxproj delete mode 100644 tikzit-1/TikZiT.xcodeproj/project.xcworkspace/contents.xcworkspacedata delete mode 100644 tikzit-1/TikZiT.xcodeproj/project.xcworkspace/xcshareddata/TikZiT.xccheckout delete mode 100644 tikzit-1/TikZiT.xcodeproj/project.xcworkspace/xcuserdata/aleks.xcuserdatad/UserInterfaceState.xcuserstate delete mode 100644 tikzit-1/TikZiT.xcodeproj/project.xcworkspace/xcuserdata/aleks.xcuserdatad/WorkspaceSettings.xcsettings delete mode 100644 tikzit-1/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist delete mode 100644 tikzit-1/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/TikZiT.xcscheme delete mode 100644 tikzit-1/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/tests.xcscheme delete mode 100644 tikzit-1/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/xcschememanagement.plist delete mode 100644 tikzit-1/TikZiT_Prefix.pch delete mode 100755 tikzit-1/autogen.sh delete mode 100644 tikzit-1/build/DEBIAN/control delete mode 100644 tikzit-1/configure.ac delete mode 100755 tikzit-1/customshape.png delete mode 100644 tikzit-1/docs/Doxyfile delete mode 100644 tikzit-1/draw-ellipse.png delete mode 100644 tikzit-1/draw-path.png delete mode 100644 tikzit-1/emblem-important.png delete mode 100644 tikzit-1/emblem-unreadable-grey.png delete mode 100755 tikzit-1/engine.png delete mode 100644 tikzit-1/format-indent-less.png delete mode 100644 tikzit-1/m4/objc.m4 delete mode 100755 tikzit-1/preamble.png delete mode 100755 tikzit-1/scripts/generate_keys.rb delete mode 100755 tikzit-1/scripts/prepare_release.sh delete mode 100755 tikzit-1/scripts/sign_update.rb delete mode 100644 tikzit-1/select-rectangular.png delete mode 100644 tikzit-1/shapes/cap.tikz delete mode 100644 tikzit-1/shapes/copants.tikz delete mode 100644 tikzit-1/shapes/cup.tikz delete mode 100644 tikzit-1/shapes/oval.tikz delete mode 100644 tikzit-1/shapes/pants.tikz delete mode 100644 tikzit-1/share/Makefile.am delete mode 100644 tikzit-1/share/applications/tikzit.desktop delete mode 100644 tikzit-1/share/icons/hicolor/128x128/apps/tikzit.png delete mode 100644 tikzit-1/share/icons/hicolor/128x128/mimetypes/text-x-tikz.png delete mode 100644 tikzit-1/share/icons/hicolor/16x16/apps/tikzit.png delete mode 100644 tikzit-1/share/icons/hicolor/16x16/mimetypes/text-x-tikz.png delete mode 100644 tikzit-1/share/icons/hicolor/22x22/apps/tikzit.png delete mode 100644 tikzit-1/share/icons/hicolor/22x22/mimetypes/text-x-tikz.png delete mode 100644 tikzit-1/share/icons/hicolor/24x24/apps/tikzit.png delete mode 100644 tikzit-1/share/icons/hicolor/32x32/apps/tikzit.png delete mode 100644 tikzit-1/share/icons/hicolor/32x32/mimetypes/text-x-tikz.png delete mode 100644 tikzit-1/share/icons/hicolor/48x48/apps/tikzit.png delete mode 100644 tikzit-1/share/icons/hicolor/48x48/mimetypes/text-x-tikz.png delete mode 100644 tikzit-1/share/icons/hicolor/64x64/apps/tikzit.png delete mode 100644 tikzit-1/share/icons/hicolor/64x64/mimetypes/text-x-tikz.png delete mode 100644 tikzit-1/share/icons/hicolor/scalable/apps/tikzit.svg delete mode 100644 tikzit-1/share/icons/hicolor/scalable/mimetypes/text-x-tikz.svg delete mode 100644 tikzit-1/share/mime/packages/tikzit.xml delete mode 120000 tikzit-1/share/tikzit delete mode 100644 tikzit-1/src/Makefile.am delete mode 100644 tikzit-1/src/common/CircleShape.h delete mode 100644 tikzit-1/src/common/CircleShape.m delete mode 100644 tikzit-1/src/common/ColorRGB.h delete mode 100644 tikzit-1/src/common/ColorRGB.m delete mode 100644 tikzit-1/src/common/DiamondShape.h delete mode 100644 tikzit-1/src/common/DiamondShape.m delete mode 100644 tikzit-1/src/common/Edge.h delete mode 100644 tikzit-1/src/common/Edge.m delete mode 100644 tikzit-1/src/common/EdgeStyle.h delete mode 100644 tikzit-1/src/common/EdgeStyle.m delete mode 100644 tikzit-1/src/common/Graph.h delete mode 100644 tikzit-1/src/common/Graph.m delete mode 100644 tikzit-1/src/common/GraphChange.h delete mode 100644 tikzit-1/src/common/GraphChange.m delete mode 100644 tikzit-1/src/common/GraphElementData.h delete mode 100644 tikzit-1/src/common/GraphElementData.m delete mode 100644 tikzit-1/src/common/GraphElementProperty.h delete mode 100644 tikzit-1/src/common/GraphElementProperty.m delete mode 100644 tikzit-1/src/common/Grid.h delete mode 100644 tikzit-1/src/common/Grid.m delete mode 100644 tikzit-1/src/common/NSError+Tikzit.h delete mode 100644 tikzit-1/src/common/NSError+Tikzit.m delete mode 100644 tikzit-1/src/common/NSFileManager+Utils.h delete mode 100644 tikzit-1/src/common/NSFileManager+Utils.m delete mode 100644 tikzit-1/src/common/NSString+LatexConstants.h delete mode 100644 tikzit-1/src/common/NSString+LatexConstants.m delete mode 100644 tikzit-1/src/common/NSString+Tikz.h delete mode 100644 tikzit-1/src/common/NSString+Tikz.m delete mode 100644 tikzit-1/src/common/NSString+Util.h delete mode 100644 tikzit-1/src/common/NSString+Util.m delete mode 100644 tikzit-1/src/common/Node.h delete mode 100644 tikzit-1/src/common/Node.m delete mode 100644 tikzit-1/src/common/NodeStyle.h delete mode 100644 tikzit-1/src/common/NodeStyle.m delete mode 100644 tikzit-1/src/common/PickSupport.h delete mode 100644 tikzit-1/src/common/PickSupport.m delete mode 100644 tikzit-1/src/common/Preambles.h delete mode 100644 tikzit-1/src/common/Preambles.m delete mode 100644 tikzit-1/src/common/PropertyHolder.h delete mode 100644 tikzit-1/src/common/PropertyHolder.m delete mode 100644 tikzit-1/src/common/RColor.h delete mode 100644 tikzit-1/src/common/RColor.m delete mode 100644 tikzit-1/src/common/RectangleShape.h delete mode 100644 tikzit-1/src/common/RectangleShape.m delete mode 100644 tikzit-1/src/common/RegularPolyShape.h delete mode 100644 tikzit-1/src/common/RegularPolyShape.m delete mode 100644 tikzit-1/src/common/RenderContext.h delete mode 100644 tikzit-1/src/common/Shape.h delete mode 100644 tikzit-1/src/common/Shape.m delete mode 100644 tikzit-1/src/common/ShapeNames.h delete mode 100644 tikzit-1/src/common/StyleManager.h delete mode 100644 tikzit-1/src/common/StyleManager.m delete mode 100644 tikzit-1/src/common/SupportDir.h delete mode 100644 tikzit-1/src/common/SupportDir.m delete mode 100644 tikzit-1/src/common/TikzGraphAssembler+Parser.h delete mode 100644 tikzit-1/src/common/TikzGraphAssembler.h delete mode 100644 tikzit-1/src/common/TikzGraphAssembler.m delete mode 100644 tikzit-1/src/common/TikzShape.h delete mode 100644 tikzit-1/src/common/TikzShape.m delete mode 100644 tikzit-1/src/common/Transformer.h delete mode 100644 tikzit-1/src/common/Transformer.m delete mode 100644 tikzit-1/src/common/test/Makefile delete mode 100644 tikzit-1/src/common/test/color.m delete mode 100644 tikzit-1/src/common/test/common.m delete mode 100644 tikzit-1/src/common/test/maths.m delete mode 100644 tikzit-1/src/common/test/parser.m delete mode 100644 tikzit-1/src/common/test/test.h delete mode 100644 tikzit-1/src/common/test/test.m delete mode 100644 tikzit-1/src/common/tikzlexer.lm delete mode 100644 tikzit-1/src/common/tikzparser.ym delete mode 100644 tikzit-1/src/common/tikzparserdefs.h delete mode 100644 tikzit-1/src/common/util.h delete mode 100644 tikzit-1/src/common/util.m delete mode 100644 tikzit-1/src/gtk/Application.h delete mode 100644 tikzit-1/src/gtk/Application.m delete mode 100644 tikzit-1/src/gtk/BoundingBoxTool.h delete mode 100644 tikzit-1/src/gtk/BoundingBoxTool.m delete mode 100644 tikzit-1/src/gtk/CairoRenderContext.h delete mode 100644 tikzit-1/src/gtk/CairoRenderContext.m delete mode 100644 tikzit-1/src/gtk/ColorRGB+Gtk.h delete mode 100644 tikzit-1/src/gtk/ColorRGB+Gtk.m delete mode 100644 tikzit-1/src/gtk/ColorRGB+IntegerListStorage.h delete mode 100644 tikzit-1/src/gtk/ColorRGB+IntegerListStorage.m delete mode 100644 tikzit-1/src/gtk/Configuration.h delete mode 100644 tikzit-1/src/gtk/Configuration.m delete mode 100644 tikzit-1/src/gtk/ContextWindow.h delete mode 100644 tikzit-1/src/gtk/ContextWindow.m delete mode 100644 tikzit-1/src/gtk/CreateEdgeTool.h delete mode 100644 tikzit-1/src/gtk/CreateEdgeTool.m delete mode 100644 tikzit-1/src/gtk/CreateNodeTool.h delete mode 100644 tikzit-1/src/gtk/CreateNodeTool.m delete mode 100644 tikzit-1/src/gtk/DocumentContext.h delete mode 100644 tikzit-1/src/gtk/Edge+Render.h delete mode 100644 tikzit-1/src/gtk/Edge+Render.m delete mode 100644 tikzit-1/src/gtk/EdgeStyle+Gtk.h delete mode 100644 tikzit-1/src/gtk/EdgeStyle+Gtk.m delete mode 100644 tikzit-1/src/gtk/EdgeStyle+Storage.h delete mode 100644 tikzit-1/src/gtk/EdgeStyle+Storage.m delete mode 100644 tikzit-1/src/gtk/EdgeStyleEditor.h delete mode 100644 tikzit-1/src/gtk/EdgeStyleEditor.m delete mode 100644 tikzit-1/src/gtk/EdgeStyleSelector.h delete mode 100644 tikzit-1/src/gtk/EdgeStyleSelector.m delete mode 100644 tikzit-1/src/gtk/EdgeStylesModel.h delete mode 100644 tikzit-1/src/gtk/EdgeStylesModel.m delete mode 100644 tikzit-1/src/gtk/EdgeStylesPalette.h delete mode 100644 tikzit-1/src/gtk/EdgeStylesPalette.m delete mode 100644 tikzit-1/src/gtk/FileChooserDialog.h delete mode 100644 tikzit-1/src/gtk/FileChooserDialog.m delete mode 100644 tikzit-1/src/gtk/GraphEditorPanel.h delete mode 100644 tikzit-1/src/gtk/GraphEditorPanel.m delete mode 100644 tikzit-1/src/gtk/GraphRenderer.h delete mode 100644 tikzit-1/src/gtk/GraphRenderer.m delete mode 100644 tikzit-1/src/gtk/HandTool.h delete mode 100644 tikzit-1/src/gtk/HandTool.m delete mode 100644 tikzit-1/src/gtk/InputDelegate.h delete mode 100644 tikzit-1/src/gtk/Menu.h delete mode 100644 tikzit-1/src/gtk/Menu.m delete mode 100644 tikzit-1/src/gtk/NSError+Glib.h delete mode 100644 tikzit-1/src/gtk/NSError+Glib.m delete mode 100644 tikzit-1/src/gtk/NSFileManager+Glib.h delete mode 100644 tikzit-1/src/gtk/NSFileManager+Glib.m delete mode 100644 tikzit-1/src/gtk/NSString+Glib.h delete mode 100644 tikzit-1/src/gtk/NSString+Glib.m delete mode 100644 tikzit-1/src/gtk/Node+Render.h delete mode 100644 tikzit-1/src/gtk/Node+Render.m delete mode 100644 tikzit-1/src/gtk/NodeStyle+Gtk.h delete mode 100644 tikzit-1/src/gtk/NodeStyle+Gtk.m delete mode 100644 tikzit-1/src/gtk/NodeStyle+Render.h delete mode 100644 tikzit-1/src/gtk/NodeStyle+Storage.h delete mode 100644 tikzit-1/src/gtk/NodeStyle+Storage.m delete mode 100644 tikzit-1/src/gtk/NodeStyleEditor.h delete mode 100644 tikzit-1/src/gtk/NodeStyleEditor.m delete mode 100644 tikzit-1/src/gtk/NodeStyleSelector.h delete mode 100644 tikzit-1/src/gtk/NodeStyleSelector.m delete mode 100644 tikzit-1/src/gtk/NodeStylesModel.h delete mode 100644 tikzit-1/src/gtk/NodeStylesModel.m delete mode 100644 tikzit-1/src/gtk/NodeStylesPalette.h delete mode 100644 tikzit-1/src/gtk/NodeStylesPalette.m delete mode 100644 tikzit-1/src/gtk/PreambleEditor.h delete mode 100644 tikzit-1/src/gtk/PreambleEditor.m delete mode 100644 tikzit-1/src/gtk/Preambles+Storage.h delete mode 100644 tikzit-1/src/gtk/Preambles+Storage.m delete mode 100644 tikzit-1/src/gtk/PreviewRenderer.h delete mode 100644 tikzit-1/src/gtk/PreviewRenderer.m delete mode 100644 tikzit-1/src/gtk/PreviewWindow.h delete mode 100644 tikzit-1/src/gtk/PreviewWindow.m delete mode 100644 tikzit-1/src/gtk/PropertiesPane.h delete mode 100644 tikzit-1/src/gtk/PropertiesPane.m delete mode 100644 tikzit-1/src/gtk/PropertyListEditor.h delete mode 100644 tikzit-1/src/gtk/PropertyListEditor.m delete mode 100644 tikzit-1/src/gtk/RecentManager.h delete mode 100644 tikzit-1/src/gtk/RecentManager.m delete mode 100644 tikzit-1/src/gtk/SelectTool.h delete mode 100644 tikzit-1/src/gtk/SelectTool.m delete mode 100644 tikzit-1/src/gtk/SelectionPane.h delete mode 100644 tikzit-1/src/gtk/SelectionPane.m delete mode 100644 tikzit-1/src/gtk/SettingsDialog.h delete mode 100644 tikzit-1/src/gtk/SettingsDialog.m delete mode 100644 tikzit-1/src/gtk/Shape+Render.h delete mode 100644 tikzit-1/src/gtk/Shape+Render.m delete mode 100644 tikzit-1/src/gtk/StyleManager+Storage.h delete mode 100644 tikzit-1/src/gtk/StyleManager+Storage.m delete mode 100644 tikzit-1/src/gtk/Surface.h delete mode 100644 tikzit-1/src/gtk/TZFoundation.h delete mode 100644 tikzit-1/src/gtk/TikzDocument.h delete mode 100644 tikzit-1/src/gtk/TikzDocument.m delete mode 100644 tikzit-1/src/gtk/Tool.h delete mode 100644 tikzit-1/src/gtk/ToolBox.h delete mode 100644 tikzit-1/src/gtk/ToolBox.m delete mode 100644 tikzit-1/src/gtk/WidgetSurface.h delete mode 100644 tikzit-1/src/gtk/WidgetSurface.m delete mode 100644 tikzit-1/src/gtk/Window.h delete mode 100644 tikzit-1/src/gtk/Window.m delete mode 100644 tikzit-1/src/gtk/cairo_helpers.h delete mode 100644 tikzit-1/src/gtk/cairo_helpers.m delete mode 100644 tikzit-1/src/gtk/clipboard.h delete mode 100644 tikzit-1/src/gtk/clipboard.m delete mode 100644 tikzit-1/src/gtk/gtkhelpers.h delete mode 100644 tikzit-1/src/gtk/gtkhelpers.m delete mode 100644 tikzit-1/src/gtk/logo.h delete mode 100644 tikzit-1/src/gtk/logo.m delete mode 100644 tikzit-1/src/gtk/main.m delete mode 100644 tikzit-1/src/gtk/mkdtemp.h delete mode 100644 tikzit-1/src/gtk/mkdtemp.m delete mode 100644 tikzit-1/src/gtk/stat.h delete mode 100644 tikzit-1/src/gtk/test/gtk.m delete mode 100644 tikzit-1/src/gtk/test/main.m delete mode 100644 tikzit-1/src/gtk/tzstockitems.h delete mode 100644 tikzit-1/src/gtk/tzstockitems.m delete mode 100644 tikzit-1/src/gtk/tztoolpalette.h delete mode 100644 tikzit-1/src/gtk/tztoolpalette.m delete mode 100644 tikzit-1/src/osx/AppDelegate.h delete mode 100644 tikzit-1/src/osx/AppDelegate.m delete mode 100644 tikzit-1/src/osx/CALayer+DrawLabel.h delete mode 100644 tikzit-1/src/osx/CALayer+DrawLabel.m delete mode 100644 tikzit-1/src/osx/CoreGraphicsRenderContext.h delete mode 100644 tikzit-1/src/osx/CoreGraphicsRenderContext.m delete mode 100644 tikzit-1/src/osx/CustomNodeCellView.h delete mode 100644 tikzit-1/src/osx/CustomNodeCellView.m delete mode 100644 tikzit-1/src/osx/CustomNodeController.h delete mode 100644 tikzit-1/src/osx/CustomNodeController.m delete mode 100644 tikzit-1/src/osx/CustomNodes.xib delete mode 100644 tikzit-1/src/osx/DraggablePDFView.h delete mode 100644 tikzit-1/src/osx/DraggablePDFView.m delete mode 100644 tikzit-1/src/osx/EdgeControlLayer.h delete mode 100644 tikzit-1/src/osx/EdgeControlLayer.m delete mode 100644 tikzit-1/src/osx/EdgeStyle+Coder.h delete mode 100644 tikzit-1/src/osx/EdgeStyle+Coder.m delete mode 100644 tikzit-1/src/osx/Graph+Coder.h delete mode 100644 tikzit-1/src/osx/Graph+Coder.m delete mode 100644 tikzit-1/src/osx/GraphicsView.h delete mode 100644 tikzit-1/src/osx/GraphicsView.m delete mode 100644 tikzit-1/src/osx/Grid.h delete mode 100644 tikzit-1/src/osx/Grid.m delete mode 100644 tikzit-1/src/osx/MultiCombo.h delete mode 100644 tikzit-1/src/osx/MultiCombo.m delete mode 100644 tikzit-1/src/osx/MultiField.h delete mode 100644 tikzit-1/src/osx/MultiField.m delete mode 100644 tikzit-1/src/osx/NilToEmptyStringTransformer.h delete mode 100644 tikzit-1/src/osx/NilToEmptyStringTransformer.m delete mode 100644 tikzit-1/src/osx/NodeLayer.h delete mode 100644 tikzit-1/src/osx/NodeLayer.m delete mode 100644 tikzit-1/src/osx/NodeSelectionLayer.h delete mode 100644 tikzit-1/src/osx/NodeSelectionLayer.m delete mode 100644 tikzit-1/src/osx/NodeStyle+Coder.h delete mode 100644 tikzit-1/src/osx/NodeStyle+Coder.m delete mode 100644 tikzit-1/src/osx/ParseErrorView.h delete mode 100644 tikzit-1/src/osx/ParseErrorView.m delete mode 100644 tikzit-1/src/osx/PreambleController.h delete mode 100644 tikzit-1/src/osx/PreambleController.m delete mode 100644 tikzit-1/src/osx/Preambles+Coder.h delete mode 100644 tikzit-1/src/osx/Preambles+Coder.m delete mode 100644 tikzit-1/src/osx/PreferenceController.h delete mode 100644 tikzit-1/src/osx/PreferenceController.m delete mode 100644 tikzit-1/src/osx/Preferences.xib delete mode 100644 tikzit-1/src/osx/PreviewController.h delete mode 100644 tikzit-1/src/osx/PreviewController.m delete mode 100644 tikzit-1/src/osx/PropertyInspectorController.h delete mode 100644 tikzit-1/src/osx/PropertyInspectorController.m delete mode 100644 tikzit-1/src/osx/SelectBoxLayer.h delete mode 100644 tikzit-1/src/osx/SelectBoxLayer.m delete mode 100644 tikzit-1/src/osx/SelectableCollectionViewItem.h delete mode 100644 tikzit-1/src/osx/SelectableCollectionViewItem.m delete mode 100644 tikzit-1/src/osx/SelectableNodeView.h delete mode 100644 tikzit-1/src/osx/SelectableNodeView.m delete mode 100644 tikzit-1/src/osx/StylePaletteController.h delete mode 100644 tikzit-1/src/osx/StylePaletteController.m delete mode 100644 tikzit-1/src/osx/TikzDocument.h delete mode 100644 tikzit-1/src/osx/TikzDocument.m delete mode 100644 tikzit-1/src/osx/TikzFormatter.h delete mode 100644 tikzit-1/src/osx/TikzFormatter.m delete mode 100644 tikzit-1/src/osx/TikzSourceController.h delete mode 100644 tikzit-1/src/osx/TikzSourceController.m delete mode 100644 tikzit-1/src/osx/TikzWindowController.h delete mode 100644 tikzit-1/src/osx/TikzWindowController.m delete mode 100644 tikzit-1/src/osx/ToolPaletteController.h delete mode 100644 tikzit-1/src/osx/ToolPaletteController.m delete mode 100644 tikzit-1/src/osx/UpdatePreferenceController.h delete mode 100644 tikzit-1/src/osx/UpdatePreferenceController.m delete mode 100644 tikzit-1/src/osx/UpdatePreferencePanel.xib delete mode 100644 tikzit-1/src/osx/main.m delete mode 100644 tikzit-1/src/osx/test/main.m delete mode 100644 tikzit-1/src/osx/test/osx.m delete mode 100644 tikzit-1/src/tikzit.rc delete mode 100644 tikzit-1/text-x-generic.png delete mode 100644 tikzit-1/text-x-script.png delete mode 100644 tikzit-1/tikzit.icns delete mode 100644 tikzit-1/tikzit.ico delete mode 100644 tikzit-1/tikzit.spec delete mode 100644 tikzit-1/tikzit48x48.png delete mode 100644 tikzit-1/tikzit_dsa_pub.pem delete mode 100644 tikzit-1/tikzitdoc.icns delete mode 100644 tikzit-1/transform-crop-and-resize.png delete mode 100644 tikzit-1/transform-move.png delete mode 100755 tikzit-1/updates.png create mode 100644 tikzit-old/.gitignore create mode 100644 tikzit-old/AH_latex_head.png create mode 100644 tikzit-old/AH_latex_tail.png create mode 100644 tikzit-old/AH_none.png create mode 100644 tikzit-old/AH_plain_head.png create mode 100644 tikzit-old/AH_plain_tail.png create mode 100644 tikzit-old/COPYING create mode 100644 tikzit-old/DESIGN-GTK create mode 100644 tikzit-old/ED_arrow.png create mode 100644 tikzit-old/ED_none.png create mode 100644 tikzit-old/ED_tick.png create mode 100644 tikzit-old/English.lproj/Credits.rtf create mode 100644 tikzit-old/English.lproj/CustomNodes.xib create mode 100644 tikzit-old/English.lproj/InfoPlist.strings create mode 100644 tikzit-old/English.lproj/MainMenu.xib create mode 100644 tikzit-old/English.lproj/Preamble.xib create mode 100644 tikzit-old/English.lproj/Preview.xib create mode 100644 tikzit-old/English.lproj/PropertyInspector.xib create mode 100644 tikzit-old/English.lproj/StylePalette.xib create mode 100644 tikzit-old/English.lproj/TikzDocument.xib create mode 100644 tikzit-old/English.lproj/UserDefaults.plist create mode 120000 tikzit-old/Frameworks/SFBInspectors.framework/Headers create mode 120000 tikzit-old/Frameworks/SFBInspectors.framework/Resources create mode 120000 tikzit-old/Frameworks/SFBInspectors.framework/SFBInspectors create mode 100644 tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPane.h create mode 100644 tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPaneBody.h create mode 100644 tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPaneHeader.h create mode 100644 tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorView.h create mode 100644 tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelector.h create mode 100644 tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelectorBar.h create mode 100644 tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelectorBarItem.h create mode 100644 tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Resources/English.lproj/InfoPlist.strings create mode 100644 tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Resources/Info.plist create mode 100755 tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/SFBInspectors create mode 120000 tikzit-old/Frameworks/SFBInspectors.framework/Versions/Current create mode 120000 tikzit-old/Frameworks/Sparkle.framework/Headers create mode 120000 tikzit-old/Frameworks/Sparkle.framework/Resources create mode 120000 tikzit-old/Frameworks/Sparkle.framework/Sparkle create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcast.h create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Headers/SUUpdater.h create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Headers/Sparkle.h create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/Info.plist create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/License.txt create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/SUModelTranslation.plist create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/classes.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/info.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/keyedobjects.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/classes.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/info.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/classes.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/info.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/keyedobjects.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/classes.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/info.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/classes.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/info.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/classes.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/info.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/keyedobjects.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/classes.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/info.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/Sparkle.strings create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/classes.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/info.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/classes.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/info.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/keyedobjects.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/classes.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/info.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/Sparkle.strings create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/classes.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/info.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/classes.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/info.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/keyedobjects.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/classes.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/info.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/Sparkle.strings create mode 120000 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr_CA.lproj create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/classes.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/info.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/classes.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/info.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/keyedobjects.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/classes.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/info.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/Sparkle.strings create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/classes.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/info.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/classes.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/info.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/keyedobjects.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/classes.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/info.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/Sparkle.strings create mode 100755 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/relaunch create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/classes.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/info.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/classes.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/info.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/keyedobjects.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/classes.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/info.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/classes.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/info.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/classes.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/info.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/keyedobjects.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/classes.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/info.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib create mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/Sparkle.strings create mode 100755 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Sparkle create mode 120000 tikzit-old/Frameworks/Sparkle.framework/Versions/Current create mode 100644 tikzit-old/INSTALL create mode 100644 tikzit-old/Makefile.am create mode 100644 tikzit-old/NEWS create mode 100644 tikzit-old/README create mode 100644 tikzit-old/README.release create mode 100644 tikzit-old/TODO create mode 100644 tikzit-old/TikZiT-Info.plist create mode 100644 tikzit-old/TikZiT.xcodeproj/project.pbxproj create mode 100644 tikzit-old/TikZiT.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 tikzit-old/TikZiT.xcodeproj/project.xcworkspace/xcshareddata/TikZiT.xccheckout create mode 100644 tikzit-old/TikZiT.xcodeproj/project.xcworkspace/xcuserdata/aleks.xcuserdatad/UserInterfaceState.xcuserstate create mode 100644 tikzit-old/TikZiT.xcodeproj/project.xcworkspace/xcuserdata/aleks.xcuserdatad/WorkspaceSettings.xcsettings create mode 100644 tikzit-old/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist create mode 100644 tikzit-old/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/TikZiT.xcscheme create mode 100644 tikzit-old/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/tests.xcscheme create mode 100644 tikzit-old/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/xcschememanagement.plist create mode 100644 tikzit-old/TikZiT_Prefix.pch create mode 100755 tikzit-old/autogen.sh create mode 100644 tikzit-old/build/DEBIAN/control create mode 100644 tikzit-old/configure.ac create mode 100755 tikzit-old/customshape.png create mode 100644 tikzit-old/docs/Doxyfile create mode 100644 tikzit-old/draw-ellipse.png create mode 100644 tikzit-old/draw-path.png create mode 100644 tikzit-old/emblem-important.png create mode 100644 tikzit-old/emblem-unreadable-grey.png create mode 100755 tikzit-old/engine.png create mode 100644 tikzit-old/format-indent-less.png create mode 100644 tikzit-old/m4/objc.m4 create mode 100755 tikzit-old/preamble.png create mode 100755 tikzit-old/scripts/generate_keys.rb create mode 100755 tikzit-old/scripts/prepare_release.sh create mode 100755 tikzit-old/scripts/sign_update.rb create mode 100644 tikzit-old/select-rectangular.png create mode 100644 tikzit-old/shapes/cap.tikz create mode 100644 tikzit-old/shapes/copants.tikz create mode 100644 tikzit-old/shapes/cup.tikz create mode 100644 tikzit-old/shapes/oval.tikz create mode 100644 tikzit-old/shapes/pants.tikz create mode 100644 tikzit-old/share/Makefile.am create mode 100644 tikzit-old/share/applications/tikzit.desktop create mode 100644 tikzit-old/share/icons/hicolor/128x128/apps/tikzit.png create mode 100644 tikzit-old/share/icons/hicolor/128x128/mimetypes/text-x-tikz.png create mode 100644 tikzit-old/share/icons/hicolor/16x16/apps/tikzit.png create mode 100644 tikzit-old/share/icons/hicolor/16x16/mimetypes/text-x-tikz.png create mode 100644 tikzit-old/share/icons/hicolor/22x22/apps/tikzit.png create mode 100644 tikzit-old/share/icons/hicolor/22x22/mimetypes/text-x-tikz.png create mode 100644 tikzit-old/share/icons/hicolor/24x24/apps/tikzit.png create mode 100644 tikzit-old/share/icons/hicolor/32x32/apps/tikzit.png create mode 100644 tikzit-old/share/icons/hicolor/32x32/mimetypes/text-x-tikz.png create mode 100644 tikzit-old/share/icons/hicolor/48x48/apps/tikzit.png create mode 100644 tikzit-old/share/icons/hicolor/48x48/mimetypes/text-x-tikz.png create mode 100644 tikzit-old/share/icons/hicolor/64x64/apps/tikzit.png create mode 100644 tikzit-old/share/icons/hicolor/64x64/mimetypes/text-x-tikz.png create mode 100644 tikzit-old/share/icons/hicolor/scalable/apps/tikzit.svg create mode 100644 tikzit-old/share/icons/hicolor/scalable/mimetypes/text-x-tikz.svg create mode 100644 tikzit-old/share/mime/packages/tikzit.xml create mode 120000 tikzit-old/share/tikzit create mode 100644 tikzit-old/src/Makefile.am create mode 100644 tikzit-old/src/common/CircleShape.h create mode 100644 tikzit-old/src/common/CircleShape.m create mode 100644 tikzit-old/src/common/ColorRGB.h create mode 100644 tikzit-old/src/common/ColorRGB.m create mode 100644 tikzit-old/src/common/DiamondShape.h create mode 100644 tikzit-old/src/common/DiamondShape.m create mode 100644 tikzit-old/src/common/Edge.h create mode 100644 tikzit-old/src/common/Edge.m create mode 100644 tikzit-old/src/common/EdgeStyle.h create mode 100644 tikzit-old/src/common/EdgeStyle.m create mode 100644 tikzit-old/src/common/Graph.h create mode 100644 tikzit-old/src/common/Graph.m create mode 100644 tikzit-old/src/common/GraphChange.h create mode 100644 tikzit-old/src/common/GraphChange.m create mode 100644 tikzit-old/src/common/GraphElementData.h create mode 100644 tikzit-old/src/common/GraphElementData.m create mode 100644 tikzit-old/src/common/GraphElementProperty.h create mode 100644 tikzit-old/src/common/GraphElementProperty.m create mode 100644 tikzit-old/src/common/Grid.h create mode 100644 tikzit-old/src/common/Grid.m create mode 100644 tikzit-old/src/common/NSError+Tikzit.h create mode 100644 tikzit-old/src/common/NSError+Tikzit.m create mode 100644 tikzit-old/src/common/NSFileManager+Utils.h create mode 100644 tikzit-old/src/common/NSFileManager+Utils.m create mode 100644 tikzit-old/src/common/NSString+LatexConstants.h create mode 100644 tikzit-old/src/common/NSString+LatexConstants.m create mode 100644 tikzit-old/src/common/NSString+Tikz.h create mode 100644 tikzit-old/src/common/NSString+Tikz.m create mode 100644 tikzit-old/src/common/NSString+Util.h create mode 100644 tikzit-old/src/common/NSString+Util.m create mode 100644 tikzit-old/src/common/Node.h create mode 100644 tikzit-old/src/common/Node.m create mode 100644 tikzit-old/src/common/NodeStyle.h create mode 100644 tikzit-old/src/common/NodeStyle.m create mode 100644 tikzit-old/src/common/PickSupport.h create mode 100644 tikzit-old/src/common/PickSupport.m create mode 100644 tikzit-old/src/common/Preambles.h create mode 100644 tikzit-old/src/common/Preambles.m create mode 100644 tikzit-old/src/common/PropertyHolder.h create mode 100644 tikzit-old/src/common/PropertyHolder.m create mode 100644 tikzit-old/src/common/RColor.h create mode 100644 tikzit-old/src/common/RColor.m create mode 100644 tikzit-old/src/common/RectangleShape.h create mode 100644 tikzit-old/src/common/RectangleShape.m create mode 100644 tikzit-old/src/common/RegularPolyShape.h create mode 100644 tikzit-old/src/common/RegularPolyShape.m create mode 100644 tikzit-old/src/common/RenderContext.h create mode 100644 tikzit-old/src/common/Shape.h create mode 100644 tikzit-old/src/common/Shape.m create mode 100644 tikzit-old/src/common/ShapeNames.h create mode 100644 tikzit-old/src/common/StyleManager.h create mode 100644 tikzit-old/src/common/StyleManager.m create mode 100644 tikzit-old/src/common/SupportDir.h create mode 100644 tikzit-old/src/common/SupportDir.m create mode 100644 tikzit-old/src/common/TikzGraphAssembler+Parser.h create mode 100644 tikzit-old/src/common/TikzGraphAssembler.h create mode 100644 tikzit-old/src/common/TikzGraphAssembler.m create mode 100644 tikzit-old/src/common/TikzShape.h create mode 100644 tikzit-old/src/common/TikzShape.m create mode 100644 tikzit-old/src/common/Transformer.h create mode 100644 tikzit-old/src/common/Transformer.m create mode 100644 tikzit-old/src/common/test/Makefile create mode 100644 tikzit-old/src/common/test/color.m create mode 100644 tikzit-old/src/common/test/common.m create mode 100644 tikzit-old/src/common/test/maths.m create mode 100644 tikzit-old/src/common/test/parser.m create mode 100644 tikzit-old/src/common/test/test.h create mode 100644 tikzit-old/src/common/test/test.m create mode 100644 tikzit-old/src/common/tikzlexer.lm create mode 100644 tikzit-old/src/common/tikzparser.ym create mode 100644 tikzit-old/src/common/tikzparserdefs.h create mode 100644 tikzit-old/src/common/util.h create mode 100644 tikzit-old/src/common/util.m create mode 100644 tikzit-old/src/gtk/Application.h create mode 100644 tikzit-old/src/gtk/Application.m create mode 100644 tikzit-old/src/gtk/BoundingBoxTool.h create mode 100644 tikzit-old/src/gtk/BoundingBoxTool.m create mode 100644 tikzit-old/src/gtk/CairoRenderContext.h create mode 100644 tikzit-old/src/gtk/CairoRenderContext.m create mode 100644 tikzit-old/src/gtk/ColorRGB+Gtk.h create mode 100644 tikzit-old/src/gtk/ColorRGB+Gtk.m create mode 100644 tikzit-old/src/gtk/ColorRGB+IntegerListStorage.h create mode 100644 tikzit-old/src/gtk/ColorRGB+IntegerListStorage.m create mode 100644 tikzit-old/src/gtk/Configuration.h create mode 100644 tikzit-old/src/gtk/Configuration.m create mode 100644 tikzit-old/src/gtk/ContextWindow.h create mode 100644 tikzit-old/src/gtk/ContextWindow.m create mode 100644 tikzit-old/src/gtk/CreateEdgeTool.h create mode 100644 tikzit-old/src/gtk/CreateEdgeTool.m create mode 100644 tikzit-old/src/gtk/CreateNodeTool.h create mode 100644 tikzit-old/src/gtk/CreateNodeTool.m create mode 100644 tikzit-old/src/gtk/DocumentContext.h create mode 100644 tikzit-old/src/gtk/Edge+Render.h create mode 100644 tikzit-old/src/gtk/Edge+Render.m create mode 100644 tikzit-old/src/gtk/EdgeStyle+Gtk.h create mode 100644 tikzit-old/src/gtk/EdgeStyle+Gtk.m create mode 100644 tikzit-old/src/gtk/EdgeStyle+Storage.h create mode 100644 tikzit-old/src/gtk/EdgeStyle+Storage.m create mode 100644 tikzit-old/src/gtk/EdgeStyleEditor.h create mode 100644 tikzit-old/src/gtk/EdgeStyleEditor.m create mode 100644 tikzit-old/src/gtk/EdgeStyleSelector.h create mode 100644 tikzit-old/src/gtk/EdgeStyleSelector.m create mode 100644 tikzit-old/src/gtk/EdgeStylesModel.h create mode 100644 tikzit-old/src/gtk/EdgeStylesModel.m create mode 100644 tikzit-old/src/gtk/EdgeStylesPalette.h create mode 100644 tikzit-old/src/gtk/EdgeStylesPalette.m create mode 100644 tikzit-old/src/gtk/FileChooserDialog.h create mode 100644 tikzit-old/src/gtk/FileChooserDialog.m create mode 100644 tikzit-old/src/gtk/GraphEditorPanel.h create mode 100644 tikzit-old/src/gtk/GraphEditorPanel.m create mode 100644 tikzit-old/src/gtk/GraphRenderer.h create mode 100644 tikzit-old/src/gtk/GraphRenderer.m create mode 100644 tikzit-old/src/gtk/HandTool.h create mode 100644 tikzit-old/src/gtk/HandTool.m create mode 100644 tikzit-old/src/gtk/InputDelegate.h create mode 100644 tikzit-old/src/gtk/Menu.h create mode 100644 tikzit-old/src/gtk/Menu.m create mode 100644 tikzit-old/src/gtk/NSError+Glib.h create mode 100644 tikzit-old/src/gtk/NSError+Glib.m create mode 100644 tikzit-old/src/gtk/NSFileManager+Glib.h create mode 100644 tikzit-old/src/gtk/NSFileManager+Glib.m create mode 100644 tikzit-old/src/gtk/NSString+Glib.h create mode 100644 tikzit-old/src/gtk/NSString+Glib.m create mode 100644 tikzit-old/src/gtk/Node+Render.h create mode 100644 tikzit-old/src/gtk/Node+Render.m create mode 100644 tikzit-old/src/gtk/NodeStyle+Gtk.h create mode 100644 tikzit-old/src/gtk/NodeStyle+Gtk.m create mode 100644 tikzit-old/src/gtk/NodeStyle+Render.h create mode 100644 tikzit-old/src/gtk/NodeStyle+Storage.h create mode 100644 tikzit-old/src/gtk/NodeStyle+Storage.m create mode 100644 tikzit-old/src/gtk/NodeStyleEditor.h create mode 100644 tikzit-old/src/gtk/NodeStyleEditor.m create mode 100644 tikzit-old/src/gtk/NodeStyleSelector.h create mode 100644 tikzit-old/src/gtk/NodeStyleSelector.m create mode 100644 tikzit-old/src/gtk/NodeStylesModel.h create mode 100644 tikzit-old/src/gtk/NodeStylesModel.m create mode 100644 tikzit-old/src/gtk/NodeStylesPalette.h create mode 100644 tikzit-old/src/gtk/NodeStylesPalette.m create mode 100644 tikzit-old/src/gtk/PreambleEditor.h create mode 100644 tikzit-old/src/gtk/PreambleEditor.m create mode 100644 tikzit-old/src/gtk/Preambles+Storage.h create mode 100644 tikzit-old/src/gtk/Preambles+Storage.m create mode 100644 tikzit-old/src/gtk/PreviewRenderer.h create mode 100644 tikzit-old/src/gtk/PreviewRenderer.m create mode 100644 tikzit-old/src/gtk/PreviewWindow.h create mode 100644 tikzit-old/src/gtk/PreviewWindow.m create mode 100644 tikzit-old/src/gtk/PropertiesPane.h create mode 100644 tikzit-old/src/gtk/PropertiesPane.m create mode 100644 tikzit-old/src/gtk/PropertyListEditor.h create mode 100644 tikzit-old/src/gtk/PropertyListEditor.m create mode 100644 tikzit-old/src/gtk/RecentManager.h create mode 100644 tikzit-old/src/gtk/RecentManager.m create mode 100644 tikzit-old/src/gtk/SelectTool.h create mode 100644 tikzit-old/src/gtk/SelectTool.m create mode 100644 tikzit-old/src/gtk/SelectionPane.h create mode 100644 tikzit-old/src/gtk/SelectionPane.m create mode 100644 tikzit-old/src/gtk/SettingsDialog.h create mode 100644 tikzit-old/src/gtk/SettingsDialog.m create mode 100644 tikzit-old/src/gtk/Shape+Render.h create mode 100644 tikzit-old/src/gtk/Shape+Render.m create mode 100644 tikzit-old/src/gtk/StyleManager+Storage.h create mode 100644 tikzit-old/src/gtk/StyleManager+Storage.m create mode 100644 tikzit-old/src/gtk/Surface.h create mode 100644 tikzit-old/src/gtk/TZFoundation.h create mode 100644 tikzit-old/src/gtk/TikzDocument.h create mode 100644 tikzit-old/src/gtk/TikzDocument.m create mode 100644 tikzit-old/src/gtk/Tool.h create mode 100644 tikzit-old/src/gtk/ToolBox.h create mode 100644 tikzit-old/src/gtk/ToolBox.m create mode 100644 tikzit-old/src/gtk/WidgetSurface.h create mode 100644 tikzit-old/src/gtk/WidgetSurface.m create mode 100644 tikzit-old/src/gtk/Window.h create mode 100644 tikzit-old/src/gtk/Window.m create mode 100644 tikzit-old/src/gtk/cairo_helpers.h create mode 100644 tikzit-old/src/gtk/cairo_helpers.m create mode 100644 tikzit-old/src/gtk/clipboard.h create mode 100644 tikzit-old/src/gtk/clipboard.m create mode 100644 tikzit-old/src/gtk/gtkhelpers.h create mode 100644 tikzit-old/src/gtk/gtkhelpers.m create mode 100644 tikzit-old/src/gtk/logo.h create mode 100644 tikzit-old/src/gtk/logo.m create mode 100644 tikzit-old/src/gtk/main.m create mode 100644 tikzit-old/src/gtk/mkdtemp.h create mode 100644 tikzit-old/src/gtk/mkdtemp.m create mode 100644 tikzit-old/src/gtk/stat.h create mode 100644 tikzit-old/src/gtk/test/gtk.m create mode 100644 tikzit-old/src/gtk/test/main.m create mode 100644 tikzit-old/src/gtk/tzstockitems.h create mode 100644 tikzit-old/src/gtk/tzstockitems.m create mode 100644 tikzit-old/src/gtk/tztoolpalette.h create mode 100644 tikzit-old/src/gtk/tztoolpalette.m create mode 100644 tikzit-old/src/osx/AppDelegate.h create mode 100644 tikzit-old/src/osx/AppDelegate.m create mode 100644 tikzit-old/src/osx/CALayer+DrawLabel.h create mode 100644 tikzit-old/src/osx/CALayer+DrawLabel.m create mode 100644 tikzit-old/src/osx/CoreGraphicsRenderContext.h create mode 100644 tikzit-old/src/osx/CoreGraphicsRenderContext.m create mode 100644 tikzit-old/src/osx/CustomNodeCellView.h create mode 100644 tikzit-old/src/osx/CustomNodeCellView.m create mode 100644 tikzit-old/src/osx/CustomNodeController.h create mode 100644 tikzit-old/src/osx/CustomNodeController.m create mode 100644 tikzit-old/src/osx/CustomNodes.xib create mode 100644 tikzit-old/src/osx/DraggablePDFView.h create mode 100644 tikzit-old/src/osx/DraggablePDFView.m create mode 100644 tikzit-old/src/osx/EdgeControlLayer.h create mode 100644 tikzit-old/src/osx/EdgeControlLayer.m create mode 100644 tikzit-old/src/osx/EdgeStyle+Coder.h create mode 100644 tikzit-old/src/osx/EdgeStyle+Coder.m create mode 100644 tikzit-old/src/osx/Graph+Coder.h create mode 100644 tikzit-old/src/osx/Graph+Coder.m create mode 100644 tikzit-old/src/osx/GraphicsView.h create mode 100644 tikzit-old/src/osx/GraphicsView.m create mode 100644 tikzit-old/src/osx/Grid.h create mode 100644 tikzit-old/src/osx/Grid.m create mode 100644 tikzit-old/src/osx/MultiCombo.h create mode 100644 tikzit-old/src/osx/MultiCombo.m create mode 100644 tikzit-old/src/osx/MultiField.h create mode 100644 tikzit-old/src/osx/MultiField.m create mode 100644 tikzit-old/src/osx/NilToEmptyStringTransformer.h create mode 100644 tikzit-old/src/osx/NilToEmptyStringTransformer.m create mode 100644 tikzit-old/src/osx/NodeLayer.h create mode 100644 tikzit-old/src/osx/NodeLayer.m create mode 100644 tikzit-old/src/osx/NodeSelectionLayer.h create mode 100644 tikzit-old/src/osx/NodeSelectionLayer.m create mode 100644 tikzit-old/src/osx/NodeStyle+Coder.h create mode 100644 tikzit-old/src/osx/NodeStyle+Coder.m create mode 100644 tikzit-old/src/osx/ParseErrorView.h create mode 100644 tikzit-old/src/osx/ParseErrorView.m create mode 100644 tikzit-old/src/osx/PreambleController.h create mode 100644 tikzit-old/src/osx/PreambleController.m create mode 100644 tikzit-old/src/osx/Preambles+Coder.h create mode 100644 tikzit-old/src/osx/Preambles+Coder.m create mode 100644 tikzit-old/src/osx/PreferenceController.h create mode 100644 tikzit-old/src/osx/PreferenceController.m create mode 100644 tikzit-old/src/osx/Preferences.xib create mode 100644 tikzit-old/src/osx/PreviewController.h create mode 100644 tikzit-old/src/osx/PreviewController.m create mode 100644 tikzit-old/src/osx/PropertyInspectorController.h create mode 100644 tikzit-old/src/osx/PropertyInspectorController.m create mode 100644 tikzit-old/src/osx/SelectBoxLayer.h create mode 100644 tikzit-old/src/osx/SelectBoxLayer.m create mode 100644 tikzit-old/src/osx/SelectableCollectionViewItem.h create mode 100644 tikzit-old/src/osx/SelectableCollectionViewItem.m create mode 100644 tikzit-old/src/osx/SelectableNodeView.h create mode 100644 tikzit-old/src/osx/SelectableNodeView.m create mode 100644 tikzit-old/src/osx/StylePaletteController.h create mode 100644 tikzit-old/src/osx/StylePaletteController.m create mode 100644 tikzit-old/src/osx/TikzDocument.h create mode 100644 tikzit-old/src/osx/TikzDocument.m create mode 100644 tikzit-old/src/osx/TikzFormatter.h create mode 100644 tikzit-old/src/osx/TikzFormatter.m create mode 100644 tikzit-old/src/osx/TikzSourceController.h create mode 100644 tikzit-old/src/osx/TikzSourceController.m create mode 100644 tikzit-old/src/osx/TikzWindowController.h create mode 100644 tikzit-old/src/osx/TikzWindowController.m create mode 100644 tikzit-old/src/osx/ToolPaletteController.h create mode 100644 tikzit-old/src/osx/ToolPaletteController.m create mode 100644 tikzit-old/src/osx/UpdatePreferenceController.h create mode 100644 tikzit-old/src/osx/UpdatePreferenceController.m create mode 100644 tikzit-old/src/osx/UpdatePreferencePanel.xib create mode 100644 tikzit-old/src/osx/main.m create mode 100644 tikzit-old/src/osx/test/main.m create mode 100644 tikzit-old/src/osx/test/osx.m create mode 100644 tikzit-old/src/tikzit.rc create mode 100644 tikzit-old/text-x-generic.png create mode 100644 tikzit-old/text-x-script.png create mode 100644 tikzit-old/tikzit.icns create mode 100644 tikzit-old/tikzit.ico create mode 100644 tikzit-old/tikzit.spec create mode 100644 tikzit-old/tikzit48x48.png create mode 100644 tikzit-old/tikzit_dsa_pub.pem create mode 100644 tikzit-old/tikzitdoc.icns create mode 100644 tikzit-old/transform-crop-and-resize.png create mode 100644 tikzit-old/transform-move.png create mode 100755 tikzit-old/updates.png delete mode 100644 www/htdocs/appcast/rnotes-release.html delete mode 100644 www/htdocs/appcast/rnotes.css delete mode 100644 www/htdocs/appcast/rnotes.html delete mode 100644 www/htdocs/appcast/tikzit-release.xml delete mode 100644 www/htdocs/appcast/tikzit.xml delete mode 100644 www/htdocs/bnf.txt delete mode 100644 www/htdocs/favicon.ico delete mode 100644 www/htdocs/images/apple.png delete mode 100644 www/htdocs/images/linux.png delete mode 100644 www/htdocs/images/man/bend.png delete mode 100644 www/htdocs/images/man/bezier.png delete mode 100644 www/htdocs/images/man/bounding_box.png delete mode 100644 www/htdocs/images/man/compound.png delete mode 100644 www/htdocs/images/man/new_edge.png delete mode 100644 www/htdocs/images/man/preambles.png delete mode 100644 www/htdocs/images/man/preview.png delete mode 100644 www/htdocs/images/man/property_inspector.png delete mode 100644 www/htdocs/images/man/shape.png delete mode 100644 www/htdocs/images/man/style_inspector.png delete mode 100644 www/htdocs/images/man/tools.png delete mode 100644 www/htdocs/images/source.png delete mode 100644 www/htdocs/images/ubuntu.png delete mode 100644 www/htdocs/images/web_logo.png delete mode 100644 www/htdocs/images/web_logo_linux.png delete mode 100644 www/htdocs/images/web_logo_manual.png delete mode 100644 www/htdocs/images/windows.png delete mode 100644 www/htdocs/index.html delete mode 100644 www/htdocs/link.php delete mode 100644 www/htdocs/linux/index.html delete mode 100644 www/htdocs/main.css delete mode 100644 www/htdocs/manual.html delete mode 100644 www/images/apple.ai delete mode 100644 www/images/source.ai delete mode 100644 www/images/tikzit.ai delete mode 100644 www/images/tikzit.ico delete mode 100644 www/images/tikzit.svg delete mode 100644 www/images/tikzit_bg.ai delete mode 100644 www/images/tikzit_bg.psd delete mode 100644 www/images/tikzit_doc.ai delete mode 100644 www/images/ubuntu.ai delete mode 100644 www/images/web_logo.ai delete mode 100644 www/images/web_logo_linux.ai delete mode 100644 www/images/web_logo_manual.ai delete mode 100644 www/images/windows.ai delete mode 100644 www/sourceforge/README-SOURCEFORGE.txt delete mode 100644 www/sourceforge/README.mkd delete mode 100644 www/sourceforge/index.html diff --git a/tikzit-1/.gitignore b/tikzit-1/.gitignore deleted file mode 100644 index fc1d580..0000000 --- a/tikzit-1/.gitignore +++ /dev/null @@ -1,235 +0,0 @@ -# Previous gitignore items - -*~ -*.swp -*.o -.deps -.dirstamp -Makefile -Makefile.in -/aclocal.m4 -/autom4te.cache -/config.guess -/config.log -/config.status -/config.sub -/configure -/depcomp -/install-sh -/missing -/src/tikzit -/src/tikzit.res -/src/common/tikzlexer.h -/src/common/tikzlexer.m -/src/common/tikzparser.m -/src/common/tikzparser.h -/src/gtk/icondata.m -/src/gtk/logodata.m -/src/gtk/edgedecdata.m -/tikzit-*.tar.gz -/tikzit-*.tar.bz2 -xbuild - -######################### -# .gitignore file for Xcode4 and Xcode5 Source projects -# -# Apple bugs, waiting for Apple to fix/respond: -# -# 15564624 - what does the xccheckout file in Xcode5 do? Where's the documentation? -# -# Version 2.3 -# For latest version, see: http://stackoverflow.com/questions/49478/git-ignore-file-for-xcode-projects -# -# 2014 updates: -# - appended non-standard items DISABLED by default (uncomment if you use those tools) -# - removed the edit that an SO.com moderator made without bothering to ask me -# - researched CocoaPods .lock more carefully, thanks to Gokhan Celiker -# 2013 updates: -# - fixed the broken "save personal Schemes" -# - added line-by-line explanations for EVERYTHING (some were missing) -# -# NB: if you are storing "built" products, this WILL NOT WORK, -# and you should use a different .gitignore (or none at all) -# This file is for SOURCE projects, where there are many extra -# files that we want to exclude -# -######################### - -##### -# OS X temporary files that should never be committed -# -# c.f. http://www.westwind.com/reference/os-x/invisibles.html - -.DS_Store -.Trashes -*.swp - -# -# *.lock - this is used and abused by many editors for many different things. -# For the main ones I use (e.g. Eclipse), it should be excluded -# from source-control, but YMMV. -# (lock files are usually local-only file-synchronization on the local FS that should NOT go in git) -# c.f. the "OPTIONAL" section at bottom though, for tool-specific variations! - -*.lock - - -# -# profile - REMOVED temporarily (on double-checking, I can't find it in OS X docs?) -#profile - - -#### -# Xcode temporary files that should never be committed -# -# NB: NIB/XIB files still exist even on Storyboard projects, so we want this... - -*~.nib - - -#### -# Xcode build files - -# -# NB: slash on the end, so we only remove the FOLDER, not any files that were badly named "DerivedData" - -DerivedData/ - -# NB: slash on the end, so we only remove the FOLDER, not any files that were badly named "build" - -build/ - - -##### -# Xcode private settings (window sizes, bookmarks, breakpoints, custom executables, smart groups) -# -# This is complicated: -# -# SOMETIMES you need to put this file in version control. -# Apple designed it poorly - if you use "custom executables", they are -# saved in this file. -# 99% of projects do NOT use those, so they do NOT want to version control this file. -# ..but if you're in the 1%, comment out the line "*.pbxuser" - -# .pbxuser: http://lists.apple.com/archives/xcode-users/2004/Jan/msg00193.html - -*.pbxuser - -# .mode1v3: http://lists.apple.com/archives/xcode-users/2007/Oct/msg00465.html - -*.mode1v3 - -# .mode2v3: http://lists.apple.com/archives/xcode-users/2007/Oct/msg00465.html - -*.mode2v3 - -# .perspectivev3: http://stackoverflow.com/questions/5223297/xcode-projects-what-is-a-perspectivev3-file - -*.perspectivev3 - -# NB: also, whitelist the default ones, some projects need to use these -!default.pbxuser -!default.mode1v3 -!default.mode2v3 -!default.perspectivev3 - - -#### -# Xcode 4 - semi-personal settings -# -# -# OPTION 1: --------------------------------- -# throw away ALL personal settings (including custom schemes! -# - unless they are "shared") -# -# NB: this is exclusive with OPTION 2 below -xcuserdata - -# OPTION 2: --------------------------------- -# get rid of ALL personal settings, but KEEP SOME OF THEM -# - NB: you must manually uncomment the bits you want to keep -# -# NB: this *requires* git v1.8.2 or above; you may need to upgrade to latest OS X, -# or manually install git over the top of the OS X version -# NB: this is exclusive with OPTION 1 above -# -#xcuserdata/**/* - -# (requires option 2 above): Personal Schemes -# -#!xcuserdata/**/xcschemes/* - -#### -# XCode 4 workspaces - more detailed -# -# Workspaces are important! They are a core feature of Xcode - don't exclude them :) -# -# Workspace layout is quite spammy. For reference: -# -# /(root)/ -# /(project-name).xcodeproj/ -# project.pbxproj -# /project.xcworkspace/ -# contents.xcworkspacedata -# /xcuserdata/ -# /(your name)/xcuserdatad/ -# UserInterfaceState.xcuserstate -# /xcsshareddata/ -# /xcschemes/ -# (shared scheme name).xcscheme -# /xcuserdata/ -# /(your name)/xcuserdatad/ -# (private scheme).xcscheme -# xcschememanagement.plist -# -# - -#### -# Xcode 4 - Deprecated classes -# -# Allegedly, if you manually "deprecate" your classes, they get moved here. -# -# We're using source-control, so this is a "feature" that we do not want! - -*.moved-aside - -#### -# OPTIONAL: Some well-known tools that people use side-by-side with Xcode / iOS development -# -# NB: I'd rather not include these here, but gitignore's design is weak and doesn't allow -# modular gitignore: you have to put EVERYTHING in one file. -# -# COCOAPODS: -# -# c.f. http://guides.cocoapods.org/using/using-cocoapods.html#what-is-a-podfilelock -# c.f. http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control -# -#!Podfile.lock -# -# RUBY: -# -# c.f. http://yehudakatz.com/2010/12/16/clarifying-the-roles-of-the-gemspec-and-gemfile/ -# -#!Gemfile.lock -# -# IDEA: -# -#.idea -# -# TEXTMATE: -# -# -- UNVERIFIED: c.f. http://stackoverflow.com/a/50283/153422 -# -#tm_build_errors - -#### -# UNKNOWN: recommended by others, but I can't discover what these files are -# -# Community suggestions (unverified, no evidence available - DISABLED by default) -# -# 1. Xcode 5 - VCS file -# -# "The data in this file not represent state of your project. -# If you'll leave this file in git - you will have merge conflicts during -# pull your cahnges to other's repo" -# -#*.xccheckout \ No newline at end of file diff --git a/tikzit-1/AH_latex_head.png b/tikzit-1/AH_latex_head.png deleted file mode 100644 index b25cf6d..0000000 Binary files a/tikzit-1/AH_latex_head.png and /dev/null differ diff --git a/tikzit-1/AH_latex_tail.png b/tikzit-1/AH_latex_tail.png deleted file mode 100644 index 0825cda..0000000 Binary files a/tikzit-1/AH_latex_tail.png and /dev/null differ diff --git a/tikzit-1/AH_none.png b/tikzit-1/AH_none.png deleted file mode 100644 index 6322374..0000000 Binary files a/tikzit-1/AH_none.png and /dev/null differ diff --git a/tikzit-1/AH_plain_head.png b/tikzit-1/AH_plain_head.png deleted file mode 100644 index 8a398fa..0000000 Binary files a/tikzit-1/AH_plain_head.png and /dev/null differ diff --git a/tikzit-1/AH_plain_tail.png b/tikzit-1/AH_plain_tail.png deleted file mode 100644 index 45b1876..0000000 Binary files a/tikzit-1/AH_plain_tail.png and /dev/null differ diff --git a/tikzit-1/COPYING b/tikzit-1/COPYING deleted file mode 100644 index 1f963da..0000000 --- a/tikzit-1/COPYING +++ /dev/null @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. - diff --git a/tikzit-1/DESIGN-GTK b/tikzit-1/DESIGN-GTK deleted file mode 100644 index 7952a34..0000000 --- a/tikzit-1/DESIGN-GTK +++ /dev/null @@ -1,23 +0,0 @@ -Some documentation on how the GTK+ port is designed. - -State classes: - -StyleManager keeps track of what user-defined styles the application -knows about, and which one is currently "active". The active style -is used when creating new nodes. - -Preambles keeps track of the preambles used for previews. - - -GUI classes: - -MainWindow is the core class that manages the application as a whole. -It manages the main GtkWindow and is generally responsible for loading -the various UI elements. It also keeps track of the main application -configuration file, the user-defined styles (via StyleManager) and the -custom preambles (via Preambles). - -The Menu class manages the menu and toolbar for MainWindow. It uses -GtkUiManager to load these from an XML description, and deals with the -GTK+ callbacks for the various actions. - diff --git a/tikzit-1/ED_arrow.png b/tikzit-1/ED_arrow.png deleted file mode 100644 index 153d2e1..0000000 Binary files a/tikzit-1/ED_arrow.png and /dev/null differ diff --git a/tikzit-1/ED_none.png b/tikzit-1/ED_none.png deleted file mode 100644 index f95140c..0000000 Binary files a/tikzit-1/ED_none.png and /dev/null differ diff --git a/tikzit-1/ED_tick.png b/tikzit-1/ED_tick.png deleted file mode 100644 index a3882fe..0000000 Binary files a/tikzit-1/ED_tick.png and /dev/null differ diff --git a/tikzit-1/English.lproj/Credits.rtf b/tikzit-1/English.lproj/Credits.rtf deleted file mode 100644 index 708d138..0000000 --- a/tikzit-1/English.lproj/Credits.rtf +++ /dev/null @@ -1,18 +0,0 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf250 -{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fnil\fcharset0 LucidaSans-Typewriter;} -{\colortbl;\red255\green255\blue255;\red0\green0\blue0;} -\vieww9000\viewh8400\viewkind0 -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural - -\f0\b\fs24 \cf0 TikZiT\ -\ -Copyright 2010 Aleks Kissinger. All rights reserved.\ - -\b0 \ -\pard\tx560\pardeftab560\ql\qnatural\pardirnatural - -\f1\fs22 \cf2 \CocoaLigature0 TikZiT is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\ -\ -TikZiT is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\ -\ -You should have received a copy of the GNU General Public License along with TikZiT. If not, see .} \ No newline at end of file diff --git a/tikzit-1/English.lproj/CustomNodes.xib b/tikzit-1/English.lproj/CustomNodes.xib deleted file mode 100644 index 33f6e3a..0000000 --- a/tikzit-1/English.lproj/CustomNodes.xib +++ /dev/null @@ -1,256 +0,0 @@ - - - - - - - - - - - - - - - - - - - - name - strokeThickness - strokeColor - fillColor - strokeColorIsKnown - fillColorIsKnown - representedObject.name - shapeName - scale - @distinctUnionOfObjects.category - category - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \begin{tikzpicture} - -\end{tikzpicture} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tikzit-1/English.lproj/InfoPlist.strings b/tikzit-1/English.lproj/InfoPlist.strings deleted file mode 100644 index 477b28f..0000000 --- a/tikzit-1/English.lproj/InfoPlist.strings +++ /dev/null @@ -1,2 +0,0 @@ -/* Localized versions of Info.plist keys */ - diff --git a/tikzit-1/English.lproj/MainMenu.xib b/tikzit-1/English.lproj/MainMenu.xib deleted file mode 100644 index c7f22d7..0000000 --- a/tikzit-1/English.lproj/MainMenu.xib +++ /dev/null @@ -1,453 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -CA - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tikzit-1/English.lproj/Preamble.xib b/tikzit-1/English.lproj/Preamble.xib deleted file mode 100644 index 54a4125..0000000 --- a/tikzit-1/English.lproj/Preamble.xib +++ /dev/null @@ -1,235 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NSNegateBoolean - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NSNegateBoolean - - - - - - - - - - - - - - - - - - - - - - - - - - - - key - - - default - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tikzit-1/English.lproj/Preview.xib b/tikzit-1/English.lproj/Preview.xib deleted file mode 100644 index cb1e82c..0000000 --- a/tikzit-1/English.lproj/Preview.xib +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tikzit-1/English.lproj/PropertyInspector.xib b/tikzit-1/English.lproj/PropertyInspector.xib deleted file mode 100644 index 9f19b5c..0000000 --- a/tikzit-1/English.lproj/PropertyInspector.xib +++ /dev/null @@ -1,769 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Multiple Values - NilToEmptyStringTransformer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NSNegateBoolean - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NilToEmptyStringTransformer - - - - - - - - - - - - - - - - - - - - - - - NSNegateBoolean - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NilToEmptyStringTransformer - - - - - - - - - - - - - - - - - - - - - - - NSNegateBoolean - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NilToEmptyStringTransformer - - - - - - - - - - - - - - - - - - - - - - - NSNegateBoolean - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NilToEmptyStringTransformer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - key - value - isAtom - - - - - key - value - isAtom - - - - - key - value - isAtom - - - - - key - value - isAtom - - - - - label - - - - - - - - edgeNode - - - - - - - - - - - - - - - - - - - - - - - - - - - NilToEmptyStringTransformer - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tikzit-1/English.lproj/StylePalette.xib b/tikzit-1/English.lproj/StylePalette.xib deleted file mode 100644 index 6385ba8..0000000 --- a/tikzit-1/English.lproj/StylePalette.xib +++ /dev/null @@ -1,631 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - uncategorized - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - uncategorized - - - - - - - - - name - strokeThickness - strokeColor - fillColor - strokeColorIsKnown - fillColorIsKnown - representedObject.name - shapeName - scale - @distinctUnionOfObjects.category - category - - - - - - - - @distinctUnionOfObjects.category - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - uncategorized - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - uncategorized - - - - - - - - - - - name - headStyle - tailStyle - decorationStyle - category - - - - - - - - name - headStyle - tailStyle - decorationStyle - category - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tikzit-1/English.lproj/TikzDocument.xib b/tikzit-1/English.lproj/TikzDocument.xib deleted file mode 100644 index 842b810..0000000 --- a/tikzit-1/English.lproj/TikzDocument.xib +++ /dev/null @@ -1,161 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \begin{tikzpicture} - -\end{tikzpicture} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tikzit-1/English.lproj/UserDefaults.plist b/tikzit-1/English.lproj/UserDefaults.plist deleted file mode 100644 index cdd5c8f..0000000 --- a/tikzit-1/English.lproj/UserDefaults.plist +++ /dev/null @@ -1,10 +0,0 @@ - - - - - net.sourceforge.tikzit.pdflatexpath - /usr/texbin/pdflatex - net.sourceforge.tikzit.previewfocus - - - diff --git a/tikzit-1/Frameworks/SFBInspectors.framework/Headers b/tikzit-1/Frameworks/SFBInspectors.framework/Headers deleted file mode 120000 index a177d2a..0000000 --- a/tikzit-1/Frameworks/SFBInspectors.framework/Headers +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Headers \ No newline at end of file diff --git a/tikzit-1/Frameworks/SFBInspectors.framework/Resources b/tikzit-1/Frameworks/SFBInspectors.framework/Resources deleted file mode 120000 index 953ee36..0000000 --- a/tikzit-1/Frameworks/SFBInspectors.framework/Resources +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Resources \ No newline at end of file diff --git a/tikzit-1/Frameworks/SFBInspectors.framework/SFBInspectors b/tikzit-1/Frameworks/SFBInspectors.framework/SFBInspectors deleted file mode 120000 index d0c5a0b..0000000 --- a/tikzit-1/Frameworks/SFBInspectors.framework/SFBInspectors +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/SFBInspectors \ No newline at end of file diff --git a/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPane.h b/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPane.h deleted file mode 100644 index b50c12d..0000000 --- a/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPane.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (C) 2009 Stephen F. Booth - * All Rights Reserved - */ - -#import - -#define INSPECTOR_PANE_HEADER_HEIGHT 17 - -@class SFBInspectorPaneHeader, SFBInspectorPaneBody; - -@interface SFBInspectorPane : NSView -{ -@private - BOOL _collapsed; - SFBInspectorPaneHeader *_headerView; - SFBInspectorPaneBody *_bodyView; -} - -@property (readonly, assign, getter=isCollapsed) BOOL collapsed; - -- (NSString *) title; -- (void) setTitle:(NSString *)title; - -- (IBAction) toggleCollapsed:(id)sender; -- (void) setCollapsed:(BOOL)collapsed animate:(BOOL)animate; - -- (SFBInspectorPaneHeader *) headerView; -- (SFBInspectorPaneBody *) bodyView; - -@end diff --git a/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPaneBody.h b/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPaneBody.h deleted file mode 100644 index 250f9e6..0000000 --- a/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPaneBody.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (C) 2009 Stephen F. Booth - * All Rights Reserved - */ - -#import - -@interface SFBInspectorPaneBody : NSView -{ -@private - CGFloat _normalHeight; -} - -@property (readonly, assign) CGFloat normalHeight; - -@end diff --git a/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPaneHeader.h b/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPaneHeader.h deleted file mode 100644 index 3512d75..0000000 --- a/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPaneHeader.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2009 Stephen F. Booth - * All Rights Reserved - */ - -#import - -@class SFBInspectorPane; - -@interface SFBInspectorPaneHeader : NSView -{ -@private - BOOL _pressed; - NSButton *_disclosureButton; - NSTextField *_titleTextField; -} - -- (NSString *) title; -- (void) setTitle:(NSString *)title; - -- (NSButton *) disclosureButton; -- (NSTextField *) titleTextField; - -@end diff --git a/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorView.h b/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorView.h deleted file mode 100644 index e7f4b53..0000000 --- a/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorView.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (C) 2009 Stephen F. Booth - * All Rights Reserved - */ - -#import - -@interface SFBInspectorView : NSView -{ -@private - NSSize _initialWindowSize; -} - -- (void) addInspectorPaneController:(NSViewController *)paneController; -- (void) addInspectorPane:(NSView *)paneBody title:(NSString *)title; - -@end diff --git a/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelector.h b/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelector.h deleted file mode 100644 index 8645914..0000000 --- a/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelector.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (C) 2009 Stephen F. Booth - * All Rights Reserved - */ - -#import - -#define VIEW_SELECTOR_BAR_HEIGHT 25 - -@class SFBViewSelectorBar; - -@interface SFBViewSelector : NSView -{ -@private - NSSize _initialWindowSize; - SFBViewSelectorBar *_selectorBar; - NSView *_bodyView; -} - -- (SFBViewSelectorBar *) selectorBar; - -@end diff --git a/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelectorBar.h b/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelectorBar.h deleted file mode 100644 index d0c8c30..0000000 --- a/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelectorBar.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2009 Stephen F. Booth - * All Rights Reserved - */ - -#import - -@class SFBViewSelectorBarItem; - -@interface SFBViewSelectorBar : NSView -{ -@private - NSInteger _selectedIndex; - NSInteger _pressedIndex; - NSMutableArray *_items; -} - -@property (assign) NSInteger selectedIndex; -@property (readonly) SFBViewSelectorBarItem * selectedItem; - -- (void) addItem:(SFBViewSelectorBarItem *)item; - -- (BOOL) selectItem:(SFBViewSelectorBarItem *)item; -- (BOOL) selectItemWithIdentifer:(NSString *)itemIdentifier; - -- (SFBViewSelectorBarItem *) itemAtIndex:(NSInteger)itemIndex; -- (SFBViewSelectorBarItem *) itemWithIdentifier:(NSString *)itemIdentifier; - -@end diff --git a/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelectorBarItem.h b/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelectorBarItem.h deleted file mode 100644 index c18cfb3..0000000 --- a/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelectorBarItem.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (C) 2009 Stephen F. Booth - * All Rights Reserved - */ - -#import - -@interface SFBViewSelectorBarItem : NSObject -{ -@private - NSString *_identifier; - NSString *_label; - NSString *_tooltip; - NSImage *_image; - NSView *_view; -} - -@property (copy) NSString * identifier; -@property (copy) NSString * label; -@property (copy) NSString * tooltip; -@property (copy) NSImage * image; -@property (retain) NSView * view; - -+ (id) itemWithIdentifier:(NSString *)identifier label:(NSString *)label tooltip:(NSString *)tooltip image:(NSImage *)image view:(NSView *)view; - -- (id) initWithIdentifier:(NSString *)identifier label:(NSString *)label tooltip:(NSString *)tooltip image:(NSImage *)image view:(NSView *)view; - -@end diff --git a/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Resources/English.lproj/InfoPlist.strings b/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Resources/English.lproj/InfoPlist.strings deleted file mode 100644 index dea12de..0000000 Binary files a/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Resources/English.lproj/InfoPlist.strings and /dev/null differ diff --git a/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Resources/Info.plist b/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Resources/Info.plist deleted file mode 100644 index d3e80f3..0000000 --- a/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/Resources/Info.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - SFBInspectors - CFBundleIdentifier - org.sbooth.Inspectors - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - SFBInspectors - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - - diff --git a/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/SFBInspectors b/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/SFBInspectors deleted file mode 100755 index 6174fbb..0000000 Binary files a/tikzit-1/Frameworks/SFBInspectors.framework/Versions/A/SFBInspectors and /dev/null differ diff --git a/tikzit-1/Frameworks/SFBInspectors.framework/Versions/Current b/tikzit-1/Frameworks/SFBInspectors.framework/Versions/Current deleted file mode 120000 index 8c7e5a6..0000000 --- a/tikzit-1/Frameworks/SFBInspectors.framework/Versions/Current +++ /dev/null @@ -1 +0,0 @@ -A \ No newline at end of file diff --git a/tikzit-1/Frameworks/Sparkle.framework/Headers b/tikzit-1/Frameworks/Sparkle.framework/Headers deleted file mode 120000 index a177d2a..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Headers +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Headers \ No newline at end of file diff --git a/tikzit-1/Frameworks/Sparkle.framework/Resources b/tikzit-1/Frameworks/Sparkle.framework/Resources deleted file mode 120000 index 953ee36..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Resources +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Resources \ No newline at end of file diff --git a/tikzit-1/Frameworks/Sparkle.framework/Sparkle b/tikzit-1/Frameworks/Sparkle.framework/Sparkle deleted file mode 120000 index b2c5273..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Sparkle +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Sparkle \ No newline at end of file diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcast.h b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcast.h deleted file mode 100644 index 171148a..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcast.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// SUAppcast.h -// Sparkle -// -// Created by Andy Matuschak on 3/12/06. -// Copyright 2006 Andy Matuschak. All rights reserved. -// - -#ifndef SUAPPCAST_H -#define SUAPPCAST_H - -@class SUAppcastItem; -@interface SUAppcast : NSObject { - NSArray *items; - NSString *userAgentString; - id delegate; - NSMutableData *incrementalData; -} - -- (void)fetchAppcastFromURL:(NSURL *)url; -- (void)setDelegate:delegate; -- (void)setUserAgentString:(NSString *)userAgentString; - -- (NSArray *)items; - -@end - -@interface NSObject (SUAppcastDelegate) -- (void)appcastDidFinishLoading:(SUAppcast *)appcast; -- (void)appcast:(SUAppcast *)appcast failedToLoadWithError:(NSError *)error; -@end - -#endif diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h deleted file mode 100644 index 7f1ca65..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h +++ /dev/null @@ -1,47 +0,0 @@ -// -// SUAppcastItem.h -// Sparkle -// -// Created by Andy Matuschak on 3/12/06. -// Copyright 2006 Andy Matuschak. All rights reserved. -// - -#ifndef SUAPPCASTITEM_H -#define SUAPPCASTITEM_H - -@interface SUAppcastItem : NSObject { - NSString *title; - NSDate *date; - NSString *itemDescription; - - NSURL *releaseNotesURL; - - NSString *DSASignature; - NSString *minimumSystemVersion; - - NSURL *fileURL; - NSString *versionString; - NSString *displayVersionString; - - NSDictionary *propertiesDictionary; -} - -// Initializes with data from a dictionary provided by the RSS class. -- initWithDictionary:(NSDictionary *)dict; - -- (NSString *)title; -- (NSString *)versionString; -- (NSString *)displayVersionString; -- (NSDate *)date; -- (NSString *)itemDescription; -- (NSURL *)releaseNotesURL; -- (NSURL *)fileURL; -- (NSString *)DSASignature; -- (NSString *)minimumSystemVersion; - -// Returns the dictionary provided in initWithDictionary; this might be useful later for extensions. -- (NSDictionary *)propertiesDictionary; - -@end - -#endif diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Headers/SUUpdater.h b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Headers/SUUpdater.h deleted file mode 100644 index e78c4d3..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Headers/SUUpdater.h +++ /dev/null @@ -1,118 +0,0 @@ -// -// SUUpdater.h -// Sparkle -// -// Created by Andy Matuschak on 1/4/06. -// Copyright 2006 Andy Matuschak. All rights reserved. -// - -#ifndef SUUPDATER_H -#define SUUPDATER_H - -#import - -@class SUUpdateDriver, SUAppcastItem, SUHost, SUAppcast; -@interface SUUpdater : NSObject { - NSTimer *checkTimer; - SUUpdateDriver *driver; - - SUHost *host; - IBOutlet id delegate; -} - -+ (SUUpdater *)sharedUpdater; -+ (SUUpdater *)updaterForBundle:(NSBundle *)bundle; -- (NSBundle *)hostBundle; - -- (void)setDelegate:(id)delegate; -- delegate; - -- (void)setAutomaticallyChecksForUpdates:(BOOL)automaticallyChecks; -- (BOOL)automaticallyChecksForUpdates; - -- (void)setUpdateCheckInterval:(NSTimeInterval)interval; -- (NSTimeInterval)updateCheckInterval; - -- (void)setFeedURL:(NSURL *)feedURL; -- (NSURL *)feedURL; - -- (void)setSendsSystemProfile:(BOOL)sendsSystemProfile; -- (BOOL)sendsSystemProfile; - -- (void)setAutomaticallyDownloadsUpdates:(BOOL)automaticallyDownloadsUpdates; -- (BOOL)automaticallyDownloadsUpdates; - -// This IBAction is meant for a main menu item. Hook up any menu item to this action, -// and Sparkle will check for updates and report back its findings verbosely. -- (IBAction)checkForUpdates:sender; - -// This kicks off an update meant to be programmatically initiated. That is, it will display no UI unless it actually finds an update, -// in which case it proceeds as usual. If the fully automated updating is turned on, however, this will invoke that behavior, and if an -// update is found, it will be downloaded and prepped for installation. -- (void)checkForUpdatesInBackground; - -// Date of last update check. Returns null if no check has been performed. -- (NSDate*)lastUpdateCheckDate; - -// This begins a "probing" check for updates which will not actually offer to update to that version. The delegate methods, though, -// (up to updater:didFindValidUpdate: and updaterDidNotFindUpdate:), are called, so you can use that information in your UI. -- (void)checkForUpdateInformation; - -// Call this to appropriately schedule or cancel the update checking timer according to the preferences for time interval and automatic checks. This call does not change the date of the next check, but only the internal NSTimer. -- (void)resetUpdateCycle; - -- (BOOL)updateInProgress; -@end - -@interface NSObject (SUUpdaterDelegateInformalProtocol) -// This method allows you to add extra parameters to the appcast URL, potentially based on whether or not Sparkle will also be sending along the system profile. This method should return an array of dictionaries with keys: "key", "value", "displayKey", "displayValue", the latter two being specifically for display to the user. -- (NSArray *)feedParametersForUpdater:(SUUpdater *)updater sendingSystemProfile:(BOOL)sendingProfile; - -// Use this to override the default behavior for Sparkle prompting the user about automatic update checks. -- (BOOL)updaterShouldPromptForPermissionToCheckForUpdates:(SUUpdater *)bundle; - -// Implement this if you want to do some special handling with the appcast once it finishes loading. -- (void)updater:(SUUpdater *)updater didFinishLoadingAppcast:(SUAppcast *)appcast; - -// If you're using special logic or extensions in your appcast, implement this to use your own logic for finding -// a valid update, if any, in the given appcast. -- (SUAppcastItem *)bestValidUpdateInAppcast:(SUAppcast *)appcast forUpdater:(SUUpdater *)bundle; - -// Sent when a valid update is found by the update driver. -- (void)updater:(SUUpdater *)updater didFindValidUpdate:(SUAppcastItem *)update; - -// Sent when a valid update is not found. -- (void)updaterDidNotFindUpdate:(SUUpdater *)update; - -// Sent immediately before installing the specified update. -- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)update; - -// Return YES to delay the relaunch until you do some processing; invoke the given NSInvocation to continue. -- (BOOL)updater:(SUUpdater *)updater shouldPostponeRelaunchForUpdate:(SUAppcastItem *)update untilInvoking:(NSInvocation *)invocation; - -// Called immediately before relaunching. -- (void)updaterWillRelaunchApplication:(SUUpdater *)updater; - -// This method allows you to provide a custom version comparator. -// If you don't implement this method or return nil, the standard version comparator will be used. -- (id )versionComparatorForUpdater:(SUUpdater *)updater; - -// Returns the path which is used to relaunch the client after the update is installed. By default, the path of the host bundle. -- (NSString *)pathToRelaunchForUpdater:(SUUpdater *)updater; - -@end - -// Define some minimum intervals to avoid DOS-like checking attacks. These are in seconds. -#ifdef DEBUG -#define SU_MIN_CHECK_INTERVAL 60 -#else -#define SU_MIN_CHECK_INTERVAL 60*60 -#endif - -#ifdef DEBUG -#define SU_DEFAULT_CHECK_INTERVAL 60 -#else -#define SU_DEFAULT_CHECK_INTERVAL 60*60*24 -#endif - -#endif diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h deleted file mode 100644 index 3d11ae8..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h +++ /dev/null @@ -1,27 +0,0 @@ -// -// SUVersionComparisonProtocol.h -// Sparkle -// -// Created by Andy Matuschak on 12/21/07. -// Copyright 2007 Andy Matuschak. All rights reserved. -// - -#ifndef SUVERSIONCOMPARISONPROTOCOL_H -#define SUVERSIONCOMPARISONPROTOCOL_H - -/*! - @protocol - @abstract Implement this protocol to provide version comparison facilities for Sparkle. -*/ -@protocol SUVersionComparison - -/*! - @method - @abstract An abstract method to compare two version strings. - @discussion Should return NSOrderedAscending if b > a, NSOrderedDescending if b < a, and NSOrderedSame if they are equivalent. -*/ -- (NSComparisonResult)compareVersion:(NSString *)versionA toVersion:(NSString *)versionB; - -@end - -#endif diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Headers/Sparkle.h b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Headers/Sparkle.h deleted file mode 100644 index 08dd577..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Headers/Sparkle.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// Sparkle.h -// Sparkle -// -// Created by Andy Matuschak on 3/16/06. (Modified by CDHW on 23/12/07) -// Copyright 2006 Andy Matuschak. All rights reserved. -// - -#ifndef SPARKLE_H -#define SPARKLE_H - -// This list should include the shared headers. It doesn't matter if some of them aren't shared (unless -// there are name-space collisions) so we can list all of them to start with: - -#import - -#import -#import -#import - -#endif diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/Info.plist b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/Info.plist deleted file mode 100644 index c7f277d..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/Info.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - Sparkle - CFBundleIdentifier - org.andymatuschak.Sparkle - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - Sparkle - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.5 Beta 6 - CFBundleSignature - ???? - CFBundleVersion - 313 - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/License.txt b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/License.txt deleted file mode 100644 index 20466c4..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/License.txt +++ /dev/null @@ -1,7 +0,0 @@ -Copyright (c) 2006 Andy Matuschak - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/SUModelTranslation.plist b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/SUModelTranslation.plist deleted file mode 100644 index 92ef947..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/SUModelTranslation.plist +++ /dev/null @@ -1,174 +0,0 @@ - - - - - ADP2,1 - Developer Transition Kit - MacBook1,1 - MacBook (Core Duo) - MacBook2,1 - MacBook (Core 2 Duo) - MacBook4,1 - MacBook (Core 2 Duo Feb 2008) - MacBookAir1,1 - MacBook Air (January 2008) - MacBookPro1,1 - MacBook Pro Core Duo (15-inch) - MacBookPro1,2 - MacBook Pro Core Duo (17-inch) - MacBookPro2,1 - MacBook Pro Core 2 Duo (17-inch) - MacBookPro2,2 - MacBook Pro Core 2 Duo (15-inch) - MacBookPro3,1 - MacBook Pro Core 2 Duo (15-inch LED, Core 2 Duo) - MacBookPro3,2 - MacBook Pro Core 2 Duo (17-inch HD, Core 2 Duo) - MacBookPro4,1 - MacBook Pro (Core 2 Duo Feb 2008) - MacPro1,1 - Mac Pro (four-core) - MacPro2,1 - Mac Pro (eight-core) - MacPro3,1 - Mac Pro (January 2008 4- or 8- core "Harpertown") - Macmini1,1 - Mac Mini (Core Solo/Duo) - PowerBook1,1 - PowerBook G3 - PowerBook2,1 - iBook G3 - PowerBook2,2 - iBook G3 (FireWire) - PowerBook2,3 - iBook G3 - PowerBook2,4 - iBook G3 - PowerBook3,1 - PowerBook G3 (FireWire) - PowerBook3,2 - PowerBook G4 - PowerBook3,3 - PowerBook G4 (Gigabit Ethernet) - PowerBook3,4 - PowerBook G4 (DVI) - PowerBook3,5 - PowerBook G4 (1GHz / 867MHz) - PowerBook4,1 - iBook G3 (Dual USB, Late 2001) - PowerBook4,2 - iBook G3 (16MB VRAM) - PowerBook4,3 - iBook G3 Opaque 16MB VRAM, 32MB VRAM, Early 2003) - PowerBook5,1 - PowerBook G4 (17 inch) - PowerBook5,2 - PowerBook G4 (15 inch FW 800) - PowerBook5,3 - PowerBook G4 (17-inch 1.33GHz) - PowerBook5,4 - PowerBook G4 (15 inch 1.5/1.33GHz) - PowerBook5,5 - PowerBook G4 (17-inch 1.5GHz) - PowerBook5,6 - PowerBook G4 (15 inch 1.67GHz/1.5GHz) - PowerBook5,7 - PowerBook G4 (17-inch 1.67GHz) - PowerBook5,8 - PowerBook G4 (Double layer SD, 15 inch) - PowerBook5,9 - PowerBook G4 (Double layer SD, 17 inch) - PowerBook6,1 - PowerBook G4 (12 inch) - PowerBook6,2 - PowerBook G4 (12 inch, DVI) - PowerBook6,3 - iBook G4 - PowerBook6,4 - PowerBook G4 (12 inch 1.33GHz) - PowerBook6,5 - iBook G4 (Early-Late 2004) - PowerBook6,7 - iBook G4 (Mid 2005) - PowerBook6,8 - PowerBook G4 (12 inch 1.5GHz) - PowerMac1,1 - Power Macintosh G3 (Blue & White) - PowerMac1,2 - Power Macintosh G4 (PCI Graphics) - PowerMac10,1 - Mac Mini G4 - PowerMac10,2 - Mac Mini (Late 2005) - PowerMac11,2 - Power Macintosh G5 (Late 2005) - PowerMac12,1 - iMac G5 (iSight) - PowerMac2,1 - iMac G3 (Slot-loading CD-ROM) - PowerMac2,2 - iMac G3 (Summer 2000) - PowerMac3,1 - Power Macintosh G4 (AGP Graphics) - PowerMac3,2 - Power Macintosh G4 (AGP Graphics) - PowerMac3,3 - Power Macintosh G4 (Gigabit Ethernet) - PowerMac3,4 - Power Macintosh G4 (Digital Audio) - PowerMac3,5 - Power Macintosh G4 (Quick Silver) - PowerMac3,6 - Power Macintosh G4 (Mirrored Drive Door) - PowerMac4,1 - iMac G3 (Early/Summer 2001) - PowerMac4,2 - iMac G4 (Flat Panel) - PowerMac4,4 - eMac - PowerMac4,5 - iMac G4 (17-inch Flat Panel) - PowerMac5,1 - Power Macintosh G4 Cube - PowerMac6,1 - iMac G4 (USB 2.0) - PowerMac6,3 - iMac G4 (20-inch Flat Panel) - PowerMac6,4 - eMac (USB 2.0, 2005) - PowerMac7,2 - Power Macintosh G5 - PowerMac7,3 - Power Macintosh G5 - PowerMac8,1 - iMac G5 - PowerMac8,2 - iMac G5 (Ambient Light Sensor) - PowerMac9,1 - Power Macintosh G5 (Late 2005) - RackMac1,1 - Xserve G4 - RackMac1,2 - Xserve G4 (slot-loading, cluster node) - RackMac3,1 - Xserve G5 - Xserve1,1 - Xserve (Intel Xeon) - Xserve2,1 - Xserve (January 2008 quad-core) - iMac1,1 - iMac G3 (Rev A-D) - iMac4,1 - iMac (Core Duo) - iMac4,2 - iMac for Education (17-inch, Core Duo) - iMac5,1 - iMac (Core 2 Duo, 17 or 20 inch, SuperDrive) - iMac5,2 - iMac (Core 2 Duo, 17 inch, Combo Drive) - iMac6,1 - iMac (Core 2 Duo, 24 inch, SuperDrive) - iMac8,1 - iMac (April 2008) - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/classes.nib deleted file mode 100644 index 22f13f8..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/classes.nib +++ /dev/null @@ -1,56 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - CLASS - NSApplication - LANGUAGE - ObjC - SUPERCLASS - NSResponder - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - CLASS - SUStatusController - LANGUAGE - ObjC - OUTLETS - - actionButton - NSButton - progressBar - NSProgressIndicator - - SUPERCLASS - SUWindowController - - - IBVersion - 1 - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/info.nib deleted file mode 100644 index a9ac867..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 670 - IBLastKnownRelativeProjectPath - Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 10A96 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/keyedobjects.nib deleted file mode 100644 index 4f1d598..0000000 Binary files a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/classes.nib deleted file mode 100644 index 4b1ab30..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,50 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - doNotInstall - id - installLater - id - installNow - id - - CLASS - SUAutomaticUpdateAlert - LANGUAGE - ObjC - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/info.nib deleted file mode 100644 index 2e04cfa..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 667 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 9D34 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index 6b92630..0000000 Binary files a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/classes.nib deleted file mode 100644 index 994d4c3..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,67 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - CLASS - NSApplication - LANGUAGE - ObjC - SUPERCLASS - NSResponder - - - ACTIONS - - installUpdate - id - remindMeLater - id - skipThisVersion - id - - CLASS - SUUpdateAlert - LANGUAGE - ObjC - OUTLETS - - delegate - id - description - NSTextField - releaseNotesView - WebView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/info.nib deleted file mode 100644 index 2e04cfa..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 667 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 9D34 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index b4353d2..0000000 Binary files a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/classes.nib deleted file mode 100644 index 5220a22..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/classes.nib +++ /dev/null @@ -1,59 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - finishPrompt - id - toggleMoreInfo - id - - CLASS - SUUpdatePermissionPrompt - LANGUAGE - ObjC - OUTLETS - - delegate - id - descriptionTextField - NSTextField - moreInfoButton - NSButton - moreInfoView - NSView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/info.nib deleted file mode 100644 index 2e04cfa..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 667 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 9D34 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib deleted file mode 100644 index b403a3e..0000000 Binary files a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings deleted file mode 100644 index b31f928..0000000 Binary files a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings and /dev/null differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/classes.nib deleted file mode 100644 index 4b1ab30..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,50 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - doNotInstall - id - installLater - id - installNow - id - - CLASS - SUAutomaticUpdateAlert - LANGUAGE - ObjC - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/info.nib deleted file mode 100644 index ab36d31..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 658 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 9C7010 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index 7630390..0000000 Binary files a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/classes.nib deleted file mode 100644 index 994d4c3..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,67 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - CLASS - NSApplication - LANGUAGE - ObjC - SUPERCLASS - NSResponder - - - ACTIONS - - installUpdate - id - remindMeLater - id - skipThisVersion - id - - CLASS - SUUpdateAlert - LANGUAGE - ObjC - OUTLETS - - delegate - id - description - NSTextField - releaseNotesView - WebView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/info.nib deleted file mode 100644 index 2fb8a83..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 670 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 18 - - IBSystem Version - 10A96 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index e7e7497..0000000 Binary files a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/classes.nib deleted file mode 100644 index 5220a22..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/classes.nib +++ /dev/null @@ -1,59 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - finishPrompt - id - toggleMoreInfo - id - - CLASS - SUUpdatePermissionPrompt - LANGUAGE - ObjC - OUTLETS - - delegate - id - descriptionTextField - NSTextField - moreInfoButton - NSButton - moreInfoView - NSView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/info.nib deleted file mode 100644 index b1cd28e..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/info.nib +++ /dev/null @@ -1,21 +0,0 @@ - - - - - IBFramework Version - 670 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - 41 - - IBSystem Version - 10A96 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib deleted file mode 100644 index e8dc5b8..0000000 Binary files a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/Sparkle.strings b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/Sparkle.strings deleted file mode 100644 index 16e0787..0000000 Binary files a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/Sparkle.strings and /dev/null differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/classes.nib deleted file mode 100644 index 4b1ab30..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,50 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - doNotInstall - id - installLater - id - installNow - id - - CLASS - SUAutomaticUpdateAlert - LANGUAGE - ObjC - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/info.nib deleted file mode 100644 index 2e04cfa..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 667 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 9D34 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index 6b2f938..0000000 Binary files a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/classes.nib deleted file mode 100644 index 994d4c3..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,67 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - CLASS - NSApplication - LANGUAGE - ObjC - SUPERCLASS - NSResponder - - - ACTIONS - - installUpdate - id - remindMeLater - id - skipThisVersion - id - - CLASS - SUUpdateAlert - LANGUAGE - ObjC - OUTLETS - - delegate - id - description - NSTextField - releaseNotesView - WebView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/info.nib deleted file mode 100644 index 2e04cfa..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 667 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 9D34 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index c9b1e7d..0000000 Binary files a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/classes.nib deleted file mode 100644 index 5220a22..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/classes.nib +++ /dev/null @@ -1,59 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - finishPrompt - id - toggleMoreInfo - id - - CLASS - SUUpdatePermissionPrompt - LANGUAGE - ObjC - OUTLETS - - delegate - id - descriptionTextField - NSTextField - moreInfoButton - NSButton - moreInfoView - NSView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/info.nib deleted file mode 100644 index 3eb7f81..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 667 - IBLastKnownRelativeProjectPath - ../../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 9D34 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib deleted file mode 100644 index 8c54c21..0000000 Binary files a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/Sparkle.strings b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/Sparkle.strings deleted file mode 100644 index f83ea23..0000000 Binary files a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/Sparkle.strings and /dev/null differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/classes.nib deleted file mode 100644 index 4b1ab30..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,50 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - doNotInstall - id - installLater - id - installNow - id - - CLASS - SUAutomaticUpdateAlert - LANGUAGE - ObjC - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/info.nib deleted file mode 100644 index 33a6020..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/info.nib +++ /dev/null @@ -1,16 +0,0 @@ - - - - - IBFramework Version - 629 - IBOldestOS - 5 - IBOpenObjects - - IBSystem Version - 9D34 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index 4cd529a..0000000 Binary files a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/classes.nib deleted file mode 100644 index 994d4c3..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,67 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - CLASS - NSApplication - LANGUAGE - ObjC - SUPERCLASS - NSResponder - - - ACTIONS - - installUpdate - id - remindMeLater - id - skipThisVersion - id - - CLASS - SUUpdateAlert - LANGUAGE - ObjC - OUTLETS - - delegate - id - description - NSTextField - releaseNotesView - WebView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/info.nib deleted file mode 100644 index d2586ea..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/info.nib +++ /dev/null @@ -1,16 +0,0 @@ - - - - - IBFramework Version - 629 - IBOldestOS - 5 - IBOpenObjects - - IBSystem Version - 9E17 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index 65dfc95..0000000 Binary files a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/classes.nib deleted file mode 100644 index 5220a22..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/classes.nib +++ /dev/null @@ -1,59 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - finishPrompt - id - toggleMoreInfo - id - - CLASS - SUUpdatePermissionPrompt - LANGUAGE - ObjC - OUTLETS - - delegate - id - descriptionTextField - NSTextField - moreInfoButton - NSButton - moreInfoView - NSView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/info.nib deleted file mode 100644 index d2586ea..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/info.nib +++ /dev/null @@ -1,16 +0,0 @@ - - - - - IBFramework Version - 629 - IBOldestOS - 5 - IBOpenObjects - - IBSystem Version - 9E17 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib deleted file mode 100644 index 4b7cc90..0000000 Binary files a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/Sparkle.strings b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/Sparkle.strings deleted file mode 100644 index ea175ae..0000000 Binary files a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/Sparkle.strings and /dev/null differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr_CA.lproj b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr_CA.lproj deleted file mode 120000 index 61a7d4e..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/fr_CA.lproj +++ /dev/null @@ -1 +0,0 @@ -/Users/andym/Development/Build Products/Release (GC dual-mode; 10.5-only)/Sparkle.framework/Resources/fr.lproj \ No newline at end of file diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/classes.nib deleted file mode 100644 index 4b1ab30..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,50 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - doNotInstall - id - installLater - id - installNow - id - - CLASS - SUAutomaticUpdateAlert - LANGUAGE - ObjC - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/info.nib deleted file mode 100644 index 2e04cfa..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 667 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 9D34 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index 15ba8f4..0000000 Binary files a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/classes.nib deleted file mode 100644 index 994d4c3..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,67 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - CLASS - NSApplication - LANGUAGE - ObjC - SUPERCLASS - NSResponder - - - ACTIONS - - installUpdate - id - remindMeLater - id - skipThisVersion - id - - CLASS - SUUpdateAlert - LANGUAGE - ObjC - OUTLETS - - delegate - id - description - NSTextField - releaseNotesView - WebView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/info.nib deleted file mode 100644 index 2e04cfa..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 667 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 9D34 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index 2984064..0000000 Binary files a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/classes.nib deleted file mode 100644 index 5220a22..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/classes.nib +++ /dev/null @@ -1,59 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - finishPrompt - id - toggleMoreInfo - id - - CLASS - SUUpdatePermissionPrompt - LANGUAGE - ObjC - OUTLETS - - delegate - id - descriptionTextField - NSTextField - moreInfoButton - NSButton - moreInfoView - NSView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/info.nib deleted file mode 100644 index c493485..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 667 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 5 - - IBSystem Version - 9D34 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib deleted file mode 100644 index 55cc2c2..0000000 Binary files a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/Sparkle.strings b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/Sparkle.strings deleted file mode 100644 index 5c410d0..0000000 Binary files a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/Sparkle.strings and /dev/null differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/classes.nib deleted file mode 100644 index 4b1ab30..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,50 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - doNotInstall - id - installLater - id - installNow - id - - CLASS - SUAutomaticUpdateAlert - LANGUAGE - ObjC - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/info.nib deleted file mode 100644 index 3f09790..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/info.nib +++ /dev/null @@ -1,18 +0,0 @@ - - - - - IBFramework Version - 629 - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 9D34 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index aa38f86..0000000 Binary files a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/classes.nib deleted file mode 100644 index 994d4c3..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,67 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - CLASS - NSApplication - LANGUAGE - ObjC - SUPERCLASS - NSResponder - - - ACTIONS - - installUpdate - id - remindMeLater - id - skipThisVersion - id - - CLASS - SUUpdateAlert - LANGUAGE - ObjC - OUTLETS - - delegate - id - description - NSTextField - releaseNotesView - WebView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/info.nib deleted file mode 100644 index d2586ea..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/info.nib +++ /dev/null @@ -1,16 +0,0 @@ - - - - - IBFramework Version - 629 - IBOldestOS - 5 - IBOpenObjects - - IBSystem Version - 9E17 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index c82d358..0000000 Binary files a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/classes.nib deleted file mode 100644 index 5220a22..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/classes.nib +++ /dev/null @@ -1,59 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - finishPrompt - id - toggleMoreInfo - id - - CLASS - SUUpdatePermissionPrompt - LANGUAGE - ObjC - OUTLETS - - delegate - id - descriptionTextField - NSTextField - moreInfoButton - NSButton - moreInfoView - NSView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/info.nib deleted file mode 100644 index d2586ea..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/info.nib +++ /dev/null @@ -1,16 +0,0 @@ - - - - - IBFramework Version - 629 - IBOldestOS - 5 - IBOpenObjects - - IBSystem Version - 9E17 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib deleted file mode 100644 index ac298ce..0000000 Binary files a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/Sparkle.strings b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/Sparkle.strings deleted file mode 100644 index 67cf535..0000000 Binary files a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/Sparkle.strings and /dev/null differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/relaunch b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/relaunch deleted file mode 100755 index e7b96d6..0000000 Binary files a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/relaunch and /dev/null differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/classes.nib deleted file mode 100644 index 4b1ab30..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,50 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - doNotInstall - id - installLater - id - installNow - id - - CLASS - SUAutomaticUpdateAlert - LANGUAGE - ObjC - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/info.nib deleted file mode 100644 index 2b3d425..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 670 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 9E17 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index 1d4655c..0000000 Binary files a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/classes.nib deleted file mode 100644 index 994d4c3..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,67 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - CLASS - NSApplication - LANGUAGE - ObjC - SUPERCLASS - NSResponder - - - ACTIONS - - installUpdate - id - remindMeLater - id - skipThisVersion - id - - CLASS - SUUpdateAlert - LANGUAGE - ObjC - OUTLETS - - delegate - id - description - NSTextField - releaseNotesView - WebView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/info.nib deleted file mode 100644 index 2b3d425..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 670 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 9E17 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index 103b1cf..0000000 Binary files a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/classes.nib deleted file mode 100644 index 0f776c8..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/classes.nib +++ /dev/null @@ -1,59 +0,0 @@ - - - - - IBClasses - - - CLASS - NSObject - LANGUAGE - ObjC - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - finishPrompt - id - toggleMoreInfo - id - - CLASS - SUUpdatePermissionPrompt - LANGUAGE - ObjC - OUTLETS - - delegate - id - descriptionTextField - NSTextField - moreInfoButton - NSButton - moreInfoView - NSView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - IBVersion - 1 - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/info.nib deleted file mode 100644 index 5132e29..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/info.nib +++ /dev/null @@ -1,18 +0,0 @@ - - - - - IBFramework Version - 670 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - IBSystem Version - 9E17 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib deleted file mode 100644 index c09d9e7..0000000 Binary files a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings deleted file mode 100644 index f3ff9d8..0000000 Binary files a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings and /dev/null differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/classes.nib deleted file mode 100644 index 4b1ab30..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,50 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - doNotInstall - id - installLater - id - installNow - id - - CLASS - SUAutomaticUpdateAlert - LANGUAGE - ObjC - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/info.nib deleted file mode 100644 index c5a067e..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 670 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 10A96 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index 53cb91a..0000000 Binary files a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/classes.nib deleted file mode 100644 index 018710a..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,39 +0,0 @@ -{ - IBClasses = ( - { - CLASS = FirstResponder; - LANGUAGE = ObjC; - SUPERCLASS = NSObject; - }, - { - CLASS = NSApplication; - LANGUAGE = ObjC; - SUPERCLASS = NSResponder; - }, - { - CLASS = NSObject; - LANGUAGE = ObjC; - }, - { - ACTIONS = { - installUpdate = id; - remindMeLater = id; - skipThisVersion = id; - }; - CLASS = SUUpdateAlert; - LANGUAGE = ObjC; - OUTLETS = { - delegate = id; - description = NSTextField; - releaseNotesView = WebView; - }; - SUPERCLASS = SUWindowController; - }, - { - CLASS = SUWindowController; - LANGUAGE = ObjC; - SUPERCLASS = NSWindowController; - } - ); - IBVersion = 1; -} \ No newline at end of file diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/info.nib deleted file mode 100644 index 6b787d4..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/info.nib +++ /dev/null @@ -1,18 +0,0 @@ - - - - - IBDocumentLocation - 69 14 356 240 0 0 1280 778 - IBFramework Version - 489.0 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBSystem Version - 9D34 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index 7e6d490..0000000 Binary files a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/classes.nib deleted file mode 100644 index 5220a22..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/classes.nib +++ /dev/null @@ -1,59 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - finishPrompt - id - toggleMoreInfo - id - - CLASS - SUUpdatePermissionPrompt - LANGUAGE - ObjC - OUTLETS - - delegate - id - descriptionTextField - NSTextField - moreInfoButton - NSButton - moreInfoView - NSView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/info.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/info.nib deleted file mode 100644 index c5a067e..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 670 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 10A96 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib deleted file mode 100644 index 64babac..0000000 Binary files a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/Sparkle.strings b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/Sparkle.strings deleted file mode 100644 index b676a4f..0000000 Binary files a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/Sparkle.strings and /dev/null differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Sparkle b/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Sparkle deleted file mode 100755 index 2d9bb2a..0000000 Binary files a/tikzit-1/Frameworks/Sparkle.framework/Versions/A/Sparkle and /dev/null differ diff --git a/tikzit-1/Frameworks/Sparkle.framework/Versions/Current b/tikzit-1/Frameworks/Sparkle.framework/Versions/Current deleted file mode 120000 index 8c7e5a6..0000000 --- a/tikzit-1/Frameworks/Sparkle.framework/Versions/Current +++ /dev/null @@ -1 +0,0 @@ -A \ No newline at end of file diff --git a/tikzit-1/INSTALL b/tikzit-1/INSTALL deleted file mode 100644 index b938f14..0000000 --- a/tikzit-1/INSTALL +++ /dev/null @@ -1,34 +0,0 @@ -For building on systems other than MacOS/X: - -Dependencies: - GNUstep (core libraries) >= 1.18.0 - gtk+-2.0 >= 2.18.0 - gdk-pixbuf >= 2.16.0 - poppler >= 0.10 - including glib bindings, which may be in - a separate poppler-glib package - Objective C compiler (eg: gcc with ObjC support) with - support for properties, optional protocols and - fast enumeration (eg: gcc 4.6 or clang). - pkg-config - build-time dependency only - -To install, just run: - - ./configure - make - make install - - - -To build from subversion (and for development) you will additionally need: - flex >= 2.5.34 - bison >= 2.3 - autoconf >= 2.60 - automake >= 1.10 - -and you will need to prepare the source tree by running - ./autogen.sh - - - diff --git a/tikzit-1/Makefile.am b/tikzit-1/Makefile.am deleted file mode 100644 index d9793a4..0000000 --- a/tikzit-1/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -SUBDIRS = src share -appdir = $(datarootdir)/tikzit -nobase_dist_app_DATA = shapes/*.tikz diff --git a/tikzit-1/NEWS b/tikzit-1/NEWS deleted file mode 100644 index 827abe7..0000000 --- a/tikzit-1/NEWS +++ /dev/null @@ -1,75 +0,0 @@ -tikzit 1.1 (2015-07-22) : - * Fix bug where copy-and-paste would lose edge anchors - * Allow tikzit-specific preview code to be omitted from preambles - * Holding down CTRL allows you to drag the graph - * Fix parsing bug where property lists would be reversed - * Better error messages when files can't be opened - -tikzit 1.0 (2013-05-07): - * GIMP-like user interface (multiple documents, separate toolboxes) - * Preferences now called Configuration, and includes node and edge styles - * Error-highlighting in the code pane - * Single-key-shortcuts for tool selection, and to update the preview - * Edge anchor support - * Option for drag-select to select nodes, edges or both - * Memory leak fixes - * Should now be impossible to use the UI to create a graph that cannot be parsed - -tikzit 0.9 (2012-08-24): - * Compilers without basic Objective C 2 support cannot be - used to compile TikZiT any more - * Add support for scale to node styles - * Add support for editing edge styles - * Add support for multiple custom preambles - * The path to pdflatex is now configurable - * Make everything look a bit better - * Edges now start from the edge of a node, not the centre, - which is what tikz does - * Edges can now have arrow heads and arrow tails - * Nodes and edges have consistent ordering, and this can be - changed with Edge->Arrange - * Edges now have colours - * Edges can now be reversed easily - * Fix various crashes - -tikzit 0.7 (2011-12-06): - * Add bounding box support - * Add support for different node shapes - * Improved error reporting - * Add scrolling support (CTRL+mouse wheel) - * Add a pan tool to move around the graph - * Add edge and graph property palettes - -tikzit 0.6 (2011-02-08): - * Fix the displaying of colours in the styles editor - * Cut, copy and paste support - * More useful buttons on the toolbar - * Improve how previewing works - * Allow custom preambles for preview generation - -tikzit 0.5 (2010-12-01): - * Hide font size commands (\small etc) in node labels - * Always output the "style" node property first - * Provide a list of recent files - * Remember the folder for Open and Save As dialogs - * Remember window dimensions - * Remember the styles list - * Add a "Node properties" pane - * Bring the separate windows into the main application window - * Improve graphics rendering / remove flicker - * Shorten the window title to something useful - -tikzit 0.4 (2010-09-19): - * Support for bounding boxes, variable-precision tikz output - * Fixed stroke width display - * Updated tikz output to handle separate edge/node layers - * Using [Graph tikz] for tikz output, attaching style after parse - * All platforms now use the same lex-based parser - * Added a menu item for showing node styles if closed - * Pre-amble support - * Added test suite - * Added preview and node labels to GTK version - -tikzit 0.3b (2010-05-11): - * Various build-system fixes on Linux - diff --git a/tikzit-1/README b/tikzit-1/README deleted file mode 100644 index 9b83327..0000000 --- a/tikzit-1/README +++ /dev/null @@ -1,7 +0,0 @@ -TikZit is a cross-platform application that allows the creation and modification of TeX diagrams written using the pgf/TikZ macro library. It is especially geared toward rapidly creating "dot"-diagrams for use in academic papers. - -For more info, see http://tikzit.sf.net - -On OS/X, the Cocoa framework is used. - -On other platforms, GTK+ and GNUstep are used. \ No newline at end of file diff --git a/tikzit-1/README.release b/tikzit-1/README.release deleted file mode 100644 index a6f1642..0000000 --- a/tikzit-1/README.release +++ /dev/null @@ -1,98 +0,0 @@ -Notes on how to make a release -============================== - -Updating doc files ------------------- - -Put all the user-visible changes since the last release into NEWS. - -Make sure the dependency requirements in INSTALL are correct. - - - -Making the source tarballs --------------------------- - -The version should be set in configure.ac (in AC_INIT) -and the package should be re-configured -(run ./configure). - -Then run `make dist` to create the source tarball in tar.gz format, and -`make dist-bzip2` to get it in tar.bz2 format. - - - -Uploading the source --------------------- - -Update /www/sourceforge/README.mkd - -Log into sourceforge.net, go to -https://sourceforge.net/projects/tikzit/files/ - -Create a folder called tikzit-[version]. - -Upload README.mkd. - -Upload the tar.bz2 and tar.gz files. - -Set the tar.bz2 file as default for everything except windows and mac -(click the (i) symbol on the right for that file to do this). - - - -Updating the website --------------------- - -Edit /www/htdocs/link.php, and update the versions. - -sftp to - [sf-username],tikzit@web.sourceforge.net - -Upload link.php into htdocs. - - - -Updating the packages ---------------------- - -Contact Gard Spreemann about the new version by sending him a message -on Launchpad (https://launchpad.net/~gspreemann). - -Update tikzit.spec (the version, the changelog and the dependencies). - -Test the spec file: -- if you don't have ~/rpmbuild, run rpmdev-setuptree -- copy the tar.bz2 file into ~/rpmbuild/SOURCES -- copy tikzit.spec into ~/rpmbuild/SPECS -- cd into ~/rpmbuild/SPECS -- run `rpmbuild -ba tikzit.spec` -- run `rpmlint ..` and check the warnings (there will be some that are - not important) - -Update the OBS packages: -- https://build.opensuse.org/package/show?package=tikzit&project=home%3Arandomguy3 -- Upload the tar.bz2 file and the tikzit.spec file. -- Wait for the build to finish - -Update the AUR package: -- http://aur.archlinux.org/packages.php?ID=37119 - - -TODO: find out how the Debian build system works - - -Publishing an OSX Update ------------------------------------------ -In OSX, the steps to publish an update are as follows. Firstly all updates are signed, so you need the private key 'tikzit_dsa_priv.pem' in the root of your working directory. This is not in the repository (for obvious reasons), so ask Aleks for a copy. Also, make sure you have ruby in your $PATH to do the actual signing. - -1. Update the SVN and note the revision number -2. In TikZiT-Info.plist, set the Bundle Version key to (MAJOR).(MINOR).(SVN REVISION + 1) -3. In the TikZiT working directory, run scripts/prepare_release.sh -4. Copy and paste the XML output into docs/web/appcast/tikzit.xml -5. Update the release notes in docs/web/appcast/rnotes.html -6. Use SFTP to upload the changed files into htdocs/appcast -7. Commit the SVN - - - diff --git a/tikzit-1/TODO b/tikzit-1/TODO deleted file mode 100644 index ca1a1b9..0000000 --- a/tikzit-1/TODO +++ /dev/null @@ -1,15 +0,0 @@ -GTK port: - - Use GooCanvas for the graph display - - -OSX port: - - node properties toolbox - - support for more than one custom preamble - - -General: - - push more code up into common (make use of RenderContext) - - vi-like mode lines in tikz files - - use mode lines for preamble knowledge - - per-document preamble selection? - diff --git a/tikzit-1/TikZiT-Info.plist b/tikzit-1/TikZiT-Info.plist deleted file mode 100644 index a495c5b..0000000 --- a/tikzit-1/TikZiT-Info.plist +++ /dev/null @@ -1,61 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleDocumentTypes - - - CFBundleTypeExtensions - - tikz - - CFBundleTypeIconFile - tikzitdoc.icns - CFBundleTypeMIMETypes - - text/plain - - CFBundleTypeName - DocumentType - CFBundleTypeOSTypes - - ???? - - CFBundleTypeRole - Editor - NSDocumentClass - TikzDocument - - - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIconFile - tikzit.icns - CFBundleIdentifier - net.sourceforge.tikzit.${PRODUCT_NAME:rfc1034identifier} - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - APPL - CFBundleShortVersionString - 0.8 - CFBundleSignature - ???? - CFBundleVersion - 0.8.398 - LSMinimumSystemVersion - ${MACOSX_DEPLOYMENT_TARGET} - NSMainNibFile - MainMenu - NSPrincipalClass - NSApplication - SUFeedURL - http://tikzit.sourceforge.net/appcast/tikzit.xml - SUPublicDSAKeyFile - tikzit_dsa_pub.pem - - diff --git a/tikzit-1/TikZiT.xcodeproj/project.pbxproj b/tikzit-1/TikZiT.xcodeproj/project.pbxproj deleted file mode 100644 index 04a7f3f..0000000 --- a/tikzit-1/TikZiT.xcodeproj/project.pbxproj +++ /dev/null @@ -1,1322 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 46; - objects = { - -/* Begin PBXBuildFile section */ - 1DDD582C0DA1D0D100B32029 /* TikzDocument.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD58280DA1D0D100B32029 /* TikzDocument.xib */; }; - 1DDD582D0DA1D0D100B32029 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD582A0DA1D0D100B32029 /* MainMenu.xib */; }; - 5504C82E11D23595002A1478 /* common.m in Sources */ = {isa = PBXBuildFile; fileRef = 5504C82A11D23595002A1478 /* common.m */; }; - 5504C82F11D23595002A1478 /* parser.m in Sources */ = {isa = PBXBuildFile; fileRef = 5504C82B11D23595002A1478 /* parser.m */; }; - 5504C83011D23595002A1478 /* test.m in Sources */ = {isa = PBXBuildFile; fileRef = 5504C82D11D23595002A1478 /* test.m */; }; - 5504C83211D23685002A1478 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 5504C83111D23685002A1478 /* main.m */; }; - 5504C84F11D23945002A1478 /* ColorRGB.m in Sources */ = {isa = PBXBuildFile; fileRef = 559EFB6711CB88E300D020F4 /* ColorRGB.m */; }; - 5504C93F11D39422002A1478 /* osx.m in Sources */ = {isa = PBXBuildFile; fileRef = 5504C93E11D39422002A1478 /* osx.m */; }; - 552202C4135F15FD007EA086 /* MultiField.m in Sources */ = {isa = PBXBuildFile; fileRef = 552202C3135F15FD007EA086 /* MultiField.m */; }; - 552202C5135F15FD007EA086 /* MultiField.m in Sources */ = {isa = PBXBuildFile; fileRef = 552202C3135F15FD007EA086 /* MultiField.m */; }; - 55391AF613D324FE007DBE71 /* Preview.xib in Resources */ = {isa = PBXBuildFile; fileRef = 55391AF513D324FE007DBE71 /* Preview.xib */; }; - 55391AF813D3250F007DBE71 /* Preamble.xib in Resources */ = {isa = PBXBuildFile; fileRef = 55391AF713D3250F007DBE71 /* Preamble.xib */; }; - 55391B0213D32608007DBE71 /* PropertyInspector.xib in Resources */ = {isa = PBXBuildFile; fileRef = 55391B0013D32608007DBE71 /* PropertyInspector.xib */; }; - 55391B0A13D32765007DBE71 /* PropertyInspectorController.m in Sources */ = {isa = PBXBuildFile; fileRef = 55391B0913D32765007DBE71 /* PropertyInspectorController.m */; }; - 55397C7914498C22006942FB /* EdgeStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 55397C7814498C22006942FB /* EdgeStyle.m */; }; - 55397C7C144990EA006942FB /* EdgeStyle+Coder.m in Sources */ = {isa = PBXBuildFile; fileRef = 55397C7B144990EA006942FB /* EdgeStyle+Coder.m */; }; - 55397C7F144999C4006942FB /* PropertyHolder.m in Sources */ = {isa = PBXBuildFile; fileRef = 55397C7E144999C4006942FB /* PropertyHolder.m */; }; - 55397C811449A877006942FB /* ED_arrow.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C801449A877006942FB /* ED_arrow.png */; }; - 55397C831449A8F1006942FB /* ED_tick.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C821449A8F1006942FB /* ED_tick.png */; }; - 55397C851449A9BF006942FB /* ED_none.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C841449A9BF006942FB /* ED_none.png */; }; - 55397C8A1449AB91006942FB /* AH_none.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C871449AB91006942FB /* AH_none.png */; }; - 55397C8B1449AB91006942FB /* AH_plain_tail.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C881449AB91006942FB /* AH_plain_tail.png */; }; - 55397C8D1449ABFC006942FB /* AH_latex_tail.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C8C1449ABFC006942FB /* AH_latex_tail.png */; }; - 55397C901449AC7C006942FB /* AH_latex_head.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C8E1449AC7C006942FB /* AH_latex_head.png */; }; - 55397C911449AC7C006942FB /* AH_plain_head.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C8F1449AC7C006942FB /* AH_plain_head.png */; }; - 553A4C5A144ED3D500AA6FAC /* NilToEmptyStringTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 553A4C59144ED3D500AA6FAC /* NilToEmptyStringTransformer.m */; }; - 55432E061444BF2D00401BB3 /* GraphElementProperty.m in Sources */ = {isa = PBXBuildFile; fileRef = 55432E051444BF2D00401BB3 /* GraphElementProperty.m */; }; - 55598E351635372E0023450A /* DiamondShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55598E341635372E0023450A /* DiamondShape.m */; }; - 555B30F911D8BE3300CAECF5 /* emblem-important.png in Resources */ = {isa = PBXBuildFile; fileRef = 555B30F811D8BE3300CAECF5 /* emblem-important.png */; }; - 555B313511D8C6DA00CAECF5 /* color.m in Sources */ = {isa = PBXBuildFile; fileRef = 555B313411D8C6DA00CAECF5 /* color.m */; }; - 555ECE9B1378A3AA0052DB71 /* CALayer+DrawLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 555ECE9A1378A3AA0052DB71 /* CALayer+DrawLabel.m */; }; - 55652DF913E1F2030023F4C6 /* SupportDir.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652DF813E1F2030023F4C6 /* SupportDir.m */; }; - 55652E3B13E1FAEE0023F4C6 /* CircleShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3413E1FAED0023F4C6 /* CircleShape.m */; }; - 55652E3C13E1FAEE0023F4C6 /* RectangleShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3613E1FAED0023F4C6 /* RectangleShape.m */; }; - 55652E3D13E1FAEE0023F4C6 /* RegularPolyShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3813E1FAED0023F4C6 /* RegularPolyShape.m */; }; - 55652E3E13E1FAEE0023F4C6 /* TikzShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3A13E1FAEE0023F4C6 /* TikzShape.m */; }; - 55652E4113E1FB0A0023F4C6 /* Shape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E4013E1FB0A0023F4C6 /* Shape.m */; }; - 55652E5613E1FC660023F4C6 /* cap.tikz in Copy Shapes */ = {isa = PBXBuildFile; fileRef = 55652E5113E1FC660023F4C6 /* cap.tikz */; }; - 55652E5713E1FC660023F4C6 /* copants.tikz in Copy Shapes */ = {isa = PBXBuildFile; fileRef = 55652E5213E1FC660023F4C6 /* copants.tikz */; }; - 55652E5813E1FC660023F4C6 /* cup.tikz in Copy Shapes */ = {isa = PBXBuildFile; fileRef = 55652E5313E1FC660023F4C6 /* cup.tikz */; }; - 55652E5913E1FC660023F4C6 /* oval.tikz in Copy Shapes */ = {isa = PBXBuildFile; fileRef = 55652E5413E1FC660023F4C6 /* oval.tikz */; }; - 55652E5A13E1FC660023F4C6 /* pants.tikz in Copy Shapes */ = {isa = PBXBuildFile; fileRef = 55652E5513E1FC660023F4C6 /* pants.tikz */; }; - 556979431168747B007E5703 /* StylePalette.xib in Resources */ = {isa = PBXBuildFile; fileRef = 556979421168747B007E5703 /* StylePalette.xib */; }; - 5573B8BA11D9FC8D00B5DC5D /* Quartz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5573B8B911D9FC8D00B5DC5D /* Quartz.framework */; }; - 5573B8C211D9FD3200B5DC5D /* PreviewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5573B8C111D9FD3200B5DC5D /* PreviewController.m */; }; - 5573B90F11DA231A00B5DC5D /* PreambleController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5573B90E11DA231A00B5DC5D /* PreambleController.m */; }; - 5573B92111DA259C00B5DC5D /* text-x-generic.png in Resources */ = {isa = PBXBuildFile; fileRef = 5573B92011DA259C00B5DC5D /* text-x-generic.png */; }; - 5573B92511DA273400B5DC5D /* format-indent-less.png in Resources */ = {isa = PBXBuildFile; fileRef = 5573B92411DA273400B5DC5D /* format-indent-less.png */; }; - 5573B92911DA292F00B5DC5D /* Preambles.m in Sources */ = {isa = PBXBuildFile; fileRef = 5573B92811DA292F00B5DC5D /* Preambles.m */; }; - 5573B98811DA377C00B5DC5D /* text-x-script.png in Resources */ = {isa = PBXBuildFile; fileRef = 5573B98711DA377C00B5DC5D /* text-x-script.png */; }; - 5573BDCB11DB4D2600B5DC5D /* Preambles+Coder.m in Sources */ = {isa = PBXBuildFile; fileRef = 5573BDCA11DB4D2600B5DC5D /* Preambles+Coder.m */; }; - 5585E5C2117F681800124513 /* NodeStyle+Coder.m in Sources */ = {isa = PBXBuildFile; fileRef = 5585E5C1117F681800124513 /* NodeStyle+Coder.m */; }; - 5589A9FF11C51E780064D310 /* TikzGraphAssembler.m in Sources */ = {isa = PBXBuildFile; fileRef = 5589A9FE11C51E780064D310 /* TikzGraphAssembler.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 5589AA6C11C542D30064D310 /* TikzGraphAssembler.m in Sources */ = {isa = PBXBuildFile; fileRef = 5589A9FE11C51E780064D310 /* TikzGraphAssembler.m */; }; - 5589AA6D11C542D30064D310 /* tikzlexer.lm in Sources */ = {isa = PBXBuildFile; fileRef = 5589A9AA11C500060064D310 /* tikzlexer.lm */; }; - 5589AA6E11C542D30064D310 /* tikzparser.ym in Sources */ = {isa = PBXBuildFile; fileRef = 5589A9AB11C500060064D310 /* tikzparser.ym */; }; - 5589AA7211C542E60064D310 /* Edge.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18BA117B031C009863B2 /* Edge.m */; }; - 5589AA7611C542E60064D310 /* Graph.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18BC117B031C009863B2 /* Graph.m */; }; - 5589AA7811C542E60064D310 /* GraphChange.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18BE117B031C009863B2 /* GraphChange.m */; }; - 5589AA7A11C542E60064D310 /* GraphElementData.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C0117B031C009863B2 /* GraphElementData.m */; }; - 5589AA7C11C542E60064D310 /* Node.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C2117B031C009863B2 /* Node.m */; }; - 5589AA8011C542E60064D310 /* NodeStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C4117B031C009863B2 /* NodeStyle.m */; }; - 5589AA8511C543500064D310 /* util.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18CD117B03DD009863B2 /* util.m */; }; - 5589AD4411C633EE0064D310 /* SelectBoxLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 5589AD4311C633EE0064D310 /* SelectBoxLayer.m */; }; - 558F18C5117B031C009863B2 /* Edge.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18BA117B031C009863B2 /* Edge.m */; }; - 558F18C6117B031C009863B2 /* Graph.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18BC117B031C009863B2 /* Graph.m */; }; - 558F18C7117B031C009863B2 /* GraphChange.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18BE117B031C009863B2 /* GraphChange.m */; }; - 558F18C8117B031C009863B2 /* GraphElementData.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C0117B031C009863B2 /* GraphElementData.m */; }; - 558F18C9117B031C009863B2 /* Node.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C2117B031C009863B2 /* Node.m */; }; - 558F18CA117B031C009863B2 /* NodeStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C4117B031C009863B2 /* NodeStyle.m */; }; - 558F18CE117B03DD009863B2 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18CB117B03DD009863B2 /* main.m */; }; - 558F18CF117B03DD009863B2 /* util.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18CD117B03DD009863B2 /* util.m */; }; - 558F18F7117B043C009863B2 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18DA117B043B009863B2 /* AppDelegate.m */; }; - 558F18F9117B043C009863B2 /* EdgeControlLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18DE117B043B009863B2 /* EdgeControlLayer.m */; }; - 558F18FA117B043C009863B2 /* GraphicsView.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18E0117B043B009863B2 /* GraphicsView.m */; }; - 558F18FB117B043C009863B2 /* Grid.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18E2117B043B009863B2 /* Grid.m */; }; - 558F18FC117B043C009863B2 /* NodeLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18E4117B043B009863B2 /* NodeLayer.m */; }; - 558F18FD117B043C009863B2 /* NodeSelectionLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18E6117B043B009863B2 /* NodeSelectionLayer.m */; }; - 558F18FF117B043C009863B2 /* SelectableCollectionViewItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18EA117B043B009863B2 /* SelectableCollectionViewItem.m */; }; - 558F1900117B043C009863B2 /* SelectableNodeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18EC117B043B009863B2 /* SelectableNodeView.m */; }; - 558F1901117B043C009863B2 /* StylePaletteController.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18EE117B043B009863B2 /* StylePaletteController.m */; }; - 558F1902117B043C009863B2 /* TikzDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18F0117B043B009863B2 /* TikzDocument.m */; }; - 558F1903117B043C009863B2 /* TikzSourceController.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18F2117B043B009863B2 /* TikzSourceController.m */; }; - 558F1904117B043C009863B2 /* ToolPaletteController.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18F4117B043B009863B2 /* ToolPaletteController.m */; }; - 55900AA1135FA918002DD28E /* MultiCombo.m in Sources */ = {isa = PBXBuildFile; fileRef = 55900AA0135FA918002DD28E /* MultiCombo.m */; }; - 55900AA2135FA918002DD28E /* MultiCombo.m in Sources */ = {isa = PBXBuildFile; fileRef = 55900AA0135FA918002DD28E /* MultiCombo.m */; }; - 55900AE3135FB305002DD28E /* emblem-unreadable-grey.png in Resources */ = {isa = PBXBuildFile; fileRef = 55900AE2135FB305002DD28E /* emblem-unreadable-grey.png */; }; - 559EFA4811C7D49800D020F4 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 559EFA4711C7D49800D020F4 /* Sparkle.framework */; }; - 559EFA4E11C7D4BD00D020F4 /* Sparkle.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 559EFA4711C7D49800D020F4 /* Sparkle.framework */; }; - 559EFA5711C7D95F00D020F4 /* tikzit_dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 559EFA5611C7D95F00D020F4 /* tikzit_dsa_pub.pem */; }; - 559EFB6811CB88E300D020F4 /* ColorRGB.m in Sources */ = {isa = PBXBuildFile; fileRef = 559EFB6711CB88E300D020F4 /* ColorRGB.m */; }; - 55CA98D512EF8FCE008F0368 /* SFBInspectors.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55CA98D412EF8FCE008F0368 /* SFBInspectors.framework */; }; - 55CA98DA12EF9098008F0368 /* SFBInspectors.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 55CA98D412EF8FCE008F0368 /* SFBInspectors.framework */; }; - 55CA98DD12EF910F008F0368 /* SFBInspectors.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55CA98D412EF8FCE008F0368 /* SFBInspectors.framework */; }; - 55CA997212F08281008F0368 /* TikzWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 55CA997112F08281008F0368 /* TikzWindowController.m */; }; - 55CA9AC912F831E5008F0368 /* RColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 55CA9AC812F831E5008F0368 /* RColor.m */; }; - 55CA9ACA12F831E5008F0368 /* RColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 55CA9AC812F831E5008F0368 /* RColor.m */; }; - 55D2E0B21186ED950060B4EC /* Graph+Coder.m in Sources */ = {isa = PBXBuildFile; fileRef = 55D2E0B11186ED950060B4EC /* Graph+Coder.m */; }; - 55D945721165904F0044178C /* tikzitdoc.icns in Resources */ = {isa = PBXBuildFile; fileRef = 55D945701165904F0044178C /* tikzitdoc.icns */; }; - 55D945731165904F0044178C /* tikzit.icns in Resources */ = {isa = PBXBuildFile; fileRef = 55D945711165904F0044178C /* tikzit.icns */; }; - 55D949141165D8870044178C /* draw-ellipse.png in Resources */ = {isa = PBXBuildFile; fileRef = 55D949111165D8870044178C /* draw-ellipse.png */; }; - 55D949151165D8870044178C /* draw-path.png in Resources */ = {isa = PBXBuildFile; fileRef = 55D949121165D8870044178C /* draw-path.png */; }; - 55D949161165D8870044178C /* select-rectangular.png in Resources */ = {isa = PBXBuildFile; fileRef = 55D949131165D8870044178C /* select-rectangular.png */; }; - 55E5E99E1215C8E300256F69 /* transform-crop-and-resize.png in Resources */ = {isa = PBXBuildFile; fileRef = 55E5E99D1215C8E300256F69 /* transform-crop-and-resize.png */; }; - 55F9585C1181B09600F99434 /* PickSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F958591181B09600F99434 /* PickSupport.m */; }; - 55F9585D1181B09600F99434 /* Transformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F9585B1181B09600F99434 /* Transformer.m */; }; - 55F9E04511FF54F000F5659E /* NSString+LatexConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F9E04411FF54F000F5659E /* NSString+LatexConstants.m */; }; - 7F18A321184C577000BC3081 /* UpdatePreferenceController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F18A320184C577000BC3081 /* UpdatePreferenceController.m */; }; - 7F18A323184C599100BC3081 /* UpdatePreferencePanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7F18A322184C599100BC3081 /* UpdatePreferencePanel.xib */; }; - 7F6E2C7D16B007F000BFE20D /* EdgeStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 55397C7814498C22006942FB /* EdgeStyle.m */; }; - 7F6E2C7E16B0080400BFE20D /* GraphElementProperty.m in Sources */ = {isa = PBXBuildFile; fileRef = 55432E051444BF2D00401BB3 /* GraphElementProperty.m */; }; - 7F6E2C7F16B0081D00BFE20D /* PropertyHolder.m in Sources */ = {isa = PBXBuildFile; fileRef = 55397C7E144999C4006942FB /* PropertyHolder.m */; }; - 7F6E2C8016B0083300BFE20D /* Shape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E4013E1FB0A0023F4C6 /* Shape.m */; }; - 7F6E2C8116B0084600BFE20D /* Transformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F9585B1181B09600F99434 /* Transformer.m */; }; - 7F6E2C8216B008B000BFE20D /* DiamondShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55598E341635372E0023450A /* DiamondShape.m */; }; - 7F6E2C8316B008B000BFE20D /* CircleShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3413E1FAED0023F4C6 /* CircleShape.m */; }; - 7F6E2C8416B008B000BFE20D /* RectangleShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3613E1FAED0023F4C6 /* RectangleShape.m */; }; - 7F6E2C8516B008B000BFE20D /* RegularPolyShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3813E1FAED0023F4C6 /* RegularPolyShape.m */; }; - 7F6E2C8616B008B000BFE20D /* TikzShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3A13E1FAEE0023F4C6 /* TikzShape.m */; }; - 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 */; }; - 7F73438A184AC559002897D0 /* DraggablePDFView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F734389184AC559002897D0 /* DraggablePDFView.m */; }; - 7F781C1A16B5DE1400239826 /* ParseErrorView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F781C1916B5DE1400239826 /* ParseErrorView.m */; }; - 7F7B6DED18DE0C9E004F6CA8 /* tikzlexer.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F7B6DEA18DE0C9E004F6CA8 /* tikzlexer.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 7F7B6DEE18DE0C9E004F6CA8 /* tikzparser.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F7B6DEC18DE0C9E004F6CA8 /* tikzparser.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 7F7B6DF418DE0D7A004F6CA8 /* CustomNodeCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F7B6DF118DE0D7A004F6CA8 /* CustomNodeCellView.m */; }; - 7F7B6DF518DE0D7A004F6CA8 /* CustomNodeController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F7B6DF318DE0D7A004F6CA8 /* CustomNodeController.m */; }; - 7F90E88616DD29600069EBCD /* NSString+Tikz.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F90E88516DD29600069EBCD /* NSString+Tikz.m */; }; - 7F90E88D16DD47540069EBCD /* PreferenceController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F90E88B16DD47540069EBCD /* PreferenceController.m */; }; - 7F90E88E16DD47540069EBCD /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7F90E88C16DD47540069EBCD /* Preferences.xib */; }; - 7F90E89116DD54440069EBCD /* UserDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 7F90E88F16DD54440069EBCD /* UserDefaults.plist */; }; - 7F93852E184D176E00FAED38 /* updates.png in Resources */ = {isa = PBXBuildFile; fileRef = 7F93852D184D176E00FAED38 /* updates.png */; }; - 7F938530184D178B00FAED38 /* engine.png in Resources */ = {isa = PBXBuildFile; fileRef = 7F93852F184D178B00FAED38 /* engine.png */; }; - 7F938532184D184700FAED38 /* preamble.png in Resources */ = {isa = PBXBuildFile; fileRef = 7F938531184D184700FAED38 /* preamble.png */; }; - 7FB9BFEE16B57C2E00773146 /* TikzFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FB9BFED16B57C2E00773146 /* TikzFormatter.m */; }; - 7FD5D44B18E1CB5300E2A930 /* CustomNodes.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7FD5D44918E1CB5300E2A930 /* CustomNodes.xib */; }; - 7FD5D44D18E1CC0B00E2A930 /* customshape.png in Resources */ = {isa = PBXBuildFile; fileRef = 7FD5D44C18E1CC0B00E2A930 /* customshape.png */; }; - 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 */; }; - 8D15AC340486D014006FF6A4 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A7FEA54F5311CA2CBB /* Cocoa.framework */; }; -/* End PBXBuildFile section */ - -/* Begin PBXContainerItemProxy section */ - 5504C91A11D36CD5002A1478 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 2A37F4A9FDCFA73011CA2CEA /* Project object */; - proxyType = 1; - remoteGlobalIDString = 8D15AC270486D014006FF6A4; - remoteInfo = TikZiT; - }; -/* End PBXContainerItemProxy section */ - -/* Begin PBXCopyFilesBuildPhase section */ - 55652E6613E1FD080023F4C6 /* Copy Shapes */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = shapes; - dstSubfolderSpec = 7; - files = ( - 55652E5613E1FC660023F4C6 /* cap.tikz in Copy Shapes */, - 55652E5713E1FC660023F4C6 /* copants.tikz in Copy Shapes */, - 55652E5813E1FC660023F4C6 /* cup.tikz in Copy Shapes */, - 55652E5913E1FC660023F4C6 /* oval.tikz in Copy Shapes */, - 55652E5A13E1FC660023F4C6 /* pants.tikz in Copy Shapes */, - ); - name = "Copy Shapes"; - runOnlyForDeploymentPostprocessing = 0; - }; - 559EFA5511C7D4DD00D020F4 /* Copy Frameworks */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - 55CA98DA12EF9098008F0368 /* SFBInspectors.framework in Copy Frameworks */, - 559EFA4E11C7D4BD00D020F4 /* Sparkle.framework in Copy Frameworks */, - ); - name = "Copy Frameworks"; - runOnlyForDeploymentPostprocessing = 0; - }; - 7F6E2C8B16B00A9200BFE20D /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - 7F6E2C8C16B00ABA00BFE20D /* SFBInspectors.framework in CopyFiles */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - 089C1660FE840EACC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; - 1058C7A7FEA54F5311CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; - 13E42FBA07B3F13500E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = ""; }; - 1DDD58290DA1D0D100B32029 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/TikzDocument.xib; sourceTree = ""; }; - 1DDD582B0DA1D0D100B32029 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = ""; }; - 2564AD2C0F5327BB00F57823 /* TikZiT_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TikZiT_Prefix.pch; sourceTree = ""; }; - 2A37F4BAFDCFA73011CA2CEA /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/Credits.rtf; sourceTree = ""; }; - 2A37F4C4FDCFA73011CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; - 2A37F4C5FDCFA73011CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; - 5504C82A11D23595002A1478 /* common.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = common.m; path = src/common/test/common.m; sourceTree = ""; }; - 5504C82B11D23595002A1478 /* parser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = parser.m; path = src/common/test/parser.m; sourceTree = ""; }; - 5504C82C11D23595002A1478 /* test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = test.h; path = src/common/test/test.h; sourceTree = ""; }; - 5504C82D11D23595002A1478 /* test.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = test.m; path = src/common/test/test.m; sourceTree = ""; }; - 5504C83111D23685002A1478 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = src/osx/test/main.m; sourceTree = ""; }; - 5504C83711D237F5002A1478 /* tests */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = tests; sourceTree = BUILT_PRODUCTS_DIR; }; - 5504C93E11D39422002A1478 /* osx.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = osx.m; path = src/osx/test/osx.m; sourceTree = ""; }; - 552202C2135F15FD007EA086 /* MultiField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MultiField.h; path = src/osx/MultiField.h; sourceTree = ""; }; - 552202C3135F15FD007EA086 /* MultiField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MultiField.m; path = src/osx/MultiField.m; sourceTree = ""; }; - 55391B0113D32608007DBE71 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/PropertyInspector.xib; sourceTree = ""; }; - 55391B0813D32765007DBE71 /* PropertyInspectorController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PropertyInspectorController.h; path = src/osx/PropertyInspectorController.h; sourceTree = ""; }; - 55391B0913D32765007DBE71 /* PropertyInspectorController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PropertyInspectorController.m; path = src/osx/PropertyInspectorController.m; sourceTree = ""; }; - 55397C7714498C21006942FB /* EdgeStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EdgeStyle.h; path = src/common/EdgeStyle.h; sourceTree = ""; }; - 55397C7814498C22006942FB /* EdgeStyle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = EdgeStyle.m; path = src/common/EdgeStyle.m; sourceTree = ""; }; - 55397C7A144990EA006942FB /* EdgeStyle+Coder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "EdgeStyle+Coder.h"; path = "src/osx/EdgeStyle+Coder.h"; sourceTree = ""; }; - 55397C7B144990EA006942FB /* EdgeStyle+Coder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "EdgeStyle+Coder.m"; path = "src/osx/EdgeStyle+Coder.m"; sourceTree = ""; }; - 55397C7D144999C4006942FB /* PropertyHolder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PropertyHolder.h; path = src/common/PropertyHolder.h; sourceTree = ""; }; - 55397C7E144999C4006942FB /* PropertyHolder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PropertyHolder.m; path = src/common/PropertyHolder.m; sourceTree = ""; }; - 55397C801449A877006942FB /* ED_arrow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ED_arrow.png; sourceTree = ""; }; - 55397C821449A8F1006942FB /* ED_tick.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ED_tick.png; sourceTree = ""; }; - 55397C841449A9BF006942FB /* ED_none.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ED_none.png; sourceTree = ""; }; - 55397C871449AB91006942FB /* AH_none.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AH_none.png; sourceTree = ""; }; - 55397C881449AB91006942FB /* AH_plain_tail.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AH_plain_tail.png; sourceTree = ""; }; - 55397C8C1449ABFC006942FB /* AH_latex_tail.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AH_latex_tail.png; sourceTree = ""; }; - 55397C8E1449AC7C006942FB /* AH_latex_head.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AH_latex_head.png; sourceTree = ""; }; - 55397C8F1449AC7C006942FB /* AH_plain_head.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AH_plain_head.png; sourceTree = ""; }; - 553A4C58144ED3D500AA6FAC /* NilToEmptyStringTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NilToEmptyStringTransformer.h; path = src/osx/NilToEmptyStringTransformer.h; sourceTree = ""; }; - 553A4C59144ED3D500AA6FAC /* NilToEmptyStringTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NilToEmptyStringTransformer.m; path = src/osx/NilToEmptyStringTransformer.m; sourceTree = ""; }; - 55432E041444BF2D00401BB3 /* GraphElementProperty.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GraphElementProperty.h; path = src/common/GraphElementProperty.h; sourceTree = ""; }; - 55432E051444BF2D00401BB3 /* GraphElementProperty.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GraphElementProperty.m; path = src/common/GraphElementProperty.m; sourceTree = ""; }; - 55598E331635372E0023450A /* DiamondShape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DiamondShape.h; path = src/common/DiamondShape.h; sourceTree = ""; }; - 55598E341635372E0023450A /* DiamondShape.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DiamondShape.m; path = src/common/DiamondShape.m; sourceTree = ""; }; - 555B30F811D8BE3300CAECF5 /* emblem-important.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emblem-important.png"; sourceTree = ""; }; - 555B313411D8C6DA00CAECF5 /* color.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = color.m; path = src/common/test/color.m; sourceTree = ""; }; - 555ECE991378A3AA0052DB71 /* CALayer+DrawLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "CALayer+DrawLabel.h"; path = "src/osx/CALayer+DrawLabel.h"; sourceTree = ""; }; - 555ECE9A1378A3AA0052DB71 /* CALayer+DrawLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "CALayer+DrawLabel.m"; path = "src/osx/CALayer+DrawLabel.m"; sourceTree = ""; }; - 555ECF361379E9F80052DB71 /* ShapeNames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ShapeNames.h; path = src/common/ShapeNames.h; sourceTree = ""; }; - 55652DF713E1F2030023F4C6 /* SupportDir.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SupportDir.h; path = src/common/SupportDir.h; sourceTree = ""; }; - 55652DF813E1F2030023F4C6 /* SupportDir.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SupportDir.m; path = src/common/SupportDir.m; sourceTree = ""; }; - 55652E3313E1FAED0023F4C6 /* CircleShape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CircleShape.h; path = src/common/CircleShape.h; sourceTree = ""; }; - 55652E3413E1FAED0023F4C6 /* CircleShape.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CircleShape.m; path = src/common/CircleShape.m; sourceTree = ""; }; - 55652E3513E1FAED0023F4C6 /* RectangleShape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RectangleShape.h; path = src/common/RectangleShape.h; sourceTree = ""; }; - 55652E3613E1FAED0023F4C6 /* RectangleShape.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RectangleShape.m; path = src/common/RectangleShape.m; sourceTree = ""; }; - 55652E3713E1FAED0023F4C6 /* RegularPolyShape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RegularPolyShape.h; path = src/common/RegularPolyShape.h; sourceTree = ""; }; - 55652E3813E1FAED0023F4C6 /* RegularPolyShape.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RegularPolyShape.m; path = src/common/RegularPolyShape.m; sourceTree = ""; }; - 55652E3913E1FAEE0023F4C6 /* TikzShape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TikzShape.h; path = src/common/TikzShape.h; sourceTree = ""; }; - 55652E3A13E1FAEE0023F4C6 /* TikzShape.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TikzShape.m; path = src/common/TikzShape.m; sourceTree = ""; }; - 55652E3F13E1FB0A0023F4C6 /* Shape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Shape.h; path = src/common/Shape.h; sourceTree = ""; }; - 55652E4013E1FB0A0023F4C6 /* Shape.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Shape.m; path = src/common/Shape.m; sourceTree = ""; }; - 55652E5113E1FC660023F4C6 /* cap.tikz */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cap.tikz; sourceTree = ""; }; - 55652E5213E1FC660023F4C6 /* copants.tikz */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = copants.tikz; sourceTree = ""; }; - 55652E5313E1FC660023F4C6 /* cup.tikz */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cup.tikz; sourceTree = ""; }; - 55652E5413E1FC660023F4C6 /* oval.tikz */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = oval.tikz; sourceTree = ""; }; - 55652E5513E1FC660023F4C6 /* pants.tikz */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = pants.tikz; sourceTree = ""; }; - 5573B8B911D9FC8D00B5DC5D /* Quartz.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quartz.framework; path = System/Library/Frameworks/Quartz.framework; sourceTree = SDKROOT; }; - 5573B8BD11D9FCD400B5DC5D /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Preview.xib; sourceTree = ""; }; - 5573B8C011D9FD3200B5DC5D /* PreviewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PreviewController.h; path = src/osx/PreviewController.h; sourceTree = ""; }; - 5573B8C111D9FD3200B5DC5D /* PreviewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PreviewController.m; path = src/osx/PreviewController.m; sourceTree = ""; }; - 5573B90D11DA231A00B5DC5D /* PreambleController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PreambleController.h; path = src/osx/PreambleController.h; sourceTree = ""; }; - 5573B90E11DA231A00B5DC5D /* PreambleController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PreambleController.m; path = src/osx/PreambleController.m; sourceTree = ""; }; - 5573B91011DA233E00B5DC5D /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Preamble.xib; sourceTree = ""; }; - 5573B92011DA259C00B5DC5D /* text-x-generic.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "text-x-generic.png"; sourceTree = ""; }; - 5573B92411DA273400B5DC5D /* format-indent-less.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "format-indent-less.png"; sourceTree = ""; }; - 5573B92711DA292F00B5DC5D /* Preambles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Preambles.h; path = src/common/Preambles.h; sourceTree = ""; }; - 5573B92811DA292F00B5DC5D /* Preambles.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Preambles.m; path = src/common/Preambles.m; sourceTree = ""; }; - 5573B98711DA377C00B5DC5D /* text-x-script.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "text-x-script.png"; sourceTree = ""; }; - 5573BDC911DB4D2600B5DC5D /* Preambles+Coder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "Preambles+Coder.h"; path = "src/osx/Preambles+Coder.h"; sourceTree = ""; }; - 5573BDCA11DB4D2600B5DC5D /* Preambles+Coder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "Preambles+Coder.m"; path = "src/osx/Preambles+Coder.m"; sourceTree = ""; }; - 5585E5C0117F681800124513 /* NodeStyle+Coder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NodeStyle+Coder.h"; path = "src/osx/NodeStyle+Coder.h"; sourceTree = ""; }; - 5585E5C1117F681800124513 /* NodeStyle+Coder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NodeStyle+Coder.m"; path = "src/osx/NodeStyle+Coder.m"; sourceTree = ""; }; - 5589A9AA11C500060064D310 /* tikzlexer.lm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.lex; name = tikzlexer.lm; path = src/common/tikzlexer.lm; sourceTree = ""; }; - 5589A9AB11C500060064D310 /* tikzparser.ym */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.yacc; name = tikzparser.ym; path = src/common/tikzparser.ym; sourceTree = ""; }; - 5589A9FD11C51E780064D310 /* TikzGraphAssembler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TikzGraphAssembler.h; path = src/common/TikzGraphAssembler.h; sourceTree = ""; }; - 5589A9FE11C51E780064D310 /* TikzGraphAssembler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TikzGraphAssembler.m; path = src/common/TikzGraphAssembler.m; sourceTree = ""; }; - 5589AD4211C633EE0064D310 /* SelectBoxLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SelectBoxLayer.h; path = src/osx/SelectBoxLayer.h; sourceTree = ""; }; - 5589AD4311C633EE0064D310 /* SelectBoxLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SelectBoxLayer.m; path = src/osx/SelectBoxLayer.m; sourceTree = ""; }; - 558F18B9117B031C009863B2 /* Edge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Edge.h; path = src/common/Edge.h; sourceTree = ""; }; - 558F18BA117B031C009863B2 /* Edge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Edge.m; path = src/common/Edge.m; sourceTree = ""; }; - 558F18BB117B031C009863B2 /* Graph.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Graph.h; path = src/common/Graph.h; sourceTree = ""; }; - 558F18BC117B031C009863B2 /* Graph.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Graph.m; path = src/common/Graph.m; sourceTree = ""; }; - 558F18BD117B031C009863B2 /* GraphChange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GraphChange.h; path = src/common/GraphChange.h; sourceTree = ""; }; - 558F18BE117B031C009863B2 /* GraphChange.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GraphChange.m; path = src/common/GraphChange.m; sourceTree = ""; }; - 558F18BF117B031C009863B2 /* GraphElementData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GraphElementData.h; path = src/common/GraphElementData.h; sourceTree = ""; }; - 558F18C0117B031C009863B2 /* GraphElementData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GraphElementData.m; path = src/common/GraphElementData.m; sourceTree = ""; }; - 558F18C1117B031C009863B2 /* Node.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Node.h; path = src/common/Node.h; sourceTree = ""; }; - 558F18C2117B031C009863B2 /* Node.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Node.m; path = src/common/Node.m; sourceTree = ""; }; - 558F18C3117B031C009863B2 /* NodeStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NodeStyle.h; path = src/common/NodeStyle.h; sourceTree = ""; }; - 558F18C4117B031C009863B2 /* NodeStyle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NodeStyle.m; path = src/common/NodeStyle.m; sourceTree = ""; }; - 558F18CB117B03DD009863B2 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = src/osx/main.m; sourceTree = ""; }; - 558F18CC117B03DD009863B2 /* util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = util.h; path = src/common/util.h; sourceTree = ""; }; - 558F18CD117B03DD009863B2 /* util.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = util.m; path = src/common/util.m; sourceTree = ""; }; - 558F18D9117B043B009863B2 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = src/osx/AppDelegate.h; sourceTree = ""; }; - 558F18DA117B043B009863B2 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = src/osx/AppDelegate.m; sourceTree = ""; }; - 558F18DD117B043B009863B2 /* EdgeControlLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EdgeControlLayer.h; path = src/osx/EdgeControlLayer.h; sourceTree = ""; }; - 558F18DE117B043B009863B2 /* EdgeControlLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = EdgeControlLayer.m; path = src/osx/EdgeControlLayer.m; sourceTree = ""; }; - 558F18DF117B043B009863B2 /* GraphicsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GraphicsView.h; path = src/osx/GraphicsView.h; sourceTree = ""; }; - 558F18E0117B043B009863B2 /* GraphicsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GraphicsView.m; path = src/osx/GraphicsView.m; sourceTree = ""; }; - 558F18E1117B043B009863B2 /* Grid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Grid.h; path = src/osx/Grid.h; sourceTree = ""; }; - 558F18E2117B043B009863B2 /* Grid.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Grid.m; path = src/osx/Grid.m; sourceTree = ""; }; - 558F18E3117B043B009863B2 /* NodeLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NodeLayer.h; path = src/osx/NodeLayer.h; sourceTree = ""; }; - 558F18E4117B043B009863B2 /* NodeLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NodeLayer.m; path = src/osx/NodeLayer.m; sourceTree = ""; }; - 558F18E5117B043B009863B2 /* NodeSelectionLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NodeSelectionLayer.h; path = src/osx/NodeSelectionLayer.h; sourceTree = ""; }; - 558F18E6117B043B009863B2 /* NodeSelectionLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NodeSelectionLayer.m; path = src/osx/NodeSelectionLayer.m; sourceTree = ""; }; - 558F18E9117B043B009863B2 /* SelectableCollectionViewItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SelectableCollectionViewItem.h; path = src/osx/SelectableCollectionViewItem.h; sourceTree = ""; }; - 558F18EA117B043B009863B2 /* SelectableCollectionViewItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SelectableCollectionViewItem.m; path = src/osx/SelectableCollectionViewItem.m; sourceTree = ""; }; - 558F18EB117B043B009863B2 /* SelectableNodeView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SelectableNodeView.h; path = src/osx/SelectableNodeView.h; sourceTree = ""; }; - 558F18EC117B043B009863B2 /* SelectableNodeView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SelectableNodeView.m; path = src/osx/SelectableNodeView.m; sourceTree = ""; }; - 558F18ED117B043B009863B2 /* StylePaletteController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StylePaletteController.h; path = src/osx/StylePaletteController.h; sourceTree = ""; }; - 558F18EE117B043B009863B2 /* StylePaletteController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = StylePaletteController.m; path = src/osx/StylePaletteController.m; sourceTree = ""; }; - 558F18EF117B043B009863B2 /* TikzDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TikzDocument.h; path = src/osx/TikzDocument.h; sourceTree = ""; }; - 558F18F0117B043B009863B2 /* TikzDocument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TikzDocument.m; path = src/osx/TikzDocument.m; sourceTree = ""; }; - 558F18F1117B043B009863B2 /* TikzSourceController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TikzSourceController.h; path = src/osx/TikzSourceController.h; sourceTree = ""; }; - 558F18F2117B043B009863B2 /* TikzSourceController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TikzSourceController.m; path = src/osx/TikzSourceController.m; sourceTree = ""; }; - 558F18F3117B043B009863B2 /* ToolPaletteController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ToolPaletteController.h; path = src/osx/ToolPaletteController.h; sourceTree = ""; }; - 558F18F4117B043B009863B2 /* ToolPaletteController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ToolPaletteController.m; path = src/osx/ToolPaletteController.m; sourceTree = ""; }; - 55900A9F135FA918002DD28E /* MultiCombo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MultiCombo.h; path = src/osx/MultiCombo.h; sourceTree = ""; }; - 55900AA0135FA918002DD28E /* MultiCombo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MultiCombo.m; path = src/osx/MultiCombo.m; sourceTree = ""; }; - 55900AE2135FB305002DD28E /* emblem-unreadable-grey.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emblem-unreadable-grey.png"; sourceTree = ""; }; - 559EFA4711C7D49800D020F4 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = Frameworks/Sparkle.framework; sourceTree = ""; }; - 559EFA5611C7D95F00D020F4 /* tikzit_dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = tikzit_dsa_pub.pem; sourceTree = ""; }; - 559EFB6611CB88E300D020F4 /* ColorRGB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ColorRGB.h; path = src/common/ColorRGB.h; sourceTree = ""; }; - 559EFB6711CB88E300D020F4 /* ColorRGB.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ColorRGB.m; path = src/common/ColorRGB.m; sourceTree = ""; }; - 55CA98D412EF8FCE008F0368 /* SFBInspectors.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SFBInspectors.framework; path = Frameworks/SFBInspectors.framework; sourceTree = ""; }; - 55CA997012F08281008F0368 /* TikzWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TikzWindowController.h; path = src/osx/TikzWindowController.h; sourceTree = ""; }; - 55CA997112F08281008F0368 /* TikzWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TikzWindowController.m; path = src/osx/TikzWindowController.m; sourceTree = ""; }; - 55CA9AC712F831E5008F0368 /* RColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RColor.h; path = src/common/RColor.h; sourceTree = ""; }; - 55CA9AC812F831E5008F0368 /* RColor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RColor.m; path = src/common/RColor.m; sourceTree = ""; }; - 55D2E0B01186ED950060B4EC /* Graph+Coder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "Graph+Coder.h"; path = "src/osx/Graph+Coder.h"; sourceTree = ""; }; - 55D2E0B11186ED950060B4EC /* Graph+Coder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "Graph+Coder.m"; path = "src/osx/Graph+Coder.m"; sourceTree = ""; }; - 55D945701165904F0044178C /* tikzitdoc.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = tikzitdoc.icns; sourceTree = ""; }; - 55D945711165904F0044178C /* tikzit.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = tikzit.icns; sourceTree = ""; }; - 55D947301165A5D40044178C /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/StylePalette.xib; sourceTree = ""; }; - 55D949111165D8870044178C /* draw-ellipse.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "draw-ellipse.png"; sourceTree = ""; }; - 55D949121165D8870044178C /* draw-path.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "draw-path.png"; sourceTree = ""; }; - 55D949131165D8870044178C /* select-rectangular.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "select-rectangular.png"; sourceTree = ""; }; - 55E5E99D1215C8E300256F69 /* transform-crop-and-resize.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "transform-crop-and-resize.png"; sourceTree = ""; }; - 55F958581181B09600F99434 /* PickSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PickSupport.h; path = src/common/PickSupport.h; sourceTree = ""; }; - 55F958591181B09600F99434 /* PickSupport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PickSupport.m; path = src/common/PickSupport.m; sourceTree = ""; }; - 55F9585A1181B09600F99434 /* Transformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Transformer.h; path = src/common/Transformer.h; sourceTree = ""; }; - 55F9585B1181B09600F99434 /* Transformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Transformer.m; path = src/common/Transformer.m; sourceTree = ""; }; - 55F9E04311FF54F000F5659E /* NSString+LatexConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSString+LatexConstants.h"; path = "src/common/NSString+LatexConstants.h"; sourceTree = ""; }; - 55F9E04411FF54F000F5659E /* NSString+LatexConstants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSString+LatexConstants.m"; path = "src/common/NSString+LatexConstants.m"; sourceTree = ""; }; - 55FF4E64116A401B000C22B4 /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = usr/lib/libicucore.dylib; sourceTree = SDKROOT; }; - 7F18A31F184C577000BC3081 /* UpdatePreferenceController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UpdatePreferenceController.h; path = src/osx/UpdatePreferenceController.h; sourceTree = ""; }; - 7F18A320184C577000BC3081 /* UpdatePreferenceController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = UpdatePreferenceController.m; path = src/osx/UpdatePreferenceController.m; sourceTree = ""; }; - 7F18A322184C599100BC3081 /* UpdatePreferencePanel.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = UpdatePreferencePanel.xib; path = src/osx/UpdatePreferencePanel.xib; sourceTree = ""; }; - 7F6E2C8716B0091300BFE20D /* maths.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = maths.m; path = src/common/test/maths.m; sourceTree = ""; }; - 7F734388184AC559002897D0 /* DraggablePDFView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DraggablePDFView.h; path = src/osx/DraggablePDFView.h; sourceTree = ""; }; - 7F734389184AC559002897D0 /* DraggablePDFView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DraggablePDFView.m; path = src/osx/DraggablePDFView.m; sourceTree = ""; }; - 7F781C1816B5DE1400239826 /* ParseErrorView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ParseErrorView.h; path = src/osx/ParseErrorView.h; sourceTree = ""; }; - 7F781C1916B5DE1400239826 /* ParseErrorView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ParseErrorView.m; path = src/osx/ParseErrorView.m; sourceTree = ""; }; - 7F7B6DE918DE0C9E004F6CA8 /* tikzlexer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tikzlexer.h; path = xbuild/TikZiT.build/Debug/TikZiT.build/DerivedSources/tikzlexer.h; sourceTree = ""; }; - 7F7B6DEA18DE0C9E004F6CA8 /* tikzlexer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = tikzlexer.m; path = xbuild/TikZiT.build/Debug/TikZiT.build/DerivedSources/tikzlexer.m; sourceTree = ""; }; - 7F7B6DEB18DE0C9E004F6CA8 /* tikzparser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tikzparser.h; path = xbuild/TikZiT.build/Debug/TikZiT.build/DerivedSources/tikzparser.h; sourceTree = ""; }; - 7F7B6DEC18DE0C9E004F6CA8 /* tikzparser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = tikzparser.m; path = xbuild/TikZiT.build/Debug/TikZiT.build/DerivedSources/tikzparser.m; sourceTree = ""; }; - 7F7B6DF018DE0D7A004F6CA8 /* CustomNodeCellView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CustomNodeCellView.h; path = src/osx/CustomNodeCellView.h; sourceTree = ""; }; - 7F7B6DF118DE0D7A004F6CA8 /* CustomNodeCellView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CustomNodeCellView.m; path = src/osx/CustomNodeCellView.m; sourceTree = ""; }; - 7F7B6DF218DE0D7A004F6CA8 /* CustomNodeController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CustomNodeController.h; path = src/osx/CustomNodeController.h; sourceTree = ""; }; - 7F7B6DF318DE0D7A004F6CA8 /* CustomNodeController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CustomNodeController.m; path = src/osx/CustomNodeController.m; sourceTree = ""; }; - 7F90E88416DD29600069EBCD /* NSString+Tikz.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSString+Tikz.h"; path = "src/common/NSString+Tikz.h"; sourceTree = ""; }; - 7F90E88516DD29600069EBCD /* NSString+Tikz.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSString+Tikz.m"; path = "src/common/NSString+Tikz.m"; sourceTree = ""; }; - 7F90E88A16DD47540069EBCD /* PreferenceController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PreferenceController.h; path = src/osx/PreferenceController.h; sourceTree = ""; }; - 7F90E88B16DD47540069EBCD /* PreferenceController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PreferenceController.m; path = src/osx/PreferenceController.m; sourceTree = ""; }; - 7F90E88C16DD47540069EBCD /* Preferences.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = Preferences.xib; path = src/osx/Preferences.xib; sourceTree = ""; }; - 7F90E89016DD54440069EBCD /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = English; path = English.lproj/UserDefaults.plist; sourceTree = ""; }; - 7F93852D184D176E00FAED38 /* updates.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = updates.png; sourceTree = ""; }; - 7F93852F184D178B00FAED38 /* engine.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = engine.png; sourceTree = ""; }; - 7F938531184D184700FAED38 /* preamble.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = preamble.png; sourceTree = ""; }; - 7FB9BFEC16B57C2E00773146 /* TikzFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TikzFormatter.h; path = src/osx/TikzFormatter.h; sourceTree = ""; }; - 7FB9BFED16B57C2E00773146 /* TikzFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TikzFormatter.m; path = src/osx/TikzFormatter.m; sourceTree = ""; }; - 7FD5D44A18E1CB5300E2A930 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/CustomNodes.xib; sourceTree = ""; }; - 7FD5D44C18E1CC0B00E2A930 /* customshape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = customshape.png; sourceTree = ""; }; - 7FEED45516B1A7C400B056CB /* StyleManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StyleManager.h; path = src/common/StyleManager.h; sourceTree = ""; }; - 7FEED45616B1A7C500B056CB /* StyleManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = StyleManager.m; path = src/common/StyleManager.m; sourceTree = ""; }; - 8D15AC360486D014006FF6A4 /* TikZiT-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "TikZiT-Info.plist"; sourceTree = ""; }; - 8D15AC370486D014006FF6A4 /* TikZiT.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TikZiT.app; sourceTree = BUILT_PRODUCTS_DIR; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 5589AA6311C5429C0064D310 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 55CA98DD12EF910F008F0368 /* SFBInspectors.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 8D15AC330486D014006FF6A4 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 8D15AC340486D014006FF6A4 /* Cocoa.framework in Frameworks */, - 559EFA4811C7D49800D020F4 /* Sparkle.framework in Frameworks */, - 5573B8BA11D9FC8D00B5DC5D /* Quartz.framework in Frameworks */, - 55CA98D512EF8FCE008F0368 /* SFBInspectors.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 1058C7A6FEA54F5311CA2CBB /* Linked Frameworks */ = { - isa = PBXGroup; - children = ( - 1058C7A7FEA54F5311CA2CBB /* Cocoa.framework */, - 55FF4E64116A401B000C22B4 /* libicucore.dylib */, - 559EFA4711C7D49800D020F4 /* Sparkle.framework */, - 55CA98D412EF8FCE008F0368 /* SFBInspectors.framework */, - ); - name = "Linked Frameworks"; - sourceTree = ""; - }; - 1058C7A8FEA54F5311CA2CBB /* Other Frameworks */ = { - isa = PBXGroup; - children = ( - 2A37F4C4FDCFA73011CA2CEA /* AppKit.framework */, - 13E42FBA07B3F13500E4EEF1 /* CoreData.framework */, - 2A37F4C5FDCFA73011CA2CEA /* Foundation.framework */, - 5573B8B911D9FC8D00B5DC5D /* Quartz.framework */, - ); - name = "Other Frameworks"; - sourceTree = ""; - }; - 19C28FB0FE9D524F11CA2CBB /* Products */ = { - isa = PBXGroup; - children = ( - 8D15AC370486D014006FF6A4 /* TikZiT.app */, - 5504C83711D237F5002A1478 /* tests */, - ); - name = Products; - sourceTree = ""; - }; - 2A37F4AAFDCFA73011CA2CEA /* TikZiT */ = { - isa = PBXGroup; - children = ( - 2A37F4ABFDCFA73011CA2CEA /* TikZiT */, - 2A37F4AFFDCFA73011CA2CEA /* Other Sources */, - 2A37F4B8FDCFA73011CA2CEA /* Resources */, - 2A37F4C3FDCFA73011CA2CEA /* Frameworks */, - 19C28FB0FE9D524F11CA2CBB /* Products */, - ); - name = TikZiT; - sourceTree = ""; - }; - 2A37F4ABFDCFA73011CA2CEA /* TikZiT */ = { - isa = PBXGroup; - children = ( - 5504C82611D23477002A1478 /* Test */, - 55D946141165924F0044178C /* Graph */, - 55D946071165922F0044178C /* Parser */, - 55D9467311659F5E0044178C /* Gui */, - 558F18D9117B043B009863B2 /* AppDelegate.h */, - 558F18DA117B043B009863B2 /* AppDelegate.m */, - 55F9E04311FF54F000F5659E /* NSString+LatexConstants.h */, - 55F9E04411FF54F000F5659E /* NSString+LatexConstants.m */, - ); - name = TikZiT; - sourceTree = ""; - }; - 2A37F4AFFDCFA73011CA2CEA /* Other Sources */ = { - isa = PBXGroup; - children = ( - 55CA9AC712F831E5008F0368 /* RColor.h */, - 55CA9AC812F831E5008F0368 /* RColor.m */, - 558F18CB117B03DD009863B2 /* main.m */, - 558F18CC117B03DD009863B2 /* util.h */, - 558F18CD117B03DD009863B2 /* util.m */, - 2564AD2C0F5327BB00F57823 /* TikZiT_Prefix.pch */, - 55652DF713E1F2030023F4C6 /* SupportDir.h */, - 55652DF813E1F2030023F4C6 /* SupportDir.m */, - ); - name = "Other Sources"; - sourceTree = ""; - }; - 2A37F4B8FDCFA73011CA2CEA /* Resources */ = { - isa = PBXGroup; - children = ( - 55397C8E1449AC7C006942FB /* AH_latex_head.png */, - 55397C8F1449AC7C006942FB /* AH_plain_head.png */, - 55397C8C1449ABFC006942FB /* AH_latex_tail.png */, - 55397C871449AB91006942FB /* AH_none.png */, - 55397C881449AB91006942FB /* AH_plain_tail.png */, - 55397C841449A9BF006942FB /* ED_none.png */, - 55397C821449A8F1006942FB /* ED_tick.png */, - 55397C801449A877006942FB /* ED_arrow.png */, - 7F93852C184D175400FAED38 /* Icons */, - 55652E5013E1FC660023F4C6 /* shapes */, - 55900AE2135FB305002DD28E /* emblem-unreadable-grey.png */, - 55E5E99D1215C8E300256F69 /* transform-crop-and-resize.png */, - 5573B98711DA377C00B5DC5D /* text-x-script.png */, - 8D15AC360486D014006FF6A4 /* TikZiT-Info.plist */, - 7F90E88F16DD54440069EBCD /* UserDefaults.plist */, - 089C165FFE840EACC02AAC07 /* InfoPlist.strings */, - 2A37F4B9FDCFA73011CA2CEA /* Credits.rtf */, - 55D949111165D8870044178C /* draw-ellipse.png */, - 55D949121165D8870044178C /* draw-path.png */, - 555B30F811D8BE3300CAECF5 /* emblem-important.png */, - 5573B92411DA273400B5DC5D /* format-indent-less.png */, - 55D949131165D8870044178C /* select-rectangular.png */, - 5573B92011DA259C00B5DC5D /* text-x-generic.png */, - 559EFA5611C7D95F00D020F4 /* tikzit_dsa_pub.pem */, - 55D945701165904F0044178C /* tikzitdoc.icns */, - 55D945711165904F0044178C /* tikzit.icns */, - 7F90E88C16DD47540069EBCD /* Preferences.xib */, - 7FD5D44918E1CB5300E2A930 /* CustomNodes.xib */, - 7F18A322184C599100BC3081 /* UpdatePreferencePanel.xib */, - 55391AF713D3250F007DBE71 /* Preamble.xib */, - 55391AF513D324FE007DBE71 /* Preview.xib */, - 55391B0013D32608007DBE71 /* PropertyInspector.xib */, - 556979421168747B007E5703 /* StylePalette.xib */, - 1DDD58280DA1D0D100B32029 /* TikzDocument.xib */, - 1DDD582A0DA1D0D100B32029 /* MainMenu.xib */, - ); - name = Resources; - sourceTree = ""; - }; - 2A37F4C3FDCFA73011CA2CEA /* Frameworks */ = { - isa = PBXGroup; - children = ( - 1058C7A6FEA54F5311CA2CBB /* Linked Frameworks */, - 1058C7A8FEA54F5311CA2CBB /* Other Frameworks */, - ); - name = Frameworks; - sourceTree = ""; - }; - 5504C82611D23477002A1478 /* Test */ = { - isa = PBXGroup; - children = ( - 555B313411D8C6DA00CAECF5 /* color.m */, - 5504C93E11D39422002A1478 /* osx.m */, - 5504C82A11D23595002A1478 /* common.m */, - 5504C83111D23685002A1478 /* main.m */, - 5504C82B11D23595002A1478 /* parser.m */, - 5504C82C11D23595002A1478 /* test.h */, - 5504C82D11D23595002A1478 /* test.m */, - 7F6E2C8716B0091300BFE20D /* maths.m */, - ); - name = Test; - sourceTree = ""; - }; - 55391B0713D326E5007DBE71 /* PropertyInspector */ = { - isa = PBXGroup; - children = ( - 552202C2135F15FD007EA086 /* MultiField.h */, - 552202C3135F15FD007EA086 /* MultiField.m */, - 55900A9F135FA918002DD28E /* MultiCombo.h */, - 55900AA0135FA918002DD28E /* MultiCombo.m */, - 55391B0813D32765007DBE71 /* PropertyInspectorController.h */, - 55391B0913D32765007DBE71 /* PropertyInspectorController.m */, - ); - name = PropertyInspector; - sourceTree = ""; - }; - 55652E5013E1FC660023F4C6 /* shapes */ = { - isa = PBXGroup; - children = ( - 55652E5113E1FC660023F4C6 /* cap.tikz */, - 55652E5213E1FC660023F4C6 /* copants.tikz */, - 55652E5313E1FC660023F4C6 /* cup.tikz */, - 55652E5413E1FC660023F4C6 /* oval.tikz */, - 55652E5513E1FC660023F4C6 /* pants.tikz */, - ); - path = shapes; - sourceTree = ""; - }; - 5573B8BF11D9FD1800B5DC5D /* Preview */ = { - isa = PBXGroup; - children = ( - 7F734388184AC559002897D0 /* DraggablePDFView.h */, - 7F734389184AC559002897D0 /* DraggablePDFView.m */, - 5573B8C011D9FD3200B5DC5D /* PreviewController.h */, - 5573B8C111D9FD3200B5DC5D /* PreviewController.m */, - ); - name = Preview; - sourceTree = ""; - }; - 5573B90C11DA22E500B5DC5D /* Preamble */ = { - isa = PBXGroup; - children = ( - 5573B92711DA292F00B5DC5D /* Preambles.h */, - 5573B92811DA292F00B5DC5D /* Preambles.m */, - 5573BDC911DB4D2600B5DC5D /* Preambles+Coder.h */, - 5573BDCA11DB4D2600B5DC5D /* Preambles+Coder.m */, - ); - name = Preamble; - sourceTree = ""; - }; - 55900AFC13605498002DD28E /* Shapes */ = { - isa = PBXGroup; - children = ( - 55598E331635372E0023450A /* DiamondShape.h */, - 55598E341635372E0023450A /* DiamondShape.m */, - 55652E3F13E1FB0A0023F4C6 /* Shape.h */, - 55652E4013E1FB0A0023F4C6 /* Shape.m */, - 55652E3313E1FAED0023F4C6 /* CircleShape.h */, - 55652E3413E1FAED0023F4C6 /* CircleShape.m */, - 55652E3513E1FAED0023F4C6 /* RectangleShape.h */, - 55652E3613E1FAED0023F4C6 /* RectangleShape.m */, - 55652E3713E1FAED0023F4C6 /* RegularPolyShape.h */, - 55652E3813E1FAED0023F4C6 /* RegularPolyShape.m */, - 55652E3913E1FAEE0023F4C6 /* TikzShape.h */, - 55652E3A13E1FAEE0023F4C6 /* TikzShape.m */, - 555ECF361379E9F80052DB71 /* ShapeNames.h */, - ); - name = Shapes; - sourceTree = ""; - }; - 55D946071165922F0044178C /* Parser */ = { - isa = PBXGroup; - children = ( - 7F7B6DE218DE0BE1004F6CA8 /* Generated sources */, - 5589A9AA11C500060064D310 /* tikzlexer.lm */, - 5589A9AB11C500060064D310 /* tikzparser.ym */, - 5589A9FD11C51E780064D310 /* TikzGraphAssembler.h */, - 5589A9FE11C51E780064D310 /* TikzGraphAssembler.m */, - ); - name = Parser; - sourceTree = ""; - }; - 55D946141165924F0044178C /* Graph */ = { - isa = PBXGroup; - children = ( - 55432E041444BF2D00401BB3 /* GraphElementProperty.h */, - 55432E051444BF2D00401BB3 /* GraphElementProperty.m */, - 559EFB6611CB88E300D020F4 /* ColorRGB.h */, - 559EFB6711CB88E300D020F4 /* ColorRGB.m */, - 558F18B9117B031C009863B2 /* Edge.h */, - 558F18BA117B031C009863B2 /* Edge.m */, - 558F18BB117B031C009863B2 /* Graph.h */, - 558F18BC117B031C009863B2 /* Graph.m */, - 55D2E0B01186ED950060B4EC /* Graph+Coder.h */, - 55D2E0B11186ED950060B4EC /* Graph+Coder.m */, - 558F18BD117B031C009863B2 /* GraphChange.h */, - 558F18BE117B031C009863B2 /* GraphChange.m */, - 7FEED45516B1A7C400B056CB /* StyleManager.h */, - 7FEED45616B1A7C500B056CB /* StyleManager.m */, - 558F18BF117B031C009863B2 /* GraphElementData.h */, - 558F18C0117B031C009863B2 /* GraphElementData.m */, - 558F18C1117B031C009863B2 /* Node.h */, - 558F18C2117B031C009863B2 /* Node.m */, - 7F90E88416DD29600069EBCD /* NSString+Tikz.h */, - 7F90E88516DD29600069EBCD /* NSString+Tikz.m */, - 558F18C3117B031C009863B2 /* NodeStyle.h */, - 558F18C4117B031C009863B2 /* NodeStyle.m */, - 5585E5C0117F681800124513 /* NodeStyle+Coder.h */, - 5585E5C1117F681800124513 /* NodeStyle+Coder.m */, - 55397C7714498C21006942FB /* EdgeStyle.h */, - 55397C7814498C22006942FB /* EdgeStyle.m */, - 55397C7A144990EA006942FB /* EdgeStyle+Coder.h */, - 55397C7B144990EA006942FB /* EdgeStyle+Coder.m */, - 55397C7D144999C4006942FB /* PropertyHolder.h */, - 55397C7E144999C4006942FB /* PropertyHolder.m */, - ); - name = Graph; - sourceTree = ""; - }; - 55D9467311659F5E0044178C /* Gui */ = { - isa = PBXGroup; - children = ( - 7FB9BFE616B54BE300773146 /* Formatter */, - 55D9468011659FD50044178C /* GraphicsView */, - 5573B90C11DA22E500B5DC5D /* Preamble */, - 5573B8BF11D9FD1800B5DC5D /* Preview */, - 55391B0713D326E5007DBE71 /* PropertyInspector */, - 55D9468D11659FF00044178C /* StylePalette */, - 558F18EF117B043B009863B2 /* TikzDocument.h */, - 7F781C1816B5DE1400239826 /* ParseErrorView.h */, - 7F781C1916B5DE1400239826 /* ParseErrorView.m */, - 558F18F0117B043B009863B2 /* TikzDocument.m */, - 558F18F1117B043B009863B2 /* TikzSourceController.h */, - 558F18F2117B043B009863B2 /* TikzSourceController.m */, - 558F18F3117B043B009863B2 /* ToolPaletteController.h */, - 558F18F4117B043B009863B2 /* ToolPaletteController.m */, - 55CA997012F08281008F0368 /* TikzWindowController.h */, - 55CA997112F08281008F0368 /* TikzWindowController.m */, - 553A4C58144ED3D500AA6FAC /* NilToEmptyStringTransformer.h */, - 553A4C59144ED3D500AA6FAC /* NilToEmptyStringTransformer.m */, - 7F18A31E184C563800BC3081 /* Preferences */, - ); - name = Gui; - sourceTree = ""; - }; - 55D9468011659FD50044178C /* GraphicsView */ = { - isa = PBXGroup; - children = ( - 55900AFC13605498002DD28E /* Shapes */, - 558F18DD117B043B009863B2 /* EdgeControlLayer.h */, - 558F18DE117B043B009863B2 /* EdgeControlLayer.m */, - 558F18DF117B043B009863B2 /* GraphicsView.h */, - 558F18E0117B043B009863B2 /* GraphicsView.m */, - 558F18E1117B043B009863B2 /* Grid.h */, - 558F18E2117B043B009863B2 /* Grid.m */, - 558F18E3117B043B009863B2 /* NodeLayer.h */, - 558F18E4117B043B009863B2 /* NodeLayer.m */, - 558F18E5117B043B009863B2 /* NodeSelectionLayer.h */, - 558F18E6117B043B009863B2 /* NodeSelectionLayer.m */, - 55F958581181B09600F99434 /* PickSupport.h */, - 55F958591181B09600F99434 /* PickSupport.m */, - 55F9585A1181B09600F99434 /* Transformer.h */, - 55F9585B1181B09600F99434 /* Transformer.m */, - 5589AD4211C633EE0064D310 /* SelectBoxLayer.h */, - 5589AD4311C633EE0064D310 /* SelectBoxLayer.m */, - 555ECE991378A3AA0052DB71 /* CALayer+DrawLabel.h */, - 555ECE9A1378A3AA0052DB71 /* CALayer+DrawLabel.m */, - ); - name = GraphicsView; - sourceTree = ""; - }; - 55D9468D11659FF00044178C /* StylePalette */ = { - isa = PBXGroup; - children = ( - 558F18E9117B043B009863B2 /* SelectableCollectionViewItem.h */, - 558F18EA117B043B009863B2 /* SelectableCollectionViewItem.m */, - 558F18EB117B043B009863B2 /* SelectableNodeView.h */, - 558F18EC117B043B009863B2 /* SelectableNodeView.m */, - 558F18ED117B043B009863B2 /* StylePaletteController.h */, - 558F18EE117B043B009863B2 /* StylePaletteController.m */, - ); - name = StylePalette; - sourceTree = ""; - }; - 7F18A31E184C563800BC3081 /* Preferences */ = { - isa = PBXGroup; - children = ( - 7F7B6DEF18DE0D70004F6CA8 /* CustomNode */, - 5573B90D11DA231A00B5DC5D /* PreambleController.h */, - 5573B90E11DA231A00B5DC5D /* PreambleController.m */, - 7F90E88A16DD47540069EBCD /* PreferenceController.h */, - 7F90E88B16DD47540069EBCD /* PreferenceController.m */, - 7F18A31F184C577000BC3081 /* UpdatePreferenceController.h */, - 7F18A320184C577000BC3081 /* UpdatePreferenceController.m */, - ); - name = Preferences; - sourceTree = ""; - }; - 7F7B6DE218DE0BE1004F6CA8 /* Generated sources */ = { - isa = PBXGroup; - children = ( - 7F7B6DE918DE0C9E004F6CA8 /* tikzlexer.h */, - 7F7B6DEA18DE0C9E004F6CA8 /* tikzlexer.m */, - 7F7B6DEB18DE0C9E004F6CA8 /* tikzparser.h */, - 7F7B6DEC18DE0C9E004F6CA8 /* tikzparser.m */, - ); - name = "Generated sources"; - sourceTree = ""; - }; - 7F7B6DEF18DE0D70004F6CA8 /* CustomNode */ = { - isa = PBXGroup; - children = ( - 7F7B6DF018DE0D7A004F6CA8 /* CustomNodeCellView.h */, - 7F7B6DF118DE0D7A004F6CA8 /* CustomNodeCellView.m */, - 7F7B6DF218DE0D7A004F6CA8 /* CustomNodeController.h */, - 7F7B6DF318DE0D7A004F6CA8 /* CustomNodeController.m */, - ); - name = CustomNode; - sourceTree = ""; - }; - 7F93852C184D175400FAED38 /* Icons */ = { - isa = PBXGroup; - children = ( - 7F93852F184D178B00FAED38 /* engine.png */, - 7F938531184D184700FAED38 /* preamble.png */, - 7FD5D44C18E1CC0B00E2A930 /* customshape.png */, - 7F93852D184D176E00FAED38 /* updates.png */, - ); - name = Icons; - sourceTree = ""; - }; - 7FB9BFE616B54BE300773146 /* Formatter */ = { - isa = PBXGroup; - children = ( - 7FB9BFEC16B57C2E00773146 /* TikzFormatter.h */, - 7FB9BFED16B57C2E00773146 /* TikzFormatter.m */, - ); - name = Formatter; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 5589AA6411C5429C0064D310 /* tests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 5589AA8311C543240064D310 /* Build configuration list for PBXNativeTarget "tests" */; - buildPhases = ( - 5589AA6211C5429C0064D310 /* Sources */, - 5589AA6311C5429C0064D310 /* Frameworks */, - 7F6E2C8B16B00A9200BFE20D /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - 5504C91B11D36CD5002A1478 /* PBXTargetDependency */, - ); - name = tests; - productName = testparser; - productReference = 5504C83711D237F5002A1478 /* tests */; - productType = "com.apple.product-type.tool"; - }; - 8D15AC270486D014006FF6A4 /* TikZiT */ = { - isa = PBXNativeTarget; - buildConfigurationList = C05733C708A9546B00998B17 /* Build configuration list for PBXNativeTarget "TikZiT" */; - buildPhases = ( - 559EFA5511C7D4DD00D020F4 /* Copy Frameworks */, - 8D15AC2B0486D014006FF6A4 /* Resources */, - 55652E6613E1FD080023F4C6 /* Copy Shapes */, - 7F7B6DE018DE02AC004F6CA8 /* Run Flex */, - 7F7B6DE118DE0A6E004F6CA8 /* Run Bison */, - 8D15AC300486D014006FF6A4 /* Sources */, - 8D15AC330486D014006FF6A4 /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = TikZiT; - productInstallPath = "$(HOME)/Applications"; - productName = TikZiT; - productReference = 8D15AC370486D014006FF6A4 /* TikZiT.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 2A37F4A9FDCFA73011CA2CEA /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 0410; - ORGANIZATIONNAME = "Aleks Kissinger"; - }; - buildConfigurationList = C05733CB08A9546B00998B17 /* Build configuration list for PBXProject "TikZiT" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; - hasScannedForEncodings = 1; - knownRegions = ( - English, - Japanese, - French, - German, - ); - mainGroup = 2A37F4AAFDCFA73011CA2CEA /* TikZiT */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 8D15AC270486D014006FF6A4 /* TikZiT */, - 5589AA6411C5429C0064D310 /* tests */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 8D15AC2B0486D014006FF6A4 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 8D15AC2C0486D014006FF6A4 /* Credits.rtf in Resources */, - 8D15AC2F0486D014006FF6A4 /* InfoPlist.strings in Resources */, - 7F938532184D184700FAED38 /* preamble.png in Resources */, - 1DDD582C0DA1D0D100B32029 /* TikzDocument.xib in Resources */, - 7F938530184D178B00FAED38 /* engine.png in Resources */, - 1DDD582D0DA1D0D100B32029 /* MainMenu.xib in Resources */, - 7FD5D44D18E1CC0B00E2A930 /* customshape.png in Resources */, - 55D945721165904F0044178C /* tikzitdoc.icns in Resources */, - 55D945731165904F0044178C /* tikzit.icns in Resources */, - 556979431168747B007E5703 /* StylePalette.xib in Resources */, - 55D949141165D8870044178C /* draw-ellipse.png in Resources */, - 55D949151165D8870044178C /* draw-path.png in Resources */, - 55D949161165D8870044178C /* select-rectangular.png in Resources */, - 559EFA5711C7D95F00D020F4 /* tikzit_dsa_pub.pem in Resources */, - 7F93852E184D176E00FAED38 /* updates.png in Resources */, - 555B30F911D8BE3300CAECF5 /* emblem-important.png in Resources */, - 55391AF613D324FE007DBE71 /* Preview.xib in Resources */, - 55391AF813D3250F007DBE71 /* Preamble.xib in Resources */, - 5573B92111DA259C00B5DC5D /* text-x-generic.png in Resources */, - 5573B92511DA273400B5DC5D /* format-indent-less.png in Resources */, - 5573B98811DA377C00B5DC5D /* text-x-script.png in Resources */, - 55E5E99E1215C8E300256F69 /* transform-crop-and-resize.png in Resources */, - 55900AE3135FB305002DD28E /* emblem-unreadable-grey.png in Resources */, - 55391B0213D32608007DBE71 /* PropertyInspector.xib in Resources */, - 55397C811449A877006942FB /* ED_arrow.png in Resources */, - 55397C831449A8F1006942FB /* ED_tick.png in Resources */, - 55397C851449A9BF006942FB /* ED_none.png in Resources */, - 55397C8A1449AB91006942FB /* AH_none.png in Resources */, - 55397C8B1449AB91006942FB /* AH_plain_tail.png in Resources */, - 55397C8D1449ABFC006942FB /* AH_latex_tail.png in Resources */, - 7FD5D44B18E1CB5300E2A930 /* CustomNodes.xib in Resources */, - 55397C901449AC7C006942FB /* AH_latex_head.png in Resources */, - 55397C911449AC7C006942FB /* AH_plain_head.png in Resources */, - 7F18A323184C599100BC3081 /* UpdatePreferencePanel.xib in Resources */, - 7F90E88E16DD47540069EBCD /* Preferences.xib in Resources */, - 7F90E89116DD54440069EBCD /* UserDefaults.plist in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXShellScriptBuildPhase section */ - 7F7B6DE018DE02AC004F6CA8 /* Run Flex */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "$(SRCROOT)/src/common/tikzlexer.lm", - ); - name = "Run Flex"; - outputPaths = ( - "$(DERIVED_SOURCES_DIR)/tikzlexer.m", - "$(DERIVED_SOURCES_DIR)/tikzlexer.h", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "cd ${SRCROOT}/src/\nexport INPUT_FILE_BASE=`basename \"${SCRIPT_INPUT_FILE_0}\" .lm`\nflex -o common/${INPUT_FILE_BASE}.m common/${INPUT_FILE_BASE}.lm\nmv common/${INPUT_FILE_BASE}.m common/${INPUT_FILE_BASE}.h ${DERIVED_SOURCES_DIR}\n"; - }; - 7F7B6DE118DE0A6E004F6CA8 /* Run Bison */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "$(SRCROOT)/src/common/tikzparser.ym", - ); - name = "Run Bison"; - outputPaths = ( - "$(DERIVED_SOURCES_DIR)/tikzparser.m", - "$(DERIVED_SOURCES_DIR)/tikzparser.h", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "cd ${SRCROOT}/src/\nexport INPUT_FILE_BASE=`basename \"${SCRIPT_INPUT_FILE_0}\" .ym`\nbison --defines=common/${INPUT_FILE_BASE}.h --output=common/${INPUT_FILE_BASE}.m common/${INPUT_FILE_BASE}.ym\nmv common/${INPUT_FILE_BASE}.m common/${INPUT_FILE_BASE}.h ${DERIVED_SOURCES_DIR}"; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 5589AA6211C5429C0064D310 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 5504C84F11D23945002A1478 /* ColorRGB.m in Sources */, - 5589AA8511C543500064D310 /* util.m in Sources */, - 5589AA7211C542E60064D310 /* Edge.m in Sources */, - 5589AA7611C542E60064D310 /* Graph.m in Sources */, - 5589AA7811C542E60064D310 /* GraphChange.m in Sources */, - 5589AA7A11C542E60064D310 /* GraphElementData.m in Sources */, - 5589AA7C11C542E60064D310 /* Node.m in Sources */, - 5589AA8011C542E60064D310 /* NodeStyle.m in Sources */, - 5589AA6C11C542D30064D310 /* TikzGraphAssembler.m in Sources */, - 5589AA6D11C542D30064D310 /* tikzlexer.lm in Sources */, - 7F6E2C8216B008B000BFE20D /* DiamondShape.m in Sources */, - 7F6E2C8316B008B000BFE20D /* CircleShape.m in Sources */, - 7F6E2C8A16B0096000BFE20D /* SupportDir.m in Sources */, - 7F6E2C8416B008B000BFE20D /* RectangleShape.m in Sources */, - 7F6E2C8516B008B000BFE20D /* RegularPolyShape.m in Sources */, - 7F6E2C8616B008B000BFE20D /* TikzShape.m in Sources */, - 7F6E2C8016B0083300BFE20D /* Shape.m in Sources */, - 7F6E2C8116B0084600BFE20D /* Transformer.m in Sources */, - 5589AA6E11C542D30064D310 /* tikzparser.ym in Sources */, - 5504C82E11D23595002A1478 /* common.m in Sources */, - 5504C82F11D23595002A1478 /* parser.m in Sources */, - 5504C83011D23595002A1478 /* test.m in Sources */, - 7F6E2C7F16B0081D00BFE20D /* PropertyHolder.m in Sources */, - 5504C83211D23685002A1478 /* main.m in Sources */, - 5504C93F11D39422002A1478 /* osx.m in Sources */, - 555B313511D8C6DA00CAECF5 /* color.m in Sources */, - 7F6E2C7E16B0080400BFE20D /* GraphElementProperty.m in Sources */, - 7F6E2C7D16B007F000BFE20D /* EdgeStyle.m in Sources */, - 55CA9ACA12F831E5008F0368 /* RColor.m in Sources */, - 552202C4135F15FD007EA086 /* MultiField.m in Sources */, - 55900AA1135FA918002DD28E /* MultiCombo.m in Sources */, - 7F6E2C8916B0091300BFE20D /* maths.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 8D15AC300486D014006FF6A4 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 7F7B6DEE18DE0C9E004F6CA8 /* tikzparser.m in Sources */, - 7F7B6DED18DE0C9E004F6CA8 /* tikzlexer.m in Sources */, - 558F18C5117B031C009863B2 /* Edge.m in Sources */, - 558F18C6117B031C009863B2 /* Graph.m in Sources */, - 558F18C7117B031C009863B2 /* GraphChange.m in Sources */, - 7F7B6DF418DE0D7A004F6CA8 /* CustomNodeCellView.m in Sources */, - 558F18C8117B031C009863B2 /* GraphElementData.m in Sources */, - 558F18C9117B031C009863B2 /* Node.m in Sources */, - 558F18CA117B031C009863B2 /* NodeStyle.m in Sources */, - 558F18CE117B03DD009863B2 /* main.m in Sources */, - 558F18CF117B03DD009863B2 /* util.m in Sources */, - 558F18F7117B043C009863B2 /* AppDelegate.m in Sources */, - 558F18F9117B043C009863B2 /* EdgeControlLayer.m in Sources */, - 558F18FA117B043C009863B2 /* GraphicsView.m in Sources */, - 7F73438A184AC559002897D0 /* DraggablePDFView.m in Sources */, - 558F18FB117B043C009863B2 /* Grid.m in Sources */, - 558F18FC117B043C009863B2 /* NodeLayer.m in Sources */, - 558F18FD117B043C009863B2 /* NodeSelectionLayer.m in Sources */, - 558F18FF117B043C009863B2 /* SelectableCollectionViewItem.m in Sources */, - 558F1900117B043C009863B2 /* SelectableNodeView.m in Sources */, - 558F1901117B043C009863B2 /* StylePaletteController.m in Sources */, - 558F1902117B043C009863B2 /* TikzDocument.m in Sources */, - 558F1903117B043C009863B2 /* TikzSourceController.m in Sources */, - 558F1904117B043C009863B2 /* ToolPaletteController.m in Sources */, - 5585E5C2117F681800124513 /* NodeStyle+Coder.m in Sources */, - 55F9585C1181B09600F99434 /* PickSupport.m in Sources */, - 55F9585D1181B09600F99434 /* Transformer.m in Sources */, - 55D2E0B21186ED950060B4EC /* Graph+Coder.m in Sources */, - 5589A9FF11C51E780064D310 /* TikzGraphAssembler.m in Sources */, - 7F7B6DF518DE0D7A004F6CA8 /* CustomNodeController.m in Sources */, - 5589AD4411C633EE0064D310 /* SelectBoxLayer.m in Sources */, - 559EFB6811CB88E300D020F4 /* ColorRGB.m in Sources */, - 5573B8C211D9FD3200B5DC5D /* PreviewController.m in Sources */, - 5573B90F11DA231A00B5DC5D /* PreambleController.m in Sources */, - 5573B92911DA292F00B5DC5D /* Preambles.m in Sources */, - 5573BDCB11DB4D2600B5DC5D /* Preambles+Coder.m in Sources */, - 55F9E04511FF54F000F5659E /* NSString+LatexConstants.m in Sources */, - 55CA997212F08281008F0368 /* TikzWindowController.m in Sources */, - 55CA9AC912F831E5008F0368 /* RColor.m in Sources */, - 552202C5135F15FD007EA086 /* MultiField.m in Sources */, - 55900AA2135FA918002DD28E /* MultiCombo.m in Sources */, - 555ECE9B1378A3AA0052DB71 /* CALayer+DrawLabel.m in Sources */, - 55391B0A13D32765007DBE71 /* PropertyInspectorController.m in Sources */, - 55652DF913E1F2030023F4C6 /* SupportDir.m in Sources */, - 55652E3B13E1FAEE0023F4C6 /* CircleShape.m in Sources */, - 55652E3C13E1FAEE0023F4C6 /* RectangleShape.m in Sources */, - 55652E3D13E1FAEE0023F4C6 /* RegularPolyShape.m in Sources */, - 55652E3E13E1FAEE0023F4C6 /* TikzShape.m in Sources */, - 55652E4113E1FB0A0023F4C6 /* Shape.m in Sources */, - 55432E061444BF2D00401BB3 /* GraphElementProperty.m in Sources */, - 55397C7914498C22006942FB /* EdgeStyle.m in Sources */, - 55397C7C144990EA006942FB /* EdgeStyle+Coder.m in Sources */, - 55397C7F144999C4006942FB /* PropertyHolder.m in Sources */, - 553A4C5A144ED3D500AA6FAC /* NilToEmptyStringTransformer.m in Sources */, - 55598E351635372E0023450A /* DiamondShape.m in Sources */, - 7FEED45716B1A7C500B056CB /* StyleManager.m in Sources */, - 7FB9BFEE16B57C2E00773146 /* TikzFormatter.m in Sources */, - 7F781C1A16B5DE1400239826 /* ParseErrorView.m in Sources */, - 7F90E88616DD29600069EBCD /* NSString+Tikz.m in Sources */, - 7F90E88D16DD47540069EBCD /* PreferenceController.m in Sources */, - 7F18A321184C577000BC3081 /* UpdatePreferenceController.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXTargetDependency section */ - 5504C91B11D36CD5002A1478 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 8D15AC270486D014006FF6A4 /* TikZiT */; - targetProxy = 5504C91A11D36CD5002A1478 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - -/* Begin PBXVariantGroup section */ - 089C165FFE840EACC02AAC07 /* InfoPlist.strings */ = { - isa = PBXVariantGroup; - children = ( - 089C1660FE840EACC02AAC07 /* English */, - ); - name = InfoPlist.strings; - sourceTree = ""; - }; - 1DDD58280DA1D0D100B32029 /* TikzDocument.xib */ = { - isa = PBXVariantGroup; - children = ( - 1DDD58290DA1D0D100B32029 /* English */, - ); - name = TikzDocument.xib; - sourceTree = ""; - }; - 1DDD582A0DA1D0D100B32029 /* MainMenu.xib */ = { - isa = PBXVariantGroup; - children = ( - 1DDD582B0DA1D0D100B32029 /* English */, - ); - name = MainMenu.xib; - sourceTree = ""; - }; - 2A37F4B9FDCFA73011CA2CEA /* Credits.rtf */ = { - isa = PBXVariantGroup; - children = ( - 2A37F4BAFDCFA73011CA2CEA /* English */, - ); - name = Credits.rtf; - sourceTree = ""; - }; - 55391AF513D324FE007DBE71 /* Preview.xib */ = { - isa = PBXVariantGroup; - children = ( - 5573B8BD11D9FCD400B5DC5D /* English */, - ); - name = Preview.xib; - sourceTree = ""; - }; - 55391AF713D3250F007DBE71 /* Preamble.xib */ = { - isa = PBXVariantGroup; - children = ( - 5573B91011DA233E00B5DC5D /* English */, - ); - name = Preamble.xib; - sourceTree = ""; - }; - 55391B0013D32608007DBE71 /* PropertyInspector.xib */ = { - isa = PBXVariantGroup; - children = ( - 55391B0113D32608007DBE71 /* English */, - ); - name = PropertyInspector.xib; - sourceTree = ""; - }; - 556979421168747B007E5703 /* StylePalette.xib */ = { - isa = PBXVariantGroup; - children = ( - 55D947301165A5D40044178C /* English */, - ); - name = StylePalette.xib; - sourceTree = ""; - }; - 7F90E88F16DD54440069EBCD /* UserDefaults.plist */ = { - isa = PBXVariantGroup; - children = ( - 7F90E89016DD54440069EBCD /* English */, - ); - name = UserDefaults.plist; - sourceTree = ""; - }; - 7FD5D44918E1CB5300E2A930 /* CustomNodes.xib */ = { - isa = PBXVariantGroup; - children = ( - 7FD5D44A18E1CB5300E2A930 /* English */, - ); - name = CustomNodes.xib; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - -/* Begin XCBuildConfiguration section */ - 5589AA6711C5429E0064D310 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/Frameworks\"", - ); - GCC_DYNAMIC_NO_PIC = NO; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; - INSTALL_PATH = /usr/local/bin; - OTHER_LDFLAGS = ( - "-framework", - Foundation, - "-framework", - AppKit, - ); - PRODUCT_NAME = tests; - SDKROOT = macosx; - }; - name = Debug; - }; - 5589AA6811C5429E0064D310 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/Frameworks\"", - ); - GCC_MODEL_TUNING = G5; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; - INSTALL_PATH = /usr/local/bin; - OTHER_LDFLAGS = ( - "-framework", - Foundation, - "-framework", - AppKit, - ); - PRODUCT_NAME = tests; - SDKROOT = macosx; - ZERO_LINK = NO; - }; - name = Release; - }; - C05733C808A9546B00998B17 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; - CLANG_ENABLE_OBJC_ARC = YES; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)\"", - "\"$(SRCROOT)/Frameworks\"", - ); - GCC_DYNAMIC_NO_PIC = NO; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = TikZiT_Prefix.pch; - INFOPLIST_FILE = "TikZiT-Info.plist"; - INSTALL_PATH = "$(HOME)/Applications"; - LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.7; - PRODUCT_NAME = TikZiT; - SDKROOT = macosx; - }; - name = Debug; - }; - C05733C908A9546B00998B17 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; - CLANG_ENABLE_OBJC_ARC = YES; - COMBINE_HIDPI_IMAGES = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)\"", - "\"$(SRCROOT)/Frameworks\"", - ); - GCC_MODEL_TUNING = G5; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = TikZiT_Prefix.pch; - INFOPLIST_FILE = "TikZiT-Info.plist"; - INSTALL_PATH = "$(HOME)/Applications"; - LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.7; - PRODUCT_NAME = TikZiT; - SDKROOT = macosx; - }; - name = Release; - }; - C05733CC08A9546B00998B17 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.5; - ONLY_ACTIVE_ARCH = YES; - PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO; - SDKROOT = macosx; - SYMROOT = xbuild; - USER_HEADER_SEARCH_PATHS = "src/osx src/common"; - VALID_ARCHS = "i386 x86_64"; - }; - name = Debug; - }; - C05733CD08A9546B00998B17 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.5; - ONLY_ACTIVE_ARCH = NO; - PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO; - SDKROOT = macosx; - SYMROOT = xbuild; - USER_HEADER_SEARCH_PATHS = "src/osx src/common"; - VALID_ARCHS = "i386 x86_64"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 5589AA8311C543240064D310 /* Build configuration list for PBXNativeTarget "tests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 5589AA6711C5429E0064D310 /* Debug */, - 5589AA6811C5429E0064D310 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - C05733C708A9546B00998B17 /* Build configuration list for PBXNativeTarget "TikZiT" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - C05733C808A9546B00998B17 /* Debug */, - C05733C908A9546B00998B17 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - C05733CB08A9546B00998B17 /* Build configuration list for PBXProject "TikZiT" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - C05733CC08A9546B00998B17 /* Debug */, - C05733CD08A9546B00998B17 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 2A37F4A9FDCFA73011CA2CEA /* Project object */; -} diff --git a/tikzit-1/TikZiT.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/tikzit-1/TikZiT.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 82f3c48..0000000 --- a/tikzit-1/TikZiT.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/tikzit-1/TikZiT.xcodeproj/project.xcworkspace/xcshareddata/TikZiT.xccheckout b/tikzit-1/TikZiT.xcodeproj/project.xcworkspace/xcshareddata/TikZiT.xccheckout deleted file mode 100644 index c3ec4fe..0000000 --- a/tikzit-1/TikZiT.xcodeproj/project.xcworkspace/xcshareddata/TikZiT.xccheckout +++ /dev/null @@ -1,37 +0,0 @@ - - - - - IDESourceControlProjectFavoriteDictionaryKey - - IDESourceControlProjectIdentifier - 26857C1F-E0FE-4FFB-BDAC-44158C649772 - IDESourceControlProjectOriginsDictionary - - F6FA2C351D428A0F1026539971510A626DEEFF59 - https://github.com/tikzit/tikzit.git - - IDESourceControlProjectRelativeInstallPathDictionary - - F6FA2C351D428A0F1026539971510A626DEEFF59 - TikZiT/ - - IDESourceControlProjectURL - https://github.com/tikzit/tikzit.git - IDESourceControlProjectVersion - 111 - IDESourceControlProjectWCCIdentifier - F6FA2C351D428A0F1026539971510A626DEEFF59 - IDESourceControlProjectWCConfigurations - - - IDESourceControlRepositoryExtensionIdentifierKey - public.vcs.git - IDESourceControlWCCIdentifierKey - F6FA2C351D428A0F1026539971510A626DEEFF59 - IDESourceControlWCCName - TikZiT - - - - diff --git a/tikzit-1/TikZiT.xcodeproj/project.xcworkspace/xcuserdata/aleks.xcuserdatad/UserInterfaceState.xcuserstate b/tikzit-1/TikZiT.xcodeproj/project.xcworkspace/xcuserdata/aleks.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index 99a5997..0000000 --- a/tikzit-1/TikZiT.xcodeproj/project.xcworkspace/xcuserdata/aleks.xcuserdatad/UserInterfaceState.xcuserstate +++ /dev/null @@ -1,24539 +0,0 @@ - - - - - $archiver - NSKeyedArchiver - $objects - - $null - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 2 - - - CF$UID - 3 - - - CF$UID - 4 - - - CF$UID - 5 - - - NS.objects - - - CF$UID - 6 - - - CF$UID - 194 - - - CF$UID - 441 - - - CF$UID - 533 - - - - 5D4A1A9F-B7F3-4B80-B1F2-42874F168C6C - FCF6616B-37CA-49A5-B7DD-7EC65F973E7D - E8D758DD-8E38-40E4-B712-F6B0919F77C9 - IDEWorkspaceDocument - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 7 - - - CF$UID - 8 - - - CF$UID - 9 - - - CF$UID - 10 - - - CF$UID - 11 - - - CF$UID - 12 - - - CF$UID - 13 - - - CF$UID - 14 - - - NS.objects - - - CF$UID - 15 - - - CF$UID - 192 - - - CF$UID - 193 - - - CF$UID - 25 - - - CF$UID - 2 - - - CF$UID - 7 - - - CF$UID - 25 - - - CF$UID - 25 - - - - IDEWorkspaceTabController_255C042C-F813-417B-AD8A-811609B9E1F2 - IDEWindowFrame - IDEOrderedWorkspaceTabControllers - IDEWindowInFullscreenMode - IDEWorkspaceWindowControllerUniqueIdentifier - IDEActiveWorkspaceTabController - IDEWindowToolbarIsVisible - IDEWindowTabBarIsVisible - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 16 - - - CF$UID - 17 - - - CF$UID - 18 - - - CF$UID - 19 - - - CF$UID - 20 - - - CF$UID - 21 - - - CF$UID - 22 - - - CF$UID - 23 - - - NS.objects - - - CF$UID - 24 - - - CF$UID - 25 - - - CF$UID - 26 - - - CF$UID - 27 - - - CF$UID - 40 - - - CF$UID - 78 - - - CF$UID - 25 - - - CF$UID - 87 - - - - IDETabLabel - IDEShowNavigator - AssistantEditorsLayout - IDEWorkspaceTabControllerUtilityAreaSplitView - IDENavigatorArea - IDEWorkspaceTabControllerDesignAreaSplitView - IDEShowUtilities - IDEEditorArea - Graph.m - - 0 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 29 - - - - DVTSplitViewItems - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 30 - - - CF$UID - 36 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 33 - - - CF$UID - 34 - - - - DVTIdentifier - DVTViewMagnitude - - 127 - - $classes - - NSDictionary - NSObject - - $classname - NSDictionary - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 33 - - - CF$UID - 37 - - - - 473 - - $classes - - NSMutableArray - NSArray - NSObject - - $classname - NSMutableArray - - - $classes - - NSMutableDictionary - NSDictionary - NSObject - - $classname - NSMutableDictionary - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 41 - - - CF$UID - 42 - - - NS.objects - - - CF$UID - 42 - - - CF$UID - 43 - - - - SelectedNavigator - Xcode.IDEKit.Navigator.Structure - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 44 - - - CF$UID - 45 - - - CF$UID - 46 - - - CF$UID - 47 - - - CF$UID - 48 - - - CF$UID - 49 - - - CF$UID - 50 - - - NS.objects - - - CF$UID - 51 - - - CF$UID - 25 - - - CF$UID - 52 - - - CF$UID - 25 - - - CF$UID - 25 - - - CF$UID - 54 - - - CF$UID - 61 - - - - IDEVisibleRect - IDEUnsavedDocumentFilteringEnabled - IDENavigatorExpandedItemsBeforeFilteringSet - IDERecentDocumentFilteringEnabled - IDESCMStatusFilteringEnabled - IDESelectedObjects - IDEExpandedItemsSet - {{0, 0}, {0, 0}} - - $class - - CF$UID - 53 - - NS.objects - - - - $classes - - NSSet - NSObject - - $classname - NSSet - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 55 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 56 - - - CF$UID - 57 - - - CF$UID - 58 - - - CF$UID - 59 - - - - TikZiT - TikZiT - Graph - Graph.m - - $classes - - NSArray - NSObject - - $classname - NSArray - - - $class - - CF$UID - 53 - - NS.objects - - - CF$UID - 62 - - - CF$UID - 63 - - - CF$UID - 65 - - - CF$UID - 66 - - - CF$UID - 68 - - - CF$UID - 72 - - - CF$UID - 73 - - - CF$UID - 75 - - - CF$UID - 76 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 56 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 56 - - - CF$UID - 64 - - - - Resources - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 56 - - - CF$UID - 57 - - - CF$UID - 58 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 56 - - - CF$UID - 57 - - - CF$UID - 67 - - - - Parser - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 56 - - - CF$UID - 69 - - - CF$UID - 70 - - - CF$UID - 71 - - - - Frameworks - Linked Frameworks - SFBInspectors.framework - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 56 - - - CF$UID - 69 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 56 - - - CF$UID - 64 - - - CF$UID - 74 - - - - shapes - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 56 - - - CF$UID - 69 - - - CF$UID - 70 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 56 - - - CF$UID - 77 - - - - Other Sources - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 79 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 80 - - - CF$UID - 82 - - - CF$UID - 84 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 20 - - - CF$UID - 81 - - - - 225 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 23 - - - CF$UID - 83 - - - - 815 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 85 - - - CF$UID - 86 - - - - IDEUtilitiesArea - 260 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 88 - - - CF$UID - 89 - - - CF$UID - 90 - - - CF$UID - 91 - - - CF$UID - 92 - - - CF$UID - 93 - - - CF$UID - 94 - - - CF$UID - 95 - - - NS.objects - - - CF$UID - 96 - - - CF$UID - 116 - - - CF$UID - 156 - - - CF$UID - 182 - - - CF$UID - 26 - - - CF$UID - 183 - - - CF$UID - 191 - - - CF$UID - 25 - - - - layoutTree - IDEEditorMode_Standard - IDEEDitorArea_DebugArea - IDEShowEditor - EditorMode - DebuggerSplitView - DefaultPersistentRepresentations - ShowDebuggerArea - - $class - - CF$UID - 115 - - geniusEditorContextNode - - CF$UID - 0 - - primaryEditorContextNode - - CF$UID - 97 - - rootLayoutTreeNode - - CF$UID - 112 - - - - $class - - CF$UID - 114 - - children - - CF$UID - 0 - - contentType - 1 - documentArchivableRepresentation - - CF$UID - 98 - - orientation - 0 - parent - - CF$UID - 112 - - - - $class - - CF$UID - 111 - - DocumentLocation - - CF$UID - 107 - - DomainIdentifier - - CF$UID - 99 - - IdentifierPath - - CF$UID - 100 - - IndexOfDocumentIdentifier - - CF$UID - 26 - - - Xcode.IDENavigableItemDomain.WorkspaceStructure - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 101 - - - CF$UID - 103 - - - CF$UID - 104 - - - CF$UID - 105 - - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 59 - - - - $classes - - IDEArchivableStringIndexPair - NSObject - - $classname - IDEArchivableStringIndexPair - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 58 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 57 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 106 - - - TikZiT - - $class - - CF$UID - 110 - - documentURL - - CF$UID - 108 - - timestamp - - CF$UID - 0 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/Graph.m - - - $classes - - NSMutableString - NSString - NSObject - - $classname - NSMutableString - - - $classes - - DVTDocumentLocation - NSObject - - $classname - DVTDocumentLocation - - - $classes - - IDENavigableItemArchivableRepresentation - NSObject - - $classname - IDENavigableItemArchivableRepresentation - - - $class - - CF$UID - 114 - - children - - CF$UID - 113 - - contentType - 0 - documentArchivableRepresentation - - CF$UID - 0 - - orientation - 0 - parent - - CF$UID - 0 - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 97 - - - - - $classes - - IDEWorkspaceTabControllerLayoutTreeNode - NSObject - - $classname - IDEWorkspaceTabControllerLayoutTreeNode - - - $classes - - IDEWorkspaceTabControllerLayoutTree - NSObject - - $classname - IDEWorkspaceTabControllerLayoutTree - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 117 - - - NS.objects - - - CF$UID - 118 - - - - EditorLayout_PersistentRepresentation - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 119 - - - NS.objects - - - CF$UID - 120 - - - - Main - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 121 - - - CF$UID - 122 - - - CF$UID - 123 - - - NS.objects - - - CF$UID - 124 - - - CF$UID - 26 - - - CF$UID - 154 - - - - EditorLayout_StateSavingStateDictionaries - EditorLayout_Selected - EditorLayout_Geometry - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 125 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 126 - - - CF$UID - 127 - - - CF$UID - 128 - - - CF$UID - 129 - - - CF$UID - 130 - - - CF$UID - 131 - - - CF$UID - 132 - - - NS.objects - - - CF$UID - 133 - - - CF$UID - 134 - - - CF$UID - 141 - - - CF$UID - 149 - - - CF$UID - 59 - - - CF$UID - 150 - - - CF$UID - 151 - - - - FileDataType - ArchivableRepresentation - EditorState - NavigableItemName - DocumentNavigableItemName - DocumentExtensionIdentifier - DocumentURL - public.objective-c-source - - $class - - CF$UID - 111 - - DocumentLocation - - CF$UID - 107 - - DomainIdentifier - - CF$UID - 99 - - IdentifierPath - - CF$UID - 135 - - IndexOfDocumentIdentifier - - CF$UID - 26 - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 136 - - - CF$UID - 137 - - - CF$UID - 138 - - - CF$UID - 139 - - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 59 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 58 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 57 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 140 - - - TikZiT - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 142 - - - CF$UID - 143 - - - CF$UID - 144 - - - CF$UID - 145 - - - NS.objects - - - CF$UID - 146 - - - CF$UID - 147 - - - CF$UID - 25 - - - CF$UID - 148 - - - - PrimaryDocumentTimestamp - PrimaryDocumentVisibleCharacterRange - HideAllIssues - PrimaryDocumentSelectedCharacterRange - 381083683.77450001 - {18089, 1176} - {19467, 0} - -tikz - Xcode.IDEKit.EditorDocument.SourceCode - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 152 - - - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/Graph.m - - $classes - - NSURL - NSObject - - $classname - NSURL - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 155 - - - - {{0, 0}, {600, 600}} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 157 - - - CF$UID - 158 - - - CF$UID - 159 - - - CF$UID - 160 - - - CF$UID - 161 - - - CF$UID - 162 - - - NS.objects - - - CF$UID - 163 - - - CF$UID - 164 - - - CF$UID - 166 - - - CF$UID - 163 - - - CF$UID - 168 - - - CF$UID - 176 - - - - LayoutFocusMode - console - variables - LayoutMode - IDEDebugArea_SplitView - IDEDebuggerAreaSplitView - 1 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 165 - - - NS.objects - - - CF$UID - 26 - - - - ConsoleFilterMode - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 167 - - - NS.objects - - - CF$UID - 163 - - - - VariablesViewSelectedScope - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 169 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 170 - - - CF$UID - 173 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 171 - - - CF$UID - 172 - - - - VariablesView - 301 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 174 - - - CF$UID - 175 - - - - ConsoleArea - 298 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 177 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 178 - - - CF$UID - 180 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 171 - - - CF$UID - 179 - - - - 301 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 174 - - - CF$UID - 181 - - - - 298 - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 184 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 185 - - - CF$UID - 188 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 186 - - - CF$UID - 187 - - - - IDEEditor - 203 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 189 - - - CF$UID - 190 - - - - IDEDebuggerArea - 115 - - $class - - CF$UID - 39 - - NS.keys - - NS.objects - - - {{264, 446}, {600, 624}} - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 7 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 8 - - - CF$UID - 9 - - - CF$UID - 195 - - - CF$UID - 10 - - - CF$UID - 196 - - - CF$UID - 12 - - - CF$UID - 13 - - - CF$UID - 14 - - - NS.objects - - - CF$UID - 197 - - - CF$UID - 198 - - - CF$UID - 199 - - - CF$UID - 25 - - - CF$UID - 3 - - - CF$UID - 195 - - - CF$UID - 182 - - - CF$UID - 25 - - - - IDEWorkspaceTabController_9038AF6D-AD9C-4682-ADF8-6CB1A302CFE7 - IDEWorkspaceWindowControllerUniqueIdentifier - {{447, 347}, {1300, 786}} - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 195 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 18 - - - CF$UID - 17 - - - CF$UID - 16 - - - CF$UID - 19 - - - CF$UID - 20 - - - CF$UID - 21 - - - CF$UID - 22 - - - CF$UID - 23 - - - NS.objects - - - CF$UID - 26 - - - CF$UID - 182 - - - CF$UID - 200 - - - CF$UID - 201 - - - CF$UID - 207 - - - CF$UID - 281 - - - CF$UID - 182 - - - CF$UID - 289 - - - - Graph.m - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 202 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 203 - - - CF$UID - 205 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 33 - - - CF$UID - 204 - - - - 403 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 33 - - - CF$UID - 206 - - - - 307 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 208 - - - CF$UID - 41 - - - CF$UID - 209 - - - CF$UID - 210 - - - CF$UID - 211 - - - CF$UID - 42 - - - CF$UID - 212 - - - NS.objects - - - CF$UID - 213 - - - CF$UID - 42 - - - CF$UID - 224 - - - CF$UID - 241 - - - CF$UID - 247 - - - CF$UID - 258 - - - CF$UID - 273 - - - - Xcode.IDEKit.Navigator.Symbol - Xcode.IDEKit.Navigator.Issues - Xcode.IDEKit.Navigator.Debug - Xcode.IDEKit.Navigator.Breakpoints - Xcode.IDEKit.Navigator.Logs - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 214 - - - CF$UID - 215 - - - CF$UID - 216 - - - CF$UID - 217 - - - CF$UID - 218 - - - CF$UID - 219 - - - CF$UID - 220 - - - NS.objects - - - CF$UID - 182 - - - CF$UID - 182 - - - CF$UID - 25 - - - CF$UID - 182 - - - CF$UID - 221 - - - CF$UID - 222 - - - CF$UID - 223 - - - - IDESymbolNavigatorShowWorkspaceOnly - IDESymbolNavigatorShowHierarchy - IDESymbolNavigatorShowContainersOnly - IDESymbolNavigatorShowClassesOnly - IDESymbolNamePatternString - IDESymbolNavigatorSelectedSymbols - IDEExpandedItems - - - $class - - CF$UID - 38 - - NS.objects - - - - $class - - CF$UID - 38 - - NS.objects - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 225 - - - CF$UID - 226 - - - CF$UID - 227 - - - CF$UID - 228 - - - CF$UID - 229 - - - CF$UID - 230 - - - CF$UID - 231 - - - CF$UID - 232 - - - CF$UID - 233 - - - NS.objects - - - CF$UID - 25 - - - CF$UID - 234 - - - CF$UID - 235 - - - CF$UID - 237 - - - CF$UID - 238 - - - CF$UID - 25 - - - CF$UID - 239 - - - CF$UID - 25 - - - CF$UID - 240 - - - - IDEErrorFilteringEnabled - IDEVisibleRect - IDECollapsedFiles - IDEExpandedIssues - IDESelectedNavigables - IDEShowsByType - IDECollapsedTypes - IDERecentFilteringEnabled - IDECollapsedGroups - {{0, 0}, {209, 644}} - - $class - - CF$UID - 236 - - NS.objects - - - - $classes - - NSMutableSet - NSSet - NSObject - - $classname - NSMutableSet - - - $class - - CF$UID - 236 - - NS.objects - - - - $class - - CF$UID - 38 - - NS.objects - - - - $class - - CF$UID - 236 - - NS.objects - - - - $class - - CF$UID - 236 - - NS.objects - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 242 - - - CF$UID - 243 - - - CF$UID - 244 - - - NS.objects - - - CF$UID - 245 - - - CF$UID - 246 - - - CF$UID - 25 - - - - IDEStackCompressionValue - IDEThreadOrQueueMode - IDEShowOnlyInterestingContent - 2 - 0 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 248 - - - CF$UID - 249 - - - CF$UID - 250 - - - CF$UID - 251 - - - NS.objects - - - CF$UID - 52 - - - CF$UID - 25 - - - CF$UID - 252 - - - CF$UID - 257 - - - - IDECollapsedtemsSet - IDEBreakpointNavigatorFilterOnEnabled - IDESelectedObjects - IDEVisibleRect - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 253 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 254 - - - CF$UID - 255 - - - CF$UID - 256 - - - - TikZiT - SelectableNodeView.m - -setNodeStyle: - {{0, 0}, {224, 686}} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 44 - - - CF$UID - 45 - - - CF$UID - 46 - - - CF$UID - 47 - - - CF$UID - 48 - - - CF$UID - 49 - - - CF$UID - 50 - - - NS.objects - - - CF$UID - 259 - - - CF$UID - 25 - - - CF$UID - 52 - - - CF$UID - 25 - - - CF$UID - 25 - - - CF$UID - 260 - - - CF$UID - 263 - - - - {{0, 0}, {209, 666}} - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 261 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 262 - - - CF$UID - 57 - - - CF$UID - 58 - - - CF$UID - 59 - - - - TikZiT - - $class - - CF$UID - 53 - - NS.objects - - - CF$UID - 264 - - - CF$UID - 265 - - - CF$UID - 266 - - - CF$UID - 267 - - - CF$UID - 268 - - - CF$UID - 269 - - - CF$UID - 270 - - - CF$UID - 271 - - - CF$UID - 272 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 262 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 262 - - - CF$UID - 64 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 262 - - - CF$UID - 57 - - - CF$UID - 67 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 262 - - - CF$UID - 69 - - - CF$UID - 70 - - - CF$UID - 71 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 262 - - - CF$UID - 64 - - - CF$UID - 74 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 262 - - - CF$UID - 69 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 262 - - - CF$UID - 77 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 262 - - - CF$UID - 57 - - - CF$UID - 58 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 262 - - - CF$UID - 69 - - - CF$UID - 70 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 274 - - - CF$UID - 275 - - - CF$UID - 276 - - - CF$UID - 277 - - - NS.objects - - - CF$UID - 278 - - - CF$UID - 279 - - - CF$UID - 25 - - - CF$UID - 280 - - - - IDELogNavigatorExpandedItemsStateKey - IDELogNavigatorSelectedObjectsStateKey - IDELogNavigatorRecentFilterStateKey - IDELogNavigatorVisibleRectStateKey - - $class - - CF$UID - 38 - - NS.objects - - - - $class - - CF$UID - 38 - - NS.objects - - - {{0, 0}, {464, 738}} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 282 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 283 - - - CF$UID - 285 - - - CF$UID - 287 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 20 - - - CF$UID - 284 - - - - 225 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 23 - - - CF$UID - 286 - - - - 815 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 85 - - - CF$UID - 288 - - - - 260 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 95 - - - CF$UID - 89 - - - CF$UID - 90 - - - CF$UID - 91 - - - CF$UID - 92 - - - CF$UID - 290 - - - CF$UID - 93 - - - CF$UID - 94 - - - CF$UID - 291 - - - CF$UID - 88 - - - NS.objects - - - CF$UID - 182 - - - CF$UID - 292 - - - CF$UID - 314 - - - CF$UID - 182 - - - CF$UID - 26 - - - CF$UID - 329 - - - CF$UID - 368 - - - CF$UID - 374 - - - CF$UID - 375 - - - CF$UID - 430 - - - - IDEEditorMode_Version - IDEEditorMode_Genius - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 117 - - - NS.objects - - - CF$UID - 293 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 119 - - - NS.objects - - - CF$UID - 294 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 121 - - - CF$UID - 122 - - - CF$UID - 123 - - - NS.objects - - - CF$UID - 295 - - - CF$UID - 26 - - - CF$UID - 312 - - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 296 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 126 - - - CF$UID - 127 - - - CF$UID - 128 - - - CF$UID - 129 - - - CF$UID - 130 - - - CF$UID - 131 - - - CF$UID - 132 - - - NS.objects - - - CF$UID - 133 - - - CF$UID - 297 - - - CF$UID - 306 - - - CF$UID - 149 - - - CF$UID - 59 - - - CF$UID - 150 - - - CF$UID - 310 - - - - - $class - - CF$UID - 111 - - DocumentLocation - - CF$UID - 305 - - DomainIdentifier - - CF$UID - 298 - - IdentifierPath - - CF$UID - 299 - - IndexOfDocumentIdentifier - - CF$UID - 26 - - - Xcode.IDENavigableItemDomain.WorkspaceStructure - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 300 - - - CF$UID - 301 - - - CF$UID - 302 - - - CF$UID - 303 - - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 59 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 58 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 57 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 304 - - - TikZiT - - $class - - CF$UID - 110 - - documentURL - - CF$UID - 108 - - timestamp - - CF$UID - 0 - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 142 - - - CF$UID - 143 - - - CF$UID - 144 - - - CF$UID - 145 - - - NS.objects - - - CF$UID - 307 - - - CF$UID - 308 - - - CF$UID - 25 - - - CF$UID - 309 - - - - 381083686.29558802 - {18344, 1251} - {19467, 0} - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 311 - - - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/Graph.m - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 313 - - - - {{0, 0}, {815, 588}} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 157 - - - CF$UID - 158 - - - CF$UID - 161 - - - CF$UID - 160 - - - CF$UID - 162 - - - CF$UID - 159 - - - NS.objects - - - CF$UID - 163 - - - CF$UID - 315 - - - CF$UID - 316 - - - CF$UID - 163 - - - CF$UID - 322 - - - CF$UID - 328 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 165 - - - NS.objects - - - CF$UID - 26 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 317 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 318 - - - CF$UID - 320 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 171 - - - CF$UID - 319 - - - - 389 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 174 - - - CF$UID - 321 - - - - 425 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 323 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 324 - - - CF$UID - 326 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 171 - - - CF$UID - 325 - - - - 389 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 174 - - - CF$UID - 327 - - - - 425 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 167 - - - NS.objects - - - CF$UID - 26 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 330 - - - CF$UID - 331 - - - NS.objects - - - CF$UID - 246 - - - CF$UID - 332 - - - - VersionsEditorSubmode - EditorLayout_PersistentRepresentation - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 333 - - - NS.objects - - - CF$UID - 334 - - - - Main - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 335 - - - CF$UID - 336 - - - CF$UID - 337 - - - NS.objects - - - CF$UID - 338 - - - CF$UID - 246 - - - CF$UID - 366 - - - - EditorLayout_StateSavingStateDictionaries - EditorLayout_Selected - EditorLayout_Geometry - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 339 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 340 - - - CF$UID - 341 - - - CF$UID - 342 - - - CF$UID - 343 - - - CF$UID - 344 - - - CF$UID - 345 - - - CF$UID - 346 - - - NS.objects - - - CF$UID - 347 - - - CF$UID - 348 - - - CF$UID - 356 - - - CF$UID - 351 - - - CF$UID - 351 - - - CF$UID - 363 - - - CF$UID - 364 - - - - FileDataType - ArchivableRepresentation - EditorState - NavigableItemName - DocumentNavigableItemName - DocumentExtensionIdentifier - DocumentURL - com.apple.xml-property-list - - $class - - CF$UID - 111 - - DocumentLocation - - CF$UID - 354 - - DomainIdentifier - - CF$UID - 298 - - IdentifierPath - - CF$UID - 349 - - IndexOfDocumentIdentifier - - CF$UID - 26 - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 350 - - - CF$UID - 352 - - - CF$UID - 353 - - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 351 - - - TikZiT-Info.plist - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 64 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 254 - - - - $class - - CF$UID - 110 - - documentURL - - CF$UID - 355 - - timestamp - - CF$UID - 0 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/TikZiT-Info.plist - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 357 - - - CF$UID - 358 - - - CF$UID - 359 - - - NS.objects - - - CF$UID - 360 - - - CF$UID - 361 - - - CF$UID - 362 - - - - PrimaryDocumentSelectedCharacterRange - PrimaryDocumentVisibleCharacterRange - PrimaryDocumentTimestamp - {0, 0} - {0, 1053} - 348502952.18491101 - Xcode.IDEKit.EditorDocument.SourceCode-from-Plist - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 365 - - - file://localhost/Users/aleks/svn/tikzit/tikzit/TikZiT-Info.plist - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 367 - - - - {{0, 0}, {815, 602}} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 369 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 370 - - - CF$UID - 372 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 186 - - - CF$UID - 371 - - - - 610 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 189 - - - CF$UID - 373 - - - - 100 - - $class - - CF$UID - 39 - - NS.keys - - NS.objects - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 376 - - - CF$UID - 331 - - - NS.objects - - - CF$UID - 377 - - - CF$UID - 378 - - - - SplitPosition - 0.4993864893913269 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 379 - - - CF$UID - 333 - - - NS.objects - - - CF$UID - 380 - - - CF$UID - 409 - - - - Alternate - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 335 - - - CF$UID - 336 - - - CF$UID - 337 - - - NS.objects - - - CF$UID - 381 - - - CF$UID - 246 - - - CF$UID - 407 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 382 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 340 - - - CF$UID - 341 - - - CF$UID - 342 - - - CF$UID - 343 - - - CF$UID - 344 - - - CF$UID - 345 - - - CF$UID - 346 - - - NS.objects - - - CF$UID - 383 - - - CF$UID - 384 - - - CF$UID - 399 - - - CF$UID - 387 - - - CF$UID - 387 - - - CF$UID - 404 - - - CF$UID - 405 - - - - public.c-header - - $class - - CF$UID - 111 - - DocumentLocation - - CF$UID - 397 - - DomainIdentifier - - CF$UID - 0 - - IdentifierPath - - CF$UID - 385 - - IndexOfDocumentIdentifier - - CF$UID - 26 - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 386 - - - CF$UID - 388 - - - CF$UID - 390 - - - CF$UID - 391 - - - CF$UID - 394 - - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 387 - - - Graph.h - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 389 - - - Graph - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 254 - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 392 - - - CF$UID - 393 - - - NS.objects - - - CF$UID - 298 - - - CF$UID - 254 - - - - manualDomainIdentifier - navigableItem_name - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 395 - - - NS.objects - - - CF$UID - 396 - - - - identifier - Xcode.IDEKit.GeniusCategory.Manual - - $class - - CF$UID - 110 - - documentURL - - CF$UID - 398 - - timestamp - - CF$UID - 0 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/Graph.h - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 401 - - - CF$UID - 402 - - - CF$UID - 25 - - - CF$UID - 403 - - - - HideAllIssues - 348502936.56562501 - {1735, 943} - {998, 0} - Xcode.IDEKit.EditorDocument.SourceCode - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 406 - - - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/Graph.h - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 408 - - - - {{0, 0}, {407, 602}} - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 335 - - - CF$UID - 336 - - - CF$UID - 337 - - - NS.objects - - - CF$UID - 410 - - - CF$UID - 246 - - - CF$UID - 429 - - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 411 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 340 - - - CF$UID - 341 - - - CF$UID - 342 - - - CF$UID - 343 - - - CF$UID - 344 - - - CF$UID - 345 - - - CF$UID - 346 - - - NS.objects - - - CF$UID - 347 - - - CF$UID - 412 - - - CF$UID - 419 - - - CF$UID - 351 - - - CF$UID - 351 - - - CF$UID - 427 - - - CF$UID - 428 - - - - - $class - - CF$UID - 111 - - DocumentLocation - - CF$UID - 417 - - DomainIdentifier - - CF$UID - 298 - - IdentifierPath - - CF$UID - 413 - - IndexOfDocumentIdentifier - - CF$UID - 26 - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 414 - - - CF$UID - 415 - - - CF$UID - 416 - - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 351 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 64 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 254 - - - - $class - - CF$UID - 110 - - documentURL - - CF$UID - 418 - - timestamp - - CF$UID - 0 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/TikZiT-Info.plist - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 420 - - - CF$UID - 421 - - - CF$UID - 422 - - - NS.objects - - - CF$UID - 423 - - - CF$UID - 425 - - - CF$UID - 426 - - - - IDE_PLIST_EDITOR_SELECTION_KEY - IDE_PLIST_EDITOR_EXPANSION_KEY - IDE_PLIST_EDITOR_VISIBLERECT_KEY - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 424 - - - - CFBundleVersion - - $class - - CF$UID - 236 - - NS.objects - - - {{0, 0}, {407, 563}} - Xcode.IDEKit.EditorDocument.PlistEditor - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 365 - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 367 - - - - - $class - - CF$UID - 115 - - geniusEditorContextNode - - CF$UID - 0 - - primaryEditorContextNode - - CF$UID - 431 - - rootLayoutTreeNode - - CF$UID - 439 - - - - $class - - CF$UID - 114 - - children - - CF$UID - 0 - - contentType - 1 - documentArchivableRepresentation - - CF$UID - 432 - - orientation - 0 - parent - - CF$UID - 439 - - - - $class - - CF$UID - 111 - - DocumentLocation - - CF$UID - 305 - - DomainIdentifier - - CF$UID - 298 - - IdentifierPath - - CF$UID - 433 - - IndexOfDocumentIdentifier - - CF$UID - 26 - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 434 - - - CF$UID - 435 - - - CF$UID - 436 - - - CF$UID - 437 - - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 59 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 58 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 57 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 438 - - - TikZiT - - $class - - CF$UID - 114 - - children - - CF$UID - 440 - - contentType - 0 - documentArchivableRepresentation - - CF$UID - 0 - - orientation - 0 - parent - - CF$UID - 0 - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 431 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 8 - - - CF$UID - 9 - - - CF$UID - 442 - - - CF$UID - 10 - - - CF$UID - 11 - - - CF$UID - 12 - - - CF$UID - 13 - - - CF$UID - 14 - - - NS.objects - - - CF$UID - 443 - - - CF$UID - 444 - - - CF$UID - 445 - - - CF$UID - 25 - - - CF$UID - 4 - - - CF$UID - 442 - - - CF$UID - 25 - - - CF$UID - 25 - - - - IDEWorkspaceTabController_5BA15B20-6E8C-4183-8118-E8E43B2873EF - {{264, 446}, {600, 624}} - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 442 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 16 - - - CF$UID - 17 - - - CF$UID - 18 - - - CF$UID - 19 - - - CF$UID - 20 - - - CF$UID - 21 - - - CF$UID - 22 - - - CF$UID - 23 - - - NS.objects - - - CF$UID - 446 - - - CF$UID - 25 - - - CF$UID - 26 - - - CF$UID - 447 - - - CF$UID - 453 - - - CF$UID - 469 - - - CF$UID - 25 - - - CF$UID - 477 - - - - tikzparser.ym - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 448 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 449 - - - CF$UID - 451 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 33 - - - CF$UID - 450 - - - - 127 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 33 - - - CF$UID - 452 - - - - 473 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 41 - - - CF$UID - 42 - - - NS.objects - - - CF$UID - 42 - - - CF$UID - 454 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 44 - - - CF$UID - 45 - - - CF$UID - 46 - - - CF$UID - 47 - - - CF$UID - 48 - - - CF$UID - 49 - - - CF$UID - 50 - - - NS.objects - - - CF$UID - 455 - - - CF$UID - 25 - - - CF$UID - 52 - - - CF$UID - 25 - - - CF$UID - 25 - - - CF$UID - 456 - - - CF$UID - 460 - - - - {{0, 0}, {0, 0}} - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 457 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 458 - - - CF$UID - 57 - - - CF$UID - 67 - - - CF$UID - 459 - - - - TikZiT - tikzparser.ym - - $class - - CF$UID - 53 - - NS.objects - - - CF$UID - 461 - - - CF$UID - 462 - - - CF$UID - 463 - - - CF$UID - 464 - - - CF$UID - 465 - - - CF$UID - 466 - - - CF$UID - 467 - - - CF$UID - 468 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 458 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 458 - - - CF$UID - 64 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 458 - - - CF$UID - 57 - - - CF$UID - 67 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 458 - - - CF$UID - 77 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 458 - - - CF$UID - 69 - - - CF$UID - 70 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 458 - - - CF$UID - 69 - - - CF$UID - 70 - - - CF$UID - 71 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 458 - - - CF$UID - 69 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 458 - - - CF$UID - 64 - - - CF$UID - 74 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 470 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 471 - - - CF$UID - 473 - - - CF$UID - 475 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 20 - - - CF$UID - 472 - - - - 225 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 23 - - - CF$UID - 474 - - - - 815 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 85 - - - CF$UID - 476 - - - - 260 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 88 - - - CF$UID - 89 - - - CF$UID - 90 - - - CF$UID - 91 - - - CF$UID - 92 - - - CF$UID - 93 - - - CF$UID - 94 - - - CF$UID - 95 - - - NS.objects - - - CF$UID - 478 - - - CF$UID - 491 - - - CF$UID - 511 - - - CF$UID - 182 - - - CF$UID - 26 - - - CF$UID - 526 - - - CF$UID - 532 - - - CF$UID - 25 - - - - - $class - - CF$UID - 115 - - geniusEditorContextNode - - CF$UID - 0 - - primaryEditorContextNode - - CF$UID - 479 - - rootLayoutTreeNode - - CF$UID - 489 - - - - $class - - CF$UID - 114 - - children - - CF$UID - 0 - - contentType - 1 - documentArchivableRepresentation - - CF$UID - 480 - - orientation - 0 - parent - - CF$UID - 489 - - - - $class - - CF$UID - 111 - - DocumentLocation - - CF$UID - 487 - - DomainIdentifier - - CF$UID - 99 - - IdentifierPath - - CF$UID - 481 - - IndexOfDocumentIdentifier - - CF$UID - 26 - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 482 - - - CF$UID - 483 - - - CF$UID - 484 - - - CF$UID - 485 - - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 459 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 67 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 57 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 486 - - - TikZiT - - $class - - CF$UID - 110 - - documentURL - - CF$UID - 488 - - timestamp - - CF$UID - 0 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/tikzparser.ym - - - $class - - CF$UID - 114 - - children - - CF$UID - 490 - - contentType - 0 - documentArchivableRepresentation - - CF$UID - 0 - - orientation - 0 - parent - - CF$UID - 0 - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 479 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 117 - - - NS.objects - - - CF$UID - 492 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 119 - - - NS.objects - - - CF$UID - 493 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 121 - - - CF$UID - 122 - - - CF$UID - 123 - - - NS.objects - - - CF$UID - 494 - - - CF$UID - 26 - - - CF$UID - 509 - - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 495 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 126 - - - CF$UID - 127 - - - CF$UID - 128 - - - CF$UID - 129 - - - CF$UID - 130 - - - CF$UID - 131 - - - CF$UID - 132 - - - NS.objects - - - CF$UID - 496 - - - CF$UID - 497 - - - CF$UID - 504 - - - CF$UID - 459 - - - CF$UID - 459 - - - CF$UID - 150 - - - CF$UID - 507 - - - - public.yacc-source - - $class - - CF$UID - 111 - - DocumentLocation - - CF$UID - 487 - - DomainIdentifier - - CF$UID - 99 - - IdentifierPath - - CF$UID - 498 - - IndexOfDocumentIdentifier - - CF$UID - 26 - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 499 - - - CF$UID - 500 - - - CF$UID - 501 - - - CF$UID - 502 - - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 459 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 67 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 57 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 503 - - - TikZiT - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 142 - - - CF$UID - 143 - - - CF$UID - 144 - - - CF$UID - 145 - - - NS.objects - - - CF$UID - 505 - - - CF$UID - 506 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 381079264.11013299 - {1063, 652} - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 508 - - - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/tikzparser.ym - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 510 - - - - {{0, 0}, {600, 600}} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 157 - - - CF$UID - 158 - - - CF$UID - 159 - - - CF$UID - 160 - - - CF$UID - 161 - - - CF$UID - 162 - - - NS.objects - - - CF$UID - 163 - - - CF$UID - 512 - - - CF$UID - 513 - - - CF$UID - 163 - - - CF$UID - 514 - - - CF$UID - 520 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 165 - - - NS.objects - - - CF$UID - 26 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 167 - - - NS.objects - - - CF$UID - 163 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 515 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 516 - - - CF$UID - 518 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 171 - - - CF$UID - 517 - - - - 301 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 174 - - - CF$UID - 519 - - - - 298 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 521 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 522 - - - CF$UID - 524 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 171 - - - CF$UID - 523 - - - - 301 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 174 - - - CF$UID - 525 - - - - 298 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 527 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 528 - - - CF$UID - 530 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 186 - - - CF$UID - 529 - - - - 203 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 189 - - - CF$UID - 531 - - - - 115 - - $class - - CF$UID - 39 - - NS.keys - - NS.objects - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 534 - - - CF$UID - 535 - - - CF$UID - 536 - - - CF$UID - 537 - - - CF$UID - 538 - - - CF$UID - 539 - - - CF$UID - 540 - - - CF$UID - 541 - - - CF$UID - 542 - - - CF$UID - 543 - - - CF$UID - 544 - - - NS.objects - - - CF$UID - 182 - - - CF$UID - 545 - - - CF$UID - 26 - - - CF$UID - 1624 - - - CF$UID - 1629 - - - CF$UID - 1632 - - - CF$UID - 1662 - - - CF$UID - 1663 - - - CF$UID - 1758 - - - CF$UID - 25 - - - CF$UID - 25 - - - - BreakpointsActivated - DefaultEditorStatesForURLs - DebuggingWindowBehavior - ActiveRunDestination - ActiveScheme - LastCompletedPersistentSchemeBasedActivityReport - DocumentWindows - DefaultEditorFrameSizeForURLs - RecentEditorDocumentURLs - AppFocusInMiniDebugging - MiniDebuggingConsole - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 546 - - - CF$UID - 427 - - - CF$UID - 547 - - - CF$UID - 404 - - - CF$UID - 548 - - - CF$UID - 549 - - - CF$UID - 363 - - - CF$UID - 550 - - - CF$UID - 551 - - - NS.objects - - - CF$UID - 552 - - - CF$UID - 576 - - - CF$UID - 596 - - - CF$UID - 713 - - - CF$UID - 1449 - - - CF$UID - 1466 - - - CF$UID - 1472 - - - CF$UID - 1475 - - - CF$UID - 1585 - - - - IDEQuickLookEditor.Editor - Xcode.IDEKit.CocoaIntegration.EditorDocument.Cocoa - Xcode.IDEKit.EditorDocument.SourceCodeComparisonEditor - Xcode.IDEKit.EditorDocument.SourceCode-from-NIB - Xcode.Xcode3ProjectSupport.EditorDocument.Xcode3Project - Xcode.IDEKit.EditorDocument.LogDocument - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 553 - - - CF$UID - 555 - - - CF$UID - 557 - - - NS.objects - - - CF$UID - 559 - - - CF$UID - 566 - - - CF$UID - 571 - - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 554 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/AH_latex_tail - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 556 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/AH_latex_head.png - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 558 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/ED_none.png - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 560 - - - NS.objects - - - CF$UID - 561 - - - - SelectedDocumentLocations - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 562 - - - - - $class - - CF$UID - 565 - - IDEQuickLookPageNumber - - CF$UID - 26 - - documentURL - - CF$UID - 563 - - timestamp - - CF$UID - 564 - - - file://localhost/Users/aleks/svn/tikzit/AH_latex_tail - 340372422.96159899 - - $classes - - IDEQuickLookDocumentLocation - DVTDocumentLocation - NSObject - - $classname - IDEQuickLookDocumentLocation - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 560 - - - NS.objects - - - CF$UID - 567 - - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 568 - - - - - $class - - CF$UID - 565 - - IDEQuickLookPageNumber - - CF$UID - 26 - - documentURL - - CF$UID - 569 - - timestamp - - CF$UID - 570 - - - file://localhost/Users/aleks/svn/tikzit/AH_latex_head.png - 340372923.18815899 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 560 - - - NS.objects - - - CF$UID - 572 - - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 573 - - - - - $class - - CF$UID - 565 - - IDEQuickLookPageNumber - - CF$UID - 26 - - documentURL - - CF$UID - 574 - - timestamp - - CF$UID - 575 - - - file://localhost/Users/aleks/svn/tikzit/ED_none.png - 340371928.114389 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 577 - - - CF$UID - 579 - - - CF$UID - 581 - - - NS.objects - - - CF$UID - 583 - - - CF$UID - 587 - - - CF$UID - 592 - - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 578 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/TikZiT-Info.plist - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 580 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/TikZiT-Info.plist - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 582 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/git/tikzit/tikzit/TikZiT-Info.plist - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 420 - - - CF$UID - 421 - - - CF$UID - 422 - - - NS.objects - - - CF$UID - 584 - - - CF$UID - 585 - - - CF$UID - 586 - - - - - $class - - CF$UID - 60 - - NS.objects - - - - $class - - CF$UID - 236 - - NS.objects - - - {{0, 0}, {743, 502}} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 420 - - - CF$UID - 422 - - - CF$UID - 421 - - - NS.objects - - - CF$UID - 588 - - - CF$UID - 590 - - - CF$UID - 591 - - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 589 - - - - CFBundleIconFile - {{0, 0}, {815, 552}} - - $class - - CF$UID - 236 - - NS.objects - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 420 - - - CF$UID - 421 - - - CF$UID - 422 - - - NS.objects - - - CF$UID - 593 - - - CF$UID - 594 - - - CF$UID - 595 - - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 589 - - - - - $class - - CF$UID - 236 - - NS.objects - - - {{0, 0}, {815, 550}} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 597 - - - CF$UID - 599 - - - CF$UID - 601 - - - CF$UID - 603 - - - CF$UID - 605 - - - CF$UID - 607 - - - CF$UID - 609 - - - CF$UID - 611 - - - CF$UID - 613 - - - CF$UID - 615 - - - NS.objects - - - CF$UID - 617 - - - CF$UID - 638 - - - CF$UID - 650 - - - CF$UID - 657 - - - CF$UID - 668 - - - CF$UID - 677 - - - CF$UID - 685 - - - CF$UID - 693 - - - CF$UID - 699 - - - CF$UID - 705 - - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 598 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/English.lproj/PropertyInspector.xib - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 600 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/English.lproj/StylePalette.xib - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 602 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/English.lproj/PropertyInspector.xib - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 604 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/English.lproj/StylePalette.xib - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 606 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/English.lproj/TikzDocument.xib - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 608 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/English.lproj/Preview.xib - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 610 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/English.lproj/MainMenu.xib - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 612 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/English.lproj/Preamble.xib - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 614 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/English.lproj/MainMenu.xib - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 616 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/English.lproj/Preamble.xib - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 618 - - - CF$UID - 619 - - - CF$UID - 620 - - - CF$UID - 621 - - - NS.objects - - - CF$UID - 622 - - - CF$UID - 584 - - - CF$UID - 621 - - - CF$UID - 625 - - - - IBDockViewController - SelectedObjectIDs - SelectionProvider - IBCanvasViewController - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 623 - - - NS.objects - - - CF$UID - 624 - - - - LastKnownOutlineViewWidth - 224 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 626 - - - CF$UID - 627 - - - NS.objects - - - CF$UID - 628 - - - CF$UID - 637 - - - - ObjectIDToLastKnownCanvasPositionMap - EditedTopLevelObjectIDs - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 629 - - - CF$UID - 630 - - - CF$UID - 631 - - - CF$UID - 632 - - - NS.objects - - - CF$UID - 633 - - - CF$UID - 634 - - - CF$UID - 635 - - - CF$UID - 636 - - - - 301 - 185 - 461 - 361 - {46, 13} - {46, 189} - {318, 118} - {46, 385} - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 629 - - - CF$UID - 632 - - - CF$UID - 630 - - - CF$UID - 631 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 618 - - - CF$UID - 619 - - - CF$UID - 620 - - - CF$UID - 621 - - - NS.objects - - - CF$UID - 639 - - - CF$UID - 641 - - - CF$UID - 643 - - - CF$UID - 644 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 623 - - - NS.objects - - - CF$UID - 640 - - - - 224 - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 642 - - - - -2 - IBStructureViewController - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 626 - - - CF$UID - 627 - - - NS.objects - - - CF$UID - 645 - - - CF$UID - 646 - - - - - $class - - CF$UID - 39 - - NS.keys - - NS.objects - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 647 - - - CF$UID - 648 - - - CF$UID - 649 - - - - 3 - 649 - 181 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 618 - - - CF$UID - 619 - - - CF$UID - 620 - - - CF$UID - 621 - - - NS.objects - - - CF$UID - 651 - - - CF$UID - 653 - - - CF$UID - 621 - - - CF$UID - 654 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 623 - - - NS.objects - - - CF$UID - 652 - - - - 224 - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 631 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 626 - - - CF$UID - 627 - - - NS.objects - - - CF$UID - 655 - - - CF$UID - 656 - - - - - $class - - CF$UID - 39 - - NS.keys - - NS.objects - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 631 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 618 - - - CF$UID - 619 - - - CF$UID - 620 - - - CF$UID - 621 - - - NS.objects - - - CF$UID - 658 - - - CF$UID - 584 - - - CF$UID - 621 - - - CF$UID - 660 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 623 - - - NS.objects - - - CF$UID - 659 - - - - 224 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 626 - - - CF$UID - 627 - - - NS.objects - - - CF$UID - 661 - - - CF$UID - 667 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 647 - - - CF$UID - 649 - - - CF$UID - 662 - - - CF$UID - 648 - - - NS.objects - - - CF$UID - 663 - - - CF$UID - 664 - - - CF$UID - 665 - - - CF$UID - 666 - - - - 524 - {306, -2} - {71, 17} - {118, 105} - {71, 359} - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 648 - - - CF$UID - 647 - - - CF$UID - 649 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 618 - - - CF$UID - 619 - - - CF$UID - 620 - - - CF$UID - 621 - - - NS.objects - - - CF$UID - 669 - - - CF$UID - 671 - - - CF$UID - 643 - - - CF$UID - 673 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 623 - - - NS.objects - - - CF$UID - 670 - - - - 224 - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 672 - - - - 100024 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 626 - - - CF$UID - 627 - - - NS.objects - - - CF$UID - 674 - - - CF$UID - 675 - - - - - $class - - CF$UID - 39 - - NS.keys - - NS.objects - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 676 - - - - 5 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 618 - - - CF$UID - 619 - - - CF$UID - 620 - - - CF$UID - 621 - - - NS.objects - - - CF$UID - 678 - - - CF$UID - 680 - - - CF$UID - 621 - - - CF$UID - 682 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 623 - - - NS.objects - - - CF$UID - 679 - - - - 224 - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 681 - - - - 11 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 626 - - - CF$UID - 627 - - - NS.objects - - - CF$UID - 683 - - - CF$UID - 684 - - - - - $class - - CF$UID - 39 - - NS.keys - - NS.objects - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 163 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 618 - - - CF$UID - 619 - - - CF$UID - 620 - - - CF$UID - 621 - - - NS.objects - - - CF$UID - 686 - - - CF$UID - 584 - - - CF$UID - 621 - - - CF$UID - 688 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 623 - - - NS.objects - - - CF$UID - 687 - - - - 200 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 626 - - - CF$UID - 627 - - - NS.objects - - - CF$UID - 689 - - - CF$UID - 690 - - - - - $class - - CF$UID - 39 - - NS.keys - - NS.objects - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 691 - - - CF$UID - 692 - - - - 535 - 29 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 618 - - - CF$UID - 619 - - - CF$UID - 620 - - - CF$UID - 621 - - - NS.objects - - - CF$UID - 694 - - - CF$UID - 584 - - - CF$UID - 621 - - - CF$UID - 696 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 623 - - - NS.objects - - - CF$UID - 695 - - - - 224 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 626 - - - CF$UID - 627 - - - NS.objects - - - CF$UID - 697 - - - CF$UID - 698 - - - - - $class - - CF$UID - 39 - - NS.keys - - NS.objects - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 163 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 618 - - - CF$UID - 619 - - - CF$UID - 620 - - - CF$UID - 621 - - - NS.objects - - - CF$UID - 700 - - - CF$UID - 584 - - - CF$UID - 621 - - - CF$UID - 702 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 623 - - - NS.objects - - - CF$UID - 701 - - - - 224 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 626 - - - CF$UID - 627 - - - NS.objects - - - CF$UID - 703 - - - CF$UID - 704 - - - - - $class - - CF$UID - 39 - - NS.keys - - NS.objects - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 692 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 618 - - - CF$UID - 619 - - - CF$UID - 620 - - - CF$UID - 621 - - - NS.objects - - - CF$UID - 706 - - - CF$UID - 708 - - - CF$UID - 621 - - - CF$UID - 710 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 623 - - - NS.objects - - - CF$UID - 707 - - - - 200 - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 709 - - - - 27 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 626 - - - CF$UID - 627 - - - NS.objects - - - CF$UID - 711 - - - CF$UID - 712 - - - - - $class - - CF$UID - 39 - - NS.keys - - NS.objects - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 163 - - - CF$UID - 647 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 714 - - - CF$UID - 716 - - - CF$UID - 718 - - - CF$UID - 720 - - - CF$UID - 722 - - - CF$UID - 724 - - - CF$UID - 726 - - - CF$UID - 728 - - - CF$UID - 730 - - - CF$UID - 732 - - - CF$UID - 734 - - - CF$UID - 736 - - - CF$UID - 738 - - - CF$UID - 740 - - - CF$UID - 742 - - - CF$UID - 744 - - - CF$UID - 746 - - - CF$UID - 748 - - - CF$UID - 750 - - - CF$UID - 752 - - - CF$UID - 754 - - - CF$UID - 756 - - - CF$UID - 758 - - - CF$UID - 760 - - - CF$UID - 762 - - - CF$UID - 764 - - - CF$UID - 766 - - - CF$UID - 768 - - - CF$UID - 770 - - - CF$UID - 772 - - - CF$UID - 774 - - - CF$UID - 776 - - - CF$UID - 778 - - - CF$UID - 780 - - - CF$UID - 782 - - - CF$UID - 784 - - - CF$UID - 785 - - - CF$UID - 787 - - - CF$UID - 789 - - - CF$UID - 791 - - - CF$UID - 793 - - - CF$UID - 795 - - - CF$UID - 797 - - - CF$UID - 799 - - - CF$UID - 801 - - - CF$UID - 803 - - - CF$UID - 805 - - - CF$UID - 807 - - - CF$UID - 809 - - - CF$UID - 811 - - - CF$UID - 813 - - - CF$UID - 815 - - - CF$UID - 817 - - - CF$UID - 819 - - - CF$UID - 821 - - - CF$UID - 823 - - - CF$UID - 825 - - - CF$UID - 827 - - - CF$UID - 829 - - - CF$UID - 831 - - - CF$UID - 833 - - - CF$UID - 835 - - - CF$UID - 837 - - - CF$UID - 839 - - - CF$UID - 841 - - - CF$UID - 843 - - - CF$UID - 845 - - - CF$UID - 847 - - - CF$UID - 849 - - - CF$UID - 851 - - - CF$UID - 853 - - - CF$UID - 855 - - - CF$UID - 857 - - - CF$UID - 859 - - - CF$UID - 861 - - - CF$UID - 863 - - - CF$UID - 865 - - - CF$UID - 867 - - - CF$UID - 869 - - - CF$UID - 871 - - - CF$UID - 873 - - - CF$UID - 875 - - - CF$UID - 877 - - - CF$UID - 879 - - - CF$UID - 881 - - - CF$UID - 883 - - - CF$UID - 885 - - - CF$UID - 887 - - - CF$UID - 889 - - - CF$UID - 891 - - - CF$UID - 893 - - - CF$UID - 895 - - - CF$UID - 897 - - - CF$UID - 899 - - - CF$UID - 901 - - - CF$UID - 903 - - - CF$UID - 905 - - - CF$UID - 907 - - - CF$UID - 908 - - - CF$UID - 910 - - - CF$UID - 912 - - - CF$UID - 914 - - - CF$UID - 916 - - - CF$UID - 918 - - - CF$UID - 920 - - - CF$UID - 922 - - - CF$UID - 924 - - - CF$UID - 926 - - - CF$UID - 928 - - - CF$UID - 930 - - - CF$UID - 932 - - - CF$UID - 934 - - - CF$UID - 936 - - - CF$UID - 938 - - - CF$UID - 940 - - - CF$UID - 942 - - - CF$UID - 944 - - - CF$UID - 946 - - - CF$UID - 948 - - - CF$UID - 950 - - - CF$UID - 952 - - - CF$UID - 954 - - - CF$UID - 956 - - - CF$UID - 958 - - - CF$UID - 960 - - - CF$UID - 962 - - - CF$UID - 964 - - - CF$UID - 966 - - - NS.objects - - - CF$UID - 968 - - - CF$UID - 972 - - - CF$UID - 976 - - - CF$UID - 980 - - - CF$UID - 984 - - - CF$UID - 988 - - - CF$UID - 992 - - - CF$UID - 996 - - - CF$UID - 1000 - - - CF$UID - 1003 - - - CF$UID - 1007 - - - CF$UID - 1011 - - - CF$UID - 1015 - - - CF$UID - 1019 - - - CF$UID - 1022 - - - CF$UID - 1025 - - - CF$UID - 1029 - - - CF$UID - 1033 - - - CF$UID - 1037 - - - CF$UID - 1041 - - - CF$UID - 1045 - - - CF$UID - 1049 - - - CF$UID - 1053 - - - CF$UID - 1057 - - - CF$UID - 1061 - - - CF$UID - 1065 - - - CF$UID - 1069 - - - CF$UID - 1073 - - - CF$UID - 1077 - - - CF$UID - 1081 - - - CF$UID - 1085 - - - CF$UID - 1089 - - - CF$UID - 1093 - - - CF$UID - 1097 - - - CF$UID - 1101 - - - CF$UID - 1105 - - - CF$UID - 1109 - - - CF$UID - 1113 - - - CF$UID - 1117 - - - CF$UID - 1120 - - - CF$UID - 1124 - - - CF$UID - 1128 - - - CF$UID - 1132 - - - CF$UID - 1136 - - - CF$UID - 1140 - - - CF$UID - 1143 - - - CF$UID - 1147 - - - CF$UID - 1151 - - - CF$UID - 1155 - - - CF$UID - 1158 - - - CF$UID - 1162 - - - CF$UID - 1165 - - - CF$UID - 1168 - - - CF$UID - 1171 - - - CF$UID - 1175 - - - CF$UID - 1178 - - - CF$UID - 1181 - - - CF$UID - 1185 - - - CF$UID - 1189 - - - CF$UID - 1193 - - - CF$UID - 1197 - - - CF$UID - 1200 - - - CF$UID - 1204 - - - CF$UID - 1208 - - - CF$UID - 1212 - - - CF$UID - 1215 - - - CF$UID - 1218 - - - CF$UID - 1221 - - - CF$UID - 1225 - - - CF$UID - 1229 - - - CF$UID - 1233 - - - CF$UID - 1236 - - - CF$UID - 1239 - - - CF$UID - 1243 - - - CF$UID - 1247 - - - CF$UID - 1251 - - - CF$UID - 1254 - - - CF$UID - 1257 - - - CF$UID - 1261 - - - CF$UID - 1264 - - - CF$UID - 1268 - - - CF$UID - 1272 - - - CF$UID - 1276 - - - CF$UID - 1280 - - - CF$UID - 1284 - - - CF$UID - 1288 - - - CF$UID - 1292 - - - CF$UID - 1296 - - - CF$UID - 1300 - - - CF$UID - 1304 - - - CF$UID - 1308 - - - CF$UID - 1312 - - - CF$UID - 1316 - - - CF$UID - 1320 - - - CF$UID - 1324 - - - CF$UID - 1327 - - - CF$UID - 1330 - - - CF$UID - 1334 - - - CF$UID - 1338 - - - CF$UID - 1342 - - - CF$UID - 1346 - - - CF$UID - 1350 - - - CF$UID - 1354 - - - CF$UID - 1358 - - - CF$UID - 1362 - - - CF$UID - 1366 - - - CF$UID - 1370 - - - CF$UID - 1373 - - - CF$UID - 1376 - - - CF$UID - 1380 - - - CF$UID - 1384 - - - CF$UID - 1388 - - - CF$UID - 1392 - - - CF$UID - 1396 - - - CF$UID - 1400 - - - CF$UID - 1404 - - - CF$UID - 1408 - - - CF$UID - 1412 - - - CF$UID - 1415 - - - CF$UID - 1418 - - - CF$UID - 1421 - - - CF$UID - 1425 - - - CF$UID - 1429 - - - CF$UID - 1432 - - - CF$UID - 1436 - - - CF$UID - 1439 - - - CF$UID - 1443 - - - CF$UID - 1446 - - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 715 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/GraphicsView.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 717 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/GraphicsView.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 719 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/Grid.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 721 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/git/tikzit/tikzit/src/osx/Grid.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 723 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/SelectBoxLayer.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 725 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/TikzSourceController.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 727 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/EdgeControlLayer.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 729 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/Edge.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 731 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/Edge.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 733 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/EdgeStyle+Coder.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 735 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/TikzShape.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 737 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/BasicMapTable.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 739 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/GraphChange.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 741 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/-%5BNSWindowController%20window%5D_disassembly_0x00007fff93905981.s - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 743 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/_objc_empty_vtable_disassembly_0x00007fff760e2f60.s - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 745 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/SupportDir.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 747 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/AppDelegate.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 749 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/PickSupport.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 751 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/NodeLayer.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 753 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/PropertyInspectorController.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 755 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/TikzDocument.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 757 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/EdgeStyle.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 759 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/EdgeStyle.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 761 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/NodeStyle.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 763 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/NSString+UnicharUtilities.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 765 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/Grid.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 767 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/DiffMatchPatch.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 769 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/CALayer+DrawLabel.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 771 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/NSString+UnicharUtilities.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 773 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/GraphDiff.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 775 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/contrib/DiffMatchPatch/NSString+DiffMatchPatchUtils.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 777 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/Graph.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 779 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/EdgeStyle.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 781 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/EdgeStyle.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 783 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/Graph.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 108 - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 786 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/SelectableNodeView.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 788 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/StylePaletteController.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 790 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/PreviewController.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 792 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/Transformer.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 794 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Developer/SDKs/MacOSX10.7.sdk/System/Library/Frameworks/Foundation.framework/Versions/C/Headers/NSArray.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 796 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/DiffMatchPatchCFUtilities.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 798 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/GraphChange.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 800 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/GraphChange.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 802 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/-%5BNSObject%20performSelector:%5D_disassembly_0x00007fff8ce162e1.s - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 804 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/DiffMatchPatchCFUtilities.c - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 806 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/PreambleController.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 808 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/PreambleController.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 810 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/CGContextAddPath_disassembly_0x00007fff910e972e.s - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 812 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/contrib/DiffMatchPatch/NSString+DiffMatchPatchUtils.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 814 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/-%5BNSCustomView%20nibInstantiateWithObjectInstantiator:%5D_disassembly_0x00007fff96b86f29.s - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 816 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/COPYING.DiffMatchPatch - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 818 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/__cxa_throw_disassembly_0x00007fff933e00e9.s - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 820 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/AppDelegate.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 822 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/AppDelegate.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 824 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/SelectBoxLayer.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 826 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/PropertyHolder.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 828 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/DiffMatchPatch.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 830 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/NSString+JavaSubstring.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 832 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/Transformer.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 834 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/Node.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 836 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/EdgeStyle+Coder.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 838 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/NSMutableDictionary+DMPExtensions.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 840 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/GraphElementProperty.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 842 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/Graph+Coder.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 844 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/test/test.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 846 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/SelectableNodeView.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 848 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Developer/SDKs/MacOSX10.7.sdk/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/CoreGraphics.framework/Versions/A/Headers/CGColor.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 850 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/NilToEmptyStringTransformer.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 852 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/NodeSelectionLayer.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 854 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/auto_fatal_disassembly_0x00007fff894d9f6f.s - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 856 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/GraphElementData.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 858 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/TikzWindowController.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 860 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/NSString+UriCompatibility.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 862 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/NodeStyle.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 864 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/CABackingStoreUpdate__disassembly_0x00007fff8d778b05.s - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 866 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/test/common.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 868 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/test/main.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 870 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/main.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 872 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/scratch/SFBInspectors/SFBInspectorView.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 874 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/ToolPaletteController.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 876 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/GraphicsView.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 878 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/GraphicsView.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 880 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/git/tikzit/tikzit/src/osx/GraphicsView.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 882 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/TikZiT-Info.plist - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 884 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/TikzGraphAssembler.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 886 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/SelectableCollectionViewItem.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 888 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/SelectableCollectionViewItem.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 890 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/TikzSourceController.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 892 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/Node.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 894 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/tikzlexer.lm - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 896 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/PickSupport.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 898 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/PickSupport.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 900 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/NilToEmptyStringTransformer.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 902 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/CFRelease_disassembly_0x00007fff8cc2b07b.s - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 904 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/GraphElementData.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 906 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/NodeStyle+Coder.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 488 - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 909 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/EdgeControlLayer.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 911 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/NodeStyle+Coder.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 913 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/Edge.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 915 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/Edge.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 917 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/Edge.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 919 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/TikzDocument.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 921 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/PropertyHolder.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 923 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/TikzGraphAssembler.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 925 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/StylePaletteController.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 927 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/StylePaletteController.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 929 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/TikzGraphAssembler.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 931 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/PropertyInspectorController.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 933 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/PropertyInspectorController.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 935 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/PreviewController.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 937 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/PreviewController.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 939 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/Graph.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 941 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/Graph.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 943 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/Graph+Coder.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 945 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/util.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 947 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/-%5BNSCollectionView%20newItemForRepresentedObject:%5D_disassembly_0x00007fff8fa0a94e.s - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 949 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/Shape.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 951 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/Shape.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 953 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Developer/SDKs/MacOSX10.7.sdk/System/Library/Frameworks/CoreFoundation.framework/Versions/A/Headers/CFString.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 955 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/TikzWindowController.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 957 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/GraphDiff.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 959 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/NodeSelectionLayer.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 961 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/GraphElementProperty.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 963 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/NodeLayer.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 965 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/NodeLayer.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 967 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/ColorRGB.m - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 969 - - - CF$UID - 970 - - - CF$UID - 25 - - - CF$UID - 971 - - - - 345762860.65236199 - {2200, 1151} - {2909, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 973 - - - CF$UID - 974 - - - CF$UID - 25 - - - CF$UID - 975 - - - - 348421987.42822403 - {2200, 1157} - {3223, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 977 - - - CF$UID - 978 - - - CF$UID - 25 - - - CF$UID - 979 - - - - 345403783.61108297 - {842, 693} - {1356, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 981 - - - CF$UID - 982 - - - CF$UID - 25 - - - CF$UID - 983 - - - - 380738928.58536297 - {2001, 1508} - {2090, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 985 - - - CF$UID - 986 - - - CF$UID - 25 - - - CF$UID - 987 - - - - 345416623.559434 - {0, 379} - {276, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 989 - - - CF$UID - 990 - - - CF$UID - 25 - - - CF$UID - 991 - - - - 345403324.869367 - {881, 944} - {1433, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 993 - - - CF$UID - 994 - - - CF$UID - 25 - - - CF$UID - 995 - - - - 345571191.17329699 - {104, 1058} - {1155, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 997 - - - CF$UID - 998 - - - CF$UID - 25 - - - CF$UID - 999 - - - - 345403538.85177398 - {943, 1136} - {9769, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1001 - - - CF$UID - 1002 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 348682214.50559098 - {1692, 820} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1004 - - - CF$UID - 1005 - - - CF$UID - 25 - - - CF$UID - 1006 - - - - 340459449.14873803 - {0, 953} - {898, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1008 - - - CF$UID - 1009 - - - CF$UID - 25 - - - CF$UID - 1010 - - - - 345404849.21465802 - {1684, 1007} - {2065, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1012 - - - CF$UID - 1013 - - - CF$UID - 25 - - - CF$UID - 1014 - - - - 345994252.86864501 - {1109, 746} - {790, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1016 - - - CF$UID - 1017 - - - CF$UID - 25 - - - CF$UID - 1018 - - - - 340625465.61212498 - {6290, 1393} - {7112, 58} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1020 - - - CF$UID - 1021 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 348348273.15865397 - {0, 2528} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1023 - - - CF$UID - 1024 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 345409605.10440803 - {0, 2496} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1026 - - - CF$UID - 1027 - - - CF$UID - 25 - - - CF$UID - 1028 - - - - 348328967.72804999 - {831, 996} - {1464, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1030 - - - CF$UID - 1031 - - - CF$UID - 25 - - - CF$UID - 1032 - - - - 345487190.58582902 - {592, 1437} - {1769, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1034 - - - CF$UID - 1035 - - - CF$UID - 25 - - - CF$UID - 1036 - - - - 348348232.74814701 - {2312, 1269} - {3305, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1038 - - - CF$UID - 1039 - - - CF$UID - 25 - - - CF$UID - 1040 - - - - 345416712.81625599 - {812, 967} - {1608, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1042 - - - CF$UID - 1043 - - - CF$UID - 25 - - - CF$UID - 1044 - - - - 345404437.01901197 - {960, 1373} - {1257, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1046 - - - CF$UID - 1047 - - - CF$UID - 25 - - - CF$UID - 1048 - - - - 340624392.15628898 - {0, 1080} - {928, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1050 - - - CF$UID - 1051 - - - CF$UID - 25 - - - CF$UID - 1052 - - - - 340473820.49560201 - {1062, 1380} - {19, 768} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1054 - - - CF$UID - 1055 - - - CF$UID - 25 - - - CF$UID - 1056 - - - - 348682101.30419898 - {0, 1156} - {811, 26} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1058 - - - CF$UID - 1059 - - - CF$UID - 25 - - - CF$UID - 1060 - - - - 345763213.21294802 - {1210, 686} - {1261, 115} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1062 - - - CF$UID - 1063 - - - CF$UID - 25 - - - CF$UID - 1064 - - - - 340632134.97458899 - {30, 1204} - {902, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1066 - - - CF$UID - 1067 - - - CF$UID - 25 - - - CF$UID - 1068 - - - - 340501555.21261299 - {97, 1322} - {976, 23} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1070 - - - CF$UID - 1071 - - - CF$UID - 25 - - - CF$UID - 1072 - - - - 340631784.15413302 - {4723, 1844} - {5843, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1074 - - - CF$UID - 1075 - - - CF$UID - 25 - - - CF$UID - 1076 - - - - 340706474.47886401 - {298, 1417} - {624, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1078 - - - CF$UID - 1079 - - - CF$UID - 25 - - - CF$UID - 1080 - - - - 340631841.98603201 - {0, 968} - {841, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1082 - - - CF$UID - 1083 - - - CF$UID - 25 - - - CF$UID - 1084 - - - - 340622423.14766902 - {0, 1050} - {947, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1086 - - - CF$UID - 1087 - - - CF$UID - 25 - - - CF$UID - 1088 - - - - 340631322.39264601 - {52, 1607} - {270, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1090 - - - CF$UID - 1091 - - - CF$UID - 25 - - - CF$UID - 1092 - - - - 340925457.76799399 - {2611, 845} - {3012, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1094 - - - CF$UID - 1095 - - - CF$UID - 25 - - - CF$UID - 1096 - - - - 340410882.75886202 - {933, 1045} - {1918, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1098 - - - CF$UID - 1099 - - - CF$UID - 25 - - - CF$UID - 1100 - - - - 348682102.890167 - {0, 1214} - {964, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1102 - - - CF$UID - 1103 - - - CF$UID - 25 - - - CF$UID - 1104 - - - - 348502930.726179 - {13299, 942} - {13697, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 142 - - - CF$UID - 143 - - - CF$UID - 144 - - - CF$UID - 145 - - - NS.objects - - - CF$UID - 1106 - - - CF$UID - 1107 - - - CF$UID - 25 - - - CF$UID - 1108 - - - - 381083509.44221699 - {18344, 1253} - {19467, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1110 - - - CF$UID - 1111 - - - CF$UID - 25 - - - CF$UID - 1112 - - - - 345488697.68925297 - {0, 1055} - {907, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1114 - - - CF$UID - 1115 - - - CF$UID - 25 - - - CF$UID - 1116 - - - - 345487787.078866 - {403, 1549} - {1655, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1118 - - - CF$UID - 1119 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 348489963.85380399 - {288, 1153} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1121 - - - CF$UID - 1122 - - - CF$UID - 25 - - - CF$UID - 1123 - - - - 340978354.92465001 - {969, 1145} - {1174, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1125 - - - CF$UID - 1126 - - - CF$UID - 25 - - - CF$UID - 1127 - - - - 340709461.72300398 - {0, 1410} - {369, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1129 - - - CF$UID - 1130 - - - CF$UID - 25 - - - CF$UID - 1131 - - - - 340632182.87597102 - {300, 1742} - {1087, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1133 - - - CF$UID - 1134 - - - CF$UID - 25 - - - CF$UID - 1135 - - - - 340625462.37954402 - {2270, 728} - {1004, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1137 - - - CF$UID - 1138 - - - CF$UID - 25 - - - CF$UID - 1139 - - - - 348419924.36261398 - {3536, 958} - {353, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1141 - - - CF$UID - 1142 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 348347980.23595798 - {0, 1071} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1144 - - - CF$UID - 1145 - - - CF$UID - 25 - - - CF$UID - 1146 - - - - 340632849.17894697 - {0, 1631} - {914, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1148 - - - CF$UID - 1149 - - - CF$UID - 25 - - - CF$UID - 1150 - - - - 345404279.50111699 - {1864, 1059} - {2502, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1152 - - - CF$UID - 1153 - - - CF$UID - 25 - - - CF$UID - 1154 - - - - 348491190.94514698 - {3485, 1369} - {4064, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1156 - - - CF$UID - 1157 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 340734505.19957298 - {0, 1949} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1159 - - - CF$UID - 1160 - - - CF$UID - 25 - - - CF$UID - 1161 - - - - 340630944.19481701 - {0, 254} - {227, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1163 - - - CF$UID - 1164 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 340715007.520365 - {3185, 2419} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1166 - - - CF$UID - 1167 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 340634798.489407 - {0, 1840} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1169 - - - CF$UID - 1170 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 340645018.90256602 - {0, 1609} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1172 - - - CF$UID - 1173 - - - CF$UID - 25 - - - CF$UID - 1174 - - - - 345487388.13644803 - {912, 1366} - {1795, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1176 - - - CF$UID - 1177 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 348348274.649975 - {784, 1230} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1179 - - - CF$UID - 1180 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 345416620.55954498 - {175, 713} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1182 - - - CF$UID - 1183 - - - CF$UID - 25 - - - CF$UID - 1184 - - - - 340588857.98394001 - {0, 1072} - {24, 767} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1186 - - - CF$UID - 1187 - - - CF$UID - 25 - - - CF$UID - 1188 - - - - 340631785.03849697 - {28409, 1632} - {29398, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1190 - - - CF$UID - 1191 - - - CF$UID - 25 - - - CF$UID - 1192 - - - - 340632146.36382198 - {0, 1162} - {1153, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1194 - - - CF$UID - 1195 - - - CF$UID - 25 - - - CF$UID - 1196 - - - - 340978419.60591 - {392, 1123} - {5521, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1198 - - - CF$UID - 1199 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 345763164.73803198 - {1306, 858} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1201 - - - CF$UID - 1202 - - - CF$UID - 25 - - - CF$UID - 1203 - - - - 340459404.56984299 - {0, 1634} - {1293, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1205 - - - CF$UID - 1206 - - - CF$UID - 25 - - - CF$UID - 1207 - - - - 340632182.02007103 - {2123, 1102} - {358, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1209 - - - CF$UID - 1210 - - - CF$UID - 25 - - - CF$UID - 1211 - - - - 345407440.14106703 - {980, 563} - {1308, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1213 - - - CF$UID - 1214 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 345570963.43227798 - {0, 307} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1216 - - - CF$UID - 1217 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 348493987.74653798 - {1400, 772} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1219 - - - CF$UID - 1220 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 345762938.27138197 - {1967, 722} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1222 - - - CF$UID - 1223 - - - CF$UID - 25 - - - CF$UID - 1224 - - - - 340715018.37839699 - {732, 1720} - {1614, 68} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1226 - - - CF$UID - 1227 - - - CF$UID - 25 - - - CF$UID - 1228 - - - - 340710896.240381 - {0, 907} - {71, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1230 - - - CF$UID - 1231 - - - CF$UID - 25 - - - CF$UID - 1232 - - - - 340978941.82531101 - {1271, 874} - {1724, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1234 - - - CF$UID - 1235 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 340743258.14034998 - {332, 2129} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1237 - - - CF$UID - 1238 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 345570916.35617101 - {1868, 787} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1240 - - - CF$UID - 1241 - - - CF$UID - 25 - - - CF$UID - 1242 - - - - 340624895.44772601 - {0, 956} - {1590, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1244 - - - CF$UID - 1245 - - - CF$UID - 25 - - - CF$UID - 1246 - - - - 340632090.00535399 - {855, 1347} - {2165, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1248 - - - CF$UID - 1249 - - - CF$UID - 25 - - - CF$UID - 1250 - - - - 345763208.75864798 - {2157, 874} - {2538, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1252 - - - CF$UID - 1253 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 340734675.59256703 - {2612, 2357} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1255 - - - CF$UID - 1256 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 348493972.20554298 - {0, 948} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1258 - - - CF$UID - 1259 - - - CF$UID - 25 - - - CF$UID - 1260 - - - - 348494575.91981101 - {202, 1322} - {1013, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1262 - - - CF$UID - 1263 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 340643026.22692502 - {0, 760} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1265 - - - CF$UID - 1266 - - - CF$UID - 25 - - - CF$UID - 1267 - - - - 345993841.814812 - {4603, 1030} - {5559, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1269 - - - CF$UID - 1270 - - - CF$UID - 25 - - - CF$UID - 1271 - - - - 345403242.32928503 - {47, 1110} - {798, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1273 - - - CF$UID - 1274 - - - CF$UID - 25 - - - CF$UID - 1275 - - - - 345994942.28171802 - {0, 1189} - {176, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1277 - - - CF$UID - 1278 - - - CF$UID - 25 - - - CF$UID - 1279 - - - - 348769524.87817502 - {27280, 1795} - {28593, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1281 - - - CF$UID - 1282 - - - CF$UID - 25 - - - CF$UID - 1283 - - - - 376240707.96911001 - {2531, 1228} - {23808, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1285 - - - CF$UID - 1286 - - - CF$UID - 25 - - - CF$UID - 1287 - - - - 348605533.47624701 - {0, 1341} - {605, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1289 - - - CF$UID - 1290 - - - CF$UID - 25 - - - CF$UID - 1291 - - - - 340567695.969051 - {0, 1207} - {830, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1293 - - - CF$UID - 1294 - - - CF$UID - 25 - - - CF$UID - 1295 - - - - 345489807.49887401 - {0, 1229} - {1146, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1297 - - - CF$UID - 1298 - - - CF$UID - 25 - - - CF$UID - 1299 - - - - 345489863.78087598 - {476, 1185} - {1510, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1301 - - - CF$UID - 1302 - - - CF$UID - 25 - - - CF$UID - 1303 - - - - 345404020.64375901 - {4401, 1141} - {5428, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1305 - - - CF$UID - 1306 - - - CF$UID - 25 - - - CF$UID - 1307 - - - - 345489170.70111698 - {709, 717} - {1130, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 142 - - - CF$UID - 143 - - - CF$UID - 144 - - - CF$UID - 145 - - - NS.objects - - - CF$UID - 1309 - - - CF$UID - 1310 - - - CF$UID - 25 - - - CF$UID - 1311 - - - - 381079266.26616299 - {1088, 2047} - {2268, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1313 - - - CF$UID - 1314 - - - CF$UID - 25 - - - CF$UID - 1315 - - - - 340715684.42909598 - {3334, 813} - {3831, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1317 - - - CF$UID - 1318 - - - CF$UID - 25 - - - CF$UID - 1319 - - - - 348348259.35793602 - {592, 833} - {3224, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1321 - - - CF$UID - 1322 - - - CF$UID - 25 - - - CF$UID - 1323 - - - - 340710918.149167 - {413, 867} - {1123, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1325 - - - CF$UID - 1326 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 340979058.26628602 - {0, 2158} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1328 - - - CF$UID - 1329 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 345763100.69483101 - {1412, 1093} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1331 - - - CF$UID - 1332 - - - CF$UID - 25 - - - CF$UID - 1333 - - - - 345401288.84783798 - {0, 1034} - {948, 79} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 142 - - - CF$UID - 143 - - - CF$UID - 144 - - - CF$UID - 145 - - - NS.objects - - - CF$UID - 1335 - - - CF$UID - 1336 - - - CF$UID - 25 - - - CF$UID - 1337 - - - - 381083143.218243 - {1711, 1286} - {2266, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1339 - - - CF$UID - 1340 - - - CF$UID - 25 - - - CF$UID - 1341 - - - - 345571135.33805102 - {3644, 993} - {4607, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1343 - - - CF$UID - 1344 - - - CF$UID - 25 - - - CF$UID - 1345 - - - - 345763340.54909998 - {1782, 1377} - {1408, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1347 - - - CF$UID - 1348 - - - CF$UID - 25 - - - CF$UID - 1349 - - - - 345403635.98861599 - {9317, 1036} - {9522, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1351 - - - CF$UID - 1352 - - - CF$UID - 25 - - - CF$UID - 1353 - - - - 348682251.432365 - {5303, 1025} - {5439, 6} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 142 - - - CF$UID - 143 - - - CF$UID - 144 - - - CF$UID - 145 - - - NS.objects - - - CF$UID - 1355 - - - CF$UID - 1356 - - - CF$UID - 25 - - - CF$UID - 1357 - - - - 381083685.054461 - {1472, 1140} - {1127, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1359 - - - CF$UID - 1360 - - - CF$UID - 25 - - - CF$UID - 1361 - - - - 345403910.70446801 - {898, 1274} - {1480, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1363 - - - CF$UID - 1364 - - - CF$UID - 25 - - - CF$UID - 1365 - - - - 340408281.394584 - {0, 1070} - {818, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1367 - - - CF$UID - 1368 - - - CF$UID - 25 - - - CF$UID - 1369 - - - - 340567709.72924697 - {111, 1169} - {2498, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1371 - - - CF$UID - 1372 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 345993841.44873297 - {6640, 969} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1374 - - - CF$UID - 1375 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 348492100.48254102 - {984, 1424} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 142 - - - CF$UID - 143 - - - CF$UID - 144 - - - CF$UID - 145 - - - NS.objects - - - CF$UID - 1377 - - - CF$UID - 1378 - - - CF$UID - 25 - - - CF$UID - 1379 - - - - 381079265.50655103 - {0, 1180} - {652, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1381 - - - CF$UID - 1382 - - - CF$UID - 25 - - - CF$UID - 1383 - - - - 345996220.58187401 - {4812, 1832} - {5468, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1385 - - - CF$UID - 1386 - - - CF$UID - 25 - - - CF$UID - 1387 - - - - 348328941.80720401 - {4812, 1747} - {5015, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1389 - - - CF$UID - 1390 - - - CF$UID - 25 - - - CF$UID - 1391 - - - - 345404215.00799 - {2896, 1165} - {3929, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1393 - - - CF$UID - 1394 - - - CF$UID - 25 - - - CF$UID - 1395 - - - - 352300514.86549997 - {1565, 1736} - {2412, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1397 - - - CF$UID - 1398 - - - CF$UID - 25 - - - CF$UID - 1399 - - - - 340724015.08366603 - {2833, 942} - {6706, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1401 - - - CF$UID - 1402 - - - CF$UID - 25 - - - CF$UID - 1403 - - - - 348425521.71969801 - {5676, 932} - {6233, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1405 - - - CF$UID - 1406 - - - CF$UID - 25 - - - CF$UID - 1407 - - - - 345570983.01814902 - {0, 528} - {521, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1409 - - - CF$UID - 1410 - - - CF$UID - 25 - - - CF$UID - 1411 - - - - 340497412.20933402 - {1831, 988} - {2427, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1413 - - - CF$UID - 1414 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 345407318.56900901 - {0, 2329} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1416 - - - CF$UID - 1417 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 345406868.72379202 - {2708, 1368} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1419 - - - CF$UID - 1420 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 348682639.65947402 - {2316, 1465} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1422 - - - CF$UID - 1423 - - - CF$UID - 25 - - - CF$UID - 1424 - - - - 340629051.56177503 - {10183, 1616} - {10616, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1426 - - - CF$UID - 1427 - - - CF$UID - 25 - - - CF$UID - 1428 - - - - 345403358.18671203 - {0, 778} - {177, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1430 - - - CF$UID - 1431 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 340628546.57123297 - {644, 1063} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1433 - - - CF$UID - 1434 - - - CF$UID - 25 - - - CF$UID - 1435 - - - - 345403253.67140001 - {106, 1057} - {1029, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1437 - - - CF$UID - 1438 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 345407415.72300202 - {798, 781} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1440 - - - CF$UID - 1441 - - - CF$UID - 25 - - - CF$UID - 1442 - - - - 345488818.74460101 - {35, 1246} - {1367, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1444 - - - CF$UID - 1445 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 348682657.38014698 - {3283, 1343} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1447 - - - CF$UID - 1448 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 340411515.847987 - {0, 1981} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 948 - - - CF$UID - 787 - - - CF$UID - 924 - - - CF$UID - 1450 - - - CF$UID - 950 - - - NS.objects - - - CF$UID - 1452 - - - CF$UID - 1456 - - - CF$UID - 1458 - - - CF$UID - 1461 - - - CF$UID - 1464 - - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1451 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/TikZiT.xcodeproj/aleks.mode1v3 - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1453 - - - CF$UID - 1454 - - - CF$UID - 25 - - - CF$UID - 1455 - - - - 340366198.37379301 - {1726, 1368} - {1954, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 357 - - - CF$UID - 359 - - - CF$UID - 358 - - - NS.objects - - - CF$UID - 360 - - - CF$UID - 1457 - - - CF$UID - 360 - - - - 340393968.41070002 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 357 - - - CF$UID - 359 - - - CF$UID - 358 - - - NS.objects - - - CF$UID - 360 - - - CF$UID - 1459 - - - CF$UID - 1460 - - - - 340394097.732535 - {4237, 1279} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 357 - - - CF$UID - 358 - - - CF$UID - 359 - - - NS.objects - - - CF$UID - 360 - - - CF$UID - 1462 - - - CF$UID - 1463 - - - - {0, 1026} - 340539479.94429201 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1465 - - - CF$UID - 360 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 348502939.40997303 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1467 - - - NS.objects - - - CF$UID - 1469 - - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1468 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/StylePalette-fPGoyqLn.xib - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 357 - - - CF$UID - 358 - - - CF$UID - 359 - - - NS.objects - - - CF$UID - 360 - - - CF$UID - 1470 - - - CF$UID - 1471 - - - - {89564, 1173} - 340370036.79549003 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 881 - - - NS.objects - - - CF$UID - 1473 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 357 - - - CF$UID - 358 - - - CF$UID - 359 - - - NS.objects - - - CF$UID - 360 - - - CF$UID - 361 - - - CF$UID - 1474 - - - - 348502941.57143199 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1476 - - - CF$UID - 1478 - - - CF$UID - 1480 - - - NS.objects - - - CF$UID - 1482 - - - CF$UID - 1506 - - - CF$UID - 1551 - - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1477 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/git/tikzit/tikzit/TikZiT.xcodeproj/ - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1479 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/TikZiT.xcodeproj - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1481 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/TikZiT.xcodeproj/ - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1483 - - - CF$UID - 1484 - - - CF$UID - 1485 - - - CF$UID - 1486 - - - NS.objects - - - CF$UID - 1487 - - - CF$UID - 1496 - - - CF$UID - 1497 - - - CF$UID - 1505 - - - - Xcode3ProjectEditor.sourceList.splitview - Xcode3ProjectEditorPreviousTargetEditorClass - Xcode3ProjectEditorSelectedDocumentLocations - Xcode3ProjectEditor_Xcode3TargetEditor - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1488 - - - NS.objects - - - CF$UID - 1489 - - - - DVTSplitViewItems - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 1490 - - - CF$UID - 1494 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1491 - - - CF$UID - 1492 - - - NS.objects - - - CF$UID - 221 - - - CF$UID - 1493 - - - - DVTIdentifier - DVTViewMagnitude - 170 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1491 - - - CF$UID - 1492 - - - NS.objects - - - CF$UID - 221 - - - CF$UID - 1495 - - - - 645 - Xcode3TargetEditor - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 1498 - - - - - $class - - CF$UID - 1504 - - documentURL - - CF$UID - 1499 - - selection - - CF$UID - 1501 - - timestamp - - CF$UID - 1500 - - - file://localhost/Users/aleks/git/tikzit/tikzit/TikZiT.xcodeproj/ - 380738961.54778898 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1502 - - - CF$UID - 1503 - - - NS.objects - - - CF$UID - 1496 - - - CF$UID - 254 - - - - Editor - Target - - $classes - - Xcode3ProjectDocumentLocation - DVTDocumentLocation - NSObject - - $classname - Xcode3ProjectDocumentLocation - - - $class - - CF$UID - 39 - - NS.keys - - NS.objects - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1507 - - - CF$UID - 1483 - - - CF$UID - 1484 - - - CF$UID - 1485 - - - CF$UID - 1508 - - - NS.objects - - - CF$UID - 1509 - - - CF$UID - 1510 - - - CF$UID - 1509 - - - CF$UID - 1516 - - - CF$UID - 1550 - - - - Xcode3ProjectEditorPreviousProjectEditorClass - Xcode3ProjectEditor_Xcode3BuildSettingsEditor - Xcode3BuildSettingsEditor - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1488 - - - NS.objects - - - CF$UID - 1511 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 1512 - - - CF$UID - 1514 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1491 - - - CF$UID - 1492 - - - NS.objects - - - CF$UID - 221 - - - CF$UID - 1513 - - - - 170 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1491 - - - CF$UID - 1492 - - - NS.objects - - - CF$UID - 221 - - - CF$UID - 1515 - - - - 645 - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 1517 - - - - - $class - - CF$UID - 1504 - - documentURL - - CF$UID - 1518 - - selection - - CF$UID - 1520 - - timestamp - - CF$UID - 1519 - - - file://localhost/Users/aleks/svn/tikzit/TikZiT.xcodeproj/ - 345993840.88442099 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1521 - - - CF$UID - 1502 - - - CF$UID - 1522 - - - NS.objects - - - CF$UID - 254 - - - CF$UID - 1509 - - - CF$UID - 1523 - - - - Project - Xcode3BuildSettingsEditorLocations - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 1524 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1525 - - - CF$UID - 1526 - - - CF$UID - 1527 - - - CF$UID - 1528 - - - CF$UID - 1529 - - - CF$UID - 1530 - - - NS.objects - - - CF$UID - 1531 - - - CF$UID - 1548 - - - CF$UID - 246 - - - CF$UID - 246 - - - CF$UID - 163 - - - CF$UID - 163 - - - - Collapsed Build Property Categories - Selected Build Properties - Xcode3BuildSettingsEditorDisplayMode - Xcode3BuildPropertyValueDisplayMode - Xcode3BuildSettingsEditorMode - Xcode3BuildPropertyNameDisplayMode - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 1532 - - - CF$UID - 1533 - - - CF$UID - 1534 - - - CF$UID - 1535 - - - CF$UID - 1536 - - - CF$UID - 1537 - - - CF$UID - 1538 - - - CF$UID - 1539 - - - CF$UID - 1540 - - - CF$UID - 1541 - - - CF$UID - 1542 - - - CF$UID - 1543 - - - CF$UID - 1544 - - - CF$UID - 1545 - - - CF$UID - 1546 - - - CF$UID - 1547 - - - - - $class - - CF$UID - 109 - - NS.string - Architectures||ARCHS - - - $class - - CF$UID - 109 - - NS.string - Architectures||SDKROOT - - - $class - - CF$UID - 109 - - NS.string - Architectures||VALID_ARCHS - - - $class - - CF$UID - 109 - - NS.string - Build Locations||SYMROOT - - - $class - - CF$UID - 109 - - NS.string - Build Options||PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR - - - $class - - CF$UID - 109 - - NS.string - Deployment||INSTALL_PATH - - - $class - - CF$UID - 109 - - NS.string - Deployment||MACOSX_DEPLOYMENT_TARGET - - - $class - - CF$UID - 109 - - NS.string - Deployment||STRIP_INSTALLED_PRODUCT - - - $class - - CF$UID - 109 - - NS.string - Packaging||INFOPLIST_FILE - - - $class - - CF$UID - 109 - - NS.string - Packaging||PRODUCT_NAME - - - $class - - CF$UID - 109 - - NS.string - Search Paths||HEADER_SEARCH_PATHS - - - $class - - CF$UID - 109 - - NS.string - Search Paths||USER_HEADER_SEARCH_PATHS - - - $class - - CF$UID - 109 - - NS.string - LLVM GCC 4.2 - Code Generation||GCC_ENABLE_OBJC_GC - - - $class - - CF$UID - 109 - - NS.string - LLVM GCC 4.2 - Language||GCC_C_LANGUAGE_STANDARD - - - $class - - CF$UID - 109 - - NS.string - LLVM GCC 4.2 - Warnings||GCC_WARN_ABOUT_RETURN_TYPE - - - $class - - CF$UID - 109 - - NS.string - LLVM GCC 4.2 - Warnings||GCC_WARN_UNUSED_VARIABLE - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 1549 - - - - - $class - - CF$UID - 109 - - NS.string - LLVM GCC 4.2 - Code Generation||GCC_ENABLE_OBJC_GC - - - $class - - CF$UID - 39 - - NS.keys - - NS.objects - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1507 - - - CF$UID - 1483 - - - CF$UID - 1484 - - - CF$UID - 1485 - - - CF$UID - 1508 - - - NS.objects - - - CF$UID - 1509 - - - CF$UID - 1552 - - - CF$UID - 1509 - - - CF$UID - 1558 - - - CF$UID - 1584 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1488 - - - NS.objects - - - CF$UID - 1553 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 1554 - - - CF$UID - 1556 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1491 - - - CF$UID - 1492 - - - NS.objects - - - CF$UID - 221 - - - CF$UID - 1555 - - - - 170 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1491 - - - CF$UID - 1492 - - - NS.objects - - - CF$UID - 221 - - - CF$UID - 1557 - - - - 645 - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 1559 - - - - - $class - - CF$UID - 1504 - - documentURL - - CF$UID - 1560 - - selection - - CF$UID - 1562 - - timestamp - - CF$UID - 1561 - - - file://localhost/Users/aleks/svn/tikzit/tikzit/TikZiT.xcodeproj/ - 348348307.809012 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1521 - - - CF$UID - 1502 - - - CF$UID - 1522 - - - NS.objects - - - CF$UID - 254 - - - CF$UID - 1509 - - - CF$UID - 1563 - - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 1564 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1530 - - - CF$UID - 1526 - - - CF$UID - 1527 - - - CF$UID - 1528 - - - CF$UID - 1529 - - - CF$UID - 1525 - - - NS.objects - - - CF$UID - 163 - - - CF$UID - 1565 - - - CF$UID - 246 - - - CF$UID - 246 - - - CF$UID - 163 - - - CF$UID - 1567 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 1566 - - - - - $class - - CF$UID - 109 - - NS.string - Architectures||VALID_ARCHS - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 1568 - - - CF$UID - 1569 - - - CF$UID - 1570 - - - CF$UID - 1571 - - - CF$UID - 1572 - - - CF$UID - 1573 - - - CF$UID - 1574 - - - CF$UID - 1575 - - - CF$UID - 1576 - - - CF$UID - 1577 - - - CF$UID - 1578 - - - CF$UID - 1579 - - - CF$UID - 1580 - - - CF$UID - 1581 - - - CF$UID - 1582 - - - CF$UID - 1583 - - - - - $class - - CF$UID - 109 - - NS.string - Architectures||ARCHS - - - $class - - CF$UID - 109 - - NS.string - Architectures||SDKROOT - - - $class - - CF$UID - 109 - - NS.string - Architectures||VALID_ARCHS - - - $class - - CF$UID - 109 - - NS.string - Build Locations||SYMROOT - - - $class - - CF$UID - 109 - - NS.string - Build Options||PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR - - - $class - - CF$UID - 109 - - NS.string - Deployment||INSTALL_PATH - - - $class - - CF$UID - 109 - - NS.string - Deployment||MACOSX_DEPLOYMENT_TARGET - - - $class - - CF$UID - 109 - - NS.string - Deployment||STRIP_INSTALLED_PRODUCT - - - $class - - CF$UID - 109 - - NS.string - Packaging||INFOPLIST_FILE - - - $class - - CF$UID - 109 - - NS.string - Packaging||PRODUCT_NAME - - - $class - - CF$UID - 109 - - NS.string - Search Paths||HEADER_SEARCH_PATHS - - - $class - - CF$UID - 109 - - NS.string - Search Paths||USER_HEADER_SEARCH_PATHS - - - $class - - CF$UID - 109 - - NS.string - LLVM GCC 4.2 - Code Generation||GCC_ENABLE_OBJC_GC - - - $class - - CF$UID - 109 - - NS.string - LLVM GCC 4.2 - Language||GCC_C_LANGUAGE_STANDARD - - - $class - - CF$UID - 109 - - NS.string - LLVM GCC 4.2 - Warnings||GCC_WARN_ABOUT_RETURN_TYPE - - - $class - - CF$UID - 109 - - NS.string - LLVM GCC 4.2 - Warnings||GCC_WARN_UNUSED_VARIABLE - - - $class - - CF$UID - 39 - - NS.keys - - NS.objects - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1586 - - - CF$UID - 1588 - - - CF$UID - 1590 - - - CF$UID - 1592 - - - CF$UID - 1594 - - - NS.objects - - - CF$UID - 1596 - - - CF$UID - 1604 - - - CF$UID - 1609 - - - CF$UID - 1614 - - - CF$UID - 1619 - - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1587 - - - x-xcode-log://93BF0A7E-9B8F-4127-9E53-6FD4359563C8 - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1589 - - - x-xcode-log://E16FA7B2-DE55-4431-89C7-43D8A6C6BE2B - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1591 - - - x-xcode-log://541A0579-23A7-4735-AC53-0CA54C1CC926 - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1593 - - - x-xcode-log://4E6ECE08-C292-42A5-9EB8-F1D770002C74 - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1595 - - - x-xcode-log://56055AA1-9319-4181-AD73-7A2BA288B024 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 560 - - - NS.objects - - - CF$UID - 1597 - - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 1598 - - - - - $class - - CF$UID - 1603 - - documentURL - - CF$UID - 1587 - - expandTranscript - - indexPath - - CF$UID - 1599 - - timestamp - - CF$UID - 0 - - - - $class - - CF$UID - 1602 - - NSIndexPathData - - CF$UID - 1600 - - NSIndexPathLength - 2 - - - $class - - CF$UID - 1601 - - NS.data - - AEc= - - - - $classes - - NSMutableData - NSData - NSObject - - $classname - NSMutableData - - - $classes - - NSIndexPath - NSObject - - $classname - NSIndexPath - - - $classes - - IDELogDocumentLocation - DVTDocumentLocation - NSObject - - $classname - IDELogDocumentLocation - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 560 - - - NS.objects - - - CF$UID - 1605 - - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 1606 - - - - - $class - - CF$UID - 1603 - - documentURL - - CF$UID - 1589 - - expandTranscript - - indexPath - - CF$UID - 1607 - - timestamp - - CF$UID - 0 - - - - $class - - CF$UID - 1602 - - NSIndexPathData - - CF$UID - 1608 - - NSIndexPathLength - 2 - - - $class - - CF$UID - 1601 - - NS.data - - AEc= - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 560 - - - NS.objects - - - CF$UID - 1610 - - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 1611 - - - - - $class - - CF$UID - 1603 - - documentURL - - CF$UID - 1591 - - expandTranscript - - indexPath - - CF$UID - 1612 - - timestamp - - CF$UID - 0 - - - - $class - - CF$UID - 1602 - - NSIndexPathData - - CF$UID - 1613 - - NSIndexPathLength - 2 - - - $class - - CF$UID - 1601 - - NS.data - - AEc= - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 560 - - - NS.objects - - - CF$UID - 1615 - - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 1616 - - - - - $class - - CF$UID - 1603 - - documentURL - - CF$UID - 1593 - - expandTranscript - - indexPath - - CF$UID - 1617 - - timestamp - - CF$UID - 0 - - - - $class - - CF$UID - 1602 - - NSIndexPathData - - CF$UID - 1618 - - NSIndexPathLength - 2 - - - $class - - CF$UID - 1601 - - NS.data - - AEc= - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 560 - - - NS.objects - - - CF$UID - 1620 - - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 1621 - - - - - $class - - CF$UID - 1603 - - documentURL - - CF$UID - 1595 - - expandTranscript - - indexPath - - CF$UID - 1622 - - timestamp - - CF$UID - 0 - - - - $class - - CF$UID - 1602 - - NSIndexPathData - - CF$UID - 1623 - - NSIndexPathLength - 2 - - - $class - - CF$UID - 1601 - - NS.data - - AEg= - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1625 - - - CF$UID - 1626 - - - NS.objects - - - CF$UID - 1627 - - - CF$UID - 1628 - - - - IDEDeviceLocation - IDEDeviceArchitecture - dvtdevice-local-computer:localhost - i386 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1630 - - - NS.objects - - - CF$UID - 1631 - - - - IDENameString - TikZiT - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1633 - - - CF$UID - 1634 - - - CF$UID - 1635 - - - NS.objects - - - CF$UID - 1636 - - - CF$UID - 1661 - - - CF$UID - 57 - - - - IDEActivityReportCompletionSummaryStringSegments - IDEActivityReportOptions - IDEActivityReportTitle - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 1637 - - - CF$UID - 1644 - - - CF$UID - 1648 - - - CF$UID - 1652 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1638 - - - CF$UID - 1639 - - - CF$UID - 1640 - - - NS.objects - - - CF$UID - 1641 - - - CF$UID - 1642 - - - CF$UID - 1643 - - - - IDEActivityReportStringSegmentPriority - IDEActivityReportStringSegmentBackSeparator - IDEActivityReportStringSegmentStringValue - 2 - - Build - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1638 - - - CF$UID - 1639 - - - CF$UID - 1640 - - - NS.objects - - - CF$UID - 1645 - - - CF$UID - 1646 - - - CF$UID - 1647 - - - - 4 - : - TikZiT - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1638 - - - CF$UID - 1639 - - - CF$UID - 1640 - - - NS.objects - - - CF$UID - 1649 - - - CF$UID - 1650 - - - CF$UID - 1651 - - - - 1 - │ - - $class - - CF$UID - 1601 - - NS.data - - YnBsaXN0MDDUAQIDBAUGOzxYJHZlcnNpb25YJG9iamVjdHNZJGFy - Y2hpdmVyVCR0b3ASAAGGoK0HCA8QGhscJCUrMTQ3VSRudWxs0wkK - CwwNDlxOU0F0dHJpYnV0ZXNWJGNsYXNzWE5TU3RyaW5ngAOADIAC - WVN1Y2NlZWRlZNMKERITFBdXTlMua2V5c1pOUy5vYmplY3RzgAui - FRaABIAFohgZgAaACVZOU0ZvbnRXTlNDb2xvctQKHR4fICEiI1ZO - U05hbWVWTlNTaXplWE5TZkZsYWdzgAiAByNAJgAAAAAAABENEF8Q - EUx1Y2lkYUdyYW5kZS1Cb2xk0iYnKClaJGNsYXNzbmFtZVgkY2xh - c3Nlc1ZOU0ZvbnSiKCpYTlNPYmplY3TTCiwtLi8wXE5TQ29sb3JT - cGFjZVdOU1doaXRlgAoQA0IwANImJzIzV05TQ29sb3KiMirSJic1 - NlxOU0RpY3Rpb25hcnmiNSrSJic4OV8QEk5TQXR0cmlidXRlZFN0 - cmluZ6I6Kl8QEk5TQXR0cmlidXRlZFN0cmluZ18QD05TS2V5ZWRB - cmNoaXZlctE9PlRyb290gAEACAARABoAIwAtADIANwBFAEsAUgBf - AGYAbwBxAHMAdQB/AIYAjgCZAJsAngCgAKIApQCnAKkAsAC4AMEA - yADPANgA2gDcAOUA6AD8AQEBDAEVARwBHwEoAS8BPAFEAUYBSAFL - AVABWAFbAWABbQFwAXUBigGNAaIBtAG3AbwAAAAAAAACAQAAAAAA - AAA/AAAAAAAAAAAAAAAAAAABvg== - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1638 - - - CF$UID - 1653 - - - CF$UID - 1654 - - - CF$UID - 1640 - - - CF$UID - 1655 - - - CF$UID - 1656 - - - NS.objects - - - CF$UID - 1657 - - - CF$UID - 163 - - - CF$UID - 1658 - - - CF$UID - 1660 - - - CF$UID - 163 - - - CF$UID - 163 - - - - IDEActivityReportStringSegmentType - IDEActivityReportStringSegmentDate - IDEActivityReportStringSegmentDateStyle - IDEActivityReportStringSegmentTimeStyle - 3 - - $class - - CF$UID - 1659 - - NS.time - 381083546.00637001 - - - $classes - - NSDate - NSObject - - $classname - NSDate - - Today at 16:32 - 234 - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 3 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1664 - - - CF$UID - 1666 - - - CF$UID - 1668 - - - CF$UID - 1670 - - - CF$UID - 1672 - - - CF$UID - 1674 - - - CF$UID - 1676 - - - CF$UID - 1678 - - - CF$UID - 1680 - - - CF$UID - 1682 - - - CF$UID - 784 - - - CF$UID - 1684 - - - CF$UID - 1685 - - - CF$UID - 1687 - - - CF$UID - 1689 - - - CF$UID - 1691 - - - CF$UID - 1693 - - - CF$UID - 1695 - - - CF$UID - 907 - - - NS.objects - - - CF$UID - 1697 - - - CF$UID - 1702 - - - CF$UID - 1705 - - - CF$UID - 1708 - - - CF$UID - 1711 - - - CF$UID - 1714 - - - CF$UID - 1717 - - - CF$UID - 1720 - - - CF$UID - 1723 - - - CF$UID - 1726 - - - CF$UID - 1729 - - - CF$UID - 1734 - - - CF$UID - 1737 - - - CF$UID - 1740 - - - CF$UID - 1743 - - - CF$UID - 1746 - - - CF$UID - 1749 - - - CF$UID - 1752 - - - CF$UID - 1755 - - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1665 - - - file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/GraphicsView.m - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1667 - - - file://localhost/Users/aleks/svn/tikzit/src/common/NodeStyle.m - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1669 - - - file://localhost/Users/aleks/svn/tikzit/English.lproj/TikzDocument.xib - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1671 - - - file://localhost/Users/aleks/svn/tikzit/src/common/Node.m - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1673 - - - file://localhost/Users/aleks/svn/tikzit/src/osx/PropertyInspectorController.m - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1675 - - - file://localhost/Users/aleks/git/tikzit/tikzit/src/osx/GraphicsView.m - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1677 - - - file://localhost/Users/aleks/svn/tikzit/English.lproj/StylePalette.xib - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1679 - - - file://localhost/Users/aleks/svn/tikzit/src/osx/StylePaletteController.m - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1681 - - - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/Edge.m - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1683 - - - file://localhost/Users/aleks/git/tikzit/tikzit/src/osx/Grid.m - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1518 - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1686 - - - file://localhost/Users/aleks/svn/tikzit/English.lproj/PropertyInspector.xib - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1688 - - - file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/PreviewController.m - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1690 - - - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/TikzGraphAssembler.m - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1692 - - - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/tikzlexer.lm - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1694 - - - file://localhost/Users/aleks/svn/tikzit/src/osx/NodeLayer.h - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1696 - - - file://localhost/Users/aleks/svn/tikzit/English.lproj/Preview.xib - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1700 - - - CF$UID - 1701 - - - - width - height - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1703 - - - CF$UID - 1704 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1706 - - - CF$UID - 1707 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1709 - - - CF$UID - 1710 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1712 - - - CF$UID - 1713 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1715 - - - CF$UID - 1716 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1718 - - - CF$UID - 1719 - - - - 1133 - 763 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1721 - - - CF$UID - 1722 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1724 - - - CF$UID - 1725 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1727 - - - CF$UID - 1728 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1730 - - - CF$UID - 1731 - - - NS.objects - - - CF$UID - 1732 - - - CF$UID - 1733 - - - - width - height - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1735 - - - CF$UID - 1736 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1738 - - - CF$UID - 1739 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1741 - - - CF$UID - 1742 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1744 - - - CF$UID - 1745 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1747 - - - CF$UID - 1748 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1750 - - - CF$UID - 1751 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1753 - - - CF$UID - 1754 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1730 - - - CF$UID - 1731 - - - NS.objects - - - CF$UID - 1756 - - - CF$UID - 1757 - - - - 600 - 600 - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 1759 - - - CF$UID - 1761 - - - CF$UID - 1763 - - - CF$UID - 1765 - - - CF$UID - 1767 - - - CF$UID - 1769 - - - CF$UID - 1771 - - - CF$UID - 1772 - - - CF$UID - 1773 - - - CF$UID - 1774 - - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1760 - - - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/Graph.m - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1762 - - - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/Edge.m - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1764 - - - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/tikzparser.ym - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1766 - - - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/tikzlexer.lm - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1768 - - - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/TikzGraphAssembler.m - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1770 - - - file://localhost/Users/aleks/git/tikzit/tikzit/TikZiT-Info.plist - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1499 - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1683 - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1675 - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 365 - - - - $top - - State - - CF$UID - 1 - - - $version - 100000 - - diff --git a/tikzit-1/TikZiT.xcodeproj/project.xcworkspace/xcuserdata/aleks.xcuserdatad/WorkspaceSettings.xcsettings b/tikzit-1/TikZiT.xcodeproj/project.xcworkspace/xcuserdata/aleks.xcuserdatad/WorkspaceSettings.xcsettings deleted file mode 100644 index c1034ce..0000000 --- a/tikzit-1/TikZiT.xcodeproj/project.xcworkspace/xcuserdata/aleks.xcuserdatad/WorkspaceSettings.xcsettings +++ /dev/null @@ -1,22 +0,0 @@ - - - - - IDEWorkspaceUserSettings_BuildLocationStyle - 2 - IDEWorkspaceUserSettings_BuildSubfolderNameStyle - 0 - IDEWorkspaceUserSettings_DerivedDataLocationStyle - 0 - IDEWorkspaceUserSettings_HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges - - IDEWorkspaceUserSettings_IssueFilterStyle - 0 - IDEWorkspaceUserSettings_LiveSourceIssuesEnabled - - IDEWorkspaceUserSettings_SnapshotAutomaticallyBeforeSignificantChanges - - IDEWorkspaceUserSettings_SnapshotLocationStyle - 0 - - diff --git a/tikzit-1/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist b/tikzit-1/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist deleted file mode 100644 index 5a56e60..0000000 --- a/tikzit-1/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tikzit-1/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/TikZiT.xcscheme b/tikzit-1/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/TikZiT.xcscheme deleted file mode 100644 index 86e70a8..0000000 --- a/tikzit-1/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/TikZiT.xcscheme +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tikzit-1/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/tests.xcscheme b/tikzit-1/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/tests.xcscheme deleted file mode 100644 index 9e1a430..0000000 --- a/tikzit-1/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/tests.xcscheme +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tikzit-1/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/xcschememanagement.plist b/tikzit-1/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/xcschememanagement.plist deleted file mode 100644 index 3291a35..0000000 --- a/tikzit-1/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/xcschememanagement.plist +++ /dev/null @@ -1,32 +0,0 @@ - - - - - SchemeUserState - - TikZiT.xcscheme - - orderHint - 1 - - tests.xcscheme - - orderHint - 0 - - - SuppressBuildableAutocreation - - 5589AA6411C5429C0064D310 - - primary - - - 8D15AC270486D014006FF6A4 - - primary - - - - - diff --git a/tikzit-1/TikZiT_Prefix.pch b/tikzit-1/TikZiT_Prefix.pch deleted file mode 100644 index 78e4d0f..0000000 --- a/tikzit-1/TikZiT_Prefix.pch +++ /dev/null @@ -1,30 +0,0 @@ -// -// TikZiT_Prefix.pch -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -// -// Prefix header for all source files of the 'TikZiT' target in the 'TikZiT' project -// - -#ifdef __OBJC__ - #import -#endif diff --git a/tikzit-1/autogen.sh b/tikzit-1/autogen.sh deleted file mode 100755 index 132ecd0..0000000 --- a/tikzit-1/autogen.sh +++ /dev/null @@ -1,1578 +0,0 @@ -#!/bin/sh -# a u t o g e n . s h -# -# Copyright (c) 2005-2009 United States Government as represented by -# the U.S. Army Research Laboratory. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following -# disclaimer in the documentation and/or other materials provided -# with the distribution. -# -# 3. The name of the author may not be used to endorse or promote -# products derived from this software without specific prior written -# permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS -# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -### -# -# Script for automatically preparing the sources for compilation by -# performing the myriad of necessary steps. The script attempts to -# detect proper version support, and outputs warnings about particular -# systems that have autotool peculiarities. -# -# Basically, if everything is set up and installed correctly, the -# script will validate that minimum versions of the GNU Build System -# tools are installed, account for several common configuration -# issues, and then simply run autoreconf for you. -# -# If autoreconf fails, which can happen for many valid configurations, -# this script proceeds to run manual preparation steps effectively -# providing a POSIX shell script (mostly complete) reimplementation of -# autoreconf. -# -# The AUTORECONF, AUTOCONF, AUTOMAKE, LIBTOOLIZE, ACLOCAL, AUTOHEADER -# environment variables and corresponding _OPTIONS variables (e.g. -# AUTORECONF_OPTIONS) may be used to override the default automatic -# detection behaviors. Similarly the _VERSION variables will override -# the minimum required version numbers. -# -# Examples: -# -# To obtain help on usage: -# ./autogen.sh --help -# -# To obtain verbose output: -# ./autogen.sh --verbose -# -# To skip autoreconf and prepare manually: -# AUTORECONF=false ./autogen.sh -# -# To verbosely try running with an older (unsupported) autoconf: -# AUTOCONF_VERSION=2.50 ./autogen.sh --verbose -# -# Author: -# Christopher Sean Morrison -# -# Patches: -# Sebastian Pipping -# -###################################################################### - -# set to minimum acceptable version of autoconf -if [ "x$AUTOCONF_VERSION" = "x" ] ; then - AUTOCONF_VERSION=2.60 -fi -# set to minimum acceptable version of automake -if [ "x$AUTOMAKE_VERSION" = "x" ] ; then - AUTOMAKE_VERSION=1.6.0 -fi -# set to minimum acceptable version of libtool -if [ "x$LIBTOOL_VERSION" = "x" ] ; then - LIBTOOL_VERSION=1.4.2 -fi - - -################## -# ident function # -################## -ident ( ) { - # extract copyright from header - __copyright="`grep Copyright $AUTOGEN_SH | head -${HEAD_N}1 | awk '{print $4}'`" - if [ "x$__copyright" = "x" ] ; then - __copyright="`date +%Y`" - fi - - # extract version from CVS Id string - __id="$Id: autogen.sh 33925 2009-03-01 23:27:06Z brlcad $" - __version="`echo $__id | sed 's/.*\([0-9][0-9][0-9][0-9]\)[-\/]\([0-9][0-9]\)[-\/]\([0-9][0-9]\).*/\1\2\3/'`" - if [ "x$__version" = "x" ] ; then - __version="" - fi - - echo "autogen.sh build preparation script by Christopher Sean Morrison" - echo " + config.guess download patch by Sebastian Pipping (2008-12-03)" - echo "revised 3-clause BSD-style license, copyright (c) $__copyright" - echo "script version $__version, ISO/IEC 9945 POSIX shell script" -} - - -################## -# USAGE FUNCTION # -################## -usage ( ) { - echo "Usage: $AUTOGEN_SH [-h|--help] [-v|--verbose] [-q|--quiet] [-d|--download] [--version]" - echo " --help Help on $NAME_OF_AUTOGEN usage" - echo " --verbose Verbose progress output" - echo " --quiet Quiet suppressed progress output" - echo " --download Download the latest config.guess from gnulib" - echo " --version Only perform GNU Build System version checks" - echo - echo "Description: This script will validate that minimum versions of the" - echo "GNU Build System tools are installed and then run autoreconf for you." - echo "Should autoreconf fail, manual preparation steps will be run" - echo "potentially accounting for several common preparation issues. The" - - echo "AUTORECONF, AUTOCONF, AUTOMAKE, LIBTOOLIZE, ACLOCAL, AUTOHEADER," - echo "PROJECT, & CONFIGURE environment variables and corresponding _OPTIONS" - echo "variables (e.g. AUTORECONF_OPTIONS) may be used to override the" - echo "default automatic detection behavior." - echo - - ident - - return 0 -} - - -########################## -# VERSION_ERROR FUNCTION # -########################## -version_error ( ) { - if [ "x$1" = "x" ] ; then - echo "INTERNAL ERROR: version_error was not provided a version" - exit 1 - fi - if [ "x$2" = "x" ] ; then - echo "INTERNAL ERROR: version_error was not provided an application name" - exit 1 - fi - $ECHO - $ECHO "ERROR: To prepare the ${PROJECT} build system from scratch," - $ECHO " at least version $1 of $2 must be installed." - $ECHO - $ECHO "$NAME_OF_AUTOGEN does not need to be run on the same machine that will" - $ECHO "run configure or make. Either the GNU Autotools will need to be installed" - $ECHO "or upgraded on this system, or $NAME_OF_AUTOGEN must be run on the source" - $ECHO "code on another system and then transferred to here. -- Cheers!" - $ECHO -} - -########################## -# VERSION_CHECK FUNCTION # -########################## -version_check ( ) { - if [ "x$1" = "x" ] ; then - echo "INTERNAL ERROR: version_check was not provided a minimum version" - exit 1 - fi - _min="$1" - if [ "x$2" = "x" ] ; then - echo "INTERNAL ERROR: version check was not provided a comparison version" - exit 1 - fi - _cur="$2" - - # needed to handle versions like 1.10 and 1.4-p6 - _min="`echo ${_min}. | sed 's/[^0-9]/./g' | sed 's/\.\././g'`" - _cur="`echo ${_cur}. | sed 's/[^0-9]/./g' | sed 's/\.\././g'`" - - _min_major="`echo $_min | cut -d. -f1`" - _min_minor="`echo $_min | cut -d. -f2`" - _min_patch="`echo $_min | cut -d. -f3`" - - _cur_major="`echo $_cur | cut -d. -f1`" - _cur_minor="`echo $_cur | cut -d. -f2`" - _cur_patch="`echo $_cur | cut -d. -f3`" - - if [ "x$_min_major" = "x" ] ; then - _min_major=0 - fi - if [ "x$_min_minor" = "x" ] ; then - _min_minor=0 - fi - if [ "x$_min_patch" = "x" ] ; then - _min_patch=0 - fi - if [ "x$_cur_minor" = "x" ] ; then - _cur_major=0 - fi - if [ "x$_cur_minor" = "x" ] ; then - _cur_minor=0 - fi - if [ "x$_cur_patch" = "x" ] ; then - _cur_patch=0 - fi - - $VERBOSE_ECHO "Checking if ${_cur_major}.${_cur_minor}.${_cur_patch} is greater than ${_min_major}.${_min_minor}.${_min_patch}" - - if [ $_min_major -lt $_cur_major ] ; then - return 0 - elif [ $_min_major -eq $_cur_major ] ; then - if [ $_min_minor -lt $_cur_minor ] ; then - return 0 - elif [ $_min_minor -eq $_cur_minor ] ; then - if [ $_min_patch -lt $_cur_patch ] ; then - return 0 - elif [ $_min_patch -eq $_cur_patch ] ; then - return 0 - fi - fi - fi - return 1 -} - - -###################################### -# LOCATE_CONFIGURE_TEMPLATE FUNCTION # -###################################### -locate_configure_template ( ) { - _pwd="`pwd`" - if test -f "./configure.ac" ; then - echo "./configure.ac" - elif test -f "./configure.in" ; then - echo "./configure.in" - elif test -f "$_pwd/configure.ac" ; then - echo "$_pwd/configure.ac" - elif test -f "$_pwd/configure.in" ; then - echo "$_pwd/configure.in" - elif test -f "$PATH_TO_AUTOGEN/configure.ac" ; then - echo "$PATH_TO_AUTOGEN/configure.ac" - elif test -f "$PATH_TO_AUTOGEN/configure.in" ; then - echo "$PATH_TO_AUTOGEN/configure.in" - fi -} - - -################## -# argument check # -################## -ARGS="$*" -PATH_TO_AUTOGEN="`dirname $0`" -NAME_OF_AUTOGEN="`basename $0`" -AUTOGEN_SH="$PATH_TO_AUTOGEN/$NAME_OF_AUTOGEN" - -LIBTOOL_M4="${PATH_TO_AUTOGEN}/misc/libtool.m4" - -if [ "x$HELP" = "x" ] ; then - HELP=no -fi -if [ "x$QUIET" = "x" ] ; then - QUIET=no -fi -if [ "x$VERBOSE" = "x" ] ; then - VERBOSE=no -fi -if [ "x$VERSION_ONLY" = "x" ] ; then - VERSION_ONLY=no -fi -if [ "x$DOWNLOAD" = "x" ] ; then - DOWNLOAD=no -fi -if [ "x$AUTORECONF_OPTIONS" = "x" ] ; then - AUTORECONF_OPTIONS="-i -f" -fi -if [ "x$AUTOCONF_OPTIONS" = "x" ] ; then - AUTOCONF_OPTIONS="-f" -fi -if [ "x$AUTOMAKE_OPTIONS" = "x" ] ; then - AUTOMAKE_OPTIONS="-a -c -f" -fi -ALT_AUTOMAKE_OPTIONS="-a -c" -if [ "x$LIBTOOLIZE_OPTIONS" = "x" ] ; then - LIBTOOLIZE_OPTIONS="--automake -c -f" -fi -ALT_LIBTOOLIZE_OPTIONS="--automake --copy --force" -if [ "x$ACLOCAL_OPTIONS" = "x" ] ; then - ACLOCAL_OPTIONS="" -fi -if [ "x$AUTOHEADER_OPTIONS" = "x" ] ; then - AUTOHEADER_OPTIONS="" -fi -if [ "x$CONFIG_GUESS_URL" = "x" ] ; then - CONFIG_GUESS_URL="http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;f=build-aux/config.guess;hb=HEAD" -fi -for arg in $ARGS ; do - case "x$arg" in - x--help) HELP=yes ;; - x-[hH]) HELP=yes ;; - x--quiet) QUIET=yes ;; - x-[qQ]) QUIET=yes ;; - x--verbose) VERBOSE=yes ;; - x-[dD]) DOWNLOAD=yes ;; - x--download) DOWNLOAD=yes ;; - x-[vV]) VERBOSE=yes ;; - x--version) VERSION_ONLY=yes ;; - *) - echo "Unknown option: $arg" - echo - usage - exit 1 - ;; - esac -done - - -##################### -# environment check # -##################### - -# sanity check before recursions potentially begin -if [ ! -f "$AUTOGEN_SH" ] ; then - echo "INTERNAL ERROR: $AUTOGEN_SH does not exist" - if [ ! "x$0" = "x$AUTOGEN_SH" ] ; then - echo "INTERNAL ERROR: dirname/basename inconsistency: $0 != $AUTOGEN_SH" - fi - exit 1 -fi - -# force locale setting to C so things like date output as expected -LC_ALL=C - -# commands that this script expects -for __cmd in echo head tail pwd ; do - echo "test" | $__cmd > /dev/null 2>&1 - if [ $? != 0 ] ; then - echo "INTERNAL ERROR: '${__cmd}' command is required" - exit 2 - fi -done -echo "test" | grep "test" > /dev/null 2>&1 -if test ! x$? = x0 ; then - echo "INTERNAL ERROR: grep command is required" - exit 1 -fi -echo "test" | sed "s/test/test/" > /dev/null 2>&1 -if test ! x$? = x0 ; then - echo "INTERNAL ERROR: sed command is required" - exit 1 -fi - - -# determine the behavior of echo -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -esac - -# determine the behavior of head -case "x`echo 'head' | head -n 1 2>&1`" in - *xhead*) HEAD_N="n " ;; - *) HEAD_N="" ;; -esac - -# determine the behavior of tail -case "x`echo 'tail' | tail -n 1 2>&1`" in - *xtail*) TAIL_N="n " ;; - *) TAIL_N="" ;; -esac - -VERBOSE_ECHO=: -ECHO=: -if [ "x$QUIET" = "xyes" ] ; then - if [ "x$VERBOSE" = "xyes" ] ; then - echo "Verbose output quelled by quiet option. Further output disabled." - fi -else - ECHO=echo - if [ "x$VERBOSE" = "xyes" ] ; then - echo "Verbose output enabled" - VERBOSE_ECHO=echo - fi -fi - - -# allow a recursive run to disable further recursions -if [ "x$RUN_RECURSIVE" = "x" ] ; then - RUN_RECURSIVE=yes -fi - - -################################################ -# check for help arg and bypass version checks # -################################################ -if [ "x`echo $ARGS | sed 's/.*[hH][eE][lL][pP].*/help/'`" = "xhelp" ] ; then - HELP=yes -fi -if [ "x$HELP" = "xyes" ] ; then - usage - $ECHO "---" - $ECHO "Help was requested. No preparation or configuration will be performed." - exit 0 -fi - - -####################### -# set up signal traps # -####################### -untrap_abnormal ( ) { - for sig in 1 2 13 15; do - trap - $sig - done -} - -# do this cleanup whenever we exit. -trap ' - # start from the root - if test -d "$START_PATH" ; then - cd "$START_PATH" - fi - - # restore/delete backup files - if test "x$PFC_INIT" = "x1" ; then - recursive_restore - fi -' 0 - -# trap SIGHUP (1), SIGINT (2), SIGPIPE (13), SIGTERM (15) -for sig in 1 2 13 15; do - trap ' - $ECHO "" - $ECHO "Aborting $NAME_OF_AUTOGEN: caught signal '$sig'" - - # start from the root - if test -d "$START_PATH" ; then - cd "$START_PATH" - fi - - # clean up on abnormal exit - $VERBOSE_ECHO "rm -rf autom4te.cache" - rm -rf autom4te.cache - - if test -f "acinclude.m4.$$.backup" ; then - $VERBOSE_ECHO "cat acinclude.m4.$$.backup > acinclude.m4" - chmod u+w acinclude.m4 - cat acinclude.m4.$$.backup > acinclude.m4 - - $VERBOSE_ECHO "rm -f acinclude.m4.$$.backup" - rm -f acinclude.m4.$$.backup - fi - - { (exit 1); exit 1; } -' $sig -done - - -############################# -# look for a configure file # -############################# -if [ "x$CONFIGURE" = "x" ] ; then - CONFIGURE="`locate_configure_template`" - if [ ! "x$CONFIGURE" = "x" ] ; then - $VERBOSE_ECHO "Found a configure template: $CONFIGURE" - fi -else - $ECHO "Using CONFIGURE environment variable override: $CONFIGURE" -fi -if [ "x$CONFIGURE" = "x" ] ; then - if [ "x$VERSION_ONLY" = "xyes" ] ; then - CONFIGURE=/dev/null - else - $ECHO - $ECHO "A configure.ac or configure.in file could not be located implying" - $ECHO "that the GNU Build System is at least not used in this directory. In" - $ECHO "any case, there is nothing to do here without one of those files." - $ECHO - $ECHO "ERROR: No configure.in or configure.ac file found in `pwd`" - exit 1 - fi -fi - -#################### -# get project name # -#################### -if [ "x$PROJECT" = "x" ] ; then - PROJECT="`grep AC_INIT $CONFIGURE | grep -v '.*#.*AC_INIT' | tail -${TAIL_N}1 | sed 's/^[ ]*AC_INIT(\([^,)]*\).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`" - if [ "x$PROJECT" = "xAC_INIT" ] ; then - # projects might be using the older/deprecated arg-less AC_INIT .. look for AM_INIT_AUTOMAKE instead - PROJECT="`grep AM_INIT_AUTOMAKE $CONFIGURE | grep -v '.*#.*AM_INIT_AUTOMAKE' | tail -${TAIL_N}1 | sed 's/^[ ]*AM_INIT_AUTOMAKE(\([^,)]*\).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`" - fi - if [ "x$PROJECT" = "xAM_INIT_AUTOMAKE" ] ; then - PROJECT="project" - fi - if [ "x$PROJECT" = "x" ] ; then - PROJECT="project" - fi -else - $ECHO "Using PROJECT environment variable override: $PROJECT" -fi -$ECHO "Preparing the $PROJECT build system...please wait" -$ECHO - - -######################## -# check for autoreconf # -######################## -HAVE_AUTORECONF=no -if [ "x$AUTORECONF" = "x" ] ; then - for AUTORECONF in autoreconf ; do - $VERBOSE_ECHO "Checking autoreconf version: $AUTORECONF --version" - $AUTORECONF --version > /dev/null 2>&1 - if [ $? = 0 ] ; then - HAVE_AUTORECONF=yes - break - fi - done -else - HAVE_AUTORECONF=yes - $ECHO "Using AUTORECONF environment variable override: $AUTORECONF" -fi - - -########################## -# autoconf version check # -########################## -_acfound=no -if [ "x$AUTOCONF" = "x" ] ; then - for AUTOCONF in autoconf ; do - $VERBOSE_ECHO "Checking autoconf version: $AUTOCONF --version" - $AUTOCONF --version > /dev/null 2>&1 - if [ $? = 0 ] ; then - _acfound=yes - break - fi - done -else - _acfound=yes - $ECHO "Using AUTOCONF environment variable override: $AUTOCONF" -fi - -_report_error=no -if [ ! "x$_acfound" = "xyes" ] ; then - $ECHO "ERROR: Unable to locate GNU Autoconf." - _report_error=yes -else - _version="`$AUTOCONF --version | head -${HEAD_N}1 | sed 's/[^0-9]*\([0-9\.][0-9\.]*\)/\1/'`" - if [ "x$_version" = "x" ] ; then - _version="0.0.0" - fi - $ECHO "Found GNU Autoconf version $_version" - version_check "$AUTOCONF_VERSION" "$_version" - if [ $? -ne 0 ] ; then - _report_error=yes - fi -fi -if [ "x$_report_error" = "xyes" ] ; then - version_error "$AUTOCONF_VERSION" "GNU Autoconf" - exit 1 -fi - - -########################## -# automake version check # -########################## -_amfound=no -if [ "x$AUTOMAKE" = "x" ] ; then - for AUTOMAKE in automake ; do - $VERBOSE_ECHO "Checking automake version: $AUTOMAKE --version" - $AUTOMAKE --version > /dev/null 2>&1 - if [ $? = 0 ] ; then - _amfound=yes - break - fi - done -else - _amfound=yes - $ECHO "Using AUTOMAKE environment variable override: $AUTOMAKE" -fi - - -_report_error=no -if [ ! "x$_amfound" = "xyes" ] ; then - $ECHO - $ECHO "ERROR: Unable to locate GNU Automake." - _report_error=yes -else - _version="`$AUTOMAKE --version | head -${HEAD_N}1 | sed 's/[^0-9]*\([0-9\.][0-9\.]*\)/\1/'`" - if [ "x$_version" = "x" ] ; then - _version="0.0.0" - fi - $ECHO "Found GNU Automake version $_version" - version_check "$AUTOMAKE_VERSION" "$_version" - if [ $? -ne 0 ] ; then - _report_error=yes - fi -fi -if [ "x$_report_error" = "xyes" ] ; then - version_error "$AUTOMAKE_VERSION" "GNU Automake" - exit 1 -fi - - -######################## -# check for libtoolize # -######################## -HAVE_LIBTOOLIZE=yes -HAVE_ALT_LIBTOOLIZE=no -_ltfound=no -if [ "x$LIBTOOLIZE" = "x" ] ; then - LIBTOOLIZE=libtoolize - $VERBOSE_ECHO "Checking libtoolize version: $LIBTOOLIZE --version" - $LIBTOOLIZE --version > /dev/null 2>&1 - if [ ! $? = 0 ] ; then - HAVE_LIBTOOLIZE=no - $ECHO - if [ "x$HAVE_AUTORECONF" = "xno" ] ; then - $ECHO "Warning: libtoolize does not appear to be available." - else - $ECHO "Warning: libtoolize does not appear to be available. This means that" - $ECHO "the automatic build preparation via autoreconf will probably not work." - $ECHO "Preparing the build by running each step individually, however, should" - $ECHO "work and will be done automatically for you if autoreconf fails." - fi - - # look for some alternates - for tool in glibtoolize libtoolize15 libtoolize14 libtoolize13 ; do - $VERBOSE_ECHO "Checking libtoolize alternate: $tool --version" - _glibtoolize="`$tool --version > /dev/null 2>&1`" - if [ $? = 0 ] ; then - $VERBOSE_ECHO "Found $tool --version" - _glti="`which $tool`" - if [ "x$_glti" = "x" ] ; then - $VERBOSE_ECHO "Cannot find $tool with which" - continue; - fi - if test ! -f "$_glti" ; then - $VERBOSE_ECHO "Cannot use $tool, $_glti is not a file" - continue; - fi - _gltidir="`dirname $_glti`" - if [ "x$_gltidir" = "x" ] ; then - $VERBOSE_ECHO "Cannot find $tool path with dirname of $_glti" - continue; - fi - if test ! -d "$_gltidir" ; then - $VERBOSE_ECHO "Cannot use $tool, $_gltidir is not a directory" - continue; - fi - HAVE_ALT_LIBTOOLIZE=yes - LIBTOOLIZE="$tool" - $ECHO - $ECHO "Fortunately, $tool was found which means that your system may simply" - $ECHO "have a non-standard or incomplete GNU Autotools install. If you have" - $ECHO "sufficient system access, it may be possible to quell this warning by" - $ECHO "running:" - $ECHO - sudo -V > /dev/null 2>&1 - if [ $? = 0 ] ; then - $ECHO " sudo ln -s $_glti $_gltidir/libtoolize" - $ECHO - else - $ECHO " ln -s $_glti $_gltidir/libtoolize" - $ECHO - $ECHO "Run that as root or with proper permissions to the $_gltidir directory" - $ECHO - fi - _ltfound=yes - break - fi - done - else - _ltfound=yes - fi -else - _ltfound=yes - $ECHO "Using LIBTOOLIZE environment variable override: $LIBTOOLIZE" -fi - - -############################ -# libtoolize version check # -############################ -_report_error=no -if [ ! "x$_ltfound" = "xyes" ] ; then - $ECHO - $ECHO "ERROR: Unable to locate GNU Libtool." - _report_error=yes -else - _version="`$LIBTOOLIZE --version | head -${HEAD_N}1 | sed 's/[^0-9]*\([0-9\.][0-9\.]*\)/\1/'`" - if [ "x$_version" = "x" ] ; then - _version="0.0.0" - fi - $ECHO "Found GNU Libtool version $_version" - version_check "$LIBTOOL_VERSION" "$_version" - if [ $? -ne 0 ] ; then - _report_error=yes - fi -fi -if [ "x$_report_error" = "xyes" ] ; then - version_error "$LIBTOOL_VERSION" "GNU Libtool" - exit 1 -fi - - -##################### -# check for aclocal # -##################### -if [ "x$ACLOCAL" = "x" ] ; then - for ACLOCAL in aclocal ; do - $VERBOSE_ECHO "Checking aclocal version: $ACLOCAL --version" - $ACLOCAL --version > /dev/null 2>&1 - if [ $? = 0 ] ; then - break - fi - done -else - $ECHO "Using ACLOCAL environment variable override: $ACLOCAL" -fi - - -######################## -# check for autoheader # -######################## -if [ "x$AUTOHEADER" = "x" ] ; then - for AUTOHEADER in autoheader ; do - $VERBOSE_ECHO "Checking autoheader version: $AUTOHEADER --version" - $AUTOHEADER --version > /dev/null 2>&1 - if [ $? = 0 ] ; then - break - fi - done -else - $ECHO "Using AUTOHEADER environment variable override: $AUTOHEADER" -fi - - -######################### -# check if version only # -######################### -$VERBOSE_ECHO "Checking whether to only output version information" -if [ "x$VERSION_ONLY" = "xyes" ] ; then - $ECHO - ident - $ECHO "---" - $ECHO "Version requested. No preparation or configuration will be performed." - exit 0 -fi - - -################################# -# PROTECT_FROM_CLOBBER FUNCTION # -################################# -protect_from_clobber ( ) { - PFC_INIT=1 - - # protect COPYING & INSTALL from overwrite by automake. the - # automake force option will (inappropriately) ignore the existing - # contents of a COPYING and/or INSTALL files (depending on the - # version) instead of just forcing *missing* files like it does - # for AUTHORS, NEWS, and README. this is broken but extremely - # prevalent behavior, so we protect against it by keeping a backup - # of the file that can later be restored. - - for file in COPYING INSTALL ; do - if test -f ${file} ; then - if test -f ${file}.$$.protect_from_automake.backup ; then - $VERBOSE_ECHO "Already backed up ${file} in `pwd`" - else - $VERBOSE_ECHO "Backing up ${file} in `pwd`" - $VERBOSE_ECHO "cp -p ${file} ${file}.$$.protect_from_automake.backup" - cp -p ${file} ${file}.$$.protect_from_automake.backup - fi - fi - done -} - - -############################## -# RECURSIVE_PROTECT FUNCTION # -############################## -recursive_protect ( ) { - - # for projects using recursive configure, run the build - # preparation steps for the subdirectories. this function assumes - # START_PATH was set to pwd before recursion begins so that - # relative paths work. - - # git 'r done, protect COPYING and INSTALL from being clobbered - protect_from_clobber - - if test -d autom4te.cache ; then - $VERBOSE_ECHO "Found an autom4te.cache directory, deleting it" - $VERBOSE_ECHO "rm -rf autom4te.cache" - rm -rf autom4te.cache - fi - - # find configure template - _configure="`locate_configure_template`" - if [ "x$_configure" = "x" ] ; then - return - fi - # $VERBOSE_ECHO "Looking for configure template found `pwd`/$_configure" - - # look for subdirs - # $VERBOSE_ECHO "Looking for subdirs in `pwd`" - _det_config_subdirs="`grep AC_CONFIG_SUBDIRS $_configure | grep -v '.*#.*AC_CONFIG_SUBDIRS' | sed 's/^[ ]*AC_CONFIG_SUBDIRS(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`" - CHECK_DIRS="" - for dir in $_det_config_subdirs ; do - if test -d "`pwd`/$dir" ; then - CHECK_DIRS="$CHECK_DIRS \"`pwd`/$dir\"" - fi - done - - # process subdirs - if [ ! "x$CHECK_DIRS" = "x" ] ; then - $VERBOSE_ECHO "Recursively scanning the following directories:" - $VERBOSE_ECHO " $CHECK_DIRS" - for dir in $CHECK_DIRS ; do - $VERBOSE_ECHO "Protecting files from automake in $dir" - cd "$START_PATH" - eval "cd $dir" - - # recursively git 'r done - recursive_protect - done - fi -} # end of recursive_protect - - -############################# -# RESTORE_CLOBBERED FUNCION # -############################# -restore_clobbered ( ) { - - # The automake (and autoreconf by extension) -f/--force-missing - # option may overwrite COPYING and INSTALL even if they do exist. - # Here we restore the files if necessary. - - spacer=no - - for file in COPYING INSTALL ; do - if test -f ${file}.$$.protect_from_automake.backup ; then - if test -f ${file} ; then - # compare entire content, restore if needed - if test "x`cat ${file}`" != "x`cat ${file}.$$.protect_from_automake.backup`" ; then - if test "x$spacer" = "xno" ; then - $VERBOSE_ECHO - spacer=yes - fi - # restore the backup - $VERBOSE_ECHO "Restoring ${file} from backup (automake -f likely clobbered it)" - $VERBOSE_ECHO "rm -f ${file}" - rm -f ${file} - $VERBOSE_ECHO "mv ${file}.$$.protect_from_automake.backup ${file}" - mv ${file}.$$.protect_from_automake.backup ${file} - fi # check contents - elif test -f ${file}.$$.protect_from_automake.backup ; then - $VERBOSE_ECHO "mv ${file}.$$.protect_from_automake.backup ${file}" - mv ${file}.$$.protect_from_automake.backup ${file} - fi # -f ${file} - - # just in case - $VERBOSE_ECHO "rm -f ${file}.$$.protect_from_automake.backup" - rm -f ${file}.$$.protect_from_automake.backup - fi # -f ${file}.$$.protect_from_automake.backup - done - - CONFIGURE="`locate_configure_template`" - if [ "x$CONFIGURE" = "x" ] ; then - return - fi - - _aux_dir="`grep AC_CONFIG_AUX_DIR $CONFIGURE | grep -v '.*#.*AC_CONFIG_AUX_DIR' | tail -${TAIL_N}1 | sed 's/^[ ]*AC_CONFIG_AUX_DIR(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`" - if test ! -d "$_aux_dir" ; then - _aux_dir=. - fi - - for file in config.guess config.sub ltmain.sh ; do - if test -f "${_aux_dir}/${file}" ; then - $VERBOSE_ECHO "rm -f \"${_aux_dir}/${file}.backup\"" - rm -f "${_aux_dir}/${file}.backup" - fi - done -} # end of restore_clobbered - - -############################## -# RECURSIVE_RESTORE FUNCTION # -############################## -recursive_restore ( ) { - - # restore COPYING and INSTALL from backup if they were clobbered - # for each directory recursively. - - # git 'r undone - restore_clobbered - - # find configure template - _configure="`locate_configure_template`" - if [ "x$_configure" = "x" ] ; then - return - fi - - # look for subdirs - _det_config_subdirs="`grep AC_CONFIG_SUBDIRS $_configure | grep -v '.*#.*AC_CONFIG_SUBDIRS' | sed 's/^[ ]*AC_CONFIG_SUBDIRS(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`" - CHECK_DIRS="" - for dir in $_det_config_subdirs ; do - if test -d "`pwd`/$dir" ; then - CHECK_DIRS="$CHECK_DIRS \"`pwd`/$dir\"" - fi - done - - # process subdirs - if [ ! "x$CHECK_DIRS" = "x" ] ; then - $VERBOSE_ECHO "Recursively scanning the following directories:" - $VERBOSE_ECHO " $CHECK_DIRS" - for dir in $CHECK_DIRS ; do - $VERBOSE_ECHO "Checking files for automake damage in $dir" - cd "$START_PATH" - eval "cd $dir" - - # recursively git 'r undone - recursive_restore - done - fi -} # end of recursive_restore - - -####################### -# INITIALIZE FUNCTION # -####################### -initialize ( ) { - - # this routine performs a variety of directory-specific - # initializations. some are sanity checks, some are preventive, - # and some are necessary setup detection. - # - # this function sets: - # CONFIGURE - # SEARCH_DIRS - # CONFIG_SUBDIRS - - ################################## - # check for a configure template # - ################################## - CONFIGURE="`locate_configure_template`" - if [ "x$CONFIGURE" = "x" ] ; then - $ECHO - $ECHO "A configure.ac or configure.in file could not be located implying" - $ECHO "that the GNU Build System is at least not used in this directory. In" - $ECHO "any case, there is nothing to do here without one of those files." - $ECHO - $ECHO "ERROR: No configure.in or configure.ac file found in `pwd`" - exit 1 - fi - - ##################### - # detect an aux dir # - ##################### - _aux_dir="`grep AC_CONFIG_AUX_DIR $CONFIGURE | grep -v '.*#.*AC_CONFIG_AUX_DIR' | tail -${TAIL_N}1 | sed 's/^[ ]*AC_CONFIG_AUX_DIR(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`" - if test ! -d "$_aux_dir" ; then - _aux_dir=. - else - $VERBOSE_ECHO "Detected auxillary directory: $_aux_dir" - fi - - ################################ - # detect a recursive configure # - ################################ - CONFIG_SUBDIRS="" - _det_config_subdirs="`grep AC_CONFIG_SUBDIRS $CONFIGURE | grep -v '.*#.*AC_CONFIG_SUBDIRS' | sed 's/^[ ]*AC_CONFIG_SUBDIRS(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`" - for dir in $_det_config_subdirs ; do - if test -d "`pwd`/$dir" ; then - $VERBOSE_ECHO "Detected recursive configure directory: `pwd`/$dir" - CONFIG_SUBDIRS="$CONFIG_SUBDIRS `pwd`/$dir" - fi - done - - ########################################################### - # make sure certain required files exist for GNU projects # - ########################################################### - _marker_found="" - _marker_found_message_intro='Detected non-GNU marker "' - _marker_found_message_mid='" in ' - for marker in foreign cygnus ; do - _marker_found_message=${_marker_found_message_intro}${marker}${_marker_found_message_mid} - _marker_found="`grep 'AM_INIT_AUTOMAKE.*'${marker} $CONFIGURE`" - if [ ! "x$_marker_found" = "x" ] ; then - $VERBOSE_ECHO "${_marker_found_message}`basename \"$CONFIGURE\"`" - break - fi - if test -f "`dirname \"$CONFIGURE\"/Makefile.am`" ; then - _marker_found="`grep 'AUTOMAKE_OPTIONS.*'${marker} Makefile.am`" - if [ ! "x$_marker_found" = "x" ] ; then - $VERBOSE_ECHO "${_marker_found_message}Makefile.am" - break - fi - fi - done - if [ "x${_marker_found}" = "x" ] ; then - _suggest_foreign=no - for file in AUTHORS COPYING ChangeLog INSTALL NEWS README ; do - if [ ! -f $file ] ; then - $VERBOSE_ECHO "Touching ${file} since it does not exist" - _suggest_foreign=yes - touch $file - fi - done - - if [ "x${_suggest_foreign}" = "xyes" ] ; then - $ECHO - $ECHO "Warning: Several files expected of projects that conform to the GNU" - $ECHO "coding standards were not found. The files were automatically added" - $ECHO "for you since you do not have a 'foreign' declaration specified." - $ECHO - $ECHO "Considered adding 'foreign' to AM_INIT_AUTOMAKE in `basename \"$CONFIGURE\"`" - if test -f "`dirname \"$CONFIGURE\"/Makefile.am`" ; then - $ECHO "or to AUTOMAKE_OPTIONS in your top-level Makefile.am file." - fi - $ECHO - fi - fi - - ################################################## - # make sure certain generated files do not exist # - ################################################## - for file in config.guess config.sub ltmain.sh ; do - if test -f "${_aux_dir}/${file}" ; then - $VERBOSE_ECHO "mv -f \"${_aux_dir}/${file}\" \"${_aux_dir}/${file}.backup\"" - mv -f "${_aux_dir}/${file}" "${_aux_dir}/${file}.backup" - fi - done - - ############################ - # search alternate m4 dirs # - ############################ - SEARCH_DIRS="" - for dir in m4 ; do - if [ -d $dir ] ; then - $VERBOSE_ECHO "Found extra aclocal search directory: $dir" - SEARCH_DIRS="$SEARCH_DIRS -I $dir" - fi - done - - ###################################### - # remove any previous build products # - ###################################### - if test -d autom4te.cache ; then - $VERBOSE_ECHO "Found an autom4te.cache directory, deleting it" - $VERBOSE_ECHO "rm -rf autom4te.cache" - rm -rf autom4te.cache - fi -# tcl/tk (and probably others) have a customized aclocal.m4, so can't delete it -# if test -f aclocal.m4 ; then -# $VERBOSE_ECHO "Found an aclocal.m4 file, deleting it" -# $VERBOSE_ECHO "rm -f aclocal.m4" -# rm -f aclocal.m4 -# fi - -} # end of initialize() - - -############## -# initialize # -############## - -# stash path -START_PATH="`pwd`" - -# Before running autoreconf or manual steps, some prep detection work -# is necessary or useful. Only needs to occur once per directory, but -# does need to traverse the entire subconfigure hierarchy to protect -# files from being clobbered even by autoreconf. -recursive_protect - -# start from where we started -cd "$START_PATH" - -# get ready to process -initialize - - -######################################### -# DOWNLOAD_GNULIB_CONFIG_GUESS FUNCTION # -######################################### - -# TODO - should make sure wget/curl exist and/or work before trying to -# use them. - -download_gnulib_config_guess () { - # abuse gitweb to download gnulib's latest config.guess via HTTP - config_guess_temp="config.guess.$$.download" - ret=1 - for __cmd in wget curl fetch ; do - $VERBOSE_ECHO "Checking for command ${__cmd}" - ${__cmd} --version > /dev/null 2>&1 - ret=$? - if [ ! $ret = 0 ] ; then - continue - fi - - __cmd_version=`${__cmd} --version | head -n 1 | sed -e 's/^[^0-9]\+//' -e 's/ .*//'` - $VERBOSE_ECHO "Found ${__cmd} ${__cmd_version}" - - opts="" - case ${__cmd} in - wget) - opts="-O" - ;; - curl) - opts="-o" - ;; - fetch) - opts="-t 5 -f" - ;; - esac - - $VERBOSE_ECHO "Running $__cmd \"${CONFIG_GUESS_URL}\" $opts \"${config_guess_temp}\"" - eval "$__cmd \"${CONFIG_GUESS_URL}\" $opts \"${config_guess_temp}\"" > /dev/null 2>&1 - if [ $? = 0 ] ; then - mv -f "${config_guess_temp}" ${_aux_dir}/config.guess - ret=0 - break - fi - done - - if [ ! $ret = 0 ] ; then - $ECHO "Warning: config.guess download failed from: $CONFIG_GUESS_URL" - rm -f "${config_guess_temp}" - fi -} - - -############################## -# LIBTOOLIZE_NEEDED FUNCTION # -############################## -libtoolize_needed () { - ret=1 # means no, don't need libtoolize - for feature in AC_PROG_LIBTOOL AM_PROG_LIBTOOL LT_INIT ; do - $VERBOSE_ECHO "Searching for $feature in $CONFIGURE" - found="`grep \"^$feature.*\" $CONFIGURE`" - if [ ! "x$found" = "x" ] ; then - ret=0 # means yes, need to run libtoolize - break - fi - done - return ${ret} -} - - - -############################################ -# prepare build via autoreconf or manually # -############################################ -reconfigure_manually=no -if [ "x$HAVE_AUTORECONF" = "xyes" ] ; then - $ECHO - $ECHO $ECHO_N "Automatically preparing build ... $ECHO_C" - - $VERBOSE_ECHO "$AUTORECONF $SEARCH_DIRS $AUTORECONF_OPTIONS" - autoreconf_output="`$AUTORECONF $SEARCH_DIRS $AUTORECONF_OPTIONS 2>&1`" - ret=$? - $VERBOSE_ECHO "$autoreconf_output" - - if [ ! $ret = 0 ] ; then - if [ "x$HAVE_ALT_LIBTOOLIZE" = "xyes" ] ; then - if [ ! "x`echo \"$autoreconf_output\" | grep libtoolize | grep \"No such file or directory\"`" = "x" ] ; then - $ECHO - $ECHO "Warning: autoreconf failed but due to what is usually a common libtool" - $ECHO "misconfiguration issue. This problem is encountered on systems that" - $ECHO "have installed libtoolize under a different name without providing a" - $ECHO "symbolic link or without setting the LIBTOOLIZE environment variable." - $ECHO - $ECHO "Restarting the preparation steps with LIBTOOLIZE set to $LIBTOOLIZE" - - export LIBTOOLIZE - RUN_RECURSIVE=no - export RUN_RECURSIVE - untrap_abnormal - - $VERBOSE_ECHO sh $AUTOGEN_SH "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9" - sh "$AUTOGEN_SH" "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9" - exit $? - fi - fi - - $ECHO "Warning: $AUTORECONF failed" - - if test -f ltmain.sh ; then - $ECHO "libtoolize being run by autoreconf is not creating ltmain.sh in the auxillary directory like it should" - fi - - $ECHO "Attempting to run the preparation steps individually" - reconfigure_manually=yes - else - if [ "x$DOWNLOAD" = "xyes" ] ; then - if libtoolize_needed ; then - download_gnulib_config_guess - fi - fi - fi -else - reconfigure_manually=yes -fi - - -############################ -# LIBTOOL_FAILURE FUNCTION # -############################ -libtool_failure ( ) { - - # libtool is rather error-prone in comparison to the other - # autotools and this routine attempts to compensate for some - # common failures. the output after a libtoolize failure is - # parsed for an error related to AC_PROG_LIBTOOL and if found, we - # attempt to inject a project-provided libtool.m4 file. - - _autoconf_output="$1" - - if [ "x$RUN_RECURSIVE" = "xno" ] ; then - # we already tried the libtool.m4, don't try again - return 1 - fi - - if test -f "$LIBTOOL_M4" ; then - found_libtool="`$ECHO $_autoconf_output | grep AC_PROG_LIBTOOL`" - if test ! "x$found_libtool" = "x" ; then - if test -f acinclude.m4 ; then - rm -f acinclude.m4.$$.backup - $VERBOSE_ECHO "cat acinclude.m4 > acinclude.m4.$$.backup" - cat acinclude.m4 > acinclude.m4.$$.backup - fi - $VERBOSE_ECHO "cat \"$LIBTOOL_M4\" >> acinclude.m4" - chmod u+w acinclude.m4 - cat "$LIBTOOL_M4" >> acinclude.m4 - - # don't keep doing this - RUN_RECURSIVE=no - export RUN_RECURSIVE - untrap_abnormal - - $ECHO - $ECHO "Restarting the preparation steps with libtool macros in acinclude.m4" - $VERBOSE_ECHO sh $AUTOGEN_SH "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9" - sh "$AUTOGEN_SH" "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9" - exit $? - fi - fi -} - - -########################### -# MANUAL_AUTOGEN FUNCTION # -########################### -manual_autogen ( ) { - - ################################################## - # Manual preparation steps taken are as follows: # - # aclocal [-I m4] # - # libtoolize --automake -c -f # - # aclocal [-I m4] # - # autoconf -f # - # autoheader # - # automake -a -c -f # - ################################################## - - ########### - # aclocal # - ########### - $VERBOSE_ECHO "$ACLOCAL $SEARCH_DIRS $ACLOCAL_OPTIONS" - aclocal_output="`$ACLOCAL $SEARCH_DIRS $ACLOCAL_OPTIONS 2>&1`" - ret=$? - $VERBOSE_ECHO "$aclocal_output" - if [ ! $ret = 0 ] ; then $ECHO "ERROR: $ACLOCAL failed" && exit 2 ; fi - - ############## - # libtoolize # - ############## - if libtoolize_needed ; then - if [ "x$HAVE_LIBTOOLIZE" = "xyes" ] ; then - $VERBOSE_ECHO "$LIBTOOLIZE $LIBTOOLIZE_OPTIONS" - libtoolize_output="`$LIBTOOLIZE $LIBTOOLIZE_OPTIONS 2>&1`" - ret=$? - $VERBOSE_ECHO "$libtoolize_output" - - if [ ! $ret = 0 ] ; then $ECHO "ERROR: $LIBTOOLIZE failed" && exit 2 ; fi - else - if [ "x$HAVE_ALT_LIBTOOLIZE" = "xyes" ] ; then - $VERBOSE_ECHO "$LIBTOOLIZE $ALT_LIBTOOLIZE_OPTIONS" - libtoolize_output="`$LIBTOOLIZE $ALT_LIBTOOLIZE_OPTIONS 2>&1`" - ret=$? - $VERBOSE_ECHO "$libtoolize_output" - - if [ ! $ret = 0 ] ; then $ECHO "ERROR: $LIBTOOLIZE failed" && exit 2 ; fi - fi - fi - - ########### - # aclocal # - ########### - # re-run again as instructed by libtoolize - $VERBOSE_ECHO "$ACLOCAL $SEARCH_DIRS $ACLOCAL_OPTIONS" - aclocal_output="`$ACLOCAL $SEARCH_DIRS $ACLOCAL_OPTIONS 2>&1`" - ret=$? - $VERBOSE_ECHO "$aclocal_output" - - # libtoolize might put ltmain.sh in the wrong place - if test -f ltmain.sh ; then - if test ! -f "${_aux_dir}/ltmain.sh" ; then - $ECHO - $ECHO "Warning: $LIBTOOLIZE is creating ltmain.sh in the wrong directory" - $ECHO - $ECHO "Fortunately, the problem can be worked around by simply copying the" - $ECHO "file to the appropriate location (${_aux_dir}/). This has been done for you." - $ECHO - $VERBOSE_ECHO "cp -p ltmain.sh \"${_aux_dir}/ltmain.sh\"" - cp -p ltmain.sh "${_aux_dir}/ltmain.sh" - $ECHO $ECHO_N "Continuing build preparation ... $ECHO_C" - fi - fi # ltmain.sh - - if [ "x$DOWNLOAD" = "xyes" ] ; then - download_gnulib_config_guess - fi - fi # libtoolize_needed - - ############ - # autoconf # - ############ - $VERBOSE_ECHO - $VERBOSE_ECHO "$AUTOCONF $AUTOCONF_OPTIONS" - autoconf_output="`$AUTOCONF $AUTOCONF_OPTIONS 2>&1`" - ret=$? - $VERBOSE_ECHO "$autoconf_output" - - if [ ! $ret = 0 ] ; then - # retry without the -f and check for usage of macros that are too new - ac2_59_macros="AC_C_RESTRICT AC_INCLUDES_DEFAULT AC_LANG_ASSERT AC_LANG_WERROR AS_SET_CATFILE" - ac2_55_macros="AC_COMPILER_IFELSE AC_FUNC_MBRTOWC AC_HEADER_STDBOOL AC_LANG_CONFTEST AC_LANG_SOURCE AC_LANG_PROGRAM AC_LANG_CALL AC_LANG_FUNC_TRY_LINK AC_MSG_FAILURE AC_PREPROC_IFELSE" - ac2_54_macros="AC_C_BACKSLASH_A AC_CONFIG_LIBOBJ_DIR AC_GNU_SOURCE AC_PROG_EGREP AC_PROG_FGREP AC_REPLACE_FNMATCH AC_FUNC_FNMATCH_GNU AC_FUNC_REALLOC AC_TYPE_MBSTATE_T" - - macros_to_search="" - ac_major="`echo ${AUTOCONF_VERSION}. | cut -d. -f1 | sed 's/[^0-9]//g'`" - ac_minor="`echo ${AUTOCONF_VERSION}. | cut -d. -f2 | sed 's/[^0-9]//g'`" - - if [ $ac_major -lt 2 ] ; then - macros_to_search="$ac2_59_macros $ac2_55_macros $ac2_54_macros" - else - if [ $ac_minor -lt 54 ] ; then - macros_to_search="$ac2_59_macros $ac2_55_macros $ac2_54_macros" - elif [ $ac_minor -lt 55 ] ; then - macros_to_search="$ac2_59_macros $ac2_55_macros" - elif [ $ac_minor -lt 59 ] ; then - macros_to_search="$ac2_59_macros" - fi - fi - - configure_ac_macros=__none__ - for feature in $macros_to_search ; do - $VERBOSE_ECHO "Searching for $feature in $CONFIGURE" - found="`grep \"^$feature.*\" $CONFIGURE`" - if [ ! "x$found" = "x" ] ; then - if [ "x$configure_ac_macros" = "x__none__" ] ; then - configure_ac_macros="$feature" - else - configure_ac_macros="$feature $configure_ac_macros" - fi - fi - done - if [ ! "x$configure_ac_macros" = "x__none__" ] ; then - $ECHO - $ECHO "Warning: Unsupported macros were found in $CONFIGURE" - $ECHO - $ECHO "The `basename \"$CONFIGURE\"` file was scanned in order to determine if any" - $ECHO "unsupported macros are used that exceed the minimum version" - $ECHO "settings specified within this file. As such, the following macros" - $ECHO "should be removed from configure.ac or the version numbers in this" - $ECHO "file should be increased:" - $ECHO - $ECHO "$configure_ac_macros" - $ECHO - $ECHO $ECHO_N "Ignorantly continuing build preparation ... $ECHO_C" - fi - - ################### - # autoconf, retry # - ################### - $VERBOSE_ECHO - $VERBOSE_ECHO "$AUTOCONF" - autoconf_output="`$AUTOCONF 2>&1`" - ret=$? - $VERBOSE_ECHO "$autoconf_output" - - if [ ! $ret = 0 ] ; then - # test if libtool is busted - libtool_failure "$autoconf_output" - - # let the user know what went wrong - cat < -Provides: tikzit -Description: TikZiT is a GTK+ application that allows the creation and modification of TeX diagrams written using the pgf/TikZ macro library. It is especially geared toward rapidly creating "dot"-diagrams for use in academic papers. diff --git a/tikzit-1/configure.ac b/tikzit-1/configure.ac deleted file mode 100644 index a86156b..0000000 --- a/tikzit-1/configure.ac +++ /dev/null @@ -1,141 +0,0 @@ -# -*- Autoconf -*- -# Process this file with autoconf to produce a configure script. - -AC_PREREQ([2.60]) -AC_INIT([TikZiT], [1.1], - [http://sourceforge.net/apps/trac/tikzit], - [tikzit], - [http://tikzit.sourceforge.net]) -AM_INIT_AUTOMAKE([1.10 foreign subdir-objects -Wall -Werror]) -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -AC_OUTPUT(Makefile - src/Makefile - share/Makefile -) -AC_CONFIG_SRCDIR([src/gtk/main.m]) - -m4_include([m4/objc.m4]) - -# Checks for programs. -AC_PROG_OBJC([gcc clang objc objcc]) -AC_LANG([Objective C]) - -AC_CHECK_PROGS([FLEX], [flex lex], [flex]) -AS_IF([$FLEX --version 2>/dev/null | grep "^flex" >/dev/null 2>/dev/null],[], - [ - AC_MSG_WARN([flex not found; this may cause problems for developers]) - # in case a lex that wasn't flex was found - FLEX=flex - ]) -AM_MISSING_PROG([LEX], [$FLEX]) - -AC_CHECK_PROGS([BISON], [bison yacc], [bison]) -AS_IF([$BISON --version 2>/dev/null | grep "^bison" >/dev/null 2>/dev/null],[], - [ - AC_MSG_WARN([bison not found; this may cause problems for developers]) - # in case a yacc that wasn't bison was found - BISON=bison - ]) -AM_MISSING_PROG([YACC], [$BISON]) - -# Checks for libraries. -FOUNDATION_OBJCFLAGS=`eval "gnustep-config --objc-flags"` -AS_IF([test "x$FOUNDATION_OBJCFLAGS" = "x"], - [AC_MSG_ERROR([GNUstep not found])]) -FOUNDATION_LIBS=`eval "gnustep-config --base-libs"` -AS_IF([test "x$FOUNDATION_LIBS" = "x"], - [AC_MSG_ERROR([GNUstep not found])]) -AC_SUBST([FOUNDATION_OBJCFLAGS]) -AC_SUBST([FOUNDATION_LIBS]) - -TZ_TEST_OBJCFLAGS="$FOUNDATION_OBJCFLAGS" -TZ_TEST_LDFLAGS="$FOUNDATION_LIBS" - -TZ_OBJC_FOUNDATION -AS_IF([test "x$tz_cv_objc_foundation" != "xyes"], - [AC_MSG_ERROR([Objective C Foundation not found -- missing gnustep-base(-devel)?])]) - -AC_ARG_WITH([poppler], AS_HELP_STRING([--without-poppler], [Ignore presence of poppler, disabling preview support])) - -AS_IF([test "x$with_poppler" != "xno"], - [ - AC_MSG_CHECKING([for poppler-glib]) - PKG_CHECK_EXISTS([poppler-glib >= 0.10], - [have_poppler=yes], - [have_poppler=no]) - AS_IF([test "x$have_poppler" = "xyes"], - [ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_POPPLER, 1) - ], - [ - AC_MSG_RESULT([no]) - AS_IF([test "x$with_poppler" = "xyes"], - [AC_MSG_ERROR([poppler requested but not found (note that poppler-glib is required)])] - ) - ]) - ], - [have_poppler=no]) -AM_CONDITIONAL([HAVE_POPPLER],[test "x$have_poppler" = "xyes"]) - -# Test all the pkg-config stuff together, so that -# dependencies and duplicate flags are correctly handled -AS_IF([test "x$have_poppler" = "xyes"], - [PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.18.0 gdk-pixbuf-2.0 >= 2.16.0 pango >= 1.16 cairo >= 1.4 poppler-glib >= 0.10])], - [PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.18.0 gdk-pixbuf-2.0 >= 2.16.0 pango >= 1.16 cairo >= 1.4])]) - -# Checks for header files. -AC_FUNC_ALLOCA -AC_CHECK_HEADERS([inttypes.h libintl.h limits.h malloc.h stddef.h stdint.h stdlib.h string.h unistd.h]) - -# Checks for typedefs, structures, and compiler characteristics. -AC_TYPE_INT16_T -AC_TYPE_INT32_T -AC_TYPE_INT8_T -AC_TYPE_SIZE_T -AC_TYPE_UINT16_T -AC_TYPE_UINT32_T -AC_TYPE_UINT64_T -AC_TYPE_UINT8_T -AC_HEADER_STDBOOL -AC_HEADER_STAT -AC_CHECK_HEADERS([stdint.h inttypes.h unistd.h sys/time.h time.h]) - -# Checks for library functions. -AC_FUNC_MALLOC -AC_FUNC_REALLOC -AC_CHECK_FUNCS([floor gettimeofday memset mkdtemp sqrt strdup]) - -TZ_OBJC2_FEATURES -AS_IF([test "x$tz_cv_objc_properties$tz_cv_objc_fast_enumeration$tz_cv_objc_optional_keyword" != "xyesyesyes"], - [AC_MSG_ERROR([Your Objective C compiler does not support the required Objective C 2 features])]) - -dnl ---------------------------------------------------------------------------- -dnl -dnl platform-specific stuff. - -AC_CANONICAL_HOST -have_msw="no" -case $host_os in - - *mingw32*) - have_msw="yes" - OBJCFLAGS="$OBJCFLAGS -mwindows" - AC_SUBST([WINDOWS]) - AC_SUBST([WIN32]) - AC_SUBST([_WIN32]) - ;; - -esac - -AM_CONDITIONAL([WINDOWS],[test "x$have_msw" = "xyes"]) - -AS_IF([test "x$with_poppler" != "xno"], - [AS_IF([test "x$have_poppler" != "xyes"], - AC_MSG_WARN([poppler-glib was not found; preview support will be disabled]) - )] - ) - -AC_OUTPUT - -# vi:sts=2:sw=2:et diff --git a/tikzit-1/customshape.png b/tikzit-1/customshape.png deleted file mode 100755 index cff8275..0000000 Binary files a/tikzit-1/customshape.png and /dev/null differ diff --git a/tikzit-1/docs/Doxyfile b/tikzit-1/docs/Doxyfile deleted file mode 100644 index 70a27f7..0000000 --- a/tikzit-1/docs/Doxyfile +++ /dev/null @@ -1,1600 +0,0 @@ -# Doxyfile 1.6.3 - -# This file describes the settings to be used by the documentation system -# doxygen (www.doxygen.org) for a project -# -# All text after a hash (#) is considered a comment and will be ignored -# The format is: -# TAG = value [value, ...] -# For lists items can also be appended using: -# TAG += value [value, ...] -# Values that contain spaces should be placed between quotes (" ") - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- - -# This tag specifies the encoding used for all characters in the config file -# that follow. The default is UTF-8 which is also the encoding used for all -# text before the first occurrence of this tag. Doxygen uses libiconv (or the -# iconv built into libc) for the transcoding. See -# http://www.gnu.org/software/libiconv for the list of possible encodings. - -DOXYFILE_ENCODING = UTF-8 - -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded -# by quotes) that should identify the project. - -PROJECT_NAME = TikZiT - -# The PROJECT_NUMBER tag can be used to enter a project or revision number. -# This could be handy for archiving the generated documentation or -# if some version control system is used. - -PROJECT_NUMBER = 0.3 - -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) -# base path where the generated documentation will be put. -# If a relative path is entered, it will be relative to the location -# where doxygen was started. If left blank the current directory will be used. - -OUTPUT_DIRECTORY = doxygen - -# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create -# 4096 sub-directories (in 2 levels) under the output directory of each output -# format and will distribute the generated files over these directories. -# Enabling this option can be useful when feeding doxygen a huge amount of -# source files, where putting all generated files in the same directory would -# otherwise cause performance problems for the file system. - -CREATE_SUBDIRS = NO - -# The OUTPUT_LANGUAGE tag is used to specify the language in which all -# documentation generated by doxygen is written. Doxygen will use this -# information to generate all constant output in the proper language. -# The default language is English, other supported languages are: -# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, -# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, -# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English -# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, -# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, -# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. - -OUTPUT_LANGUAGE = English - -# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will -# include brief member descriptions after the members that are listed in -# the file and class documentation (similar to JavaDoc). -# Set to NO to disable this. - -BRIEF_MEMBER_DESC = YES - -# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend -# the brief description of a member or function before the detailed description. -# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the -# brief descriptions will be completely suppressed. - -REPEAT_BRIEF = YES - -# This tag implements a quasi-intelligent brief description abbreviator -# that is used to form the text in various listings. Each string -# in this list, if found as the leading text of the brief description, will be -# stripped from the text and the result after processing the whole list, is -# used as the annotated text. Otherwise, the brief description is used as-is. -# If left blank, the following values are used ("$name" is automatically -# replaced with the name of the entity): "The $name class" "The $name widget" -# "The $name file" "is" "provides" "specifies" "contains" -# "represents" "a" "an" "the" - -ABBREVIATE_BRIEF = "The $name class" \ - "The $name widget" \ - "The $name file" \ - is \ - provides \ - specifies \ - contains \ - represents \ - a \ - an \ - the - -# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# Doxygen will generate a detailed section even if there is only a brief -# description. - -ALWAYS_DETAILED_SEC = NO - -# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all -# inherited members of a class in the documentation of that class as if those -# members were ordinary class members. Constructors, destructors and assignment -# operators of the base classes will not be shown. - -INLINE_INHERITED_MEMB = NO - -# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full -# path before files name in the file list and in the header files. If set -# to NO the shortest path that makes the file name unique will be used. - -FULL_PATH_NAMES = YES - -# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag -# can be used to strip a user-defined part of the path. Stripping is -# only done if one of the specified strings matches the left-hand part of -# the path. The tag can be used to show relative paths in the file list. -# If left blank the directory from which doxygen is run is used as the -# path to strip. - -STRIP_FROM_PATH = /Applications/ - -# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of -# the path mentioned in the documentation of a class, which tells -# the reader which header file to include in order to use a class. -# If left blank only the name of the header file containing the class -# definition is used. Otherwise one should specify the include paths that -# are normally passed to the compiler using the -I flag. - -STRIP_FROM_INC_PATH = - -# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter -# (but less readable) file names. This can be useful is your file systems -# doesn't support long names like on DOS, Mac, or CD-ROM. - -SHORT_NAMES = NO - -# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen -# will interpret the first line (until the first dot) of a JavaDoc-style -# comment as the brief description. If set to NO, the JavaDoc -# comments will behave just like regular Qt-style comments -# (thus requiring an explicit @brief command for a brief description.) - -JAVADOC_AUTOBRIEF = NO - -# If the QT_AUTOBRIEF tag is set to YES then Doxygen will -# interpret the first line (until the first dot) of a Qt-style -# comment as the brief description. If set to NO, the comments -# will behave just like regular Qt-style comments (thus requiring -# an explicit \brief command for a brief description.) - -QT_AUTOBRIEF = NO - -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen -# treat a multi-line C++ special comment block (i.e. a block of //! or /// -# comments) as a brief description. This used to be the default behaviour. -# The new default is to treat a multi-line C++ comment block as a detailed -# description. Set this tag to YES if you prefer the old behaviour instead. - -MULTILINE_CPP_IS_BRIEF = NO - -# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented -# member inherits the documentation from any documented member that it -# re-implements. - -INHERIT_DOCS = YES - -# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce -# a new page for each member. If set to NO, the documentation of a member will -# be part of the file/class/namespace that contains it. - -SEPARATE_MEMBER_PAGES = NO - -# The TAB_SIZE tag can be used to set the number of spaces in a tab. -# Doxygen uses this value to replace tabs by spaces in code fragments. - -TAB_SIZE = 8 - -# This tag can be used to specify a number of aliases that acts -# as commands in the documentation. An alias has the form "name=value". -# For example adding "sideeffect=\par Side Effects:\n" will allow you to -# put the command \sideeffect (or @sideeffect) in the documentation, which -# will result in a user-defined paragraph with heading "Side Effects:". -# You can put \n's in the value part of an alias to insert newlines. - -ALIASES = - -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C -# sources only. Doxygen will then generate output that is more tailored for C. -# For instance, some of the names that are used will be different. The list -# of all members will be omitted, etc. - -OPTIMIZE_OUTPUT_FOR_C = NO - -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java -# sources only. Doxygen will then generate output that is more tailored for -# Java. For instance, namespaces will be presented as packages, qualified -# scopes will look different, etc. - -OPTIMIZE_OUTPUT_JAVA = NO - -# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran -# sources only. Doxygen will then generate output that is more tailored for -# Fortran. - -OPTIMIZE_FOR_FORTRAN = NO - -# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL -# sources. Doxygen will then generate output that is tailored for -# VHDL. - -OPTIMIZE_OUTPUT_VHDL = NO - -# Doxygen selects the parser to use depending on the extension of the files it parses. -# With this tag you can assign which parser to use for a given extension. -# Doxygen has a built-in mapping, but you can override or extend it using this tag. -# The format is ext=language, where ext is a file extension, and language is one of -# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, -# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat -# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), -# use: inc=Fortran f=C. Note that for custom extensions you also need to set -# FILE_PATTERNS otherwise the files are not read by doxygen. - -EXTENSION_MAPPING = - -# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want -# to include (a tag file for) the STL sources as input, then you should -# set this tag to YES in order to let doxygen match functions declarations and -# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. -# func(std::string) {}). This also make the inheritance and collaboration -# diagrams that involve STL classes more complete and accurate. - -BUILTIN_STL_SUPPORT = NO - -# If you use Microsoft's C++/CLI language, you should set this option to YES to -# enable parsing support. - -CPP_CLI_SUPPORT = NO - -# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. -# Doxygen will parse them like normal C++ but will assume all classes use public -# instead of private inheritance when no explicit protection keyword is present. - -SIP_SUPPORT = NO - -# For Microsoft's IDL there are propget and propput attributes to indicate getter -# and setter methods for a property. Setting this option to YES (the default) -# will make doxygen to replace the get and set methods by a property in the -# documentation. This will only work if the methods are indeed getting or -# setting a simple type. If this is not the case, or you want to show the -# methods anyway, you should set this option to NO. - -IDL_PROPERTY_SUPPORT = YES - -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES, then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default -# all members of a group must be documented explicitly. - -DISTRIBUTE_GROUP_DOC = NO - -# Set the SUBGROUPING tag to YES (the default) to allow class member groups of -# the same type (for instance a group of public functions) to be put as a -# subgroup of that type (e.g. under the Public Functions section). Set it to -# NO to prevent subgrouping. Alternatively, this can be done per class using -# the \nosubgrouping command. - -SUBGROUPING = YES - -# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum -# is documented as struct, union, or enum with the name of the typedef. So -# typedef struct TypeS {} TypeT, will appear in the documentation as a struct -# with name TypeT. When disabled the typedef will appear as a member of a file, -# namespace, or class. And the struct will be named TypeS. This can typically -# be useful for C code in case the coding convention dictates that all compound -# types are typedef'ed and only the typedef is referenced, never the tag name. - -TYPEDEF_HIDES_STRUCT = NO - -# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to -# determine which symbols to keep in memory and which to flush to disk. -# When the cache is full, less often used symbols will be written to disk. -# For small to medium size projects (<1000 input files) the default value is -# probably good enough. For larger projects a too small cache size can cause -# doxygen to be busy swapping symbols to and from disk most of the time -# causing a significant performance penality. -# If the system has enough physical memory increasing the cache will improve the -# performance by keeping more symbols in memory. Note that the value works on -# a logarithmic scale so increasing the size by one will rougly double the -# memory usage. The cache size is given by this formula: -# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, -# corresponding to a cache size of 2^16 = 65536 symbols - -SYMBOL_CACHE_SIZE = 0 - -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- - -# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in -# documentation are documented, even if no documentation was available. -# Private class members and static file members will be hidden unless -# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES - -EXTRACT_ALL = YES - -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class -# will be included in the documentation. - -EXTRACT_PRIVATE = NO - -# If the EXTRACT_STATIC tag is set to YES all static members of a file -# will be included in the documentation. - -EXTRACT_STATIC = NO - -# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) -# defined locally in source files will be included in the documentation. -# If set to NO only classes defined in header files are included. - -EXTRACT_LOCAL_CLASSES = YES - -# This flag is only useful for Objective-C code. When set to YES local -# methods, which are defined in the implementation section but not in -# the interface are included in the documentation. -# If set to NO (the default) only methods in the interface are included. - -EXTRACT_LOCAL_METHODS = NO - -# If this flag is set to YES, the members of anonymous namespaces will be -# extracted and appear in the documentation as a namespace called -# 'anonymous_namespace{file}', where file will be replaced with the base -# name of the file that contains the anonymous namespace. By default -# anonymous namespace are hidden. - -EXTRACT_ANON_NSPACES = NO - -# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all -# undocumented members of documented classes, files or namespaces. -# If set to NO (the default) these members will be included in the -# various overviews, but no documentation section is generated. -# This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_MEMBERS = YES - -# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. -# If set to NO (the default) these classes will be included in the various -# overviews. This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_CLASSES = YES - -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all -# friend (class|struct|union) declarations. -# If set to NO (the default) these declarations will be included in the -# documentation. - -HIDE_FRIEND_COMPOUNDS = NO - -# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any -# documentation blocks found inside the body of a function. -# If set to NO (the default) these blocks will be appended to the -# function's detailed documentation block. - -HIDE_IN_BODY_DOCS = NO - -# The INTERNAL_DOCS tag determines if documentation -# that is typed after a \internal command is included. If the tag is set -# to NO (the default) then the documentation will be excluded. -# Set it to YES to include the internal documentation. - -INTERNAL_DOCS = NO - -# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate -# file names in lower-case letters. If set to YES upper-case letters are also -# allowed. This is useful if you have classes or files whose names only differ -# in case and if your file system supports case sensitive file names. Windows -# and Mac users are advised to set this option to NO. - -CASE_SENSE_NAMES = NO - -# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen -# will show members with their full class and namespace scopes in the -# documentation. If set to YES the scope will be hidden. - -HIDE_SCOPE_NAMES = NO - -# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen -# will put a list of the files that are included by a file in the documentation -# of that file. - -SHOW_INCLUDE_FILES = YES - -# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen -# will list include files with double quotes in the documentation -# rather than with sharp brackets. - -FORCE_LOCAL_INCLUDES = NO - -# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] -# is inserted in the documentation for inline members. - -INLINE_INFO = YES - -# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen -# will sort the (detailed) documentation of file and class members -# alphabetically by member name. If set to NO the members will appear in -# declaration order. - -SORT_MEMBER_DOCS = YES - -# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the -# brief documentation of file, namespace and class members alphabetically -# by member name. If set to NO (the default) the members will appear in -# declaration order. - -SORT_BRIEF_DOCS = NO - -# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen -# will sort the (brief and detailed) documentation of class members so that -# constructors and destructors are listed first. If set to NO (the default) -# the constructors will appear in the respective orders defined by -# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. -# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO -# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO. - -SORT_MEMBERS_CTORS_1ST = NO - -# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the -# hierarchy of group names into alphabetical order. If set to NO (the default) -# the group names will appear in their defined order. - -SORT_GROUP_NAMES = NO - -# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be -# sorted by fully-qualified names, including namespaces. If set to -# NO (the default), the class list will be sorted only by class name, -# not including the namespace part. -# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. -# Note: This option applies only to the class list, not to the -# alphabetical list. - -SORT_BY_SCOPE_NAME = NO - -# The GENERATE_TODOLIST tag can be used to enable (YES) or -# disable (NO) the todo list. This list is created by putting \todo -# commands in the documentation. - -GENERATE_TODOLIST = YES - -# The GENERATE_TESTLIST tag can be used to enable (YES) or -# disable (NO) the test list. This list is created by putting \test -# commands in the documentation. - -GENERATE_TESTLIST = YES - -# The GENERATE_BUGLIST tag can be used to enable (YES) or -# disable (NO) the bug list. This list is created by putting \bug -# commands in the documentation. - -GENERATE_BUGLIST = YES - -# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or -# disable (NO) the deprecated list. This list is created by putting -# \deprecated commands in the documentation. - -GENERATE_DEPRECATEDLIST= YES - -# The ENABLED_SECTIONS tag can be used to enable conditional -# documentation sections, marked by \if sectionname ... \endif. - -ENABLED_SECTIONS = - -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines -# the initial value of a variable or define consists of for it to appear in -# the documentation. If the initializer consists of more lines than specified -# here it will be hidden. Use a value of 0 to hide initializers completely. -# The appearance of the initializer of individual variables and defines in the -# documentation can be controlled using \showinitializer or \hideinitializer -# command in the documentation regardless of this setting. - -MAX_INITIALIZER_LINES = 30 - -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated -# at the bottom of the documentation of classes and structs. If set to YES the -# list will mention the files that were used to generate the documentation. - -SHOW_USED_FILES = YES - -# If the sources in your project are distributed over multiple directories -# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy -# in the documentation. The default is NO. - -SHOW_DIRECTORIES = NO - -# Set the SHOW_FILES tag to NO to disable the generation of the Files page. -# This will remove the Files entry from the Quick Index and from the -# Folder Tree View (if specified). The default is YES. - -SHOW_FILES = YES - -# Set the SHOW_NAMESPACES tag to NO to disable the generation of the -# Namespaces page. This will remove the Namespaces entry from the Quick Index -# and from the Folder Tree View (if specified). The default is YES. - -SHOW_NAMESPACES = YES - -# The FILE_VERSION_FILTER tag can be used to specify a program or script that -# doxygen should invoke to get the current version for each file (typically from -# the version control system). Doxygen will invoke the program by executing (via -# popen()) the command , where is the value of -# the FILE_VERSION_FILTER tag, and is the name of an input file -# provided by doxygen. Whatever the program writes to standard output -# is used as the file version. See the manual for examples. - -FILE_VERSION_FILTER = - -# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by -# doxygen. The layout file controls the global structure of the generated output files -# in an output format independent way. The create the layout file that represents -# doxygen's defaults, run doxygen with the -l option. You can optionally specify a -# file name after the option, if omitted DoxygenLayout.xml will be used as the name -# of the layout file. - -LAYOUT_FILE = - -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- - -# The QUIET tag can be used to turn on/off the messages that are generated -# by doxygen. Possible values are YES and NO. If left blank NO is used. - -QUIET = NO - -# The WARNINGS tag can be used to turn on/off the warning messages that are -# generated by doxygen. Possible values are YES and NO. If left blank -# NO is used. - -WARNINGS = YES - -# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings -# for undocumented members. If EXTRACT_ALL is set to YES then this flag will -# automatically be disabled. - -WARN_IF_UNDOCUMENTED = YES - -# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as not documenting some -# parameters in a documented function, or documenting parameters that -# don't exist or using markup commands wrongly. - -WARN_IF_DOC_ERROR = YES - -# This WARN_NO_PARAMDOC option can be abled to get warnings for -# functions that are documented, but have no documentation for their parameters -# or return value. If set to NO (the default) doxygen will only warn about -# wrong or incomplete parameter documentation, but not about the absence of -# documentation. - -WARN_NO_PARAMDOC = YES - -# The WARN_FORMAT tag determines the format of the warning messages that -# doxygen can produce. The string should contain the $file, $line, and $text -# tags, which will be replaced by the file and line number from which the -# warning originated and the warning text. Optionally the format may contain -# $version, which will be replaced by the version of the file (if it could -# be obtained via FILE_VERSION_FILTER) - -WARN_FORMAT = "$file:$line: $text" - -# The WARN_LOGFILE tag can be used to specify a file to which warning -# and error messages should be written. If left blank the output is written -# to stderr. - -WARN_LOGFILE = - -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- - -# The INPUT tag can be used to specify the files and/or directories that contain -# documented source files. You may enter file names like "myfile.cpp" or -# directories like "/usr/src/myproject". Separate the files or directories -# with spaces. - -INPUT = ../src - -# This tag can be used to specify the character encoding of the source files -# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is -# also the default input encoding. Doxygen uses libiconv (or the iconv built -# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for -# the list of possible encodings. - -INPUT_ENCODING = UTF-8 - -# If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank the following patterns are tested: -# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx -# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 - -FILE_PATTERNS = *.c \ - *.cc \ - *.cxx \ - *.cpp \ - *.c++ \ - *.d \ - *.java \ - *.ii \ - *.ixx \ - *.ipp \ - *.i++ \ - *.inl \ - *.h \ - *.hh \ - *.hxx \ - *.hpp \ - *.h++ \ - *.idl \ - *.odl \ - *.cs \ - *.php \ - *.php3 \ - *.inc \ - *.m \ - *.mm \ - *.dox \ - *.py \ - *.f90 \ - *.f \ - *.vhd \ - *.vhdl - -# The RECURSIVE tag can be used to turn specify whether or not subdirectories -# should be searched for input files as well. Possible values are YES and NO. -# If left blank NO is used. - -RECURSIVE = YES - -# The EXCLUDE tag can be used to specify files and/or directories that should -# excluded from the INPUT source files. This way you can easily exclude a -# subdirectory from a directory tree whose root is specified with the INPUT tag. - -EXCLUDE = ../src/ParseKit - -# The EXCLUDE_SYMLINKS tag can be used select whether or not files or -# directories that are symbolic links (a Unix filesystem feature) are excluded -# from the input. - -EXCLUDE_SYMLINKS = NO - -# If the value of the INPUT tag contains directories, you can use the -# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. Note that the wildcards are matched -# against the file with absolute path, so to exclude all test directories -# for example use the pattern */test/* - -EXCLUDE_PATTERNS = - -# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names -# (namespaces, classes, functions, etc.) that should be excluded from the -# output. The symbol name can be a fully qualified name, a word, or if the -# wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test - -EXCLUDE_SYMBOLS = - -# The EXAMPLE_PATH tag can be used to specify one or more files or -# directories that contain example code fragments that are included (see -# the \include command). - -EXAMPLE_PATH = - -# If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank all files are included. - -EXAMPLE_PATTERNS = * - -# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be -# searched for input files to be used with the \include or \dontinclude -# commands irrespective of the value of the RECURSIVE tag. -# Possible values are YES and NO. If left blank NO is used. - -EXAMPLE_RECURSIVE = NO - -# The IMAGE_PATH tag can be used to specify one or more files or -# directories that contain image that are included in the documentation (see -# the \image command). - -IMAGE_PATH = - -# The INPUT_FILTER tag can be used to specify a program that doxygen should -# invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command , where -# is the value of the INPUT_FILTER tag, and is the name of an -# input file. Doxygen will then use the output that the filter program writes -# to standard output. If FILTER_PATTERNS is specified, this tag will be -# ignored. - -INPUT_FILTER = - -# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern -# basis. Doxygen will compare the file name with each pattern and apply the -# filter if there is a match. The filters are a list of the form: -# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further -# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER -# is applied to all files. - -FILTER_PATTERNS = - -# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER) will be used to filter the input files when producing source -# files to browse (i.e. when SOURCE_BROWSER is set to YES). - -FILTER_SOURCE_FILES = NO - -#--------------------------------------------------------------------------- -# configuration options related to source browsing -#--------------------------------------------------------------------------- - -# If the SOURCE_BROWSER tag is set to YES then a list of source files will -# be generated. Documented entities will be cross-referenced with these sources. -# Note: To get rid of all source code in the generated output, make sure also -# VERBATIM_HEADERS is set to NO. - -SOURCE_BROWSER = YES - -# Setting the INLINE_SOURCES tag to YES will include the body -# of functions and classes directly in the documentation. - -INLINE_SOURCES = NO - -# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct -# doxygen to hide any special comment blocks from generated source code -# fragments. Normal C and C++ comments will always remain visible. - -STRIP_CODE_COMMENTS = YES - -# If the REFERENCED_BY_RELATION tag is set to YES -# then for each documented function all documented -# functions referencing it will be listed. - -REFERENCED_BY_RELATION = NO - -# If the REFERENCES_RELATION tag is set to YES -# then for each documented function all documented entities -# called/used by that function will be listed. - -REFERENCES_RELATION = NO - -# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) -# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from -# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will -# link to the source code. Otherwise they will link to the documentation. - -REFERENCES_LINK_SOURCE = YES - -# If the USE_HTAGS tag is set to YES then the references to source code -# will point to the HTML generated by the htags(1) tool instead of doxygen -# built-in source browser. The htags tool is part of GNU's global source -# tagging system (see http://www.gnu.org/software/global/global.html). You -# will need version 4.8.6 or higher. - -USE_HTAGS = NO - -# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen -# will generate a verbatim copy of the header file for each class for -# which an include is specified. Set to NO to disable this. - -VERBATIM_HEADERS = NO - -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- - -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index -# of all compounds will be generated. Enable this if the project -# contains a lot of classes, structs, unions or interfaces. - -ALPHABETICAL_INDEX = NO - -# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then -# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns -# in which this list will be split (can be a number in the range [1..20]) - -COLS_IN_ALPHA_INDEX = 5 - -# In case all classes in a project start with a common prefix, all -# classes will be put under the same header in the alphabetical index. -# The IGNORE_PREFIX tag can be used to specify one or more prefixes that -# should be ignored while generating the index headers. - -IGNORE_PREFIX = - -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- - -# If the GENERATE_HTML tag is set to YES (the default) Doxygen will -# generate HTML output. - -GENERATE_HTML = YES - -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `html' will be used as the default path. - -HTML_OUTPUT = html - -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for -# each generated HTML page (for example: .htm,.php,.asp). If it is left blank -# doxygen will generate files with .html extension. - -HTML_FILE_EXTENSION = .html - -# The HTML_HEADER tag can be used to specify a personal HTML header for -# each generated HTML page. If it is left blank doxygen will generate a -# standard header. - -HTML_HEADER = - -# The HTML_FOOTER tag can be used to specify a personal HTML footer for -# each generated HTML page. If it is left blank doxygen will generate a -# standard footer. - -HTML_FOOTER = - -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading -# style sheet that is used by each HTML page. It can be used to -# fine-tune the look of the HTML output. If the tag is left blank doxygen -# will generate a default style sheet. Note that doxygen will try to copy -# the style sheet file to the HTML output directory, so don't put your own -# stylesheet in the HTML output directory as well, or it will be erased! - -HTML_STYLESHEET = - -# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML -# page will contain the date and time when the page was generated. Setting -# this to NO can help when comparing the output of multiple runs. - -HTML_TIMESTAMP = YES - -# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, -# files or namespaces will be aligned in HTML using tables. If set to -# NO a bullet list will be used. - -HTML_ALIGN_MEMBERS = YES - -# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML -# documentation will contain sections that can be hidden and shown after the -# page has loaded. For this to work a browser that supports -# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox -# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). - -HTML_DYNAMIC_SECTIONS = NO - -# If the GENERATE_DOCSET tag is set to YES, additional index files -# will be generated that can be used as input for Apple's Xcode 3 -# integrated development environment, introduced with OSX 10.5 (Leopard). -# To create a documentation set, doxygen will generate a Makefile in the -# HTML output directory. Running make will produce the docset in that -# directory and running "make install" will install the docset in -# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find -# it at startup. -# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information. - -GENERATE_DOCSET = NO - -# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the -# feed. A documentation feed provides an umbrella under which multiple -# documentation sets from a single provider (such as a company or product suite) -# can be grouped. - -DOCSET_FEEDNAME = "Doxygen generated docs" - -# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that -# should uniquely identify the documentation set bundle. This should be a -# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen -# will append .docset to the name. - -DOCSET_BUNDLE_ID = org.doxygen.Project - -# If the GENERATE_HTMLHELP tag is set to YES, additional index files -# will be generated that can be used as input for tools like the -# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) -# of the generated HTML documentation. - -GENERATE_HTMLHELP = NO - -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can -# be used to specify the file name of the resulting .chm file. You -# can add a path in front of the file if the result should not be -# written to the html output directory. - -CHM_FILE = - -# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can -# be used to specify the location (absolute path including file name) of -# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run -# the HTML help compiler on the generated index.hhp. - -HHC_LOCATION = - -# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag -# controls if a separate .chi index file is generated (YES) or that -# it should be included in the master .chm file (NO). - -GENERATE_CHI = NO - -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING -# is used to encode HtmlHelp index (hhk), content (hhc) and project file -# content. - -CHM_INDEX_ENCODING = - -# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag -# controls whether a binary table of contents is generated (YES) or a -# normal table of contents (NO) in the .chm file. - -BINARY_TOC = NO - -# The TOC_EXPAND flag can be set to YES to add extra items for group members -# to the contents of the HTML help documentation and to the tree view. - -TOC_EXPAND = NO - -# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER -# are set, an additional index file will be generated that can be used as input for -# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated -# HTML documentation. - -GENERATE_QHP = NO - -# If the QHG_LOCATION tag is specified, the QCH_FILE tag can -# be used to specify the file name of the resulting .qch file. -# The path specified is relative to the HTML output folder. - -QCH_FILE = - -# The QHP_NAMESPACE tag specifies the namespace to use when generating -# Qt Help Project output. For more information please see -# http://doc.trolltech.com/qthelpproject.html#namespace - -QHP_NAMESPACE = org.doxygen.Project - -# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating -# Qt Help Project output. For more information please see -# http://doc.trolltech.com/qthelpproject.html#virtual-folders - -QHP_VIRTUAL_FOLDER = doc - -# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add. -# For more information please see -# http://doc.trolltech.com/qthelpproject.html#custom-filters - -QHP_CUST_FILTER_NAME = - -# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see -# Qt Help Project / Custom Filters. - -QHP_CUST_FILTER_ATTRS = - -# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's -# filter section matches. -# Qt Help Project / Filter Attributes. - -QHP_SECT_FILTER_ATTRS = - -# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can -# be used to specify the location of Qt's qhelpgenerator. -# If non-empty doxygen will try to run qhelpgenerator on the generated -# .qhp file. - -QHG_LOCATION = - -# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files -# will be generated, which together with the HTML files, form an Eclipse help -# plugin. To install this plugin and make it available under the help contents -# menu in Eclipse, the contents of the directory containing the HTML and XML -# files needs to be copied into the plugins directory of eclipse. The name of -# the directory within the plugins directory should be the same as -# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before -# the help appears. - -GENERATE_ECLIPSEHELP = NO - -# A unique identifier for the eclipse help plugin. When installing the plugin -# the directory name containing the HTML and XML files should also have -# this name. - -ECLIPSE_DOC_ID = org.doxygen.Project - -# The DISABLE_INDEX tag can be used to turn on/off the condensed index at -# top of each HTML page. The value NO (the default) enables the index and -# the value YES disables it. - -DISABLE_INDEX = NO - -# This tag can be used to set the number of enum values (range [1..20]) -# that doxygen will group on one line in the generated HTML documentation. - -ENUM_VALUES_PER_LINE = 4 - -# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index -# structure should be generated to display hierarchical information. -# If the tag value is set to YES, a side panel will be generated -# containing a tree-like index structure (just like the one that -# is generated for HTML Help). For this to work a browser that supports -# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). -# Windows users are probably better off using the HTML help feature. - -GENERATE_TREEVIEW = NO - -# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, -# and Class Hierarchy pages using a tree view instead of an ordered list. - -USE_INLINE_TREES = NO - -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be -# used to set the initial width (in pixels) of the frame in which the tree -# is shown. - -TREEVIEW_WIDTH = 250 - -# Use this tag to change the font size of Latex formulas included -# as images in the HTML documentation. The default is 10. Note that -# when you change the font size after a successful doxygen run you need -# to manually remove any form_*.png images from the HTML output directory -# to force them to be regenerated. - -FORMULA_FONTSIZE = 10 - -# When the SEARCHENGINE tag is enabled doxygen will generate a search box -# for the HTML output. The underlying search engine uses javascript -# and DHTML and should work on any modern browser. Note that when using -# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets -# (GENERATE_DOCSET) there is already a search function so this one should -# typically be disabled. For large projects the javascript based search engine -# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. - -SEARCHENGINE = NO - -# When the SERVER_BASED_SEARCH tag is enabled the search engine will be -# implemented using a PHP enabled web server instead of at the web client -# using Javascript. Doxygen will generate the search PHP script and index -# file to put on the web server. The advantage of the server -# based approach is that it scales better to large projects and allows -# full text search. The disadvances is that it is more difficult to setup -# and does not have live searching capabilities. - -SERVER_BASED_SEARCH = NO - -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- - -# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will -# generate Latex output. - -GENERATE_LATEX = NO - -# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `latex' will be used as the default path. - -LATEX_OUTPUT = latex - -# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be -# invoked. If left blank `latex' will be used as the default command name. -# Note that when enabling USE_PDFLATEX this option is only used for -# generating bitmaps for formulas in the HTML output, but not in the -# Makefile that is written to the output directory. - -LATEX_CMD_NAME = latex - -# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to -# generate index for LaTeX. If left blank `makeindex' will be used as the -# default command name. - -MAKEINDEX_CMD_NAME = makeindex - -# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact -# LaTeX documents. This may be useful for small projects and may help to -# save some trees in general. - -COMPACT_LATEX = NO - -# The PAPER_TYPE tag can be used to set the paper type that is used -# by the printer. Possible values are: a4, a4wide, letter, legal and -# executive. If left blank a4wide will be used. - -PAPER_TYPE = a4wide - -# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX -# packages that should be included in the LaTeX output. - -EXTRA_PACKAGES = - -# The LATEX_HEADER tag can be used to specify a personal LaTeX header for -# the generated latex document. The header should contain everything until -# the first chapter. If it is left blank doxygen will generate a -# standard header. Notice: only use this tag if you know what you are doing! - -LATEX_HEADER = - -# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated -# is prepared for conversion to pdf (using ps2pdf). The pdf file will -# contain links (just like the HTML output) instead of page references -# This makes the output suitable for online browsing using a pdf viewer. - -PDF_HYPERLINKS = YES - -# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of -# plain latex in the generated Makefile. Set this option to YES to get a -# higher quality PDF documentation. - -USE_PDFLATEX = YES - -# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. -# command to the generated LaTeX files. This will instruct LaTeX to keep -# running if errors occur, instead of asking the user for help. -# This option is also used when generating formulas in HTML. - -LATEX_BATCHMODE = NO - -# If LATEX_HIDE_INDICES is set to YES then doxygen will not -# include the index chapters (such as File Index, Compound Index, etc.) -# in the output. - -LATEX_HIDE_INDICES = NO - -# If LATEX_SOURCE_CODE is set to YES then doxygen will include -# source code with syntax highlighting in the LaTeX output. -# Note that which sources are shown also depends on other settings -# such as SOURCE_BROWSER. - -LATEX_SOURCE_CODE = NO - -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- - -# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output -# The RTF output is optimized for Word 97 and may not look very pretty with -# other RTF readers or editors. - -GENERATE_RTF = NO - -# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `rtf' will be used as the default path. - -RTF_OUTPUT = rtf - -# If the COMPACT_RTF tag is set to YES Doxygen generates more compact -# RTF documents. This may be useful for small projects and may help to -# save some trees in general. - -COMPACT_RTF = NO - -# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated -# will contain hyperlink fields. The RTF file will -# contain links (just like the HTML output) instead of page references. -# This makes the output suitable for online browsing using WORD or other -# programs which support those fields. -# Note: wordpad (write) and others do not support links. - -RTF_HYPERLINKS = NO - -# Load stylesheet definitions from file. Syntax is similar to doxygen's -# config file, i.e. a series of assignments. You only have to provide -# replacements, missing definitions are set to their default value. - -RTF_STYLESHEET_FILE = - -# Set optional variables used in the generation of an rtf document. -# Syntax is similar to doxygen's config file. - -RTF_EXTENSIONS_FILE = - -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- - -# If the GENERATE_MAN tag is set to YES (the default) Doxygen will -# generate man pages - -GENERATE_MAN = NO - -# The MAN_OUTPUT tag is used to specify where the man pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `man' will be used as the default path. - -MAN_OUTPUT = man - -# The MAN_EXTENSION tag determines the extension that is added to -# the generated man pages (default is the subroutine's section .3) - -MAN_EXTENSION = .3 - -# If the MAN_LINKS tag is set to YES and Doxygen generates man output, -# then it will generate one additional man file for each entity -# documented in the real man page(s). These additional files -# only source the real man page, but without them the man command -# would be unable to find the correct page. The default is NO. - -MAN_LINKS = NO - -#--------------------------------------------------------------------------- -# configuration options related to the XML output -#--------------------------------------------------------------------------- - -# If the GENERATE_XML tag is set to YES Doxygen will -# generate an XML file that captures the structure of -# the code including all documentation. - -GENERATE_XML = YES - -# The XML_OUTPUT tag is used to specify where the XML pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `xml' will be used as the default path. - -XML_OUTPUT = xml - -# The XML_SCHEMA tag can be used to specify an XML schema, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_SCHEMA = - -# The XML_DTD tag can be used to specify an XML DTD, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_DTD = - -# If the XML_PROGRAMLISTING tag is set to YES Doxygen will -# dump the program listings (including syntax highlighting -# and cross-referencing information) to the XML output. Note that -# enabling this will significantly increase the size of the XML output. - -XML_PROGRAMLISTING = YES - -#--------------------------------------------------------------------------- -# configuration options for the AutoGen Definitions output -#--------------------------------------------------------------------------- - -# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will -# generate an AutoGen Definitions (see autogen.sf.net) file -# that captures the structure of the code including all -# documentation. Note that this feature is still experimental -# and incomplete at the moment. - -GENERATE_AUTOGEN_DEF = NO - -#--------------------------------------------------------------------------- -# configuration options related to the Perl module output -#--------------------------------------------------------------------------- - -# If the GENERATE_PERLMOD tag is set to YES Doxygen will -# generate a Perl module file that captures the structure of -# the code including all documentation. Note that this -# feature is still experimental and incomplete at the -# moment. - -GENERATE_PERLMOD = NO - -# If the PERLMOD_LATEX tag is set to YES Doxygen will generate -# the necessary Makefile rules, Perl scripts and LaTeX code to be able -# to generate PDF and DVI output from the Perl module output. - -PERLMOD_LATEX = NO - -# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be -# nicely formatted so it can be parsed by a human reader. This is useful -# if you want to understand what is going on. On the other hand, if this -# tag is set to NO the size of the Perl module output will be much smaller -# and Perl will parse it just the same. - -PERLMOD_PRETTY = YES - -# The names of the make variables in the generated doxyrules.make file -# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. -# This is useful so different doxyrules.make files included by the same -# Makefile don't overwrite each other's variables. - -PERLMOD_MAKEVAR_PREFIX = - -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- - -# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will -# evaluate all C-preprocessor directives found in the sources and include -# files. - -ENABLE_PREPROCESSING = YES - -# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro -# names in the source code. If set to NO (the default) only conditional -# compilation will be performed. Macro expansion can be done in a controlled -# way by setting EXPAND_ONLY_PREDEF to YES. - -MACRO_EXPANSION = NO - -# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES -# then the macro expansion is limited to the macros specified with the -# PREDEFINED and EXPAND_AS_DEFINED tags. - -EXPAND_ONLY_PREDEF = NO - -# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files -# in the INCLUDE_PATH (see below) will be search if a #include is found. - -SEARCH_INCLUDES = YES - -# The INCLUDE_PATH tag can be used to specify one or more directories that -# contain include files that are not input files but should be processed by -# the preprocessor. - -INCLUDE_PATH = - -# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard -# patterns (like *.h and *.hpp) to filter out the header-files in the -# directories. If left blank, the patterns specified with FILE_PATTERNS will -# be used. - -INCLUDE_FILE_PATTERNS = - -# The PREDEFINED tag can be used to specify one or more macro names that -# are defined before the preprocessor is started (similar to the -D option of -# gcc). The argument of the tag is a list of macros of the form: name -# or name=definition (no spaces). If the definition and the = are -# omitted =1 is assumed. To prevent a macro definition from being -# undefined via #undef or recursively expanded use the := operator -# instead of the = operator. - -PREDEFINED = __APPLE__ - -# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then -# this tag can be used to specify a list of macro names that should be expanded. -# The macro definition that is found in the sources will be used. -# Use the PREDEFINED tag if you want to use a different macro definition. - -EXPAND_AS_DEFINED = - -# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then -# doxygen's preprocessor will remove all function-like macros that are alone -# on a line, have an all uppercase name, and do not end with a semicolon. Such -# function macros are typically used for boiler-plate code, and will confuse -# the parser if not removed. - -SKIP_FUNCTION_MACROS = YES - -#--------------------------------------------------------------------------- -# Configuration::additions related to external references -#--------------------------------------------------------------------------- - -# The TAGFILES option can be used to specify one or more tagfiles. -# Optionally an initial location of the external documentation -# can be added for each tagfile. The format of a tag file without -# this location is as follows: -# TAGFILES = file1 file2 ... -# Adding location for the tag files is done as follows: -# TAGFILES = file1=loc1 "file2 = loc2" ... -# where "loc1" and "loc2" can be relative or absolute paths or -# URLs. If a location is present for each tag, the installdox tool -# does not have to be run to correct the links. -# Note that each tag file must have a unique name -# (where the name does NOT include the path) -# If a tag file is not located in the directory in which doxygen -# is run, you must also specify the path to the tagfile here. - -TAGFILES = - -# When a file name is specified after GENERATE_TAGFILE, doxygen will create -# a tag file that is based on the input files it reads. - -GENERATE_TAGFILE = - -# If the ALLEXTERNALS tag is set to YES all external classes will be listed -# in the class index. If set to NO only the inherited external classes -# will be listed. - -ALLEXTERNALS = NO - -# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed -# in the modules index. If set to NO, only the current project's groups will -# be listed. - -EXTERNAL_GROUPS = YES - -# The PERL_PATH should be the absolute path and name of the perl script -# interpreter (i.e. the result of `which perl'). - -PERL_PATH = /usr/bin/perl - -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- - -# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will -# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base -# or super classes. Setting the tag to NO turns the diagrams off. Note that -# this option is superseded by the HAVE_DOT option below. This is only a -# fallback. It is recommended to install and use dot, since it yields more -# powerful graphs. - -CLASS_DIAGRAMS = NO - -# You can define message sequence charts within doxygen comments using the \msc -# command. Doxygen will then run the mscgen tool (see -# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the -# documentation. The MSCGEN_PATH tag allows you to specify the directory where -# the mscgen tool resides. If left empty the tool is assumed to be found in the -# default search path. - -MSCGEN_PATH = /Applications/Doxygen.app/Contents/Resources/ - -# If set to YES, the inheritance and collaboration graphs will hide -# inheritance and usage relations if the target is undocumented -# or is not a class. - -HIDE_UNDOC_RELATIONS = YES - -# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is -# available from the path. This tool is part of Graphviz, a graph visualization -# toolkit from AT&T and Lucent Bell Labs. The other options in this section -# have no effect if this option is set to NO (the default) - -HAVE_DOT = YES - -# By default doxygen will write a font called FreeSans.ttf to the output -# directory and reference it in all dot files that doxygen generates. This -# font does not include all possible unicode characters however, so when you need -# these (or just want a differently looking font) you can specify the font name -# using DOT_FONTNAME. You need need to make sure dot is able to find the font, -# which can be done by putting it in a standard location or by setting the -# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory -# containing the font. - -DOT_FONTNAME = FreeSans - -# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. -# The default size is 10pt. - -DOT_FONTSIZE = 10 - -# By default doxygen will tell dot to use the output directory to look for the -# FreeSans.ttf font (which doxygen will put there itself). If you specify a -# different font using DOT_FONTNAME you can set the path where dot -# can find it using this tag. - -DOT_FONTPATH = - -# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect inheritance relations. Setting this tag to YES will force the -# the CLASS_DIAGRAMS tag to NO. - -CLASS_GRAPH = YES - -# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect implementation dependencies (inheritance, containment, and -# class references variables) of the class with other documented classes. - -COLLABORATION_GRAPH = YES - -# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for groups, showing the direct groups dependencies - -GROUP_GRAPHS = YES - -# If the UML_LOOK tag is set to YES doxygen will generate inheritance and -# collaboration diagrams in a style similar to the OMG's Unified Modeling -# Language. - -UML_LOOK = NO - -# If set to YES, the inheritance and collaboration graphs will show the -# relations between templates and their instances. - -TEMPLATE_RELATIONS = NO - -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT -# tags are set to YES then doxygen will generate a graph for each documented -# file showing the direct and indirect include dependencies of the file with -# other documented files. - -INCLUDE_GRAPH = YES - -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and -# HAVE_DOT tags are set to YES then doxygen will generate a graph for each -# documented header file showing the documented files that directly or -# indirectly include this file. - -INCLUDED_BY_GRAPH = YES - -# If the CALL_GRAPH and HAVE_DOT options are set to YES then -# doxygen will generate a call dependency graph for every global function -# or class method. Note that enabling this option will significantly increase -# the time of a run. So in most cases it will be better to enable call graphs -# for selected functions only using the \callgraph command. - -CALL_GRAPH = YES - -# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then -# doxygen will generate a caller dependency graph for every global function -# or class method. Note that enabling this option will significantly increase -# the time of a run. So in most cases it will be better to enable caller -# graphs for selected functions only using the \callergraph command. - -CALLER_GRAPH = NO - -# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen -# will graphical hierarchy of all classes instead of a textual one. - -GRAPHICAL_HIERARCHY = YES - -# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES -# then doxygen will show the dependencies a directory has on other directories -# in a graphical way. The dependency relations are determined by the #include -# relations between the files in the directories. - -DIRECTORY_GRAPH = YES - -# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images -# generated by dot. Possible values are png, jpg, or gif -# If left blank png will be used. - -DOT_IMAGE_FORMAT = png - -# The tag DOT_PATH can be used to specify the path where the dot tool can be -# found. If left blank, it is assumed the dot tool can be found in the path. - -DOT_PATH = /Applications/Doxygen.app/Contents/Resources/ - -# The DOTFILE_DIRS tag can be used to specify one or more directories that -# contain dot files that are included in the documentation (see the -# \dotfile command). - -DOTFILE_DIRS = - -# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of -# nodes that will be shown in the graph. If the number of nodes in a graph -# becomes larger than this value, doxygen will truncate the graph, which is -# visualized by representing a node as a red box. Note that doxygen if the -# number of direct children of the root node in a graph is already larger than -# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note -# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. - -DOT_GRAPH_MAX_NODES = 50 - -# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the -# graphs generated by dot. A depth value of 3 means that only nodes reachable -# from the root by following a path via at most 3 edges will be shown. Nodes -# that lay further from the root node will be omitted. Note that setting this -# option to 1 or 2 may greatly reduce the computation time needed for large -# code bases. Also note that the size of a graph can be further restricted by -# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. - -MAX_DOT_GRAPH_DEPTH = 1000 - -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not -# seem to support this out of the box. Warning: Depending on the platform used, -# enabling this option may lead to badly anti-aliased labels on the edges of -# a graph (i.e. they become hard to read). - -DOT_TRANSPARENT = NO - -# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output -# files in one run (i.e. multiple -o and -T options on the command line). This -# makes dot run faster, but since only newer versions of dot (>1.8.10) -# support this, this feature is disabled by default. - -DOT_MULTI_TARGETS = NO - -# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will -# generate a legend page explaining the meaning of the various boxes and -# arrows in the dot generated graphs. - -GENERATE_LEGEND = YES - -# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will -# remove the intermediate dot files that are used to generate -# the various graphs. - -DOT_CLEANUP = YES diff --git a/tikzit-1/draw-ellipse.png b/tikzit-1/draw-ellipse.png deleted file mode 100644 index d8e3e6f..0000000 Binary files a/tikzit-1/draw-ellipse.png and /dev/null differ diff --git a/tikzit-1/draw-path.png b/tikzit-1/draw-path.png deleted file mode 100644 index ec5e691..0000000 Binary files a/tikzit-1/draw-path.png and /dev/null differ diff --git a/tikzit-1/emblem-important.png b/tikzit-1/emblem-important.png deleted file mode 100644 index 81e9ed2..0000000 Binary files a/tikzit-1/emblem-important.png and /dev/null differ diff --git a/tikzit-1/emblem-unreadable-grey.png b/tikzit-1/emblem-unreadable-grey.png deleted file mode 100644 index 09572ab..0000000 Binary files a/tikzit-1/emblem-unreadable-grey.png and /dev/null differ diff --git a/tikzit-1/engine.png b/tikzit-1/engine.png deleted file mode 100755 index 1e45370..0000000 Binary files a/tikzit-1/engine.png and /dev/null differ diff --git a/tikzit-1/format-indent-less.png b/tikzit-1/format-indent-less.png deleted file mode 100644 index 7ced16f..0000000 Binary files a/tikzit-1/format-indent-less.png and /dev/null differ diff --git a/tikzit-1/m4/objc.m4 b/tikzit-1/m4/objc.m4 deleted file mode 100644 index 8c7cc78..0000000 --- a/tikzit-1/m4/objc.m4 +++ /dev/null @@ -1,135 +0,0 @@ -# Checks for a working Foundation -# tz_cv_objc_foundation -# to either "yes" or "no" -# -AC_DEFUN([TZ_OBJC_FOUNDATION], -[ -AC_LANG_ASSERT([Objective C]) -tz_old_objcflags="$OBJCFLAGS" -OBJCFLAGS="$OBJCFLAGS $TZ_TEST_OBJCFLAGS" - -AC_CACHE_CHECK([for Objective C Foundation], - [tz_cv_objc_foundation], -[AC_COMPILE_IFELSE( - [AC_LANG_SOURCE([[ -#import - -@interface TestObj : NSObject { - int intVar; - NSObject *objVar; - NSString *strVar; -} --(id)init; -@end - -@implementation TestObj --(id)init { - self = [super init]; - intVar = 0; - objVar = nil; - strVar = @"Foo"; - return self; -} -@end - -int main(void) { - TestObj *obj = [[TestObj alloc] init]; - [obj release]; - return 0; -} - ]])], - [tz_cv_objc_foundation=yes], - [tz_cv_objc_foundation=no])]) - -OBJCFLAGS="$tz_old_objcflags" -]) - - -# Checks for Objective C 2 feature support -# and sets the shell variables -# tz_cv_objc_properties -# tz_cv_objc_fast_enumeration -# tz_cv_objc_optional_keyword -# to either "yes" or "no" -# -AC_DEFUN([TZ_OBJC2_FEATURES], -[ -AC_LANG_ASSERT([Objective C]) -tz_old_objcflags="$OBJCFLAGS" -OBJCFLAGS="$OBJCFLAGS $TZ_TEST_OBJCFLAGS" - -AC_CACHE_CHECK([for Objective C 2 @property support], - [tz_cv_objc_properties], -[AC_COMPILE_IFELSE( - [AC_LANG_SOURCE([[ -#import - -@interface TestObj : NSObject { - int intProp1; - NSObject *copyObjProp; - NSObject *fooProp; -} -@property (assign,nonatomic) int intProp; -@property (retain,readonly) NSObject *retainObjProp; -@property (copy,readwrite) NSObject *copyObjProp; -@property (retain,getter=foo,setter=foo1:) NSObject *fooProp; -@end - -@implementation TestObj -@synthesize intProp=intProp1; -@dynamic retainObjProp; -- (NSObject*) retainObjProp { return nil; } -@synthesize copyObjProp; -@synthesize fooProp; -@end - -int main(void) { - TestObj *obj = [[TestObj alloc] init]; - obj.intProp = 4; - NSObject *result = obj.retainObjProp; - return 0; -} - ]])], - [tz_cv_objc_properties=yes], - [tz_cv_objc_properties=no])]) - - -AC_CACHE_CHECK([for Objective C 2 fast enumeration support], - [tz_cv_objc_fast_enumeration], -[AC_COMPILE_IFELSE( - [AC_LANG_SOURCE([[ -#import - -int main(void) { - NSArray *array = [NSArray arrayWithObjects: @"One", @"Two", @"Three", @"Four", nil]; - for (NSString *element in array) { - NSLog(@"element: %@", element); - } - return 0; -} - ]])], - [tz_cv_objc_fast_enumeration=yes], - [tz_cv_objc_fast_enumeration=no])]) - -AC_CACHE_CHECK([for Objective C 2 @optional support], - [tz_cv_objc_optional_keyword], -[AC_COMPILE_IFELSE( - [AC_LANG_SOURCE([[ -#import - -@protocol Foo -@optional -- (void) foo; -@required -- (void) bar; -@end - -int main(void) { - return 0; -} - ]])], - [tz_cv_objc_optional_keyword=yes], - [tz_cv_objc_optional_keyword=no])]) - -OBJCFLAGS="$tz_old_objcflags" -]) diff --git a/tikzit-1/preamble.png b/tikzit-1/preamble.png deleted file mode 100755 index d940d24..0000000 Binary files a/tikzit-1/preamble.png and /dev/null differ diff --git a/tikzit-1/scripts/generate_keys.rb b/tikzit-1/scripts/generate_keys.rb deleted file mode 100755 index b22439c..0000000 --- a/tikzit-1/scripts/generate_keys.rb +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/ruby -["dsaparam.pem", "dsa_priv.pem", "dsa_pub.pem"].each do |file| - if File.exist? file - puts "There's already a #{file} here! Move it aside or be more careful!" - end -end -`openssl dsaparam 2048 < /dev/urandom > dsaparam.pem` -`openssl gendsa dsaparam.pem -out dsa_priv.pem` -`openssl dsa -in dsa_priv.pem -pubout -out dsa_pub.pem` -`rm dsaparam.pem` -puts "\nGenerated private and public keys: dsa_priv.pem and dsa_pub.pem.\n -BACK UP YOUR PRIVATE KEY AND KEEP IT SAFE!\n -If you lose it, your users will be unable to upgrade!\n" \ No newline at end of file diff --git a/tikzit-1/scripts/prepare_release.sh b/tikzit-1/scripts/prepare_release.sh deleted file mode 100755 index 5f5edfc..0000000 --- a/tikzit-1/scripts/prepare_release.sh +++ /dev/null @@ -1,40 +0,0 @@ -set -o errexit - -PROJECT_NAME=TikZiT -APP_BUNDLE=xbuild/Release/$PROJECT_NAME.app - -VERSION=$(defaults read "$(pwd)/$APP_BUNDLE/Contents/Info" CFBundleVersion) -DOWNLOAD_BASE_URL="http://tikzit.sourceforge.net/appcast" -RELEASENOTES_URL="$DOWNLOAD_BASE_URL/rnotes.html" - -ARCHIVE_FILENAME="$PROJECT_NAME $VERSION.tar.bz2" -ARCHIVE_PATH="../www/htdocs/appcast/files/$ARCHIVE_FILENAME" -DOWNLOAD_URL="$DOWNLOAD_BASE_URL/files/$ARCHIVE_FILENAME" - -if [ -e "$ARCHIVE_PATH" ]; then - echo 'Archive already exists. Either remove this archive or increment version.' - exit 1 -fi - -tar cjf "$ARCHIVE_PATH" "$APP_BUNDLE" - -SIZE=$(stat -f %z "$ARCHIVE_PATH") -PUBDATE=$(LC_TIME=en_US date +"%a, %d %b %G %T %z") -SIGNATURE=$(scripts/sign_update.rb "$ARCHIVE_PATH" tikzit_dsa_priv.pem) - -cat < - Version $VERSION - - $RELEASENOTES_URL - - $PUBDATE - - -EOF diff --git a/tikzit-1/scripts/sign_update.rb b/tikzit-1/scripts/sign_update.rb deleted file mode 100755 index 6d03e2e..0000000 --- a/tikzit-1/scripts/sign_update.rb +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/ruby -if ARGV.length < 2 - puts "Usage: ruby sign_update.rb update_archive private_key" - exit -end - -puts `openssl dgst -sha1 -binary < "#{ARGV[0]}" | openssl dgst -dss1 -sign "#{ARGV[1]}" | openssl enc -base64` \ No newline at end of file diff --git a/tikzit-1/select-rectangular.png b/tikzit-1/select-rectangular.png deleted file mode 100644 index 866b602..0000000 Binary files a/tikzit-1/select-rectangular.png and /dev/null differ diff --git a/tikzit-1/shapes/cap.tikz b/tikzit-1/shapes/cap.tikz deleted file mode 100644 index a98ff39..0000000 --- a/tikzit-1/shapes/cap.tikz +++ /dev/null @@ -1,13 +0,0 @@ -\begin{tikzpicture} - \path [use as bounding box] (-2,-2) rectangle (2,2); - \begin{pgfonlayer}{nodelayer} - \node [style=none] (0) at (0, 0.75) {}; - \node [style=none] (1) at (-0.5, 0) {}; - \node [style=none] (2) at (0.5, 0) {}; - \end{pgfonlayer} - \begin{pgfonlayer}{edgelayer} - \draw [in=0, out=90] (2.center) to (0.center); - \draw [in=270, out=-90, looseness=0.75] (1.center) to (2.center); - \draw [in=90, out=180] (0.center) to (1.center); - \end{pgfonlayer} -\end{tikzpicture} \ No newline at end of file diff --git a/tikzit-1/shapes/copants.tikz b/tikzit-1/shapes/copants.tikz deleted file mode 100644 index d2b8e3c..0000000 --- a/tikzit-1/shapes/copants.tikz +++ /dev/null @@ -1,19 +0,0 @@ -\begin{tikzpicture} - \path [use as bounding box] (-2,-2) rectangle (2,2); - \begin{pgfonlayer}{nodelayer} - \node [style=none] (0) at (-1.5, 1) {}; - \node [style=none] (1) at (-0.5, 1) {}; - \node [style=none] (2) at (0.5, 1) {}; - \node [style=none] (3) at (1.5, 1) {}; - \node [style=none] (4) at (-0.5, -1) {}; - \node [style=none] (5) at (0.5, -1) {}; - \end{pgfonlayer} - \begin{pgfonlayer}{edgelayer} - \draw [in=-90, out=90, looseness=0.75] (5.center) to (3.center); - \draw [in=90, out=90, looseness=0.75] (4.center) to (5.center); - \draw [in=270, out=-90, looseness=0.75] (1.center) to (0.center); - \draw [in=270, out=-90, looseness=0.75] (3.center) to (2.center); - \draw [in=-270, out=-90, looseness=0.75] (0.center) to (4.center); - \draw [in=-90, out=-90, looseness=1.75] (2.center) to (1.center); - \end{pgfonlayer} -\end{tikzpicture} \ No newline at end of file diff --git a/tikzit-1/shapes/cup.tikz b/tikzit-1/shapes/cup.tikz deleted file mode 100644 index 1dc1faa..0000000 --- a/tikzit-1/shapes/cup.tikz +++ /dev/null @@ -1,13 +0,0 @@ -\begin{tikzpicture} - \path [use as bounding box] (-2,-2) rectangle (2,2); - \begin{pgfonlayer}{nodelayer} - \node [style=none] (0) at (-0.5, 0) {}; - \node [style=none] (1) at (0.5, 0) {}; - \node [style=none] (2) at (0, -0.75) {}; - \end{pgfonlayer} - \begin{pgfonlayer}{edgelayer} - \draw [in=0, out=-90] (1.center) to (2.center); - \draw [in=-270, out=90, looseness=0.75] (0.center) to (1.center); - \draw [in=-90, out=-180] (2.center) to (0.center); - \end{pgfonlayer} -\end{tikzpicture} \ No newline at end of file diff --git a/tikzit-1/shapes/oval.tikz b/tikzit-1/shapes/oval.tikz deleted file mode 100644 index b5d2891..0000000 --- a/tikzit-1/shapes/oval.tikz +++ /dev/null @@ -1,11 +0,0 @@ -\begin{tikzpicture} - \path [use as bounding box] (-2,-2) rectangle (2,2); - \begin{pgfonlayer}{nodelayer} - \node [style=none] (0) at (-0.5, 0) {}; - \node [style=none] (1) at (0.5, 0) {}; - \end{pgfonlayer} - \begin{pgfonlayer}{edgelayer} - \draw [in=90, out=90, looseness=0.75] (0.center) to (1.center); - \draw [in=-90, out=270, looseness=0.75] (1.center) to (0.center); - \end{pgfonlayer} -\end{tikzpicture} \ No newline at end of file diff --git a/tikzit-1/shapes/pants.tikz b/tikzit-1/shapes/pants.tikz deleted file mode 100644 index c2c15c2..0000000 --- a/tikzit-1/shapes/pants.tikz +++ /dev/null @@ -1,19 +0,0 @@ -\begin{tikzpicture} - \path [use as bounding box] (-2,-2) rectangle (2,2); - \begin{pgfonlayer}{nodelayer} - \node [style=none] (0) at (-0.5, 1) {}; - \node [style=none] (1) at (0.5, 1) {}; - \node [style=none] (2) at (-1.5, -1) {}; - \node [style=none] (3) at (-0.5, -1) {}; - \node [style=none] (4) at (0.5, -1) {}; - \node [style=none] (5) at (1.5, -1) {}; - \end{pgfonlayer} - \begin{pgfonlayer}{edgelayer} - \draw [in=90, out=90, looseness=1.75] (4.center) to (3.center); - \draw [in=270, out=90, looseness=0.75] (2.center) to (0.center); - \draw [in=-90, out=-90, looseness=0.75] (0.center) to (1.center); - \draw [in=90, out=-90, looseness=0.75] (1.center) to (5.center); - \draw [in=-270, out=90, looseness=0.75] (5.center) to (4.center); - \draw [in=-270, out=90, looseness=0.75] (3.center) to (2.center); - \end{pgfonlayer} -\end{tikzpicture} \ No newline at end of file diff --git a/tikzit-1/share/Makefile.am b/tikzit-1/share/Makefile.am deleted file mode 100644 index 658b4d9..0000000 --- a/tikzit-1/share/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -if WINDOWS -else -sharedir = $(datarootdir) -nobase_dist_share_DATA = \ - applications/tikzit.desktop \ - mime/packages/tikzit.xml \ - icons/hicolor/*/*/*.png \ - icons/hicolor/scalable/*/*.svg -endif - diff --git a/tikzit-1/share/applications/tikzit.desktop b/tikzit-1/share/applications/tikzit.desktop deleted file mode 100644 index 12b6fa5..0000000 --- a/tikzit-1/share/applications/tikzit.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Name=TikZit -Comment=Editor for PGF/TikZ-based node-and-edge graphs for LaTeX documents -GenericName=TikZ Graph Editor -MimeType=text/x-tikz -Exec=tikzit -Icon=tikzit -Categories=GTK;Graphics;Education;Science; -StartupNotify=false diff --git a/tikzit-1/share/icons/hicolor/128x128/apps/tikzit.png b/tikzit-1/share/icons/hicolor/128x128/apps/tikzit.png deleted file mode 100644 index e8ee92b..0000000 Binary files a/tikzit-1/share/icons/hicolor/128x128/apps/tikzit.png and /dev/null differ diff --git a/tikzit-1/share/icons/hicolor/128x128/mimetypes/text-x-tikz.png b/tikzit-1/share/icons/hicolor/128x128/mimetypes/text-x-tikz.png deleted file mode 100644 index 6b3bbe6..0000000 Binary files a/tikzit-1/share/icons/hicolor/128x128/mimetypes/text-x-tikz.png and /dev/null differ diff --git a/tikzit-1/share/icons/hicolor/16x16/apps/tikzit.png b/tikzit-1/share/icons/hicolor/16x16/apps/tikzit.png deleted file mode 100644 index 9b7a377..0000000 Binary files a/tikzit-1/share/icons/hicolor/16x16/apps/tikzit.png and /dev/null differ diff --git a/tikzit-1/share/icons/hicolor/16x16/mimetypes/text-x-tikz.png b/tikzit-1/share/icons/hicolor/16x16/mimetypes/text-x-tikz.png deleted file mode 100644 index 364e831..0000000 Binary files a/tikzit-1/share/icons/hicolor/16x16/mimetypes/text-x-tikz.png and /dev/null differ diff --git a/tikzit-1/share/icons/hicolor/22x22/apps/tikzit.png b/tikzit-1/share/icons/hicolor/22x22/apps/tikzit.png deleted file mode 100644 index be803da..0000000 Binary files a/tikzit-1/share/icons/hicolor/22x22/apps/tikzit.png and /dev/null differ diff --git a/tikzit-1/share/icons/hicolor/22x22/mimetypes/text-x-tikz.png b/tikzit-1/share/icons/hicolor/22x22/mimetypes/text-x-tikz.png deleted file mode 100644 index 6436a9e..0000000 Binary files a/tikzit-1/share/icons/hicolor/22x22/mimetypes/text-x-tikz.png and /dev/null differ diff --git a/tikzit-1/share/icons/hicolor/24x24/apps/tikzit.png b/tikzit-1/share/icons/hicolor/24x24/apps/tikzit.png deleted file mode 100644 index 478aeab..0000000 Binary files a/tikzit-1/share/icons/hicolor/24x24/apps/tikzit.png and /dev/null differ diff --git a/tikzit-1/share/icons/hicolor/32x32/apps/tikzit.png b/tikzit-1/share/icons/hicolor/32x32/apps/tikzit.png deleted file mode 100644 index 75174e1..0000000 Binary files a/tikzit-1/share/icons/hicolor/32x32/apps/tikzit.png and /dev/null differ diff --git a/tikzit-1/share/icons/hicolor/32x32/mimetypes/text-x-tikz.png b/tikzit-1/share/icons/hicolor/32x32/mimetypes/text-x-tikz.png deleted file mode 100644 index 7faaded..0000000 Binary files a/tikzit-1/share/icons/hicolor/32x32/mimetypes/text-x-tikz.png and /dev/null differ diff --git a/tikzit-1/share/icons/hicolor/48x48/apps/tikzit.png b/tikzit-1/share/icons/hicolor/48x48/apps/tikzit.png deleted file mode 100644 index 7186458..0000000 Binary files a/tikzit-1/share/icons/hicolor/48x48/apps/tikzit.png and /dev/null differ diff --git a/tikzit-1/share/icons/hicolor/48x48/mimetypes/text-x-tikz.png b/tikzit-1/share/icons/hicolor/48x48/mimetypes/text-x-tikz.png deleted file mode 100644 index d061ed9..0000000 Binary files a/tikzit-1/share/icons/hicolor/48x48/mimetypes/text-x-tikz.png and /dev/null differ diff --git a/tikzit-1/share/icons/hicolor/64x64/apps/tikzit.png b/tikzit-1/share/icons/hicolor/64x64/apps/tikzit.png deleted file mode 100644 index 1641e85..0000000 Binary files a/tikzit-1/share/icons/hicolor/64x64/apps/tikzit.png and /dev/null differ diff --git a/tikzit-1/share/icons/hicolor/64x64/mimetypes/text-x-tikz.png b/tikzit-1/share/icons/hicolor/64x64/mimetypes/text-x-tikz.png deleted file mode 100644 index 2197553..0000000 Binary files a/tikzit-1/share/icons/hicolor/64x64/mimetypes/text-x-tikz.png and /dev/null differ diff --git a/tikzit-1/share/icons/hicolor/scalable/apps/tikzit.svg b/tikzit-1/share/icons/hicolor/scalable/apps/tikzit.svg deleted file mode 100644 index dc5cc84..0000000 --- a/tikzit-1/share/icons/hicolor/scalable/apps/tikzit.svg +++ /dev/null @@ -1,79 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/tikzit-1/share/icons/hicolor/scalable/mimetypes/text-x-tikz.svg b/tikzit-1/share/icons/hicolor/scalable/mimetypes/text-x-tikz.svg deleted file mode 100644 index 1642e87..0000000 --- a/tikzit-1/share/icons/hicolor/scalable/mimetypes/text-x-tikz.svg +++ /dev/null @@ -1,488 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - text - plaintext - regular - script - shell - bash - python - perl - php - ruby - - - - - - Jakub Steiner - - - http://jimmac.musichall.cz - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tikzit-1/share/mime/packages/tikzit.xml b/tikzit-1/share/mime/packages/tikzit.xml deleted file mode 100644 index c6e7c0c..0000000 --- a/tikzit-1/share/mime/packages/tikzit.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/tikzit-1/share/tikzit b/tikzit-1/share/tikzit deleted file mode 120000 index a96aa0e..0000000 --- a/tikzit-1/share/tikzit +++ /dev/null @@ -1 +0,0 @@ -.. \ No newline at end of file diff --git a/tikzit-1/src/Makefile.am b/tikzit-1/src/Makefile.am deleted file mode 100644 index 5108e9c..0000000 --- a/tikzit-1/src/Makefile.am +++ /dev/null @@ -1,178 +0,0 @@ -if WINDOWS -sharedir = ../ -else -sharedir = @datarootdir@/tikzit -endif - -AM_OBJCFLAGS = @FOUNDATION_OBJCFLAGS@ \ - @GTK_CFLAGS@ \ - -I common \ - -I gtk \ - -DTIKZITSHAREDIR=\"$(sharedir)\" \ - -std=c99 \ - -D_GNU_SOURCE -LIBS = @FOUNDATION_LIBS@ \ - @GTK_LIBS@ -AM_YFLAGS = -d -PARSERFILES = common/tikzlexer.m common/tikzlexer.h common/tikzparser.m common/tikzparser.h -ICONFILES = ../draw-ellipse.png \ - ../draw-path.png \ - ../select-rectangular.png \ - ../transform-crop-and-resize.png \ - ../transform-move.png -EDGEDECFILES = ../AH_*.png ../ED_*.png - -bin_PROGRAMS = tikzit -BUILT_SOURCES = $(PARSERFILES) -tikzit_SOURCES = gtk/Application.m \ - gtk/BoundingBoxTool.m \ - gtk/CairoRenderContext.m \ - gtk/ColorRGB+IntegerListStorage.m \ - gtk/ColorRGB+Gtk.m \ - gtk/Configuration.m \ - gtk/ContextWindow.m \ - gtk/CreateEdgeTool.m \ - gtk/CreateNodeTool.m \ - gtk/Edge+Render.m \ - gtk/EdgeStyle+Gtk.m \ - gtk/EdgeStyle+Storage.m \ - gtk/EdgeStyleEditor.m \ - gtk/EdgeStyleSelector.m \ - gtk/EdgeStylesModel.m \ - gtk/EdgeStylesPalette.m \ - gtk/FileChooserDialog.m \ - gtk/HandTool.m \ - gtk/GraphEditorPanel.m \ - gtk/GraphRenderer.m \ - gtk/Menu.m \ - gtk/Node+Render.m \ - gtk/NodeStyle+Gtk.m \ - gtk/NodeStyle+Storage.m \ - gtk/NodeStyleEditor.m \ - gtk/NodeStylesModel.m \ - gtk/NodeStyleSelector.m \ - gtk/NodeStylesPalette.m \ - gtk/NSError+Glib.m \ - gtk/NSFileManager+Glib.m \ - gtk/NSString+Glib.m \ - gtk/PropertiesPane.m \ - gtk/PropertyListEditor.m \ - gtk/RecentManager.m \ - gtk/SelectTool.m \ - gtk/SelectionPane.m \ - gtk/SettingsDialog.m \ - gtk/Shape+Render.m \ - gtk/StyleManager+Storage.m \ - gtk/TikzDocument.m \ - gtk/ToolBox.m \ - gtk/WidgetSurface.m \ - gtk/Window.m \ - gtk/cairo_helpers.m \ - gtk/clipboard.m \ - gtk/gtkhelpers.m \ - gtk/logo.m \ - gtk/mkdtemp.m \ - gtk/main.m \ - gtk/tzstockitems.m \ - gtk/tztoolpalette.m \ - common/CircleShape.m \ - common/ColorRGB.m \ - common/DiamondShape.m \ - common/Edge.m \ - common/EdgeStyle.m \ - common/GraphChange.m \ - common/GraphElementData.m \ - common/Graph.m \ - common/Grid.m \ - common/Node.m \ - common/NodeStyle.m \ - common/NSError+Tikzit.m \ - common/NSFileManager+Utils.m \ - common/NSString+LatexConstants.m \ - common/NSString+Tikz.m \ - common/NSString+Util.m \ - common/PickSupport.m \ - common/PropertyHolder.m \ - common/GraphElementProperty.m \ - common/RColor.m \ - common/RectangleShape.m \ - common/RegularPolyShape.m \ - common/Shape.m \ - common/StyleManager.m \ - common/SupportDir.m \ - common/TikzGraphAssembler.m \ - common/TikzShape.m \ - common/Transformer.m \ - common/tikzparser.m \ - common/tikzlexer.m \ - common/util.m - -if HAVE_POPPLER -tikzit_SOURCES += \ - common/Preambles.m \ - gtk/PreambleEditor.m \ - gtk/Preambles+Storage.m \ - gtk/PreviewRenderer.m \ - gtk/PreviewWindow.m -endif - -if WINDOWS -tikzit.res: tikzit.rc - $(AM_V_GEN)windres $^ -O coff -o $@ - -tikzit_LDADD = tikzit.res -CLEANFILES = tikzit.res -endif - -common/tikzlexer.m common/tikzlexer.h: common/tikzlexer.lm - $(AM_V_GEN)$(LEX) -o common/tikzlexer.m $^ -# ordering hack for parallel builds -common/tikzlexer.h: common/tikzlexer.m - -common/tikzparser.m common/tikzparser.h: common/tikzparser.ym - $(AM_V_GEN)$(YACC) --defines=common/tikzparser.h --output=common/tikzparser.m $^ -# ordering hack for parallel builds -common/tikzparser.h: common/tikzparser.m - -gtk/icondata.m: $(ICONFILES) - $(AM_V_GEN)gdk-pixbuf-csource --struct --static --raw --build-list \ - draw_ellipse ../draw-ellipse.png \ - draw_path ../draw-path.png \ - select_rectangular ../select-rectangular.png \ - transform_crop_and_resize ../transform-crop-and-resize.png \ - transform_move ../transform-move.png \ - > $@ - -gtk/logodata.m: ../share/icons/hicolor/*/apps/tikzit.png - $(AM_V_GEN)gdk-pixbuf-csource --struct --static --raw --build-list \ - logo16 ../share/icons/hicolor/16x16/apps/tikzit.png \ - logo24 ../share/icons/hicolor/24x24/apps/tikzit.png \ - logo32 ../share/icons/hicolor/32x32/apps/tikzit.png \ - logo48 ../share/icons/hicolor/48x48/apps/tikzit.png \ - logo64 ../share/icons/hicolor/64x64/apps/tikzit.png \ - logo128 ../share/icons/hicolor/128x128/apps/tikzit.png \ - > $@ - -gtk/edgedecdata.m: $(EDGEDECFILES) - $(AM_V_GEN)gdk-pixbuf-csource --struct --static --raw --build-list \ - AH_none_pixdata ../AH_none.png \ - AH_latex_head_pixdata ../AH_latex_head.png \ - AH_latex_tail_pixdata ../AH_latex_tail.png \ - AH_plain_head_pixdata ../AH_plain_head.png \ - AH_plain_tail_pixdata ../AH_plain_tail.png \ - ED_none_pixdata ../ED_none.png \ - ED_arrow_pixdata ../ED_arrow.png \ - ED_tick_pixdata ../ED_tick.png \ - > $@ - -gtk/Menu.m: gtk/icondata.m -gtk/logo.m: gtk/logodata.m -gtk/EdgeStyleEditor.m: gtk/edgedecdata.m - -EXTRA_DIST = gtk/*.h common/*.h \ - $(PARSERFILES) common/tikzlexer.lm common/tikzparser.ym \ - $(ICONFILES) gtk/icondata.m \ - gtk/logodata.m \ - $(EDGEDECFILES) gtk/edgedecdata.m \ - tikzit.rc ../tikzit.ico -MAINTAINERCLEANFILES = $(PARSERFILES) gtk/icondata.m gtk/logodata.m gtk/edgedecdata.m diff --git a/tikzit-1/src/common/CircleShape.h b/tikzit-1/src/common/CircleShape.h deleted file mode 100644 index 8215b92..0000000 --- a/tikzit-1/src/common/CircleShape.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// CircleShape.h -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "Shape.h" - -@interface CircleShape : Shape { -} - - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/CircleShape.m b/tikzit-1/src/common/CircleShape.m deleted file mode 100644 index f2d1d52..0000000 --- a/tikzit-1/src/common/CircleShape.m +++ /dev/null @@ -1,57 +0,0 @@ -// -// CircleShape.m -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "CircleShape.h" -#import "Node.h" -#import "Edge.h" - -@implementation CircleShape - -- (id)init { - self = [super init]; - if (self) { - Node *n0,*n1,*n2,*n3; - - n0 = [Node nodeWithPoint:NSMakePoint( 0.0f, 0.2f)]; - n1 = [Node nodeWithPoint:NSMakePoint( 0.2f, 0.0f)]; - n2 = [Node nodeWithPoint:NSMakePoint( 0.0f, -0.2f)]; - n3 = [Node nodeWithPoint:NSMakePoint(-0.2f, 0.0f)]; - - Edge *e0,*e1,*e2,*e3; - - e0 = [Edge edgeWithSource:n0 andTarget:n1]; [e0 setBend:-45]; - e1 = [Edge edgeWithSource:n1 andTarget:n2]; [e1 setBend:-45]; - e2 = [Edge edgeWithSource:n2 andTarget:n3]; [e2 setBend:-45]; - e3 = [Edge edgeWithSource:n3 andTarget:n0]; [e3 setBend:-45]; - - paths = [[NSSet alloc] initWithObjects:[NSArray arrayWithObjects:e0,e1,e2,e3,nil],nil]; - - styleTikz = @"circle"; - } - return self; -} - - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/ColorRGB.h b/tikzit-1/src/common/ColorRGB.h deleted file mode 100644 index 607ba64..0000000 --- a/tikzit-1/src/common/ColorRGB.h +++ /dev/null @@ -1,64 +0,0 @@ -// -// ColorRGB.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "RColor.h" - -@interface ColorRGB : NSObject { - unsigned short red, green, blue; -} - -@property (assign) unsigned short red; -@property (assign) unsigned short green; -@property (assign) unsigned short blue; - -@property (assign) float redFloat; -@property (assign) float greenFloat; -@property (assign) float blueFloat; - -@property (readonly) NSString *name; - -- (RColor)rColor; -- (RColor)rColorWithAlpha:(CGFloat)alpha; - -- (NSString*)hexName; -- (BOOL)isEqual:(id)col; -- (float)distanceFromColor:(ColorRGB*)col; -- (int)hash; - -- (id)initWithRed:(unsigned short)r green:(unsigned short)g blue:(unsigned short)b; -- (id)initWithFloatRed:(float)r green:(float)g blue:(float)b; -- (id)initWithRColor:(RColor)color; - -- (void)setToClosestHashed; - -+ (ColorRGB*)colorWithRed:(unsigned short)r green:(unsigned short)g blue:(unsigned short)b; -+ (ColorRGB*)colorWithFloatRed:(float)r green:(float)g blue:(float)b; -+ (ColorRGB*)colorWithRColor:(RColor)color; - -+ (void)makeColorHash; -+ (void)releaseColorHash; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/ColorRGB.m b/tikzit-1/src/common/ColorRGB.m deleted file mode 100644 index 840d716..0000000 --- a/tikzit-1/src/common/ColorRGB.m +++ /dev/null @@ -1,353 +0,0 @@ -// -// ColorRGB.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "ColorRGB.h" -#import "util.h" - -typedef struct { -#if __has_feature(objc_arc) - __unsafe_unretained NSString *name; -#else - NSString *name; -#endif - unsigned short r, g, b; -} ColorRGBEntry; - -static const ColorRGBEntry kColors[147] = { - { @"AliceBlue", 240, 248, 255 }, - { @"AntiqueWhite", 250, 235, 215 }, - { @"Aqua", 0, 255, 255 }, - { @"Aquamarine", 127, 255, 212 }, - { @"Azure", 240, 255, 255 }, - { @"Beige", 245, 245, 220 }, - { @"Bisque", 255, 228, 196 }, - { @"Black", 0, 0, 0 }, - { @"BlanchedAlmond", 255, 235, 205 }, - { @"Blue", 0, 0, 255 }, - { @"BlueViolet", 138, 43, 226 }, - { @"Brown", 165, 42, 42 }, - { @"BurlyWood", 222, 184, 135 }, - { @"CadetBlue", 95, 158, 160 }, - { @"Chartreuse", 127, 255, 0 }, - { @"Chocolate", 210, 105, 30 }, - { @"Coral", 255, 127, 80 }, - { @"CornflowerBlue", 100, 149, 237 }, - { @"Cornsilk", 255, 248, 220 }, - { @"Crimson", 220, 20, 60 }, - { @"Cyan", 0, 255, 255 }, - { @"DarkBlue", 0, 0, 139 }, - { @"DarkCyan", 0, 139, 139 }, - { @"DarkGoldenrod", 184, 134, 11 }, - { @"DarkGray", 169, 169, 169 }, - { @"DarkGreen", 0, 100, 0 }, - { @"DarkGrey", 169, 169, 169 }, - { @"DarkKhaki", 189, 183, 107 }, - { @"DarkMagenta", 139, 0, 139 }, - { @"DarkOliveGreen", 85, 107, 47 }, - { @"DarkOrange", 255, 140, 0 }, - { @"DarkOrchid", 153, 50, 204 }, - { @"DarkRed", 139, 0, 0 }, - { @"DarkSalmon", 233, 150, 122 }, - { @"DarkSeaGreen", 143, 188, 143 }, - { @"DarkSlateBlue", 72, 61, 139 }, - { @"DarkSlateGray", 47, 79, 79 }, - { @"DarkSlateGrey", 47, 79, 79 }, - { @"DarkTurquoise", 0, 206, 209 }, - { @"DarkViolet", 148, 0, 211 }, - { @"DeepPink", 255, 20, 147 }, - { @"DeepSkyBlue", 0, 191, 255 }, - { @"DimGray", 105, 105, 105 }, - { @"DimGrey", 105, 105, 105 }, - { @"DodgerBlue", 30, 144, 255 }, - { @"FireBrick", 178, 34, 34 }, - { @"FloralWhite", 255, 250, 240 }, - { @"ForestGreen", 34, 139, 34 }, - { @"Fuchsia", 255, 0, 255 }, - { @"Gainsboro", 220, 220, 220 }, - { @"GhostWhite", 248, 248, 255 }, - { @"Gold", 255, 215, 0 }, - { @"Goldenrod", 218, 165, 32 }, - { @"Gray", 128, 128, 128 }, - { @"Grey", 128, 128, 128 }, - { @"Green", 0, 128, 0 }, - { @"GreenYellow", 173, 255, 47 }, - { @"Honeydew", 240, 255, 240 }, - { @"HotPink", 255, 105, 180 }, - { @"IndianRed", 205, 92, 92 }, - { @"Indigo", 75, 0, 130 }, - { @"Ivory", 255, 255, 240 }, - { @"Khaki", 240, 230, 140 }, - { @"Lavender", 230, 230, 250 }, - { @"LavenderBlush", 255, 240, 245 }, - { @"LawnGreen", 124, 252, 0 }, - { @"LemonChiffon", 255, 250, 205 }, - { @"LightBlue", 173, 216, 230 }, - { @"LightCoral", 240, 128, 128 }, - { @"LightCyan", 224, 255, 255 }, - { @"LightGoldenrodYellow", 250, 250, 210 }, - { @"LightGray", 211, 211, 211 }, - { @"LightGreen", 144, 238, 144 }, - { @"LightGrey", 211, 211, 211 }, - { @"LightPink", 255, 182, 193 }, - { @"LightSalmon", 255, 160, 122 }, - { @"LightSeaGreen", 32, 178, 170 }, - { @"LightSkyBlue", 135, 206, 250 }, - { @"LightSlateGray", 119, 136, 153 }, - { @"LightSlateGrey", 119, 136, 153 }, - { @"LightSteelBlue", 176, 196, 222 }, - { @"LightYellow", 255, 255, 224 }, - { @"Lime", 0, 255, 0 }, - { @"LimeGreen", 50, 205, 50 }, - { @"Linen", 250, 240, 230 }, - { @"Magenta", 255, 0, 255 }, - { @"Maroon", 128, 0, 0 }, - { @"MediumAquamarine", 102, 205, 170 }, - { @"MediumBlue", 0, 0, 205 }, - { @"MediumOrchid", 186, 85, 211 }, - { @"MediumPurple", 147, 112, 219 }, - { @"MediumSeaGreen", 60, 179, 113 }, - { @"MediumSlateBlue", 123, 104, 238 }, - { @"MediumSpringGreen", 0, 250, 154 }, - { @"MediumTurquoise", 72, 209, 204 }, - { @"MediumVioletRed", 199, 21, 133 }, - { @"MidnightBlue", 25, 25, 112 }, - { @"MintCream", 245, 255, 250 }, - { @"MistyRose", 255, 228, 225 }, - { @"Moccasin", 255, 228, 181 }, - { @"NavajoWhite", 255, 222, 173 }, - { @"Navy", 0, 0, 128 }, - { @"OldLace", 253, 245, 230 }, - { @"Olive", 128, 128, 0 }, - { @"OliveDrab", 107, 142, 35 }, - { @"Orange", 255, 165, 0 }, - { @"OrangeRed", 255, 69, 0 }, - { @"Orchid", 218, 112, 214 }, - { @"PaleGoldenrod", 238, 232, 170 }, - { @"PaleGreen", 152, 251, 152 }, - { @"PaleTurquoise", 175, 238, 238 }, - { @"PaleVioletRed", 219, 112, 147 }, - { @"PapayaWhip", 255, 239, 213 }, - { @"PeachPuff", 255, 218, 185 }, - { @"Peru", 205, 133, 63 }, - { @"Pink", 255, 192, 203 }, - { @"Plum", 221, 160, 221 }, - { @"PowderBlue", 176, 224, 230 }, - { @"Purple", 128, 0, 128 }, - { @"Red", 255, 0, 0 }, - { @"RosyBrown", 188, 143, 143 }, - { @"RoyalBlue", 65, 105, 225 }, - { @"SaddleBrown", 139, 69, 19 }, - { @"Salmon", 250, 128, 114 }, - { @"SandyBrown", 244, 164, 96 }, - { @"SeaGreen", 46, 139, 87 }, - { @"Seashell", 255, 245, 238 }, - { @"Sienna", 160, 82, 45 }, - { @"Silver", 192, 192, 192 }, - { @"SkyBlue", 135, 206, 235 }, - { @"SlateBlue", 106, 90, 205 }, - { @"SlateGray", 112, 128, 144 }, - { @"SlateGrey", 112, 128, 144 }, - { @"Snow", 255, 250, 250 }, - { @"SpringGreen", 0, 255, 127 }, - { @"SteelBlue", 70, 130, 180 }, - { @"Tan", 210, 180, 140 }, - { @"Teal", 0, 128, 128 }, - { @"Thistle", 216, 191, 216 }, - { @"Tomato", 255, 99, 71 }, - { @"Turquoise", 64, 224, 208 }, - { @"Violet", 238, 130, 238 }, - { @"Wheat", 245, 222, 179 }, - { @"White", 255, 255, 255 }, - { @"WhiteSmoke", 245, 245, 245 }, - { @"Yellow", 255, 255, 0 }, - { @"YellowGreen", 154, 205, 50 } -}; - -static NSMapTable *colorHash = nil; - -@implementation ColorRGB - -+ (void)initialize { - [self setKeys:[NSArray arrayWithObject:@"red"] triggerChangeNotificationsForDependentKey:@"redFloat"]; - [self setKeys:[NSArray arrayWithObject:@"green"] triggerChangeNotificationsForDependentKey:@"greenFloat"]; - [self setKeys:[NSArray arrayWithObject:@"blue"] triggerChangeNotificationsForDependentKey:@"blueFloat"]; - [self setKeys:[NSArray arrayWithObjects:@"red", @"green", @"blue", nil] - triggerChangeNotificationsForDependentKey:@"name"]; -} - -@synthesize red, green, blue; - -- (float)redFloat { return ((float)red)/255.0f; } -- (void)setRedFloat:(float)r { [self setRed:round(r*255.0f)]; } -- (float)greenFloat { return ((float)green)/255.0f; } -- (void)setGreenFloat:(float)g { [self setGreen:round(g*255.0f)]; } -- (float)blueFloat { return ((float)blue)/255.0f; } -- (void)setBlueFloat:(float)b { [self setBlue:round(b*255.0f)]; } - -- (int)hash { - return (red<<4) + (green<<2) + blue; -} - -- (id)initWithRed:(unsigned short)r green:(unsigned short)g blue:(unsigned short)b { - self = [super init]; - if (self) { - red = r; - green = g; - blue = b; - } - return self; -} - -- (id)initWithFloatRed:(float)r green:(float)g blue:(float)b { - self = [super init]; - if (self) { - red = round(r*255.0f); - green = round(g*255.0f); - blue = round(b*255.0f); - } - return self; -} - -- (id) initWithRColor:(RColor)color { - return [self initWithFloatRed:color.red green:color.green blue:color.blue]; -} - -- (RColor) rColor { - return MakeSolidRColor ([self redFloat], [self greenFloat], [self blueFloat]); -} - -- (RColor) rColorWithAlpha:(CGFloat)alpha { - return MakeRColor ([self redFloat], [self greenFloat], [self blueFloat], alpha); -} - -- (NSString*)name { - if (colorHash == nil) - [ColorRGB makeColorHash]; - return [colorHash objectForKey:self]; -} - -- (NSString*)hexName { - return [NSString stringWithFormat:@"hexcolor0x%.2x%.2x%.2x", red, green, blue]; -} - -- (NSComparisonResult)compare:(ColorRGB*)col { - if (red > [col red]) return NSOrderedDescending; - else if (red < [col red]) return NSOrderedAscending; - else { - if (green > [col green]) return NSOrderedDescending; - else if (green < [col green]) return NSOrderedAscending; - else { - if (blue > [col blue]) return NSOrderedDescending; - else if (blue < [col blue]) return NSOrderedAscending; - else return NSOrderedSame; - } - } -} - -- (BOOL)isEqual:(id)col { - return [self compare:col] == NSOrderedSame; -} - -- (float)distanceFromColor:(ColorRGB *)col { - float dr = (float)(red - [col red]); - float dg = (float)(green - [col green]); - float db = (float)(blue - [col blue]); - return dr*dr + dg*dg + db*db; -} - -- (id)copyWithZone:(NSZone*)zone { - ColorRGB *col = [[ColorRGB allocWithZone:zone] initWithRed:red green:green blue:blue]; - return col; -} - -+ (ColorRGB*)colorWithRed:(unsigned short)r green:(unsigned short)g blue:(unsigned short)b { - ColorRGB *col = [[ColorRGB alloc] initWithRed:r green:g blue:b]; -#if __has_feature(objc_arc) - return col; -#else - return [col autorelease]; -#endif -} - - -+ (ColorRGB*)colorWithFloatRed:(float)r green:(float)g blue:(float)b { - ColorRGB *col = [[ColorRGB alloc] initWithFloatRed:r green:g blue:b]; -#if __has_feature(objc_arc) - return col; -#else - return [col autorelease]; -#endif -} - -+ (ColorRGB*) colorWithRColor:(RColor)color { -#if __has_feature(objc_arc) - return [[self alloc] initWithRColor:color]; -#else - return [[[self alloc] initWithRColor:color] autorelease]; -#endif -} - -+ (void)makeColorHash { - NSMapTable *h = [[NSMapTable alloc] init]; - int i; - for (i = 0; i < 147; ++i) { - ColorRGB *col = [[ColorRGB alloc] initWithRed:kColors[i].r - green:kColors[i].g - blue:kColors[i].b]; - [h setObject:kColors[i].name forKey:col]; - //NSLog(@"adding color %@ (%d)", kColors[i].name, [col hash]); -#if ! __has_feature(objc_arc) - [col release]; -#endif - } - colorHash = h; -} - -+ (void)releaseColorHash { -#if ! __has_feature(objc_arc) - [colorHash release]; -#endif -} - -- (void)setToClosestHashed { - if (colorHash == nil) - [ColorRGB makeColorHash]; - float bestDist = -1; - ColorRGB *bestColor = nil; - NSEnumerator *enumerator = [colorHash keyEnumerator]; - ColorRGB *tryColor; - while ((tryColor = [enumerator nextObject]) != nil) { - float dist = [self distanceFromColor:tryColor]; - if (bestDist<0 || dist. -// - -#import -#import "Shape.h" - -@interface DiamondShape : Shape { -} - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 - diff --git a/tikzit-1/src/common/DiamondShape.m b/tikzit-1/src/common/DiamondShape.m deleted file mode 100644 index 1a578b8..0000000 --- a/tikzit-1/src/common/DiamondShape.m +++ /dev/null @@ -1,63 +0,0 @@ -// -// DiamondShape.m -// TikZiT -// -// Copyright 2011 Aleks Kissinger -// Copyright 2012 Alex Merry -// All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "DiamondShape.h" - -#import "Node.h" -#import "Edge.h" - -@implementation DiamondShape - -- (id)init { - self = [super init]; - - if (!self) - return nil; - - Node *n0,*n1,*n2,*n3; - float sz = 0.25f; - - n0 = [Node nodeWithPoint:NSMakePoint(0, sz)]; - n1 = [Node nodeWithPoint:NSMakePoint(sz, 0)]; - n2 = [Node nodeWithPoint:NSMakePoint(0,-sz)]; - n3 = [Node nodeWithPoint:NSMakePoint(-sz,0)]; - - Edge *e0,*e1,*e2,*e3; - - e0 = [Edge edgeWithSource:n0 andTarget:n1]; - e1 = [Edge edgeWithSource:n1 andTarget:n2]; - e2 = [Edge edgeWithSource:n2 andTarget:n3]; - e3 = [Edge edgeWithSource:n3 andTarget:n0]; - - paths = [[NSSet alloc] initWithObjects:[NSArray arrayWithObjects:e0,e1,e2,e3,nil],nil]; - - styleTikz = @"shape=diamond"; - - return self; -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/Edge.h b/tikzit-1/src/common/Edge.h deleted file mode 100644 index accf38c..0000000 --- a/tikzit-1/src/common/Edge.h +++ /dev/null @@ -1,401 +0,0 @@ -// -// Edge.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - - -// Edge : store the data associated with an edge. Also, lazily compute -// bezier curve control points based on bend and the coordinates of -// the endpoints. - -#import "Node.h" -#import "EdgeStyle.h" - -/*! - @typedef enum EdgeBendMode - @brief Indicates the type of edge bend. - @var EdgeBendModeBasic A basic, one-angle bend. Positive values will be interpreted - as bend left, negative as bend right. - @var EdgeBendModeInOut A two-angle bend mode, using inAngle and outAngle. - */ -typedef enum { - EdgeBendModeBasic, - EdgeBendModeInOut -} EdgeBendMode; - -/*! - @class Edge - @brief A graph edge, with associated bend and style data. - @details A graph edge, with associated bend and style data. This class - also contains methods for computing the bezier control points - and the midpoint of the curve. - */ -@interface Edge : NSObject { - Node *source; - Node *target; - Node *edgeNode; - int bend; - int inAngle, outAngle; - EdgeBendMode bendMode; - float weight; - EdgeStyle *style; - GraphElementData *data; - NSString *sourceAnchor; - NSString *targetAnchor; - - // When set to YES, lazily create the edge node, and keep it around when set - // to NO (at least until saved/loaded). - BOOL hasEdgeNode; - BOOL dirty; - - // these are all cached values computed from the above - NSPoint src; - NSPoint targ; - NSPoint head; - NSPoint tail; - NSPoint cp1; - NSPoint cp2; - NSPoint mid; - NSPoint midTan; - NSPoint headTan; - NSPoint tailTan; -} - -/*! - @property data - @brief Associated edge data. - */ -@property (copy) GraphElementData *data; - -// KVC methods -- (void) insertObject:(GraphElementProperty*)gep - inDataAtIndex:(NSUInteger)index; -- (void) removeObjectFromDataAtIndex:(NSUInteger)index; -- (void) replaceObjectInDataAtIndex:(NSUInteger)index - withObject:(GraphElementProperty*)gep; - -/*! - @property style - @brief Edge style. - */ -@property (retain) EdgeStyle *style; - -/*! - @property source - @brief Source node. - */ -@property (retain) Node *source; - -/*! - @property target - @brief Target node. - */ -@property (retain) Node *target; - -/*! - @property edgeNode - @brief A node attached to this edge, as in a label or tick. - */ -@property (retain) Node *edgeNode; - -/*! - @property sourceAnchor - @brief The source node anchor point, as in north or center. - */ -@property (copy) NSString *sourceAnchor; - -/*! - @property targetAnchor - @brief The target node anchor point, as in north or center. - */ -@property (copy) NSString *targetAnchor; - -/*! - @property hasEdgeNode - @brief A read/write property. When set to true, a new edge node is actually constructed. -*/ -@property (assign) BOOL hasEdgeNode; - -/*! - @property bend - @brief The degrees by which the edge bends. - */ -@property (assign) int bend; - -/*! - @property weight - @brief How close the edge will pass to control points. - */ -@property (assign) float weight; - -/*! - @property inAngle - @brief The angle by which the edge enters its target. - */ -@property (assign) int inAngle; - -/*! - @property outAngle - @brief The angle by which the edge leaves its target. - */ -@property (assign) int outAngle; - -/*! - @property bendMode - @brief The mode of the edge bend. Either simple bend in in/out style. - */ -@property (assign) EdgeBendMode bendMode; - -/*! - @property head - @brief The starting point of the edge. - @detail This value is computed based on the source, target and - either bend or in/out angles. It is where the edge - makes contact with the source node. - */ -@property (readonly) NSPoint head; - -/*! - @property tail - @brief The ending point of the edge. - @detail This value is computed based on the source, target and - either bend or in/out angles. It is where the edge - makes contact with the target node. - */ -@property (readonly) NSPoint tail; - -/*! - @property cp1 - @brief The first control point of the edge. - @detail This value is computed based on the source, target and - either bend or in/out angles. - */ -@property (readonly) NSPoint cp1; - -/*! - @property cp2 - @brief The second control point of the edge. - @detail This value is computed based on the source, target and - either bend or in/out angles. - */ -@property (readonly) NSPoint cp2; - -/*! - @property mid - @brief The midpoint of the curve. Computed from the source, target, and control points. - */ -@property (readonly) NSPoint mid; - -/*! - @property mid_tan - @brief The second point of a line tangent to the midpoint. (The first is the midpoint itself.) - */ -@property (readonly) NSPoint midTan; - -/*! - @property left_normal - @brief The second point in a line perp. to the edge coming from mid-point. (left side) - */ -@property (readonly) NSPoint leftNormal; - -/*! - @property left_normal - @brief The second point in a line perp. to the edge coming from mid-point. (right side) - */ -@property (readonly) NSPoint rightNormal; - -@property (readonly) NSPoint headTan; - -/*! - @property leftHeadNormal - */ -@property (readonly) NSPoint leftHeadNormal; - -/*! - @property rightHeadNormal - */ -@property (readonly) NSPoint rightHeadNormal; - -@property (readonly) NSPoint tailTan; - -/*! - @property leftTailNormal - */ -@property (readonly) NSPoint leftTailNormal; - -/*! - @property rightTailNormal - */ -@property (readonly) NSPoint rightTailNormal; - -/*! - @property isSelfLoop - @brief Returns YES if this edge is a self loop. - */ -@property (readonly) BOOL isSelfLoop; - -/*! - @property isStraight - @brief Returns YES if this edge can be drawn as a straight line (as opposed to a bezier curve). - */ -@property (readonly) BOOL isStraight; - - -/*! - @brief Construct a blank edge. - @result An edge. - */ -- (id)init; - -/*! - @brief Construct an edge with the given source and target. - @param s the source node. - @param t the target node. - @result An edge. - */ -- (id)initWithSource:(Node*)s andTarget:(Node*)t; - -/*! - @brief Force the recalculation of the derived properties. - */ -- (void)recalculateProperties; - -/*! - @brief Recompute the control points and midpoint. - */ -- (void)updateControls; - -/*! - @brief Push edge properties back into its GraphElementData. - */ -- (void)updateData; - -/*! - @brief Set edge properties from fields in GraphElementData. - */ -- (void)setAttributesFromData; - -/*! - @brief Use data.style to find and attach the EdgeStyle object from the given array. - */ -- (BOOL)attachStyleFromTable:(NSArray*)styles; - -/*! - @brief Convert the bend angle to an inAngle and outAngle. - */ -- (void)convertBendToAngles; - -/*! - @brief Set the bend angle to the average of the in and out angles. - */ -- (void)convertAnglesToBend; - -/*! - @brief Update this edge to look just like the given edge. - @param e an edge to mimic. - */ -- (void)setPropertiesFromEdge:(Edge *)e; - -/*! - @brief Get a bounding rect for this edge. - @detail Note that this may not be a tight bound. - */ -- (NSRect)boundingRect; - -/*! - @brief Moves the first control point, updating edge properties as necessary - @detail This will move a control point and adjust the weight and - bend (or outAngle) to fit. - - A courseness can be specified for both the weight and the - bend, allowing them to be constrained to certain values. For - example, passing 10 as the bend courseness will force the bend - to be a multiple of 5. Passing 0 for either of these will - cause the relevant value to be unconstrained. - @param point the new position of the control point - @param wc force the weight to be a multiple of this value (unless 0) - @param bc force the bend (or outAngle) to be a multiple of this value (unless 0) - @param link when in EdgeBendModeInOut, change both the in and out angles at once - */ -- (void) moveCp1To:(NSPoint)point withWeightCourseness:(float)wc andBendCourseness:(int)bc forceLinkControlPoints:(BOOL)link; - -/*! - @brief Moves the first control point, updating edge properties as necessary - @detail This will move a control point and adjust the weight and - bend (or outAngle) to fit. - - The same as moveCp1To:point withWeightCourseness:0.0f andBendCourseness:0 forceLinkControlPoints:No - @param point the new position of the control point - @param wc force the weight to be a multiple of this value (unless 0) - @param bc force the bend (or outAngle) to be a multiple of this value (unless 0) - @param link when in EdgeBendModeInOut, change both the in and out angles at once - */ -- (void) moveCp1To:(NSPoint)point; - -/*! - @brief Moves the first control point, updating edge properties as necessary - @detail This will move a control point and adjust the weight and - bend (or inAngle) to fit. - - A courseness can be specified for both the weight and the - bend, allowing them to be constrained to certain values. For - example, passing 10 as the bend courseness will force the bend - to be a multiple of 5. Passing 0 for either of these will - cause the relevant value to be unconstrained. - @param point the new position of the control point - @param wc force the weight to be a multiple of this value (unless 0) - @param bc force the bend (or inAngle) to be a multiple of this value (unless 0) - @param link when in EdgeBendModeInOut, change both the in and out angles at once - */ -- (void) moveCp2To:(NSPoint)point withWeightCourseness:(float)wc andBendCourseness:(int)bc forceLinkControlPoints:(BOOL)link; - -/*! - @brief Moves the first control point, updating edge properties as necessary - @detail This will move a control point and adjust the weight and - bend (or inAngle) to fit. - - The same as moveCp2To:point withWeightCourseness:0.0f andBendCourseness:0 forceLinkControlPoints:No - @param point the new position of the control point - */ -- (void) moveCp2To:(NSPoint)point; - -/*! - @brief Reverse edge direction, updating bend/inAngle/outAngle/etc - */ -- (void)reverse; - -/*! - @brief Factory method to make a blank edge. - @result An edge. - */ -+ (Edge*)edge; - -/*! - @brief Factory method to make an edge with the given source and target. - @param s a source node. - @param t a target node. - @result An edge. - */ -+ (Edge*)edgeWithSource:(Node*)s andTarget:(Node*)t; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/Edge.m b/tikzit-1/src/common/Edge.m deleted file mode 100644 index 0c88e9d..0000000 --- a/tikzit-1/src/common/Edge.m +++ /dev/null @@ -1,757 +0,0 @@ -// -// Edge.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "Edge.h" -#import "Shape.h" -#import "util.h" - -@implementation Edge - -- (id)init { - self = [super init]; - if (self) { - data = [[GraphElementData alloc] init]; - bend = 0; - inAngle = 135; - outAngle = 45; - bendMode = EdgeBendModeBasic; - weight = 0.4f; - dirty = YES; - source = nil; - target = nil; - edgeNode = nil; - sourceAnchor = @""; - targetAnchor = @""; - } - return self; -} - -- (id)initWithSource:(Node*)s andTarget:(Node*)t { - self = [self init]; - if (self) { - [self setSource:s]; - [self setTarget:t]; - edgeNode = nil; - - dirty = YES; - } - return self; -} - -- (BOOL)attachStyleFromTable:(NSArray*)styles { - NSString *style_name = [data propertyForKey:@"style"]; - - [self setStyle:nil]; - if (style_name == nil) return YES; - - for (EdgeStyle *s in styles) { - if ([[s name] compare:style_name]==NSOrderedSame) { - [self setStyle:s]; - return YES; - } - } - - // if we didn't find a style, fill in a default one -#if __has_feature(objc_arc) - style = [EdgeStyle defaultEdgeStyleWithName:style_name]; -#else - style = [[EdgeStyle defaultEdgeStyleWithName:style_name] retain]; -#endif - return NO; -} - -- (NSPoint) _findContactPointOn:(Node*)node at:(float)angle { - NSPoint rayStart = [node point]; - Shape *shape = [node shape]; - if (shape == nil) { - return rayStart; - } - - Transformer *shapeTrans = [node shapeTransformer]; - // rounding errors are a pain - NSRect searchArea = NSInsetRect([node boundsUsingShapeTransform:shapeTrans],-0.01,-0.01); - if (!NSPointInRect(rayStart, searchArea)) { - return rayStart; - } - - NSPoint rayEnd = findExitPointOfRay (rayStart, angle, searchArea); - - for (NSArray *path in [shape paths]) { - for (Edge *curve in path) { - NSPoint intersect; - [curve updateControls]; - if (lineSegmentIntersectsBezier (rayStart, rayEnd, - [shapeTrans toScreen:curve->tail], - [shapeTrans toScreen:curve->cp1], - [shapeTrans toScreen:curve->cp2], - [shapeTrans toScreen:curve->head], - &intersect)) { - // we just keep shortening the line - rayStart = intersect; - } - } - } - - return rayStart; -} - -- (NSPoint) _findTanFor:(NSPoint)pt usingSpanFrom:(float)t1 to:(float)t2 { - float dx = bezierInterpolate(t2, tail.x, cp1.x, cp2.x, head.x) - - bezierInterpolate(t1, tail.x, cp1.x, cp2.x, head.x); - float dy = bezierInterpolate(t2, tail.y, cp1.y, cp2.y, head.y) - - bezierInterpolate(t1, tail.y, cp1.y, cp2.y, head.y); - - // normalise - float len = sqrt(dx*dx+dy*dy); - if (len != 0) { - dx = (dx/len) * 0.1f; - dy = (dy/len) * 0.1f; - } - - return NSMakePoint (pt.x + dx, pt.y + dy); -} - -- (void)recalculateProperties { - dirty = YES; -} - -- (void)updateControls { - // check for external modification to the node locations - if (src.x != [source point].x || src.y != [source point].y || - targ.x != [target point].x || targ.y != [target point].y) - { - dirty = YES; - } - - if (dirty) { - src = [source point]; - targ = [target point]; - - float dx = (targ.x - src.x); - float dy = (targ.y - src.y); - - float angleSrc = 0.0f; - float angleTarg = 0.0f; - - if (bendMode == EdgeBendModeBasic) { - float angle = good_atan(dx, dy); - float bnd = (float)bend * (M_PI / 180.0f); - angleSrc = angle - bnd; - angleTarg = M_PI + angle + bnd; - } else if (bendMode == EdgeBendModeInOut) { - angleSrc = (float)outAngle * (M_PI / 180.0f); - angleTarg = (float)inAngle * (M_PI / 180.0f); - } - - tail = [self _findContactPointOn:source at:angleSrc]; - head = [self _findContactPointOn:target at:angleTarg]; - - // give a default distance for self-loops - float cdist = (dx==0.0f && dy==0.0f) ? weight : sqrt(dx*dx + dy*dy) * weight; - - cp1 = NSMakePoint(src.x + (cdist * cos(angleSrc)), - src.y + (cdist * sin(angleSrc))); - - cp2 = NSMakePoint(targ.x + (cdist * cos(angleTarg)), - targ.y + (cdist * sin(angleTarg))); - - mid = bezierInterpolateFull (0.5f, tail, cp1, cp2, head); - midTan = [self _findTanFor:mid usingSpanFrom:0.4f to:0.6f]; - - tailTan = [self _findTanFor:tail usingSpanFrom:0.0f to:0.1f]; - headTan = [self _findTanFor:head usingSpanFrom:1.0f to:0.9f]; - } - dirty = NO; -} - -- (void)convertBendToAngles { - float dx = (targ.x - src.x); - float dy = (targ.y - src.y); - float angle = good_atan(dx, dy); - float bnd = (float)bend * (M_PI / 180.0f); - - [self setOutAngle:round((angle - bnd) * (180.0f/M_PI))]; - [self setInAngle:round((M_PI + angle + bnd) * (180.0f/M_PI))]; - dirty = YES; -} - -- (void)convertAnglesToBend { - float dx = (targ.x - src.x); - float dy = (targ.y - src.y); - int angle = round((180.0f/M_PI) * good_atan(dx, dy)); - - // compute bend1 and bend2 to match inAngle and outAngle, resp. - int bend1, bend2; - - bend1 = outAngle - angle; - bend2 = angle - inAngle; - - [self setBend:(bend1 + bend2) / 2]; -} - -- (BOOL)isSelfLoop { - return (source == target); -} - -- (BOOL)isStraight { - return (bendMode == EdgeBendModeBasic && bend == 0); -} - -- (NSPoint)mid { - [self updateControls]; - return mid; -} - -- (NSPoint)midTan { - [self updateControls]; - return midTan; -} - -- (NSPoint)leftNormal { - [self updateControls]; - return NSMakePoint(mid.x + (mid.y - midTan.y), mid.y - (mid.x - midTan.x)); -} - -- (NSPoint)rightNormal { - [self updateControls]; - return NSMakePoint(mid.x - (mid.y - midTan.y), mid.y + (mid.x - midTan.x)); -} - -- (NSPoint)headTan { - [self updateControls]; - return headTan; -} - -- (NSPoint)leftHeadNormal { - [self updateControls]; - return NSMakePoint(headTan.x + (head.y - headTan.y), headTan.y - (head.x - headTan.x)); -} - -- (NSPoint)rightHeadNormal { - [self updateControls]; - return NSMakePoint(headTan.x - (head.y - headTan.y), headTan.y + (head.x - headTan.x)); -} - -- (NSPoint)tailTan { - [self updateControls]; - return tailTan; -} - -- (NSPoint)leftTailNormal { - [self updateControls]; - return NSMakePoint(tailTan.x + (tail.y - tailTan.y), tailTan.y - (tail.x - tailTan.x)); -} - -- (NSPoint)rightTailNormal { - [self updateControls]; - return NSMakePoint(tailTan.x - (tail.y - tailTan.y), tailTan.y + (tail.x - tailTan.x)); -} - -- (NSPoint) head { - [self updateControls]; - return head; -} - -- (NSPoint) tail { - [self updateControls]; - return tail; -} - -- (NSPoint)cp1 { - [self updateControls]; - return cp1; -} - -- (NSPoint)cp2 { - [self updateControls]; - return cp2; -} - -- (int)inAngle {return inAngle;} -- (void)setInAngle:(int)a { - inAngle = normaliseAngleDeg (a); - dirty = YES; -} - -- (int)outAngle {return outAngle;} -- (void)setOutAngle:(int)a { - outAngle = normaliseAngleDeg (a); - dirty = YES; -} - -- (EdgeBendMode)bendMode {return bendMode;} -- (void)setBendMode:(EdgeBendMode)mode { - bendMode = mode; - dirty = YES; -} - -- (int)bend {return bend;} -- (void)setBend:(int)b { - bend = normaliseAngleDeg (b); - dirty = YES; -} - -- (float)weight {return weight;} -- (void)setWeight:(float)w { -// if (source == target) weight = 1.0f; -// else weight = w; - weight = w; - dirty = YES; -} - -- (EdgeStyle*)style {return style;} -- (void)setStyle:(EdgeStyle*)s { - if (style != s) { -#if __has_feature(objc_arc) - style = s; -#else - [style release]; - style = [s retain]; -#endif - } -} - -- (Node*)source {return source;} -- (void)setSource:(Node *)s { - if (source != s) { - [source removeObserver:self - forKeyPath:@"style"]; - - if ([s style] == nil) { - [self setSourceAnchor:@"center"]; - } else if ([sourceAnchor isEqual:@"center"]) { - [self setSourceAnchor:@""]; - } - -#if __has_feature(objc_arc) - source = s; -#else - [source release]; - source = [s retain]; -#endif - - if (source==target) { - bendMode = EdgeBendModeInOut; - weight = 1.0f; - } - - [source addObserver:self - forKeyPath:@"style" - options:NSKeyValueObservingOptionNew - | NSKeyValueObservingOptionOld - context:NULL]; - - dirty = YES; - } -} - -- (Node*)target {return target;} -- (void)setTarget:(Node *)t { - if (target != t) { - [target removeObserver:self - forKeyPath:@"style"]; - - if ([t style] == nil) { - [self setTargetAnchor:@"center"]; - } else if ([targetAnchor isEqual:@"center"]) { - [self setTargetAnchor:@""]; - } - -#if __has_feature(objc_arc) - target = t; -#else - [target release]; - target = [t retain]; -#endif - - if (source==target) { - bendMode = EdgeBendModeInOut; - weight = 1.0f; - } - - [target addObserver:self - forKeyPath:@"style" - options:NSKeyValueObservingOptionNew - | NSKeyValueObservingOptionOld - context:NULL]; - - dirty = YES; - } -} - -- (void)observeValueForKeyPath:(NSString *)keyPath - ofObject:(id)object - change:(NSDictionary *)change - context:(void *)context - -{ - if ([keyPath isEqual:@"style"]) { - id oldStyle = [change objectForKey:NSKeyValueChangeOldKey]; - id newStyle = [change objectForKey:NSKeyValueChangeNewKey]; - id none = [NSNull null]; - if (object == source) { - if (oldStyle != none && newStyle == none) { - [self setSourceAnchor:@"center"]; - } else if (oldStyle == none && newStyle != none && - [sourceAnchor isEqual:@"center"]) { - [self setSourceAnchor:@""]; - } - } - if (object == target) { - if (oldStyle != none && newStyle == none) { - [self setTargetAnchor:@"center"]; - } else if (oldStyle == none && newStyle != none && - [targetAnchor isEqual:@"center"]) { - [self setTargetAnchor:@""]; - } - } - } - dirty = YES; -} - - -// edgeNode and hasEdgeNode use a bit of key-value observing to help the mac GUI keep up - -- (Node*)edgeNode {return edgeNode;} -- (void)setEdgeNode:(Node *)n { - [self willChangeValueForKey:@"edgeNode"]; - [self willChangeValueForKey:@"hasEdgeNode"]; - if (edgeNode != n) { - hasEdgeNode = (n != nil); -#if __has_feature(objc_arc) - edgeNode = n; -#else - [edgeNode release]; - edgeNode = [n retain]; -#endif - // don't set dirty bit, because control points don't need update - } - [self didChangeValueForKey:@"edgeNode"]; - [self didChangeValueForKey:@"hasEdgeNode"]; -} - -- (BOOL)hasEdgeNode { return hasEdgeNode; } -- (void)setHasEdgeNode:(BOOL)b { - [self willChangeValueForKey:@"edgeNode"]; - [self willChangeValueForKey:@"hasEdgeNode"]; - hasEdgeNode = b; - if (hasEdgeNode && edgeNode == nil) { - edgeNode = [[Node alloc] init]; - } - [self didChangeValueForKey:@"edgeNode"]; - [self didChangeValueForKey:@"hasEdgeNode"]; -} - -- (NSString*) sourceAnchor { return sourceAnchor; } -- (void)setSourceAnchor:(NSString *)_sourceAnchor{ - NSString *oldSourceAnchor = sourceAnchor; - if(_sourceAnchor != nil){ - sourceAnchor = [_sourceAnchor copy]; - }else{ - sourceAnchor = @""; - } -#if ! __has_feature(objc_arc) - [oldSourceAnchor release]; -#endif -} - -- (NSString*) targetAnchor { return targetAnchor; } -- (void)setTargetAnchor:(NSString *)_targetAnchor{ - NSString *oldTargetAnchor = targetAnchor; - if(_targetAnchor != nil){ - targetAnchor = [_targetAnchor copy]; - }else{ - targetAnchor = @""; - } -#if ! __has_feature(objc_arc) - [oldTargetAnchor release]; -#endif -} - -@synthesize data; -- (void) insertObject:(GraphElementProperty*)gep - inDataAtIndex:(NSUInteger)index { - [data insertObject:gep atIndex:index]; -} -- (void) removeObjectFromDataAtIndex:(NSUInteger)index { - [data removeObjectAtIndex:index]; -} -- (void) replaceObjectInDataAtIndex:(NSUInteger)index - withObject:(GraphElementProperty*)gep { - [data replaceObjectAtIndex:index withObject:gep]; -} - -- (void)updateData { - // unset everything to avoid redundant defs - [data unsetAtom:@"loop"]; - [data unsetProperty:@"in"]; - [data unsetProperty:@"out"]; - [data unsetAtom:@"bend left"]; - [data unsetAtom:@"bend right"]; - [data unsetProperty:@"bend left"]; - [data unsetProperty:@"bend right"]; - [data unsetProperty:@"looseness"]; - - if (style == nil) { - [data unsetProperty:@"style"]; - } else { - [data setProperty:[style name] forKey:@"style"]; - } - - if (bendMode == EdgeBendModeBasic && bend != 0) { - NSString *bendkey = @"bend right"; - int b = [self bend]; - if (b < 0) { - bendkey = @"bend left"; - b = -b; - } - - if (b == 30) { - [data setAtom:bendkey]; - } else { - [data setProperty:[NSString stringWithFormat:@"%d",b] forKey:bendkey]; - } - - } else if (bendMode == EdgeBendModeInOut) { - [data setProperty:[NSString stringWithFormat:@"%d",inAngle] - forKey:@"in"]; - [data setProperty:[NSString stringWithFormat:@"%d",outAngle] - forKey:@"out"]; - } - - // loop needs to come after in/out - if (source == target) [data setAtom:@"loop"]; - - if (![self isSelfLoop] && ![self isStraight]) - { - [data setProperty:[NSString stringWithFormat:@"%.2f",weight*2.5f] - forKey:@"looseness"]; - } -} - -- (void)setAttributesFromData { - bendMode = EdgeBendModeBasic; - - if ([data isAtomSet:@"bend left"]) { - [self setBend:-30]; - } else if ([data isAtomSet:@"bend right"]) { - [self setBend:30]; - } else if ([data propertyForKey:@"bend left"] != nil) { - NSString *bnd = [data propertyForKey:@"bend left"]; - [self setBend:-[bnd intValue]]; - } else if ([data propertyForKey:@"bend right"] != nil) { - NSString *bnd = [data propertyForKey:@"bend right"]; - [self setBend:[bnd intValue]]; - } else { - [self setBend:0]; - - if ([data propertyForKey:@"in"] != nil && [data propertyForKey:@"out"] != nil) { - bendMode = EdgeBendModeInOut; - [self setInAngle:[[data propertyForKey:@"in"] intValue]]; - [self setOutAngle:[[data propertyForKey:@"out"] intValue]]; - } - } - - if ([data propertyForKey:@"looseness"] != nil) { - weight = [[data propertyForKey:@"looseness"] floatValue] / 2.5f; - } else { - weight = ([self isSelfLoop]) ? 1.0f : 0.4f; - } -} - -- (void)setPropertiesFromEdge:(Edge*)e { - Node *en = [[e edgeNode] copy]; - [self setEdgeNode:en]; -#if ! __has_feature(objc_arc) - [en release]; -#endif - - GraphElementData *d = [[e data] copy]; - [self setData:d]; -#if ! __has_feature(objc_arc) - [d release]; -#endif - - [self setStyle:[e style]]; - [self setBend:[e bend]]; - [self setInAngle:[e inAngle]]; - [self setOutAngle:[e outAngle]]; - [self setBendMode:[e bendMode]]; - [self setWeight:[e weight]]; - - dirty = YES; // cached data will be recomputed lazily, rather than copied -} - -- (NSRect)boundingRect { - [self updateControls]; - NSRect bound = NSRectAround4Points(head, tail, cp1, cp2); - if ([self style] != nil) { - switch ([[self style] decorationStyle]) { - case ED_Arrow: - bound = NSRectWithPoint(bound, [self midTan]); - case ED_Tick: - bound = NSRectWithPoint(bound, [self leftNormal]); - bound = NSRectWithPoint(bound, [self rightNormal]); - case ED_None: - break; - } - if ([[self style] headStyle] != AH_None) { - bound = NSRectWithPoint(bound, [self leftHeadNormal]); - bound = NSRectWithPoint(bound, [self rightHeadNormal]); - } - if ([[self style] tailStyle] != AH_None) { - bound = NSRectWithPoint(bound, [self leftTailNormal]); - bound = NSRectWithPoint(bound, [self rightTailNormal]); - } - } - return bound; -} - -- (void) adjustWeight:(float)handle_dist withCourseness:(float)wcourseness { - float base_dist = NSDistanceBetweenPoints (src, targ); - if (base_dist == 0.0f) { - base_dist = 1.0f; - } - - [self setWeight:roundToNearest(wcourseness, handle_dist / base_dist)]; -} - -- (float) angleOf:(NSPoint)point relativeTo:(NSPoint)base { - float dx = point.x - base.x; - float dy = point.y - base.y; - return radiansToDegrees (good_atan(dx, dy)); -} - -- (void) moveCp1To:(NSPoint)point withWeightCourseness:(float)wc andBendCourseness:(int)bc forceLinkControlPoints:(BOOL)link { - [self updateControls]; - [self adjustWeight:NSDistanceBetweenPoints (point, src) withCourseness:wc]; - - float control_angle = [self angleOf:point relativeTo:src]; - if (bendMode == EdgeBendModeBasic) { - float base_angle = [self angleOf:targ relativeTo:src]; - int b = (int)roundToNearest (bc, base_angle - control_angle); - [self setBend:b]; - } else { - int angle = (int)roundToNearest (bc, control_angle); - if (link) { - [self setInAngle:(inAngle + angle - outAngle)]; - } - [self setOutAngle:angle]; - } -} - -- (void) moveCp1To:(NSPoint)point { - [self moveCp1To:point withWeightCourseness:0.0f andBendCourseness:0 forceLinkControlPoints:NO]; -} - -- (void) moveCp2To:(NSPoint)point withWeightCourseness:(float)wc andBendCourseness:(int)bc forceLinkControlPoints:(BOOL)link { - [self updateControls]; - - if (![self isSelfLoop]) { - [self adjustWeight:NSDistanceBetweenPoints (point, targ) withCourseness:wc]; - } - - float control_angle = [self angleOf:point relativeTo:targ]; - if (bendMode == EdgeBendModeBasic) { - float base_angle = [self angleOf:src relativeTo:targ]; - int b = (int)roundToNearest (bc, control_angle - base_angle); - [self setBend:b]; - } else { - int angle = (int)roundToNearest (bc, control_angle); - if (link) { - [self setOutAngle:(outAngle + angle - inAngle)]; - } - [self setInAngle: angle]; - } -} - -- (void) moveCp2To:(NSPoint)point { - [self moveCp2To:point withWeightCourseness:0.0f andBendCourseness:0 forceLinkControlPoints:NO]; -} - -- (void)reverse { - Node *n; - float f; - NSString *a; - - n = source; - source = target; - target = n; - - f = inAngle; - inAngle = outAngle; - outAngle = f; - - a = sourceAnchor; - sourceAnchor = targetAnchor; - targetAnchor = a; - - [self setBend:-bend]; - - dirty = YES; -} - -- (void)dealloc { - [source removeObserver:self - forKeyPath:@"style"]; - [target removeObserver:self - forKeyPath:@"style"]; -#if ! __has_feature(objc_arc) - [source release]; - [target release]; - [data release]; - [sourceAnchor release]; - [targetAnchor release]; - [super dealloc]; -#endif -} - -- (id)copyWithZone:(NSZone*)zone { - Edge *cp = [[Edge allocWithZone:zone] init]; - [cp setSource:[self source]]; - [cp setTarget:[self target]]; - [cp setSourceAnchor:[self sourceAnchor]]; - [cp setTargetAnchor:[self targetAnchor]]; - [cp setPropertiesFromEdge:self]; - return cp; -} - -+ (Edge*)edge { -#if __has_feature(objc_arc) - return [[Edge alloc] init]; -#else - return [[[Edge alloc] init] autorelease]; -#endif -} - -+ (Edge*)edgeWithSource:(Node*)s andTarget:(Node*)t { -#if __has_feature(objc_arc) - return [[Edge alloc] initWithSource:s andTarget:t]; -#else - return [[[Edge alloc] initWithSource:s andTarget:t] autorelease]; -#endif -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/EdgeStyle.h b/tikzit-1/src/common/EdgeStyle.h deleted file mode 100644 index a51f129..0000000 --- a/tikzit-1/src/common/EdgeStyle.h +++ /dev/null @@ -1,71 +0,0 @@ -// -// EdgeStyle.h -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "PropertyHolder.h" -#import "ColorRGB.h" - -typedef enum { - AH_None = 0, - AH_Plain = 1, - AH_Latex = 2 -} ArrowHeadStyle; - -typedef enum { - ED_None = 0, - ED_Arrow = 1, - ED_Tick = 2 -} EdgeDectorationStyle; - -@interface EdgeStyle : PropertyHolder { - ArrowHeadStyle headStyle, tailStyle; - EdgeDectorationStyle decorationStyle; - float thickness; - ColorRGB *colorRGB; - NSString *name; - NSString *category; -} - -/*! - @property colorRGB - @brief The color to render the line in - */ -@property (copy) ColorRGB *colorRGB; - -@property (copy) NSString *name; -@property (copy) NSString *category; -@property (assign) ArrowHeadStyle headStyle; -@property (assign) ArrowHeadStyle tailStyle; -@property (assign) EdgeDectorationStyle decorationStyle; -@property (assign) float thickness; - -@property (readonly) NSString *tikz; - -- (id)init; -- (id)initWithName:(NSString*)nm; -+ (EdgeStyle*)defaultEdgeStyleWithName:(NSString*)nm; -- (void) updateFromStyle:(EdgeStyle*)style; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/EdgeStyle.m b/tikzit-1/src/common/EdgeStyle.m deleted file mode 100644 index c61e94a..0000000 --- a/tikzit-1/src/common/EdgeStyle.m +++ /dev/null @@ -1,222 +0,0 @@ -// -// EdgeStyle.m -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "EdgeStyle.h" - -@implementation EdgeStyle - -+ (void)initialize { - [self setKeys:[NSArray arrayWithObjects: - @"tailStyle", - @"headStyle", - @"decorationStyle", - @"thickness", - @"colorRGB.red", - @"colorRGB.blue", - @"colorRGB.green", - @"name", - nil] - triggerChangeNotificationsForDependentKey:@"tikz"]; - [self setKeys:[NSArray arrayWithObjects: - @"colorRGB.name", - nil] - triggerChangeNotificationsForDependentKey:@"colorIsKnown"]; -} - -- (id)initWithName:(NSString*)nm { - self = [super initWithNotificationName:@"EdgeStylePropertyChanged"]; - - if (self != nil) { - headStyle = AH_None; - tailStyle = AH_None; - decorationStyle = ED_None; - colorRGB = [[ColorRGB alloc] initWithRed:0 green:0 blue:0]; - name = nm; - category = nil; - thickness = 1.0f; - } - - return self; -} - -- (id)init { - self = [self initWithName:@"new"]; - return self; -} - -- (id)copyWithZone:(NSZone*)zone { - EdgeStyle *style = [[EdgeStyle allocWithZone:zone] init]; - [style setName:[self name]]; - [style setCategory:[self category]]; - [style setHeadStyle:[self headStyle]]; - [style setTailStyle:[self tailStyle]]; - [style setDecorationStyle:[self decorationStyle]]; - [style setThickness:[self thickness]]; - [style setColorRGB:[self colorRGB]]; - return style; -} - -- (void)dealloc { -#if ! __has_feature(objc_arc) - [name release]; - [category release]; - [colorRGB release]; - [super dealloc]; -#endif -} - -- (NSString*) description { - return [NSString stringWithFormat:@"Edge style \"%@\"", name]; -} - -- (void) updateFromStyle:(EdgeStyle*)style { - [self setName:[style name]]; - [self setCategory:[style category]]; - [self setHeadStyle:[style headStyle]]; - [self setTailStyle:[style tailStyle]]; - [self setDecorationStyle:[style decorationStyle]]; - [self setThickness:[style thickness]]; - [self setColorRGB:[style colorRGB]]; -} - -+ (EdgeStyle*)defaultEdgeStyleWithName:(NSString*)nm { -#if __has_feature(objc_arc) - return [[EdgeStyle alloc] initWithName:nm]; -#else - return [[[EdgeStyle alloc] initWithName:nm] autorelease]; -#endif -} - -- (NSString*)name { return name; } -- (void)setName:(NSString *)s { - if (name != s) { - NSString *oldValue = name; - name = [s copy]; - [self postPropertyChanged:@"name" oldValue:oldValue]; -#if ! __has_feature(objc_arc) - [oldValue release]; -#endif - } -} - -- (ArrowHeadStyle)headStyle { return headStyle; } -- (void)setHeadStyle:(ArrowHeadStyle)s { - ArrowHeadStyle oldValue = headStyle; - headStyle = s; - [self postPropertyChanged:@"headStyle" oldValue:[NSNumber numberWithInt:oldValue]]; -} - -- (ArrowHeadStyle)tailStyle { return tailStyle; } -- (void)setTailStyle:(ArrowHeadStyle)s { - ArrowHeadStyle oldValue = tailStyle; - tailStyle = s; - [self postPropertyChanged:@"tailStyle" oldValue:[NSNumber numberWithInt:oldValue]]; -} - -- (EdgeDectorationStyle)decorationStyle { return decorationStyle; } -- (void)setDecorationStyle:(EdgeDectorationStyle)s { - EdgeDectorationStyle oldValue = decorationStyle; - decorationStyle = s; - [self postPropertyChanged:@"decorationStyle" oldValue:[NSNumber numberWithInt:oldValue]]; -} -- (float)thickness { return thickness; } -- (void)setThickness:(float)s { - float oldValue = thickness; - thickness = s; - [self postPropertyChanged:@"thickness" oldValue:[NSNumber numberWithFloat:oldValue]]; -} - -- (NSString*)category { - return category; -} - -- (void)setCategory:(NSString *)s { - if (category != s) { - NSString *oldValue = category; - category = [s copy]; - [self postPropertyChanged:@"category" oldValue:oldValue]; -#if ! __has_feature(objc_arc) - [oldValue release]; -#endif - } -} - -- (ColorRGB*)colorRGB { - return colorRGB; -} - -- (void)setColorRGB:(ColorRGB*)c { - if (colorRGB != c) { - ColorRGB *oldValue = colorRGB; - colorRGB = [c copy]; - [self postPropertyChanged:@"colorRGB" oldValue:oldValue]; -#if ! __has_feature(objc_arc) - [oldValue release]; -#endif - } -} - -- (NSString*)tikz { - NSMutableString *buf = [NSMutableString stringWithFormat:@"\\tikzstyle{%@}=[", name]; - - NSString *colorName = [colorRGB name]; - if (colorName == nil) - colorName = [colorRGB hexName]; - - if (tailStyle == AH_Plain) - [buf appendString:@"<"]; - else if (tailStyle == AH_Latex) - [buf appendString:@"latex"]; - - [buf appendString:@"-"]; - - if (headStyle == AH_Plain) - [buf appendString:@">"]; - else if (headStyle == AH_Latex) - [buf appendString:@"latex"]; - - if(colorName != nil){ - [buf appendString:@",draw="]; - [buf appendString:colorName]; - } - - if (decorationStyle != ED_None) { - [buf appendString:@",postaction={decorate},decoration={markings,mark="]; - if (decorationStyle == ED_Arrow) - [buf appendString:@"at position .5 with {\\arrow{>}}"]; - else if (decorationStyle == ED_Tick) - [buf appendString:@"at position .5 with {\\draw (0,-0.1) -- (0,0.1);}"]; - [buf appendString:@"}"]; - } - - if (thickness != 1.0f) { - [buf appendFormat:@",line width=%.3f", thickness]; - } - - [buf appendString:@"]"]; - return buf; -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/Graph.h b/tikzit-1/src/common/Graph.h deleted file mode 100644 index 1f98858..0000000 --- a/tikzit-1/src/common/Graph.h +++ /dev/null @@ -1,401 +0,0 @@ -// -// Graph.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - - -/*! - - @mainpage TikZiT - TikZiT is a GUI application for drawing, editing, and parsing TikZ - diagrams. Common code is in src/common, and plaform-specific code is - in src/{osx,linux}. - - */ - - -#import "Node.h" -#import "Edge.h" -#import "GraphChange.h" -#import "Transformer.h" - -/*! - @class Graph - @brief Store a graph, output to TikZ. - @details All of the methods that change a graph return an object of type GraphChange. - Graph changes can be re-done by calling applyGraphChange. They can be undone - by calling applyGraphChange on [change inverse]. - */ -@interface Graph : NSObject { - NSRecursiveLock *graphLock; - BOOL dirty; // keep track of when inEdges and outEdges need an update - NSMutableArray *nodes; - NSMutableArray *edges; - - NSMapTable *inEdges; - NSMapTable *outEdges; - - GraphElementData *data; - NSRect boundingBox; -} - -/*! - @property data - @brief Data associated with the graph. - */ -@property (copy) GraphElementData *data; - -// KVC methods -- (void) insertObject:(GraphElementProperty*)gep - inDataAtIndex:(NSUInteger)index; -- (void) removeObjectFromDataAtIndex:(NSUInteger)index; -- (void) replaceObjectInDataAtIndex:(NSUInteger)index - withObject:(GraphElementProperty*)gep; - -/*! - @property nodes - @brief The set of nodes. - @details The node set is cached internally, so no need to lock - the graph when enumerating. - */ -@property (readonly) NSArray *nodes; - -/*! - @property edges - @brief The set of edges. - @details The edge set is cached internally, so no need to lock - the graph when enumerating. - */ -@property (readonly) NSArray *edges; - -/*! - @property boundingBox - @brief The bounding box of a graph - @details Optional data containing the bounding box, set with - \path [use as bounding box] .... - */ -@property (assign) NSRect boundingBox; - -/*! - @property hasBoundingBox - @brief Returns true if this graph has a bounding box. - */ -@property (readonly) BOOL hasBoundingBox; - - -/*! - @brief Computes graph bounds. - @result Graph bounds. - */ -- (NSRect)bounds; - -/*! - @brief Returns the set of edges incident to the given node set. - @param nds a set of nodes. - @result A set of incident edges. - */ -- (NSSet*)incidentEdgesForNodes:(NSSet*)nds; - -/*! - @brief Returns the set of in-edges for this node. - @param nd a node. - @result A set of edges. -*/ -- (NSSet*)inEdgesForNode:(Node*)nd; - -/*! - @brief Returns the set of out-edges for this node. - @param nd a node. - @result A set of edges. -*/ -- (NSSet*)outEdgesForNode:(Node*)nd; - -/*! - @brief Gives a copy of the full subgraph with the given nodes. - @param nds a set of nodes. - @result A subgraph. - */ -- (Graph*)copyOfSubgraphWithNodes:(NSSet*)nds; - -/*! - @brief Gives a copy of the full subgraph with the given nodes. - @param nds a set of nodes. - @param zone an allocation zone - @result A subgraph. - */ -- (Graph*)copyOfSubgraphWithNodes:(NSSet*)nds zone:(NSZone*)zone; - -/*! - @brief Gives a set of edge-arrays that partition all of the edges in the graph. - @result An NSet of NSArrays of edges. - */ -- (NSSet*)pathCover; - -/*! - @brief Adds a node. - @param node - @result A GraphChange recording this action. - */ -- (GraphChange*)addNode:(Node*)node; - -/*! - @brief Removes a node. - @param node - @result A GraphChange recording this action. - */ -- (GraphChange*)removeNode:(Node*)node; - -/*! - @brief Removes a set of nodes. - @param nds a set of nodes - @result A GraphChange recording this action. - */ -- (GraphChange*)removeNodes:(NSSet *)nds; - -/*! - @brief Adds an edge. - @param edge - @result A GraphChange recording this action. - */ -- (GraphChange*)addEdge:(Edge*)edge; - -/*! - @brief Removed an edge. - @param edge - @result A GraphChange recording this action. - */ -- (GraphChange*)removeEdge:(Edge*)edge; - -/*! - @brief Removes a set of edges. - @param es a set of edges. - @result A GraphChange recording this action. - */ -- (GraphChange*)removeEdges:(NSSet *)es; - -/*! - @brief Convenience function, intializes an edge with the given - source and target and adds it. - @param source the source of the edge. - @param target the target of the edge. - @result A GraphChange recording this action. - */ -- (GraphChange*)addEdgeFrom:(Node*)source to:(Node*)target; - -/*! - @brief Return the z-index for a given node (lower is farther back). - @param node a node in the graph - @result An int - */ -- (int)indexOfNode:(Node*)node; - -/*! - @brief Set the z-index for a given node (lower is farther back). - @param idx a new z-index - @param node a node in the graph - */ -- (void)setIndex:(int)idx ofNode:(Node*)node; - -/*! - @brief Bring set of nodes forward by one. - @param nodeSet a set of nodes - */ -- (GraphChange*)bringNodesForward:(NSSet*)nodeSet; - -/*! - @brief Bring set of nodes to the front. - @param nodeSet a set of nodes - */ -- (GraphChange*)bringNodesToFront:(NSSet*)nodeSet; - -/*! - @brief Bring set of edges to the front. - @param edgeSet a set of edges - */ -- (GraphChange*)bringEdgesToFront:(NSSet*)edgeSet; - -/*! - @brief Bring set of edges forward by one. - @param edgeSet a set of edges - */ -- (GraphChange*)bringEdgesForward:(NSSet*)edgeSet; - -/*! - @brief Send set of nodes backward by one. - @param nodeSet a set of nodes - */ -- (GraphChange*)sendNodesBackward:(NSSet*)nodeSet; - -/*! - @brief Send set of edges backward by one. - @param edgeSet a set of edges - */ -- (GraphChange*)sendEdgesBackward:(NSSet*)edgeSet; - -/*! - @brief Send set of nodes to back. - @param nodeSet a set of nodes - */ -- (GraphChange*)sendNodesToBack:(NSSet*)nodeSet; - -/*! - @brief Send set of edges to back. - @param edgeSet a set of edges - */ -- (GraphChange*)sendEdgesToBack:(NSSet*)edgeSet; - - -/*! - @brief Transform every node in the graph to screen space. - @param t a transformer - */ -- (void)applyTransformer:(Transformer*)t; - -/*! - @brief Shift nodes by a given distance. - @param ns a set of nodes. - @param p an x and y distance, given as an NSPoint. - @result A GraphChange recording this action. - */ -- (GraphChange*)shiftNodes:(id)ns byPoint:(NSPoint)p; - -/*! - @brief Reverse the given edges - @param es the edges to reverse - @result A GraphChange recording this action. - */ -- (GraphChange*)reverseEdges:(NSSet *)es; - -/*! - @brief Insert the given graph into this one. Used for copy - and paste. - @param g a graph. - @result A GraphChange recording this action. - */ -- (GraphChange*)insertGraph:(Graph*)g; - -/*! - @brief Flip the subgraph defined by the given node set - horizontally. - @param nds a set of nodes. - @result A GraphChange recording this action. - */ -- (GraphChange*)flipHorizontalNodes:(NSSet*)nds; - -/*! - @brief Flip the subgraph defined by the given node set - vertically. - @param nds a set of nodes. - @result A GraphChange recording this action. - */ -- (GraphChange*)flipVerticalNodes:(NSSet*)nds; - -/*! - @brief Apply a graph change. - @details An undo manager should maintain a stack of GraphChange - objects returned. To undo a GraphChange, call this method - with [change inverse] as is argument. - @param ch a graph change. - */ -- (void)applyGraphChange:(GraphChange*)ch; - -/*! - @brief The TikZ representation of this graph. - @details The TikZ representation of this graph. The TikZ code should - contain enough data to totally reconstruct the graph. - @result A string containing TikZ code. - */ -- (NSString*)tikz; - - -/*! - @brief Copy the node set and return a table of copies, whose - keys are the original nodes. This is used to save the state - of a set of nodes in a GraphChange. - @param nds a set of nodes. - @result A NSMapTable of node copies. - */ -+ (NSMapTable*)nodeTableForNodes:(NSSet*)nds; - -+ (NSMapTable*)nodeTableForNodes:(NSSet*)nds withZone:(NSZone*)zone; - -/*! - @brief Copy the edge set and return a table of copies, whose - keys are the original edges. This is used to save the state - of a set of edges in a GraphChange. - @param es a set of edges. - @result A NSMapTable of edge copies. - */ -+ (NSMapTable*)edgeTableForEdges:(NSSet*)es; - -+ (NSMapTable*)edgeTableForEdges:(NSSet*)es withZone:(NSZone*)zone; - -/*! - @brief Compute the bounds for a set of nodes. - @param nds an enumerable collection of nodes. - @result The bounds. - */ -+ (NSRect)boundsForNodes:(id)nds; - -/*! - @brief Factory method for constructing graphs. - @result An empty graph. - */ -+ (Graph*)graph; - -/** - * Initialize an empty graph - */ -- (id)init; - -/** - * Constructs a graph from the given tikz code - * - * See TikzGraphAssembler for more information about the error argument. - */ -+ (Graph*)graphFromTikz:(NSString*)tikz error:(NSError**)e; - -/** - * Constructs a graph from the given tikz code - */ -+ (Graph*)graphFromTikz:(NSString*)tikz; - -/** - * Initialize an empty graph from the given tikz code - * - * Note that this may not return the same object it was called on, - * and will return nil if parsing failed. - * - * See TikzGraphAssembler for more information about the error argument. - */ -- (id)initFromTikz:(NSString*)tikz error:(NSError**)e; - -/** - * Initialize an empty graph from the given tikz code - * - * Note that this may not return the same object it was called on, - * and will return nil if parsing failed. - */ -- (id)initFromTikz:(NSString*)tikz; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/Graph.m b/tikzit-1/src/common/Graph.m deleted file mode 100644 index cf09a69..0000000 --- a/tikzit-1/src/common/Graph.m +++ /dev/null @@ -1,922 +0,0 @@ -// -// Graph.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "Graph.h" -#import "TikzGraphAssembler.h" -#import "Shape.h" - -@interface Graph (Private) -- (void) shapeDictionaryReplaced:(NSNotification*)notification; -@end - -@implementation Graph - -- (id)init { - self = [super init]; - if (self != nil) { - data = [[GraphElementData alloc] init]; - boundingBox = NSMakeRect(0, 0, 0, 0); - graphLock = [[NSRecursiveLock alloc] init]; - nodes = [[NSMutableArray alloc] initWithCapacity:10]; - edges = [[NSMutableArray alloc] initWithCapacity:10]; - inEdges = nil; - outEdges = nil; - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(shapeDictionaryReplaced:) - name:@"ShapeDictionaryReplaced" - object:[Shape class]]; - } - return self; -} - -- (id)initFromTikz:(NSString*)tikz error:(NSError**)e { -#if __has_feature(objc_arc) - return [TikzGraphAssembler parseTikz:tikz error:e]; -#else - [self release]; - return [[TikzGraphAssembler parseTikz:tikz error:e] retain]; -#endif -} - -- (id)initFromTikz:(NSString*)tikz { - return [self initFromTikz:tikz error:NULL]; -} - -- (id) copyWithZone:(NSZone*)zone { - Graph *newGraph = [self copyOfSubgraphWithNodes:[NSSet setWithArray:nodes] zone:zone]; - [newGraph setData:[self data]]; - return newGraph; -} - -- (void)dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - [graphLock lock]; -#if ! __has_feature(objc_arc) - [inEdges release]; - [outEdges release]; - [edges release]; - [nodes release]; - [data release]; - [graphLock unlock]; - [graphLock release]; - - [super dealloc]; -#endif -} - -- (void)sync { - [graphLock lock]; - if (dirty) { -#if ! __has_feature(objc_arc) - [inEdges release]; - [outEdges release]; -#endif - inEdges = [[NSMapTable alloc] initWithKeyOptions:NSMapTableStrongMemory valueOptions:NSMapTableStrongMemory capacity:10]; - outEdges = [[NSMapTable alloc] initWithKeyOptions:NSMapTableStrongMemory valueOptions:NSMapTableStrongMemory capacity:10]; - -#if ! __has_feature(objc_arc) - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; -#endif - - for (Edge *e in edges) { - NSMutableSet *ie = [inEdges objectForKey:[e target]]; - NSMutableSet *oe = [outEdges objectForKey:[e source]]; - - if (ie == nil) { - ie = [NSMutableSet setWithCapacity:4]; - [inEdges setObject:ie forKey:[e target]]; - } - - if (oe == nil) { - oe = [NSMutableSet setWithCapacity:4]; - [outEdges setObject:oe forKey:[e source]]; - } - - [ie addObject:e]; - [oe addObject:e]; - } - -#if ! __has_feature(objc_arc) - [pool drain]; -#endif - - dirty = NO; - } - [graphLock unlock]; -} - -@synthesize nodes; -@synthesize edges; - -@synthesize data; -- (void) insertObject:(GraphElementProperty*)gep - inDataAtIndex:(NSUInteger)index { - [data insertObject:gep atIndex:index]; -} -- (void) removeObjectFromDataAtIndex:(NSUInteger)index { - [data removeObjectAtIndex:index]; -} -- (void) replaceObjectInDataAtIndex:(NSUInteger)index - withObject:(GraphElementProperty*)gep { - [data replaceObjectAtIndex:index withObject:gep]; -} - -@synthesize boundingBox; - -- (NSRect)bounds { - [graphLock lock]; - NSRect b = [Graph boundsForNodes:nodes]; - [graphLock unlock]; - return b; -} - -- (BOOL)hasBoundingBox { - return !( - boundingBox.size.width == 0 && - boundingBox.size.height == 0 - ); -} - -- (NSSet*)inEdgesForNode:(Node*)nd { - [self sync]; -#if __has_feature(objc_arc) - return [inEdges objectForKey:nd]; -#else - return [[[inEdges objectForKey:nd] retain] autorelease]; -#endif -} - -- (NSSet*)outEdgesForNode:(Node*)nd { - [self sync]; -#if __has_feature(objc_arc) - return [outEdges objectForKey:nd]; -#else - return [[[outEdges objectForKey:nd] retain] autorelease]; -#endif -} - -- (NSSet*)incidentEdgesForNodes:(NSSet*)nds { - [self sync]; - - NSMutableSet *mset = [NSMutableSet setWithCapacity:10]; - for (Node *n in nds) { - [mset unionSet:[self inEdgesForNode:n]]; - [mset unionSet:[self outEdgesForNode:n]]; - } - - return mset; -} - -- (void)applyTransformer:(Transformer *)t { - [graphLock lock]; - for (Node *n in nodes) { - [n setPoint:[t toScreen:[n point]]]; - } - [graphLock unlock]; -} - -- (GraphChange*)addNode:(Node *)node{ - [graphLock lock]; - NSSet *addedNode; - - // addNode is a no-op if graph already contains node - if (![nodes containsObject:node]) { - [nodes addObject:node]; - dirty = YES; - addedNode = [NSSet setWithObject:node]; - } else { - addedNode = [NSSet set]; - } - [graphLock unlock]; - - return [GraphChange graphAdditionWithNodes:addedNode - edges:[NSSet set]]; -} - -- (GraphChange*)removeNode:(Node*)node { - [graphLock lock]; - NSMutableSet *affectedEdges = [NSMutableSet set]; - for (Edge *e in edges) { - if ([e source] == node || [e target] == node) { - [affectedEdges addObject:e]; - } - } - for (Edge *e in affectedEdges) { - [edges removeObject:e]; - } - [nodes removeObject:node]; - dirty = YES; - [graphLock unlock]; - - return [GraphChange graphDeletionWithNodes:[NSSet setWithObject:node] - edges:affectedEdges]; -} - -- (GraphChange*)removeNodes:(NSSet *)nds { - [graphLock lock]; - - Node *n; - Edge *e; - - NSMutableSet *affectedEdges = [NSMutableSet set]; - NSEnumerator *en = [edges objectEnumerator]; - while ((e = [en nextObject])) { - if ([nds containsObject:[e source]] || [nds containsObject:[e target]]) { - [affectedEdges addObject:e]; - } - } - - en = [affectedEdges objectEnumerator]; - while ((e = [en nextObject])) [edges removeObject:e]; - - en = [nds objectEnumerator]; - while ((n = [en nextObject])) [nodes removeObject:n]; - - dirty = YES; - [graphLock unlock]; - - return [GraphChange graphDeletionWithNodes:nds edges:affectedEdges]; -} - -- (GraphChange*)addEdge:(Edge*)edge { - [graphLock lock]; - NSSet *addedEdge; - - // addEdge is a no-op if graph already contains edge - if (![edges containsObject:edge]) { - [edges addObject:edge]; - dirty = YES; - addedEdge = [NSSet setWithObject:edge]; - } else { - addedEdge = [NSSet set]; - } - [graphLock unlock]; - - return [GraphChange graphAdditionWithNodes:[NSSet set] - edges:addedEdge]; -} - -- (GraphChange*)removeEdge:(Edge *)edge { - [graphLock lock]; - [edges removeObject:edge]; - dirty = YES; - [graphLock unlock]; - return [GraphChange graphDeletionWithNodes:[NSSet set] - edges:[NSSet setWithObject:edge]]; -} - -- (GraphChange*)removeEdges:(NSSet *)es { - [graphLock lock]; - - for (Edge *e in es) { - [edges removeObject:e]; - } - dirty = YES; - [graphLock unlock]; - return [GraphChange graphDeletionWithNodes:[NSSet set] edges:es]; -} - -- (GraphChange*)addEdgeFrom:(Node *)source to:(Node *)target { - return [self addEdge:[Edge edgeWithSource:source andTarget:target]]; -} - -- (GraphChange*)shiftNodes:(id)ns byPoint:(NSPoint)p { - NSPoint newLoc; - NSMutableSet *nodeSet = [NSMutableSet setWithCapacity:5]; - for (Node *n in ns) { - newLoc = NSMakePoint([n point].x + p.x, [n point].y + p.y); - [n setPoint:newLoc]; - [nodeSet addObject:n]; - } - return [GraphChange shiftNodes:nodeSet byPoint:p]; -} - -- (GraphChange*)reverseEdges:(NSSet *)es { - [graphLock lock]; - for (Edge *e in es) { - [e reverse]; - } - dirty = YES; - [graphLock unlock]; - return [GraphChange reverseEdges:es]; -} - -- (int)indexOfNode:(Node *)node { - return [nodes indexOfObject:node]; -} - -- (void)setIndex:(int)idx ofNode:(Node *)node { - [graphLock lock]; - - if ([nodes containsObject:node]) { - [nodes removeObject:node]; - [nodes insertObject:node atIndex:idx]; - } - - [graphLock unlock]; -} - -- (int)indexOfEdge:(Edge *)edge { - return [edges indexOfObject:edge]; -} - -- (void)setIndex:(int)idx ofEdge:(Edge *)edge { - [graphLock lock]; - - if ([edges containsObject:edge]) { - [edges removeObject:edge]; - [edges insertObject:edge atIndex:idx]; - } - - [graphLock unlock]; -} - -- (GraphChange*)bringNodesForward:(NSSet*)nodeSet { - NSArray *oldOrder = [nodes copy]; - [graphLock lock]; - // start at the top of the array and work backwards - for (int i = [nodes count]-2; i >= 0; --i) { - if ( [nodeSet containsObject:[nodes objectAtIndex:i]] && - ![nodeSet containsObject:[nodes objectAtIndex:i+1]]) - { - [self setIndex:(i+1) ofNode:[nodes objectAtIndex:i]]; - } - } - GraphChange *change = [GraphChange nodeOrderChangeFrom:oldOrder to:nodes moved:nodeSet]; - [graphLock unlock]; - -#if ! __has_feature(objc_arc) - [oldOrder release]; -#endif - - return change; -} - -- (GraphChange*)bringNodesToFront:(NSSet*)nodeSet { - NSArray *oldOrder = [nodes copy]; - int i = 0, top = [nodes count]-1; - - while (i <= top) { - if ([nodeSet containsObject:[nodes objectAtIndex:i]]) { - [self setIndex:([nodes count]-1) ofNode:[nodes objectAtIndex:i]]; - --top; - } else { - ++i; - } - } - GraphChange *change = [GraphChange nodeOrderChangeFrom:oldOrder to:nodes moved:nodeSet]; - -#if ! __has_feature(objc_arc) - [oldOrder release]; -#endif - - return change; -} - -- (GraphChange*)bringEdgesForward:(NSSet*)edgeSet { - [graphLock lock]; - NSArray *oldOrder = [edges copy]; - // start at the top of the array and work backwards - for (int i = [edges count]-2; i >= 0; --i) { - if ( [edgeSet containsObject:[edges objectAtIndex:i]] && - ![edgeSet containsObject:[edges objectAtIndex:i+1]]) - { - [self setIndex:(i+1) ofEdge:[edges objectAtIndex:i]]; - } - } - GraphChange *change = [GraphChange edgeOrderChangeFrom:oldOrder to:edges moved:edgeSet]; - [graphLock unlock]; - -#if ! __has_feature(objc_arc) - [oldOrder release]; -#endif - - return change; -} - -- (GraphChange*)bringEdgesToFront:(NSSet*)edgeSet { - NSArray *oldOrder = [edges copy]; - int i = 0, top = [edges count]-1; - - while (i <= top) { - if ([edgeSet containsObject:[edges objectAtIndex:i]]) { - [self setIndex:([edges count]-1) ofEdge:[edges objectAtIndex:i]]; - --top; - } else { - ++i; - } - } - GraphChange *change = [GraphChange edgeOrderChangeFrom:oldOrder to:edges moved:edgeSet]; - -#if ! __has_feature(objc_arc) - [oldOrder release]; -#endif - - return change; -} - -- (GraphChange*)sendNodesBackward:(NSSet*)nodeSet { - [graphLock lock]; - NSArray *oldOrder = [nodes copy]; - // start at the top of the array and work backwards - for (int i = 1; i < [nodes count]; ++i) { - if ( [nodeSet containsObject:[nodes objectAtIndex:i]] && - ![nodeSet containsObject:[nodes objectAtIndex:i-1]]) - { - [self setIndex:(i-1) ofNode:[nodes objectAtIndex:i]]; - } - } - GraphChange *change = [GraphChange nodeOrderChangeFrom:oldOrder to:nodes moved:nodeSet]; - [graphLock unlock]; - -#if ! __has_feature(objc_arc) - [oldOrder release]; -#endif - - return change; -} - -- (GraphChange*)sendEdgesBackward:(NSSet*)edgeSet { - [graphLock lock]; - NSArray *oldOrder = [edges copy]; - // start at the top of the array and work backwards - for (int i = 1; i < [edges count]; ++i) { - if ( [edgeSet containsObject:[edges objectAtIndex:i]] && - ![edgeSet containsObject:[edges objectAtIndex:i-1]]) - { - [self setIndex:(i-1) ofEdge:[edges objectAtIndex:i]]; - } - } - GraphChange *change = [GraphChange edgeOrderChangeFrom:oldOrder to:edges moved:edgeSet]; - [graphLock unlock]; - -#if ! __has_feature(objc_arc) - [oldOrder release]; -#endif - - return change; -} - -- (GraphChange*)sendNodesToBack:(NSSet*)nodeSet { - NSArray *oldOrder = [nodes copy]; - int i = [nodes count]-1, bot = 0; - - while (i >= bot) { - if ([nodeSet containsObject:[nodes objectAtIndex:i]]) { - [self setIndex:0 ofNode:[nodes objectAtIndex:i]]; - ++bot; - } else { - --i; - } - } - GraphChange *change = [GraphChange nodeOrderChangeFrom:oldOrder to:nodes moved:nodeSet]; - -#if ! __has_feature(objc_arc) - [oldOrder release]; -#endif - - return change; -} - -- (GraphChange*)sendEdgesToBack:(NSSet*)edgeSet { - NSArray *oldOrder = [edges copy]; - int i = [edges count]-1, bot = 0; - - while (i >= bot) { - if ([edgeSet containsObject:[edges objectAtIndex:i]]) { - [self setIndex:0 ofEdge:[edges objectAtIndex:i]]; - ++bot; - } else { - --i; - } - } - GraphChange *change = [GraphChange edgeOrderChangeFrom:oldOrder to:edges moved:edgeSet]; - -#if ! __has_feature(objc_arc) - [oldOrder release]; -#endif - - return change; -} - -- (GraphChange*)insertGraph:(Graph*)g { - [graphLock lock]; - - for (Node *n in [g nodes]) { - [self addNode:n]; - } - - for (Edge *e in [g edges]) { - [self addEdge:e]; - } - - dirty = YES; - - [graphLock unlock]; - - - return [GraphChange graphAdditionWithNodes:[NSSet setWithArray:[g nodes]] edges:[NSSet setWithArray:[g edges]]]; -} - -- (void)flipNodes:(NSSet*)nds horizontal:(BOOL)horiz { - [graphLock lock]; - - NSRect bds = [Graph boundsForNodes:nds]; - float ctr; - if (horiz) ctr = bds.origin.x + (bds.size.width/2); - else ctr = bds.origin.y + (bds.size.height/2); - - Node *n; - NSPoint p; - NSEnumerator *en = [nds objectEnumerator]; - while ((n = [en nextObject])) { - p = [n point]; - if (horiz) p.x = 2 * ctr - p.x; - else p.y = 2 * ctr - p.y; - [n setPoint:p]; - } - - Edge *e; - en = [edges objectEnumerator]; - while ((e = [en nextObject])) { - if ([nds containsObject:[e source]] && - [nds containsObject:[e target]]) - { - if ([e bendMode] == EdgeBendModeInOut) { - if (horiz) { - if ([e inAngle] < 0) [e setInAngle:(-180 - [e inAngle])]; - else [e setInAngle:180 - [e inAngle]]; - - if ([e outAngle] < 0) [e setOutAngle:(-180 - [e outAngle])]; - else [e setOutAngle:180 - [e outAngle]]; - } else { - [e setInAngle:-[e inAngle]]; - [e setOutAngle:-[e outAngle]]; - } - } else { - [e setBend:-[e bend]]; - } - } - } - - [graphLock unlock]; -} - -- (GraphChange*)flipHorizontalNodes:(NSSet*)nds { - [self flipNodes:nds horizontal:YES]; - return [GraphChange flipNodes:nds horizontal:YES]; -} - -- (GraphChange*)flipVerticalNodes:(NSSet*)nds { - [self flipNodes:nds horizontal:NO]; - return [GraphChange flipNodes:nds horizontal:NO]; -} - -- (Graph*)copyOfSubgraphWithNodes:(NSSet*)nds { - return [self copyOfSubgraphWithNodes:nds zone:NSDefaultMallocZone()]; -} - -- (Graph*)copyOfSubgraphWithNodes:(NSSet*)nds zone:(NSZone*)zone { - [graphLock lock]; - - NSMapTable *newNds = [Graph nodeTableForNodes:nds withZone:zone]; - Graph* newGraph = [[Graph allocWithZone:zone] init]; - - for (Node *nd in [newNds objectEnumerator]) { - [newGraph addNode:nd]; - } - - for (Edge *e in edges) { - if ([nds containsObject:[e source]] && [nds containsObject:[e target]]) { - Edge *e1 = [e copyWithZone:zone]; - [e1 setSource:[newNds objectForKey:[e source]]]; - [e1 setTarget:[newNds objectForKey:[e target]]]; - [newGraph addEdge:e1]; -#if ! __has_feature(objc_arc) - [e1 release]; // e1 belongs to newGraph -#endif - } - } - - [graphLock unlock]; - - return newGraph; -} - -- (NSSet*)pathCover { - [self sync]; - - NSMutableSet *cover = [NSMutableSet set]; -#if ! __has_feature(objc_arc) - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; -#endif - NSMutableSet *remainingEdges = [NSMutableSet setWithArray:edges]; - - while ([remainingEdges count] != 0) { - NSMutableArray *path = [[NSMutableArray alloc] init]; - NSSet *succs; - Edge *succ; - NSEnumerator *en; - - Edge *e = [remainingEdges anyObject]; - - while (e!=nil) { - [path addObject:e]; - [remainingEdges removeObject:e]; - - succs = [self outEdgesForNode:[e target]]; - en = [succs objectEnumerator]; - e = nil; - - while ((succ = [en nextObject])) { - if ([remainingEdges containsObject:succ]) e = succ; - } - } - - [cover addObject:path]; -#if ! __has_feature(objc_arc) - [path release]; -#endif - } - -#if ! __has_feature(objc_arc) - [pool drain]; -#endif - return cover; -} - -- (void)applyGraphChange:(GraphChange*)ch { - [graphLock lock]; - switch ([ch changeType]) { - case GraphAddition: - for (Node *n in [[ch affectedNodes] objectEnumerator]) { - [nodes addObject:n]; - } - - for (Edge *e in [[ch affectedEdges] objectEnumerator]) { - [edges addObject:e]; - } - - break; - case GraphDeletion: - for (Edge *e in [[ch affectedEdges] objectEnumerator]) { - [edges removeObject:e]; - } - - for (Node *n in [[ch affectedNodes] objectEnumerator]) { - [nodes removeObject:n]; - } - - break; - case NodePropertyChange: - [[ch nodeRef] setPropertiesFromNode:[ch nwNode]]; - break; - case NodesPropertyChange: - for (Node *key in [[ch nwNodeTable] keyEnumerator]) { - [key setPropertiesFromNode:[[ch nwNodeTable] objectForKey:key]]; - } - break; - case EdgePropertyChange: - [[ch edgeRef] setPropertiesFromEdge:[ch nwEdge]]; - break; - case EdgesPropertyChange: - for (Edge *key in [[ch nwEdgeTable] keyEnumerator]) { - [key setPropertiesFromEdge:[[ch nwEdgeTable] objectForKey:key]]; - } - break; - case NodesShift: - for (Node *n in [[ch affectedNodes] objectEnumerator]) { - [n setPoint:NSMakePoint([n point].x + [ch shiftPoint].x, - [n point].y + [ch shiftPoint].y)]; - } - break; - case NodesFlip: - [self flipNodes:[ch affectedNodes] horizontal:[ch horizontal]]; - break; - case EdgesReverse: - for (Edge *e in [[ch affectedEdges] objectEnumerator]) { - [e reverse]; - } - break; - case BoundingBoxChange: - [self setBoundingBox:[ch nwBoundingBox]]; - break; - case GraphPropertyChange: - [data setArray:[ch nwGraphData]]; - break; - case NodeOrderChange: - [nodes setArray:[ch nwNodeOrder]]; - break; - case EdgeOrderChange: - [edges setArray:[ch nwEdgeOrder]]; - break; - } - - dirty = YES; - [graphLock unlock]; -} - -//- (void)undoGraphChange:(GraphChange*)ch { -// [self applyGraphChange:[GraphChange inverseGraphChange:ch]]; -//} - -- (NSString*)tikz { - [graphLock lock]; - - NSMutableString *code = [NSMutableString - stringWithFormat:@"\\begin{tikzpicture}%@\n", - [[self data] tikzList]]; - - if ([self hasBoundingBox]) { - [code appendFormat:@"\t\\path [use as bounding box] (%@,%@) rectangle (%@,%@);\n", - [NSNumber numberWithFloat:boundingBox.origin.x], - [NSNumber numberWithFloat:boundingBox.origin.y], - [NSNumber numberWithFloat:boundingBox.origin.x + boundingBox.size.width], - [NSNumber numberWithFloat:boundingBox.origin.y + boundingBox.size.height]]; - } - -// NSArray *sortedNodeList = [[nodes allObjects] -// sortedArrayUsingSelector:@selector(compareTo:)]; - //NSMutableDictionary *nodeNames = [NSMutableDictionary dictionary]; - - if ([nodes count] > 0) [code appendFormat:@"\t\\begin{pgfonlayer}{nodelayer}\n"]; - - int i = 0; - for (Node *n in nodes) { - [n updateData]; - [n setName:[NSString stringWithFormat:@"%d", i]]; - [code appendFormat:@"\t\t\\node %@ (%d) at (%@, %@) {%@};\n", - [[n data] tikzList], - i, - formatFloat([n point].x, 4), - formatFloat([n point].y, 4), - [n label] - ]; - i++; - } - - if ([nodes count] > 0) [code appendFormat:@"\t\\end{pgfonlayer}\n"]; - if ([edges count] > 0) [code appendFormat:@"\t\\begin{pgfonlayer}{edgelayer}\n"]; - - NSString *nodeStr; - for (Edge *e in edges) { - [e updateData]; - - if ([e hasEdgeNode]) { - nodeStr = [NSString stringWithFormat:@"node%@{%@} ", - [[[e edgeNode] data] tikzList], - [[e edgeNode] label] - ]; - } else { - nodeStr = @""; - } - - NSString *edata = [[e data] tikzList]; - - NSString *srcAnchor; - NSString *tgtAnchor; - - if ([[e sourceAnchor] isEqual:@""]) { - srcAnchor = @""; - } else { - srcAnchor = [NSString stringWithFormat:@".%@", [e sourceAnchor]]; - } - - if ([[e targetAnchor] isEqual:@""]) { - tgtAnchor = @""; - } else { - tgtAnchor = [NSString stringWithFormat:@".%@", [e targetAnchor]]; - } - - [code appendFormat:@"\t\t\\draw%@ (%@%@) to %@(%@%@);\n", - ([edata isEqual:@""]) ? @"" : [NSString stringWithFormat:@" %@", edata], - [[e source] name], - srcAnchor, - nodeStr, - ([e source] == [e target]) ? @"" : [[e target] name], - tgtAnchor - ]; - } - - if ([edges count] > 0) [code appendFormat:@"\t\\end{pgfonlayer}\n"]; - - [code appendString:@"\\end{tikzpicture}"]; - - [graphLock unlock]; - - return code; -} - -+ (Graph*)graph { -#if __has_feature(objc_arc) - return [[self alloc] init]; -#else - return [[[self alloc] init] autorelease]; -#endif -} - -+ (Graph*)graphFromTikz:(NSString*)tikz error:(NSError**)e { - return [TikzGraphAssembler parseTikz:tikz error:e]; -} - -+ (Graph*)graphFromTikz:(NSString*)tikz { - return [self graphFromTikz:tikz error:NULL]; -} - -+ (NSMapTable*)nodeTableForNodes:(NSSet*)nds { - return [self nodeTableForNodes:nds withZone:NSDefaultMallocZone()]; -} - -+ (NSMapTable*)nodeTableForNodes:(NSSet*)nds withZone:(NSZone*)zone { - NSMapTable *tab = [[NSMapTable allocWithZone:zone] - initWithKeyOptions:NSMapTableStrongMemory - valueOptions:NSMapTableStrongMemory - capacity:[nds count]]; - for (Node *n in nds) { - Node *ncopy = [n copyWithZone:zone]; - [tab setObject:ncopy forKey:n]; -#if ! __has_feature(objc_arc) - [ncopy release]; // tab should still retain ncopy. -#endif - } -#if __has_feature(objc_arc) - return tab; -#else - return [tab autorelease]; -#endif -} - -+ (NSMapTable*)edgeTableForEdges:(NSSet*)es { - return [self edgeTableForEdges:es withZone:NSDefaultMallocZone()]; -} - -+ (NSMapTable*)edgeTableForEdges:(NSSet*)es withZone:(NSZone*)zone { - NSMapTable *tab = [[NSMapTable allocWithZone:zone] - initWithKeyOptions:NSMapTableStrongMemory - valueOptions:NSMapTableStrongMemory - capacity:[es count]]; - for (Edge *e in es) { - Edge *ecopy = [e copyWithZone:zone]; - [tab setObject:ecopy forKey:e]; -#if ! __has_feature(objc_arc) - [ecopy release]; // tab should still retain ecopy. -#endif - } - return tab; -} - - -+ (NSRect)boundsForNodes:(id)nds { - NSPoint tl, br; - NSPoint p; - BOOL hasPoints = NO; - for (Node *n in nds) { - p = [n point]; - if (!hasPoints) { - tl = p; - br = p; - hasPoints = YES; - } else { - if (p.x < tl.x) tl.x = p.x; - if (p.y > tl.y) tl.y = p.y; - if (p.x > br.x) br.x = p.x; - if (p.y < br.y) br.y = p.y; - } - } - - return (hasPoints) ? NSRectAroundPoints(tl, br) : NSMakeRect(0, 0, 0, 0); -} - -@end - -@implementation Graph (Private) -- (void) shapeDictionaryReplaced:(NSNotification*)notification { - for (Edge *e in edges) { - [e recalculateProperties]; - } -} -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/GraphChange.h b/tikzit-1/src/common/GraphChange.h deleted file mode 100644 index 0e71a90..0000000 --- a/tikzit-1/src/common/GraphChange.h +++ /dev/null @@ -1,344 +0,0 @@ -// -// GraphChange.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "Node.h" -#import "Edge.h" - -typedef enum { - GraphAddition, - GraphDeletion, - NodePropertyChange, - EdgePropertyChange, - NodesPropertyChange, - EdgesPropertyChange, - NodesShift, - NodesFlip, - EdgesReverse, - BoundingBoxChange, - GraphPropertyChange, - NodeOrderChange, - EdgeOrderChange -} ChangeType; - -/*! - @class GraphChange - @brief Store the data associated with a graph change. - @details All of the methods that change a graph return an object of type GraphChange. - Graph changes can be re-done by calling [graph applyGraphChange:]. They can be undone - by calling applyGraphChange on [change inverse]. This class has no public initializer, - so everything should be constructed by factory methods. - */ -@interface GraphChange : NSObject { - ChangeType changeType; - - // for addition, deletion, and shifts - NSSet *affectedNodes; - NSSet *affectedEdges; - NSPoint shiftPoint; - - // for flip - BOOL horizontal; - - // for property changes - Node *nodeRef; - Edge *edgeRef; - - Node *oldNode, *nwNode; - Edge *oldEdge, *nwEdge; - NSMapTable *oldNodeTable, *nwNodeTable; - NSMapTable *oldEdgeTable, *nwEdgeTable; - NSRect oldBoundingBox, nwBoundingBox; - GraphElementData *oldGraphData, *nwGraphData; - - NSArray *oldNodeOrder, *nwNodeOrder; - NSArray *oldEdgeOrder, *nwEdgeOrder; -} - -/*! - @property changeType - @brief Type of GraphChange. - */ -@property (assign) ChangeType changeType; - -/*! - @property shiftPoint - @brief A point storing a shifted distance. - */ -@property (assign) NSPoint shiftPoint; - -/*! - @property horizontal - @brief Flags whether nodes were flipped horizontally - */ -@property (assign) BOOL horizontal; - -/*! - @property affectedNodes - @brief A set of nodes affected by this change, may be undefined. - */ -@property (copy) NSSet *affectedNodes; - -/*! - @property affectedEdges - @brief A set of edges affected by this change, may be undefined. - */ -@property (copy) NSSet *affectedEdges; - -/*! - @property nodeRef - @brief A reference to a single node affected by this change, may be undefined. - */ -@property (retain) Node *nodeRef; - -/*! - @property oldNode - @brief A copy of the node pre-change. - */ -@property (copy) Node *oldNode; - -/*! - @property nwNode - @brief A copy of the node post-change. - */ -@property (copy) Node *nwNode; - -/*! - @property edgeRef - @brief A reference to a single edge affected by this change, may be undefined. - */ -@property (retain) Edge *edgeRef; - -/*! - @property oldEdge - @brief A copy of the edge pre-change. - */ -@property (copy) Edge *oldEdge; - -/*! - @property nwEdge - @brief A copy of the edge post-change. - */ -@property (copy) Edge *nwEdge; - -/*! - @property oldNodeTable - @brief A a table containing copies of a set of nodes pre-change. - */ -@property (retain) NSMapTable *oldNodeTable; - -/*! - @property nwNodeTable - @brief A a table containing copies of a set of nodes post-change. - */ -@property (retain) NSMapTable *nwNodeTable; - -/*! - @property oldEdgeTable - @brief A a table containing copies of a set of edges pre-change. - */ -@property (retain) NSMapTable *oldEdgeTable; - -/*! - @property nwEdgeTable - @brief A a table containing copies of a set of edges post-change. - */ -@property (retain) NSMapTable *nwEdgeTable; - -/*! - @property oldBoundingBox - @brief The old bounding box. - */ -@property (assign) NSRect oldBoundingBox; - -/*! - @property nwBoundingBox - @brief The new bounding box. - */ -@property (assign) NSRect nwBoundingBox; - -/*! - @property oldGraphData - @brief The old graph data. - */ -@property (copy) GraphElementData *oldGraphData; - -/*! - @property nwGraphData - @brief The new graph data. - */ -@property (copy) GraphElementData *nwGraphData; - -/*! - @property oldNodeOrder - @brief The old node list. - */ -@property (copy) NSArray *oldNodeOrder; - -/*! - @property nwNodeOrder - @brief The new node list. - */ -@property (copy) NSArray *nwNodeOrder; - -/*! - @property oldEdgeOrder - @brief The old edge list. - */ -@property (copy) NSArray *oldEdgeOrder; - -/*! - @property nwEdgeOrder - @brief The new edge list. - */ -@property (copy) NSArray *nwEdgeOrder; - -/*! - @brief Invert a GraphChange. - @details Invert a GraphChange. Calling [graph applyGraphChange:[[graph msg:...] invert]] - should leave the graph unchanged for any method of Graph that returns a - GraphChange. - @result The inverse of the current Graph Change. - */ -- (GraphChange*)invert; - -/*! - @brief Construct a graph addition. affectedNodes are the added nodes, - affectedEdges are the added edges. - @param ns a set of nodes. - @param es a set of edges. - @result A graph addition. - */ -+ (GraphChange*)graphAdditionWithNodes:(NSSet*)ns edges:(NSSet*)es; - -/*! - @brief Construct a graph deletion. affectedNodes are the deleted nodes, - affectedEdges are the deleted edges. - @param ns a set of nodes. - @param es a set of edges. - @result A graph deletion. - */ -+ (GraphChange*)graphDeletionWithNodes:(NSSet*)ns edges:(NSSet*)es; - -/*! - @brief Construct a property change of a single node. - @param nd the affected node. - @param old a copy of the node pre-change - @param nw a copy of the node post-change - @result A property change of a single node. - */ -+ (GraphChange*)propertyChangeOfNode:(Node*)nd fromOld:(Node*)old toNew:(Node*)nw; - -/*! - @brief Construct a property change of a single edge. - @param e the affected edge. - @param old a copy of the edge pre-change - @param nw a copy of the edge post-change - @result A property change of a single node. - */ -+ (GraphChange*)propertyChangeOfEdge:(Edge*)e fromOld:(Edge *)old toNew:(Edge *)nw; - -/*! - @brief Construct a property change of set of nodes. - @details Construct a property change of set of nodes. oldC and newC should be - constructed using the class method [Graph nodeTableForNodes:] before - and after the property change, respectively. The affected nodes are - keys(oldC) = keys(newC). - @param oldC a table of copies of nodes pre-change - @param newC a table of copies of nodes post-change - @result A property change of a set of nodes. - */ -+ (GraphChange*)propertyChangeOfNodesFromOldCopies:(NSMapTable*)oldC - toNewCopies:(NSMapTable*)newC; - -/*! - @brief Construct a property change of set of edges. - @details Construct a property change of set of edges. oldC and newC should be - constructed using the class method [Graph edgeTableForEdges:] before - and after the property change, respectively. The affected edges are - keys(oldC) = keys(newC). - @param oldC a table of copies of edges pre-change - @param newC a table of copies of edges post-change - @result A property change of a set of edges. - */ -+ (GraphChange*)propertyChangeOfEdgesFromOldCopies:(NSMapTable*)oldC - toNewCopies:(NSMapTable*)newC; - - -/*! - @brief Construct a shift of a set of nodes by a given point. - @param ns the affected nodes. - @param p a point storing (dx,dy) - @result A shift of a set of nodes. - */ -+ (GraphChange*)shiftNodes:(NSSet*)ns byPoint:(NSPoint)p; - -/*! - @brief Construct a horizontal or vertical flip of a set of nodes. - @param ns the affected nodes. - @param b flag for whether to flip horizontally - @result A flip of a set of nodes. - */ -+ (GraphChange*)flipNodes:(NSSet*)ns horizontal:(BOOL)b; - -/*! - @brief Construct a reversal of a set of edges. - @param es the affected edges. - @result A reverse of a set of edges. - */ -+ (GraphChange*)reverseEdges:(NSSet*)es; - -/*! - @brief Construct a bounding box change - @param oldBB the old bounding box - @param newBB the new bounding box - @result A bounding box change. - */ -+ (GraphChange*)changeBoundingBoxFrom:(NSRect)oldBB to:(NSRect)newBB; - -/*! - @brief Construct a graph property change - @param oldData the old graph data - @param newData the new graph data - @result A graph property change. - */ -+ (GraphChange*)propertyChangeOfGraphFrom:(GraphElementData*)oldData to:(GraphElementData*)newData; - -/*! - @brief Construct a node order change - @param old The old ordering - @param new The new ordering - @result A node order change - */ -+ (GraphChange*)nodeOrderChangeFrom:(NSArray*)old to:(NSArray*)new moved:(NSSet*)affected; - -/*! - @brief Construct an edge order change - @param old The old ordering - @param new The new ordering - @result A edge order change - */ -+ (GraphChange*)edgeOrderChangeFrom:(NSArray*)old to:(NSArray*)new moved:(NSSet*)affected; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/GraphChange.m b/tikzit-1/src/common/GraphChange.m deleted file mode 100644 index 29a3939..0000000 --- a/tikzit-1/src/common/GraphChange.m +++ /dev/null @@ -1,369 +0,0 @@ -// -// GraphChange.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - - -// GraphChange : store the data associated to a single, undo-able change -// to a graph. An undo manager should maintain a stack of such changes -// and undo/redo them on request using [graph applyGraphChange:...]. - -#import "GraphChange.h" - - -@implementation GraphChange - -- (id)init { - return [super init]; -} - -- (void)dealloc { -#if ! __has_feature(objc_arc) - [affectedNodes release]; - [affectedEdges release]; - [nodeRef release]; - [edgeRef release]; - [oldNode release]; - [nwNode release]; - [oldEdge release]; - [nwEdge release]; - [oldNodeTable release]; - [nwNodeTable release]; - [oldEdgeTable release]; - [nwEdgeTable release]; - [oldGraphData release]; - [nwGraphData release]; - [oldNodeOrder release]; - [nwNodeOrder release]; - [oldEdgeOrder release]; - [nwEdgeOrder release]; - - [super dealloc]; -#endif -} - -@synthesize changeType; -@synthesize shiftPoint, horizontal; -@synthesize affectedEdges, affectedNodes; -@synthesize edgeRef, nodeRef; -@synthesize nwNode, oldNode; -@synthesize nwEdge, oldEdge; -@synthesize oldNodeTable, nwNodeTable; -@synthesize oldEdgeTable, nwEdgeTable; -@synthesize oldBoundingBox, nwBoundingBox; -@synthesize oldGraphData, nwGraphData; -@synthesize oldNodeOrder, nwNodeOrder; -@synthesize oldEdgeOrder, nwEdgeOrder; - -- (GraphChange*)invert { - GraphChange *inverse = [[GraphChange alloc] init]; - [inverse setChangeType:[self changeType]]; - switch ([self changeType]) { - case GraphAddition: - [inverse setChangeType:GraphDeletion]; -#if __has_feature(objc_arc) - inverse->affectedNodes = affectedNodes; - inverse->affectedEdges = affectedEdges; -#else - inverse->affectedNodes = [affectedNodes retain]; - inverse->affectedEdges = [affectedEdges retain]; -#endif - break; - case GraphDeletion: - [inverse setChangeType:GraphAddition]; -#if __has_feature(objc_arc) - inverse->affectedNodes = affectedNodes; - inverse->affectedEdges = affectedEdges; -#else - inverse->affectedNodes = [affectedNodes retain]; - inverse->affectedEdges = [affectedEdges retain]; -#endif - break; - case NodePropertyChange: -#if __has_feature(objc_arc) - inverse->nodeRef = nodeRef; - inverse->oldNode = nwNode; - inverse->nwNode = oldNode; -#else - inverse->nodeRef = [nodeRef retain]; - inverse->oldNode = [nwNode retain]; - inverse->nwNode = [oldNode retain]; -#endif - break; - case NodesPropertyChange: -#if __has_feature(objc_arc) - -#else - inverse->oldNodeTable = [nwNodeTable retain]; - inverse->nwNodeTable = [oldNodeTable retain]; -#endif - break; - case EdgePropertyChange: -#if __has_feature(objc_arc) - inverse->edgeRef = edgeRef; - inverse->oldEdge = nwEdge; - inverse->nwEdge = oldEdge; -#else - inverse->edgeRef = [edgeRef retain]; - inverse->oldEdge = [nwEdge retain]; - inverse->nwEdge = [oldEdge retain]; -#endif - break; - case EdgesPropertyChange: -#if __has_feature(objc_arc) - inverse->oldEdgeTable = nwEdgeTable; - inverse->nwEdgeTable = oldEdgeTable; -#else - inverse->oldEdgeTable = [nwEdgeTable retain]; - inverse->nwEdgeTable = [oldEdgeTable retain]; -#endif - break; - case NodesShift: -#if __has_feature(objc_arc) - inverse->affectedNodes = affectedNodes; -#else - inverse->affectedNodes = [affectedNodes retain]; -#endif - [inverse setShiftPoint:NSMakePoint(-[self shiftPoint].x, - -[self shiftPoint].y)]; - break; - case NodesFlip: -#if __has_feature(objc_arc) - inverse->affectedNodes = affectedNodes; -#else - inverse->affectedNodes = [affectedNodes retain]; -#endif - [inverse setHorizontal:[self horizontal]]; - break; - case EdgesReverse: -#if __has_feature(objc_arc) - inverse->affectedEdges = affectedEdges; -#else - inverse->affectedEdges = [affectedEdges retain]; -#endif - break; - case BoundingBoxChange: - inverse->oldBoundingBox = nwBoundingBox; - inverse->nwBoundingBox = oldBoundingBox; - break; - case GraphPropertyChange: -#if __has_feature(objc_arc) - inverse->oldGraphData = nwGraphData; - inverse->nwGraphData = oldGraphData; -#else - inverse->oldGraphData = [nwGraphData retain]; - inverse->nwGraphData = [oldGraphData retain]; -#endif - break; - case NodeOrderChange: -#if __has_feature(objc_arc) - inverse->affectedNodes = affectedNodes; - inverse->oldNodeOrder = nwNodeOrder; - inverse->nwNodeOrder = oldNodeOrder; -#else - inverse->affectedNodes = [affectedNodes retain]; - inverse->oldNodeOrder = [nwNodeOrder retain]; - inverse->nwNodeOrder = [oldNodeOrder retain]; -#endif - break; - case EdgeOrderChange: -#if __has_feature(objc_arc) - inverse->affectedEdges = affectedEdges; - inverse->oldEdgeOrder = nwEdgeOrder; - inverse->nwEdgeOrder = oldEdgeOrder; -#else - inverse->affectedEdges = [affectedEdges retain]; - inverse->oldEdgeOrder = [nwEdgeOrder retain]; - inverse->nwEdgeOrder = [oldEdgeOrder retain]; -#endif - break; - } -#if __has_feature(objc_arc) - return inverse; -#else - return [inverse autorelease]; -#endif -} - -+ (GraphChange*)graphAdditionWithNodes:(NSSet *)ns edges:(NSSet *)es { - GraphChange *gc = [[GraphChange alloc] init]; - [gc setChangeType:GraphAddition]; - [gc setAffectedNodes:ns]; - [gc setAffectedEdges:es]; -#if __has_feature(objc_arc) - return gc; -#else - return [gc autorelease]; -#endif -} - -+ (GraphChange*)graphDeletionWithNodes:(NSSet *)ns edges:(NSSet *)es { - GraphChange *gc = [[GraphChange alloc] init]; - [gc setChangeType:GraphDeletion]; - [gc setAffectedNodes:ns]; - [gc setAffectedEdges:es]; -#if __has_feature(objc_arc) - return gc; -#else - return [gc autorelease]; -#endif -} - -+ (GraphChange*)propertyChangeOfNode:(Node*)nd fromOld:(Node*)old toNew:(Node*)nw { - GraphChange *gc = [[GraphChange alloc] init]; - [gc setChangeType:NodePropertyChange]; - [gc setNodeRef:nd]; - [gc setOldNode:old]; - [gc setNwNode:nw]; -#if __has_feature(objc_arc) - return gc; -#else - return [gc autorelease]; -#endif -} - -+ (GraphChange*)propertyChangeOfNodesFromOldCopies:(NSMapTable*)oldC - toNewCopies:(NSMapTable*)newC { - GraphChange *gc = [[GraphChange alloc] init]; - [gc setChangeType:NodesPropertyChange]; - [gc setOldNodeTable:oldC]; - [gc setNwNodeTable:newC]; -#if __has_feature(objc_arc) - return gc; -#else - return [gc autorelease]; -#endif -} - -+ (GraphChange*)propertyChangeOfEdge:(Edge*)e fromOld:(Edge *)old toNew:(Edge *)nw { - GraphChange *gc = [[GraphChange alloc] init]; - [gc setChangeType:EdgePropertyChange]; - [gc setEdgeRef:e]; - [gc setOldEdge:old]; - [gc setNwEdge:nw]; -#if __has_feature(objc_arc) - return gc; -#else - return [gc autorelease]; -#endif -} - -+ (GraphChange*)propertyChangeOfEdgesFromOldCopies:(NSMapTable*)oldC - toNewCopies:(NSMapTable*)newC { - GraphChange *gc = [[GraphChange alloc] init]; - [gc setChangeType:EdgesPropertyChange]; - [gc setOldEdgeTable:oldC]; - [gc setNwEdgeTable:newC]; -#if __has_feature(objc_arc) - return gc; -#else - return [gc autorelease]; -#endif -} - -+ (GraphChange*)shiftNodes:(NSSet*)ns byPoint:(NSPoint)p { - GraphChange *gc = [[GraphChange alloc] init]; - [gc setChangeType:NodesShift]; - [gc setAffectedNodes:ns]; - [gc setShiftPoint:p]; -#if __has_feature(objc_arc) - return gc; -#else - return [gc autorelease]; -#endif -} - -+ (GraphChange*)flipNodes:(NSSet*)ns horizontal:(BOOL)b { - GraphChange *gc = [[GraphChange alloc] init]; - [gc setChangeType:NodesFlip]; - [gc setAffectedNodes:ns]; - [gc setHorizontal:b]; -#if __has_feature(objc_arc) - return gc; -#else - return [gc autorelease]; -#endif -} - -+ (GraphChange*)reverseEdges:(NSSet*)es { - GraphChange *gc = [[GraphChange alloc] init]; - [gc setChangeType:EdgesReverse]; - [gc setAffectedEdges:es]; -#if __has_feature(objc_arc) - return gc; -#else - return [gc autorelease]; -#endif -} - -+ (GraphChange*)changeBoundingBoxFrom:(NSRect)oldBB to:(NSRect)newBB { - GraphChange *gc = [[GraphChange alloc] init]; - [gc setChangeType:BoundingBoxChange]; - [gc setOldBoundingBox:oldBB]; - [gc setNwBoundingBox:newBB]; -#if __has_feature(objc_arc) - return gc; -#else - return [gc autorelease]; -#endif -} - -+ (GraphChange*)propertyChangeOfGraphFrom:(GraphElementData*)oldData to:(GraphElementData*)newData { - GraphChange *gc = [[GraphChange alloc] init]; - [gc setChangeType:GraphPropertyChange]; - [gc setOldGraphData:oldData]; - [gc setNwGraphData:newData]; -#if __has_feature(objc_arc) - return gc; -#else - return [gc autorelease]; -#endif -} - -+ (GraphChange*)nodeOrderChangeFrom:(NSArray*)old to:(NSArray*)new moved:(NSSet*)affected { - GraphChange *gc = [[GraphChange alloc] init]; - [gc setChangeType:NodeOrderChange]; - [gc setAffectedNodes:affected]; - [gc setOldNodeOrder:old]; - [gc setNwNodeOrder:new]; -#if __has_feature(objc_arc) - return gc; -#else - return [gc autorelease]; -#endif -} - -+ (GraphChange*)edgeOrderChangeFrom:(NSArray*)old to:(NSArray*)new moved:(NSSet*)affected { - GraphChange *gc = [[GraphChange alloc] init]; - [gc setChangeType:EdgeOrderChange]; - [gc setAffectedEdges:affected]; - [gc setOldEdgeOrder:old]; - [gc setNwEdgeOrder:new]; -#if __has_feature(objc_arc) - return gc; -#else - return [gc autorelease]; -#endif -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/GraphElementData.h b/tikzit-1/src/common/GraphElementData.h deleted file mode 100644 index a65e6df..0000000 --- a/tikzit-1/src/common/GraphElementData.h +++ /dev/null @@ -1,94 +0,0 @@ -// -// GraphElementData.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - - -#import - -/*! - @class GraphElementData - @brief Store extra data associated with a graph, node, or edge. - @details Store the extra (style, ...) data associated with - a graph, node, or edge. This data is stored as a mutable - array of properties. It also implements hash-like accessors, - but care should be taken using these, as the list can contain - multiple occurrences of the same key. - - Convention: Getters and setters act on the *first* occurrence - of the key. 'Unsetters' remove *all* occurrences. - */ -@interface GraphElementData : NSMutableArray { - NSMutableArray *properties; -} - -- (id)init; -+ (id)data; - -/*! - @brief Set the given value for the *first* property matching this key. Add a - new property if it doesn't already exist. - @param val the value to set - @param key the key for this property - */ -- (void)setProperty:(NSString*)val forKey:(NSString*)key; - -/*! - @brief Remove *all* occurences of the property with the given key. - @param key - */ -- (void)unsetProperty:(NSString*)key; - -/*! - @brief Return the value of the *first* occurrence of the given key. - @param key - */ -- (NSString*)propertyForKey:(NSString*)key; - -/*! - @brief Add the given atom to the list, if it's not already present. - @param atom - */ -- (void)setAtom:(NSString*)atom; - -/*! - @brief Remove *all* occurrences of the given atom. - @param atom - */ -- (void)unsetAtom:(NSString*)atom; - -/*! - @brief Returns YES if the list contains at least one occurrence of - the given atom. - @param atom - @result A boolean value. - */ -- (BOOL)isAtomSet:(NSString*)atom; - -/*! - @brief Returns a TikZ-friendly string containing all of the properties. - @result A string. - */ -- (NSString*)tikzList; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/GraphElementData.m b/tikzit-1/src/common/GraphElementData.m deleted file mode 100644 index 41dc9aa..0000000 --- a/tikzit-1/src/common/GraphElementData.m +++ /dev/null @@ -1,188 +0,0 @@ -// -// GraphElementData.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "GraphElementData.h" -#import "GraphElementProperty.h" - - -@implementation GraphElementData - -+ (id)data { -#if __has_feature(objc_arc) - return [[self alloc] init]; -#else - return [[[self alloc] init] autorelease]; -#endif -} - -- (id)init { - self = [super init]; - if (self) { - properties = [[NSMutableArray alloc] init]; - } - return self; -} - -// all of the array messages delegate to 'properties' - -- (NSUInteger)count { return [properties count]; } -- (id)objectAtIndex:(NSUInteger)index { - return [properties objectAtIndex:index]; -} -- (NSArray*)objectsAtIndexes:(NSIndexSet*)indexes { - return [properties objectsAtIndexes:indexes]; -} - -#if __has_feature(objc_arc) -- (void) getObjects:(__unsafe_unretained id*)buffer range:(NSRange)range { -#else -- (void) getObjects:(id*)buffer range:(NSRange)range { -#endif - [properties getObjects:buffer range:range]; -} - -- (void)insertObject:(id)anObject atIndex:(NSUInteger)index { - [properties insertObject:anObject atIndex:index]; -} -- (void)removeObjectAtIndex:(NSUInteger)index { - [properties removeObjectAtIndex:index]; -} -- (void)addObject:(id)anObject { - [properties addObject:anObject]; -} -- (void)removeLastObject { - [properties removeLastObject]; -} -- (void)replaceObjectAtIndex:(NSUInteger)index withObject:(id)anObject { - [properties replaceObjectAtIndex:index withObject:anObject]; -} - -#if __has_feature(objc_arc) -- (NSUInteger) countByEnumeratingWithState:(NSFastEnumerationState *)state - objects:(__unsafe_unretained id [])stackbuf - count:(NSUInteger)len { -#else -- (NSUInteger)countByEnumeratingWithState:(NSFastEnumerationState *)state - objects:(id *)stackbuf - count:(NSUInteger)len { -#endif - return [properties countByEnumeratingWithState:state objects:stackbuf count:len]; -} - -- (void)setProperty:(NSString*)val forKey:(NSString*)key { - GraphElementProperty *m = [[GraphElementProperty alloc] initWithKeyMatching:key]; - NSInteger idx = [properties indexOfObject:m]; -#if !__has_feature(objc_arc) - [m release]; -#endif - - GraphElementProperty *p; - if (idx == NSNotFound) { - p = [[GraphElementProperty alloc] initWithPropertyValue:val forKey:key]; - [properties addObject:p]; -#if !__has_feature(objc_arc) - [p release]; -#endif - } else { - p = [properties objectAtIndex:idx]; - [p setValue:val]; - } -} - -- (void)unsetProperty:(NSString*)key { - GraphElementProperty *m = [[GraphElementProperty alloc] initWithKeyMatching:key]; - [properties removeObject:m]; -#if !__has_feature(objc_arc) - [m release]; -#endif - -} - -- (NSString*)propertyForKey:(NSString*)key { - GraphElementProperty *m = [[GraphElementProperty alloc] initWithKeyMatching:key]; - NSInteger idx = [properties indexOfObject:m]; -#if !__has_feature(objc_arc) - [m release]; -#endif - - - if (idx == NSNotFound) { - return nil; - }else { - GraphElementProperty *p = [properties objectAtIndex:idx]; - return [p value]; - } -} - -- (void)setAtom:(NSString*)atom { - GraphElementProperty *a = [[GraphElementProperty alloc] initWithAtomName:atom]; - if (![properties containsObject:a]) [properties addObject:a]; -#if !__has_feature(objc_arc) - [a release]; -#endif -} - -- (void)unsetAtom:(NSString*)atom { - GraphElementProperty *a = [[GraphElementProperty alloc] initWithAtomName:atom]; - [properties removeObject:a]; -#if !__has_feature(objc_arc) - [a release]; -#endif -} - -- (BOOL)isAtomSet:(NSString*)atom { - GraphElementProperty *a = [[GraphElementProperty alloc] initWithAtomName:atom]; - BOOL set = [properties containsObject:a]; -#if !__has_feature(objc_arc) - [a release]; -#endif - return set; -} - -- (NSString*)tikzList { - NSString *s = [properties componentsJoinedByString:@", "]; - return ([s isEqualToString:@""]) ? @"" : [NSString stringWithFormat:@"[%@]", s]; -} - -- (id)copyWithZone:(NSZone *)zone { - GraphElementData *cp = [[GraphElementData allocWithZone:zone] init]; - for (GraphElementProperty *p in properties) { - GraphElementProperty *p2 = [p copy]; - [cp addObject:p2]; -#if !__has_feature(objc_arc) - [p2 release]; -#endif - } - return cp; -} - -- (void)dealloc { -#if !__has_feature(objc_arc) - [properties release]; - [super dealloc]; -#endif -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/GraphElementProperty.h b/tikzit-1/src/common/GraphElementProperty.h deleted file mode 100644 index 057cdbb..0000000 --- a/tikzit-1/src/common/GraphElementProperty.h +++ /dev/null @@ -1,88 +0,0 @@ -// -// GraphElementProperty.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import - -/*! - @class GraphElementProperty - @brief A property. I.e. a single entry in a node's/edge's/graph's - GraphElementData table. - */ -@interface GraphElementProperty : NSObject { - NSString *key; - NSString *value; - BOOL isAtom; - BOOL isKeyMatch; -} - -@property (copy) NSString *key; -@property (copy) NSString *value; -@property (readonly) BOOL isAtom; -@property (readonly) BOOL isKeyMatch; - -/*! - @brief Initialize a new key-matching object. - @param k a key to match - @result A key-matching object. - */ -- (id)initWithKeyMatching:(NSString*)k; -+ (id)keyMatching:(NSString*)k; - -/*! - @brief Initialize a new atomic property. - @param n the atom's name - @result An atom. - */ -- (id)initWithAtomName:(NSString*)n; -+ (id)atom:(NSString*)n; - -/*! - @brief Initialize a new property. - @param v the property's value - @param k the associated key - @result A property. - */ -- (id)initWithPropertyValue:(NSString*)v forKey:(NSString*)k; -+ (id)property:(NSString*)k withValue:(NSString*)v; - -/*! - @brief A matching function for properties. - @details Two properties match iff their keys match and one of the following: - (a) they are both atomic, (b) one is a key-matching and one is a non-atomic - property, or (c) they are both non-atomic and their values match. - @param object another GraphElementProperty - @result A boolean. - */ -- (BOOL)matches:(GraphElementProperty*)object; - -/*! - @brief An alias for matches:. This allows one to use built-in methods that - filter on isEqual: for NSObjects. - @param object another GraphElementProperty - @result A boolean. - */ -- (BOOL)isEqual:(id)object; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/GraphElementProperty.m b/tikzit-1/src/common/GraphElementProperty.m deleted file mode 100644 index 25e1b15..0000000 --- a/tikzit-1/src/common/GraphElementProperty.m +++ /dev/null @@ -1,164 +0,0 @@ -// -// -// GraphElementProperty.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "GraphElementProperty.h" -#import "NSString+Tikz.h" - -@implementation GraphElementProperty - -+ (id)atom:(NSString*)n { -#if __has_feature(objc_arc) - return [[self alloc] initWithAtomName:n]; -#else - return [[[self alloc] initWithAtomName:n] autorelease]; -#endif -} -+ (id)property:(NSString*)k withValue:(NSString*)v { -#if __has_feature(objc_arc) - return [[self alloc] initWithPropertyValue:v forKey:k]; -#else - return [[[self alloc] initWithPropertyValue:v forKey:k] autorelease]; -#endif -} -+ (id)keyMatching:(NSString*)k { -#if __has_feature(objc_arc) - return [[self alloc] initWithKeyMatching:k]; -#else - return [[[self alloc] initWithKeyMatching:k] autorelease]; -#endif -} - -- (id)initWithAtomName:(NSString*)n { - self = [super init]; - if (self) { - [self setKey:n]; - isAtom = YES; - } - return self; -} - -- (id)initWithPropertyValue:(NSString*)v forKey:(NSString*)k { - self = [super init]; - if (self) { - [self setKey:k]; - [self setValue:v]; - } - return self; -} - -- (id)initWithKeyMatching:(NSString*)k { - self = [super init]; - if (self) { - [self setKey:k]; - isKeyMatch = YES; - } - return self; -} - -- (void) dealloc { -#if ! __has_feature(objc_arc) - [key release]; - [value release]; - [super dealloc]; -#endif -} - -- (void)setValue:(NSString *)v { - if (value != v) { -#if ! __has_feature(objc_arc) - [value release]; -#endif - value = [v copy]; - } -} - -- (NSString*)value { - if (isAtom) { - return @"(atom)"; - } else { - return value; - } -} - - -- (void)setKey:(NSString *)k { - if (key != k) { -#if ! __has_feature(objc_arc) - [key release]; -#endif - key = [k copy]; - } - if (key == nil) - key = @""; // don't allow nil keys -} - -- (NSString*)key { - return key; -} - -- (BOOL)isAtom { return isAtom; } -- (BOOL)isKeyMatch { return isKeyMatch; } - -- (BOOL)matches:(GraphElementProperty*)object { - // properties and atoms are taken to be incomparable - if ([self isAtom] != [object isAtom]) return NO; - - // only compare keys if (a) we are both atoms, (b) i am a key match, or (c) object is a key match - if (([self isAtom] && [object isAtom]) || [self isKeyMatch] || [object isKeyMatch]) { - return [[self key] isEqual:[object key]]; - } - - // otherwise compare key and value - return [[self key] isEqual:[object key]] && [[self value] isEqual:[object value]]; -} - -- (BOOL)isEqual:(id)object { - return [self matches:object]; -} - -- (id)copyWithZone:(NSZone*)zone { - if (isAtom) { - return [[GraphElementProperty allocWithZone:zone] initWithAtomName:[self key]]; - } else if (isKeyMatch) { - return [[GraphElementProperty allocWithZone:zone] initWithKeyMatching:[self key]]; - } else { - return [[GraphElementProperty allocWithZone:zone] initWithPropertyValue:[self value] forKey:[self key]]; - } -} - -- (NSString*)description { - if ([self isAtom]) { - return [[self key] tikzEscapedString]; - } else if ([self isKeyMatch]) { - return [NSString stringWithFormat:@"%@=*", [[self key] tikzEscapedString]]; - } else { - return [NSString stringWithFormat:@"%@=%@", - [[self key] tikzEscapedString], - [[self value] tikzEscapedString]]; - } -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/Grid.h b/tikzit-1/src/common/Grid.h deleted file mode 100644 index b267536..0000000 --- a/tikzit-1/src/common/Grid.h +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import -#import "RenderContext.h" -#import "Transformer.h" - -/*! - * Provides a grid, which can be use for snapping points - * - * The grid is divided into cells, and each cell is further subdivided. - * These subdivisions are the snap points for the grid. - */ -@interface Grid: NSObject { - Transformer *transformer; - float spacing; - int cellSubdivisions; -} - -/*! - * The number of times to subdivide the edge of each cell - * - * Each cell will be divided into cellSubdivisions^2 squares. - */ -@property (assign) int cellSubdivisions; - -/*! - * The cell spacing - * - * Each cell will be @p cellSpacing wide and @p cellSpacing high. - */ -@property (assign) float cellSpacing; - - -/*! - * Create a new grid object. - * - * @param sp the cell spacing - this will be the width and height of each cell - * @param subs the number of cell subdivisions; the cell will end up being - * divided into subs*subs squares that are each sp/subs wide and high - * @param t the transformer to be used when snapping screen points - */ -+ (Grid*) gridWithSpacing:(float)sp subdivisions:(int)subs transformer:(Transformer*)t; -/*! - * Initialize a grid object. - * - * @param sp the cell spacing - this will be the width and height of each cell - * @param subs the number of cell subdivisions; each cell will end up being - * divided into subs*subs squares that are each sp/subs wide and high - * @param t the transformer to be used when snapping screen points - */ -- (id) initWithSpacing:(float)sp subdivisions:(int)subs transformer:(Transformer*)t; - -/*! - * Snap a point in screen co-ordinates - * - * @param p the point to snap, in screen co-ordinates - * @result @p p aligned to the nearest corner of a cell subdivision - */ -- (NSPoint) snapScreenPoint:(NSPoint)p; -/*! - * Snap a point in base co-ordinates - * - * @param p the point to snap - * @result @p p aligned to the nearest corner of a cell subdivision - */ -- (NSPoint) snapPoint:(NSPoint)p; - -/** - * Renders the grid - * - * The grid is rendered across the entire surface (subject to the context's - * clip). - * - * The internal transformer is used to convert between graph co-ordinates - * and graphics co-ordinates. - * - * @param cr the context to render in - */ -- (void) renderGridInContext:(id)cr; - -/** - * Renders the grid - * - * The grid is rendered across the entire surface (subject to the context's - * clip). - * - * @param cr the context to render in - * @param t a transformer that will be used to map graph co-ordinates - * to graphics co-ordinates - */ -- (void) renderGridInContext:(id)cr transformer:(Transformer*)t; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/Grid.m b/tikzit-1/src/common/Grid.m deleted file mode 100644 index f597a4a..0000000 --- a/tikzit-1/src/common/Grid.m +++ /dev/null @@ -1,186 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * Copyright 2010 Chris Heunen - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "Grid.h" -#import "util.h" - -@implementation Grid - -+ (Grid*) gridWithSpacing:(float)sp subdivisions:(int)subs transformer:(Transformer*)t { - return [[[self alloc] initWithSpacing:sp subdivisions:subs transformer:t] autorelease]; -} - -- (id) initWithSpacing:(float)sp subdivisions:(int)subs transformer:(Transformer*)t { - self = [super init]; - - if (self) { - transformer = [t retain]; - spacing = sp; - cellSubdivisions = subs; - } - - return self; -} - -- (id) copyWithZone:(NSZone*)zone { - return [[Grid allocWithZone:zone] - initWithSpacing:spacing - subdivisions:cellSubdivisions - transformer:transformer]; -} - -- (void) dealloc { - [transformer release]; - [super dealloc]; -} - -- (int) cellSubdivisions { - return cellSubdivisions; -} - -- (void) setCellSubdivisions:(int)count { - cellSubdivisions = count; -} - -- (float) cellSpacing { - return spacing; -} - -- (void) setCellSpacing:(float)sp { - spacing = sp; -} - -- (NSPoint) snapScreenPoint:(NSPoint)point { - NSPoint gridPoint = [transformer fromScreen:point]; - return [transformer toScreen:[self snapPoint:gridPoint]]; -} - -- (NSPoint) snapPoint:(NSPoint)p { - const float snapDistance = spacing/(float)cellSubdivisions; - p.x = roundToNearest (snapDistance, p.x); - p.y = roundToNearest (snapDistance, p.y); - return p; -} - -- (void) _setupLinesForContext:(id)context withSpacing:(float)offset omittingEvery:(int)omitEvery origin:(NSPoint)origin { - NSRect clip = [context clipBoundingBox]; - float clipx1 = clip.origin.x; - float clipx2 = clipx1 + clip.size.width; - float clipy1 = clip.origin.y; - float clipy2 = clipy1 + clip.size.height; - - // left of the Y axis, moving outwards - unsigned int count = 1; - float x = origin.x - offset; - while (x >= clipx1) { - if (omitEvery == 0 || (count % omitEvery != 0)) { - [context moveTo:NSMakePoint(x, clipy1)]; - [context lineTo:NSMakePoint(x, clipy2)]; - } - - x -= offset; - ++count; - } - // right of the Y axis, moving outwards - count = 1; - x = origin.x + offset; - while (x <= clipx2) { - if (omitEvery == 0 || (count % omitEvery != 0)) { - [context moveTo:NSMakePoint(x, clipy1)]; - [context lineTo:NSMakePoint(x, clipy2)]; - } - - x += offset; - ++count; - } - - // above the Y axis, moving outwards - count = 1; - float y = origin.y - offset; - while (y >= clipy1) { - if (omitEvery == 0 || (count % omitEvery != 0)) { - [context moveTo:NSMakePoint(clipx1, y)]; - [context lineTo:NSMakePoint(clipx2, y)]; - } - - y -= offset; - ++count; - } - // below the Y axis, moving outwards - count = 1; - y = origin.y + offset; - while (y <= clipy2) { - if (omitEvery == 0 || (count % omitEvery != 0)) { - [context moveTo:NSMakePoint(clipx1, y)]; - [context lineTo:NSMakePoint(clipx2, y)]; - } - - y += offset; - ++count; - } -} - -- (void) _renderSubdivisionsWithContext:(id)context origin:(NSPoint)origin cellSize:(float)cellSize { - const float offset = cellSize / cellSubdivisions; - - [self _setupLinesForContext:context withSpacing:offset omittingEvery:cellSubdivisions origin:origin]; - - [context strokePathWithColor:MakeSolidRColor (0.9, 0.9, 1.0)]; -} - -- (void) _renderCellsWithContext:(id)context origin:(NSPoint)origin cellSize:(float)cellSize { - [self _setupLinesForContext:context withSpacing:cellSize omittingEvery:0 origin:origin]; - - [context strokePathWithColor:MakeSolidRColor (0.8, 0.8, 0.9)]; -} - -- (void) _renderAxesWithContext:(id)context origin:(NSPoint)origin { - NSRect clip = [context clipBoundingBox]; - - [context moveTo:NSMakePoint(origin.x, clip.origin.y)]; - [context lineTo:NSMakePoint(origin.x, clip.origin.y + clip.size.height)]; - [context moveTo:NSMakePoint(clip.origin.x, origin.y)]; - [context lineTo:NSMakePoint(clip.origin.x + clip.size.width, origin.y)]; - - [context strokePathWithColor:MakeSolidRColor (0.6, 0.6, 0.7)]; -} - -- (void) renderGridInContext:(id)cr { - [self renderGridInContext:cr transformer:transformer]; -} - -- (void) renderGridInContext:(id)context transformer:(Transformer*)t { - const NSPoint origin = [t toScreen:NSZeroPoint]; - const float cellSize = [t scaleToScreen:spacing]; - - [context saveState]; - - // common line settings - [context setLineWidth:1.0]; - [context setAntialiasMode:AntialiasDisabled]; - - [self _renderSubdivisionsWithContext:context origin:origin cellSize:cellSize]; - [self _renderCellsWithContext:context origin:origin cellSize:cellSize]; - [self _renderAxesWithContext:context origin:origin]; - - [context restoreState]; -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/NSError+Tikzit.h b/tikzit-1/src/common/NSError+Tikzit.h deleted file mode 100644 index 0f45fba..0000000 --- a/tikzit-1/src/common/NSError+Tikzit.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import - -NSString* const TZErrorDomain; - -enum { - TZ_ERR_OTHER = 1, - TZ_ERR_BADSTATE, - TZ_ERR_BADFORMAT, - TZ_ERR_IO, - TZ_ERR_TOOL_FAILED, - TZ_ERR_NOTDIRECTORY, - TZ_ERR_PARSE -}; - -NSString* const TZToolOutputErrorKey; - -@interface NSError(Tikzit) -+ (NSString*)tikzitErrorDomain; -+ (id) errorWithMessage:(NSString*)message code:(NSInteger)code cause:(NSError*)cause; -+ (id) errorWithMessage:(NSString*)message code:(NSInteger)code; -+ (id) errorWithLibcError:(NSInteger)errnum; -- (NSString*)toolOutput; -@end - -void logError (NSError *error, NSString *message); - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/NSError+Tikzit.m b/tikzit-1/src/common/NSError+Tikzit.m deleted file mode 100644 index 6b9404b..0000000 --- a/tikzit-1/src/common/NSError+Tikzit.m +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "NSError+Tikzit.h" - -NSString* const TZErrorDomain = @"tikzit"; - -NSString* const TZToolOutputErrorKey = @"tool-output"; - -@implementation NSError(Tikzit) -+ (NSString*)tikzitErrorDomain { - return TZErrorDomain; -} - -+ (id) errorWithMessage:(NSString*)message code:(NSInteger)code cause:(NSError*)cause { - NSMutableDictionary *errorDetail = [NSMutableDictionary dictionaryWithCapacity:2]; - [errorDetail setValue:message forKey:NSLocalizedDescriptionKey]; - if (cause) - [errorDetail setValue:cause forKey:NSUnderlyingErrorKey]; - return [self errorWithDomain:TZErrorDomain code:code userInfo:errorDetail]; -} - -+ (id) errorWithMessage:(NSString*)message code:(NSInteger)code { - NSMutableDictionary *errorDetail = [NSMutableDictionary dictionaryWithObject:message - forKey:NSLocalizedDescriptionKey]; - return [self errorWithDomain:TZErrorDomain code:code userInfo:errorDetail]; -} - -+ (id) errorWithLibcError:(NSInteger)errnum { - NSString *message = [NSString stringWithUTF8String:strerror(errnum)]; - NSMutableDictionary *errorDetail = [NSMutableDictionary dictionaryWithObject:message - forKey:NSLocalizedDescriptionKey]; - return [self errorWithDomain:NSPOSIXErrorDomain code:errnum userInfo:errorDetail]; -} - -- (NSString*)toolOutput { - return [[self userInfo] objectForKey:TZToolOutputErrorKey]; -} - -@end - -void logError (NSError *error, NSString *message) { - if (message == nil) { - NSLog (@"%@", [error localizedDescription]); - } else { - NSLog (@"%@: %@", message, [error localizedDescription]); - } -} - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/NSFileManager+Utils.h b/tikzit-1/src/common/NSFileManager+Utils.h deleted file mode 100644 index 1349919..0000000 --- a/tikzit-1/src/common/NSFileManager+Utils.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// NSFileManager+Utils.h -// TikZiT -// -// Copyright 2010 Alex Merry -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import - -@interface NSFileManager(Utils) -- (BOOL) ensureDirectoryExists:(NSString*)path error:(NSError**)error; -@end - -// vi:ft=objc:sts=4:sw=4:ts=4:noet diff --git a/tikzit-1/src/common/NSFileManager+Utils.m b/tikzit-1/src/common/NSFileManager+Utils.m deleted file mode 100644 index 87ede95..0000000 --- a/tikzit-1/src/common/NSFileManager+Utils.m +++ /dev/null @@ -1,46 +0,0 @@ -// -// NSFileManager+Utils.h -// TikZiT -// -// Copyright 2010 Alex Merry -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "NSError+Tikzit.h" - -@implementation NSFileManager(Utils) -- (BOOL) ensureDirectoryExists:(NSString*)directory error:(NSError**)error { - BOOL isDirectory = NO; - if (![self fileExistsAtPath:directory isDirectory:&isDirectory]) { - if (![self createDirectoryAtPath:directory withIntermediateDirectories:YES attributes:nil error:error]) { - return NO; - } - } else if (!isDirectory) { - if (error) { - NSMutableDictionary *errorDetail = [NSMutableDictionary dictionary]; - [errorDetail setValue:@"Directory is a file" forKey:NSLocalizedDescriptionKey]; - [errorDetail setValue:directory forKey:NSFilePathErrorKey]; - *error = [NSError errorWithDomain:TZErrorDomain code:TZ_ERR_NOTDIRECTORY userInfo:errorDetail]; - } - return NO; - } - return YES; -} -@end - -// vi:ft=objc:sts=4:sw=4:ts=4:noet diff --git a/tikzit-1/src/common/NSString+LatexConstants.h b/tikzit-1/src/common/NSString+LatexConstants.h deleted file mode 100644 index f4b5236..0000000 --- a/tikzit-1/src/common/NSString+LatexConstants.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// NSString+LatexConstants.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import - - -@interface NSString(LatexConstants) - -- (NSString*)stringByExpandingLatexConstants; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/NSString+LatexConstants.m b/tikzit-1/src/common/NSString+LatexConstants.m deleted file mode 100644 index 634c189..0000000 --- a/tikzit-1/src/common/NSString+LatexConstants.m +++ /dev/null @@ -1,212 +0,0 @@ -// -// NSString+LatexConstants.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "NSString+LatexConstants.h" - -// can't use sizeof() in non-fragile ABI (eg: clang) -#define texConstantCount 63 -static NSString *texConstantNames[texConstantCount] = { - @"alpha", - @"beta", - @"gamma", - @"delta", - @"epsilon", - @"zeta", - @"eta", - @"theta", - @"iota", - @"kappa", - @"lambda", - @"mu", - @"nu", - @"xi", - @"pi", - @"rho", - @"sigma", - @"tau", - @"upsilon", - @"phi", - @"chi", - @"psi", - @"omega", - @"Gamma", - @"Delta", - @"Theta", - @"Lambda", - @"Xi", - @"Pi", - @"Sigma", - @"Upsilon", - @"Phi", - @"Psi", - @"Omega", - - @"pm", - @"to", - @"Rightarrow", - @"Leftrightarrow", - @"forall", - @"partial", - @"exists", - @"emptyset", - @"nabla", - @"in", - @"notin", - @"prod", - @"sum", - @"surd", - @"infty", - @"wedge", - @"vee", - @"cap", - @"cup", - @"int", - @"approx", - @"neq", - @"equiv", - @"leq", - @"geq", - @"subset", - @"supset", - @"cdot", - @"ldots" -}; - -static char * texConstantCodes[texConstantCount] = { - "\u03b1","\u03b2","\u03b3","\u03b4","\u03b5","\u03b6","\u03b7", - "\u03b8","\u03b9","\u03ba","\u03bb","\u03bc","\u03bd","\u03be", - "\u03c0","\u03c1","\u03c3","\u03c4","\u03c5","\u03c6","\u03c7", - "\u03c8","\u03c9","\u0393","\u0394","\u0398","\u039b","\u039e", - "\u03a0","\u03a3","\u03a5","\u03a6","\u03a8","\u03a9", - - "\u00b1","\u2192","\u21d2","\u21d4","\u2200","\u2202","\u2203", - "\u2205","\u2207","\u2208","\u2209","\u220f","\u2211","\u221a", - "\u221e","\u2227","\u2228","\u2229","\u222a","\u222b","\u2248", - "\u2260","\u2261","\u2264","\u2265","\u2282","\u2283","\u22c5", - "\u2026" -}; - -#define texModifierCount 10 -static NSString *texModifierNames[texModifierCount] = { - @"tiny", - @"scriptsize", - @"footnotesize", - @"small", - @"normalsize", - @"large", - @"Large", - @"LARGE", - @"huge", - @"Huge" -}; - -static NSDictionary *texConstants = nil; -static NSSet *texModifiers = nil; - -@implementation NSString(LatexConstants) - -- (NSString*)stringByExpandingLatexConstants { - - if (texConstants == nil) { - NSMutableDictionary *constants = [[NSMutableDictionary alloc] initWithCapacity:texConstantCount]; - for (int i = 0; i < texConstantCount; ++i) { - [constants setObject:[NSString stringWithUTF8String:texConstantCodes[i]] forKey:texConstantNames[i]]; - } - texConstants = constants; - } - if (texModifiers == nil) { - texModifiers = [[NSSet alloc] initWithObjects:texModifierNames count:texModifierCount]; - } - - NSMutableString *buf = [[NSMutableString alloc] initWithCapacity:[self length]]; - NSMutableString *wordBuf = [[NSMutableString alloc] initWithCapacity:10]; - - unichar c_a = [@"a" characterAtIndex:0]; - unichar c_z = [@"z" characterAtIndex:0]; - unichar c_A = [@"A" characterAtIndex:0]; - unichar c_Z = [@"Z" characterAtIndex:0]; - - int state = 0; - // a tiny little DFA to replace \\([\w*]) with unicode of $1 - unichar c; - NSString *code; - int i; - for (i = 0; i<[self length]; ++i) { - c = [self characterAtIndex:i]; - switch (state) { - case 0: - if (c=='\\') { - state = 1; - } else if (c!='$') { - [buf appendFormat:@"%C", c]; - } - break; - case 1: - if ((c>=c_a && c<=c_z) || (c>=c_A && c<=c_Z)) { - [wordBuf appendFormat:@"%C", c]; - } else { - code = [texConstants objectForKey:wordBuf]; - if (code != nil) { - [buf appendString:code]; - } else if (![texModifiers containsObject:wordBuf]) { - [buf appendFormat:@"\\%@", wordBuf]; - } - - [wordBuf setString:@""]; - if (c=='\\') { - state = 1; - } else { - if (c!='$') { - [buf appendFormat:@"%C", c]; - } - state = 0; - } - - } - break; - } - } - - if (state == 1) { - code = [texConstants objectForKey:wordBuf]; - if (code != nil) { - [buf appendString:code]; - } else if (![texModifiers containsObject:wordBuf]) { - [buf appendFormat:@"\\%@", wordBuf]; - } - } - - NSString *ret = [buf copy]; -#if __has_feature(objc_arc) - return ret; -#else - [buf release]; - [wordBuf release]; - - return [ret autorelease]; -#endif -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/NSString+Tikz.h b/tikzit-1/src/common/NSString+Tikz.h deleted file mode 100644 index ea6ea40..0000000 --- a/tikzit-1/src/common/NSString+Tikz.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2013 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import - -@interface NSString (Tikz) - - (NSString*) tikzEscapedString; - - (BOOL) isValidTikzPropertyNameOrValue; - - (BOOL) isValidAnchor; -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/NSString+Tikz.m b/tikzit-1/src/common/NSString+Tikz.m deleted file mode 100644 index 1e3073b..0000000 --- a/tikzit-1/src/common/NSString+Tikz.m +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright 2013 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "NSString+Tikz.h" -#import "TikzGraphAssembler.h" - -@implementation NSString (Tikz) - -- (NSString*) tikzEscapedString { - static NSCharacterSet *avoid = nil; - if (avoid == nil) -#if __has_feature(objc_arc) - avoid = [[NSCharacterSet characterSetWithCharactersInString:@"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ<>-'0123456789. "] invertedSet]; -#else - avoid = [[[NSCharacterSet characterSetWithCharactersInString:@"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ<>-'0123456789. "] invertedSet] retain]; -#endif - - - if ([self rangeOfCharacterFromSet:avoid].length > 0) { - return [NSString stringWithFormat:@"{%@}", self]; - } else { -#if __has_feature(objc_arc) - return self; -#else - return [[self retain] autorelease]; -#endif - } -} - -- (BOOL) isValidTikzPropertyNameOrValue { - NSUInteger length = [self length]; - unsigned int brace_depth = 0; - unsigned int escape = 0; - for (NSUInteger i = 0; i < length; ++i) { - unichar c = [self characterAtIndex:i]; - - if (escape) { - escape = 0; - } else if (c == '\\') { - escape = 1; - } else if (c == '{') { - brace_depth++; - } else if (c == '}') { - if (brace_depth == 0) - return NO; - brace_depth--; - } - } - return !escape && brace_depth == 0; -} - -- (BOOL) isValidAnchor { - return [TikzGraphAssembler validateTikzEdgeAnchor:self]; -} - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/NSString+Util.h b/tikzit-1/src/common/NSString+Util.h deleted file mode 100644 index 548edb3..0000000 --- a/tikzit-1/src/common/NSString+Util.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2013 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import - -@interface NSString (Util) - + (NSString*) stringWithContentsOfFile:(NSString*)path - error:(NSError**)error; - - (id) initWithContentsOfFile:(NSString*)path - error:(NSError**)error; -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/NSString+Util.m b/tikzit-1/src/common/NSString+Util.m deleted file mode 100644 index b18f397..0000000 --- a/tikzit-1/src/common/NSString+Util.m +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright 2013 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import -#import "NSString+Util.h" -#import "NSError+Tikzit.h" - -@implementation NSString (Util) -+ (NSString*) stringWithContentsOfFile:(NSString*)path - error:(NSError**)error -{ - return [[[self alloc] initWithContentsOfFile:path error:error] autorelease]; -} -- (id) initWithContentsOfFile:(NSString*)path - error:(NSError**)error -{ - // Fun fact: on GNUstep, at least, - // [stringWithContentsOfFile:usedEncoding:error:] only - // sets error objects if the decoding fails, not if file - // access fails. - // Fun fact 2: on GNUstep, trying to read a directory using - // [stringWithContentsOfFile:] causes an out-of-memory error; - // hence we do these checks *before* trying to read the file. - NSFileManager *fm = [NSFileManager defaultManager]; - BOOL isDir = NO; - NSString *msg = nil; - if (![fm fileExistsAtPath:path isDirectory:&isDir]) { - msg = [NSString stringWithFormat:@"\"%@\" does not exist", path]; - } else if (isDir) { - msg = [NSString stringWithFormat:@"\"%@\" is a directory", path]; - } else if (![fm isReadableFileAtPath:path]) { - msg = [NSString stringWithFormat:@"\"%@\" is not readable", path]; - } - if (msg != nil) { - if (error) { - *error = [NSError errorWithMessage:msg - code:TZ_ERR_IO]; - } - return nil; - } - self = [self initWithContentsOfFile:path]; - if (self == nil) { - if (error) { - *error = [NSError errorWithMessage:@"unknown error" - code:TZ_ERR_IO]; - } - } - return self; -} -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/Node.h b/tikzit-1/src/common/Node.h deleted file mode 100644 index 1e580ce..0000000 --- a/tikzit-1/src/common/Node.h +++ /dev/null @@ -1,181 +0,0 @@ -// -// Node.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - - -// Node : store the data associated with a node. - -#import - -#import "NodeStyle.h" -#import "GraphElementData.h" - -@class GraphElementProperty; -@class Shape; -@class Transformer; - -/*! - @class Node - @brief A graph node, with associated location and style data. - */ -@interface Node : NSObject { - NSPoint point; - NodeStyle *style; - NSString *name; - NSString *label; - GraphElementData *data; -} - -/*! - @property shape - @brief The shape to use - @detail This is a convenience property that resolves the shape name - from the style, and uses a circle if there is no style. - - This property is NOT KVO-compliant - */ -@property (readonly) Shape *shape; - -/*! - @property point - @brief The point where this node is located. - */ -@property (assign) NSPoint point; - -/*! - @property style - @brief The style of this node. - */ -@property (retain) NodeStyle *style; - -/*! - @property name - @brief The name of this node. This is a temporary name and may change between - successive TikZ outputs. - */ -@property (copy) NSString *name; - -/*! - @property label - @brief The latex label that appears on this node. - */ -@property (copy) NSString *label; - -/*! - @property data - @brief Associated extra data. - */ -@property (copy) GraphElementData *data; - -// KVC methods -- (void) insertObject:(GraphElementProperty*)gep - inDataAtIndex:(NSUInteger)index; -- (void) removeObjectFromDataAtIndex:(NSUInteger)index; -- (void) replaceObjectInDataAtIndex:(NSUInteger)index - withObject:(GraphElementProperty*)gep; - -/*! - @brief Initialize a new node with the given point. - @param p a point. - @result A node. - */ -- (id)initWithPoint:(NSPoint)p; - -/*! - @brief Initialize a new node at (0,0). - @result A node. - */ -- (id)init; - -/*! - @brief Composes the shape transformer with another transformer - @param t The transform to apply before the shape transform - @result A transformer that first maps according to t, then according - to -shapeTransformer. - */ -- (Transformer*) shapeTransformerFromTransformer:(Transformer*)t; - -/*! - @brief A transformer that may be used to convert the shape to the - right position and scale - */ -- (Transformer*) shapeTransformer; - -/*! - @brief The bounding rect in the given co-ordinate system - @detail This is the bounding rect of the shape (after being - suitably translated and scaled). The label is not - considered. - @param shapeTrans The mapping from graph co-ordinates to the required - co-ordinates - @result The bounding rectangle - */ -- (NSRect) boundsUsingShapeTransform:(Transformer*)shapeTrans; - -/*! - @brief The bounding rect in graph co-ordinates - @detail This is the bounding rect of the shape (after being suitably - translated and scaled). The label is not considered. - */ -- (NSRect) boundingRect; - -/*! - @brief Try to attach a style of the correct name from the given style list. - @param styles an array of styles. - @result YES if successfully attached, NO otherwise. - */ -- (BOOL)attachStyleFromTable:(NSArray*)styles; - -/*! - @brief Set node properties from GraphElementData. - */ -- (void)updateData; - -/*! - @brief Set properties of this node to match the given node. - @param nd a node to mimic. - */ -- (void)setPropertiesFromNode:(Node *)nd; - -/*! - @brief Compare a node to another node using a lex ordering on coordinates. - @param nd another node. - @result A comparison result. - */ -- (NSComparisonResult)compareTo:(id)nd; - -/*! - @brief Factory method to construct a node with the given point. - @param p a point. - @result A node. - */ -+ (Node*)nodeWithPoint:(NSPoint)p; - -/*! - @brief Factory method to construct a node at (0,0). - @result A node. - */ -+ (Node*)node; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/Node.m b/tikzit-1/src/common/Node.m deleted file mode 100644 index c5b11d1..0000000 --- a/tikzit-1/src/common/Node.m +++ /dev/null @@ -1,214 +0,0 @@ -// -// Node.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "Node.h" - -#import "Shape.h" - - -@implementation Node - -- (id)initWithPoint:(NSPoint)p { - self = [super init]; - if (self) { - data = [[GraphElementData alloc] init]; - style = nil; - label = @""; - point = p; - } - return self; -} - -- (id)init { - return [self initWithPoint:NSMakePoint(0.0f, 0.0f)]; -} - -- (id)copyWithZone:(NSZone*)z { - Node *cp = [[Node allocWithZone:z] init]; - [cp setPropertiesFromNode:self]; - return cp; -} - -- (void)dealloc { -#if ! __has_feature(objc_arc) - [name release]; - [style release]; - [data release]; - [label release]; - [super dealloc]; -#endif -} - -- (Shape*) shape { - if (style) { - return [Shape shapeForName:[style shapeName]]; - } else { - return nil; - } -} - -- (Transformer*) shapeTransformerFromTransformer:(Transformer*)t { - // we take a copy to keep the reflection attributes -#if ! __has_feature(objc_arc) - Transformer *transformer = [[t copy] autorelease]; -#else - Transformer *transformer = [t copy]; -#endif - NSPoint screenPos = [t toScreen:point]; - [transformer setOrigin:screenPos]; - float scale = [t scale]; - if (style) { - scale *= [style scale]; - } - [transformer setScale:scale]; - return transformer; -} - -- (Transformer*) shapeTransformer { - float scale = 1.0f; - if (style) { - scale = [style scale]; - } - return [Transformer transformerWithOrigin:point andScale:scale]; -} - -- (NSRect) boundsUsingShapeTransform:(Transformer*)shapeTrans { - //if (style) { - return [shapeTrans rectToScreen:[[self shape] boundingRect]]; - /*} else { - NSRect r = NSZeroRect; - r.origin = [shapeTrans toScreen:[self point]]; - return r; - }*/ -} - -- (NSRect) boundingRect { - return [self boundsUsingShapeTransform:[self shapeTransformer]]; -} - -- (BOOL)attachStyleFromTable:(NSArray*)styles { -#if __has_feature(objc_arc) - NSString *style_name = [data propertyForKey:@"style"]; -#else - NSString *style_name = [[[data propertyForKey:@"style"] retain] autorelease]; -#endif - - [self setStyle:nil]; - - // 'none' is a reserved style - if (style_name == nil || [style_name isEqualToString:@"none"]) return YES; - - for (NodeStyle *s in styles) { - if ([[s name] compare:style_name]==NSOrderedSame) { - [self setStyle:s]; - return YES; - } - } - - // if we didn't find a style, fill in a default one - [self setStyle:[NodeStyle defaultNodeStyleWithName:style_name]]; - return NO; -} - -- (void)updateData { - if (style == nil) { - [data setProperty:@"none" forKey:@"style"]; - } else { - [data setProperty:[style name] forKey:@"style"]; - } -} - -- (void)setPropertiesFromNode:(Node*)nd { - [self setPoint:[nd point]]; - [self setStyle:[nd style]]; - [self setName:[nd name]]; - [self setData:[nd data]]; - [self setLabel:[nd label]]; -} - -+ (Node*)nodeWithPoint:(NSPoint)p { -#if __has_feature(objc_arc) - return [[Node alloc] initWithPoint:p]; -#else - return [[[Node alloc] initWithPoint:p] autorelease]; -#endif -} - -+ (Node*)node { -#if __has_feature(objc_arc) - return [[Node alloc] init]; -#else - return [[[Node alloc] init] autorelease]; -#endif -} - - -// perform a lexicographic ordering (-y, x) on coordinates. -- (NSComparisonResult)compareTo:(id)nd { - Node *node = (Node*)nd; - if (point.y > [node point].y) return NSOrderedAscending; - else if (point.y < [node point].y) return NSOrderedDescending; - else { - if (point.x < [node point].x) return NSOrderedAscending; - else if (point.x > [node point].x) return NSOrderedDescending; - else return NSOrderedSame; - } -} - -@synthesize name; -@synthesize label; -@synthesize point; - -@synthesize data; -- (void) insertObject:(GraphElementProperty*)gep - inDataAtIndex:(NSUInteger)index { - [data insertObject:gep atIndex:index]; -} -- (void) removeObjectFromDataAtIndex:(NSUInteger)index { - [data removeObjectAtIndex:index]; -} -- (void) replaceObjectInDataAtIndex:(NSUInteger)index - withObject:(GraphElementProperty*)gep { - [data replaceObjectAtIndex:index withObject:gep]; -} - -- (NodeStyle*)style { - return style; -} - -- (void)setStyle:(NodeStyle *)st { - if (style != st) { -#if __has_feature(objc_arc) - style = st; -#else - NodeStyle *oldStyle = style; - style = [st retain]; - [oldStyle release]; -#endif - } - [self updateData]; -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/NodeStyle.h b/tikzit-1/src/common/NodeStyle.h deleted file mode 100644 index 034f95d..0000000 --- a/tikzit-1/src/common/NodeStyle.h +++ /dev/null @@ -1,125 +0,0 @@ -// -// NodeStyle.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "util.h" -#import "ColorRGB.h" -#import "PropertyHolder.h" - -/*! - @class NodeStyle - @brief Store node style information. - @details Store node style information. These properties affect how a node - is displayed in TikZiT. Colors are stored in the ColorRGB struct - to avoid any Cocoa dependency. These styles should be persistant, - which should be implemented in a platform-specific category. For - OS X, this is NodeStyle+Coder. - */ -@interface NodeStyle : PropertyHolder { - int strokeThickness; - float scale; - ColorRGB *strokeColorRGB; - ColorRGB *fillColorRGB; - NSString *name; - NSString *shapeName; - NSString *category; -} - -/*! - @property strokeThickness - @brief Thickness of the stroke. - */ -@property (assign) int strokeThickness; - -/*! - @property scale - @brief Overall scale of the shape. Defaults to 1.0. - */ -@property (assign) float scale; - - -/*! - @property strokeColorRGB - @brief The stroke color used to render the node - */ -@property (copy) ColorRGB *strokeColorRGB; - -/*! - @property fillColorRGB - @brief The fill color used to render the node - */ -@property (copy) ColorRGB *fillColorRGB; - -/*! - @property name - @brief Style name. - @details Style name. This is the only thing that affects how the node - will look when the latex code is rendered. - */ -@property (copy) NSString *name; - -/*! - @property shapeName - @brief The name of the shape that will be drawn in TikZiT. - */ -@property (copy) NSString *shapeName; - -/*! - @property category - @brief ??? - */ -@property (copy) NSString *category; - -@property (readonly) NSString *tikz; -@property (readonly) BOOL strokeColorIsKnown; -@property (readonly) BOOL fillColorIsKnown; - -+ (int) defaultStrokeThickness; - -/*! - @brief Designated initializer. Construct a blank style with name 'new'. - @result A default style. - */ -- (id)init; - -/*! - @brief Create a named style. - @param nm the style name. - @result A NodeStyle with the given name. - */ -- (id)initWithName:(NSString *)nm; - -/*! - @brief Factory method for initWithName: - @param nm the style name. - @result A NodeStyle with the given name. - */ -+ (NodeStyle*)defaultNodeStyleWithName:(NSString *)nm; - -/*! - * Make this style the same as the given one - */ -- (void) updateFromStyle:(NodeStyle*)style; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/NodeStyle.m b/tikzit-1/src/common/NodeStyle.m deleted file mode 100644 index 193d44d..0000000 --- a/tikzit-1/src/common/NodeStyle.m +++ /dev/null @@ -1,246 +0,0 @@ -// -// NodeStyle.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "NodeStyle.h" -#import "Shape.h" -#import "ShapeNames.h" - -@implementation NodeStyle - -+ (void)initialize { - [self setKeys:[NSArray arrayWithObjects: - @"fillColorRGB.red", - @"fillColorRGB.blue", - @"fillColorRGB.green", - @"strokeColorRGB.red", - @"strokeColorRGB.blue", - @"strokeColorRGB.green", - @"strokeThickness", - @"shapeName", - @"name", - nil] - triggerChangeNotificationsForDependentKey:@"tikz"]; - [self setKeys:[NSArray arrayWithObjects: - @"fillColorRGB.name", - nil] - triggerChangeNotificationsForDependentKey:@"fillColorIsKnown"]; - [self setKeys:[NSArray arrayWithObjects: - @"strokeColorRGB.name", - nil] - triggerChangeNotificationsForDependentKey:@"strokeColorIsKnown"]; -} - -+ (int) defaultStrokeThickness { return 1; } - -- (id)initWithName:(NSString*)nm { - self = [super initWithNotificationName:@"NodeStylePropertyChanged"]; - if (self != nil) { - strokeThickness = [NodeStyle defaultStrokeThickness]; - scale = 1.0f; - strokeColorRGB = [[ColorRGB alloc] initWithRed:0 green:0 blue:0]; - fillColorRGB = [[ColorRGB alloc] initWithRed:255 green:255 blue:255]; - - name = nm; - category = nil; - shapeName = SHAPE_CIRCLE; - } - return self; -} - -- (id)init { - self = [self initWithName:@"new"]; - return self; -} - -- (id)copyWithZone:(NSZone*)zone { - NodeStyle *style = [[NodeStyle allocWithZone:zone] init]; - - [style setStrokeThickness:[self strokeThickness]]; - [style setScale:[self scale]]; - [style setStrokeColorRGB:[self strokeColorRGB]]; - [style setFillColorRGB:[self fillColorRGB]]; - [style setName:[self name]]; - [style setShapeName:[self shapeName]]; - [style setCategory:[self category]]; - - return style; -} - -- (void)dealloc { -#if ! __has_feature(objc_arc) - [name release]; - [category release]; - [shapeName release]; - [strokeColorRGB release]; - [fillColorRGB release]; - [super dealloc]; -#endif -} - -- (NSString*) description { - return [NSString stringWithFormat:@"Node style \"%@\"", name]; -} - -- (void) updateFromStyle:(NodeStyle*)style { - [self setStrokeThickness:[style strokeThickness]]; - [self setScale:[style scale]]; - [self setStrokeColorRGB:[style strokeColorRGB]]; - [self setFillColorRGB:[style fillColorRGB]]; - [self setName:[style name]]; - [self setShapeName:[style shapeName]]; - [self setCategory:[style category]]; -} - -+ (NodeStyle*)defaultNodeStyleWithName:(NSString*)nm { -#if __has_feature(objc_arc) - return [[NodeStyle alloc] initWithName:nm]; -#else - return [[[NodeStyle alloc] initWithName:nm] autorelease]; -#endif -} - -- (NSString*)name { - return name; -} - -- (void)setName:(NSString *)s { - if (name != s) { - NSString *oldValue = name; - name = [s copy]; - [self postPropertyChanged:@"name" oldValue:oldValue]; -#if ! __has_feature(objc_arc) - [oldValue release]; -#endif - } -} - -- (NSString*)shapeName { - return shapeName; -} - -- (void)setShapeName:(NSString *)s { - if (shapeName != s) { - NSString *oldValue = shapeName; - shapeName = [s copy]; - [self postPropertyChanged:@"shapeName" oldValue:oldValue]; -#if ! __has_feature(objc_arc) - [oldValue release]; -#endif - } -} - -- (NSString*)category { - return category; -} - -- (void)setCategory:(NSString *)s { - if (category != s) { - NSString *oldValue = category; - category = [s copy]; - [self postPropertyChanged:@"category" oldValue:oldValue]; -#if ! __has_feature(objc_arc) - [oldValue release]; -#endif - } -} - -- (int)strokeThickness { return strokeThickness; } -- (void)setStrokeThickness:(int)i { - int oldValue = strokeThickness; - strokeThickness = i; - [self postPropertyChanged:@"strokeThickness" oldValue:[NSNumber numberWithInt:oldValue]]; -} - -- (float)scale { return scale; } -- (void)setScale:(float)s { - float oldValue = scale; - scale = s; - [self postPropertyChanged:@"scale" oldValue:[NSNumber numberWithFloat:oldValue]]; -} - -- (ColorRGB*)strokeColorRGB { - return strokeColorRGB; -} - -- (void)setStrokeColorRGB:(ColorRGB*)c { - if (strokeColorRGB != c) { - ColorRGB *oldValue = strokeColorRGB; - strokeColorRGB = [c copy]; - [self postPropertyChanged:@"strokeColorRGB" oldValue:oldValue]; -#if ! __has_feature(objc_arc) - [oldValue release]; -#endif - } -} - -- (ColorRGB*)fillColorRGB { - return fillColorRGB; -} - -- (void)setFillColorRGB:(ColorRGB*)c { - if (fillColorRGB != c) { - ColorRGB *oldValue = fillColorRGB; - fillColorRGB = [c copy]; - [self postPropertyChanged:@"fillColorRGB" oldValue:oldValue]; -#if ! __has_feature(objc_arc) - [oldValue release]; -#endif - } -} - -- (NSString*)tikz { - NSString *fillName = [fillColorRGB name]; - NSString *strokeName = [strokeColorRGB name]; - NSString *stroke = @""; - if (strokeThickness != 1) { - stroke = [NSString stringWithFormat:@",line width=%@ pt", - [NSNumber numberWithFloat:(float)strokeThickness * 0.4f]]; - } - - // If the colors are unknown, fall back on hexnames. These should be defined as colors - // in the Preambles class. - if (fillName == nil) fillName = [fillColorRGB hexName]; - if (strokeName == nil) strokeName = [strokeColorRGB hexName]; - - NSString *shapeDesc = [[Shape shapeForName:shapeName] styleTikz]; - if (shapeDesc == nil) shapeDesc = shapeName; - - return [NSString stringWithFormat:@"\\tikzstyle{%@}=[%@,fill=%@,draw=%@%@]", - name, - shapeDesc, - fillName, - strokeName, - stroke]; -} - -- (BOOL)strokeColorIsKnown { - return ([strokeColorRGB name] != nil); -} - -- (BOOL)fillColorIsKnown { - return ([fillColorRGB name] != nil); -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/PickSupport.h b/tikzit-1/src/common/PickSupport.h deleted file mode 100644 index 0749649..0000000 --- a/tikzit-1/src/common/PickSupport.h +++ /dev/null @@ -1,164 +0,0 @@ -// -// PickSupport.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - - -#import -#import "Node.h" -#import "Edge.h" - -/*! - @class PickSupport - @brief Maintain the selection state of nodes and edges. - @detail In addition to the notifications listed for specific methods, - whenever the node selection changes, a "NodeSelectionChanged" - signal is emitted, and whenever the edge selection changes, - an "EdgeSelectionChanged" signal is emitted. - */ -@interface PickSupport : NSObject { - NSMutableSet *selectedNodes; - NSMutableSet *selectedEdges; -} - -/*! - @property selectedNodes - @brief A set of selected nodes. - */ -@property (readonly) NSSet *selectedNodes; - -// KVC methods -- (void)addSelectedNodesObject:(Node*)node; -- (void)addSelectedNodes:(NSSet*)nodes; -- (void)removeSelectedNodesObject:(Node*)node; -- (void)removeSelectedNodes:(NSSet*)nodes; - -/*! - @property selectedEdges - @brief A set of selected edges. - */ -@property (readonly) NSSet *selectedEdges; - -// KVC methods -- (void)addSelectedEdgesObject:(Edge*)edge; -- (void)addSelectedEdges:(NSSet*)edges; -- (void)removeSelectedEdgesObject:(Edge*)edge; -- (void)removeSelectedEdges:(NSSet*)edges; - -/*! - @brief Check if a node is selected. - @param nd a node. - @result YES if nd is selected. - */ -- (BOOL)isNodeSelected:(Node*)nd; - -/*! - @brief Check if an edge is selected. - @param e an edge. - @result YES if e is selected. - */ -- (BOOL)isEdgeSelected:(Edge*)e; - -/*! - @brief Select a node. - @details Sends the "NodeSelected" notification if the node was not - already selected, with @p nd as "node" in the userInfo - @param nd a node. - */ -- (void)selectNode:(Node*)nd; - -/*! - @brief Deselect a node. - @details Sends the "NodeDeselected" notification if the node was - selected, with @p nd as "node" in the userInfo - @param nd a node. - */ -- (void)deselectNode:(Node*)nd; - -/*! - @brief Select an edge. - @details Sends the "EdgeSelected" notification if the node was not - already selected, with @p e as "edge" in the userInfo - @param e an edge. - */ -- (void)selectEdge:(Edge*)e; - -/*! - @brief Deselect an edge. - @details Sends the "EdgeDeselected" notification if the node was - selected, with @p e as "edge" in the userInfo - @param e an edge. - */ -- (void)deselectEdge:(Edge*)e; - -/*! - @brief Toggle the selected state of the given node. - @details Sends the "NodeSelected" or "NodeDeselected" notification as - appropriate, with @p nd as "node" in the userInfo - @param nd a node. - */ -- (void)toggleNodeSelected:(Node*)nd; - -/*! - @brief Select all nodes in the given set. - @details Sends the "NodeSelectionReplaced" notification if this - caused the selection to change. - - Equivalent to selectAllNodes:nodes replacingSelection:YES - @param nodes a set of nodes. - */ -- (void)selectAllNodes:(NSSet*)nodes; - -/*! - @brief Select all nodes in the given set. - @details Sends the "NodeSelectionReplaced" notification if this - caused the selection to change. - - If replace is NO, @p nodes will be added to the existing - selection, otherwise it will replace the existing selection. - @param nodes a set of nodes. - @param replace whether to replace the existing selection - */ -- (void)selectAllNodes:(NSSet*)nodes replacingSelection:(BOOL)replace; - -/*! - @brief Deselect all nodes. - @details Sends the "NodeSelectionReplaced" notification if there - were any nodes previously selected - */ -- (void)deselectAllNodes; - -/*! - @brief Deselect all edges. - @details Sends the "EdgeSelectionReplaced" notification if there - were any edges previously selected - */ -- (void)deselectAllEdges; - -/*! - @brief Factory method for getting a new PickSupport object. - @result An empty PickSupport. - */ -+ (PickSupport*)pickSupport; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/PickSupport.m b/tikzit-1/src/common/PickSupport.m deleted file mode 100644 index 560fc2c..0000000 --- a/tikzit-1/src/common/PickSupport.m +++ /dev/null @@ -1,232 +0,0 @@ -// -// PickSupport.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "PickSupport.h" - - -@implementation PickSupport - -- (void) postNodeSelectionChanged { - [[NSNotificationCenter defaultCenter] - postNotificationName:@"NodeSelectionChanged" - object:self]; -} - -- (void) postEdgeSelectionChanged { - [[NSNotificationCenter defaultCenter] - postNotificationName:@"EdgeSelectionChanged" - object:self]; -} - -- (id) init { - self = [super init]; - - if (self) { -#if __has_feature(objc_arc) - selectedNodes = [NSMutableSet set]; - selectedEdges = [NSMutableSet set]; -#else - selectedNodes = [[NSMutableSet set] retain]; - selectedEdges = [[NSMutableSet set] retain]; -#endif - } - - return self; -} - -+ (PickSupport*)pickSupport { -#if __has_feature(objc_arc) - return [[PickSupport alloc] init]; -#else - return [[[PickSupport alloc] init] autorelease]; -#endif -} - -@synthesize selectedNodes; -- (void)addSelectedNodesObject:(Node*)node { - return [self selectNode:node]; -} -- (void)addSelectedNodes:(NSSet*)nodes { - return [self selectAllNodes:nodes replacingSelection:NO]; -} -- (void)removeSelectedNodesObject:(Node*)node { - return [self deselectNode:node]; -} -- (void)removeSelectedNodes:(NSSet*)nodes { - if ([selectedNodes count] > 0) { - [selectedNodes minusSet:nodes]; - [[NSNotificationCenter defaultCenter] - postNotificationName:@"NodeSelectionReplaced" - object:self]; - [self postNodeSelectionChanged]; - } -} - -@synthesize selectedEdges; -- (void)addSelectedEdgesObject:(Edge*)edge { - return [self selectEdge:edge]; -} -- (void)addSelectedEdges:(NSSet*)edges { - if (selectedEdges == edges) { - return; - } - if ([edges count] == 0) { - return; - } - - [selectedEdges unionSet:edges]; - [[NSNotificationCenter defaultCenter] - postNotificationName:@"EdgeSelectionReplaced" - object:self]; - [self postEdgeSelectionChanged]; -} -- (void)removeSelectedEdgesObject:(Edge*)edge { - return [self deselectEdge:edge]; -} -- (void)removeSelectedEdges:(NSSet*)edges { - if ([selectedEdges count] > 0 && [edges count] > 0) { - [selectedEdges minusSet:edges]; - [[NSNotificationCenter defaultCenter] - postNotificationName:@"EdgeSelectionReplaced" - object:self]; - [self postEdgeSelectionChanged]; - } -} - -- (BOOL)isNodeSelected:(Node*)nd { - return [selectedNodes containsObject:nd]; -} - -- (BOOL)isEdgeSelected:(Edge*)e { - return [selectedEdges containsObject:e]; -} - -- (void)selectNode:(Node*)nd { - if (nd != nil && ![selectedNodes member:nd]) { - [selectedNodes addObject:nd]; - [[NSNotificationCenter defaultCenter] - postNotificationName:@"NodeSelected" - object:self - userInfo:[NSDictionary dictionaryWithObject:nd forKey:@"node"]]; - [self postNodeSelectionChanged]; - } -} - -- (void)deselectNode:(Node*)nd { - if (nd != nil && [selectedNodes member:nd]) { - [selectedNodes removeObject:nd]; - [[NSNotificationCenter defaultCenter] - postNotificationName:@"NodeDeselected" - object:self - userInfo:[NSDictionary dictionaryWithObject:nd forKey:@"node"]]; - [self postNodeSelectionChanged]; - } -} - -- (void)selectEdge:(Edge*)e { - if (e != nil && ![selectedEdges member:e]) { - [selectedEdges addObject:e]; - [[NSNotificationCenter defaultCenter] - postNotificationName:@"EdgeSelected" - object:self - userInfo:[NSDictionary dictionaryWithObject:e forKey:@"edge"]]; - [self postEdgeSelectionChanged]; - } -} - -- (void)deselectEdge:(Edge*)e { - if (e != nil && [selectedEdges member:e]) { - [selectedEdges removeObject:e]; - [[NSNotificationCenter defaultCenter] - postNotificationName:@"EdgeDeselected" - object:self - userInfo:[NSDictionary dictionaryWithObject:e forKey:@"edge"]]; - [self postEdgeSelectionChanged]; - } -} - -- (void)toggleNodeSelected:(Node*)nd { - if ([self isNodeSelected:nd]) - [self deselectNode:nd]; - else - [self selectNode:nd]; -} - -- (void)selectAllNodes:(NSSet*)nodes { - [self selectAllNodes:nodes replacingSelection:YES]; -} - -- (void)selectAllNodes:(NSSet*)nodes replacingSelection:(BOOL)replace { - if (selectedNodes == nodes) { - return; - } - if (!replace && [nodes count] == 0) { - return; - } - - if (replace) { -#if ! __has_feature(objc_arc) - [selectedNodes release]; -#endif - selectedNodes = [nodes mutableCopy]; - } else { - [selectedNodes unionSet:nodes]; - } - [[NSNotificationCenter defaultCenter] - postNotificationName:@"NodeSelectionReplaced" - object:self]; - [self postNodeSelectionChanged]; -} - -- (void)deselectAllNodes { - if ([selectedNodes count] > 0) { - [selectedNodes removeAllObjects]; - [[NSNotificationCenter defaultCenter] - postNotificationName:@"NodeSelectionReplaced" - object:self]; - [self postNodeSelectionChanged]; - } -} - -- (void)deselectAllEdges { - if ([selectedEdges count] > 0) { - [selectedEdges removeAllObjects]; - [[NSNotificationCenter defaultCenter] - postNotificationName:@"EdgeSelectionReplaced" - object:self]; - [self postEdgeSelectionChanged]; - } -} - -- (void)dealloc { -#if ! __has_feature(objc_arc) - [selectedNodes release]; - [selectedEdges release]; - - [super dealloc]; -#endif -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/Preambles.h b/tikzit-1/src/common/Preambles.h deleted file mode 100644 index 2fb084a..0000000 --- a/tikzit-1/src/common/Preambles.h +++ /dev/null @@ -1,73 +0,0 @@ -// -// Preambles.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// Copyright 2011 Alex Merry. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "StyleManager.h" - -@class Graph; - -@interface Preambles : NSObject { - NSMutableDictionary *preambleDict; - NSString *selectedPreambleName; - NSArray *styles; - NSArray *edges; - StyleManager *styleManager; -} - -@property (copy) NSString *selectedPreambleName; -@property (retain) NSString *currentPreamble; -@property (retain) StyleManager *styleManager; -@property (readonly) NSMutableDictionary *preambleDict; - -+ (Preambles*)preambles; -- (id)init; -- (void)setStyles:(NSArray*)sty; -- (void)setEdges:(NSArray*)edg; - -- (NSString*)preambleForName:(NSString*)name; -- (BOOL)setPreamble:(NSString*)content forName:(NSString*)name; - -- (NSString*)addPreamble; -- (NSString*)addPreambleWithNameBase:(NSString*)name; - -- (BOOL)renamePreambleFrom:(NSString*)old to:(NSString*)new; -- (BOOL)removePreamble:(NSString*)name; - -- (NSEnumerator*)customPreambleNameEnumerator; - -- (void)removeAllPreambles; - -- (BOOL)selectedPreambleIsDefault; - -- (NSString*)styleDefinitions; -- (NSString*)defaultPreamble; -- (NSString*)defaultPreambleName; -- (NSString*)currentPostamble; - -- (NSString*)buildDocumentForTikz:(NSString*)tikz; -- (NSString*)buildDocumentForGraph:(Graph*)g; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/Preambles.m b/tikzit-1/src/common/Preambles.m deleted file mode 100644 index 922fc30..0000000 --- a/tikzit-1/src/common/Preambles.m +++ /dev/null @@ -1,320 +0,0 @@ -// -// Preambles.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "Preambles.h" -#import "NodeStyle.h" -#import "EdgeStyle.h" -#import "Graph.h" - -static NSString *DEF_PREAMBLE_START = -@"\\usepackage[svgnames]{xcolor}\n" -@"\\usepackage{tikz}\n" -@"\\usetikzlibrary{decorations.markings}\n" -@"\\usetikzlibrary{shapes.geometric}\n" -@"\n" -@"\\pgfdeclarelayer{edgelayer}\n" -@"\\pgfdeclarelayer{nodelayer}\n" -@"\\pgfsetlayers{edgelayer,nodelayer,main}\n" -@"\n" -@"\\tikzstyle{none}=[inner sep=0pt]\n"; - -static NSString *PREAMBLE_TAIL = -@"\n" -@"\\pagestyle{empty}\n" -@"\\usepackage[graphics,tightpage,active]{preview}\n" -@"\\PreviewEnvironment{tikzpicture}\n" -@"\\newlength{\\imagewidth}\n" -@"\\newlength{\\imagescale}\n" -@"\n" -@"\\begin{document}\n"; - -static NSString *POSTAMBLE = -@"\n" -@"\\end{document}\n"; - -@implementation Preambles - -+ (Preambles*)preambles { -#if __has_feature(objc_arc) - return [[self alloc] init]; -#else - return [[[self alloc] init] autorelease]; -#endif -} - -- (id)init { - self = [super init]; - if (self) { - selectedPreambleName = @"default"; - preambleDict = [[NSMutableDictionary alloc] initWithCapacity:1]; - [preambleDict setObject:[self defaultPreamble] forKey:@"custom"]; - styles = nil; - edges = nil; - styleManager = nil; - } - return self; -} - -- (void)dealloc { -#if ! __has_feature(objc_arc) - [selectedPreambleName release]; - [styles release]; - [styleManager release]; - [super dealloc]; -#endif -} - -- (NSString*)preambleForName:(NSString*)name { - if ([name isEqualToString:@"default"]) - return [self defaultPreamble]; - else - return [preambleDict objectForKey:name]; -} - -- (BOOL)setPreamble:(NSString*)content forName:(NSString*)name { - if ([name isEqualToString:@"default"]) - return NO; - [preambleDict setObject:content forKey:name]; - return YES; -} - -- (void)removeAllPreambles { - [preambleDict removeAllObjects]; -} - -- (NSEnumerator*)customPreambleNameEnumerator { - return [preambleDict keyEnumerator]; -} - -- (void)setStyles:(NSArray*)sty { -#if ! __has_feature(objc_arc) - [sty retain]; - [styles release]; -#endif - styles = sty; -} - -- (void)setEdges:(NSArray*)edg { -#if ! __has_feature(objc_arc) - [edg retain]; - [edges release]; -#endif - edges = edg; -} - -- (NSString*)styleDefinitions { - if (styleManager != nil) { - [self setStyles:[styleManager nodeStyles]]; - } -#if ! __has_feature(objc_arc) - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; -#endif - NSMutableString *buf = [NSMutableString string]; - NSMutableString *colbuf = [NSMutableString string]; - NSMutableSet *colors = [NSMutableSet setWithCapacity:2*[styles count]]; - for (NodeStyle *st in styles) { - [buf appendFormat:@"%@\n", [st tikz]]; - ColorRGB *fill = [st fillColorRGB]; - ColorRGB *stroke = [st strokeColorRGB]; - if ([fill name] == nil && ![colors containsObject:fill]) { - [colors addObject:fill]; - [colbuf appendFormat:@"\\definecolor{%@}{rgb}{%.3f,%.3f,%.3f}\n", - [fill hexName], [fill redFloat], [fill greenFloat], [fill blueFloat]]; - } - - if ([stroke name] == nil && ![colors containsObject:stroke]) { - [colors addObject:stroke]; - [colbuf appendFormat:@"\\definecolor{%@}{rgb}{%.3f,%.3f,%.3f}\n", - [stroke hexName], [stroke redFloat], [stroke greenFloat], [stroke blueFloat]]; - } - } - - if (styleManager != nil) { - [self setEdges:[styleManager edgeStyles]]; - } - - [buf appendString:@"\n"]; - for (EdgeStyle *st in edges) { - [buf appendFormat:@"%@\n", [st tikz]]; - ColorRGB *color = [st colorRGB]; - if (color != nil && [color name] == nil && ![colors containsObject:color]) { - [colors addObject:color]; - [colbuf appendFormat:@"\\definecolor{%@}{rgb}{%.3f,%.3f,%.3f}\n", - [color hexName], [color redFloat], [color greenFloat], [color blueFloat]]; - } - } - - NSString *defs = [[NSString alloc] initWithFormat:@"%@\n%@", colbuf, buf]; - -#if __has_feature(objc_arc) - return defs; -#else - [pool drain]; - return [defs autorelease]; -#endif -} - -- (NSString*)defaultPreamble { - return [NSString stringWithFormat:@"%@%@", - DEF_PREAMBLE_START, [self styleDefinitions]]; -} - -- (BOOL)selectedPreambleIsDefault { - return [selectedPreambleName isEqualToString:@"default"]; -} - -- (NSString*)selectedPreambleName { return selectedPreambleName; } -- (void)setSelectedPreambleName:(NSString *)sel { - if (sel != selectedPreambleName) { -#if ! __has_feature(objc_arc) - [selectedPreambleName release]; -#endif - selectedPreambleName = [sel copy]; - } -} - -- (NSString*)currentPreamble { - NSString *pre = [self preambleForName:selectedPreambleName]; - return (pre == nil) ? [self defaultPreamble] : pre; -} - -- (void)setCurrentPreamble:(NSString*)str { - if (![selectedPreambleName isEqualToString:@"default"]) - [preambleDict setObject:str forKey:selectedPreambleName]; -} - -- (StyleManager*)styleManager { - return styleManager; -} - -- (void)setStyleManager:(StyleManager *)manager { -#if ! __has_feature(objc_arc) - [manager retain]; - [styleManager release]; -#endif - styleManager = manager; -} - -- (NSString*)currentPostamble { - return POSTAMBLE; -} - -- (NSMutableDictionary*)preambleDict { - return preambleDict; -} - -- (NSString*)defaultPreambleName { - return @"default"; -} - -- (NSString*)addPreamble { - return [self addPreambleWithNameBase:@"new preamble"]; -} - -- (NSString*)addPreambleWithNameBase:(NSString*)base { - if ([preambleDict objectForKey:base] == nil) { - [self setPreamble:[self defaultPreamble] forName:base]; - return base; - } - int i = 0; - NSString *tryName = nil; - do { - ++i; - tryName = [NSString stringWithFormat:@"%@ %d", base, i]; - } while ([preambleDict objectForKey:tryName] != nil); - - [self setPreamble:[self defaultPreamble] forName:tryName]; - return tryName; -} - -- (BOOL)renamePreambleFrom:(NSString*)old to:(NSString*)new { - if ([old isEqualToString:@"default"]) - return NO; - if ([new isEqualToString:@"default"]) - return NO; - if ([old isEqualToString:new]) - return YES; - BOOL isSelected = NO; - if ([old isEqualToString:selectedPreambleName]) { - [self setSelectedPreambleName:nil]; - isSelected = YES; - } - NSString *preamble = [preambleDict objectForKey:old]; -#if ! __has_feature(objc_arc) - [preamble retain]; -#endif - [preambleDict removeObjectForKey:old]; - [preambleDict setObject:preamble forKey:new]; -#if ! __has_feature(objc_arc) - [preamble release]; -#endif - if (isSelected) { - [self setSelectedPreambleName:new]; - } - return YES; -} - -- (BOOL)removePreamble:(NSString*)name { - if ([name isEqualToString:@"default"]) - return NO; - // "name" may be held only by being the selected preamble... -#if ! __has_feature(objc_arc) - [name retain]; -#endif - if ([name isEqualToString:selectedPreambleName]) - [self setSelectedPreambleName:nil]; - [preambleDict removeObjectForKey:name]; -#if ! __has_feature(objc_arc) - [name release]; -#endif - return YES; -} - -- (NSString*)buildDocumentForTikz:(NSString*)tikz -{ - NSString *preamble = [self currentPreamble]; - NSString *doc_head = @""; - if (![preamble hasPrefix:@"\\documentclass"]) { - doc_head = @"\\documentclass{article}\n"; - } - NSString *preamble_suffix = @""; - if ([preamble rangeOfString:@"\\begin{document}" - options:NSBackwardsSearch].length == 0) { - preamble_suffix = PREAMBLE_TAIL; - } - return [NSString stringWithFormat:@"%@%@%@%@%@", - doc_head, - [self currentPreamble], - preamble_suffix, - tikz, - POSTAMBLE]; -} - -- (NSString*)buildDocumentForGraph:(Graph*)g -{ - return [self buildDocumentForTikz:[g tikz]]; -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/PropertyHolder.h b/tikzit-1/src/common/PropertyHolder.h deleted file mode 100644 index ba1d825..0000000 --- a/tikzit-1/src/common/PropertyHolder.h +++ /dev/null @@ -1,36 +0,0 @@ -// -// PropertyHolder.h -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import - -@interface PropertyHolder : NSObject { - NSString *notificationName; -} - -- (id)initWithNotificationName:(NSString*)name; -- (void) postPropertyChanged:(NSString*)property oldValue:(id)value; -- (void) postPropertyChanged:(NSString*)property; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/PropertyHolder.m b/tikzit-1/src/common/PropertyHolder.m deleted file mode 100644 index 6aaf125..0000000 --- a/tikzit-1/src/common/PropertyHolder.m +++ /dev/null @@ -1,74 +0,0 @@ -// -// PropertyHolder.m -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "PropertyHolder.h" - -@implementation PropertyHolder - - -- (id)init { - self = [super init]; - if (self) { - notificationName = @"UnknownPropertyChanged"; - } - return self; -} - -- (id)initWithNotificationName:(NSString*)n { - self = [super init]; - if (self) { - notificationName = [n copy]; - } - return self; -} - -- (void)postPropertyChanged:(NSString*)property oldValue:(id)value { - NSDictionary *userInfo; - if (value != nil) { - userInfo = [NSDictionary dictionaryWithObjectsAndKeys: - property, @"propertyName", - value, @"oldValue", - nil]; - } else { - userInfo = [NSDictionary dictionaryWithObject:property - forKey:@"propertyName"]; - } - [[NSNotificationCenter defaultCenter] postNotificationName:notificationName - object:self - userInfo:userInfo]; -} - -- (void)postPropertyChanged:(NSString*)property { - [self postPropertyChanged:property oldValue:nil]; -} - -- (void)dealloc { -#if ! __has_feature(objc_arc) - [notificationName release]; - [super dealloc]; -#endif -} - -@end - -// vi:ft=objc:ts=4:et:sts=4:sw=4 diff --git a/tikzit-1/src/common/RColor.h b/tikzit-1/src/common/RColor.h deleted file mode 100644 index 7f22547..0000000 --- a/tikzit-1/src/common/RColor.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import - -#ifndef CGFloat -#define CGFloat float -#endif - -/** - * A lightweight color structure used by RenderContext - * - * This is mainly to avoid the overhead of ColorRGB when - * rendering things not based on a NodeStyle - * - * All values range from 0.0f to 1.0f. - */ -typedef struct { - CGFloat red; - CGFloat green; - CGFloat blue; - CGFloat alpha; -} -RColor; - -/** Solid white */ -static const RColor WhiteRColor __attribute__((unused)) = {1.0, 1.0, 1.0, 1.0}; -/** Solid black */ -static const RColor BlackRColor __attribute__((unused)) = {0.0, 0.0, 0.0, 1.0}; - -/** Create a color with alpha set to 1.0 */ -RColor MakeSolidRColor (CGFloat red, CGFloat green, CGFloat blue); -/** Create a color */ -RColor MakeRColor (CGFloat red, CGFloat green, CGFloat blue, CGFloat alpha); - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/RColor.m b/tikzit-1/src/common/RColor.m deleted file mode 100644 index 49914fe..0000000 --- a/tikzit-1/src/common/RColor.m +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "RColor.h" - -RColor MakeSolidRColor (CGFloat red, CGFloat green, CGFloat blue) { - return MakeRColor (red, green, blue, 1.0); -} - -RColor MakeRColor (CGFloat red, CGFloat green, CGFloat blue, CGFloat alpha) { - RColor color; - color.red = red; - color.green = green; - color.blue = blue; - color.alpha = alpha; - return color; -} - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/RectangleShape.h b/tikzit-1/src/common/RectangleShape.h deleted file mode 100644 index 3fa0f31..0000000 --- a/tikzit-1/src/common/RectangleShape.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// RectangleShape.h -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "Shape.h" - - -@interface RectangleShape : Shape { -} - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/RectangleShape.m b/tikzit-1/src/common/RectangleShape.m deleted file mode 100644 index db9c803..0000000 --- a/tikzit-1/src/common/RectangleShape.m +++ /dev/null @@ -1,57 +0,0 @@ -// -// RectangleShape.m -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "RectangleShape.h" -#import "Node.h" -#import "Edge.h" - -@implementation RectangleShape - -- (id)init { - self = [super init]; - if (self) { - Node *n0,*n1,*n2,*n3; - float sz = 0.2f; - - n0 = [Node nodeWithPoint:NSMakePoint(-sz, sz)]; - n1 = [Node nodeWithPoint:NSMakePoint( sz, sz)]; - n2 = [Node nodeWithPoint:NSMakePoint( sz,-sz)]; - n3 = [Node nodeWithPoint:NSMakePoint(-sz,-sz)]; - - Edge *e0,*e1,*e2,*e3; - - e0 = [Edge edgeWithSource:n0 andTarget:n1]; - e1 = [Edge edgeWithSource:n1 andTarget:n2]; - e2 = [Edge edgeWithSource:n2 andTarget:n3]; - e3 = [Edge edgeWithSource:n3 andTarget:n0]; - - paths = [[NSSet alloc] initWithObjects:[NSArray arrayWithObjects:e0,e1,e2,e3,nil],nil]; - - styleTikz = @"rectangle"; - } - return self; -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/RegularPolyShape.h b/tikzit-1/src/common/RegularPolyShape.h deleted file mode 100644 index 1fd8f1e..0000000 --- a/tikzit-1/src/common/RegularPolyShape.h +++ /dev/null @@ -1,50 +0,0 @@ -// -// RegularPolyShape.h -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "Shape.h" - -/** - * A regular polygon - * - * Matches the "regular polygon" shape in the shapes.geometric - * PGF/TikZ library. - */ -@interface RegularPolyShape : Shape { -} - -/** - * Initialise a regular polygon - * - * A rotation of 0 will produce a polygon with one - * edge flat along the bottom (just like PGF/TikZ - * does it). - * - * @param sides the number of sides the polygon should have - * @param rotation the rotation of the polygon, in degrees - */ -- (id)initWithSides:(int)sides rotation:(int)rotation; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/RegularPolyShape.m b/tikzit-1/src/common/RegularPolyShape.m deleted file mode 100644 index 3555115..0000000 --- a/tikzit-1/src/common/RegularPolyShape.m +++ /dev/null @@ -1,76 +0,0 @@ -// -// RegularPolyShape.m -// TikZiT -// -// Copyright 2011 Aleks Kissinger -// Copyright 2012 Alex Merry -// All rights reserved. -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "RegularPolyShape.h" -#import "Node.h" -#import "Edge.h" -#import "util.h" - -@implementation RegularPolyShape - -- (id)initWithSides:(int)sides rotation:(int)rotation { - self = [super init]; - if (self == nil) - return nil; - - // TikZ draws regular polygons using a radius inscribed - // _inside_ the shape (touching middles of edges), not - // outside (touching points) - const float innerRadius = 0.2f; - - NSMutableArray *nodes = [NSMutableArray arrayWithCapacity:sides]; - NSMutableArray *edges = [NSMutableArray arrayWithCapacity:sides]; - - float dtheta = (M_PI * 2.0f) / ((float)sides); - float theta = (dtheta/2.0f) - (M_PI / 2.0f); - theta += degreesToRadians(rotation); - // radius of the outer circle - float radius = ABS(innerRadius / cos(dtheta)); - - for (int i = 0; i < sides; ++i) { - NSPoint p; - p.x = radius * cos(theta); - p.y = radius * sin(theta); - - [nodes addObject:[Node nodeWithPoint:p]]; - theta += dtheta; - } - - for (int i = 0; i < sides; ++i) { - [edges addObject:[Edge edgeWithSource:[nodes objectAtIndex:i] - andTarget:[nodes objectAtIndex:(i+1)%sides]]]; - } - - paths = [[NSSet alloc] initWithObjects:edges,nil]; - - styleTikz = [[NSString alloc] initWithFormat: - @"regular polygon,regular polygon sides=%d,shape border rotate=%d", - sides, rotation]; - - return self; -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/RenderContext.h b/tikzit-1/src/common/RenderContext.h deleted file mode 100644 index 8633944..0000000 --- a/tikzit-1/src/common/RenderContext.h +++ /dev/null @@ -1,156 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import -#import "RColor.h" - -typedef enum { - AntialiasDisabled, - AntialiasDefault -} AntialiasMode; - -// encapsulates a CTLine on OSX and -// a PangoLayout in GTK+ -@protocol TextLayout -@property (readonly) NSSize size; -@property (readonly) NSString *text; -- (void) showTextAt:(NSPoint)topLeft withColor:(RColor)color; -@end - -@protocol RenderContext -- (void) saveState; -- (void) restoreState; - -- (NSRect) clipBoundingBox; -- (BOOL) strokeIncludesPoint:(NSPoint)p; -- (BOOL) fillIncludesPoint:(NSPoint)p; -- (id) layoutText:(NSString*)text withSize:(CGFloat)fontSize; - -// this may not affect text rendering -- (void) setAntialiasMode:(AntialiasMode)mode; -- (void) setLineWidth:(CGFloat)width; -// setting to 0 will unset the dash -- (void) setLineDash:(CGFloat)dashLength; - -/** - * Clear the current path, including all subpaths - */ -- (void) startPath; -/** - * Close the current subpath - */ -- (void) closeSubPath; -/** - * Start a new subpath, and set the current point. - * - * The point will be the current point and the starting point - * for the subpath. - */ -- (void) moveTo:(NSPoint)p; -/** - * Add a cubic bezier curve to the current subpath. - * - * The curve will start at the current point, terminate at end and - * be defined by cp1 and cp2. - */ -- (void) curveTo:(NSPoint)end withCp1:(NSPoint)cp1 andCp2:(NSPoint)cp2; -/** - * Add a straight line to the current subpath. - * - * The line will start at the current point, and terminate at end. - */ -- (void) lineTo:(NSPoint)end; -/** - * Add a new rectangular subpath. - * - * The current point is undefined after this call. - */ -- (void) rect:(NSRect)rect; -/** - * Add a new circular subpath. - * - * The current point is undefined after this call. - */ -- (void) circleAt:(NSPoint)c withRadius:(CGFloat)r; - -/** - * Paint along the current path. - * - * The current line width and dash style will be used, - * and the colour is given by color. - * - * The path will be cleared by this call, as though - * startPath had been called. - */ -- (void) strokePathWithColor:(RColor)color; -/** - * Paint inside the current path. - * - * The fill colour is given by color. - * - * The path will be cleared by this call, as though - * startPath had been called. - */ -- (void) fillPathWithColor:(RColor)color; -/** - * Paint along and inside the current path. - * - * The current line width and dash style will be used, - * and the colour is given by color. - * - * The path will be cleared by this call, as though - * startPath had been called. - * - * Note that the fill and stroke may overlap, although - * the stroke is always painted on top, so this is only - * relevant when the stroke colour has an alpha channel - * other than 1.0f. - */ -- (void) strokePathWithColor:(RColor)scolor - andFillWithColor:(RColor)fcolor; -/** - * Paint along and inside the current path using an alpha channel. - * - * The current line width and dash style will be used, - * and the colour is given by color. - * - * The path will be cleared by this call, as though - * startPath had been called. - * - * Note that the fill and stroke may overlap, although - * the stroke is always painted on top, so this is only - * relevant when the stroke colour has an alpha channel - * other than 1.0f. - */ -- (void) strokePathWithColor:(RColor)scolor - andFillWithColor:(RColor)fcolor - usingAlpha:(CGFloat)alpha; -/** - * Set the clip to the current path. - * - * The path will be cleared by this call, as though - * startPath had been called. - */ -- (void) clipToPath; - -/** - * Paint everywhere within the clip. - */ -- (void) paintWithColor:(RColor)color; -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/Shape.h b/tikzit-1/src/common/Shape.h deleted file mode 100644 index b401a87..0000000 --- a/tikzit-1/src/common/Shape.h +++ /dev/null @@ -1,49 +0,0 @@ -// -// Shape.h -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "Transformer.h" - -@interface Shape : NSObject { - NSSet *paths; - NSRect boundingRect; // cache - NSString *styleTikz; -} - -@property (retain) NSSet *paths; -@property (readonly) NSRect boundingRect; -/** - * The tikz code to use in style properties for this shape - * - * This can return nil, in which case the shape name should be used - */ -@property (retain) NSString *styleTikz; - -- (id)init; -+ (void)refreshShapeDictionary; -+ (NSDictionary*)shapeDictionary; -+ (Shape*)shapeForName:(NSString*)shapeName; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/Shape.m b/tikzit-1/src/common/Shape.m deleted file mode 100644 index e887688..0000000 --- a/tikzit-1/src/common/Shape.m +++ /dev/null @@ -1,171 +0,0 @@ -// -// Shape.m -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "Shape.h" - -#import "Edge.h" -#import "SupportDir.h" -#import "ShapeNames.h" - -#import "CircleShape.h" -#import "DiamondShape.h" -#import "RectangleShape.h" -#import "RegularPolyShape.h" -#import "TikzShape.h" - -#import "util.h" - -@implementation Shape - -- (void)calcBoundingRect { - boundingRect = NSZeroRect; - - if (paths == nil) - return; - - for (NSArray *arr in paths) { - for (Edge *e in arr) { - boundingRect = NSUnionRect(boundingRect, [e boundingRect]); - } - } -} - -- (id)init { - self = [super init]; - if (self) { - paths = nil; - } - return self; -} - -- (NSSet*)paths {return paths;} -- (void)setPaths:(NSSet *)p { - if (paths != p) { -#if __has_feature(objc_arc) - paths = p; -#else - [paths release]; - paths = [p retain]; -#endif - [self calcBoundingRect]; - } -} - -- (NSRect)boundingRect { return boundingRect; } - -@synthesize styleTikz; - -- (id)copyWithZone:(NSZone*)zone { - Shape *cp = [[[self class] allocWithZone:zone] init]; - [cp setPaths:paths]; - [cp setStyleTikz:styleTikz]; - return cp; -} - -- (void)dealloc { -#if ! __has_feature(objc_arc) - [paths release]; - [styleTikz release]; - [super dealloc]; -#endif -} - -NSDictionary *shapeDictionary = nil; - -+ (void)addShapesInDir:(NSString*)shapeDir to:(NSMutableDictionary*)shapeDict { - NSFileManager *fileManager = [NSFileManager defaultManager]; - NSError *err = nil; - NSArray *files = [fileManager contentsOfDirectoryAtPath:shapeDir error:&err]; - - if (files != nil) { - NSString *nm; - for (NSString *f in files) { - if ([f hasSuffix:@".tikz"]) { - nm = [f substringToIndex:[f length]-5]; - TikzShape *sh = - [[TikzShape alloc] initWithTikzFile: - [shapeDir stringByAppendingPathComponent:f]]; - if (sh != nil) { - [shapeDict setObject:sh forKey:nm]; -#if ! __has_feature(objc_arc) - [sh release]; -#endif - } - } - } - } -} - -+ (void)refreshShapeDictionary { - Shape *shapes[5] = { - [[CircleShape alloc] init], - [[RectangleShape alloc] init], - [[DiamondShape alloc] init], - [[RegularPolyShape alloc] initWithSides:3 rotation:0], - [[RegularPolyShape alloc] initWithSides:3 rotation:180]}; - NSMutableDictionary *shapeDict = [[NSMutableDictionary alloc] initWithObjectsAndKeys: - shapes[0], SHAPE_CIRCLE, - shapes[1], SHAPE_RECTANGLE, - shapes[2], SHAPE_DIAMOND, - shapes[3], SHAPE_UP_TRIANGLE, - shapes[4], SHAPE_DOWN_TRIANGLE, - nil]; -#if ! __has_feature(objc_arc) - for (int i = 0; i<5; ++i) [shapes[i] release]; -#endif - - NSString *systemShapeDir = [[SupportDir systemSupportDir] stringByAppendingPathComponent:@"shapes"]; - NSString *userShapeDir = [[SupportDir userSupportDir] stringByAppendingPathComponent:@"shapes"]; - - [Shape addShapesInDir:systemShapeDir to:shapeDict]; - [Shape addShapesInDir:userShapeDir to:shapeDict]; - - NSDictionary *oldShapeDictionary = shapeDictionary; - shapeDictionary = shapeDict; - - [[NSNotificationCenter defaultCenter] - postNotificationName:@"ShapeDictionaryReplaced" - object:self]; - -#if ! __has_feature(objc_arc) - [oldShapeDictionary release]; -#endif -} - -+ (NSDictionary*)shapeDictionary { - if (shapeDictionary == nil) [Shape refreshShapeDictionary]; - return shapeDictionary; -} - -+ (Shape*)shapeForName:(NSString*)shapeName { - Shape *s = [[[self shapeDictionary] objectForKey:shapeName] copy]; -#if __has_feature(objc_arc) - return s; -#else - return [s autorelease]; -#endif -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/ShapeNames.h b/tikzit-1/src/common/ShapeNames.h deleted file mode 100644 index 66ecfb1..0000000 --- a/tikzit-1/src/common/ShapeNames.h +++ /dev/null @@ -1,27 +0,0 @@ -// -// ShapeNames.h -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// - -#define SHAPE_CIRCLE @"circle" -#define SHAPE_RECTANGLE @"rectangle" -#define SHAPE_UP_TRIANGLE @"up triangle" -#define SHAPE_DOWN_TRIANGLE @"down triangle" -#define SHAPE_DIAMOND @"diamond" - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/StyleManager.h b/tikzit-1/src/common/StyleManager.h deleted file mode 100644 index bc920e7..0000000 --- a/tikzit-1/src/common/StyleManager.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import -#import "NodeStyle.h" -#import "EdgeStyle.h" - -@interface StyleManager: NSObject { - NSMutableArray *nodeStyles; - NSMutableArray *edgeStyles; -} - -+ (StyleManager*) manager; -- (id) init; - -@property (readonly) NSArray *nodeStyles; -@property (readonly) NSArray *edgeStyles; - -// only for use by loading code -- (void) _setNodeStyles:(NSMutableArray*)styles; -- (void) _setEdgeStyles:(NSMutableArray*)styles; - -- (NodeStyle*) nodeStyleForName:(NSString*)name; -- (EdgeStyle*) edgeStyleForName:(NSString*)name; - -- (void) addNodeStyle:(NodeStyle*)style; -- (void) removeNodeStyle:(NodeStyle*)style; -- (void) addEdgeStyle:(EdgeStyle*)style; -- (void) removeEdgeStyle:(EdgeStyle*)style; - -- (void) updateFromManager:(StyleManager*)manager; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/StyleManager.m b/tikzit-1/src/common/StyleManager.m deleted file mode 100644 index 05c6c86..0000000 --- a/tikzit-1/src/common/StyleManager.m +++ /dev/null @@ -1,378 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "StyleManager.h" - -@implementation StyleManager - -- (void) nodeStylePropertyChanged:(NSNotification*)n { - if ([[[n userInfo] objectForKey:@"propertyName"] isEqual:@"name"]) { - NSDictionary *userInfo; - userInfo = [NSDictionary dictionaryWithObjectsAndKeys: - [n object], @"style", - [[n userInfo] objectForKey:@"oldValue"], @"oldName", - nil]; - [[NSNotificationCenter defaultCenter] postNotificationName:@"NodeStyleRenamed" - object:self - userInfo:userInfo]; - } -} - -- (void) ignoreAllNodeStyles { - [[NSNotificationCenter defaultCenter] - removeObserver:self - name:@"NodeStylePropertyChanged" - object:nil]; -} - -- (void) ignoreNodeStyle:(NodeStyle*)style { - [[NSNotificationCenter defaultCenter] - removeObserver:self - name:@"NodeStylePropertyChanged" - object:style]; -} - -- (void) listenToNodeStyle:(NodeStyle*)style { - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(nodeStylePropertyChanged:) - name:@"NodeStylePropertyChanged" - object:style]; -} - -- (void) edgeStylePropertyChanged:(NSNotification*)n { - if ([[[n userInfo] objectForKey:@"propertyName"] isEqual:@"name"]) { - NSDictionary *userInfo; - userInfo = [NSDictionary dictionaryWithObjectsAndKeys: - [n object], @"style", - [[n userInfo] objectForKey:@"oldValue"], @"oldName", - nil]; - [[NSNotificationCenter defaultCenter] postNotificationName:@"EdgeStyleRenamed" - object:self - userInfo:userInfo]; - } -} - -- (void) ignoreAllEdgeStyles { - [[NSNotificationCenter defaultCenter] - removeObserver:self - name:@"EdgeStylePropertyChanged" - object:nil]; -} - -- (void) ignoreEdgeStyle:(EdgeStyle*)style { - [[NSNotificationCenter defaultCenter] - removeObserver:self - name:@"EdgeStylePropertyChanged" - object:style]; -} - -- (void) listenToEdgeStyle:(EdgeStyle*)style { - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(edgeStylePropertyChanged:) - name:@"EdgeStylePropertyChanged" - object:style]; -} - -+ (StyleManager*) manager { -#if __has_feature(objc_arc) - return [[self alloc] init]; -#else - return [[[self alloc] init] autorelease]; -#endif -} - -- (id) init { - self = [super init]; - - if (self) { - // we lazily load the default styles, since they may not be needed - nodeStyles = nil; - edgeStyles = nil; - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; -#if ! __has_feature(objc_arc) - [nodeStyles release]; - [edgeStyles release]; - - [super dealloc]; -#endif -} - -- (void) loadDefaultEdgeStyles { -#if ! __has_feature(objc_arc) - [edgeStyles release]; -#endif - edgeStyles = [[NSMutableArray alloc] initWithCapacity:3]; - - EdgeStyle *simple = [EdgeStyle defaultEdgeStyleWithName:@"simple"]; - [simple setThickness:2.0f]; - [self listenToEdgeStyle:simple]; - - EdgeStyle *arrow = [EdgeStyle defaultEdgeStyleWithName:@"arrow"]; - [arrow setThickness:2.0f]; - [arrow setDecorationStyle:ED_Arrow]; - [self listenToEdgeStyle:arrow]; - - EdgeStyle *tick = [EdgeStyle defaultEdgeStyleWithName:@"tick"]; - [tick setThickness:2.0f]; - [tick setDecorationStyle:ED_Tick]; - [self listenToEdgeStyle:tick]; - - [edgeStyles addObject:simple]; - [edgeStyles addObject:arrow]; - [edgeStyles addObject:tick]; -} - -- (void) loadDefaultNodeStyles { -#if ! __has_feature(objc_arc) - [nodeStyles release]; -#endif - nodeStyles = [[NSMutableArray alloc] initWithCapacity:3]; - - NodeStyle *rn = [NodeStyle defaultNodeStyleWithName:@"rn"]; - [rn setStrokeThickness:2]; - [rn setStrokeColorRGB:[ColorRGB colorWithFloatRed:0 green:0 blue:0]]; - [rn setFillColorRGB:[ColorRGB colorWithFloatRed:1 green:0 blue:0]]; - [self listenToNodeStyle:rn]; - - NodeStyle *gn = [NodeStyle defaultNodeStyleWithName:@"gn"]; - [gn setStrokeThickness:2]; - [gn setStrokeColorRGB:[ColorRGB colorWithFloatRed:0 green:0 blue:0]]; - [gn setFillColorRGB:[ColorRGB colorWithFloatRed:0 green:1 blue:0]]; - [self listenToNodeStyle:gn]; - - NodeStyle *yn = [NodeStyle defaultNodeStyleWithName:@"yn"]; - [yn setStrokeThickness:2]; - [yn setStrokeColorRGB:[ColorRGB colorWithFloatRed:0 green:0 blue:0]]; - [yn setFillColorRGB:[ColorRGB colorWithFloatRed:1 green:1 blue:0]]; - [self listenToNodeStyle:yn]; - - [nodeStyles addObject:rn]; - [nodeStyles addObject:gn]; - [nodeStyles addObject:yn]; -} - -- (void) postNodeStyleAdded:(NodeStyle*)style { - [[NSNotificationCenter defaultCenter] postNotificationName:@"NodeStyleAdded" - object:self - userInfo:[NSDictionary dictionaryWithObject:style forKey:@"style"]]; -} - -- (void) postNodeStyleRemoved:(NodeStyle*)style { - [[NSNotificationCenter defaultCenter] postNotificationName:@"NodeStyleRemoved" - object:self - userInfo:[NSDictionary dictionaryWithObject:style forKey:@"style"]]; -} - -- (void) postEdgeStyleAdded:(EdgeStyle*)style { - [[NSNotificationCenter defaultCenter] postNotificationName:@"EdgeStyleAdded" - object:self - userInfo:[NSDictionary dictionaryWithObject:style forKey:@"style"]]; -} - -- (void) postEdgeStyleRemoved:(EdgeStyle*)style { - [[NSNotificationCenter defaultCenter] postNotificationName:@"EdgeStyleRemoved" - object:self - userInfo:[NSDictionary dictionaryWithObject:style forKey:@"style"]]; -} - -- (void) postNodeStylesReplaced { - [[NSNotificationCenter defaultCenter] postNotificationName:@"NodeStylesReplaced" object:self]; -} - -- (void) postEdgeStylesReplaced { - [[NSNotificationCenter defaultCenter] postNotificationName:@"EdgeStylesReplaced" object:self]; -} - -- (NSArray*) nodeStyles { - if (nodeStyles == nil) { - [self loadDefaultNodeStyles]; - } - return nodeStyles; -} - -- (NSArray*) edgeStyles { - if (edgeStyles == nil) { - [self loadDefaultEdgeStyles]; - } - return edgeStyles; -} - -- (void) _setNodeStyles:(NSMutableArray*)styles { - [self ignoreAllNodeStyles]; -#if ! __has_feature(objc_arc) - [nodeStyles release]; - [styles retain]; -#endif - nodeStyles = styles; - for (NodeStyle *style in styles) { - [self listenToNodeStyle:style]; - } - [self postNodeStylesReplaced]; -} - -- (void) _setEdgeStyles:(NSMutableArray*)styles { - [self ignoreAllEdgeStyles]; -#if ! __has_feature(objc_arc) - [edgeStyles release]; - [styles retain]; -#endif - edgeStyles = styles; - for (EdgeStyle *style in styles) { - [self listenToEdgeStyle:style]; - } - [self postEdgeStylesReplaced]; -} - -- (NodeStyle*) nodeStyleForName:(NSString*)name { - for (NodeStyle *s in nodeStyles) { - if ([[s name] isEqualToString:name]) { - return s; - } - } - - return nil; -} - -- (void) addNodeStyle:(NodeStyle*)style { - if (nodeStyles == nil) { - [self loadDefaultNodeStyles]; - } - [nodeStyles addObject:style]; - [self listenToNodeStyle:style]; - [self postNodeStyleAdded:style]; -} - -- (void) removeNodeStyle:(NodeStyle*)style { - if (nodeStyles == nil) { - [self loadDefaultNodeStyles]; - } - - [self ignoreNodeStyle:style]; -#if ! __has_feature(objc_arc) - [style retain]; -#endif - [nodeStyles removeObject:style]; - [self postNodeStyleRemoved:style]; -#if ! __has_feature(objc_arc) - [style release]; -#endif -} - -- (EdgeStyle*) edgeStyleForName:(NSString*)name { - for (EdgeStyle *s in edgeStyles) { - if ([[s name] isEqualToString:name]) { - return s; - } - } - - return nil; -} - -- (void) addEdgeStyle:(EdgeStyle*)style { - if (edgeStyles == nil) { - [self loadDefaultEdgeStyles]; - } - [edgeStyles addObject:style]; - [self listenToEdgeStyle:style]; - [self postEdgeStyleAdded:style]; -} - -- (void) removeEdgeStyle:(EdgeStyle*)style { - if (edgeStyles == nil) { - [self loadDefaultEdgeStyles]; - } - - [self ignoreEdgeStyle:style]; -#if ! __has_feature(objc_arc) - [style retain]; -#endif - [edgeStyles removeObject:style]; - [self postEdgeStyleRemoved:style]; -#if ! __has_feature(objc_arc) - [style release]; -#endif -} - -- (void) updateFromManager:(StyleManager*)m { - NSMutableArray *ns = [NSMutableArray arrayWithCapacity:[[m nodeStyles] count]]; - for (NodeStyle *style in [m nodeStyles]) { - NodeStyle *currentStyle = [self nodeStyleForName:[style name]]; - if (currentStyle != nil) { - [currentStyle updateFromStyle:style]; - [ns addObject:currentStyle]; - } else { -#if __has_feature(objc_arc) - [ns addObject:[style copy]]; -#else - [ns addObject:[[style copy] autorelease]]; -#endif - } - } - NSMutableArray *es = [NSMutableArray arrayWithCapacity:[[m edgeStyles] count]]; - for (EdgeStyle *style in [m edgeStyles]) { - EdgeStyle *currentStyle = [self edgeStyleForName:[style name]]; - if (currentStyle != nil) { - [currentStyle updateFromStyle:style]; - [es addObject:currentStyle]; - } else { -#if __has_feature(objc_arc) - [es addObject:[style copy]]; -#else - [es addObject:[[style copy] autorelease]]; -#endif - } - } - [self _setNodeStyles:ns]; - [self _setEdgeStyles:es]; -} - -- (id) copyWithZone:(NSZone*)zone { - StyleManager *m = [[StyleManager allocWithZone:zone] init]; - - NSMutableArray *ns = [NSMutableArray arrayWithCapacity:[nodeStyles count]]; - for (NodeStyle *style in nodeStyles) { -#if __has_feature(objc_arc) - [ns addObject:[style copyWithZone:zone]]; -#else - [ns addObject:[[style copyWithZone:zone] autorelease]]; -#endif - } - NSMutableArray *es = [NSMutableArray arrayWithCapacity:[edgeStyles count]]; - for (EdgeStyle *style in edgeStyles) { -#if __has_feature(objc_arc) - [es addObject:[style copyWithZone:zone]]; -#else - [es addObject:[[style copyWithZone:zone] autorelease]]; -#endif - } - [m _setNodeStyles:ns]; - [m _setEdgeStyles:es]; - - return m; -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/SupportDir.h b/tikzit-1/src/common/SupportDir.h deleted file mode 100644 index 30ccbcb..0000000 --- a/tikzit-1/src/common/SupportDir.h +++ /dev/null @@ -1,36 +0,0 @@ -// -// SupportDir.h -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import - - -@interface SupportDir : NSObject { -} - -+ (void)createUserSupportDir; -+ (NSString*)userSupportDir; -+ (NSString*)systemSupportDir; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/SupportDir.m b/tikzit-1/src/common/SupportDir.m deleted file mode 100644 index 22fed1b..0000000 --- a/tikzit-1/src/common/SupportDir.m +++ /dev/null @@ -1,65 +0,0 @@ -// -// SupportDir.m -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "SupportDir.h" - -#ifndef __APPLE__ -#import -#import "stat.h" -#endif - -@implementation SupportDir - -+ (NSString*)userSupportDir { -#ifdef __APPLE__ - return [[NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory,NSUserDomainMask,YES) - objectAtIndex:0] stringByAppendingPathComponent:@"TikZiT"]; -#else - return [NSString stringWithFormat:@"%s/tikzit", g_get_user_config_dir ()]; -#endif -} - -+ (NSString*)systemSupportDir { -#ifdef __APPLE__ - return [[NSBundle mainBundle] resourcePath]; -#else - return @TIKZITSHAREDIR; -#endif -} - -+ (void)createUserSupportDir { -#ifdef __APPLE__ - NSFileManager *fileManager = [NSFileManager defaultManager]; - [fileManager createDirectoryAtPath:[SupportDir userSupportDir] - withIntermediateDirectories:YES - attributes:nil - error:NULL]; -#else - // NSFileManager is slightly dodgy on Windows - g_mkdir_with_parents ([[SupportDir userSupportDir] UTF8String], S_IRUSR | S_IWUSR | S_IXUSR); -#endif -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/TikzGraphAssembler+Parser.h b/tikzit-1/src/common/TikzGraphAssembler+Parser.h deleted file mode 100644 index c9391a9..0000000 --- a/tikzit-1/src/common/TikzGraphAssembler+Parser.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2013 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * TikzGraphAssember+Parser.h - * - * This file exposes some TikzGraphAssembler functions - * that are only of use to the parser. - */ - -#import "TikzGraphAssembler.h" - -@interface TikzGraphAssembler (Parser) -- (Graph*) graph; -/** Store a node so that it can be looked up by name later */ -- (void) addNodeToMap:(Node*)n; -/** Get a previously-stored node by name */ -- (Node*) nodeWithName:(NSString*)name; -- (void) reportError:(const char *)message atLocation:(YYLTYPE*)yylloc; -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/TikzGraphAssembler.h b/tikzit-1/src/common/TikzGraphAssembler.h deleted file mode 100644 index 3403969..0000000 --- a/tikzit-1/src/common/TikzGraphAssembler.h +++ /dev/null @@ -1,115 +0,0 @@ -// -// TikzGraphAssembler.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "Graph.h" - -/** - * Parses (a subset of) tikz code and produces the corresponding Graph - * - * A note on errors: - * If parsing fails and a non-NULL error argument is given, it will be - * populated with an error with domain TZErrorDomain and code TZ_ERR_PARSE - * (see NSError+Tikzit.h). - * - * This will have a description set, typically something like - * "syntax error, unexpected [, expecting (" - * It may also have the following keys (it will have all or none of these), - * where numbers are stored using NSNumber: - * - startLine: the line (starting at 1) containing the first character - * of the bad token - * - startColumn: the column (starting at 1; tabs count for 1) of the first - * character of the bad token - * - endLine: the line (starting at 1) containing the last character - * of the bad token - * - endColumn: the column (starting at 1; tabs count for 1) of the last - * character of the bad token - * - syntaxString: an excerpt of the input string (typically the contents - * from startLine to endLine) providing some context - * - tokenOffset: the character offset (starting at 0) of the bad token - * within syntaxString - * - tokenLength: the character length (including newlines) of the bad token - * within syntaxString - */ -@interface TikzGraphAssembler : NSObject { - const char *tikzStr; - Graph *graph; - void *scanner; - NSMutableDictionary *nodeMap; - NSError *lastError; -} - -/** - * Parse tikz and place the result in gr - * - * Note that the graph must be empty; this might be used from an init - * method, for example, although don't forget that you can return a - * different object in init methods, providing you get the allocation - * right. - * - * @param tikz the tikz string to parse - * @param gr the graph to store the result in (must be empty, non-nil) - * @param e a location to store an error if parsing fails (may be NULL) - * @return YES if parsing succeeded, NO otherwise - */ -+ (BOOL) parseTikz:(NSString*)tikz forGraph:(Graph*)gr error:(NSError**)e; -/** - * Overload for -[parseTikz:forGraph:error:] with the error set to NULL - */ -+ (BOOL) parseTikz:(NSString*)tikz forGraph:(Graph*)gr; -/** - * Parse tikz - * - * @param tikz the tikz string to parse - * @param e a location to store an error if parsing fails (may be NULL) - * @return a Graph object if parsing succeeded, nil otherwise - */ -+ (Graph*) parseTikz:(NSString*)tikz error:(NSError**)e; -/** - * Overload for -[parseTikz:error:] with the error set to NULL - */ -+ (Graph*) parseTikz:(NSString*)tikz; -/** - * Validate a property string or value - * - * Wraps the string in "{" and "}" and checks it lexes completely; in other - * words, makes sure that "{" and "}" are balanced (ignoring escaped versions). - * @param tikz the string to validate - * @return YES if the string can be used as a property name or value, NO - * otherwise - */ -+ (BOOL)validateTikzPropertyNameOrValue:(NSString*)tikz; - -/** - * Validate an edge anchor - * - * Checks that the given string will successfully lex if used as an anchor for - * and edge - * @param tikz the string to validate - * @return YES if the string can be used as an edge anchor, NO otherwise - */ -+ (BOOL)validateTikzEdgeAnchor:(NSString*)tikz; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/TikzGraphAssembler.m b/tikzit-1/src/common/TikzGraphAssembler.m deleted file mode 100644 index c5d2811..0000000 --- a/tikzit-1/src/common/TikzGraphAssembler.m +++ /dev/null @@ -1,310 +0,0 @@ -// -// TikzGraphAssembler.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "TikzGraphAssembler.h" -#import "tikzparserdefs.h" -#import "tikzparser.h" -#import "TikzGraphAssembler+Parser.h" -#import "tikzlexer.h" -#import "NSError+Tikzit.h" - -@implementation TikzGraphAssembler - -- (id)init { -#if ! __has_feature(objc_arc) - [self release]; -#endif - return nil; -} - -- (id)initWithGraph:(Graph*)g { - self = [super init]; - if (self) { -#if __has_feature(objc_arc) - graph = g; -#else - graph = [g retain]; -#endif - nodeMap = [[NSMutableDictionary alloc] init]; - yylex_init (&scanner); - yyset_extra(self, scanner); - } - return self; -} - -- (void)dealloc { -#if ! __has_feature(objc_arc) - [graph release]; - [nodeMap release]; - [lastError release]; - yylex_destroy (scanner); - [super dealloc]; -#endif -} - -- (BOOL) parseTikz:(NSString*)t error:(NSError**)error { -#if ! __has_feature(objc_arc) - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; -#endif - - tikzStr = [t UTF8String]; - yy_scan_string(tikzStr, scanner); - int result = yyparse(scanner); - tikzStr = NULL; - -#if ! __has_feature(objc_arc) - [pool drain]; -#endif - - if (result == 0) { - return YES; - } else { - if (error) { - if (lastError) { -#if __has_feature(objc_arc) - *error = lastError; -#else - *error = [[lastError retain] autorelease]; -#endif - } else if (result == 1) { - *error = [NSError errorWithMessage:@"Syntax error" - code:TZ_ERR_PARSE]; - } else if (result == 2) { - *error = [NSError errorWithMessage:@"Insufficient memory" - code:TZ_ERR_PARSE]; - } else { - *error = [NSError errorWithMessage:@"Unknown error" - code:TZ_ERR_PARSE]; - } - } - return NO; - } -} - -+ (BOOL) parseTikz:(NSString*)tikz forGraph:(Graph*)gr { - return [self parseTikz:tikz forGraph:gr error:NULL]; -} -+ (Graph*) parseTikz:(NSString*)tikz error:(NSError**)e { - Graph *gr = [[Graph alloc] init]; - if ([self parseTikz:tikz forGraph:gr error:e]) { -#if __has_feature(objc_arc) - return gr; -#else - return [gr autorelease]; -#endif - } else { -#if ! __has_feature(objc_arc) - [gr release]; -#endif - return nil; - } -} -+ (Graph*) parseTikz:(NSString*)tikz { - return [self parseTikz:tikz error:NULL]; -} - -+ (BOOL) parseTikz:(NSString*)tikz forGraph:(Graph*)gr error:(NSError**)error { - if([tikz length] == 0) { - // empty string -> empty graph - return YES; - } - - TikzGraphAssembler *assembler = [[self alloc] initWithGraph:gr]; - BOOL success = [assembler parseTikz:tikz error:error]; -#if ! __has_feature(objc_arc) - [assembler release]; -#endif - return success; -} - -+ (BOOL)validateTikzPropertyNameOrValue:(NSString*)tikz { - BOOL valid; - - NSString * testTikz = [NSString stringWithFormat: @"{%@}", tikz]; - - void *scanner; - yylex_init (&scanner); - yyset_extra(nil, scanner); - yy_scan_string([testTikz UTF8String], scanner); - YYSTYPE lval; - YYLTYPE lloc; - int result = yylex(&lval, &lloc, scanner); - valid = (result == DELIMITEDSTRING) && - (yyget_leng(scanner) == [testTikz length]); - yylex_destroy(scanner); - - return valid; -} - -+ (BOOL)validateTikzEdgeAnchor:(NSString*)tikz { - if ([tikz length] == 0) - return YES; - - BOOL valid = YES; - - NSString * testTikz = [NSString stringWithFormat: @"(1.%@)", tikz]; - - void *scanner; - yylex_init (&scanner); - yyset_extra(nil, scanner); - yy_scan_string([testTikz UTF8String], scanner); - YYSTYPE lval; - YYLTYPE lloc; - valid = valid && (yylex(&lval, &lloc, scanner) == LEFTPARENTHESIS); - valid = valid && (yylex(&lval, &lloc, scanner) == REFSTRING); - valid = valid && (yylex(&lval, &lloc, scanner) == FULLSTOP); - valid = valid && (yylex(&lval, &lloc, scanner) == REFSTRING); - valid = valid && (yylex(&lval, &lloc, scanner) == RIGHTPARENTHESIS); - valid = valid && (lloc.last_column == [testTikz length]); - yylex_destroy(scanner); - - return valid; -} - -@end - -@implementation TikzGraphAssembler (Parser) -- (Graph*)graph { return graph; } - -- (void)addNodeToMap:(Node*)n { - [nodeMap setObject:n forKey:[n name]]; -} - -- (Node*)nodeWithName:(NSString*)name { - return [nodeMap objectForKey:name]; -} - -- (void) setLastError:(NSError*)error { -#if ! __has_feature(objc_arc) - [error retain]; - [lastError release]; -#endif - lastError = error; -} - -- (void) reportError:(const char *)message atLocation:(YYLTYPE*)yylloc { - NSString *nsmsg = [NSString stringWithUTF8String:message]; - - const char *first_line_start = find_start_of_nth_line ( - tikzStr, yylloc->first_line - 1); - const char *last_line_start = find_start_of_nth_line ( - first_line_start, yylloc->last_line - yylloc->first_line); - const char *last_line_end = last_line_start; - while (*last_line_end && *last_line_end != '\n') { - // points to just after end of last line - ++last_line_end; - } - - size_t context_len = last_line_end - first_line_start; - size_t token_offset = yylloc->first_column - 1; - size_t token_len = ((last_line_start - first_line_start) + yylloc->last_column) - token_offset; - - if (token_offset + token_len > context_len) { - // error position state is corrupted - NSLog(@"Got bad error state for error \"%s\": start(%i,%i), end(%i,%i)", - message, - yylloc->first_line, - yylloc->first_column, - yylloc->last_line, - yylloc->last_column); - [self setLastError:[NSError errorWithMessage:nsmsg - code:TZ_ERR_PARSE]]; - } else { - char *context = malloc (context_len + 1); - strncpy (context, first_line_start, context_len); - *(context + context_len) = '\0'; - - NSDictionary *userInfo = - [NSDictionary dictionaryWithObjectsAndKeys: - nsmsg, - NSLocalizedDescriptionKey, - [NSNumber numberWithInt:yylloc->first_line], - @"startLine", - [NSNumber numberWithInt:yylloc->first_column], - @"startColumn", - [NSNumber numberWithInt:yylloc->last_line], - @"endLine", - [NSNumber numberWithInt:yylloc->last_column], - @"endColumn", - [NSString stringWithUTF8String:context], - @"syntaxString", - [NSNumber numberWithInt:token_offset], - @"tokenStart", - [NSNumber numberWithInt:token_len], - @"tokenLength", - nil]; - [self setLastError: - [NSError errorWithDomain:TZErrorDomain - code:TZ_ERR_PARSE - userInfo:userInfo]]; - - // we can now freely edit context string - // we only bother printing out the first line - if (yylloc->last_line > yylloc->first_line) { - char *nlp = strchr(context, '\n'); - if (nlp) { - *nlp = '\0'; - context_len = nlp - context; - NSAssert2(token_offset < context_len, @"token_offset (%lu) < context_len (%lu)", token_offset, context_len); - if (token_offset + token_len > context_len) { - token_len = context_len - token_offset; - } - } else { - NSLog(@"Didn't find any newlines in context string!"); - } - } - size_t token_col_offset = 0; - size_t token_col_len = 0; - for (int i = 0; i < token_offset; ++i) { - if (*(context + i) == '\t') - token_col_offset += 8; - else - ++token_col_offset; - } - for (int i = token_offset; i < token_offset + token_len; ++i) { - if (*(context + i) == '\t') - token_col_len += 8; - else - ++token_col_len; - } - NSString *pointerLinePadding = - [@"" stringByPaddingToLength:token_col_offset - withString:@" " - startingAtIndex:0]; - NSString *pointerLineCarets = - [@"" stringByPaddingToLength:token_col_len - withString:@"^" - startingAtIndex:0]; - NSLog(@"Parse error on line %i, starting at %i: %s\n%s\n%@%@", - yylloc->first_line, - yylloc->first_column, - message, - context, - pointerLinePadding, - pointerLineCarets); - free (context); - } -} -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/TikzShape.h b/tikzit-1/src/common/TikzShape.h deleted file mode 100644 index 6a91f91..0000000 --- a/tikzit-1/src/common/TikzShape.h +++ /dev/null @@ -1,37 +0,0 @@ -// -// TikzShape.h -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "Shape.h" - -@interface TikzShape : Shape { - NSString *tikzSrc; -} - -@property (copy) NSString *tikzSrc; - -- (id)initWithTikzFile:(NSString*)file; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/TikzShape.m b/tikzit-1/src/common/TikzShape.m deleted file mode 100644 index 555a7df..0000000 --- a/tikzit-1/src/common/TikzShape.m +++ /dev/null @@ -1,70 +0,0 @@ -// -// TikzShape.m -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "TikzShape.h" -#import "Graph.h" - -@implementation TikzShape - -@synthesize tikzSrc; - -- (id)initWithTikzFile:(NSString*)file { - self = [super init]; - if (self) { - NSString *tikz = [NSString stringWithContentsOfFile:file - encoding:NSUTF8StringEncoding - error:NULL]; - if (tikz == nil) return nil; - - tikzSrc = [tikz copy]; - - Graph *graph = [Graph graphFromTikz:tikz]; - if (graph == nil) return nil; - - NSRect graphBounds = ([graph hasBoundingBox]) ? [graph boundingBox] : [graph bounds]; - - float sz = 0.5f; - - // the "screen" coordinate space fits in the shape bounds - Transformer *t = [Transformer transformer]; - float width_ratio = (2*sz) / graphBounds.size.width; - float height_ratio = (2*sz) / graphBounds.size.height; - [t setScale:MIN(width_ratio, height_ratio)]; - NSRect bds = [t rectToScreen:graphBounds]; - NSPoint shift = NSMakePoint(-NSMidX(bds), - -NSMidY(bds)); - [t setOrigin:shift]; - [graph applyTransformer:t]; -#if __has_feature(objc_arc) - paths = [graph pathCover]; -#else - paths = [[graph pathCover] retain]; -#endif - } - return self; -} - - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/Transformer.h b/tikzit-1/src/common/Transformer.h deleted file mode 100644 index 1b0108a..0000000 --- a/tikzit-1/src/common/Transformer.h +++ /dev/null @@ -1,154 +0,0 @@ -// -// Transformer.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - - -#import - -extern float const PIXELS_PER_UNIT; - -/*! - @class Transformer - @brief Do affine coordinate transforms between an abstract co-ordinate - space (such as the graph's) and the screen's. - - This currently allows zooming and panning. - */ -@interface Transformer : NSObject { - NSPoint origin; - float x_scale; - float y_scale; -} - -/*! - @brief The screen co-ordinate of the abstract space origin. - */ -@property (assign) NSPoint origin; - -/*! - @brief The scale (from abstract space to screen space) - @detail This is the size of a single unit (a distance of 1.0) - of the abstract space on the screen. - - Around 50 is a reasonable value. - */ -@property (assign) float scale; - -/*! - @brief Whether co-ordinates are flipped about the X axis - @detail TikZ considers X co-ordinates to run left to right, - which is not necessarily how the screen views - them. - */ -@property (assign,getter=isFlippedAboutXAxis) BOOL flippedAboutXAxis; - -/*! - @brief Whether co-ordinates are flipped about the Y axis - @detail TikZ considers Y co-ordinates to run up the page, - which is not necessarily how the screen views - them. - */ -@property (assign,getter=isFlippedAboutYAxis) BOOL flippedAboutYAxis; - -/*! - @brief Transform a point from screen space to abstract space. - @param p a point in screen space. - @result A point in abstract space. - */ -- (NSPoint)fromScreen:(NSPoint)p; - -/*! - @brief Transform a point from abstract space to screen space. - @param p a point in abstract space. - @result A point in screen space. - */ -- (NSPoint)toScreen:(NSPoint)p; - -/*! - @brief Scale a distance from screen space to abstract space. - @param dist a distance in screen space. - @result A distance in abstract space. - */ -- (float)scaleFromScreen:(float)dist; - -/*! - @brief Scale a distance from abstract space to screen space. - @param dist a distance in abstract space. - @result A distance in screen space. - */ -- (float)scaleToScreen:(float)dist; - -/*! - @brief Scale a rectangle from screen space to abstract space. - @param r a rectangle in screen space. - @result A rectangle in abstract space. - */ -- (NSRect)rectFromScreen:(NSRect)r; - -/*! - @brief Scale a rectangle from abstract space to screen space. - @param r a rectangle in abstract space. - @result A rectangle in screen space. - */ -- (NSRect)rectToScreen:(NSRect)r; - -/*! - @brief Factory method to get an identity transformer. - @result A transformer. - */ -+ (Transformer*)transformer; - -/*! - @brief Factory method to get a transformer identical to another - @result A transformer. - */ -+ (Transformer*)transformerWithTransformer:(Transformer*)t; - -/*! - @brief Factory method to get a transformer. - @param o The screen co-ordinate of the abstract space origin - @param scale The scale (from abstract space to screen space) - @result A transformer. - */ -+ (Transformer*)transformerWithOrigin:(NSPoint)o andScale:(float)scale; - -/*! - @brief Get a global 'actual size' transformer. - @result A transformer. - */ -+ (Transformer*)defaultTransformer; - -/*! - @brief A transformer set up from two bounding rects. - - graphRect is made as large as possible while still fitting into screenRect. - @result A transformer. - */ -+ (Transformer*)transformerToFit:(NSRect)graphRect intoScreenRect:(NSRect)screenRect flippedAboutXAxis:(BOOL)flipX flippedAboutYAxis:(BOOL)flipY; - -+ (Transformer*)transformerToFit:(NSRect)graphRect intoScreenRect:(NSRect)screenRect flippedAboutXAxis:(BOOL)flipX; -+ (Transformer*)transformerToFit:(NSRect)graphRect intoScreenRect:(NSRect)screenRect flippedAboutYAxis:(BOOL)flipY; -+ (Transformer*)transformerToFit:(NSRect)graphRect intoScreenRect:(NSRect)screenRect; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/Transformer.m b/tikzit-1/src/common/Transformer.m deleted file mode 100644 index 2b56813..0000000 --- a/tikzit-1/src/common/Transformer.m +++ /dev/null @@ -1,231 +0,0 @@ -// -// Transformer.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "Transformer.h" - -float const PIXELS_PER_UNIT = 50; - -@implementation Transformer - -+ (Transformer*)transformer { -#if __has_feature(objc_arc) - return [[Transformer alloc] init]; -#else - return [[[Transformer alloc] init] autorelease]; -#endif -} - -+ (Transformer*)transformerWithTransformer:(Transformer*)t { -#if __has_feature(objc_arc) - return [t copy]; -#else - return [[t copy] autorelease]; -#endif -} - -+ (Transformer*)transformerWithOrigin:(NSPoint)o andScale:(float)scale { - Transformer *trans = [self transformer]; - [trans setOrigin:o]; - [trans setScale:scale]; - return trans; -} - -+ (Transformer*)transformerToFit:(NSRect)graphRect - intoScreenRect:(NSRect)screenRect { - return [self transformerToFit:graphRect - intoScreenRect:screenRect - flippedAboutXAxis:NO - flippedAboutYAxis:NO]; -} - -+ (Transformer*)transformerToFit:(NSRect)graphRect - intoScreenRect:(NSRect)screenRect - flippedAboutXAxis:(BOOL)flipX { - return [self transformerToFit:graphRect - intoScreenRect:screenRect - flippedAboutXAxis:flipX - flippedAboutYAxis:NO]; -} - -+ (Transformer*)transformerToFit:(NSRect)graphRect - intoScreenRect:(NSRect)screenRect - flippedAboutYAxis:(BOOL)flipY { - return [self transformerToFit:graphRect - intoScreenRect:screenRect - flippedAboutXAxis:NO - flippedAboutYAxis:flipY]; -} - -+ (Transformer*)transformerToFit:(NSRect)graphRect - intoScreenRect:(NSRect)screenRect - flippedAboutXAxis:(BOOL)flipAboutXAxis - flippedAboutYAxis:(BOOL)flipAboutYAxis { - - const float wscale = screenRect.size.width / graphRect.size.width; - const float hscale = screenRect.size.height / graphRect.size.height; - const float scale = (wscale < hscale) ? wscale : hscale; - const float xpad = (screenRect.size.width - (graphRect.size.width * scale)) / 2.0; - const float ypad = (screenRect.size.height - (graphRect.size.height * scale)) / 2.0; - - // if we are flipping, we need to calculate the origin from the opposite edge - const float gx = flipAboutYAxis ? -(graphRect.size.width + graphRect.origin.x) - : graphRect.origin.x; - const float gy = flipAboutXAxis ? -(graphRect.size.height + graphRect.origin.y) - : graphRect.origin.y; - const float origin_x = screenRect.origin.x - (gx * scale) + xpad; - const float origin_y = screenRect.origin.y - (gy * scale) + ypad; - - Transformer *trans = [self transformer]; - [trans setOrigin:NSMakePoint(origin_x, origin_y)]; - [trans setScale:scale]; - [trans setFlippedAboutXAxis:flipAboutXAxis]; - [trans setFlippedAboutYAxis:flipAboutYAxis]; - return trans; -} - -- (id) init { - self = [super init]; - - if (self) { - origin = NSZeroPoint; - x_scale = 1.0f; - y_scale = 1.0f; - } - - return self; -} - -- (id)copyWithZone:(NSZone *)zone { - Transformer *cp = [[[self class] allocWithZone:zone] init]; - if (cp) { - cp->origin = origin; - cp->x_scale = x_scale; - cp->y_scale = y_scale; - } - return cp; -} - -- (NSPoint)origin { return origin; } -- (void)setOrigin:(NSPoint)o { - origin = o; -} - -- (float)scale { return ABS(x_scale); } -- (void)setScale:(float)s { - x_scale = (x_scale < 0.0) ? -s : s; - y_scale = (y_scale < 0.0) ? -s : s; -} - -- (BOOL)isFlippedAboutXAxis { - return y_scale < 0.0; -} - -- (void)setFlippedAboutXAxis:(BOOL)flip { - if (flip != [self isFlippedAboutXAxis]) { - y_scale *= -1; - } -} - -- (BOOL)isFlippedAboutYAxis { - return x_scale < 0.0; -} - -- (void)setFlippedAboutYAxis:(BOOL)flip { - if (flip != [self isFlippedAboutYAxis]) { - x_scale *= -1; - } -} - -- (NSPoint)fromScreen:(NSPoint)p { - NSPoint trans; - trans.x = (p.x - origin.x) / x_scale; - trans.y = (p.y - origin.y) / y_scale; - return trans; -} - -- (NSPoint)toScreen:(NSPoint)p { - NSPoint trans; - trans.x = (p.x * x_scale) + origin.x; - trans.y = (p.y * y_scale) + origin.y; - return trans; -} - -- (float)scaleFromScreen:(float)dist { - return dist / ABS(x_scale); -} - -- (float)scaleToScreen:(float)dist { - return dist * ABS(x_scale); -} - -- (NSRect)rectFromScreen:(NSRect)r { - NSRect r1; - r1.origin = [self fromScreen:r.origin]; - r1.size.width = [self scaleFromScreen:r.size.width]; - r1.size.height = [self scaleFromScreen:r.size.height]; - // if we're flipped, the origin will be at a different corner - if ([self isFlippedAboutYAxis]) { - r1.origin.x -= r1.size.width; - } - if ([self isFlippedAboutXAxis]) { - r1.origin.y -= r1.size.height; - } - return r1; -} - -- (NSRect)rectToScreen:(NSRect)r { - NSPoint o = r.origin; - // if we're flipped, the origin will be at a different corner - if ([self isFlippedAboutYAxis]) { - o.x = NSMaxX(r); - } - if ([self isFlippedAboutXAxis]) { - o.y = NSMaxY(r); - } - NSRect r1; - r1.origin = [self toScreen:o]; - r1.size.width = [self scaleToScreen:r.size.width]; - r1.size.height = [self scaleToScreen:r.size.height]; - return r1; -} - -- (BOOL)isEqual:(id)object { - Transformer *t = (Transformer*)object; - return ([t origin].x == [self origin].x && - [t origin].y == [self origin].y && - [t scale] == [self scale]); -} - -Transformer *defaultTransformer = nil; - -+ (Transformer*)defaultTransformer { - if (defaultTransformer == nil) { - defaultTransformer = [[Transformer alloc] init]; - [defaultTransformer setScale:PIXELS_PER_UNIT]; - } - return defaultTransformer; -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/common/test/Makefile b/tikzit-1/src/common/test/Makefile deleted file mode 100644 index d158d16..0000000 --- a/tikzit-1/src/common/test/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -OBJC = gcc -MMD -MP -DSTAND_ALONE -DGNUSTEP -DGNUSTEP_BASE_LIBRARY=1 -DGNU_RUNTIME=1 -DGNUSTEP_BASE_LIBRARY=1 -fno-strict-aliasing -fPIC -Wall -DGSWARN -DGSDIAGNOSE -Wno-import -O0 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic -fgnu-runtime -fconstant-string-class=NSConstantString -I. -I.. -I/users/alemer/GNUstep/Library/Headers -std=c99 -D_GNU_SOURCE -rdynamic -fgnu-runtime -L/users/alemer/GNUstep/Library/Libraries -L/usr/local/lib64 -L/usr/lib64 -lgnustep-base -lpthread -lobjc -lm - -maths_test_objects = test.m maths.m ../util.m -color_test_objects = test.m color.m ../ColorRGB.m ../util.m ../BasicMapTable.m ../RColor.m - -test: maths-test color-test - ./maths-test - ./color-test - -maths-test: $(maths_test_objects) - $(OBJC) $(maths_test_objects) -o $@ - -color-test: $(color_test_objects) - $(OBJC) $(color_test_objects) -o $@ diff --git a/tikzit-1/src/common/test/color.m b/tikzit-1/src/common/test/color.m deleted file mode 100644 index 48a6ff4..0000000 --- a/tikzit-1/src/common/test/color.m +++ /dev/null @@ -1,80 +0,0 @@ -// -// color.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// -#import "test/test.h" -#import "ColorRGB.h" - -#ifdef STAND_ALONE -void runTests() { -#else -void testColor() { -#endif - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - startTestBlock(@"color"); - - ColorRGB *red = [ColorRGB colorWithRed:255 green:0 blue:0]; - ColorRGB *lime = [ColorRGB colorWithRed:0 green:255 blue:0]; - ColorRGB *green = [ColorRGB colorWithRed:0 green:128 blue:0]; - TEST(@"Recognised red", - [red name] != nil && - [[red name] isEqualToString:@"Red"]); - TEST(@"Recognised lime", - [lime name] != nil && - [[lime name] isEqualToString:@"Lime"]); - TEST(@"Recognised green", - [green name] != nil && - [[green name] isEqualToString:@"Green"]); - - ColorRGB *floatRed = [ColorRGB colorWithFloatRed:1.0f green:0.0f blue:0.0f]; - ColorRGB *floatLime = [ColorRGB colorWithFloatRed:0.0f green:1.0f blue:0.0f]; - ColorRGB *floatGreen = [ColorRGB colorWithFloatRed:0.0f green:0.5f blue:0.0f]; - - TEST(@"Float red equal to int red", [floatRed isEqual:red]); - TEST(@"Float lime equal to int lime", [floatLime isEqual:lime]); - TEST(@"Float green equal to int green", [floatGreen isEqual:green]); - - TEST(@"Recognised float red", - [floatRed name] != nil && - [[floatRed name] isEqualToString:@"Red"]); - - TEST(@"Recognised float lime", - [floatLime name] != nil && - [[floatLime name] isEqualToString:@"Lime"]); - - TEST(@"Recognised float green", - [floatGreen name] != nil && - [[floatGreen name] isEqualToString:@"Green"]); - - [floatRed setRedFloat:0.99f]; - TEST(@"Nudged red, not recognised now", [floatRed name] == nil); - [floatRed setToClosestHashed]; - TEST(@"Set to closest hashed, reconised again", - [floatRed name] != nil && - [[floatRed name] isEqualToString:@"Red"]); - - TEST(@"Red has correct hex (ff0000)", [[red hexName] isEqualToString:@"hexcolor0xff0000"]); - TEST(@"Lime has correct hex (00ff00)", [[lime hexName] isEqualToString:@"hexcolor0x00ff00"]); - TEST(@"Green has correct hex (008000)", [[green hexName] isEqualToString:@"hexcolor0x008000"]); - - endTestBlock(@"color"); - [pool drain]; -} diff --git a/tikzit-1/src/common/test/common.m b/tikzit-1/src/common/test/common.m deleted file mode 100644 index c9ac980..0000000 --- a/tikzit-1/src/common/test/common.m +++ /dev/null @@ -1,34 +0,0 @@ -// -// common.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// -#import "test/test.h" -void testParser(); -void testColor(); -void testMaths(); - -void testCommon() { - startTestBlock(@"common"); - testParser(); - testColor(); - testMaths(); - endTestBlock(@"common"); -} diff --git a/tikzit-1/src/common/test/maths.m b/tikzit-1/src/common/test/maths.m deleted file mode 100644 index a11e58e..0000000 --- a/tikzit-1/src/common/test/maths.m +++ /dev/null @@ -1,562 +0,0 @@ -// -// TikZiT -// -// Copyright 2011 Alex Merry -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "../util.h" - -#import "test.h" - -void testRectAroundPoints() { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - startTestBlock(@"NSRectAroundPoints"); - - NSRect rect = NSRectAroundPoints (NSZeroPoint, NSZeroPoint); - assertRectsEqual (@"(0,0) and (0,0)", rect, NSZeroRect); - - rect = NSRectAroundPoints (NSZeroPoint, NSMakePoint (1.0f, 1.0f)); - assertRectsEqual (@"(0,0) and (1,1)", rect, NSMakeRect (0.0f, 0.0f, 1.0f, 1.0f)); - - rect = NSRectAroundPoints (NSMakePoint (-1.0f, 1.0f), NSMakePoint (1.0f, -1.0f)); - assertRectsEqual (@"(-1,1) and (1,-1)", rect, NSMakeRect (-1.0f, -1.0f, 2.0f, 2.0f)); - - endTestBlock(@"NSRectAroundPoints"); - [pool drain]; -} - -void testRectAroundPointsWithPadding() { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - startTestBlock(@"NSRectAroundPointsWithPadding"); - - NSRect rect = NSRectAroundPointsWithPadding (NSZeroPoint, NSZeroPoint, 0.0f); - assertRectsEqual (@"(0,0) and (0,0); 0 padding", rect, NSZeroRect); - - rect = NSRectAroundPointsWithPadding (NSZeroPoint, NSZeroPoint, 0.2f); - assertRectsEqual (@"(0,0) and (0,0); 0.2 padding", rect, NSMakeRect (-0.2f, -0.2f, 0.4f, 0.4f)); - - rect = NSRectAroundPointsWithPadding (NSZeroPoint, NSMakePoint (1.0f, 1.0f), -0.2f); - assertRectsEqual (@"(0,0) and (1,1); -0.2 padding", rect, NSMakeRect (0.2f, 0.2f, 0.6f, 0.6f)); - - endTestBlock(@"NSRectAroundPointsWithPadding"); - [pool drain]; -} - -void testGoodAtan() { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - startTestBlock(@"good_atan"); - - assertFloatsEqual (@"0.0, 0.0", good_atan (0.0f, 0.0f), 0.0f); - assertFloatsEqual (@"0.0, 1.0", good_atan (0.0f, 1.0f), 0.5f * M_PI); - assertFloatsEqual (@"0.0, -1.0", good_atan (0.0f, -1.0f), 1.5f * M_PI); - assertFloatsEqual (@"1.0, 0.0", good_atan (1.0f, 0.0f), 0.0f); - assertFloatsEqual (@"1.0, 0.1", good_atan (1.0f, 0.1f), 0.0996687f); - - endTestBlock(@"good_atan"); - [pool drain]; -} - -void testBezierInterpolate() { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - startTestBlock(@"bezierInterpolate"); - - assertFloatsEqual (@"0.0, (0.0, 0.1, 0.2, 0.3)", bezierInterpolate (0.0f, 0.0f, 0.1f, 0.2f, 0.3f), 0.0f); - assertFloatsEqual (@"1.0, (0.0, 0.1, 0.2, 0.3)", bezierInterpolate (1.0f, 0.0f, 0.1f, 0.2f, 0.3f), 0.3f); - assertFloatsEqual (@"0.5, (0.0, 0.1, 0.2, 0.3)", bezierInterpolate (0.5f, 0.0f, 0.1f, 0.2f, 0.3f), 0.15f); - // FIXME: other tests - - endTestBlock(@"bezierInterpolate"); - [pool drain]; -} - -void testLineSegmentsIntersect() { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - startTestBlock(@"lineSegmentsIntersect"); - - BOOL result = NO; - NSPoint intersection = NSMakePoint (-1.0f, -1.0f); - - result = lineSegmentsIntersect (NSMakePoint (-1.0f, -1.0f), NSMakePoint (1.0f, 1.0f), - NSMakePoint (-1.0f, 1.0f), NSMakePoint (1.0f, -1.0f), - &intersection); - TEST (@"Cross at zero: has intersection", result); - assertPointsEqual (@"Cross at zero: intersection value", intersection, NSZeroPoint); - - result = lineSegmentsIntersect (NSMakePoint (-1.0f, -1.0f), NSMakePoint (-0.5f, -0.5f), - NSMakePoint (-1.0f, 1.0f), NSMakePoint (1.0f, -1.0f), - &intersection); - TEST (@"Fail to cross at zero", !result); - - result = lineSegmentsIntersect (NSMakePoint (1.0f, 1.0f), NSMakePoint (1.0f, -1.0f), - NSMakePoint (0.0f, 0.0f), NSMakePoint (1.0f, 0.0f), - &intersection); - TEST (@"Touch at one: has intersection", result); - assertPointsEqual (@"Touch at one: intersection value", intersection, NSMakePoint (1.0f, 0.0f)); - - endTestBlock(@"lineSegmentsIntersect"); - [pool drain]; -} - -void testLineSegmentIntersectsRect() { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - startTestBlock(@"lineSegmentIntersectsRect"); - - BOOL result = NO; - - result = lineSegmentIntersectsRect ( - NSMakePoint (-1.0f, -1.0f), - NSMakePoint (0.0f, 0.0f), - NSZeroRect); - TEST (@"Zero rect; line touches zero", result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (-1.0f, -1.0f), - NSMakePoint (-0.1f, -0.1f), - NSZeroRect); - TEST (@"Zero rect; line short of zero", !result); - - NSRect rect = NSMakeRect (1.0f, 1.0f, 1.0f, 1.0f); - - result = lineSegmentIntersectsRect ( - NSMakePoint (0.0f, 0.0f), - NSMakePoint (3.0f, 1.0f), - rect); - TEST (@"Line underneath", !result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (0.0f, 0.0f), - NSMakePoint (1.0f, 3.0f), - rect); - TEST (@"Line to left", !result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (0.0f, 2.0f), - NSMakePoint (3.0f, 3.0f), - rect); - TEST (@"Line above", !result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (2.0f, 0.0f), - NSMakePoint (3.0f, 3.0f), - rect); - TEST (@"Line to right", !result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (0.0f, 0.0f), - NSMakePoint (0.9f, 0.9f), - rect); - TEST (@"Line short", !result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (1.1f, 1.1f), - NSMakePoint (1.9f, 1.9f), - rect); - TEST (@"Line inside", result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (0.0f, 1.5f), - NSMakePoint (3.0f, 1.5f), - rect); - TEST (@"Horizontal line through", result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (1.5f, 0.0f), - NSMakePoint (1.5f, 3.0f), - rect); - TEST (@"Vertical line through", result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (0.5f, 1.0f), - NSMakePoint (2.0f, 2.5f), - rect); - TEST (@"Cut top and left", result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (2.0f, 0.5f), - NSMakePoint (0.5f, 2.0f), - rect); - TEST (@"Cut bottom and left", result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (1.0f, 0.5f), - NSMakePoint (2.5f, 2.0f), - rect); - TEST (@"Cut bottom and right", result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (0.0f, 1.0f), - NSMakePoint (2.0f, 3.0f), - rect); - TEST (@"Touch top left", result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (1.0f, 0.0f), - NSMakePoint (3.0f, 2.0f), - rect); - TEST (@"Touch bottom right", result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (1.0f, 0.0f), - NSMakePoint (1.0f, 3.0f), - rect); - TEST (@"Along left side", result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (0.0f, 1.0f), - NSMakePoint (3.0f, 1.0f), - rect); - TEST (@"Along bottom side", result); - - endTestBlock(@"lineSegmentIntersectsRect"); - [pool drain]; -} - -struct line_bezier_test { - NSString *msg; - NSPoint lstart; - NSPoint lend; - NSPoint c0; - NSPoint c1; - NSPoint c2; - NSPoint c3; - BOOL expectedResult; - float expectedT; - NSPoint expectedIntersect; -}; - -static struct line_bezier_test line_bezier_tests[] = { - { - @"Outside box", - {0.0f, 0.0f}, - {1.0f, 0.0f}, - {0.0f, 1.0f}, - {0.0f, 2.0f}, - {1.0f, 2.0f}, - {1.0f, 1.0f}, - NO, - -1.0f, - {0.0f, 0.0f} - }, - { - @"Single intersect", - {100.0f, 20.0f}, - {195.0f, 255.0f}, - {93.0f, 163.0f}, - {40.0f, 30.0f}, - {270.0f, 115.0f}, - {219.0f, 178.0f}, - YES, - -0.4f, - {129.391693f, 92.705772f} - }, - { - @"Double intersect", - {100.0f, 20.0f}, - {195.0f, 255.0f}, - {93.0f, 163.0f}, - {40.0f, 30.0f}, - {270.0f, 115.0f}, - {154.0f, 212.0f}, - YES, - -0.909f, - {170.740646f,194.990021f} - }, - { - @"Near miss", - {100.0f, 20.0f}, - {195.0f, 255.0f}, - {93.0f, 163.0f}, - {40.0f, 30.0f}, - {176.0f, 100.0f}, - {154.0f, 212.0f}, - NO, - -1.0f, - {0.0f,0.0f} - } -}; -static unsigned int n_line_bezier_tests = sizeof (line_bezier_tests) / sizeof (line_bezier_tests[0]); - -void testLineSegmentIntersectsBezier() { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - startTestBlock(@"lineSegmentIntersectsBezier"); - - for (unsigned int i = 0; i < n_line_bezier_tests; ++i) { - NSPoint intersect; - BOOL result = lineSegmentIntersectsBezier ( - line_bezier_tests[i].lstart, - line_bezier_tests[i].lend, - line_bezier_tests[i].c0, - line_bezier_tests[i].c1, - line_bezier_tests[i].c2, - line_bezier_tests[i].c3, - &intersect); - if (result) { - if (line_bezier_tests[i].expectedT < 0.0f) { - assertPointsEqual (line_bezier_tests[i].msg, intersect, line_bezier_tests[i].expectedIntersect); - } else { - assertPointsEqual (line_bezier_tests[i].msg, intersect, - bezierInterpolateFull (line_bezier_tests[i].expectedT, line_bezier_tests[i].c0, line_bezier_tests[i].c1, line_bezier_tests[i].c2, line_bezier_tests[i].c3)); - } - } else { - if (line_bezier_tests[i].expectedResult) - fail (line_bezier_tests[i].msg); - else - pass (line_bezier_tests[i].msg); - } - } - -BOOL lineSegmentIntersectsBezier (NSPoint lstart, NSPoint lend, NSPoint c0, NSPoint c1, NSPoint c2, NSPoint c3, NSPoint *result); - endTestBlock(@"lineSegmentIntersectsBezier"); - [pool drain]; -} - -struct exit_point_test { - NSString *msg; - NSPoint rayStart; - float angle; - NSRect rect; - NSPoint expected; -}; - -static struct exit_point_test exit_point_tests[] = { - { - @"0.0 rads", - {0.0f, 0.0f}, - 0.0f, - {{-1.0f, -1.0f}, {2.0f, 2.0f}}, - {1.0f, 0.0f} - }, - { - @"pi/2 rads", - {0.0f, 0.0f}, - M_PI / 2.0f, - {{-1.0f, -1.0f}, {2.0f, 2.0f}}, - {0.0f, 1.0f} - }, - { - @"-pi/2 rads", - {0.0f, 0.0f}, - -M_PI / 2.0f, - {{-1.0f, -1.0f}, {2.0f, 2.0f}}, - {0.0f, -1.0f} - }, - { - @"pi rads", - {0.0f, 0.0f}, - M_PI, - {{-1.0f, -1.0f}, {2.0f, 2.0f}}, - {-1.0f, 0.0f} - }, - { - @"-pi rads", - {0.0f, 0.0f}, - -M_PI, - {{-1.0f, -1.0f}, {2.0f, 2.0f}}, - {-1.0f, 0.0f} - }, - { - @"pi/4 rads", - {0.0f, 0.0f}, - M_PI / 4.0f, - {{-1.0f, -1.0f}, {2.0f, 2.0f}}, - {1.0f, 1.0f} - }, - { - @"3pi/4 rads", - {0.0f, 0.0f}, - (3.0f * M_PI) / 4.0f, - {{-1.0f, -1.0f}, {2.0f, 2.0f}}, - {-1.0f, 1.0f} - }, - { - @"-pi/4 rads", - {0.0f, 0.0f}, - -M_PI / 4.0f, - {{-1.0f, -1.0f}, {2.0f, 2.0f}}, - {1.0f, -1.0f} - }, - { - @"-3pi/4 rads", - {0.0f, 0.0f}, - (-3.0f * M_PI) / 4.0f, - {{-1.0f, -1.0f}, {2.0f, 2.0f}}, - {-1.0f, -1.0f} - }, - { - @"pi/8 rads", - {0.0f, 0.0f}, - M_PI / 8.0f, - {{-1.0f, -1.0f}, {2.0f, 2.0f}}, - {1.0f, 0.414213562373095f} - }, - { - @"3pi/8 rads", - {0.0f, 0.0f}, - 3.0f * M_PI / 8.0f, - {{-1.0f, -1.0f}, {2.0f, 2.0f}}, - {0.414213562373095f, 1.0f} - }, - { - @"-5pi/8 rads", - {0.0f, 0.0f}, - -5.0f * M_PI / 8.0f, - {{-1.0f, -1.0f}, {2.0f, 2.0f}}, - {-0.414213562373095f, -1.0f} - }, - { - @"-7pi/8 rads", - {0.0f, 0.0f}, - -7.0f * M_PI / 8.0f, - {{-1.0f, -1.0f}, {2.0f, 2.0f}}, - {-1.0f, -0.414213562373095f} - }, - { - @"pi/8 rads; origin (1,1)", - {1.0f, 1.0f}, - M_PI / 8.0f, - {{0.0f, 0.0f}, {2.0f, 2.0f}}, - {2.0f, 1.414213562373095f} - }, - { - @"7pi/8 rads; origin (-2,2)", - {-2.0f, 2.0f}, - 7.0f * M_PI / 8.0f, - {{-3.0f, 1.0f}, {2.0f, 2.0f}}, - {-3.0f, 2.414213562373095f} - }, - { - @"pi/8 rads; origin (1,1); SW of box", - {1.0f, 1.0f}, - M_PI / 8.0f, - {{1.0f, 1.0f}, {1.0f, 1.0f}}, - {2.0f, 1.414213562373095f} - }, - { - @"pi/8 rads; origin (1,1); SE of box", - {1.0f, 1.0f}, - M_PI / 8.0f, - {{0.0f, 1.0f}, {1.0f, 1.0f}}, - {1.0f, 1.0f} - }, - { - @"pi/8 rads; origin (1,1); NE of box", - {1.0f, 1.0f}, - M_PI / 8.0f, - {{0.0f, 1.0f}, {1.0f, 1.0f}}, - {1.0f, 1.0f} - }, - { - @"pi/8 rads; origin (1,1); NW of box", - {1.0f, 1.0f}, - M_PI / 8.0f, - {{1.0f, 0.0f}, {1.0f, 1.0f}}, - {1.0f, 1.0f} - }, - { - @"pi/8 rads; origin (1,1); N of box", - {1.0f, 1.0f}, - M_PI / 8.0f, - {{0.5f, 0.0f}, {1.0f, 1.0f}}, - {1.0f, 1.0f} - }, - { - @"7pi/8 rads; origin (1,1); N of box", - {1.0f, 1.0f}, - 7.0f * M_PI / 8.0f, - {{0.5f, 0.0f}, {1.0f, 1.0f}}, - {1.0f, 1.0f} - }, - { - @"-pi/8 rads; origin (1,1); S of box", - {1.0f, 1.0f}, - -M_PI / 8.0f, - {{0.5f, 1.0f}, {1.0f, 1.0f}}, - {1.0f, 1.0f} - }, - { - @"-pi/8 rads; origin (1,1); E of box", - {1.0f, 1.0f}, - -M_PI / 8.0f, - {{0.0f, 0.5f}, {1.0f, 1.0f}}, - {1.0f, 1.0f} - }, - { - @"-7pi/8 rads; origin (1,1); W of box", - {1.0f, 1.0f}, - -7.0f * M_PI / 8.0f, - {{1.0f, 0.5f}, {1.0f, 1.0f}}, - {1.0f, 1.0f} - }, - { - @"7pi/8 rads; origin (1,1); W of box", - {1.0f, 1.0f}, - 7.0f * M_PI / 8.0f, - {{1.0f, 0.5f}, {1.0f, 1.0f}}, - {1.0f, 1.0f} - }, - { - @"pi/8 rads; origin (1,1); leave through top", - {1.0f, 1.0f}, - M_PI / 8.0f, - {{0.9f, 0.1f}, {1.0f, 1.0f}}, - {1.2414213562373f, 1.1f} - }, - { - @"0 rads; origin (1,1); N of box", - {1.0f, 1.0f}, - 0.0f, - {{0.5f, 0.0f}, {1.0f, 1.0f}}, - {1.5f, 1.0f} - } -}; -static unsigned int n_exit_point_tests = sizeof (exit_point_tests) / sizeof (exit_point_tests[0]); - -void testFindExitPointOfRay() { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - startTestBlock(@"findExitPointOfRay"); - - for (unsigned int i = 0; i < n_exit_point_tests; ++i) { - NSPoint exitPoint = findExitPointOfRay ( - exit_point_tests[i].rayStart, - exit_point_tests[i].angle, - exit_point_tests[i].rect); - assertPointsEqual (exit_point_tests[i].msg, exitPoint, exit_point_tests[i].expected); - } - - endTestBlock(@"findExitPointOfRay"); - [pool drain]; -} - -#ifdef STAND_ALONE -void runTests() { -#else -void testMaths() { -#endif - startTestBlock(@"maths"); - testRectAroundPoints(); - testRectAroundPointsWithPadding(); - testGoodAtan(); - testBezierInterpolate(); - testLineSegmentsIntersect(); - testLineSegmentIntersectsRect(); - testFindExitPointOfRay(); - testLineSegmentIntersectsBezier(); - endTestBlock(@"maths"); -} - -// vim:ft=objc:ts=4:sts=4:sw=4:noet diff --git a/tikzit-1/src/common/test/parser.m b/tikzit-1/src/common/test/parser.m deleted file mode 100644 index 3346acd..0000000 --- a/tikzit-1/src/common/test/parser.m +++ /dev/null @@ -1,86 +0,0 @@ -// -// parser.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// -#import "test/test.h" -#import "TikzGraphAssembler.h" - - -#ifdef STAND_ALONE -void runTests() { -#else -void testParser() { -#endif - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - startTestBlock(@"parser"); - - [TikzGraphAssembler setup]; - - NodeStyle *rn = [NodeStyle defaultNodeStyleWithName:@"rn"]; - NSArray *styles = [NSArray arrayWithObject:rn]; - - NSString *tikz = - @"\\begin{tikzpicture}[dotpic]" - @" \\begin{pgfonlayer}{foo}" //ignored - @" \\node [style=rn] (0) at (-2,3.4) {stuff{$\\alpha$ in here}};" - @" \\node (b) at (1,1) {};" - @" \\end{pgfonlayer}" //ignored - @" \\draw [bend right=20] (0) to node[tick]{-} (b.center);" - @"\\end{tikzpicture}"; - - TikzGraphAssembler *ga = [[TikzGraphAssembler alloc] init]; - TEST(@"Parsing TikZ", [ga parseTikz:tikz]); - - Graph *g = [ga graph]; - TEST(@"Graph is non-nil", g != nil); - TEST(@"Graph has correct number of nodes", [[g nodes] count]==2); - TEST(@"Graph has correct number of edges", [[g edges] count]==1); - - NSEnumerator *en = [[g nodes] objectEnumerator]; - Node *n; - Node *n1, *n2; - while ((n=[en nextObject])) { - [n attachStyleFromTable:styles]; - if ([n style] == rn) n1 = n; - else if ([n style] == nil) n2 = n; - } - - TEST(@"Styles attached correctly", n1!=nil && n2!=nil); - - TEST(@"Nodes labeled correctly", - [[n1 label] isEqualToString:@"stuff{$\\alpha$ in here}"] && - [[n2 label] isEqualToString:@""] - ); - - Edge *e1 = [[[g edges] objectEnumerator] nextObject]; - - TEST(@"Edge has edge node", [e1 edgeNode]!=nil); - TEST(@"Edge node labeled correctly", [[[e1 edgeNode] label] isEqualToString:@"-"]); -// NSString *sty = [[[[[e1 edgeNode] data] atoms] objectEnumerator] nextObject]; -// TEST(@"Edge node styled correctly", sty!=nil && [sty isEqualToString:@"tick"]); - - PUTS(@"Source anchor: %@",[e1 sourceAnchor]); - PUTS(@"Target anchor: %@",[e1 targetAnchor]); - - endTestBlock(@"parser"); - - [pool drain]; -} diff --git a/tikzit-1/src/common/test/test.h b/tikzit-1/src/common/test/test.h deleted file mode 100644 index 59dcdd4..0000000 --- a/tikzit-1/src/common/test/test.h +++ /dev/null @@ -1,57 +0,0 @@ -// -// test.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// -#import - -@interface Allocator : NSObject -{} -@end - -BOOL fuzzyCompare (float f1, float f2); -BOOL fuzzyComparePoints (NSPoint p1, NSPoint p2); - -void setColorEnabled(BOOL b); - -void pass(NSString *msg); -void fail(NSString *msg); -void TEST(NSString *msg, BOOL test); -void assertRectsEqual (NSString *msg, NSRect val, NSRect exp); -void assertPointsEqual (NSString *msg, NSPoint val, NSPoint exp); -void assertFloatsEqual (NSString *msg, float val, float exp); - -void startTests(); -void endTests(); - -void startTestBlock(NSString *name); -void endTestBlock(NSString *name); - -#define PUTS(fmt, ...) { \ - NSString *_str = [[NSString alloc] initWithFormat:fmt, ##__VA_ARGS__]; \ - printf("%s\n", [_str UTF8String]); \ - [_str release]; } - -#define failFmt(fmt, ...) { \ - NSString *_fstr = [[NSString alloc] initWithFormat:fmt, ##__VA_ARGS__]; \ - fail(_fstr); \ - [_fstr release]; } - -// vim:ft=objc:ts=4:sts=4:sw=4:noet diff --git a/tikzit-1/src/common/test/test.m b/tikzit-1/src/common/test/test.m deleted file mode 100644 index 9afcd67..0000000 --- a/tikzit-1/src/common/test/test.m +++ /dev/null @@ -1,175 +0,0 @@ -// -// test.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// -#import "test/test.h" - -static int PASSES; -static int FAILS; - -static int ALLOC_INSTANCES = 0; - -static BOOL colorEnabled = YES; -static int depth = 0; - -static NSString *RED, *GREEN, *BLUE, *OFF; - -static NSString *indents[6] = - {@"", @" ", @" ", @" ", - @" ", @" "}; - -#define INDENT ((depth >= 6) ? indents[5] : indents[depth]) - - -@implementation Allocator - -+ (id)alloc { - ++ALLOC_INSTANCES; - return [super alloc]; -} - -- (void)dealloc { - --ALLOC_INSTANCES; - [super dealloc]; -} - -+ (Allocator*)allocator { - return [[[Allocator alloc] init] autorelease]; -} - -@end - -BOOL fuzzyCompare(float f1, float f2) { - return (ABS(f1 - f2) <= 0.00001f * MAX(1.0f,MIN(ABS(f1), ABS(f2)))); -} - -BOOL fuzzyComparePoints (NSPoint p1, NSPoint p2) { - return fuzzyCompare (p1.x, p2.x) && fuzzyCompare (p1.y, p2.y); -} - -void pass(NSString *msg) { - PUTS(@"%@[%@PASS%@] %@", INDENT, GREEN, OFF, msg); - ++PASSES; -} - -void fail(NSString *msg) { - PUTS(@"%@[%@FAIL%@] %@", INDENT, RED, OFF, msg); - ++FAILS; -} - -void TEST(NSString *msg, BOOL test) { - if (test) { - pass (msg); - } else { - fail (msg); - } -} - -void assertRectsEqual (NSString *msg, NSRect r1, NSRect r2) { - BOOL equal = fuzzyCompare (r1.origin.x, r2.origin.x) && - fuzzyCompare (r1.origin.y, r2.origin.y) && - fuzzyCompare (r1.size.width, r2.size.width) && - fuzzyCompare (r1.size.height, r2.size.height); - if (equal) { - pass (msg); - } else { - failFmt(@"%@ (expected (%f,%f:%fx%f) but got (%f,%f:%fx%f))", - msg, - r2.origin.x, r2.origin.y, r2.size.width, r2.size.height, - r1.origin.x, r1.origin.y, r1.size.width, r1.size.height); - } -} - -void assertPointsEqual (NSString *msg, NSPoint p1, NSPoint p2) { - BOOL equal = fuzzyCompare (p1.x, p2.x) && fuzzyCompare (p1.y, p2.y); - if (equal) { - pass (msg); - } else { - failFmt(@"%@ (expected (%f,%f) but got (%f,%f)", - msg, - p2.x, p2.y, - p1.x, p1.y); - } -} - -void assertFloatsEqual (NSString *msg, float f1, float f2) { - if (fuzzyCompare (f1, f2)) { - pass (msg); - } else { - failFmt(@"%@ (expected %f but got %f", msg, f2, f1); - } -} - -void startTests() { - PASSES = 0; - FAILS = 0; -} - -void endTests() { - PUTS(@"Done testing. %@%d%@ passed, %@%d%@ failed.", - GREEN, PASSES, OFF, - RED, FAILS, OFF); -} - -void startTestBlock(NSString *name) { - PUTS(@"%@Starting %@%@%@ tests.", INDENT, BLUE, name, OFF); - ++depth; -} - -void endTestBlock(NSString *name) { - --depth; - PUTS(@"%@Done with %@%@%@ tests.", INDENT, BLUE, name, OFF); -} - -void setColorEnabled(BOOL b) { - colorEnabled = b; - if (b) { - RED = @"\033[31;1m"; - GREEN = @"\033[32;1m"; - BLUE = @"\033[36;1m"; - OFF = @"\033[0m"; - } else { - RED = @""; - GREEN = @""; - BLUE = @""; - OFF = @""; - } -} - -#ifdef STAND_ALONE -void runTests(); - -int main() { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - setColorEnabled (NO); - startTests(); - - runTests(); - - endTests(); - - [pool drain]; - return 0; -} -#endif - -// vim:ft=objc:ts=4:sts=4:sw=4:noet diff --git a/tikzit-1/src/common/tikzlexer.lm b/tikzit-1/src/common/tikzlexer.lm deleted file mode 100644 index 1e92f73..0000000 --- a/tikzit-1/src/common/tikzlexer.lm +++ /dev/null @@ -1,170 +0,0 @@ -%{ -/* - * Copyright 2010 Chris Heunen - * Copyright 2010-2013 Aleks Kissinger - * Copyright 2013 K. Johan Paulsson - * Copyright 2013 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import -#import "tikzparserdefs.h" -#import "tikzparser.h" - -#define YY_USER_ACTION \ - yylloc->first_line = yylloc->last_line; \ - yylloc->first_column = yylloc->last_column + 1; \ - yylloc->last_column = yylloc->first_column + yyleng - 1; - -%} - -%option reentrant bison-bridge bison-locations 8bit -%option nounput -%option yylineno -%option noyywrap -%option header-file="common/tikzlexer.h" -%option extra-type="TikzGraphAssembler *" - - -%s props -%s xcoord -%s ycoord -%s noderef - -FLOAT \-?[0-9]*(\.[0-9]+)? - -%% - - /* whitespace is ignored, except for position counting; we don't - count formfeed and vtab as whitespace, because it's not obvious - how they should be dealt with and no-one actually uses them */ - - /* lex will take the longest-matching string */ -\r\n|\r|\n { - yylloc->first_line += 1; - yylloc->last_line = yylloc->first_line; - yylloc->first_column = yylloc->last_column = 0; -} -[\t ]+ { } - -\\begin\{tikzpicture\} { return BEGIN_TIKZPICTURE_CMD; } -\\end\{tikzpicture\} { return END_TIKZPICTURE_CMD; } -\\begin\{pgfonlayer\} { return BEGIN_PGFONLAYER_CMD; } -\\end\{pgfonlayer\} { return END_PGFONLAYER_CMD; } -\\draw { return DRAW_CMD; } -\\node { return NODE_CMD; } -\\path { return PATH_CMD; } -rectangle { return RECTANGLE; } -node { return NODE; } -at { return AT; } -to { return TO; } -; { return SEMICOLON; } - -\([ ]*{FLOAT}[ ]*,[ ]*{FLOAT}[ ]*\) { - yylloc->last_column = yylloc->first_column + 1; - yyless(1); - BEGIN(xcoord); -} -{FLOAT} { - yylval->pt.x=(float)strtod(yytext,NULL); - BEGIN(ycoord); -} -, { } -{FLOAT} { - yylval->pt.y=(float)strtod(yytext,NULL); -} -\) { - BEGIN(INITIAL); - return COORD; -} - - /* when we see "[", change parsing mode */ -\[ /*syntaxhlfix]*/ { - BEGIN(props); - return LEFTBRACKET; -} -= { return EQUALS; } -, { return COMMA; } - /* technically, it is possible to have newlines in the middle of - property names or values, but in practice this is unlikely and - screws up our line counting */ -[^=,\{\] \t\n]([^=,\{\]\n]*[^=,\{\] \t\n])? { - yylval->nsstr=[NSString stringWithUTF8String:yytext]; - return PROPSTRING; -} -\] { - BEGIN(INITIAL); - return RIGHTBRACKET; -} - -\( { - BEGIN(noderef); - return LEFTPARENTHESIS; -} -\. { - return FULLSTOP; -} - /* we assume node names (and anchor names) never contain - newlines */ -[^\.\{\)\n]+ { - yylval->nsstr=[NSString stringWithUTF8String:yytext]; - return REFSTRING; -} -\) { - BEGIN(INITIAL); - return RIGHTPARENTHESIS; -} - -\{ { - NSMutableString *buf = [NSMutableString string]; - unsigned int brace_depth = 1; - unsigned int escape = 0; - while (1) { - char c = input(yyscanner); - // eof reached before closing brace - if (c == '\0' || c == EOF) { - return UNCLOSED_DELIM_STR; - } - - yylloc->last_column += 1; - yyleng += 1; - if (escape) { - escape = 0; - } else if (c == '\\') { - escape = 1; - } else if (c == '{') { - brace_depth++; - } else if (c == '}') { - brace_depth--; - if (brace_depth == 0) break; - } else if (c == '\n') { - yylloc->last_line += 1; - yylloc->last_column = 0; - } - [buf appendFormat:@"%c", c]; - } - - yylval->nsstr = buf; - return DELIMITEDSTRING; -} - -\\begin { return UNKNOWN_BEGIN_CMD; } -\\end { return UNKNOWN_END_CMD; } -\\[a-zA-Z0-9]+ { return UNKNOWN_CMD; } -[a-zA-Z0-9]+ { return UNKNOWN_STR; } -. { return UNKNOWN_STR; } - - /* vi:ft=lex:noet:ts=4:sts=4:sw=4: - */ diff --git a/tikzit-1/src/common/tikzparser.ym b/tikzit-1/src/common/tikzparser.ym deleted file mode 100644 index 344e969..0000000 --- a/tikzit-1/src/common/tikzparser.ym +++ /dev/null @@ -1,224 +0,0 @@ -%{ -/* - * Copyright 2010 Chris Heunen - * Copyright 2010-2013 Aleks Kissinger - * Copyright 2013 K. Johan Paulsson - * Copyright 2013 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "tikzparserdefs.h" -%} - -/* we use features added to bison 2.4 */ -%require "2.3" - -%error-verbose -/* enable maintaining locations for better error messages */ -%locations -/* the name of the header file */ -/*%defines "common/tikzparser.h"*/ -/* make it re-entrant (no global variables) */ -%pure-parser -/* We use a pure (re-entrant) lexer. This means yylex - will take a void* (opaque) type to maintain its state */ -%lex-param {void *scanner} -/* Since this parser is also pure, yyparse needs to take - that lexer state as an argument */ -%parse-param {void *scanner} - -/* possible data types for semantic values */ -%union { - NSString *nsstr; - GraphElementProperty *prop; - GraphElementData *data; - Node *node; - NSPoint pt; - struct noderef noderef; -} - -%{ -#import "GraphElementData.h" -#import "GraphElementProperty.h" -#import "Node.h" -#import "Edge.h" - -#import "tikzlexer.h" -#import "TikzGraphAssembler+Parser.h" -/* the assembler (used by this parser) is stored in the lexer - state as "extra" data */ -#define assembler yyget_extra(scanner) - -/* pass errors off to the assembler */ -void yyerror(YYLTYPE *yylloc, void *scanner, const char *str) { - [assembler reportError:str atLocation:yylloc]; -} -%} - -/* yyloc is set up with first_column = last_column = 1 by default; - however, it makes more sense to think of us being "before the - start of the line" before we parse anything */ -%initial-action { - yylloc.first_column = yylloc.last_column = 0; -} - - -%token BEGIN_TIKZPICTURE_CMD "\\begin{tikzpicture}" -%token END_TIKZPICTURE_CMD "\\end{tikzpicture}" -%token BEGIN_PGFONLAYER_CMD "\\begin{pgfonlayer}" -%token END_PGFONLAYER_CMD "\\end{pgfonlayer}" -%token DRAW_CMD "\\draw" -%token NODE_CMD "\\node" -%token PATH_CMD "\\path" -%token RECTANGLE "rectangle" -%token NODE "node" -%token AT "at" -%token TO "to" -%token SEMICOLON ";" -%token COMMA "," - -%token LEFTPARENTHESIS "(" -%token RIGHTPARENTHESIS ")" -%token LEFTBRACKET "[" -%token RIGHTBRACKET "]" -%token FULLSTOP "." -%token EQUALS "=" -%token COORD "co-ordinate" -%token PROPSTRING "key/value string" -%token REFSTRING "string" -%token DELIMITEDSTRING "{-delimited string" - -%token UNKNOWN_BEGIN_CMD "unknown \\begin command" -%token UNKNOWN_END_CMD "unknown \\end command" -%token UNKNOWN_CMD "unknown latex command" -%token UNKNOWN_STR "unknown string" -%token UNCLOSED_DELIM_STR "unclosed {-delimited string" - -%type nodename -%type optanchor -%type val -%type property -%type extraproperties -%type properties -%type optproperties -%type optedgenode -%type noderef -%type optnoderef - -%% - -tikzpicture: "\\begin{tikzpicture}" optproperties tikzcmds "\\end{tikzpicture}" - { - if ($2) { - [[assembler graph] setData:$2]; - } - }; -tikzcmds: tikzcmds tikzcmd | ; -tikzcmd: node | edge | boundingbox | ignore; - -ignore: "\\begin{pgfonlayer}" DELIMITEDSTRING | "\\end{pgfonlayer}"; - -optproperties: - "[" "]" - { $$ = nil; } - | "[" properties "]" - { $$ = $2; } - | { $$ = nil; }; -properties: extraproperties property - { - [$1 addObject:$2]; - $$ = $1; - }; -extraproperties: - extraproperties property "," - { - [$1 addObject:$2]; - $$ = $1; - } - | { $$ = [GraphElementData data]; }; -property: - val "=" val - { $$ = [GraphElementProperty property:$1 withValue:$3]; } - | val - { $$ = [GraphElementProperty atom:$1]; }; -val: PROPSTRING { $$ = $1; } | DELIMITEDSTRING { $$ = $1; }; - -nodename: "(" REFSTRING ")" { $$ = $2; }; -node: "\\node" optproperties nodename "at" COORD DELIMITEDSTRING ";" - { - Node *node = [[Node alloc] init]; - if ($2) - [node setData:$2]; - [node setName:$3]; - [node setPoint:$5]; - [node setLabel:$6]; - [assembler addNodeToMap:node]; - [[assembler graph] addNode:node]; -#if ! __has_feature(objc_arc) - [node release]; -#endif - }; - -optanchor: { $$ = nil; } | "." REFSTRING { $$ = $2; }; -noderef: "(" REFSTRING optanchor ")" - { - $$.node = [assembler nodeWithName:$2]; - $$.anchor = $3; - }; -optnoderef: - noderef { $$ = $1; } - | "(" ")" { $$.node = nil; $$.anchor = nil; } -optedgenode: - { $$ = nil; } - | "node" optproperties DELIMITEDSTRING - { - $$ = [Node node]; - if ($2) - [$$ setData:$2]; - [$$ setLabel:$3]; - } -edge: "\\draw" optproperties noderef "to" optedgenode optnoderef ";" - { - Edge *edge = [[Edge alloc] init]; - if ($2) - [edge setData:$2]; - [edge setSource:$3.node]; - [edge setSourceAnchor:$3.anchor]; - [edge setEdgeNode:$5]; - if ($6.node) { - [edge setTarget:$6.node]; - [edge setTargetAnchor:$6.anchor]; - } else { - [edge setTarget:$3.node]; - [edge setTargetAnchor:$3.anchor]; - } - [edge setAttributesFromData]; - [[assembler graph] addEdge:edge]; -#if ! __has_feature(objc_arc) - [edge release]; -#endif - }; - -ignoreprop: val | val "=" val; -ignoreprops: ignoreprop ignoreprops | ; -optignoreprops: "[" ignoreprops "]"; -boundingbox: - "\\path" optignoreprops COORD "rectangle" COORD ";" - { - [[assembler graph] setBoundingBox:NSRectAroundPoints($3, $5)]; - }; - -/* vi:ft=yacc:noet:ts=4:sts=4:sw=4 -*/ diff --git a/tikzit-1/src/common/tikzparserdefs.h b/tikzit-1/src/common/tikzparserdefs.h deleted file mode 100644 index cde3345..0000000 --- a/tikzit-1/src/common/tikzparserdefs.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright 2013 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/* - * This file sets up some defs (particularly struct noderef) needed for - * the tikz parser and its users. - * - * It is needed because we wish to support bison 2.3, which is the - * version shipped with OSX. bison 2.4 onwards allows us to put this - * stuff in a "%code requires" block, where it will be put in the - * generated header file by bison. - * - * All the types used by the %union directive in tikzparser.ym should - * be declared, defined or imported here. - */ - -// Foundation has NSPoint and NSString -#import - -@class TikzGraphAssembler; -@class GraphElementData; -@class GraphElementProperty; -@class Node; - -struct noderef { -#if __has_feature(objc_arc) - __unsafe_unretained Node *node; - __unsafe_unretained NSString *anchor; -#else - Node *node; - NSString *anchor; -#endif -}; - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/common/util.h b/tikzit-1/src/common/util.h deleted file mode 100644 index b34f25d..0000000 --- a/tikzit-1/src/common/util.h +++ /dev/null @@ -1,201 +0,0 @@ -// -// util.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// - -#import - -#include - -#ifndef M_PI -#define M_PI 3.141592654 -#endif - -#ifndef MAX -#define MAX(a,b) (((a) > (b)) ? (a) : (b)) -#endif - -#ifndef MIN -#define MIN(a,b) (((a) < (b)) ? (a) : (b)) -#endif - -/*! - @brief Compute a bounding rectangle for two given points. - @param p1 a point. - @param p2 another point. - @result A bounding rectangle for p1 and p2. - */ -NSRect NSRectAroundPoints(NSPoint p1, NSPoint p2); - -/*! - @brief Compute a bounding rectangle for two given points. - @param rect the base rectangle - @param the point to ensure is included - @result A rectangle containing rect and p - */ -NSRect NSRectWithPoint(NSRect rect, NSPoint p); - -/*! - @brief Compute a bounding rectangle for two given points with a given padding. - @param p1 a point. - @param p2 another point. - @param padding a padding. - @result A bounding rectangle for p1 and p2 with padding. - */ -NSRect NSRectAroundPointsWithPadding(NSPoint p1, NSPoint p2, float padding); - -/*! - @brief Compute a bounding rectangle for four given points. - @result A bounding rectangle for p1, p2, p3 and p4. - */ -NSRect NSRectAround4Points(NSPoint p1, NSPoint p2, NSPoint p3, NSPoint p4); - -/*! - @brief Compute a bounding rectangle for four given points. - @param padding the amount to pad the rectangle - @result A bounding rectangle for p1, p2, p3 and p4 with padding - */ -NSRect NSRectAround4PointsWithPadding(NSPoint p1, NSPoint p2, NSPoint p3, NSPoint p4, float padding); - -/*! - @brief Find the distance between two points - @param p1 The first point - @param p2 The second point - @result The distance between p1 and p2 - */ -float NSDistanceBetweenPoints(NSPoint p1, NSPoint p2); - -/*! - @brief Compute the 'real' arctan for two points. Always succeeds and gives a good angle, - regardless of sign, zeroes, etc. - @param dx the x distance between points. - @param dy the y distance between points. - @result An angle in radians. - */ -float good_atan(float dx, float dy); - -/*! - @brief Interpolate along a bezier curve to the given distance. To find the x coord, - use the relavant x coordinates for c0-c3, and for y use the y's. - @param dist a distance from 0 to 1 spanning the whole curve. - @param c0 the x (resp. y) coordinate of the start point. - @param c1 the x (resp. y) coordinate of the first control point. - @param c2 the x (resp. y) coordinate of the second control point. - @param c3 the x (resp. y) coordinate of the end point. - @result The x (resp. y) coordinate of the point at 'dist'. - */ -float bezierInterpolate (float dist, float c0, float c1, float c2, float c3); - -/*! - @brief Interpolate along a bezier curve to the given distance. - @param dist a distance from 0 to 1 spanning the whole curve. - @param c0 the x start point. - @param c1 the x first control point. - @param c2 the x second control point. - @param c3 the x end point. - @result The point at 'dist'. - */ -NSPoint bezierInterpolateFull (float dist, NSPoint c0, NSPoint c1, NSPoint c2, NSPoint c3); - -/*! - * @brief Find whether two line segments intersect - * @param l1start The starting point of line segment 1 - * @param l1end The ending point of line segment 1 - * @param l2start The starting point of line segment 2 - * @param l2end The ending point of line segment 2 - * @param result A location to store the intersection point - * @result YES if they intersect, NO if they do not - */ -BOOL lineSegmentsIntersect (NSPoint l1start, NSPoint l1end, NSPoint l2start, NSPoint l2end, NSPoint *result); - -/*! - * @brief Find whether a line segment intersects a bezier curve - * @detail Always finds the intersection furthest along the line segment - * @param lstart The starting point of the line segment - * @param lend The ending point of the line segment - * @param c0 The starting point of the bezier curve - * @param c1 The first control point of the bezier curve - * @param c2 The second control point of the bezier curve - * @param c3 The ending point of the bezier curve - * @param result A location to store the intersection point - * @result YES if they intersect, NO if they do not - */ -BOOL lineSegmentIntersectsBezier (NSPoint lstart, NSPoint lend, NSPoint c0, NSPoint c1, NSPoint c2, NSPoint c3, NSPoint *result); - -/*! - * @brief Find whether a line segment enters a rectangle - * @param lineStart The starting point of the line segment - * @param lineEnd The ending point of the line segment - * @param rect The rectangle - * @result YES if they intersect, NO if they do not - */ -BOOL lineSegmentIntersectsRect (NSPoint lineStart, NSPoint lineEnd, NSRect rect); - -/*! - * @brief Find where a ray exits a rectangle - * @param rayStart The starting point of the ray; must be contained in rect - * @param angle_rads The angle of the ray, in radians - * @param rect The rectangle - * @result The point at which the ray leaves the rect - */ -NSPoint findExitPointOfRay (NSPoint rayStart, float angle_rads, NSRect rect); - -/*! - @brief Round val to nearest stepSize - @param stepSize the courseness - @param val a value to round - */ -float roundToNearest(float stepSize, float val); - -/*! - @brief Convert radians into degrees - */ -float radiansToDegrees(float radians); - -/*! - @brief Convert degrees into radians - */ -float degreesToRadians(float degrees); - -/*! - @brief Normalises an angle (in degrees) to fall between -179 and 180 - */ -int normaliseAngleDeg (int degrees); - -/*! - @brief Normalises an angle (in radians) to fall in the range (-pi,pi] - */ -float normaliseAngleRad (float rads); - -/*! - @brief Express a byte as alpha-only hex, with digits (0..16) -> (a..jA..F) - @param sh A number 0-255 - @result A string 'aa'-'FF' - */ -NSString *alphaHex(unsigned short sh); - -const char *find_start_of_nth_line (const char * string, int line); - -/*! - @brief Formats a CGFloat as a string, removing trailing zeros - @detail Unlike formatting an NSNumber, or using %g, it will never - produce scientific notation (like "2.00e2"). Unlike %f, - it will not include unnecessary trailing zeros. - */ -NSString *formatFloat(CGFloat f, int maxdps); - diff --git a/tikzit-1/src/common/util.m b/tikzit-1/src/common/util.m deleted file mode 100644 index e9b8899..0000000 --- a/tikzit-1/src/common/util.m +++ /dev/null @@ -1,403 +0,0 @@ -// -// util.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// - -#import "util.h" -#import "math.h" - -static BOOL fuzzyCompare(float f1, float f2) { - return (ABS(f1 - f2) <= 0.00001f * MIN(ABS(f1), ABS(f2))); -} - -NSRect NSRectWithPoint(NSRect rect, NSPoint p) { - CGFloat minX = NSMinX(rect); - CGFloat maxX = NSMaxX(rect); - CGFloat minY = NSMinY(rect); - CGFloat maxY = NSMaxY(rect); - if (p.x < minX) { - minX = p.x; - } else if (p.x > maxX) { - maxX = p.x; - } - if (p.y < minY) { - minY = p.y; - } else if (p.y > maxY) { - maxY = p.y; - } - return NSMakeRect(minX, minY, maxX - minX, maxY - minY); -} - -NSRect NSRectAroundPointsWithPadding(NSPoint p1, NSPoint p2, float padding) { - return NSMakeRect(MIN(p1.x,p2.x)-padding, - MIN(p1.y,p2.y)-padding, - ABS(p2.x-p1.x)+(2.0f*padding), - ABS(p2.y-p1.y)+(2.0f*padding)); -} - -NSRect NSRectAroundPoints(NSPoint p1, NSPoint p2) { - return NSRectAroundPointsWithPadding(p1, p2, 0.0f); -} - -NSRect NSRectAround4PointsWithPadding(NSPoint p1, NSPoint p2, NSPoint p3, NSPoint p4, float padding) { - float leftMost = MIN(p1.x, p2.x); - leftMost = MIN(leftMost, p3.x); - leftMost = MIN(leftMost, p4.x); - float rightMost = MAX(p1.x, p2.x); - rightMost = MAX(rightMost, p3.x); - rightMost = MAX(rightMost, p4.x); - float topMost = MIN(p1.y, p2.y); - topMost = MIN(topMost, p3.y); - topMost = MIN(topMost, p4.y); - float bottomMost = MAX(p1.y, p2.y); - bottomMost = MAX(bottomMost, p3.y); - bottomMost = MAX(bottomMost, p4.y); - return NSMakeRect(leftMost-padding, - topMost-padding, - (rightMost - leftMost)+(2.0f*padding), - (bottomMost - topMost)+(2.0f*padding)); -} - -NSRect NSRectAround4Points(NSPoint p1, NSPoint p2, NSPoint p3, NSPoint p4) { - return NSRectAround4PointsWithPadding(p1, p2, p3, p4, 0.0f); -} - -float NSDistanceBetweenPoints(NSPoint p1, NSPoint p2) { - float dx = p2.x - p1.x; - float dy = p2.y - p1.y; - return sqrt(dx * dx + dy * dy); -} - -float good_atan(float dx, float dy) { - if (dx > 0) { - return atan(dy/dx); - } else if (dx < 0) { - return M_PI + atan(dy/dx); - } else { - if (dy > 0) return 0.5 * M_PI; - else if (dy < 0) return 1.5 * M_PI; - else return 0; - } -} - -// interpolate on a cubic bezier curve -float bezierInterpolate(float dist, float c0, float c1, float c2, float c3) { - float distp = 1 - dist; - return (distp*distp*distp) * c0 + - 3 * (distp*distp) * dist * c1 + - 3 * (dist*dist) * distp * c2 + - (dist*dist*dist) * c3; -} - -NSPoint bezierInterpolateFull (float dist, NSPoint c0, NSPoint c1, NSPoint c2, NSPoint c3) { - return NSMakePoint (bezierInterpolate (dist, c0.x, c1.x, c2.x, c3.x), - bezierInterpolate (dist, c0.y, c1.y, c2.y, c3.y)); -} - -static void lineCoeffsFromPoints(NSPoint p1, NSPoint p2, float *A, float *B, float *C) { - *A = p2.y - p1.y; - *B = p1.x - p2.x; - *C = (*A) * p1.x + (*B) * p1.y; -} - -static void lineCoeffsFromPointAndAngle(NSPoint p, float angle, float *A, float *B, float *C) { - *A = sin (angle); - *B = -cos (angle); - *C = (*A) * p.x + (*B) * p.y; -} - -static BOOL lineSegmentContainsPoint(NSPoint l1, NSPoint l2, float x, float y) { - float minX = MIN(l1.x, l2.x); - float maxX = MAX(l1.x, l2.x); - float minY = MIN(l1.y, l2.y); - float maxY = MAX(l1.y, l2.y); - return (x >= minX || fuzzyCompare (x, minX)) && - (x <= maxX || fuzzyCompare (x, maxX)) && - (y >= minY || fuzzyCompare (y, minY)) && - (y <= maxY || fuzzyCompare (y, maxY)); -} - -BOOL lineSegmentsIntersect(NSPoint l1start, NSPoint l1end, NSPoint l2start, NSPoint l2end, NSPoint *result) { - // Ax + By = C - float A1, B1, C1; - lineCoeffsFromPoints(l1start, l1end, &A1, &B1, &C1); - float A2, B2, C2; - lineCoeffsFromPoints(l2start, l2end, &A2, &B2, &C2); - - float det = A1*B2 - A2*B1; - if (det == 0.0f) { - // parallel - return NO; - } else { - float x = (B2*C1 - B1*C2)/det; - float y = (A1*C2 - A2*C1)/det; - - if (lineSegmentContainsPoint(l1start, l1end, x, y) && - lineSegmentContainsPoint(l2start, l2end, x, y)) { - if (result) { - (*result).x = x; - (*result).y = y; - } - return YES; - } - } - return NO; -} - -BOOL lineSegmentIntersectsBezier (NSPoint lstart, NSPoint lend, NSPoint c0, NSPoint c1, NSPoint c2, NSPoint c3, NSPoint *result) { - NSRect curveBounds = NSRectAround4Points(c0, c1, c2, c3); - if (!lineSegmentIntersectsRect(lstart, lend, curveBounds)) - return NO; - - const int divisions = 20; - const float chunkSize = 1.0f/(float)divisions; - float chunkStart = 0.0f; - BOOL found = NO; - - for (int i = 0; i < divisions; ++i) { - float chunkEnd = chunkStart + chunkSize; - - NSPoint p1 = bezierInterpolateFull (chunkStart, c0, c1, c2, c3); - NSPoint p2 = bezierInterpolateFull (chunkEnd, c0, c1, c2, c3); - - NSPoint p; - if (lineSegmentsIntersect (lstart, lend, p1, p2, &p)) { - lstart = p; - found = YES; - } - - chunkStart = chunkEnd; - } - if (found && result) { - *result = lstart; - } - return found; -} - -BOOL lineSegmentIntersectsRect(NSPoint lineStart, NSPoint lineEnd, NSRect rect) { - const float rectMaxX = NSMaxX(rect); - const float rectMinX = NSMinX(rect); - const float rectMaxY = NSMaxY(rect); - const float rectMinY = NSMinY(rect); - - // check if the segment is entirely to one side of the rect - if (lineStart.x > rectMaxX && lineEnd.x > rectMaxX) { - return NO; - } - if (lineStart.x < rectMinX && lineEnd.x < rectMinX) { - return NO; - } - if (lineStart.y > rectMaxY && lineEnd.y > rectMaxY) { - return NO; - } - if (lineStart.y < rectMinY && lineEnd.y < rectMinY) { - return NO; - } - - // Now check whether the (infinite) line intersects the rect - // (if it does, so does the segment, due to above checks) - - // Ax + By = C - float A, B, C; - lineCoeffsFromPoints(lineStart, lineEnd, &A, &B, &C); - - const float tlVal = A * rectMinX + B * rectMaxY - C; - const float trVal = A * rectMaxX + B * rectMaxY - C; - const float blVal = A * rectMinX + B * rectMinY - C; - const float brVal = A * rectMaxX + B * rectMinY - C; - - if (tlVal < 0 && trVal < 0 && blVal < 0 && brVal < 0) { - // rect below line - return NO; - } - if (tlVal > 0 && trVal > 0 && blVal > 0 && brVal > 0) { - // rect above line - return NO; - } - - return YES; -} - -NSPoint findExitPointOfRay (NSPoint p, float angle_rads, NSRect rect) { - const float rectMinX = NSMinX (rect); - const float rectMaxX = NSMaxX (rect); - const float rectMinY = NSMinY (rect); - const float rectMaxY = NSMaxY (rect); - - const float angle = normaliseAngleRad (angle_rads); - - // special case the edges - if (p.y == rectMaxY && angle > 0 && angle < M_PI) { - // along the top of the box - return p; - } - if (p.y == rectMinY && angle < 0 && angle > -M_PI) { - // along the bottom of the box - return p; - } - if (p.x == rectMaxX && angle > -M_PI/2.0f && angle < M_PI/2.0f) { - // along the right of the box - return p; - } - if (p.x == rectMinX && (angle > M_PI/2.0f || angle < -M_PI/2.0f)) { - // along the left of the box - return p; - } - - float A1, B1, C1; - lineCoeffsFromPointAndAngle(p, angle, &A1, &B1, &C1); - //NSLog(@"Ray is %fx + %fy = %f", A1, B1, C1); - - const float tlAngle = normaliseAngleRad (good_atan (rectMinX - p.x, rectMaxY - p.y)); - const float trAngle = normaliseAngleRad (good_atan (rectMaxX - p.x, rectMaxY - p.y)); - if (angle <= tlAngle && angle >= trAngle) { - // exit top - float A2, B2, C2; - lineCoeffsFromPoints(NSMakePoint (rectMinX, rectMaxY), - NSMakePoint (rectMaxX, rectMaxY), - &A2, &B2, &C2); - float det = A1*B2 - A2*B1; - NSCAssert(det != 0.0f, @"Parallel lines?"); - NSPoint intersect = NSMakePoint ((B2*C1 - B1*C2)/det, - (A1*C2 - A2*C1)/det); - return intersect; - } - - const float brAngle = normaliseAngleRad (good_atan (rectMaxX - p.x, rectMinY - p.y)); - if (angle <= trAngle && angle >= brAngle) { - // exit right - float A2, B2, C2; - lineCoeffsFromPoints(NSMakePoint (rectMaxX, rectMaxY), - NSMakePoint (rectMaxX, rectMinY), - &A2, &B2, &C2); - //NSLog(@"Edge is %fx + %fy = %f", A2, B2, C2); - float det = A1*B2 - A2*B1; - NSCAssert(det != 0.0f, @"Parallel lines?"); - NSPoint intersect = NSMakePoint ((B2*C1 - B1*C2)/det, - (A1*C2 - A2*C1)/det); - return intersect; - } - - const float blAngle = normaliseAngleRad (good_atan (rectMinX - p.x, rectMinY - p.y)); - if (angle <= brAngle && angle >= blAngle) { - // exit bottom - float A2, B2, C2; - lineCoeffsFromPoints(NSMakePoint (rectMaxX, rectMinY), - NSMakePoint (rectMinX, rectMinY), - &A2, &B2, &C2); - float det = A1*B2 - A2*B1; - NSCAssert(det != 0.0f, @"Parallel lines?"); - NSPoint intersect = NSMakePoint ((B2*C1 - B1*C2)/det, - (A1*C2 - A2*C1)/det); - return intersect; - } else { - // exit left - float A2, B2, C2; - lineCoeffsFromPoints(NSMakePoint (rectMinX, rectMaxY), - NSMakePoint (rectMinX, rectMinY), - &A2, &B2, &C2); - float det = A1*B2 - A2*B1; - NSCAssert(det != 0.0f, @"Parallel lines?"); - NSPoint intersect = NSMakePoint ((B2*C1 - B1*C2)/det, - (A1*C2 - A2*C1)/det); - return intersect; - } -} - -float roundToNearest(float stepSize, float val) { - if (stepSize==0.0f) return val; - else return round(val/stepSize)*stepSize; -} - -float radiansToDegrees (float radians) { - return (radians * 180.0f) / M_PI; -} - -float degreesToRadians(float degrees) { - return (degrees * M_PI) / 180.0f; -} - -int normaliseAngleDeg (int degrees) { - while (degrees > 180) { - degrees -= 360; - } - while (degrees <= -180) { - degrees += 360; - } - return degrees; -} - -float normaliseAngleRad (float rads) { - while (rads > M_PI) { - rads -= 2 * M_PI; - } - while (rads <= -M_PI) { - rads += 2 * M_PI; - } - return rads; -} - -static char ahex[] = -{'a','b','c','d','e','f','g','h','i','j', - 'A','B','C','D','E','F'}; - -NSString *alphaHex(unsigned short sh) { - if (sh > 255) return @"!!"; - return [NSString stringWithFormat:@"%c%c", ahex[sh/16], ahex[sh%16]]; -} - -const char *find_start_of_nth_line (const char * string, int line) { - int l = 0; - const char *lineStart = string; - while (*lineStart && l < line) { - while (*lineStart && *lineStart != '\n') { - ++lineStart; - } - if (*lineStart) { - ++l; - ++lineStart; - } - } - return lineStart; -} - -NSString *formatFloat(CGFloat f, int maxdps) { - NSMutableString *result = [NSMutableString - stringWithFormat:@"%.*f", maxdps, f]; - // delete trailing zeros - NSUInteger lastPos = [result length] - 1; - NSUInteger firstDigit = ([result characterAtIndex:0] == '-') ? 1 : 0; - while (lastPos > firstDigit) { - if ([result characterAtIndex:lastPos] == '0') { - [result deleteCharactersInRange:NSMakeRange(lastPos, 1)]; - lastPos -= 1; - } else { - break; - } - } - if ([result characterAtIndex:lastPos] == '.') { - [result deleteCharactersInRange:NSMakeRange(lastPos, 1)]; - lastPos -= 1; - } - if ([@"-0" isEqualToString:result]) - return @"0"; - else - return result; -} - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/Application.h b/tikzit-1/src/gtk/Application.h deleted file mode 100644 index 1b48a79..0000000 --- a/tikzit-1/src/gtk/Application.h +++ /dev/null @@ -1,155 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "InputDelegate.h" - -@class Application; -@class Configuration; -@class ContextWindow; -@class Preambles; -@class PreambleEditor; -@class PreviewWindow; -@class SettingsDialog; -@class StyleManager; -@class TikzDocument; -@class ToolBox; -@class Window; -@protocol Tool; - -extern Application* app; - -/** - * Manages the main application window - */ -@interface Application: NSObject { - // the main application configuration - Configuration *configFile; - // maintains the known (user-defined) styles - StyleManager *styleManager; - // maintains the preambles used for previews - Preambles *preambles; - // the last-accessed folders (for open and save dialogs) - NSString *lastOpenFolder; - NSString *lastSaveAsFolder; - - ToolBox *toolBox; - PreambleEditor *preambleWindow; - ContextWindow *contextWindow; - SettingsDialog *settingsDialog; - - // the open windows (array of Window*) - NSMutableArray *openWindows; - - // tools - id activeTool; - NSArray *tools; -} - -/** - * The main application configuration file - */ -@property (readonly) Configuration *mainConfiguration; - -/** - * The app-wide style manager instance - */ -@property (readonly) StyleManager *styleManager; - -/** - * The app-wide preambles registry - */ -@property (readonly) Preambles *preambles; - -/** - * The tools - */ -@property (readonly) NSArray *tools; - -/** - * The currently-selected tool - */ -@property (assign) id activeTool; - -/** - * The folder last actively chosen by a user for opening a file - */ -@property (copy) NSString *lastOpenFolder; - -/** - * The folder last actively chosen by a user for saving a file - */ -@property (copy) NSString *lastSaveAsFolder; - -/** - * The application instance. - */ -+ (Application*) app; - -/** - * Starts the application with a single window containing an empty file - */ -- (id) init; -/** - * Starts the application with the given files open - */ -- (id) initWithFiles:(NSArray*)files; - -/** - * Loads a new, empty document in a new window - */ -- (void) newWindow; -/** - * Loads an existing document from a file in a new window - * - * @param doc the document the new window should show - */ -- (void) newWindowWithDocument:(TikzDocument*)doc; -/** - * Quit the application, confirming with the user if there are - * changes to any open documents. - */ -- (void) quit; - -/** - * Show the dialog for editing preambles. - */ -- (void) presentPreamblesEditor; -/** - * Show the context-aware window - */ -- (void) presentContextWindow; -/** - * Show the settings dialog. - */ -- (void) presentSettingsDialog; - -/** - * Save the application configuration to permanent storage - * - * Should be called just before the application exits - */ -- (void) saveConfiguration; - -/** - * @result YES if key event was processed, NO otherwise - */ -- (BOOL) activateToolForKey:(unsigned int)keyVal withMask:(InputMask)mask; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/Application.m b/tikzit-1/src/gtk/Application.m deleted file mode 100644 index e9935bd..0000000 --- a/tikzit-1/src/gtk/Application.m +++ /dev/null @@ -1,377 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "Application.h" - -#import "Configuration.h" -#import "EdgeStylesModel.h" -#import "NodeStylesModel.h" -#import "PreambleEditor.h" -#import "ContextWindow.h" -#import "Shape.h" -#import "SettingsDialog.h" -#import "StyleManager.h" -#import "StyleManager+Storage.h" -#import "SupportDir.h" -#import "TikzDocument.h" -#import "ToolBox.h" -#import "Window.h" - -#ifdef HAVE_POPPLER -#import "Preambles.h" -#import "Preambles+Storage.h" -#endif - -#import "BoundingBoxTool.h" -#import "CreateNodeTool.h" -#import "CreateEdgeTool.h" -#import "HandTool.h" -#import "SelectTool.h" - -// used for args to g_mkdir_with_parents -#import "stat.h" - -Application* app = nil; - -@interface Application (Notifications) -- (void) windowClosed:(NSNotification*)notification; -- (void) windowGainedFocus:(NSNotification*)notification; -- (void) selectedToolChanged:(NSNotification*)notification; -- (void) windowDocumentChanged:(NSNotification*)n; -@end - -@interface Application (Private) -- (void) setActiveWindow:(Window*)window; -@end - -@implementation Application - -@synthesize mainConfiguration=configFile; -@synthesize styleManager, preambles; -@synthesize lastOpenFolder, lastSaveAsFolder; -@synthesize tools; - -+ (Application*) app { - if (app == nil) { - [[[self alloc] init] release]; - } - return app; -} - -- (id) _initCommon { - if (app != nil) { - [self release]; - self = app; - return self; - } - self = [super init]; - - if (self) { - NSError *error = nil; - configFile = [[Configuration alloc] initWithName:@"tikzit" loadError:&error]; - if (error != nil) { - logError (error, @"WARNING: Failed to load configuration"); - } - - styleManager = [[StyleManager alloc] init]; - [styleManager loadStylesUsingConfigurationName:@"styles"]; // FIXME: error message? - NodeStylesModel *nsm = [NodeStylesModel modelWithStyleManager:styleManager]; - EdgeStylesModel *esm = [EdgeStylesModel modelWithStyleManager:styleManager]; - -#ifdef HAVE_POPPLER - NSString *preamblesDir = [[SupportDir userSupportDir] stringByAppendingPathComponent:@"preambles"]; - preambles = [[Preambles alloc] initFromDirectory:preamblesDir]; // FIXME: error message? - [preambles setStyleManager:styleManager]; - NSString *selectedPreamble = [configFile stringEntry:@"selectedPreamble" inGroup:@"Preambles"]; - if (selectedPreamble != nil) { - [preambles setSelectedPreambleName:selectedPreamble]; - } -#endif - - lastOpenFolder = [[configFile stringEntry:@"lastOpenFolder" inGroup:@"Paths"] retain]; - if (lastOpenFolder == nil) - lastOpenFolder = [[configFile stringEntry:@"lastFolder" inGroup:@"Paths"] retain]; - lastSaveAsFolder = [[configFile stringEntry:@"lastSaveAsFolder" inGroup:@"Paths"] retain]; - if (lastSaveAsFolder == nil) - lastSaveAsFolder = [[configFile stringEntry:@"lastFolder" inGroup:@"Paths"] retain]; - - openWindows = [[NSMutableArray alloc] init]; - - tools = [[NSArray alloc] initWithObjects: - [SelectTool tool], - [CreateNodeTool toolWithNodeStylesModel:nsm], - [CreateEdgeTool toolWithEdgeStylesModel:esm], - [BoundingBoxTool tool], - [HandTool tool], - nil]; - activeTool = [tools objectAtIndex:0]; - for (id tool in tools) { - [tool loadConfiguration:configFile]; - } - - toolBox = [[ToolBox alloc] initWithTools:tools]; - [toolBox loadConfiguration:configFile]; - [toolBox setSelectedTool:activeTool]; - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(selectedToolChanged:) - name:@"ToolSelectionChanged" - object:toolBox]; - [toolBox show]; - - contextWindow = [[ContextWindow alloc] initWithNodeStylesModel:nsm - andEdgeStylesModel:esm]; - [contextWindow loadConfiguration:configFile]; - - app = [self retain]; - } - - return self; -} - -- (id) init { - self = [self _initCommon]; - - if (self) { - [self newWindow]; - } - - return self; -} - -- (id) initWithFiles:(NSArray*)files { - self = [self _initCommon]; - - if (self) { - int fileOpenCount = 0; - for (NSString *file in files) { - NSError *error = nil; - TikzDocument *doc = [TikzDocument documentFromFile:file styleManager:styleManager error:&error]; - if (doc != nil) { - [self newWindowWithDocument:doc]; - ++fileOpenCount; - } else { - logError(error, @"WARNING: failed to open file"); - } - } - if (fileOpenCount == 0) { - [self newWindow]; - } - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - [configFile release]; - [styleManager release]; - [preambles release]; - [lastOpenFolder release]; - [lastSaveAsFolder release]; - [preambleWindow release]; - [settingsDialog release]; - [openWindows release]; - [tools release]; - [activeTool release]; - [toolBox release]; - [contextWindow release]; - - [super dealloc]; -} - -- (id) activeTool { return activeTool; } -- (void) setActiveTool:(id)tool { - if (activeTool == tool) - return; - - activeTool = tool; - [toolBox setSelectedTool:tool]; - for (Window* window in openWindows) { - [window setActiveTool:tool]; - } -} - -- (BOOL) activateToolForKey:(unsigned int)keyVal withMask:(InputMask)mask { - // FIXME: cache the accel info, rather than reparsing it every time? - for (id tool in tools) { - guint toolKey = 0; - GdkModifierType toolMod = 0; - gtk_accelerator_parse ([[tool shortcut] UTF8String], &toolKey, &toolMod); - if (toolKey != 0 && toolKey == keyVal && (int)mask == (int)toolMod) { - [self setActiveTool:tool]; - return YES; - } - } - return NO; -} - -- (void) _addWindow:(Window*)window { - [window setActiveTool:activeTool]; - [openWindows addObject:window]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(windowClosed:) - name:@"WindowClosed" - object:window]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(windowGainedFocus:) - name:@"WindowGainedFocus" - object:window]; - if ([window hasFocus]) { - [self setActiveWindow:window]; - } -} - -- (void) newWindow { - [self _addWindow:[Window window]]; -} - -- (void) newWindowWithDocument:(TikzDocument*)doc { - [self _addWindow:[Window windowWithDocument:doc]]; -} - -- (void) quit { - NSMutableArray *unsavedDocs = [NSMutableArray arrayWithCapacity:[openWindows count]]; - for (Window *window in openWindows) { - TikzDocument *doc = [window document]; - if ([doc hasUnsavedChanges]) { - [unsavedDocs addObject:doc]; - } - } - if ([unsavedDocs count] > 0) { - // FIXME: show a dialog - return; - } - gtk_main_quit(); -} - -- (void) presentPreamblesEditor { -#ifdef HAVE_POPPLER - if (preambleWindow == nil) { - preambleWindow = [[PreambleEditor alloc] initWithPreambles:preambles]; - //[preambleWindow setParentWindow:mainWindow]; - } - [preambleWindow present]; -#endif -} - -- (void) presentContextWindow { - [contextWindow present]; -} - -- (void) presentSettingsDialog { - if (settingsDialog == nil) { - settingsDialog = [[SettingsDialog alloc] initWithConfiguration:configFile - andStyleManager:styleManager]; - //[settingsDialog setParentWindow:mainWindow]; - } - [settingsDialog present]; -} - -- (Configuration*) mainConfiguration { - return configFile; -} - -- (void) saveConfiguration { - NSError *error = nil; - -#ifdef HAVE_POPPLER - if (preambles != nil) { - NSString *preamblesDir = [[SupportDir userSupportDir] stringByAppendingPathComponent:@"preambles"]; - // NSFileManager is slightly dodgy on Windows - g_mkdir_with_parents ([preamblesDir UTF8String], S_IRUSR | S_IWUSR | S_IXUSR); - [preambles storeToDirectory:preamblesDir]; - [configFile setStringEntry:@"selectedPreamble" inGroup:@"Preambles" value:[preambles selectedPreambleName]]; - } -#endif - - [styleManager saveStylesUsingConfigurationName:@"styles"]; - - for (id tool in tools) { - [tool saveConfiguration:configFile]; - } - [toolBox saveConfiguration:configFile]; - - [contextWindow saveConfiguration:configFile]; - - if (lastOpenFolder != nil) { - [configFile setStringEntry:@"lastOpenFolder" inGroup:@"Paths" value:lastOpenFolder]; - } - if (lastSaveAsFolder != nil) { - [configFile setStringEntry:@"lastSaveAsFolder" inGroup:@"Paths" value:lastSaveAsFolder]; - } - - if (![configFile writeToStoreWithError:&error]) { - logError (error, @"Could not write config file"); - } -} - -@end - -@implementation Application (Notifications) -- (void) windowClosed:(NSNotification*)notification { - Window *window = [notification object]; - [openWindows removeObjectIdenticalTo:window]; - [[NSNotificationCenter defaultCenter] removeObserver:self - name:nil - object:window]; - if ([openWindows count] == 0) { - gtk_main_quit(); - } else { - [self setActiveWindow:[openWindows objectAtIndex:0]]; - } -} - -- (void) windowGainedFocus:(NSNotification*)notification { - Window *window = [notification object]; - [self setActiveWindow:window]; -} - -- (void) selectedToolChanged:(NSNotification*)n { - id tool = [[n userInfo] objectForKey:@"tool"]; - if (tool != nil) - [self setActiveTool:tool]; - else - NSLog(@"nil tool!"); -} - -- (void) windowDocumentChanged:(NSNotification*)n { - [contextWindow setDocument:[[n userInfo] objectForKey:@"document"]]; -} -@end - -@implementation Application (Private) -- (void) setActiveWindow:(Window*)window { - [[NSNotificationCenter defaultCenter] removeObserver:self - name:@"DocumentChanged" - object:nil]; - - [contextWindow setDocument:[window document]]; - - [contextWindow attachToWindow:window]; - [toolBox attachToWindow:window]; - - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(windowDocumentChanged:) - name:@"DocumentChanged" - object:window]; -} -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/BoundingBoxTool.h b/tikzit-1/src/gtk/BoundingBoxTool.h deleted file mode 100644 index f6498b0..0000000 --- a/tikzit-1/src/gtk/BoundingBoxTool.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "Tool.h" - -typedef enum { - NoHandle, - EastHandle, - SouthEastHandle, - SouthHandle, - SouthWestHandle, - WestHandle, - NorthWestHandle, - NorthHandle, - NorthEastHandle -} ResizeHandle; - -@interface BoundingBoxTool : NSObject { - GraphRenderer *renderer; - NSPoint dragOrigin; - ResizeHandle currentResizeHandle; - BOOL drawingNewBox; -} - -+ (id) tool; -- (id) init; -@end - - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/BoundingBoxTool.m b/tikzit-1/src/gtk/BoundingBoxTool.m deleted file mode 100644 index 483705e..0000000 --- a/tikzit-1/src/gtk/BoundingBoxTool.m +++ /dev/null @@ -1,353 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "BoundingBoxTool.h" - -#import "GraphRenderer.h" -#import "TikzDocument.h" -#import "tzstockitems.h" - -static const float handle_size = 8.0; -float sideHandleTop(NSRect bbox) { - return (NSMinY(bbox) + NSMaxY(bbox) - handle_size)/2.0f; -} -float tbHandleLeft(NSRect bbox) { - return (NSMinX(bbox) + NSMaxX(bbox) - handle_size)/2.0f; -} - -@interface BoundingBoxTool (Private) -- (NSRect) screenBoundingBox; -- (ResizeHandle) boundingBoxResizeHandleAt:(NSPoint)p; -- (NSRect) boundingBoxResizeHandleRect:(ResizeHandle)handle; -- (void) setResizeCursorForHandle:(ResizeHandle)handle; -@end - -@implementation BoundingBoxTool -- (NSString*) name { return @"Bounding Box"; } -- (const gchar*) stockId { return TIKZIT_STOCK_BOUNDING_BOX; } -- (NSString*) helpText { return @"Set the bounding box"; } -- (NSString*) shortcut { return @"b"; } - -+ (id) tool { - return [[[self alloc] init] autorelease]; -} - -- (id) init { - self = [super init]; - - if (self) { - currentResizeHandle = NoHandle; - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - [renderer release]; - - [super dealloc]; -} - -- (GraphRenderer*) activeRenderer { return renderer; } -- (void) setActiveRenderer:(GraphRenderer*)r { - if (r == renderer) - return; - - [[renderer surface] setCursor:NormalCursor]; - - [r retain]; - [renderer release]; - renderer = r; -} - -- (GtkWidget*) configurationWidget { return NULL; } - -- (void) mousePressAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { - if (button != LeftButton) - return; - - dragOrigin = pos; - currentResizeHandle = [self boundingBoxResizeHandleAt:pos]; - [[renderer document] startChangeBoundingBox]; - if (currentResizeHandle == NoHandle) { - drawingNewBox = YES; - [[[renderer document] graph] setBoundingBox:NSZeroRect]; - } else { - drawingNewBox = NO; - } - [renderer invalidateGraph]; -} - -- (void) mouseMoveTo:(NSPoint)pos withButtons:(MouseButton)buttons andMask:(InputMask)mask { - if (!(buttons & LeftButton)) { - ResizeHandle handle = [self boundingBoxResizeHandleAt:pos]; - [self setResizeCursorForHandle:handle]; - return; - } - - Transformer *transformer = [renderer transformer]; - Grid *grid = [renderer grid]; - Graph *graph = [[renderer document] graph]; - - if (currentResizeHandle == NoHandle) { - NSRect bbox = NSRectAroundPoints( - [grid snapScreenPoint:dragOrigin], - [grid snapScreenPoint:pos] - ); - [graph setBoundingBox:[transformer rectFromScreen:bbox]]; - } else { - NSRect bbox = [transformer rectToScreen:[graph boundingBox]]; - NSPoint p2 = [grid snapScreenPoint:pos]; - - if (currentResizeHandle == NorthWestHandle || - currentResizeHandle == NorthHandle || - currentResizeHandle == NorthEastHandle) { - - float dy = p2.y - NSMinY(bbox); - if (dy < bbox.size.height) { - bbox.origin.y += dy; - bbox.size.height -= dy; - } else { - bbox.origin.y = NSMaxY(bbox); - bbox.size.height = 0; - } - - } else if (currentResizeHandle == SouthWestHandle || - currentResizeHandle == SouthHandle || - currentResizeHandle == SouthEastHandle) { - - float dy = p2.y - NSMaxY(bbox); - if (-dy < bbox.size.height) { - bbox.size.height += dy; - } else { - bbox.size.height = 0; - } - } - - if (currentResizeHandle == NorthWestHandle || - currentResizeHandle == WestHandle || - currentResizeHandle == SouthWestHandle) { - - float dx = p2.x - NSMinX(bbox); - if (dx < bbox.size.width) { - bbox.origin.x += dx; - bbox.size.width -= dx; - } else { - bbox.origin.x = NSMaxX(bbox); - bbox.size.width = 0; - } - - } else if (currentResizeHandle == NorthEastHandle || - currentResizeHandle == EastHandle || - currentResizeHandle == SouthEastHandle) { - - float dx = p2.x - NSMaxX(bbox); - if (-dx < bbox.size.width) { - bbox.size.width += dx; - } else { - bbox.size.width = 0; - } - } - [graph setBoundingBox:[transformer rectFromScreen:bbox]]; - } - [[renderer document] changeBoundingBoxCheckPoint]; - [renderer invalidateGraph]; -} - -- (void) mouseReleaseAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { - if (button != LeftButton) - return; - - [[renderer document] endChangeBoundingBox]; - drawingNewBox = NO; - [renderer invalidateGraph]; -} - -- (void) renderWithContext:(id)context onSurface:(id)surface { - if (!drawingNewBox && [[[renderer document] graph] hasBoundingBox]) { - [context saveState]; - - [context setAntialiasMode:AntialiasDisabled]; - [context setLineWidth:1.0]; - - [context startPath]; - [context rect:[self boundingBoxResizeHandleRect:EastHandle]]; - [context rect:[self boundingBoxResizeHandleRect:SouthEastHandle]]; - [context rect:[self boundingBoxResizeHandleRect:SouthHandle]]; - [context rect:[self boundingBoxResizeHandleRect:SouthWestHandle]]; - [context rect:[self boundingBoxResizeHandleRect:WestHandle]]; - [context rect:[self boundingBoxResizeHandleRect:NorthWestHandle]]; - [context rect:[self boundingBoxResizeHandleRect:NorthHandle]]; - [context rect:[self boundingBoxResizeHandleRect:NorthEastHandle]]; - [context strokePathWithColor:MakeSolidRColor (0.5, 0.5, 0.5)]; - - [context restoreState]; - } -} -- (void) loadConfiguration:(Configuration*)config {} -- (void) saveConfiguration:(Configuration*)config {} -@end - -@implementation BoundingBoxTool (Private) -- (NSRect) screenBoundingBox { - Transformer *transformer = [[renderer surface] transformer]; - Graph *graph = [[renderer document] graph]; - return [transformer rectToScreen:[graph boundingBox]]; -} - -- (ResizeHandle) boundingBoxResizeHandleAt:(NSPoint)p { - NSRect bbox = [self screenBoundingBox]; - if (p.x >= NSMaxX(bbox)) { - if (p.x <= NSMaxX(bbox) + handle_size) { - if (p.y >= NSMaxY(bbox)) { - if (p.y <= NSMaxY(bbox) + handle_size) { - return SouthEastHandle; - } - } else if (p.y <= NSMinY(bbox)) { - if (p.y >= NSMinY(bbox) - handle_size) { - return NorthEastHandle; - } - } else { - float eastHandleTop = sideHandleTop(bbox); - if (p.y >= eastHandleTop && p.y <= (eastHandleTop + handle_size)) { - return EastHandle; - } - } - } - } else if (p.x <= NSMinX(bbox)) { - if (p.x >= NSMinX(bbox) - handle_size) { - if (p.y >= NSMaxY(bbox)) { - if (p.y <= NSMaxY(bbox) + handle_size) { - return SouthWestHandle; - } - } else if (p.y <= NSMinY(bbox)) { - if (p.y >= NSMinY(bbox) - handle_size) { - return NorthWestHandle; - } - } else { - float westHandleTop = sideHandleTop(bbox); - if (p.y >= westHandleTop && p.y <= (westHandleTop + handle_size)) { - return WestHandle; - } - } - } - } else if (p.y >= NSMaxY(bbox)) { - if (p.y <= NSMaxY(bbox) + handle_size) { - float southHandleLeft = tbHandleLeft(bbox); - if (p.x >= southHandleLeft && p.x <= (southHandleLeft + handle_size)) { - return SouthHandle; - } - } - } else if (p.y <= NSMinY(bbox)) { - if (p.y >= NSMinY(bbox) - handle_size) { - float northHandleLeft = tbHandleLeft(bbox); - if (p.x >= northHandleLeft && p.x <= (northHandleLeft + handle_size)) { - return NorthHandle; - } - } - } - return NoHandle; -} - -- (NSRect) boundingBoxResizeHandleRect:(ResizeHandle)handle { - Graph *graph = [[renderer document] graph]; - if (![graph hasBoundingBox]) { - return NSZeroRect; - } - NSRect bbox = [self screenBoundingBox]; - float x; - float y; - switch (handle) { - case NorthEastHandle: - case EastHandle: - case SouthEastHandle: - x = NSMaxX(bbox); - break; - case NorthWestHandle: - case WestHandle: - case SouthWestHandle: - x = NSMinX(bbox) - handle_size; - break; - case SouthHandle: - case NorthHandle: - x = tbHandleLeft(bbox); - break; - default: - return NSZeroRect; - } - switch (handle) { - case EastHandle: - case WestHandle: - y = sideHandleTop(bbox); - break; - case SouthEastHandle: - case SouthHandle: - case SouthWestHandle: - y = NSMaxY(bbox); - break; - case NorthEastHandle: - case NorthHandle: - case NorthWestHandle: - y = NSMinY(bbox) - handle_size; - break; - default: - return NSZeroRect; - } - return NSMakeRect(x, y, handle_size, handle_size); -} - -- (void) setResizeCursorForHandle:(ResizeHandle)handle { - if (handle != currentResizeHandle) { - currentResizeHandle = handle; - Cursor c = NormalCursor; - switch (handle) { - case EastHandle: - c = ResizeRightCursor; - break; - case SouthEastHandle: - c = ResizeBottomRightCursor; - break; - case SouthHandle: - c = ResizeBottomCursor; - break; - case SouthWestHandle: - c = ResizeBottomLeftCursor; - break; - case WestHandle: - c = ResizeLeftCursor; - break; - case NorthWestHandle: - c = ResizeTopLeftCursor; - break; - case NorthHandle: - c = ResizeTopCursor; - break; - case NorthEastHandle: - c = ResizeTopRightCursor; - break; - default: - c = NormalCursor; - break; - } - [[renderer surface] setCursor:c]; - } -} -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/CairoRenderContext.h b/tikzit-1/src/gtk/CairoRenderContext.h deleted file mode 100644 index ac9c5ee..0000000 --- a/tikzit-1/src/gtk/CairoRenderContext.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "RenderContext.h" -#import "Transformer.h" -#import -#import -#import - -@interface PangoTextLayout: NSObject { - PangoLayout *layout; - cairo_t *context; -} - -+ (PangoTextLayout*) layoutForContext:(cairo_t*)cr withFontSize:(CGFloat)fontSize; -- (id) initWithContext:(cairo_t*)cr fontSize:(CGFloat)fontSize; -- (void) setText:(NSString*)text; - -@end - -@interface CairoRenderContext: NSObject { - cairo_t *context; -} - -+ (CairoRenderContext*) contextForSurface:(cairo_surface_t*)surface; -- (id) initForSurface:(cairo_surface_t*)surface; - -+ (CairoRenderContext*) contextForWidget:(GtkWidget*)widget; -- (id) initForWidget:(GtkWidget*)widget; - -+ (CairoRenderContext*) contextForDrawable:(GdkDrawable*)d; -- (id) initForDrawable:(GdkDrawable*)d; - -+ (CairoRenderContext*) contextForPixbuf:(GdkPixbuf*)buf; -- (id) initForPixbuf:(GdkPixbuf*)buf; - -- (cairo_t*) cairoContext; -- (void) applyTransform:(Transformer*)transformer; - -- (void) clearSurface; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/CairoRenderContext.m b/tikzit-1/src/gtk/CairoRenderContext.m deleted file mode 100644 index 77e10b5..0000000 --- a/tikzit-1/src/gtk/CairoRenderContext.m +++ /dev/null @@ -1,344 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "CairoRenderContext.h" - -#import "cairo_helpers.h" -#import "util.h" - -#import - -@implementation PangoTextLayout - -- (id) init { - [self release]; - return nil; -} - -+ (PangoTextLayout*) layoutForContext:(cairo_t*)cr withFontSize:(CGFloat)fontSize { - return [[[self alloc] initWithContext:cr fontSize:fontSize] autorelease]; -} - -- (id) initWithContext:(cairo_t*)cr fontSize:(CGFloat)fontSize { - self = [super init]; - - if (self) { - cairo_reference (cr); - context = cr; - layout = pango_cairo_create_layout (cr); - - PangoFontDescription *font_desc = pango_font_description_new (); - pango_font_description_set_family_static (font_desc, "Sans"); - pango_font_description_set_size (font_desc, pango_units_from_double (fontSize)); - pango_layout_set_font_description (layout, font_desc); - pango_font_description_free (font_desc); - } - - return self; -} - -- (void) setText:(NSString*)text { - pango_layout_set_text (layout, [text UTF8String], -1); -} - -- (NSSize) size { - int width, height; - pango_layout_get_size (layout, &width, &height); - return NSMakeSize (pango_units_to_double (width), pango_units_to_double (height)); -} - -- (NSString*) text { - return [NSString stringWithUTF8String:pango_layout_get_text (layout)]; -} - -- (void) showTextAt:(NSPoint)topLeft withColor:(RColor)color { - cairo_save (context); - - cairo_move_to(context, topLeft.x, topLeft.y); - cairo_set_source_rcolor (context, color); - pango_cairo_show_layout (context, layout); - - cairo_restore (context); -} - -- (void) dealloc { - if (layout) - g_object_unref (G_OBJECT (layout)); - if (context) - cairo_destroy (context); - - [super dealloc]; -} - -@end - -@implementation CairoRenderContext - -- (id) init { - [self release]; - return nil; -} - -+ (CairoRenderContext*) contextForSurface:(cairo_surface_t*)surface { - return [[[self alloc] initForSurface:surface] autorelease]; -} - -- (id) initForSurface:(cairo_surface_t*)surface { - self = [super init]; - - if (self) { - context = cairo_create (surface); - } - - return self; -} - -+ (CairoRenderContext*) contextForWidget:(GtkWidget*)widget { - return [[[self alloc] initForWidget:widget] autorelease]; -} - -- (id) initForWidget:(GtkWidget*)widget { - self = [super init]; - - if (self) { - GdkWindow *window = gtk_widget_get_window (widget); - if (window) { - context = gdk_cairo_create (window); - } else { - [self release]; - self = nil; - } - } - - return self; -} - -+ (CairoRenderContext*) contextForDrawable:(GdkDrawable*)d { - return [[[self alloc] initForDrawable:d] autorelease]; -} - -- (id) initForDrawable:(GdkDrawable*)d { - self = [super init]; - - if (self) { - context = gdk_cairo_create (d); - } - - return self; -} - -+ (CairoRenderContext*) contextForPixbuf:(GdkPixbuf*)pixbuf { - return [[[self alloc] initForPixbuf:pixbuf] autorelease]; -} - -- (id) initForPixbuf:(GdkPixbuf*)pixbuf { - self = [super init]; - - if (self) { - cairo_format_t format = -1; - - if (gdk_pixbuf_get_colorspace (pixbuf) != GDK_COLORSPACE_RGB) { - NSLog(@"Unsupported colorspace (must be RGB)"); - [self release]; - return nil; - } - if (gdk_pixbuf_get_bits_per_sample (pixbuf) != 8) { - NSLog(@"Unsupported bits per sample (must be 8)"); - [self release]; - return nil; - } - if (gdk_pixbuf_get_has_alpha (pixbuf)) { - if (gdk_pixbuf_get_n_channels (pixbuf) != 4) { - NSLog(@"Unsupported bits per sample (must be 4 for an image with alpha)"); - [self release]; - return nil; - } - format = CAIRO_FORMAT_ARGB32; - } else { - if (gdk_pixbuf_get_n_channels (pixbuf) != 3) { - NSLog(@"Unsupported bits per sample (must be 3 for an image without alpha)"); - [self release]; - return nil; - } - format = CAIRO_FORMAT_RGB24; - } - - cairo_surface_t *surface = cairo_image_surface_create_for_data( - gdk_pixbuf_get_pixels(pixbuf), - format, - gdk_pixbuf_get_width(pixbuf), - gdk_pixbuf_get_height(pixbuf), - gdk_pixbuf_get_rowstride(pixbuf)); - context = cairo_create (surface); - cairo_surface_destroy (surface); - } - - return self; -} - -- (cairo_t*) cairoContext { - return context; -} - -- (void) applyTransform:(Transformer*)transformer { - NSPoint origin = [transformer toScreen:NSZeroPoint]; - cairo_translate (context, origin.x, origin.y); - NSPoint scale = [transformer toScreen:NSMakePoint (1.0f, 1.0f)]; - scale.x -= origin.x; - scale.y -= origin.y; - cairo_scale (context, scale.x, scale.y); -} - -- (void) saveState { - cairo_save (context); -} - -- (void) restoreState { - cairo_restore (context); -} - -- (NSRect) clipBoundingBox { - double clipx1, clipx2, clipy1, clipy2; - cairo_clip_extents (context, &clipx1, &clipy1, &clipx2, &clipy2); - return NSMakeRect (clipx1, clipy1, clipx2-clipx1, clipy2-clipy1); -} - -- (BOOL) strokeIncludesPoint:(NSPoint)p { - return cairo_in_stroke (context, p.x, p.y); -} - -- (BOOL) fillIncludesPoint:(NSPoint)p { - return cairo_in_fill (context, p.x, p.y); -} - -- (id) layoutText:(NSString*)text withSize:(CGFloat)fontSize { - PangoTextLayout *layout = [PangoTextLayout layoutForContext:context withFontSize:fontSize]; - [layout setText:text]; - return layout; -} - -- (void) setAntialiasMode:(AntialiasMode)mode { - if (mode == AntialiasDisabled) { - cairo_set_antialias (context, CAIRO_ANTIALIAS_NONE); - } else { - cairo_set_antialias (context, CAIRO_ANTIALIAS_DEFAULT); - } -} - -- (void) setLineWidth:(CGFloat)width { - cairo_set_line_width (context, width); -} - -- (void) setLineDash:(CGFloat)dashLength { - if (dashLength <= 0.0) { - cairo_set_dash (context, NULL, 0, 0); - } else { - double dashes[] = { dashLength }; - cairo_set_dash (context, dashes, 1, 0); - } -} - -// paths -- (void) startPath { - cairo_new_path (context); -} - -- (void) closeSubPath { - cairo_close_path (context); -} - -- (void) moveTo:(NSPoint)p { - cairo_move_to(context, p.x, p.y); -} - -- (void) curveTo:(NSPoint)end withCp1:(NSPoint)cp1 andCp2:(NSPoint)cp2 { - cairo_curve_to (context, cp1.x, cp1.y, cp2.x, cp2.y, end.x, end.y); -} - -- (void) lineTo:(NSPoint)end { - cairo_line_to (context, end.x, end.y); -} - -- (void) rect:(NSRect)rect { - cairo_rectangle (context, rect.origin.x, rect.origin.y, rect.size.width, rect.size.height); -} - -- (void) circleAt:(NSPoint)c withRadius:(CGFloat)r { - cairo_new_sub_path (context); - cairo_arc (context, c.x, c.y, r, 0, 2 * M_PI); -} - -- (void) strokePathWithColor:(RColor)color { - cairo_set_source_rcolor (context, color); - cairo_stroke (context); -} - -- (void) fillPathWithColor:(RColor)color { - cairo_set_source_rcolor (context, color); - cairo_fill (context); -} - -- (void) strokePathWithColor:(RColor)scolor - andFillWithColor:(RColor)fcolor { - cairo_set_source_rcolor (context, fcolor); - cairo_fill_preserve (context); - cairo_set_source_rcolor (context, scolor); - cairo_stroke (context); -} - -- (void) strokePathWithColor:(RColor)scolor - andFillWithColor:(RColor)fcolor - usingAlpha:(CGFloat)alpha { - cairo_push_group (context); - cairo_set_source_rcolor (context, fcolor); - cairo_fill_preserve (context); - cairo_set_source_rcolor (context, scolor); - cairo_stroke (context); - cairo_pop_group_to_source (context); - cairo_paint_with_alpha (context, alpha); -} - -- (void) clipToPath { - cairo_clip (context); -} - -- (void) paintWithColor:(RColor)color { - cairo_set_source_rcolor (context, color); - cairo_paint (context); -} - -- (void) clearSurface { - cairo_operator_t old_op = cairo_get_operator (context); - - cairo_set_operator (context, CAIRO_OPERATOR_SOURCE); - cairo_set_source_rgba (context, 0.0, 0.0, 0.0, 0.0); - cairo_paint (context); - - cairo_set_operator (context, old_op); -} - -- (void) dealloc { - if (context) { - cairo_destroy (context); - } - - [super dealloc]; -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/ColorRGB+Gtk.h b/tikzit-1/src/gtk/ColorRGB+Gtk.h deleted file mode 100644 index 5cfb4d7..0000000 --- a/tikzit-1/src/gtk/ColorRGB+Gtk.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "ColorRGB.h" -#import - -@interface ColorRGB (Gtk) - -+ (ColorRGB*) colorWithGdkColor:(GdkColor)color; -- (id) initWithGdkColor:(GdkColor)color; -- (GdkColor) gdkColor; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/ColorRGB+Gtk.m b/tikzit-1/src/gtk/ColorRGB+Gtk.m deleted file mode 100644 index be5dd56..0000000 --- a/tikzit-1/src/gtk/ColorRGB+Gtk.m +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * Copyright 2010 Chris Heunen - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "ColorRGB+Gtk.h" - -// 257 = 65535/255 -// GdkColor values run from 0 to 65535, not from 0 to 255 -#define GDK_FACTOR 257 - -@implementation ColorRGB (Gtk) - -+ (ColorRGB*) colorWithGdkColor:(GdkColor)color { - return [ColorRGB colorWithRed:color.red/GDK_FACTOR green:color.green/GDK_FACTOR blue:color.blue/GDK_FACTOR]; -} - -- (id) initWithGdkColor:(GdkColor)color { - return [self initWithRed:color.red/GDK_FACTOR green:color.green/GDK_FACTOR blue:color.blue/GDK_FACTOR]; -} - -- (GdkColor) gdkColor { - GdkColor color; - color.pixel = 0; - color.red = GDK_FACTOR * [self red]; - color.green = GDK_FACTOR * [self green]; - color.blue = GDK_FACTOR * [self blue]; - return color; -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/ColorRGB+IntegerListStorage.h b/tikzit-1/src/gtk/ColorRGB+IntegerListStorage.h deleted file mode 100644 index 118eaee..0000000 --- a/tikzit-1/src/gtk/ColorRGB+IntegerListStorage.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "ColorRGB.h" - -/** - * Stores a ColorRGB as a list of short integers - */ -@interface ColorRGB (IntegerListStorage) - -+ (ColorRGB*) colorFromValueList:(NSArray*)values; -- (id) initFromValueList:(NSArray*)values; -- (NSArray*) valueList; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/ColorRGB+IntegerListStorage.m b/tikzit-1/src/gtk/ColorRGB+IntegerListStorage.m deleted file mode 100644 index 0103a3c..0000000 --- a/tikzit-1/src/gtk/ColorRGB+IntegerListStorage.m +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * Copyright 2010 Chris Heunen - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "ColorRGB+IntegerListStorage.h" - -@implementation ColorRGB (IntegerListStorage) - -+ (ColorRGB*) colorFromValueList:(NSArray*)values { - if ([values count] != 3) { - return nil; - } - - unsigned short redValue = [[values objectAtIndex:0] intValue]; - unsigned short greenValue = [[values objectAtIndex:1] intValue]; - unsigned short blueValue = [[values objectAtIndex:2] intValue]; - return [ColorRGB colorWithRed:redValue green:greenValue blue:blueValue]; -} - -- (id) initFromValueList:(NSArray*)values { - if ([values count] != 3) { - [self release]; - return nil; - } - - unsigned short redValue = [[values objectAtIndex:0] intValue]; - unsigned short greenValue = [[values objectAtIndex:1] intValue]; - unsigned short blueValue = [[values objectAtIndex:2] intValue]; - - return [self initWithRed:redValue green:greenValue blue:blueValue]; -} - -- (NSArray*) valueList { - NSMutableArray *array = [NSMutableArray arrayWithCapacity:3]; - [array addObject:[NSNumber numberWithInt:[self red]]]; - [array addObject:[NSNumber numberWithInt:[self green]]]; - [array addObject:[NSNumber numberWithInt:[self blue]]]; - return array; -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/Configuration.h b/tikzit-1/src/gtk/Configuration.h deleted file mode 100644 index 6c68681..0000000 --- a/tikzit-1/src/gtk/Configuration.h +++ /dev/null @@ -1,447 +0,0 @@ -// -// Configuration.h -// TikZiT -// -// Copyright 2010 Alex Merry -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "TZFoundation.h" - -/** - * Manages configuration information in a grouped key-value format. - */ -@interface Configuration : NSObject { - NSString *name; - GKeyFile *file; -} - -/** - * Check whether there is any existing configuration. - */ -+ (BOOL) configurationExistsWithName:(NSString*)name; -/** - * Create a blank configuration with the given name, without loading - * any existing configuration information. - * - * @param name the name of the configuration - */ -+ (Configuration*) emptyConfigurationWithName:(NSString*)name; -/** - * Load an existing configuration for the given name. - * - * If there was no existing configuration, or it could not be opened, - * an empty configuration will be returned. - * - * @param name the name of the configuration - */ -+ (Configuration*) configurationWithName:(NSString*)name; -/** - * Load an existing configuration for the given name. - * - * If there was no existing configuration, or it could not be opened, - * an empty configuration will be returned. - * - * @param name the name of the configuration - * @param error this will be set if the configuration exists, but could - * not be opened. - */ -+ (Configuration*) configurationWithName:(NSString*)name loadError:(NSError**)error; - -/** - * Initialise the configuration to be empty - * - * Does not attempt to load any existing configuration data. - * - * @param name the name of the configuration - */ -- (id) initEmptyWithName:(NSString*)name; -/** - * Initialise a configuration, loading it if it had previously been stored. - * - * If there was no existing configuration, or it could not be opened, - * an empty configuration will be returned. - * - * @param name the name of the configuration - */ -- (id) initWithName:(NSString*)name; -/** - * Initialise a configuration, loading it if it had previously been stored. - * - * If there was no existing configuration, or it could not be opened, - * an empty configuration will be returned. - * - * @param name the name of the configuration - * @param error this will be set if the configuration exists, but could - * not be opened. - */ -- (id) initWithName:(NSString*)name loadError:(NSError**)error; - -/** - * The name of the configuration. - * - * Configurations with different names are stored independently. - */ -- (NSString*) name; -/** - * Set the name of the configuration. - * - * This will affect the behaviour of [-writeToStore] - * - * Configurations with different names are stored independently. - */ -- (void) setName:(NSString*)name; - -/** - * Writes the configuration to the backing store. - * - * The location the configuration is written to is determined by the - * [-name] property. - * - * @result YES if the configuration was successfully written, NO otherwise - */ -- (BOOL) writeToStore; -/** - * Writes the configuration to the backing store. - * - * The location the configuration is written to is determined by the - * [-name] property. - * - * @param error this will be set if the configuration could not be written - * to the backing store - * @result YES if the configuration was successfully written, NO otherwise - */ -- (BOOL) writeToStoreWithError:(NSError**)error; - -/** - * Check whether a particular key exists within a group - * - * @param key the key to check for - * @param group the name of the group to look in - * @result YES if the key exists, NO otherwise - */ -- (BOOL) hasKey:(NSString*)key inGroup:(NSString*)group; -/** - * Check whether a particular group exists - * - * @param group the name of the group to check for - * @result YES if the group exists, NO otherwise - */ -- (BOOL) hasGroup:(NSString*)group; -/** - * List the groups in the configuration. - * - * @result a list of group names - */ -- (NSArray*) groups; - -/** - * Get the value associated with a key as a string - * - * This is only guaranteed to work if the value was stored as a string. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @result the value associated with key as a string, or nil - * if no string value was associated with key - */ -- (NSString*) stringEntry:(NSString*)key inGroup:(NSString*)group; -/** - * Get the value associated with a key as a string - * - * This is only guaranteed to work if the value was stored as a string. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @param def the value to return if no string value was associated with key - * @result the value associated with key as a string, or default - */ -- (NSString*) stringEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSString*)def; -/** - * Get the value associated with a key as a boolean - * - * This is only guaranteed to work if the value was stored as a boolean. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @result the value associated with key as a boolean, or NO - * if no boolean value was associated with key - */ -- (BOOL) booleanEntry:(NSString*)key inGroup:(NSString*)group; -/** - * Get the value associated with a key as a boolean - * - * This is only guaranteed to work if the value was stored as a boolean. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @param def the value to return if no boolean value was associated with key - * @result the value associated with key as a boolean, or def - */ -- (BOOL) booleanEntry:(NSString*)key inGroup:(NSString*)group withDefault:(BOOL)def; -/** - * Get the value associated with a key as a integer - * - * This is only guaranteed to work if the value was stored as a integer. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @result the value associated with key as a integer, or 0 - * if no integer value was associated with key - */ -- (int) integerEntry:(NSString*)key inGroup:(NSString*)group; -/** - * Get the value associated with a key as a integer - * - * This is only guaranteed to work if the value was stored as a integer. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @param def the value to return if no integer value was associated with key - * @result the value associated with key as a integer, or def - */ -- (int) integerEntry:(NSString*)key inGroup:(NSString*)group withDefault:(int)def; -/** - * Get the value associated with a key as a double - * - * This is only guaranteed to work if the value was stored as a double. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @result the value associated with key as a double, or 0 - * if no double value was associated with key - */ -- (double) doubleEntry:(NSString*)key inGroup:(NSString*)group; -/** - * Get the value associated with a key as a double - * - * This is only guaranteed to work if the value was stored as a double. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @param def the value to return if no double value was associated with key - * @result the value associated with key as a double, or def - */ -- (double) doubleEntry:(NSString*)key inGroup:(NSString*)group withDefault:(double)def; - -/** - * Get the value associated with a key as a list of strings - * - * This is only guaranteed to work if the value was stored as a - * list of strings. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @result the value associated with key as a list of strings, - * or nil if no list of strings was associated with key - */ -- (NSArray*) stringListEntry:(NSString*)key inGroup:(NSString*)group; -/** - * Get the value associated with a key as a list of strings - * - * This is only guaranteed to work if the value was stored as a - * list of strings. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @param def the value to return if no string list value was associated with key - * @result the value associated with key as a list of strings, or def - */ -- (NSArray*) stringListEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSArray*)def; -/** - * Get the value associated with a key as a list of booleans - * - * This is only guaranteed to work if the value was stored as a - * list of booleans. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @result the value associated with key as a list of NSNumber - * objects, containing boolean values, or nil - */ -- (NSArray*) booleanListEntry:(NSString*)key inGroup:(NSString*)group; -/** - * Get the value associated with a key as a list of booleans - * - * This is only guaranteed to work if the value was stored as a - * list of booleans. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @param def the value to return if no boolean list value was associated with key - * @result the value associated with key as a list of NSNumber - * objects, containing boolean values, or def - */ -- (NSArray*) booleanListEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSArray*)def; -/** - * Get the value associated with a key as a list of integers - * - * This is only guaranteed to work if the value was stored as a - * list of integers. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @result the value associated with key as a list of NSNumber - * objects, containing integer values, or nil - */ -- (NSArray*) integerListEntry:(NSString*)key inGroup:(NSString*)group; -/** - * Get the value associated with a key as a list of integers - * - * This is only guaranteed to work if the value was stored as a - * list of integers. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @param def the value to return if no integer list value was associated with key - * @result the value associated with key as a list of NSNumber - * objects, containing integer values, or def - */ -- (NSArray*) integerListEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSArray*)def; -/** - * Get the value associated with a key as a list of doubles - * - * This is only guaranteed to work if the value was stored as a - * list of doubles. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @result the value associated with key as a list of NSNumber - * objects, containing double values, or nil - */ -- (NSArray*) doubleListEntry:(NSString*)key inGroup:(NSString*)group; -/** - * Get the value associated with a key as a list of doubles - * - * This is only guaranteed to work if the value was stored as a - * list of doubles. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @param def the value to return if no double list value was associated with key - * @result the value associated with key as a list of NSNumber - * objects, containing double values, or def - */ -- (NSArray*) doubleListEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSArray*)def; - -/** - * Associate a string value with a key. - * - * Any previous value (of any type) with the same key and group will - * be overwritten. - * - * @param key the key to associate the value with - * @param group the group to store the association in - * @param value the value to store - */ -- (void) setStringEntry:(NSString*)key inGroup:(NSString*)group value:(NSString*)value; -/** - * Associate a boolean value with a key. - * - * Any previous value (of any type) with the same key and group will - * be overwritten. - * - * @param key the key to associate the value with - * @param group the group to store the association in - * @param value the value to store - */ -- (void) setBooleanEntry:(NSString*)key inGroup:(NSString*)group value:(BOOL)value; -/** - * Associate a integer value with a key. - * - * Any previous value (of any type) with the same key and group will - * be overwritten. - * - * @param key the key to associate the value with - * @param group the group to store the association in - * @param value the value to store - */ -- (void) setIntegerEntry:(NSString*)key inGroup:(NSString*)group value:(int)value; -/** - * Associate a double value with a key. - * - * Any previous value (of any type) with the same key and group will - * be overwritten. - * - * @param key the key to associate the value with - * @param group the group to store the association in - * @param value the value to store - */ -- (void) setDoubleEntry:(NSString*)key inGroup:(NSString*)group value:(double)value; - -/** - * Associate a list of string values with a key. - * - * Any previous value (of any type) with the same key and group will - * be overwritten. - * - * @param key the key to associate the list with - * @param group the group to store the association in - * @param value the list to store, as an array of strings - */ -- (void) setStringListEntry:(NSString*)key inGroup:(NSString*)group value:(NSArray*)value; -/** - * Associate a list of boolean values with a key. - * - * Any previous value (of any type) with the same key and group will - * be overwritten. - * - * @param key the key to associate the list with - * @param group the group to store the association in - * @param value the list to store, as an array of NSNumber objects - */ -- (void) setBooleanListEntry:(NSString*)key inGroup:(NSString*)group value:(NSArray*)value; -/** - * Associate a list of integer values with a key. - * - * Any previous value (of any type) with the same key and group will - * be overwritten. - * - * @param key the key to associate the list with - * @param group the group to store the association in - * @param value the list to store, as an array of NSNumber objects - */ -- (void) setIntegerListEntry:(NSString*)key inGroup:(NSString*)group value:(NSArray*)value; -/** - * Associate a list of double values with a key. - * - * Any previous value (of any type) with the same key and group will - * be overwritten. - * - * @param key the key to associate the list with - * @param group the group to store the association in - * @param value the list to store, as an array of NSNumber objects - */ -- (void) setDoubleListEntry:(NSString*)key inGroup:(NSString*)group value:(NSArray*)value; - -/** - * Remove a group from the configuration - * - * This will remove all the groups key-value associations. - */ -- (void) removeGroup:(NSString*)group; -/** - * Remove a key from the configuration - * - * @param key the key to remove - * @param group the group to remove it from - */ -- (void) removeKey:(NSString*)key inGroup:(NSString*)group; - -@end - -// vim:ft=objc:sts=4:sw=4:et diff --git a/tikzit-1/src/gtk/Configuration.m b/tikzit-1/src/gtk/Configuration.m deleted file mode 100644 index 4a3ed79..0000000 --- a/tikzit-1/src/gtk/Configuration.m +++ /dev/null @@ -1,450 +0,0 @@ -// -// Configuration.h -// TikZiT -// -// Copyright 2010 Alex Merry -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "Configuration.h" -#import "SupportDir.h" - -@implementation Configuration - -+ (NSString*) _pathFromName:(NSString*)name { - return [NSString stringWithFormat:@"%@/%@.conf", [SupportDir userSupportDir], name]; -} - -+ (BOOL) configurationExistsWithName:(NSString*)name { - BOOL isDir; - BOOL exists = [[NSFileManager defaultManager] fileExistsAtPath:[self _pathFromName:name] isDirectory:&isDir]; - return exists && !isDir; -} - -+ (Configuration*) emptyConfigurationWithName:(NSString*)name - { return [[[self alloc] initEmptyWithName:name] autorelease]; } -+ (Configuration*) configurationWithName:(NSString*)name - { return [[[self alloc] initWithName:name] autorelease]; } -+ (Configuration*) configurationWithName:(NSString*)name loadError:(NSError**)error - { return [[[self alloc] initWithName:name loadError:error] autorelease]; } - -- (id) init -{ - [self release]; - return nil; -} - -- (id) initEmptyWithName:(NSString*)n -{ - self = [super init]; - if (self) { - name = [n retain]; - file = g_key_file_new (); - } - - return self; -} - -- (id) _initFromFile:(NSString*)path error:(NSError**)error -{ - self = [super init]; - if (self) { - file = g_key_file_new (); - - NSFileManager *manager = [NSFileManager defaultManager]; - if ([manager fileExistsAtPath:path]) { - gchar *filename = [path glibFilename]; - - GError *gerror = NULL; - g_key_file_load_from_file (file, - filename, - G_KEY_FILE_NONE, - &gerror); - g_free (filename); - - if (gerror) { - GErrorToNSError (gerror, error); - g_error_free (gerror); - } - } - } - - return self; -} - -- (id) initWithName:(NSString*)n { - return [self initWithName:n loadError:NULL]; -} - -- (id) initWithName:(NSString*)n loadError:(NSError**)error { - self = [self _initFromFile:[Configuration _pathFromName:n] error:error]; - - if (self) { - name = [n retain]; - } - - return self; -} - -- (BOOL) _ensureParentExists:(NSString*)path error:(NSError**)error { - NSString *directory = [path stringByDeletingLastPathComponent]; - return [[NSFileManager defaultManager] ensureDirectoryExists:directory error:error]; -} - -- (BOOL) _writeFileTo:(NSString*)path error:(NSError**)error -{ - if (![self _ensureParentExists:path error:error]) { - return NO; - } - - BOOL success = NO; - gsize length; - gchar *data = g_key_file_to_data (file, &length, NULL); // never reports an error - if (data && length) { - GError *gerror = NULL; - gchar* nativePath = [path glibFilename]; - success = g_file_set_contents (nativePath, data, length, &gerror) ? YES : NO; - g_free (data); - g_free (nativePath); - if (gerror) { - g_warning ("Failed to write file: %s\n", gerror->message); - GErrorToNSError (gerror, error); - g_error_free (gerror); - } - } else { - [[NSFileManager defaultManager] removeFileAtPath:path handler:nil]; - success = YES; - } - - return success; -} - -- (NSString*) name { - return name; -} - -- (void) setName:(NSString*)n { - [n retain]; - [name release]; - name = n; -} - -- (BOOL) writeToStore { - return [self writeToStoreWithError:NULL]; -} - -- (BOOL) writeToStoreWithError:(NSError**)error { - return [self _writeFileTo:[Configuration _pathFromName:name] error:error]; -} - -- (BOOL) hasKey:(NSString*)key inGroup:(NSString*)group -{ - gboolean result = g_key_file_has_key (file, [group UTF8String], [key UTF8String], NULL); - return result ? YES : NO; -} - -- (BOOL) hasGroup:(NSString*)group -{ - gboolean result = g_key_file_has_group (file, [group UTF8String]); - return result ? YES : NO; -} - -- (NSArray*) keys:(NSString*)group -{ - gsize length; - gchar **keys = g_key_file_get_keys (file, [group UTF8String], &length, NULL); - if (!keys) - length = 0; - - NSMutableArray *array = [NSMutableArray arrayWithCapacity:length]; - for (int i = 0; i < length; ++i) { - [array addObject:[NSString stringWithUTF8String:keys[i]]]; - } - g_strfreev (keys); - return array; -} - -- (NSArray*) groups -{ - gsize length; - gchar **groups = g_key_file_get_groups (file, &length); - NSMutableArray *array = [NSMutableArray arrayWithCapacity:length]; - for (int i = 0; i < length; ++i) { - [array addObject:[NSString stringWithUTF8String:groups[i]]]; - } - g_strfreev (groups); - return array; -} - -- (NSString*) stringEntry:(NSString*)key inGroup:(NSString*)group -{ - return [self stringEntry:key inGroup:group withDefault:nil]; -} - -- (NSString*) stringEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSString*)def -{ - NSString *result = def; - gchar *entry = g_key_file_get_string (file, [group UTF8String], [key UTF8String], NULL); - if (entry) { - result = [NSString stringWithUTF8String:entry]; - g_free (entry); - } - return result; -} - -- (BOOL) booleanEntry:(NSString*)key inGroup:(NSString*)group withDefault:(BOOL)def -{ - GError *error = NULL; - gboolean result = g_key_file_get_boolean (file, [group UTF8String], [key UTF8String], &error); - if (error != NULL) { - g_error_free (error); - return def; - } else { - return result ? YES : NO; - } -} - -- (BOOL) booleanEntry:(NSString*)key inGroup:(NSString*)group -{ - gboolean result = g_key_file_get_boolean (file, [group UTF8String], [key UTF8String], NULL); - return result ? YES : NO; -} - -- (int) integerEntry:(NSString*)key inGroup:(NSString*)group withDefault:(int)def -{ - GError *error = NULL; - int result = g_key_file_get_integer (file, [group UTF8String], [key UTF8String], &error); - if (error != NULL) { - g_error_free (error); - return def; - } else { - return result; - } -} - -- (int) integerEntry:(NSString*)key inGroup:(NSString*)group -{ - return g_key_file_get_integer (file, [group UTF8String], [key UTF8String], NULL); -} - -- (double) doubleEntry:(NSString*)key inGroup:(NSString*)group withDefault:(double)def -{ - GError *error = NULL; - double result = g_key_file_get_double (file, [group UTF8String], [key UTF8String], &error); - if (error != NULL) { - g_error_free (error); - return def; - } else { - return result; - } -} - -- (double) doubleEntry:(NSString*)key inGroup:(NSString*)group -{ - return g_key_file_get_double (file, [group UTF8String], [key UTF8String], NULL); -} - -- (NSArray*) stringListEntry:(NSString*)key inGroup:(NSString*)group -{ - return [self stringListEntry:key inGroup:group withDefault:nil]; -} - -- (NSArray*) stringListEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSArray*)def -{ - gsize length; - gchar **list = g_key_file_get_string_list (file, [group UTF8String], [key UTF8String], &length, NULL); - if (list) { - NSMutableArray *result = [NSMutableArray arrayWithCapacity:length]; - for (int i = 0; i < length; ++i) { - [result addObject:[NSString stringWithUTF8String:list[i]]]; - } - g_strfreev (list); - return result; - } else { - return def; - } -} - -- (NSArray*) booleanListEntry:(NSString*)key inGroup:(NSString*)group -{ - return [self booleanListEntry:key inGroup:group withDefault:nil]; -} - -- (NSArray*) booleanListEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSArray*)def -{ - gsize length; - gboolean *list = g_key_file_get_boolean_list (file, [group UTF8String], [key UTF8String], &length, NULL); - if (list) { - NSMutableArray *result = [NSMutableArray arrayWithCapacity:length]; - for (int i = 0; i < length; ++i) { - [result addObject:[NSNumber numberWithBool:list[i]]]; - } - g_free (list); - return result; - } else { - return def; - } -} - -- (NSArray*) integerListEntry:(NSString*)key inGroup:(NSString*)group -{ - return [self integerListEntry:key inGroup:group withDefault:nil]; -} - -- (NSArray*) integerListEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSArray*)def -{ - gsize length; - gint *list = g_key_file_get_integer_list (file, [group UTF8String], [key UTF8String], &length, NULL); - if (list) { - NSMutableArray *result = [NSMutableArray arrayWithCapacity:length]; - for (int i = 0; i < length; ++i) { - [result addObject:[NSNumber numberWithInt:list[i]]]; - } - g_free (list); - return result; - } else { - return def; - } -} - -- (NSArray*) doubleListEntry:(NSString*)key inGroup:(NSString*)group -{ - return [self doubleListEntry:key inGroup:group withDefault:nil]; -} - -- (NSArray*) doubleListEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSArray*)def -{ - gsize length; - double *list = g_key_file_get_double_list (file, [group UTF8String], [key UTF8String], &length, NULL); - if (list) { - NSMutableArray *result = [NSMutableArray arrayWithCapacity:length]; - for (int i = 0; i < length; ++i) { - [result addObject:[NSNumber numberWithDouble:list[i]]]; - } - g_free (list); - return result; - } else { - return def; - } -} - -- (void) setStringEntry:(NSString*)key inGroup:(NSString*)group value:(NSString*)value -{ - if (value == nil) { - [self removeKey:key inGroup:group]; - return; - } - g_key_file_set_string (file, [group UTF8String], [key UTF8String], [value UTF8String]); -} - -- (void) setBooleanEntry:(NSString*)key inGroup:(NSString*)group value:(BOOL)value; -{ - g_key_file_set_boolean (file, [group UTF8String], [key UTF8String], value); -} - -- (void) setIntegerEntry:(NSString*)key inGroup:(NSString*)group value:(int)value; -{ - g_key_file_set_integer (file, [group UTF8String], [key UTF8String], value); -} - -- (void) setDoubleEntry:(NSString*)key inGroup:(NSString*)group value:(double)value; -{ - g_key_file_set_double (file, [group UTF8String], [key UTF8String], value); -} - - -- (void) setStringListEntry:(NSString*)key inGroup:(NSString*)group value:(NSArray*)value -{ - if (value == nil) { - [self removeKey:key inGroup:group]; - return; - } - gsize length = [value count]; - const gchar * *list = g_new (const gchar *, length); - for (int i = 0; i < length; ++i) { - list[i] = [[value objectAtIndex:i] UTF8String]; - } - g_key_file_set_string_list (file, [group UTF8String], [key UTF8String], list, length); - g_free (list); -} - -- (void) setBooleanListEntry:(NSString*)key inGroup:(NSString*)group value:(NSArray*)value; -{ - if (value == nil) { - [self removeKey:key inGroup:group]; - return; - } - gsize length = [value count]; - gboolean *list = g_new (gboolean, length); - for (int i = 0; i < length; ++i) { - list[i] = [[value objectAtIndex:i] boolValue]; - } - g_key_file_set_boolean_list (file, [group UTF8String], [key UTF8String], list, length); - g_free (list); -} - -- (void) setIntegerListEntry:(NSString*)key inGroup:(NSString*)group value:(NSArray*)value; -{ - if (value == nil) { - [self removeKey:key inGroup:group]; - return; - } - gsize length = [value count]; - gint *list = g_new (gint, length); - for (int i = 0; i < length; ++i) { - list[i] = [[value objectAtIndex:i] intValue]; - } - g_key_file_set_integer_list (file, [group UTF8String], [key UTF8String], list, length); - g_free (list); -} - -- (void) setDoubleListEntry:(NSString*)key inGroup:(NSString*)group value:(NSArray*)value; -{ - if (value == nil) { - [self removeKey:key inGroup:group]; - return; - } - gsize length = [value count]; - gdouble *list = g_new (gdouble, length); - for (int i = 0; i < length; ++i) { - list[i] = [[value objectAtIndex:i] doubleValue]; - } - g_key_file_set_double_list (file, [group UTF8String], [key UTF8String], list, length); - g_free (list); -} - -- (void) removeGroup:(NSString*)group -{ - g_key_file_remove_group (file, [group UTF8String], NULL); -} - -- (void) removeKey:(NSString*)key inGroup:(NSString*)group; -{ - g_key_file_remove_key (file, [group UTF8String], [key UTF8String], NULL); -} - -- (void) dealloc -{ - [name release]; - g_key_file_free (file); - file = NULL; - [super dealloc]; -} - -@end - -// vim:ft=objc:sts=4:sw=4:et diff --git a/tikzit-1/src/gtk/ContextWindow.h b/tikzit-1/src/gtk/ContextWindow.h deleted file mode 100644 index fcad9df..0000000 --- a/tikzit-1/src/gtk/ContextWindow.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class Configuration; -@class EdgeStylesModel; -@class NodeStylesModel; -@class PropertiesPane; -@class SelectionPane; -@class StyleManager; -@class TikzDocument; -@class Window; - -@interface ContextWindow: NSObject { - PropertiesPane *propsPane; - SelectionPane *selPane; - - GtkWidget *window; - GtkWidget *layout; -} - -@property (retain) TikzDocument *document; -@property (assign) BOOL visible; - -- (id) initWithStyleManager:(StyleManager*)mgr; -- (id) initWithNodeStylesModel:(NodeStylesModel*)nsm - andEdgeStylesModel:(EdgeStylesModel*)esm; - -- (void) present; -- (void) attachToWindow:(Window*)parent; - -- (void) loadConfiguration:(Configuration*)config; -- (void) saveConfiguration:(Configuration*)config; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/ContextWindow.m b/tikzit-1/src/gtk/ContextWindow.m deleted file mode 100644 index d8e9d20..0000000 --- a/tikzit-1/src/gtk/ContextWindow.m +++ /dev/null @@ -1,169 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "ContextWindow.h" - -#import "Configuration.h" -#import "EdgeStylesModel.h" -#import "NodeStylesModel.h" -#import "PropertiesPane.h" -#import "SelectionPane.h" -#import "StyleManager.h" -#import "Window.h" - -#import "gtkhelpers.h" - -static gboolean props_window_delete_event_cb (GtkWidget *widget, GdkEvent *event, ContextWindow *window); - -@implementation ContextWindow - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithStyleManager:(StyleManager*)sm { - return [self initWithNodeStylesModel:[NodeStylesModel modelWithStyleManager:sm] - andEdgeStylesModel:[EdgeStylesModel modelWithStyleManager:sm]]; -} - -- (id) initWithNodeStylesModel:(NodeStylesModel*)nsm - andEdgeStylesModel:(EdgeStylesModel*)esm { - self = [super init]; - - if (self) { - window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - g_object_ref_sink (window); - gtk_window_set_title (GTK_WINDOW (window), "Context"); - gtk_window_set_role (GTK_WINDOW (window), "context"); - gtk_window_set_type_hint (GTK_WINDOW (window), - GDK_WINDOW_TYPE_HINT_UTILITY); - gtk_window_set_default_size (GTK_WINDOW (window), 200, 500); - g_signal_connect (G_OBJECT (window), - "delete-event", - G_CALLBACK (props_window_delete_event_cb), - self); - - layout = gtk_vbox_new (FALSE, 3); - g_object_ref_sink (layout); - gtk_widget_show (layout); - gtk_container_set_border_width (GTK_CONTAINER (layout), 6); - - gtk_container_add (GTK_CONTAINER (window), layout); - - propsPane = [[PropertiesPane alloc] init]; - gtk_box_pack_start (GTK_BOX (layout), [propsPane gtkWidget], - TRUE, TRUE, 0); - - GtkWidget *sep = gtk_hseparator_new (); - gtk_widget_show (sep); - gtk_box_pack_start (GTK_BOX (layout), sep, - FALSE, FALSE, 0); - - selPane = [[SelectionPane alloc] initWithNodeStylesModel:nsm - andEdgeStylesModel:esm]; - gtk_box_pack_start (GTK_BOX (layout), [selPane gtkWidget], - FALSE, FALSE, 0); - - // hack to position the context window somewhere sensible - // (upper right) - gtk_window_parse_geometry (GTK_WINDOW (window), "-0+0"); - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - g_object_unref (layout); - g_object_unref (window); - - [propsPane release]; - - [super dealloc]; -} - -- (TikzDocument*) document { - return [propsPane document]; -} - -- (void) setDocument:(TikzDocument*)doc { - [propsPane setDocument:doc]; - [selPane setDocument:doc]; -} - -- (BOOL) visible { - return gtk_widget_get_visible (window); -} - -- (void) setVisible:(BOOL)visible { - gtk_widget_set_visible (window, visible); -} - -- (void) present { - gtk_window_present (GTK_WINDOW (window)); -} - -- (void) attachToWindow:(Window*)parent { - utility_window_attach (GTK_WINDOW (window), [parent gtkWindow]); -} - -- (void) loadConfiguration:(Configuration*)config { - [propsPane loadConfiguration:config]; - [selPane loadConfiguration:config]; - - if ([config hasGroup:@"ContextWindow"]) { - tz_restore_window (GTK_WINDOW (window), - [config integerEntry:@"x" inGroup:@"ContextWindow"], - [config integerEntry:@"y" inGroup:@"ContextWindow"], - [config integerEntry:@"w" inGroup:@"ContextWindow"], - [config integerEntry:@"h" inGroup:@"ContextWindow"]); - } - [self setVisible:[config booleanEntry:@"visible" - inGroup:@"ContextWindow" - withDefault:YES]]; -} - -- (void) saveConfiguration:(Configuration*)config { - gint x, y, w, h; - - gtk_window_get_position (GTK_WINDOW (window), &x, &y); - gtk_window_get_size (GTK_WINDOW (window), &w, &h); - - [config setIntegerEntry:@"x" inGroup:@"ContextWindow" value:x]; - [config setIntegerEntry:@"y" inGroup:@"ContextWindow" value:y]; - [config setIntegerEntry:@"w" inGroup:@"ContextWindow" value:w]; - [config setIntegerEntry:@"h" inGroup:@"ContextWindow" value:h]; - [config setBooleanEntry:@"visible" - inGroup:@"ContextWindow" - value:[self visible]]; - - [propsPane saveConfiguration:config]; - [selPane saveConfiguration:config]; -} - -@end - -static gboolean props_window_delete_event_cb (GtkWidget *widget, GdkEvent *event, ContextWindow *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window setVisible:NO]; - [pool drain]; - return TRUE; -} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/CreateEdgeTool.h b/tikzit-1/src/gtk/CreateEdgeTool.h deleted file mode 100644 index d33efce..0000000 --- a/tikzit-1/src/gtk/CreateEdgeTool.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "Tool.h" - -@class EdgeStyle; -@class EdgeStylesModel; -@class EdgeStyleSelector; -@class Node; -@class StyleManager; - -@interface CreateEdgeTool : NSObject { - GraphRenderer *renderer; - EdgeStyleSelector *stylePicker; - GtkWidget *configWidget; - Node *sourceNode; - NSPoint sourceNodeScreenPoint; - NSPoint halfEdgeEnd; -} - -@property (retain) EdgeStyle *activeStyle; - -+ (id) toolWithStyleManager:(StyleManager*)sm; -- (id) initWithStyleManager:(StyleManager*)sm; -+ (id) toolWithEdgeStylesModel:(EdgeStylesModel*)esm; -- (id) initWithEdgeStylesModel:(EdgeStylesModel*)esm; -@end - - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/CreateEdgeTool.m b/tikzit-1/src/gtk/CreateEdgeTool.m deleted file mode 100644 index f3fb2c0..0000000 --- a/tikzit-1/src/gtk/CreateEdgeTool.m +++ /dev/null @@ -1,226 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "CreateEdgeTool.h" - -#import "Configuration.h" -#import "EdgeStyleSelector.h" -#import "EdgeStylesModel.h" -#import "GraphRenderer.h" -#import "TikzDocument.h" -#import "tzstockitems.h" - -static void clear_style_button_cb (GtkButton *widget, - EdgeStyleSelector *selector); - -@implementation CreateEdgeTool -- (NSString*) name { return @"Create Edge"; } -- (const gchar*) stockId { return TIKZIT_STOCK_CREATE_EDGE; } -- (NSString*) helpText { return @"Create new edges"; } -- (NSString*) shortcut { return @"e"; } -@synthesize activeRenderer=renderer; -@synthesize configurationWidget=configWidget; - -+ (id) toolWithStyleManager:(StyleManager*)sm { - return [[[self alloc] initWithStyleManager:sm] autorelease]; -} - -+ (id) toolWithEdgeStylesModel:(EdgeStylesModel*)esm { - return [[[self alloc] initWithEdgeStylesModel:esm] autorelease]; -} - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithStyleManager:(StyleManager*)sm { - return [self initWithEdgeStylesModel:[EdgeStylesModel modelWithStyleManager:sm]]; -} - -- (id) initWithEdgeStylesModel:(EdgeStylesModel*)esm { - self = [super init]; - - if (self) { - stylePicker = [[EdgeStyleSelector alloc] initWithModel:esm]; - - configWidget = gtk_vbox_new (FALSE, 0); - g_object_ref_sink (configWidget); - - GtkWidget *label = gtk_label_new ("Edge style:"); - gtk_widget_show (label); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_box_pack_start (GTK_BOX (configWidget), - label, - FALSE, - FALSE, - 0); - - GtkWidget *selWindow = gtk_scrolled_window_new (NULL, NULL); - gtk_widget_show (selWindow); - gtk_container_add (GTK_CONTAINER (selWindow), - [stylePicker widget]); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (selWindow), - GTK_POLICY_NEVER, - GTK_POLICY_AUTOMATIC); - gtk_widget_show ([stylePicker widget]); - - GtkWidget *selectorFrame = gtk_frame_new (NULL); - gtk_widget_show (selectorFrame); - gtk_box_pack_start (GTK_BOX (configWidget), - selectorFrame, - TRUE, - TRUE, - 0); - gtk_container_add (GTK_CONTAINER (selectorFrame), - selWindow); - - GtkWidget *button = gtk_button_new_with_label ("No style"); - gtk_widget_show (button); - gtk_box_pack_start (GTK_BOX (configWidget), - button, - FALSE, - FALSE, - 0); - g_signal_connect (G_OBJECT (button), - "clicked", - G_CALLBACK (clear_style_button_cb), - stylePicker); - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - [renderer release]; - [stylePicker release]; - [sourceNode release]; - - g_object_unref (G_OBJECT (configWidget)); - - [super dealloc]; -} - -- (EdgeStyle*) activeStyle { - return [stylePicker selectedStyle]; -} - -- (void) setActiveStyle:(EdgeStyle*)style { - return [stylePicker setSelectedStyle:style]; -} - -- (void) invalidateHalfEdge { - NSRect invRect = NSRectAroundPoints(sourceNodeScreenPoint, halfEdgeEnd); - [renderer invalidateRect:NSInsetRect (invRect, -2.0f, -2.0f)]; -} - -- (void) mousePressAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { - if (button != LeftButton) - return; - - sourceNode = [renderer anyNodeAt:pos]; - if (sourceNode != nil) { - Transformer *transformer = [[renderer surface] transformer]; - sourceNodeScreenPoint = [transformer toScreen:[sourceNode point]]; - halfEdgeEnd = pos; - [renderer setNode:sourceNode highlighted:YES]; - } -} - -- (void) mouseMoveTo:(NSPoint)pos withButtons:(MouseButton)buttons andMask:(InputMask)mask { - if (!(buttons & LeftButton)) - return; - if (sourceNode == nil) - return; - - [self invalidateHalfEdge]; - - [renderer clearHighlightedNodes]; - [renderer setNode:sourceNode highlighted:YES]; - halfEdgeEnd = pos; - Node *targ = [renderer anyNodeAt:pos]; - if (targ != nil) { - [renderer setNode:targ highlighted:YES]; - } - - [self invalidateHalfEdge]; -} - -- (void) mouseReleaseAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { - if (button != LeftButton) - return; - if (sourceNode == nil) - return; - - [renderer clearHighlightedNodes]; - [self invalidateHalfEdge]; - - Node *targ = [renderer anyNodeAt:pos]; - if (targ != nil) { - Edge *edge = [Edge edgeWithSource:sourceNode andTarget:targ]; - [edge setStyle:[self activeStyle]]; - [[renderer document] addEdge:edge]; - [renderer invalidateEdge:edge]; - } - - sourceNode = nil; -} - -- (void) renderWithContext:(id)context onSurface:(id)surface { - if (sourceNode == nil) { - return; - } - [context saveState]; - - [context setLineWidth:1.0]; - [context startPath]; - [context moveTo:sourceNodeScreenPoint]; - [context lineTo:halfEdgeEnd]; - [context strokePathWithColor:MakeRColor (0, 0, 0, 0.5)]; - - [context restoreState]; -} - -- (StyleManager*) styleManager { - return [[stylePicker model] styleManager]; -} - -- (void) loadConfiguration:(Configuration*)config { - NSString *styleName = [config stringEntry:@"ActiveStyle" - inGroup:@"CreateEdgeTool" - withDefault:nil]; - [self setActiveStyle:[[self styleManager] edgeStyleForName:styleName]]; -} - -- (void) saveConfiguration:(Configuration*)config { - [config setStringEntry:@"ActiveStyle" - inGroup:@"CreateEdgeTool" - value:[[self activeStyle] name]]; -} -@end - -static void clear_style_button_cb (GtkButton *widget, - EdgeStyleSelector *selector) -{ - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [selector setSelectedStyle:nil]; - [pool drain]; -} - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/CreateNodeTool.h b/tikzit-1/src/gtk/CreateNodeTool.h deleted file mode 100644 index 94d6b31..0000000 --- a/tikzit-1/src/gtk/CreateNodeTool.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import -#import "Tool.h" - -@class NodeStyle; -@class NodeStyleSelector; -@class NodeStylesModel; -@class StyleManager; - -@interface CreateNodeTool : NSObject { - GraphRenderer *renderer; - NodeStyleSelector *stylePicker; - GtkWidget *configWidget; -} - -@property (retain) NodeStyle *activeStyle; - -+ (id) toolWithStyleManager:(StyleManager*)sm; -- (id) initWithStyleManager:(StyleManager*)sm; -+ (id) toolWithNodeStylesModel:(NodeStylesModel*)nsm; -- (id) initWithNodeStylesModel:(NodeStylesModel*)nsm; -@end - - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/CreateNodeTool.m b/tikzit-1/src/gtk/CreateNodeTool.m deleted file mode 100644 index 77b24f0..0000000 --- a/tikzit-1/src/gtk/CreateNodeTool.m +++ /dev/null @@ -1,169 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "CreateNodeTool.h" - -#import "Configuration.h" -#import "GraphRenderer.h" -#import "NodeStyleSelector.h" -#import "NodeStylesModel.h" -#import "TikzDocument.h" -#import "tzstockitems.h" - -static void clear_style_button_cb (GtkButton *widget, - NodeStyleSelector *selector); - -@implementation CreateNodeTool -- (NSString*) name { return @"Create Node"; } -- (const gchar*) stockId { return TIKZIT_STOCK_CREATE_NODE; } -- (NSString*) helpText { return @"Create new nodes"; } -- (NSString*) shortcut { return @"n"; } -@synthesize activeRenderer=renderer; -@synthesize configurationWidget=configWidget; - -+ (id) toolWithStyleManager:(StyleManager*)sm { - return [[[self alloc] initWithStyleManager:sm] autorelease]; -} - -+ (id) toolWithNodeStylesModel:(NodeStylesModel*)nsm { - return [[[self alloc] initWithNodeStylesModel:nsm] autorelease]; -} - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithStyleManager:(StyleManager*)sm { - return [self initWithNodeStylesModel:[NodeStylesModel modelWithStyleManager:sm]]; -} - -- (id) initWithNodeStylesModel:(NodeStylesModel*)nsm { - self = [super init]; - - if (self) { - stylePicker = [[NodeStyleSelector alloc] initWithModel:nsm]; - - configWidget = gtk_vbox_new (FALSE, 0); - g_object_ref_sink (configWidget); - - GtkWidget *label = gtk_label_new ("Node style:"); - gtk_widget_show (label); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_box_pack_start (GTK_BOX (configWidget), - label, - FALSE, - FALSE, - 0); - - GtkWidget *selWindow = gtk_scrolled_window_new (NULL, NULL); - gtk_widget_show (selWindow); - gtk_container_add (GTK_CONTAINER (selWindow), - [stylePicker widget]); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (selWindow), - GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); - gtk_widget_show ([stylePicker widget]); - - GtkWidget *selectorFrame = gtk_frame_new (NULL); - gtk_widget_show (selectorFrame); - gtk_box_pack_start (GTK_BOX (configWidget), - selectorFrame, - TRUE, - TRUE, - 0); - gtk_container_add (GTK_CONTAINER (selectorFrame), - selWindow); - - GtkWidget *button = gtk_button_new_with_label ("No style"); - gtk_widget_show (button); - gtk_box_pack_start (GTK_BOX (configWidget), - button, - FALSE, - FALSE, - 0); - g_signal_connect (G_OBJECT (button), - "clicked", - G_CALLBACK (clear_style_button_cb), - stylePicker); - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - [renderer release]; - [stylePicker release]; - - g_object_unref (G_OBJECT (configWidget)); - - [super dealloc]; -} - -- (NodeStyle*) activeStyle { - return [stylePicker selectedStyle]; -} - -- (void) setActiveStyle:(NodeStyle*)style { - return [stylePicker setSelectedStyle:style]; -} - -// FIXME: create node on press, and drag it around? -- (void) mousePressAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask {} - -- (void) mouseReleaseAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { - if (button != LeftButton) - return; - - Transformer *transformer = [renderer transformer]; - NSPoint nodePoint = [transformer fromScreen:[[renderer grid] snapScreenPoint:pos]]; - Node *node = [Node nodeWithPoint:nodePoint]; - [node setStyle:[self activeStyle]]; - [[renderer document] addNode:node]; -} - -- (void) renderWithContext:(id)context onSurface:(id)surface {} - -- (StyleManager*) styleManager { - return [[stylePicker model] styleManager]; -} - -- (void) loadConfiguration:(Configuration*)config { - NSString *styleName = [config stringEntry:@"ActiveStyle" - inGroup:@"CreateNodeTool" - withDefault:nil]; - [self setActiveStyle:[[self styleManager] nodeStyleForName:styleName]]; -} - -- (void) saveConfiguration:(Configuration*)config { - [config setStringEntry:@"ActiveStyle" - inGroup:@"CreateNodeTool" - value:[[self activeStyle] name]]; -} -@end - -static void clear_style_button_cb (GtkButton *widget, - NodeStyleSelector *selector) -{ - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [selector setSelectedStyle:nil]; - [pool drain]; -} - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/DocumentContext.h b/tikzit-1/src/gtk/DocumentContext.h deleted file mode 100644 index e4c1065..0000000 --- a/tikzit-1/src/gtk/DocumentContext.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" - -@class TikzDocument; - -@interface DocumentContext { - TikzDocument *document; - GraphRenderer *renderSurface; -} - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/Edge+Render.h b/tikzit-1/src/gtk/Edge+Render.h deleted file mode 100644 index e88b28a..0000000 --- a/tikzit-1/src/gtk/Edge+Render.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "Edge.h" -#import "RenderContext.h" -#import "Surface.h" - -@interface Edge (Render) - -+ (float) controlPointRadius; -- (void) renderControlsInContext:(id)context withTransformer:(Transformer*)transformer; -- (void) renderBasicEdgeInContext:(id)context withTransformer:(Transformer*)t selected:(BOOL)selected; -- (void) renderToSurface:(id)surface withContext:(id)context selected:(BOOL)selected; -- (NSRect) renderedBoundsWithTransformer:(Transformer*)t whenSelected:(BOOL)selected; -- (BOOL) hitByPoint:(NSPoint)p onSurface:(id)surface withFuzz:(float)fuzz; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/Edge+Render.m b/tikzit-1/src/gtk/Edge+Render.m deleted file mode 100644 index 3cc2a14..0000000 --- a/tikzit-1/src/gtk/Edge+Render.m +++ /dev/null @@ -1,267 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * Copyright 2010 Chris Heunen - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "Edge+Render.h" -#import "Node+Render.h" -#import "../common/util.h" - -static const float edgeWidth = 2.0; -static const float cpRadius = 3.0; -static const float cpLineWidth = 1.0; - -@implementation Edge (Render) - -+ (float) controlPointRadius { - return cpRadius; -} - -- (float) controlDistance { - const float dx = (targ.x - src.x); - const float dy = (targ.y - src.y); - if (dx == 0 && dy == 0) { - return weight; - } else { - return NSDistanceBetweenPoints(src, targ) * weight; - } -} - -- (void) renderControlsInContext:(id)context withTransformer:(Transformer*)transformer { - [context saveState]; - - [self updateControls]; - - NSPoint c_source = [transformer toScreen:src]; - NSPoint c_target = [transformer toScreen:targ]; - NSPoint c_mid = [transformer toScreen:mid]; - - const float dx = (c_target.x - c_source.x); - const float dy = (c_target.y - c_source.y); - - [context setLineWidth:cpLineWidth]; - RColor fillColor = MakeRColor (1.0, 1.0, 1.0, 0.5); - - // draw a circle at the mid point - [context startPath]; - [context circleAt:c_mid withRadius:cpRadius]; - [context strokePathWithColor:MakeSolidRColor(0, 0, 1) andFillWithColor:fillColor]; - - //[context setAntialiasMode:AntialiasDisabled]; - - // size of control circles - float c_dist = 0.0f; - if (dx == 0 && dy == 0) { - c_dist = [transformer scaleToScreen:weight]; - } else { - c_dist = NSDistanceBetweenPoints(c_source, c_target) * weight; - } - - // basic bend is blue, in-out is green - RColor controlTrackColor; - if ([self bendMode] == EdgeBendModeBasic) { - controlTrackColor = MakeRColor (0.0, 0.0, 1.0, 0.4); - } else { - controlTrackColor = MakeRColor (0.0, 0.7, 0.0, 0.4); - } - - [context startPath]; - [context circleAt:c_source withRadius:c_dist]; - if (dx != 0 || dy != 0) { - [context circleAt:c_target withRadius:c_dist]; - } - [context strokePathWithColor:controlTrackColor]; - - RColor handleColor = MakeRColor (1.0, 0.0, 1.0, 0.6); - if ([self bendMode] == EdgeBendModeBasic) { - if (bend % 45 != 0) { - handleColor = MakeRColor (0.0, 0.0, 0.1, 0.4); - } - } else if ([self bendMode] == EdgeBendModeInOut) { - if (outAngle % 45 != 0) { - handleColor = MakeRColor (0.0, 0.7, 0.0, 0.4); - } - } - - NSPoint c_cp1 = [transformer toScreen:cp1]; - [context moveTo:c_source]; - [context lineTo:c_cp1]; - [context circleAt:c_cp1 withRadius:cpRadius]; - [context strokePathWithColor:handleColor]; - - if ([self bendMode] == EdgeBendModeInOut) { - // recalculate color based on inAngle - if (inAngle % 45 == 0) { - handleColor = MakeRColor (1.0, 0.0, 1.0, 0.6); - } else { - handleColor = MakeRColor (0.0, 0.7, 0.0, 0.4); - } - } - - NSPoint c_cp2 = [transformer toScreen:cp2]; - [context moveTo:c_target]; - [context lineTo:c_cp2]; - [context circleAt:c_cp2 withRadius:cpRadius]; - [context strokePathWithColor:handleColor]; - - [context restoreState]; -} - -- (void) renderArrowStrokePathInContext:(id)context withTransformer:(Transformer*)transformer color:(RColor)color { - - if ([self style] != nil) { - switch ([[self style] headStyle]) { - case AH_None: - break; - case AH_Plain: - [context startPath]; - [context moveTo:[transformer toScreen:[self leftHeadNormal]]]; - [context lineTo:[transformer toScreen:head]]; - [context lineTo:[transformer toScreen:[self rightHeadNormal]]]; - [context strokePathWithColor:color]; - break; - case AH_Latex: - [context startPath]; - [context moveTo:[transformer toScreen:[self leftHeadNormal]]]; - [context lineTo:[transformer toScreen:head]]; - [context lineTo:[transformer toScreen:[self rightHeadNormal]]]; - [context closeSubPath]; - [context strokePathWithColor:color andFillWithColor:color]; - break; - } - switch ([[self style] tailStyle]) { - case AH_None: - break; - case AH_Plain: - [context startPath]; - [context moveTo:[transformer toScreen:[self leftTailNormal]]]; - [context lineTo:[transformer toScreen:tail]]; - [context lineTo:[transformer toScreen:[self rightTailNormal]]]; - [context strokePathWithColor:color]; - break; - case AH_Latex: - [context startPath]; - [context moveTo:[transformer toScreen:[self leftTailNormal]]]; - [context lineTo:[transformer toScreen:tail]]; - [context lineTo:[transformer toScreen:[self rightTailNormal]]]; - [context closeSubPath]; - [context strokePathWithColor:color andFillWithColor:color]; - break; - } - } -} - -- (void) createStrokePathInContext:(id)context withTransformer:(Transformer*)transformer { - NSPoint c_tail = [transformer toScreen:tail]; - NSPoint c_cp1 = [transformer toScreen:cp1]; - NSPoint c_cp2 = [transformer toScreen:cp2]; - NSPoint c_head = [transformer toScreen:head]; - - [context startPath]; - [context moveTo:c_tail]; - [context curveTo:c_head withCp1:c_cp1 andCp2:c_cp2]; - - if ([self style] != nil) { - // draw edge decoration - switch ([[self style] decorationStyle]) { - case ED_None: - break; - case ED_Tick: - [context moveTo:[transformer toScreen:[self leftNormal]]]; - [context lineTo:[transformer toScreen:[self rightNormal]]]; - break; - case ED_Arrow: - [context moveTo:[transformer toScreen:[self leftNormal]]]; - [context lineTo:[transformer toScreen:[self midTan]]]; - [context lineTo:[transformer toScreen:[self rightNormal]]]; - break; - } - - } -} - -- (RColor) color { - if (style) { - return [[style colorRGB] rColor]; - } else { - return BlackRColor; - } -} - -- (void) renderBasicEdgeInContext:(id)context withTransformer:(Transformer*)t selected:(BOOL)selected { - [self updateControls]; - [context saveState]; - - const CGFloat lineWidth = style ? [style thickness] : edgeWidth; - [context setLineWidth:lineWidth]; - RColor color = [self color]; - if (selected) { - color.alpha = 0.5; - } - - [self createStrokePathInContext:context withTransformer:t]; - [context strokePathWithColor:color]; - - [self renderArrowStrokePathInContext:context withTransformer:t color:color]; - - [context restoreState]; -} - -- (void) renderToSurface:(id )surface withContext:(id)context selected:(BOOL)selected { - [self renderBasicEdgeInContext:context withTransformer:[surface transformer] selected:selected]; - - if (selected) { - [self renderControlsInContext:context withTransformer:[surface transformer]]; - } - - if ([self hasEdgeNode]) { - NSPoint labelPt = [[surface transformer] toScreen:[self mid]]; - [[self edgeNode] renderLabelAt:labelPt - withContext:context]; - } -} - -- (NSRect) renderedBoundsWithTransformer:(Transformer*)t whenSelected:(BOOL)selected { - if (selected) { - float c_dist = [self controlDistance] + cpRadius; // include handle - NSRect cp1circ = NSMakeRect (head.x - c_dist, head.y - c_dist, 2*c_dist, 2*c_dist); - NSRect cp2circ = NSMakeRect (tail.x - c_dist, tail.y - c_dist, 2*c_dist, 2*c_dist); - NSRect rect = NSUnionRect ([self boundingRect], NSUnionRect (cp1circ, cp2circ)); - return [t rectToScreen:rect]; - } else { - return [t rectToScreen:[self boundingRect]]; - } -} - -- (BOOL) hitByPoint:(NSPoint)p onSurface:(id)surface withFuzz:(float)fuzz { - [self updateControls]; - - NSRect boundingRect = [[surface transformer] rectToScreen:[self boundingRect]]; - if (!NSPointInRect(p, NSInsetRect(boundingRect, -fuzz, -fuzz))) { - return NO; - } - - id cr = [surface createRenderContext]; - - [cr setLineWidth:edgeWidth + 2 * fuzz]; - [self createStrokePathInContext:cr withTransformer:[surface transformer]]; - - return [cr strokeIncludesPoint:p]; -} - -@end - -// vim:ft=objc:ts=4:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/EdgeStyle+Gtk.h b/tikzit-1/src/gtk/EdgeStyle+Gtk.h deleted file mode 100644 index 4323593..0000000 --- a/tikzit-1/src/gtk/EdgeStyle+Gtk.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "EdgeStyle.h" -#import - -@interface EdgeStyle (Gtk) - -- (GdkColor) color; -- (void) setColor:(GdkColor)color; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/EdgeStyle+Gtk.m b/tikzit-1/src/gtk/EdgeStyle+Gtk.m deleted file mode 100644 index 886329e..0000000 --- a/tikzit-1/src/gtk/EdgeStyle+Gtk.m +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "EdgeStyle+Gtk.h" -#import "ColorRGB+Gtk.h" - -@implementation EdgeStyle (Gtk) - -- (GdkColor) color { - return [[self colorRGB] gdkColor]; -} - -- (void) setColor:(GdkColor)color { - [self setColorRGB:[ColorRGB colorWithGdkColor:color]]; -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/EdgeStyle+Storage.h b/tikzit-1/src/gtk/EdgeStyle+Storage.h deleted file mode 100644 index 74881f3..0000000 --- a/tikzit-1/src/gtk/EdgeStyle+Storage.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "EdgeStyle.h" -#import "Configuration.h" - -@interface EdgeStyle (Storage) - -- (id) initFromConfigurationGroup:(NSString*)groupName config:(Configuration*)configFile; -- (void) storeToConfigurationGroup:(NSString*)groupName config:(Configuration*)configFile; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/EdgeStyle+Storage.m b/tikzit-1/src/gtk/EdgeStyle+Storage.m deleted file mode 100644 index 45e2a20..0000000 --- a/tikzit-1/src/gtk/EdgeStyle+Storage.m +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "EdgeStyle+Storage.h" -#import "ColorRGB+IntegerListStorage.h" - -@implementation EdgeStyle (Storage) - -- (id) initFromConfigurationGroup:(NSString*)groupName config:(Configuration*)configFile { - self = [self init]; - - if (self) { - [self setName:[configFile stringEntry:@"Name" inGroup:groupName withDefault:name]]; - [self setCategory:[configFile stringEntry:@"Category" inGroup:groupName withDefault:category]]; - headStyle = [configFile integerEntry:@"HeadStyle" inGroup:groupName withDefault:headStyle]; - tailStyle = [configFile integerEntry:@"TailStyle" inGroup:groupName withDefault:tailStyle]; - decorationStyle = [configFile integerEntry:@"DecorationStyle" inGroup:groupName withDefault:decorationStyle]; - thickness = [configFile doubleEntry:@"Thickness" inGroup:groupName withDefault:thickness]; - [self setColorRGB: - [ColorRGB colorFromValueList: - [configFile integerListEntry:@"Color" - inGroup:groupName - withDefault:[colorRGB valueList]]]]; - } - - return self; -} - -- (void) storeToConfigurationGroup:(NSString*)groupName config:(Configuration*)configFile { - [configFile setStringEntry:@"Name" inGroup:groupName value:name]; - [configFile setStringEntry:@"Category" inGroup:groupName value:category]; - [configFile setIntegerEntry:@"HeadStyle" inGroup:groupName value:headStyle]; - [configFile setIntegerEntry:@"TailStyle" inGroup:groupName value:tailStyle]; - [configFile setIntegerEntry:@"DecorationStyle" inGroup:groupName value:decorationStyle]; - [configFile setDoubleEntry:@"Thickness" inGroup:groupName value:thickness]; - [configFile setIntegerListEntry:@"Color" inGroup:groupName value:[[self colorRGB] valueList]]; -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/EdgeStyleEditor.h b/tikzit-1/src/gtk/EdgeStyleEditor.h deleted file mode 100644 index 2224bbb..0000000 --- a/tikzit-1/src/gtk/EdgeStyleEditor.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class EdgeStyle; - -@interface EdgeStyleEditor: NSObject { - EdgeStyle *style; - GtkTable *table; - GtkEntry *nameEdit; - GtkComboBox *decorationCombo; - GtkComboBox *headArrowCombo; - GtkComboBox *tailArrowCombo; - GtkColorButton *colorButton; - GtkWidget *makeColorTexSafeButton; - GtkAdjustment *thicknessAdj; - BOOL blockSignals; -} - -@property (retain) EdgeStyle *style; -@property (readonly) GtkWidget *widget; - -- (id) init; - -- (void) selectNameField; - -@end - -// vim:ft=objc:ts=4:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/EdgeStyleEditor.m b/tikzit-1/src/gtk/EdgeStyleEditor.m deleted file mode 100644 index c7ca8bd..0000000 --- a/tikzit-1/src/gtk/EdgeStyleEditor.m +++ /dev/null @@ -1,499 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "EdgeStyleEditor.h" - -#import "EdgeStyle.h" -#import "EdgeStyle+Gtk.h" -#import "Shape.h" - -#include - -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wpointer-sign" -#import "edgedecdata.m" -#pragma GCC diagnostic pop - -// {{{ Data Types -enum { - DEC_NAME_COL = 0, - DEC_PREVIEW_COL, - DEC_VALUE_COL, - DEC_N_COLS -}; - -struct dec_info { - const gchar *name; - const GdkPixdata *pixdata; - int value; -}; -static struct dec_info ed_entries[] = { - { "None", &ED_none_pixdata, ED_None }, - { "Arrow", &ED_arrow_pixdata, ED_Arrow }, - { "Tick", &ED_tick_pixdata, ED_Tick } -}; -static guint n_ed_entries = G_N_ELEMENTS (ed_entries); -static struct dec_info ah_head_entries[] = { - { "None", &AH_none_pixdata, AH_None }, - { "Plain", &AH_plain_head_pixdata, AH_Plain }, - { "Latex", &AH_latex_head_pixdata, AH_Latex } -}; -static guint n_ah_head_entries = G_N_ELEMENTS (ah_head_entries); -static struct dec_info ah_tail_entries[] = { - { "None", &AH_none_pixdata, AH_None }, - { "Plain", &AH_plain_tail_pixdata, AH_Plain }, - { "Latex", &AH_latex_tail_pixdata, AH_Latex } -}; -static guint n_ah_tail_entries = G_N_ELEMENTS (ah_tail_entries); - -static const guint row_count = 6; - -// }}} -// {{{ Internal interfaces -// {{{ GTK+ Callbacks -static void style_name_edit_changed_cb (GtkEditable *widget, EdgeStyleEditor *editor); -static void decoration_combo_changed_cb (GtkComboBox *widget, EdgeStyleEditor *editor); -static void head_arrow_combo_changed_cb (GtkComboBox *widget, EdgeStyleEditor *editor); -static void tail_arrow_combo_changed_cb (GtkComboBox *widget, EdgeStyleEditor *editor); -static void thickness_adjustment_changed_cb (GtkAdjustment *widget, EdgeStyleEditor *editor); -static void color_changed_cb (GtkColorButton *widget, EdgeStyleEditor *editor); -static void make_color_safe_button_clicked_cb (GtkButton *widget, EdgeStyleEditor *editor); -// }}} -// {{{ Notifications - -@interface EdgeStyleEditor (Notifications) -- (void) nameChangedTo:(NSString*)value; -- (void) edgeDecorationChangedTo:(EdgeDectorationStyle)value; -- (void) headArrowChangedTo:(ArrowHeadStyle)value; -- (void) tailArrowChangedTo:(ArrowHeadStyle)value; -- (void) thicknessChangedTo:(double)value; -- (void) makeColorTexSafe; -- (void) colorChangedTo:(GdkColor)value; -@end - -// }}} -// {{{ Private - -@interface EdgeStyleEditor (Private) -- (void) load:(guint)count decorationStylesFrom:(struct dec_info*)info into:(GtkListStore*)list; -- (void) clearDecCombo:(GtkComboBox*)combo; -- (void) setDecCombo:(GtkComboBox*)combo toValue:(int)value; -@end - -// }}} -// }}} -// {{{ API - -@implementation EdgeStyleEditor - -- (void) _addWidget:(GtkWidget*)w withLabel:(gchar *)label atRow:(guint)row { - NSAssert(row < row_count, @"row_count is wrong!"); - - GtkWidget *l = gtk_label_new (label); - gtk_misc_set_alignment (GTK_MISC (l), 0, 0.5); - gtk_widget_show (l); - gtk_widget_show (w); - - gtk_table_attach (table, l, - 0, 1, row, row+1, // l, r, t, b - GTK_FILL, // x opts - GTK_FILL | GTK_EXPAND, // y opts - 5, // x padding - 0); // y padding - - gtk_table_attach (table, w, - 1, 2, row, row+1, // l, r, t, b - GTK_FILL | GTK_EXPAND, // x opts - GTK_FILL | GTK_EXPAND, // y opts - 0, // x padding - 0); // y padding -} - -- (GtkComboBox*) _createDecComboWithEntries:(struct dec_info*)entries count:(guint)n { - GtkListStore *store = gtk_list_store_new (DEC_N_COLS, G_TYPE_STRING, GDK_TYPE_PIXBUF, G_TYPE_INT); - [self load:n decorationStylesFrom:entries into:store]; - - GtkComboBox *combo = GTK_COMBO_BOX (gtk_combo_box_new_with_model (GTK_TREE_MODEL (store))); - g_object_unref (store); - GtkCellRenderer *cellRend = gtk_cell_renderer_pixbuf_new (); - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), - cellRend, - TRUE); - gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo), cellRend, "pixbuf", DEC_PREVIEW_COL); - g_object_ref_sink (combo); - - return combo; -} - -- (GtkWidget*) _createMakeColorTexSafeButton { - GtkWidget *b = gtk_button_new (); - GtkWidget *icon = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_BUTTON); - gtk_widget_show (icon); - gtk_container_add (GTK_CONTAINER (b), icon); - NSString *ttip = @"The colour is not a predefined TeX colour.\nClick here to choose the nearest TeX-safe colour."; - gtk_widget_set_tooltip_text (b, [ttip UTF8String]); - return b; -} - -- (id) init { - self = [super init]; - - if (self != nil) { - style = nil; - table = GTK_TABLE (gtk_table_new (row_count, 2, FALSE)); - gtk_table_set_col_spacings (table, 6); - gtk_table_set_row_spacings (table, 6); - gtk_widget_set_sensitive (GTK_WIDGET (table), FALSE); - blockSignals = NO; - - /** - * Name - */ - nameEdit = GTK_ENTRY (gtk_entry_new ()); - g_object_ref_sink (nameEdit); - [self _addWidget:GTK_WIDGET (nameEdit) - withLabel:"Name" - atRow:0]; - g_signal_connect (G_OBJECT (nameEdit), - "changed", - G_CALLBACK (style_name_edit_changed_cb), - self); - - - /** - * Edge decoration style - */ - decorationCombo = [self _createDecComboWithEntries:ed_entries count:n_ed_entries]; - [self _addWidget:GTK_WIDGET (decorationCombo) - withLabel:"Decoration" - atRow:1]; - g_signal_connect (G_OBJECT (decorationCombo), - "changed", - G_CALLBACK (decoration_combo_changed_cb), - self); - - - /** - * Head arrow style - */ - headArrowCombo = [self _createDecComboWithEntries:ah_head_entries count:n_ah_head_entries]; - [self _addWidget:GTK_WIDGET (headArrowCombo) - withLabel:"Arrow head" - atRow:2]; - g_signal_connect (G_OBJECT (headArrowCombo), - "changed", - G_CALLBACK (head_arrow_combo_changed_cb), - self); - - - /** - * Tail arrow style - */ - tailArrowCombo = [self _createDecComboWithEntries:ah_tail_entries count:n_ah_tail_entries]; - [self _addWidget:GTK_WIDGET (tailArrowCombo) - withLabel:"Arrow tail" - atRow:3]; - g_signal_connect (G_OBJECT (tailArrowCombo), - "changed", - G_CALLBACK (tail_arrow_combo_changed_cb), - self); - - - /** - * Colour - */ - GtkWidget *colorBox = gtk_hbox_new (FALSE, 0); - [self _addWidget:colorBox - withLabel:"Colour" - atRow:4]; - colorButton = GTK_COLOR_BUTTON (gtk_color_button_new ()); - g_object_ref_sink (colorButton); - gtk_widget_show (GTK_WIDGET (colorButton)); - gtk_box_pack_start (GTK_BOX (colorBox), GTK_WIDGET (colorButton), - FALSE, FALSE, 0); - makeColorTexSafeButton = [self _createMakeColorTexSafeButton]; - g_object_ref_sink (makeColorTexSafeButton); - gtk_box_pack_start (GTK_BOX (colorBox), makeColorTexSafeButton, - FALSE, FALSE, 0); - g_signal_connect (G_OBJECT (colorButton), - "color-set", - G_CALLBACK (color_changed_cb), - self); - g_signal_connect (G_OBJECT (makeColorTexSafeButton), - "clicked", - G_CALLBACK (make_color_safe_button_clicked_cb), - self); - - - /** - * Thickness - */ - thicknessAdj = GTK_ADJUSTMENT (gtk_adjustment_new ( - 1.0, // value - 0.0, // lower - 50.0, // upper - 0.20, // step - 1.0, // page - 0.0)); // (irrelevant) - g_object_ref_sink (thicknessAdj); - GtkWidget *scaleSpin = gtk_spin_button_new (thicknessAdj, 0.0, 2); - [self _addWidget:scaleSpin - withLabel:"Thickness" - atRow:5]; - g_signal_connect (G_OBJECT (thicknessAdj), - "value-changed", - G_CALLBACK (thickness_adjustment_changed_cb), - self); - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - g_object_unref (nameEdit); - g_object_unref (decorationCombo); - g_object_unref (colorButton); - g_object_unref (makeColorTexSafeButton); - g_object_unref (thicknessAdj); - g_object_unref (table); - [style release]; - - [super dealloc]; -} - -- (EdgeStyle*) style { - return style; -} - -- (void) setStyle:(EdgeStyle*)s { - blockSignals = YES; - EdgeStyle *oldStyle = style; - style = [s retain]; - - if (style != nil) { - gtk_widget_set_sensitive (GTK_WIDGET (table), TRUE); - - gtk_entry_set_text(nameEdit, [[style name] UTF8String]); - - [self setDecCombo:decorationCombo toValue:[style decorationStyle]]; - [self setDecCombo:headArrowCombo toValue:[style headStyle]]; - [self setDecCombo:tailArrowCombo toValue:[style tailStyle]]; - - GdkColor c = [style color]; - gtk_color_button_set_color(colorButton, &c); - gtk_widget_set_visible (makeColorTexSafeButton, ([[style colorRGB] name] == nil)); - - gtk_adjustment_set_value(thicknessAdj, [style thickness]); - } else { - gtk_entry_set_text(nameEdit, ""); - [self clearDecCombo:decorationCombo]; - [self clearDecCombo:headArrowCombo]; - [self clearDecCombo:tailArrowCombo]; - gtk_widget_set_visible (makeColorTexSafeButton, FALSE); - gtk_adjustment_set_value(thicknessAdj, 1.0); - gtk_widget_set_sensitive (GTK_WIDGET (table), FALSE); - } - - [oldStyle release]; - blockSignals = NO; -} - -- (GtkWidget*) widget { - return GTK_WIDGET (table); -} - -- (void) selectNameField { - gtk_widget_grab_focus (GTK_WIDGET (nameEdit)); - gtk_editable_select_region (GTK_EDITABLE (nameEdit), 0, -1); -} - -@end - -// }}} -// {{{ Notifications - -@implementation EdgeStyleEditor (Notifications) -- (void) nameChangedTo:(NSString*)value { - [style setName:value]; -} - -- (void) edgeDecorationChangedTo:(EdgeDectorationStyle)value { - [style setDecorationStyle:value]; -} - -- (void) headArrowChangedTo:(ArrowHeadStyle)value { - [style setHeadStyle:value]; -} - -- (void) tailArrowChangedTo:(ArrowHeadStyle)value { - [style setTailStyle:value]; -} - -- (void) thicknessChangedTo:(double)value { - [style setThickness:(float)value]; -} - -- (void) colorChangedTo:(GdkColor)value { - [style setColor:value]; - gtk_widget_set_visible (makeColorTexSafeButton, - [[style colorRGB] name] == nil); -} - -- (void) makeColorTexSafe { - if (style != nil) { - [[style colorRGB] setToClosestHashed]; - GdkColor color = [style color]; - gtk_color_button_set_color(colorButton, &color); - gtk_widget_set_visible (makeColorTexSafeButton, FALSE); - } -} -@end - -// }}} -// {{{ Private - -@implementation EdgeStyleEditor (Private) -- (BOOL) signalsBlocked { return blockSignals; } - -- (void) load:(guint)count decorationStylesFrom:(struct dec_info*)info into:(GtkListStore*)list { - GtkTreeIter iter; - - for (guint i = 0; i < count; ++i) { - GdkPixbuf *buf = gdk_pixbuf_from_pixdata (info[i].pixdata, FALSE, NULL); - gtk_list_store_append (list, &iter); - gtk_list_store_set (list, &iter, - DEC_NAME_COL, info[i].name, - DEC_PREVIEW_COL, buf, - DEC_VALUE_COL, info[i].value, - -1); - g_object_unref (buf); - } -} - -- (void) clearDecCombo:(GtkComboBox*)combo { - gtk_combo_box_set_active (combo, -1); -} - -- (void) setDecCombo:(GtkComboBox*)combo toValue:(int)value { - GtkTreeModel *model = gtk_combo_box_get_model (combo); - GtkTreeIter iter; - if (gtk_tree_model_get_iter_first (model, &iter)) { - do { - int rowValue; - gtk_tree_model_get (model, &iter, DEC_VALUE_COL, &rowValue, -1); - if (rowValue == value) { - gtk_combo_box_set_active_iter (combo, &iter); - return; - } - } while (gtk_tree_model_iter_next (model, &iter)); - } -} -@end - -// }}} -// {{{ GTK+ callbacks - -static void style_name_edit_changed_cb (GtkEditable *widget, EdgeStyleEditor *editor) { - if ([editor signalsBlocked]) - return; - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - const gchar *contents = gtk_entry_get_text (GTK_ENTRY (widget)); - [editor nameChangedTo:[NSString stringWithUTF8String:contents]]; - - [pool drain]; -} - -static void decoration_combo_changed_cb (GtkComboBox *widget, EdgeStyleEditor *editor) { - if ([editor signalsBlocked]) - return; - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - GtkTreeIter iter; - gtk_combo_box_get_active_iter (widget, &iter); - EdgeDectorationStyle dec = ED_None; - gtk_tree_model_get (gtk_combo_box_get_model (widget), &iter, DEC_VALUE_COL, &dec, -1); - [editor edgeDecorationChangedTo:dec]; - - [pool drain]; -} - -static void head_arrow_combo_changed_cb (GtkComboBox *widget, EdgeStyleEditor *editor) { - if ([editor signalsBlocked]) - return; - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - GtkTreeIter iter; - gtk_combo_box_get_active_iter (widget, &iter); - ArrowHeadStyle dec = AH_None; - gtk_tree_model_get (gtk_combo_box_get_model (widget), &iter, DEC_VALUE_COL, &dec, -1); - [editor headArrowChangedTo:dec]; - - [pool drain]; -} - -static void tail_arrow_combo_changed_cb (GtkComboBox *widget, EdgeStyleEditor *editor) { - if ([editor signalsBlocked]) - return; - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - GtkTreeIter iter; - gtk_combo_box_get_active_iter (widget, &iter); - ArrowHeadStyle dec = AH_None; - gtk_tree_model_get (gtk_combo_box_get_model (widget), &iter, DEC_VALUE_COL, &dec, -1); - [editor tailArrowChangedTo:dec]; - - [pool drain]; -} - -static void thickness_adjustment_changed_cb (GtkAdjustment *adj, EdgeStyleEditor *editor) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor thicknessChangedTo:gtk_adjustment_get_value (adj)]; - [pool drain]; -} - -static void color_changed_cb (GtkColorButton *widget, EdgeStyleEditor *editor) { - if ([editor signalsBlocked]) - return; - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - GdkColor color; - gtk_color_button_get_color (widget, &color); - [editor colorChangedTo:color]; - - [pool drain]; -} - -static void make_color_safe_button_clicked_cb (GtkButton *widget, EdgeStyleEditor *editor) { - if ([editor signalsBlocked]) - return; - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor makeColorTexSafe]; - [pool drain]; -} - -// }}} - -// vim:ft=objc:ts=4:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/EdgeStyleSelector.h b/tikzit-1/src/gtk/EdgeStyleSelector.h deleted file mode 100644 index 904bd93..0000000 --- a/tikzit-1/src/gtk/EdgeStyleSelector.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class EdgeStyle; -@class EdgeStylesModel; -@class StyleManager; - -@interface EdgeStyleSelector: NSObject { - EdgeStylesModel *model; - GtkTreeView *view; -} - -/*! - @property widget - @brief The GTK widget - */ -@property (readonly) GtkWidget *widget; - -/*! - @property model - @brief The model to use. - */ -@property (retain) EdgeStylesModel *model; - -/*! - @property selectedStyle - @brief The selected style. - - When this changes, a SelectedStyleChanged notification will be posted - */ -@property (assign) EdgeStyle *selectedStyle; - -/*! - * Initialise with a new model for the given style manager - */ -- (id) initWithStyleManager:(StyleManager*)m; -/*! - * Initialise with the given model - */ -- (id) initWithModel:(EdgeStylesModel*)model; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/EdgeStyleSelector.m b/tikzit-1/src/gtk/EdgeStyleSelector.m deleted file mode 100644 index 6a9db33..0000000 --- a/tikzit-1/src/gtk/EdgeStyleSelector.m +++ /dev/null @@ -1,143 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "EdgeStyleSelector.h" - -#import "EdgeStylesModel.h" - -// {{{ Internal interfaces -static void selection_changed_cb (GtkTreeSelection *sel, EdgeStyleSelector *mgr); -// }}} -// {{{ API - -@implementation EdgeStyleSelector - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithStyleManager:(StyleManager*)m { - return [self initWithModel:[EdgeStylesModel modelWithStyleManager:m]]; -} -- (id) initWithModel:(EdgeStylesModel*)m { - self = [super init]; - - if (self) { - model = [m retain]; - - view = GTK_TREE_VIEW (gtk_tree_view_new_with_model ([m model])); - gtk_tree_view_set_headers_visible (view, FALSE); - g_object_ref (view); - - GtkCellRenderer *renderer; - GtkTreeViewColumn *column; - renderer = gtk_cell_renderer_pixbuf_new (); - column = gtk_tree_view_column_new_with_attributes ( - "Preview", - renderer, - "pixbuf", EDGE_STYLES_ICON_COL, - NULL); - gtk_tree_view_append_column (view, column); - gtk_tree_view_set_tooltip_column (view, EDGE_STYLES_NAME_COL); - - GtkTreeSelection *sel = gtk_tree_view_get_selection (view); - gtk_tree_selection_set_mode (sel, GTK_SELECTION_SINGLE); - - g_signal_connect (G_OBJECT (sel), - "changed", - G_CALLBACK (selection_changed_cb), - self); - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - g_object_unref (view); - [model release]; - - [super dealloc]; -} - -- (EdgeStylesModel*) model { - return model; -} - -- (void) setModel:(EdgeStylesModel*)m { - if (m == model) - return; - - EdgeStylesModel *oldModel = model; - model = [m retain]; - gtk_tree_view_set_model (view, [model model]); - [oldModel release]; -} - -- (GtkWidget*) widget { - return GTK_WIDGET (view); -} - -- (EdgeStyle*) selectedStyle { - GtkTreeSelection *sel = gtk_tree_view_get_selection (view); - GtkTreeIter iter; - - if (!gtk_tree_selection_get_selected (sel, NULL, &iter)) { - return nil; - } - - EdgeStyle *style = nil; - gtk_tree_model_get ([model model], &iter, EDGE_STYLES_PTR_COL, &style, -1); - - return style; -} - -- (void) setSelectedStyle:(EdgeStyle*)style { - GtkTreeSelection *sel = gtk_tree_view_get_selection (view); - - if (style == nil) { - gtk_tree_selection_unselect_all (sel); - return; - } - - GtkTreePath *path = [model pathFromStyle:style]; - if (path) { - gtk_tree_selection_unselect_all (sel); - gtk_tree_selection_select_path (sel, path); - gtk_tree_path_free (path); - } -} -@end - -// }}} -// {{{ GTK+ callbacks - -static void selection_changed_cb (GtkTreeSelection *sel, EdgeStyleSelector *mgr) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - [[NSNotificationCenter defaultCenter] - postNotificationName:@"SelectedStyleChanged" - object:mgr]; - - [pool drain]; -} -// }}} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker - diff --git a/tikzit-1/src/gtk/EdgeStylesModel.h b/tikzit-1/src/gtk/EdgeStylesModel.h deleted file mode 100644 index 1166f92..0000000 --- a/tikzit-1/src/gtk/EdgeStylesModel.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class EdgeStyle; -@class StyleManager; - -enum { - EDGE_STYLES_NAME_COL = 0, - EDGE_STYLES_ICON_COL, - EDGE_STYLES_PTR_COL, - EDGE_STYLES_N_COLS -}; - -@interface EdgeStylesModel: NSObject { - GtkListStore *store; - StyleManager *styleManager; -} - -/*! - @property model - @brief The GTK+ tree model - */ -@property (readonly) GtkTreeModel *model; - -/*! - @property manager - @brief The StyleManager to use. - */ -@property (retain) StyleManager *styleManager; - -/*! - * Initialise with the given style manager - */ -- (id) initWithStyleManager:(StyleManager*)m; - -+ (id) modelWithStyleManager:(StyleManager*)m; - -- (EdgeStyle*) styleFromPath:(GtkTreePath*)path; -- (GtkTreePath*) pathFromStyle:(EdgeStyle*)style; -- (EdgeStyle*) styleFromIter:(GtkTreeIter*)iter; -- (GtkTreeIter*) iterFromStyle:(EdgeStyle*)style; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/EdgeStylesModel.m b/tikzit-1/src/gtk/EdgeStylesModel.m deleted file mode 100644 index 2de57ed..0000000 --- a/tikzit-1/src/gtk/EdgeStylesModel.m +++ /dev/null @@ -1,367 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "EdgeStylesModel.h" - -#import "CairoRenderContext.h" -#import "Edge.h" -#import "Edge+Render.h" -#import "EdgeStyle.h" -#import "Node.h" -#import "StyleManager.h" - -#import "gtkhelpers.h" - -#import - -// {{{ Internal interfaces - -@interface EdgeStylesModel (Notifications) -- (void) edgeStylesReplaced:(NSNotification*)notification; -- (void) edgeStyleAdded:(NSNotification*)notification; -- (void) edgeStyleRemoved:(NSNotification*)notification; -- (void) observeValueForKeyPath:(NSString*)keyPath - ofObject:(id)object - change:(NSDictionary*)change - context:(void*)context; -@end - -@interface EdgeStylesModel (Private) -- (cairo_surface_t*) createEdgeIconSurface; -- (GdkPixbuf*) pixbufOfEdgeInStyle:(EdgeStyle*)style; -- (GdkPixbuf*) pixbufOfEdgeInStyle:(EdgeStyle*)style usingSurface:(cairo_surface_t*)surface; -- (void) addEdgeStyle:(EdgeStyle*)style; -- (void) addEdgeStyle:(EdgeStyle*)style usingSurface:(cairo_surface_t*)surface; -- (void) observeEdgeStyle:(EdgeStyle*)style; -- (void) stopObservingEdgeStyle:(EdgeStyle*)style; -- (void) clearEdgeStylesModel; -- (void) reloadEdgeStyles; -@end - -// }}} -// {{{ API - -@implementation EdgeStylesModel - -+ (id) modelWithStyleManager:(StyleManager*)m { - return [[[self alloc] initWithStyleManager:m] autorelease]; -} - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithStyleManager:(StyleManager*)m { - self = [super init]; - - if (self) { - store = gtk_list_store_new (EDGE_STYLES_N_COLS, - G_TYPE_STRING, - GDK_TYPE_PIXBUF, - G_TYPE_POINTER); - g_object_ref_sink (store); - - [self setStyleManager:m]; - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - [self clearEdgeStylesModel]; - g_object_unref (store); - [styleManager release]; - - [super dealloc]; -} - -- (GtkTreeModel*) model { - return GTK_TREE_MODEL (store); -} - -- (StyleManager*) styleManager { - return styleManager; -} - -- (void) setStyleManager:(StyleManager*)m { - if (m == nil) { - [NSException raise:NSInvalidArgumentException format:@"Style manager cannot be nil"]; - } - [m retain]; - - [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:styleManager]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(edgeStylesReplaced:) - name:@"EdgeStylesReplaced" - object:m]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(edgeStyleAdded:) - name:@"EdgeStyleAdded" - object:m]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(edgeStyleRemoved:) - name:@"EdgeStyleRemoved" - object:m]; - - [styleManager release]; - styleManager = m; - - [self reloadEdgeStyles]; -} - -- (EdgeStyle*) styleFromPath:(GtkTreePath*)path { - GtkTreeIter iter; - gtk_tree_model_get_iter (GTK_TREE_MODEL (store), &iter, path); - EdgeStyle *style = nil; - gtk_tree_model_get (GTK_TREE_MODEL (store), &iter, EDGE_STYLES_PTR_COL, &style, -1); - return style; -} - -- (GtkTreePath*) pathFromStyle:(EdgeStyle*)style { - GtkTreeModel *m = GTK_TREE_MODEL (store); - GtkTreeIter row; - if (gtk_tree_model_get_iter_first (m, &row)) { - do { - EdgeStyle *rowStyle; - gtk_tree_model_get (m, &row, EDGE_STYLES_PTR_COL, &rowStyle, -1); - if (style == rowStyle) { - return gtk_tree_model_get_path (m, &row); - } - } while (gtk_tree_model_iter_next (m, &row)); - } - return NULL; -} - -- (EdgeStyle*) styleFromIter:(GtkTreeIter*)iter { - EdgeStyle *style = nil; - gtk_tree_model_get (GTK_TREE_MODEL (store), iter, EDGE_STYLES_PTR_COL, &style, -1); - return style; -} - -- (GtkTreeIter*) iterFromStyle:(EdgeStyle*)style { - GtkTreeModel *m = GTK_TREE_MODEL (store); - GtkTreeIter row; - if (gtk_tree_model_get_iter_first (m, &row)) { - do { - EdgeStyle *rowStyle; - gtk_tree_model_get (m, &row, EDGE_STYLES_PTR_COL, &rowStyle, -1); - if (style == rowStyle) { - return gtk_tree_iter_copy (&row); - } - } while (gtk_tree_model_iter_next (m, &row)); - } - return NULL; -} -@end - -// }}} -// {{{ Notifications - -@implementation EdgeStylesModel (Notifications) - -- (void) edgeStylesReplaced:(NSNotification*)notification { - [self reloadEdgeStyles]; -} - -- (void) edgeStyleAdded:(NSNotification*)notification { - [self addEdgeStyle:[[notification userInfo] objectForKey:@"style"]]; -} - -- (void) edgeStyleRemoved:(NSNotification*)notification { - EdgeStyle *style = [[notification userInfo] objectForKey:@"style"]; - - GtkTreeModel *model = GTK_TREE_MODEL (store); - GtkTreeIter row; - if (gtk_tree_model_get_iter_first (model, &row)) { - do { - EdgeStyle *rowStyle; - gtk_tree_model_get (model, &row, EDGE_STYLES_PTR_COL, &rowStyle, -1); - if (style == rowStyle) { - gtk_list_store_remove (store, &row); - [self stopObservingEdgeStyle:rowStyle]; - [rowStyle release]; - return; - } - } while (gtk_tree_model_iter_next (model, &row)); - } -} - -- (void) observeValueForKeyPath:(NSString*)keyPath - ofObject:(id)object - change:(NSDictionary*)change - context:(void*)context -{ - if ([object class] != [EdgeStyle class]) - return; - - EdgeStyle *style = object; - - GtkTreeModel *model = GTK_TREE_MODEL (store); - GtkTreeIter row; - if (gtk_tree_model_get_iter_first (model, &row)) { - do { - EdgeStyle *rowStyle; - gtk_tree_model_get (model, &row, EDGE_STYLES_PTR_COL, &rowStyle, -1); - if (style == rowStyle) { - if ([@"name" isEqual:keyPath]) { - gtk_list_store_set (store, &row, EDGE_STYLES_NAME_COL, [[style name] UTF8String], -1); - } else { - GdkPixbuf *pixbuf = [self pixbufOfEdgeInStyle:style]; - gtk_list_store_set (store, &row, EDGE_STYLES_ICON_COL, pixbuf, -1); - g_object_unref (pixbuf); - } - } - } while (gtk_tree_model_iter_next (model, &row)); - } -} -@end - -// }}} -// {{{ Private - -@implementation EdgeStylesModel (Private) -- (cairo_surface_t*) createEdgeIconSurface { - return cairo_image_surface_create (CAIRO_FORMAT_ARGB32, 48, 18); -} - -- (GdkPixbuf*) pixbufOfEdgeInStyle:(EdgeStyle*)style { - cairo_surface_t *surface = [self createEdgeIconSurface]; - GdkPixbuf *pixbuf = [self pixbufOfEdgeInStyle:style usingSurface:surface]; - cairo_surface_destroy (surface); - return pixbuf; -} - -- (GdkPixbuf*) pixbufOfEdgeInStyle:(EdgeStyle*)style usingSurface:(cairo_surface_t*)surface { - Transformer *transformer = [Transformer defaultTransformer]; - [transformer setFlippedAboutXAxis:YES]; - - int width = cairo_image_surface_get_width (surface); - int height = cairo_image_surface_get_height (surface); - NSRect pixbufBounds = NSMakeRect(0.0, 0.0, width, height); - NSRect graphBounds = [transformer rectFromScreen:pixbufBounds]; - - NSPoint start = NSMakePoint (NSMinX (graphBounds) + 0.1f, NSMidY (graphBounds)); - NSPoint end = NSMakePoint (NSMaxX (graphBounds) - 0.1f, NSMidY (graphBounds)); - Node *src = [Node nodeWithPoint:start]; - Node *tgt = [Node nodeWithPoint:end]; - Edge *e = [Edge edgeWithSource:src andTarget:tgt]; - [e setStyle:style]; - - CairoRenderContext *context = [[CairoRenderContext alloc] initForSurface:surface]; - [context clearSurface]; - [e renderBasicEdgeInContext:context withTransformer:transformer selected:NO]; - [context release]; - - return pixbuf_get_from_surface (surface); -} - -- (void) addEdgeStyle:(EdgeStyle*)style usingSurface:(cairo_surface_t*)surface { - GtkTreeIter iter; - gtk_list_store_append (store, &iter); - - GdkPixbuf *pixbuf = [self pixbufOfEdgeInStyle:style usingSurface:surface]; - gtk_list_store_set (store, &iter, - EDGE_STYLES_NAME_COL, [[style name] UTF8String], - EDGE_STYLES_ICON_COL, pixbuf, - EDGE_STYLES_PTR_COL, (gpointer)[style retain], - -1); - g_object_unref (pixbuf); - [self observeEdgeStyle:style]; -} - -- (void) addEdgeStyle:(EdgeStyle*)style { - cairo_surface_t *surface = [self createEdgeIconSurface]; - [self addEdgeStyle:style usingSurface:surface]; - cairo_surface_destroy (surface); -} - -- (void) observeEdgeStyle:(EdgeStyle*)style { - [style addObserver:self - forKeyPath:@"name" - options:NSKeyValueObservingOptionNew - context:NULL]; - [style addObserver:self - forKeyPath:@"thickness" - options:0 - context:NULL]; - [style addObserver:self - forKeyPath:@"headStyle" - options:0 - context:NULL]; - [style addObserver:self - forKeyPath:@"tailStyle" - options:0 - context:NULL]; - [style addObserver:self - forKeyPath:@"decorationStyle" - options:0 - context:NULL]; - [style addObserver:self - forKeyPath:@"colorRGB.red" - options:0 - context:NULL]; - [style addObserver:self - forKeyPath:@"colorRGB.green" - options:0 - context:NULL]; - [style addObserver:self - forKeyPath:@"colorRGB.blue" - options:0 - context:NULL]; -} - -- (void) stopObservingEdgeStyle:(EdgeStyle*)style { - [style removeObserver:self forKeyPath:@"name"]; - [style removeObserver:self forKeyPath:@"thickness"]; - [style removeObserver:self forKeyPath:@"headStyle"]; - [style removeObserver:self forKeyPath:@"tailStyle"]; - [style removeObserver:self forKeyPath:@"decorationStyle"]; - [style removeObserver:self forKeyPath:@"colorRGB.red"]; - [style removeObserver:self forKeyPath:@"colorRGB.green"]; - [style removeObserver:self forKeyPath:@"colorRGB.blue"]; -} - -- (void) clearEdgeStylesModel { - GtkTreeModel *model = GTK_TREE_MODEL (store); - GtkTreeIter row; - if (gtk_tree_model_get_iter_first (model, &row)) { - do { - EdgeStyle *rowStyle; - gtk_tree_model_get (model, &row, EDGE_STYLES_PTR_COL, &rowStyle, -1); - [self stopObservingEdgeStyle:rowStyle]; - [rowStyle release]; - } while (gtk_tree_model_iter_next (model, &row)); - } - gtk_list_store_clear (store); -} - -- (void) reloadEdgeStyles { - [self clearEdgeStylesModel]; - cairo_surface_t *surface = [self createEdgeIconSurface]; - for (EdgeStyle *style in [styleManager edgeStyles]) { - [self addEdgeStyle:style usingSurface:surface]; - } - cairo_surface_destroy (surface); -} -@end - -// }}} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/EdgeStylesPalette.h b/tikzit-1/src/gtk/EdgeStylesPalette.h deleted file mode 100644 index c0c6c4b..0000000 --- a/tikzit-1/src/gtk/EdgeStylesPalette.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class StyleManager; -@class EdgeStyleSelector; -@class EdgeStyleEditor; - -@interface EdgeStylesPalette: NSObject { - EdgeStyleSelector *selector; - EdgeStyleEditor *editor; - - GtkWidget *palette; - - GtkWidget *removeStyleButton; - GtkWidget *applyStyleButton; - GtkWidget *clearStyleButton; -} - -@property (retain) StyleManager *styleManager; -@property (readonly) GtkWidget *widget; - -- (id) initWithManager:(StyleManager*)m; - -@end - -// vim:ft=objc:ts=4:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/EdgeStylesPalette.m b/tikzit-1/src/gtk/EdgeStylesPalette.m deleted file mode 100644 index 33264cf..0000000 --- a/tikzit-1/src/gtk/EdgeStylesPalette.m +++ /dev/null @@ -1,198 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "EdgeStylesPalette.h" - -#import "EdgeStylesModel.h" -#import "EdgeStyleSelector.h" -#import "EdgeStyleEditor.h" -#import "StyleManager.h" - -// {{{ Internal interfaces -// {{{ GTK+ Callbacks -static void add_style_button_cb (GtkButton *widget, EdgeStylesPalette *palette); -static void remove_style_button_cb (GtkButton *widget, EdgeStylesPalette *palette); -// }}} -// {{{ Notifications - -@interface EdgeStylesPalette (Notifications) -- (void) selectedStyleChanged:(NSNotification*)notification; -@end - -// }}} -// {{{ Private - -@interface EdgeStylesPalette (Private) -- (void) updateButtonState; -- (void) removeSelectedStyle; -- (void) addStyle; -@end - -// }}} -// }}} -// {{{ API - -@implementation EdgeStylesPalette - -@synthesize widget=palette; - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithManager:(StyleManager*)m { - self = [super init]; - - if (self) { - selector = [[EdgeStyleSelector alloc] initWithStyleManager:m]; - editor = [[EdgeStyleEditor alloc] init]; - - palette = gtk_vbox_new (FALSE, 6); - gtk_container_set_border_width (GTK_CONTAINER (palette), 6); - g_object_ref_sink (palette); - - GtkWidget *mainBox = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (palette), mainBox, FALSE, FALSE, 0); - gtk_widget_show (mainBox); - - GtkWidget *selectorScroller = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (selectorScroller), - GTK_POLICY_NEVER, - GTK_POLICY_AUTOMATIC); - GtkWidget *selectorFrame = gtk_frame_new (NULL); - gtk_container_add (GTK_CONTAINER (selectorScroller), [selector widget]); - gtk_container_add (GTK_CONTAINER (selectorFrame), selectorScroller); - gtk_box_pack_start (GTK_BOX (mainBox), selectorFrame, TRUE, TRUE, 0); - gtk_widget_show (selectorScroller); - gtk_widget_show (selectorFrame); - gtk_widget_show ([selector widget]); - - gtk_box_pack_start (GTK_BOX (mainBox), [editor widget], TRUE, TRUE, 0); - gtk_widget_show ([editor widget]); - - GtkBox *buttonBox = GTK_BOX (gtk_hbox_new(FALSE, 0)); - gtk_box_pack_start (GTK_BOX (palette), GTK_WIDGET (buttonBox), FALSE, FALSE, 0); - - GtkWidget *addStyleButton = gtk_button_new (); - gtk_widget_set_tooltip_text (addStyleButton, "Add a new style"); - GtkWidget *addIcon = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON); - gtk_container_add (GTK_CONTAINER (addStyleButton), addIcon); - gtk_box_pack_start (buttonBox, addStyleButton, FALSE, FALSE, 0); - g_signal_connect (G_OBJECT (addStyleButton), - "clicked", - G_CALLBACK (add_style_button_cb), - self); - - removeStyleButton = gtk_button_new (); - g_object_ref_sink (removeStyleButton); - gtk_widget_set_tooltip_text (removeStyleButton, "Delete selected style"); - GtkWidget *removeIcon = gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_BUTTON); - gtk_container_add (GTK_CONTAINER (removeStyleButton), removeIcon); - gtk_box_pack_start (buttonBox, removeStyleButton, FALSE, FALSE, 0); - g_signal_connect (G_OBJECT (removeStyleButton), - "clicked", - G_CALLBACK (remove_style_button_cb), - self); - - gtk_widget_show_all (GTK_WIDGET (buttonBox)); - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(selectedStyleChanged:) - name:@"SelectedStyleChanged" - object:selector]; - - [self updateButtonState]; - } - - return self; -} - -- (StyleManager*) styleManager { - return [[selector model] styleManager]; -} - -- (void) setStyleManager:(StyleManager*)m { - [[selector model] setStyleManager:m]; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - [editor release]; - [selector release]; - - g_object_unref (palette); - g_object_unref (removeStyleButton); - - [super dealloc]; -} - -@end - -// }}} -// {{{ Notifications - -@implementation EdgeStylesPalette (Notifications) -- (void) selectedStyleChanged:(NSNotification*)notification { - [editor setStyle:[selector selectedStyle]]; - [self updateButtonState]; -} -@end - -// }}} -// {{{ Private - -@implementation EdgeStylesPalette (Private) -- (void) updateButtonState { - gboolean hasStyleSelection = [selector selectedStyle] != nil; - gtk_widget_set_sensitive (removeStyleButton, hasStyleSelection); -} - -- (void) removeSelectedStyle { - EdgeStyle *style = [selector selectedStyle]; - if (style) - [[[selector model] styleManager] removeEdgeStyle:style]; -} - -- (void) addStyle { - EdgeStyle *newStyle = [EdgeStyle defaultEdgeStyleWithName:@"newstyle"]; - [[self styleManager] addEdgeStyle:newStyle]; - [selector setSelectedStyle:newStyle]; - [editor selectNameField]; -} - -@end - -// }}} -// {{{ GTK+ callbacks - -static void add_style_button_cb (GtkButton *widget, EdgeStylesPalette *palette) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [palette addStyle]; - [pool drain]; -} - -static void remove_style_button_cb (GtkButton *widget, EdgeStylesPalette *palette) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [palette removeSelectedStyle]; - [pool drain]; -} - -// }}} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/FileChooserDialog.h b/tikzit-1/src/gtk/FileChooserDialog.h deleted file mode 100644 index 80b03f5..0000000 --- a/tikzit-1/src/gtk/FileChooserDialog.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@interface FileChooserDialog: NSObject { - GtkFileChooser *dialog; -} - -+ (FileChooserDialog*) saveDialog; -+ (FileChooserDialog*) saveDialogWithParent:(GtkWindow*)parent; -+ (FileChooserDialog*) saveDialogWithTitle:(NSString*)title parent:(GtkWindow*)parent; -+ (FileChooserDialog*) openDialog; -+ (FileChooserDialog*) openDialogWithParent:(GtkWindow*)parent; -+ (FileChooserDialog*) openDialogWithTitle:(NSString*)title parent:(GtkWindow*)parent; - -- (id) initSaveDialog; -- (id) initSaveDialogWithParent:(GtkWindow*)parent; -- (id) initSaveDialogWithTitle:(NSString*)title parent:(GtkWindow*)parent; -- (id) initOpenDialog; -- (id) initOpenDialogWithParent:(GtkWindow*)parent; -- (id) initOpenDialogWithTitle:(NSString*)title parent:(GtkWindow*)parent; - -- (void) addStandardFilters; -- (void) addFileFilter:(NSString*)filterName withPattern:(NSString*)filePattern; -- (void) addFileFilter:(NSString*)filterName withPattern:(NSString*)filePattern setSelected:(BOOL)selected; - -- (void) setCurrentFolder:(NSString*)path; -- (NSString*) currentFolder; - -- (void) setSuggestedName:(NSString*)fileName; - -- (NSString*) filePath; - -- (BOOL) showDialog; - -- (void) destroy; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/FileChooserDialog.m b/tikzit-1/src/gtk/FileChooserDialog.m deleted file mode 100644 index 9498e4c..0000000 --- a/tikzit-1/src/gtk/FileChooserDialog.m +++ /dev/null @@ -1,152 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "FileChooserDialog.h" - -@implementation FileChooserDialog: NSObject - -+ (FileChooserDialog*) saveDialog { return [[[self alloc] initSaveDialog] autorelease]; } -+ (FileChooserDialog*) saveDialogWithParent:(GtkWindow*)parent - { return [[[self alloc] initSaveDialogWithParent:parent] autorelease]; } -+ (FileChooserDialog*) saveDialogWithTitle:(NSString*)title parent:(GtkWindow*)parent - { return [[[self alloc] initSaveDialogWithTitle:title parent:parent] autorelease]; } -+ (FileChooserDialog*) openDialog { return [[[self alloc] initOpenDialog] autorelease]; } -+ (FileChooserDialog*) openDialogWithParent:(GtkWindow*)parent - { return [[[self alloc] initOpenDialogWithParent:parent] autorelease]; } -+ (FileChooserDialog*) openDialogWithTitle:(NSString*)title parent:(GtkWindow*)parent - { return [[[self alloc] initOpenDialogWithTitle:title parent:parent] autorelease]; } - -- (id) initSaveDialog { return [self initSaveDialogWithParent:NULL]; } -- (id) initSaveDialogWithParent:(GtkWindow*)parent - { return [self initSaveDialogWithTitle:@"Save file" parent:parent]; } -- (id) initSaveDialogWithTitle:(NSString*)title parent:(GtkWindow*)parent { - self = [super init]; - - if (self) { - dialog = GTK_FILE_CHOOSER (gtk_file_chooser_dialog_new ( - [title UTF8String], - parent, - GTK_FILE_CHOOSER_ACTION_SAVE, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, - NULL)); - gtk_file_chooser_set_do_overwrite_confirmation (dialog, TRUE); - } - - return self; -} - -- (id) initOpenDialog { return [self initOpenDialogWithParent:NULL]; } -- (id) initOpenDialogWithParent:(GtkWindow*)parent - { return [self initOpenDialogWithTitle:@"Open file" parent:parent]; } -- (id) initOpenDialogWithTitle:(NSString*)title parent:(GtkWindow*)parent { - self = [super init]; - - if (self) { - dialog = GTK_FILE_CHOOSER (gtk_file_chooser_dialog_new ( - [title UTF8String], - parent, - GTK_FILE_CHOOSER_ACTION_OPEN, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, - NULL)); - } - - return self; -} - -- (void) addStandardFilters { - GtkFileFilter *tikzfilter = gtk_file_filter_new(); - gtk_file_filter_set_name(tikzfilter, ".tikz files"); - gtk_file_filter_add_pattern(tikzfilter, "*.tikz"); - gtk_file_chooser_add_filter(dialog, tikzfilter); - GtkFileFilter *allfilter = gtk_file_filter_new(); - gtk_file_filter_set_name(allfilter, "all files"); - gtk_file_filter_add_pattern(allfilter, "*"); - gtk_file_chooser_add_filter(dialog, allfilter); - gtk_file_chooser_set_filter(dialog, tikzfilter); -} - -- (void) addFileFilter:(NSString*)filterName withPattern:(NSString*)filePattern { - [self addFileFilter:filterName withPattern:filePattern setSelected:NO]; -} - -- (void) addFileFilter:(NSString*)filterName withPattern:(NSString*)filePattern setSelected:(BOOL)selected { - GtkFileFilter *oldFilter = selected ? NULL : gtk_file_chooser_get_filter (dialog); - GtkFileFilter *filter = gtk_file_filter_new(); - gtk_file_filter_set_name(filter, [filterName UTF8String]); - gtk_file_filter_add_pattern(filter, [filePattern UTF8String]); - gtk_file_chooser_add_filter(dialog, filter); - if (selected) { - gtk_file_chooser_set_filter (dialog, filter); - } else if (oldFilter) { - gtk_file_chooser_set_filter (dialog, oldFilter); - } -} - -- (void) setCurrentFolder:(NSString*)path { - gchar *folder = [path glibFilename]; - if (folder) { - gtk_file_chooser_set_current_folder(dialog, folder); - g_free (folder); - } -} - -- (NSString*) currentFolder { - NSString *path = nil; - gchar *folder = gtk_file_chooser_get_current_folder(dialog); - if (folder) { - path = [NSString stringWithGlibFilename:folder]; - g_free (folder); - } - return path; -} - -- (void) setSuggestedName:(NSString*)fileName { - gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), [fileName UTF8String]); -} - -- (NSString*) filePath { - NSString *path = nil; - gchar *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); - if (filename) { - path = [NSString stringWithGlibFilename:filename]; - g_free (filename); - } - return path; -} - -- (BOOL) showDialog { - return (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) ? YES : NO; -} - -- (void) destroy { - gtk_widget_destroy (GTK_WIDGET (dialog)); - dialog = NULL; -} - -- (void) dealloc { - if (dialog) { - g_warning ("Failed to destroy file chooser dialog!\n"); - gtk_widget_destroy (GTK_WIDGET (dialog)); - } - [super dealloc]; -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/GraphEditorPanel.h b/tikzit-1/src/gtk/GraphEditorPanel.h deleted file mode 100644 index 2b93259..0000000 --- a/tikzit-1/src/gtk/GraphEditorPanel.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "Tool.h" -#import - -@class GraphInputHandler; -@class GraphRenderer; -@class TikzDocument; -@class WidgetSurface; - -@protocol PreviewHandler -- (void) showPreview; -@end -@interface GraphEditorPanel : NSObject { - GraphRenderer *renderer; - WidgetSurface *surface; - GraphInputHandler *inputHandler; - id previewHandler; - id tool; -} -@property (retain) TikzDocument *document; -@property (readonly) GtkWidget *widget; -@property (retain) id activeTool; -@property (assign) id previewHandler; - -- (id) init; -- (id) initWithDocument:(TikzDocument*)document; -- (void) grabTool; -- (void) zoomInAboutPoint:(NSPoint)pos; -- (void) zoomOutAboutPoint:(NSPoint)pos; -- (void) zoomIn; -- (void) zoomOut; -- (void) zoomReset; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/GraphEditorPanel.m b/tikzit-1/src/gtk/GraphEditorPanel.m deleted file mode 100644 index dac52a0..0000000 --- a/tikzit-1/src/gtk/GraphEditorPanel.m +++ /dev/null @@ -1,240 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "GraphEditorPanel.h" - -#import "Application.h" -#import "GraphRenderer.h" -#import "HandTool.h" -#import "InputDelegate.h" -#import "TikzDocument.h" -#import "WidgetSurface.h" - -#import - -@class GraphRenderer; -@class WidgetSurface; - -static const InputMask zoomPanMask = ControlMask; - -/** - * Mostly just a multiplexer, but also handles zoom and pan - * when ctrl is held - */ -@interface GraphInputHandler : NSObject { - GraphEditorPanel *panel; - NSPoint dragOrigin; - NSPoint oldGraphOrigin; - BOOL zoomPanActive; -} -- (id) initForPanel:(GraphEditorPanel*)p; -@end - -@implementation GraphEditorPanel - -@synthesize previewHandler; - -- (id) init { - return [self initWithDocument:nil]; -} -- (id) initWithDocument:(TikzDocument*)document { - self = [super init]; - if (self) { - surface = [[WidgetSurface alloc] init]; - [surface setDefaultScale:50.0f]; - [surface setKeepCentered:YES]; - [surface setCanFocus:YES]; - renderer = [[GraphRenderer alloc] initWithSurface:surface document:document]; - - inputHandler = [[GraphInputHandler alloc] initForPanel:self]; - [surface setInputDelegate:inputHandler]; - } - return self; -} - -- (void) dealloc { - [renderer release]; - [surface release]; - [inputHandler release]; - - [super dealloc]; -} - -- (GraphRenderer*) renderer { - return renderer; -} -- (TikzDocument*) document { - return [renderer document]; -} -- (void) setDocument:(TikzDocument*)doc { - [renderer setDocument:doc]; -} -- (GtkWidget*) widget { - return [surface widget]; -} -- (id) activeTool { - return tool; -} -- (void) setActiveTool:(id)t { - if (t == tool) - return; - - [[[renderer document] pickSupport] deselectAllNodes]; - [[[renderer document] pickSupport] deselectAllEdges]; - - id oldTool = tool; - BOOL weHadTool = ([oldTool activeRenderer] == renderer); - if (weHadTool) { - [oldTool setActiveRenderer:nil]; - } - - tool = [t retain]; - [oldTool release]; - - if (weHadTool) { - [self grabTool]; - } -} - -- (BOOL) hasTool { - return [tool activeRenderer] == renderer; -} - -- (void) grabTool { - if ([tool activeRenderer] != renderer) { - [[tool activeRenderer] setPostRenderer:nil]; - [tool setActiveRenderer:renderer]; - } - [renderer setPostRenderer:tool]; -} - -- (void) zoomInAboutPoint:(NSPoint)pos { [surface zoomInAboutPoint:pos]; } -- (void) zoomOutAboutPoint:(NSPoint)pos { [surface zoomOutAboutPoint:pos]; } -- (void) zoomIn { [surface zoomIn]; } -- (void) zoomOut { [surface zoomOut]; } -- (void) zoomReset { [surface zoomReset]; } - -@end - -@implementation GraphInputHandler -- (id) initForPanel:(GraphEditorPanel*)p { - self = [super init]; - if (self) { - // NB: no retention! - panel = p; - } - return self; -} -- (id) init { - [self release]; - return nil; -} -- (void) dealloc { - [super dealloc]; -} - -// FIXME: share code with HandTool? -- (void) mousePressAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { - if (mask == zoomPanMask && button == LeftButton) { - dragOrigin = pos; - oldGraphOrigin = [[[panel renderer] transformer] origin]; - zoomPanActive = YES; - } else { - zoomPanActive = NO; - [panel grabTool]; - id tool = [panel activeTool]; - if ([tool respondsToSelector:@selector(mousePressAt:withButton:andMask:)]) { - [tool mousePressAt:pos withButton:button andMask:mask]; - } - } -} - -- (void) mouseDoubleClickAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { - [panel grabTool]; - id tool = [panel activeTool]; - if ([tool respondsToSelector:@selector(mouseDoubleClickAt:withButton:andMask:)]) { - [tool mouseDoubleClickAt:pos withButton:button andMask:mask]; - } -} - -- (void) mouseReleaseAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { - if (zoomPanActive && button == LeftButton) { - zoomPanActive = NO; - } else if ([panel hasTool]) { - id tool = [panel activeTool]; - if ([tool respondsToSelector:@selector(mouseReleaseAt:withButton:andMask:)]) { - [tool mouseReleaseAt:pos withButton:button andMask:mask]; - } - } -} - -- (void) mouseMoveTo:(NSPoint)pos withButtons:(MouseButton)buttons andMask:(InputMask)mask { - if (zoomPanActive && (buttons & LeftButton)) { - NSPoint newGraphOrigin = oldGraphOrigin; - newGraphOrigin.x += pos.x - dragOrigin.x; - newGraphOrigin.y += pos.y - dragOrigin.y; - [[[panel renderer] transformer] setOrigin:newGraphOrigin]; - [[panel renderer] invalidateGraph]; - } else if ([panel hasTool]) { - id tool = [panel activeTool]; - if ([tool respondsToSelector:@selector(mouseMoveTo:withButtons:andMask:)]) { - [tool mouseMoveTo:pos withButtons:buttons andMask:mask]; - } - } -} - -- (void) mouseScrolledAt:(NSPoint)pos inDirection:(ScrollDirection)dir withMask:(InputMask)mask { - if (mask == zoomPanMask) { - if (dir == ScrollUp) { - [panel zoomInAboutPoint:pos]; - } else if (dir == ScrollDown) { - [panel zoomOutAboutPoint:pos]; - } - } else { - id tool = [panel activeTool]; - if ([panel hasTool] && [tool respondsToSelector:@selector(mouseScrolledAt:inDirection:withMask:)]) { - [tool mouseScrolledAt:pos inDirection:dir withMask:mask]; - } - } -} - -- (void) keyPressed:(unsigned int)keyVal withMask:(InputMask)mask { - if (keyVal == GDK_KEY_space && !mask) { - return; - } - if (![app activateToolForKey:keyVal withMask:mask]) { - id tool = [panel activeTool]; - if ([panel hasTool] && [tool respondsToSelector:@selector(keyPressed:withMask:)]) { - [tool keyPressed:keyVal withMask:mask]; - } - } -} - -- (void) keyReleased:(unsigned int)keyVal withMask:(InputMask)mask { - if (keyVal == GDK_KEY_space && !mask) { - [[panel previewHandler] showPreview]; - } - if (![app activateToolForKey:keyVal withMask:mask]) { - id tool = [panel activeTool]; - if ([panel hasTool] && [tool respondsToSelector:@selector(keyReleased:withMask:)]) { - [tool keyReleased:keyVal withMask:mask]; - } - } -} -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/GraphRenderer.h b/tikzit-1/src/gtk/GraphRenderer.h deleted file mode 100644 index 730d606..0000000 --- a/tikzit-1/src/gtk/GraphRenderer.h +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -// classes -#import "Graph.h" -#import "Grid.h" -#import "PickSupport.h" -#import "TikzDocument.h" - -// protocols -#import "Surface.h" - -@interface GraphRenderer: NSObject { - TikzDocument *doc; - NSObject *surface; - Grid *grid; - NSMutableSet *highlightedNodes; - id postRenderer; -} - -@property (retain) id postRenderer; - -- (id) initWithSurface:(NSObject *)surface; -- (id) initWithSurface:(NSObject *)surface document:(TikzDocument*)document; -- (void) renderWithContext:(id)context; -- (void) invalidateRect:(NSRect)rect; -- (void) invalidateGraph; -- (void) invalidateNode:(Node*)node; -- (void) invalidateEdge:(Edge*)edge; -- (void) invalidateNodesHitBy:(NSPoint)point; -- (BOOL) point:(NSPoint)p hitsNode:(Node*)node; -- (BOOL) point:(NSPoint)p hitsEdge:(Edge*)edge withFuzz:(float)fuzz; -/** - * Finds a node at the given screen location. - * - * If there is more than one node at this point (because they overlap), - * an arbitrary one is returned. - */ -- (Node*) anyNodeAt:(NSPoint)p; -/** - * Finds an edge at the given screen location. - * - * If there is more than one edge at this point (because they overlap), - * an arbitrary one is returned. - * - * @param fuzz the fuzz for detecting edges: this will pick up - * edges that are close to the point - */ -- (Edge*) anyEdgeAt:(NSPoint)p withFuzz:(float)fuzz; - -- (id) surface; -- (Transformer*) transformer; -- (Grid*) grid; -- (PickSupport*) pickSupport; - -- (Graph*) graph; - -- (TikzDocument*) document; -- (void) setDocument:(TikzDocument*)document; - -- (BOOL) isNodeHighlighted:(Node*)node; -- (void) setNode:(Node*)node highlighted:(BOOL)h; -- (void) clearHighlightedNodes; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/GraphRenderer.m b/tikzit-1/src/gtk/GraphRenderer.m deleted file mode 100644 index b413d3e..0000000 --- a/tikzit-1/src/gtk/GraphRenderer.m +++ /dev/null @@ -1,476 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * Copyright 2010 Chris Heunen - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "GraphRenderer.h" -#import "Edge+Render.h" -#import "Node+Render.h" -#import "Shape.h" - -void graph_renderer_expose_event(GtkWidget *widget, GdkEventExpose *event); - -@interface GraphRenderer (Private) -- (enum NodeState) nodeState:(Node*)node; -- (void) renderBoundingBoxWithContext:(id)context; -- (void) nodeNeedsRefreshing:(NSNotification*)notification; -- (void) edgeNeedsRefreshing:(NSNotification*)notification; -- (void) graphNeedsRefreshing:(NSNotification*)notification; -- (void) graphChanged:(NSNotification*)notification; -- (void) nodeStylePropertyChanged:(NSNotification*)notification; -- (void) edgeStylePropertyChanged:(NSNotification*)notification; -- (void) shapeDictionaryReplaced:(NSNotification*)notification; -@end - -@implementation GraphRenderer - -- (id) initWithSurface:(NSObject *)s { - self = [super init]; - - if (self) { - surface = [s retain]; - grid = [[Grid alloc] initWithSpacing:1.0f subdivisions:4 transformer:[s transformer]]; - highlightedNodes = [[NSMutableSet alloc] initWithCapacity:10]; - [surface setRenderDelegate:self]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(nodeStylePropertyChanged:) - name:@"NodeStylePropertyChanged" - object:nil]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(edgeStylePropertyChanged:) - name:@"EdgeStylePropertyChanged" - object:nil]; - } - - return self; -} - -- (id) initWithSurface:(NSObject *)s document:(TikzDocument*)document { - self = [self initWithSurface:s]; - - if (self) { - [self setDocument:document]; - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - [doc release]; - [grid release]; - [highlightedNodes release]; - [surface release]; - - [super dealloc]; -} - -- (id) postRenderer { - return postRenderer; -} -- (void) setPostRenderer:(id)r { - if (r == postRenderer) - return; - - [r retain]; - [postRenderer release]; - postRenderer = r; - - [self invalidateGraph]; -} - -- (void) renderWithContext:(id)context onSurface:(id)s { - [self renderWithContext:context]; - if ([s hasFocus]) { - [s renderFocus]; - } -} - -- (void) renderWithContext:(id)context { - // blank surface - [context paintWithColor:WhiteRColor]; - - // draw grid - [grid renderGridInContext:context]; - - // draw edges - NSEnumerator *enumerator = [doc edgeEnumerator]; - Edge *edge; - while ((edge = [enumerator nextObject]) != nil) { - [edge renderToSurface:surface withContext:context selected:[doc isEdgeSelected:edge]]; - } - - // draw nodes - enumerator = [doc nodeEnumerator]; - Node *node; - while ((node = [enumerator nextObject]) != nil) { - [node renderToSurface:surface withContext:context state:[self nodeState:node]]; - } - - [self renderBoundingBoxWithContext:context]; - [postRenderer renderWithContext:context onSurface:surface]; -} - -- (void) invalidateGraph { - [surface invalidate]; -} - -- (void) invalidateRect:(NSRect)rect { - [surface invalidateRect:rect]; -} - -- (void) invalidateNodes:(NSSet*)nodes { - for (Node *node in nodes) { - [self invalidateNode:node]; - } -} - -- (void) invalidateEdges:(NSSet*)edges { - for (Edge *edge in edges) { - [self invalidateEdge:edge]; - } -} - -- (void) invalidateNode:(Node*)node { - if (node == nil) { - return; - } - NSRect nodeRect = [node renderBoundsWithLabelForSurface:surface]; - nodeRect = NSInsetRect (nodeRect, -2.0f, -2.0f); - [surface invalidateRect:nodeRect]; -} - -- (void) invalidateEdge:(Edge*)edge { - if (edge == nil) { - return; - } - BOOL selected = [doc isEdgeSelected:edge]; - NSRect edgeRect = [edge renderedBoundsWithTransformer:[surface transformer] whenSelected:selected]; - edgeRect = NSInsetRect (edgeRect, -2.0f, -2.0f); - [surface invalidateRect:edgeRect]; -} - -- (void) invalidateNodesHitBy:(NSPoint)point { - NSEnumerator *enumerator = [doc nodeEnumerator]; - Node *node = nil; - while ((node = [enumerator nextObject]) != nil) { - if ([self point:point hitsNode:node]) { - [self invalidateNode:node]; - } - } -} - -- (BOOL) point:(NSPoint)p hitsNode:(Node*)node { - return [node hitByPoint:p onSurface:surface]; -} - -- (BOOL) point:(NSPoint)p fuzzyHitsNode:(Node*)node { - NSRect bounds = [node renderBoundsForSurface:surface]; - return NSPointInRect(p, bounds); -} - -- (BOOL) point:(NSPoint)p hitsEdge:(Edge*)edge withFuzz:(float)fuzz { - return [edge hitByPoint:p onSurface:surface withFuzz:fuzz]; -} - -- (Node*) anyNodeAt:(NSPoint)p { - NSEnumerator *enumerator = [doc nodeEnumerator]; - Node *node; - while ((node = [enumerator nextObject]) != nil) { - if ([self point:p hitsNode:node]) { - return node; - } - } - return nil; -} - -- (Edge*) anyEdgeAt:(NSPoint)p withFuzz:(float)fuzz { - // FIXME: is there an efficient way to find the "nearest" edge - // if the fuzz is the reason we hit more than one? - NSEnumerator *enumerator = [doc edgeEnumerator]; - Edge *edge; - while ((edge = [enumerator nextObject]) != nil) { - if ([self point:p hitsEdge:edge withFuzz:fuzz]) { - return edge; - } - } - return nil; -} - -- (id) surface { - return surface; -} - -- (Transformer*) transformer { - return [surface transformer]; -} - -- (Grid*) grid { - return grid; -} - -- (PickSupport*) pickSupport { - return [doc pickSupport]; -} - -- (Graph*) graph { - return [doc graph]; -} - -- (TikzDocument*) document { - return doc; -} - -- (void) setDocument:(TikzDocument*)document { - if (doc == document) { - return; - } - - if (doc != nil) { - [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:doc]; - [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:[doc pickSupport]]; - } - - [document retain]; - [doc release]; - doc = document; - - if (doc != nil) { - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(graphNeedsRefreshing:) - name:@"GraphReplaced" object:doc]; - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(graphChanged:) - name:@"GraphChanged" object:doc]; - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(graphChanged:) - name:@"GraphBeingChanged" object:doc]; - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(graphChanged:) - name:@"GraphChangeCancelled" object:doc]; - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(nodeNeedsRefreshing:) - name:@"NodeSelected" object:[doc pickSupport]]; - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(nodeNeedsRefreshing:) - name:@"NodeDeselected" object:[doc pickSupport]]; - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(graphNeedsRefreshing:) - name:@"NodeSelectionReplaced" object:[doc pickSupport]]; - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(edgeNeedsRefreshing:) - name:@"EdgeSelected" object:[doc pickSupport]]; - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(edgeNeedsRefreshing:) - name:@"EdgeDeselected" object:[doc pickSupport]]; - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(graphNeedsRefreshing:) - name:@"EdgeSelectionReplaced" object:[doc pickSupport]]; - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(shapeDictionaryReplaced:) - name:@"ShapeDictionaryReplaced" - object:[Shape class]]; - } - [surface invalidate]; -} - -- (BOOL) isNodeHighlighted:(Node*)node { - return [highlightedNodes containsObject:node]; -} -- (void) setNode:(Node*)node highlighted:(BOOL)h { - if (h) { - if (![highlightedNodes containsObject:node]) { - [highlightedNodes addObject:node]; - [self invalidateNode:node]; - } - } else { - if ([highlightedNodes containsObject:node]) { - [highlightedNodes removeObject:node]; - [self invalidateNode:node]; - } - } -} -- (void) clearHighlightedNodes { - [self invalidateNodes:highlightedNodes]; - [highlightedNodes removeAllObjects]; -} - -@end - -@implementation GraphRenderer (Private) -- (enum NodeState) nodeState:(Node*)node { - if ([doc isNodeSelected:node]) { - return NodeSelected; - } else if ([self isNodeHighlighted:node]) { - return NodeHighlighted; - } else { - return NodeNormal; - } -} - -- (void) renderBoundingBoxWithContext:(id)context { - if ([[self graph] hasBoundingBox]) { - [context saveState]; - - NSRect bbox = [[surface transformer] rectToScreen:[[self graph] boundingBox]]; - - [context setAntialiasMode:AntialiasDisabled]; - [context setLineWidth:1.0]; - [context startPath]; - [context rect:bbox]; - [context strokePathWithColor:MakeSolidRColor (1.0, 0.7, 0.5)]; - - [context restoreState]; - } -} - -- (void) nodeNeedsRefreshing:(NSNotification*)notification { - [self invalidateNode:[[notification userInfo] objectForKey:@"node"]]; -} - -- (void) edgeNeedsRefreshing:(NSNotification*)notification { - Edge *edge = [[notification userInfo] objectForKey:@"edge"]; - NSRect edgeRect = [edge renderedBoundsWithTransformer:[surface transformer] whenSelected:YES]; - edgeRect = NSInsetRect (edgeRect, -2, -2); - [surface invalidateRect:edgeRect]; -} - -- (void) graphNeedsRefreshing:(NSNotification*)notification { - [self invalidateGraph]; -} - -- (void) invalidateBentIncidentEdgesForNode:(Node*)nd { - for (Edge *e in [[self graph] inEdgesForNode:nd]) { - if (![e isStraight]) { - [self invalidateEdge:e]; - } - } - for (Edge *e in [[self graph] outEdgesForNode:nd]) { - if (![e isStraight]) { - [self invalidateEdge:e]; - } - } -} - -- (void) graphChanged:(NSNotification*)notification { - GraphChange *change = [[notification userInfo] objectForKey:@"change"]; - switch ([change changeType]) { - case GraphAddition: - case GraphDeletion: - [self invalidateNodes:[change affectedNodes]]; - [self invalidateEdges:[change affectedEdges]]; - break; - case NodePropertyChange: - if (!NSEqualPoints ([[change oldNode] point], [[change nwNode] point])) { - // if the node has moved, it may be affecting edges - [surface invalidate]; - } else if ([[change oldNode] style] != [[change nwNode] style]) { - // change in style means that edges may touch at a different point, - // but this only matters for bent edges - [self invalidateBentIncidentEdgesForNode:[change nodeRef]]; - // invalide both old and new (old node may be larger) - [self invalidateNode:[change oldNode]]; - [self invalidateNode:[change nwNode]]; - } else { - // invalide both old and new (old node may be larger) - [self invalidateNode:[change oldNode]]; - [self invalidateNode:[change nwNode]]; - } - break; - case EdgePropertyChange: - // invalide both old and new (old bend may increase bounds) - [self invalidateEdge:[change oldEdge]]; - [self invalidateEdge:[change nwEdge]]; - [self invalidateEdge:[change edgeRef]]; - break; - case NodesPropertyChange: - { - NSEnumerator *enumerator = [[change oldNodeTable] keyEnumerator]; - Node *node = nil; - while ((node = [enumerator nextObject]) != nil) { - NSPoint oldPos = [[[change oldNodeTable] objectForKey:node] point]; - NSPoint newPos = [[[change nwNodeTable] objectForKey:node] point]; - NodeStyle *oldStyle = [[[change oldNodeTable] objectForKey:node] style]; - NodeStyle *newStyle = [[[change nwNodeTable] objectForKey:node] style]; - if (!NSEqualPoints (oldPos, newPos)) { - [surface invalidate]; - break; - } else if (oldStyle != newStyle) { - [self invalidateBentIncidentEdgesForNode:node]; - [self invalidateNode:[[change oldNodeTable] objectForKey:node]]; - [self invalidateNode:[[change nwNodeTable] objectForKey:node]]; - } else { - [self invalidateNode:[[change oldNodeTable] objectForKey:node]]; - [self invalidateNode:[[change nwNodeTable] objectForKey:node]]; - } - } - } - break; - case NodesShift: - case NodesFlip: - case BoundingBoxChange: - [surface invalidate]; - break; - default: - // unknown change - [surface invalidate]; - break; - }; -} - -- (void) nodeStylePropertyChanged:(NSNotification*)notification { - if (![@"name" isEqual:[[notification userInfo] objectForKey:@"propertyName"]]) { - BOOL affected = NO; - for (Node *node in [[self graph] nodes]) { - if ([node style] == [notification object]) - affected = YES; - } - if (affected) - [surface invalidate]; - } -} - -- (void) edgeStylePropertyChanged:(NSNotification*)notification { - if (![@"name" isEqual:[[notification userInfo] objectForKey:@"propertyName"]]) { - BOOL affected = NO; - for (Edge *edge in [[self graph] edges]) { - if ([edge style] == [notification object]) - affected = YES; - } - if (affected) - [surface invalidate]; - } -} - -- (void) shapeDictionaryReplaced:(NSNotification*)notification { - [surface invalidate]; -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/HandTool.h b/tikzit-1/src/gtk/HandTool.h deleted file mode 100644 index c96de36..0000000 --- a/tikzit-1/src/gtk/HandTool.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "Tool.h" - -@interface HandTool : NSObject { - GraphRenderer *renderer; - NSPoint dragOrigin; - NSPoint oldGraphOrigin; -} - - -+ (id) tool; -- (id) init; -@end - - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/HandTool.m b/tikzit-1/src/gtk/HandTool.m deleted file mode 100644 index c3a0fb4..0000000 --- a/tikzit-1/src/gtk/HandTool.m +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "HandTool.h" - -#import "GraphRenderer.h" -#import "TikzDocument.h" -#import "tzstockitems.h" - -@implementation HandTool -- (NSString*) name { return @"Drag"; } -- (const gchar*) stockId { return TIKZIT_STOCK_DRAG; } -- (NSString*) helpText { return @"Move the diagram to view different parts"; } -- (NSString*) shortcut { return @"m"; } -@synthesize activeRenderer=renderer; - -+ (id) tool { - return [[[self alloc] init] autorelease]; -} - -- (id) init { - return [super init]; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - [renderer release]; - - [super dealloc]; -} - -- (GtkWidget*) configurationWidget { return NULL; } - -- (void) mousePressAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { - if (button != LeftButton) - return; - - dragOrigin = pos; - oldGraphOrigin = [[renderer transformer] origin]; -} - -- (void) mouseMoveTo:(NSPoint)pos withButtons:(MouseButton)buttons andMask:(InputMask)mask { - if (!(buttons & LeftButton)) - return; - - NSPoint newGraphOrigin = oldGraphOrigin; - newGraphOrigin.x += pos.x - dragOrigin.x; - newGraphOrigin.y += pos.y - dragOrigin.y; - [[renderer transformer] setOrigin:newGraphOrigin]; - [renderer invalidateGraph]; -} - -- (void) mouseReleaseAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask {} - -- (void) renderWithContext:(id)context onSurface:(id)surface {} -- (void) loadConfiguration:(Configuration*)config {} -- (void) saveConfiguration:(Configuration*)config {} -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/InputDelegate.h b/tikzit-1/src/gtk/InputDelegate.h deleted file mode 100644 index 9f9b426..0000000 --- a/tikzit-1/src/gtk/InputDelegate.h +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" - -typedef enum { - LeftButton = 1, - MiddleButton = 2, - RightButton = 3, - Button4 = 4, - Button5 = 5 -} MouseButton; - -typedef enum { - ShiftMask = 1, - ControlMask = 2, - MetaMask = 4 -} InputMask; - -typedef enum { - ScrollUp = 1, - ScrollDown = 2, - ScrollLeft = 3, - ScrollRight = 4, -} ScrollDirection; - -@protocol InputDelegate -@optional -/** - * A mouse button was pressed. - */ -- (void) mousePressAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask; -/** - * A mouse button was released. - */ -- (void) mouseReleaseAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask; -/** - * A mouse button was double-clicked. - * - * Note that mouseDown and mouseUp events will still be delivered. - * This will be triggered between the second mouseDown and the second - * mouseUp. - */ -- (void) mouseDoubleClickAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask; -/** - * The mouse was moved - */ -- (void) mouseMoveTo:(NSPoint)pos withButtons:(MouseButton)button andMask:(InputMask)mask; -/** - * The mouse was scrolled - */ -- (void) mouseScrolledAt:(NSPoint)pos inDirection:(ScrollDirection)dir withMask:(InputMask)mask; -/** - * A key was pressed - */ -- (void) keyPressed:(unsigned int)keyVal withMask:(InputMask)mask; -/** - * A key was released - */ -- (void) keyReleased:(unsigned int)keyVal withMask:(InputMask)mask; -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/Menu.h b/tikzit-1/src/gtk/Menu.h deleted file mode 100644 index e0f78d4..0000000 --- a/tikzit-1/src/gtk/Menu.h +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class Window; -@class PickSupport; - -/** - * Manages the menu - */ -@interface Menu: NSObject { - GtkWidget *menubar; - GtkActionGroup *appActions; - GtkActionGroup *windowActions; - GtkAction *undoAction; // no ref - GtkAction *redoAction; // no ref - GtkAction *pasteAction; // no ref - GtkAction **nodeSelBasedActions; - guint nodeSelBasedActionCount; - GtkAction **edgeSelBasedActions; - guint edgeSelBasedActionCount; - GtkAction **selBasedActions; - guint selBasedActionCount; -} - -/** - * The menubar widget, to be inserted into the window - */ -@property (readonly) GtkWidget *menubar; - -/** - * Constructs the menu for @p window - * - * @param window the window that will be acted upon - */ -- (id) initForWindow:(Window*)window; - -/** - * Enables or disables the undo action - */ -- (void) setUndoActionEnabled:(BOOL)enabled; -/** - * Sets the text that describes what action will be undone - * - * @param detail a text description of the action, or nil - */ -- (void) setUndoActionDetail:(NSString*)detail; -/** - * Enables or disables the redo action - */ -- (void) setRedoActionEnabled:(BOOL)enabled; -/** - * Sets the text that describes what action will be redone - * - * @param detail a text description of the action, or nil - */ -- (void) setRedoActionDetail:(NSString*)detail; - -/** - * Gets the paste action - */ -- (GtkAction*) pasteAction; - -/** - * Enables or disables the actions that act on a selection - */ -- (void) notifySelectionChanged:(PickSupport*)pickSupport; -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/Menu.m b/tikzit-1/src/gtk/Menu.m deleted file mode 100644 index 04c9c31..0000000 --- a/tikzit-1/src/gtk/Menu.m +++ /dev/null @@ -1,737 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * Stuff stolen from glade-window.c in Glade: - * Copyright (C) 2001 Ximian, Inc. - * Copyright (C) 2007 Vincent Geddes. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "Menu.h" - -#import "Application.h" -#import "Window.h" -#import "Configuration.h" -#import "PickSupport.h" -#import "Shape.h" -#import "Tool.h" -#import "TikzDocument.h" - -#import -#ifdef _ -#undef _ -#endif -#import -#import - -#import "gtkhelpers.h" - -#import "logo.h" - -// {{{ Application actions -static void new_cb (GtkAction *action, Application *appl) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [appl newWindow]; - [pool drain]; -} - -static void refresh_shapes_cb (GtkAction *action, Application *appl) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [Shape refreshShapeDictionary]; - [pool drain]; -} - -static void show_preferences_cb (GtkAction *action, Application *appl) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [appl presentSettingsDialog]; - [pool drain]; -} - -#ifdef HAVE_POPPLER -static void show_preamble_cb (GtkAction *action, Application *appl) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [appl presentPreamblesEditor]; - [pool drain]; -} -#endif - -static void show_context_window_cb (GtkAction *action, Application *appl) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [appl presentContextWindow]; - [pool drain]; -} - -static void quit_cb (GtkAction *action, Application *appl) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [appl quit]; - [pool drain]; -} - -static void help_cb (GtkAction *action, Application *appl) { - GError *gerror = NULL; - gtk_show_uri (NULL, "http://tikzit.sourceforge.net/manual.html", GDK_CURRENT_TIME, &gerror); - if (gerror != NULL) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - logGError (gerror, @"Could not show help"); - [pool drain]; - } -} - -static void about_cb (GtkAction *action, Application *appl) { - static const gchar * const authors[] = - { "Aleks Kissinger ", - "Chris Heunen ", - "Alex Merry ", - NULL }; - - static const gchar license[] = - N_("TikZiT is free software; you can redistribute it and/or modify " - "it under the terms of the GNU General Public License as " - "published by the Free Software Foundation; either version 2 of the " - "License, or (at your option) any later version." - "\n\n" - "TikZiT is distributed in the hope that it will be useful, " - "but WITHOUT ANY WARRANTY; without even the implied warranty of " - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the " - "GNU General Public License for more details." - "\n\n" - "You should have received a copy of the GNU General Public License " - "along with TikZiT; if not, write to the Free Software " - "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, " - "MA 02110-1301, USA."); - - static const gchar copyright[] = - "Copyright \xc2\xa9 2010-2011 Aleks Kissinger, Chris Heunen and Alex Merry."; - - GdkPixbuf *logo = get_logo (LOGO_SIZE_128); - gtk_show_about_dialog (NULL, - "program-name", PACKAGE_NAME, - "logo", logo, - "authors", authors, - "translator-credits", _("translator-credits"), - "comments", _("A graph manipulation program for pgf/tikz graphs"), - "license", _(license), - "wrap-license", TRUE, - "copyright", copyright, - "version", PACKAGE_VERSION, - "website", "http://tikzit.sourceforge.net", - NULL); - g_object_unref (logo); -} - -static GtkActionEntry app_action_entries[] = { - /* - Fields: - * action name - * stock id or name of icon for action - * label for action (mark for translation with N_) - * accelerator (as understood by gtk_accelerator_parse()) - * tooltip (mark for translation with N_) - * callback - */ - { "New", GTK_STOCK_NEW, NULL, "N", - N_("Create a new graph"), G_CALLBACK (new_cb) }, - - { "RefreshShapes", NULL, N_("_Refresh shapes"), NULL, - N_(""), G_CALLBACK (refresh_shapes_cb) }, - - { "Quit", GTK_STOCK_QUIT, NULL, "Q", - N_("Quit the program"), G_CALLBACK (quit_cb) }, - - { "Tool", NULL, N_("_Tool") }, - - { "ShowPreferences", GTK_STOCK_PREFERENCES, N_("Configure TikZiT..."), NULL, - N_("Edit the TikZiT configuration"), G_CALLBACK (show_preferences_cb) }, - -#ifdef HAVE_POPPLER - { "ShowPreamble", NULL, N_("_Edit Preambles..."), NULL, - N_("Edit the preambles used to generate the preview"), G_CALLBACK (show_preamble_cb) }, -#endif - - { "ShowContextWindow", NULL, N_("_Context Window"), NULL, - N_("Show the contextual tools window"), G_CALLBACK (show_context_window_cb) }, - - /* HelpMenu */ - { "HelpManual", GTK_STOCK_HELP, N_("_Online manual"), "F1", - N_("TikZiT manual (online)"), G_CALLBACK (help_cb) }, - - { "About", GTK_STOCK_ABOUT, NULL, NULL, - N_("About this application"), G_CALLBACK (about_cb) }, -}; -static guint n_app_action_entries = G_N_ELEMENTS (app_action_entries); -// }}} -// {{{ Window actions - -static void open_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window openFile]; - [pool drain]; -} - -static void close_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window close]; - [pool drain]; -} - -static void save_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window saveActiveDocument]; - [pool drain]; -} - -static void save_as_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window saveActiveDocumentAs]; - [pool drain]; -} - -static void save_as_shape_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window saveActiveDocumentAsShape]; - [pool drain]; -} - -static void undo_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - TikzDocument *document = [window document]; - if ([document canUndo]) { - [document undo]; - } else { - g_warning ("Can't undo!\n"); - gtk_action_set_sensitive (action, FALSE); - } - - [pool drain]; -} - -static void redo_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - TikzDocument *document = [window document]; - if ([document canRedo]) { - [document redo]; - } else { - g_warning ("Can't redo!\n"); - gtk_action_set_sensitive (action, FALSE); - } - - [pool drain]; -} - -static void cut_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window selectionCutToClipboard]; - [pool drain]; -} - -static void copy_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window selectionCopyToClipboard]; - [pool drain]; -} - -static void paste_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window pasteFromClipboard]; - [pool drain]; -} - -static void delete_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [[window document] removeSelected]; - [pool drain]; -} - -static void select_all_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - TikzDocument *document = [window document]; - [[document pickSupport] selectAllNodes:[NSSet setWithArray:[[document graph] nodes]]]; - [pool drain]; -} - -static void deselect_all_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - TikzDocument *document = [window document]; - [[document pickSupport] deselectAllNodes]; - [[document pickSupport] deselectAllEdges]; - [pool drain]; -} - -static void flip_horiz_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [[window document] flipSelectedNodesHorizontally]; - [pool drain]; -} - -static void flip_vert_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [[window document] flipSelectedNodesVertically]; - [pool drain]; -} - -static void reverse_edges_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [[window document] reverseSelectedEdges]; - [pool drain]; -} - -static void bring_forward_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [[window document] bringSelectionForward]; - [pool drain]; -} - -static void send_backward_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [[window document] sendSelectionBackward]; - [pool drain]; -} - -static void bring_to_front_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [[window document] bringSelectionToFront]; - [pool drain]; -} - -static void send_to_back_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [[window document] sendSelectionToBack]; - [pool drain]; -} - -#ifdef HAVE_POPPLER -static void show_preview_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window presentPreview]; - [pool drain]; -} -#endif - -static void zoom_in_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window zoomIn]; - [pool drain]; -} - -static void zoom_out_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window zoomOut]; - [pool drain]; -} - -static void zoom_reset_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window zoomReset]; - [pool drain]; -} - -static void recent_chooser_item_activated_cb (GtkRecentChooser *chooser, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - gchar *uri, *path; - GError *error = NULL; - - uri = gtk_recent_chooser_get_current_uri (chooser); - - path = g_filename_from_uri (uri, NULL, NULL); - if (error) { - g_warning ("Could not convert uri \"%s\" to a local path: %s", uri, error->message); - g_error_free (error); - return; - } - - [window openFileAtPath:[NSString stringWithGlibFilename:path]]; - - g_free (uri); - g_free (path); - - [pool drain]; -} - - -static GtkActionEntry window_action_entries[] = { - /* - Fields: - * action name - * stock id or name of icon for action - * label for action (mark for translation with N_) - * accelerator (as understood by gtk_accelerator_parse()) - * tooltip (mark for translation with N_) - * callback - */ - { "FileMenu", NULL, N_("_File") }, - { "EditMenu", NULL, N_("_Edit") }, - { "ViewMenu", NULL, N_("_View") }, - { "HelpMenu", NULL, N_("_Help") }, - - { "Arrange", NULL, N_("_Arrange") }, - { "Zoom", NULL, N_("_Zoom") }, - - { "Open", GTK_STOCK_OPEN, N_("_Open\342\200\246") ,"O", - N_("Open a graph"), G_CALLBACK (open_cb) }, - - { "Close", GTK_STOCK_CLOSE, NULL, "W", - N_("Close the current graph"), G_CALLBACK (close_cb) }, - - { "ZoomIn", GTK_STOCK_ZOOM_IN, NULL, "plus", - NULL, G_CALLBACK (zoom_in_cb) }, - - { "ZoomOut", GTK_STOCK_ZOOM_OUT, NULL, "minus", - NULL, G_CALLBACK (zoom_out_cb) }, - - { "ZoomReset", GTK_STOCK_ZOOM_100, N_("_Reset zoom"), "0", - NULL, G_CALLBACK (zoom_reset_cb) }, - - { "Save", GTK_STOCK_SAVE, NULL, "S", - N_("Save the current graph"), G_CALLBACK (save_cb) }, - - { "SaveAs", GTK_STOCK_SAVE_AS, N_("Save _As\342\200\246"), NULL, - N_("Save the current graph with a different name"), G_CALLBACK (save_as_cb) }, - - { "SaveAsShape", NULL, N_("Save As S_hape\342\200\246"), NULL, - N_("Save the current graph as a shape for use in styles"), G_CALLBACK (save_as_shape_cb) }, - - { "Undo", GTK_STOCK_UNDO, NULL, "Z", - N_("Undo the last action"), G_CALLBACK (undo_cb) }, - - { "Redo", GTK_STOCK_REDO, NULL, "Z", - N_("Redo the last action"), G_CALLBACK (redo_cb) }, - - { "Cut", GTK_STOCK_CUT, NULL, NULL, - N_("Cut the selection"), G_CALLBACK (cut_cb) }, - - { "Copy", GTK_STOCK_COPY, NULL, NULL, - N_("Copy the selection"), G_CALLBACK (copy_cb) }, - - { "Paste", GTK_STOCK_PASTE, NULL, NULL, - N_("Paste the clipboard"), G_CALLBACK (paste_cb) }, - - { "Delete", GTK_STOCK_DELETE, NULL, "Delete", - N_("Delete the selection"), G_CALLBACK (delete_cb) }, - - { "SelectAll", GTK_STOCK_SELECT_ALL, NULL, "A", - N_("Select all nodes on the graph"), G_CALLBACK (select_all_cb) }, - - { "DeselectAll", NULL, N_("D_eselect all"), "A", - N_("Deselect everything"), G_CALLBACK (deselect_all_cb) }, - - { "FlipHoriz", NULL, N_("Flip nodes _horizonally"), NULL, - N_("Flip the selected nodes horizontally"), G_CALLBACK (flip_horiz_cb) }, - - { "FlipVert", NULL, N_("Flip nodes _vertically"), NULL, - N_("Flip the selected nodes vertically"), G_CALLBACK (flip_vert_cb) }, - - { "ReverseEdges", NULL, N_("Rever_se edges"), NULL, - N_("Reverse the selected edges"), G_CALLBACK (reverse_edges_cb) }, - - { "SendToBack", NULL, N_("Send to _back"), NULL, - N_("Send the selected nodes and edges to the back of the graph"), G_CALLBACK (send_to_back_cb) }, - - { "SendBackward", NULL, N_("Send b_ackward"), NULL, - N_("Send the selected nodes and edges backward"), G_CALLBACK (send_backward_cb) }, - - { "BringForward", NULL, N_("Bring f_orward"), NULL, - N_("Bring the selected nodes and edges forward"), G_CALLBACK (bring_forward_cb) }, - - { "BringToFront", NULL, N_("Bring to _front"), NULL, - N_("Bring the selected nodes and edges to the front of the graph"), G_CALLBACK (bring_to_front_cb) }, - - /* ViewMenu */ -#ifdef HAVE_POPPLER - { "ShowPreview", NULL, N_("_Preview"), "L", - N_("See the graph as it will look when rendered in LaTeX"), G_CALLBACK (show_preview_cb) }, -#endif -}; -static guint n_window_action_entries = G_N_ELEMENTS (window_action_entries); - -// }}} -// {{{ UI XML - -static const gchar ui_info[] = -"" -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -#ifdef HAVE_POPPLER -" " -" " -#endif -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -/* -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -*/ -""; - - - -// }}} -// {{{ Helper methods - -static void configure_recent_chooser (GtkRecentChooser *chooser) -{ - gtk_recent_chooser_set_local_only (chooser, TRUE); - gtk_recent_chooser_set_show_icons (chooser, FALSE); - gtk_recent_chooser_set_sort_type (chooser, GTK_RECENT_SORT_MRU); - - GtkRecentFilter *filter = gtk_recent_filter_new (); - gtk_recent_filter_add_application (filter, g_get_application_name()); - gtk_recent_chooser_set_filter (chooser, filter); -} - -static void tool_cb (GtkAction *action, id tool) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [app setActiveTool:tool]; - [pool drain]; -} - - - -// }}} -// {{{ API - -@implementation Menu - -- (id) init { - [self release]; - return nil; -} - -- (id) initForWindow:(Window*)window { - self = [super init]; - if (!self) { - return nil; - } - - GError *error = NULL; - - appActions = gtk_action_group_new ("TZApp"); - //gtk_action_group_set_translation_domain (actions, GETTEXT_PACKAGE); - gtk_action_group_add_actions (appActions, - app_action_entries, - n_app_action_entries, - app); - for (id tool in [app tools]) { - NSString *tooltip = [NSString stringWithFormat: - @"%@: %@ (%@)", [tool name], [tool helpText], [tool shortcut]]; - GtkAction *action = gtk_action_new ( - [[tool name] UTF8String], - [[tool name] UTF8String], - [tooltip UTF8String], - [tool stockId]); - gtk_action_group_add_action_with_accel ( - appActions, - action, - NULL); - g_signal_connect ( - G_OBJECT (action), - "activate", - G_CALLBACK (tool_cb), - tool); - g_object_unref (action); - } - - windowActions = gtk_action_group_new ("TZWindow"); - //gtk_action_group_set_translation_domain (windowActions, GETTEXT_PACKAGE); - - gtk_action_group_add_actions (windowActions, - window_action_entries, - n_window_action_entries, - window); - - GtkAction *action = gtk_recent_action_new ("OpenRecent", N_("Open _Recent"), NULL, NULL); - g_signal_connect (G_OBJECT (action), - "item-activated", - G_CALLBACK (recent_chooser_item_activated_cb), - window); - configure_recent_chooser (GTK_RECENT_CHOOSER (action)); - gtk_action_group_add_action_with_accel (windowActions, action, NULL); - g_object_unref (action); - - /* Save refs to actions that will need to be updated */ - undoAction = gtk_action_group_get_action (windowActions, "Undo"); - redoAction = gtk_action_group_get_action (windowActions, "Redo"); - pasteAction = gtk_action_group_get_action (windowActions, "Paste"); - - nodeSelBasedActionCount = 4; - nodeSelBasedActions = g_new (GtkAction*, nodeSelBasedActionCount); - nodeSelBasedActions[0] = gtk_action_group_get_action (windowActions, "Cut"); - nodeSelBasedActions[1] = gtk_action_group_get_action (windowActions, "Copy"); - nodeSelBasedActions[2] = gtk_action_group_get_action (windowActions, "FlipHoriz"); - nodeSelBasedActions[3] = gtk_action_group_get_action (windowActions, "FlipVert"); - edgeSelBasedActionCount = 1; - edgeSelBasedActions = g_new (GtkAction*, edgeSelBasedActionCount); - edgeSelBasedActions[0] = gtk_action_group_get_action (windowActions, "ReverseEdges"); - selBasedActionCount = 2; - selBasedActions = g_new (GtkAction*, selBasedActionCount); - selBasedActions[0] = gtk_action_group_get_action (windowActions, "Delete"); - selBasedActions[1] = gtk_action_group_get_action (windowActions, "DeselectAll"); - - - GtkUIManager *ui = gtk_ui_manager_new (); - gtk_ui_manager_insert_action_group (ui, windowActions, 0); - gtk_ui_manager_insert_action_group (ui, appActions, 1); - gtk_window_add_accel_group ([window gtkWindow], gtk_ui_manager_get_accel_group (ui)); - if (!gtk_ui_manager_add_ui_from_string (ui, ui_info, -1, &error)) - { - g_message ("Building menus failed: %s", error->message); - g_error_free (error); - g_object_unref (ui); - [self release]; - return nil; - } - guint tool_merge_id = gtk_ui_manager_new_merge_id (ui); - for (id tool in [app tools]) { - gtk_ui_manager_add_ui (ui, - tool_merge_id, - "/ui/MenuBar/EditMenu/Tool", - [[tool name] UTF8String], - [[tool name] UTF8String], - GTK_UI_MANAGER_AUTO, - FALSE); - } - menubar = gtk_ui_manager_get_widget (ui, "/MenuBar"); - g_object_ref_sink (menubar); - g_object_unref (ui); - - return self; -} - -- (void) dealloc { - g_free (nodeSelBasedActions); - g_free (edgeSelBasedActions); - g_free (selBasedActions); - g_object_unref (menubar); - g_object_unref (appActions); - g_object_unref (windowActions); - - [super dealloc]; -} - -@synthesize menubar; - -- (void) setUndoActionEnabled:(BOOL)enabled { - gtk_action_set_sensitive (undoAction, enabled); -} - -- (void) setUndoActionDetail:(NSString*)detail { - gtk_action_set_detailed_label (undoAction, "_Undo", [detail UTF8String]); -} - -- (void) setRedoActionEnabled:(BOOL)enabled { - gtk_action_set_sensitive (redoAction, enabled); -} - -- (void) setRedoActionDetail:(NSString*)detail { - gtk_action_set_detailed_label (redoAction, "_Redo", [detail UTF8String]); -} - -- (GtkAction*) pasteAction { - return pasteAction; -} - -- (void) notifySelectionChanged:(PickSupport*)pickSupport { - BOOL hasSelectedNodes = [[pickSupport selectedNodes] count] > 0; - BOOL hasSelectedEdges = [[pickSupport selectedEdges] count] > 0; - for (int i = 0; i < nodeSelBasedActionCount; ++i) { - if (nodeSelBasedActions[i]) { - gtk_action_set_sensitive (nodeSelBasedActions[i], hasSelectedNodes); - } - } - for (int i = 0; i < edgeSelBasedActionCount; ++i) { - if (edgeSelBasedActions[i]) { - gtk_action_set_sensitive (edgeSelBasedActions[i], hasSelectedEdges); - } - } - for (int i = 0; i < selBasedActionCount; ++i) { - if (selBasedActions[i]) { - gtk_action_set_sensitive (selBasedActions[i], hasSelectedNodes || hasSelectedEdges); - } - } -} - -@end - -// }}} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/NSError+Glib.h b/tikzit-1/src/gtk/NSError+Glib.h deleted file mode 100644 index 137977e..0000000 --- a/tikzit-1/src/gtk/NSError+Glib.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import -#import - -@interface NSError(Glib) -+ (id) errorWithGError:(GError*)gerror; -@end - -void GErrorToNSError(GError *errorIn, NSError **errorOut); -void logGError (GError *error, NSString *message); - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/NSError+Glib.m b/tikzit-1/src/gtk/NSError+Glib.m deleted file mode 100644 index f466d9e..0000000 --- a/tikzit-1/src/gtk/NSError+Glib.m +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "NSError+Glib.h" -#import "TZFoundation.h" - -@implementation NSError(Glib) -+ (id) errorWithGError:(GError*)gerror { - if (!gerror) - return nil; - - NSString *message = [NSString stringWithUTF8String:gerror->message]; - NSString *domain = [NSString stringWithUTF8String:g_quark_to_string(gerror->domain)]; - - NSMutableDictionary *errorDetail = [NSMutableDictionary dictionaryWithObject:message - forKey:NSLocalizedDescriptionKey]; - return [self errorWithDomain:domain code:gerror->code userInfo:errorDetail]; -} -@end - -void GErrorToNSError(GError *errorIn, NSError **errorOut) -{ - if (errorOut && errorIn) { - *errorOut = [NSError errorWithGError:errorIn]; - } -} - -void logGError (GError *error, NSString *message) { - if (message == nil) { - NSLog (@"%s", error->message); - } else { - NSLog (@"%@: %s", message, error->message); - } -} - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/NSFileManager+Glib.h b/tikzit-1/src/gtk/NSFileManager+Glib.h deleted file mode 100644 index cb49fcb..0000000 --- a/tikzit-1/src/gtk/NSFileManager+Glib.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import - -@interface NSFileManager(Glib) -/** - * Creates a directory in the system temp directory - */ -- (NSString*) createTempDirectoryWithError:(NSError**)error; -/** - * Creates a directory in the system temp directory - */ -- (NSString*) createTempDirectory; -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/NSFileManager+Glib.m b/tikzit-1/src/gtk/NSFileManager+Glib.m deleted file mode 100644 index b3e9de6..0000000 --- a/tikzit-1/src/gtk/NSFileManager+Glib.m +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "NSFileManager+Glib.h" -#import "TZFoundation.h" -#import "mkdtemp.h" - -@implementation NSFileManager(Glib) - -- (NSString*) createTempDirectoryWithError:(NSError**)error { - NSString *result = nil; -#if GLIB_CHECK_VERSION (2, 30, 0) - GError *gerror = NULL; - gchar *dir = g_dir_make_tmp ("tikzitXXXXXX", &gerror); - GErrorToNSError (gerror, error); - if (dir) - result = [NSString stringWithGlibFilename:dir]; - g_free (dir); -#else -//#if (!GLIB_CHECK_VERSION (2, 26, 0)) -#define g_mkdtemp mkdtemp -//#endif - gchar *dir = g_build_filename (g_get_tmp_dir(), "tikzitXXXXXX", NULL); - gchar *rdir = g_mkdtemp (dir); - if (rdir) { - result = [NSString stringWithGlibFilename:dir]; - } else if (error) { - *error = [NSError errorWithLibcError:errno]; - } - g_free (dir); -#endif - return result; -} - -- (NSString*) createTempDirectory { - return [self createTempDirectoryWithError:NULL]; -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/NSString+Glib.h b/tikzit-1/src/gtk/NSString+Glib.h deleted file mode 100644 index ac59833..0000000 --- a/tikzit-1/src/gtk/NSString+Glib.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import -#import - -@interface NSString(Glib) -/** - * Initialise a string with a string in the GLib filename encoding - */ -- (id) initWithGlibFilename:(const gchar *)filename; -/** - * Create a string from a string in the GLib filename encoding - */ -+ (id) stringWithGlibFilename:(const gchar *)filename; -/** - * Get a copy of the string in GLib filename encoding. - * - * This will need to be freed with g_free. - */ -- (gchar*)glibFilename; -/** - * Get a copy of the string as a GLib URI - * - * This will need to be freed with g_free. - */ -- (gchar*)glibUriWithError:(NSError**)error; -/** - * Get a copy of the string as a GLib URI - * - * This will need to be freed with g_free. - */ -- (gchar*)glibUri; -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/NSString+Glib.m b/tikzit-1/src/gtk/NSString+Glib.m deleted file mode 100644 index b6dc765..0000000 --- a/tikzit-1/src/gtk/NSString+Glib.m +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "NSString+Glib.h" -#import "TZFoundation.h" - -@implementation NSString(Glib) -+ (id) stringWithGlibFilename:(const gchar *)filename { - return [[[self alloc] initWithGlibFilename:filename] autorelease]; -} - -- (id) initWithGlibFilename:(const gchar *)filename { - if (self == nil) { - return nil; - } - - if (filename == NULL) { - [self release]; - return nil; - } - - GError *error = NULL; - gchar *utf8file = g_filename_to_utf8 (filename, -1, NULL, NULL, &error); - if (utf8file == NULL) { - if (error) - logGError (error, @"Failed to convert a GLib filename to UTF8"); - [self release]; - return nil; - } - - self = [self initWithUTF8String:utf8file]; - g_free (utf8file); - - return self; -} - -- (gchar*)glibFilenameWithError:(NSError**)error { - GError *gerror = NULL; - gchar *result = g_filename_from_utf8 ([self UTF8String], -1, NULL, NULL, &gerror); - GErrorToNSError (gerror, error); - if (gerror) { - logGError (gerror, @"Failed to convert a UTF8 string to a GLib filename"); - } - return result; -} - -- (gchar*)glibFilename { - return [self glibFilenameWithError:NULL]; -} - -- (gchar*)glibUriWithError:(NSError**)error { - gchar *filepath; - gchar *uri; - NSError *cause = nil; - - filepath = [self glibFilenameWithError:&cause]; - if (!filepath) { - if (error) { - NSString *message = [NSString stringWithFormat:@"Could not convert \"%@\" to the GLib filename encoding", self]; - *error = [NSError errorWithMessage:message code:TZ_ERR_OTHER cause:cause]; - } - return NULL; - } - - GError *gerror = NULL; - GError **gerrorptr = error ? &gerror : NULL; - uri = g_filename_to_uri (filepath, NULL, gerrorptr); - if (!uri && error) { - NSString *message = [NSString stringWithFormat:@"Could not convert \"%@\" to a GLib URI", self]; - *error = [NSError errorWithMessage:message code:TZ_ERR_BADFORMAT cause:[NSError errorWithGError:gerror]]; - } - g_free (filepath); - return uri; -} - -- (gchar*)glibUri { - return [self glibUriWithError:NULL]; -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/Node+Render.h b/tikzit-1/src/gtk/Node+Render.h deleted file mode 100644 index 60d2573..0000000 --- a/tikzit-1/src/gtk/Node+Render.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "Node.h" -#import "RenderContext.h" -#import "Surface.h" - -enum NodeState { - NodeNormal, - NodeSelected, - NodeHighlighted -}; - -@interface Node(Render) - -- (Transformer*) shapeTransformerForSurface:(id)surface; -// the total rendered bounds, excluding label -- (NSRect) renderBoundsForSurface:(id)surface; -- (NSRect) renderBoundsWithLabelForSurface:(id)surface; -- (NSString*) renderedLabel; -- (NSSize) renderedLabelSizeInContext:(id)context; -- (void) renderLabelToSurface:(id)surface withContext:(id)context; -- (void) renderLabelAt:(NSPoint)point withContext:(id)context; -- (void) renderToSurface:(id)surface withContext:(id)context state:(enum NodeState)state; -- (BOOL) hitByPoint:(NSPoint)p onSurface:(id)surface; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/Node+Render.m b/tikzit-1/src/gtk/Node+Render.m deleted file mode 100644 index 907d818..0000000 --- a/tikzit-1/src/gtk/Node+Render.m +++ /dev/null @@ -1,188 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * Copyright 2010 Chris Heunen - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "Node+Render.h" -#import "Shape.h" -#import "Shape+Render.h" -#import "ShapeNames.h" - -#define MAX_LABEL_LENGTH 10 -#define LABEL_PADDING_X 2 -#define LABEL_PADDING_Y 2 - -@implementation Node (Render) - -- (Shape*) shapeToRender { - if (style) { - return [Shape shapeForName:[style shapeName]]; - } else { - return [Shape shapeForName:SHAPE_CIRCLE]; - } -} - -- (Transformer*) shapeTransformerForSurface:(id)surface { - return [self shapeTransformerFromTransformer:[surface transformer]]; -} - -- (NSRect) renderBoundsUsingShapeTransform:(Transformer*)shapeTrans { - float strokeThickness = style ? [style strokeThickness] : [NodeStyle defaultStrokeThickness]; - NSRect screenBounds = [shapeTrans rectToScreen:[[self shapeToRender] boundingRect]]; - screenBounds = NSInsetRect(screenBounds, -strokeThickness, -strokeThickness); - return screenBounds; -} - -- (NSRect) renderBoundsForSurface:(id)surface { - return [self renderBoundsUsingShapeTransform:[self shapeTransformerForSurface:surface]]; -} - -- (NSRect) renderBoundsWithLabelForSurface:(id)surface { - NSRect nodeBounds = [self renderBoundsForSurface:surface]; - NSRect labelRect = NSZeroRect; - if (![label isEqual:@""]) { - id cr = [surface createRenderContext]; - labelRect.size = [self renderedLabelSizeInContext:cr]; - NSPoint nodePos = [[surface transformer] toScreen:point]; - labelRect.origin.x = nodePos.x - (labelRect.size.width / 2); - labelRect.origin.y = nodePos.y - (labelRect.size.height / 2); - } - return NSUnionRect(nodeBounds, labelRect); -} - -- (RColor) strokeColor { - if (style) { - return [[style strokeColorRGB] rColor]; - } else { - return MakeRColor (0.4, 0.4, 0.7, 0.8); - } -} - -- (RColor) fillColor { - if (style) { - return [[style fillColorRGB] rColor]; - } else { - return MakeRColor (0.4, 0.4, 0.7, 0.3); - } -} - -- (NSString*) renderedLabel { - NSString *r_label = [label stringByExpandingLatexConstants]; - if ([r_label length] > MAX_LABEL_LENGTH) { - r_label = [[[r_label substringToIndex:MAX_LABEL_LENGTH-1] stringByTrimmingSpaces] stringByAppendingString:@"..."]; - } else { - r_label = [r_label stringByTrimmingSpaces]; - } - return r_label; -} - -- (NSSize) renderedLabelSizeInContext:(id)context { - NSSize result = {0, 0}; - if (![label isEqual:@""]) { - NSString *r_label = [self renderedLabel]; - - id layout = [context layoutText:r_label withSize:9]; - - result = [layout size]; - result.width += LABEL_PADDING_X; - result.height += LABEL_PADDING_Y; - } - return result; -} - -- (void) renderLabelToSurface:(id )surface withContext:(id)context { - [self renderLabelAt:[[surface transformer] toScreen:point] withContext:context]; -} - -- (void) renderLabelAt:(NSPoint)p withContext:(id)context { - // draw latex code overlayed on node - if (![label isEqual:@""]) { - [context saveState]; - - NSString *r_label = [self renderedLabel]; - id layout = [context layoutText:r_label withSize:9]; - - NSSize labelSize = [layout size]; - - NSRect textBounds = NSMakeRect (p.x - labelSize.width/2, - p.y - labelSize.height/2, - labelSize.width, - labelSize.height); - NSRect backRect = NSInsetRect (textBounds, -LABEL_PADDING_X, -LABEL_PADDING_Y); - - [context startPath]; - [context setLineWidth:1.0]; - [context rect:backRect]; - RColor fColor = MakeRColor (1.0, 1.0, 0.5, 0.7); - RColor sColor = MakeRColor (0.5, 0.0, 0.0, 0.7); - [context strokePathWithColor:sColor andFillWithColor:fColor]; - - [layout showTextAt:textBounds.origin withColor:BlackRColor]; - - [context restoreState]; - } -} - -- (void) renderToSurface:(id )surface withContext:(id)context state:(enum NodeState)state { - Transformer *shapeTrans = [self shapeTransformerForSurface:surface]; - float strokeThickness = style ? [style strokeThickness] : [NodeStyle defaultStrokeThickness]; - - [context saveState]; - - [[self shapeToRender] drawPathWithTransform:shapeTrans andContext:context]; - - [context setLineWidth:strokeThickness]; - if (!style) { - [context setLineDash:3.0]; - } - [context strokePathWithColor:[self strokeColor] andFillWithColor:[self fillColor]]; - - if (state != NodeNormal) { - [context setLineWidth:strokeThickness + 4.0]; - [context setLineDash:0.0]; - float alpha = 0.0f; - if (state == NodeSelected) - alpha = 0.5f; - else if (state == NodeHighlighted) - alpha = 0.25f; - RColor selectionColor = MakeSolidRColor(0.61f, 0.735f, 1.0f); - - [[self shapeToRender] drawPathWithTransform:shapeTrans andContext:context]; - [context strokePathWithColor:selectionColor andFillWithColor:selectionColor usingAlpha:alpha]; - } - - [context restoreState]; - [self renderLabelToSurface:surface withContext:context]; -} - -- (BOOL) hitByPoint:(NSPoint)p onSurface:(id)surface { - Transformer *shapeTrans = [self shapeTransformerForSurface:surface]; - - NSRect screenBounds = [self renderBoundsUsingShapeTransform:shapeTrans]; - if (!NSPointInRect(p, screenBounds)) { - return NO; - } - - float strokeThickness = style ? [style strokeThickness] : [NodeStyle defaultStrokeThickness]; - id ctx = [surface createRenderContext]; - [ctx setLineWidth:strokeThickness]; - [[self shapeToRender] drawPathWithTransform:shapeTrans andContext:ctx]; - return [ctx strokeIncludesPoint:p] || [ctx fillIncludesPoint:p]; -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/NodeStyle+Gtk.h b/tikzit-1/src/gtk/NodeStyle+Gtk.h deleted file mode 100644 index 4fa5edd..0000000 --- a/tikzit-1/src/gtk/NodeStyle+Gtk.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "NodeStyle.h" -#import - -@interface NodeStyle (Gtk) - -- (GdkColor) strokeColor; -- (void) setStrokeColor:(GdkColor)color; -- (GdkColor) fillColor; -- (void) setFillColor:(GdkColor)color; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/NodeStyle+Gtk.m b/tikzit-1/src/gtk/NodeStyle+Gtk.m deleted file mode 100644 index 1954def..0000000 --- a/tikzit-1/src/gtk/NodeStyle+Gtk.m +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "NodeStyle+Gtk.h" -#import "ColorRGB+Gtk.h" - -@implementation NodeStyle (Gtk) - -- (GdkColor) strokeColor { - return [[self strokeColorRGB] gdkColor]; -} - -- (void) setStrokeColor:(GdkColor)color { - [self setStrokeColorRGB:[ColorRGB colorWithGdkColor:color]]; -} - -- (GdkColor) fillColor { - return [[self fillColorRGB] gdkColor]; -} - -- (void) setFillColor:(GdkColor)color { - [self setFillColorRGB:[ColorRGB colorWithGdkColor:color]]; -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/NodeStyle+Render.h b/tikzit-1/src/gtk/NodeStyle+Render.h deleted file mode 100644 index 00edd27..0000000 --- a/tikzit-1/src/gtk/NodeStyle+Render.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "NodeStyle.h" -#import "RenderContext.h" -#import "Surface.h" - -@interface NodeStyle (Render) - -- (void) renderToSurface:(id)surface withContext:(id)context at:(NSPoint)p; -- (BOOL) hitByPoint:(NSPoint)p onSurface:(id)surface; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/NodeStyle+Storage.h b/tikzit-1/src/gtk/NodeStyle+Storage.h deleted file mode 100644 index 7649414..0000000 --- a/tikzit-1/src/gtk/NodeStyle+Storage.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "NodeStyle.h" -#import "Configuration.h" - -@interface NodeStyle (Storage) - -- (id) initFromConfigurationGroup:(NSString*)groupName config:(Configuration*)configFile; -- (void) storeToConfigurationGroup:(NSString*)groupName config:(Configuration*)configFile; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/NodeStyle+Storage.m b/tikzit-1/src/gtk/NodeStyle+Storage.m deleted file mode 100644 index 088b062..0000000 --- a/tikzit-1/src/gtk/NodeStyle+Storage.m +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * Copyright 2010 Chris Heunen - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "NodeStyle+Storage.h" -#import "ColorRGB+IntegerListStorage.h" - -@implementation NodeStyle (Storage) - -- (id) initFromConfigurationGroup:(NSString*)groupName config:(Configuration*)configFile { - self = [self init]; - - if (self) { - [self setName:[configFile stringEntry:@"Name" inGroup:groupName withDefault:name]]; - [self setCategory:[configFile stringEntry:@"Category" inGroup:groupName withDefault:category]]; - [self setShapeName:[configFile stringEntry:@"ShapeName" inGroup:groupName withDefault:shapeName]]; - [self setScale:[configFile doubleEntry:@"Scale" inGroup:groupName withDefault:scale]]; - [self setStrokeThickness:[configFile integerEntry:@"StrokeThickness" - inGroup:groupName - withDefault:strokeThickness]]; - [self setStrokeColorRGB: - [ColorRGB colorFromValueList: - [configFile integerListEntry:@"StrokeColor" - inGroup:groupName - withDefault:[strokeColorRGB valueList]]]]; - [self setFillColorRGB: - [ColorRGB colorFromValueList: - [configFile integerListEntry:@"FillColor" - inGroup:groupName - withDefault:[fillColorRGB valueList]]]]; - } - - return self; -} - -- (void) storeToConfigurationGroup:(NSString*)groupName config:(Configuration*)configFile { - [configFile setStringEntry:@"Name" inGroup:groupName value:[self name]]; - [configFile setStringEntry:@"Category" inGroup:groupName value:[self category]]; - [configFile setStringEntry:@"ShapeName" inGroup:groupName value:[self shapeName]]; - [configFile setDoubleEntry:@"Scale" inGroup:groupName value:[self scale]]; - [configFile setIntegerEntry:@"StrokeThickness" inGroup:groupName value:[self strokeThickness]]; - [configFile setIntegerListEntry:@"StrokeColor" inGroup:groupName value:[[self strokeColorRGB] valueList]]; - [configFile setIntegerListEntry:@"FillColor" inGroup:groupName value:[[self fillColorRGB] valueList]]; -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/NodeStyleEditor.h b/tikzit-1/src/gtk/NodeStyleEditor.h deleted file mode 100644 index b45c992..0000000 --- a/tikzit-1/src/gtk/NodeStyleEditor.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class NodeStyle; - -@interface NodeStyleEditor: NSObject { - NodeStyle *style; - GtkTable *table; - GtkEntry *nameEdit; - GtkComboBox *shapeNameCombo; - GtkColorButton *strokeColorButton; - GtkWidget *makeStrokeTexSafeButton; - GtkColorButton *fillColorButton; - GtkWidget *makeFillTexSafeButton; - GtkAdjustment *scaleAdj; - BOOL blockSignals; -} - -@property (retain) NodeStyle *style; -@property (readonly) GtkWidget *widget; - -- (id) init; - -- (void) selectNameField; - -@end - -// vim:ft=objc:ts=4:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/NodeStyleEditor.m b/tikzit-1/src/gtk/NodeStyleEditor.m deleted file mode 100644 index fcf4147..0000000 --- a/tikzit-1/src/gtk/NodeStyleEditor.m +++ /dev/null @@ -1,477 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "NodeStyleEditor.h" -#import "NodeStyle.h" -#import "NodeStyle+Gtk.h" -#import "Shape.h" - -static const guint row_count = 5; - -// {{{ Internal interfaces -// {{{ GTK+ Callbacks -static void style_name_edit_changed_cb (GtkEditable *widget, NodeStyleEditor *editor); -static void style_shape_combo_changed_cb (GtkComboBox *widget, NodeStyleEditor *editor); -static void stroke_color_changed_cb (GtkColorButton *widget, NodeStyleEditor *editor); -static void fill_color_changed_cb (GtkColorButton *widget, NodeStyleEditor *editor); -static void make_stroke_safe_button_clicked_cb (GtkButton *widget, NodeStyleEditor *editor); -static void make_fill_safe_button_clicked_cb (GtkButton *widget, NodeStyleEditor *editor); -static void scale_adjustment_changed_cb (GtkAdjustment *widget, NodeStyleEditor *editor); -// }}} -// {{{ Notifications - -@interface NodeStyleEditor (Notifications) -- (void) shapeDictionaryReplaced:(NSNotification*)n; -- (void) nameChangedTo:(NSString*)value; -- (void) shapeNameChangedTo:(NSString*)value; -- (void) strokeColorChangedTo:(GdkColor)value; -- (void) makeStrokeColorTexSafe; -- (void) fillColorChangedTo:(GdkColor)value; -- (void) makeFillColorTexSafe; -- (void) scaleChangedTo:(double)value; -@end - -// }}} -// {{{ Private - -@interface NodeStyleEditor (Private) -- (void) loadShapeNames; -- (void) setActiveShapeName:(NSString*)name; -@end - -// }}} -// }}} -// {{{ API - -@implementation NodeStyleEditor - -- (void) _addWidget:(GtkWidget*)w withLabel:(gchar *)label atRow:(guint)row { - NSAssert(row < row_count, @"row_count is wrong!"); - - GtkWidget *l = gtk_label_new (label); - gtk_misc_set_alignment (GTK_MISC (l), 0, 0.5); - gtk_widget_show (l); - gtk_widget_show (w); - - gtk_table_attach (table, l, - 0, 1, row, row+1, // l, r, t, b - GTK_FILL, // x opts - GTK_FILL | GTK_EXPAND, // y opts - 5, // x padding - 0); // y padding - - gtk_table_attach (table, w, - 1, 2, row, row+1, // l, r, t, b - GTK_FILL | GTK_EXPAND, // x opts - GTK_FILL | GTK_EXPAND, // y opts - 0, // x padding - 0); // y padding -} - -- (GtkWidget*) _createMakeColorTexSafeButton:(NSString*)type { - GtkWidget *b = gtk_button_new (); - GtkWidget *icon = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_BUTTON); - gtk_widget_show (icon); - gtk_container_add (GTK_CONTAINER (b), icon); - NSString *ttip = [NSString stringWithFormat:@"The %@ colour is not a predefined TeX colour.\nClick here to choose the nearest TeX-safe colour.", type]; - gtk_widget_set_tooltip_text (b, [ttip UTF8String]); - return b; -} - -- (id) init { - self = [super init]; - - if (self != nil) { - style = nil; - table = GTK_TABLE (gtk_table_new (row_count, 2, FALSE)); - gtk_table_set_col_spacings (table, 6); - gtk_table_set_row_spacings (table, 6); - gtk_widget_set_sensitive (GTK_WIDGET (table), FALSE); - blockSignals = NO; - - /** - * Name - */ - nameEdit = GTK_ENTRY (gtk_entry_new ()); - g_object_ref_sink (nameEdit); - [self _addWidget:GTK_WIDGET (nameEdit) - withLabel:"Name" - atRow:0]; - g_signal_connect (G_OBJECT (nameEdit), - "changed", - G_CALLBACK (style_name_edit_changed_cb), - self); - - - /** - * Shape - */ - GtkListStore *store = gtk_list_store_new (1, G_TYPE_STRING); - shapeNameCombo = GTK_COMBO_BOX (gtk_combo_box_new_with_model (GTK_TREE_MODEL (store))); - GtkCellRenderer *cellRend = gtk_cell_renderer_text_new (); - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (shapeNameCombo), - cellRend, - TRUE); - gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (shapeNameCombo), cellRend, "text", 0); - g_object_ref_sink (shapeNameCombo); - [self _addWidget:GTK_WIDGET (shapeNameCombo) - withLabel:"Shape" - atRow:1]; - g_signal_connect (G_OBJECT (shapeNameCombo), - "changed", - G_CALLBACK (style_shape_combo_changed_cb), - self); - - - /** - * Stroke colour - */ - GtkWidget *strokeBox = gtk_hbox_new (FALSE, 0); - [self _addWidget:strokeBox - withLabel:"Stroke colour" - atRow:2]; - strokeColorButton = GTK_COLOR_BUTTON (gtk_color_button_new ()); - g_object_ref_sink (strokeColorButton); - gtk_widget_show (GTK_WIDGET (strokeColorButton)); - gtk_box_pack_start (GTK_BOX (strokeBox), GTK_WIDGET (strokeColorButton), - FALSE, FALSE, 0); - makeStrokeTexSafeButton = [self _createMakeColorTexSafeButton:@"stroke"]; - g_object_ref_sink (makeStrokeTexSafeButton); - gtk_box_pack_start (GTK_BOX (strokeBox), makeStrokeTexSafeButton, - FALSE, FALSE, 0); - g_signal_connect (G_OBJECT (strokeColorButton), - "color-set", - G_CALLBACK (stroke_color_changed_cb), - self); - g_signal_connect (G_OBJECT (makeStrokeTexSafeButton), - "clicked", - G_CALLBACK (make_stroke_safe_button_clicked_cb), - self); - - - /** - * Fill colour - */ - GtkWidget *fillBox = gtk_hbox_new (FALSE, 0); - [self _addWidget:fillBox - withLabel:"Fill colour" - atRow:3]; - fillColorButton = GTK_COLOR_BUTTON (gtk_color_button_new ()); - g_object_ref_sink (fillColorButton); - gtk_widget_show (GTK_WIDGET (fillColorButton)); - gtk_box_pack_start (GTK_BOX (fillBox), GTK_WIDGET (fillColorButton), - FALSE, FALSE, 0); - makeFillTexSafeButton = [self _createMakeColorTexSafeButton:@"fill"]; - g_object_ref_sink (makeFillTexSafeButton); - gtk_box_pack_start (GTK_BOX (fillBox), makeFillTexSafeButton, - FALSE, FALSE, 0); - g_signal_connect (G_OBJECT (fillColorButton), - "color-set", - G_CALLBACK (fill_color_changed_cb), - self); - g_signal_connect (G_OBJECT (makeFillTexSafeButton), - "clicked", - G_CALLBACK (make_fill_safe_button_clicked_cb), - self); - - - /** - * Scale - */ - scaleAdj = GTK_ADJUSTMENT (gtk_adjustment_new ( - 1.0, // value - 0.0, // lower - 50.0, // upper - 0.20, // step - 1.0, // page - 0.0)); // (irrelevant) - g_object_ref_sink (scaleAdj); - GtkWidget *scaleSpin = gtk_spin_button_new (scaleAdj, 0.0, 2); - [self _addWidget:scaleSpin - withLabel:"Scale" - atRow:4]; - g_signal_connect (G_OBJECT (scaleAdj), - "value-changed", - G_CALLBACK (scale_adjustment_changed_cb), - self); - - [self loadShapeNames]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(shapeDictionaryReplaced:) - name:@"ShapeDictionaryReplaced" - object:[Shape class]]; - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - g_object_unref (nameEdit); - g_object_unref (shapeNameCombo); - g_object_unref (strokeColorButton); - g_object_unref (makeStrokeTexSafeButton); - g_object_unref (fillColorButton); - g_object_unref (makeFillTexSafeButton); - g_object_unref (scaleAdj); - g_object_unref (table); - [style release]; - - [super dealloc]; -} - -- (NodeStyle*) style { - return style; -} - -- (void) setStyle:(NodeStyle*)s { - blockSignals = YES; - NodeStyle *oldStyle = style; - style = [s retain]; - - if (style != nil) { - gtk_widget_set_sensitive (GTK_WIDGET (table), TRUE); - - gtk_entry_set_text(nameEdit, [[style name] UTF8String]); - - [self setActiveShapeName:[style shapeName]]; - - GdkColor c = [style strokeColor]; - gtk_color_button_set_color(strokeColorButton, &c); - - gtk_widget_set_visible (makeStrokeTexSafeButton, ([[style strokeColorRGB] name] == nil)); - - c = [style fillColor]; - gtk_color_button_set_color(fillColorButton, &c); - - gtk_widget_set_visible (makeFillTexSafeButton, ([[style fillColorRGB] name] == nil)); - - gtk_adjustment_set_value(scaleAdj, [style scale]); - } else { - gtk_entry_set_text(nameEdit, ""); - [self setActiveShapeName:nil]; - gtk_widget_set_visible (makeStrokeTexSafeButton, FALSE); - gtk_widget_set_visible (makeFillTexSafeButton, FALSE); - gtk_adjustment_set_value(scaleAdj, 1.0); - gtk_widget_set_sensitive (GTK_WIDGET (table), FALSE); - } - - [oldStyle release]; - blockSignals = NO; -} - -- (GtkWidget*) widget { - return GTK_WIDGET (table); -} - -- (void) selectNameField { - gtk_widget_grab_focus (GTK_WIDGET (nameEdit)); - gtk_editable_select_region (GTK_EDITABLE (nameEdit), 0, -1); -} - -@end - -// }}} -// {{{ Notifications - -@implementation NodeStyleEditor (Notifications) -- (void) shapeDictionaryReplaced:(NSNotification*)n { - blockSignals = YES; - - [self loadShapeNames]; - [self setActiveShapeName:[style shapeName]]; - - blockSignals = NO; -} - -- (void) nameChangedTo:(NSString*)value { - [style setName:value]; -} - -- (void) shapeNameChangedTo:(NSString*)value { - [style setShapeName:value]; -} - -- (void) strokeColorChangedTo:(GdkColor)value { - [style setStrokeColor:value]; - gtk_widget_set_visible (makeStrokeTexSafeButton, - [[style strokeColorRGB] name] == nil); -} - -- (void) makeStrokeColorTexSafe { - if (style != nil) { - [[style strokeColorRGB] setToClosestHashed]; - GdkColor color = [style strokeColor]; - gtk_color_button_set_color(strokeColorButton, &color); - gtk_widget_set_visible (makeStrokeTexSafeButton, FALSE); - } -} - -- (void) fillColorChangedTo:(GdkColor)value { - [style setFillColor:value]; - gtk_widget_set_visible (makeFillTexSafeButton, - [[style fillColorRGB] name] == nil); -} - -- (void) makeFillColorTexSafe { - if (style != nil) { - [[style fillColorRGB] setToClosestHashed]; - GdkColor color = [style fillColor]; - gtk_color_button_set_color(fillColorButton, &color); - gtk_widget_set_visible (makeFillTexSafeButton, FALSE); - } -} - -- (void) scaleChangedTo:(double)value { - [style setScale:value]; -} -@end - -// }}} -// {{{ Private - -@implementation NodeStyleEditor (Private) -- (BOOL) signalsBlocked { return blockSignals; } - -- (void) loadShapeNames { - blockSignals = YES; - - gtk_combo_box_set_active (shapeNameCombo, -1); - - GtkListStore *list = GTK_LIST_STORE (gtk_combo_box_get_model (shapeNameCombo)); - gtk_list_store_clear (list); - - NSEnumerator *en = [[Shape shapeDictionary] keyEnumerator]; - NSString *shapeName; - GtkTreeIter iter; - while ((shapeName = [en nextObject]) != nil) { - gtk_list_store_append (list, &iter); - gtk_list_store_set (list, &iter, 0, [shapeName UTF8String], -1); - } - - blockSignals = NO; -} - -- (void) setActiveShapeName:(NSString*)name { - if (name == nil) { - gtk_combo_box_set_active (shapeNameCombo, -1); - return; - } - const gchar *shapeName = [name UTF8String]; - - GtkTreeModel *model = gtk_combo_box_get_model (shapeNameCombo); - GtkTreeIter iter; - if (gtk_tree_model_get_iter_first (model, &iter)) { - do { - gchar *rowShapeName; - gtk_tree_model_get (model, &iter, 0, &rowShapeName, -1); - if (g_strcmp0 (shapeName, rowShapeName) == 0) { - gtk_combo_box_set_active_iter (shapeNameCombo, &iter); - g_free (rowShapeName); - return; - } - g_free (rowShapeName); - } while (gtk_tree_model_iter_next (model, &iter)); - } -} -@end - -// }}} -// {{{ GTK+ callbacks - -static void style_name_edit_changed_cb (GtkEditable *widget, NodeStyleEditor *editor) { - if ([editor signalsBlocked]) - return; - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - const gchar *contents = gtk_entry_get_text (GTK_ENTRY (widget)); - [editor nameChangedTo:[NSString stringWithUTF8String:contents]]; - - [pool drain]; -} - -static void style_shape_combo_changed_cb (GtkComboBox *widget, NodeStyleEditor *editor) { - if ([editor signalsBlocked]) - return; - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - GtkTreeIter iter; - gtk_combo_box_get_active_iter (widget, &iter); - gchar *shapeName = NULL; - gtk_tree_model_get (gtk_combo_box_get_model (widget), &iter, 0, &shapeName, -1); - [editor shapeNameChangedTo:[NSString stringWithUTF8String:shapeName]]; - g_free (shapeName); - - [pool drain]; -} - -static void stroke_color_changed_cb (GtkColorButton *widget, NodeStyleEditor *editor) { - if ([editor signalsBlocked]) - return; - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - GdkColor color; - gtk_color_button_get_color (widget, &color); - [editor strokeColorChangedTo:color]; - - [pool drain]; -} - -static void fill_color_changed_cb (GtkColorButton *widget, NodeStyleEditor *editor) { - if ([editor signalsBlocked]) - return; - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - GdkColor color; - gtk_color_button_get_color (widget, &color); - [editor fillColorChangedTo:color]; - - [pool drain]; -} - -static void make_stroke_safe_button_clicked_cb (GtkButton *widget, NodeStyleEditor *editor) { - if ([editor signalsBlocked]) - return; - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor makeStrokeColorTexSafe]; - [pool drain]; -} - -static void make_fill_safe_button_clicked_cb (GtkButton *widget, NodeStyleEditor *editor) { - if ([editor signalsBlocked]) - return; - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor makeFillColorTexSafe]; - [pool drain]; -} - -static void scale_adjustment_changed_cb (GtkAdjustment *adj, NodeStyleEditor *editor) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor scaleChangedTo:gtk_adjustment_get_value (adj)]; - [pool drain]; -} - -// }}} - -// vim:ft=objc:ts=4:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/NodeStyleSelector.h b/tikzit-1/src/gtk/NodeStyleSelector.h deleted file mode 100644 index a699dc8..0000000 --- a/tikzit-1/src/gtk/NodeStyleSelector.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class NodeStyle; -@class NodeStylesModel; -@class StyleManager; - -@interface NodeStyleSelector: NSObject { - NodeStylesModel *model; - GtkIconView *view; -} - -/*! - @property widget - @brief The GTK widget - */ -@property (readonly) GtkWidget *widget; - -/*! - @property model - @brief The model to use. - */ -@property (retain) NodeStylesModel *model; - -/*! - @property selectedStyle - @brief The selected style. - - When this changes, a SelectedStyleChanged notification will be posted - */ -@property (assign) NodeStyle *selectedStyle; - -/*! - * Initialise with a new model for the given style manager - */ -- (id) initWithStyleManager:(StyleManager*)manager; -/*! - * Initialise with the given model - */ -- (id) initWithModel:(NodeStylesModel*)model; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/NodeStyleSelector.m b/tikzit-1/src/gtk/NodeStyleSelector.m deleted file mode 100644 index 14cdc75..0000000 --- a/tikzit-1/src/gtk/NodeStyleSelector.m +++ /dev/null @@ -1,135 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "NodeStyleSelector.h" - -#import "NodeStylesModel.h" - -// {{{ Internal interfaces -static void selection_changed_cb (GtkIconView *widget, NodeStyleSelector *mgr); -// }}} -// {{{ API - -@implementation NodeStyleSelector - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithStyleManager:(StyleManager*)m { - return [self initWithModel:[NodeStylesModel modelWithStyleManager:m]]; -} -- (id) initWithModel:(NodeStylesModel*)m { - self = [super init]; - - if (self) { - model = [m retain]; - - view = GTK_ICON_VIEW (gtk_icon_view_new ()); - g_object_ref_sink (view); - - gtk_icon_view_set_model (view, [model model]); - gtk_icon_view_set_pixbuf_column (view, NODE_STYLES_ICON_COL); - gtk_icon_view_set_tooltip_column (view, NODE_STYLES_NAME_COL); - gtk_icon_view_set_selection_mode (view, GTK_SELECTION_SINGLE); - - g_signal_connect (G_OBJECT (view), - "selection-changed", - G_CALLBACK (selection_changed_cb), - self); - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - g_object_unref (view); - [model release]; - - [super dealloc]; -} - -- (NodeStylesModel*) model { - return model; -} - -- (void) setModel:(NodeStylesModel*)m { - if (m == model) - return; - - NodeStylesModel *oldModel = model; - model = [m retain]; - gtk_icon_view_set_model (view, [model model]); - [oldModel release]; -} - -- (GtkWidget*) widget { - return GTK_WIDGET (view); -} - -- (NodeStyle*) selectedStyle { - GList *list = gtk_icon_view_get_selected_items (view); - if (!list) { - return nil; - } - if (list->next != NULL) { - NSLog(@"Multiple selected items in NodeStyleSelector!"); - } - - GtkTreePath *path = (GtkTreePath*) list->data; - NodeStyle *style = [model styleFromPath:path]; - - g_list_foreach (list, (GFunc)gtk_tree_path_free, NULL); - g_list_free (list); - - return style; -} - -- (void) setSelectedStyle:(NodeStyle*)style { - if (style == nil) { - gtk_icon_view_unselect_all (view); - return; - } - - GtkTreePath *path = [model pathFromStyle:style]; - if (path) { - gtk_icon_view_unselect_all (view); - gtk_icon_view_select_path (view, path); - gtk_tree_path_free (path); - } -} - -@end - -// }}} -// {{{ GTK+ callbacks - -static void selection_changed_cb (GtkIconView *view, NodeStyleSelector *mgr) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - [[NSNotificationCenter defaultCenter] - postNotificationName:@"SelectedStyleChanged" - object:mgr]; - - [pool drain]; -} -// }}} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/NodeStylesModel.h b/tikzit-1/src/gtk/NodeStylesModel.h deleted file mode 100644 index a048560..0000000 --- a/tikzit-1/src/gtk/NodeStylesModel.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class NodeStyle; -@class StyleManager; - -enum { - NODE_STYLES_NAME_COL = 0, - NODE_STYLES_ICON_COL, - NODE_STYLES_PTR_COL, - NODE_STYLES_N_COLS -}; - -@interface NodeStylesModel: NSObject { - GtkListStore *store; - StyleManager *styleManager; -} - -/*! - @property model - @brief The GTK+ tree model - */ -@property (readonly) GtkTreeModel *model; - -/*! - @property manager - @brief The StyleManager to use. - */ -@property (retain) StyleManager *styleManager; - -/*! - * Initialise with the given style manager - */ -- (id) initWithStyleManager:(StyleManager*)m; - -+ (id) modelWithStyleManager:(StyleManager*)m; - -- (NodeStyle*) styleFromPath:(GtkTreePath*)path; -- (GtkTreePath*) pathFromStyle:(NodeStyle*)style; -- (NodeStyle*) styleFromIter:(GtkTreeIter*)iter; -- (GtkTreeIter*) iterFromStyle:(NodeStyle*)style; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/NodeStylesModel.m b/tikzit-1/src/gtk/NodeStylesModel.m deleted file mode 100644 index 3cc5771..0000000 --- a/tikzit-1/src/gtk/NodeStylesModel.m +++ /dev/null @@ -1,381 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "NodeStylesModel.h" - -#import "CairoRenderContext.h" -#import "NodeStyle.h" -#import "Shape.h" -#import "Shape+Render.h" -#import "ShapeNames.h" -#import "StyleManager.h" - -#import "gtkhelpers.h" - -#import - -// {{{ Internal interfaces - -@interface NodeStylesModel (Notifications) -- (void) nodeStylesReplaced:(NSNotification*)notification; -- (void) nodeStyleAdded:(NSNotification*)notification; -- (void) nodeStyleRemoved:(NSNotification*)notification; -- (void) shapeDictionaryReplaced:(NSNotification*)n; -- (void) observeValueForKeyPath:(NSString*)keyPath - ofObject:(id)object - change:(NSDictionary*)change - context:(void*)context; -@end - -@interface NodeStylesModel (Private) -- (cairo_surface_t*) createNodeIconSurface; -- (GdkPixbuf*) pixbufOfNodeInStyle:(NodeStyle*)style; -- (GdkPixbuf*) pixbufOfNodeInStyle:(NodeStyle*)style usingSurface:(cairo_surface_t*)surface; -- (void) addNodeStyle:(NodeStyle*)style; -- (void) addNodeStyle:(NodeStyle*)style usingSurface:(cairo_surface_t*)surface; -- (void) observeNodeStyle:(NodeStyle*)style; -- (void) stopObservingNodeStyle:(NodeStyle*)style; -- (void) clearNodeStylesModel; -- (void) reloadNodeStyles; -@end - -// }}} -// {{{ API - -@implementation NodeStylesModel - -+ (id) modelWithStyleManager:(StyleManager*)m { - return [[[self alloc] initWithStyleManager:m] autorelease]; -} - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithStyleManager:(StyleManager*)m { - self = [super init]; - - if (self) { - store = gtk_list_store_new (NODE_STYLES_N_COLS, - G_TYPE_STRING, - GDK_TYPE_PIXBUF, - G_TYPE_POINTER); - g_object_ref_sink (store); - - [self setStyleManager:m]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(shapeDictionaryReplaced:) - name:@"ShapeDictionaryReplaced" - object:[Shape class]]; - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - [self clearNodeStylesModel]; - g_object_unref (store); - [styleManager release]; - - [super dealloc]; -} - -- (StyleManager*) styleManager { - return styleManager; -} - -- (void) setStyleManager:(StyleManager*)m { - if (m == nil) { - [NSException raise:NSInvalidArgumentException format:@"Style manager cannot be nil"]; - } - [m retain]; - - [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:styleManager]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(nodeStylesReplaced:) - name:@"NodeStylesReplaced" - object:m]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(nodeStyleAdded:) - name:@"NodeStyleAdded" - object:m]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(nodeStyleRemoved:) - name:@"NodeStyleRemoved" - object:m]; - - [styleManager release]; - styleManager = m; - - [self reloadNodeStyles]; -} - -- (GtkTreeModel*) model { - return GTK_TREE_MODEL (store); -} - -- (NodeStyle*) styleFromPath:(GtkTreePath*)path { - GtkTreeIter iter; - gtk_tree_model_get_iter (GTK_TREE_MODEL (store), &iter, path); - NodeStyle *style = nil; - gtk_tree_model_get (GTK_TREE_MODEL (store), &iter, NODE_STYLES_PTR_COL, &style, -1); - return style; -} - -- (GtkTreePath*) pathFromStyle:(NodeStyle*)style { - GtkTreeModel *m = GTK_TREE_MODEL (store); - GtkTreeIter row; - if (gtk_tree_model_get_iter_first (m, &row)) { - do { - NodeStyle *rowStyle; - gtk_tree_model_get (m, &row, NODE_STYLES_PTR_COL, &rowStyle, -1); - if (style == rowStyle) { - return gtk_tree_model_get_path (m, &row); - } - } while (gtk_tree_model_iter_next (m, &row)); - } - return NULL; -} - -- (NodeStyle*) styleFromIter:(GtkTreeIter*)iter { - NodeStyle *style = nil; - gtk_tree_model_get (GTK_TREE_MODEL (store), iter, NODE_STYLES_PTR_COL, &style, -1); - return style; -} - -- (GtkTreeIter*) iterFromStyle:(NodeStyle*)style { - GtkTreeModel *m = GTK_TREE_MODEL (store); - GtkTreeIter row; - if (gtk_tree_model_get_iter_first (m, &row)) { - do { - NodeStyle *rowStyle; - gtk_tree_model_get (m, &row, NODE_STYLES_PTR_COL, &rowStyle, -1); - if (style == rowStyle) { - return gtk_tree_iter_copy (&row); - } - } while (gtk_tree_model_iter_next (m, &row)); - } - return NULL; -} -@end - -// }}} -// {{{ Notifications - -@implementation NodeStylesModel (Notifications) - -- (void) nodeStylesReplaced:(NSNotification*)notification { - [self reloadNodeStyles]; -} - -- (void) nodeStyleAdded:(NSNotification*)notification { - [self addNodeStyle:[[notification userInfo] objectForKey:@"style"]]; -} - -- (void) nodeStyleRemoved:(NSNotification*)notification { - NodeStyle *style = [[notification userInfo] objectForKey:@"style"]; - - GtkTreeModel *model = GTK_TREE_MODEL (store); - GtkTreeIter row; - if (gtk_tree_model_get_iter_first (model, &row)) { - do { - NodeStyle *rowStyle; - gtk_tree_model_get (model, &row, NODE_STYLES_PTR_COL, &rowStyle, -1); - if (style == rowStyle) { - gtk_list_store_remove (store, &row); - [self stopObservingNodeStyle:rowStyle]; - [rowStyle release]; - return; - } - } while (gtk_tree_model_iter_next (model, &row)); - } -} - -- (void) observeValueForKeyPath:(NSString*)keyPath - ofObject:(id)object - change:(NSDictionary*)change - context:(void*)context -{ - if ([object class] == [NodeStyle class]) { - NodeStyle *style = object; - - GtkTreeModel *model = GTK_TREE_MODEL (store); - GtkTreeIter row; - if (gtk_tree_model_get_iter_first (model, &row)) { - do { - NodeStyle *rowStyle; - gtk_tree_model_get (model, &row, NODE_STYLES_PTR_COL, &rowStyle, -1); - if (style == rowStyle) { - if ([@"name" isEqual:keyPath]) { - gtk_list_store_set (store, &row, NODE_STYLES_NAME_COL, [[style name] UTF8String], -1); - } else { - GdkPixbuf *pixbuf = [self pixbufOfNodeInStyle:style]; - gtk_list_store_set (store, &row, NODE_STYLES_ICON_COL, pixbuf, -1); - g_object_unref (pixbuf); - } - } - } while (gtk_tree_model_iter_next (model, &row)); - } - } -} - -- (void) shapeDictionaryReplaced:(NSNotification*)n { - [self reloadNodeStyles]; -} -@end - -// }}} -// {{{ Private - -@implementation NodeStylesModel (Private) -- (cairo_surface_t*) createNodeIconSurface { - return cairo_image_surface_create (CAIRO_FORMAT_ARGB32, 24, 24); -} - -- (GdkPixbuf*) pixbufOfNodeInStyle:(NodeStyle*)style { - cairo_surface_t *surface = [self createNodeIconSurface]; - GdkPixbuf *pixbuf = [self pixbufOfNodeInStyle:style usingSurface:surface]; - cairo_surface_destroy (surface); - return pixbuf; -} - -- (GdkPixbuf*) pixbufOfNodeInStyle:(NodeStyle*)style usingSurface:(cairo_surface_t*)surface { - Shape *shape = [Shape shapeForName:[style shapeName]]; - - int width = cairo_image_surface_get_width (surface); - int height = cairo_image_surface_get_height (surface); - NSRect pixbufBounds = NSMakeRect(0.0, 0.0, width, height); - const CGFloat lineWidth = [style strokeThickness]; - Transformer *shapeTrans = [Transformer transformerToFit:[shape boundingRect] - intoScreenRect:NSInsetRect(pixbufBounds, lineWidth, lineWidth) - flippedAboutXAxis:YES]; - if ([style scale] < 1.0) - [shapeTrans setScale:[style scale] * [shapeTrans scale]]; - - CairoRenderContext *context = [[CairoRenderContext alloc] initForSurface:surface]; - [context clearSurface]; - [shape drawPathWithTransform:shapeTrans andContext:context]; - [context setLineWidth:lineWidth]; - [context strokePathWithColor:[[style strokeColorRGB] rColor] - andFillWithColor:[[style fillColorRGB] rColor]]; - [context release]; - - return pixbuf_get_from_surface (surface); -} - -- (void) addNodeStyle:(NodeStyle*)style usingSurface:(cairo_surface_t*)surface { - GtkTreeIter iter; - gtk_list_store_append (store, &iter); - - GdkPixbuf *pixbuf = [self pixbufOfNodeInStyle:style usingSurface:surface]; - gtk_list_store_set (store, &iter, - NODE_STYLES_NAME_COL, [[style name] UTF8String], - NODE_STYLES_ICON_COL, pixbuf, - NODE_STYLES_PTR_COL, (gpointer)[style retain], - -1); - g_object_unref (pixbuf); - [self observeNodeStyle:style]; -} - -- (void) addNodeStyle:(NodeStyle*)style { - cairo_surface_t *surface = [self createNodeIconSurface]; - [self addNodeStyle:style usingSurface:surface]; - cairo_surface_destroy (surface); -} - -- (void) observeNodeStyle:(NodeStyle*)style { - [style addObserver:self - forKeyPath:@"name" - options:NSKeyValueObservingOptionNew - context:NULL]; - [style addObserver:self - forKeyPath:@"strokeThickness" - options:0 - context:NULL]; - [style addObserver:self - forKeyPath:@"strokeColorRGB.red" - options:0 - context:NULL]; - [style addObserver:self - forKeyPath:@"strokeColorRGB.green" - options:0 - context:NULL]; - [style addObserver:self - forKeyPath:@"strokeColorRGB.blue" - options:0 - context:NULL]; - [style addObserver:self - forKeyPath:@"fillColorRGB.red" - options:0 - context:NULL]; - [style addObserver:self - forKeyPath:@"fillColorRGB.green" - options:0 - context:NULL]; - [style addObserver:self - forKeyPath:@"fillColorRGB.blue" - options:0 - context:NULL]; - [style addObserver:self - forKeyPath:@"shapeName" - options:0 - context:NULL]; -} - -- (void) stopObservingNodeStyle:(NodeStyle*)style { - [style removeObserver:self forKeyPath:@"name"]; - [style removeObserver:self forKeyPath:@"strokeThickness"]; - [style removeObserver:self forKeyPath:@"strokeColorRGB.red"]; - [style removeObserver:self forKeyPath:@"strokeColorRGB.green"]; - [style removeObserver:self forKeyPath:@"strokeColorRGB.blue"]; - [style removeObserver:self forKeyPath:@"fillColorRGB.red"]; - [style removeObserver:self forKeyPath:@"fillColorRGB.green"]; - [style removeObserver:self forKeyPath:@"fillColorRGB.blue"]; - [style removeObserver:self forKeyPath:@"shapeName"]; -} - -- (void) clearNodeStylesModel { - GtkTreeModel *model = GTK_TREE_MODEL (store); - GtkTreeIter row; - if (gtk_tree_model_get_iter_first (model, &row)) { - do { - NodeStyle *rowStyle; - gtk_tree_model_get (model, &row, NODE_STYLES_PTR_COL, &rowStyle, -1); - [self stopObservingNodeStyle:rowStyle]; - [rowStyle release]; - } while (gtk_tree_model_iter_next (model, &row)); - } - gtk_list_store_clear (store); -} - -- (void) reloadNodeStyles { - [self clearNodeStylesModel]; - cairo_surface_t *surface = [self createNodeIconSurface]; - for (NodeStyle *style in [styleManager nodeStyles]) { - [self addNodeStyle:style usingSurface:surface]; - } - cairo_surface_destroy (surface); -} -@end - -// }}} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/NodeStylesPalette.h b/tikzit-1/src/gtk/NodeStylesPalette.h deleted file mode 100644 index ac712ea..0000000 --- a/tikzit-1/src/gtk/NodeStylesPalette.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class StyleManager; -@class NodeStyleSelector; -@class NodeStyleEditor; - -@interface NodeStylesPalette: NSObject { - NodeStyleSelector *selector; - NodeStyleEditor *editor; - - GtkWidget *palette; - - GtkWidget *removeStyleButton; - GtkWidget *applyStyleButton; - GtkWidget *clearStyleButton; -} - -@property (retain) StyleManager *styleManager; -@property (readonly) GtkWidget *widget; - -- (id) initWithManager:(StyleManager*)m; - -@end - -// vim:ft=objc:ts=4:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/NodeStylesPalette.m b/tikzit-1/src/gtk/NodeStylesPalette.m deleted file mode 100644 index e28edbb..0000000 --- a/tikzit-1/src/gtk/NodeStylesPalette.m +++ /dev/null @@ -1,197 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "NodeStylesPalette.h" - -#import "NodeStyleSelector.h" -#import "NodeStyleEditor.h" -#import "NodeStylesModel.h" -#import "StyleManager.h" - -// {{{ Internal interfaces -// {{{ GTK+ Callbacks -static void add_style_button_cb (GtkButton *widget, NodeStylesPalette *palette); -static void remove_style_button_cb (GtkButton *widget, NodeStylesPalette *palette); -// }}} -// {{{ Notifications - -@interface NodeStylesPalette (Notifications) -- (void) selectedStyleChanged:(NSNotification*)notification; -@end - -// }}} -// {{{ Private - -@interface NodeStylesPalette (Private) -- (void) updateButtonState; -- (void) removeSelectedStyle; -- (void) addStyle; -@end - -// }}} -// }}} -// {{{ API - -@implementation NodeStylesPalette - -@synthesize widget=palette; - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithManager:(StyleManager*)m { - self = [super init]; - - if (self) { - selector = [[NodeStyleSelector alloc] initWithStyleManager:m]; - editor = [[NodeStyleEditor alloc] init]; - - palette = gtk_vbox_new (FALSE, 6); - gtk_container_set_border_width (GTK_CONTAINER (palette), 6); - g_object_ref_sink (palette); - - GtkWidget *mainBox = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (palette), mainBox, FALSE, FALSE, 0); - gtk_widget_show (mainBox); - - GtkWidget *selectorScroller = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (selectorScroller), - GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); - GtkWidget *selectorFrame = gtk_frame_new (NULL); - gtk_container_add (GTK_CONTAINER (selectorScroller), [selector widget]); - gtk_container_add (GTK_CONTAINER (selectorFrame), selectorScroller); - gtk_box_pack_start (GTK_BOX (mainBox), selectorFrame, TRUE, TRUE, 0); - gtk_widget_show (selectorScroller); - gtk_widget_show (selectorFrame); - gtk_widget_show ([selector widget]); - - gtk_box_pack_start (GTK_BOX (mainBox), [editor widget], TRUE, TRUE, 0); - gtk_widget_show ([editor widget]); - - GtkBox *buttonBox = GTK_BOX (gtk_hbox_new(FALSE, 0)); - gtk_box_pack_start (GTK_BOX (palette), GTK_WIDGET (buttonBox), FALSE, FALSE, 0); - - GtkWidget *addStyleButton = gtk_button_new (); - gtk_widget_set_tooltip_text (addStyleButton, "Add a new style"); - GtkWidget *addIcon = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON); - gtk_container_add (GTK_CONTAINER (addStyleButton), addIcon); - gtk_box_pack_start (buttonBox, addStyleButton, FALSE, FALSE, 0); - g_signal_connect (G_OBJECT (addStyleButton), - "clicked", - G_CALLBACK (add_style_button_cb), - self); - - removeStyleButton = gtk_button_new (); - g_object_ref_sink (removeStyleButton); - gtk_widget_set_tooltip_text (removeStyleButton, "Delete selected style"); - GtkWidget *removeIcon = gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_BUTTON); - gtk_container_add (GTK_CONTAINER (removeStyleButton), removeIcon); - gtk_box_pack_start (buttonBox, removeStyleButton, FALSE, FALSE, 0); - g_signal_connect (G_OBJECT (removeStyleButton), - "clicked", - G_CALLBACK (remove_style_button_cb), - self); - - gtk_widget_show_all (GTK_WIDGET (buttonBox)); - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(selectedStyleChanged:) - name:@"SelectedStyleChanged" - object:selector]; - - [self updateButtonState]; - } - - return self; -} - -- (StyleManager*) styleManager { - return [[selector model] styleManager]; -} - -- (void) setStyleManager:(StyleManager*)m { - [[selector model] setStyleManager:m]; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - [editor release]; - [selector release]; - g_object_unref (palette); - g_object_unref (removeStyleButton); - - [super dealloc]; -} - -@end - -// }}} -// {{{ Notifications - -@implementation NodeStylesPalette (Notifications) -- (void) selectedStyleChanged:(NSNotification*)notification { - [editor setStyle:[selector selectedStyle]]; - [self updateButtonState]; -} -@end - -// }}} -// {{{ Private - -@implementation NodeStylesPalette (Private) -- (void) updateButtonState { - gboolean hasStyleSelection = [selector selectedStyle] != nil; - - gtk_widget_set_sensitive (removeStyleButton, hasStyleSelection); -} - -- (void) removeSelectedStyle { - NodeStyle *style = [selector selectedStyle]; - if (style) - [[[selector model] styleManager] removeNodeStyle:style]; -} - -- (void) addStyle { - NodeStyle *newStyle = [NodeStyle defaultNodeStyleWithName:@"newstyle"]; - [[self styleManager] addNodeStyle:newStyle]; - [selector setSelectedStyle:newStyle]; - [editor selectNameField]; -} - -@end - -// }}} -// {{{ GTK+ callbacks - -static void add_style_button_cb (GtkButton *widget, NodeStylesPalette *palette) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [palette addStyle]; - [pool drain]; -} - -static void remove_style_button_cb (GtkButton *widget, NodeStylesPalette *palette) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [palette removeSelectedStyle]; - [pool drain]; -} - -// }}} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/PreambleEditor.h b/tikzit-1/src/gtk/PreambleEditor.h deleted file mode 100644 index f181446..0000000 --- a/tikzit-1/src/gtk/PreambleEditor.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class Preambles; - -@interface PreambleEditor: NSObject { - Preambles *preambles; - - // we don't keep any refs, as we control - // the top window - GtkWindow *parentWindow; - GtkWindow *window; - GtkListStore *preambleListStore; - GtkTreeView *preambleSelector; - GtkTextView *preambleView; - BOOL blockSignals; - BOOL adding; -} - -- (id) initWithPreambles:(Preambles*)p; - -- (void) setParentWindow:(GtkWindow*)parent; - -- (Preambles*) preambles; - -- (void) present; -- (void) show; -- (void) hide; -- (BOOL) isVisible; -- (void) setVisible:(BOOL)visible; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/PreambleEditor.m b/tikzit-1/src/gtk/PreambleEditor.m deleted file mode 100644 index d1f72ee..0000000 --- a/tikzit-1/src/gtk/PreambleEditor.m +++ /dev/null @@ -1,568 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "PreambleEditor.h" - -#import "Application.h" -#import "Preambles.h" -#import - -enum { - NAME_COLUMN, - IS_CUSTOM_COLUMN, - N_COLUMNS -}; - -// {{{ Internal interfaces -// {{{ Signals -static gboolean window_delete_event_cb (GtkWidget *widget, - GdkEvent *event, - PreambleEditor *editor); -static gboolean window_focus_out_event_cb (GtkWidget *widget, - GdkEvent *event, - PreambleEditor *editor); -static void close_button_clicked_cb (GtkButton *widget, PreambleEditor *editor); -static void add_button_clicked_cb (GtkButton *widget, PreambleEditor *editor); -static void remove_button_clicked_cb (GtkButton *widget, PreambleEditor *editor); -/* -static void undo_button_clicked_cb (GtkButton *widget, PreambleEditor *editor); -static void redo_button_clicked_cb (GtkButton *widget, PreambleEditor *editor); -*/ -static void preamble_name_edited_cb (GtkCellRendererText *renderer, - gchar *path, - gchar *new_text, - PreambleEditor *editor); -static void preamble_selection_changed_cb (GtkTreeSelection *treeselection, - PreambleEditor *editor); -// }}} - -@interface PreambleEditor (Private) -- (void) loadUi; -- (void) save; -- (void) revert; -- (void) update; -- (void) fillListStore; -- (BOOL) isDefaultPreambleSelected; -- (NSString*) selectedPreambleName; -- (void) addPreamble; -- (void) deletePreamble; -- (void) renamePreambleAtPath:(gchar*)path to:(gchar*)newValue; -- (void) nodeStylePropertyChanged:(NSNotification*)notification; -- (void) edgeStylePropertyChanged:(NSNotification*)notification; -@end - -// }}} -// {{{ API - -@implementation PreambleEditor - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithPreambles:(Preambles*)p { - self = [super init]; - - if (self) { - preambles = [p retain]; - parentWindow = NULL; - window = NULL; - preambleView = NULL; - preambleSelector = NULL; - blockSignals = NO; - adding = NO; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(nodeStylePropertyChanged:) - name:@"NodeStylePropertyChanged" - object:nil]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(edgeStylePropertyChanged:) - name:@"EdgeStylePropertyChanged" - object:nil]; - } - - return self; -} - -- (Preambles*) preambles { - return preambles; -} - -- (void) setParentWindow:(GtkWindow*)parent { - GtkWindow *oldParent = parentWindow; - - if (parentWindow) - g_object_ref (parentWindow); - parentWindow = parent; - if (oldParent) - g_object_unref (oldParent); - - if (window) { - gtk_window_set_transient_for (window, parentWindow); - } -} - -- (void) present { - [self loadUi]; - gtk_window_present (GTK_WINDOW (window)); - [self revert]; -} - -- (void) show { - [self loadUi]; - gtk_widget_show (GTK_WIDGET (window)); - [self revert]; -} - -- (void) hide { - if (!window) { - return; - } - [self save]; - gtk_widget_hide (GTK_WIDGET (window)); -} - -- (BOOL) isVisible { - if (!window) { - return NO; - } - gboolean visible; - g_object_get (G_OBJECT (window), "visible", &visible, NULL); - return visible ? YES : NO; -} - -- (void) setVisible:(BOOL)visible { - if (visible) { - [self show]; - } else { - [self hide]; - } -} - -- (void) dealloc { - [preambles release]; - preambles = nil; - if (window) { - gtk_widget_destroy (GTK_WIDGET (window)); - window = NULL; - } - if (parentWindow) { - g_object_ref (parentWindow); - } - - [super dealloc]; -} - -@end - -// }}} -// {{{ Private - -@implementation PreambleEditor (Private) -- (GtkWidget*) createPreambleList { - preambleListStore = gtk_list_store_new (N_COLUMNS, G_TYPE_STRING, G_TYPE_BOOLEAN); - preambleSelector = GTK_TREE_VIEW (gtk_tree_view_new_with_model ( - GTK_TREE_MODEL (preambleListStore))); - gtk_widget_set_size_request (GTK_WIDGET (preambleSelector), 150, -1); - gtk_tree_view_set_headers_visible (preambleSelector, FALSE); - - GtkCellRenderer *renderer; - GtkTreeViewColumn *column; - - renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes ("Preamble", - renderer, - "text", NAME_COLUMN, - "editable", IS_CUSTOM_COLUMN, - NULL); - gtk_tree_view_append_column (preambleSelector, column); - g_signal_connect (G_OBJECT (renderer), - "edited", - G_CALLBACK (preamble_name_edited_cb), - self); - - GtkWidget *listScroller = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (listScroller), - GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); - gtk_container_add (GTK_CONTAINER (listScroller), - GTK_WIDGET (preambleSelector)); - - [self fillListStore]; - - GtkTreeSelection *sel = gtk_tree_view_get_selection (preambleSelector); - gtk_tree_selection_set_mode (sel, GTK_SELECTION_BROWSE); - g_signal_connect (G_OBJECT (sel), - "changed", - G_CALLBACK (preamble_selection_changed_cb), - self); - - return listScroller; -} - -- (void) loadUi { - if (window) { - return; - } - - window = GTK_WINDOW (gtk_window_new (GTK_WINDOW_TOPLEVEL)); - gtk_window_set_title (window, "Preamble editor"); - gtk_window_set_position (window, GTK_WIN_POS_CENTER_ON_PARENT); - gtk_window_set_default_size (window, 600, 400); - gtk_window_set_type_hint (window, GDK_WINDOW_TYPE_HINT_DIALOG); - if (parentWindow) { - gtk_window_set_transient_for (window, parentWindow); - } - GdkEventMask mask; - g_object_get (G_OBJECT (window), "events", &mask, NULL); - mask |= GDK_FOCUS_CHANGE_MASK; - g_object_set (G_OBJECT (window), "events", mask, NULL); - g_signal_connect (window, - "delete-event", - G_CALLBACK (window_delete_event_cb), - self); - g_signal_connect (window, - "focus-out-event", - G_CALLBACK (window_focus_out_event_cb), - self); - - GtkWidget *mainBox = gtk_vbox_new (FALSE, 18); - gtk_container_set_border_width (GTK_CONTAINER (mainBox), 12); - gtk_container_add (GTK_CONTAINER (window), mainBox); - - GtkPaned *paned = GTK_PANED (gtk_hpaned_new ()); - gtk_box_pack_start (GTK_BOX (mainBox), - GTK_WIDGET (paned), - TRUE, TRUE, 0); - - GtkWidget *listWidget = [self createPreambleList]; - GtkWidget *listFrame = gtk_frame_new (NULL); - gtk_container_add (GTK_CONTAINER (listFrame), listWidget); - - GtkBox *listBox = GTK_BOX (gtk_vbox_new (FALSE, 6)); - gtk_box_pack_start (listBox, listFrame, TRUE, TRUE, 0); - - GtkContainer *listButtonBox = GTK_CONTAINER (gtk_hbox_new (FALSE, 6)); - gtk_box_pack_start (listBox, GTK_WIDGET (listButtonBox), FALSE, TRUE, 0); - GtkWidget *addButton = gtk_button_new_from_stock (GTK_STOCK_ADD); - g_signal_connect (addButton, - "clicked", - G_CALLBACK (add_button_clicked_cb), - self); - gtk_container_add (listButtonBox, addButton); - GtkWidget *removeButton = gtk_button_new_from_stock (GTK_STOCK_REMOVE); - g_signal_connect (removeButton, - "clicked", - G_CALLBACK (remove_button_clicked_cb), - self); - gtk_container_add (listButtonBox, removeButton); - - gtk_paned_pack1 (paned, GTK_WIDGET (listBox), FALSE, TRUE); - - preambleView = GTK_TEXT_VIEW (gtk_text_view_new ()); - gtk_text_view_set_left_margin (preambleView, 3); - gtk_text_view_set_right_margin (preambleView, 3); - GtkWidget *scroller = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroller), - GTK_POLICY_AUTOMATIC, // horiz - GTK_POLICY_ALWAYS); // vert - gtk_container_add (GTK_CONTAINER (scroller), GTK_WIDGET (preambleView)); - GtkWidget *editorFrame = gtk_frame_new (NULL); - gtk_container_add (GTK_CONTAINER (editorFrame), scroller); - gtk_paned_pack2 (paned, editorFrame, TRUE, TRUE); - - GtkContainer *buttonBox = GTK_CONTAINER (gtk_hbutton_box_new ()); - gtk_box_set_spacing (GTK_BOX (buttonBox), 6); - gtk_button_box_set_layout (GTK_BUTTON_BOX (buttonBox), GTK_BUTTONBOX_END); - gtk_box_pack_start (GTK_BOX (mainBox), - GTK_WIDGET (buttonBox), - FALSE, TRUE, 0); - GtkWidget *closeButton = gtk_button_new_from_stock (GTK_STOCK_CLOSE); - gtk_container_add (buttonBox, closeButton); - g_signal_connect (closeButton, - "clicked", - G_CALLBACK (close_button_clicked_cb), - self); - /* - GtkWidget *undoButton = gtk_button_new_from_stock (GTK_STOCK_UNDO); - gtk_container_add (buttonBox, undoButton); - gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (buttonBox), - undoButton, - TRUE); - g_signal_connect (undoButton, - "clicked", - G_CALLBACK (undo_button_clicked_cb), - self); - GtkWidget *redoButton = gtk_button_new_from_stock (GTK_STOCK_REDO); - gtk_container_add (buttonBox, redoButton); - gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (buttonBox), - redoButton, - TRUE); - g_signal_connect (redoButton, - "clicked", - G_CALLBACK (redo_button_clicked_cb), - self); - */ - [self revert]; - - gtk_widget_show_all (mainBox); -} - -- (void) save { - if (!preambleView) - return; - if ([self isDefaultPreambleSelected]) - return; - GtkTextIter start,end; - GtkTextBuffer *preambleBuffer = gtk_text_view_get_buffer (preambleView); - gtk_text_buffer_get_bounds(preambleBuffer, &start, &end); - gchar *text = gtk_text_buffer_get_text(preambleBuffer, &start, &end, FALSE); - NSString *preamble = [NSString stringWithUTF8String:text]; - g_free (text); - [preambles setCurrentPreamble:preamble]; - [app saveConfiguration]; -} - -- (void) revert { - if (!preambleView) - return; - GtkTextBuffer *preambleBuffer = gtk_text_view_get_buffer (preambleView); - gtk_text_buffer_set_text (preambleBuffer, [[preambles currentPreamble] UTF8String], -1); - gtk_text_view_set_editable (preambleView, ![self isDefaultPreambleSelected]); -} - -- (void) update { - if (!blockSignals) { - [self save]; - } - GtkTreeSelection *sel = gtk_tree_view_get_selection (preambleSelector); - GtkTreeIter row; - GtkTreeModel *model; - if (gtk_tree_selection_get_selected (sel, &model, &row)) { - gchar *name; - gtk_tree_model_get (model, &row, NAME_COLUMN, &name, -1); - NSString *preambleName = [NSString stringWithUTF8String:name]; - [preambles setSelectedPreambleName:preambleName]; - g_free (name); - } - [self revert]; -} - -- (void) fillListStore { - blockSignals = YES; - - GtkTreeIter row; - gtk_list_store_clear (preambleListStore); - - gtk_list_store_append (preambleListStore, &row); - gtk_list_store_set (preambleListStore, &row, - NAME_COLUMN, [[preambles defaultPreambleName] UTF8String], - IS_CUSTOM_COLUMN, FALSE, - -1); - GtkTreeSelection *sel = gtk_tree_view_get_selection (preambleSelector); - if ([self isDefaultPreambleSelected]) { - gtk_tree_selection_select_iter (sel, &row); - } - - NSEnumerator *en = [preambles customPreambleNameEnumerator]; - NSString *preambleName; - while ((preambleName = [en nextObject])) { - gtk_list_store_append (preambleListStore, &row); - gtk_list_store_set (preambleListStore, &row, - NAME_COLUMN, [preambleName UTF8String], - IS_CUSTOM_COLUMN, TRUE, - -1); - if ([preambleName isEqualToString:[self selectedPreambleName]]) { - gtk_tree_selection_select_iter (sel, &row); - } - } - - blockSignals = NO; -} - -- (BOOL) isDefaultPreambleSelected { - return [preambles selectedPreambleIsDefault]; -} - -- (NSString*) selectedPreambleName { - return [preambles selectedPreambleName]; -} - -- (void) addPreamble { - NSString *newName = [preambles addPreamble]; - - GtkTreeIter row; - gtk_list_store_append (preambleListStore, &row); - gtk_list_store_set (preambleListStore, &row, - NAME_COLUMN, [newName UTF8String], - IS_CUSTOM_COLUMN, TRUE, - -1); - - GtkTreeSelection *sel = gtk_tree_view_get_selection (preambleSelector); - gtk_tree_selection_select_iter (sel, &row); -} - -- (void) deletePreamble { - if ([self isDefaultPreambleSelected]) - return; - - NSString *name = [self selectedPreambleName]; - - GtkTreeIter row; - GtkTreeModel *model = GTK_TREE_MODEL (preambleListStore); - - gtk_tree_model_get_iter_first (model, &row); - // ignore first; it is the default one - gboolean found = FALSE; - while (!found && gtk_tree_model_iter_next (model, &row)) { - gchar *candidate; - gtk_tree_model_get (model, &row, NAME_COLUMN, &candidate, -1); - if (g_strcmp0 (candidate, [name UTF8String]) == 0) { - found = TRUE; - } - g_free (candidate); - } - - if (!found) - return; - - if (![preambles removePreamble:name]) - return; - - blockSignals = YES; - - gboolean had_next = gtk_list_store_remove (preambleListStore, &row); - if (!had_next) { - // select the last item - gint length = gtk_tree_model_iter_n_children (model, NULL); - gtk_tree_model_iter_nth_child (model, &row, NULL, length - 1); - } - - GtkTreeSelection *sel = gtk_tree_view_get_selection (preambleSelector); - gtk_tree_selection_select_iter (sel, &row); - - [self revert]; - - blockSignals = NO; -} - -- (void) renamePreambleAtPath:(gchar*)path to:(gchar*)newValue { - NSString *newName = [NSString stringWithUTF8String:newValue]; - - GtkTreeIter row; - GtkTreeModel *model = GTK_TREE_MODEL (preambleListStore); - - if (!gtk_tree_model_get_iter_from_string (model, &row, path)) - return; - - gchar *oldValue; - gtk_tree_model_get (model, &row, NAME_COLUMN, &oldValue, -1); - - NSString* oldName = [NSString stringWithUTF8String:oldValue]; - if ([preambles renamePreambleFrom:oldName to:newName]) { - gtk_list_store_set (preambleListStore, &row, - NAME_COLUMN, newValue, - -1); - } -} - -- (void) nodeStylePropertyChanged:(NSNotification*)notification { - if ([self isDefaultPreambleSelected]) { - [self revert]; - } -} - -- (void) edgeStylePropertyChanged:(NSNotification*)notification { - if ([self isDefaultPreambleSelected]) { - [self revert]; - } -} -@end - -// }}} -// {{{ GTK+ callbacks - -static gboolean window_delete_event_cb (GtkWidget *widget, - GdkEvent *event, - PreambleEditor *editor) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor hide]; - [pool drain]; - return TRUE; // we dealt with this event -} - -static gboolean window_focus_out_event_cb (GtkWidget *widget, - GdkEvent *event, - PreambleEditor *editor) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor save]; - [pool drain]; - return FALSE; -} - -static void close_button_clicked_cb (GtkButton *widget, PreambleEditor *editor) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor hide]; - [pool drain]; -} - -static void add_button_clicked_cb (GtkButton *widget, PreambleEditor *editor) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor addPreamble]; - [pool drain]; -} - -static void remove_button_clicked_cb (GtkButton *widget, PreambleEditor *editor) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor deletePreamble]; - [pool drain]; -} - -/* -static void undo_button_clicked_cb (GtkButton *widget, PreambleEditor *editor) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - NSLog(@"Undo"); - [pool drain]; -} - -static void redo_button_clicked_cb (GtkButton *widget, PreambleEditor *editor) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - NSLog(@"Redo"); - [pool drain]; -} -*/ - -static void preamble_name_edited_cb (GtkCellRendererText *renderer, - gchar *path, - gchar *new_text, - PreambleEditor *editor) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor renamePreambleAtPath:path to:new_text]; - [pool drain]; -} - -static void preamble_selection_changed_cb (GtkTreeSelection *treeselection, - PreambleEditor *editor) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor update]; - [pool drain]; -} - -// }}} - -// vim:ft=objc:ts=4:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/Preambles+Storage.h b/tikzit-1/src/gtk/Preambles+Storage.h deleted file mode 100644 index 76f56cc..0000000 --- a/tikzit-1/src/gtk/Preambles+Storage.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "Preambles.h" - -@interface Preambles (Storage) - -+ (Preambles*) preamblesFromDirectory:(NSString*)directory; -- (id) initFromDirectory:(NSString*)directory; -- (void) loadFromDirectory:(NSString*)directory; -- (void) storeToDirectory:(NSString*)directory; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/Preambles+Storage.m b/tikzit-1/src/gtk/Preambles+Storage.m deleted file mode 100644 index bd3ea03..0000000 --- a/tikzit-1/src/gtk/Preambles+Storage.m +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "Preambles+Storage.h" - -static NSString *ext = @"preamble"; - -@implementation Preambles (Storage) - -+ (Preambles*) preamblesFromDirectory:(NSString*)directory { - return [[[self alloc] initFromDirectory:directory] autorelease]; -} - -- (id) initFromDirectory:(NSString*)directory { - BOOL isDir = NO; - if ([[NSFileManager defaultManager] fileExistsAtPath:directory isDirectory:&isDir] && isDir) { - self = [super init]; - - if (self) { - selectedPreambleName = @"default"; - preambleDict = nil; - [self loadFromDirectory:directory]; - } - } else { - self = [self init]; - } - - return self; -} - -- (void) loadFromDirectory:(NSString*)directory { - preambleDict = [[NSMutableDictionary alloc] initWithCapacity:1]; - NSDirectoryEnumerator *en = [[NSFileManager defaultManager] enumeratorAtPath:directory]; - NSString *filename; - while ((filename = [en nextObject]) != nil) { - if ([filename hasSuffix:ext] && [[en fileAttributes] fileType] == NSFileTypeRegular) { - NSString *path = [directory stringByAppendingPathComponent:filename]; - NSString *contents = [NSString stringWithContentsOfFile:path]; - if (contents) { - [preambleDict setObject:contents forKey:[filename stringByDeletingPathExtension]]; - } - } - } -} - -- (void) storeToDirectory:(NSString*)directory { - NSDirectoryEnumerator *den = [[NSFileManager defaultManager] enumeratorAtPath:directory]; - NSString *filename; - while ((filename = [den nextObject]) != nil) { - if ([filename hasSuffix:ext] && [[den fileAttributes] fileType] == NSFileTypeRegular) { - NSString *path = [directory stringByAppendingPathComponent:filename]; - NSString *entry = [filename stringByDeletingPathExtension]; - if ([preambleDict objectForKey:entry] == nil) { - [[NSFileManager defaultManager] removeFileAtPath:path handler:nil]; - } - } - } - - NSEnumerator *en = [self customPreambleNameEnumerator]; - NSString *entry; - while ((entry = [en nextObject]) != nil) { - NSString *path = [directory stringByAppendingPathComponent:[entry stringByAppendingPathExtension:ext]]; - NSString *contents = [preambleDict objectForKey:entry]; - [contents writeToFile:path atomically:YES]; - } -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/PreviewRenderer.h b/tikzit-1/src/gtk/PreviewRenderer.h deleted file mode 100644 index d691722..0000000 --- a/tikzit-1/src/gtk/PreviewRenderer.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -#import "Surface.h" - -@class Configuration; -@class Preambles; -@class TikzDocument; - -@interface PreviewRenderer: NSObject { - Configuration *config; - Preambles *preambles; - TikzDocument *document; - PopplerDocument *pdfDocument; - PopplerPage *pdfPage; -} - -@property (readonly) Preambles *preambles; -@property (retain) TikzDocument *document; -@property (readonly) double height; -@property (readonly) double width; - -- (id) initWithPreambles:(Preambles*)p config:(Configuration*)c; - -- (BOOL) updateWithError:(NSError**)error; -- (BOOL) update; -- (BOOL) isValid; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/PreviewRenderer.m b/tikzit-1/src/gtk/PreviewRenderer.m deleted file mode 100644 index 28113d6..0000000 --- a/tikzit-1/src/gtk/PreviewRenderer.m +++ /dev/null @@ -1,250 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "PreviewRenderer.h" - -#import "CairoRenderContext.h" -#import "Configuration.h" -#import "Preambles.h" -#import "TikzDocument.h" - -@implementation PreviewRenderer - -@synthesize preambles, document; - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithPreambles:(Preambles*)p config:(Configuration*)c { - self = [super init]; - - if (self) { - document = nil; - config = [c retain]; - preambles = [p retain]; - pdfDocument = NULL; - pdfPage = NULL; - } - - return self; -} - -- (void) dealloc { - [document release]; - [config release]; - [preambles release]; - - if (pdfDocument) { - g_object_unref (pdfDocument); - pdfDocument = NULL; - } - if (pdfPage) { - g_object_unref (pdfPage); - pdfPage = NULL; - } - - [super dealloc]; -} - -- (BOOL) update { - NSError *error = nil; - BOOL result = [self updateWithError:&error]; - if (error) { - logError (error, @"Could not update preview"); - if ([error code] == TZ_ERR_TOOL_FAILED) { - NSLog (@"Output: %@", [[error userInfo] objectForKey:TZToolOutputErrorKey]); - } - } - return result; -} - -- (BOOL) updateWithError:(NSError**)error { - if (document == nil) { - if (error) { - *error = [NSError errorWithMessage:@"No document given" code:TZ_ERR_BADSTATE]; - } - if (pdfDocument) { - g_object_unref (pdfDocument); - pdfDocument = NULL; - } - if (pdfPage) { - g_object_unref (pdfPage); - pdfPage = NULL; - } - return NO; - } - - NSString *tex = [preambles buildDocumentForTikz:[document tikz]]; - - NSString *tempDir = [[NSFileManager defaultManager] createTempDirectoryWithError:error]; - if (!tempDir) { - if (error) { - *error = [NSError errorWithMessage:@"Could not create temporary directory" code:TZ_ERR_IO cause:*error]; - } - return NO; - } - - // write tex code to temporary file - NSString *texFile = [NSString stringWithFormat:@"%@/tikzit.tex", tempDir]; - NSString *pdfFile = [NSString stringWithFormat:@"file://%@/tikzit.pdf", tempDir]; - [tex writeToFile:texFile atomically:YES]; - - NSTask *latexTask = [[NSTask alloc] init]; - [latexTask setCurrentDirectoryPath:tempDir]; - - // GNUStep is clever enough to use PATH - NSString *path = [config stringEntry:@"pdflatex" - inGroup:@"Previews" - withDefault:@"pdflatex"]; - [latexTask setLaunchPath:path]; - - NSArray *args = [NSArray arrayWithObjects: - @"-fmt=latex", - @"-output-format=pdf", - @"-interaction=nonstopmode", - @"-halt-on-error", - texFile, - nil]; - [latexTask setArguments:args]; - - NSPipe *pout = [NSPipe pipe]; - [latexTask setStandardOutput:pout]; - - NSFileHandle *latexOut = [pout fileHandleForReading]; - - BOOL success = NO; - - NS_DURING { - [latexTask launch]; - [latexTask waitUntilExit]; - } NS_HANDLER { - NSLog(@"Failed to run '%@'; error was: %@", path, [localException reason]); - (void)localException; - if (error) { - NSString *desc = [NSString stringWithFormat:@"Failed to run '%@'", path]; - NSMutableDictionary *errorDetail = [NSMutableDictionary dictionaryWithCapacity:2]; - [errorDetail setValue:desc forKey:NSLocalizedDescriptionKey]; - *error = [NSError errorWithDomain:TZErrorDomain code:TZ_ERR_IO userInfo:errorDetail]; - } - - // remove all temporary files - [[NSFileManager defaultManager] removeFileAtPath:tempDir handler:NULL]; - [latexTask release]; - - return NO; - } NS_ENDHANDLER - - if ([latexTask terminationStatus] != 0) { - if (error) { - NSData *data = [latexOut readDataToEndOfFile]; - NSString *str = [[NSString alloc] initWithData:data - encoding:NSUTF8StringEncoding]; - NSMutableDictionary *errorDetail = [NSMutableDictionary dictionaryWithCapacity:2]; - [errorDetail setValue:@"Generating a PDF file with pdflatex failed" forKey:NSLocalizedDescriptionKey]; - [errorDetail setValue:str forKey:TZToolOutputErrorKey]; - *error = [NSError errorWithDomain:TZErrorDomain code:TZ_ERR_TOOL_FAILED userInfo:errorDetail]; - [str release]; - } - } else { - // load pdf document - GError* gerror = NULL; - pdfDocument = poppler_document_new_from_file([pdfFile UTF8String], NULL, &gerror); - if (!pdfDocument) { - if (error) { - *error = [NSError errorWithMessage:[NSString stringWithFormat:@"Could not load PDF document", pdfFile] - code:TZ_ERR_IO - cause:[NSError errorWithGError:gerror]]; - } - g_error_free(gerror); - } else { - pdfPage = poppler_document_get_page(pdfDocument, 0); - if(!pdfPage) { - if (error) { - *error = [NSError errorWithMessage:@"Could not open first page of PDF document" - code:TZ_ERR_OTHER]; - } - g_object_unref(pdfDocument); - } else { - success = YES; - } - } - } - - // remove all temporary files - [[NSFileManager defaultManager] removeFileAtPath:tempDir handler:NULL]; - [latexTask release]; - - return success; -} - -- (BOOL) isValid { - return pdfPage ? YES : NO; -} - -- (double) width { - double w = 0.0; - if (pdfPage) - poppler_page_get_size(pdfPage, &w, NULL); - return w; -} - -- (double) height { - double h = 0.0; - if (pdfPage) - poppler_page_get_size(pdfPage, NULL, &h); - return h; -} - -- (void) renderWithContext:(id)c onSurface:(id)surface { - if (document != nil && pdfPage) { - CairoRenderContext *context = (CairoRenderContext*)c; - - double w = 0.0; - double h = 0.0; - poppler_page_get_size(pdfPage, &w, &h); - if (w==0) w = 1.0; - if (h==0) h = 1.0; - - double scale = ([surface height] / h) * 0.95; - if (w * scale > [surface width]) scale = [surface width] / w; - [[surface transformer] setScale:scale]; - - NSPoint origin; - w *= scale; - h *= scale; - origin.x = ([surface width] - w) / 2; - origin.y = ([surface height] - h) / 2; - - [[surface transformer] setOrigin:origin]; - - [context saveState]; - [context applyTransform:[surface transformer]]; - - // white-out - [context paintWithColor:WhiteRColor]; - - poppler_page_render (pdfPage, [context cairoContext]); - - [context restoreState]; - } -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/PreviewWindow.h b/tikzit-1/src/gtk/PreviewWindow.h deleted file mode 100644 index 8bcd3e5..0000000 --- a/tikzit-1/src/gtk/PreviewWindow.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class Configuration; -@class Preambles; -@class PreviewRenderer; -@class TikzDocument; -@class WidgetSurface; - -@interface PreviewWindow: NSObject { - PreviewRenderer *previewer; - GtkWindow *window; - WidgetSurface *surface; - GtkWindow *parent; -} - -- (id) initWithPreambles:(Preambles*)p config:(Configuration*)c; - -- (void) setParentWindow:(GtkWindow*)parent; - -- (TikzDocument*) document; -- (void) setDocument:(TikzDocument*)doc; - -- (BOOL) update; - -- (void) present; -- (void) show; -- (void) hide; -- (BOOL) isVisible; -- (void) setVisible:(BOOL)visible; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/PreviewWindow.m b/tikzit-1/src/gtk/PreviewWindow.m deleted file mode 100644 index fc0e7a3..0000000 --- a/tikzit-1/src/gtk/PreviewWindow.m +++ /dev/null @@ -1,195 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "PreviewWindow.h" - -#import "Preambles.h" -#import "PreviewRenderer.h" -#import "TikzDocument.h" -#import "WidgetSurface.h" - -#import "gtkhelpers.h" - -@interface PreviewWindow (Private) -- (BOOL) updateOrShowError; -- (void) updateDefaultSize; -@end - -// {{{ API - -@implementation PreviewWindow - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithPreambles:(Preambles*)p config:(Configuration*)c { - self = [super init]; - - if (self) { - parent = NULL; - previewer = [[PreviewRenderer alloc] initWithPreambles:p config:c]; - - window = GTK_WINDOW (gtk_window_new (GTK_WINDOW_TOPLEVEL)); - gtk_window_set_title (window, "Preview"); - gtk_window_set_resizable (window, TRUE); - gtk_window_set_default_size (window, 150.0, 150.0); - g_signal_connect (G_OBJECT (window), - "delete-event", - G_CALLBACK (gtk_widget_hide_on_delete), - NULL); - - GtkWidget *pdfArea = gtk_drawing_area_new (); - gtk_container_add (GTK_CONTAINER (window), pdfArea); - gtk_widget_show (pdfArea); - surface = [[WidgetSurface alloc] initWithWidget:pdfArea]; - [surface setRenderDelegate:previewer]; - Transformer *t = [surface transformer]; - [t setFlippedAboutXAxis:![t isFlippedAboutXAxis]]; - } - - return self; -} - -- (void) setParentWindow:(GtkWindow*)p { - parent = p; - gtk_window_set_transient_for (window, p); - if (p != NULL) { - gtk_window_set_position (window, GTK_WIN_POS_CENTER_ON_PARENT); - } -} - -- (TikzDocument*) document { - return [previewer document]; -} - -- (void) setDocument:(TikzDocument*)doc { - [previewer setDocument:doc]; -} - -- (void) present { - if ([self updateOrShowError]) { - [self updateDefaultSize]; - gtk_window_present (GTK_WINDOW (window)); - [surface invalidate]; - } -} - -- (BOOL) update { - if ([self updateOrShowError]) { - [self updateDefaultSize]; - return YES; - } - - return NO; -} - -- (void) show { - if ([self updateOrShowError]) { - [self updateDefaultSize]; - gtk_widget_show (GTK_WIDGET (window)); - [surface invalidate]; - } -} - -- (void) hide { - gtk_widget_hide (GTK_WIDGET (window)); -} - -- (BOOL) isVisible { - gboolean visible; - g_object_get (G_OBJECT (window), "visible", &visible, NULL); - return visible ? YES : NO; -} - -- (void) setVisible:(BOOL)visible { - if (visible) { - [self show]; - } else { - [self hide]; - } -} - -- (void) dealloc { - gtk_widget_destroy (GTK_WIDGET (window)); - [previewer release]; - [surface release]; - - [super dealloc]; -} - -@end -// }}} - -@implementation PreviewWindow (Private) -- (BOOL) updateOrShowError { - NSError *error = nil; - if (![previewer updateWithError:&error]) { - GtkWindow *dparent = gtk_widget_get_visible (GTK_WIDGET (window)) - ? window - : parent; - GtkWidget *dialog = gtk_message_dialog_new (dparent, - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_CLOSE, - "Failed to generate the preview: %s", - [[error localizedDescription] UTF8String]); -#if GTK_CHECK_VERSION(2,22,0) - if ([error code] == TZ_ERR_TOOL_FAILED) { - GtkBox *box = GTK_BOX (gtk_message_dialog_get_message_area (GTK_MESSAGE_DIALOG (dialog))); - GtkWidget *label = gtk_label_new ("pdflatex said:"); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5f); - gtk_widget_show (label); - gtk_box_pack_start (box, label, FALSE, TRUE, 0); - - GtkWidget *view = gtk_text_view_new (); - GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)); - gtk_text_buffer_set_text (buffer, [[error toolOutput] UTF8String], -1); - gtk_text_view_set_editable (GTK_TEXT_VIEW (view), FALSE); - gtk_widget_show (view); - GtkWidget *scrolledView = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledView), - GTK_POLICY_NEVER, // horiz - GTK_POLICY_ALWAYS); // vert - gtk_widget_set_size_request (scrolledView, -1, 120); - gtk_container_add (GTK_CONTAINER (scrolledView), view); - gtk_widget_show (scrolledView); - gtk_box_pack_start (box, scrolledView, TRUE, TRUE, 0); - } -#endif // GTK+ 2.22.0 - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - return NO; - } - return YES; -} - -- (void) updateDefaultSize { - double width = 150; - double height = 150; - if ([previewer isValid]) { - double pWidth = [previewer width]; - double pHeight = [previewer height]; - width = (width < pWidth + 4) ? pWidth + 4 : width; - height = (height < pHeight + 4) ? pHeight + 4 : height; - } - gtk_window_set_default_size (window, width, height); -} -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/PropertiesPane.h b/tikzit-1/src/gtk/PropertiesPane.h deleted file mode 100644 index c76efae..0000000 --- a/tikzit-1/src/gtk/PropertiesPane.h +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class Configuration; -@class EdgePropertyDelegate; -@class EdgeStylesModel; -@class GraphPropertyDelegate; -@class NodePropertyDelegate; -@class NodeStylesModel; -@class PropertyListEditor; -@class StyleManager; -@class TikzDocument; - -@interface PropertiesPane: NSObject { - TikzDocument *document; - BOOL blockUpdates; - - PropertyListEditor *graphProps; - PropertyListEditor *nodeProps; - PropertyListEditor *edgeProps; - PropertyListEditor *edgeNodeProps; - - GraphPropertyDelegate *graphPropDelegate; - NodePropertyDelegate *nodePropDelegate; - EdgePropertyDelegate *edgePropDelegate; - - GtkWidget *layout; - - GtkWidget *currentPropsWidget; // no ref! - - GtkWidget *graphPropsWidget; - GtkWidget *nodePropsWidget; - GtkWidget *edgePropsWidget; - - GtkEntry *nodeLabelEntry; - GtkToggleButton *edgeNodeToggle; - GtkWidget *edgeNodePropsWidget; - GtkEntry *edgeNodeLabelEntry; - GtkEntry *edgeSourceAnchorEntry; - GtkEntry *edgeTargetAnchorEntry; -} - -@property (retain) TikzDocument *document; -@property (assign) BOOL visible; -@property (readonly) GtkWidget *gtkWidget; - -- (void) loadConfiguration:(Configuration*)config; -- (void) saveConfiguration:(Configuration*)config; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/PropertiesPane.m b/tikzit-1/src/gtk/PropertiesPane.m deleted file mode 100644 index ba43298..0000000 --- a/tikzit-1/src/gtk/PropertiesPane.m +++ /dev/null @@ -1,763 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "PropertiesPane.h" - -#import "GraphElementProperty.h" -#import "PropertyListEditor.h" -#import "TikzDocument.h" - -#import "gtkhelpers.h" - -// {{{ Internal interfaces -// {{{ GTK+ helpers -static GtkWidget *createLabelledEntry (const gchar *labelText, GtkEntry **entry); -static GtkWidget *createPropsPaneWithLabelEntry (PropertyListEditor *props, GtkEntry **labelEntry); -static GtkWidget *createBoldLabel (const gchar *text); -// }}} -// {{{ GTK+ callbacks -static void node_label_changed_cb (GtkEditable *widget, PropertiesPane *pane); -static void edge_node_label_changed_cb (GtkEditable *widget, PropertiesPane *pane); -static void edge_node_toggled_cb (GtkToggleButton *widget, PropertiesPane *pane); -static void edge_source_anchor_changed_cb (GtkEditable *widget, PropertiesPane *pane); -static void edge_target_anchor_changed_cb (GtkEditable *widget, PropertiesPane *pane); -// }}} - -@interface PropertiesPane (Notifications) -- (void) nodeSelectionChanged:(NSNotification*)n; -- (void) edgeSelectionChanged:(NSNotification*)n; -- (void) graphChanged:(NSNotification*)n; -- (void) nodeLabelEdited:(NSString*)newValue; -- (void) edgeNodeLabelEdited:(NSString*)newValue; -- (void) edgeNodeToggled:(BOOL)newValue; -- (BOOL) edgeSourceAnchorEdited:(NSString*)newValue; -- (BOOL) edgeTargetAnchorEdited:(NSString*)newValue; -@end - -@interface PropertiesPane (Private) -- (void) _updatePane; -- (void) _setDisplayedWidget:(GtkWidget*)widget; -@end - -// {{{ Delegates - -@interface GraphPropertyDelegate : NSObject { - TikzDocument *doc; -} -- (void) setDocument:(TikzDocument*)d; -@end - -@interface NodePropertyDelegate : NSObject { - TikzDocument *doc; - Node *node; -} -- (void) setDocument:(TikzDocument*)d; -- (void) setNode:(Node*)n; -@end - -@interface EdgePropertyDelegate : NSObject { - TikzDocument *doc; - Edge *edge; -} -- (void) setDocument:(TikzDocument*)d; -- (void) setEdge:(Edge*)e; -@end - -// }}} - -// }}} -// {{{ API - -@implementation PropertiesPane - -- (id) init { - self = [super init]; - - if (self) { - document = nil; - blockUpdates = NO; - - graphProps = [[PropertyListEditor alloc] init]; - graphPropDelegate = [[GraphPropertyDelegate alloc] init]; - [graphProps setDelegate:graphPropDelegate]; - - nodeProps = [[PropertyListEditor alloc] init]; - nodePropDelegate = [[NodePropertyDelegate alloc] init]; - [nodeProps setDelegate:nodePropDelegate]; - - edgeProps = [[PropertyListEditor alloc] init]; - edgePropDelegate = [[EdgePropertyDelegate alloc] init]; - [edgeProps setDelegate:edgePropDelegate]; - - edgeNodeProps = [[PropertyListEditor alloc] init]; - [edgeNodeProps setDelegate:edgePropDelegate]; - - layout = gtk_vbox_new (FALSE, 0); - g_object_ref_sink (layout); - gtk_widget_show (layout); - - /* - * Graph properties - */ - graphPropsWidget = gtk_vbox_new (FALSE, 6); - g_object_ref_sink (graphPropsWidget); - gtk_widget_show (graphPropsWidget); - - GtkWidget *label = createBoldLabel ("Graph properties"); - gtk_widget_show (label); - gtk_box_pack_start (GTK_BOX (graphPropsWidget), - label, - FALSE, FALSE, 0); - - gtk_widget_show ([graphProps widget]); - gtk_box_pack_start (GTK_BOX (graphPropsWidget), - [graphProps widget], - TRUE, TRUE, 0); - - gtk_box_pack_start (GTK_BOX (layout), - graphPropsWidget, - TRUE, TRUE, 0); - - - /* - * Node properties - */ - nodePropsWidget = gtk_vbox_new (FALSE, 6); - g_object_ref_sink (nodePropsWidget); - gtk_box_pack_start (GTK_BOX (layout), - nodePropsWidget, - TRUE, TRUE, 0); - - label = createBoldLabel ("Node properties"); - gtk_widget_show (label); - gtk_box_pack_start (GTK_BOX (nodePropsWidget), - label, - FALSE, FALSE, 0); - - GtkWidget *labelWidget = createLabelledEntry ("Label", &nodeLabelEntry); - gtk_widget_show (labelWidget); - gtk_box_pack_start (GTK_BOX (nodePropsWidget), - labelWidget, - FALSE, FALSE, 0); - - gtk_widget_show ([nodeProps widget]); - gtk_box_pack_start (GTK_BOX (nodePropsWidget), - [nodeProps widget], - TRUE, TRUE, 0); - - g_signal_connect (G_OBJECT (nodeLabelEntry), - "changed", - G_CALLBACK (node_label_changed_cb), - self); - - /* - * Edge properties - */ - edgePropsWidget = gtk_vbox_new (FALSE, 6); - g_object_ref_sink (edgePropsWidget); - gtk_box_pack_start (GTK_BOX (layout), - edgePropsWidget, - TRUE, TRUE, 0); - - label = createBoldLabel ("Edge properties"); - gtk_widget_show (label); - gtk_box_pack_start (GTK_BOX (edgePropsWidget), - label, - FALSE, FALSE, 0); - - gtk_widget_show ([edgeProps widget]); - gtk_box_pack_start (GTK_BOX (edgePropsWidget), - [edgeProps widget], - TRUE, TRUE, 0); - - GtkWidget *split = gtk_hseparator_new (); - gtk_widget_show (split); - gtk_box_pack_start (GTK_BOX (edgePropsWidget), - split, - FALSE, FALSE, 0); - - GtkWidget *anchorTable = gtk_table_new (2, 2, FALSE); - - label = gtk_label_new ("Source anchor:"); - gtk_table_attach_defaults (GTK_TABLE (anchorTable), label, - 0, 1, 0, 1); - edgeSourceAnchorEntry = GTK_ENTRY (gtk_entry_new ()); - g_object_ref_sink (edgeSourceAnchorEntry); - gtk_table_attach_defaults (GTK_TABLE (anchorTable), - GTK_WIDGET (edgeSourceAnchorEntry), - 1, 2, 0, 1); - g_signal_connect (G_OBJECT (edgeSourceAnchorEntry), - "changed", - G_CALLBACK (edge_source_anchor_changed_cb), - self); - - label = gtk_label_new ("Target anchor:"); - gtk_table_attach_defaults (GTK_TABLE (anchorTable), label, - 0, 1, 1, 2); - edgeTargetAnchorEntry = GTK_ENTRY (gtk_entry_new ()); - g_object_ref_sink (edgeTargetAnchorEntry); - gtk_table_attach_defaults (GTK_TABLE (anchorTable), - GTK_WIDGET (edgeTargetAnchorEntry), - 1, 2, 1, 2); - g_signal_connect (G_OBJECT (edgeTargetAnchorEntry), - "changed", - G_CALLBACK (edge_target_anchor_changed_cb), - self); - - gtk_widget_show_all (anchorTable); - gtk_box_pack_start (GTK_BOX (edgePropsWidget), - anchorTable, - FALSE, FALSE, 0); - - split = gtk_hseparator_new (); - gtk_widget_show (split); - gtk_box_pack_start (GTK_BOX (edgePropsWidget), - split, - FALSE, FALSE, 0); - - edgeNodeToggle = GTK_TOGGLE_BUTTON (gtk_check_button_new_with_label ("Child node")); - g_object_ref_sink (edgeNodeToggle); - gtk_widget_show (GTK_WIDGET (edgeNodeToggle)); - gtk_box_pack_start (GTK_BOX (edgePropsWidget), - GTK_WIDGET (edgeNodeToggle), - FALSE, FALSE, 0); - g_signal_connect (G_OBJECT (GTK_WIDGET (edgeNodeToggle)), - "toggled", - G_CALLBACK (edge_node_toggled_cb), - self); - - edgeNodePropsWidget = createPropsPaneWithLabelEntry(edgeNodeProps, &edgeNodeLabelEntry); - g_object_ref_sink (edgeNodePropsWidget); - g_object_ref_sink (edgeNodeLabelEntry); - gtk_box_pack_start (GTK_BOX (edgePropsWidget), - edgeNodePropsWidget, - TRUE, TRUE, 0); - g_signal_connect (G_OBJECT (edgeNodeLabelEntry), - "changed", - G_CALLBACK (edge_node_label_changed_cb), - self); - - /* - * Misc setup - */ - - [self _setDisplayedWidget:graphPropsWidget]; - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - g_object_unref (graphPropsWidget); - g_object_unref (nodePropsWidget); - g_object_unref (edgePropsWidget); - - g_object_unref (nodeLabelEntry); - g_object_unref (edgeNodeToggle); - g_object_unref (edgeNodePropsWidget); - g_object_unref (edgeNodeLabelEntry); - g_object_unref (edgeSourceAnchorEntry); - g_object_unref (edgeTargetAnchorEntry); - - g_object_unref (layout); - - [graphProps release]; - [nodeProps release]; - [edgeProps release]; - [edgeNodeProps release]; - - [graphPropDelegate release]; - [nodePropDelegate release]; - [edgePropDelegate release]; - - [document release]; - - [super dealloc]; -} - -- (TikzDocument*) document { - return document; -} - -- (void) setDocument:(TikzDocument*)doc { - if (document != nil) { - [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:document]; - [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:[document pickSupport]]; - } - - [doc retain]; - [document release]; - document = doc; - - [graphPropDelegate setDocument:doc]; - [nodePropDelegate setDocument:doc]; - [edgePropDelegate setDocument:doc]; - - if (doc != nil) { - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(nodeSelectionChanged:) - name:@"NodeSelectionChanged" object:[doc pickSupport]]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(edgeSelectionChanged:) - name:@"EdgeSelectionChanged" object:[doc pickSupport]]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(graphChanged:) - name:@"TikzChanged" object:doc]; - } - - [self _updatePane]; -} - -- (BOOL) visible { - return gtk_widget_get_visible (layout); -} - -- (void) setVisible:(BOOL)visible { - gtk_widget_set_visible (layout, visible); -} - -- (GtkWidget*) gtkWidget { - return layout; -} - -- (void) loadConfiguration:(Configuration*)config { -} - -- (void) saveConfiguration:(Configuration*)config { -} - -@end -// }}} -// {{{ Notifications - -@implementation PropertiesPane (Notifications) - -- (void) nodeSelectionChanged:(NSNotification*)n { - [self _updatePane]; -} - -- (void) edgeSelectionChanged:(NSNotification*)n { - [self _updatePane]; -} - -- (void) graphChanged:(NSNotification*)n { - [self _updatePane]; -} - -- (void) nodeLabelEdited:(NSString*)newValue { - if (blockUpdates) - return; - - NSSet *sel = [[document pickSupport] selectedNodes]; - if ([sel count] != 1) { - NSLog(@"Expected single node selected; got %lu", [sel count]); - return; - } - - if ([newValue isValidTikzPropertyNameOrValue]) { - Node *node = [sel anyObject]; - [document startModifyNode:node]; - [node setLabel:newValue]; - [document endModifyNode]; - } else { - widget_set_error (GTK_WIDGET (nodeLabelEntry)); - } -} - -- (void) edgeNodeLabelEdited:(NSString*)newValue { - if (blockUpdates) - return; - - NSSet *sel = [[document pickSupport] selectedEdges]; - if ([sel count] != 1) { - NSLog(@"Expected single edge selected; got %lu", [sel count]); - return; - } - - Edge *edge = [sel anyObject]; - if (![edge hasEdgeNode]) { - NSLog(@"Expected edge with edge node"); - return; - } - - if ([newValue isValidTikzPropertyNameOrValue]) { - [document startModifyEdge:edge]; - [[edge edgeNode] setLabel:newValue]; - [document endModifyEdge]; - } else { - widget_set_error (GTK_WIDGET (edgeNodeLabelEntry)); - } -} - -- (void) edgeNodeToggled:(BOOL)newValue { - if (blockUpdates) - return; - - NSSet *sel = [[document pickSupport] selectedEdges]; - if ([sel count] != 1) { - NSLog(@"Expected single edge selected; got %lu", [sel count]); - return; - } - - Edge *edge = [sel anyObject]; - - [document startModifyEdge:edge]; - [edge setHasEdgeNode:newValue]; - [document endModifyEdge]; -} - -- (BOOL) edgeSourceAnchorEdited:(NSString*)newValue { - if (blockUpdates) - return YES; - - NSSet *sel = [[document pickSupport] selectedEdges]; - if ([sel count] != 1) { - NSLog(@"Expected single edge selected; got %lu", [sel count]); - return YES; - } - - Edge *edge = [sel anyObject]; - if ([newValue isValidAnchor]) { - [document startModifyEdge:edge]; - [edge setSourceAnchor:newValue]; - [document endModifyEdge]; - return YES; - } else { - return NO; - } -} - -- (BOOL) edgeTargetAnchorEdited:(NSString*)newValue { - if (blockUpdates) - return YES; - - NSSet *sel = [[document pickSupport] selectedEdges]; - if ([sel count] != 1) { - NSLog(@"Expected single edge selected; got %lu", [sel count]); - return YES; - } - - Edge *edge = [sel anyObject]; - if ([newValue isValidAnchor]) { - [document startModifyEdge:edge]; - [edge setTargetAnchor:newValue]; - [document endModifyEdge]; - return YES; - } else { - return NO; - } -} - -@end -// }}} -// {{{ Private - -@implementation PropertiesPane (Private) - -- (void) _setDisplayedWidget:(GtkWidget*)widget { - if (currentPropsWidget != widget) { - if (currentPropsWidget) - gtk_widget_hide (currentPropsWidget); - currentPropsWidget = widget; - if (widget) - gtk_widget_show (widget); - } -} - -- (void) _updatePane { - blockUpdates = YES; - - BOOL editGraphProps = YES; - GraphElementData *data = [[document graph] data]; - [graphProps setData:data]; - - NSSet *nodeSel = [[document pickSupport] selectedNodes]; - if ([nodeSel count] == 1) { - Node *n = [nodeSel anyObject]; - [nodePropDelegate setNode:n]; - [nodeProps setData:[n data]]; - gtk_entry_set_text (nodeLabelEntry, [[n label] UTF8String]); - widget_clear_error (GTK_WIDGET (nodeLabelEntry)); - [self _setDisplayedWidget:nodePropsWidget]; - editGraphProps = NO; - } else { - [nodePropDelegate setNode:nil]; - [nodeProps setData:nil]; - gtk_entry_set_text (nodeLabelEntry, ""); - - NSSet *edgeSel = [[document pickSupport] selectedEdges]; - if ([edgeSel count] == 1) { - Edge *e = [edgeSel anyObject]; - [edgePropDelegate setEdge:e]; - [edgeProps setData:[e data]]; - gtk_entry_set_text (edgeSourceAnchorEntry, - [[e sourceAnchor] UTF8String]); - gtk_entry_set_text (edgeTargetAnchorEntry, - [[e targetAnchor] UTF8String]); - widget_clear_error (GTK_WIDGET (edgeSourceAnchorEntry)); - widget_clear_error (GTK_WIDGET (edgeTargetAnchorEntry)); - widget_clear_error (GTK_WIDGET (edgeNodeLabelEntry)); - if ([e hasEdgeNode]) { - gtk_toggle_button_set_active (edgeNodeToggle, TRUE); - gtk_widget_show (edgeNodePropsWidget); - gtk_entry_set_text (edgeNodeLabelEntry, [[[e edgeNode] label] UTF8String]); - [edgeNodeProps setData:[[e edgeNode] data]]; - gtk_widget_set_sensitive (edgeNodePropsWidget, TRUE); - } else { - gtk_toggle_button_set_active (edgeNodeToggle, FALSE); - gtk_widget_hide (edgeNodePropsWidget); - gtk_entry_set_text (edgeNodeLabelEntry, ""); - [edgeNodeProps setData:nil]; - gtk_widget_set_sensitive (edgeNodePropsWidget, FALSE); - } - [self _setDisplayedWidget:edgePropsWidget]; - editGraphProps = NO; - } else { - [edgePropDelegate setEdge:nil]; - [edgeProps setData:nil]; - [edgeNodeProps setData:nil]; - gtk_entry_set_text (edgeNodeLabelEntry, ""); - } - } - - if (editGraphProps) { - [self _setDisplayedWidget:graphPropsWidget]; - } - - blockUpdates = NO; -} - -@end - -// }}} -// {{{ Delegates - -@implementation GraphPropertyDelegate -- (id) init { - self = [super init]; - if (self) { - doc = nil; - } - return self; -} -- (void) dealloc { - // doc is not retained - [super dealloc]; -} -- (void) setDocument:(TikzDocument*)d { - doc = d; -} -- (BOOL)startEdit { - if ([doc graph] != nil) { - [doc startChangeGraphProperties]; - return YES; - } - return NO; -} -- (void)endEdit { - [doc endChangeGraphProperties]; -} -- (void)cancelEdit { - [doc cancelChangeGraphProperties]; -} -@end - -@implementation NodePropertyDelegate -- (id) init { - self = [super init]; - if (self) { - doc = nil; - node = nil; - } - return self; -} -- (void) dealloc { - // doc,node not retained - [super dealloc]; -} -- (void) setDocument:(TikzDocument*)d { - doc = d; - node = nil; -} -- (void) setNode:(Node*)n { - node = n; -} -- (BOOL)startEdit { - if (node != nil) { - [doc startModifyNode:node]; - return YES; - } - return NO; -} -- (void)endEdit { - [doc endModifyNode]; -} -- (void)cancelEdit { - [doc cancelModifyNode]; -} -@end - -@implementation EdgePropertyDelegate -- (id) init { - self = [super init]; - if (self) { - doc = nil; - edge = nil; - } - return self; -} -- (void) dealloc { - // doc,edge not retained - [super dealloc]; -} -- (void) setDocument:(TikzDocument*)d { - doc = d; - edge = nil; -} -- (void) setEdge:(Edge*)e { - edge = e; -} -- (BOOL)startEdit { - if (edge != nil) { - [doc startModifyEdge:edge]; - return YES; - } - return NO; -} -- (void)endEdit { - [doc endModifyEdge]; -} -- (void)cancelEdit { - [doc cancelModifyEdge]; -} -@end - -// }}} -// {{{ GTK+ helpers - -static GtkWidget *createLabelledEntry (const gchar *labelText, GtkEntry **entry) { - GtkBox *box = GTK_BOX (gtk_hbox_new (FALSE, 0)); - GtkWidget *label = gtk_label_new (labelText); - gtk_widget_show (label); - GtkWidget *entryWidget = gtk_entry_new (); - gtk_widget_show (entryWidget); - // container widget expand fill pad - gtk_box_pack_start (box, label, FALSE, TRUE, 5); - gtk_box_pack_start (box, entryWidget, TRUE, TRUE, 0); - if (entry) - *entry = GTK_ENTRY (entryWidget); - return GTK_WIDGET (box); -} - -static GtkWidget *createPropsPaneWithLabelEntry (PropertyListEditor *props, GtkEntry **labelEntry) { - GtkBox *box = GTK_BOX (gtk_vbox_new (FALSE, 6)); - - GtkWidget *labelWidget = createLabelledEntry ("Label", labelEntry); - gtk_widget_show (labelWidget); - // box widget expand fill pad - gtk_box_pack_start (box, labelWidget, FALSE, FALSE, 0); - gtk_box_pack_start (box, [props widget], TRUE, TRUE, 0); - gtk_widget_show ([props widget]); - return GTK_WIDGET (box); -} - -static GtkWidget *createBoldLabel (const gchar *text) { - GtkWidget *label = gtk_label_new (text); - label_set_bold (GTK_LABEL (label)); - return label; -} - -// }}} -// {{{ GTK+ callbacks - -static void node_label_changed_cb (GtkEditable *editable, PropertiesPane *pane) { - if (!gtk_widget_is_sensitive (GTK_WIDGET (editable))) { - // clearly wasn't the user editing - return; - } - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - NSString *newValue = gtk_editable_get_string (editable, 0, -1); - [pane nodeLabelEdited:newValue]; - - [pool drain]; -} - -static void edge_node_label_changed_cb (GtkEditable *editable, PropertiesPane *pane) { - if (!gtk_widget_is_sensitive (GTK_WIDGET (editable))) { - // clearly wasn't the user editing - return; - } - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - NSString *newValue = gtk_editable_get_string (editable, 0, -1); - [pane edgeNodeLabelEdited:newValue]; - - [pool drain]; -} - -static void edge_node_toggled_cb (GtkToggleButton *toggle, PropertiesPane *pane) { - if (!gtk_widget_is_sensitive (GTK_WIDGET (toggle))) { - // clearly wasn't the user editing - return; - } - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - gboolean newValue = gtk_toggle_button_get_active (toggle); - [pane edgeNodeToggled:newValue]; - - [pool drain]; -} - -static void edge_source_anchor_changed_cb (GtkEditable *editable, PropertiesPane *pane) { - if (!gtk_widget_is_sensitive (GTK_WIDGET (editable))) { - // clearly wasn't the user editing - return; - } - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - NSString *newValue = gtk_editable_get_string (editable, 0, -1); - if (![pane edgeSourceAnchorEdited:newValue]) - widget_set_error (GTK_WIDGET (editable)); - - [pool drain]; -} - -static void edge_target_anchor_changed_cb (GtkEditable *editable, PropertiesPane *pane) { - if (!gtk_widget_is_sensitive (GTK_WIDGET (editable))) { - // clearly wasn't the user editing - return; - } - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - NSString *newValue = gtk_editable_get_string (editable, 0, -1); - if (![pane edgeTargetAnchorEdited:newValue]) - widget_set_error (GTK_WIDGET (editable)); - - [pool drain]; -} - -// }}} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/PropertyListEditor.h b/tikzit-1/src/gtk/PropertyListEditor.h deleted file mode 100644 index 2d3166a..0000000 --- a/tikzit-1/src/gtk/PropertyListEditor.h +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import -#import "GraphElementData.h" -#import "GraphElementProperty.h" - -@protocol PropertyChangeDelegate -@optional -- (BOOL)startEdit; -- (void)endEdit; -- (void)cancelEdit; -@end - -@interface PropertyListEditor: NSObject { - GraphElementData *data; - NSObject *delegate; - - GtkListStore *list; - GtkWidget *view; - GtkWidget *widget; - GtkWidget *removeButton; -} - -/*! - @property widget - @brief The widget displaying the editable list - */ -@property (readonly) GtkWidget *widget; - -/*! - @property data - @brief The GraphElementData that should be reflected in the list - */ -@property (retain) GraphElementData *data; - -/*! - @property delegate - @brief A delegate for dealing with property changes - */ -@property (retain) NSObject *delegate; - -/*! - * Reload the properties from the data store - */ -- (void) reloadProperties; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/PropertyListEditor.m b/tikzit-1/src/gtk/PropertyListEditor.m deleted file mode 100644 index 9760618..0000000 --- a/tikzit-1/src/gtk/PropertyListEditor.m +++ /dev/null @@ -1,501 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "PropertyListEditor.h" -#import "gtkhelpers.h" - -// {{{ Constants - -enum { - PLM_NAME_COL = 0, - PLM_VALUE_COL, - PLM_IS_PROPERTY_COL, - PLM_PROPERTY_COL, - PLM_N_COLS -}; - -// }}} -// {{{ Internal interfaces -// {{{ Signals - -static void value_edited_cb (GtkCellRendererText *renderer, - gchar *path, - gchar *new_text, - PropertyListEditor *editor); -static void name_edited_cb (GtkCellRendererText *renderer, - gchar *path, - gchar *new_text, - PropertyListEditor *editor); -static void add_prop_clicked_cb (GtkButton *button, - PropertyListEditor *editor); -static void add_atom_clicked_cb (GtkButton *button, - PropertyListEditor *editor); -static void remove_clicked_cb (GtkButton *button, - PropertyListEditor *editor); -static void text_editing_started (GtkCellRenderer *cell, - GtkCellEditable *editable, - const gchar *path, - PropertyListEditor *editor); -static void text_changed_cb (GtkEditable *editable, - PropertyListEditor *pane); -static void selection_changed_cb (GtkTreeSelection *selection, - PropertyListEditor *pane); - -// }}} -// {{{ Private - -@interface PropertyListEditor (Private) -- (void) updatePath:(gchar*)path withValue:(NSString*)newText; -- (void) updatePath:(gchar*)path withName:(NSString*)newText; -- (void) addProperty; -- (void) addAtom; -- (void) removeSelected; -- (void) selectionCountChanged:(int)newSelectionCount; -- (void) clearStore; -@end - -// }}} -// }}} -// {{{ API - -@implementation PropertyListEditor - -- (id) init { - self = [super init]; - - if (self) { - list = gtk_list_store_new (PLM_N_COLS, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_BOOLEAN, - G_TYPE_POINTER); - g_object_ref_sink (G_OBJECT (list)); - view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (list)); - g_object_ref_sink (G_OBJECT (view)); - GtkWidget *scrolledview = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledview), - GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); - gtk_container_add (GTK_CONTAINER (scrolledview), view); - gtk_widget_set_size_request (view, -1, 150); - data = nil; - delegate = nil; - - GtkCellRenderer *renderer; - GtkTreeViewColumn *column; - - renderer = gtk_cell_renderer_text_new (); - g_object_set (G_OBJECT (renderer), - "editable", TRUE, - NULL); - column = gtk_tree_view_column_new_with_attributes ("Key/Atom", - renderer, - "text", PLM_NAME_COL, - NULL); - gtk_tree_view_append_column (GTK_TREE_VIEW (view), column); - g_signal_connect (G_OBJECT (renderer), - "editing-started", - G_CALLBACK (text_editing_started), - self); - g_signal_connect (G_OBJECT (renderer), - "edited", - G_CALLBACK (name_edited_cb), - self); - - renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes ("Value", - renderer, - "text", PLM_VALUE_COL, - "editable", PLM_IS_PROPERTY_COL, - "sensitive", PLM_IS_PROPERTY_COL, - NULL); - gtk_tree_view_append_column (GTK_TREE_VIEW (view), column); - g_signal_connect (G_OBJECT (renderer), - "edited", - G_CALLBACK (value_edited_cb), - self); - - widget = gtk_vbox_new (FALSE, 0); - gtk_box_set_spacing (GTK_BOX (widget), 6); - g_object_ref_sink (G_OBJECT (widget)); - - GtkWidget *listFrame = gtk_frame_new (NULL); - gtk_container_add (GTK_CONTAINER (listFrame), scrolledview); - gtk_widget_show (listFrame); - gtk_container_add (GTK_CONTAINER (widget), listFrame); - - GtkBox *buttonBox = GTK_BOX (gtk_hbox_new(FALSE, 0)); - gtk_box_pack_start (GTK_BOX (widget), GTK_WIDGET (buttonBox), FALSE, FALSE, 0); - - GtkWidget *addPropButton = gtk_button_new (); - //gtk_widget_set_size_request (addPropButton, 27, 27); - gtk_widget_set_tooltip_text (addPropButton, "Add property"); - GtkWidget *addPropContents = gtk_hbox_new(FALSE, 0); - GtkWidget *addPropIcon = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON); - gtk_container_add (GTK_CONTAINER (addPropContents), addPropIcon); - gtk_container_add (GTK_CONTAINER (addPropContents), gtk_label_new ("P")); - gtk_container_add (GTK_CONTAINER (addPropButton), addPropContents); - gtk_box_pack_start (buttonBox, addPropButton, FALSE, FALSE, 0); - g_signal_connect (G_OBJECT (addPropButton), - "clicked", - G_CALLBACK (add_prop_clicked_cb), - self); - - GtkWidget *addAtomButton = gtk_button_new (); - //gtk_widget_set_size_request (addAtomButton, 27, 27); - gtk_widget_set_tooltip_text (addAtomButton, "Add atom"); - GtkWidget *addAtomContents = gtk_hbox_new(FALSE, 0); - GtkWidget *addAtomIcon = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON); - gtk_container_add (GTK_CONTAINER (addAtomContents), addAtomIcon); - gtk_container_add (GTK_CONTAINER (addAtomContents), gtk_label_new ("A")); - gtk_container_add (GTK_CONTAINER (addAtomButton), addAtomContents); - gtk_box_pack_start (buttonBox, addAtomButton, FALSE, FALSE, 0); - g_signal_connect (G_OBJECT (addAtomButton), - "clicked", - G_CALLBACK (add_atom_clicked_cb), - self); - - removeButton = gtk_button_new (); - g_object_ref_sink (G_OBJECT (removeButton)); - gtk_widget_set_sensitive (removeButton, FALSE); - //gtk_widget_set_size_request (removeButton, 27, 27); - gtk_widget_set_tooltip_text (removeButton, "Remove selected"); - GtkWidget *removeIcon = gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_BUTTON); - gtk_container_add (GTK_CONTAINER (removeButton), removeIcon); - gtk_box_pack_start (buttonBox, removeButton, FALSE, FALSE, 0); - g_signal_connect (G_OBJECT (removeButton), - "clicked", - G_CALLBACK (remove_clicked_cb), - self); - - GtkTreeSelection *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view)); - g_signal_connect (G_OBJECT (selection), - "changed", - G_CALLBACK (selection_changed_cb), - self); - - gtk_widget_show_all (GTK_WIDGET (buttonBox)); - gtk_widget_show_all (scrolledview); - - gtk_widget_set_sensitive (widget, FALSE); - } - - return self; -} - -- (void) dealloc { - [self clearStore]; - - [data release]; - [delegate release]; - - g_object_unref (list); - g_object_unref (view); - g_object_unref (widget); - g_object_unref (removeButton); - - [super dealloc]; -} - -@synthesize widget, delegate; - -- (GraphElementData*) data { return data; } -- (void) setData:(GraphElementData*)d { - [d retain]; - [data release]; - data = d; - [self reloadProperties]; - gtk_widget_set_sensitive (widget, data != nil); -} - -- (void) reloadProperties { - [self clearStore]; - int pos = 0; - for (GraphElementProperty *p in data) { - GtkTreeIter iter; - [p retain]; - gtk_list_store_insert_with_values (list, &iter, pos, - PLM_NAME_COL, [[p key] UTF8String], - PLM_VALUE_COL, [[p value] UTF8String], - PLM_IS_PROPERTY_COL, ![p isAtom], - PLM_PROPERTY_COL, (void *)p, - -1); - ++pos; - } -} - -@end - -// }}} -// {{{ Private - -@implementation PropertyListEditor (Private) -- (void) updatePath:(gchar*)pathStr withValue:(NSString*)newText { - if (![newText isValidTikzPropertyNameOrValue]) - return; - - GtkTreeIter iter; - GtkTreePath *path = gtk_tree_path_new_from_string (pathStr); - - if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (list), &iter, path)) { - gtk_tree_path_free (path); - return; - } - - void *propPtr; - gtk_tree_model_get (GTK_TREE_MODEL (list), &iter, - PLM_PROPERTY_COL, &propPtr, - -1); - GraphElementProperty *prop = (GraphElementProperty*)propPtr; - - if (![prop isAtom]) { - if (![delegate respondsToSelector:@selector(startEdit)] || [delegate startEdit]) { - [prop setValue:newText]; - gtk_list_store_set (list, &iter, - PLM_VALUE_COL, [newText UTF8String], - -1); - [delegate endEdit]; - } - } - - gtk_tree_path_free (path); -} - -- (void) updatePath:(gchar*)pathStr withName:(NSString*)newText { - if (![newText isValidTikzPropertyNameOrValue]) - return; - - GtkTreeIter iter; - GtkTreePath *path = gtk_tree_path_new_from_string (pathStr); - - if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (list), &iter, path)) { - gtk_tree_path_free (path); - return; - } - - void *propPtr; - gtk_tree_model_get (GTK_TREE_MODEL (list), &iter, - PLM_PROPERTY_COL, &propPtr, - -1); - GraphElementProperty *prop = (GraphElementProperty*)propPtr; - - if (![delegate respondsToSelector:@selector(startEdit)] || [delegate startEdit]) { - if ([newText isEqualToString:@""]) { - [data removeObjectIdenticalTo:prop]; - gtk_list_store_remove (list, &iter); - [prop release]; - } else { - [prop setKey:newText]; - gtk_list_store_set (list, &iter, - PLM_NAME_COL, [newText UTF8String], - -1); - } - [delegate endEdit]; - } - - gtk_tree_path_free (path); -} - -- (void) addProperty { - GtkTreeIter iter; - GraphElementProperty *p = [[GraphElementProperty alloc] initWithPropertyValue:@"" forKey:@"new property"]; - if (![delegate respondsToSelector:@selector(startEdit)] || [delegate startEdit]) { - [data addObject:p]; - gint pos = [data count] - 1; - gtk_list_store_insert_with_values (list, &iter, pos, - PLM_NAME_COL, "new property", - PLM_VALUE_COL, "", - PLM_IS_PROPERTY_COL, TRUE, - PLM_PROPERTY_COL, (void *)p, - -1); - [delegate endEdit]; - } else { - [p release]; - } -} - -- (void) addAtom { - GtkTreeIter iter; - GraphElementProperty *p = [[GraphElementProperty alloc] initWithAtomName:@"new atom"]; - if (![delegate respondsToSelector:@selector(startEdit)] || [delegate startEdit]) { - [data addObject:p]; - gint pos = [data count] - 1; - gtk_list_store_insert_with_values (list, &iter, pos, - PLM_NAME_COL, "new atom", - PLM_VALUE_COL, [[p value] UTF8String], - PLM_IS_PROPERTY_COL, FALSE, - PLM_PROPERTY_COL, (void *)p, - -1); - [delegate endEdit]; - } else { - [p release]; - } -} - -- (void) removeSelected { - GtkTreeSelection *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view)); - GList *selPaths = gtk_tree_selection_get_selected_rows (selection, NULL); - GList *selIters = NULL; - - // Convert to iters, as GtkListStore has persistent iters - GList *curr = selPaths; - while (curr != NULL) { - GtkTreeIter iter; - gtk_tree_model_get_iter (GTK_TREE_MODEL (list), - &iter, - (GtkTreePath*)curr->data); - selIters = g_list_prepend (selIters, gtk_tree_iter_copy (&iter)); - curr = g_list_next (curr); - } - - // remove all iters - curr = selIters; - while (curr != NULL) { - GtkTreeIter *iter = (GtkTreeIter*)curr->data; - void *propPtr; - gtk_tree_model_get (GTK_TREE_MODEL (list), iter, - PLM_PROPERTY_COL, &propPtr, - -1); - GraphElementProperty *prop = (GraphElementProperty*)propPtr; - if (![delegate respondsToSelector:@selector(startEdit)] || [delegate startEdit]) { - [data removeObjectIdenticalTo:prop]; - gtk_list_store_remove (list, iter); - [prop release]; - [delegate endEdit]; - } - curr = g_list_next (curr); - } - - g_list_foreach (selIters, (GFunc) gtk_tree_iter_free, NULL); - g_list_free (selIters); - g_list_foreach (selPaths, (GFunc) gtk_tree_path_free, NULL); - g_list_free (selPaths); -} - -- (void) selectionCountChanged:(int)count { - gtk_widget_set_sensitive (removeButton, count > 0); -} - -- (void) clearStore { - GtkTreeIter iter; - if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list), &iter)) { - do { - void *prop; - gtk_tree_model_get (GTK_TREE_MODEL (list), &iter, - PLM_PROPERTY_COL, &prop, - -1); - [(id)prop release]; - } while (gtk_tree_model_iter_next (GTK_TREE_MODEL (list), &iter)); - gtk_list_store_clear (list); - } -} -@end - -// }}} -// {{{ GTK+ callbacks - -static void value_edited_cb (GtkCellRendererText *renderer, - gchar *path, - gchar *new_text, - PropertyListEditor *editor) -{ - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor updatePath:path withValue:[NSString stringWithUTF8String:new_text]]; - [pool drain]; -} - -static void name_edited_cb (GtkCellRendererText *renderer, - gchar *path, - gchar *new_text, - PropertyListEditor *editor) -{ - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor updatePath:path withName:[NSString stringWithUTF8String:new_text]]; - [pool drain]; -} - -static void add_prop_clicked_cb (GtkButton *button, - PropertyListEditor *editor) -{ - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor addProperty]; - [pool drain]; -} - -static void add_atom_clicked_cb (GtkButton *button, - PropertyListEditor *editor) -{ - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor addAtom]; - [pool drain]; -} - -static void remove_clicked_cb (GtkButton *button, - PropertyListEditor *editor) -{ - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor removeSelected]; - [pool drain]; -} - -static void text_editing_started (GtkCellRenderer *cell, - GtkCellEditable *editable, - const gchar *path, - PropertyListEditor *editor) -{ - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - if (GTK_IS_EDITABLE (editable) && GTK_IS_WIDGET (editable)) { - g_signal_handlers_disconnect_by_func (G_OBJECT (editable), - G_CALLBACK (text_changed_cb), - editor); - widget_clear_error (GTK_WIDGET (editable)); - g_signal_connect (G_OBJECT (editable), - "changed", - G_CALLBACK (text_changed_cb), - editor); - } - - [pool drain]; -} - -static void text_changed_cb (GtkEditable *editable, PropertyListEditor *pane) -{ - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - NSString *newValue = gtk_editable_get_string (editable, 0, -1); - if (![newValue isValidTikzPropertyNameOrValue]) { - widget_set_error (GTK_WIDGET (editable)); - } else { - widget_clear_error (GTK_WIDGET (editable)); - } - - [pool drain]; -} - -static void selection_changed_cb (GtkTreeSelection *selection, - PropertyListEditor *pane) -{ - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - int selcount = gtk_tree_selection_count_selected_rows (selection); - [pane selectionCountChanged:selcount]; - [pool drain]; -} - -// }}} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/RecentManager.h b/tikzit-1/src/gtk/RecentManager.h deleted file mode 100644 index e2c2793..0000000 --- a/tikzit-1/src/gtk/RecentManager.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" - -@interface RecentManager: NSObject { -} - -+ (RecentManager*) defaultManager; - -- (void)addRecentFile:(NSString*)path; -- (void)removeRecentFile:(NSString*)path; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/RecentManager.m b/tikzit-1/src/gtk/RecentManager.m deleted file mode 100644 index c6074c6..0000000 --- a/tikzit-1/src/gtk/RecentManager.m +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "RecentManager.h" -#import - -static RecentManager *defMan = nil; - -@implementation RecentManager -- (id) init { - self = [super init]; - return self; -} - -+ (RecentManager*) defaultManager { - if (defMan == nil) { - defMan = [[self alloc] init]; - } - return defMan; -} - -- (void)addRecentFile:(NSString*)path { - NSError *error = nil; - gchar *uri = [path glibUriWithError:&error]; - if (error) { - logError (error, @"Could not add recent file"); - return; - } - - GtkRecentData recent_data; - recent_data.display_name = NULL; - recent_data.description = NULL; - recent_data.mime_type = "text/x-tikz"; - recent_data.app_name = (gchar *) g_get_application_name (); - recent_data.app_exec = g_strjoin (" ", g_get_prgname (), "%u", NULL); - recent_data.groups = NULL; - recent_data.is_private = FALSE; - - gtk_recent_manager_add_full (gtk_recent_manager_get_default(), uri, &recent_data); - - g_free (uri); - g_free (recent_data.app_exec); -} - -- (void)removeRecentFile:(NSString*)path { - NSError *error = nil; - gchar *uri = [path glibUriWithError:&error]; - if (error) { - logError (error, @"Could not remove recent file"); - return; - } - - gtk_recent_manager_remove_item (gtk_recent_manager_get_default(), uri, NULL); - - g_free (uri); -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/SelectTool.h b/tikzit-1/src/gtk/SelectTool.h deleted file mode 100644 index 65f511a..0000000 --- a/tikzit-1/src/gtk/SelectTool.h +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "Tool.h" - -@class Edge; -@class Node; - -// FIXME: replace this with delegates -typedef enum { - QuietState, - SelectBoxState, - ToggleSelectState, - MoveSelectedNodesState, - DragEdgeControlPoint1, - DragEdgeControlPoint2 -} SelectToolState; - -typedef enum { - DragSelectsNodes = 1, - DragSelectsEdges = 2, - DragSelectsBoth = DragSelectsNodes | DragSelectsEdges -} DragSelectMode; - -@interface SelectTool : NSObject { - GraphRenderer *renderer; - SelectToolState state; - float edgeFuzz; - DragSelectMode dragSelectMode; - NSPoint dragOrigin; - Node *leaderNode; - NSPoint oldLeaderPos; - Edge *modifyEdge; - NSRect selectionBox; - NSMutableSet *selectionBoxContents; - - GtkWidget *configWidget; - GSList *dragSelectModeButtons; -} - -@property (assign) float edgeFuzz; -@property (assign) DragSelectMode dragSelectMode; - -- (id) init; -+ (id) tool; -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/SelectTool.m b/tikzit-1/src/gtk/SelectTool.m deleted file mode 100644 index b3121ae..0000000 --- a/tikzit-1/src/gtk/SelectTool.m +++ /dev/null @@ -1,590 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "SelectTool.h" - -#import "Configuration.h" -#import "Edge+Render.h" -#import "GraphRenderer.h" -#import "TikzDocument.h" -#import "tzstockitems.h" - -#import - -#define DRAG_SELECT_MODE_KEY "tikzit-drag-select-mode" - -static const InputMask unionSelectMask = ShiftMask; - -static void drag_select_mode_cb (GtkToggleButton *button, SelectTool *tool); - -@interface SelectTool (Private) -- (TikzDocument*) doc; -- (void) shiftNodesByMovingLeader:(Node*)leader to:(NSPoint)to; -- (void) deselectAllNodes; -- (void) deselectAllEdges; -- (void) deselectAll; -- (BOOL) circleWithCenter:(NSPoint)c andRadius:(float)r containsPoint:(NSPoint)p; -- (void) lookForControlPointAt:(NSPoint)pos; -- (void) setSelectionBox:(NSRect)box; -- (void) clearSelectionBox; -- (BOOL) selectionBoxContainsNode:(Node*)node; -@end - -@implementation SelectTool -- (NSString*) name { return @"Select"; } -- (const gchar*) stockId { return TIKZIT_STOCK_SELECT; } -- (NSString*) helpText { return @"Select, move and edit nodes and edges"; } -- (NSString*) shortcut { return @"s"; } -@synthesize configurationWidget=configWidget; -@synthesize edgeFuzz; - -+ (id) tool { - return [[[self alloc] init] autorelease]; -} - -- (id) init { - self = [super init]; - - if (self) { - state = QuietState; - edgeFuzz = 3.0f; - dragSelectMode = DragSelectsNodes; - - configWidget = gtk_vbox_new (FALSE, 0); - g_object_ref_sink (configWidget); - - GtkWidget *label = gtk_label_new ("Drag selects:"); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_box_pack_start (GTK_BOX (configWidget), - label, - FALSE, - FALSE, - 0); - - GtkWidget *nodeOpt = gtk_radio_button_new_with_label (NULL, "nodes (N)"); - g_object_set_data (G_OBJECT (nodeOpt), - DRAG_SELECT_MODE_KEY, - (gpointer)DragSelectsNodes); - gtk_box_pack_start (GTK_BOX (configWidget), - nodeOpt, - FALSE, - FALSE, - 0); - g_signal_connect (G_OBJECT (nodeOpt), - "toggled", - G_CALLBACK (drag_select_mode_cb), - self); - - GtkWidget *edgeOpt = gtk_radio_button_new_with_label ( - gtk_radio_button_get_group (GTK_RADIO_BUTTON (nodeOpt)), - "edges (E)"); - g_object_set_data (G_OBJECT (edgeOpt), - DRAG_SELECT_MODE_KEY, - (gpointer)DragSelectsEdges); - gtk_box_pack_start (GTK_BOX (configWidget), - edgeOpt, - FALSE, - FALSE, - 0); - g_signal_connect (G_OBJECT (edgeOpt), - "toggled", - G_CALLBACK (drag_select_mode_cb), - self); - - GtkWidget *bothOpt = gtk_radio_button_new_with_label ( - gtk_radio_button_get_group (GTK_RADIO_BUTTON (edgeOpt)), - "both (B)"); - g_object_set_data (G_OBJECT (bothOpt), - DRAG_SELECT_MODE_KEY, - (gpointer)DragSelectsBoth); - gtk_box_pack_start (GTK_BOX (configWidget), - bothOpt, - FALSE, - FALSE, - 0); - g_signal_connect (G_OBJECT (bothOpt), - "toggled", - G_CALLBACK (drag_select_mode_cb), - self); - dragSelectModeButtons = gtk_radio_button_get_group (GTK_RADIO_BUTTON (bothOpt)); - - gtk_widget_show_all (configWidget); - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - [renderer release]; - [leaderNode release]; - [modifyEdge release]; - - g_object_unref (G_OBJECT (configWidget)); - - [super dealloc]; -} - -- (DragSelectMode) dragSelectMode { - return dragSelectMode; -} - -- (void) setDragSelectMode:(DragSelectMode)mode { - if (dragSelectMode == mode) - return; - - dragSelectMode = mode; - - GSList *entry = dragSelectModeButtons; - while (entry) { - GtkToggleButton *button = GTK_TOGGLE_BUTTON (entry->data); - DragSelectMode buttonMode = - (DragSelectMode) g_object_get_data ( - G_OBJECT (button), - DRAG_SELECT_MODE_KEY); - if (buttonMode == dragSelectMode) { - gtk_toggle_button_set_active (button, TRUE); - break; - } - - entry = g_slist_next (entry); - } -} - -- (GraphRenderer*) activeRenderer { return renderer; } -- (void) setActiveRenderer:(GraphRenderer*)r { - if (r == renderer) - return; - - [r retain]; - [renderer release]; - renderer = r; - - state = QuietState; -} - -- (void) mousePressAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { - if (button != LeftButton) - return; - - dragOrigin = pos; - - // we should already be in a quiet state, but no harm in making sure - state = QuietState; - - modifyEdge = nil; - [self lookForControlPointAt:pos]; - - if (modifyEdge == nil) { - // we didn't find a control point - - BOOL unionSelect = (mask & unionSelectMask); - - leaderNode = [renderer anyNodeAt:pos]; - // if we hit a node, deselect other nodes (if Shift is up) and go to move mode - if (leaderNode != nil) { - BOOL alreadySelected = [[self doc] isNodeSelected:leaderNode]; - if (!unionSelect && !alreadySelected) { - [self deselectAll]; - } - if (unionSelect && alreadySelected) { - state = ToggleSelectState; - } else { - [[[self doc] pickSupport] selectNode:leaderNode]; - state = MoveSelectedNodesState; - oldLeaderPos = [leaderNode point]; - [[self doc] startShiftNodes:[[[self doc] pickSupport] selectedNodes]]; - } - } - - // if mouse did not hit a node, check if mouse hit an edge - if (leaderNode == nil) { - Edge *edge = [renderer anyEdgeAt:pos withFuzz:edgeFuzz]; - if (edge != nil) { - BOOL alreadySelected = [[self doc] isEdgeSelected:edge]; - if (!unionSelect) { - [self deselectAll]; - } - if (unionSelect && alreadySelected) { - [[[self doc] pickSupport] deselectEdge:edge]; - } else { - [[[self doc] pickSupport] selectEdge:edge]; - } - } else { - // if mouse did not hit anything, put us in box mode - if (!unionSelect) { - [self deselectAll]; - } - [renderer clearHighlightedNodes]; - state = SelectBoxState; - } - } - } -} - -- (void) mouseMoveTo:(NSPoint)pos withButtons:(MouseButton)buttons andMask:(InputMask)mask { - if (!(buttons & LeftButton)) - return; - - Transformer *transformer = [renderer transformer]; - - if (state == ToggleSelectState) { - state = MoveSelectedNodesState; - oldLeaderPos = [leaderNode point]; - [[self doc] startShiftNodes:[[[self doc] pickSupport] selectedNodes]]; - } - - if (state == SelectBoxState) { - [self setSelectionBox:NSRectAroundPoints(dragOrigin, pos)]; - - NSEnumerator *enumerator = [[self doc] nodeEnumerator]; - Node *node; - while ((node = [enumerator nextObject]) != nil) { - NSPoint nodePos = [transformer toScreen:[node point]]; - if (NSPointInRect(nodePos, selectionBox)) { - [renderer setNode:node highlighted:YES]; - } else { - [renderer setNode:node highlighted:NO]; - } - } - } else if (state == MoveSelectedNodesState) { - if (leaderNode != nil) { - [self shiftNodesByMovingLeader:leaderNode to:pos]; - NSPoint shiftSoFar; - shiftSoFar.x = [leaderNode point].x - oldLeaderPos.x; - shiftSoFar.y = [leaderNode point].y - oldLeaderPos.y; - [[self doc] shiftNodesUpdate:shiftSoFar]; - } - } else if (state == DragEdgeControlPoint1 || state == DragEdgeControlPoint2) { - // invalidate once before we start changing it: we may be shrinking - // the control circles - [[self doc] modifyEdgeCheckPoint]; - if (state == DragEdgeControlPoint1) { - [modifyEdge moveCp1To:[transformer fromScreen:pos] - withWeightCourseness:0.1f - andBendCourseness:15 - forceLinkControlPoints:(mask & ControlMask)]; - } else { - [modifyEdge moveCp2To:[transformer fromScreen:pos] - withWeightCourseness:0.1f - andBendCourseness:15 - forceLinkControlPoints:(mask & ControlMask)]; - } - [[self doc] modifyEdgeCheckPoint]; - } -} - -- (void) mouseReleaseAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { - if (button != LeftButton) - return; - - if (state == SelectBoxState) { - PickSupport *ps = [[self doc] pickSupport]; - Transformer *transformer = [renderer transformer]; - - if (!(mask & unionSelectMask)) { - [ps deselectAllNodes]; - [ps deselectAllEdges]; - } - - Graph *graph = [[self doc] graph]; - if (dragSelectMode & DragSelectsNodes) { - for (Node *node in [graph nodes]) { - NSPoint nodePos = [transformer toScreen:[node point]]; - if (NSPointInRect(nodePos, selectionBox)) { - [ps selectNode:node]; - } - } - } - if (dragSelectMode & DragSelectsEdges) { - for (Edge *edge in [graph edges]) { - NSPoint edgePos = [transformer toScreen:[edge mid]]; - if (NSPointInRect(edgePos, selectionBox)) { - [ps selectEdge:edge]; - } - } - } - - [self clearSelectionBox]; - } else if (state == ToggleSelectState) { - [[[self doc] pickSupport] deselectNode:leaderNode]; - leaderNode = nil; - } else if (state == MoveSelectedNodesState) { - if (NSEqualPoints (oldLeaderPos, [leaderNode point])) { - [[self doc] cancelShiftNodes]; - } else { - [[self doc] endShiftNodes]; - } - leaderNode = nil; - } else if (state == DragEdgeControlPoint1 || state == DragEdgeControlPoint2) { - // FIXME: check if there was any real change - [[self doc] endModifyEdge]; - } - - state = QuietState; -} - -- (void) mouseDoubleClickAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { - if (button != LeftButton) - return; - - if (state != QuietState) { - return; - } - // convert bend mode on edge under mouse cursor - Edge *edge = [renderer anyEdgeAt:pos withFuzz:edgeFuzz]; - if (edge != nil) { - [[self doc] startModifyEdge:edge]; - if ([edge bendMode]==EdgeBendModeBasic) { - [edge convertBendToAngles]; - [edge setBendMode:EdgeBendModeInOut]; - } else { - [edge setBendMode:EdgeBendModeBasic]; - } - [[self doc] endModifyEdge]; - - [self deselectAllEdges]; - [[[self doc] pickSupport] selectEdge:edge]; - } -} - -- (void) keyPressed:(unsigned int)keyVal withMask:(InputMask)mask { - if (keyVal == GDK_KEY_N && mask == ShiftMask) { - [self setDragSelectMode:DragSelectsNodes]; - } else if (keyVal == GDK_KEY_E && mask == ShiftMask) { - [self setDragSelectMode:DragSelectsEdges]; - } else if (keyVal == GDK_KEY_B && mask == ShiftMask) { - [self setDragSelectMode:DragSelectsBoth]; - } else if (keyVal == GDK_KEY_D && (!mask || mask == ShiftMask)) { - PickSupport *ps = [[self doc] pickSupport]; - for (Node* node in [ps selectedNodes]) { - NSRect b = [node boundingRect]; - NSLog(@"%@ @ (%f,%f) {style=%@, label=%@, data=%@, bounds=(%f,%f),(%fx%f)}", - [node name], - [node point].x, - [node point].y, - [[node style] name], - [node label], - [[node data] tikzList], - b.origin.x, b.origin.y, b.size.width, b.size.height); - } - for (Edge* edge in [ps selectedEdges]) { - NSRect b = [edge boundingRect]; - NSLog(@"%@:%@->%@:%@ {\n" - @" style=%@, data=%@,\n" - @" bend=%d, weight=%f, inAngle=%d, outAngle=%d, bendMode=%d,\n" - @" head=(%f,%f), headTan=(%f,%f) leftHeadNormal=(%f,%f), rightHeadNormal=(%f,%f),\n" - @" cp1=(%f,%f),\n" - @" mid=(%f,%f), midTan=(%f,%f), leftNormal=(%f,%f), rightNormal=(%f,%f)\n" - @" cp2=(%f,%f),\n" - @" tail=(%f,%f), tailTan=(%f,%f), leftTailNormal=(%f,%f), rightTailNormal=(%f,%f),\n" - @" isSelfLoop=%s, isStraight=%s,\n" - @" bounds=(%f,%f),(%fx%f)\n" - @"}", - [[edge source] name], - [edge sourceAnchor], - [[edge target] name], - [edge targetAnchor], - [[edge style] name], - [[edge data] tikzList], - [edge bend], - [edge weight], - [edge inAngle], - [edge outAngle], - [edge bendMode], - [edge head].x, - [edge head].y, - [edge headTan].x, - [edge headTan].y, - [edge leftHeadNormal].x, - [edge leftHeadNormal].y, - [edge rightHeadNormal].x, - [edge rightHeadNormal].y, - [edge cp1].x, - [edge cp1].y, - [edge mid].x, - [edge mid].y, - [edge midTan].x, - [edge midTan].y, - [edge leftNormal].x, - [edge leftNormal].y, - [edge rightNormal].x, - [edge rightNormal].y, - [edge cp2].x, - [edge cp2].y, - [edge tail].x, - [edge tail].y, - [edge tailTan].x, - [edge tailTan].y, - [edge leftTailNormal].x, - [edge leftTailNormal].y, - [edge rightTailNormal].x, - [edge rightTailNormal].y, - [edge isSelfLoop] ? "yes" : "no", - [edge isStraight] ? "yes" : "no", - b.origin.x, b.origin.y, b.size.width, b.size.height); - } - } -} - -- (void) renderWithContext:(id)context onSurface:(id)surface { - if (!NSIsEmptyRect (selectionBox)) { - [context saveState]; - - [context setAntialiasMode:AntialiasDisabled]; - [context setLineWidth:1.0]; - [context startPath]; - [context rect:selectionBox]; - RColor fColor = MakeRColor (0.8, 0.8, 0.8, 0.2); - RColor sColor = MakeSolidRColor (0.6, 0.6, 0.6); - [context strokePathWithColor:sColor andFillWithColor:fColor]; - - [context restoreState]; - } -} - -- (void) loadConfiguration:(Configuration*)config { - NSString *mode = [config stringEntry:@"Drag select mode" - inGroup:@"SelectTool"]; - if ([mode isEqualToString:@"nodes"]) { - [self setDragSelectMode:DragSelectsNodes]; - } else if ([mode isEqualToString:@"edges"]) { - [self setDragSelectMode:DragSelectsEdges]; - } else if ([mode isEqualToString:@"both"]) { - [self setDragSelectMode:DragSelectsBoth]; - } -} - -- (void) saveConfiguration:(Configuration*)config { - switch (dragSelectMode) { - case DragSelectsNodes: - [config setStringEntry:@"Drag select mode" - inGroup:@"SelectTool" - value:@"nodes"]; - break; - case DragSelectsEdges: - [config setStringEntry:@"Drag select mode" - inGroup:@"SelectTool" - value:@"edges"]; - break; - case DragSelectsBoth: - [config setStringEntry:@"Drag select mode" - inGroup:@"SelectTool" - value:@"both"]; - break; - } -} - -@end - -@implementation SelectTool (Private) -- (TikzDocument*) doc { - return [renderer document]; -} - -- (void) shiftNodesByMovingLeader:(Node*)leader to:(NSPoint)to { - Transformer *transformer = [renderer transformer]; - - NSPoint from = [transformer toScreen:[leader point]]; - to = [[renderer grid] snapScreenPoint:to]; - float dx = to.x - from.x; - float dy = to.y - from.y; - - for (Node *node in [[[self doc] pickSupport] selectedNodes]) { - NSPoint p = [transformer toScreen:[node point]]; - p.x += dx; - p.y += dy; - [node setPoint:[transformer fromScreen:p]]; - } -} - -- (void) deselectAllNodes { - [[[self doc] pickSupport] deselectAllNodes]; -} - -- (void) deselectAllEdges { - [[[self doc] pickSupport] deselectAllEdges]; -} - -- (void) deselectAll { - [[[self doc] pickSupport] deselectAllNodes]; - [[[self doc] pickSupport] deselectAllEdges]; -} - -- (BOOL) circleWithCenter:(NSPoint)c andRadius:(float)r containsPoint:(NSPoint)p { - return (NSDistanceBetweenPoints(c, p) <= r); -} - -- (void) lookForControlPointAt:(NSPoint)pos { - const float cpr = [Edge controlPointRadius]; - for (Edge *e in [[[self doc] pickSupport] selectedEdges]) { - NSPoint cp1 = [[renderer transformer] toScreen:[e cp1]]; - if ([self circleWithCenter:cp1 andRadius:cpr containsPoint:pos]) { - state = DragEdgeControlPoint1; - modifyEdge = e; - [[self doc] startModifyEdge:e]; - return; - } - NSPoint cp2 = [[renderer transformer] toScreen:[e cp2]]; - if ([self circleWithCenter:cp2 andRadius:cpr containsPoint:pos]) { - state = DragEdgeControlPoint2; - modifyEdge = e; - [[self doc] startModifyEdge:e]; - return; - } - } -} - -- (void) setSelectionBox:(NSRect)box { - NSRect invRect = NSUnionRect (selectionBox, box); - selectionBox = box; - [renderer invalidateRect:NSInsetRect (invRect, -2, -2)]; -} - -- (void) clearSelectionBox { - NSRect oldRect = selectionBox; - - selectionBox = NSZeroRect; - - [renderer invalidateRect:NSInsetRect (oldRect, -2, -2)]; - [renderer clearHighlightedNodes]; -} - -- (BOOL) selectionBoxContainsNode:(Node*)node { - if (!NSIsEmptyRect (selectionBox)) - return NO; - - Transformer *transf = [[renderer surface] transformer]; - NSPoint screenPt = [transf toScreen:[node point]]; - return NSPointInRect(screenPt, selectionBox); -} -@end - -static void drag_select_mode_cb (GtkToggleButton *button, SelectTool *tool) { - if (gtk_toggle_button_get_active (button)) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - DragSelectMode buttonMode = - (DragSelectMode) g_object_get_data ( - G_OBJECT (button), - DRAG_SELECT_MODE_KEY); - [tool setDragSelectMode:buttonMode]; - [pool drain]; - } -} - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/SelectionPane.h b/tikzit-1/src/gtk/SelectionPane.h deleted file mode 100644 index 57a766a..0000000 --- a/tikzit-1/src/gtk/SelectionPane.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class Configuration; -@class EdgeStylesModel; -@class NodeStylesModel; -@class StyleManager; -@class TikzDocument; - -@interface SelectionPane: NSObject { - TikzDocument *document; - - NodeStylesModel *nodeStylesModel; - EdgeStylesModel *edgeStylesModel; - - GtkWidget *layout; - - GtkWidget *nodeStyleCombo; - GtkWidget *applyNodeStyleButton; - GtkWidget *clearNodeStyleButton; - GtkWidget *edgeStyleCombo; - GtkWidget *applyEdgeStyleButton; - GtkWidget *clearEdgeStyleButton; -} - -@property (retain) TikzDocument *document; -@property (assign) BOOL visible; -@property (readonly) GtkWidget *gtkWidget; - -- (id) initWithStyleManager:(StyleManager*)mgr; -- (id) initWithNodeStylesModel:(NodeStylesModel*)nsm - andEdgeStylesModel:(EdgeStylesModel*)esm; - -- (void) loadConfiguration:(Configuration*)config; -- (void) saveConfiguration:(Configuration*)config; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/SelectionPane.m b/tikzit-1/src/gtk/SelectionPane.m deleted file mode 100644 index 2931258..0000000 --- a/tikzit-1/src/gtk/SelectionPane.m +++ /dev/null @@ -1,432 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "SelectionPane.h" - -#import "Configuration.h" -#import "EdgeStylesModel.h" -#import "NodeStylesModel.h" -#import "TikzDocument.h" - -#import "gtkhelpers.h" - -// {{{ Internal interfaces - -static void node_style_changed_cb (GtkComboBox *widget, SelectionPane *pane); -static void apply_node_style_button_cb (GtkButton *widget, SelectionPane *pane); -static void clear_node_style_button_cb (GtkButton *widget, SelectionPane *pane); -static void edge_style_changed_cb (GtkComboBox *widget, SelectionPane *pane); -static void apply_edge_style_button_cb (GtkButton *widget, SelectionPane *pane); -static void clear_edge_style_button_cb (GtkButton *widget, SelectionPane *pane); - -static void setup_style_cell_layout (GtkCellLayout *cell_layout, gint pixbuf_col, gint name_col); - -@interface SelectionPane (Notifications) -- (void) nodeSelectionChanged:(NSNotification*)n; -- (void) edgeSelectionChanged:(NSNotification*)n; -@end - -@interface SelectionPane (Private) -- (void) _updateNodeStyleButtons; -- (void) _updateEdgeStyleButtons; -- (NodeStyle*) _selectedNodeStyle; -- (EdgeStyle*) _selectedEdgeStyle; -- (void) _applyNodeStyle; -- (void) _clearNodeStyle; -- (void) _applyEdgeStyle; -- (void) _clearEdgeStyle; -@end - -// }}} -// {{{ API - -@implementation SelectionPane - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithStyleManager:(StyleManager*)sm { - return [self initWithNodeStylesModel:[NodeStylesModel modelWithStyleManager:sm] - andEdgeStylesModel:[EdgeStylesModel modelWithStyleManager:sm]]; -} - -- (id) initWithNodeStylesModel:(NodeStylesModel*)nsm - andEdgeStylesModel:(EdgeStylesModel*)esm { - self = [super init]; - - if (self) { - nodeStylesModel = [nsm retain]; - edgeStylesModel = [esm retain]; - - layout = gtk_vbox_new (FALSE, 0); - g_object_ref_sink (layout); - gtk_widget_show (layout); - - GtkWidget *label = gtk_label_new ("Selection"); - label_set_bold (GTK_LABEL (label)); - gtk_widget_show (label); - gtk_box_pack_start (GTK_BOX (layout), label, - FALSE, FALSE, 0); - - GtkWidget *lvl1_box = gtk_vbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (layout), lvl1_box, - FALSE, FALSE, 3); - - nodeStyleCombo = gtk_combo_box_new_with_model ([nodeStylesModel model]); - g_object_ref_sink (nodeStyleCombo); - setup_style_cell_layout (GTK_CELL_LAYOUT (nodeStyleCombo), - NODE_STYLES_ICON_COL, - NODE_STYLES_NAME_COL); - g_signal_connect (G_OBJECT (nodeStyleCombo), - "changed", - G_CALLBACK (node_style_changed_cb), - self); - gtk_box_pack_start (GTK_BOX (lvl1_box), nodeStyleCombo, - FALSE, FALSE, 0); - - GtkWidget *lvl2_box = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (lvl1_box), lvl2_box, - FALSE, FALSE, 0); - - applyNodeStyleButton = gtk_button_new_with_label ("Apply"); - g_object_ref_sink (applyNodeStyleButton); - gtk_widget_set_tooltip_text (applyNodeStyleButton, "Apply style to selected nodes"); - gtk_widget_set_sensitive (applyNodeStyleButton, FALSE); - g_signal_connect (G_OBJECT (applyNodeStyleButton), - "clicked", - G_CALLBACK (apply_node_style_button_cb), - self); - gtk_box_pack_start (GTK_BOX (lvl2_box), applyNodeStyleButton, - FALSE, FALSE, 0); - - clearNodeStyleButton = gtk_button_new_with_label ("Clear"); - g_object_ref_sink (clearNodeStyleButton); - gtk_widget_set_tooltip_text (clearNodeStyleButton, "Clear style from selected nodes"); - gtk_widget_set_sensitive (clearNodeStyleButton, FALSE); - g_signal_connect (G_OBJECT (clearNodeStyleButton), - "clicked", - G_CALLBACK (clear_node_style_button_cb), - self); - gtk_box_pack_start (GTK_BOX (lvl2_box), clearNodeStyleButton, - FALSE, FALSE, 0); - - lvl1_box = gtk_vbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (layout), lvl1_box, - FALSE, FALSE, 3); - - edgeStyleCombo = gtk_combo_box_new_with_model ([edgeStylesModel model]); - g_object_ref_sink (edgeStyleCombo); - setup_style_cell_layout (GTK_CELL_LAYOUT (edgeStyleCombo), - EDGE_STYLES_ICON_COL, - EDGE_STYLES_NAME_COL); - g_signal_connect (G_OBJECT (edgeStyleCombo), - "changed", - G_CALLBACK (edge_style_changed_cb), - self); - gtk_box_pack_start (GTK_BOX (lvl1_box), edgeStyleCombo, - FALSE, FALSE, 0); - - lvl2_box = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (lvl1_box), lvl2_box, - FALSE, FALSE, 0); - - applyEdgeStyleButton = gtk_button_new_with_label ("Apply"); - g_object_ref_sink (applyEdgeStyleButton); - gtk_widget_set_tooltip_text (applyEdgeStyleButton, "Apply style to selected edges"); - gtk_widget_set_sensitive (applyEdgeStyleButton, FALSE); - g_signal_connect (G_OBJECT (applyEdgeStyleButton), - "clicked", - G_CALLBACK (apply_edge_style_button_cb), - self); - gtk_box_pack_start (GTK_BOX (lvl2_box), applyEdgeStyleButton, - FALSE, FALSE, 0); - - clearEdgeStyleButton = gtk_button_new_with_label ("Clear"); - g_object_ref_sink (clearEdgeStyleButton); - gtk_widget_set_tooltip_text (clearEdgeStyleButton, "Clear style from selected edges"); - gtk_widget_set_sensitive (clearEdgeStyleButton, FALSE); - g_signal_connect (G_OBJECT (clearEdgeStyleButton), - "clicked", - G_CALLBACK (clear_edge_style_button_cb), - self); - gtk_box_pack_start (GTK_BOX (lvl2_box), clearEdgeStyleButton, - FALSE, FALSE, 0); - - gtk_widget_show_all (layout); - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - g_object_unref (nodeStyleCombo); - g_object_unref (applyNodeStyleButton); - g_object_unref (clearNodeStyleButton); - g_object_unref (edgeStyleCombo); - g_object_unref (applyEdgeStyleButton); - g_object_unref (clearEdgeStyleButton); - - g_object_unref (layout); - - [nodeStylesModel release]; - [edgeStylesModel release]; - - [document release]; - - [super dealloc]; -} - -- (TikzDocument*) document { - return document; -} - -- (void) setDocument:(TikzDocument*)doc { - if (document != nil) { - [[NSNotificationCenter defaultCenter] - removeObserver:self - name:nil - object:[document pickSupport]]; - } - - [doc retain]; - [document release]; - document = doc; - - if (doc != nil) { - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(nodeSelectionChanged:) - name:@"NodeSelectionChanged" object:[doc pickSupport]]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(edgeSelectionChanged:) - name:@"EdgeSelectionChanged" object:[doc pickSupport]]; - } - - [self _updateNodeStyleButtons]; - [self _updateEdgeStyleButtons]; -} - -- (BOOL) visible { - return gtk_widget_get_visible (layout); -} - -- (void) setVisible:(BOOL)visible { - gtk_widget_set_visible (layout, visible); -} - -- (GtkWidget*) gtkWidget { - return layout; -} - -- (void) loadConfiguration:(Configuration*)config { - NSString *nodeStyleName = [config stringEntry:@"SelectedNodeStyle" - inGroup:@"SelectionPane" - withDefault:nil]; - NodeStyle *nodeStyle = [[nodeStylesModel styleManager] nodeStyleForName:nodeStyleName]; - if (nodeStyle == nil) { - gtk_combo_box_set_active (GTK_COMBO_BOX (nodeStyleCombo), -1); - } else { - GtkTreeIter *iter = [nodeStylesModel iterFromStyle:nodeStyle]; - if (iter) { - gtk_combo_box_set_active_iter (GTK_COMBO_BOX (nodeStyleCombo), iter); - gtk_tree_iter_free (iter); - } - } - - NSString *edgeStyleName = [config stringEntry:@"SelectedEdgeStyle" - inGroup:@"SelectionPane" - withDefault:nil]; - EdgeStyle *edgeStyle = [[edgeStylesModel styleManager] edgeStyleForName:edgeStyleName]; - if (edgeStyle == nil) { - gtk_combo_box_set_active (GTK_COMBO_BOX (edgeStyleCombo), -1); - } else { - GtkTreeIter *iter = [edgeStylesModel iterFromStyle:edgeStyle]; - if (iter) { - gtk_combo_box_set_active_iter (GTK_COMBO_BOX (edgeStyleCombo), iter); - gtk_tree_iter_free (iter); - } - } -} - -- (void) saveConfiguration:(Configuration*)config { - [config setStringEntry:@"SelectedNodeStyle" - inGroup:@"SelectionPane" - value:[[self _selectedNodeStyle] name]]; - [config setStringEntry:@"SelectedEdgeStyle" - inGroup:@"SelectionPane" - value:[[self _selectedEdgeStyle] name]]; -} - -@end - -// }}} -// {{{ Notifications - -@implementation SelectionPane (Notifications) -- (void) nodeSelectionChanged:(NSNotification*)n { - [self _updateNodeStyleButtons]; -} - -- (void) edgeSelectionChanged:(NSNotification*)n { - [self _updateEdgeStyleButtons]; -} -@end - -// }}} -// {{{ Private - -@implementation SelectionPane (Private) -- (void) _updateNodeStyleButtons { - gboolean hasNodeSelection = [[[document pickSupport] selectedNodes] count] > 0; - - gtk_widget_set_sensitive (applyNodeStyleButton, - hasNodeSelection && [self _selectedNodeStyle] != nil); - gtk_widget_set_sensitive (clearNodeStyleButton, hasNodeSelection); -} - -- (void) _updateEdgeStyleButtons { - gboolean hasEdgeSelection = [[[document pickSupport] selectedEdges] count] > 0; - - gtk_widget_set_sensitive (applyEdgeStyleButton, - hasEdgeSelection && [self _selectedEdgeStyle] != nil); - gtk_widget_set_sensitive (clearEdgeStyleButton, hasEdgeSelection); -} - -- (NodeStyle*) _selectedNodeStyle { - GtkTreeIter iter; - if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (nodeStyleCombo), &iter)) { - return [nodeStylesModel styleFromIter:&iter]; - } else { - return nil; - } -} - -- (EdgeStyle*) _selectedEdgeStyle { - GtkTreeIter iter; - if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (edgeStyleCombo), &iter)) { - return [edgeStylesModel styleFromIter:&iter]; - } else { - return nil; - } -} - -- (void) _applyNodeStyle { - [document startModifyNodes:[[document pickSupport] selectedNodes]]; - - NodeStyle *style = [self _selectedNodeStyle]; - for (Node *node in [[document pickSupport] selectedNodes]) { - [node setStyle:style]; - } - - [document endModifyNodes]; -} - -- (void) _clearNodeStyle { - [document startModifyNodes:[[document pickSupport] selectedNodes]]; - - for (Node *node in [[document pickSupport] selectedNodes]) { - [node setStyle:nil]; - } - - [document endModifyNodes]; -} - -- (void) _applyEdgeStyle { - [document startModifyEdges:[[document pickSupport] selectedEdges]]; - - EdgeStyle *style = [self _selectedEdgeStyle]; - for (Edge *edge in [[document pickSupport] selectedEdges]) { - [edge setStyle:style]; - } - - [document endModifyEdges]; -} - -- (void) _clearEdgeStyle { - [document startModifyEdges:[[document pickSupport] selectedEdges]]; - - for (Edge *edge in [[document pickSupport] selectedEdges]) { - [edge setStyle:nil]; - } - - [document endModifyEdges]; -} -@end - -// }}} -// {{{ GTK+ callbacks - -static void node_style_changed_cb (GtkComboBox *widget, SelectionPane *pane) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [pane _updateNodeStyleButtons]; - [pool drain]; -} - -static void apply_node_style_button_cb (GtkButton *widget, SelectionPane *pane) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [pane _applyNodeStyle]; - [pool drain]; -} - -static void clear_node_style_button_cb (GtkButton *widget, SelectionPane *pane) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [pane _clearNodeStyle]; - [pool drain]; -} - -static void edge_style_changed_cb (GtkComboBox *widget, SelectionPane *pane) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [pane _updateEdgeStyleButtons]; - [pool drain]; -} - -static void apply_edge_style_button_cb (GtkButton *widget, SelectionPane *pane) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [pane _applyEdgeStyle]; - [pool drain]; -} - -static void clear_edge_style_button_cb (GtkButton *widget, SelectionPane *pane) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [pane _clearEdgeStyle]; - [pool drain]; -} - -// }}} -// -static void setup_style_cell_layout (GtkCellLayout *cell_layout, gint pixbuf_col, gint name_col) { - gtk_cell_layout_clear (cell_layout); - GtkCellRenderer *pixbuf_renderer = gtk_cell_renderer_pixbuf_new (); - gtk_cell_layout_pack_start (cell_layout, pixbuf_renderer, FALSE); - gtk_cell_layout_set_attributes ( - cell_layout, - pixbuf_renderer, - "pixbuf", pixbuf_col, - NULL); - GtkCellRenderer *text_renderer = gtk_cell_renderer_text_new (); - gtk_cell_layout_pack_start (cell_layout, text_renderer, FALSE); - gtk_cell_layout_set_attributes ( - cell_layout, - text_renderer, - "text", name_col, - NULL); -} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/SettingsDialog.h b/tikzit-1/src/gtk/SettingsDialog.h deleted file mode 100644 index 0f687b3..0000000 --- a/tikzit-1/src/gtk/SettingsDialog.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class Configuration; -@class EdgeStylesPalette; -@class NodeStylesPalette; -@class StyleManager; - -@interface SettingsDialog: NSObject { - Configuration *configuration; - StyleManager *styleManager; - StyleManager *tempStyleManager; - NodeStylesPalette *nodePalette; - EdgeStylesPalette *edgePalette; - - GtkWindow *parentWindow; - GtkWindow *window; - - // we don't keep any refs, as we control - // the top window - GtkEntry *pdflatexPathEntry; -} - -@property (retain) Configuration *configuration; -@property (retain) StyleManager *styleManager; -@property (assign) GtkWindow *parentWindow; -@property (assign,getter=isVisible) BOOL visible; - -- (id) initWithConfiguration:(Configuration*)c andStyleManager:(StyleManager*)m; - -- (void) present; -- (void) show; -- (void) hide; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/SettingsDialog.m b/tikzit-1/src/gtk/SettingsDialog.m deleted file mode 100644 index bdb5db6..0000000 --- a/tikzit-1/src/gtk/SettingsDialog.m +++ /dev/null @@ -1,328 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "SettingsDialog.h" - -#import "Application.h" -#import "Configuration.h" -#import "EdgeStylesPalette.h" -#import "NodeStylesPalette.h" -#import "StyleManager.h" - -// {{{ Internal interfaces -// {{{ Signals -static gboolean window_delete_event_cb (GtkWidget *widget, - GdkEvent *event, - SettingsDialog *dialog); -static void ok_button_clicked_cb (GtkButton *widget, SettingsDialog *dialog); -static void cancel_button_clicked_cb (GtkButton *widget, SettingsDialog *dialog); -// }}} - -@interface SettingsDialog (Private) -- (void) loadUi; -- (void) save; -- (void) revert; -@end - -// }}} -// {{{ API - -@implementation SettingsDialog - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithConfiguration:(Configuration*)c andStyleManager:(StyleManager*)m { - self = [super init]; - - if (self) { - configuration = [c retain]; - styleManager = [m retain]; - tempStyleManager = [m copy]; - } - - return self; -} - -- (void) dealloc { - if (window) { - gtk_widget_destroy (GTK_WIDGET (window)); - } - if (parentWindow) { - g_object_unref (parentWindow); - } - - [configuration release]; - [tempStyleManager release]; - [styleManager release]; - [nodePalette release]; - [edgePalette release]; - - [super dealloc]; -} - -- (Configuration*) configuration { - return configuration; -} - -- (void) setConfiguration:(Configuration*)c { - [c retain]; - [configuration release]; - configuration = c; - [self revert]; -} - -- (StyleManager*) styleManager { - return styleManager; -} - -- (void) setStyleManager:(StyleManager*)m { - [m retain]; - [styleManager release]; - styleManager = m; -} - -- (GtkWindow*) parentWindow { - return parentWindow; -} - -- (void) setParentWindow:(GtkWindow*)parent { - GtkWindow *oldParent = parentWindow; - - if (parent) - g_object_ref (parent); - parentWindow = parent; - if (oldParent) - g_object_unref (oldParent); - - if (window) { - gtk_window_set_transient_for (window, parentWindow); - } -} - -- (void) present { - [self loadUi]; - [self revert]; - gtk_window_present (GTK_WINDOW (window)); -} - -- (void) show { - [self loadUi]; - [self revert]; - gtk_widget_show (GTK_WIDGET (window)); -} - -- (void) hide { - if (!window) { - return; - } - gtk_widget_hide (GTK_WIDGET (window)); -} - -- (BOOL) isVisible { - if (!window) { - return NO; - } - gboolean visible; - g_object_get (G_OBJECT (window), "visible", &visible, NULL); - return visible ? YES : NO; -} - -- (void) setVisible:(BOOL)visible { - if (visible) { - [self show]; - } else { - [self hide]; - } -} - -@end - -// }}} -// {{{ Private - -@implementation SettingsDialog (Private) -- (void) loadUi { - if (window) { - return; - } - - nodePalette = [[NodeStylesPalette alloc] initWithManager:tempStyleManager]; - edgePalette = [[EdgeStylesPalette alloc] initWithManager:tempStyleManager]; - - window = GTK_WINDOW (gtk_window_new (GTK_WINDOW_TOPLEVEL)); - gtk_window_set_default_size (window, 570, -1); - gtk_window_set_title (window, "TikZiT Configuration"); - gtk_window_set_modal (window, TRUE); - gtk_window_set_position (window, GTK_WIN_POS_CENTER_ON_PARENT); - gtk_window_set_type_hint (window, GDK_WINDOW_TYPE_HINT_DIALOG); - if (parentWindow) { - gtk_window_set_transient_for (window, parentWindow); - } - g_signal_connect (window, - "delete-event", - G_CALLBACK (window_delete_event_cb), - self); - - GtkWidget *mainBox = gtk_vbox_new (FALSE, 18); - gtk_container_set_border_width (GTK_CONTAINER (mainBox), 12); - gtk_container_add (GTK_CONTAINER (window), mainBox); - gtk_widget_show (mainBox); - -#ifdef HAVE_POPPLER - /* - * Path for pdflatex - */ - - GtkWidget *pdflatexFrame = gtk_frame_new ("Previews"); - gtk_box_pack_start (GTK_BOX (mainBox), pdflatexFrame, TRUE, TRUE, 0); - - GtkBox *pdflatexBox = GTK_BOX (gtk_hbox_new (FALSE, 6)); - gtk_container_add (GTK_CONTAINER (pdflatexFrame), GTK_WIDGET (pdflatexBox)); - gtk_container_set_border_width (GTK_CONTAINER (pdflatexBox), 6); - - GtkWidget *pdflatexLabel = gtk_label_new ("Path to pdflatex:"); - gtk_misc_set_alignment (GTK_MISC (pdflatexLabel), 0, 0.5); - gtk_box_pack_start (pdflatexBox, - pdflatexLabel, - FALSE, TRUE, 0); - - pdflatexPathEntry = GTK_ENTRY (gtk_entry_new ()); - gtk_box_pack_start (pdflatexBox, - GTK_WIDGET (pdflatexPathEntry), - TRUE, TRUE, 0); - - gtk_widget_show_all (pdflatexFrame); -#else - pdflatexPathEntry = NULL; -#endif - - /* - * Node styles - */ - GtkWidget *nodeStylesFrame = gtk_frame_new ("Node Styles"); - gtk_widget_show (nodeStylesFrame); - gtk_box_pack_start (GTK_BOX (mainBox), nodeStylesFrame, TRUE, TRUE, 0); - gtk_container_add (GTK_CONTAINER (nodeStylesFrame), - GTK_WIDGET ([nodePalette widget])); - gtk_widget_show ([nodePalette widget]); - - - /* - * Edge styles - */ - GtkWidget *edgeStylesFrame = gtk_frame_new ("Edge Styles"); - gtk_widget_show (edgeStylesFrame); - gtk_box_pack_start (GTK_BOX (mainBox), edgeStylesFrame, TRUE, TRUE, 0); - gtk_container_add (GTK_CONTAINER (edgeStylesFrame), - GTK_WIDGET ([edgePalette widget])); - gtk_widget_show ([edgePalette widget]); - - - /* - * Bottom buttons - */ - - GtkContainer *buttonBox = GTK_CONTAINER (gtk_hbutton_box_new ()); - gtk_box_set_spacing (GTK_BOX (buttonBox), 6); - gtk_button_box_set_layout (GTK_BUTTON_BOX (buttonBox), GTK_BUTTONBOX_END); - gtk_box_pack_start (GTK_BOX (mainBox), - GTK_WIDGET (buttonBox), - FALSE, TRUE, 0); - - GtkWidget *okButton = gtk_button_new_from_stock (GTK_STOCK_OK); - gtk_container_add (buttonBox, okButton); - g_signal_connect (okButton, - "clicked", - G_CALLBACK (ok_button_clicked_cb), - self); - - GtkWidget *cancelButton = gtk_button_new_from_stock (GTK_STOCK_CANCEL); - gtk_container_add (buttonBox, cancelButton); - g_signal_connect (cancelButton, - "clicked", - G_CALLBACK (cancel_button_clicked_cb), - self); - - gtk_widget_show_all (GTK_WIDGET (buttonBox)); - - [self revert]; -} - -- (void) save { - if (!window) - return; - -#ifdef HAVE_POPPLER - const gchar *path = gtk_entry_get_text (pdflatexPathEntry); - if (path && *path) { - [configuration setStringEntry:@"pdflatex" - inGroup:@"Previews" - value:[NSString stringWithUTF8String:path]]; - } -#endif - - [styleManager updateFromManager:tempStyleManager]; - - [app saveConfiguration]; -} - -- (void) revert { - if (!window) - return; - -#ifdef HAVE_POPPLER - NSString *path = [configuration stringEntry:@"pdflatex" - inGroup:@"Previews" - withDefault:@"pdflatex"]; - gtk_entry_set_text (pdflatexPathEntry, [path UTF8String]); -#endif - - [tempStyleManager updateFromManager:styleManager]; -} -@end - -// }}} -// {{{ GTK+ callbacks - -static gboolean window_delete_event_cb (GtkWidget *widget, - GdkEvent *event, - SettingsDialog *dialog) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [dialog hide]; - [pool drain]; - return TRUE; // we dealt with this event -} - -static void ok_button_clicked_cb (GtkButton *widget, SettingsDialog *dialog) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [dialog save]; - [dialog hide]; - [pool drain]; -} - -static void cancel_button_clicked_cb (GtkButton *widget, SettingsDialog *dialog) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [dialog hide]; - [pool drain]; -} - -// }}} - -// vim:ft=objc:ts=4:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/Shape+Render.h b/tikzit-1/src/gtk/Shape+Render.h deleted file mode 100644 index a744c77..0000000 --- a/tikzit-1/src/gtk/Shape+Render.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "Shape.h" -#import "RenderContext.h" -#import "Surface.h" - -@interface Shape (Render) - -- (void) drawPathWithTransform:(Transformer*)transform andContext:(id)context; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/Shape+Render.m b/tikzit-1/src/gtk/Shape+Render.m deleted file mode 100644 index 924bb24..0000000 --- a/tikzit-1/src/gtk/Shape+Render.m +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "Shape+Render.h" - -#import "Edge.h" - -// we use cairo for finding the bounding box etc. -#import - -@implementation Shape (Render) - -- (void) drawPathWithTransform:(Transformer*)transform andContext:(id)context { - [context startPath]; - - for (NSArray *arr in [self paths]) { - BOOL fst = YES; - NSPoint p, cp1, cp2; - - for (Edge *e in arr) { - if (fst) { - fst = NO; - p = [transform toScreen:[[e source] point]]; - [context moveTo:p]; - } - - p = [transform toScreen:[[e target] point]]; - if ([e isStraight]) { - [context lineTo:p]; - } else { - cp1 = [transform toScreen:[e cp1]]; - cp2 = [transform toScreen:[e cp2]]; - [context curveTo:p withCp1:cp1 andCp2:cp2]; - } - } - - [context closeSubPath]; - } -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/StyleManager+Storage.h b/tikzit-1/src/gtk/StyleManager+Storage.h deleted file mode 100644 index 1727786..0000000 --- a/tikzit-1/src/gtk/StyleManager+Storage.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "StyleManager.h" - -@interface StyleManager (Storage) -- (void) loadStylesUsingConfigurationName:(NSString*)name; -- (void) saveStylesUsingConfigurationName:(NSString*)name; -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/StyleManager+Storage.m b/tikzit-1/src/gtk/StyleManager+Storage.m deleted file mode 100644 index f4c8232..0000000 --- a/tikzit-1/src/gtk/StyleManager+Storage.m +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "StyleManager+Storage.h" -#import "Configuration.h" -#import "NodeStyle+Storage.h" -#import "EdgeStyle+Storage.h" - -static NSString *nodeStyleGroupPrefix = @"Style "; -static NSString *edgeStyleGroupPrefix = @"EdgeStyle "; - -@implementation StyleManager (Storage) - -- (void) loadStylesUsingConfigurationName:(NSString*)name { - if (![Configuration configurationExistsWithName:name]) { - NSLog(@"No styles config found"); - return; - } - NSError *error = nil; - Configuration *stylesConfig = [Configuration configurationWithName:name loadError:&error]; - if (error != nil) { - logError (error, @"Could not load styles configuration"); - // stick with the default config - return; - } - NSArray *groups = [stylesConfig groups]; - NSMutableArray *ns = [NSMutableArray arrayWithCapacity:[groups count]]; - NSMutableArray *es = [NSMutableArray arrayWithCapacity:[groups count]]; - - for (NSString *groupName in groups) { - if ([groupName hasPrefix:nodeStyleGroupPrefix]) { - NodeStyle *style = [[NodeStyle alloc] initFromConfigurationGroup:groupName config:stylesConfig]; - [ns addObject:style]; - } else if ([groupName hasPrefix:edgeStyleGroupPrefix]) { - EdgeStyle *style = [[EdgeStyle alloc] initFromConfigurationGroup:groupName config:stylesConfig]; - [es addObject:style]; - } - } - - [self _setNodeStyles:ns]; - [self _setEdgeStyles:es]; -} - -- (void) saveStylesUsingConfigurationName:(NSString*)name { - NSError *error = nil; - Configuration *stylesConfig = [Configuration emptyConfigurationWithName:name]; - NSArray *ns = [self nodeStyles]; - NSArray *es = [self edgeStyles]; - NSUInteger length = [ns count]; - for (int i = 0; i < length; ++i) { - NodeStyle *style = [ns objectAtIndex:i]; - NSString *groupName = [NSString stringWithFormat:@"%@%d", nodeStyleGroupPrefix, i]; - [style storeToConfigurationGroup:groupName config:stylesConfig]; - } - length = [es count]; - for (int i = 0; i < length; ++i) { - EdgeStyle *style = [es objectAtIndex:i]; - NSString *groupName = [NSString stringWithFormat:@"%@%d", edgeStyleGroupPrefix, i]; - [style storeToConfigurationGroup:groupName config:stylesConfig]; - } - if (![stylesConfig writeToStoreWithError:&error]) { - logError (error, @"Could not write styles configuration"); - } -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/Surface.h b/tikzit-1/src/gtk/Surface.h deleted file mode 100644 index db4288e..0000000 --- a/tikzit-1/src/gtk/Surface.h +++ /dev/null @@ -1,107 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "RenderContext.h" -#import "Transformer.h" - -typedef enum { - NormalCursor, - ResizeRightCursor, - ResizeBottomRightCursor, - ResizeBottomCursor, - ResizeBottomLeftCursor, - ResizeLeftCursor, - ResizeTopLeftCursor, - ResizeTopCursor, - ResizeTopRightCursor -} Cursor; - -@protocol Surface; - -@protocol RenderDelegate -- (void) renderWithContext:(id)context onSurface:(id)surface; -@end - -/** - * Represents a surface that can be rendered to - * - * This protocol should be implemented by drawing surfaces. It - * provides geometry information and methods to invalidate - * regions of the surface, triggering a redraw. - * - * The surface should send a "SurfaceSizeChanged" notification - * when the width or height changes. - */ -@protocol Surface - -/** - * The width of the surface, in surface units - * - * The surface should send a "SurfaceSizeChanged" notification - * when this property changes. - */ -@property (readonly) int width; -/** - * The height of the surface, in surface units - * - * The surface should send a "SurfaceSizeChanged" notification - * when this property changes. - */ -@property (readonly) int height; -/** - * The transformer that converts between graph units and surface units - */ -@property (readonly) Transformer *transformer; -/** - * The render delegate. - * - * This will be used to redraw (parts of) the surface when necessary. - */ -@property (assign) id renderDelegate; - -/** - * Create a render context for the surface. - */ -- (id) createRenderContext; -/** - * Invalidate a portion of the surface. - * - * This will request that part of the surface be redrawn. - */ -- (void) invalidateRect:(NSRect)rect; -/** - * Invalidate the whole surface. - * - * This will request that the whole surface be redrawn. - */ -- (void) invalidate; - -- (void) zoomIn; -- (void) zoomOut; -- (void) zoomReset; -- (void) zoomInAboutPoint:(NSPoint)p; -- (void) zoomOutAboutPoint:(NSPoint)p; -- (void) zoomResetAboutPoint:(NSPoint)p; - -- (void) setCursor:(Cursor)c; - -- (BOOL) hasFocus; -- (void) renderFocus; -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/TZFoundation.h b/tikzit-1/src/gtk/TZFoundation.h deleted file mode 100644 index 2ff20ca..0000000 --- a/tikzit-1/src/gtk/TZFoundation.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import -#import - -#import "NSError+Glib.h" -#import "NSError+Tikzit.h" -#import "NSFileManager+Glib.h" -#import "NSFileManager+Utils.h" -#import "NSString+Glib.h" -#import "NSString+LatexConstants.h" -#import "NSString+Tikz.h" -#import "NSString+Util.h" - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/TikzDocument.h b/tikzit-1/src/gtk/TikzDocument.h deleted file mode 100644 index 5d15d13..0000000 --- a/tikzit-1/src/gtk/TikzDocument.h +++ /dev/null @@ -1,149 +0,0 @@ -// -// TikzDocument.h -// TikZiT -// -// Copyright 2010 Chris Heunen -// Copyright 2010 Alex Merry -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "TZFoundation.h" -#import -#import "PickSupport.h" -#import "StyleManager.h" - -@interface TikzDocument : NSObject { - StyleManager *styleManager; - Graph *graph; - PickSupport *pickSupport; - NSUndoManager *undoManager; - NSString *tikz; - NSString *path; - NSSet *nodesetBeingModified; - NSMapTable *nodesetBeingModifiedOldCopy; - NSSet *edgesetBeingModified; - NSMapTable *edgesetBeingModifiedOldCopy; - NSPoint currentNodeShift; - Node *nodeBeingModified; - Node *nodeBeingModifiedOldCopy; - Edge *edgeBeingModified; - Edge *edgeBeingModifiedOldCopy; - NSRect oldGraphBounds; - GraphElementData *oldGraphData; - BOOL hasChanges; -} - -+ (TikzDocument*) documentWithStyleManager:(StyleManager*)manager; -+ (TikzDocument*) documentWithGraph:(Graph*)g styleManager:(StyleManager*)manager; -+ (TikzDocument*) documentWithTikz:(NSString*)t styleManager:(StyleManager*)manager error:(NSError**)error; -+ (TikzDocument*) documentFromFile:(NSString*)path styleManager:(StyleManager*)manager error:(NSError**)error; - -- (id) initWithStyleManager:(StyleManager*)manager; -- (id) initWithGraph:(Graph*)g styleManager:(StyleManager*)manager; -- (id) initWithTikz:(NSString*)t styleManager:(StyleManager*)manager error:(NSError**)error; -- (id) initFromFile:(NSString*)path styleManager:(StyleManager*)manager error:(NSError**)error; - -@property (readonly) Graph *graph; -@property (readonly) PickSupport *pickSupport; -@property (readonly) NSString *path; -@property (readonly) NSString *name; -@property (readonly) NSString *suggestedFileName; -@property (readonly) BOOL hasUnsavedChanges; -@property (retain) StyleManager *styleManager; -@property (readonly) NSString *tikz; -@property (readonly) BOOL canUndo; -@property (readonly) BOOL canRedo; -@property (readonly) NSString *undoName; -@property (readonly) NSString *redoName; - -- (BOOL) updateTikz:(NSString*)t error:(NSError**)error; - -- (Graph*) selectionCut; -- (Graph*) selectionCopy; -- (void) paste:(Graph*)graph; -- (void) pasteFromTikz:(NSString*)tikz; - -// some convenience methods: -- (BOOL) isNodeSelected:(Node*)node; -- (BOOL) isEdgeSelected:(Edge*)edge; -- (NSEnumerator*) nodeEnumerator; -- (NSEnumerator*) edgeEnumerator; - -- (void) undo; -- (void) redo; - -- (void) startUndoGroup; -- (void) nameAndEndUndoGroup:(NSString*)nm; -- (void) endUndoGroup; - -- (void) startModifyNode:(Node*)node; -- (void) modifyNodeCheckPoint; -- (void) endModifyNode; -- (void) cancelModifyNode; - -- (void) startModifyNodes:(NSSet*)nodes; -- (void) modifyNodesCheckPoint; -- (void) endModifyNodes; -- (void) cancelModifyNodes; - -- (void) startShiftNodes:(NSSet*)nodes; -- (void) shiftNodesUpdate:(NSPoint)shiftChange; -- (void) endShiftNodes; -- (void) cancelShiftNodes; - -- (void) startModifyEdge:(Edge*)edge; -- (void) modifyEdgeCheckPoint; -- (void) endModifyEdge; -- (void) cancelModifyEdge; - -- (void) startModifyEdges:(NSSet*)edges; -- (void) modifyEdgesCheckPoint; -- (void) endModifyEdges; -- (void) cancelModifyEdges; - -- (void) startChangeBoundingBox; -- (void) changeBoundingBoxCheckPoint; -- (void) endChangeBoundingBox; -- (void) cancelChangeBoundingBox; - -- (void) startChangeGraphProperties; -- (void) changeGraphPropertiesCheckPoint; -- (void) endChangeGraphProperties; -- (void) cancelChangeGraphProperties; - -- (void) removeSelected; -- (void) addNode:(Node*)node; -- (void) removeNode:(Node*)node; -- (void) addEdge:(Edge*)edge; -- (void) removeEdge:(Edge*)edge; -- (void) shiftSelectedNodesByPoint:(NSPoint)offset; -- (void) insertGraph:(Graph*)g; -- (void) flipSelectedNodesHorizontally; -- (void) flipSelectedNodesVertically; -- (void) reverseSelectedEdges; -- (void) bringSelectionForward; -- (void) bringSelectionToFront; -- (void) sendSelectionBackward; -- (void) sendSelectionToBack; - -- (BOOL) saveCopyToPath: (NSString*)path error: (NSError**)error; -- (BOOL) saveToPath: (NSString*)path error: (NSError**)error; -- (BOOL) save: (NSError**)error; - -@end - -// vim:ft=objc:sts=4:sw=4:et diff --git a/tikzit-1/src/gtk/TikzDocument.m b/tikzit-1/src/gtk/TikzDocument.m deleted file mode 100644 index bff5a2e..0000000 --- a/tikzit-1/src/gtk/TikzDocument.m +++ /dev/null @@ -1,911 +0,0 @@ -// -// TikzDocument.h -// TikZiT -// -// Copyright 2010 Chris Heunen -// Copyright 2010 Alex Merry -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "TikzDocument.h" - -@interface TikzDocument (Private) -- (void) styleRenamed:(NSNotification*)n; - -- (void) setPath:(NSString*)path; -- (void) setGraph:(Graph*)g; - -- (void) registerUndoForChange:(GraphChange*)change; -- (void) registerUndoGroupForChange:(GraphChange*)change withName:(NSString*)name; -- (void) undoGraphChange:(GraphChange*)change; -- (void) completedGraphChange:(GraphChange*)change withName:(NSString*)name; -- (void) attachStylesToGraph:(Graph*)g; - -- (void) regenerateTikz; -@end - -@implementation TikzDocument - -+ (TikzDocument*) documentWithStyleManager:(StyleManager*)manager -{ - return [[[TikzDocument alloc] initWithStyleManager:manager] autorelease]; -} - -+ (TikzDocument*) documentWithGraph:(Graph*)g - styleManager:(StyleManager*)manager -{ - return [[[TikzDocument alloc] initWithGraph:g - styleManager:manager] autorelease]; -} - -+ (TikzDocument*) documentWithTikz:(NSString*)t - styleManager:(StyleManager*)manager - error:(NSError**)error -{ - return [[[TikzDocument alloc] initWithTikz:t - styleManager:manager - error:error] autorelease]; -} - -+ (TikzDocument*) documentFromFile:(NSString*)pth - styleManager:(StyleManager*)manager - error:(NSError**)error -{ - return [[[TikzDocument alloc] initFromFile:pth - styleManager:manager - error:error] autorelease]; -} - - -- (id) initWithStyleManager:(StyleManager*)manager { - self = [self initWithGraph:[Graph graph] styleManager:manager]; - return self; -} - -- (id) initWithGraph:(Graph*)g styleManager:(StyleManager*)manager { - self = [super init]; - - if (self) { - graph = nil; - styleManager = [manager retain]; - pickSupport = [[PickSupport alloc] init]; - undoManager = [[NSUndoManager alloc] init]; - [undoManager setGroupsByEvent:NO]; - tikz = nil; - path = nil; - nodesetBeingModified = nil; - nodesetBeingModifiedOldCopy = nil; - nodeBeingModified = nil; - nodeBeingModifiedOldCopy = nil; - edgeBeingModified = nil; - edgeBeingModifiedOldCopy = nil; - - [undoManager disableUndoRegistration]; - [self setGraph:g]; - [undoManager enableUndoRegistration]; - - hasChanges = NO; - - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(styleRenamed:) - name:@"NodeStyleRenamed" - object:styleManager]; - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(styleRenamed:) - name:@"EdgeStyleRenamed" - object:styleManager]; - } - - return self; -} - -- (id) initWithTikz:(NSString*)t - styleManager:(StyleManager*)manager - error:(NSError**)error -{ - self = [self initWithStyleManager:manager]; - - if (self) { - [undoManager disableUndoRegistration]; - BOOL success = [self updateTikz:t error:error]; - if (!success) { - [self release]; - return nil; - } - [undoManager enableUndoRegistration]; - hasChanges = NO; - } - - return self; -} - -- (id) initFromFile:(NSString*)pth - styleManager:(StyleManager*)manager - error:(NSError**)error -{ - NSString *t = [NSString stringWithContentsOfFile:pth error:error]; - if (t == nil) { - [self release]; - return nil; - } - - self = [self initWithTikz:t styleManager:manager error:error]; - - if (self) { - [self setPath:pth]; - } - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - [styleManager release]; - [graph release]; - [pickSupport release]; - [undoManager release]; - [tikz release]; - [path release]; - [nodesetBeingModified release]; - [nodesetBeingModifiedOldCopy release]; - [nodeBeingModified release]; - [nodeBeingModifiedOldCopy release]; - [edgeBeingModified release]; - [edgeBeingModifiedOldCopy release]; - [oldGraphData release]; - [super dealloc]; -} - -@synthesize graph, pickSupport, path; - -- (NSString*) name { - if (path) { - return [[NSFileManager defaultManager] displayNameAtPath: path]; - } else { - return @"Untitled"; - } -} - -- (NSString*) suggestedFileName { - if (path) { - return [path lastPathComponent]; - } else { - return @"untitled.tikz"; - } -} - -- (BOOL) hasUnsavedChanges { - return hasChanges; -} - -- (StyleManager*) styleManager { - return styleManager; -} - -- (void) setStyleManager:(StyleManager*)manager { - StyleManager *oldManager = styleManager; - [[NSNotificationCenter defaultCenter] - removeObserver:self - name:nil - object:oldManager]; - - styleManager = [manager retain]; - - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(styleRenamed:) - name:@"NodeStyleRenamed" - object:styleManager]; - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(styleRenamed:) - name:@"EdgeStyleRenamed" - object:styleManager]; - - [self attachStylesToGraph:graph]; - [oldManager release]; -} - -- (void) postGraphReplaced { - [[NSNotificationCenter defaultCenter] postNotificationName:@"GraphReplaced" object:self]; -} - -- (void) postGraphChange:(GraphChange*)change { - NSDictionary *info = [NSDictionary dictionaryWithObject:change forKey:@"change"]; - [[NSNotificationCenter defaultCenter] postNotificationName:@"GraphChanged" object:self userInfo:info]; -} - -- (void) postIncompleteGraphChange:(GraphChange*)change { - NSDictionary *info = [NSDictionary dictionaryWithObject:change forKey:@"change"]; - [[NSNotificationCenter defaultCenter] postNotificationName:@"GraphBeingChanged" object:self userInfo:info]; -} - -- (void) postCancelledGraphChange:(GraphChange*)change { - NSDictionary *info = [NSDictionary dictionaryWithObject:change forKey:@"change"]; - [[NSNotificationCenter defaultCenter] postNotificationName:@"GraphChangeCancelled" object:self userInfo:info]; -} - -- (void) postTikzChanged { - [[NSNotificationCenter defaultCenter] postNotificationName:@"TikzChanged" object:self]; -} - -- (void) postUndoStackChanged { - [[NSNotificationCenter defaultCenter] postNotificationName:@"UndoStackChanged" object:self]; -} - -- (NSString*) tikz { - return tikz; -} - -- (BOOL) updateTikz:(NSString*)t error:(NSError**)error { - if (t == nil) { - t = [NSString string]; - } - if (t == tikz || [t isEqual:tikz]) { - return YES; - } - - Graph *g = [Graph graphFromTikz:t error:error]; - if (g) { - // updateTikz actually generates a graph from the tikz, - // and generates the final tikz from that - [self startUndoGroup]; - [self setGraph:g]; - [self nameAndEndUndoGroup:@"Update tikz"]; - return YES; - } - - return NO; -} - -- (Graph*) selectionCut { - Graph *selection = [self selectionCopy]; - [self startUndoGroup]; - [self removeSelected]; - [self nameAndEndUndoGroup:@"Cut"]; - return selection; -} - -- (Graph*) selectionCopy { - return [[graph copyOfSubgraphWithNodes:[pickSupport selectedNodes]] autorelease]; -} - -- (void) paste:(Graph*)g { - if (g == nil || [[g nodes] count] == 0) { - // nothing to paste - return; - } - - // place to the right of the existing graph - NSRect bounds = [graph bounds]; - NSRect gBounds = [g bounds]; - float dx = NSMaxX (bounds) - gBounds.origin.x + 0.5f; - [g shiftNodes:[g nodes] byPoint:NSMakePoint (dx, 0)]; - - GraphChange *change = [graph insertGraph:g]; - [self completedGraphChange:change withName:@"Paste"]; - - // select everything from the clipboard - [pickSupport deselectAllEdges]; - [pickSupport selectAllNodes:[NSSet setWithArray:[g nodes]] replacingSelection:YES]; -} - -- (void) pasteFromTikz:(NSString*)t { - Graph *clipboard = [Graph graphFromTikz:t]; - if (clipboard) { - [self attachStylesToGraph:clipboard]; - [self paste:clipboard]; - } -} - -- (BOOL) isNodeSelected:(Node*)node { - return [pickSupport isNodeSelected:node]; -} - -- (BOOL) isEdgeSelected:(Edge*)edge { - return [pickSupport isEdgeSelected:edge]; -} - -- (NSEnumerator*) nodeEnumerator { - return [[graph nodes] objectEnumerator]; -} - -- (NSEnumerator*) edgeEnumerator { - return [[graph edges] objectEnumerator]; -} - -- (BOOL) canUndo { - return [undoManager canUndo]; -} - -- (void) undo { - [undoManager undo]; - [self postUndoStackChanged]; -} - -- (BOOL) canRedo { - return [undoManager canRedo]; -} - -- (void) redo { - [undoManager redo]; - [self postUndoStackChanged]; -} - -- (NSString*) undoName { - return [undoManager undoActionName]; -} - -- (NSString*) redoName { - return [undoManager redoActionName]; -} - -- (void) startUndoGroup { - [undoManager beginUndoGrouping]; -} - -- (void) nameAndEndUndoGroup:(NSString*)nm { - [undoManager setActionName:nm]; - [undoManager endUndoGrouping]; - [self postUndoStackChanged]; -} - -- (void) endUndoGroup { - [undoManager endUndoGrouping]; - [self postUndoStackChanged]; -} - -- (void) startModifyNode:(Node*)node { - if (nodeBeingModified != nil) { - [NSException raise:@"NSInternalInconsistencyException" format:@"Already modifying a node"]; - } - nodeBeingModified = [node retain]; - nodeBeingModifiedOldCopy = [node copy]; -} - -- (void) modifyNodeCheckPoint { - [self regenerateTikz]; - GraphChange *change = [GraphChange propertyChangeOfNode:nodeBeingModified - fromOld:nodeBeingModifiedOldCopy - toNew:[[nodeBeingModified copy] autorelease]]; - [self postIncompleteGraphChange:change]; -} - -- (void) _finishModifySequence:(GraphChange*)change withName:(NSString*)chName cancelled:(BOOL)cancelled { - if (cancelled) { - change = [change invert]; - [graph applyGraphChange:change]; - [self regenerateTikz]; - [self postCancelledGraphChange:change]; - } else { - [self registerUndoGroupForChange:change withName:chName]; - [self regenerateTikz]; - [self postGraphChange:change]; - } -} - -- (void) _finishModifyNodeCancelled:(BOOL)cancelled { - if (nodeBeingModified == nil) { - [NSException raise:@"NSInternalInconsistencyException" format:@"Not modifying a node"]; - } - - GraphChange *change = [GraphChange propertyChangeOfNode:nodeBeingModified - fromOld:nodeBeingModifiedOldCopy - toNew:[[nodeBeingModified copy] autorelease]]; - [self _finishModifySequence:change withName:@"Modify node" cancelled:cancelled]; - - [nodeBeingModified release]; - nodeBeingModified = nil; - [nodeBeingModifiedOldCopy release]; - nodeBeingModifiedOldCopy = nil; -} - -- (void) endModifyNode { [self _finishModifyNodeCancelled:NO]; } -- (void) cancelModifyNode { [self _finishModifyNodeCancelled:YES]; } - -- (void) startModifyNodes:(NSSet*)nodes { - if (nodesetBeingModified != nil) { - [NSException raise:@"NSInternalInconsistencyException" format:@"Already modifying a node set"]; - } - - nodesetBeingModified = [nodes copy]; - nodesetBeingModifiedOldCopy = [[Graph nodeTableForNodes:nodes] retain]; -} - -- (void) modifyNodesCheckPoint { - [self regenerateTikz]; - GraphChange *change = [GraphChange propertyChangeOfNodesFromOldCopies:nodesetBeingModifiedOldCopy - toNewCopies:[Graph nodeTableForNodes:nodesetBeingModified]]; - [self postIncompleteGraphChange:change]; -} - -- (void) _finishModifyNodes:(BOOL)cancelled { - if (nodesetBeingModified == nil) { - [NSException raise:@"NSInternalInconsistencyException" format:@"Not modifying a node set"]; - } - - GraphChange *change = [GraphChange propertyChangeOfNodesFromOldCopies:nodesetBeingModifiedOldCopy - toNewCopies:[Graph nodeTableForNodes:nodesetBeingModified]]; - [self _finishModifySequence:change withName:@"Modify nodes" cancelled:cancelled]; - - [nodesetBeingModified release]; - nodesetBeingModified = nil; - [nodesetBeingModifiedOldCopy release]; - nodesetBeingModifiedOldCopy = nil; -} - -- (void) endModifyNodes { [self _finishModifyNodes:NO]; } -- (void) cancelModifyNodes { [self _finishModifyNodes:YES]; } - -- (void) startShiftNodes:(NSSet*)nodes { - if (nodesetBeingModified != nil) { - [NSException raise:@"NSInternalInconsistencyException" format:@"Already modifying a node set"]; - } - - nodesetBeingModified = [nodes copy]; - currentNodeShift = NSZeroPoint; -} - -- (void) shiftNodesUpdate:(NSPoint)currentShift { - if (nodesetBeingModified == nil) { - [NSException raise:@"NSInternalInconsistencyException" format:@"Not modifying a node set"]; - } - - currentNodeShift = currentShift; - [self regenerateTikz]; - GraphChange *change = [GraphChange shiftNodes:nodesetBeingModified - byPoint:currentNodeShift]; - [self postIncompleteGraphChange:change]; -} - -- (void) _finishShiftNodesCancelled:(BOOL)cancelled { - if (nodesetBeingModified == nil) { - [NSException raise:@"NSInternalInconsistencyException" format:@"Not modifying a node set"]; - } - - if (!NSEqualPoints (currentNodeShift, NSZeroPoint)) { - GraphChange *change = [GraphChange shiftNodes:nodesetBeingModified - byPoint:currentNodeShift]; - [self _finishModifySequence:change withName:@"Move nodes" cancelled:cancelled]; - } - - [nodesetBeingModified release]; - nodesetBeingModified = nil; -} - -- (void) endShiftNodes { [self _finishShiftNodesCancelled:NO]; } -- (void) cancelShiftNodes { [self _finishShiftNodesCancelled:YES]; } - -- (void) startModifyEdge:(Edge*)edge { - if (edgeBeingModified != nil) { - [NSException raise:@"NSInternalInconsistencyException" format:@"Already modifying an edge"]; - } - edgeBeingModified = [edge retain]; - edgeBeingModifiedOldCopy = [edge copy]; -} - -- (void) modifyEdgeCheckPoint { - [self regenerateTikz]; - GraphChange *change = [GraphChange propertyChangeOfEdge:edgeBeingModified - fromOld:edgeBeingModifiedOldCopy - toNew:[[edgeBeingModified copy] autorelease]]; - [self postIncompleteGraphChange:change]; -} - -- (void) _finishModifyEdgeCancelled:(BOOL)cancelled { - if (edgeBeingModified == nil) { - [NSException raise:@"NSInternalInconsistencyException" format:@"Not modifying an edge"]; - } - - GraphChange *change = [GraphChange propertyChangeOfEdge:edgeBeingModified - fromOld:edgeBeingModifiedOldCopy - toNew:[[edgeBeingModified copy] autorelease]]; - [self _finishModifySequence:change withName:@"Modify edge" cancelled:cancelled]; - - [edgeBeingModified release]; - edgeBeingModified = nil; - [edgeBeingModifiedOldCopy release]; - edgeBeingModifiedOldCopy = nil; -} - -- (void) endModifyEdge { [self _finishModifyEdgeCancelled:NO]; } -- (void) cancelModifyEdge { [self _finishModifyEdgeCancelled:YES]; } - -- (void) startModifyEdges:(NSSet*)edges { - if (edgesetBeingModified != nil) { - [NSException raise:@"NSInternalInconsistencyException" format:@"Already modifying an edge set"]; - } - - edgesetBeingModified = [edges copy]; - edgesetBeingModifiedOldCopy = [[Graph edgeTableForEdges:edges] retain]; -} - -- (void) modifyEdgesCheckPoint { - [self regenerateTikz]; - GraphChange *change = [GraphChange propertyChangeOfEdgesFromOldCopies:edgesetBeingModifiedOldCopy - toNewCopies:[Graph edgeTableForEdges:edgesetBeingModified]]; - [self postIncompleteGraphChange:change]; -} - -- (void) _finishModifyEdgesCancelled:(BOOL)cancelled { - if (edgesetBeingModified == nil) { - [NSException raise:@"NSInternalInconsistencyException" format:@"Not modifying an edge"]; - } - - GraphChange *change = [GraphChange propertyChangeOfEdgesFromOldCopies:edgesetBeingModifiedOldCopy - toNewCopies:[Graph edgeTableForEdges:edgesetBeingModified]]; - [self _finishModifySequence:change withName:@"Modify edges" cancelled:cancelled]; - - [edgesetBeingModified release]; - edgesetBeingModified = nil; - [edgesetBeingModifiedOldCopy release]; - edgesetBeingModifiedOldCopy = nil; -} - -- (void) endModifyEdges { [self _finishModifyEdgesCancelled:NO]; } -- (void) cancelModifyEdges { [self _finishModifyEdgesCancelled:YES]; } - -- (void) startChangeBoundingBox { - oldGraphBounds = [graph boundingBox]; -} - -- (void) changeBoundingBoxCheckPoint { - [self regenerateTikz]; - GraphChange *change = [GraphChange changeBoundingBoxFrom:oldGraphBounds - to:[graph boundingBox]]; - [self postIncompleteGraphChange:change]; -} - -- (void) _finishChangeBoundingBoxCancelled:(BOOL)cancelled { - GraphChange *change = [GraphChange changeBoundingBoxFrom:oldGraphBounds - to:[graph boundingBox]]; - [self _finishModifySequence:change withName:@"Set bounding box" cancelled:cancelled]; -} -- (void) endChangeBoundingBox { [self _finishChangeBoundingBoxCancelled:NO]; } -- (void) cancelChangeBoundingBox { [self _finishChangeBoundingBoxCancelled:YES]; } - -- (void) startChangeGraphProperties { - oldGraphData = [[graph data] copy]; -} - -- (void) changeGraphPropertiesCheckPoint { - [self regenerateTikz]; - GraphChange *change = [GraphChange propertyChangeOfGraphFrom:oldGraphData - to:[graph data]]; - [self postIncompleteGraphChange:change]; -} - -- (void) _finishChangeGraphPropertiesCancelled:(BOOL)cancelled { - GraphChange *change = [GraphChange propertyChangeOfGraphFrom:oldGraphData - to:[graph data]]; - [self _finishModifySequence:change withName:@"Change graph properties" cancelled:cancelled]; - [oldGraphData release]; - oldGraphData = nil; -} -- (void) endChangeGraphProperties { [self _finishChangeGraphPropertiesCancelled:NO]; } -- (void) cancelChangeGraphProperties { [self _finishChangeGraphPropertiesCancelled:YES]; } - -- (void) removeSelected { - NSUInteger selEdges = [[pickSupport selectedEdges] count]; - NSUInteger selNodes = [[pickSupport selectedNodes] count]; - - if (selEdges == 0 && selNodes == 0) { - return; - } - - NSString *actionName = @"Remove selection"; - - [self startUndoGroup]; - if (selEdges > 0) { - GraphChange *change = [graph removeEdges:[pickSupport selectedEdges]]; - [self registerUndoForChange:change]; - [pickSupport deselectAllEdges]; - [self postGraphChange:change]; - } else { - actionName = (selNodes == 1 ? @"Remove node" : @"Remove nodes"); - } - if (selNodes > 0) { - GraphChange *change = [graph removeNodes:[pickSupport selectedNodes]]; - [self registerUndoForChange:change]; - [pickSupport deselectAllNodes]; - [self postGraphChange:change]; - } else { - actionName = (selEdges == 1 ? @"Remove edge" : @"Remove edges"); - } - [self nameAndEndUndoGroup:actionName]; - [self regenerateTikz]; -} - -- (void) addNode:(Node*)node { - GraphChange *change = [graph addNode:node]; - [self completedGraphChange:change withName:@"Add node"]; -} - -- (void) removeNode:(Node*)node { - [pickSupport deselectNode:node]; - GraphChange *change = [graph removeNode:node]; - [self completedGraphChange:change withName:@"Remove node"]; -} - -- (void) addEdge:(Edge*)edge { - GraphChange *change = [graph addEdge:edge]; - [self completedGraphChange:change withName:@"Add edge"]; -} - -- (void) removeEdge:(Edge*)edge { - [pickSupport deselectEdge:edge]; - GraphChange *change = [graph removeEdge:edge]; - [self completedGraphChange:change withName:@"Remove edge"]; -} - -- (void) shiftSelectedNodesByPoint:(NSPoint)offset { - if ([[pickSupport selectedNodes] count] > 0) { - GraphChange *change = [graph shiftNodes:[pickSupport selectedNodes] byPoint:offset]; - [self completedGraphChange:change withName:@"Move nodes"]; - } -} - -- (void) insertGraph:(Graph*)g { - GraphChange *change = [graph insertGraph:g]; - [self completedGraphChange:change withName:@"Insert graph"]; -} - -- (void) flipSelectedNodesHorizontally { - if ([[pickSupport selectedNodes] count] > 0) { - GraphChange *change = [graph flipHorizontalNodes:[pickSupport selectedNodes]]; - [self completedGraphChange:change withName:@"Flip nodes horizontally"]; - } -} - -- (void) flipSelectedNodesVertically { - if ([[pickSupport selectedNodes] count] > 0) { - GraphChange *change = [graph flipVerticalNodes:[pickSupport selectedNodes]]; - [self completedGraphChange:change withName:@"Flip nodes vertically"]; - } -} - -- (void) reverseSelectedEdges { - if ([[pickSupport selectedEdges] count] > 0) { - GraphChange *change = [graph reverseEdges:[pickSupport selectedEdges]]; - [self completedGraphChange:change withName:@"Reverse edges"]; - } -} - -- (void) bringSelectionForward { - BOOL hasNodeSelection = [[pickSupport selectedNodes] count] > 0; - BOOL hasEdgeSelection = [[pickSupport selectedEdges] count] > 0; - if (!hasNodeSelection && !hasEdgeSelection) - return; - - [self startUndoGroup]; - GraphChange *nodeChange; - GraphChange *edgeChange; - if (hasNodeSelection) { - nodeChange = [graph bringNodesForward:[pickSupport selectedNodes]]; - [self registerUndoForChange:nodeChange]; - } - if (hasEdgeSelection) { - edgeChange = [graph bringEdgesForward:[pickSupport selectedEdges]]; - [self registerUndoForChange:edgeChange]; - } - [self nameAndEndUndoGroup:@"Bring forward"]; - [self regenerateTikz]; - if (hasNodeSelection) - [self postGraphChange:nodeChange]; - if (hasEdgeSelection) - [self postGraphChange:edgeChange]; -} - -- (void) bringSelectionToFront { - BOOL hasNodeSelection = [[pickSupport selectedNodes] count] > 0; - BOOL hasEdgeSelection = [[pickSupport selectedEdges] count] > 0; - if (!hasNodeSelection && !hasEdgeSelection) - return; - - [self startUndoGroup]; - GraphChange *nodeChange; - GraphChange *edgeChange; - if (hasNodeSelection) { - nodeChange = [graph bringNodesToFront:[pickSupport selectedNodes]]; - [self registerUndoForChange:nodeChange]; - } - if (hasEdgeSelection) { - edgeChange = [graph bringEdgesToFront:[pickSupport selectedEdges]]; - [self registerUndoForChange:edgeChange]; - } - [self nameAndEndUndoGroup:@"Bring to front"]; - [self regenerateTikz]; - if (hasNodeSelection) - [self postGraphChange:nodeChange]; - if (hasEdgeSelection) - [self postGraphChange:edgeChange]; -} - -- (void) sendSelectionBackward { - BOOL hasNodeSelection = [[pickSupport selectedNodes] count] > 0; - BOOL hasEdgeSelection = [[pickSupport selectedEdges] count] > 0; - if (!hasNodeSelection && !hasEdgeSelection) - return; - - [self startUndoGroup]; - GraphChange *nodeChange; - GraphChange *edgeChange; - if (hasNodeSelection) { - nodeChange = [graph sendNodesBackward:[pickSupport selectedNodes]]; - [self registerUndoForChange:nodeChange]; - } - if (hasEdgeSelection) { - edgeChange = [graph sendNodesBackward:[pickSupport selectedEdges]]; - [self registerUndoForChange:edgeChange]; - } - [self nameAndEndUndoGroup:@"Send backward"]; - [self regenerateTikz]; - if (hasNodeSelection) - [self postGraphChange:nodeChange]; - if (hasEdgeSelection) - [self postGraphChange:edgeChange]; -} - -- (void) sendSelectionToBack { - BOOL hasNodeSelection = [[pickSupport selectedNodes] count] > 0; - BOOL hasEdgeSelection = [[pickSupport selectedEdges] count] > 0; - if (!hasNodeSelection && !hasEdgeSelection) - return; - - [self startUndoGroup]; - GraphChange *nodeChange; - GraphChange *edgeChange; - if (hasNodeSelection) { - nodeChange = [graph sendNodesToBack:[pickSupport selectedNodes]]; - [self registerUndoForChange:nodeChange]; - } - if (hasEdgeSelection) { - edgeChange = [graph sendNodesToBack:[pickSupport selectedEdges]]; - [self registerUndoForChange:edgeChange]; - } - [self nameAndEndUndoGroup:@"Send to back"]; - [self regenerateTikz]; - if (hasNodeSelection) - [self postGraphChange:nodeChange]; - if (hasEdgeSelection) - [self postGraphChange:edgeChange]; -} - -- (BOOL) saveCopyToPath: (NSString*)p error: (NSError**)error { - if (!p) { - [NSException raise:@"No document path" format:@"No path given"]; - } - // we use glib for writing the file, because GNUStep sucks in this regard - // (older versions don't have -[NSString writeToFile:atomically:encoding:error:]) - GError *gerror = NULL; - gchar *filename = [p glibFilename]; - BOOL success = g_file_set_contents (filename, [tikz UTF8String], -1, &gerror) ? YES : NO; - if (gerror) { - GErrorToNSError (gerror, error); - g_error_free (gerror); - } - g_free (filename); - return success; -} - -- (BOOL) saveToPath: (NSString*)p error: (NSError**)error { - BOOL success = [self saveCopyToPath:p error:error]; - if (success) { - [self setPath:p]; - hasChanges = NO; - } - return success; -} - -- (BOOL) save: (NSError**)error { - if (!path) { - [NSException raise:@"No document path" format:@"Tried to save a document when there was no path"]; - } - return [self saveToPath:path error:error]; -} - -@end - -@implementation TikzDocument (Private) -- (void) styleRenamed:(NSNotification*)n { - [self regenerateTikz]; -} - -- (void) setPath:(NSString*)p { - [p retain]; - [path release]; - path = p; -} - -- (void) setGraph:(Graph*)g { - if (g == nil) { - g = [Graph graph]; - } - if (g == graph) { - return; - } - - [pickSupport deselectAllNodes]; - [pickSupport deselectAllEdges]; - - [self startUndoGroup]; - [undoManager registerUndoWithTarget:self selector:@selector(setGraph:) object:graph]; - [g retain]; - [graph release]; - graph = g; - - [self attachStylesToGraph:graph]; - - [self regenerateTikz]; - [self postGraphReplaced]; - [self nameAndEndUndoGroup:@"Replace graph"]; -} - -- (void) registerUndoForChange:(GraphChange*)change { - [undoManager registerUndoWithTarget:self - selector:@selector(undoGraphChange:) - object:change]; -} - -- (void) registerUndoGroupForChange:(GraphChange*)change withName:(NSString*)nm { - [self startUndoGroup]; - [self registerUndoForChange:change]; - [self nameAndEndUndoGroup:nm]; -} - -- (void) undoGraphChange:(GraphChange*)change { - GraphChange *inverse = [change invert]; - [graph applyGraphChange:inverse]; - [self startUndoGroup]; - [undoManager registerUndoWithTarget:self - selector:@selector(undoGraphChange:) - object:inverse]; - [self endUndoGroup]; - [self regenerateTikz]; - [self postGraphChange:change]; -} - -- (void) completedGraphChange:(GraphChange*)change withName:(NSString*)name { - if (change == nil) { - NSLog(@"No graph change given for change %@", name); - return; - } - [self registerUndoGroupForChange:change withName:name]; - [self regenerateTikz]; - [self postGraphChange:change]; -} - -- (void) attachStylesToGraph:(Graph*)g { - for (Node *n in [g nodes]) { - [n attachStyleFromTable:[styleManager nodeStyles]]; - } - for (Edge *e in [g edges]) { - [e attachStyleFromTable:[styleManager edgeStyles]]; - } -} - -- (void) regenerateTikz { - [tikz release]; - tikz = [[graph tikz] retain]; - hasChanges = YES; - [self postTikzChanged]; -} -@end - -// vim:ft=objc:sts=4:sw=4:et diff --git a/tikzit-1/src/gtk/Tool.h b/tikzit-1/src/gtk/Tool.h deleted file mode 100644 index 22c983e..0000000 --- a/tikzit-1/src/gtk/Tool.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "InputDelegate.h" -#import "Surface.h" - -#import -#import - -@class Configuration; -@class GraphRenderer; -@protocol InputDelegate; -@protocol RenderDelegate; - -@protocol Tool -@property (readonly) NSString *name; -@property (readonly) const gchar *stockId; -@property (readonly) NSString *helpText; -@property (readonly) NSString *shortcut; -@property (retain) GraphRenderer *activeRenderer; -@property (readonly) GtkWidget *configurationWidget; -- (void) loadConfiguration:(Configuration*)config; -- (void) saveConfiguration:(Configuration*)config; -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/ToolBox.h b/tikzit-1/src/gtk/ToolBox.h deleted file mode 100644 index 60074c1..0000000 --- a/tikzit-1/src/gtk/ToolBox.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class Configuration; -@class Window; -@protocol Tool; - -@interface ToolBox : NSObject { - GtkWidget *window; - GtkToolItemGroup *toolGroup; - GtkWidget *titleLabel; - GtkWidget *configWidgetContainer; - GtkWidget *configWidget; -} - -@property (assign) id selectedTool; - -- (id) initWithTools:(NSArray*)tools; - -- (void) show; -- (void) present; -- (void) attachToWindow:(Window*)parent; - -- (void) loadConfiguration:(Configuration*)config; -- (void) saveConfiguration:(Configuration*)config; -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/ToolBox.m b/tikzit-1/src/gtk/ToolBox.m deleted file mode 100644 index c6d2ccf..0000000 --- a/tikzit-1/src/gtk/ToolBox.m +++ /dev/null @@ -1,280 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "ToolBox.h" - -#import "Application.h" -#import "Configuration.h" -#import "Tool.h" -#import "Window.h" - -#import "gtkhelpers.h" -#import "tztoolpalette.h" - -static void tool_button_toggled_cb (GtkWidget *widget, ToolBox *toolBox); - -#define TOOL_DATA_KEY "tikzit-tool" - -@implementation ToolBox - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithTools:(NSArray*)tools { - self = [super init]; - - if (self) { - window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - g_object_ref_sink (window); - gtk_window_set_title (GTK_WINDOW (window), "Toolbox"); - gtk_window_set_role (GTK_WINDOW (window), "toolbox"); - gtk_window_set_type_hint (GTK_WINDOW (window), - GDK_WINDOW_TYPE_HINT_UTILITY); - gtk_window_set_deletable (GTK_WINDOW (window), FALSE); - - GtkWidget *mainLayout = gtk_vbox_new (FALSE, 5); - gtk_widget_show (mainLayout); - gtk_container_add (GTK_CONTAINER (window), mainLayout); - - GtkWidget *toolPalette = tz_tool_palette_new (); - gtk_widget_show (toolPalette); - gtk_box_pack_start (GTK_BOX (mainLayout), - toolPalette, - FALSE, - FALSE, - 0); - gtk_tool_palette_set_style (GTK_TOOL_PALETTE (toolPalette), - GTK_TOOLBAR_ICONS); - - toolGroup = GTK_TOOL_ITEM_GROUP (gtk_tool_item_group_new ("Tools")); - g_object_ref_sink (G_OBJECT (toolGroup)); - gtk_tool_item_group_set_label_widget ( - toolGroup, - NULL); - gtk_container_add (GTK_CONTAINER (toolPalette), GTK_WIDGET (toolGroup)); - gtk_widget_show (GTK_WIDGET (toolGroup)); - - GSList *item_group = NULL; - for (id tool in tools) { - NSString *tooltip = [NSString stringWithFormat: - @"%@: %@ (%@)", - [tool name], [tool helpText], [tool shortcut]]; - GtkToolItem *item = gtk_radio_tool_button_new_from_stock ( - item_group, - [tool stockId]); - gtk_tool_item_set_tooltip_text (item, [tooltip UTF8String]); - item_group = gtk_radio_tool_button_get_group ( - GTK_RADIO_TOOL_BUTTON (item)); - gtk_tool_item_group_insert ( - toolGroup, - item, - -1); - gtk_widget_show (GTK_WIDGET (item)); - g_object_set_data_full ( - G_OBJECT(item), - TOOL_DATA_KEY, - [tool retain], - release_obj); - - g_signal_connect (item, "toggled", - G_CALLBACK (tool_button_toggled_cb), - self); - } - - GtkWidget *sep = gtk_hseparator_new (); - gtk_widget_show (sep); - gtk_box_pack_start (GTK_BOX (mainLayout), - sep, - FALSE, - FALSE, - 0); - - titleLabel = gtk_label_new (""); - g_object_ref_sink (titleLabel); - gtk_widget_show (titleLabel); - - PangoAttrList *attrs = pango_attr_list_new (); - pango_attr_list_insert (attrs, - pango_attr_weight_new (PANGO_WEIGHT_SEMIBOLD)); - gtk_label_set_attributes (GTK_LABEL (titleLabel), attrs); - pango_attr_list_unref (attrs); - - gtk_box_pack_start (GTK_BOX (mainLayout), - titleLabel, - FALSE, - FALSE, - 0); - - configWidgetContainer = gtk_alignment_new (0.5, 0.5, 1.0, 1.0); - g_object_ref_sink (configWidgetContainer); - gtk_widget_show (configWidgetContainer); - gtk_box_pack_start (GTK_BOX (mainLayout), - configWidgetContainer, - TRUE, - TRUE, - 0); - gtk_alignment_set_padding (GTK_ALIGNMENT (configWidgetContainer), - 5, 5, 5, 5); - - gint button_width; - gint button_height; - - if (tz_tool_palette_get_button_size (TZ_TOOL_PALETTE (toolPalette), - &button_width, &button_height)) - { - GdkGeometry geometry; - - geometry.min_width = 2 * button_width; - geometry.min_height = -1; - geometry.base_width = button_width; - geometry.base_height = 0; - geometry.width_inc = button_width; - geometry.height_inc = 1; - - gtk_window_set_geometry_hints (GTK_WINDOW (window), - NULL, - &geometry, - GDK_HINT_MIN_SIZE | - GDK_HINT_BASE_SIZE | - GDK_HINT_RESIZE_INC | - GDK_HINT_USER_POS); - } - gtk_window_set_default_size (GTK_WINDOW (window), button_width * 5, 500); - - // hack to position the toolbox window somewhere sensible - // (upper left) - gtk_window_parse_geometry (GTK_WINDOW (window), "+0+0"); - } - - return self; -} - -- (void) dealloc { - if (window) { - g_object_unref (G_OBJECT (toolGroup)); - g_object_unref (G_OBJECT (titleLabel)); - g_object_unref (G_OBJECT (configWidgetContainer)); - if (configWidget) - g_object_unref (G_OBJECT (configWidget)); - gtk_widget_destroy (window); - g_object_unref (G_OBJECT (window)); - } - - [super dealloc]; -} - -- (id) selectedTool { - guint count = gtk_tool_item_group_get_n_items (toolGroup); - for (guint i = 0; i < count; ++i) { - GtkToolItem *item = gtk_tool_item_group_get_nth_item (toolGroup, i); - if (gtk_toggle_tool_button_get_active (GTK_TOGGLE_TOOL_BUTTON (item))) { - return (id)g_object_get_data (G_OBJECT (item), TOOL_DATA_KEY); - } - } - return nil; -} - -- (void) _setToolWidget:(GtkWidget*)widget { - if (configWidget) { - gtk_widget_hide (configWidget); - gtk_container_remove (GTK_CONTAINER (configWidgetContainer), - configWidget); - g_object_unref (configWidget); - } - configWidget = widget; - if (configWidget) { - g_object_ref (configWidget); - gtk_container_add (GTK_CONTAINER (configWidgetContainer), - configWidget); - gtk_widget_show (configWidget); - } -} - -- (void) setSelectedTool:(id)tool { - guint count = gtk_tool_item_group_get_n_items (toolGroup); - for (guint i = 0; i < count; ++i) { - GtkToolItem *item = gtk_tool_item_group_get_nth_item (toolGroup, i); - id data = (id)g_object_get_data (G_OBJECT (item), TOOL_DATA_KEY); - if (data == tool) { - gtk_toggle_tool_button_set_active ( - GTK_TOGGLE_TOOL_BUTTON (item), - TRUE); - break; - } - } - gtk_label_set_label (GTK_LABEL (titleLabel), - [[tool name] UTF8String]); - [self _setToolWidget:[tool configurationWidget]]; -} - -- (void) show { - gtk_widget_show (window); -} - -- (void) present { - gtk_window_present (GTK_WINDOW (window)); -} - -- (void) attachToWindow:(Window*)parent { - utility_window_attach (GTK_WINDOW (window), [parent gtkWindow]); -} - -- (void) loadConfiguration:(Configuration*)config { - if ([config hasGroup:@"ToolBox"]) { - tz_restore_window (GTK_WINDOW (window), - [config integerEntry:@"x" inGroup:@"ToolBox"], - [config integerEntry:@"y" inGroup:@"ToolBox"], - [config integerEntry:@"w" inGroup:@"ToolBox"], - [config integerEntry:@"h" inGroup:@"ToolBox"]); - } -} - -- (void) saveConfiguration:(Configuration*)config { - gint x, y, w, h; - - gtk_window_get_position (GTK_WINDOW (window), &x, &y); - gtk_window_get_size (GTK_WINDOW (window), &w, &h); - - [config setIntegerEntry:@"x" inGroup:@"ToolBox" value:x]; - [config setIntegerEntry:@"y" inGroup:@"ToolBox" value:y]; - [config setIntegerEntry:@"w" inGroup:@"ToolBox" value:w]; - [config setIntegerEntry:@"h" inGroup:@"ToolBox" value:h]; -} - -@end - -static void tool_button_toggled_cb (GtkWidget *widget, ToolBox *toolBox) { - if (gtk_toggle_tool_button_get_active (GTK_TOGGLE_TOOL_BUTTON (widget))) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - id tool = (id)g_object_get_data (G_OBJECT(widget), TOOL_DATA_KEY); - [app setActiveTool:tool]; - NSDictionary *userInfo = [NSDictionary - dictionaryWithObject:tool - forKey:@"tool"]; - [[NSNotificationCenter defaultCenter] - postNotificationName:@"ToolSelectionChanged" - object:toolBox - userInfo:userInfo]; - - [pool drain]; - } -} - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/WidgetSurface.h b/tikzit-1/src/gtk/WidgetSurface.h deleted file mode 100644 index 667749f..0000000 --- a/tikzit-1/src/gtk/WidgetSurface.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import -#import -#import - -/** - * Provides a surface for rendering to a widget. - */ -@interface WidgetSurface: NSObject { - GtkWidget *widget; - Transformer *transformer; - id renderDelegate; - id inputDelegate; - BOOL keepCentered; - BOOL buttonPressesRequired; - CGFloat defaultScale; - NSSize lastKnownSize; -} - -@property (assign) BOOL canFocus; -@property (assign) BOOL keepCentered; -@property (assign) CGFloat defaultScale; - -- (id) initWithWidget:(GtkWidget*)widget; -- (GtkWidget*) widget; - -- (id) inputDelegate; -- (void) setInputDelegate:(id)delegate; - -/** - * Set the minimum size that this widget wants - */ -- (void) setSizeRequestWidth:(double)width height:(double)height; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/WidgetSurface.m b/tikzit-1/src/gtk/WidgetSurface.m deleted file mode 100644 index 004e722..0000000 --- a/tikzit-1/src/gtk/WidgetSurface.m +++ /dev/null @@ -1,630 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "WidgetSurface.h" -#import "gtkhelpers.h" -#import "InputDelegate.h" -#import "CairoRenderContext.h" - -// {{{ Internal interfaces -// {{{ GTK+ callbacks -static gboolean configure_event_cb (GtkWidget *widget, GdkEventConfigure *event, WidgetSurface *surface); -static void realize_cb (GtkWidget *widget, WidgetSurface *surface); -static gboolean expose_event_cb (GtkWidget *widget, GdkEventExpose *event, WidgetSurface *surface); -static gboolean button_press_event_cb (GtkWidget *widget, GdkEventButton *event, WidgetSurface *surface); -static gboolean button_release_event_cb (GtkWidget *widget, GdkEventButton *event, WidgetSurface *surface); -static gboolean motion_notify_event_cb (GtkWidget *widget, GdkEventMotion *event, WidgetSurface *surface); -static gboolean key_press_event_cb (GtkWidget *widget, GdkEventKey *event, WidgetSurface *surface); -static gboolean key_release_event_cb (GtkWidget *widget, GdkEventKey *event, WidgetSurface *surface); -static gboolean scroll_event_cb (GtkWidget *widget, GdkEventScroll *event, WidgetSurface *surface); -static void set_cursor (GtkWidget *widget, GdkCursor *cursor); -static void unref_cursor (gpointer cursor, GClosure *closure); -// }}} - -@interface WidgetSurface (Private) -- (void) updateTransformer; -- (void) widgetSizeChanged:(NSNotification*)notification; -- (void) handleExposeEvent:(GdkEventExpose*)event; -- (void) updateLastKnownSize; -- (void) zoomTo:(CGFloat)scale aboutPoint:(NSPoint)p; -- (void) zoomTo:(CGFloat)scale; -- (void) addToEventMask:(GdkEventMask)values; -- (void) removeFromEventMask:(GdkEventMask)values; -@end -// }}} -// {{{ API -@implementation WidgetSurface - -- (id) init { - return [self initWithWidget:gtk_drawing_area_new ()]; -} - -- (id) initWithWidget:(GtkWidget*)w { - self = [super init]; - - if (self) { - widget = w; - g_object_ref_sink (G_OBJECT (widget)); - defaultScale = 1.0f; - transformer = [[Transformer alloc] init]; - [transformer setFlippedAboutXAxis:YES]; - [self updateLastKnownSize]; - g_object_set (G_OBJECT (widget), "events", GDK_STRUCTURE_MASK, NULL); - g_signal_connect (widget, "expose-event", G_CALLBACK (expose_event_cb), self); - g_signal_connect (widget, "configure-event", G_CALLBACK (configure_event_cb), self); - g_signal_connect (widget, "realize", G_CALLBACK (realize_cb), self); - g_signal_connect (widget, "button-press-event", G_CALLBACK (button_press_event_cb), self); - g_signal_connect (widget, "button-release-event", G_CALLBACK (button_release_event_cb), self); - g_signal_connect (widget, "motion-notify-event", G_CALLBACK (motion_notify_event_cb), self); - g_signal_connect (widget, "key-press-event", G_CALLBACK (key_press_event_cb), self); - g_signal_connect (widget, "key-release-event", G_CALLBACK (key_release_event_cb), self); - g_signal_connect (widget, "scroll-event", G_CALLBACK (scroll_event_cb), self); - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(widgetSizeChanged:) - name:@"SurfaceSizeChanged" - object:self]; - if ([self canFocus]) { - [self addToEventMask:GDK_BUTTON_PRESS_MASK]; - } else { - [self removeFromEventMask:GDK_BUTTON_PRESS_MASK]; - } - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - [transformer release]; - g_object_unref (G_OBJECT (widget)); - - [super dealloc]; -} - -- (void) invalidateRect:(NSRect)rect { - if (!NSIsEmptyRect (rect)) { - GdkWindow *window = gtk_widget_get_window (widget); - if (window) { - GdkRectangle g_rect = gdk_rectangle_from_ns_rect (rect); - gdk_window_invalidate_rect (window, &g_rect, TRUE); - } - } -} - -- (void) invalidate { - GdkWindow *window = gtk_widget_get_window (widget); - if (window) { - GdkRegion *visible = gdk_drawable_get_visible_region (GDK_DRAWABLE (window)); - gdk_window_invalidate_region (window, visible, TRUE); - gdk_region_destroy (visible); - } -} - -- (id) createRenderContext { - return [CairoRenderContext contextForWidget:widget]; -} - -- (int) width { - int width = 0; - GdkWindow *window = gtk_widget_get_window (widget); - if (window) { - gdk_drawable_get_size (window, &width, NULL); - } - return width; -} - -- (int) height { - int height = 0; - GdkWindow *window = gtk_widget_get_window (widget); - if (window) { - gdk_drawable_get_size (window, NULL, &height); - } - return height; -} - -- (void) setSizeRequestWidth:(double)width height:(double)height { - gtk_widget_set_size_request (widget, width, height); -} - -- (Transformer*) transformer { - return transformer; -} - -- (GtkWidget*) widget { - return widget; -} - -- (void) setRenderDelegate:(id )delegate { - // NB: no retention! - renderDelegate = delegate; - if (renderDelegate == nil) { - [self removeFromEventMask:GDK_EXPOSURE_MASK]; - } else { - [self addToEventMask:GDK_EXPOSURE_MASK]; - } -} - -- (id) inputDelegate { - return inputDelegate; -} - -- (void) setInputDelegate:(id)delegate { - if (delegate == inputDelegate) { - return; - } - buttonPressesRequired = NO; - if (inputDelegate != nil) { - [self removeFromEventMask:GDK_POINTER_MOTION_MASK - | GDK_BUTTON_PRESS_MASK - | GDK_BUTTON_RELEASE_MASK - | GDK_KEY_PRESS_MASK - | GDK_KEY_RELEASE_MASK]; - } - inputDelegate = delegate; - if (delegate != nil) { - GdkEventMask mask = 0; - if ([delegate respondsToSelector:@selector(mousePressAt:withButton:andMask:)]) { - buttonPressesRequired = YES; - mask |= GDK_BUTTON_PRESS_MASK; - } - if ([delegate respondsToSelector:@selector(mouseReleaseAt:withButton:andMask:)]) { - mask |= GDK_BUTTON_RELEASE_MASK; - } - if ([delegate respondsToSelector:@selector(mouseDoubleClickAt:withButton:andMask:)]) { - buttonPressesRequired = YES; - mask |= GDK_BUTTON_PRESS_MASK; - } - if ([delegate respondsToSelector:@selector(mouseMoveTo:withButtons:andMask:)]) { - mask |= GDK_POINTER_MOTION_MASK; - } - if ([delegate respondsToSelector:@selector(keyPressed:withMask:)]) { - mask |= GDK_KEY_PRESS_MASK; - } - if ([delegate respondsToSelector:@selector(keyReleased:withMask:)]) { - mask |= GDK_KEY_RELEASE_MASK; - } - [self addToEventMask:mask]; - } -} - -- (id ) renderDelegate { - return renderDelegate; -} - -- (void) setKeepCentered:(BOOL)centered { - keepCentered = centered; - [self updateTransformer]; -} - -- (BOOL) keepCentered { - return keepCentered; -} - -- (BOOL) canFocus { - return gtk_widget_get_can_focus (widget); -} - -- (void) setCanFocus:(BOOL)focus { - gtk_widget_set_can_focus (widget, focus); - if (focus) { - [self addToEventMask:GDK_BUTTON_PRESS_MASK]; - } else if (!buttonPressesRequired) { - [self removeFromEventMask:GDK_BUTTON_PRESS_MASK]; - } -} - -- (BOOL) hasFocus { - return gtk_widget_has_focus (widget); -} - -- (void) renderFocus { - GdkWindow *window = gtk_widget_get_window (widget); - if (window) { - int width = 0; - int height = 0; - gdk_drawable_get_size (window, &width, &height); - gtk_paint_focus (gtk_widget_get_style (widget), - window, - GTK_STATE_NORMAL, - NULL, - widget, - NULL, - 0, - 0, - width, - height - ); - } -} - -- (CGFloat) defaultScale { - return defaultScale; -} - -- (void) setDefaultScale:(CGFloat)newDefault { - if (defaultScale != newDefault) { - CGFloat oldDefault = defaultScale; - defaultScale = newDefault; - - CGFloat scale = [transformer scale]; - scale *= (newDefault / oldDefault); - [transformer setScale:scale]; - [self invalidate]; - } -} - -- (void) zoomIn { - CGFloat scale = [transformer scale]; - scale *= 1.2f; - [self zoomTo:scale]; -} - -- (void) zoomOut { - CGFloat scale = [transformer scale]; - scale /= 1.2f; - [self zoomTo:scale]; -} - -- (void) zoomReset { - [self zoomTo:defaultScale]; -} - -- (void) zoomInAboutPoint:(NSPoint)p { - CGFloat scale = [transformer scale]; - scale *= 1.2f; - [self zoomTo:scale aboutPoint:p]; -} - -- (void) zoomOutAboutPoint:(NSPoint)p { - CGFloat scale = [transformer scale]; - scale /= 1.2f; - [self zoomTo:scale aboutPoint:p]; -} - -- (void) zoomResetAboutPoint:(NSPoint)p { - [self zoomTo:defaultScale aboutPoint:p]; -} - -- (void) setCursor:(Cursor)c { - GdkCursor *cursor = NULL; - switch (c) { - case ResizeRightCursor: - cursor = gdk_cursor_new (GDK_RIGHT_SIDE); - break; - case ResizeBottomRightCursor: - cursor = gdk_cursor_new (GDK_BOTTOM_RIGHT_CORNER); - break; - case ResizeBottomCursor: - cursor = gdk_cursor_new (GDK_BOTTOM_SIDE); - break; - case ResizeBottomLeftCursor: - cursor = gdk_cursor_new (GDK_BOTTOM_LEFT_CORNER); - break; - case ResizeLeftCursor: - cursor = gdk_cursor_new (GDK_LEFT_SIDE); - break; - case ResizeTopLeftCursor: - cursor = gdk_cursor_new (GDK_TOP_LEFT_CORNER); - break; - case ResizeTopCursor: - cursor = gdk_cursor_new (GDK_TOP_SIDE); - break; - case ResizeTopRightCursor: - cursor = gdk_cursor_new (GDK_TOP_RIGHT_CORNER); - break; - default: break; - } - GdkWindow *window = gtk_widget_get_window (widget); - g_signal_handlers_disconnect_matched (window, - G_SIGNAL_MATCH_FUNC, 0, 0, NULL, - G_CALLBACK (set_cursor), NULL); - if (window) { - gdk_window_set_cursor (window, cursor); - if (cursor != NULL) { - gdk_cursor_unref (cursor); - } - } else { - g_signal_connect_data (widget, - "realize", G_CALLBACK (set_cursor), cursor, - unref_cursor, 0); - } -} - -@end -// }}} -// {{{ Private -@implementation WidgetSurface (Private) -- (void) widgetSizeChanged:(NSNotification*)notification { - [self updateTransformer]; - [self updateLastKnownSize]; -} - -- (void) updateTransformer { - if (keepCentered) { - GdkWindow *window = gtk_widget_get_window (widget); - if (window) { - int width = 0; - int height = 0; - gdk_drawable_get_size (window, &width, &height); - NSPoint origin; - if (lastKnownSize.width < 1 || lastKnownSize.height < 1) { - origin.x = (float)width / 2.0f; - origin.y = (float)height / 2.0f; - } else { - origin = [transformer origin]; - origin.x += ((float)width - lastKnownSize.width) / 2.0f; - origin.y += ((float)height - lastKnownSize.height) / 2.0f; - } - [transformer setOrigin:origin]; - } - } -} - -- (void) handleExposeEvent:(GdkEventExpose*)event { - if (renderDelegate != nil) { - NSRect area = gdk_rectangle_to_ns_rect (event->area); - - id context = [CairoRenderContext contextForWidget:widget]; - [context rect:area]; - [context clipToPath]; - [renderDelegate renderWithContext:context onSurface:self]; - } -} - -- (void) updateLastKnownSize { - GdkWindow *window = gtk_widget_get_window (widget); - if (window) { - int width = 0; - int height = 0; - gdk_drawable_get_size (window, &width, &height); - lastKnownSize.width = (float)width; - lastKnownSize.height = (float)height; - } else { - lastKnownSize = NSZeroSize; - } -} - -- (void) zoomTo:(CGFloat)scale aboutPoint:(NSPoint)p { - NSPoint graphP = [transformer fromScreen:p]; - - [transformer setScale:scale]; - - NSPoint newP = [transformer toScreen:graphP]; - NSPoint origin = [transformer origin]; - origin.x += p.x - newP.x; - origin.y += p.y - newP.y; - [transformer setOrigin:origin]; - - [self invalidate]; -} - -- (void) zoomTo:(CGFloat)scale { - NSPoint centre = NSMakePoint (lastKnownSize.width/2.0f, lastKnownSize.height/2.0f); - [self zoomTo:scale aboutPoint:centre]; -} - -- (void) addToEventMask:(GdkEventMask)values { - GdkEventMask mask; - g_object_get (G_OBJECT (widget), "events", &mask, NULL); - mask |= values; - g_object_set (G_OBJECT (widget), "events", mask, NULL); -} - -- (void) removeFromEventMask:(GdkEventMask)values { - GdkEventMask mask; - g_object_get (G_OBJECT (widget), "events", &mask, NULL); - mask ^= values; - if (buttonPressesRequired || [self canFocus]) { - mask |= GDK_BUTTON_PRESS_MASK; - } - g_object_set (G_OBJECT (widget), "events", mask, NULL); -} - -@end -// }}} -// {{{ GTK+ callbacks -static gboolean configure_event_cb(GtkWidget *widget, GdkEventConfigure *event, WidgetSurface *surface) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [[NSNotificationCenter defaultCenter] postNotificationName:@"SurfaceSizeChanged" object:surface]; - [pool drain]; - return FALSE; -} - -static void realize_cb (GtkWidget *widget, WidgetSurface *surface) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [surface updateTransformer]; - [pool drain]; -} - -static gboolean expose_event_cb(GtkWidget *widget, GdkEventExpose *event, WidgetSurface *surface) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [surface handleExposeEvent:event]; - [pool drain]; - return FALSE; -} - -InputMask mask_from_gdk_modifier_state (GdkModifierType state) { - InputMask mask = 0; - if (state & GDK_SHIFT_MASK) { - mask |= ShiftMask; - } - if (state & GDK_CONTROL_MASK) { - mask |= ControlMask; - } - if (state & GDK_META_MASK) { - mask |= MetaMask; - } - return mask; -} - -ScrollDirection scroll_dir_from_gdk_scroll_dir (GdkScrollDirection dir) { - switch (dir) { - case GDK_SCROLL_UP: return ScrollUp; - case GDK_SCROLL_DOWN: return ScrollDown; - case GDK_SCROLL_LEFT: return ScrollLeft; - case GDK_SCROLL_RIGHT: return ScrollRight; - default: NSLog(@"Invalid scroll direction %i", (int)dir); return ScrollDown; - } -} - -MouseButton buttons_from_gdk_modifier_state (GdkModifierType state) { - MouseButton buttons = 0; - if (state & GDK_BUTTON1_MASK) { - buttons |= LeftButton; - } - if (state & GDK_BUTTON2_MASK) { - buttons |= MiddleButton; - } - if (state & GDK_BUTTON3_MASK) { - buttons |= RightButton; - } - if (state & GDK_BUTTON4_MASK) { - buttons |= Button4; - } - if (state & GDK_BUTTON5_MASK) { - buttons |= Button5; - } - return buttons; -} - -static gboolean button_press_event_cb(GtkWidget *widget, GdkEventButton *event, WidgetSurface *surface) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - if ([surface canFocus]) { - if (!gtk_widget_has_focus (widget)) { - gtk_widget_grab_focus (widget); - } - } - - id delegate = [surface inputDelegate]; - if (delegate != nil) { - NSPoint pos = NSMakePoint (event->x, event->y); - MouseButton button = (MouseButton)event->button; - InputMask mask = mask_from_gdk_modifier_state (event->state); - if (event->type == GDK_BUTTON_PRESS && [delegate respondsToSelector:@selector(mousePressAt:withButton:andMask:)]) { - [delegate mousePressAt:pos withButton:button andMask:mask]; - } - if (event->type == GDK_2BUTTON_PRESS && [delegate respondsToSelector:@selector(mouseDoubleClickAt:withButton:andMask:)]) { - [delegate mouseDoubleClickAt:pos withButton:button andMask:mask]; - } - } - - [pool drain]; - return FALSE; -} - -static gboolean button_release_event_cb(GtkWidget *widget, GdkEventButton *event, WidgetSurface *surface) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - id delegate = [surface inputDelegate]; - if (delegate != nil) { - if ([delegate respondsToSelector:@selector(mouseReleaseAt:withButton:andMask:)]) { - NSPoint pos = NSMakePoint (event->x, event->y); - MouseButton button = (MouseButton)event->button; - InputMask mask = mask_from_gdk_modifier_state (event->state); - [delegate mouseReleaseAt:pos withButton:button andMask:mask]; - } - } - - [pool drain]; - return FALSE; -} - -static gboolean motion_notify_event_cb(GtkWidget *widget, GdkEventMotion *event, WidgetSurface *surface) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - id delegate = [surface inputDelegate]; - if (delegate != nil) { - if ([delegate respondsToSelector:@selector(mouseMoveTo:withButtons:andMask:)]) { - NSPoint pos = NSMakePoint (event->x, event->y); - MouseButton buttons = buttons_from_gdk_modifier_state (event->state); - InputMask mask = mask_from_gdk_modifier_state (event->state); - [delegate mouseMoveTo:pos withButtons:buttons andMask:mask]; - } - } - - [pool drain]; - return FALSE; -} - -static gboolean key_press_event_cb(GtkWidget *widget, GdkEventKey *event, WidgetSurface *surface) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - id delegate = [surface inputDelegate]; - if (delegate != nil) { - if ([delegate respondsToSelector:@selector(keyPressed:withMask:)]) { - InputMask mask = mask_from_gdk_modifier_state (event->state); - [delegate keyPressed:event->keyval withMask:mask]; - } - } - - [pool drain]; - return FALSE; -} - -static gboolean key_release_event_cb(GtkWidget *widget, GdkEventKey *event, WidgetSurface *surface) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - id delegate = [surface inputDelegate]; - if (delegate != nil) { - if ([delegate respondsToSelector:@selector(keyReleased:withMask:)]) { - InputMask mask = mask_from_gdk_modifier_state (event->state); - [delegate keyReleased:event->keyval withMask:mask]; - } - } - - [pool drain]; - return FALSE; -} - -static gboolean scroll_event_cb (GtkWidget *widget, GdkEventScroll *event, WidgetSurface *surface) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - id delegate = [surface inputDelegate]; - if (delegate != nil) { - if ([delegate respondsToSelector:@selector(mouseScrolledAt:inDirection:withMask:)]) { - NSPoint pos = NSMakePoint (event->x, event->y); - InputMask mask = mask_from_gdk_modifier_state (event->state); - ScrollDirection dir = scroll_dir_from_gdk_scroll_dir (event->direction); - [delegate mouseScrolledAt:pos - inDirection:dir - withMask:mask]; - } - } - - [pool drain]; - return FALSE; -} - -static void unref_cursor (gpointer cursor, GClosure *closure) { - if (cursor != NULL) { - gdk_cursor_unref ((GdkCursor*)cursor); - } -} - -static void set_cursor (GtkWidget *widget, GdkCursor *cursor) { - GdkWindow *window = gtk_widget_get_window (widget); - if (window) { - gdk_window_set_cursor (window, cursor); - if (cursor != NULL) { - gdk_cursor_unref (cursor); - } - } -} -// }}} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/Window.h b/tikzit-1/src/gtk/Window.h deleted file mode 100644 index a3ce8a4..0000000 --- a/tikzit-1/src/gtk/Window.h +++ /dev/null @@ -1,182 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class GraphEditorPanel; -@class Menu; -@class PropertyPane; -@class Preambles; -@class PreambleEditor; -@class PreviewWindow; -@class SettingsDialog; -@class StyleManager; -@class StylesPane; -@class TikzDocument; -@protocol Tool; - -/** - * Manages a document window - */ -@interface Window: NSObject { - // GTK+ widgets - GtkWindow *window; - GtkTextBuffer *tikzBuffer; - GtkStatusbar *statusBar; - GtkPaned *tikzPaneSplitter; - GtkWidget *tikzPane; - - gulong clipboard_handler_id; - GtkTextTag *errorHighlightTag; // owned by tikzBuffer - - // Classes that manage parts of the window - Menu *menu; - GraphEditorPanel *graphPanel; - - PreviewWindow *previewWindow; - - // state variables - BOOL suppressTikzUpdates; - BOOL hasParseError; - - // the document displayed by the window - TikzDocument *document; -} - -/** - * The document displayed by the window - */ -@property (retain) TikzDocument *document; -@property (readonly) BOOL hasFocus; -@property (readonly) GtkWindow *gtkWindow; - -/** - * Create a window with an empty document - */ -- (id) init; -+ (id) window; - -/** - * Create a window with the given document - */ -- (id) initWithDocument:(TikzDocument*)doc; -+ (id) windowWithDocument:(TikzDocument*)doc; - -/** - * Present the window to the user - */ -- (void) present; - -/** - * Open a file, asking the user which file to open - */ -- (void) openFile; -/** - * Open a file - */ -- (BOOL) openFileAtPath:(NSString*)path; -/** - * Save the active document to the path it was opened from - * or last saved to, or ask the user where to save it. - */ -- (BOOL) saveActiveDocument; -/** - * Save the active document, asking the user where to save it. - */ -- (BOOL) saveActiveDocumentAs; -/** - * Save the active document as a shape, asking the user what to name it. - */ -- (void) saveActiveDocumentAsShape; - -/** - * Close the window. - * - * May terminate the application if this is the last window. - * - * Will ask for user confirmation if the document is not saved. - */ -- (void) close; - -/** - * Cut the current selection to the clipboard. - */ -- (void) selectionCutToClipboard; -/** - * Copy the current selection to the clipboard. - */ -- (void) selectionCopyToClipboard; -/** - * Paste from the clipboard to the appropriate place. - */ -- (void) pasteFromClipboard; - -/** - * The GTK+ window that this class manages. - */ -- (GtkWindow*) gtkWindow; -/** - * The menu for the window. - */ -- (Menu*) menu; - -/** - * Present an error to the user - * - * @param error the error to present - */ -- (void) presentError:(NSError*)error; -/** - * Present an error to the user - * - * @param error the error to present - * @param message a message to display with the error - */ -- (void) presentError:(NSError*)error withMessage:(NSString*)message; -/** - * Present an error to the user - * - * @param error the error to present - */ -- (void) presentGError:(GError*)error; -/** - * Present an error to the user - * - * @param error the error to present - * @param message a message to display with the error - */ -- (void) presentGError:(GError*)error withMessage:(NSString*)message; - -- (void) setActiveTool:(id)tool; - -- (void) zoomIn; -- (void) zoomOut; -- (void) zoomReset; - -/** - * Show or update the preview window. - */ -- (void) presentPreview; -/** - * Show or update the preview window without it grabbing focus - */ -- (void) updatePreview; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/Window.m b/tikzit-1/src/gtk/Window.m deleted file mode 100644 index 2d9e63a..0000000 --- a/tikzit-1/src/gtk/Window.m +++ /dev/null @@ -1,991 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "Window.h" - -#import -#import "gtkhelpers.h" -#import "clipboard.h" - -#import "Application.h" -#import "Configuration.h" -#import "FileChooserDialog.h" -#import "GraphEditorPanel.h" -#import "Menu.h" -#import "RecentManager.h" -#import "Shape.h" -#import "SupportDir.h" -#import "TikzDocument.h" - -#ifdef HAVE_POPPLER -#import "PreviewWindow.h" -#endif - -enum { - GraphInfoStatus, - ParseStatus -}; - -// {{{ Internal interfaces -// {{{ Clipboard support - -static void clipboard_provide_data (GtkClipboard *clipboard, - GtkSelectionData *selection_data, - guint info, - gpointer clipboard_graph_data); -static void clipboard_release_data (GtkClipboard *clipboard, gpointer clipboard_graph_data); -static void clipboard_check_targets (GtkClipboard *clipboard, - GdkAtom *atoms, - gint n_atoms, - gpointer action); -static void clipboard_paste_contents (GtkClipboard *clipboard, - GtkSelectionData *selection_data, - gpointer document); - -// }}} -// {{{ Signals - -static void window_toplevel_focus_changed_cb (GObject *gobject, GParamSpec *pspec, Window *window); -static void graph_divider_position_changed_cb (GObject *gobject, GParamSpec *pspec, Window *window); -static void tikz_buffer_changed_cb (GtkTextBuffer *buffer, Window *window); -static gboolean main_window_delete_event_cb (GtkWidget *widget, GdkEvent *event, Window *window); -static void main_window_destroy_cb (GtkWidget *widget, Window *window); -static gboolean main_window_configure_event_cb (GtkWidget *widget, GdkEventConfigure *event, Window *window); -static void update_paste_action (GtkClipboard *clipboard, GdkEvent *event, GtkAction *action); - -// }}} - -@interface Window (Notifications) -- (void) tikzBufferChanged; -- (void) windowSizeChangedWidth:(int)width height:(int)height; -- (void) documentTikzChanged:(NSNotification*)notification; -- (void) documentSelectionChanged:(NSNotification*)notification; -- (void) undoStackChanged:(NSNotification*)notification; -@end - -@interface Window (InitHelpers) -- (void) _loadUi; -- (void) _restoreUiState; -- (void) _connectSignals; -@end - -@interface Window (Private) -- (BOOL) _askCanClose; -/** Open a document, dealing with errors as necessary */ -- (TikzDocument*) _openDocument:(NSString*)path; -- (void) _placeGraphOnClipboard:(Graph*)graph; -- (void) _clearParseError; -- (void) _setParseError:(NSError*)error; -/** Update the window title. */ -- (void) _updateTitle; -/** Update the window status bar default text. */ -- (void) _updateStatus; -/** Update the displayed tikz code to match the active document. */ -- (void) _updateTikz; -/** Update the undo and redo actions to match the active document's - * undo stack. */ -- (void) _updateUndoActions; -- (void) showPreview; -@end - -// }}} -// {{{ API - -@implementation Window - -@synthesize gtkWindow=window; - -- (id) init { - return [self initWithDocument:[TikzDocument documentWithStyleManager:[app styleManager]]]; -} -+ (id) window { - return [[[self alloc] init] autorelease]; -} -- (id) initWithDocument:(TikzDocument*)doc { - self = [super init]; - - if (self) { - [self _loadUi]; - [self _restoreUiState]; - [self _connectSignals]; - - [self setDocument:doc]; - - gtk_widget_show (GTK_WIDGET (window)); - } - - return self; -} -+ (id) windowWithDocument:(TikzDocument*)doc { - return [[[self alloc] initWithDocument:doc] autorelease]; -} - -- (void) dealloc { - // The GTK+ window has already been destroyed at this point - - [[NSNotificationCenter defaultCenter] removeObserver:self]; - g_signal_handler_disconnect ( - gtk_clipboard_get (GDK_SELECTION_CLIPBOARD), - clipboard_handler_id); - - [previewWindow release]; - [menu release]; - [graphPanel release]; - [document release]; - - g_object_unref (tikzBuffer); - g_object_unref (tikzPane); - g_object_unref (tikzPaneSplitter); - g_object_unref (statusBar); - g_object_unref (window); - - [super dealloc]; -} - -- (TikzDocument*) document { - return document; -} -- (void) setDocument:(TikzDocument*)newDoc { - [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:[document pickSupport]]; - [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:document]; - - TikzDocument *oldDoc = document; - document = [newDoc retain]; - - [graphPanel setDocument:document]; - [previewWindow setDocument:document]; - [self _updateTikz]; - [self _updateTitle]; - [self _updateStatus]; - [self _updateUndoActions]; - [menu notifySelectionChanged:[document pickSupport]]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(documentTikzChanged:) - name:@"TikzChanged" object:document]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(undoStackChanged:) - name:@"UndoStackChanged" object:document]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(documentSelectionChanged:) - name:@"NodeSelectionChanged" object:[document pickSupport]]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(documentSelectionChanged:) - name:@"EdgeSelectionChanged" object:[document pickSupport]]; - - if ([document path] != nil) { - [[RecentManager defaultManager] addRecentFile:[document path]]; - } - - NSDictionary *userInfo; - userInfo = [NSDictionary dictionaryWithObjectsAndKeys: - document, @"document", - oldDoc, @"oldDocument", - nil]; - [[NSNotificationCenter defaultCenter] - postNotificationName:@"DocumentChanged" - object:self - userInfo:userInfo]; - [oldDoc release]; -} - -- (BOOL) hasFocus { - return gtk_window_has_toplevel_focus (GTK_WINDOW (window)); -} - -- (void) present { - gtk_window_present (GTK_WINDOW (window)); -} - -- (void) openFile { - FileChooserDialog *dialog = [FileChooserDialog openDialogWithParent:window]; - [dialog addStandardFilters]; - if ([document path]) { - [dialog setCurrentFolder:[[document path] stringByDeletingLastPathComponent]]; - } else if ([app lastOpenFolder]) { - [dialog setCurrentFolder:[app lastOpenFolder]]; - } - - if ([dialog showDialog]) { - if ([self openFileAtPath:[dialog filePath]]) { - [app setLastOpenFolder:[dialog currentFolder]]; - } - } - [dialog destroy]; -} - -- (BOOL) openFileAtPath:(NSString*)path { - TikzDocument *doc = [self _openDocument:path]; - if (doc != nil) { - if (![document hasUnsavedChanges] && [document path] == nil) { - // we just have a fresh, untitled document - replace it - [self setDocument:doc]; - } else { - [app newWindowWithDocument:doc]; - } - return YES; - } - return NO; -} - -- (BOOL) saveActiveDocument { - if ([document path] == nil) { - return [self saveActiveDocumentAs]; - } else { - NSError *error = nil; - if (![document save:&error]) { - [self presentError:error]; - return NO; - } else { - [self _updateTitle]; - return YES; - } - } -} - -- (BOOL) saveActiveDocumentAs { - FileChooserDialog *dialog = [FileChooserDialog saveDialogWithParent:window]; - [dialog addStandardFilters]; - if ([document path] != nil) { - [dialog setCurrentFolder:[[document path] stringByDeletingLastPathComponent]]; - } else if ([app lastSaveAsFolder] != nil) { - [dialog setCurrentFolder:[app lastSaveAsFolder]]; - } - [dialog setSuggestedName:[document suggestedFileName]]; - - BOOL saved = NO; - if ([dialog showDialog]) { - NSString *nfile = [dialog filePath]; - - NSError *error = nil; - if (![document saveToPath:nfile error:&error]) { - [self presentError:error]; - } else { - [self _updateTitle]; - [[RecentManager defaultManager] addRecentFile:nfile]; - [app setLastSaveAsFolder:[dialog currentFolder]]; - saved = YES; - } - } - [dialog destroy]; - return saved; -} - -- (void) saveActiveDocumentAsShape { - GtkWidget *dialog = gtk_dialog_new_with_buttons ( - "Save as shape", - window, - GTK_DIALOG_MODAL, - GTK_STOCK_OK, - GTK_RESPONSE_ACCEPT, - GTK_STOCK_CANCEL, - GTK_RESPONSE_REJECT, - NULL); - GtkBox *content = GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))); - GtkWidget *label1 = gtk_label_new ("Please choose a name for the shape"); - GtkWidget *label2 = gtk_label_new ("Name:"); - GtkWidget *input = gtk_entry_new (); - GtkBox *hbox = GTK_BOX (gtk_hbox_new (FALSE, 5)); - gtk_box_pack_start (hbox, label2, FALSE, TRUE, 0); - gtk_box_pack_start (hbox, input, TRUE, TRUE, 0); - gtk_box_pack_start (content, label1, TRUE, TRUE, 5); - gtk_box_pack_start (content, GTK_WIDGET (hbox), TRUE, TRUE, 5); - gtk_widget_show_all (GTK_WIDGET (content)); - gint response = gtk_dialog_run (GTK_DIALOG (dialog)); - while (response == GTK_RESPONSE_ACCEPT) { - response = GTK_RESPONSE_NONE; - NSDictionary *shapeDict = [Shape shapeDictionary]; - const gchar *dialogInput = gtk_entry_get_text (GTK_ENTRY (input)); - NSString *shapeName = [NSString stringWithUTF8String:dialogInput]; - BOOL doSave = NO; - if ([shapeName isEqual:@""]) { - GtkWidget *emptyStrDialog = gtk_message_dialog_new (window, - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_CLOSE, - "You must specify a shape name"); - gtk_dialog_run (GTK_DIALOG (emptyStrDialog)); - gtk_widget_destroy (emptyStrDialog); - response = gtk_dialog_run (GTK_DIALOG (dialog)); - } else if ([shapeDict objectForKey:shapeName] != nil) { - GtkWidget *overwriteDialog = gtk_message_dialog_new (window, - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_QUESTION, - GTK_BUTTONS_YES_NO, - "Do you want to replace the existing shape named '%s'?", - dialogInput); - gint overwriteResp = gtk_dialog_run (GTK_DIALOG (overwriteDialog)); - gtk_widget_destroy (overwriteDialog); - - if (overwriteResp == GTK_RESPONSE_YES) { - doSave = YES; - } else { - response = gtk_dialog_run (GTK_DIALOG (dialog)); - } - } else { - doSave = YES; - } - if (doSave) { - NSError *error = nil; - NSString *userShapeDir = [[SupportDir userSupportDir] stringByAppendingPathComponent:@"shapes"]; - NSString *file = [NSString stringWithFormat:@"%@/%@.tikz", userShapeDir, shapeName]; - if (![[NSFileManager defaultManager] ensureDirectoryExists:userShapeDir error:&error]) { - [self presentError:error withMessage:@"Could not create user shape directory"]; - } else { - if (![document saveCopyToPath:file error:&error]) { - [self presentError:error withMessage:@"Could not save shape file"]; - } else { - [Shape refreshShapeDictionary]; - } - } - } - } - gtk_widget_destroy (dialog); -} - -- (void) close { - if ([self _askCanClose]) { - gtk_widget_destroy (GTK_WIDGET (window)); - } -} - -- (void) selectionCutToClipboard { - if ([[[document pickSupport] selectedNodes] count] > 0) { - [self _placeGraphOnClipboard:[document selectionCut]]; - } -} - -- (void) selectionCopyToClipboard { - if ([[[document pickSupport] selectedNodes] count] > 0) { - [self _placeGraphOnClipboard:[document selectionCopy]]; - } -} - -- (void) pasteFromClipboard { - gtk_clipboard_request_contents (gtk_clipboard_get (GDK_SELECTION_CLIPBOARD), - tikzit_picture_atom, - clipboard_paste_contents, - document); -} - -- (GtkWindow*) gtkWindow { - return window; -} - -- (Configuration*) mainConfiguration { - return [app mainConfiguration]; -} - -- (Menu*) menu { - return menu; -} - -- (void) presentError:(NSError*)error { - const gchar *errorDesc = "unknown error"; - if (error && [error localizedDescription]) { - errorDesc = [[error localizedDescription] UTF8String]; - } - GtkWidget *dialog = gtk_message_dialog_new (window, - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_CLOSE, - "%s", - errorDesc); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); -} - -- (void) presentError:(NSError*)error withMessage:(NSString*)message { - const gchar *errorDesc = "unknown error"; - if (error && [error localizedDescription]) { - errorDesc = [[error localizedDescription] UTF8String]; - } - GtkWidget *dialog = gtk_message_dialog_new (window, - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_CLOSE, - "%s: %s", - [message UTF8String], - errorDesc); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); -} - -- (void) presentGError:(GError*)error { - const gchar *errorDesc = "unknown error"; - if (error && error->message) { - errorDesc = error->message; - } - GtkWidget *dialog = gtk_message_dialog_new (window, - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_CLOSE, - "%s", - errorDesc); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); -} - -- (void) presentGError:(GError*)error withMessage:(NSString*)message { - const gchar *errorDesc = "unknown error"; - if (error && error->message) { - errorDesc = error->message; - } - GtkWidget *dialog = gtk_message_dialog_new (window, - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_CLOSE, - "%s: %s", - [message UTF8String], - errorDesc); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); -} - -- (void) setActiveTool:(id)tool { - [graphPanel setActiveTool:tool]; - gboolean hasfocus; - g_object_get (G_OBJECT (window), "has-toplevel-focus", &hasfocus, NULL); - if (hasfocus) { - [graphPanel grabTool]; - } -} - -- (void) zoomIn { - [graphPanel zoomIn]; -} - -- (void) zoomOut { - [graphPanel zoomOut]; -} - -- (void) zoomReset { - [graphPanel zoomReset]; -} - -- (void) presentPreview { -#ifdef HAVE_POPPLER - if (previewWindow == nil) { - previewWindow = [[PreviewWindow alloc] initWithPreambles:[app preambles] - config:[app mainConfiguration]]; - //[previewWindow setParentWindow:self]; - [previewWindow setDocument:document]; - } - [previewWindow present]; -#endif -} - -- (void) updatePreview { -#ifdef HAVE_POPPLER - if (previewWindow == nil) { - previewWindow = [[PreviewWindow alloc] initWithPreambles:[app preambles] - config:[app mainConfiguration]]; - //[previewWindow setParentWindow:self]; - [previewWindow setDocument:document]; - } - [previewWindow show]; -#endif -} - -@end - -// }}} -// {{{ Notifications - -@implementation Window (Notifications) -- (void) graphHeightChanged:(int)newHeight { - [[app mainConfiguration] setIntegerEntry:@"graphHeight" - inGroup:@"window" - value:newHeight]; -} - -- (void) tikzBufferChanged { - if (!suppressTikzUpdates) { - suppressTikzUpdates = TRUE; - - GtkTextIter start, end; - gtk_text_buffer_get_bounds (tikzBuffer, &start, &end); - gchar *text = gtk_text_buffer_get_text (tikzBuffer, &start, &end, FALSE); - - NSError *error = nil; - BOOL success = [document updateTikz:[NSString stringWithUTF8String:text] error:&error]; - if (success) - [self _clearParseError]; - else - [self _setParseError:error]; - - g_free (text); - - suppressTikzUpdates = FALSE; - } -} - -- (void) windowSizeChangedWidth:(int)width height:(int)height { - if (width > 0 && height > 0) { - NSNumber *w = [NSNumber numberWithInt:width]; - NSNumber *h = [NSNumber numberWithInt:height]; - NSMutableArray *size = [NSMutableArray arrayWithCapacity:2]; - [size addObject:w]; - [size addObject:h]; - [[app mainConfiguration] setIntegerListEntry:@"windowSize" - inGroup:@"window" - value:size]; - } -} - -- (void) documentTikzChanged:(NSNotification*)notification { - [self _updateTitle]; - [self _updateTikz]; -} - -- (void) documentSelectionChanged:(NSNotification*)notification { - [self _updateStatus]; - [menu notifySelectionChanged:[document pickSupport]]; -} - -- (void) undoStackChanged:(NSNotification*)notification { - [self _updateUndoActions]; -} -@end - -// }}} -// {{{ InitHelpers - -@implementation Window (InitHelpers) - -- (void) _loadUi { - window = GTK_WINDOW (gtk_window_new (GTK_WINDOW_TOPLEVEL)); - g_object_ref_sink (window); - gtk_window_set_title (window, "TikZiT"); - gtk_window_set_default_size (window, 700, 400); - - GtkBox *mainLayout = GTK_BOX (gtk_vbox_new (FALSE, 0)); - gtk_widget_show (GTK_WIDGET (mainLayout)); - gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (mainLayout)); - - menu = [[Menu alloc] initForWindow:self]; - - GtkWidget *menubar = [menu menubar]; - gtk_box_pack_start (mainLayout, menubar, FALSE, TRUE, 0); - gtk_box_reorder_child (mainLayout, menubar, 0); - gtk_widget_show (menubar); - - tikzPaneSplitter = GTK_PANED (gtk_vpaned_new ()); - g_object_ref_sink (tikzPaneSplitter); - gtk_widget_show (GTK_WIDGET (tikzPaneSplitter)); - gtk_box_pack_start (mainLayout, GTK_WIDGET (tikzPaneSplitter), TRUE, TRUE, 0); - - graphPanel = [[GraphEditorPanel alloc] initWithDocument:document]; - [graphPanel setPreviewHandler:self]; - GtkWidget *graphEditorWidget = [graphPanel widget]; - gtk_widget_show (graphEditorWidget); - GtkWidget *graphFrame = gtk_frame_new (NULL); - gtk_container_add (GTK_CONTAINER (graphFrame), graphEditorWidget); - gtk_widget_show (graphFrame); - gtk_paned_pack1 (tikzPaneSplitter, graphFrame, TRUE, TRUE); - - tikzBuffer = gtk_text_buffer_new (NULL); - g_object_ref_sink (tikzBuffer); - errorHighlightTag = gtk_text_buffer_create_tag ( - tikzBuffer, NULL, - "foreground", "#d40000", - "foreground-set", TRUE, - "weight", PANGO_WEIGHT_SEMIBOLD, - "weight-set", TRUE, - NULL); - GtkWidget *tikzScroller = gtk_scrolled_window_new (NULL, NULL); - gtk_widget_show (tikzScroller); - - tikzPane = gtk_text_view_new_with_buffer (tikzBuffer); - gtk_text_view_set_left_margin (GTK_TEXT_VIEW (tikzPane), 3); - gtk_text_view_set_right_margin (GTK_TEXT_VIEW (tikzPane), 3); - g_object_ref_sink (tikzPane); - gtk_widget_show (tikzPane); - gtk_container_add (GTK_CONTAINER (tikzScroller), tikzPane); - GtkWidget *tikzFrame = gtk_frame_new (NULL); - gtk_container_add (GTK_CONTAINER (tikzFrame), tikzScroller); - gtk_widget_show (tikzFrame); - gtk_paned_pack2 (tikzPaneSplitter, tikzFrame, FALSE, TRUE); - - statusBar = GTK_STATUSBAR (gtk_statusbar_new ()); - g_object_ref_sink (statusBar); - gtk_widget_show (GTK_WIDGET (statusBar)); - gtk_box_pack_start (mainLayout, GTK_WIDGET (statusBar), FALSE, TRUE, 0); - - GtkClipboard *clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); - update_paste_action (clipboard, NULL, [menu pasteAction]); -} - -- (void) _restoreUiState { - Configuration *config = [app mainConfiguration]; - NSArray *windowSize = [config integerListEntry:@"windowSize" - inGroup:@"window"]; - if (windowSize && [windowSize count] == 2) { - gint width = [[windowSize objectAtIndex:0] intValue]; - gint height = [[windowSize objectAtIndex:1] intValue]; - if (width > 0 && height > 0) { - gtk_window_set_default_size (window, width, height); - } - } - int panePos = [config integerEntry:@"graphHeight" - inGroup:@"window"]; - if (panePos > 0) { - gtk_paned_set_position (tikzPaneSplitter, panePos); - } -} - -- (void) _connectSignals { - GtkClipboard *clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); - clipboard_handler_id = - g_signal_connect (G_OBJECT (clipboard), - "owner-change", - G_CALLBACK (update_paste_action), - [menu pasteAction]); - g_signal_connect (G_OBJECT (window), - "key-press-event", - G_CALLBACK (tz_hijack_key_press), - NULL); - g_signal_connect (G_OBJECT (window), - "notify::has-toplevel-focus", - G_CALLBACK (window_toplevel_focus_changed_cb), - self); - g_signal_connect (G_OBJECT (tikzPaneSplitter), - "notify::position", - G_CALLBACK (graph_divider_position_changed_cb), - self); - g_signal_connect (G_OBJECT (tikzBuffer), - "changed", - G_CALLBACK (tikz_buffer_changed_cb), - self); - g_signal_connect (G_OBJECT (window), - "delete-event", - G_CALLBACK (main_window_delete_event_cb), - self); - g_signal_connect (G_OBJECT (window), - "destroy", - G_CALLBACK (main_window_destroy_cb), - self); - g_signal_connect (G_OBJECT (window), - "configure-event", - G_CALLBACK (main_window_configure_event_cb), - self); -} -@end - -// }}} -// {{{ Private - -@implementation Window (Private) - -- (BOOL) _askCanClose { - if ([document hasUnsavedChanges]) { - GtkWidget *dialog = gtk_message_dialog_new (window, - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_QUESTION, - GTK_BUTTONS_NONE, - "Save changes to the document \"%s\" before closing?", - [[document name] UTF8String]); - gtk_dialog_add_buttons (GTK_DIALOG (dialog), - "Save", GTK_RESPONSE_YES, - "Don't save", GTK_RESPONSE_NO, - "Cancel", GTK_RESPONSE_CANCEL, - NULL); - gint result = gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - if (result == GTK_RESPONSE_YES) { - return [self saveActiveDocument]; - } else { - return result == GTK_RESPONSE_NO; - } - } else { - return YES; - } -} - -- (TikzDocument*) _openDocument:(NSString*)path { - NSError *error = nil; - TikzDocument *d = [TikzDocument documentFromFile:path - styleManager:[app styleManager] - error:&error]; - if (d != nil) { - return d; - } else { - if ([error code] == TZ_ERR_PARSE) { - [self presentError:error withMessage:@"Invalid file"]; - } else { - [self presentError:error withMessage:@"Could not open file"]; - } - [[RecentManager defaultManager] removeRecentFile:path]; - return nil; - } -} - -- (void) _placeGraphOnClipboard:(Graph*)graph { - GtkClipboard *clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); - - static const GtkTargetEntry targets[] = { - { "TIKZITPICTURE", 0, TARGET_TIKZIT_PICTURE }, - { "UTF8_STRING", 0, TARGET_UTF8_STRING } }; - - gtk_clipboard_set_with_data (clipboard, - targets, G_N_ELEMENTS (targets), - clipboard_provide_data, - clipboard_release_data, - clipboard_graph_data_new (graph)); -} - -- (void) _clearParseError { - if (!hasParseError) - return; - gtk_statusbar_pop (statusBar, ParseStatus); - text_buffer_clear_tag (tikzBuffer, errorHighlightTag); - widget_clear_error (tikzPane); - hasParseError = NO; -} - -- (void) _setParseError:(NSError*)error { - if (!hasParseError) { - widget_set_error (tikzPane); - hasParseError = YES; - } - NSString *message = [NSString stringWithFormat:@"Parse error: %@", [error localizedDescription]]; - gtk_statusbar_pop (statusBar, ParseStatus); - gtk_statusbar_push (statusBar, ParseStatus, [message UTF8String]); - - text_buffer_clear_tag (tikzBuffer, errorHighlightTag); - - NSDictionary *errorInfo = [error userInfo]; - if ([errorInfo objectForKey:@"startLine"] != nil) { - GtkTextIter symbolStart; - GtkTextIter symbolEnd; - gtk_text_buffer_get_iter_at_line_index (tikzBuffer, &symbolStart, - [[errorInfo objectForKey:@"startLine"] intValue] - 1, - [[errorInfo objectForKey:@"startColumn"] intValue] - 1); - gtk_text_buffer_get_iter_at_line_index (tikzBuffer, &symbolEnd, - [[errorInfo objectForKey:@"endLine"] intValue] - 1, - [[errorInfo objectForKey:@"endColumn"] intValue]); - gtk_text_buffer_apply_tag (tikzBuffer, errorHighlightTag, - &symbolStart, &symbolEnd); - } -} - -- (void) _updateUndoActions { - [menu setUndoActionEnabled:[document canUndo]]; - [menu setUndoActionDetail:[document undoName]]; - - [menu setRedoActionEnabled:[document canRedo]]; - [menu setRedoActionDetail:[document redoName]]; -} - -- (void) _updateTitle { - NSString *title = [NSString stringWithFormat:@"TikZiT - %@%s", - [document name], - ([document hasUnsavedChanges] ? "*" : "")]; - gtk_window_set_title(window, [title UTF8String]); -} - -- (void) _updateStatus { - // FIXME: show tooltips or something instead - GString *buffer = g_string_sized_new (30); - gchar *nextNode = 0; - - for (Node *n in [[document pickSupport] selectedNodes]) { - if (nextNode) { - if (buffer->len == 0) { - g_string_printf(buffer, "Nodes %s", nextNode); - } else { - g_string_append_printf(buffer, ", %s", nextNode); - } - } - nextNode = (gchar *)[[n name] UTF8String]; - } - if (nextNode) { - if (buffer->len == 0) { - g_string_printf(buffer, "Node %s is selected", nextNode); - } else { - g_string_append_printf(buffer, " and %s are selected", nextNode); - } - } - - if (buffer->len == 0) { - int nrNodes = [[[document graph] nodes] count]; - int nrEdges = [[[document graph] edges] count]; - g_string_printf(buffer, "Graph has %d node%s and %d edge%s", - nrNodes, - nrNodes!=1 ? "s" : "", - nrEdges, - nrEdges!=1 ? "s" : ""); - } - gtk_statusbar_pop(statusBar, GraphInfoStatus); - gtk_statusbar_push(statusBar, GraphInfoStatus, buffer->str); - - g_string_free (buffer, TRUE); -} - -- (void) _updateTikz { - if (document != nil && !suppressTikzUpdates) { - suppressTikzUpdates = TRUE; - - if (document != nil) { - const char *tikzString = [[document tikz] UTF8String]; - gtk_text_buffer_set_text (tikzBuffer, tikzString, -1); - } else { - gtk_text_buffer_set_text (tikzBuffer, "", -1); - } - [self _clearParseError]; - - suppressTikzUpdates = FALSE; - } -} - -- (GraphEditorPanel*) _graphPanel { - return graphPanel; -} - -- (void) showPreview { - [self updatePreview]; -} - -@end - -// }}} -// {{{ GTK+ callbacks - -static void window_toplevel_focus_changed_cb (GObject *gobject, GParamSpec *pspec, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - gboolean hasfocus; - g_object_get (gobject, "has-toplevel-focus", &hasfocus, NULL); - if (hasfocus) { - [[NSNotificationCenter defaultCenter] - postNotificationName:@"WindowGainedFocus" - object:window]; - [[window _graphPanel] grabTool]; - } else { - [[NSNotificationCenter defaultCenter] - postNotificationName:@"WindowLostFocus" - object:window]; - } - [pool drain]; -} - -static void graph_divider_position_changed_cb (GObject *gobject, GParamSpec *pspec, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - gint position; - g_object_get (gobject, "position", &position, NULL); - [window graphHeightChanged:position]; - [pool drain]; -} - -static void tikz_buffer_changed_cb (GtkTextBuffer *buffer, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window tikzBufferChanged]; - [pool drain]; -} - -static gboolean main_window_delete_event_cb (GtkWidget *widget, GdkEvent *event, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window close]; - [pool drain]; - return TRUE; -} - -static void main_window_destroy_cb (GtkWidget *widget, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [[NSNotificationCenter defaultCenter] postNotificationName:@"WindowClosed" - object:window]; - [pool drain]; -} - -static gboolean main_window_configure_event_cb (GtkWidget *widget, GdkEventConfigure *event, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window windowSizeChangedWidth:event->width height:event->height]; - [pool drain]; - return FALSE; -} - -static void clipboard_provide_data (GtkClipboard *clipboard, - GtkSelectionData *selection_data, - guint info, - gpointer clipboard_graph_data) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - ClipboardGraphData *data = (ClipboardGraphData*)clipboard_graph_data; - if (info == TARGET_UTF8_STRING || info == TARGET_TIKZIT_PICTURE) { - clipboard_graph_data_convert (data); - GdkAtom target = (info == TARGET_UTF8_STRING) ? utf8_atom : tikzit_picture_atom; - gtk_selection_data_set (selection_data, - target, - 8*sizeof(gchar), - (guchar*)data->tikz, - data->tikz_length); - } - - [pool drain]; -} - -static void clipboard_release_data (GtkClipboard *clipboard, gpointer data) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - clipboard_graph_data_free ((ClipboardGraphData*)data); - [pool drain]; -} - -static void clipboard_check_targets (GtkClipboard *clipboard, - GdkAtom *atoms, - gint n_atoms, - gpointer action) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - gboolean found = FALSE; - for (gint i = 0; i < n_atoms; ++i) { - if (atoms[i] == tikzit_picture_atom) { - found = TRUE; - break; - } - } - gtk_action_set_sensitive (GTK_ACTION (action), found); - - [pool drain]; -} - -static void update_paste_action (GtkClipboard *clipboard, GdkEvent *event, GtkAction *action) { - gtk_action_set_sensitive (action, FALSE); - gtk_clipboard_request_targets (clipboard, clipboard_check_targets, action); -} - -static void clipboard_paste_contents (GtkClipboard *clipboard, - GtkSelectionData *selection_data, - gpointer document) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - TikzDocument *doc = (TikzDocument*)document; - gint length = gtk_selection_data_get_length (selection_data); - if (length >= 0) { - const guchar *raw_data = gtk_selection_data_get_data (selection_data); - gchar *data = g_new (gchar, length+1); - g_strlcpy (data, (const gchar *)raw_data, length+1); - NSString *tikz = [NSString stringWithUTF8String:data]; - if (tikz != nil) { - [doc pasteFromTikz:tikz]; - } - g_free (data); - } - - [pool drain]; -} - -// }}} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/cairo_helpers.h b/tikzit-1/src/gtk/cairo_helpers.h deleted file mode 100644 index e95357b..0000000 --- a/tikzit-1/src/gtk/cairo_helpers.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "RColor.h" -#import - -void cairo_ns_rectangle (cairo_t* cr, NSRect rect); -void cairo_set_source_rcolor (cairo_t* cr, RColor color); - -// vim:ft=objc:sts=4:sw=4:et diff --git a/tikzit-1/src/gtk/cairo_helpers.m b/tikzit-1/src/gtk/cairo_helpers.m deleted file mode 100644 index 104e686..0000000 --- a/tikzit-1/src/gtk/cairo_helpers.m +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "cairo_helpers.h" - -void cairo_ns_rectangle (cairo_t* cr, NSRect rect) { - cairo_rectangle (cr, rect.origin.x, rect.origin.y, rect.size.width, rect.size.height); -} - -void cairo_set_source_rcolor (cairo_t* cr, RColor color) { - cairo_set_source_rgba (cr, color.red, color.green, color.blue, color.alpha); -} - -// vim:ft=objc:sts=4:sw=4:et diff --git a/tikzit-1/src/gtk/clipboard.h b/tikzit-1/src/gtk/clipboard.h deleted file mode 100644 index 568fc50..0000000 --- a/tikzit-1/src/gtk/clipboard.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import -#import - -enum { - TARGET_UTF8_STRING, - TARGET_TIKZIT_PICTURE -}; -typedef struct -{ - Graph *graph; - gchar *tikz; - gint tikz_length; -} ClipboardGraphData; - -extern GdkAtom utf8_atom; -extern GdkAtom tikzit_picture_atom; - -void clipboard_init (); -ClipboardGraphData *clipboard_graph_data_new (Graph *graph); -void clipboard_graph_data_free (ClipboardGraphData *data); -void clipboard_graph_data_convert (ClipboardGraphData *data); - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/clipboard.m b/tikzit-1/src/gtk/clipboard.m deleted file mode 100644 index 7001717..0000000 --- a/tikzit-1/src/gtk/clipboard.m +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "clipboard.h" - -GdkAtom utf8_atom; -GdkAtom tikzit_picture_atom; - -void clipboard_init () { - if (utf8_atom == GDK_NONE) { - utf8_atom = gdk_atom_intern ("UTF8_STRING", FALSE); - } - if (tikzit_picture_atom == GDK_NONE) { - tikzit_picture_atom = gdk_atom_intern ("TIKZITPICTURE", FALSE); - } -} - -ClipboardGraphData *clipboard_graph_data_new (Graph *graph) { - ClipboardGraphData *data = g_new (ClipboardGraphData, 1); - data->graph = [graph retain]; - data->tikz = NULL; - data->tikz_length = 0; - return data; -} - -void clipboard_graph_data_free (ClipboardGraphData *data) { - [data->graph release]; - if (data->tikz) { - g_free (data->tikz); - } - g_free (data); -} - -void clipboard_graph_data_convert (ClipboardGraphData *data) { - if (data->graph != nil && !data->tikz) { - data->tikz = g_strdup ([[data->graph tikz] UTF8String]); - data->tikz_length = strlen (data->tikz); - [data->graph release]; - data->graph = nil; - } -} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/gtkhelpers.h b/tikzit-1/src/gtk/gtkhelpers.h deleted file mode 100644 index e4b79b8..0000000 --- a/tikzit-1/src/gtk/gtkhelpers.h +++ /dev/null @@ -1,60 +0,0 @@ -// -// gtkhelpers.h -// TikZiT -// -// Copyright 2010 Alex Merry. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// -#import "TZFoundation.h" -#include -#import - -/** - * Releases the Objective-C object pointed to by data - * - * Intended for use as a cleanup function in Glib/GObject-based - * code. - */ -void release_obj (gpointer data); - -NSString * gtk_editable_get_string (GtkEditable *editable, gint start, gint end); - -GdkRectangle gdk_rectangle_from_ns_rect (NSRect rect); -NSRect gdk_rectangle_to_ns_rect (GdkRectangle rect); - -void gtk_action_set_detailed_label (GtkAction *action, const gchar *baseLabel, const gchar *actionName); - -gint tz_hijack_key_press (GtkWindow *win, - GdkEventKey *event, - gpointer user_data); - -// Equivalent of GTK+3's gdk_pixbuf_get_from_surface() -GdkPixbuf * pixbuf_get_from_surface(cairo_surface_t *surface); - -void tz_restore_window (GtkWindow *window, gint x, gint y, gint w, gint h); - -void label_set_bold (GtkLabel *label); - -void widget_set_error (GtkWidget *widget); -void widget_clear_error (GtkWidget *widget); - -void text_buffer_clear_tag (GtkTextBuffer *buffer, GtkTextTag *tag); - -void utility_window_attach (GtkWindow *util_win, GtkWindow *parent_win); - -// vim:ft=objc:sts=2:sw=2:et diff --git a/tikzit-1/src/gtk/gtkhelpers.m b/tikzit-1/src/gtk/gtkhelpers.m deleted file mode 100644 index 9d26af5..0000000 --- a/tikzit-1/src/gtk/gtkhelpers.m +++ /dev/null @@ -1,275 +0,0 @@ -// -// gtkhelpers.h -// TikZiT -// -// Copyright 2010 Alex Merry. All rights reserved. -// -// Some code from Glade: -// Copyright 2001 Ximian, Inc. -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// -#import "gtkhelpers.h" -#import - -void release_obj (gpointer data) { - id obj = (id)data; - [obj release]; -} - -NSString * gtk_editable_get_string (GtkEditable *editable, gint start, gint end) -{ - gchar *text = gtk_editable_get_chars (editable, start, end); - NSString *string = [NSString stringWithUTF8String:text]; - g_free (text); - return string; -} - -GdkRectangle gdk_rectangle_from_ns_rect (NSRect box) { - GdkRectangle rect; - rect.x = box.origin.x; - rect.y = box.origin.y; - rect.width = box.size.width; - rect.height = box.size.height; - return rect; -} - -NSRect gdk_rectangle_to_ns_rect (GdkRectangle rect) { - NSRect result; - result.origin.x = rect.x; - result.origin.y = rect.y; - result.size.width = rect.width; - result.size.height = rect.height; - return result; -} - -void gtk_action_set_detailed_label (GtkAction *action, const gchar *baseLabel, const gchar *actionName) { - if (actionName == NULL || *actionName == '\0') { - gtk_action_set_label (action, baseLabel); - } else { - GString *label = g_string_sized_new (30); - g_string_printf(label, "%s: %s", baseLabel, actionName); - gtk_action_set_label (action, label->str); - g_string_free (label, TRUE); - } -} - -/** - * tz_hijack_key_press: - * @win: a #GtkWindow - * event: the GdkEventKey - * user_data: unused - * - * This function is meant to be attached to key-press-event of a toplevel, - * it simply allows the window contents to treat key events /before/ - * accelerator keys come into play (this way widgets dont get deleted - * when cutting text in an entry etc.). - * - * Returns: whether the event was handled - */ -gint -tz_hijack_key_press (GtkWindow *win, - GdkEventKey *event, - gpointer user_data) -{ - GtkWidget *focus_widget; - - focus_widget = gtk_window_get_focus (win); - if (focus_widget && - (event->keyval == GDK_Delete || /* Filter Delete from accelerator keys */ - ((event->state & GDK_CONTROL_MASK) && /* CTRL keys... */ - ((event->keyval == GDK_c || event->keyval == GDK_C) || /* CTRL-C (copy) */ - (event->keyval == GDK_x || event->keyval == GDK_X) || /* CTRL-X (cut) */ - (event->keyval == GDK_v || event->keyval == GDK_V) || /* CTRL-V (paste) */ - (event->keyval == GDK_a || event->keyval == GDK_A) || /* CTRL-A (select-all) */ - (event->keyval == GDK_n || event->keyval == GDK_N))))) /* CTRL-N (new document) ?? */ - { - return gtk_widget_event (focus_widget, - (GdkEvent *)event); - } - return FALSE; -} - -GdkPixbuf * pixbuf_get_from_surface(cairo_surface_t *surface) { - cairo_surface_flush (surface); - - int width = cairo_image_surface_get_width (surface); - int height = cairo_image_surface_get_height (surface); - int stride = cairo_image_surface_get_stride (surface); - unsigned char *data = cairo_image_surface_get_data (surface); - - GdkPixbuf *pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, - TRUE, - 8, - width, - height); - unsigned char *pbdata = gdk_pixbuf_get_pixels (pixbuf); - int pbstride = gdk_pixbuf_get_rowstride (pixbuf); - - for (int y = 0; y < height; ++y) { - uint32_t *line = (uint32_t*)(data + y*stride); - unsigned char *pbline = pbdata + (y*pbstride); - for (int x = 0; x < width; ++x) { - uint32_t pixel = *(line + x); - unsigned char *pbpixel = pbline + (x*4); - // NB: We should un-pre-mult the alpha here. - // However, in our world, alpha is always - // on or off, so it doesn't really matter - pbpixel[3] = ((pixel & 0xff000000) >> 24); - pbpixel[0] = ((pixel & 0x00ff0000) >> 16); - pbpixel[1] = ((pixel & 0x0000ff00) >> 8); - pbpixel[2] = (pixel & 0x000000ff); - } - } - - return pixbuf; -} - -/* This function mostly lifted from - * gtk+/gdk/gdkscreen.c:gdk_screen_get_monitor_at_window() - */ -static gint -get_appropriate_monitor (GdkScreen *screen, - gint x, - gint y, - gint w, - gint h) -{ - GdkRectangle rect; - gint area = 0; - gint monitor = -1; - gint num_monitors; - gint i; - - rect.x = x; - rect.y = y; - rect.width = w; - rect.height = h; - - num_monitors = gdk_screen_get_n_monitors (screen); - - for (i = 0; i < num_monitors; i++) - { - GdkRectangle geometry; - - gdk_screen_get_monitor_geometry (screen, i, &geometry); - - if (gdk_rectangle_intersect (&rect, &geometry, &geometry) && - geometry.width * geometry.height > area) - { - area = geometry.width * geometry.height; - monitor = i; - } - } - - if (monitor >= 0) - return monitor; - else - return gdk_screen_get_monitor_at_point (screen, - rect.x + rect.width / 2, - rect.y + rect.height / 2); -} - -/* This function mostly lifted from gimp_session_info_apply_geometry - * in gimp-2.6/app/widgets/gimpsessioninfo.c - */ -void tz_restore_window (GtkWindow *window, gint x, gint y, gint w, gint h) -{ - gint forced_w = w; - gint forced_h = h; - if (w <= 0 || h <= 0) { - gtk_window_get_default_size (window, &w, &h); - } - if (w <= 0 || h <= 0) { - gtk_window_get_size (window, &w, &h); - } - - GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET (window)); - - gint monitor = 0; - if (w > 0 && h > 0) { - monitor = get_appropriate_monitor (screen, x, y, w, h); - } else { - monitor = gdk_screen_get_monitor_at_point (screen, x, y); - } - - GdkRectangle rect; - gdk_screen_get_monitor_geometry (screen, monitor, &rect); - - x = CLAMP (x, - rect.x, - rect.x + rect.width - (w > 0 ? w : 128)); - y = CLAMP (y, - rect.y, - rect.y + rect.height - (h > 0 ? h : 128)); - - gchar geom[32]; - g_snprintf (geom, sizeof (geom), "%+d%+d", x, y); - - gtk_window_parse_geometry (window, geom); - - if (forced_w > 0 && forced_h > 0) { - gtk_window_set_default_size (window, forced_w, forced_h); - } -} - -void label_set_bold (GtkLabel *label) { - PangoAttrList *attrs = pango_attr_list_new (); - pango_attr_list_insert (attrs, - pango_attr_weight_new (PANGO_WEIGHT_SEMIBOLD)); - gtk_label_set_attributes (label, attrs); - pango_attr_list_unref (attrs); -} - -void widget_set_error (GtkWidget *widget) { - GdkColor color = {0, 65535, 61184, 61184}; - gtk_widget_modify_base (widget, GTK_STATE_NORMAL, &color); -} - -void widget_clear_error (GtkWidget *widget) { - gtk_widget_modify_base (widget, GTK_STATE_NORMAL, NULL); -} - -void text_buffer_clear_tag (GtkTextBuffer *buffer, GtkTextTag *tag) { - GtkTextIter start; - GtkTextIter end; - gtk_text_buffer_get_start_iter (buffer, &start); - gtk_text_buffer_get_end_iter (buffer, &end); - gtk_text_buffer_remove_tag (buffer, tag, &start, &end); -} - -void utility_window_attach (GtkWindow *util_win, GtkWindow *parent_win) { - if (parent_win == gtk_window_get_transient_for (util_win)) - return; - - // HACK: X window managers tend to move windows around when they are - // unmapped and mapped again, so we save the position - gint x, y; - gtk_window_get_position (util_win, &x, &y); - - // HACK: Altering WM_TRANSIENT_FOR on a non-hidden but unmapped window - // (eg: when you have minimised the original parent window) can - // cause the window to be lost forever, so we hide it first - gtk_widget_hide (GTK_WIDGET (util_win)); - gtk_window_set_focus_on_map (util_win, FALSE); - gtk_window_set_transient_for (util_win, parent_win); - gtk_widget_show (GTK_WIDGET (util_win)); - - // HACK: see above - gtk_window_move (util_win, x, y); -} - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/logo.h b/tikzit-1/src/gtk/logo.h deleted file mode 100644 index e778da9..0000000 --- a/tikzit-1/src/gtk/logo.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include - -typedef enum { - LOGO_SIZE_16, - LOGO_SIZE_24, - LOGO_SIZE_32, - LOGO_SIZE_48, - LOGO_SIZE_64, - LOGO_SIZE_128, - LOGO_SIZE_COUNT -} LogoSize; - -GdkPixbuf *get_logo (LogoSize size); - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/logo.m b/tikzit-1/src/gtk/logo.m deleted file mode 100644 index 57533c7..0000000 --- a/tikzit-1/src/gtk/logo.m +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "logo.h" -#include - -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wpointer-sign" -#import "logodata.m" -#pragma GCC diagnostic pop - -static GdkPixbuf *pixbufCache[LOGO_SIZE_COUNT]; - -GdkPixbuf *get_logo (LogoSize size) { - const GdkPixdata *data = NULL; - switch (size) { - case LOGO_SIZE_16: - data = &logo16; - break; - case LOGO_SIZE_24: - data = &logo24; - break; - case LOGO_SIZE_32: - data = &logo32; - break; - case LOGO_SIZE_48: - data = &logo48; - break; - case LOGO_SIZE_64: - data = &logo64; - break; - case LOGO_SIZE_128: - data = &logo128; - break; - default: - return NULL; - }; - if (pixbufCache[size]) { - g_object_ref (pixbufCache[size]); - return pixbufCache[size]; - } else { - GdkPixbuf *buf = gdk_pixbuf_from_pixdata (data, FALSE, NULL); - pixbufCache[size] = buf; - g_object_add_weak_pointer (G_OBJECT (buf), (void**)(&(pixbufCache[size]))); - return buf; - } -} - -// vim:ft=objc:ts=8:et:sts=4:sw=4 - diff --git a/tikzit-1/src/gtk/main.m b/tikzit-1/src/gtk/main.m deleted file mode 100644 index 5d9f4a4..0000000 --- a/tikzit-1/src/gtk/main.m +++ /dev/null @@ -1,111 +0,0 @@ -// -// main.m -// TikZiT -// -// Copyright 2010 Chris Heunen. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "TZFoundation.h" -#import -#import "clipboard.h" -#import "logo.h" -#import "tzstockitems.h" - -#import "Application.h" - -static GOptionEntry entries[] = -{ - //{ "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose, "Be verbose", NULL }, - { NULL } -}; - -void onUncaughtException(NSException* exception) -{ - NSString *joinStr = @"\n "; - NSLog(@"uncaught exception: %@\n backtrace: %@", - [exception description], - [[exception callStackSymbols] componentsJoinedByString:joinStr]); -} - -int main (int argc, char *argv[]) { - NSSetUncaughtExceptionHandler(&onUncaughtException); - - [[NSAutoreleasePool alloc] init]; - - GError *error = NULL; - GOptionContext *context; - context = g_option_context_new ("[FILES] - PGF/TikZ-based graph editor"); - g_option_context_add_main_entries (context, entries, NULL); - g_option_context_add_group (context, gtk_get_option_group (TRUE)); - if (!g_option_context_parse (context, &argc, &argv, &error)) - { - if (error->domain == G_OPTION_ERROR) { - g_print ("%s\nUse --help to see available options\n", error->message); - } else { - g_print ("Unexpected error parsing options: %s\n", error->message); - } - exit (1); - } - g_option_context_free (context); - -#ifndef WINDOWS - GList *icon_list = NULL; - icon_list = g_list_prepend (icon_list, get_logo(LOGO_SIZE_128)); - icon_list = g_list_prepend (icon_list, get_logo(LOGO_SIZE_64)); - icon_list = g_list_prepend (icon_list, get_logo(LOGO_SIZE_48)); - icon_list = g_list_prepend (icon_list, get_logo(LOGO_SIZE_32)); - icon_list = g_list_prepend (icon_list, get_logo(LOGO_SIZE_24)); - icon_list = g_list_prepend (icon_list, get_logo(LOGO_SIZE_16)); - gtk_window_set_default_icon_list (icon_list); - GList *list_head = icon_list; - while (list_head) { - g_object_unref ((GObject*)list_head->data); - list_head = list_head->next; - } -#endif - - NSAutoreleasePool *initPool = [[NSAutoreleasePool alloc] init]; - - tz_register_stock_items(); - clipboard_init(); - - Application *app = nil; - if (argc > 1) { - NSMutableArray *files = [NSMutableArray arrayWithCapacity:argc-1]; - for (int i = 1; i < argc; ++i) { - [files insertObject:[NSString stringWithGlibFilename:argv[i]] - atIndex:i-1]; - } - NSLog(@"Files: %@", files); - app = [[Application alloc] initWithFiles:files]; - } else { - app = [[Application alloc] init]; - } - - [initPool drain]; - - gtk_main (); - - [app saveConfiguration]; - [app release]; - - return 0; -} - -// vim:ft=objc:et:sts=4:sw=4 diff --git a/tikzit-1/src/gtk/mkdtemp.h b/tikzit-1/src/gtk/mkdtemp.h deleted file mode 100644 index 65ee99e..0000000 --- a/tikzit-1/src/gtk/mkdtemp.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Creating a private temporary directory. - Copyright (C) 2001-2002 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - -#if HAVE_MKDTEMP - -/* Get mkdtemp() declaration. */ -#include - -#else - -/* Create a unique temporary directory from TEMPLATE. - The last six characters of TEMPLATE must be "XXXXXX"; - they are replaced with a string that makes the directory name unique. - Returns TEMPLATE, or a null pointer if it cannot get a unique name. - The directory is created mode 700. */ -extern char * mkdtemp (char *template); - -#endif diff --git a/tikzit-1/src/gtk/mkdtemp.m b/tikzit-1/src/gtk/mkdtemp.m deleted file mode 100644 index ee3cd7c..0000000 --- a/tikzit-1/src/gtk/mkdtemp.m +++ /dev/null @@ -1,180 +0,0 @@ -/* Copyright (C) 1999, 2001-2003 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - see . - */ - -/* Extracted from misc/mkdtemp.c and sysdeps/posix/tempname.c. */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -/* Specification. */ -#include "mkdtemp.h" - -#include -#ifndef __set_errno -# define __set_errno(Val) errno = (Val) -#endif - -#include -#include -#include - -#include -#ifndef TMP_MAX -# define TMP_MAX 238328 -#endif - -#if HAVE_STDINT_H || _LIBC -# include -#endif -#if HAVE_INTTYPES_H -# include -#endif - -#if HAVE_UNISTD_H || _LIBC -# include -#endif - -#if HAVE_GETTIMEOFDAY || _LIBC -# if HAVE_SYS_TIME_H || _LIBC -# include -# endif -#else -# if HAVE_TIME_H || _LIBC -# include -# endif -#endif - -#include "stat.h" - -#ifdef __MINGW32__ -/* mingw's mkdir() function has 1 argument, but we pass 2 arguments. - Therefore we have to disable the argument count checking. */ -# define mkdir ((int (*)()) mkdir) -#endif - -#if !_LIBC -# define __getpid getpid -# define __gettimeofday gettimeofday -# define __mkdir mkdir -#endif - -/* Use the widest available unsigned type if uint64_t is not - available. The algorithm below extracts a number less than 62**6 - (approximately 2**35.725) from uint64_t, so ancient hosts where - uintmax_t is only 32 bits lose about 3.725 bits of randomness, - which is better than not having mkstemp at all. */ -#if !defined UINT64_MAX && !defined uint64_t -# define uint64_t uintmax_t -#endif - -/* These are the characters used in temporary filenames. */ -static const char letters[] = -"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; - -/* Generate a temporary file name based on TMPL. TMPL must match the - rules for mk[s]temp (i.e. end in "XXXXXX"). The name constructed - does not exist at the time of the call to __gen_tempname. TMPL is - overwritten with the result. - - KIND is: - __GT_DIR: create a directory, which will be mode 0700. - - We use a clever algorithm to get hard-to-predict names. */ -static int -gen_tempname (char *tmpl) -{ - int len; - char *XXXXXX; - static uint64_t value; - uint64_t random_time_bits; - int count, fd = -1; - int save_errno = errno; - - len = strlen (tmpl); - if (len < 6 || strcmp (&tmpl[len - 6], "XXXXXX")) - { - __set_errno (EINVAL); - return -1; - } - - /* This is where the Xs start. */ - XXXXXX = &tmpl[len - 6]; - - /* Get some more or less random data. */ -#ifdef RANDOM_BITS - RANDOM_BITS (random_time_bits); -#else -# if HAVE_GETTIMEOFDAY || _LIBC - { - struct timeval tv; - __gettimeofday (&tv, NULL); - random_time_bits = ((uint64_t) tv.tv_usec << 16) ^ tv.tv_sec; - } -# else - random_time_bits = time (NULL); -# endif -#endif - value += random_time_bits ^ __getpid (); - - for (count = 0; count < TMP_MAX; value += 7777, ++count) - { - uint64_t v = value; - - /* Fill in the random bits. */ - XXXXXX[0] = letters[v % 62]; - v /= 62; - XXXXXX[1] = letters[v % 62]; - v /= 62; - XXXXXX[2] = letters[v % 62]; - v /= 62; - XXXXXX[3] = letters[v % 62]; - v /= 62; - XXXXXX[4] = letters[v % 62]; - v /= 62; - XXXXXX[5] = letters[v % 62]; - - fd = __mkdir (tmpl, S_IRUSR | S_IWUSR | S_IXUSR); - - if (fd >= 0) - { - __set_errno (save_errno); - return fd; - } - else if (errno != EEXIST) - return -1; - } - - /* We got out of the loop because we ran out of combinations to try. */ - __set_errno (EEXIST); - return -1; -} - -/* Generate a unique temporary directory from TEMPLATE. - The last six characters of TEMPLATE must be "XXXXXX"; - they are replaced with a string that makes the filename unique. - The directory is created, mode 700, and its name is returned. - (This function comes from OpenBSD.) */ -char * -mkdtemp (char *template) -{ - if (gen_tempname (template)) - return NULL; - else - return template; -} diff --git a/tikzit-1/src/gtk/stat.h b/tikzit-1/src/gtk/stat.h deleted file mode 100644 index a9829ae..0000000 --- a/tikzit-1/src/gtk/stat.h +++ /dev/null @@ -1,25 +0,0 @@ -#include -#if STAT_MACROS_BROKEN -# undef S_ISDIR -#endif -#if !defined S_ISDIR && defined S_IFDIR -# define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR) -#endif -#if !S_IRUSR && S_IREAD -# define S_IRUSR S_IREAD -#endif -#if !S_IRUSR -# define S_IRUSR 00400 -#endif -#if !S_IWUSR && S_IWRITE -# define S_IWUSR S_IWRITE -#endif -#if !S_IWUSR -# define S_IWUSR 00200 -#endif -#if !S_IXUSR && S_IEXEC -# define S_IXUSR S_IEXEC -#endif -#if !S_IXUSR -# define S_IXUSR 00100 -#endif diff --git a/tikzit-1/src/gtk/test/gtk.m b/tikzit-1/src/gtk/test/gtk.m deleted file mode 100644 index aabb0f2..0000000 --- a/tikzit-1/src/gtk/test/gtk.m +++ /dev/null @@ -1,27 +0,0 @@ -// -// linux.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// -#import "test/test.h" - -void testGtk() { - -} diff --git a/tikzit-1/src/gtk/test/main.m b/tikzit-1/src/gtk/test/main.m deleted file mode 100644 index 639a335..0000000 --- a/tikzit-1/src/gtk/test/main.m +++ /dev/null @@ -1,50 +0,0 @@ -// -// main.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// -#include "config.h" -#import "test/test.h" -#include -void testCommon(); - -int main(int argc, char **argv) { - if (argc == 2 && strcmp(argv[1], "--disable-color")==0) { - setColorEnabled(NO); - } else { - setColorEnabled(YES); - } - - PUTS(@""); - PUTS(@"**********************************************"); - PUTS(@"TikZiT TESTS, LINUX VERSION %@", VERSION); - PUTS(@"**********************************************"); - PUTS(@""); - - startTests(); - testCommon(); - testLinux(); - - PUTS(@""); - PUTS(@"**********************************************"); - endTests(); - PUTS(@"**********************************************"); - PUTS(@""); -} diff --git a/tikzit-1/src/gtk/tzstockitems.h b/tikzit-1/src/gtk/tzstockitems.h deleted file mode 100644 index 5ad0da9..0000000 --- a/tikzit-1/src/gtk/tzstockitems.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#define TIKZIT_STOCK_SELECT "tikzit-select" -#define TIKZIT_STOCK_CREATE_NODE "tikzit-create-node" -#define TIKZIT_STOCK_CREATE_EDGE "tikzit-create-edge" -#define TIKZIT_STOCK_BOUNDING_BOX "tikzit-bounding-box" -#define TIKZIT_STOCK_DRAG "tikzit-drag" - -void tz_register_stock_items(); - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/tzstockitems.m b/tikzit-1/src/gtk/tzstockitems.m deleted file mode 100644 index 5eba912..0000000 --- a/tikzit-1/src/gtk/tzstockitems.m +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "tzstockitems.h" -#include -#include - -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wpointer-sign" -#import "icondata.m" -#pragma GCC diagnostic pop - -static GtkStockItem stock_items[] = { - // gchar *stock_id; - // gchar *label; - // GdkModifierType modifier; - // guint keyval; - // gchar *translation_domain; - { TIKZIT_STOCK_SELECT, "Select", 0, 0, NULL }, - { TIKZIT_STOCK_CREATE_NODE, "Create Node", 0, 0, NULL }, - { TIKZIT_STOCK_CREATE_EDGE, "Create Edge", 0, 0, NULL }, - { TIKZIT_STOCK_BOUNDING_BOX, "Bounding Box", 0, 0, NULL }, - { TIKZIT_STOCK_DRAG, "Drag", 0, 0, NULL }, -}; -static guint n_stock_items = G_N_ELEMENTS (stock_items); - -static void icon_factory_add_pixdata (GtkIconFactory *factory, - const gchar *stock_id, - const GdkPixdata *image_data) { - - GdkPixbuf *buf = gdk_pixbuf_from_pixdata (image_data, FALSE, NULL); - GtkIconSet *icon_set = gtk_icon_set_new_from_pixbuf (buf); - gtk_icon_factory_add (factory, stock_id, icon_set); - gtk_icon_set_unref (icon_set); - g_object_unref (G_OBJECT (buf)); -} - -void tz_register_stock_items() { - gtk_stock_add_static (stock_items, n_stock_items); - - GtkIconFactory *factory = gtk_icon_factory_new (); - icon_factory_add_pixdata (factory, TIKZIT_STOCK_SELECT, &select_rectangular); - icon_factory_add_pixdata (factory, TIKZIT_STOCK_CREATE_NODE, &draw_ellipse); - icon_factory_add_pixdata (factory, TIKZIT_STOCK_CREATE_EDGE, &draw_path); - icon_factory_add_pixdata (factory, TIKZIT_STOCK_BOUNDING_BOX, &transform_crop_and_resize); - icon_factory_add_pixdata (factory, TIKZIT_STOCK_DRAG, &transform_move); - gtk_icon_factory_add_default (factory); -} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-1/src/gtk/tztoolpalette.h b/tikzit-1/src/gtk/tztoolpalette.h deleted file mode 100644 index 45ec2ac..0000000 --- a/tikzit-1/src/gtk/tztoolpalette.h +++ /dev/null @@ -1,56 +0,0 @@ -/* GIMP - The GNU Image Manipulation Program - * Copyright (C) 1995 Spencer Kimball and Peter Mattis - * - * tztoolpalette.h, based on gimptoolpalette.h - * Copyright (C) 2010 Michael Natterer - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef __TZ_TOOL_PALETTE_H__ -#define __TZ_TOOL_PALETTE_H__ - - -#define TZ_TYPE_TOOL_PALETTE (tz_tool_palette_get_type ()) -#define TZ_TOOL_PALETTE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TZ_TYPE_TOOL_PALETTE, TzToolPalette)) -#define TZ_TOOL_PALETTE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TZ_TYPE_TOOL_PALETTE, TzToolPaletteClass)) -#define TZ_IS_TOOL_PALETTE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TZ_TYPE_TOOL_PALETTE)) -#define TZ_IS_TOOL_PALETTE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TZ_TYPE_TOOL_PALETTE)) -#define TZ_TOOL_PALETTE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TZ_TYPE_TOOL_PALETTE, TzToolPaletteClass)) - - -typedef struct _TzToolPaletteClass TzToolPaletteClass; -typedef struct _TzToolPalette TzToolPalette; - -struct _TzToolPalette -{ - GtkToolPalette parent_instance; -}; - -struct _TzToolPaletteClass -{ - GtkToolPaletteClass parent_class; -}; - - -GType tz_tool_palette_get_type (void) G_GNUC_CONST; - -GtkWidget * tz_tool_palette_new (void); - -gboolean tz_tool_palette_get_button_size (TzToolPalette *widget, - gint *width, - gint *height); - - -#endif /* __TZ_TOOL_PALETTE_H__ */ diff --git a/tikzit-1/src/gtk/tztoolpalette.m b/tikzit-1/src/gtk/tztoolpalette.m deleted file mode 100644 index a948127..0000000 --- a/tikzit-1/src/gtk/tztoolpalette.m +++ /dev/null @@ -1,158 +0,0 @@ -/* GIMP - The GNU Image Manipulation Program - * Copyright (C) 1995 Spencer Kimball and Peter Mattis - * - * tztoolpalette.c, based on gimptoolpalette.c - * Copyright (C) 2010 Michael Natterer - * Copyright (C) 2012 Alex Merry - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include - -#include "tztoolpalette.h" - - -#define DEFAULT_TOOL_ICON_SIZE GTK_ICON_SIZE_BUTTON -#define DEFAULT_BUTTON_RELIEF GTK_RELIEF_NONE - -#define TOOL_BUTTON_DATA_KEY "tz-tool-palette-item" -#define TOOL_INFO_DATA_KEY "tz-tool-info" - - -typedef struct _TzToolPalettePrivate TzToolPalettePrivate; - -struct _TzToolPalettePrivate -{ - gint tool_rows; - gint tool_columns; -}; - -#define GET_PRIVATE(p) G_TYPE_INSTANCE_GET_PRIVATE (p, \ - TZ_TYPE_TOOL_PALETTE, \ - TzToolPalettePrivate) - - -static void tz_tool_palette_size_allocate (GtkWidget *widget, - GtkAllocation *allocation); - - -G_DEFINE_TYPE (TzToolPalette, tz_tool_palette, GTK_TYPE_TOOL_PALETTE) - -#define parent_class tz_tool_palette_parent_class - - -static void -tz_tool_palette_class_init (TzToolPaletteClass *klass) -{ - GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); - - widget_class->size_allocate = tz_tool_palette_size_allocate; - - g_type_class_add_private (klass, sizeof (TzToolPalettePrivate)); -} - -static void -tz_tool_palette_init (TzToolPalette *palette) -{ -} - -static GtkToolItemGroup * -tz_tool_palette_tool_group (TzToolPalette *palette) -{ - GList *children; - GtkToolItemGroup *group; - - children = gtk_container_get_children (GTK_CONTAINER (palette)); - g_return_val_if_fail (children, NULL); - group = GTK_TOOL_ITEM_GROUP (children->data); - g_list_free (children); - - return group; -} - -gboolean -tz_tool_palette_get_button_size (TzToolPalette *palette, - gint *width, - gint *height) -{ - g_return_val_if_fail (width || height, FALSE); - - GtkToolItemGroup *group = tz_tool_palette_tool_group (palette); - g_return_val_if_fail (group, FALSE); - - guint tool_count = gtk_tool_item_group_get_n_items (group); - if (tool_count > 0) - { - GtkWidget *tool_button; - GtkRequisition button_requisition; - - tool_button = GTK_WIDGET (gtk_tool_item_group_get_nth_item (group, 0)); - gtk_widget_size_request (tool_button, &button_requisition); - if (width) - *width = button_requisition.width; - if (height) - *height = button_requisition.height; - return TRUE; - } - return FALSE; -} - -static void -tz_tool_palette_size_allocate (GtkWidget *widget, - GtkAllocation *allocation) -{ - TzToolPalettePrivate *private = GET_PRIVATE (widget); - GtkToolItemGroup *group = tz_tool_palette_tool_group (TZ_TOOL_PALETTE (widget)); - - g_return_if_fail (group); - - GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation); - - guint tool_count = gtk_tool_item_group_get_n_items (group); - if (tool_count > 0) - { - GtkWidget *tool_button; - GtkRequisition button_requisition; - gint tool_rows; - gint tool_columns; - - tool_button = GTK_WIDGET (gtk_tool_item_group_get_nth_item (group, 0)); - gtk_widget_size_request (tool_button, &button_requisition); - - tool_columns = MAX (1, (allocation->width / button_requisition.width)); - tool_rows = tool_count / tool_columns; - - if (tool_count % tool_columns) - tool_rows++; - - if (private->tool_rows != tool_rows || - private->tool_columns != tool_columns) - { - private->tool_rows = tool_rows; - private->tool_columns = tool_columns; - - gtk_widget_set_size_request (widget, -1, - tool_rows * button_requisition.height); - } - } -} - -GtkWidget * -tz_tool_palette_new (void) -{ - return g_object_new (TZ_TYPE_TOOL_PALETTE, NULL); -} - -// vim:ft=objc:ts=8:et:sts=2:sw=2:foldmethod=marker diff --git a/tikzit-1/src/osx/AppDelegate.h b/tikzit-1/src/osx/AppDelegate.h deleted file mode 100644 index 92d9add..0000000 --- a/tikzit-1/src/osx/AppDelegate.h +++ /dev/null @@ -1,57 +0,0 @@ -// -// AppDelegate.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "StylePaletteController.h" -#import "ToolPaletteController.h" -#import "PropertyInspectorController.h" -#import "PreambleController.h" -#import "PreviewController.h" -#import "GraphicsView.h" -#import "PreferenceController.h" - -@interface AppDelegate : NSObject { - NSMapTable *table; - StylePaletteController *stylePaletteController; - PropertyInspectorController *propertyInspectorController; - PreambleController *preambleController; - PreviewController *previewController; - PreferenceController *preferenceController; - ToolPaletteController *toolPaletteController; - IBOutlet GraphicsView *graphicsView; - NSString *tempDir; -} - -@property IBOutlet StylePaletteController *stylePaletteController; -@property (strong) IBOutlet ToolPaletteController *toolPaletteController; - -- (void)awakeFromNib; -+ (void)setDefaults; -- (void)applicationWillTerminate:(NSNotification *)notification; -- (IBAction)toggleStyleInspector:(id)sender; -- (IBAction)togglePropertyInspector:(id)sender; -- (IBAction)togglePreamble:(id)sender; -- (IBAction)togglePreferences:(id)sender; -- (IBAction)refreshShapes:(id)sender; - -@end diff --git a/tikzit-1/src/osx/AppDelegate.m b/tikzit-1/src/osx/AppDelegate.m deleted file mode 100644 index 94f5507..0000000 --- a/tikzit-1/src/osx/AppDelegate.m +++ /dev/null @@ -1,124 +0,0 @@ -// -// AppDelegate.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "AppDelegate.h" -#import "TikzDocument.h" -#import "Shape.h" -#import "SupportDir.h" - -@implementation AppDelegate - -@synthesize stylePaletteController, toolPaletteController; - -+(void)initialize{ - [self setDefaults]; -} - -- (void)awakeFromNib { - [SupportDir createUserSupportDir]; - NSString *supportDir = [SupportDir userSupportDir]; - //NSLog(stylePlist); - stylePaletteController = - [[StylePaletteController alloc] initWithWindowNibName:@"StylePalette" - supportDir:supportDir]; - - propertyInspectorController = - [[PropertyInspectorController alloc] initWithWindowNibName:@"PropertyInspector"]; - - [propertyInspectorController setStylePaletteController:stylePaletteController]; - - NSString *preamblePlist = [supportDir stringByAppendingPathComponent:@"preambles.plist"]; - preambleController = - [[PreambleController alloc] initWithNibName:@"Preamble" - plist:preamblePlist - styles:[stylePaletteController nodeStyles] - edges:[stylePaletteController edgeStyles]]; - - - char template[] = "/tmp/tikzit_tmp_XXXXXXX"; - char *dir = mkdtemp(template); - tempDir = [NSString stringWithUTF8String:dir]; - - NSLog(@"created temp dir: %@", tempDir); - NSLog(@"system support dir: %@", [SupportDir systemSupportDir]); - - previewController = - [[PreviewController alloc] initWithWindowNibName:@"Preview" - preambleController:preambleController - tempDir:tempDir]; - - preferenceController = [[PreferenceController alloc] initWithWindowNibName:@"Preferences" preambleController:preambleController]; - - // each application has one global preview controller - [PreviewController setDefaultPreviewController:previewController]; -} - -+ (void)setDefaults{ - NSString *userDefaultsValuesPath; - NSDictionary *userDefaultsValuesDict; - - userDefaultsValuesPath=[[NSBundle mainBundle] pathForResource:@"UserDefaults" - ofType:@"plist"]; - userDefaultsValuesDict=[NSDictionary dictionaryWithContentsOfFile:userDefaultsValuesPath]; - - [[NSUserDefaults standardUserDefaults] registerDefaults:userDefaultsValuesDict]; -} - -- (void)applicationWillTerminate:(NSNotification *)notification { - NSString *supportDir = [SupportDir userSupportDir]; - [stylePaletteController saveStyles:supportDir]; - [preambleController savePreambles:[supportDir stringByAppendingPathComponent:@"preambles.plist"]]; - - NSLog(@"wiping temp dir: %@", tempDir); - [[NSFileManager defaultManager] removeItemAtPath:tempDir error:NULL]; -} - -- (void)toggleController:(NSWindowController*)c { - if ([[c window] isVisible]) { - [c close]; - } else { - [c showWindow:self]; - } -} - -- (IBAction)toggleStyleInspector:(id)sender { - [self toggleController:stylePaletteController]; -} - -- (IBAction)togglePropertyInspector:(id)sender { - [self toggleController:propertyInspectorController]; -} - -- (IBAction)togglePreamble:(id)sender { - [self toggleController:(NSWindowController *) preambleController]; -} - -- (IBAction)togglePreferences:(id)sender { - [self toggleController:preferenceController]; -} - -- (IBAction)refreshShapes:(id)sender { - [Shape refreshShapeDictionary]; -} - -@end diff --git a/tikzit-1/src/osx/CALayer+DrawLabel.h b/tikzit-1/src/osx/CALayer+DrawLabel.h deleted file mode 100644 index 32282d9..0000000 --- a/tikzit-1/src/osx/CALayer+DrawLabel.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// CALayer+DrawLabel.h -// TikZiT -// -// Created by Aleks Kissinger on 09/05/2011. -// Copyright 2011 Aleks Kissinger. All rights reserved. -// - -#import -#import - -@class Transformer; - -@interface CALayer(DrawLabel) - -- (void)drawLabel:(NSString*)label - atPoint:(NSPoint)pt - inContext:(CGContextRef)context - usingTrans:(Transformer*)t; - -@end diff --git a/tikzit-1/src/osx/CALayer+DrawLabel.m b/tikzit-1/src/osx/CALayer+DrawLabel.m deleted file mode 100644 index 4860a3c..0000000 --- a/tikzit-1/src/osx/CALayer+DrawLabel.m +++ /dev/null @@ -1,84 +0,0 @@ -// -// CALayer+DrawLabel.m -// TikZiT -// -// Created by Aleks Kissinger on 09/05/2011. -// Copyright 2011 Aleks Kissinger. All rights reserved. -// - -#import "CALayer+DrawLabel.h" -#import "Transformer.h" - -@implementation CALayer(DrawLabel) - -- (void)drawLabel:(NSString*)label - atPoint:(NSPoint)pt - inContext:(CGContextRef)context - usingTrans:(Transformer*)t { - - CGContextSaveGState(context); - - if ([label length] > 15) { - label = [[label substringToIndex:12] stringByAppendingString:@"..."]; - } - - float fontSize = [t scaleToScreen:0.18f]; // size 9 @ 100% - if (fontSize > 18.0f) fontSize = 18.0f; - - // Prepare font - CTFontRef font = CTFontCreateWithName(CFSTR("Monaco"), fontSize, NULL); - - // Create an attributed string - CFStringRef keys[] = { kCTFontAttributeName }; - CFTypeRef values[] = { font }; - CFDictionaryRef attr = CFDictionaryCreate(NULL, - (const void **)&keys, - (const void **)&values, - sizeof(keys) / sizeof(keys[0]), - &kCFTypeDictionaryKeyCallBacks, - &kCFTypeDictionaryValueCallBacks); - CFAttributedStringRef attrString = - CFAttributedStringCreate(NULL, (CFStringRef)label, attr); - CFRelease(attr); - - // Draw the string - CTLineRef line = CTLineCreateWithAttributedString(attrString); - CGContextSetTextMatrix(context, CGAffineTransformIdentity); - CGContextSetTextPosition(context, 0, 0); - - CGRect labelBounds = CGRectIntegral(CTLineGetImageBounds(line, context)); - //int shiftx = round(labelBounds.size.width / 2); - - CGContextSetTextPosition(context, - round(pt.x - (labelBounds.size.width/2)), - round(pt.y - (0.9*labelBounds.size.height/2))); - - labelBounds = CGRectIntegral(CTLineGetImageBounds(line, context)); - labelBounds.origin.x -= 2; - labelBounds.origin.y -= 2; - labelBounds.size.width += 4; - labelBounds.size.height += 4; - - CGContextSetShouldAntialias(context, NO); - - CGContextSetRGBFillColor(context, 1.0f, 1.0f, 0.5f, 0.7f); - CGContextSetRGBStrokeColor(context, 0.5f, 0.0f, 0.0f, 0.7f); - - CGContextFillRect(context, labelBounds); - CGContextStrokeRect(context, labelBounds); - - CGContextSetShouldAntialias(context, YES); - - CGContextSetRGBFillColor(context, 0.3f, 0.3f, 0.3f, 0.7f); - - CTLineDraw(line, context); - - // Clean up - CFRelease(line); - CFRelease(attrString); - CFRelease(font); - - CGContextRestoreGState(context); -} - -@end diff --git a/tikzit-1/src/osx/CoreGraphicsRenderContext.h b/tikzit-1/src/osx/CoreGraphicsRenderContext.h deleted file mode 100644 index 7b00484..0000000 --- a/tikzit-1/src/osx/CoreGraphicsRenderContext.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import -#import "RenderContext.h" - -@interface CoreTextLayout: NSObject { - CFAttributedStringRef attrString; - CTFontRef font; - CTLineRef line; - CGContextRef ctx; -} - -+ (CoreTextLayout*) layoutForContext:(CGContextRef)c withString:(NSString*)string fontSize:(CGFloat)fontSize; -- (id) initWithContext:(CGContextRef)cr withString:(NSString*)string fontSize:(CGFloat)fontSize; - -@end - -@interface CoreGraphicsRenderContext: NSObject { - CGContextRef ctx; -} - -+ (CoreGraphicsRenderContext*) contextWithCGContext:(CGContextRef)c; -+ (id) initWithCGContext:(CGContextRef)c; - -- (CGContextRef) ctx; - -@end - -// vim:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/osx/CoreGraphicsRenderContext.m b/tikzit-1/src/osx/CoreGraphicsRenderContext.m deleted file mode 100644 index 1cb0daf..0000000 --- a/tikzit-1/src/osx/CoreGraphicsRenderContext.m +++ /dev/null @@ -1,234 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import -#import "RenderContext.h" - -@implementation CoreTextLayout - -+ (CoreTextLayout*) layoutForContext:(CGContextRef)c withString:(NSString*)string fontSize:(CGFloat)fontSize { - return [[[self alloc] initWithContext:c withString:string fontSize:fontSize] autorelease]; -} - -- (id) initWithContext:(CGContextRef)cr withString:(NSString*)string fontSize:(CGFloat)fontSize { - self = [super init]; - - if (self == nil) { - return nil; - } - - CGContextRetain (cr); - ctx = cr; - font = CTFontCreateWithName(CFSTR("Monaco"), fontSize, NULL); - - // Create an attributed string - CFStringRef keys[] = { kCTFontAttributeName }; - CFTypeRef values[] = { font }; - CFDictionaryRef attr = CFDictionaryCreate(NULL, - (const void **)&keys, - (const void **)&values, - sizeof(keys) / sizeof(keys[0]), - &kCFTypeDictionaryKeyCallBacks, - &kCFTypeDictionaryValueCallBacks); - attrString = CFAttributedStringCreate(NULL, (CFStringRef)lab, attr); - CFRelease(attr); - line = CTLineCreateWithAttributedString(attrString); - - return self; -} - -- (NSSize) size { - CGRect labelBounds = CGRectIntegral(CTLineGetImageBounds(line, ctx)); - return labelBounds.size; -} - -- (NSString*) text { - return CFAttributedStringGetString (attrString); -} - -- (void) showTextAt:(NSPoint)topLeft withColor:(RColor)color { - CGContextSaveGState(ctx); - - CGContextSetRGBFillColor(ctx, color.red, color.green, color.blue, color.alpha); - CGContextSetRGBStrokeColor(ctx, color.red, color.green, color.blue, color.alpha); - CGContextSetShouldAntialias(ctx, YES); - - CGContextSetTextMatrix(ctx, CGAffineTransformIdentity); - CGContextSetTextPosition(ctx, 0, 0); - CGRect bounds = CGRectIntegral(CTLineGetImageBounds(line, ctx)); - CGContextSetTextPosition(ctx, topLeft.x - bounds.x, topLeft.y - bounds.y); - - CTLineDraw(line, ctx); - - CGContextRestoreGState(ctx); -} - -- (void) dealloc { - CFRelease(line); - CFRelease(attrString); - CFRelease(font); - CGContextRelease (ctx); - - [super dealloc]; -} - -@end - -@implementation CoreGraphicsRenderContext - -+ (CoreGraphicsRenderContext*) contextWithCGContext:(CGContextRef)c { - return [[[self alloc] initWithCGContext:c] autorelease]; -} - -+ (id) initWithCGContext:(CGContextRef)c { - self = [super init]; - - if (self) { - ctx = c; - CGContextRetain (ctx); - } - - return self; -} - -- (void) dealloc { - CGContextRelease (ctx); - - [super dealloc]; -} - -- (CGContextRef) ctx { - return ctx; -} - -- (void) saveState { - CGContextSaveGState(ctx); -} - -- (void) restoreState { - CGContextRestoreGState(ctx); -} - -- (NSRect) clipBoundingBox { - return CGContextGetClipBoundingBox (ctx); -} - -- (BOOL) strokeIncludesPoint:(NSPoint)p { - return CGContextPathContainsPoint(ctx, NSPointToCGPoint(p), kCGPathStroke); -} - -- (BOOL) fillIncludesPoint:(NSPoint)p { - return CGContextPathContainsPoint(ctx, NSPointToCGPoint(p), kCGPathFill); -} - -- (id) layoutText:(NSString*)text withSize:(CGFloat)fontSize { - return [CoreTextLayout layoutForContext:ctx withString:text fontSize:fontSize]; -} - -// this may not affect text rendering -- (void) setAntialiasMode:(AntialiasMode)mode { - CGContextSetShouldAntialias(ctx, mode != AntialiasDisabled); -} - -- (void) setLineWidth:(CGFloat)width { - CGContextSetLineWidth(ctx, width); -} - -// setting to 0 will unset the dash -- (void) setLineDash:(CGFloat)dashLength { - if (dashLength <= 0.0f) { - CGContextSetLineDash(ctx, 0.0f, NULL, 0); - } else { - const CGFloat dash[] = {dashLength, dashLength}; - CGContextSetLineDash(ctx, 0.0f, dash, 2); - } -} - -// paths -- (void) startPath { - CGContextBeginPath (ctx); -} - -- (void) closeSubPath { - CGContextClosePath (ctx); -} - -- (void) moveTo:(NSPoint)p { - CGContextMoveToPoint (ctx, p.x, p.y); -} - -- (void) curveTo:(NSPoint)end withCp1:(NSPoint)cp1 andCp2:(NSPoint)cp2 { - CGContextAddCurveToPoint(ctx, cp1.x, cp1.y, cp2.x, cp2.y, end.x, end.y); -} - -- (void) lineTo:(NSPoint)end { - CGContextAddLineToPoint(ctx, end.x, end.y); -} - -- (void) rect:(NSRect)rect { - CGContextAddRect (ctx, rect); -} - -- (void) circleAt:(NSPoint)c withRadius:(CGFloat)r { - CGContextMoveToPoint (ctx, c.x + r, c.y); - CGContextAddArc (ctx, c.x, c.y, r, 0.0f, M_PI, 1); -} - -// these methods clear the path -- (void) strokePathWithColor:(RColor)color { - CGContextSetRGBStrokeColor(ctx, color.red, color.green, color.blue, color.alpha); - CGContextDrawPath (ctx, kCGPathStroke); -} - -- (void) fillPathWithColor:(RColor)color { - CGContextSetRGBFillColor(ctx, color.red, color.green, color.blue, color.alpha); - CGContextDrawPath (ctx, kCGPathFill); -} - -- (void) strokePathWithColor:(RColor)scolor - andFillWithColor:(RColor)fcolor { - CGContextSetRGBFillColor(ctx, color.red, color.green, color.blue, color.alpha); - CGContextSetRGBStrokeColor(ctx, color.red, color.green, color.blue, color.alpha); - CGContextDrawPath (ctx, kCGPathFillStroke); -} - -- (void) strokePathWithColor:(RColor)scolor - andFillWithColor:(RColor)fcolor - usingAlpha:(CGFloat)alpha { - CGContextSetRGBFillColor(ctx, color.red, color.green, color.blue, color.alpha * alpha); - CGContextSetRGBStrokeColor(ctx, color.red, color.green, color.blue, color.alpha * alpha); - CGContextDrawPath (ctx, kCGPathFillStroke); -} - -- (void) clipToPath { - CGContextClip (ctx); -} - -// paint everywhere within the clip -- (void) paintWithColor:(RColor)color { - CGContextSetRGBFillColor(ctx, color.red, color.green, color.blue, color.alpha); - CGRect r = CGContextGetClipBoundingBox (ctx); - r.origin.x -= 1; - r.origin.y -= 1; - r.size.width += 2; - r.size.height += 2; - CGContextFillRect(context, r); -} - -@end - -// vim:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-1/src/osx/CustomNodeCellView.h b/tikzit-1/src/osx/CustomNodeCellView.h deleted file mode 100644 index 22606d7..0000000 --- a/tikzit-1/src/osx/CustomNodeCellView.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// CustomNodeCellView.h -// TikZiT -// -// Created by Johan Paulsson on 12/12/13. -// Copyright (c) 2013 Aleks Kissinger. All rights reserved. -// - -#import - -#import "NodeLayer.h" -#import "NodeStyle.h" -#import "NodeStyle+Coder.h" - -@interface CustomNodeCellView : NSTableCellView{ - NodeLayer *nodeLayer; - NodeStyle *nodeStyle; - BOOL selected; -} - -@property (strong) id objectValue; - -@end diff --git a/tikzit-1/src/osx/CustomNodeCellView.m b/tikzit-1/src/osx/CustomNodeCellView.m deleted file mode 100644 index 612394b..0000000 --- a/tikzit-1/src/osx/CustomNodeCellView.m +++ /dev/null @@ -1,83 +0,0 @@ -// -// CustomNodeCellView.m -// TikZiT -// -// Created by Johan Paulsson on 12/12/13. -// Copyright (c) 2013 Aleks Kissinger. All rights reserved. -// - -#import "CustomNodeCellView.h" - -@implementation CustomNodeCellView - -- (id)initWithFrame:(NSRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - // Initialization code here. - } - return self; -} - -- (void)drawRect:(NSRect)dirtyRect -{ - [super drawRect:dirtyRect]; - - // Drawing code here. -} - -- (id) objectValue{ - return [super objectValue]; -} - --(void)drawLayer:(CALayer *)layer inContext:(CGContextRef)context { - if (nodeLayer!=nil) { - if (![[[self layer] sublayers] containsObject:nodeLayer]) { - [[self layer] addSublayer:nodeLayer]; - NSPoint c = NSMakePoint((CGRectGetMinX([[self layer] frame])+CGRectGetWidth([nodeLayer bounds])/2), - CGRectGetMidY([[self layer] frame])); - //c = NSMakePoint(-16.5,-16.5); - [nodeLayer setCenter:c andAnimateWhen:NO]; - [[self textField] setFrame:NSMakeRect(CGRectGetWidth([nodeLayer bounds]), CGRectGetMidY([[self layer] frame]), CGRectGetWidth([[self textField] frame]), CGRectGetHeight([[self textField] frame]))]; - } - - if (selected){ - [nodeStyle setStrokeColor:[NSColor whiteColor]]; - [[nodeLayer node] setStyle:nodeStyle]; - }else{ - [nodeStyle setStrokeColor:[NSColor blackColor]]; - [[nodeLayer node] setStyle:nodeStyle]; - } - - [nodeLayer updateFrame]; - } -} - -- (void) setObjectValue:(id)objectValue{ - if(objectValue == nil) - return; - - nodeStyle = (NodeStyle *)objectValue; - [[self textField] setStringValue:[nodeStyle shapeName]]; - - if (nodeLayer == nil) { - nodeLayer = [[NodeLayer alloc] initWithNode:[Node node] - transformer:[Transformer defaultTransformer]]; - [nodeLayer setRescale:NO]; - } - [nodeStyle setName:[nodeStyle shapeName]]; - - [[nodeLayer node] setStyle:nodeStyle]; - [nodeLayer updateFrame]; - - NSLog(@"asd"); -} - -- (void)setBackgroundStyle:(NSBackgroundStyle)backgroundStyle { - [super setBackgroundStyle:backgroundStyle]; - - selected = (backgroundStyle == NSBackgroundStyleDark); - [self setNeedsDisplay:YES]; -} - -@end diff --git a/tikzit-1/src/osx/CustomNodeController.h b/tikzit-1/src/osx/CustomNodeController.h deleted file mode 100644 index 67adf0b..0000000 --- a/tikzit-1/src/osx/CustomNodeController.h +++ /dev/null @@ -1,35 +0,0 @@ -// -// CustomNodeController.h -// TikZiT -// -// Created by Johan Paulsson on 12/4/13. -// Copyright (c) 2013 Aleks Kissinger. All rights reserved. -// - -#import -#import "Shape.h" -#import "TikzShape.h" - -#import "GraphicsView.h" -#import "TikzSourceController.h" - -#import "SupportDir.h" - -@interface CustomNodeController : NSViewController { - NSDictionary *nodeStyles; - NSMutableArray* customNodeStyles; - - GraphicsView *__weak graphicsView; - TikzSourceController *__weak tikzSourceController; - NSTableView *customNodeTable; -} - -@property NSDictionary *nodeStyles; -@property NSMutableArray* customNodeStyles; - -@property IBOutlet NSTableView *customNodeTable; - -@property (weak) IBOutlet GraphicsView *graphicsView; -@property (weak) IBOutlet TikzSourceController *tikzSourceController; - -@end diff --git a/tikzit-1/src/osx/CustomNodeController.m b/tikzit-1/src/osx/CustomNodeController.m deleted file mode 100644 index 4f46acc..0000000 --- a/tikzit-1/src/osx/CustomNodeController.m +++ /dev/null @@ -1,58 +0,0 @@ -// -// CustomNodeController.m -// TikZiT -// -// Created by Johan Paulsson on 12/4/13. -// Copyright (c) 2013 Aleks Kissinger. All rights reserved. -// - -#import "CustomNodeController.h" -#import "NodeStyle.h" - -@interface CustomNodeController () - -@end - -@implementation CustomNodeController - -@synthesize nodeStyles, customNodeStyles; -@synthesize graphicsView, tikzSourceController; -@synthesize customNodeTable; - -- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil -{ - if (self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]) { - nodeStyles = [Shape shapeDictionary]; - customNodeStyles = [NSMutableArray array]; - - for(id key in nodeStyles) { - Shape *value = [nodeStyles objectForKey:key]; - - if([value isKindOfClass:[TikzShape class]]){ - NodeStyle *newNodeStyle = [[NodeStyle alloc] init]; - [newNodeStyle setShapeName:key]; - - [customNodeStyles addObject:newNodeStyle]; - } - } - } - - return self; -} - -- (void)tableViewSelectionDidChange:(NSNotification *)aNotification{ - NSInteger selectedRow = [customNodeTable selectedRow]; - - NodeStyle* selectedNodeStyle = [customNodeStyles objectAtIndex:selectedRow]; - TikzShape *tikzshape = (TikzShape *) [nodeStyles objectForKey:[selectedNodeStyle shapeName]]; - - [[tikzSourceController graphicsView] setEnabled:NO]; - [tikzSourceController setTikz:[tikzshape tikzSrc]]; - [tikzSourceController parseTikz:self]; -} - -- (id)valueForUndefinedKey:(NSString *)key{ - return nil; -} - -@end diff --git a/tikzit-1/src/osx/CustomNodes.xib b/tikzit-1/src/osx/CustomNodes.xib deleted file mode 100644 index 1cc8db2..0000000 --- a/tikzit-1/src/osx/CustomNodes.xib +++ /dev/null @@ -1,249 +0,0 @@ - - - - - - - - - - - - - - - - - - - name - strokeThickness - strokeColor - fillColor - strokeColorIsKnown - fillColorIsKnown - representedObject.name - shapeName - scale - @distinctUnionOfObjects.category - category - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \begin{tikzpicture} - -\end{tikzpicture} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tikzit-1/src/osx/DraggablePDFView.h b/tikzit-1/src/osx/DraggablePDFView.h deleted file mode 100644 index 9e53c44..0000000 --- a/tikzit-1/src/osx/DraggablePDFView.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// PreviewController.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import - -@interface DraggablePDFView : PDFView - -@end diff --git a/tikzit-1/src/osx/DraggablePDFView.m b/tikzit-1/src/osx/DraggablePDFView.m deleted file mode 100644 index ce393c7..0000000 --- a/tikzit-1/src/osx/DraggablePDFView.m +++ /dev/null @@ -1,60 +0,0 @@ -// -// PreviewController.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "DraggablePDFView.h" - -@implementation DraggablePDFView - -- (id)initWithFrame:(NSRect)frame -{ - self = [super initWithFrame:frame]; - return self; -} - -- (void)drawRect:(NSRect)dirtyRect -{ - [super drawRect:dirtyRect]; -} - -- (void)mouseDown:(NSEvent *)theEvent -{ - NSRect pageBox = [[[self document] pageAtIndex:0] boundsForBox:kPDFDisplayBoxMediaBox]; - NSRect pageRect= [self convertRect:pageBox fromPage:[[self document] pageAtIndex:0]]; - - NSArray *fileList = [NSArray arrayWithObjects:[[[self document] documentURL] path], nil]; - NSPasteboard *pboard = [NSPasteboard pasteboardWithName:NSDragPboard]; - [pboard declareTypes:[NSArray arrayWithObject:NSFilenamesPboardType] owner:nil]; - [pboard setPropertyList:fileList forType:NSFilenamesPboardType]; - - [self dragImage:[[NSImage alloc] initWithData:[[self document] dataRepresentation]] - at:pageRect.origin - offset:pageRect.size - event:theEvent - pasteboard:pboard - source:self - slideBack:YES]; - - return; -} - -@end diff --git a/tikzit-1/src/osx/EdgeControlLayer.h b/tikzit-1/src/osx/EdgeControlLayer.h deleted file mode 100644 index 4cdf8bc..0000000 --- a/tikzit-1/src/osx/EdgeControlLayer.h +++ /dev/null @@ -1,44 +0,0 @@ -// -// EdgeControlLayer.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import -#import "Edge.h" -#import "Transformer.h" - - -@interface EdgeControlLayer : CALayer { - Edge *edge; - Transformer *transformer; - BOOL selected; -} - -- (id)initWithEdge:(Edge*)e andTransformer:(Transformer*)t; -- (void)highlight; -- (void)unhighlight; -- (void)select; -- (void)deselect; - -+ (float)handleRadius; - -@end diff --git a/tikzit-1/src/osx/EdgeControlLayer.m b/tikzit-1/src/osx/EdgeControlLayer.m deleted file mode 100644 index facdd84..0000000 --- a/tikzit-1/src/osx/EdgeControlLayer.m +++ /dev/null @@ -1,150 +0,0 @@ -// -// EdgeControlLayer.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "EdgeControlLayer.h" -#import "util.h" - - -@implementation EdgeControlLayer - - -- (id)initWithEdge:(Edge*)e andTransformer:(Transformer*)t { - if (!(self = [super init])) return nil; - transformer = t; - edge = e; - self.opacity = 0.0f; - return self; -} - -- (void)select { - selected = YES; - self.opacity = 1.0f; -} - -- (void)deselect { - selected = NO; - self.opacity = 0.0f; -} - -- (void)highlight { - if (!selected) { - self.opacity = 0.5f; - } -} - -- (void)unhighlight { - if (!selected) { - self.opacity = 0.0f; - } -} - -- (void)drawInContext:(CGContextRef)ctx { - CGContextSaveGState(ctx); - - [edge updateControls]; - CGPoint source = NSPointToCGPoint([transformer toScreen:[[edge source] point]]); - CGPoint target = NSPointToCGPoint([transformer toScreen:[[edge target] point]]); - CGPoint mid = NSPointToCGPoint([transformer toScreen:[edge mid]]); - CGPoint cp1 = NSPointToCGPoint([transformer toScreen:[edge cp1]]); - CGPoint cp2 = NSPointToCGPoint([transformer toScreen:[edge cp2]]); - - float dx = (target.x - source.x); - float dy = (target.y - source.y); - - // draw a circle at the midpoint - CGRect mid_rect = CGRectMake(mid.x-3.0f, mid.y-3.0f, 6.0f, 6.0f); - CGContextAddEllipseInRect(ctx, mid_rect); - CGContextSetLineWidth(ctx, 1.0f); - CGContextSetRGBFillColor(ctx, 1.0f, 1.0f, 1.0f, 0.5f); - CGContextSetRGBStrokeColor(ctx, 0.0f, 0.0f, 1.0f, 0.5f); - CGContextDrawPath(ctx, kCGPathFillStroke); - - - CGContextSetShouldAntialias(ctx, YES); - - // compute size of control circles - float cdist; - if (dx == 0 && dy == 0) cdist = [transformer scaleToScreen:edge.weight]; - else cdist = sqrt(dx*dx + dy*dy) * edge.weight; - - // if basic bend, draw blue, if inout, draw green - if ([edge bendMode] == EdgeBendModeBasic) CGContextSetRGBStrokeColor(ctx, 0, 0, 1, 0.4f); - else CGContextSetRGBStrokeColor(ctx, 0, 0.7f, 0, 0.4f); - - // draw source control circle - CGRect ellipse1 = CGRectMake(source.x-cdist, source.y-cdist, cdist*2.0f, cdist*2.0f); - CGContextAddEllipseInRect(ctx, ellipse1); - if (dx!=0 || dy!=0) { - CGRect ellipse2 = CGRectMake(target.x-cdist, target.y-cdist, cdist*2.0f, cdist*2.0f); - CGContextAddEllipseInRect(ctx, ellipse2); - } - - CGContextStrokePath(ctx); - - float handleRad = [EdgeControlLayer handleRadius]; - - // handles - CGRect ctrl1 = CGRectMake(cp1.x-handleRad, cp1.y-handleRad, 2*handleRad, 2*handleRad); - CGRect ctrl2 = CGRectMake(cp2.x-handleRad, cp2.y-handleRad, 2*handleRad, 2*handleRad); - - CGContextSetRGBFillColor(ctx, 1.0f, 1.0f, 1.0f, 0.8f); - - // draw a line from source vertex to first handle - if ([edge bendMode] == EdgeBendModeInOut) { - if ([edge outAngle] % 45 == 0) CGContextSetRGBStrokeColor(ctx, 1, 0, 1, 0.6f); - else CGContextSetRGBStrokeColor(ctx, 0, 0.7f, 0, 0.4f); - } else { - if ([edge bend] % 45 == 0) CGContextSetRGBStrokeColor(ctx, 1, 0, 1, 0.6f); - else CGContextSetRGBStrokeColor(ctx, 0, 0, 1, 0.4f); - } - - CGContextMoveToPoint(ctx, source.x, source.y); - CGContextAddLineToPoint(ctx, cp1.x, cp1.y); - CGContextStrokePath(ctx); - - CGContextAddEllipseInRect(ctx, ctrl1); - CGContextDrawPath(ctx, kCGPathFillStroke); - - - // draw a line from target vertex to second handle - if ([edge bendMode] == EdgeBendModeInOut) { - if ([edge inAngle] % 45 == 0) CGContextSetRGBStrokeColor(ctx, 1, 0, 1, 0.6f); - else CGContextSetRGBStrokeColor(ctx, 0, 0.7f, 0, 0.4f); - } else { - if ([edge bend] % 45 == 0) CGContextSetRGBStrokeColor(ctx, 1, 0, 1, 0.6f); - else CGContextSetRGBStrokeColor(ctx, 0, 0, 1, 0.4f); - } - - CGContextMoveToPoint(ctx, target.x, target.y); - CGContextAddLineToPoint(ctx, cp2.x, cp2.y); - CGContextStrokePath(ctx); - - CGContextAddEllipseInRect(ctx, ctrl2); - CGContextDrawPath(ctx, kCGPathFillStroke); - - CGContextRestoreGState(ctx); -} - -+ (float)handleRadius { return 4.0f; } - -@end diff --git a/tikzit-1/src/osx/EdgeStyle+Coder.h b/tikzit-1/src/osx/EdgeStyle+Coder.h deleted file mode 100644 index e35c18f..0000000 --- a/tikzit-1/src/osx/EdgeStyle+Coder.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// EdgeStyle+Coder.h -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "EdgeStyle.h" - -@interface EdgeStyle (Coder) -- (id)initWithCoder:(NSCoder*)coder; -- (void)encodeWithCoder:(NSCoder*)coder; -@end diff --git a/tikzit-1/src/osx/EdgeStyle+Coder.m b/tikzit-1/src/osx/EdgeStyle+Coder.m deleted file mode 100644 index 039344d..0000000 --- a/tikzit-1/src/osx/EdgeStyle+Coder.m +++ /dev/null @@ -1,50 +0,0 @@ -// -// EdgeStyle+Coder.m -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "EdgeStyle+Coder.h" - -@implementation EdgeStyle (Coder) - -- (id)initWithCoder:(NSCoder*)coder { - if (!(self = [super init])) return nil; - - name = [coder decodeObjectForKey:@"name"]; - category = [coder decodeObjectForKey:@"category"]; - headStyle = [coder decodeIntForKey:@"headStyle"]; - tailStyle = [coder decodeIntForKey:@"tailStyle"]; - decorationStyle = [coder decodeIntForKey:@"decorationStyle"]; - thickness = [coder decodeFloatForKey:@"thickness"]; - - return self; -} - -- (void)encodeWithCoder:(NSCoder*)coder { - [coder encodeObject:name forKey:@"name"]; - [coder encodeObject:category forKey:@"category"]; - [coder encodeInt:headStyle forKey:@"headStyle"]; - [coder encodeInt:tailStyle forKey:@"tailStyle"]; - [coder encodeInt:decorationStyle forKey:@"decorationStyle"]; - [coder encodeFloat:thickness forKey:@"thickness"]; -} - -@end diff --git a/tikzit-1/src/osx/Graph+Coder.h b/tikzit-1/src/osx/Graph+Coder.h deleted file mode 100644 index 1404fc2..0000000 --- a/tikzit-1/src/osx/Graph+Coder.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// Graph+Coder.h -// TikZiT -// -// Created by Aleks Kissinger on 27/04/2010. -// Copyright 2010 __MyCompanyName__. All rights reserved. -// - -#import -#import "Graph.h" - -@interface Graph (Coder) - -- (id)initWithCoder:(NSCoder*)coder; -- (void)encodeWithCoder:(NSCoder*)coder; - -@end diff --git a/tikzit-1/src/osx/Graph+Coder.m b/tikzit-1/src/osx/Graph+Coder.m deleted file mode 100644 index 7d3787e..0000000 --- a/tikzit-1/src/osx/Graph+Coder.m +++ /dev/null @@ -1,24 +0,0 @@ -// -// Graph+Coder.m -// TikZiT -// -// Created by Aleks Kissinger on 27/04/2010. -// Copyright 2010 __MyCompanyName__. All rights reserved. -// - -#import "Graph+Coder.h" -#import "TikzGraphAssembler.h" - -@implementation Graph(Coder) - -- (id)initWithCoder:(NSCoder*)coder { - NSString *tikz = [coder decodeObject]; - [TikzGraphAssembler parseTikz:tikz forGraph:self]; - return self; -} - -- (void)encodeWithCoder:(NSCoder*)coder { - [coder encodeObject:[self tikz]]; -} - -@end diff --git a/tikzit-1/src/osx/GraphicsView.h b/tikzit-1/src/osx/GraphicsView.h deleted file mode 100644 index 329b1e5..0000000 --- a/tikzit-1/src/osx/GraphicsView.h +++ /dev/null @@ -1,129 +0,0 @@ -// -// GraphicsView.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import -#import "PickSupport.h" -#import "Grid.h" -#import "Transformer.h" -#import "Graph.h" -#import "NodeStyle.h" -#import "StylePaletteController.h" -#import "ToolPaletteController.h" -#import "SelectBoxLayer.h" - -// mouse modes, corresponding to different tools. format: (tool)[sub-mode]Mode -typedef enum { - SelectMode = 0x10, - SelectBoxMode = 0x11, - SelectMoveMode = 0x12, - SelectEdgeBendMode = 0x14, - - NodeMode = 0x20, - - EdgeMode = 0x40, - EdgeDragMode = 0x41, - - CropMode = 0x80, - CropDragMode = 0x81 -} MouseMode; - -@class TikzSourceController; - -@interface GraphicsView : NSView { - BOOL enabled; - - IBOutlet NSApplication *application; - StylePaletteController *stylePaletteController; - ToolPaletteController *toolPaletteController; - - BOOL frameMoveMode; - - Graph *graph; - NSString *graphTikzOnMouseDown; - PickSupport *pickSupport; - //NSMapTable *nodeSelectionLayers; - NSMapTable *edgeControlLayers; - NSMapTable *nodeLayers; - NSPoint dragOrigin; - NSPoint dragTarget; - NSPoint oldTransformerOrigin; - NSPoint oldMainOrigin; - NSRect oldBounds; - //NSRect selectionBox; - Transformer *transformer; - - CALayer *mainLayer; - CALayer *gridLayer; - CALayer *graphLayer; - CALayer *hudLayer; - SelectBoxLayer *selectionLayer; - - MouseMode mouseMode; - Node *leaderNode; - Grid *grid; - - Edge *modifyEdge; - BOOL firstControlPoint; - - int bboxLeftRight; - int bboxBottomTop; - - NSUndoManager *documentUndoManager; - NSPoint startPoint; - - TikzSourceController *tikzSourceController; -} - -@property BOOL enabled; -@property (weak) Graph *graph; -@property IBOutlet TikzSourceController *tikzSourceController; -@property (readonly) Transformer *transformer; -@property (readonly) PickSupport *pickSupport; - -- (void)setDocumentUndoManager:(NSUndoManager*)um; -- (void)applyStyleToSelectedNodes:(NodeStyle*)style; -- (void)applyStyleToSelectedEdges:(EdgeStyle*)style; - -- (void)updateMouseMode; -- (void)refreshLayers; - -//- (void)registerUndo:(GraphChange *)change withActionName:(NSString*)name; -- (void)registerUndo:(NSString*)oldTikz withActionName:(NSString*)name; -//- (void)undoGraphChange:(GraphChange *)change; -- (void)undoGraphChange:(NSString*)oldTikz; -- (void)postGraphChange; -- (void)postSelectionChange; - -- (void)deselectAll:(id)sender; -- (void)selectAll:(id)sender; -- (void)cut:(id)sender; -- (void)copy:(id)sender; -- (void)paste:(id)sender; -- (void)delete:(id)sender; -- (void)bringForward:(id)sender; -- (void)flipHorizonal:(id)sender; -- (void)flipVertical:(id)sender; -- (void)reverseEdgeDirection:(id)sender; - -@end diff --git a/tikzit-1/src/osx/GraphicsView.m b/tikzit-1/src/osx/GraphicsView.m deleted file mode 100644 index efa7ecb..0000000 --- a/tikzit-1/src/osx/GraphicsView.m +++ /dev/null @@ -1,1216 +0,0 @@ -// -// GraphicsView.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "GraphicsView.h" -#import "util.h" -#import "CALayer+DrawLabel.h" - -#import "NodeSelectionLayer.h" -#import "NodeLayer.h" -#import "EdgeControlLayer.h" -#import "AppDelegate.h" -#import "TikzGraphAssembler.h" -#import "TikzSourceController.h" - -@interface GraphicsView (Private) -- (void)setupLayers; -- (void)addNodeLayers:(Node*)n; -- (void)addEdgeLayers:(Edge*)e; -- (void)removeNodeLayers:(Node*)n; -- (void)resetMainOrigin; -- (void)setMainOrigin:(NSPoint)o; -@end - -static CGColorRef cgGrayColor, cgWhiteColor, cgClearColor = nil; - - -@implementation GraphicsView - -@synthesize enabled, transformer, pickSupport, tikzSourceController; - -- (void)postGraphChange { - [[NSNotificationCenter defaultCenter] postNotificationName:@"GraphChanged" - object:self]; - [self postSelectionChange]; -} - -- (void)postSelectionChange { - [[NSNotificationCenter defaultCenter] postNotificationName:@"SelectionChanged" - object:self]; -} - -- (id)initWithFrame:(NSRect)frame { - self = [super initWithFrame:frame]; - if (self) { - if (cgClearColor == nil) { - cgClearColor = CGColorGetConstantColor(kCGColorClear); - cgGrayColor = CGColorCreateGenericGray(0.5f, 0.5f); - cgWhiteColor = CGColorCreateGenericRGB(1, 1, 1, 1); - } - - transformer = [[Transformer alloc] init]; - mouseMode = SelectMode; - grid = [Grid gridWithSpacing:1.0f - subdivisions:4 - transformer:transformer]; - [grid setSize:NSSizeFromCGSize([gridLayer bounds].size)]; - [transformer setScale:PIXELS_PER_UNIT]; - - [self setupLayers]; - - leaderNode = nil; - pickSupport = [[PickSupport alloc] init]; - frameMoveMode = NO; - - enabled = YES; - [self setGraph:[Graph graph]]; - } - return self; -} - -- (void)awakeFromNib { - AppDelegate *del = [application delegate]; - stylePaletteController = [del stylePaletteController]; - toolPaletteController = [del toolPaletteController]; - [self refreshLayers]; - [self postGraphChange]; -} - -- (void)setupLayers { - mainLayer = [CALayer layer]; - [mainLayer setBackgroundColor:cgWhiteColor]; - [mainLayer setFrame:CGRectIntegral(NSRectToCGRect([self bounds]))]; - [mainLayer setOpacity:1.0f]; - [self setLayer:mainLayer]; - [self resetMainOrigin]; - - gridLayer = [CALayer layer]; - [gridLayer setDelegate:grid]; - [gridLayer setOpacity:0.3f]; - [mainLayer addSublayer:gridLayer]; - - graphLayer = [CALayer layer]; - [graphLayer setDelegate:self]; - [mainLayer addSublayer:graphLayer]; - - hudLayer = [CALayer layer]; - [mainLayer addSublayer:hudLayer]; - - selectionLayer = [SelectBoxLayer layer]; - [mainLayer addSublayer:selectionLayer]; - - [transformer setOrigin:NSMakePoint(NSMidX([self bounds]),NSMidY([self bounds]))]; - oldBounds = [self bounds]; - [self refreshLayers]; -} - -// Lion resume feature -//- (void)encodeRestorableStateWithCoder:(NSCoder*)coder { -// NSLog(@"got encode request"); -//} -//- (void)restoreStateWithCoder:(NSCoder*)coder { -// NSLog(@"got decode request"); -//} - -- (void)registerUndo:(NSString*)oldTikz withActionName:(NSString*)nm { - [documentUndoManager registerUndoWithTarget:self - selector:@selector(undoGraphChange:) - object:oldTikz]; - [documentUndoManager setActionName:nm]; -} - -- (void)revertToTikz:(NSString*)tikz { - [tikzSourceController setTikz:tikz]; - [tikzSourceController tryParseTikz]; - [self refreshLayers]; - [self postGraphChange]; -} - - -- (void)undoGraphChange:(NSString*)oldTikz { - NSString *currentTikz = [graph tikz]; - [self revertToTikz:oldTikz]; - [documentUndoManager registerUndoWithTarget:self - selector:@selector(undoGraphChange:) - object:currentTikz]; -} - -- (void)setGraph:(Graph*)gr { - graph = gr; - - NSEnumerator *e; - CALayer *layer; - - e = [edgeControlLayers objectEnumerator]; - while (layer = [e nextObject]) [layer removeFromSuperlayer]; - edgeControlLayers = [NSMapTable mapTableWithStrongToStrongObjects]; - - - e = [nodeLayers objectEnumerator]; - while (layer = [e nextObject]) [layer removeFromSuperlayer]; - nodeLayers = [NSMapTable mapTableWithStrongToStrongObjects]; - - for (Node *n in [graph nodes]) { - [n attachStyleFromTable:[stylePaletteController nodeStyles]]; - [self addNodeLayers:n]; - } - - for (Edge *e in [graph edges]) { - [e setAttributesFromData]; - [e attachStyleFromTable:[stylePaletteController edgeStyles]]; - [self addEdgeLayers:e]; - } -} - -- (Graph*)graph { return graph; } - -- (void)setMainOrigin:(NSPoint)o { - o.x = round(o.x); - o.y = round(o.y); - CGRect rect = [mainLayer frame]; - rect.origin = NSPointToCGPoint(o); - [mainLayer setFrame:rect]; -} - -- (void)resetMainOrigin { - NSRect bds = [self bounds]; - bds.origin.x -= bds.size.width; - bds.origin.y -= bds.size.height; - bds.size.width *= 3; - bds.size.height *= 3; - [mainLayer setFrame:NSRectToCGRect([self bounds])]; -} - -- (void)refreshLayers { - [gridLayer setFrame:[mainLayer frame]]; - [graphLayer setFrame:[mainLayer frame]]; - [hudLayer setFrame:[mainLayer frame]]; - [selectionLayer setFrame:[mainLayer frame]]; - - if (enabled) { - [hudLayer setBackgroundColor:cgClearColor]; - } else { - [hudLayer setBackgroundColor:cgGrayColor]; - } - - [grid setSize:NSSizeFromCGSize([gridLayer bounds].size)]; - [gridLayer setNeedsDisplay]; - [graphLayer setNeedsDisplay]; - [hudLayer setNeedsDisplay]; - - NSEnumerator *e = [edgeControlLayers objectEnumerator]; - CALayer *layer; - while (layer = [e nextObject]) { - [layer setFrame:[graphLayer frame]]; - [layer setNeedsDisplay]; - } -} - - -- (void)viewDidEndLiveResize { - [super viewDidEndLiveResize]; - NSPoint o = [transformer origin]; - o.x += round(([self bounds].size.width - oldBounds.size.width)/2.0f); - o.y += round(([self bounds].size.height - oldBounds.size.height)/2.0f); - [transformer setOrigin:o]; - oldBounds = [self bounds]; - [self refreshLayers]; -} - -- (void)applyStyleToSelectedNodes:(NodeStyle*)style { - NSString *oldTikz = [graph tikz]; - - for (Node *n in [pickSupport selectedNodes]) { - [n setStyle:style]; - [[nodeLayers objectForKey:n] setNeedsDisplay]; - } - - [self registerUndo:oldTikz withActionName:@"Apply Style to Nodes"]; - [self refreshLayers]; - [self postGraphChange]; -} - -- (void)applyStyleToSelectedEdges:(EdgeStyle*)style { - NSString *oldTikz = [graph tikz]; - - for (Edge *e in [pickSupport selectedEdges]) { - [e setStyle:style]; - } - - [self registerUndo:oldTikz withActionName:@"Apply Style to Edges"]; - [self refreshLayers]; - [self postGraphChange]; -} - -- (void)addNodeLayers:(Node*)n { - // add a node to the graph - [graph addNode:n]; - - NSPoint pt = [transformer toScreen:[n point]]; - - // add a node layer - NodeLayer *nl = [[NodeLayer alloc] initWithNode:n transformer:transformer]; - [nl setCenter:pt]; - [nodeLayers setObject:nl forKey:n]; - [graphLayer addSublayer:nl]; - [nl setNeedsDisplay]; -} - -- (void)removeNodeLayers:(Node*)n { - [[nodeLayers objectForKey:n] removeFromSuperlayer]; - [nodeLayers removeObjectForKey:n]; -} - -- (void)addEdgeLayers:(Edge *)e { - [graph addEdge:e]; - EdgeControlLayer *ecl = [[EdgeControlLayer alloc] initWithEdge:e andTransformer:transformer]; - [edgeControlLayers setObject:ecl forKey:e]; - [ecl setFrame:CGRectMake(10, 10, 100, 100)]; - [hudLayer addSublayer:ecl]; - [ecl setNeedsDisplay]; -} - -- (void)removeEdgeLayers:(Edge*)e { - [[edgeControlLayers objectForKey:e] removeFromSuperlayer]; - [edgeControlLayers removeObjectForKey:e]; - [self refreshLayers]; -} - -- (BOOL)circleWithCenter:(NSPoint)center andRadius:(float)radius containsPoint:(NSPoint)p { - float dx = center.x - p.x; - float dy = center.y - p.y; - return (dx*dx + dy*dy) <= radius*radius; -} - -- (BOOL)node:(Node*)node containsPoint:(NSPoint)p { - NodeLayer *nl = [nodeLayers objectForKey:node]; - return [nl nodeContainsPoint:p]; -} - -- (BOOL)edge:(Edge*)edge containsPoint:(NSPoint)p { -// NSPoint center = [transformer toScreen:edge.mid]; -// float dx = center.x - p.x; -// float dy = center.y - p.y; -// float radius = 5.0f; // tolerence for clicks -// return (dx*dx + dy*dy) <= radius*radius; - - CGContextRef ctx = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort]; - - // Save the graphics state before doing the hit detection. - CGContextSaveGState(ctx); - - NSPoint src = [transformer toScreen:[edge tail]]; - NSPoint targ = [transformer toScreen:[edge head]]; - NSPoint cp1 = [transformer toScreen:[edge cp1]]; - NSPoint cp2 = [transformer toScreen:[edge cp2]]; - - CGContextSetLineWidth(ctx, 8.0f); - - CGContextMoveToPoint(ctx, src.x, src.y); - CGContextAddCurveToPoint(ctx, cp1.x, cp1.y, cp2.x, cp2.y, targ.x, targ.y); - - BOOL containsPoint = CGContextPathContainsPoint(ctx, NSPointToCGPoint(p), kCGPathStroke); - - CGContextSetRGBStrokeColor(ctx, 0, 0, 0, 0); - - CGContextStrokePath(ctx); - //CGContextFlush(ctx); - CGContextRestoreGState(ctx); - - return containsPoint; -} - -- (void)shiftNodes:(NSSet*)set from:(NSPoint)source to:(NSPoint)dest { - float dx = dest.x - source.x; - float dy = dest.y - source.y; - - for (Node *n in set) { - NSPoint p = [transformer toScreen:[n point]]; - p = [grid snapScreenPoint:NSMakePoint(p.x+dx, p.y+dy)]; - [n setPoint:[transformer fromScreen:p]]; - } -} - - -- (void)mouseDown:(NSEvent*)theEvent { - if (!enabled) return; - - [self updateMouseMode]; - - dragOrigin = [self convertPoint:[theEvent locationInWindow] fromView:nil]; - dragTarget = dragOrigin; - - graphTikzOnMouseDown = [graph tikz]; - - if ([theEvent modifierFlags] & NSCommandKeyMask) { - oldTransformerOrigin = [transformer origin]; - oldMainOrigin = [self frame].origin; - frameMoveMode = YES; - return; - } - - if (mouseMode == SelectMode) { - [selectionLayer setActive:YES]; - [selectionLayer setSelectBox:NSRectAroundPoints(dragOrigin, dragOrigin)]; - [selectionLayer setNeedsDisplay]; - - modifyEdge = nil; - NSPoint cp1, cp2; - for (Edge *e in [pickSupport selectedEdges]) { - cp1 = [transformer toScreen:[e cp1]]; - cp2 = [transformer toScreen:[e cp2]]; - if ([self circleWithCenter:cp1 - andRadius:[EdgeControlLayer handleRadius] - containsPoint:dragOrigin]) - { - mouseMode = SelectEdgeBendMode; - modifyEdge = e; - firstControlPoint = YES; - break; - } else if ([self circleWithCenter:cp2 - andRadius:[EdgeControlLayer handleRadius] - containsPoint:dragOrigin]) - { - mouseMode = SelectEdgeBendMode; - modifyEdge = e; - firstControlPoint = NO; - break; - } - } - - if (modifyEdge == nil) { // skip all the rest if we're modifying an edge - - leaderNode = nil; - - // in first pass, try to find a leader node, under the mouse - for (Node* n in [graph nodes]) { - if ([self node:n containsPoint:dragOrigin]) { - leaderNode = n; - [gridLayer setOpacity:1.0f]; - break; - } - } - - // if we found one, deselect the others (if appropriate) and go to move mode - if (leaderNode != nil) { - startPoint = [leaderNode point]; - - // if we select a node, we should always deselect all edges: - for (Edge *e in [graph edges]) [[edgeControlLayers objectForKey:e] deselect]; - [pickSupport deselectAllEdges]; - - BOOL shouldDeselect = - !([theEvent modifierFlags] & NSShiftKeyMask) - && ![pickSupport isNodeSelected:leaderNode]; - for (Node *n in [graph nodes]) { - if (n != leaderNode && shouldDeselect) { - [pickSupport deselectNode:n]; - [[[nodeLayers objectForKey:n] selection] deselect]; - } - } - - // ensure the leader node is actually selected - if (![pickSupport isNodeSelected:leaderNode]) { - [pickSupport selectNode:leaderNode]; - [[[nodeLayers objectForKey:leaderNode] selection] select]; - } - - - // put us in move mode - mouseMode = SelectMoveMode; - } else { - mouseMode = SelectBoxMode; - - // if we didn't select a node, start hunting for an edge to select - BOOL shouldDeselect = !([theEvent modifierFlags] & NSShiftKeyMask); - - if (shouldDeselect) { - [pickSupport deselectAllEdges]; - for (Edge *e in graph.edges) [[edgeControlLayers objectForKey:e] deselect]; - } - - for (Edge* e in [graph edges]) { - // find the first node under the pointer, select it, show its controls - // and deselect all others if shift isn't down - if ([self edge:e containsPoint:dragOrigin]) { - for (Node *n in [pickSupport selectedNodes]) [[[nodeLayers objectForKey:n] selection] deselect]; - - [pickSupport deselectAllNodes]; - [pickSupport selectEdge:e]; - [[edgeControlLayers objectForKey:e] select]; - break; - } - } // end for e in [graph edges] - } // end if leaderNode == nil - } // end if modifyEdge == nil - - } else if (mouseMode == NodeMode) { - // do nothing... - } else if (mouseMode == EdgeMode) { - for (Node *n in [graph nodes]) { - if ([self node:n containsPoint:dragOrigin]) { - [[[nodeLayers objectForKey:n] selection] highlight]; - } - } - mouseMode = EdgeDragMode; - } else if (mouseMode == CropMode) { - if ([graph hasBoundingBox]) { - float fudge = 3; - - NSRect bb = [graph boundingBox]; - NSPoint bl = [transformer toScreen:bb.origin]; - NSPoint tr = [transformer - toScreen:NSMakePoint(bb.origin.x+bb.size.width, - bb.origin.y+bb.size.height)]; - if (dragOrigin.x > bl.x-fudge && dragOrigin.x < tr.x+fudge && - dragOrigin.y > tr.y-fudge && dragOrigin.y < tr.y+fudge) - { - bboxBottomTop = 1; - } else if (dragOrigin.x > bl.x-fudge && dragOrigin.x < tr.x+fudge && - dragOrigin.y > bl.y-fudge && dragOrigin.y < bl.y+fudge) - { - bboxBottomTop = -1; - } else { - bboxBottomTop = 0; - } - - if (dragOrigin.y > bl.y-fudge && dragOrigin.y < tr.y+fudge && - dragOrigin.x > tr.x-fudge && dragOrigin.x < tr.x+fudge) - { - bboxLeftRight = 1; - } else if (dragOrigin.y > bl.y-fudge && dragOrigin.y < tr.y+fudge && - dragOrigin.x > bl.x-fudge && dragOrigin.x < bl.x+fudge) - { - bboxLeftRight = -1; - } else { - bboxLeftRight = 0; - } - - if (bboxBottomTop != 0 || bboxLeftRight != 0) { - mouseMode = CropDragMode; - } - } - } else { - printf("WARNING: MOUSE DOWN IN INVALID MODE.\n"); - } - - [self refreshLayers]; -} - -- (void)mouseDragged:(NSEvent *)theEvent { - if (!enabled) return; - dragTarget = [self convertPoint:[theEvent locationInWindow] fromView:nil]; - - if (frameMoveMode) { - NSPoint newTransOrigin, newMainOrigin; - NSPoint diff = NSMakePoint(dragTarget.x - dragOrigin.x, dragTarget.y - dragOrigin.y); - newTransOrigin.x = oldTransformerOrigin.x + diff.x; - newTransOrigin.y = oldTransformerOrigin.y + diff.y; - newMainOrigin.x = oldMainOrigin.x + diff.x; - newMainOrigin.y = oldMainOrigin.y + diff.y; - - [CATransaction begin]; - [CATransaction setValue:(id)kCFBooleanTrue forKey:kCATransactionDisableActions]; - [self setMainOrigin:newMainOrigin]; - [CATransaction commit]; - - [transformer setOrigin:newTransOrigin]; - return; - } - - if (mouseMode == SelectBoxMode) { - [selectionLayer setSelectBox:NSRectAroundPoints(dragOrigin, dragTarget)]; - [selectionLayer setNeedsDisplay]; - - for (Node* n in [graph nodes]) { - if (NSPointInRect([transformer toScreen:[n point]], [selectionLayer selectBox])) { - [[[nodeLayers objectForKey:n] selection] highlight]; - } else if (!([theEvent modifierFlags] & NSShiftKeyMask)) { - [[[nodeLayers objectForKey:n] selection] unhighlight]; - } - } - } else if (mouseMode == SelectMoveMode) { - if (leaderNode != nil) { - [self shiftNodes:[pickSupport selectedNodes] - from:[transformer toScreen:[leaderNode point]] - to:dragTarget]; - } else { - printf("WARNING: LEADER NODE SHOULD NOT BE NIL.\n"); - } - - [self refreshLayers]; - } else if (mouseMode == SelectEdgeBendMode) { - NSPoint src = [transformer toScreen:[[modifyEdge source] point]]; - NSPoint targ = [transformer toScreen:[[modifyEdge target] point]]; - float dx1 = targ.x - src.x; - float dy1 = targ.y - src.y; - float dx2, dy2; - if (firstControlPoint) { - dx2 = dragTarget.x - src.x; - dy2 = dragTarget.y - src.y; - } else { - dx2 = dragTarget.x - targ.x; - dy2 = dragTarget.y - targ.y; - } - float base_dist = sqrt(dx1*dx1 + dy1*dy1); - float handle_dist = sqrt(dx2*dx2 + dy2*dy2); - float wcourseness = 0.1f; - - if (![modifyEdge isSelfLoop]) { - if (base_dist != 0) { - [modifyEdge setWeight:roundToNearest(wcourseness, handle_dist/base_dist)]; - //round(handle_dist / (base_dist*wcourseness)) * wcourseness; - } else { - [modifyEdge setWeight: - roundToNearest(wcourseness, [transformer scaleFromScreen:handle_dist])]; - } - } - - - float control_angle = good_atan(dx2, dy2); - - int bcourseness = 15; - - if ([modifyEdge bendMode] == EdgeBendModeBasic) { - float bnd; - float base_angle = good_atan(dx1, dy1); - if (firstControlPoint) { - bnd = base_angle - control_angle; - } else { - bnd = control_angle - base_angle + pi; - if (bnd > pi) bnd -= 2*pi; - } - - [modifyEdge setBend:round(bnd * (180.0f / pi) * - (1.0f / (float)bcourseness)) * - bcourseness]; - } else { - int bnd = round(control_angle * (180.0f / pi) * - (1.0f / (float)bcourseness)) * - bcourseness; - if (firstControlPoint) { - if ([theEvent modifierFlags] & NSAlternateKeyMask) { - if ([modifyEdge isSelfLoop]) { - [modifyEdge setInAngle:[modifyEdge inAngle] + - (bnd - [modifyEdge outAngle])]; - } else { - [modifyEdge setInAngle:[modifyEdge inAngle] - - (bnd - [modifyEdge outAngle])]; - } - } - - [modifyEdge setOutAngle:bnd]; - } else { - if (theEvent.modifierFlags & NSAlternateKeyMask) { - if ([modifyEdge isSelfLoop]) { - [modifyEdge setOutAngle:[modifyEdge outAngle] + - (bnd - [modifyEdge inAngle])]; - } else { - [modifyEdge setOutAngle:[modifyEdge outAngle] - - (bnd - [modifyEdge inAngle])]; - } - } - - [modifyEdge setInAngle:bnd]; - } - } - - [self refreshLayers]; - } else if (mouseMode == NodeMode) { - // do nothing... - } else if (mouseMode == EdgeDragMode) { - for (Node *n in [graph nodes]) { - if ([self node:n containsPoint:dragOrigin] || - [self node:n containsPoint:dragTarget]) - { - [[[nodeLayers objectForKey:n] selection] highlight]; - } else { - [[[nodeLayers objectForKey:n] selection] unhighlight]; - } - } - - [self refreshLayers]; - } else if (mouseMode == CropMode || mouseMode == CropDragMode) { - NSPoint p1 = [transformer fromScreen:[grid snapScreenPoint:dragOrigin]]; - NSPoint p2 = [transformer fromScreen:[grid snapScreenPoint:dragTarget]]; - - NSRect bbox; - if (mouseMode == CropDragMode) { - bbox = [graph boundingBox]; - if (bboxBottomTop == -1) { - float dy = p2.y - bbox.origin.y; - bbox.origin.y += dy; - bbox.size.height -= dy; - } else if (bboxBottomTop == 1) { - float dy = p2.y - (bbox.origin.y + bbox.size.height); - bbox.size.height += dy; - } - - if (bboxLeftRight == -1) { - float dx = p2.x - bbox.origin.x; - bbox.origin.x += dx; - bbox.size.width -= dx; - } else if (bboxLeftRight == 1) { - float dx = p2.x - (bbox.origin.x + bbox.size.width); - bbox.size.width += dx; - } - } else { - bbox = NSRectAroundPoints(p1, p2); - } - - [graph setBoundingBox:bbox]; - [self postGraphChange]; - [self refreshLayers]; - } else { - printf("WARNING: MOUSE DRAGGED IN INVALID MODE.\n"); - } -} - -- (void)mouseUp:(NSEvent*)theEvent { - if (!enabled) return; - - if (frameMoveMode) { - [CATransaction begin]; - [CATransaction setValue:(id)kCFBooleanTrue forKey:kCATransactionDisableActions]; - [self resetMainOrigin]; - [self refreshLayers]; - [CATransaction commit]; - frameMoveMode = NO; - return; - } - - dragTarget = [self convertPoint:[theEvent locationInWindow] fromView:nil]; - - if ((mouseMode & SelectMode) == SelectMode && [theEvent clickCount] == 2) { - for (Edge *e in [graph edges]) { - if ([self edge:e containsPoint:dragTarget]) { - if ([e bendMode] == EdgeBendModeBasic) { - [e convertBendToAngles]; - [e setBendMode:EdgeBendModeInOut]; - } else { - [e convertAnglesToBend]; - [e setBendMode:EdgeBendModeBasic]; - } - - [self registerUndo:graphTikzOnMouseDown withActionName:@"Change Edge Mode"]; - [self postGraphChange]; - break; - } - } - } - - if (mouseMode == SelectBoxMode) { - for (Node* n in [graph nodes]) { - if (NSPointInRect([transformer toScreen:[n point]], [selectionLayer selectBox])) { - [pickSupport selectNode:n]; - [[[nodeLayers objectForKey:n] selection] select]; - } else if (!([theEvent modifierFlags] & NSShiftKeyMask)) { - [pickSupport deselectNode:n]; - [[[nodeLayers objectForKey:n] selection] deselect]; - } - } - - [selectionLayer setActive:NO]; - [selectionLayer setNeedsDisplay]; - [self postSelectionChange]; - - mouseMode = SelectMode; - } else if (mouseMode == SelectMoveMode) { - [gridLayer setOpacity:0.3f]; - - if (dragTarget.x != dragOrigin.x || dragTarget.y != dragOrigin.y) { - [self registerUndo:graphTikzOnMouseDown withActionName:@"Shift Nodes"]; - } - - leaderNode = nil; - - [self postGraphChange]; - mouseMode = SelectMode; - } else if (mouseMode == SelectEdgeBendMode) { - [self registerUndo:graphTikzOnMouseDown withActionName:@"Adjust Edge"]; - [self postGraphChange]; - mouseMode = SelectMode; - modifyEdge = nil; - } else if (mouseMode == NodeMode) { - NSPoint coords = [transformer fromScreen:[grid snapScreenPoint:dragTarget]]; - Node *n = [Node nodeWithPoint:coords]; - [n setStyle:[stylePaletteController activeNodeStyle]]; - [graph addNode:n]; - - [self registerUndo:graphTikzOnMouseDown withActionName:@"Add Node"]; - - [self addNodeLayers:n]; - [self postGraphChange]; - } else if (mouseMode == EdgeDragMode) { - Node *src = nil; - Node *targ = nil; - BOOL found = NO; // don't break the loop until everything is unhighlighted - for (Node *n in [graph nodes]) { - [[[nodeLayers objectForKey:n] selection] unhighlight]; - if (!found) { - if ([self node:n containsPoint:dragOrigin]) src = n; - if ([self node:n containsPoint:dragTarget]) targ = n; - if (src != nil && targ != nil) { - Edge *e = [Edge edgeWithSource:src andTarget:targ]; - [e setStyle:[stylePaletteController activeEdgeStyle]]; - [graph addEdge:e]; - [self registerUndo:graphTikzOnMouseDown withActionName:@"Add Edge"]; - [self addEdgeLayers:e]; - found = YES; - } - } - } - - [self postGraphChange]; - mouseMode = EdgeMode; - } else if (mouseMode == CropMode || mouseMode == CropDragMode) { - if (dragOrigin.x == dragTarget.x && dragOrigin.y == dragTarget.y) { - [graph setBoundingBox:NSMakeRect(0, 0, 0, 0)]; - [self registerUndo:graphTikzOnMouseDown withActionName:@"Clear Bounding Box"]; - [self postGraphChange]; - } else { - [self registerUndo:graphTikzOnMouseDown withActionName:@"Change Bounding Box"]; - } - - mouseMode = CropMode; - } else { - if (! ([theEvent modifierFlags] & NSCommandKeyMask)) - printf("WARNING: MOUSE UP IN INVALID MODE.\n"); - } - - [self refreshLayers]; -} - -- (void)drawNode:(Node*)nd onLayer:(CALayer*)layer inContext:(CGContextRef)context { - NSPoint pt = [transformer toScreen:[nd point]]; - - NodeLayer *nl = [nodeLayers objectForKey:nd]; - //[nl setStrokeWidth:2.0f]; - [nl setCenter:pt andAnimateWhen:(mouseMode != SelectMoveMode)]; -} - -- (void)drawEdge:(Edge*)e onLayer:(CALayer*)layer inContext:(CGContextRef)context { - CGContextSaveGState(context); - NSPoint src = [transformer toScreen:[e tail]]; - NSPoint targ = [transformer toScreen:[e head]]; - NSPoint cp1 = [transformer toScreen:[e cp1]]; - NSPoint cp2 = [transformer toScreen:[e cp2]]; - - // all nodes have the same radius. this will need to be fixed - float sradius = 0;//(slayer.ghost) ? 0 : slayer.radius; - float tradius = 0;//(tlayer.ghost) ? 0 : tlayer.radius; - - float sdx = cp1.x - src.x; - float sdy = cp1.y - src.y; - float sdist = sqrt(sdx*sdx + sdy*sdy); - float sshortx = (sdist==0) ? 0 : sdx/sdist * sradius; - float sshorty = (sdist==0) ? 0 : sdy/sdist * sradius; - - float tdx = cp2.x - targ.x; - float tdy = cp2.y - targ.y; - float tdist = sqrt(tdx*tdx + tdy*tdy); - float tshortx = (tdist==0) ? 0 : tdx/tdist * tradius; - float tshorty = (tdist==0) ? 0 : tdy/tdist * tradius; - - CGContextMoveToPoint(context, src.x+sshortx, src.y+sshorty); - CGContextAddCurveToPoint(context, cp1.x, cp1.y, cp2.x, cp2.y, targ.x+tshortx, targ.y+tshorty); - - - float lineWidth = [transformer scaleToScreen:0.04f]; - - CGContextSetLineWidth(context, lineWidth); - CGContextSetRGBStrokeColor(context, 0, 0, 0, 1); - CGContextSetRGBFillColor(context, 0, 0, 0, 1); - CGContextStrokePath(context); - - if ([e style] != nil) { - NSPoint p1,p2,p3; - - // draw edge decoration - switch ([[e style] decorationStyle]) { - case ED_None: - break; - case ED_Tick: - p1 = [transformer toScreen:[e leftNormal]]; - p2 = [transformer toScreen:[e rightNormal]]; - CGContextMoveToPoint(context, p1.x, p1.y); - CGContextAddLineToPoint(context, p2.x, p2.y); - CGContextStrokePath(context); - break; - case ED_Arrow: - p1 = [transformer toScreen:[e leftNormal]]; - p2 = [transformer toScreen:[e midTan]]; - p3 = [transformer toScreen:[e rightNormal]]; - CGContextMoveToPoint(context, p1.x, p1.y); - CGContextAddLineToPoint(context, p2.x, p2.y); - CGContextAddLineToPoint(context, p3.x, p3.y); - CGContextStrokePath(context); - break; - } - - // draw arrow head - switch ([[e style] headStyle]) { - case AH_None: - break; - case AH_Plain: - p1 = [transformer toScreen:[e leftHeadNormal]]; - p2 = [transformer toScreen:[e head]]; - p3 = [transformer toScreen:[e rightHeadNormal]]; - CGContextMoveToPoint(context, p1.x, p1.y); - CGContextAddLineToPoint(context, p2.x, p2.y); - CGContextAddLineToPoint(context, p3.x, p3.y); - CGContextStrokePath(context); - break; - case AH_Latex: - p1 = [transformer toScreen:[e leftHeadNormal]]; - p2 = [transformer toScreen:[e head]]; - p3 = [transformer toScreen:[e rightHeadNormal]]; - CGContextMoveToPoint(context, p1.x, p1.y); - CGContextAddLineToPoint(context, p2.x, p2.y); - CGContextAddLineToPoint(context, p3.x, p3.y); - CGContextClosePath(context); - CGContextFillPath(context); - break; - } - - // draw arrow tail - switch ([[e style] tailStyle]) { - case AH_None: - break; - case AH_Plain: - p1 = [transformer toScreen:[e leftTailNormal]]; - p2 = [transformer toScreen:[e tail]]; - p3 = [transformer toScreen:[e rightTailNormal]]; - CGContextMoveToPoint(context, p1.x, p1.y); - CGContextAddLineToPoint(context, p2.x, p2.y); - CGContextAddLineToPoint(context, p3.x, p3.y); - CGContextStrokePath(context); - break; - case AH_Latex: - p1 = [transformer toScreen:[e leftTailNormal]]; - p2 = [transformer toScreen:[e tail]]; - p3 = [transformer toScreen:[e rightTailNormal]]; - CGContextMoveToPoint(context, p1.x, p1.y); - CGContextAddLineToPoint(context, p2.x, p2.y); - CGContextAddLineToPoint(context, p3.x, p3.y); - CGContextClosePath(context); - CGContextFillPath(context); - break; - } - } - - - CGContextRestoreGState(context); - - if ([e hasEdgeNode]) { - Node *en = [e edgeNode]; - NSPoint mid = [transformer toScreen:[e mid]]; - if (![[en label] isEqual:@""]) { - [layer drawLabel:[en label] - atPoint:mid - inContext:context - usingTrans:transformer]; - } - } - - EdgeControlLayer *ecl = [edgeControlLayers objectForKey:e]; - [ecl setNeedsDisplay]; -} - - -// draw the graph layer --(void)drawLayer:(CALayer *)layer inContext:(CGContextRef)context { - for (Edge* e in [graph edges]) [self drawEdge:e onLayer:layer inContext:context]; - - for (Node* n in [graph nodes]) [self drawNode:n onLayer:layer inContext:context]; - - if ([graph hasBoundingBox]) { - CGRect bbox = NSRectToCGRect(NSIntegralRect( - [transformer rectToScreen:[graph boundingBox]])); - CGContextSetRGBStrokeColor(context, 1.0f, 0.7f, 0.5f, 1.0f); - CGContextSetLineWidth(context, 1.0f); - CGContextSetShouldAntialias(context, NO); - CGContextStrokeRect(context, bbox); - CGContextSetShouldAntialias(context, YES); - } - - if (mouseMode == EdgeDragMode) { - CGContextMoveToPoint(context, dragOrigin.x, dragOrigin.y); - CGContextAddLineToPoint(context, dragTarget.x, dragTarget.y); - CGContextSetLineWidth(context, 2); - CGContextSetRGBStrokeColor(context, 0, 0, 1, 1); - CGContextStrokePath(context); - } -} - -// if enabled, suppress the default "bonk" behaviour on key presses -- (void)keyDown:(NSEvent *)theEvent { - if (!enabled) [super keyDown:theEvent]; -} - -- (void)delete:(id)sender { - BOOL didDelete = NO; - NSString *oldTikz = [graph tikz]; - - if ([[pickSupport selectedNodes] count] != 0) { - GraphChange *change = [graph removeNodes:[pickSupport selectedNodes]]; - for (Node *n in [change affectedNodes]) [self removeNodeLayers:n]; - for (Edge *e in [change affectedEdges]) [self removeEdgeLayers:e]; - - [self refreshLayers]; - [self postGraphChange]; - didDelete = YES; - } - - if ([[pickSupport selectedEdges] count] != 0) { - [graph removeEdges:[pickSupport selectedEdges]]; - for (Edge *e in [pickSupport selectedEdges]) [self removeEdgeLayers:e]; - [self refreshLayers]; - [self postGraphChange]; - didDelete = YES; - } - - [pickSupport deselectAllNodes]; - [pickSupport deselectAllEdges]; - - if (didDelete) [self registerUndo:oldTikz withActionName:@"Delete Nodes or Edges"]; -} - -- (void)keyUp:(NSEvent *)theEvent { - if (!enabled) return; - - id sender = self; - switch ([theEvent keyCode]) { - case 51: // delete - [self delete:sender]; // "self" is the sender - break; - case 1: // S - [toolPaletteController setSelectedTool:TikzToolSelect]; - break; - case 45: // N - case 9: // V - [toolPaletteController setSelectedTool:TikzToolNode]; - break; - case 14: // E - [toolPaletteController setSelectedTool:TikzToolEdge]; - //[self updateMouseMode]; - break; - case 40: // K - [toolPaletteController setSelectedTool:TikzToolCrop]; - break; - } - [self refreshLayers]; -} - - -- (void)deselectAll:(id)sender { - [pickSupport deselectAllNodes]; - [pickSupport deselectAllEdges]; - - for (Node *n in [graph nodes]) { - [[[nodeLayers objectForKey:n] selection] deselect]; - } - - for (Edge *e in [graph edges]) { - [[edgeControlLayers objectForKey:e] deselect]; - } - - [self postSelectionChange]; -} - -- (void)selectAll:(id)sender { - [pickSupport selectAllNodes:[NSSet setWithArray:[graph nodes]]]; - - for (Node *n in [graph nodes]) { - [[[nodeLayers objectForKey:n] selection] select]; - } - - [self postSelectionChange]; -} - - -- (void)updateMouseMode { - switch (toolPaletteController.selectedTool) { - case TikzToolSelect: - mouseMode = SelectMode; - break; - case TikzToolNode: - mouseMode = NodeMode; - break; - case TikzToolEdge: - mouseMode = EdgeMode; - break; - case TikzToolCrop: - mouseMode = CropMode; - break; - } -} - -- (void)setDocumentUndoManager:(NSUndoManager *)um { - documentUndoManager = um; -} - -- (void)copy:(id)sender { - if ([[pickSupport selectedNodes] count] != 0) { - Graph *clip = [graph copyOfSubgraphWithNodes:[pickSupport selectedNodes]]; - NSString *tikz = [clip tikz]; - NSData *data = [tikz dataUsingEncoding:NSUTF8StringEncoding]; - //NSLog(@"about to copy: %@", tikz); - NSPasteboard *cb = [NSPasteboard generalPasteboard]; - [cb declareTypes:[NSArray arrayWithObject:@"tikzpicture"] owner:self]; - [cb setData:data forType:@"tikzpicture"]; - } -} - -- (void)cut:(id)sender { - if ([[pickSupport selectedNodes] count] != 0) { - [self copy:sender]; - [self delete:sender]; - - // otherwise, menu will say "Undo Delete Graph" - [documentUndoManager setActionName:@"Cut Graph"]; - } -} - -- (void)paste:(id)sender { - NSPasteboard *cb = [NSPasteboard generalPasteboard]; - NSString *type = [cb availableTypeFromArray:[NSArray arrayWithObject:@"tikzpicture"]]; - if (type) { - NSData *data = [cb dataForType:type]; - NSString *tikz = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]; - //NSLog(@"pasting tikz:\n%@",tikz); - Graph *clip = [TikzGraphAssembler parseTikz:tikz]; - if (clip) { - //NSLog(@"tikz pasted:\n%@",tikz); - NSRect graphBounds = [graph bounds]; - NSRect clipBounds = [clip bounds]; - float dx = graphBounds.origin.x + - graphBounds.size.width - - clipBounds.origin.x + 0.5f; - [clip shiftNodes:[clip nodes] byPoint:NSMakePoint(dx, 0)]; - - if ([[clip nodes] count] != 0) { - NSString *oldTikz = [graph tikz]; - [self deselectAll:self]; - - // select everything from the clipboard - for (Node *n in [clip nodes]) { - [n attachStyleFromTable:[stylePaletteController nodeStyles]]; - [self addNodeLayers:n]; - [pickSupport selectNode:n]; - [[[nodeLayers objectForKey:n] selection] select]; - } - - for (Edge *e in [clip edges]) { - [e attachStyleFromTable:[stylePaletteController edgeStyles]]; - [self addEdgeLayers:e]; - } - - [graph insertGraph:clip]; - - [self registerUndo:oldTikz withActionName:@"Paste Graph"]; - [self refreshLayers]; - [self postGraphChange]; - } - } else { - NSLog(@"Error: couldn't parse tikz picture from clipboard."); - } - - } -} - -- (void)bringForward:(id)sender { - NSString *oldTikz = [graph tikz]; - [graph bringNodesForward:[pickSupport selectedNodes]]; - [graph bringEdgesForward:[pickSupport selectedEdges]]; - [self registerUndo:oldTikz withActionName:@"Bring Forward"]; - [self postGraphChange]; - [self refreshLayers]; -} - -- (void)sendBackward:(id)sender { - NSString *oldTikz = [graph tikz]; - [graph sendNodesBackward:[pickSupport selectedNodes]]; - [graph sendEdgesBackward:[pickSupport selectedEdges]]; - [self registerUndo:oldTikz withActionName:@"Send Backward"]; - [self postGraphChange]; - [self refreshLayers]; -} - -- (void)bringToFront:(id)sender { - NSString *oldTikz = [graph tikz]; - [graph bringNodesToFront:[pickSupport selectedNodes]]; - [graph bringEdgesToFront:[pickSupport selectedEdges]]; - [self registerUndo:oldTikz withActionName:@"Bring to Front"]; - [self postGraphChange]; - [self refreshLayers]; -} - -- (void)sendToBack:(id)sender { - NSString *oldTikz = [graph tikz]; - [graph sendNodesToBack:[pickSupport selectedNodes]]; - [graph sendEdgesToBack:[pickSupport selectedEdges]]; - [self registerUndo:oldTikz withActionName:@"Send to Back"]; - [self postGraphChange]; - [self refreshLayers]; -} - -- (void)flipHorizonal:(id)sender { - NSString *oldTikz = [graph tikz]; - [graph flipHorizontalNodes:[pickSupport selectedNodes]]; - [self registerUndo:oldTikz withActionName:@"Flip Horizontal"]; - [self postGraphChange]; - [self refreshLayers]; -} - -- (void)flipVertical:(id)sender { - NSString *oldTikz = [graph tikz]; - [graph flipVerticalNodes:[pickSupport selectedNodes]]; - [self registerUndo:oldTikz withActionName:@"Flip Vertical"]; - [self postGraphChange]; - [self refreshLayers]; -} - -- (void)reverseEdgeDirection:(id)sender { - NSString *oldTikz = [graph tikz]; - - NSSet *es; - if ([[pickSupport selectedEdges] count] != 0) { - es = [pickSupport selectedEdges]; - } else { - es = [graph incidentEdgesForNodes:[pickSupport selectedNodes]]; - } - - for (Edge *e in es) [e reverse]; - - [self registerUndo:oldTikz withActionName:@"Flip Edge Direction"]; - [self postGraphChange]; - [self refreshLayers]; -} - -- (BOOL)acceptsFirstResponder { return YES; } -- (BOOL)acceptsFirstMouse:(NSEvent *)theEvent { return YES; } -- (BOOL)canBecomeKeyView { return YES; } - - -@end diff --git a/tikzit-1/src/osx/Grid.h b/tikzit-1/src/osx/Grid.h deleted file mode 100644 index 76826e2..0000000 --- a/tikzit-1/src/osx/Grid.h +++ /dev/null @@ -1,48 +0,0 @@ -// -// Grid.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "Transformer.h" - -@interface Grid : NSObject { - float gridX, gridY; - //float gridCellX, gridCellY; - int subdivisions; - Transformer *transformer; - NSSize size; -} - -@property NSSize size; - -- (id)initWithSpacing:(float)spacing subdivisions:(int)subs transformer:(Transformer*)t; -+ (Grid*)gridWithSpacing:(float)spacing subdivisions:(int)subs transformer:(Transformer*)t; -- (NSPoint)snapScreenPoint:(NSPoint)p; -- (float)gridX; -- (float)gridY; -- (int)subdivisions; -- (void)setSubdivisions:(int)subs; - -// Grid can also draw itself on a layer -- (void)drawLayer:(CALayer *)layer inContext:(CGContextRef)ctx; - -@end diff --git a/tikzit-1/src/osx/Grid.m b/tikzit-1/src/osx/Grid.m deleted file mode 100644 index aa35c1f..0000000 --- a/tikzit-1/src/osx/Grid.m +++ /dev/null @@ -1,152 +0,0 @@ -// -// Grid.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "Grid.h" - - -@implementation Grid - -@synthesize size; - -- (id)initWithSpacing:(float)spacing - subdivisions:(int)subs - transformer:(Transformer*)t -{ - if (!(self = [super init])) return nil; - gridX = spacing; - gridY = spacing; - subdivisions = subs; - size.width = 0; - size.height = 0; - transformer = t; - return self; -} - -+ (Grid*)gridWithSpacing:(float)spacing - subdivisions:(int)subs - transformer:(Transformer*)t -{ - return [[Grid alloc] initWithSpacing:spacing - subdivisions:subs - transformer:t]; -} - -- (float)gridX { - return gridX; -} - -- (float)gridY { - return gridY; -} - -- (int)subdivisions { - return subdivisions; -} - -- (void)setSubdivisions:(int)subs { - subdivisions = subs; -} - -- (NSPoint)snapScreenPoint:(NSPoint)p { - NSPoint snap; - - float gridCellX = [transformer scaleToScreen:gridX] / (float)subdivisions; - float gridCellY = [transformer scaleToScreen:gridY] / (float)subdivisions; - - // snap along grid lines, relative to the origin - snap.x = floor(((p.x-[transformer origin].x)/gridCellX)+0.5)*gridCellX + [transformer origin].x; - snap.y = floor(((p.y-[transformer origin].y)/gridCellY)+0.5)*gridCellY + [transformer origin].y; - return snap; -} - --(void)drawLayer:(CALayer *)layer inContext:(CGContextRef)context -{ - CGContextSaveGState(context); - - CGContextSetShouldAntialias(context, NO); - - float x,y; - float grX = [transformer scaleToScreen:gridX]; - float grY = [transformer scaleToScreen:gridY]; - - float gridCellX = grX / (float)subdivisions; - float gridCellY = grY / (float)subdivisions; - - for (x = [transformer origin].x + gridCellX; x < size.width; x += gridCellX) { - CGContextMoveToPoint(context, x, 0); - CGContextAddLineToPoint(context, x, size.height); - } - - for (x = [transformer origin].x - gridCellX; x > 0; x -= gridCellX) { - CGContextMoveToPoint(context, x, 0); - CGContextAddLineToPoint(context, x, size.height); - } - - for (y = [transformer origin].y + gridCellY; y < size.height; y += gridCellY) { - CGContextMoveToPoint(context, 0, y); - CGContextAddLineToPoint(context, size.width, y); - } - - for (y = [transformer origin].y - gridCellY; y > 0; y -= gridCellY) { - CGContextMoveToPoint(context, 0, y); - CGContextAddLineToPoint(context, size.width, y); - } - - CGContextSetRGBStrokeColor(context, 0.9, 0.9, 1, 1); - CGContextStrokePath(context); - - for (x = [transformer origin].x + grX; x < size.width; x += grX) { - CGContextMoveToPoint(context, x, 0); - CGContextAddLineToPoint(context, x, size.height); - } - - for (x = [transformer origin].x - grX; x > 0; x -= grX) { - CGContextMoveToPoint(context, x, 0); - CGContextAddLineToPoint(context, x, size.height); - } - - for (y = [transformer origin].y + grY; y < size.height; y += grY) { - CGContextMoveToPoint(context, 0, y); - CGContextAddLineToPoint(context, size.width, y); - } - - for (y = [transformer origin].y + grY; y > 0; y -= grY) { - CGContextMoveToPoint(context, 0, y); - CGContextAddLineToPoint(context, size.width, y); - } - - CGContextSetRGBStrokeColor(context, 0.8, 0.8, 0.9, 1); - CGContextStrokePath(context); - - CGContextMoveToPoint(context, [transformer origin].x, 0); - CGContextAddLineToPoint(context, [transformer origin].x, size.height); - CGContextMoveToPoint(context, 0, [transformer origin].y); - CGContextAddLineToPoint(context, size.width, [transformer origin].y); - - CGContextSetRGBStrokeColor(context, 0.6, 0.6, 0.7, 1); - CGContextStrokePath(context); - - CGContextRestoreGState(context); -} - -@end diff --git a/tikzit-1/src/osx/MultiCombo.h b/tikzit-1/src/osx/MultiCombo.h deleted file mode 100644 index c8ec769..0000000 --- a/tikzit-1/src/osx/MultiCombo.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// MultiCombo.h -// TikZiT -// -// Created by Aleks Kissinger on 21/04/2011. -// Copyright 2011 __MyCompanyName__. All rights reserved. -// - -#import - - -@interface MultiCombo : NSComboBox { - BOOL multi; -} - -@property (readwrite,assign) BOOL multi; - -@end diff --git a/tikzit-1/src/osx/MultiCombo.m b/tikzit-1/src/osx/MultiCombo.m deleted file mode 100644 index 8930460..0000000 --- a/tikzit-1/src/osx/MultiCombo.m +++ /dev/null @@ -1,38 +0,0 @@ -// -// MultiCombo.m -// TikZiT -// -// Created by Aleks Kissinger on 21/04/2011. -// Copyright 2011 __MyCompanyName__. All rights reserved. -// - -#import "MultiCombo.h" - - -@implementation MultiCombo - -- (void)textDidChange:(NSNotification *)notification { - [super textDidChange:notification]; - [self setMulti:NO]; -} - -- (void)setMulti:(BOOL)m { - multi = m; - if (multi) { - [self setTextColor:[NSColor grayColor]]; - [self setStringValue:@"multiple values"]; - } -} - -- (BOOL)multi { return multi; } - -- (BOOL)becomeFirstResponder { - [super becomeFirstResponder]; - if ([self multi]) { - [self setTextColor:[NSColor blackColor]]; - [self setStringValue:@""]; - } - return YES; -} - -@end diff --git a/tikzit-1/src/osx/MultiField.h b/tikzit-1/src/osx/MultiField.h deleted file mode 100644 index 39eeefa..0000000 --- a/tikzit-1/src/osx/MultiField.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// LabelField.h -// TikZiT -// -// Created by Aleks Kissinger on 20/04/2011. -// Copyright 2011 __MyCompanyName__. All rights reserved. -// - -#import - - -@interface MultiField : NSTextField { - BOOL multi; -} - -@property (readwrite,assign) BOOL multi; - -@end diff --git a/tikzit-1/src/osx/MultiField.m b/tikzit-1/src/osx/MultiField.m deleted file mode 100644 index 7c5aac3..0000000 --- a/tikzit-1/src/osx/MultiField.m +++ /dev/null @@ -1,53 +0,0 @@ -// -// LabelField.m -// TikZiT -// -// Created by Aleks Kissinger on 20/04/2011. -// Copyright 2011 __MyCompanyName__. All rights reserved. -// - -#import "MultiField.h" - - -@implementation MultiField - -- (void)textDidChange:(NSNotification *)notification { - [super textDidChange:notification]; - [self setMulti:NO]; -} - -- (void)setMulti:(BOOL)m { - multi = m; - if (multi) { - [self setTextColor:[NSColor grayColor]]; - [self setStringValue:@"multiple values"]; - } -} - -- (BOOL)multi { return multi; } - -- (BOOL)becomeFirstResponder { - [super becomeFirstResponder]; - if ([self multi]) { - [self setTextColor:[NSColor blackColor]]; - [self setStringValue:@""]; - } - return YES; -} - -//- (BOOL)textShouldBeginEditing:(NSText *)textObject { -// [super textShouldBeginEditing:textObject]; -// NSLog(@"about to type"); -// return YES; -//} - -//- (void)textDidEndEditing:(NSNotification *)obj { -// [super textDidEndEditing:obj]; -// -// NSLog(@"focus lost"); -// if ([self multi]) { -// [self setMulti:YES]; -// } -//} - -@end diff --git a/tikzit-1/src/osx/NilToEmptyStringTransformer.h b/tikzit-1/src/osx/NilToEmptyStringTransformer.h deleted file mode 100644 index 1445a94..0000000 --- a/tikzit-1/src/osx/NilToEmptyStringTransformer.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// NilToEmptyStringTransformer.h -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import - -@interface NilToEmptyStringTransformer : NSValueTransformer - -@end diff --git a/tikzit-1/src/osx/NilToEmptyStringTransformer.m b/tikzit-1/src/osx/NilToEmptyStringTransformer.m deleted file mode 100644 index 413f404..0000000 --- a/tikzit-1/src/osx/NilToEmptyStringTransformer.m +++ /dev/null @@ -1,53 +0,0 @@ -// -// NilToEmptyStringTransformer.m -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "NilToEmptyStringTransformer.h" - -@implementation NilToEmptyStringTransformer - -- (id)init { - if (!(self = [super init])) return nil; - return self; -} - -+ (Class)transformedValueClass { - return [NSString class]; -} - -+ (BOOL)allowsReverseTransformation { - return YES; -} - -- (id)transformedValue:(id)value { - if (value == nil) { - return @""; - } else { - return value; - } -} - -- (id)reverseTransformedValue:(id)value { - return [self transformedValue:value]; -} - -@end diff --git a/tikzit-1/src/osx/NodeLayer.h b/tikzit-1/src/osx/NodeLayer.h deleted file mode 100644 index dbcdac5..0000000 --- a/tikzit-1/src/osx/NodeLayer.h +++ /dev/null @@ -1,62 +0,0 @@ -// -// NodeLayer.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import -#import "Transformer.h" -#import "Shape.h" -#import "Node.h" -#import "NodeStyle+Coder.h" -#import "NodeSelectionLayer.h" - -@interface NodeLayer : CALayer { - Node *node; - Shape *shape; - CGMutablePathRef path; - float textwidth; - NSPoint center; - Transformer *transformer; - Transformer *localTrans; - NodeSelectionLayer *selection; - BOOL rescale; - BOOL dirty; // need to rebuild CGBezierPath of the shape -} - -@property (strong) Node *node; -@property (assign) NSPoint center; -@property (assign) BOOL rescale; -@property (strong) NodeSelectionLayer *selection; -@property (readonly) CGMutablePathRef path; - -- (id)initWithNode:(Node*)n transformer:(Transformer*)t; -- (NSColor*)strokeColor; -- (NSColor*)fillColor; -- (float)strokeWidth; - -- (void)setCenter:(NSPoint)ctr andAnimateWhen:(BOOL)anim; -- (void)updateFrame; -- (BOOL)nodeContainsPoint:(NSPoint)p; - -- (void)drawInContext:(CGContextRef)context; - -@end diff --git a/tikzit-1/src/osx/NodeLayer.m b/tikzit-1/src/osx/NodeLayer.m deleted file mode 100644 index 5d15585..0000000 --- a/tikzit-1/src/osx/NodeLayer.m +++ /dev/null @@ -1,238 +0,0 @@ -// -// NodeLayer.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "NodeLayer.h" -#import "CALayer+DrawLabel.h" -#import "NSString+LatexConstants.h" -#import "Shape.h" -#import "ShapeNames.h" -#import "Node.h" -#import "Edge.h" - -@implementation NodeLayer - -@synthesize node, selection, rescale; - -- (id)initWithNode:(Node *)n transformer:(Transformer*)t { - if (!(self = [super init])) return nil; - node = n; - selection = [[NodeSelectionLayer alloc] init]; - [selection setNodeLayer:self]; - localTrans = [[Transformer alloc] init]; - - [self addSublayer:selection]; - textwidth = 0.0f; - center = NSMakePoint(0.0f, 0.0f); - transformer = t; - - path = NULL; - rescale = YES; - dirty = YES; - - [self updateFrame]; - return self; -} - -- (NSColor*)strokeColor { - if ([node style] != nil) { - return [[[node style] strokeColor] colorUsingColorSpace:[NSColorSpace deviceRGBColorSpace]]; - } else { - return nil; - } -} - -- (NSColor*)fillColor { - if ([node style] != nil) { - return [[[node style] fillColor] colorUsingColorSpace:[NSColorSpace deviceRGBColorSpace]]; - } else { - return nil; - } -} - -- (float)strokeWidth { - if ([node style] != nil) { - return [node.style strokeThickness]; - } else { - return [NodeStyle defaultStrokeThickness]; - } -} - -- (NSPoint)center { return center; } - -- (void)setCenter:(NSPoint)ctr { - center.x = round(ctr.x); - center.y = round(ctr.y); - [self updateFrame]; -} - -- (void)setCenter:(NSPoint)ctr andAnimateWhen:(BOOL)anim { - [CATransaction begin]; - if (!anim) { - [CATransaction setValue:(id)kCFBooleanTrue forKey:kCATransactionDisableActions]; - } - [self setCenter:ctr]; - [CATransaction commit]; -} - -- (void)updateShape { - Shape *s = ([node style] != nil) ? - [Shape shapeForName:[[node style] shapeName]] : - [Shape shapeForName:SHAPE_CIRCLE]; - if (s != shape) { // straight pointer comparison - shape = s; - dirty = YES; - } -} - -- (void)updateLocalTrans { - float scale = ([node style] != nil) ? [[node style] scale] : 1.0f; - - Transformer *t = [Transformer transformer]; - float rad = ([transformer scaleToScreen:scale] / 2.0f) + 8.0f; - [t setOrigin:NSMakePoint(rad, rad)]; - [t setScale:[transformer scale]*((rescale)?scale:0.8f)]; - - if (![localTrans isEqual:t]) { - dirty = YES; - localTrans = t; - } -} - -- (void)updateFrame { - [self updateLocalTrans]; - [self updateShape]; - float rad = [localTrans origin].x; - [self setFrame:CGRectIntegral(CGRectMake(center.x - rad, center.y - rad, 2*rad, 2*rad))]; - NSRect bds = NSMakeRect(0, 0, 2*rad, 2*rad); - [selection setFrame:NSRectToCGRect(bds)]; - - [self setNeedsDisplay]; - [selection setNeedsDisplay]; -} - -- (CGMutablePathRef)path { - if (dirty) { - CGMutablePathRef pth = CGPathCreateMutable(); - NSPoint p, cp1, cp2; - for (NSArray *arr in [shape paths]) { - BOOL fst = YES; - for (Edge *e in arr) { - if (fst) { - fst = NO; - p = [localTrans toScreen:[[e source] point]]; - CGPathMoveToPoint(pth, nil, p.x, p.y); - } - - p = [localTrans toScreen:[[e target] point]]; - if ([e isStraight]) { - CGPathAddLineToPoint(pth, nil, p.x, p.y); - } else { - cp1 = [localTrans toScreen:[e cp1]]; - cp2 = [localTrans toScreen:[e cp2]]; - CGPathAddCurveToPoint(pth, nil, cp1.x, cp1.y, cp2.x, cp2.y, p.x, p.y); - } - } - - CGPathCloseSubpath(pth); - } - - if (path != NULL) CFRelease(path); - path = pth; - dirty = NO; - } - - - return path; -} - -- (BOOL)nodeContainsPoint:(NSPoint)p { - CGPoint p1 = CGPointMake(p.x - [self frame].origin.x, p.y - [self frame].origin.y); - return CGPathContainsPoint([self path],nil,p1,NO); -} - - -- (void)drawInContext:(CGContextRef)context { - CGContextSaveGState(context); - - - if ([node style] == nil) { - CGContextSetRGBStrokeColor(context, 0.4f, 0.4f, 0.7f, 1.0f); - CGContextSetRGBFillColor(context, 0.4f, 0.4f, 0.7f, 1.0f); - //CGRect fr = [self frame]; - CGRect bds = NSRectToCGRect([localTrans rectToScreen:NSMakeRect(-0.5, -0.5, 1, 1)]); - CGRect pt = CGRectMake(CGRectGetMidX(bds)-1.0f, CGRectGetMidY(bds)-1.0f, 2.0f, 2.0f); - CGContextSetLineWidth(context, 0); - CGContextAddEllipseInRect(context, pt); - CGContextFillPath(context); - - // HACK: for some reason, CGFloat isn't getting typedef'ed properly - -#ifdef __x86_64__ - const double dash[2] = {2.0,2.0}; -#else - const float dash[2] = {2.0,2.0}; -#endif - CGContextSetLineDash(context, 0.0, dash, 2); - CGContextSetLineWidth(context, 1); - CGContextAddPath(context, [self path]); - CGContextStrokePath(context); - } else { - NSColor *stroke = [self strokeColor]; - NSColor *fill = [self fillColor]; - - CGContextSetRGBStrokeColor(context, - [stroke redComponent], - [stroke greenComponent], - [stroke blueComponent], - [stroke alphaComponent]); - - CGContextSetLineWidth(context, [self strokeWidth]); - - CGContextSetRGBFillColor(context, - [fill redComponent], - [fill greenComponent], - [fill blueComponent], - [fill alphaComponent]); - - - CGContextSetLineWidth(context, [self strokeWidth]); - CGContextAddPath(context, [self path]); - CGContextDrawPath(context, kCGPathFillStroke); - } - - if (!([node label] == nil || [[node label] isEqual:@""])) { - NSPoint labelPt = NSMakePoint([self frame].size.width/2, [self frame].size.height/2); - [self drawLabel:[[node label] stringByExpandingLatexConstants] - atPoint:labelPt - inContext:context - usingTrans:transformer]; - } - - CGContextRestoreGState(context); -} - -- (void)dealloc { - if (path != NULL) CFRelease(path); -} - -@end diff --git a/tikzit-1/src/osx/NodeSelectionLayer.h b/tikzit-1/src/osx/NodeSelectionLayer.h deleted file mode 100644 index 99ee75f..0000000 --- a/tikzit-1/src/osx/NodeSelectionLayer.h +++ /dev/null @@ -1,45 +0,0 @@ -// -// NodeSelectionLayer.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import -#import "Shape.h" - -@class NodeLayer; - -@interface NodeSelectionLayer : CALayer { - BOOL selected; - CGMutablePathRef path; - NSLock *drawLock; - NodeLayer *nodeLayer; -} - -@property NodeLayer *nodeLayer; - -- (id)init; -- (void)select; -- (void)deselect; -- (void)highlight; -- (void)unhighlight; - -@end diff --git a/tikzit-1/src/osx/NodeSelectionLayer.m b/tikzit-1/src/osx/NodeSelectionLayer.m deleted file mode 100644 index 02b8ac2..0000000 --- a/tikzit-1/src/osx/NodeSelectionLayer.m +++ /dev/null @@ -1,93 +0,0 @@ -// -// NodeSelectionLayer.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "NodeSelectionLayer.h" -#import "NodeLayer.h" -#import "CircleShape.h" - -@implementation NodeSelectionLayer - -@synthesize nodeLayer; - -- (id)init { - if (!(self = [super init])) return nil; - selected = NO; - drawLock = [[NSLock alloc] init]; - nodeLayer = nil; - [self setOpacity:0.0f]; - return self; -} - - -- (void)select { - selected = YES; - [self setOpacity:0.5f]; -} - -- (void)deselect { - selected = NO; - [self setOpacity:0.0f]; -} - -- (void)highlight { - if (!selected) { - [self setOpacity:0.25f]; - } -} - -- (void)unhighlight { - if (!selected) { - [self setOpacity:0.0f]; - } -} - -//- (CGMutablePathRef)path { -// return path; -//} -// -//- (void)setPath:(CGMutablePathRef)p { -// path = CGPathCreateMutableCopy(p); -// CFMakeCollectable(path); -//} - -- (void)drawInContext:(CGContextRef)context { - [drawLock lock]; - CGContextSaveGState(context); - - //CGContextSetRGBStrokeColor(context, 0.61f, 0.735f, 1.0f, 1.0f); - CGContextSetRGBStrokeColor(context, 0.61f, 0.735f, 1.0f, 1.0f); - CGContextSetRGBFillColor(context, 0.61f, 0.735f, 1.0f, 1.0f); - CGContextSetLineWidth(context, 6.0f); - - if (nodeLayer != nil) { - CGContextAddPath(context, [nodeLayer path]); - } else { - NSLog(@"WARNING: attempting to draw selection with path = nil."); - } - CGContextDrawPath(context, kCGPathFillStroke); - - CGContextRestoreGState(context); - [drawLock unlock]; -} - -@end diff --git a/tikzit-1/src/osx/NodeStyle+Coder.h b/tikzit-1/src/osx/NodeStyle+Coder.h deleted file mode 100644 index b6443af..0000000 --- a/tikzit-1/src/osx/NodeStyle+Coder.h +++ /dev/null @@ -1,36 +0,0 @@ -// -// NodeStyle+Coder.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "NodeStyle.h" - - -@interface NodeStyle(Coder) - -@property (copy) NSColor *fillColor; -@property (copy) NSColor *strokeColor; - -- (id)initWithCoder:(NSCoder *)coder; -- (void)encodeWithCoder:(NSCoder *)coder; - -@end diff --git a/tikzit-1/src/osx/NodeStyle+Coder.m b/tikzit-1/src/osx/NodeStyle+Coder.m deleted file mode 100644 index d3623f5..0000000 --- a/tikzit-1/src/osx/NodeStyle+Coder.m +++ /dev/null @@ -1,91 +0,0 @@ -// -// NodeStyle+Coder.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "NodeStyle+Coder.h" -#import "ShapeNames.h" - -@implementation NodeStyle(Coder) - -- (NSColor*)fillColor { - return [NSColor colorWithDeviceRed:fillColorRGB.redFloat - green:fillColorRGB.greenFloat - blue:fillColorRGB.blueFloat - alpha:1.0f]; -} - -- (void)setFillColor:(NSColor*)c { - NSColor *c1 = [c colorUsingColorSpaceName:NSDeviceRGBColorSpace]; - [self willChangeValueForKey:@"fillColorIsKnown"]; - fillColorRGB = [ColorRGB colorWithFloatRed:c1.redComponent - green:c1.greenComponent - blue:c1.blueComponent]; - [self didChangeValueForKey:@"fillColorIsKnown"]; -} - -- (NSColor*)strokeColor { - return [NSColor colorWithDeviceRed:strokeColorRGB.redFloat - green:strokeColorRGB.greenFloat - blue:strokeColorRGB.blueFloat - alpha:1.0f]; -} - -- (void)setStrokeColor:(NSColor*)c { - NSColor *c1 = [c colorUsingColorSpaceName:NSDeviceRGBColorSpace]; - [self willChangeValueForKey:@"strokeColorIsKnown"]; - strokeColorRGB = [ColorRGB colorWithFloatRed:c1.redComponent - green:c1.greenComponent - blue:c1.blueComponent]; - [self didChangeValueForKey:@"strokeColorIsKnown"]; -} - -- (id)initWithCoder:(NSCoder *)coder { - if (!(self = [super init])) return nil; - - // decode keys - name = [coder decodeObjectForKey:@"name"]; - [self setStrokeColor:[coder decodeObjectForKey:@"strokeColor"]]; - [self setFillColor:[coder decodeObjectForKey:@"fillColor"]]; - strokeThickness = [coder decodeIntForKey:@"strokeThickness"]; - shapeName = [coder decodeObjectForKey:@"shapeName"]; - category = [coder decodeObjectForKey:@"category"]; - scale = [coder decodeFloatForKey:@"scale"]; - - // apply defaults - if (scale == 0.0f) scale = 1.0f; - if (shapeName == nil) shapeName = SHAPE_CIRCLE; - - return self; -} - -- (void)encodeWithCoder:(NSCoder *)coder { - [coder encodeObject:name forKey:@"name"]; - [coder encodeObject:[self strokeColor] forKey:@"strokeColor"]; - [coder encodeObject:[self fillColor] forKey:@"fillColor"]; - [coder encodeInt:strokeThickness forKey:@"strokeThickness"]; - [coder encodeObject:shapeName forKey:@"shapeName"]; - [coder encodeObject:category forKey:@"category"]; - [coder encodeFloat:scale forKey:@"scale"]; -} - - -@end diff --git a/tikzit-1/src/osx/ParseErrorView.h b/tikzit-1/src/osx/ParseErrorView.h deleted file mode 100644 index bb6141f..0000000 --- a/tikzit-1/src/osx/ParseErrorView.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// ParseErrorView.h -// TikZiT -// -// Created by Karl Johan Paulsson on 27/01/2013. -// Copyright (c) 2013 Aleks Kissinger. All rights reserved. -// - -#import - -@interface ParseErrorView : NSView - -@end diff --git a/tikzit-1/src/osx/ParseErrorView.m b/tikzit-1/src/osx/ParseErrorView.m deleted file mode 100644 index 83383f0..0000000 --- a/tikzit-1/src/osx/ParseErrorView.m +++ /dev/null @@ -1,40 +0,0 @@ -// -// ParseErrorView.m -// TikZiT -// -// Created by Karl Johan Paulsson on 27/01/2013. -// Copyright (c) 2013 Aleks Kissinger. All rights reserved. -// - -#import "ParseErrorView.h" - -@implementation ParseErrorView - -- (id)initWithFrame:(NSRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - // Initialization code here. - } - - return self; -} - -- (void)drawRect:(NSRect)dirtyRect -{ - // Drawing code here. -} - -- (void)awakeFromNib{ - self.layer = [CALayer layer]; - self.wantsLayer = YES; - CALayer *newLayer = [CALayer layer]; - self.layer.backgroundColor = [[NSColor controlColor] CGColor]; - //CGColorCreate(CGColorSpaceCreateDeviceRGB(), (CGFloat[]){ 1, .9, .64, 1 }); -// newLayer.backgroundColor = [NSColor redColor].CGColor; - newLayer.frame = CGRectMake(100,100,100,100);//NSMakeRect(0,0,image.size.width,image.size.height); - newLayer.position = CGPointMake(20,20); - //[self.layer addSublayer:newLayer]; -} - -@end diff --git a/tikzit-1/src/osx/PreambleController.h b/tikzit-1/src/osx/PreambleController.h deleted file mode 100644 index 5b0931d..0000000 --- a/tikzit-1/src/osx/PreambleController.h +++ /dev/null @@ -1,57 +0,0 @@ -// -// PreambleController.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "Preambles.h" -#import "Preambles+Coder.h" - -@interface PreambleController : NSViewController { - Preambles *preambles; - IBOutlet NSTextView *textView; - IBOutlet NSDictionaryController *preambleDictionaryController; - - NSDictionary *textAttrs; - NSAttributedString *preambleText; - NSColor *ghostColor; - NSIndexSet *selectionIndexes; -} - -@property (readonly) BOOL useDefaultPreamble; -@property (readonly) Preambles *preambles; -@property (strong) NSAttributedString *preambleText; -@property (strong) NSIndexSet *selectionIndexes; - -- (id)initWithNibName:(NSString *)nibName plist:(NSString*)plist styles:(NSArray*)sty edges:(NSArray*)edg; -- (void)savePreambles:(NSString*)plist; -- (NSString*)currentPreamble; -- (NSString*)currentPostamble; -- (NSString*)buildDocumentForTikz:(NSString*)tikz; - -- (IBAction)setPreambleToDefault:(id)sender; -- (IBAction)setPreamble:(id)sender; -- (IBAction)insertDefaultStyles:(id)sender; - -- (IBAction)addPreamble:(id)sender; -- (IBAction)duplicatePreamble:(id)sender; - -@end diff --git a/tikzit-1/src/osx/PreambleController.m b/tikzit-1/src/osx/PreambleController.m deleted file mode 100644 index 206bb30..0000000 --- a/tikzit-1/src/osx/PreambleController.m +++ /dev/null @@ -1,168 +0,0 @@ -// -// PreambleController.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "PreambleController.h" - - -@implementation PreambleController - -@synthesize preambleText, preambles; - -- (id)initWithNibName:(NSString *)nibName plist:(NSString*)plist styles:(NSArray*)sty edges:(NSArray*)edg { - if (!(self = [super initWithNibName:nibName bundle:Nil])) return nil; - - preambles = (Preambles*)[NSKeyedUnarchiver unarchiveObjectWithFile:plist]; - [preambles setStyles:sty]; - [preambles setEdges:edg]; - if (preambles == nil) preambles = [[Preambles alloc] init]; - - preambleText = nil; - - NSFont *font = [NSFont userFixedPitchFontOfSize:11.0f]; - textAttrs = [NSDictionary dictionaryWithObject:font forKey:NSFontAttributeName]; - ghostColor = [NSColor colorWithDeviceRed:0.9f green:0.9f blue:0.9f alpha:1.0f]; - - - - return self; -} - -- (void)awakeFromNib { - NSArray *arr = [preambleDictionaryController arrangedObjects]; - NSString *current = [preambles selectedPreambleName]; - - if (current != nil && ![current isEqual:@"default"]) { - for (int i = 0; i < [arr count]; ++i) { - if ([[[arr objectAtIndex:i] key] isEqual:current]) { - [self setSelectionIndexes:[NSIndexSet indexSetWithIndex:i]]; - break; - } - } - } -} - -- (BOOL)useDefaultPreamble { - return [[preambles selectedPreambleName] isEqualToString:@"default"]; -} - -- (void)flushText { - if (preambleText != nil && ![self useDefaultPreamble]) { - [preambles setCurrentPreamble:[preambleText string]]; - } -} - -- (void)setCurrentPreamble:(NSString*)current { - [self flushText]; - - [self willChangeValueForKey:@"useDefaultPreamble"]; - [preambles setSelectedPreambleName:current]; - [self didChangeValueForKey:@"useDefaultPreamble"]; - - [self setPreambleText: - [[NSAttributedString alloc] initWithString:[preambles currentPreamble] - attributes:textAttrs]]; -} - -- (void)savePreambles:(NSString*)plist { - [self flushText]; - [NSKeyedArchiver archiveRootObject:preambles toFile:plist]; -} - -- (NSString*)currentPreamble { - [self flushText]; - return [preambles currentPreamble]; -} - -- (NSString*)currentPostamble { - return [preambles currentPostamble]; -} - -- (NSString*)buildDocumentForTikz:(NSString*)tikz { - [self flushText]; - return [preambles buildDocumentForTikz:tikz]; -} - -- (void)setSelectionIndexes:(NSIndexSet *)idx { - [self willChangeValueForKey:@"selectionIndexes"]; - selectionIndexes = idx; - [self didChangeValueForKey:@"selectionIndexes"]; - - [self setPreamble:self]; -} - -- (NSIndexSet*)selectionIndexes { - return selectionIndexes; -} - -- (IBAction)setPreambleToDefault:(id)sender{ - [self setCurrentPreamble:@"default"]; - [textView setBackgroundColor:ghostColor]; -} - -- (IBAction)setPreamble:(id)sender { - //if ([[toolbar selectedItemIdentifier] isEqualToString:[defaultToolbarItem itemIdentifier]]) { - // [self setCurrentPreamble:@"default"]; - // [textView setBackgroundColor:ghostColor]; - //} else if ([[toolbar selectedItemIdentifier] isEqualToString:[customToolbarItem itemIdentifier]]) { - NSString *key = nil; - if ([selectionIndexes count]==1) { - int i = [selectionIndexes firstIndex]; - key = [[[preambleDictionaryController arrangedObjects] objectAtIndex:i] key]; - } - if (key != nil) { - [self setCurrentPreamble:key]; - //NSLog(@"preamble set to %@", key); - } else { - [self setCurrentPreamble:@"custom"]; - //NSLog(@"preamble set to custom"); - } - [textView setBackgroundColor:[NSColor whiteColor]]; - //} -} - -- (IBAction)insertDefaultStyles:(id)sender { - [textView insertText:[preambles styleDefinitions]]; -} - -- (IBAction)addPreamble:(id)sender { - [preambleDictionaryController setInitialKey:@"new preamble"]; - [preambleDictionaryController setInitialValue:[preambles defaultPreamble]]; - [preambleDictionaryController add:sender]; -} - -- (void)controlTextDidEndEditing:(NSNotification *)obj { - //NSLog(@"got a text change"); - [self setPreamble:[obj object]]; -} - - -// NOT IMPLEMENTED -- (IBAction)duplicatePreamble:(id)sender { -// NSLog(@"set text to: %@", [preambles currentPreamble]); -// [preambleDictionaryController setInitialKey:[preambles selectedPreambleName]]; -// [preambleDictionaryController setInitialValue:[preambles currentPreamble]]; -// [preambleDictionaryController add:sender]; -} - - -@end diff --git a/tikzit-1/src/osx/Preambles+Coder.h b/tikzit-1/src/osx/Preambles+Coder.h deleted file mode 100644 index 5a270c5..0000000 --- a/tikzit-1/src/osx/Preambles+Coder.h +++ /dev/null @@ -1,32 +0,0 @@ -// -// Preambles+Coder.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "Preambles.h" -#import - -@interface Preambles (Coder) - -- (id)initWithCoder:(NSCoder *)coder; -- (void)encodeWithCoder:(NSCoder *)coder; - -@end diff --git a/tikzit-1/src/osx/Preambles+Coder.m b/tikzit-1/src/osx/Preambles+Coder.m deleted file mode 100644 index 5e468b2..0000000 --- a/tikzit-1/src/osx/Preambles+Coder.m +++ /dev/null @@ -1,41 +0,0 @@ -// -// Preambles+Coder.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "Preambles+Coder.h" - - -@implementation Preambles (Coder) - -- (id)initWithCoder:(NSCoder *)coder { - if (!(self = [super init])) return nil; - selectedPreambleName = [coder decodeObjectForKey:@"selectedPreamble"]; - preambleDict = [coder decodeObjectForKey:@"preambles"]; - return self; -} - -- (void)encodeWithCoder:(NSCoder *)coder { - [coder encodeObject:selectedPreambleName forKey:@"selectedPreamble"]; - [coder encodeObject:preambleDict forKey:@"preambles"]; -} - -@end diff --git a/tikzit-1/src/osx/PreferenceController.h b/tikzit-1/src/osx/PreferenceController.h deleted file mode 100644 index b2b23f3..0000000 --- a/tikzit-1/src/osx/PreferenceController.h +++ /dev/null @@ -1,49 +0,0 @@ -// -// PreferenceController.h -// TikZiT -// -// Created by Karl Johan Paulsson on 26/02/2013. -// Copyright (c) 2013 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "UpdatePreferenceController.h" -#import "PreambleController.h" -#import "CustomNodeController.h" - -@interface PreferenceController : NSWindowController{ - - IBOutlet NSView *engineView; - IBOutlet NSView *generalView; - IBOutlet NSView *updateView; - IBOutlet NSView *preambleView; - IBOutlet NSView *customNodeView; - - UpdatePreferenceController *updateController; - PreambleController *preambleController; - CustomNodeController *customNodeController; - - int currentViewTag; -} - -- (id)initWithWindowNibName:(NSString *)windowNibName preambleController:(PreambleController *)pc; - -- (IBAction)switchView:(id)sender; - -@end diff --git a/tikzit-1/src/osx/PreferenceController.m b/tikzit-1/src/osx/PreferenceController.m deleted file mode 100644 index e785358..0000000 --- a/tikzit-1/src/osx/PreferenceController.m +++ /dev/null @@ -1,133 +0,0 @@ -// -// PreferenceController.m -// TikZiT -// -// Created by Karl Johan Paulsson on 26/02/2013. -// Copyright (c) 2013 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "PreferenceController.h" - -@interface PreferenceController () - -@end - -@implementation PreferenceController - -- (id)initWithWindowNibName:(NSString *)windowNibName preambleController:(PreambleController *)pc{ - if (!(self = [super initWithWindowNibName:windowNibName])) return nil; - - preambleController = pc; - - return self; -} - -- (NSRect)newFrameForNewContentView:(NSView*)view { - NSWindow *window = [self window]; - NSRect newFrameRect = [window frameRectForContentRect:[view frame]]; - NSRect oldFrameRect = [window frame]; - NSSize newSize = newFrameRect.size; - NSSize oldSize = oldFrameRect.size; - - NSRect frame = [window frame]; - frame.size = newSize; - frame.origin.y -= (newSize.height - oldSize.height); - - return frame; -} - -- (NSView *)viewForTag:(int)tag { - - NSView *view = nil; - switch (tag) { - default: - case 0: - view = generalView; - break; - case 1: - view = engineView; - break; - case 2: - view = updateView; - break; - case 3: - view = preambleView; - break; - case 4: - view = customNodeView; - break; - } - - return view; -} - -- (BOOL)validateToolbarItem:(NSToolbarItem *)item { - - if ([item tag] == currentViewTag) return NO; - else return YES; - -} - -- (void)awakeFromNib { - - [[self window] setContentSize:[generalView frame].size]; - [[[self window] contentView] addSubview:generalView]; - [[[self window] contentView] setWantsLayer:YES]; - - updateController = [[UpdatePreferenceController alloc] initWithNibName:@"UpdatePreferencePanel" bundle:nil]; - [[updateController view] setFrame:[updateView frame]]; - [[[self window] contentView] replaceSubview:updateView with:[updateController view]]; - updateView = [updateController view]; - - [[preambleController view] setFrame:[preambleView frame]]; - [[[self window] contentView] replaceSubview:preambleView with:[preambleController view]]; - preambleView = [preambleController view]; - - customNodeController = [[CustomNodeController alloc] initWithNibName:@"CustomNodes" bundle:nil]; - [[customNodeController view] setFrame:[customNodeView frame]]; - [[[self window] contentView] replaceSubview:customNodeView with:[customNodeController view]]; - customNodeView = [customNodeController view]; - - [[self window] setContentSize:[engineView frame].size]; - [[[self window] contentView] addSubview:engineView]; - currentViewTag = 1; -} - -- (IBAction)switchView:(id)sender { - - int tag = [sender tag]; - NSView *view = [self viewForTag:tag]; - NSView *previousView = [self viewForTag:currentViewTag]; - currentViewTag = tag; - - NSRect newFrame = [self newFrameForNewContentView:view]; - - [NSAnimationContext beginGrouping]; - - if ([[NSApp currentEvent] modifierFlags] & NSShiftKeyMask) - [[NSAnimationContext currentContext] setDuration:1.0]; - - [[[[self window] contentView] animator] replaceSubview:previousView with:view]; - [[[self window] animator] setFrame:newFrame display:YES]; - - [NSAnimationContext endGrouping]; - -} - -@end diff --git a/tikzit-1/src/osx/Preferences.xib b/tikzit-1/src/osx/Preferences.xib deleted file mode 100644 index 1be3f9f..0000000 --- a/tikzit-1/src/osx/Preferences.xib +++ /dev/null @@ -1,1165 +0,0 @@ - - - - 1070 - 13C64 - 5053 - 1265.19 - 697.40 - - com.apple.InterfaceBuilder.CocoaPlugin - 5053 - - - IBNSLayoutConstraint - NSButton - NSButtonCell - NSCustomObject - NSCustomView - NSTextField - NSTextFieldCell - NSToolbar - NSToolbarItem - NSUserDefaultsController - NSView - NSWindowTemplate - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - PreferenceController - - - FirstResponder - - - NSApplication - - - 7 - 2 - {{196, 240}, {480, 270}} - 544736256 - Preferences - NSWindow - - - C1747407-DC9A-4297-9C1C-0A5010984E6C - - - YES - YES - NO - NO - 1 - 1 - - - - 197F9408-AFB0-404B-B2B6-4DB1250B0A80 - - Updates - Updates - - - - NSImage - updates - - - - {0, 0} - {0, 0} - YES - YES - 2 - YES - 0 - - - - A3DDD070-5637-444B-92C6-905084CAC389 - - General - General - - - - NSImage - NSPreferencesGeneral - - - - {0, 0} - {0, 0} - YES - YES - 1 - YES - 0 - - - - A96DC4D4-2171-4D05-8C08-8D01B3829158 - - Preamble - Preamble - - - - NSImage - preamble - - - - {0, 0} - {0, 0} - YES - YES - 3 - YES - 0 - - - - CBA2626C-DD4C-4ADD-BD5D-26D21216D9A8 - - Custom Nodes - Custom Nodes - - - - NSImage - customshape - - - - {0, 0} - {0, 0} - YES - YES - 4 - YES - 0 - - - - F85FE7C2-9847-4E58-8BF6-BE334E918CA7 - - Engine - Engine - - - - NSImage - engine - - - - {0, 0} - {0, 0} - YES - YES - 1 - YES - 0 - - - - - - - - - - - - - - - - - - - - - {480, 270} - - - - - {{0, 0}, {1680, 1028}} - {10000000000000, 10000000000000} - YES - - - - 268 - - - - 268 - {{18, 106}, {219, 18}} - - - - _NS:9 - YES - - -2080374784 - 268435456 - Keep inspector windows on top - - .LucidaGrandeUI - 13 - 1044 - - _NS:9 - - 1211912448 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 - - NO - - - - 268 - {{18, 126}, {168, 18}} - - - - _NS:9 - YES - - -2080374784 - 268435456 - Autocomplete brackets - - _NS:9 - - 1211912448 - 2 - - - - - 200 - 25 - - NO - - - - 268 - {{18, 18}, {214, 18}} - - - - _NS:9 - YES - - -2080374784 - 268435456 - Bring preview window to focus - - _NS:9 - - 1211912448 - 2 - - - - - 200 - 25 - - NO - - - - 268 - {{20, 42}, {440, 22}} - - - - _NS:9 - YES - - -1804599231 - 272630784 - - - _NS:9 - - YES - - 6 - System - textBackgroundColor - - 3 - MQA - - - - 6 - System - textColor - - 3 - MAA - - - - NO - 1 - - - - 268 - {{18, 72}, {140, 17}} - - - - _NS:1535 - YES - - 68157504 - 272630784 - pdfLaTeX source path - - _NS:1535 - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - - - NO - 1 - - - {480, 162} - - - - _NS:9 - NSView - - - - 268 - - {480, 96} - - - - _NS:9 - NSView - - - - 12 - - {480, 115} - - - - _NS:9 - NSView - - - - 12 - - {557, 354} - - - - _NS:9 - NSView - - - - 12 - - {557, 354} - - - - _NS:9 - NSView - - - YES - - - - - - - window - - - - 3 - - - - engineView - - - - 23 - - - - generalView - - - - 25 - - - - switchView: - - - - 26 - - - - switchView: - - - - 27 - - - - switchView: - - - - 116 - - - - updateView - - - - 117 - - - - switchView: - - - - 120 - - - - preambleView - - - - 121 - - - - customNodeView - - - - 123 - - - - switchView: - - - - 125 - - - - delegate - - - - 4 - - - - value: values.net.sourceforge.tikzit.pdflatexpath - - - - - - value: values.net.sourceforge.tikzit.pdflatexpath - value - values.net.sourceforge.tikzit.pdflatexpath - 2 - - - 54 - - - - value: values.net.sourceforge.tikzit.previewfocus - - - - - - value: values.net.sourceforge.tikzit.previewfocus - value - values.net.sourceforge.tikzit.previewfocus - 2 - - - 62 - - - - value: values.net.sourceforge.tikzit.autocomplete - - - - - - value: values.net.sourceforge.tikzit.autocomplete - value - values.net.sourceforge.tikzit.autocomplete - 2 - - - 149 - - - - value: values.net.sourceforge.tikzit.inspectorsontop - - - - - - value: values.net.sourceforge.tikzit.inspectorsontop - value - values.net.sourceforge.tikzit.inspectorsontop - 2 - - - 150 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 1 - - - - - - - - - 2 - - - - - 5 - - - - - - - - - - - - 11 - - - - - 12 - - - - - 13 - - - - - 4 - 0 - - 4 - 1 - 1 - - 20 - - 1000 - - 8 - 23 - 3 - NO - - - - 3 - 0 - - 4 - 1 - 1 - - 8 - - 1000 - - 6 - 24 - 3 - NO - - - - 5 - 0 - - 5 - 1 - 1 - - 20 - - 1000 - - 0 - 29 - 3 - NO - - - - 6 - 0 - - 6 - 1 - 1 - - 20 - - 1000 - - 0 - 29 - 3 - NO - - - - 3 - 0 - - 4 - 1 - 1 - - 8 - - 1000 - - 6 - 24 - 3 - NO - - - - 5 - 0 - - 5 - 1 - 1 - - 20 - - 1000 - - 0 - 29 - 3 - NO - - - - 5 - 0 - - 5 - 1 - 1 - - 20 - - 1000 - - 0 - 29 - 3 - NO - - - - 5 - 0 - - 5 - 1 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - NO - - - - 3 - 0 - - 4 - 1 - 1 - - 6 - - 1000 - - 6 - 24 - 3 - NO - - - - 5 - 0 - - 5 - 1 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - NO - - - - 3 - 0 - - 3 - 1 - 1 - - 20 - - 1000 - - 8 - 23 - 3 - NO - - - - - - - - - - - 14 - - - - - - 15 - - - - - - - - 16 - - - - - 30 - - - - - 32 - - - - - - - - 33 - - - - - 36 - - - - - 39 - - - - - 55 - - - - - 56 - - - - - 57 - - - - - - - - 58 - - - - - 59 - - - - - 60 - - - - - 64 - - - - - - 115 - - - - - 118 - - - - - 119 - - - - - 122 - - - - - 124 - - - - - 126 - - - - - 127 - - - - - - - - 128 - - - - - 130 - - - - - 131 - - - - - - - - 132 - - - - - 134 - - - - - 135 - - - - - 153 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{357, 418}, {480, 270}} - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - - - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - 153 - - - - - PreferenceController - NSWindowController - - switchView: - id - - - switchView: - - switchView: - id - - - - NSView - NSView - NSView - NSView - NSView - - - - customNodeView - NSView - - - engineView - NSView - - - generalView - NSView - - - preambleView - NSView - - - updateView - NSView - - - - IBProjectSource - ./Classes/PreferenceController.h - - - - - 0 - IBCocoaFramework - YES - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES - 3 - - {32, 32} - {15, 15} - {32, 32} - {32, 32} - {32, 32} - {32, 32} - - YES - - diff --git a/tikzit-1/src/osx/PreviewController.h b/tikzit-1/src/osx/PreviewController.h deleted file mode 100644 index 6c51a23..0000000 --- a/tikzit-1/src/osx/PreviewController.h +++ /dev/null @@ -1,52 +0,0 @@ -// -// PreviewController.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - - -#import -#import "DraggablePDFView.h" - -@class PDFView; -@class PreambleController; - -@interface PreviewController : NSWindowController { - IBOutlet DraggablePDFView *pdfView; - IBOutlet NSProgressIndicator *progressIndicator; - IBOutlet NSScrollView *errorTextView; - IBOutlet NSTextView *errorText; - PreambleController *preambleController; - NSString *tempDir; - NSLock *latexLock; - int typesetCount; -} - - -- (id)initWithWindowNibName:(NSString*)nib - preambleController:(PreambleController*)pc - tempDir:(NSString*)dir; - -- (void)buildTikz:(NSString*)tikz; - -+ (void)setDefaultPreviewController:(PreviewController*)pc; -+ (PreviewController*)defaultPreviewController; - -@end diff --git a/tikzit-1/src/osx/PreviewController.m b/tikzit-1/src/osx/PreviewController.m deleted file mode 100644 index cf069b1..0000000 --- a/tikzit-1/src/osx/PreviewController.m +++ /dev/null @@ -1,147 +0,0 @@ -// -// PreviewController.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "PreviewController.h" -#import "AppDelegate.h" -#import "PreambleController.h" -#import - -@implementation PreviewController - -static PreviewController *preview = nil; - -- (id)initWithWindowNibName:(NSString*)nib - preambleController:(PreambleController*)pc - tempDir:(NSString*)dir { - if (!(self = [super initWithWindowNibName:nib])) return nil; - tempDir = [dir copy]; - typesetCount = 0; - preambleController = pc; - latexLock = [[NSLock alloc] init]; - return self; -} - -- (void)runLatex:(id)tikz { - // Only build one tex file at a time, so we don't get funky results. - //[latexLock lock]; - [progressIndicator startAnimation:self]; - - if([[NSUserDefaults standardUserDefaults] boolForKey:@"net.sourceforge.tikzit.previewfocus"]){ - [[preview window] makeKeyAndOrderFront:self]; - } - - int fnum = typesetCount++; - - NSString *tex = [preambleController buildDocumentForTikz:tikz]; - - NSString *texFile = [NSString stringWithFormat:@"%@/tikzit_%d.tex", tempDir, fnum]; - NSString *pdfFile = [NSString stringWithFormat:@"%@/tikzit_%d.pdf", tempDir, fnum]; - - [tex writeToFile:texFile atomically:NO encoding:NSUTF8StringEncoding error:NULL]; - - NSString *pdflatexPath = [[NSUserDefaults standardUserDefaults] stringForKey:@"net.sourceforge.tikzit.pdflatexpath"]; - - // We run pdflatex in a bash shell to have easy access to the setup from unix-land - NSTask *latexTask = [[NSTask alloc] init]; - [latexTask setCurrentDirectoryPath:tempDir]; - [latexTask setLaunchPath:@"/bin/bash"]; - - // This assumes the user has $PATH set up to find pdflatex in either .profile - // or .bashrc. This should be improved to take other path setups into account - // and to be customisable. - NSString *latexCmd = - [NSString stringWithFormat: - @"if [ -e ~/.profile ]; then source ~/.profile; fi\n" - @"if [ -e ~/.bashrc ]; then source ~/.bashrc; fi\n" - @"%@ -interaction=nonstopmode -output-format=pdf -halt-on-error '%@'\n", pdflatexPath, texFile]; - - NSLog(@"Telling bash: %@", latexCmd); - - NSPipe *pout = [NSPipe pipe]; - NSPipe *pin = [NSPipe pipe]; - [latexTask setStandardOutput:pout]; - [latexTask setStandardInput:pin]; - - NSFileHandle *latexIn = [pin fileHandleForWriting]; - NSFileHandle *latexOut = [pout fileHandleForReading]; - - [latexTask launch]; - [latexIn writeData:[latexCmd dataUsingEncoding:NSUTF8StringEncoding]]; - [latexIn closeFile]; - - - NSData *data = [latexOut readDataToEndOfFile]; - NSString *str = [[NSString alloc] initWithData:data - encoding:NSUTF8StringEncoding]; - - [latexTask waitUntilExit]; - if ([latexTask terminationStatus] != 0) { - if ([latexTask terminationStatus] == 127) { - [errorTextView setHidden:YES]; - [errorText setString:@"\nCouldn't find pdflatex, change settings and try again."]; - [errorTextView setHidden:NO]; - }else{ - [errorTextView setHidden:YES]; - [errorText setString:[@"\nAN ERROR HAS OCCURRED, PDFLATEX SAID:\n\n" stringByAppendingString:str]]; - [errorTextView setHidden:NO]; - } - } else { - [errorText setString:@""]; - [errorTextView setHidden:YES]; - - PDFDocument *doc = [[PDFDocument alloc] initWithURL:[[NSURL alloc] initFileURLWithPath:pdfFile]]; - - // pad the PDF by a couple of pixels - if ([doc pageCount] >= 1) { - PDFPage *page = [doc pageAtIndex:0]; - NSRect box = [page boundsForBox:kPDFDisplayBoxCropBox]; - box.origin.x -= 2.0f; - box.origin.y -= 2.0f; - box.size.width += 4.0f; - box.size.height += 4.0f; - [page setBounds:box forBox:kPDFDisplayBoxCropBox]; - [page setBounds:box forBox:kPDFDisplayBoxMediaBox]; - } - - [pdfView setDocument:doc]; - } - - [progressIndicator stopAnimation:self]; - //[latexLock unlock]; -} - -- (void)buildTikz:(NSString*)tikz { - // Build on a separate thread to keep the interface responsive. - [NSThread detachNewThreadSelector:@selector(runLatex:) toTarget:self withObject:tikz]; -} - -+ (void)setDefaultPreviewController:(PreviewController*)pc { - preview = pc; -} - -+ (PreviewController*)defaultPreviewController { - return preview; -} - - -@end diff --git a/tikzit-1/src/osx/PropertyInspectorController.h b/tikzit-1/src/osx/PropertyInspectorController.h deleted file mode 100644 index 663ee4a..0000000 --- a/tikzit-1/src/osx/PropertyInspectorController.h +++ /dev/null @@ -1,83 +0,0 @@ -// -// PropertyInspectorController.h -// TikZiT -// -// Created by Aleks Kissinger on 17/07/2011. -// Copyright 2011 Aleks Kissinger. All rights reserved. -// - -#import -#import "NodeStyle.h" -#import "GraphElementData.h" - -@class SFBInspectorView; -@class StylePaletteController; - -@interface PropertyInspectorController : NSWindowController { - IBOutlet SFBInspectorView *propertyInspectorView; - IBOutlet NSView *nodePropertiesView; - IBOutlet NSView *graphPropertiesView; - IBOutlet NSView *edgePropertiesView; - IBOutlet NSComboBox *sourceAnchorComboBox; - IBOutlet NSComboBox *targetAnchorComboBox; - IBOutlet NSTextField *edgeNodeLabelField; - IBOutlet NSButton *edgeNodeCheckbox; - IBOutlet NSArrayController *nodeDataArrayController; - IBOutlet NSArrayController *graphDataArrayController; - IBOutlet NSArrayController *edgeDataArrayController; - IBOutlet NSArrayController *edgeNodeDataArrayController; - - NSMutableArray *sourceAnchorNames; - IBOutlet NSArrayController *sourceAnchorNamesArrayController; - - NSMutableArray *targetAnchorNames; - IBOutlet NSArrayController *targetAnchorNamesArrayController; - - NSMutableArray *selectedNodes; - IBOutlet NSArrayController *selectedNodesArrayController; - - NSMutableArray *selectedEdges; - IBOutlet NSArrayController *selectedEdgesArrayController; - - // this data lists exists solely for displaying messages in disabled data tables - GraphElementData *noSelection; - GraphElementData *multipleSelection; - GraphElementData *noEdgeNode; - GraphElementData *noGraph; - - - // used to get access to the global style table - StylePaletteController *stylePaletteController; -} - -//@property (readonly) BOOL enableNodeDataControls; -//@property (readonly) BOOL enableEdgeDataControls; -@property (strong) NSMutableArray *selectedNodes; -@property (strong) NSMutableArray *selectedEdges; -@property (strong) NSMutableArray *sourceAnchorNames; -@property (strong) NSMutableArray *targetAnchorNames; -@property (strong) StylePaletteController *stylePaletteController; - -- (id)initWithWindowNibName:(NSString *)windowNibName; -- (void)graphSelectionChanged:(NSNotification*)notification; - -- (IBAction)addNodeProperty:(id)sender; -- (IBAction)addNodeAtom:(id)sender; -- (IBAction)removeNodeProperty:(id)sender; - -- (IBAction)addGraphProperty:(id)sender; -- (IBAction)addGraphAtom:(id)sender; -- (IBAction)removeGraphProperty:(id)sender; - -- (IBAction)addEdgeProperty:(id)sender; -- (IBAction)addEdgeAtom:(id)sender; -- (IBAction)removeEdgeProperty:(id)sender; - -- (IBAction)addEdgeNodeProperty:(id)sender; -- (IBAction)addEdgeNodeAtom:(id)sender; -- (IBAction)removeEdgeNodeProperty:(id)sender; - -//- (IBAction)addRemoveChildNode:(id)sender; -- (IBAction)refreshDocument:(id)sender; - -@end diff --git a/tikzit-1/src/osx/PropertyInspectorController.m b/tikzit-1/src/osx/PropertyInspectorController.m deleted file mode 100644 index 039a30f..0000000 --- a/tikzit-1/src/osx/PropertyInspectorController.m +++ /dev/null @@ -1,280 +0,0 @@ -// -// PropertyInspectorController.m -// TikZiT -// -// Created by Aleks Kissinger on 17/07/2011. -// Copyright 2011 Aleks Kissinger. All rights reserved. -// - -#import "PropertyInspectorController.h" -#import "StylePaletteController.h" -#import "TikzDocument.h" -#import "SFBInspectors/SFBInspectorView.h" -#import "PickSupport.h" -#import "Node.h" -#import "Edge.h" -#import "NodeStyle.h" -#import "GraphicsView.h" -#import "GraphElementProperty.h" -#import "Shape.h" - -@implementation PropertyInspectorController - -@synthesize stylePaletteController; -@synthesize selectedNodes, selectedEdges; -@synthesize sourceAnchorNames, targetAnchorNames; - -- (id)initWithWindowNibName:(NSString *)windowNibName { - if (!(self = [super initWithWindowNibName:windowNibName])) return nil; - - noSelection = [[GraphElementData alloc] init]; - [noSelection setProperty:@"" forKey:@"No Selection"]; - multipleSelection = [[GraphElementData alloc] init]; - [multipleSelection setProperty:@"" forKey:@"Mult. Selection"]; - noEdgeNode = [[GraphElementData alloc] init]; - [noEdgeNode setProperty:@"" forKey:@"No Child"]; - noGraph = [[GraphElementData alloc] init]; - [noGraph setProperty:@"" forKey:@"No Graph"]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(graphSelectionChanged:) - name:@"SelectionChanged" - object:nil]; - -// [[NSDocumentController sharedDocumentController] addObserver:self -// forKeyPath:@"currentDocument" -// options:NSKeyValueObservingOptionNew -// context:NULL]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(graphSelectionChanged:) - name:@"NSWindowDidBecomeMainNotification" - object:nil]; - - [self setSourceAnchorNames: [[NSMutableArray alloc] initWithArray: [@"north south west east" componentsSeparatedByString:@" "]]]; - - [self setTargetAnchorNames: [[NSMutableArray alloc] initWithArray:[@"north south west east" componentsSeparatedByString:@" "]]]; - - - if ([[NSUserDefaults standardUserDefaults] boolForKey:@"net.sourceforge.tikzit.inspectorsontop"] == YES) { - [[self window] setLevel:NSFloatingWindowLevel]; - } else { - [[self window] setLevel:NSNormalWindowLevel]; - } - - [self showWindow:self]; - return self; -} - -- (void)observeValueForKeyPath:(NSString*)keyPath - ofObject:(id)object - change:(NSDictionary*)change - context:(void*)context { - [self graphSelectionChanged:nil]; -} - -//- (void)willChangeValueForKey:(NSString *)key { -// [super willChangeValueForKey:key]; -// NSLog(@"will: %@",key); -//} -// -//- (void)didChangeValueForKey:(NSString *)key { -// [super didChangeValueForKey:key]; -// NSLog(@"did: %@",key); -//} - -- (void)windowDidLoad { - [[self window] setMovableByWindowBackground:YES]; - - [propertyInspectorView addInspectorPane:graphPropertiesView - title:@"Graph Properties"]; - [propertyInspectorView addInspectorPane:nodePropertiesView - title:@"Node Properties"]; - [propertyInspectorView addInspectorPane:edgePropertiesView - title:@"Edge Properties"]; - [super windowDidLoad]; -} - -- (IBAction)refreshDocument:(id)sender { - NSDocumentController *dc = [NSDocumentController sharedDocumentController]; - TikzDocument *doc = (TikzDocument*)[dc currentDocument]; - - if (doc != nil) { - [[doc graphicsView] postGraphChange]; - [[doc graphicsView] refreshLayers]; - } -} - - -- (void)updateGraphFields { - NSDocumentController *dc = [NSDocumentController sharedDocumentController]; - TikzDocument *doc = (TikzDocument*)[dc currentDocument]; - - if (doc != nil) { - [graphDataArrayController setContent:[[[doc graphicsView] graph] data]]; - [graphDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; - [graphDataArrayController setEditable:YES]; - } else { - [graphDataArrayController setContent:noGraph]; - [graphDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; - [graphDataArrayController setEditable:NO]; - } -} - -- (void)updateNodeFields { - NSDocumentController *dc = [NSDocumentController sharedDocumentController]; - TikzDocument *doc = (TikzDocument*)[dc currentDocument]; - if (doc != nil) { - NSSet *sel = [[[doc graphicsView] pickSupport] selectedNodes]; - [self setSelectedNodes:[[sel allObjects] mutableCopy]]; - [selectedNodesArrayController setSelectedObjects:selectedNodes]; - if ([sel count] == 1) { - Node *n = [sel anyObject]; - [nodeDataArrayController setContent:[n data]]; - [nodeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; - [nodeDataArrayController setEditable:YES]; - } else if ([sel count] == 0) { - [nodeDataArrayController setContent:noSelection]; - [nodeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; - [nodeDataArrayController setEditable:NO]; - } else { - [nodeDataArrayController setContent:multipleSelection]; - [nodeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; - [nodeDataArrayController setEditable:NO]; - } - } else { - [nodeDataArrayController setContent:noGraph]; - [nodeDataArrayController setEditable:NO]; - } -} - -- (void)updateEdgeFields { - NSDocumentController *dc = [NSDocumentController sharedDocumentController]; - TikzDocument *doc = (TikzDocument*)[dc currentDocument]; - - if (doc != nil) { - NSSet *sel = [[[doc graphicsView] pickSupport] selectedEdges]; - [self setSelectedEdges:[[sel allObjects] mutableCopy]]; - [selectedEdgesArrayController setSelectedObjects:selectedEdges]; - if ([sel count] == 1) { - Edge *e = [sel anyObject]; - [edgeDataArrayController setContent:[e data]]; - [edgeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; - [edgeDataArrayController setEditable:YES]; - if ([e hasEdgeNode]) { - Node *n = [e edgeNode]; - [edgeNodeDataArrayController setContent:[n data]]; - [edgeNodeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; - [edgeNodeDataArrayController setEditable:YES]; - } else { - [edgeNodeDataArrayController setContent:noEdgeNode]; - [edgeNodeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; - [edgeNodeDataArrayController setEditable:NO]; - } - } else if ([sel count] == 0) { - [edgeDataArrayController setContent:noSelection]; - [edgeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; - [edgeDataArrayController setEditable:NO]; - [edgeNodeDataArrayController setContent:noSelection]; - [edgeNodeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; - [edgeNodeDataArrayController setEditable:NO]; - } else { - [edgeDataArrayController setContent:multipleSelection]; - [edgeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; - [edgeDataArrayController setEditable:NO]; - [edgeNodeDataArrayController setContent:multipleSelection]; - [edgeNodeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; - [edgeNodeDataArrayController setEditable:NO]; - } - } else { - [edgeDataArrayController setContent:noGraph]; - [edgeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; - [edgeDataArrayController setEditable:NO]; - [edgeNodeDataArrayController setContent:noGraph]; - [edgeNodeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; - [edgeNodeDataArrayController setEditable:NO]; - } -} - -- (void)graphSelectionChanged:(NSNotification*)notification { - [self updateNodeFields]; - [self updateEdgeFields]; - [self updateGraphFields]; -} - -- (void)controlTextDidEndEditing:(NSNotification*)notification { - NSDocumentController *dc = [NSDocumentController sharedDocumentController]; - TikzDocument *doc = (TikzDocument*)[dc currentDocument]; - if (doc != nil) { - PickSupport *pick = [[doc graphicsView] pickSupport]; - for (Node *n in [pick selectedNodes]) { - [n attachStyleFromTable:[stylePaletteController nodeStyles]]; - } - - for (Edge *e in [pick selectedEdges]) { - [e attachStyleFromTable:[stylePaletteController edgeStyles]]; - } - } - - [self refreshDocument:[notification object]]; -} - -- (void)addPropertyToAC:(NSArrayController*)ac { - [ac addObject:[[GraphElementProperty alloc] initWithPropertyValue:@"val" forKey:@"new_property"]]; - [self refreshDocument:nil]; -} - -- (void)addAtomToAC:(NSArrayController*)ac { - [ac addObject:[[GraphElementProperty alloc] initWithAtomName:@"new_atom"]]; - [self refreshDocument:nil]; -} - -- (void)removeFromAC:(NSArrayController*)ac { - [ac remove:nil]; - [self refreshDocument:nil]; -} - -- (IBAction)addNodeProperty:(id)sender { [self addPropertyToAC:nodeDataArrayController]; } -- (IBAction)addNodeAtom:(id)sender { [self addAtomToAC:nodeDataArrayController]; } -- (IBAction)removeNodeProperty:(id)sender { [self removeFromAC:nodeDataArrayController]; } - -- (IBAction)addGraphProperty:(id)sender { [self addPropertyToAC:graphDataArrayController]; } -- (IBAction)addGraphAtom:(id)sender { [self addAtomToAC:graphDataArrayController]; } -- (IBAction)removeGraphProperty:(id)sender { [self removeFromAC:graphDataArrayController]; } - -- (IBAction)addEdgeProperty:(id)sender { [self addPropertyToAC:edgeDataArrayController]; } -- (IBAction)addEdgeAtom:(id)sender { [self addAtomToAC:edgeDataArrayController]; } -- (IBAction)removeEdgeProperty:(id)sender { [self removeFromAC:edgeDataArrayController]; } - -- (IBAction)addEdgeNodeProperty:(id)sender { [self addPropertyToAC:edgeNodeDataArrayController]; } -- (IBAction)addEdgeNodeAtom:(id)sender { [self addAtomToAC:edgeNodeDataArrayController]; } -- (IBAction)removeEdgeNodeProperty:(id)sender { [self removeFromAC:edgeNodeDataArrayController]; } - -//- (BOOL)enableEdgeDataControls { -// NSDocumentController *dc = [NSDocumentController sharedDocumentController]; -// TikzDocument *doc = (TikzDocument*)[dc currentDocument]; -// -// if (doc != nil) { -// return ([[[[doc graphicsView] pickSupport] selectedEdges] count] == 1); -// } else { -// return NO; -// } -//} -// -//- (BOOL)enableEdgeNodeDataControls { -// NSDocumentController *dc = [NSDocumentController sharedDocumentController]; -// TikzDocument *doc = (TikzDocument*)[dc currentDocument]; -// -// if (doc != nil) { -// PickSupport *pick = [[doc graphicsView] pickSupport]; -// if ([[pick selectedEdges] count] == 1) { -// return ([[[pick selectedEdges] anyObject] hasEdgeNode]); -// } else { -// return NO; -// } -// } else { -// return NO; -// } -//} - -@end diff --git a/tikzit-1/src/osx/SelectBoxLayer.h b/tikzit-1/src/osx/SelectBoxLayer.h deleted file mode 100644 index 45b43c7..0000000 --- a/tikzit-1/src/osx/SelectBoxLayer.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// SelectBoxLayer.h -// TikZiT -// -// Created by Aleks Kissinger on 14/06/2010. -// Copyright 2010 __MyCompanyName__. All rights reserved. -// - -#import -#import - -@interface SelectBoxLayer : CALayer { - BOOL active; - CGRect box; -} - -@property (assign) BOOL active; -@property (assign) NSRect selectBox; - -+ (SelectBoxLayer*)layer; - -@end diff --git a/tikzit-1/src/osx/SelectBoxLayer.m b/tikzit-1/src/osx/SelectBoxLayer.m deleted file mode 100644 index a7abe33..0000000 --- a/tikzit-1/src/osx/SelectBoxLayer.m +++ /dev/null @@ -1,48 +0,0 @@ -// -// SelectBoxLayer.m -// TikZiT -// -// Created by Aleks Kissinger on 14/06/2010. -// Copyright 2010 __MyCompanyName__. All rights reserved. -// - -#import "SelectBoxLayer.h" - - -@implementation SelectBoxLayer - -@synthesize active; - -- (id)init { - if (!(self = [super init])) return nil; - box = CGRectMake(0.0f, 0.0f, 0.0f, 0.0f); - active = NO; - return self; -} - -- (void)setSelectBox:(NSRect)r { - box = NSRectToCGRect(r); -} - -- (NSRect)selectBox { - return NSRectFromCGRect(box); -} - -- (void)drawInContext:(CGContextRef)context { - if (active) { - CGContextAddRect(context, box); - - CGContextSetRGBStrokeColor(context, 0.6, 0.6, 0.6, 1); - CGContextSetRGBFillColor(context, 0.8, 0.8, 0.8, 0.2); - CGContextSetLineWidth(context, 1); - - CGContextSetShouldAntialias(context, NO); - CGContextDrawPath(context, kCGPathFillStroke); - } -} - -+ (SelectBoxLayer*)layer { - return [[SelectBoxLayer alloc] init]; -} - -@end diff --git a/tikzit-1/src/osx/SelectableCollectionViewItem.h b/tikzit-1/src/osx/SelectableCollectionViewItem.h deleted file mode 100644 index 4a2c571..0000000 --- a/tikzit-1/src/osx/SelectableCollectionViewItem.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// SelectableCollectionViewItem.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "StylePaletteController.h" - -@interface SelectableCollectionViewItem : NSCollectionViewItem { - IBOutlet StylePaletteController *stylePaletteController; -} - -- (void)setStylePaletteController:(StylePaletteController*)spc; - -@end diff --git a/tikzit-1/src/osx/SelectableCollectionViewItem.m b/tikzit-1/src/osx/SelectableCollectionViewItem.m deleted file mode 100644 index 880c37b..0000000 --- a/tikzit-1/src/osx/SelectableCollectionViewItem.m +++ /dev/null @@ -1,54 +0,0 @@ -// -// SelectableCollectionViewItem.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "SelectableCollectionViewItem.h" -#import "SelectableNodeView.h" - -@implementation SelectableCollectionViewItem - -- (id)copyWithZone:(NSZone *)zone { - SelectableCollectionViewItem *item = [super copyWithZone:zone]; - [item setStylePaletteController:stylePaletteController]; - return (id)item; -} - -- (void)setSelected:(BOOL)flag { - [super setSelected:flag]; - [(SelectableNodeView*)[self view] setSelected:flag]; - - // only fire this event from the view that lost selection - //if (flag == NO) [stylePaletteController selectionDidChange]; - - [[self view] setNeedsDisplay:YES]; -} - -- (void)setRepresentedObject:(id)object { - [super setRepresentedObject:object]; - [(SelectableNodeView*)[self view] setNodeStyle:(NodeStyle*)object]; -} - -- (void)setStylePaletteController:(StylePaletteController*)spc { - stylePaletteController = spc; -} - -@end diff --git a/tikzit-1/src/osx/SelectableNodeView.h b/tikzit-1/src/osx/SelectableNodeView.h deleted file mode 100644 index 6b0841d..0000000 --- a/tikzit-1/src/osx/SelectableNodeView.h +++ /dev/null @@ -1,38 +0,0 @@ -// -// SelectableView.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "NodeLayer.h" -#import "NodeStyle.h" -#import "NodeStyle+Coder.h" - -@interface SelectableNodeView : NSView { - BOOL selected; - NodeLayer *nodeLayer; -} - -@property (assign) BOOL selected; -@property (strong) NodeStyle *nodeStyle; - - -@end diff --git a/tikzit-1/src/osx/SelectableNodeView.m b/tikzit-1/src/osx/SelectableNodeView.m deleted file mode 100644 index 797a137..0000000 --- a/tikzit-1/src/osx/SelectableNodeView.m +++ /dev/null @@ -1,96 +0,0 @@ -// -// SelectableView.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "SelectableNodeView.h" -#import "Shape.h" -#import "Transformer.h" - -@implementation SelectableNodeView - -@synthesize selected; - -- (id)initWithFrame:(NSRect)frameRect { - if (!(self = [super initWithFrame:frameRect])) return nil; - nodeLayer = nil; - return self; -} - --(void)drawLayer:(CALayer *)layer inContext:(CGContextRef)context { -// NSLog(@"got draw"); -// CGContextSaveGState(context); -// -// if (selected) { -// CGContextSetRGBStrokeColor(context, 0.61f, 0.735f, 1.0f, 1.0f); -// CGContextSetRGBFillColor(context, 0.61f, 0.735f, 1.0f, 0.5f); -// CGContextSetLineWidth(context, 1.0f); -// -// CGRect box = CGRectMake([layer frame].origin.x + 2, -// [layer frame].origin.y + 2, -// [layer frame].size.width - 4, -// [layer frame].size.height - 4); -// -// //CGContextAddRect(context, box); -// CGContextDrawPath(context, kCGPathFillStroke); -// } -// -// CGContextRestoreGState(context); - - if (nodeLayer!=nil) { - if (![[[self layer] sublayers] containsObject:nodeLayer]) { - [[self layer] addSublayer:nodeLayer]; - NSPoint c = NSMakePoint(CGRectGetMidX([[self layer] frame]), - CGRectGetMidY([[self layer] frame])); - [nodeLayer setCenter:c andAnimateWhen:NO]; - } - - if (selected) [[nodeLayer selection] select]; - else [[nodeLayer selection] deselect]; - - [nodeLayer updateFrame]; - } -} - -- (void)drawRect:(NSRect)rect { - [super drawRect:rect]; -} - -- (BOOL)acceptsFirstMouse:(NSEvent *)theEvent { return YES; } - -- (void)setNodeStyle:(NodeStyle *)sty { - if (nodeLayer == nil) { - nodeLayer = [[NodeLayer alloc] initWithNode:[Node node] - transformer:[Transformer defaultTransformer]]; - [nodeLayer setRescale:NO]; - } - - [[nodeLayer node] setStyle:sty]; - [nodeLayer updateFrame]; -} - -- (NodeStyle*)nodeStyle { - if (nodeLayer != nil) return [[nodeLayer node] style]; - else return nil; -} - - -@end diff --git a/tikzit-1/src/osx/StylePaletteController.h b/tikzit-1/src/osx/StylePaletteController.h deleted file mode 100644 index 05f0684..0000000 --- a/tikzit-1/src/osx/StylePaletteController.h +++ /dev/null @@ -1,80 +0,0 @@ -// -// StylePaletteController.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "NodeStyle.h" -#import "EdgeStyle.h" - -@class SFBInspectorView; - -@interface StylePaletteController : NSWindowController { - NSMutableArray *nodeStyles; - NSMutableArray *edgeStyles; - IBOutlet NSArrayController *nodeStyleArrayController; - IBOutlet NSArrayController *filteredNodeStyleArrayController; - IBOutlet NSArrayController *edgeStyleArrayController; - IBOutlet NSArrayController *filteredEdgeStyleArrayController; - IBOutlet NSCollectionView *collectionView; - IBOutlet SFBInspectorView *nodeStyleInspectorView; - IBOutlet NSView *nodeStyleView; - IBOutlet NSView *edgeStyleView; - IBOutlet NSPopUpButton *shapeDropdown; - NSString *displayedNodeStyleCategory; - NSString *displayedEdgeStyleCategory; -} - -@property (strong) NSMutableArray *nodeStyles; -@property (strong) NSMutableArray *edgeStyles; -@property (readonly) BOOL documentActive; -@property (strong) NodeStyle *activeNodeStyle; -@property (strong) EdgeStyle *activeEdgeStyle; -@property (copy) NSString *displayedNodeStyleCategory; -@property (copy) NSString *displayedEdgeStyleCategory; -@property (readonly) NSPredicate *displayedNodeStylePredicate; -@property (readonly) NSPredicate *displayedEdgeStylePredicate; - -//@property NSString *nodeLabel; - -- (id)initWithWindowNibName:(NSString *)windowNibName - supportDir:(NSString*)supportDir; -- (void)saveStyles:(NSString *)plist; - -- (IBAction)refreshCollection:(id)sender; - -- (IBAction)applyActiveNodeStyle:(id)sender; -- (IBAction)clearActiveNodeStyle:(id)sender; -- (IBAction)addNodeStyle:(id)sender; - -- (IBAction)appleActiveEdgeStyle:(id)sender; -- (IBAction)clearActiveEdgeStyle:(id)sender; -- (IBAction)addEdgeStyle:(id)sender; -- (void)setActiveEdgeStyle:(EdgeStyle*)style; - -- (IBAction)setFillToClosestHashed:(id)sender; -- (IBAction)setStrokeToClosestHashed:(id)sender; - - -//- (IBAction)changeShape:(id)sender; - - -@end diff --git a/tikzit-1/src/osx/StylePaletteController.m b/tikzit-1/src/osx/StylePaletteController.m deleted file mode 100644 index 4fe46be..0000000 --- a/tikzit-1/src/osx/StylePaletteController.m +++ /dev/null @@ -1,252 +0,0 @@ -// -// StylePaletteController.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "StylePaletteController.h" -#import "TikzDocument.h" -#import "SFBInspectors/SFBInspectorView.h" -#import "PickSupport.h" -#import "Node.h" -#import "Edge.h" -#import "NodeStyle.h" -#import "GraphicsView.h" -#import "GraphElementProperty.h" -#import "Shape.h" - -@implementation StylePaletteController - -@synthesize nodeStyles, edgeStyles; - -- (id)initWithWindowNibName:(NSString *)windowNibName - supportDir:(NSString*)supportDir -{ - if (self = [super initWithWindowNibName:windowNibName]) { - NSString *ns = [supportDir stringByAppendingPathComponent:@"nodeStyles.plist"]; - NSString *es = [supportDir stringByAppendingPathComponent:@"edgeStyles.plist"]; - nodeStyles = (NSMutableArray*)[NSKeyedUnarchiver - unarchiveObjectWithFile:ns]; - edgeStyles = (NSMutableArray*)[NSKeyedUnarchiver - unarchiveObjectWithFile:es]; - - if (nodeStyles == nil) nodeStyles = [NSMutableArray array]; - if (edgeStyles == nil) edgeStyles = [NSMutableArray array]; - - if ([[NSUserDefaults standardUserDefaults] boolForKey:@"net.sourceforge.tikzit.inspectorsontop"] == YES) { - [[self window] setLevel:NSFloatingWindowLevel]; - } else { - [[self window] setLevel:NSNormalWindowLevel]; - } - - [self showWindow:self]; - } - - return self; -} - -- (void)windowDidLoad { - [[self window] setMovableByWindowBackground:YES]; - [shapeDropdown addItemsWithTitles:[[Shape shapeDictionary] allKeys]]; - if ([self activeNodeStyle] != nil) { - [shapeDropdown setTitle:[[self activeNodeStyle] shapeName]]; - } - - [nodeStyleInspectorView addInspectorPane:nodeStyleView - title:@"Node Styles"]; - - [nodeStyleInspectorView addInspectorPane:edgeStyleView - title:@"Edge Styles"]; - - [super windowDidLoad]; -} - -- (void)saveStyles:(NSString*)supportDir { - NSString *ns = [supportDir stringByAppendingPathComponent:@"nodeStyles.plist"]; - NSString *es = [supportDir stringByAppendingPathComponent:@"edgeStyles.plist"]; - [NSKeyedArchiver archiveRootObject:nodeStyles toFile:ns]; - [NSKeyedArchiver archiveRootObject:edgeStyles toFile:es]; -} - -- (IBAction)refreshCollection:(id)sender { - [collectionView setNeedsDisplay:YES]; -} - - -- (BOOL)documentActive { - NSDocumentController *dc = [NSDocumentController sharedDocumentController]; - return dc.currentDocument != nil; -} - --(BOOL)collectionView:(NSCollectionView*)collectionView canDragItemsAtIndexes:(NSIndexSet*)indexes withEvent:(NSEvent*)event { - return YES; -} - - -//=========================== -//= setting SVG-safe colors = -//=========================== -- (IBAction)setFillToClosestHashed:(id)sender { - NSArray *sel = [nodeStyleArrayController selectedObjects]; - if ([sel count] != 0) { - NodeStyle *sty = [sel objectAtIndex:0]; - [sty willChangeValueForKey:@"fillColor"]; - [sty willChangeValueForKey:@"fillColorIsKnown"]; - [sty.fillColorRGB setToClosestHashed]; - [sty didChangeValueForKey:@"fillColor"]; - [sty didChangeValueForKey:@"fillColorIsKnown"]; - } -} - -- (IBAction)setStrokeToClosestHashed:(id)sender { - NSArray *sel = [nodeStyleArrayController selectedObjects]; - if ([sel count] != 0) { - NodeStyle *sty = [sel objectAtIndex:0]; - [sty willChangeValueForKey:@"strokeColor"]; - [sty willChangeValueForKey:@"strokeColorIsKnown"]; - [sty.strokeColorRGB setToClosestHashed]; - [sty didChangeValueForKey:@"strokeColor"]; - [sty didChangeValueForKey:@"strokeColorIsKnown"]; - } -} - -//================================================= -//= setting filter predicates for nodes and edges = -//================================================= -- (NSString*)displayedNodeStyleCategory { - return displayedNodeStyleCategory; -} - -- (void)setDisplayedNodeStyleCategory:(NSString *)cat { - [self willChangeValueForKey:@"displayedNodeStylePredicate"]; - displayedNodeStyleCategory = cat; - [self didChangeValueForKey:@"displayedNodeStylePredicate"]; -} - -- (NSString*)displayedEdgeStyleCategory { - return displayedEdgeStyleCategory; -} - -- (void)setDisplayedEdgeStyleCategory:(NSString *)cat { - [self willChangeValueForKey:@"displayedEdgeStylePredicate"]; - displayedEdgeStyleCategory = cat; - [self didChangeValueForKey:@"displayedEdgeStylePredicate"]; -} - -- (NSPredicate*)displayedNodeStylePredicate { - return [NSPredicate predicateWithFormat:@"category == %@", displayedNodeStyleCategory]; -} - -- (NSPredicate*)displayedEdgeStylePredicate { - return [NSPredicate predicateWithFormat:@"category == %@", displayedEdgeStyleCategory]; -} - - -//============================== -//= getting and setting styles = -//============================== - -- (IBAction)applyActiveNodeStyle:(id)sender { - NSDocumentController *dc = [NSDocumentController sharedDocumentController]; - TikzDocument *doc = (TikzDocument*)[dc currentDocument]; - - if (doc != nil) { - [[doc graphicsView] applyStyleToSelectedNodes:[self activeNodeStyle]]; - } - - [[doc graphicsView] postSelectionChange]; -} - -- (IBAction)clearActiveNodeStyle:(id)sender { - [self setActiveNodeStyle:nil]; - - NSDocumentController *dc = [NSDocumentController sharedDocumentController]; - TikzDocument *doc = (TikzDocument*)[dc currentDocument]; - - if (doc != nil) { - [[doc graphicsView] applyStyleToSelectedNodes:nil]; - } - - [[doc graphicsView] postSelectionChange]; -} - -- (NodeStyle*)activeNodeStyle { - NSArray *sel = [filteredNodeStyleArrayController selectedObjects]; - if ([sel count] == 0) return nil; - else return [sel objectAtIndex:0]; -} - -- (void)setActiveNodeStyle:(NodeStyle*)style { - if ([nodeStyles containsObject:style]) { - [filteredNodeStyleArrayController setSelectedObjects:[NSArray arrayWithObject:style]]; - } else { - [filteredNodeStyleArrayController setSelectedObjects:[NSArray array]]; - } -} - -- (IBAction)appleActiveEdgeStyle:(id)sender { - NSDocumentController *dc = [NSDocumentController sharedDocumentController]; - TikzDocument *doc = (TikzDocument*)[dc currentDocument]; - - if (doc != nil) { - [[doc graphicsView] applyStyleToSelectedEdges:[self activeEdgeStyle]]; - } -} - -- (IBAction)clearActiveEdgeStyle:(id)sender { - [self setActiveEdgeStyle:nil]; - [self appleActiveEdgeStyle:sender]; -} - -- (EdgeStyle*)activeEdgeStyle { - NSArray *sel = [filteredEdgeStyleArrayController selectedObjects]; - if ([sel count] == 0) return nil; - else return [sel objectAtIndex:0]; -} - -- (void)setActiveEdgeStyle:(EdgeStyle*)style { - if ([edgeStyles containsObject:style]) { - [filteredEdgeStyleArrayController setSelectedObjects:[NSArray arrayWithObject:style]]; - } else { - [filteredEdgeStyleArrayController setSelectedObjects:[NSArray array]]; - } -} - - -//================= -//= adding styles = -//================= - -- (IBAction)addEdgeStyle:(id)sender { - EdgeStyle *sty = [[EdgeStyle alloc] init]; - [sty setCategory:displayedEdgeStyleCategory]; - [edgeStyleArrayController addObject:sty]; - [self setActiveEdgeStyle:sty]; -} - -- (IBAction)addNodeStyle:(id)sender { - NodeStyle *sty = [[NodeStyle alloc] init]; - [sty setCategory:displayedNodeStyleCategory]; - [nodeStyleArrayController addObject:sty]; - [self setActiveNodeStyle:sty]; -} - - -@end diff --git a/tikzit-1/src/osx/TikzDocument.h b/tikzit-1/src/osx/TikzDocument.h deleted file mode 100644 index 1881994..0000000 --- a/tikzit-1/src/osx/TikzDocument.h +++ /dev/null @@ -1,37 +0,0 @@ -// -// TikzDocument.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "GraphicsView.h" -#import "TikzSourceController.h" -#import "PreviewController.h" -#import "GraphicsView.h" - -@interface TikzDocument : NSDocument { - NSString *tikz; -} - -@property (readonly) NSString *tikz; -@property (weak, readonly) GraphicsView *graphicsView; - -@end diff --git a/tikzit-1/src/osx/TikzDocument.m b/tikzit-1/src/osx/TikzDocument.m deleted file mode 100644 index ef5908d..0000000 --- a/tikzit-1/src/osx/TikzDocument.m +++ /dev/null @@ -1,84 +0,0 @@ -// -// TikzDocument.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "TikzDocument.h" -#import "TikzWindowController.h" - -@implementation TikzDocument - -@synthesize tikz; - -- (id)init { - self = [super init]; - if (self) { - tikz = nil; - } - return self; -} - -//- (NSString *)windowNibName { -// // Override returning the nib file name of the document -// // If you need to use a subclass of NSWindowController or if your document supports multiple NSWindowControllers, you should remove this method and override -makeWindowControllers instead. -// return @"TikzDocument"; -//} - -- (void)makeWindowControllers { - TikzWindowController *wc = [[TikzWindowController alloc] initWithDocument:self]; - [self addWindowController:wc]; -} - -- (void)windowControllerDidLoadNib:(NSWindowController *) aController { - [super windowControllerDidLoadNib:aController]; - [[self graphicsView] refreshLayers]; - // Add any code here that needs to be executed once the windowController has loaded the document's window. -} - -- (NSData *)dataOfType:(NSString *)typeName error:(NSError **)outError { - TikzWindowController *wc = - (TikzWindowController*)[[self windowControllers] objectAtIndex:0]; - NSData *outData = [[[wc tikzSourceController] tikz] dataUsingEncoding:NSUTF8StringEncoding]; - - if ( outError != NULL ) { - *outError = [NSError errorWithDomain:NSOSStatusErrorDomain code:unimpErr userInfo:NULL]; - } - return outData; -} - -- (BOOL)readFromData:(NSData *)data ofType:(NSString *)typeName error:(NSError **)outError { - tikz = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]; - - if ( outError != NULL ) { - *outError = [NSError errorWithDomain:NSOSStatusErrorDomain code:unimpErr userInfo:NULL]; - } - - return YES; -} - -- (GraphicsView*)graphicsView { - TikzWindowController *wc = - (TikzWindowController*)[[self windowControllers] objectAtIndex:0]; - return [wc graphicsView]; -} - - -@end diff --git a/tikzit-1/src/osx/TikzFormatter.h b/tikzit-1/src/osx/TikzFormatter.h deleted file mode 100644 index 4d9ec04..0000000 --- a/tikzit-1/src/osx/TikzFormatter.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// NSTikzFormatter.h -// TikZiT -// -// Created by Karl Johan Paulsson on 27/01/2013. -// Copyright (c) 2013 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import - -@interface TikzFormatter : NSFormatter - -@end diff --git a/tikzit-1/src/osx/TikzFormatter.m b/tikzit-1/src/osx/TikzFormatter.m deleted file mode 100644 index cb0865d..0000000 --- a/tikzit-1/src/osx/TikzFormatter.m +++ /dev/null @@ -1,91 +0,0 @@ -// -// NSTikzFormatter.m -// TikZiT -// -// Created by Karl Johan Paulsson on 27/01/2013. -// Copyright (c) 2013 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "TikzFormatter.h" -#import "TikzGraphAssembler.h" - -@implementation TikzFormatter - -- (NSString *)stringForObjectValue:(id)obj{ - if (![obj isKindOfClass:[NSString class]]) { - return @""; - } - - return [NSString stringWithString:obj]; -} - -- (BOOL)getObjectValue:(out id *)obj forString:(NSString *)string errorDescription:(out NSString **)error{ - *obj = [NSString stringWithString:string]; - - BOOL r = [TikzGraphAssembler validateTikzPropertyNameOrValue:string]; - - if (!r && error) - *error = NSLocalizedString(@"Invalid input, couldn't parse value.", @"tikz user input error"); - - return r; -} - -- (BOOL)isPartialStringValid:(NSString **)partialStringPtr proposedSelectedRange:(NSRangePointer)proposedSelRangePtr originalString:(NSString *)origString originalSelectedRange:(NSRange)origSelRange errorDescription:(NSString **)error{ - NSRange addedRange; - NSString *addedString; - - if(![[NSUserDefaults standardUserDefaults] boolForKey:@"net.sourceforge.tikzit.autocomplete"]){ - return YES; - } - - addedRange = NSMakeRange(origSelRange.location, proposedSelRangePtr->location - origSelRange.location); - addedString = [*partialStringPtr substringWithRange: addedRange]; - - if([addedString isEqualToString:@"{"]){ - NSString *s = [[NSString stringWithString:*partialStringPtr] stringByAppendingString:@"}"]; - *partialStringPtr = s; - - return NO; - } - - if([addedString isEqualToString:@"}"]){ - NSScanner *scanner = [NSScanner scannerWithString:*partialStringPtr]; - - NSCharacterSet *cs = [NSCharacterSet characterSetWithCharactersInString:@"{}"]; - NSMutableString *strippedString = [NSMutableString stringWithCapacity:[*partialStringPtr length]]; - - while ([scanner isAtEnd] == NO) { - NSString *buffer; - if ([scanner scanCharactersFromSet:cs intoString:&buffer]) { - [strippedString appendString:buffer]; - - } else { - [scanner setScanLocation:([scanner scanLocation] + 1)]; - } - } - - if([strippedString length] % 2 == 1){ - return NO; - } - } - - return YES; -} - -@end diff --git a/tikzit-1/src/osx/TikzSourceController.h b/tikzit-1/src/osx/TikzSourceController.h deleted file mode 100644 index 84d36da..0000000 --- a/tikzit-1/src/osx/TikzSourceController.h +++ /dev/null @@ -1,71 +0,0 @@ -// -// TikzSourceController.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import - -#import "GraphicsView.h" -#import "ParseErrorView.h" - -@interface TikzSourceController : NSObject { - GraphicsView *__weak graphicsView; - NSTextView *__unsafe_unretained sourceView; - NSAttributedString *source; - NSTextField *__weak status; - NSDictionary *textAttrs; - NSColor *successColor; - NSColor *failedColor; - NSTextField *__weak errorMessage; - ParseErrorView *__weak errorNotification; - - NSUndoManager *__weak documentUndoManager; - - BOOL tikzChanged; - BOOL justUndid; - - NSError *lastError; -} - -@property BOOL tikzChanged; -@property (weak) IBOutlet GraphicsView *graphicsView; -@property (unsafe_unretained) IBOutlet NSTextView *sourceView; -@property (weak) IBOutlet NSTextField *status; -@property (weak) NSUndoManager *documentUndoManager; -@property (copy) NSAttributedString *source; -@property (copy) NSString *tikz; -@property (weak) IBOutlet ParseErrorView *errorNotification; -@property (weak) IBOutlet NSTextField *errorMessage; - -- (void)updateTikzFromGraph; -- (void)graphChanged:(NSNotification*)n; - -- (IBAction)closeParseError:(id)pId; - -// called by code, these do not register an undo -- (BOOL)tryParseTikz; -- (void)doRevertTikz; - -// called by user, these do register an undo -- (void)parseTikz:(id)sender; -- (void)revertTikz:(id)sender; - -@end diff --git a/tikzit-1/src/osx/TikzSourceController.m b/tikzit-1/src/osx/TikzSourceController.m deleted file mode 100644 index 84eb3a5..0000000 --- a/tikzit-1/src/osx/TikzSourceController.m +++ /dev/null @@ -1,241 +0,0 @@ -// -// TikzSourceController.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "TikzSourceController.h" -#import "TikzGraphAssembler.h" -#import "Graph.h" - -@implementation TikzSourceController - -@synthesize graphicsView, sourceView, source, status; -@synthesize documentUndoManager, tikzChanged; -@synthesize errorMessage, errorNotification; - -- (void)endEditing { - NSResponder *res = [[sourceView window] firstResponder]; - [[sourceView window] makeFirstResponder:nil]; - [[sourceView window] makeFirstResponder:res]; -} - -- (void)undoParseTikz:(Graph *)oldGraph { - [graphicsView setGraph:oldGraph]; - [graphicsView setEnabled:NO]; - [graphicsView postGraphChange]; - [graphicsView refreshLayers]; - - [documentUndoManager registerUndoWithTarget:self - selector:@selector(parseTikz:) - object:self]; - [documentUndoManager setActionName:@"Parse Tikz"]; -} - -- (void)undoRevertTikz:(NSString*)oldTikz { - [self setTikz:oldTikz]; - [graphicsView setEnabled:NO]; - [graphicsView refreshLayers]; - - [documentUndoManager registerUndoWithTarget:self - selector:@selector(revertTikz:) - object:self]; - [documentUndoManager setActionName:@"Revert Tikz"]; -} - -- (void)undoTikzChange:(id)ignore { - [graphicsView setEnabled:YES]; - [graphicsView refreshLayers]; - [self endEditing]; - [self updateTikzFromGraph]; - [documentUndoManager registerUndoWithTarget:self - selector:@selector(redoTikzChange:) - object:nil]; - [documentUndoManager setActionName:@"Tikz Change"]; -} - -- (void)redoTikzChange:(id)ignore { - [graphicsView setEnabled:NO]; - [graphicsView refreshLayers]; - [documentUndoManager registerUndoWithTarget:self - selector:@selector(undoTikzChange:) - object:nil]; - [documentUndoManager setActionName:@"Tikz Change"]; -} - - -- (void)awakeFromNib { - justUndid = NO; - successColor = [NSColor colorWithCalibratedRed:0.0f - green:0.5f - blue:0.0f - alpha:1.0f]; - failedColor = [NSColor redColor]; - - NSFont *font = [NSFont userFixedPitchFontOfSize:11.0f]; - - if (font != nil) { - textAttrs = [NSDictionary dictionaryWithObject:font - forKey:NSFontAttributeName]; - } else { - NSLog(@"WARNING: couldn't find monospaced font."); - textAttrs = [NSDictionary dictionary]; - } - - - [self graphChanged:nil]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(graphChanged:) - name:@"GraphChanged" - object:graphicsView]; -} - -- (void)setTikz:(NSString *)str { - [self willChangeValueForKey:@"source"]; - source = [[NSAttributedString alloc] initWithString:str attributes:textAttrs]; - [self didChangeValueForKey:@"source"]; -} - -- (NSString*)tikz { - return [source string]; -} - -- (void)updateTikzFromGraph { - [self setTikz:[[graphicsView graph] tikz]]; - [errorNotification setHidden:TRUE]; -} - -- (void)graphChanged:(NSNotification*)n { - if ([graphicsView enabled]) [self updateTikzFromGraph]; -} - -- (IBAction)closeParseError:(id)pId{ - [errorNotification setHidden:TRUE]; -} - -- (void)textDidBeginEditing:(NSNotification *)notification { - if ([graphicsView enabled]){ - [graphicsView setEnabled:NO]; - [graphicsView refreshLayers]; - [documentUndoManager registerUndoWithTarget:self - selector:@selector(undoTikzChange:) - object:nil]; - [documentUndoManager setActionName:@"Tikz Change"]; - } -} - -- (BOOL)tryParseTikz { - NSError *thisError; - - Graph *g = [TikzGraphAssembler parseTikz:[self tikz] - error:&thisError]; - - lastError = thisError; - - if (g) { - [graphicsView deselectAll:self]; - [graphicsView setGraph:g]; - [graphicsView refreshLayers]; - [self doRevertTikz]; - return YES; - } else { - return NO; - } -} - -- (void)doRevertTikz { - [self updateTikzFromGraph]; - [self endEditing]; - [graphicsView setEnabled:YES]; - [graphicsView refreshLayers]; - [status setStringValue:@""]; -} - -- (void)parseTikz:(id)sender { - if (![graphicsView enabled]) { - Graph *oldGraph = [graphicsView graph]; - if ([self tryParseTikz]) { - [self endEditing]; - [documentUndoManager registerUndoWithTarget:self - selector:@selector(undoParseTikz:) - object:oldGraph]; - [documentUndoManager setActionName:@"Parse Tikz"]; - - [status setStringValue:@"success"]; - [status setTextColor:successColor]; - - [errorNotification setHidden:TRUE]; - } else { - [status setStringValue:@"parse error"]; - [status setTextColor:failedColor]; - - NSDictionary *d = [lastError userInfo]; - - NSString *ts = [NSString stringWithFormat: @"Parse error on line %@: %@\n", [d valueForKey:@"startLine"], [d valueForKey:NSLocalizedDescriptionKey]]; - NSMutableAttributedString *as = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat: @"Parse error on line %@: %@\n%@\n", [d valueForKey:@"startLine"], [d valueForKey:NSLocalizedDescriptionKey], [[d valueForKey:@"syntaxString"] stringByReplacingOccurrencesOfString:@"\t" withString:@""]]]; - - NSInteger tokenLength = [[d valueForKey:@"tokenLength"] integerValue]; - // Bit of a mess, offset around to find correct position and correct for 4 characters for every one character of \t - NSInteger addedTokenStart = [[d valueForKey:@"tokenStart"] integerValue] + [ts length] - ([[[d valueForKey:@"syntaxString"] componentsSeparatedByString:@"\t"] count]-1)*4 - tokenLength; - - // Can't see if the error is a start paranthesis as only that will be underlined, underline the entire paranthesis instead - if(tokenLength == 1 && [[as string] characterAtIndex:addedTokenStart] == '('){ - tokenLength += [[[as string] substringFromIndex:addedTokenStart+1] rangeOfString:@")"].location + 1; - } - - // Same if unexpected endparanthesis - if(tokenLength == 1 && [[as string] characterAtIndex:addedTokenStart] == ')'){ - NSInteger d = addedTokenStart - [[[as string] substringToIndex:addedTokenStart] rangeOfString:@"(" options:NSBackwardsSearch].location; - - tokenLength += d; - addedTokenStart -= d; - } - - [as beginEditing]; - [as addAttributes:[NSDictionary dictionaryWithObjectsAndKeys: - [NSNumber numberWithInt:NSUnderlineStyleSingle | NSUnderlinePatternDot], NSUnderlineStyleAttributeName, - [NSColor redColor], NSUnderlineColorAttributeName, - nil] - range:NSMakeRange(addedTokenStart, tokenLength)]; - [as endEditing]; - - [errorMessage setAttributedStringValue:as]; - [errorNotification setHidden:FALSE]; - } - } -} - -- (void)revertTikz:(id)sender { - if (![graphicsView enabled]) { - NSString *oldTikz = [[self tikz] copy]; - [self doRevertTikz]; - - [documentUndoManager registerUndoWithTarget:self - selector:@selector(undoRevertTikz:) - object:oldTikz]; - [documentUndoManager setActionName:@"Revert Tikz"]; - } -} - -- (void)dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; -} - -@end diff --git a/tikzit-1/src/osx/TikzWindowController.h b/tikzit-1/src/osx/TikzWindowController.h deleted file mode 100644 index eab427c..0000000 --- a/tikzit-1/src/osx/TikzWindowController.h +++ /dev/null @@ -1,31 +0,0 @@ -// -// TikzWindowController.h -// TikZiT -// -// Created by Aleks Kissinger on 26/01/2011. -// Copyright 2011 __MyCompanyName__. All rights reserved. -// - -#import - -@class TikzDocument, GraphicsView, TikzSourceController; - -@interface TikzWindowController : NSWindowController { - GraphicsView *__weak graphicsView; - TikzSourceController *__weak tikzSourceController; - TikzDocument *document; -} - -@property (weak) IBOutlet GraphicsView *graphicsView; -@property (weak) IBOutlet TikzSourceController *tikzSourceController; - -- (id)initWithDocument:(TikzDocument*)doc; - -// pass these straight to the tikz source controller -- (void)parseTikz:(id)sender; -- (void)revertTikz:(id)sender; -- (void)zoomIn:(id)sender; -- (void)zoomOut:(id)sender; -- (void)zoomToActualSize:(id)sender; - -@end diff --git a/tikzit-1/src/osx/TikzWindowController.m b/tikzit-1/src/osx/TikzWindowController.m deleted file mode 100644 index bfacbfb..0000000 --- a/tikzit-1/src/osx/TikzWindowController.m +++ /dev/null @@ -1,66 +0,0 @@ -// -// TikzWindowController.m -// TikZiT -// -// Created by Aleks Kissinger on 26/01/2011. -// Copyright 2011 __MyCompanyName__. All rights reserved. -// - -#import "TikzWindowController.h" -#import "TikzDocument.h" -#import "GraphicsView.h" -#import "TikzSourceController.h" - -@implementation TikzWindowController - -@synthesize graphicsView, tikzSourceController; - -- (id)initWithDocument:(TikzDocument*)doc { - if (!(self = [super initWithWindowNibName:@"TikzDocument"])) return nil; - document = doc; - return self; -} - -- (void)awakeFromNib { - if ([document tikz] != nil) { - [graphicsView setEnabled:NO]; - [tikzSourceController setTikz:[document tikz]]; - [tikzSourceController parseTikz:self]; - } - - [graphicsView setDocumentUndoManager:[document undoManager]]; - [tikzSourceController setDocumentUndoManager:[document undoManager]]; -} - -- (void)parseTikz:(id)sender { - [tikzSourceController parseTikz:sender]; -} - -- (void)revertTikz:(id)sender { - [tikzSourceController revertTikz:sender]; -} - -- (void)previewTikz:(id)sender { - PreviewController *pc = [PreviewController defaultPreviewController]; - if (![[pc window] isVisible]) [pc showWindow:sender]; - [pc buildTikz:[tikzSourceController tikz]]; -} - -- (void)zoomIn:(id)sender { - float scale = [[graphicsView transformer] scale] * 1.25f; - [[graphicsView transformer] setScale:scale]; - [graphicsView refreshLayers]; -} - -- (void)zoomOut:(id)sender { - float scale = [[graphicsView transformer] scale] * 0.8f; - [[graphicsView transformer] setScale:scale]; - [graphicsView refreshLayers]; -} - -- (void)zoomToActualSize:(id)sender { - [[graphicsView transformer] setScale:50.0f]; - [graphicsView refreshLayers]; -} - -@end diff --git a/tikzit-1/src/osx/ToolPaletteController.h b/tikzit-1/src/osx/ToolPaletteController.h deleted file mode 100644 index 6301c6b..0000000 --- a/tikzit-1/src/osx/ToolPaletteController.h +++ /dev/null @@ -1,42 +0,0 @@ -// -// ToolPaletteController.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// -#import - -typedef enum { - TikzToolSelect, - TikzToolNode, - TikzToolEdge, - TikzToolCrop -} TikzTool; - -@interface ToolPaletteController : NSObject { - NSPanel *__weak toolPalette; - NSMatrix *__weak toolMatrix; -} - -@property TikzTool selectedTool; -@property (weak) IBOutlet NSPanel *toolPalette; -@property (weak) IBOutlet NSMatrix *toolMatrix; - - -@end diff --git a/tikzit-1/src/osx/ToolPaletteController.m b/tikzit-1/src/osx/ToolPaletteController.m deleted file mode 100644 index 000287d..0000000 --- a/tikzit-1/src/osx/ToolPaletteController.m +++ /dev/null @@ -1,58 +0,0 @@ -// -// ToolPaletteController.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "ToolPaletteController.h" - - -@implementation ToolPaletteController - -@synthesize toolPalette, toolMatrix; - -- (TikzTool)selectedTool { - switch (toolMatrix.selectedRow) { - case 0: return TikzToolSelect; - case 1: return TikzToolNode; - case 2: return TikzToolEdge; - case 3: return TikzToolCrop; - } - return TikzToolSelect; -} - -- (void)setSelectedTool:(TikzTool)tool { - switch (tool) { - case TikzToolSelect: - [toolMatrix selectCellAtRow:0 column:0]; - break; - case TikzToolNode: - [toolMatrix selectCellAtRow:1 column:0]; - break; - case TikzToolEdge: - [toolMatrix selectCellAtRow:2 column:0]; - break; - case TikzToolCrop: - [toolMatrix selectCellAtRow:3 column:0]; - break; - } -} - -@end diff --git a/tikzit-1/src/osx/UpdatePreferenceController.h b/tikzit-1/src/osx/UpdatePreferenceController.h deleted file mode 100644 index 816322f..0000000 --- a/tikzit-1/src/osx/UpdatePreferenceController.h +++ /dev/null @@ -1,34 +0,0 @@ -// -// UpdatePreferenceController.h -// TikZiT -// -// Copyright (c) 2013 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import - -@interface UpdatePreferenceController : NSViewController{ - IBOutlet SUUpdater *sharedUpdater; - IBOutlet NSDate *lastUpdate; -} - -- (IBAction)checkForUpdates:(id)sender; - -@end diff --git a/tikzit-1/src/osx/UpdatePreferenceController.m b/tikzit-1/src/osx/UpdatePreferenceController.m deleted file mode 100644 index 2ff270f..0000000 --- a/tikzit-1/src/osx/UpdatePreferenceController.m +++ /dev/null @@ -1,49 +0,0 @@ -// -// UpdatePreferenceController.h -// TikZiT -// -// Copyright (c) 2013 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "UpdatePreferenceController.h" - -@interface UpdatePreferenceController () - -@end - -@implementation UpdatePreferenceController - -- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil -{ - self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]; - if (self) { - sharedUpdater = [SUUpdater sharedUpdater]; - } - return self; -} - -- (IBAction)checkForUpdates:(id)sender{ - [sharedUpdater checkForUpdates:sender]; -} - -- (NSDate*)getLastUpdate{ - return [sharedUpdater lastUpdateCheckDate]; -} - -@end diff --git a/tikzit-1/src/osx/UpdatePreferencePanel.xib b/tikzit-1/src/osx/UpdatePreferencePanel.xib deleted file mode 100644 index a9f57bd..0000000 --- a/tikzit-1/src/osx/UpdatePreferencePanel.xib +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tikzit-1/src/osx/main.m b/tikzit-1/src/osx/main.m deleted file mode 100644 index e6b4499..0000000 --- a/tikzit-1/src/osx/main.m +++ /dev/null @@ -1,26 +0,0 @@ -// -// main.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// - -#import - -int main(int argc, char *argv[]) -{ - return NSApplicationMain(argc, (const char **) argv); -} diff --git a/tikzit-1/src/osx/test/main.m b/tikzit-1/src/osx/test/main.m deleted file mode 100644 index ad0c1f7..0000000 --- a/tikzit-1/src/osx/test/main.m +++ /dev/null @@ -1,56 +0,0 @@ -// -// main.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "test/test.h" -#include - -void testCommon(); -void testOSX(); - -int main(int argc, char **argv) { - if (argc == 2 && strcmp(argv[1], "--disable-color")==0) { - setColorEnabled(NO); - } else { - setColorEnabled(YES); - } - - NSBundle *bund = [NSBundle bundleWithPath:@"TikZiT.app"]; - - - PUTS(@""); - PUTS(@"**********************************************"); - PUTS(@"TikZiT TESTS, OS X BUNDLE VERSION %@", - [bund objectForInfoDictionaryKey:@"CFBundleVersion"]); - PUTS(@"**********************************************"); - PUTS(@""); - - startTests(); - testCommon(); - testOSX(); - - PUTS(@""); - PUTS(@"**********************************************"); - endTests(); - PUTS(@"**********************************************"); - PUTS(@""); -} \ No newline at end of file diff --git a/tikzit-1/src/osx/test/osx.m b/tikzit-1/src/osx/test/osx.m deleted file mode 100644 index f9565ab..0000000 --- a/tikzit-1/src/osx/test/osx.m +++ /dev/null @@ -1,64 +0,0 @@ -// -// osx.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// -#import "test/test.h" - -#import - -void testOSX() { -// char template[] = "/tmp/tikzit_test_tmp_XXXXXXX"; -// char *dir = mkdtemp(template); -// NSString *tempDir = [NSString stringWithUTF8String:dir]; -// -// NSString *testLatex = -// @"\\documentclass{article}\n" -// @"\\begin{document}\n" -// @"test document\n" -// @"\\end{document}\n"; -// -// NSString *texFile = [NSString stringWithFormat:@"%@/test.tex", tempDir]; -// NSString *pdfFile = [NSString stringWithFormat:@"%@/test.pdf", tempDir]; -// -// [testLatex writeToFile:texFile atomically:NO encoding:NSUTF8StringEncoding error:NULL]; -// -// NSTask *task = [[NSTask alloc] init]; -// [task setLaunchPath:@"/bin/bash"]; -// NSPipe *inpt = [NSPipe pipe]; -// NSPipe *outpt = [NSPipe pipe]; -// [task setStandardInput:inpt]; -// [task setStandardOutput:outpt]; -// -// [task launch]; -// -// NSFileHandle *wr = [inpt fileHandleForWriting]; -// NSString *cmd = -// [NSString stringWithFormat: -// @"if [ -e ~/.profile ]; then source ~/.profile; fi" -// @"if [ -e ~/.profile ]; then source ~/.profile; fi"; -// [wr writeData:[cmd dataUsingEncoding:NSUTF8StringEncoding]]; -// [wr closeFile]; -// -// NSFileHandle *rd = [outpt fileHandleForReading]; -// NSString *res = [[NSString alloc] initWithData:[rd readDataToEndOfFile] -// encoding:NSUTF8StringEncoding]; -// NSLog(@"got:\n %@", res); -} diff --git a/tikzit-1/src/tikzit.rc b/tikzit-1/src/tikzit.rc deleted file mode 100644 index 072f825..0000000 --- a/tikzit-1/src/tikzit.rc +++ /dev/null @@ -1,24 +0,0 @@ -1 VERSIONINFO -FILEVERSION 0,7,0,0 -PRODUCTVERSION 0,7,0,0 -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "080904E4" - BEGIN - VALUE "FileDescription", "A graph editor for LaTeX" - VALUE "FileVersion", "1.0" - VALUE "InternalName", "tikzit" - VALUE "LegalCopyright", "Aleks Kissinger, Alex Merry, Chris Heunen" - VALUE "OriginalFilename", "tikzit.exe" - VALUE "ProductName", "TikZiT" - VALUE "ProductVersion", "0.7" - END - END - - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x809, 1252 - END -END -id ICON "../tikzit.ico" diff --git a/tikzit-1/text-x-generic.png b/tikzit-1/text-x-generic.png deleted file mode 100644 index 928a679..0000000 Binary files a/tikzit-1/text-x-generic.png and /dev/null differ diff --git a/tikzit-1/text-x-script.png b/tikzit-1/text-x-script.png deleted file mode 100644 index 801dcd6..0000000 Binary files a/tikzit-1/text-x-script.png and /dev/null differ diff --git a/tikzit-1/tikzit.icns b/tikzit-1/tikzit.icns deleted file mode 100644 index dc66f7f..0000000 Binary files a/tikzit-1/tikzit.icns and /dev/null differ diff --git a/tikzit-1/tikzit.ico b/tikzit-1/tikzit.ico deleted file mode 100644 index 3132b4c..0000000 Binary files a/tikzit-1/tikzit.ico and /dev/null differ diff --git a/tikzit-1/tikzit.spec b/tikzit-1/tikzit.spec deleted file mode 100644 index 237c543..0000000 --- a/tikzit-1/tikzit.spec +++ /dev/null @@ -1,98 +0,0 @@ -Name: tikzit -Version: 1.0 -Release: 1%{?dist} -Summary: Tool for creating and modifying PGF/TikZ-based node-and-edge graphs for LaTeX documents - -# try to choose a sensible group for this distro -%if 0%{?suse_version} -Group: Productivity/Graphics/Visualization/Graph -%else -%if 0%{?mdkversion} -Group: Sciences/Other -%else -Group: Applications/Productivity -%endif -%endif - -%if 0%{?suse_version} -License: GPL-2.0+ -%else -License: GPLv2+ -%endif -URL: http://tikzit.sourceforge.net -Source0: http://switch.dl.sourceforge.net/project/%{name}/%{name}-%{version}/%{name}-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-build - -BuildRequires: gcc-objc >= 4.6.0 -BuildRequires: gnustep-base-devel >= 1.18.0 -BuildRequires: gtk2-devel >= 2.18.0 -BuildRequires: pango-devel >= 1.16 -BuildRequires: cairo-devel >= 1.4 -%if 0%{?suse_version}%{?mdkversion} -BuildRequires: libpoppler-glib-devel >= 0.10 -%else -BuildRequires: poppler-glib-devel >= 0.10 -%endif -%if 0%{?suse_version} -BuildRequires: update-desktop-files -%endif - -%description -TikZiT is a GTK+ application that allows the creation and modification of TeX -diagrams written using the pgf/TikZ macro library. It is especially geared -toward rapidly creating "dot"-diagrams for use in academic papers. - - -%prep -%setup -q - - -%build -%configure -make %{?_smp_mflags} - - -%install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} -%if 0%{?suse_version} -# SuSE is particularly fussy about desktop file categories -%suse_update_desktop_file %{name} -r Graphics 2DGraphics -%endif - - -%clean -rm -rf %{buildroot} - - -%files -%defattr(-,root,root,-) -%doc -%{_bindir}/tikzit -%{_datadir}/tikzit/ -%{_datadir}/applications/tikzit.desktop -%{_datadir}/icons/hicolor/* - - -%changelog -* Fri May 17 2013 Alex Merry 1.0-2 --Fixed license on openSUSE - -* Tue May 7 2013 Alex Merry 1.0-1 --Bumped version - -* Fri Aug 24 2012 Alex Merry 0.9-1 --Bumped version --Bumped requirements - -* Tue Dec 06 2011 Alex Merry 0.7-1 --Bumped version - -* Tue Feb 08 2011 Alex Merry 0.6-1 --Bumped version --Added Pango and Cairo to BuildRequires --Set minimum version for GNUStep-base - -* Thu Dec 02 2010 Alex Merry 0.5-1 --Rewrote spec file - diff --git a/tikzit-1/tikzit48x48.png b/tikzit-1/tikzit48x48.png deleted file mode 100644 index 056d04b..0000000 Binary files a/tikzit-1/tikzit48x48.png and /dev/null differ diff --git a/tikzit-1/tikzit_dsa_pub.pem b/tikzit-1/tikzit_dsa_pub.pem deleted file mode 100644 index c97cc04..0000000 --- a/tikzit-1/tikzit_dsa_pub.pem +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN PUBLIC KEY----- -MIIDOjCCAi0GByqGSM44BAEwggIgAoIBAQDAdRlqLgJYjdAKkDsKtZDXgVlhqwyl -OXWCILHuE/MLh24I/mAaro4hucdhj92V5td9KNdM/R19904yZ3XcLj2/SodDVD7I -lEHPGwC/y+mJd9CaMNI/ARgFbLwJ+3+l/Ia3sraa/ASGAzardJPzYdkkRbZ/1DJn -wtHh2HgmPBdOMZZrbDmw3g4lj69Vacj4Wdz+YDG7750FjAUd+IcOvaDip28B8ogj -ogVirSXGe5YLoYbw078gx92PzSw6vfOZ3b7Gqk7zilYGB0bUJXUPSLOkxa5TMSx1 -Lr2UdW+vXrudI76rBhW52B32i7f801N4/W/qUfg8tw4tUGi/Uw8n2/S5AhUA0F82 -Qxit1jmqP0mZSLAn+qIVPuUCggEAEkSBjRxMo4KRvHOSppZphdaV2RWmQ6w9mxMj -3Z4AGDNU/buQ+TWJEYGVsIXpykI7DYCfgp8XO9uhj1hporfDsU4QGNZd0rG7SLK3 -DHwSf9QTgXY+D5IRQvkBtocxYRgNpuW+mfwl886SPmrRcT3QvsiFaI7/Iw787Tr6 -Yip4D7GjqTvj+epJH6kZq1xbdnrfBEA4dKs5IrZupF75npU8d1EjcdLlTyuzxuoZ -5a3SQWoBvT4l0xvbtR4yv+Af++MB+uxdxBSYMIgtQPgoIjFWtTDRZCwFAig1RWxz -fHEI5Fk4mqGhLAVbROL/pebYYZ5UxTKt9AMjmgmuM10/L5TXbwOCAQUAAoIBAA7t -W96VBoZgbbO2EfSxt5az4EnAJmuua6DNjZzESpcb67/DR7nLd5yveZEPL+9x6c1S -FtduIk8allplryOJtwysf8KkxrPVej83XiVJ9PDLMktsYjtnVksGIk9CS3v98OgT -c3g+xgJpRbwB6dROa5ZMxvoCU100ngfI3F/RUqeYYh7PP5kEL6SfqEHG5udIf1K7 -jUmOycNzI5Fsi+IDh8qtzxoOVTjoMPlN2F4T27xuWXA0BEd/NZqtgGLIFsbww5oD -8VPQIeo9UwQkYo/Qz1/uuaXi1u2PbTbbx2FTUL+zJuqrAv3oqmG2Ktyi0RXZaUAJ -4+P+kdS46Ip2NybQbkE= ------END PUBLIC KEY----- diff --git a/tikzit-1/tikzitdoc.icns b/tikzit-1/tikzitdoc.icns deleted file mode 100644 index 2f8bbcd..0000000 Binary files a/tikzit-1/tikzitdoc.icns and /dev/null differ diff --git a/tikzit-1/transform-crop-and-resize.png b/tikzit-1/transform-crop-and-resize.png deleted file mode 100644 index 4dedd93..0000000 Binary files a/tikzit-1/transform-crop-and-resize.png and /dev/null differ diff --git a/tikzit-1/transform-move.png b/tikzit-1/transform-move.png deleted file mode 100644 index ae4201b..0000000 Binary files a/tikzit-1/transform-move.png and /dev/null differ diff --git a/tikzit-1/updates.png b/tikzit-1/updates.png deleted file mode 100755 index 469ae30..0000000 Binary files a/tikzit-1/updates.png and /dev/null differ diff --git a/tikzit-old/.gitignore b/tikzit-old/.gitignore new file mode 100644 index 0000000..fc1d580 --- /dev/null +++ b/tikzit-old/.gitignore @@ -0,0 +1,235 @@ +# Previous gitignore items + +*~ +*.swp +*.o +.deps +.dirstamp +Makefile +Makefile.in +/aclocal.m4 +/autom4te.cache +/config.guess +/config.log +/config.status +/config.sub +/configure +/depcomp +/install-sh +/missing +/src/tikzit +/src/tikzit.res +/src/common/tikzlexer.h +/src/common/tikzlexer.m +/src/common/tikzparser.m +/src/common/tikzparser.h +/src/gtk/icondata.m +/src/gtk/logodata.m +/src/gtk/edgedecdata.m +/tikzit-*.tar.gz +/tikzit-*.tar.bz2 +xbuild + +######################### +# .gitignore file for Xcode4 and Xcode5 Source projects +# +# Apple bugs, waiting for Apple to fix/respond: +# +# 15564624 - what does the xccheckout file in Xcode5 do? Where's the documentation? +# +# Version 2.3 +# For latest version, see: http://stackoverflow.com/questions/49478/git-ignore-file-for-xcode-projects +# +# 2014 updates: +# - appended non-standard items DISABLED by default (uncomment if you use those tools) +# - removed the edit that an SO.com moderator made without bothering to ask me +# - researched CocoaPods .lock more carefully, thanks to Gokhan Celiker +# 2013 updates: +# - fixed the broken "save personal Schemes" +# - added line-by-line explanations for EVERYTHING (some were missing) +# +# NB: if you are storing "built" products, this WILL NOT WORK, +# and you should use a different .gitignore (or none at all) +# This file is for SOURCE projects, where there are many extra +# files that we want to exclude +# +######################### + +##### +# OS X temporary files that should never be committed +# +# c.f. http://www.westwind.com/reference/os-x/invisibles.html + +.DS_Store +.Trashes +*.swp + +# +# *.lock - this is used and abused by many editors for many different things. +# For the main ones I use (e.g. Eclipse), it should be excluded +# from source-control, but YMMV. +# (lock files are usually local-only file-synchronization on the local FS that should NOT go in git) +# c.f. the "OPTIONAL" section at bottom though, for tool-specific variations! + +*.lock + + +# +# profile - REMOVED temporarily (on double-checking, I can't find it in OS X docs?) +#profile + + +#### +# Xcode temporary files that should never be committed +# +# NB: NIB/XIB files still exist even on Storyboard projects, so we want this... + +*~.nib + + +#### +# Xcode build files - +# +# NB: slash on the end, so we only remove the FOLDER, not any files that were badly named "DerivedData" + +DerivedData/ + +# NB: slash on the end, so we only remove the FOLDER, not any files that were badly named "build" + +build/ + + +##### +# Xcode private settings (window sizes, bookmarks, breakpoints, custom executables, smart groups) +# +# This is complicated: +# +# SOMETIMES you need to put this file in version control. +# Apple designed it poorly - if you use "custom executables", they are +# saved in this file. +# 99% of projects do NOT use those, so they do NOT want to version control this file. +# ..but if you're in the 1%, comment out the line "*.pbxuser" + +# .pbxuser: http://lists.apple.com/archives/xcode-users/2004/Jan/msg00193.html + +*.pbxuser + +# .mode1v3: http://lists.apple.com/archives/xcode-users/2007/Oct/msg00465.html + +*.mode1v3 + +# .mode2v3: http://lists.apple.com/archives/xcode-users/2007/Oct/msg00465.html + +*.mode2v3 + +# .perspectivev3: http://stackoverflow.com/questions/5223297/xcode-projects-what-is-a-perspectivev3-file + +*.perspectivev3 + +# NB: also, whitelist the default ones, some projects need to use these +!default.pbxuser +!default.mode1v3 +!default.mode2v3 +!default.perspectivev3 + + +#### +# Xcode 4 - semi-personal settings +# +# +# OPTION 1: --------------------------------- +# throw away ALL personal settings (including custom schemes! +# - unless they are "shared") +# +# NB: this is exclusive with OPTION 2 below +xcuserdata + +# OPTION 2: --------------------------------- +# get rid of ALL personal settings, but KEEP SOME OF THEM +# - NB: you must manually uncomment the bits you want to keep +# +# NB: this *requires* git v1.8.2 or above; you may need to upgrade to latest OS X, +# or manually install git over the top of the OS X version +# NB: this is exclusive with OPTION 1 above +# +#xcuserdata/**/* + +# (requires option 2 above): Personal Schemes +# +#!xcuserdata/**/xcschemes/* + +#### +# XCode 4 workspaces - more detailed +# +# Workspaces are important! They are a core feature of Xcode - don't exclude them :) +# +# Workspace layout is quite spammy. For reference: +# +# /(root)/ +# /(project-name).xcodeproj/ +# project.pbxproj +# /project.xcworkspace/ +# contents.xcworkspacedata +# /xcuserdata/ +# /(your name)/xcuserdatad/ +# UserInterfaceState.xcuserstate +# /xcsshareddata/ +# /xcschemes/ +# (shared scheme name).xcscheme +# /xcuserdata/ +# /(your name)/xcuserdatad/ +# (private scheme).xcscheme +# xcschememanagement.plist +# +# + +#### +# Xcode 4 - Deprecated classes +# +# Allegedly, if you manually "deprecate" your classes, they get moved here. +# +# We're using source-control, so this is a "feature" that we do not want! + +*.moved-aside + +#### +# OPTIONAL: Some well-known tools that people use side-by-side with Xcode / iOS development +# +# NB: I'd rather not include these here, but gitignore's design is weak and doesn't allow +# modular gitignore: you have to put EVERYTHING in one file. +# +# COCOAPODS: +# +# c.f. http://guides.cocoapods.org/using/using-cocoapods.html#what-is-a-podfilelock +# c.f. http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control +# +#!Podfile.lock +# +# RUBY: +# +# c.f. http://yehudakatz.com/2010/12/16/clarifying-the-roles-of-the-gemspec-and-gemfile/ +# +#!Gemfile.lock +# +# IDEA: +# +#.idea +# +# TEXTMATE: +# +# -- UNVERIFIED: c.f. http://stackoverflow.com/a/50283/153422 +# +#tm_build_errors + +#### +# UNKNOWN: recommended by others, but I can't discover what these files are +# +# Community suggestions (unverified, no evidence available - DISABLED by default) +# +# 1. Xcode 5 - VCS file +# +# "The data in this file not represent state of your project. +# If you'll leave this file in git - you will have merge conflicts during +# pull your cahnges to other's repo" +# +#*.xccheckout \ No newline at end of file diff --git a/tikzit-old/AH_latex_head.png b/tikzit-old/AH_latex_head.png new file mode 100644 index 0000000..b25cf6d Binary files /dev/null and b/tikzit-old/AH_latex_head.png differ diff --git a/tikzit-old/AH_latex_tail.png b/tikzit-old/AH_latex_tail.png new file mode 100644 index 0000000..0825cda Binary files /dev/null and b/tikzit-old/AH_latex_tail.png differ diff --git a/tikzit-old/AH_none.png b/tikzit-old/AH_none.png new file mode 100644 index 0000000..6322374 Binary files /dev/null and b/tikzit-old/AH_none.png differ diff --git a/tikzit-old/AH_plain_head.png b/tikzit-old/AH_plain_head.png new file mode 100644 index 0000000..8a398fa Binary files /dev/null and b/tikzit-old/AH_plain_head.png differ diff --git a/tikzit-old/AH_plain_tail.png b/tikzit-old/AH_plain_tail.png new file mode 100644 index 0000000..45b1876 Binary files /dev/null and b/tikzit-old/AH_plain_tail.png differ diff --git a/tikzit-old/COPYING b/tikzit-old/COPYING new file mode 100644 index 0000000..1f963da --- /dev/null +++ b/tikzit-old/COPYING @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. + diff --git a/tikzit-old/DESIGN-GTK b/tikzit-old/DESIGN-GTK new file mode 100644 index 0000000..7952a34 --- /dev/null +++ b/tikzit-old/DESIGN-GTK @@ -0,0 +1,23 @@ +Some documentation on how the GTK+ port is designed. + +State classes: + +StyleManager keeps track of what user-defined styles the application +knows about, and which one is currently "active". The active style +is used when creating new nodes. + +Preambles keeps track of the preambles used for previews. + + +GUI classes: + +MainWindow is the core class that manages the application as a whole. +It manages the main GtkWindow and is generally responsible for loading +the various UI elements. It also keeps track of the main application +configuration file, the user-defined styles (via StyleManager) and the +custom preambles (via Preambles). + +The Menu class manages the menu and toolbar for MainWindow. It uses +GtkUiManager to load these from an XML description, and deals with the +GTK+ callbacks for the various actions. + diff --git a/tikzit-old/ED_arrow.png b/tikzit-old/ED_arrow.png new file mode 100644 index 0000000..153d2e1 Binary files /dev/null and b/tikzit-old/ED_arrow.png differ diff --git a/tikzit-old/ED_none.png b/tikzit-old/ED_none.png new file mode 100644 index 0000000..f95140c Binary files /dev/null and b/tikzit-old/ED_none.png differ diff --git a/tikzit-old/ED_tick.png b/tikzit-old/ED_tick.png new file mode 100644 index 0000000..a3882fe Binary files /dev/null and b/tikzit-old/ED_tick.png differ diff --git a/tikzit-old/English.lproj/Credits.rtf b/tikzit-old/English.lproj/Credits.rtf new file mode 100644 index 0000000..708d138 --- /dev/null +++ b/tikzit-old/English.lproj/Credits.rtf @@ -0,0 +1,18 @@ +{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf250 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fnil\fcharset0 LucidaSans-Typewriter;} +{\colortbl;\red255\green255\blue255;\red0\green0\blue0;} +\vieww9000\viewh8400\viewkind0 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural + +\f0\b\fs24 \cf0 TikZiT\ +\ +Copyright 2010 Aleks Kissinger. All rights reserved.\ + +\b0 \ +\pard\tx560\pardeftab560\ql\qnatural\pardirnatural + +\f1\fs22 \cf2 \CocoaLigature0 TikZiT is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\ +\ +TikZiT is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\ +\ +You should have received a copy of the GNU General Public License along with TikZiT. If not, see .} \ No newline at end of file diff --git a/tikzit-old/English.lproj/CustomNodes.xib b/tikzit-old/English.lproj/CustomNodes.xib new file mode 100644 index 0000000..33f6e3a --- /dev/null +++ b/tikzit-old/English.lproj/CustomNodes.xib @@ -0,0 +1,256 @@ + + + + + + + + + + + + + + + + + + + + name + strokeThickness + strokeColor + fillColor + strokeColorIsKnown + fillColorIsKnown + representedObject.name + shapeName + scale + @distinctUnionOfObjects.category + category + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \begin{tikzpicture} + +\end{tikzpicture} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tikzit-old/English.lproj/InfoPlist.strings b/tikzit-old/English.lproj/InfoPlist.strings new file mode 100644 index 0000000..477b28f --- /dev/null +++ b/tikzit-old/English.lproj/InfoPlist.strings @@ -0,0 +1,2 @@ +/* Localized versions of Info.plist keys */ + diff --git a/tikzit-old/English.lproj/MainMenu.xib b/tikzit-old/English.lproj/MainMenu.xib new file mode 100644 index 0000000..c7f22d7 --- /dev/null +++ b/tikzit-old/English.lproj/MainMenu.xib @@ -0,0 +1,453 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +CA + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tikzit-old/English.lproj/Preamble.xib b/tikzit-old/English.lproj/Preamble.xib new file mode 100644 index 0000000..54a4125 --- /dev/null +++ b/tikzit-old/English.lproj/Preamble.xib @@ -0,0 +1,235 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + key + + + default + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tikzit-old/English.lproj/Preview.xib b/tikzit-old/English.lproj/Preview.xib new file mode 100644 index 0000000..cb1e82c --- /dev/null +++ b/tikzit-old/English.lproj/Preview.xib @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tikzit-old/English.lproj/PropertyInspector.xib b/tikzit-old/English.lproj/PropertyInspector.xib new file mode 100644 index 0000000..9f19b5c --- /dev/null +++ b/tikzit-old/English.lproj/PropertyInspector.xib @@ -0,0 +1,769 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Multiple Values + NilToEmptyStringTransformer + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NilToEmptyStringTransformer + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NilToEmptyStringTransformer + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NilToEmptyStringTransformer + + + + + + + + + + + + + + + + + + + + + + + NSNegateBoolean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NilToEmptyStringTransformer + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + key + value + isAtom + + + + + key + value + isAtom + + + + + key + value + isAtom + + + + + key + value + isAtom + + + + + label + + + + + + + + edgeNode + + + + + + + + + + + + + + + + + + + + + + + + + + + NilToEmptyStringTransformer + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tikzit-old/English.lproj/StylePalette.xib b/tikzit-old/English.lproj/StylePalette.xib new file mode 100644 index 0000000..6385ba8 --- /dev/null +++ b/tikzit-old/English.lproj/StylePalette.xib @@ -0,0 +1,631 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + uncategorized + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + uncategorized + + + + + + + + + name + strokeThickness + strokeColor + fillColor + strokeColorIsKnown + fillColorIsKnown + representedObject.name + shapeName + scale + @distinctUnionOfObjects.category + category + + + + + + + + @distinctUnionOfObjects.category + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + uncategorized + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + uncategorized + + + + + + + + + + + name + headStyle + tailStyle + decorationStyle + category + + + + + + + + name + headStyle + tailStyle + decorationStyle + category + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tikzit-old/English.lproj/TikzDocument.xib b/tikzit-old/English.lproj/TikzDocument.xib new file mode 100644 index 0000000..842b810 --- /dev/null +++ b/tikzit-old/English.lproj/TikzDocument.xib @@ -0,0 +1,161 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \begin{tikzpicture} + +\end{tikzpicture} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tikzit-old/English.lproj/UserDefaults.plist b/tikzit-old/English.lproj/UserDefaults.plist new file mode 100644 index 0000000..cdd5c8f --- /dev/null +++ b/tikzit-old/English.lproj/UserDefaults.plist @@ -0,0 +1,10 @@ + + + + + net.sourceforge.tikzit.pdflatexpath + /usr/texbin/pdflatex + net.sourceforge.tikzit.previewfocus + + + diff --git a/tikzit-old/Frameworks/SFBInspectors.framework/Headers b/tikzit-old/Frameworks/SFBInspectors.framework/Headers new file mode 120000 index 0000000..a177d2a --- /dev/null +++ b/tikzit-old/Frameworks/SFBInspectors.framework/Headers @@ -0,0 +1 @@ +Versions/Current/Headers \ No newline at end of file diff --git a/tikzit-old/Frameworks/SFBInspectors.framework/Resources b/tikzit-old/Frameworks/SFBInspectors.framework/Resources new file mode 120000 index 0000000..953ee36 --- /dev/null +++ b/tikzit-old/Frameworks/SFBInspectors.framework/Resources @@ -0,0 +1 @@ +Versions/Current/Resources \ No newline at end of file diff --git a/tikzit-old/Frameworks/SFBInspectors.framework/SFBInspectors b/tikzit-old/Frameworks/SFBInspectors.framework/SFBInspectors new file mode 120000 index 0000000..d0c5a0b --- /dev/null +++ b/tikzit-old/Frameworks/SFBInspectors.framework/SFBInspectors @@ -0,0 +1 @@ +Versions/Current/SFBInspectors \ No newline at end of file diff --git a/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPane.h b/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPane.h new file mode 100644 index 0000000..b50c12d --- /dev/null +++ b/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPane.h @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2009 Stephen F. Booth + * All Rights Reserved + */ + +#import + +#define INSPECTOR_PANE_HEADER_HEIGHT 17 + +@class SFBInspectorPaneHeader, SFBInspectorPaneBody; + +@interface SFBInspectorPane : NSView +{ +@private + BOOL _collapsed; + SFBInspectorPaneHeader *_headerView; + SFBInspectorPaneBody *_bodyView; +} + +@property (readonly, assign, getter=isCollapsed) BOOL collapsed; + +- (NSString *) title; +- (void) setTitle:(NSString *)title; + +- (IBAction) toggleCollapsed:(id)sender; +- (void) setCollapsed:(BOOL)collapsed animate:(BOOL)animate; + +- (SFBInspectorPaneHeader *) headerView; +- (SFBInspectorPaneBody *) bodyView; + +@end diff --git a/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPaneBody.h b/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPaneBody.h new file mode 100644 index 0000000..250f9e6 --- /dev/null +++ b/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPaneBody.h @@ -0,0 +1,16 @@ +/* + * Copyright (C) 2009 Stephen F. Booth + * All Rights Reserved + */ + +#import + +@interface SFBInspectorPaneBody : NSView +{ +@private + CGFloat _normalHeight; +} + +@property (readonly, assign) CGFloat normalHeight; + +@end diff --git a/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPaneHeader.h b/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPaneHeader.h new file mode 100644 index 0000000..3512d75 --- /dev/null +++ b/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPaneHeader.h @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2009 Stephen F. Booth + * All Rights Reserved + */ + +#import + +@class SFBInspectorPane; + +@interface SFBInspectorPaneHeader : NSView +{ +@private + BOOL _pressed; + NSButton *_disclosureButton; + NSTextField *_titleTextField; +} + +- (NSString *) title; +- (void) setTitle:(NSString *)title; + +- (NSButton *) disclosureButton; +- (NSTextField *) titleTextField; + +@end diff --git a/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorView.h b/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorView.h new file mode 100644 index 0000000..e7f4b53 --- /dev/null +++ b/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorView.h @@ -0,0 +1,17 @@ +/* + * Copyright (C) 2009 Stephen F. Booth + * All Rights Reserved + */ + +#import + +@interface SFBInspectorView : NSView +{ +@private + NSSize _initialWindowSize; +} + +- (void) addInspectorPaneController:(NSViewController *)paneController; +- (void) addInspectorPane:(NSView *)paneBody title:(NSString *)title; + +@end diff --git a/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelector.h b/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelector.h new file mode 100644 index 0000000..8645914 --- /dev/null +++ b/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelector.h @@ -0,0 +1,22 @@ +/* + * Copyright (C) 2009 Stephen F. Booth + * All Rights Reserved + */ + +#import + +#define VIEW_SELECTOR_BAR_HEIGHT 25 + +@class SFBViewSelectorBar; + +@interface SFBViewSelector : NSView +{ +@private + NSSize _initialWindowSize; + SFBViewSelectorBar *_selectorBar; + NSView *_bodyView; +} + +- (SFBViewSelectorBar *) selectorBar; + +@end diff --git a/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelectorBar.h b/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelectorBar.h new file mode 100644 index 0000000..d0c8c30 --- /dev/null +++ b/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelectorBar.h @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2009 Stephen F. Booth + * All Rights Reserved + */ + +#import + +@class SFBViewSelectorBarItem; + +@interface SFBViewSelectorBar : NSView +{ +@private + NSInteger _selectedIndex; + NSInteger _pressedIndex; + NSMutableArray *_items; +} + +@property (assign) NSInteger selectedIndex; +@property (readonly) SFBViewSelectorBarItem * selectedItem; + +- (void) addItem:(SFBViewSelectorBarItem *)item; + +- (BOOL) selectItem:(SFBViewSelectorBarItem *)item; +- (BOOL) selectItemWithIdentifer:(NSString *)itemIdentifier; + +- (SFBViewSelectorBarItem *) itemAtIndex:(NSInteger)itemIndex; +- (SFBViewSelectorBarItem *) itemWithIdentifier:(NSString *)itemIdentifier; + +@end diff --git a/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelectorBarItem.h b/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelectorBarItem.h new file mode 100644 index 0000000..c18cfb3 --- /dev/null +++ b/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelectorBarItem.h @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2009 Stephen F. Booth + * All Rights Reserved + */ + +#import + +@interface SFBViewSelectorBarItem : NSObject +{ +@private + NSString *_identifier; + NSString *_label; + NSString *_tooltip; + NSImage *_image; + NSView *_view; +} + +@property (copy) NSString * identifier; +@property (copy) NSString * label; +@property (copy) NSString * tooltip; +@property (copy) NSImage * image; +@property (retain) NSView * view; + ++ (id) itemWithIdentifier:(NSString *)identifier label:(NSString *)label tooltip:(NSString *)tooltip image:(NSImage *)image view:(NSView *)view; + +- (id) initWithIdentifier:(NSString *)identifier label:(NSString *)label tooltip:(NSString *)tooltip image:(NSImage *)image view:(NSView *)view; + +@end diff --git a/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Resources/English.lproj/InfoPlist.strings b/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Resources/English.lproj/InfoPlist.strings new file mode 100644 index 0000000..dea12de Binary files /dev/null and b/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Resources/English.lproj/InfoPlist.strings differ diff --git a/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Resources/Info.plist b/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Resources/Info.plist new file mode 100644 index 0000000..d3e80f3 --- /dev/null +++ b/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Resources/Info.plist @@ -0,0 +1,24 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + SFBInspectors + CFBundleIdentifier + org.sbooth.Inspectors + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + SFBInspectors + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1 + + diff --git a/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/SFBInspectors b/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/SFBInspectors new file mode 100755 index 0000000..6174fbb Binary files /dev/null and b/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/SFBInspectors differ diff --git a/tikzit-old/Frameworks/SFBInspectors.framework/Versions/Current b/tikzit-old/Frameworks/SFBInspectors.framework/Versions/Current new file mode 120000 index 0000000..8c7e5a6 --- /dev/null +++ b/tikzit-old/Frameworks/SFBInspectors.framework/Versions/Current @@ -0,0 +1 @@ +A \ No newline at end of file diff --git a/tikzit-old/Frameworks/Sparkle.framework/Headers b/tikzit-old/Frameworks/Sparkle.framework/Headers new file mode 120000 index 0000000..a177d2a --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Headers @@ -0,0 +1 @@ +Versions/Current/Headers \ No newline at end of file diff --git a/tikzit-old/Frameworks/Sparkle.framework/Resources b/tikzit-old/Frameworks/Sparkle.framework/Resources new file mode 120000 index 0000000..953ee36 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Resources @@ -0,0 +1 @@ +Versions/Current/Resources \ No newline at end of file diff --git a/tikzit-old/Frameworks/Sparkle.framework/Sparkle b/tikzit-old/Frameworks/Sparkle.framework/Sparkle new file mode 120000 index 0000000..b2c5273 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Sparkle @@ -0,0 +1 @@ +Versions/Current/Sparkle \ No newline at end of file diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcast.h b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcast.h new file mode 100644 index 0000000..171148a --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcast.h @@ -0,0 +1,33 @@ +// +// SUAppcast.h +// Sparkle +// +// Created by Andy Matuschak on 3/12/06. +// Copyright 2006 Andy Matuschak. All rights reserved. +// + +#ifndef SUAPPCAST_H +#define SUAPPCAST_H + +@class SUAppcastItem; +@interface SUAppcast : NSObject { + NSArray *items; + NSString *userAgentString; + id delegate; + NSMutableData *incrementalData; +} + +- (void)fetchAppcastFromURL:(NSURL *)url; +- (void)setDelegate:delegate; +- (void)setUserAgentString:(NSString *)userAgentString; + +- (NSArray *)items; + +@end + +@interface NSObject (SUAppcastDelegate) +- (void)appcastDidFinishLoading:(SUAppcast *)appcast; +- (void)appcast:(SUAppcast *)appcast failedToLoadWithError:(NSError *)error; +@end + +#endif diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h new file mode 100644 index 0000000..7f1ca65 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h @@ -0,0 +1,47 @@ +// +// SUAppcastItem.h +// Sparkle +// +// Created by Andy Matuschak on 3/12/06. +// Copyright 2006 Andy Matuschak. All rights reserved. +// + +#ifndef SUAPPCASTITEM_H +#define SUAPPCASTITEM_H + +@interface SUAppcastItem : NSObject { + NSString *title; + NSDate *date; + NSString *itemDescription; + + NSURL *releaseNotesURL; + + NSString *DSASignature; + NSString *minimumSystemVersion; + + NSURL *fileURL; + NSString *versionString; + NSString *displayVersionString; + + NSDictionary *propertiesDictionary; +} + +// Initializes with data from a dictionary provided by the RSS class. +- initWithDictionary:(NSDictionary *)dict; + +- (NSString *)title; +- (NSString *)versionString; +- (NSString *)displayVersionString; +- (NSDate *)date; +- (NSString *)itemDescription; +- (NSURL *)releaseNotesURL; +- (NSURL *)fileURL; +- (NSString *)DSASignature; +- (NSString *)minimumSystemVersion; + +// Returns the dictionary provided in initWithDictionary; this might be useful later for extensions. +- (NSDictionary *)propertiesDictionary; + +@end + +#endif diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Headers/SUUpdater.h b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Headers/SUUpdater.h new file mode 100644 index 0000000..e78c4d3 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Headers/SUUpdater.h @@ -0,0 +1,118 @@ +// +// SUUpdater.h +// Sparkle +// +// Created by Andy Matuschak on 1/4/06. +// Copyright 2006 Andy Matuschak. All rights reserved. +// + +#ifndef SUUPDATER_H +#define SUUPDATER_H + +#import + +@class SUUpdateDriver, SUAppcastItem, SUHost, SUAppcast; +@interface SUUpdater : NSObject { + NSTimer *checkTimer; + SUUpdateDriver *driver; + + SUHost *host; + IBOutlet id delegate; +} + ++ (SUUpdater *)sharedUpdater; ++ (SUUpdater *)updaterForBundle:(NSBundle *)bundle; +- (NSBundle *)hostBundle; + +- (void)setDelegate:(id)delegate; +- delegate; + +- (void)setAutomaticallyChecksForUpdates:(BOOL)automaticallyChecks; +- (BOOL)automaticallyChecksForUpdates; + +- (void)setUpdateCheckInterval:(NSTimeInterval)interval; +- (NSTimeInterval)updateCheckInterval; + +- (void)setFeedURL:(NSURL *)feedURL; +- (NSURL *)feedURL; + +- (void)setSendsSystemProfile:(BOOL)sendsSystemProfile; +- (BOOL)sendsSystemProfile; + +- (void)setAutomaticallyDownloadsUpdates:(BOOL)automaticallyDownloadsUpdates; +- (BOOL)automaticallyDownloadsUpdates; + +// This IBAction is meant for a main menu item. Hook up any menu item to this action, +// and Sparkle will check for updates and report back its findings verbosely. +- (IBAction)checkForUpdates:sender; + +// This kicks off an update meant to be programmatically initiated. That is, it will display no UI unless it actually finds an update, +// in which case it proceeds as usual. If the fully automated updating is turned on, however, this will invoke that behavior, and if an +// update is found, it will be downloaded and prepped for installation. +- (void)checkForUpdatesInBackground; + +// Date of last update check. Returns null if no check has been performed. +- (NSDate*)lastUpdateCheckDate; + +// This begins a "probing" check for updates which will not actually offer to update to that version. The delegate methods, though, +// (up to updater:didFindValidUpdate: and updaterDidNotFindUpdate:), are called, so you can use that information in your UI. +- (void)checkForUpdateInformation; + +// Call this to appropriately schedule or cancel the update checking timer according to the preferences for time interval and automatic checks. This call does not change the date of the next check, but only the internal NSTimer. +- (void)resetUpdateCycle; + +- (BOOL)updateInProgress; +@end + +@interface NSObject (SUUpdaterDelegateInformalProtocol) +// This method allows you to add extra parameters to the appcast URL, potentially based on whether or not Sparkle will also be sending along the system profile. This method should return an array of dictionaries with keys: "key", "value", "displayKey", "displayValue", the latter two being specifically for display to the user. +- (NSArray *)feedParametersForUpdater:(SUUpdater *)updater sendingSystemProfile:(BOOL)sendingProfile; + +// Use this to override the default behavior for Sparkle prompting the user about automatic update checks. +- (BOOL)updaterShouldPromptForPermissionToCheckForUpdates:(SUUpdater *)bundle; + +// Implement this if you want to do some special handling with the appcast once it finishes loading. +- (void)updater:(SUUpdater *)updater didFinishLoadingAppcast:(SUAppcast *)appcast; + +// If you're using special logic or extensions in your appcast, implement this to use your own logic for finding +// a valid update, if any, in the given appcast. +- (SUAppcastItem *)bestValidUpdateInAppcast:(SUAppcast *)appcast forUpdater:(SUUpdater *)bundle; + +// Sent when a valid update is found by the update driver. +- (void)updater:(SUUpdater *)updater didFindValidUpdate:(SUAppcastItem *)update; + +// Sent when a valid update is not found. +- (void)updaterDidNotFindUpdate:(SUUpdater *)update; + +// Sent immediately before installing the specified update. +- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)update; + +// Return YES to delay the relaunch until you do some processing; invoke the given NSInvocation to continue. +- (BOOL)updater:(SUUpdater *)updater shouldPostponeRelaunchForUpdate:(SUAppcastItem *)update untilInvoking:(NSInvocation *)invocation; + +// Called immediately before relaunching. +- (void)updaterWillRelaunchApplication:(SUUpdater *)updater; + +// This method allows you to provide a custom version comparator. +// If you don't implement this method or return nil, the standard version comparator will be used. +- (id )versionComparatorForUpdater:(SUUpdater *)updater; + +// Returns the path which is used to relaunch the client after the update is installed. By default, the path of the host bundle. +- (NSString *)pathToRelaunchForUpdater:(SUUpdater *)updater; + +@end + +// Define some minimum intervals to avoid DOS-like checking attacks. These are in seconds. +#ifdef DEBUG +#define SU_MIN_CHECK_INTERVAL 60 +#else +#define SU_MIN_CHECK_INTERVAL 60*60 +#endif + +#ifdef DEBUG +#define SU_DEFAULT_CHECK_INTERVAL 60 +#else +#define SU_DEFAULT_CHECK_INTERVAL 60*60*24 +#endif + +#endif diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h new file mode 100644 index 0000000..3d11ae8 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h @@ -0,0 +1,27 @@ +// +// SUVersionComparisonProtocol.h +// Sparkle +// +// Created by Andy Matuschak on 12/21/07. +// Copyright 2007 Andy Matuschak. All rights reserved. +// + +#ifndef SUVERSIONCOMPARISONPROTOCOL_H +#define SUVERSIONCOMPARISONPROTOCOL_H + +/*! + @protocol + @abstract Implement this protocol to provide version comparison facilities for Sparkle. +*/ +@protocol SUVersionComparison + +/*! + @method + @abstract An abstract method to compare two version strings. + @discussion Should return NSOrderedAscending if b > a, NSOrderedDescending if b < a, and NSOrderedSame if they are equivalent. +*/ +- (NSComparisonResult)compareVersion:(NSString *)versionA toVersion:(NSString *)versionB; + +@end + +#endif diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Headers/Sparkle.h b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Headers/Sparkle.h new file mode 100644 index 0000000..08dd577 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Headers/Sparkle.h @@ -0,0 +1,21 @@ +// +// Sparkle.h +// Sparkle +// +// Created by Andy Matuschak on 3/16/06. (Modified by CDHW on 23/12/07) +// Copyright 2006 Andy Matuschak. All rights reserved. +// + +#ifndef SPARKLE_H +#define SPARKLE_H + +// This list should include the shared headers. It doesn't matter if some of them aren't shared (unless +// there are name-space collisions) so we can list all of them to start with: + +#import + +#import +#import +#import + +#endif diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/Info.plist b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/Info.plist new file mode 100644 index 0000000..c7f277d --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/Info.plist @@ -0,0 +1,24 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + Sparkle + CFBundleIdentifier + org.andymatuschak.Sparkle + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + Sparkle + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.5 Beta 6 + CFBundleSignature + ???? + CFBundleVersion + 313 + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/License.txt b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/License.txt new file mode 100644 index 0000000..20466c4 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/License.txt @@ -0,0 +1,7 @@ +Copyright (c) 2006 Andy Matuschak + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/SUModelTranslation.plist b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/SUModelTranslation.plist new file mode 100644 index 0000000..92ef947 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/SUModelTranslation.plist @@ -0,0 +1,174 @@ + + + + + ADP2,1 + Developer Transition Kit + MacBook1,1 + MacBook (Core Duo) + MacBook2,1 + MacBook (Core 2 Duo) + MacBook4,1 + MacBook (Core 2 Duo Feb 2008) + MacBookAir1,1 + MacBook Air (January 2008) + MacBookPro1,1 + MacBook Pro Core Duo (15-inch) + MacBookPro1,2 + MacBook Pro Core Duo (17-inch) + MacBookPro2,1 + MacBook Pro Core 2 Duo (17-inch) + MacBookPro2,2 + MacBook Pro Core 2 Duo (15-inch) + MacBookPro3,1 + MacBook Pro Core 2 Duo (15-inch LED, Core 2 Duo) + MacBookPro3,2 + MacBook Pro Core 2 Duo (17-inch HD, Core 2 Duo) + MacBookPro4,1 + MacBook Pro (Core 2 Duo Feb 2008) + MacPro1,1 + Mac Pro (four-core) + MacPro2,1 + Mac Pro (eight-core) + MacPro3,1 + Mac Pro (January 2008 4- or 8- core "Harpertown") + Macmini1,1 + Mac Mini (Core Solo/Duo) + PowerBook1,1 + PowerBook G3 + PowerBook2,1 + iBook G3 + PowerBook2,2 + iBook G3 (FireWire) + PowerBook2,3 + iBook G3 + PowerBook2,4 + iBook G3 + PowerBook3,1 + PowerBook G3 (FireWire) + PowerBook3,2 + PowerBook G4 + PowerBook3,3 + PowerBook G4 (Gigabit Ethernet) + PowerBook3,4 + PowerBook G4 (DVI) + PowerBook3,5 + PowerBook G4 (1GHz / 867MHz) + PowerBook4,1 + iBook G3 (Dual USB, Late 2001) + PowerBook4,2 + iBook G3 (16MB VRAM) + PowerBook4,3 + iBook G3 Opaque 16MB VRAM, 32MB VRAM, Early 2003) + PowerBook5,1 + PowerBook G4 (17 inch) + PowerBook5,2 + PowerBook G4 (15 inch FW 800) + PowerBook5,3 + PowerBook G4 (17-inch 1.33GHz) + PowerBook5,4 + PowerBook G4 (15 inch 1.5/1.33GHz) + PowerBook5,5 + PowerBook G4 (17-inch 1.5GHz) + PowerBook5,6 + PowerBook G4 (15 inch 1.67GHz/1.5GHz) + PowerBook5,7 + PowerBook G4 (17-inch 1.67GHz) + PowerBook5,8 + PowerBook G4 (Double layer SD, 15 inch) + PowerBook5,9 + PowerBook G4 (Double layer SD, 17 inch) + PowerBook6,1 + PowerBook G4 (12 inch) + PowerBook6,2 + PowerBook G4 (12 inch, DVI) + PowerBook6,3 + iBook G4 + PowerBook6,4 + PowerBook G4 (12 inch 1.33GHz) + PowerBook6,5 + iBook G4 (Early-Late 2004) + PowerBook6,7 + iBook G4 (Mid 2005) + PowerBook6,8 + PowerBook G4 (12 inch 1.5GHz) + PowerMac1,1 + Power Macintosh G3 (Blue & White) + PowerMac1,2 + Power Macintosh G4 (PCI Graphics) + PowerMac10,1 + Mac Mini G4 + PowerMac10,2 + Mac Mini (Late 2005) + PowerMac11,2 + Power Macintosh G5 (Late 2005) + PowerMac12,1 + iMac G5 (iSight) + PowerMac2,1 + iMac G3 (Slot-loading CD-ROM) + PowerMac2,2 + iMac G3 (Summer 2000) + PowerMac3,1 + Power Macintosh G4 (AGP Graphics) + PowerMac3,2 + Power Macintosh G4 (AGP Graphics) + PowerMac3,3 + Power Macintosh G4 (Gigabit Ethernet) + PowerMac3,4 + Power Macintosh G4 (Digital Audio) + PowerMac3,5 + Power Macintosh G4 (Quick Silver) + PowerMac3,6 + Power Macintosh G4 (Mirrored Drive Door) + PowerMac4,1 + iMac G3 (Early/Summer 2001) + PowerMac4,2 + iMac G4 (Flat Panel) + PowerMac4,4 + eMac + PowerMac4,5 + iMac G4 (17-inch Flat Panel) + PowerMac5,1 + Power Macintosh G4 Cube + PowerMac6,1 + iMac G4 (USB 2.0) + PowerMac6,3 + iMac G4 (20-inch Flat Panel) + PowerMac6,4 + eMac (USB 2.0, 2005) + PowerMac7,2 + Power Macintosh G5 + PowerMac7,3 + Power Macintosh G5 + PowerMac8,1 + iMac G5 + PowerMac8,2 + iMac G5 (Ambient Light Sensor) + PowerMac9,1 + Power Macintosh G5 (Late 2005) + RackMac1,1 + Xserve G4 + RackMac1,2 + Xserve G4 (slot-loading, cluster node) + RackMac3,1 + Xserve G5 + Xserve1,1 + Xserve (Intel Xeon) + Xserve2,1 + Xserve (January 2008 quad-core) + iMac1,1 + iMac G3 (Rev A-D) + iMac4,1 + iMac (Core Duo) + iMac4,2 + iMac for Education (17-inch, Core Duo) + iMac5,1 + iMac (Core 2 Duo, 17 or 20 inch, SuperDrive) + iMac5,2 + iMac (Core 2 Duo, 17 inch, Combo Drive) + iMac6,1 + iMac (Core 2 Duo, 24 inch, SuperDrive) + iMac8,1 + iMac (April 2008) + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/classes.nib new file mode 100644 index 0000000..22f13f8 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/classes.nib @@ -0,0 +1,56 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + CLASS + NSApplication + LANGUAGE + ObjC + SUPERCLASS + NSResponder + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + CLASS + SUStatusController + LANGUAGE + ObjC + OUTLETS + + actionButton + NSButton + progressBar + NSProgressIndicator + + SUPERCLASS + SUWindowController + + + IBVersion + 1 + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/info.nib new file mode 100644 index 0000000..a9ac867 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 670 + IBLastKnownRelativeProjectPath + Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 6 + + IBSystem Version + 10A96 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/keyedobjects.nib new file mode 100644 index 0000000..4f1d598 Binary files /dev/null and b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/keyedobjects.nib differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/classes.nib new file mode 100644 index 0000000..4b1ab30 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/classes.nib @@ -0,0 +1,50 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + doNotInstall + id + installLater + id + installNow + id + + CLASS + SUAutomaticUpdateAlert + LANGUAGE + ObjC + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/info.nib new file mode 100644 index 0000000..2e04cfa --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 667 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 6 + + IBSystem Version + 9D34 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 0000000..6b92630 Binary files /dev/null and b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/classes.nib new file mode 100644 index 0000000..994d4c3 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/classes.nib @@ -0,0 +1,67 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + CLASS + NSApplication + LANGUAGE + ObjC + SUPERCLASS + NSResponder + + + ACTIONS + + installUpdate + id + remindMeLater + id + skipThisVersion + id + + CLASS + SUUpdateAlert + LANGUAGE + ObjC + OUTLETS + + delegate + id + description + NSTextField + releaseNotesView + WebView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/info.nib new file mode 100644 index 0000000..2e04cfa --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 667 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 6 + + IBSystem Version + 9D34 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 0000000..b4353d2 Binary files /dev/null and b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/keyedobjects.nib differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/classes.nib new file mode 100644 index 0000000..5220a22 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/classes.nib @@ -0,0 +1,59 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + finishPrompt + id + toggleMoreInfo + id + + CLASS + SUUpdatePermissionPrompt + LANGUAGE + ObjC + OUTLETS + + delegate + id + descriptionTextField + NSTextField + moreInfoButton + NSButton + moreInfoView + NSView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/info.nib new file mode 100644 index 0000000..2e04cfa --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 667 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 6 + + IBSystem Version + 9D34 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib new file mode 100644 index 0000000..b403a3e Binary files /dev/null and b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings new file mode 100644 index 0000000..b31f928 Binary files /dev/null and b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/classes.nib new file mode 100644 index 0000000..4b1ab30 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/classes.nib @@ -0,0 +1,50 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + doNotInstall + id + installLater + id + installNow + id + + CLASS + SUAutomaticUpdateAlert + LANGUAGE + ObjC + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/info.nib new file mode 100644 index 0000000..ab36d31 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 658 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 6 + + IBSystem Version + 9C7010 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 0000000..7630390 Binary files /dev/null and b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/classes.nib new file mode 100644 index 0000000..994d4c3 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/classes.nib @@ -0,0 +1,67 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + CLASS + NSApplication + LANGUAGE + ObjC + SUPERCLASS + NSResponder + + + ACTIONS + + installUpdate + id + remindMeLater + id + skipThisVersion + id + + CLASS + SUUpdateAlert + LANGUAGE + ObjC + OUTLETS + + delegate + id + description + NSTextField + releaseNotesView + WebView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/info.nib new file mode 100644 index 0000000..2fb8a83 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 670 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 18 + + IBSystem Version + 10A96 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 0000000..e7e7497 Binary files /dev/null and b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/keyedobjects.nib differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/classes.nib new file mode 100644 index 0000000..5220a22 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/classes.nib @@ -0,0 +1,59 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + finishPrompt + id + toggleMoreInfo + id + + CLASS + SUUpdatePermissionPrompt + LANGUAGE + ObjC + OUTLETS + + delegate + id + descriptionTextField + NSTextField + moreInfoButton + NSButton + moreInfoView + NSView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/info.nib new file mode 100644 index 0000000..b1cd28e --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/info.nib @@ -0,0 +1,21 @@ + + + + + IBFramework Version + 670 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 6 + 41 + + IBSystem Version + 10A96 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib new file mode 100644 index 0000000..e8dc5b8 Binary files /dev/null and b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/Sparkle.strings b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/Sparkle.strings new file mode 100644 index 0000000..16e0787 Binary files /dev/null and b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/Sparkle.strings differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/classes.nib new file mode 100644 index 0000000..4b1ab30 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/classes.nib @@ -0,0 +1,50 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + doNotInstall + id + installLater + id + installNow + id + + CLASS + SUAutomaticUpdateAlert + LANGUAGE + ObjC + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/info.nib new file mode 100644 index 0000000..2e04cfa --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 667 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 6 + + IBSystem Version + 9D34 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 0000000..6b2f938 Binary files /dev/null and b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/classes.nib new file mode 100644 index 0000000..994d4c3 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/classes.nib @@ -0,0 +1,67 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + CLASS + NSApplication + LANGUAGE + ObjC + SUPERCLASS + NSResponder + + + ACTIONS + + installUpdate + id + remindMeLater + id + skipThisVersion + id + + CLASS + SUUpdateAlert + LANGUAGE + ObjC + OUTLETS + + delegate + id + description + NSTextField + releaseNotesView + WebView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/info.nib new file mode 100644 index 0000000..2e04cfa --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 667 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 6 + + IBSystem Version + 9D34 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 0000000..c9b1e7d Binary files /dev/null and b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/keyedobjects.nib differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/classes.nib new file mode 100644 index 0000000..5220a22 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/classes.nib @@ -0,0 +1,59 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + finishPrompt + id + toggleMoreInfo + id + + CLASS + SUUpdatePermissionPrompt + LANGUAGE + ObjC + OUTLETS + + delegate + id + descriptionTextField + NSTextField + moreInfoButton + NSButton + moreInfoView + NSView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/info.nib new file mode 100644 index 0000000..3eb7f81 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 667 + IBLastKnownRelativeProjectPath + ../../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 6 + + IBSystem Version + 9D34 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib new file mode 100644 index 0000000..8c54c21 Binary files /dev/null and b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/Sparkle.strings b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/Sparkle.strings new file mode 100644 index 0000000..f83ea23 Binary files /dev/null and b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/Sparkle.strings differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/classes.nib new file mode 100644 index 0000000..4b1ab30 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/classes.nib @@ -0,0 +1,50 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + doNotInstall + id + installLater + id + installNow + id + + CLASS + SUAutomaticUpdateAlert + LANGUAGE + ObjC + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/info.nib new file mode 100644 index 0000000..33a6020 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/info.nib @@ -0,0 +1,16 @@ + + + + + IBFramework Version + 629 + IBOldestOS + 5 + IBOpenObjects + + IBSystem Version + 9D34 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 0000000..4cd529a Binary files /dev/null and b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/classes.nib new file mode 100644 index 0000000..994d4c3 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/classes.nib @@ -0,0 +1,67 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + CLASS + NSApplication + LANGUAGE + ObjC + SUPERCLASS + NSResponder + + + ACTIONS + + installUpdate + id + remindMeLater + id + skipThisVersion + id + + CLASS + SUUpdateAlert + LANGUAGE + ObjC + OUTLETS + + delegate + id + description + NSTextField + releaseNotesView + WebView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/info.nib new file mode 100644 index 0000000..d2586ea --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/info.nib @@ -0,0 +1,16 @@ + + + + + IBFramework Version + 629 + IBOldestOS + 5 + IBOpenObjects + + IBSystem Version + 9E17 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 0000000..65dfc95 Binary files /dev/null and b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/keyedobjects.nib differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/classes.nib new file mode 100644 index 0000000..5220a22 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/classes.nib @@ -0,0 +1,59 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + finishPrompt + id + toggleMoreInfo + id + + CLASS + SUUpdatePermissionPrompt + LANGUAGE + ObjC + OUTLETS + + delegate + id + descriptionTextField + NSTextField + moreInfoButton + NSButton + moreInfoView + NSView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/info.nib new file mode 100644 index 0000000..d2586ea --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/info.nib @@ -0,0 +1,16 @@ + + + + + IBFramework Version + 629 + IBOldestOS + 5 + IBOpenObjects + + IBSystem Version + 9E17 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib new file mode 100644 index 0000000..4b7cc90 Binary files /dev/null and b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/Sparkle.strings b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/Sparkle.strings new file mode 100644 index 0000000..ea175ae Binary files /dev/null and b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/Sparkle.strings differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr_CA.lproj b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr_CA.lproj new file mode 120000 index 0000000..61a7d4e --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr_CA.lproj @@ -0,0 +1 @@ +/Users/andym/Development/Build Products/Release (GC dual-mode; 10.5-only)/Sparkle.framework/Resources/fr.lproj \ No newline at end of file diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/classes.nib new file mode 100644 index 0000000..4b1ab30 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/classes.nib @@ -0,0 +1,50 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + doNotInstall + id + installLater + id + installNow + id + + CLASS + SUAutomaticUpdateAlert + LANGUAGE + ObjC + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/info.nib new file mode 100644 index 0000000..2e04cfa --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 667 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 6 + + IBSystem Version + 9D34 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 0000000..15ba8f4 Binary files /dev/null and b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/classes.nib new file mode 100644 index 0000000..994d4c3 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/classes.nib @@ -0,0 +1,67 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + CLASS + NSApplication + LANGUAGE + ObjC + SUPERCLASS + NSResponder + + + ACTIONS + + installUpdate + id + remindMeLater + id + skipThisVersion + id + + CLASS + SUUpdateAlert + LANGUAGE + ObjC + OUTLETS + + delegate + id + description + NSTextField + releaseNotesView + WebView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/info.nib new file mode 100644 index 0000000..2e04cfa --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 667 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 6 + + IBSystem Version + 9D34 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 0000000..2984064 Binary files /dev/null and b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/keyedobjects.nib differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/classes.nib new file mode 100644 index 0000000..5220a22 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/classes.nib @@ -0,0 +1,59 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + finishPrompt + id + toggleMoreInfo + id + + CLASS + SUUpdatePermissionPrompt + LANGUAGE + ObjC + OUTLETS + + delegate + id + descriptionTextField + NSTextField + moreInfoButton + NSButton + moreInfoView + NSView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/info.nib new file mode 100644 index 0000000..c493485 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 667 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 5 + + IBSystem Version + 9D34 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib new file mode 100644 index 0000000..55cc2c2 Binary files /dev/null and b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/Sparkle.strings b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/Sparkle.strings new file mode 100644 index 0000000..5c410d0 Binary files /dev/null and b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/Sparkle.strings differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/classes.nib new file mode 100644 index 0000000..4b1ab30 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/classes.nib @@ -0,0 +1,50 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + doNotInstall + id + installLater + id + installNow + id + + CLASS + SUAutomaticUpdateAlert + LANGUAGE + ObjC + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/info.nib new file mode 100644 index 0000000..3f09790 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/info.nib @@ -0,0 +1,18 @@ + + + + + IBFramework Version + 629 + IBOldestOS + 5 + IBOpenObjects + + 6 + + IBSystem Version + 9D34 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 0000000..aa38f86 Binary files /dev/null and b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/classes.nib new file mode 100644 index 0000000..994d4c3 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/classes.nib @@ -0,0 +1,67 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + CLASS + NSApplication + LANGUAGE + ObjC + SUPERCLASS + NSResponder + + + ACTIONS + + installUpdate + id + remindMeLater + id + skipThisVersion + id + + CLASS + SUUpdateAlert + LANGUAGE + ObjC + OUTLETS + + delegate + id + description + NSTextField + releaseNotesView + WebView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/info.nib new file mode 100644 index 0000000..d2586ea --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/info.nib @@ -0,0 +1,16 @@ + + + + + IBFramework Version + 629 + IBOldestOS + 5 + IBOpenObjects + + IBSystem Version + 9E17 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 0000000..c82d358 Binary files /dev/null and b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/keyedobjects.nib differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/classes.nib new file mode 100644 index 0000000..5220a22 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/classes.nib @@ -0,0 +1,59 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + finishPrompt + id + toggleMoreInfo + id + + CLASS + SUUpdatePermissionPrompt + LANGUAGE + ObjC + OUTLETS + + delegate + id + descriptionTextField + NSTextField + moreInfoButton + NSButton + moreInfoView + NSView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/info.nib new file mode 100644 index 0000000..d2586ea --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/info.nib @@ -0,0 +1,16 @@ + + + + + IBFramework Version + 629 + IBOldestOS + 5 + IBOpenObjects + + IBSystem Version + 9E17 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib new file mode 100644 index 0000000..ac298ce Binary files /dev/null and b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/Sparkle.strings b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/Sparkle.strings new file mode 100644 index 0000000..67cf535 Binary files /dev/null and b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/Sparkle.strings differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/relaunch b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/relaunch new file mode 100755 index 0000000..e7b96d6 Binary files /dev/null and b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/relaunch differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/classes.nib new file mode 100644 index 0000000..4b1ab30 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/classes.nib @@ -0,0 +1,50 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + doNotInstall + id + installLater + id + installNow + id + + CLASS + SUAutomaticUpdateAlert + LANGUAGE + ObjC + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/info.nib new file mode 100644 index 0000000..2b3d425 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 670 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 6 + + IBSystem Version + 9E17 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 0000000..1d4655c Binary files /dev/null and b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/classes.nib new file mode 100644 index 0000000..994d4c3 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/classes.nib @@ -0,0 +1,67 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + CLASS + NSApplication + LANGUAGE + ObjC + SUPERCLASS + NSResponder + + + ACTIONS + + installUpdate + id + remindMeLater + id + skipThisVersion + id + + CLASS + SUUpdateAlert + LANGUAGE + ObjC + OUTLETS + + delegate + id + description + NSTextField + releaseNotesView + WebView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/info.nib new file mode 100644 index 0000000..2b3d425 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 670 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 6 + + IBSystem Version + 9E17 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 0000000..103b1cf Binary files /dev/null and b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/keyedobjects.nib differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/classes.nib new file mode 100644 index 0000000..0f776c8 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/classes.nib @@ -0,0 +1,59 @@ + + + + + IBClasses + + + CLASS + NSObject + LANGUAGE + ObjC + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + finishPrompt + id + toggleMoreInfo + id + + CLASS + SUUpdatePermissionPrompt + LANGUAGE + ObjC + OUTLETS + + delegate + id + descriptionTextField + NSTextField + moreInfoButton + NSButton + moreInfoView + NSView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + IBVersion + 1 + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/info.nib new file mode 100644 index 0000000..5132e29 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/info.nib @@ -0,0 +1,18 @@ + + + + + IBFramework Version + 670 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + IBSystem Version + 9E17 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib new file mode 100644 index 0000000..c09d9e7 Binary files /dev/null and b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings new file mode 100644 index 0000000..f3ff9d8 Binary files /dev/null and b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/classes.nib new file mode 100644 index 0000000..4b1ab30 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/classes.nib @@ -0,0 +1,50 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + doNotInstall + id + installLater + id + installNow + id + + CLASS + SUAutomaticUpdateAlert + LANGUAGE + ObjC + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/info.nib new file mode 100644 index 0000000..c5a067e --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 670 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 6 + + IBSystem Version + 10A96 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 0000000..53cb91a Binary files /dev/null and b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/classes.nib new file mode 100644 index 0000000..018710a --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/classes.nib @@ -0,0 +1,39 @@ +{ + IBClasses = ( + { + CLASS = FirstResponder; + LANGUAGE = ObjC; + SUPERCLASS = NSObject; + }, + { + CLASS = NSApplication; + LANGUAGE = ObjC; + SUPERCLASS = NSResponder; + }, + { + CLASS = NSObject; + LANGUAGE = ObjC; + }, + { + ACTIONS = { + installUpdate = id; + remindMeLater = id; + skipThisVersion = id; + }; + CLASS = SUUpdateAlert; + LANGUAGE = ObjC; + OUTLETS = { + delegate = id; + description = NSTextField; + releaseNotesView = WebView; + }; + SUPERCLASS = SUWindowController; + }, + { + CLASS = SUWindowController; + LANGUAGE = ObjC; + SUPERCLASS = NSWindowController; + } + ); + IBVersion = 1; +} \ No newline at end of file diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/info.nib new file mode 100644 index 0000000..6b787d4 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/info.nib @@ -0,0 +1,18 @@ + + + + + IBDocumentLocation + 69 14 356 240 0 0 1280 778 + IBFramework Version + 489.0 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBSystem Version + 9D34 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/keyedobjects.nib new file mode 100644 index 0000000..7e6d490 Binary files /dev/null and b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/keyedobjects.nib differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/classes.nib new file mode 100644 index 0000000..5220a22 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/classes.nib @@ -0,0 +1,59 @@ + + + + + IBClasses + + + CLASS + SUWindowController + LANGUAGE + ObjC + SUPERCLASS + NSWindowController + + + ACTIONS + + finishPrompt + id + toggleMoreInfo + id + + CLASS + SUUpdatePermissionPrompt + LANGUAGE + ObjC + OUTLETS + + delegate + id + descriptionTextField + NSTextField + moreInfoButton + NSButton + moreInfoView + NSView + + SUPERCLASS + SUWindowController + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/info.nib new file mode 100644 index 0000000..c5a067e --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/info.nib @@ -0,0 +1,20 @@ + + + + + IBFramework Version + 670 + IBLastKnownRelativeProjectPath + ../Sparkle.xcodeproj + IBOldestOS + 5 + IBOpenObjects + + 6 + + IBSystem Version + 10A96 + targetFramework + IBCocoaFramework + + diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib new file mode 100644 index 0000000..64babac Binary files /dev/null and b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/Sparkle.strings b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/Sparkle.strings new file mode 100644 index 0000000..b676a4f Binary files /dev/null and b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/Sparkle.strings differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Sparkle b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Sparkle new file mode 100755 index 0000000..2d9bb2a Binary files /dev/null and b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Sparkle differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/Current b/tikzit-old/Frameworks/Sparkle.framework/Versions/Current new file mode 120000 index 0000000..8c7e5a6 --- /dev/null +++ b/tikzit-old/Frameworks/Sparkle.framework/Versions/Current @@ -0,0 +1 @@ +A \ No newline at end of file diff --git a/tikzit-old/INSTALL b/tikzit-old/INSTALL new file mode 100644 index 0000000..b938f14 --- /dev/null +++ b/tikzit-old/INSTALL @@ -0,0 +1,34 @@ +For building on systems other than MacOS/X: + +Dependencies: + GNUstep (core libraries) >= 1.18.0 + gtk+-2.0 >= 2.18.0 + gdk-pixbuf >= 2.16.0 + poppler >= 0.10 + including glib bindings, which may be in + a separate poppler-glib package + Objective C compiler (eg: gcc with ObjC support) with + support for properties, optional protocols and + fast enumeration (eg: gcc 4.6 or clang). + pkg-config + build-time dependency only + +To install, just run: + + ./configure + make + make install + + + +To build from subversion (and for development) you will additionally need: + flex >= 2.5.34 + bison >= 2.3 + autoconf >= 2.60 + automake >= 1.10 + +and you will need to prepare the source tree by running + ./autogen.sh + + + diff --git a/tikzit-old/Makefile.am b/tikzit-old/Makefile.am new file mode 100644 index 0000000..d9793a4 --- /dev/null +++ b/tikzit-old/Makefile.am @@ -0,0 +1,3 @@ +SUBDIRS = src share +appdir = $(datarootdir)/tikzit +nobase_dist_app_DATA = shapes/*.tikz diff --git a/tikzit-old/NEWS b/tikzit-old/NEWS new file mode 100644 index 0000000..827abe7 --- /dev/null +++ b/tikzit-old/NEWS @@ -0,0 +1,75 @@ +tikzit 1.1 (2015-07-22) : + * Fix bug where copy-and-paste would lose edge anchors + * Allow tikzit-specific preview code to be omitted from preambles + * Holding down CTRL allows you to drag the graph + * Fix parsing bug where property lists would be reversed + * Better error messages when files can't be opened + +tikzit 1.0 (2013-05-07): + * GIMP-like user interface (multiple documents, separate toolboxes) + * Preferences now called Configuration, and includes node and edge styles + * Error-highlighting in the code pane + * Single-key-shortcuts for tool selection, and to update the preview + * Edge anchor support + * Option for drag-select to select nodes, edges or both + * Memory leak fixes + * Should now be impossible to use the UI to create a graph that cannot be parsed + +tikzit 0.9 (2012-08-24): + * Compilers without basic Objective C 2 support cannot be + used to compile TikZiT any more + * Add support for scale to node styles + * Add support for editing edge styles + * Add support for multiple custom preambles + * The path to pdflatex is now configurable + * Make everything look a bit better + * Edges now start from the edge of a node, not the centre, + which is what tikz does + * Edges can now have arrow heads and arrow tails + * Nodes and edges have consistent ordering, and this can be + changed with Edge->Arrange + * Edges now have colours + * Edges can now be reversed easily + * Fix various crashes + +tikzit 0.7 (2011-12-06): + * Add bounding box support + * Add support for different node shapes + * Improved error reporting + * Add scrolling support (CTRL+mouse wheel) + * Add a pan tool to move around the graph + * Add edge and graph property palettes + +tikzit 0.6 (2011-02-08): + * Fix the displaying of colours in the styles editor + * Cut, copy and paste support + * More useful buttons on the toolbar + * Improve how previewing works + * Allow custom preambles for preview generation + +tikzit 0.5 (2010-12-01): + * Hide font size commands (\small etc) in node labels + * Always output the "style" node property first + * Provide a list of recent files + * Remember the folder for Open and Save As dialogs + * Remember window dimensions + * Remember the styles list + * Add a "Node properties" pane + * Bring the separate windows into the main application window + * Improve graphics rendering / remove flicker + * Shorten the window title to something useful + +tikzit 0.4 (2010-09-19): + * Support for bounding boxes, variable-precision tikz output + * Fixed stroke width display + * Updated tikz output to handle separate edge/node layers + * Using [Graph tikz] for tikz output, attaching style after parse + * All platforms now use the same lex-based parser + * Added a menu item for showing node styles if closed + * Pre-amble support + * Added test suite + * Added preview and node labels to GTK version + +tikzit 0.3b (2010-05-11): + * Various build-system fixes on Linux + diff --git a/tikzit-old/README b/tikzit-old/README new file mode 100644 index 0000000..9b83327 --- /dev/null +++ b/tikzit-old/README @@ -0,0 +1,7 @@ +TikZit is a cross-platform application that allows the creation and modification of TeX diagrams written using the pgf/TikZ macro library. It is especially geared toward rapidly creating "dot"-diagrams for use in academic papers. + +For more info, see http://tikzit.sf.net + +On OS/X, the Cocoa framework is used. + +On other platforms, GTK+ and GNUstep are used. \ No newline at end of file diff --git a/tikzit-old/README.release b/tikzit-old/README.release new file mode 100644 index 0000000..a6f1642 --- /dev/null +++ b/tikzit-old/README.release @@ -0,0 +1,98 @@ +Notes on how to make a release +============================== + +Updating doc files +------------------ + +Put all the user-visible changes since the last release into NEWS. + +Make sure the dependency requirements in INSTALL are correct. + + + +Making the source tarballs +-------------------------- + +The version should be set in configure.ac (in AC_INIT) +and the package should be re-configured +(run ./configure). + +Then run `make dist` to create the source tarball in tar.gz format, and +`make dist-bzip2` to get it in tar.bz2 format. + + + +Uploading the source +-------------------- + +Update /www/sourceforge/README.mkd + +Log into sourceforge.net, go to +https://sourceforge.net/projects/tikzit/files/ + +Create a folder called tikzit-[version]. + +Upload README.mkd. + +Upload the tar.bz2 and tar.gz files. + +Set the tar.bz2 file as default for everything except windows and mac +(click the (i) symbol on the right for that file to do this). + + + +Updating the website +-------------------- + +Edit /www/htdocs/link.php, and update the versions. + +sftp to + [sf-username],tikzit@web.sourceforge.net + +Upload link.php into htdocs. + + + +Updating the packages +--------------------- + +Contact Gard Spreemann about the new version by sending him a message +on Launchpad (https://launchpad.net/~gspreemann). + +Update tikzit.spec (the version, the changelog and the dependencies). + +Test the spec file: +- if you don't have ~/rpmbuild, run rpmdev-setuptree +- copy the tar.bz2 file into ~/rpmbuild/SOURCES +- copy tikzit.spec into ~/rpmbuild/SPECS +- cd into ~/rpmbuild/SPECS +- run `rpmbuild -ba tikzit.spec` +- run `rpmlint ..` and check the warnings (there will be some that are + not important) + +Update the OBS packages: +- https://build.opensuse.org/package/show?package=tikzit&project=home%3Arandomguy3 +- Upload the tar.bz2 file and the tikzit.spec file. +- Wait for the build to finish + +Update the AUR package: +- http://aur.archlinux.org/packages.php?ID=37119 + + +TODO: find out how the Debian build system works + + +Publishing an OSX Update +----------------------------------------- +In OSX, the steps to publish an update are as follows. Firstly all updates are signed, so you need the private key 'tikzit_dsa_priv.pem' in the root of your working directory. This is not in the repository (for obvious reasons), so ask Aleks for a copy. Also, make sure you have ruby in your $PATH to do the actual signing. + +1. Update the SVN and note the revision number +2. In TikZiT-Info.plist, set the Bundle Version key to (MAJOR).(MINOR).(SVN REVISION + 1) +3. In the TikZiT working directory, run scripts/prepare_release.sh +4. Copy and paste the XML output into docs/web/appcast/tikzit.xml +5. Update the release notes in docs/web/appcast/rnotes.html +6. Use SFTP to upload the changed files into htdocs/appcast +7. Commit the SVN + + + diff --git a/tikzit-old/TODO b/tikzit-old/TODO new file mode 100644 index 0000000..ca1a1b9 --- /dev/null +++ b/tikzit-old/TODO @@ -0,0 +1,15 @@ +GTK port: + - Use GooCanvas for the graph display + + +OSX port: + - node properties toolbox + - support for more than one custom preamble + + +General: + - push more code up into common (make use of RenderContext) + - vi-like mode lines in tikz files + - use mode lines for preamble knowledge + - per-document preamble selection? + diff --git a/tikzit-old/TikZiT-Info.plist b/tikzit-old/TikZiT-Info.plist new file mode 100644 index 0000000..a495c5b --- /dev/null +++ b/tikzit-old/TikZiT-Info.plist @@ -0,0 +1,61 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleDocumentTypes + + + CFBundleTypeExtensions + + tikz + + CFBundleTypeIconFile + tikzitdoc.icns + CFBundleTypeMIMETypes + + text/plain + + CFBundleTypeName + DocumentType + CFBundleTypeOSTypes + + ???? + + CFBundleTypeRole + Editor + NSDocumentClass + TikzDocument + + + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIconFile + tikzit.icns + CFBundleIdentifier + net.sourceforge.tikzit.${PRODUCT_NAME:rfc1034identifier} + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + APPL + CFBundleShortVersionString + 0.8 + CFBundleSignature + ???? + CFBundleVersion + 0.8.398 + LSMinimumSystemVersion + ${MACOSX_DEPLOYMENT_TARGET} + NSMainNibFile + MainMenu + NSPrincipalClass + NSApplication + SUFeedURL + http://tikzit.sourceforge.net/appcast/tikzit.xml + SUPublicDSAKeyFile + tikzit_dsa_pub.pem + + diff --git a/tikzit-old/TikZiT.xcodeproj/project.pbxproj b/tikzit-old/TikZiT.xcodeproj/project.pbxproj new file mode 100644 index 0000000..04a7f3f --- /dev/null +++ b/tikzit-old/TikZiT.xcodeproj/project.pbxproj @@ -0,0 +1,1322 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + 1DDD582C0DA1D0D100B32029 /* TikzDocument.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD58280DA1D0D100B32029 /* TikzDocument.xib */; }; + 1DDD582D0DA1D0D100B32029 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD582A0DA1D0D100B32029 /* MainMenu.xib */; }; + 5504C82E11D23595002A1478 /* common.m in Sources */ = {isa = PBXBuildFile; fileRef = 5504C82A11D23595002A1478 /* common.m */; }; + 5504C82F11D23595002A1478 /* parser.m in Sources */ = {isa = PBXBuildFile; fileRef = 5504C82B11D23595002A1478 /* parser.m */; }; + 5504C83011D23595002A1478 /* test.m in Sources */ = {isa = PBXBuildFile; fileRef = 5504C82D11D23595002A1478 /* test.m */; }; + 5504C83211D23685002A1478 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 5504C83111D23685002A1478 /* main.m */; }; + 5504C84F11D23945002A1478 /* ColorRGB.m in Sources */ = {isa = PBXBuildFile; fileRef = 559EFB6711CB88E300D020F4 /* ColorRGB.m */; }; + 5504C93F11D39422002A1478 /* osx.m in Sources */ = {isa = PBXBuildFile; fileRef = 5504C93E11D39422002A1478 /* osx.m */; }; + 552202C4135F15FD007EA086 /* MultiField.m in Sources */ = {isa = PBXBuildFile; fileRef = 552202C3135F15FD007EA086 /* MultiField.m */; }; + 552202C5135F15FD007EA086 /* MultiField.m in Sources */ = {isa = PBXBuildFile; fileRef = 552202C3135F15FD007EA086 /* MultiField.m */; }; + 55391AF613D324FE007DBE71 /* Preview.xib in Resources */ = {isa = PBXBuildFile; fileRef = 55391AF513D324FE007DBE71 /* Preview.xib */; }; + 55391AF813D3250F007DBE71 /* Preamble.xib in Resources */ = {isa = PBXBuildFile; fileRef = 55391AF713D3250F007DBE71 /* Preamble.xib */; }; + 55391B0213D32608007DBE71 /* PropertyInspector.xib in Resources */ = {isa = PBXBuildFile; fileRef = 55391B0013D32608007DBE71 /* PropertyInspector.xib */; }; + 55391B0A13D32765007DBE71 /* PropertyInspectorController.m in Sources */ = {isa = PBXBuildFile; fileRef = 55391B0913D32765007DBE71 /* PropertyInspectorController.m */; }; + 55397C7914498C22006942FB /* EdgeStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 55397C7814498C22006942FB /* EdgeStyle.m */; }; + 55397C7C144990EA006942FB /* EdgeStyle+Coder.m in Sources */ = {isa = PBXBuildFile; fileRef = 55397C7B144990EA006942FB /* EdgeStyle+Coder.m */; }; + 55397C7F144999C4006942FB /* PropertyHolder.m in Sources */ = {isa = PBXBuildFile; fileRef = 55397C7E144999C4006942FB /* PropertyHolder.m */; }; + 55397C811449A877006942FB /* ED_arrow.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C801449A877006942FB /* ED_arrow.png */; }; + 55397C831449A8F1006942FB /* ED_tick.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C821449A8F1006942FB /* ED_tick.png */; }; + 55397C851449A9BF006942FB /* ED_none.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C841449A9BF006942FB /* ED_none.png */; }; + 55397C8A1449AB91006942FB /* AH_none.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C871449AB91006942FB /* AH_none.png */; }; + 55397C8B1449AB91006942FB /* AH_plain_tail.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C881449AB91006942FB /* AH_plain_tail.png */; }; + 55397C8D1449ABFC006942FB /* AH_latex_tail.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C8C1449ABFC006942FB /* AH_latex_tail.png */; }; + 55397C901449AC7C006942FB /* AH_latex_head.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C8E1449AC7C006942FB /* AH_latex_head.png */; }; + 55397C911449AC7C006942FB /* AH_plain_head.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C8F1449AC7C006942FB /* AH_plain_head.png */; }; + 553A4C5A144ED3D500AA6FAC /* NilToEmptyStringTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 553A4C59144ED3D500AA6FAC /* NilToEmptyStringTransformer.m */; }; + 55432E061444BF2D00401BB3 /* GraphElementProperty.m in Sources */ = {isa = PBXBuildFile; fileRef = 55432E051444BF2D00401BB3 /* GraphElementProperty.m */; }; + 55598E351635372E0023450A /* DiamondShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55598E341635372E0023450A /* DiamondShape.m */; }; + 555B30F911D8BE3300CAECF5 /* emblem-important.png in Resources */ = {isa = PBXBuildFile; fileRef = 555B30F811D8BE3300CAECF5 /* emblem-important.png */; }; + 555B313511D8C6DA00CAECF5 /* color.m in Sources */ = {isa = PBXBuildFile; fileRef = 555B313411D8C6DA00CAECF5 /* color.m */; }; + 555ECE9B1378A3AA0052DB71 /* CALayer+DrawLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 555ECE9A1378A3AA0052DB71 /* CALayer+DrawLabel.m */; }; + 55652DF913E1F2030023F4C6 /* SupportDir.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652DF813E1F2030023F4C6 /* SupportDir.m */; }; + 55652E3B13E1FAEE0023F4C6 /* CircleShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3413E1FAED0023F4C6 /* CircleShape.m */; }; + 55652E3C13E1FAEE0023F4C6 /* RectangleShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3613E1FAED0023F4C6 /* RectangleShape.m */; }; + 55652E3D13E1FAEE0023F4C6 /* RegularPolyShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3813E1FAED0023F4C6 /* RegularPolyShape.m */; }; + 55652E3E13E1FAEE0023F4C6 /* TikzShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3A13E1FAEE0023F4C6 /* TikzShape.m */; }; + 55652E4113E1FB0A0023F4C6 /* Shape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E4013E1FB0A0023F4C6 /* Shape.m */; }; + 55652E5613E1FC660023F4C6 /* cap.tikz in Copy Shapes */ = {isa = PBXBuildFile; fileRef = 55652E5113E1FC660023F4C6 /* cap.tikz */; }; + 55652E5713E1FC660023F4C6 /* copants.tikz in Copy Shapes */ = {isa = PBXBuildFile; fileRef = 55652E5213E1FC660023F4C6 /* copants.tikz */; }; + 55652E5813E1FC660023F4C6 /* cup.tikz in Copy Shapes */ = {isa = PBXBuildFile; fileRef = 55652E5313E1FC660023F4C6 /* cup.tikz */; }; + 55652E5913E1FC660023F4C6 /* oval.tikz in Copy Shapes */ = {isa = PBXBuildFile; fileRef = 55652E5413E1FC660023F4C6 /* oval.tikz */; }; + 55652E5A13E1FC660023F4C6 /* pants.tikz in Copy Shapes */ = {isa = PBXBuildFile; fileRef = 55652E5513E1FC660023F4C6 /* pants.tikz */; }; + 556979431168747B007E5703 /* StylePalette.xib in Resources */ = {isa = PBXBuildFile; fileRef = 556979421168747B007E5703 /* StylePalette.xib */; }; + 5573B8BA11D9FC8D00B5DC5D /* Quartz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5573B8B911D9FC8D00B5DC5D /* Quartz.framework */; }; + 5573B8C211D9FD3200B5DC5D /* PreviewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5573B8C111D9FD3200B5DC5D /* PreviewController.m */; }; + 5573B90F11DA231A00B5DC5D /* PreambleController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5573B90E11DA231A00B5DC5D /* PreambleController.m */; }; + 5573B92111DA259C00B5DC5D /* text-x-generic.png in Resources */ = {isa = PBXBuildFile; fileRef = 5573B92011DA259C00B5DC5D /* text-x-generic.png */; }; + 5573B92511DA273400B5DC5D /* format-indent-less.png in Resources */ = {isa = PBXBuildFile; fileRef = 5573B92411DA273400B5DC5D /* format-indent-less.png */; }; + 5573B92911DA292F00B5DC5D /* Preambles.m in Sources */ = {isa = PBXBuildFile; fileRef = 5573B92811DA292F00B5DC5D /* Preambles.m */; }; + 5573B98811DA377C00B5DC5D /* text-x-script.png in Resources */ = {isa = PBXBuildFile; fileRef = 5573B98711DA377C00B5DC5D /* text-x-script.png */; }; + 5573BDCB11DB4D2600B5DC5D /* Preambles+Coder.m in Sources */ = {isa = PBXBuildFile; fileRef = 5573BDCA11DB4D2600B5DC5D /* Preambles+Coder.m */; }; + 5585E5C2117F681800124513 /* NodeStyle+Coder.m in Sources */ = {isa = PBXBuildFile; fileRef = 5585E5C1117F681800124513 /* NodeStyle+Coder.m */; }; + 5589A9FF11C51E780064D310 /* TikzGraphAssembler.m in Sources */ = {isa = PBXBuildFile; fileRef = 5589A9FE11C51E780064D310 /* TikzGraphAssembler.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 5589AA6C11C542D30064D310 /* TikzGraphAssembler.m in Sources */ = {isa = PBXBuildFile; fileRef = 5589A9FE11C51E780064D310 /* TikzGraphAssembler.m */; }; + 5589AA6D11C542D30064D310 /* tikzlexer.lm in Sources */ = {isa = PBXBuildFile; fileRef = 5589A9AA11C500060064D310 /* tikzlexer.lm */; }; + 5589AA6E11C542D30064D310 /* tikzparser.ym in Sources */ = {isa = PBXBuildFile; fileRef = 5589A9AB11C500060064D310 /* tikzparser.ym */; }; + 5589AA7211C542E60064D310 /* Edge.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18BA117B031C009863B2 /* Edge.m */; }; + 5589AA7611C542E60064D310 /* Graph.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18BC117B031C009863B2 /* Graph.m */; }; + 5589AA7811C542E60064D310 /* GraphChange.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18BE117B031C009863B2 /* GraphChange.m */; }; + 5589AA7A11C542E60064D310 /* GraphElementData.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C0117B031C009863B2 /* GraphElementData.m */; }; + 5589AA7C11C542E60064D310 /* Node.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C2117B031C009863B2 /* Node.m */; }; + 5589AA8011C542E60064D310 /* NodeStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C4117B031C009863B2 /* NodeStyle.m */; }; + 5589AA8511C543500064D310 /* util.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18CD117B03DD009863B2 /* util.m */; }; + 5589AD4411C633EE0064D310 /* SelectBoxLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 5589AD4311C633EE0064D310 /* SelectBoxLayer.m */; }; + 558F18C5117B031C009863B2 /* Edge.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18BA117B031C009863B2 /* Edge.m */; }; + 558F18C6117B031C009863B2 /* Graph.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18BC117B031C009863B2 /* Graph.m */; }; + 558F18C7117B031C009863B2 /* GraphChange.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18BE117B031C009863B2 /* GraphChange.m */; }; + 558F18C8117B031C009863B2 /* GraphElementData.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C0117B031C009863B2 /* GraphElementData.m */; }; + 558F18C9117B031C009863B2 /* Node.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C2117B031C009863B2 /* Node.m */; }; + 558F18CA117B031C009863B2 /* NodeStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C4117B031C009863B2 /* NodeStyle.m */; }; + 558F18CE117B03DD009863B2 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18CB117B03DD009863B2 /* main.m */; }; + 558F18CF117B03DD009863B2 /* util.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18CD117B03DD009863B2 /* util.m */; }; + 558F18F7117B043C009863B2 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18DA117B043B009863B2 /* AppDelegate.m */; }; + 558F18F9117B043C009863B2 /* EdgeControlLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18DE117B043B009863B2 /* EdgeControlLayer.m */; }; + 558F18FA117B043C009863B2 /* GraphicsView.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18E0117B043B009863B2 /* GraphicsView.m */; }; + 558F18FB117B043C009863B2 /* Grid.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18E2117B043B009863B2 /* Grid.m */; }; + 558F18FC117B043C009863B2 /* NodeLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18E4117B043B009863B2 /* NodeLayer.m */; }; + 558F18FD117B043C009863B2 /* NodeSelectionLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18E6117B043B009863B2 /* NodeSelectionLayer.m */; }; + 558F18FF117B043C009863B2 /* SelectableCollectionViewItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18EA117B043B009863B2 /* SelectableCollectionViewItem.m */; }; + 558F1900117B043C009863B2 /* SelectableNodeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18EC117B043B009863B2 /* SelectableNodeView.m */; }; + 558F1901117B043C009863B2 /* StylePaletteController.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18EE117B043B009863B2 /* StylePaletteController.m */; }; + 558F1902117B043C009863B2 /* TikzDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18F0117B043B009863B2 /* TikzDocument.m */; }; + 558F1903117B043C009863B2 /* TikzSourceController.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18F2117B043B009863B2 /* TikzSourceController.m */; }; + 558F1904117B043C009863B2 /* ToolPaletteController.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18F4117B043B009863B2 /* ToolPaletteController.m */; }; + 55900AA1135FA918002DD28E /* MultiCombo.m in Sources */ = {isa = PBXBuildFile; fileRef = 55900AA0135FA918002DD28E /* MultiCombo.m */; }; + 55900AA2135FA918002DD28E /* MultiCombo.m in Sources */ = {isa = PBXBuildFile; fileRef = 55900AA0135FA918002DD28E /* MultiCombo.m */; }; + 55900AE3135FB305002DD28E /* emblem-unreadable-grey.png in Resources */ = {isa = PBXBuildFile; fileRef = 55900AE2135FB305002DD28E /* emblem-unreadable-grey.png */; }; + 559EFA4811C7D49800D020F4 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 559EFA4711C7D49800D020F4 /* Sparkle.framework */; }; + 559EFA4E11C7D4BD00D020F4 /* Sparkle.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 559EFA4711C7D49800D020F4 /* Sparkle.framework */; }; + 559EFA5711C7D95F00D020F4 /* tikzit_dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 559EFA5611C7D95F00D020F4 /* tikzit_dsa_pub.pem */; }; + 559EFB6811CB88E300D020F4 /* ColorRGB.m in Sources */ = {isa = PBXBuildFile; fileRef = 559EFB6711CB88E300D020F4 /* ColorRGB.m */; }; + 55CA98D512EF8FCE008F0368 /* SFBInspectors.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55CA98D412EF8FCE008F0368 /* SFBInspectors.framework */; }; + 55CA98DA12EF9098008F0368 /* SFBInspectors.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 55CA98D412EF8FCE008F0368 /* SFBInspectors.framework */; }; + 55CA98DD12EF910F008F0368 /* SFBInspectors.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55CA98D412EF8FCE008F0368 /* SFBInspectors.framework */; }; + 55CA997212F08281008F0368 /* TikzWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 55CA997112F08281008F0368 /* TikzWindowController.m */; }; + 55CA9AC912F831E5008F0368 /* RColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 55CA9AC812F831E5008F0368 /* RColor.m */; }; + 55CA9ACA12F831E5008F0368 /* RColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 55CA9AC812F831E5008F0368 /* RColor.m */; }; + 55D2E0B21186ED950060B4EC /* Graph+Coder.m in Sources */ = {isa = PBXBuildFile; fileRef = 55D2E0B11186ED950060B4EC /* Graph+Coder.m */; }; + 55D945721165904F0044178C /* tikzitdoc.icns in Resources */ = {isa = PBXBuildFile; fileRef = 55D945701165904F0044178C /* tikzitdoc.icns */; }; + 55D945731165904F0044178C /* tikzit.icns in Resources */ = {isa = PBXBuildFile; fileRef = 55D945711165904F0044178C /* tikzit.icns */; }; + 55D949141165D8870044178C /* draw-ellipse.png in Resources */ = {isa = PBXBuildFile; fileRef = 55D949111165D8870044178C /* draw-ellipse.png */; }; + 55D949151165D8870044178C /* draw-path.png in Resources */ = {isa = PBXBuildFile; fileRef = 55D949121165D8870044178C /* draw-path.png */; }; + 55D949161165D8870044178C /* select-rectangular.png in Resources */ = {isa = PBXBuildFile; fileRef = 55D949131165D8870044178C /* select-rectangular.png */; }; + 55E5E99E1215C8E300256F69 /* transform-crop-and-resize.png in Resources */ = {isa = PBXBuildFile; fileRef = 55E5E99D1215C8E300256F69 /* transform-crop-and-resize.png */; }; + 55F9585C1181B09600F99434 /* PickSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F958591181B09600F99434 /* PickSupport.m */; }; + 55F9585D1181B09600F99434 /* Transformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F9585B1181B09600F99434 /* Transformer.m */; }; + 55F9E04511FF54F000F5659E /* NSString+LatexConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F9E04411FF54F000F5659E /* NSString+LatexConstants.m */; }; + 7F18A321184C577000BC3081 /* UpdatePreferenceController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F18A320184C577000BC3081 /* UpdatePreferenceController.m */; }; + 7F18A323184C599100BC3081 /* UpdatePreferencePanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7F18A322184C599100BC3081 /* UpdatePreferencePanel.xib */; }; + 7F6E2C7D16B007F000BFE20D /* EdgeStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 55397C7814498C22006942FB /* EdgeStyle.m */; }; + 7F6E2C7E16B0080400BFE20D /* GraphElementProperty.m in Sources */ = {isa = PBXBuildFile; fileRef = 55432E051444BF2D00401BB3 /* GraphElementProperty.m */; }; + 7F6E2C7F16B0081D00BFE20D /* PropertyHolder.m in Sources */ = {isa = PBXBuildFile; fileRef = 55397C7E144999C4006942FB /* PropertyHolder.m */; }; + 7F6E2C8016B0083300BFE20D /* Shape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E4013E1FB0A0023F4C6 /* Shape.m */; }; + 7F6E2C8116B0084600BFE20D /* Transformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F9585B1181B09600F99434 /* Transformer.m */; }; + 7F6E2C8216B008B000BFE20D /* DiamondShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55598E341635372E0023450A /* DiamondShape.m */; }; + 7F6E2C8316B008B000BFE20D /* CircleShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3413E1FAED0023F4C6 /* CircleShape.m */; }; + 7F6E2C8416B008B000BFE20D /* RectangleShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3613E1FAED0023F4C6 /* RectangleShape.m */; }; + 7F6E2C8516B008B000BFE20D /* RegularPolyShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3813E1FAED0023F4C6 /* RegularPolyShape.m */; }; + 7F6E2C8616B008B000BFE20D /* TikzShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3A13E1FAEE0023F4C6 /* TikzShape.m */; }; + 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 */; }; + 7F73438A184AC559002897D0 /* DraggablePDFView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F734389184AC559002897D0 /* DraggablePDFView.m */; }; + 7F781C1A16B5DE1400239826 /* ParseErrorView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F781C1916B5DE1400239826 /* ParseErrorView.m */; }; + 7F7B6DED18DE0C9E004F6CA8 /* tikzlexer.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F7B6DEA18DE0C9E004F6CA8 /* tikzlexer.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 7F7B6DEE18DE0C9E004F6CA8 /* tikzparser.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F7B6DEC18DE0C9E004F6CA8 /* tikzparser.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; + 7F7B6DF418DE0D7A004F6CA8 /* CustomNodeCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F7B6DF118DE0D7A004F6CA8 /* CustomNodeCellView.m */; }; + 7F7B6DF518DE0D7A004F6CA8 /* CustomNodeController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F7B6DF318DE0D7A004F6CA8 /* CustomNodeController.m */; }; + 7F90E88616DD29600069EBCD /* NSString+Tikz.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F90E88516DD29600069EBCD /* NSString+Tikz.m */; }; + 7F90E88D16DD47540069EBCD /* PreferenceController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F90E88B16DD47540069EBCD /* PreferenceController.m */; }; + 7F90E88E16DD47540069EBCD /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7F90E88C16DD47540069EBCD /* Preferences.xib */; }; + 7F90E89116DD54440069EBCD /* UserDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 7F90E88F16DD54440069EBCD /* UserDefaults.plist */; }; + 7F93852E184D176E00FAED38 /* updates.png in Resources */ = {isa = PBXBuildFile; fileRef = 7F93852D184D176E00FAED38 /* updates.png */; }; + 7F938530184D178B00FAED38 /* engine.png in Resources */ = {isa = PBXBuildFile; fileRef = 7F93852F184D178B00FAED38 /* engine.png */; }; + 7F938532184D184700FAED38 /* preamble.png in Resources */ = {isa = PBXBuildFile; fileRef = 7F938531184D184700FAED38 /* preamble.png */; }; + 7FB9BFEE16B57C2E00773146 /* TikzFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FB9BFED16B57C2E00773146 /* TikzFormatter.m */; }; + 7FD5D44B18E1CB5300E2A930 /* CustomNodes.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7FD5D44918E1CB5300E2A930 /* CustomNodes.xib */; }; + 7FD5D44D18E1CC0B00E2A930 /* customshape.png in Resources */ = {isa = PBXBuildFile; fileRef = 7FD5D44C18E1CC0B00E2A930 /* customshape.png */; }; + 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 */; }; + 8D15AC340486D014006FF6A4 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A7FEA54F5311CA2CBB /* Cocoa.framework */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 5504C91A11D36CD5002A1478 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 2A37F4A9FDCFA73011CA2CEA /* Project object */; + proxyType = 1; + remoteGlobalIDString = 8D15AC270486D014006FF6A4; + remoteInfo = TikZiT; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 55652E6613E1FD080023F4C6 /* Copy Shapes */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = shapes; + dstSubfolderSpec = 7; + files = ( + 55652E5613E1FC660023F4C6 /* cap.tikz in Copy Shapes */, + 55652E5713E1FC660023F4C6 /* copants.tikz in Copy Shapes */, + 55652E5813E1FC660023F4C6 /* cup.tikz in Copy Shapes */, + 55652E5913E1FC660023F4C6 /* oval.tikz in Copy Shapes */, + 55652E5A13E1FC660023F4C6 /* pants.tikz in Copy Shapes */, + ); + name = "Copy Shapes"; + runOnlyForDeploymentPostprocessing = 0; + }; + 559EFA5511C7D4DD00D020F4 /* Copy Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 55CA98DA12EF9098008F0368 /* SFBInspectors.framework in Copy Frameworks */, + 559EFA4E11C7D4BD00D020F4 /* Sparkle.framework in Copy Frameworks */, + ); + name = "Copy Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; + 7F6E2C8B16B00A9200BFE20D /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 7F6E2C8C16B00ABA00BFE20D /* SFBInspectors.framework in CopyFiles */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 089C1660FE840EACC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; + 1058C7A7FEA54F5311CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; + 13E42FBA07B3F13500E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = ""; }; + 1DDD58290DA1D0D100B32029 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/TikzDocument.xib; sourceTree = ""; }; + 1DDD582B0DA1D0D100B32029 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = ""; }; + 2564AD2C0F5327BB00F57823 /* TikZiT_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TikZiT_Prefix.pch; sourceTree = ""; }; + 2A37F4BAFDCFA73011CA2CEA /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/Credits.rtf; sourceTree = ""; }; + 2A37F4C4FDCFA73011CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; + 2A37F4C5FDCFA73011CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; + 5504C82A11D23595002A1478 /* common.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = common.m; path = src/common/test/common.m; sourceTree = ""; }; + 5504C82B11D23595002A1478 /* parser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = parser.m; path = src/common/test/parser.m; sourceTree = ""; }; + 5504C82C11D23595002A1478 /* test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = test.h; path = src/common/test/test.h; sourceTree = ""; }; + 5504C82D11D23595002A1478 /* test.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = test.m; path = src/common/test/test.m; sourceTree = ""; }; + 5504C83111D23685002A1478 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = src/osx/test/main.m; sourceTree = ""; }; + 5504C83711D237F5002A1478 /* tests */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = tests; sourceTree = BUILT_PRODUCTS_DIR; }; + 5504C93E11D39422002A1478 /* osx.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = osx.m; path = src/osx/test/osx.m; sourceTree = ""; }; + 552202C2135F15FD007EA086 /* MultiField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MultiField.h; path = src/osx/MultiField.h; sourceTree = ""; }; + 552202C3135F15FD007EA086 /* MultiField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MultiField.m; path = src/osx/MultiField.m; sourceTree = ""; }; + 55391B0113D32608007DBE71 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/PropertyInspector.xib; sourceTree = ""; }; + 55391B0813D32765007DBE71 /* PropertyInspectorController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PropertyInspectorController.h; path = src/osx/PropertyInspectorController.h; sourceTree = ""; }; + 55391B0913D32765007DBE71 /* PropertyInspectorController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PropertyInspectorController.m; path = src/osx/PropertyInspectorController.m; sourceTree = ""; }; + 55397C7714498C21006942FB /* EdgeStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EdgeStyle.h; path = src/common/EdgeStyle.h; sourceTree = ""; }; + 55397C7814498C22006942FB /* EdgeStyle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = EdgeStyle.m; path = src/common/EdgeStyle.m; sourceTree = ""; }; + 55397C7A144990EA006942FB /* EdgeStyle+Coder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "EdgeStyle+Coder.h"; path = "src/osx/EdgeStyle+Coder.h"; sourceTree = ""; }; + 55397C7B144990EA006942FB /* EdgeStyle+Coder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "EdgeStyle+Coder.m"; path = "src/osx/EdgeStyle+Coder.m"; sourceTree = ""; }; + 55397C7D144999C4006942FB /* PropertyHolder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PropertyHolder.h; path = src/common/PropertyHolder.h; sourceTree = ""; }; + 55397C7E144999C4006942FB /* PropertyHolder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PropertyHolder.m; path = src/common/PropertyHolder.m; sourceTree = ""; }; + 55397C801449A877006942FB /* ED_arrow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ED_arrow.png; sourceTree = ""; }; + 55397C821449A8F1006942FB /* ED_tick.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ED_tick.png; sourceTree = ""; }; + 55397C841449A9BF006942FB /* ED_none.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ED_none.png; sourceTree = ""; }; + 55397C871449AB91006942FB /* AH_none.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AH_none.png; sourceTree = ""; }; + 55397C881449AB91006942FB /* AH_plain_tail.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AH_plain_tail.png; sourceTree = ""; }; + 55397C8C1449ABFC006942FB /* AH_latex_tail.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AH_latex_tail.png; sourceTree = ""; }; + 55397C8E1449AC7C006942FB /* AH_latex_head.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AH_latex_head.png; sourceTree = ""; }; + 55397C8F1449AC7C006942FB /* AH_plain_head.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AH_plain_head.png; sourceTree = ""; }; + 553A4C58144ED3D500AA6FAC /* NilToEmptyStringTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NilToEmptyStringTransformer.h; path = src/osx/NilToEmptyStringTransformer.h; sourceTree = ""; }; + 553A4C59144ED3D500AA6FAC /* NilToEmptyStringTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NilToEmptyStringTransformer.m; path = src/osx/NilToEmptyStringTransformer.m; sourceTree = ""; }; + 55432E041444BF2D00401BB3 /* GraphElementProperty.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GraphElementProperty.h; path = src/common/GraphElementProperty.h; sourceTree = ""; }; + 55432E051444BF2D00401BB3 /* GraphElementProperty.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GraphElementProperty.m; path = src/common/GraphElementProperty.m; sourceTree = ""; }; + 55598E331635372E0023450A /* DiamondShape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DiamondShape.h; path = src/common/DiamondShape.h; sourceTree = ""; }; + 55598E341635372E0023450A /* DiamondShape.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DiamondShape.m; path = src/common/DiamondShape.m; sourceTree = ""; }; + 555B30F811D8BE3300CAECF5 /* emblem-important.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emblem-important.png"; sourceTree = ""; }; + 555B313411D8C6DA00CAECF5 /* color.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = color.m; path = src/common/test/color.m; sourceTree = ""; }; + 555ECE991378A3AA0052DB71 /* CALayer+DrawLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "CALayer+DrawLabel.h"; path = "src/osx/CALayer+DrawLabel.h"; sourceTree = ""; }; + 555ECE9A1378A3AA0052DB71 /* CALayer+DrawLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "CALayer+DrawLabel.m"; path = "src/osx/CALayer+DrawLabel.m"; sourceTree = ""; }; + 555ECF361379E9F80052DB71 /* ShapeNames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ShapeNames.h; path = src/common/ShapeNames.h; sourceTree = ""; }; + 55652DF713E1F2030023F4C6 /* SupportDir.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SupportDir.h; path = src/common/SupportDir.h; sourceTree = ""; }; + 55652DF813E1F2030023F4C6 /* SupportDir.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SupportDir.m; path = src/common/SupportDir.m; sourceTree = ""; }; + 55652E3313E1FAED0023F4C6 /* CircleShape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CircleShape.h; path = src/common/CircleShape.h; sourceTree = ""; }; + 55652E3413E1FAED0023F4C6 /* CircleShape.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CircleShape.m; path = src/common/CircleShape.m; sourceTree = ""; }; + 55652E3513E1FAED0023F4C6 /* RectangleShape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RectangleShape.h; path = src/common/RectangleShape.h; sourceTree = ""; }; + 55652E3613E1FAED0023F4C6 /* RectangleShape.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RectangleShape.m; path = src/common/RectangleShape.m; sourceTree = ""; }; + 55652E3713E1FAED0023F4C6 /* RegularPolyShape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RegularPolyShape.h; path = src/common/RegularPolyShape.h; sourceTree = ""; }; + 55652E3813E1FAED0023F4C6 /* RegularPolyShape.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RegularPolyShape.m; path = src/common/RegularPolyShape.m; sourceTree = ""; }; + 55652E3913E1FAEE0023F4C6 /* TikzShape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TikzShape.h; path = src/common/TikzShape.h; sourceTree = ""; }; + 55652E3A13E1FAEE0023F4C6 /* TikzShape.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TikzShape.m; path = src/common/TikzShape.m; sourceTree = ""; }; + 55652E3F13E1FB0A0023F4C6 /* Shape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Shape.h; path = src/common/Shape.h; sourceTree = ""; }; + 55652E4013E1FB0A0023F4C6 /* Shape.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Shape.m; path = src/common/Shape.m; sourceTree = ""; }; + 55652E5113E1FC660023F4C6 /* cap.tikz */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cap.tikz; sourceTree = ""; }; + 55652E5213E1FC660023F4C6 /* copants.tikz */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = copants.tikz; sourceTree = ""; }; + 55652E5313E1FC660023F4C6 /* cup.tikz */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cup.tikz; sourceTree = ""; }; + 55652E5413E1FC660023F4C6 /* oval.tikz */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = oval.tikz; sourceTree = ""; }; + 55652E5513E1FC660023F4C6 /* pants.tikz */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = pants.tikz; sourceTree = ""; }; + 5573B8B911D9FC8D00B5DC5D /* Quartz.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quartz.framework; path = System/Library/Frameworks/Quartz.framework; sourceTree = SDKROOT; }; + 5573B8BD11D9FCD400B5DC5D /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Preview.xib; sourceTree = ""; }; + 5573B8C011D9FD3200B5DC5D /* PreviewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PreviewController.h; path = src/osx/PreviewController.h; sourceTree = ""; }; + 5573B8C111D9FD3200B5DC5D /* PreviewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PreviewController.m; path = src/osx/PreviewController.m; sourceTree = ""; }; + 5573B90D11DA231A00B5DC5D /* PreambleController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PreambleController.h; path = src/osx/PreambleController.h; sourceTree = ""; }; + 5573B90E11DA231A00B5DC5D /* PreambleController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PreambleController.m; path = src/osx/PreambleController.m; sourceTree = ""; }; + 5573B91011DA233E00B5DC5D /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Preamble.xib; sourceTree = ""; }; + 5573B92011DA259C00B5DC5D /* text-x-generic.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "text-x-generic.png"; sourceTree = ""; }; + 5573B92411DA273400B5DC5D /* format-indent-less.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "format-indent-less.png"; sourceTree = ""; }; + 5573B92711DA292F00B5DC5D /* Preambles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Preambles.h; path = src/common/Preambles.h; sourceTree = ""; }; + 5573B92811DA292F00B5DC5D /* Preambles.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Preambles.m; path = src/common/Preambles.m; sourceTree = ""; }; + 5573B98711DA377C00B5DC5D /* text-x-script.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "text-x-script.png"; sourceTree = ""; }; + 5573BDC911DB4D2600B5DC5D /* Preambles+Coder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "Preambles+Coder.h"; path = "src/osx/Preambles+Coder.h"; sourceTree = ""; }; + 5573BDCA11DB4D2600B5DC5D /* Preambles+Coder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "Preambles+Coder.m"; path = "src/osx/Preambles+Coder.m"; sourceTree = ""; }; + 5585E5C0117F681800124513 /* NodeStyle+Coder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NodeStyle+Coder.h"; path = "src/osx/NodeStyle+Coder.h"; sourceTree = ""; }; + 5585E5C1117F681800124513 /* NodeStyle+Coder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NodeStyle+Coder.m"; path = "src/osx/NodeStyle+Coder.m"; sourceTree = ""; }; + 5589A9AA11C500060064D310 /* tikzlexer.lm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.lex; name = tikzlexer.lm; path = src/common/tikzlexer.lm; sourceTree = ""; }; + 5589A9AB11C500060064D310 /* tikzparser.ym */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.yacc; name = tikzparser.ym; path = src/common/tikzparser.ym; sourceTree = ""; }; + 5589A9FD11C51E780064D310 /* TikzGraphAssembler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TikzGraphAssembler.h; path = src/common/TikzGraphAssembler.h; sourceTree = ""; }; + 5589A9FE11C51E780064D310 /* TikzGraphAssembler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TikzGraphAssembler.m; path = src/common/TikzGraphAssembler.m; sourceTree = ""; }; + 5589AD4211C633EE0064D310 /* SelectBoxLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SelectBoxLayer.h; path = src/osx/SelectBoxLayer.h; sourceTree = ""; }; + 5589AD4311C633EE0064D310 /* SelectBoxLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SelectBoxLayer.m; path = src/osx/SelectBoxLayer.m; sourceTree = ""; }; + 558F18B9117B031C009863B2 /* Edge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Edge.h; path = src/common/Edge.h; sourceTree = ""; }; + 558F18BA117B031C009863B2 /* Edge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Edge.m; path = src/common/Edge.m; sourceTree = ""; }; + 558F18BB117B031C009863B2 /* Graph.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Graph.h; path = src/common/Graph.h; sourceTree = ""; }; + 558F18BC117B031C009863B2 /* Graph.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Graph.m; path = src/common/Graph.m; sourceTree = ""; }; + 558F18BD117B031C009863B2 /* GraphChange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GraphChange.h; path = src/common/GraphChange.h; sourceTree = ""; }; + 558F18BE117B031C009863B2 /* GraphChange.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GraphChange.m; path = src/common/GraphChange.m; sourceTree = ""; }; + 558F18BF117B031C009863B2 /* GraphElementData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GraphElementData.h; path = src/common/GraphElementData.h; sourceTree = ""; }; + 558F18C0117B031C009863B2 /* GraphElementData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GraphElementData.m; path = src/common/GraphElementData.m; sourceTree = ""; }; + 558F18C1117B031C009863B2 /* Node.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Node.h; path = src/common/Node.h; sourceTree = ""; }; + 558F18C2117B031C009863B2 /* Node.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Node.m; path = src/common/Node.m; sourceTree = ""; }; + 558F18C3117B031C009863B2 /* NodeStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NodeStyle.h; path = src/common/NodeStyle.h; sourceTree = ""; }; + 558F18C4117B031C009863B2 /* NodeStyle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NodeStyle.m; path = src/common/NodeStyle.m; sourceTree = ""; }; + 558F18CB117B03DD009863B2 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = src/osx/main.m; sourceTree = ""; }; + 558F18CC117B03DD009863B2 /* util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = util.h; path = src/common/util.h; sourceTree = ""; }; + 558F18CD117B03DD009863B2 /* util.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = util.m; path = src/common/util.m; sourceTree = ""; }; + 558F18D9117B043B009863B2 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = src/osx/AppDelegate.h; sourceTree = ""; }; + 558F18DA117B043B009863B2 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = src/osx/AppDelegate.m; sourceTree = ""; }; + 558F18DD117B043B009863B2 /* EdgeControlLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EdgeControlLayer.h; path = src/osx/EdgeControlLayer.h; sourceTree = ""; }; + 558F18DE117B043B009863B2 /* EdgeControlLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = EdgeControlLayer.m; path = src/osx/EdgeControlLayer.m; sourceTree = ""; }; + 558F18DF117B043B009863B2 /* GraphicsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GraphicsView.h; path = src/osx/GraphicsView.h; sourceTree = ""; }; + 558F18E0117B043B009863B2 /* GraphicsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GraphicsView.m; path = src/osx/GraphicsView.m; sourceTree = ""; }; + 558F18E1117B043B009863B2 /* Grid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Grid.h; path = src/osx/Grid.h; sourceTree = ""; }; + 558F18E2117B043B009863B2 /* Grid.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Grid.m; path = src/osx/Grid.m; sourceTree = ""; }; + 558F18E3117B043B009863B2 /* NodeLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NodeLayer.h; path = src/osx/NodeLayer.h; sourceTree = ""; }; + 558F18E4117B043B009863B2 /* NodeLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NodeLayer.m; path = src/osx/NodeLayer.m; sourceTree = ""; }; + 558F18E5117B043B009863B2 /* NodeSelectionLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NodeSelectionLayer.h; path = src/osx/NodeSelectionLayer.h; sourceTree = ""; }; + 558F18E6117B043B009863B2 /* NodeSelectionLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NodeSelectionLayer.m; path = src/osx/NodeSelectionLayer.m; sourceTree = ""; }; + 558F18E9117B043B009863B2 /* SelectableCollectionViewItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SelectableCollectionViewItem.h; path = src/osx/SelectableCollectionViewItem.h; sourceTree = ""; }; + 558F18EA117B043B009863B2 /* SelectableCollectionViewItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SelectableCollectionViewItem.m; path = src/osx/SelectableCollectionViewItem.m; sourceTree = ""; }; + 558F18EB117B043B009863B2 /* SelectableNodeView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SelectableNodeView.h; path = src/osx/SelectableNodeView.h; sourceTree = ""; }; + 558F18EC117B043B009863B2 /* SelectableNodeView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SelectableNodeView.m; path = src/osx/SelectableNodeView.m; sourceTree = ""; }; + 558F18ED117B043B009863B2 /* StylePaletteController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StylePaletteController.h; path = src/osx/StylePaletteController.h; sourceTree = ""; }; + 558F18EE117B043B009863B2 /* StylePaletteController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = StylePaletteController.m; path = src/osx/StylePaletteController.m; sourceTree = ""; }; + 558F18EF117B043B009863B2 /* TikzDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TikzDocument.h; path = src/osx/TikzDocument.h; sourceTree = ""; }; + 558F18F0117B043B009863B2 /* TikzDocument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TikzDocument.m; path = src/osx/TikzDocument.m; sourceTree = ""; }; + 558F18F1117B043B009863B2 /* TikzSourceController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TikzSourceController.h; path = src/osx/TikzSourceController.h; sourceTree = ""; }; + 558F18F2117B043B009863B2 /* TikzSourceController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TikzSourceController.m; path = src/osx/TikzSourceController.m; sourceTree = ""; }; + 558F18F3117B043B009863B2 /* ToolPaletteController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ToolPaletteController.h; path = src/osx/ToolPaletteController.h; sourceTree = ""; }; + 558F18F4117B043B009863B2 /* ToolPaletteController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ToolPaletteController.m; path = src/osx/ToolPaletteController.m; sourceTree = ""; }; + 55900A9F135FA918002DD28E /* MultiCombo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MultiCombo.h; path = src/osx/MultiCombo.h; sourceTree = ""; }; + 55900AA0135FA918002DD28E /* MultiCombo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MultiCombo.m; path = src/osx/MultiCombo.m; sourceTree = ""; }; + 55900AE2135FB305002DD28E /* emblem-unreadable-grey.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emblem-unreadable-grey.png"; sourceTree = ""; }; + 559EFA4711C7D49800D020F4 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = Frameworks/Sparkle.framework; sourceTree = ""; }; + 559EFA5611C7D95F00D020F4 /* tikzit_dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = tikzit_dsa_pub.pem; sourceTree = ""; }; + 559EFB6611CB88E300D020F4 /* ColorRGB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ColorRGB.h; path = src/common/ColorRGB.h; sourceTree = ""; }; + 559EFB6711CB88E300D020F4 /* ColorRGB.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ColorRGB.m; path = src/common/ColorRGB.m; sourceTree = ""; }; + 55CA98D412EF8FCE008F0368 /* SFBInspectors.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SFBInspectors.framework; path = Frameworks/SFBInspectors.framework; sourceTree = ""; }; + 55CA997012F08281008F0368 /* TikzWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TikzWindowController.h; path = src/osx/TikzWindowController.h; sourceTree = ""; }; + 55CA997112F08281008F0368 /* TikzWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TikzWindowController.m; path = src/osx/TikzWindowController.m; sourceTree = ""; }; + 55CA9AC712F831E5008F0368 /* RColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RColor.h; path = src/common/RColor.h; sourceTree = ""; }; + 55CA9AC812F831E5008F0368 /* RColor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RColor.m; path = src/common/RColor.m; sourceTree = ""; }; + 55D2E0B01186ED950060B4EC /* Graph+Coder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "Graph+Coder.h"; path = "src/osx/Graph+Coder.h"; sourceTree = ""; }; + 55D2E0B11186ED950060B4EC /* Graph+Coder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "Graph+Coder.m"; path = "src/osx/Graph+Coder.m"; sourceTree = ""; }; + 55D945701165904F0044178C /* tikzitdoc.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = tikzitdoc.icns; sourceTree = ""; }; + 55D945711165904F0044178C /* tikzit.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = tikzit.icns; sourceTree = ""; }; + 55D947301165A5D40044178C /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/StylePalette.xib; sourceTree = ""; }; + 55D949111165D8870044178C /* draw-ellipse.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "draw-ellipse.png"; sourceTree = ""; }; + 55D949121165D8870044178C /* draw-path.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "draw-path.png"; sourceTree = ""; }; + 55D949131165D8870044178C /* select-rectangular.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "select-rectangular.png"; sourceTree = ""; }; + 55E5E99D1215C8E300256F69 /* transform-crop-and-resize.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "transform-crop-and-resize.png"; sourceTree = ""; }; + 55F958581181B09600F99434 /* PickSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PickSupport.h; path = src/common/PickSupport.h; sourceTree = ""; }; + 55F958591181B09600F99434 /* PickSupport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PickSupport.m; path = src/common/PickSupport.m; sourceTree = ""; }; + 55F9585A1181B09600F99434 /* Transformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Transformer.h; path = src/common/Transformer.h; sourceTree = ""; }; + 55F9585B1181B09600F99434 /* Transformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Transformer.m; path = src/common/Transformer.m; sourceTree = ""; }; + 55F9E04311FF54F000F5659E /* NSString+LatexConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSString+LatexConstants.h"; path = "src/common/NSString+LatexConstants.h"; sourceTree = ""; }; + 55F9E04411FF54F000F5659E /* NSString+LatexConstants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSString+LatexConstants.m"; path = "src/common/NSString+LatexConstants.m"; sourceTree = ""; }; + 55FF4E64116A401B000C22B4 /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = usr/lib/libicucore.dylib; sourceTree = SDKROOT; }; + 7F18A31F184C577000BC3081 /* UpdatePreferenceController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UpdatePreferenceController.h; path = src/osx/UpdatePreferenceController.h; sourceTree = ""; }; + 7F18A320184C577000BC3081 /* UpdatePreferenceController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = UpdatePreferenceController.m; path = src/osx/UpdatePreferenceController.m; sourceTree = ""; }; + 7F18A322184C599100BC3081 /* UpdatePreferencePanel.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = UpdatePreferencePanel.xib; path = src/osx/UpdatePreferencePanel.xib; sourceTree = ""; }; + 7F6E2C8716B0091300BFE20D /* maths.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = maths.m; path = src/common/test/maths.m; sourceTree = ""; }; + 7F734388184AC559002897D0 /* DraggablePDFView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DraggablePDFView.h; path = src/osx/DraggablePDFView.h; sourceTree = ""; }; + 7F734389184AC559002897D0 /* DraggablePDFView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DraggablePDFView.m; path = src/osx/DraggablePDFView.m; sourceTree = ""; }; + 7F781C1816B5DE1400239826 /* ParseErrorView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ParseErrorView.h; path = src/osx/ParseErrorView.h; sourceTree = ""; }; + 7F781C1916B5DE1400239826 /* ParseErrorView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ParseErrorView.m; path = src/osx/ParseErrorView.m; sourceTree = ""; }; + 7F7B6DE918DE0C9E004F6CA8 /* tikzlexer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tikzlexer.h; path = xbuild/TikZiT.build/Debug/TikZiT.build/DerivedSources/tikzlexer.h; sourceTree = ""; }; + 7F7B6DEA18DE0C9E004F6CA8 /* tikzlexer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = tikzlexer.m; path = xbuild/TikZiT.build/Debug/TikZiT.build/DerivedSources/tikzlexer.m; sourceTree = ""; }; + 7F7B6DEB18DE0C9E004F6CA8 /* tikzparser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tikzparser.h; path = xbuild/TikZiT.build/Debug/TikZiT.build/DerivedSources/tikzparser.h; sourceTree = ""; }; + 7F7B6DEC18DE0C9E004F6CA8 /* tikzparser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = tikzparser.m; path = xbuild/TikZiT.build/Debug/TikZiT.build/DerivedSources/tikzparser.m; sourceTree = ""; }; + 7F7B6DF018DE0D7A004F6CA8 /* CustomNodeCellView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CustomNodeCellView.h; path = src/osx/CustomNodeCellView.h; sourceTree = ""; }; + 7F7B6DF118DE0D7A004F6CA8 /* CustomNodeCellView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CustomNodeCellView.m; path = src/osx/CustomNodeCellView.m; sourceTree = ""; }; + 7F7B6DF218DE0D7A004F6CA8 /* CustomNodeController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CustomNodeController.h; path = src/osx/CustomNodeController.h; sourceTree = ""; }; + 7F7B6DF318DE0D7A004F6CA8 /* CustomNodeController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CustomNodeController.m; path = src/osx/CustomNodeController.m; sourceTree = ""; }; + 7F90E88416DD29600069EBCD /* NSString+Tikz.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSString+Tikz.h"; path = "src/common/NSString+Tikz.h"; sourceTree = ""; }; + 7F90E88516DD29600069EBCD /* NSString+Tikz.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSString+Tikz.m"; path = "src/common/NSString+Tikz.m"; sourceTree = ""; }; + 7F90E88A16DD47540069EBCD /* PreferenceController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PreferenceController.h; path = src/osx/PreferenceController.h; sourceTree = ""; }; + 7F90E88B16DD47540069EBCD /* PreferenceController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PreferenceController.m; path = src/osx/PreferenceController.m; sourceTree = ""; }; + 7F90E88C16DD47540069EBCD /* Preferences.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = Preferences.xib; path = src/osx/Preferences.xib; sourceTree = ""; }; + 7F90E89016DD54440069EBCD /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = English; path = English.lproj/UserDefaults.plist; sourceTree = ""; }; + 7F93852D184D176E00FAED38 /* updates.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = updates.png; sourceTree = ""; }; + 7F93852F184D178B00FAED38 /* engine.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = engine.png; sourceTree = ""; }; + 7F938531184D184700FAED38 /* preamble.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = preamble.png; sourceTree = ""; }; + 7FB9BFEC16B57C2E00773146 /* TikzFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TikzFormatter.h; path = src/osx/TikzFormatter.h; sourceTree = ""; }; + 7FB9BFED16B57C2E00773146 /* TikzFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TikzFormatter.m; path = src/osx/TikzFormatter.m; sourceTree = ""; }; + 7FD5D44A18E1CB5300E2A930 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/CustomNodes.xib; sourceTree = ""; }; + 7FD5D44C18E1CC0B00E2A930 /* customshape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = customshape.png; sourceTree = ""; }; + 7FEED45516B1A7C400B056CB /* StyleManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StyleManager.h; path = src/common/StyleManager.h; sourceTree = ""; }; + 7FEED45616B1A7C500B056CB /* StyleManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = StyleManager.m; path = src/common/StyleManager.m; sourceTree = ""; }; + 8D15AC360486D014006FF6A4 /* TikZiT-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "TikZiT-Info.plist"; sourceTree = ""; }; + 8D15AC370486D014006FF6A4 /* TikZiT.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TikZiT.app; sourceTree = BUILT_PRODUCTS_DIR; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 5589AA6311C5429C0064D310 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 55CA98DD12EF910F008F0368 /* SFBInspectors.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 8D15AC330486D014006FF6A4 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 8D15AC340486D014006FF6A4 /* Cocoa.framework in Frameworks */, + 559EFA4811C7D49800D020F4 /* Sparkle.framework in Frameworks */, + 5573B8BA11D9FC8D00B5DC5D /* Quartz.framework in Frameworks */, + 55CA98D512EF8FCE008F0368 /* SFBInspectors.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 1058C7A6FEA54F5311CA2CBB /* Linked Frameworks */ = { + isa = PBXGroup; + children = ( + 1058C7A7FEA54F5311CA2CBB /* Cocoa.framework */, + 55FF4E64116A401B000C22B4 /* libicucore.dylib */, + 559EFA4711C7D49800D020F4 /* Sparkle.framework */, + 55CA98D412EF8FCE008F0368 /* SFBInspectors.framework */, + ); + name = "Linked Frameworks"; + sourceTree = ""; + }; + 1058C7A8FEA54F5311CA2CBB /* Other Frameworks */ = { + isa = PBXGroup; + children = ( + 2A37F4C4FDCFA73011CA2CEA /* AppKit.framework */, + 13E42FBA07B3F13500E4EEF1 /* CoreData.framework */, + 2A37F4C5FDCFA73011CA2CEA /* Foundation.framework */, + 5573B8B911D9FC8D00B5DC5D /* Quartz.framework */, + ); + name = "Other Frameworks"; + sourceTree = ""; + }; + 19C28FB0FE9D524F11CA2CBB /* Products */ = { + isa = PBXGroup; + children = ( + 8D15AC370486D014006FF6A4 /* TikZiT.app */, + 5504C83711D237F5002A1478 /* tests */, + ); + name = Products; + sourceTree = ""; + }; + 2A37F4AAFDCFA73011CA2CEA /* TikZiT */ = { + isa = PBXGroup; + children = ( + 2A37F4ABFDCFA73011CA2CEA /* TikZiT */, + 2A37F4AFFDCFA73011CA2CEA /* Other Sources */, + 2A37F4B8FDCFA73011CA2CEA /* Resources */, + 2A37F4C3FDCFA73011CA2CEA /* Frameworks */, + 19C28FB0FE9D524F11CA2CBB /* Products */, + ); + name = TikZiT; + sourceTree = ""; + }; + 2A37F4ABFDCFA73011CA2CEA /* TikZiT */ = { + isa = PBXGroup; + children = ( + 5504C82611D23477002A1478 /* Test */, + 55D946141165924F0044178C /* Graph */, + 55D946071165922F0044178C /* Parser */, + 55D9467311659F5E0044178C /* Gui */, + 558F18D9117B043B009863B2 /* AppDelegate.h */, + 558F18DA117B043B009863B2 /* AppDelegate.m */, + 55F9E04311FF54F000F5659E /* NSString+LatexConstants.h */, + 55F9E04411FF54F000F5659E /* NSString+LatexConstants.m */, + ); + name = TikZiT; + sourceTree = ""; + }; + 2A37F4AFFDCFA73011CA2CEA /* Other Sources */ = { + isa = PBXGroup; + children = ( + 55CA9AC712F831E5008F0368 /* RColor.h */, + 55CA9AC812F831E5008F0368 /* RColor.m */, + 558F18CB117B03DD009863B2 /* main.m */, + 558F18CC117B03DD009863B2 /* util.h */, + 558F18CD117B03DD009863B2 /* util.m */, + 2564AD2C0F5327BB00F57823 /* TikZiT_Prefix.pch */, + 55652DF713E1F2030023F4C6 /* SupportDir.h */, + 55652DF813E1F2030023F4C6 /* SupportDir.m */, + ); + name = "Other Sources"; + sourceTree = ""; + }; + 2A37F4B8FDCFA73011CA2CEA /* Resources */ = { + isa = PBXGroup; + children = ( + 55397C8E1449AC7C006942FB /* AH_latex_head.png */, + 55397C8F1449AC7C006942FB /* AH_plain_head.png */, + 55397C8C1449ABFC006942FB /* AH_latex_tail.png */, + 55397C871449AB91006942FB /* AH_none.png */, + 55397C881449AB91006942FB /* AH_plain_tail.png */, + 55397C841449A9BF006942FB /* ED_none.png */, + 55397C821449A8F1006942FB /* ED_tick.png */, + 55397C801449A877006942FB /* ED_arrow.png */, + 7F93852C184D175400FAED38 /* Icons */, + 55652E5013E1FC660023F4C6 /* shapes */, + 55900AE2135FB305002DD28E /* emblem-unreadable-grey.png */, + 55E5E99D1215C8E300256F69 /* transform-crop-and-resize.png */, + 5573B98711DA377C00B5DC5D /* text-x-script.png */, + 8D15AC360486D014006FF6A4 /* TikZiT-Info.plist */, + 7F90E88F16DD54440069EBCD /* UserDefaults.plist */, + 089C165FFE840EACC02AAC07 /* InfoPlist.strings */, + 2A37F4B9FDCFA73011CA2CEA /* Credits.rtf */, + 55D949111165D8870044178C /* draw-ellipse.png */, + 55D949121165D8870044178C /* draw-path.png */, + 555B30F811D8BE3300CAECF5 /* emblem-important.png */, + 5573B92411DA273400B5DC5D /* format-indent-less.png */, + 55D949131165D8870044178C /* select-rectangular.png */, + 5573B92011DA259C00B5DC5D /* text-x-generic.png */, + 559EFA5611C7D95F00D020F4 /* tikzit_dsa_pub.pem */, + 55D945701165904F0044178C /* tikzitdoc.icns */, + 55D945711165904F0044178C /* tikzit.icns */, + 7F90E88C16DD47540069EBCD /* Preferences.xib */, + 7FD5D44918E1CB5300E2A930 /* CustomNodes.xib */, + 7F18A322184C599100BC3081 /* UpdatePreferencePanel.xib */, + 55391AF713D3250F007DBE71 /* Preamble.xib */, + 55391AF513D324FE007DBE71 /* Preview.xib */, + 55391B0013D32608007DBE71 /* PropertyInspector.xib */, + 556979421168747B007E5703 /* StylePalette.xib */, + 1DDD58280DA1D0D100B32029 /* TikzDocument.xib */, + 1DDD582A0DA1D0D100B32029 /* MainMenu.xib */, + ); + name = Resources; + sourceTree = ""; + }; + 2A37F4C3FDCFA73011CA2CEA /* Frameworks */ = { + isa = PBXGroup; + children = ( + 1058C7A6FEA54F5311CA2CBB /* Linked Frameworks */, + 1058C7A8FEA54F5311CA2CBB /* Other Frameworks */, + ); + name = Frameworks; + sourceTree = ""; + }; + 5504C82611D23477002A1478 /* Test */ = { + isa = PBXGroup; + children = ( + 555B313411D8C6DA00CAECF5 /* color.m */, + 5504C93E11D39422002A1478 /* osx.m */, + 5504C82A11D23595002A1478 /* common.m */, + 5504C83111D23685002A1478 /* main.m */, + 5504C82B11D23595002A1478 /* parser.m */, + 5504C82C11D23595002A1478 /* test.h */, + 5504C82D11D23595002A1478 /* test.m */, + 7F6E2C8716B0091300BFE20D /* maths.m */, + ); + name = Test; + sourceTree = ""; + }; + 55391B0713D326E5007DBE71 /* PropertyInspector */ = { + isa = PBXGroup; + children = ( + 552202C2135F15FD007EA086 /* MultiField.h */, + 552202C3135F15FD007EA086 /* MultiField.m */, + 55900A9F135FA918002DD28E /* MultiCombo.h */, + 55900AA0135FA918002DD28E /* MultiCombo.m */, + 55391B0813D32765007DBE71 /* PropertyInspectorController.h */, + 55391B0913D32765007DBE71 /* PropertyInspectorController.m */, + ); + name = PropertyInspector; + sourceTree = ""; + }; + 55652E5013E1FC660023F4C6 /* shapes */ = { + isa = PBXGroup; + children = ( + 55652E5113E1FC660023F4C6 /* cap.tikz */, + 55652E5213E1FC660023F4C6 /* copants.tikz */, + 55652E5313E1FC660023F4C6 /* cup.tikz */, + 55652E5413E1FC660023F4C6 /* oval.tikz */, + 55652E5513E1FC660023F4C6 /* pants.tikz */, + ); + path = shapes; + sourceTree = ""; + }; + 5573B8BF11D9FD1800B5DC5D /* Preview */ = { + isa = PBXGroup; + children = ( + 7F734388184AC559002897D0 /* DraggablePDFView.h */, + 7F734389184AC559002897D0 /* DraggablePDFView.m */, + 5573B8C011D9FD3200B5DC5D /* PreviewController.h */, + 5573B8C111D9FD3200B5DC5D /* PreviewController.m */, + ); + name = Preview; + sourceTree = ""; + }; + 5573B90C11DA22E500B5DC5D /* Preamble */ = { + isa = PBXGroup; + children = ( + 5573B92711DA292F00B5DC5D /* Preambles.h */, + 5573B92811DA292F00B5DC5D /* Preambles.m */, + 5573BDC911DB4D2600B5DC5D /* Preambles+Coder.h */, + 5573BDCA11DB4D2600B5DC5D /* Preambles+Coder.m */, + ); + name = Preamble; + sourceTree = ""; + }; + 55900AFC13605498002DD28E /* Shapes */ = { + isa = PBXGroup; + children = ( + 55598E331635372E0023450A /* DiamondShape.h */, + 55598E341635372E0023450A /* DiamondShape.m */, + 55652E3F13E1FB0A0023F4C6 /* Shape.h */, + 55652E4013E1FB0A0023F4C6 /* Shape.m */, + 55652E3313E1FAED0023F4C6 /* CircleShape.h */, + 55652E3413E1FAED0023F4C6 /* CircleShape.m */, + 55652E3513E1FAED0023F4C6 /* RectangleShape.h */, + 55652E3613E1FAED0023F4C6 /* RectangleShape.m */, + 55652E3713E1FAED0023F4C6 /* RegularPolyShape.h */, + 55652E3813E1FAED0023F4C6 /* RegularPolyShape.m */, + 55652E3913E1FAEE0023F4C6 /* TikzShape.h */, + 55652E3A13E1FAEE0023F4C6 /* TikzShape.m */, + 555ECF361379E9F80052DB71 /* ShapeNames.h */, + ); + name = Shapes; + sourceTree = ""; + }; + 55D946071165922F0044178C /* Parser */ = { + isa = PBXGroup; + children = ( + 7F7B6DE218DE0BE1004F6CA8 /* Generated sources */, + 5589A9AA11C500060064D310 /* tikzlexer.lm */, + 5589A9AB11C500060064D310 /* tikzparser.ym */, + 5589A9FD11C51E780064D310 /* TikzGraphAssembler.h */, + 5589A9FE11C51E780064D310 /* TikzGraphAssembler.m */, + ); + name = Parser; + sourceTree = ""; + }; + 55D946141165924F0044178C /* Graph */ = { + isa = PBXGroup; + children = ( + 55432E041444BF2D00401BB3 /* GraphElementProperty.h */, + 55432E051444BF2D00401BB3 /* GraphElementProperty.m */, + 559EFB6611CB88E300D020F4 /* ColorRGB.h */, + 559EFB6711CB88E300D020F4 /* ColorRGB.m */, + 558F18B9117B031C009863B2 /* Edge.h */, + 558F18BA117B031C009863B2 /* Edge.m */, + 558F18BB117B031C009863B2 /* Graph.h */, + 558F18BC117B031C009863B2 /* Graph.m */, + 55D2E0B01186ED950060B4EC /* Graph+Coder.h */, + 55D2E0B11186ED950060B4EC /* Graph+Coder.m */, + 558F18BD117B031C009863B2 /* GraphChange.h */, + 558F18BE117B031C009863B2 /* GraphChange.m */, + 7FEED45516B1A7C400B056CB /* StyleManager.h */, + 7FEED45616B1A7C500B056CB /* StyleManager.m */, + 558F18BF117B031C009863B2 /* GraphElementData.h */, + 558F18C0117B031C009863B2 /* GraphElementData.m */, + 558F18C1117B031C009863B2 /* Node.h */, + 558F18C2117B031C009863B2 /* Node.m */, + 7F90E88416DD29600069EBCD /* NSString+Tikz.h */, + 7F90E88516DD29600069EBCD /* NSString+Tikz.m */, + 558F18C3117B031C009863B2 /* NodeStyle.h */, + 558F18C4117B031C009863B2 /* NodeStyle.m */, + 5585E5C0117F681800124513 /* NodeStyle+Coder.h */, + 5585E5C1117F681800124513 /* NodeStyle+Coder.m */, + 55397C7714498C21006942FB /* EdgeStyle.h */, + 55397C7814498C22006942FB /* EdgeStyle.m */, + 55397C7A144990EA006942FB /* EdgeStyle+Coder.h */, + 55397C7B144990EA006942FB /* EdgeStyle+Coder.m */, + 55397C7D144999C4006942FB /* PropertyHolder.h */, + 55397C7E144999C4006942FB /* PropertyHolder.m */, + ); + name = Graph; + sourceTree = ""; + }; + 55D9467311659F5E0044178C /* Gui */ = { + isa = PBXGroup; + children = ( + 7FB9BFE616B54BE300773146 /* Formatter */, + 55D9468011659FD50044178C /* GraphicsView */, + 5573B90C11DA22E500B5DC5D /* Preamble */, + 5573B8BF11D9FD1800B5DC5D /* Preview */, + 55391B0713D326E5007DBE71 /* PropertyInspector */, + 55D9468D11659FF00044178C /* StylePalette */, + 558F18EF117B043B009863B2 /* TikzDocument.h */, + 7F781C1816B5DE1400239826 /* ParseErrorView.h */, + 7F781C1916B5DE1400239826 /* ParseErrorView.m */, + 558F18F0117B043B009863B2 /* TikzDocument.m */, + 558F18F1117B043B009863B2 /* TikzSourceController.h */, + 558F18F2117B043B009863B2 /* TikzSourceController.m */, + 558F18F3117B043B009863B2 /* ToolPaletteController.h */, + 558F18F4117B043B009863B2 /* ToolPaletteController.m */, + 55CA997012F08281008F0368 /* TikzWindowController.h */, + 55CA997112F08281008F0368 /* TikzWindowController.m */, + 553A4C58144ED3D500AA6FAC /* NilToEmptyStringTransformer.h */, + 553A4C59144ED3D500AA6FAC /* NilToEmptyStringTransformer.m */, + 7F18A31E184C563800BC3081 /* Preferences */, + ); + name = Gui; + sourceTree = ""; + }; + 55D9468011659FD50044178C /* GraphicsView */ = { + isa = PBXGroup; + children = ( + 55900AFC13605498002DD28E /* Shapes */, + 558F18DD117B043B009863B2 /* EdgeControlLayer.h */, + 558F18DE117B043B009863B2 /* EdgeControlLayer.m */, + 558F18DF117B043B009863B2 /* GraphicsView.h */, + 558F18E0117B043B009863B2 /* GraphicsView.m */, + 558F18E1117B043B009863B2 /* Grid.h */, + 558F18E2117B043B009863B2 /* Grid.m */, + 558F18E3117B043B009863B2 /* NodeLayer.h */, + 558F18E4117B043B009863B2 /* NodeLayer.m */, + 558F18E5117B043B009863B2 /* NodeSelectionLayer.h */, + 558F18E6117B043B009863B2 /* NodeSelectionLayer.m */, + 55F958581181B09600F99434 /* PickSupport.h */, + 55F958591181B09600F99434 /* PickSupport.m */, + 55F9585A1181B09600F99434 /* Transformer.h */, + 55F9585B1181B09600F99434 /* Transformer.m */, + 5589AD4211C633EE0064D310 /* SelectBoxLayer.h */, + 5589AD4311C633EE0064D310 /* SelectBoxLayer.m */, + 555ECE991378A3AA0052DB71 /* CALayer+DrawLabel.h */, + 555ECE9A1378A3AA0052DB71 /* CALayer+DrawLabel.m */, + ); + name = GraphicsView; + sourceTree = ""; + }; + 55D9468D11659FF00044178C /* StylePalette */ = { + isa = PBXGroup; + children = ( + 558F18E9117B043B009863B2 /* SelectableCollectionViewItem.h */, + 558F18EA117B043B009863B2 /* SelectableCollectionViewItem.m */, + 558F18EB117B043B009863B2 /* SelectableNodeView.h */, + 558F18EC117B043B009863B2 /* SelectableNodeView.m */, + 558F18ED117B043B009863B2 /* StylePaletteController.h */, + 558F18EE117B043B009863B2 /* StylePaletteController.m */, + ); + name = StylePalette; + sourceTree = ""; + }; + 7F18A31E184C563800BC3081 /* Preferences */ = { + isa = PBXGroup; + children = ( + 7F7B6DEF18DE0D70004F6CA8 /* CustomNode */, + 5573B90D11DA231A00B5DC5D /* PreambleController.h */, + 5573B90E11DA231A00B5DC5D /* PreambleController.m */, + 7F90E88A16DD47540069EBCD /* PreferenceController.h */, + 7F90E88B16DD47540069EBCD /* PreferenceController.m */, + 7F18A31F184C577000BC3081 /* UpdatePreferenceController.h */, + 7F18A320184C577000BC3081 /* UpdatePreferenceController.m */, + ); + name = Preferences; + sourceTree = ""; + }; + 7F7B6DE218DE0BE1004F6CA8 /* Generated sources */ = { + isa = PBXGroup; + children = ( + 7F7B6DE918DE0C9E004F6CA8 /* tikzlexer.h */, + 7F7B6DEA18DE0C9E004F6CA8 /* tikzlexer.m */, + 7F7B6DEB18DE0C9E004F6CA8 /* tikzparser.h */, + 7F7B6DEC18DE0C9E004F6CA8 /* tikzparser.m */, + ); + name = "Generated sources"; + sourceTree = ""; + }; + 7F7B6DEF18DE0D70004F6CA8 /* CustomNode */ = { + isa = PBXGroup; + children = ( + 7F7B6DF018DE0D7A004F6CA8 /* CustomNodeCellView.h */, + 7F7B6DF118DE0D7A004F6CA8 /* CustomNodeCellView.m */, + 7F7B6DF218DE0D7A004F6CA8 /* CustomNodeController.h */, + 7F7B6DF318DE0D7A004F6CA8 /* CustomNodeController.m */, + ); + name = CustomNode; + sourceTree = ""; + }; + 7F93852C184D175400FAED38 /* Icons */ = { + isa = PBXGroup; + children = ( + 7F93852F184D178B00FAED38 /* engine.png */, + 7F938531184D184700FAED38 /* preamble.png */, + 7FD5D44C18E1CC0B00E2A930 /* customshape.png */, + 7F93852D184D176E00FAED38 /* updates.png */, + ); + name = Icons; + sourceTree = ""; + }; + 7FB9BFE616B54BE300773146 /* Formatter */ = { + isa = PBXGroup; + children = ( + 7FB9BFEC16B57C2E00773146 /* TikzFormatter.h */, + 7FB9BFED16B57C2E00773146 /* TikzFormatter.m */, + ); + name = Formatter; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 5589AA6411C5429C0064D310 /* tests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 5589AA8311C543240064D310 /* Build configuration list for PBXNativeTarget "tests" */; + buildPhases = ( + 5589AA6211C5429C0064D310 /* Sources */, + 5589AA6311C5429C0064D310 /* Frameworks */, + 7F6E2C8B16B00A9200BFE20D /* CopyFiles */, + ); + buildRules = ( + ); + dependencies = ( + 5504C91B11D36CD5002A1478 /* PBXTargetDependency */, + ); + name = tests; + productName = testparser; + productReference = 5504C83711D237F5002A1478 /* tests */; + productType = "com.apple.product-type.tool"; + }; + 8D15AC270486D014006FF6A4 /* TikZiT */ = { + isa = PBXNativeTarget; + buildConfigurationList = C05733C708A9546B00998B17 /* Build configuration list for PBXNativeTarget "TikZiT" */; + buildPhases = ( + 559EFA5511C7D4DD00D020F4 /* Copy Frameworks */, + 8D15AC2B0486D014006FF6A4 /* Resources */, + 55652E6613E1FD080023F4C6 /* Copy Shapes */, + 7F7B6DE018DE02AC004F6CA8 /* Run Flex */, + 7F7B6DE118DE0A6E004F6CA8 /* Run Bison */, + 8D15AC300486D014006FF6A4 /* Sources */, + 8D15AC330486D014006FF6A4 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = TikZiT; + productInstallPath = "$(HOME)/Applications"; + productName = TikZiT; + productReference = 8D15AC370486D014006FF6A4 /* TikZiT.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 2A37F4A9FDCFA73011CA2CEA /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0410; + ORGANIZATIONNAME = "Aleks Kissinger"; + }; + buildConfigurationList = C05733CB08A9546B00998B17 /* Build configuration list for PBXProject "TikZiT" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 1; + knownRegions = ( + English, + Japanese, + French, + German, + ); + mainGroup = 2A37F4AAFDCFA73011CA2CEA /* TikZiT */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 8D15AC270486D014006FF6A4 /* TikZiT */, + 5589AA6411C5429C0064D310 /* tests */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 8D15AC2B0486D014006FF6A4 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 8D15AC2C0486D014006FF6A4 /* Credits.rtf in Resources */, + 8D15AC2F0486D014006FF6A4 /* InfoPlist.strings in Resources */, + 7F938532184D184700FAED38 /* preamble.png in Resources */, + 1DDD582C0DA1D0D100B32029 /* TikzDocument.xib in Resources */, + 7F938530184D178B00FAED38 /* engine.png in Resources */, + 1DDD582D0DA1D0D100B32029 /* MainMenu.xib in Resources */, + 7FD5D44D18E1CC0B00E2A930 /* customshape.png in Resources */, + 55D945721165904F0044178C /* tikzitdoc.icns in Resources */, + 55D945731165904F0044178C /* tikzit.icns in Resources */, + 556979431168747B007E5703 /* StylePalette.xib in Resources */, + 55D949141165D8870044178C /* draw-ellipse.png in Resources */, + 55D949151165D8870044178C /* draw-path.png in Resources */, + 55D949161165D8870044178C /* select-rectangular.png in Resources */, + 559EFA5711C7D95F00D020F4 /* tikzit_dsa_pub.pem in Resources */, + 7F93852E184D176E00FAED38 /* updates.png in Resources */, + 555B30F911D8BE3300CAECF5 /* emblem-important.png in Resources */, + 55391AF613D324FE007DBE71 /* Preview.xib in Resources */, + 55391AF813D3250F007DBE71 /* Preamble.xib in Resources */, + 5573B92111DA259C00B5DC5D /* text-x-generic.png in Resources */, + 5573B92511DA273400B5DC5D /* format-indent-less.png in Resources */, + 5573B98811DA377C00B5DC5D /* text-x-script.png in Resources */, + 55E5E99E1215C8E300256F69 /* transform-crop-and-resize.png in Resources */, + 55900AE3135FB305002DD28E /* emblem-unreadable-grey.png in Resources */, + 55391B0213D32608007DBE71 /* PropertyInspector.xib in Resources */, + 55397C811449A877006942FB /* ED_arrow.png in Resources */, + 55397C831449A8F1006942FB /* ED_tick.png in Resources */, + 55397C851449A9BF006942FB /* ED_none.png in Resources */, + 55397C8A1449AB91006942FB /* AH_none.png in Resources */, + 55397C8B1449AB91006942FB /* AH_plain_tail.png in Resources */, + 55397C8D1449ABFC006942FB /* AH_latex_tail.png in Resources */, + 7FD5D44B18E1CB5300E2A930 /* CustomNodes.xib in Resources */, + 55397C901449AC7C006942FB /* AH_latex_head.png in Resources */, + 55397C911449AC7C006942FB /* AH_plain_head.png in Resources */, + 7F18A323184C599100BC3081 /* UpdatePreferencePanel.xib in Resources */, + 7F90E88E16DD47540069EBCD /* Preferences.xib in Resources */, + 7F90E89116DD54440069EBCD /* UserDefaults.plist in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 7F7B6DE018DE02AC004F6CA8 /* Run Flex */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "$(SRCROOT)/src/common/tikzlexer.lm", + ); + name = "Run Flex"; + outputPaths = ( + "$(DERIVED_SOURCES_DIR)/tikzlexer.m", + "$(DERIVED_SOURCES_DIR)/tikzlexer.h", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "cd ${SRCROOT}/src/\nexport INPUT_FILE_BASE=`basename \"${SCRIPT_INPUT_FILE_0}\" .lm`\nflex -o common/${INPUT_FILE_BASE}.m common/${INPUT_FILE_BASE}.lm\nmv common/${INPUT_FILE_BASE}.m common/${INPUT_FILE_BASE}.h ${DERIVED_SOURCES_DIR}\n"; + }; + 7F7B6DE118DE0A6E004F6CA8 /* Run Bison */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "$(SRCROOT)/src/common/tikzparser.ym", + ); + name = "Run Bison"; + outputPaths = ( + "$(DERIVED_SOURCES_DIR)/tikzparser.m", + "$(DERIVED_SOURCES_DIR)/tikzparser.h", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "cd ${SRCROOT}/src/\nexport INPUT_FILE_BASE=`basename \"${SCRIPT_INPUT_FILE_0}\" .ym`\nbison --defines=common/${INPUT_FILE_BASE}.h --output=common/${INPUT_FILE_BASE}.m common/${INPUT_FILE_BASE}.ym\nmv common/${INPUT_FILE_BASE}.m common/${INPUT_FILE_BASE}.h ${DERIVED_SOURCES_DIR}"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 5589AA6211C5429C0064D310 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 5504C84F11D23945002A1478 /* ColorRGB.m in Sources */, + 5589AA8511C543500064D310 /* util.m in Sources */, + 5589AA7211C542E60064D310 /* Edge.m in Sources */, + 5589AA7611C542E60064D310 /* Graph.m in Sources */, + 5589AA7811C542E60064D310 /* GraphChange.m in Sources */, + 5589AA7A11C542E60064D310 /* GraphElementData.m in Sources */, + 5589AA7C11C542E60064D310 /* Node.m in Sources */, + 5589AA8011C542E60064D310 /* NodeStyle.m in Sources */, + 5589AA6C11C542D30064D310 /* TikzGraphAssembler.m in Sources */, + 5589AA6D11C542D30064D310 /* tikzlexer.lm in Sources */, + 7F6E2C8216B008B000BFE20D /* DiamondShape.m in Sources */, + 7F6E2C8316B008B000BFE20D /* CircleShape.m in Sources */, + 7F6E2C8A16B0096000BFE20D /* SupportDir.m in Sources */, + 7F6E2C8416B008B000BFE20D /* RectangleShape.m in Sources */, + 7F6E2C8516B008B000BFE20D /* RegularPolyShape.m in Sources */, + 7F6E2C8616B008B000BFE20D /* TikzShape.m in Sources */, + 7F6E2C8016B0083300BFE20D /* Shape.m in Sources */, + 7F6E2C8116B0084600BFE20D /* Transformer.m in Sources */, + 5589AA6E11C542D30064D310 /* tikzparser.ym in Sources */, + 5504C82E11D23595002A1478 /* common.m in Sources */, + 5504C82F11D23595002A1478 /* parser.m in Sources */, + 5504C83011D23595002A1478 /* test.m in Sources */, + 7F6E2C7F16B0081D00BFE20D /* PropertyHolder.m in Sources */, + 5504C83211D23685002A1478 /* main.m in Sources */, + 5504C93F11D39422002A1478 /* osx.m in Sources */, + 555B313511D8C6DA00CAECF5 /* color.m in Sources */, + 7F6E2C7E16B0080400BFE20D /* GraphElementProperty.m in Sources */, + 7F6E2C7D16B007F000BFE20D /* EdgeStyle.m in Sources */, + 55CA9ACA12F831E5008F0368 /* RColor.m in Sources */, + 552202C4135F15FD007EA086 /* MultiField.m in Sources */, + 55900AA1135FA918002DD28E /* MultiCombo.m in Sources */, + 7F6E2C8916B0091300BFE20D /* maths.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 8D15AC300486D014006FF6A4 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 7F7B6DEE18DE0C9E004F6CA8 /* tikzparser.m in Sources */, + 7F7B6DED18DE0C9E004F6CA8 /* tikzlexer.m in Sources */, + 558F18C5117B031C009863B2 /* Edge.m in Sources */, + 558F18C6117B031C009863B2 /* Graph.m in Sources */, + 558F18C7117B031C009863B2 /* GraphChange.m in Sources */, + 7F7B6DF418DE0D7A004F6CA8 /* CustomNodeCellView.m in Sources */, + 558F18C8117B031C009863B2 /* GraphElementData.m in Sources */, + 558F18C9117B031C009863B2 /* Node.m in Sources */, + 558F18CA117B031C009863B2 /* NodeStyle.m in Sources */, + 558F18CE117B03DD009863B2 /* main.m in Sources */, + 558F18CF117B03DD009863B2 /* util.m in Sources */, + 558F18F7117B043C009863B2 /* AppDelegate.m in Sources */, + 558F18F9117B043C009863B2 /* EdgeControlLayer.m in Sources */, + 558F18FA117B043C009863B2 /* GraphicsView.m in Sources */, + 7F73438A184AC559002897D0 /* DraggablePDFView.m in Sources */, + 558F18FB117B043C009863B2 /* Grid.m in Sources */, + 558F18FC117B043C009863B2 /* NodeLayer.m in Sources */, + 558F18FD117B043C009863B2 /* NodeSelectionLayer.m in Sources */, + 558F18FF117B043C009863B2 /* SelectableCollectionViewItem.m in Sources */, + 558F1900117B043C009863B2 /* SelectableNodeView.m in Sources */, + 558F1901117B043C009863B2 /* StylePaletteController.m in Sources */, + 558F1902117B043C009863B2 /* TikzDocument.m in Sources */, + 558F1903117B043C009863B2 /* TikzSourceController.m in Sources */, + 558F1904117B043C009863B2 /* ToolPaletteController.m in Sources */, + 5585E5C2117F681800124513 /* NodeStyle+Coder.m in Sources */, + 55F9585C1181B09600F99434 /* PickSupport.m in Sources */, + 55F9585D1181B09600F99434 /* Transformer.m in Sources */, + 55D2E0B21186ED950060B4EC /* Graph+Coder.m in Sources */, + 5589A9FF11C51E780064D310 /* TikzGraphAssembler.m in Sources */, + 7F7B6DF518DE0D7A004F6CA8 /* CustomNodeController.m in Sources */, + 5589AD4411C633EE0064D310 /* SelectBoxLayer.m in Sources */, + 559EFB6811CB88E300D020F4 /* ColorRGB.m in Sources */, + 5573B8C211D9FD3200B5DC5D /* PreviewController.m in Sources */, + 5573B90F11DA231A00B5DC5D /* PreambleController.m in Sources */, + 5573B92911DA292F00B5DC5D /* Preambles.m in Sources */, + 5573BDCB11DB4D2600B5DC5D /* Preambles+Coder.m in Sources */, + 55F9E04511FF54F000F5659E /* NSString+LatexConstants.m in Sources */, + 55CA997212F08281008F0368 /* TikzWindowController.m in Sources */, + 55CA9AC912F831E5008F0368 /* RColor.m in Sources */, + 552202C5135F15FD007EA086 /* MultiField.m in Sources */, + 55900AA2135FA918002DD28E /* MultiCombo.m in Sources */, + 555ECE9B1378A3AA0052DB71 /* CALayer+DrawLabel.m in Sources */, + 55391B0A13D32765007DBE71 /* PropertyInspectorController.m in Sources */, + 55652DF913E1F2030023F4C6 /* SupportDir.m in Sources */, + 55652E3B13E1FAEE0023F4C6 /* CircleShape.m in Sources */, + 55652E3C13E1FAEE0023F4C6 /* RectangleShape.m in Sources */, + 55652E3D13E1FAEE0023F4C6 /* RegularPolyShape.m in Sources */, + 55652E3E13E1FAEE0023F4C6 /* TikzShape.m in Sources */, + 55652E4113E1FB0A0023F4C6 /* Shape.m in Sources */, + 55432E061444BF2D00401BB3 /* GraphElementProperty.m in Sources */, + 55397C7914498C22006942FB /* EdgeStyle.m in Sources */, + 55397C7C144990EA006942FB /* EdgeStyle+Coder.m in Sources */, + 55397C7F144999C4006942FB /* PropertyHolder.m in Sources */, + 553A4C5A144ED3D500AA6FAC /* NilToEmptyStringTransformer.m in Sources */, + 55598E351635372E0023450A /* DiamondShape.m in Sources */, + 7FEED45716B1A7C500B056CB /* StyleManager.m in Sources */, + 7FB9BFEE16B57C2E00773146 /* TikzFormatter.m in Sources */, + 7F781C1A16B5DE1400239826 /* ParseErrorView.m in Sources */, + 7F90E88616DD29600069EBCD /* NSString+Tikz.m in Sources */, + 7F90E88D16DD47540069EBCD /* PreferenceController.m in Sources */, + 7F18A321184C577000BC3081 /* UpdatePreferenceController.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 5504C91B11D36CD5002A1478 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 8D15AC270486D014006FF6A4 /* TikZiT */; + targetProxy = 5504C91A11D36CD5002A1478 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + 089C165FFE840EACC02AAC07 /* InfoPlist.strings */ = { + isa = PBXVariantGroup; + children = ( + 089C1660FE840EACC02AAC07 /* English */, + ); + name = InfoPlist.strings; + sourceTree = ""; + }; + 1DDD58280DA1D0D100B32029 /* TikzDocument.xib */ = { + isa = PBXVariantGroup; + children = ( + 1DDD58290DA1D0D100B32029 /* English */, + ); + name = TikzDocument.xib; + sourceTree = ""; + }; + 1DDD582A0DA1D0D100B32029 /* MainMenu.xib */ = { + isa = PBXVariantGroup; + children = ( + 1DDD582B0DA1D0D100B32029 /* English */, + ); + name = MainMenu.xib; + sourceTree = ""; + }; + 2A37F4B9FDCFA73011CA2CEA /* Credits.rtf */ = { + isa = PBXVariantGroup; + children = ( + 2A37F4BAFDCFA73011CA2CEA /* English */, + ); + name = Credits.rtf; + sourceTree = ""; + }; + 55391AF513D324FE007DBE71 /* Preview.xib */ = { + isa = PBXVariantGroup; + children = ( + 5573B8BD11D9FCD400B5DC5D /* English */, + ); + name = Preview.xib; + sourceTree = ""; + }; + 55391AF713D3250F007DBE71 /* Preamble.xib */ = { + isa = PBXVariantGroup; + children = ( + 5573B91011DA233E00B5DC5D /* English */, + ); + name = Preamble.xib; + sourceTree = ""; + }; + 55391B0013D32608007DBE71 /* PropertyInspector.xib */ = { + isa = PBXVariantGroup; + children = ( + 55391B0113D32608007DBE71 /* English */, + ); + name = PropertyInspector.xib; + sourceTree = ""; + }; + 556979421168747B007E5703 /* StylePalette.xib */ = { + isa = PBXVariantGroup; + children = ( + 55D947301165A5D40044178C /* English */, + ); + name = StylePalette.xib; + sourceTree = ""; + }; + 7F90E88F16DD54440069EBCD /* UserDefaults.plist */ = { + isa = PBXVariantGroup; + children = ( + 7F90E89016DD54440069EBCD /* English */, + ); + name = UserDefaults.plist; + sourceTree = ""; + }; + 7FD5D44918E1CB5300E2A930 /* CustomNodes.xib */ = { + isa = PBXVariantGroup; + children = ( + 7FD5D44A18E1CB5300E2A930 /* English */, + ); + name = CustomNodes.xib; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 5589AA6711C5429E0064D310 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/Frameworks\"", + ); + GCC_DYNAMIC_NO_PIC = NO; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; + INSTALL_PATH = /usr/local/bin; + OTHER_LDFLAGS = ( + "-framework", + Foundation, + "-framework", + AppKit, + ); + PRODUCT_NAME = tests; + SDKROOT = macosx; + }; + name = Debug; + }; + 5589AA6811C5429E0064D310 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/Frameworks\"", + ); + GCC_MODEL_TUNING = G5; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; + INSTALL_PATH = /usr/local/bin; + OTHER_LDFLAGS = ( + "-framework", + Foundation, + "-framework", + AppKit, + ); + PRODUCT_NAME = tests; + SDKROOT = macosx; + ZERO_LINK = NO; + }; + name = Release; + }; + C05733C808A9546B00998B17 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CLANG_ENABLE_OBJC_ARC = YES; + COMBINE_HIDPI_IMAGES = YES; + COPY_PHASE_STRIP = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)\"", + "\"$(SRCROOT)/Frameworks\"", + ); + GCC_DYNAMIC_NO_PIC = NO; + GCC_MODEL_TUNING = G5; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = TikZiT_Prefix.pch; + INFOPLIST_FILE = "TikZiT-Info.plist"; + INSTALL_PATH = "$(HOME)/Applications"; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.7; + PRODUCT_NAME = TikZiT; + SDKROOT = macosx; + }; + name = Debug; + }; + C05733C908A9546B00998B17 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CLANG_ENABLE_OBJC_ARC = YES; + COMBINE_HIDPI_IMAGES = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)\"", + "\"$(SRCROOT)/Frameworks\"", + ); + GCC_MODEL_TUNING = G5; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = TikZiT_Prefix.pch; + INFOPLIST_FILE = "TikZiT-Info.plist"; + INSTALL_PATH = "$(HOME)/Applications"; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.7; + PRODUCT_NAME = TikZiT; + SDKROOT = macosx; + }; + name = Release; + }; + C05733CC08A9546B00998B17 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = ""; + MACOSX_DEPLOYMENT_TARGET = 10.5; + ONLY_ACTIVE_ARCH = YES; + PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO; + SDKROOT = macosx; + SYMROOT = xbuild; + USER_HEADER_SEARCH_PATHS = "src/osx src/common"; + VALID_ARCHS = "i386 x86_64"; + }; + name = Debug; + }; + C05733CD08A9546B00998B17 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = ""; + MACOSX_DEPLOYMENT_TARGET = 10.5; + ONLY_ACTIVE_ARCH = NO; + PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO; + SDKROOT = macosx; + SYMROOT = xbuild; + USER_HEADER_SEARCH_PATHS = "src/osx src/common"; + VALID_ARCHS = "i386 x86_64"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 5589AA8311C543240064D310 /* Build configuration list for PBXNativeTarget "tests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 5589AA6711C5429E0064D310 /* Debug */, + 5589AA6811C5429E0064D310 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + C05733C708A9546B00998B17 /* Build configuration list for PBXNativeTarget "TikZiT" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + C05733C808A9546B00998B17 /* Debug */, + C05733C908A9546B00998B17 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + C05733CB08A9546B00998B17 /* Build configuration list for PBXProject "TikZiT" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + C05733CC08A9546B00998B17 /* Debug */, + C05733CD08A9546B00998B17 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 2A37F4A9FDCFA73011CA2CEA /* Project object */; +} diff --git a/tikzit-old/TikZiT.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/tikzit-old/TikZiT.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..82f3c48 --- /dev/null +++ b/tikzit-old/TikZiT.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/tikzit-old/TikZiT.xcodeproj/project.xcworkspace/xcshareddata/TikZiT.xccheckout b/tikzit-old/TikZiT.xcodeproj/project.xcworkspace/xcshareddata/TikZiT.xccheckout new file mode 100644 index 0000000..c3ec4fe --- /dev/null +++ b/tikzit-old/TikZiT.xcodeproj/project.xcworkspace/xcshareddata/TikZiT.xccheckout @@ -0,0 +1,37 @@ + + + + + IDESourceControlProjectFavoriteDictionaryKey + + IDESourceControlProjectIdentifier + 26857C1F-E0FE-4FFB-BDAC-44158C649772 + IDESourceControlProjectOriginsDictionary + + F6FA2C351D428A0F1026539971510A626DEEFF59 + https://github.com/tikzit/tikzit.git + + IDESourceControlProjectRelativeInstallPathDictionary + + F6FA2C351D428A0F1026539971510A626DEEFF59 + TikZiT/ + + IDESourceControlProjectURL + https://github.com/tikzit/tikzit.git + IDESourceControlProjectVersion + 111 + IDESourceControlProjectWCCIdentifier + F6FA2C351D428A0F1026539971510A626DEEFF59 + IDESourceControlProjectWCConfigurations + + + IDESourceControlRepositoryExtensionIdentifierKey + public.vcs.git + IDESourceControlWCCIdentifierKey + F6FA2C351D428A0F1026539971510A626DEEFF59 + IDESourceControlWCCName + TikZiT + + + + diff --git a/tikzit-old/TikZiT.xcodeproj/project.xcworkspace/xcuserdata/aleks.xcuserdatad/UserInterfaceState.xcuserstate b/tikzit-old/TikZiT.xcodeproj/project.xcworkspace/xcuserdata/aleks.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000..99a5997 --- /dev/null +++ b/tikzit-old/TikZiT.xcodeproj/project.xcworkspace/xcuserdata/aleks.xcuserdatad/UserInterfaceState.xcuserstate @@ -0,0 +1,24539 @@ + + + + + $archiver + NSKeyedArchiver + $objects + + $null + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 2 + + + CF$UID + 3 + + + CF$UID + 4 + + + CF$UID + 5 + + + NS.objects + + + CF$UID + 6 + + + CF$UID + 194 + + + CF$UID + 441 + + + CF$UID + 533 + + + + 5D4A1A9F-B7F3-4B80-B1F2-42874F168C6C + FCF6616B-37CA-49A5-B7DD-7EC65F973E7D + E8D758DD-8E38-40E4-B712-F6B0919F77C9 + IDEWorkspaceDocument + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 7 + + + CF$UID + 8 + + + CF$UID + 9 + + + CF$UID + 10 + + + CF$UID + 11 + + + CF$UID + 12 + + + CF$UID + 13 + + + CF$UID + 14 + + + NS.objects + + + CF$UID + 15 + + + CF$UID + 192 + + + CF$UID + 193 + + + CF$UID + 25 + + + CF$UID + 2 + + + CF$UID + 7 + + + CF$UID + 25 + + + CF$UID + 25 + + + + IDEWorkspaceTabController_255C042C-F813-417B-AD8A-811609B9E1F2 + IDEWindowFrame + IDEOrderedWorkspaceTabControllers + IDEWindowInFullscreenMode + IDEWorkspaceWindowControllerUniqueIdentifier + IDEActiveWorkspaceTabController + IDEWindowToolbarIsVisible + IDEWindowTabBarIsVisible + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 16 + + + CF$UID + 17 + + + CF$UID + 18 + + + CF$UID + 19 + + + CF$UID + 20 + + + CF$UID + 21 + + + CF$UID + 22 + + + CF$UID + 23 + + + NS.objects + + + CF$UID + 24 + + + CF$UID + 25 + + + CF$UID + 26 + + + CF$UID + 27 + + + CF$UID + 40 + + + CF$UID + 78 + + + CF$UID + 25 + + + CF$UID + 87 + + + + IDETabLabel + IDEShowNavigator + AssistantEditorsLayout + IDEWorkspaceTabControllerUtilityAreaSplitView + IDENavigatorArea + IDEWorkspaceTabControllerDesignAreaSplitView + IDEShowUtilities + IDEEditorArea + Graph.m + + 0 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 28 + + + NS.objects + + + CF$UID + 29 + + + + DVTSplitViewItems + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 30 + + + CF$UID + 36 + + + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 33 + + + CF$UID + 34 + + + + DVTIdentifier + DVTViewMagnitude + + 127 + + $classes + + NSDictionary + NSObject + + $classname + NSDictionary + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 33 + + + CF$UID + 37 + + + + 473 + + $classes + + NSMutableArray + NSArray + NSObject + + $classname + NSMutableArray + + + $classes + + NSMutableDictionary + NSDictionary + NSObject + + $classname + NSMutableDictionary + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 41 + + + CF$UID + 42 + + + NS.objects + + + CF$UID + 42 + + + CF$UID + 43 + + + + SelectedNavigator + Xcode.IDEKit.Navigator.Structure + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 44 + + + CF$UID + 45 + + + CF$UID + 46 + + + CF$UID + 47 + + + CF$UID + 48 + + + CF$UID + 49 + + + CF$UID + 50 + + + NS.objects + + + CF$UID + 51 + + + CF$UID + 25 + + + CF$UID + 52 + + + CF$UID + 25 + + + CF$UID + 25 + + + CF$UID + 54 + + + CF$UID + 61 + + + + IDEVisibleRect + IDEUnsavedDocumentFilteringEnabled + IDENavigatorExpandedItemsBeforeFilteringSet + IDERecentDocumentFilteringEnabled + IDESCMStatusFilteringEnabled + IDESelectedObjects + IDEExpandedItemsSet + {{0, 0}, {0, 0}} + + $class + + CF$UID + 53 + + NS.objects + + + + $classes + + NSSet + NSObject + + $classname + NSSet + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 55 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 56 + + + CF$UID + 57 + + + CF$UID + 58 + + + CF$UID + 59 + + + + TikZiT + TikZiT + Graph + Graph.m + + $classes + + NSArray + NSObject + + $classname + NSArray + + + $class + + CF$UID + 53 + + NS.objects + + + CF$UID + 62 + + + CF$UID + 63 + + + CF$UID + 65 + + + CF$UID + 66 + + + CF$UID + 68 + + + CF$UID + 72 + + + CF$UID + 73 + + + CF$UID + 75 + + + CF$UID + 76 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 56 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 56 + + + CF$UID + 64 + + + + Resources + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 56 + + + CF$UID + 57 + + + CF$UID + 58 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 56 + + + CF$UID + 57 + + + CF$UID + 67 + + + + Parser + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 56 + + + CF$UID + 69 + + + CF$UID + 70 + + + CF$UID + 71 + + + + Frameworks + Linked Frameworks + SFBInspectors.framework + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 56 + + + CF$UID + 69 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 56 + + + CF$UID + 64 + + + CF$UID + 74 + + + + shapes + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 56 + + + CF$UID + 69 + + + CF$UID + 70 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 56 + + + CF$UID + 77 + + + + Other Sources + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 28 + + + NS.objects + + + CF$UID + 79 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 80 + + + CF$UID + 82 + + + CF$UID + 84 + + + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 20 + + + CF$UID + 81 + + + + 225 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 23 + + + CF$UID + 83 + + + + 815 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 85 + + + CF$UID + 86 + + + + IDEUtilitiesArea + 260 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 88 + + + CF$UID + 89 + + + CF$UID + 90 + + + CF$UID + 91 + + + CF$UID + 92 + + + CF$UID + 93 + + + CF$UID + 94 + + + CF$UID + 95 + + + NS.objects + + + CF$UID + 96 + + + CF$UID + 116 + + + CF$UID + 156 + + + CF$UID + 182 + + + CF$UID + 26 + + + CF$UID + 183 + + + CF$UID + 191 + + + CF$UID + 25 + + + + layoutTree + IDEEditorMode_Standard + IDEEDitorArea_DebugArea + IDEShowEditor + EditorMode + DebuggerSplitView + DefaultPersistentRepresentations + ShowDebuggerArea + + $class + + CF$UID + 115 + + geniusEditorContextNode + + CF$UID + 0 + + primaryEditorContextNode + + CF$UID + 97 + + rootLayoutTreeNode + + CF$UID + 112 + + + + $class + + CF$UID + 114 + + children + + CF$UID + 0 + + contentType + 1 + documentArchivableRepresentation + + CF$UID + 98 + + orientation + 0 + parent + + CF$UID + 112 + + + + $class + + CF$UID + 111 + + DocumentLocation + + CF$UID + 107 + + DomainIdentifier + + CF$UID + 99 + + IdentifierPath + + CF$UID + 100 + + IndexOfDocumentIdentifier + + CF$UID + 26 + + + Xcode.IDENavigableItemDomain.WorkspaceStructure + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 101 + + + CF$UID + 103 + + + CF$UID + 104 + + + CF$UID + 105 + + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 59 + + + + $classes + + IDEArchivableStringIndexPair + NSObject + + $classname + IDEArchivableStringIndexPair + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 58 + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 57 + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 106 + + + TikZiT + + $class + + CF$UID + 110 + + documentURL + + CF$UID + 108 + + timestamp + + CF$UID + 0 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/git/tikzit/tikzit/src/common/Graph.m + + + $classes + + NSMutableString + NSString + NSObject + + $classname + NSMutableString + + + $classes + + DVTDocumentLocation + NSObject + + $classname + DVTDocumentLocation + + + $classes + + IDENavigableItemArchivableRepresentation + NSObject + + $classname + IDENavigableItemArchivableRepresentation + + + $class + + CF$UID + 114 + + children + + CF$UID + 113 + + contentType + 0 + documentArchivableRepresentation + + CF$UID + 0 + + orientation + 0 + parent + + CF$UID + 0 + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 97 + + + + + $classes + + IDEWorkspaceTabControllerLayoutTreeNode + NSObject + + $classname + IDEWorkspaceTabControllerLayoutTreeNode + + + $classes + + IDEWorkspaceTabControllerLayoutTree + NSObject + + $classname + IDEWorkspaceTabControllerLayoutTree + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 117 + + + NS.objects + + + CF$UID + 118 + + + + EditorLayout_PersistentRepresentation + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 119 + + + NS.objects + + + CF$UID + 120 + + + + Main + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 121 + + + CF$UID + 122 + + + CF$UID + 123 + + + NS.objects + + + CF$UID + 124 + + + CF$UID + 26 + + + CF$UID + 154 + + + + EditorLayout_StateSavingStateDictionaries + EditorLayout_Selected + EditorLayout_Geometry + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 125 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 126 + + + CF$UID + 127 + + + CF$UID + 128 + + + CF$UID + 129 + + + CF$UID + 130 + + + CF$UID + 131 + + + CF$UID + 132 + + + NS.objects + + + CF$UID + 133 + + + CF$UID + 134 + + + CF$UID + 141 + + + CF$UID + 149 + + + CF$UID + 59 + + + CF$UID + 150 + + + CF$UID + 151 + + + + FileDataType + ArchivableRepresentation + EditorState + NavigableItemName + DocumentNavigableItemName + DocumentExtensionIdentifier + DocumentURL + public.objective-c-source + + $class + + CF$UID + 111 + + DocumentLocation + + CF$UID + 107 + + DomainIdentifier + + CF$UID + 99 + + IdentifierPath + + CF$UID + 135 + + IndexOfDocumentIdentifier + + CF$UID + 26 + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 136 + + + CF$UID + 137 + + + CF$UID + 138 + + + CF$UID + 139 + + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 59 + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 58 + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 57 + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 140 + + + TikZiT + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 142 + + + CF$UID + 143 + + + CF$UID + 144 + + + CF$UID + 145 + + + NS.objects + + + CF$UID + 146 + + + CF$UID + 147 + + + CF$UID + 25 + + + CF$UID + 148 + + + + PrimaryDocumentTimestamp + PrimaryDocumentVisibleCharacterRange + HideAllIssues + PrimaryDocumentSelectedCharacterRange + 381083683.77450001 + {18089, 1176} + {19467, 0} + -tikz + Xcode.IDEKit.EditorDocument.SourceCode + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 152 + + + file://localhost/Users/aleks/git/tikzit/tikzit/src/common/Graph.m + + $classes + + NSURL + NSObject + + $classname + NSURL + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 155 + + + + {{0, 0}, {600, 600}} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 157 + + + CF$UID + 158 + + + CF$UID + 159 + + + CF$UID + 160 + + + CF$UID + 161 + + + CF$UID + 162 + + + NS.objects + + + CF$UID + 163 + + + CF$UID + 164 + + + CF$UID + 166 + + + CF$UID + 163 + + + CF$UID + 168 + + + CF$UID + 176 + + + + LayoutFocusMode + console + variables + LayoutMode + IDEDebugArea_SplitView + IDEDebuggerAreaSplitView + 1 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 165 + + + NS.objects + + + CF$UID + 26 + + + + ConsoleFilterMode + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 167 + + + NS.objects + + + CF$UID + 163 + + + + VariablesViewSelectedScope + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 28 + + + NS.objects + + + CF$UID + 169 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 170 + + + CF$UID + 173 + + + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 171 + + + CF$UID + 172 + + + + VariablesView + 301 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 174 + + + CF$UID + 175 + + + + ConsoleArea + 298 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 28 + + + NS.objects + + + CF$UID + 177 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 178 + + + CF$UID + 180 + + + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 171 + + + CF$UID + 179 + + + + 301 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 174 + + + CF$UID + 181 + + + + 298 + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 28 + + + NS.objects + + + CF$UID + 184 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 185 + + + CF$UID + 188 + + + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 186 + + + CF$UID + 187 + + + + IDEEditor + 203 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 189 + + + CF$UID + 190 + + + + IDEDebuggerArea + 115 + + $class + + CF$UID + 39 + + NS.keys + + NS.objects + + + {{264, 446}, {600, 624}} + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 7 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 8 + + + CF$UID + 9 + + + CF$UID + 195 + + + CF$UID + 10 + + + CF$UID + 196 + + + CF$UID + 12 + + + CF$UID + 13 + + + CF$UID + 14 + + + NS.objects + + + CF$UID + 197 + + + CF$UID + 198 + + + CF$UID + 199 + + + CF$UID + 25 + + + CF$UID + 3 + + + CF$UID + 195 + + + CF$UID + 182 + + + CF$UID + 25 + + + + IDEWorkspaceTabController_9038AF6D-AD9C-4682-ADF8-6CB1A302CFE7 + IDEWorkspaceWindowControllerUniqueIdentifier + {{447, 347}, {1300, 786}} + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 195 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 18 + + + CF$UID + 17 + + + CF$UID + 16 + + + CF$UID + 19 + + + CF$UID + 20 + + + CF$UID + 21 + + + CF$UID + 22 + + + CF$UID + 23 + + + NS.objects + + + CF$UID + 26 + + + CF$UID + 182 + + + CF$UID + 200 + + + CF$UID + 201 + + + CF$UID + 207 + + + CF$UID + 281 + + + CF$UID + 182 + + + CF$UID + 289 + + + + Graph.m + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 28 + + + NS.objects + + + CF$UID + 202 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 203 + + + CF$UID + 205 + + + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 33 + + + CF$UID + 204 + + + + 403 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 33 + + + CF$UID + 206 + + + + 307 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 208 + + + CF$UID + 41 + + + CF$UID + 209 + + + CF$UID + 210 + + + CF$UID + 211 + + + CF$UID + 42 + + + CF$UID + 212 + + + NS.objects + + + CF$UID + 213 + + + CF$UID + 42 + + + CF$UID + 224 + + + CF$UID + 241 + + + CF$UID + 247 + + + CF$UID + 258 + + + CF$UID + 273 + + + + Xcode.IDEKit.Navigator.Symbol + Xcode.IDEKit.Navigator.Issues + Xcode.IDEKit.Navigator.Debug + Xcode.IDEKit.Navigator.Breakpoints + Xcode.IDEKit.Navigator.Logs + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 214 + + + CF$UID + 215 + + + CF$UID + 216 + + + CF$UID + 217 + + + CF$UID + 218 + + + CF$UID + 219 + + + CF$UID + 220 + + + NS.objects + + + CF$UID + 182 + + + CF$UID + 182 + + + CF$UID + 25 + + + CF$UID + 182 + + + CF$UID + 221 + + + CF$UID + 222 + + + CF$UID + 223 + + + + IDESymbolNavigatorShowWorkspaceOnly + IDESymbolNavigatorShowHierarchy + IDESymbolNavigatorShowContainersOnly + IDESymbolNavigatorShowClassesOnly + IDESymbolNamePatternString + IDESymbolNavigatorSelectedSymbols + IDEExpandedItems + + + $class + + CF$UID + 38 + + NS.objects + + + + $class + + CF$UID + 38 + + NS.objects + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 225 + + + CF$UID + 226 + + + CF$UID + 227 + + + CF$UID + 228 + + + CF$UID + 229 + + + CF$UID + 230 + + + CF$UID + 231 + + + CF$UID + 232 + + + CF$UID + 233 + + + NS.objects + + + CF$UID + 25 + + + CF$UID + 234 + + + CF$UID + 235 + + + CF$UID + 237 + + + CF$UID + 238 + + + CF$UID + 25 + + + CF$UID + 239 + + + CF$UID + 25 + + + CF$UID + 240 + + + + IDEErrorFilteringEnabled + IDEVisibleRect + IDECollapsedFiles + IDEExpandedIssues + IDESelectedNavigables + IDEShowsByType + IDECollapsedTypes + IDERecentFilteringEnabled + IDECollapsedGroups + {{0, 0}, {209, 644}} + + $class + + CF$UID + 236 + + NS.objects + + + + $classes + + NSMutableSet + NSSet + NSObject + + $classname + NSMutableSet + + + $class + + CF$UID + 236 + + NS.objects + + + + $class + + CF$UID + 38 + + NS.objects + + + + $class + + CF$UID + 236 + + NS.objects + + + + $class + + CF$UID + 236 + + NS.objects + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 242 + + + CF$UID + 243 + + + CF$UID + 244 + + + NS.objects + + + CF$UID + 245 + + + CF$UID + 246 + + + CF$UID + 25 + + + + IDEStackCompressionValue + IDEThreadOrQueueMode + IDEShowOnlyInterestingContent + 2 + 0 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 248 + + + CF$UID + 249 + + + CF$UID + 250 + + + CF$UID + 251 + + + NS.objects + + + CF$UID + 52 + + + CF$UID + 25 + + + CF$UID + 252 + + + CF$UID + 257 + + + + IDECollapsedtemsSet + IDEBreakpointNavigatorFilterOnEnabled + IDESelectedObjects + IDEVisibleRect + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 253 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 254 + + + CF$UID + 255 + + + CF$UID + 256 + + + + TikZiT + SelectableNodeView.m + -setNodeStyle: + {{0, 0}, {224, 686}} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 44 + + + CF$UID + 45 + + + CF$UID + 46 + + + CF$UID + 47 + + + CF$UID + 48 + + + CF$UID + 49 + + + CF$UID + 50 + + + NS.objects + + + CF$UID + 259 + + + CF$UID + 25 + + + CF$UID + 52 + + + CF$UID + 25 + + + CF$UID + 25 + + + CF$UID + 260 + + + CF$UID + 263 + + + + {{0, 0}, {209, 666}} + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 261 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 262 + + + CF$UID + 57 + + + CF$UID + 58 + + + CF$UID + 59 + + + + TikZiT + + $class + + CF$UID + 53 + + NS.objects + + + CF$UID + 264 + + + CF$UID + 265 + + + CF$UID + 266 + + + CF$UID + 267 + + + CF$UID + 268 + + + CF$UID + 269 + + + CF$UID + 270 + + + CF$UID + 271 + + + CF$UID + 272 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 262 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 262 + + + CF$UID + 64 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 262 + + + CF$UID + 57 + + + CF$UID + 67 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 262 + + + CF$UID + 69 + + + CF$UID + 70 + + + CF$UID + 71 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 262 + + + CF$UID + 64 + + + CF$UID + 74 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 262 + + + CF$UID + 69 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 262 + + + CF$UID + 77 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 262 + + + CF$UID + 57 + + + CF$UID + 58 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 262 + + + CF$UID + 69 + + + CF$UID + 70 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 274 + + + CF$UID + 275 + + + CF$UID + 276 + + + CF$UID + 277 + + + NS.objects + + + CF$UID + 278 + + + CF$UID + 279 + + + CF$UID + 25 + + + CF$UID + 280 + + + + IDELogNavigatorExpandedItemsStateKey + IDELogNavigatorSelectedObjectsStateKey + IDELogNavigatorRecentFilterStateKey + IDELogNavigatorVisibleRectStateKey + + $class + + CF$UID + 38 + + NS.objects + + + + $class + + CF$UID + 38 + + NS.objects + + + {{0, 0}, {464, 738}} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 28 + + + NS.objects + + + CF$UID + 282 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 283 + + + CF$UID + 285 + + + CF$UID + 287 + + + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 20 + + + CF$UID + 284 + + + + 225 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 23 + + + CF$UID + 286 + + + + 815 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 85 + + + CF$UID + 288 + + + + 260 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 95 + + + CF$UID + 89 + + + CF$UID + 90 + + + CF$UID + 91 + + + CF$UID + 92 + + + CF$UID + 290 + + + CF$UID + 93 + + + CF$UID + 94 + + + CF$UID + 291 + + + CF$UID + 88 + + + NS.objects + + + CF$UID + 182 + + + CF$UID + 292 + + + CF$UID + 314 + + + CF$UID + 182 + + + CF$UID + 26 + + + CF$UID + 329 + + + CF$UID + 368 + + + CF$UID + 374 + + + CF$UID + 375 + + + CF$UID + 430 + + + + IDEEditorMode_Version + IDEEditorMode_Genius + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 117 + + + NS.objects + + + CF$UID + 293 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 119 + + + NS.objects + + + CF$UID + 294 + + + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 121 + + + CF$UID + 122 + + + CF$UID + 123 + + + NS.objects + + + CF$UID + 295 + + + CF$UID + 26 + + + CF$UID + 312 + + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 296 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 126 + + + CF$UID + 127 + + + CF$UID + 128 + + + CF$UID + 129 + + + CF$UID + 130 + + + CF$UID + 131 + + + CF$UID + 132 + + + NS.objects + + + CF$UID + 133 + + + CF$UID + 297 + + + CF$UID + 306 + + + CF$UID + 149 + + + CF$UID + 59 + + + CF$UID + 150 + + + CF$UID + 310 + + + + + $class + + CF$UID + 111 + + DocumentLocation + + CF$UID + 305 + + DomainIdentifier + + CF$UID + 298 + + IdentifierPath + + CF$UID + 299 + + IndexOfDocumentIdentifier + + CF$UID + 26 + + + Xcode.IDENavigableItemDomain.WorkspaceStructure + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 300 + + + CF$UID + 301 + + + CF$UID + 302 + + + CF$UID + 303 + + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 59 + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 58 + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 57 + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 304 + + + TikZiT + + $class + + CF$UID + 110 + + documentURL + + CF$UID + 108 + + timestamp + + CF$UID + 0 + + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 142 + + + CF$UID + 143 + + + CF$UID + 144 + + + CF$UID + 145 + + + NS.objects + + + CF$UID + 307 + + + CF$UID + 308 + + + CF$UID + 25 + + + CF$UID + 309 + + + + 381083686.29558802 + {18344, 1251} + {19467, 0} + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 311 + + + file://localhost/Users/aleks/git/tikzit/tikzit/src/common/Graph.m + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 313 + + + + {{0, 0}, {815, 588}} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 157 + + + CF$UID + 158 + + + CF$UID + 161 + + + CF$UID + 160 + + + CF$UID + 162 + + + CF$UID + 159 + + + NS.objects + + + CF$UID + 163 + + + CF$UID + 315 + + + CF$UID + 316 + + + CF$UID + 163 + + + CF$UID + 322 + + + CF$UID + 328 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 165 + + + NS.objects + + + CF$UID + 26 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 28 + + + NS.objects + + + CF$UID + 317 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 318 + + + CF$UID + 320 + + + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 171 + + + CF$UID + 319 + + + + 389 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 174 + + + CF$UID + 321 + + + + 425 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 28 + + + NS.objects + + + CF$UID + 323 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 324 + + + CF$UID + 326 + + + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 171 + + + CF$UID + 325 + + + + 389 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 174 + + + CF$UID + 327 + + + + 425 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 167 + + + NS.objects + + + CF$UID + 26 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 330 + + + CF$UID + 331 + + + NS.objects + + + CF$UID + 246 + + + CF$UID + 332 + + + + VersionsEditorSubmode + EditorLayout_PersistentRepresentation + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 333 + + + NS.objects + + + CF$UID + 334 + + + + Main + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 335 + + + CF$UID + 336 + + + CF$UID + 337 + + + NS.objects + + + CF$UID + 338 + + + CF$UID + 246 + + + CF$UID + 366 + + + + EditorLayout_StateSavingStateDictionaries + EditorLayout_Selected + EditorLayout_Geometry + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 339 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 340 + + + CF$UID + 341 + + + CF$UID + 342 + + + CF$UID + 343 + + + CF$UID + 344 + + + CF$UID + 345 + + + CF$UID + 346 + + + NS.objects + + + CF$UID + 347 + + + CF$UID + 348 + + + CF$UID + 356 + + + CF$UID + 351 + + + CF$UID + 351 + + + CF$UID + 363 + + + CF$UID + 364 + + + + FileDataType + ArchivableRepresentation + EditorState + NavigableItemName + DocumentNavigableItemName + DocumentExtensionIdentifier + DocumentURL + com.apple.xml-property-list + + $class + + CF$UID + 111 + + DocumentLocation + + CF$UID + 354 + + DomainIdentifier + + CF$UID + 298 + + IdentifierPath + + CF$UID + 349 + + IndexOfDocumentIdentifier + + CF$UID + 26 + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 350 + + + CF$UID + 352 + + + CF$UID + 353 + + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 351 + + + TikZiT-Info.plist + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 64 + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 254 + + + + $class + + CF$UID + 110 + + documentURL + + CF$UID + 355 + + timestamp + + CF$UID + 0 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/TikZiT-Info.plist + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 357 + + + CF$UID + 358 + + + CF$UID + 359 + + + NS.objects + + + CF$UID + 360 + + + CF$UID + 361 + + + CF$UID + 362 + + + + PrimaryDocumentSelectedCharacterRange + PrimaryDocumentVisibleCharacterRange + PrimaryDocumentTimestamp + {0, 0} + {0, 1053} + 348502952.18491101 + Xcode.IDEKit.EditorDocument.SourceCode-from-Plist + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 365 + + + file://localhost/Users/aleks/svn/tikzit/tikzit/TikZiT-Info.plist + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 367 + + + + {{0, 0}, {815, 602}} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 28 + + + NS.objects + + + CF$UID + 369 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 370 + + + CF$UID + 372 + + + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 186 + + + CF$UID + 371 + + + + 610 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 189 + + + CF$UID + 373 + + + + 100 + + $class + + CF$UID + 39 + + NS.keys + + NS.objects + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 376 + + + CF$UID + 331 + + + NS.objects + + + CF$UID + 377 + + + CF$UID + 378 + + + + SplitPosition + 0.4993864893913269 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 379 + + + CF$UID + 333 + + + NS.objects + + + CF$UID + 380 + + + CF$UID + 409 + + + + Alternate + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 335 + + + CF$UID + 336 + + + CF$UID + 337 + + + NS.objects + + + CF$UID + 381 + + + CF$UID + 246 + + + CF$UID + 407 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 382 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 340 + + + CF$UID + 341 + + + CF$UID + 342 + + + CF$UID + 343 + + + CF$UID + 344 + + + CF$UID + 345 + + + CF$UID + 346 + + + NS.objects + + + CF$UID + 383 + + + CF$UID + 384 + + + CF$UID + 399 + + + CF$UID + 387 + + + CF$UID + 387 + + + CF$UID + 404 + + + CF$UID + 405 + + + + public.c-header + + $class + + CF$UID + 111 + + DocumentLocation + + CF$UID + 397 + + DomainIdentifier + + CF$UID + 0 + + IdentifierPath + + CF$UID + 385 + + IndexOfDocumentIdentifier + + CF$UID + 26 + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 386 + + + CF$UID + 388 + + + CF$UID + 390 + + + CF$UID + 391 + + + CF$UID + 394 + + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 387 + + + Graph.h + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 389 + + + Graph + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 254 + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 392 + + + CF$UID + 393 + + + NS.objects + + + CF$UID + 298 + + + CF$UID + 254 + + + + manualDomainIdentifier + navigableItem_name + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 395 + + + NS.objects + + + CF$UID + 396 + + + + identifier + Xcode.IDEKit.GeniusCategory.Manual + + $class + + CF$UID + 110 + + documentURL + + CF$UID + 398 + + timestamp + + CF$UID + 0 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/Graph.h + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 401 + + + CF$UID + 402 + + + CF$UID + 25 + + + CF$UID + 403 + + + + HideAllIssues + 348502936.56562501 + {1735, 943} + {998, 0} + Xcode.IDEKit.EditorDocument.SourceCode + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 406 + + + file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/Graph.h + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 408 + + + + {{0, 0}, {407, 602}} + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 335 + + + CF$UID + 336 + + + CF$UID + 337 + + + NS.objects + + + CF$UID + 410 + + + CF$UID + 246 + + + CF$UID + 429 + + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 411 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 340 + + + CF$UID + 341 + + + CF$UID + 342 + + + CF$UID + 343 + + + CF$UID + 344 + + + CF$UID + 345 + + + CF$UID + 346 + + + NS.objects + + + CF$UID + 347 + + + CF$UID + 412 + + + CF$UID + 419 + + + CF$UID + 351 + + + CF$UID + 351 + + + CF$UID + 427 + + + CF$UID + 428 + + + + + $class + + CF$UID + 111 + + DocumentLocation + + CF$UID + 417 + + DomainIdentifier + + CF$UID + 298 + + IdentifierPath + + CF$UID + 413 + + IndexOfDocumentIdentifier + + CF$UID + 26 + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 414 + + + CF$UID + 415 + + + CF$UID + 416 + + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 351 + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 64 + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 254 + + + + $class + + CF$UID + 110 + + documentURL + + CF$UID + 418 + + timestamp + + CF$UID + 0 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/TikZiT-Info.plist + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 420 + + + CF$UID + 421 + + + CF$UID + 422 + + + NS.objects + + + CF$UID + 423 + + + CF$UID + 425 + + + CF$UID + 426 + + + + IDE_PLIST_EDITOR_SELECTION_KEY + IDE_PLIST_EDITOR_EXPANSION_KEY + IDE_PLIST_EDITOR_VISIBLERECT_KEY + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 424 + + + + CFBundleVersion + + $class + + CF$UID + 236 + + NS.objects + + + {{0, 0}, {407, 563}} + Xcode.IDEKit.EditorDocument.PlistEditor + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 365 + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 367 + + + + + $class + + CF$UID + 115 + + geniusEditorContextNode + + CF$UID + 0 + + primaryEditorContextNode + + CF$UID + 431 + + rootLayoutTreeNode + + CF$UID + 439 + + + + $class + + CF$UID + 114 + + children + + CF$UID + 0 + + contentType + 1 + documentArchivableRepresentation + + CF$UID + 432 + + orientation + 0 + parent + + CF$UID + 439 + + + + $class + + CF$UID + 111 + + DocumentLocation + + CF$UID + 305 + + DomainIdentifier + + CF$UID + 298 + + IdentifierPath + + CF$UID + 433 + + IndexOfDocumentIdentifier + + CF$UID + 26 + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 434 + + + CF$UID + 435 + + + CF$UID + 436 + + + CF$UID + 437 + + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 59 + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 58 + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 57 + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 438 + + + TikZiT + + $class + + CF$UID + 114 + + children + + CF$UID + 440 + + contentType + 0 + documentArchivableRepresentation + + CF$UID + 0 + + orientation + 0 + parent + + CF$UID + 0 + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 431 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 8 + + + CF$UID + 9 + + + CF$UID + 442 + + + CF$UID + 10 + + + CF$UID + 11 + + + CF$UID + 12 + + + CF$UID + 13 + + + CF$UID + 14 + + + NS.objects + + + CF$UID + 443 + + + CF$UID + 444 + + + CF$UID + 445 + + + CF$UID + 25 + + + CF$UID + 4 + + + CF$UID + 442 + + + CF$UID + 25 + + + CF$UID + 25 + + + + IDEWorkspaceTabController_5BA15B20-6E8C-4183-8118-E8E43B2873EF + {{264, 446}, {600, 624}} + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 442 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 16 + + + CF$UID + 17 + + + CF$UID + 18 + + + CF$UID + 19 + + + CF$UID + 20 + + + CF$UID + 21 + + + CF$UID + 22 + + + CF$UID + 23 + + + NS.objects + + + CF$UID + 446 + + + CF$UID + 25 + + + CF$UID + 26 + + + CF$UID + 447 + + + CF$UID + 453 + + + CF$UID + 469 + + + CF$UID + 25 + + + CF$UID + 477 + + + + tikzparser.ym + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 28 + + + NS.objects + + + CF$UID + 448 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 449 + + + CF$UID + 451 + + + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 33 + + + CF$UID + 450 + + + + 127 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 33 + + + CF$UID + 452 + + + + 473 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 41 + + + CF$UID + 42 + + + NS.objects + + + CF$UID + 42 + + + CF$UID + 454 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 44 + + + CF$UID + 45 + + + CF$UID + 46 + + + CF$UID + 47 + + + CF$UID + 48 + + + CF$UID + 49 + + + CF$UID + 50 + + + NS.objects + + + CF$UID + 455 + + + CF$UID + 25 + + + CF$UID + 52 + + + CF$UID + 25 + + + CF$UID + 25 + + + CF$UID + 456 + + + CF$UID + 460 + + + + {{0, 0}, {0, 0}} + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 457 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 458 + + + CF$UID + 57 + + + CF$UID + 67 + + + CF$UID + 459 + + + + TikZiT + tikzparser.ym + + $class + + CF$UID + 53 + + NS.objects + + + CF$UID + 461 + + + CF$UID + 462 + + + CF$UID + 463 + + + CF$UID + 464 + + + CF$UID + 465 + + + CF$UID + 466 + + + CF$UID + 467 + + + CF$UID + 468 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 458 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 458 + + + CF$UID + 64 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 458 + + + CF$UID + 57 + + + CF$UID + 67 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 458 + + + CF$UID + 77 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 458 + + + CF$UID + 69 + + + CF$UID + 70 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 458 + + + CF$UID + 69 + + + CF$UID + 70 + + + CF$UID + 71 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 458 + + + CF$UID + 69 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 458 + + + CF$UID + 64 + + + CF$UID + 74 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 28 + + + NS.objects + + + CF$UID + 470 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 471 + + + CF$UID + 473 + + + CF$UID + 475 + + + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 20 + + + CF$UID + 472 + + + + 225 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 23 + + + CF$UID + 474 + + + + 815 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 85 + + + CF$UID + 476 + + + + 260 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 88 + + + CF$UID + 89 + + + CF$UID + 90 + + + CF$UID + 91 + + + CF$UID + 92 + + + CF$UID + 93 + + + CF$UID + 94 + + + CF$UID + 95 + + + NS.objects + + + CF$UID + 478 + + + CF$UID + 491 + + + CF$UID + 511 + + + CF$UID + 182 + + + CF$UID + 26 + + + CF$UID + 526 + + + CF$UID + 532 + + + CF$UID + 25 + + + + + $class + + CF$UID + 115 + + geniusEditorContextNode + + CF$UID + 0 + + primaryEditorContextNode + + CF$UID + 479 + + rootLayoutTreeNode + + CF$UID + 489 + + + + $class + + CF$UID + 114 + + children + + CF$UID + 0 + + contentType + 1 + documentArchivableRepresentation + + CF$UID + 480 + + orientation + 0 + parent + + CF$UID + 489 + + + + $class + + CF$UID + 111 + + DocumentLocation + + CF$UID + 487 + + DomainIdentifier + + CF$UID + 99 + + IdentifierPath + + CF$UID + 481 + + IndexOfDocumentIdentifier + + CF$UID + 26 + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 482 + + + CF$UID + 483 + + + CF$UID + 484 + + + CF$UID + 485 + + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 459 + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 67 + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 57 + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 486 + + + TikZiT + + $class + + CF$UID + 110 + + documentURL + + CF$UID + 488 + + timestamp + + CF$UID + 0 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/git/tikzit/tikzit/src/common/tikzparser.ym + + + $class + + CF$UID + 114 + + children + + CF$UID + 490 + + contentType + 0 + documentArchivableRepresentation + + CF$UID + 0 + + orientation + 0 + parent + + CF$UID + 0 + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 479 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 117 + + + NS.objects + + + CF$UID + 492 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 119 + + + NS.objects + + + CF$UID + 493 + + + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 121 + + + CF$UID + 122 + + + CF$UID + 123 + + + NS.objects + + + CF$UID + 494 + + + CF$UID + 26 + + + CF$UID + 509 + + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 495 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 126 + + + CF$UID + 127 + + + CF$UID + 128 + + + CF$UID + 129 + + + CF$UID + 130 + + + CF$UID + 131 + + + CF$UID + 132 + + + NS.objects + + + CF$UID + 496 + + + CF$UID + 497 + + + CF$UID + 504 + + + CF$UID + 459 + + + CF$UID + 459 + + + CF$UID + 150 + + + CF$UID + 507 + + + + public.yacc-source + + $class + + CF$UID + 111 + + DocumentLocation + + CF$UID + 487 + + DomainIdentifier + + CF$UID + 99 + + IdentifierPath + + CF$UID + 498 + + IndexOfDocumentIdentifier + + CF$UID + 26 + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 499 + + + CF$UID + 500 + + + CF$UID + 501 + + + CF$UID + 502 + + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 459 + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 67 + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 57 + + + + $class + + CF$UID + 102 + + Identifier + + CF$UID + 503 + + + TikZiT + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 142 + + + CF$UID + 143 + + + CF$UID + 144 + + + CF$UID + 145 + + + NS.objects + + + CF$UID + 505 + + + CF$UID + 506 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 381079264.11013299 + {1063, 652} + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 508 + + + file://localhost/Users/aleks/git/tikzit/tikzit/src/common/tikzparser.ym + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 510 + + + + {{0, 0}, {600, 600}} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 157 + + + CF$UID + 158 + + + CF$UID + 159 + + + CF$UID + 160 + + + CF$UID + 161 + + + CF$UID + 162 + + + NS.objects + + + CF$UID + 163 + + + CF$UID + 512 + + + CF$UID + 513 + + + CF$UID + 163 + + + CF$UID + 514 + + + CF$UID + 520 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 165 + + + NS.objects + + + CF$UID + 26 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 167 + + + NS.objects + + + CF$UID + 163 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 28 + + + NS.objects + + + CF$UID + 515 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 516 + + + CF$UID + 518 + + + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 171 + + + CF$UID + 517 + + + + 301 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 174 + + + CF$UID + 519 + + + + 298 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 28 + + + NS.objects + + + CF$UID + 521 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 522 + + + CF$UID + 524 + + + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 171 + + + CF$UID + 523 + + + + 301 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 174 + + + CF$UID + 525 + + + + 298 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 28 + + + NS.objects + + + CF$UID + 527 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 528 + + + CF$UID + 530 + + + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 186 + + + CF$UID + 529 + + + + 203 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 31 + + + CF$UID + 32 + + + NS.objects + + + CF$UID + 189 + + + CF$UID + 531 + + + + 115 + + $class + + CF$UID + 39 + + NS.keys + + NS.objects + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 534 + + + CF$UID + 535 + + + CF$UID + 536 + + + CF$UID + 537 + + + CF$UID + 538 + + + CF$UID + 539 + + + CF$UID + 540 + + + CF$UID + 541 + + + CF$UID + 542 + + + CF$UID + 543 + + + CF$UID + 544 + + + NS.objects + + + CF$UID + 182 + + + CF$UID + 545 + + + CF$UID + 26 + + + CF$UID + 1624 + + + CF$UID + 1629 + + + CF$UID + 1632 + + + CF$UID + 1662 + + + CF$UID + 1663 + + + CF$UID + 1758 + + + CF$UID + 25 + + + CF$UID + 25 + + + + BreakpointsActivated + DefaultEditorStatesForURLs + DebuggingWindowBehavior + ActiveRunDestination + ActiveScheme + LastCompletedPersistentSchemeBasedActivityReport + DocumentWindows + DefaultEditorFrameSizeForURLs + RecentEditorDocumentURLs + AppFocusInMiniDebugging + MiniDebuggingConsole + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 546 + + + CF$UID + 427 + + + CF$UID + 547 + + + CF$UID + 404 + + + CF$UID + 548 + + + CF$UID + 549 + + + CF$UID + 363 + + + CF$UID + 550 + + + CF$UID + 551 + + + NS.objects + + + CF$UID + 552 + + + CF$UID + 576 + + + CF$UID + 596 + + + CF$UID + 713 + + + CF$UID + 1449 + + + CF$UID + 1466 + + + CF$UID + 1472 + + + CF$UID + 1475 + + + CF$UID + 1585 + + + + IDEQuickLookEditor.Editor + Xcode.IDEKit.CocoaIntegration.EditorDocument.Cocoa + Xcode.IDEKit.EditorDocument.SourceCodeComparisonEditor + Xcode.IDEKit.EditorDocument.SourceCode-from-NIB + Xcode.Xcode3ProjectSupport.EditorDocument.Xcode3Project + Xcode.IDEKit.EditorDocument.LogDocument + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 553 + + + CF$UID + 555 + + + CF$UID + 557 + + + NS.objects + + + CF$UID + 559 + + + CF$UID + 566 + + + CF$UID + 571 + + + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 554 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/AH_latex_tail + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 556 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/AH_latex_head.png + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 558 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/ED_none.png + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 560 + + + NS.objects + + + CF$UID + 561 + + + + SelectedDocumentLocations + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 562 + + + + + $class + + CF$UID + 565 + + IDEQuickLookPageNumber + + CF$UID + 26 + + documentURL + + CF$UID + 563 + + timestamp + + CF$UID + 564 + + + file://localhost/Users/aleks/svn/tikzit/AH_latex_tail + 340372422.96159899 + + $classes + + IDEQuickLookDocumentLocation + DVTDocumentLocation + NSObject + + $classname + IDEQuickLookDocumentLocation + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 560 + + + NS.objects + + + CF$UID + 567 + + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 568 + + + + + $class + + CF$UID + 565 + + IDEQuickLookPageNumber + + CF$UID + 26 + + documentURL + + CF$UID + 569 + + timestamp + + CF$UID + 570 + + + file://localhost/Users/aleks/svn/tikzit/AH_latex_head.png + 340372923.18815899 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 560 + + + NS.objects + + + CF$UID + 572 + + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 573 + + + + + $class + + CF$UID + 565 + + IDEQuickLookPageNumber + + CF$UID + 26 + + documentURL + + CF$UID + 574 + + timestamp + + CF$UID + 575 + + + file://localhost/Users/aleks/svn/tikzit/ED_none.png + 340371928.114389 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 577 + + + CF$UID + 579 + + + CF$UID + 581 + + + NS.objects + + + CF$UID + 583 + + + CF$UID + 587 + + + CF$UID + 592 + + + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 578 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/TikZiT-Info.plist + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 580 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/TikZiT-Info.plist + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 582 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/git/tikzit/tikzit/TikZiT-Info.plist + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 420 + + + CF$UID + 421 + + + CF$UID + 422 + + + NS.objects + + + CF$UID + 584 + + + CF$UID + 585 + + + CF$UID + 586 + + + + + $class + + CF$UID + 60 + + NS.objects + + + + $class + + CF$UID + 236 + + NS.objects + + + {{0, 0}, {743, 502}} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 420 + + + CF$UID + 422 + + + CF$UID + 421 + + + NS.objects + + + CF$UID + 588 + + + CF$UID + 590 + + + CF$UID + 591 + + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 589 + + + + CFBundleIconFile + {{0, 0}, {815, 552}} + + $class + + CF$UID + 236 + + NS.objects + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 420 + + + CF$UID + 421 + + + CF$UID + 422 + + + NS.objects + + + CF$UID + 593 + + + CF$UID + 594 + + + CF$UID + 595 + + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 589 + + + + + $class + + CF$UID + 236 + + NS.objects + + + {{0, 0}, {815, 550}} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 597 + + + CF$UID + 599 + + + CF$UID + 601 + + + CF$UID + 603 + + + CF$UID + 605 + + + CF$UID + 607 + + + CF$UID + 609 + + + CF$UID + 611 + + + CF$UID + 613 + + + CF$UID + 615 + + + NS.objects + + + CF$UID + 617 + + + CF$UID + 638 + + + CF$UID + 650 + + + CF$UID + 657 + + + CF$UID + 668 + + + CF$UID + 677 + + + CF$UID + 685 + + + CF$UID + 693 + + + CF$UID + 699 + + + CF$UID + 705 + + + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 598 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/English.lproj/PropertyInspector.xib + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 600 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/English.lproj/StylePalette.xib + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 602 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/English.lproj/PropertyInspector.xib + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 604 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/English.lproj/StylePalette.xib + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 606 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/English.lproj/TikzDocument.xib + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 608 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/English.lproj/Preview.xib + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 610 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/English.lproj/MainMenu.xib + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 612 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/English.lproj/Preamble.xib + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 614 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/English.lproj/MainMenu.xib + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 616 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/English.lproj/Preamble.xib + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 618 + + + CF$UID + 619 + + + CF$UID + 620 + + + CF$UID + 621 + + + NS.objects + + + CF$UID + 622 + + + CF$UID + 584 + + + CF$UID + 621 + + + CF$UID + 625 + + + + IBDockViewController + SelectedObjectIDs + SelectionProvider + IBCanvasViewController + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 623 + + + NS.objects + + + CF$UID + 624 + + + + LastKnownOutlineViewWidth + 224 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 626 + + + CF$UID + 627 + + + NS.objects + + + CF$UID + 628 + + + CF$UID + 637 + + + + ObjectIDToLastKnownCanvasPositionMap + EditedTopLevelObjectIDs + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 629 + + + CF$UID + 630 + + + CF$UID + 631 + + + CF$UID + 632 + + + NS.objects + + + CF$UID + 633 + + + CF$UID + 634 + + + CF$UID + 635 + + + CF$UID + 636 + + + + 301 + 185 + 461 + 361 + {46, 13} + {46, 189} + {318, 118} + {46, 385} + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 629 + + + CF$UID + 632 + + + CF$UID + 630 + + + CF$UID + 631 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 618 + + + CF$UID + 619 + + + CF$UID + 620 + + + CF$UID + 621 + + + NS.objects + + + CF$UID + 639 + + + CF$UID + 641 + + + CF$UID + 643 + + + CF$UID + 644 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 623 + + + NS.objects + + + CF$UID + 640 + + + + 224 + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 642 + + + + -2 + IBStructureViewController + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 626 + + + CF$UID + 627 + + + NS.objects + + + CF$UID + 645 + + + CF$UID + 646 + + + + + $class + + CF$UID + 39 + + NS.keys + + NS.objects + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 647 + + + CF$UID + 648 + + + CF$UID + 649 + + + + 3 + 649 + 181 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 618 + + + CF$UID + 619 + + + CF$UID + 620 + + + CF$UID + 621 + + + NS.objects + + + CF$UID + 651 + + + CF$UID + 653 + + + CF$UID + 621 + + + CF$UID + 654 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 623 + + + NS.objects + + + CF$UID + 652 + + + + 224 + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 631 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 626 + + + CF$UID + 627 + + + NS.objects + + + CF$UID + 655 + + + CF$UID + 656 + + + + + $class + + CF$UID + 39 + + NS.keys + + NS.objects + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 631 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 618 + + + CF$UID + 619 + + + CF$UID + 620 + + + CF$UID + 621 + + + NS.objects + + + CF$UID + 658 + + + CF$UID + 584 + + + CF$UID + 621 + + + CF$UID + 660 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 623 + + + NS.objects + + + CF$UID + 659 + + + + 224 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 626 + + + CF$UID + 627 + + + NS.objects + + + CF$UID + 661 + + + CF$UID + 667 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 647 + + + CF$UID + 649 + + + CF$UID + 662 + + + CF$UID + 648 + + + NS.objects + + + CF$UID + 663 + + + CF$UID + 664 + + + CF$UID + 665 + + + CF$UID + 666 + + + + 524 + {306, -2} + {71, 17} + {118, 105} + {71, 359} + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 648 + + + CF$UID + 647 + + + CF$UID + 649 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 618 + + + CF$UID + 619 + + + CF$UID + 620 + + + CF$UID + 621 + + + NS.objects + + + CF$UID + 669 + + + CF$UID + 671 + + + CF$UID + 643 + + + CF$UID + 673 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 623 + + + NS.objects + + + CF$UID + 670 + + + + 224 + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 672 + + + + 100024 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 626 + + + CF$UID + 627 + + + NS.objects + + + CF$UID + 674 + + + CF$UID + 675 + + + + + $class + + CF$UID + 39 + + NS.keys + + NS.objects + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 676 + + + + 5 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 618 + + + CF$UID + 619 + + + CF$UID + 620 + + + CF$UID + 621 + + + NS.objects + + + CF$UID + 678 + + + CF$UID + 680 + + + CF$UID + 621 + + + CF$UID + 682 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 623 + + + NS.objects + + + CF$UID + 679 + + + + 224 + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 681 + + + + 11 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 626 + + + CF$UID + 627 + + + NS.objects + + + CF$UID + 683 + + + CF$UID + 684 + + + + + $class + + CF$UID + 39 + + NS.keys + + NS.objects + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 163 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 618 + + + CF$UID + 619 + + + CF$UID + 620 + + + CF$UID + 621 + + + NS.objects + + + CF$UID + 686 + + + CF$UID + 584 + + + CF$UID + 621 + + + CF$UID + 688 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 623 + + + NS.objects + + + CF$UID + 687 + + + + 200 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 626 + + + CF$UID + 627 + + + NS.objects + + + CF$UID + 689 + + + CF$UID + 690 + + + + + $class + + CF$UID + 39 + + NS.keys + + NS.objects + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 691 + + + CF$UID + 692 + + + + 535 + 29 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 618 + + + CF$UID + 619 + + + CF$UID + 620 + + + CF$UID + 621 + + + NS.objects + + + CF$UID + 694 + + + CF$UID + 584 + + + CF$UID + 621 + + + CF$UID + 696 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 623 + + + NS.objects + + + CF$UID + 695 + + + + 224 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 626 + + + CF$UID + 627 + + + NS.objects + + + CF$UID + 697 + + + CF$UID + 698 + + + + + $class + + CF$UID + 39 + + NS.keys + + NS.objects + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 163 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 618 + + + CF$UID + 619 + + + CF$UID + 620 + + + CF$UID + 621 + + + NS.objects + + + CF$UID + 700 + + + CF$UID + 584 + + + CF$UID + 621 + + + CF$UID + 702 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 623 + + + NS.objects + + + CF$UID + 701 + + + + 224 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 626 + + + CF$UID + 627 + + + NS.objects + + + CF$UID + 703 + + + CF$UID + 704 + + + + + $class + + CF$UID + 39 + + NS.keys + + NS.objects + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 692 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 618 + + + CF$UID + 619 + + + CF$UID + 620 + + + CF$UID + 621 + + + NS.objects + + + CF$UID + 706 + + + CF$UID + 708 + + + CF$UID + 621 + + + CF$UID + 710 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 623 + + + NS.objects + + + CF$UID + 707 + + + + 200 + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 709 + + + + 27 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 626 + + + CF$UID + 627 + + + NS.objects + + + CF$UID + 711 + + + CF$UID + 712 + + + + + $class + + CF$UID + 39 + + NS.keys + + NS.objects + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 163 + + + CF$UID + 647 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 714 + + + CF$UID + 716 + + + CF$UID + 718 + + + CF$UID + 720 + + + CF$UID + 722 + + + CF$UID + 724 + + + CF$UID + 726 + + + CF$UID + 728 + + + CF$UID + 730 + + + CF$UID + 732 + + + CF$UID + 734 + + + CF$UID + 736 + + + CF$UID + 738 + + + CF$UID + 740 + + + CF$UID + 742 + + + CF$UID + 744 + + + CF$UID + 746 + + + CF$UID + 748 + + + CF$UID + 750 + + + CF$UID + 752 + + + CF$UID + 754 + + + CF$UID + 756 + + + CF$UID + 758 + + + CF$UID + 760 + + + CF$UID + 762 + + + CF$UID + 764 + + + CF$UID + 766 + + + CF$UID + 768 + + + CF$UID + 770 + + + CF$UID + 772 + + + CF$UID + 774 + + + CF$UID + 776 + + + CF$UID + 778 + + + CF$UID + 780 + + + CF$UID + 782 + + + CF$UID + 784 + + + CF$UID + 785 + + + CF$UID + 787 + + + CF$UID + 789 + + + CF$UID + 791 + + + CF$UID + 793 + + + CF$UID + 795 + + + CF$UID + 797 + + + CF$UID + 799 + + + CF$UID + 801 + + + CF$UID + 803 + + + CF$UID + 805 + + + CF$UID + 807 + + + CF$UID + 809 + + + CF$UID + 811 + + + CF$UID + 813 + + + CF$UID + 815 + + + CF$UID + 817 + + + CF$UID + 819 + + + CF$UID + 821 + + + CF$UID + 823 + + + CF$UID + 825 + + + CF$UID + 827 + + + CF$UID + 829 + + + CF$UID + 831 + + + CF$UID + 833 + + + CF$UID + 835 + + + CF$UID + 837 + + + CF$UID + 839 + + + CF$UID + 841 + + + CF$UID + 843 + + + CF$UID + 845 + + + CF$UID + 847 + + + CF$UID + 849 + + + CF$UID + 851 + + + CF$UID + 853 + + + CF$UID + 855 + + + CF$UID + 857 + + + CF$UID + 859 + + + CF$UID + 861 + + + CF$UID + 863 + + + CF$UID + 865 + + + CF$UID + 867 + + + CF$UID + 869 + + + CF$UID + 871 + + + CF$UID + 873 + + + CF$UID + 875 + + + CF$UID + 877 + + + CF$UID + 879 + + + CF$UID + 881 + + + CF$UID + 883 + + + CF$UID + 885 + + + CF$UID + 887 + + + CF$UID + 889 + + + CF$UID + 891 + + + CF$UID + 893 + + + CF$UID + 895 + + + CF$UID + 897 + + + CF$UID + 899 + + + CF$UID + 901 + + + CF$UID + 903 + + + CF$UID + 905 + + + CF$UID + 907 + + + CF$UID + 908 + + + CF$UID + 910 + + + CF$UID + 912 + + + CF$UID + 914 + + + CF$UID + 916 + + + CF$UID + 918 + + + CF$UID + 920 + + + CF$UID + 922 + + + CF$UID + 924 + + + CF$UID + 926 + + + CF$UID + 928 + + + CF$UID + 930 + + + CF$UID + 932 + + + CF$UID + 934 + + + CF$UID + 936 + + + CF$UID + 938 + + + CF$UID + 940 + + + CF$UID + 942 + + + CF$UID + 944 + + + CF$UID + 946 + + + CF$UID + 948 + + + CF$UID + 950 + + + CF$UID + 952 + + + CF$UID + 954 + + + CF$UID + 956 + + + CF$UID + 958 + + + CF$UID + 960 + + + CF$UID + 962 + + + CF$UID + 964 + + + CF$UID + 966 + + + NS.objects + + + CF$UID + 968 + + + CF$UID + 972 + + + CF$UID + 976 + + + CF$UID + 980 + + + CF$UID + 984 + + + CF$UID + 988 + + + CF$UID + 992 + + + CF$UID + 996 + + + CF$UID + 1000 + + + CF$UID + 1003 + + + CF$UID + 1007 + + + CF$UID + 1011 + + + CF$UID + 1015 + + + CF$UID + 1019 + + + CF$UID + 1022 + + + CF$UID + 1025 + + + CF$UID + 1029 + + + CF$UID + 1033 + + + CF$UID + 1037 + + + CF$UID + 1041 + + + CF$UID + 1045 + + + CF$UID + 1049 + + + CF$UID + 1053 + + + CF$UID + 1057 + + + CF$UID + 1061 + + + CF$UID + 1065 + + + CF$UID + 1069 + + + CF$UID + 1073 + + + CF$UID + 1077 + + + CF$UID + 1081 + + + CF$UID + 1085 + + + CF$UID + 1089 + + + CF$UID + 1093 + + + CF$UID + 1097 + + + CF$UID + 1101 + + + CF$UID + 1105 + + + CF$UID + 1109 + + + CF$UID + 1113 + + + CF$UID + 1117 + + + CF$UID + 1120 + + + CF$UID + 1124 + + + CF$UID + 1128 + + + CF$UID + 1132 + + + CF$UID + 1136 + + + CF$UID + 1140 + + + CF$UID + 1143 + + + CF$UID + 1147 + + + CF$UID + 1151 + + + CF$UID + 1155 + + + CF$UID + 1158 + + + CF$UID + 1162 + + + CF$UID + 1165 + + + CF$UID + 1168 + + + CF$UID + 1171 + + + CF$UID + 1175 + + + CF$UID + 1178 + + + CF$UID + 1181 + + + CF$UID + 1185 + + + CF$UID + 1189 + + + CF$UID + 1193 + + + CF$UID + 1197 + + + CF$UID + 1200 + + + CF$UID + 1204 + + + CF$UID + 1208 + + + CF$UID + 1212 + + + CF$UID + 1215 + + + CF$UID + 1218 + + + CF$UID + 1221 + + + CF$UID + 1225 + + + CF$UID + 1229 + + + CF$UID + 1233 + + + CF$UID + 1236 + + + CF$UID + 1239 + + + CF$UID + 1243 + + + CF$UID + 1247 + + + CF$UID + 1251 + + + CF$UID + 1254 + + + CF$UID + 1257 + + + CF$UID + 1261 + + + CF$UID + 1264 + + + CF$UID + 1268 + + + CF$UID + 1272 + + + CF$UID + 1276 + + + CF$UID + 1280 + + + CF$UID + 1284 + + + CF$UID + 1288 + + + CF$UID + 1292 + + + CF$UID + 1296 + + + CF$UID + 1300 + + + CF$UID + 1304 + + + CF$UID + 1308 + + + CF$UID + 1312 + + + CF$UID + 1316 + + + CF$UID + 1320 + + + CF$UID + 1324 + + + CF$UID + 1327 + + + CF$UID + 1330 + + + CF$UID + 1334 + + + CF$UID + 1338 + + + CF$UID + 1342 + + + CF$UID + 1346 + + + CF$UID + 1350 + + + CF$UID + 1354 + + + CF$UID + 1358 + + + CF$UID + 1362 + + + CF$UID + 1366 + + + CF$UID + 1370 + + + CF$UID + 1373 + + + CF$UID + 1376 + + + CF$UID + 1380 + + + CF$UID + 1384 + + + CF$UID + 1388 + + + CF$UID + 1392 + + + CF$UID + 1396 + + + CF$UID + 1400 + + + CF$UID + 1404 + + + CF$UID + 1408 + + + CF$UID + 1412 + + + CF$UID + 1415 + + + CF$UID + 1418 + + + CF$UID + 1421 + + + CF$UID + 1425 + + + CF$UID + 1429 + + + CF$UID + 1432 + + + CF$UID + 1436 + + + CF$UID + 1439 + + + CF$UID + 1443 + + + CF$UID + 1446 + + + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 715 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/GraphicsView.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 717 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/GraphicsView.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 719 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/Grid.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 721 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/git/tikzit/tikzit/src/osx/Grid.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 723 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/SelectBoxLayer.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 725 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/TikzSourceController.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 727 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/EdgeControlLayer.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 729 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/Edge.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 731 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/Edge.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 733 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/EdgeStyle+Coder.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 735 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/TikzShape.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 737 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/BasicMapTable.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 739 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/GraphChange.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 741 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/-%5BNSWindowController%20window%5D_disassembly_0x00007fff93905981.s + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 743 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/_objc_empty_vtable_disassembly_0x00007fff760e2f60.s + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 745 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/SupportDir.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 747 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/AppDelegate.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 749 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/PickSupport.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 751 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/NodeLayer.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 753 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/PropertyInspectorController.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 755 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/TikzDocument.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 757 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/EdgeStyle.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 759 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/EdgeStyle.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 761 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/NodeStyle.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 763 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/NSString+UnicharUtilities.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 765 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/Grid.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 767 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/DiffMatchPatch.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 769 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/CALayer+DrawLabel.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 771 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/NSString+UnicharUtilities.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 773 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/GraphDiff.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 775 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/contrib/DiffMatchPatch/NSString+DiffMatchPatchUtils.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 777 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/Graph.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 779 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/EdgeStyle.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 781 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/EdgeStyle.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 783 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/Graph.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 108 + + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 786 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/SelectableNodeView.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 788 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/StylePaletteController.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 790 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/PreviewController.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 792 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/Transformer.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 794 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Developer/SDKs/MacOSX10.7.sdk/System/Library/Frameworks/Foundation.framework/Versions/C/Headers/NSArray.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 796 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/DiffMatchPatchCFUtilities.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 798 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/GraphChange.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 800 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/GraphChange.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 802 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/-%5BNSObject%20performSelector:%5D_disassembly_0x00007fff8ce162e1.s + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 804 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/DiffMatchPatchCFUtilities.c + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 806 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/PreambleController.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 808 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/PreambleController.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 810 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/CGContextAddPath_disassembly_0x00007fff910e972e.s + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 812 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/contrib/DiffMatchPatch/NSString+DiffMatchPatchUtils.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 814 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/-%5BNSCustomView%20nibInstantiateWithObjectInstantiator:%5D_disassembly_0x00007fff96b86f29.s + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 816 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/COPYING.DiffMatchPatch + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 818 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/__cxa_throw_disassembly_0x00007fff933e00e9.s + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 820 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/AppDelegate.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 822 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/AppDelegate.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 824 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/SelectBoxLayer.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 826 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/PropertyHolder.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 828 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/DiffMatchPatch.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 830 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/NSString+JavaSubstring.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 832 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/Transformer.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 834 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/Node.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 836 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/EdgeStyle+Coder.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 838 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/NSMutableDictionary+DMPExtensions.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 840 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/GraphElementProperty.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 842 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/Graph+Coder.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 844 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/test/test.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 846 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/SelectableNodeView.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 848 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Developer/SDKs/MacOSX10.7.sdk/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/CoreGraphics.framework/Versions/A/Headers/CGColor.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 850 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/NilToEmptyStringTransformer.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 852 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/NodeSelectionLayer.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 854 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/auto_fatal_disassembly_0x00007fff894d9f6f.s + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 856 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/GraphElementData.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 858 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/TikzWindowController.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 860 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/NSString+UriCompatibility.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 862 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/NodeStyle.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 864 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/CABackingStoreUpdate__disassembly_0x00007fff8d778b05.s + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 866 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/test/common.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 868 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/test/main.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 870 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/main.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 872 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/scratch/SFBInspectors/SFBInspectorView.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 874 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/ToolPaletteController.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 876 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/GraphicsView.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 878 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/GraphicsView.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 880 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/git/tikzit/tikzit/src/osx/GraphicsView.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 882 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/TikZiT-Info.plist + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 884 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/TikzGraphAssembler.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 886 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/SelectableCollectionViewItem.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 888 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/SelectableCollectionViewItem.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 890 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/TikzSourceController.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 892 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/Node.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 894 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/git/tikzit/tikzit/src/common/tikzlexer.lm + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 896 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/PickSupport.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 898 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/PickSupport.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 900 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/NilToEmptyStringTransformer.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 902 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/CFRelease_disassembly_0x00007fff8cc2b07b.s + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 904 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/GraphElementData.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 906 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/NodeStyle+Coder.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 488 + + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 909 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/EdgeControlLayer.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 911 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/NodeStyle+Coder.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 913 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/Edge.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 915 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/Edge.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 917 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/git/tikzit/tikzit/src/common/Edge.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 919 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/TikzDocument.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 921 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/PropertyHolder.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 923 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/TikzGraphAssembler.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 925 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/StylePaletteController.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 927 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/StylePaletteController.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 929 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/git/tikzit/tikzit/src/common/TikzGraphAssembler.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 931 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/PropertyInspectorController.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 933 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/PropertyInspectorController.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 935 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/PreviewController.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 937 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/PreviewController.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 939 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/Graph.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 941 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/Graph.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 943 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/Graph+Coder.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 945 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/util.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 947 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/-%5BNSCollectionView%20newItemForRepresentedObject:%5D_disassembly_0x00007fff8fa0a94e.s + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 949 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/Shape.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 951 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/Shape.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 953 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Developer/SDKs/MacOSX10.7.sdk/System/Library/Frameworks/CoreFoundation.framework/Versions/A/Headers/CFString.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 955 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/TikzWindowController.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 957 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/GraphDiff.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 959 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/NodeSelectionLayer.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 961 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/GraphElementProperty.h + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 963 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/osx/NodeLayer.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 965 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/NodeLayer.m + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 967 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/src/common/ColorRGB.m + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 969 + + + CF$UID + 970 + + + CF$UID + 25 + + + CF$UID + 971 + + + + 345762860.65236199 + {2200, 1151} + {2909, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 973 + + + CF$UID + 974 + + + CF$UID + 25 + + + CF$UID + 975 + + + + 348421987.42822403 + {2200, 1157} + {3223, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 977 + + + CF$UID + 978 + + + CF$UID + 25 + + + CF$UID + 979 + + + + 345403783.61108297 + {842, 693} + {1356, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 981 + + + CF$UID + 982 + + + CF$UID + 25 + + + CF$UID + 983 + + + + 380738928.58536297 + {2001, 1508} + {2090, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 985 + + + CF$UID + 986 + + + CF$UID + 25 + + + CF$UID + 987 + + + + 345416623.559434 + {0, 379} + {276, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 989 + + + CF$UID + 990 + + + CF$UID + 25 + + + CF$UID + 991 + + + + 345403324.869367 + {881, 944} + {1433, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 993 + + + CF$UID + 994 + + + CF$UID + 25 + + + CF$UID + 995 + + + + 345571191.17329699 + {104, 1058} + {1155, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 997 + + + CF$UID + 998 + + + CF$UID + 25 + + + CF$UID + 999 + + + + 345403538.85177398 + {943, 1136} + {9769, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1001 + + + CF$UID + 1002 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 348682214.50559098 + {1692, 820} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1004 + + + CF$UID + 1005 + + + CF$UID + 25 + + + CF$UID + 1006 + + + + 340459449.14873803 + {0, 953} + {898, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1008 + + + CF$UID + 1009 + + + CF$UID + 25 + + + CF$UID + 1010 + + + + 345404849.21465802 + {1684, 1007} + {2065, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1012 + + + CF$UID + 1013 + + + CF$UID + 25 + + + CF$UID + 1014 + + + + 345994252.86864501 + {1109, 746} + {790, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1016 + + + CF$UID + 1017 + + + CF$UID + 25 + + + CF$UID + 1018 + + + + 340625465.61212498 + {6290, 1393} + {7112, 58} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1020 + + + CF$UID + 1021 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 348348273.15865397 + {0, 2528} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1023 + + + CF$UID + 1024 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 345409605.10440803 + {0, 2496} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1026 + + + CF$UID + 1027 + + + CF$UID + 25 + + + CF$UID + 1028 + + + + 348328967.72804999 + {831, 996} + {1464, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1030 + + + CF$UID + 1031 + + + CF$UID + 25 + + + CF$UID + 1032 + + + + 345487190.58582902 + {592, 1437} + {1769, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1034 + + + CF$UID + 1035 + + + CF$UID + 25 + + + CF$UID + 1036 + + + + 348348232.74814701 + {2312, 1269} + {3305, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1038 + + + CF$UID + 1039 + + + CF$UID + 25 + + + CF$UID + 1040 + + + + 345416712.81625599 + {812, 967} + {1608, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1042 + + + CF$UID + 1043 + + + CF$UID + 25 + + + CF$UID + 1044 + + + + 345404437.01901197 + {960, 1373} + {1257, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1046 + + + CF$UID + 1047 + + + CF$UID + 25 + + + CF$UID + 1048 + + + + 340624392.15628898 + {0, 1080} + {928, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1050 + + + CF$UID + 1051 + + + CF$UID + 25 + + + CF$UID + 1052 + + + + 340473820.49560201 + {1062, 1380} + {19, 768} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1054 + + + CF$UID + 1055 + + + CF$UID + 25 + + + CF$UID + 1056 + + + + 348682101.30419898 + {0, 1156} + {811, 26} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1058 + + + CF$UID + 1059 + + + CF$UID + 25 + + + CF$UID + 1060 + + + + 345763213.21294802 + {1210, 686} + {1261, 115} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1062 + + + CF$UID + 1063 + + + CF$UID + 25 + + + CF$UID + 1064 + + + + 340632134.97458899 + {30, 1204} + {902, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1066 + + + CF$UID + 1067 + + + CF$UID + 25 + + + CF$UID + 1068 + + + + 340501555.21261299 + {97, 1322} + {976, 23} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1070 + + + CF$UID + 1071 + + + CF$UID + 25 + + + CF$UID + 1072 + + + + 340631784.15413302 + {4723, 1844} + {5843, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1074 + + + CF$UID + 1075 + + + CF$UID + 25 + + + CF$UID + 1076 + + + + 340706474.47886401 + {298, 1417} + {624, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1078 + + + CF$UID + 1079 + + + CF$UID + 25 + + + CF$UID + 1080 + + + + 340631841.98603201 + {0, 968} + {841, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1082 + + + CF$UID + 1083 + + + CF$UID + 25 + + + CF$UID + 1084 + + + + 340622423.14766902 + {0, 1050} + {947, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1086 + + + CF$UID + 1087 + + + CF$UID + 25 + + + CF$UID + 1088 + + + + 340631322.39264601 + {52, 1607} + {270, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1090 + + + CF$UID + 1091 + + + CF$UID + 25 + + + CF$UID + 1092 + + + + 340925457.76799399 + {2611, 845} + {3012, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1094 + + + CF$UID + 1095 + + + CF$UID + 25 + + + CF$UID + 1096 + + + + 340410882.75886202 + {933, 1045} + {1918, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1098 + + + CF$UID + 1099 + + + CF$UID + 25 + + + CF$UID + 1100 + + + + 348682102.890167 + {0, 1214} + {964, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1102 + + + CF$UID + 1103 + + + CF$UID + 25 + + + CF$UID + 1104 + + + + 348502930.726179 + {13299, 942} + {13697, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 142 + + + CF$UID + 143 + + + CF$UID + 144 + + + CF$UID + 145 + + + NS.objects + + + CF$UID + 1106 + + + CF$UID + 1107 + + + CF$UID + 25 + + + CF$UID + 1108 + + + + 381083509.44221699 + {18344, 1253} + {19467, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1110 + + + CF$UID + 1111 + + + CF$UID + 25 + + + CF$UID + 1112 + + + + 345488697.68925297 + {0, 1055} + {907, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1114 + + + CF$UID + 1115 + + + CF$UID + 25 + + + CF$UID + 1116 + + + + 345487787.078866 + {403, 1549} + {1655, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1118 + + + CF$UID + 1119 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 348489963.85380399 + {288, 1153} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1121 + + + CF$UID + 1122 + + + CF$UID + 25 + + + CF$UID + 1123 + + + + 340978354.92465001 + {969, 1145} + {1174, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1125 + + + CF$UID + 1126 + + + CF$UID + 25 + + + CF$UID + 1127 + + + + 340709461.72300398 + {0, 1410} + {369, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1129 + + + CF$UID + 1130 + + + CF$UID + 25 + + + CF$UID + 1131 + + + + 340632182.87597102 + {300, 1742} + {1087, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1133 + + + CF$UID + 1134 + + + CF$UID + 25 + + + CF$UID + 1135 + + + + 340625462.37954402 + {2270, 728} + {1004, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1137 + + + CF$UID + 1138 + + + CF$UID + 25 + + + CF$UID + 1139 + + + + 348419924.36261398 + {3536, 958} + {353, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1141 + + + CF$UID + 1142 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 348347980.23595798 + {0, 1071} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1144 + + + CF$UID + 1145 + + + CF$UID + 25 + + + CF$UID + 1146 + + + + 340632849.17894697 + {0, 1631} + {914, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1148 + + + CF$UID + 1149 + + + CF$UID + 25 + + + CF$UID + 1150 + + + + 345404279.50111699 + {1864, 1059} + {2502, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1152 + + + CF$UID + 1153 + + + CF$UID + 25 + + + CF$UID + 1154 + + + + 348491190.94514698 + {3485, 1369} + {4064, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1156 + + + CF$UID + 1157 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 340734505.19957298 + {0, 1949} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1159 + + + CF$UID + 1160 + + + CF$UID + 25 + + + CF$UID + 1161 + + + + 340630944.19481701 + {0, 254} + {227, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1163 + + + CF$UID + 1164 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 340715007.520365 + {3185, 2419} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1166 + + + CF$UID + 1167 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 340634798.489407 + {0, 1840} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1169 + + + CF$UID + 1170 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 340645018.90256602 + {0, 1609} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1172 + + + CF$UID + 1173 + + + CF$UID + 25 + + + CF$UID + 1174 + + + + 345487388.13644803 + {912, 1366} + {1795, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1176 + + + CF$UID + 1177 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 348348274.649975 + {784, 1230} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1179 + + + CF$UID + 1180 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 345416620.55954498 + {175, 713} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1182 + + + CF$UID + 1183 + + + CF$UID + 25 + + + CF$UID + 1184 + + + + 340588857.98394001 + {0, 1072} + {24, 767} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1186 + + + CF$UID + 1187 + + + CF$UID + 25 + + + CF$UID + 1188 + + + + 340631785.03849697 + {28409, 1632} + {29398, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1190 + + + CF$UID + 1191 + + + CF$UID + 25 + + + CF$UID + 1192 + + + + 340632146.36382198 + {0, 1162} + {1153, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1194 + + + CF$UID + 1195 + + + CF$UID + 25 + + + CF$UID + 1196 + + + + 340978419.60591 + {392, 1123} + {5521, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1198 + + + CF$UID + 1199 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 345763164.73803198 + {1306, 858} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1201 + + + CF$UID + 1202 + + + CF$UID + 25 + + + CF$UID + 1203 + + + + 340459404.56984299 + {0, 1634} + {1293, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1205 + + + CF$UID + 1206 + + + CF$UID + 25 + + + CF$UID + 1207 + + + + 340632182.02007103 + {2123, 1102} + {358, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1209 + + + CF$UID + 1210 + + + CF$UID + 25 + + + CF$UID + 1211 + + + + 345407440.14106703 + {980, 563} + {1308, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1213 + + + CF$UID + 1214 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 345570963.43227798 + {0, 307} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1216 + + + CF$UID + 1217 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 348493987.74653798 + {1400, 772} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1219 + + + CF$UID + 1220 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 345762938.27138197 + {1967, 722} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1222 + + + CF$UID + 1223 + + + CF$UID + 25 + + + CF$UID + 1224 + + + + 340715018.37839699 + {732, 1720} + {1614, 68} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1226 + + + CF$UID + 1227 + + + CF$UID + 25 + + + CF$UID + 1228 + + + + 340710896.240381 + {0, 907} + {71, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1230 + + + CF$UID + 1231 + + + CF$UID + 25 + + + CF$UID + 1232 + + + + 340978941.82531101 + {1271, 874} + {1724, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1234 + + + CF$UID + 1235 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 340743258.14034998 + {332, 2129} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1237 + + + CF$UID + 1238 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 345570916.35617101 + {1868, 787} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1240 + + + CF$UID + 1241 + + + CF$UID + 25 + + + CF$UID + 1242 + + + + 340624895.44772601 + {0, 956} + {1590, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1244 + + + CF$UID + 1245 + + + CF$UID + 25 + + + CF$UID + 1246 + + + + 340632090.00535399 + {855, 1347} + {2165, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1248 + + + CF$UID + 1249 + + + CF$UID + 25 + + + CF$UID + 1250 + + + + 345763208.75864798 + {2157, 874} + {2538, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1252 + + + CF$UID + 1253 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 340734675.59256703 + {2612, 2357} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1255 + + + CF$UID + 1256 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 348493972.20554298 + {0, 948} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1258 + + + CF$UID + 1259 + + + CF$UID + 25 + + + CF$UID + 1260 + + + + 348494575.91981101 + {202, 1322} + {1013, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1262 + + + CF$UID + 1263 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 340643026.22692502 + {0, 760} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1265 + + + CF$UID + 1266 + + + CF$UID + 25 + + + CF$UID + 1267 + + + + 345993841.814812 + {4603, 1030} + {5559, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1269 + + + CF$UID + 1270 + + + CF$UID + 25 + + + CF$UID + 1271 + + + + 345403242.32928503 + {47, 1110} + {798, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1273 + + + CF$UID + 1274 + + + CF$UID + 25 + + + CF$UID + 1275 + + + + 345994942.28171802 + {0, 1189} + {176, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1277 + + + CF$UID + 1278 + + + CF$UID + 25 + + + CF$UID + 1279 + + + + 348769524.87817502 + {27280, 1795} + {28593, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1281 + + + CF$UID + 1282 + + + CF$UID + 25 + + + CF$UID + 1283 + + + + 376240707.96911001 + {2531, 1228} + {23808, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1285 + + + CF$UID + 1286 + + + CF$UID + 25 + + + CF$UID + 1287 + + + + 348605533.47624701 + {0, 1341} + {605, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1289 + + + CF$UID + 1290 + + + CF$UID + 25 + + + CF$UID + 1291 + + + + 340567695.969051 + {0, 1207} + {830, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1293 + + + CF$UID + 1294 + + + CF$UID + 25 + + + CF$UID + 1295 + + + + 345489807.49887401 + {0, 1229} + {1146, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1297 + + + CF$UID + 1298 + + + CF$UID + 25 + + + CF$UID + 1299 + + + + 345489863.78087598 + {476, 1185} + {1510, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1301 + + + CF$UID + 1302 + + + CF$UID + 25 + + + CF$UID + 1303 + + + + 345404020.64375901 + {4401, 1141} + {5428, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1305 + + + CF$UID + 1306 + + + CF$UID + 25 + + + CF$UID + 1307 + + + + 345489170.70111698 + {709, 717} + {1130, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 142 + + + CF$UID + 143 + + + CF$UID + 144 + + + CF$UID + 145 + + + NS.objects + + + CF$UID + 1309 + + + CF$UID + 1310 + + + CF$UID + 25 + + + CF$UID + 1311 + + + + 381079266.26616299 + {1088, 2047} + {2268, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1313 + + + CF$UID + 1314 + + + CF$UID + 25 + + + CF$UID + 1315 + + + + 340715684.42909598 + {3334, 813} + {3831, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1317 + + + CF$UID + 1318 + + + CF$UID + 25 + + + CF$UID + 1319 + + + + 348348259.35793602 + {592, 833} + {3224, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1321 + + + CF$UID + 1322 + + + CF$UID + 25 + + + CF$UID + 1323 + + + + 340710918.149167 + {413, 867} + {1123, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1325 + + + CF$UID + 1326 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 340979058.26628602 + {0, 2158} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1328 + + + CF$UID + 1329 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 345763100.69483101 + {1412, 1093} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1331 + + + CF$UID + 1332 + + + CF$UID + 25 + + + CF$UID + 1333 + + + + 345401288.84783798 + {0, 1034} + {948, 79} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 142 + + + CF$UID + 143 + + + CF$UID + 144 + + + CF$UID + 145 + + + NS.objects + + + CF$UID + 1335 + + + CF$UID + 1336 + + + CF$UID + 25 + + + CF$UID + 1337 + + + + 381083143.218243 + {1711, 1286} + {2266, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1339 + + + CF$UID + 1340 + + + CF$UID + 25 + + + CF$UID + 1341 + + + + 345571135.33805102 + {3644, 993} + {4607, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1343 + + + CF$UID + 1344 + + + CF$UID + 25 + + + CF$UID + 1345 + + + + 345763340.54909998 + {1782, 1377} + {1408, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1347 + + + CF$UID + 1348 + + + CF$UID + 25 + + + CF$UID + 1349 + + + + 345403635.98861599 + {9317, 1036} + {9522, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1351 + + + CF$UID + 1352 + + + CF$UID + 25 + + + CF$UID + 1353 + + + + 348682251.432365 + {5303, 1025} + {5439, 6} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 142 + + + CF$UID + 143 + + + CF$UID + 144 + + + CF$UID + 145 + + + NS.objects + + + CF$UID + 1355 + + + CF$UID + 1356 + + + CF$UID + 25 + + + CF$UID + 1357 + + + + 381083685.054461 + {1472, 1140} + {1127, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1359 + + + CF$UID + 1360 + + + CF$UID + 25 + + + CF$UID + 1361 + + + + 345403910.70446801 + {898, 1274} + {1480, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1363 + + + CF$UID + 1364 + + + CF$UID + 25 + + + CF$UID + 1365 + + + + 340408281.394584 + {0, 1070} + {818, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1367 + + + CF$UID + 1368 + + + CF$UID + 25 + + + CF$UID + 1369 + + + + 340567709.72924697 + {111, 1169} + {2498, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1371 + + + CF$UID + 1372 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 345993841.44873297 + {6640, 969} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1374 + + + CF$UID + 1375 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 348492100.48254102 + {984, 1424} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 142 + + + CF$UID + 143 + + + CF$UID + 144 + + + CF$UID + 145 + + + NS.objects + + + CF$UID + 1377 + + + CF$UID + 1378 + + + CF$UID + 25 + + + CF$UID + 1379 + + + + 381079265.50655103 + {0, 1180} + {652, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1381 + + + CF$UID + 1382 + + + CF$UID + 25 + + + CF$UID + 1383 + + + + 345996220.58187401 + {4812, 1832} + {5468, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1385 + + + CF$UID + 1386 + + + CF$UID + 25 + + + CF$UID + 1387 + + + + 348328941.80720401 + {4812, 1747} + {5015, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1389 + + + CF$UID + 1390 + + + CF$UID + 25 + + + CF$UID + 1391 + + + + 345404215.00799 + {2896, 1165} + {3929, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1393 + + + CF$UID + 1394 + + + CF$UID + 25 + + + CF$UID + 1395 + + + + 352300514.86549997 + {1565, 1736} + {2412, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1397 + + + CF$UID + 1398 + + + CF$UID + 25 + + + CF$UID + 1399 + + + + 340724015.08366603 + {2833, 942} + {6706, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1401 + + + CF$UID + 1402 + + + CF$UID + 25 + + + CF$UID + 1403 + + + + 348425521.71969801 + {5676, 932} + {6233, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1405 + + + CF$UID + 1406 + + + CF$UID + 25 + + + CF$UID + 1407 + + + + 345570983.01814902 + {0, 528} + {521, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1409 + + + CF$UID + 1410 + + + CF$UID + 25 + + + CF$UID + 1411 + + + + 340497412.20933402 + {1831, 988} + {2427, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1413 + + + CF$UID + 1414 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 345407318.56900901 + {0, 2329} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1416 + + + CF$UID + 1417 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 345406868.72379202 + {2708, 1368} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1419 + + + CF$UID + 1420 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 348682639.65947402 + {2316, 1465} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1422 + + + CF$UID + 1423 + + + CF$UID + 25 + + + CF$UID + 1424 + + + + 340629051.56177503 + {10183, 1616} + {10616, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1426 + + + CF$UID + 1427 + + + CF$UID + 25 + + + CF$UID + 1428 + + + + 345403358.18671203 + {0, 778} + {177, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1430 + + + CF$UID + 1431 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 340628546.57123297 + {644, 1063} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1433 + + + CF$UID + 1434 + + + CF$UID + 25 + + + CF$UID + 1435 + + + + 345403253.67140001 + {106, 1057} + {1029, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1437 + + + CF$UID + 1438 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 345407415.72300202 + {798, 781} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1440 + + + CF$UID + 1441 + + + CF$UID + 25 + + + CF$UID + 1442 + + + + 345488818.74460101 + {35, 1246} + {1367, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1444 + + + CF$UID + 1445 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 348682657.38014698 + {3283, 1343} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1447 + + + CF$UID + 1448 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 340411515.847987 + {0, 1981} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 948 + + + CF$UID + 787 + + + CF$UID + 924 + + + CF$UID + 1450 + + + CF$UID + 950 + + + NS.objects + + + CF$UID + 1452 + + + CF$UID + 1456 + + + CF$UID + 1458 + + + CF$UID + 1461 + + + CF$UID + 1464 + + + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1451 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/TikZiT.xcodeproj/aleks.mode1v3 + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1453 + + + CF$UID + 1454 + + + CF$UID + 25 + + + CF$UID + 1455 + + + + 340366198.37379301 + {1726, 1368} + {1954, 0} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 357 + + + CF$UID + 359 + + + CF$UID + 358 + + + NS.objects + + + CF$UID + 360 + + + CF$UID + 1457 + + + CF$UID + 360 + + + + 340393968.41070002 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 357 + + + CF$UID + 359 + + + CF$UID + 358 + + + NS.objects + + + CF$UID + 360 + + + CF$UID + 1459 + + + CF$UID + 1460 + + + + 340394097.732535 + {4237, 1279} + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 357 + + + CF$UID + 358 + + + CF$UID + 359 + + + NS.objects + + + CF$UID + 360 + + + CF$UID + 1462 + + + CF$UID + 1463 + + + + {0, 1026} + 340539479.94429201 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 359 + + + CF$UID + 358 + + + CF$UID + 400 + + + CF$UID + 357 + + + NS.objects + + + CF$UID + 1465 + + + CF$UID + 360 + + + CF$UID + 25 + + + CF$UID + 360 + + + + 348502939.40997303 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1467 + + + NS.objects + + + CF$UID + 1469 + + + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1468 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/StylePalette-fPGoyqLn.xib + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 357 + + + CF$UID + 358 + + + CF$UID + 359 + + + NS.objects + + + CF$UID + 360 + + + CF$UID + 1470 + + + CF$UID + 1471 + + + + {89564, 1173} + 340370036.79549003 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 881 + + + NS.objects + + + CF$UID + 1473 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 357 + + + CF$UID + 358 + + + CF$UID + 359 + + + NS.objects + + + CF$UID + 360 + + + CF$UID + 361 + + + CF$UID + 1474 + + + + 348502941.57143199 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1476 + + + CF$UID + 1478 + + + CF$UID + 1480 + + + NS.objects + + + CF$UID + 1482 + + + CF$UID + 1506 + + + CF$UID + 1551 + + + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1477 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/git/tikzit/tikzit/TikZiT.xcodeproj/ + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1479 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/TikZiT.xcodeproj + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1481 + + + + $class + + CF$UID + 109 + + NS.string + file://localhost/Users/aleks/svn/tikzit/tikzit/TikZiT.xcodeproj/ + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1483 + + + CF$UID + 1484 + + + CF$UID + 1485 + + + CF$UID + 1486 + + + NS.objects + + + CF$UID + 1487 + + + CF$UID + 1496 + + + CF$UID + 1497 + + + CF$UID + 1505 + + + + Xcode3ProjectEditor.sourceList.splitview + Xcode3ProjectEditorPreviousTargetEditorClass + Xcode3ProjectEditorSelectedDocumentLocations + Xcode3ProjectEditor_Xcode3TargetEditor + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1488 + + + NS.objects + + + CF$UID + 1489 + + + + DVTSplitViewItems + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 1490 + + + CF$UID + 1494 + + + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1491 + + + CF$UID + 1492 + + + NS.objects + + + CF$UID + 221 + + + CF$UID + 1493 + + + + DVTIdentifier + DVTViewMagnitude + 170 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1491 + + + CF$UID + 1492 + + + NS.objects + + + CF$UID + 221 + + + CF$UID + 1495 + + + + 645 + Xcode3TargetEditor + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 1498 + + + + + $class + + CF$UID + 1504 + + documentURL + + CF$UID + 1499 + + selection + + CF$UID + 1501 + + timestamp + + CF$UID + 1500 + + + file://localhost/Users/aleks/git/tikzit/tikzit/TikZiT.xcodeproj/ + 380738961.54778898 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1502 + + + CF$UID + 1503 + + + NS.objects + + + CF$UID + 1496 + + + CF$UID + 254 + + + + Editor + Target + + $classes + + Xcode3ProjectDocumentLocation + DVTDocumentLocation + NSObject + + $classname + Xcode3ProjectDocumentLocation + + + $class + + CF$UID + 39 + + NS.keys + + NS.objects + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1507 + + + CF$UID + 1483 + + + CF$UID + 1484 + + + CF$UID + 1485 + + + CF$UID + 1508 + + + NS.objects + + + CF$UID + 1509 + + + CF$UID + 1510 + + + CF$UID + 1509 + + + CF$UID + 1516 + + + CF$UID + 1550 + + + + Xcode3ProjectEditorPreviousProjectEditorClass + Xcode3ProjectEditor_Xcode3BuildSettingsEditor + Xcode3BuildSettingsEditor + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1488 + + + NS.objects + + + CF$UID + 1511 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 1512 + + + CF$UID + 1514 + + + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1491 + + + CF$UID + 1492 + + + NS.objects + + + CF$UID + 221 + + + CF$UID + 1513 + + + + 170 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1491 + + + CF$UID + 1492 + + + NS.objects + + + CF$UID + 221 + + + CF$UID + 1515 + + + + 645 + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 1517 + + + + + $class + + CF$UID + 1504 + + documentURL + + CF$UID + 1518 + + selection + + CF$UID + 1520 + + timestamp + + CF$UID + 1519 + + + file://localhost/Users/aleks/svn/tikzit/TikZiT.xcodeproj/ + 345993840.88442099 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1521 + + + CF$UID + 1502 + + + CF$UID + 1522 + + + NS.objects + + + CF$UID + 254 + + + CF$UID + 1509 + + + CF$UID + 1523 + + + + Project + Xcode3BuildSettingsEditorLocations + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 1524 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1525 + + + CF$UID + 1526 + + + CF$UID + 1527 + + + CF$UID + 1528 + + + CF$UID + 1529 + + + CF$UID + 1530 + + + NS.objects + + + CF$UID + 1531 + + + CF$UID + 1548 + + + CF$UID + 246 + + + CF$UID + 246 + + + CF$UID + 163 + + + CF$UID + 163 + + + + Collapsed Build Property Categories + Selected Build Properties + Xcode3BuildSettingsEditorDisplayMode + Xcode3BuildPropertyValueDisplayMode + Xcode3BuildSettingsEditorMode + Xcode3BuildPropertyNameDisplayMode + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 1532 + + + CF$UID + 1533 + + + CF$UID + 1534 + + + CF$UID + 1535 + + + CF$UID + 1536 + + + CF$UID + 1537 + + + CF$UID + 1538 + + + CF$UID + 1539 + + + CF$UID + 1540 + + + CF$UID + 1541 + + + CF$UID + 1542 + + + CF$UID + 1543 + + + CF$UID + 1544 + + + CF$UID + 1545 + + + CF$UID + 1546 + + + CF$UID + 1547 + + + + + $class + + CF$UID + 109 + + NS.string + Architectures||ARCHS + + + $class + + CF$UID + 109 + + NS.string + Architectures||SDKROOT + + + $class + + CF$UID + 109 + + NS.string + Architectures||VALID_ARCHS + + + $class + + CF$UID + 109 + + NS.string + Build Locations||SYMROOT + + + $class + + CF$UID + 109 + + NS.string + Build Options||PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR + + + $class + + CF$UID + 109 + + NS.string + Deployment||INSTALL_PATH + + + $class + + CF$UID + 109 + + NS.string + Deployment||MACOSX_DEPLOYMENT_TARGET + + + $class + + CF$UID + 109 + + NS.string + Deployment||STRIP_INSTALLED_PRODUCT + + + $class + + CF$UID + 109 + + NS.string + Packaging||INFOPLIST_FILE + + + $class + + CF$UID + 109 + + NS.string + Packaging||PRODUCT_NAME + + + $class + + CF$UID + 109 + + NS.string + Search Paths||HEADER_SEARCH_PATHS + + + $class + + CF$UID + 109 + + NS.string + Search Paths||USER_HEADER_SEARCH_PATHS + + + $class + + CF$UID + 109 + + NS.string + LLVM GCC 4.2 - Code Generation||GCC_ENABLE_OBJC_GC + + + $class + + CF$UID + 109 + + NS.string + LLVM GCC 4.2 - Language||GCC_C_LANGUAGE_STANDARD + + + $class + + CF$UID + 109 + + NS.string + LLVM GCC 4.2 - Warnings||GCC_WARN_ABOUT_RETURN_TYPE + + + $class + + CF$UID + 109 + + NS.string + LLVM GCC 4.2 - Warnings||GCC_WARN_UNUSED_VARIABLE + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 1549 + + + + + $class + + CF$UID + 109 + + NS.string + LLVM GCC 4.2 - Code Generation||GCC_ENABLE_OBJC_GC + + + $class + + CF$UID + 39 + + NS.keys + + NS.objects + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1507 + + + CF$UID + 1483 + + + CF$UID + 1484 + + + CF$UID + 1485 + + + CF$UID + 1508 + + + NS.objects + + + CF$UID + 1509 + + + CF$UID + 1552 + + + CF$UID + 1509 + + + CF$UID + 1558 + + + CF$UID + 1584 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1488 + + + NS.objects + + + CF$UID + 1553 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 1554 + + + CF$UID + 1556 + + + + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1491 + + + CF$UID + 1492 + + + NS.objects + + + CF$UID + 221 + + + CF$UID + 1555 + + + + 170 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1491 + + + CF$UID + 1492 + + + NS.objects + + + CF$UID + 221 + + + CF$UID + 1557 + + + + 645 + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 1559 + + + + + $class + + CF$UID + 1504 + + documentURL + + CF$UID + 1560 + + selection + + CF$UID + 1562 + + timestamp + + CF$UID + 1561 + + + file://localhost/Users/aleks/svn/tikzit/tikzit/TikZiT.xcodeproj/ + 348348307.809012 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1521 + + + CF$UID + 1502 + + + CF$UID + 1522 + + + NS.objects + + + CF$UID + 254 + + + CF$UID + 1509 + + + CF$UID + 1563 + + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 1564 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1530 + + + CF$UID + 1526 + + + CF$UID + 1527 + + + CF$UID + 1528 + + + CF$UID + 1529 + + + CF$UID + 1525 + + + NS.objects + + + CF$UID + 163 + + + CF$UID + 1565 + + + CF$UID + 246 + + + CF$UID + 246 + + + CF$UID + 163 + + + CF$UID + 1567 + + + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 1566 + + + + + $class + + CF$UID + 109 + + NS.string + Architectures||VALID_ARCHS + + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 1568 + + + CF$UID + 1569 + + + CF$UID + 1570 + + + CF$UID + 1571 + + + CF$UID + 1572 + + + CF$UID + 1573 + + + CF$UID + 1574 + + + CF$UID + 1575 + + + CF$UID + 1576 + + + CF$UID + 1577 + + + CF$UID + 1578 + + + CF$UID + 1579 + + + CF$UID + 1580 + + + CF$UID + 1581 + + + CF$UID + 1582 + + + CF$UID + 1583 + + + + + $class + + CF$UID + 109 + + NS.string + Architectures||ARCHS + + + $class + + CF$UID + 109 + + NS.string + Architectures||SDKROOT + + + $class + + CF$UID + 109 + + NS.string + Architectures||VALID_ARCHS + + + $class + + CF$UID + 109 + + NS.string + Build Locations||SYMROOT + + + $class + + CF$UID + 109 + + NS.string + Build Options||PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR + + + $class + + CF$UID + 109 + + NS.string + Deployment||INSTALL_PATH + + + $class + + CF$UID + 109 + + NS.string + Deployment||MACOSX_DEPLOYMENT_TARGET + + + $class + + CF$UID + 109 + + NS.string + Deployment||STRIP_INSTALLED_PRODUCT + + + $class + + CF$UID + 109 + + NS.string + Packaging||INFOPLIST_FILE + + + $class + + CF$UID + 109 + + NS.string + Packaging||PRODUCT_NAME + + + $class + + CF$UID + 109 + + NS.string + Search Paths||HEADER_SEARCH_PATHS + + + $class + + CF$UID + 109 + + NS.string + Search Paths||USER_HEADER_SEARCH_PATHS + + + $class + + CF$UID + 109 + + NS.string + LLVM GCC 4.2 - Code Generation||GCC_ENABLE_OBJC_GC + + + $class + + CF$UID + 109 + + NS.string + LLVM GCC 4.2 - Language||GCC_C_LANGUAGE_STANDARD + + + $class + + CF$UID + 109 + + NS.string + LLVM GCC 4.2 - Warnings||GCC_WARN_ABOUT_RETURN_TYPE + + + $class + + CF$UID + 109 + + NS.string + LLVM GCC 4.2 - Warnings||GCC_WARN_UNUSED_VARIABLE + + + $class + + CF$UID + 39 + + NS.keys + + NS.objects + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1586 + + + CF$UID + 1588 + + + CF$UID + 1590 + + + CF$UID + 1592 + + + CF$UID + 1594 + + + NS.objects + + + CF$UID + 1596 + + + CF$UID + 1604 + + + CF$UID + 1609 + + + CF$UID + 1614 + + + CF$UID + 1619 + + + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1587 + + + x-xcode-log://93BF0A7E-9B8F-4127-9E53-6FD4359563C8 + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1589 + + + x-xcode-log://E16FA7B2-DE55-4431-89C7-43D8A6C6BE2B + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1591 + + + x-xcode-log://541A0579-23A7-4735-AC53-0CA54C1CC926 + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1593 + + + x-xcode-log://4E6ECE08-C292-42A5-9EB8-F1D770002C74 + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1595 + + + x-xcode-log://56055AA1-9319-4181-AD73-7A2BA288B024 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 560 + + + NS.objects + + + CF$UID + 1597 + + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 1598 + + + + + $class + + CF$UID + 1603 + + documentURL + + CF$UID + 1587 + + expandTranscript + + indexPath + + CF$UID + 1599 + + timestamp + + CF$UID + 0 + + + + $class + + CF$UID + 1602 + + NSIndexPathData + + CF$UID + 1600 + + NSIndexPathLength + 2 + + + $class + + CF$UID + 1601 + + NS.data + + AEc= + + + + $classes + + NSMutableData + NSData + NSObject + + $classname + NSMutableData + + + $classes + + NSIndexPath + NSObject + + $classname + NSIndexPath + + + $classes + + IDELogDocumentLocation + DVTDocumentLocation + NSObject + + $classname + IDELogDocumentLocation + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 560 + + + NS.objects + + + CF$UID + 1605 + + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 1606 + + + + + $class + + CF$UID + 1603 + + documentURL + + CF$UID + 1589 + + expandTranscript + + indexPath + + CF$UID + 1607 + + timestamp + + CF$UID + 0 + + + + $class + + CF$UID + 1602 + + NSIndexPathData + + CF$UID + 1608 + + NSIndexPathLength + 2 + + + $class + + CF$UID + 1601 + + NS.data + + AEc= + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 560 + + + NS.objects + + + CF$UID + 1610 + + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 1611 + + + + + $class + + CF$UID + 1603 + + documentURL + + CF$UID + 1591 + + expandTranscript + + indexPath + + CF$UID + 1612 + + timestamp + + CF$UID + 0 + + + + $class + + CF$UID + 1602 + + NSIndexPathData + + CF$UID + 1613 + + NSIndexPathLength + 2 + + + $class + + CF$UID + 1601 + + NS.data + + AEc= + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 560 + + + NS.objects + + + CF$UID + 1615 + + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 1616 + + + + + $class + + CF$UID + 1603 + + documentURL + + CF$UID + 1593 + + expandTranscript + + indexPath + + CF$UID + 1617 + + timestamp + + CF$UID + 0 + + + + $class + + CF$UID + 1602 + + NSIndexPathData + + CF$UID + 1618 + + NSIndexPathLength + 2 + + + $class + + CF$UID + 1601 + + NS.data + + AEc= + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 560 + + + NS.objects + + + CF$UID + 1620 + + + + + $class + + CF$UID + 60 + + NS.objects + + + CF$UID + 1621 + + + + + $class + + CF$UID + 1603 + + documentURL + + CF$UID + 1595 + + expandTranscript + + indexPath + + CF$UID + 1622 + + timestamp + + CF$UID + 0 + + + + $class + + CF$UID + 1602 + + NSIndexPathData + + CF$UID + 1623 + + NSIndexPathLength + 2 + + + $class + + CF$UID + 1601 + + NS.data + + AEg= + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1625 + + + CF$UID + 1626 + + + NS.objects + + + CF$UID + 1627 + + + CF$UID + 1628 + + + + IDEDeviceLocation + IDEDeviceArchitecture + dvtdevice-local-computer:localhost + i386 + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1630 + + + NS.objects + + + CF$UID + 1631 + + + + IDENameString + TikZiT + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1633 + + + CF$UID + 1634 + + + CF$UID + 1635 + + + NS.objects + + + CF$UID + 1636 + + + CF$UID + 1661 + + + CF$UID + 57 + + + + IDEActivityReportCompletionSummaryStringSegments + IDEActivityReportOptions + IDEActivityReportTitle + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 1637 + + + CF$UID + 1644 + + + CF$UID + 1648 + + + CF$UID + 1652 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1638 + + + CF$UID + 1639 + + + CF$UID + 1640 + + + NS.objects + + + CF$UID + 1641 + + + CF$UID + 1642 + + + CF$UID + 1643 + + + + IDEActivityReportStringSegmentPriority + IDEActivityReportStringSegmentBackSeparator + IDEActivityReportStringSegmentStringValue + 2 + + Build + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1638 + + + CF$UID + 1639 + + + CF$UID + 1640 + + + NS.objects + + + CF$UID + 1645 + + + CF$UID + 1646 + + + CF$UID + 1647 + + + + 4 + : + TikZiT + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1638 + + + CF$UID + 1639 + + + CF$UID + 1640 + + + NS.objects + + + CF$UID + 1649 + + + CF$UID + 1650 + + + CF$UID + 1651 + + + + 1 + │ + + $class + + CF$UID + 1601 + + NS.data + + YnBsaXN0MDDUAQIDBAUGOzxYJHZlcnNpb25YJG9iamVjdHNZJGFy + Y2hpdmVyVCR0b3ASAAGGoK0HCA8QGhscJCUrMTQ3VSRudWxs0wkK + CwwNDlxOU0F0dHJpYnV0ZXNWJGNsYXNzWE5TU3RyaW5ngAOADIAC + WVN1Y2NlZWRlZNMKERITFBdXTlMua2V5c1pOUy5vYmplY3RzgAui + FRaABIAFohgZgAaACVZOU0ZvbnRXTlNDb2xvctQKHR4fICEiI1ZO + U05hbWVWTlNTaXplWE5TZkZsYWdzgAiAByNAJgAAAAAAABENEF8Q + EUx1Y2lkYUdyYW5kZS1Cb2xk0iYnKClaJGNsYXNzbmFtZVgkY2xh + c3Nlc1ZOU0ZvbnSiKCpYTlNPYmplY3TTCiwtLi8wXE5TQ29sb3JT + cGFjZVdOU1doaXRlgAoQA0IwANImJzIzV05TQ29sb3KiMirSJic1 + NlxOU0RpY3Rpb25hcnmiNSrSJic4OV8QEk5TQXR0cmlidXRlZFN0 + cmluZ6I6Kl8QEk5TQXR0cmlidXRlZFN0cmluZ18QD05TS2V5ZWRB + cmNoaXZlctE9PlRyb290gAEACAARABoAIwAtADIANwBFAEsAUgBf + AGYAbwBxAHMAdQB/AIYAjgCZAJsAngCgAKIApQCnAKkAsAC4AMEA + yADPANgA2gDcAOUA6AD8AQEBDAEVARwBHwEoAS8BPAFEAUYBSAFL + AVABWAFbAWABbQFwAXUBigGNAaIBtAG3AbwAAAAAAAACAQAAAAAA + AAA/AAAAAAAAAAAAAAAAAAABvg== + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1638 + + + CF$UID + 1653 + + + CF$UID + 1654 + + + CF$UID + 1640 + + + CF$UID + 1655 + + + CF$UID + 1656 + + + NS.objects + + + CF$UID + 1657 + + + CF$UID + 163 + + + CF$UID + 1658 + + + CF$UID + 1660 + + + CF$UID + 163 + + + CF$UID + 163 + + + + IDEActivityReportStringSegmentType + IDEActivityReportStringSegmentDate + IDEActivityReportStringSegmentDateStyle + IDEActivityReportStringSegmentTimeStyle + 3 + + $class + + CF$UID + 1659 + + NS.time + 381083546.00637001 + + + $classes + + NSDate + NSObject + + $classname + NSDate + + Today at 16:32 + 234 + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 3 + + + + + $class + + CF$UID + 39 + + NS.keys + + + CF$UID + 1664 + + + CF$UID + 1666 + + + CF$UID + 1668 + + + CF$UID + 1670 + + + CF$UID + 1672 + + + CF$UID + 1674 + + + CF$UID + 1676 + + + CF$UID + 1678 + + + CF$UID + 1680 + + + CF$UID + 1682 + + + CF$UID + 784 + + + CF$UID + 1684 + + + CF$UID + 1685 + + + CF$UID + 1687 + + + CF$UID + 1689 + + + CF$UID + 1691 + + + CF$UID + 1693 + + + CF$UID + 1695 + + + CF$UID + 907 + + + NS.objects + + + CF$UID + 1697 + + + CF$UID + 1702 + + + CF$UID + 1705 + + + CF$UID + 1708 + + + CF$UID + 1711 + + + CF$UID + 1714 + + + CF$UID + 1717 + + + CF$UID + 1720 + + + CF$UID + 1723 + + + CF$UID + 1726 + + + CF$UID + 1729 + + + CF$UID + 1734 + + + CF$UID + 1737 + + + CF$UID + 1740 + + + CF$UID + 1743 + + + CF$UID + 1746 + + + CF$UID + 1749 + + + CF$UID + 1752 + + + CF$UID + 1755 + + + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1665 + + + file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/GraphicsView.m + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1667 + + + file://localhost/Users/aleks/svn/tikzit/src/common/NodeStyle.m + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1669 + + + file://localhost/Users/aleks/svn/tikzit/English.lproj/TikzDocument.xib + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1671 + + + file://localhost/Users/aleks/svn/tikzit/src/common/Node.m + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1673 + + + file://localhost/Users/aleks/svn/tikzit/src/osx/PropertyInspectorController.m + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1675 + + + file://localhost/Users/aleks/git/tikzit/tikzit/src/osx/GraphicsView.m + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1677 + + + file://localhost/Users/aleks/svn/tikzit/English.lproj/StylePalette.xib + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1679 + + + file://localhost/Users/aleks/svn/tikzit/src/osx/StylePaletteController.m + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1681 + + + file://localhost/Users/aleks/git/tikzit/tikzit/src/common/Edge.m + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1683 + + + file://localhost/Users/aleks/git/tikzit/tikzit/src/osx/Grid.m + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1518 + + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1686 + + + file://localhost/Users/aleks/svn/tikzit/English.lproj/PropertyInspector.xib + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1688 + + + file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/PreviewController.m + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1690 + + + file://localhost/Users/aleks/git/tikzit/tikzit/src/common/TikzGraphAssembler.m + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1692 + + + file://localhost/Users/aleks/git/tikzit/tikzit/src/common/tikzlexer.lm + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1694 + + + file://localhost/Users/aleks/svn/tikzit/src/osx/NodeLayer.h + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1696 + + + file://localhost/Users/aleks/svn/tikzit/English.lproj/Preview.xib + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1698 + + + CF$UID + 1699 + + + NS.objects + + + CF$UID + 1700 + + + CF$UID + 1701 + + + + width + height + 600 + 600 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1698 + + + CF$UID + 1699 + + + NS.objects + + + CF$UID + 1703 + + + CF$UID + 1704 + + + + 600 + 600 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1698 + + + CF$UID + 1699 + + + NS.objects + + + CF$UID + 1706 + + + CF$UID + 1707 + + + + 600 + 600 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1698 + + + CF$UID + 1699 + + + NS.objects + + + CF$UID + 1709 + + + CF$UID + 1710 + + + + 600 + 600 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1698 + + + CF$UID + 1699 + + + NS.objects + + + CF$UID + 1712 + + + CF$UID + 1713 + + + + 600 + 600 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1698 + + + CF$UID + 1699 + + + NS.objects + + + CF$UID + 1715 + + + CF$UID + 1716 + + + + 600 + 600 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1698 + + + CF$UID + 1699 + + + NS.objects + + + CF$UID + 1718 + + + CF$UID + 1719 + + + + 1133 + 763 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1698 + + + CF$UID + 1699 + + + NS.objects + + + CF$UID + 1721 + + + CF$UID + 1722 + + + + 600 + 600 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1698 + + + CF$UID + 1699 + + + NS.objects + + + CF$UID + 1724 + + + CF$UID + 1725 + + + + 600 + 600 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1698 + + + CF$UID + 1699 + + + NS.objects + + + CF$UID + 1727 + + + CF$UID + 1728 + + + + 600 + 600 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1730 + + + CF$UID + 1731 + + + NS.objects + + + CF$UID + 1732 + + + CF$UID + 1733 + + + + width + height + 600 + 600 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1698 + + + CF$UID + 1699 + + + NS.objects + + + CF$UID + 1735 + + + CF$UID + 1736 + + + + 600 + 600 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1698 + + + CF$UID + 1699 + + + NS.objects + + + CF$UID + 1738 + + + CF$UID + 1739 + + + + 600 + 600 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1698 + + + CF$UID + 1699 + + + NS.objects + + + CF$UID + 1741 + + + CF$UID + 1742 + + + + 600 + 600 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1698 + + + CF$UID + 1699 + + + NS.objects + + + CF$UID + 1744 + + + CF$UID + 1745 + + + + 600 + 600 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1698 + + + CF$UID + 1699 + + + NS.objects + + + CF$UID + 1747 + + + CF$UID + 1748 + + + + 600 + 600 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1698 + + + CF$UID + 1699 + + + NS.objects + + + CF$UID + 1750 + + + CF$UID + 1751 + + + + 600 + 600 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1698 + + + CF$UID + 1699 + + + NS.objects + + + CF$UID + 1753 + + + CF$UID + 1754 + + + + 600 + 600 + + $class + + CF$UID + 35 + + NS.keys + + + CF$UID + 1730 + + + CF$UID + 1731 + + + NS.objects + + + CF$UID + 1756 + + + CF$UID + 1757 + + + + 600 + 600 + + $class + + CF$UID + 38 + + NS.objects + + + CF$UID + 1759 + + + CF$UID + 1761 + + + CF$UID + 1763 + + + CF$UID + 1765 + + + CF$UID + 1767 + + + CF$UID + 1769 + + + CF$UID + 1771 + + + CF$UID + 1772 + + + CF$UID + 1773 + + + CF$UID + 1774 + + + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1760 + + + file://localhost/Users/aleks/git/tikzit/tikzit/src/common/Graph.m + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1762 + + + file://localhost/Users/aleks/git/tikzit/tikzit/src/common/Edge.m + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1764 + + + file://localhost/Users/aleks/git/tikzit/tikzit/src/common/tikzparser.ym + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1766 + + + file://localhost/Users/aleks/git/tikzit/tikzit/src/common/tikzlexer.lm + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1768 + + + file://localhost/Users/aleks/git/tikzit/tikzit/src/common/TikzGraphAssembler.m + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1770 + + + file://localhost/Users/aleks/git/tikzit/tikzit/TikZiT-Info.plist + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1499 + + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1683 + + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 1675 + + + + $class + + CF$UID + 153 + + NS.base + + CF$UID + 0 + + NS.relative + + CF$UID + 365 + + + + $top + + State + + CF$UID + 1 + + + $version + 100000 + + diff --git a/tikzit-old/TikZiT.xcodeproj/project.xcworkspace/xcuserdata/aleks.xcuserdatad/WorkspaceSettings.xcsettings b/tikzit-old/TikZiT.xcodeproj/project.xcworkspace/xcuserdata/aleks.xcuserdatad/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..c1034ce --- /dev/null +++ b/tikzit-old/TikZiT.xcodeproj/project.xcworkspace/xcuserdata/aleks.xcuserdatad/WorkspaceSettings.xcsettings @@ -0,0 +1,22 @@ + + + + + IDEWorkspaceUserSettings_BuildLocationStyle + 2 + IDEWorkspaceUserSettings_BuildSubfolderNameStyle + 0 + IDEWorkspaceUserSettings_DerivedDataLocationStyle + 0 + IDEWorkspaceUserSettings_HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges + + IDEWorkspaceUserSettings_IssueFilterStyle + 0 + IDEWorkspaceUserSettings_LiveSourceIssuesEnabled + + IDEWorkspaceUserSettings_SnapshotAutomaticallyBeforeSignificantChanges + + IDEWorkspaceUserSettings_SnapshotLocationStyle + 0 + + diff --git a/tikzit-old/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist b/tikzit-old/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist new file mode 100644 index 0000000..5a56e60 --- /dev/null +++ b/tikzit-old/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tikzit-old/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/TikZiT.xcscheme b/tikzit-old/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/TikZiT.xcscheme new file mode 100644 index 0000000..86e70a8 --- /dev/null +++ b/tikzit-old/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/TikZiT.xcscheme @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tikzit-old/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/tests.xcscheme b/tikzit-old/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/tests.xcscheme new file mode 100644 index 0000000..9e1a430 --- /dev/null +++ b/tikzit-old/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/tests.xcscheme @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tikzit-old/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/xcschememanagement.plist b/tikzit-old/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..3291a35 --- /dev/null +++ b/tikzit-old/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,32 @@ + + + + + SchemeUserState + + TikZiT.xcscheme + + orderHint + 1 + + tests.xcscheme + + orderHint + 0 + + + SuppressBuildableAutocreation + + 5589AA6411C5429C0064D310 + + primary + + + 8D15AC270486D014006FF6A4 + + primary + + + + + diff --git a/tikzit-old/TikZiT_Prefix.pch b/tikzit-old/TikZiT_Prefix.pch new file mode 100644 index 0000000..78e4d0f --- /dev/null +++ b/tikzit-old/TikZiT_Prefix.pch @@ -0,0 +1,30 @@ +// +// TikZiT_Prefix.pch +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +// +// Prefix header for all source files of the 'TikZiT' target in the 'TikZiT' project +// + +#ifdef __OBJC__ + #import +#endif diff --git a/tikzit-old/autogen.sh b/tikzit-old/autogen.sh new file mode 100755 index 0000000..132ecd0 --- /dev/null +++ b/tikzit-old/autogen.sh @@ -0,0 +1,1578 @@ +#!/bin/sh +# a u t o g e n . s h +# +# Copyright (c) 2005-2009 United States Government as represented by +# the U.S. Army Research Laboratory. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following +# disclaimer in the documentation and/or other materials provided +# with the distribution. +# +# 3. The name of the author may not be used to endorse or promote +# products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS +# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +### +# +# Script for automatically preparing the sources for compilation by +# performing the myriad of necessary steps. The script attempts to +# detect proper version support, and outputs warnings about particular +# systems that have autotool peculiarities. +# +# Basically, if everything is set up and installed correctly, the +# script will validate that minimum versions of the GNU Build System +# tools are installed, account for several common configuration +# issues, and then simply run autoreconf for you. +# +# If autoreconf fails, which can happen for many valid configurations, +# this script proceeds to run manual preparation steps effectively +# providing a POSIX shell script (mostly complete) reimplementation of +# autoreconf. +# +# The AUTORECONF, AUTOCONF, AUTOMAKE, LIBTOOLIZE, ACLOCAL, AUTOHEADER +# environment variables and corresponding _OPTIONS variables (e.g. +# AUTORECONF_OPTIONS) may be used to override the default automatic +# detection behaviors. Similarly the _VERSION variables will override +# the minimum required version numbers. +# +# Examples: +# +# To obtain help on usage: +# ./autogen.sh --help +# +# To obtain verbose output: +# ./autogen.sh --verbose +# +# To skip autoreconf and prepare manually: +# AUTORECONF=false ./autogen.sh +# +# To verbosely try running with an older (unsupported) autoconf: +# AUTOCONF_VERSION=2.50 ./autogen.sh --verbose +# +# Author: +# Christopher Sean Morrison +# +# Patches: +# Sebastian Pipping +# +###################################################################### + +# set to minimum acceptable version of autoconf +if [ "x$AUTOCONF_VERSION" = "x" ] ; then + AUTOCONF_VERSION=2.60 +fi +# set to minimum acceptable version of automake +if [ "x$AUTOMAKE_VERSION" = "x" ] ; then + AUTOMAKE_VERSION=1.6.0 +fi +# set to minimum acceptable version of libtool +if [ "x$LIBTOOL_VERSION" = "x" ] ; then + LIBTOOL_VERSION=1.4.2 +fi + + +################## +# ident function # +################## +ident ( ) { + # extract copyright from header + __copyright="`grep Copyright $AUTOGEN_SH | head -${HEAD_N}1 | awk '{print $4}'`" + if [ "x$__copyright" = "x" ] ; then + __copyright="`date +%Y`" + fi + + # extract version from CVS Id string + __id="$Id: autogen.sh 33925 2009-03-01 23:27:06Z brlcad $" + __version="`echo $__id | sed 's/.*\([0-9][0-9][0-9][0-9]\)[-\/]\([0-9][0-9]\)[-\/]\([0-9][0-9]\).*/\1\2\3/'`" + if [ "x$__version" = "x" ] ; then + __version="" + fi + + echo "autogen.sh build preparation script by Christopher Sean Morrison" + echo " + config.guess download patch by Sebastian Pipping (2008-12-03)" + echo "revised 3-clause BSD-style license, copyright (c) $__copyright" + echo "script version $__version, ISO/IEC 9945 POSIX shell script" +} + + +################## +# USAGE FUNCTION # +################## +usage ( ) { + echo "Usage: $AUTOGEN_SH [-h|--help] [-v|--verbose] [-q|--quiet] [-d|--download] [--version]" + echo " --help Help on $NAME_OF_AUTOGEN usage" + echo " --verbose Verbose progress output" + echo " --quiet Quiet suppressed progress output" + echo " --download Download the latest config.guess from gnulib" + echo " --version Only perform GNU Build System version checks" + echo + echo "Description: This script will validate that minimum versions of the" + echo "GNU Build System tools are installed and then run autoreconf for you." + echo "Should autoreconf fail, manual preparation steps will be run" + echo "potentially accounting for several common preparation issues. The" + + echo "AUTORECONF, AUTOCONF, AUTOMAKE, LIBTOOLIZE, ACLOCAL, AUTOHEADER," + echo "PROJECT, & CONFIGURE environment variables and corresponding _OPTIONS" + echo "variables (e.g. AUTORECONF_OPTIONS) may be used to override the" + echo "default automatic detection behavior." + echo + + ident + + return 0 +} + + +########################## +# VERSION_ERROR FUNCTION # +########################## +version_error ( ) { + if [ "x$1" = "x" ] ; then + echo "INTERNAL ERROR: version_error was not provided a version" + exit 1 + fi + if [ "x$2" = "x" ] ; then + echo "INTERNAL ERROR: version_error was not provided an application name" + exit 1 + fi + $ECHO + $ECHO "ERROR: To prepare the ${PROJECT} build system from scratch," + $ECHO " at least version $1 of $2 must be installed." + $ECHO + $ECHO "$NAME_OF_AUTOGEN does not need to be run on the same machine that will" + $ECHO "run configure or make. Either the GNU Autotools will need to be installed" + $ECHO "or upgraded on this system, or $NAME_OF_AUTOGEN must be run on the source" + $ECHO "code on another system and then transferred to here. -- Cheers!" + $ECHO +} + +########################## +# VERSION_CHECK FUNCTION # +########################## +version_check ( ) { + if [ "x$1" = "x" ] ; then + echo "INTERNAL ERROR: version_check was not provided a minimum version" + exit 1 + fi + _min="$1" + if [ "x$2" = "x" ] ; then + echo "INTERNAL ERROR: version check was not provided a comparison version" + exit 1 + fi + _cur="$2" + + # needed to handle versions like 1.10 and 1.4-p6 + _min="`echo ${_min}. | sed 's/[^0-9]/./g' | sed 's/\.\././g'`" + _cur="`echo ${_cur}. | sed 's/[^0-9]/./g' | sed 's/\.\././g'`" + + _min_major="`echo $_min | cut -d. -f1`" + _min_minor="`echo $_min | cut -d. -f2`" + _min_patch="`echo $_min | cut -d. -f3`" + + _cur_major="`echo $_cur | cut -d. -f1`" + _cur_minor="`echo $_cur | cut -d. -f2`" + _cur_patch="`echo $_cur | cut -d. -f3`" + + if [ "x$_min_major" = "x" ] ; then + _min_major=0 + fi + if [ "x$_min_minor" = "x" ] ; then + _min_minor=0 + fi + if [ "x$_min_patch" = "x" ] ; then + _min_patch=0 + fi + if [ "x$_cur_minor" = "x" ] ; then + _cur_major=0 + fi + if [ "x$_cur_minor" = "x" ] ; then + _cur_minor=0 + fi + if [ "x$_cur_patch" = "x" ] ; then + _cur_patch=0 + fi + + $VERBOSE_ECHO "Checking if ${_cur_major}.${_cur_minor}.${_cur_patch} is greater than ${_min_major}.${_min_minor}.${_min_patch}" + + if [ $_min_major -lt $_cur_major ] ; then + return 0 + elif [ $_min_major -eq $_cur_major ] ; then + if [ $_min_minor -lt $_cur_minor ] ; then + return 0 + elif [ $_min_minor -eq $_cur_minor ] ; then + if [ $_min_patch -lt $_cur_patch ] ; then + return 0 + elif [ $_min_patch -eq $_cur_patch ] ; then + return 0 + fi + fi + fi + return 1 +} + + +###################################### +# LOCATE_CONFIGURE_TEMPLATE FUNCTION # +###################################### +locate_configure_template ( ) { + _pwd="`pwd`" + if test -f "./configure.ac" ; then + echo "./configure.ac" + elif test -f "./configure.in" ; then + echo "./configure.in" + elif test -f "$_pwd/configure.ac" ; then + echo "$_pwd/configure.ac" + elif test -f "$_pwd/configure.in" ; then + echo "$_pwd/configure.in" + elif test -f "$PATH_TO_AUTOGEN/configure.ac" ; then + echo "$PATH_TO_AUTOGEN/configure.ac" + elif test -f "$PATH_TO_AUTOGEN/configure.in" ; then + echo "$PATH_TO_AUTOGEN/configure.in" + fi +} + + +################## +# argument check # +################## +ARGS="$*" +PATH_TO_AUTOGEN="`dirname $0`" +NAME_OF_AUTOGEN="`basename $0`" +AUTOGEN_SH="$PATH_TO_AUTOGEN/$NAME_OF_AUTOGEN" + +LIBTOOL_M4="${PATH_TO_AUTOGEN}/misc/libtool.m4" + +if [ "x$HELP" = "x" ] ; then + HELP=no +fi +if [ "x$QUIET" = "x" ] ; then + QUIET=no +fi +if [ "x$VERBOSE" = "x" ] ; then + VERBOSE=no +fi +if [ "x$VERSION_ONLY" = "x" ] ; then + VERSION_ONLY=no +fi +if [ "x$DOWNLOAD" = "x" ] ; then + DOWNLOAD=no +fi +if [ "x$AUTORECONF_OPTIONS" = "x" ] ; then + AUTORECONF_OPTIONS="-i -f" +fi +if [ "x$AUTOCONF_OPTIONS" = "x" ] ; then + AUTOCONF_OPTIONS="-f" +fi +if [ "x$AUTOMAKE_OPTIONS" = "x" ] ; then + AUTOMAKE_OPTIONS="-a -c -f" +fi +ALT_AUTOMAKE_OPTIONS="-a -c" +if [ "x$LIBTOOLIZE_OPTIONS" = "x" ] ; then + LIBTOOLIZE_OPTIONS="--automake -c -f" +fi +ALT_LIBTOOLIZE_OPTIONS="--automake --copy --force" +if [ "x$ACLOCAL_OPTIONS" = "x" ] ; then + ACLOCAL_OPTIONS="" +fi +if [ "x$AUTOHEADER_OPTIONS" = "x" ] ; then + AUTOHEADER_OPTIONS="" +fi +if [ "x$CONFIG_GUESS_URL" = "x" ] ; then + CONFIG_GUESS_URL="http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;f=build-aux/config.guess;hb=HEAD" +fi +for arg in $ARGS ; do + case "x$arg" in + x--help) HELP=yes ;; + x-[hH]) HELP=yes ;; + x--quiet) QUIET=yes ;; + x-[qQ]) QUIET=yes ;; + x--verbose) VERBOSE=yes ;; + x-[dD]) DOWNLOAD=yes ;; + x--download) DOWNLOAD=yes ;; + x-[vV]) VERBOSE=yes ;; + x--version) VERSION_ONLY=yes ;; + *) + echo "Unknown option: $arg" + echo + usage + exit 1 + ;; + esac +done + + +##################### +# environment check # +##################### + +# sanity check before recursions potentially begin +if [ ! -f "$AUTOGEN_SH" ] ; then + echo "INTERNAL ERROR: $AUTOGEN_SH does not exist" + if [ ! "x$0" = "x$AUTOGEN_SH" ] ; then + echo "INTERNAL ERROR: dirname/basename inconsistency: $0 != $AUTOGEN_SH" + fi + exit 1 +fi + +# force locale setting to C so things like date output as expected +LC_ALL=C + +# commands that this script expects +for __cmd in echo head tail pwd ; do + echo "test" | $__cmd > /dev/null 2>&1 + if [ $? != 0 ] ; then + echo "INTERNAL ERROR: '${__cmd}' command is required" + exit 2 + fi +done +echo "test" | grep "test" > /dev/null 2>&1 +if test ! x$? = x0 ; then + echo "INTERNAL ERROR: grep command is required" + exit 1 +fi +echo "test" | sed "s/test/test/" > /dev/null 2>&1 +if test ! x$? = x0 ; then + echo "INTERNAL ERROR: sed command is required" + exit 1 +fi + + +# determine the behavior of echo +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in + *c*,-n*) ECHO_N= ECHO_C=' +' ECHO_T=' ' ;; + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; + *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +esac + +# determine the behavior of head +case "x`echo 'head' | head -n 1 2>&1`" in + *xhead*) HEAD_N="n " ;; + *) HEAD_N="" ;; +esac + +# determine the behavior of tail +case "x`echo 'tail' | tail -n 1 2>&1`" in + *xtail*) TAIL_N="n " ;; + *) TAIL_N="" ;; +esac + +VERBOSE_ECHO=: +ECHO=: +if [ "x$QUIET" = "xyes" ] ; then + if [ "x$VERBOSE" = "xyes" ] ; then + echo "Verbose output quelled by quiet option. Further output disabled." + fi +else + ECHO=echo + if [ "x$VERBOSE" = "xyes" ] ; then + echo "Verbose output enabled" + VERBOSE_ECHO=echo + fi +fi + + +# allow a recursive run to disable further recursions +if [ "x$RUN_RECURSIVE" = "x" ] ; then + RUN_RECURSIVE=yes +fi + + +################################################ +# check for help arg and bypass version checks # +################################################ +if [ "x`echo $ARGS | sed 's/.*[hH][eE][lL][pP].*/help/'`" = "xhelp" ] ; then + HELP=yes +fi +if [ "x$HELP" = "xyes" ] ; then + usage + $ECHO "---" + $ECHO "Help was requested. No preparation or configuration will be performed." + exit 0 +fi + + +####################### +# set up signal traps # +####################### +untrap_abnormal ( ) { + for sig in 1 2 13 15; do + trap - $sig + done +} + +# do this cleanup whenever we exit. +trap ' + # start from the root + if test -d "$START_PATH" ; then + cd "$START_PATH" + fi + + # restore/delete backup files + if test "x$PFC_INIT" = "x1" ; then + recursive_restore + fi +' 0 + +# trap SIGHUP (1), SIGINT (2), SIGPIPE (13), SIGTERM (15) +for sig in 1 2 13 15; do + trap ' + $ECHO "" + $ECHO "Aborting $NAME_OF_AUTOGEN: caught signal '$sig'" + + # start from the root + if test -d "$START_PATH" ; then + cd "$START_PATH" + fi + + # clean up on abnormal exit + $VERBOSE_ECHO "rm -rf autom4te.cache" + rm -rf autom4te.cache + + if test -f "acinclude.m4.$$.backup" ; then + $VERBOSE_ECHO "cat acinclude.m4.$$.backup > acinclude.m4" + chmod u+w acinclude.m4 + cat acinclude.m4.$$.backup > acinclude.m4 + + $VERBOSE_ECHO "rm -f acinclude.m4.$$.backup" + rm -f acinclude.m4.$$.backup + fi + + { (exit 1); exit 1; } +' $sig +done + + +############################# +# look for a configure file # +############################# +if [ "x$CONFIGURE" = "x" ] ; then + CONFIGURE="`locate_configure_template`" + if [ ! "x$CONFIGURE" = "x" ] ; then + $VERBOSE_ECHO "Found a configure template: $CONFIGURE" + fi +else + $ECHO "Using CONFIGURE environment variable override: $CONFIGURE" +fi +if [ "x$CONFIGURE" = "x" ] ; then + if [ "x$VERSION_ONLY" = "xyes" ] ; then + CONFIGURE=/dev/null + else + $ECHO + $ECHO "A configure.ac or configure.in file could not be located implying" + $ECHO "that the GNU Build System is at least not used in this directory. In" + $ECHO "any case, there is nothing to do here without one of those files." + $ECHO + $ECHO "ERROR: No configure.in or configure.ac file found in `pwd`" + exit 1 + fi +fi + +#################### +# get project name # +#################### +if [ "x$PROJECT" = "x" ] ; then + PROJECT="`grep AC_INIT $CONFIGURE | grep -v '.*#.*AC_INIT' | tail -${TAIL_N}1 | sed 's/^[ ]*AC_INIT(\([^,)]*\).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`" + if [ "x$PROJECT" = "xAC_INIT" ] ; then + # projects might be using the older/deprecated arg-less AC_INIT .. look for AM_INIT_AUTOMAKE instead + PROJECT="`grep AM_INIT_AUTOMAKE $CONFIGURE | grep -v '.*#.*AM_INIT_AUTOMAKE' | tail -${TAIL_N}1 | sed 's/^[ ]*AM_INIT_AUTOMAKE(\([^,)]*\).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`" + fi + if [ "x$PROJECT" = "xAM_INIT_AUTOMAKE" ] ; then + PROJECT="project" + fi + if [ "x$PROJECT" = "x" ] ; then + PROJECT="project" + fi +else + $ECHO "Using PROJECT environment variable override: $PROJECT" +fi +$ECHO "Preparing the $PROJECT build system...please wait" +$ECHO + + +######################## +# check for autoreconf # +######################## +HAVE_AUTORECONF=no +if [ "x$AUTORECONF" = "x" ] ; then + for AUTORECONF in autoreconf ; do + $VERBOSE_ECHO "Checking autoreconf version: $AUTORECONF --version" + $AUTORECONF --version > /dev/null 2>&1 + if [ $? = 0 ] ; then + HAVE_AUTORECONF=yes + break + fi + done +else + HAVE_AUTORECONF=yes + $ECHO "Using AUTORECONF environment variable override: $AUTORECONF" +fi + + +########################## +# autoconf version check # +########################## +_acfound=no +if [ "x$AUTOCONF" = "x" ] ; then + for AUTOCONF in autoconf ; do + $VERBOSE_ECHO "Checking autoconf version: $AUTOCONF --version" + $AUTOCONF --version > /dev/null 2>&1 + if [ $? = 0 ] ; then + _acfound=yes + break + fi + done +else + _acfound=yes + $ECHO "Using AUTOCONF environment variable override: $AUTOCONF" +fi + +_report_error=no +if [ ! "x$_acfound" = "xyes" ] ; then + $ECHO "ERROR: Unable to locate GNU Autoconf." + _report_error=yes +else + _version="`$AUTOCONF --version | head -${HEAD_N}1 | sed 's/[^0-9]*\([0-9\.][0-9\.]*\)/\1/'`" + if [ "x$_version" = "x" ] ; then + _version="0.0.0" + fi + $ECHO "Found GNU Autoconf version $_version" + version_check "$AUTOCONF_VERSION" "$_version" + if [ $? -ne 0 ] ; then + _report_error=yes + fi +fi +if [ "x$_report_error" = "xyes" ] ; then + version_error "$AUTOCONF_VERSION" "GNU Autoconf" + exit 1 +fi + + +########################## +# automake version check # +########################## +_amfound=no +if [ "x$AUTOMAKE" = "x" ] ; then + for AUTOMAKE in automake ; do + $VERBOSE_ECHO "Checking automake version: $AUTOMAKE --version" + $AUTOMAKE --version > /dev/null 2>&1 + if [ $? = 0 ] ; then + _amfound=yes + break + fi + done +else + _amfound=yes + $ECHO "Using AUTOMAKE environment variable override: $AUTOMAKE" +fi + + +_report_error=no +if [ ! "x$_amfound" = "xyes" ] ; then + $ECHO + $ECHO "ERROR: Unable to locate GNU Automake." + _report_error=yes +else + _version="`$AUTOMAKE --version | head -${HEAD_N}1 | sed 's/[^0-9]*\([0-9\.][0-9\.]*\)/\1/'`" + if [ "x$_version" = "x" ] ; then + _version="0.0.0" + fi + $ECHO "Found GNU Automake version $_version" + version_check "$AUTOMAKE_VERSION" "$_version" + if [ $? -ne 0 ] ; then + _report_error=yes + fi +fi +if [ "x$_report_error" = "xyes" ] ; then + version_error "$AUTOMAKE_VERSION" "GNU Automake" + exit 1 +fi + + +######################## +# check for libtoolize # +######################## +HAVE_LIBTOOLIZE=yes +HAVE_ALT_LIBTOOLIZE=no +_ltfound=no +if [ "x$LIBTOOLIZE" = "x" ] ; then + LIBTOOLIZE=libtoolize + $VERBOSE_ECHO "Checking libtoolize version: $LIBTOOLIZE --version" + $LIBTOOLIZE --version > /dev/null 2>&1 + if [ ! $? = 0 ] ; then + HAVE_LIBTOOLIZE=no + $ECHO + if [ "x$HAVE_AUTORECONF" = "xno" ] ; then + $ECHO "Warning: libtoolize does not appear to be available." + else + $ECHO "Warning: libtoolize does not appear to be available. This means that" + $ECHO "the automatic build preparation via autoreconf will probably not work." + $ECHO "Preparing the build by running each step individually, however, should" + $ECHO "work and will be done automatically for you if autoreconf fails." + fi + + # look for some alternates + for tool in glibtoolize libtoolize15 libtoolize14 libtoolize13 ; do + $VERBOSE_ECHO "Checking libtoolize alternate: $tool --version" + _glibtoolize="`$tool --version > /dev/null 2>&1`" + if [ $? = 0 ] ; then + $VERBOSE_ECHO "Found $tool --version" + _glti="`which $tool`" + if [ "x$_glti" = "x" ] ; then + $VERBOSE_ECHO "Cannot find $tool with which" + continue; + fi + if test ! -f "$_glti" ; then + $VERBOSE_ECHO "Cannot use $tool, $_glti is not a file" + continue; + fi + _gltidir="`dirname $_glti`" + if [ "x$_gltidir" = "x" ] ; then + $VERBOSE_ECHO "Cannot find $tool path with dirname of $_glti" + continue; + fi + if test ! -d "$_gltidir" ; then + $VERBOSE_ECHO "Cannot use $tool, $_gltidir is not a directory" + continue; + fi + HAVE_ALT_LIBTOOLIZE=yes + LIBTOOLIZE="$tool" + $ECHO + $ECHO "Fortunately, $tool was found which means that your system may simply" + $ECHO "have a non-standard or incomplete GNU Autotools install. If you have" + $ECHO "sufficient system access, it may be possible to quell this warning by" + $ECHO "running:" + $ECHO + sudo -V > /dev/null 2>&1 + if [ $? = 0 ] ; then + $ECHO " sudo ln -s $_glti $_gltidir/libtoolize" + $ECHO + else + $ECHO " ln -s $_glti $_gltidir/libtoolize" + $ECHO + $ECHO "Run that as root or with proper permissions to the $_gltidir directory" + $ECHO + fi + _ltfound=yes + break + fi + done + else + _ltfound=yes + fi +else + _ltfound=yes + $ECHO "Using LIBTOOLIZE environment variable override: $LIBTOOLIZE" +fi + + +############################ +# libtoolize version check # +############################ +_report_error=no +if [ ! "x$_ltfound" = "xyes" ] ; then + $ECHO + $ECHO "ERROR: Unable to locate GNU Libtool." + _report_error=yes +else + _version="`$LIBTOOLIZE --version | head -${HEAD_N}1 | sed 's/[^0-9]*\([0-9\.][0-9\.]*\)/\1/'`" + if [ "x$_version" = "x" ] ; then + _version="0.0.0" + fi + $ECHO "Found GNU Libtool version $_version" + version_check "$LIBTOOL_VERSION" "$_version" + if [ $? -ne 0 ] ; then + _report_error=yes + fi +fi +if [ "x$_report_error" = "xyes" ] ; then + version_error "$LIBTOOL_VERSION" "GNU Libtool" + exit 1 +fi + + +##################### +# check for aclocal # +##################### +if [ "x$ACLOCAL" = "x" ] ; then + for ACLOCAL in aclocal ; do + $VERBOSE_ECHO "Checking aclocal version: $ACLOCAL --version" + $ACLOCAL --version > /dev/null 2>&1 + if [ $? = 0 ] ; then + break + fi + done +else + $ECHO "Using ACLOCAL environment variable override: $ACLOCAL" +fi + + +######################## +# check for autoheader # +######################## +if [ "x$AUTOHEADER" = "x" ] ; then + for AUTOHEADER in autoheader ; do + $VERBOSE_ECHO "Checking autoheader version: $AUTOHEADER --version" + $AUTOHEADER --version > /dev/null 2>&1 + if [ $? = 0 ] ; then + break + fi + done +else + $ECHO "Using AUTOHEADER environment variable override: $AUTOHEADER" +fi + + +######################### +# check if version only # +######################### +$VERBOSE_ECHO "Checking whether to only output version information" +if [ "x$VERSION_ONLY" = "xyes" ] ; then + $ECHO + ident + $ECHO "---" + $ECHO "Version requested. No preparation or configuration will be performed." + exit 0 +fi + + +################################# +# PROTECT_FROM_CLOBBER FUNCTION # +################################# +protect_from_clobber ( ) { + PFC_INIT=1 + + # protect COPYING & INSTALL from overwrite by automake. the + # automake force option will (inappropriately) ignore the existing + # contents of a COPYING and/or INSTALL files (depending on the + # version) instead of just forcing *missing* files like it does + # for AUTHORS, NEWS, and README. this is broken but extremely + # prevalent behavior, so we protect against it by keeping a backup + # of the file that can later be restored. + + for file in COPYING INSTALL ; do + if test -f ${file} ; then + if test -f ${file}.$$.protect_from_automake.backup ; then + $VERBOSE_ECHO "Already backed up ${file} in `pwd`" + else + $VERBOSE_ECHO "Backing up ${file} in `pwd`" + $VERBOSE_ECHO "cp -p ${file} ${file}.$$.protect_from_automake.backup" + cp -p ${file} ${file}.$$.protect_from_automake.backup + fi + fi + done +} + + +############################## +# RECURSIVE_PROTECT FUNCTION # +############################## +recursive_protect ( ) { + + # for projects using recursive configure, run the build + # preparation steps for the subdirectories. this function assumes + # START_PATH was set to pwd before recursion begins so that + # relative paths work. + + # git 'r done, protect COPYING and INSTALL from being clobbered + protect_from_clobber + + if test -d autom4te.cache ; then + $VERBOSE_ECHO "Found an autom4te.cache directory, deleting it" + $VERBOSE_ECHO "rm -rf autom4te.cache" + rm -rf autom4te.cache + fi + + # find configure template + _configure="`locate_configure_template`" + if [ "x$_configure" = "x" ] ; then + return + fi + # $VERBOSE_ECHO "Looking for configure template found `pwd`/$_configure" + + # look for subdirs + # $VERBOSE_ECHO "Looking for subdirs in `pwd`" + _det_config_subdirs="`grep AC_CONFIG_SUBDIRS $_configure | grep -v '.*#.*AC_CONFIG_SUBDIRS' | sed 's/^[ ]*AC_CONFIG_SUBDIRS(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`" + CHECK_DIRS="" + for dir in $_det_config_subdirs ; do + if test -d "`pwd`/$dir" ; then + CHECK_DIRS="$CHECK_DIRS \"`pwd`/$dir\"" + fi + done + + # process subdirs + if [ ! "x$CHECK_DIRS" = "x" ] ; then + $VERBOSE_ECHO "Recursively scanning the following directories:" + $VERBOSE_ECHO " $CHECK_DIRS" + for dir in $CHECK_DIRS ; do + $VERBOSE_ECHO "Protecting files from automake in $dir" + cd "$START_PATH" + eval "cd $dir" + + # recursively git 'r done + recursive_protect + done + fi +} # end of recursive_protect + + +############################# +# RESTORE_CLOBBERED FUNCION # +############################# +restore_clobbered ( ) { + + # The automake (and autoreconf by extension) -f/--force-missing + # option may overwrite COPYING and INSTALL even if they do exist. + # Here we restore the files if necessary. + + spacer=no + + for file in COPYING INSTALL ; do + if test -f ${file}.$$.protect_from_automake.backup ; then + if test -f ${file} ; then + # compare entire content, restore if needed + if test "x`cat ${file}`" != "x`cat ${file}.$$.protect_from_automake.backup`" ; then + if test "x$spacer" = "xno" ; then + $VERBOSE_ECHO + spacer=yes + fi + # restore the backup + $VERBOSE_ECHO "Restoring ${file} from backup (automake -f likely clobbered it)" + $VERBOSE_ECHO "rm -f ${file}" + rm -f ${file} + $VERBOSE_ECHO "mv ${file}.$$.protect_from_automake.backup ${file}" + mv ${file}.$$.protect_from_automake.backup ${file} + fi # check contents + elif test -f ${file}.$$.protect_from_automake.backup ; then + $VERBOSE_ECHO "mv ${file}.$$.protect_from_automake.backup ${file}" + mv ${file}.$$.protect_from_automake.backup ${file} + fi # -f ${file} + + # just in case + $VERBOSE_ECHO "rm -f ${file}.$$.protect_from_automake.backup" + rm -f ${file}.$$.protect_from_automake.backup + fi # -f ${file}.$$.protect_from_automake.backup + done + + CONFIGURE="`locate_configure_template`" + if [ "x$CONFIGURE" = "x" ] ; then + return + fi + + _aux_dir="`grep AC_CONFIG_AUX_DIR $CONFIGURE | grep -v '.*#.*AC_CONFIG_AUX_DIR' | tail -${TAIL_N}1 | sed 's/^[ ]*AC_CONFIG_AUX_DIR(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`" + if test ! -d "$_aux_dir" ; then + _aux_dir=. + fi + + for file in config.guess config.sub ltmain.sh ; do + if test -f "${_aux_dir}/${file}" ; then + $VERBOSE_ECHO "rm -f \"${_aux_dir}/${file}.backup\"" + rm -f "${_aux_dir}/${file}.backup" + fi + done +} # end of restore_clobbered + + +############################## +# RECURSIVE_RESTORE FUNCTION # +############################## +recursive_restore ( ) { + + # restore COPYING and INSTALL from backup if they were clobbered + # for each directory recursively. + + # git 'r undone + restore_clobbered + + # find configure template + _configure="`locate_configure_template`" + if [ "x$_configure" = "x" ] ; then + return + fi + + # look for subdirs + _det_config_subdirs="`grep AC_CONFIG_SUBDIRS $_configure | grep -v '.*#.*AC_CONFIG_SUBDIRS' | sed 's/^[ ]*AC_CONFIG_SUBDIRS(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`" + CHECK_DIRS="" + for dir in $_det_config_subdirs ; do + if test -d "`pwd`/$dir" ; then + CHECK_DIRS="$CHECK_DIRS \"`pwd`/$dir\"" + fi + done + + # process subdirs + if [ ! "x$CHECK_DIRS" = "x" ] ; then + $VERBOSE_ECHO "Recursively scanning the following directories:" + $VERBOSE_ECHO " $CHECK_DIRS" + for dir in $CHECK_DIRS ; do + $VERBOSE_ECHO "Checking files for automake damage in $dir" + cd "$START_PATH" + eval "cd $dir" + + # recursively git 'r undone + recursive_restore + done + fi +} # end of recursive_restore + + +####################### +# INITIALIZE FUNCTION # +####################### +initialize ( ) { + + # this routine performs a variety of directory-specific + # initializations. some are sanity checks, some are preventive, + # and some are necessary setup detection. + # + # this function sets: + # CONFIGURE + # SEARCH_DIRS + # CONFIG_SUBDIRS + + ################################## + # check for a configure template # + ################################## + CONFIGURE="`locate_configure_template`" + if [ "x$CONFIGURE" = "x" ] ; then + $ECHO + $ECHO "A configure.ac or configure.in file could not be located implying" + $ECHO "that the GNU Build System is at least not used in this directory. In" + $ECHO "any case, there is nothing to do here without one of those files." + $ECHO + $ECHO "ERROR: No configure.in or configure.ac file found in `pwd`" + exit 1 + fi + + ##################### + # detect an aux dir # + ##################### + _aux_dir="`grep AC_CONFIG_AUX_DIR $CONFIGURE | grep -v '.*#.*AC_CONFIG_AUX_DIR' | tail -${TAIL_N}1 | sed 's/^[ ]*AC_CONFIG_AUX_DIR(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`" + if test ! -d "$_aux_dir" ; then + _aux_dir=. + else + $VERBOSE_ECHO "Detected auxillary directory: $_aux_dir" + fi + + ################################ + # detect a recursive configure # + ################################ + CONFIG_SUBDIRS="" + _det_config_subdirs="`grep AC_CONFIG_SUBDIRS $CONFIGURE | grep -v '.*#.*AC_CONFIG_SUBDIRS' | sed 's/^[ ]*AC_CONFIG_SUBDIRS(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`" + for dir in $_det_config_subdirs ; do + if test -d "`pwd`/$dir" ; then + $VERBOSE_ECHO "Detected recursive configure directory: `pwd`/$dir" + CONFIG_SUBDIRS="$CONFIG_SUBDIRS `pwd`/$dir" + fi + done + + ########################################################### + # make sure certain required files exist for GNU projects # + ########################################################### + _marker_found="" + _marker_found_message_intro='Detected non-GNU marker "' + _marker_found_message_mid='" in ' + for marker in foreign cygnus ; do + _marker_found_message=${_marker_found_message_intro}${marker}${_marker_found_message_mid} + _marker_found="`grep 'AM_INIT_AUTOMAKE.*'${marker} $CONFIGURE`" + if [ ! "x$_marker_found" = "x" ] ; then + $VERBOSE_ECHO "${_marker_found_message}`basename \"$CONFIGURE\"`" + break + fi + if test -f "`dirname \"$CONFIGURE\"/Makefile.am`" ; then + _marker_found="`grep 'AUTOMAKE_OPTIONS.*'${marker} Makefile.am`" + if [ ! "x$_marker_found" = "x" ] ; then + $VERBOSE_ECHO "${_marker_found_message}Makefile.am" + break + fi + fi + done + if [ "x${_marker_found}" = "x" ] ; then + _suggest_foreign=no + for file in AUTHORS COPYING ChangeLog INSTALL NEWS README ; do + if [ ! -f $file ] ; then + $VERBOSE_ECHO "Touching ${file} since it does not exist" + _suggest_foreign=yes + touch $file + fi + done + + if [ "x${_suggest_foreign}" = "xyes" ] ; then + $ECHO + $ECHO "Warning: Several files expected of projects that conform to the GNU" + $ECHO "coding standards were not found. The files were automatically added" + $ECHO "for you since you do not have a 'foreign' declaration specified." + $ECHO + $ECHO "Considered adding 'foreign' to AM_INIT_AUTOMAKE in `basename \"$CONFIGURE\"`" + if test -f "`dirname \"$CONFIGURE\"/Makefile.am`" ; then + $ECHO "or to AUTOMAKE_OPTIONS in your top-level Makefile.am file." + fi + $ECHO + fi + fi + + ################################################## + # make sure certain generated files do not exist # + ################################################## + for file in config.guess config.sub ltmain.sh ; do + if test -f "${_aux_dir}/${file}" ; then + $VERBOSE_ECHO "mv -f \"${_aux_dir}/${file}\" \"${_aux_dir}/${file}.backup\"" + mv -f "${_aux_dir}/${file}" "${_aux_dir}/${file}.backup" + fi + done + + ############################ + # search alternate m4 dirs # + ############################ + SEARCH_DIRS="" + for dir in m4 ; do + if [ -d $dir ] ; then + $VERBOSE_ECHO "Found extra aclocal search directory: $dir" + SEARCH_DIRS="$SEARCH_DIRS -I $dir" + fi + done + + ###################################### + # remove any previous build products # + ###################################### + if test -d autom4te.cache ; then + $VERBOSE_ECHO "Found an autom4te.cache directory, deleting it" + $VERBOSE_ECHO "rm -rf autom4te.cache" + rm -rf autom4te.cache + fi +# tcl/tk (and probably others) have a customized aclocal.m4, so can't delete it +# if test -f aclocal.m4 ; then +# $VERBOSE_ECHO "Found an aclocal.m4 file, deleting it" +# $VERBOSE_ECHO "rm -f aclocal.m4" +# rm -f aclocal.m4 +# fi + +} # end of initialize() + + +############## +# initialize # +############## + +# stash path +START_PATH="`pwd`" + +# Before running autoreconf or manual steps, some prep detection work +# is necessary or useful. Only needs to occur once per directory, but +# does need to traverse the entire subconfigure hierarchy to protect +# files from being clobbered even by autoreconf. +recursive_protect + +# start from where we started +cd "$START_PATH" + +# get ready to process +initialize + + +######################################### +# DOWNLOAD_GNULIB_CONFIG_GUESS FUNCTION # +######################################### + +# TODO - should make sure wget/curl exist and/or work before trying to +# use them. + +download_gnulib_config_guess () { + # abuse gitweb to download gnulib's latest config.guess via HTTP + config_guess_temp="config.guess.$$.download" + ret=1 + for __cmd in wget curl fetch ; do + $VERBOSE_ECHO "Checking for command ${__cmd}" + ${__cmd} --version > /dev/null 2>&1 + ret=$? + if [ ! $ret = 0 ] ; then + continue + fi + + __cmd_version=`${__cmd} --version | head -n 1 | sed -e 's/^[^0-9]\+//' -e 's/ .*//'` + $VERBOSE_ECHO "Found ${__cmd} ${__cmd_version}" + + opts="" + case ${__cmd} in + wget) + opts="-O" + ;; + curl) + opts="-o" + ;; + fetch) + opts="-t 5 -f" + ;; + esac + + $VERBOSE_ECHO "Running $__cmd \"${CONFIG_GUESS_URL}\" $opts \"${config_guess_temp}\"" + eval "$__cmd \"${CONFIG_GUESS_URL}\" $opts \"${config_guess_temp}\"" > /dev/null 2>&1 + if [ $? = 0 ] ; then + mv -f "${config_guess_temp}" ${_aux_dir}/config.guess + ret=0 + break + fi + done + + if [ ! $ret = 0 ] ; then + $ECHO "Warning: config.guess download failed from: $CONFIG_GUESS_URL" + rm -f "${config_guess_temp}" + fi +} + + +############################## +# LIBTOOLIZE_NEEDED FUNCTION # +############################## +libtoolize_needed () { + ret=1 # means no, don't need libtoolize + for feature in AC_PROG_LIBTOOL AM_PROG_LIBTOOL LT_INIT ; do + $VERBOSE_ECHO "Searching for $feature in $CONFIGURE" + found="`grep \"^$feature.*\" $CONFIGURE`" + if [ ! "x$found" = "x" ] ; then + ret=0 # means yes, need to run libtoolize + break + fi + done + return ${ret} +} + + + +############################################ +# prepare build via autoreconf or manually # +############################################ +reconfigure_manually=no +if [ "x$HAVE_AUTORECONF" = "xyes" ] ; then + $ECHO + $ECHO $ECHO_N "Automatically preparing build ... $ECHO_C" + + $VERBOSE_ECHO "$AUTORECONF $SEARCH_DIRS $AUTORECONF_OPTIONS" + autoreconf_output="`$AUTORECONF $SEARCH_DIRS $AUTORECONF_OPTIONS 2>&1`" + ret=$? + $VERBOSE_ECHO "$autoreconf_output" + + if [ ! $ret = 0 ] ; then + if [ "x$HAVE_ALT_LIBTOOLIZE" = "xyes" ] ; then + if [ ! "x`echo \"$autoreconf_output\" | grep libtoolize | grep \"No such file or directory\"`" = "x" ] ; then + $ECHO + $ECHO "Warning: autoreconf failed but due to what is usually a common libtool" + $ECHO "misconfiguration issue. This problem is encountered on systems that" + $ECHO "have installed libtoolize under a different name without providing a" + $ECHO "symbolic link or without setting the LIBTOOLIZE environment variable." + $ECHO + $ECHO "Restarting the preparation steps with LIBTOOLIZE set to $LIBTOOLIZE" + + export LIBTOOLIZE + RUN_RECURSIVE=no + export RUN_RECURSIVE + untrap_abnormal + + $VERBOSE_ECHO sh $AUTOGEN_SH "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9" + sh "$AUTOGEN_SH" "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9" + exit $? + fi + fi + + $ECHO "Warning: $AUTORECONF failed" + + if test -f ltmain.sh ; then + $ECHO "libtoolize being run by autoreconf is not creating ltmain.sh in the auxillary directory like it should" + fi + + $ECHO "Attempting to run the preparation steps individually" + reconfigure_manually=yes + else + if [ "x$DOWNLOAD" = "xyes" ] ; then + if libtoolize_needed ; then + download_gnulib_config_guess + fi + fi + fi +else + reconfigure_manually=yes +fi + + +############################ +# LIBTOOL_FAILURE FUNCTION # +############################ +libtool_failure ( ) { + + # libtool is rather error-prone in comparison to the other + # autotools and this routine attempts to compensate for some + # common failures. the output after a libtoolize failure is + # parsed for an error related to AC_PROG_LIBTOOL and if found, we + # attempt to inject a project-provided libtool.m4 file. + + _autoconf_output="$1" + + if [ "x$RUN_RECURSIVE" = "xno" ] ; then + # we already tried the libtool.m4, don't try again + return 1 + fi + + if test -f "$LIBTOOL_M4" ; then + found_libtool="`$ECHO $_autoconf_output | grep AC_PROG_LIBTOOL`" + if test ! "x$found_libtool" = "x" ; then + if test -f acinclude.m4 ; then + rm -f acinclude.m4.$$.backup + $VERBOSE_ECHO "cat acinclude.m4 > acinclude.m4.$$.backup" + cat acinclude.m4 > acinclude.m4.$$.backup + fi + $VERBOSE_ECHO "cat \"$LIBTOOL_M4\" >> acinclude.m4" + chmod u+w acinclude.m4 + cat "$LIBTOOL_M4" >> acinclude.m4 + + # don't keep doing this + RUN_RECURSIVE=no + export RUN_RECURSIVE + untrap_abnormal + + $ECHO + $ECHO "Restarting the preparation steps with libtool macros in acinclude.m4" + $VERBOSE_ECHO sh $AUTOGEN_SH "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9" + sh "$AUTOGEN_SH" "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9" + exit $? + fi + fi +} + + +########################### +# MANUAL_AUTOGEN FUNCTION # +########################### +manual_autogen ( ) { + + ################################################## + # Manual preparation steps taken are as follows: # + # aclocal [-I m4] # + # libtoolize --automake -c -f # + # aclocal [-I m4] # + # autoconf -f # + # autoheader # + # automake -a -c -f # + ################################################## + + ########### + # aclocal # + ########### + $VERBOSE_ECHO "$ACLOCAL $SEARCH_DIRS $ACLOCAL_OPTIONS" + aclocal_output="`$ACLOCAL $SEARCH_DIRS $ACLOCAL_OPTIONS 2>&1`" + ret=$? + $VERBOSE_ECHO "$aclocal_output" + if [ ! $ret = 0 ] ; then $ECHO "ERROR: $ACLOCAL failed" && exit 2 ; fi + + ############## + # libtoolize # + ############## + if libtoolize_needed ; then + if [ "x$HAVE_LIBTOOLIZE" = "xyes" ] ; then + $VERBOSE_ECHO "$LIBTOOLIZE $LIBTOOLIZE_OPTIONS" + libtoolize_output="`$LIBTOOLIZE $LIBTOOLIZE_OPTIONS 2>&1`" + ret=$? + $VERBOSE_ECHO "$libtoolize_output" + + if [ ! $ret = 0 ] ; then $ECHO "ERROR: $LIBTOOLIZE failed" && exit 2 ; fi + else + if [ "x$HAVE_ALT_LIBTOOLIZE" = "xyes" ] ; then + $VERBOSE_ECHO "$LIBTOOLIZE $ALT_LIBTOOLIZE_OPTIONS" + libtoolize_output="`$LIBTOOLIZE $ALT_LIBTOOLIZE_OPTIONS 2>&1`" + ret=$? + $VERBOSE_ECHO "$libtoolize_output" + + if [ ! $ret = 0 ] ; then $ECHO "ERROR: $LIBTOOLIZE failed" && exit 2 ; fi + fi + fi + + ########### + # aclocal # + ########### + # re-run again as instructed by libtoolize + $VERBOSE_ECHO "$ACLOCAL $SEARCH_DIRS $ACLOCAL_OPTIONS" + aclocal_output="`$ACLOCAL $SEARCH_DIRS $ACLOCAL_OPTIONS 2>&1`" + ret=$? + $VERBOSE_ECHO "$aclocal_output" + + # libtoolize might put ltmain.sh in the wrong place + if test -f ltmain.sh ; then + if test ! -f "${_aux_dir}/ltmain.sh" ; then + $ECHO + $ECHO "Warning: $LIBTOOLIZE is creating ltmain.sh in the wrong directory" + $ECHO + $ECHO "Fortunately, the problem can be worked around by simply copying the" + $ECHO "file to the appropriate location (${_aux_dir}/). This has been done for you." + $ECHO + $VERBOSE_ECHO "cp -p ltmain.sh \"${_aux_dir}/ltmain.sh\"" + cp -p ltmain.sh "${_aux_dir}/ltmain.sh" + $ECHO $ECHO_N "Continuing build preparation ... $ECHO_C" + fi + fi # ltmain.sh + + if [ "x$DOWNLOAD" = "xyes" ] ; then + download_gnulib_config_guess + fi + fi # libtoolize_needed + + ############ + # autoconf # + ############ + $VERBOSE_ECHO + $VERBOSE_ECHO "$AUTOCONF $AUTOCONF_OPTIONS" + autoconf_output="`$AUTOCONF $AUTOCONF_OPTIONS 2>&1`" + ret=$? + $VERBOSE_ECHO "$autoconf_output" + + if [ ! $ret = 0 ] ; then + # retry without the -f and check for usage of macros that are too new + ac2_59_macros="AC_C_RESTRICT AC_INCLUDES_DEFAULT AC_LANG_ASSERT AC_LANG_WERROR AS_SET_CATFILE" + ac2_55_macros="AC_COMPILER_IFELSE AC_FUNC_MBRTOWC AC_HEADER_STDBOOL AC_LANG_CONFTEST AC_LANG_SOURCE AC_LANG_PROGRAM AC_LANG_CALL AC_LANG_FUNC_TRY_LINK AC_MSG_FAILURE AC_PREPROC_IFELSE" + ac2_54_macros="AC_C_BACKSLASH_A AC_CONFIG_LIBOBJ_DIR AC_GNU_SOURCE AC_PROG_EGREP AC_PROG_FGREP AC_REPLACE_FNMATCH AC_FUNC_FNMATCH_GNU AC_FUNC_REALLOC AC_TYPE_MBSTATE_T" + + macros_to_search="" + ac_major="`echo ${AUTOCONF_VERSION}. | cut -d. -f1 | sed 's/[^0-9]//g'`" + ac_minor="`echo ${AUTOCONF_VERSION}. | cut -d. -f2 | sed 's/[^0-9]//g'`" + + if [ $ac_major -lt 2 ] ; then + macros_to_search="$ac2_59_macros $ac2_55_macros $ac2_54_macros" + else + if [ $ac_minor -lt 54 ] ; then + macros_to_search="$ac2_59_macros $ac2_55_macros $ac2_54_macros" + elif [ $ac_minor -lt 55 ] ; then + macros_to_search="$ac2_59_macros $ac2_55_macros" + elif [ $ac_minor -lt 59 ] ; then + macros_to_search="$ac2_59_macros" + fi + fi + + configure_ac_macros=__none__ + for feature in $macros_to_search ; do + $VERBOSE_ECHO "Searching for $feature in $CONFIGURE" + found="`grep \"^$feature.*\" $CONFIGURE`" + if [ ! "x$found" = "x" ] ; then + if [ "x$configure_ac_macros" = "x__none__" ] ; then + configure_ac_macros="$feature" + else + configure_ac_macros="$feature $configure_ac_macros" + fi + fi + done + if [ ! "x$configure_ac_macros" = "x__none__" ] ; then + $ECHO + $ECHO "Warning: Unsupported macros were found in $CONFIGURE" + $ECHO + $ECHO "The `basename \"$CONFIGURE\"` file was scanned in order to determine if any" + $ECHO "unsupported macros are used that exceed the minimum version" + $ECHO "settings specified within this file. As such, the following macros" + $ECHO "should be removed from configure.ac or the version numbers in this" + $ECHO "file should be increased:" + $ECHO + $ECHO "$configure_ac_macros" + $ECHO + $ECHO $ECHO_N "Ignorantly continuing build preparation ... $ECHO_C" + fi + + ################### + # autoconf, retry # + ################### + $VERBOSE_ECHO + $VERBOSE_ECHO "$AUTOCONF" + autoconf_output="`$AUTOCONF 2>&1`" + ret=$? + $VERBOSE_ECHO "$autoconf_output" + + if [ ! $ret = 0 ] ; then + # test if libtool is busted + libtool_failure "$autoconf_output" + + # let the user know what went wrong + cat < +Provides: tikzit +Description: TikZiT is a GTK+ application that allows the creation and modification of TeX diagrams written using the pgf/TikZ macro library. It is especially geared toward rapidly creating "dot"-diagrams for use in academic papers. diff --git a/tikzit-old/configure.ac b/tikzit-old/configure.ac new file mode 100644 index 0000000..a86156b --- /dev/null +++ b/tikzit-old/configure.ac @@ -0,0 +1,141 @@ +# -*- Autoconf -*- +# Process this file with autoconf to produce a configure script. + +AC_PREREQ([2.60]) +AC_INIT([TikZiT], [1.1], + [http://sourceforge.net/apps/trac/tikzit], + [tikzit], + [http://tikzit.sourceforge.net]) +AM_INIT_AUTOMAKE([1.10 foreign subdir-objects -Wall -Werror]) +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +AC_OUTPUT(Makefile + src/Makefile + share/Makefile +) +AC_CONFIG_SRCDIR([src/gtk/main.m]) + +m4_include([m4/objc.m4]) + +# Checks for programs. +AC_PROG_OBJC([gcc clang objc objcc]) +AC_LANG([Objective C]) + +AC_CHECK_PROGS([FLEX], [flex lex], [flex]) +AS_IF([$FLEX --version 2>/dev/null | grep "^flex" >/dev/null 2>/dev/null],[], + [ + AC_MSG_WARN([flex not found; this may cause problems for developers]) + # in case a lex that wasn't flex was found + FLEX=flex + ]) +AM_MISSING_PROG([LEX], [$FLEX]) + +AC_CHECK_PROGS([BISON], [bison yacc], [bison]) +AS_IF([$BISON --version 2>/dev/null | grep "^bison" >/dev/null 2>/dev/null],[], + [ + AC_MSG_WARN([bison not found; this may cause problems for developers]) + # in case a yacc that wasn't bison was found + BISON=bison + ]) +AM_MISSING_PROG([YACC], [$BISON]) + +# Checks for libraries. +FOUNDATION_OBJCFLAGS=`eval "gnustep-config --objc-flags"` +AS_IF([test "x$FOUNDATION_OBJCFLAGS" = "x"], + [AC_MSG_ERROR([GNUstep not found])]) +FOUNDATION_LIBS=`eval "gnustep-config --base-libs"` +AS_IF([test "x$FOUNDATION_LIBS" = "x"], + [AC_MSG_ERROR([GNUstep not found])]) +AC_SUBST([FOUNDATION_OBJCFLAGS]) +AC_SUBST([FOUNDATION_LIBS]) + +TZ_TEST_OBJCFLAGS="$FOUNDATION_OBJCFLAGS" +TZ_TEST_LDFLAGS="$FOUNDATION_LIBS" + +TZ_OBJC_FOUNDATION +AS_IF([test "x$tz_cv_objc_foundation" != "xyes"], + [AC_MSG_ERROR([Objective C Foundation not found -- missing gnustep-base(-devel)?])]) + +AC_ARG_WITH([poppler], AS_HELP_STRING([--without-poppler], [Ignore presence of poppler, disabling preview support])) + +AS_IF([test "x$with_poppler" != "xno"], + [ + AC_MSG_CHECKING([for poppler-glib]) + PKG_CHECK_EXISTS([poppler-glib >= 0.10], + [have_poppler=yes], + [have_poppler=no]) + AS_IF([test "x$have_poppler" = "xyes"], + [ + AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_POPPLER, 1) + ], + [ + AC_MSG_RESULT([no]) + AS_IF([test "x$with_poppler" = "xyes"], + [AC_MSG_ERROR([poppler requested but not found (note that poppler-glib is required)])] + ) + ]) + ], + [have_poppler=no]) +AM_CONDITIONAL([HAVE_POPPLER],[test "x$have_poppler" = "xyes"]) + +# Test all the pkg-config stuff together, so that +# dependencies and duplicate flags are correctly handled +AS_IF([test "x$have_poppler" = "xyes"], + [PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.18.0 gdk-pixbuf-2.0 >= 2.16.0 pango >= 1.16 cairo >= 1.4 poppler-glib >= 0.10])], + [PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.18.0 gdk-pixbuf-2.0 >= 2.16.0 pango >= 1.16 cairo >= 1.4])]) + +# Checks for header files. +AC_FUNC_ALLOCA +AC_CHECK_HEADERS([inttypes.h libintl.h limits.h malloc.h stddef.h stdint.h stdlib.h string.h unistd.h]) + +# Checks for typedefs, structures, and compiler characteristics. +AC_TYPE_INT16_T +AC_TYPE_INT32_T +AC_TYPE_INT8_T +AC_TYPE_SIZE_T +AC_TYPE_UINT16_T +AC_TYPE_UINT32_T +AC_TYPE_UINT64_T +AC_TYPE_UINT8_T +AC_HEADER_STDBOOL +AC_HEADER_STAT +AC_CHECK_HEADERS([stdint.h inttypes.h unistd.h sys/time.h time.h]) + +# Checks for library functions. +AC_FUNC_MALLOC +AC_FUNC_REALLOC +AC_CHECK_FUNCS([floor gettimeofday memset mkdtemp sqrt strdup]) + +TZ_OBJC2_FEATURES +AS_IF([test "x$tz_cv_objc_properties$tz_cv_objc_fast_enumeration$tz_cv_objc_optional_keyword" != "xyesyesyes"], + [AC_MSG_ERROR([Your Objective C compiler does not support the required Objective C 2 features])]) + +dnl ---------------------------------------------------------------------------- +dnl +dnl platform-specific stuff. + +AC_CANONICAL_HOST +have_msw="no" +case $host_os in + + *mingw32*) + have_msw="yes" + OBJCFLAGS="$OBJCFLAGS -mwindows" + AC_SUBST([WINDOWS]) + AC_SUBST([WIN32]) + AC_SUBST([_WIN32]) + ;; + +esac + +AM_CONDITIONAL([WINDOWS],[test "x$have_msw" = "xyes"]) + +AS_IF([test "x$with_poppler" != "xno"], + [AS_IF([test "x$have_poppler" != "xyes"], + AC_MSG_WARN([poppler-glib was not found; preview support will be disabled]) + )] + ) + +AC_OUTPUT + +# vi:sts=2:sw=2:et diff --git a/tikzit-old/customshape.png b/tikzit-old/customshape.png new file mode 100755 index 0000000..cff8275 Binary files /dev/null and b/tikzit-old/customshape.png differ diff --git a/tikzit-old/docs/Doxyfile b/tikzit-old/docs/Doxyfile new file mode 100644 index 0000000..70a27f7 --- /dev/null +++ b/tikzit-old/docs/Doxyfile @@ -0,0 +1,1600 @@ +# Doxyfile 1.6.3 + +# This file describes the settings to be used by the documentation system +# doxygen (www.doxygen.org) for a project +# +# All text after a hash (#) is considered a comment and will be ignored +# The format is: +# TAG = value [value, ...] +# For lists items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (" ") + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- + +# This tag specifies the encoding used for all characters in the config file +# that follow. The default is UTF-8 which is also the encoding used for all +# text before the first occurrence of this tag. Doxygen uses libiconv (or the +# iconv built into libc) for the transcoding. See +# http://www.gnu.org/software/libiconv for the list of possible encodings. + +DOXYFILE_ENCODING = UTF-8 + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded +# by quotes) that should identify the project. + +PROJECT_NAME = TikZiT + +# The PROJECT_NUMBER tag can be used to enter a project or revision number. +# This could be handy for archiving the generated documentation or +# if some version control system is used. + +PROJECT_NUMBER = 0.3 + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) +# base path where the generated documentation will be put. +# If a relative path is entered, it will be relative to the location +# where doxygen was started. If left blank the current directory will be used. + +OUTPUT_DIRECTORY = doxygen + +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create +# 4096 sub-directories (in 2 levels) under the output directory of each output +# format and will distribute the generated files over these directories. +# Enabling this option can be useful when feeding doxygen a huge amount of +# source files, where putting all generated files in the same directory would +# otherwise cause performance problems for the file system. + +CREATE_SUBDIRS = NO + +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# The default language is English, other supported languages are: +# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, +# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, +# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English +# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, +# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, +# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. + +OUTPUT_LANGUAGE = English + +# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will +# include brief member descriptions after the members that are listed in +# the file and class documentation (similar to JavaDoc). +# Set to NO to disable this. + +BRIEF_MEMBER_DESC = YES + +# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend +# the brief description of a member or function before the detailed description. +# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# brief descriptions will be completely suppressed. + +REPEAT_BRIEF = YES + +# This tag implements a quasi-intelligent brief description abbreviator +# that is used to form the text in various listings. Each string +# in this list, if found as the leading text of the brief description, will be +# stripped from the text and the result after processing the whole list, is +# used as the annotated text. Otherwise, the brief description is used as-is. +# If left blank, the following values are used ("$name" is automatically +# replaced with the name of the entity): "The $name class" "The $name widget" +# "The $name file" "is" "provides" "specifies" "contains" +# "represents" "a" "an" "the" + +ABBREVIATE_BRIEF = "The $name class" \ + "The $name widget" \ + "The $name file" \ + is \ + provides \ + specifies \ + contains \ + represents \ + a \ + an \ + the + +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# Doxygen will generate a detailed section even if there is only a brief +# description. + +ALWAYS_DETAILED_SEC = NO + +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment +# operators of the base classes will not be shown. + +INLINE_INHERITED_MEMB = NO + +# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full +# path before files name in the file list and in the header files. If set +# to NO the shortest path that makes the file name unique will be used. + +FULL_PATH_NAMES = YES + +# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag +# can be used to strip a user-defined part of the path. Stripping is +# only done if one of the specified strings matches the left-hand part of +# the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the +# path to strip. + +STRIP_FROM_PATH = /Applications/ + +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of +# the path mentioned in the documentation of a class, which tells +# the reader which header file to include in order to use a class. +# If left blank only the name of the header file containing the class +# definition is used. Otherwise one should specify the include paths that +# are normally passed to the compiler using the -I flag. + +STRIP_FROM_INC_PATH = + +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter +# (but less readable) file names. This can be useful is your file systems +# doesn't support long names like on DOS, Mac, or CD-ROM. + +SHORT_NAMES = NO + +# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen +# will interpret the first line (until the first dot) of a JavaDoc-style +# comment as the brief description. If set to NO, the JavaDoc +# comments will behave just like regular Qt-style comments +# (thus requiring an explicit @brief command for a brief description.) + +JAVADOC_AUTOBRIEF = NO + +# If the QT_AUTOBRIEF tag is set to YES then Doxygen will +# interpret the first line (until the first dot) of a Qt-style +# comment as the brief description. If set to NO, the comments +# will behave just like regular Qt-style comments (thus requiring +# an explicit \brief command for a brief description.) + +QT_AUTOBRIEF = NO + +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen +# treat a multi-line C++ special comment block (i.e. a block of //! or /// +# comments) as a brief description. This used to be the default behaviour. +# The new default is to treat a multi-line C++ comment block as a detailed +# description. Set this tag to YES if you prefer the old behaviour instead. + +MULTILINE_CPP_IS_BRIEF = NO + +# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented +# member inherits the documentation from any documented member that it +# re-implements. + +INHERIT_DOCS = YES + +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce +# a new page for each member. If set to NO, the documentation of a member will +# be part of the file/class/namespace that contains it. + +SEPARATE_MEMBER_PAGES = NO + +# The TAB_SIZE tag can be used to set the number of spaces in a tab. +# Doxygen uses this value to replace tabs by spaces in code fragments. + +TAB_SIZE = 8 + +# This tag can be used to specify a number of aliases that acts +# as commands in the documentation. An alias has the form "name=value". +# For example adding "sideeffect=\par Side Effects:\n" will allow you to +# put the command \sideeffect (or @sideeffect) in the documentation, which +# will result in a user-defined paragraph with heading "Side Effects:". +# You can put \n's in the value part of an alias to insert newlines. + +ALIASES = + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C +# sources only. Doxygen will then generate output that is more tailored for C. +# For instance, some of the names that are used will be different. The list +# of all members will be omitted, etc. + +OPTIMIZE_OUTPUT_FOR_C = NO + +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java +# sources only. Doxygen will then generate output that is more tailored for +# Java. For instance, namespaces will be presented as packages, qualified +# scopes will look different, etc. + +OPTIMIZE_OUTPUT_JAVA = NO + +# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran +# sources only. Doxygen will then generate output that is more tailored for +# Fortran. + +OPTIMIZE_FOR_FORTRAN = NO + +# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL +# sources. Doxygen will then generate output that is tailored for +# VHDL. + +OPTIMIZE_OUTPUT_VHDL = NO + +# Doxygen selects the parser to use depending on the extension of the files it parses. +# With this tag you can assign which parser to use for a given extension. +# Doxygen has a built-in mapping, but you can override or extend it using this tag. +# The format is ext=language, where ext is a file extension, and language is one of +# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, +# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat +# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), +# use: inc=Fortran f=C. Note that for custom extensions you also need to set +# FILE_PATTERNS otherwise the files are not read by doxygen. + +EXTENSION_MAPPING = + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want +# to include (a tag file for) the STL sources as input, then you should +# set this tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. +# func(std::string) {}). This also make the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate. + +BUILTIN_STL_SUPPORT = NO + +# If you use Microsoft's C++/CLI language, you should set this option to YES to +# enable parsing support. + +CPP_CLI_SUPPORT = NO + +# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. +# Doxygen will parse them like normal C++ but will assume all classes use public +# instead of private inheritance when no explicit protection keyword is present. + +SIP_SUPPORT = NO + +# For Microsoft's IDL there are propget and propput attributes to indicate getter +# and setter methods for a property. Setting this option to YES (the default) +# will make doxygen to replace the get and set methods by a property in the +# documentation. This will only work if the methods are indeed getting or +# setting a simple type. If this is not the case, or you want to show the +# methods anyway, you should set this option to NO. + +IDL_PROPERTY_SUPPORT = YES + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default +# all members of a group must be documented explicitly. + +DISTRIBUTE_GROUP_DOC = NO + +# Set the SUBGROUPING tag to YES (the default) to allow class member groups of +# the same type (for instance a group of public functions) to be put as a +# subgroup of that type (e.g. under the Public Functions section). Set it to +# NO to prevent subgrouping. Alternatively, this can be done per class using +# the \nosubgrouping command. + +SUBGROUPING = YES + +# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum +# is documented as struct, union, or enum with the name of the typedef. So +# typedef struct TypeS {} TypeT, will appear in the documentation as a struct +# with name TypeT. When disabled the typedef will appear as a member of a file, +# namespace, or class. And the struct will be named TypeS. This can typically +# be useful for C code in case the coding convention dictates that all compound +# types are typedef'ed and only the typedef is referenced, never the tag name. + +TYPEDEF_HIDES_STRUCT = NO + +# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to +# determine which symbols to keep in memory and which to flush to disk. +# When the cache is full, less often used symbols will be written to disk. +# For small to medium size projects (<1000 input files) the default value is +# probably good enough. For larger projects a too small cache size can cause +# doxygen to be busy swapping symbols to and from disk most of the time +# causing a significant performance penality. +# If the system has enough physical memory increasing the cache will improve the +# performance by keeping more symbols in memory. Note that the value works on +# a logarithmic scale so increasing the size by one will rougly double the +# memory usage. The cache size is given by this formula: +# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, +# corresponding to a cache size of 2^16 = 65536 symbols + +SYMBOL_CACHE_SIZE = 0 + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- + +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. +# Private class members and static file members will be hidden unless +# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES + +EXTRACT_ALL = YES + +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class +# will be included in the documentation. + +EXTRACT_PRIVATE = NO + +# If the EXTRACT_STATIC tag is set to YES all static members of a file +# will be included in the documentation. + +EXTRACT_STATIC = NO + +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) +# defined locally in source files will be included in the documentation. +# If set to NO only classes defined in header files are included. + +EXTRACT_LOCAL_CLASSES = YES + +# This flag is only useful for Objective-C code. When set to YES local +# methods, which are defined in the implementation section but not in +# the interface are included in the documentation. +# If set to NO (the default) only methods in the interface are included. + +EXTRACT_LOCAL_METHODS = NO + +# If this flag is set to YES, the members of anonymous namespaces will be +# extracted and appear in the documentation as a namespace called +# 'anonymous_namespace{file}', where file will be replaced with the base +# name of the file that contains the anonymous namespace. By default +# anonymous namespace are hidden. + +EXTRACT_ANON_NSPACES = NO + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all +# undocumented members of documented classes, files or namespaces. +# If set to NO (the default) these members will be included in the +# various overviews, but no documentation section is generated. +# This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_MEMBERS = YES + +# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. +# If set to NO (the default) these classes will be included in the various +# overviews. This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_CLASSES = YES + +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all +# friend (class|struct|union) declarations. +# If set to NO (the default) these declarations will be included in the +# documentation. + +HIDE_FRIEND_COMPOUNDS = NO + +# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any +# documentation blocks found inside the body of a function. +# If set to NO (the default) these blocks will be appended to the +# function's detailed documentation block. + +HIDE_IN_BODY_DOCS = NO + +# The INTERNAL_DOCS tag determines if documentation +# that is typed after a \internal command is included. If the tag is set +# to NO (the default) then the documentation will be excluded. +# Set it to YES to include the internal documentation. + +INTERNAL_DOCS = NO + +# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate +# file names in lower-case letters. If set to YES upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows +# and Mac users are advised to set this option to NO. + +CASE_SENSE_NAMES = NO + +# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen +# will show members with their full class and namespace scopes in the +# documentation. If set to YES the scope will be hidden. + +HIDE_SCOPE_NAMES = NO + +# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen +# will put a list of the files that are included by a file in the documentation +# of that file. + +SHOW_INCLUDE_FILES = YES + +# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen +# will list include files with double quotes in the documentation +# rather than with sharp brackets. + +FORCE_LOCAL_INCLUDES = NO + +# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] +# is inserted in the documentation for inline members. + +INLINE_INFO = YES + +# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen +# will sort the (detailed) documentation of file and class members +# alphabetically by member name. If set to NO the members will appear in +# declaration order. + +SORT_MEMBER_DOCS = YES + +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the +# brief documentation of file, namespace and class members alphabetically +# by member name. If set to NO (the default) the members will appear in +# declaration order. + +SORT_BRIEF_DOCS = NO + +# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen +# will sort the (brief and detailed) documentation of class members so that +# constructors and destructors are listed first. If set to NO (the default) +# the constructors will appear in the respective orders defined by +# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. +# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO +# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO. + +SORT_MEMBERS_CTORS_1ST = NO + +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the +# hierarchy of group names into alphabetical order. If set to NO (the default) +# the group names will appear in their defined order. + +SORT_GROUP_NAMES = NO + +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be +# sorted by fully-qualified names, including namespaces. If set to +# NO (the default), the class list will be sorted only by class name, +# not including the namespace part. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option applies only to the class list, not to the +# alphabetical list. + +SORT_BY_SCOPE_NAME = NO + +# The GENERATE_TODOLIST tag can be used to enable (YES) or +# disable (NO) the todo list. This list is created by putting \todo +# commands in the documentation. + +GENERATE_TODOLIST = YES + +# The GENERATE_TESTLIST tag can be used to enable (YES) or +# disable (NO) the test list. This list is created by putting \test +# commands in the documentation. + +GENERATE_TESTLIST = YES + +# The GENERATE_BUGLIST tag can be used to enable (YES) or +# disable (NO) the bug list. This list is created by putting \bug +# commands in the documentation. + +GENERATE_BUGLIST = YES + +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or +# disable (NO) the deprecated list. This list is created by putting +# \deprecated commands in the documentation. + +GENERATE_DEPRECATEDLIST= YES + +# The ENABLED_SECTIONS tag can be used to enable conditional +# documentation sections, marked by \if sectionname ... \endif. + +ENABLED_SECTIONS = + +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines +# the initial value of a variable or define consists of for it to appear in +# the documentation. If the initializer consists of more lines than specified +# here it will be hidden. Use a value of 0 to hide initializers completely. +# The appearance of the initializer of individual variables and defines in the +# documentation can be controlled using \showinitializer or \hideinitializer +# command in the documentation regardless of this setting. + +MAX_INITIALIZER_LINES = 30 + +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated +# at the bottom of the documentation of classes and structs. If set to YES the +# list will mention the files that were used to generate the documentation. + +SHOW_USED_FILES = YES + +# If the sources in your project are distributed over multiple directories +# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy +# in the documentation. The default is NO. + +SHOW_DIRECTORIES = NO + +# Set the SHOW_FILES tag to NO to disable the generation of the Files page. +# This will remove the Files entry from the Quick Index and from the +# Folder Tree View (if specified). The default is YES. + +SHOW_FILES = YES + +# Set the SHOW_NAMESPACES tag to NO to disable the generation of the +# Namespaces page. This will remove the Namespaces entry from the Quick Index +# and from the Folder Tree View (if specified). The default is YES. + +SHOW_NAMESPACES = YES + +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from +# the version control system). Doxygen will invoke the program by executing (via +# popen()) the command , where is the value of +# the FILE_VERSION_FILTER tag, and is the name of an input file +# provided by doxygen. Whatever the program writes to standard output +# is used as the file version. See the manual for examples. + +FILE_VERSION_FILTER = + +# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by +# doxygen. The layout file controls the global structure of the generated output files +# in an output format independent way. The create the layout file that represents +# doxygen's defaults, run doxygen with the -l option. You can optionally specify a +# file name after the option, if omitted DoxygenLayout.xml will be used as the name +# of the layout file. + +LAYOUT_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +# The QUIET tag can be used to turn on/off the messages that are generated +# by doxygen. Possible values are YES and NO. If left blank NO is used. + +QUIET = NO + +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated by doxygen. Possible values are YES and NO. If left blank +# NO is used. + +WARNINGS = YES + +# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings +# for undocumented members. If EXTRACT_ALL is set to YES then this flag will +# automatically be disabled. + +WARN_IF_UNDOCUMENTED = YES + +# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some +# parameters in a documented function, or documenting parameters that +# don't exist or using markup commands wrongly. + +WARN_IF_DOC_ERROR = YES + +# This WARN_NO_PARAMDOC option can be abled to get warnings for +# functions that are documented, but have no documentation for their parameters +# or return value. If set to NO (the default) doxygen will only warn about +# wrong or incomplete parameter documentation, but not about the absence of +# documentation. + +WARN_NO_PARAMDOC = YES + +# The WARN_FORMAT tag determines the format of the warning messages that +# doxygen can produce. The string should contain the $file, $line, and $text +# tags, which will be replaced by the file and line number from which the +# warning originated and the warning text. Optionally the format may contain +# $version, which will be replaced by the version of the file (if it could +# be obtained via FILE_VERSION_FILTER) + +WARN_FORMAT = "$file:$line: $text" + +# The WARN_LOGFILE tag can be used to specify a file to which warning +# and error messages should be written. If left blank the output is written +# to stderr. + +WARN_LOGFILE = + +#--------------------------------------------------------------------------- +# configuration options related to the input files +#--------------------------------------------------------------------------- + +# The INPUT tag can be used to specify the files and/or directories that contain +# documented source files. You may enter file names like "myfile.cpp" or +# directories like "/usr/src/myproject". Separate the files or directories +# with spaces. + +INPUT = ../src + +# This tag can be used to specify the character encoding of the source files +# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is +# also the default input encoding. Doxygen uses libiconv (or the iconv built +# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for +# the list of possible encodings. + +INPUT_ENCODING = UTF-8 + +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank the following patterns are tested: +# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx +# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 + +FILE_PATTERNS = *.c \ + *.cc \ + *.cxx \ + *.cpp \ + *.c++ \ + *.d \ + *.java \ + *.ii \ + *.ixx \ + *.ipp \ + *.i++ \ + *.inl \ + *.h \ + *.hh \ + *.hxx \ + *.hpp \ + *.h++ \ + *.idl \ + *.odl \ + *.cs \ + *.php \ + *.php3 \ + *.inc \ + *.m \ + *.mm \ + *.dox \ + *.py \ + *.f90 \ + *.f \ + *.vhd \ + *.vhdl + +# The RECURSIVE tag can be used to turn specify whether or not subdirectories +# should be searched for input files as well. Possible values are YES and NO. +# If left blank NO is used. + +RECURSIVE = YES + +# The EXCLUDE tag can be used to specify files and/or directories that should +# excluded from the INPUT source files. This way you can easily exclude a +# subdirectory from a directory tree whose root is specified with the INPUT tag. + +EXCLUDE = ../src/ParseKit + +# The EXCLUDE_SYMLINKS tag can be used select whether or not files or +# directories that are symbolic links (a Unix filesystem feature) are excluded +# from the input. + +EXCLUDE_SYMLINKS = NO + +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. Note that the wildcards are matched +# against the file with absolute path, so to exclude all test directories +# for example use the pattern */test/* + +EXCLUDE_PATTERNS = + +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the +# output. The symbol name can be a fully qualified name, a word, or if the +# wildcard * is used, a substring. Examples: ANamespace, AClass, +# AClass::ANamespace, ANamespace::*Test + +EXCLUDE_SYMBOLS = + +# The EXAMPLE_PATH tag can be used to specify one or more files or +# directories that contain example code fragments that are included (see +# the \include command). + +EXAMPLE_PATH = + +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank all files are included. + +EXAMPLE_PATTERNS = * + +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude +# commands irrespective of the value of the RECURSIVE tag. +# Possible values are YES and NO. If left blank NO is used. + +EXAMPLE_RECURSIVE = NO + +# The IMAGE_PATH tag can be used to specify one or more files or +# directories that contain image that are included in the documentation (see +# the \image command). + +IMAGE_PATH = + +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command , where +# is the value of the INPUT_FILTER tag, and is the name of an +# input file. Doxygen will then use the output that the filter program writes +# to standard output. If FILTER_PATTERNS is specified, this tag will be +# ignored. + +INPUT_FILTER = + +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. The filters are a list of the form: +# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further +# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER +# is applied to all files. + +FILTER_PATTERNS = + +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will be used to filter the input files when producing source +# files to browse (i.e. when SOURCE_BROWSER is set to YES). + +FILTER_SOURCE_FILES = NO + +#--------------------------------------------------------------------------- +# configuration options related to source browsing +#--------------------------------------------------------------------------- + +# If the SOURCE_BROWSER tag is set to YES then a list of source files will +# be generated. Documented entities will be cross-referenced with these sources. +# Note: To get rid of all source code in the generated output, make sure also +# VERBATIM_HEADERS is set to NO. + +SOURCE_BROWSER = YES + +# Setting the INLINE_SOURCES tag to YES will include the body +# of functions and classes directly in the documentation. + +INLINE_SOURCES = NO + +# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct +# doxygen to hide any special comment blocks from generated source code +# fragments. Normal C and C++ comments will always remain visible. + +STRIP_CODE_COMMENTS = YES + +# If the REFERENCED_BY_RELATION tag is set to YES +# then for each documented function all documented +# functions referencing it will be listed. + +REFERENCED_BY_RELATION = NO + +# If the REFERENCES_RELATION tag is set to YES +# then for each documented function all documented entities +# called/used by that function will be listed. + +REFERENCES_RELATION = NO + +# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) +# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from +# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will +# link to the source code. Otherwise they will link to the documentation. + +REFERENCES_LINK_SOURCE = YES + +# If the USE_HTAGS tag is set to YES then the references to source code +# will point to the HTML generated by the htags(1) tool instead of doxygen +# built-in source browser. The htags tool is part of GNU's global source +# tagging system (see http://www.gnu.org/software/global/global.html). You +# will need version 4.8.6 or higher. + +USE_HTAGS = NO + +# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen +# will generate a verbatim copy of the header file for each class for +# which an include is specified. Set to NO to disable this. + +VERBATIM_HEADERS = NO + +#--------------------------------------------------------------------------- +# configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- + +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index +# of all compounds will be generated. Enable this if the project +# contains a lot of classes, structs, unions or interfaces. + +ALPHABETICAL_INDEX = NO + +# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then +# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns +# in which this list will be split (can be a number in the range [1..20]) + +COLS_IN_ALPHA_INDEX = 5 + +# In case all classes in a project start with a common prefix, all +# classes will be put under the same header in the alphabetical index. +# The IGNORE_PREFIX tag can be used to specify one or more prefixes that +# should be ignored while generating the index headers. + +IGNORE_PREFIX = + +#--------------------------------------------------------------------------- +# configuration options related to the HTML output +#--------------------------------------------------------------------------- + +# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# generate HTML output. + +GENERATE_HTML = YES + +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `html' will be used as the default path. + +HTML_OUTPUT = html + +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for +# each generated HTML page (for example: .htm,.php,.asp). If it is left blank +# doxygen will generate files with .html extension. + +HTML_FILE_EXTENSION = .html + +# The HTML_HEADER tag can be used to specify a personal HTML header for +# each generated HTML page. If it is left blank doxygen will generate a +# standard header. + +HTML_HEADER = + +# The HTML_FOOTER tag can be used to specify a personal HTML footer for +# each generated HTML page. If it is left blank doxygen will generate a +# standard footer. + +HTML_FOOTER = + +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading +# style sheet that is used by each HTML page. It can be used to +# fine-tune the look of the HTML output. If the tag is left blank doxygen +# will generate a default style sheet. Note that doxygen will try to copy +# the style sheet file to the HTML output directory, so don't put your own +# stylesheet in the HTML output directory as well, or it will be erased! + +HTML_STYLESHEET = + +# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML +# page will contain the date and time when the page was generated. Setting +# this to NO can help when comparing the output of multiple runs. + +HTML_TIMESTAMP = YES + +# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, +# files or namespaces will be aligned in HTML using tables. If set to +# NO a bullet list will be used. + +HTML_ALIGN_MEMBERS = YES + +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. For this to work a browser that supports +# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox +# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). + +HTML_DYNAMIC_SECTIONS = NO + +# If the GENERATE_DOCSET tag is set to YES, additional index files +# will be generated that can be used as input for Apple's Xcode 3 +# integrated development environment, introduced with OSX 10.5 (Leopard). +# To create a documentation set, doxygen will generate a Makefile in the +# HTML output directory. Running make will produce the docset in that +# directory and running "make install" will install the docset in +# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find +# it at startup. +# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information. + +GENERATE_DOCSET = NO + +# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the +# feed. A documentation feed provides an umbrella under which multiple +# documentation sets from a single provider (such as a company or product suite) +# can be grouped. + +DOCSET_FEEDNAME = "Doxygen generated docs" + +# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that +# should uniquely identify the documentation set bundle. This should be a +# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen +# will append .docset to the name. + +DOCSET_BUNDLE_ID = org.doxygen.Project + +# If the GENERATE_HTMLHELP tag is set to YES, additional index files +# will be generated that can be used as input for tools like the +# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) +# of the generated HTML documentation. + +GENERATE_HTMLHELP = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can +# be used to specify the file name of the resulting .chm file. You +# can add a path in front of the file if the result should not be +# written to the html output directory. + +CHM_FILE = + +# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can +# be used to specify the location (absolute path including file name) of +# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run +# the HTML help compiler on the generated index.hhp. + +HHC_LOCATION = + +# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag +# controls if a separate .chi index file is generated (YES) or that +# it should be included in the master .chm file (NO). + +GENERATE_CHI = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING +# is used to encode HtmlHelp index (hhk), content (hhc) and project file +# content. + +CHM_INDEX_ENCODING = + +# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag +# controls whether a binary table of contents is generated (YES) or a +# normal table of contents (NO) in the .chm file. + +BINARY_TOC = NO + +# The TOC_EXPAND flag can be set to YES to add extra items for group members +# to the contents of the HTML help documentation and to the tree view. + +TOC_EXPAND = NO + +# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER +# are set, an additional index file will be generated that can be used as input for +# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated +# HTML documentation. + +GENERATE_QHP = NO + +# If the QHG_LOCATION tag is specified, the QCH_FILE tag can +# be used to specify the file name of the resulting .qch file. +# The path specified is relative to the HTML output folder. + +QCH_FILE = + +# The QHP_NAMESPACE tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#namespace + +QHP_NAMESPACE = org.doxygen.Project + +# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#virtual-folders + +QHP_VIRTUAL_FOLDER = doc + +# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add. +# For more information please see +# http://doc.trolltech.com/qthelpproject.html#custom-filters + +QHP_CUST_FILTER_NAME = + +# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see +# Qt Help Project / Custom Filters. + +QHP_CUST_FILTER_ATTRS = + +# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's +# filter section matches. +# Qt Help Project / Filter Attributes. + +QHP_SECT_FILTER_ATTRS = + +# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can +# be used to specify the location of Qt's qhelpgenerator. +# If non-empty doxygen will try to run qhelpgenerator on the generated +# .qhp file. + +QHG_LOCATION = + +# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files +# will be generated, which together with the HTML files, form an Eclipse help +# plugin. To install this plugin and make it available under the help contents +# menu in Eclipse, the contents of the directory containing the HTML and XML +# files needs to be copied into the plugins directory of eclipse. The name of +# the directory within the plugins directory should be the same as +# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before +# the help appears. + +GENERATE_ECLIPSEHELP = NO + +# A unique identifier for the eclipse help plugin. When installing the plugin +# the directory name containing the HTML and XML files should also have +# this name. + +ECLIPSE_DOC_ID = org.doxygen.Project + +# The DISABLE_INDEX tag can be used to turn on/off the condensed index at +# top of each HTML page. The value NO (the default) enables the index and +# the value YES disables it. + +DISABLE_INDEX = NO + +# This tag can be used to set the number of enum values (range [1..20]) +# that doxygen will group on one line in the generated HTML documentation. + +ENUM_VALUES_PER_LINE = 4 + +# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index +# structure should be generated to display hierarchical information. +# If the tag value is set to YES, a side panel will be generated +# containing a tree-like index structure (just like the one that +# is generated for HTML Help). For this to work a browser that supports +# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). +# Windows users are probably better off using the HTML help feature. + +GENERATE_TREEVIEW = NO + +# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, +# and Class Hierarchy pages using a tree view instead of an ordered list. + +USE_INLINE_TREES = NO + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be +# used to set the initial width (in pixels) of the frame in which the tree +# is shown. + +TREEVIEW_WIDTH = 250 + +# Use this tag to change the font size of Latex formulas included +# as images in the HTML documentation. The default is 10. Note that +# when you change the font size after a successful doxygen run you need +# to manually remove any form_*.png images from the HTML output directory +# to force them to be regenerated. + +FORMULA_FONTSIZE = 10 + +# When the SEARCHENGINE tag is enabled doxygen will generate a search box +# for the HTML output. The underlying search engine uses javascript +# and DHTML and should work on any modern browser. Note that when using +# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets +# (GENERATE_DOCSET) there is already a search function so this one should +# typically be disabled. For large projects the javascript based search engine +# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. + +SEARCHENGINE = NO + +# When the SERVER_BASED_SEARCH tag is enabled the search engine will be +# implemented using a PHP enabled web server instead of at the web client +# using Javascript. Doxygen will generate the search PHP script and index +# file to put on the web server. The advantage of the server +# based approach is that it scales better to large projects and allows +# full text search. The disadvances is that it is more difficult to setup +# and does not have live searching capabilities. + +SERVER_BASED_SEARCH = NO + +#--------------------------------------------------------------------------- +# configuration options related to the LaTeX output +#--------------------------------------------------------------------------- + +# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# generate Latex output. + +GENERATE_LATEX = NO + +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `latex' will be used as the default path. + +LATEX_OUTPUT = latex + +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# invoked. If left blank `latex' will be used as the default command name. +# Note that when enabling USE_PDFLATEX this option is only used for +# generating bitmaps for formulas in the HTML output, but not in the +# Makefile that is written to the output directory. + +LATEX_CMD_NAME = latex + +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to +# generate index for LaTeX. If left blank `makeindex' will be used as the +# default command name. + +MAKEINDEX_CMD_NAME = makeindex + +# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact +# LaTeX documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_LATEX = NO + +# The PAPER_TYPE tag can be used to set the paper type that is used +# by the printer. Possible values are: a4, a4wide, letter, legal and +# executive. If left blank a4wide will be used. + +PAPER_TYPE = a4wide + +# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX +# packages that should be included in the LaTeX output. + +EXTRA_PACKAGES = + +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for +# the generated latex document. The header should contain everything until +# the first chapter. If it is left blank doxygen will generate a +# standard header. Notice: only use this tag if you know what you are doing! + +LATEX_HEADER = + +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated +# is prepared for conversion to pdf (using ps2pdf). The pdf file will +# contain links (just like the HTML output) instead of page references +# This makes the output suitable for online browsing using a pdf viewer. + +PDF_HYPERLINKS = YES + +# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of +# plain latex in the generated Makefile. Set this option to YES to get a +# higher quality PDF documentation. + +USE_PDFLATEX = YES + +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. +# command to the generated LaTeX files. This will instruct LaTeX to keep +# running if errors occur, instead of asking the user for help. +# This option is also used when generating formulas in HTML. + +LATEX_BATCHMODE = NO + +# If LATEX_HIDE_INDICES is set to YES then doxygen will not +# include the index chapters (such as File Index, Compound Index, etc.) +# in the output. + +LATEX_HIDE_INDICES = NO + +# If LATEX_SOURCE_CODE is set to YES then doxygen will include +# source code with syntax highlighting in the LaTeX output. +# Note that which sources are shown also depends on other settings +# such as SOURCE_BROWSER. + +LATEX_SOURCE_CODE = NO + +#--------------------------------------------------------------------------- +# configuration options related to the RTF output +#--------------------------------------------------------------------------- + +# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output +# The RTF output is optimized for Word 97 and may not look very pretty with +# other RTF readers or editors. + +GENERATE_RTF = NO + +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `rtf' will be used as the default path. + +RTF_OUTPUT = rtf + +# If the COMPACT_RTF tag is set to YES Doxygen generates more compact +# RTF documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_RTF = NO + +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated +# will contain hyperlink fields. The RTF file will +# contain links (just like the HTML output) instead of page references. +# This makes the output suitable for online browsing using WORD or other +# programs which support those fields. +# Note: wordpad (write) and others do not support links. + +RTF_HYPERLINKS = NO + +# Load stylesheet definitions from file. Syntax is similar to doxygen's +# config file, i.e. a series of assignments. You only have to provide +# replacements, missing definitions are set to their default value. + +RTF_STYLESHEET_FILE = + +# Set optional variables used in the generation of an rtf document. +# Syntax is similar to doxygen's config file. + +RTF_EXTENSIONS_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to the man page output +#--------------------------------------------------------------------------- + +# If the GENERATE_MAN tag is set to YES (the default) Doxygen will +# generate man pages + +GENERATE_MAN = NO + +# The MAN_OUTPUT tag is used to specify where the man pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `man' will be used as the default path. + +MAN_OUTPUT = man + +# The MAN_EXTENSION tag determines the extension that is added to +# the generated man pages (default is the subroutine's section .3) + +MAN_EXTENSION = .3 + +# If the MAN_LINKS tag is set to YES and Doxygen generates man output, +# then it will generate one additional man file for each entity +# documented in the real man page(s). These additional files +# only source the real man page, but without them the man command +# would be unable to find the correct page. The default is NO. + +MAN_LINKS = NO + +#--------------------------------------------------------------------------- +# configuration options related to the XML output +#--------------------------------------------------------------------------- + +# If the GENERATE_XML tag is set to YES Doxygen will +# generate an XML file that captures the structure of +# the code including all documentation. + +GENERATE_XML = YES + +# The XML_OUTPUT tag is used to specify where the XML pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `xml' will be used as the default path. + +XML_OUTPUT = xml + +# The XML_SCHEMA tag can be used to specify an XML schema, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_SCHEMA = + +# The XML_DTD tag can be used to specify an XML DTD, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_DTD = + +# If the XML_PROGRAMLISTING tag is set to YES Doxygen will +# dump the program listings (including syntax highlighting +# and cross-referencing information) to the XML output. Note that +# enabling this will significantly increase the size of the XML output. + +XML_PROGRAMLISTING = YES + +#--------------------------------------------------------------------------- +# configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- + +# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will +# generate an AutoGen Definitions (see autogen.sf.net) file +# that captures the structure of the code including all +# documentation. Note that this feature is still experimental +# and incomplete at the moment. + +GENERATE_AUTOGEN_DEF = NO + +#--------------------------------------------------------------------------- +# configuration options related to the Perl module output +#--------------------------------------------------------------------------- + +# If the GENERATE_PERLMOD tag is set to YES Doxygen will +# generate a Perl module file that captures the structure of +# the code including all documentation. Note that this +# feature is still experimental and incomplete at the +# moment. + +GENERATE_PERLMOD = NO + +# If the PERLMOD_LATEX tag is set to YES Doxygen will generate +# the necessary Makefile rules, Perl scripts and LaTeX code to be able +# to generate PDF and DVI output from the Perl module output. + +PERLMOD_LATEX = NO + +# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be +# nicely formatted so it can be parsed by a human reader. This is useful +# if you want to understand what is going on. On the other hand, if this +# tag is set to NO the size of the Perl module output will be much smaller +# and Perl will parse it just the same. + +PERLMOD_PRETTY = YES + +# The names of the make variables in the generated doxyrules.make file +# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. +# This is useful so different doxyrules.make files included by the same +# Makefile don't overwrite each other's variables. + +PERLMOD_MAKEVAR_PREFIX = + +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- + +# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will +# evaluate all C-preprocessor directives found in the sources and include +# files. + +ENABLE_PREPROCESSING = YES + +# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro +# names in the source code. If set to NO (the default) only conditional +# compilation will be performed. Macro expansion can be done in a controlled +# way by setting EXPAND_ONLY_PREDEF to YES. + +MACRO_EXPANSION = NO + +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES +# then the macro expansion is limited to the macros specified with the +# PREDEFINED and EXPAND_AS_DEFINED tags. + +EXPAND_ONLY_PREDEF = NO + +# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files +# in the INCLUDE_PATH (see below) will be search if a #include is found. + +SEARCH_INCLUDES = YES + +# The INCLUDE_PATH tag can be used to specify one or more directories that +# contain include files that are not input files but should be processed by +# the preprocessor. + +INCLUDE_PATH = + +# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard +# patterns (like *.h and *.hpp) to filter out the header-files in the +# directories. If left blank, the patterns specified with FILE_PATTERNS will +# be used. + +INCLUDE_FILE_PATTERNS = + +# The PREDEFINED tag can be used to specify one or more macro names that +# are defined before the preprocessor is started (similar to the -D option of +# gcc). The argument of the tag is a list of macros of the form: name +# or name=definition (no spaces). If the definition and the = are +# omitted =1 is assumed. To prevent a macro definition from being +# undefined via #undef or recursively expanded use the := operator +# instead of the = operator. + +PREDEFINED = __APPLE__ + +# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then +# this tag can be used to specify a list of macro names that should be expanded. +# The macro definition that is found in the sources will be used. +# Use the PREDEFINED tag if you want to use a different macro definition. + +EXPAND_AS_DEFINED = + +# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then +# doxygen's preprocessor will remove all function-like macros that are alone +# on a line, have an all uppercase name, and do not end with a semicolon. Such +# function macros are typically used for boiler-plate code, and will confuse +# the parser if not removed. + +SKIP_FUNCTION_MACROS = YES + +#--------------------------------------------------------------------------- +# Configuration::additions related to external references +#--------------------------------------------------------------------------- + +# The TAGFILES option can be used to specify one or more tagfiles. +# Optionally an initial location of the external documentation +# can be added for each tagfile. The format of a tag file without +# this location is as follows: +# TAGFILES = file1 file2 ... +# Adding location for the tag files is done as follows: +# TAGFILES = file1=loc1 "file2 = loc2" ... +# where "loc1" and "loc2" can be relative or absolute paths or +# URLs. If a location is present for each tag, the installdox tool +# does not have to be run to correct the links. +# Note that each tag file must have a unique name +# (where the name does NOT include the path) +# If a tag file is not located in the directory in which doxygen +# is run, you must also specify the path to the tagfile here. + +TAGFILES = + +# When a file name is specified after GENERATE_TAGFILE, doxygen will create +# a tag file that is based on the input files it reads. + +GENERATE_TAGFILE = + +# If the ALLEXTERNALS tag is set to YES all external classes will be listed +# in the class index. If set to NO only the inherited external classes +# will be listed. + +ALLEXTERNALS = NO + +# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed +# in the modules index. If set to NO, only the current project's groups will +# be listed. + +EXTERNAL_GROUPS = YES + +# The PERL_PATH should be the absolute path and name of the perl script +# interpreter (i.e. the result of `which perl'). + +PERL_PATH = /usr/bin/perl + +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- + +# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will +# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base +# or super classes. Setting the tag to NO turns the diagrams off. Note that +# this option is superseded by the HAVE_DOT option below. This is only a +# fallback. It is recommended to install and use dot, since it yields more +# powerful graphs. + +CLASS_DIAGRAMS = NO + +# You can define message sequence charts within doxygen comments using the \msc +# command. Doxygen will then run the mscgen tool (see +# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the +# documentation. The MSCGEN_PATH tag allows you to specify the directory where +# the mscgen tool resides. If left empty the tool is assumed to be found in the +# default search path. + +MSCGEN_PATH = /Applications/Doxygen.app/Contents/Resources/ + +# If set to YES, the inheritance and collaboration graphs will hide +# inheritance and usage relations if the target is undocumented +# or is not a class. + +HIDE_UNDOC_RELATIONS = YES + +# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is +# available from the path. This tool is part of Graphviz, a graph visualization +# toolkit from AT&T and Lucent Bell Labs. The other options in this section +# have no effect if this option is set to NO (the default) + +HAVE_DOT = YES + +# By default doxygen will write a font called FreeSans.ttf to the output +# directory and reference it in all dot files that doxygen generates. This +# font does not include all possible unicode characters however, so when you need +# these (or just want a differently looking font) you can specify the font name +# using DOT_FONTNAME. You need need to make sure dot is able to find the font, +# which can be done by putting it in a standard location or by setting the +# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory +# containing the font. + +DOT_FONTNAME = FreeSans + +# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. +# The default size is 10pt. + +DOT_FONTSIZE = 10 + +# By default doxygen will tell dot to use the output directory to look for the +# FreeSans.ttf font (which doxygen will put there itself). If you specify a +# different font using DOT_FONTNAME you can set the path where dot +# can find it using this tag. + +DOT_FONTPATH = + +# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect inheritance relations. Setting this tag to YES will force the +# the CLASS_DIAGRAMS tag to NO. + +CLASS_GRAPH = YES + +# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect implementation dependencies (inheritance, containment, and +# class references variables) of the class with other documented classes. + +COLLABORATION_GRAPH = YES + +# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for groups, showing the direct groups dependencies + +GROUP_GRAPHS = YES + +# If the UML_LOOK tag is set to YES doxygen will generate inheritance and +# collaboration diagrams in a style similar to the OMG's Unified Modeling +# Language. + +UML_LOOK = NO + +# If set to YES, the inheritance and collaboration graphs will show the +# relations between templates and their instances. + +TEMPLATE_RELATIONS = NO + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT +# tags are set to YES then doxygen will generate a graph for each documented +# file showing the direct and indirect include dependencies of the file with +# other documented files. + +INCLUDE_GRAPH = YES + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and +# HAVE_DOT tags are set to YES then doxygen will generate a graph for each +# documented header file showing the documented files that directly or +# indirectly include this file. + +INCLUDED_BY_GRAPH = YES + +# If the CALL_GRAPH and HAVE_DOT options are set to YES then +# doxygen will generate a call dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable call graphs +# for selected functions only using the \callgraph command. + +CALL_GRAPH = YES + +# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then +# doxygen will generate a caller dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable caller +# graphs for selected functions only using the \callergraph command. + +CALLER_GRAPH = NO + +# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen +# will graphical hierarchy of all classes instead of a textual one. + +GRAPHICAL_HIERARCHY = YES + +# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES +# then doxygen will show the dependencies a directory has on other directories +# in a graphical way. The dependency relations are determined by the #include +# relations between the files in the directories. + +DIRECTORY_GRAPH = YES + +# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images +# generated by dot. Possible values are png, jpg, or gif +# If left blank png will be used. + +DOT_IMAGE_FORMAT = png + +# The tag DOT_PATH can be used to specify the path where the dot tool can be +# found. If left blank, it is assumed the dot tool can be found in the path. + +DOT_PATH = /Applications/Doxygen.app/Contents/Resources/ + +# The DOTFILE_DIRS tag can be used to specify one or more directories that +# contain dot files that are included in the documentation (see the +# \dotfile command). + +DOTFILE_DIRS = + +# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of +# nodes that will be shown in the graph. If the number of nodes in a graph +# becomes larger than this value, doxygen will truncate the graph, which is +# visualized by representing a node as a red box. Note that doxygen if the +# number of direct children of the root node in a graph is already larger than +# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note +# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. + +DOT_GRAPH_MAX_NODES = 50 + +# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the +# graphs generated by dot. A depth value of 3 means that only nodes reachable +# from the root by following a path via at most 3 edges will be shown. Nodes +# that lay further from the root node will be omitted. Note that setting this +# option to 1 or 2 may greatly reduce the computation time needed for large +# code bases. Also note that the size of a graph can be further restricted by +# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. + +MAX_DOT_GRAPH_DEPTH = 1000 + +# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent +# background. This is disabled by default, because dot on Windows does not +# seem to support this out of the box. Warning: Depending on the platform used, +# enabling this option may lead to badly anti-aliased labels on the edges of +# a graph (i.e. they become hard to read). + +DOT_TRANSPARENT = NO + +# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output +# files in one run (i.e. multiple -o and -T options on the command line). This +# makes dot run faster, but since only newer versions of dot (>1.8.10) +# support this, this feature is disabled by default. + +DOT_MULTI_TARGETS = NO + +# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will +# generate a legend page explaining the meaning of the various boxes and +# arrows in the dot generated graphs. + +GENERATE_LEGEND = YES + +# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will +# remove the intermediate dot files that are used to generate +# the various graphs. + +DOT_CLEANUP = YES diff --git a/tikzit-old/draw-ellipse.png b/tikzit-old/draw-ellipse.png new file mode 100644 index 0000000..d8e3e6f Binary files /dev/null and b/tikzit-old/draw-ellipse.png differ diff --git a/tikzit-old/draw-path.png b/tikzit-old/draw-path.png new file mode 100644 index 0000000..ec5e691 Binary files /dev/null and b/tikzit-old/draw-path.png differ diff --git a/tikzit-old/emblem-important.png b/tikzit-old/emblem-important.png new file mode 100644 index 0000000..81e9ed2 Binary files /dev/null and b/tikzit-old/emblem-important.png differ diff --git a/tikzit-old/emblem-unreadable-grey.png b/tikzit-old/emblem-unreadable-grey.png new file mode 100644 index 0000000..09572ab Binary files /dev/null and b/tikzit-old/emblem-unreadable-grey.png differ diff --git a/tikzit-old/engine.png b/tikzit-old/engine.png new file mode 100755 index 0000000..1e45370 Binary files /dev/null and b/tikzit-old/engine.png differ diff --git a/tikzit-old/format-indent-less.png b/tikzit-old/format-indent-less.png new file mode 100644 index 0000000..7ced16f Binary files /dev/null and b/tikzit-old/format-indent-less.png differ diff --git a/tikzit-old/m4/objc.m4 b/tikzit-old/m4/objc.m4 new file mode 100644 index 0000000..8c7cc78 --- /dev/null +++ b/tikzit-old/m4/objc.m4 @@ -0,0 +1,135 @@ +# Checks for a working Foundation +# tz_cv_objc_foundation +# to either "yes" or "no" +# +AC_DEFUN([TZ_OBJC_FOUNDATION], +[ +AC_LANG_ASSERT([Objective C]) +tz_old_objcflags="$OBJCFLAGS" +OBJCFLAGS="$OBJCFLAGS $TZ_TEST_OBJCFLAGS" + +AC_CACHE_CHECK([for Objective C Foundation], + [tz_cv_objc_foundation], +[AC_COMPILE_IFELSE( + [AC_LANG_SOURCE([[ +#import + +@interface TestObj : NSObject { + int intVar; + NSObject *objVar; + NSString *strVar; +} +-(id)init; +@end + +@implementation TestObj +-(id)init { + self = [super init]; + intVar = 0; + objVar = nil; + strVar = @"Foo"; + return self; +} +@end + +int main(void) { + TestObj *obj = [[TestObj alloc] init]; + [obj release]; + return 0; +} + ]])], + [tz_cv_objc_foundation=yes], + [tz_cv_objc_foundation=no])]) + +OBJCFLAGS="$tz_old_objcflags" +]) + + +# Checks for Objective C 2 feature support +# and sets the shell variables +# tz_cv_objc_properties +# tz_cv_objc_fast_enumeration +# tz_cv_objc_optional_keyword +# to either "yes" or "no" +# +AC_DEFUN([TZ_OBJC2_FEATURES], +[ +AC_LANG_ASSERT([Objective C]) +tz_old_objcflags="$OBJCFLAGS" +OBJCFLAGS="$OBJCFLAGS $TZ_TEST_OBJCFLAGS" + +AC_CACHE_CHECK([for Objective C 2 @property support], + [tz_cv_objc_properties], +[AC_COMPILE_IFELSE( + [AC_LANG_SOURCE([[ +#import + +@interface TestObj : NSObject { + int intProp1; + NSObject *copyObjProp; + NSObject *fooProp; +} +@property (assign,nonatomic) int intProp; +@property (retain,readonly) NSObject *retainObjProp; +@property (copy,readwrite) NSObject *copyObjProp; +@property (retain,getter=foo,setter=foo1:) NSObject *fooProp; +@end + +@implementation TestObj +@synthesize intProp=intProp1; +@dynamic retainObjProp; +- (NSObject*) retainObjProp { return nil; } +@synthesize copyObjProp; +@synthesize fooProp; +@end + +int main(void) { + TestObj *obj = [[TestObj alloc] init]; + obj.intProp = 4; + NSObject *result = obj.retainObjProp; + return 0; +} + ]])], + [tz_cv_objc_properties=yes], + [tz_cv_objc_properties=no])]) + + +AC_CACHE_CHECK([for Objective C 2 fast enumeration support], + [tz_cv_objc_fast_enumeration], +[AC_COMPILE_IFELSE( + [AC_LANG_SOURCE([[ +#import + +int main(void) { + NSArray *array = [NSArray arrayWithObjects: @"One", @"Two", @"Three", @"Four", nil]; + for (NSString *element in array) { + NSLog(@"element: %@", element); + } + return 0; +} + ]])], + [tz_cv_objc_fast_enumeration=yes], + [tz_cv_objc_fast_enumeration=no])]) + +AC_CACHE_CHECK([for Objective C 2 @optional support], + [tz_cv_objc_optional_keyword], +[AC_COMPILE_IFELSE( + [AC_LANG_SOURCE([[ +#import + +@protocol Foo +@optional +- (void) foo; +@required +- (void) bar; +@end + +int main(void) { + return 0; +} + ]])], + [tz_cv_objc_optional_keyword=yes], + [tz_cv_objc_optional_keyword=no])]) + +OBJCFLAGS="$tz_old_objcflags" +]) diff --git a/tikzit-old/preamble.png b/tikzit-old/preamble.png new file mode 100755 index 0000000..d940d24 Binary files /dev/null and b/tikzit-old/preamble.png differ diff --git a/tikzit-old/scripts/generate_keys.rb b/tikzit-old/scripts/generate_keys.rb new file mode 100755 index 0000000..b22439c --- /dev/null +++ b/tikzit-old/scripts/generate_keys.rb @@ -0,0 +1,13 @@ +#!/usr/bin/ruby +["dsaparam.pem", "dsa_priv.pem", "dsa_pub.pem"].each do |file| + if File.exist? file + puts "There's already a #{file} here! Move it aside or be more careful!" + end +end +`openssl dsaparam 2048 < /dev/urandom > dsaparam.pem` +`openssl gendsa dsaparam.pem -out dsa_priv.pem` +`openssl dsa -in dsa_priv.pem -pubout -out dsa_pub.pem` +`rm dsaparam.pem` +puts "\nGenerated private and public keys: dsa_priv.pem and dsa_pub.pem.\n +BACK UP YOUR PRIVATE KEY AND KEEP IT SAFE!\n +If you lose it, your users will be unable to upgrade!\n" \ No newline at end of file diff --git a/tikzit-old/scripts/prepare_release.sh b/tikzit-old/scripts/prepare_release.sh new file mode 100755 index 0000000..5f5edfc --- /dev/null +++ b/tikzit-old/scripts/prepare_release.sh @@ -0,0 +1,40 @@ +set -o errexit + +PROJECT_NAME=TikZiT +APP_BUNDLE=xbuild/Release/$PROJECT_NAME.app + +VERSION=$(defaults read "$(pwd)/$APP_BUNDLE/Contents/Info" CFBundleVersion) +DOWNLOAD_BASE_URL="http://tikzit.sourceforge.net/appcast" +RELEASENOTES_URL="$DOWNLOAD_BASE_URL/rnotes.html" + +ARCHIVE_FILENAME="$PROJECT_NAME $VERSION.tar.bz2" +ARCHIVE_PATH="../www/htdocs/appcast/files/$ARCHIVE_FILENAME" +DOWNLOAD_URL="$DOWNLOAD_BASE_URL/files/$ARCHIVE_FILENAME" + +if [ -e "$ARCHIVE_PATH" ]; then + echo 'Archive already exists. Either remove this archive or increment version.' + exit 1 +fi + +tar cjf "$ARCHIVE_PATH" "$APP_BUNDLE" + +SIZE=$(stat -f %z "$ARCHIVE_PATH") +PUBDATE=$(LC_TIME=en_US date +"%a, %d %b %G %T %z") +SIGNATURE=$(scripts/sign_update.rb "$ARCHIVE_PATH" tikzit_dsa_priv.pem) + +cat < + Version $VERSION + + $RELEASENOTES_URL + + $PUBDATE + + +EOF diff --git a/tikzit-old/scripts/sign_update.rb b/tikzit-old/scripts/sign_update.rb new file mode 100755 index 0000000..6d03e2e --- /dev/null +++ b/tikzit-old/scripts/sign_update.rb @@ -0,0 +1,7 @@ +#!/usr/bin/ruby +if ARGV.length < 2 + puts "Usage: ruby sign_update.rb update_archive private_key" + exit +end + +puts `openssl dgst -sha1 -binary < "#{ARGV[0]}" | openssl dgst -dss1 -sign "#{ARGV[1]}" | openssl enc -base64` \ No newline at end of file diff --git a/tikzit-old/select-rectangular.png b/tikzit-old/select-rectangular.png new file mode 100644 index 0000000..866b602 Binary files /dev/null and b/tikzit-old/select-rectangular.png differ diff --git a/tikzit-old/shapes/cap.tikz b/tikzit-old/shapes/cap.tikz new file mode 100644 index 0000000..a98ff39 --- /dev/null +++ b/tikzit-old/shapes/cap.tikz @@ -0,0 +1,13 @@ +\begin{tikzpicture} + \path [use as bounding box] (-2,-2) rectangle (2,2); + \begin{pgfonlayer}{nodelayer} + \node [style=none] (0) at (0, 0.75) {}; + \node [style=none] (1) at (-0.5, 0) {}; + \node [style=none] (2) at (0.5, 0) {}; + \end{pgfonlayer} + \begin{pgfonlayer}{edgelayer} + \draw [in=0, out=90] (2.center) to (0.center); + \draw [in=270, out=-90, looseness=0.75] (1.center) to (2.center); + \draw [in=90, out=180] (0.center) to (1.center); + \end{pgfonlayer} +\end{tikzpicture} \ No newline at end of file diff --git a/tikzit-old/shapes/copants.tikz b/tikzit-old/shapes/copants.tikz new file mode 100644 index 0000000..d2b8e3c --- /dev/null +++ b/tikzit-old/shapes/copants.tikz @@ -0,0 +1,19 @@ +\begin{tikzpicture} + \path [use as bounding box] (-2,-2) rectangle (2,2); + \begin{pgfonlayer}{nodelayer} + \node [style=none] (0) at (-1.5, 1) {}; + \node [style=none] (1) at (-0.5, 1) {}; + \node [style=none] (2) at (0.5, 1) {}; + \node [style=none] (3) at (1.5, 1) {}; + \node [style=none] (4) at (-0.5, -1) {}; + \node [style=none] (5) at (0.5, -1) {}; + \end{pgfonlayer} + \begin{pgfonlayer}{edgelayer} + \draw [in=-90, out=90, looseness=0.75] (5.center) to (3.center); + \draw [in=90, out=90, looseness=0.75] (4.center) to (5.center); + \draw [in=270, out=-90, looseness=0.75] (1.center) to (0.center); + \draw [in=270, out=-90, looseness=0.75] (3.center) to (2.center); + \draw [in=-270, out=-90, looseness=0.75] (0.center) to (4.center); + \draw [in=-90, out=-90, looseness=1.75] (2.center) to (1.center); + \end{pgfonlayer} +\end{tikzpicture} \ No newline at end of file diff --git a/tikzit-old/shapes/cup.tikz b/tikzit-old/shapes/cup.tikz new file mode 100644 index 0000000..1dc1faa --- /dev/null +++ b/tikzit-old/shapes/cup.tikz @@ -0,0 +1,13 @@ +\begin{tikzpicture} + \path [use as bounding box] (-2,-2) rectangle (2,2); + \begin{pgfonlayer}{nodelayer} + \node [style=none] (0) at (-0.5, 0) {}; + \node [style=none] (1) at (0.5, 0) {}; + \node [style=none] (2) at (0, -0.75) {}; + \end{pgfonlayer} + \begin{pgfonlayer}{edgelayer} + \draw [in=0, out=-90] (1.center) to (2.center); + \draw [in=-270, out=90, looseness=0.75] (0.center) to (1.center); + \draw [in=-90, out=-180] (2.center) to (0.center); + \end{pgfonlayer} +\end{tikzpicture} \ No newline at end of file diff --git a/tikzit-old/shapes/oval.tikz b/tikzit-old/shapes/oval.tikz new file mode 100644 index 0000000..b5d2891 --- /dev/null +++ b/tikzit-old/shapes/oval.tikz @@ -0,0 +1,11 @@ +\begin{tikzpicture} + \path [use as bounding box] (-2,-2) rectangle (2,2); + \begin{pgfonlayer}{nodelayer} + \node [style=none] (0) at (-0.5, 0) {}; + \node [style=none] (1) at (0.5, 0) {}; + \end{pgfonlayer} + \begin{pgfonlayer}{edgelayer} + \draw [in=90, out=90, looseness=0.75] (0.center) to (1.center); + \draw [in=-90, out=270, looseness=0.75] (1.center) to (0.center); + \end{pgfonlayer} +\end{tikzpicture} \ No newline at end of file diff --git a/tikzit-old/shapes/pants.tikz b/tikzit-old/shapes/pants.tikz new file mode 100644 index 0000000..c2c15c2 --- /dev/null +++ b/tikzit-old/shapes/pants.tikz @@ -0,0 +1,19 @@ +\begin{tikzpicture} + \path [use as bounding box] (-2,-2) rectangle (2,2); + \begin{pgfonlayer}{nodelayer} + \node [style=none] (0) at (-0.5, 1) {}; + \node [style=none] (1) at (0.5, 1) {}; + \node [style=none] (2) at (-1.5, -1) {}; + \node [style=none] (3) at (-0.5, -1) {}; + \node [style=none] (4) at (0.5, -1) {}; + \node [style=none] (5) at (1.5, -1) {}; + \end{pgfonlayer} + \begin{pgfonlayer}{edgelayer} + \draw [in=90, out=90, looseness=1.75] (4.center) to (3.center); + \draw [in=270, out=90, looseness=0.75] (2.center) to (0.center); + \draw [in=-90, out=-90, looseness=0.75] (0.center) to (1.center); + \draw [in=90, out=-90, looseness=0.75] (1.center) to (5.center); + \draw [in=-270, out=90, looseness=0.75] (5.center) to (4.center); + \draw [in=-270, out=90, looseness=0.75] (3.center) to (2.center); + \end{pgfonlayer} +\end{tikzpicture} \ No newline at end of file diff --git a/tikzit-old/share/Makefile.am b/tikzit-old/share/Makefile.am new file mode 100644 index 0000000..658b4d9 --- /dev/null +++ b/tikzit-old/share/Makefile.am @@ -0,0 +1,10 @@ +if WINDOWS +else +sharedir = $(datarootdir) +nobase_dist_share_DATA = \ + applications/tikzit.desktop \ + mime/packages/tikzit.xml \ + icons/hicolor/*/*/*.png \ + icons/hicolor/scalable/*/*.svg +endif + diff --git a/tikzit-old/share/applications/tikzit.desktop b/tikzit-old/share/applications/tikzit.desktop new file mode 100644 index 0000000..12b6fa5 --- /dev/null +++ b/tikzit-old/share/applications/tikzit.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=TikZit +Comment=Editor for PGF/TikZ-based node-and-edge graphs for LaTeX documents +GenericName=TikZ Graph Editor +MimeType=text/x-tikz +Exec=tikzit +Icon=tikzit +Categories=GTK;Graphics;Education;Science; +StartupNotify=false diff --git a/tikzit-old/share/icons/hicolor/128x128/apps/tikzit.png b/tikzit-old/share/icons/hicolor/128x128/apps/tikzit.png new file mode 100644 index 0000000..e8ee92b Binary files /dev/null and b/tikzit-old/share/icons/hicolor/128x128/apps/tikzit.png differ diff --git a/tikzit-old/share/icons/hicolor/128x128/mimetypes/text-x-tikz.png b/tikzit-old/share/icons/hicolor/128x128/mimetypes/text-x-tikz.png new file mode 100644 index 0000000..6b3bbe6 Binary files /dev/null and b/tikzit-old/share/icons/hicolor/128x128/mimetypes/text-x-tikz.png differ diff --git a/tikzit-old/share/icons/hicolor/16x16/apps/tikzit.png b/tikzit-old/share/icons/hicolor/16x16/apps/tikzit.png new file mode 100644 index 0000000..9b7a377 Binary files /dev/null and b/tikzit-old/share/icons/hicolor/16x16/apps/tikzit.png differ diff --git a/tikzit-old/share/icons/hicolor/16x16/mimetypes/text-x-tikz.png b/tikzit-old/share/icons/hicolor/16x16/mimetypes/text-x-tikz.png new file mode 100644 index 0000000..364e831 Binary files /dev/null and b/tikzit-old/share/icons/hicolor/16x16/mimetypes/text-x-tikz.png differ diff --git a/tikzit-old/share/icons/hicolor/22x22/apps/tikzit.png b/tikzit-old/share/icons/hicolor/22x22/apps/tikzit.png new file mode 100644 index 0000000..be803da Binary files /dev/null and b/tikzit-old/share/icons/hicolor/22x22/apps/tikzit.png differ diff --git a/tikzit-old/share/icons/hicolor/22x22/mimetypes/text-x-tikz.png b/tikzit-old/share/icons/hicolor/22x22/mimetypes/text-x-tikz.png new file mode 100644 index 0000000..6436a9e Binary files /dev/null and b/tikzit-old/share/icons/hicolor/22x22/mimetypes/text-x-tikz.png differ diff --git a/tikzit-old/share/icons/hicolor/24x24/apps/tikzit.png b/tikzit-old/share/icons/hicolor/24x24/apps/tikzit.png new file mode 100644 index 0000000..478aeab Binary files /dev/null and b/tikzit-old/share/icons/hicolor/24x24/apps/tikzit.png differ diff --git a/tikzit-old/share/icons/hicolor/32x32/apps/tikzit.png b/tikzit-old/share/icons/hicolor/32x32/apps/tikzit.png new file mode 100644 index 0000000..75174e1 Binary files /dev/null and b/tikzit-old/share/icons/hicolor/32x32/apps/tikzit.png differ diff --git a/tikzit-old/share/icons/hicolor/32x32/mimetypes/text-x-tikz.png b/tikzit-old/share/icons/hicolor/32x32/mimetypes/text-x-tikz.png new file mode 100644 index 0000000..7faaded Binary files /dev/null and b/tikzit-old/share/icons/hicolor/32x32/mimetypes/text-x-tikz.png differ diff --git a/tikzit-old/share/icons/hicolor/48x48/apps/tikzit.png b/tikzit-old/share/icons/hicolor/48x48/apps/tikzit.png new file mode 100644 index 0000000..7186458 Binary files /dev/null and b/tikzit-old/share/icons/hicolor/48x48/apps/tikzit.png differ diff --git a/tikzit-old/share/icons/hicolor/48x48/mimetypes/text-x-tikz.png b/tikzit-old/share/icons/hicolor/48x48/mimetypes/text-x-tikz.png new file mode 100644 index 0000000..d061ed9 Binary files /dev/null and b/tikzit-old/share/icons/hicolor/48x48/mimetypes/text-x-tikz.png differ diff --git a/tikzit-old/share/icons/hicolor/64x64/apps/tikzit.png b/tikzit-old/share/icons/hicolor/64x64/apps/tikzit.png new file mode 100644 index 0000000..1641e85 Binary files /dev/null and b/tikzit-old/share/icons/hicolor/64x64/apps/tikzit.png differ diff --git a/tikzit-old/share/icons/hicolor/64x64/mimetypes/text-x-tikz.png b/tikzit-old/share/icons/hicolor/64x64/mimetypes/text-x-tikz.png new file mode 100644 index 0000000..2197553 Binary files /dev/null and b/tikzit-old/share/icons/hicolor/64x64/mimetypes/text-x-tikz.png differ diff --git a/tikzit-old/share/icons/hicolor/scalable/apps/tikzit.svg b/tikzit-old/share/icons/hicolor/scalable/apps/tikzit.svg new file mode 100644 index 0000000..dc5cc84 --- /dev/null +++ b/tikzit-old/share/icons/hicolor/scalable/apps/tikzit.svg @@ -0,0 +1,79 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/tikzit-old/share/icons/hicolor/scalable/mimetypes/text-x-tikz.svg b/tikzit-old/share/icons/hicolor/scalable/mimetypes/text-x-tikz.svg new file mode 100644 index 0000000..1642e87 --- /dev/null +++ b/tikzit-old/share/icons/hicolor/scalable/mimetypes/text-x-tikz.svg @@ -0,0 +1,488 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + text + plaintext + regular + script + shell + bash + python + perl + php + ruby + + + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tikzit-old/share/mime/packages/tikzit.xml b/tikzit-old/share/mime/packages/tikzit.xml new file mode 100644 index 0000000..c6e7c0c --- /dev/null +++ b/tikzit-old/share/mime/packages/tikzit.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/tikzit-old/share/tikzit b/tikzit-old/share/tikzit new file mode 120000 index 0000000..a96aa0e --- /dev/null +++ b/tikzit-old/share/tikzit @@ -0,0 +1 @@ +.. \ No newline at end of file diff --git a/tikzit-old/src/Makefile.am b/tikzit-old/src/Makefile.am new file mode 100644 index 0000000..5108e9c --- /dev/null +++ b/tikzit-old/src/Makefile.am @@ -0,0 +1,178 @@ +if WINDOWS +sharedir = ../ +else +sharedir = @datarootdir@/tikzit +endif + +AM_OBJCFLAGS = @FOUNDATION_OBJCFLAGS@ \ + @GTK_CFLAGS@ \ + -I common \ + -I gtk \ + -DTIKZITSHAREDIR=\"$(sharedir)\" \ + -std=c99 \ + -D_GNU_SOURCE +LIBS = @FOUNDATION_LIBS@ \ + @GTK_LIBS@ +AM_YFLAGS = -d +PARSERFILES = common/tikzlexer.m common/tikzlexer.h common/tikzparser.m common/tikzparser.h +ICONFILES = ../draw-ellipse.png \ + ../draw-path.png \ + ../select-rectangular.png \ + ../transform-crop-and-resize.png \ + ../transform-move.png +EDGEDECFILES = ../AH_*.png ../ED_*.png + +bin_PROGRAMS = tikzit +BUILT_SOURCES = $(PARSERFILES) +tikzit_SOURCES = gtk/Application.m \ + gtk/BoundingBoxTool.m \ + gtk/CairoRenderContext.m \ + gtk/ColorRGB+IntegerListStorage.m \ + gtk/ColorRGB+Gtk.m \ + gtk/Configuration.m \ + gtk/ContextWindow.m \ + gtk/CreateEdgeTool.m \ + gtk/CreateNodeTool.m \ + gtk/Edge+Render.m \ + gtk/EdgeStyle+Gtk.m \ + gtk/EdgeStyle+Storage.m \ + gtk/EdgeStyleEditor.m \ + gtk/EdgeStyleSelector.m \ + gtk/EdgeStylesModel.m \ + gtk/EdgeStylesPalette.m \ + gtk/FileChooserDialog.m \ + gtk/HandTool.m \ + gtk/GraphEditorPanel.m \ + gtk/GraphRenderer.m \ + gtk/Menu.m \ + gtk/Node+Render.m \ + gtk/NodeStyle+Gtk.m \ + gtk/NodeStyle+Storage.m \ + gtk/NodeStyleEditor.m \ + gtk/NodeStylesModel.m \ + gtk/NodeStyleSelector.m \ + gtk/NodeStylesPalette.m \ + gtk/NSError+Glib.m \ + gtk/NSFileManager+Glib.m \ + gtk/NSString+Glib.m \ + gtk/PropertiesPane.m \ + gtk/PropertyListEditor.m \ + gtk/RecentManager.m \ + gtk/SelectTool.m \ + gtk/SelectionPane.m \ + gtk/SettingsDialog.m \ + gtk/Shape+Render.m \ + gtk/StyleManager+Storage.m \ + gtk/TikzDocument.m \ + gtk/ToolBox.m \ + gtk/WidgetSurface.m \ + gtk/Window.m \ + gtk/cairo_helpers.m \ + gtk/clipboard.m \ + gtk/gtkhelpers.m \ + gtk/logo.m \ + gtk/mkdtemp.m \ + gtk/main.m \ + gtk/tzstockitems.m \ + gtk/tztoolpalette.m \ + common/CircleShape.m \ + common/ColorRGB.m \ + common/DiamondShape.m \ + common/Edge.m \ + common/EdgeStyle.m \ + common/GraphChange.m \ + common/GraphElementData.m \ + common/Graph.m \ + common/Grid.m \ + common/Node.m \ + common/NodeStyle.m \ + common/NSError+Tikzit.m \ + common/NSFileManager+Utils.m \ + common/NSString+LatexConstants.m \ + common/NSString+Tikz.m \ + common/NSString+Util.m \ + common/PickSupport.m \ + common/PropertyHolder.m \ + common/GraphElementProperty.m \ + common/RColor.m \ + common/RectangleShape.m \ + common/RegularPolyShape.m \ + common/Shape.m \ + common/StyleManager.m \ + common/SupportDir.m \ + common/TikzGraphAssembler.m \ + common/TikzShape.m \ + common/Transformer.m \ + common/tikzparser.m \ + common/tikzlexer.m \ + common/util.m + +if HAVE_POPPLER +tikzit_SOURCES += \ + common/Preambles.m \ + gtk/PreambleEditor.m \ + gtk/Preambles+Storage.m \ + gtk/PreviewRenderer.m \ + gtk/PreviewWindow.m +endif + +if WINDOWS +tikzit.res: tikzit.rc + $(AM_V_GEN)windres $^ -O coff -o $@ + +tikzit_LDADD = tikzit.res +CLEANFILES = tikzit.res +endif + +common/tikzlexer.m common/tikzlexer.h: common/tikzlexer.lm + $(AM_V_GEN)$(LEX) -o common/tikzlexer.m $^ +# ordering hack for parallel builds +common/tikzlexer.h: common/tikzlexer.m + +common/tikzparser.m common/tikzparser.h: common/tikzparser.ym + $(AM_V_GEN)$(YACC) --defines=common/tikzparser.h --output=common/tikzparser.m $^ +# ordering hack for parallel builds +common/tikzparser.h: common/tikzparser.m + +gtk/icondata.m: $(ICONFILES) + $(AM_V_GEN)gdk-pixbuf-csource --struct --static --raw --build-list \ + draw_ellipse ../draw-ellipse.png \ + draw_path ../draw-path.png \ + select_rectangular ../select-rectangular.png \ + transform_crop_and_resize ../transform-crop-and-resize.png \ + transform_move ../transform-move.png \ + > $@ + +gtk/logodata.m: ../share/icons/hicolor/*/apps/tikzit.png + $(AM_V_GEN)gdk-pixbuf-csource --struct --static --raw --build-list \ + logo16 ../share/icons/hicolor/16x16/apps/tikzit.png \ + logo24 ../share/icons/hicolor/24x24/apps/tikzit.png \ + logo32 ../share/icons/hicolor/32x32/apps/tikzit.png \ + logo48 ../share/icons/hicolor/48x48/apps/tikzit.png \ + logo64 ../share/icons/hicolor/64x64/apps/tikzit.png \ + logo128 ../share/icons/hicolor/128x128/apps/tikzit.png \ + > $@ + +gtk/edgedecdata.m: $(EDGEDECFILES) + $(AM_V_GEN)gdk-pixbuf-csource --struct --static --raw --build-list \ + AH_none_pixdata ../AH_none.png \ + AH_latex_head_pixdata ../AH_latex_head.png \ + AH_latex_tail_pixdata ../AH_latex_tail.png \ + AH_plain_head_pixdata ../AH_plain_head.png \ + AH_plain_tail_pixdata ../AH_plain_tail.png \ + ED_none_pixdata ../ED_none.png \ + ED_arrow_pixdata ../ED_arrow.png \ + ED_tick_pixdata ../ED_tick.png \ + > $@ + +gtk/Menu.m: gtk/icondata.m +gtk/logo.m: gtk/logodata.m +gtk/EdgeStyleEditor.m: gtk/edgedecdata.m + +EXTRA_DIST = gtk/*.h common/*.h \ + $(PARSERFILES) common/tikzlexer.lm common/tikzparser.ym \ + $(ICONFILES) gtk/icondata.m \ + gtk/logodata.m \ + $(EDGEDECFILES) gtk/edgedecdata.m \ + tikzit.rc ../tikzit.ico +MAINTAINERCLEANFILES = $(PARSERFILES) gtk/icondata.m gtk/logodata.m gtk/edgedecdata.m diff --git a/tikzit-old/src/common/CircleShape.h b/tikzit-old/src/common/CircleShape.h new file mode 100644 index 0000000..8215b92 --- /dev/null +++ b/tikzit-old/src/common/CircleShape.h @@ -0,0 +1,33 @@ +// +// CircleShape.h +// TikZiT +// +// Copyright 2011 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import "Shape.h" + +@interface CircleShape : Shape { +} + + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/CircleShape.m b/tikzit-old/src/common/CircleShape.m new file mode 100644 index 0000000..f2d1d52 --- /dev/null +++ b/tikzit-old/src/common/CircleShape.m @@ -0,0 +1,57 @@ +// +// CircleShape.m +// TikZiT +// +// Copyright 2011 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "CircleShape.h" +#import "Node.h" +#import "Edge.h" + +@implementation CircleShape + +- (id)init { + self = [super init]; + if (self) { + Node *n0,*n1,*n2,*n3; + + n0 = [Node nodeWithPoint:NSMakePoint( 0.0f, 0.2f)]; + n1 = [Node nodeWithPoint:NSMakePoint( 0.2f, 0.0f)]; + n2 = [Node nodeWithPoint:NSMakePoint( 0.0f, -0.2f)]; + n3 = [Node nodeWithPoint:NSMakePoint(-0.2f, 0.0f)]; + + Edge *e0,*e1,*e2,*e3; + + e0 = [Edge edgeWithSource:n0 andTarget:n1]; [e0 setBend:-45]; + e1 = [Edge edgeWithSource:n1 andTarget:n2]; [e1 setBend:-45]; + e2 = [Edge edgeWithSource:n2 andTarget:n3]; [e2 setBend:-45]; + e3 = [Edge edgeWithSource:n3 andTarget:n0]; [e3 setBend:-45]; + + paths = [[NSSet alloc] initWithObjects:[NSArray arrayWithObjects:e0,e1,e2,e3,nil],nil]; + + styleTikz = @"circle"; + } + return self; +} + + +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/ColorRGB.h b/tikzit-old/src/common/ColorRGB.h new file mode 100644 index 0000000..607ba64 --- /dev/null +++ b/tikzit-old/src/common/ColorRGB.h @@ -0,0 +1,64 @@ +// +// ColorRGB.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import "RColor.h" + +@interface ColorRGB : NSObject { + unsigned short red, green, blue; +} + +@property (assign) unsigned short red; +@property (assign) unsigned short green; +@property (assign) unsigned short blue; + +@property (assign) float redFloat; +@property (assign) float greenFloat; +@property (assign) float blueFloat; + +@property (readonly) NSString *name; + +- (RColor)rColor; +- (RColor)rColorWithAlpha:(CGFloat)alpha; + +- (NSString*)hexName; +- (BOOL)isEqual:(id)col; +- (float)distanceFromColor:(ColorRGB*)col; +- (int)hash; + +- (id)initWithRed:(unsigned short)r green:(unsigned short)g blue:(unsigned short)b; +- (id)initWithFloatRed:(float)r green:(float)g blue:(float)b; +- (id)initWithRColor:(RColor)color; + +- (void)setToClosestHashed; + ++ (ColorRGB*)colorWithRed:(unsigned short)r green:(unsigned short)g blue:(unsigned short)b; ++ (ColorRGB*)colorWithFloatRed:(float)r green:(float)g blue:(float)b; ++ (ColorRGB*)colorWithRColor:(RColor)color; + ++ (void)makeColorHash; ++ (void)releaseColorHash; + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/ColorRGB.m b/tikzit-old/src/common/ColorRGB.m new file mode 100644 index 0000000..840d716 --- /dev/null +++ b/tikzit-old/src/common/ColorRGB.m @@ -0,0 +1,353 @@ +// +// ColorRGB.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "ColorRGB.h" +#import "util.h" + +typedef struct { +#if __has_feature(objc_arc) + __unsafe_unretained NSString *name; +#else + NSString *name; +#endif + unsigned short r, g, b; +} ColorRGBEntry; + +static const ColorRGBEntry kColors[147] = { + { @"AliceBlue", 240, 248, 255 }, + { @"AntiqueWhite", 250, 235, 215 }, + { @"Aqua", 0, 255, 255 }, + { @"Aquamarine", 127, 255, 212 }, + { @"Azure", 240, 255, 255 }, + { @"Beige", 245, 245, 220 }, + { @"Bisque", 255, 228, 196 }, + { @"Black", 0, 0, 0 }, + { @"BlanchedAlmond", 255, 235, 205 }, + { @"Blue", 0, 0, 255 }, + { @"BlueViolet", 138, 43, 226 }, + { @"Brown", 165, 42, 42 }, + { @"BurlyWood", 222, 184, 135 }, + { @"CadetBlue", 95, 158, 160 }, + { @"Chartreuse", 127, 255, 0 }, + { @"Chocolate", 210, 105, 30 }, + { @"Coral", 255, 127, 80 }, + { @"CornflowerBlue", 100, 149, 237 }, + { @"Cornsilk", 255, 248, 220 }, + { @"Crimson", 220, 20, 60 }, + { @"Cyan", 0, 255, 255 }, + { @"DarkBlue", 0, 0, 139 }, + { @"DarkCyan", 0, 139, 139 }, + { @"DarkGoldenrod", 184, 134, 11 }, + { @"DarkGray", 169, 169, 169 }, + { @"DarkGreen", 0, 100, 0 }, + { @"DarkGrey", 169, 169, 169 }, + { @"DarkKhaki", 189, 183, 107 }, + { @"DarkMagenta", 139, 0, 139 }, + { @"DarkOliveGreen", 85, 107, 47 }, + { @"DarkOrange", 255, 140, 0 }, + { @"DarkOrchid", 153, 50, 204 }, + { @"DarkRed", 139, 0, 0 }, + { @"DarkSalmon", 233, 150, 122 }, + { @"DarkSeaGreen", 143, 188, 143 }, + { @"DarkSlateBlue", 72, 61, 139 }, + { @"DarkSlateGray", 47, 79, 79 }, + { @"DarkSlateGrey", 47, 79, 79 }, + { @"DarkTurquoise", 0, 206, 209 }, + { @"DarkViolet", 148, 0, 211 }, + { @"DeepPink", 255, 20, 147 }, + { @"DeepSkyBlue", 0, 191, 255 }, + { @"DimGray", 105, 105, 105 }, + { @"DimGrey", 105, 105, 105 }, + { @"DodgerBlue", 30, 144, 255 }, + { @"FireBrick", 178, 34, 34 }, + { @"FloralWhite", 255, 250, 240 }, + { @"ForestGreen", 34, 139, 34 }, + { @"Fuchsia", 255, 0, 255 }, + { @"Gainsboro", 220, 220, 220 }, + { @"GhostWhite", 248, 248, 255 }, + { @"Gold", 255, 215, 0 }, + { @"Goldenrod", 218, 165, 32 }, + { @"Gray", 128, 128, 128 }, + { @"Grey", 128, 128, 128 }, + { @"Green", 0, 128, 0 }, + { @"GreenYellow", 173, 255, 47 }, + { @"Honeydew", 240, 255, 240 }, + { @"HotPink", 255, 105, 180 }, + { @"IndianRed", 205, 92, 92 }, + { @"Indigo", 75, 0, 130 }, + { @"Ivory", 255, 255, 240 }, + { @"Khaki", 240, 230, 140 }, + { @"Lavender", 230, 230, 250 }, + { @"LavenderBlush", 255, 240, 245 }, + { @"LawnGreen", 124, 252, 0 }, + { @"LemonChiffon", 255, 250, 205 }, + { @"LightBlue", 173, 216, 230 }, + { @"LightCoral", 240, 128, 128 }, + { @"LightCyan", 224, 255, 255 }, + { @"LightGoldenrodYellow", 250, 250, 210 }, + { @"LightGray", 211, 211, 211 }, + { @"LightGreen", 144, 238, 144 }, + { @"LightGrey", 211, 211, 211 }, + { @"LightPink", 255, 182, 193 }, + { @"LightSalmon", 255, 160, 122 }, + { @"LightSeaGreen", 32, 178, 170 }, + { @"LightSkyBlue", 135, 206, 250 }, + { @"LightSlateGray", 119, 136, 153 }, + { @"LightSlateGrey", 119, 136, 153 }, + { @"LightSteelBlue", 176, 196, 222 }, + { @"LightYellow", 255, 255, 224 }, + { @"Lime", 0, 255, 0 }, + { @"LimeGreen", 50, 205, 50 }, + { @"Linen", 250, 240, 230 }, + { @"Magenta", 255, 0, 255 }, + { @"Maroon", 128, 0, 0 }, + { @"MediumAquamarine", 102, 205, 170 }, + { @"MediumBlue", 0, 0, 205 }, + { @"MediumOrchid", 186, 85, 211 }, + { @"MediumPurple", 147, 112, 219 }, + { @"MediumSeaGreen", 60, 179, 113 }, + { @"MediumSlateBlue", 123, 104, 238 }, + { @"MediumSpringGreen", 0, 250, 154 }, + { @"MediumTurquoise", 72, 209, 204 }, + { @"MediumVioletRed", 199, 21, 133 }, + { @"MidnightBlue", 25, 25, 112 }, + { @"MintCream", 245, 255, 250 }, + { @"MistyRose", 255, 228, 225 }, + { @"Moccasin", 255, 228, 181 }, + { @"NavajoWhite", 255, 222, 173 }, + { @"Navy", 0, 0, 128 }, + { @"OldLace", 253, 245, 230 }, + { @"Olive", 128, 128, 0 }, + { @"OliveDrab", 107, 142, 35 }, + { @"Orange", 255, 165, 0 }, + { @"OrangeRed", 255, 69, 0 }, + { @"Orchid", 218, 112, 214 }, + { @"PaleGoldenrod", 238, 232, 170 }, + { @"PaleGreen", 152, 251, 152 }, + { @"PaleTurquoise", 175, 238, 238 }, + { @"PaleVioletRed", 219, 112, 147 }, + { @"PapayaWhip", 255, 239, 213 }, + { @"PeachPuff", 255, 218, 185 }, + { @"Peru", 205, 133, 63 }, + { @"Pink", 255, 192, 203 }, + { @"Plum", 221, 160, 221 }, + { @"PowderBlue", 176, 224, 230 }, + { @"Purple", 128, 0, 128 }, + { @"Red", 255, 0, 0 }, + { @"RosyBrown", 188, 143, 143 }, + { @"RoyalBlue", 65, 105, 225 }, + { @"SaddleBrown", 139, 69, 19 }, + { @"Salmon", 250, 128, 114 }, + { @"SandyBrown", 244, 164, 96 }, + { @"SeaGreen", 46, 139, 87 }, + { @"Seashell", 255, 245, 238 }, + { @"Sienna", 160, 82, 45 }, + { @"Silver", 192, 192, 192 }, + { @"SkyBlue", 135, 206, 235 }, + { @"SlateBlue", 106, 90, 205 }, + { @"SlateGray", 112, 128, 144 }, + { @"SlateGrey", 112, 128, 144 }, + { @"Snow", 255, 250, 250 }, + { @"SpringGreen", 0, 255, 127 }, + { @"SteelBlue", 70, 130, 180 }, + { @"Tan", 210, 180, 140 }, + { @"Teal", 0, 128, 128 }, + { @"Thistle", 216, 191, 216 }, + { @"Tomato", 255, 99, 71 }, + { @"Turquoise", 64, 224, 208 }, + { @"Violet", 238, 130, 238 }, + { @"Wheat", 245, 222, 179 }, + { @"White", 255, 255, 255 }, + { @"WhiteSmoke", 245, 245, 245 }, + { @"Yellow", 255, 255, 0 }, + { @"YellowGreen", 154, 205, 50 } +}; + +static NSMapTable *colorHash = nil; + +@implementation ColorRGB + ++ (void)initialize { + [self setKeys:[NSArray arrayWithObject:@"red"] triggerChangeNotificationsForDependentKey:@"redFloat"]; + [self setKeys:[NSArray arrayWithObject:@"green"] triggerChangeNotificationsForDependentKey:@"greenFloat"]; + [self setKeys:[NSArray arrayWithObject:@"blue"] triggerChangeNotificationsForDependentKey:@"blueFloat"]; + [self setKeys:[NSArray arrayWithObjects:@"red", @"green", @"blue", nil] + triggerChangeNotificationsForDependentKey:@"name"]; +} + +@synthesize red, green, blue; + +- (float)redFloat { return ((float)red)/255.0f; } +- (void)setRedFloat:(float)r { [self setRed:round(r*255.0f)]; } +- (float)greenFloat { return ((float)green)/255.0f; } +- (void)setGreenFloat:(float)g { [self setGreen:round(g*255.0f)]; } +- (float)blueFloat { return ((float)blue)/255.0f; } +- (void)setBlueFloat:(float)b { [self setBlue:round(b*255.0f)]; } + +- (int)hash { + return (red<<4) + (green<<2) + blue; +} + +- (id)initWithRed:(unsigned short)r green:(unsigned short)g blue:(unsigned short)b { + self = [super init]; + if (self) { + red = r; + green = g; + blue = b; + } + return self; +} + +- (id)initWithFloatRed:(float)r green:(float)g blue:(float)b { + self = [super init]; + if (self) { + red = round(r*255.0f); + green = round(g*255.0f); + blue = round(b*255.0f); + } + return self; +} + +- (id) initWithRColor:(RColor)color { + return [self initWithFloatRed:color.red green:color.green blue:color.blue]; +} + +- (RColor) rColor { + return MakeSolidRColor ([self redFloat], [self greenFloat], [self blueFloat]); +} + +- (RColor) rColorWithAlpha:(CGFloat)alpha { + return MakeRColor ([self redFloat], [self greenFloat], [self blueFloat], alpha); +} + +- (NSString*)name { + if (colorHash == nil) + [ColorRGB makeColorHash]; + return [colorHash objectForKey:self]; +} + +- (NSString*)hexName { + return [NSString stringWithFormat:@"hexcolor0x%.2x%.2x%.2x", red, green, blue]; +} + +- (NSComparisonResult)compare:(ColorRGB*)col { + if (red > [col red]) return NSOrderedDescending; + else if (red < [col red]) return NSOrderedAscending; + else { + if (green > [col green]) return NSOrderedDescending; + else if (green < [col green]) return NSOrderedAscending; + else { + if (blue > [col blue]) return NSOrderedDescending; + else if (blue < [col blue]) return NSOrderedAscending; + else return NSOrderedSame; + } + } +} + +- (BOOL)isEqual:(id)col { + return [self compare:col] == NSOrderedSame; +} + +- (float)distanceFromColor:(ColorRGB *)col { + float dr = (float)(red - [col red]); + float dg = (float)(green - [col green]); + float db = (float)(blue - [col blue]); + return dr*dr + dg*dg + db*db; +} + +- (id)copyWithZone:(NSZone*)zone { + ColorRGB *col = [[ColorRGB allocWithZone:zone] initWithRed:red green:green blue:blue]; + return col; +} + ++ (ColorRGB*)colorWithRed:(unsigned short)r green:(unsigned short)g blue:(unsigned short)b { + ColorRGB *col = [[ColorRGB alloc] initWithRed:r green:g blue:b]; +#if __has_feature(objc_arc) + return col; +#else + return [col autorelease]; +#endif +} + + ++ (ColorRGB*)colorWithFloatRed:(float)r green:(float)g blue:(float)b { + ColorRGB *col = [[ColorRGB alloc] initWithFloatRed:r green:g blue:b]; +#if __has_feature(objc_arc) + return col; +#else + return [col autorelease]; +#endif +} + ++ (ColorRGB*) colorWithRColor:(RColor)color { +#if __has_feature(objc_arc) + return [[self alloc] initWithRColor:color]; +#else + return [[[self alloc] initWithRColor:color] autorelease]; +#endif +} + ++ (void)makeColorHash { + NSMapTable *h = [[NSMapTable alloc] init]; + int i; + for (i = 0; i < 147; ++i) { + ColorRGB *col = [[ColorRGB alloc] initWithRed:kColors[i].r + green:kColors[i].g + blue:kColors[i].b]; + [h setObject:kColors[i].name forKey:col]; + //NSLog(@"adding color %@ (%d)", kColors[i].name, [col hash]); +#if ! __has_feature(objc_arc) + [col release]; +#endif + } + colorHash = h; +} + ++ (void)releaseColorHash { +#if ! __has_feature(objc_arc) + [colorHash release]; +#endif +} + +- (void)setToClosestHashed { + if (colorHash == nil) + [ColorRGB makeColorHash]; + float bestDist = -1; + ColorRGB *bestColor = nil; + NSEnumerator *enumerator = [colorHash keyEnumerator]; + ColorRGB *tryColor; + while ((tryColor = [enumerator nextObject]) != nil) { + float dist = [self distanceFromColor:tryColor]; + if (bestDist<0 || dist. +// + +#import +#import "Shape.h" + +@interface DiamondShape : Shape { +} + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 + diff --git a/tikzit-old/src/common/DiamondShape.m b/tikzit-old/src/common/DiamondShape.m new file mode 100644 index 0000000..1a578b8 --- /dev/null +++ b/tikzit-old/src/common/DiamondShape.m @@ -0,0 +1,63 @@ +// +// DiamondShape.m +// TikZiT +// +// Copyright 2011 Aleks Kissinger +// Copyright 2012 Alex Merry +// All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "DiamondShape.h" + +#import "Node.h" +#import "Edge.h" + +@implementation DiamondShape + +- (id)init { + self = [super init]; + + if (!self) + return nil; + + Node *n0,*n1,*n2,*n3; + float sz = 0.25f; + + n0 = [Node nodeWithPoint:NSMakePoint(0, sz)]; + n1 = [Node nodeWithPoint:NSMakePoint(sz, 0)]; + n2 = [Node nodeWithPoint:NSMakePoint(0,-sz)]; + n3 = [Node nodeWithPoint:NSMakePoint(-sz,0)]; + + Edge *e0,*e1,*e2,*e3; + + e0 = [Edge edgeWithSource:n0 andTarget:n1]; + e1 = [Edge edgeWithSource:n1 andTarget:n2]; + e2 = [Edge edgeWithSource:n2 andTarget:n3]; + e3 = [Edge edgeWithSource:n3 andTarget:n0]; + + paths = [[NSSet alloc] initWithObjects:[NSArray arrayWithObjects:e0,e1,e2,e3,nil],nil]; + + styleTikz = @"shape=diamond"; + + return self; +} + +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/Edge.h b/tikzit-old/src/common/Edge.h new file mode 100644 index 0000000..accf38c --- /dev/null +++ b/tikzit-old/src/common/Edge.h @@ -0,0 +1,401 @@ +// +// Edge.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + + +// Edge : store the data associated with an edge. Also, lazily compute +// bezier curve control points based on bend and the coordinates of +// the endpoints. + +#import "Node.h" +#import "EdgeStyle.h" + +/*! + @typedef enum EdgeBendMode + @brief Indicates the type of edge bend. + @var EdgeBendModeBasic A basic, one-angle bend. Positive values will be interpreted + as bend left, negative as bend right. + @var EdgeBendModeInOut A two-angle bend mode, using inAngle and outAngle. + */ +typedef enum { + EdgeBendModeBasic, + EdgeBendModeInOut +} EdgeBendMode; + +/*! + @class Edge + @brief A graph edge, with associated bend and style data. + @details A graph edge, with associated bend and style data. This class + also contains methods for computing the bezier control points + and the midpoint of the curve. + */ +@interface Edge : NSObject { + Node *source; + Node *target; + Node *edgeNode; + int bend; + int inAngle, outAngle; + EdgeBendMode bendMode; + float weight; + EdgeStyle *style; + GraphElementData *data; + NSString *sourceAnchor; + NSString *targetAnchor; + + // When set to YES, lazily create the edge node, and keep it around when set + // to NO (at least until saved/loaded). + BOOL hasEdgeNode; + BOOL dirty; + + // these are all cached values computed from the above + NSPoint src; + NSPoint targ; + NSPoint head; + NSPoint tail; + NSPoint cp1; + NSPoint cp2; + NSPoint mid; + NSPoint midTan; + NSPoint headTan; + NSPoint tailTan; +} + +/*! + @property data + @brief Associated edge data. + */ +@property (copy) GraphElementData *data; + +// KVC methods +- (void) insertObject:(GraphElementProperty*)gep + inDataAtIndex:(NSUInteger)index; +- (void) removeObjectFromDataAtIndex:(NSUInteger)index; +- (void) replaceObjectInDataAtIndex:(NSUInteger)index + withObject:(GraphElementProperty*)gep; + +/*! + @property style + @brief Edge style. + */ +@property (retain) EdgeStyle *style; + +/*! + @property source + @brief Source node. + */ +@property (retain) Node *source; + +/*! + @property target + @brief Target node. + */ +@property (retain) Node *target; + +/*! + @property edgeNode + @brief A node attached to this edge, as in a label or tick. + */ +@property (retain) Node *edgeNode; + +/*! + @property sourceAnchor + @brief The source node anchor point, as in north or center. + */ +@property (copy) NSString *sourceAnchor; + +/*! + @property targetAnchor + @brief The target node anchor point, as in north or center. + */ +@property (copy) NSString *targetAnchor; + +/*! + @property hasEdgeNode + @brief A read/write property. When set to true, a new edge node is actually constructed. +*/ +@property (assign) BOOL hasEdgeNode; + +/*! + @property bend + @brief The degrees by which the edge bends. + */ +@property (assign) int bend; + +/*! + @property weight + @brief How close the edge will pass to control points. + */ +@property (assign) float weight; + +/*! + @property inAngle + @brief The angle by which the edge enters its target. + */ +@property (assign) int inAngle; + +/*! + @property outAngle + @brief The angle by which the edge leaves its target. + */ +@property (assign) int outAngle; + +/*! + @property bendMode + @brief The mode of the edge bend. Either simple bend in in/out style. + */ +@property (assign) EdgeBendMode bendMode; + +/*! + @property head + @brief The starting point of the edge. + @detail This value is computed based on the source, target and + either bend or in/out angles. It is where the edge + makes contact with the source node. + */ +@property (readonly) NSPoint head; + +/*! + @property tail + @brief The ending point of the edge. + @detail This value is computed based on the source, target and + either bend or in/out angles. It is where the edge + makes contact with the target node. + */ +@property (readonly) NSPoint tail; + +/*! + @property cp1 + @brief The first control point of the edge. + @detail This value is computed based on the source, target and + either bend or in/out angles. + */ +@property (readonly) NSPoint cp1; + +/*! + @property cp2 + @brief The second control point of the edge. + @detail This value is computed based on the source, target and + either bend or in/out angles. + */ +@property (readonly) NSPoint cp2; + +/*! + @property mid + @brief The midpoint of the curve. Computed from the source, target, and control points. + */ +@property (readonly) NSPoint mid; + +/*! + @property mid_tan + @brief The second point of a line tangent to the midpoint. (The first is the midpoint itself.) + */ +@property (readonly) NSPoint midTan; + +/*! + @property left_normal + @brief The second point in a line perp. to the edge coming from mid-point. (left side) + */ +@property (readonly) NSPoint leftNormal; + +/*! + @property left_normal + @brief The second point in a line perp. to the edge coming from mid-point. (right side) + */ +@property (readonly) NSPoint rightNormal; + +@property (readonly) NSPoint headTan; + +/*! + @property leftHeadNormal + */ +@property (readonly) NSPoint leftHeadNormal; + +/*! + @property rightHeadNormal + */ +@property (readonly) NSPoint rightHeadNormal; + +@property (readonly) NSPoint tailTan; + +/*! + @property leftTailNormal + */ +@property (readonly) NSPoint leftTailNormal; + +/*! + @property rightTailNormal + */ +@property (readonly) NSPoint rightTailNormal; + +/*! + @property isSelfLoop + @brief Returns YES if this edge is a self loop. + */ +@property (readonly) BOOL isSelfLoop; + +/*! + @property isStraight + @brief Returns YES if this edge can be drawn as a straight line (as opposed to a bezier curve). + */ +@property (readonly) BOOL isStraight; + + +/*! + @brief Construct a blank edge. + @result An edge. + */ +- (id)init; + +/*! + @brief Construct an edge with the given source and target. + @param s the source node. + @param t the target node. + @result An edge. + */ +- (id)initWithSource:(Node*)s andTarget:(Node*)t; + +/*! + @brief Force the recalculation of the derived properties. + */ +- (void)recalculateProperties; + +/*! + @brief Recompute the control points and midpoint. + */ +- (void)updateControls; + +/*! + @brief Push edge properties back into its GraphElementData. + */ +- (void)updateData; + +/*! + @brief Set edge properties from fields in GraphElementData. + */ +- (void)setAttributesFromData; + +/*! + @brief Use data.style to find and attach the EdgeStyle object from the given array. + */ +- (BOOL)attachStyleFromTable:(NSArray*)styles; + +/*! + @brief Convert the bend angle to an inAngle and outAngle. + */ +- (void)convertBendToAngles; + +/*! + @brief Set the bend angle to the average of the in and out angles. + */ +- (void)convertAnglesToBend; + +/*! + @brief Update this edge to look just like the given edge. + @param e an edge to mimic. + */ +- (void)setPropertiesFromEdge:(Edge *)e; + +/*! + @brief Get a bounding rect for this edge. + @detail Note that this may not be a tight bound. + */ +- (NSRect)boundingRect; + +/*! + @brief Moves the first control point, updating edge properties as necessary + @detail This will move a control point and adjust the weight and + bend (or outAngle) to fit. + + A courseness can be specified for both the weight and the + bend, allowing them to be constrained to certain values. For + example, passing 10 as the bend courseness will force the bend + to be a multiple of 5. Passing 0 for either of these will + cause the relevant value to be unconstrained. + @param point the new position of the control point + @param wc force the weight to be a multiple of this value (unless 0) + @param bc force the bend (or outAngle) to be a multiple of this value (unless 0) + @param link when in EdgeBendModeInOut, change both the in and out angles at once + */ +- (void) moveCp1To:(NSPoint)point withWeightCourseness:(float)wc andBendCourseness:(int)bc forceLinkControlPoints:(BOOL)link; + +/*! + @brief Moves the first control point, updating edge properties as necessary + @detail This will move a control point and adjust the weight and + bend (or outAngle) to fit. + + The same as moveCp1To:point withWeightCourseness:0.0f andBendCourseness:0 forceLinkControlPoints:No + @param point the new position of the control point + @param wc force the weight to be a multiple of this value (unless 0) + @param bc force the bend (or outAngle) to be a multiple of this value (unless 0) + @param link when in EdgeBendModeInOut, change both the in and out angles at once + */ +- (void) moveCp1To:(NSPoint)point; + +/*! + @brief Moves the first control point, updating edge properties as necessary + @detail This will move a control point and adjust the weight and + bend (or inAngle) to fit. + + A courseness can be specified for both the weight and the + bend, allowing them to be constrained to certain values. For + example, passing 10 as the bend courseness will force the bend + to be a multiple of 5. Passing 0 for either of these will + cause the relevant value to be unconstrained. + @param point the new position of the control point + @param wc force the weight to be a multiple of this value (unless 0) + @param bc force the bend (or inAngle) to be a multiple of this value (unless 0) + @param link when in EdgeBendModeInOut, change both the in and out angles at once + */ +- (void) moveCp2To:(NSPoint)point withWeightCourseness:(float)wc andBendCourseness:(int)bc forceLinkControlPoints:(BOOL)link; + +/*! + @brief Moves the first control point, updating edge properties as necessary + @detail This will move a control point and adjust the weight and + bend (or inAngle) to fit. + + The same as moveCp2To:point withWeightCourseness:0.0f andBendCourseness:0 forceLinkControlPoints:No + @param point the new position of the control point + */ +- (void) moveCp2To:(NSPoint)point; + +/*! + @brief Reverse edge direction, updating bend/inAngle/outAngle/etc + */ +- (void)reverse; + +/*! + @brief Factory method to make a blank edge. + @result An edge. + */ ++ (Edge*)edge; + +/*! + @brief Factory method to make an edge with the given source and target. + @param s a source node. + @param t a target node. + @result An edge. + */ ++ (Edge*)edgeWithSource:(Node*)s andTarget:(Node*)t; + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/Edge.m b/tikzit-old/src/common/Edge.m new file mode 100644 index 0000000..0c88e9d --- /dev/null +++ b/tikzit-old/src/common/Edge.m @@ -0,0 +1,757 @@ +// +// Edge.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "Edge.h" +#import "Shape.h" +#import "util.h" + +@implementation Edge + +- (id)init { + self = [super init]; + if (self) { + data = [[GraphElementData alloc] init]; + bend = 0; + inAngle = 135; + outAngle = 45; + bendMode = EdgeBendModeBasic; + weight = 0.4f; + dirty = YES; + source = nil; + target = nil; + edgeNode = nil; + sourceAnchor = @""; + targetAnchor = @""; + } + return self; +} + +- (id)initWithSource:(Node*)s andTarget:(Node*)t { + self = [self init]; + if (self) { + [self setSource:s]; + [self setTarget:t]; + edgeNode = nil; + + dirty = YES; + } + return self; +} + +- (BOOL)attachStyleFromTable:(NSArray*)styles { + NSString *style_name = [data propertyForKey:@"style"]; + + [self setStyle:nil]; + if (style_name == nil) return YES; + + for (EdgeStyle *s in styles) { + if ([[s name] compare:style_name]==NSOrderedSame) { + [self setStyle:s]; + return YES; + } + } + + // if we didn't find a style, fill in a default one +#if __has_feature(objc_arc) + style = [EdgeStyle defaultEdgeStyleWithName:style_name]; +#else + style = [[EdgeStyle defaultEdgeStyleWithName:style_name] retain]; +#endif + return NO; +} + +- (NSPoint) _findContactPointOn:(Node*)node at:(float)angle { + NSPoint rayStart = [node point]; + Shape *shape = [node shape]; + if (shape == nil) { + return rayStart; + } + + Transformer *shapeTrans = [node shapeTransformer]; + // rounding errors are a pain + NSRect searchArea = NSInsetRect([node boundsUsingShapeTransform:shapeTrans],-0.01,-0.01); + if (!NSPointInRect(rayStart, searchArea)) { + return rayStart; + } + + NSPoint rayEnd = findExitPointOfRay (rayStart, angle, searchArea); + + for (NSArray *path in [shape paths]) { + for (Edge *curve in path) { + NSPoint intersect; + [curve updateControls]; + if (lineSegmentIntersectsBezier (rayStart, rayEnd, + [shapeTrans toScreen:curve->tail], + [shapeTrans toScreen:curve->cp1], + [shapeTrans toScreen:curve->cp2], + [shapeTrans toScreen:curve->head], + &intersect)) { + // we just keep shortening the line + rayStart = intersect; + } + } + } + + return rayStart; +} + +- (NSPoint) _findTanFor:(NSPoint)pt usingSpanFrom:(float)t1 to:(float)t2 { + float dx = bezierInterpolate(t2, tail.x, cp1.x, cp2.x, head.x) - + bezierInterpolate(t1, tail.x, cp1.x, cp2.x, head.x); + float dy = bezierInterpolate(t2, tail.y, cp1.y, cp2.y, head.y) - + bezierInterpolate(t1, tail.y, cp1.y, cp2.y, head.y); + + // normalise + float len = sqrt(dx*dx+dy*dy); + if (len != 0) { + dx = (dx/len) * 0.1f; + dy = (dy/len) * 0.1f; + } + + return NSMakePoint (pt.x + dx, pt.y + dy); +} + +- (void)recalculateProperties { + dirty = YES; +} + +- (void)updateControls { + // check for external modification to the node locations + if (src.x != [source point].x || src.y != [source point].y || + targ.x != [target point].x || targ.y != [target point].y) + { + dirty = YES; + } + + if (dirty) { + src = [source point]; + targ = [target point]; + + float dx = (targ.x - src.x); + float dy = (targ.y - src.y); + + float angleSrc = 0.0f; + float angleTarg = 0.0f; + + if (bendMode == EdgeBendModeBasic) { + float angle = good_atan(dx, dy); + float bnd = (float)bend * (M_PI / 180.0f); + angleSrc = angle - bnd; + angleTarg = M_PI + angle + bnd; + } else if (bendMode == EdgeBendModeInOut) { + angleSrc = (float)outAngle * (M_PI / 180.0f); + angleTarg = (float)inAngle * (M_PI / 180.0f); + } + + tail = [self _findContactPointOn:source at:angleSrc]; + head = [self _findContactPointOn:target at:angleTarg]; + + // give a default distance for self-loops + float cdist = (dx==0.0f && dy==0.0f) ? weight : sqrt(dx*dx + dy*dy) * weight; + + cp1 = NSMakePoint(src.x + (cdist * cos(angleSrc)), + src.y + (cdist * sin(angleSrc))); + + cp2 = NSMakePoint(targ.x + (cdist * cos(angleTarg)), + targ.y + (cdist * sin(angleTarg))); + + mid = bezierInterpolateFull (0.5f, tail, cp1, cp2, head); + midTan = [self _findTanFor:mid usingSpanFrom:0.4f to:0.6f]; + + tailTan = [self _findTanFor:tail usingSpanFrom:0.0f to:0.1f]; + headTan = [self _findTanFor:head usingSpanFrom:1.0f to:0.9f]; + } + dirty = NO; +} + +- (void)convertBendToAngles { + float dx = (targ.x - src.x); + float dy = (targ.y - src.y); + float angle = good_atan(dx, dy); + float bnd = (float)bend * (M_PI / 180.0f); + + [self setOutAngle:round((angle - bnd) * (180.0f/M_PI))]; + [self setInAngle:round((M_PI + angle + bnd) * (180.0f/M_PI))]; + dirty = YES; +} + +- (void)convertAnglesToBend { + float dx = (targ.x - src.x); + float dy = (targ.y - src.y); + int angle = round((180.0f/M_PI) * good_atan(dx, dy)); + + // compute bend1 and bend2 to match inAngle and outAngle, resp. + int bend1, bend2; + + bend1 = outAngle - angle; + bend2 = angle - inAngle; + + [self setBend:(bend1 + bend2) / 2]; +} + +- (BOOL)isSelfLoop { + return (source == target); +} + +- (BOOL)isStraight { + return (bendMode == EdgeBendModeBasic && bend == 0); +} + +- (NSPoint)mid { + [self updateControls]; + return mid; +} + +- (NSPoint)midTan { + [self updateControls]; + return midTan; +} + +- (NSPoint)leftNormal { + [self updateControls]; + return NSMakePoint(mid.x + (mid.y - midTan.y), mid.y - (mid.x - midTan.x)); +} + +- (NSPoint)rightNormal { + [self updateControls]; + return NSMakePoint(mid.x - (mid.y - midTan.y), mid.y + (mid.x - midTan.x)); +} + +- (NSPoint)headTan { + [self updateControls]; + return headTan; +} + +- (NSPoint)leftHeadNormal { + [self updateControls]; + return NSMakePoint(headTan.x + (head.y - headTan.y), headTan.y - (head.x - headTan.x)); +} + +- (NSPoint)rightHeadNormal { + [self updateControls]; + return NSMakePoint(headTan.x - (head.y - headTan.y), headTan.y + (head.x - headTan.x)); +} + +- (NSPoint)tailTan { + [self updateControls]; + return tailTan; +} + +- (NSPoint)leftTailNormal { + [self updateControls]; + return NSMakePoint(tailTan.x + (tail.y - tailTan.y), tailTan.y - (tail.x - tailTan.x)); +} + +- (NSPoint)rightTailNormal { + [self updateControls]; + return NSMakePoint(tailTan.x - (tail.y - tailTan.y), tailTan.y + (tail.x - tailTan.x)); +} + +- (NSPoint) head { + [self updateControls]; + return head; +} + +- (NSPoint) tail { + [self updateControls]; + return tail; +} + +- (NSPoint)cp1 { + [self updateControls]; + return cp1; +} + +- (NSPoint)cp2 { + [self updateControls]; + return cp2; +} + +- (int)inAngle {return inAngle;} +- (void)setInAngle:(int)a { + inAngle = normaliseAngleDeg (a); + dirty = YES; +} + +- (int)outAngle {return outAngle;} +- (void)setOutAngle:(int)a { + outAngle = normaliseAngleDeg (a); + dirty = YES; +} + +- (EdgeBendMode)bendMode {return bendMode;} +- (void)setBendMode:(EdgeBendMode)mode { + bendMode = mode; + dirty = YES; +} + +- (int)bend {return bend;} +- (void)setBend:(int)b { + bend = normaliseAngleDeg (b); + dirty = YES; +} + +- (float)weight {return weight;} +- (void)setWeight:(float)w { +// if (source == target) weight = 1.0f; +// else weight = w; + weight = w; + dirty = YES; +} + +- (EdgeStyle*)style {return style;} +- (void)setStyle:(EdgeStyle*)s { + if (style != s) { +#if __has_feature(objc_arc) + style = s; +#else + [style release]; + style = [s retain]; +#endif + } +} + +- (Node*)source {return source;} +- (void)setSource:(Node *)s { + if (source != s) { + [source removeObserver:self + forKeyPath:@"style"]; + + if ([s style] == nil) { + [self setSourceAnchor:@"center"]; + } else if ([sourceAnchor isEqual:@"center"]) { + [self setSourceAnchor:@""]; + } + +#if __has_feature(objc_arc) + source = s; +#else + [source release]; + source = [s retain]; +#endif + + if (source==target) { + bendMode = EdgeBendModeInOut; + weight = 1.0f; + } + + [source addObserver:self + forKeyPath:@"style" + options:NSKeyValueObservingOptionNew + | NSKeyValueObservingOptionOld + context:NULL]; + + dirty = YES; + } +} + +- (Node*)target {return target;} +- (void)setTarget:(Node *)t { + if (target != t) { + [target removeObserver:self + forKeyPath:@"style"]; + + if ([t style] == nil) { + [self setTargetAnchor:@"center"]; + } else if ([targetAnchor isEqual:@"center"]) { + [self setTargetAnchor:@""]; + } + +#if __has_feature(objc_arc) + target = t; +#else + [target release]; + target = [t retain]; +#endif + + if (source==target) { + bendMode = EdgeBendModeInOut; + weight = 1.0f; + } + + [target addObserver:self + forKeyPath:@"style" + options:NSKeyValueObservingOptionNew + | NSKeyValueObservingOptionOld + context:NULL]; + + dirty = YES; + } +} + +- (void)observeValueForKeyPath:(NSString *)keyPath + ofObject:(id)object + change:(NSDictionary *)change + context:(void *)context + +{ + if ([keyPath isEqual:@"style"]) { + id oldStyle = [change objectForKey:NSKeyValueChangeOldKey]; + id newStyle = [change objectForKey:NSKeyValueChangeNewKey]; + id none = [NSNull null]; + if (object == source) { + if (oldStyle != none && newStyle == none) { + [self setSourceAnchor:@"center"]; + } else if (oldStyle == none && newStyle != none && + [sourceAnchor isEqual:@"center"]) { + [self setSourceAnchor:@""]; + } + } + if (object == target) { + if (oldStyle != none && newStyle == none) { + [self setTargetAnchor:@"center"]; + } else if (oldStyle == none && newStyle != none && + [targetAnchor isEqual:@"center"]) { + [self setTargetAnchor:@""]; + } + } + } + dirty = YES; +} + + +// edgeNode and hasEdgeNode use a bit of key-value observing to help the mac GUI keep up + +- (Node*)edgeNode {return edgeNode;} +- (void)setEdgeNode:(Node *)n { + [self willChangeValueForKey:@"edgeNode"]; + [self willChangeValueForKey:@"hasEdgeNode"]; + if (edgeNode != n) { + hasEdgeNode = (n != nil); +#if __has_feature(objc_arc) + edgeNode = n; +#else + [edgeNode release]; + edgeNode = [n retain]; +#endif + // don't set dirty bit, because control points don't need update + } + [self didChangeValueForKey:@"edgeNode"]; + [self didChangeValueForKey:@"hasEdgeNode"]; +} + +- (BOOL)hasEdgeNode { return hasEdgeNode; } +- (void)setHasEdgeNode:(BOOL)b { + [self willChangeValueForKey:@"edgeNode"]; + [self willChangeValueForKey:@"hasEdgeNode"]; + hasEdgeNode = b; + if (hasEdgeNode && edgeNode == nil) { + edgeNode = [[Node alloc] init]; + } + [self didChangeValueForKey:@"edgeNode"]; + [self didChangeValueForKey:@"hasEdgeNode"]; +} + +- (NSString*) sourceAnchor { return sourceAnchor; } +- (void)setSourceAnchor:(NSString *)_sourceAnchor{ + NSString *oldSourceAnchor = sourceAnchor; + if(_sourceAnchor != nil){ + sourceAnchor = [_sourceAnchor copy]; + }else{ + sourceAnchor = @""; + } +#if ! __has_feature(objc_arc) + [oldSourceAnchor release]; +#endif +} + +- (NSString*) targetAnchor { return targetAnchor; } +- (void)setTargetAnchor:(NSString *)_targetAnchor{ + NSString *oldTargetAnchor = targetAnchor; + if(_targetAnchor != nil){ + targetAnchor = [_targetAnchor copy]; + }else{ + targetAnchor = @""; + } +#if ! __has_feature(objc_arc) + [oldTargetAnchor release]; +#endif +} + +@synthesize data; +- (void) insertObject:(GraphElementProperty*)gep + inDataAtIndex:(NSUInteger)index { + [data insertObject:gep atIndex:index]; +} +- (void) removeObjectFromDataAtIndex:(NSUInteger)index { + [data removeObjectAtIndex:index]; +} +- (void) replaceObjectInDataAtIndex:(NSUInteger)index + withObject:(GraphElementProperty*)gep { + [data replaceObjectAtIndex:index withObject:gep]; +} + +- (void)updateData { + // unset everything to avoid redundant defs + [data unsetAtom:@"loop"]; + [data unsetProperty:@"in"]; + [data unsetProperty:@"out"]; + [data unsetAtom:@"bend left"]; + [data unsetAtom:@"bend right"]; + [data unsetProperty:@"bend left"]; + [data unsetProperty:@"bend right"]; + [data unsetProperty:@"looseness"]; + + if (style == nil) { + [data unsetProperty:@"style"]; + } else { + [data setProperty:[style name] forKey:@"style"]; + } + + if (bendMode == EdgeBendModeBasic && bend != 0) { + NSString *bendkey = @"bend right"; + int b = [self bend]; + if (b < 0) { + bendkey = @"bend left"; + b = -b; + } + + if (b == 30) { + [data setAtom:bendkey]; + } else { + [data setProperty:[NSString stringWithFormat:@"%d",b] forKey:bendkey]; + } + + } else if (bendMode == EdgeBendModeInOut) { + [data setProperty:[NSString stringWithFormat:@"%d",inAngle] + forKey:@"in"]; + [data setProperty:[NSString stringWithFormat:@"%d",outAngle] + forKey:@"out"]; + } + + // loop needs to come after in/out + if (source == target) [data setAtom:@"loop"]; + + if (![self isSelfLoop] && ![self isStraight]) + { + [data setProperty:[NSString stringWithFormat:@"%.2f",weight*2.5f] + forKey:@"looseness"]; + } +} + +- (void)setAttributesFromData { + bendMode = EdgeBendModeBasic; + + if ([data isAtomSet:@"bend left"]) { + [self setBend:-30]; + } else if ([data isAtomSet:@"bend right"]) { + [self setBend:30]; + } else if ([data propertyForKey:@"bend left"] != nil) { + NSString *bnd = [data propertyForKey:@"bend left"]; + [self setBend:-[bnd intValue]]; + } else if ([data propertyForKey:@"bend right"] != nil) { + NSString *bnd = [data propertyForKey:@"bend right"]; + [self setBend:[bnd intValue]]; + } else { + [self setBend:0]; + + if ([data propertyForKey:@"in"] != nil && [data propertyForKey:@"out"] != nil) { + bendMode = EdgeBendModeInOut; + [self setInAngle:[[data propertyForKey:@"in"] intValue]]; + [self setOutAngle:[[data propertyForKey:@"out"] intValue]]; + } + } + + if ([data propertyForKey:@"looseness"] != nil) { + weight = [[data propertyForKey:@"looseness"] floatValue] / 2.5f; + } else { + weight = ([self isSelfLoop]) ? 1.0f : 0.4f; + } +} + +- (void)setPropertiesFromEdge:(Edge*)e { + Node *en = [[e edgeNode] copy]; + [self setEdgeNode:en]; +#if ! __has_feature(objc_arc) + [en release]; +#endif + + GraphElementData *d = [[e data] copy]; + [self setData:d]; +#if ! __has_feature(objc_arc) + [d release]; +#endif + + [self setStyle:[e style]]; + [self setBend:[e bend]]; + [self setInAngle:[e inAngle]]; + [self setOutAngle:[e outAngle]]; + [self setBendMode:[e bendMode]]; + [self setWeight:[e weight]]; + + dirty = YES; // cached data will be recomputed lazily, rather than copied +} + +- (NSRect)boundingRect { + [self updateControls]; + NSRect bound = NSRectAround4Points(head, tail, cp1, cp2); + if ([self style] != nil) { + switch ([[self style] decorationStyle]) { + case ED_Arrow: + bound = NSRectWithPoint(bound, [self midTan]); + case ED_Tick: + bound = NSRectWithPoint(bound, [self leftNormal]); + bound = NSRectWithPoint(bound, [self rightNormal]); + case ED_None: + break; + } + if ([[self style] headStyle] != AH_None) { + bound = NSRectWithPoint(bound, [self leftHeadNormal]); + bound = NSRectWithPoint(bound, [self rightHeadNormal]); + } + if ([[self style] tailStyle] != AH_None) { + bound = NSRectWithPoint(bound, [self leftTailNormal]); + bound = NSRectWithPoint(bound, [self rightTailNormal]); + } + } + return bound; +} + +- (void) adjustWeight:(float)handle_dist withCourseness:(float)wcourseness { + float base_dist = NSDistanceBetweenPoints (src, targ); + if (base_dist == 0.0f) { + base_dist = 1.0f; + } + + [self setWeight:roundToNearest(wcourseness, handle_dist / base_dist)]; +} + +- (float) angleOf:(NSPoint)point relativeTo:(NSPoint)base { + float dx = point.x - base.x; + float dy = point.y - base.y; + return radiansToDegrees (good_atan(dx, dy)); +} + +- (void) moveCp1To:(NSPoint)point withWeightCourseness:(float)wc andBendCourseness:(int)bc forceLinkControlPoints:(BOOL)link { + [self updateControls]; + [self adjustWeight:NSDistanceBetweenPoints (point, src) withCourseness:wc]; + + float control_angle = [self angleOf:point relativeTo:src]; + if (bendMode == EdgeBendModeBasic) { + float base_angle = [self angleOf:targ relativeTo:src]; + int b = (int)roundToNearest (bc, base_angle - control_angle); + [self setBend:b]; + } else { + int angle = (int)roundToNearest (bc, control_angle); + if (link) { + [self setInAngle:(inAngle + angle - outAngle)]; + } + [self setOutAngle:angle]; + } +} + +- (void) moveCp1To:(NSPoint)point { + [self moveCp1To:point withWeightCourseness:0.0f andBendCourseness:0 forceLinkControlPoints:NO]; +} + +- (void) moveCp2To:(NSPoint)point withWeightCourseness:(float)wc andBendCourseness:(int)bc forceLinkControlPoints:(BOOL)link { + [self updateControls]; + + if (![self isSelfLoop]) { + [self adjustWeight:NSDistanceBetweenPoints (point, targ) withCourseness:wc]; + } + + float control_angle = [self angleOf:point relativeTo:targ]; + if (bendMode == EdgeBendModeBasic) { + float base_angle = [self angleOf:src relativeTo:targ]; + int b = (int)roundToNearest (bc, control_angle - base_angle); + [self setBend:b]; + } else { + int angle = (int)roundToNearest (bc, control_angle); + if (link) { + [self setOutAngle:(outAngle + angle - inAngle)]; + } + [self setInAngle: angle]; + } +} + +- (void) moveCp2To:(NSPoint)point { + [self moveCp2To:point withWeightCourseness:0.0f andBendCourseness:0 forceLinkControlPoints:NO]; +} + +- (void)reverse { + Node *n; + float f; + NSString *a; + + n = source; + source = target; + target = n; + + f = inAngle; + inAngle = outAngle; + outAngle = f; + + a = sourceAnchor; + sourceAnchor = targetAnchor; + targetAnchor = a; + + [self setBend:-bend]; + + dirty = YES; +} + +- (void)dealloc { + [source removeObserver:self + forKeyPath:@"style"]; + [target removeObserver:self + forKeyPath:@"style"]; +#if ! __has_feature(objc_arc) + [source release]; + [target release]; + [data release]; + [sourceAnchor release]; + [targetAnchor release]; + [super dealloc]; +#endif +} + +- (id)copyWithZone:(NSZone*)zone { + Edge *cp = [[Edge allocWithZone:zone] init]; + [cp setSource:[self source]]; + [cp setTarget:[self target]]; + [cp setSourceAnchor:[self sourceAnchor]]; + [cp setTargetAnchor:[self targetAnchor]]; + [cp setPropertiesFromEdge:self]; + return cp; +} + ++ (Edge*)edge { +#if __has_feature(objc_arc) + return [[Edge alloc] init]; +#else + return [[[Edge alloc] init] autorelease]; +#endif +} + ++ (Edge*)edgeWithSource:(Node*)s andTarget:(Node*)t { +#if __has_feature(objc_arc) + return [[Edge alloc] initWithSource:s andTarget:t]; +#else + return [[[Edge alloc] initWithSource:s andTarget:t] autorelease]; +#endif +} + +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/EdgeStyle.h b/tikzit-old/src/common/EdgeStyle.h new file mode 100644 index 0000000..a51f129 --- /dev/null +++ b/tikzit-old/src/common/EdgeStyle.h @@ -0,0 +1,71 @@ +// +// EdgeStyle.h +// TikZiT +// +// Copyright 2011 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import "PropertyHolder.h" +#import "ColorRGB.h" + +typedef enum { + AH_None = 0, + AH_Plain = 1, + AH_Latex = 2 +} ArrowHeadStyle; + +typedef enum { + ED_None = 0, + ED_Arrow = 1, + ED_Tick = 2 +} EdgeDectorationStyle; + +@interface EdgeStyle : PropertyHolder { + ArrowHeadStyle headStyle, tailStyle; + EdgeDectorationStyle decorationStyle; + float thickness; + ColorRGB *colorRGB; + NSString *name; + NSString *category; +} + +/*! + @property colorRGB + @brief The color to render the line in + */ +@property (copy) ColorRGB *colorRGB; + +@property (copy) NSString *name; +@property (copy) NSString *category; +@property (assign) ArrowHeadStyle headStyle; +@property (assign) ArrowHeadStyle tailStyle; +@property (assign) EdgeDectorationStyle decorationStyle; +@property (assign) float thickness; + +@property (readonly) NSString *tikz; + +- (id)init; +- (id)initWithName:(NSString*)nm; ++ (EdgeStyle*)defaultEdgeStyleWithName:(NSString*)nm; +- (void) updateFromStyle:(EdgeStyle*)style; + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/EdgeStyle.m b/tikzit-old/src/common/EdgeStyle.m new file mode 100644 index 0000000..c61e94a --- /dev/null +++ b/tikzit-old/src/common/EdgeStyle.m @@ -0,0 +1,222 @@ +// +// EdgeStyle.m +// TikZiT +// +// Copyright 2011 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "EdgeStyle.h" + +@implementation EdgeStyle + ++ (void)initialize { + [self setKeys:[NSArray arrayWithObjects: + @"tailStyle", + @"headStyle", + @"decorationStyle", + @"thickness", + @"colorRGB.red", + @"colorRGB.blue", + @"colorRGB.green", + @"name", + nil] + triggerChangeNotificationsForDependentKey:@"tikz"]; + [self setKeys:[NSArray arrayWithObjects: + @"colorRGB.name", + nil] + triggerChangeNotificationsForDependentKey:@"colorIsKnown"]; +} + +- (id)initWithName:(NSString*)nm { + self = [super initWithNotificationName:@"EdgeStylePropertyChanged"]; + + if (self != nil) { + headStyle = AH_None; + tailStyle = AH_None; + decorationStyle = ED_None; + colorRGB = [[ColorRGB alloc] initWithRed:0 green:0 blue:0]; + name = nm; + category = nil; + thickness = 1.0f; + } + + return self; +} + +- (id)init { + self = [self initWithName:@"new"]; + return self; +} + +- (id)copyWithZone:(NSZone*)zone { + EdgeStyle *style = [[EdgeStyle allocWithZone:zone] init]; + [style setName:[self name]]; + [style setCategory:[self category]]; + [style setHeadStyle:[self headStyle]]; + [style setTailStyle:[self tailStyle]]; + [style setDecorationStyle:[self decorationStyle]]; + [style setThickness:[self thickness]]; + [style setColorRGB:[self colorRGB]]; + return style; +} + +- (void)dealloc { +#if ! __has_feature(objc_arc) + [name release]; + [category release]; + [colorRGB release]; + [super dealloc]; +#endif +} + +- (NSString*) description { + return [NSString stringWithFormat:@"Edge style \"%@\"", name]; +} + +- (void) updateFromStyle:(EdgeStyle*)style { + [self setName:[style name]]; + [self setCategory:[style category]]; + [self setHeadStyle:[style headStyle]]; + [self setTailStyle:[style tailStyle]]; + [self setDecorationStyle:[style decorationStyle]]; + [self setThickness:[style thickness]]; + [self setColorRGB:[style colorRGB]]; +} + ++ (EdgeStyle*)defaultEdgeStyleWithName:(NSString*)nm { +#if __has_feature(objc_arc) + return [[EdgeStyle alloc] initWithName:nm]; +#else + return [[[EdgeStyle alloc] initWithName:nm] autorelease]; +#endif +} + +- (NSString*)name { return name; } +- (void)setName:(NSString *)s { + if (name != s) { + NSString *oldValue = name; + name = [s copy]; + [self postPropertyChanged:@"name" oldValue:oldValue]; +#if ! __has_feature(objc_arc) + [oldValue release]; +#endif + } +} + +- (ArrowHeadStyle)headStyle { return headStyle; } +- (void)setHeadStyle:(ArrowHeadStyle)s { + ArrowHeadStyle oldValue = headStyle; + headStyle = s; + [self postPropertyChanged:@"headStyle" oldValue:[NSNumber numberWithInt:oldValue]]; +} + +- (ArrowHeadStyle)tailStyle { return tailStyle; } +- (void)setTailStyle:(ArrowHeadStyle)s { + ArrowHeadStyle oldValue = tailStyle; + tailStyle = s; + [self postPropertyChanged:@"tailStyle" oldValue:[NSNumber numberWithInt:oldValue]]; +} + +- (EdgeDectorationStyle)decorationStyle { return decorationStyle; } +- (void)setDecorationStyle:(EdgeDectorationStyle)s { + EdgeDectorationStyle oldValue = decorationStyle; + decorationStyle = s; + [self postPropertyChanged:@"decorationStyle" oldValue:[NSNumber numberWithInt:oldValue]]; +} +- (float)thickness { return thickness; } +- (void)setThickness:(float)s { + float oldValue = thickness; + thickness = s; + [self postPropertyChanged:@"thickness" oldValue:[NSNumber numberWithFloat:oldValue]]; +} + +- (NSString*)category { + return category; +} + +- (void)setCategory:(NSString *)s { + if (category != s) { + NSString *oldValue = category; + category = [s copy]; + [self postPropertyChanged:@"category" oldValue:oldValue]; +#if ! __has_feature(objc_arc) + [oldValue release]; +#endif + } +} + +- (ColorRGB*)colorRGB { + return colorRGB; +} + +- (void)setColorRGB:(ColorRGB*)c { + if (colorRGB != c) { + ColorRGB *oldValue = colorRGB; + colorRGB = [c copy]; + [self postPropertyChanged:@"colorRGB" oldValue:oldValue]; +#if ! __has_feature(objc_arc) + [oldValue release]; +#endif + } +} + +- (NSString*)tikz { + NSMutableString *buf = [NSMutableString stringWithFormat:@"\\tikzstyle{%@}=[", name]; + + NSString *colorName = [colorRGB name]; + if (colorName == nil) + colorName = [colorRGB hexName]; + + if (tailStyle == AH_Plain) + [buf appendString:@"<"]; + else if (tailStyle == AH_Latex) + [buf appendString:@"latex"]; + + [buf appendString:@"-"]; + + if (headStyle == AH_Plain) + [buf appendString:@">"]; + else if (headStyle == AH_Latex) + [buf appendString:@"latex"]; + + if(colorName != nil){ + [buf appendString:@",draw="]; + [buf appendString:colorName]; + } + + if (decorationStyle != ED_None) { + [buf appendString:@",postaction={decorate},decoration={markings,mark="]; + if (decorationStyle == ED_Arrow) + [buf appendString:@"at position .5 with {\\arrow{>}}"]; + else if (decorationStyle == ED_Tick) + [buf appendString:@"at position .5 with {\\draw (0,-0.1) -- (0,0.1);}"]; + [buf appendString:@"}"]; + } + + if (thickness != 1.0f) { + [buf appendFormat:@",line width=%.3f", thickness]; + } + + [buf appendString:@"]"]; + return buf; +} + +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/Graph.h b/tikzit-old/src/common/Graph.h new file mode 100644 index 0000000..1f98858 --- /dev/null +++ b/tikzit-old/src/common/Graph.h @@ -0,0 +1,401 @@ +// +// Graph.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + + +/*! + + @mainpage TikZiT + TikZiT is a GUI application for drawing, editing, and parsing TikZ + diagrams. Common code is in src/common, and plaform-specific code is + in src/{osx,linux}. + + */ + + +#import "Node.h" +#import "Edge.h" +#import "GraphChange.h" +#import "Transformer.h" + +/*! + @class Graph + @brief Store a graph, output to TikZ. + @details All of the methods that change a graph return an object of type GraphChange. + Graph changes can be re-done by calling applyGraphChange. They can be undone + by calling applyGraphChange on [change inverse]. + */ +@interface Graph : NSObject { + NSRecursiveLock *graphLock; + BOOL dirty; // keep track of when inEdges and outEdges need an update + NSMutableArray *nodes; + NSMutableArray *edges; + + NSMapTable *inEdges; + NSMapTable *outEdges; + + GraphElementData *data; + NSRect boundingBox; +} + +/*! + @property data + @brief Data associated with the graph. + */ +@property (copy) GraphElementData *data; + +// KVC methods +- (void) insertObject:(GraphElementProperty*)gep + inDataAtIndex:(NSUInteger)index; +- (void) removeObjectFromDataAtIndex:(NSUInteger)index; +- (void) replaceObjectInDataAtIndex:(NSUInteger)index + withObject:(GraphElementProperty*)gep; + +/*! + @property nodes + @brief The set of nodes. + @details The node set is cached internally, so no need to lock + the graph when enumerating. + */ +@property (readonly) NSArray *nodes; + +/*! + @property edges + @brief The set of edges. + @details The edge set is cached internally, so no need to lock + the graph when enumerating. + */ +@property (readonly) NSArray *edges; + +/*! + @property boundingBox + @brief The bounding box of a graph + @details Optional data containing the bounding box, set with + \path [use as bounding box] .... + */ +@property (assign) NSRect boundingBox; + +/*! + @property hasBoundingBox + @brief Returns true if this graph has a bounding box. + */ +@property (readonly) BOOL hasBoundingBox; + + +/*! + @brief Computes graph bounds. + @result Graph bounds. + */ +- (NSRect)bounds; + +/*! + @brief Returns the set of edges incident to the given node set. + @param nds a set of nodes. + @result A set of incident edges. + */ +- (NSSet*)incidentEdgesForNodes:(NSSet*)nds; + +/*! + @brief Returns the set of in-edges for this node. + @param nd a node. + @result A set of edges. +*/ +- (NSSet*)inEdgesForNode:(Node*)nd; + +/*! + @brief Returns the set of out-edges for this node. + @param nd a node. + @result A set of edges. +*/ +- (NSSet*)outEdgesForNode:(Node*)nd; + +/*! + @brief Gives a copy of the full subgraph with the given nodes. + @param nds a set of nodes. + @result A subgraph. + */ +- (Graph*)copyOfSubgraphWithNodes:(NSSet*)nds; + +/*! + @brief Gives a copy of the full subgraph with the given nodes. + @param nds a set of nodes. + @param zone an allocation zone + @result A subgraph. + */ +- (Graph*)copyOfSubgraphWithNodes:(NSSet*)nds zone:(NSZone*)zone; + +/*! + @brief Gives a set of edge-arrays that partition all of the edges in the graph. + @result An NSet of NSArrays of edges. + */ +- (NSSet*)pathCover; + +/*! + @brief Adds a node. + @param node + @result A GraphChange recording this action. + */ +- (GraphChange*)addNode:(Node*)node; + +/*! + @brief Removes a node. + @param node + @result A GraphChange recording this action. + */ +- (GraphChange*)removeNode:(Node*)node; + +/*! + @brief Removes a set of nodes. + @param nds a set of nodes + @result A GraphChange recording this action. + */ +- (GraphChange*)removeNodes:(NSSet *)nds; + +/*! + @brief Adds an edge. + @param edge + @result A GraphChange recording this action. + */ +- (GraphChange*)addEdge:(Edge*)edge; + +/*! + @brief Removed an edge. + @param edge + @result A GraphChange recording this action. + */ +- (GraphChange*)removeEdge:(Edge*)edge; + +/*! + @brief Removes a set of edges. + @param es a set of edges. + @result A GraphChange recording this action. + */ +- (GraphChange*)removeEdges:(NSSet *)es; + +/*! + @brief Convenience function, intializes an edge with the given + source and target and adds it. + @param source the source of the edge. + @param target the target of the edge. + @result A GraphChange recording this action. + */ +- (GraphChange*)addEdgeFrom:(Node*)source to:(Node*)target; + +/*! + @brief Return the z-index for a given node (lower is farther back). + @param node a node in the graph + @result An int + */ +- (int)indexOfNode:(Node*)node; + +/*! + @brief Set the z-index for a given node (lower is farther back). + @param idx a new z-index + @param node a node in the graph + */ +- (void)setIndex:(int)idx ofNode:(Node*)node; + +/*! + @brief Bring set of nodes forward by one. + @param nodeSet a set of nodes + */ +- (GraphChange*)bringNodesForward:(NSSet*)nodeSet; + +/*! + @brief Bring set of nodes to the front. + @param nodeSet a set of nodes + */ +- (GraphChange*)bringNodesToFront:(NSSet*)nodeSet; + +/*! + @brief Bring set of edges to the front. + @param edgeSet a set of edges + */ +- (GraphChange*)bringEdgesToFront:(NSSet*)edgeSet; + +/*! + @brief Bring set of edges forward by one. + @param edgeSet a set of edges + */ +- (GraphChange*)bringEdgesForward:(NSSet*)edgeSet; + +/*! + @brief Send set of nodes backward by one. + @param nodeSet a set of nodes + */ +- (GraphChange*)sendNodesBackward:(NSSet*)nodeSet; + +/*! + @brief Send set of edges backward by one. + @param edgeSet a set of edges + */ +- (GraphChange*)sendEdgesBackward:(NSSet*)edgeSet; + +/*! + @brief Send set of nodes to back. + @param nodeSet a set of nodes + */ +- (GraphChange*)sendNodesToBack:(NSSet*)nodeSet; + +/*! + @brief Send set of edges to back. + @param edgeSet a set of edges + */ +- (GraphChange*)sendEdgesToBack:(NSSet*)edgeSet; + + +/*! + @brief Transform every node in the graph to screen space. + @param t a transformer + */ +- (void)applyTransformer:(Transformer*)t; + +/*! + @brief Shift nodes by a given distance. + @param ns a set of nodes. + @param p an x and y distance, given as an NSPoint. + @result A GraphChange recording this action. + */ +- (GraphChange*)shiftNodes:(id)ns byPoint:(NSPoint)p; + +/*! + @brief Reverse the given edges + @param es the edges to reverse + @result A GraphChange recording this action. + */ +- (GraphChange*)reverseEdges:(NSSet *)es; + +/*! + @brief Insert the given graph into this one. Used for copy + and paste. + @param g a graph. + @result A GraphChange recording this action. + */ +- (GraphChange*)insertGraph:(Graph*)g; + +/*! + @brief Flip the subgraph defined by the given node set + horizontally. + @param nds a set of nodes. + @result A GraphChange recording this action. + */ +- (GraphChange*)flipHorizontalNodes:(NSSet*)nds; + +/*! + @brief Flip the subgraph defined by the given node set + vertically. + @param nds a set of nodes. + @result A GraphChange recording this action. + */ +- (GraphChange*)flipVerticalNodes:(NSSet*)nds; + +/*! + @brief Apply a graph change. + @details An undo manager should maintain a stack of GraphChange + objects returned. To undo a GraphChange, call this method + with [change inverse] as is argument. + @param ch a graph change. + */ +- (void)applyGraphChange:(GraphChange*)ch; + +/*! + @brief The TikZ representation of this graph. + @details The TikZ representation of this graph. The TikZ code should + contain enough data to totally reconstruct the graph. + @result A string containing TikZ code. + */ +- (NSString*)tikz; + + +/*! + @brief Copy the node set and return a table of copies, whose + keys are the original nodes. This is used to save the state + of a set of nodes in a GraphChange. + @param nds a set of nodes. + @result A NSMapTable of node copies. + */ ++ (NSMapTable*)nodeTableForNodes:(NSSet*)nds; + ++ (NSMapTable*)nodeTableForNodes:(NSSet*)nds withZone:(NSZone*)zone; + +/*! + @brief Copy the edge set and return a table of copies, whose + keys are the original edges. This is used to save the state + of a set of edges in a GraphChange. + @param es a set of edges. + @result A NSMapTable of edge copies. + */ ++ (NSMapTable*)edgeTableForEdges:(NSSet*)es; + ++ (NSMapTable*)edgeTableForEdges:(NSSet*)es withZone:(NSZone*)zone; + +/*! + @brief Compute the bounds for a set of nodes. + @param nds an enumerable collection of nodes. + @result The bounds. + */ ++ (NSRect)boundsForNodes:(id)nds; + +/*! + @brief Factory method for constructing graphs. + @result An empty graph. + */ ++ (Graph*)graph; + +/** + * Initialize an empty graph + */ +- (id)init; + +/** + * Constructs a graph from the given tikz code + * + * See TikzGraphAssembler for more information about the error argument. + */ ++ (Graph*)graphFromTikz:(NSString*)tikz error:(NSError**)e; + +/** + * Constructs a graph from the given tikz code + */ ++ (Graph*)graphFromTikz:(NSString*)tikz; + +/** + * Initialize an empty graph from the given tikz code + * + * Note that this may not return the same object it was called on, + * and will return nil if parsing failed. + * + * See TikzGraphAssembler for more information about the error argument. + */ +- (id)initFromTikz:(NSString*)tikz error:(NSError**)e; + +/** + * Initialize an empty graph from the given tikz code + * + * Note that this may not return the same object it was called on, + * and will return nil if parsing failed. + */ +- (id)initFromTikz:(NSString*)tikz; + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/Graph.m b/tikzit-old/src/common/Graph.m new file mode 100644 index 0000000..cf09a69 --- /dev/null +++ b/tikzit-old/src/common/Graph.m @@ -0,0 +1,922 @@ +// +// Graph.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "Graph.h" +#import "TikzGraphAssembler.h" +#import "Shape.h" + +@interface Graph (Private) +- (void) shapeDictionaryReplaced:(NSNotification*)notification; +@end + +@implementation Graph + +- (id)init { + self = [super init]; + if (self != nil) { + data = [[GraphElementData alloc] init]; + boundingBox = NSMakeRect(0, 0, 0, 0); + graphLock = [[NSRecursiveLock alloc] init]; + nodes = [[NSMutableArray alloc] initWithCapacity:10]; + edges = [[NSMutableArray alloc] initWithCapacity:10]; + inEdges = nil; + outEdges = nil; + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(shapeDictionaryReplaced:) + name:@"ShapeDictionaryReplaced" + object:[Shape class]]; + } + return self; +} + +- (id)initFromTikz:(NSString*)tikz error:(NSError**)e { +#if __has_feature(objc_arc) + return [TikzGraphAssembler parseTikz:tikz error:e]; +#else + [self release]; + return [[TikzGraphAssembler parseTikz:tikz error:e] retain]; +#endif +} + +- (id)initFromTikz:(NSString*)tikz { + return [self initFromTikz:tikz error:NULL]; +} + +- (id) copyWithZone:(NSZone*)zone { + Graph *newGraph = [self copyOfSubgraphWithNodes:[NSSet setWithArray:nodes] zone:zone]; + [newGraph setData:[self data]]; + return newGraph; +} + +- (void)dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + + [graphLock lock]; +#if ! __has_feature(objc_arc) + [inEdges release]; + [outEdges release]; + [edges release]; + [nodes release]; + [data release]; + [graphLock unlock]; + [graphLock release]; + + [super dealloc]; +#endif +} + +- (void)sync { + [graphLock lock]; + if (dirty) { +#if ! __has_feature(objc_arc) + [inEdges release]; + [outEdges release]; +#endif + inEdges = [[NSMapTable alloc] initWithKeyOptions:NSMapTableStrongMemory valueOptions:NSMapTableStrongMemory capacity:10]; + outEdges = [[NSMapTable alloc] initWithKeyOptions:NSMapTableStrongMemory valueOptions:NSMapTableStrongMemory capacity:10]; + +#if ! __has_feature(objc_arc) + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; +#endif + + for (Edge *e in edges) { + NSMutableSet *ie = [inEdges objectForKey:[e target]]; + NSMutableSet *oe = [outEdges objectForKey:[e source]]; + + if (ie == nil) { + ie = [NSMutableSet setWithCapacity:4]; + [inEdges setObject:ie forKey:[e target]]; + } + + if (oe == nil) { + oe = [NSMutableSet setWithCapacity:4]; + [outEdges setObject:oe forKey:[e source]]; + } + + [ie addObject:e]; + [oe addObject:e]; + } + +#if ! __has_feature(objc_arc) + [pool drain]; +#endif + + dirty = NO; + } + [graphLock unlock]; +} + +@synthesize nodes; +@synthesize edges; + +@synthesize data; +- (void) insertObject:(GraphElementProperty*)gep + inDataAtIndex:(NSUInteger)index { + [data insertObject:gep atIndex:index]; +} +- (void) removeObjectFromDataAtIndex:(NSUInteger)index { + [data removeObjectAtIndex:index]; +} +- (void) replaceObjectInDataAtIndex:(NSUInteger)index + withObject:(GraphElementProperty*)gep { + [data replaceObjectAtIndex:index withObject:gep]; +} + +@synthesize boundingBox; + +- (NSRect)bounds { + [graphLock lock]; + NSRect b = [Graph boundsForNodes:nodes]; + [graphLock unlock]; + return b; +} + +- (BOOL)hasBoundingBox { + return !( + boundingBox.size.width == 0 && + boundingBox.size.height == 0 + ); +} + +- (NSSet*)inEdgesForNode:(Node*)nd { + [self sync]; +#if __has_feature(objc_arc) + return [inEdges objectForKey:nd]; +#else + return [[[inEdges objectForKey:nd] retain] autorelease]; +#endif +} + +- (NSSet*)outEdgesForNode:(Node*)nd { + [self sync]; +#if __has_feature(objc_arc) + return [outEdges objectForKey:nd]; +#else + return [[[outEdges objectForKey:nd] retain] autorelease]; +#endif +} + +- (NSSet*)incidentEdgesForNodes:(NSSet*)nds { + [self sync]; + + NSMutableSet *mset = [NSMutableSet setWithCapacity:10]; + for (Node *n in nds) { + [mset unionSet:[self inEdgesForNode:n]]; + [mset unionSet:[self outEdgesForNode:n]]; + } + + return mset; +} + +- (void)applyTransformer:(Transformer *)t { + [graphLock lock]; + for (Node *n in nodes) { + [n setPoint:[t toScreen:[n point]]]; + } + [graphLock unlock]; +} + +- (GraphChange*)addNode:(Node *)node{ + [graphLock lock]; + NSSet *addedNode; + + // addNode is a no-op if graph already contains node + if (![nodes containsObject:node]) { + [nodes addObject:node]; + dirty = YES; + addedNode = [NSSet setWithObject:node]; + } else { + addedNode = [NSSet set]; + } + [graphLock unlock]; + + return [GraphChange graphAdditionWithNodes:addedNode + edges:[NSSet set]]; +} + +- (GraphChange*)removeNode:(Node*)node { + [graphLock lock]; + NSMutableSet *affectedEdges = [NSMutableSet set]; + for (Edge *e in edges) { + if ([e source] == node || [e target] == node) { + [affectedEdges addObject:e]; + } + } + for (Edge *e in affectedEdges) { + [edges removeObject:e]; + } + [nodes removeObject:node]; + dirty = YES; + [graphLock unlock]; + + return [GraphChange graphDeletionWithNodes:[NSSet setWithObject:node] + edges:affectedEdges]; +} + +- (GraphChange*)removeNodes:(NSSet *)nds { + [graphLock lock]; + + Node *n; + Edge *e; + + NSMutableSet *affectedEdges = [NSMutableSet set]; + NSEnumerator *en = [edges objectEnumerator]; + while ((e = [en nextObject])) { + if ([nds containsObject:[e source]] || [nds containsObject:[e target]]) { + [affectedEdges addObject:e]; + } + } + + en = [affectedEdges objectEnumerator]; + while ((e = [en nextObject])) [edges removeObject:e]; + + en = [nds objectEnumerator]; + while ((n = [en nextObject])) [nodes removeObject:n]; + + dirty = YES; + [graphLock unlock]; + + return [GraphChange graphDeletionWithNodes:nds edges:affectedEdges]; +} + +- (GraphChange*)addEdge:(Edge*)edge { + [graphLock lock]; + NSSet *addedEdge; + + // addEdge is a no-op if graph already contains edge + if (![edges containsObject:edge]) { + [edges addObject:edge]; + dirty = YES; + addedEdge = [NSSet setWithObject:edge]; + } else { + addedEdge = [NSSet set]; + } + [graphLock unlock]; + + return [GraphChange graphAdditionWithNodes:[NSSet set] + edges:addedEdge]; +} + +- (GraphChange*)removeEdge:(Edge *)edge { + [graphLock lock]; + [edges removeObject:edge]; + dirty = YES; + [graphLock unlock]; + return [GraphChange graphDeletionWithNodes:[NSSet set] + edges:[NSSet setWithObject:edge]]; +} + +- (GraphChange*)removeEdges:(NSSet *)es { + [graphLock lock]; + + for (Edge *e in es) { + [edges removeObject:e]; + } + dirty = YES; + [graphLock unlock]; + return [GraphChange graphDeletionWithNodes:[NSSet set] edges:es]; +} + +- (GraphChange*)addEdgeFrom:(Node *)source to:(Node *)target { + return [self addEdge:[Edge edgeWithSource:source andTarget:target]]; +} + +- (GraphChange*)shiftNodes:(id)ns byPoint:(NSPoint)p { + NSPoint newLoc; + NSMutableSet *nodeSet = [NSMutableSet setWithCapacity:5]; + for (Node *n in ns) { + newLoc = NSMakePoint([n point].x + p.x, [n point].y + p.y); + [n setPoint:newLoc]; + [nodeSet addObject:n]; + } + return [GraphChange shiftNodes:nodeSet byPoint:p]; +} + +- (GraphChange*)reverseEdges:(NSSet *)es { + [graphLock lock]; + for (Edge *e in es) { + [e reverse]; + } + dirty = YES; + [graphLock unlock]; + return [GraphChange reverseEdges:es]; +} + +- (int)indexOfNode:(Node *)node { + return [nodes indexOfObject:node]; +} + +- (void)setIndex:(int)idx ofNode:(Node *)node { + [graphLock lock]; + + if ([nodes containsObject:node]) { + [nodes removeObject:node]; + [nodes insertObject:node atIndex:idx]; + } + + [graphLock unlock]; +} + +- (int)indexOfEdge:(Edge *)edge { + return [edges indexOfObject:edge]; +} + +- (void)setIndex:(int)idx ofEdge:(Edge *)edge { + [graphLock lock]; + + if ([edges containsObject:edge]) { + [edges removeObject:edge]; + [edges insertObject:edge atIndex:idx]; + } + + [graphLock unlock]; +} + +- (GraphChange*)bringNodesForward:(NSSet*)nodeSet { + NSArray *oldOrder = [nodes copy]; + [graphLock lock]; + // start at the top of the array and work backwards + for (int i = [nodes count]-2; i >= 0; --i) { + if ( [nodeSet containsObject:[nodes objectAtIndex:i]] && + ![nodeSet containsObject:[nodes objectAtIndex:i+1]]) + { + [self setIndex:(i+1) ofNode:[nodes objectAtIndex:i]]; + } + } + GraphChange *change = [GraphChange nodeOrderChangeFrom:oldOrder to:nodes moved:nodeSet]; + [graphLock unlock]; + +#if ! __has_feature(objc_arc) + [oldOrder release]; +#endif + + return change; +} + +- (GraphChange*)bringNodesToFront:(NSSet*)nodeSet { + NSArray *oldOrder = [nodes copy]; + int i = 0, top = [nodes count]-1; + + while (i <= top) { + if ([nodeSet containsObject:[nodes objectAtIndex:i]]) { + [self setIndex:([nodes count]-1) ofNode:[nodes objectAtIndex:i]]; + --top; + } else { + ++i; + } + } + GraphChange *change = [GraphChange nodeOrderChangeFrom:oldOrder to:nodes moved:nodeSet]; + +#if ! __has_feature(objc_arc) + [oldOrder release]; +#endif + + return change; +} + +- (GraphChange*)bringEdgesForward:(NSSet*)edgeSet { + [graphLock lock]; + NSArray *oldOrder = [edges copy]; + // start at the top of the array and work backwards + for (int i = [edges count]-2; i >= 0; --i) { + if ( [edgeSet containsObject:[edges objectAtIndex:i]] && + ![edgeSet containsObject:[edges objectAtIndex:i+1]]) + { + [self setIndex:(i+1) ofEdge:[edges objectAtIndex:i]]; + } + } + GraphChange *change = [GraphChange edgeOrderChangeFrom:oldOrder to:edges moved:edgeSet]; + [graphLock unlock]; + +#if ! __has_feature(objc_arc) + [oldOrder release]; +#endif + + return change; +} + +- (GraphChange*)bringEdgesToFront:(NSSet*)edgeSet { + NSArray *oldOrder = [edges copy]; + int i = 0, top = [edges count]-1; + + while (i <= top) { + if ([edgeSet containsObject:[edges objectAtIndex:i]]) { + [self setIndex:([edges count]-1) ofEdge:[edges objectAtIndex:i]]; + --top; + } else { + ++i; + } + } + GraphChange *change = [GraphChange edgeOrderChangeFrom:oldOrder to:edges moved:edgeSet]; + +#if ! __has_feature(objc_arc) + [oldOrder release]; +#endif + + return change; +} + +- (GraphChange*)sendNodesBackward:(NSSet*)nodeSet { + [graphLock lock]; + NSArray *oldOrder = [nodes copy]; + // start at the top of the array and work backwards + for (int i = 1; i < [nodes count]; ++i) { + if ( [nodeSet containsObject:[nodes objectAtIndex:i]] && + ![nodeSet containsObject:[nodes objectAtIndex:i-1]]) + { + [self setIndex:(i-1) ofNode:[nodes objectAtIndex:i]]; + } + } + GraphChange *change = [GraphChange nodeOrderChangeFrom:oldOrder to:nodes moved:nodeSet]; + [graphLock unlock]; + +#if ! __has_feature(objc_arc) + [oldOrder release]; +#endif + + return change; +} + +- (GraphChange*)sendEdgesBackward:(NSSet*)edgeSet { + [graphLock lock]; + NSArray *oldOrder = [edges copy]; + // start at the top of the array and work backwards + for (int i = 1; i < [edges count]; ++i) { + if ( [edgeSet containsObject:[edges objectAtIndex:i]] && + ![edgeSet containsObject:[edges objectAtIndex:i-1]]) + { + [self setIndex:(i-1) ofEdge:[edges objectAtIndex:i]]; + } + } + GraphChange *change = [GraphChange edgeOrderChangeFrom:oldOrder to:edges moved:edgeSet]; + [graphLock unlock]; + +#if ! __has_feature(objc_arc) + [oldOrder release]; +#endif + + return change; +} + +- (GraphChange*)sendNodesToBack:(NSSet*)nodeSet { + NSArray *oldOrder = [nodes copy]; + int i = [nodes count]-1, bot = 0; + + while (i >= bot) { + if ([nodeSet containsObject:[nodes objectAtIndex:i]]) { + [self setIndex:0 ofNode:[nodes objectAtIndex:i]]; + ++bot; + } else { + --i; + } + } + GraphChange *change = [GraphChange nodeOrderChangeFrom:oldOrder to:nodes moved:nodeSet]; + +#if ! __has_feature(objc_arc) + [oldOrder release]; +#endif + + return change; +} + +- (GraphChange*)sendEdgesToBack:(NSSet*)edgeSet { + NSArray *oldOrder = [edges copy]; + int i = [edges count]-1, bot = 0; + + while (i >= bot) { + if ([edgeSet containsObject:[edges objectAtIndex:i]]) { + [self setIndex:0 ofEdge:[edges objectAtIndex:i]]; + ++bot; + } else { + --i; + } + } + GraphChange *change = [GraphChange edgeOrderChangeFrom:oldOrder to:edges moved:edgeSet]; + +#if ! __has_feature(objc_arc) + [oldOrder release]; +#endif + + return change; +} + +- (GraphChange*)insertGraph:(Graph*)g { + [graphLock lock]; + + for (Node *n in [g nodes]) { + [self addNode:n]; + } + + for (Edge *e in [g edges]) { + [self addEdge:e]; + } + + dirty = YES; + + [graphLock unlock]; + + + return [GraphChange graphAdditionWithNodes:[NSSet setWithArray:[g nodes]] edges:[NSSet setWithArray:[g edges]]]; +} + +- (void)flipNodes:(NSSet*)nds horizontal:(BOOL)horiz { + [graphLock lock]; + + NSRect bds = [Graph boundsForNodes:nds]; + float ctr; + if (horiz) ctr = bds.origin.x + (bds.size.width/2); + else ctr = bds.origin.y + (bds.size.height/2); + + Node *n; + NSPoint p; + NSEnumerator *en = [nds objectEnumerator]; + while ((n = [en nextObject])) { + p = [n point]; + if (horiz) p.x = 2 * ctr - p.x; + else p.y = 2 * ctr - p.y; + [n setPoint:p]; + } + + Edge *e; + en = [edges objectEnumerator]; + while ((e = [en nextObject])) { + if ([nds containsObject:[e source]] && + [nds containsObject:[e target]]) + { + if ([e bendMode] == EdgeBendModeInOut) { + if (horiz) { + if ([e inAngle] < 0) [e setInAngle:(-180 - [e inAngle])]; + else [e setInAngle:180 - [e inAngle]]; + + if ([e outAngle] < 0) [e setOutAngle:(-180 - [e outAngle])]; + else [e setOutAngle:180 - [e outAngle]]; + } else { + [e setInAngle:-[e inAngle]]; + [e setOutAngle:-[e outAngle]]; + } + } else { + [e setBend:-[e bend]]; + } + } + } + + [graphLock unlock]; +} + +- (GraphChange*)flipHorizontalNodes:(NSSet*)nds { + [self flipNodes:nds horizontal:YES]; + return [GraphChange flipNodes:nds horizontal:YES]; +} + +- (GraphChange*)flipVerticalNodes:(NSSet*)nds { + [self flipNodes:nds horizontal:NO]; + return [GraphChange flipNodes:nds horizontal:NO]; +} + +- (Graph*)copyOfSubgraphWithNodes:(NSSet*)nds { + return [self copyOfSubgraphWithNodes:nds zone:NSDefaultMallocZone()]; +} + +- (Graph*)copyOfSubgraphWithNodes:(NSSet*)nds zone:(NSZone*)zone { + [graphLock lock]; + + NSMapTable *newNds = [Graph nodeTableForNodes:nds withZone:zone]; + Graph* newGraph = [[Graph allocWithZone:zone] init]; + + for (Node *nd in [newNds objectEnumerator]) { + [newGraph addNode:nd]; + } + + for (Edge *e in edges) { + if ([nds containsObject:[e source]] && [nds containsObject:[e target]]) { + Edge *e1 = [e copyWithZone:zone]; + [e1 setSource:[newNds objectForKey:[e source]]]; + [e1 setTarget:[newNds objectForKey:[e target]]]; + [newGraph addEdge:e1]; +#if ! __has_feature(objc_arc) + [e1 release]; // e1 belongs to newGraph +#endif + } + } + + [graphLock unlock]; + + return newGraph; +} + +- (NSSet*)pathCover { + [self sync]; + + NSMutableSet *cover = [NSMutableSet set]; +#if ! __has_feature(objc_arc) + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; +#endif + NSMutableSet *remainingEdges = [NSMutableSet setWithArray:edges]; + + while ([remainingEdges count] != 0) { + NSMutableArray *path = [[NSMutableArray alloc] init]; + NSSet *succs; + Edge *succ; + NSEnumerator *en; + + Edge *e = [remainingEdges anyObject]; + + while (e!=nil) { + [path addObject:e]; + [remainingEdges removeObject:e]; + + succs = [self outEdgesForNode:[e target]]; + en = [succs objectEnumerator]; + e = nil; + + while ((succ = [en nextObject])) { + if ([remainingEdges containsObject:succ]) e = succ; + } + } + + [cover addObject:path]; +#if ! __has_feature(objc_arc) + [path release]; +#endif + } + +#if ! __has_feature(objc_arc) + [pool drain]; +#endif + return cover; +} + +- (void)applyGraphChange:(GraphChange*)ch { + [graphLock lock]; + switch ([ch changeType]) { + case GraphAddition: + for (Node *n in [[ch affectedNodes] objectEnumerator]) { + [nodes addObject:n]; + } + + for (Edge *e in [[ch affectedEdges] objectEnumerator]) { + [edges addObject:e]; + } + + break; + case GraphDeletion: + for (Edge *e in [[ch affectedEdges] objectEnumerator]) { + [edges removeObject:e]; + } + + for (Node *n in [[ch affectedNodes] objectEnumerator]) { + [nodes removeObject:n]; + } + + break; + case NodePropertyChange: + [[ch nodeRef] setPropertiesFromNode:[ch nwNode]]; + break; + case NodesPropertyChange: + for (Node *key in [[ch nwNodeTable] keyEnumerator]) { + [key setPropertiesFromNode:[[ch nwNodeTable] objectForKey:key]]; + } + break; + case EdgePropertyChange: + [[ch edgeRef] setPropertiesFromEdge:[ch nwEdge]]; + break; + case EdgesPropertyChange: + for (Edge *key in [[ch nwEdgeTable] keyEnumerator]) { + [key setPropertiesFromEdge:[[ch nwEdgeTable] objectForKey:key]]; + } + break; + case NodesShift: + for (Node *n in [[ch affectedNodes] objectEnumerator]) { + [n setPoint:NSMakePoint([n point].x + [ch shiftPoint].x, + [n point].y + [ch shiftPoint].y)]; + } + break; + case NodesFlip: + [self flipNodes:[ch affectedNodes] horizontal:[ch horizontal]]; + break; + case EdgesReverse: + for (Edge *e in [[ch affectedEdges] objectEnumerator]) { + [e reverse]; + } + break; + case BoundingBoxChange: + [self setBoundingBox:[ch nwBoundingBox]]; + break; + case GraphPropertyChange: + [data setArray:[ch nwGraphData]]; + break; + case NodeOrderChange: + [nodes setArray:[ch nwNodeOrder]]; + break; + case EdgeOrderChange: + [edges setArray:[ch nwEdgeOrder]]; + break; + } + + dirty = YES; + [graphLock unlock]; +} + +//- (void)undoGraphChange:(GraphChange*)ch { +// [self applyGraphChange:[GraphChange inverseGraphChange:ch]]; +//} + +- (NSString*)tikz { + [graphLock lock]; + + NSMutableString *code = [NSMutableString + stringWithFormat:@"\\begin{tikzpicture}%@\n", + [[self data] tikzList]]; + + if ([self hasBoundingBox]) { + [code appendFormat:@"\t\\path [use as bounding box] (%@,%@) rectangle (%@,%@);\n", + [NSNumber numberWithFloat:boundingBox.origin.x], + [NSNumber numberWithFloat:boundingBox.origin.y], + [NSNumber numberWithFloat:boundingBox.origin.x + boundingBox.size.width], + [NSNumber numberWithFloat:boundingBox.origin.y + boundingBox.size.height]]; + } + +// NSArray *sortedNodeList = [[nodes allObjects] +// sortedArrayUsingSelector:@selector(compareTo:)]; + //NSMutableDictionary *nodeNames = [NSMutableDictionary dictionary]; + + if ([nodes count] > 0) [code appendFormat:@"\t\\begin{pgfonlayer}{nodelayer}\n"]; + + int i = 0; + for (Node *n in nodes) { + [n updateData]; + [n setName:[NSString stringWithFormat:@"%d", i]]; + [code appendFormat:@"\t\t\\node %@ (%d) at (%@, %@) {%@};\n", + [[n data] tikzList], + i, + formatFloat([n point].x, 4), + formatFloat([n point].y, 4), + [n label] + ]; + i++; + } + + if ([nodes count] > 0) [code appendFormat:@"\t\\end{pgfonlayer}\n"]; + if ([edges count] > 0) [code appendFormat:@"\t\\begin{pgfonlayer}{edgelayer}\n"]; + + NSString *nodeStr; + for (Edge *e in edges) { + [e updateData]; + + if ([e hasEdgeNode]) { + nodeStr = [NSString stringWithFormat:@"node%@{%@} ", + [[[e edgeNode] data] tikzList], + [[e edgeNode] label] + ]; + } else { + nodeStr = @""; + } + + NSString *edata = [[e data] tikzList]; + + NSString *srcAnchor; + NSString *tgtAnchor; + + if ([[e sourceAnchor] isEqual:@""]) { + srcAnchor = @""; + } else { + srcAnchor = [NSString stringWithFormat:@".%@", [e sourceAnchor]]; + } + + if ([[e targetAnchor] isEqual:@""]) { + tgtAnchor = @""; + } else { + tgtAnchor = [NSString stringWithFormat:@".%@", [e targetAnchor]]; + } + + [code appendFormat:@"\t\t\\draw%@ (%@%@) to %@(%@%@);\n", + ([edata isEqual:@""]) ? @"" : [NSString stringWithFormat:@" %@", edata], + [[e source] name], + srcAnchor, + nodeStr, + ([e source] == [e target]) ? @"" : [[e target] name], + tgtAnchor + ]; + } + + if ([edges count] > 0) [code appendFormat:@"\t\\end{pgfonlayer}\n"]; + + [code appendString:@"\\end{tikzpicture}"]; + + [graphLock unlock]; + + return code; +} + ++ (Graph*)graph { +#if __has_feature(objc_arc) + return [[self alloc] init]; +#else + return [[[self alloc] init] autorelease]; +#endif +} + ++ (Graph*)graphFromTikz:(NSString*)tikz error:(NSError**)e { + return [TikzGraphAssembler parseTikz:tikz error:e]; +} + ++ (Graph*)graphFromTikz:(NSString*)tikz { + return [self graphFromTikz:tikz error:NULL]; +} + ++ (NSMapTable*)nodeTableForNodes:(NSSet*)nds { + return [self nodeTableForNodes:nds withZone:NSDefaultMallocZone()]; +} + ++ (NSMapTable*)nodeTableForNodes:(NSSet*)nds withZone:(NSZone*)zone { + NSMapTable *tab = [[NSMapTable allocWithZone:zone] + initWithKeyOptions:NSMapTableStrongMemory + valueOptions:NSMapTableStrongMemory + capacity:[nds count]]; + for (Node *n in nds) { + Node *ncopy = [n copyWithZone:zone]; + [tab setObject:ncopy forKey:n]; +#if ! __has_feature(objc_arc) + [ncopy release]; // tab should still retain ncopy. +#endif + } +#if __has_feature(objc_arc) + return tab; +#else + return [tab autorelease]; +#endif +} + ++ (NSMapTable*)edgeTableForEdges:(NSSet*)es { + return [self edgeTableForEdges:es withZone:NSDefaultMallocZone()]; +} + ++ (NSMapTable*)edgeTableForEdges:(NSSet*)es withZone:(NSZone*)zone { + NSMapTable *tab = [[NSMapTable allocWithZone:zone] + initWithKeyOptions:NSMapTableStrongMemory + valueOptions:NSMapTableStrongMemory + capacity:[es count]]; + for (Edge *e in es) { + Edge *ecopy = [e copyWithZone:zone]; + [tab setObject:ecopy forKey:e]; +#if ! __has_feature(objc_arc) + [ecopy release]; // tab should still retain ecopy. +#endif + } + return tab; +} + + ++ (NSRect)boundsForNodes:(id)nds { + NSPoint tl, br; + NSPoint p; + BOOL hasPoints = NO; + for (Node *n in nds) { + p = [n point]; + if (!hasPoints) { + tl = p; + br = p; + hasPoints = YES; + } else { + if (p.x < tl.x) tl.x = p.x; + if (p.y > tl.y) tl.y = p.y; + if (p.x > br.x) br.x = p.x; + if (p.y < br.y) br.y = p.y; + } + } + + return (hasPoints) ? NSRectAroundPoints(tl, br) : NSMakeRect(0, 0, 0, 0); +} + +@end + +@implementation Graph (Private) +- (void) shapeDictionaryReplaced:(NSNotification*)notification { + for (Edge *e in edges) { + [e recalculateProperties]; + } +} +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/GraphChange.h b/tikzit-old/src/common/GraphChange.h new file mode 100644 index 0000000..0e71a90 --- /dev/null +++ b/tikzit-old/src/common/GraphChange.h @@ -0,0 +1,344 @@ +// +// GraphChange.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "Node.h" +#import "Edge.h" + +typedef enum { + GraphAddition, + GraphDeletion, + NodePropertyChange, + EdgePropertyChange, + NodesPropertyChange, + EdgesPropertyChange, + NodesShift, + NodesFlip, + EdgesReverse, + BoundingBoxChange, + GraphPropertyChange, + NodeOrderChange, + EdgeOrderChange +} ChangeType; + +/*! + @class GraphChange + @brief Store the data associated with a graph change. + @details All of the methods that change a graph return an object of type GraphChange. + Graph changes can be re-done by calling [graph applyGraphChange:]. They can be undone + by calling applyGraphChange on [change inverse]. This class has no public initializer, + so everything should be constructed by factory methods. + */ +@interface GraphChange : NSObject { + ChangeType changeType; + + // for addition, deletion, and shifts + NSSet *affectedNodes; + NSSet *affectedEdges; + NSPoint shiftPoint; + + // for flip + BOOL horizontal; + + // for property changes + Node *nodeRef; + Edge *edgeRef; + + Node *oldNode, *nwNode; + Edge *oldEdge, *nwEdge; + NSMapTable *oldNodeTable, *nwNodeTable; + NSMapTable *oldEdgeTable, *nwEdgeTable; + NSRect oldBoundingBox, nwBoundingBox; + GraphElementData *oldGraphData, *nwGraphData; + + NSArray *oldNodeOrder, *nwNodeOrder; + NSArray *oldEdgeOrder, *nwEdgeOrder; +} + +/*! + @property changeType + @brief Type of GraphChange. + */ +@property (assign) ChangeType changeType; + +/*! + @property shiftPoint + @brief A point storing a shifted distance. + */ +@property (assign) NSPoint shiftPoint; + +/*! + @property horizontal + @brief Flags whether nodes were flipped horizontally + */ +@property (assign) BOOL horizontal; + +/*! + @property affectedNodes + @brief A set of nodes affected by this change, may be undefined. + */ +@property (copy) NSSet *affectedNodes; + +/*! + @property affectedEdges + @brief A set of edges affected by this change, may be undefined. + */ +@property (copy) NSSet *affectedEdges; + +/*! + @property nodeRef + @brief A reference to a single node affected by this change, may be undefined. + */ +@property (retain) Node *nodeRef; + +/*! + @property oldNode + @brief A copy of the node pre-change. + */ +@property (copy) Node *oldNode; + +/*! + @property nwNode + @brief A copy of the node post-change. + */ +@property (copy) Node *nwNode; + +/*! + @property edgeRef + @brief A reference to a single edge affected by this change, may be undefined. + */ +@property (retain) Edge *edgeRef; + +/*! + @property oldEdge + @brief A copy of the edge pre-change. + */ +@property (copy) Edge *oldEdge; + +/*! + @property nwEdge + @brief A copy of the edge post-change. + */ +@property (copy) Edge *nwEdge; + +/*! + @property oldNodeTable + @brief A a table containing copies of a set of nodes pre-change. + */ +@property (retain) NSMapTable *oldNodeTable; + +/*! + @property nwNodeTable + @brief A a table containing copies of a set of nodes post-change. + */ +@property (retain) NSMapTable *nwNodeTable; + +/*! + @property oldEdgeTable + @brief A a table containing copies of a set of edges pre-change. + */ +@property (retain) NSMapTable *oldEdgeTable; + +/*! + @property nwEdgeTable + @brief A a table containing copies of a set of edges post-change. + */ +@property (retain) NSMapTable *nwEdgeTable; + +/*! + @property oldBoundingBox + @brief The old bounding box. + */ +@property (assign) NSRect oldBoundingBox; + +/*! + @property nwBoundingBox + @brief The new bounding box. + */ +@property (assign) NSRect nwBoundingBox; + +/*! + @property oldGraphData + @brief The old graph data. + */ +@property (copy) GraphElementData *oldGraphData; + +/*! + @property nwGraphData + @brief The new graph data. + */ +@property (copy) GraphElementData *nwGraphData; + +/*! + @property oldNodeOrder + @brief The old node list. + */ +@property (copy) NSArray *oldNodeOrder; + +/*! + @property nwNodeOrder + @brief The new node list. + */ +@property (copy) NSArray *nwNodeOrder; + +/*! + @property oldEdgeOrder + @brief The old edge list. + */ +@property (copy) NSArray *oldEdgeOrder; + +/*! + @property nwEdgeOrder + @brief The new edge list. + */ +@property (copy) NSArray *nwEdgeOrder; + +/*! + @brief Invert a GraphChange. + @details Invert a GraphChange. Calling [graph applyGraphChange:[[graph msg:...] invert]] + should leave the graph unchanged for any method of Graph that returns a + GraphChange. + @result The inverse of the current Graph Change. + */ +- (GraphChange*)invert; + +/*! + @brief Construct a graph addition. affectedNodes are the added nodes, + affectedEdges are the added edges. + @param ns a set of nodes. + @param es a set of edges. + @result A graph addition. + */ ++ (GraphChange*)graphAdditionWithNodes:(NSSet*)ns edges:(NSSet*)es; + +/*! + @brief Construct a graph deletion. affectedNodes are the deleted nodes, + affectedEdges are the deleted edges. + @param ns a set of nodes. + @param es a set of edges. + @result A graph deletion. + */ ++ (GraphChange*)graphDeletionWithNodes:(NSSet*)ns edges:(NSSet*)es; + +/*! + @brief Construct a property change of a single node. + @param nd the affected node. + @param old a copy of the node pre-change + @param nw a copy of the node post-change + @result A property change of a single node. + */ ++ (GraphChange*)propertyChangeOfNode:(Node*)nd fromOld:(Node*)old toNew:(Node*)nw; + +/*! + @brief Construct a property change of a single edge. + @param e the affected edge. + @param old a copy of the edge pre-change + @param nw a copy of the edge post-change + @result A property change of a single node. + */ ++ (GraphChange*)propertyChangeOfEdge:(Edge*)e fromOld:(Edge *)old toNew:(Edge *)nw; + +/*! + @brief Construct a property change of set of nodes. + @details Construct a property change of set of nodes. oldC and newC should be + constructed using the class method [Graph nodeTableForNodes:] before + and after the property change, respectively. The affected nodes are + keys(oldC) = keys(newC). + @param oldC a table of copies of nodes pre-change + @param newC a table of copies of nodes post-change + @result A property change of a set of nodes. + */ ++ (GraphChange*)propertyChangeOfNodesFromOldCopies:(NSMapTable*)oldC + toNewCopies:(NSMapTable*)newC; + +/*! + @brief Construct a property change of set of edges. + @details Construct a property change of set of edges. oldC and newC should be + constructed using the class method [Graph edgeTableForEdges:] before + and after the property change, respectively. The affected edges are + keys(oldC) = keys(newC). + @param oldC a table of copies of edges pre-change + @param newC a table of copies of edges post-change + @result A property change of a set of edges. + */ ++ (GraphChange*)propertyChangeOfEdgesFromOldCopies:(NSMapTable*)oldC + toNewCopies:(NSMapTable*)newC; + + +/*! + @brief Construct a shift of a set of nodes by a given point. + @param ns the affected nodes. + @param p a point storing (dx,dy) + @result A shift of a set of nodes. + */ ++ (GraphChange*)shiftNodes:(NSSet*)ns byPoint:(NSPoint)p; + +/*! + @brief Construct a horizontal or vertical flip of a set of nodes. + @param ns the affected nodes. + @param b flag for whether to flip horizontally + @result A flip of a set of nodes. + */ ++ (GraphChange*)flipNodes:(NSSet*)ns horizontal:(BOOL)b; + +/*! + @brief Construct a reversal of a set of edges. + @param es the affected edges. + @result A reverse of a set of edges. + */ ++ (GraphChange*)reverseEdges:(NSSet*)es; + +/*! + @brief Construct a bounding box change + @param oldBB the old bounding box + @param newBB the new bounding box + @result A bounding box change. + */ ++ (GraphChange*)changeBoundingBoxFrom:(NSRect)oldBB to:(NSRect)newBB; + +/*! + @brief Construct a graph property change + @param oldData the old graph data + @param newData the new graph data + @result A graph property change. + */ ++ (GraphChange*)propertyChangeOfGraphFrom:(GraphElementData*)oldData to:(GraphElementData*)newData; + +/*! + @brief Construct a node order change + @param old The old ordering + @param new The new ordering + @result A node order change + */ ++ (GraphChange*)nodeOrderChangeFrom:(NSArray*)old to:(NSArray*)new moved:(NSSet*)affected; + +/*! + @brief Construct an edge order change + @param old The old ordering + @param new The new ordering + @result A edge order change + */ ++ (GraphChange*)edgeOrderChangeFrom:(NSArray*)old to:(NSArray*)new moved:(NSSet*)affected; + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/GraphChange.m b/tikzit-old/src/common/GraphChange.m new file mode 100644 index 0000000..29a3939 --- /dev/null +++ b/tikzit-old/src/common/GraphChange.m @@ -0,0 +1,369 @@ +// +// GraphChange.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + + +// GraphChange : store the data associated to a single, undo-able change +// to a graph. An undo manager should maintain a stack of such changes +// and undo/redo them on request using [graph applyGraphChange:...]. + +#import "GraphChange.h" + + +@implementation GraphChange + +- (id)init { + return [super init]; +} + +- (void)dealloc { +#if ! __has_feature(objc_arc) + [affectedNodes release]; + [affectedEdges release]; + [nodeRef release]; + [edgeRef release]; + [oldNode release]; + [nwNode release]; + [oldEdge release]; + [nwEdge release]; + [oldNodeTable release]; + [nwNodeTable release]; + [oldEdgeTable release]; + [nwEdgeTable release]; + [oldGraphData release]; + [nwGraphData release]; + [oldNodeOrder release]; + [nwNodeOrder release]; + [oldEdgeOrder release]; + [nwEdgeOrder release]; + + [super dealloc]; +#endif +} + +@synthesize changeType; +@synthesize shiftPoint, horizontal; +@synthesize affectedEdges, affectedNodes; +@synthesize edgeRef, nodeRef; +@synthesize nwNode, oldNode; +@synthesize nwEdge, oldEdge; +@synthesize oldNodeTable, nwNodeTable; +@synthesize oldEdgeTable, nwEdgeTable; +@synthesize oldBoundingBox, nwBoundingBox; +@synthesize oldGraphData, nwGraphData; +@synthesize oldNodeOrder, nwNodeOrder; +@synthesize oldEdgeOrder, nwEdgeOrder; + +- (GraphChange*)invert { + GraphChange *inverse = [[GraphChange alloc] init]; + [inverse setChangeType:[self changeType]]; + switch ([self changeType]) { + case GraphAddition: + [inverse setChangeType:GraphDeletion]; +#if __has_feature(objc_arc) + inverse->affectedNodes = affectedNodes; + inverse->affectedEdges = affectedEdges; +#else + inverse->affectedNodes = [affectedNodes retain]; + inverse->affectedEdges = [affectedEdges retain]; +#endif + break; + case GraphDeletion: + [inverse setChangeType:GraphAddition]; +#if __has_feature(objc_arc) + inverse->affectedNodes = affectedNodes; + inverse->affectedEdges = affectedEdges; +#else + inverse->affectedNodes = [affectedNodes retain]; + inverse->affectedEdges = [affectedEdges retain]; +#endif + break; + case NodePropertyChange: +#if __has_feature(objc_arc) + inverse->nodeRef = nodeRef; + inverse->oldNode = nwNode; + inverse->nwNode = oldNode; +#else + inverse->nodeRef = [nodeRef retain]; + inverse->oldNode = [nwNode retain]; + inverse->nwNode = [oldNode retain]; +#endif + break; + case NodesPropertyChange: +#if __has_feature(objc_arc) + +#else + inverse->oldNodeTable = [nwNodeTable retain]; + inverse->nwNodeTable = [oldNodeTable retain]; +#endif + break; + case EdgePropertyChange: +#if __has_feature(objc_arc) + inverse->edgeRef = edgeRef; + inverse->oldEdge = nwEdge; + inverse->nwEdge = oldEdge; +#else + inverse->edgeRef = [edgeRef retain]; + inverse->oldEdge = [nwEdge retain]; + inverse->nwEdge = [oldEdge retain]; +#endif + break; + case EdgesPropertyChange: +#if __has_feature(objc_arc) + inverse->oldEdgeTable = nwEdgeTable; + inverse->nwEdgeTable = oldEdgeTable; +#else + inverse->oldEdgeTable = [nwEdgeTable retain]; + inverse->nwEdgeTable = [oldEdgeTable retain]; +#endif + break; + case NodesShift: +#if __has_feature(objc_arc) + inverse->affectedNodes = affectedNodes; +#else + inverse->affectedNodes = [affectedNodes retain]; +#endif + [inverse setShiftPoint:NSMakePoint(-[self shiftPoint].x, + -[self shiftPoint].y)]; + break; + case NodesFlip: +#if __has_feature(objc_arc) + inverse->affectedNodes = affectedNodes; +#else + inverse->affectedNodes = [affectedNodes retain]; +#endif + [inverse setHorizontal:[self horizontal]]; + break; + case EdgesReverse: +#if __has_feature(objc_arc) + inverse->affectedEdges = affectedEdges; +#else + inverse->affectedEdges = [affectedEdges retain]; +#endif + break; + case BoundingBoxChange: + inverse->oldBoundingBox = nwBoundingBox; + inverse->nwBoundingBox = oldBoundingBox; + break; + case GraphPropertyChange: +#if __has_feature(objc_arc) + inverse->oldGraphData = nwGraphData; + inverse->nwGraphData = oldGraphData; +#else + inverse->oldGraphData = [nwGraphData retain]; + inverse->nwGraphData = [oldGraphData retain]; +#endif + break; + case NodeOrderChange: +#if __has_feature(objc_arc) + inverse->affectedNodes = affectedNodes; + inverse->oldNodeOrder = nwNodeOrder; + inverse->nwNodeOrder = oldNodeOrder; +#else + inverse->affectedNodes = [affectedNodes retain]; + inverse->oldNodeOrder = [nwNodeOrder retain]; + inverse->nwNodeOrder = [oldNodeOrder retain]; +#endif + break; + case EdgeOrderChange: +#if __has_feature(objc_arc) + inverse->affectedEdges = affectedEdges; + inverse->oldEdgeOrder = nwEdgeOrder; + inverse->nwEdgeOrder = oldEdgeOrder; +#else + inverse->affectedEdges = [affectedEdges retain]; + inverse->oldEdgeOrder = [nwEdgeOrder retain]; + inverse->nwEdgeOrder = [oldEdgeOrder retain]; +#endif + break; + } +#if __has_feature(objc_arc) + return inverse; +#else + return [inverse autorelease]; +#endif +} + ++ (GraphChange*)graphAdditionWithNodes:(NSSet *)ns edges:(NSSet *)es { + GraphChange *gc = [[GraphChange alloc] init]; + [gc setChangeType:GraphAddition]; + [gc setAffectedNodes:ns]; + [gc setAffectedEdges:es]; +#if __has_feature(objc_arc) + return gc; +#else + return [gc autorelease]; +#endif +} + ++ (GraphChange*)graphDeletionWithNodes:(NSSet *)ns edges:(NSSet *)es { + GraphChange *gc = [[GraphChange alloc] init]; + [gc setChangeType:GraphDeletion]; + [gc setAffectedNodes:ns]; + [gc setAffectedEdges:es]; +#if __has_feature(objc_arc) + return gc; +#else + return [gc autorelease]; +#endif +} + ++ (GraphChange*)propertyChangeOfNode:(Node*)nd fromOld:(Node*)old toNew:(Node*)nw { + GraphChange *gc = [[GraphChange alloc] init]; + [gc setChangeType:NodePropertyChange]; + [gc setNodeRef:nd]; + [gc setOldNode:old]; + [gc setNwNode:nw]; +#if __has_feature(objc_arc) + return gc; +#else + return [gc autorelease]; +#endif +} + ++ (GraphChange*)propertyChangeOfNodesFromOldCopies:(NSMapTable*)oldC + toNewCopies:(NSMapTable*)newC { + GraphChange *gc = [[GraphChange alloc] init]; + [gc setChangeType:NodesPropertyChange]; + [gc setOldNodeTable:oldC]; + [gc setNwNodeTable:newC]; +#if __has_feature(objc_arc) + return gc; +#else + return [gc autorelease]; +#endif +} + ++ (GraphChange*)propertyChangeOfEdge:(Edge*)e fromOld:(Edge *)old toNew:(Edge *)nw { + GraphChange *gc = [[GraphChange alloc] init]; + [gc setChangeType:EdgePropertyChange]; + [gc setEdgeRef:e]; + [gc setOldEdge:old]; + [gc setNwEdge:nw]; +#if __has_feature(objc_arc) + return gc; +#else + return [gc autorelease]; +#endif +} + ++ (GraphChange*)propertyChangeOfEdgesFromOldCopies:(NSMapTable*)oldC + toNewCopies:(NSMapTable*)newC { + GraphChange *gc = [[GraphChange alloc] init]; + [gc setChangeType:EdgesPropertyChange]; + [gc setOldEdgeTable:oldC]; + [gc setNwEdgeTable:newC]; +#if __has_feature(objc_arc) + return gc; +#else + return [gc autorelease]; +#endif +} + ++ (GraphChange*)shiftNodes:(NSSet*)ns byPoint:(NSPoint)p { + GraphChange *gc = [[GraphChange alloc] init]; + [gc setChangeType:NodesShift]; + [gc setAffectedNodes:ns]; + [gc setShiftPoint:p]; +#if __has_feature(objc_arc) + return gc; +#else + return [gc autorelease]; +#endif +} + ++ (GraphChange*)flipNodes:(NSSet*)ns horizontal:(BOOL)b { + GraphChange *gc = [[GraphChange alloc] init]; + [gc setChangeType:NodesFlip]; + [gc setAffectedNodes:ns]; + [gc setHorizontal:b]; +#if __has_feature(objc_arc) + return gc; +#else + return [gc autorelease]; +#endif +} + ++ (GraphChange*)reverseEdges:(NSSet*)es { + GraphChange *gc = [[GraphChange alloc] init]; + [gc setChangeType:EdgesReverse]; + [gc setAffectedEdges:es]; +#if __has_feature(objc_arc) + return gc; +#else + return [gc autorelease]; +#endif +} + ++ (GraphChange*)changeBoundingBoxFrom:(NSRect)oldBB to:(NSRect)newBB { + GraphChange *gc = [[GraphChange alloc] init]; + [gc setChangeType:BoundingBoxChange]; + [gc setOldBoundingBox:oldBB]; + [gc setNwBoundingBox:newBB]; +#if __has_feature(objc_arc) + return gc; +#else + return [gc autorelease]; +#endif +} + ++ (GraphChange*)propertyChangeOfGraphFrom:(GraphElementData*)oldData to:(GraphElementData*)newData { + GraphChange *gc = [[GraphChange alloc] init]; + [gc setChangeType:GraphPropertyChange]; + [gc setOldGraphData:oldData]; + [gc setNwGraphData:newData]; +#if __has_feature(objc_arc) + return gc; +#else + return [gc autorelease]; +#endif +} + ++ (GraphChange*)nodeOrderChangeFrom:(NSArray*)old to:(NSArray*)new moved:(NSSet*)affected { + GraphChange *gc = [[GraphChange alloc] init]; + [gc setChangeType:NodeOrderChange]; + [gc setAffectedNodes:affected]; + [gc setOldNodeOrder:old]; + [gc setNwNodeOrder:new]; +#if __has_feature(objc_arc) + return gc; +#else + return [gc autorelease]; +#endif +} + ++ (GraphChange*)edgeOrderChangeFrom:(NSArray*)old to:(NSArray*)new moved:(NSSet*)affected { + GraphChange *gc = [[GraphChange alloc] init]; + [gc setChangeType:EdgeOrderChange]; + [gc setAffectedEdges:affected]; + [gc setOldEdgeOrder:old]; + [gc setNwEdgeOrder:new]; +#if __has_feature(objc_arc) + return gc; +#else + return [gc autorelease]; +#endif +} + +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/GraphElementData.h b/tikzit-old/src/common/GraphElementData.h new file mode 100644 index 0000000..a65e6df --- /dev/null +++ b/tikzit-old/src/common/GraphElementData.h @@ -0,0 +1,94 @@ +// +// GraphElementData.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + + +#import + +/*! + @class GraphElementData + @brief Store extra data associated with a graph, node, or edge. + @details Store the extra (style, ...) data associated with + a graph, node, or edge. This data is stored as a mutable + array of properties. It also implements hash-like accessors, + but care should be taken using these, as the list can contain + multiple occurrences of the same key. + + Convention: Getters and setters act on the *first* occurrence + of the key. 'Unsetters' remove *all* occurrences. + */ +@interface GraphElementData : NSMutableArray { + NSMutableArray *properties; +} + +- (id)init; ++ (id)data; + +/*! + @brief Set the given value for the *first* property matching this key. Add a + new property if it doesn't already exist. + @param val the value to set + @param key the key for this property + */ +- (void)setProperty:(NSString*)val forKey:(NSString*)key; + +/*! + @brief Remove *all* occurences of the property with the given key. + @param key + */ +- (void)unsetProperty:(NSString*)key; + +/*! + @brief Return the value of the *first* occurrence of the given key. + @param key + */ +- (NSString*)propertyForKey:(NSString*)key; + +/*! + @brief Add the given atom to the list, if it's not already present. + @param atom + */ +- (void)setAtom:(NSString*)atom; + +/*! + @brief Remove *all* occurrences of the given atom. + @param atom + */ +- (void)unsetAtom:(NSString*)atom; + +/*! + @brief Returns YES if the list contains at least one occurrence of + the given atom. + @param atom + @result A boolean value. + */ +- (BOOL)isAtomSet:(NSString*)atom; + +/*! + @brief Returns a TikZ-friendly string containing all of the properties. + @result A string. + */ +- (NSString*)tikzList; + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/GraphElementData.m b/tikzit-old/src/common/GraphElementData.m new file mode 100644 index 0000000..41dc9aa --- /dev/null +++ b/tikzit-old/src/common/GraphElementData.m @@ -0,0 +1,188 @@ +// +// GraphElementData.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "GraphElementData.h" +#import "GraphElementProperty.h" + + +@implementation GraphElementData + ++ (id)data { +#if __has_feature(objc_arc) + return [[self alloc] init]; +#else + return [[[self alloc] init] autorelease]; +#endif +} + +- (id)init { + self = [super init]; + if (self) { + properties = [[NSMutableArray alloc] init]; + } + return self; +} + +// all of the array messages delegate to 'properties' + +- (NSUInteger)count { return [properties count]; } +- (id)objectAtIndex:(NSUInteger)index { + return [properties objectAtIndex:index]; +} +- (NSArray*)objectsAtIndexes:(NSIndexSet*)indexes { + return [properties objectsAtIndexes:indexes]; +} + +#if __has_feature(objc_arc) +- (void) getObjects:(__unsafe_unretained id*)buffer range:(NSRange)range { +#else +- (void) getObjects:(id*)buffer range:(NSRange)range { +#endif + [properties getObjects:buffer range:range]; +} + +- (void)insertObject:(id)anObject atIndex:(NSUInteger)index { + [properties insertObject:anObject atIndex:index]; +} +- (void)removeObjectAtIndex:(NSUInteger)index { + [properties removeObjectAtIndex:index]; +} +- (void)addObject:(id)anObject { + [properties addObject:anObject]; +} +- (void)removeLastObject { + [properties removeLastObject]; +} +- (void)replaceObjectAtIndex:(NSUInteger)index withObject:(id)anObject { + [properties replaceObjectAtIndex:index withObject:anObject]; +} + +#if __has_feature(objc_arc) +- (NSUInteger) countByEnumeratingWithState:(NSFastEnumerationState *)state + objects:(__unsafe_unretained id [])stackbuf + count:(NSUInteger)len { +#else +- (NSUInteger)countByEnumeratingWithState:(NSFastEnumerationState *)state + objects:(id *)stackbuf + count:(NSUInteger)len { +#endif + return [properties countByEnumeratingWithState:state objects:stackbuf count:len]; +} + +- (void)setProperty:(NSString*)val forKey:(NSString*)key { + GraphElementProperty *m = [[GraphElementProperty alloc] initWithKeyMatching:key]; + NSInteger idx = [properties indexOfObject:m]; +#if !__has_feature(objc_arc) + [m release]; +#endif + + GraphElementProperty *p; + if (idx == NSNotFound) { + p = [[GraphElementProperty alloc] initWithPropertyValue:val forKey:key]; + [properties addObject:p]; +#if !__has_feature(objc_arc) + [p release]; +#endif + } else { + p = [properties objectAtIndex:idx]; + [p setValue:val]; + } +} + +- (void)unsetProperty:(NSString*)key { + GraphElementProperty *m = [[GraphElementProperty alloc] initWithKeyMatching:key]; + [properties removeObject:m]; +#if !__has_feature(objc_arc) + [m release]; +#endif + +} + +- (NSString*)propertyForKey:(NSString*)key { + GraphElementProperty *m = [[GraphElementProperty alloc] initWithKeyMatching:key]; + NSInteger idx = [properties indexOfObject:m]; +#if !__has_feature(objc_arc) + [m release]; +#endif + + + if (idx == NSNotFound) { + return nil; + }else { + GraphElementProperty *p = [properties objectAtIndex:idx]; + return [p value]; + } +} + +- (void)setAtom:(NSString*)atom { + GraphElementProperty *a = [[GraphElementProperty alloc] initWithAtomName:atom]; + if (![properties containsObject:a]) [properties addObject:a]; +#if !__has_feature(objc_arc) + [a release]; +#endif +} + +- (void)unsetAtom:(NSString*)atom { + GraphElementProperty *a = [[GraphElementProperty alloc] initWithAtomName:atom]; + [properties removeObject:a]; +#if !__has_feature(objc_arc) + [a release]; +#endif +} + +- (BOOL)isAtomSet:(NSString*)atom { + GraphElementProperty *a = [[GraphElementProperty alloc] initWithAtomName:atom]; + BOOL set = [properties containsObject:a]; +#if !__has_feature(objc_arc) + [a release]; +#endif + return set; +} + +- (NSString*)tikzList { + NSString *s = [properties componentsJoinedByString:@", "]; + return ([s isEqualToString:@""]) ? @"" : [NSString stringWithFormat:@"[%@]", s]; +} + +- (id)copyWithZone:(NSZone *)zone { + GraphElementData *cp = [[GraphElementData allocWithZone:zone] init]; + for (GraphElementProperty *p in properties) { + GraphElementProperty *p2 = [p copy]; + [cp addObject:p2]; +#if !__has_feature(objc_arc) + [p2 release]; +#endif + } + return cp; +} + +- (void)dealloc { +#if !__has_feature(objc_arc) + [properties release]; + [super dealloc]; +#endif +} + +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/GraphElementProperty.h b/tikzit-old/src/common/GraphElementProperty.h new file mode 100644 index 0000000..057cdbb --- /dev/null +++ b/tikzit-old/src/common/GraphElementProperty.h @@ -0,0 +1,88 @@ +// +// GraphElementProperty.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import + +/*! + @class GraphElementProperty + @brief A property. I.e. a single entry in a node's/edge's/graph's + GraphElementData table. + */ +@interface GraphElementProperty : NSObject { + NSString *key; + NSString *value; + BOOL isAtom; + BOOL isKeyMatch; +} + +@property (copy) NSString *key; +@property (copy) NSString *value; +@property (readonly) BOOL isAtom; +@property (readonly) BOOL isKeyMatch; + +/*! + @brief Initialize a new key-matching object. + @param k a key to match + @result A key-matching object. + */ +- (id)initWithKeyMatching:(NSString*)k; ++ (id)keyMatching:(NSString*)k; + +/*! + @brief Initialize a new atomic property. + @param n the atom's name + @result An atom. + */ +- (id)initWithAtomName:(NSString*)n; ++ (id)atom:(NSString*)n; + +/*! + @brief Initialize a new property. + @param v the property's value + @param k the associated key + @result A property. + */ +- (id)initWithPropertyValue:(NSString*)v forKey:(NSString*)k; ++ (id)property:(NSString*)k withValue:(NSString*)v; + +/*! + @brief A matching function for properties. + @details Two properties match iff their keys match and one of the following: + (a) they are both atomic, (b) one is a key-matching and one is a non-atomic + property, or (c) they are both non-atomic and their values match. + @param object another GraphElementProperty + @result A boolean. + */ +- (BOOL)matches:(GraphElementProperty*)object; + +/*! + @brief An alias for matches:. This allows one to use built-in methods that + filter on isEqual: for NSObjects. + @param object another GraphElementProperty + @result A boolean. + */ +- (BOOL)isEqual:(id)object; + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/GraphElementProperty.m b/tikzit-old/src/common/GraphElementProperty.m new file mode 100644 index 0000000..25e1b15 --- /dev/null +++ b/tikzit-old/src/common/GraphElementProperty.m @@ -0,0 +1,164 @@ +// +// +// GraphElementProperty.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "GraphElementProperty.h" +#import "NSString+Tikz.h" + +@implementation GraphElementProperty + ++ (id)atom:(NSString*)n { +#if __has_feature(objc_arc) + return [[self alloc] initWithAtomName:n]; +#else + return [[[self alloc] initWithAtomName:n] autorelease]; +#endif +} ++ (id)property:(NSString*)k withValue:(NSString*)v { +#if __has_feature(objc_arc) + return [[self alloc] initWithPropertyValue:v forKey:k]; +#else + return [[[self alloc] initWithPropertyValue:v forKey:k] autorelease]; +#endif +} ++ (id)keyMatching:(NSString*)k { +#if __has_feature(objc_arc) + return [[self alloc] initWithKeyMatching:k]; +#else + return [[[self alloc] initWithKeyMatching:k] autorelease]; +#endif +} + +- (id)initWithAtomName:(NSString*)n { + self = [super init]; + if (self) { + [self setKey:n]; + isAtom = YES; + } + return self; +} + +- (id)initWithPropertyValue:(NSString*)v forKey:(NSString*)k { + self = [super init]; + if (self) { + [self setKey:k]; + [self setValue:v]; + } + return self; +} + +- (id)initWithKeyMatching:(NSString*)k { + self = [super init]; + if (self) { + [self setKey:k]; + isKeyMatch = YES; + } + return self; +} + +- (void) dealloc { +#if ! __has_feature(objc_arc) + [key release]; + [value release]; + [super dealloc]; +#endif +} + +- (void)setValue:(NSString *)v { + if (value != v) { +#if ! __has_feature(objc_arc) + [value release]; +#endif + value = [v copy]; + } +} + +- (NSString*)value { + if (isAtom) { + return @"(atom)"; + } else { + return value; + } +} + + +- (void)setKey:(NSString *)k { + if (key != k) { +#if ! __has_feature(objc_arc) + [key release]; +#endif + key = [k copy]; + } + if (key == nil) + key = @""; // don't allow nil keys +} + +- (NSString*)key { + return key; +} + +- (BOOL)isAtom { return isAtom; } +- (BOOL)isKeyMatch { return isKeyMatch; } + +- (BOOL)matches:(GraphElementProperty*)object { + // properties and atoms are taken to be incomparable + if ([self isAtom] != [object isAtom]) return NO; + + // only compare keys if (a) we are both atoms, (b) i am a key match, or (c) object is a key match + if (([self isAtom] && [object isAtom]) || [self isKeyMatch] || [object isKeyMatch]) { + return [[self key] isEqual:[object key]]; + } + + // otherwise compare key and value + return [[self key] isEqual:[object key]] && [[self value] isEqual:[object value]]; +} + +- (BOOL)isEqual:(id)object { + return [self matches:object]; +} + +- (id)copyWithZone:(NSZone*)zone { + if (isAtom) { + return [[GraphElementProperty allocWithZone:zone] initWithAtomName:[self key]]; + } else if (isKeyMatch) { + return [[GraphElementProperty allocWithZone:zone] initWithKeyMatching:[self key]]; + } else { + return [[GraphElementProperty allocWithZone:zone] initWithPropertyValue:[self value] forKey:[self key]]; + } +} + +- (NSString*)description { + if ([self isAtom]) { + return [[self key] tikzEscapedString]; + } else if ([self isKeyMatch]) { + return [NSString stringWithFormat:@"%@=*", [[self key] tikzEscapedString]]; + } else { + return [NSString stringWithFormat:@"%@=%@", + [[self key] tikzEscapedString], + [[self value] tikzEscapedString]]; + } +} + +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/Grid.h b/tikzit-old/src/common/Grid.h new file mode 100644 index 0000000..b267536 --- /dev/null +++ b/tikzit-old/src/common/Grid.h @@ -0,0 +1,110 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import +#import "RenderContext.h" +#import "Transformer.h" + +/*! + * Provides a grid, which can be use for snapping points + * + * The grid is divided into cells, and each cell is further subdivided. + * These subdivisions are the snap points for the grid. + */ +@interface Grid: NSObject { + Transformer *transformer; + float spacing; + int cellSubdivisions; +} + +/*! + * The number of times to subdivide the edge of each cell + * + * Each cell will be divided into cellSubdivisions^2 squares. + */ +@property (assign) int cellSubdivisions; + +/*! + * The cell spacing + * + * Each cell will be @p cellSpacing wide and @p cellSpacing high. + */ +@property (assign) float cellSpacing; + + +/*! + * Create a new grid object. + * + * @param sp the cell spacing - this will be the width and height of each cell + * @param subs the number of cell subdivisions; the cell will end up being + * divided into subs*subs squares that are each sp/subs wide and high + * @param t the transformer to be used when snapping screen points + */ ++ (Grid*) gridWithSpacing:(float)sp subdivisions:(int)subs transformer:(Transformer*)t; +/*! + * Initialize a grid object. + * + * @param sp the cell spacing - this will be the width and height of each cell + * @param subs the number of cell subdivisions; each cell will end up being + * divided into subs*subs squares that are each sp/subs wide and high + * @param t the transformer to be used when snapping screen points + */ +- (id) initWithSpacing:(float)sp subdivisions:(int)subs transformer:(Transformer*)t; + +/*! + * Snap a point in screen co-ordinates + * + * @param p the point to snap, in screen co-ordinates + * @result @p p aligned to the nearest corner of a cell subdivision + */ +- (NSPoint) snapScreenPoint:(NSPoint)p; +/*! + * Snap a point in base co-ordinates + * + * @param p the point to snap + * @result @p p aligned to the nearest corner of a cell subdivision + */ +- (NSPoint) snapPoint:(NSPoint)p; + +/** + * Renders the grid + * + * The grid is rendered across the entire surface (subject to the context's + * clip). + * + * The internal transformer is used to convert between graph co-ordinates + * and graphics co-ordinates. + * + * @param cr the context to render in + */ +- (void) renderGridInContext:(id)cr; + +/** + * Renders the grid + * + * The grid is rendered across the entire surface (subject to the context's + * clip). + * + * @param cr the context to render in + * @param t a transformer that will be used to map graph co-ordinates + * to graphics co-ordinates + */ +- (void) renderGridInContext:(id)cr transformer:(Transformer*)t; + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/Grid.m b/tikzit-old/src/common/Grid.m new file mode 100644 index 0000000..f597a4a --- /dev/null +++ b/tikzit-old/src/common/Grid.m @@ -0,0 +1,186 @@ +/* + * Copyright 2011 Alex Merry + * Copyright 2010 Chris Heunen + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "Grid.h" +#import "util.h" + +@implementation Grid + ++ (Grid*) gridWithSpacing:(float)sp subdivisions:(int)subs transformer:(Transformer*)t { + return [[[self alloc] initWithSpacing:sp subdivisions:subs transformer:t] autorelease]; +} + +- (id) initWithSpacing:(float)sp subdivisions:(int)subs transformer:(Transformer*)t { + self = [super init]; + + if (self) { + transformer = [t retain]; + spacing = sp; + cellSubdivisions = subs; + } + + return self; +} + +- (id) copyWithZone:(NSZone*)zone { + return [[Grid allocWithZone:zone] + initWithSpacing:spacing + subdivisions:cellSubdivisions + transformer:transformer]; +} + +- (void) dealloc { + [transformer release]; + [super dealloc]; +} + +- (int) cellSubdivisions { + return cellSubdivisions; +} + +- (void) setCellSubdivisions:(int)count { + cellSubdivisions = count; +} + +- (float) cellSpacing { + return spacing; +} + +- (void) setCellSpacing:(float)sp { + spacing = sp; +} + +- (NSPoint) snapScreenPoint:(NSPoint)point { + NSPoint gridPoint = [transformer fromScreen:point]; + return [transformer toScreen:[self snapPoint:gridPoint]]; +} + +- (NSPoint) snapPoint:(NSPoint)p { + const float snapDistance = spacing/(float)cellSubdivisions; + p.x = roundToNearest (snapDistance, p.x); + p.y = roundToNearest (snapDistance, p.y); + return p; +} + +- (void) _setupLinesForContext:(id)context withSpacing:(float)offset omittingEvery:(int)omitEvery origin:(NSPoint)origin { + NSRect clip = [context clipBoundingBox]; + float clipx1 = clip.origin.x; + float clipx2 = clipx1 + clip.size.width; + float clipy1 = clip.origin.y; + float clipy2 = clipy1 + clip.size.height; + + // left of the Y axis, moving outwards + unsigned int count = 1; + float x = origin.x - offset; + while (x >= clipx1) { + if (omitEvery == 0 || (count % omitEvery != 0)) { + [context moveTo:NSMakePoint(x, clipy1)]; + [context lineTo:NSMakePoint(x, clipy2)]; + } + + x -= offset; + ++count; + } + // right of the Y axis, moving outwards + count = 1; + x = origin.x + offset; + while (x <= clipx2) { + if (omitEvery == 0 || (count % omitEvery != 0)) { + [context moveTo:NSMakePoint(x, clipy1)]; + [context lineTo:NSMakePoint(x, clipy2)]; + } + + x += offset; + ++count; + } + + // above the Y axis, moving outwards + count = 1; + float y = origin.y - offset; + while (y >= clipy1) { + if (omitEvery == 0 || (count % omitEvery != 0)) { + [context moveTo:NSMakePoint(clipx1, y)]; + [context lineTo:NSMakePoint(clipx2, y)]; + } + + y -= offset; + ++count; + } + // below the Y axis, moving outwards + count = 1; + y = origin.y + offset; + while (y <= clipy2) { + if (omitEvery == 0 || (count % omitEvery != 0)) { + [context moveTo:NSMakePoint(clipx1, y)]; + [context lineTo:NSMakePoint(clipx2, y)]; + } + + y += offset; + ++count; + } +} + +- (void) _renderSubdivisionsWithContext:(id)context origin:(NSPoint)origin cellSize:(float)cellSize { + const float offset = cellSize / cellSubdivisions; + + [self _setupLinesForContext:context withSpacing:offset omittingEvery:cellSubdivisions origin:origin]; + + [context strokePathWithColor:MakeSolidRColor (0.9, 0.9, 1.0)]; +} + +- (void) _renderCellsWithContext:(id)context origin:(NSPoint)origin cellSize:(float)cellSize { + [self _setupLinesForContext:context withSpacing:cellSize omittingEvery:0 origin:origin]; + + [context strokePathWithColor:MakeSolidRColor (0.8, 0.8, 0.9)]; +} + +- (void) _renderAxesWithContext:(id)context origin:(NSPoint)origin { + NSRect clip = [context clipBoundingBox]; + + [context moveTo:NSMakePoint(origin.x, clip.origin.y)]; + [context lineTo:NSMakePoint(origin.x, clip.origin.y + clip.size.height)]; + [context moveTo:NSMakePoint(clip.origin.x, origin.y)]; + [context lineTo:NSMakePoint(clip.origin.x + clip.size.width, origin.y)]; + + [context strokePathWithColor:MakeSolidRColor (0.6, 0.6, 0.7)]; +} + +- (void) renderGridInContext:(id)cr { + [self renderGridInContext:cr transformer:transformer]; +} + +- (void) renderGridInContext:(id)context transformer:(Transformer*)t { + const NSPoint origin = [t toScreen:NSZeroPoint]; + const float cellSize = [t scaleToScreen:spacing]; + + [context saveState]; + + // common line settings + [context setLineWidth:1.0]; + [context setAntialiasMode:AntialiasDisabled]; + + [self _renderSubdivisionsWithContext:context origin:origin cellSize:cellSize]; + [self _renderCellsWithContext:context origin:origin cellSize:cellSize]; + [self _renderAxesWithContext:context origin:origin]; + + [context restoreState]; +} + +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/NSError+Tikzit.h b/tikzit-old/src/common/NSError+Tikzit.h new file mode 100644 index 0000000..0f45fba --- /dev/null +++ b/tikzit-old/src/common/NSError+Tikzit.h @@ -0,0 +1,44 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import + +NSString* const TZErrorDomain; + +enum { + TZ_ERR_OTHER = 1, + TZ_ERR_BADSTATE, + TZ_ERR_BADFORMAT, + TZ_ERR_IO, + TZ_ERR_TOOL_FAILED, + TZ_ERR_NOTDIRECTORY, + TZ_ERR_PARSE +}; + +NSString* const TZToolOutputErrorKey; + +@interface NSError(Tikzit) ++ (NSString*)tikzitErrorDomain; ++ (id) errorWithMessage:(NSString*)message code:(NSInteger)code cause:(NSError*)cause; ++ (id) errorWithMessage:(NSString*)message code:(NSInteger)code; ++ (id) errorWithLibcError:(NSInteger)errnum; +- (NSString*)toolOutput; +@end + +void logError (NSError *error, NSString *message); + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/NSError+Tikzit.m b/tikzit-old/src/common/NSError+Tikzit.m new file mode 100644 index 0000000..6b9404b --- /dev/null +++ b/tikzit-old/src/common/NSError+Tikzit.m @@ -0,0 +1,64 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "NSError+Tikzit.h" + +NSString* const TZErrorDomain = @"tikzit"; + +NSString* const TZToolOutputErrorKey = @"tool-output"; + +@implementation NSError(Tikzit) ++ (NSString*)tikzitErrorDomain { + return TZErrorDomain; +} + ++ (id) errorWithMessage:(NSString*)message code:(NSInteger)code cause:(NSError*)cause { + NSMutableDictionary *errorDetail = [NSMutableDictionary dictionaryWithCapacity:2]; + [errorDetail setValue:message forKey:NSLocalizedDescriptionKey]; + if (cause) + [errorDetail setValue:cause forKey:NSUnderlyingErrorKey]; + return [self errorWithDomain:TZErrorDomain code:code userInfo:errorDetail]; +} + ++ (id) errorWithMessage:(NSString*)message code:(NSInteger)code { + NSMutableDictionary *errorDetail = [NSMutableDictionary dictionaryWithObject:message + forKey:NSLocalizedDescriptionKey]; + return [self errorWithDomain:TZErrorDomain code:code userInfo:errorDetail]; +} + ++ (id) errorWithLibcError:(NSInteger)errnum { + NSString *message = [NSString stringWithUTF8String:strerror(errnum)]; + NSMutableDictionary *errorDetail = [NSMutableDictionary dictionaryWithObject:message + forKey:NSLocalizedDescriptionKey]; + return [self errorWithDomain:NSPOSIXErrorDomain code:errnum userInfo:errorDetail]; +} + +- (NSString*)toolOutput { + return [[self userInfo] objectForKey:TZToolOutputErrorKey]; +} + +@end + +void logError (NSError *error, NSString *message) { + if (message == nil) { + NSLog (@"%@", [error localizedDescription]); + } else { + NSLog (@"%@: %@", message, [error localizedDescription]); + } +} + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/NSFileManager+Utils.h b/tikzit-old/src/common/NSFileManager+Utils.h new file mode 100644 index 0000000..1349919 --- /dev/null +++ b/tikzit-old/src/common/NSFileManager+Utils.h @@ -0,0 +1,29 @@ +// +// NSFileManager+Utils.h +// TikZiT +// +// Copyright 2010 Alex Merry +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import + +@interface NSFileManager(Utils) +- (BOOL) ensureDirectoryExists:(NSString*)path error:(NSError**)error; +@end + +// vi:ft=objc:sts=4:sw=4:ts=4:noet diff --git a/tikzit-old/src/common/NSFileManager+Utils.m b/tikzit-old/src/common/NSFileManager+Utils.m new file mode 100644 index 0000000..87ede95 --- /dev/null +++ b/tikzit-old/src/common/NSFileManager+Utils.m @@ -0,0 +1,46 @@ +// +// NSFileManager+Utils.h +// TikZiT +// +// Copyright 2010 Alex Merry +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import "NSError+Tikzit.h" + +@implementation NSFileManager(Utils) +- (BOOL) ensureDirectoryExists:(NSString*)directory error:(NSError**)error { + BOOL isDirectory = NO; + if (![self fileExistsAtPath:directory isDirectory:&isDirectory]) { + if (![self createDirectoryAtPath:directory withIntermediateDirectories:YES attributes:nil error:error]) { + return NO; + } + } else if (!isDirectory) { + if (error) { + NSMutableDictionary *errorDetail = [NSMutableDictionary dictionary]; + [errorDetail setValue:@"Directory is a file" forKey:NSLocalizedDescriptionKey]; + [errorDetail setValue:directory forKey:NSFilePathErrorKey]; + *error = [NSError errorWithDomain:TZErrorDomain code:TZ_ERR_NOTDIRECTORY userInfo:errorDetail]; + } + return NO; + } + return YES; +} +@end + +// vi:ft=objc:sts=4:sw=4:ts=4:noet diff --git a/tikzit-old/src/common/NSString+LatexConstants.h b/tikzit-old/src/common/NSString+LatexConstants.h new file mode 100644 index 0000000..f4b5236 --- /dev/null +++ b/tikzit-old/src/common/NSString+LatexConstants.h @@ -0,0 +1,33 @@ +// +// NSString+LatexConstants.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import + + +@interface NSString(LatexConstants) + +- (NSString*)stringByExpandingLatexConstants; + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/NSString+LatexConstants.m b/tikzit-old/src/common/NSString+LatexConstants.m new file mode 100644 index 0000000..634c189 --- /dev/null +++ b/tikzit-old/src/common/NSString+LatexConstants.m @@ -0,0 +1,212 @@ +// +// NSString+LatexConstants.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "NSString+LatexConstants.h" + +// can't use sizeof() in non-fragile ABI (eg: clang) +#define texConstantCount 63 +static NSString *texConstantNames[texConstantCount] = { + @"alpha", + @"beta", + @"gamma", + @"delta", + @"epsilon", + @"zeta", + @"eta", + @"theta", + @"iota", + @"kappa", + @"lambda", + @"mu", + @"nu", + @"xi", + @"pi", + @"rho", + @"sigma", + @"tau", + @"upsilon", + @"phi", + @"chi", + @"psi", + @"omega", + @"Gamma", + @"Delta", + @"Theta", + @"Lambda", + @"Xi", + @"Pi", + @"Sigma", + @"Upsilon", + @"Phi", + @"Psi", + @"Omega", + + @"pm", + @"to", + @"Rightarrow", + @"Leftrightarrow", + @"forall", + @"partial", + @"exists", + @"emptyset", + @"nabla", + @"in", + @"notin", + @"prod", + @"sum", + @"surd", + @"infty", + @"wedge", + @"vee", + @"cap", + @"cup", + @"int", + @"approx", + @"neq", + @"equiv", + @"leq", + @"geq", + @"subset", + @"supset", + @"cdot", + @"ldots" +}; + +static char * texConstantCodes[texConstantCount] = { + "\u03b1","\u03b2","\u03b3","\u03b4","\u03b5","\u03b6","\u03b7", + "\u03b8","\u03b9","\u03ba","\u03bb","\u03bc","\u03bd","\u03be", + "\u03c0","\u03c1","\u03c3","\u03c4","\u03c5","\u03c6","\u03c7", + "\u03c8","\u03c9","\u0393","\u0394","\u0398","\u039b","\u039e", + "\u03a0","\u03a3","\u03a5","\u03a6","\u03a8","\u03a9", + + "\u00b1","\u2192","\u21d2","\u21d4","\u2200","\u2202","\u2203", + "\u2205","\u2207","\u2208","\u2209","\u220f","\u2211","\u221a", + "\u221e","\u2227","\u2228","\u2229","\u222a","\u222b","\u2248", + "\u2260","\u2261","\u2264","\u2265","\u2282","\u2283","\u22c5", + "\u2026" +}; + +#define texModifierCount 10 +static NSString *texModifierNames[texModifierCount] = { + @"tiny", + @"scriptsize", + @"footnotesize", + @"small", + @"normalsize", + @"large", + @"Large", + @"LARGE", + @"huge", + @"Huge" +}; + +static NSDictionary *texConstants = nil; +static NSSet *texModifiers = nil; + +@implementation NSString(LatexConstants) + +- (NSString*)stringByExpandingLatexConstants { + + if (texConstants == nil) { + NSMutableDictionary *constants = [[NSMutableDictionary alloc] initWithCapacity:texConstantCount]; + for (int i = 0; i < texConstantCount; ++i) { + [constants setObject:[NSString stringWithUTF8String:texConstantCodes[i]] forKey:texConstantNames[i]]; + } + texConstants = constants; + } + if (texModifiers == nil) { + texModifiers = [[NSSet alloc] initWithObjects:texModifierNames count:texModifierCount]; + } + + NSMutableString *buf = [[NSMutableString alloc] initWithCapacity:[self length]]; + NSMutableString *wordBuf = [[NSMutableString alloc] initWithCapacity:10]; + + unichar c_a = [@"a" characterAtIndex:0]; + unichar c_z = [@"z" characterAtIndex:0]; + unichar c_A = [@"A" characterAtIndex:0]; + unichar c_Z = [@"Z" characterAtIndex:0]; + + int state = 0; + // a tiny little DFA to replace \\([\w*]) with unicode of $1 + unichar c; + NSString *code; + int i; + for (i = 0; i<[self length]; ++i) { + c = [self characterAtIndex:i]; + switch (state) { + case 0: + if (c=='\\') { + state = 1; + } else if (c!='$') { + [buf appendFormat:@"%C", c]; + } + break; + case 1: + if ((c>=c_a && c<=c_z) || (c>=c_A && c<=c_Z)) { + [wordBuf appendFormat:@"%C", c]; + } else { + code = [texConstants objectForKey:wordBuf]; + if (code != nil) { + [buf appendString:code]; + } else if (![texModifiers containsObject:wordBuf]) { + [buf appendFormat:@"\\%@", wordBuf]; + } + + [wordBuf setString:@""]; + if (c=='\\') { + state = 1; + } else { + if (c!='$') { + [buf appendFormat:@"%C", c]; + } + state = 0; + } + + } + break; + } + } + + if (state == 1) { + code = [texConstants objectForKey:wordBuf]; + if (code != nil) { + [buf appendString:code]; + } else if (![texModifiers containsObject:wordBuf]) { + [buf appendFormat:@"\\%@", wordBuf]; + } + } + + NSString *ret = [buf copy]; +#if __has_feature(objc_arc) + return ret; +#else + [buf release]; + [wordBuf release]; + + return [ret autorelease]; +#endif +} + +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/NSString+Tikz.h b/tikzit-old/src/common/NSString+Tikz.h new file mode 100644 index 0000000..ea6ea40 --- /dev/null +++ b/tikzit-old/src/common/NSString+Tikz.h @@ -0,0 +1,26 @@ +/* + * Copyright 2013 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import + +@interface NSString (Tikz) + - (NSString*) tikzEscapedString; + - (BOOL) isValidTikzPropertyNameOrValue; + - (BOOL) isValidAnchor; +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/NSString+Tikz.m b/tikzit-old/src/common/NSString+Tikz.m new file mode 100644 index 0000000..1e3073b --- /dev/null +++ b/tikzit-old/src/common/NSString+Tikz.m @@ -0,0 +1,72 @@ +/* + * Copyright 2013 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "NSString+Tikz.h" +#import "TikzGraphAssembler.h" + +@implementation NSString (Tikz) + +- (NSString*) tikzEscapedString { + static NSCharacterSet *avoid = nil; + if (avoid == nil) +#if __has_feature(objc_arc) + avoid = [[NSCharacterSet characterSetWithCharactersInString:@"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ<>-'0123456789. "] invertedSet]; +#else + avoid = [[[NSCharacterSet characterSetWithCharactersInString:@"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ<>-'0123456789. "] invertedSet] retain]; +#endif + + + if ([self rangeOfCharacterFromSet:avoid].length > 0) { + return [NSString stringWithFormat:@"{%@}", self]; + } else { +#if __has_feature(objc_arc) + return self; +#else + return [[self retain] autorelease]; +#endif + } +} + +- (BOOL) isValidTikzPropertyNameOrValue { + NSUInteger length = [self length]; + unsigned int brace_depth = 0; + unsigned int escape = 0; + for (NSUInteger i = 0; i < length; ++i) { + unichar c = [self characterAtIndex:i]; + + if (escape) { + escape = 0; + } else if (c == '\\') { + escape = 1; + } else if (c == '{') { + brace_depth++; + } else if (c == '}') { + if (brace_depth == 0) + return NO; + brace_depth--; + } + } + return !escape && brace_depth == 0; +} + +- (BOOL) isValidAnchor { + return [TikzGraphAssembler validateTikzEdgeAnchor:self]; +} + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/NSString+Util.h b/tikzit-old/src/common/NSString+Util.h new file mode 100644 index 0000000..548edb3 --- /dev/null +++ b/tikzit-old/src/common/NSString+Util.h @@ -0,0 +1,27 @@ +/* + * Copyright 2013 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import + +@interface NSString (Util) + + (NSString*) stringWithContentsOfFile:(NSString*)path + error:(NSError**)error; + - (id) initWithContentsOfFile:(NSString*)path + error:(NSError**)error; +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/NSString+Util.m b/tikzit-old/src/common/NSString+Util.m new file mode 100644 index 0000000..b18f397 --- /dev/null +++ b/tikzit-old/src/common/NSString+Util.m @@ -0,0 +1,66 @@ +/* + * Copyright 2013 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import +#import "NSString+Util.h" +#import "NSError+Tikzit.h" + +@implementation NSString (Util) ++ (NSString*) stringWithContentsOfFile:(NSString*)path + error:(NSError**)error +{ + return [[[self alloc] initWithContentsOfFile:path error:error] autorelease]; +} +- (id) initWithContentsOfFile:(NSString*)path + error:(NSError**)error +{ + // Fun fact: on GNUstep, at least, + // [stringWithContentsOfFile:usedEncoding:error:] only + // sets error objects if the decoding fails, not if file + // access fails. + // Fun fact 2: on GNUstep, trying to read a directory using + // [stringWithContentsOfFile:] causes an out-of-memory error; + // hence we do these checks *before* trying to read the file. + NSFileManager *fm = [NSFileManager defaultManager]; + BOOL isDir = NO; + NSString *msg = nil; + if (![fm fileExistsAtPath:path isDirectory:&isDir]) { + msg = [NSString stringWithFormat:@"\"%@\" does not exist", path]; + } else if (isDir) { + msg = [NSString stringWithFormat:@"\"%@\" is a directory", path]; + } else if (![fm isReadableFileAtPath:path]) { + msg = [NSString stringWithFormat:@"\"%@\" is not readable", path]; + } + if (msg != nil) { + if (error) { + *error = [NSError errorWithMessage:msg + code:TZ_ERR_IO]; + } + return nil; + } + self = [self initWithContentsOfFile:path]; + if (self == nil) { + if (error) { + *error = [NSError errorWithMessage:@"unknown error" + code:TZ_ERR_IO]; + } + } + return self; +} +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/Node.h b/tikzit-old/src/common/Node.h new file mode 100644 index 0000000..1e580ce --- /dev/null +++ b/tikzit-old/src/common/Node.h @@ -0,0 +1,181 @@ +// +// Node.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + + +// Node : store the data associated with a node. + +#import + +#import "NodeStyle.h" +#import "GraphElementData.h" + +@class GraphElementProperty; +@class Shape; +@class Transformer; + +/*! + @class Node + @brief A graph node, with associated location and style data. + */ +@interface Node : NSObject { + NSPoint point; + NodeStyle *style; + NSString *name; + NSString *label; + GraphElementData *data; +} + +/*! + @property shape + @brief The shape to use + @detail This is a convenience property that resolves the shape name + from the style, and uses a circle if there is no style. + + This property is NOT KVO-compliant + */ +@property (readonly) Shape *shape; + +/*! + @property point + @brief The point where this node is located. + */ +@property (assign) NSPoint point; + +/*! + @property style + @brief The style of this node. + */ +@property (retain) NodeStyle *style; + +/*! + @property name + @brief The name of this node. This is a temporary name and may change between + successive TikZ outputs. + */ +@property (copy) NSString *name; + +/*! + @property label + @brief The latex label that appears on this node. + */ +@property (copy) NSString *label; + +/*! + @property data + @brief Associated extra data. + */ +@property (copy) GraphElementData *data; + +// KVC methods +- (void) insertObject:(GraphElementProperty*)gep + inDataAtIndex:(NSUInteger)index; +- (void) removeObjectFromDataAtIndex:(NSUInteger)index; +- (void) replaceObjectInDataAtIndex:(NSUInteger)index + withObject:(GraphElementProperty*)gep; + +/*! + @brief Initialize a new node with the given point. + @param p a point. + @result A node. + */ +- (id)initWithPoint:(NSPoint)p; + +/*! + @brief Initialize a new node at (0,0). + @result A node. + */ +- (id)init; + +/*! + @brief Composes the shape transformer with another transformer + @param t The transform to apply before the shape transform + @result A transformer that first maps according to t, then according + to -shapeTransformer. + */ +- (Transformer*) shapeTransformerFromTransformer:(Transformer*)t; + +/*! + @brief A transformer that may be used to convert the shape to the + right position and scale + */ +- (Transformer*) shapeTransformer; + +/*! + @brief The bounding rect in the given co-ordinate system + @detail This is the bounding rect of the shape (after being + suitably translated and scaled). The label is not + considered. + @param shapeTrans The mapping from graph co-ordinates to the required + co-ordinates + @result The bounding rectangle + */ +- (NSRect) boundsUsingShapeTransform:(Transformer*)shapeTrans; + +/*! + @brief The bounding rect in graph co-ordinates + @detail This is the bounding rect of the shape (after being suitably + translated and scaled). The label is not considered. + */ +- (NSRect) boundingRect; + +/*! + @brief Try to attach a style of the correct name from the given style list. + @param styles an array of styles. + @result YES if successfully attached, NO otherwise. + */ +- (BOOL)attachStyleFromTable:(NSArray*)styles; + +/*! + @brief Set node properties from GraphElementData. + */ +- (void)updateData; + +/*! + @brief Set properties of this node to match the given node. + @param nd a node to mimic. + */ +- (void)setPropertiesFromNode:(Node *)nd; + +/*! + @brief Compare a node to another node using a lex ordering on coordinates. + @param nd another node. + @result A comparison result. + */ +- (NSComparisonResult)compareTo:(id)nd; + +/*! + @brief Factory method to construct a node with the given point. + @param p a point. + @result A node. + */ ++ (Node*)nodeWithPoint:(NSPoint)p; + +/*! + @brief Factory method to construct a node at (0,0). + @result A node. + */ ++ (Node*)node; + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/Node.m b/tikzit-old/src/common/Node.m new file mode 100644 index 0000000..c5b11d1 --- /dev/null +++ b/tikzit-old/src/common/Node.m @@ -0,0 +1,214 @@ +// +// Node.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "Node.h" + +#import "Shape.h" + + +@implementation Node + +- (id)initWithPoint:(NSPoint)p { + self = [super init]; + if (self) { + data = [[GraphElementData alloc] init]; + style = nil; + label = @""; + point = p; + } + return self; +} + +- (id)init { + return [self initWithPoint:NSMakePoint(0.0f, 0.0f)]; +} + +- (id)copyWithZone:(NSZone*)z { + Node *cp = [[Node allocWithZone:z] init]; + [cp setPropertiesFromNode:self]; + return cp; +} + +- (void)dealloc { +#if ! __has_feature(objc_arc) + [name release]; + [style release]; + [data release]; + [label release]; + [super dealloc]; +#endif +} + +- (Shape*) shape { + if (style) { + return [Shape shapeForName:[style shapeName]]; + } else { + return nil; + } +} + +- (Transformer*) shapeTransformerFromTransformer:(Transformer*)t { + // we take a copy to keep the reflection attributes +#if ! __has_feature(objc_arc) + Transformer *transformer = [[t copy] autorelease]; +#else + Transformer *transformer = [t copy]; +#endif + NSPoint screenPos = [t toScreen:point]; + [transformer setOrigin:screenPos]; + float scale = [t scale]; + if (style) { + scale *= [style scale]; + } + [transformer setScale:scale]; + return transformer; +} + +- (Transformer*) shapeTransformer { + float scale = 1.0f; + if (style) { + scale = [style scale]; + } + return [Transformer transformerWithOrigin:point andScale:scale]; +} + +- (NSRect) boundsUsingShapeTransform:(Transformer*)shapeTrans { + //if (style) { + return [shapeTrans rectToScreen:[[self shape] boundingRect]]; + /*} else { + NSRect r = NSZeroRect; + r.origin = [shapeTrans toScreen:[self point]]; + return r; + }*/ +} + +- (NSRect) boundingRect { + return [self boundsUsingShapeTransform:[self shapeTransformer]]; +} + +- (BOOL)attachStyleFromTable:(NSArray*)styles { +#if __has_feature(objc_arc) + NSString *style_name = [data propertyForKey:@"style"]; +#else + NSString *style_name = [[[data propertyForKey:@"style"] retain] autorelease]; +#endif + + [self setStyle:nil]; + + // 'none' is a reserved style + if (style_name == nil || [style_name isEqualToString:@"none"]) return YES; + + for (NodeStyle *s in styles) { + if ([[s name] compare:style_name]==NSOrderedSame) { + [self setStyle:s]; + return YES; + } + } + + // if we didn't find a style, fill in a default one + [self setStyle:[NodeStyle defaultNodeStyleWithName:style_name]]; + return NO; +} + +- (void)updateData { + if (style == nil) { + [data setProperty:@"none" forKey:@"style"]; + } else { + [data setProperty:[style name] forKey:@"style"]; + } +} + +- (void)setPropertiesFromNode:(Node*)nd { + [self setPoint:[nd point]]; + [self setStyle:[nd style]]; + [self setName:[nd name]]; + [self setData:[nd data]]; + [self setLabel:[nd label]]; +} + ++ (Node*)nodeWithPoint:(NSPoint)p { +#if __has_feature(objc_arc) + return [[Node alloc] initWithPoint:p]; +#else + return [[[Node alloc] initWithPoint:p] autorelease]; +#endif +} + ++ (Node*)node { +#if __has_feature(objc_arc) + return [[Node alloc] init]; +#else + return [[[Node alloc] init] autorelease]; +#endif +} + + +// perform a lexicographic ordering (-y, x) on coordinates. +- (NSComparisonResult)compareTo:(id)nd { + Node *node = (Node*)nd; + if (point.y > [node point].y) return NSOrderedAscending; + else if (point.y < [node point].y) return NSOrderedDescending; + else { + if (point.x < [node point].x) return NSOrderedAscending; + else if (point.x > [node point].x) return NSOrderedDescending; + else return NSOrderedSame; + } +} + +@synthesize name; +@synthesize label; +@synthesize point; + +@synthesize data; +- (void) insertObject:(GraphElementProperty*)gep + inDataAtIndex:(NSUInteger)index { + [data insertObject:gep atIndex:index]; +} +- (void) removeObjectFromDataAtIndex:(NSUInteger)index { + [data removeObjectAtIndex:index]; +} +- (void) replaceObjectInDataAtIndex:(NSUInteger)index + withObject:(GraphElementProperty*)gep { + [data replaceObjectAtIndex:index withObject:gep]; +} + +- (NodeStyle*)style { + return style; +} + +- (void)setStyle:(NodeStyle *)st { + if (style != st) { +#if __has_feature(objc_arc) + style = st; +#else + NodeStyle *oldStyle = style; + style = [st retain]; + [oldStyle release]; +#endif + } + [self updateData]; +} + +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/NodeStyle.h b/tikzit-old/src/common/NodeStyle.h new file mode 100644 index 0000000..034f95d --- /dev/null +++ b/tikzit-old/src/common/NodeStyle.h @@ -0,0 +1,125 @@ +// +// NodeStyle.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "util.h" +#import "ColorRGB.h" +#import "PropertyHolder.h" + +/*! + @class NodeStyle + @brief Store node style information. + @details Store node style information. These properties affect how a node + is displayed in TikZiT. Colors are stored in the ColorRGB struct + to avoid any Cocoa dependency. These styles should be persistant, + which should be implemented in a platform-specific category. For + OS X, this is NodeStyle+Coder. + */ +@interface NodeStyle : PropertyHolder { + int strokeThickness; + float scale; + ColorRGB *strokeColorRGB; + ColorRGB *fillColorRGB; + NSString *name; + NSString *shapeName; + NSString *category; +} + +/*! + @property strokeThickness + @brief Thickness of the stroke. + */ +@property (assign) int strokeThickness; + +/*! + @property scale + @brief Overall scale of the shape. Defaults to 1.0. + */ +@property (assign) float scale; + + +/*! + @property strokeColorRGB + @brief The stroke color used to render the node + */ +@property (copy) ColorRGB *strokeColorRGB; + +/*! + @property fillColorRGB + @brief The fill color used to render the node + */ +@property (copy) ColorRGB *fillColorRGB; + +/*! + @property name + @brief Style name. + @details Style name. This is the only thing that affects how the node + will look when the latex code is rendered. + */ +@property (copy) NSString *name; + +/*! + @property shapeName + @brief The name of the shape that will be drawn in TikZiT. + */ +@property (copy) NSString *shapeName; + +/*! + @property category + @brief ??? + */ +@property (copy) NSString *category; + +@property (readonly) NSString *tikz; +@property (readonly) BOOL strokeColorIsKnown; +@property (readonly) BOOL fillColorIsKnown; + ++ (int) defaultStrokeThickness; + +/*! + @brief Designated initializer. Construct a blank style with name 'new'. + @result A default style. + */ +- (id)init; + +/*! + @brief Create a named style. + @param nm the style name. + @result A NodeStyle with the given name. + */ +- (id)initWithName:(NSString *)nm; + +/*! + @brief Factory method for initWithName: + @param nm the style name. + @result A NodeStyle with the given name. + */ ++ (NodeStyle*)defaultNodeStyleWithName:(NSString *)nm; + +/*! + * Make this style the same as the given one + */ +- (void) updateFromStyle:(NodeStyle*)style; + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/NodeStyle.m b/tikzit-old/src/common/NodeStyle.m new file mode 100644 index 0000000..193d44d --- /dev/null +++ b/tikzit-old/src/common/NodeStyle.m @@ -0,0 +1,246 @@ +// +// NodeStyle.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "NodeStyle.h" +#import "Shape.h" +#import "ShapeNames.h" + +@implementation NodeStyle + ++ (void)initialize { + [self setKeys:[NSArray arrayWithObjects: + @"fillColorRGB.red", + @"fillColorRGB.blue", + @"fillColorRGB.green", + @"strokeColorRGB.red", + @"strokeColorRGB.blue", + @"strokeColorRGB.green", + @"strokeThickness", + @"shapeName", + @"name", + nil] + triggerChangeNotificationsForDependentKey:@"tikz"]; + [self setKeys:[NSArray arrayWithObjects: + @"fillColorRGB.name", + nil] + triggerChangeNotificationsForDependentKey:@"fillColorIsKnown"]; + [self setKeys:[NSArray arrayWithObjects: + @"strokeColorRGB.name", + nil] + triggerChangeNotificationsForDependentKey:@"strokeColorIsKnown"]; +} + ++ (int) defaultStrokeThickness { return 1; } + +- (id)initWithName:(NSString*)nm { + self = [super initWithNotificationName:@"NodeStylePropertyChanged"]; + if (self != nil) { + strokeThickness = [NodeStyle defaultStrokeThickness]; + scale = 1.0f; + strokeColorRGB = [[ColorRGB alloc] initWithRed:0 green:0 blue:0]; + fillColorRGB = [[ColorRGB alloc] initWithRed:255 green:255 blue:255]; + + name = nm; + category = nil; + shapeName = SHAPE_CIRCLE; + } + return self; +} + +- (id)init { + self = [self initWithName:@"new"]; + return self; +} + +- (id)copyWithZone:(NSZone*)zone { + NodeStyle *style = [[NodeStyle allocWithZone:zone] init]; + + [style setStrokeThickness:[self strokeThickness]]; + [style setScale:[self scale]]; + [style setStrokeColorRGB:[self strokeColorRGB]]; + [style setFillColorRGB:[self fillColorRGB]]; + [style setName:[self name]]; + [style setShapeName:[self shapeName]]; + [style setCategory:[self category]]; + + return style; +} + +- (void)dealloc { +#if ! __has_feature(objc_arc) + [name release]; + [category release]; + [shapeName release]; + [strokeColorRGB release]; + [fillColorRGB release]; + [super dealloc]; +#endif +} + +- (NSString*) description { + return [NSString stringWithFormat:@"Node style \"%@\"", name]; +} + +- (void) updateFromStyle:(NodeStyle*)style { + [self setStrokeThickness:[style strokeThickness]]; + [self setScale:[style scale]]; + [self setStrokeColorRGB:[style strokeColorRGB]]; + [self setFillColorRGB:[style fillColorRGB]]; + [self setName:[style name]]; + [self setShapeName:[style shapeName]]; + [self setCategory:[style category]]; +} + ++ (NodeStyle*)defaultNodeStyleWithName:(NSString*)nm { +#if __has_feature(objc_arc) + return [[NodeStyle alloc] initWithName:nm]; +#else + return [[[NodeStyle alloc] initWithName:nm] autorelease]; +#endif +} + +- (NSString*)name { + return name; +} + +- (void)setName:(NSString *)s { + if (name != s) { + NSString *oldValue = name; + name = [s copy]; + [self postPropertyChanged:@"name" oldValue:oldValue]; +#if ! __has_feature(objc_arc) + [oldValue release]; +#endif + } +} + +- (NSString*)shapeName { + return shapeName; +} + +- (void)setShapeName:(NSString *)s { + if (shapeName != s) { + NSString *oldValue = shapeName; + shapeName = [s copy]; + [self postPropertyChanged:@"shapeName" oldValue:oldValue]; +#if ! __has_feature(objc_arc) + [oldValue release]; +#endif + } +} + +- (NSString*)category { + return category; +} + +- (void)setCategory:(NSString *)s { + if (category != s) { + NSString *oldValue = category; + category = [s copy]; + [self postPropertyChanged:@"category" oldValue:oldValue]; +#if ! __has_feature(objc_arc) + [oldValue release]; +#endif + } +} + +- (int)strokeThickness { return strokeThickness; } +- (void)setStrokeThickness:(int)i { + int oldValue = strokeThickness; + strokeThickness = i; + [self postPropertyChanged:@"strokeThickness" oldValue:[NSNumber numberWithInt:oldValue]]; +} + +- (float)scale { return scale; } +- (void)setScale:(float)s { + float oldValue = scale; + scale = s; + [self postPropertyChanged:@"scale" oldValue:[NSNumber numberWithFloat:oldValue]]; +} + +- (ColorRGB*)strokeColorRGB { + return strokeColorRGB; +} + +- (void)setStrokeColorRGB:(ColorRGB*)c { + if (strokeColorRGB != c) { + ColorRGB *oldValue = strokeColorRGB; + strokeColorRGB = [c copy]; + [self postPropertyChanged:@"strokeColorRGB" oldValue:oldValue]; +#if ! __has_feature(objc_arc) + [oldValue release]; +#endif + } +} + +- (ColorRGB*)fillColorRGB { + return fillColorRGB; +} + +- (void)setFillColorRGB:(ColorRGB*)c { + if (fillColorRGB != c) { + ColorRGB *oldValue = fillColorRGB; + fillColorRGB = [c copy]; + [self postPropertyChanged:@"fillColorRGB" oldValue:oldValue]; +#if ! __has_feature(objc_arc) + [oldValue release]; +#endif + } +} + +- (NSString*)tikz { + NSString *fillName = [fillColorRGB name]; + NSString *strokeName = [strokeColorRGB name]; + NSString *stroke = @""; + if (strokeThickness != 1) { + stroke = [NSString stringWithFormat:@",line width=%@ pt", + [NSNumber numberWithFloat:(float)strokeThickness * 0.4f]]; + } + + // If the colors are unknown, fall back on hexnames. These should be defined as colors + // in the Preambles class. + if (fillName == nil) fillName = [fillColorRGB hexName]; + if (strokeName == nil) strokeName = [strokeColorRGB hexName]; + + NSString *shapeDesc = [[Shape shapeForName:shapeName] styleTikz]; + if (shapeDesc == nil) shapeDesc = shapeName; + + return [NSString stringWithFormat:@"\\tikzstyle{%@}=[%@,fill=%@,draw=%@%@]", + name, + shapeDesc, + fillName, + strokeName, + stroke]; +} + +- (BOOL)strokeColorIsKnown { + return ([strokeColorRGB name] != nil); +} + +- (BOOL)fillColorIsKnown { + return ([fillColorRGB name] != nil); +} + +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/PickSupport.h b/tikzit-old/src/common/PickSupport.h new file mode 100644 index 0000000..0749649 --- /dev/null +++ b/tikzit-old/src/common/PickSupport.h @@ -0,0 +1,164 @@ +// +// PickSupport.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + + +#import +#import "Node.h" +#import "Edge.h" + +/*! + @class PickSupport + @brief Maintain the selection state of nodes and edges. + @detail In addition to the notifications listed for specific methods, + whenever the node selection changes, a "NodeSelectionChanged" + signal is emitted, and whenever the edge selection changes, + an "EdgeSelectionChanged" signal is emitted. + */ +@interface PickSupport : NSObject { + NSMutableSet *selectedNodes; + NSMutableSet *selectedEdges; +} + +/*! + @property selectedNodes + @brief A set of selected nodes. + */ +@property (readonly) NSSet *selectedNodes; + +// KVC methods +- (void)addSelectedNodesObject:(Node*)node; +- (void)addSelectedNodes:(NSSet*)nodes; +- (void)removeSelectedNodesObject:(Node*)node; +- (void)removeSelectedNodes:(NSSet*)nodes; + +/*! + @property selectedEdges + @brief A set of selected edges. + */ +@property (readonly) NSSet *selectedEdges; + +// KVC methods +- (void)addSelectedEdgesObject:(Edge*)edge; +- (void)addSelectedEdges:(NSSet*)edges; +- (void)removeSelectedEdgesObject:(Edge*)edge; +- (void)removeSelectedEdges:(NSSet*)edges; + +/*! + @brief Check if a node is selected. + @param nd a node. + @result YES if nd is selected. + */ +- (BOOL)isNodeSelected:(Node*)nd; + +/*! + @brief Check if an edge is selected. + @param e an edge. + @result YES if e is selected. + */ +- (BOOL)isEdgeSelected:(Edge*)e; + +/*! + @brief Select a node. + @details Sends the "NodeSelected" notification if the node was not + already selected, with @p nd as "node" in the userInfo + @param nd a node. + */ +- (void)selectNode:(Node*)nd; + +/*! + @brief Deselect a node. + @details Sends the "NodeDeselected" notification if the node was + selected, with @p nd as "node" in the userInfo + @param nd a node. + */ +- (void)deselectNode:(Node*)nd; + +/*! + @brief Select an edge. + @details Sends the "EdgeSelected" notification if the node was not + already selected, with @p e as "edge" in the userInfo + @param e an edge. + */ +- (void)selectEdge:(Edge*)e; + +/*! + @brief Deselect an edge. + @details Sends the "EdgeDeselected" notification if the node was + selected, with @p e as "edge" in the userInfo + @param e an edge. + */ +- (void)deselectEdge:(Edge*)e; + +/*! + @brief Toggle the selected state of the given node. + @details Sends the "NodeSelected" or "NodeDeselected" notification as + appropriate, with @p nd as "node" in the userInfo + @param nd a node. + */ +- (void)toggleNodeSelected:(Node*)nd; + +/*! + @brief Select all nodes in the given set. + @details Sends the "NodeSelectionReplaced" notification if this + caused the selection to change. + + Equivalent to selectAllNodes:nodes replacingSelection:YES + @param nodes a set of nodes. + */ +- (void)selectAllNodes:(NSSet*)nodes; + +/*! + @brief Select all nodes in the given set. + @details Sends the "NodeSelectionReplaced" notification if this + caused the selection to change. + + If replace is NO, @p nodes will be added to the existing + selection, otherwise it will replace the existing selection. + @param nodes a set of nodes. + @param replace whether to replace the existing selection + */ +- (void)selectAllNodes:(NSSet*)nodes replacingSelection:(BOOL)replace; + +/*! + @brief Deselect all nodes. + @details Sends the "NodeSelectionReplaced" notification if there + were any nodes previously selected + */ +- (void)deselectAllNodes; + +/*! + @brief Deselect all edges. + @details Sends the "EdgeSelectionReplaced" notification if there + were any edges previously selected + */ +- (void)deselectAllEdges; + +/*! + @brief Factory method for getting a new PickSupport object. + @result An empty PickSupport. + */ ++ (PickSupport*)pickSupport; + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/PickSupport.m b/tikzit-old/src/common/PickSupport.m new file mode 100644 index 0000000..560fc2c --- /dev/null +++ b/tikzit-old/src/common/PickSupport.m @@ -0,0 +1,232 @@ +// +// PickSupport.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "PickSupport.h" + + +@implementation PickSupport + +- (void) postNodeSelectionChanged { + [[NSNotificationCenter defaultCenter] + postNotificationName:@"NodeSelectionChanged" + object:self]; +} + +- (void) postEdgeSelectionChanged { + [[NSNotificationCenter defaultCenter] + postNotificationName:@"EdgeSelectionChanged" + object:self]; +} + +- (id) init { + self = [super init]; + + if (self) { +#if __has_feature(objc_arc) + selectedNodes = [NSMutableSet set]; + selectedEdges = [NSMutableSet set]; +#else + selectedNodes = [[NSMutableSet set] retain]; + selectedEdges = [[NSMutableSet set] retain]; +#endif + } + + return self; +} + ++ (PickSupport*)pickSupport { +#if __has_feature(objc_arc) + return [[PickSupport alloc] init]; +#else + return [[[PickSupport alloc] init] autorelease]; +#endif +} + +@synthesize selectedNodes; +- (void)addSelectedNodesObject:(Node*)node { + return [self selectNode:node]; +} +- (void)addSelectedNodes:(NSSet*)nodes { + return [self selectAllNodes:nodes replacingSelection:NO]; +} +- (void)removeSelectedNodesObject:(Node*)node { + return [self deselectNode:node]; +} +- (void)removeSelectedNodes:(NSSet*)nodes { + if ([selectedNodes count] > 0) { + [selectedNodes minusSet:nodes]; + [[NSNotificationCenter defaultCenter] + postNotificationName:@"NodeSelectionReplaced" + object:self]; + [self postNodeSelectionChanged]; + } +} + +@synthesize selectedEdges; +- (void)addSelectedEdgesObject:(Edge*)edge { + return [self selectEdge:edge]; +} +- (void)addSelectedEdges:(NSSet*)edges { + if (selectedEdges == edges) { + return; + } + if ([edges count] == 0) { + return; + } + + [selectedEdges unionSet:edges]; + [[NSNotificationCenter defaultCenter] + postNotificationName:@"EdgeSelectionReplaced" + object:self]; + [self postEdgeSelectionChanged]; +} +- (void)removeSelectedEdgesObject:(Edge*)edge { + return [self deselectEdge:edge]; +} +- (void)removeSelectedEdges:(NSSet*)edges { + if ([selectedEdges count] > 0 && [edges count] > 0) { + [selectedEdges minusSet:edges]; + [[NSNotificationCenter defaultCenter] + postNotificationName:@"EdgeSelectionReplaced" + object:self]; + [self postEdgeSelectionChanged]; + } +} + +- (BOOL)isNodeSelected:(Node*)nd { + return [selectedNodes containsObject:nd]; +} + +- (BOOL)isEdgeSelected:(Edge*)e { + return [selectedEdges containsObject:e]; +} + +- (void)selectNode:(Node*)nd { + if (nd != nil && ![selectedNodes member:nd]) { + [selectedNodes addObject:nd]; + [[NSNotificationCenter defaultCenter] + postNotificationName:@"NodeSelected" + object:self + userInfo:[NSDictionary dictionaryWithObject:nd forKey:@"node"]]; + [self postNodeSelectionChanged]; + } +} + +- (void)deselectNode:(Node*)nd { + if (nd != nil && [selectedNodes member:nd]) { + [selectedNodes removeObject:nd]; + [[NSNotificationCenter defaultCenter] + postNotificationName:@"NodeDeselected" + object:self + userInfo:[NSDictionary dictionaryWithObject:nd forKey:@"node"]]; + [self postNodeSelectionChanged]; + } +} + +- (void)selectEdge:(Edge*)e { + if (e != nil && ![selectedEdges member:e]) { + [selectedEdges addObject:e]; + [[NSNotificationCenter defaultCenter] + postNotificationName:@"EdgeSelected" + object:self + userInfo:[NSDictionary dictionaryWithObject:e forKey:@"edge"]]; + [self postEdgeSelectionChanged]; + } +} + +- (void)deselectEdge:(Edge*)e { + if (e != nil && [selectedEdges member:e]) { + [selectedEdges removeObject:e]; + [[NSNotificationCenter defaultCenter] + postNotificationName:@"EdgeDeselected" + object:self + userInfo:[NSDictionary dictionaryWithObject:e forKey:@"edge"]]; + [self postEdgeSelectionChanged]; + } +} + +- (void)toggleNodeSelected:(Node*)nd { + if ([self isNodeSelected:nd]) + [self deselectNode:nd]; + else + [self selectNode:nd]; +} + +- (void)selectAllNodes:(NSSet*)nodes { + [self selectAllNodes:nodes replacingSelection:YES]; +} + +- (void)selectAllNodes:(NSSet*)nodes replacingSelection:(BOOL)replace { + if (selectedNodes == nodes) { + return; + } + if (!replace && [nodes count] == 0) { + return; + } + + if (replace) { +#if ! __has_feature(objc_arc) + [selectedNodes release]; +#endif + selectedNodes = [nodes mutableCopy]; + } else { + [selectedNodes unionSet:nodes]; + } + [[NSNotificationCenter defaultCenter] + postNotificationName:@"NodeSelectionReplaced" + object:self]; + [self postNodeSelectionChanged]; +} + +- (void)deselectAllNodes { + if ([selectedNodes count] > 0) { + [selectedNodes removeAllObjects]; + [[NSNotificationCenter defaultCenter] + postNotificationName:@"NodeSelectionReplaced" + object:self]; + [self postNodeSelectionChanged]; + } +} + +- (void)deselectAllEdges { + if ([selectedEdges count] > 0) { + [selectedEdges removeAllObjects]; + [[NSNotificationCenter defaultCenter] + postNotificationName:@"EdgeSelectionReplaced" + object:self]; + [self postEdgeSelectionChanged]; + } +} + +- (void)dealloc { +#if ! __has_feature(objc_arc) + [selectedNodes release]; + [selectedEdges release]; + + [super dealloc]; +#endif +} + +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/Preambles.h b/tikzit-old/src/common/Preambles.h new file mode 100644 index 0000000..2fb084a --- /dev/null +++ b/tikzit-old/src/common/Preambles.h @@ -0,0 +1,73 @@ +// +// Preambles.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// Copyright 2011 Alex Merry. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import "StyleManager.h" + +@class Graph; + +@interface Preambles : NSObject { + NSMutableDictionary *preambleDict; + NSString *selectedPreambleName; + NSArray *styles; + NSArray *edges; + StyleManager *styleManager; +} + +@property (copy) NSString *selectedPreambleName; +@property (retain) NSString *currentPreamble; +@property (retain) StyleManager *styleManager; +@property (readonly) NSMutableDictionary *preambleDict; + ++ (Preambles*)preambles; +- (id)init; +- (void)setStyles:(NSArray*)sty; +- (void)setEdges:(NSArray*)edg; + +- (NSString*)preambleForName:(NSString*)name; +- (BOOL)setPreamble:(NSString*)content forName:(NSString*)name; + +- (NSString*)addPreamble; +- (NSString*)addPreambleWithNameBase:(NSString*)name; + +- (BOOL)renamePreambleFrom:(NSString*)old to:(NSString*)new; +- (BOOL)removePreamble:(NSString*)name; + +- (NSEnumerator*)customPreambleNameEnumerator; + +- (void)removeAllPreambles; + +- (BOOL)selectedPreambleIsDefault; + +- (NSString*)styleDefinitions; +- (NSString*)defaultPreamble; +- (NSString*)defaultPreambleName; +- (NSString*)currentPostamble; + +- (NSString*)buildDocumentForTikz:(NSString*)tikz; +- (NSString*)buildDocumentForGraph:(Graph*)g; + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/Preambles.m b/tikzit-old/src/common/Preambles.m new file mode 100644 index 0000000..922fc30 --- /dev/null +++ b/tikzit-old/src/common/Preambles.m @@ -0,0 +1,320 @@ +// +// Preambles.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "Preambles.h" +#import "NodeStyle.h" +#import "EdgeStyle.h" +#import "Graph.h" + +static NSString *DEF_PREAMBLE_START = +@"\\usepackage[svgnames]{xcolor}\n" +@"\\usepackage{tikz}\n" +@"\\usetikzlibrary{decorations.markings}\n" +@"\\usetikzlibrary{shapes.geometric}\n" +@"\n" +@"\\pgfdeclarelayer{edgelayer}\n" +@"\\pgfdeclarelayer{nodelayer}\n" +@"\\pgfsetlayers{edgelayer,nodelayer,main}\n" +@"\n" +@"\\tikzstyle{none}=[inner sep=0pt]\n"; + +static NSString *PREAMBLE_TAIL = +@"\n" +@"\\pagestyle{empty}\n" +@"\\usepackage[graphics,tightpage,active]{preview}\n" +@"\\PreviewEnvironment{tikzpicture}\n" +@"\\newlength{\\imagewidth}\n" +@"\\newlength{\\imagescale}\n" +@"\n" +@"\\begin{document}\n"; + +static NSString *POSTAMBLE = +@"\n" +@"\\end{document}\n"; + +@implementation Preambles + ++ (Preambles*)preambles { +#if __has_feature(objc_arc) + return [[self alloc] init]; +#else + return [[[self alloc] init] autorelease]; +#endif +} + +- (id)init { + self = [super init]; + if (self) { + selectedPreambleName = @"default"; + preambleDict = [[NSMutableDictionary alloc] initWithCapacity:1]; + [preambleDict setObject:[self defaultPreamble] forKey:@"custom"]; + styles = nil; + edges = nil; + styleManager = nil; + } + return self; +} + +- (void)dealloc { +#if ! __has_feature(objc_arc) + [selectedPreambleName release]; + [styles release]; + [styleManager release]; + [super dealloc]; +#endif +} + +- (NSString*)preambleForName:(NSString*)name { + if ([name isEqualToString:@"default"]) + return [self defaultPreamble]; + else + return [preambleDict objectForKey:name]; +} + +- (BOOL)setPreamble:(NSString*)content forName:(NSString*)name { + if ([name isEqualToString:@"default"]) + return NO; + [preambleDict setObject:content forKey:name]; + return YES; +} + +- (void)removeAllPreambles { + [preambleDict removeAllObjects]; +} + +- (NSEnumerator*)customPreambleNameEnumerator { + return [preambleDict keyEnumerator]; +} + +- (void)setStyles:(NSArray*)sty { +#if ! __has_feature(objc_arc) + [sty retain]; + [styles release]; +#endif + styles = sty; +} + +- (void)setEdges:(NSArray*)edg { +#if ! __has_feature(objc_arc) + [edg retain]; + [edges release]; +#endif + edges = edg; +} + +- (NSString*)styleDefinitions { + if (styleManager != nil) { + [self setStyles:[styleManager nodeStyles]]; + } +#if ! __has_feature(objc_arc) + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; +#endif + NSMutableString *buf = [NSMutableString string]; + NSMutableString *colbuf = [NSMutableString string]; + NSMutableSet *colors = [NSMutableSet setWithCapacity:2*[styles count]]; + for (NodeStyle *st in styles) { + [buf appendFormat:@"%@\n", [st tikz]]; + ColorRGB *fill = [st fillColorRGB]; + ColorRGB *stroke = [st strokeColorRGB]; + if ([fill name] == nil && ![colors containsObject:fill]) { + [colors addObject:fill]; + [colbuf appendFormat:@"\\definecolor{%@}{rgb}{%.3f,%.3f,%.3f}\n", + [fill hexName], [fill redFloat], [fill greenFloat], [fill blueFloat]]; + } + + if ([stroke name] == nil && ![colors containsObject:stroke]) { + [colors addObject:stroke]; + [colbuf appendFormat:@"\\definecolor{%@}{rgb}{%.3f,%.3f,%.3f}\n", + [stroke hexName], [stroke redFloat], [stroke greenFloat], [stroke blueFloat]]; + } + } + + if (styleManager != nil) { + [self setEdges:[styleManager edgeStyles]]; + } + + [buf appendString:@"\n"]; + for (EdgeStyle *st in edges) { + [buf appendFormat:@"%@\n", [st tikz]]; + ColorRGB *color = [st colorRGB]; + if (color != nil && [color name] == nil && ![colors containsObject:color]) { + [colors addObject:color]; + [colbuf appendFormat:@"\\definecolor{%@}{rgb}{%.3f,%.3f,%.3f}\n", + [color hexName], [color redFloat], [color greenFloat], [color blueFloat]]; + } + } + + NSString *defs = [[NSString alloc] initWithFormat:@"%@\n%@", colbuf, buf]; + +#if __has_feature(objc_arc) + return defs; +#else + [pool drain]; + return [defs autorelease]; +#endif +} + +- (NSString*)defaultPreamble { + return [NSString stringWithFormat:@"%@%@", + DEF_PREAMBLE_START, [self styleDefinitions]]; +} + +- (BOOL)selectedPreambleIsDefault { + return [selectedPreambleName isEqualToString:@"default"]; +} + +- (NSString*)selectedPreambleName { return selectedPreambleName; } +- (void)setSelectedPreambleName:(NSString *)sel { + if (sel != selectedPreambleName) { +#if ! __has_feature(objc_arc) + [selectedPreambleName release]; +#endif + selectedPreambleName = [sel copy]; + } +} + +- (NSString*)currentPreamble { + NSString *pre = [self preambleForName:selectedPreambleName]; + return (pre == nil) ? [self defaultPreamble] : pre; +} + +- (void)setCurrentPreamble:(NSString*)str { + if (![selectedPreambleName isEqualToString:@"default"]) + [preambleDict setObject:str forKey:selectedPreambleName]; +} + +- (StyleManager*)styleManager { + return styleManager; +} + +- (void)setStyleManager:(StyleManager *)manager { +#if ! __has_feature(objc_arc) + [manager retain]; + [styleManager release]; +#endif + styleManager = manager; +} + +- (NSString*)currentPostamble { + return POSTAMBLE; +} + +- (NSMutableDictionary*)preambleDict { + return preambleDict; +} + +- (NSString*)defaultPreambleName { + return @"default"; +} + +- (NSString*)addPreamble { + return [self addPreambleWithNameBase:@"new preamble"]; +} + +- (NSString*)addPreambleWithNameBase:(NSString*)base { + if ([preambleDict objectForKey:base] == nil) { + [self setPreamble:[self defaultPreamble] forName:base]; + return base; + } + int i = 0; + NSString *tryName = nil; + do { + ++i; + tryName = [NSString stringWithFormat:@"%@ %d", base, i]; + } while ([preambleDict objectForKey:tryName] != nil); + + [self setPreamble:[self defaultPreamble] forName:tryName]; + return tryName; +} + +- (BOOL)renamePreambleFrom:(NSString*)old to:(NSString*)new { + if ([old isEqualToString:@"default"]) + return NO; + if ([new isEqualToString:@"default"]) + return NO; + if ([old isEqualToString:new]) + return YES; + BOOL isSelected = NO; + if ([old isEqualToString:selectedPreambleName]) { + [self setSelectedPreambleName:nil]; + isSelected = YES; + } + NSString *preamble = [preambleDict objectForKey:old]; +#if ! __has_feature(objc_arc) + [preamble retain]; +#endif + [preambleDict removeObjectForKey:old]; + [preambleDict setObject:preamble forKey:new]; +#if ! __has_feature(objc_arc) + [preamble release]; +#endif + if (isSelected) { + [self setSelectedPreambleName:new]; + } + return YES; +} + +- (BOOL)removePreamble:(NSString*)name { + if ([name isEqualToString:@"default"]) + return NO; + // "name" may be held only by being the selected preamble... +#if ! __has_feature(objc_arc) + [name retain]; +#endif + if ([name isEqualToString:selectedPreambleName]) + [self setSelectedPreambleName:nil]; + [preambleDict removeObjectForKey:name]; +#if ! __has_feature(objc_arc) + [name release]; +#endif + return YES; +} + +- (NSString*)buildDocumentForTikz:(NSString*)tikz +{ + NSString *preamble = [self currentPreamble]; + NSString *doc_head = @""; + if (![preamble hasPrefix:@"\\documentclass"]) { + doc_head = @"\\documentclass{article}\n"; + } + NSString *preamble_suffix = @""; + if ([preamble rangeOfString:@"\\begin{document}" + options:NSBackwardsSearch].length == 0) { + preamble_suffix = PREAMBLE_TAIL; + } + return [NSString stringWithFormat:@"%@%@%@%@%@", + doc_head, + [self currentPreamble], + preamble_suffix, + tikz, + POSTAMBLE]; +} + +- (NSString*)buildDocumentForGraph:(Graph*)g +{ + return [self buildDocumentForTikz:[g tikz]]; +} + +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/PropertyHolder.h b/tikzit-old/src/common/PropertyHolder.h new file mode 100644 index 0000000..ba1d825 --- /dev/null +++ b/tikzit-old/src/common/PropertyHolder.h @@ -0,0 +1,36 @@ +// +// PropertyHolder.h +// TikZiT +// +// Copyright 2011 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import + +@interface PropertyHolder : NSObject { + NSString *notificationName; +} + +- (id)initWithNotificationName:(NSString*)name; +- (void) postPropertyChanged:(NSString*)property oldValue:(id)value; +- (void) postPropertyChanged:(NSString*)property; + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/PropertyHolder.m b/tikzit-old/src/common/PropertyHolder.m new file mode 100644 index 0000000..6aaf125 --- /dev/null +++ b/tikzit-old/src/common/PropertyHolder.m @@ -0,0 +1,74 @@ +// +// PropertyHolder.m +// TikZiT +// +// Copyright 2011 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "PropertyHolder.h" + +@implementation PropertyHolder + + +- (id)init { + self = [super init]; + if (self) { + notificationName = @"UnknownPropertyChanged"; + } + return self; +} + +- (id)initWithNotificationName:(NSString*)n { + self = [super init]; + if (self) { + notificationName = [n copy]; + } + return self; +} + +- (void)postPropertyChanged:(NSString*)property oldValue:(id)value { + NSDictionary *userInfo; + if (value != nil) { + userInfo = [NSDictionary dictionaryWithObjectsAndKeys: + property, @"propertyName", + value, @"oldValue", + nil]; + } else { + userInfo = [NSDictionary dictionaryWithObject:property + forKey:@"propertyName"]; + } + [[NSNotificationCenter defaultCenter] postNotificationName:notificationName + object:self + userInfo:userInfo]; +} + +- (void)postPropertyChanged:(NSString*)property { + [self postPropertyChanged:property oldValue:nil]; +} + +- (void)dealloc { +#if ! __has_feature(objc_arc) + [notificationName release]; + [super dealloc]; +#endif +} + +@end + +// vi:ft=objc:ts=4:et:sts=4:sw=4 diff --git a/tikzit-old/src/common/RColor.h b/tikzit-old/src/common/RColor.h new file mode 100644 index 0000000..7f22547 --- /dev/null +++ b/tikzit-old/src/common/RColor.h @@ -0,0 +1,50 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import + +#ifndef CGFloat +#define CGFloat float +#endif + +/** + * A lightweight color structure used by RenderContext + * + * This is mainly to avoid the overhead of ColorRGB when + * rendering things not based on a NodeStyle + * + * All values range from 0.0f to 1.0f. + */ +typedef struct { + CGFloat red; + CGFloat green; + CGFloat blue; + CGFloat alpha; +} +RColor; + +/** Solid white */ +static const RColor WhiteRColor __attribute__((unused)) = {1.0, 1.0, 1.0, 1.0}; +/** Solid black */ +static const RColor BlackRColor __attribute__((unused)) = {0.0, 0.0, 0.0, 1.0}; + +/** Create a color with alpha set to 1.0 */ +RColor MakeSolidRColor (CGFloat red, CGFloat green, CGFloat blue); +/** Create a color */ +RColor MakeRColor (CGFloat red, CGFloat green, CGFloat blue, CGFloat alpha); + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/RColor.m b/tikzit-old/src/common/RColor.m new file mode 100644 index 0000000..49914fe --- /dev/null +++ b/tikzit-old/src/common/RColor.m @@ -0,0 +1,33 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "RColor.h" + +RColor MakeSolidRColor (CGFloat red, CGFloat green, CGFloat blue) { + return MakeRColor (red, green, blue, 1.0); +} + +RColor MakeRColor (CGFloat red, CGFloat green, CGFloat blue, CGFloat alpha) { + RColor color; + color.red = red; + color.green = green; + color.blue = blue; + color.alpha = alpha; + return color; +} + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/RectangleShape.h b/tikzit-old/src/common/RectangleShape.h new file mode 100644 index 0000000..3fa0f31 --- /dev/null +++ b/tikzit-old/src/common/RectangleShape.h @@ -0,0 +1,33 @@ +// +// RectangleShape.h +// TikZiT +// +// Copyright 2011 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import "Shape.h" + + +@interface RectangleShape : Shape { +} + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/RectangleShape.m b/tikzit-old/src/common/RectangleShape.m new file mode 100644 index 0000000..db9c803 --- /dev/null +++ b/tikzit-old/src/common/RectangleShape.m @@ -0,0 +1,57 @@ +// +// RectangleShape.m +// TikZiT +// +// Copyright 2011 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "RectangleShape.h" +#import "Node.h" +#import "Edge.h" + +@implementation RectangleShape + +- (id)init { + self = [super init]; + if (self) { + Node *n0,*n1,*n2,*n3; + float sz = 0.2f; + + n0 = [Node nodeWithPoint:NSMakePoint(-sz, sz)]; + n1 = [Node nodeWithPoint:NSMakePoint( sz, sz)]; + n2 = [Node nodeWithPoint:NSMakePoint( sz,-sz)]; + n3 = [Node nodeWithPoint:NSMakePoint(-sz,-sz)]; + + Edge *e0,*e1,*e2,*e3; + + e0 = [Edge edgeWithSource:n0 andTarget:n1]; + e1 = [Edge edgeWithSource:n1 andTarget:n2]; + e2 = [Edge edgeWithSource:n2 andTarget:n3]; + e3 = [Edge edgeWithSource:n3 andTarget:n0]; + + paths = [[NSSet alloc] initWithObjects:[NSArray arrayWithObjects:e0,e1,e2,e3,nil],nil]; + + styleTikz = @"rectangle"; + } + return self; +} + +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/RegularPolyShape.h b/tikzit-old/src/common/RegularPolyShape.h new file mode 100644 index 0000000..1fd8f1e --- /dev/null +++ b/tikzit-old/src/common/RegularPolyShape.h @@ -0,0 +1,50 @@ +// +// RegularPolyShape.h +// TikZiT +// +// Copyright 2011 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import "Shape.h" + +/** + * A regular polygon + * + * Matches the "regular polygon" shape in the shapes.geometric + * PGF/TikZ library. + */ +@interface RegularPolyShape : Shape { +} + +/** + * Initialise a regular polygon + * + * A rotation of 0 will produce a polygon with one + * edge flat along the bottom (just like PGF/TikZ + * does it). + * + * @param sides the number of sides the polygon should have + * @param rotation the rotation of the polygon, in degrees + */ +- (id)initWithSides:(int)sides rotation:(int)rotation; + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/RegularPolyShape.m b/tikzit-old/src/common/RegularPolyShape.m new file mode 100644 index 0000000..3555115 --- /dev/null +++ b/tikzit-old/src/common/RegularPolyShape.m @@ -0,0 +1,76 @@ +// +// RegularPolyShape.m +// TikZiT +// +// Copyright 2011 Aleks Kissinger +// Copyright 2012 Alex Merry +// All rights reserved. +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "RegularPolyShape.h" +#import "Node.h" +#import "Edge.h" +#import "util.h" + +@implementation RegularPolyShape + +- (id)initWithSides:(int)sides rotation:(int)rotation { + self = [super init]; + if (self == nil) + return nil; + + // TikZ draws regular polygons using a radius inscribed + // _inside_ the shape (touching middles of edges), not + // outside (touching points) + const float innerRadius = 0.2f; + + NSMutableArray *nodes = [NSMutableArray arrayWithCapacity:sides]; + NSMutableArray *edges = [NSMutableArray arrayWithCapacity:sides]; + + float dtheta = (M_PI * 2.0f) / ((float)sides); + float theta = (dtheta/2.0f) - (M_PI / 2.0f); + theta += degreesToRadians(rotation); + // radius of the outer circle + float radius = ABS(innerRadius / cos(dtheta)); + + for (int i = 0; i < sides; ++i) { + NSPoint p; + p.x = radius * cos(theta); + p.y = radius * sin(theta); + + [nodes addObject:[Node nodeWithPoint:p]]; + theta += dtheta; + } + + for (int i = 0; i < sides; ++i) { + [edges addObject:[Edge edgeWithSource:[nodes objectAtIndex:i] + andTarget:[nodes objectAtIndex:(i+1)%sides]]]; + } + + paths = [[NSSet alloc] initWithObjects:edges,nil]; + + styleTikz = [[NSString alloc] initWithFormat: + @"regular polygon,regular polygon sides=%d,shape border rotate=%d", + sides, rotation]; + + return self; +} + +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/RenderContext.h b/tikzit-old/src/common/RenderContext.h new file mode 100644 index 0000000..8633944 --- /dev/null +++ b/tikzit-old/src/common/RenderContext.h @@ -0,0 +1,156 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import +#import "RColor.h" + +typedef enum { + AntialiasDisabled, + AntialiasDefault +} AntialiasMode; + +// encapsulates a CTLine on OSX and +// a PangoLayout in GTK+ +@protocol TextLayout +@property (readonly) NSSize size; +@property (readonly) NSString *text; +- (void) showTextAt:(NSPoint)topLeft withColor:(RColor)color; +@end + +@protocol RenderContext +- (void) saveState; +- (void) restoreState; + +- (NSRect) clipBoundingBox; +- (BOOL) strokeIncludesPoint:(NSPoint)p; +- (BOOL) fillIncludesPoint:(NSPoint)p; +- (id) layoutText:(NSString*)text withSize:(CGFloat)fontSize; + +// this may not affect text rendering +- (void) setAntialiasMode:(AntialiasMode)mode; +- (void) setLineWidth:(CGFloat)width; +// setting to 0 will unset the dash +- (void) setLineDash:(CGFloat)dashLength; + +/** + * Clear the current path, including all subpaths + */ +- (void) startPath; +/** + * Close the current subpath + */ +- (void) closeSubPath; +/** + * Start a new subpath, and set the current point. + * + * The point will be the current point and the starting point + * for the subpath. + */ +- (void) moveTo:(NSPoint)p; +/** + * Add a cubic bezier curve to the current subpath. + * + * The curve will start at the current point, terminate at end and + * be defined by cp1 and cp2. + */ +- (void) curveTo:(NSPoint)end withCp1:(NSPoint)cp1 andCp2:(NSPoint)cp2; +/** + * Add a straight line to the current subpath. + * + * The line will start at the current point, and terminate at end. + */ +- (void) lineTo:(NSPoint)end; +/** + * Add a new rectangular subpath. + * + * The current point is undefined after this call. + */ +- (void) rect:(NSRect)rect; +/** + * Add a new circular subpath. + * + * The current point is undefined after this call. + */ +- (void) circleAt:(NSPoint)c withRadius:(CGFloat)r; + +/** + * Paint along the current path. + * + * The current line width and dash style will be used, + * and the colour is given by color. + * + * The path will be cleared by this call, as though + * startPath had been called. + */ +- (void) strokePathWithColor:(RColor)color; +/** + * Paint inside the current path. + * + * The fill colour is given by color. + * + * The path will be cleared by this call, as though + * startPath had been called. + */ +- (void) fillPathWithColor:(RColor)color; +/** + * Paint along and inside the current path. + * + * The current line width and dash style will be used, + * and the colour is given by color. + * + * The path will be cleared by this call, as though + * startPath had been called. + * + * Note that the fill and stroke may overlap, although + * the stroke is always painted on top, so this is only + * relevant when the stroke colour has an alpha channel + * other than 1.0f. + */ +- (void) strokePathWithColor:(RColor)scolor + andFillWithColor:(RColor)fcolor; +/** + * Paint along and inside the current path using an alpha channel. + * + * The current line width and dash style will be used, + * and the colour is given by color. + * + * The path will be cleared by this call, as though + * startPath had been called. + * + * Note that the fill and stroke may overlap, although + * the stroke is always painted on top, so this is only + * relevant when the stroke colour has an alpha channel + * other than 1.0f. + */ +- (void) strokePathWithColor:(RColor)scolor + andFillWithColor:(RColor)fcolor + usingAlpha:(CGFloat)alpha; +/** + * Set the clip to the current path. + * + * The path will be cleared by this call, as though + * startPath had been called. + */ +- (void) clipToPath; + +/** + * Paint everywhere within the clip. + */ +- (void) paintWithColor:(RColor)color; +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/Shape.h b/tikzit-old/src/common/Shape.h new file mode 100644 index 0000000..b401a87 --- /dev/null +++ b/tikzit-old/src/common/Shape.h @@ -0,0 +1,49 @@ +// +// Shape.h +// TikZiT +// +// Copyright 2011 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import "Transformer.h" + +@interface Shape : NSObject { + NSSet *paths; + NSRect boundingRect; // cache + NSString *styleTikz; +} + +@property (retain) NSSet *paths; +@property (readonly) NSRect boundingRect; +/** + * The tikz code to use in style properties for this shape + * + * This can return nil, in which case the shape name should be used + */ +@property (retain) NSString *styleTikz; + +- (id)init; ++ (void)refreshShapeDictionary; ++ (NSDictionary*)shapeDictionary; ++ (Shape*)shapeForName:(NSString*)shapeName; + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/Shape.m b/tikzit-old/src/common/Shape.m new file mode 100644 index 0000000..e887688 --- /dev/null +++ b/tikzit-old/src/common/Shape.m @@ -0,0 +1,171 @@ +// +// Shape.m +// TikZiT +// +// Copyright 2011 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "Shape.h" + +#import "Edge.h" +#import "SupportDir.h" +#import "ShapeNames.h" + +#import "CircleShape.h" +#import "DiamondShape.h" +#import "RectangleShape.h" +#import "RegularPolyShape.h" +#import "TikzShape.h" + +#import "util.h" + +@implementation Shape + +- (void)calcBoundingRect { + boundingRect = NSZeroRect; + + if (paths == nil) + return; + + for (NSArray *arr in paths) { + for (Edge *e in arr) { + boundingRect = NSUnionRect(boundingRect, [e boundingRect]); + } + } +} + +- (id)init { + self = [super init]; + if (self) { + paths = nil; + } + return self; +} + +- (NSSet*)paths {return paths;} +- (void)setPaths:(NSSet *)p { + if (paths != p) { +#if __has_feature(objc_arc) + paths = p; +#else + [paths release]; + paths = [p retain]; +#endif + [self calcBoundingRect]; + } +} + +- (NSRect)boundingRect { return boundingRect; } + +@synthesize styleTikz; + +- (id)copyWithZone:(NSZone*)zone { + Shape *cp = [[[self class] allocWithZone:zone] init]; + [cp setPaths:paths]; + [cp setStyleTikz:styleTikz]; + return cp; +} + +- (void)dealloc { +#if ! __has_feature(objc_arc) + [paths release]; + [styleTikz release]; + [super dealloc]; +#endif +} + +NSDictionary *shapeDictionary = nil; + ++ (void)addShapesInDir:(NSString*)shapeDir to:(NSMutableDictionary*)shapeDict { + NSFileManager *fileManager = [NSFileManager defaultManager]; + NSError *err = nil; + NSArray *files = [fileManager contentsOfDirectoryAtPath:shapeDir error:&err]; + + if (files != nil) { + NSString *nm; + for (NSString *f in files) { + if ([f hasSuffix:@".tikz"]) { + nm = [f substringToIndex:[f length]-5]; + TikzShape *sh = + [[TikzShape alloc] initWithTikzFile: + [shapeDir stringByAppendingPathComponent:f]]; + if (sh != nil) { + [shapeDict setObject:sh forKey:nm]; +#if ! __has_feature(objc_arc) + [sh release]; +#endif + } + } + } + } +} + ++ (void)refreshShapeDictionary { + Shape *shapes[5] = { + [[CircleShape alloc] init], + [[RectangleShape alloc] init], + [[DiamondShape alloc] init], + [[RegularPolyShape alloc] initWithSides:3 rotation:0], + [[RegularPolyShape alloc] initWithSides:3 rotation:180]}; + NSMutableDictionary *shapeDict = [[NSMutableDictionary alloc] initWithObjectsAndKeys: + shapes[0], SHAPE_CIRCLE, + shapes[1], SHAPE_RECTANGLE, + shapes[2], SHAPE_DIAMOND, + shapes[3], SHAPE_UP_TRIANGLE, + shapes[4], SHAPE_DOWN_TRIANGLE, + nil]; +#if ! __has_feature(objc_arc) + for (int i = 0; i<5; ++i) [shapes[i] release]; +#endif + + NSString *systemShapeDir = [[SupportDir systemSupportDir] stringByAppendingPathComponent:@"shapes"]; + NSString *userShapeDir = [[SupportDir userSupportDir] stringByAppendingPathComponent:@"shapes"]; + + [Shape addShapesInDir:systemShapeDir to:shapeDict]; + [Shape addShapesInDir:userShapeDir to:shapeDict]; + + NSDictionary *oldShapeDictionary = shapeDictionary; + shapeDictionary = shapeDict; + + [[NSNotificationCenter defaultCenter] + postNotificationName:@"ShapeDictionaryReplaced" + object:self]; + +#if ! __has_feature(objc_arc) + [oldShapeDictionary release]; +#endif +} + ++ (NSDictionary*)shapeDictionary { + if (shapeDictionary == nil) [Shape refreshShapeDictionary]; + return shapeDictionary; +} + ++ (Shape*)shapeForName:(NSString*)shapeName { + Shape *s = [[[self shapeDictionary] objectForKey:shapeName] copy]; +#if __has_feature(objc_arc) + return s; +#else + return [s autorelease]; +#endif +} + +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/ShapeNames.h b/tikzit-old/src/common/ShapeNames.h new file mode 100644 index 0000000..66ecfb1 --- /dev/null +++ b/tikzit-old/src/common/ShapeNames.h @@ -0,0 +1,27 @@ +// +// ShapeNames.h +// TikZiT +// +// Copyright 2011 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// + +#define SHAPE_CIRCLE @"circle" +#define SHAPE_RECTANGLE @"rectangle" +#define SHAPE_UP_TRIANGLE @"up triangle" +#define SHAPE_DOWN_TRIANGLE @"down triangle" +#define SHAPE_DIAMOND @"diamond" + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/StyleManager.h b/tikzit-old/src/common/StyleManager.h new file mode 100644 index 0000000..bc920e7 --- /dev/null +++ b/tikzit-old/src/common/StyleManager.h @@ -0,0 +1,49 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import +#import "NodeStyle.h" +#import "EdgeStyle.h" + +@interface StyleManager: NSObject { + NSMutableArray *nodeStyles; + NSMutableArray *edgeStyles; +} + ++ (StyleManager*) manager; +- (id) init; + +@property (readonly) NSArray *nodeStyles; +@property (readonly) NSArray *edgeStyles; + +// only for use by loading code +- (void) _setNodeStyles:(NSMutableArray*)styles; +- (void) _setEdgeStyles:(NSMutableArray*)styles; + +- (NodeStyle*) nodeStyleForName:(NSString*)name; +- (EdgeStyle*) edgeStyleForName:(NSString*)name; + +- (void) addNodeStyle:(NodeStyle*)style; +- (void) removeNodeStyle:(NodeStyle*)style; +- (void) addEdgeStyle:(EdgeStyle*)style; +- (void) removeEdgeStyle:(EdgeStyle*)style; + +- (void) updateFromManager:(StyleManager*)manager; + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/StyleManager.m b/tikzit-old/src/common/StyleManager.m new file mode 100644 index 0000000..05c6c86 --- /dev/null +++ b/tikzit-old/src/common/StyleManager.m @@ -0,0 +1,378 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "StyleManager.h" + +@implementation StyleManager + +- (void) nodeStylePropertyChanged:(NSNotification*)n { + if ([[[n userInfo] objectForKey:@"propertyName"] isEqual:@"name"]) { + NSDictionary *userInfo; + userInfo = [NSDictionary dictionaryWithObjectsAndKeys: + [n object], @"style", + [[n userInfo] objectForKey:@"oldValue"], @"oldName", + nil]; + [[NSNotificationCenter defaultCenter] postNotificationName:@"NodeStyleRenamed" + object:self + userInfo:userInfo]; + } +} + +- (void) ignoreAllNodeStyles { + [[NSNotificationCenter defaultCenter] + removeObserver:self + name:@"NodeStylePropertyChanged" + object:nil]; +} + +- (void) ignoreNodeStyle:(NodeStyle*)style { + [[NSNotificationCenter defaultCenter] + removeObserver:self + name:@"NodeStylePropertyChanged" + object:style]; +} + +- (void) listenToNodeStyle:(NodeStyle*)style { + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(nodeStylePropertyChanged:) + name:@"NodeStylePropertyChanged" + object:style]; +} + +- (void) edgeStylePropertyChanged:(NSNotification*)n { + if ([[[n userInfo] objectForKey:@"propertyName"] isEqual:@"name"]) { + NSDictionary *userInfo; + userInfo = [NSDictionary dictionaryWithObjectsAndKeys: + [n object], @"style", + [[n userInfo] objectForKey:@"oldValue"], @"oldName", + nil]; + [[NSNotificationCenter defaultCenter] postNotificationName:@"EdgeStyleRenamed" + object:self + userInfo:userInfo]; + } +} + +- (void) ignoreAllEdgeStyles { + [[NSNotificationCenter defaultCenter] + removeObserver:self + name:@"EdgeStylePropertyChanged" + object:nil]; +} + +- (void) ignoreEdgeStyle:(EdgeStyle*)style { + [[NSNotificationCenter defaultCenter] + removeObserver:self + name:@"EdgeStylePropertyChanged" + object:style]; +} + +- (void) listenToEdgeStyle:(EdgeStyle*)style { + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(edgeStylePropertyChanged:) + name:@"EdgeStylePropertyChanged" + object:style]; +} + ++ (StyleManager*) manager { +#if __has_feature(objc_arc) + return [[self alloc] init]; +#else + return [[[self alloc] init] autorelease]; +#endif +} + +- (id) init { + self = [super init]; + + if (self) { + // we lazily load the default styles, since they may not be needed + nodeStyles = nil; + edgeStyles = nil; + } + + return self; +} + +- (void) dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; +#if ! __has_feature(objc_arc) + [nodeStyles release]; + [edgeStyles release]; + + [super dealloc]; +#endif +} + +- (void) loadDefaultEdgeStyles { +#if ! __has_feature(objc_arc) + [edgeStyles release]; +#endif + edgeStyles = [[NSMutableArray alloc] initWithCapacity:3]; + + EdgeStyle *simple = [EdgeStyle defaultEdgeStyleWithName:@"simple"]; + [simple setThickness:2.0f]; + [self listenToEdgeStyle:simple]; + + EdgeStyle *arrow = [EdgeStyle defaultEdgeStyleWithName:@"arrow"]; + [arrow setThickness:2.0f]; + [arrow setDecorationStyle:ED_Arrow]; + [self listenToEdgeStyle:arrow]; + + EdgeStyle *tick = [EdgeStyle defaultEdgeStyleWithName:@"tick"]; + [tick setThickness:2.0f]; + [tick setDecorationStyle:ED_Tick]; + [self listenToEdgeStyle:tick]; + + [edgeStyles addObject:simple]; + [edgeStyles addObject:arrow]; + [edgeStyles addObject:tick]; +} + +- (void) loadDefaultNodeStyles { +#if ! __has_feature(objc_arc) + [nodeStyles release]; +#endif + nodeStyles = [[NSMutableArray alloc] initWithCapacity:3]; + + NodeStyle *rn = [NodeStyle defaultNodeStyleWithName:@"rn"]; + [rn setStrokeThickness:2]; + [rn setStrokeColorRGB:[ColorRGB colorWithFloatRed:0 green:0 blue:0]]; + [rn setFillColorRGB:[ColorRGB colorWithFloatRed:1 green:0 blue:0]]; + [self listenToNodeStyle:rn]; + + NodeStyle *gn = [NodeStyle defaultNodeStyleWithName:@"gn"]; + [gn setStrokeThickness:2]; + [gn setStrokeColorRGB:[ColorRGB colorWithFloatRed:0 green:0 blue:0]]; + [gn setFillColorRGB:[ColorRGB colorWithFloatRed:0 green:1 blue:0]]; + [self listenToNodeStyle:gn]; + + NodeStyle *yn = [NodeStyle defaultNodeStyleWithName:@"yn"]; + [yn setStrokeThickness:2]; + [yn setStrokeColorRGB:[ColorRGB colorWithFloatRed:0 green:0 blue:0]]; + [yn setFillColorRGB:[ColorRGB colorWithFloatRed:1 green:1 blue:0]]; + [self listenToNodeStyle:yn]; + + [nodeStyles addObject:rn]; + [nodeStyles addObject:gn]; + [nodeStyles addObject:yn]; +} + +- (void) postNodeStyleAdded:(NodeStyle*)style { + [[NSNotificationCenter defaultCenter] postNotificationName:@"NodeStyleAdded" + object:self + userInfo:[NSDictionary dictionaryWithObject:style forKey:@"style"]]; +} + +- (void) postNodeStyleRemoved:(NodeStyle*)style { + [[NSNotificationCenter defaultCenter] postNotificationName:@"NodeStyleRemoved" + object:self + userInfo:[NSDictionary dictionaryWithObject:style forKey:@"style"]]; +} + +- (void) postEdgeStyleAdded:(EdgeStyle*)style { + [[NSNotificationCenter defaultCenter] postNotificationName:@"EdgeStyleAdded" + object:self + userInfo:[NSDictionary dictionaryWithObject:style forKey:@"style"]]; +} + +- (void) postEdgeStyleRemoved:(EdgeStyle*)style { + [[NSNotificationCenter defaultCenter] postNotificationName:@"EdgeStyleRemoved" + object:self + userInfo:[NSDictionary dictionaryWithObject:style forKey:@"style"]]; +} + +- (void) postNodeStylesReplaced { + [[NSNotificationCenter defaultCenter] postNotificationName:@"NodeStylesReplaced" object:self]; +} + +- (void) postEdgeStylesReplaced { + [[NSNotificationCenter defaultCenter] postNotificationName:@"EdgeStylesReplaced" object:self]; +} + +- (NSArray*) nodeStyles { + if (nodeStyles == nil) { + [self loadDefaultNodeStyles]; + } + return nodeStyles; +} + +- (NSArray*) edgeStyles { + if (edgeStyles == nil) { + [self loadDefaultEdgeStyles]; + } + return edgeStyles; +} + +- (void) _setNodeStyles:(NSMutableArray*)styles { + [self ignoreAllNodeStyles]; +#if ! __has_feature(objc_arc) + [nodeStyles release]; + [styles retain]; +#endif + nodeStyles = styles; + for (NodeStyle *style in styles) { + [self listenToNodeStyle:style]; + } + [self postNodeStylesReplaced]; +} + +- (void) _setEdgeStyles:(NSMutableArray*)styles { + [self ignoreAllEdgeStyles]; +#if ! __has_feature(objc_arc) + [edgeStyles release]; + [styles retain]; +#endif + edgeStyles = styles; + for (EdgeStyle *style in styles) { + [self listenToEdgeStyle:style]; + } + [self postEdgeStylesReplaced]; +} + +- (NodeStyle*) nodeStyleForName:(NSString*)name { + for (NodeStyle *s in nodeStyles) { + if ([[s name] isEqualToString:name]) { + return s; + } + } + + return nil; +} + +- (void) addNodeStyle:(NodeStyle*)style { + if (nodeStyles == nil) { + [self loadDefaultNodeStyles]; + } + [nodeStyles addObject:style]; + [self listenToNodeStyle:style]; + [self postNodeStyleAdded:style]; +} + +- (void) removeNodeStyle:(NodeStyle*)style { + if (nodeStyles == nil) { + [self loadDefaultNodeStyles]; + } + + [self ignoreNodeStyle:style]; +#if ! __has_feature(objc_arc) + [style retain]; +#endif + [nodeStyles removeObject:style]; + [self postNodeStyleRemoved:style]; +#if ! __has_feature(objc_arc) + [style release]; +#endif +} + +- (EdgeStyle*) edgeStyleForName:(NSString*)name { + for (EdgeStyle *s in edgeStyles) { + if ([[s name] isEqualToString:name]) { + return s; + } + } + + return nil; +} + +- (void) addEdgeStyle:(EdgeStyle*)style { + if (edgeStyles == nil) { + [self loadDefaultEdgeStyles]; + } + [edgeStyles addObject:style]; + [self listenToEdgeStyle:style]; + [self postEdgeStyleAdded:style]; +} + +- (void) removeEdgeStyle:(EdgeStyle*)style { + if (edgeStyles == nil) { + [self loadDefaultEdgeStyles]; + } + + [self ignoreEdgeStyle:style]; +#if ! __has_feature(objc_arc) + [style retain]; +#endif + [edgeStyles removeObject:style]; + [self postEdgeStyleRemoved:style]; +#if ! __has_feature(objc_arc) + [style release]; +#endif +} + +- (void) updateFromManager:(StyleManager*)m { + NSMutableArray *ns = [NSMutableArray arrayWithCapacity:[[m nodeStyles] count]]; + for (NodeStyle *style in [m nodeStyles]) { + NodeStyle *currentStyle = [self nodeStyleForName:[style name]]; + if (currentStyle != nil) { + [currentStyle updateFromStyle:style]; + [ns addObject:currentStyle]; + } else { +#if __has_feature(objc_arc) + [ns addObject:[style copy]]; +#else + [ns addObject:[[style copy] autorelease]]; +#endif + } + } + NSMutableArray *es = [NSMutableArray arrayWithCapacity:[[m edgeStyles] count]]; + for (EdgeStyle *style in [m edgeStyles]) { + EdgeStyle *currentStyle = [self edgeStyleForName:[style name]]; + if (currentStyle != nil) { + [currentStyle updateFromStyle:style]; + [es addObject:currentStyle]; + } else { +#if __has_feature(objc_arc) + [es addObject:[style copy]]; +#else + [es addObject:[[style copy] autorelease]]; +#endif + } + } + [self _setNodeStyles:ns]; + [self _setEdgeStyles:es]; +} + +- (id) copyWithZone:(NSZone*)zone { + StyleManager *m = [[StyleManager allocWithZone:zone] init]; + + NSMutableArray *ns = [NSMutableArray arrayWithCapacity:[nodeStyles count]]; + for (NodeStyle *style in nodeStyles) { +#if __has_feature(objc_arc) + [ns addObject:[style copyWithZone:zone]]; +#else + [ns addObject:[[style copyWithZone:zone] autorelease]]; +#endif + } + NSMutableArray *es = [NSMutableArray arrayWithCapacity:[edgeStyles count]]; + for (EdgeStyle *style in edgeStyles) { +#if __has_feature(objc_arc) + [es addObject:[style copyWithZone:zone]]; +#else + [es addObject:[[style copyWithZone:zone] autorelease]]; +#endif + } + [m _setNodeStyles:ns]; + [m _setEdgeStyles:es]; + + return m; +} + +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/SupportDir.h b/tikzit-old/src/common/SupportDir.h new file mode 100644 index 0000000..30ccbcb --- /dev/null +++ b/tikzit-old/src/common/SupportDir.h @@ -0,0 +1,36 @@ +// +// SupportDir.h +// TikZiT +// +// Copyright 2011 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import + + +@interface SupportDir : NSObject { +} + ++ (void)createUserSupportDir; ++ (NSString*)userSupportDir; ++ (NSString*)systemSupportDir; + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/SupportDir.m b/tikzit-old/src/common/SupportDir.m new file mode 100644 index 0000000..22fed1b --- /dev/null +++ b/tikzit-old/src/common/SupportDir.m @@ -0,0 +1,65 @@ +// +// SupportDir.m +// TikZiT +// +// Copyright 2011 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "SupportDir.h" + +#ifndef __APPLE__ +#import +#import "stat.h" +#endif + +@implementation SupportDir + ++ (NSString*)userSupportDir { +#ifdef __APPLE__ + return [[NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory,NSUserDomainMask,YES) + objectAtIndex:0] stringByAppendingPathComponent:@"TikZiT"]; +#else + return [NSString stringWithFormat:@"%s/tikzit", g_get_user_config_dir ()]; +#endif +} + ++ (NSString*)systemSupportDir { +#ifdef __APPLE__ + return [[NSBundle mainBundle] resourcePath]; +#else + return @TIKZITSHAREDIR; +#endif +} + ++ (void)createUserSupportDir { +#ifdef __APPLE__ + NSFileManager *fileManager = [NSFileManager defaultManager]; + [fileManager createDirectoryAtPath:[SupportDir userSupportDir] + withIntermediateDirectories:YES + attributes:nil + error:NULL]; +#else + // NSFileManager is slightly dodgy on Windows + g_mkdir_with_parents ([[SupportDir userSupportDir] UTF8String], S_IRUSR | S_IWUSR | S_IXUSR); +#endif +} + +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/TikzGraphAssembler+Parser.h b/tikzit-old/src/common/TikzGraphAssembler+Parser.h new file mode 100644 index 0000000..c9391a9 --- /dev/null +++ b/tikzit-old/src/common/TikzGraphAssembler+Parser.h @@ -0,0 +1,36 @@ +/* + * Copyright 2013 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * TikzGraphAssember+Parser.h + * + * This file exposes some TikzGraphAssembler functions + * that are only of use to the parser. + */ + +#import "TikzGraphAssembler.h" + +@interface TikzGraphAssembler (Parser) +- (Graph*) graph; +/** Store a node so that it can be looked up by name later */ +- (void) addNodeToMap:(Node*)n; +/** Get a previously-stored node by name */ +- (Node*) nodeWithName:(NSString*)name; +- (void) reportError:(const char *)message atLocation:(YYLTYPE*)yylloc; +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/TikzGraphAssembler.h b/tikzit-old/src/common/TikzGraphAssembler.h new file mode 100644 index 0000000..3403969 --- /dev/null +++ b/tikzit-old/src/common/TikzGraphAssembler.h @@ -0,0 +1,115 @@ +// +// TikzGraphAssembler.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import "Graph.h" + +/** + * Parses (a subset of) tikz code and produces the corresponding Graph + * + * A note on errors: + * If parsing fails and a non-NULL error argument is given, it will be + * populated with an error with domain TZErrorDomain and code TZ_ERR_PARSE + * (see NSError+Tikzit.h). + * + * This will have a description set, typically something like + * "syntax error, unexpected [, expecting (" + * It may also have the following keys (it will have all or none of these), + * where numbers are stored using NSNumber: + * - startLine: the line (starting at 1) containing the first character + * of the bad token + * - startColumn: the column (starting at 1; tabs count for 1) of the first + * character of the bad token + * - endLine: the line (starting at 1) containing the last character + * of the bad token + * - endColumn: the column (starting at 1; tabs count for 1) of the last + * character of the bad token + * - syntaxString: an excerpt of the input string (typically the contents + * from startLine to endLine) providing some context + * - tokenOffset: the character offset (starting at 0) of the bad token + * within syntaxString + * - tokenLength: the character length (including newlines) of the bad token + * within syntaxString + */ +@interface TikzGraphAssembler : NSObject { + const char *tikzStr; + Graph *graph; + void *scanner; + NSMutableDictionary *nodeMap; + NSError *lastError; +} + +/** + * Parse tikz and place the result in gr + * + * Note that the graph must be empty; this might be used from an init + * method, for example, although don't forget that you can return a + * different object in init methods, providing you get the allocation + * right. + * + * @param tikz the tikz string to parse + * @param gr the graph to store the result in (must be empty, non-nil) + * @param e a location to store an error if parsing fails (may be NULL) + * @return YES if parsing succeeded, NO otherwise + */ ++ (BOOL) parseTikz:(NSString*)tikz forGraph:(Graph*)gr error:(NSError**)e; +/** + * Overload for -[parseTikz:forGraph:error:] with the error set to NULL + */ ++ (BOOL) parseTikz:(NSString*)tikz forGraph:(Graph*)gr; +/** + * Parse tikz + * + * @param tikz the tikz string to parse + * @param e a location to store an error if parsing fails (may be NULL) + * @return a Graph object if parsing succeeded, nil otherwise + */ ++ (Graph*) parseTikz:(NSString*)tikz error:(NSError**)e; +/** + * Overload for -[parseTikz:error:] with the error set to NULL + */ ++ (Graph*) parseTikz:(NSString*)tikz; +/** + * Validate a property string or value + * + * Wraps the string in "{" and "}" and checks it lexes completely; in other + * words, makes sure that "{" and "}" are balanced (ignoring escaped versions). + * @param tikz the string to validate + * @return YES if the string can be used as a property name or value, NO + * otherwise + */ ++ (BOOL)validateTikzPropertyNameOrValue:(NSString*)tikz; + +/** + * Validate an edge anchor + * + * Checks that the given string will successfully lex if used as an anchor for + * and edge + * @param tikz the string to validate + * @return YES if the string can be used as an edge anchor, NO otherwise + */ ++ (BOOL)validateTikzEdgeAnchor:(NSString*)tikz; + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/TikzGraphAssembler.m b/tikzit-old/src/common/TikzGraphAssembler.m new file mode 100644 index 0000000..c5d2811 --- /dev/null +++ b/tikzit-old/src/common/TikzGraphAssembler.m @@ -0,0 +1,310 @@ +// +// TikzGraphAssembler.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "TikzGraphAssembler.h" +#import "tikzparserdefs.h" +#import "tikzparser.h" +#import "TikzGraphAssembler+Parser.h" +#import "tikzlexer.h" +#import "NSError+Tikzit.h" + +@implementation TikzGraphAssembler + +- (id)init { +#if ! __has_feature(objc_arc) + [self release]; +#endif + return nil; +} + +- (id)initWithGraph:(Graph*)g { + self = [super init]; + if (self) { +#if __has_feature(objc_arc) + graph = g; +#else + graph = [g retain]; +#endif + nodeMap = [[NSMutableDictionary alloc] init]; + yylex_init (&scanner); + yyset_extra(self, scanner); + } + return self; +} + +- (void)dealloc { +#if ! __has_feature(objc_arc) + [graph release]; + [nodeMap release]; + [lastError release]; + yylex_destroy (scanner); + [super dealloc]; +#endif +} + +- (BOOL) parseTikz:(NSString*)t error:(NSError**)error { +#if ! __has_feature(objc_arc) + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; +#endif + + tikzStr = [t UTF8String]; + yy_scan_string(tikzStr, scanner); + int result = yyparse(scanner); + tikzStr = NULL; + +#if ! __has_feature(objc_arc) + [pool drain]; +#endif + + if (result == 0) { + return YES; + } else { + if (error) { + if (lastError) { +#if __has_feature(objc_arc) + *error = lastError; +#else + *error = [[lastError retain] autorelease]; +#endif + } else if (result == 1) { + *error = [NSError errorWithMessage:@"Syntax error" + code:TZ_ERR_PARSE]; + } else if (result == 2) { + *error = [NSError errorWithMessage:@"Insufficient memory" + code:TZ_ERR_PARSE]; + } else { + *error = [NSError errorWithMessage:@"Unknown error" + code:TZ_ERR_PARSE]; + } + } + return NO; + } +} + ++ (BOOL) parseTikz:(NSString*)tikz forGraph:(Graph*)gr { + return [self parseTikz:tikz forGraph:gr error:NULL]; +} ++ (Graph*) parseTikz:(NSString*)tikz error:(NSError**)e { + Graph *gr = [[Graph alloc] init]; + if ([self parseTikz:tikz forGraph:gr error:e]) { +#if __has_feature(objc_arc) + return gr; +#else + return [gr autorelease]; +#endif + } else { +#if ! __has_feature(objc_arc) + [gr release]; +#endif + return nil; + } +} ++ (Graph*) parseTikz:(NSString*)tikz { + return [self parseTikz:tikz error:NULL]; +} + ++ (BOOL) parseTikz:(NSString*)tikz forGraph:(Graph*)gr error:(NSError**)error { + if([tikz length] == 0) { + // empty string -> empty graph + return YES; + } + + TikzGraphAssembler *assembler = [[self alloc] initWithGraph:gr]; + BOOL success = [assembler parseTikz:tikz error:error]; +#if ! __has_feature(objc_arc) + [assembler release]; +#endif + return success; +} + ++ (BOOL)validateTikzPropertyNameOrValue:(NSString*)tikz { + BOOL valid; + + NSString * testTikz = [NSString stringWithFormat: @"{%@}", tikz]; + + void *scanner; + yylex_init (&scanner); + yyset_extra(nil, scanner); + yy_scan_string([testTikz UTF8String], scanner); + YYSTYPE lval; + YYLTYPE lloc; + int result = yylex(&lval, &lloc, scanner); + valid = (result == DELIMITEDSTRING) && + (yyget_leng(scanner) == [testTikz length]); + yylex_destroy(scanner); + + return valid; +} + ++ (BOOL)validateTikzEdgeAnchor:(NSString*)tikz { + if ([tikz length] == 0) + return YES; + + BOOL valid = YES; + + NSString * testTikz = [NSString stringWithFormat: @"(1.%@)", tikz]; + + void *scanner; + yylex_init (&scanner); + yyset_extra(nil, scanner); + yy_scan_string([testTikz UTF8String], scanner); + YYSTYPE lval; + YYLTYPE lloc; + valid = valid && (yylex(&lval, &lloc, scanner) == LEFTPARENTHESIS); + valid = valid && (yylex(&lval, &lloc, scanner) == REFSTRING); + valid = valid && (yylex(&lval, &lloc, scanner) == FULLSTOP); + valid = valid && (yylex(&lval, &lloc, scanner) == REFSTRING); + valid = valid && (yylex(&lval, &lloc, scanner) == RIGHTPARENTHESIS); + valid = valid && (lloc.last_column == [testTikz length]); + yylex_destroy(scanner); + + return valid; +} + +@end + +@implementation TikzGraphAssembler (Parser) +- (Graph*)graph { return graph; } + +- (void)addNodeToMap:(Node*)n { + [nodeMap setObject:n forKey:[n name]]; +} + +- (Node*)nodeWithName:(NSString*)name { + return [nodeMap objectForKey:name]; +} + +- (void) setLastError:(NSError*)error { +#if ! __has_feature(objc_arc) + [error retain]; + [lastError release]; +#endif + lastError = error; +} + +- (void) reportError:(const char *)message atLocation:(YYLTYPE*)yylloc { + NSString *nsmsg = [NSString stringWithUTF8String:message]; + + const char *first_line_start = find_start_of_nth_line ( + tikzStr, yylloc->first_line - 1); + const char *last_line_start = find_start_of_nth_line ( + first_line_start, yylloc->last_line - yylloc->first_line); + const char *last_line_end = last_line_start; + while (*last_line_end && *last_line_end != '\n') { + // points to just after end of last line + ++last_line_end; + } + + size_t context_len = last_line_end - first_line_start; + size_t token_offset = yylloc->first_column - 1; + size_t token_len = ((last_line_start - first_line_start) + yylloc->last_column) - token_offset; + + if (token_offset + token_len > context_len) { + // error position state is corrupted + NSLog(@"Got bad error state for error \"%s\": start(%i,%i), end(%i,%i)", + message, + yylloc->first_line, + yylloc->first_column, + yylloc->last_line, + yylloc->last_column); + [self setLastError:[NSError errorWithMessage:nsmsg + code:TZ_ERR_PARSE]]; + } else { + char *context = malloc (context_len + 1); + strncpy (context, first_line_start, context_len); + *(context + context_len) = '\0'; + + NSDictionary *userInfo = + [NSDictionary dictionaryWithObjectsAndKeys: + nsmsg, + NSLocalizedDescriptionKey, + [NSNumber numberWithInt:yylloc->first_line], + @"startLine", + [NSNumber numberWithInt:yylloc->first_column], + @"startColumn", + [NSNumber numberWithInt:yylloc->last_line], + @"endLine", + [NSNumber numberWithInt:yylloc->last_column], + @"endColumn", + [NSString stringWithUTF8String:context], + @"syntaxString", + [NSNumber numberWithInt:token_offset], + @"tokenStart", + [NSNumber numberWithInt:token_len], + @"tokenLength", + nil]; + [self setLastError: + [NSError errorWithDomain:TZErrorDomain + code:TZ_ERR_PARSE + userInfo:userInfo]]; + + // we can now freely edit context string + // we only bother printing out the first line + if (yylloc->last_line > yylloc->first_line) { + char *nlp = strchr(context, '\n'); + if (nlp) { + *nlp = '\0'; + context_len = nlp - context; + NSAssert2(token_offset < context_len, @"token_offset (%lu) < context_len (%lu)", token_offset, context_len); + if (token_offset + token_len > context_len) { + token_len = context_len - token_offset; + } + } else { + NSLog(@"Didn't find any newlines in context string!"); + } + } + size_t token_col_offset = 0; + size_t token_col_len = 0; + for (int i = 0; i < token_offset; ++i) { + if (*(context + i) == '\t') + token_col_offset += 8; + else + ++token_col_offset; + } + for (int i = token_offset; i < token_offset + token_len; ++i) { + if (*(context + i) == '\t') + token_col_len += 8; + else + ++token_col_len; + } + NSString *pointerLinePadding = + [@"" stringByPaddingToLength:token_col_offset + withString:@" " + startingAtIndex:0]; + NSString *pointerLineCarets = + [@"" stringByPaddingToLength:token_col_len + withString:@"^" + startingAtIndex:0]; + NSLog(@"Parse error on line %i, starting at %i: %s\n%s\n%@%@", + yylloc->first_line, + yylloc->first_column, + message, + context, + pointerLinePadding, + pointerLineCarets); + free (context); + } +} +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/TikzShape.h b/tikzit-old/src/common/TikzShape.h new file mode 100644 index 0000000..6a91f91 --- /dev/null +++ b/tikzit-old/src/common/TikzShape.h @@ -0,0 +1,37 @@ +// +// TikzShape.h +// TikZiT +// +// Copyright 2011 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import "Shape.h" + +@interface TikzShape : Shape { + NSString *tikzSrc; +} + +@property (copy) NSString *tikzSrc; + +- (id)initWithTikzFile:(NSString*)file; + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/TikzShape.m b/tikzit-old/src/common/TikzShape.m new file mode 100644 index 0000000..555a7df --- /dev/null +++ b/tikzit-old/src/common/TikzShape.m @@ -0,0 +1,70 @@ +// +// TikzShape.m +// TikZiT +// +// Copyright 2011 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "TikzShape.h" +#import "Graph.h" + +@implementation TikzShape + +@synthesize tikzSrc; + +- (id)initWithTikzFile:(NSString*)file { + self = [super init]; + if (self) { + NSString *tikz = [NSString stringWithContentsOfFile:file + encoding:NSUTF8StringEncoding + error:NULL]; + if (tikz == nil) return nil; + + tikzSrc = [tikz copy]; + + Graph *graph = [Graph graphFromTikz:tikz]; + if (graph == nil) return nil; + + NSRect graphBounds = ([graph hasBoundingBox]) ? [graph boundingBox] : [graph bounds]; + + float sz = 0.5f; + + // the "screen" coordinate space fits in the shape bounds + Transformer *t = [Transformer transformer]; + float width_ratio = (2*sz) / graphBounds.size.width; + float height_ratio = (2*sz) / graphBounds.size.height; + [t setScale:MIN(width_ratio, height_ratio)]; + NSRect bds = [t rectToScreen:graphBounds]; + NSPoint shift = NSMakePoint(-NSMidX(bds), + -NSMidY(bds)); + [t setOrigin:shift]; + [graph applyTransformer:t]; +#if __has_feature(objc_arc) + paths = [graph pathCover]; +#else + paths = [[graph pathCover] retain]; +#endif + } + return self; +} + + +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/Transformer.h b/tikzit-old/src/common/Transformer.h new file mode 100644 index 0000000..1b0108a --- /dev/null +++ b/tikzit-old/src/common/Transformer.h @@ -0,0 +1,154 @@ +// +// Transformer.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + + +#import + +extern float const PIXELS_PER_UNIT; + +/*! + @class Transformer + @brief Do affine coordinate transforms between an abstract co-ordinate + space (such as the graph's) and the screen's. + + This currently allows zooming and panning. + */ +@interface Transformer : NSObject { + NSPoint origin; + float x_scale; + float y_scale; +} + +/*! + @brief The screen co-ordinate of the abstract space origin. + */ +@property (assign) NSPoint origin; + +/*! + @brief The scale (from abstract space to screen space) + @detail This is the size of a single unit (a distance of 1.0) + of the abstract space on the screen. + + Around 50 is a reasonable value. + */ +@property (assign) float scale; + +/*! + @brief Whether co-ordinates are flipped about the X axis + @detail TikZ considers X co-ordinates to run left to right, + which is not necessarily how the screen views + them. + */ +@property (assign,getter=isFlippedAboutXAxis) BOOL flippedAboutXAxis; + +/*! + @brief Whether co-ordinates are flipped about the Y axis + @detail TikZ considers Y co-ordinates to run up the page, + which is not necessarily how the screen views + them. + */ +@property (assign,getter=isFlippedAboutYAxis) BOOL flippedAboutYAxis; + +/*! + @brief Transform a point from screen space to abstract space. + @param p a point in screen space. + @result A point in abstract space. + */ +- (NSPoint)fromScreen:(NSPoint)p; + +/*! + @brief Transform a point from abstract space to screen space. + @param p a point in abstract space. + @result A point in screen space. + */ +- (NSPoint)toScreen:(NSPoint)p; + +/*! + @brief Scale a distance from screen space to abstract space. + @param dist a distance in screen space. + @result A distance in abstract space. + */ +- (float)scaleFromScreen:(float)dist; + +/*! + @brief Scale a distance from abstract space to screen space. + @param dist a distance in abstract space. + @result A distance in screen space. + */ +- (float)scaleToScreen:(float)dist; + +/*! + @brief Scale a rectangle from screen space to abstract space. + @param r a rectangle in screen space. + @result A rectangle in abstract space. + */ +- (NSRect)rectFromScreen:(NSRect)r; + +/*! + @brief Scale a rectangle from abstract space to screen space. + @param r a rectangle in abstract space. + @result A rectangle in screen space. + */ +- (NSRect)rectToScreen:(NSRect)r; + +/*! + @brief Factory method to get an identity transformer. + @result A transformer. + */ ++ (Transformer*)transformer; + +/*! + @brief Factory method to get a transformer identical to another + @result A transformer. + */ ++ (Transformer*)transformerWithTransformer:(Transformer*)t; + +/*! + @brief Factory method to get a transformer. + @param o The screen co-ordinate of the abstract space origin + @param scale The scale (from abstract space to screen space) + @result A transformer. + */ ++ (Transformer*)transformerWithOrigin:(NSPoint)o andScale:(float)scale; + +/*! + @brief Get a global 'actual size' transformer. + @result A transformer. + */ ++ (Transformer*)defaultTransformer; + +/*! + @brief A transformer set up from two bounding rects. + + graphRect is made as large as possible while still fitting into screenRect. + @result A transformer. + */ ++ (Transformer*)transformerToFit:(NSRect)graphRect intoScreenRect:(NSRect)screenRect flippedAboutXAxis:(BOOL)flipX flippedAboutYAxis:(BOOL)flipY; + ++ (Transformer*)transformerToFit:(NSRect)graphRect intoScreenRect:(NSRect)screenRect flippedAboutXAxis:(BOOL)flipX; ++ (Transformer*)transformerToFit:(NSRect)graphRect intoScreenRect:(NSRect)screenRect flippedAboutYAxis:(BOOL)flipY; ++ (Transformer*)transformerToFit:(NSRect)graphRect intoScreenRect:(NSRect)screenRect; + +@end + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/Transformer.m b/tikzit-old/src/common/Transformer.m new file mode 100644 index 0000000..2b56813 --- /dev/null +++ b/tikzit-old/src/common/Transformer.m @@ -0,0 +1,231 @@ +// +// Transformer.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "Transformer.h" + +float const PIXELS_PER_UNIT = 50; + +@implementation Transformer + ++ (Transformer*)transformer { +#if __has_feature(objc_arc) + return [[Transformer alloc] init]; +#else + return [[[Transformer alloc] init] autorelease]; +#endif +} + ++ (Transformer*)transformerWithTransformer:(Transformer*)t { +#if __has_feature(objc_arc) + return [t copy]; +#else + return [[t copy] autorelease]; +#endif +} + ++ (Transformer*)transformerWithOrigin:(NSPoint)o andScale:(float)scale { + Transformer *trans = [self transformer]; + [trans setOrigin:o]; + [trans setScale:scale]; + return trans; +} + ++ (Transformer*)transformerToFit:(NSRect)graphRect + intoScreenRect:(NSRect)screenRect { + return [self transformerToFit:graphRect + intoScreenRect:screenRect + flippedAboutXAxis:NO + flippedAboutYAxis:NO]; +} + ++ (Transformer*)transformerToFit:(NSRect)graphRect + intoScreenRect:(NSRect)screenRect + flippedAboutXAxis:(BOOL)flipX { + return [self transformerToFit:graphRect + intoScreenRect:screenRect + flippedAboutXAxis:flipX + flippedAboutYAxis:NO]; +} + ++ (Transformer*)transformerToFit:(NSRect)graphRect + intoScreenRect:(NSRect)screenRect + flippedAboutYAxis:(BOOL)flipY { + return [self transformerToFit:graphRect + intoScreenRect:screenRect + flippedAboutXAxis:NO + flippedAboutYAxis:flipY]; +} + ++ (Transformer*)transformerToFit:(NSRect)graphRect + intoScreenRect:(NSRect)screenRect + flippedAboutXAxis:(BOOL)flipAboutXAxis + flippedAboutYAxis:(BOOL)flipAboutYAxis { + + const float wscale = screenRect.size.width / graphRect.size.width; + const float hscale = screenRect.size.height / graphRect.size.height; + const float scale = (wscale < hscale) ? wscale : hscale; + const float xpad = (screenRect.size.width - (graphRect.size.width * scale)) / 2.0; + const float ypad = (screenRect.size.height - (graphRect.size.height * scale)) / 2.0; + + // if we are flipping, we need to calculate the origin from the opposite edge + const float gx = flipAboutYAxis ? -(graphRect.size.width + graphRect.origin.x) + : graphRect.origin.x; + const float gy = flipAboutXAxis ? -(graphRect.size.height + graphRect.origin.y) + : graphRect.origin.y; + const float origin_x = screenRect.origin.x - (gx * scale) + xpad; + const float origin_y = screenRect.origin.y - (gy * scale) + ypad; + + Transformer *trans = [self transformer]; + [trans setOrigin:NSMakePoint(origin_x, origin_y)]; + [trans setScale:scale]; + [trans setFlippedAboutXAxis:flipAboutXAxis]; + [trans setFlippedAboutYAxis:flipAboutYAxis]; + return trans; +} + +- (id) init { + self = [super init]; + + if (self) { + origin = NSZeroPoint; + x_scale = 1.0f; + y_scale = 1.0f; + } + + return self; +} + +- (id)copyWithZone:(NSZone *)zone { + Transformer *cp = [[[self class] allocWithZone:zone] init]; + if (cp) { + cp->origin = origin; + cp->x_scale = x_scale; + cp->y_scale = y_scale; + } + return cp; +} + +- (NSPoint)origin { return origin; } +- (void)setOrigin:(NSPoint)o { + origin = o; +} + +- (float)scale { return ABS(x_scale); } +- (void)setScale:(float)s { + x_scale = (x_scale < 0.0) ? -s : s; + y_scale = (y_scale < 0.0) ? -s : s; +} + +- (BOOL)isFlippedAboutXAxis { + return y_scale < 0.0; +} + +- (void)setFlippedAboutXAxis:(BOOL)flip { + if (flip != [self isFlippedAboutXAxis]) { + y_scale *= -1; + } +} + +- (BOOL)isFlippedAboutYAxis { + return x_scale < 0.0; +} + +- (void)setFlippedAboutYAxis:(BOOL)flip { + if (flip != [self isFlippedAboutYAxis]) { + x_scale *= -1; + } +} + +- (NSPoint)fromScreen:(NSPoint)p { + NSPoint trans; + trans.x = (p.x - origin.x) / x_scale; + trans.y = (p.y - origin.y) / y_scale; + return trans; +} + +- (NSPoint)toScreen:(NSPoint)p { + NSPoint trans; + trans.x = (p.x * x_scale) + origin.x; + trans.y = (p.y * y_scale) + origin.y; + return trans; +} + +- (float)scaleFromScreen:(float)dist { + return dist / ABS(x_scale); +} + +- (float)scaleToScreen:(float)dist { + return dist * ABS(x_scale); +} + +- (NSRect)rectFromScreen:(NSRect)r { + NSRect r1; + r1.origin = [self fromScreen:r.origin]; + r1.size.width = [self scaleFromScreen:r.size.width]; + r1.size.height = [self scaleFromScreen:r.size.height]; + // if we're flipped, the origin will be at a different corner + if ([self isFlippedAboutYAxis]) { + r1.origin.x -= r1.size.width; + } + if ([self isFlippedAboutXAxis]) { + r1.origin.y -= r1.size.height; + } + return r1; +} + +- (NSRect)rectToScreen:(NSRect)r { + NSPoint o = r.origin; + // if we're flipped, the origin will be at a different corner + if ([self isFlippedAboutYAxis]) { + o.x = NSMaxX(r); + } + if ([self isFlippedAboutXAxis]) { + o.y = NSMaxY(r); + } + NSRect r1; + r1.origin = [self toScreen:o]; + r1.size.width = [self scaleToScreen:r.size.width]; + r1.size.height = [self scaleToScreen:r.size.height]; + return r1; +} + +- (BOOL)isEqual:(id)object { + Transformer *t = (Transformer*)object; + return ([t origin].x == [self origin].x && + [t origin].y == [self origin].y && + [t scale] == [self scale]); +} + +Transformer *defaultTransformer = nil; + ++ (Transformer*)defaultTransformer { + if (defaultTransformer == nil) { + defaultTransformer = [[Transformer alloc] init]; + [defaultTransformer setScale:PIXELS_PER_UNIT]; + } + return defaultTransformer; +} + +@end + +// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/test/Makefile b/tikzit-old/src/common/test/Makefile new file mode 100644 index 0000000..d158d16 --- /dev/null +++ b/tikzit-old/src/common/test/Makefile @@ -0,0 +1,14 @@ +OBJC = gcc -MMD -MP -DSTAND_ALONE -DGNUSTEP -DGNUSTEP_BASE_LIBRARY=1 -DGNU_RUNTIME=1 -DGNUSTEP_BASE_LIBRARY=1 -fno-strict-aliasing -fPIC -Wall -DGSWARN -DGSDIAGNOSE -Wno-import -O0 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic -fgnu-runtime -fconstant-string-class=NSConstantString -I. -I.. -I/users/alemer/GNUstep/Library/Headers -std=c99 -D_GNU_SOURCE -rdynamic -fgnu-runtime -L/users/alemer/GNUstep/Library/Libraries -L/usr/local/lib64 -L/usr/lib64 -lgnustep-base -lpthread -lobjc -lm + +maths_test_objects = test.m maths.m ../util.m +color_test_objects = test.m color.m ../ColorRGB.m ../util.m ../BasicMapTable.m ../RColor.m + +test: maths-test color-test + ./maths-test + ./color-test + +maths-test: $(maths_test_objects) + $(OBJC) $(maths_test_objects) -o $@ + +color-test: $(color_test_objects) + $(OBJC) $(color_test_objects) -o $@ diff --git a/tikzit-old/src/common/test/color.m b/tikzit-old/src/common/test/color.m new file mode 100644 index 0000000..48a6ff4 --- /dev/null +++ b/tikzit-old/src/common/test/color.m @@ -0,0 +1,80 @@ +// +// color.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// +#import "test/test.h" +#import "ColorRGB.h" + +#ifdef STAND_ALONE +void runTests() { +#else +void testColor() { +#endif + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + startTestBlock(@"color"); + + ColorRGB *red = [ColorRGB colorWithRed:255 green:0 blue:0]; + ColorRGB *lime = [ColorRGB colorWithRed:0 green:255 blue:0]; + ColorRGB *green = [ColorRGB colorWithRed:0 green:128 blue:0]; + TEST(@"Recognised red", + [red name] != nil && + [[red name] isEqualToString:@"Red"]); + TEST(@"Recognised lime", + [lime name] != nil && + [[lime name] isEqualToString:@"Lime"]); + TEST(@"Recognised green", + [green name] != nil && + [[green name] isEqualToString:@"Green"]); + + ColorRGB *floatRed = [ColorRGB colorWithFloatRed:1.0f green:0.0f blue:0.0f]; + ColorRGB *floatLime = [ColorRGB colorWithFloatRed:0.0f green:1.0f blue:0.0f]; + ColorRGB *floatGreen = [ColorRGB colorWithFloatRed:0.0f green:0.5f blue:0.0f]; + + TEST(@"Float red equal to int red", [floatRed isEqual:red]); + TEST(@"Float lime equal to int lime", [floatLime isEqual:lime]); + TEST(@"Float green equal to int green", [floatGreen isEqual:green]); + + TEST(@"Recognised float red", + [floatRed name] != nil && + [[floatRed name] isEqualToString:@"Red"]); + + TEST(@"Recognised float lime", + [floatLime name] != nil && + [[floatLime name] isEqualToString:@"Lime"]); + + TEST(@"Recognised float green", + [floatGreen name] != nil && + [[floatGreen name] isEqualToString:@"Green"]); + + [floatRed setRedFloat:0.99f]; + TEST(@"Nudged red, not recognised now", [floatRed name] == nil); + [floatRed setToClosestHashed]; + TEST(@"Set to closest hashed, reconised again", + [floatRed name] != nil && + [[floatRed name] isEqualToString:@"Red"]); + + TEST(@"Red has correct hex (ff0000)", [[red hexName] isEqualToString:@"hexcolor0xff0000"]); + TEST(@"Lime has correct hex (00ff00)", [[lime hexName] isEqualToString:@"hexcolor0x00ff00"]); + TEST(@"Green has correct hex (008000)", [[green hexName] isEqualToString:@"hexcolor0x008000"]); + + endTestBlock(@"color"); + [pool drain]; +} diff --git a/tikzit-old/src/common/test/common.m b/tikzit-old/src/common/test/common.m new file mode 100644 index 0000000..c9ac980 --- /dev/null +++ b/tikzit-old/src/common/test/common.m @@ -0,0 +1,34 @@ +// +// common.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// +#import "test/test.h" +void testParser(); +void testColor(); +void testMaths(); + +void testCommon() { + startTestBlock(@"common"); + testParser(); + testColor(); + testMaths(); + endTestBlock(@"common"); +} diff --git a/tikzit-old/src/common/test/maths.m b/tikzit-old/src/common/test/maths.m new file mode 100644 index 0000000..a11e58e --- /dev/null +++ b/tikzit-old/src/common/test/maths.m @@ -0,0 +1,562 @@ +// +// TikZiT +// +// Copyright 2011 Alex Merry +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "../util.h" + +#import "test.h" + +void testRectAroundPoints() { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + startTestBlock(@"NSRectAroundPoints"); + + NSRect rect = NSRectAroundPoints (NSZeroPoint, NSZeroPoint); + assertRectsEqual (@"(0,0) and (0,0)", rect, NSZeroRect); + + rect = NSRectAroundPoints (NSZeroPoint, NSMakePoint (1.0f, 1.0f)); + assertRectsEqual (@"(0,0) and (1,1)", rect, NSMakeRect (0.0f, 0.0f, 1.0f, 1.0f)); + + rect = NSRectAroundPoints (NSMakePoint (-1.0f, 1.0f), NSMakePoint (1.0f, -1.0f)); + assertRectsEqual (@"(-1,1) and (1,-1)", rect, NSMakeRect (-1.0f, -1.0f, 2.0f, 2.0f)); + + endTestBlock(@"NSRectAroundPoints"); + [pool drain]; +} + +void testRectAroundPointsWithPadding() { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + startTestBlock(@"NSRectAroundPointsWithPadding"); + + NSRect rect = NSRectAroundPointsWithPadding (NSZeroPoint, NSZeroPoint, 0.0f); + assertRectsEqual (@"(0,0) and (0,0); 0 padding", rect, NSZeroRect); + + rect = NSRectAroundPointsWithPadding (NSZeroPoint, NSZeroPoint, 0.2f); + assertRectsEqual (@"(0,0) and (0,0); 0.2 padding", rect, NSMakeRect (-0.2f, -0.2f, 0.4f, 0.4f)); + + rect = NSRectAroundPointsWithPadding (NSZeroPoint, NSMakePoint (1.0f, 1.0f), -0.2f); + assertRectsEqual (@"(0,0) and (1,1); -0.2 padding", rect, NSMakeRect (0.2f, 0.2f, 0.6f, 0.6f)); + + endTestBlock(@"NSRectAroundPointsWithPadding"); + [pool drain]; +} + +void testGoodAtan() { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + startTestBlock(@"good_atan"); + + assertFloatsEqual (@"0.0, 0.0", good_atan (0.0f, 0.0f), 0.0f); + assertFloatsEqual (@"0.0, 1.0", good_atan (0.0f, 1.0f), 0.5f * M_PI); + assertFloatsEqual (@"0.0, -1.0", good_atan (0.0f, -1.0f), 1.5f * M_PI); + assertFloatsEqual (@"1.0, 0.0", good_atan (1.0f, 0.0f), 0.0f); + assertFloatsEqual (@"1.0, 0.1", good_atan (1.0f, 0.1f), 0.0996687f); + + endTestBlock(@"good_atan"); + [pool drain]; +} + +void testBezierInterpolate() { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + startTestBlock(@"bezierInterpolate"); + + assertFloatsEqual (@"0.0, (0.0, 0.1, 0.2, 0.3)", bezierInterpolate (0.0f, 0.0f, 0.1f, 0.2f, 0.3f), 0.0f); + assertFloatsEqual (@"1.0, (0.0, 0.1, 0.2, 0.3)", bezierInterpolate (1.0f, 0.0f, 0.1f, 0.2f, 0.3f), 0.3f); + assertFloatsEqual (@"0.5, (0.0, 0.1, 0.2, 0.3)", bezierInterpolate (0.5f, 0.0f, 0.1f, 0.2f, 0.3f), 0.15f); + // FIXME: other tests + + endTestBlock(@"bezierInterpolate"); + [pool drain]; +} + +void testLineSegmentsIntersect() { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + startTestBlock(@"lineSegmentsIntersect"); + + BOOL result = NO; + NSPoint intersection = NSMakePoint (-1.0f, -1.0f); + + result = lineSegmentsIntersect (NSMakePoint (-1.0f, -1.0f), NSMakePoint (1.0f, 1.0f), + NSMakePoint (-1.0f, 1.0f), NSMakePoint (1.0f, -1.0f), + &intersection); + TEST (@"Cross at zero: has intersection", result); + assertPointsEqual (@"Cross at zero: intersection value", intersection, NSZeroPoint); + + result = lineSegmentsIntersect (NSMakePoint (-1.0f, -1.0f), NSMakePoint (-0.5f, -0.5f), + NSMakePoint (-1.0f, 1.0f), NSMakePoint (1.0f, -1.0f), + &intersection); + TEST (@"Fail to cross at zero", !result); + + result = lineSegmentsIntersect (NSMakePoint (1.0f, 1.0f), NSMakePoint (1.0f, -1.0f), + NSMakePoint (0.0f, 0.0f), NSMakePoint (1.0f, 0.0f), + &intersection); + TEST (@"Touch at one: has intersection", result); + assertPointsEqual (@"Touch at one: intersection value", intersection, NSMakePoint (1.0f, 0.0f)); + + endTestBlock(@"lineSegmentsIntersect"); + [pool drain]; +} + +void testLineSegmentIntersectsRect() { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + startTestBlock(@"lineSegmentIntersectsRect"); + + BOOL result = NO; + + result = lineSegmentIntersectsRect ( + NSMakePoint (-1.0f, -1.0f), + NSMakePoint (0.0f, 0.0f), + NSZeroRect); + TEST (@"Zero rect; line touches zero", result); + + result = lineSegmentIntersectsRect ( + NSMakePoint (-1.0f, -1.0f), + NSMakePoint (-0.1f, -0.1f), + NSZeroRect); + TEST (@"Zero rect; line short of zero", !result); + + NSRect rect = NSMakeRect (1.0f, 1.0f, 1.0f, 1.0f); + + result = lineSegmentIntersectsRect ( + NSMakePoint (0.0f, 0.0f), + NSMakePoint (3.0f, 1.0f), + rect); + TEST (@"Line underneath", !result); + + result = lineSegmentIntersectsRect ( + NSMakePoint (0.0f, 0.0f), + NSMakePoint (1.0f, 3.0f), + rect); + TEST (@"Line to left", !result); + + result = lineSegmentIntersectsRect ( + NSMakePoint (0.0f, 2.0f), + NSMakePoint (3.0f, 3.0f), + rect); + TEST (@"Line above", !result); + + result = lineSegmentIntersectsRect ( + NSMakePoint (2.0f, 0.0f), + NSMakePoint (3.0f, 3.0f), + rect); + TEST (@"Line to right", !result); + + result = lineSegmentIntersectsRect ( + NSMakePoint (0.0f, 0.0f), + NSMakePoint (0.9f, 0.9f), + rect); + TEST (@"Line short", !result); + + result = lineSegmentIntersectsRect ( + NSMakePoint (1.1f, 1.1f), + NSMakePoint (1.9f, 1.9f), + rect); + TEST (@"Line inside", result); + + result = lineSegmentIntersectsRect ( + NSMakePoint (0.0f, 1.5f), + NSMakePoint (3.0f, 1.5f), + rect); + TEST (@"Horizontal line through", result); + + result = lineSegmentIntersectsRect ( + NSMakePoint (1.5f, 0.0f), + NSMakePoint (1.5f, 3.0f), + rect); + TEST (@"Vertical line through", result); + + result = lineSegmentIntersectsRect ( + NSMakePoint (0.5f, 1.0f), + NSMakePoint (2.0f, 2.5f), + rect); + TEST (@"Cut top and left", result); + + result = lineSegmentIntersectsRect ( + NSMakePoint (2.0f, 0.5f), + NSMakePoint (0.5f, 2.0f), + rect); + TEST (@"Cut bottom and left", result); + + result = lineSegmentIntersectsRect ( + NSMakePoint (1.0f, 0.5f), + NSMakePoint (2.5f, 2.0f), + rect); + TEST (@"Cut bottom and right", result); + + result = lineSegmentIntersectsRect ( + NSMakePoint (0.0f, 1.0f), + NSMakePoint (2.0f, 3.0f), + rect); + TEST (@"Touch top left", result); + + result = lineSegmentIntersectsRect ( + NSMakePoint (1.0f, 0.0f), + NSMakePoint (3.0f, 2.0f), + rect); + TEST (@"Touch bottom right", result); + + result = lineSegmentIntersectsRect ( + NSMakePoint (1.0f, 0.0f), + NSMakePoint (1.0f, 3.0f), + rect); + TEST (@"Along left side", result); + + result = lineSegmentIntersectsRect ( + NSMakePoint (0.0f, 1.0f), + NSMakePoint (3.0f, 1.0f), + rect); + TEST (@"Along bottom side", result); + + endTestBlock(@"lineSegmentIntersectsRect"); + [pool drain]; +} + +struct line_bezier_test { + NSString *msg; + NSPoint lstart; + NSPoint lend; + NSPoint c0; + NSPoint c1; + NSPoint c2; + NSPoint c3; + BOOL expectedResult; + float expectedT; + NSPoint expectedIntersect; +}; + +static struct line_bezier_test line_bezier_tests[] = { + { + @"Outside box", + {0.0f, 0.0f}, + {1.0f, 0.0f}, + {0.0f, 1.0f}, + {0.0f, 2.0f}, + {1.0f, 2.0f}, + {1.0f, 1.0f}, + NO, + -1.0f, + {0.0f, 0.0f} + }, + { + @"Single intersect", + {100.0f, 20.0f}, + {195.0f, 255.0f}, + {93.0f, 163.0f}, + {40.0f, 30.0f}, + {270.0f, 115.0f}, + {219.0f, 178.0f}, + YES, + -0.4f, + {129.391693f, 92.705772f} + }, + { + @"Double intersect", + {100.0f, 20.0f}, + {195.0f, 255.0f}, + {93.0f, 163.0f}, + {40.0f, 30.0f}, + {270.0f, 115.0f}, + {154.0f, 212.0f}, + YES, + -0.909f, + {170.740646f,194.990021f} + }, + { + @"Near miss", + {100.0f, 20.0f}, + {195.0f, 255.0f}, + {93.0f, 163.0f}, + {40.0f, 30.0f}, + {176.0f, 100.0f}, + {154.0f, 212.0f}, + NO, + -1.0f, + {0.0f,0.0f} + } +}; +static unsigned int n_line_bezier_tests = sizeof (line_bezier_tests) / sizeof (line_bezier_tests[0]); + +void testLineSegmentIntersectsBezier() { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + startTestBlock(@"lineSegmentIntersectsBezier"); + + for (unsigned int i = 0; i < n_line_bezier_tests; ++i) { + NSPoint intersect; + BOOL result = lineSegmentIntersectsBezier ( + line_bezier_tests[i].lstart, + line_bezier_tests[i].lend, + line_bezier_tests[i].c0, + line_bezier_tests[i].c1, + line_bezier_tests[i].c2, + line_bezier_tests[i].c3, + &intersect); + if (result) { + if (line_bezier_tests[i].expectedT < 0.0f) { + assertPointsEqual (line_bezier_tests[i].msg, intersect, line_bezier_tests[i].expectedIntersect); + } else { + assertPointsEqual (line_bezier_tests[i].msg, intersect, + bezierInterpolateFull (line_bezier_tests[i].expectedT, line_bezier_tests[i].c0, line_bezier_tests[i].c1, line_bezier_tests[i].c2, line_bezier_tests[i].c3)); + } + } else { + if (line_bezier_tests[i].expectedResult) + fail (line_bezier_tests[i].msg); + else + pass (line_bezier_tests[i].msg); + } + } + +BOOL lineSegmentIntersectsBezier (NSPoint lstart, NSPoint lend, NSPoint c0, NSPoint c1, NSPoint c2, NSPoint c3, NSPoint *result); + endTestBlock(@"lineSegmentIntersectsBezier"); + [pool drain]; +} + +struct exit_point_test { + NSString *msg; + NSPoint rayStart; + float angle; + NSRect rect; + NSPoint expected; +}; + +static struct exit_point_test exit_point_tests[] = { + { + @"0.0 rads", + {0.0f, 0.0f}, + 0.0f, + {{-1.0f, -1.0f}, {2.0f, 2.0f}}, + {1.0f, 0.0f} + }, + { + @"pi/2 rads", + {0.0f, 0.0f}, + M_PI / 2.0f, + {{-1.0f, -1.0f}, {2.0f, 2.0f}}, + {0.0f, 1.0f} + }, + { + @"-pi/2 rads", + {0.0f, 0.0f}, + -M_PI / 2.0f, + {{-1.0f, -1.0f}, {2.0f, 2.0f}}, + {0.0f, -1.0f} + }, + { + @"pi rads", + {0.0f, 0.0f}, + M_PI, + {{-1.0f, -1.0f}, {2.0f, 2.0f}}, + {-1.0f, 0.0f} + }, + { + @"-pi rads", + {0.0f, 0.0f}, + -M_PI, + {{-1.0f, -1.0f}, {2.0f, 2.0f}}, + {-1.0f, 0.0f} + }, + { + @"pi/4 rads", + {0.0f, 0.0f}, + M_PI / 4.0f, + {{-1.0f, -1.0f}, {2.0f, 2.0f}}, + {1.0f, 1.0f} + }, + { + @"3pi/4 rads", + {0.0f, 0.0f}, + (3.0f * M_PI) / 4.0f, + {{-1.0f, -1.0f}, {2.0f, 2.0f}}, + {-1.0f, 1.0f} + }, + { + @"-pi/4 rads", + {0.0f, 0.0f}, + -M_PI / 4.0f, + {{-1.0f, -1.0f}, {2.0f, 2.0f}}, + {1.0f, -1.0f} + }, + { + @"-3pi/4 rads", + {0.0f, 0.0f}, + (-3.0f * M_PI) / 4.0f, + {{-1.0f, -1.0f}, {2.0f, 2.0f}}, + {-1.0f, -1.0f} + }, + { + @"pi/8 rads", + {0.0f, 0.0f}, + M_PI / 8.0f, + {{-1.0f, -1.0f}, {2.0f, 2.0f}}, + {1.0f, 0.414213562373095f} + }, + { + @"3pi/8 rads", + {0.0f, 0.0f}, + 3.0f * M_PI / 8.0f, + {{-1.0f, -1.0f}, {2.0f, 2.0f}}, + {0.414213562373095f, 1.0f} + }, + { + @"-5pi/8 rads", + {0.0f, 0.0f}, + -5.0f * M_PI / 8.0f, + {{-1.0f, -1.0f}, {2.0f, 2.0f}}, + {-0.414213562373095f, -1.0f} + }, + { + @"-7pi/8 rads", + {0.0f, 0.0f}, + -7.0f * M_PI / 8.0f, + {{-1.0f, -1.0f}, {2.0f, 2.0f}}, + {-1.0f, -0.414213562373095f} + }, + { + @"pi/8 rads; origin (1,1)", + {1.0f, 1.0f}, + M_PI / 8.0f, + {{0.0f, 0.0f}, {2.0f, 2.0f}}, + {2.0f, 1.414213562373095f} + }, + { + @"7pi/8 rads; origin (-2,2)", + {-2.0f, 2.0f}, + 7.0f * M_PI / 8.0f, + {{-3.0f, 1.0f}, {2.0f, 2.0f}}, + {-3.0f, 2.414213562373095f} + }, + { + @"pi/8 rads; origin (1,1); SW of box", + {1.0f, 1.0f}, + M_PI / 8.0f, + {{1.0f, 1.0f}, {1.0f, 1.0f}}, + {2.0f, 1.414213562373095f} + }, + { + @"pi/8 rads; origin (1,1); SE of box", + {1.0f, 1.0f}, + M_PI / 8.0f, + {{0.0f, 1.0f}, {1.0f, 1.0f}}, + {1.0f, 1.0f} + }, + { + @"pi/8 rads; origin (1,1); NE of box", + {1.0f, 1.0f}, + M_PI / 8.0f, + {{0.0f, 1.0f}, {1.0f, 1.0f}}, + {1.0f, 1.0f} + }, + { + @"pi/8 rads; origin (1,1); NW of box", + {1.0f, 1.0f}, + M_PI / 8.0f, + {{1.0f, 0.0f}, {1.0f, 1.0f}}, + {1.0f, 1.0f} + }, + { + @"pi/8 rads; origin (1,1); N of box", + {1.0f, 1.0f}, + M_PI / 8.0f, + {{0.5f, 0.0f}, {1.0f, 1.0f}}, + {1.0f, 1.0f} + }, + { + @"7pi/8 rads; origin (1,1); N of box", + {1.0f, 1.0f}, + 7.0f * M_PI / 8.0f, + {{0.5f, 0.0f}, {1.0f, 1.0f}}, + {1.0f, 1.0f} + }, + { + @"-pi/8 rads; origin (1,1); S of box", + {1.0f, 1.0f}, + -M_PI / 8.0f, + {{0.5f, 1.0f}, {1.0f, 1.0f}}, + {1.0f, 1.0f} + }, + { + @"-pi/8 rads; origin (1,1); E of box", + {1.0f, 1.0f}, + -M_PI / 8.0f, + {{0.0f, 0.5f}, {1.0f, 1.0f}}, + {1.0f, 1.0f} + }, + { + @"-7pi/8 rads; origin (1,1); W of box", + {1.0f, 1.0f}, + -7.0f * M_PI / 8.0f, + {{1.0f, 0.5f}, {1.0f, 1.0f}}, + {1.0f, 1.0f} + }, + { + @"7pi/8 rads; origin (1,1); W of box", + {1.0f, 1.0f}, + 7.0f * M_PI / 8.0f, + {{1.0f, 0.5f}, {1.0f, 1.0f}}, + {1.0f, 1.0f} + }, + { + @"pi/8 rads; origin (1,1); leave through top", + {1.0f, 1.0f}, + M_PI / 8.0f, + {{0.9f, 0.1f}, {1.0f, 1.0f}}, + {1.2414213562373f, 1.1f} + }, + { + @"0 rads; origin (1,1); N of box", + {1.0f, 1.0f}, + 0.0f, + {{0.5f, 0.0f}, {1.0f, 1.0f}}, + {1.5f, 1.0f} + } +}; +static unsigned int n_exit_point_tests = sizeof (exit_point_tests) / sizeof (exit_point_tests[0]); + +void testFindExitPointOfRay() { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + startTestBlock(@"findExitPointOfRay"); + + for (unsigned int i = 0; i < n_exit_point_tests; ++i) { + NSPoint exitPoint = findExitPointOfRay ( + exit_point_tests[i].rayStart, + exit_point_tests[i].angle, + exit_point_tests[i].rect); + assertPointsEqual (exit_point_tests[i].msg, exitPoint, exit_point_tests[i].expected); + } + + endTestBlock(@"findExitPointOfRay"); + [pool drain]; +} + +#ifdef STAND_ALONE +void runTests() { +#else +void testMaths() { +#endif + startTestBlock(@"maths"); + testRectAroundPoints(); + testRectAroundPointsWithPadding(); + testGoodAtan(); + testBezierInterpolate(); + testLineSegmentsIntersect(); + testLineSegmentIntersectsRect(); + testFindExitPointOfRay(); + testLineSegmentIntersectsBezier(); + endTestBlock(@"maths"); +} + +// vim:ft=objc:ts=4:sts=4:sw=4:noet diff --git a/tikzit-old/src/common/test/parser.m b/tikzit-old/src/common/test/parser.m new file mode 100644 index 0000000..3346acd --- /dev/null +++ b/tikzit-old/src/common/test/parser.m @@ -0,0 +1,86 @@ +// +// parser.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// +#import "test/test.h" +#import "TikzGraphAssembler.h" + + +#ifdef STAND_ALONE +void runTests() { +#else +void testParser() { +#endif + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + startTestBlock(@"parser"); + + [TikzGraphAssembler setup]; + + NodeStyle *rn = [NodeStyle defaultNodeStyleWithName:@"rn"]; + NSArray *styles = [NSArray arrayWithObject:rn]; + + NSString *tikz = + @"\\begin{tikzpicture}[dotpic]" + @" \\begin{pgfonlayer}{foo}" //ignored + @" \\node [style=rn] (0) at (-2,3.4) {stuff{$\\alpha$ in here}};" + @" \\node (b) at (1,1) {};" + @" \\end{pgfonlayer}" //ignored + @" \\draw [bend right=20] (0) to node[tick]{-} (b.center);" + @"\\end{tikzpicture}"; + + TikzGraphAssembler *ga = [[TikzGraphAssembler alloc] init]; + TEST(@"Parsing TikZ", [ga parseTikz:tikz]); + + Graph *g = [ga graph]; + TEST(@"Graph is non-nil", g != nil); + TEST(@"Graph has correct number of nodes", [[g nodes] count]==2); + TEST(@"Graph has correct number of edges", [[g edges] count]==1); + + NSEnumerator *en = [[g nodes] objectEnumerator]; + Node *n; + Node *n1, *n2; + while ((n=[en nextObject])) { + [n attachStyleFromTable:styles]; + if ([n style] == rn) n1 = n; + else if ([n style] == nil) n2 = n; + } + + TEST(@"Styles attached correctly", n1!=nil && n2!=nil); + + TEST(@"Nodes labeled correctly", + [[n1 label] isEqualToString:@"stuff{$\\alpha$ in here}"] && + [[n2 label] isEqualToString:@""] + ); + + Edge *e1 = [[[g edges] objectEnumerator] nextObject]; + + TEST(@"Edge has edge node", [e1 edgeNode]!=nil); + TEST(@"Edge node labeled correctly", [[[e1 edgeNode] label] isEqualToString:@"-"]); +// NSString *sty = [[[[[e1 edgeNode] data] atoms] objectEnumerator] nextObject]; +// TEST(@"Edge node styled correctly", sty!=nil && [sty isEqualToString:@"tick"]); + + PUTS(@"Source anchor: %@",[e1 sourceAnchor]); + PUTS(@"Target anchor: %@",[e1 targetAnchor]); + + endTestBlock(@"parser"); + + [pool drain]; +} diff --git a/tikzit-old/src/common/test/test.h b/tikzit-old/src/common/test/test.h new file mode 100644 index 0000000..59dcdd4 --- /dev/null +++ b/tikzit-old/src/common/test/test.h @@ -0,0 +1,57 @@ +// +// test.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// +#import + +@interface Allocator : NSObject +{} +@end + +BOOL fuzzyCompare (float f1, float f2); +BOOL fuzzyComparePoints (NSPoint p1, NSPoint p2); + +void setColorEnabled(BOOL b); + +void pass(NSString *msg); +void fail(NSString *msg); +void TEST(NSString *msg, BOOL test); +void assertRectsEqual (NSString *msg, NSRect val, NSRect exp); +void assertPointsEqual (NSString *msg, NSPoint val, NSPoint exp); +void assertFloatsEqual (NSString *msg, float val, float exp); + +void startTests(); +void endTests(); + +void startTestBlock(NSString *name); +void endTestBlock(NSString *name); + +#define PUTS(fmt, ...) { \ + NSString *_str = [[NSString alloc] initWithFormat:fmt, ##__VA_ARGS__]; \ + printf("%s\n", [_str UTF8String]); \ + [_str release]; } + +#define failFmt(fmt, ...) { \ + NSString *_fstr = [[NSString alloc] initWithFormat:fmt, ##__VA_ARGS__]; \ + fail(_fstr); \ + [_fstr release]; } + +// vim:ft=objc:ts=4:sts=4:sw=4:noet diff --git a/tikzit-old/src/common/test/test.m b/tikzit-old/src/common/test/test.m new file mode 100644 index 0000000..9afcd67 --- /dev/null +++ b/tikzit-old/src/common/test/test.m @@ -0,0 +1,175 @@ +// +// test.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// +#import "test/test.h" + +static int PASSES; +static int FAILS; + +static int ALLOC_INSTANCES = 0; + +static BOOL colorEnabled = YES; +static int depth = 0; + +static NSString *RED, *GREEN, *BLUE, *OFF; + +static NSString *indents[6] = + {@"", @" ", @" ", @" ", + @" ", @" "}; + +#define INDENT ((depth >= 6) ? indents[5] : indents[depth]) + + +@implementation Allocator + ++ (id)alloc { + ++ALLOC_INSTANCES; + return [super alloc]; +} + +- (void)dealloc { + --ALLOC_INSTANCES; + [super dealloc]; +} + ++ (Allocator*)allocator { + return [[[Allocator alloc] init] autorelease]; +} + +@end + +BOOL fuzzyCompare(float f1, float f2) { + return (ABS(f1 - f2) <= 0.00001f * MAX(1.0f,MIN(ABS(f1), ABS(f2)))); +} + +BOOL fuzzyComparePoints (NSPoint p1, NSPoint p2) { + return fuzzyCompare (p1.x, p2.x) && fuzzyCompare (p1.y, p2.y); +} + +void pass(NSString *msg) { + PUTS(@"%@[%@PASS%@] %@", INDENT, GREEN, OFF, msg); + ++PASSES; +} + +void fail(NSString *msg) { + PUTS(@"%@[%@FAIL%@] %@", INDENT, RED, OFF, msg); + ++FAILS; +} + +void TEST(NSString *msg, BOOL test) { + if (test) { + pass (msg); + } else { + fail (msg); + } +} + +void assertRectsEqual (NSString *msg, NSRect r1, NSRect r2) { + BOOL equal = fuzzyCompare (r1.origin.x, r2.origin.x) && + fuzzyCompare (r1.origin.y, r2.origin.y) && + fuzzyCompare (r1.size.width, r2.size.width) && + fuzzyCompare (r1.size.height, r2.size.height); + if (equal) { + pass (msg); + } else { + failFmt(@"%@ (expected (%f,%f:%fx%f) but got (%f,%f:%fx%f))", + msg, + r2.origin.x, r2.origin.y, r2.size.width, r2.size.height, + r1.origin.x, r1.origin.y, r1.size.width, r1.size.height); + } +} + +void assertPointsEqual (NSString *msg, NSPoint p1, NSPoint p2) { + BOOL equal = fuzzyCompare (p1.x, p2.x) && fuzzyCompare (p1.y, p2.y); + if (equal) { + pass (msg); + } else { + failFmt(@"%@ (expected (%f,%f) but got (%f,%f)", + msg, + p2.x, p2.y, + p1.x, p1.y); + } +} + +void assertFloatsEqual (NSString *msg, float f1, float f2) { + if (fuzzyCompare (f1, f2)) { + pass (msg); + } else { + failFmt(@"%@ (expected %f but got %f", msg, f2, f1); + } +} + +void startTests() { + PASSES = 0; + FAILS = 0; +} + +void endTests() { + PUTS(@"Done testing. %@%d%@ passed, %@%d%@ failed.", + GREEN, PASSES, OFF, + RED, FAILS, OFF); +} + +void startTestBlock(NSString *name) { + PUTS(@"%@Starting %@%@%@ tests.", INDENT, BLUE, name, OFF); + ++depth; +} + +void endTestBlock(NSString *name) { + --depth; + PUTS(@"%@Done with %@%@%@ tests.", INDENT, BLUE, name, OFF); +} + +void setColorEnabled(BOOL b) { + colorEnabled = b; + if (b) { + RED = @"\033[31;1m"; + GREEN = @"\033[32;1m"; + BLUE = @"\033[36;1m"; + OFF = @"\033[0m"; + } else { + RED = @""; + GREEN = @""; + BLUE = @""; + OFF = @""; + } +} + +#ifdef STAND_ALONE +void runTests(); + +int main() { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + setColorEnabled (NO); + startTests(); + + runTests(); + + endTests(); + + [pool drain]; + return 0; +} +#endif + +// vim:ft=objc:ts=4:sts=4:sw=4:noet diff --git a/tikzit-old/src/common/tikzlexer.lm b/tikzit-old/src/common/tikzlexer.lm new file mode 100644 index 0000000..1e92f73 --- /dev/null +++ b/tikzit-old/src/common/tikzlexer.lm @@ -0,0 +1,170 @@ +%{ +/* + * Copyright 2010 Chris Heunen + * Copyright 2010-2013 Aleks Kissinger + * Copyright 2013 K. Johan Paulsson + * Copyright 2013 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import +#import "tikzparserdefs.h" +#import "tikzparser.h" + +#define YY_USER_ACTION \ + yylloc->first_line = yylloc->last_line; \ + yylloc->first_column = yylloc->last_column + 1; \ + yylloc->last_column = yylloc->first_column + yyleng - 1; + +%} + +%option reentrant bison-bridge bison-locations 8bit +%option nounput +%option yylineno +%option noyywrap +%option header-file="common/tikzlexer.h" +%option extra-type="TikzGraphAssembler *" + + +%s props +%s xcoord +%s ycoord +%s noderef + +FLOAT \-?[0-9]*(\.[0-9]+)? + +%% + + /* whitespace is ignored, except for position counting; we don't + count formfeed and vtab as whitespace, because it's not obvious + how they should be dealt with and no-one actually uses them */ + + /* lex will take the longest-matching string */ +\r\n|\r|\n { + yylloc->first_line += 1; + yylloc->last_line = yylloc->first_line; + yylloc->first_column = yylloc->last_column = 0; +} +[\t ]+ { } + +\\begin\{tikzpicture\} { return BEGIN_TIKZPICTURE_CMD; } +\\end\{tikzpicture\} { return END_TIKZPICTURE_CMD; } +\\begin\{pgfonlayer\} { return BEGIN_PGFONLAYER_CMD; } +\\end\{pgfonlayer\} { return END_PGFONLAYER_CMD; } +\\draw { return DRAW_CMD; } +\\node { return NODE_CMD; } +\\path { return PATH_CMD; } +rectangle { return RECTANGLE; } +node { return NODE; } +at { return AT; } +to { return TO; } +; { return SEMICOLON; } + +\([ ]*{FLOAT}[ ]*,[ ]*{FLOAT}[ ]*\) { + yylloc->last_column = yylloc->first_column + 1; + yyless(1); + BEGIN(xcoord); +} +{FLOAT} { + yylval->pt.x=(float)strtod(yytext,NULL); + BEGIN(ycoord); +} +, { } +{FLOAT} { + yylval->pt.y=(float)strtod(yytext,NULL); +} +\) { + BEGIN(INITIAL); + return COORD; +} + + /* when we see "[", change parsing mode */ +\[ /*syntaxhlfix]*/ { + BEGIN(props); + return LEFTBRACKET; +} += { return EQUALS; } +, { return COMMA; } + /* technically, it is possible to have newlines in the middle of + property names or values, but in practice this is unlikely and + screws up our line counting */ +[^=,\{\] \t\n]([^=,\{\]\n]*[^=,\{\] \t\n])? { + yylval->nsstr=[NSString stringWithUTF8String:yytext]; + return PROPSTRING; +} +\] { + BEGIN(INITIAL); + return RIGHTBRACKET; +} + +\( { + BEGIN(noderef); + return LEFTPARENTHESIS; +} +\. { + return FULLSTOP; +} + /* we assume node names (and anchor names) never contain + newlines */ +[^\.\{\)\n]+ { + yylval->nsstr=[NSString stringWithUTF8String:yytext]; + return REFSTRING; +} +\) { + BEGIN(INITIAL); + return RIGHTPARENTHESIS; +} + +\{ { + NSMutableString *buf = [NSMutableString string]; + unsigned int brace_depth = 1; + unsigned int escape = 0; + while (1) { + char c = input(yyscanner); + // eof reached before closing brace + if (c == '\0' || c == EOF) { + return UNCLOSED_DELIM_STR; + } + + yylloc->last_column += 1; + yyleng += 1; + if (escape) { + escape = 0; + } else if (c == '\\') { + escape = 1; + } else if (c == '{') { + brace_depth++; + } else if (c == '}') { + brace_depth--; + if (brace_depth == 0) break; + } else if (c == '\n') { + yylloc->last_line += 1; + yylloc->last_column = 0; + } + [buf appendFormat:@"%c", c]; + } + + yylval->nsstr = buf; + return DELIMITEDSTRING; +} + +\\begin { return UNKNOWN_BEGIN_CMD; } +\\end { return UNKNOWN_END_CMD; } +\\[a-zA-Z0-9]+ { return UNKNOWN_CMD; } +[a-zA-Z0-9]+ { return UNKNOWN_STR; } +. { return UNKNOWN_STR; } + + /* vi:ft=lex:noet:ts=4:sts=4:sw=4: + */ diff --git a/tikzit-old/src/common/tikzparser.ym b/tikzit-old/src/common/tikzparser.ym new file mode 100644 index 0000000..344e969 --- /dev/null +++ b/tikzit-old/src/common/tikzparser.ym @@ -0,0 +1,224 @@ +%{ +/* + * Copyright 2010 Chris Heunen + * Copyright 2010-2013 Aleks Kissinger + * Copyright 2013 K. Johan Paulsson + * Copyright 2013 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "tikzparserdefs.h" +%} + +/* we use features added to bison 2.4 */ +%require "2.3" + +%error-verbose +/* enable maintaining locations for better error messages */ +%locations +/* the name of the header file */ +/*%defines "common/tikzparser.h"*/ +/* make it re-entrant (no global variables) */ +%pure-parser +/* We use a pure (re-entrant) lexer. This means yylex + will take a void* (opaque) type to maintain its state */ +%lex-param {void *scanner} +/* Since this parser is also pure, yyparse needs to take + that lexer state as an argument */ +%parse-param {void *scanner} + +/* possible data types for semantic values */ +%union { + NSString *nsstr; + GraphElementProperty *prop; + GraphElementData *data; + Node *node; + NSPoint pt; + struct noderef noderef; +} + +%{ +#import "GraphElementData.h" +#import "GraphElementProperty.h" +#import "Node.h" +#import "Edge.h" + +#import "tikzlexer.h" +#import "TikzGraphAssembler+Parser.h" +/* the assembler (used by this parser) is stored in the lexer + state as "extra" data */ +#define assembler yyget_extra(scanner) + +/* pass errors off to the assembler */ +void yyerror(YYLTYPE *yylloc, void *scanner, const char *str) { + [assembler reportError:str atLocation:yylloc]; +} +%} + +/* yyloc is set up with first_column = last_column = 1 by default; + however, it makes more sense to think of us being "before the + start of the line" before we parse anything */ +%initial-action { + yylloc.first_column = yylloc.last_column = 0; +} + + +%token BEGIN_TIKZPICTURE_CMD "\\begin{tikzpicture}" +%token END_TIKZPICTURE_CMD "\\end{tikzpicture}" +%token BEGIN_PGFONLAYER_CMD "\\begin{pgfonlayer}" +%token END_PGFONLAYER_CMD "\\end{pgfonlayer}" +%token DRAW_CMD "\\draw" +%token NODE_CMD "\\node" +%token PATH_CMD "\\path" +%token RECTANGLE "rectangle" +%token NODE "node" +%token AT "at" +%token TO "to" +%token SEMICOLON ";" +%token COMMA "," + +%token LEFTPARENTHESIS "(" +%token RIGHTPARENTHESIS ")" +%token LEFTBRACKET "[" +%token RIGHTBRACKET "]" +%token FULLSTOP "." +%token EQUALS "=" +%token COORD "co-ordinate" +%token PROPSTRING "key/value string" +%token REFSTRING "string" +%token DELIMITEDSTRING "{-delimited string" + +%token UNKNOWN_BEGIN_CMD "unknown \\begin command" +%token UNKNOWN_END_CMD "unknown \\end command" +%token UNKNOWN_CMD "unknown latex command" +%token UNKNOWN_STR "unknown string" +%token UNCLOSED_DELIM_STR "unclosed {-delimited string" + +%type nodename +%type optanchor +%type val +%type property +%type extraproperties +%type properties +%type optproperties +%type optedgenode +%type noderef +%type optnoderef + +%% + +tikzpicture: "\\begin{tikzpicture}" optproperties tikzcmds "\\end{tikzpicture}" + { + if ($2) { + [[assembler graph] setData:$2]; + } + }; +tikzcmds: tikzcmds tikzcmd | ; +tikzcmd: node | edge | boundingbox | ignore; + +ignore: "\\begin{pgfonlayer}" DELIMITEDSTRING | "\\end{pgfonlayer}"; + +optproperties: + "[" "]" + { $$ = nil; } + | "[" properties "]" + { $$ = $2; } + | { $$ = nil; }; +properties: extraproperties property + { + [$1 addObject:$2]; + $$ = $1; + }; +extraproperties: + extraproperties property "," + { + [$1 addObject:$2]; + $$ = $1; + } + | { $$ = [GraphElementData data]; }; +property: + val "=" val + { $$ = [GraphElementProperty property:$1 withValue:$3]; } + | val + { $$ = [GraphElementProperty atom:$1]; }; +val: PROPSTRING { $$ = $1; } | DELIMITEDSTRING { $$ = $1; }; + +nodename: "(" REFSTRING ")" { $$ = $2; }; +node: "\\node" optproperties nodename "at" COORD DELIMITEDSTRING ";" + { + Node *node = [[Node alloc] init]; + if ($2) + [node setData:$2]; + [node setName:$3]; + [node setPoint:$5]; + [node setLabel:$6]; + [assembler addNodeToMap:node]; + [[assembler graph] addNode:node]; +#if ! __has_feature(objc_arc) + [node release]; +#endif + }; + +optanchor: { $$ = nil; } | "." REFSTRING { $$ = $2; }; +noderef: "(" REFSTRING optanchor ")" + { + $$.node = [assembler nodeWithName:$2]; + $$.anchor = $3; + }; +optnoderef: + noderef { $$ = $1; } + | "(" ")" { $$.node = nil; $$.anchor = nil; } +optedgenode: + { $$ = nil; } + | "node" optproperties DELIMITEDSTRING + { + $$ = [Node node]; + if ($2) + [$$ setData:$2]; + [$$ setLabel:$3]; + } +edge: "\\draw" optproperties noderef "to" optedgenode optnoderef ";" + { + Edge *edge = [[Edge alloc] init]; + if ($2) + [edge setData:$2]; + [edge setSource:$3.node]; + [edge setSourceAnchor:$3.anchor]; + [edge setEdgeNode:$5]; + if ($6.node) { + [edge setTarget:$6.node]; + [edge setTargetAnchor:$6.anchor]; + } else { + [edge setTarget:$3.node]; + [edge setTargetAnchor:$3.anchor]; + } + [edge setAttributesFromData]; + [[assembler graph] addEdge:edge]; +#if ! __has_feature(objc_arc) + [edge release]; +#endif + }; + +ignoreprop: val | val "=" val; +ignoreprops: ignoreprop ignoreprops | ; +optignoreprops: "[" ignoreprops "]"; +boundingbox: + "\\path" optignoreprops COORD "rectangle" COORD ";" + { + [[assembler graph] setBoundingBox:NSRectAroundPoints($3, $5)]; + }; + +/* vi:ft=yacc:noet:ts=4:sts=4:sw=4 +*/ diff --git a/tikzit-old/src/common/tikzparserdefs.h b/tikzit-old/src/common/tikzparserdefs.h new file mode 100644 index 0000000..cde3345 --- /dev/null +++ b/tikzit-old/src/common/tikzparserdefs.h @@ -0,0 +1,49 @@ +/* + * Copyright 2013 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/* + * This file sets up some defs (particularly struct noderef) needed for + * the tikz parser and its users. + * + * It is needed because we wish to support bison 2.3, which is the + * version shipped with OSX. bison 2.4 onwards allows us to put this + * stuff in a "%code requires" block, where it will be put in the + * generated header file by bison. + * + * All the types used by the %union directive in tikzparser.ym should + * be declared, defined or imported here. + */ + +// Foundation has NSPoint and NSString +#import + +@class TikzGraphAssembler; +@class GraphElementData; +@class GraphElementProperty; +@class Node; + +struct noderef { +#if __has_feature(objc_arc) + __unsafe_unretained Node *node; + __unsafe_unretained NSString *anchor; +#else + Node *node; + NSString *anchor; +#endif +}; + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/util.h b/tikzit-old/src/common/util.h new file mode 100644 index 0000000..b34f25d --- /dev/null +++ b/tikzit-old/src/common/util.h @@ -0,0 +1,201 @@ +// +// util.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// + +#import + +#include + +#ifndef M_PI +#define M_PI 3.141592654 +#endif + +#ifndef MAX +#define MAX(a,b) (((a) > (b)) ? (a) : (b)) +#endif + +#ifndef MIN +#define MIN(a,b) (((a) < (b)) ? (a) : (b)) +#endif + +/*! + @brief Compute a bounding rectangle for two given points. + @param p1 a point. + @param p2 another point. + @result A bounding rectangle for p1 and p2. + */ +NSRect NSRectAroundPoints(NSPoint p1, NSPoint p2); + +/*! + @brief Compute a bounding rectangle for two given points. + @param rect the base rectangle + @param the point to ensure is included + @result A rectangle containing rect and p + */ +NSRect NSRectWithPoint(NSRect rect, NSPoint p); + +/*! + @brief Compute a bounding rectangle for two given points with a given padding. + @param p1 a point. + @param p2 another point. + @param padding a padding. + @result A bounding rectangle for p1 and p2 with padding. + */ +NSRect NSRectAroundPointsWithPadding(NSPoint p1, NSPoint p2, float padding); + +/*! + @brief Compute a bounding rectangle for four given points. + @result A bounding rectangle for p1, p2, p3 and p4. + */ +NSRect NSRectAround4Points(NSPoint p1, NSPoint p2, NSPoint p3, NSPoint p4); + +/*! + @brief Compute a bounding rectangle for four given points. + @param padding the amount to pad the rectangle + @result A bounding rectangle for p1, p2, p3 and p4 with padding + */ +NSRect NSRectAround4PointsWithPadding(NSPoint p1, NSPoint p2, NSPoint p3, NSPoint p4, float padding); + +/*! + @brief Find the distance between two points + @param p1 The first point + @param p2 The second point + @result The distance between p1 and p2 + */ +float NSDistanceBetweenPoints(NSPoint p1, NSPoint p2); + +/*! + @brief Compute the 'real' arctan for two points. Always succeeds and gives a good angle, + regardless of sign, zeroes, etc. + @param dx the x distance between points. + @param dy the y distance between points. + @result An angle in radians. + */ +float good_atan(float dx, float dy); + +/*! + @brief Interpolate along a bezier curve to the given distance. To find the x coord, + use the relavant x coordinates for c0-c3, and for y use the y's. + @param dist a distance from 0 to 1 spanning the whole curve. + @param c0 the x (resp. y) coordinate of the start point. + @param c1 the x (resp. y) coordinate of the first control point. + @param c2 the x (resp. y) coordinate of the second control point. + @param c3 the x (resp. y) coordinate of the end point. + @result The x (resp. y) coordinate of the point at 'dist'. + */ +float bezierInterpolate (float dist, float c0, float c1, float c2, float c3); + +/*! + @brief Interpolate along a bezier curve to the given distance. + @param dist a distance from 0 to 1 spanning the whole curve. + @param c0 the x start point. + @param c1 the x first control point. + @param c2 the x second control point. + @param c3 the x end point. + @result The point at 'dist'. + */ +NSPoint bezierInterpolateFull (float dist, NSPoint c0, NSPoint c1, NSPoint c2, NSPoint c3); + +/*! + * @brief Find whether two line segments intersect + * @param l1start The starting point of line segment 1 + * @param l1end The ending point of line segment 1 + * @param l2start The starting point of line segment 2 + * @param l2end The ending point of line segment 2 + * @param result A location to store the intersection point + * @result YES if they intersect, NO if they do not + */ +BOOL lineSegmentsIntersect (NSPoint l1start, NSPoint l1end, NSPoint l2start, NSPoint l2end, NSPoint *result); + +/*! + * @brief Find whether a line segment intersects a bezier curve + * @detail Always finds the intersection furthest along the line segment + * @param lstart The starting point of the line segment + * @param lend The ending point of the line segment + * @param c0 The starting point of the bezier curve + * @param c1 The first control point of the bezier curve + * @param c2 The second control point of the bezier curve + * @param c3 The ending point of the bezier curve + * @param result A location to store the intersection point + * @result YES if they intersect, NO if they do not + */ +BOOL lineSegmentIntersectsBezier (NSPoint lstart, NSPoint lend, NSPoint c0, NSPoint c1, NSPoint c2, NSPoint c3, NSPoint *result); + +/*! + * @brief Find whether a line segment enters a rectangle + * @param lineStart The starting point of the line segment + * @param lineEnd The ending point of the line segment + * @param rect The rectangle + * @result YES if they intersect, NO if they do not + */ +BOOL lineSegmentIntersectsRect (NSPoint lineStart, NSPoint lineEnd, NSRect rect); + +/*! + * @brief Find where a ray exits a rectangle + * @param rayStart The starting point of the ray; must be contained in rect + * @param angle_rads The angle of the ray, in radians + * @param rect The rectangle + * @result The point at which the ray leaves the rect + */ +NSPoint findExitPointOfRay (NSPoint rayStart, float angle_rads, NSRect rect); + +/*! + @brief Round val to nearest stepSize + @param stepSize the courseness + @param val a value to round + */ +float roundToNearest(float stepSize, float val); + +/*! + @brief Convert radians into degrees + */ +float radiansToDegrees(float radians); + +/*! + @brief Convert degrees into radians + */ +float degreesToRadians(float degrees); + +/*! + @brief Normalises an angle (in degrees) to fall between -179 and 180 + */ +int normaliseAngleDeg (int degrees); + +/*! + @brief Normalises an angle (in radians) to fall in the range (-pi,pi] + */ +float normaliseAngleRad (float rads); + +/*! + @brief Express a byte as alpha-only hex, with digits (0..16) -> (a..jA..F) + @param sh A number 0-255 + @result A string 'aa'-'FF' + */ +NSString *alphaHex(unsigned short sh); + +const char *find_start_of_nth_line (const char * string, int line); + +/*! + @brief Formats a CGFloat as a string, removing trailing zeros + @detail Unlike formatting an NSNumber, or using %g, it will never + produce scientific notation (like "2.00e2"). Unlike %f, + it will not include unnecessary trailing zeros. + */ +NSString *formatFloat(CGFloat f, int maxdps); + diff --git a/tikzit-old/src/common/util.m b/tikzit-old/src/common/util.m new file mode 100644 index 0000000..e9b8899 --- /dev/null +++ b/tikzit-old/src/common/util.m @@ -0,0 +1,403 @@ +// +// util.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// + +#import "util.h" +#import "math.h" + +static BOOL fuzzyCompare(float f1, float f2) { + return (ABS(f1 - f2) <= 0.00001f * MIN(ABS(f1), ABS(f2))); +} + +NSRect NSRectWithPoint(NSRect rect, NSPoint p) { + CGFloat minX = NSMinX(rect); + CGFloat maxX = NSMaxX(rect); + CGFloat minY = NSMinY(rect); + CGFloat maxY = NSMaxY(rect); + if (p.x < minX) { + minX = p.x; + } else if (p.x > maxX) { + maxX = p.x; + } + if (p.y < minY) { + minY = p.y; + } else if (p.y > maxY) { + maxY = p.y; + } + return NSMakeRect(minX, minY, maxX - minX, maxY - minY); +} + +NSRect NSRectAroundPointsWithPadding(NSPoint p1, NSPoint p2, float padding) { + return NSMakeRect(MIN(p1.x,p2.x)-padding, + MIN(p1.y,p2.y)-padding, + ABS(p2.x-p1.x)+(2.0f*padding), + ABS(p2.y-p1.y)+(2.0f*padding)); +} + +NSRect NSRectAroundPoints(NSPoint p1, NSPoint p2) { + return NSRectAroundPointsWithPadding(p1, p2, 0.0f); +} + +NSRect NSRectAround4PointsWithPadding(NSPoint p1, NSPoint p2, NSPoint p3, NSPoint p4, float padding) { + float leftMost = MIN(p1.x, p2.x); + leftMost = MIN(leftMost, p3.x); + leftMost = MIN(leftMost, p4.x); + float rightMost = MAX(p1.x, p2.x); + rightMost = MAX(rightMost, p3.x); + rightMost = MAX(rightMost, p4.x); + float topMost = MIN(p1.y, p2.y); + topMost = MIN(topMost, p3.y); + topMost = MIN(topMost, p4.y); + float bottomMost = MAX(p1.y, p2.y); + bottomMost = MAX(bottomMost, p3.y); + bottomMost = MAX(bottomMost, p4.y); + return NSMakeRect(leftMost-padding, + topMost-padding, + (rightMost - leftMost)+(2.0f*padding), + (bottomMost - topMost)+(2.0f*padding)); +} + +NSRect NSRectAround4Points(NSPoint p1, NSPoint p2, NSPoint p3, NSPoint p4) { + return NSRectAround4PointsWithPadding(p1, p2, p3, p4, 0.0f); +} + +float NSDistanceBetweenPoints(NSPoint p1, NSPoint p2) { + float dx = p2.x - p1.x; + float dy = p2.y - p1.y; + return sqrt(dx * dx + dy * dy); +} + +float good_atan(float dx, float dy) { + if (dx > 0) { + return atan(dy/dx); + } else if (dx < 0) { + return M_PI + atan(dy/dx); + } else { + if (dy > 0) return 0.5 * M_PI; + else if (dy < 0) return 1.5 * M_PI; + else return 0; + } +} + +// interpolate on a cubic bezier curve +float bezierInterpolate(float dist, float c0, float c1, float c2, float c3) { + float distp = 1 - dist; + return (distp*distp*distp) * c0 + + 3 * (distp*distp) * dist * c1 + + 3 * (dist*dist) * distp * c2 + + (dist*dist*dist) * c3; +} + +NSPoint bezierInterpolateFull (float dist, NSPoint c0, NSPoint c1, NSPoint c2, NSPoint c3) { + return NSMakePoint (bezierInterpolate (dist, c0.x, c1.x, c2.x, c3.x), + bezierInterpolate (dist, c0.y, c1.y, c2.y, c3.y)); +} + +static void lineCoeffsFromPoints(NSPoint p1, NSPoint p2, float *A, float *B, float *C) { + *A = p2.y - p1.y; + *B = p1.x - p2.x; + *C = (*A) * p1.x + (*B) * p1.y; +} + +static void lineCoeffsFromPointAndAngle(NSPoint p, float angle, float *A, float *B, float *C) { + *A = sin (angle); + *B = -cos (angle); + *C = (*A) * p.x + (*B) * p.y; +} + +static BOOL lineSegmentContainsPoint(NSPoint l1, NSPoint l2, float x, float y) { + float minX = MIN(l1.x, l2.x); + float maxX = MAX(l1.x, l2.x); + float minY = MIN(l1.y, l2.y); + float maxY = MAX(l1.y, l2.y); + return (x >= minX || fuzzyCompare (x, minX)) && + (x <= maxX || fuzzyCompare (x, maxX)) && + (y >= minY || fuzzyCompare (y, minY)) && + (y <= maxY || fuzzyCompare (y, maxY)); +} + +BOOL lineSegmentsIntersect(NSPoint l1start, NSPoint l1end, NSPoint l2start, NSPoint l2end, NSPoint *result) { + // Ax + By = C + float A1, B1, C1; + lineCoeffsFromPoints(l1start, l1end, &A1, &B1, &C1); + float A2, B2, C2; + lineCoeffsFromPoints(l2start, l2end, &A2, &B2, &C2); + + float det = A1*B2 - A2*B1; + if (det == 0.0f) { + // parallel + return NO; + } else { + float x = (B2*C1 - B1*C2)/det; + float y = (A1*C2 - A2*C1)/det; + + if (lineSegmentContainsPoint(l1start, l1end, x, y) && + lineSegmentContainsPoint(l2start, l2end, x, y)) { + if (result) { + (*result).x = x; + (*result).y = y; + } + return YES; + } + } + return NO; +} + +BOOL lineSegmentIntersectsBezier (NSPoint lstart, NSPoint lend, NSPoint c0, NSPoint c1, NSPoint c2, NSPoint c3, NSPoint *result) { + NSRect curveBounds = NSRectAround4Points(c0, c1, c2, c3); + if (!lineSegmentIntersectsRect(lstart, lend, curveBounds)) + return NO; + + const int divisions = 20; + const float chunkSize = 1.0f/(float)divisions; + float chunkStart = 0.0f; + BOOL found = NO; + + for (int i = 0; i < divisions; ++i) { + float chunkEnd = chunkStart + chunkSize; + + NSPoint p1 = bezierInterpolateFull (chunkStart, c0, c1, c2, c3); + NSPoint p2 = bezierInterpolateFull (chunkEnd, c0, c1, c2, c3); + + NSPoint p; + if (lineSegmentsIntersect (lstart, lend, p1, p2, &p)) { + lstart = p; + found = YES; + } + + chunkStart = chunkEnd; + } + if (found && result) { + *result = lstart; + } + return found; +} + +BOOL lineSegmentIntersectsRect(NSPoint lineStart, NSPoint lineEnd, NSRect rect) { + const float rectMaxX = NSMaxX(rect); + const float rectMinX = NSMinX(rect); + const float rectMaxY = NSMaxY(rect); + const float rectMinY = NSMinY(rect); + + // check if the segment is entirely to one side of the rect + if (lineStart.x > rectMaxX && lineEnd.x > rectMaxX) { + return NO; + } + if (lineStart.x < rectMinX && lineEnd.x < rectMinX) { + return NO; + } + if (lineStart.y > rectMaxY && lineEnd.y > rectMaxY) { + return NO; + } + if (lineStart.y < rectMinY && lineEnd.y < rectMinY) { + return NO; + } + + // Now check whether the (infinite) line intersects the rect + // (if it does, so does the segment, due to above checks) + + // Ax + By = C + float A, B, C; + lineCoeffsFromPoints(lineStart, lineEnd, &A, &B, &C); + + const float tlVal = A * rectMinX + B * rectMaxY - C; + const float trVal = A * rectMaxX + B * rectMaxY - C; + const float blVal = A * rectMinX + B * rectMinY - C; + const float brVal = A * rectMaxX + B * rectMinY - C; + + if (tlVal < 0 && trVal < 0 && blVal < 0 && brVal < 0) { + // rect below line + return NO; + } + if (tlVal > 0 && trVal > 0 && blVal > 0 && brVal > 0) { + // rect above line + return NO; + } + + return YES; +} + +NSPoint findExitPointOfRay (NSPoint p, float angle_rads, NSRect rect) { + const float rectMinX = NSMinX (rect); + const float rectMaxX = NSMaxX (rect); + const float rectMinY = NSMinY (rect); + const float rectMaxY = NSMaxY (rect); + + const float angle = normaliseAngleRad (angle_rads); + + // special case the edges + if (p.y == rectMaxY && angle > 0 && angle < M_PI) { + // along the top of the box + return p; + } + if (p.y == rectMinY && angle < 0 && angle > -M_PI) { + // along the bottom of the box + return p; + } + if (p.x == rectMaxX && angle > -M_PI/2.0f && angle < M_PI/2.0f) { + // along the right of the box + return p; + } + if (p.x == rectMinX && (angle > M_PI/2.0f || angle < -M_PI/2.0f)) { + // along the left of the box + return p; + } + + float A1, B1, C1; + lineCoeffsFromPointAndAngle(p, angle, &A1, &B1, &C1); + //NSLog(@"Ray is %fx + %fy = %f", A1, B1, C1); + + const float tlAngle = normaliseAngleRad (good_atan (rectMinX - p.x, rectMaxY - p.y)); + const float trAngle = normaliseAngleRad (good_atan (rectMaxX - p.x, rectMaxY - p.y)); + if (angle <= tlAngle && angle >= trAngle) { + // exit top + float A2, B2, C2; + lineCoeffsFromPoints(NSMakePoint (rectMinX, rectMaxY), + NSMakePoint (rectMaxX, rectMaxY), + &A2, &B2, &C2); + float det = A1*B2 - A2*B1; + NSCAssert(det != 0.0f, @"Parallel lines?"); + NSPoint intersect = NSMakePoint ((B2*C1 - B1*C2)/det, + (A1*C2 - A2*C1)/det); + return intersect; + } + + const float brAngle = normaliseAngleRad (good_atan (rectMaxX - p.x, rectMinY - p.y)); + if (angle <= trAngle && angle >= brAngle) { + // exit right + float A2, B2, C2; + lineCoeffsFromPoints(NSMakePoint (rectMaxX, rectMaxY), + NSMakePoint (rectMaxX, rectMinY), + &A2, &B2, &C2); + //NSLog(@"Edge is %fx + %fy = %f", A2, B2, C2); + float det = A1*B2 - A2*B1; + NSCAssert(det != 0.0f, @"Parallel lines?"); + NSPoint intersect = NSMakePoint ((B2*C1 - B1*C2)/det, + (A1*C2 - A2*C1)/det); + return intersect; + } + + const float blAngle = normaliseAngleRad (good_atan (rectMinX - p.x, rectMinY - p.y)); + if (angle <= brAngle && angle >= blAngle) { + // exit bottom + float A2, B2, C2; + lineCoeffsFromPoints(NSMakePoint (rectMaxX, rectMinY), + NSMakePoint (rectMinX, rectMinY), + &A2, &B2, &C2); + float det = A1*B2 - A2*B1; + NSCAssert(det != 0.0f, @"Parallel lines?"); + NSPoint intersect = NSMakePoint ((B2*C1 - B1*C2)/det, + (A1*C2 - A2*C1)/det); + return intersect; + } else { + // exit left + float A2, B2, C2; + lineCoeffsFromPoints(NSMakePoint (rectMinX, rectMaxY), + NSMakePoint (rectMinX, rectMinY), + &A2, &B2, &C2); + float det = A1*B2 - A2*B1; + NSCAssert(det != 0.0f, @"Parallel lines?"); + NSPoint intersect = NSMakePoint ((B2*C1 - B1*C2)/det, + (A1*C2 - A2*C1)/det); + return intersect; + } +} + +float roundToNearest(float stepSize, float val) { + if (stepSize==0.0f) return val; + else return round(val/stepSize)*stepSize; +} + +float radiansToDegrees (float radians) { + return (radians * 180.0f) / M_PI; +} + +float degreesToRadians(float degrees) { + return (degrees * M_PI) / 180.0f; +} + +int normaliseAngleDeg (int degrees) { + while (degrees > 180) { + degrees -= 360; + } + while (degrees <= -180) { + degrees += 360; + } + return degrees; +} + +float normaliseAngleRad (float rads) { + while (rads > M_PI) { + rads -= 2 * M_PI; + } + while (rads <= -M_PI) { + rads += 2 * M_PI; + } + return rads; +} + +static char ahex[] = +{'a','b','c','d','e','f','g','h','i','j', + 'A','B','C','D','E','F'}; + +NSString *alphaHex(unsigned short sh) { + if (sh > 255) return @"!!"; + return [NSString stringWithFormat:@"%c%c", ahex[sh/16], ahex[sh%16]]; +} + +const char *find_start_of_nth_line (const char * string, int line) { + int l = 0; + const char *lineStart = string; + while (*lineStart && l < line) { + while (*lineStart && *lineStart != '\n') { + ++lineStart; + } + if (*lineStart) { + ++l; + ++lineStart; + } + } + return lineStart; +} + +NSString *formatFloat(CGFloat f, int maxdps) { + NSMutableString *result = [NSMutableString + stringWithFormat:@"%.*f", maxdps, f]; + // delete trailing zeros + NSUInteger lastPos = [result length] - 1; + NSUInteger firstDigit = ([result characterAtIndex:0] == '-') ? 1 : 0; + while (lastPos > firstDigit) { + if ([result characterAtIndex:lastPos] == '0') { + [result deleteCharactersInRange:NSMakeRange(lastPos, 1)]; + lastPos -= 1; + } else { + break; + } + } + if ([result characterAtIndex:lastPos] == '.') { + [result deleteCharactersInRange:NSMakeRange(lastPos, 1)]; + lastPos -= 1; + } + if ([@"-0" isEqualToString:result]) + return @"0"; + else + return result; +} + +// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/Application.h b/tikzit-old/src/gtk/Application.h new file mode 100644 index 0000000..1b48a79 --- /dev/null +++ b/tikzit-old/src/gtk/Application.h @@ -0,0 +1,155 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import "InputDelegate.h" + +@class Application; +@class Configuration; +@class ContextWindow; +@class Preambles; +@class PreambleEditor; +@class PreviewWindow; +@class SettingsDialog; +@class StyleManager; +@class TikzDocument; +@class ToolBox; +@class Window; +@protocol Tool; + +extern Application* app; + +/** + * Manages the main application window + */ +@interface Application: NSObject { + // the main application configuration + Configuration *configFile; + // maintains the known (user-defined) styles + StyleManager *styleManager; + // maintains the preambles used for previews + Preambles *preambles; + // the last-accessed folders (for open and save dialogs) + NSString *lastOpenFolder; + NSString *lastSaveAsFolder; + + ToolBox *toolBox; + PreambleEditor *preambleWindow; + ContextWindow *contextWindow; + SettingsDialog *settingsDialog; + + // the open windows (array of Window*) + NSMutableArray *openWindows; + + // tools + id activeTool; + NSArray *tools; +} + +/** + * The main application configuration file + */ +@property (readonly) Configuration *mainConfiguration; + +/** + * The app-wide style manager instance + */ +@property (readonly) StyleManager *styleManager; + +/** + * The app-wide preambles registry + */ +@property (readonly) Preambles *preambles; + +/** + * The tools + */ +@property (readonly) NSArray *tools; + +/** + * The currently-selected tool + */ +@property (assign) id activeTool; + +/** + * The folder last actively chosen by a user for opening a file + */ +@property (copy) NSString *lastOpenFolder; + +/** + * The folder last actively chosen by a user for saving a file + */ +@property (copy) NSString *lastSaveAsFolder; + +/** + * The application instance. + */ ++ (Application*) app; + +/** + * Starts the application with a single window containing an empty file + */ +- (id) init; +/** + * Starts the application with the given files open + */ +- (id) initWithFiles:(NSArray*)files; + +/** + * Loads a new, empty document in a new window + */ +- (void) newWindow; +/** + * Loads an existing document from a file in a new window + * + * @param doc the document the new window should show + */ +- (void) newWindowWithDocument:(TikzDocument*)doc; +/** + * Quit the application, confirming with the user if there are + * changes to any open documents. + */ +- (void) quit; + +/** + * Show the dialog for editing preambles. + */ +- (void) presentPreamblesEditor; +/** + * Show the context-aware window + */ +- (void) presentContextWindow; +/** + * Show the settings dialog. + */ +- (void) presentSettingsDialog; + +/** + * Save the application configuration to permanent storage + * + * Should be called just before the application exits + */ +- (void) saveConfiguration; + +/** + * @result YES if key event was processed, NO otherwise + */ +- (BOOL) activateToolForKey:(unsigned int)keyVal withMask:(InputMask)mask; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/Application.m b/tikzit-old/src/gtk/Application.m new file mode 100644 index 0000000..e9935bd --- /dev/null +++ b/tikzit-old/src/gtk/Application.m @@ -0,0 +1,377 @@ +/* + * Copyright 2011-2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "Application.h" + +#import "Configuration.h" +#import "EdgeStylesModel.h" +#import "NodeStylesModel.h" +#import "PreambleEditor.h" +#import "ContextWindow.h" +#import "Shape.h" +#import "SettingsDialog.h" +#import "StyleManager.h" +#import "StyleManager+Storage.h" +#import "SupportDir.h" +#import "TikzDocument.h" +#import "ToolBox.h" +#import "Window.h" + +#ifdef HAVE_POPPLER +#import "Preambles.h" +#import "Preambles+Storage.h" +#endif + +#import "BoundingBoxTool.h" +#import "CreateNodeTool.h" +#import "CreateEdgeTool.h" +#import "HandTool.h" +#import "SelectTool.h" + +// used for args to g_mkdir_with_parents +#import "stat.h" + +Application* app = nil; + +@interface Application (Notifications) +- (void) windowClosed:(NSNotification*)notification; +- (void) windowGainedFocus:(NSNotification*)notification; +- (void) selectedToolChanged:(NSNotification*)notification; +- (void) windowDocumentChanged:(NSNotification*)n; +@end + +@interface Application (Private) +- (void) setActiveWindow:(Window*)window; +@end + +@implementation Application + +@synthesize mainConfiguration=configFile; +@synthesize styleManager, preambles; +@synthesize lastOpenFolder, lastSaveAsFolder; +@synthesize tools; + ++ (Application*) app { + if (app == nil) { + [[[self alloc] init] release]; + } + return app; +} + +- (id) _initCommon { + if (app != nil) { + [self release]; + self = app; + return self; + } + self = [super init]; + + if (self) { + NSError *error = nil; + configFile = [[Configuration alloc] initWithName:@"tikzit" loadError:&error]; + if (error != nil) { + logError (error, @"WARNING: Failed to load configuration"); + } + + styleManager = [[StyleManager alloc] init]; + [styleManager loadStylesUsingConfigurationName:@"styles"]; // FIXME: error message? + NodeStylesModel *nsm = [NodeStylesModel modelWithStyleManager:styleManager]; + EdgeStylesModel *esm = [EdgeStylesModel modelWithStyleManager:styleManager]; + +#ifdef HAVE_POPPLER + NSString *preamblesDir = [[SupportDir userSupportDir] stringByAppendingPathComponent:@"preambles"]; + preambles = [[Preambles alloc] initFromDirectory:preamblesDir]; // FIXME: error message? + [preambles setStyleManager:styleManager]; + NSString *selectedPreamble = [configFile stringEntry:@"selectedPreamble" inGroup:@"Preambles"]; + if (selectedPreamble != nil) { + [preambles setSelectedPreambleName:selectedPreamble]; + } +#endif + + lastOpenFolder = [[configFile stringEntry:@"lastOpenFolder" inGroup:@"Paths"] retain]; + if (lastOpenFolder == nil) + lastOpenFolder = [[configFile stringEntry:@"lastFolder" inGroup:@"Paths"] retain]; + lastSaveAsFolder = [[configFile stringEntry:@"lastSaveAsFolder" inGroup:@"Paths"] retain]; + if (lastSaveAsFolder == nil) + lastSaveAsFolder = [[configFile stringEntry:@"lastFolder" inGroup:@"Paths"] retain]; + + openWindows = [[NSMutableArray alloc] init]; + + tools = [[NSArray alloc] initWithObjects: + [SelectTool tool], + [CreateNodeTool toolWithNodeStylesModel:nsm], + [CreateEdgeTool toolWithEdgeStylesModel:esm], + [BoundingBoxTool tool], + [HandTool tool], + nil]; + activeTool = [tools objectAtIndex:0]; + for (id tool in tools) { + [tool loadConfiguration:configFile]; + } + + toolBox = [[ToolBox alloc] initWithTools:tools]; + [toolBox loadConfiguration:configFile]; + [toolBox setSelectedTool:activeTool]; + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(selectedToolChanged:) + name:@"ToolSelectionChanged" + object:toolBox]; + [toolBox show]; + + contextWindow = [[ContextWindow alloc] initWithNodeStylesModel:nsm + andEdgeStylesModel:esm]; + [contextWindow loadConfiguration:configFile]; + + app = [self retain]; + } + + return self; +} + +- (id) init { + self = [self _initCommon]; + + if (self) { + [self newWindow]; + } + + return self; +} + +- (id) initWithFiles:(NSArray*)files { + self = [self _initCommon]; + + if (self) { + int fileOpenCount = 0; + for (NSString *file in files) { + NSError *error = nil; + TikzDocument *doc = [TikzDocument documentFromFile:file styleManager:styleManager error:&error]; + if (doc != nil) { + [self newWindowWithDocument:doc]; + ++fileOpenCount; + } else { + logError(error, @"WARNING: failed to open file"); + } + } + if (fileOpenCount == 0) { + [self newWindow]; + } + } + + return self; +} + +- (void) dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + + [configFile release]; + [styleManager release]; + [preambles release]; + [lastOpenFolder release]; + [lastSaveAsFolder release]; + [preambleWindow release]; + [settingsDialog release]; + [openWindows release]; + [tools release]; + [activeTool release]; + [toolBox release]; + [contextWindow release]; + + [super dealloc]; +} + +- (id) activeTool { return activeTool; } +- (void) setActiveTool:(id)tool { + if (activeTool == tool) + return; + + activeTool = tool; + [toolBox setSelectedTool:tool]; + for (Window* window in openWindows) { + [window setActiveTool:tool]; + } +} + +- (BOOL) activateToolForKey:(unsigned int)keyVal withMask:(InputMask)mask { + // FIXME: cache the accel info, rather than reparsing it every time? + for (id tool in tools) { + guint toolKey = 0; + GdkModifierType toolMod = 0; + gtk_accelerator_parse ([[tool shortcut] UTF8String], &toolKey, &toolMod); + if (toolKey != 0 && toolKey == keyVal && (int)mask == (int)toolMod) { + [self setActiveTool:tool]; + return YES; + } + } + return NO; +} + +- (void) _addWindow:(Window*)window { + [window setActiveTool:activeTool]; + [openWindows addObject:window]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(windowClosed:) + name:@"WindowClosed" + object:window]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(windowGainedFocus:) + name:@"WindowGainedFocus" + object:window]; + if ([window hasFocus]) { + [self setActiveWindow:window]; + } +} + +- (void) newWindow { + [self _addWindow:[Window window]]; +} + +- (void) newWindowWithDocument:(TikzDocument*)doc { + [self _addWindow:[Window windowWithDocument:doc]]; +} + +- (void) quit { + NSMutableArray *unsavedDocs = [NSMutableArray arrayWithCapacity:[openWindows count]]; + for (Window *window in openWindows) { + TikzDocument *doc = [window document]; + if ([doc hasUnsavedChanges]) { + [unsavedDocs addObject:doc]; + } + } + if ([unsavedDocs count] > 0) { + // FIXME: show a dialog + return; + } + gtk_main_quit(); +} + +- (void) presentPreamblesEditor { +#ifdef HAVE_POPPLER + if (preambleWindow == nil) { + preambleWindow = [[PreambleEditor alloc] initWithPreambles:preambles]; + //[preambleWindow setParentWindow:mainWindow]; + } + [preambleWindow present]; +#endif +} + +- (void) presentContextWindow { + [contextWindow present]; +} + +- (void) presentSettingsDialog { + if (settingsDialog == nil) { + settingsDialog = [[SettingsDialog alloc] initWithConfiguration:configFile + andStyleManager:styleManager]; + //[settingsDialog setParentWindow:mainWindow]; + } + [settingsDialog present]; +} + +- (Configuration*) mainConfiguration { + return configFile; +} + +- (void) saveConfiguration { + NSError *error = nil; + +#ifdef HAVE_POPPLER + if (preambles != nil) { + NSString *preamblesDir = [[SupportDir userSupportDir] stringByAppendingPathComponent:@"preambles"]; + // NSFileManager is slightly dodgy on Windows + g_mkdir_with_parents ([preamblesDir UTF8String], S_IRUSR | S_IWUSR | S_IXUSR); + [preambles storeToDirectory:preamblesDir]; + [configFile setStringEntry:@"selectedPreamble" inGroup:@"Preambles" value:[preambles selectedPreambleName]]; + } +#endif + + [styleManager saveStylesUsingConfigurationName:@"styles"]; + + for (id tool in tools) { + [tool saveConfiguration:configFile]; + } + [toolBox saveConfiguration:configFile]; + + [contextWindow saveConfiguration:configFile]; + + if (lastOpenFolder != nil) { + [configFile setStringEntry:@"lastOpenFolder" inGroup:@"Paths" value:lastOpenFolder]; + } + if (lastSaveAsFolder != nil) { + [configFile setStringEntry:@"lastSaveAsFolder" inGroup:@"Paths" value:lastSaveAsFolder]; + } + + if (![configFile writeToStoreWithError:&error]) { + logError (error, @"Could not write config file"); + } +} + +@end + +@implementation Application (Notifications) +- (void) windowClosed:(NSNotification*)notification { + Window *window = [notification object]; + [openWindows removeObjectIdenticalTo:window]; + [[NSNotificationCenter defaultCenter] removeObserver:self + name:nil + object:window]; + if ([openWindows count] == 0) { + gtk_main_quit(); + } else { + [self setActiveWindow:[openWindows objectAtIndex:0]]; + } +} + +- (void) windowGainedFocus:(NSNotification*)notification { + Window *window = [notification object]; + [self setActiveWindow:window]; +} + +- (void) selectedToolChanged:(NSNotification*)n { + id tool = [[n userInfo] objectForKey:@"tool"]; + if (tool != nil) + [self setActiveTool:tool]; + else + NSLog(@"nil tool!"); +} + +- (void) windowDocumentChanged:(NSNotification*)n { + [contextWindow setDocument:[[n userInfo] objectForKey:@"document"]]; +} +@end + +@implementation Application (Private) +- (void) setActiveWindow:(Window*)window { + [[NSNotificationCenter defaultCenter] removeObserver:self + name:@"DocumentChanged" + object:nil]; + + [contextWindow setDocument:[window document]]; + + [contextWindow attachToWindow:window]; + [toolBox attachToWindow:window]; + + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(windowDocumentChanged:) + name:@"DocumentChanged" + object:window]; +} +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/BoundingBoxTool.h b/tikzit-old/src/gtk/BoundingBoxTool.h new file mode 100644 index 0000000..f6498b0 --- /dev/null +++ b/tikzit-old/src/gtk/BoundingBoxTool.h @@ -0,0 +1,45 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import "Tool.h" + +typedef enum { + NoHandle, + EastHandle, + SouthEastHandle, + SouthHandle, + SouthWestHandle, + WestHandle, + NorthWestHandle, + NorthHandle, + NorthEastHandle +} ResizeHandle; + +@interface BoundingBoxTool : NSObject { + GraphRenderer *renderer; + NSPoint dragOrigin; + ResizeHandle currentResizeHandle; + BOOL drawingNewBox; +} + ++ (id) tool; +- (id) init; +@end + + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/BoundingBoxTool.m b/tikzit-old/src/gtk/BoundingBoxTool.m new file mode 100644 index 0000000..483705e --- /dev/null +++ b/tikzit-old/src/gtk/BoundingBoxTool.m @@ -0,0 +1,353 @@ +/* + * Copyright 2011-2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "BoundingBoxTool.h" + +#import "GraphRenderer.h" +#import "TikzDocument.h" +#import "tzstockitems.h" + +static const float handle_size = 8.0; +float sideHandleTop(NSRect bbox) { + return (NSMinY(bbox) + NSMaxY(bbox) - handle_size)/2.0f; +} +float tbHandleLeft(NSRect bbox) { + return (NSMinX(bbox) + NSMaxX(bbox) - handle_size)/2.0f; +} + +@interface BoundingBoxTool (Private) +- (NSRect) screenBoundingBox; +- (ResizeHandle) boundingBoxResizeHandleAt:(NSPoint)p; +- (NSRect) boundingBoxResizeHandleRect:(ResizeHandle)handle; +- (void) setResizeCursorForHandle:(ResizeHandle)handle; +@end + +@implementation BoundingBoxTool +- (NSString*) name { return @"Bounding Box"; } +- (const gchar*) stockId { return TIKZIT_STOCK_BOUNDING_BOX; } +- (NSString*) helpText { return @"Set the bounding box"; } +- (NSString*) shortcut { return @"b"; } + ++ (id) tool { + return [[[self alloc] init] autorelease]; +} + +- (id) init { + self = [super init]; + + if (self) { + currentResizeHandle = NoHandle; + } + + return self; +} + +- (void) dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + + [renderer release]; + + [super dealloc]; +} + +- (GraphRenderer*) activeRenderer { return renderer; } +- (void) setActiveRenderer:(GraphRenderer*)r { + if (r == renderer) + return; + + [[renderer surface] setCursor:NormalCursor]; + + [r retain]; + [renderer release]; + renderer = r; +} + +- (GtkWidget*) configurationWidget { return NULL; } + +- (void) mousePressAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { + if (button != LeftButton) + return; + + dragOrigin = pos; + currentResizeHandle = [self boundingBoxResizeHandleAt:pos]; + [[renderer document] startChangeBoundingBox]; + if (currentResizeHandle == NoHandle) { + drawingNewBox = YES; + [[[renderer document] graph] setBoundingBox:NSZeroRect]; + } else { + drawingNewBox = NO; + } + [renderer invalidateGraph]; +} + +- (void) mouseMoveTo:(NSPoint)pos withButtons:(MouseButton)buttons andMask:(InputMask)mask { + if (!(buttons & LeftButton)) { + ResizeHandle handle = [self boundingBoxResizeHandleAt:pos]; + [self setResizeCursorForHandle:handle]; + return; + } + + Transformer *transformer = [renderer transformer]; + Grid *grid = [renderer grid]; + Graph *graph = [[renderer document] graph]; + + if (currentResizeHandle == NoHandle) { + NSRect bbox = NSRectAroundPoints( + [grid snapScreenPoint:dragOrigin], + [grid snapScreenPoint:pos] + ); + [graph setBoundingBox:[transformer rectFromScreen:bbox]]; + } else { + NSRect bbox = [transformer rectToScreen:[graph boundingBox]]; + NSPoint p2 = [grid snapScreenPoint:pos]; + + if (currentResizeHandle == NorthWestHandle || + currentResizeHandle == NorthHandle || + currentResizeHandle == NorthEastHandle) { + + float dy = p2.y - NSMinY(bbox); + if (dy < bbox.size.height) { + bbox.origin.y += dy; + bbox.size.height -= dy; + } else { + bbox.origin.y = NSMaxY(bbox); + bbox.size.height = 0; + } + + } else if (currentResizeHandle == SouthWestHandle || + currentResizeHandle == SouthHandle || + currentResizeHandle == SouthEastHandle) { + + float dy = p2.y - NSMaxY(bbox); + if (-dy < bbox.size.height) { + bbox.size.height += dy; + } else { + bbox.size.height = 0; + } + } + + if (currentResizeHandle == NorthWestHandle || + currentResizeHandle == WestHandle || + currentResizeHandle == SouthWestHandle) { + + float dx = p2.x - NSMinX(bbox); + if (dx < bbox.size.width) { + bbox.origin.x += dx; + bbox.size.width -= dx; + } else { + bbox.origin.x = NSMaxX(bbox); + bbox.size.width = 0; + } + + } else if (currentResizeHandle == NorthEastHandle || + currentResizeHandle == EastHandle || + currentResizeHandle == SouthEastHandle) { + + float dx = p2.x - NSMaxX(bbox); + if (-dx < bbox.size.width) { + bbox.size.width += dx; + } else { + bbox.size.width = 0; + } + } + [graph setBoundingBox:[transformer rectFromScreen:bbox]]; + } + [[renderer document] changeBoundingBoxCheckPoint]; + [renderer invalidateGraph]; +} + +- (void) mouseReleaseAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { + if (button != LeftButton) + return; + + [[renderer document] endChangeBoundingBox]; + drawingNewBox = NO; + [renderer invalidateGraph]; +} + +- (void) renderWithContext:(id)context onSurface:(id)surface { + if (!drawingNewBox && [[[renderer document] graph] hasBoundingBox]) { + [context saveState]; + + [context setAntialiasMode:AntialiasDisabled]; + [context setLineWidth:1.0]; + + [context startPath]; + [context rect:[self boundingBoxResizeHandleRect:EastHandle]]; + [context rect:[self boundingBoxResizeHandleRect:SouthEastHandle]]; + [context rect:[self boundingBoxResizeHandleRect:SouthHandle]]; + [context rect:[self boundingBoxResizeHandleRect:SouthWestHandle]]; + [context rect:[self boundingBoxResizeHandleRect:WestHandle]]; + [context rect:[self boundingBoxResizeHandleRect:NorthWestHandle]]; + [context rect:[self boundingBoxResizeHandleRect:NorthHandle]]; + [context rect:[self boundingBoxResizeHandleRect:NorthEastHandle]]; + [context strokePathWithColor:MakeSolidRColor (0.5, 0.5, 0.5)]; + + [context restoreState]; + } +} +- (void) loadConfiguration:(Configuration*)config {} +- (void) saveConfiguration:(Configuration*)config {} +@end + +@implementation BoundingBoxTool (Private) +- (NSRect) screenBoundingBox { + Transformer *transformer = [[renderer surface] transformer]; + Graph *graph = [[renderer document] graph]; + return [transformer rectToScreen:[graph boundingBox]]; +} + +- (ResizeHandle) boundingBoxResizeHandleAt:(NSPoint)p { + NSRect bbox = [self screenBoundingBox]; + if (p.x >= NSMaxX(bbox)) { + if (p.x <= NSMaxX(bbox) + handle_size) { + if (p.y >= NSMaxY(bbox)) { + if (p.y <= NSMaxY(bbox) + handle_size) { + return SouthEastHandle; + } + } else if (p.y <= NSMinY(bbox)) { + if (p.y >= NSMinY(bbox) - handle_size) { + return NorthEastHandle; + } + } else { + float eastHandleTop = sideHandleTop(bbox); + if (p.y >= eastHandleTop && p.y <= (eastHandleTop + handle_size)) { + return EastHandle; + } + } + } + } else if (p.x <= NSMinX(bbox)) { + if (p.x >= NSMinX(bbox) - handle_size) { + if (p.y >= NSMaxY(bbox)) { + if (p.y <= NSMaxY(bbox) + handle_size) { + return SouthWestHandle; + } + } else if (p.y <= NSMinY(bbox)) { + if (p.y >= NSMinY(bbox) - handle_size) { + return NorthWestHandle; + } + } else { + float westHandleTop = sideHandleTop(bbox); + if (p.y >= westHandleTop && p.y <= (westHandleTop + handle_size)) { + return WestHandle; + } + } + } + } else if (p.y >= NSMaxY(bbox)) { + if (p.y <= NSMaxY(bbox) + handle_size) { + float southHandleLeft = tbHandleLeft(bbox); + if (p.x >= southHandleLeft && p.x <= (southHandleLeft + handle_size)) { + return SouthHandle; + } + } + } else if (p.y <= NSMinY(bbox)) { + if (p.y >= NSMinY(bbox) - handle_size) { + float northHandleLeft = tbHandleLeft(bbox); + if (p.x >= northHandleLeft && p.x <= (northHandleLeft + handle_size)) { + return NorthHandle; + } + } + } + return NoHandle; +} + +- (NSRect) boundingBoxResizeHandleRect:(ResizeHandle)handle { + Graph *graph = [[renderer document] graph]; + if (![graph hasBoundingBox]) { + return NSZeroRect; + } + NSRect bbox = [self screenBoundingBox]; + float x; + float y; + switch (handle) { + case NorthEastHandle: + case EastHandle: + case SouthEastHandle: + x = NSMaxX(bbox); + break; + case NorthWestHandle: + case WestHandle: + case SouthWestHandle: + x = NSMinX(bbox) - handle_size; + break; + case SouthHandle: + case NorthHandle: + x = tbHandleLeft(bbox); + break; + default: + return NSZeroRect; + } + switch (handle) { + case EastHandle: + case WestHandle: + y = sideHandleTop(bbox); + break; + case SouthEastHandle: + case SouthHandle: + case SouthWestHandle: + y = NSMaxY(bbox); + break; + case NorthEastHandle: + case NorthHandle: + case NorthWestHandle: + y = NSMinY(bbox) - handle_size; + break; + default: + return NSZeroRect; + } + return NSMakeRect(x, y, handle_size, handle_size); +} + +- (void) setResizeCursorForHandle:(ResizeHandle)handle { + if (handle != currentResizeHandle) { + currentResizeHandle = handle; + Cursor c = NormalCursor; + switch (handle) { + case EastHandle: + c = ResizeRightCursor; + break; + case SouthEastHandle: + c = ResizeBottomRightCursor; + break; + case SouthHandle: + c = ResizeBottomCursor; + break; + case SouthWestHandle: + c = ResizeBottomLeftCursor; + break; + case WestHandle: + c = ResizeLeftCursor; + break; + case NorthWestHandle: + c = ResizeTopLeftCursor; + break; + case NorthHandle: + c = ResizeTopCursor; + break; + case NorthEastHandle: + c = ResizeTopRightCursor; + break; + default: + c = NormalCursor; + break; + } + [[renderer surface] setCursor:c]; + } +} +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/CairoRenderContext.h b/tikzit-old/src/gtk/CairoRenderContext.h new file mode 100644 index 0000000..ac9c5ee --- /dev/null +++ b/tikzit-old/src/gtk/CairoRenderContext.h @@ -0,0 +1,59 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import "RenderContext.h" +#import "Transformer.h" +#import +#import +#import + +@interface PangoTextLayout: NSObject { + PangoLayout *layout; + cairo_t *context; +} + ++ (PangoTextLayout*) layoutForContext:(cairo_t*)cr withFontSize:(CGFloat)fontSize; +- (id) initWithContext:(cairo_t*)cr fontSize:(CGFloat)fontSize; +- (void) setText:(NSString*)text; + +@end + +@interface CairoRenderContext: NSObject { + cairo_t *context; +} + ++ (CairoRenderContext*) contextForSurface:(cairo_surface_t*)surface; +- (id) initForSurface:(cairo_surface_t*)surface; + ++ (CairoRenderContext*) contextForWidget:(GtkWidget*)widget; +- (id) initForWidget:(GtkWidget*)widget; + ++ (CairoRenderContext*) contextForDrawable:(GdkDrawable*)d; +- (id) initForDrawable:(GdkDrawable*)d; + ++ (CairoRenderContext*) contextForPixbuf:(GdkPixbuf*)buf; +- (id) initForPixbuf:(GdkPixbuf*)buf; + +- (cairo_t*) cairoContext; +- (void) applyTransform:(Transformer*)transformer; + +- (void) clearSurface; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/CairoRenderContext.m b/tikzit-old/src/gtk/CairoRenderContext.m new file mode 100644 index 0000000..77e10b5 --- /dev/null +++ b/tikzit-old/src/gtk/CairoRenderContext.m @@ -0,0 +1,344 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "CairoRenderContext.h" + +#import "cairo_helpers.h" +#import "util.h" + +#import + +@implementation PangoTextLayout + +- (id) init { + [self release]; + return nil; +} + ++ (PangoTextLayout*) layoutForContext:(cairo_t*)cr withFontSize:(CGFloat)fontSize { + return [[[self alloc] initWithContext:cr fontSize:fontSize] autorelease]; +} + +- (id) initWithContext:(cairo_t*)cr fontSize:(CGFloat)fontSize { + self = [super init]; + + if (self) { + cairo_reference (cr); + context = cr; + layout = pango_cairo_create_layout (cr); + + PangoFontDescription *font_desc = pango_font_description_new (); + pango_font_description_set_family_static (font_desc, "Sans"); + pango_font_description_set_size (font_desc, pango_units_from_double (fontSize)); + pango_layout_set_font_description (layout, font_desc); + pango_font_description_free (font_desc); + } + + return self; +} + +- (void) setText:(NSString*)text { + pango_layout_set_text (layout, [text UTF8String], -1); +} + +- (NSSize) size { + int width, height; + pango_layout_get_size (layout, &width, &height); + return NSMakeSize (pango_units_to_double (width), pango_units_to_double (height)); +} + +- (NSString*) text { + return [NSString stringWithUTF8String:pango_layout_get_text (layout)]; +} + +- (void) showTextAt:(NSPoint)topLeft withColor:(RColor)color { + cairo_save (context); + + cairo_move_to(context, topLeft.x, topLeft.y); + cairo_set_source_rcolor (context, color); + pango_cairo_show_layout (context, layout); + + cairo_restore (context); +} + +- (void) dealloc { + if (layout) + g_object_unref (G_OBJECT (layout)); + if (context) + cairo_destroy (context); + + [super dealloc]; +} + +@end + +@implementation CairoRenderContext + +- (id) init { + [self release]; + return nil; +} + ++ (CairoRenderContext*) contextForSurface:(cairo_surface_t*)surface { + return [[[self alloc] initForSurface:surface] autorelease]; +} + +- (id) initForSurface:(cairo_surface_t*)surface { + self = [super init]; + + if (self) { + context = cairo_create (surface); + } + + return self; +} + ++ (CairoRenderContext*) contextForWidget:(GtkWidget*)widget { + return [[[self alloc] initForWidget:widget] autorelease]; +} + +- (id) initForWidget:(GtkWidget*)widget { + self = [super init]; + + if (self) { + GdkWindow *window = gtk_widget_get_window (widget); + if (window) { + context = gdk_cairo_create (window); + } else { + [self release]; + self = nil; + } + } + + return self; +} + ++ (CairoRenderContext*) contextForDrawable:(GdkDrawable*)d { + return [[[self alloc] initForDrawable:d] autorelease]; +} + +- (id) initForDrawable:(GdkDrawable*)d { + self = [super init]; + + if (self) { + context = gdk_cairo_create (d); + } + + return self; +} + ++ (CairoRenderContext*) contextForPixbuf:(GdkPixbuf*)pixbuf { + return [[[self alloc] initForPixbuf:pixbuf] autorelease]; +} + +- (id) initForPixbuf:(GdkPixbuf*)pixbuf { + self = [super init]; + + if (self) { + cairo_format_t format = -1; + + if (gdk_pixbuf_get_colorspace (pixbuf) != GDK_COLORSPACE_RGB) { + NSLog(@"Unsupported colorspace (must be RGB)"); + [self release]; + return nil; + } + if (gdk_pixbuf_get_bits_per_sample (pixbuf) != 8) { + NSLog(@"Unsupported bits per sample (must be 8)"); + [self release]; + return nil; + } + if (gdk_pixbuf_get_has_alpha (pixbuf)) { + if (gdk_pixbuf_get_n_channels (pixbuf) != 4) { + NSLog(@"Unsupported bits per sample (must be 4 for an image with alpha)"); + [self release]; + return nil; + } + format = CAIRO_FORMAT_ARGB32; + } else { + if (gdk_pixbuf_get_n_channels (pixbuf) != 3) { + NSLog(@"Unsupported bits per sample (must be 3 for an image without alpha)"); + [self release]; + return nil; + } + format = CAIRO_FORMAT_RGB24; + } + + cairo_surface_t *surface = cairo_image_surface_create_for_data( + gdk_pixbuf_get_pixels(pixbuf), + format, + gdk_pixbuf_get_width(pixbuf), + gdk_pixbuf_get_height(pixbuf), + gdk_pixbuf_get_rowstride(pixbuf)); + context = cairo_create (surface); + cairo_surface_destroy (surface); + } + + return self; +} + +- (cairo_t*) cairoContext { + return context; +} + +- (void) applyTransform:(Transformer*)transformer { + NSPoint origin = [transformer toScreen:NSZeroPoint]; + cairo_translate (context, origin.x, origin.y); + NSPoint scale = [transformer toScreen:NSMakePoint (1.0f, 1.0f)]; + scale.x -= origin.x; + scale.y -= origin.y; + cairo_scale (context, scale.x, scale.y); +} + +- (void) saveState { + cairo_save (context); +} + +- (void) restoreState { + cairo_restore (context); +} + +- (NSRect) clipBoundingBox { + double clipx1, clipx2, clipy1, clipy2; + cairo_clip_extents (context, &clipx1, &clipy1, &clipx2, &clipy2); + return NSMakeRect (clipx1, clipy1, clipx2-clipx1, clipy2-clipy1); +} + +- (BOOL) strokeIncludesPoint:(NSPoint)p { + return cairo_in_stroke (context, p.x, p.y); +} + +- (BOOL) fillIncludesPoint:(NSPoint)p { + return cairo_in_fill (context, p.x, p.y); +} + +- (id) layoutText:(NSString*)text withSize:(CGFloat)fontSize { + PangoTextLayout *layout = [PangoTextLayout layoutForContext:context withFontSize:fontSize]; + [layout setText:text]; + return layout; +} + +- (void) setAntialiasMode:(AntialiasMode)mode { + if (mode == AntialiasDisabled) { + cairo_set_antialias (context, CAIRO_ANTIALIAS_NONE); + } else { + cairo_set_antialias (context, CAIRO_ANTIALIAS_DEFAULT); + } +} + +- (void) setLineWidth:(CGFloat)width { + cairo_set_line_width (context, width); +} + +- (void) setLineDash:(CGFloat)dashLength { + if (dashLength <= 0.0) { + cairo_set_dash (context, NULL, 0, 0); + } else { + double dashes[] = { dashLength }; + cairo_set_dash (context, dashes, 1, 0); + } +} + +// paths +- (void) startPath { + cairo_new_path (context); +} + +- (void) closeSubPath { + cairo_close_path (context); +} + +- (void) moveTo:(NSPoint)p { + cairo_move_to(context, p.x, p.y); +} + +- (void) curveTo:(NSPoint)end withCp1:(NSPoint)cp1 andCp2:(NSPoint)cp2 { + cairo_curve_to (context, cp1.x, cp1.y, cp2.x, cp2.y, end.x, end.y); +} + +- (void) lineTo:(NSPoint)end { + cairo_line_to (context, end.x, end.y); +} + +- (void) rect:(NSRect)rect { + cairo_rectangle (context, rect.origin.x, rect.origin.y, rect.size.width, rect.size.height); +} + +- (void) circleAt:(NSPoint)c withRadius:(CGFloat)r { + cairo_new_sub_path (context); + cairo_arc (context, c.x, c.y, r, 0, 2 * M_PI); +} + +- (void) strokePathWithColor:(RColor)color { + cairo_set_source_rcolor (context, color); + cairo_stroke (context); +} + +- (void) fillPathWithColor:(RColor)color { + cairo_set_source_rcolor (context, color); + cairo_fill (context); +} + +- (void) strokePathWithColor:(RColor)scolor + andFillWithColor:(RColor)fcolor { + cairo_set_source_rcolor (context, fcolor); + cairo_fill_preserve (context); + cairo_set_source_rcolor (context, scolor); + cairo_stroke (context); +} + +- (void) strokePathWithColor:(RColor)scolor + andFillWithColor:(RColor)fcolor + usingAlpha:(CGFloat)alpha { + cairo_push_group (context); + cairo_set_source_rcolor (context, fcolor); + cairo_fill_preserve (context); + cairo_set_source_rcolor (context, scolor); + cairo_stroke (context); + cairo_pop_group_to_source (context); + cairo_paint_with_alpha (context, alpha); +} + +- (void) clipToPath { + cairo_clip (context); +} + +- (void) paintWithColor:(RColor)color { + cairo_set_source_rcolor (context, color); + cairo_paint (context); +} + +- (void) clearSurface { + cairo_operator_t old_op = cairo_get_operator (context); + + cairo_set_operator (context, CAIRO_OPERATOR_SOURCE); + cairo_set_source_rgba (context, 0.0, 0.0, 0.0, 0.0); + cairo_paint (context); + + cairo_set_operator (context, old_op); +} + +- (void) dealloc { + if (context) { + cairo_destroy (context); + } + + [super dealloc]; +} + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/ColorRGB+Gtk.h b/tikzit-old/src/gtk/ColorRGB+Gtk.h new file mode 100644 index 0000000..5cfb4d7 --- /dev/null +++ b/tikzit-old/src/gtk/ColorRGB+Gtk.h @@ -0,0 +1,30 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import "ColorRGB.h" +#import + +@interface ColorRGB (Gtk) + ++ (ColorRGB*) colorWithGdkColor:(GdkColor)color; +- (id) initWithGdkColor:(GdkColor)color; +- (GdkColor) gdkColor; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/ColorRGB+Gtk.m b/tikzit-old/src/gtk/ColorRGB+Gtk.m new file mode 100644 index 0000000..be5dd56 --- /dev/null +++ b/tikzit-old/src/gtk/ColorRGB+Gtk.m @@ -0,0 +1,46 @@ +/* + * Copyright 2011 Alex Merry + * Copyright 2010 Chris Heunen + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "ColorRGB+Gtk.h" + +// 257 = 65535/255 +// GdkColor values run from 0 to 65535, not from 0 to 255 +#define GDK_FACTOR 257 + +@implementation ColorRGB (Gtk) + ++ (ColorRGB*) colorWithGdkColor:(GdkColor)color { + return [ColorRGB colorWithRed:color.red/GDK_FACTOR green:color.green/GDK_FACTOR blue:color.blue/GDK_FACTOR]; +} + +- (id) initWithGdkColor:(GdkColor)color { + return [self initWithRed:color.red/GDK_FACTOR green:color.green/GDK_FACTOR blue:color.blue/GDK_FACTOR]; +} + +- (GdkColor) gdkColor { + GdkColor color; + color.pixel = 0; + color.red = GDK_FACTOR * [self red]; + color.green = GDK_FACTOR * [self green]; + color.blue = GDK_FACTOR * [self blue]; + return color; +} + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/ColorRGB+IntegerListStorage.h b/tikzit-old/src/gtk/ColorRGB+IntegerListStorage.h new file mode 100644 index 0000000..118eaee --- /dev/null +++ b/tikzit-old/src/gtk/ColorRGB+IntegerListStorage.h @@ -0,0 +1,32 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import "ColorRGB.h" + +/** + * Stores a ColorRGB as a list of short integers + */ +@interface ColorRGB (IntegerListStorage) + ++ (ColorRGB*) colorFromValueList:(NSArray*)values; +- (id) initFromValueList:(NSArray*)values; +- (NSArray*) valueList; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/ColorRGB+IntegerListStorage.m b/tikzit-old/src/gtk/ColorRGB+IntegerListStorage.m new file mode 100644 index 0000000..0103a3c --- /dev/null +++ b/tikzit-old/src/gtk/ColorRGB+IntegerListStorage.m @@ -0,0 +1,57 @@ +/* + * Copyright 2011 Alex Merry + * Copyright 2010 Chris Heunen + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "ColorRGB+IntegerListStorage.h" + +@implementation ColorRGB (IntegerListStorage) + ++ (ColorRGB*) colorFromValueList:(NSArray*)values { + if ([values count] != 3) { + return nil; + } + + unsigned short redValue = [[values objectAtIndex:0] intValue]; + unsigned short greenValue = [[values objectAtIndex:1] intValue]; + unsigned short blueValue = [[values objectAtIndex:2] intValue]; + return [ColorRGB colorWithRed:redValue green:greenValue blue:blueValue]; +} + +- (id) initFromValueList:(NSArray*)values { + if ([values count] != 3) { + [self release]; + return nil; + } + + unsigned short redValue = [[values objectAtIndex:0] intValue]; + unsigned short greenValue = [[values objectAtIndex:1] intValue]; + unsigned short blueValue = [[values objectAtIndex:2] intValue]; + + return [self initWithRed:redValue green:greenValue blue:blueValue]; +} + +- (NSArray*) valueList { + NSMutableArray *array = [NSMutableArray arrayWithCapacity:3]; + [array addObject:[NSNumber numberWithInt:[self red]]]; + [array addObject:[NSNumber numberWithInt:[self green]]]; + [array addObject:[NSNumber numberWithInt:[self blue]]]; + return array; +} + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/Configuration.h b/tikzit-old/src/gtk/Configuration.h new file mode 100644 index 0000000..6c68681 --- /dev/null +++ b/tikzit-old/src/gtk/Configuration.h @@ -0,0 +1,447 @@ +// +// Configuration.h +// TikZiT +// +// Copyright 2010 Alex Merry +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "TZFoundation.h" + +/** + * Manages configuration information in a grouped key-value format. + */ +@interface Configuration : NSObject { + NSString *name; + GKeyFile *file; +} + +/** + * Check whether there is any existing configuration. + */ ++ (BOOL) configurationExistsWithName:(NSString*)name; +/** + * Create a blank configuration with the given name, without loading + * any existing configuration information. + * + * @param name the name of the configuration + */ ++ (Configuration*) emptyConfigurationWithName:(NSString*)name; +/** + * Load an existing configuration for the given name. + * + * If there was no existing configuration, or it could not be opened, + * an empty configuration will be returned. + * + * @param name the name of the configuration + */ ++ (Configuration*) configurationWithName:(NSString*)name; +/** + * Load an existing configuration for the given name. + * + * If there was no existing configuration, or it could not be opened, + * an empty configuration will be returned. + * + * @param name the name of the configuration + * @param error this will be set if the configuration exists, but could + * not be opened. + */ ++ (Configuration*) configurationWithName:(NSString*)name loadError:(NSError**)error; + +/** + * Initialise the configuration to be empty + * + * Does not attempt to load any existing configuration data. + * + * @param name the name of the configuration + */ +- (id) initEmptyWithName:(NSString*)name; +/** + * Initialise a configuration, loading it if it had previously been stored. + * + * If there was no existing configuration, or it could not be opened, + * an empty configuration will be returned. + * + * @param name the name of the configuration + */ +- (id) initWithName:(NSString*)name; +/** + * Initialise a configuration, loading it if it had previously been stored. + * + * If there was no existing configuration, or it could not be opened, + * an empty configuration will be returned. + * + * @param name the name of the configuration + * @param error this will be set if the configuration exists, but could + * not be opened. + */ +- (id) initWithName:(NSString*)name loadError:(NSError**)error; + +/** + * The name of the configuration. + * + * Configurations with different names are stored independently. + */ +- (NSString*) name; +/** + * Set the name of the configuration. + * + * This will affect the behaviour of [-writeToStore] + * + * Configurations with different names are stored independently. + */ +- (void) setName:(NSString*)name; + +/** + * Writes the configuration to the backing store. + * + * The location the configuration is written to is determined by the + * [-name] property. + * + * @result YES if the configuration was successfully written, NO otherwise + */ +- (BOOL) writeToStore; +/** + * Writes the configuration to the backing store. + * + * The location the configuration is written to is determined by the + * [-name] property. + * + * @param error this will be set if the configuration could not be written + * to the backing store + * @result YES if the configuration was successfully written, NO otherwise + */ +- (BOOL) writeToStoreWithError:(NSError**)error; + +/** + * Check whether a particular key exists within a group + * + * @param key the key to check for + * @param group the name of the group to look in + * @result YES if the key exists, NO otherwise + */ +- (BOOL) hasKey:(NSString*)key inGroup:(NSString*)group; +/** + * Check whether a particular group exists + * + * @param group the name of the group to check for + * @result YES if the group exists, NO otherwise + */ +- (BOOL) hasGroup:(NSString*)group; +/** + * List the groups in the configuration. + * + * @result a list of group names + */ +- (NSArray*) groups; + +/** + * Get the value associated with a key as a string + * + * This is only guaranteed to work if the value was stored as a string. + * + * @param key the key to fetch the data for + * @param group the name of the group to look in + * @result the value associated with key as a string, or nil + * if no string value was associated with key + */ +- (NSString*) stringEntry:(NSString*)key inGroup:(NSString*)group; +/** + * Get the value associated with a key as a string + * + * This is only guaranteed to work if the value was stored as a string. + * + * @param key the key to fetch the data for + * @param group the name of the group to look in + * @param def the value to return if no string value was associated with key + * @result the value associated with key as a string, or default + */ +- (NSString*) stringEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSString*)def; +/** + * Get the value associated with a key as a boolean + * + * This is only guaranteed to work if the value was stored as a boolean. + * + * @param key the key to fetch the data for + * @param group the name of the group to look in + * @result the value associated with key as a boolean, or NO + * if no boolean value was associated with key + */ +- (BOOL) booleanEntry:(NSString*)key inGroup:(NSString*)group; +/** + * Get the value associated with a key as a boolean + * + * This is only guaranteed to work if the value was stored as a boolean. + * + * @param key the key to fetch the data for + * @param group the name of the group to look in + * @param def the value to return if no boolean value was associated with key + * @result the value associated with key as a boolean, or def + */ +- (BOOL) booleanEntry:(NSString*)key inGroup:(NSString*)group withDefault:(BOOL)def; +/** + * Get the value associated with a key as a integer + * + * This is only guaranteed to work if the value was stored as a integer. + * + * @param key the key to fetch the data for + * @param group the name of the group to look in + * @result the value associated with key as a integer, or 0 + * if no integer value was associated with key + */ +- (int) integerEntry:(NSString*)key inGroup:(NSString*)group; +/** + * Get the value associated with a key as a integer + * + * This is only guaranteed to work if the value was stored as a integer. + * + * @param key the key to fetch the data for + * @param group the name of the group to look in + * @param def the value to return if no integer value was associated with key + * @result the value associated with key as a integer, or def + */ +- (int) integerEntry:(NSString*)key inGroup:(NSString*)group withDefault:(int)def; +/** + * Get the value associated with a key as a double + * + * This is only guaranteed to work if the value was stored as a double. + * + * @param key the key to fetch the data for + * @param group the name of the group to look in + * @result the value associated with key as a double, or 0 + * if no double value was associated with key + */ +- (double) doubleEntry:(NSString*)key inGroup:(NSString*)group; +/** + * Get the value associated with a key as a double + * + * This is only guaranteed to work if the value was stored as a double. + * + * @param key the key to fetch the data for + * @param group the name of the group to look in + * @param def the value to return if no double value was associated with key + * @result the value associated with key as a double, or def + */ +- (double) doubleEntry:(NSString*)key inGroup:(NSString*)group withDefault:(double)def; + +/** + * Get the value associated with a key as a list of strings + * + * This is only guaranteed to work if the value was stored as a + * list of strings. + * + * @param key the key to fetch the data for + * @param group the name of the group to look in + * @result the value associated with key as a list of strings, + * or nil if no list of strings was associated with key + */ +- (NSArray*) stringListEntry:(NSString*)key inGroup:(NSString*)group; +/** + * Get the value associated with a key as a list of strings + * + * This is only guaranteed to work if the value was stored as a + * list of strings. + * + * @param key the key to fetch the data for + * @param group the name of the group to look in + * @param def the value to return if no string list value was associated with key + * @result the value associated with key as a list of strings, or def + */ +- (NSArray*) stringListEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSArray*)def; +/** + * Get the value associated with a key as a list of booleans + * + * This is only guaranteed to work if the value was stored as a + * list of booleans. + * + * @param key the key to fetch the data for + * @param group the name of the group to look in + * @result the value associated with key as a list of NSNumber + * objects, containing boolean values, or nil + */ +- (NSArray*) booleanListEntry:(NSString*)key inGroup:(NSString*)group; +/** + * Get the value associated with a key as a list of booleans + * + * This is only guaranteed to work if the value was stored as a + * list of booleans. + * + * @param key the key to fetch the data for + * @param group the name of the group to look in + * @param def the value to return if no boolean list value was associated with key + * @result the value associated with key as a list of NSNumber + * objects, containing boolean values, or def + */ +- (NSArray*) booleanListEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSArray*)def; +/** + * Get the value associated with a key as a list of integers + * + * This is only guaranteed to work if the value was stored as a + * list of integers. + * + * @param key the key to fetch the data for + * @param group the name of the group to look in + * @result the value associated with key as a list of NSNumber + * objects, containing integer values, or nil + */ +- (NSArray*) integerListEntry:(NSString*)key inGroup:(NSString*)group; +/** + * Get the value associated with a key as a list of integers + * + * This is only guaranteed to work if the value was stored as a + * list of integers. + * + * @param key the key to fetch the data for + * @param group the name of the group to look in + * @param def the value to return if no integer list value was associated with key + * @result the value associated with key as a list of NSNumber + * objects, containing integer values, or def + */ +- (NSArray*) integerListEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSArray*)def; +/** + * Get the value associated with a key as a list of doubles + * + * This is only guaranteed to work if the value was stored as a + * list of doubles. + * + * @param key the key to fetch the data for + * @param group the name of the group to look in + * @result the value associated with key as a list of NSNumber + * objects, containing double values, or nil + */ +- (NSArray*) doubleListEntry:(NSString*)key inGroup:(NSString*)group; +/** + * Get the value associated with a key as a list of doubles + * + * This is only guaranteed to work if the value was stored as a + * list of doubles. + * + * @param key the key to fetch the data for + * @param group the name of the group to look in + * @param def the value to return if no double list value was associated with key + * @result the value associated with key as a list of NSNumber + * objects, containing double values, or def + */ +- (NSArray*) doubleListEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSArray*)def; + +/** + * Associate a string value with a key. + * + * Any previous value (of any type) with the same key and group will + * be overwritten. + * + * @param key the key to associate the value with + * @param group the group to store the association in + * @param value the value to store + */ +- (void) setStringEntry:(NSString*)key inGroup:(NSString*)group value:(NSString*)value; +/** + * Associate a boolean value with a key. + * + * Any previous value (of any type) with the same key and group will + * be overwritten. + * + * @param key the key to associate the value with + * @param group the group to store the association in + * @param value the value to store + */ +- (void) setBooleanEntry:(NSString*)key inGroup:(NSString*)group value:(BOOL)value; +/** + * Associate a integer value with a key. + * + * Any previous value (of any type) with the same key and group will + * be overwritten. + * + * @param key the key to associate the value with + * @param group the group to store the association in + * @param value the value to store + */ +- (void) setIntegerEntry:(NSString*)key inGroup:(NSString*)group value:(int)value; +/** + * Associate a double value with a key. + * + * Any previous value (of any type) with the same key and group will + * be overwritten. + * + * @param key the key to associate the value with + * @param group the group to store the association in + * @param value the value to store + */ +- (void) setDoubleEntry:(NSString*)key inGroup:(NSString*)group value:(double)value; + +/** + * Associate a list of string values with a key. + * + * Any previous value (of any type) with the same key and group will + * be overwritten. + * + * @param key the key to associate the list with + * @param group the group to store the association in + * @param value the list to store, as an array of strings + */ +- (void) setStringListEntry:(NSString*)key inGroup:(NSString*)group value:(NSArray*)value; +/** + * Associate a list of boolean values with a key. + * + * Any previous value (of any type) with the same key and group will + * be overwritten. + * + * @param key the key to associate the list with + * @param group the group to store the association in + * @param value the list to store, as an array of NSNumber objects + */ +- (void) setBooleanListEntry:(NSString*)key inGroup:(NSString*)group value:(NSArray*)value; +/** + * Associate a list of integer values with a key. + * + * Any previous value (of any type) with the same key and group will + * be overwritten. + * + * @param key the key to associate the list with + * @param group the group to store the association in + * @param value the list to store, as an array of NSNumber objects + */ +- (void) setIntegerListEntry:(NSString*)key inGroup:(NSString*)group value:(NSArray*)value; +/** + * Associate a list of double values with a key. + * + * Any previous value (of any type) with the same key and group will + * be overwritten. + * + * @param key the key to associate the list with + * @param group the group to store the association in + * @param value the list to store, as an array of NSNumber objects + */ +- (void) setDoubleListEntry:(NSString*)key inGroup:(NSString*)group value:(NSArray*)value; + +/** + * Remove a group from the configuration + * + * This will remove all the groups key-value associations. + */ +- (void) removeGroup:(NSString*)group; +/** + * Remove a key from the configuration + * + * @param key the key to remove + * @param group the group to remove it from + */ +- (void) removeKey:(NSString*)key inGroup:(NSString*)group; + +@end + +// vim:ft=objc:sts=4:sw=4:et diff --git a/tikzit-old/src/gtk/Configuration.m b/tikzit-old/src/gtk/Configuration.m new file mode 100644 index 0000000..4a3ed79 --- /dev/null +++ b/tikzit-old/src/gtk/Configuration.m @@ -0,0 +1,450 @@ +// +// Configuration.h +// TikZiT +// +// Copyright 2010 Alex Merry +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "Configuration.h" +#import "SupportDir.h" + +@implementation Configuration + ++ (NSString*) _pathFromName:(NSString*)name { + return [NSString stringWithFormat:@"%@/%@.conf", [SupportDir userSupportDir], name]; +} + ++ (BOOL) configurationExistsWithName:(NSString*)name { + BOOL isDir; + BOOL exists = [[NSFileManager defaultManager] fileExistsAtPath:[self _pathFromName:name] isDirectory:&isDir]; + return exists && !isDir; +} + ++ (Configuration*) emptyConfigurationWithName:(NSString*)name + { return [[[self alloc] initEmptyWithName:name] autorelease]; } ++ (Configuration*) configurationWithName:(NSString*)name + { return [[[self alloc] initWithName:name] autorelease]; } ++ (Configuration*) configurationWithName:(NSString*)name loadError:(NSError**)error + { return [[[self alloc] initWithName:name loadError:error] autorelease]; } + +- (id) init +{ + [self release]; + return nil; +} + +- (id) initEmptyWithName:(NSString*)n +{ + self = [super init]; + if (self) { + name = [n retain]; + file = g_key_file_new (); + } + + return self; +} + +- (id) _initFromFile:(NSString*)path error:(NSError**)error +{ + self = [super init]; + if (self) { + file = g_key_file_new (); + + NSFileManager *manager = [NSFileManager defaultManager]; + if ([manager fileExistsAtPath:path]) { + gchar *filename = [path glibFilename]; + + GError *gerror = NULL; + g_key_file_load_from_file (file, + filename, + G_KEY_FILE_NONE, + &gerror); + g_free (filename); + + if (gerror) { + GErrorToNSError (gerror, error); + g_error_free (gerror); + } + } + } + + return self; +} + +- (id) initWithName:(NSString*)n { + return [self initWithName:n loadError:NULL]; +} + +- (id) initWithName:(NSString*)n loadError:(NSError**)error { + self = [self _initFromFile:[Configuration _pathFromName:n] error:error]; + + if (self) { + name = [n retain]; + } + + return self; +} + +- (BOOL) _ensureParentExists:(NSString*)path error:(NSError**)error { + NSString *directory = [path stringByDeletingLastPathComponent]; + return [[NSFileManager defaultManager] ensureDirectoryExists:directory error:error]; +} + +- (BOOL) _writeFileTo:(NSString*)path error:(NSError**)error +{ + if (![self _ensureParentExists:path error:error]) { + return NO; + } + + BOOL success = NO; + gsize length; + gchar *data = g_key_file_to_data (file, &length, NULL); // never reports an error + if (data && length) { + GError *gerror = NULL; + gchar* nativePath = [path glibFilename]; + success = g_file_set_contents (nativePath, data, length, &gerror) ? YES : NO; + g_free (data); + g_free (nativePath); + if (gerror) { + g_warning ("Failed to write file: %s\n", gerror->message); + GErrorToNSError (gerror, error); + g_error_free (gerror); + } + } else { + [[NSFileManager defaultManager] removeFileAtPath:path handler:nil]; + success = YES; + } + + return success; +} + +- (NSString*) name { + return name; +} + +- (void) setName:(NSString*)n { + [n retain]; + [name release]; + name = n; +} + +- (BOOL) writeToStore { + return [self writeToStoreWithError:NULL]; +} + +- (BOOL) writeToStoreWithError:(NSError**)error { + return [self _writeFileTo:[Configuration _pathFromName:name] error:error]; +} + +- (BOOL) hasKey:(NSString*)key inGroup:(NSString*)group +{ + gboolean result = g_key_file_has_key (file, [group UTF8String], [key UTF8String], NULL); + return result ? YES : NO; +} + +- (BOOL) hasGroup:(NSString*)group +{ + gboolean result = g_key_file_has_group (file, [group UTF8String]); + return result ? YES : NO; +} + +- (NSArray*) keys:(NSString*)group +{ + gsize length; + gchar **keys = g_key_file_get_keys (file, [group UTF8String], &length, NULL); + if (!keys) + length = 0; + + NSMutableArray *array = [NSMutableArray arrayWithCapacity:length]; + for (int i = 0; i < length; ++i) { + [array addObject:[NSString stringWithUTF8String:keys[i]]]; + } + g_strfreev (keys); + return array; +} + +- (NSArray*) groups +{ + gsize length; + gchar **groups = g_key_file_get_groups (file, &length); + NSMutableArray *array = [NSMutableArray arrayWithCapacity:length]; + for (int i = 0; i < length; ++i) { + [array addObject:[NSString stringWithUTF8String:groups[i]]]; + } + g_strfreev (groups); + return array; +} + +- (NSString*) stringEntry:(NSString*)key inGroup:(NSString*)group +{ + return [self stringEntry:key inGroup:group withDefault:nil]; +} + +- (NSString*) stringEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSString*)def +{ + NSString *result = def; + gchar *entry = g_key_file_get_string (file, [group UTF8String], [key UTF8String], NULL); + if (entry) { + result = [NSString stringWithUTF8String:entry]; + g_free (entry); + } + return result; +} + +- (BOOL) booleanEntry:(NSString*)key inGroup:(NSString*)group withDefault:(BOOL)def +{ + GError *error = NULL; + gboolean result = g_key_file_get_boolean (file, [group UTF8String], [key UTF8String], &error); + if (error != NULL) { + g_error_free (error); + return def; + } else { + return result ? YES : NO; + } +} + +- (BOOL) booleanEntry:(NSString*)key inGroup:(NSString*)group +{ + gboolean result = g_key_file_get_boolean (file, [group UTF8String], [key UTF8String], NULL); + return result ? YES : NO; +} + +- (int) integerEntry:(NSString*)key inGroup:(NSString*)group withDefault:(int)def +{ + GError *error = NULL; + int result = g_key_file_get_integer (file, [group UTF8String], [key UTF8String], &error); + if (error != NULL) { + g_error_free (error); + return def; + } else { + return result; + } +} + +- (int) integerEntry:(NSString*)key inGroup:(NSString*)group +{ + return g_key_file_get_integer (file, [group UTF8String], [key UTF8String], NULL); +} + +- (double) doubleEntry:(NSString*)key inGroup:(NSString*)group withDefault:(double)def +{ + GError *error = NULL; + double result = g_key_file_get_double (file, [group UTF8String], [key UTF8String], &error); + if (error != NULL) { + g_error_free (error); + return def; + } else { + return result; + } +} + +- (double) doubleEntry:(NSString*)key inGroup:(NSString*)group +{ + return g_key_file_get_double (file, [group UTF8String], [key UTF8String], NULL); +} + +- (NSArray*) stringListEntry:(NSString*)key inGroup:(NSString*)group +{ + return [self stringListEntry:key inGroup:group withDefault:nil]; +} + +- (NSArray*) stringListEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSArray*)def +{ + gsize length; + gchar **list = g_key_file_get_string_list (file, [group UTF8String], [key UTF8String], &length, NULL); + if (list) { + NSMutableArray *result = [NSMutableArray arrayWithCapacity:length]; + for (int i = 0; i < length; ++i) { + [result addObject:[NSString stringWithUTF8String:list[i]]]; + } + g_strfreev (list); + return result; + } else { + return def; + } +} + +- (NSArray*) booleanListEntry:(NSString*)key inGroup:(NSString*)group +{ + return [self booleanListEntry:key inGroup:group withDefault:nil]; +} + +- (NSArray*) booleanListEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSArray*)def +{ + gsize length; + gboolean *list = g_key_file_get_boolean_list (file, [group UTF8String], [key UTF8String], &length, NULL); + if (list) { + NSMutableArray *result = [NSMutableArray arrayWithCapacity:length]; + for (int i = 0; i < length; ++i) { + [result addObject:[NSNumber numberWithBool:list[i]]]; + } + g_free (list); + return result; + } else { + return def; + } +} + +- (NSArray*) integerListEntry:(NSString*)key inGroup:(NSString*)group +{ + return [self integerListEntry:key inGroup:group withDefault:nil]; +} + +- (NSArray*) integerListEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSArray*)def +{ + gsize length; + gint *list = g_key_file_get_integer_list (file, [group UTF8String], [key UTF8String], &length, NULL); + if (list) { + NSMutableArray *result = [NSMutableArray arrayWithCapacity:length]; + for (int i = 0; i < length; ++i) { + [result addObject:[NSNumber numberWithInt:list[i]]]; + } + g_free (list); + return result; + } else { + return def; + } +} + +- (NSArray*) doubleListEntry:(NSString*)key inGroup:(NSString*)group +{ + return [self doubleListEntry:key inGroup:group withDefault:nil]; +} + +- (NSArray*) doubleListEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSArray*)def +{ + gsize length; + double *list = g_key_file_get_double_list (file, [group UTF8String], [key UTF8String], &length, NULL); + if (list) { + NSMutableArray *result = [NSMutableArray arrayWithCapacity:length]; + for (int i = 0; i < length; ++i) { + [result addObject:[NSNumber numberWithDouble:list[i]]]; + } + g_free (list); + return result; + } else { + return def; + } +} + +- (void) setStringEntry:(NSString*)key inGroup:(NSString*)group value:(NSString*)value +{ + if (value == nil) { + [self removeKey:key inGroup:group]; + return; + } + g_key_file_set_string (file, [group UTF8String], [key UTF8String], [value UTF8String]); +} + +- (void) setBooleanEntry:(NSString*)key inGroup:(NSString*)group value:(BOOL)value; +{ + g_key_file_set_boolean (file, [group UTF8String], [key UTF8String], value); +} + +- (void) setIntegerEntry:(NSString*)key inGroup:(NSString*)group value:(int)value; +{ + g_key_file_set_integer (file, [group UTF8String], [key UTF8String], value); +} + +- (void) setDoubleEntry:(NSString*)key inGroup:(NSString*)group value:(double)value; +{ + g_key_file_set_double (file, [group UTF8String], [key UTF8String], value); +} + + +- (void) setStringListEntry:(NSString*)key inGroup:(NSString*)group value:(NSArray*)value +{ + if (value == nil) { + [self removeKey:key inGroup:group]; + return; + } + gsize length = [value count]; + const gchar * *list = g_new (const gchar *, length); + for (int i = 0; i < length; ++i) { + list[i] = [[value objectAtIndex:i] UTF8String]; + } + g_key_file_set_string_list (file, [group UTF8String], [key UTF8String], list, length); + g_free (list); +} + +- (void) setBooleanListEntry:(NSString*)key inGroup:(NSString*)group value:(NSArray*)value; +{ + if (value == nil) { + [self removeKey:key inGroup:group]; + return; + } + gsize length = [value count]; + gboolean *list = g_new (gboolean, length); + for (int i = 0; i < length; ++i) { + list[i] = [[value objectAtIndex:i] boolValue]; + } + g_key_file_set_boolean_list (file, [group UTF8String], [key UTF8String], list, length); + g_free (list); +} + +- (void) setIntegerListEntry:(NSString*)key inGroup:(NSString*)group value:(NSArray*)value; +{ + if (value == nil) { + [self removeKey:key inGroup:group]; + return; + } + gsize length = [value count]; + gint *list = g_new (gint, length); + for (int i = 0; i < length; ++i) { + list[i] = [[value objectAtIndex:i] intValue]; + } + g_key_file_set_integer_list (file, [group UTF8String], [key UTF8String], list, length); + g_free (list); +} + +- (void) setDoubleListEntry:(NSString*)key inGroup:(NSString*)group value:(NSArray*)value; +{ + if (value == nil) { + [self removeKey:key inGroup:group]; + return; + } + gsize length = [value count]; + gdouble *list = g_new (gdouble, length); + for (int i = 0; i < length; ++i) { + list[i] = [[value objectAtIndex:i] doubleValue]; + } + g_key_file_set_double_list (file, [group UTF8String], [key UTF8String], list, length); + g_free (list); +} + +- (void) removeGroup:(NSString*)group +{ + g_key_file_remove_group (file, [group UTF8String], NULL); +} + +- (void) removeKey:(NSString*)key inGroup:(NSString*)group; +{ + g_key_file_remove_key (file, [group UTF8String], [key UTF8String], NULL); +} + +- (void) dealloc +{ + [name release]; + g_key_file_free (file); + file = NULL; + [super dealloc]; +} + +@end + +// vim:ft=objc:sts=4:sw=4:et diff --git a/tikzit-old/src/gtk/ContextWindow.h b/tikzit-old/src/gtk/ContextWindow.h new file mode 100644 index 0000000..fcad9df --- /dev/null +++ b/tikzit-old/src/gtk/ContextWindow.h @@ -0,0 +1,53 @@ +/* + * Copyright 2011-2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import + +@class Configuration; +@class EdgeStylesModel; +@class NodeStylesModel; +@class PropertiesPane; +@class SelectionPane; +@class StyleManager; +@class TikzDocument; +@class Window; + +@interface ContextWindow: NSObject { + PropertiesPane *propsPane; + SelectionPane *selPane; + + GtkWidget *window; + GtkWidget *layout; +} + +@property (retain) TikzDocument *document; +@property (assign) BOOL visible; + +- (id) initWithStyleManager:(StyleManager*)mgr; +- (id) initWithNodeStylesModel:(NodeStylesModel*)nsm + andEdgeStylesModel:(EdgeStylesModel*)esm; + +- (void) present; +- (void) attachToWindow:(Window*)parent; + +- (void) loadConfiguration:(Configuration*)config; +- (void) saveConfiguration:(Configuration*)config; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/ContextWindow.m b/tikzit-old/src/gtk/ContextWindow.m new file mode 100644 index 0000000..d8e9d20 --- /dev/null +++ b/tikzit-old/src/gtk/ContextWindow.m @@ -0,0 +1,169 @@ +/* + * Copyright 2011-2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "ContextWindow.h" + +#import "Configuration.h" +#import "EdgeStylesModel.h" +#import "NodeStylesModel.h" +#import "PropertiesPane.h" +#import "SelectionPane.h" +#import "StyleManager.h" +#import "Window.h" + +#import "gtkhelpers.h" + +static gboolean props_window_delete_event_cb (GtkWidget *widget, GdkEvent *event, ContextWindow *window); + +@implementation ContextWindow + +- (id) init { + [self release]; + return nil; +} + +- (id) initWithStyleManager:(StyleManager*)sm { + return [self initWithNodeStylesModel:[NodeStylesModel modelWithStyleManager:sm] + andEdgeStylesModel:[EdgeStylesModel modelWithStyleManager:sm]]; +} + +- (id) initWithNodeStylesModel:(NodeStylesModel*)nsm + andEdgeStylesModel:(EdgeStylesModel*)esm { + self = [super init]; + + if (self) { + window = gtk_window_new (GTK_WINDOW_TOPLEVEL); + g_object_ref_sink (window); + gtk_window_set_title (GTK_WINDOW (window), "Context"); + gtk_window_set_role (GTK_WINDOW (window), "context"); + gtk_window_set_type_hint (GTK_WINDOW (window), + GDK_WINDOW_TYPE_HINT_UTILITY); + gtk_window_set_default_size (GTK_WINDOW (window), 200, 500); + g_signal_connect (G_OBJECT (window), + "delete-event", + G_CALLBACK (props_window_delete_event_cb), + self); + + layout = gtk_vbox_new (FALSE, 3); + g_object_ref_sink (layout); + gtk_widget_show (layout); + gtk_container_set_border_width (GTK_CONTAINER (layout), 6); + + gtk_container_add (GTK_CONTAINER (window), layout); + + propsPane = [[PropertiesPane alloc] init]; + gtk_box_pack_start (GTK_BOX (layout), [propsPane gtkWidget], + TRUE, TRUE, 0); + + GtkWidget *sep = gtk_hseparator_new (); + gtk_widget_show (sep); + gtk_box_pack_start (GTK_BOX (layout), sep, + FALSE, FALSE, 0); + + selPane = [[SelectionPane alloc] initWithNodeStylesModel:nsm + andEdgeStylesModel:esm]; + gtk_box_pack_start (GTK_BOX (layout), [selPane gtkWidget], + FALSE, FALSE, 0); + + // hack to position the context window somewhere sensible + // (upper right) + gtk_window_parse_geometry (GTK_WINDOW (window), "-0+0"); + } + + return self; +} + +- (void) dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + + g_object_unref (layout); + g_object_unref (window); + + [propsPane release]; + + [super dealloc]; +} + +- (TikzDocument*) document { + return [propsPane document]; +} + +- (void) setDocument:(TikzDocument*)doc { + [propsPane setDocument:doc]; + [selPane setDocument:doc]; +} + +- (BOOL) visible { + return gtk_widget_get_visible (window); +} + +- (void) setVisible:(BOOL)visible { + gtk_widget_set_visible (window, visible); +} + +- (void) present { + gtk_window_present (GTK_WINDOW (window)); +} + +- (void) attachToWindow:(Window*)parent { + utility_window_attach (GTK_WINDOW (window), [parent gtkWindow]); +} + +- (void) loadConfiguration:(Configuration*)config { + [propsPane loadConfiguration:config]; + [selPane loadConfiguration:config]; + + if ([config hasGroup:@"ContextWindow"]) { + tz_restore_window (GTK_WINDOW (window), + [config integerEntry:@"x" inGroup:@"ContextWindow"], + [config integerEntry:@"y" inGroup:@"ContextWindow"], + [config integerEntry:@"w" inGroup:@"ContextWindow"], + [config integerEntry:@"h" inGroup:@"ContextWindow"]); + } + [self setVisible:[config booleanEntry:@"visible" + inGroup:@"ContextWindow" + withDefault:YES]]; +} + +- (void) saveConfiguration:(Configuration*)config { + gint x, y, w, h; + + gtk_window_get_position (GTK_WINDOW (window), &x, &y); + gtk_window_get_size (GTK_WINDOW (window), &w, &h); + + [config setIntegerEntry:@"x" inGroup:@"ContextWindow" value:x]; + [config setIntegerEntry:@"y" inGroup:@"ContextWindow" value:y]; + [config setIntegerEntry:@"w" inGroup:@"ContextWindow" value:w]; + [config setIntegerEntry:@"h" inGroup:@"ContextWindow" value:h]; + [config setBooleanEntry:@"visible" + inGroup:@"ContextWindow" + value:[self visible]]; + + [propsPane saveConfiguration:config]; + [selPane saveConfiguration:config]; +} + +@end + +static gboolean props_window_delete_event_cb (GtkWidget *widget, GdkEvent *event, ContextWindow *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [window setVisible:NO]; + [pool drain]; + return TRUE; +} + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/CreateEdgeTool.h b/tikzit-old/src/gtk/CreateEdgeTool.h new file mode 100644 index 0000000..d33efce --- /dev/null +++ b/tikzit-old/src/gtk/CreateEdgeTool.h @@ -0,0 +1,45 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import "Tool.h" + +@class EdgeStyle; +@class EdgeStylesModel; +@class EdgeStyleSelector; +@class Node; +@class StyleManager; + +@interface CreateEdgeTool : NSObject { + GraphRenderer *renderer; + EdgeStyleSelector *stylePicker; + GtkWidget *configWidget; + Node *sourceNode; + NSPoint sourceNodeScreenPoint; + NSPoint halfEdgeEnd; +} + +@property (retain) EdgeStyle *activeStyle; + ++ (id) toolWithStyleManager:(StyleManager*)sm; +- (id) initWithStyleManager:(StyleManager*)sm; ++ (id) toolWithEdgeStylesModel:(EdgeStylesModel*)esm; +- (id) initWithEdgeStylesModel:(EdgeStylesModel*)esm; +@end + + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/CreateEdgeTool.m b/tikzit-old/src/gtk/CreateEdgeTool.m new file mode 100644 index 0000000..f3fb2c0 --- /dev/null +++ b/tikzit-old/src/gtk/CreateEdgeTool.m @@ -0,0 +1,226 @@ +/* + * Copyright 2011-2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "CreateEdgeTool.h" + +#import "Configuration.h" +#import "EdgeStyleSelector.h" +#import "EdgeStylesModel.h" +#import "GraphRenderer.h" +#import "TikzDocument.h" +#import "tzstockitems.h" + +static void clear_style_button_cb (GtkButton *widget, + EdgeStyleSelector *selector); + +@implementation CreateEdgeTool +- (NSString*) name { return @"Create Edge"; } +- (const gchar*) stockId { return TIKZIT_STOCK_CREATE_EDGE; } +- (NSString*) helpText { return @"Create new edges"; } +- (NSString*) shortcut { return @"e"; } +@synthesize activeRenderer=renderer; +@synthesize configurationWidget=configWidget; + ++ (id) toolWithStyleManager:(StyleManager*)sm { + return [[[self alloc] initWithStyleManager:sm] autorelease]; +} + ++ (id) toolWithEdgeStylesModel:(EdgeStylesModel*)esm { + return [[[self alloc] initWithEdgeStylesModel:esm] autorelease]; +} + +- (id) init { + [self release]; + return nil; +} + +- (id) initWithStyleManager:(StyleManager*)sm { + return [self initWithEdgeStylesModel:[EdgeStylesModel modelWithStyleManager:sm]]; +} + +- (id) initWithEdgeStylesModel:(EdgeStylesModel*)esm { + self = [super init]; + + if (self) { + stylePicker = [[EdgeStyleSelector alloc] initWithModel:esm]; + + configWidget = gtk_vbox_new (FALSE, 0); + g_object_ref_sink (configWidget); + + GtkWidget *label = gtk_label_new ("Edge style:"); + gtk_widget_show (label); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_box_pack_start (GTK_BOX (configWidget), + label, + FALSE, + FALSE, + 0); + + GtkWidget *selWindow = gtk_scrolled_window_new (NULL, NULL); + gtk_widget_show (selWindow); + gtk_container_add (GTK_CONTAINER (selWindow), + [stylePicker widget]); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (selWindow), + GTK_POLICY_NEVER, + GTK_POLICY_AUTOMATIC); + gtk_widget_show ([stylePicker widget]); + + GtkWidget *selectorFrame = gtk_frame_new (NULL); + gtk_widget_show (selectorFrame); + gtk_box_pack_start (GTK_BOX (configWidget), + selectorFrame, + TRUE, + TRUE, + 0); + gtk_container_add (GTK_CONTAINER (selectorFrame), + selWindow); + + GtkWidget *button = gtk_button_new_with_label ("No style"); + gtk_widget_show (button); + gtk_box_pack_start (GTK_BOX (configWidget), + button, + FALSE, + FALSE, + 0); + g_signal_connect (G_OBJECT (button), + "clicked", + G_CALLBACK (clear_style_button_cb), + stylePicker); + } + + return self; +} + +- (void) dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + + [renderer release]; + [stylePicker release]; + [sourceNode release]; + + g_object_unref (G_OBJECT (configWidget)); + + [super dealloc]; +} + +- (EdgeStyle*) activeStyle { + return [stylePicker selectedStyle]; +} + +- (void) setActiveStyle:(EdgeStyle*)style { + return [stylePicker setSelectedStyle:style]; +} + +- (void) invalidateHalfEdge { + NSRect invRect = NSRectAroundPoints(sourceNodeScreenPoint, halfEdgeEnd); + [renderer invalidateRect:NSInsetRect (invRect, -2.0f, -2.0f)]; +} + +- (void) mousePressAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { + if (button != LeftButton) + return; + + sourceNode = [renderer anyNodeAt:pos]; + if (sourceNode != nil) { + Transformer *transformer = [[renderer surface] transformer]; + sourceNodeScreenPoint = [transformer toScreen:[sourceNode point]]; + halfEdgeEnd = pos; + [renderer setNode:sourceNode highlighted:YES]; + } +} + +- (void) mouseMoveTo:(NSPoint)pos withButtons:(MouseButton)buttons andMask:(InputMask)mask { + if (!(buttons & LeftButton)) + return; + if (sourceNode == nil) + return; + + [self invalidateHalfEdge]; + + [renderer clearHighlightedNodes]; + [renderer setNode:sourceNode highlighted:YES]; + halfEdgeEnd = pos; + Node *targ = [renderer anyNodeAt:pos]; + if (targ != nil) { + [renderer setNode:targ highlighted:YES]; + } + + [self invalidateHalfEdge]; +} + +- (void) mouseReleaseAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { + if (button != LeftButton) + return; + if (sourceNode == nil) + return; + + [renderer clearHighlightedNodes]; + [self invalidateHalfEdge]; + + Node *targ = [renderer anyNodeAt:pos]; + if (targ != nil) { + Edge *edge = [Edge edgeWithSource:sourceNode andTarget:targ]; + [edge setStyle:[self activeStyle]]; + [[renderer document] addEdge:edge]; + [renderer invalidateEdge:edge]; + } + + sourceNode = nil; +} + +- (void) renderWithContext:(id)context onSurface:(id)surface { + if (sourceNode == nil) { + return; + } + [context saveState]; + + [context setLineWidth:1.0]; + [context startPath]; + [context moveTo:sourceNodeScreenPoint]; + [context lineTo:halfEdgeEnd]; + [context strokePathWithColor:MakeRColor (0, 0, 0, 0.5)]; + + [context restoreState]; +} + +- (StyleManager*) styleManager { + return [[stylePicker model] styleManager]; +} + +- (void) loadConfiguration:(Configuration*)config { + NSString *styleName = [config stringEntry:@"ActiveStyle" + inGroup:@"CreateEdgeTool" + withDefault:nil]; + [self setActiveStyle:[[self styleManager] edgeStyleForName:styleName]]; +} + +- (void) saveConfiguration:(Configuration*)config { + [config setStringEntry:@"ActiveStyle" + inGroup:@"CreateEdgeTool" + value:[[self activeStyle] name]]; +} +@end + +static void clear_style_button_cb (GtkButton *widget, + EdgeStyleSelector *selector) +{ + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [selector setSelectedStyle:nil]; + [pool drain]; +} + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/CreateNodeTool.h b/tikzit-old/src/gtk/CreateNodeTool.h new file mode 100644 index 0000000..94d6b31 --- /dev/null +++ b/tikzit-old/src/gtk/CreateNodeTool.h @@ -0,0 +1,42 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import +#import "Tool.h" + +@class NodeStyle; +@class NodeStyleSelector; +@class NodeStylesModel; +@class StyleManager; + +@interface CreateNodeTool : NSObject { + GraphRenderer *renderer; + NodeStyleSelector *stylePicker; + GtkWidget *configWidget; +} + +@property (retain) NodeStyle *activeStyle; + ++ (id) toolWithStyleManager:(StyleManager*)sm; +- (id) initWithStyleManager:(StyleManager*)sm; ++ (id) toolWithNodeStylesModel:(NodeStylesModel*)nsm; +- (id) initWithNodeStylesModel:(NodeStylesModel*)nsm; +@end + + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/CreateNodeTool.m b/tikzit-old/src/gtk/CreateNodeTool.m new file mode 100644 index 0000000..77b24f0 --- /dev/null +++ b/tikzit-old/src/gtk/CreateNodeTool.m @@ -0,0 +1,169 @@ +/* + * Copyright 2011-2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "CreateNodeTool.h" + +#import "Configuration.h" +#import "GraphRenderer.h" +#import "NodeStyleSelector.h" +#import "NodeStylesModel.h" +#import "TikzDocument.h" +#import "tzstockitems.h" + +static void clear_style_button_cb (GtkButton *widget, + NodeStyleSelector *selector); + +@implementation CreateNodeTool +- (NSString*) name { return @"Create Node"; } +- (const gchar*) stockId { return TIKZIT_STOCK_CREATE_NODE; } +- (NSString*) helpText { return @"Create new nodes"; } +- (NSString*) shortcut { return @"n"; } +@synthesize activeRenderer=renderer; +@synthesize configurationWidget=configWidget; + ++ (id) toolWithStyleManager:(StyleManager*)sm { + return [[[self alloc] initWithStyleManager:sm] autorelease]; +} + ++ (id) toolWithNodeStylesModel:(NodeStylesModel*)nsm { + return [[[self alloc] initWithNodeStylesModel:nsm] autorelease]; +} + +- (id) init { + [self release]; + return nil; +} + +- (id) initWithStyleManager:(StyleManager*)sm { + return [self initWithNodeStylesModel:[NodeStylesModel modelWithStyleManager:sm]]; +} + +- (id) initWithNodeStylesModel:(NodeStylesModel*)nsm { + self = [super init]; + + if (self) { + stylePicker = [[NodeStyleSelector alloc] initWithModel:nsm]; + + configWidget = gtk_vbox_new (FALSE, 0); + g_object_ref_sink (configWidget); + + GtkWidget *label = gtk_label_new ("Node style:"); + gtk_widget_show (label); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_box_pack_start (GTK_BOX (configWidget), + label, + FALSE, + FALSE, + 0); + + GtkWidget *selWindow = gtk_scrolled_window_new (NULL, NULL); + gtk_widget_show (selWindow); + gtk_container_add (GTK_CONTAINER (selWindow), + [stylePicker widget]); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (selWindow), + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); + gtk_widget_show ([stylePicker widget]); + + GtkWidget *selectorFrame = gtk_frame_new (NULL); + gtk_widget_show (selectorFrame); + gtk_box_pack_start (GTK_BOX (configWidget), + selectorFrame, + TRUE, + TRUE, + 0); + gtk_container_add (GTK_CONTAINER (selectorFrame), + selWindow); + + GtkWidget *button = gtk_button_new_with_label ("No style"); + gtk_widget_show (button); + gtk_box_pack_start (GTK_BOX (configWidget), + button, + FALSE, + FALSE, + 0); + g_signal_connect (G_OBJECT (button), + "clicked", + G_CALLBACK (clear_style_button_cb), + stylePicker); + } + + return self; +} + +- (void) dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + + [renderer release]; + [stylePicker release]; + + g_object_unref (G_OBJECT (configWidget)); + + [super dealloc]; +} + +- (NodeStyle*) activeStyle { + return [stylePicker selectedStyle]; +} + +- (void) setActiveStyle:(NodeStyle*)style { + return [stylePicker setSelectedStyle:style]; +} + +// FIXME: create node on press, and drag it around? +- (void) mousePressAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask {} + +- (void) mouseReleaseAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { + if (button != LeftButton) + return; + + Transformer *transformer = [renderer transformer]; + NSPoint nodePoint = [transformer fromScreen:[[renderer grid] snapScreenPoint:pos]]; + Node *node = [Node nodeWithPoint:nodePoint]; + [node setStyle:[self activeStyle]]; + [[renderer document] addNode:node]; +} + +- (void) renderWithContext:(id)context onSurface:(id)surface {} + +- (StyleManager*) styleManager { + return [[stylePicker model] styleManager]; +} + +- (void) loadConfiguration:(Configuration*)config { + NSString *styleName = [config stringEntry:@"ActiveStyle" + inGroup:@"CreateNodeTool" + withDefault:nil]; + [self setActiveStyle:[[self styleManager] nodeStyleForName:styleName]]; +} + +- (void) saveConfiguration:(Configuration*)config { + [config setStringEntry:@"ActiveStyle" + inGroup:@"CreateNodeTool" + value:[[self activeStyle] name]]; +} +@end + +static void clear_style_button_cb (GtkButton *widget, + NodeStyleSelector *selector) +{ + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [selector setSelectedStyle:nil]; + [pool drain]; +} + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/DocumentContext.h b/tikzit-old/src/gtk/DocumentContext.h new file mode 100644 index 0000000..e4c1065 --- /dev/null +++ b/tikzit-old/src/gtk/DocumentContext.h @@ -0,0 +1,27 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" + +@class TikzDocument; + +@interface DocumentContext { + TikzDocument *document; + GraphRenderer *renderSurface; +} + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/Edge+Render.h b/tikzit-old/src/gtk/Edge+Render.h new file mode 100644 index 0000000..e88b28a --- /dev/null +++ b/tikzit-old/src/gtk/Edge+Render.h @@ -0,0 +1,34 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import "Edge.h" +#import "RenderContext.h" +#import "Surface.h" + +@interface Edge (Render) + ++ (float) controlPointRadius; +- (void) renderControlsInContext:(id)context withTransformer:(Transformer*)transformer; +- (void) renderBasicEdgeInContext:(id)context withTransformer:(Transformer*)t selected:(BOOL)selected; +- (void) renderToSurface:(id)surface withContext:(id)context selected:(BOOL)selected; +- (NSRect) renderedBoundsWithTransformer:(Transformer*)t whenSelected:(BOOL)selected; +- (BOOL) hitByPoint:(NSPoint)p onSurface:(id)surface withFuzz:(float)fuzz; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/Edge+Render.m b/tikzit-old/src/gtk/Edge+Render.m new file mode 100644 index 0000000..3cc2a14 --- /dev/null +++ b/tikzit-old/src/gtk/Edge+Render.m @@ -0,0 +1,267 @@ +/* + * Copyright 2011 Alex Merry + * Copyright 2010 Chris Heunen + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "Edge+Render.h" +#import "Node+Render.h" +#import "../common/util.h" + +static const float edgeWidth = 2.0; +static const float cpRadius = 3.0; +static const float cpLineWidth = 1.0; + +@implementation Edge (Render) + ++ (float) controlPointRadius { + return cpRadius; +} + +- (float) controlDistance { + const float dx = (targ.x - src.x); + const float dy = (targ.y - src.y); + if (dx == 0 && dy == 0) { + return weight; + } else { + return NSDistanceBetweenPoints(src, targ) * weight; + } +} + +- (void) renderControlsInContext:(id)context withTransformer:(Transformer*)transformer { + [context saveState]; + + [self updateControls]; + + NSPoint c_source = [transformer toScreen:src]; + NSPoint c_target = [transformer toScreen:targ]; + NSPoint c_mid = [transformer toScreen:mid]; + + const float dx = (c_target.x - c_source.x); + const float dy = (c_target.y - c_source.y); + + [context setLineWidth:cpLineWidth]; + RColor fillColor = MakeRColor (1.0, 1.0, 1.0, 0.5); + + // draw a circle at the mid point + [context startPath]; + [context circleAt:c_mid withRadius:cpRadius]; + [context strokePathWithColor:MakeSolidRColor(0, 0, 1) andFillWithColor:fillColor]; + + //[context setAntialiasMode:AntialiasDisabled]; + + // size of control circles + float c_dist = 0.0f; + if (dx == 0 && dy == 0) { + c_dist = [transformer scaleToScreen:weight]; + } else { + c_dist = NSDistanceBetweenPoints(c_source, c_target) * weight; + } + + // basic bend is blue, in-out is green + RColor controlTrackColor; + if ([self bendMode] == EdgeBendModeBasic) { + controlTrackColor = MakeRColor (0.0, 0.0, 1.0, 0.4); + } else { + controlTrackColor = MakeRColor (0.0, 0.7, 0.0, 0.4); + } + + [context startPath]; + [context circleAt:c_source withRadius:c_dist]; + if (dx != 0 || dy != 0) { + [context circleAt:c_target withRadius:c_dist]; + } + [context strokePathWithColor:controlTrackColor]; + + RColor handleColor = MakeRColor (1.0, 0.0, 1.0, 0.6); + if ([self bendMode] == EdgeBendModeBasic) { + if (bend % 45 != 0) { + handleColor = MakeRColor (0.0, 0.0, 0.1, 0.4); + } + } else if ([self bendMode] == EdgeBendModeInOut) { + if (outAngle % 45 != 0) { + handleColor = MakeRColor (0.0, 0.7, 0.0, 0.4); + } + } + + NSPoint c_cp1 = [transformer toScreen:cp1]; + [context moveTo:c_source]; + [context lineTo:c_cp1]; + [context circleAt:c_cp1 withRadius:cpRadius]; + [context strokePathWithColor:handleColor]; + + if ([self bendMode] == EdgeBendModeInOut) { + // recalculate color based on inAngle + if (inAngle % 45 == 0) { + handleColor = MakeRColor (1.0, 0.0, 1.0, 0.6); + } else { + handleColor = MakeRColor (0.0, 0.7, 0.0, 0.4); + } + } + + NSPoint c_cp2 = [transformer toScreen:cp2]; + [context moveTo:c_target]; + [context lineTo:c_cp2]; + [context circleAt:c_cp2 withRadius:cpRadius]; + [context strokePathWithColor:handleColor]; + + [context restoreState]; +} + +- (void) renderArrowStrokePathInContext:(id)context withTransformer:(Transformer*)transformer color:(RColor)color { + + if ([self style] != nil) { + switch ([[self style] headStyle]) { + case AH_None: + break; + case AH_Plain: + [context startPath]; + [context moveTo:[transformer toScreen:[self leftHeadNormal]]]; + [context lineTo:[transformer toScreen:head]]; + [context lineTo:[transformer toScreen:[self rightHeadNormal]]]; + [context strokePathWithColor:color]; + break; + case AH_Latex: + [context startPath]; + [context moveTo:[transformer toScreen:[self leftHeadNormal]]]; + [context lineTo:[transformer toScreen:head]]; + [context lineTo:[transformer toScreen:[self rightHeadNormal]]]; + [context closeSubPath]; + [context strokePathWithColor:color andFillWithColor:color]; + break; + } + switch ([[self style] tailStyle]) { + case AH_None: + break; + case AH_Plain: + [context startPath]; + [context moveTo:[transformer toScreen:[self leftTailNormal]]]; + [context lineTo:[transformer toScreen:tail]]; + [context lineTo:[transformer toScreen:[self rightTailNormal]]]; + [context strokePathWithColor:color]; + break; + case AH_Latex: + [context startPath]; + [context moveTo:[transformer toScreen:[self leftTailNormal]]]; + [context lineTo:[transformer toScreen:tail]]; + [context lineTo:[transformer toScreen:[self rightTailNormal]]]; + [context closeSubPath]; + [context strokePathWithColor:color andFillWithColor:color]; + break; + } + } +} + +- (void) createStrokePathInContext:(id)context withTransformer:(Transformer*)transformer { + NSPoint c_tail = [transformer toScreen:tail]; + NSPoint c_cp1 = [transformer toScreen:cp1]; + NSPoint c_cp2 = [transformer toScreen:cp2]; + NSPoint c_head = [transformer toScreen:head]; + + [context startPath]; + [context moveTo:c_tail]; + [context curveTo:c_head withCp1:c_cp1 andCp2:c_cp2]; + + if ([self style] != nil) { + // draw edge decoration + switch ([[self style] decorationStyle]) { + case ED_None: + break; + case ED_Tick: + [context moveTo:[transformer toScreen:[self leftNormal]]]; + [context lineTo:[transformer toScreen:[self rightNormal]]]; + break; + case ED_Arrow: + [context moveTo:[transformer toScreen:[self leftNormal]]]; + [context lineTo:[transformer toScreen:[self midTan]]]; + [context lineTo:[transformer toScreen:[self rightNormal]]]; + break; + } + + } +} + +- (RColor) color { + if (style) { + return [[style colorRGB] rColor]; + } else { + return BlackRColor; + } +} + +- (void) renderBasicEdgeInContext:(id)context withTransformer:(Transformer*)t selected:(BOOL)selected { + [self updateControls]; + [context saveState]; + + const CGFloat lineWidth = style ? [style thickness] : edgeWidth; + [context setLineWidth:lineWidth]; + RColor color = [self color]; + if (selected) { + color.alpha = 0.5; + } + + [self createStrokePathInContext:context withTransformer:t]; + [context strokePathWithColor:color]; + + [self renderArrowStrokePathInContext:context withTransformer:t color:color]; + + [context restoreState]; +} + +- (void) renderToSurface:(id )surface withContext:(id)context selected:(BOOL)selected { + [self renderBasicEdgeInContext:context withTransformer:[surface transformer] selected:selected]; + + if (selected) { + [self renderControlsInContext:context withTransformer:[surface transformer]]; + } + + if ([self hasEdgeNode]) { + NSPoint labelPt = [[surface transformer] toScreen:[self mid]]; + [[self edgeNode] renderLabelAt:labelPt + withContext:context]; + } +} + +- (NSRect) renderedBoundsWithTransformer:(Transformer*)t whenSelected:(BOOL)selected { + if (selected) { + float c_dist = [self controlDistance] + cpRadius; // include handle + NSRect cp1circ = NSMakeRect (head.x - c_dist, head.y - c_dist, 2*c_dist, 2*c_dist); + NSRect cp2circ = NSMakeRect (tail.x - c_dist, tail.y - c_dist, 2*c_dist, 2*c_dist); + NSRect rect = NSUnionRect ([self boundingRect], NSUnionRect (cp1circ, cp2circ)); + return [t rectToScreen:rect]; + } else { + return [t rectToScreen:[self boundingRect]]; + } +} + +- (BOOL) hitByPoint:(NSPoint)p onSurface:(id)surface withFuzz:(float)fuzz { + [self updateControls]; + + NSRect boundingRect = [[surface transformer] rectToScreen:[self boundingRect]]; + if (!NSPointInRect(p, NSInsetRect(boundingRect, -fuzz, -fuzz))) { + return NO; + } + + id cr = [surface createRenderContext]; + + [cr setLineWidth:edgeWidth + 2 * fuzz]; + [self createStrokePathInContext:cr withTransformer:[surface transformer]]; + + return [cr strokeIncludesPoint:p]; +} + +@end + +// vim:ft=objc:ts=4:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/EdgeStyle+Gtk.h b/tikzit-old/src/gtk/EdgeStyle+Gtk.h new file mode 100644 index 0000000..4323593 --- /dev/null +++ b/tikzit-old/src/gtk/EdgeStyle+Gtk.h @@ -0,0 +1,29 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import "EdgeStyle.h" +#import + +@interface EdgeStyle (Gtk) + +- (GdkColor) color; +- (void) setColor:(GdkColor)color; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/EdgeStyle+Gtk.m b/tikzit-old/src/gtk/EdgeStyle+Gtk.m new file mode 100644 index 0000000..886329e --- /dev/null +++ b/tikzit-old/src/gtk/EdgeStyle+Gtk.m @@ -0,0 +1,33 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "EdgeStyle+Gtk.h" +#import "ColorRGB+Gtk.h" + +@implementation EdgeStyle (Gtk) + +- (GdkColor) color { + return [[self colorRGB] gdkColor]; +} + +- (void) setColor:(GdkColor)color { + [self setColorRGB:[ColorRGB colorWithGdkColor:color]]; +} + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/EdgeStyle+Storage.h b/tikzit-old/src/gtk/EdgeStyle+Storage.h new file mode 100644 index 0000000..74881f3 --- /dev/null +++ b/tikzit-old/src/gtk/EdgeStyle+Storage.h @@ -0,0 +1,29 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import "EdgeStyle.h" +#import "Configuration.h" + +@interface EdgeStyle (Storage) + +- (id) initFromConfigurationGroup:(NSString*)groupName config:(Configuration*)configFile; +- (void) storeToConfigurationGroup:(NSString*)groupName config:(Configuration*)configFile; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/EdgeStyle+Storage.m b/tikzit-old/src/gtk/EdgeStyle+Storage.m new file mode 100644 index 0000000..45e2a20 --- /dev/null +++ b/tikzit-old/src/gtk/EdgeStyle+Storage.m @@ -0,0 +1,55 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "EdgeStyle+Storage.h" +#import "ColorRGB+IntegerListStorage.h" + +@implementation EdgeStyle (Storage) + +- (id) initFromConfigurationGroup:(NSString*)groupName config:(Configuration*)configFile { + self = [self init]; + + if (self) { + [self setName:[configFile stringEntry:@"Name" inGroup:groupName withDefault:name]]; + [self setCategory:[configFile stringEntry:@"Category" inGroup:groupName withDefault:category]]; + headStyle = [configFile integerEntry:@"HeadStyle" inGroup:groupName withDefault:headStyle]; + tailStyle = [configFile integerEntry:@"TailStyle" inGroup:groupName withDefault:tailStyle]; + decorationStyle = [configFile integerEntry:@"DecorationStyle" inGroup:groupName withDefault:decorationStyle]; + thickness = [configFile doubleEntry:@"Thickness" inGroup:groupName withDefault:thickness]; + [self setColorRGB: + [ColorRGB colorFromValueList: + [configFile integerListEntry:@"Color" + inGroup:groupName + withDefault:[colorRGB valueList]]]]; + } + + return self; +} + +- (void) storeToConfigurationGroup:(NSString*)groupName config:(Configuration*)configFile { + [configFile setStringEntry:@"Name" inGroup:groupName value:name]; + [configFile setStringEntry:@"Category" inGroup:groupName value:category]; + [configFile setIntegerEntry:@"HeadStyle" inGroup:groupName value:headStyle]; + [configFile setIntegerEntry:@"TailStyle" inGroup:groupName value:tailStyle]; + [configFile setIntegerEntry:@"DecorationStyle" inGroup:groupName value:decorationStyle]; + [configFile setDoubleEntry:@"Thickness" inGroup:groupName value:thickness]; + [configFile setIntegerListEntry:@"Color" inGroup:groupName value:[[self colorRGB] valueList]]; +} + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/EdgeStyleEditor.h b/tikzit-old/src/gtk/EdgeStyleEditor.h new file mode 100644 index 0000000..2224bbb --- /dev/null +++ b/tikzit-old/src/gtk/EdgeStyleEditor.h @@ -0,0 +1,45 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import + +@class EdgeStyle; + +@interface EdgeStyleEditor: NSObject { + EdgeStyle *style; + GtkTable *table; + GtkEntry *nameEdit; + GtkComboBox *decorationCombo; + GtkComboBox *headArrowCombo; + GtkComboBox *tailArrowCombo; + GtkColorButton *colorButton; + GtkWidget *makeColorTexSafeButton; + GtkAdjustment *thicknessAdj; + BOOL blockSignals; +} + +@property (retain) EdgeStyle *style; +@property (readonly) GtkWidget *widget; + +- (id) init; + +- (void) selectNameField; + +@end + +// vim:ft=objc:ts=4:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/EdgeStyleEditor.m b/tikzit-old/src/gtk/EdgeStyleEditor.m new file mode 100644 index 0000000..c7ca8bd --- /dev/null +++ b/tikzit-old/src/gtk/EdgeStyleEditor.m @@ -0,0 +1,499 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "EdgeStyleEditor.h" + +#import "EdgeStyle.h" +#import "EdgeStyle+Gtk.h" +#import "Shape.h" + +#include + +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpointer-sign" +#import "edgedecdata.m" +#pragma GCC diagnostic pop + +// {{{ Data Types +enum { + DEC_NAME_COL = 0, + DEC_PREVIEW_COL, + DEC_VALUE_COL, + DEC_N_COLS +}; + +struct dec_info { + const gchar *name; + const GdkPixdata *pixdata; + int value; +}; +static struct dec_info ed_entries[] = { + { "None", &ED_none_pixdata, ED_None }, + { "Arrow", &ED_arrow_pixdata, ED_Arrow }, + { "Tick", &ED_tick_pixdata, ED_Tick } +}; +static guint n_ed_entries = G_N_ELEMENTS (ed_entries); +static struct dec_info ah_head_entries[] = { + { "None", &AH_none_pixdata, AH_None }, + { "Plain", &AH_plain_head_pixdata, AH_Plain }, + { "Latex", &AH_latex_head_pixdata, AH_Latex } +}; +static guint n_ah_head_entries = G_N_ELEMENTS (ah_head_entries); +static struct dec_info ah_tail_entries[] = { + { "None", &AH_none_pixdata, AH_None }, + { "Plain", &AH_plain_tail_pixdata, AH_Plain }, + { "Latex", &AH_latex_tail_pixdata, AH_Latex } +}; +static guint n_ah_tail_entries = G_N_ELEMENTS (ah_tail_entries); + +static const guint row_count = 6; + +// }}} +// {{{ Internal interfaces +// {{{ GTK+ Callbacks +static void style_name_edit_changed_cb (GtkEditable *widget, EdgeStyleEditor *editor); +static void decoration_combo_changed_cb (GtkComboBox *widget, EdgeStyleEditor *editor); +static void head_arrow_combo_changed_cb (GtkComboBox *widget, EdgeStyleEditor *editor); +static void tail_arrow_combo_changed_cb (GtkComboBox *widget, EdgeStyleEditor *editor); +static void thickness_adjustment_changed_cb (GtkAdjustment *widget, EdgeStyleEditor *editor); +static void color_changed_cb (GtkColorButton *widget, EdgeStyleEditor *editor); +static void make_color_safe_button_clicked_cb (GtkButton *widget, EdgeStyleEditor *editor); +// }}} +// {{{ Notifications + +@interface EdgeStyleEditor (Notifications) +- (void) nameChangedTo:(NSString*)value; +- (void) edgeDecorationChangedTo:(EdgeDectorationStyle)value; +- (void) headArrowChangedTo:(ArrowHeadStyle)value; +- (void) tailArrowChangedTo:(ArrowHeadStyle)value; +- (void) thicknessChangedTo:(double)value; +- (void) makeColorTexSafe; +- (void) colorChangedTo:(GdkColor)value; +@end + +// }}} +// {{{ Private + +@interface EdgeStyleEditor (Private) +- (void) load:(guint)count decorationStylesFrom:(struct dec_info*)info into:(GtkListStore*)list; +- (void) clearDecCombo:(GtkComboBox*)combo; +- (void) setDecCombo:(GtkComboBox*)combo toValue:(int)value; +@end + +// }}} +// }}} +// {{{ API + +@implementation EdgeStyleEditor + +- (void) _addWidget:(GtkWidget*)w withLabel:(gchar *)label atRow:(guint)row { + NSAssert(row < row_count, @"row_count is wrong!"); + + GtkWidget *l = gtk_label_new (label); + gtk_misc_set_alignment (GTK_MISC (l), 0, 0.5); + gtk_widget_show (l); + gtk_widget_show (w); + + gtk_table_attach (table, l, + 0, 1, row, row+1, // l, r, t, b + GTK_FILL, // x opts + GTK_FILL | GTK_EXPAND, // y opts + 5, // x padding + 0); // y padding + + gtk_table_attach (table, w, + 1, 2, row, row+1, // l, r, t, b + GTK_FILL | GTK_EXPAND, // x opts + GTK_FILL | GTK_EXPAND, // y opts + 0, // x padding + 0); // y padding +} + +- (GtkComboBox*) _createDecComboWithEntries:(struct dec_info*)entries count:(guint)n { + GtkListStore *store = gtk_list_store_new (DEC_N_COLS, G_TYPE_STRING, GDK_TYPE_PIXBUF, G_TYPE_INT); + [self load:n decorationStylesFrom:entries into:store]; + + GtkComboBox *combo = GTK_COMBO_BOX (gtk_combo_box_new_with_model (GTK_TREE_MODEL (store))); + g_object_unref (store); + GtkCellRenderer *cellRend = gtk_cell_renderer_pixbuf_new (); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), + cellRend, + TRUE); + gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo), cellRend, "pixbuf", DEC_PREVIEW_COL); + g_object_ref_sink (combo); + + return combo; +} + +- (GtkWidget*) _createMakeColorTexSafeButton { + GtkWidget *b = gtk_button_new (); + GtkWidget *icon = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_BUTTON); + gtk_widget_show (icon); + gtk_container_add (GTK_CONTAINER (b), icon); + NSString *ttip = @"The colour is not a predefined TeX colour.\nClick here to choose the nearest TeX-safe colour."; + gtk_widget_set_tooltip_text (b, [ttip UTF8String]); + return b; +} + +- (id) init { + self = [super init]; + + if (self != nil) { + style = nil; + table = GTK_TABLE (gtk_table_new (row_count, 2, FALSE)); + gtk_table_set_col_spacings (table, 6); + gtk_table_set_row_spacings (table, 6); + gtk_widget_set_sensitive (GTK_WIDGET (table), FALSE); + blockSignals = NO; + + /** + * Name + */ + nameEdit = GTK_ENTRY (gtk_entry_new ()); + g_object_ref_sink (nameEdit); + [self _addWidget:GTK_WIDGET (nameEdit) + withLabel:"Name" + atRow:0]; + g_signal_connect (G_OBJECT (nameEdit), + "changed", + G_CALLBACK (style_name_edit_changed_cb), + self); + + + /** + * Edge decoration style + */ + decorationCombo = [self _createDecComboWithEntries:ed_entries count:n_ed_entries]; + [self _addWidget:GTK_WIDGET (decorationCombo) + withLabel:"Decoration" + atRow:1]; + g_signal_connect (G_OBJECT (decorationCombo), + "changed", + G_CALLBACK (decoration_combo_changed_cb), + self); + + + /** + * Head arrow style + */ + headArrowCombo = [self _createDecComboWithEntries:ah_head_entries count:n_ah_head_entries]; + [self _addWidget:GTK_WIDGET (headArrowCombo) + withLabel:"Arrow head" + atRow:2]; + g_signal_connect (G_OBJECT (headArrowCombo), + "changed", + G_CALLBACK (head_arrow_combo_changed_cb), + self); + + + /** + * Tail arrow style + */ + tailArrowCombo = [self _createDecComboWithEntries:ah_tail_entries count:n_ah_tail_entries]; + [self _addWidget:GTK_WIDGET (tailArrowCombo) + withLabel:"Arrow tail" + atRow:3]; + g_signal_connect (G_OBJECT (tailArrowCombo), + "changed", + G_CALLBACK (tail_arrow_combo_changed_cb), + self); + + + /** + * Colour + */ + GtkWidget *colorBox = gtk_hbox_new (FALSE, 0); + [self _addWidget:colorBox + withLabel:"Colour" + atRow:4]; + colorButton = GTK_COLOR_BUTTON (gtk_color_button_new ()); + g_object_ref_sink (colorButton); + gtk_widget_show (GTK_WIDGET (colorButton)); + gtk_box_pack_start (GTK_BOX (colorBox), GTK_WIDGET (colorButton), + FALSE, FALSE, 0); + makeColorTexSafeButton = [self _createMakeColorTexSafeButton]; + g_object_ref_sink (makeColorTexSafeButton); + gtk_box_pack_start (GTK_BOX (colorBox), makeColorTexSafeButton, + FALSE, FALSE, 0); + g_signal_connect (G_OBJECT (colorButton), + "color-set", + G_CALLBACK (color_changed_cb), + self); + g_signal_connect (G_OBJECT (makeColorTexSafeButton), + "clicked", + G_CALLBACK (make_color_safe_button_clicked_cb), + self); + + + /** + * Thickness + */ + thicknessAdj = GTK_ADJUSTMENT (gtk_adjustment_new ( + 1.0, // value + 0.0, // lower + 50.0, // upper + 0.20, // step + 1.0, // page + 0.0)); // (irrelevant) + g_object_ref_sink (thicknessAdj); + GtkWidget *scaleSpin = gtk_spin_button_new (thicknessAdj, 0.0, 2); + [self _addWidget:scaleSpin + withLabel:"Thickness" + atRow:5]; + g_signal_connect (G_OBJECT (thicknessAdj), + "value-changed", + G_CALLBACK (thickness_adjustment_changed_cb), + self); + } + + return self; +} + +- (void) dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + + g_object_unref (nameEdit); + g_object_unref (decorationCombo); + g_object_unref (colorButton); + g_object_unref (makeColorTexSafeButton); + g_object_unref (thicknessAdj); + g_object_unref (table); + [style release]; + + [super dealloc]; +} + +- (EdgeStyle*) style { + return style; +} + +- (void) setStyle:(EdgeStyle*)s { + blockSignals = YES; + EdgeStyle *oldStyle = style; + style = [s retain]; + + if (style != nil) { + gtk_widget_set_sensitive (GTK_WIDGET (table), TRUE); + + gtk_entry_set_text(nameEdit, [[style name] UTF8String]); + + [self setDecCombo:decorationCombo toValue:[style decorationStyle]]; + [self setDecCombo:headArrowCombo toValue:[style headStyle]]; + [self setDecCombo:tailArrowCombo toValue:[style tailStyle]]; + + GdkColor c = [style color]; + gtk_color_button_set_color(colorButton, &c); + gtk_widget_set_visible (makeColorTexSafeButton, ([[style colorRGB] name] == nil)); + + gtk_adjustment_set_value(thicknessAdj, [style thickness]); + } else { + gtk_entry_set_text(nameEdit, ""); + [self clearDecCombo:decorationCombo]; + [self clearDecCombo:headArrowCombo]; + [self clearDecCombo:tailArrowCombo]; + gtk_widget_set_visible (makeColorTexSafeButton, FALSE); + gtk_adjustment_set_value(thicknessAdj, 1.0); + gtk_widget_set_sensitive (GTK_WIDGET (table), FALSE); + } + + [oldStyle release]; + blockSignals = NO; +} + +- (GtkWidget*) widget { + return GTK_WIDGET (table); +} + +- (void) selectNameField { + gtk_widget_grab_focus (GTK_WIDGET (nameEdit)); + gtk_editable_select_region (GTK_EDITABLE (nameEdit), 0, -1); +} + +@end + +// }}} +// {{{ Notifications + +@implementation EdgeStyleEditor (Notifications) +- (void) nameChangedTo:(NSString*)value { + [style setName:value]; +} + +- (void) edgeDecorationChangedTo:(EdgeDectorationStyle)value { + [style setDecorationStyle:value]; +} + +- (void) headArrowChangedTo:(ArrowHeadStyle)value { + [style setHeadStyle:value]; +} + +- (void) tailArrowChangedTo:(ArrowHeadStyle)value { + [style setTailStyle:value]; +} + +- (void) thicknessChangedTo:(double)value { + [style setThickness:(float)value]; +} + +- (void) colorChangedTo:(GdkColor)value { + [style setColor:value]; + gtk_widget_set_visible (makeColorTexSafeButton, + [[style colorRGB] name] == nil); +} + +- (void) makeColorTexSafe { + if (style != nil) { + [[style colorRGB] setToClosestHashed]; + GdkColor color = [style color]; + gtk_color_button_set_color(colorButton, &color); + gtk_widget_set_visible (makeColorTexSafeButton, FALSE); + } +} +@end + +// }}} +// {{{ Private + +@implementation EdgeStyleEditor (Private) +- (BOOL) signalsBlocked { return blockSignals; } + +- (void) load:(guint)count decorationStylesFrom:(struct dec_info*)info into:(GtkListStore*)list { + GtkTreeIter iter; + + for (guint i = 0; i < count; ++i) { + GdkPixbuf *buf = gdk_pixbuf_from_pixdata (info[i].pixdata, FALSE, NULL); + gtk_list_store_append (list, &iter); + gtk_list_store_set (list, &iter, + DEC_NAME_COL, info[i].name, + DEC_PREVIEW_COL, buf, + DEC_VALUE_COL, info[i].value, + -1); + g_object_unref (buf); + } +} + +- (void) clearDecCombo:(GtkComboBox*)combo { + gtk_combo_box_set_active (combo, -1); +} + +- (void) setDecCombo:(GtkComboBox*)combo toValue:(int)value { + GtkTreeModel *model = gtk_combo_box_get_model (combo); + GtkTreeIter iter; + if (gtk_tree_model_get_iter_first (model, &iter)) { + do { + int rowValue; + gtk_tree_model_get (model, &iter, DEC_VALUE_COL, &rowValue, -1); + if (rowValue == value) { + gtk_combo_box_set_active_iter (combo, &iter); + return; + } + } while (gtk_tree_model_iter_next (model, &iter)); + } +} +@end + +// }}} +// {{{ GTK+ callbacks + +static void style_name_edit_changed_cb (GtkEditable *widget, EdgeStyleEditor *editor) { + if ([editor signalsBlocked]) + return; + + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + const gchar *contents = gtk_entry_get_text (GTK_ENTRY (widget)); + [editor nameChangedTo:[NSString stringWithUTF8String:contents]]; + + [pool drain]; +} + +static void decoration_combo_changed_cb (GtkComboBox *widget, EdgeStyleEditor *editor) { + if ([editor signalsBlocked]) + return; + + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + GtkTreeIter iter; + gtk_combo_box_get_active_iter (widget, &iter); + EdgeDectorationStyle dec = ED_None; + gtk_tree_model_get (gtk_combo_box_get_model (widget), &iter, DEC_VALUE_COL, &dec, -1); + [editor edgeDecorationChangedTo:dec]; + + [pool drain]; +} + +static void head_arrow_combo_changed_cb (GtkComboBox *widget, EdgeStyleEditor *editor) { + if ([editor signalsBlocked]) + return; + + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + GtkTreeIter iter; + gtk_combo_box_get_active_iter (widget, &iter); + ArrowHeadStyle dec = AH_None; + gtk_tree_model_get (gtk_combo_box_get_model (widget), &iter, DEC_VALUE_COL, &dec, -1); + [editor headArrowChangedTo:dec]; + + [pool drain]; +} + +static void tail_arrow_combo_changed_cb (GtkComboBox *widget, EdgeStyleEditor *editor) { + if ([editor signalsBlocked]) + return; + + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + GtkTreeIter iter; + gtk_combo_box_get_active_iter (widget, &iter); + ArrowHeadStyle dec = AH_None; + gtk_tree_model_get (gtk_combo_box_get_model (widget), &iter, DEC_VALUE_COL, &dec, -1); + [editor tailArrowChangedTo:dec]; + + [pool drain]; +} + +static void thickness_adjustment_changed_cb (GtkAdjustment *adj, EdgeStyleEditor *editor) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [editor thicknessChangedTo:gtk_adjustment_get_value (adj)]; + [pool drain]; +} + +static void color_changed_cb (GtkColorButton *widget, EdgeStyleEditor *editor) { + if ([editor signalsBlocked]) + return; + + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + GdkColor color; + gtk_color_button_get_color (widget, &color); + [editor colorChangedTo:color]; + + [pool drain]; +} + +static void make_color_safe_button_clicked_cb (GtkButton *widget, EdgeStyleEditor *editor) { + if ([editor signalsBlocked]) + return; + + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [editor makeColorTexSafe]; + [pool drain]; +} + +// }}} + +// vim:ft=objc:ts=4:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/EdgeStyleSelector.h b/tikzit-old/src/gtk/EdgeStyleSelector.h new file mode 100644 index 0000000..904bd93 --- /dev/null +++ b/tikzit-old/src/gtk/EdgeStyleSelector.h @@ -0,0 +1,61 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import + +@class EdgeStyle; +@class EdgeStylesModel; +@class StyleManager; + +@interface EdgeStyleSelector: NSObject { + EdgeStylesModel *model; + GtkTreeView *view; +} + +/*! + @property widget + @brief The GTK widget + */ +@property (readonly) GtkWidget *widget; + +/*! + @property model + @brief The model to use. + */ +@property (retain) EdgeStylesModel *model; + +/*! + @property selectedStyle + @brief The selected style. + + When this changes, a SelectedStyleChanged notification will be posted + */ +@property (assign) EdgeStyle *selectedStyle; + +/*! + * Initialise with a new model for the given style manager + */ +- (id) initWithStyleManager:(StyleManager*)m; +/*! + * Initialise with the given model + */ +- (id) initWithModel:(EdgeStylesModel*)model; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/EdgeStyleSelector.m b/tikzit-old/src/gtk/EdgeStyleSelector.m new file mode 100644 index 0000000..6a9db33 --- /dev/null +++ b/tikzit-old/src/gtk/EdgeStyleSelector.m @@ -0,0 +1,143 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "EdgeStyleSelector.h" + +#import "EdgeStylesModel.h" + +// {{{ Internal interfaces +static void selection_changed_cb (GtkTreeSelection *sel, EdgeStyleSelector *mgr); +// }}} +// {{{ API + +@implementation EdgeStyleSelector + +- (id) init { + [self release]; + return nil; +} + +- (id) initWithStyleManager:(StyleManager*)m { + return [self initWithModel:[EdgeStylesModel modelWithStyleManager:m]]; +} +- (id) initWithModel:(EdgeStylesModel*)m { + self = [super init]; + + if (self) { + model = [m retain]; + + view = GTK_TREE_VIEW (gtk_tree_view_new_with_model ([m model])); + gtk_tree_view_set_headers_visible (view, FALSE); + g_object_ref (view); + + GtkCellRenderer *renderer; + GtkTreeViewColumn *column; + renderer = gtk_cell_renderer_pixbuf_new (); + column = gtk_tree_view_column_new_with_attributes ( + "Preview", + renderer, + "pixbuf", EDGE_STYLES_ICON_COL, + NULL); + gtk_tree_view_append_column (view, column); + gtk_tree_view_set_tooltip_column (view, EDGE_STYLES_NAME_COL); + + GtkTreeSelection *sel = gtk_tree_view_get_selection (view); + gtk_tree_selection_set_mode (sel, GTK_SELECTION_SINGLE); + + g_signal_connect (G_OBJECT (sel), + "changed", + G_CALLBACK (selection_changed_cb), + self); + } + + return self; +} + +- (void) dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + + g_object_unref (view); + [model release]; + + [super dealloc]; +} + +- (EdgeStylesModel*) model { + return model; +} + +- (void) setModel:(EdgeStylesModel*)m { + if (m == model) + return; + + EdgeStylesModel *oldModel = model; + model = [m retain]; + gtk_tree_view_set_model (view, [model model]); + [oldModel release]; +} + +- (GtkWidget*) widget { + return GTK_WIDGET (view); +} + +- (EdgeStyle*) selectedStyle { + GtkTreeSelection *sel = gtk_tree_view_get_selection (view); + GtkTreeIter iter; + + if (!gtk_tree_selection_get_selected (sel, NULL, &iter)) { + return nil; + } + + EdgeStyle *style = nil; + gtk_tree_model_get ([model model], &iter, EDGE_STYLES_PTR_COL, &style, -1); + + return style; +} + +- (void) setSelectedStyle:(EdgeStyle*)style { + GtkTreeSelection *sel = gtk_tree_view_get_selection (view); + + if (style == nil) { + gtk_tree_selection_unselect_all (sel); + return; + } + + GtkTreePath *path = [model pathFromStyle:style]; + if (path) { + gtk_tree_selection_unselect_all (sel); + gtk_tree_selection_select_path (sel, path); + gtk_tree_path_free (path); + } +} +@end + +// }}} +// {{{ GTK+ callbacks + +static void selection_changed_cb (GtkTreeSelection *sel, EdgeStyleSelector *mgr) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + [[NSNotificationCenter defaultCenter] + postNotificationName:@"SelectedStyleChanged" + object:mgr]; + + [pool drain]; +} +// }}} + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker + diff --git a/tikzit-old/src/gtk/EdgeStylesModel.h b/tikzit-old/src/gtk/EdgeStylesModel.h new file mode 100644 index 0000000..1166f92 --- /dev/null +++ b/tikzit-old/src/gtk/EdgeStylesModel.h @@ -0,0 +1,62 @@ +/* + * Copyright 2011-2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import + +@class EdgeStyle; +@class StyleManager; + +enum { + EDGE_STYLES_NAME_COL = 0, + EDGE_STYLES_ICON_COL, + EDGE_STYLES_PTR_COL, + EDGE_STYLES_N_COLS +}; + +@interface EdgeStylesModel: NSObject { + GtkListStore *store; + StyleManager *styleManager; +} + +/*! + @property model + @brief The GTK+ tree model + */ +@property (readonly) GtkTreeModel *model; + +/*! + @property manager + @brief The StyleManager to use. + */ +@property (retain) StyleManager *styleManager; + +/*! + * Initialise with the given style manager + */ +- (id) initWithStyleManager:(StyleManager*)m; + ++ (id) modelWithStyleManager:(StyleManager*)m; + +- (EdgeStyle*) styleFromPath:(GtkTreePath*)path; +- (GtkTreePath*) pathFromStyle:(EdgeStyle*)style; +- (EdgeStyle*) styleFromIter:(GtkTreeIter*)iter; +- (GtkTreeIter*) iterFromStyle:(EdgeStyle*)style; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/EdgeStylesModel.m b/tikzit-old/src/gtk/EdgeStylesModel.m new file mode 100644 index 0000000..2de57ed --- /dev/null +++ b/tikzit-old/src/gtk/EdgeStylesModel.m @@ -0,0 +1,367 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "EdgeStylesModel.h" + +#import "CairoRenderContext.h" +#import "Edge.h" +#import "Edge+Render.h" +#import "EdgeStyle.h" +#import "Node.h" +#import "StyleManager.h" + +#import "gtkhelpers.h" + +#import + +// {{{ Internal interfaces + +@interface EdgeStylesModel (Notifications) +- (void) edgeStylesReplaced:(NSNotification*)notification; +- (void) edgeStyleAdded:(NSNotification*)notification; +- (void) edgeStyleRemoved:(NSNotification*)notification; +- (void) observeValueForKeyPath:(NSString*)keyPath + ofObject:(id)object + change:(NSDictionary*)change + context:(void*)context; +@end + +@interface EdgeStylesModel (Private) +- (cairo_surface_t*) createEdgeIconSurface; +- (GdkPixbuf*) pixbufOfEdgeInStyle:(EdgeStyle*)style; +- (GdkPixbuf*) pixbufOfEdgeInStyle:(EdgeStyle*)style usingSurface:(cairo_surface_t*)surface; +- (void) addEdgeStyle:(EdgeStyle*)style; +- (void) addEdgeStyle:(EdgeStyle*)style usingSurface:(cairo_surface_t*)surface; +- (void) observeEdgeStyle:(EdgeStyle*)style; +- (void) stopObservingEdgeStyle:(EdgeStyle*)style; +- (void) clearEdgeStylesModel; +- (void) reloadEdgeStyles; +@end + +// }}} +// {{{ API + +@implementation EdgeStylesModel + ++ (id) modelWithStyleManager:(StyleManager*)m { + return [[[self alloc] initWithStyleManager:m] autorelease]; +} + +- (id) init { + [self release]; + return nil; +} + +- (id) initWithStyleManager:(StyleManager*)m { + self = [super init]; + + if (self) { + store = gtk_list_store_new (EDGE_STYLES_N_COLS, + G_TYPE_STRING, + GDK_TYPE_PIXBUF, + G_TYPE_POINTER); + g_object_ref_sink (store); + + [self setStyleManager:m]; + } + + return self; +} + +- (void) dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + + [self clearEdgeStylesModel]; + g_object_unref (store); + [styleManager release]; + + [super dealloc]; +} + +- (GtkTreeModel*) model { + return GTK_TREE_MODEL (store); +} + +- (StyleManager*) styleManager { + return styleManager; +} + +- (void) setStyleManager:(StyleManager*)m { + if (m == nil) { + [NSException raise:NSInvalidArgumentException format:@"Style manager cannot be nil"]; + } + [m retain]; + + [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:styleManager]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(edgeStylesReplaced:) + name:@"EdgeStylesReplaced" + object:m]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(edgeStyleAdded:) + name:@"EdgeStyleAdded" + object:m]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(edgeStyleRemoved:) + name:@"EdgeStyleRemoved" + object:m]; + + [styleManager release]; + styleManager = m; + + [self reloadEdgeStyles]; +} + +- (EdgeStyle*) styleFromPath:(GtkTreePath*)path { + GtkTreeIter iter; + gtk_tree_model_get_iter (GTK_TREE_MODEL (store), &iter, path); + EdgeStyle *style = nil; + gtk_tree_model_get (GTK_TREE_MODEL (store), &iter, EDGE_STYLES_PTR_COL, &style, -1); + return style; +} + +- (GtkTreePath*) pathFromStyle:(EdgeStyle*)style { + GtkTreeModel *m = GTK_TREE_MODEL (store); + GtkTreeIter row; + if (gtk_tree_model_get_iter_first (m, &row)) { + do { + EdgeStyle *rowStyle; + gtk_tree_model_get (m, &row, EDGE_STYLES_PTR_COL, &rowStyle, -1); + if (style == rowStyle) { + return gtk_tree_model_get_path (m, &row); + } + } while (gtk_tree_model_iter_next (m, &row)); + } + return NULL; +} + +- (EdgeStyle*) styleFromIter:(GtkTreeIter*)iter { + EdgeStyle *style = nil; + gtk_tree_model_get (GTK_TREE_MODEL (store), iter, EDGE_STYLES_PTR_COL, &style, -1); + return style; +} + +- (GtkTreeIter*) iterFromStyle:(EdgeStyle*)style { + GtkTreeModel *m = GTK_TREE_MODEL (store); + GtkTreeIter row; + if (gtk_tree_model_get_iter_first (m, &row)) { + do { + EdgeStyle *rowStyle; + gtk_tree_model_get (m, &row, EDGE_STYLES_PTR_COL, &rowStyle, -1); + if (style == rowStyle) { + return gtk_tree_iter_copy (&row); + } + } while (gtk_tree_model_iter_next (m, &row)); + } + return NULL; +} +@end + +// }}} +// {{{ Notifications + +@implementation EdgeStylesModel (Notifications) + +- (void) edgeStylesReplaced:(NSNotification*)notification { + [self reloadEdgeStyles]; +} + +- (void) edgeStyleAdded:(NSNotification*)notification { + [self addEdgeStyle:[[notification userInfo] objectForKey:@"style"]]; +} + +- (void) edgeStyleRemoved:(NSNotification*)notification { + EdgeStyle *style = [[notification userInfo] objectForKey:@"style"]; + + GtkTreeModel *model = GTK_TREE_MODEL (store); + GtkTreeIter row; + if (gtk_tree_model_get_iter_first (model, &row)) { + do { + EdgeStyle *rowStyle; + gtk_tree_model_get (model, &row, EDGE_STYLES_PTR_COL, &rowStyle, -1); + if (style == rowStyle) { + gtk_list_store_remove (store, &row); + [self stopObservingEdgeStyle:rowStyle]; + [rowStyle release]; + return; + } + } while (gtk_tree_model_iter_next (model, &row)); + } +} + +- (void) observeValueForKeyPath:(NSString*)keyPath + ofObject:(id)object + change:(NSDictionary*)change + context:(void*)context +{ + if ([object class] != [EdgeStyle class]) + return; + + EdgeStyle *style = object; + + GtkTreeModel *model = GTK_TREE_MODEL (store); + GtkTreeIter row; + if (gtk_tree_model_get_iter_first (model, &row)) { + do { + EdgeStyle *rowStyle; + gtk_tree_model_get (model, &row, EDGE_STYLES_PTR_COL, &rowStyle, -1); + if (style == rowStyle) { + if ([@"name" isEqual:keyPath]) { + gtk_list_store_set (store, &row, EDGE_STYLES_NAME_COL, [[style name] UTF8String], -1); + } else { + GdkPixbuf *pixbuf = [self pixbufOfEdgeInStyle:style]; + gtk_list_store_set (store, &row, EDGE_STYLES_ICON_COL, pixbuf, -1); + g_object_unref (pixbuf); + } + } + } while (gtk_tree_model_iter_next (model, &row)); + } +} +@end + +// }}} +// {{{ Private + +@implementation EdgeStylesModel (Private) +- (cairo_surface_t*) createEdgeIconSurface { + return cairo_image_surface_create (CAIRO_FORMAT_ARGB32, 48, 18); +} + +- (GdkPixbuf*) pixbufOfEdgeInStyle:(EdgeStyle*)style { + cairo_surface_t *surface = [self createEdgeIconSurface]; + GdkPixbuf *pixbuf = [self pixbufOfEdgeInStyle:style usingSurface:surface]; + cairo_surface_destroy (surface); + return pixbuf; +} + +- (GdkPixbuf*) pixbufOfEdgeInStyle:(EdgeStyle*)style usingSurface:(cairo_surface_t*)surface { + Transformer *transformer = [Transformer defaultTransformer]; + [transformer setFlippedAboutXAxis:YES]; + + int width = cairo_image_surface_get_width (surface); + int height = cairo_image_surface_get_height (surface); + NSRect pixbufBounds = NSMakeRect(0.0, 0.0, width, height); + NSRect graphBounds = [transformer rectFromScreen:pixbufBounds]; + + NSPoint start = NSMakePoint (NSMinX (graphBounds) + 0.1f, NSMidY (graphBounds)); + NSPoint end = NSMakePoint (NSMaxX (graphBounds) - 0.1f, NSMidY (graphBounds)); + Node *src = [Node nodeWithPoint:start]; + Node *tgt = [Node nodeWithPoint:end]; + Edge *e = [Edge edgeWithSource:src andTarget:tgt]; + [e setStyle:style]; + + CairoRenderContext *context = [[CairoRenderContext alloc] initForSurface:surface]; + [context clearSurface]; + [e renderBasicEdgeInContext:context withTransformer:transformer selected:NO]; + [context release]; + + return pixbuf_get_from_surface (surface); +} + +- (void) addEdgeStyle:(EdgeStyle*)style usingSurface:(cairo_surface_t*)surface { + GtkTreeIter iter; + gtk_list_store_append (store, &iter); + + GdkPixbuf *pixbuf = [self pixbufOfEdgeInStyle:style usingSurface:surface]; + gtk_list_store_set (store, &iter, + EDGE_STYLES_NAME_COL, [[style name] UTF8String], + EDGE_STYLES_ICON_COL, pixbuf, + EDGE_STYLES_PTR_COL, (gpointer)[style retain], + -1); + g_object_unref (pixbuf); + [self observeEdgeStyle:style]; +} + +- (void) addEdgeStyle:(EdgeStyle*)style { + cairo_surface_t *surface = [self createEdgeIconSurface]; + [self addEdgeStyle:style usingSurface:surface]; + cairo_surface_destroy (surface); +} + +- (void) observeEdgeStyle:(EdgeStyle*)style { + [style addObserver:self + forKeyPath:@"name" + options:NSKeyValueObservingOptionNew + context:NULL]; + [style addObserver:self + forKeyPath:@"thickness" + options:0 + context:NULL]; + [style addObserver:self + forKeyPath:@"headStyle" + options:0 + context:NULL]; + [style addObserver:self + forKeyPath:@"tailStyle" + options:0 + context:NULL]; + [style addObserver:self + forKeyPath:@"decorationStyle" + options:0 + context:NULL]; + [style addObserver:self + forKeyPath:@"colorRGB.red" + options:0 + context:NULL]; + [style addObserver:self + forKeyPath:@"colorRGB.green" + options:0 + context:NULL]; + [style addObserver:self + forKeyPath:@"colorRGB.blue" + options:0 + context:NULL]; +} + +- (void) stopObservingEdgeStyle:(EdgeStyle*)style { + [style removeObserver:self forKeyPath:@"name"]; + [style removeObserver:self forKeyPath:@"thickness"]; + [style removeObserver:self forKeyPath:@"headStyle"]; + [style removeObserver:self forKeyPath:@"tailStyle"]; + [style removeObserver:self forKeyPath:@"decorationStyle"]; + [style removeObserver:self forKeyPath:@"colorRGB.red"]; + [style removeObserver:self forKeyPath:@"colorRGB.green"]; + [style removeObserver:self forKeyPath:@"colorRGB.blue"]; +} + +- (void) clearEdgeStylesModel { + GtkTreeModel *model = GTK_TREE_MODEL (store); + GtkTreeIter row; + if (gtk_tree_model_get_iter_first (model, &row)) { + do { + EdgeStyle *rowStyle; + gtk_tree_model_get (model, &row, EDGE_STYLES_PTR_COL, &rowStyle, -1); + [self stopObservingEdgeStyle:rowStyle]; + [rowStyle release]; + } while (gtk_tree_model_iter_next (model, &row)); + } + gtk_list_store_clear (store); +} + +- (void) reloadEdgeStyles { + [self clearEdgeStylesModel]; + cairo_surface_t *surface = [self createEdgeIconSurface]; + for (EdgeStyle *style in [styleManager edgeStyles]) { + [self addEdgeStyle:style usingSurface:surface]; + } + cairo_surface_destroy (surface); +} +@end + +// }}} + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/EdgeStylesPalette.h b/tikzit-old/src/gtk/EdgeStylesPalette.h new file mode 100644 index 0000000..c0c6c4b --- /dev/null +++ b/tikzit-old/src/gtk/EdgeStylesPalette.h @@ -0,0 +1,43 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import + +@class StyleManager; +@class EdgeStyleSelector; +@class EdgeStyleEditor; + +@interface EdgeStylesPalette: NSObject { + EdgeStyleSelector *selector; + EdgeStyleEditor *editor; + + GtkWidget *palette; + + GtkWidget *removeStyleButton; + GtkWidget *applyStyleButton; + GtkWidget *clearStyleButton; +} + +@property (retain) StyleManager *styleManager; +@property (readonly) GtkWidget *widget; + +- (id) initWithManager:(StyleManager*)m; + +@end + +// vim:ft=objc:ts=4:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/EdgeStylesPalette.m b/tikzit-old/src/gtk/EdgeStylesPalette.m new file mode 100644 index 0000000..33264cf --- /dev/null +++ b/tikzit-old/src/gtk/EdgeStylesPalette.m @@ -0,0 +1,198 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "EdgeStylesPalette.h" + +#import "EdgeStylesModel.h" +#import "EdgeStyleSelector.h" +#import "EdgeStyleEditor.h" +#import "StyleManager.h" + +// {{{ Internal interfaces +// {{{ GTK+ Callbacks +static void add_style_button_cb (GtkButton *widget, EdgeStylesPalette *palette); +static void remove_style_button_cb (GtkButton *widget, EdgeStylesPalette *palette); +// }}} +// {{{ Notifications + +@interface EdgeStylesPalette (Notifications) +- (void) selectedStyleChanged:(NSNotification*)notification; +@end + +// }}} +// {{{ Private + +@interface EdgeStylesPalette (Private) +- (void) updateButtonState; +- (void) removeSelectedStyle; +- (void) addStyle; +@end + +// }}} +// }}} +// {{{ API + +@implementation EdgeStylesPalette + +@synthesize widget=palette; + +- (id) init { + [self release]; + return nil; +} + +- (id) initWithManager:(StyleManager*)m { + self = [super init]; + + if (self) { + selector = [[EdgeStyleSelector alloc] initWithStyleManager:m]; + editor = [[EdgeStyleEditor alloc] init]; + + palette = gtk_vbox_new (FALSE, 6); + gtk_container_set_border_width (GTK_CONTAINER (palette), 6); + g_object_ref_sink (palette); + + GtkWidget *mainBox = gtk_hbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (palette), mainBox, FALSE, FALSE, 0); + gtk_widget_show (mainBox); + + GtkWidget *selectorScroller = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (selectorScroller), + GTK_POLICY_NEVER, + GTK_POLICY_AUTOMATIC); + GtkWidget *selectorFrame = gtk_frame_new (NULL); + gtk_container_add (GTK_CONTAINER (selectorScroller), [selector widget]); + gtk_container_add (GTK_CONTAINER (selectorFrame), selectorScroller); + gtk_box_pack_start (GTK_BOX (mainBox), selectorFrame, TRUE, TRUE, 0); + gtk_widget_show (selectorScroller); + gtk_widget_show (selectorFrame); + gtk_widget_show ([selector widget]); + + gtk_box_pack_start (GTK_BOX (mainBox), [editor widget], TRUE, TRUE, 0); + gtk_widget_show ([editor widget]); + + GtkBox *buttonBox = GTK_BOX (gtk_hbox_new(FALSE, 0)); + gtk_box_pack_start (GTK_BOX (palette), GTK_WIDGET (buttonBox), FALSE, FALSE, 0); + + GtkWidget *addStyleButton = gtk_button_new (); + gtk_widget_set_tooltip_text (addStyleButton, "Add a new style"); + GtkWidget *addIcon = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON); + gtk_container_add (GTK_CONTAINER (addStyleButton), addIcon); + gtk_box_pack_start (buttonBox, addStyleButton, FALSE, FALSE, 0); + g_signal_connect (G_OBJECT (addStyleButton), + "clicked", + G_CALLBACK (add_style_button_cb), + self); + + removeStyleButton = gtk_button_new (); + g_object_ref_sink (removeStyleButton); + gtk_widget_set_tooltip_text (removeStyleButton, "Delete selected style"); + GtkWidget *removeIcon = gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_BUTTON); + gtk_container_add (GTK_CONTAINER (removeStyleButton), removeIcon); + gtk_box_pack_start (buttonBox, removeStyleButton, FALSE, FALSE, 0); + g_signal_connect (G_OBJECT (removeStyleButton), + "clicked", + G_CALLBACK (remove_style_button_cb), + self); + + gtk_widget_show_all (GTK_WIDGET (buttonBox)); + + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(selectedStyleChanged:) + name:@"SelectedStyleChanged" + object:selector]; + + [self updateButtonState]; + } + + return self; +} + +- (StyleManager*) styleManager { + return [[selector model] styleManager]; +} + +- (void) setStyleManager:(StyleManager*)m { + [[selector model] setStyleManager:m]; +} + +- (void) dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + + [editor release]; + [selector release]; + + g_object_unref (palette); + g_object_unref (removeStyleButton); + + [super dealloc]; +} + +@end + +// }}} +// {{{ Notifications + +@implementation EdgeStylesPalette (Notifications) +- (void) selectedStyleChanged:(NSNotification*)notification { + [editor setStyle:[selector selectedStyle]]; + [self updateButtonState]; +} +@end + +// }}} +// {{{ Private + +@implementation EdgeStylesPalette (Private) +- (void) updateButtonState { + gboolean hasStyleSelection = [selector selectedStyle] != nil; + gtk_widget_set_sensitive (removeStyleButton, hasStyleSelection); +} + +- (void) removeSelectedStyle { + EdgeStyle *style = [selector selectedStyle]; + if (style) + [[[selector model] styleManager] removeEdgeStyle:style]; +} + +- (void) addStyle { + EdgeStyle *newStyle = [EdgeStyle defaultEdgeStyleWithName:@"newstyle"]; + [[self styleManager] addEdgeStyle:newStyle]; + [selector setSelectedStyle:newStyle]; + [editor selectNameField]; +} + +@end + +// }}} +// {{{ GTK+ callbacks + +static void add_style_button_cb (GtkButton *widget, EdgeStylesPalette *palette) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [palette addStyle]; + [pool drain]; +} + +static void remove_style_button_cb (GtkButton *widget, EdgeStylesPalette *palette) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [palette removeSelectedStyle]; + [pool drain]; +} + +// }}} + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/FileChooserDialog.h b/tikzit-old/src/gtk/FileChooserDialog.h new file mode 100644 index 0000000..80b03f5 --- /dev/null +++ b/tikzit-old/src/gtk/FileChooserDialog.h @@ -0,0 +1,56 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import + +@interface FileChooserDialog: NSObject { + GtkFileChooser *dialog; +} + ++ (FileChooserDialog*) saveDialog; ++ (FileChooserDialog*) saveDialogWithParent:(GtkWindow*)parent; ++ (FileChooserDialog*) saveDialogWithTitle:(NSString*)title parent:(GtkWindow*)parent; ++ (FileChooserDialog*) openDialog; ++ (FileChooserDialog*) openDialogWithParent:(GtkWindow*)parent; ++ (FileChooserDialog*) openDialogWithTitle:(NSString*)title parent:(GtkWindow*)parent; + +- (id) initSaveDialog; +- (id) initSaveDialogWithParent:(GtkWindow*)parent; +- (id) initSaveDialogWithTitle:(NSString*)title parent:(GtkWindow*)parent; +- (id) initOpenDialog; +- (id) initOpenDialogWithParent:(GtkWindow*)parent; +- (id) initOpenDialogWithTitle:(NSString*)title parent:(GtkWindow*)parent; + +- (void) addStandardFilters; +- (void) addFileFilter:(NSString*)filterName withPattern:(NSString*)filePattern; +- (void) addFileFilter:(NSString*)filterName withPattern:(NSString*)filePattern setSelected:(BOOL)selected; + +- (void) setCurrentFolder:(NSString*)path; +- (NSString*) currentFolder; + +- (void) setSuggestedName:(NSString*)fileName; + +- (NSString*) filePath; + +- (BOOL) showDialog; + +- (void) destroy; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/FileChooserDialog.m b/tikzit-old/src/gtk/FileChooserDialog.m new file mode 100644 index 0000000..9498e4c --- /dev/null +++ b/tikzit-old/src/gtk/FileChooserDialog.m @@ -0,0 +1,152 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "FileChooserDialog.h" + +@implementation FileChooserDialog: NSObject + ++ (FileChooserDialog*) saveDialog { return [[[self alloc] initSaveDialog] autorelease]; } ++ (FileChooserDialog*) saveDialogWithParent:(GtkWindow*)parent + { return [[[self alloc] initSaveDialogWithParent:parent] autorelease]; } ++ (FileChooserDialog*) saveDialogWithTitle:(NSString*)title parent:(GtkWindow*)parent + { return [[[self alloc] initSaveDialogWithTitle:title parent:parent] autorelease]; } ++ (FileChooserDialog*) openDialog { return [[[self alloc] initOpenDialog] autorelease]; } ++ (FileChooserDialog*) openDialogWithParent:(GtkWindow*)parent + { return [[[self alloc] initOpenDialogWithParent:parent] autorelease]; } ++ (FileChooserDialog*) openDialogWithTitle:(NSString*)title parent:(GtkWindow*)parent + { return [[[self alloc] initOpenDialogWithTitle:title parent:parent] autorelease]; } + +- (id) initSaveDialog { return [self initSaveDialogWithParent:NULL]; } +- (id) initSaveDialogWithParent:(GtkWindow*)parent + { return [self initSaveDialogWithTitle:@"Save file" parent:parent]; } +- (id) initSaveDialogWithTitle:(NSString*)title parent:(GtkWindow*)parent { + self = [super init]; + + if (self) { + dialog = GTK_FILE_CHOOSER (gtk_file_chooser_dialog_new ( + [title UTF8String], + parent, + GTK_FILE_CHOOSER_ACTION_SAVE, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, + NULL)); + gtk_file_chooser_set_do_overwrite_confirmation (dialog, TRUE); + } + + return self; +} + +- (id) initOpenDialog { return [self initOpenDialogWithParent:NULL]; } +- (id) initOpenDialogWithParent:(GtkWindow*)parent + { return [self initOpenDialogWithTitle:@"Open file" parent:parent]; } +- (id) initOpenDialogWithTitle:(NSString*)title parent:(GtkWindow*)parent { + self = [super init]; + + if (self) { + dialog = GTK_FILE_CHOOSER (gtk_file_chooser_dialog_new ( + [title UTF8String], + parent, + GTK_FILE_CHOOSER_ACTION_OPEN, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, + NULL)); + } + + return self; +} + +- (void) addStandardFilters { + GtkFileFilter *tikzfilter = gtk_file_filter_new(); + gtk_file_filter_set_name(tikzfilter, ".tikz files"); + gtk_file_filter_add_pattern(tikzfilter, "*.tikz"); + gtk_file_chooser_add_filter(dialog, tikzfilter); + GtkFileFilter *allfilter = gtk_file_filter_new(); + gtk_file_filter_set_name(allfilter, "all files"); + gtk_file_filter_add_pattern(allfilter, "*"); + gtk_file_chooser_add_filter(dialog, allfilter); + gtk_file_chooser_set_filter(dialog, tikzfilter); +} + +- (void) addFileFilter:(NSString*)filterName withPattern:(NSString*)filePattern { + [self addFileFilter:filterName withPattern:filePattern setSelected:NO]; +} + +- (void) addFileFilter:(NSString*)filterName withPattern:(NSString*)filePattern setSelected:(BOOL)selected { + GtkFileFilter *oldFilter = selected ? NULL : gtk_file_chooser_get_filter (dialog); + GtkFileFilter *filter = gtk_file_filter_new(); + gtk_file_filter_set_name(filter, [filterName UTF8String]); + gtk_file_filter_add_pattern(filter, [filePattern UTF8String]); + gtk_file_chooser_add_filter(dialog, filter); + if (selected) { + gtk_file_chooser_set_filter (dialog, filter); + } else if (oldFilter) { + gtk_file_chooser_set_filter (dialog, oldFilter); + } +} + +- (void) setCurrentFolder:(NSString*)path { + gchar *folder = [path glibFilename]; + if (folder) { + gtk_file_chooser_set_current_folder(dialog, folder); + g_free (folder); + } +} + +- (NSString*) currentFolder { + NSString *path = nil; + gchar *folder = gtk_file_chooser_get_current_folder(dialog); + if (folder) { + path = [NSString stringWithGlibFilename:folder]; + g_free (folder); + } + return path; +} + +- (void) setSuggestedName:(NSString*)fileName { + gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), [fileName UTF8String]); +} + +- (NSString*) filePath { + NSString *path = nil; + gchar *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); + if (filename) { + path = [NSString stringWithGlibFilename:filename]; + g_free (filename); + } + return path; +} + +- (BOOL) showDialog { + return (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) ? YES : NO; +} + +- (void) destroy { + gtk_widget_destroy (GTK_WIDGET (dialog)); + dialog = NULL; +} + +- (void) dealloc { + if (dialog) { + g_warning ("Failed to destroy file chooser dialog!\n"); + gtk_widget_destroy (GTK_WIDGET (dialog)); + } + [super dealloc]; +} + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/GraphEditorPanel.h b/tikzit-old/src/gtk/GraphEditorPanel.h new file mode 100644 index 0000000..2b93259 --- /dev/null +++ b/tikzit-old/src/gtk/GraphEditorPanel.h @@ -0,0 +1,53 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import "Tool.h" +#import + +@class GraphInputHandler; +@class GraphRenderer; +@class TikzDocument; +@class WidgetSurface; + +@protocol PreviewHandler +- (void) showPreview; +@end +@interface GraphEditorPanel : NSObject { + GraphRenderer *renderer; + WidgetSurface *surface; + GraphInputHandler *inputHandler; + id previewHandler; + id tool; +} +@property (retain) TikzDocument *document; +@property (readonly) GtkWidget *widget; +@property (retain) id activeTool; +@property (assign) id previewHandler; + +- (id) init; +- (id) initWithDocument:(TikzDocument*)document; +- (void) grabTool; +- (void) zoomInAboutPoint:(NSPoint)pos; +- (void) zoomOutAboutPoint:(NSPoint)pos; +- (void) zoomIn; +- (void) zoomOut; +- (void) zoomReset; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/GraphEditorPanel.m b/tikzit-old/src/gtk/GraphEditorPanel.m new file mode 100644 index 0000000..dac52a0 --- /dev/null +++ b/tikzit-old/src/gtk/GraphEditorPanel.m @@ -0,0 +1,240 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "GraphEditorPanel.h" + +#import "Application.h" +#import "GraphRenderer.h" +#import "HandTool.h" +#import "InputDelegate.h" +#import "TikzDocument.h" +#import "WidgetSurface.h" + +#import + +@class GraphRenderer; +@class WidgetSurface; + +static const InputMask zoomPanMask = ControlMask; + +/** + * Mostly just a multiplexer, but also handles zoom and pan + * when ctrl is held + */ +@interface GraphInputHandler : NSObject { + GraphEditorPanel *panel; + NSPoint dragOrigin; + NSPoint oldGraphOrigin; + BOOL zoomPanActive; +} +- (id) initForPanel:(GraphEditorPanel*)p; +@end + +@implementation GraphEditorPanel + +@synthesize previewHandler; + +- (id) init { + return [self initWithDocument:nil]; +} +- (id) initWithDocument:(TikzDocument*)document { + self = [super init]; + if (self) { + surface = [[WidgetSurface alloc] init]; + [surface setDefaultScale:50.0f]; + [surface setKeepCentered:YES]; + [surface setCanFocus:YES]; + renderer = [[GraphRenderer alloc] initWithSurface:surface document:document]; + + inputHandler = [[GraphInputHandler alloc] initForPanel:self]; + [surface setInputDelegate:inputHandler]; + } + return self; +} + +- (void) dealloc { + [renderer release]; + [surface release]; + [inputHandler release]; + + [super dealloc]; +} + +- (GraphRenderer*) renderer { + return renderer; +} +- (TikzDocument*) document { + return [renderer document]; +} +- (void) setDocument:(TikzDocument*)doc { + [renderer setDocument:doc]; +} +- (GtkWidget*) widget { + return [surface widget]; +} +- (id) activeTool { + return tool; +} +- (void) setActiveTool:(id)t { + if (t == tool) + return; + + [[[renderer document] pickSupport] deselectAllNodes]; + [[[renderer document] pickSupport] deselectAllEdges]; + + id oldTool = tool; + BOOL weHadTool = ([oldTool activeRenderer] == renderer); + if (weHadTool) { + [oldTool setActiveRenderer:nil]; + } + + tool = [t retain]; + [oldTool release]; + + if (weHadTool) { + [self grabTool]; + } +} + +- (BOOL) hasTool { + return [tool activeRenderer] == renderer; +} + +- (void) grabTool { + if ([tool activeRenderer] != renderer) { + [[tool activeRenderer] setPostRenderer:nil]; + [tool setActiveRenderer:renderer]; + } + [renderer setPostRenderer:tool]; +} + +- (void) zoomInAboutPoint:(NSPoint)pos { [surface zoomInAboutPoint:pos]; } +- (void) zoomOutAboutPoint:(NSPoint)pos { [surface zoomOutAboutPoint:pos]; } +- (void) zoomIn { [surface zoomIn]; } +- (void) zoomOut { [surface zoomOut]; } +- (void) zoomReset { [surface zoomReset]; } + +@end + +@implementation GraphInputHandler +- (id) initForPanel:(GraphEditorPanel*)p { + self = [super init]; + if (self) { + // NB: no retention! + panel = p; + } + return self; +} +- (id) init { + [self release]; + return nil; +} +- (void) dealloc { + [super dealloc]; +} + +// FIXME: share code with HandTool? +- (void) mousePressAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { + if (mask == zoomPanMask && button == LeftButton) { + dragOrigin = pos; + oldGraphOrigin = [[[panel renderer] transformer] origin]; + zoomPanActive = YES; + } else { + zoomPanActive = NO; + [panel grabTool]; + id tool = [panel activeTool]; + if ([tool respondsToSelector:@selector(mousePressAt:withButton:andMask:)]) { + [tool mousePressAt:pos withButton:button andMask:mask]; + } + } +} + +- (void) mouseDoubleClickAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { + [panel grabTool]; + id tool = [panel activeTool]; + if ([tool respondsToSelector:@selector(mouseDoubleClickAt:withButton:andMask:)]) { + [tool mouseDoubleClickAt:pos withButton:button andMask:mask]; + } +} + +- (void) mouseReleaseAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { + if (zoomPanActive && button == LeftButton) { + zoomPanActive = NO; + } else if ([panel hasTool]) { + id tool = [panel activeTool]; + if ([tool respondsToSelector:@selector(mouseReleaseAt:withButton:andMask:)]) { + [tool mouseReleaseAt:pos withButton:button andMask:mask]; + } + } +} + +- (void) mouseMoveTo:(NSPoint)pos withButtons:(MouseButton)buttons andMask:(InputMask)mask { + if (zoomPanActive && (buttons & LeftButton)) { + NSPoint newGraphOrigin = oldGraphOrigin; + newGraphOrigin.x += pos.x - dragOrigin.x; + newGraphOrigin.y += pos.y - dragOrigin.y; + [[[panel renderer] transformer] setOrigin:newGraphOrigin]; + [[panel renderer] invalidateGraph]; + } else if ([panel hasTool]) { + id tool = [panel activeTool]; + if ([tool respondsToSelector:@selector(mouseMoveTo:withButtons:andMask:)]) { + [tool mouseMoveTo:pos withButtons:buttons andMask:mask]; + } + } +} + +- (void) mouseScrolledAt:(NSPoint)pos inDirection:(ScrollDirection)dir withMask:(InputMask)mask { + if (mask == zoomPanMask) { + if (dir == ScrollUp) { + [panel zoomInAboutPoint:pos]; + } else if (dir == ScrollDown) { + [panel zoomOutAboutPoint:pos]; + } + } else { + id tool = [panel activeTool]; + if ([panel hasTool] && [tool respondsToSelector:@selector(mouseScrolledAt:inDirection:withMask:)]) { + [tool mouseScrolledAt:pos inDirection:dir withMask:mask]; + } + } +} + +- (void) keyPressed:(unsigned int)keyVal withMask:(InputMask)mask { + if (keyVal == GDK_KEY_space && !mask) { + return; + } + if (![app activateToolForKey:keyVal withMask:mask]) { + id tool = [panel activeTool]; + if ([panel hasTool] && [tool respondsToSelector:@selector(keyPressed:withMask:)]) { + [tool keyPressed:keyVal withMask:mask]; + } + } +} + +- (void) keyReleased:(unsigned int)keyVal withMask:(InputMask)mask { + if (keyVal == GDK_KEY_space && !mask) { + [[panel previewHandler] showPreview]; + } + if (![app activateToolForKey:keyVal withMask:mask]) { + id tool = [panel activeTool]; + if ([panel hasTool] && [tool respondsToSelector:@selector(keyReleased:withMask:)]) { + [tool keyReleased:keyVal withMask:mask]; + } + } +} +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/GraphRenderer.h b/tikzit-old/src/gtk/GraphRenderer.h new file mode 100644 index 0000000..730d606 --- /dev/null +++ b/tikzit-old/src/gtk/GraphRenderer.h @@ -0,0 +1,84 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import + +// classes +#import "Graph.h" +#import "Grid.h" +#import "PickSupport.h" +#import "TikzDocument.h" + +// protocols +#import "Surface.h" + +@interface GraphRenderer: NSObject { + TikzDocument *doc; + NSObject *surface; + Grid *grid; + NSMutableSet *highlightedNodes; + id postRenderer; +} + +@property (retain) id postRenderer; + +- (id) initWithSurface:(NSObject *)surface; +- (id) initWithSurface:(NSObject *)surface document:(TikzDocument*)document; +- (void) renderWithContext:(id)context; +- (void) invalidateRect:(NSRect)rect; +- (void) invalidateGraph; +- (void) invalidateNode:(Node*)node; +- (void) invalidateEdge:(Edge*)edge; +- (void) invalidateNodesHitBy:(NSPoint)point; +- (BOOL) point:(NSPoint)p hitsNode:(Node*)node; +- (BOOL) point:(NSPoint)p hitsEdge:(Edge*)edge withFuzz:(float)fuzz; +/** + * Finds a node at the given screen location. + * + * If there is more than one node at this point (because they overlap), + * an arbitrary one is returned. + */ +- (Node*) anyNodeAt:(NSPoint)p; +/** + * Finds an edge at the given screen location. + * + * If there is more than one edge at this point (because they overlap), + * an arbitrary one is returned. + * + * @param fuzz the fuzz for detecting edges: this will pick up + * edges that are close to the point + */ +- (Edge*) anyEdgeAt:(NSPoint)p withFuzz:(float)fuzz; + +- (id) surface; +- (Transformer*) transformer; +- (Grid*) grid; +- (PickSupport*) pickSupport; + +- (Graph*) graph; + +- (TikzDocument*) document; +- (void) setDocument:(TikzDocument*)document; + +- (BOOL) isNodeHighlighted:(Node*)node; +- (void) setNode:(Node*)node highlighted:(BOOL)h; +- (void) clearHighlightedNodes; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/GraphRenderer.m b/tikzit-old/src/gtk/GraphRenderer.m new file mode 100644 index 0000000..b413d3e --- /dev/null +++ b/tikzit-old/src/gtk/GraphRenderer.m @@ -0,0 +1,476 @@ +/* + * Copyright 2011 Alex Merry + * Copyright 2010 Chris Heunen + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "GraphRenderer.h" +#import "Edge+Render.h" +#import "Node+Render.h" +#import "Shape.h" + +void graph_renderer_expose_event(GtkWidget *widget, GdkEventExpose *event); + +@interface GraphRenderer (Private) +- (enum NodeState) nodeState:(Node*)node; +- (void) renderBoundingBoxWithContext:(id)context; +- (void) nodeNeedsRefreshing:(NSNotification*)notification; +- (void) edgeNeedsRefreshing:(NSNotification*)notification; +- (void) graphNeedsRefreshing:(NSNotification*)notification; +- (void) graphChanged:(NSNotification*)notification; +- (void) nodeStylePropertyChanged:(NSNotification*)notification; +- (void) edgeStylePropertyChanged:(NSNotification*)notification; +- (void) shapeDictionaryReplaced:(NSNotification*)notification; +@end + +@implementation GraphRenderer + +- (id) initWithSurface:(NSObject *)s { + self = [super init]; + + if (self) { + surface = [s retain]; + grid = [[Grid alloc] initWithSpacing:1.0f subdivisions:4 transformer:[s transformer]]; + highlightedNodes = [[NSMutableSet alloc] initWithCapacity:10]; + [surface setRenderDelegate:self]; + + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(nodeStylePropertyChanged:) + name:@"NodeStylePropertyChanged" + object:nil]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(edgeStylePropertyChanged:) + name:@"EdgeStylePropertyChanged" + object:nil]; + } + + return self; +} + +- (id) initWithSurface:(NSObject *)s document:(TikzDocument*)document { + self = [self initWithSurface:s]; + + if (self) { + [self setDocument:document]; + } + + return self; +} + +- (void) dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + [doc release]; + [grid release]; + [highlightedNodes release]; + [surface release]; + + [super dealloc]; +} + +- (id) postRenderer { + return postRenderer; +} +- (void) setPostRenderer:(id)r { + if (r == postRenderer) + return; + + [r retain]; + [postRenderer release]; + postRenderer = r; + + [self invalidateGraph]; +} + +- (void) renderWithContext:(id)context onSurface:(id)s { + [self renderWithContext:context]; + if ([s hasFocus]) { + [s renderFocus]; + } +} + +- (void) renderWithContext:(id)context { + // blank surface + [context paintWithColor:WhiteRColor]; + + // draw grid + [grid renderGridInContext:context]; + + // draw edges + NSEnumerator *enumerator = [doc edgeEnumerator]; + Edge *edge; + while ((edge = [enumerator nextObject]) != nil) { + [edge renderToSurface:surface withContext:context selected:[doc isEdgeSelected:edge]]; + } + + // draw nodes + enumerator = [doc nodeEnumerator]; + Node *node; + while ((node = [enumerator nextObject]) != nil) { + [node renderToSurface:surface withContext:context state:[self nodeState:node]]; + } + + [self renderBoundingBoxWithContext:context]; + [postRenderer renderWithContext:context onSurface:surface]; +} + +- (void) invalidateGraph { + [surface invalidate]; +} + +- (void) invalidateRect:(NSRect)rect { + [surface invalidateRect:rect]; +} + +- (void) invalidateNodes:(NSSet*)nodes { + for (Node *node in nodes) { + [self invalidateNode:node]; + } +} + +- (void) invalidateEdges:(NSSet*)edges { + for (Edge *edge in edges) { + [self invalidateEdge:edge]; + } +} + +- (void) invalidateNode:(Node*)node { + if (node == nil) { + return; + } + NSRect nodeRect = [node renderBoundsWithLabelForSurface:surface]; + nodeRect = NSInsetRect (nodeRect, -2.0f, -2.0f); + [surface invalidateRect:nodeRect]; +} + +- (void) invalidateEdge:(Edge*)edge { + if (edge == nil) { + return; + } + BOOL selected = [doc isEdgeSelected:edge]; + NSRect edgeRect = [edge renderedBoundsWithTransformer:[surface transformer] whenSelected:selected]; + edgeRect = NSInsetRect (edgeRect, -2.0f, -2.0f); + [surface invalidateRect:edgeRect]; +} + +- (void) invalidateNodesHitBy:(NSPoint)point { + NSEnumerator *enumerator = [doc nodeEnumerator]; + Node *node = nil; + while ((node = [enumerator nextObject]) != nil) { + if ([self point:point hitsNode:node]) { + [self invalidateNode:node]; + } + } +} + +- (BOOL) point:(NSPoint)p hitsNode:(Node*)node { + return [node hitByPoint:p onSurface:surface]; +} + +- (BOOL) point:(NSPoint)p fuzzyHitsNode:(Node*)node { + NSRect bounds = [node renderBoundsForSurface:surface]; + return NSPointInRect(p, bounds); +} + +- (BOOL) point:(NSPoint)p hitsEdge:(Edge*)edge withFuzz:(float)fuzz { + return [edge hitByPoint:p onSurface:surface withFuzz:fuzz]; +} + +- (Node*) anyNodeAt:(NSPoint)p { + NSEnumerator *enumerator = [doc nodeEnumerator]; + Node *node; + while ((node = [enumerator nextObject]) != nil) { + if ([self point:p hitsNode:node]) { + return node; + } + } + return nil; +} + +- (Edge*) anyEdgeAt:(NSPoint)p withFuzz:(float)fuzz { + // FIXME: is there an efficient way to find the "nearest" edge + // if the fuzz is the reason we hit more than one? + NSEnumerator *enumerator = [doc edgeEnumerator]; + Edge *edge; + while ((edge = [enumerator nextObject]) != nil) { + if ([self point:p hitsEdge:edge withFuzz:fuzz]) { + return edge; + } + } + return nil; +} + +- (id) surface { + return surface; +} + +- (Transformer*) transformer { + return [surface transformer]; +} + +- (Grid*) grid { + return grid; +} + +- (PickSupport*) pickSupport { + return [doc pickSupport]; +} + +- (Graph*) graph { + return [doc graph]; +} + +- (TikzDocument*) document { + return doc; +} + +- (void) setDocument:(TikzDocument*)document { + if (doc == document) { + return; + } + + if (doc != nil) { + [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:doc]; + [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:[doc pickSupport]]; + } + + [document retain]; + [doc release]; + doc = document; + + if (doc != nil) { + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(graphNeedsRefreshing:) + name:@"GraphReplaced" object:doc]; + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(graphChanged:) + name:@"GraphChanged" object:doc]; + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(graphChanged:) + name:@"GraphBeingChanged" object:doc]; + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(graphChanged:) + name:@"GraphChangeCancelled" object:doc]; + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(nodeNeedsRefreshing:) + name:@"NodeSelected" object:[doc pickSupport]]; + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(nodeNeedsRefreshing:) + name:@"NodeDeselected" object:[doc pickSupport]]; + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(graphNeedsRefreshing:) + name:@"NodeSelectionReplaced" object:[doc pickSupport]]; + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(edgeNeedsRefreshing:) + name:@"EdgeSelected" object:[doc pickSupport]]; + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(edgeNeedsRefreshing:) + name:@"EdgeDeselected" object:[doc pickSupport]]; + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(graphNeedsRefreshing:) + name:@"EdgeSelectionReplaced" object:[doc pickSupport]]; + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(shapeDictionaryReplaced:) + name:@"ShapeDictionaryReplaced" + object:[Shape class]]; + } + [surface invalidate]; +} + +- (BOOL) isNodeHighlighted:(Node*)node { + return [highlightedNodes containsObject:node]; +} +- (void) setNode:(Node*)node highlighted:(BOOL)h { + if (h) { + if (![highlightedNodes containsObject:node]) { + [highlightedNodes addObject:node]; + [self invalidateNode:node]; + } + } else { + if ([highlightedNodes containsObject:node]) { + [highlightedNodes removeObject:node]; + [self invalidateNode:node]; + } + } +} +- (void) clearHighlightedNodes { + [self invalidateNodes:highlightedNodes]; + [highlightedNodes removeAllObjects]; +} + +@end + +@implementation GraphRenderer (Private) +- (enum NodeState) nodeState:(Node*)node { + if ([doc isNodeSelected:node]) { + return NodeSelected; + } else if ([self isNodeHighlighted:node]) { + return NodeHighlighted; + } else { + return NodeNormal; + } +} + +- (void) renderBoundingBoxWithContext:(id)context { + if ([[self graph] hasBoundingBox]) { + [context saveState]; + + NSRect bbox = [[surface transformer] rectToScreen:[[self graph] boundingBox]]; + + [context setAntialiasMode:AntialiasDisabled]; + [context setLineWidth:1.0]; + [context startPath]; + [context rect:bbox]; + [context strokePathWithColor:MakeSolidRColor (1.0, 0.7, 0.5)]; + + [context restoreState]; + } +} + +- (void) nodeNeedsRefreshing:(NSNotification*)notification { + [self invalidateNode:[[notification userInfo] objectForKey:@"node"]]; +} + +- (void) edgeNeedsRefreshing:(NSNotification*)notification { + Edge *edge = [[notification userInfo] objectForKey:@"edge"]; + NSRect edgeRect = [edge renderedBoundsWithTransformer:[surface transformer] whenSelected:YES]; + edgeRect = NSInsetRect (edgeRect, -2, -2); + [surface invalidateRect:edgeRect]; +} + +- (void) graphNeedsRefreshing:(NSNotification*)notification { + [self invalidateGraph]; +} + +- (void) invalidateBentIncidentEdgesForNode:(Node*)nd { + for (Edge *e in [[self graph] inEdgesForNode:nd]) { + if (![e isStraight]) { + [self invalidateEdge:e]; + } + } + for (Edge *e in [[self graph] outEdgesForNode:nd]) { + if (![e isStraight]) { + [self invalidateEdge:e]; + } + } +} + +- (void) graphChanged:(NSNotification*)notification { + GraphChange *change = [[notification userInfo] objectForKey:@"change"]; + switch ([change changeType]) { + case GraphAddition: + case GraphDeletion: + [self invalidateNodes:[change affectedNodes]]; + [self invalidateEdges:[change affectedEdges]]; + break; + case NodePropertyChange: + if (!NSEqualPoints ([[change oldNode] point], [[change nwNode] point])) { + // if the node has moved, it may be affecting edges + [surface invalidate]; + } else if ([[change oldNode] style] != [[change nwNode] style]) { + // change in style means that edges may touch at a different point, + // but this only matters for bent edges + [self invalidateBentIncidentEdgesForNode:[change nodeRef]]; + // invalide both old and new (old node may be larger) + [self invalidateNode:[change oldNode]]; + [self invalidateNode:[change nwNode]]; + } else { + // invalide both old and new (old node may be larger) + [self invalidateNode:[change oldNode]]; + [self invalidateNode:[change nwNode]]; + } + break; + case EdgePropertyChange: + // invalide both old and new (old bend may increase bounds) + [self invalidateEdge:[change oldEdge]]; + [self invalidateEdge:[change nwEdge]]; + [self invalidateEdge:[change edgeRef]]; + break; + case NodesPropertyChange: + { + NSEnumerator *enumerator = [[change oldNodeTable] keyEnumerator]; + Node *node = nil; + while ((node = [enumerator nextObject]) != nil) { + NSPoint oldPos = [[[change oldNodeTable] objectForKey:node] point]; + NSPoint newPos = [[[change nwNodeTable] objectForKey:node] point]; + NodeStyle *oldStyle = [[[change oldNodeTable] objectForKey:node] style]; + NodeStyle *newStyle = [[[change nwNodeTable] objectForKey:node] style]; + if (!NSEqualPoints (oldPos, newPos)) { + [surface invalidate]; + break; + } else if (oldStyle != newStyle) { + [self invalidateBentIncidentEdgesForNode:node]; + [self invalidateNode:[[change oldNodeTable] objectForKey:node]]; + [self invalidateNode:[[change nwNodeTable] objectForKey:node]]; + } else { + [self invalidateNode:[[change oldNodeTable] objectForKey:node]]; + [self invalidateNode:[[change nwNodeTable] objectForKey:node]]; + } + } + } + break; + case NodesShift: + case NodesFlip: + case BoundingBoxChange: + [surface invalidate]; + break; + default: + // unknown change + [surface invalidate]; + break; + }; +} + +- (void) nodeStylePropertyChanged:(NSNotification*)notification { + if (![@"name" isEqual:[[notification userInfo] objectForKey:@"propertyName"]]) { + BOOL affected = NO; + for (Node *node in [[self graph] nodes]) { + if ([node style] == [notification object]) + affected = YES; + } + if (affected) + [surface invalidate]; + } +} + +- (void) edgeStylePropertyChanged:(NSNotification*)notification { + if (![@"name" isEqual:[[notification userInfo] objectForKey:@"propertyName"]]) { + BOOL affected = NO; + for (Edge *edge in [[self graph] edges]) { + if ([edge style] == [notification object]) + affected = YES; + } + if (affected) + [surface invalidate]; + } +} + +- (void) shapeDictionaryReplaced:(NSNotification*)notification { + [surface invalidate]; +} + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/HandTool.h b/tikzit-old/src/gtk/HandTool.h new file mode 100644 index 0000000..c96de36 --- /dev/null +++ b/tikzit-old/src/gtk/HandTool.h @@ -0,0 +1,33 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import "Tool.h" + +@interface HandTool : NSObject { + GraphRenderer *renderer; + NSPoint dragOrigin; + NSPoint oldGraphOrigin; +} + + ++ (id) tool; +- (id) init; +@end + + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/HandTool.m b/tikzit-old/src/gtk/HandTool.m new file mode 100644 index 0000000..c3a0fb4 --- /dev/null +++ b/tikzit-old/src/gtk/HandTool.m @@ -0,0 +1,75 @@ +/* + * Copyright 2011-2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "HandTool.h" + +#import "GraphRenderer.h" +#import "TikzDocument.h" +#import "tzstockitems.h" + +@implementation HandTool +- (NSString*) name { return @"Drag"; } +- (const gchar*) stockId { return TIKZIT_STOCK_DRAG; } +- (NSString*) helpText { return @"Move the diagram to view different parts"; } +- (NSString*) shortcut { return @"m"; } +@synthesize activeRenderer=renderer; + ++ (id) tool { + return [[[self alloc] init] autorelease]; +} + +- (id) init { + return [super init]; +} + +- (void) dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + + [renderer release]; + + [super dealloc]; +} + +- (GtkWidget*) configurationWidget { return NULL; } + +- (void) mousePressAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { + if (button != LeftButton) + return; + + dragOrigin = pos; + oldGraphOrigin = [[renderer transformer] origin]; +} + +- (void) mouseMoveTo:(NSPoint)pos withButtons:(MouseButton)buttons andMask:(InputMask)mask { + if (!(buttons & LeftButton)) + return; + + NSPoint newGraphOrigin = oldGraphOrigin; + newGraphOrigin.x += pos.x - dragOrigin.x; + newGraphOrigin.y += pos.y - dragOrigin.y; + [[renderer transformer] setOrigin:newGraphOrigin]; + [renderer invalidateGraph]; +} + +- (void) mouseReleaseAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask {} + +- (void) renderWithContext:(id)context onSurface:(id)surface {} +- (void) loadConfiguration:(Configuration*)config {} +- (void) saveConfiguration:(Configuration*)config {} +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/InputDelegate.h b/tikzit-old/src/gtk/InputDelegate.h new file mode 100644 index 0000000..9f9b426 --- /dev/null +++ b/tikzit-old/src/gtk/InputDelegate.h @@ -0,0 +1,77 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" + +typedef enum { + LeftButton = 1, + MiddleButton = 2, + RightButton = 3, + Button4 = 4, + Button5 = 5 +} MouseButton; + +typedef enum { + ShiftMask = 1, + ControlMask = 2, + MetaMask = 4 +} InputMask; + +typedef enum { + ScrollUp = 1, + ScrollDown = 2, + ScrollLeft = 3, + ScrollRight = 4, +} ScrollDirection; + +@protocol InputDelegate +@optional +/** + * A mouse button was pressed. + */ +- (void) mousePressAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask; +/** + * A mouse button was released. + */ +- (void) mouseReleaseAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask; +/** + * A mouse button was double-clicked. + * + * Note that mouseDown and mouseUp events will still be delivered. + * This will be triggered between the second mouseDown and the second + * mouseUp. + */ +- (void) mouseDoubleClickAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask; +/** + * The mouse was moved + */ +- (void) mouseMoveTo:(NSPoint)pos withButtons:(MouseButton)button andMask:(InputMask)mask; +/** + * The mouse was scrolled + */ +- (void) mouseScrolledAt:(NSPoint)pos inDirection:(ScrollDirection)dir withMask:(InputMask)mask; +/** + * A key was pressed + */ +- (void) keyPressed:(unsigned int)keyVal withMask:(InputMask)mask; +/** + * A key was released + */ +- (void) keyReleased:(unsigned int)keyVal withMask:(InputMask)mask; +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/Menu.h b/tikzit-old/src/gtk/Menu.h new file mode 100644 index 0000000..e0f78d4 --- /dev/null +++ b/tikzit-old/src/gtk/Menu.h @@ -0,0 +1,86 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import + +@class Window; +@class PickSupport; + +/** + * Manages the menu + */ +@interface Menu: NSObject { + GtkWidget *menubar; + GtkActionGroup *appActions; + GtkActionGroup *windowActions; + GtkAction *undoAction; // no ref + GtkAction *redoAction; // no ref + GtkAction *pasteAction; // no ref + GtkAction **nodeSelBasedActions; + guint nodeSelBasedActionCount; + GtkAction **edgeSelBasedActions; + guint edgeSelBasedActionCount; + GtkAction **selBasedActions; + guint selBasedActionCount; +} + +/** + * The menubar widget, to be inserted into the window + */ +@property (readonly) GtkWidget *menubar; + +/** + * Constructs the menu for @p window + * + * @param window the window that will be acted upon + */ +- (id) initForWindow:(Window*)window; + +/** + * Enables or disables the undo action + */ +- (void) setUndoActionEnabled:(BOOL)enabled; +/** + * Sets the text that describes what action will be undone + * + * @param detail a text description of the action, or nil + */ +- (void) setUndoActionDetail:(NSString*)detail; +/** + * Enables or disables the redo action + */ +- (void) setRedoActionEnabled:(BOOL)enabled; +/** + * Sets the text that describes what action will be redone + * + * @param detail a text description of the action, or nil + */ +- (void) setRedoActionDetail:(NSString*)detail; + +/** + * Gets the paste action + */ +- (GtkAction*) pasteAction; + +/** + * Enables or disables the actions that act on a selection + */ +- (void) notifySelectionChanged:(PickSupport*)pickSupport; +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/Menu.m b/tikzit-old/src/gtk/Menu.m new file mode 100644 index 0000000..04c9c31 --- /dev/null +++ b/tikzit-old/src/gtk/Menu.m @@ -0,0 +1,737 @@ +/* + * Copyright 2011 Alex Merry + * + * Stuff stolen from glade-window.c in Glade: + * Copyright (C) 2001 Ximian, Inc. + * Copyright (C) 2007 Vincent Geddes. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "Menu.h" + +#import "Application.h" +#import "Window.h" +#import "Configuration.h" +#import "PickSupport.h" +#import "Shape.h" +#import "Tool.h" +#import "TikzDocument.h" + +#import +#ifdef _ +#undef _ +#endif +#import +#import + +#import "gtkhelpers.h" + +#import "logo.h" + +// {{{ Application actions +static void new_cb (GtkAction *action, Application *appl) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [appl newWindow]; + [pool drain]; +} + +static void refresh_shapes_cb (GtkAction *action, Application *appl) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [Shape refreshShapeDictionary]; + [pool drain]; +} + +static void show_preferences_cb (GtkAction *action, Application *appl) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [appl presentSettingsDialog]; + [pool drain]; +} + +#ifdef HAVE_POPPLER +static void show_preamble_cb (GtkAction *action, Application *appl) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [appl presentPreamblesEditor]; + [pool drain]; +} +#endif + +static void show_context_window_cb (GtkAction *action, Application *appl) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [appl presentContextWindow]; + [pool drain]; +} + +static void quit_cb (GtkAction *action, Application *appl) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [appl quit]; + [pool drain]; +} + +static void help_cb (GtkAction *action, Application *appl) { + GError *gerror = NULL; + gtk_show_uri (NULL, "http://tikzit.sourceforge.net/manual.html", GDK_CURRENT_TIME, &gerror); + if (gerror != NULL) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + logGError (gerror, @"Could not show help"); + [pool drain]; + } +} + +static void about_cb (GtkAction *action, Application *appl) { + static const gchar * const authors[] = + { "Aleks Kissinger ", + "Chris Heunen ", + "Alex Merry ", + NULL }; + + static const gchar license[] = + N_("TikZiT is free software; you can redistribute it and/or modify " + "it under the terms of the GNU General Public License as " + "published by the Free Software Foundation; either version 2 of the " + "License, or (at your option) any later version." + "\n\n" + "TikZiT is distributed in the hope that it will be useful, " + "but WITHOUT ANY WARRANTY; without even the implied warranty of " + "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the " + "GNU General Public License for more details." + "\n\n" + "You should have received a copy of the GNU General Public License " + "along with TikZiT; if not, write to the Free Software " + "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, " + "MA 02110-1301, USA."); + + static const gchar copyright[] = + "Copyright \xc2\xa9 2010-2011 Aleks Kissinger, Chris Heunen and Alex Merry."; + + GdkPixbuf *logo = get_logo (LOGO_SIZE_128); + gtk_show_about_dialog (NULL, + "program-name", PACKAGE_NAME, + "logo", logo, + "authors", authors, + "translator-credits", _("translator-credits"), + "comments", _("A graph manipulation program for pgf/tikz graphs"), + "license", _(license), + "wrap-license", TRUE, + "copyright", copyright, + "version", PACKAGE_VERSION, + "website", "http://tikzit.sourceforge.net", + NULL); + g_object_unref (logo); +} + +static GtkActionEntry app_action_entries[] = { + /* + Fields: + * action name + * stock id or name of icon for action + * label for action (mark for translation with N_) + * accelerator (as understood by gtk_accelerator_parse()) + * tooltip (mark for translation with N_) + * callback + */ + { "New", GTK_STOCK_NEW, NULL, "N", + N_("Create a new graph"), G_CALLBACK (new_cb) }, + + { "RefreshShapes", NULL, N_("_Refresh shapes"), NULL, + N_(""), G_CALLBACK (refresh_shapes_cb) }, + + { "Quit", GTK_STOCK_QUIT, NULL, "Q", + N_("Quit the program"), G_CALLBACK (quit_cb) }, + + { "Tool", NULL, N_("_Tool") }, + + { "ShowPreferences", GTK_STOCK_PREFERENCES, N_("Configure TikZiT..."), NULL, + N_("Edit the TikZiT configuration"), G_CALLBACK (show_preferences_cb) }, + +#ifdef HAVE_POPPLER + { "ShowPreamble", NULL, N_("_Edit Preambles..."), NULL, + N_("Edit the preambles used to generate the preview"), G_CALLBACK (show_preamble_cb) }, +#endif + + { "ShowContextWindow", NULL, N_("_Context Window"), NULL, + N_("Show the contextual tools window"), G_CALLBACK (show_context_window_cb) }, + + /* HelpMenu */ + { "HelpManual", GTK_STOCK_HELP, N_("_Online manual"), "F1", + N_("TikZiT manual (online)"), G_CALLBACK (help_cb) }, + + { "About", GTK_STOCK_ABOUT, NULL, NULL, + N_("About this application"), G_CALLBACK (about_cb) }, +}; +static guint n_app_action_entries = G_N_ELEMENTS (app_action_entries); +// }}} +// {{{ Window actions + +static void open_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [window openFile]; + [pool drain]; +} + +static void close_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [window close]; + [pool drain]; +} + +static void save_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [window saveActiveDocument]; + [pool drain]; +} + +static void save_as_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [window saveActiveDocumentAs]; + [pool drain]; +} + +static void save_as_shape_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [window saveActiveDocumentAsShape]; + [pool drain]; +} + +static void undo_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + TikzDocument *document = [window document]; + if ([document canUndo]) { + [document undo]; + } else { + g_warning ("Can't undo!\n"); + gtk_action_set_sensitive (action, FALSE); + } + + [pool drain]; +} + +static void redo_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + TikzDocument *document = [window document]; + if ([document canRedo]) { + [document redo]; + } else { + g_warning ("Can't redo!\n"); + gtk_action_set_sensitive (action, FALSE); + } + + [pool drain]; +} + +static void cut_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [window selectionCutToClipboard]; + [pool drain]; +} + +static void copy_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [window selectionCopyToClipboard]; + [pool drain]; +} + +static void paste_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [window pasteFromClipboard]; + [pool drain]; +} + +static void delete_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [[window document] removeSelected]; + [pool drain]; +} + +static void select_all_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + TikzDocument *document = [window document]; + [[document pickSupport] selectAllNodes:[NSSet setWithArray:[[document graph] nodes]]]; + [pool drain]; +} + +static void deselect_all_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + TikzDocument *document = [window document]; + [[document pickSupport] deselectAllNodes]; + [[document pickSupport] deselectAllEdges]; + [pool drain]; +} + +static void flip_horiz_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [[window document] flipSelectedNodesHorizontally]; + [pool drain]; +} + +static void flip_vert_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [[window document] flipSelectedNodesVertically]; + [pool drain]; +} + +static void reverse_edges_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [[window document] reverseSelectedEdges]; + [pool drain]; +} + +static void bring_forward_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [[window document] bringSelectionForward]; + [pool drain]; +} + +static void send_backward_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [[window document] sendSelectionBackward]; + [pool drain]; +} + +static void bring_to_front_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [[window document] bringSelectionToFront]; + [pool drain]; +} + +static void send_to_back_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [[window document] sendSelectionToBack]; + [pool drain]; +} + +#ifdef HAVE_POPPLER +static void show_preview_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [window presentPreview]; + [pool drain]; +} +#endif + +static void zoom_in_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [window zoomIn]; + [pool drain]; +} + +static void zoom_out_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [window zoomOut]; + [pool drain]; +} + +static void zoom_reset_cb (GtkAction *action, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [window zoomReset]; + [pool drain]; +} + +static void recent_chooser_item_activated_cb (GtkRecentChooser *chooser, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + gchar *uri, *path; + GError *error = NULL; + + uri = gtk_recent_chooser_get_current_uri (chooser); + + path = g_filename_from_uri (uri, NULL, NULL); + if (error) { + g_warning ("Could not convert uri \"%s\" to a local path: %s", uri, error->message); + g_error_free (error); + return; + } + + [window openFileAtPath:[NSString stringWithGlibFilename:path]]; + + g_free (uri); + g_free (path); + + [pool drain]; +} + + +static GtkActionEntry window_action_entries[] = { + /* + Fields: + * action name + * stock id or name of icon for action + * label for action (mark for translation with N_) + * accelerator (as understood by gtk_accelerator_parse()) + * tooltip (mark for translation with N_) + * callback + */ + { "FileMenu", NULL, N_("_File") }, + { "EditMenu", NULL, N_("_Edit") }, + { "ViewMenu", NULL, N_("_View") }, + { "HelpMenu", NULL, N_("_Help") }, + + { "Arrange", NULL, N_("_Arrange") }, + { "Zoom", NULL, N_("_Zoom") }, + + { "Open", GTK_STOCK_OPEN, N_("_Open\342\200\246") ,"O", + N_("Open a graph"), G_CALLBACK (open_cb) }, + + { "Close", GTK_STOCK_CLOSE, NULL, "W", + N_("Close the current graph"), G_CALLBACK (close_cb) }, + + { "ZoomIn", GTK_STOCK_ZOOM_IN, NULL, "plus", + NULL, G_CALLBACK (zoom_in_cb) }, + + { "ZoomOut", GTK_STOCK_ZOOM_OUT, NULL, "minus", + NULL, G_CALLBACK (zoom_out_cb) }, + + { "ZoomReset", GTK_STOCK_ZOOM_100, N_("_Reset zoom"), "0", + NULL, G_CALLBACK (zoom_reset_cb) }, + + { "Save", GTK_STOCK_SAVE, NULL, "S", + N_("Save the current graph"), G_CALLBACK (save_cb) }, + + { "SaveAs", GTK_STOCK_SAVE_AS, N_("Save _As\342\200\246"), NULL, + N_("Save the current graph with a different name"), G_CALLBACK (save_as_cb) }, + + { "SaveAsShape", NULL, N_("Save As S_hape\342\200\246"), NULL, + N_("Save the current graph as a shape for use in styles"), G_CALLBACK (save_as_shape_cb) }, + + { "Undo", GTK_STOCK_UNDO, NULL, "Z", + N_("Undo the last action"), G_CALLBACK (undo_cb) }, + + { "Redo", GTK_STOCK_REDO, NULL, "Z", + N_("Redo the last action"), G_CALLBACK (redo_cb) }, + + { "Cut", GTK_STOCK_CUT, NULL, NULL, + N_("Cut the selection"), G_CALLBACK (cut_cb) }, + + { "Copy", GTK_STOCK_COPY, NULL, NULL, + N_("Copy the selection"), G_CALLBACK (copy_cb) }, + + { "Paste", GTK_STOCK_PASTE, NULL, NULL, + N_("Paste the clipboard"), G_CALLBACK (paste_cb) }, + + { "Delete", GTK_STOCK_DELETE, NULL, "Delete", + N_("Delete the selection"), G_CALLBACK (delete_cb) }, + + { "SelectAll", GTK_STOCK_SELECT_ALL, NULL, "A", + N_("Select all nodes on the graph"), G_CALLBACK (select_all_cb) }, + + { "DeselectAll", NULL, N_("D_eselect all"), "A", + N_("Deselect everything"), G_CALLBACK (deselect_all_cb) }, + + { "FlipHoriz", NULL, N_("Flip nodes _horizonally"), NULL, + N_("Flip the selected nodes horizontally"), G_CALLBACK (flip_horiz_cb) }, + + { "FlipVert", NULL, N_("Flip nodes _vertically"), NULL, + N_("Flip the selected nodes vertically"), G_CALLBACK (flip_vert_cb) }, + + { "ReverseEdges", NULL, N_("Rever_se edges"), NULL, + N_("Reverse the selected edges"), G_CALLBACK (reverse_edges_cb) }, + + { "SendToBack", NULL, N_("Send to _back"), NULL, + N_("Send the selected nodes and edges to the back of the graph"), G_CALLBACK (send_to_back_cb) }, + + { "SendBackward", NULL, N_("Send b_ackward"), NULL, + N_("Send the selected nodes and edges backward"), G_CALLBACK (send_backward_cb) }, + + { "BringForward", NULL, N_("Bring f_orward"), NULL, + N_("Bring the selected nodes and edges forward"), G_CALLBACK (bring_forward_cb) }, + + { "BringToFront", NULL, N_("Bring to _front"), NULL, + N_("Bring the selected nodes and edges to the front of the graph"), G_CALLBACK (bring_to_front_cb) }, + + /* ViewMenu */ +#ifdef HAVE_POPPLER + { "ShowPreview", NULL, N_("_Preview"), "L", + N_("See the graph as it will look when rendered in LaTeX"), G_CALLBACK (show_preview_cb) }, +#endif +}; +static guint n_window_action_entries = G_N_ELEMENTS (window_action_entries); + +// }}} +// {{{ UI XML + +static const gchar ui_info[] = +"" +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +#ifdef HAVE_POPPLER +" " +" " +#endif +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +/* +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +*/ +""; + + + +// }}} +// {{{ Helper methods + +static void configure_recent_chooser (GtkRecentChooser *chooser) +{ + gtk_recent_chooser_set_local_only (chooser, TRUE); + gtk_recent_chooser_set_show_icons (chooser, FALSE); + gtk_recent_chooser_set_sort_type (chooser, GTK_RECENT_SORT_MRU); + + GtkRecentFilter *filter = gtk_recent_filter_new (); + gtk_recent_filter_add_application (filter, g_get_application_name()); + gtk_recent_chooser_set_filter (chooser, filter); +} + +static void tool_cb (GtkAction *action, id tool) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [app setActiveTool:tool]; + [pool drain]; +} + + + +// }}} +// {{{ API + +@implementation Menu + +- (id) init { + [self release]; + return nil; +} + +- (id) initForWindow:(Window*)window { + self = [super init]; + if (!self) { + return nil; + } + + GError *error = NULL; + + appActions = gtk_action_group_new ("TZApp"); + //gtk_action_group_set_translation_domain (actions, GETTEXT_PACKAGE); + gtk_action_group_add_actions (appActions, + app_action_entries, + n_app_action_entries, + app); + for (id tool in [app tools]) { + NSString *tooltip = [NSString stringWithFormat: + @"%@: %@ (%@)", [tool name], [tool helpText], [tool shortcut]]; + GtkAction *action = gtk_action_new ( + [[tool name] UTF8String], + [[tool name] UTF8String], + [tooltip UTF8String], + [tool stockId]); + gtk_action_group_add_action_with_accel ( + appActions, + action, + NULL); + g_signal_connect ( + G_OBJECT (action), + "activate", + G_CALLBACK (tool_cb), + tool); + g_object_unref (action); + } + + windowActions = gtk_action_group_new ("TZWindow"); + //gtk_action_group_set_translation_domain (windowActions, GETTEXT_PACKAGE); + + gtk_action_group_add_actions (windowActions, + window_action_entries, + n_window_action_entries, + window); + + GtkAction *action = gtk_recent_action_new ("OpenRecent", N_("Open _Recent"), NULL, NULL); + g_signal_connect (G_OBJECT (action), + "item-activated", + G_CALLBACK (recent_chooser_item_activated_cb), + window); + configure_recent_chooser (GTK_RECENT_CHOOSER (action)); + gtk_action_group_add_action_with_accel (windowActions, action, NULL); + g_object_unref (action); + + /* Save refs to actions that will need to be updated */ + undoAction = gtk_action_group_get_action (windowActions, "Undo"); + redoAction = gtk_action_group_get_action (windowActions, "Redo"); + pasteAction = gtk_action_group_get_action (windowActions, "Paste"); + + nodeSelBasedActionCount = 4; + nodeSelBasedActions = g_new (GtkAction*, nodeSelBasedActionCount); + nodeSelBasedActions[0] = gtk_action_group_get_action (windowActions, "Cut"); + nodeSelBasedActions[1] = gtk_action_group_get_action (windowActions, "Copy"); + nodeSelBasedActions[2] = gtk_action_group_get_action (windowActions, "FlipHoriz"); + nodeSelBasedActions[3] = gtk_action_group_get_action (windowActions, "FlipVert"); + edgeSelBasedActionCount = 1; + edgeSelBasedActions = g_new (GtkAction*, edgeSelBasedActionCount); + edgeSelBasedActions[0] = gtk_action_group_get_action (windowActions, "ReverseEdges"); + selBasedActionCount = 2; + selBasedActions = g_new (GtkAction*, selBasedActionCount); + selBasedActions[0] = gtk_action_group_get_action (windowActions, "Delete"); + selBasedActions[1] = gtk_action_group_get_action (windowActions, "DeselectAll"); + + + GtkUIManager *ui = gtk_ui_manager_new (); + gtk_ui_manager_insert_action_group (ui, windowActions, 0); + gtk_ui_manager_insert_action_group (ui, appActions, 1); + gtk_window_add_accel_group ([window gtkWindow], gtk_ui_manager_get_accel_group (ui)); + if (!gtk_ui_manager_add_ui_from_string (ui, ui_info, -1, &error)) + { + g_message ("Building menus failed: %s", error->message); + g_error_free (error); + g_object_unref (ui); + [self release]; + return nil; + } + guint tool_merge_id = gtk_ui_manager_new_merge_id (ui); + for (id tool in [app tools]) { + gtk_ui_manager_add_ui (ui, + tool_merge_id, + "/ui/MenuBar/EditMenu/Tool", + [[tool name] UTF8String], + [[tool name] UTF8String], + GTK_UI_MANAGER_AUTO, + FALSE); + } + menubar = gtk_ui_manager_get_widget (ui, "/MenuBar"); + g_object_ref_sink (menubar); + g_object_unref (ui); + + return self; +} + +- (void) dealloc { + g_free (nodeSelBasedActions); + g_free (edgeSelBasedActions); + g_free (selBasedActions); + g_object_unref (menubar); + g_object_unref (appActions); + g_object_unref (windowActions); + + [super dealloc]; +} + +@synthesize menubar; + +- (void) setUndoActionEnabled:(BOOL)enabled { + gtk_action_set_sensitive (undoAction, enabled); +} + +- (void) setUndoActionDetail:(NSString*)detail { + gtk_action_set_detailed_label (undoAction, "_Undo", [detail UTF8String]); +} + +- (void) setRedoActionEnabled:(BOOL)enabled { + gtk_action_set_sensitive (redoAction, enabled); +} + +- (void) setRedoActionDetail:(NSString*)detail { + gtk_action_set_detailed_label (redoAction, "_Redo", [detail UTF8String]); +} + +- (GtkAction*) pasteAction { + return pasteAction; +} + +- (void) notifySelectionChanged:(PickSupport*)pickSupport { + BOOL hasSelectedNodes = [[pickSupport selectedNodes] count] > 0; + BOOL hasSelectedEdges = [[pickSupport selectedEdges] count] > 0; + for (int i = 0; i < nodeSelBasedActionCount; ++i) { + if (nodeSelBasedActions[i]) { + gtk_action_set_sensitive (nodeSelBasedActions[i], hasSelectedNodes); + } + } + for (int i = 0; i < edgeSelBasedActionCount; ++i) { + if (edgeSelBasedActions[i]) { + gtk_action_set_sensitive (edgeSelBasedActions[i], hasSelectedEdges); + } + } + for (int i = 0; i < selBasedActionCount; ++i) { + if (selBasedActions[i]) { + gtk_action_set_sensitive (selBasedActions[i], hasSelectedNodes || hasSelectedEdges); + } + } +} + +@end + +// }}} + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/NSError+Glib.h b/tikzit-old/src/gtk/NSError+Glib.h new file mode 100644 index 0000000..137977e --- /dev/null +++ b/tikzit-old/src/gtk/NSError+Glib.h @@ -0,0 +1,28 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import +#import + +@interface NSError(Glib) ++ (id) errorWithGError:(GError*)gerror; +@end + +void GErrorToNSError(GError *errorIn, NSError **errorOut); +void logGError (GError *error, NSString *message); + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/NSError+Glib.m b/tikzit-old/src/gtk/NSError+Glib.m new file mode 100644 index 0000000..f466d9e --- /dev/null +++ b/tikzit-old/src/gtk/NSError+Glib.m @@ -0,0 +1,50 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "NSError+Glib.h" +#import "TZFoundation.h" + +@implementation NSError(Glib) ++ (id) errorWithGError:(GError*)gerror { + if (!gerror) + return nil; + + NSString *message = [NSString stringWithUTF8String:gerror->message]; + NSString *domain = [NSString stringWithUTF8String:g_quark_to_string(gerror->domain)]; + + NSMutableDictionary *errorDetail = [NSMutableDictionary dictionaryWithObject:message + forKey:NSLocalizedDescriptionKey]; + return [self errorWithDomain:domain code:gerror->code userInfo:errorDetail]; +} +@end + +void GErrorToNSError(GError *errorIn, NSError **errorOut) +{ + if (errorOut && errorIn) { + *errorOut = [NSError errorWithGError:errorIn]; + } +} + +void logGError (GError *error, NSString *message) { + if (message == nil) { + NSLog (@"%s", error->message); + } else { + NSLog (@"%@: %s", message, error->message); + } +} + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/NSFileManager+Glib.h b/tikzit-old/src/gtk/NSFileManager+Glib.h new file mode 100644 index 0000000..cb49fcb --- /dev/null +++ b/tikzit-old/src/gtk/NSFileManager+Glib.h @@ -0,0 +1,31 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import + +@interface NSFileManager(Glib) +/** + * Creates a directory in the system temp directory + */ +- (NSString*) createTempDirectoryWithError:(NSError**)error; +/** + * Creates a directory in the system temp directory + */ +- (NSString*) createTempDirectory; +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/NSFileManager+Glib.m b/tikzit-old/src/gtk/NSFileManager+Glib.m new file mode 100644 index 0000000..b3e9de6 --- /dev/null +++ b/tikzit-old/src/gtk/NSFileManager+Glib.m @@ -0,0 +1,55 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "NSFileManager+Glib.h" +#import "TZFoundation.h" +#import "mkdtemp.h" + +@implementation NSFileManager(Glib) + +- (NSString*) createTempDirectoryWithError:(NSError**)error { + NSString *result = nil; +#if GLIB_CHECK_VERSION (2, 30, 0) + GError *gerror = NULL; + gchar *dir = g_dir_make_tmp ("tikzitXXXXXX", &gerror); + GErrorToNSError (gerror, error); + if (dir) + result = [NSString stringWithGlibFilename:dir]; + g_free (dir); +#else +//#if (!GLIB_CHECK_VERSION (2, 26, 0)) +#define g_mkdtemp mkdtemp +//#endif + gchar *dir = g_build_filename (g_get_tmp_dir(), "tikzitXXXXXX", NULL); + gchar *rdir = g_mkdtemp (dir); + if (rdir) { + result = [NSString stringWithGlibFilename:dir]; + } else if (error) { + *error = [NSError errorWithLibcError:errno]; + } + g_free (dir); +#endif + return result; +} + +- (NSString*) createTempDirectory { + return [self createTempDirectoryWithError:NULL]; +} + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/NSString+Glib.h b/tikzit-old/src/gtk/NSString+Glib.h new file mode 100644 index 0000000..ac59833 --- /dev/null +++ b/tikzit-old/src/gtk/NSString+Glib.h @@ -0,0 +1,50 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import +#import + +@interface NSString(Glib) +/** + * Initialise a string with a string in the GLib filename encoding + */ +- (id) initWithGlibFilename:(const gchar *)filename; +/** + * Create a string from a string in the GLib filename encoding + */ ++ (id) stringWithGlibFilename:(const gchar *)filename; +/** + * Get a copy of the string in GLib filename encoding. + * + * This will need to be freed with g_free. + */ +- (gchar*)glibFilename; +/** + * Get a copy of the string as a GLib URI + * + * This will need to be freed with g_free. + */ +- (gchar*)glibUriWithError:(NSError**)error; +/** + * Get a copy of the string as a GLib URI + * + * This will need to be freed with g_free. + */ +- (gchar*)glibUri; +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/NSString+Glib.m b/tikzit-old/src/gtk/NSString+Glib.m new file mode 100644 index 0000000..b6dc765 --- /dev/null +++ b/tikzit-old/src/gtk/NSString+Glib.m @@ -0,0 +1,96 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "NSString+Glib.h" +#import "TZFoundation.h" + +@implementation NSString(Glib) ++ (id) stringWithGlibFilename:(const gchar *)filename { + return [[[self alloc] initWithGlibFilename:filename] autorelease]; +} + +- (id) initWithGlibFilename:(const gchar *)filename { + if (self == nil) { + return nil; + } + + if (filename == NULL) { + [self release]; + return nil; + } + + GError *error = NULL; + gchar *utf8file = g_filename_to_utf8 (filename, -1, NULL, NULL, &error); + if (utf8file == NULL) { + if (error) + logGError (error, @"Failed to convert a GLib filename to UTF8"); + [self release]; + return nil; + } + + self = [self initWithUTF8String:utf8file]; + g_free (utf8file); + + return self; +} + +- (gchar*)glibFilenameWithError:(NSError**)error { + GError *gerror = NULL; + gchar *result = g_filename_from_utf8 ([self UTF8String], -1, NULL, NULL, &gerror); + GErrorToNSError (gerror, error); + if (gerror) { + logGError (gerror, @"Failed to convert a UTF8 string to a GLib filename"); + } + return result; +} + +- (gchar*)glibFilename { + return [self glibFilenameWithError:NULL]; +} + +- (gchar*)glibUriWithError:(NSError**)error { + gchar *filepath; + gchar *uri; + NSError *cause = nil; + + filepath = [self glibFilenameWithError:&cause]; + if (!filepath) { + if (error) { + NSString *message = [NSString stringWithFormat:@"Could not convert \"%@\" to the GLib filename encoding", self]; + *error = [NSError errorWithMessage:message code:TZ_ERR_OTHER cause:cause]; + } + return NULL; + } + + GError *gerror = NULL; + GError **gerrorptr = error ? &gerror : NULL; + uri = g_filename_to_uri (filepath, NULL, gerrorptr); + if (!uri && error) { + NSString *message = [NSString stringWithFormat:@"Could not convert \"%@\" to a GLib URI", self]; + *error = [NSError errorWithMessage:message code:TZ_ERR_BADFORMAT cause:[NSError errorWithGError:gerror]]; + } + g_free (filepath); + return uri; +} + +- (gchar*)glibUri { + return [self glibUriWithError:NULL]; +} + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/Node+Render.h b/tikzit-old/src/gtk/Node+Render.h new file mode 100644 index 0000000..60d2573 --- /dev/null +++ b/tikzit-old/src/gtk/Node+Render.h @@ -0,0 +1,44 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import "Node.h" +#import "RenderContext.h" +#import "Surface.h" + +enum NodeState { + NodeNormal, + NodeSelected, + NodeHighlighted +}; + +@interface Node(Render) + +- (Transformer*) shapeTransformerForSurface:(id)surface; +// the total rendered bounds, excluding label +- (NSRect) renderBoundsForSurface:(id)surface; +- (NSRect) renderBoundsWithLabelForSurface:(id)surface; +- (NSString*) renderedLabel; +- (NSSize) renderedLabelSizeInContext:(id)context; +- (void) renderLabelToSurface:(id)surface withContext:(id)context; +- (void) renderLabelAt:(NSPoint)point withContext:(id)context; +- (void) renderToSurface:(id)surface withContext:(id)context state:(enum NodeState)state; +- (BOOL) hitByPoint:(NSPoint)p onSurface:(id)surface; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/Node+Render.m b/tikzit-old/src/gtk/Node+Render.m new file mode 100644 index 0000000..907d818 --- /dev/null +++ b/tikzit-old/src/gtk/Node+Render.m @@ -0,0 +1,188 @@ +/* + * Copyright 2011 Alex Merry + * Copyright 2010 Chris Heunen + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "Node+Render.h" +#import "Shape.h" +#import "Shape+Render.h" +#import "ShapeNames.h" + +#define MAX_LABEL_LENGTH 10 +#define LABEL_PADDING_X 2 +#define LABEL_PADDING_Y 2 + +@implementation Node (Render) + +- (Shape*) shapeToRender { + if (style) { + return [Shape shapeForName:[style shapeName]]; + } else { + return [Shape shapeForName:SHAPE_CIRCLE]; + } +} + +- (Transformer*) shapeTransformerForSurface:(id)surface { + return [self shapeTransformerFromTransformer:[surface transformer]]; +} + +- (NSRect) renderBoundsUsingShapeTransform:(Transformer*)shapeTrans { + float strokeThickness = style ? [style strokeThickness] : [NodeStyle defaultStrokeThickness]; + NSRect screenBounds = [shapeTrans rectToScreen:[[self shapeToRender] boundingRect]]; + screenBounds = NSInsetRect(screenBounds, -strokeThickness, -strokeThickness); + return screenBounds; +} + +- (NSRect) renderBoundsForSurface:(id)surface { + return [self renderBoundsUsingShapeTransform:[self shapeTransformerForSurface:surface]]; +} + +- (NSRect) renderBoundsWithLabelForSurface:(id)surface { + NSRect nodeBounds = [self renderBoundsForSurface:surface]; + NSRect labelRect = NSZeroRect; + if (![label isEqual:@""]) { + id cr = [surface createRenderContext]; + labelRect.size = [self renderedLabelSizeInContext:cr]; + NSPoint nodePos = [[surface transformer] toScreen:point]; + labelRect.origin.x = nodePos.x - (labelRect.size.width / 2); + labelRect.origin.y = nodePos.y - (labelRect.size.height / 2); + } + return NSUnionRect(nodeBounds, labelRect); +} + +- (RColor) strokeColor { + if (style) { + return [[style strokeColorRGB] rColor]; + } else { + return MakeRColor (0.4, 0.4, 0.7, 0.8); + } +} + +- (RColor) fillColor { + if (style) { + return [[style fillColorRGB] rColor]; + } else { + return MakeRColor (0.4, 0.4, 0.7, 0.3); + } +} + +- (NSString*) renderedLabel { + NSString *r_label = [label stringByExpandingLatexConstants]; + if ([r_label length] > MAX_LABEL_LENGTH) { + r_label = [[[r_label substringToIndex:MAX_LABEL_LENGTH-1] stringByTrimmingSpaces] stringByAppendingString:@"..."]; + } else { + r_label = [r_label stringByTrimmingSpaces]; + } + return r_label; +} + +- (NSSize) renderedLabelSizeInContext:(id)context { + NSSize result = {0, 0}; + if (![label isEqual:@""]) { + NSString *r_label = [self renderedLabel]; + + id layout = [context layoutText:r_label withSize:9]; + + result = [layout size]; + result.width += LABEL_PADDING_X; + result.height += LABEL_PADDING_Y; + } + return result; +} + +- (void) renderLabelToSurface:(id )surface withContext:(id)context { + [self renderLabelAt:[[surface transformer] toScreen:point] withContext:context]; +} + +- (void) renderLabelAt:(NSPoint)p withContext:(id)context { + // draw latex code overlayed on node + if (![label isEqual:@""]) { + [context saveState]; + + NSString *r_label = [self renderedLabel]; + id layout = [context layoutText:r_label withSize:9]; + + NSSize labelSize = [layout size]; + + NSRect textBounds = NSMakeRect (p.x - labelSize.width/2, + p.y - labelSize.height/2, + labelSize.width, + labelSize.height); + NSRect backRect = NSInsetRect (textBounds, -LABEL_PADDING_X, -LABEL_PADDING_Y); + + [context startPath]; + [context setLineWidth:1.0]; + [context rect:backRect]; + RColor fColor = MakeRColor (1.0, 1.0, 0.5, 0.7); + RColor sColor = MakeRColor (0.5, 0.0, 0.0, 0.7); + [context strokePathWithColor:sColor andFillWithColor:fColor]; + + [layout showTextAt:textBounds.origin withColor:BlackRColor]; + + [context restoreState]; + } +} + +- (void) renderToSurface:(id )surface withContext:(id)context state:(enum NodeState)state { + Transformer *shapeTrans = [self shapeTransformerForSurface:surface]; + float strokeThickness = style ? [style strokeThickness] : [NodeStyle defaultStrokeThickness]; + + [context saveState]; + + [[self shapeToRender] drawPathWithTransform:shapeTrans andContext:context]; + + [context setLineWidth:strokeThickness]; + if (!style) { + [context setLineDash:3.0]; + } + [context strokePathWithColor:[self strokeColor] andFillWithColor:[self fillColor]]; + + if (state != NodeNormal) { + [context setLineWidth:strokeThickness + 4.0]; + [context setLineDash:0.0]; + float alpha = 0.0f; + if (state == NodeSelected) + alpha = 0.5f; + else if (state == NodeHighlighted) + alpha = 0.25f; + RColor selectionColor = MakeSolidRColor(0.61f, 0.735f, 1.0f); + + [[self shapeToRender] drawPathWithTransform:shapeTrans andContext:context]; + [context strokePathWithColor:selectionColor andFillWithColor:selectionColor usingAlpha:alpha]; + } + + [context restoreState]; + [self renderLabelToSurface:surface withContext:context]; +} + +- (BOOL) hitByPoint:(NSPoint)p onSurface:(id)surface { + Transformer *shapeTrans = [self shapeTransformerForSurface:surface]; + + NSRect screenBounds = [self renderBoundsUsingShapeTransform:shapeTrans]; + if (!NSPointInRect(p, screenBounds)) { + return NO; + } + + float strokeThickness = style ? [style strokeThickness] : [NodeStyle defaultStrokeThickness]; + id ctx = [surface createRenderContext]; + [ctx setLineWidth:strokeThickness]; + [[self shapeToRender] drawPathWithTransform:shapeTrans andContext:ctx]; + return [ctx strokeIncludesPoint:p] || [ctx fillIncludesPoint:p]; +} + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/NodeStyle+Gtk.h b/tikzit-old/src/gtk/NodeStyle+Gtk.h new file mode 100644 index 0000000..4fa5edd --- /dev/null +++ b/tikzit-old/src/gtk/NodeStyle+Gtk.h @@ -0,0 +1,31 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import "NodeStyle.h" +#import + +@interface NodeStyle (Gtk) + +- (GdkColor) strokeColor; +- (void) setStrokeColor:(GdkColor)color; +- (GdkColor) fillColor; +- (void) setFillColor:(GdkColor)color; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/NodeStyle+Gtk.m b/tikzit-old/src/gtk/NodeStyle+Gtk.m new file mode 100644 index 0000000..1954def --- /dev/null +++ b/tikzit-old/src/gtk/NodeStyle+Gtk.m @@ -0,0 +1,41 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "NodeStyle+Gtk.h" +#import "ColorRGB+Gtk.h" + +@implementation NodeStyle (Gtk) + +- (GdkColor) strokeColor { + return [[self strokeColorRGB] gdkColor]; +} + +- (void) setStrokeColor:(GdkColor)color { + [self setStrokeColorRGB:[ColorRGB colorWithGdkColor:color]]; +} + +- (GdkColor) fillColor { + return [[self fillColorRGB] gdkColor]; +} + +- (void) setFillColor:(GdkColor)color { + [self setFillColorRGB:[ColorRGB colorWithGdkColor:color]]; +} + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/NodeStyle+Render.h b/tikzit-old/src/gtk/NodeStyle+Render.h new file mode 100644 index 0000000..00edd27 --- /dev/null +++ b/tikzit-old/src/gtk/NodeStyle+Render.h @@ -0,0 +1,30 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import "NodeStyle.h" +#import "RenderContext.h" +#import "Surface.h" + +@interface NodeStyle (Render) + +- (void) renderToSurface:(id)surface withContext:(id)context at:(NSPoint)p; +- (BOOL) hitByPoint:(NSPoint)p onSurface:(id)surface; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/NodeStyle+Storage.h b/tikzit-old/src/gtk/NodeStyle+Storage.h new file mode 100644 index 0000000..7649414 --- /dev/null +++ b/tikzit-old/src/gtk/NodeStyle+Storage.h @@ -0,0 +1,29 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import "NodeStyle.h" +#import "Configuration.h" + +@interface NodeStyle (Storage) + +- (id) initFromConfigurationGroup:(NSString*)groupName config:(Configuration*)configFile; +- (void) storeToConfigurationGroup:(NSString*)groupName config:(Configuration*)configFile; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/NodeStyle+Storage.m b/tikzit-old/src/gtk/NodeStyle+Storage.m new file mode 100644 index 0000000..088b062 --- /dev/null +++ b/tikzit-old/src/gtk/NodeStyle+Storage.m @@ -0,0 +1,62 @@ +/* + * Copyright 2011 Alex Merry + * Copyright 2010 Chris Heunen + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "NodeStyle+Storage.h" +#import "ColorRGB+IntegerListStorage.h" + +@implementation NodeStyle (Storage) + +- (id) initFromConfigurationGroup:(NSString*)groupName config:(Configuration*)configFile { + self = [self init]; + + if (self) { + [self setName:[configFile stringEntry:@"Name" inGroup:groupName withDefault:name]]; + [self setCategory:[configFile stringEntry:@"Category" inGroup:groupName withDefault:category]]; + [self setShapeName:[configFile stringEntry:@"ShapeName" inGroup:groupName withDefault:shapeName]]; + [self setScale:[configFile doubleEntry:@"Scale" inGroup:groupName withDefault:scale]]; + [self setStrokeThickness:[configFile integerEntry:@"StrokeThickness" + inGroup:groupName + withDefault:strokeThickness]]; + [self setStrokeColorRGB: + [ColorRGB colorFromValueList: + [configFile integerListEntry:@"StrokeColor" + inGroup:groupName + withDefault:[strokeColorRGB valueList]]]]; + [self setFillColorRGB: + [ColorRGB colorFromValueList: + [configFile integerListEntry:@"FillColor" + inGroup:groupName + withDefault:[fillColorRGB valueList]]]]; + } + + return self; +} + +- (void) storeToConfigurationGroup:(NSString*)groupName config:(Configuration*)configFile { + [configFile setStringEntry:@"Name" inGroup:groupName value:[self name]]; + [configFile setStringEntry:@"Category" inGroup:groupName value:[self category]]; + [configFile setStringEntry:@"ShapeName" inGroup:groupName value:[self shapeName]]; + [configFile setDoubleEntry:@"Scale" inGroup:groupName value:[self scale]]; + [configFile setIntegerEntry:@"StrokeThickness" inGroup:groupName value:[self strokeThickness]]; + [configFile setIntegerListEntry:@"StrokeColor" inGroup:groupName value:[[self strokeColorRGB] valueList]]; + [configFile setIntegerListEntry:@"FillColor" inGroup:groupName value:[[self fillColorRGB] valueList]]; +} + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/NodeStyleEditor.h b/tikzit-old/src/gtk/NodeStyleEditor.h new file mode 100644 index 0000000..b45c992 --- /dev/null +++ b/tikzit-old/src/gtk/NodeStyleEditor.h @@ -0,0 +1,45 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import + +@class NodeStyle; + +@interface NodeStyleEditor: NSObject { + NodeStyle *style; + GtkTable *table; + GtkEntry *nameEdit; + GtkComboBox *shapeNameCombo; + GtkColorButton *strokeColorButton; + GtkWidget *makeStrokeTexSafeButton; + GtkColorButton *fillColorButton; + GtkWidget *makeFillTexSafeButton; + GtkAdjustment *scaleAdj; + BOOL blockSignals; +} + +@property (retain) NodeStyle *style; +@property (readonly) GtkWidget *widget; + +- (id) init; + +- (void) selectNameField; + +@end + +// vim:ft=objc:ts=4:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/NodeStyleEditor.m b/tikzit-old/src/gtk/NodeStyleEditor.m new file mode 100644 index 0000000..fcf4147 --- /dev/null +++ b/tikzit-old/src/gtk/NodeStyleEditor.m @@ -0,0 +1,477 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "NodeStyleEditor.h" +#import "NodeStyle.h" +#import "NodeStyle+Gtk.h" +#import "Shape.h" + +static const guint row_count = 5; + +// {{{ Internal interfaces +// {{{ GTK+ Callbacks +static void style_name_edit_changed_cb (GtkEditable *widget, NodeStyleEditor *editor); +static void style_shape_combo_changed_cb (GtkComboBox *widget, NodeStyleEditor *editor); +static void stroke_color_changed_cb (GtkColorButton *widget, NodeStyleEditor *editor); +static void fill_color_changed_cb (GtkColorButton *widget, NodeStyleEditor *editor); +static void make_stroke_safe_button_clicked_cb (GtkButton *widget, NodeStyleEditor *editor); +static void make_fill_safe_button_clicked_cb (GtkButton *widget, NodeStyleEditor *editor); +static void scale_adjustment_changed_cb (GtkAdjustment *widget, NodeStyleEditor *editor); +// }}} +// {{{ Notifications + +@interface NodeStyleEditor (Notifications) +- (void) shapeDictionaryReplaced:(NSNotification*)n; +- (void) nameChangedTo:(NSString*)value; +- (void) shapeNameChangedTo:(NSString*)value; +- (void) strokeColorChangedTo:(GdkColor)value; +- (void) makeStrokeColorTexSafe; +- (void) fillColorChangedTo:(GdkColor)value; +- (void) makeFillColorTexSafe; +- (void) scaleChangedTo:(double)value; +@end + +// }}} +// {{{ Private + +@interface NodeStyleEditor (Private) +- (void) loadShapeNames; +- (void) setActiveShapeName:(NSString*)name; +@end + +// }}} +// }}} +// {{{ API + +@implementation NodeStyleEditor + +- (void) _addWidget:(GtkWidget*)w withLabel:(gchar *)label atRow:(guint)row { + NSAssert(row < row_count, @"row_count is wrong!"); + + GtkWidget *l = gtk_label_new (label); + gtk_misc_set_alignment (GTK_MISC (l), 0, 0.5); + gtk_widget_show (l); + gtk_widget_show (w); + + gtk_table_attach (table, l, + 0, 1, row, row+1, // l, r, t, b + GTK_FILL, // x opts + GTK_FILL | GTK_EXPAND, // y opts + 5, // x padding + 0); // y padding + + gtk_table_attach (table, w, + 1, 2, row, row+1, // l, r, t, b + GTK_FILL | GTK_EXPAND, // x opts + GTK_FILL | GTK_EXPAND, // y opts + 0, // x padding + 0); // y padding +} + +- (GtkWidget*) _createMakeColorTexSafeButton:(NSString*)type { + GtkWidget *b = gtk_button_new (); + GtkWidget *icon = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_BUTTON); + gtk_widget_show (icon); + gtk_container_add (GTK_CONTAINER (b), icon); + NSString *ttip = [NSString stringWithFormat:@"The %@ colour is not a predefined TeX colour.\nClick here to choose the nearest TeX-safe colour.", type]; + gtk_widget_set_tooltip_text (b, [ttip UTF8String]); + return b; +} + +- (id) init { + self = [super init]; + + if (self != nil) { + style = nil; + table = GTK_TABLE (gtk_table_new (row_count, 2, FALSE)); + gtk_table_set_col_spacings (table, 6); + gtk_table_set_row_spacings (table, 6); + gtk_widget_set_sensitive (GTK_WIDGET (table), FALSE); + blockSignals = NO; + + /** + * Name + */ + nameEdit = GTK_ENTRY (gtk_entry_new ()); + g_object_ref_sink (nameEdit); + [self _addWidget:GTK_WIDGET (nameEdit) + withLabel:"Name" + atRow:0]; + g_signal_connect (G_OBJECT (nameEdit), + "changed", + G_CALLBACK (style_name_edit_changed_cb), + self); + + + /** + * Shape + */ + GtkListStore *store = gtk_list_store_new (1, G_TYPE_STRING); + shapeNameCombo = GTK_COMBO_BOX (gtk_combo_box_new_with_model (GTK_TREE_MODEL (store))); + GtkCellRenderer *cellRend = gtk_cell_renderer_text_new (); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (shapeNameCombo), + cellRend, + TRUE); + gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (shapeNameCombo), cellRend, "text", 0); + g_object_ref_sink (shapeNameCombo); + [self _addWidget:GTK_WIDGET (shapeNameCombo) + withLabel:"Shape" + atRow:1]; + g_signal_connect (G_OBJECT (shapeNameCombo), + "changed", + G_CALLBACK (style_shape_combo_changed_cb), + self); + + + /** + * Stroke colour + */ + GtkWidget *strokeBox = gtk_hbox_new (FALSE, 0); + [self _addWidget:strokeBox + withLabel:"Stroke colour" + atRow:2]; + strokeColorButton = GTK_COLOR_BUTTON (gtk_color_button_new ()); + g_object_ref_sink (strokeColorButton); + gtk_widget_show (GTK_WIDGET (strokeColorButton)); + gtk_box_pack_start (GTK_BOX (strokeBox), GTK_WIDGET (strokeColorButton), + FALSE, FALSE, 0); + makeStrokeTexSafeButton = [self _createMakeColorTexSafeButton:@"stroke"]; + g_object_ref_sink (makeStrokeTexSafeButton); + gtk_box_pack_start (GTK_BOX (strokeBox), makeStrokeTexSafeButton, + FALSE, FALSE, 0); + g_signal_connect (G_OBJECT (strokeColorButton), + "color-set", + G_CALLBACK (stroke_color_changed_cb), + self); + g_signal_connect (G_OBJECT (makeStrokeTexSafeButton), + "clicked", + G_CALLBACK (make_stroke_safe_button_clicked_cb), + self); + + + /** + * Fill colour + */ + GtkWidget *fillBox = gtk_hbox_new (FALSE, 0); + [self _addWidget:fillBox + withLabel:"Fill colour" + atRow:3]; + fillColorButton = GTK_COLOR_BUTTON (gtk_color_button_new ()); + g_object_ref_sink (fillColorButton); + gtk_widget_show (GTK_WIDGET (fillColorButton)); + gtk_box_pack_start (GTK_BOX (fillBox), GTK_WIDGET (fillColorButton), + FALSE, FALSE, 0); + makeFillTexSafeButton = [self _createMakeColorTexSafeButton:@"fill"]; + g_object_ref_sink (makeFillTexSafeButton); + gtk_box_pack_start (GTK_BOX (fillBox), makeFillTexSafeButton, + FALSE, FALSE, 0); + g_signal_connect (G_OBJECT (fillColorButton), + "color-set", + G_CALLBACK (fill_color_changed_cb), + self); + g_signal_connect (G_OBJECT (makeFillTexSafeButton), + "clicked", + G_CALLBACK (make_fill_safe_button_clicked_cb), + self); + + + /** + * Scale + */ + scaleAdj = GTK_ADJUSTMENT (gtk_adjustment_new ( + 1.0, // value + 0.0, // lower + 50.0, // upper + 0.20, // step + 1.0, // page + 0.0)); // (irrelevant) + g_object_ref_sink (scaleAdj); + GtkWidget *scaleSpin = gtk_spin_button_new (scaleAdj, 0.0, 2); + [self _addWidget:scaleSpin + withLabel:"Scale" + atRow:4]; + g_signal_connect (G_OBJECT (scaleAdj), + "value-changed", + G_CALLBACK (scale_adjustment_changed_cb), + self); + + [self loadShapeNames]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(shapeDictionaryReplaced:) + name:@"ShapeDictionaryReplaced" + object:[Shape class]]; + } + + return self; +} + +- (void) dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + + g_object_unref (nameEdit); + g_object_unref (shapeNameCombo); + g_object_unref (strokeColorButton); + g_object_unref (makeStrokeTexSafeButton); + g_object_unref (fillColorButton); + g_object_unref (makeFillTexSafeButton); + g_object_unref (scaleAdj); + g_object_unref (table); + [style release]; + + [super dealloc]; +} + +- (NodeStyle*) style { + return style; +} + +- (void) setStyle:(NodeStyle*)s { + blockSignals = YES; + NodeStyle *oldStyle = style; + style = [s retain]; + + if (style != nil) { + gtk_widget_set_sensitive (GTK_WIDGET (table), TRUE); + + gtk_entry_set_text(nameEdit, [[style name] UTF8String]); + + [self setActiveShapeName:[style shapeName]]; + + GdkColor c = [style strokeColor]; + gtk_color_button_set_color(strokeColorButton, &c); + + gtk_widget_set_visible (makeStrokeTexSafeButton, ([[style strokeColorRGB] name] == nil)); + + c = [style fillColor]; + gtk_color_button_set_color(fillColorButton, &c); + + gtk_widget_set_visible (makeFillTexSafeButton, ([[style fillColorRGB] name] == nil)); + + gtk_adjustment_set_value(scaleAdj, [style scale]); + } else { + gtk_entry_set_text(nameEdit, ""); + [self setActiveShapeName:nil]; + gtk_widget_set_visible (makeStrokeTexSafeButton, FALSE); + gtk_widget_set_visible (makeFillTexSafeButton, FALSE); + gtk_adjustment_set_value(scaleAdj, 1.0); + gtk_widget_set_sensitive (GTK_WIDGET (table), FALSE); + } + + [oldStyle release]; + blockSignals = NO; +} + +- (GtkWidget*) widget { + return GTK_WIDGET (table); +} + +- (void) selectNameField { + gtk_widget_grab_focus (GTK_WIDGET (nameEdit)); + gtk_editable_select_region (GTK_EDITABLE (nameEdit), 0, -1); +} + +@end + +// }}} +// {{{ Notifications + +@implementation NodeStyleEditor (Notifications) +- (void) shapeDictionaryReplaced:(NSNotification*)n { + blockSignals = YES; + + [self loadShapeNames]; + [self setActiveShapeName:[style shapeName]]; + + blockSignals = NO; +} + +- (void) nameChangedTo:(NSString*)value { + [style setName:value]; +} + +- (void) shapeNameChangedTo:(NSString*)value { + [style setShapeName:value]; +} + +- (void) strokeColorChangedTo:(GdkColor)value { + [style setStrokeColor:value]; + gtk_widget_set_visible (makeStrokeTexSafeButton, + [[style strokeColorRGB] name] == nil); +} + +- (void) makeStrokeColorTexSafe { + if (style != nil) { + [[style strokeColorRGB] setToClosestHashed]; + GdkColor color = [style strokeColor]; + gtk_color_button_set_color(strokeColorButton, &color); + gtk_widget_set_visible (makeStrokeTexSafeButton, FALSE); + } +} + +- (void) fillColorChangedTo:(GdkColor)value { + [style setFillColor:value]; + gtk_widget_set_visible (makeFillTexSafeButton, + [[style fillColorRGB] name] == nil); +} + +- (void) makeFillColorTexSafe { + if (style != nil) { + [[style fillColorRGB] setToClosestHashed]; + GdkColor color = [style fillColor]; + gtk_color_button_set_color(fillColorButton, &color); + gtk_widget_set_visible (makeFillTexSafeButton, FALSE); + } +} + +- (void) scaleChangedTo:(double)value { + [style setScale:value]; +} +@end + +// }}} +// {{{ Private + +@implementation NodeStyleEditor (Private) +- (BOOL) signalsBlocked { return blockSignals; } + +- (void) loadShapeNames { + blockSignals = YES; + + gtk_combo_box_set_active (shapeNameCombo, -1); + + GtkListStore *list = GTK_LIST_STORE (gtk_combo_box_get_model (shapeNameCombo)); + gtk_list_store_clear (list); + + NSEnumerator *en = [[Shape shapeDictionary] keyEnumerator]; + NSString *shapeName; + GtkTreeIter iter; + while ((shapeName = [en nextObject]) != nil) { + gtk_list_store_append (list, &iter); + gtk_list_store_set (list, &iter, 0, [shapeName UTF8String], -1); + } + + blockSignals = NO; +} + +- (void) setActiveShapeName:(NSString*)name { + if (name == nil) { + gtk_combo_box_set_active (shapeNameCombo, -1); + return; + } + const gchar *shapeName = [name UTF8String]; + + GtkTreeModel *model = gtk_combo_box_get_model (shapeNameCombo); + GtkTreeIter iter; + if (gtk_tree_model_get_iter_first (model, &iter)) { + do { + gchar *rowShapeName; + gtk_tree_model_get (model, &iter, 0, &rowShapeName, -1); + if (g_strcmp0 (shapeName, rowShapeName) == 0) { + gtk_combo_box_set_active_iter (shapeNameCombo, &iter); + g_free (rowShapeName); + return; + } + g_free (rowShapeName); + } while (gtk_tree_model_iter_next (model, &iter)); + } +} +@end + +// }}} +// {{{ GTK+ callbacks + +static void style_name_edit_changed_cb (GtkEditable *widget, NodeStyleEditor *editor) { + if ([editor signalsBlocked]) + return; + + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + const gchar *contents = gtk_entry_get_text (GTK_ENTRY (widget)); + [editor nameChangedTo:[NSString stringWithUTF8String:contents]]; + + [pool drain]; +} + +static void style_shape_combo_changed_cb (GtkComboBox *widget, NodeStyleEditor *editor) { + if ([editor signalsBlocked]) + return; + + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + GtkTreeIter iter; + gtk_combo_box_get_active_iter (widget, &iter); + gchar *shapeName = NULL; + gtk_tree_model_get (gtk_combo_box_get_model (widget), &iter, 0, &shapeName, -1); + [editor shapeNameChangedTo:[NSString stringWithUTF8String:shapeName]]; + g_free (shapeName); + + [pool drain]; +} + +static void stroke_color_changed_cb (GtkColorButton *widget, NodeStyleEditor *editor) { + if ([editor signalsBlocked]) + return; + + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + GdkColor color; + gtk_color_button_get_color (widget, &color); + [editor strokeColorChangedTo:color]; + + [pool drain]; +} + +static void fill_color_changed_cb (GtkColorButton *widget, NodeStyleEditor *editor) { + if ([editor signalsBlocked]) + return; + + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + GdkColor color; + gtk_color_button_get_color (widget, &color); + [editor fillColorChangedTo:color]; + + [pool drain]; +} + +static void make_stroke_safe_button_clicked_cb (GtkButton *widget, NodeStyleEditor *editor) { + if ([editor signalsBlocked]) + return; + + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [editor makeStrokeColorTexSafe]; + [pool drain]; +} + +static void make_fill_safe_button_clicked_cb (GtkButton *widget, NodeStyleEditor *editor) { + if ([editor signalsBlocked]) + return; + + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [editor makeFillColorTexSafe]; + [pool drain]; +} + +static void scale_adjustment_changed_cb (GtkAdjustment *adj, NodeStyleEditor *editor) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [editor scaleChangedTo:gtk_adjustment_get_value (adj)]; + [pool drain]; +} + +// }}} + +// vim:ft=objc:ts=4:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/NodeStyleSelector.h b/tikzit-old/src/gtk/NodeStyleSelector.h new file mode 100644 index 0000000..a699dc8 --- /dev/null +++ b/tikzit-old/src/gtk/NodeStyleSelector.h @@ -0,0 +1,61 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import + +@class NodeStyle; +@class NodeStylesModel; +@class StyleManager; + +@interface NodeStyleSelector: NSObject { + NodeStylesModel *model; + GtkIconView *view; +} + +/*! + @property widget + @brief The GTK widget + */ +@property (readonly) GtkWidget *widget; + +/*! + @property model + @brief The model to use. + */ +@property (retain) NodeStylesModel *model; + +/*! + @property selectedStyle + @brief The selected style. + + When this changes, a SelectedStyleChanged notification will be posted + */ +@property (assign) NodeStyle *selectedStyle; + +/*! + * Initialise with a new model for the given style manager + */ +- (id) initWithStyleManager:(StyleManager*)manager; +/*! + * Initialise with the given model + */ +- (id) initWithModel:(NodeStylesModel*)model; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/NodeStyleSelector.m b/tikzit-old/src/gtk/NodeStyleSelector.m new file mode 100644 index 0000000..14cdc75 --- /dev/null +++ b/tikzit-old/src/gtk/NodeStyleSelector.m @@ -0,0 +1,135 @@ +/* + * Copyright 2011-2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "NodeStyleSelector.h" + +#import "NodeStylesModel.h" + +// {{{ Internal interfaces +static void selection_changed_cb (GtkIconView *widget, NodeStyleSelector *mgr); +// }}} +// {{{ API + +@implementation NodeStyleSelector + +- (id) init { + [self release]; + return nil; +} + +- (id) initWithStyleManager:(StyleManager*)m { + return [self initWithModel:[NodeStylesModel modelWithStyleManager:m]]; +} +- (id) initWithModel:(NodeStylesModel*)m { + self = [super init]; + + if (self) { + model = [m retain]; + + view = GTK_ICON_VIEW (gtk_icon_view_new ()); + g_object_ref_sink (view); + + gtk_icon_view_set_model (view, [model model]); + gtk_icon_view_set_pixbuf_column (view, NODE_STYLES_ICON_COL); + gtk_icon_view_set_tooltip_column (view, NODE_STYLES_NAME_COL); + gtk_icon_view_set_selection_mode (view, GTK_SELECTION_SINGLE); + + g_signal_connect (G_OBJECT (view), + "selection-changed", + G_CALLBACK (selection_changed_cb), + self); + } + + return self; +} + +- (void) dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + + g_object_unref (view); + [model release]; + + [super dealloc]; +} + +- (NodeStylesModel*) model { + return model; +} + +- (void) setModel:(NodeStylesModel*)m { + if (m == model) + return; + + NodeStylesModel *oldModel = model; + model = [m retain]; + gtk_icon_view_set_model (view, [model model]); + [oldModel release]; +} + +- (GtkWidget*) widget { + return GTK_WIDGET (view); +} + +- (NodeStyle*) selectedStyle { + GList *list = gtk_icon_view_get_selected_items (view); + if (!list) { + return nil; + } + if (list->next != NULL) { + NSLog(@"Multiple selected items in NodeStyleSelector!"); + } + + GtkTreePath *path = (GtkTreePath*) list->data; + NodeStyle *style = [model styleFromPath:path]; + + g_list_foreach (list, (GFunc)gtk_tree_path_free, NULL); + g_list_free (list); + + return style; +} + +- (void) setSelectedStyle:(NodeStyle*)style { + if (style == nil) { + gtk_icon_view_unselect_all (view); + return; + } + + GtkTreePath *path = [model pathFromStyle:style]; + if (path) { + gtk_icon_view_unselect_all (view); + gtk_icon_view_select_path (view, path); + gtk_tree_path_free (path); + } +} + +@end + +// }}} +// {{{ GTK+ callbacks + +static void selection_changed_cb (GtkIconView *view, NodeStyleSelector *mgr) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + [[NSNotificationCenter defaultCenter] + postNotificationName:@"SelectedStyleChanged" + object:mgr]; + + [pool drain]; +} +// }}} + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/NodeStylesModel.h b/tikzit-old/src/gtk/NodeStylesModel.h new file mode 100644 index 0000000..a048560 --- /dev/null +++ b/tikzit-old/src/gtk/NodeStylesModel.h @@ -0,0 +1,62 @@ +/* + * Copyright 2011-2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import + +@class NodeStyle; +@class StyleManager; + +enum { + NODE_STYLES_NAME_COL = 0, + NODE_STYLES_ICON_COL, + NODE_STYLES_PTR_COL, + NODE_STYLES_N_COLS +}; + +@interface NodeStylesModel: NSObject { + GtkListStore *store; + StyleManager *styleManager; +} + +/*! + @property model + @brief The GTK+ tree model + */ +@property (readonly) GtkTreeModel *model; + +/*! + @property manager + @brief The StyleManager to use. + */ +@property (retain) StyleManager *styleManager; + +/*! + * Initialise with the given style manager + */ +- (id) initWithStyleManager:(StyleManager*)m; + ++ (id) modelWithStyleManager:(StyleManager*)m; + +- (NodeStyle*) styleFromPath:(GtkTreePath*)path; +- (GtkTreePath*) pathFromStyle:(NodeStyle*)style; +- (NodeStyle*) styleFromIter:(GtkTreeIter*)iter; +- (GtkTreeIter*) iterFromStyle:(NodeStyle*)style; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/NodeStylesModel.m b/tikzit-old/src/gtk/NodeStylesModel.m new file mode 100644 index 0000000..3cc5771 --- /dev/null +++ b/tikzit-old/src/gtk/NodeStylesModel.m @@ -0,0 +1,381 @@ +/* + * Copyright 2011-2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "NodeStylesModel.h" + +#import "CairoRenderContext.h" +#import "NodeStyle.h" +#import "Shape.h" +#import "Shape+Render.h" +#import "ShapeNames.h" +#import "StyleManager.h" + +#import "gtkhelpers.h" + +#import + +// {{{ Internal interfaces + +@interface NodeStylesModel (Notifications) +- (void) nodeStylesReplaced:(NSNotification*)notification; +- (void) nodeStyleAdded:(NSNotification*)notification; +- (void) nodeStyleRemoved:(NSNotification*)notification; +- (void) shapeDictionaryReplaced:(NSNotification*)n; +- (void) observeValueForKeyPath:(NSString*)keyPath + ofObject:(id)object + change:(NSDictionary*)change + context:(void*)context; +@end + +@interface NodeStylesModel (Private) +- (cairo_surface_t*) createNodeIconSurface; +- (GdkPixbuf*) pixbufOfNodeInStyle:(NodeStyle*)style; +- (GdkPixbuf*) pixbufOfNodeInStyle:(NodeStyle*)style usingSurface:(cairo_surface_t*)surface; +- (void) addNodeStyle:(NodeStyle*)style; +- (void) addNodeStyle:(NodeStyle*)style usingSurface:(cairo_surface_t*)surface; +- (void) observeNodeStyle:(NodeStyle*)style; +- (void) stopObservingNodeStyle:(NodeStyle*)style; +- (void) clearNodeStylesModel; +- (void) reloadNodeStyles; +@end + +// }}} +// {{{ API + +@implementation NodeStylesModel + ++ (id) modelWithStyleManager:(StyleManager*)m { + return [[[self alloc] initWithStyleManager:m] autorelease]; +} + +- (id) init { + [self release]; + return nil; +} + +- (id) initWithStyleManager:(StyleManager*)m { + self = [super init]; + + if (self) { + store = gtk_list_store_new (NODE_STYLES_N_COLS, + G_TYPE_STRING, + GDK_TYPE_PIXBUF, + G_TYPE_POINTER); + g_object_ref_sink (store); + + [self setStyleManager:m]; + + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(shapeDictionaryReplaced:) + name:@"ShapeDictionaryReplaced" + object:[Shape class]]; + } + + return self; +} + +- (void) dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + + [self clearNodeStylesModel]; + g_object_unref (store); + [styleManager release]; + + [super dealloc]; +} + +- (StyleManager*) styleManager { + return styleManager; +} + +- (void) setStyleManager:(StyleManager*)m { + if (m == nil) { + [NSException raise:NSInvalidArgumentException format:@"Style manager cannot be nil"]; + } + [m retain]; + + [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:styleManager]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(nodeStylesReplaced:) + name:@"NodeStylesReplaced" + object:m]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(nodeStyleAdded:) + name:@"NodeStyleAdded" + object:m]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(nodeStyleRemoved:) + name:@"NodeStyleRemoved" + object:m]; + + [styleManager release]; + styleManager = m; + + [self reloadNodeStyles]; +} + +- (GtkTreeModel*) model { + return GTK_TREE_MODEL (store); +} + +- (NodeStyle*) styleFromPath:(GtkTreePath*)path { + GtkTreeIter iter; + gtk_tree_model_get_iter (GTK_TREE_MODEL (store), &iter, path); + NodeStyle *style = nil; + gtk_tree_model_get (GTK_TREE_MODEL (store), &iter, NODE_STYLES_PTR_COL, &style, -1); + return style; +} + +- (GtkTreePath*) pathFromStyle:(NodeStyle*)style { + GtkTreeModel *m = GTK_TREE_MODEL (store); + GtkTreeIter row; + if (gtk_tree_model_get_iter_first (m, &row)) { + do { + NodeStyle *rowStyle; + gtk_tree_model_get (m, &row, NODE_STYLES_PTR_COL, &rowStyle, -1); + if (style == rowStyle) { + return gtk_tree_model_get_path (m, &row); + } + } while (gtk_tree_model_iter_next (m, &row)); + } + return NULL; +} + +- (NodeStyle*) styleFromIter:(GtkTreeIter*)iter { + NodeStyle *style = nil; + gtk_tree_model_get (GTK_TREE_MODEL (store), iter, NODE_STYLES_PTR_COL, &style, -1); + return style; +} + +- (GtkTreeIter*) iterFromStyle:(NodeStyle*)style { + GtkTreeModel *m = GTK_TREE_MODEL (store); + GtkTreeIter row; + if (gtk_tree_model_get_iter_first (m, &row)) { + do { + NodeStyle *rowStyle; + gtk_tree_model_get (m, &row, NODE_STYLES_PTR_COL, &rowStyle, -1); + if (style == rowStyle) { + return gtk_tree_iter_copy (&row); + } + } while (gtk_tree_model_iter_next (m, &row)); + } + return NULL; +} +@end + +// }}} +// {{{ Notifications + +@implementation NodeStylesModel (Notifications) + +- (void) nodeStylesReplaced:(NSNotification*)notification { + [self reloadNodeStyles]; +} + +- (void) nodeStyleAdded:(NSNotification*)notification { + [self addNodeStyle:[[notification userInfo] objectForKey:@"style"]]; +} + +- (void) nodeStyleRemoved:(NSNotification*)notification { + NodeStyle *style = [[notification userInfo] objectForKey:@"style"]; + + GtkTreeModel *model = GTK_TREE_MODEL (store); + GtkTreeIter row; + if (gtk_tree_model_get_iter_first (model, &row)) { + do { + NodeStyle *rowStyle; + gtk_tree_model_get (model, &row, NODE_STYLES_PTR_COL, &rowStyle, -1); + if (style == rowStyle) { + gtk_list_store_remove (store, &row); + [self stopObservingNodeStyle:rowStyle]; + [rowStyle release]; + return; + } + } while (gtk_tree_model_iter_next (model, &row)); + } +} + +- (void) observeValueForKeyPath:(NSString*)keyPath + ofObject:(id)object + change:(NSDictionary*)change + context:(void*)context +{ + if ([object class] == [NodeStyle class]) { + NodeStyle *style = object; + + GtkTreeModel *model = GTK_TREE_MODEL (store); + GtkTreeIter row; + if (gtk_tree_model_get_iter_first (model, &row)) { + do { + NodeStyle *rowStyle; + gtk_tree_model_get (model, &row, NODE_STYLES_PTR_COL, &rowStyle, -1); + if (style == rowStyle) { + if ([@"name" isEqual:keyPath]) { + gtk_list_store_set (store, &row, NODE_STYLES_NAME_COL, [[style name] UTF8String], -1); + } else { + GdkPixbuf *pixbuf = [self pixbufOfNodeInStyle:style]; + gtk_list_store_set (store, &row, NODE_STYLES_ICON_COL, pixbuf, -1); + g_object_unref (pixbuf); + } + } + } while (gtk_tree_model_iter_next (model, &row)); + } + } +} + +- (void) shapeDictionaryReplaced:(NSNotification*)n { + [self reloadNodeStyles]; +} +@end + +// }}} +// {{{ Private + +@implementation NodeStylesModel (Private) +- (cairo_surface_t*) createNodeIconSurface { + return cairo_image_surface_create (CAIRO_FORMAT_ARGB32, 24, 24); +} + +- (GdkPixbuf*) pixbufOfNodeInStyle:(NodeStyle*)style { + cairo_surface_t *surface = [self createNodeIconSurface]; + GdkPixbuf *pixbuf = [self pixbufOfNodeInStyle:style usingSurface:surface]; + cairo_surface_destroy (surface); + return pixbuf; +} + +- (GdkPixbuf*) pixbufOfNodeInStyle:(NodeStyle*)style usingSurface:(cairo_surface_t*)surface { + Shape *shape = [Shape shapeForName:[style shapeName]]; + + int width = cairo_image_surface_get_width (surface); + int height = cairo_image_surface_get_height (surface); + NSRect pixbufBounds = NSMakeRect(0.0, 0.0, width, height); + const CGFloat lineWidth = [style strokeThickness]; + Transformer *shapeTrans = [Transformer transformerToFit:[shape boundingRect] + intoScreenRect:NSInsetRect(pixbufBounds, lineWidth, lineWidth) + flippedAboutXAxis:YES]; + if ([style scale] < 1.0) + [shapeTrans setScale:[style scale] * [shapeTrans scale]]; + + CairoRenderContext *context = [[CairoRenderContext alloc] initForSurface:surface]; + [context clearSurface]; + [shape drawPathWithTransform:shapeTrans andContext:context]; + [context setLineWidth:lineWidth]; + [context strokePathWithColor:[[style strokeColorRGB] rColor] + andFillWithColor:[[style fillColorRGB] rColor]]; + [context release]; + + return pixbuf_get_from_surface (surface); +} + +- (void) addNodeStyle:(NodeStyle*)style usingSurface:(cairo_surface_t*)surface { + GtkTreeIter iter; + gtk_list_store_append (store, &iter); + + GdkPixbuf *pixbuf = [self pixbufOfNodeInStyle:style usingSurface:surface]; + gtk_list_store_set (store, &iter, + NODE_STYLES_NAME_COL, [[style name] UTF8String], + NODE_STYLES_ICON_COL, pixbuf, + NODE_STYLES_PTR_COL, (gpointer)[style retain], + -1); + g_object_unref (pixbuf); + [self observeNodeStyle:style]; +} + +- (void) addNodeStyle:(NodeStyle*)style { + cairo_surface_t *surface = [self createNodeIconSurface]; + [self addNodeStyle:style usingSurface:surface]; + cairo_surface_destroy (surface); +} + +- (void) observeNodeStyle:(NodeStyle*)style { + [style addObserver:self + forKeyPath:@"name" + options:NSKeyValueObservingOptionNew + context:NULL]; + [style addObserver:self + forKeyPath:@"strokeThickness" + options:0 + context:NULL]; + [style addObserver:self + forKeyPath:@"strokeColorRGB.red" + options:0 + context:NULL]; + [style addObserver:self + forKeyPath:@"strokeColorRGB.green" + options:0 + context:NULL]; + [style addObserver:self + forKeyPath:@"strokeColorRGB.blue" + options:0 + context:NULL]; + [style addObserver:self + forKeyPath:@"fillColorRGB.red" + options:0 + context:NULL]; + [style addObserver:self + forKeyPath:@"fillColorRGB.green" + options:0 + context:NULL]; + [style addObserver:self + forKeyPath:@"fillColorRGB.blue" + options:0 + context:NULL]; + [style addObserver:self + forKeyPath:@"shapeName" + options:0 + context:NULL]; +} + +- (void) stopObservingNodeStyle:(NodeStyle*)style { + [style removeObserver:self forKeyPath:@"name"]; + [style removeObserver:self forKeyPath:@"strokeThickness"]; + [style removeObserver:self forKeyPath:@"strokeColorRGB.red"]; + [style removeObserver:self forKeyPath:@"strokeColorRGB.green"]; + [style removeObserver:self forKeyPath:@"strokeColorRGB.blue"]; + [style removeObserver:self forKeyPath:@"fillColorRGB.red"]; + [style removeObserver:self forKeyPath:@"fillColorRGB.green"]; + [style removeObserver:self forKeyPath:@"fillColorRGB.blue"]; + [style removeObserver:self forKeyPath:@"shapeName"]; +} + +- (void) clearNodeStylesModel { + GtkTreeModel *model = GTK_TREE_MODEL (store); + GtkTreeIter row; + if (gtk_tree_model_get_iter_first (model, &row)) { + do { + NodeStyle *rowStyle; + gtk_tree_model_get (model, &row, NODE_STYLES_PTR_COL, &rowStyle, -1); + [self stopObservingNodeStyle:rowStyle]; + [rowStyle release]; + } while (gtk_tree_model_iter_next (model, &row)); + } + gtk_list_store_clear (store); +} + +- (void) reloadNodeStyles { + [self clearNodeStylesModel]; + cairo_surface_t *surface = [self createNodeIconSurface]; + for (NodeStyle *style in [styleManager nodeStyles]) { + [self addNodeStyle:style usingSurface:surface]; + } + cairo_surface_destroy (surface); +} +@end + +// }}} + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/NodeStylesPalette.h b/tikzit-old/src/gtk/NodeStylesPalette.h new file mode 100644 index 0000000..ac712ea --- /dev/null +++ b/tikzit-old/src/gtk/NodeStylesPalette.h @@ -0,0 +1,43 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import + +@class StyleManager; +@class NodeStyleSelector; +@class NodeStyleEditor; + +@interface NodeStylesPalette: NSObject { + NodeStyleSelector *selector; + NodeStyleEditor *editor; + + GtkWidget *palette; + + GtkWidget *removeStyleButton; + GtkWidget *applyStyleButton; + GtkWidget *clearStyleButton; +} + +@property (retain) StyleManager *styleManager; +@property (readonly) GtkWidget *widget; + +- (id) initWithManager:(StyleManager*)m; + +@end + +// vim:ft=objc:ts=4:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/NodeStylesPalette.m b/tikzit-old/src/gtk/NodeStylesPalette.m new file mode 100644 index 0000000..e28edbb --- /dev/null +++ b/tikzit-old/src/gtk/NodeStylesPalette.m @@ -0,0 +1,197 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "NodeStylesPalette.h" + +#import "NodeStyleSelector.h" +#import "NodeStyleEditor.h" +#import "NodeStylesModel.h" +#import "StyleManager.h" + +// {{{ Internal interfaces +// {{{ GTK+ Callbacks +static void add_style_button_cb (GtkButton *widget, NodeStylesPalette *palette); +static void remove_style_button_cb (GtkButton *widget, NodeStylesPalette *palette); +// }}} +// {{{ Notifications + +@interface NodeStylesPalette (Notifications) +- (void) selectedStyleChanged:(NSNotification*)notification; +@end + +// }}} +// {{{ Private + +@interface NodeStylesPalette (Private) +- (void) updateButtonState; +- (void) removeSelectedStyle; +- (void) addStyle; +@end + +// }}} +// }}} +// {{{ API + +@implementation NodeStylesPalette + +@synthesize widget=palette; + +- (id) init { + [self release]; + return nil; +} + +- (id) initWithManager:(StyleManager*)m { + self = [super init]; + + if (self) { + selector = [[NodeStyleSelector alloc] initWithStyleManager:m]; + editor = [[NodeStyleEditor alloc] init]; + + palette = gtk_vbox_new (FALSE, 6); + gtk_container_set_border_width (GTK_CONTAINER (palette), 6); + g_object_ref_sink (palette); + + GtkWidget *mainBox = gtk_hbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (palette), mainBox, FALSE, FALSE, 0); + gtk_widget_show (mainBox); + + GtkWidget *selectorScroller = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (selectorScroller), + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); + GtkWidget *selectorFrame = gtk_frame_new (NULL); + gtk_container_add (GTK_CONTAINER (selectorScroller), [selector widget]); + gtk_container_add (GTK_CONTAINER (selectorFrame), selectorScroller); + gtk_box_pack_start (GTK_BOX (mainBox), selectorFrame, TRUE, TRUE, 0); + gtk_widget_show (selectorScroller); + gtk_widget_show (selectorFrame); + gtk_widget_show ([selector widget]); + + gtk_box_pack_start (GTK_BOX (mainBox), [editor widget], TRUE, TRUE, 0); + gtk_widget_show ([editor widget]); + + GtkBox *buttonBox = GTK_BOX (gtk_hbox_new(FALSE, 0)); + gtk_box_pack_start (GTK_BOX (palette), GTK_WIDGET (buttonBox), FALSE, FALSE, 0); + + GtkWidget *addStyleButton = gtk_button_new (); + gtk_widget_set_tooltip_text (addStyleButton, "Add a new style"); + GtkWidget *addIcon = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON); + gtk_container_add (GTK_CONTAINER (addStyleButton), addIcon); + gtk_box_pack_start (buttonBox, addStyleButton, FALSE, FALSE, 0); + g_signal_connect (G_OBJECT (addStyleButton), + "clicked", + G_CALLBACK (add_style_button_cb), + self); + + removeStyleButton = gtk_button_new (); + g_object_ref_sink (removeStyleButton); + gtk_widget_set_tooltip_text (removeStyleButton, "Delete selected style"); + GtkWidget *removeIcon = gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_BUTTON); + gtk_container_add (GTK_CONTAINER (removeStyleButton), removeIcon); + gtk_box_pack_start (buttonBox, removeStyleButton, FALSE, FALSE, 0); + g_signal_connect (G_OBJECT (removeStyleButton), + "clicked", + G_CALLBACK (remove_style_button_cb), + self); + + gtk_widget_show_all (GTK_WIDGET (buttonBox)); + + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(selectedStyleChanged:) + name:@"SelectedStyleChanged" + object:selector]; + + [self updateButtonState]; + } + + return self; +} + +- (StyleManager*) styleManager { + return [[selector model] styleManager]; +} + +- (void) setStyleManager:(StyleManager*)m { + [[selector model] setStyleManager:m]; +} + +- (void) dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + [editor release]; + [selector release]; + g_object_unref (palette); + g_object_unref (removeStyleButton); + + [super dealloc]; +} + +@end + +// }}} +// {{{ Notifications + +@implementation NodeStylesPalette (Notifications) +- (void) selectedStyleChanged:(NSNotification*)notification { + [editor setStyle:[selector selectedStyle]]; + [self updateButtonState]; +} +@end + +// }}} +// {{{ Private + +@implementation NodeStylesPalette (Private) +- (void) updateButtonState { + gboolean hasStyleSelection = [selector selectedStyle] != nil; + + gtk_widget_set_sensitive (removeStyleButton, hasStyleSelection); +} + +- (void) removeSelectedStyle { + NodeStyle *style = [selector selectedStyle]; + if (style) + [[[selector model] styleManager] removeNodeStyle:style]; +} + +- (void) addStyle { + NodeStyle *newStyle = [NodeStyle defaultNodeStyleWithName:@"newstyle"]; + [[self styleManager] addNodeStyle:newStyle]; + [selector setSelectedStyle:newStyle]; + [editor selectNameField]; +} + +@end + +// }}} +// {{{ GTK+ callbacks + +static void add_style_button_cb (GtkButton *widget, NodeStylesPalette *palette) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [palette addStyle]; + [pool drain]; +} + +static void remove_style_button_cb (GtkButton *widget, NodeStylesPalette *palette) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [palette removeSelectedStyle]; + [pool drain]; +} + +// }}} + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/PreambleEditor.h b/tikzit-old/src/gtk/PreambleEditor.h new file mode 100644 index 0000000..f181446 --- /dev/null +++ b/tikzit-old/src/gtk/PreambleEditor.h @@ -0,0 +1,51 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import + +@class Preambles; + +@interface PreambleEditor: NSObject { + Preambles *preambles; + + // we don't keep any refs, as we control + // the top window + GtkWindow *parentWindow; + GtkWindow *window; + GtkListStore *preambleListStore; + GtkTreeView *preambleSelector; + GtkTextView *preambleView; + BOOL blockSignals; + BOOL adding; +} + +- (id) initWithPreambles:(Preambles*)p; + +- (void) setParentWindow:(GtkWindow*)parent; + +- (Preambles*) preambles; + +- (void) present; +- (void) show; +- (void) hide; +- (BOOL) isVisible; +- (void) setVisible:(BOOL)visible; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/PreambleEditor.m b/tikzit-old/src/gtk/PreambleEditor.m new file mode 100644 index 0000000..d1f72ee --- /dev/null +++ b/tikzit-old/src/gtk/PreambleEditor.m @@ -0,0 +1,568 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "PreambleEditor.h" + +#import "Application.h" +#import "Preambles.h" +#import + +enum { + NAME_COLUMN, + IS_CUSTOM_COLUMN, + N_COLUMNS +}; + +// {{{ Internal interfaces +// {{{ Signals +static gboolean window_delete_event_cb (GtkWidget *widget, + GdkEvent *event, + PreambleEditor *editor); +static gboolean window_focus_out_event_cb (GtkWidget *widget, + GdkEvent *event, + PreambleEditor *editor); +static void close_button_clicked_cb (GtkButton *widget, PreambleEditor *editor); +static void add_button_clicked_cb (GtkButton *widget, PreambleEditor *editor); +static void remove_button_clicked_cb (GtkButton *widget, PreambleEditor *editor); +/* +static void undo_button_clicked_cb (GtkButton *widget, PreambleEditor *editor); +static void redo_button_clicked_cb (GtkButton *widget, PreambleEditor *editor); +*/ +static void preamble_name_edited_cb (GtkCellRendererText *renderer, + gchar *path, + gchar *new_text, + PreambleEditor *editor); +static void preamble_selection_changed_cb (GtkTreeSelection *treeselection, + PreambleEditor *editor); +// }}} + +@interface PreambleEditor (Private) +- (void) loadUi; +- (void) save; +- (void) revert; +- (void) update; +- (void) fillListStore; +- (BOOL) isDefaultPreambleSelected; +- (NSString*) selectedPreambleName; +- (void) addPreamble; +- (void) deletePreamble; +- (void) renamePreambleAtPath:(gchar*)path to:(gchar*)newValue; +- (void) nodeStylePropertyChanged:(NSNotification*)notification; +- (void) edgeStylePropertyChanged:(NSNotification*)notification; +@end + +// }}} +// {{{ API + +@implementation PreambleEditor + +- (id) init { + [self release]; + return nil; +} + +- (id) initWithPreambles:(Preambles*)p { + self = [super init]; + + if (self) { + preambles = [p retain]; + parentWindow = NULL; + window = NULL; + preambleView = NULL; + preambleSelector = NULL; + blockSignals = NO; + adding = NO; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(nodeStylePropertyChanged:) + name:@"NodeStylePropertyChanged" + object:nil]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(edgeStylePropertyChanged:) + name:@"EdgeStylePropertyChanged" + object:nil]; + } + + return self; +} + +- (Preambles*) preambles { + return preambles; +} + +- (void) setParentWindow:(GtkWindow*)parent { + GtkWindow *oldParent = parentWindow; + + if (parentWindow) + g_object_ref (parentWindow); + parentWindow = parent; + if (oldParent) + g_object_unref (oldParent); + + if (window) { + gtk_window_set_transient_for (window, parentWindow); + } +} + +- (void) present { + [self loadUi]; + gtk_window_present (GTK_WINDOW (window)); + [self revert]; +} + +- (void) show { + [self loadUi]; + gtk_widget_show (GTK_WIDGET (window)); + [self revert]; +} + +- (void) hide { + if (!window) { + return; + } + [self save]; + gtk_widget_hide (GTK_WIDGET (window)); +} + +- (BOOL) isVisible { + if (!window) { + return NO; + } + gboolean visible; + g_object_get (G_OBJECT (window), "visible", &visible, NULL); + return visible ? YES : NO; +} + +- (void) setVisible:(BOOL)visible { + if (visible) { + [self show]; + } else { + [self hide]; + } +} + +- (void) dealloc { + [preambles release]; + preambles = nil; + if (window) { + gtk_widget_destroy (GTK_WIDGET (window)); + window = NULL; + } + if (parentWindow) { + g_object_ref (parentWindow); + } + + [super dealloc]; +} + +@end + +// }}} +// {{{ Private + +@implementation PreambleEditor (Private) +- (GtkWidget*) createPreambleList { + preambleListStore = gtk_list_store_new (N_COLUMNS, G_TYPE_STRING, G_TYPE_BOOLEAN); + preambleSelector = GTK_TREE_VIEW (gtk_tree_view_new_with_model ( + GTK_TREE_MODEL (preambleListStore))); + gtk_widget_set_size_request (GTK_WIDGET (preambleSelector), 150, -1); + gtk_tree_view_set_headers_visible (preambleSelector, FALSE); + + GtkCellRenderer *renderer; + GtkTreeViewColumn *column; + + renderer = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes ("Preamble", + renderer, + "text", NAME_COLUMN, + "editable", IS_CUSTOM_COLUMN, + NULL); + gtk_tree_view_append_column (preambleSelector, column); + g_signal_connect (G_OBJECT (renderer), + "edited", + G_CALLBACK (preamble_name_edited_cb), + self); + + GtkWidget *listScroller = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (listScroller), + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); + gtk_container_add (GTK_CONTAINER (listScroller), + GTK_WIDGET (preambleSelector)); + + [self fillListStore]; + + GtkTreeSelection *sel = gtk_tree_view_get_selection (preambleSelector); + gtk_tree_selection_set_mode (sel, GTK_SELECTION_BROWSE); + g_signal_connect (G_OBJECT (sel), + "changed", + G_CALLBACK (preamble_selection_changed_cb), + self); + + return listScroller; +} + +- (void) loadUi { + if (window) { + return; + } + + window = GTK_WINDOW (gtk_window_new (GTK_WINDOW_TOPLEVEL)); + gtk_window_set_title (window, "Preamble editor"); + gtk_window_set_position (window, GTK_WIN_POS_CENTER_ON_PARENT); + gtk_window_set_default_size (window, 600, 400); + gtk_window_set_type_hint (window, GDK_WINDOW_TYPE_HINT_DIALOG); + if (parentWindow) { + gtk_window_set_transient_for (window, parentWindow); + } + GdkEventMask mask; + g_object_get (G_OBJECT (window), "events", &mask, NULL); + mask |= GDK_FOCUS_CHANGE_MASK; + g_object_set (G_OBJECT (window), "events", mask, NULL); + g_signal_connect (window, + "delete-event", + G_CALLBACK (window_delete_event_cb), + self); + g_signal_connect (window, + "focus-out-event", + G_CALLBACK (window_focus_out_event_cb), + self); + + GtkWidget *mainBox = gtk_vbox_new (FALSE, 18); + gtk_container_set_border_width (GTK_CONTAINER (mainBox), 12); + gtk_container_add (GTK_CONTAINER (window), mainBox); + + GtkPaned *paned = GTK_PANED (gtk_hpaned_new ()); + gtk_box_pack_start (GTK_BOX (mainBox), + GTK_WIDGET (paned), + TRUE, TRUE, 0); + + GtkWidget *listWidget = [self createPreambleList]; + GtkWidget *listFrame = gtk_frame_new (NULL); + gtk_container_add (GTK_CONTAINER (listFrame), listWidget); + + GtkBox *listBox = GTK_BOX (gtk_vbox_new (FALSE, 6)); + gtk_box_pack_start (listBox, listFrame, TRUE, TRUE, 0); + + GtkContainer *listButtonBox = GTK_CONTAINER (gtk_hbox_new (FALSE, 6)); + gtk_box_pack_start (listBox, GTK_WIDGET (listButtonBox), FALSE, TRUE, 0); + GtkWidget *addButton = gtk_button_new_from_stock (GTK_STOCK_ADD); + g_signal_connect (addButton, + "clicked", + G_CALLBACK (add_button_clicked_cb), + self); + gtk_container_add (listButtonBox, addButton); + GtkWidget *removeButton = gtk_button_new_from_stock (GTK_STOCK_REMOVE); + g_signal_connect (removeButton, + "clicked", + G_CALLBACK (remove_button_clicked_cb), + self); + gtk_container_add (listButtonBox, removeButton); + + gtk_paned_pack1 (paned, GTK_WIDGET (listBox), FALSE, TRUE); + + preambleView = GTK_TEXT_VIEW (gtk_text_view_new ()); + gtk_text_view_set_left_margin (preambleView, 3); + gtk_text_view_set_right_margin (preambleView, 3); + GtkWidget *scroller = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroller), + GTK_POLICY_AUTOMATIC, // horiz + GTK_POLICY_ALWAYS); // vert + gtk_container_add (GTK_CONTAINER (scroller), GTK_WIDGET (preambleView)); + GtkWidget *editorFrame = gtk_frame_new (NULL); + gtk_container_add (GTK_CONTAINER (editorFrame), scroller); + gtk_paned_pack2 (paned, editorFrame, TRUE, TRUE); + + GtkContainer *buttonBox = GTK_CONTAINER (gtk_hbutton_box_new ()); + gtk_box_set_spacing (GTK_BOX (buttonBox), 6); + gtk_button_box_set_layout (GTK_BUTTON_BOX (buttonBox), GTK_BUTTONBOX_END); + gtk_box_pack_start (GTK_BOX (mainBox), + GTK_WIDGET (buttonBox), + FALSE, TRUE, 0); + GtkWidget *closeButton = gtk_button_new_from_stock (GTK_STOCK_CLOSE); + gtk_container_add (buttonBox, closeButton); + g_signal_connect (closeButton, + "clicked", + G_CALLBACK (close_button_clicked_cb), + self); + /* + GtkWidget *undoButton = gtk_button_new_from_stock (GTK_STOCK_UNDO); + gtk_container_add (buttonBox, undoButton); + gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (buttonBox), + undoButton, + TRUE); + g_signal_connect (undoButton, + "clicked", + G_CALLBACK (undo_button_clicked_cb), + self); + GtkWidget *redoButton = gtk_button_new_from_stock (GTK_STOCK_REDO); + gtk_container_add (buttonBox, redoButton); + gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (buttonBox), + redoButton, + TRUE); + g_signal_connect (redoButton, + "clicked", + G_CALLBACK (redo_button_clicked_cb), + self); + */ + [self revert]; + + gtk_widget_show_all (mainBox); +} + +- (void) save { + if (!preambleView) + return; + if ([self isDefaultPreambleSelected]) + return; + GtkTextIter start,end; + GtkTextBuffer *preambleBuffer = gtk_text_view_get_buffer (preambleView); + gtk_text_buffer_get_bounds(preambleBuffer, &start, &end); + gchar *text = gtk_text_buffer_get_text(preambleBuffer, &start, &end, FALSE); + NSString *preamble = [NSString stringWithUTF8String:text]; + g_free (text); + [preambles setCurrentPreamble:preamble]; + [app saveConfiguration]; +} + +- (void) revert { + if (!preambleView) + return; + GtkTextBuffer *preambleBuffer = gtk_text_view_get_buffer (preambleView); + gtk_text_buffer_set_text (preambleBuffer, [[preambles currentPreamble] UTF8String], -1); + gtk_text_view_set_editable (preambleView, ![self isDefaultPreambleSelected]); +} + +- (void) update { + if (!blockSignals) { + [self save]; + } + GtkTreeSelection *sel = gtk_tree_view_get_selection (preambleSelector); + GtkTreeIter row; + GtkTreeModel *model; + if (gtk_tree_selection_get_selected (sel, &model, &row)) { + gchar *name; + gtk_tree_model_get (model, &row, NAME_COLUMN, &name, -1); + NSString *preambleName = [NSString stringWithUTF8String:name]; + [preambles setSelectedPreambleName:preambleName]; + g_free (name); + } + [self revert]; +} + +- (void) fillListStore { + blockSignals = YES; + + GtkTreeIter row; + gtk_list_store_clear (preambleListStore); + + gtk_list_store_append (preambleListStore, &row); + gtk_list_store_set (preambleListStore, &row, + NAME_COLUMN, [[preambles defaultPreambleName] UTF8String], + IS_CUSTOM_COLUMN, FALSE, + -1); + GtkTreeSelection *sel = gtk_tree_view_get_selection (preambleSelector); + if ([self isDefaultPreambleSelected]) { + gtk_tree_selection_select_iter (sel, &row); + } + + NSEnumerator *en = [preambles customPreambleNameEnumerator]; + NSString *preambleName; + while ((preambleName = [en nextObject])) { + gtk_list_store_append (preambleListStore, &row); + gtk_list_store_set (preambleListStore, &row, + NAME_COLUMN, [preambleName UTF8String], + IS_CUSTOM_COLUMN, TRUE, + -1); + if ([preambleName isEqualToString:[self selectedPreambleName]]) { + gtk_tree_selection_select_iter (sel, &row); + } + } + + blockSignals = NO; +} + +- (BOOL) isDefaultPreambleSelected { + return [preambles selectedPreambleIsDefault]; +} + +- (NSString*) selectedPreambleName { + return [preambles selectedPreambleName]; +} + +- (void) addPreamble { + NSString *newName = [preambles addPreamble]; + + GtkTreeIter row; + gtk_list_store_append (preambleListStore, &row); + gtk_list_store_set (preambleListStore, &row, + NAME_COLUMN, [newName UTF8String], + IS_CUSTOM_COLUMN, TRUE, + -1); + + GtkTreeSelection *sel = gtk_tree_view_get_selection (preambleSelector); + gtk_tree_selection_select_iter (sel, &row); +} + +- (void) deletePreamble { + if ([self isDefaultPreambleSelected]) + return; + + NSString *name = [self selectedPreambleName]; + + GtkTreeIter row; + GtkTreeModel *model = GTK_TREE_MODEL (preambleListStore); + + gtk_tree_model_get_iter_first (model, &row); + // ignore first; it is the default one + gboolean found = FALSE; + while (!found && gtk_tree_model_iter_next (model, &row)) { + gchar *candidate; + gtk_tree_model_get (model, &row, NAME_COLUMN, &candidate, -1); + if (g_strcmp0 (candidate, [name UTF8String]) == 0) { + found = TRUE; + } + g_free (candidate); + } + + if (!found) + return; + + if (![preambles removePreamble:name]) + return; + + blockSignals = YES; + + gboolean had_next = gtk_list_store_remove (preambleListStore, &row); + if (!had_next) { + // select the last item + gint length = gtk_tree_model_iter_n_children (model, NULL); + gtk_tree_model_iter_nth_child (model, &row, NULL, length - 1); + } + + GtkTreeSelection *sel = gtk_tree_view_get_selection (preambleSelector); + gtk_tree_selection_select_iter (sel, &row); + + [self revert]; + + blockSignals = NO; +} + +- (void) renamePreambleAtPath:(gchar*)path to:(gchar*)newValue { + NSString *newName = [NSString stringWithUTF8String:newValue]; + + GtkTreeIter row; + GtkTreeModel *model = GTK_TREE_MODEL (preambleListStore); + + if (!gtk_tree_model_get_iter_from_string (model, &row, path)) + return; + + gchar *oldValue; + gtk_tree_model_get (model, &row, NAME_COLUMN, &oldValue, -1); + + NSString* oldName = [NSString stringWithUTF8String:oldValue]; + if ([preambles renamePreambleFrom:oldName to:newName]) { + gtk_list_store_set (preambleListStore, &row, + NAME_COLUMN, newValue, + -1); + } +} + +- (void) nodeStylePropertyChanged:(NSNotification*)notification { + if ([self isDefaultPreambleSelected]) { + [self revert]; + } +} + +- (void) edgeStylePropertyChanged:(NSNotification*)notification { + if ([self isDefaultPreambleSelected]) { + [self revert]; + } +} +@end + +// }}} +// {{{ GTK+ callbacks + +static gboolean window_delete_event_cb (GtkWidget *widget, + GdkEvent *event, + PreambleEditor *editor) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [editor hide]; + [pool drain]; + return TRUE; // we dealt with this event +} + +static gboolean window_focus_out_event_cb (GtkWidget *widget, + GdkEvent *event, + PreambleEditor *editor) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [editor save]; + [pool drain]; + return FALSE; +} + +static void close_button_clicked_cb (GtkButton *widget, PreambleEditor *editor) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [editor hide]; + [pool drain]; +} + +static void add_button_clicked_cb (GtkButton *widget, PreambleEditor *editor) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [editor addPreamble]; + [pool drain]; +} + +static void remove_button_clicked_cb (GtkButton *widget, PreambleEditor *editor) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [editor deletePreamble]; + [pool drain]; +} + +/* +static void undo_button_clicked_cb (GtkButton *widget, PreambleEditor *editor) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + NSLog(@"Undo"); + [pool drain]; +} + +static void redo_button_clicked_cb (GtkButton *widget, PreambleEditor *editor) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + NSLog(@"Redo"); + [pool drain]; +} +*/ + +static void preamble_name_edited_cb (GtkCellRendererText *renderer, + gchar *path, + gchar *new_text, + PreambleEditor *editor) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [editor renamePreambleAtPath:path to:new_text]; + [pool drain]; +} + +static void preamble_selection_changed_cb (GtkTreeSelection *treeselection, + PreambleEditor *editor) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [editor update]; + [pool drain]; +} + +// }}} + +// vim:ft=objc:ts=4:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/Preambles+Storage.h b/tikzit-old/src/gtk/Preambles+Storage.h new file mode 100644 index 0000000..76f56cc --- /dev/null +++ b/tikzit-old/src/gtk/Preambles+Storage.h @@ -0,0 +1,29 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "Preambles.h" + +@interface Preambles (Storage) + ++ (Preambles*) preamblesFromDirectory:(NSString*)directory; +- (id) initFromDirectory:(NSString*)directory; +- (void) loadFromDirectory:(NSString*)directory; +- (void) storeToDirectory:(NSString*)directory; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/Preambles+Storage.m b/tikzit-old/src/gtk/Preambles+Storage.m new file mode 100644 index 0000000..bd3ea03 --- /dev/null +++ b/tikzit-old/src/gtk/Preambles+Storage.m @@ -0,0 +1,84 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "Preambles+Storage.h" + +static NSString *ext = @"preamble"; + +@implementation Preambles (Storage) + ++ (Preambles*) preamblesFromDirectory:(NSString*)directory { + return [[[self alloc] initFromDirectory:directory] autorelease]; +} + +- (id) initFromDirectory:(NSString*)directory { + BOOL isDir = NO; + if ([[NSFileManager defaultManager] fileExistsAtPath:directory isDirectory:&isDir] && isDir) { + self = [super init]; + + if (self) { + selectedPreambleName = @"default"; + preambleDict = nil; + [self loadFromDirectory:directory]; + } + } else { + self = [self init]; + } + + return self; +} + +- (void) loadFromDirectory:(NSString*)directory { + preambleDict = [[NSMutableDictionary alloc] initWithCapacity:1]; + NSDirectoryEnumerator *en = [[NSFileManager defaultManager] enumeratorAtPath:directory]; + NSString *filename; + while ((filename = [en nextObject]) != nil) { + if ([filename hasSuffix:ext] && [[en fileAttributes] fileType] == NSFileTypeRegular) { + NSString *path = [directory stringByAppendingPathComponent:filename]; + NSString *contents = [NSString stringWithContentsOfFile:path]; + if (contents) { + [preambleDict setObject:contents forKey:[filename stringByDeletingPathExtension]]; + } + } + } +} + +- (void) storeToDirectory:(NSString*)directory { + NSDirectoryEnumerator *den = [[NSFileManager defaultManager] enumeratorAtPath:directory]; + NSString *filename; + while ((filename = [den nextObject]) != nil) { + if ([filename hasSuffix:ext] && [[den fileAttributes] fileType] == NSFileTypeRegular) { + NSString *path = [directory stringByAppendingPathComponent:filename]; + NSString *entry = [filename stringByDeletingPathExtension]; + if ([preambleDict objectForKey:entry] == nil) { + [[NSFileManager defaultManager] removeFileAtPath:path handler:nil]; + } + } + } + + NSEnumerator *en = [self customPreambleNameEnumerator]; + NSString *entry; + while ((entry = [en nextObject]) != nil) { + NSString *path = [directory stringByAppendingPathComponent:[entry stringByAppendingPathExtension:ext]]; + NSString *contents = [preambleDict objectForKey:entry]; + [contents writeToFile:path atomically:YES]; + } +} + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/PreviewRenderer.h b/tikzit-old/src/gtk/PreviewRenderer.h new file mode 100644 index 0000000..d691722 --- /dev/null +++ b/tikzit-old/src/gtk/PreviewRenderer.h @@ -0,0 +1,48 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import + +#import "Surface.h" + +@class Configuration; +@class Preambles; +@class TikzDocument; + +@interface PreviewRenderer: NSObject { + Configuration *config; + Preambles *preambles; + TikzDocument *document; + PopplerDocument *pdfDocument; + PopplerPage *pdfPage; +} + +@property (readonly) Preambles *preambles; +@property (retain) TikzDocument *document; +@property (readonly) double height; +@property (readonly) double width; + +- (id) initWithPreambles:(Preambles*)p config:(Configuration*)c; + +- (BOOL) updateWithError:(NSError**)error; +- (BOOL) update; +- (BOOL) isValid; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/PreviewRenderer.m b/tikzit-old/src/gtk/PreviewRenderer.m new file mode 100644 index 0000000..28113d6 --- /dev/null +++ b/tikzit-old/src/gtk/PreviewRenderer.m @@ -0,0 +1,250 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "PreviewRenderer.h" + +#import "CairoRenderContext.h" +#import "Configuration.h" +#import "Preambles.h" +#import "TikzDocument.h" + +@implementation PreviewRenderer + +@synthesize preambles, document; + +- (id) init { + [self release]; + return nil; +} + +- (id) initWithPreambles:(Preambles*)p config:(Configuration*)c { + self = [super init]; + + if (self) { + document = nil; + config = [c retain]; + preambles = [p retain]; + pdfDocument = NULL; + pdfPage = NULL; + } + + return self; +} + +- (void) dealloc { + [document release]; + [config release]; + [preambles release]; + + if (pdfDocument) { + g_object_unref (pdfDocument); + pdfDocument = NULL; + } + if (pdfPage) { + g_object_unref (pdfPage); + pdfPage = NULL; + } + + [super dealloc]; +} + +- (BOOL) update { + NSError *error = nil; + BOOL result = [self updateWithError:&error]; + if (error) { + logError (error, @"Could not update preview"); + if ([error code] == TZ_ERR_TOOL_FAILED) { + NSLog (@"Output: %@", [[error userInfo] objectForKey:TZToolOutputErrorKey]); + } + } + return result; +} + +- (BOOL) updateWithError:(NSError**)error { + if (document == nil) { + if (error) { + *error = [NSError errorWithMessage:@"No document given" code:TZ_ERR_BADSTATE]; + } + if (pdfDocument) { + g_object_unref (pdfDocument); + pdfDocument = NULL; + } + if (pdfPage) { + g_object_unref (pdfPage); + pdfPage = NULL; + } + return NO; + } + + NSString *tex = [preambles buildDocumentForTikz:[document tikz]]; + + NSString *tempDir = [[NSFileManager defaultManager] createTempDirectoryWithError:error]; + if (!tempDir) { + if (error) { + *error = [NSError errorWithMessage:@"Could not create temporary directory" code:TZ_ERR_IO cause:*error]; + } + return NO; + } + + // write tex code to temporary file + NSString *texFile = [NSString stringWithFormat:@"%@/tikzit.tex", tempDir]; + NSString *pdfFile = [NSString stringWithFormat:@"file://%@/tikzit.pdf", tempDir]; + [tex writeToFile:texFile atomically:YES]; + + NSTask *latexTask = [[NSTask alloc] init]; + [latexTask setCurrentDirectoryPath:tempDir]; + + // GNUStep is clever enough to use PATH + NSString *path = [config stringEntry:@"pdflatex" + inGroup:@"Previews" + withDefault:@"pdflatex"]; + [latexTask setLaunchPath:path]; + + NSArray *args = [NSArray arrayWithObjects: + @"-fmt=latex", + @"-output-format=pdf", + @"-interaction=nonstopmode", + @"-halt-on-error", + texFile, + nil]; + [latexTask setArguments:args]; + + NSPipe *pout = [NSPipe pipe]; + [latexTask setStandardOutput:pout]; + + NSFileHandle *latexOut = [pout fileHandleForReading]; + + BOOL success = NO; + + NS_DURING { + [latexTask launch]; + [latexTask waitUntilExit]; + } NS_HANDLER { + NSLog(@"Failed to run '%@'; error was: %@", path, [localException reason]); + (void)localException; + if (error) { + NSString *desc = [NSString stringWithFormat:@"Failed to run '%@'", path]; + NSMutableDictionary *errorDetail = [NSMutableDictionary dictionaryWithCapacity:2]; + [errorDetail setValue:desc forKey:NSLocalizedDescriptionKey]; + *error = [NSError errorWithDomain:TZErrorDomain code:TZ_ERR_IO userInfo:errorDetail]; + } + + // remove all temporary files + [[NSFileManager defaultManager] removeFileAtPath:tempDir handler:NULL]; + [latexTask release]; + + return NO; + } NS_ENDHANDLER + + if ([latexTask terminationStatus] != 0) { + if (error) { + NSData *data = [latexOut readDataToEndOfFile]; + NSString *str = [[NSString alloc] initWithData:data + encoding:NSUTF8StringEncoding]; + NSMutableDictionary *errorDetail = [NSMutableDictionary dictionaryWithCapacity:2]; + [errorDetail setValue:@"Generating a PDF file with pdflatex failed" forKey:NSLocalizedDescriptionKey]; + [errorDetail setValue:str forKey:TZToolOutputErrorKey]; + *error = [NSError errorWithDomain:TZErrorDomain code:TZ_ERR_TOOL_FAILED userInfo:errorDetail]; + [str release]; + } + } else { + // load pdf document + GError* gerror = NULL; + pdfDocument = poppler_document_new_from_file([pdfFile UTF8String], NULL, &gerror); + if (!pdfDocument) { + if (error) { + *error = [NSError errorWithMessage:[NSString stringWithFormat:@"Could not load PDF document", pdfFile] + code:TZ_ERR_IO + cause:[NSError errorWithGError:gerror]]; + } + g_error_free(gerror); + } else { + pdfPage = poppler_document_get_page(pdfDocument, 0); + if(!pdfPage) { + if (error) { + *error = [NSError errorWithMessage:@"Could not open first page of PDF document" + code:TZ_ERR_OTHER]; + } + g_object_unref(pdfDocument); + } else { + success = YES; + } + } + } + + // remove all temporary files + [[NSFileManager defaultManager] removeFileAtPath:tempDir handler:NULL]; + [latexTask release]; + + return success; +} + +- (BOOL) isValid { + return pdfPage ? YES : NO; +} + +- (double) width { + double w = 0.0; + if (pdfPage) + poppler_page_get_size(pdfPage, &w, NULL); + return w; +} + +- (double) height { + double h = 0.0; + if (pdfPage) + poppler_page_get_size(pdfPage, NULL, &h); + return h; +} + +- (void) renderWithContext:(id)c onSurface:(id)surface { + if (document != nil && pdfPage) { + CairoRenderContext *context = (CairoRenderContext*)c; + + double w = 0.0; + double h = 0.0; + poppler_page_get_size(pdfPage, &w, &h); + if (w==0) w = 1.0; + if (h==0) h = 1.0; + + double scale = ([surface height] / h) * 0.95; + if (w * scale > [surface width]) scale = [surface width] / w; + [[surface transformer] setScale:scale]; + + NSPoint origin; + w *= scale; + h *= scale; + origin.x = ([surface width] - w) / 2; + origin.y = ([surface height] - h) / 2; + + [[surface transformer] setOrigin:origin]; + + [context saveState]; + [context applyTransform:[surface transformer]]; + + // white-out + [context paintWithColor:WhiteRColor]; + + poppler_page_render (pdfPage, [context cairoContext]); + + [context restoreState]; + } +} + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/PreviewWindow.h b/tikzit-old/src/gtk/PreviewWindow.h new file mode 100644 index 0000000..8bcd3e5 --- /dev/null +++ b/tikzit-old/src/gtk/PreviewWindow.h @@ -0,0 +1,51 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import + +@class Configuration; +@class Preambles; +@class PreviewRenderer; +@class TikzDocument; +@class WidgetSurface; + +@interface PreviewWindow: NSObject { + PreviewRenderer *previewer; + GtkWindow *window; + WidgetSurface *surface; + GtkWindow *parent; +} + +- (id) initWithPreambles:(Preambles*)p config:(Configuration*)c; + +- (void) setParentWindow:(GtkWindow*)parent; + +- (TikzDocument*) document; +- (void) setDocument:(TikzDocument*)doc; + +- (BOOL) update; + +- (void) present; +- (void) show; +- (void) hide; +- (BOOL) isVisible; +- (void) setVisible:(BOOL)visible; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/PreviewWindow.m b/tikzit-old/src/gtk/PreviewWindow.m new file mode 100644 index 0000000..fc0e7a3 --- /dev/null +++ b/tikzit-old/src/gtk/PreviewWindow.m @@ -0,0 +1,195 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "PreviewWindow.h" + +#import "Preambles.h" +#import "PreviewRenderer.h" +#import "TikzDocument.h" +#import "WidgetSurface.h" + +#import "gtkhelpers.h" + +@interface PreviewWindow (Private) +- (BOOL) updateOrShowError; +- (void) updateDefaultSize; +@end + +// {{{ API + +@implementation PreviewWindow + +- (id) init { + [self release]; + return nil; +} + +- (id) initWithPreambles:(Preambles*)p config:(Configuration*)c { + self = [super init]; + + if (self) { + parent = NULL; + previewer = [[PreviewRenderer alloc] initWithPreambles:p config:c]; + + window = GTK_WINDOW (gtk_window_new (GTK_WINDOW_TOPLEVEL)); + gtk_window_set_title (window, "Preview"); + gtk_window_set_resizable (window, TRUE); + gtk_window_set_default_size (window, 150.0, 150.0); + g_signal_connect (G_OBJECT (window), + "delete-event", + G_CALLBACK (gtk_widget_hide_on_delete), + NULL); + + GtkWidget *pdfArea = gtk_drawing_area_new (); + gtk_container_add (GTK_CONTAINER (window), pdfArea); + gtk_widget_show (pdfArea); + surface = [[WidgetSurface alloc] initWithWidget:pdfArea]; + [surface setRenderDelegate:previewer]; + Transformer *t = [surface transformer]; + [t setFlippedAboutXAxis:![t isFlippedAboutXAxis]]; + } + + return self; +} + +- (void) setParentWindow:(GtkWindow*)p { + parent = p; + gtk_window_set_transient_for (window, p); + if (p != NULL) { + gtk_window_set_position (window, GTK_WIN_POS_CENTER_ON_PARENT); + } +} + +- (TikzDocument*) document { + return [previewer document]; +} + +- (void) setDocument:(TikzDocument*)doc { + [previewer setDocument:doc]; +} + +- (void) present { + if ([self updateOrShowError]) { + [self updateDefaultSize]; + gtk_window_present (GTK_WINDOW (window)); + [surface invalidate]; + } +} + +- (BOOL) update { + if ([self updateOrShowError]) { + [self updateDefaultSize]; + return YES; + } + + return NO; +} + +- (void) show { + if ([self updateOrShowError]) { + [self updateDefaultSize]; + gtk_widget_show (GTK_WIDGET (window)); + [surface invalidate]; + } +} + +- (void) hide { + gtk_widget_hide (GTK_WIDGET (window)); +} + +- (BOOL) isVisible { + gboolean visible; + g_object_get (G_OBJECT (window), "visible", &visible, NULL); + return visible ? YES : NO; +} + +- (void) setVisible:(BOOL)visible { + if (visible) { + [self show]; + } else { + [self hide]; + } +} + +- (void) dealloc { + gtk_widget_destroy (GTK_WIDGET (window)); + [previewer release]; + [surface release]; + + [super dealloc]; +} + +@end +// }}} + +@implementation PreviewWindow (Private) +- (BOOL) updateOrShowError { + NSError *error = nil; + if (![previewer updateWithError:&error]) { + GtkWindow *dparent = gtk_widget_get_visible (GTK_WIDGET (window)) + ? window + : parent; + GtkWidget *dialog = gtk_message_dialog_new (dparent, + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_CLOSE, + "Failed to generate the preview: %s", + [[error localizedDescription] UTF8String]); +#if GTK_CHECK_VERSION(2,22,0) + if ([error code] == TZ_ERR_TOOL_FAILED) { + GtkBox *box = GTK_BOX (gtk_message_dialog_get_message_area (GTK_MESSAGE_DIALOG (dialog))); + GtkWidget *label = gtk_label_new ("pdflatex said:"); + gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5f); + gtk_widget_show (label); + gtk_box_pack_start (box, label, FALSE, TRUE, 0); + + GtkWidget *view = gtk_text_view_new (); + GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)); + gtk_text_buffer_set_text (buffer, [[error toolOutput] UTF8String], -1); + gtk_text_view_set_editable (GTK_TEXT_VIEW (view), FALSE); + gtk_widget_show (view); + GtkWidget *scrolledView = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledView), + GTK_POLICY_NEVER, // horiz + GTK_POLICY_ALWAYS); // vert + gtk_widget_set_size_request (scrolledView, -1, 120); + gtk_container_add (GTK_CONTAINER (scrolledView), view); + gtk_widget_show (scrolledView); + gtk_box_pack_start (box, scrolledView, TRUE, TRUE, 0); + } +#endif // GTK+ 2.22.0 + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + return NO; + } + return YES; +} + +- (void) updateDefaultSize { + double width = 150; + double height = 150; + if ([previewer isValid]) { + double pWidth = [previewer width]; + double pHeight = [previewer height]; + width = (width < pWidth + 4) ? pWidth + 4 : width; + height = (height < pHeight + 4) ? pHeight + 4 : height; + } + gtk_window_set_default_size (window, width, height); +} +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/PropertiesPane.h b/tikzit-old/src/gtk/PropertiesPane.h new file mode 100644 index 0000000..c76efae --- /dev/null +++ b/tikzit-old/src/gtk/PropertiesPane.h @@ -0,0 +1,69 @@ +/* + * Copyright 2011-2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import + +@class Configuration; +@class EdgePropertyDelegate; +@class EdgeStylesModel; +@class GraphPropertyDelegate; +@class NodePropertyDelegate; +@class NodeStylesModel; +@class PropertyListEditor; +@class StyleManager; +@class TikzDocument; + +@interface PropertiesPane: NSObject { + TikzDocument *document; + BOOL blockUpdates; + + PropertyListEditor *graphProps; + PropertyListEditor *nodeProps; + PropertyListEditor *edgeProps; + PropertyListEditor *edgeNodeProps; + + GraphPropertyDelegate *graphPropDelegate; + NodePropertyDelegate *nodePropDelegate; + EdgePropertyDelegate *edgePropDelegate; + + GtkWidget *layout; + + GtkWidget *currentPropsWidget; // no ref! + + GtkWidget *graphPropsWidget; + GtkWidget *nodePropsWidget; + GtkWidget *edgePropsWidget; + + GtkEntry *nodeLabelEntry; + GtkToggleButton *edgeNodeToggle; + GtkWidget *edgeNodePropsWidget; + GtkEntry *edgeNodeLabelEntry; + GtkEntry *edgeSourceAnchorEntry; + GtkEntry *edgeTargetAnchorEntry; +} + +@property (retain) TikzDocument *document; +@property (assign) BOOL visible; +@property (readonly) GtkWidget *gtkWidget; + +- (void) loadConfiguration:(Configuration*)config; +- (void) saveConfiguration:(Configuration*)config; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/PropertiesPane.m b/tikzit-old/src/gtk/PropertiesPane.m new file mode 100644 index 0000000..ba43298 --- /dev/null +++ b/tikzit-old/src/gtk/PropertiesPane.m @@ -0,0 +1,763 @@ +/* + * Copyright 2011-2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "PropertiesPane.h" + +#import "GraphElementProperty.h" +#import "PropertyListEditor.h" +#import "TikzDocument.h" + +#import "gtkhelpers.h" + +// {{{ Internal interfaces +// {{{ GTK+ helpers +static GtkWidget *createLabelledEntry (const gchar *labelText, GtkEntry **entry); +static GtkWidget *createPropsPaneWithLabelEntry (PropertyListEditor *props, GtkEntry **labelEntry); +static GtkWidget *createBoldLabel (const gchar *text); +// }}} +// {{{ GTK+ callbacks +static void node_label_changed_cb (GtkEditable *widget, PropertiesPane *pane); +static void edge_node_label_changed_cb (GtkEditable *widget, PropertiesPane *pane); +static void edge_node_toggled_cb (GtkToggleButton *widget, PropertiesPane *pane); +static void edge_source_anchor_changed_cb (GtkEditable *widget, PropertiesPane *pane); +static void edge_target_anchor_changed_cb (GtkEditable *widget, PropertiesPane *pane); +// }}} + +@interface PropertiesPane (Notifications) +- (void) nodeSelectionChanged:(NSNotification*)n; +- (void) edgeSelectionChanged:(NSNotification*)n; +- (void) graphChanged:(NSNotification*)n; +- (void) nodeLabelEdited:(NSString*)newValue; +- (void) edgeNodeLabelEdited:(NSString*)newValue; +- (void) edgeNodeToggled:(BOOL)newValue; +- (BOOL) edgeSourceAnchorEdited:(NSString*)newValue; +- (BOOL) edgeTargetAnchorEdited:(NSString*)newValue; +@end + +@interface PropertiesPane (Private) +- (void) _updatePane; +- (void) _setDisplayedWidget:(GtkWidget*)widget; +@end + +// {{{ Delegates + +@interface GraphPropertyDelegate : NSObject { + TikzDocument *doc; +} +- (void) setDocument:(TikzDocument*)d; +@end + +@interface NodePropertyDelegate : NSObject { + TikzDocument *doc; + Node *node; +} +- (void) setDocument:(TikzDocument*)d; +- (void) setNode:(Node*)n; +@end + +@interface EdgePropertyDelegate : NSObject { + TikzDocument *doc; + Edge *edge; +} +- (void) setDocument:(TikzDocument*)d; +- (void) setEdge:(Edge*)e; +@end + +// }}} + +// }}} +// {{{ API + +@implementation PropertiesPane + +- (id) init { + self = [super init]; + + if (self) { + document = nil; + blockUpdates = NO; + + graphProps = [[PropertyListEditor alloc] init]; + graphPropDelegate = [[GraphPropertyDelegate alloc] init]; + [graphProps setDelegate:graphPropDelegate]; + + nodeProps = [[PropertyListEditor alloc] init]; + nodePropDelegate = [[NodePropertyDelegate alloc] init]; + [nodeProps setDelegate:nodePropDelegate]; + + edgeProps = [[PropertyListEditor alloc] init]; + edgePropDelegate = [[EdgePropertyDelegate alloc] init]; + [edgeProps setDelegate:edgePropDelegate]; + + edgeNodeProps = [[PropertyListEditor alloc] init]; + [edgeNodeProps setDelegate:edgePropDelegate]; + + layout = gtk_vbox_new (FALSE, 0); + g_object_ref_sink (layout); + gtk_widget_show (layout); + + /* + * Graph properties + */ + graphPropsWidget = gtk_vbox_new (FALSE, 6); + g_object_ref_sink (graphPropsWidget); + gtk_widget_show (graphPropsWidget); + + GtkWidget *label = createBoldLabel ("Graph properties"); + gtk_widget_show (label); + gtk_box_pack_start (GTK_BOX (graphPropsWidget), + label, + FALSE, FALSE, 0); + + gtk_widget_show ([graphProps widget]); + gtk_box_pack_start (GTK_BOX (graphPropsWidget), + [graphProps widget], + TRUE, TRUE, 0); + + gtk_box_pack_start (GTK_BOX (layout), + graphPropsWidget, + TRUE, TRUE, 0); + + + /* + * Node properties + */ + nodePropsWidget = gtk_vbox_new (FALSE, 6); + g_object_ref_sink (nodePropsWidget); + gtk_box_pack_start (GTK_BOX (layout), + nodePropsWidget, + TRUE, TRUE, 0); + + label = createBoldLabel ("Node properties"); + gtk_widget_show (label); + gtk_box_pack_start (GTK_BOX (nodePropsWidget), + label, + FALSE, FALSE, 0); + + GtkWidget *labelWidget = createLabelledEntry ("Label", &nodeLabelEntry); + gtk_widget_show (labelWidget); + gtk_box_pack_start (GTK_BOX (nodePropsWidget), + labelWidget, + FALSE, FALSE, 0); + + gtk_widget_show ([nodeProps widget]); + gtk_box_pack_start (GTK_BOX (nodePropsWidget), + [nodeProps widget], + TRUE, TRUE, 0); + + g_signal_connect (G_OBJECT (nodeLabelEntry), + "changed", + G_CALLBACK (node_label_changed_cb), + self); + + /* + * Edge properties + */ + edgePropsWidget = gtk_vbox_new (FALSE, 6); + g_object_ref_sink (edgePropsWidget); + gtk_box_pack_start (GTK_BOX (layout), + edgePropsWidget, + TRUE, TRUE, 0); + + label = createBoldLabel ("Edge properties"); + gtk_widget_show (label); + gtk_box_pack_start (GTK_BOX (edgePropsWidget), + label, + FALSE, FALSE, 0); + + gtk_widget_show ([edgeProps widget]); + gtk_box_pack_start (GTK_BOX (edgePropsWidget), + [edgeProps widget], + TRUE, TRUE, 0); + + GtkWidget *split = gtk_hseparator_new (); + gtk_widget_show (split); + gtk_box_pack_start (GTK_BOX (edgePropsWidget), + split, + FALSE, FALSE, 0); + + GtkWidget *anchorTable = gtk_table_new (2, 2, FALSE); + + label = gtk_label_new ("Source anchor:"); + gtk_table_attach_defaults (GTK_TABLE (anchorTable), label, + 0, 1, 0, 1); + edgeSourceAnchorEntry = GTK_ENTRY (gtk_entry_new ()); + g_object_ref_sink (edgeSourceAnchorEntry); + gtk_table_attach_defaults (GTK_TABLE (anchorTable), + GTK_WIDGET (edgeSourceAnchorEntry), + 1, 2, 0, 1); + g_signal_connect (G_OBJECT (edgeSourceAnchorEntry), + "changed", + G_CALLBACK (edge_source_anchor_changed_cb), + self); + + label = gtk_label_new ("Target anchor:"); + gtk_table_attach_defaults (GTK_TABLE (anchorTable), label, + 0, 1, 1, 2); + edgeTargetAnchorEntry = GTK_ENTRY (gtk_entry_new ()); + g_object_ref_sink (edgeTargetAnchorEntry); + gtk_table_attach_defaults (GTK_TABLE (anchorTable), + GTK_WIDGET (edgeTargetAnchorEntry), + 1, 2, 1, 2); + g_signal_connect (G_OBJECT (edgeTargetAnchorEntry), + "changed", + G_CALLBACK (edge_target_anchor_changed_cb), + self); + + gtk_widget_show_all (anchorTable); + gtk_box_pack_start (GTK_BOX (edgePropsWidget), + anchorTable, + FALSE, FALSE, 0); + + split = gtk_hseparator_new (); + gtk_widget_show (split); + gtk_box_pack_start (GTK_BOX (edgePropsWidget), + split, + FALSE, FALSE, 0); + + edgeNodeToggle = GTK_TOGGLE_BUTTON (gtk_check_button_new_with_label ("Child node")); + g_object_ref_sink (edgeNodeToggle); + gtk_widget_show (GTK_WIDGET (edgeNodeToggle)); + gtk_box_pack_start (GTK_BOX (edgePropsWidget), + GTK_WIDGET (edgeNodeToggle), + FALSE, FALSE, 0); + g_signal_connect (G_OBJECT (GTK_WIDGET (edgeNodeToggle)), + "toggled", + G_CALLBACK (edge_node_toggled_cb), + self); + + edgeNodePropsWidget = createPropsPaneWithLabelEntry(edgeNodeProps, &edgeNodeLabelEntry); + g_object_ref_sink (edgeNodePropsWidget); + g_object_ref_sink (edgeNodeLabelEntry); + gtk_box_pack_start (GTK_BOX (edgePropsWidget), + edgeNodePropsWidget, + TRUE, TRUE, 0); + g_signal_connect (G_OBJECT (edgeNodeLabelEntry), + "changed", + G_CALLBACK (edge_node_label_changed_cb), + self); + + /* + * Misc setup + */ + + [self _setDisplayedWidget:graphPropsWidget]; + } + + return self; +} + +- (void) dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + + g_object_unref (graphPropsWidget); + g_object_unref (nodePropsWidget); + g_object_unref (edgePropsWidget); + + g_object_unref (nodeLabelEntry); + g_object_unref (edgeNodeToggle); + g_object_unref (edgeNodePropsWidget); + g_object_unref (edgeNodeLabelEntry); + g_object_unref (edgeSourceAnchorEntry); + g_object_unref (edgeTargetAnchorEntry); + + g_object_unref (layout); + + [graphProps release]; + [nodeProps release]; + [edgeProps release]; + [edgeNodeProps release]; + + [graphPropDelegate release]; + [nodePropDelegate release]; + [edgePropDelegate release]; + + [document release]; + + [super dealloc]; +} + +- (TikzDocument*) document { + return document; +} + +- (void) setDocument:(TikzDocument*)doc { + if (document != nil) { + [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:document]; + [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:[document pickSupport]]; + } + + [doc retain]; + [document release]; + document = doc; + + [graphPropDelegate setDocument:doc]; + [nodePropDelegate setDocument:doc]; + [edgePropDelegate setDocument:doc]; + + if (doc != nil) { + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(nodeSelectionChanged:) + name:@"NodeSelectionChanged" object:[doc pickSupport]]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(edgeSelectionChanged:) + name:@"EdgeSelectionChanged" object:[doc pickSupport]]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(graphChanged:) + name:@"TikzChanged" object:doc]; + } + + [self _updatePane]; +} + +- (BOOL) visible { + return gtk_widget_get_visible (layout); +} + +- (void) setVisible:(BOOL)visible { + gtk_widget_set_visible (layout, visible); +} + +- (GtkWidget*) gtkWidget { + return layout; +} + +- (void) loadConfiguration:(Configuration*)config { +} + +- (void) saveConfiguration:(Configuration*)config { +} + +@end +// }}} +// {{{ Notifications + +@implementation PropertiesPane (Notifications) + +- (void) nodeSelectionChanged:(NSNotification*)n { + [self _updatePane]; +} + +- (void) edgeSelectionChanged:(NSNotification*)n { + [self _updatePane]; +} + +- (void) graphChanged:(NSNotification*)n { + [self _updatePane]; +} + +- (void) nodeLabelEdited:(NSString*)newValue { + if (blockUpdates) + return; + + NSSet *sel = [[document pickSupport] selectedNodes]; + if ([sel count] != 1) { + NSLog(@"Expected single node selected; got %lu", [sel count]); + return; + } + + if ([newValue isValidTikzPropertyNameOrValue]) { + Node *node = [sel anyObject]; + [document startModifyNode:node]; + [node setLabel:newValue]; + [document endModifyNode]; + } else { + widget_set_error (GTK_WIDGET (nodeLabelEntry)); + } +} + +- (void) edgeNodeLabelEdited:(NSString*)newValue { + if (blockUpdates) + return; + + NSSet *sel = [[document pickSupport] selectedEdges]; + if ([sel count] != 1) { + NSLog(@"Expected single edge selected; got %lu", [sel count]); + return; + } + + Edge *edge = [sel anyObject]; + if (![edge hasEdgeNode]) { + NSLog(@"Expected edge with edge node"); + return; + } + + if ([newValue isValidTikzPropertyNameOrValue]) { + [document startModifyEdge:edge]; + [[edge edgeNode] setLabel:newValue]; + [document endModifyEdge]; + } else { + widget_set_error (GTK_WIDGET (edgeNodeLabelEntry)); + } +} + +- (void) edgeNodeToggled:(BOOL)newValue { + if (blockUpdates) + return; + + NSSet *sel = [[document pickSupport] selectedEdges]; + if ([sel count] != 1) { + NSLog(@"Expected single edge selected; got %lu", [sel count]); + return; + } + + Edge *edge = [sel anyObject]; + + [document startModifyEdge:edge]; + [edge setHasEdgeNode:newValue]; + [document endModifyEdge]; +} + +- (BOOL) edgeSourceAnchorEdited:(NSString*)newValue { + if (blockUpdates) + return YES; + + NSSet *sel = [[document pickSupport] selectedEdges]; + if ([sel count] != 1) { + NSLog(@"Expected single edge selected; got %lu", [sel count]); + return YES; + } + + Edge *edge = [sel anyObject]; + if ([newValue isValidAnchor]) { + [document startModifyEdge:edge]; + [edge setSourceAnchor:newValue]; + [document endModifyEdge]; + return YES; + } else { + return NO; + } +} + +- (BOOL) edgeTargetAnchorEdited:(NSString*)newValue { + if (blockUpdates) + return YES; + + NSSet *sel = [[document pickSupport] selectedEdges]; + if ([sel count] != 1) { + NSLog(@"Expected single edge selected; got %lu", [sel count]); + return YES; + } + + Edge *edge = [sel anyObject]; + if ([newValue isValidAnchor]) { + [document startModifyEdge:edge]; + [edge setTargetAnchor:newValue]; + [document endModifyEdge]; + return YES; + } else { + return NO; + } +} + +@end +// }}} +// {{{ Private + +@implementation PropertiesPane (Private) + +- (void) _setDisplayedWidget:(GtkWidget*)widget { + if (currentPropsWidget != widget) { + if (currentPropsWidget) + gtk_widget_hide (currentPropsWidget); + currentPropsWidget = widget; + if (widget) + gtk_widget_show (widget); + } +} + +- (void) _updatePane { + blockUpdates = YES; + + BOOL editGraphProps = YES; + GraphElementData *data = [[document graph] data]; + [graphProps setData:data]; + + NSSet *nodeSel = [[document pickSupport] selectedNodes]; + if ([nodeSel count] == 1) { + Node *n = [nodeSel anyObject]; + [nodePropDelegate setNode:n]; + [nodeProps setData:[n data]]; + gtk_entry_set_text (nodeLabelEntry, [[n label] UTF8String]); + widget_clear_error (GTK_WIDGET (nodeLabelEntry)); + [self _setDisplayedWidget:nodePropsWidget]; + editGraphProps = NO; + } else { + [nodePropDelegate setNode:nil]; + [nodeProps setData:nil]; + gtk_entry_set_text (nodeLabelEntry, ""); + + NSSet *edgeSel = [[document pickSupport] selectedEdges]; + if ([edgeSel count] == 1) { + Edge *e = [edgeSel anyObject]; + [edgePropDelegate setEdge:e]; + [edgeProps setData:[e data]]; + gtk_entry_set_text (edgeSourceAnchorEntry, + [[e sourceAnchor] UTF8String]); + gtk_entry_set_text (edgeTargetAnchorEntry, + [[e targetAnchor] UTF8String]); + widget_clear_error (GTK_WIDGET (edgeSourceAnchorEntry)); + widget_clear_error (GTK_WIDGET (edgeTargetAnchorEntry)); + widget_clear_error (GTK_WIDGET (edgeNodeLabelEntry)); + if ([e hasEdgeNode]) { + gtk_toggle_button_set_active (edgeNodeToggle, TRUE); + gtk_widget_show (edgeNodePropsWidget); + gtk_entry_set_text (edgeNodeLabelEntry, [[[e edgeNode] label] UTF8String]); + [edgeNodeProps setData:[[e edgeNode] data]]; + gtk_widget_set_sensitive (edgeNodePropsWidget, TRUE); + } else { + gtk_toggle_button_set_active (edgeNodeToggle, FALSE); + gtk_widget_hide (edgeNodePropsWidget); + gtk_entry_set_text (edgeNodeLabelEntry, ""); + [edgeNodeProps setData:nil]; + gtk_widget_set_sensitive (edgeNodePropsWidget, FALSE); + } + [self _setDisplayedWidget:edgePropsWidget]; + editGraphProps = NO; + } else { + [edgePropDelegate setEdge:nil]; + [edgeProps setData:nil]; + [edgeNodeProps setData:nil]; + gtk_entry_set_text (edgeNodeLabelEntry, ""); + } + } + + if (editGraphProps) { + [self _setDisplayedWidget:graphPropsWidget]; + } + + blockUpdates = NO; +} + +@end + +// }}} +// {{{ Delegates + +@implementation GraphPropertyDelegate +- (id) init { + self = [super init]; + if (self) { + doc = nil; + } + return self; +} +- (void) dealloc { + // doc is not retained + [super dealloc]; +} +- (void) setDocument:(TikzDocument*)d { + doc = d; +} +- (BOOL)startEdit { + if ([doc graph] != nil) { + [doc startChangeGraphProperties]; + return YES; + } + return NO; +} +- (void)endEdit { + [doc endChangeGraphProperties]; +} +- (void)cancelEdit { + [doc cancelChangeGraphProperties]; +} +@end + +@implementation NodePropertyDelegate +- (id) init { + self = [super init]; + if (self) { + doc = nil; + node = nil; + } + return self; +} +- (void) dealloc { + // doc,node not retained + [super dealloc]; +} +- (void) setDocument:(TikzDocument*)d { + doc = d; + node = nil; +} +- (void) setNode:(Node*)n { + node = n; +} +- (BOOL)startEdit { + if (node != nil) { + [doc startModifyNode:node]; + return YES; + } + return NO; +} +- (void)endEdit { + [doc endModifyNode]; +} +- (void)cancelEdit { + [doc cancelModifyNode]; +} +@end + +@implementation EdgePropertyDelegate +- (id) init { + self = [super init]; + if (self) { + doc = nil; + edge = nil; + } + return self; +} +- (void) dealloc { + // doc,edge not retained + [super dealloc]; +} +- (void) setDocument:(TikzDocument*)d { + doc = d; + edge = nil; +} +- (void) setEdge:(Edge*)e { + edge = e; +} +- (BOOL)startEdit { + if (edge != nil) { + [doc startModifyEdge:edge]; + return YES; + } + return NO; +} +- (void)endEdit { + [doc endModifyEdge]; +} +- (void)cancelEdit { + [doc cancelModifyEdge]; +} +@end + +// }}} +// {{{ GTK+ helpers + +static GtkWidget *createLabelledEntry (const gchar *labelText, GtkEntry **entry) { + GtkBox *box = GTK_BOX (gtk_hbox_new (FALSE, 0)); + GtkWidget *label = gtk_label_new (labelText); + gtk_widget_show (label); + GtkWidget *entryWidget = gtk_entry_new (); + gtk_widget_show (entryWidget); + // container widget expand fill pad + gtk_box_pack_start (box, label, FALSE, TRUE, 5); + gtk_box_pack_start (box, entryWidget, TRUE, TRUE, 0); + if (entry) + *entry = GTK_ENTRY (entryWidget); + return GTK_WIDGET (box); +} + +static GtkWidget *createPropsPaneWithLabelEntry (PropertyListEditor *props, GtkEntry **labelEntry) { + GtkBox *box = GTK_BOX (gtk_vbox_new (FALSE, 6)); + + GtkWidget *labelWidget = createLabelledEntry ("Label", labelEntry); + gtk_widget_show (labelWidget); + // box widget expand fill pad + gtk_box_pack_start (box, labelWidget, FALSE, FALSE, 0); + gtk_box_pack_start (box, [props widget], TRUE, TRUE, 0); + gtk_widget_show ([props widget]); + return GTK_WIDGET (box); +} + +static GtkWidget *createBoldLabel (const gchar *text) { + GtkWidget *label = gtk_label_new (text); + label_set_bold (GTK_LABEL (label)); + return label; +} + +// }}} +// {{{ GTK+ callbacks + +static void node_label_changed_cb (GtkEditable *editable, PropertiesPane *pane) { + if (!gtk_widget_is_sensitive (GTK_WIDGET (editable))) { + // clearly wasn't the user editing + return; + } + + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + NSString *newValue = gtk_editable_get_string (editable, 0, -1); + [pane nodeLabelEdited:newValue]; + + [pool drain]; +} + +static void edge_node_label_changed_cb (GtkEditable *editable, PropertiesPane *pane) { + if (!gtk_widget_is_sensitive (GTK_WIDGET (editable))) { + // clearly wasn't the user editing + return; + } + + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + NSString *newValue = gtk_editable_get_string (editable, 0, -1); + [pane edgeNodeLabelEdited:newValue]; + + [pool drain]; +} + +static void edge_node_toggled_cb (GtkToggleButton *toggle, PropertiesPane *pane) { + if (!gtk_widget_is_sensitive (GTK_WIDGET (toggle))) { + // clearly wasn't the user editing + return; + } + + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + gboolean newValue = gtk_toggle_button_get_active (toggle); + [pane edgeNodeToggled:newValue]; + + [pool drain]; +} + +static void edge_source_anchor_changed_cb (GtkEditable *editable, PropertiesPane *pane) { + if (!gtk_widget_is_sensitive (GTK_WIDGET (editable))) { + // clearly wasn't the user editing + return; + } + + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + NSString *newValue = gtk_editable_get_string (editable, 0, -1); + if (![pane edgeSourceAnchorEdited:newValue]) + widget_set_error (GTK_WIDGET (editable)); + + [pool drain]; +} + +static void edge_target_anchor_changed_cb (GtkEditable *editable, PropertiesPane *pane) { + if (!gtk_widget_is_sensitive (GTK_WIDGET (editable))) { + // clearly wasn't the user editing + return; + } + + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + NSString *newValue = gtk_editable_get_string (editable, 0, -1); + if (![pane edgeTargetAnchorEdited:newValue]) + widget_set_error (GTK_WIDGET (editable)); + + [pool drain]; +} + +// }}} + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/PropertyListEditor.h b/tikzit-old/src/gtk/PropertyListEditor.h new file mode 100644 index 0000000..2d3166a --- /dev/null +++ b/tikzit-old/src/gtk/PropertyListEditor.h @@ -0,0 +1,65 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import +#import "GraphElementData.h" +#import "GraphElementProperty.h" + +@protocol PropertyChangeDelegate +@optional +- (BOOL)startEdit; +- (void)endEdit; +- (void)cancelEdit; +@end + +@interface PropertyListEditor: NSObject { + GraphElementData *data; + NSObject *delegate; + + GtkListStore *list; + GtkWidget *view; + GtkWidget *widget; + GtkWidget *removeButton; +} + +/*! + @property widget + @brief The widget displaying the editable list + */ +@property (readonly) GtkWidget *widget; + +/*! + @property data + @brief The GraphElementData that should be reflected in the list + */ +@property (retain) GraphElementData *data; + +/*! + @property delegate + @brief A delegate for dealing with property changes + */ +@property (retain) NSObject *delegate; + +/*! + * Reload the properties from the data store + */ +- (void) reloadProperties; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/PropertyListEditor.m b/tikzit-old/src/gtk/PropertyListEditor.m new file mode 100644 index 0000000..9760618 --- /dev/null +++ b/tikzit-old/src/gtk/PropertyListEditor.m @@ -0,0 +1,501 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "PropertyListEditor.h" +#import "gtkhelpers.h" + +// {{{ Constants + +enum { + PLM_NAME_COL = 0, + PLM_VALUE_COL, + PLM_IS_PROPERTY_COL, + PLM_PROPERTY_COL, + PLM_N_COLS +}; + +// }}} +// {{{ Internal interfaces +// {{{ Signals + +static void value_edited_cb (GtkCellRendererText *renderer, + gchar *path, + gchar *new_text, + PropertyListEditor *editor); +static void name_edited_cb (GtkCellRendererText *renderer, + gchar *path, + gchar *new_text, + PropertyListEditor *editor); +static void add_prop_clicked_cb (GtkButton *button, + PropertyListEditor *editor); +static void add_atom_clicked_cb (GtkButton *button, + PropertyListEditor *editor); +static void remove_clicked_cb (GtkButton *button, + PropertyListEditor *editor); +static void text_editing_started (GtkCellRenderer *cell, + GtkCellEditable *editable, + const gchar *path, + PropertyListEditor *editor); +static void text_changed_cb (GtkEditable *editable, + PropertyListEditor *pane); +static void selection_changed_cb (GtkTreeSelection *selection, + PropertyListEditor *pane); + +// }}} +// {{{ Private + +@interface PropertyListEditor (Private) +- (void) updatePath:(gchar*)path withValue:(NSString*)newText; +- (void) updatePath:(gchar*)path withName:(NSString*)newText; +- (void) addProperty; +- (void) addAtom; +- (void) removeSelected; +- (void) selectionCountChanged:(int)newSelectionCount; +- (void) clearStore; +@end + +// }}} +// }}} +// {{{ API + +@implementation PropertyListEditor + +- (id) init { + self = [super init]; + + if (self) { + list = gtk_list_store_new (PLM_N_COLS, + G_TYPE_STRING, + G_TYPE_STRING, + G_TYPE_BOOLEAN, + G_TYPE_POINTER); + g_object_ref_sink (G_OBJECT (list)); + view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (list)); + g_object_ref_sink (G_OBJECT (view)); + GtkWidget *scrolledview = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledview), + GTK_POLICY_AUTOMATIC, + GTK_POLICY_AUTOMATIC); + gtk_container_add (GTK_CONTAINER (scrolledview), view); + gtk_widget_set_size_request (view, -1, 150); + data = nil; + delegate = nil; + + GtkCellRenderer *renderer; + GtkTreeViewColumn *column; + + renderer = gtk_cell_renderer_text_new (); + g_object_set (G_OBJECT (renderer), + "editable", TRUE, + NULL); + column = gtk_tree_view_column_new_with_attributes ("Key/Atom", + renderer, + "text", PLM_NAME_COL, + NULL); + gtk_tree_view_append_column (GTK_TREE_VIEW (view), column); + g_signal_connect (G_OBJECT (renderer), + "editing-started", + G_CALLBACK (text_editing_started), + self); + g_signal_connect (G_OBJECT (renderer), + "edited", + G_CALLBACK (name_edited_cb), + self); + + renderer = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes ("Value", + renderer, + "text", PLM_VALUE_COL, + "editable", PLM_IS_PROPERTY_COL, + "sensitive", PLM_IS_PROPERTY_COL, + NULL); + gtk_tree_view_append_column (GTK_TREE_VIEW (view), column); + g_signal_connect (G_OBJECT (renderer), + "edited", + G_CALLBACK (value_edited_cb), + self); + + widget = gtk_vbox_new (FALSE, 0); + gtk_box_set_spacing (GTK_BOX (widget), 6); + g_object_ref_sink (G_OBJECT (widget)); + + GtkWidget *listFrame = gtk_frame_new (NULL); + gtk_container_add (GTK_CONTAINER (listFrame), scrolledview); + gtk_widget_show (listFrame); + gtk_container_add (GTK_CONTAINER (widget), listFrame); + + GtkBox *buttonBox = GTK_BOX (gtk_hbox_new(FALSE, 0)); + gtk_box_pack_start (GTK_BOX (widget), GTK_WIDGET (buttonBox), FALSE, FALSE, 0); + + GtkWidget *addPropButton = gtk_button_new (); + //gtk_widget_set_size_request (addPropButton, 27, 27); + gtk_widget_set_tooltip_text (addPropButton, "Add property"); + GtkWidget *addPropContents = gtk_hbox_new(FALSE, 0); + GtkWidget *addPropIcon = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON); + gtk_container_add (GTK_CONTAINER (addPropContents), addPropIcon); + gtk_container_add (GTK_CONTAINER (addPropContents), gtk_label_new ("P")); + gtk_container_add (GTK_CONTAINER (addPropButton), addPropContents); + gtk_box_pack_start (buttonBox, addPropButton, FALSE, FALSE, 0); + g_signal_connect (G_OBJECT (addPropButton), + "clicked", + G_CALLBACK (add_prop_clicked_cb), + self); + + GtkWidget *addAtomButton = gtk_button_new (); + //gtk_widget_set_size_request (addAtomButton, 27, 27); + gtk_widget_set_tooltip_text (addAtomButton, "Add atom"); + GtkWidget *addAtomContents = gtk_hbox_new(FALSE, 0); + GtkWidget *addAtomIcon = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON); + gtk_container_add (GTK_CONTAINER (addAtomContents), addAtomIcon); + gtk_container_add (GTK_CONTAINER (addAtomContents), gtk_label_new ("A")); + gtk_container_add (GTK_CONTAINER (addAtomButton), addAtomContents); + gtk_box_pack_start (buttonBox, addAtomButton, FALSE, FALSE, 0); + g_signal_connect (G_OBJECT (addAtomButton), + "clicked", + G_CALLBACK (add_atom_clicked_cb), + self); + + removeButton = gtk_button_new (); + g_object_ref_sink (G_OBJECT (removeButton)); + gtk_widget_set_sensitive (removeButton, FALSE); + //gtk_widget_set_size_request (removeButton, 27, 27); + gtk_widget_set_tooltip_text (removeButton, "Remove selected"); + GtkWidget *removeIcon = gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_BUTTON); + gtk_container_add (GTK_CONTAINER (removeButton), removeIcon); + gtk_box_pack_start (buttonBox, removeButton, FALSE, FALSE, 0); + g_signal_connect (G_OBJECT (removeButton), + "clicked", + G_CALLBACK (remove_clicked_cb), + self); + + GtkTreeSelection *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view)); + g_signal_connect (G_OBJECT (selection), + "changed", + G_CALLBACK (selection_changed_cb), + self); + + gtk_widget_show_all (GTK_WIDGET (buttonBox)); + gtk_widget_show_all (scrolledview); + + gtk_widget_set_sensitive (widget, FALSE); + } + + return self; +} + +- (void) dealloc { + [self clearStore]; + + [data release]; + [delegate release]; + + g_object_unref (list); + g_object_unref (view); + g_object_unref (widget); + g_object_unref (removeButton); + + [super dealloc]; +} + +@synthesize widget, delegate; + +- (GraphElementData*) data { return data; } +- (void) setData:(GraphElementData*)d { + [d retain]; + [data release]; + data = d; + [self reloadProperties]; + gtk_widget_set_sensitive (widget, data != nil); +} + +- (void) reloadProperties { + [self clearStore]; + int pos = 0; + for (GraphElementProperty *p in data) { + GtkTreeIter iter; + [p retain]; + gtk_list_store_insert_with_values (list, &iter, pos, + PLM_NAME_COL, [[p key] UTF8String], + PLM_VALUE_COL, [[p value] UTF8String], + PLM_IS_PROPERTY_COL, ![p isAtom], + PLM_PROPERTY_COL, (void *)p, + -1); + ++pos; + } +} + +@end + +// }}} +// {{{ Private + +@implementation PropertyListEditor (Private) +- (void) updatePath:(gchar*)pathStr withValue:(NSString*)newText { + if (![newText isValidTikzPropertyNameOrValue]) + return; + + GtkTreeIter iter; + GtkTreePath *path = gtk_tree_path_new_from_string (pathStr); + + if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (list), &iter, path)) { + gtk_tree_path_free (path); + return; + } + + void *propPtr; + gtk_tree_model_get (GTK_TREE_MODEL (list), &iter, + PLM_PROPERTY_COL, &propPtr, + -1); + GraphElementProperty *prop = (GraphElementProperty*)propPtr; + + if (![prop isAtom]) { + if (![delegate respondsToSelector:@selector(startEdit)] || [delegate startEdit]) { + [prop setValue:newText]; + gtk_list_store_set (list, &iter, + PLM_VALUE_COL, [newText UTF8String], + -1); + [delegate endEdit]; + } + } + + gtk_tree_path_free (path); +} + +- (void) updatePath:(gchar*)pathStr withName:(NSString*)newText { + if (![newText isValidTikzPropertyNameOrValue]) + return; + + GtkTreeIter iter; + GtkTreePath *path = gtk_tree_path_new_from_string (pathStr); + + if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (list), &iter, path)) { + gtk_tree_path_free (path); + return; + } + + void *propPtr; + gtk_tree_model_get (GTK_TREE_MODEL (list), &iter, + PLM_PROPERTY_COL, &propPtr, + -1); + GraphElementProperty *prop = (GraphElementProperty*)propPtr; + + if (![delegate respondsToSelector:@selector(startEdit)] || [delegate startEdit]) { + if ([newText isEqualToString:@""]) { + [data removeObjectIdenticalTo:prop]; + gtk_list_store_remove (list, &iter); + [prop release]; + } else { + [prop setKey:newText]; + gtk_list_store_set (list, &iter, + PLM_NAME_COL, [newText UTF8String], + -1); + } + [delegate endEdit]; + } + + gtk_tree_path_free (path); +} + +- (void) addProperty { + GtkTreeIter iter; + GraphElementProperty *p = [[GraphElementProperty alloc] initWithPropertyValue:@"" forKey:@"new property"]; + if (![delegate respondsToSelector:@selector(startEdit)] || [delegate startEdit]) { + [data addObject:p]; + gint pos = [data count] - 1; + gtk_list_store_insert_with_values (list, &iter, pos, + PLM_NAME_COL, "new property", + PLM_VALUE_COL, "", + PLM_IS_PROPERTY_COL, TRUE, + PLM_PROPERTY_COL, (void *)p, + -1); + [delegate endEdit]; + } else { + [p release]; + } +} + +- (void) addAtom { + GtkTreeIter iter; + GraphElementProperty *p = [[GraphElementProperty alloc] initWithAtomName:@"new atom"]; + if (![delegate respondsToSelector:@selector(startEdit)] || [delegate startEdit]) { + [data addObject:p]; + gint pos = [data count] - 1; + gtk_list_store_insert_with_values (list, &iter, pos, + PLM_NAME_COL, "new atom", + PLM_VALUE_COL, [[p value] UTF8String], + PLM_IS_PROPERTY_COL, FALSE, + PLM_PROPERTY_COL, (void *)p, + -1); + [delegate endEdit]; + } else { + [p release]; + } +} + +- (void) removeSelected { + GtkTreeSelection *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view)); + GList *selPaths = gtk_tree_selection_get_selected_rows (selection, NULL); + GList *selIters = NULL; + + // Convert to iters, as GtkListStore has persistent iters + GList *curr = selPaths; + while (curr != NULL) { + GtkTreeIter iter; + gtk_tree_model_get_iter (GTK_TREE_MODEL (list), + &iter, + (GtkTreePath*)curr->data); + selIters = g_list_prepend (selIters, gtk_tree_iter_copy (&iter)); + curr = g_list_next (curr); + } + + // remove all iters + curr = selIters; + while (curr != NULL) { + GtkTreeIter *iter = (GtkTreeIter*)curr->data; + void *propPtr; + gtk_tree_model_get (GTK_TREE_MODEL (list), iter, + PLM_PROPERTY_COL, &propPtr, + -1); + GraphElementProperty *prop = (GraphElementProperty*)propPtr; + if (![delegate respondsToSelector:@selector(startEdit)] || [delegate startEdit]) { + [data removeObjectIdenticalTo:prop]; + gtk_list_store_remove (list, iter); + [prop release]; + [delegate endEdit]; + } + curr = g_list_next (curr); + } + + g_list_foreach (selIters, (GFunc) gtk_tree_iter_free, NULL); + g_list_free (selIters); + g_list_foreach (selPaths, (GFunc) gtk_tree_path_free, NULL); + g_list_free (selPaths); +} + +- (void) selectionCountChanged:(int)count { + gtk_widget_set_sensitive (removeButton, count > 0); +} + +- (void) clearStore { + GtkTreeIter iter; + if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list), &iter)) { + do { + void *prop; + gtk_tree_model_get (GTK_TREE_MODEL (list), &iter, + PLM_PROPERTY_COL, &prop, + -1); + [(id)prop release]; + } while (gtk_tree_model_iter_next (GTK_TREE_MODEL (list), &iter)); + gtk_list_store_clear (list); + } +} +@end + +// }}} +// {{{ GTK+ callbacks + +static void value_edited_cb (GtkCellRendererText *renderer, + gchar *path, + gchar *new_text, + PropertyListEditor *editor) +{ + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [editor updatePath:path withValue:[NSString stringWithUTF8String:new_text]]; + [pool drain]; +} + +static void name_edited_cb (GtkCellRendererText *renderer, + gchar *path, + gchar *new_text, + PropertyListEditor *editor) +{ + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [editor updatePath:path withName:[NSString stringWithUTF8String:new_text]]; + [pool drain]; +} + +static void add_prop_clicked_cb (GtkButton *button, + PropertyListEditor *editor) +{ + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [editor addProperty]; + [pool drain]; +} + +static void add_atom_clicked_cb (GtkButton *button, + PropertyListEditor *editor) +{ + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [editor addAtom]; + [pool drain]; +} + +static void remove_clicked_cb (GtkButton *button, + PropertyListEditor *editor) +{ + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [editor removeSelected]; + [pool drain]; +} + +static void text_editing_started (GtkCellRenderer *cell, + GtkCellEditable *editable, + const gchar *path, + PropertyListEditor *editor) +{ + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + if (GTK_IS_EDITABLE (editable) && GTK_IS_WIDGET (editable)) { + g_signal_handlers_disconnect_by_func (G_OBJECT (editable), + G_CALLBACK (text_changed_cb), + editor); + widget_clear_error (GTK_WIDGET (editable)); + g_signal_connect (G_OBJECT (editable), + "changed", + G_CALLBACK (text_changed_cb), + editor); + } + + [pool drain]; +} + +static void text_changed_cb (GtkEditable *editable, PropertyListEditor *pane) +{ + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + NSString *newValue = gtk_editable_get_string (editable, 0, -1); + if (![newValue isValidTikzPropertyNameOrValue]) { + widget_set_error (GTK_WIDGET (editable)); + } else { + widget_clear_error (GTK_WIDGET (editable)); + } + + [pool drain]; +} + +static void selection_changed_cb (GtkTreeSelection *selection, + PropertyListEditor *pane) +{ + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + int selcount = gtk_tree_selection_count_selected_rows (selection); + [pane selectionCountChanged:selcount]; + [pool drain]; +} + +// }}} + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/RecentManager.h b/tikzit-old/src/gtk/RecentManager.h new file mode 100644 index 0000000..e2c2793 --- /dev/null +++ b/tikzit-old/src/gtk/RecentManager.h @@ -0,0 +1,30 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" + +@interface RecentManager: NSObject { +} + ++ (RecentManager*) defaultManager; + +- (void)addRecentFile:(NSString*)path; +- (void)removeRecentFile:(NSString*)path; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/RecentManager.m b/tikzit-old/src/gtk/RecentManager.m new file mode 100644 index 0000000..c6074c6 --- /dev/null +++ b/tikzit-old/src/gtk/RecentManager.m @@ -0,0 +1,74 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "RecentManager.h" +#import + +static RecentManager *defMan = nil; + +@implementation RecentManager +- (id) init { + self = [super init]; + return self; +} + ++ (RecentManager*) defaultManager { + if (defMan == nil) { + defMan = [[self alloc] init]; + } + return defMan; +} + +- (void)addRecentFile:(NSString*)path { + NSError *error = nil; + gchar *uri = [path glibUriWithError:&error]; + if (error) { + logError (error, @"Could not add recent file"); + return; + } + + GtkRecentData recent_data; + recent_data.display_name = NULL; + recent_data.description = NULL; + recent_data.mime_type = "text/x-tikz"; + recent_data.app_name = (gchar *) g_get_application_name (); + recent_data.app_exec = g_strjoin (" ", g_get_prgname (), "%u", NULL); + recent_data.groups = NULL; + recent_data.is_private = FALSE; + + gtk_recent_manager_add_full (gtk_recent_manager_get_default(), uri, &recent_data); + + g_free (uri); + g_free (recent_data.app_exec); +} + +- (void)removeRecentFile:(NSString*)path { + NSError *error = nil; + gchar *uri = [path glibUriWithError:&error]; + if (error) { + logError (error, @"Could not remove recent file"); + return; + } + + gtk_recent_manager_remove_item (gtk_recent_manager_get_default(), uri, NULL); + + g_free (uri); +} + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/SelectTool.h b/tikzit-old/src/gtk/SelectTool.h new file mode 100644 index 0000000..65f511a --- /dev/null +++ b/tikzit-old/src/gtk/SelectTool.h @@ -0,0 +1,63 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import "Tool.h" + +@class Edge; +@class Node; + +// FIXME: replace this with delegates +typedef enum { + QuietState, + SelectBoxState, + ToggleSelectState, + MoveSelectedNodesState, + DragEdgeControlPoint1, + DragEdgeControlPoint2 +} SelectToolState; + +typedef enum { + DragSelectsNodes = 1, + DragSelectsEdges = 2, + DragSelectsBoth = DragSelectsNodes | DragSelectsEdges +} DragSelectMode; + +@interface SelectTool : NSObject { + GraphRenderer *renderer; + SelectToolState state; + float edgeFuzz; + DragSelectMode dragSelectMode; + NSPoint dragOrigin; + Node *leaderNode; + NSPoint oldLeaderPos; + Edge *modifyEdge; + NSRect selectionBox; + NSMutableSet *selectionBoxContents; + + GtkWidget *configWidget; + GSList *dragSelectModeButtons; +} + +@property (assign) float edgeFuzz; +@property (assign) DragSelectMode dragSelectMode; + +- (id) init; ++ (id) tool; +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/SelectTool.m b/tikzit-old/src/gtk/SelectTool.m new file mode 100644 index 0000000..b3121ae --- /dev/null +++ b/tikzit-old/src/gtk/SelectTool.m @@ -0,0 +1,590 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "SelectTool.h" + +#import "Configuration.h" +#import "Edge+Render.h" +#import "GraphRenderer.h" +#import "TikzDocument.h" +#import "tzstockitems.h" + +#import + +#define DRAG_SELECT_MODE_KEY "tikzit-drag-select-mode" + +static const InputMask unionSelectMask = ShiftMask; + +static void drag_select_mode_cb (GtkToggleButton *button, SelectTool *tool); + +@interface SelectTool (Private) +- (TikzDocument*) doc; +- (void) shiftNodesByMovingLeader:(Node*)leader to:(NSPoint)to; +- (void) deselectAllNodes; +- (void) deselectAllEdges; +- (void) deselectAll; +- (BOOL) circleWithCenter:(NSPoint)c andRadius:(float)r containsPoint:(NSPoint)p; +- (void) lookForControlPointAt:(NSPoint)pos; +- (void) setSelectionBox:(NSRect)box; +- (void) clearSelectionBox; +- (BOOL) selectionBoxContainsNode:(Node*)node; +@end + +@implementation SelectTool +- (NSString*) name { return @"Select"; } +- (const gchar*) stockId { return TIKZIT_STOCK_SELECT; } +- (NSString*) helpText { return @"Select, move and edit nodes and edges"; } +- (NSString*) shortcut { return @"s"; } +@synthesize configurationWidget=configWidget; +@synthesize edgeFuzz; + ++ (id) tool { + return [[[self alloc] init] autorelease]; +} + +- (id) init { + self = [super init]; + + if (self) { + state = QuietState; + edgeFuzz = 3.0f; + dragSelectMode = DragSelectsNodes; + + configWidget = gtk_vbox_new (FALSE, 0); + g_object_ref_sink (configWidget); + + GtkWidget *label = gtk_label_new ("Drag selects:"); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_box_pack_start (GTK_BOX (configWidget), + label, + FALSE, + FALSE, + 0); + + GtkWidget *nodeOpt = gtk_radio_button_new_with_label (NULL, "nodes (N)"); + g_object_set_data (G_OBJECT (nodeOpt), + DRAG_SELECT_MODE_KEY, + (gpointer)DragSelectsNodes); + gtk_box_pack_start (GTK_BOX (configWidget), + nodeOpt, + FALSE, + FALSE, + 0); + g_signal_connect (G_OBJECT (nodeOpt), + "toggled", + G_CALLBACK (drag_select_mode_cb), + self); + + GtkWidget *edgeOpt = gtk_radio_button_new_with_label ( + gtk_radio_button_get_group (GTK_RADIO_BUTTON (nodeOpt)), + "edges (E)"); + g_object_set_data (G_OBJECT (edgeOpt), + DRAG_SELECT_MODE_KEY, + (gpointer)DragSelectsEdges); + gtk_box_pack_start (GTK_BOX (configWidget), + edgeOpt, + FALSE, + FALSE, + 0); + g_signal_connect (G_OBJECT (edgeOpt), + "toggled", + G_CALLBACK (drag_select_mode_cb), + self); + + GtkWidget *bothOpt = gtk_radio_button_new_with_label ( + gtk_radio_button_get_group (GTK_RADIO_BUTTON (edgeOpt)), + "both (B)"); + g_object_set_data (G_OBJECT (bothOpt), + DRAG_SELECT_MODE_KEY, + (gpointer)DragSelectsBoth); + gtk_box_pack_start (GTK_BOX (configWidget), + bothOpt, + FALSE, + FALSE, + 0); + g_signal_connect (G_OBJECT (bothOpt), + "toggled", + G_CALLBACK (drag_select_mode_cb), + self); + dragSelectModeButtons = gtk_radio_button_get_group (GTK_RADIO_BUTTON (bothOpt)); + + gtk_widget_show_all (configWidget); + } + + return self; +} + +- (void) dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + + [renderer release]; + [leaderNode release]; + [modifyEdge release]; + + g_object_unref (G_OBJECT (configWidget)); + + [super dealloc]; +} + +- (DragSelectMode) dragSelectMode { + return dragSelectMode; +} + +- (void) setDragSelectMode:(DragSelectMode)mode { + if (dragSelectMode == mode) + return; + + dragSelectMode = mode; + + GSList *entry = dragSelectModeButtons; + while (entry) { + GtkToggleButton *button = GTK_TOGGLE_BUTTON (entry->data); + DragSelectMode buttonMode = + (DragSelectMode) g_object_get_data ( + G_OBJECT (button), + DRAG_SELECT_MODE_KEY); + if (buttonMode == dragSelectMode) { + gtk_toggle_button_set_active (button, TRUE); + break; + } + + entry = g_slist_next (entry); + } +} + +- (GraphRenderer*) activeRenderer { return renderer; } +- (void) setActiveRenderer:(GraphRenderer*)r { + if (r == renderer) + return; + + [r retain]; + [renderer release]; + renderer = r; + + state = QuietState; +} + +- (void) mousePressAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { + if (button != LeftButton) + return; + + dragOrigin = pos; + + // we should already be in a quiet state, but no harm in making sure + state = QuietState; + + modifyEdge = nil; + [self lookForControlPointAt:pos]; + + if (modifyEdge == nil) { + // we didn't find a control point + + BOOL unionSelect = (mask & unionSelectMask); + + leaderNode = [renderer anyNodeAt:pos]; + // if we hit a node, deselect other nodes (if Shift is up) and go to move mode + if (leaderNode != nil) { + BOOL alreadySelected = [[self doc] isNodeSelected:leaderNode]; + if (!unionSelect && !alreadySelected) { + [self deselectAll]; + } + if (unionSelect && alreadySelected) { + state = ToggleSelectState; + } else { + [[[self doc] pickSupport] selectNode:leaderNode]; + state = MoveSelectedNodesState; + oldLeaderPos = [leaderNode point]; + [[self doc] startShiftNodes:[[[self doc] pickSupport] selectedNodes]]; + } + } + + // if mouse did not hit a node, check if mouse hit an edge + if (leaderNode == nil) { + Edge *edge = [renderer anyEdgeAt:pos withFuzz:edgeFuzz]; + if (edge != nil) { + BOOL alreadySelected = [[self doc] isEdgeSelected:edge]; + if (!unionSelect) { + [self deselectAll]; + } + if (unionSelect && alreadySelected) { + [[[self doc] pickSupport] deselectEdge:edge]; + } else { + [[[self doc] pickSupport] selectEdge:edge]; + } + } else { + // if mouse did not hit anything, put us in box mode + if (!unionSelect) { + [self deselectAll]; + } + [renderer clearHighlightedNodes]; + state = SelectBoxState; + } + } + } +} + +- (void) mouseMoveTo:(NSPoint)pos withButtons:(MouseButton)buttons andMask:(InputMask)mask { + if (!(buttons & LeftButton)) + return; + + Transformer *transformer = [renderer transformer]; + + if (state == ToggleSelectState) { + state = MoveSelectedNodesState; + oldLeaderPos = [leaderNode point]; + [[self doc] startShiftNodes:[[[self doc] pickSupport] selectedNodes]]; + } + + if (state == SelectBoxState) { + [self setSelectionBox:NSRectAroundPoints(dragOrigin, pos)]; + + NSEnumerator *enumerator = [[self doc] nodeEnumerator]; + Node *node; + while ((node = [enumerator nextObject]) != nil) { + NSPoint nodePos = [transformer toScreen:[node point]]; + if (NSPointInRect(nodePos, selectionBox)) { + [renderer setNode:node highlighted:YES]; + } else { + [renderer setNode:node highlighted:NO]; + } + } + } else if (state == MoveSelectedNodesState) { + if (leaderNode != nil) { + [self shiftNodesByMovingLeader:leaderNode to:pos]; + NSPoint shiftSoFar; + shiftSoFar.x = [leaderNode point].x - oldLeaderPos.x; + shiftSoFar.y = [leaderNode point].y - oldLeaderPos.y; + [[self doc] shiftNodesUpdate:shiftSoFar]; + } + } else if (state == DragEdgeControlPoint1 || state == DragEdgeControlPoint2) { + // invalidate once before we start changing it: we may be shrinking + // the control circles + [[self doc] modifyEdgeCheckPoint]; + if (state == DragEdgeControlPoint1) { + [modifyEdge moveCp1To:[transformer fromScreen:pos] + withWeightCourseness:0.1f + andBendCourseness:15 + forceLinkControlPoints:(mask & ControlMask)]; + } else { + [modifyEdge moveCp2To:[transformer fromScreen:pos] + withWeightCourseness:0.1f + andBendCourseness:15 + forceLinkControlPoints:(mask & ControlMask)]; + } + [[self doc] modifyEdgeCheckPoint]; + } +} + +- (void) mouseReleaseAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { + if (button != LeftButton) + return; + + if (state == SelectBoxState) { + PickSupport *ps = [[self doc] pickSupport]; + Transformer *transformer = [renderer transformer]; + + if (!(mask & unionSelectMask)) { + [ps deselectAllNodes]; + [ps deselectAllEdges]; + } + + Graph *graph = [[self doc] graph]; + if (dragSelectMode & DragSelectsNodes) { + for (Node *node in [graph nodes]) { + NSPoint nodePos = [transformer toScreen:[node point]]; + if (NSPointInRect(nodePos, selectionBox)) { + [ps selectNode:node]; + } + } + } + if (dragSelectMode & DragSelectsEdges) { + for (Edge *edge in [graph edges]) { + NSPoint edgePos = [transformer toScreen:[edge mid]]; + if (NSPointInRect(edgePos, selectionBox)) { + [ps selectEdge:edge]; + } + } + } + + [self clearSelectionBox]; + } else if (state == ToggleSelectState) { + [[[self doc] pickSupport] deselectNode:leaderNode]; + leaderNode = nil; + } else if (state == MoveSelectedNodesState) { + if (NSEqualPoints (oldLeaderPos, [leaderNode point])) { + [[self doc] cancelShiftNodes]; + } else { + [[self doc] endShiftNodes]; + } + leaderNode = nil; + } else if (state == DragEdgeControlPoint1 || state == DragEdgeControlPoint2) { + // FIXME: check if there was any real change + [[self doc] endModifyEdge]; + } + + state = QuietState; +} + +- (void) mouseDoubleClickAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { + if (button != LeftButton) + return; + + if (state != QuietState) { + return; + } + // convert bend mode on edge under mouse cursor + Edge *edge = [renderer anyEdgeAt:pos withFuzz:edgeFuzz]; + if (edge != nil) { + [[self doc] startModifyEdge:edge]; + if ([edge bendMode]==EdgeBendModeBasic) { + [edge convertBendToAngles]; + [edge setBendMode:EdgeBendModeInOut]; + } else { + [edge setBendMode:EdgeBendModeBasic]; + } + [[self doc] endModifyEdge]; + + [self deselectAllEdges]; + [[[self doc] pickSupport] selectEdge:edge]; + } +} + +- (void) keyPressed:(unsigned int)keyVal withMask:(InputMask)mask { + if (keyVal == GDK_KEY_N && mask == ShiftMask) { + [self setDragSelectMode:DragSelectsNodes]; + } else if (keyVal == GDK_KEY_E && mask == ShiftMask) { + [self setDragSelectMode:DragSelectsEdges]; + } else if (keyVal == GDK_KEY_B && mask == ShiftMask) { + [self setDragSelectMode:DragSelectsBoth]; + } else if (keyVal == GDK_KEY_D && (!mask || mask == ShiftMask)) { + PickSupport *ps = [[self doc] pickSupport]; + for (Node* node in [ps selectedNodes]) { + NSRect b = [node boundingRect]; + NSLog(@"%@ @ (%f,%f) {style=%@, label=%@, data=%@, bounds=(%f,%f),(%fx%f)}", + [node name], + [node point].x, + [node point].y, + [[node style] name], + [node label], + [[node data] tikzList], + b.origin.x, b.origin.y, b.size.width, b.size.height); + } + for (Edge* edge in [ps selectedEdges]) { + NSRect b = [edge boundingRect]; + NSLog(@"%@:%@->%@:%@ {\n" + @" style=%@, data=%@,\n" + @" bend=%d, weight=%f, inAngle=%d, outAngle=%d, bendMode=%d,\n" + @" head=(%f,%f), headTan=(%f,%f) leftHeadNormal=(%f,%f), rightHeadNormal=(%f,%f),\n" + @" cp1=(%f,%f),\n" + @" mid=(%f,%f), midTan=(%f,%f), leftNormal=(%f,%f), rightNormal=(%f,%f)\n" + @" cp2=(%f,%f),\n" + @" tail=(%f,%f), tailTan=(%f,%f), leftTailNormal=(%f,%f), rightTailNormal=(%f,%f),\n" + @" isSelfLoop=%s, isStraight=%s,\n" + @" bounds=(%f,%f),(%fx%f)\n" + @"}", + [[edge source] name], + [edge sourceAnchor], + [[edge target] name], + [edge targetAnchor], + [[edge style] name], + [[edge data] tikzList], + [edge bend], + [edge weight], + [edge inAngle], + [edge outAngle], + [edge bendMode], + [edge head].x, + [edge head].y, + [edge headTan].x, + [edge headTan].y, + [edge leftHeadNormal].x, + [edge leftHeadNormal].y, + [edge rightHeadNormal].x, + [edge rightHeadNormal].y, + [edge cp1].x, + [edge cp1].y, + [edge mid].x, + [edge mid].y, + [edge midTan].x, + [edge midTan].y, + [edge leftNormal].x, + [edge leftNormal].y, + [edge rightNormal].x, + [edge rightNormal].y, + [edge cp2].x, + [edge cp2].y, + [edge tail].x, + [edge tail].y, + [edge tailTan].x, + [edge tailTan].y, + [edge leftTailNormal].x, + [edge leftTailNormal].y, + [edge rightTailNormal].x, + [edge rightTailNormal].y, + [edge isSelfLoop] ? "yes" : "no", + [edge isStraight] ? "yes" : "no", + b.origin.x, b.origin.y, b.size.width, b.size.height); + } + } +} + +- (void) renderWithContext:(id)context onSurface:(id)surface { + if (!NSIsEmptyRect (selectionBox)) { + [context saveState]; + + [context setAntialiasMode:AntialiasDisabled]; + [context setLineWidth:1.0]; + [context startPath]; + [context rect:selectionBox]; + RColor fColor = MakeRColor (0.8, 0.8, 0.8, 0.2); + RColor sColor = MakeSolidRColor (0.6, 0.6, 0.6); + [context strokePathWithColor:sColor andFillWithColor:fColor]; + + [context restoreState]; + } +} + +- (void) loadConfiguration:(Configuration*)config { + NSString *mode = [config stringEntry:@"Drag select mode" + inGroup:@"SelectTool"]; + if ([mode isEqualToString:@"nodes"]) { + [self setDragSelectMode:DragSelectsNodes]; + } else if ([mode isEqualToString:@"edges"]) { + [self setDragSelectMode:DragSelectsEdges]; + } else if ([mode isEqualToString:@"both"]) { + [self setDragSelectMode:DragSelectsBoth]; + } +} + +- (void) saveConfiguration:(Configuration*)config { + switch (dragSelectMode) { + case DragSelectsNodes: + [config setStringEntry:@"Drag select mode" + inGroup:@"SelectTool" + value:@"nodes"]; + break; + case DragSelectsEdges: + [config setStringEntry:@"Drag select mode" + inGroup:@"SelectTool" + value:@"edges"]; + break; + case DragSelectsBoth: + [config setStringEntry:@"Drag select mode" + inGroup:@"SelectTool" + value:@"both"]; + break; + } +} + +@end + +@implementation SelectTool (Private) +- (TikzDocument*) doc { + return [renderer document]; +} + +- (void) shiftNodesByMovingLeader:(Node*)leader to:(NSPoint)to { + Transformer *transformer = [renderer transformer]; + + NSPoint from = [transformer toScreen:[leader point]]; + to = [[renderer grid] snapScreenPoint:to]; + float dx = to.x - from.x; + float dy = to.y - from.y; + + for (Node *node in [[[self doc] pickSupport] selectedNodes]) { + NSPoint p = [transformer toScreen:[node point]]; + p.x += dx; + p.y += dy; + [node setPoint:[transformer fromScreen:p]]; + } +} + +- (void) deselectAllNodes { + [[[self doc] pickSupport] deselectAllNodes]; +} + +- (void) deselectAllEdges { + [[[self doc] pickSupport] deselectAllEdges]; +} + +- (void) deselectAll { + [[[self doc] pickSupport] deselectAllNodes]; + [[[self doc] pickSupport] deselectAllEdges]; +} + +- (BOOL) circleWithCenter:(NSPoint)c andRadius:(float)r containsPoint:(NSPoint)p { + return (NSDistanceBetweenPoints(c, p) <= r); +} + +- (void) lookForControlPointAt:(NSPoint)pos { + const float cpr = [Edge controlPointRadius]; + for (Edge *e in [[[self doc] pickSupport] selectedEdges]) { + NSPoint cp1 = [[renderer transformer] toScreen:[e cp1]]; + if ([self circleWithCenter:cp1 andRadius:cpr containsPoint:pos]) { + state = DragEdgeControlPoint1; + modifyEdge = e; + [[self doc] startModifyEdge:e]; + return; + } + NSPoint cp2 = [[renderer transformer] toScreen:[e cp2]]; + if ([self circleWithCenter:cp2 andRadius:cpr containsPoint:pos]) { + state = DragEdgeControlPoint2; + modifyEdge = e; + [[self doc] startModifyEdge:e]; + return; + } + } +} + +- (void) setSelectionBox:(NSRect)box { + NSRect invRect = NSUnionRect (selectionBox, box); + selectionBox = box; + [renderer invalidateRect:NSInsetRect (invRect, -2, -2)]; +} + +- (void) clearSelectionBox { + NSRect oldRect = selectionBox; + + selectionBox = NSZeroRect; + + [renderer invalidateRect:NSInsetRect (oldRect, -2, -2)]; + [renderer clearHighlightedNodes]; +} + +- (BOOL) selectionBoxContainsNode:(Node*)node { + if (!NSIsEmptyRect (selectionBox)) + return NO; + + Transformer *transf = [[renderer surface] transformer]; + NSPoint screenPt = [transf toScreen:[node point]]; + return NSPointInRect(screenPt, selectionBox); +} +@end + +static void drag_select_mode_cb (GtkToggleButton *button, SelectTool *tool) { + if (gtk_toggle_button_get_active (button)) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + DragSelectMode buttonMode = + (DragSelectMode) g_object_get_data ( + G_OBJECT (button), + DRAG_SELECT_MODE_KEY); + [tool setDragSelectMode:buttonMode]; + [pool drain]; + } +} + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/SelectionPane.h b/tikzit-old/src/gtk/SelectionPane.h new file mode 100644 index 0000000..57a766a --- /dev/null +++ b/tikzit-old/src/gtk/SelectionPane.h @@ -0,0 +1,56 @@ +/* + * Copyright 2011-2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import + +@class Configuration; +@class EdgeStylesModel; +@class NodeStylesModel; +@class StyleManager; +@class TikzDocument; + +@interface SelectionPane: NSObject { + TikzDocument *document; + + NodeStylesModel *nodeStylesModel; + EdgeStylesModel *edgeStylesModel; + + GtkWidget *layout; + + GtkWidget *nodeStyleCombo; + GtkWidget *applyNodeStyleButton; + GtkWidget *clearNodeStyleButton; + GtkWidget *edgeStyleCombo; + GtkWidget *applyEdgeStyleButton; + GtkWidget *clearEdgeStyleButton; +} + +@property (retain) TikzDocument *document; +@property (assign) BOOL visible; +@property (readonly) GtkWidget *gtkWidget; + +- (id) initWithStyleManager:(StyleManager*)mgr; +- (id) initWithNodeStylesModel:(NodeStylesModel*)nsm + andEdgeStylesModel:(EdgeStylesModel*)esm; + +- (void) loadConfiguration:(Configuration*)config; +- (void) saveConfiguration:(Configuration*)config; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/SelectionPane.m b/tikzit-old/src/gtk/SelectionPane.m new file mode 100644 index 0000000..2931258 --- /dev/null +++ b/tikzit-old/src/gtk/SelectionPane.m @@ -0,0 +1,432 @@ +/* + * Copyright 2011-2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "SelectionPane.h" + +#import "Configuration.h" +#import "EdgeStylesModel.h" +#import "NodeStylesModel.h" +#import "TikzDocument.h" + +#import "gtkhelpers.h" + +// {{{ Internal interfaces + +static void node_style_changed_cb (GtkComboBox *widget, SelectionPane *pane); +static void apply_node_style_button_cb (GtkButton *widget, SelectionPane *pane); +static void clear_node_style_button_cb (GtkButton *widget, SelectionPane *pane); +static void edge_style_changed_cb (GtkComboBox *widget, SelectionPane *pane); +static void apply_edge_style_button_cb (GtkButton *widget, SelectionPane *pane); +static void clear_edge_style_button_cb (GtkButton *widget, SelectionPane *pane); + +static void setup_style_cell_layout (GtkCellLayout *cell_layout, gint pixbuf_col, gint name_col); + +@interface SelectionPane (Notifications) +- (void) nodeSelectionChanged:(NSNotification*)n; +- (void) edgeSelectionChanged:(NSNotification*)n; +@end + +@interface SelectionPane (Private) +- (void) _updateNodeStyleButtons; +- (void) _updateEdgeStyleButtons; +- (NodeStyle*) _selectedNodeStyle; +- (EdgeStyle*) _selectedEdgeStyle; +- (void) _applyNodeStyle; +- (void) _clearNodeStyle; +- (void) _applyEdgeStyle; +- (void) _clearEdgeStyle; +@end + +// }}} +// {{{ API + +@implementation SelectionPane + +- (id) init { + [self release]; + return nil; +} + +- (id) initWithStyleManager:(StyleManager*)sm { + return [self initWithNodeStylesModel:[NodeStylesModel modelWithStyleManager:sm] + andEdgeStylesModel:[EdgeStylesModel modelWithStyleManager:sm]]; +} + +- (id) initWithNodeStylesModel:(NodeStylesModel*)nsm + andEdgeStylesModel:(EdgeStylesModel*)esm { + self = [super init]; + + if (self) { + nodeStylesModel = [nsm retain]; + edgeStylesModel = [esm retain]; + + layout = gtk_vbox_new (FALSE, 0); + g_object_ref_sink (layout); + gtk_widget_show (layout); + + GtkWidget *label = gtk_label_new ("Selection"); + label_set_bold (GTK_LABEL (label)); + gtk_widget_show (label); + gtk_box_pack_start (GTK_BOX (layout), label, + FALSE, FALSE, 0); + + GtkWidget *lvl1_box = gtk_vbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (layout), lvl1_box, + FALSE, FALSE, 3); + + nodeStyleCombo = gtk_combo_box_new_with_model ([nodeStylesModel model]); + g_object_ref_sink (nodeStyleCombo); + setup_style_cell_layout (GTK_CELL_LAYOUT (nodeStyleCombo), + NODE_STYLES_ICON_COL, + NODE_STYLES_NAME_COL); + g_signal_connect (G_OBJECT (nodeStyleCombo), + "changed", + G_CALLBACK (node_style_changed_cb), + self); + gtk_box_pack_start (GTK_BOX (lvl1_box), nodeStyleCombo, + FALSE, FALSE, 0); + + GtkWidget *lvl2_box = gtk_hbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (lvl1_box), lvl2_box, + FALSE, FALSE, 0); + + applyNodeStyleButton = gtk_button_new_with_label ("Apply"); + g_object_ref_sink (applyNodeStyleButton); + gtk_widget_set_tooltip_text (applyNodeStyleButton, "Apply style to selected nodes"); + gtk_widget_set_sensitive (applyNodeStyleButton, FALSE); + g_signal_connect (G_OBJECT (applyNodeStyleButton), + "clicked", + G_CALLBACK (apply_node_style_button_cb), + self); + gtk_box_pack_start (GTK_BOX (lvl2_box), applyNodeStyleButton, + FALSE, FALSE, 0); + + clearNodeStyleButton = gtk_button_new_with_label ("Clear"); + g_object_ref_sink (clearNodeStyleButton); + gtk_widget_set_tooltip_text (clearNodeStyleButton, "Clear style from selected nodes"); + gtk_widget_set_sensitive (clearNodeStyleButton, FALSE); + g_signal_connect (G_OBJECT (clearNodeStyleButton), + "clicked", + G_CALLBACK (clear_node_style_button_cb), + self); + gtk_box_pack_start (GTK_BOX (lvl2_box), clearNodeStyleButton, + FALSE, FALSE, 0); + + lvl1_box = gtk_vbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (layout), lvl1_box, + FALSE, FALSE, 3); + + edgeStyleCombo = gtk_combo_box_new_with_model ([edgeStylesModel model]); + g_object_ref_sink (edgeStyleCombo); + setup_style_cell_layout (GTK_CELL_LAYOUT (edgeStyleCombo), + EDGE_STYLES_ICON_COL, + EDGE_STYLES_NAME_COL); + g_signal_connect (G_OBJECT (edgeStyleCombo), + "changed", + G_CALLBACK (edge_style_changed_cb), + self); + gtk_box_pack_start (GTK_BOX (lvl1_box), edgeStyleCombo, + FALSE, FALSE, 0); + + lvl2_box = gtk_hbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX (lvl1_box), lvl2_box, + FALSE, FALSE, 0); + + applyEdgeStyleButton = gtk_button_new_with_label ("Apply"); + g_object_ref_sink (applyEdgeStyleButton); + gtk_widget_set_tooltip_text (applyEdgeStyleButton, "Apply style to selected edges"); + gtk_widget_set_sensitive (applyEdgeStyleButton, FALSE); + g_signal_connect (G_OBJECT (applyEdgeStyleButton), + "clicked", + G_CALLBACK (apply_edge_style_button_cb), + self); + gtk_box_pack_start (GTK_BOX (lvl2_box), applyEdgeStyleButton, + FALSE, FALSE, 0); + + clearEdgeStyleButton = gtk_button_new_with_label ("Clear"); + g_object_ref_sink (clearEdgeStyleButton); + gtk_widget_set_tooltip_text (clearEdgeStyleButton, "Clear style from selected edges"); + gtk_widget_set_sensitive (clearEdgeStyleButton, FALSE); + g_signal_connect (G_OBJECT (clearEdgeStyleButton), + "clicked", + G_CALLBACK (clear_edge_style_button_cb), + self); + gtk_box_pack_start (GTK_BOX (lvl2_box), clearEdgeStyleButton, + FALSE, FALSE, 0); + + gtk_widget_show_all (layout); + } + + return self; +} + +- (void) dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + + g_object_unref (nodeStyleCombo); + g_object_unref (applyNodeStyleButton); + g_object_unref (clearNodeStyleButton); + g_object_unref (edgeStyleCombo); + g_object_unref (applyEdgeStyleButton); + g_object_unref (clearEdgeStyleButton); + + g_object_unref (layout); + + [nodeStylesModel release]; + [edgeStylesModel release]; + + [document release]; + + [super dealloc]; +} + +- (TikzDocument*) document { + return document; +} + +- (void) setDocument:(TikzDocument*)doc { + if (document != nil) { + [[NSNotificationCenter defaultCenter] + removeObserver:self + name:nil + object:[document pickSupport]]; + } + + [doc retain]; + [document release]; + document = doc; + + if (doc != nil) { + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(nodeSelectionChanged:) + name:@"NodeSelectionChanged" object:[doc pickSupport]]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(edgeSelectionChanged:) + name:@"EdgeSelectionChanged" object:[doc pickSupport]]; + } + + [self _updateNodeStyleButtons]; + [self _updateEdgeStyleButtons]; +} + +- (BOOL) visible { + return gtk_widget_get_visible (layout); +} + +- (void) setVisible:(BOOL)visible { + gtk_widget_set_visible (layout, visible); +} + +- (GtkWidget*) gtkWidget { + return layout; +} + +- (void) loadConfiguration:(Configuration*)config { + NSString *nodeStyleName = [config stringEntry:@"SelectedNodeStyle" + inGroup:@"SelectionPane" + withDefault:nil]; + NodeStyle *nodeStyle = [[nodeStylesModel styleManager] nodeStyleForName:nodeStyleName]; + if (nodeStyle == nil) { + gtk_combo_box_set_active (GTK_COMBO_BOX (nodeStyleCombo), -1); + } else { + GtkTreeIter *iter = [nodeStylesModel iterFromStyle:nodeStyle]; + if (iter) { + gtk_combo_box_set_active_iter (GTK_COMBO_BOX (nodeStyleCombo), iter); + gtk_tree_iter_free (iter); + } + } + + NSString *edgeStyleName = [config stringEntry:@"SelectedEdgeStyle" + inGroup:@"SelectionPane" + withDefault:nil]; + EdgeStyle *edgeStyle = [[edgeStylesModel styleManager] edgeStyleForName:edgeStyleName]; + if (edgeStyle == nil) { + gtk_combo_box_set_active (GTK_COMBO_BOX (edgeStyleCombo), -1); + } else { + GtkTreeIter *iter = [edgeStylesModel iterFromStyle:edgeStyle]; + if (iter) { + gtk_combo_box_set_active_iter (GTK_COMBO_BOX (edgeStyleCombo), iter); + gtk_tree_iter_free (iter); + } + } +} + +- (void) saveConfiguration:(Configuration*)config { + [config setStringEntry:@"SelectedNodeStyle" + inGroup:@"SelectionPane" + value:[[self _selectedNodeStyle] name]]; + [config setStringEntry:@"SelectedEdgeStyle" + inGroup:@"SelectionPane" + value:[[self _selectedEdgeStyle] name]]; +} + +@end + +// }}} +// {{{ Notifications + +@implementation SelectionPane (Notifications) +- (void) nodeSelectionChanged:(NSNotification*)n { + [self _updateNodeStyleButtons]; +} + +- (void) edgeSelectionChanged:(NSNotification*)n { + [self _updateEdgeStyleButtons]; +} +@end + +// }}} +// {{{ Private + +@implementation SelectionPane (Private) +- (void) _updateNodeStyleButtons { + gboolean hasNodeSelection = [[[document pickSupport] selectedNodes] count] > 0; + + gtk_widget_set_sensitive (applyNodeStyleButton, + hasNodeSelection && [self _selectedNodeStyle] != nil); + gtk_widget_set_sensitive (clearNodeStyleButton, hasNodeSelection); +} + +- (void) _updateEdgeStyleButtons { + gboolean hasEdgeSelection = [[[document pickSupport] selectedEdges] count] > 0; + + gtk_widget_set_sensitive (applyEdgeStyleButton, + hasEdgeSelection && [self _selectedEdgeStyle] != nil); + gtk_widget_set_sensitive (clearEdgeStyleButton, hasEdgeSelection); +} + +- (NodeStyle*) _selectedNodeStyle { + GtkTreeIter iter; + if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (nodeStyleCombo), &iter)) { + return [nodeStylesModel styleFromIter:&iter]; + } else { + return nil; + } +} + +- (EdgeStyle*) _selectedEdgeStyle { + GtkTreeIter iter; + if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (edgeStyleCombo), &iter)) { + return [edgeStylesModel styleFromIter:&iter]; + } else { + return nil; + } +} + +- (void) _applyNodeStyle { + [document startModifyNodes:[[document pickSupport] selectedNodes]]; + + NodeStyle *style = [self _selectedNodeStyle]; + for (Node *node in [[document pickSupport] selectedNodes]) { + [node setStyle:style]; + } + + [document endModifyNodes]; +} + +- (void) _clearNodeStyle { + [document startModifyNodes:[[document pickSupport] selectedNodes]]; + + for (Node *node in [[document pickSupport] selectedNodes]) { + [node setStyle:nil]; + } + + [document endModifyNodes]; +} + +- (void) _applyEdgeStyle { + [document startModifyEdges:[[document pickSupport] selectedEdges]]; + + EdgeStyle *style = [self _selectedEdgeStyle]; + for (Edge *edge in [[document pickSupport] selectedEdges]) { + [edge setStyle:style]; + } + + [document endModifyEdges]; +} + +- (void) _clearEdgeStyle { + [document startModifyEdges:[[document pickSupport] selectedEdges]]; + + for (Edge *edge in [[document pickSupport] selectedEdges]) { + [edge setStyle:nil]; + } + + [document endModifyEdges]; +} +@end + +// }}} +// {{{ GTK+ callbacks + +static void node_style_changed_cb (GtkComboBox *widget, SelectionPane *pane) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [pane _updateNodeStyleButtons]; + [pool drain]; +} + +static void apply_node_style_button_cb (GtkButton *widget, SelectionPane *pane) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [pane _applyNodeStyle]; + [pool drain]; +} + +static void clear_node_style_button_cb (GtkButton *widget, SelectionPane *pane) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [pane _clearNodeStyle]; + [pool drain]; +} + +static void edge_style_changed_cb (GtkComboBox *widget, SelectionPane *pane) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [pane _updateEdgeStyleButtons]; + [pool drain]; +} + +static void apply_edge_style_button_cb (GtkButton *widget, SelectionPane *pane) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [pane _applyEdgeStyle]; + [pool drain]; +} + +static void clear_edge_style_button_cb (GtkButton *widget, SelectionPane *pane) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [pane _clearEdgeStyle]; + [pool drain]; +} + +// }}} +// +static void setup_style_cell_layout (GtkCellLayout *cell_layout, gint pixbuf_col, gint name_col) { + gtk_cell_layout_clear (cell_layout); + GtkCellRenderer *pixbuf_renderer = gtk_cell_renderer_pixbuf_new (); + gtk_cell_layout_pack_start (cell_layout, pixbuf_renderer, FALSE); + gtk_cell_layout_set_attributes ( + cell_layout, + pixbuf_renderer, + "pixbuf", pixbuf_col, + NULL); + GtkCellRenderer *text_renderer = gtk_cell_renderer_text_new (); + gtk_cell_layout_pack_start (cell_layout, text_renderer, FALSE); + gtk_cell_layout_set_attributes ( + cell_layout, + text_renderer, + "text", name_col, + NULL); +} + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/SettingsDialog.h b/tikzit-old/src/gtk/SettingsDialog.h new file mode 100644 index 0000000..0f687b3 --- /dev/null +++ b/tikzit-old/src/gtk/SettingsDialog.h @@ -0,0 +1,54 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import + +@class Configuration; +@class EdgeStylesPalette; +@class NodeStylesPalette; +@class StyleManager; + +@interface SettingsDialog: NSObject { + Configuration *configuration; + StyleManager *styleManager; + StyleManager *tempStyleManager; + NodeStylesPalette *nodePalette; + EdgeStylesPalette *edgePalette; + + GtkWindow *parentWindow; + GtkWindow *window; + + // we don't keep any refs, as we control + // the top window + GtkEntry *pdflatexPathEntry; +} + +@property (retain) Configuration *configuration; +@property (retain) StyleManager *styleManager; +@property (assign) GtkWindow *parentWindow; +@property (assign,getter=isVisible) BOOL visible; + +- (id) initWithConfiguration:(Configuration*)c andStyleManager:(StyleManager*)m; + +- (void) present; +- (void) show; +- (void) hide; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/SettingsDialog.m b/tikzit-old/src/gtk/SettingsDialog.m new file mode 100644 index 0000000..bdb5db6 --- /dev/null +++ b/tikzit-old/src/gtk/SettingsDialog.m @@ -0,0 +1,328 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "SettingsDialog.h" + +#import "Application.h" +#import "Configuration.h" +#import "EdgeStylesPalette.h" +#import "NodeStylesPalette.h" +#import "StyleManager.h" + +// {{{ Internal interfaces +// {{{ Signals +static gboolean window_delete_event_cb (GtkWidget *widget, + GdkEvent *event, + SettingsDialog *dialog); +static void ok_button_clicked_cb (GtkButton *widget, SettingsDialog *dialog); +static void cancel_button_clicked_cb (GtkButton *widget, SettingsDialog *dialog); +// }}} + +@interface SettingsDialog (Private) +- (void) loadUi; +- (void) save; +- (void) revert; +@end + +// }}} +// {{{ API + +@implementation SettingsDialog + +- (id) init { + [self release]; + return nil; +} + +- (id) initWithConfiguration:(Configuration*)c andStyleManager:(StyleManager*)m { + self = [super init]; + + if (self) { + configuration = [c retain]; + styleManager = [m retain]; + tempStyleManager = [m copy]; + } + + return self; +} + +- (void) dealloc { + if (window) { + gtk_widget_destroy (GTK_WIDGET (window)); + } + if (parentWindow) { + g_object_unref (parentWindow); + } + + [configuration release]; + [tempStyleManager release]; + [styleManager release]; + [nodePalette release]; + [edgePalette release]; + + [super dealloc]; +} + +- (Configuration*) configuration { + return configuration; +} + +- (void) setConfiguration:(Configuration*)c { + [c retain]; + [configuration release]; + configuration = c; + [self revert]; +} + +- (StyleManager*) styleManager { + return styleManager; +} + +- (void) setStyleManager:(StyleManager*)m { + [m retain]; + [styleManager release]; + styleManager = m; +} + +- (GtkWindow*) parentWindow { + return parentWindow; +} + +- (void) setParentWindow:(GtkWindow*)parent { + GtkWindow *oldParent = parentWindow; + + if (parent) + g_object_ref (parent); + parentWindow = parent; + if (oldParent) + g_object_unref (oldParent); + + if (window) { + gtk_window_set_transient_for (window, parentWindow); + } +} + +- (void) present { + [self loadUi]; + [self revert]; + gtk_window_present (GTK_WINDOW (window)); +} + +- (void) show { + [self loadUi]; + [self revert]; + gtk_widget_show (GTK_WIDGET (window)); +} + +- (void) hide { + if (!window) { + return; + } + gtk_widget_hide (GTK_WIDGET (window)); +} + +- (BOOL) isVisible { + if (!window) { + return NO; + } + gboolean visible; + g_object_get (G_OBJECT (window), "visible", &visible, NULL); + return visible ? YES : NO; +} + +- (void) setVisible:(BOOL)visible { + if (visible) { + [self show]; + } else { + [self hide]; + } +} + +@end + +// }}} +// {{{ Private + +@implementation SettingsDialog (Private) +- (void) loadUi { + if (window) { + return; + } + + nodePalette = [[NodeStylesPalette alloc] initWithManager:tempStyleManager]; + edgePalette = [[EdgeStylesPalette alloc] initWithManager:tempStyleManager]; + + window = GTK_WINDOW (gtk_window_new (GTK_WINDOW_TOPLEVEL)); + gtk_window_set_default_size (window, 570, -1); + gtk_window_set_title (window, "TikZiT Configuration"); + gtk_window_set_modal (window, TRUE); + gtk_window_set_position (window, GTK_WIN_POS_CENTER_ON_PARENT); + gtk_window_set_type_hint (window, GDK_WINDOW_TYPE_HINT_DIALOG); + if (parentWindow) { + gtk_window_set_transient_for (window, parentWindow); + } + g_signal_connect (window, + "delete-event", + G_CALLBACK (window_delete_event_cb), + self); + + GtkWidget *mainBox = gtk_vbox_new (FALSE, 18); + gtk_container_set_border_width (GTK_CONTAINER (mainBox), 12); + gtk_container_add (GTK_CONTAINER (window), mainBox); + gtk_widget_show (mainBox); + +#ifdef HAVE_POPPLER + /* + * Path for pdflatex + */ + + GtkWidget *pdflatexFrame = gtk_frame_new ("Previews"); + gtk_box_pack_start (GTK_BOX (mainBox), pdflatexFrame, TRUE, TRUE, 0); + + GtkBox *pdflatexBox = GTK_BOX (gtk_hbox_new (FALSE, 6)); + gtk_container_add (GTK_CONTAINER (pdflatexFrame), GTK_WIDGET (pdflatexBox)); + gtk_container_set_border_width (GTK_CONTAINER (pdflatexBox), 6); + + GtkWidget *pdflatexLabel = gtk_label_new ("Path to pdflatex:"); + gtk_misc_set_alignment (GTK_MISC (pdflatexLabel), 0, 0.5); + gtk_box_pack_start (pdflatexBox, + pdflatexLabel, + FALSE, TRUE, 0); + + pdflatexPathEntry = GTK_ENTRY (gtk_entry_new ()); + gtk_box_pack_start (pdflatexBox, + GTK_WIDGET (pdflatexPathEntry), + TRUE, TRUE, 0); + + gtk_widget_show_all (pdflatexFrame); +#else + pdflatexPathEntry = NULL; +#endif + + /* + * Node styles + */ + GtkWidget *nodeStylesFrame = gtk_frame_new ("Node Styles"); + gtk_widget_show (nodeStylesFrame); + gtk_box_pack_start (GTK_BOX (mainBox), nodeStylesFrame, TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (nodeStylesFrame), + GTK_WIDGET ([nodePalette widget])); + gtk_widget_show ([nodePalette widget]); + + + /* + * Edge styles + */ + GtkWidget *edgeStylesFrame = gtk_frame_new ("Edge Styles"); + gtk_widget_show (edgeStylesFrame); + gtk_box_pack_start (GTK_BOX (mainBox), edgeStylesFrame, TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (edgeStylesFrame), + GTK_WIDGET ([edgePalette widget])); + gtk_widget_show ([edgePalette widget]); + + + /* + * Bottom buttons + */ + + GtkContainer *buttonBox = GTK_CONTAINER (gtk_hbutton_box_new ()); + gtk_box_set_spacing (GTK_BOX (buttonBox), 6); + gtk_button_box_set_layout (GTK_BUTTON_BOX (buttonBox), GTK_BUTTONBOX_END); + gtk_box_pack_start (GTK_BOX (mainBox), + GTK_WIDGET (buttonBox), + FALSE, TRUE, 0); + + GtkWidget *okButton = gtk_button_new_from_stock (GTK_STOCK_OK); + gtk_container_add (buttonBox, okButton); + g_signal_connect (okButton, + "clicked", + G_CALLBACK (ok_button_clicked_cb), + self); + + GtkWidget *cancelButton = gtk_button_new_from_stock (GTK_STOCK_CANCEL); + gtk_container_add (buttonBox, cancelButton); + g_signal_connect (cancelButton, + "clicked", + G_CALLBACK (cancel_button_clicked_cb), + self); + + gtk_widget_show_all (GTK_WIDGET (buttonBox)); + + [self revert]; +} + +- (void) save { + if (!window) + return; + +#ifdef HAVE_POPPLER + const gchar *path = gtk_entry_get_text (pdflatexPathEntry); + if (path && *path) { + [configuration setStringEntry:@"pdflatex" + inGroup:@"Previews" + value:[NSString stringWithUTF8String:path]]; + } +#endif + + [styleManager updateFromManager:tempStyleManager]; + + [app saveConfiguration]; +} + +- (void) revert { + if (!window) + return; + +#ifdef HAVE_POPPLER + NSString *path = [configuration stringEntry:@"pdflatex" + inGroup:@"Previews" + withDefault:@"pdflatex"]; + gtk_entry_set_text (pdflatexPathEntry, [path UTF8String]); +#endif + + [tempStyleManager updateFromManager:styleManager]; +} +@end + +// }}} +// {{{ GTK+ callbacks + +static gboolean window_delete_event_cb (GtkWidget *widget, + GdkEvent *event, + SettingsDialog *dialog) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [dialog hide]; + [pool drain]; + return TRUE; // we dealt with this event +} + +static void ok_button_clicked_cb (GtkButton *widget, SettingsDialog *dialog) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [dialog save]; + [dialog hide]; + [pool drain]; +} + +static void cancel_button_clicked_cb (GtkButton *widget, SettingsDialog *dialog) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [dialog hide]; + [pool drain]; +} + +// }}} + +// vim:ft=objc:ts=4:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/Shape+Render.h b/tikzit-old/src/gtk/Shape+Render.h new file mode 100644 index 0000000..a744c77 --- /dev/null +++ b/tikzit-old/src/gtk/Shape+Render.h @@ -0,0 +1,29 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import "Shape.h" +#import "RenderContext.h" +#import "Surface.h" + +@interface Shape (Render) + +- (void) drawPathWithTransform:(Transformer*)transform andContext:(id)context; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/Shape+Render.m b/tikzit-old/src/gtk/Shape+Render.m new file mode 100644 index 0000000..924bb24 --- /dev/null +++ b/tikzit-old/src/gtk/Shape+Render.m @@ -0,0 +1,57 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "Shape+Render.h" + +#import "Edge.h" + +// we use cairo for finding the bounding box etc. +#import + +@implementation Shape (Render) + +- (void) drawPathWithTransform:(Transformer*)transform andContext:(id)context { + [context startPath]; + + for (NSArray *arr in [self paths]) { + BOOL fst = YES; + NSPoint p, cp1, cp2; + + for (Edge *e in arr) { + if (fst) { + fst = NO; + p = [transform toScreen:[[e source] point]]; + [context moveTo:p]; + } + + p = [transform toScreen:[[e target] point]]; + if ([e isStraight]) { + [context lineTo:p]; + } else { + cp1 = [transform toScreen:[e cp1]]; + cp2 = [transform toScreen:[e cp2]]; + [context curveTo:p withCp1:cp1 andCp2:cp2]; + } + } + + [context closeSubPath]; + } +} + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/StyleManager+Storage.h b/tikzit-old/src/gtk/StyleManager+Storage.h new file mode 100644 index 0000000..1727786 --- /dev/null +++ b/tikzit-old/src/gtk/StyleManager+Storage.h @@ -0,0 +1,26 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import "StyleManager.h" + +@interface StyleManager (Storage) +- (void) loadStylesUsingConfigurationName:(NSString*)name; +- (void) saveStylesUsingConfigurationName:(NSString*)name; +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/StyleManager+Storage.m b/tikzit-old/src/gtk/StyleManager+Storage.m new file mode 100644 index 0000000..f4c8232 --- /dev/null +++ b/tikzit-old/src/gtk/StyleManager+Storage.m @@ -0,0 +1,82 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "StyleManager+Storage.h" +#import "Configuration.h" +#import "NodeStyle+Storage.h" +#import "EdgeStyle+Storage.h" + +static NSString *nodeStyleGroupPrefix = @"Style "; +static NSString *edgeStyleGroupPrefix = @"EdgeStyle "; + +@implementation StyleManager (Storage) + +- (void) loadStylesUsingConfigurationName:(NSString*)name { + if (![Configuration configurationExistsWithName:name]) { + NSLog(@"No styles config found"); + return; + } + NSError *error = nil; + Configuration *stylesConfig = [Configuration configurationWithName:name loadError:&error]; + if (error != nil) { + logError (error, @"Could not load styles configuration"); + // stick with the default config + return; + } + NSArray *groups = [stylesConfig groups]; + NSMutableArray *ns = [NSMutableArray arrayWithCapacity:[groups count]]; + NSMutableArray *es = [NSMutableArray arrayWithCapacity:[groups count]]; + + for (NSString *groupName in groups) { + if ([groupName hasPrefix:nodeStyleGroupPrefix]) { + NodeStyle *style = [[NodeStyle alloc] initFromConfigurationGroup:groupName config:stylesConfig]; + [ns addObject:style]; + } else if ([groupName hasPrefix:edgeStyleGroupPrefix]) { + EdgeStyle *style = [[EdgeStyle alloc] initFromConfigurationGroup:groupName config:stylesConfig]; + [es addObject:style]; + } + } + + [self _setNodeStyles:ns]; + [self _setEdgeStyles:es]; +} + +- (void) saveStylesUsingConfigurationName:(NSString*)name { + NSError *error = nil; + Configuration *stylesConfig = [Configuration emptyConfigurationWithName:name]; + NSArray *ns = [self nodeStyles]; + NSArray *es = [self edgeStyles]; + NSUInteger length = [ns count]; + for (int i = 0; i < length; ++i) { + NodeStyle *style = [ns objectAtIndex:i]; + NSString *groupName = [NSString stringWithFormat:@"%@%d", nodeStyleGroupPrefix, i]; + [style storeToConfigurationGroup:groupName config:stylesConfig]; + } + length = [es count]; + for (int i = 0; i < length; ++i) { + EdgeStyle *style = [es objectAtIndex:i]; + NSString *groupName = [NSString stringWithFormat:@"%@%d", edgeStyleGroupPrefix, i]; + [style storeToConfigurationGroup:groupName config:stylesConfig]; + } + if (![stylesConfig writeToStoreWithError:&error]) { + logError (error, @"Could not write styles configuration"); + } +} + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/Surface.h b/tikzit-old/src/gtk/Surface.h new file mode 100644 index 0000000..db4288e --- /dev/null +++ b/tikzit-old/src/gtk/Surface.h @@ -0,0 +1,107 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import "RenderContext.h" +#import "Transformer.h" + +typedef enum { + NormalCursor, + ResizeRightCursor, + ResizeBottomRightCursor, + ResizeBottomCursor, + ResizeBottomLeftCursor, + ResizeLeftCursor, + ResizeTopLeftCursor, + ResizeTopCursor, + ResizeTopRightCursor +} Cursor; + +@protocol Surface; + +@protocol RenderDelegate +- (void) renderWithContext:(id)context onSurface:(id)surface; +@end + +/** + * Represents a surface that can be rendered to + * + * This protocol should be implemented by drawing surfaces. It + * provides geometry information and methods to invalidate + * regions of the surface, triggering a redraw. + * + * The surface should send a "SurfaceSizeChanged" notification + * when the width or height changes. + */ +@protocol Surface + +/** + * The width of the surface, in surface units + * + * The surface should send a "SurfaceSizeChanged" notification + * when this property changes. + */ +@property (readonly) int width; +/** + * The height of the surface, in surface units + * + * The surface should send a "SurfaceSizeChanged" notification + * when this property changes. + */ +@property (readonly) int height; +/** + * The transformer that converts between graph units and surface units + */ +@property (readonly) Transformer *transformer; +/** + * The render delegate. + * + * This will be used to redraw (parts of) the surface when necessary. + */ +@property (assign) id renderDelegate; + +/** + * Create a render context for the surface. + */ +- (id) createRenderContext; +/** + * Invalidate a portion of the surface. + * + * This will request that part of the surface be redrawn. + */ +- (void) invalidateRect:(NSRect)rect; +/** + * Invalidate the whole surface. + * + * This will request that the whole surface be redrawn. + */ +- (void) invalidate; + +- (void) zoomIn; +- (void) zoomOut; +- (void) zoomReset; +- (void) zoomInAboutPoint:(NSPoint)p; +- (void) zoomOutAboutPoint:(NSPoint)p; +- (void) zoomResetAboutPoint:(NSPoint)p; + +- (void) setCursor:(Cursor)c; + +- (BOOL) hasFocus; +- (void) renderFocus; +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/TZFoundation.h b/tikzit-old/src/gtk/TZFoundation.h new file mode 100644 index 0000000..2ff20ca --- /dev/null +++ b/tikzit-old/src/gtk/TZFoundation.h @@ -0,0 +1,30 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import +#import + +#import "NSError+Glib.h" +#import "NSError+Tikzit.h" +#import "NSFileManager+Glib.h" +#import "NSFileManager+Utils.h" +#import "NSString+Glib.h" +#import "NSString+LatexConstants.h" +#import "NSString+Tikz.h" +#import "NSString+Util.h" + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/TikzDocument.h b/tikzit-old/src/gtk/TikzDocument.h new file mode 100644 index 0000000..5d15d13 --- /dev/null +++ b/tikzit-old/src/gtk/TikzDocument.h @@ -0,0 +1,149 @@ +// +// TikzDocument.h +// TikZiT +// +// Copyright 2010 Chris Heunen +// Copyright 2010 Alex Merry +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "TZFoundation.h" +#import +#import "PickSupport.h" +#import "StyleManager.h" + +@interface TikzDocument : NSObject { + StyleManager *styleManager; + Graph *graph; + PickSupport *pickSupport; + NSUndoManager *undoManager; + NSString *tikz; + NSString *path; + NSSet *nodesetBeingModified; + NSMapTable *nodesetBeingModifiedOldCopy; + NSSet *edgesetBeingModified; + NSMapTable *edgesetBeingModifiedOldCopy; + NSPoint currentNodeShift; + Node *nodeBeingModified; + Node *nodeBeingModifiedOldCopy; + Edge *edgeBeingModified; + Edge *edgeBeingModifiedOldCopy; + NSRect oldGraphBounds; + GraphElementData *oldGraphData; + BOOL hasChanges; +} + ++ (TikzDocument*) documentWithStyleManager:(StyleManager*)manager; ++ (TikzDocument*) documentWithGraph:(Graph*)g styleManager:(StyleManager*)manager; ++ (TikzDocument*) documentWithTikz:(NSString*)t styleManager:(StyleManager*)manager error:(NSError**)error; ++ (TikzDocument*) documentFromFile:(NSString*)path styleManager:(StyleManager*)manager error:(NSError**)error; + +- (id) initWithStyleManager:(StyleManager*)manager; +- (id) initWithGraph:(Graph*)g styleManager:(StyleManager*)manager; +- (id) initWithTikz:(NSString*)t styleManager:(StyleManager*)manager error:(NSError**)error; +- (id) initFromFile:(NSString*)path styleManager:(StyleManager*)manager error:(NSError**)error; + +@property (readonly) Graph *graph; +@property (readonly) PickSupport *pickSupport; +@property (readonly) NSString *path; +@property (readonly) NSString *name; +@property (readonly) NSString *suggestedFileName; +@property (readonly) BOOL hasUnsavedChanges; +@property (retain) StyleManager *styleManager; +@property (readonly) NSString *tikz; +@property (readonly) BOOL canUndo; +@property (readonly) BOOL canRedo; +@property (readonly) NSString *undoName; +@property (readonly) NSString *redoName; + +- (BOOL) updateTikz:(NSString*)t error:(NSError**)error; + +- (Graph*) selectionCut; +- (Graph*) selectionCopy; +- (void) paste:(Graph*)graph; +- (void) pasteFromTikz:(NSString*)tikz; + +// some convenience methods: +- (BOOL) isNodeSelected:(Node*)node; +- (BOOL) isEdgeSelected:(Edge*)edge; +- (NSEnumerator*) nodeEnumerator; +- (NSEnumerator*) edgeEnumerator; + +- (void) undo; +- (void) redo; + +- (void) startUndoGroup; +- (void) nameAndEndUndoGroup:(NSString*)nm; +- (void) endUndoGroup; + +- (void) startModifyNode:(Node*)node; +- (void) modifyNodeCheckPoint; +- (void) endModifyNode; +- (void) cancelModifyNode; + +- (void) startModifyNodes:(NSSet*)nodes; +- (void) modifyNodesCheckPoint; +- (void) endModifyNodes; +- (void) cancelModifyNodes; + +- (void) startShiftNodes:(NSSet*)nodes; +- (void) shiftNodesUpdate:(NSPoint)shiftChange; +- (void) endShiftNodes; +- (void) cancelShiftNodes; + +- (void) startModifyEdge:(Edge*)edge; +- (void) modifyEdgeCheckPoint; +- (void) endModifyEdge; +- (void) cancelModifyEdge; + +- (void) startModifyEdges:(NSSet*)edges; +- (void) modifyEdgesCheckPoint; +- (void) endModifyEdges; +- (void) cancelModifyEdges; + +- (void) startChangeBoundingBox; +- (void) changeBoundingBoxCheckPoint; +- (void) endChangeBoundingBox; +- (void) cancelChangeBoundingBox; + +- (void) startChangeGraphProperties; +- (void) changeGraphPropertiesCheckPoint; +- (void) endChangeGraphProperties; +- (void) cancelChangeGraphProperties; + +- (void) removeSelected; +- (void) addNode:(Node*)node; +- (void) removeNode:(Node*)node; +- (void) addEdge:(Edge*)edge; +- (void) removeEdge:(Edge*)edge; +- (void) shiftSelectedNodesByPoint:(NSPoint)offset; +- (void) insertGraph:(Graph*)g; +- (void) flipSelectedNodesHorizontally; +- (void) flipSelectedNodesVertically; +- (void) reverseSelectedEdges; +- (void) bringSelectionForward; +- (void) bringSelectionToFront; +- (void) sendSelectionBackward; +- (void) sendSelectionToBack; + +- (BOOL) saveCopyToPath: (NSString*)path error: (NSError**)error; +- (BOOL) saveToPath: (NSString*)path error: (NSError**)error; +- (BOOL) save: (NSError**)error; + +@end + +// vim:ft=objc:sts=4:sw=4:et diff --git a/tikzit-old/src/gtk/TikzDocument.m b/tikzit-old/src/gtk/TikzDocument.m new file mode 100644 index 0000000..bff5a2e --- /dev/null +++ b/tikzit-old/src/gtk/TikzDocument.m @@ -0,0 +1,911 @@ +// +// TikzDocument.h +// TikZiT +// +// Copyright 2010 Chris Heunen +// Copyright 2010 Alex Merry +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "TikzDocument.h" + +@interface TikzDocument (Private) +- (void) styleRenamed:(NSNotification*)n; + +- (void) setPath:(NSString*)path; +- (void) setGraph:(Graph*)g; + +- (void) registerUndoForChange:(GraphChange*)change; +- (void) registerUndoGroupForChange:(GraphChange*)change withName:(NSString*)name; +- (void) undoGraphChange:(GraphChange*)change; +- (void) completedGraphChange:(GraphChange*)change withName:(NSString*)name; +- (void) attachStylesToGraph:(Graph*)g; + +- (void) regenerateTikz; +@end + +@implementation TikzDocument + ++ (TikzDocument*) documentWithStyleManager:(StyleManager*)manager +{ + return [[[TikzDocument alloc] initWithStyleManager:manager] autorelease]; +} + ++ (TikzDocument*) documentWithGraph:(Graph*)g + styleManager:(StyleManager*)manager +{ + return [[[TikzDocument alloc] initWithGraph:g + styleManager:manager] autorelease]; +} + ++ (TikzDocument*) documentWithTikz:(NSString*)t + styleManager:(StyleManager*)manager + error:(NSError**)error +{ + return [[[TikzDocument alloc] initWithTikz:t + styleManager:manager + error:error] autorelease]; +} + ++ (TikzDocument*) documentFromFile:(NSString*)pth + styleManager:(StyleManager*)manager + error:(NSError**)error +{ + return [[[TikzDocument alloc] initFromFile:pth + styleManager:manager + error:error] autorelease]; +} + + +- (id) initWithStyleManager:(StyleManager*)manager { + self = [self initWithGraph:[Graph graph] styleManager:manager]; + return self; +} + +- (id) initWithGraph:(Graph*)g styleManager:(StyleManager*)manager { + self = [super init]; + + if (self) { + graph = nil; + styleManager = [manager retain]; + pickSupport = [[PickSupport alloc] init]; + undoManager = [[NSUndoManager alloc] init]; + [undoManager setGroupsByEvent:NO]; + tikz = nil; + path = nil; + nodesetBeingModified = nil; + nodesetBeingModifiedOldCopy = nil; + nodeBeingModified = nil; + nodeBeingModifiedOldCopy = nil; + edgeBeingModified = nil; + edgeBeingModifiedOldCopy = nil; + + [undoManager disableUndoRegistration]; + [self setGraph:g]; + [undoManager enableUndoRegistration]; + + hasChanges = NO; + + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(styleRenamed:) + name:@"NodeStyleRenamed" + object:styleManager]; + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(styleRenamed:) + name:@"EdgeStyleRenamed" + object:styleManager]; + } + + return self; +} + +- (id) initWithTikz:(NSString*)t + styleManager:(StyleManager*)manager + error:(NSError**)error +{ + self = [self initWithStyleManager:manager]; + + if (self) { + [undoManager disableUndoRegistration]; + BOOL success = [self updateTikz:t error:error]; + if (!success) { + [self release]; + return nil; + } + [undoManager enableUndoRegistration]; + hasChanges = NO; + } + + return self; +} + +- (id) initFromFile:(NSString*)pth + styleManager:(StyleManager*)manager + error:(NSError**)error +{ + NSString *t = [NSString stringWithContentsOfFile:pth error:error]; + if (t == nil) { + [self release]; + return nil; + } + + self = [self initWithTikz:t styleManager:manager error:error]; + + if (self) { + [self setPath:pth]; + } + return self; +} + +- (void) dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + + [styleManager release]; + [graph release]; + [pickSupport release]; + [undoManager release]; + [tikz release]; + [path release]; + [nodesetBeingModified release]; + [nodesetBeingModifiedOldCopy release]; + [nodeBeingModified release]; + [nodeBeingModifiedOldCopy release]; + [edgeBeingModified release]; + [edgeBeingModifiedOldCopy release]; + [oldGraphData release]; + [super dealloc]; +} + +@synthesize graph, pickSupport, path; + +- (NSString*) name { + if (path) { + return [[NSFileManager defaultManager] displayNameAtPath: path]; + } else { + return @"Untitled"; + } +} + +- (NSString*) suggestedFileName { + if (path) { + return [path lastPathComponent]; + } else { + return @"untitled.tikz"; + } +} + +- (BOOL) hasUnsavedChanges { + return hasChanges; +} + +- (StyleManager*) styleManager { + return styleManager; +} + +- (void) setStyleManager:(StyleManager*)manager { + StyleManager *oldManager = styleManager; + [[NSNotificationCenter defaultCenter] + removeObserver:self + name:nil + object:oldManager]; + + styleManager = [manager retain]; + + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(styleRenamed:) + name:@"NodeStyleRenamed" + object:styleManager]; + [[NSNotificationCenter defaultCenter] + addObserver:self + selector:@selector(styleRenamed:) + name:@"EdgeStyleRenamed" + object:styleManager]; + + [self attachStylesToGraph:graph]; + [oldManager release]; +} + +- (void) postGraphReplaced { + [[NSNotificationCenter defaultCenter] postNotificationName:@"GraphReplaced" object:self]; +} + +- (void) postGraphChange:(GraphChange*)change { + NSDictionary *info = [NSDictionary dictionaryWithObject:change forKey:@"change"]; + [[NSNotificationCenter defaultCenter] postNotificationName:@"GraphChanged" object:self userInfo:info]; +} + +- (void) postIncompleteGraphChange:(GraphChange*)change { + NSDictionary *info = [NSDictionary dictionaryWithObject:change forKey:@"change"]; + [[NSNotificationCenter defaultCenter] postNotificationName:@"GraphBeingChanged" object:self userInfo:info]; +} + +- (void) postCancelledGraphChange:(GraphChange*)change { + NSDictionary *info = [NSDictionary dictionaryWithObject:change forKey:@"change"]; + [[NSNotificationCenter defaultCenter] postNotificationName:@"GraphChangeCancelled" object:self userInfo:info]; +} + +- (void) postTikzChanged { + [[NSNotificationCenter defaultCenter] postNotificationName:@"TikzChanged" object:self]; +} + +- (void) postUndoStackChanged { + [[NSNotificationCenter defaultCenter] postNotificationName:@"UndoStackChanged" object:self]; +} + +- (NSString*) tikz { + return tikz; +} + +- (BOOL) updateTikz:(NSString*)t error:(NSError**)error { + if (t == nil) { + t = [NSString string]; + } + if (t == tikz || [t isEqual:tikz]) { + return YES; + } + + Graph *g = [Graph graphFromTikz:t error:error]; + if (g) { + // updateTikz actually generates a graph from the tikz, + // and generates the final tikz from that + [self startUndoGroup]; + [self setGraph:g]; + [self nameAndEndUndoGroup:@"Update tikz"]; + return YES; + } + + return NO; +} + +- (Graph*) selectionCut { + Graph *selection = [self selectionCopy]; + [self startUndoGroup]; + [self removeSelected]; + [self nameAndEndUndoGroup:@"Cut"]; + return selection; +} + +- (Graph*) selectionCopy { + return [[graph copyOfSubgraphWithNodes:[pickSupport selectedNodes]] autorelease]; +} + +- (void) paste:(Graph*)g { + if (g == nil || [[g nodes] count] == 0) { + // nothing to paste + return; + } + + // place to the right of the existing graph + NSRect bounds = [graph bounds]; + NSRect gBounds = [g bounds]; + float dx = NSMaxX (bounds) - gBounds.origin.x + 0.5f; + [g shiftNodes:[g nodes] byPoint:NSMakePoint (dx, 0)]; + + GraphChange *change = [graph insertGraph:g]; + [self completedGraphChange:change withName:@"Paste"]; + + // select everything from the clipboard + [pickSupport deselectAllEdges]; + [pickSupport selectAllNodes:[NSSet setWithArray:[g nodes]] replacingSelection:YES]; +} + +- (void) pasteFromTikz:(NSString*)t { + Graph *clipboard = [Graph graphFromTikz:t]; + if (clipboard) { + [self attachStylesToGraph:clipboard]; + [self paste:clipboard]; + } +} + +- (BOOL) isNodeSelected:(Node*)node { + return [pickSupport isNodeSelected:node]; +} + +- (BOOL) isEdgeSelected:(Edge*)edge { + return [pickSupport isEdgeSelected:edge]; +} + +- (NSEnumerator*) nodeEnumerator { + return [[graph nodes] objectEnumerator]; +} + +- (NSEnumerator*) edgeEnumerator { + return [[graph edges] objectEnumerator]; +} + +- (BOOL) canUndo { + return [undoManager canUndo]; +} + +- (void) undo { + [undoManager undo]; + [self postUndoStackChanged]; +} + +- (BOOL) canRedo { + return [undoManager canRedo]; +} + +- (void) redo { + [undoManager redo]; + [self postUndoStackChanged]; +} + +- (NSString*) undoName { + return [undoManager undoActionName]; +} + +- (NSString*) redoName { + return [undoManager redoActionName]; +} + +- (void) startUndoGroup { + [undoManager beginUndoGrouping]; +} + +- (void) nameAndEndUndoGroup:(NSString*)nm { + [undoManager setActionName:nm]; + [undoManager endUndoGrouping]; + [self postUndoStackChanged]; +} + +- (void) endUndoGroup { + [undoManager endUndoGrouping]; + [self postUndoStackChanged]; +} + +- (void) startModifyNode:(Node*)node { + if (nodeBeingModified != nil) { + [NSException raise:@"NSInternalInconsistencyException" format:@"Already modifying a node"]; + } + nodeBeingModified = [node retain]; + nodeBeingModifiedOldCopy = [node copy]; +} + +- (void) modifyNodeCheckPoint { + [self regenerateTikz]; + GraphChange *change = [GraphChange propertyChangeOfNode:nodeBeingModified + fromOld:nodeBeingModifiedOldCopy + toNew:[[nodeBeingModified copy] autorelease]]; + [self postIncompleteGraphChange:change]; +} + +- (void) _finishModifySequence:(GraphChange*)change withName:(NSString*)chName cancelled:(BOOL)cancelled { + if (cancelled) { + change = [change invert]; + [graph applyGraphChange:change]; + [self regenerateTikz]; + [self postCancelledGraphChange:change]; + } else { + [self registerUndoGroupForChange:change withName:chName]; + [self regenerateTikz]; + [self postGraphChange:change]; + } +} + +- (void) _finishModifyNodeCancelled:(BOOL)cancelled { + if (nodeBeingModified == nil) { + [NSException raise:@"NSInternalInconsistencyException" format:@"Not modifying a node"]; + } + + GraphChange *change = [GraphChange propertyChangeOfNode:nodeBeingModified + fromOld:nodeBeingModifiedOldCopy + toNew:[[nodeBeingModified copy] autorelease]]; + [self _finishModifySequence:change withName:@"Modify node" cancelled:cancelled]; + + [nodeBeingModified release]; + nodeBeingModified = nil; + [nodeBeingModifiedOldCopy release]; + nodeBeingModifiedOldCopy = nil; +} + +- (void) endModifyNode { [self _finishModifyNodeCancelled:NO]; } +- (void) cancelModifyNode { [self _finishModifyNodeCancelled:YES]; } + +- (void) startModifyNodes:(NSSet*)nodes { + if (nodesetBeingModified != nil) { + [NSException raise:@"NSInternalInconsistencyException" format:@"Already modifying a node set"]; + } + + nodesetBeingModified = [nodes copy]; + nodesetBeingModifiedOldCopy = [[Graph nodeTableForNodes:nodes] retain]; +} + +- (void) modifyNodesCheckPoint { + [self regenerateTikz]; + GraphChange *change = [GraphChange propertyChangeOfNodesFromOldCopies:nodesetBeingModifiedOldCopy + toNewCopies:[Graph nodeTableForNodes:nodesetBeingModified]]; + [self postIncompleteGraphChange:change]; +} + +- (void) _finishModifyNodes:(BOOL)cancelled { + if (nodesetBeingModified == nil) { + [NSException raise:@"NSInternalInconsistencyException" format:@"Not modifying a node set"]; + } + + GraphChange *change = [GraphChange propertyChangeOfNodesFromOldCopies:nodesetBeingModifiedOldCopy + toNewCopies:[Graph nodeTableForNodes:nodesetBeingModified]]; + [self _finishModifySequence:change withName:@"Modify nodes" cancelled:cancelled]; + + [nodesetBeingModified release]; + nodesetBeingModified = nil; + [nodesetBeingModifiedOldCopy release]; + nodesetBeingModifiedOldCopy = nil; +} + +- (void) endModifyNodes { [self _finishModifyNodes:NO]; } +- (void) cancelModifyNodes { [self _finishModifyNodes:YES]; } + +- (void) startShiftNodes:(NSSet*)nodes { + if (nodesetBeingModified != nil) { + [NSException raise:@"NSInternalInconsistencyException" format:@"Already modifying a node set"]; + } + + nodesetBeingModified = [nodes copy]; + currentNodeShift = NSZeroPoint; +} + +- (void) shiftNodesUpdate:(NSPoint)currentShift { + if (nodesetBeingModified == nil) { + [NSException raise:@"NSInternalInconsistencyException" format:@"Not modifying a node set"]; + } + + currentNodeShift = currentShift; + [self regenerateTikz]; + GraphChange *change = [GraphChange shiftNodes:nodesetBeingModified + byPoint:currentNodeShift]; + [self postIncompleteGraphChange:change]; +} + +- (void) _finishShiftNodesCancelled:(BOOL)cancelled { + if (nodesetBeingModified == nil) { + [NSException raise:@"NSInternalInconsistencyException" format:@"Not modifying a node set"]; + } + + if (!NSEqualPoints (currentNodeShift, NSZeroPoint)) { + GraphChange *change = [GraphChange shiftNodes:nodesetBeingModified + byPoint:currentNodeShift]; + [self _finishModifySequence:change withName:@"Move nodes" cancelled:cancelled]; + } + + [nodesetBeingModified release]; + nodesetBeingModified = nil; +} + +- (void) endShiftNodes { [self _finishShiftNodesCancelled:NO]; } +- (void) cancelShiftNodes { [self _finishShiftNodesCancelled:YES]; } + +- (void) startModifyEdge:(Edge*)edge { + if (edgeBeingModified != nil) { + [NSException raise:@"NSInternalInconsistencyException" format:@"Already modifying an edge"]; + } + edgeBeingModified = [edge retain]; + edgeBeingModifiedOldCopy = [edge copy]; +} + +- (void) modifyEdgeCheckPoint { + [self regenerateTikz]; + GraphChange *change = [GraphChange propertyChangeOfEdge:edgeBeingModified + fromOld:edgeBeingModifiedOldCopy + toNew:[[edgeBeingModified copy] autorelease]]; + [self postIncompleteGraphChange:change]; +} + +- (void) _finishModifyEdgeCancelled:(BOOL)cancelled { + if (edgeBeingModified == nil) { + [NSException raise:@"NSInternalInconsistencyException" format:@"Not modifying an edge"]; + } + + GraphChange *change = [GraphChange propertyChangeOfEdge:edgeBeingModified + fromOld:edgeBeingModifiedOldCopy + toNew:[[edgeBeingModified copy] autorelease]]; + [self _finishModifySequence:change withName:@"Modify edge" cancelled:cancelled]; + + [edgeBeingModified release]; + edgeBeingModified = nil; + [edgeBeingModifiedOldCopy release]; + edgeBeingModifiedOldCopy = nil; +} + +- (void) endModifyEdge { [self _finishModifyEdgeCancelled:NO]; } +- (void) cancelModifyEdge { [self _finishModifyEdgeCancelled:YES]; } + +- (void) startModifyEdges:(NSSet*)edges { + if (edgesetBeingModified != nil) { + [NSException raise:@"NSInternalInconsistencyException" format:@"Already modifying an edge set"]; + } + + edgesetBeingModified = [edges copy]; + edgesetBeingModifiedOldCopy = [[Graph edgeTableForEdges:edges] retain]; +} + +- (void) modifyEdgesCheckPoint { + [self regenerateTikz]; + GraphChange *change = [GraphChange propertyChangeOfEdgesFromOldCopies:edgesetBeingModifiedOldCopy + toNewCopies:[Graph edgeTableForEdges:edgesetBeingModified]]; + [self postIncompleteGraphChange:change]; +} + +- (void) _finishModifyEdgesCancelled:(BOOL)cancelled { + if (edgesetBeingModified == nil) { + [NSException raise:@"NSInternalInconsistencyException" format:@"Not modifying an edge"]; + } + + GraphChange *change = [GraphChange propertyChangeOfEdgesFromOldCopies:edgesetBeingModifiedOldCopy + toNewCopies:[Graph edgeTableForEdges:edgesetBeingModified]]; + [self _finishModifySequence:change withName:@"Modify edges" cancelled:cancelled]; + + [edgesetBeingModified release]; + edgesetBeingModified = nil; + [edgesetBeingModifiedOldCopy release]; + edgesetBeingModifiedOldCopy = nil; +} + +- (void) endModifyEdges { [self _finishModifyEdgesCancelled:NO]; } +- (void) cancelModifyEdges { [self _finishModifyEdgesCancelled:YES]; } + +- (void) startChangeBoundingBox { + oldGraphBounds = [graph boundingBox]; +} + +- (void) changeBoundingBoxCheckPoint { + [self regenerateTikz]; + GraphChange *change = [GraphChange changeBoundingBoxFrom:oldGraphBounds + to:[graph boundingBox]]; + [self postIncompleteGraphChange:change]; +} + +- (void) _finishChangeBoundingBoxCancelled:(BOOL)cancelled { + GraphChange *change = [GraphChange changeBoundingBoxFrom:oldGraphBounds + to:[graph boundingBox]]; + [self _finishModifySequence:change withName:@"Set bounding box" cancelled:cancelled]; +} +- (void) endChangeBoundingBox { [self _finishChangeBoundingBoxCancelled:NO]; } +- (void) cancelChangeBoundingBox { [self _finishChangeBoundingBoxCancelled:YES]; } + +- (void) startChangeGraphProperties { + oldGraphData = [[graph data] copy]; +} + +- (void) changeGraphPropertiesCheckPoint { + [self regenerateTikz]; + GraphChange *change = [GraphChange propertyChangeOfGraphFrom:oldGraphData + to:[graph data]]; + [self postIncompleteGraphChange:change]; +} + +- (void) _finishChangeGraphPropertiesCancelled:(BOOL)cancelled { + GraphChange *change = [GraphChange propertyChangeOfGraphFrom:oldGraphData + to:[graph data]]; + [self _finishModifySequence:change withName:@"Change graph properties" cancelled:cancelled]; + [oldGraphData release]; + oldGraphData = nil; +} +- (void) endChangeGraphProperties { [self _finishChangeGraphPropertiesCancelled:NO]; } +- (void) cancelChangeGraphProperties { [self _finishChangeGraphPropertiesCancelled:YES]; } + +- (void) removeSelected { + NSUInteger selEdges = [[pickSupport selectedEdges] count]; + NSUInteger selNodes = [[pickSupport selectedNodes] count]; + + if (selEdges == 0 && selNodes == 0) { + return; + } + + NSString *actionName = @"Remove selection"; + + [self startUndoGroup]; + if (selEdges > 0) { + GraphChange *change = [graph removeEdges:[pickSupport selectedEdges]]; + [self registerUndoForChange:change]; + [pickSupport deselectAllEdges]; + [self postGraphChange:change]; + } else { + actionName = (selNodes == 1 ? @"Remove node" : @"Remove nodes"); + } + if (selNodes > 0) { + GraphChange *change = [graph removeNodes:[pickSupport selectedNodes]]; + [self registerUndoForChange:change]; + [pickSupport deselectAllNodes]; + [self postGraphChange:change]; + } else { + actionName = (selEdges == 1 ? @"Remove edge" : @"Remove edges"); + } + [self nameAndEndUndoGroup:actionName]; + [self regenerateTikz]; +} + +- (void) addNode:(Node*)node { + GraphChange *change = [graph addNode:node]; + [self completedGraphChange:change withName:@"Add node"]; +} + +- (void) removeNode:(Node*)node { + [pickSupport deselectNode:node]; + GraphChange *change = [graph removeNode:node]; + [self completedGraphChange:change withName:@"Remove node"]; +} + +- (void) addEdge:(Edge*)edge { + GraphChange *change = [graph addEdge:edge]; + [self completedGraphChange:change withName:@"Add edge"]; +} + +- (void) removeEdge:(Edge*)edge { + [pickSupport deselectEdge:edge]; + GraphChange *change = [graph removeEdge:edge]; + [self completedGraphChange:change withName:@"Remove edge"]; +} + +- (void) shiftSelectedNodesByPoint:(NSPoint)offset { + if ([[pickSupport selectedNodes] count] > 0) { + GraphChange *change = [graph shiftNodes:[pickSupport selectedNodes] byPoint:offset]; + [self completedGraphChange:change withName:@"Move nodes"]; + } +} + +- (void) insertGraph:(Graph*)g { + GraphChange *change = [graph insertGraph:g]; + [self completedGraphChange:change withName:@"Insert graph"]; +} + +- (void) flipSelectedNodesHorizontally { + if ([[pickSupport selectedNodes] count] > 0) { + GraphChange *change = [graph flipHorizontalNodes:[pickSupport selectedNodes]]; + [self completedGraphChange:change withName:@"Flip nodes horizontally"]; + } +} + +- (void) flipSelectedNodesVertically { + if ([[pickSupport selectedNodes] count] > 0) { + GraphChange *change = [graph flipVerticalNodes:[pickSupport selectedNodes]]; + [self completedGraphChange:change withName:@"Flip nodes vertically"]; + } +} + +- (void) reverseSelectedEdges { + if ([[pickSupport selectedEdges] count] > 0) { + GraphChange *change = [graph reverseEdges:[pickSupport selectedEdges]]; + [self completedGraphChange:change withName:@"Reverse edges"]; + } +} + +- (void) bringSelectionForward { + BOOL hasNodeSelection = [[pickSupport selectedNodes] count] > 0; + BOOL hasEdgeSelection = [[pickSupport selectedEdges] count] > 0; + if (!hasNodeSelection && !hasEdgeSelection) + return; + + [self startUndoGroup]; + GraphChange *nodeChange; + GraphChange *edgeChange; + if (hasNodeSelection) { + nodeChange = [graph bringNodesForward:[pickSupport selectedNodes]]; + [self registerUndoForChange:nodeChange]; + } + if (hasEdgeSelection) { + edgeChange = [graph bringEdgesForward:[pickSupport selectedEdges]]; + [self registerUndoForChange:edgeChange]; + } + [self nameAndEndUndoGroup:@"Bring forward"]; + [self regenerateTikz]; + if (hasNodeSelection) + [self postGraphChange:nodeChange]; + if (hasEdgeSelection) + [self postGraphChange:edgeChange]; +} + +- (void) bringSelectionToFront { + BOOL hasNodeSelection = [[pickSupport selectedNodes] count] > 0; + BOOL hasEdgeSelection = [[pickSupport selectedEdges] count] > 0; + if (!hasNodeSelection && !hasEdgeSelection) + return; + + [self startUndoGroup]; + GraphChange *nodeChange; + GraphChange *edgeChange; + if (hasNodeSelection) { + nodeChange = [graph bringNodesToFront:[pickSupport selectedNodes]]; + [self registerUndoForChange:nodeChange]; + } + if (hasEdgeSelection) { + edgeChange = [graph bringEdgesToFront:[pickSupport selectedEdges]]; + [self registerUndoForChange:edgeChange]; + } + [self nameAndEndUndoGroup:@"Bring to front"]; + [self regenerateTikz]; + if (hasNodeSelection) + [self postGraphChange:nodeChange]; + if (hasEdgeSelection) + [self postGraphChange:edgeChange]; +} + +- (void) sendSelectionBackward { + BOOL hasNodeSelection = [[pickSupport selectedNodes] count] > 0; + BOOL hasEdgeSelection = [[pickSupport selectedEdges] count] > 0; + if (!hasNodeSelection && !hasEdgeSelection) + return; + + [self startUndoGroup]; + GraphChange *nodeChange; + GraphChange *edgeChange; + if (hasNodeSelection) { + nodeChange = [graph sendNodesBackward:[pickSupport selectedNodes]]; + [self registerUndoForChange:nodeChange]; + } + if (hasEdgeSelection) { + edgeChange = [graph sendNodesBackward:[pickSupport selectedEdges]]; + [self registerUndoForChange:edgeChange]; + } + [self nameAndEndUndoGroup:@"Send backward"]; + [self regenerateTikz]; + if (hasNodeSelection) + [self postGraphChange:nodeChange]; + if (hasEdgeSelection) + [self postGraphChange:edgeChange]; +} + +- (void) sendSelectionToBack { + BOOL hasNodeSelection = [[pickSupport selectedNodes] count] > 0; + BOOL hasEdgeSelection = [[pickSupport selectedEdges] count] > 0; + if (!hasNodeSelection && !hasEdgeSelection) + return; + + [self startUndoGroup]; + GraphChange *nodeChange; + GraphChange *edgeChange; + if (hasNodeSelection) { + nodeChange = [graph sendNodesToBack:[pickSupport selectedNodes]]; + [self registerUndoForChange:nodeChange]; + } + if (hasEdgeSelection) { + edgeChange = [graph sendNodesToBack:[pickSupport selectedEdges]]; + [self registerUndoForChange:edgeChange]; + } + [self nameAndEndUndoGroup:@"Send to back"]; + [self regenerateTikz]; + if (hasNodeSelection) + [self postGraphChange:nodeChange]; + if (hasEdgeSelection) + [self postGraphChange:edgeChange]; +} + +- (BOOL) saveCopyToPath: (NSString*)p error: (NSError**)error { + if (!p) { + [NSException raise:@"No document path" format:@"No path given"]; + } + // we use glib for writing the file, because GNUStep sucks in this regard + // (older versions don't have -[NSString writeToFile:atomically:encoding:error:]) + GError *gerror = NULL; + gchar *filename = [p glibFilename]; + BOOL success = g_file_set_contents (filename, [tikz UTF8String], -1, &gerror) ? YES : NO; + if (gerror) { + GErrorToNSError (gerror, error); + g_error_free (gerror); + } + g_free (filename); + return success; +} + +- (BOOL) saveToPath: (NSString*)p error: (NSError**)error { + BOOL success = [self saveCopyToPath:p error:error]; + if (success) { + [self setPath:p]; + hasChanges = NO; + } + return success; +} + +- (BOOL) save: (NSError**)error { + if (!path) { + [NSException raise:@"No document path" format:@"Tried to save a document when there was no path"]; + } + return [self saveToPath:path error:error]; +} + +@end + +@implementation TikzDocument (Private) +- (void) styleRenamed:(NSNotification*)n { + [self regenerateTikz]; +} + +- (void) setPath:(NSString*)p { + [p retain]; + [path release]; + path = p; +} + +- (void) setGraph:(Graph*)g { + if (g == nil) { + g = [Graph graph]; + } + if (g == graph) { + return; + } + + [pickSupport deselectAllNodes]; + [pickSupport deselectAllEdges]; + + [self startUndoGroup]; + [undoManager registerUndoWithTarget:self selector:@selector(setGraph:) object:graph]; + [g retain]; + [graph release]; + graph = g; + + [self attachStylesToGraph:graph]; + + [self regenerateTikz]; + [self postGraphReplaced]; + [self nameAndEndUndoGroup:@"Replace graph"]; +} + +- (void) registerUndoForChange:(GraphChange*)change { + [undoManager registerUndoWithTarget:self + selector:@selector(undoGraphChange:) + object:change]; +} + +- (void) registerUndoGroupForChange:(GraphChange*)change withName:(NSString*)nm { + [self startUndoGroup]; + [self registerUndoForChange:change]; + [self nameAndEndUndoGroup:nm]; +} + +- (void) undoGraphChange:(GraphChange*)change { + GraphChange *inverse = [change invert]; + [graph applyGraphChange:inverse]; + [self startUndoGroup]; + [undoManager registerUndoWithTarget:self + selector:@selector(undoGraphChange:) + object:inverse]; + [self endUndoGroup]; + [self regenerateTikz]; + [self postGraphChange:change]; +} + +- (void) completedGraphChange:(GraphChange*)change withName:(NSString*)name { + if (change == nil) { + NSLog(@"No graph change given for change %@", name); + return; + } + [self registerUndoGroupForChange:change withName:name]; + [self regenerateTikz]; + [self postGraphChange:change]; +} + +- (void) attachStylesToGraph:(Graph*)g { + for (Node *n in [g nodes]) { + [n attachStyleFromTable:[styleManager nodeStyles]]; + } + for (Edge *e in [g edges]) { + [e attachStyleFromTable:[styleManager edgeStyles]]; + } +} + +- (void) regenerateTikz { + [tikz release]; + tikz = [[graph tikz] retain]; + hasChanges = YES; + [self postTikzChanged]; +} +@end + +// vim:ft=objc:sts=4:sw=4:et diff --git a/tikzit-old/src/gtk/Tool.h b/tikzit-old/src/gtk/Tool.h new file mode 100644 index 0000000..22c983e --- /dev/null +++ b/tikzit-old/src/gtk/Tool.h @@ -0,0 +1,41 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import "InputDelegate.h" +#import "Surface.h" + +#import +#import + +@class Configuration; +@class GraphRenderer; +@protocol InputDelegate; +@protocol RenderDelegate; + +@protocol Tool +@property (readonly) NSString *name; +@property (readonly) const gchar *stockId; +@property (readonly) NSString *helpText; +@property (readonly) NSString *shortcut; +@property (retain) GraphRenderer *activeRenderer; +@property (readonly) GtkWidget *configurationWidget; +- (void) loadConfiguration:(Configuration*)config; +- (void) saveConfiguration:(Configuration*)config; +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/ToolBox.h b/tikzit-old/src/gtk/ToolBox.h new file mode 100644 index 0000000..60074c1 --- /dev/null +++ b/tikzit-old/src/gtk/ToolBox.h @@ -0,0 +1,45 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import + +@class Configuration; +@class Window; +@protocol Tool; + +@interface ToolBox : NSObject { + GtkWidget *window; + GtkToolItemGroup *toolGroup; + GtkWidget *titleLabel; + GtkWidget *configWidgetContainer; + GtkWidget *configWidget; +} + +@property (assign) id selectedTool; + +- (id) initWithTools:(NSArray*)tools; + +- (void) show; +- (void) present; +- (void) attachToWindow:(Window*)parent; + +- (void) loadConfiguration:(Configuration*)config; +- (void) saveConfiguration:(Configuration*)config; +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/ToolBox.m b/tikzit-old/src/gtk/ToolBox.m new file mode 100644 index 0000000..c6d2ccf --- /dev/null +++ b/tikzit-old/src/gtk/ToolBox.m @@ -0,0 +1,280 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "ToolBox.h" + +#import "Application.h" +#import "Configuration.h" +#import "Tool.h" +#import "Window.h" + +#import "gtkhelpers.h" +#import "tztoolpalette.h" + +static void tool_button_toggled_cb (GtkWidget *widget, ToolBox *toolBox); + +#define TOOL_DATA_KEY "tikzit-tool" + +@implementation ToolBox + +- (id) init { + [self release]; + return nil; +} + +- (id) initWithTools:(NSArray*)tools { + self = [super init]; + + if (self) { + window = gtk_window_new (GTK_WINDOW_TOPLEVEL); + g_object_ref_sink (window); + gtk_window_set_title (GTK_WINDOW (window), "Toolbox"); + gtk_window_set_role (GTK_WINDOW (window), "toolbox"); + gtk_window_set_type_hint (GTK_WINDOW (window), + GDK_WINDOW_TYPE_HINT_UTILITY); + gtk_window_set_deletable (GTK_WINDOW (window), FALSE); + + GtkWidget *mainLayout = gtk_vbox_new (FALSE, 5); + gtk_widget_show (mainLayout); + gtk_container_add (GTK_CONTAINER (window), mainLayout); + + GtkWidget *toolPalette = tz_tool_palette_new (); + gtk_widget_show (toolPalette); + gtk_box_pack_start (GTK_BOX (mainLayout), + toolPalette, + FALSE, + FALSE, + 0); + gtk_tool_palette_set_style (GTK_TOOL_PALETTE (toolPalette), + GTK_TOOLBAR_ICONS); + + toolGroup = GTK_TOOL_ITEM_GROUP (gtk_tool_item_group_new ("Tools")); + g_object_ref_sink (G_OBJECT (toolGroup)); + gtk_tool_item_group_set_label_widget ( + toolGroup, + NULL); + gtk_container_add (GTK_CONTAINER (toolPalette), GTK_WIDGET (toolGroup)); + gtk_widget_show (GTK_WIDGET (toolGroup)); + + GSList *item_group = NULL; + for (id tool in tools) { + NSString *tooltip = [NSString stringWithFormat: + @"%@: %@ (%@)", + [tool name], [tool helpText], [tool shortcut]]; + GtkToolItem *item = gtk_radio_tool_button_new_from_stock ( + item_group, + [tool stockId]); + gtk_tool_item_set_tooltip_text (item, [tooltip UTF8String]); + item_group = gtk_radio_tool_button_get_group ( + GTK_RADIO_TOOL_BUTTON (item)); + gtk_tool_item_group_insert ( + toolGroup, + item, + -1); + gtk_widget_show (GTK_WIDGET (item)); + g_object_set_data_full ( + G_OBJECT(item), + TOOL_DATA_KEY, + [tool retain], + release_obj); + + g_signal_connect (item, "toggled", + G_CALLBACK (tool_button_toggled_cb), + self); + } + + GtkWidget *sep = gtk_hseparator_new (); + gtk_widget_show (sep); + gtk_box_pack_start (GTK_BOX (mainLayout), + sep, + FALSE, + FALSE, + 0); + + titleLabel = gtk_label_new (""); + g_object_ref_sink (titleLabel); + gtk_widget_show (titleLabel); + + PangoAttrList *attrs = pango_attr_list_new (); + pango_attr_list_insert (attrs, + pango_attr_weight_new (PANGO_WEIGHT_SEMIBOLD)); + gtk_label_set_attributes (GTK_LABEL (titleLabel), attrs); + pango_attr_list_unref (attrs); + + gtk_box_pack_start (GTK_BOX (mainLayout), + titleLabel, + FALSE, + FALSE, + 0); + + configWidgetContainer = gtk_alignment_new (0.5, 0.5, 1.0, 1.0); + g_object_ref_sink (configWidgetContainer); + gtk_widget_show (configWidgetContainer); + gtk_box_pack_start (GTK_BOX (mainLayout), + configWidgetContainer, + TRUE, + TRUE, + 0); + gtk_alignment_set_padding (GTK_ALIGNMENT (configWidgetContainer), + 5, 5, 5, 5); + + gint button_width; + gint button_height; + + if (tz_tool_palette_get_button_size (TZ_TOOL_PALETTE (toolPalette), + &button_width, &button_height)) + { + GdkGeometry geometry; + + geometry.min_width = 2 * button_width; + geometry.min_height = -1; + geometry.base_width = button_width; + geometry.base_height = 0; + geometry.width_inc = button_width; + geometry.height_inc = 1; + + gtk_window_set_geometry_hints (GTK_WINDOW (window), + NULL, + &geometry, + GDK_HINT_MIN_SIZE | + GDK_HINT_BASE_SIZE | + GDK_HINT_RESIZE_INC | + GDK_HINT_USER_POS); + } + gtk_window_set_default_size (GTK_WINDOW (window), button_width * 5, 500); + + // hack to position the toolbox window somewhere sensible + // (upper left) + gtk_window_parse_geometry (GTK_WINDOW (window), "+0+0"); + } + + return self; +} + +- (void) dealloc { + if (window) { + g_object_unref (G_OBJECT (toolGroup)); + g_object_unref (G_OBJECT (titleLabel)); + g_object_unref (G_OBJECT (configWidgetContainer)); + if (configWidget) + g_object_unref (G_OBJECT (configWidget)); + gtk_widget_destroy (window); + g_object_unref (G_OBJECT (window)); + } + + [super dealloc]; +} + +- (id) selectedTool { + guint count = gtk_tool_item_group_get_n_items (toolGroup); + for (guint i = 0; i < count; ++i) { + GtkToolItem *item = gtk_tool_item_group_get_nth_item (toolGroup, i); + if (gtk_toggle_tool_button_get_active (GTK_TOGGLE_TOOL_BUTTON (item))) { + return (id)g_object_get_data (G_OBJECT (item), TOOL_DATA_KEY); + } + } + return nil; +} + +- (void) _setToolWidget:(GtkWidget*)widget { + if (configWidget) { + gtk_widget_hide (configWidget); + gtk_container_remove (GTK_CONTAINER (configWidgetContainer), + configWidget); + g_object_unref (configWidget); + } + configWidget = widget; + if (configWidget) { + g_object_ref (configWidget); + gtk_container_add (GTK_CONTAINER (configWidgetContainer), + configWidget); + gtk_widget_show (configWidget); + } +} + +- (void) setSelectedTool:(id)tool { + guint count = gtk_tool_item_group_get_n_items (toolGroup); + for (guint i = 0; i < count; ++i) { + GtkToolItem *item = gtk_tool_item_group_get_nth_item (toolGroup, i); + id data = (id)g_object_get_data (G_OBJECT (item), TOOL_DATA_KEY); + if (data == tool) { + gtk_toggle_tool_button_set_active ( + GTK_TOGGLE_TOOL_BUTTON (item), + TRUE); + break; + } + } + gtk_label_set_label (GTK_LABEL (titleLabel), + [[tool name] UTF8String]); + [self _setToolWidget:[tool configurationWidget]]; +} + +- (void) show { + gtk_widget_show (window); +} + +- (void) present { + gtk_window_present (GTK_WINDOW (window)); +} + +- (void) attachToWindow:(Window*)parent { + utility_window_attach (GTK_WINDOW (window), [parent gtkWindow]); +} + +- (void) loadConfiguration:(Configuration*)config { + if ([config hasGroup:@"ToolBox"]) { + tz_restore_window (GTK_WINDOW (window), + [config integerEntry:@"x" inGroup:@"ToolBox"], + [config integerEntry:@"y" inGroup:@"ToolBox"], + [config integerEntry:@"w" inGroup:@"ToolBox"], + [config integerEntry:@"h" inGroup:@"ToolBox"]); + } +} + +- (void) saveConfiguration:(Configuration*)config { + gint x, y, w, h; + + gtk_window_get_position (GTK_WINDOW (window), &x, &y); + gtk_window_get_size (GTK_WINDOW (window), &w, &h); + + [config setIntegerEntry:@"x" inGroup:@"ToolBox" value:x]; + [config setIntegerEntry:@"y" inGroup:@"ToolBox" value:y]; + [config setIntegerEntry:@"w" inGroup:@"ToolBox" value:w]; + [config setIntegerEntry:@"h" inGroup:@"ToolBox" value:h]; +} + +@end + +static void tool_button_toggled_cb (GtkWidget *widget, ToolBox *toolBox) { + if (gtk_toggle_tool_button_get_active (GTK_TOGGLE_TOOL_BUTTON (widget))) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + id tool = (id)g_object_get_data (G_OBJECT(widget), TOOL_DATA_KEY); + [app setActiveTool:tool]; + NSDictionary *userInfo = [NSDictionary + dictionaryWithObject:tool + forKey:@"tool"]; + [[NSNotificationCenter defaultCenter] + postNotificationName:@"ToolSelectionChanged" + object:toolBox + userInfo:userInfo]; + + [pool drain]; + } +} + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/WidgetSurface.h b/tikzit-old/src/gtk/WidgetSurface.h new file mode 100644 index 0000000..667749f --- /dev/null +++ b/tikzit-old/src/gtk/WidgetSurface.h @@ -0,0 +1,54 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import +#import +#import + +/** + * Provides a surface for rendering to a widget. + */ +@interface WidgetSurface: NSObject { + GtkWidget *widget; + Transformer *transformer; + id renderDelegate; + id inputDelegate; + BOOL keepCentered; + BOOL buttonPressesRequired; + CGFloat defaultScale; + NSSize lastKnownSize; +} + +@property (assign) BOOL canFocus; +@property (assign) BOOL keepCentered; +@property (assign) CGFloat defaultScale; + +- (id) initWithWidget:(GtkWidget*)widget; +- (GtkWidget*) widget; + +- (id) inputDelegate; +- (void) setInputDelegate:(id)delegate; + +/** + * Set the minimum size that this widget wants + */ +- (void) setSizeRequestWidth:(double)width height:(double)height; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/WidgetSurface.m b/tikzit-old/src/gtk/WidgetSurface.m new file mode 100644 index 0000000..004e722 --- /dev/null +++ b/tikzit-old/src/gtk/WidgetSurface.m @@ -0,0 +1,630 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "WidgetSurface.h" +#import "gtkhelpers.h" +#import "InputDelegate.h" +#import "CairoRenderContext.h" + +// {{{ Internal interfaces +// {{{ GTK+ callbacks +static gboolean configure_event_cb (GtkWidget *widget, GdkEventConfigure *event, WidgetSurface *surface); +static void realize_cb (GtkWidget *widget, WidgetSurface *surface); +static gboolean expose_event_cb (GtkWidget *widget, GdkEventExpose *event, WidgetSurface *surface); +static gboolean button_press_event_cb (GtkWidget *widget, GdkEventButton *event, WidgetSurface *surface); +static gboolean button_release_event_cb (GtkWidget *widget, GdkEventButton *event, WidgetSurface *surface); +static gboolean motion_notify_event_cb (GtkWidget *widget, GdkEventMotion *event, WidgetSurface *surface); +static gboolean key_press_event_cb (GtkWidget *widget, GdkEventKey *event, WidgetSurface *surface); +static gboolean key_release_event_cb (GtkWidget *widget, GdkEventKey *event, WidgetSurface *surface); +static gboolean scroll_event_cb (GtkWidget *widget, GdkEventScroll *event, WidgetSurface *surface); +static void set_cursor (GtkWidget *widget, GdkCursor *cursor); +static void unref_cursor (gpointer cursor, GClosure *closure); +// }}} + +@interface WidgetSurface (Private) +- (void) updateTransformer; +- (void) widgetSizeChanged:(NSNotification*)notification; +- (void) handleExposeEvent:(GdkEventExpose*)event; +- (void) updateLastKnownSize; +- (void) zoomTo:(CGFloat)scale aboutPoint:(NSPoint)p; +- (void) zoomTo:(CGFloat)scale; +- (void) addToEventMask:(GdkEventMask)values; +- (void) removeFromEventMask:(GdkEventMask)values; +@end +// }}} +// {{{ API +@implementation WidgetSurface + +- (id) init { + return [self initWithWidget:gtk_drawing_area_new ()]; +} + +- (id) initWithWidget:(GtkWidget*)w { + self = [super init]; + + if (self) { + widget = w; + g_object_ref_sink (G_OBJECT (widget)); + defaultScale = 1.0f; + transformer = [[Transformer alloc] init]; + [transformer setFlippedAboutXAxis:YES]; + [self updateLastKnownSize]; + g_object_set (G_OBJECT (widget), "events", GDK_STRUCTURE_MASK, NULL); + g_signal_connect (widget, "expose-event", G_CALLBACK (expose_event_cb), self); + g_signal_connect (widget, "configure-event", G_CALLBACK (configure_event_cb), self); + g_signal_connect (widget, "realize", G_CALLBACK (realize_cb), self); + g_signal_connect (widget, "button-press-event", G_CALLBACK (button_press_event_cb), self); + g_signal_connect (widget, "button-release-event", G_CALLBACK (button_release_event_cb), self); + g_signal_connect (widget, "motion-notify-event", G_CALLBACK (motion_notify_event_cb), self); + g_signal_connect (widget, "key-press-event", G_CALLBACK (key_press_event_cb), self); + g_signal_connect (widget, "key-release-event", G_CALLBACK (key_release_event_cb), self); + g_signal_connect (widget, "scroll-event", G_CALLBACK (scroll_event_cb), self); + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(widgetSizeChanged:) + name:@"SurfaceSizeChanged" + object:self]; + if ([self canFocus]) { + [self addToEventMask:GDK_BUTTON_PRESS_MASK]; + } else { + [self removeFromEventMask:GDK_BUTTON_PRESS_MASK]; + } + } + + return self; +} + +- (void) dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; + [transformer release]; + g_object_unref (G_OBJECT (widget)); + + [super dealloc]; +} + +- (void) invalidateRect:(NSRect)rect { + if (!NSIsEmptyRect (rect)) { + GdkWindow *window = gtk_widget_get_window (widget); + if (window) { + GdkRectangle g_rect = gdk_rectangle_from_ns_rect (rect); + gdk_window_invalidate_rect (window, &g_rect, TRUE); + } + } +} + +- (void) invalidate { + GdkWindow *window = gtk_widget_get_window (widget); + if (window) { + GdkRegion *visible = gdk_drawable_get_visible_region (GDK_DRAWABLE (window)); + gdk_window_invalidate_region (window, visible, TRUE); + gdk_region_destroy (visible); + } +} + +- (id) createRenderContext { + return [CairoRenderContext contextForWidget:widget]; +} + +- (int) width { + int width = 0; + GdkWindow *window = gtk_widget_get_window (widget); + if (window) { + gdk_drawable_get_size (window, &width, NULL); + } + return width; +} + +- (int) height { + int height = 0; + GdkWindow *window = gtk_widget_get_window (widget); + if (window) { + gdk_drawable_get_size (window, NULL, &height); + } + return height; +} + +- (void) setSizeRequestWidth:(double)width height:(double)height { + gtk_widget_set_size_request (widget, width, height); +} + +- (Transformer*) transformer { + return transformer; +} + +- (GtkWidget*) widget { + return widget; +} + +- (void) setRenderDelegate:(id )delegate { + // NB: no retention! + renderDelegate = delegate; + if (renderDelegate == nil) { + [self removeFromEventMask:GDK_EXPOSURE_MASK]; + } else { + [self addToEventMask:GDK_EXPOSURE_MASK]; + } +} + +- (id) inputDelegate { + return inputDelegate; +} + +- (void) setInputDelegate:(id)delegate { + if (delegate == inputDelegate) { + return; + } + buttonPressesRequired = NO; + if (inputDelegate != nil) { + [self removeFromEventMask:GDK_POINTER_MOTION_MASK + | GDK_BUTTON_PRESS_MASK + | GDK_BUTTON_RELEASE_MASK + | GDK_KEY_PRESS_MASK + | GDK_KEY_RELEASE_MASK]; + } + inputDelegate = delegate; + if (delegate != nil) { + GdkEventMask mask = 0; + if ([delegate respondsToSelector:@selector(mousePressAt:withButton:andMask:)]) { + buttonPressesRequired = YES; + mask |= GDK_BUTTON_PRESS_MASK; + } + if ([delegate respondsToSelector:@selector(mouseReleaseAt:withButton:andMask:)]) { + mask |= GDK_BUTTON_RELEASE_MASK; + } + if ([delegate respondsToSelector:@selector(mouseDoubleClickAt:withButton:andMask:)]) { + buttonPressesRequired = YES; + mask |= GDK_BUTTON_PRESS_MASK; + } + if ([delegate respondsToSelector:@selector(mouseMoveTo:withButtons:andMask:)]) { + mask |= GDK_POINTER_MOTION_MASK; + } + if ([delegate respondsToSelector:@selector(keyPressed:withMask:)]) { + mask |= GDK_KEY_PRESS_MASK; + } + if ([delegate respondsToSelector:@selector(keyReleased:withMask:)]) { + mask |= GDK_KEY_RELEASE_MASK; + } + [self addToEventMask:mask]; + } +} + +- (id ) renderDelegate { + return renderDelegate; +} + +- (void) setKeepCentered:(BOOL)centered { + keepCentered = centered; + [self updateTransformer]; +} + +- (BOOL) keepCentered { + return keepCentered; +} + +- (BOOL) canFocus { + return gtk_widget_get_can_focus (widget); +} + +- (void) setCanFocus:(BOOL)focus { + gtk_widget_set_can_focus (widget, focus); + if (focus) { + [self addToEventMask:GDK_BUTTON_PRESS_MASK]; + } else if (!buttonPressesRequired) { + [self removeFromEventMask:GDK_BUTTON_PRESS_MASK]; + } +} + +- (BOOL) hasFocus { + return gtk_widget_has_focus (widget); +} + +- (void) renderFocus { + GdkWindow *window = gtk_widget_get_window (widget); + if (window) { + int width = 0; + int height = 0; + gdk_drawable_get_size (window, &width, &height); + gtk_paint_focus (gtk_widget_get_style (widget), + window, + GTK_STATE_NORMAL, + NULL, + widget, + NULL, + 0, + 0, + width, + height + ); + } +} + +- (CGFloat) defaultScale { + return defaultScale; +} + +- (void) setDefaultScale:(CGFloat)newDefault { + if (defaultScale != newDefault) { + CGFloat oldDefault = defaultScale; + defaultScale = newDefault; + + CGFloat scale = [transformer scale]; + scale *= (newDefault / oldDefault); + [transformer setScale:scale]; + [self invalidate]; + } +} + +- (void) zoomIn { + CGFloat scale = [transformer scale]; + scale *= 1.2f; + [self zoomTo:scale]; +} + +- (void) zoomOut { + CGFloat scale = [transformer scale]; + scale /= 1.2f; + [self zoomTo:scale]; +} + +- (void) zoomReset { + [self zoomTo:defaultScale]; +} + +- (void) zoomInAboutPoint:(NSPoint)p { + CGFloat scale = [transformer scale]; + scale *= 1.2f; + [self zoomTo:scale aboutPoint:p]; +} + +- (void) zoomOutAboutPoint:(NSPoint)p { + CGFloat scale = [transformer scale]; + scale /= 1.2f; + [self zoomTo:scale aboutPoint:p]; +} + +- (void) zoomResetAboutPoint:(NSPoint)p { + [self zoomTo:defaultScale aboutPoint:p]; +} + +- (void) setCursor:(Cursor)c { + GdkCursor *cursor = NULL; + switch (c) { + case ResizeRightCursor: + cursor = gdk_cursor_new (GDK_RIGHT_SIDE); + break; + case ResizeBottomRightCursor: + cursor = gdk_cursor_new (GDK_BOTTOM_RIGHT_CORNER); + break; + case ResizeBottomCursor: + cursor = gdk_cursor_new (GDK_BOTTOM_SIDE); + break; + case ResizeBottomLeftCursor: + cursor = gdk_cursor_new (GDK_BOTTOM_LEFT_CORNER); + break; + case ResizeLeftCursor: + cursor = gdk_cursor_new (GDK_LEFT_SIDE); + break; + case ResizeTopLeftCursor: + cursor = gdk_cursor_new (GDK_TOP_LEFT_CORNER); + break; + case ResizeTopCursor: + cursor = gdk_cursor_new (GDK_TOP_SIDE); + break; + case ResizeTopRightCursor: + cursor = gdk_cursor_new (GDK_TOP_RIGHT_CORNER); + break; + default: break; + } + GdkWindow *window = gtk_widget_get_window (widget); + g_signal_handlers_disconnect_matched (window, + G_SIGNAL_MATCH_FUNC, 0, 0, NULL, + G_CALLBACK (set_cursor), NULL); + if (window) { + gdk_window_set_cursor (window, cursor); + if (cursor != NULL) { + gdk_cursor_unref (cursor); + } + } else { + g_signal_connect_data (widget, + "realize", G_CALLBACK (set_cursor), cursor, + unref_cursor, 0); + } +} + +@end +// }}} +// {{{ Private +@implementation WidgetSurface (Private) +- (void) widgetSizeChanged:(NSNotification*)notification { + [self updateTransformer]; + [self updateLastKnownSize]; +} + +- (void) updateTransformer { + if (keepCentered) { + GdkWindow *window = gtk_widget_get_window (widget); + if (window) { + int width = 0; + int height = 0; + gdk_drawable_get_size (window, &width, &height); + NSPoint origin; + if (lastKnownSize.width < 1 || lastKnownSize.height < 1) { + origin.x = (float)width / 2.0f; + origin.y = (float)height / 2.0f; + } else { + origin = [transformer origin]; + origin.x += ((float)width - lastKnownSize.width) / 2.0f; + origin.y += ((float)height - lastKnownSize.height) / 2.0f; + } + [transformer setOrigin:origin]; + } + } +} + +- (void) handleExposeEvent:(GdkEventExpose*)event { + if (renderDelegate != nil) { + NSRect area = gdk_rectangle_to_ns_rect (event->area); + + id context = [CairoRenderContext contextForWidget:widget]; + [context rect:area]; + [context clipToPath]; + [renderDelegate renderWithContext:context onSurface:self]; + } +} + +- (void) updateLastKnownSize { + GdkWindow *window = gtk_widget_get_window (widget); + if (window) { + int width = 0; + int height = 0; + gdk_drawable_get_size (window, &width, &height); + lastKnownSize.width = (float)width; + lastKnownSize.height = (float)height; + } else { + lastKnownSize = NSZeroSize; + } +} + +- (void) zoomTo:(CGFloat)scale aboutPoint:(NSPoint)p { + NSPoint graphP = [transformer fromScreen:p]; + + [transformer setScale:scale]; + + NSPoint newP = [transformer toScreen:graphP]; + NSPoint origin = [transformer origin]; + origin.x += p.x - newP.x; + origin.y += p.y - newP.y; + [transformer setOrigin:origin]; + + [self invalidate]; +} + +- (void) zoomTo:(CGFloat)scale { + NSPoint centre = NSMakePoint (lastKnownSize.width/2.0f, lastKnownSize.height/2.0f); + [self zoomTo:scale aboutPoint:centre]; +} + +- (void) addToEventMask:(GdkEventMask)values { + GdkEventMask mask; + g_object_get (G_OBJECT (widget), "events", &mask, NULL); + mask |= values; + g_object_set (G_OBJECT (widget), "events", mask, NULL); +} + +- (void) removeFromEventMask:(GdkEventMask)values { + GdkEventMask mask; + g_object_get (G_OBJECT (widget), "events", &mask, NULL); + mask ^= values; + if (buttonPressesRequired || [self canFocus]) { + mask |= GDK_BUTTON_PRESS_MASK; + } + g_object_set (G_OBJECT (widget), "events", mask, NULL); +} + +@end +// }}} +// {{{ GTK+ callbacks +static gboolean configure_event_cb(GtkWidget *widget, GdkEventConfigure *event, WidgetSurface *surface) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [[NSNotificationCenter defaultCenter] postNotificationName:@"SurfaceSizeChanged" object:surface]; + [pool drain]; + return FALSE; +} + +static void realize_cb (GtkWidget *widget, WidgetSurface *surface) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [surface updateTransformer]; + [pool drain]; +} + +static gboolean expose_event_cb(GtkWidget *widget, GdkEventExpose *event, WidgetSurface *surface) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [surface handleExposeEvent:event]; + [pool drain]; + return FALSE; +} + +InputMask mask_from_gdk_modifier_state (GdkModifierType state) { + InputMask mask = 0; + if (state & GDK_SHIFT_MASK) { + mask |= ShiftMask; + } + if (state & GDK_CONTROL_MASK) { + mask |= ControlMask; + } + if (state & GDK_META_MASK) { + mask |= MetaMask; + } + return mask; +} + +ScrollDirection scroll_dir_from_gdk_scroll_dir (GdkScrollDirection dir) { + switch (dir) { + case GDK_SCROLL_UP: return ScrollUp; + case GDK_SCROLL_DOWN: return ScrollDown; + case GDK_SCROLL_LEFT: return ScrollLeft; + case GDK_SCROLL_RIGHT: return ScrollRight; + default: NSLog(@"Invalid scroll direction %i", (int)dir); return ScrollDown; + } +} + +MouseButton buttons_from_gdk_modifier_state (GdkModifierType state) { + MouseButton buttons = 0; + if (state & GDK_BUTTON1_MASK) { + buttons |= LeftButton; + } + if (state & GDK_BUTTON2_MASK) { + buttons |= MiddleButton; + } + if (state & GDK_BUTTON3_MASK) { + buttons |= RightButton; + } + if (state & GDK_BUTTON4_MASK) { + buttons |= Button4; + } + if (state & GDK_BUTTON5_MASK) { + buttons |= Button5; + } + return buttons; +} + +static gboolean button_press_event_cb(GtkWidget *widget, GdkEventButton *event, WidgetSurface *surface) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + if ([surface canFocus]) { + if (!gtk_widget_has_focus (widget)) { + gtk_widget_grab_focus (widget); + } + } + + id delegate = [surface inputDelegate]; + if (delegate != nil) { + NSPoint pos = NSMakePoint (event->x, event->y); + MouseButton button = (MouseButton)event->button; + InputMask mask = mask_from_gdk_modifier_state (event->state); + if (event->type == GDK_BUTTON_PRESS && [delegate respondsToSelector:@selector(mousePressAt:withButton:andMask:)]) { + [delegate mousePressAt:pos withButton:button andMask:mask]; + } + if (event->type == GDK_2BUTTON_PRESS && [delegate respondsToSelector:@selector(mouseDoubleClickAt:withButton:andMask:)]) { + [delegate mouseDoubleClickAt:pos withButton:button andMask:mask]; + } + } + + [pool drain]; + return FALSE; +} + +static gboolean button_release_event_cb(GtkWidget *widget, GdkEventButton *event, WidgetSurface *surface) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + id delegate = [surface inputDelegate]; + if (delegate != nil) { + if ([delegate respondsToSelector:@selector(mouseReleaseAt:withButton:andMask:)]) { + NSPoint pos = NSMakePoint (event->x, event->y); + MouseButton button = (MouseButton)event->button; + InputMask mask = mask_from_gdk_modifier_state (event->state); + [delegate mouseReleaseAt:pos withButton:button andMask:mask]; + } + } + + [pool drain]; + return FALSE; +} + +static gboolean motion_notify_event_cb(GtkWidget *widget, GdkEventMotion *event, WidgetSurface *surface) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + id delegate = [surface inputDelegate]; + if (delegate != nil) { + if ([delegate respondsToSelector:@selector(mouseMoveTo:withButtons:andMask:)]) { + NSPoint pos = NSMakePoint (event->x, event->y); + MouseButton buttons = buttons_from_gdk_modifier_state (event->state); + InputMask mask = mask_from_gdk_modifier_state (event->state); + [delegate mouseMoveTo:pos withButtons:buttons andMask:mask]; + } + } + + [pool drain]; + return FALSE; +} + +static gboolean key_press_event_cb(GtkWidget *widget, GdkEventKey *event, WidgetSurface *surface) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + id delegate = [surface inputDelegate]; + if (delegate != nil) { + if ([delegate respondsToSelector:@selector(keyPressed:withMask:)]) { + InputMask mask = mask_from_gdk_modifier_state (event->state); + [delegate keyPressed:event->keyval withMask:mask]; + } + } + + [pool drain]; + return FALSE; +} + +static gboolean key_release_event_cb(GtkWidget *widget, GdkEventKey *event, WidgetSurface *surface) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + id delegate = [surface inputDelegate]; + if (delegate != nil) { + if ([delegate respondsToSelector:@selector(keyReleased:withMask:)]) { + InputMask mask = mask_from_gdk_modifier_state (event->state); + [delegate keyReleased:event->keyval withMask:mask]; + } + } + + [pool drain]; + return FALSE; +} + +static gboolean scroll_event_cb (GtkWidget *widget, GdkEventScroll *event, WidgetSurface *surface) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + id delegate = [surface inputDelegate]; + if (delegate != nil) { + if ([delegate respondsToSelector:@selector(mouseScrolledAt:inDirection:withMask:)]) { + NSPoint pos = NSMakePoint (event->x, event->y); + InputMask mask = mask_from_gdk_modifier_state (event->state); + ScrollDirection dir = scroll_dir_from_gdk_scroll_dir (event->direction); + [delegate mouseScrolledAt:pos + inDirection:dir + withMask:mask]; + } + } + + [pool drain]; + return FALSE; +} + +static void unref_cursor (gpointer cursor, GClosure *closure) { + if (cursor != NULL) { + gdk_cursor_unref ((GdkCursor*)cursor); + } +} + +static void set_cursor (GtkWidget *widget, GdkCursor *cursor) { + GdkWindow *window = gtk_widget_get_window (widget); + if (window) { + gdk_window_set_cursor (window, cursor); + if (cursor != NULL) { + gdk_cursor_unref (cursor); + } + } +} +// }}} + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/Window.h b/tikzit-old/src/gtk/Window.h new file mode 100644 index 0000000..a3ce8a4 --- /dev/null +++ b/tikzit-old/src/gtk/Window.h @@ -0,0 +1,182 @@ +/* + * Copyright 2011-2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import + +@class GraphEditorPanel; +@class Menu; +@class PropertyPane; +@class Preambles; +@class PreambleEditor; +@class PreviewWindow; +@class SettingsDialog; +@class StyleManager; +@class StylesPane; +@class TikzDocument; +@protocol Tool; + +/** + * Manages a document window + */ +@interface Window: NSObject { + // GTK+ widgets + GtkWindow *window; + GtkTextBuffer *tikzBuffer; + GtkStatusbar *statusBar; + GtkPaned *tikzPaneSplitter; + GtkWidget *tikzPane; + + gulong clipboard_handler_id; + GtkTextTag *errorHighlightTag; // owned by tikzBuffer + + // Classes that manage parts of the window + Menu *menu; + GraphEditorPanel *graphPanel; + + PreviewWindow *previewWindow; + + // state variables + BOOL suppressTikzUpdates; + BOOL hasParseError; + + // the document displayed by the window + TikzDocument *document; +} + +/** + * The document displayed by the window + */ +@property (retain) TikzDocument *document; +@property (readonly) BOOL hasFocus; +@property (readonly) GtkWindow *gtkWindow; + +/** + * Create a window with an empty document + */ +- (id) init; ++ (id) window; + +/** + * Create a window with the given document + */ +- (id) initWithDocument:(TikzDocument*)doc; ++ (id) windowWithDocument:(TikzDocument*)doc; + +/** + * Present the window to the user + */ +- (void) present; + +/** + * Open a file, asking the user which file to open + */ +- (void) openFile; +/** + * Open a file + */ +- (BOOL) openFileAtPath:(NSString*)path; +/** + * Save the active document to the path it was opened from + * or last saved to, or ask the user where to save it. + */ +- (BOOL) saveActiveDocument; +/** + * Save the active document, asking the user where to save it. + */ +- (BOOL) saveActiveDocumentAs; +/** + * Save the active document as a shape, asking the user what to name it. + */ +- (void) saveActiveDocumentAsShape; + +/** + * Close the window. + * + * May terminate the application if this is the last window. + * + * Will ask for user confirmation if the document is not saved. + */ +- (void) close; + +/** + * Cut the current selection to the clipboard. + */ +- (void) selectionCutToClipboard; +/** + * Copy the current selection to the clipboard. + */ +- (void) selectionCopyToClipboard; +/** + * Paste from the clipboard to the appropriate place. + */ +- (void) pasteFromClipboard; + +/** + * The GTK+ window that this class manages. + */ +- (GtkWindow*) gtkWindow; +/** + * The menu for the window. + */ +- (Menu*) menu; + +/** + * Present an error to the user + * + * @param error the error to present + */ +- (void) presentError:(NSError*)error; +/** + * Present an error to the user + * + * @param error the error to present + * @param message a message to display with the error + */ +- (void) presentError:(NSError*)error withMessage:(NSString*)message; +/** + * Present an error to the user + * + * @param error the error to present + */ +- (void) presentGError:(GError*)error; +/** + * Present an error to the user + * + * @param error the error to present + * @param message a message to display with the error + */ +- (void) presentGError:(GError*)error withMessage:(NSString*)message; + +- (void) setActiveTool:(id)tool; + +- (void) zoomIn; +- (void) zoomOut; +- (void) zoomReset; + +/** + * Show or update the preview window. + */ +- (void) presentPreview; +/** + * Show or update the preview window without it grabbing focus + */ +- (void) updatePreview; + +@end + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/Window.m b/tikzit-old/src/gtk/Window.m new file mode 100644 index 0000000..2d9e63a --- /dev/null +++ b/tikzit-old/src/gtk/Window.m @@ -0,0 +1,991 @@ +/* + * Copyright 2011-2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "Window.h" + +#import +#import "gtkhelpers.h" +#import "clipboard.h" + +#import "Application.h" +#import "Configuration.h" +#import "FileChooserDialog.h" +#import "GraphEditorPanel.h" +#import "Menu.h" +#import "RecentManager.h" +#import "Shape.h" +#import "SupportDir.h" +#import "TikzDocument.h" + +#ifdef HAVE_POPPLER +#import "PreviewWindow.h" +#endif + +enum { + GraphInfoStatus, + ParseStatus +}; + +// {{{ Internal interfaces +// {{{ Clipboard support + +static void clipboard_provide_data (GtkClipboard *clipboard, + GtkSelectionData *selection_data, + guint info, + gpointer clipboard_graph_data); +static void clipboard_release_data (GtkClipboard *clipboard, gpointer clipboard_graph_data); +static void clipboard_check_targets (GtkClipboard *clipboard, + GdkAtom *atoms, + gint n_atoms, + gpointer action); +static void clipboard_paste_contents (GtkClipboard *clipboard, + GtkSelectionData *selection_data, + gpointer document); + +// }}} +// {{{ Signals + +static void window_toplevel_focus_changed_cb (GObject *gobject, GParamSpec *pspec, Window *window); +static void graph_divider_position_changed_cb (GObject *gobject, GParamSpec *pspec, Window *window); +static void tikz_buffer_changed_cb (GtkTextBuffer *buffer, Window *window); +static gboolean main_window_delete_event_cb (GtkWidget *widget, GdkEvent *event, Window *window); +static void main_window_destroy_cb (GtkWidget *widget, Window *window); +static gboolean main_window_configure_event_cb (GtkWidget *widget, GdkEventConfigure *event, Window *window); +static void update_paste_action (GtkClipboard *clipboard, GdkEvent *event, GtkAction *action); + +// }}} + +@interface Window (Notifications) +- (void) tikzBufferChanged; +- (void) windowSizeChangedWidth:(int)width height:(int)height; +- (void) documentTikzChanged:(NSNotification*)notification; +- (void) documentSelectionChanged:(NSNotification*)notification; +- (void) undoStackChanged:(NSNotification*)notification; +@end + +@interface Window (InitHelpers) +- (void) _loadUi; +- (void) _restoreUiState; +- (void) _connectSignals; +@end + +@interface Window (Private) +- (BOOL) _askCanClose; +/** Open a document, dealing with errors as necessary */ +- (TikzDocument*) _openDocument:(NSString*)path; +- (void) _placeGraphOnClipboard:(Graph*)graph; +- (void) _clearParseError; +- (void) _setParseError:(NSError*)error; +/** Update the window title. */ +- (void) _updateTitle; +/** Update the window status bar default text. */ +- (void) _updateStatus; +/** Update the displayed tikz code to match the active document. */ +- (void) _updateTikz; +/** Update the undo and redo actions to match the active document's + * undo stack. */ +- (void) _updateUndoActions; +- (void) showPreview; +@end + +// }}} +// {{{ API + +@implementation Window + +@synthesize gtkWindow=window; + +- (id) init { + return [self initWithDocument:[TikzDocument documentWithStyleManager:[app styleManager]]]; +} ++ (id) window { + return [[[self alloc] init] autorelease]; +} +- (id) initWithDocument:(TikzDocument*)doc { + self = [super init]; + + if (self) { + [self _loadUi]; + [self _restoreUiState]; + [self _connectSignals]; + + [self setDocument:doc]; + + gtk_widget_show (GTK_WIDGET (window)); + } + + return self; +} ++ (id) windowWithDocument:(TikzDocument*)doc { + return [[[self alloc] initWithDocument:doc] autorelease]; +} + +- (void) dealloc { + // The GTK+ window has already been destroyed at this point + + [[NSNotificationCenter defaultCenter] removeObserver:self]; + g_signal_handler_disconnect ( + gtk_clipboard_get (GDK_SELECTION_CLIPBOARD), + clipboard_handler_id); + + [previewWindow release]; + [menu release]; + [graphPanel release]; + [document release]; + + g_object_unref (tikzBuffer); + g_object_unref (tikzPane); + g_object_unref (tikzPaneSplitter); + g_object_unref (statusBar); + g_object_unref (window); + + [super dealloc]; +} + +- (TikzDocument*) document { + return document; +} +- (void) setDocument:(TikzDocument*)newDoc { + [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:[document pickSupport]]; + [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:document]; + + TikzDocument *oldDoc = document; + document = [newDoc retain]; + + [graphPanel setDocument:document]; + [previewWindow setDocument:document]; + [self _updateTikz]; + [self _updateTitle]; + [self _updateStatus]; + [self _updateUndoActions]; + [menu notifySelectionChanged:[document pickSupport]]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(documentTikzChanged:) + name:@"TikzChanged" object:document]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(undoStackChanged:) + name:@"UndoStackChanged" object:document]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(documentSelectionChanged:) + name:@"NodeSelectionChanged" object:[document pickSupport]]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(documentSelectionChanged:) + name:@"EdgeSelectionChanged" object:[document pickSupport]]; + + if ([document path] != nil) { + [[RecentManager defaultManager] addRecentFile:[document path]]; + } + + NSDictionary *userInfo; + userInfo = [NSDictionary dictionaryWithObjectsAndKeys: + document, @"document", + oldDoc, @"oldDocument", + nil]; + [[NSNotificationCenter defaultCenter] + postNotificationName:@"DocumentChanged" + object:self + userInfo:userInfo]; + [oldDoc release]; +} + +- (BOOL) hasFocus { + return gtk_window_has_toplevel_focus (GTK_WINDOW (window)); +} + +- (void) present { + gtk_window_present (GTK_WINDOW (window)); +} + +- (void) openFile { + FileChooserDialog *dialog = [FileChooserDialog openDialogWithParent:window]; + [dialog addStandardFilters]; + if ([document path]) { + [dialog setCurrentFolder:[[document path] stringByDeletingLastPathComponent]]; + } else if ([app lastOpenFolder]) { + [dialog setCurrentFolder:[app lastOpenFolder]]; + } + + if ([dialog showDialog]) { + if ([self openFileAtPath:[dialog filePath]]) { + [app setLastOpenFolder:[dialog currentFolder]]; + } + } + [dialog destroy]; +} + +- (BOOL) openFileAtPath:(NSString*)path { + TikzDocument *doc = [self _openDocument:path]; + if (doc != nil) { + if (![document hasUnsavedChanges] && [document path] == nil) { + // we just have a fresh, untitled document - replace it + [self setDocument:doc]; + } else { + [app newWindowWithDocument:doc]; + } + return YES; + } + return NO; +} + +- (BOOL) saveActiveDocument { + if ([document path] == nil) { + return [self saveActiveDocumentAs]; + } else { + NSError *error = nil; + if (![document save:&error]) { + [self presentError:error]; + return NO; + } else { + [self _updateTitle]; + return YES; + } + } +} + +- (BOOL) saveActiveDocumentAs { + FileChooserDialog *dialog = [FileChooserDialog saveDialogWithParent:window]; + [dialog addStandardFilters]; + if ([document path] != nil) { + [dialog setCurrentFolder:[[document path] stringByDeletingLastPathComponent]]; + } else if ([app lastSaveAsFolder] != nil) { + [dialog setCurrentFolder:[app lastSaveAsFolder]]; + } + [dialog setSuggestedName:[document suggestedFileName]]; + + BOOL saved = NO; + if ([dialog showDialog]) { + NSString *nfile = [dialog filePath]; + + NSError *error = nil; + if (![document saveToPath:nfile error:&error]) { + [self presentError:error]; + } else { + [self _updateTitle]; + [[RecentManager defaultManager] addRecentFile:nfile]; + [app setLastSaveAsFolder:[dialog currentFolder]]; + saved = YES; + } + } + [dialog destroy]; + return saved; +} + +- (void) saveActiveDocumentAsShape { + GtkWidget *dialog = gtk_dialog_new_with_buttons ( + "Save as shape", + window, + GTK_DIALOG_MODAL, + GTK_STOCK_OK, + GTK_RESPONSE_ACCEPT, + GTK_STOCK_CANCEL, + GTK_RESPONSE_REJECT, + NULL); + GtkBox *content = GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))); + GtkWidget *label1 = gtk_label_new ("Please choose a name for the shape"); + GtkWidget *label2 = gtk_label_new ("Name:"); + GtkWidget *input = gtk_entry_new (); + GtkBox *hbox = GTK_BOX (gtk_hbox_new (FALSE, 5)); + gtk_box_pack_start (hbox, label2, FALSE, TRUE, 0); + gtk_box_pack_start (hbox, input, TRUE, TRUE, 0); + gtk_box_pack_start (content, label1, TRUE, TRUE, 5); + gtk_box_pack_start (content, GTK_WIDGET (hbox), TRUE, TRUE, 5); + gtk_widget_show_all (GTK_WIDGET (content)); + gint response = gtk_dialog_run (GTK_DIALOG (dialog)); + while (response == GTK_RESPONSE_ACCEPT) { + response = GTK_RESPONSE_NONE; + NSDictionary *shapeDict = [Shape shapeDictionary]; + const gchar *dialogInput = gtk_entry_get_text (GTK_ENTRY (input)); + NSString *shapeName = [NSString stringWithUTF8String:dialogInput]; + BOOL doSave = NO; + if ([shapeName isEqual:@""]) { + GtkWidget *emptyStrDialog = gtk_message_dialog_new (window, + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_CLOSE, + "You must specify a shape name"); + gtk_dialog_run (GTK_DIALOG (emptyStrDialog)); + gtk_widget_destroy (emptyStrDialog); + response = gtk_dialog_run (GTK_DIALOG (dialog)); + } else if ([shapeDict objectForKey:shapeName] != nil) { + GtkWidget *overwriteDialog = gtk_message_dialog_new (window, + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_QUESTION, + GTK_BUTTONS_YES_NO, + "Do you want to replace the existing shape named '%s'?", + dialogInput); + gint overwriteResp = gtk_dialog_run (GTK_DIALOG (overwriteDialog)); + gtk_widget_destroy (overwriteDialog); + + if (overwriteResp == GTK_RESPONSE_YES) { + doSave = YES; + } else { + response = gtk_dialog_run (GTK_DIALOG (dialog)); + } + } else { + doSave = YES; + } + if (doSave) { + NSError *error = nil; + NSString *userShapeDir = [[SupportDir userSupportDir] stringByAppendingPathComponent:@"shapes"]; + NSString *file = [NSString stringWithFormat:@"%@/%@.tikz", userShapeDir, shapeName]; + if (![[NSFileManager defaultManager] ensureDirectoryExists:userShapeDir error:&error]) { + [self presentError:error withMessage:@"Could not create user shape directory"]; + } else { + if (![document saveCopyToPath:file error:&error]) { + [self presentError:error withMessage:@"Could not save shape file"]; + } else { + [Shape refreshShapeDictionary]; + } + } + } + } + gtk_widget_destroy (dialog); +} + +- (void) close { + if ([self _askCanClose]) { + gtk_widget_destroy (GTK_WIDGET (window)); + } +} + +- (void) selectionCutToClipboard { + if ([[[document pickSupport] selectedNodes] count] > 0) { + [self _placeGraphOnClipboard:[document selectionCut]]; + } +} + +- (void) selectionCopyToClipboard { + if ([[[document pickSupport] selectedNodes] count] > 0) { + [self _placeGraphOnClipboard:[document selectionCopy]]; + } +} + +- (void) pasteFromClipboard { + gtk_clipboard_request_contents (gtk_clipboard_get (GDK_SELECTION_CLIPBOARD), + tikzit_picture_atom, + clipboard_paste_contents, + document); +} + +- (GtkWindow*) gtkWindow { + return window; +} + +- (Configuration*) mainConfiguration { + return [app mainConfiguration]; +} + +- (Menu*) menu { + return menu; +} + +- (void) presentError:(NSError*)error { + const gchar *errorDesc = "unknown error"; + if (error && [error localizedDescription]) { + errorDesc = [[error localizedDescription] UTF8String]; + } + GtkWidget *dialog = gtk_message_dialog_new (window, + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_CLOSE, + "%s", + errorDesc); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); +} + +- (void) presentError:(NSError*)error withMessage:(NSString*)message { + const gchar *errorDesc = "unknown error"; + if (error && [error localizedDescription]) { + errorDesc = [[error localizedDescription] UTF8String]; + } + GtkWidget *dialog = gtk_message_dialog_new (window, + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_CLOSE, + "%s: %s", + [message UTF8String], + errorDesc); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); +} + +- (void) presentGError:(GError*)error { + const gchar *errorDesc = "unknown error"; + if (error && error->message) { + errorDesc = error->message; + } + GtkWidget *dialog = gtk_message_dialog_new (window, + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_CLOSE, + "%s", + errorDesc); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); +} + +- (void) presentGError:(GError*)error withMessage:(NSString*)message { + const gchar *errorDesc = "unknown error"; + if (error && error->message) { + errorDesc = error->message; + } + GtkWidget *dialog = gtk_message_dialog_new (window, + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_CLOSE, + "%s: %s", + [message UTF8String], + errorDesc); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); +} + +- (void) setActiveTool:(id)tool { + [graphPanel setActiveTool:tool]; + gboolean hasfocus; + g_object_get (G_OBJECT (window), "has-toplevel-focus", &hasfocus, NULL); + if (hasfocus) { + [graphPanel grabTool]; + } +} + +- (void) zoomIn { + [graphPanel zoomIn]; +} + +- (void) zoomOut { + [graphPanel zoomOut]; +} + +- (void) zoomReset { + [graphPanel zoomReset]; +} + +- (void) presentPreview { +#ifdef HAVE_POPPLER + if (previewWindow == nil) { + previewWindow = [[PreviewWindow alloc] initWithPreambles:[app preambles] + config:[app mainConfiguration]]; + //[previewWindow setParentWindow:self]; + [previewWindow setDocument:document]; + } + [previewWindow present]; +#endif +} + +- (void) updatePreview { +#ifdef HAVE_POPPLER + if (previewWindow == nil) { + previewWindow = [[PreviewWindow alloc] initWithPreambles:[app preambles] + config:[app mainConfiguration]]; + //[previewWindow setParentWindow:self]; + [previewWindow setDocument:document]; + } + [previewWindow show]; +#endif +} + +@end + +// }}} +// {{{ Notifications + +@implementation Window (Notifications) +- (void) graphHeightChanged:(int)newHeight { + [[app mainConfiguration] setIntegerEntry:@"graphHeight" + inGroup:@"window" + value:newHeight]; +} + +- (void) tikzBufferChanged { + if (!suppressTikzUpdates) { + suppressTikzUpdates = TRUE; + + GtkTextIter start, end; + gtk_text_buffer_get_bounds (tikzBuffer, &start, &end); + gchar *text = gtk_text_buffer_get_text (tikzBuffer, &start, &end, FALSE); + + NSError *error = nil; + BOOL success = [document updateTikz:[NSString stringWithUTF8String:text] error:&error]; + if (success) + [self _clearParseError]; + else + [self _setParseError:error]; + + g_free (text); + + suppressTikzUpdates = FALSE; + } +} + +- (void) windowSizeChangedWidth:(int)width height:(int)height { + if (width > 0 && height > 0) { + NSNumber *w = [NSNumber numberWithInt:width]; + NSNumber *h = [NSNumber numberWithInt:height]; + NSMutableArray *size = [NSMutableArray arrayWithCapacity:2]; + [size addObject:w]; + [size addObject:h]; + [[app mainConfiguration] setIntegerListEntry:@"windowSize" + inGroup:@"window" + value:size]; + } +} + +- (void) documentTikzChanged:(NSNotification*)notification { + [self _updateTitle]; + [self _updateTikz]; +} + +- (void) documentSelectionChanged:(NSNotification*)notification { + [self _updateStatus]; + [menu notifySelectionChanged:[document pickSupport]]; +} + +- (void) undoStackChanged:(NSNotification*)notification { + [self _updateUndoActions]; +} +@end + +// }}} +// {{{ InitHelpers + +@implementation Window (InitHelpers) + +- (void) _loadUi { + window = GTK_WINDOW (gtk_window_new (GTK_WINDOW_TOPLEVEL)); + g_object_ref_sink (window); + gtk_window_set_title (window, "TikZiT"); + gtk_window_set_default_size (window, 700, 400); + + GtkBox *mainLayout = GTK_BOX (gtk_vbox_new (FALSE, 0)); + gtk_widget_show (GTK_WIDGET (mainLayout)); + gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (mainLayout)); + + menu = [[Menu alloc] initForWindow:self]; + + GtkWidget *menubar = [menu menubar]; + gtk_box_pack_start (mainLayout, menubar, FALSE, TRUE, 0); + gtk_box_reorder_child (mainLayout, menubar, 0); + gtk_widget_show (menubar); + + tikzPaneSplitter = GTK_PANED (gtk_vpaned_new ()); + g_object_ref_sink (tikzPaneSplitter); + gtk_widget_show (GTK_WIDGET (tikzPaneSplitter)); + gtk_box_pack_start (mainLayout, GTK_WIDGET (tikzPaneSplitter), TRUE, TRUE, 0); + + graphPanel = [[GraphEditorPanel alloc] initWithDocument:document]; + [graphPanel setPreviewHandler:self]; + GtkWidget *graphEditorWidget = [graphPanel widget]; + gtk_widget_show (graphEditorWidget); + GtkWidget *graphFrame = gtk_frame_new (NULL); + gtk_container_add (GTK_CONTAINER (graphFrame), graphEditorWidget); + gtk_widget_show (graphFrame); + gtk_paned_pack1 (tikzPaneSplitter, graphFrame, TRUE, TRUE); + + tikzBuffer = gtk_text_buffer_new (NULL); + g_object_ref_sink (tikzBuffer); + errorHighlightTag = gtk_text_buffer_create_tag ( + tikzBuffer, NULL, + "foreground", "#d40000", + "foreground-set", TRUE, + "weight", PANGO_WEIGHT_SEMIBOLD, + "weight-set", TRUE, + NULL); + GtkWidget *tikzScroller = gtk_scrolled_window_new (NULL, NULL); + gtk_widget_show (tikzScroller); + + tikzPane = gtk_text_view_new_with_buffer (tikzBuffer); + gtk_text_view_set_left_margin (GTK_TEXT_VIEW (tikzPane), 3); + gtk_text_view_set_right_margin (GTK_TEXT_VIEW (tikzPane), 3); + g_object_ref_sink (tikzPane); + gtk_widget_show (tikzPane); + gtk_container_add (GTK_CONTAINER (tikzScroller), tikzPane); + GtkWidget *tikzFrame = gtk_frame_new (NULL); + gtk_container_add (GTK_CONTAINER (tikzFrame), tikzScroller); + gtk_widget_show (tikzFrame); + gtk_paned_pack2 (tikzPaneSplitter, tikzFrame, FALSE, TRUE); + + statusBar = GTK_STATUSBAR (gtk_statusbar_new ()); + g_object_ref_sink (statusBar); + gtk_widget_show (GTK_WIDGET (statusBar)); + gtk_box_pack_start (mainLayout, GTK_WIDGET (statusBar), FALSE, TRUE, 0); + + GtkClipboard *clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); + update_paste_action (clipboard, NULL, [menu pasteAction]); +} + +- (void) _restoreUiState { + Configuration *config = [app mainConfiguration]; + NSArray *windowSize = [config integerListEntry:@"windowSize" + inGroup:@"window"]; + if (windowSize && [windowSize count] == 2) { + gint width = [[windowSize objectAtIndex:0] intValue]; + gint height = [[windowSize objectAtIndex:1] intValue]; + if (width > 0 && height > 0) { + gtk_window_set_default_size (window, width, height); + } + } + int panePos = [config integerEntry:@"graphHeight" + inGroup:@"window"]; + if (panePos > 0) { + gtk_paned_set_position (tikzPaneSplitter, panePos); + } +} + +- (void) _connectSignals { + GtkClipboard *clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); + clipboard_handler_id = + g_signal_connect (G_OBJECT (clipboard), + "owner-change", + G_CALLBACK (update_paste_action), + [menu pasteAction]); + g_signal_connect (G_OBJECT (window), + "key-press-event", + G_CALLBACK (tz_hijack_key_press), + NULL); + g_signal_connect (G_OBJECT (window), + "notify::has-toplevel-focus", + G_CALLBACK (window_toplevel_focus_changed_cb), + self); + g_signal_connect (G_OBJECT (tikzPaneSplitter), + "notify::position", + G_CALLBACK (graph_divider_position_changed_cb), + self); + g_signal_connect (G_OBJECT (tikzBuffer), + "changed", + G_CALLBACK (tikz_buffer_changed_cb), + self); + g_signal_connect (G_OBJECT (window), + "delete-event", + G_CALLBACK (main_window_delete_event_cb), + self); + g_signal_connect (G_OBJECT (window), + "destroy", + G_CALLBACK (main_window_destroy_cb), + self); + g_signal_connect (G_OBJECT (window), + "configure-event", + G_CALLBACK (main_window_configure_event_cb), + self); +} +@end + +// }}} +// {{{ Private + +@implementation Window (Private) + +- (BOOL) _askCanClose { + if ([document hasUnsavedChanges]) { + GtkWidget *dialog = gtk_message_dialog_new (window, + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_QUESTION, + GTK_BUTTONS_NONE, + "Save changes to the document \"%s\" before closing?", + [[document name] UTF8String]); + gtk_dialog_add_buttons (GTK_DIALOG (dialog), + "Save", GTK_RESPONSE_YES, + "Don't save", GTK_RESPONSE_NO, + "Cancel", GTK_RESPONSE_CANCEL, + NULL); + gint result = gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + if (result == GTK_RESPONSE_YES) { + return [self saveActiveDocument]; + } else { + return result == GTK_RESPONSE_NO; + } + } else { + return YES; + } +} + +- (TikzDocument*) _openDocument:(NSString*)path { + NSError *error = nil; + TikzDocument *d = [TikzDocument documentFromFile:path + styleManager:[app styleManager] + error:&error]; + if (d != nil) { + return d; + } else { + if ([error code] == TZ_ERR_PARSE) { + [self presentError:error withMessage:@"Invalid file"]; + } else { + [self presentError:error withMessage:@"Could not open file"]; + } + [[RecentManager defaultManager] removeRecentFile:path]; + return nil; + } +} + +- (void) _placeGraphOnClipboard:(Graph*)graph { + GtkClipboard *clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); + + static const GtkTargetEntry targets[] = { + { "TIKZITPICTURE", 0, TARGET_TIKZIT_PICTURE }, + { "UTF8_STRING", 0, TARGET_UTF8_STRING } }; + + gtk_clipboard_set_with_data (clipboard, + targets, G_N_ELEMENTS (targets), + clipboard_provide_data, + clipboard_release_data, + clipboard_graph_data_new (graph)); +} + +- (void) _clearParseError { + if (!hasParseError) + return; + gtk_statusbar_pop (statusBar, ParseStatus); + text_buffer_clear_tag (tikzBuffer, errorHighlightTag); + widget_clear_error (tikzPane); + hasParseError = NO; +} + +- (void) _setParseError:(NSError*)error { + if (!hasParseError) { + widget_set_error (tikzPane); + hasParseError = YES; + } + NSString *message = [NSString stringWithFormat:@"Parse error: %@", [error localizedDescription]]; + gtk_statusbar_pop (statusBar, ParseStatus); + gtk_statusbar_push (statusBar, ParseStatus, [message UTF8String]); + + text_buffer_clear_tag (tikzBuffer, errorHighlightTag); + + NSDictionary *errorInfo = [error userInfo]; + if ([errorInfo objectForKey:@"startLine"] != nil) { + GtkTextIter symbolStart; + GtkTextIter symbolEnd; + gtk_text_buffer_get_iter_at_line_index (tikzBuffer, &symbolStart, + [[errorInfo objectForKey:@"startLine"] intValue] - 1, + [[errorInfo objectForKey:@"startColumn"] intValue] - 1); + gtk_text_buffer_get_iter_at_line_index (tikzBuffer, &symbolEnd, + [[errorInfo objectForKey:@"endLine"] intValue] - 1, + [[errorInfo objectForKey:@"endColumn"] intValue]); + gtk_text_buffer_apply_tag (tikzBuffer, errorHighlightTag, + &symbolStart, &symbolEnd); + } +} + +- (void) _updateUndoActions { + [menu setUndoActionEnabled:[document canUndo]]; + [menu setUndoActionDetail:[document undoName]]; + + [menu setRedoActionEnabled:[document canRedo]]; + [menu setRedoActionDetail:[document redoName]]; +} + +- (void) _updateTitle { + NSString *title = [NSString stringWithFormat:@"TikZiT - %@%s", + [document name], + ([document hasUnsavedChanges] ? "*" : "")]; + gtk_window_set_title(window, [title UTF8String]); +} + +- (void) _updateStatus { + // FIXME: show tooltips or something instead + GString *buffer = g_string_sized_new (30); + gchar *nextNode = 0; + + for (Node *n in [[document pickSupport] selectedNodes]) { + if (nextNode) { + if (buffer->len == 0) { + g_string_printf(buffer, "Nodes %s", nextNode); + } else { + g_string_append_printf(buffer, ", %s", nextNode); + } + } + nextNode = (gchar *)[[n name] UTF8String]; + } + if (nextNode) { + if (buffer->len == 0) { + g_string_printf(buffer, "Node %s is selected", nextNode); + } else { + g_string_append_printf(buffer, " and %s are selected", nextNode); + } + } + + if (buffer->len == 0) { + int nrNodes = [[[document graph] nodes] count]; + int nrEdges = [[[document graph] edges] count]; + g_string_printf(buffer, "Graph has %d node%s and %d edge%s", + nrNodes, + nrNodes!=1 ? "s" : "", + nrEdges, + nrEdges!=1 ? "s" : ""); + } + gtk_statusbar_pop(statusBar, GraphInfoStatus); + gtk_statusbar_push(statusBar, GraphInfoStatus, buffer->str); + + g_string_free (buffer, TRUE); +} + +- (void) _updateTikz { + if (document != nil && !suppressTikzUpdates) { + suppressTikzUpdates = TRUE; + + if (document != nil) { + const char *tikzString = [[document tikz] UTF8String]; + gtk_text_buffer_set_text (tikzBuffer, tikzString, -1); + } else { + gtk_text_buffer_set_text (tikzBuffer, "", -1); + } + [self _clearParseError]; + + suppressTikzUpdates = FALSE; + } +} + +- (GraphEditorPanel*) _graphPanel { + return graphPanel; +} + +- (void) showPreview { + [self updatePreview]; +} + +@end + +// }}} +// {{{ GTK+ callbacks + +static void window_toplevel_focus_changed_cb (GObject *gobject, GParamSpec *pspec, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + gboolean hasfocus; + g_object_get (gobject, "has-toplevel-focus", &hasfocus, NULL); + if (hasfocus) { + [[NSNotificationCenter defaultCenter] + postNotificationName:@"WindowGainedFocus" + object:window]; + [[window _graphPanel] grabTool]; + } else { + [[NSNotificationCenter defaultCenter] + postNotificationName:@"WindowLostFocus" + object:window]; + } + [pool drain]; +} + +static void graph_divider_position_changed_cb (GObject *gobject, GParamSpec *pspec, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + gint position; + g_object_get (gobject, "position", &position, NULL); + [window graphHeightChanged:position]; + [pool drain]; +} + +static void tikz_buffer_changed_cb (GtkTextBuffer *buffer, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [window tikzBufferChanged]; + [pool drain]; +} + +static gboolean main_window_delete_event_cb (GtkWidget *widget, GdkEvent *event, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [window close]; + [pool drain]; + return TRUE; +} + +static void main_window_destroy_cb (GtkWidget *widget, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [[NSNotificationCenter defaultCenter] postNotificationName:@"WindowClosed" + object:window]; + [pool drain]; +} + +static gboolean main_window_configure_event_cb (GtkWidget *widget, GdkEventConfigure *event, Window *window) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + [window windowSizeChangedWidth:event->width height:event->height]; + [pool drain]; + return FALSE; +} + +static void clipboard_provide_data (GtkClipboard *clipboard, + GtkSelectionData *selection_data, + guint info, + gpointer clipboard_graph_data) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + ClipboardGraphData *data = (ClipboardGraphData*)clipboard_graph_data; + if (info == TARGET_UTF8_STRING || info == TARGET_TIKZIT_PICTURE) { + clipboard_graph_data_convert (data); + GdkAtom target = (info == TARGET_UTF8_STRING) ? utf8_atom : tikzit_picture_atom; + gtk_selection_data_set (selection_data, + target, + 8*sizeof(gchar), + (guchar*)data->tikz, + data->tikz_length); + } + + [pool drain]; +} + +static void clipboard_release_data (GtkClipboard *clipboard, gpointer data) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + clipboard_graph_data_free ((ClipboardGraphData*)data); + [pool drain]; +} + +static void clipboard_check_targets (GtkClipboard *clipboard, + GdkAtom *atoms, + gint n_atoms, + gpointer action) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + gboolean found = FALSE; + for (gint i = 0; i < n_atoms; ++i) { + if (atoms[i] == tikzit_picture_atom) { + found = TRUE; + break; + } + } + gtk_action_set_sensitive (GTK_ACTION (action), found); + + [pool drain]; +} + +static void update_paste_action (GtkClipboard *clipboard, GdkEvent *event, GtkAction *action) { + gtk_action_set_sensitive (action, FALSE); + gtk_clipboard_request_targets (clipboard, clipboard_check_targets, action); +} + +static void clipboard_paste_contents (GtkClipboard *clipboard, + GtkSelectionData *selection_data, + gpointer document) { + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + TikzDocument *doc = (TikzDocument*)document; + gint length = gtk_selection_data_get_length (selection_data); + if (length >= 0) { + const guchar *raw_data = gtk_selection_data_get_data (selection_data); + gchar *data = g_new (gchar, length+1); + g_strlcpy (data, (const gchar *)raw_data, length+1); + NSString *tikz = [NSString stringWithUTF8String:data]; + if (tikz != nil) { + [doc pasteFromTikz:tikz]; + } + g_free (data); + } + + [pool drain]; +} + +// }}} + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/cairo_helpers.h b/tikzit-old/src/gtk/cairo_helpers.h new file mode 100644 index 0000000..e95357b --- /dev/null +++ b/tikzit-old/src/gtk/cairo_helpers.h @@ -0,0 +1,25 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import "RColor.h" +#import + +void cairo_ns_rectangle (cairo_t* cr, NSRect rect); +void cairo_set_source_rcolor (cairo_t* cr, RColor color); + +// vim:ft=objc:sts=4:sw=4:et diff --git a/tikzit-old/src/gtk/cairo_helpers.m b/tikzit-old/src/gtk/cairo_helpers.m new file mode 100644 index 0000000..104e686 --- /dev/null +++ b/tikzit-old/src/gtk/cairo_helpers.m @@ -0,0 +1,28 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "cairo_helpers.h" + +void cairo_ns_rectangle (cairo_t* cr, NSRect rect) { + cairo_rectangle (cr, rect.origin.x, rect.origin.y, rect.size.width, rect.size.height); +} + +void cairo_set_source_rcolor (cairo_t* cr, RColor color) { + cairo_set_source_rgba (cr, color.red, color.green, color.blue, color.alpha); +} + +// vim:ft=objc:sts=4:sw=4:et diff --git a/tikzit-old/src/gtk/clipboard.h b/tikzit-old/src/gtk/clipboard.h new file mode 100644 index 0000000..568fc50 --- /dev/null +++ b/tikzit-old/src/gtk/clipboard.h @@ -0,0 +1,41 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "TZFoundation.h" +#import +#import + +enum { + TARGET_UTF8_STRING, + TARGET_TIKZIT_PICTURE +}; +typedef struct +{ + Graph *graph; + gchar *tikz; + gint tikz_length; +} ClipboardGraphData; + +extern GdkAtom utf8_atom; +extern GdkAtom tikzit_picture_atom; + +void clipboard_init (); +ClipboardGraphData *clipboard_graph_data_new (Graph *graph); +void clipboard_graph_data_free (ClipboardGraphData *data); +void clipboard_graph_data_convert (ClipboardGraphData *data); + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/clipboard.m b/tikzit-old/src/gtk/clipboard.m new file mode 100644 index 0000000..7001717 --- /dev/null +++ b/tikzit-old/src/gtk/clipboard.m @@ -0,0 +1,57 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "clipboard.h" + +GdkAtom utf8_atom; +GdkAtom tikzit_picture_atom; + +void clipboard_init () { + if (utf8_atom == GDK_NONE) { + utf8_atom = gdk_atom_intern ("UTF8_STRING", FALSE); + } + if (tikzit_picture_atom == GDK_NONE) { + tikzit_picture_atom = gdk_atom_intern ("TIKZITPICTURE", FALSE); + } +} + +ClipboardGraphData *clipboard_graph_data_new (Graph *graph) { + ClipboardGraphData *data = g_new (ClipboardGraphData, 1); + data->graph = [graph retain]; + data->tikz = NULL; + data->tikz_length = 0; + return data; +} + +void clipboard_graph_data_free (ClipboardGraphData *data) { + [data->graph release]; + if (data->tikz) { + g_free (data->tikz); + } + g_free (data); +} + +void clipboard_graph_data_convert (ClipboardGraphData *data) { + if (data->graph != nil && !data->tikz) { + data->tikz = g_strdup ([[data->graph tikz] UTF8String]); + data->tikz_length = strlen (data->tikz); + [data->graph release]; + data->graph = nil; + } +} + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/gtkhelpers.h b/tikzit-old/src/gtk/gtkhelpers.h new file mode 100644 index 0000000..e4b79b8 --- /dev/null +++ b/tikzit-old/src/gtk/gtkhelpers.h @@ -0,0 +1,60 @@ +// +// gtkhelpers.h +// TikZiT +// +// Copyright 2010 Alex Merry. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// +#import "TZFoundation.h" +#include +#import + +/** + * Releases the Objective-C object pointed to by data + * + * Intended for use as a cleanup function in Glib/GObject-based + * code. + */ +void release_obj (gpointer data); + +NSString * gtk_editable_get_string (GtkEditable *editable, gint start, gint end); + +GdkRectangle gdk_rectangle_from_ns_rect (NSRect rect); +NSRect gdk_rectangle_to_ns_rect (GdkRectangle rect); + +void gtk_action_set_detailed_label (GtkAction *action, const gchar *baseLabel, const gchar *actionName); + +gint tz_hijack_key_press (GtkWindow *win, + GdkEventKey *event, + gpointer user_data); + +// Equivalent of GTK+3's gdk_pixbuf_get_from_surface() +GdkPixbuf * pixbuf_get_from_surface(cairo_surface_t *surface); + +void tz_restore_window (GtkWindow *window, gint x, gint y, gint w, gint h); + +void label_set_bold (GtkLabel *label); + +void widget_set_error (GtkWidget *widget); +void widget_clear_error (GtkWidget *widget); + +void text_buffer_clear_tag (GtkTextBuffer *buffer, GtkTextTag *tag); + +void utility_window_attach (GtkWindow *util_win, GtkWindow *parent_win); + +// vim:ft=objc:sts=2:sw=2:et diff --git a/tikzit-old/src/gtk/gtkhelpers.m b/tikzit-old/src/gtk/gtkhelpers.m new file mode 100644 index 0000000..9d26af5 --- /dev/null +++ b/tikzit-old/src/gtk/gtkhelpers.m @@ -0,0 +1,275 @@ +// +// gtkhelpers.h +// TikZiT +// +// Copyright 2010 Alex Merry. All rights reserved. +// +// Some code from Glade: +// Copyright 2001 Ximian, Inc. +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// +#import "gtkhelpers.h" +#import + +void release_obj (gpointer data) { + id obj = (id)data; + [obj release]; +} + +NSString * gtk_editable_get_string (GtkEditable *editable, gint start, gint end) +{ + gchar *text = gtk_editable_get_chars (editable, start, end); + NSString *string = [NSString stringWithUTF8String:text]; + g_free (text); + return string; +} + +GdkRectangle gdk_rectangle_from_ns_rect (NSRect box) { + GdkRectangle rect; + rect.x = box.origin.x; + rect.y = box.origin.y; + rect.width = box.size.width; + rect.height = box.size.height; + return rect; +} + +NSRect gdk_rectangle_to_ns_rect (GdkRectangle rect) { + NSRect result; + result.origin.x = rect.x; + result.origin.y = rect.y; + result.size.width = rect.width; + result.size.height = rect.height; + return result; +} + +void gtk_action_set_detailed_label (GtkAction *action, const gchar *baseLabel, const gchar *actionName) { + if (actionName == NULL || *actionName == '\0') { + gtk_action_set_label (action, baseLabel); + } else { + GString *label = g_string_sized_new (30); + g_string_printf(label, "%s: %s", baseLabel, actionName); + gtk_action_set_label (action, label->str); + g_string_free (label, TRUE); + } +} + +/** + * tz_hijack_key_press: + * @win: a #GtkWindow + * event: the GdkEventKey + * user_data: unused + * + * This function is meant to be attached to key-press-event of a toplevel, + * it simply allows the window contents to treat key events /before/ + * accelerator keys come into play (this way widgets dont get deleted + * when cutting text in an entry etc.). + * + * Returns: whether the event was handled + */ +gint +tz_hijack_key_press (GtkWindow *win, + GdkEventKey *event, + gpointer user_data) +{ + GtkWidget *focus_widget; + + focus_widget = gtk_window_get_focus (win); + if (focus_widget && + (event->keyval == GDK_Delete || /* Filter Delete from accelerator keys */ + ((event->state & GDK_CONTROL_MASK) && /* CTRL keys... */ + ((event->keyval == GDK_c || event->keyval == GDK_C) || /* CTRL-C (copy) */ + (event->keyval == GDK_x || event->keyval == GDK_X) || /* CTRL-X (cut) */ + (event->keyval == GDK_v || event->keyval == GDK_V) || /* CTRL-V (paste) */ + (event->keyval == GDK_a || event->keyval == GDK_A) || /* CTRL-A (select-all) */ + (event->keyval == GDK_n || event->keyval == GDK_N))))) /* CTRL-N (new document) ?? */ + { + return gtk_widget_event (focus_widget, + (GdkEvent *)event); + } + return FALSE; +} + +GdkPixbuf * pixbuf_get_from_surface(cairo_surface_t *surface) { + cairo_surface_flush (surface); + + int width = cairo_image_surface_get_width (surface); + int height = cairo_image_surface_get_height (surface); + int stride = cairo_image_surface_get_stride (surface); + unsigned char *data = cairo_image_surface_get_data (surface); + + GdkPixbuf *pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, + TRUE, + 8, + width, + height); + unsigned char *pbdata = gdk_pixbuf_get_pixels (pixbuf); + int pbstride = gdk_pixbuf_get_rowstride (pixbuf); + + for (int y = 0; y < height; ++y) { + uint32_t *line = (uint32_t*)(data + y*stride); + unsigned char *pbline = pbdata + (y*pbstride); + for (int x = 0; x < width; ++x) { + uint32_t pixel = *(line + x); + unsigned char *pbpixel = pbline + (x*4); + // NB: We should un-pre-mult the alpha here. + // However, in our world, alpha is always + // on or off, so it doesn't really matter + pbpixel[3] = ((pixel & 0xff000000) >> 24); + pbpixel[0] = ((pixel & 0x00ff0000) >> 16); + pbpixel[1] = ((pixel & 0x0000ff00) >> 8); + pbpixel[2] = (pixel & 0x000000ff); + } + } + + return pixbuf; +} + +/* This function mostly lifted from + * gtk+/gdk/gdkscreen.c:gdk_screen_get_monitor_at_window() + */ +static gint +get_appropriate_monitor (GdkScreen *screen, + gint x, + gint y, + gint w, + gint h) +{ + GdkRectangle rect; + gint area = 0; + gint monitor = -1; + gint num_monitors; + gint i; + + rect.x = x; + rect.y = y; + rect.width = w; + rect.height = h; + + num_monitors = gdk_screen_get_n_monitors (screen); + + for (i = 0; i < num_monitors; i++) + { + GdkRectangle geometry; + + gdk_screen_get_monitor_geometry (screen, i, &geometry); + + if (gdk_rectangle_intersect (&rect, &geometry, &geometry) && + geometry.width * geometry.height > area) + { + area = geometry.width * geometry.height; + monitor = i; + } + } + + if (monitor >= 0) + return monitor; + else + return gdk_screen_get_monitor_at_point (screen, + rect.x + rect.width / 2, + rect.y + rect.height / 2); +} + +/* This function mostly lifted from gimp_session_info_apply_geometry + * in gimp-2.6/app/widgets/gimpsessioninfo.c + */ +void tz_restore_window (GtkWindow *window, gint x, gint y, gint w, gint h) +{ + gint forced_w = w; + gint forced_h = h; + if (w <= 0 || h <= 0) { + gtk_window_get_default_size (window, &w, &h); + } + if (w <= 0 || h <= 0) { + gtk_window_get_size (window, &w, &h); + } + + GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET (window)); + + gint monitor = 0; + if (w > 0 && h > 0) { + monitor = get_appropriate_monitor (screen, x, y, w, h); + } else { + monitor = gdk_screen_get_monitor_at_point (screen, x, y); + } + + GdkRectangle rect; + gdk_screen_get_monitor_geometry (screen, monitor, &rect); + + x = CLAMP (x, + rect.x, + rect.x + rect.width - (w > 0 ? w : 128)); + y = CLAMP (y, + rect.y, + rect.y + rect.height - (h > 0 ? h : 128)); + + gchar geom[32]; + g_snprintf (geom, sizeof (geom), "%+d%+d", x, y); + + gtk_window_parse_geometry (window, geom); + + if (forced_w > 0 && forced_h > 0) { + gtk_window_set_default_size (window, forced_w, forced_h); + } +} + +void label_set_bold (GtkLabel *label) { + PangoAttrList *attrs = pango_attr_list_new (); + pango_attr_list_insert (attrs, + pango_attr_weight_new (PANGO_WEIGHT_SEMIBOLD)); + gtk_label_set_attributes (label, attrs); + pango_attr_list_unref (attrs); +} + +void widget_set_error (GtkWidget *widget) { + GdkColor color = {0, 65535, 61184, 61184}; + gtk_widget_modify_base (widget, GTK_STATE_NORMAL, &color); +} + +void widget_clear_error (GtkWidget *widget) { + gtk_widget_modify_base (widget, GTK_STATE_NORMAL, NULL); +} + +void text_buffer_clear_tag (GtkTextBuffer *buffer, GtkTextTag *tag) { + GtkTextIter start; + GtkTextIter end; + gtk_text_buffer_get_start_iter (buffer, &start); + gtk_text_buffer_get_end_iter (buffer, &end); + gtk_text_buffer_remove_tag (buffer, tag, &start, &end); +} + +void utility_window_attach (GtkWindow *util_win, GtkWindow *parent_win) { + if (parent_win == gtk_window_get_transient_for (util_win)) + return; + + // HACK: X window managers tend to move windows around when they are + // unmapped and mapped again, so we save the position + gint x, y; + gtk_window_get_position (util_win, &x, &y); + + // HACK: Altering WM_TRANSIENT_FOR on a non-hidden but unmapped window + // (eg: when you have minimised the original parent window) can + // cause the window to be lost forever, so we hide it first + gtk_widget_hide (GTK_WIDGET (util_win)); + gtk_window_set_focus_on_map (util_win, FALSE); + gtk_window_set_transient_for (util_win, parent_win); + gtk_widget_show (GTK_WIDGET (util_win)); + + // HACK: see above + gtk_window_move (util_win, x, y); +} + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/logo.h b/tikzit-old/src/gtk/logo.h new file mode 100644 index 0000000..e778da9 --- /dev/null +++ b/tikzit-old/src/gtk/logo.h @@ -0,0 +1,32 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include + +typedef enum { + LOGO_SIZE_16, + LOGO_SIZE_24, + LOGO_SIZE_32, + LOGO_SIZE_48, + LOGO_SIZE_64, + LOGO_SIZE_128, + LOGO_SIZE_COUNT +} LogoSize; + +GdkPixbuf *get_logo (LogoSize size); + +// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/logo.m b/tikzit-old/src/gtk/logo.m new file mode 100644 index 0000000..57533c7 --- /dev/null +++ b/tikzit-old/src/gtk/logo.m @@ -0,0 +1,64 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import "logo.h" +#include + +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpointer-sign" +#import "logodata.m" +#pragma GCC diagnostic pop + +static GdkPixbuf *pixbufCache[LOGO_SIZE_COUNT]; + +GdkPixbuf *get_logo (LogoSize size) { + const GdkPixdata *data = NULL; + switch (size) { + case LOGO_SIZE_16: + data = &logo16; + break; + case LOGO_SIZE_24: + data = &logo24; + break; + case LOGO_SIZE_32: + data = &logo32; + break; + case LOGO_SIZE_48: + data = &logo48; + break; + case LOGO_SIZE_64: + data = &logo64; + break; + case LOGO_SIZE_128: + data = &logo128; + break; + default: + return NULL; + }; + if (pixbufCache[size]) { + g_object_ref (pixbufCache[size]); + return pixbufCache[size]; + } else { + GdkPixbuf *buf = gdk_pixbuf_from_pixdata (data, FALSE, NULL); + pixbufCache[size] = buf; + g_object_add_weak_pointer (G_OBJECT (buf), (void**)(&(pixbufCache[size]))); + return buf; + } +} + +// vim:ft=objc:ts=8:et:sts=4:sw=4 + diff --git a/tikzit-old/src/gtk/main.m b/tikzit-old/src/gtk/main.m new file mode 100644 index 0000000..5d9f4a4 --- /dev/null +++ b/tikzit-old/src/gtk/main.m @@ -0,0 +1,111 @@ +// +// main.m +// TikZiT +// +// Copyright 2010 Chris Heunen. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "TZFoundation.h" +#import +#import "clipboard.h" +#import "logo.h" +#import "tzstockitems.h" + +#import "Application.h" + +static GOptionEntry entries[] = +{ + //{ "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose, "Be verbose", NULL }, + { NULL } +}; + +void onUncaughtException(NSException* exception) +{ + NSString *joinStr = @"\n "; + NSLog(@"uncaught exception: %@\n backtrace: %@", + [exception description], + [[exception callStackSymbols] componentsJoinedByString:joinStr]); +} + +int main (int argc, char *argv[]) { + NSSetUncaughtExceptionHandler(&onUncaughtException); + + [[NSAutoreleasePool alloc] init]; + + GError *error = NULL; + GOptionContext *context; + context = g_option_context_new ("[FILES] - PGF/TikZ-based graph editor"); + g_option_context_add_main_entries (context, entries, NULL); + g_option_context_add_group (context, gtk_get_option_group (TRUE)); + if (!g_option_context_parse (context, &argc, &argv, &error)) + { + if (error->domain == G_OPTION_ERROR) { + g_print ("%s\nUse --help to see available options\n", error->message); + } else { + g_print ("Unexpected error parsing options: %s\n", error->message); + } + exit (1); + } + g_option_context_free (context); + +#ifndef WINDOWS + GList *icon_list = NULL; + icon_list = g_list_prepend (icon_list, get_logo(LOGO_SIZE_128)); + icon_list = g_list_prepend (icon_list, get_logo(LOGO_SIZE_64)); + icon_list = g_list_prepend (icon_list, get_logo(LOGO_SIZE_48)); + icon_list = g_list_prepend (icon_list, get_logo(LOGO_SIZE_32)); + icon_list = g_list_prepend (icon_list, get_logo(LOGO_SIZE_24)); + icon_list = g_list_prepend (icon_list, get_logo(LOGO_SIZE_16)); + gtk_window_set_default_icon_list (icon_list); + GList *list_head = icon_list; + while (list_head) { + g_object_unref ((GObject*)list_head->data); + list_head = list_head->next; + } +#endif + + NSAutoreleasePool *initPool = [[NSAutoreleasePool alloc] init]; + + tz_register_stock_items(); + clipboard_init(); + + Application *app = nil; + if (argc > 1) { + NSMutableArray *files = [NSMutableArray arrayWithCapacity:argc-1]; + for (int i = 1; i < argc; ++i) { + [files insertObject:[NSString stringWithGlibFilename:argv[i]] + atIndex:i-1]; + } + NSLog(@"Files: %@", files); + app = [[Application alloc] initWithFiles:files]; + } else { + app = [[Application alloc] init]; + } + + [initPool drain]; + + gtk_main (); + + [app saveConfiguration]; + [app release]; + + return 0; +} + +// vim:ft=objc:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/mkdtemp.h b/tikzit-old/src/gtk/mkdtemp.h new file mode 100644 index 0000000..65ee99e --- /dev/null +++ b/tikzit-old/src/gtk/mkdtemp.h @@ -0,0 +1,32 @@ +/* Creating a private temporary directory. + Copyright (C) 2001-2002 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#if HAVE_MKDTEMP + +/* Get mkdtemp() declaration. */ +#include + +#else + +/* Create a unique temporary directory from TEMPLATE. + The last six characters of TEMPLATE must be "XXXXXX"; + they are replaced with a string that makes the directory name unique. + Returns TEMPLATE, or a null pointer if it cannot get a unique name. + The directory is created mode 700. */ +extern char * mkdtemp (char *template); + +#endif diff --git a/tikzit-old/src/gtk/mkdtemp.m b/tikzit-old/src/gtk/mkdtemp.m new file mode 100644 index 0000000..ee3cd7c --- /dev/null +++ b/tikzit-old/src/gtk/mkdtemp.m @@ -0,0 +1,180 @@ +/* Copyright (C) 1999, 2001-2003 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + see . + */ + +/* Extracted from misc/mkdtemp.c and sysdeps/posix/tempname.c. */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +/* Specification. */ +#include "mkdtemp.h" + +#include +#ifndef __set_errno +# define __set_errno(Val) errno = (Val) +#endif + +#include +#include +#include + +#include +#ifndef TMP_MAX +# define TMP_MAX 238328 +#endif + +#if HAVE_STDINT_H || _LIBC +# include +#endif +#if HAVE_INTTYPES_H +# include +#endif + +#if HAVE_UNISTD_H || _LIBC +# include +#endif + +#if HAVE_GETTIMEOFDAY || _LIBC +# if HAVE_SYS_TIME_H || _LIBC +# include +# endif +#else +# if HAVE_TIME_H || _LIBC +# include +# endif +#endif + +#include "stat.h" + +#ifdef __MINGW32__ +/* mingw's mkdir() function has 1 argument, but we pass 2 arguments. + Therefore we have to disable the argument count checking. */ +# define mkdir ((int (*)()) mkdir) +#endif + +#if !_LIBC +# define __getpid getpid +# define __gettimeofday gettimeofday +# define __mkdir mkdir +#endif + +/* Use the widest available unsigned type if uint64_t is not + available. The algorithm below extracts a number less than 62**6 + (approximately 2**35.725) from uint64_t, so ancient hosts where + uintmax_t is only 32 bits lose about 3.725 bits of randomness, + which is better than not having mkstemp at all. */ +#if !defined UINT64_MAX && !defined uint64_t +# define uint64_t uintmax_t +#endif + +/* These are the characters used in temporary filenames. */ +static const char letters[] = +"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; + +/* Generate a temporary file name based on TMPL. TMPL must match the + rules for mk[s]temp (i.e. end in "XXXXXX"). The name constructed + does not exist at the time of the call to __gen_tempname. TMPL is + overwritten with the result. + + KIND is: + __GT_DIR: create a directory, which will be mode 0700. + + We use a clever algorithm to get hard-to-predict names. */ +static int +gen_tempname (char *tmpl) +{ + int len; + char *XXXXXX; + static uint64_t value; + uint64_t random_time_bits; + int count, fd = -1; + int save_errno = errno; + + len = strlen (tmpl); + if (len < 6 || strcmp (&tmpl[len - 6], "XXXXXX")) + { + __set_errno (EINVAL); + return -1; + } + + /* This is where the Xs start. */ + XXXXXX = &tmpl[len - 6]; + + /* Get some more or less random data. */ +#ifdef RANDOM_BITS + RANDOM_BITS (random_time_bits); +#else +# if HAVE_GETTIMEOFDAY || _LIBC + { + struct timeval tv; + __gettimeofday (&tv, NULL); + random_time_bits = ((uint64_t) tv.tv_usec << 16) ^ tv.tv_sec; + } +# else + random_time_bits = time (NULL); +# endif +#endif + value += random_time_bits ^ __getpid (); + + for (count = 0; count < TMP_MAX; value += 7777, ++count) + { + uint64_t v = value; + + /* Fill in the random bits. */ + XXXXXX[0] = letters[v % 62]; + v /= 62; + XXXXXX[1] = letters[v % 62]; + v /= 62; + XXXXXX[2] = letters[v % 62]; + v /= 62; + XXXXXX[3] = letters[v % 62]; + v /= 62; + XXXXXX[4] = letters[v % 62]; + v /= 62; + XXXXXX[5] = letters[v % 62]; + + fd = __mkdir (tmpl, S_IRUSR | S_IWUSR | S_IXUSR); + + if (fd >= 0) + { + __set_errno (save_errno); + return fd; + } + else if (errno != EEXIST) + return -1; + } + + /* We got out of the loop because we ran out of combinations to try. */ + __set_errno (EEXIST); + return -1; +} + +/* Generate a unique temporary directory from TEMPLATE. + The last six characters of TEMPLATE must be "XXXXXX"; + they are replaced with a string that makes the filename unique. + The directory is created, mode 700, and its name is returned. + (This function comes from OpenBSD.) */ +char * +mkdtemp (char *template) +{ + if (gen_tempname (template)) + return NULL; + else + return template; +} diff --git a/tikzit-old/src/gtk/stat.h b/tikzit-old/src/gtk/stat.h new file mode 100644 index 0000000..a9829ae --- /dev/null +++ b/tikzit-old/src/gtk/stat.h @@ -0,0 +1,25 @@ +#include +#if STAT_MACROS_BROKEN +# undef S_ISDIR +#endif +#if !defined S_ISDIR && defined S_IFDIR +# define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR) +#endif +#if !S_IRUSR && S_IREAD +# define S_IRUSR S_IREAD +#endif +#if !S_IRUSR +# define S_IRUSR 00400 +#endif +#if !S_IWUSR && S_IWRITE +# define S_IWUSR S_IWRITE +#endif +#if !S_IWUSR +# define S_IWUSR 00200 +#endif +#if !S_IXUSR && S_IEXEC +# define S_IXUSR S_IEXEC +#endif +#if !S_IXUSR +# define S_IXUSR 00100 +#endif diff --git a/tikzit-old/src/gtk/test/gtk.m b/tikzit-old/src/gtk/test/gtk.m new file mode 100644 index 0000000..aabb0f2 --- /dev/null +++ b/tikzit-old/src/gtk/test/gtk.m @@ -0,0 +1,27 @@ +// +// linux.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// +#import "test/test.h" + +void testGtk() { + +} diff --git a/tikzit-old/src/gtk/test/main.m b/tikzit-old/src/gtk/test/main.m new file mode 100644 index 0000000..639a335 --- /dev/null +++ b/tikzit-old/src/gtk/test/main.m @@ -0,0 +1,50 @@ +// +// main.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// +#include "config.h" +#import "test/test.h" +#include +void testCommon(); + +int main(int argc, char **argv) { + if (argc == 2 && strcmp(argv[1], "--disable-color")==0) { + setColorEnabled(NO); + } else { + setColorEnabled(YES); + } + + PUTS(@""); + PUTS(@"**********************************************"); + PUTS(@"TikZiT TESTS, LINUX VERSION %@", VERSION); + PUTS(@"**********************************************"); + PUTS(@""); + + startTests(); + testCommon(); + testLinux(); + + PUTS(@""); + PUTS(@"**********************************************"); + endTests(); + PUTS(@"**********************************************"); + PUTS(@""); +} diff --git a/tikzit-old/src/gtk/tzstockitems.h b/tikzit-old/src/gtk/tzstockitems.h new file mode 100644 index 0000000..5ad0da9 --- /dev/null +++ b/tikzit-old/src/gtk/tzstockitems.h @@ -0,0 +1,26 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#define TIKZIT_STOCK_SELECT "tikzit-select" +#define TIKZIT_STOCK_CREATE_NODE "tikzit-create-node" +#define TIKZIT_STOCK_CREATE_EDGE "tikzit-create-edge" +#define TIKZIT_STOCK_BOUNDING_BOX "tikzit-bounding-box" +#define TIKZIT_STOCK_DRAG "tikzit-drag" + +void tz_register_stock_items(); + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/tzstockitems.m b/tikzit-old/src/gtk/tzstockitems.m new file mode 100644 index 0000000..5eba912 --- /dev/null +++ b/tikzit-old/src/gtk/tzstockitems.m @@ -0,0 +1,64 @@ +/* + * Copyright 2012 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "tzstockitems.h" +#include +#include + +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wpointer-sign" +#import "icondata.m" +#pragma GCC diagnostic pop + +static GtkStockItem stock_items[] = { + // gchar *stock_id; + // gchar *label; + // GdkModifierType modifier; + // guint keyval; + // gchar *translation_domain; + { TIKZIT_STOCK_SELECT, "Select", 0, 0, NULL }, + { TIKZIT_STOCK_CREATE_NODE, "Create Node", 0, 0, NULL }, + { TIKZIT_STOCK_CREATE_EDGE, "Create Edge", 0, 0, NULL }, + { TIKZIT_STOCK_BOUNDING_BOX, "Bounding Box", 0, 0, NULL }, + { TIKZIT_STOCK_DRAG, "Drag", 0, 0, NULL }, +}; +static guint n_stock_items = G_N_ELEMENTS (stock_items); + +static void icon_factory_add_pixdata (GtkIconFactory *factory, + const gchar *stock_id, + const GdkPixdata *image_data) { + + GdkPixbuf *buf = gdk_pixbuf_from_pixdata (image_data, FALSE, NULL); + GtkIconSet *icon_set = gtk_icon_set_new_from_pixbuf (buf); + gtk_icon_factory_add (factory, stock_id, icon_set); + gtk_icon_set_unref (icon_set); + g_object_unref (G_OBJECT (buf)); +} + +void tz_register_stock_items() { + gtk_stock_add_static (stock_items, n_stock_items); + + GtkIconFactory *factory = gtk_icon_factory_new (); + icon_factory_add_pixdata (factory, TIKZIT_STOCK_SELECT, &select_rectangular); + icon_factory_add_pixdata (factory, TIKZIT_STOCK_CREATE_NODE, &draw_ellipse); + icon_factory_add_pixdata (factory, TIKZIT_STOCK_CREATE_EDGE, &draw_path); + icon_factory_add_pixdata (factory, TIKZIT_STOCK_BOUNDING_BOX, &transform_crop_and_resize); + icon_factory_add_pixdata (factory, TIKZIT_STOCK_DRAG, &transform_move); + gtk_icon_factory_add_default (factory); +} + +// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/tztoolpalette.h b/tikzit-old/src/gtk/tztoolpalette.h new file mode 100644 index 0000000..45ec2ac --- /dev/null +++ b/tikzit-old/src/gtk/tztoolpalette.h @@ -0,0 +1,56 @@ +/* GIMP - The GNU Image Manipulation Program + * Copyright (C) 1995 Spencer Kimball and Peter Mattis + * + * tztoolpalette.h, based on gimptoolpalette.h + * Copyright (C) 2010 Michael Natterer + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef __TZ_TOOL_PALETTE_H__ +#define __TZ_TOOL_PALETTE_H__ + + +#define TZ_TYPE_TOOL_PALETTE (tz_tool_palette_get_type ()) +#define TZ_TOOL_PALETTE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TZ_TYPE_TOOL_PALETTE, TzToolPalette)) +#define TZ_TOOL_PALETTE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TZ_TYPE_TOOL_PALETTE, TzToolPaletteClass)) +#define TZ_IS_TOOL_PALETTE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TZ_TYPE_TOOL_PALETTE)) +#define TZ_IS_TOOL_PALETTE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TZ_TYPE_TOOL_PALETTE)) +#define TZ_TOOL_PALETTE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TZ_TYPE_TOOL_PALETTE, TzToolPaletteClass)) + + +typedef struct _TzToolPaletteClass TzToolPaletteClass; +typedef struct _TzToolPalette TzToolPalette; + +struct _TzToolPalette +{ + GtkToolPalette parent_instance; +}; + +struct _TzToolPaletteClass +{ + GtkToolPaletteClass parent_class; +}; + + +GType tz_tool_palette_get_type (void) G_GNUC_CONST; + +GtkWidget * tz_tool_palette_new (void); + +gboolean tz_tool_palette_get_button_size (TzToolPalette *widget, + gint *width, + gint *height); + + +#endif /* __TZ_TOOL_PALETTE_H__ */ diff --git a/tikzit-old/src/gtk/tztoolpalette.m b/tikzit-old/src/gtk/tztoolpalette.m new file mode 100644 index 0000000..a948127 --- /dev/null +++ b/tikzit-old/src/gtk/tztoolpalette.m @@ -0,0 +1,158 @@ +/* GIMP - The GNU Image Manipulation Program + * Copyright (C) 1995 Spencer Kimball and Peter Mattis + * + * tztoolpalette.c, based on gimptoolpalette.c + * Copyright (C) 2010 Michael Natterer + * Copyright (C) 2012 Alex Merry + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include + +#include "tztoolpalette.h" + + +#define DEFAULT_TOOL_ICON_SIZE GTK_ICON_SIZE_BUTTON +#define DEFAULT_BUTTON_RELIEF GTK_RELIEF_NONE + +#define TOOL_BUTTON_DATA_KEY "tz-tool-palette-item" +#define TOOL_INFO_DATA_KEY "tz-tool-info" + + +typedef struct _TzToolPalettePrivate TzToolPalettePrivate; + +struct _TzToolPalettePrivate +{ + gint tool_rows; + gint tool_columns; +}; + +#define GET_PRIVATE(p) G_TYPE_INSTANCE_GET_PRIVATE (p, \ + TZ_TYPE_TOOL_PALETTE, \ + TzToolPalettePrivate) + + +static void tz_tool_palette_size_allocate (GtkWidget *widget, + GtkAllocation *allocation); + + +G_DEFINE_TYPE (TzToolPalette, tz_tool_palette, GTK_TYPE_TOOL_PALETTE) + +#define parent_class tz_tool_palette_parent_class + + +static void +tz_tool_palette_class_init (TzToolPaletteClass *klass) +{ + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); + + widget_class->size_allocate = tz_tool_palette_size_allocate; + + g_type_class_add_private (klass, sizeof (TzToolPalettePrivate)); +} + +static void +tz_tool_palette_init (TzToolPalette *palette) +{ +} + +static GtkToolItemGroup * +tz_tool_palette_tool_group (TzToolPalette *palette) +{ + GList *children; + GtkToolItemGroup *group; + + children = gtk_container_get_children (GTK_CONTAINER (palette)); + g_return_val_if_fail (children, NULL); + group = GTK_TOOL_ITEM_GROUP (children->data); + g_list_free (children); + + return group; +} + +gboolean +tz_tool_palette_get_button_size (TzToolPalette *palette, + gint *width, + gint *height) +{ + g_return_val_if_fail (width || height, FALSE); + + GtkToolItemGroup *group = tz_tool_palette_tool_group (palette); + g_return_val_if_fail (group, FALSE); + + guint tool_count = gtk_tool_item_group_get_n_items (group); + if (tool_count > 0) + { + GtkWidget *tool_button; + GtkRequisition button_requisition; + + tool_button = GTK_WIDGET (gtk_tool_item_group_get_nth_item (group, 0)); + gtk_widget_size_request (tool_button, &button_requisition); + if (width) + *width = button_requisition.width; + if (height) + *height = button_requisition.height; + return TRUE; + } + return FALSE; +} + +static void +tz_tool_palette_size_allocate (GtkWidget *widget, + GtkAllocation *allocation) +{ + TzToolPalettePrivate *private = GET_PRIVATE (widget); + GtkToolItemGroup *group = tz_tool_palette_tool_group (TZ_TOOL_PALETTE (widget)); + + g_return_if_fail (group); + + GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation); + + guint tool_count = gtk_tool_item_group_get_n_items (group); + if (tool_count > 0) + { + GtkWidget *tool_button; + GtkRequisition button_requisition; + gint tool_rows; + gint tool_columns; + + tool_button = GTK_WIDGET (gtk_tool_item_group_get_nth_item (group, 0)); + gtk_widget_size_request (tool_button, &button_requisition); + + tool_columns = MAX (1, (allocation->width / button_requisition.width)); + tool_rows = tool_count / tool_columns; + + if (tool_count % tool_columns) + tool_rows++; + + if (private->tool_rows != tool_rows || + private->tool_columns != tool_columns) + { + private->tool_rows = tool_rows; + private->tool_columns = tool_columns; + + gtk_widget_set_size_request (widget, -1, + tool_rows * button_requisition.height); + } + } +} + +GtkWidget * +tz_tool_palette_new (void) +{ + return g_object_new (TZ_TYPE_TOOL_PALETTE, NULL); +} + +// vim:ft=objc:ts=8:et:sts=2:sw=2:foldmethod=marker diff --git a/tikzit-old/src/osx/AppDelegate.h b/tikzit-old/src/osx/AppDelegate.h new file mode 100644 index 0000000..92d9add --- /dev/null +++ b/tikzit-old/src/osx/AppDelegate.h @@ -0,0 +1,57 @@ +// +// AppDelegate.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import "StylePaletteController.h" +#import "ToolPaletteController.h" +#import "PropertyInspectorController.h" +#import "PreambleController.h" +#import "PreviewController.h" +#import "GraphicsView.h" +#import "PreferenceController.h" + +@interface AppDelegate : NSObject { + NSMapTable *table; + StylePaletteController *stylePaletteController; + PropertyInspectorController *propertyInspectorController; + PreambleController *preambleController; + PreviewController *previewController; + PreferenceController *preferenceController; + ToolPaletteController *toolPaletteController; + IBOutlet GraphicsView *graphicsView; + NSString *tempDir; +} + +@property IBOutlet StylePaletteController *stylePaletteController; +@property (strong) IBOutlet ToolPaletteController *toolPaletteController; + +- (void)awakeFromNib; ++ (void)setDefaults; +- (void)applicationWillTerminate:(NSNotification *)notification; +- (IBAction)toggleStyleInspector:(id)sender; +- (IBAction)togglePropertyInspector:(id)sender; +- (IBAction)togglePreamble:(id)sender; +- (IBAction)togglePreferences:(id)sender; +- (IBAction)refreshShapes:(id)sender; + +@end diff --git a/tikzit-old/src/osx/AppDelegate.m b/tikzit-old/src/osx/AppDelegate.m new file mode 100644 index 0000000..94f5507 --- /dev/null +++ b/tikzit-old/src/osx/AppDelegate.m @@ -0,0 +1,124 @@ +// +// AppDelegate.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "AppDelegate.h" +#import "TikzDocument.h" +#import "Shape.h" +#import "SupportDir.h" + +@implementation AppDelegate + +@synthesize stylePaletteController, toolPaletteController; + ++(void)initialize{ + [self setDefaults]; +} + +- (void)awakeFromNib { + [SupportDir createUserSupportDir]; + NSString *supportDir = [SupportDir userSupportDir]; + //NSLog(stylePlist); + stylePaletteController = + [[StylePaletteController alloc] initWithWindowNibName:@"StylePalette" + supportDir:supportDir]; + + propertyInspectorController = + [[PropertyInspectorController alloc] initWithWindowNibName:@"PropertyInspector"]; + + [propertyInspectorController setStylePaletteController:stylePaletteController]; + + NSString *preamblePlist = [supportDir stringByAppendingPathComponent:@"preambles.plist"]; + preambleController = + [[PreambleController alloc] initWithNibName:@"Preamble" + plist:preamblePlist + styles:[stylePaletteController nodeStyles] + edges:[stylePaletteController edgeStyles]]; + + + char template[] = "/tmp/tikzit_tmp_XXXXXXX"; + char *dir = mkdtemp(template); + tempDir = [NSString stringWithUTF8String:dir]; + + NSLog(@"created temp dir: %@", tempDir); + NSLog(@"system support dir: %@", [SupportDir systemSupportDir]); + + previewController = + [[PreviewController alloc] initWithWindowNibName:@"Preview" + preambleController:preambleController + tempDir:tempDir]; + + preferenceController = [[PreferenceController alloc] initWithWindowNibName:@"Preferences" preambleController:preambleController]; + + // each application has one global preview controller + [PreviewController setDefaultPreviewController:previewController]; +} + ++ (void)setDefaults{ + NSString *userDefaultsValuesPath; + NSDictionary *userDefaultsValuesDict; + + userDefaultsValuesPath=[[NSBundle mainBundle] pathForResource:@"UserDefaults" + ofType:@"plist"]; + userDefaultsValuesDict=[NSDictionary dictionaryWithContentsOfFile:userDefaultsValuesPath]; + + [[NSUserDefaults standardUserDefaults] registerDefaults:userDefaultsValuesDict]; +} + +- (void)applicationWillTerminate:(NSNotification *)notification { + NSString *supportDir = [SupportDir userSupportDir]; + [stylePaletteController saveStyles:supportDir]; + [preambleController savePreambles:[supportDir stringByAppendingPathComponent:@"preambles.plist"]]; + + NSLog(@"wiping temp dir: %@", tempDir); + [[NSFileManager defaultManager] removeItemAtPath:tempDir error:NULL]; +} + +- (void)toggleController:(NSWindowController*)c { + if ([[c window] isVisible]) { + [c close]; + } else { + [c showWindow:self]; + } +} + +- (IBAction)toggleStyleInspector:(id)sender { + [self toggleController:stylePaletteController]; +} + +- (IBAction)togglePropertyInspector:(id)sender { + [self toggleController:propertyInspectorController]; +} + +- (IBAction)togglePreamble:(id)sender { + [self toggleController:(NSWindowController *) preambleController]; +} + +- (IBAction)togglePreferences:(id)sender { + [self toggleController:preferenceController]; +} + +- (IBAction)refreshShapes:(id)sender { + [Shape refreshShapeDictionary]; +} + +@end diff --git a/tikzit-old/src/osx/CALayer+DrawLabel.h b/tikzit-old/src/osx/CALayer+DrawLabel.h new file mode 100644 index 0000000..32282d9 --- /dev/null +++ b/tikzit-old/src/osx/CALayer+DrawLabel.h @@ -0,0 +1,21 @@ +// +// CALayer+DrawLabel.h +// TikZiT +// +// Created by Aleks Kissinger on 09/05/2011. +// Copyright 2011 Aleks Kissinger. All rights reserved. +// + +#import +#import + +@class Transformer; + +@interface CALayer(DrawLabel) + +- (void)drawLabel:(NSString*)label + atPoint:(NSPoint)pt + inContext:(CGContextRef)context + usingTrans:(Transformer*)t; + +@end diff --git a/tikzit-old/src/osx/CALayer+DrawLabel.m b/tikzit-old/src/osx/CALayer+DrawLabel.m new file mode 100644 index 0000000..4860a3c --- /dev/null +++ b/tikzit-old/src/osx/CALayer+DrawLabel.m @@ -0,0 +1,84 @@ +// +// CALayer+DrawLabel.m +// TikZiT +// +// Created by Aleks Kissinger on 09/05/2011. +// Copyright 2011 Aleks Kissinger. All rights reserved. +// + +#import "CALayer+DrawLabel.h" +#import "Transformer.h" + +@implementation CALayer(DrawLabel) + +- (void)drawLabel:(NSString*)label + atPoint:(NSPoint)pt + inContext:(CGContextRef)context + usingTrans:(Transformer*)t { + + CGContextSaveGState(context); + + if ([label length] > 15) { + label = [[label substringToIndex:12] stringByAppendingString:@"..."]; + } + + float fontSize = [t scaleToScreen:0.18f]; // size 9 @ 100% + if (fontSize > 18.0f) fontSize = 18.0f; + + // Prepare font + CTFontRef font = CTFontCreateWithName(CFSTR("Monaco"), fontSize, NULL); + + // Create an attributed string + CFStringRef keys[] = { kCTFontAttributeName }; + CFTypeRef values[] = { font }; + CFDictionaryRef attr = CFDictionaryCreate(NULL, + (const void **)&keys, + (const void **)&values, + sizeof(keys) / sizeof(keys[0]), + &kCFTypeDictionaryKeyCallBacks, + &kCFTypeDictionaryValueCallBacks); + CFAttributedStringRef attrString = + CFAttributedStringCreate(NULL, (CFStringRef)label, attr); + CFRelease(attr); + + // Draw the string + CTLineRef line = CTLineCreateWithAttributedString(attrString); + CGContextSetTextMatrix(context, CGAffineTransformIdentity); + CGContextSetTextPosition(context, 0, 0); + + CGRect labelBounds = CGRectIntegral(CTLineGetImageBounds(line, context)); + //int shiftx = round(labelBounds.size.width / 2); + + CGContextSetTextPosition(context, + round(pt.x - (labelBounds.size.width/2)), + round(pt.y - (0.9*labelBounds.size.height/2))); + + labelBounds = CGRectIntegral(CTLineGetImageBounds(line, context)); + labelBounds.origin.x -= 2; + labelBounds.origin.y -= 2; + labelBounds.size.width += 4; + labelBounds.size.height += 4; + + CGContextSetShouldAntialias(context, NO); + + CGContextSetRGBFillColor(context, 1.0f, 1.0f, 0.5f, 0.7f); + CGContextSetRGBStrokeColor(context, 0.5f, 0.0f, 0.0f, 0.7f); + + CGContextFillRect(context, labelBounds); + CGContextStrokeRect(context, labelBounds); + + CGContextSetShouldAntialias(context, YES); + + CGContextSetRGBFillColor(context, 0.3f, 0.3f, 0.3f, 0.7f); + + CTLineDraw(line, context); + + // Clean up + CFRelease(line); + CFRelease(attrString); + CFRelease(font); + + CGContextRestoreGState(context); +} + +@end diff --git a/tikzit-old/src/osx/CoreGraphicsRenderContext.h b/tikzit-old/src/osx/CoreGraphicsRenderContext.h new file mode 100644 index 0000000..7b00484 --- /dev/null +++ b/tikzit-old/src/osx/CoreGraphicsRenderContext.h @@ -0,0 +1,44 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import +#import "RenderContext.h" + +@interface CoreTextLayout: NSObject { + CFAttributedStringRef attrString; + CTFontRef font; + CTLineRef line; + CGContextRef ctx; +} + ++ (CoreTextLayout*) layoutForContext:(CGContextRef)c withString:(NSString*)string fontSize:(CGFloat)fontSize; +- (id) initWithContext:(CGContextRef)cr withString:(NSString*)string fontSize:(CGFloat)fontSize; + +@end + +@interface CoreGraphicsRenderContext: NSObject { + CGContextRef ctx; +} + ++ (CoreGraphicsRenderContext*) contextWithCGContext:(CGContextRef)c; ++ (id) initWithCGContext:(CGContextRef)c; + +- (CGContextRef) ctx; + +@end + +// vim:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/osx/CoreGraphicsRenderContext.m b/tikzit-old/src/osx/CoreGraphicsRenderContext.m new file mode 100644 index 0000000..1cb0daf --- /dev/null +++ b/tikzit-old/src/osx/CoreGraphicsRenderContext.m @@ -0,0 +1,234 @@ +/* + * Copyright 2011 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#import +#import "RenderContext.h" + +@implementation CoreTextLayout + ++ (CoreTextLayout*) layoutForContext:(CGContextRef)c withString:(NSString*)string fontSize:(CGFloat)fontSize { + return [[[self alloc] initWithContext:c withString:string fontSize:fontSize] autorelease]; +} + +- (id) initWithContext:(CGContextRef)cr withString:(NSString*)string fontSize:(CGFloat)fontSize { + self = [super init]; + + if (self == nil) { + return nil; + } + + CGContextRetain (cr); + ctx = cr; + font = CTFontCreateWithName(CFSTR("Monaco"), fontSize, NULL); + + // Create an attributed string + CFStringRef keys[] = { kCTFontAttributeName }; + CFTypeRef values[] = { font }; + CFDictionaryRef attr = CFDictionaryCreate(NULL, + (const void **)&keys, + (const void **)&values, + sizeof(keys) / sizeof(keys[0]), + &kCFTypeDictionaryKeyCallBacks, + &kCFTypeDictionaryValueCallBacks); + attrString = CFAttributedStringCreate(NULL, (CFStringRef)lab, attr); + CFRelease(attr); + line = CTLineCreateWithAttributedString(attrString); + + return self; +} + +- (NSSize) size { + CGRect labelBounds = CGRectIntegral(CTLineGetImageBounds(line, ctx)); + return labelBounds.size; +} + +- (NSString*) text { + return CFAttributedStringGetString (attrString); +} + +- (void) showTextAt:(NSPoint)topLeft withColor:(RColor)color { + CGContextSaveGState(ctx); + + CGContextSetRGBFillColor(ctx, color.red, color.green, color.blue, color.alpha); + CGContextSetRGBStrokeColor(ctx, color.red, color.green, color.blue, color.alpha); + CGContextSetShouldAntialias(ctx, YES); + + CGContextSetTextMatrix(ctx, CGAffineTransformIdentity); + CGContextSetTextPosition(ctx, 0, 0); + CGRect bounds = CGRectIntegral(CTLineGetImageBounds(line, ctx)); + CGContextSetTextPosition(ctx, topLeft.x - bounds.x, topLeft.y - bounds.y); + + CTLineDraw(line, ctx); + + CGContextRestoreGState(ctx); +} + +- (void) dealloc { + CFRelease(line); + CFRelease(attrString); + CFRelease(font); + CGContextRelease (ctx); + + [super dealloc]; +} + +@end + +@implementation CoreGraphicsRenderContext + ++ (CoreGraphicsRenderContext*) contextWithCGContext:(CGContextRef)c { + return [[[self alloc] initWithCGContext:c] autorelease]; +} + ++ (id) initWithCGContext:(CGContextRef)c { + self = [super init]; + + if (self) { + ctx = c; + CGContextRetain (ctx); + } + + return self; +} + +- (void) dealloc { + CGContextRelease (ctx); + + [super dealloc]; +} + +- (CGContextRef) ctx { + return ctx; +} + +- (void) saveState { + CGContextSaveGState(ctx); +} + +- (void) restoreState { + CGContextRestoreGState(ctx); +} + +- (NSRect) clipBoundingBox { + return CGContextGetClipBoundingBox (ctx); +} + +- (BOOL) strokeIncludesPoint:(NSPoint)p { + return CGContextPathContainsPoint(ctx, NSPointToCGPoint(p), kCGPathStroke); +} + +- (BOOL) fillIncludesPoint:(NSPoint)p { + return CGContextPathContainsPoint(ctx, NSPointToCGPoint(p), kCGPathFill); +} + +- (id) layoutText:(NSString*)text withSize:(CGFloat)fontSize { + return [CoreTextLayout layoutForContext:ctx withString:text fontSize:fontSize]; +} + +// this may not affect text rendering +- (void) setAntialiasMode:(AntialiasMode)mode { + CGContextSetShouldAntialias(ctx, mode != AntialiasDisabled); +} + +- (void) setLineWidth:(CGFloat)width { + CGContextSetLineWidth(ctx, width); +} + +// setting to 0 will unset the dash +- (void) setLineDash:(CGFloat)dashLength { + if (dashLength <= 0.0f) { + CGContextSetLineDash(ctx, 0.0f, NULL, 0); + } else { + const CGFloat dash[] = {dashLength, dashLength}; + CGContextSetLineDash(ctx, 0.0f, dash, 2); + } +} + +// paths +- (void) startPath { + CGContextBeginPath (ctx); +} + +- (void) closeSubPath { + CGContextClosePath (ctx); +} + +- (void) moveTo:(NSPoint)p { + CGContextMoveToPoint (ctx, p.x, p.y); +} + +- (void) curveTo:(NSPoint)end withCp1:(NSPoint)cp1 andCp2:(NSPoint)cp2 { + CGContextAddCurveToPoint(ctx, cp1.x, cp1.y, cp2.x, cp2.y, end.x, end.y); +} + +- (void) lineTo:(NSPoint)end { + CGContextAddLineToPoint(ctx, end.x, end.y); +} + +- (void) rect:(NSRect)rect { + CGContextAddRect (ctx, rect); +} + +- (void) circleAt:(NSPoint)c withRadius:(CGFloat)r { + CGContextMoveToPoint (ctx, c.x + r, c.y); + CGContextAddArc (ctx, c.x, c.y, r, 0.0f, M_PI, 1); +} + +// these methods clear the path +- (void) strokePathWithColor:(RColor)color { + CGContextSetRGBStrokeColor(ctx, color.red, color.green, color.blue, color.alpha); + CGContextDrawPath (ctx, kCGPathStroke); +} + +- (void) fillPathWithColor:(RColor)color { + CGContextSetRGBFillColor(ctx, color.red, color.green, color.blue, color.alpha); + CGContextDrawPath (ctx, kCGPathFill); +} + +- (void) strokePathWithColor:(RColor)scolor + andFillWithColor:(RColor)fcolor { + CGContextSetRGBFillColor(ctx, color.red, color.green, color.blue, color.alpha); + CGContextSetRGBStrokeColor(ctx, color.red, color.green, color.blue, color.alpha); + CGContextDrawPath (ctx, kCGPathFillStroke); +} + +- (void) strokePathWithColor:(RColor)scolor + andFillWithColor:(RColor)fcolor + usingAlpha:(CGFloat)alpha { + CGContextSetRGBFillColor(ctx, color.red, color.green, color.blue, color.alpha * alpha); + CGContextSetRGBStrokeColor(ctx, color.red, color.green, color.blue, color.alpha * alpha); + CGContextDrawPath (ctx, kCGPathFillStroke); +} + +- (void) clipToPath { + CGContextClip (ctx); +} + +// paint everywhere within the clip +- (void) paintWithColor:(RColor)color { + CGContextSetRGBFillColor(ctx, color.red, color.green, color.blue, color.alpha); + CGRect r = CGContextGetClipBoundingBox (ctx); + r.origin.x -= 1; + r.origin.y -= 1; + r.size.width += 2; + r.size.height += 2; + CGContextFillRect(context, r); +} + +@end + +// vim:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/osx/CustomNodeCellView.h b/tikzit-old/src/osx/CustomNodeCellView.h new file mode 100644 index 0000000..22606d7 --- /dev/null +++ b/tikzit-old/src/osx/CustomNodeCellView.h @@ -0,0 +1,23 @@ +// +// CustomNodeCellView.h +// TikZiT +// +// Created by Johan Paulsson on 12/12/13. +// Copyright (c) 2013 Aleks Kissinger. All rights reserved. +// + +#import + +#import "NodeLayer.h" +#import "NodeStyle.h" +#import "NodeStyle+Coder.h" + +@interface CustomNodeCellView : NSTableCellView{ + NodeLayer *nodeLayer; + NodeStyle *nodeStyle; + BOOL selected; +} + +@property (strong) id objectValue; + +@end diff --git a/tikzit-old/src/osx/CustomNodeCellView.m b/tikzit-old/src/osx/CustomNodeCellView.m new file mode 100644 index 0000000..612394b --- /dev/null +++ b/tikzit-old/src/osx/CustomNodeCellView.m @@ -0,0 +1,83 @@ +// +// CustomNodeCellView.m +// TikZiT +// +// Created by Johan Paulsson on 12/12/13. +// Copyright (c) 2013 Aleks Kissinger. All rights reserved. +// + +#import "CustomNodeCellView.h" + +@implementation CustomNodeCellView + +- (id)initWithFrame:(NSRect)frame +{ + self = [super initWithFrame:frame]; + if (self) { + // Initialization code here. + } + return self; +} + +- (void)drawRect:(NSRect)dirtyRect +{ + [super drawRect:dirtyRect]; + + // Drawing code here. +} + +- (id) objectValue{ + return [super objectValue]; +} + +-(void)drawLayer:(CALayer *)layer inContext:(CGContextRef)context { + if (nodeLayer!=nil) { + if (![[[self layer] sublayers] containsObject:nodeLayer]) { + [[self layer] addSublayer:nodeLayer]; + NSPoint c = NSMakePoint((CGRectGetMinX([[self layer] frame])+CGRectGetWidth([nodeLayer bounds])/2), + CGRectGetMidY([[self layer] frame])); + //c = NSMakePoint(-16.5,-16.5); + [nodeLayer setCenter:c andAnimateWhen:NO]; + [[self textField] setFrame:NSMakeRect(CGRectGetWidth([nodeLayer bounds]), CGRectGetMidY([[self layer] frame]), CGRectGetWidth([[self textField] frame]), CGRectGetHeight([[self textField] frame]))]; + } + + if (selected){ + [nodeStyle setStrokeColor:[NSColor whiteColor]]; + [[nodeLayer node] setStyle:nodeStyle]; + }else{ + [nodeStyle setStrokeColor:[NSColor blackColor]]; + [[nodeLayer node] setStyle:nodeStyle]; + } + + [nodeLayer updateFrame]; + } +} + +- (void) setObjectValue:(id)objectValue{ + if(objectValue == nil) + return; + + nodeStyle = (NodeStyle *)objectValue; + [[self textField] setStringValue:[nodeStyle shapeName]]; + + if (nodeLayer == nil) { + nodeLayer = [[NodeLayer alloc] initWithNode:[Node node] + transformer:[Transformer defaultTransformer]]; + [nodeLayer setRescale:NO]; + } + [nodeStyle setName:[nodeStyle shapeName]]; + + [[nodeLayer node] setStyle:nodeStyle]; + [nodeLayer updateFrame]; + + NSLog(@"asd"); +} + +- (void)setBackgroundStyle:(NSBackgroundStyle)backgroundStyle { + [super setBackgroundStyle:backgroundStyle]; + + selected = (backgroundStyle == NSBackgroundStyleDark); + [self setNeedsDisplay:YES]; +} + +@end diff --git a/tikzit-old/src/osx/CustomNodeController.h b/tikzit-old/src/osx/CustomNodeController.h new file mode 100644 index 0000000..67adf0b --- /dev/null +++ b/tikzit-old/src/osx/CustomNodeController.h @@ -0,0 +1,35 @@ +// +// CustomNodeController.h +// TikZiT +// +// Created by Johan Paulsson on 12/4/13. +// Copyright (c) 2013 Aleks Kissinger. All rights reserved. +// + +#import +#import "Shape.h" +#import "TikzShape.h" + +#import "GraphicsView.h" +#import "TikzSourceController.h" + +#import "SupportDir.h" + +@interface CustomNodeController : NSViewController { + NSDictionary *nodeStyles; + NSMutableArray* customNodeStyles; + + GraphicsView *__weak graphicsView; + TikzSourceController *__weak tikzSourceController; + NSTableView *customNodeTable; +} + +@property NSDictionary *nodeStyles; +@property NSMutableArray* customNodeStyles; + +@property IBOutlet NSTableView *customNodeTable; + +@property (weak) IBOutlet GraphicsView *graphicsView; +@property (weak) IBOutlet TikzSourceController *tikzSourceController; + +@end diff --git a/tikzit-old/src/osx/CustomNodeController.m b/tikzit-old/src/osx/CustomNodeController.m new file mode 100644 index 0000000..4f46acc --- /dev/null +++ b/tikzit-old/src/osx/CustomNodeController.m @@ -0,0 +1,58 @@ +// +// CustomNodeController.m +// TikZiT +// +// Created by Johan Paulsson on 12/4/13. +// Copyright (c) 2013 Aleks Kissinger. All rights reserved. +// + +#import "CustomNodeController.h" +#import "NodeStyle.h" + +@interface CustomNodeController () + +@end + +@implementation CustomNodeController + +@synthesize nodeStyles, customNodeStyles; +@synthesize graphicsView, tikzSourceController; +@synthesize customNodeTable; + +- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil +{ + if (self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]) { + nodeStyles = [Shape shapeDictionary]; + customNodeStyles = [NSMutableArray array]; + + for(id key in nodeStyles) { + Shape *value = [nodeStyles objectForKey:key]; + + if([value isKindOfClass:[TikzShape class]]){ + NodeStyle *newNodeStyle = [[NodeStyle alloc] init]; + [newNodeStyle setShapeName:key]; + + [customNodeStyles addObject:newNodeStyle]; + } + } + } + + return self; +} + +- (void)tableViewSelectionDidChange:(NSNotification *)aNotification{ + NSInteger selectedRow = [customNodeTable selectedRow]; + + NodeStyle* selectedNodeStyle = [customNodeStyles objectAtIndex:selectedRow]; + TikzShape *tikzshape = (TikzShape *) [nodeStyles objectForKey:[selectedNodeStyle shapeName]]; + + [[tikzSourceController graphicsView] setEnabled:NO]; + [tikzSourceController setTikz:[tikzshape tikzSrc]]; + [tikzSourceController parseTikz:self]; +} + +- (id)valueForUndefinedKey:(NSString *)key{ + return nil; +} + +@end diff --git a/tikzit-old/src/osx/CustomNodes.xib b/tikzit-old/src/osx/CustomNodes.xib new file mode 100644 index 0000000..1cc8db2 --- /dev/null +++ b/tikzit-old/src/osx/CustomNodes.xib @@ -0,0 +1,249 @@ + + + + + + + + + + + + + + + + + + + name + strokeThickness + strokeColor + fillColor + strokeColorIsKnown + fillColorIsKnown + representedObject.name + shapeName + scale + @distinctUnionOfObjects.category + category + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \begin{tikzpicture} + +\end{tikzpicture} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tikzit-old/src/osx/DraggablePDFView.h b/tikzit-old/src/osx/DraggablePDFView.h new file mode 100644 index 0000000..9e53c44 --- /dev/null +++ b/tikzit-old/src/osx/DraggablePDFView.h @@ -0,0 +1,28 @@ +// +// PreviewController.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import + +@interface DraggablePDFView : PDFView + +@end diff --git a/tikzit-old/src/osx/DraggablePDFView.m b/tikzit-old/src/osx/DraggablePDFView.m new file mode 100644 index 0000000..ce393c7 --- /dev/null +++ b/tikzit-old/src/osx/DraggablePDFView.m @@ -0,0 +1,60 @@ +// +// PreviewController.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "DraggablePDFView.h" + +@implementation DraggablePDFView + +- (id)initWithFrame:(NSRect)frame +{ + self = [super initWithFrame:frame]; + return self; +} + +- (void)drawRect:(NSRect)dirtyRect +{ + [super drawRect:dirtyRect]; +} + +- (void)mouseDown:(NSEvent *)theEvent +{ + NSRect pageBox = [[[self document] pageAtIndex:0] boundsForBox:kPDFDisplayBoxMediaBox]; + NSRect pageRect= [self convertRect:pageBox fromPage:[[self document] pageAtIndex:0]]; + + NSArray *fileList = [NSArray arrayWithObjects:[[[self document] documentURL] path], nil]; + NSPasteboard *pboard = [NSPasteboard pasteboardWithName:NSDragPboard]; + [pboard declareTypes:[NSArray arrayWithObject:NSFilenamesPboardType] owner:nil]; + [pboard setPropertyList:fileList forType:NSFilenamesPboardType]; + + [self dragImage:[[NSImage alloc] initWithData:[[self document] dataRepresentation]] + at:pageRect.origin + offset:pageRect.size + event:theEvent + pasteboard:pboard + source:self + slideBack:YES]; + + return; +} + +@end diff --git a/tikzit-old/src/osx/EdgeControlLayer.h b/tikzit-old/src/osx/EdgeControlLayer.h new file mode 100644 index 0000000..4cdf8bc --- /dev/null +++ b/tikzit-old/src/osx/EdgeControlLayer.h @@ -0,0 +1,44 @@ +// +// EdgeControlLayer.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import +#import "Edge.h" +#import "Transformer.h" + + +@interface EdgeControlLayer : CALayer { + Edge *edge; + Transformer *transformer; + BOOL selected; +} + +- (id)initWithEdge:(Edge*)e andTransformer:(Transformer*)t; +- (void)highlight; +- (void)unhighlight; +- (void)select; +- (void)deselect; + ++ (float)handleRadius; + +@end diff --git a/tikzit-old/src/osx/EdgeControlLayer.m b/tikzit-old/src/osx/EdgeControlLayer.m new file mode 100644 index 0000000..facdd84 --- /dev/null +++ b/tikzit-old/src/osx/EdgeControlLayer.m @@ -0,0 +1,150 @@ +// +// EdgeControlLayer.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "EdgeControlLayer.h" +#import "util.h" + + +@implementation EdgeControlLayer + + +- (id)initWithEdge:(Edge*)e andTransformer:(Transformer*)t { + if (!(self = [super init])) return nil; + transformer = t; + edge = e; + self.opacity = 0.0f; + return self; +} + +- (void)select { + selected = YES; + self.opacity = 1.0f; +} + +- (void)deselect { + selected = NO; + self.opacity = 0.0f; +} + +- (void)highlight { + if (!selected) { + self.opacity = 0.5f; + } +} + +- (void)unhighlight { + if (!selected) { + self.opacity = 0.0f; + } +} + +- (void)drawInContext:(CGContextRef)ctx { + CGContextSaveGState(ctx); + + [edge updateControls]; + CGPoint source = NSPointToCGPoint([transformer toScreen:[[edge source] point]]); + CGPoint target = NSPointToCGPoint([transformer toScreen:[[edge target] point]]); + CGPoint mid = NSPointToCGPoint([transformer toScreen:[edge mid]]); + CGPoint cp1 = NSPointToCGPoint([transformer toScreen:[edge cp1]]); + CGPoint cp2 = NSPointToCGPoint([transformer toScreen:[edge cp2]]); + + float dx = (target.x - source.x); + float dy = (target.y - source.y); + + // draw a circle at the midpoint + CGRect mid_rect = CGRectMake(mid.x-3.0f, mid.y-3.0f, 6.0f, 6.0f); + CGContextAddEllipseInRect(ctx, mid_rect); + CGContextSetLineWidth(ctx, 1.0f); + CGContextSetRGBFillColor(ctx, 1.0f, 1.0f, 1.0f, 0.5f); + CGContextSetRGBStrokeColor(ctx, 0.0f, 0.0f, 1.0f, 0.5f); + CGContextDrawPath(ctx, kCGPathFillStroke); + + + CGContextSetShouldAntialias(ctx, YES); + + // compute size of control circles + float cdist; + if (dx == 0 && dy == 0) cdist = [transformer scaleToScreen:edge.weight]; + else cdist = sqrt(dx*dx + dy*dy) * edge.weight; + + // if basic bend, draw blue, if inout, draw green + if ([edge bendMode] == EdgeBendModeBasic) CGContextSetRGBStrokeColor(ctx, 0, 0, 1, 0.4f); + else CGContextSetRGBStrokeColor(ctx, 0, 0.7f, 0, 0.4f); + + // draw source control circle + CGRect ellipse1 = CGRectMake(source.x-cdist, source.y-cdist, cdist*2.0f, cdist*2.0f); + CGContextAddEllipseInRect(ctx, ellipse1); + if (dx!=0 || dy!=0) { + CGRect ellipse2 = CGRectMake(target.x-cdist, target.y-cdist, cdist*2.0f, cdist*2.0f); + CGContextAddEllipseInRect(ctx, ellipse2); + } + + CGContextStrokePath(ctx); + + float handleRad = [EdgeControlLayer handleRadius]; + + // handles + CGRect ctrl1 = CGRectMake(cp1.x-handleRad, cp1.y-handleRad, 2*handleRad, 2*handleRad); + CGRect ctrl2 = CGRectMake(cp2.x-handleRad, cp2.y-handleRad, 2*handleRad, 2*handleRad); + + CGContextSetRGBFillColor(ctx, 1.0f, 1.0f, 1.0f, 0.8f); + + // draw a line from source vertex to first handle + if ([edge bendMode] == EdgeBendModeInOut) { + if ([edge outAngle] % 45 == 0) CGContextSetRGBStrokeColor(ctx, 1, 0, 1, 0.6f); + else CGContextSetRGBStrokeColor(ctx, 0, 0.7f, 0, 0.4f); + } else { + if ([edge bend] % 45 == 0) CGContextSetRGBStrokeColor(ctx, 1, 0, 1, 0.6f); + else CGContextSetRGBStrokeColor(ctx, 0, 0, 1, 0.4f); + } + + CGContextMoveToPoint(ctx, source.x, source.y); + CGContextAddLineToPoint(ctx, cp1.x, cp1.y); + CGContextStrokePath(ctx); + + CGContextAddEllipseInRect(ctx, ctrl1); + CGContextDrawPath(ctx, kCGPathFillStroke); + + + // draw a line from target vertex to second handle + if ([edge bendMode] == EdgeBendModeInOut) { + if ([edge inAngle] % 45 == 0) CGContextSetRGBStrokeColor(ctx, 1, 0, 1, 0.6f); + else CGContextSetRGBStrokeColor(ctx, 0, 0.7f, 0, 0.4f); + } else { + if ([edge bend] % 45 == 0) CGContextSetRGBStrokeColor(ctx, 1, 0, 1, 0.6f); + else CGContextSetRGBStrokeColor(ctx, 0, 0, 1, 0.4f); + } + + CGContextMoveToPoint(ctx, target.x, target.y); + CGContextAddLineToPoint(ctx, cp2.x, cp2.y); + CGContextStrokePath(ctx); + + CGContextAddEllipseInRect(ctx, ctrl2); + CGContextDrawPath(ctx, kCGPathFillStroke); + + CGContextRestoreGState(ctx); +} + ++ (float)handleRadius { return 4.0f; } + +@end diff --git a/tikzit-old/src/osx/EdgeStyle+Coder.h b/tikzit-old/src/osx/EdgeStyle+Coder.h new file mode 100644 index 0000000..e35c18f --- /dev/null +++ b/tikzit-old/src/osx/EdgeStyle+Coder.h @@ -0,0 +1,30 @@ +// +// EdgeStyle+Coder.h +// TikZiT +// +// Copyright 2011 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import "EdgeStyle.h" + +@interface EdgeStyle (Coder) +- (id)initWithCoder:(NSCoder*)coder; +- (void)encodeWithCoder:(NSCoder*)coder; +@end diff --git a/tikzit-old/src/osx/EdgeStyle+Coder.m b/tikzit-old/src/osx/EdgeStyle+Coder.m new file mode 100644 index 0000000..039344d --- /dev/null +++ b/tikzit-old/src/osx/EdgeStyle+Coder.m @@ -0,0 +1,50 @@ +// +// EdgeStyle+Coder.m +// TikZiT +// +// Copyright 2011 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "EdgeStyle+Coder.h" + +@implementation EdgeStyle (Coder) + +- (id)initWithCoder:(NSCoder*)coder { + if (!(self = [super init])) return nil; + + name = [coder decodeObjectForKey:@"name"]; + category = [coder decodeObjectForKey:@"category"]; + headStyle = [coder decodeIntForKey:@"headStyle"]; + tailStyle = [coder decodeIntForKey:@"tailStyle"]; + decorationStyle = [coder decodeIntForKey:@"decorationStyle"]; + thickness = [coder decodeFloatForKey:@"thickness"]; + + return self; +} + +- (void)encodeWithCoder:(NSCoder*)coder { + [coder encodeObject:name forKey:@"name"]; + [coder encodeObject:category forKey:@"category"]; + [coder encodeInt:headStyle forKey:@"headStyle"]; + [coder encodeInt:tailStyle forKey:@"tailStyle"]; + [coder encodeInt:decorationStyle forKey:@"decorationStyle"]; + [coder encodeFloat:thickness forKey:@"thickness"]; +} + +@end diff --git a/tikzit-old/src/osx/Graph+Coder.h b/tikzit-old/src/osx/Graph+Coder.h new file mode 100644 index 0000000..1404fc2 --- /dev/null +++ b/tikzit-old/src/osx/Graph+Coder.h @@ -0,0 +1,17 @@ +// +// Graph+Coder.h +// TikZiT +// +// Created by Aleks Kissinger on 27/04/2010. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import +#import "Graph.h" + +@interface Graph (Coder) + +- (id)initWithCoder:(NSCoder*)coder; +- (void)encodeWithCoder:(NSCoder*)coder; + +@end diff --git a/tikzit-old/src/osx/Graph+Coder.m b/tikzit-old/src/osx/Graph+Coder.m new file mode 100644 index 0000000..7d3787e --- /dev/null +++ b/tikzit-old/src/osx/Graph+Coder.m @@ -0,0 +1,24 @@ +// +// Graph+Coder.m +// TikZiT +// +// Created by Aleks Kissinger on 27/04/2010. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import "Graph+Coder.h" +#import "TikzGraphAssembler.h" + +@implementation Graph(Coder) + +- (id)initWithCoder:(NSCoder*)coder { + NSString *tikz = [coder decodeObject]; + [TikzGraphAssembler parseTikz:tikz forGraph:self]; + return self; +} + +- (void)encodeWithCoder:(NSCoder*)coder { + [coder encodeObject:[self tikz]]; +} + +@end diff --git a/tikzit-old/src/osx/GraphicsView.h b/tikzit-old/src/osx/GraphicsView.h new file mode 100644 index 0000000..329b1e5 --- /dev/null +++ b/tikzit-old/src/osx/GraphicsView.h @@ -0,0 +1,129 @@ +// +// GraphicsView.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import +#import "PickSupport.h" +#import "Grid.h" +#import "Transformer.h" +#import "Graph.h" +#import "NodeStyle.h" +#import "StylePaletteController.h" +#import "ToolPaletteController.h" +#import "SelectBoxLayer.h" + +// mouse modes, corresponding to different tools. format: (tool)[sub-mode]Mode +typedef enum { + SelectMode = 0x10, + SelectBoxMode = 0x11, + SelectMoveMode = 0x12, + SelectEdgeBendMode = 0x14, + + NodeMode = 0x20, + + EdgeMode = 0x40, + EdgeDragMode = 0x41, + + CropMode = 0x80, + CropDragMode = 0x81 +} MouseMode; + +@class TikzSourceController; + +@interface GraphicsView : NSView { + BOOL enabled; + + IBOutlet NSApplication *application; + StylePaletteController *stylePaletteController; + ToolPaletteController *toolPaletteController; + + BOOL frameMoveMode; + + Graph *graph; + NSString *graphTikzOnMouseDown; + PickSupport *pickSupport; + //NSMapTable *nodeSelectionLayers; + NSMapTable *edgeControlLayers; + NSMapTable *nodeLayers; + NSPoint dragOrigin; + NSPoint dragTarget; + NSPoint oldTransformerOrigin; + NSPoint oldMainOrigin; + NSRect oldBounds; + //NSRect selectionBox; + Transformer *transformer; + + CALayer *mainLayer; + CALayer *gridLayer; + CALayer *graphLayer; + CALayer *hudLayer; + SelectBoxLayer *selectionLayer; + + MouseMode mouseMode; + Node *leaderNode; + Grid *grid; + + Edge *modifyEdge; + BOOL firstControlPoint; + + int bboxLeftRight; + int bboxBottomTop; + + NSUndoManager *documentUndoManager; + NSPoint startPoint; + + TikzSourceController *tikzSourceController; +} + +@property BOOL enabled; +@property (weak) Graph *graph; +@property IBOutlet TikzSourceController *tikzSourceController; +@property (readonly) Transformer *transformer; +@property (readonly) PickSupport *pickSupport; + +- (void)setDocumentUndoManager:(NSUndoManager*)um; +- (void)applyStyleToSelectedNodes:(NodeStyle*)style; +- (void)applyStyleToSelectedEdges:(EdgeStyle*)style; + +- (void)updateMouseMode; +- (void)refreshLayers; + +//- (void)registerUndo:(GraphChange *)change withActionName:(NSString*)name; +- (void)registerUndo:(NSString*)oldTikz withActionName:(NSString*)name; +//- (void)undoGraphChange:(GraphChange *)change; +- (void)undoGraphChange:(NSString*)oldTikz; +- (void)postGraphChange; +- (void)postSelectionChange; + +- (void)deselectAll:(id)sender; +- (void)selectAll:(id)sender; +- (void)cut:(id)sender; +- (void)copy:(id)sender; +- (void)paste:(id)sender; +- (void)delete:(id)sender; +- (void)bringForward:(id)sender; +- (void)flipHorizonal:(id)sender; +- (void)flipVertical:(id)sender; +- (void)reverseEdgeDirection:(id)sender; + +@end diff --git a/tikzit-old/src/osx/GraphicsView.m b/tikzit-old/src/osx/GraphicsView.m new file mode 100644 index 0000000..efa7ecb --- /dev/null +++ b/tikzit-old/src/osx/GraphicsView.m @@ -0,0 +1,1216 @@ +// +// GraphicsView.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "GraphicsView.h" +#import "util.h" +#import "CALayer+DrawLabel.h" + +#import "NodeSelectionLayer.h" +#import "NodeLayer.h" +#import "EdgeControlLayer.h" +#import "AppDelegate.h" +#import "TikzGraphAssembler.h" +#import "TikzSourceController.h" + +@interface GraphicsView (Private) +- (void)setupLayers; +- (void)addNodeLayers:(Node*)n; +- (void)addEdgeLayers:(Edge*)e; +- (void)removeNodeLayers:(Node*)n; +- (void)resetMainOrigin; +- (void)setMainOrigin:(NSPoint)o; +@end + +static CGColorRef cgGrayColor, cgWhiteColor, cgClearColor = nil; + + +@implementation GraphicsView + +@synthesize enabled, transformer, pickSupport, tikzSourceController; + +- (void)postGraphChange { + [[NSNotificationCenter defaultCenter] postNotificationName:@"GraphChanged" + object:self]; + [self postSelectionChange]; +} + +- (void)postSelectionChange { + [[NSNotificationCenter defaultCenter] postNotificationName:@"SelectionChanged" + object:self]; +} + +- (id)initWithFrame:(NSRect)frame { + self = [super initWithFrame:frame]; + if (self) { + if (cgClearColor == nil) { + cgClearColor = CGColorGetConstantColor(kCGColorClear); + cgGrayColor = CGColorCreateGenericGray(0.5f, 0.5f); + cgWhiteColor = CGColorCreateGenericRGB(1, 1, 1, 1); + } + + transformer = [[Transformer alloc] init]; + mouseMode = SelectMode; + grid = [Grid gridWithSpacing:1.0f + subdivisions:4 + transformer:transformer]; + [grid setSize:NSSizeFromCGSize([gridLayer bounds].size)]; + [transformer setScale:PIXELS_PER_UNIT]; + + [self setupLayers]; + + leaderNode = nil; + pickSupport = [[PickSupport alloc] init]; + frameMoveMode = NO; + + enabled = YES; + [self setGraph:[Graph graph]]; + } + return self; +} + +- (void)awakeFromNib { + AppDelegate *del = [application delegate]; + stylePaletteController = [del stylePaletteController]; + toolPaletteController = [del toolPaletteController]; + [self refreshLayers]; + [self postGraphChange]; +} + +- (void)setupLayers { + mainLayer = [CALayer layer]; + [mainLayer setBackgroundColor:cgWhiteColor]; + [mainLayer setFrame:CGRectIntegral(NSRectToCGRect([self bounds]))]; + [mainLayer setOpacity:1.0f]; + [self setLayer:mainLayer]; + [self resetMainOrigin]; + + gridLayer = [CALayer layer]; + [gridLayer setDelegate:grid]; + [gridLayer setOpacity:0.3f]; + [mainLayer addSublayer:gridLayer]; + + graphLayer = [CALayer layer]; + [graphLayer setDelegate:self]; + [mainLayer addSublayer:graphLayer]; + + hudLayer = [CALayer layer]; + [mainLayer addSublayer:hudLayer]; + + selectionLayer = [SelectBoxLayer layer]; + [mainLayer addSublayer:selectionLayer]; + + [transformer setOrigin:NSMakePoint(NSMidX([self bounds]),NSMidY([self bounds]))]; + oldBounds = [self bounds]; + [self refreshLayers]; +} + +// Lion resume feature +//- (void)encodeRestorableStateWithCoder:(NSCoder*)coder { +// NSLog(@"got encode request"); +//} +//- (void)restoreStateWithCoder:(NSCoder*)coder { +// NSLog(@"got decode request"); +//} + +- (void)registerUndo:(NSString*)oldTikz withActionName:(NSString*)nm { + [documentUndoManager registerUndoWithTarget:self + selector:@selector(undoGraphChange:) + object:oldTikz]; + [documentUndoManager setActionName:nm]; +} + +- (void)revertToTikz:(NSString*)tikz { + [tikzSourceController setTikz:tikz]; + [tikzSourceController tryParseTikz]; + [self refreshLayers]; + [self postGraphChange]; +} + + +- (void)undoGraphChange:(NSString*)oldTikz { + NSString *currentTikz = [graph tikz]; + [self revertToTikz:oldTikz]; + [documentUndoManager registerUndoWithTarget:self + selector:@selector(undoGraphChange:) + object:currentTikz]; +} + +- (void)setGraph:(Graph*)gr { + graph = gr; + + NSEnumerator *e; + CALayer *layer; + + e = [edgeControlLayers objectEnumerator]; + while (layer = [e nextObject]) [layer removeFromSuperlayer]; + edgeControlLayers = [NSMapTable mapTableWithStrongToStrongObjects]; + + + e = [nodeLayers objectEnumerator]; + while (layer = [e nextObject]) [layer removeFromSuperlayer]; + nodeLayers = [NSMapTable mapTableWithStrongToStrongObjects]; + + for (Node *n in [graph nodes]) { + [n attachStyleFromTable:[stylePaletteController nodeStyles]]; + [self addNodeLayers:n]; + } + + for (Edge *e in [graph edges]) { + [e setAttributesFromData]; + [e attachStyleFromTable:[stylePaletteController edgeStyles]]; + [self addEdgeLayers:e]; + } +} + +- (Graph*)graph { return graph; } + +- (void)setMainOrigin:(NSPoint)o { + o.x = round(o.x); + o.y = round(o.y); + CGRect rect = [mainLayer frame]; + rect.origin = NSPointToCGPoint(o); + [mainLayer setFrame:rect]; +} + +- (void)resetMainOrigin { + NSRect bds = [self bounds]; + bds.origin.x -= bds.size.width; + bds.origin.y -= bds.size.height; + bds.size.width *= 3; + bds.size.height *= 3; + [mainLayer setFrame:NSRectToCGRect([self bounds])]; +} + +- (void)refreshLayers { + [gridLayer setFrame:[mainLayer frame]]; + [graphLayer setFrame:[mainLayer frame]]; + [hudLayer setFrame:[mainLayer frame]]; + [selectionLayer setFrame:[mainLayer frame]]; + + if (enabled) { + [hudLayer setBackgroundColor:cgClearColor]; + } else { + [hudLayer setBackgroundColor:cgGrayColor]; + } + + [grid setSize:NSSizeFromCGSize([gridLayer bounds].size)]; + [gridLayer setNeedsDisplay]; + [graphLayer setNeedsDisplay]; + [hudLayer setNeedsDisplay]; + + NSEnumerator *e = [edgeControlLayers objectEnumerator]; + CALayer *layer; + while (layer = [e nextObject]) { + [layer setFrame:[graphLayer frame]]; + [layer setNeedsDisplay]; + } +} + + +- (void)viewDidEndLiveResize { + [super viewDidEndLiveResize]; + NSPoint o = [transformer origin]; + o.x += round(([self bounds].size.width - oldBounds.size.width)/2.0f); + o.y += round(([self bounds].size.height - oldBounds.size.height)/2.0f); + [transformer setOrigin:o]; + oldBounds = [self bounds]; + [self refreshLayers]; +} + +- (void)applyStyleToSelectedNodes:(NodeStyle*)style { + NSString *oldTikz = [graph tikz]; + + for (Node *n in [pickSupport selectedNodes]) { + [n setStyle:style]; + [[nodeLayers objectForKey:n] setNeedsDisplay]; + } + + [self registerUndo:oldTikz withActionName:@"Apply Style to Nodes"]; + [self refreshLayers]; + [self postGraphChange]; +} + +- (void)applyStyleToSelectedEdges:(EdgeStyle*)style { + NSString *oldTikz = [graph tikz]; + + for (Edge *e in [pickSupport selectedEdges]) { + [e setStyle:style]; + } + + [self registerUndo:oldTikz withActionName:@"Apply Style to Edges"]; + [self refreshLayers]; + [self postGraphChange]; +} + +- (void)addNodeLayers:(Node*)n { + // add a node to the graph + [graph addNode:n]; + + NSPoint pt = [transformer toScreen:[n point]]; + + // add a node layer + NodeLayer *nl = [[NodeLayer alloc] initWithNode:n transformer:transformer]; + [nl setCenter:pt]; + [nodeLayers setObject:nl forKey:n]; + [graphLayer addSublayer:nl]; + [nl setNeedsDisplay]; +} + +- (void)removeNodeLayers:(Node*)n { + [[nodeLayers objectForKey:n] removeFromSuperlayer]; + [nodeLayers removeObjectForKey:n]; +} + +- (void)addEdgeLayers:(Edge *)e { + [graph addEdge:e]; + EdgeControlLayer *ecl = [[EdgeControlLayer alloc] initWithEdge:e andTransformer:transformer]; + [edgeControlLayers setObject:ecl forKey:e]; + [ecl setFrame:CGRectMake(10, 10, 100, 100)]; + [hudLayer addSublayer:ecl]; + [ecl setNeedsDisplay]; +} + +- (void)removeEdgeLayers:(Edge*)e { + [[edgeControlLayers objectForKey:e] removeFromSuperlayer]; + [edgeControlLayers removeObjectForKey:e]; + [self refreshLayers]; +} + +- (BOOL)circleWithCenter:(NSPoint)center andRadius:(float)radius containsPoint:(NSPoint)p { + float dx = center.x - p.x; + float dy = center.y - p.y; + return (dx*dx + dy*dy) <= radius*radius; +} + +- (BOOL)node:(Node*)node containsPoint:(NSPoint)p { + NodeLayer *nl = [nodeLayers objectForKey:node]; + return [nl nodeContainsPoint:p]; +} + +- (BOOL)edge:(Edge*)edge containsPoint:(NSPoint)p { +// NSPoint center = [transformer toScreen:edge.mid]; +// float dx = center.x - p.x; +// float dy = center.y - p.y; +// float radius = 5.0f; // tolerence for clicks +// return (dx*dx + dy*dy) <= radius*radius; + + CGContextRef ctx = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort]; + + // Save the graphics state before doing the hit detection. + CGContextSaveGState(ctx); + + NSPoint src = [transformer toScreen:[edge tail]]; + NSPoint targ = [transformer toScreen:[edge head]]; + NSPoint cp1 = [transformer toScreen:[edge cp1]]; + NSPoint cp2 = [transformer toScreen:[edge cp2]]; + + CGContextSetLineWidth(ctx, 8.0f); + + CGContextMoveToPoint(ctx, src.x, src.y); + CGContextAddCurveToPoint(ctx, cp1.x, cp1.y, cp2.x, cp2.y, targ.x, targ.y); + + BOOL containsPoint = CGContextPathContainsPoint(ctx, NSPointToCGPoint(p), kCGPathStroke); + + CGContextSetRGBStrokeColor(ctx, 0, 0, 0, 0); + + CGContextStrokePath(ctx); + //CGContextFlush(ctx); + CGContextRestoreGState(ctx); + + return containsPoint; +} + +- (void)shiftNodes:(NSSet*)set from:(NSPoint)source to:(NSPoint)dest { + float dx = dest.x - source.x; + float dy = dest.y - source.y; + + for (Node *n in set) { + NSPoint p = [transformer toScreen:[n point]]; + p = [grid snapScreenPoint:NSMakePoint(p.x+dx, p.y+dy)]; + [n setPoint:[transformer fromScreen:p]]; + } +} + + +- (void)mouseDown:(NSEvent*)theEvent { + if (!enabled) return; + + [self updateMouseMode]; + + dragOrigin = [self convertPoint:[theEvent locationInWindow] fromView:nil]; + dragTarget = dragOrigin; + + graphTikzOnMouseDown = [graph tikz]; + + if ([theEvent modifierFlags] & NSCommandKeyMask) { + oldTransformerOrigin = [transformer origin]; + oldMainOrigin = [self frame].origin; + frameMoveMode = YES; + return; + } + + if (mouseMode == SelectMode) { + [selectionLayer setActive:YES]; + [selectionLayer setSelectBox:NSRectAroundPoints(dragOrigin, dragOrigin)]; + [selectionLayer setNeedsDisplay]; + + modifyEdge = nil; + NSPoint cp1, cp2; + for (Edge *e in [pickSupport selectedEdges]) { + cp1 = [transformer toScreen:[e cp1]]; + cp2 = [transformer toScreen:[e cp2]]; + if ([self circleWithCenter:cp1 + andRadius:[EdgeControlLayer handleRadius] + containsPoint:dragOrigin]) + { + mouseMode = SelectEdgeBendMode; + modifyEdge = e; + firstControlPoint = YES; + break; + } else if ([self circleWithCenter:cp2 + andRadius:[EdgeControlLayer handleRadius] + containsPoint:dragOrigin]) + { + mouseMode = SelectEdgeBendMode; + modifyEdge = e; + firstControlPoint = NO; + break; + } + } + + if (modifyEdge == nil) { // skip all the rest if we're modifying an edge + + leaderNode = nil; + + // in first pass, try to find a leader node, under the mouse + for (Node* n in [graph nodes]) { + if ([self node:n containsPoint:dragOrigin]) { + leaderNode = n; + [gridLayer setOpacity:1.0f]; + break; + } + } + + // if we found one, deselect the others (if appropriate) and go to move mode + if (leaderNode != nil) { + startPoint = [leaderNode point]; + + // if we select a node, we should always deselect all edges: + for (Edge *e in [graph edges]) [[edgeControlLayers objectForKey:e] deselect]; + [pickSupport deselectAllEdges]; + + BOOL shouldDeselect = + !([theEvent modifierFlags] & NSShiftKeyMask) + && ![pickSupport isNodeSelected:leaderNode]; + for (Node *n in [graph nodes]) { + if (n != leaderNode && shouldDeselect) { + [pickSupport deselectNode:n]; + [[[nodeLayers objectForKey:n] selection] deselect]; + } + } + + // ensure the leader node is actually selected + if (![pickSupport isNodeSelected:leaderNode]) { + [pickSupport selectNode:leaderNode]; + [[[nodeLayers objectForKey:leaderNode] selection] select]; + } + + + // put us in move mode + mouseMode = SelectMoveMode; + } else { + mouseMode = SelectBoxMode; + + // if we didn't select a node, start hunting for an edge to select + BOOL shouldDeselect = !([theEvent modifierFlags] & NSShiftKeyMask); + + if (shouldDeselect) { + [pickSupport deselectAllEdges]; + for (Edge *e in graph.edges) [[edgeControlLayers objectForKey:e] deselect]; + } + + for (Edge* e in [graph edges]) { + // find the first node under the pointer, select it, show its controls + // and deselect all others if shift isn't down + if ([self edge:e containsPoint:dragOrigin]) { + for (Node *n in [pickSupport selectedNodes]) [[[nodeLayers objectForKey:n] selection] deselect]; + + [pickSupport deselectAllNodes]; + [pickSupport selectEdge:e]; + [[edgeControlLayers objectForKey:e] select]; + break; + } + } // end for e in [graph edges] + } // end if leaderNode == nil + } // end if modifyEdge == nil + + } else if (mouseMode == NodeMode) { + // do nothing... + } else if (mouseMode == EdgeMode) { + for (Node *n in [graph nodes]) { + if ([self node:n containsPoint:dragOrigin]) { + [[[nodeLayers objectForKey:n] selection] highlight]; + } + } + mouseMode = EdgeDragMode; + } else if (mouseMode == CropMode) { + if ([graph hasBoundingBox]) { + float fudge = 3; + + NSRect bb = [graph boundingBox]; + NSPoint bl = [transformer toScreen:bb.origin]; + NSPoint tr = [transformer + toScreen:NSMakePoint(bb.origin.x+bb.size.width, + bb.origin.y+bb.size.height)]; + if (dragOrigin.x > bl.x-fudge && dragOrigin.x < tr.x+fudge && + dragOrigin.y > tr.y-fudge && dragOrigin.y < tr.y+fudge) + { + bboxBottomTop = 1; + } else if (dragOrigin.x > bl.x-fudge && dragOrigin.x < tr.x+fudge && + dragOrigin.y > bl.y-fudge && dragOrigin.y < bl.y+fudge) + { + bboxBottomTop = -1; + } else { + bboxBottomTop = 0; + } + + if (dragOrigin.y > bl.y-fudge && dragOrigin.y < tr.y+fudge && + dragOrigin.x > tr.x-fudge && dragOrigin.x < tr.x+fudge) + { + bboxLeftRight = 1; + } else if (dragOrigin.y > bl.y-fudge && dragOrigin.y < tr.y+fudge && + dragOrigin.x > bl.x-fudge && dragOrigin.x < bl.x+fudge) + { + bboxLeftRight = -1; + } else { + bboxLeftRight = 0; + } + + if (bboxBottomTop != 0 || bboxLeftRight != 0) { + mouseMode = CropDragMode; + } + } + } else { + printf("WARNING: MOUSE DOWN IN INVALID MODE.\n"); + } + + [self refreshLayers]; +} + +- (void)mouseDragged:(NSEvent *)theEvent { + if (!enabled) return; + dragTarget = [self convertPoint:[theEvent locationInWindow] fromView:nil]; + + if (frameMoveMode) { + NSPoint newTransOrigin, newMainOrigin; + NSPoint diff = NSMakePoint(dragTarget.x - dragOrigin.x, dragTarget.y - dragOrigin.y); + newTransOrigin.x = oldTransformerOrigin.x + diff.x; + newTransOrigin.y = oldTransformerOrigin.y + diff.y; + newMainOrigin.x = oldMainOrigin.x + diff.x; + newMainOrigin.y = oldMainOrigin.y + diff.y; + + [CATransaction begin]; + [CATransaction setValue:(id)kCFBooleanTrue forKey:kCATransactionDisableActions]; + [self setMainOrigin:newMainOrigin]; + [CATransaction commit]; + + [transformer setOrigin:newTransOrigin]; + return; + } + + if (mouseMode == SelectBoxMode) { + [selectionLayer setSelectBox:NSRectAroundPoints(dragOrigin, dragTarget)]; + [selectionLayer setNeedsDisplay]; + + for (Node* n in [graph nodes]) { + if (NSPointInRect([transformer toScreen:[n point]], [selectionLayer selectBox])) { + [[[nodeLayers objectForKey:n] selection] highlight]; + } else if (!([theEvent modifierFlags] & NSShiftKeyMask)) { + [[[nodeLayers objectForKey:n] selection] unhighlight]; + } + } + } else if (mouseMode == SelectMoveMode) { + if (leaderNode != nil) { + [self shiftNodes:[pickSupport selectedNodes] + from:[transformer toScreen:[leaderNode point]] + to:dragTarget]; + } else { + printf("WARNING: LEADER NODE SHOULD NOT BE NIL.\n"); + } + + [self refreshLayers]; + } else if (mouseMode == SelectEdgeBendMode) { + NSPoint src = [transformer toScreen:[[modifyEdge source] point]]; + NSPoint targ = [transformer toScreen:[[modifyEdge target] point]]; + float dx1 = targ.x - src.x; + float dy1 = targ.y - src.y; + float dx2, dy2; + if (firstControlPoint) { + dx2 = dragTarget.x - src.x; + dy2 = dragTarget.y - src.y; + } else { + dx2 = dragTarget.x - targ.x; + dy2 = dragTarget.y - targ.y; + } + float base_dist = sqrt(dx1*dx1 + dy1*dy1); + float handle_dist = sqrt(dx2*dx2 + dy2*dy2); + float wcourseness = 0.1f; + + if (![modifyEdge isSelfLoop]) { + if (base_dist != 0) { + [modifyEdge setWeight:roundToNearest(wcourseness, handle_dist/base_dist)]; + //round(handle_dist / (base_dist*wcourseness)) * wcourseness; + } else { + [modifyEdge setWeight: + roundToNearest(wcourseness, [transformer scaleFromScreen:handle_dist])]; + } + } + + + float control_angle = good_atan(dx2, dy2); + + int bcourseness = 15; + + if ([modifyEdge bendMode] == EdgeBendModeBasic) { + float bnd; + float base_angle = good_atan(dx1, dy1); + if (firstControlPoint) { + bnd = base_angle - control_angle; + } else { + bnd = control_angle - base_angle + pi; + if (bnd > pi) bnd -= 2*pi; + } + + [modifyEdge setBend:round(bnd * (180.0f / pi) * + (1.0f / (float)bcourseness)) * + bcourseness]; + } else { + int bnd = round(control_angle * (180.0f / pi) * + (1.0f / (float)bcourseness)) * + bcourseness; + if (firstControlPoint) { + if ([theEvent modifierFlags] & NSAlternateKeyMask) { + if ([modifyEdge isSelfLoop]) { + [modifyEdge setInAngle:[modifyEdge inAngle] + + (bnd - [modifyEdge outAngle])]; + } else { + [modifyEdge setInAngle:[modifyEdge inAngle] - + (bnd - [modifyEdge outAngle])]; + } + } + + [modifyEdge setOutAngle:bnd]; + } else { + if (theEvent.modifierFlags & NSAlternateKeyMask) { + if ([modifyEdge isSelfLoop]) { + [modifyEdge setOutAngle:[modifyEdge outAngle] + + (bnd - [modifyEdge inAngle])]; + } else { + [modifyEdge setOutAngle:[modifyEdge outAngle] - + (bnd - [modifyEdge inAngle])]; + } + } + + [modifyEdge setInAngle:bnd]; + } + } + + [self refreshLayers]; + } else if (mouseMode == NodeMode) { + // do nothing... + } else if (mouseMode == EdgeDragMode) { + for (Node *n in [graph nodes]) { + if ([self node:n containsPoint:dragOrigin] || + [self node:n containsPoint:dragTarget]) + { + [[[nodeLayers objectForKey:n] selection] highlight]; + } else { + [[[nodeLayers objectForKey:n] selection] unhighlight]; + } + } + + [self refreshLayers]; + } else if (mouseMode == CropMode || mouseMode == CropDragMode) { + NSPoint p1 = [transformer fromScreen:[grid snapScreenPoint:dragOrigin]]; + NSPoint p2 = [transformer fromScreen:[grid snapScreenPoint:dragTarget]]; + + NSRect bbox; + if (mouseMode == CropDragMode) { + bbox = [graph boundingBox]; + if (bboxBottomTop == -1) { + float dy = p2.y - bbox.origin.y; + bbox.origin.y += dy; + bbox.size.height -= dy; + } else if (bboxBottomTop == 1) { + float dy = p2.y - (bbox.origin.y + bbox.size.height); + bbox.size.height += dy; + } + + if (bboxLeftRight == -1) { + float dx = p2.x - bbox.origin.x; + bbox.origin.x += dx; + bbox.size.width -= dx; + } else if (bboxLeftRight == 1) { + float dx = p2.x - (bbox.origin.x + bbox.size.width); + bbox.size.width += dx; + } + } else { + bbox = NSRectAroundPoints(p1, p2); + } + + [graph setBoundingBox:bbox]; + [self postGraphChange]; + [self refreshLayers]; + } else { + printf("WARNING: MOUSE DRAGGED IN INVALID MODE.\n"); + } +} + +- (void)mouseUp:(NSEvent*)theEvent { + if (!enabled) return; + + if (frameMoveMode) { + [CATransaction begin]; + [CATransaction setValue:(id)kCFBooleanTrue forKey:kCATransactionDisableActions]; + [self resetMainOrigin]; + [self refreshLayers]; + [CATransaction commit]; + frameMoveMode = NO; + return; + } + + dragTarget = [self convertPoint:[theEvent locationInWindow] fromView:nil]; + + if ((mouseMode & SelectMode) == SelectMode && [theEvent clickCount] == 2) { + for (Edge *e in [graph edges]) { + if ([self edge:e containsPoint:dragTarget]) { + if ([e bendMode] == EdgeBendModeBasic) { + [e convertBendToAngles]; + [e setBendMode:EdgeBendModeInOut]; + } else { + [e convertAnglesToBend]; + [e setBendMode:EdgeBendModeBasic]; + } + + [self registerUndo:graphTikzOnMouseDown withActionName:@"Change Edge Mode"]; + [self postGraphChange]; + break; + } + } + } + + if (mouseMode == SelectBoxMode) { + for (Node* n in [graph nodes]) { + if (NSPointInRect([transformer toScreen:[n point]], [selectionLayer selectBox])) { + [pickSupport selectNode:n]; + [[[nodeLayers objectForKey:n] selection] select]; + } else if (!([theEvent modifierFlags] & NSShiftKeyMask)) { + [pickSupport deselectNode:n]; + [[[nodeLayers objectForKey:n] selection] deselect]; + } + } + + [selectionLayer setActive:NO]; + [selectionLayer setNeedsDisplay]; + [self postSelectionChange]; + + mouseMode = SelectMode; + } else if (mouseMode == SelectMoveMode) { + [gridLayer setOpacity:0.3f]; + + if (dragTarget.x != dragOrigin.x || dragTarget.y != dragOrigin.y) { + [self registerUndo:graphTikzOnMouseDown withActionName:@"Shift Nodes"]; + } + + leaderNode = nil; + + [self postGraphChange]; + mouseMode = SelectMode; + } else if (mouseMode == SelectEdgeBendMode) { + [self registerUndo:graphTikzOnMouseDown withActionName:@"Adjust Edge"]; + [self postGraphChange]; + mouseMode = SelectMode; + modifyEdge = nil; + } else if (mouseMode == NodeMode) { + NSPoint coords = [transformer fromScreen:[grid snapScreenPoint:dragTarget]]; + Node *n = [Node nodeWithPoint:coords]; + [n setStyle:[stylePaletteController activeNodeStyle]]; + [graph addNode:n]; + + [self registerUndo:graphTikzOnMouseDown withActionName:@"Add Node"]; + + [self addNodeLayers:n]; + [self postGraphChange]; + } else if (mouseMode == EdgeDragMode) { + Node *src = nil; + Node *targ = nil; + BOOL found = NO; // don't break the loop until everything is unhighlighted + for (Node *n in [graph nodes]) { + [[[nodeLayers objectForKey:n] selection] unhighlight]; + if (!found) { + if ([self node:n containsPoint:dragOrigin]) src = n; + if ([self node:n containsPoint:dragTarget]) targ = n; + if (src != nil && targ != nil) { + Edge *e = [Edge edgeWithSource:src andTarget:targ]; + [e setStyle:[stylePaletteController activeEdgeStyle]]; + [graph addEdge:e]; + [self registerUndo:graphTikzOnMouseDown withActionName:@"Add Edge"]; + [self addEdgeLayers:e]; + found = YES; + } + } + } + + [self postGraphChange]; + mouseMode = EdgeMode; + } else if (mouseMode == CropMode || mouseMode == CropDragMode) { + if (dragOrigin.x == dragTarget.x && dragOrigin.y == dragTarget.y) { + [graph setBoundingBox:NSMakeRect(0, 0, 0, 0)]; + [self registerUndo:graphTikzOnMouseDown withActionName:@"Clear Bounding Box"]; + [self postGraphChange]; + } else { + [self registerUndo:graphTikzOnMouseDown withActionName:@"Change Bounding Box"]; + } + + mouseMode = CropMode; + } else { + if (! ([theEvent modifierFlags] & NSCommandKeyMask)) + printf("WARNING: MOUSE UP IN INVALID MODE.\n"); + } + + [self refreshLayers]; +} + +- (void)drawNode:(Node*)nd onLayer:(CALayer*)layer inContext:(CGContextRef)context { + NSPoint pt = [transformer toScreen:[nd point]]; + + NodeLayer *nl = [nodeLayers objectForKey:nd]; + //[nl setStrokeWidth:2.0f]; + [nl setCenter:pt andAnimateWhen:(mouseMode != SelectMoveMode)]; +} + +- (void)drawEdge:(Edge*)e onLayer:(CALayer*)layer inContext:(CGContextRef)context { + CGContextSaveGState(context); + NSPoint src = [transformer toScreen:[e tail]]; + NSPoint targ = [transformer toScreen:[e head]]; + NSPoint cp1 = [transformer toScreen:[e cp1]]; + NSPoint cp2 = [transformer toScreen:[e cp2]]; + + // all nodes have the same radius. this will need to be fixed + float sradius = 0;//(slayer.ghost) ? 0 : slayer.radius; + float tradius = 0;//(tlayer.ghost) ? 0 : tlayer.radius; + + float sdx = cp1.x - src.x; + float sdy = cp1.y - src.y; + float sdist = sqrt(sdx*sdx + sdy*sdy); + float sshortx = (sdist==0) ? 0 : sdx/sdist * sradius; + float sshorty = (sdist==0) ? 0 : sdy/sdist * sradius; + + float tdx = cp2.x - targ.x; + float tdy = cp2.y - targ.y; + float tdist = sqrt(tdx*tdx + tdy*tdy); + float tshortx = (tdist==0) ? 0 : tdx/tdist * tradius; + float tshorty = (tdist==0) ? 0 : tdy/tdist * tradius; + + CGContextMoveToPoint(context, src.x+sshortx, src.y+sshorty); + CGContextAddCurveToPoint(context, cp1.x, cp1.y, cp2.x, cp2.y, targ.x+tshortx, targ.y+tshorty); + + + float lineWidth = [transformer scaleToScreen:0.04f]; + + CGContextSetLineWidth(context, lineWidth); + CGContextSetRGBStrokeColor(context, 0, 0, 0, 1); + CGContextSetRGBFillColor(context, 0, 0, 0, 1); + CGContextStrokePath(context); + + if ([e style] != nil) { + NSPoint p1,p2,p3; + + // draw edge decoration + switch ([[e style] decorationStyle]) { + case ED_None: + break; + case ED_Tick: + p1 = [transformer toScreen:[e leftNormal]]; + p2 = [transformer toScreen:[e rightNormal]]; + CGContextMoveToPoint(context, p1.x, p1.y); + CGContextAddLineToPoint(context, p2.x, p2.y); + CGContextStrokePath(context); + break; + case ED_Arrow: + p1 = [transformer toScreen:[e leftNormal]]; + p2 = [transformer toScreen:[e midTan]]; + p3 = [transformer toScreen:[e rightNormal]]; + CGContextMoveToPoint(context, p1.x, p1.y); + CGContextAddLineToPoint(context, p2.x, p2.y); + CGContextAddLineToPoint(context, p3.x, p3.y); + CGContextStrokePath(context); + break; + } + + // draw arrow head + switch ([[e style] headStyle]) { + case AH_None: + break; + case AH_Plain: + p1 = [transformer toScreen:[e leftHeadNormal]]; + p2 = [transformer toScreen:[e head]]; + p3 = [transformer toScreen:[e rightHeadNormal]]; + CGContextMoveToPoint(context, p1.x, p1.y); + CGContextAddLineToPoint(context, p2.x, p2.y); + CGContextAddLineToPoint(context, p3.x, p3.y); + CGContextStrokePath(context); + break; + case AH_Latex: + p1 = [transformer toScreen:[e leftHeadNormal]]; + p2 = [transformer toScreen:[e head]]; + p3 = [transformer toScreen:[e rightHeadNormal]]; + CGContextMoveToPoint(context, p1.x, p1.y); + CGContextAddLineToPoint(context, p2.x, p2.y); + CGContextAddLineToPoint(context, p3.x, p3.y); + CGContextClosePath(context); + CGContextFillPath(context); + break; + } + + // draw arrow tail + switch ([[e style] tailStyle]) { + case AH_None: + break; + case AH_Plain: + p1 = [transformer toScreen:[e leftTailNormal]]; + p2 = [transformer toScreen:[e tail]]; + p3 = [transformer toScreen:[e rightTailNormal]]; + CGContextMoveToPoint(context, p1.x, p1.y); + CGContextAddLineToPoint(context, p2.x, p2.y); + CGContextAddLineToPoint(context, p3.x, p3.y); + CGContextStrokePath(context); + break; + case AH_Latex: + p1 = [transformer toScreen:[e leftTailNormal]]; + p2 = [transformer toScreen:[e tail]]; + p3 = [transformer toScreen:[e rightTailNormal]]; + CGContextMoveToPoint(context, p1.x, p1.y); + CGContextAddLineToPoint(context, p2.x, p2.y); + CGContextAddLineToPoint(context, p3.x, p3.y); + CGContextClosePath(context); + CGContextFillPath(context); + break; + } + } + + + CGContextRestoreGState(context); + + if ([e hasEdgeNode]) { + Node *en = [e edgeNode]; + NSPoint mid = [transformer toScreen:[e mid]]; + if (![[en label] isEqual:@""]) { + [layer drawLabel:[en label] + atPoint:mid + inContext:context + usingTrans:transformer]; + } + } + + EdgeControlLayer *ecl = [edgeControlLayers objectForKey:e]; + [ecl setNeedsDisplay]; +} + + +// draw the graph layer +-(void)drawLayer:(CALayer *)layer inContext:(CGContextRef)context { + for (Edge* e in [graph edges]) [self drawEdge:e onLayer:layer inContext:context]; + + for (Node* n in [graph nodes]) [self drawNode:n onLayer:layer inContext:context]; + + if ([graph hasBoundingBox]) { + CGRect bbox = NSRectToCGRect(NSIntegralRect( + [transformer rectToScreen:[graph boundingBox]])); + CGContextSetRGBStrokeColor(context, 1.0f, 0.7f, 0.5f, 1.0f); + CGContextSetLineWidth(context, 1.0f); + CGContextSetShouldAntialias(context, NO); + CGContextStrokeRect(context, bbox); + CGContextSetShouldAntialias(context, YES); + } + + if (mouseMode == EdgeDragMode) { + CGContextMoveToPoint(context, dragOrigin.x, dragOrigin.y); + CGContextAddLineToPoint(context, dragTarget.x, dragTarget.y); + CGContextSetLineWidth(context, 2); + CGContextSetRGBStrokeColor(context, 0, 0, 1, 1); + CGContextStrokePath(context); + } +} + +// if enabled, suppress the default "bonk" behaviour on key presses +- (void)keyDown:(NSEvent *)theEvent { + if (!enabled) [super keyDown:theEvent]; +} + +- (void)delete:(id)sender { + BOOL didDelete = NO; + NSString *oldTikz = [graph tikz]; + + if ([[pickSupport selectedNodes] count] != 0) { + GraphChange *change = [graph removeNodes:[pickSupport selectedNodes]]; + for (Node *n in [change affectedNodes]) [self removeNodeLayers:n]; + for (Edge *e in [change affectedEdges]) [self removeEdgeLayers:e]; + + [self refreshLayers]; + [self postGraphChange]; + didDelete = YES; + } + + if ([[pickSupport selectedEdges] count] != 0) { + [graph removeEdges:[pickSupport selectedEdges]]; + for (Edge *e in [pickSupport selectedEdges]) [self removeEdgeLayers:e]; + [self refreshLayers]; + [self postGraphChange]; + didDelete = YES; + } + + [pickSupport deselectAllNodes]; + [pickSupport deselectAllEdges]; + + if (didDelete) [self registerUndo:oldTikz withActionName:@"Delete Nodes or Edges"]; +} + +- (void)keyUp:(NSEvent *)theEvent { + if (!enabled) return; + + id sender = self; + switch ([theEvent keyCode]) { + case 51: // delete + [self delete:sender]; // "self" is the sender + break; + case 1: // S + [toolPaletteController setSelectedTool:TikzToolSelect]; + break; + case 45: // N + case 9: // V + [toolPaletteController setSelectedTool:TikzToolNode]; + break; + case 14: // E + [toolPaletteController setSelectedTool:TikzToolEdge]; + //[self updateMouseMode]; + break; + case 40: // K + [toolPaletteController setSelectedTool:TikzToolCrop]; + break; + } + [self refreshLayers]; +} + + +- (void)deselectAll:(id)sender { + [pickSupport deselectAllNodes]; + [pickSupport deselectAllEdges]; + + for (Node *n in [graph nodes]) { + [[[nodeLayers objectForKey:n] selection] deselect]; + } + + for (Edge *e in [graph edges]) { + [[edgeControlLayers objectForKey:e] deselect]; + } + + [self postSelectionChange]; +} + +- (void)selectAll:(id)sender { + [pickSupport selectAllNodes:[NSSet setWithArray:[graph nodes]]]; + + for (Node *n in [graph nodes]) { + [[[nodeLayers objectForKey:n] selection] select]; + } + + [self postSelectionChange]; +} + + +- (void)updateMouseMode { + switch (toolPaletteController.selectedTool) { + case TikzToolSelect: + mouseMode = SelectMode; + break; + case TikzToolNode: + mouseMode = NodeMode; + break; + case TikzToolEdge: + mouseMode = EdgeMode; + break; + case TikzToolCrop: + mouseMode = CropMode; + break; + } +} + +- (void)setDocumentUndoManager:(NSUndoManager *)um { + documentUndoManager = um; +} + +- (void)copy:(id)sender { + if ([[pickSupport selectedNodes] count] != 0) { + Graph *clip = [graph copyOfSubgraphWithNodes:[pickSupport selectedNodes]]; + NSString *tikz = [clip tikz]; + NSData *data = [tikz dataUsingEncoding:NSUTF8StringEncoding]; + //NSLog(@"about to copy: %@", tikz); + NSPasteboard *cb = [NSPasteboard generalPasteboard]; + [cb declareTypes:[NSArray arrayWithObject:@"tikzpicture"] owner:self]; + [cb setData:data forType:@"tikzpicture"]; + } +} + +- (void)cut:(id)sender { + if ([[pickSupport selectedNodes] count] != 0) { + [self copy:sender]; + [self delete:sender]; + + // otherwise, menu will say "Undo Delete Graph" + [documentUndoManager setActionName:@"Cut Graph"]; + } +} + +- (void)paste:(id)sender { + NSPasteboard *cb = [NSPasteboard generalPasteboard]; + NSString *type = [cb availableTypeFromArray:[NSArray arrayWithObject:@"tikzpicture"]]; + if (type) { + NSData *data = [cb dataForType:type]; + NSString *tikz = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]; + //NSLog(@"pasting tikz:\n%@",tikz); + Graph *clip = [TikzGraphAssembler parseTikz:tikz]; + if (clip) { + //NSLog(@"tikz pasted:\n%@",tikz); + NSRect graphBounds = [graph bounds]; + NSRect clipBounds = [clip bounds]; + float dx = graphBounds.origin.x + + graphBounds.size.width - + clipBounds.origin.x + 0.5f; + [clip shiftNodes:[clip nodes] byPoint:NSMakePoint(dx, 0)]; + + if ([[clip nodes] count] != 0) { + NSString *oldTikz = [graph tikz]; + [self deselectAll:self]; + + // select everything from the clipboard + for (Node *n in [clip nodes]) { + [n attachStyleFromTable:[stylePaletteController nodeStyles]]; + [self addNodeLayers:n]; + [pickSupport selectNode:n]; + [[[nodeLayers objectForKey:n] selection] select]; + } + + for (Edge *e in [clip edges]) { + [e attachStyleFromTable:[stylePaletteController edgeStyles]]; + [self addEdgeLayers:e]; + } + + [graph insertGraph:clip]; + + [self registerUndo:oldTikz withActionName:@"Paste Graph"]; + [self refreshLayers]; + [self postGraphChange]; + } + } else { + NSLog(@"Error: couldn't parse tikz picture from clipboard."); + } + + } +} + +- (void)bringForward:(id)sender { + NSString *oldTikz = [graph tikz]; + [graph bringNodesForward:[pickSupport selectedNodes]]; + [graph bringEdgesForward:[pickSupport selectedEdges]]; + [self registerUndo:oldTikz withActionName:@"Bring Forward"]; + [self postGraphChange]; + [self refreshLayers]; +} + +- (void)sendBackward:(id)sender { + NSString *oldTikz = [graph tikz]; + [graph sendNodesBackward:[pickSupport selectedNodes]]; + [graph sendEdgesBackward:[pickSupport selectedEdges]]; + [self registerUndo:oldTikz withActionName:@"Send Backward"]; + [self postGraphChange]; + [self refreshLayers]; +} + +- (void)bringToFront:(id)sender { + NSString *oldTikz = [graph tikz]; + [graph bringNodesToFront:[pickSupport selectedNodes]]; + [graph bringEdgesToFront:[pickSupport selectedEdges]]; + [self registerUndo:oldTikz withActionName:@"Bring to Front"]; + [self postGraphChange]; + [self refreshLayers]; +} + +- (void)sendToBack:(id)sender { + NSString *oldTikz = [graph tikz]; + [graph sendNodesToBack:[pickSupport selectedNodes]]; + [graph sendEdgesToBack:[pickSupport selectedEdges]]; + [self registerUndo:oldTikz withActionName:@"Send to Back"]; + [self postGraphChange]; + [self refreshLayers]; +} + +- (void)flipHorizonal:(id)sender { + NSString *oldTikz = [graph tikz]; + [graph flipHorizontalNodes:[pickSupport selectedNodes]]; + [self registerUndo:oldTikz withActionName:@"Flip Horizontal"]; + [self postGraphChange]; + [self refreshLayers]; +} + +- (void)flipVertical:(id)sender { + NSString *oldTikz = [graph tikz]; + [graph flipVerticalNodes:[pickSupport selectedNodes]]; + [self registerUndo:oldTikz withActionName:@"Flip Vertical"]; + [self postGraphChange]; + [self refreshLayers]; +} + +- (void)reverseEdgeDirection:(id)sender { + NSString *oldTikz = [graph tikz]; + + NSSet *es; + if ([[pickSupport selectedEdges] count] != 0) { + es = [pickSupport selectedEdges]; + } else { + es = [graph incidentEdgesForNodes:[pickSupport selectedNodes]]; + } + + for (Edge *e in es) [e reverse]; + + [self registerUndo:oldTikz withActionName:@"Flip Edge Direction"]; + [self postGraphChange]; + [self refreshLayers]; +} + +- (BOOL)acceptsFirstResponder { return YES; } +- (BOOL)acceptsFirstMouse:(NSEvent *)theEvent { return YES; } +- (BOOL)canBecomeKeyView { return YES; } + + +@end diff --git a/tikzit-old/src/osx/Grid.h b/tikzit-old/src/osx/Grid.h new file mode 100644 index 0000000..76826e2 --- /dev/null +++ b/tikzit-old/src/osx/Grid.h @@ -0,0 +1,48 @@ +// +// Grid.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import "Transformer.h" + +@interface Grid : NSObject { + float gridX, gridY; + //float gridCellX, gridCellY; + int subdivisions; + Transformer *transformer; + NSSize size; +} + +@property NSSize size; + +- (id)initWithSpacing:(float)spacing subdivisions:(int)subs transformer:(Transformer*)t; ++ (Grid*)gridWithSpacing:(float)spacing subdivisions:(int)subs transformer:(Transformer*)t; +- (NSPoint)snapScreenPoint:(NSPoint)p; +- (float)gridX; +- (float)gridY; +- (int)subdivisions; +- (void)setSubdivisions:(int)subs; + +// Grid can also draw itself on a layer +- (void)drawLayer:(CALayer *)layer inContext:(CGContextRef)ctx; + +@end diff --git a/tikzit-old/src/osx/Grid.m b/tikzit-old/src/osx/Grid.m new file mode 100644 index 0000000..aa35c1f --- /dev/null +++ b/tikzit-old/src/osx/Grid.m @@ -0,0 +1,152 @@ +// +// Grid.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "Grid.h" + + +@implementation Grid + +@synthesize size; + +- (id)initWithSpacing:(float)spacing + subdivisions:(int)subs + transformer:(Transformer*)t +{ + if (!(self = [super init])) return nil; + gridX = spacing; + gridY = spacing; + subdivisions = subs; + size.width = 0; + size.height = 0; + transformer = t; + return self; +} + ++ (Grid*)gridWithSpacing:(float)spacing + subdivisions:(int)subs + transformer:(Transformer*)t +{ + return [[Grid alloc] initWithSpacing:spacing + subdivisions:subs + transformer:t]; +} + +- (float)gridX { + return gridX; +} + +- (float)gridY { + return gridY; +} + +- (int)subdivisions { + return subdivisions; +} + +- (void)setSubdivisions:(int)subs { + subdivisions = subs; +} + +- (NSPoint)snapScreenPoint:(NSPoint)p { + NSPoint snap; + + float gridCellX = [transformer scaleToScreen:gridX] / (float)subdivisions; + float gridCellY = [transformer scaleToScreen:gridY] / (float)subdivisions; + + // snap along grid lines, relative to the origin + snap.x = floor(((p.x-[transformer origin].x)/gridCellX)+0.5)*gridCellX + [transformer origin].x; + snap.y = floor(((p.y-[transformer origin].y)/gridCellY)+0.5)*gridCellY + [transformer origin].y; + return snap; +} + +-(void)drawLayer:(CALayer *)layer inContext:(CGContextRef)context +{ + CGContextSaveGState(context); + + CGContextSetShouldAntialias(context, NO); + + float x,y; + float grX = [transformer scaleToScreen:gridX]; + float grY = [transformer scaleToScreen:gridY]; + + float gridCellX = grX / (float)subdivisions; + float gridCellY = grY / (float)subdivisions; + + for (x = [transformer origin].x + gridCellX; x < size.width; x += gridCellX) { + CGContextMoveToPoint(context, x, 0); + CGContextAddLineToPoint(context, x, size.height); + } + + for (x = [transformer origin].x - gridCellX; x > 0; x -= gridCellX) { + CGContextMoveToPoint(context, x, 0); + CGContextAddLineToPoint(context, x, size.height); + } + + for (y = [transformer origin].y + gridCellY; y < size.height; y += gridCellY) { + CGContextMoveToPoint(context, 0, y); + CGContextAddLineToPoint(context, size.width, y); + } + + for (y = [transformer origin].y - gridCellY; y > 0; y -= gridCellY) { + CGContextMoveToPoint(context, 0, y); + CGContextAddLineToPoint(context, size.width, y); + } + + CGContextSetRGBStrokeColor(context, 0.9, 0.9, 1, 1); + CGContextStrokePath(context); + + for (x = [transformer origin].x + grX; x < size.width; x += grX) { + CGContextMoveToPoint(context, x, 0); + CGContextAddLineToPoint(context, x, size.height); + } + + for (x = [transformer origin].x - grX; x > 0; x -= grX) { + CGContextMoveToPoint(context, x, 0); + CGContextAddLineToPoint(context, x, size.height); + } + + for (y = [transformer origin].y + grY; y < size.height; y += grY) { + CGContextMoveToPoint(context, 0, y); + CGContextAddLineToPoint(context, size.width, y); + } + + for (y = [transformer origin].y + grY; y > 0; y -= grY) { + CGContextMoveToPoint(context, 0, y); + CGContextAddLineToPoint(context, size.width, y); + } + + CGContextSetRGBStrokeColor(context, 0.8, 0.8, 0.9, 1); + CGContextStrokePath(context); + + CGContextMoveToPoint(context, [transformer origin].x, 0); + CGContextAddLineToPoint(context, [transformer origin].x, size.height); + CGContextMoveToPoint(context, 0, [transformer origin].y); + CGContextAddLineToPoint(context, size.width, [transformer origin].y); + + CGContextSetRGBStrokeColor(context, 0.6, 0.6, 0.7, 1); + CGContextStrokePath(context); + + CGContextRestoreGState(context); +} + +@end diff --git a/tikzit-old/src/osx/MultiCombo.h b/tikzit-old/src/osx/MultiCombo.h new file mode 100644 index 0000000..c8ec769 --- /dev/null +++ b/tikzit-old/src/osx/MultiCombo.h @@ -0,0 +1,18 @@ +// +// MultiCombo.h +// TikZiT +// +// Created by Aleks Kissinger on 21/04/2011. +// Copyright 2011 __MyCompanyName__. All rights reserved. +// + +#import + + +@interface MultiCombo : NSComboBox { + BOOL multi; +} + +@property (readwrite,assign) BOOL multi; + +@end diff --git a/tikzit-old/src/osx/MultiCombo.m b/tikzit-old/src/osx/MultiCombo.m new file mode 100644 index 0000000..8930460 --- /dev/null +++ b/tikzit-old/src/osx/MultiCombo.m @@ -0,0 +1,38 @@ +// +// MultiCombo.m +// TikZiT +// +// Created by Aleks Kissinger on 21/04/2011. +// Copyright 2011 __MyCompanyName__. All rights reserved. +// + +#import "MultiCombo.h" + + +@implementation MultiCombo + +- (void)textDidChange:(NSNotification *)notification { + [super textDidChange:notification]; + [self setMulti:NO]; +} + +- (void)setMulti:(BOOL)m { + multi = m; + if (multi) { + [self setTextColor:[NSColor grayColor]]; + [self setStringValue:@"multiple values"]; + } +} + +- (BOOL)multi { return multi; } + +- (BOOL)becomeFirstResponder { + [super becomeFirstResponder]; + if ([self multi]) { + [self setTextColor:[NSColor blackColor]]; + [self setStringValue:@""]; + } + return YES; +} + +@end diff --git a/tikzit-old/src/osx/MultiField.h b/tikzit-old/src/osx/MultiField.h new file mode 100644 index 0000000..39eeefa --- /dev/null +++ b/tikzit-old/src/osx/MultiField.h @@ -0,0 +1,18 @@ +// +// LabelField.h +// TikZiT +// +// Created by Aleks Kissinger on 20/04/2011. +// Copyright 2011 __MyCompanyName__. All rights reserved. +// + +#import + + +@interface MultiField : NSTextField { + BOOL multi; +} + +@property (readwrite,assign) BOOL multi; + +@end diff --git a/tikzit-old/src/osx/MultiField.m b/tikzit-old/src/osx/MultiField.m new file mode 100644 index 0000000..7c5aac3 --- /dev/null +++ b/tikzit-old/src/osx/MultiField.m @@ -0,0 +1,53 @@ +// +// LabelField.m +// TikZiT +// +// Created by Aleks Kissinger on 20/04/2011. +// Copyright 2011 __MyCompanyName__. All rights reserved. +// + +#import "MultiField.h" + + +@implementation MultiField + +- (void)textDidChange:(NSNotification *)notification { + [super textDidChange:notification]; + [self setMulti:NO]; +} + +- (void)setMulti:(BOOL)m { + multi = m; + if (multi) { + [self setTextColor:[NSColor grayColor]]; + [self setStringValue:@"multiple values"]; + } +} + +- (BOOL)multi { return multi; } + +- (BOOL)becomeFirstResponder { + [super becomeFirstResponder]; + if ([self multi]) { + [self setTextColor:[NSColor blackColor]]; + [self setStringValue:@""]; + } + return YES; +} + +//- (BOOL)textShouldBeginEditing:(NSText *)textObject { +// [super textShouldBeginEditing:textObject]; +// NSLog(@"about to type"); +// return YES; +//} + +//- (void)textDidEndEditing:(NSNotification *)obj { +// [super textDidEndEditing:obj]; +// +// NSLog(@"focus lost"); +// if ([self multi]) { +// [self setMulti:YES]; +// } +//} + +@end diff --git a/tikzit-old/src/osx/NilToEmptyStringTransformer.h b/tikzit-old/src/osx/NilToEmptyStringTransformer.h new file mode 100644 index 0000000..1445a94 --- /dev/null +++ b/tikzit-old/src/osx/NilToEmptyStringTransformer.h @@ -0,0 +1,28 @@ +// +// NilToEmptyStringTransformer.h +// TikZiT +// +// Copyright 2011 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import + +@interface NilToEmptyStringTransformer : NSValueTransformer + +@end diff --git a/tikzit-old/src/osx/NilToEmptyStringTransformer.m b/tikzit-old/src/osx/NilToEmptyStringTransformer.m new file mode 100644 index 0000000..413f404 --- /dev/null +++ b/tikzit-old/src/osx/NilToEmptyStringTransformer.m @@ -0,0 +1,53 @@ +// +// NilToEmptyStringTransformer.m +// TikZiT +// +// Copyright 2011 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "NilToEmptyStringTransformer.h" + +@implementation NilToEmptyStringTransformer + +- (id)init { + if (!(self = [super init])) return nil; + return self; +} + ++ (Class)transformedValueClass { + return [NSString class]; +} + ++ (BOOL)allowsReverseTransformation { + return YES; +} + +- (id)transformedValue:(id)value { + if (value == nil) { + return @""; + } else { + return value; + } +} + +- (id)reverseTransformedValue:(id)value { + return [self transformedValue:value]; +} + +@end diff --git a/tikzit-old/src/osx/NodeLayer.h b/tikzit-old/src/osx/NodeLayer.h new file mode 100644 index 0000000..dbcdac5 --- /dev/null +++ b/tikzit-old/src/osx/NodeLayer.h @@ -0,0 +1,62 @@ +// +// NodeLayer.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import +#import "Transformer.h" +#import "Shape.h" +#import "Node.h" +#import "NodeStyle+Coder.h" +#import "NodeSelectionLayer.h" + +@interface NodeLayer : CALayer { + Node *node; + Shape *shape; + CGMutablePathRef path; + float textwidth; + NSPoint center; + Transformer *transformer; + Transformer *localTrans; + NodeSelectionLayer *selection; + BOOL rescale; + BOOL dirty; // need to rebuild CGBezierPath of the shape +} + +@property (strong) Node *node; +@property (assign) NSPoint center; +@property (assign) BOOL rescale; +@property (strong) NodeSelectionLayer *selection; +@property (readonly) CGMutablePathRef path; + +- (id)initWithNode:(Node*)n transformer:(Transformer*)t; +- (NSColor*)strokeColor; +- (NSColor*)fillColor; +- (float)strokeWidth; + +- (void)setCenter:(NSPoint)ctr andAnimateWhen:(BOOL)anim; +- (void)updateFrame; +- (BOOL)nodeContainsPoint:(NSPoint)p; + +- (void)drawInContext:(CGContextRef)context; + +@end diff --git a/tikzit-old/src/osx/NodeLayer.m b/tikzit-old/src/osx/NodeLayer.m new file mode 100644 index 0000000..5d15585 --- /dev/null +++ b/tikzit-old/src/osx/NodeLayer.m @@ -0,0 +1,238 @@ +// +// NodeLayer.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "NodeLayer.h" +#import "CALayer+DrawLabel.h" +#import "NSString+LatexConstants.h" +#import "Shape.h" +#import "ShapeNames.h" +#import "Node.h" +#import "Edge.h" + +@implementation NodeLayer + +@synthesize node, selection, rescale; + +- (id)initWithNode:(Node *)n transformer:(Transformer*)t { + if (!(self = [super init])) return nil; + node = n; + selection = [[NodeSelectionLayer alloc] init]; + [selection setNodeLayer:self]; + localTrans = [[Transformer alloc] init]; + + [self addSublayer:selection]; + textwidth = 0.0f; + center = NSMakePoint(0.0f, 0.0f); + transformer = t; + + path = NULL; + rescale = YES; + dirty = YES; + + [self updateFrame]; + return self; +} + +- (NSColor*)strokeColor { + if ([node style] != nil) { + return [[[node style] strokeColor] colorUsingColorSpace:[NSColorSpace deviceRGBColorSpace]]; + } else { + return nil; + } +} + +- (NSColor*)fillColor { + if ([node style] != nil) { + return [[[node style] fillColor] colorUsingColorSpace:[NSColorSpace deviceRGBColorSpace]]; + } else { + return nil; + } +} + +- (float)strokeWidth { + if ([node style] != nil) { + return [node.style strokeThickness]; + } else { + return [NodeStyle defaultStrokeThickness]; + } +} + +- (NSPoint)center { return center; } + +- (void)setCenter:(NSPoint)ctr { + center.x = round(ctr.x); + center.y = round(ctr.y); + [self updateFrame]; +} + +- (void)setCenter:(NSPoint)ctr andAnimateWhen:(BOOL)anim { + [CATransaction begin]; + if (!anim) { + [CATransaction setValue:(id)kCFBooleanTrue forKey:kCATransactionDisableActions]; + } + [self setCenter:ctr]; + [CATransaction commit]; +} + +- (void)updateShape { + Shape *s = ([node style] != nil) ? + [Shape shapeForName:[[node style] shapeName]] : + [Shape shapeForName:SHAPE_CIRCLE]; + if (s != shape) { // straight pointer comparison + shape = s; + dirty = YES; + } +} + +- (void)updateLocalTrans { + float scale = ([node style] != nil) ? [[node style] scale] : 1.0f; + + Transformer *t = [Transformer transformer]; + float rad = ([transformer scaleToScreen:scale] / 2.0f) + 8.0f; + [t setOrigin:NSMakePoint(rad, rad)]; + [t setScale:[transformer scale]*((rescale)?scale:0.8f)]; + + if (![localTrans isEqual:t]) { + dirty = YES; + localTrans = t; + } +} + +- (void)updateFrame { + [self updateLocalTrans]; + [self updateShape]; + float rad = [localTrans origin].x; + [self setFrame:CGRectIntegral(CGRectMake(center.x - rad, center.y - rad, 2*rad, 2*rad))]; + NSRect bds = NSMakeRect(0, 0, 2*rad, 2*rad); + [selection setFrame:NSRectToCGRect(bds)]; + + [self setNeedsDisplay]; + [selection setNeedsDisplay]; +} + +- (CGMutablePathRef)path { + if (dirty) { + CGMutablePathRef pth = CGPathCreateMutable(); + NSPoint p, cp1, cp2; + for (NSArray *arr in [shape paths]) { + BOOL fst = YES; + for (Edge *e in arr) { + if (fst) { + fst = NO; + p = [localTrans toScreen:[[e source] point]]; + CGPathMoveToPoint(pth, nil, p.x, p.y); + } + + p = [localTrans toScreen:[[e target] point]]; + if ([e isStraight]) { + CGPathAddLineToPoint(pth, nil, p.x, p.y); + } else { + cp1 = [localTrans toScreen:[e cp1]]; + cp2 = [localTrans toScreen:[e cp2]]; + CGPathAddCurveToPoint(pth, nil, cp1.x, cp1.y, cp2.x, cp2.y, p.x, p.y); + } + } + + CGPathCloseSubpath(pth); + } + + if (path != NULL) CFRelease(path); + path = pth; + dirty = NO; + } + + + return path; +} + +- (BOOL)nodeContainsPoint:(NSPoint)p { + CGPoint p1 = CGPointMake(p.x - [self frame].origin.x, p.y - [self frame].origin.y); + return CGPathContainsPoint([self path],nil,p1,NO); +} + + +- (void)drawInContext:(CGContextRef)context { + CGContextSaveGState(context); + + + if ([node style] == nil) { + CGContextSetRGBStrokeColor(context, 0.4f, 0.4f, 0.7f, 1.0f); + CGContextSetRGBFillColor(context, 0.4f, 0.4f, 0.7f, 1.0f); + //CGRect fr = [self frame]; + CGRect bds = NSRectToCGRect([localTrans rectToScreen:NSMakeRect(-0.5, -0.5, 1, 1)]); + CGRect pt = CGRectMake(CGRectGetMidX(bds)-1.0f, CGRectGetMidY(bds)-1.0f, 2.0f, 2.0f); + CGContextSetLineWidth(context, 0); + CGContextAddEllipseInRect(context, pt); + CGContextFillPath(context); + + // HACK: for some reason, CGFloat isn't getting typedef'ed properly + +#ifdef __x86_64__ + const double dash[2] = {2.0,2.0}; +#else + const float dash[2] = {2.0,2.0}; +#endif + CGContextSetLineDash(context, 0.0, dash, 2); + CGContextSetLineWidth(context, 1); + CGContextAddPath(context, [self path]); + CGContextStrokePath(context); + } else { + NSColor *stroke = [self strokeColor]; + NSColor *fill = [self fillColor]; + + CGContextSetRGBStrokeColor(context, + [stroke redComponent], + [stroke greenComponent], + [stroke blueComponent], + [stroke alphaComponent]); + + CGContextSetLineWidth(context, [self strokeWidth]); + + CGContextSetRGBFillColor(context, + [fill redComponent], + [fill greenComponent], + [fill blueComponent], + [fill alphaComponent]); + + + CGContextSetLineWidth(context, [self strokeWidth]); + CGContextAddPath(context, [self path]); + CGContextDrawPath(context, kCGPathFillStroke); + } + + if (!([node label] == nil || [[node label] isEqual:@""])) { + NSPoint labelPt = NSMakePoint([self frame].size.width/2, [self frame].size.height/2); + [self drawLabel:[[node label] stringByExpandingLatexConstants] + atPoint:labelPt + inContext:context + usingTrans:transformer]; + } + + CGContextRestoreGState(context); +} + +- (void)dealloc { + if (path != NULL) CFRelease(path); +} + +@end diff --git a/tikzit-old/src/osx/NodeSelectionLayer.h b/tikzit-old/src/osx/NodeSelectionLayer.h new file mode 100644 index 0000000..99ee75f --- /dev/null +++ b/tikzit-old/src/osx/NodeSelectionLayer.h @@ -0,0 +1,45 @@ +// +// NodeSelectionLayer.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import +#import "Shape.h" + +@class NodeLayer; + +@interface NodeSelectionLayer : CALayer { + BOOL selected; + CGMutablePathRef path; + NSLock *drawLock; + NodeLayer *nodeLayer; +} + +@property NodeLayer *nodeLayer; + +- (id)init; +- (void)select; +- (void)deselect; +- (void)highlight; +- (void)unhighlight; + +@end diff --git a/tikzit-old/src/osx/NodeSelectionLayer.m b/tikzit-old/src/osx/NodeSelectionLayer.m new file mode 100644 index 0000000..02b8ac2 --- /dev/null +++ b/tikzit-old/src/osx/NodeSelectionLayer.m @@ -0,0 +1,93 @@ +// +// NodeSelectionLayer.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "NodeSelectionLayer.h" +#import "NodeLayer.h" +#import "CircleShape.h" + +@implementation NodeSelectionLayer + +@synthesize nodeLayer; + +- (id)init { + if (!(self = [super init])) return nil; + selected = NO; + drawLock = [[NSLock alloc] init]; + nodeLayer = nil; + [self setOpacity:0.0f]; + return self; +} + + +- (void)select { + selected = YES; + [self setOpacity:0.5f]; +} + +- (void)deselect { + selected = NO; + [self setOpacity:0.0f]; +} + +- (void)highlight { + if (!selected) { + [self setOpacity:0.25f]; + } +} + +- (void)unhighlight { + if (!selected) { + [self setOpacity:0.0f]; + } +} + +//- (CGMutablePathRef)path { +// return path; +//} +// +//- (void)setPath:(CGMutablePathRef)p { +// path = CGPathCreateMutableCopy(p); +// CFMakeCollectable(path); +//} + +- (void)drawInContext:(CGContextRef)context { + [drawLock lock]; + CGContextSaveGState(context); + + //CGContextSetRGBStrokeColor(context, 0.61f, 0.735f, 1.0f, 1.0f); + CGContextSetRGBStrokeColor(context, 0.61f, 0.735f, 1.0f, 1.0f); + CGContextSetRGBFillColor(context, 0.61f, 0.735f, 1.0f, 1.0f); + CGContextSetLineWidth(context, 6.0f); + + if (nodeLayer != nil) { + CGContextAddPath(context, [nodeLayer path]); + } else { + NSLog(@"WARNING: attempting to draw selection with path = nil."); + } + CGContextDrawPath(context, kCGPathFillStroke); + + CGContextRestoreGState(context); + [drawLock unlock]; +} + +@end diff --git a/tikzit-old/src/osx/NodeStyle+Coder.h b/tikzit-old/src/osx/NodeStyle+Coder.h new file mode 100644 index 0000000..b6443af --- /dev/null +++ b/tikzit-old/src/osx/NodeStyle+Coder.h @@ -0,0 +1,36 @@ +// +// NodeStyle+Coder.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import "NodeStyle.h" + + +@interface NodeStyle(Coder) + +@property (copy) NSColor *fillColor; +@property (copy) NSColor *strokeColor; + +- (id)initWithCoder:(NSCoder *)coder; +- (void)encodeWithCoder:(NSCoder *)coder; + +@end diff --git a/tikzit-old/src/osx/NodeStyle+Coder.m b/tikzit-old/src/osx/NodeStyle+Coder.m new file mode 100644 index 0000000..d3623f5 --- /dev/null +++ b/tikzit-old/src/osx/NodeStyle+Coder.m @@ -0,0 +1,91 @@ +// +// NodeStyle+Coder.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "NodeStyle+Coder.h" +#import "ShapeNames.h" + +@implementation NodeStyle(Coder) + +- (NSColor*)fillColor { + return [NSColor colorWithDeviceRed:fillColorRGB.redFloat + green:fillColorRGB.greenFloat + blue:fillColorRGB.blueFloat + alpha:1.0f]; +} + +- (void)setFillColor:(NSColor*)c { + NSColor *c1 = [c colorUsingColorSpaceName:NSDeviceRGBColorSpace]; + [self willChangeValueForKey:@"fillColorIsKnown"]; + fillColorRGB = [ColorRGB colorWithFloatRed:c1.redComponent + green:c1.greenComponent + blue:c1.blueComponent]; + [self didChangeValueForKey:@"fillColorIsKnown"]; +} + +- (NSColor*)strokeColor { + return [NSColor colorWithDeviceRed:strokeColorRGB.redFloat + green:strokeColorRGB.greenFloat + blue:strokeColorRGB.blueFloat + alpha:1.0f]; +} + +- (void)setStrokeColor:(NSColor*)c { + NSColor *c1 = [c colorUsingColorSpaceName:NSDeviceRGBColorSpace]; + [self willChangeValueForKey:@"strokeColorIsKnown"]; + strokeColorRGB = [ColorRGB colorWithFloatRed:c1.redComponent + green:c1.greenComponent + blue:c1.blueComponent]; + [self didChangeValueForKey:@"strokeColorIsKnown"]; +} + +- (id)initWithCoder:(NSCoder *)coder { + if (!(self = [super init])) return nil; + + // decode keys + name = [coder decodeObjectForKey:@"name"]; + [self setStrokeColor:[coder decodeObjectForKey:@"strokeColor"]]; + [self setFillColor:[coder decodeObjectForKey:@"fillColor"]]; + strokeThickness = [coder decodeIntForKey:@"strokeThickness"]; + shapeName = [coder decodeObjectForKey:@"shapeName"]; + category = [coder decodeObjectForKey:@"category"]; + scale = [coder decodeFloatForKey:@"scale"]; + + // apply defaults + if (scale == 0.0f) scale = 1.0f; + if (shapeName == nil) shapeName = SHAPE_CIRCLE; + + return self; +} + +- (void)encodeWithCoder:(NSCoder *)coder { + [coder encodeObject:name forKey:@"name"]; + [coder encodeObject:[self strokeColor] forKey:@"strokeColor"]; + [coder encodeObject:[self fillColor] forKey:@"fillColor"]; + [coder encodeInt:strokeThickness forKey:@"strokeThickness"]; + [coder encodeObject:shapeName forKey:@"shapeName"]; + [coder encodeObject:category forKey:@"category"]; + [coder encodeFloat:scale forKey:@"scale"]; +} + + +@end diff --git a/tikzit-old/src/osx/ParseErrorView.h b/tikzit-old/src/osx/ParseErrorView.h new file mode 100644 index 0000000..bb6141f --- /dev/null +++ b/tikzit-old/src/osx/ParseErrorView.h @@ -0,0 +1,13 @@ +// +// ParseErrorView.h +// TikZiT +// +// Created by Karl Johan Paulsson on 27/01/2013. +// Copyright (c) 2013 Aleks Kissinger. All rights reserved. +// + +#import + +@interface ParseErrorView : NSView + +@end diff --git a/tikzit-old/src/osx/ParseErrorView.m b/tikzit-old/src/osx/ParseErrorView.m new file mode 100644 index 0000000..83383f0 --- /dev/null +++ b/tikzit-old/src/osx/ParseErrorView.m @@ -0,0 +1,40 @@ +// +// ParseErrorView.m +// TikZiT +// +// Created by Karl Johan Paulsson on 27/01/2013. +// Copyright (c) 2013 Aleks Kissinger. All rights reserved. +// + +#import "ParseErrorView.h" + +@implementation ParseErrorView + +- (id)initWithFrame:(NSRect)frame +{ + self = [super initWithFrame:frame]; + if (self) { + // Initialization code here. + } + + return self; +} + +- (void)drawRect:(NSRect)dirtyRect +{ + // Drawing code here. +} + +- (void)awakeFromNib{ + self.layer = [CALayer layer]; + self.wantsLayer = YES; + CALayer *newLayer = [CALayer layer]; + self.layer.backgroundColor = [[NSColor controlColor] CGColor]; + //CGColorCreate(CGColorSpaceCreateDeviceRGB(), (CGFloat[]){ 1, .9, .64, 1 }); +// newLayer.backgroundColor = [NSColor redColor].CGColor; + newLayer.frame = CGRectMake(100,100,100,100);//NSMakeRect(0,0,image.size.width,image.size.height); + newLayer.position = CGPointMake(20,20); + //[self.layer addSublayer:newLayer]; +} + +@end diff --git a/tikzit-old/src/osx/PreambleController.h b/tikzit-old/src/osx/PreambleController.h new file mode 100644 index 0000000..5b0931d --- /dev/null +++ b/tikzit-old/src/osx/PreambleController.h @@ -0,0 +1,57 @@ +// +// PreambleController.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import "Preambles.h" +#import "Preambles+Coder.h" + +@interface PreambleController : NSViewController { + Preambles *preambles; + IBOutlet NSTextView *textView; + IBOutlet NSDictionaryController *preambleDictionaryController; + + NSDictionary *textAttrs; + NSAttributedString *preambleText; + NSColor *ghostColor; + NSIndexSet *selectionIndexes; +} + +@property (readonly) BOOL useDefaultPreamble; +@property (readonly) Preambles *preambles; +@property (strong) NSAttributedString *preambleText; +@property (strong) NSIndexSet *selectionIndexes; + +- (id)initWithNibName:(NSString *)nibName plist:(NSString*)plist styles:(NSArray*)sty edges:(NSArray*)edg; +- (void)savePreambles:(NSString*)plist; +- (NSString*)currentPreamble; +- (NSString*)currentPostamble; +- (NSString*)buildDocumentForTikz:(NSString*)tikz; + +- (IBAction)setPreambleToDefault:(id)sender; +- (IBAction)setPreamble:(id)sender; +- (IBAction)insertDefaultStyles:(id)sender; + +- (IBAction)addPreamble:(id)sender; +- (IBAction)duplicatePreamble:(id)sender; + +@end diff --git a/tikzit-old/src/osx/PreambleController.m b/tikzit-old/src/osx/PreambleController.m new file mode 100644 index 0000000..206bb30 --- /dev/null +++ b/tikzit-old/src/osx/PreambleController.m @@ -0,0 +1,168 @@ +// +// PreambleController.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "PreambleController.h" + + +@implementation PreambleController + +@synthesize preambleText, preambles; + +- (id)initWithNibName:(NSString *)nibName plist:(NSString*)plist styles:(NSArray*)sty edges:(NSArray*)edg { + if (!(self = [super initWithNibName:nibName bundle:Nil])) return nil; + + preambles = (Preambles*)[NSKeyedUnarchiver unarchiveObjectWithFile:plist]; + [preambles setStyles:sty]; + [preambles setEdges:edg]; + if (preambles == nil) preambles = [[Preambles alloc] init]; + + preambleText = nil; + + NSFont *font = [NSFont userFixedPitchFontOfSize:11.0f]; + textAttrs = [NSDictionary dictionaryWithObject:font forKey:NSFontAttributeName]; + ghostColor = [NSColor colorWithDeviceRed:0.9f green:0.9f blue:0.9f alpha:1.0f]; + + + + return self; +} + +- (void)awakeFromNib { + NSArray *arr = [preambleDictionaryController arrangedObjects]; + NSString *current = [preambles selectedPreambleName]; + + if (current != nil && ![current isEqual:@"default"]) { + for (int i = 0; i < [arr count]; ++i) { + if ([[[arr objectAtIndex:i] key] isEqual:current]) { + [self setSelectionIndexes:[NSIndexSet indexSetWithIndex:i]]; + break; + } + } + } +} + +- (BOOL)useDefaultPreamble { + return [[preambles selectedPreambleName] isEqualToString:@"default"]; +} + +- (void)flushText { + if (preambleText != nil && ![self useDefaultPreamble]) { + [preambles setCurrentPreamble:[preambleText string]]; + } +} + +- (void)setCurrentPreamble:(NSString*)current { + [self flushText]; + + [self willChangeValueForKey:@"useDefaultPreamble"]; + [preambles setSelectedPreambleName:current]; + [self didChangeValueForKey:@"useDefaultPreamble"]; + + [self setPreambleText: + [[NSAttributedString alloc] initWithString:[preambles currentPreamble] + attributes:textAttrs]]; +} + +- (void)savePreambles:(NSString*)plist { + [self flushText]; + [NSKeyedArchiver archiveRootObject:preambles toFile:plist]; +} + +- (NSString*)currentPreamble { + [self flushText]; + return [preambles currentPreamble]; +} + +- (NSString*)currentPostamble { + return [preambles currentPostamble]; +} + +- (NSString*)buildDocumentForTikz:(NSString*)tikz { + [self flushText]; + return [preambles buildDocumentForTikz:tikz]; +} + +- (void)setSelectionIndexes:(NSIndexSet *)idx { + [self willChangeValueForKey:@"selectionIndexes"]; + selectionIndexes = idx; + [self didChangeValueForKey:@"selectionIndexes"]; + + [self setPreamble:self]; +} + +- (NSIndexSet*)selectionIndexes { + return selectionIndexes; +} + +- (IBAction)setPreambleToDefault:(id)sender{ + [self setCurrentPreamble:@"default"]; + [textView setBackgroundColor:ghostColor]; +} + +- (IBAction)setPreamble:(id)sender { + //if ([[toolbar selectedItemIdentifier] isEqualToString:[defaultToolbarItem itemIdentifier]]) { + // [self setCurrentPreamble:@"default"]; + // [textView setBackgroundColor:ghostColor]; + //} else if ([[toolbar selectedItemIdentifier] isEqualToString:[customToolbarItem itemIdentifier]]) { + NSString *key = nil; + if ([selectionIndexes count]==1) { + int i = [selectionIndexes firstIndex]; + key = [[[preambleDictionaryController arrangedObjects] objectAtIndex:i] key]; + } + if (key != nil) { + [self setCurrentPreamble:key]; + //NSLog(@"preamble set to %@", key); + } else { + [self setCurrentPreamble:@"custom"]; + //NSLog(@"preamble set to custom"); + } + [textView setBackgroundColor:[NSColor whiteColor]]; + //} +} + +- (IBAction)insertDefaultStyles:(id)sender { + [textView insertText:[preambles styleDefinitions]]; +} + +- (IBAction)addPreamble:(id)sender { + [preambleDictionaryController setInitialKey:@"new preamble"]; + [preambleDictionaryController setInitialValue:[preambles defaultPreamble]]; + [preambleDictionaryController add:sender]; +} + +- (void)controlTextDidEndEditing:(NSNotification *)obj { + //NSLog(@"got a text change"); + [self setPreamble:[obj object]]; +} + + +// NOT IMPLEMENTED +- (IBAction)duplicatePreamble:(id)sender { +// NSLog(@"set text to: %@", [preambles currentPreamble]); +// [preambleDictionaryController setInitialKey:[preambles selectedPreambleName]]; +// [preambleDictionaryController setInitialValue:[preambles currentPreamble]]; +// [preambleDictionaryController add:sender]; +} + + +@end diff --git a/tikzit-old/src/osx/Preambles+Coder.h b/tikzit-old/src/osx/Preambles+Coder.h new file mode 100644 index 0000000..5a270c5 --- /dev/null +++ b/tikzit-old/src/osx/Preambles+Coder.h @@ -0,0 +1,32 @@ +// +// Preambles+Coder.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "Preambles.h" +#import + +@interface Preambles (Coder) + +- (id)initWithCoder:(NSCoder *)coder; +- (void)encodeWithCoder:(NSCoder *)coder; + +@end diff --git a/tikzit-old/src/osx/Preambles+Coder.m b/tikzit-old/src/osx/Preambles+Coder.m new file mode 100644 index 0000000..5e468b2 --- /dev/null +++ b/tikzit-old/src/osx/Preambles+Coder.m @@ -0,0 +1,41 @@ +// +// Preambles+Coder.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "Preambles+Coder.h" + + +@implementation Preambles (Coder) + +- (id)initWithCoder:(NSCoder *)coder { + if (!(self = [super init])) return nil; + selectedPreambleName = [coder decodeObjectForKey:@"selectedPreamble"]; + preambleDict = [coder decodeObjectForKey:@"preambles"]; + return self; +} + +- (void)encodeWithCoder:(NSCoder *)coder { + [coder encodeObject:selectedPreambleName forKey:@"selectedPreamble"]; + [coder encodeObject:preambleDict forKey:@"preambles"]; +} + +@end diff --git a/tikzit-old/src/osx/PreferenceController.h b/tikzit-old/src/osx/PreferenceController.h new file mode 100644 index 0000000..b2b23f3 --- /dev/null +++ b/tikzit-old/src/osx/PreferenceController.h @@ -0,0 +1,49 @@ +// +// PreferenceController.h +// TikZiT +// +// Created by Karl Johan Paulsson on 26/02/2013. +// Copyright (c) 2013 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import "UpdatePreferenceController.h" +#import "PreambleController.h" +#import "CustomNodeController.h" + +@interface PreferenceController : NSWindowController{ + + IBOutlet NSView *engineView; + IBOutlet NSView *generalView; + IBOutlet NSView *updateView; + IBOutlet NSView *preambleView; + IBOutlet NSView *customNodeView; + + UpdatePreferenceController *updateController; + PreambleController *preambleController; + CustomNodeController *customNodeController; + + int currentViewTag; +} + +- (id)initWithWindowNibName:(NSString *)windowNibName preambleController:(PreambleController *)pc; + +- (IBAction)switchView:(id)sender; + +@end diff --git a/tikzit-old/src/osx/PreferenceController.m b/tikzit-old/src/osx/PreferenceController.m new file mode 100644 index 0000000..e785358 --- /dev/null +++ b/tikzit-old/src/osx/PreferenceController.m @@ -0,0 +1,133 @@ +// +// PreferenceController.m +// TikZiT +// +// Created by Karl Johan Paulsson on 26/02/2013. +// Copyright (c) 2013 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "PreferenceController.h" + +@interface PreferenceController () + +@end + +@implementation PreferenceController + +- (id)initWithWindowNibName:(NSString *)windowNibName preambleController:(PreambleController *)pc{ + if (!(self = [super initWithWindowNibName:windowNibName])) return nil; + + preambleController = pc; + + return self; +} + +- (NSRect)newFrameForNewContentView:(NSView*)view { + NSWindow *window = [self window]; + NSRect newFrameRect = [window frameRectForContentRect:[view frame]]; + NSRect oldFrameRect = [window frame]; + NSSize newSize = newFrameRect.size; + NSSize oldSize = oldFrameRect.size; + + NSRect frame = [window frame]; + frame.size = newSize; + frame.origin.y -= (newSize.height - oldSize.height); + + return frame; +} + +- (NSView *)viewForTag:(int)tag { + + NSView *view = nil; + switch (tag) { + default: + case 0: + view = generalView; + break; + case 1: + view = engineView; + break; + case 2: + view = updateView; + break; + case 3: + view = preambleView; + break; + case 4: + view = customNodeView; + break; + } + + return view; +} + +- (BOOL)validateToolbarItem:(NSToolbarItem *)item { + + if ([item tag] == currentViewTag) return NO; + else return YES; + +} + +- (void)awakeFromNib { + + [[self window] setContentSize:[generalView frame].size]; + [[[self window] contentView] addSubview:generalView]; + [[[self window] contentView] setWantsLayer:YES]; + + updateController = [[UpdatePreferenceController alloc] initWithNibName:@"UpdatePreferencePanel" bundle:nil]; + [[updateController view] setFrame:[updateView frame]]; + [[[self window] contentView] replaceSubview:updateView with:[updateController view]]; + updateView = [updateController view]; + + [[preambleController view] setFrame:[preambleView frame]]; + [[[self window] contentView] replaceSubview:preambleView with:[preambleController view]]; + preambleView = [preambleController view]; + + customNodeController = [[CustomNodeController alloc] initWithNibName:@"CustomNodes" bundle:nil]; + [[customNodeController view] setFrame:[customNodeView frame]]; + [[[self window] contentView] replaceSubview:customNodeView with:[customNodeController view]]; + customNodeView = [customNodeController view]; + + [[self window] setContentSize:[engineView frame].size]; + [[[self window] contentView] addSubview:engineView]; + currentViewTag = 1; +} + +- (IBAction)switchView:(id)sender { + + int tag = [sender tag]; + NSView *view = [self viewForTag:tag]; + NSView *previousView = [self viewForTag:currentViewTag]; + currentViewTag = tag; + + NSRect newFrame = [self newFrameForNewContentView:view]; + + [NSAnimationContext beginGrouping]; + + if ([[NSApp currentEvent] modifierFlags] & NSShiftKeyMask) + [[NSAnimationContext currentContext] setDuration:1.0]; + + [[[[self window] contentView] animator] replaceSubview:previousView with:view]; + [[[self window] animator] setFrame:newFrame display:YES]; + + [NSAnimationContext endGrouping]; + +} + +@end diff --git a/tikzit-old/src/osx/Preferences.xib b/tikzit-old/src/osx/Preferences.xib new file mode 100644 index 0000000..1be3f9f --- /dev/null +++ b/tikzit-old/src/osx/Preferences.xib @@ -0,0 +1,1165 @@ + + + + 1070 + 13C64 + 5053 + 1265.19 + 697.40 + + com.apple.InterfaceBuilder.CocoaPlugin + 5053 + + + IBNSLayoutConstraint + NSButton + NSButtonCell + NSCustomObject + NSCustomView + NSTextField + NSTextFieldCell + NSToolbar + NSToolbarItem + NSUserDefaultsController + NSView + NSWindowTemplate + + + com.apple.InterfaceBuilder.CocoaPlugin + + + PluginDependencyRecalculationVersion + + + + + PreferenceController + + + FirstResponder + + + NSApplication + + + 7 + 2 + {{196, 240}, {480, 270}} + 544736256 + Preferences + NSWindow + + + C1747407-DC9A-4297-9C1C-0A5010984E6C + + + YES + YES + NO + NO + 1 + 1 + + + + 197F9408-AFB0-404B-B2B6-4DB1250B0A80 + + Updates + Updates + + + + NSImage + updates + + + + {0, 0} + {0, 0} + YES + YES + 2 + YES + 0 + + + + A3DDD070-5637-444B-92C6-905084CAC389 + + General + General + + + + NSImage + NSPreferencesGeneral + + + + {0, 0} + {0, 0} + YES + YES + 1 + YES + 0 + + + + A96DC4D4-2171-4D05-8C08-8D01B3829158 + + Preamble + Preamble + + + + NSImage + preamble + + + + {0, 0} + {0, 0} + YES + YES + 3 + YES + 0 + + + + CBA2626C-DD4C-4ADD-BD5D-26D21216D9A8 + + Custom Nodes + Custom Nodes + + + + NSImage + customshape + + + + {0, 0} + {0, 0} + YES + YES + 4 + YES + 0 + + + + F85FE7C2-9847-4E58-8BF6-BE334E918CA7 + + Engine + Engine + + + + NSImage + engine + + + + {0, 0} + {0, 0} + YES + YES + 1 + YES + 0 + + + + + + + + + + + + + + + + + + + + + {480, 270} + + + + + {{0, 0}, {1680, 1028}} + {10000000000000, 10000000000000} + YES + + + + 268 + + + + 268 + {{18, 106}, {219, 18}} + + + + _NS:9 + YES + + -2080374784 + 268435456 + Keep inspector windows on top + + .LucidaGrandeUI + 13 + 1044 + + _NS:9 + + 1211912448 + 2 + + NSImage + NSSwitch + + + NSSwitch + + + + 200 + 25 + + NO + + + + 268 + {{18, 126}, {168, 18}} + + + + _NS:9 + YES + + -2080374784 + 268435456 + Autocomplete brackets + + _NS:9 + + 1211912448 + 2 + + + + + 200 + 25 + + NO + + + + 268 + {{18, 18}, {214, 18}} + + + + _NS:9 + YES + + -2080374784 + 268435456 + Bring preview window to focus + + _NS:9 + + 1211912448 + 2 + + + + + 200 + 25 + + NO + + + + 268 + {{20, 42}, {440, 22}} + + + + _NS:9 + YES + + -1804599231 + 272630784 + + + _NS:9 + + YES + + 6 + System + textBackgroundColor + + 3 + MQA + + + + 6 + System + textColor + + 3 + MAA + + + + NO + 1 + + + + 268 + {{18, 72}, {140, 17}} + + + + _NS:1535 + YES + + 68157504 + 272630784 + pdfLaTeX source path + + _NS:1535 + + + 6 + System + controlColor + + 3 + MC42NjY2NjY2NjY3AA + + + + 6 + System + controlTextColor + + + + NO + 1 + + + {480, 162} + + + + _NS:9 + NSView + + + + 268 + + {480, 96} + + + + _NS:9 + NSView + + + + 12 + + {480, 115} + + + + _NS:9 + NSView + + + + 12 + + {557, 354} + + + + _NS:9 + NSView + + + + 12 + + {557, 354} + + + + _NS:9 + NSView + + + YES + + + + + + + window + + + + 3 + + + + engineView + + + + 23 + + + + generalView + + + + 25 + + + + switchView: + + + + 26 + + + + switchView: + + + + 27 + + + + switchView: + + + + 116 + + + + updateView + + + + 117 + + + + switchView: + + + + 120 + + + + preambleView + + + + 121 + + + + customNodeView + + + + 123 + + + + switchView: + + + + 125 + + + + delegate + + + + 4 + + + + value: values.net.sourceforge.tikzit.pdflatexpath + + + + + + value: values.net.sourceforge.tikzit.pdflatexpath + value + values.net.sourceforge.tikzit.pdflatexpath + 2 + + + 54 + + + + value: values.net.sourceforge.tikzit.previewfocus + + + + + + value: values.net.sourceforge.tikzit.previewfocus + value + values.net.sourceforge.tikzit.previewfocus + 2 + + + 62 + + + + value: values.net.sourceforge.tikzit.autocomplete + + + + + + value: values.net.sourceforge.tikzit.autocomplete + value + values.net.sourceforge.tikzit.autocomplete + 2 + + + 149 + + + + value: values.net.sourceforge.tikzit.inspectorsontop + + + + + + value: values.net.sourceforge.tikzit.inspectorsontop + value + values.net.sourceforge.tikzit.inspectorsontop + 2 + + + 150 + + + + + + 0 + + + + + + -2 + + + File's Owner + + + -1 + + + First Responder + + + -3 + + + Application + + + 1 + + + + + + + + + 2 + + + + + 5 + + + + + + + + + + + + 11 + + + + + 12 + + + + + 13 + + + + + 4 + 0 + + 4 + 1 + 1 + + 20 + + 1000 + + 8 + 23 + 3 + NO + + + + 3 + 0 + + 4 + 1 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + NO + + + + 5 + 0 + + 5 + 1 + 1 + + 20 + + 1000 + + 0 + 29 + 3 + NO + + + + 6 + 0 + + 6 + 1 + 1 + + 20 + + 1000 + + 0 + 29 + 3 + NO + + + + 3 + 0 + + 4 + 1 + 1 + + 8 + + 1000 + + 6 + 24 + 3 + NO + + + + 5 + 0 + + 5 + 1 + 1 + + 20 + + 1000 + + 0 + 29 + 3 + NO + + + + 5 + 0 + + 5 + 1 + 1 + + 20 + + 1000 + + 0 + 29 + 3 + NO + + + + 5 + 0 + + 5 + 1 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + NO + + + + 3 + 0 + + 4 + 1 + 1 + + 6 + + 1000 + + 6 + 24 + 3 + NO + + + + 5 + 0 + + 5 + 1 + 1 + + 0.0 + + 1000 + + 6 + 24 + 2 + NO + + + + 3 + 0 + + 3 + 1 + 1 + + 20 + + 1000 + + 8 + 23 + 3 + NO + + + + + + + + + + + 14 + + + + + + 15 + + + + + + + + 16 + + + + + 30 + + + + + 32 + + + + + + + + 33 + + + + + 36 + + + + + 39 + + + + + 55 + + + + + 56 + + + + + 57 + + + + + + + + 58 + + + + + 59 + + + + + 60 + + + + + 64 + + + + + + 115 + + + + + 118 + + + + + 119 + + + + + 122 + + + + + 124 + + + + + 126 + + + + + 127 + + + + + + + + 128 + + + + + 130 + + + + + 131 + + + + + + + + 132 + + + + + 134 + + + + + 135 + + + + + 153 + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + {{357, 418}, {480, 270}} + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + + + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + 153 + + + + + PreferenceController + NSWindowController + + switchView: + id + + + switchView: + + switchView: + id + + + + NSView + NSView + NSView + NSView + NSView + + + + customNodeView + NSView + + + engineView + NSView + + + generalView + NSView + + + preambleView + NSView + + + updateView + NSView + + + + IBProjectSource + ./Classes/PreferenceController.h + + + + + 0 + IBCocoaFramework + YES + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + + + YES + 3 + + {32, 32} + {15, 15} + {32, 32} + {32, 32} + {32, 32} + {32, 32} + + YES + + diff --git a/tikzit-old/src/osx/PreviewController.h b/tikzit-old/src/osx/PreviewController.h new file mode 100644 index 0000000..6c51a23 --- /dev/null +++ b/tikzit-old/src/osx/PreviewController.h @@ -0,0 +1,52 @@ +// +// PreviewController.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + + +#import +#import "DraggablePDFView.h" + +@class PDFView; +@class PreambleController; + +@interface PreviewController : NSWindowController { + IBOutlet DraggablePDFView *pdfView; + IBOutlet NSProgressIndicator *progressIndicator; + IBOutlet NSScrollView *errorTextView; + IBOutlet NSTextView *errorText; + PreambleController *preambleController; + NSString *tempDir; + NSLock *latexLock; + int typesetCount; +} + + +- (id)initWithWindowNibName:(NSString*)nib + preambleController:(PreambleController*)pc + tempDir:(NSString*)dir; + +- (void)buildTikz:(NSString*)tikz; + ++ (void)setDefaultPreviewController:(PreviewController*)pc; ++ (PreviewController*)defaultPreviewController; + +@end diff --git a/tikzit-old/src/osx/PreviewController.m b/tikzit-old/src/osx/PreviewController.m new file mode 100644 index 0000000..cf069b1 --- /dev/null +++ b/tikzit-old/src/osx/PreviewController.m @@ -0,0 +1,147 @@ +// +// PreviewController.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "PreviewController.h" +#import "AppDelegate.h" +#import "PreambleController.h" +#import + +@implementation PreviewController + +static PreviewController *preview = nil; + +- (id)initWithWindowNibName:(NSString*)nib + preambleController:(PreambleController*)pc + tempDir:(NSString*)dir { + if (!(self = [super initWithWindowNibName:nib])) return nil; + tempDir = [dir copy]; + typesetCount = 0; + preambleController = pc; + latexLock = [[NSLock alloc] init]; + return self; +} + +- (void)runLatex:(id)tikz { + // Only build one tex file at a time, so we don't get funky results. + //[latexLock lock]; + [progressIndicator startAnimation:self]; + + if([[NSUserDefaults standardUserDefaults] boolForKey:@"net.sourceforge.tikzit.previewfocus"]){ + [[preview window] makeKeyAndOrderFront:self]; + } + + int fnum = typesetCount++; + + NSString *tex = [preambleController buildDocumentForTikz:tikz]; + + NSString *texFile = [NSString stringWithFormat:@"%@/tikzit_%d.tex", tempDir, fnum]; + NSString *pdfFile = [NSString stringWithFormat:@"%@/tikzit_%d.pdf", tempDir, fnum]; + + [tex writeToFile:texFile atomically:NO encoding:NSUTF8StringEncoding error:NULL]; + + NSString *pdflatexPath = [[NSUserDefaults standardUserDefaults] stringForKey:@"net.sourceforge.tikzit.pdflatexpath"]; + + // We run pdflatex in a bash shell to have easy access to the setup from unix-land + NSTask *latexTask = [[NSTask alloc] init]; + [latexTask setCurrentDirectoryPath:tempDir]; + [latexTask setLaunchPath:@"/bin/bash"]; + + // This assumes the user has $PATH set up to find pdflatex in either .profile + // or .bashrc. This should be improved to take other path setups into account + // and to be customisable. + NSString *latexCmd = + [NSString stringWithFormat: + @"if [ -e ~/.profile ]; then source ~/.profile; fi\n" + @"if [ -e ~/.bashrc ]; then source ~/.bashrc; fi\n" + @"%@ -interaction=nonstopmode -output-format=pdf -halt-on-error '%@'\n", pdflatexPath, texFile]; + + NSLog(@"Telling bash: %@", latexCmd); + + NSPipe *pout = [NSPipe pipe]; + NSPipe *pin = [NSPipe pipe]; + [latexTask setStandardOutput:pout]; + [latexTask setStandardInput:pin]; + + NSFileHandle *latexIn = [pin fileHandleForWriting]; + NSFileHandle *latexOut = [pout fileHandleForReading]; + + [latexTask launch]; + [latexIn writeData:[latexCmd dataUsingEncoding:NSUTF8StringEncoding]]; + [latexIn closeFile]; + + + NSData *data = [latexOut readDataToEndOfFile]; + NSString *str = [[NSString alloc] initWithData:data + encoding:NSUTF8StringEncoding]; + + [latexTask waitUntilExit]; + if ([latexTask terminationStatus] != 0) { + if ([latexTask terminationStatus] == 127) { + [errorTextView setHidden:YES]; + [errorText setString:@"\nCouldn't find pdflatex, change settings and try again."]; + [errorTextView setHidden:NO]; + }else{ + [errorTextView setHidden:YES]; + [errorText setString:[@"\nAN ERROR HAS OCCURRED, PDFLATEX SAID:\n\n" stringByAppendingString:str]]; + [errorTextView setHidden:NO]; + } + } else { + [errorText setString:@""]; + [errorTextView setHidden:YES]; + + PDFDocument *doc = [[PDFDocument alloc] initWithURL:[[NSURL alloc] initFileURLWithPath:pdfFile]]; + + // pad the PDF by a couple of pixels + if ([doc pageCount] >= 1) { + PDFPage *page = [doc pageAtIndex:0]; + NSRect box = [page boundsForBox:kPDFDisplayBoxCropBox]; + box.origin.x -= 2.0f; + box.origin.y -= 2.0f; + box.size.width += 4.0f; + box.size.height += 4.0f; + [page setBounds:box forBox:kPDFDisplayBoxCropBox]; + [page setBounds:box forBox:kPDFDisplayBoxMediaBox]; + } + + [pdfView setDocument:doc]; + } + + [progressIndicator stopAnimation:self]; + //[latexLock unlock]; +} + +- (void)buildTikz:(NSString*)tikz { + // Build on a separate thread to keep the interface responsive. + [NSThread detachNewThreadSelector:@selector(runLatex:) toTarget:self withObject:tikz]; +} + ++ (void)setDefaultPreviewController:(PreviewController*)pc { + preview = pc; +} + ++ (PreviewController*)defaultPreviewController { + return preview; +} + + +@end diff --git a/tikzit-old/src/osx/PropertyInspectorController.h b/tikzit-old/src/osx/PropertyInspectorController.h new file mode 100644 index 0000000..663ee4a --- /dev/null +++ b/tikzit-old/src/osx/PropertyInspectorController.h @@ -0,0 +1,83 @@ +// +// PropertyInspectorController.h +// TikZiT +// +// Created by Aleks Kissinger on 17/07/2011. +// Copyright 2011 Aleks Kissinger. All rights reserved. +// + +#import +#import "NodeStyle.h" +#import "GraphElementData.h" + +@class SFBInspectorView; +@class StylePaletteController; + +@interface PropertyInspectorController : NSWindowController { + IBOutlet SFBInspectorView *propertyInspectorView; + IBOutlet NSView *nodePropertiesView; + IBOutlet NSView *graphPropertiesView; + IBOutlet NSView *edgePropertiesView; + IBOutlet NSComboBox *sourceAnchorComboBox; + IBOutlet NSComboBox *targetAnchorComboBox; + IBOutlet NSTextField *edgeNodeLabelField; + IBOutlet NSButton *edgeNodeCheckbox; + IBOutlet NSArrayController *nodeDataArrayController; + IBOutlet NSArrayController *graphDataArrayController; + IBOutlet NSArrayController *edgeDataArrayController; + IBOutlet NSArrayController *edgeNodeDataArrayController; + + NSMutableArray *sourceAnchorNames; + IBOutlet NSArrayController *sourceAnchorNamesArrayController; + + NSMutableArray *targetAnchorNames; + IBOutlet NSArrayController *targetAnchorNamesArrayController; + + NSMutableArray *selectedNodes; + IBOutlet NSArrayController *selectedNodesArrayController; + + NSMutableArray *selectedEdges; + IBOutlet NSArrayController *selectedEdgesArrayController; + + // this data lists exists solely for displaying messages in disabled data tables + GraphElementData *noSelection; + GraphElementData *multipleSelection; + GraphElementData *noEdgeNode; + GraphElementData *noGraph; + + + // used to get access to the global style table + StylePaletteController *stylePaletteController; +} + +//@property (readonly) BOOL enableNodeDataControls; +//@property (readonly) BOOL enableEdgeDataControls; +@property (strong) NSMutableArray *selectedNodes; +@property (strong) NSMutableArray *selectedEdges; +@property (strong) NSMutableArray *sourceAnchorNames; +@property (strong) NSMutableArray *targetAnchorNames; +@property (strong) StylePaletteController *stylePaletteController; + +- (id)initWithWindowNibName:(NSString *)windowNibName; +- (void)graphSelectionChanged:(NSNotification*)notification; + +- (IBAction)addNodeProperty:(id)sender; +- (IBAction)addNodeAtom:(id)sender; +- (IBAction)removeNodeProperty:(id)sender; + +- (IBAction)addGraphProperty:(id)sender; +- (IBAction)addGraphAtom:(id)sender; +- (IBAction)removeGraphProperty:(id)sender; + +- (IBAction)addEdgeProperty:(id)sender; +- (IBAction)addEdgeAtom:(id)sender; +- (IBAction)removeEdgeProperty:(id)sender; + +- (IBAction)addEdgeNodeProperty:(id)sender; +- (IBAction)addEdgeNodeAtom:(id)sender; +- (IBAction)removeEdgeNodeProperty:(id)sender; + +//- (IBAction)addRemoveChildNode:(id)sender; +- (IBAction)refreshDocument:(id)sender; + +@end diff --git a/tikzit-old/src/osx/PropertyInspectorController.m b/tikzit-old/src/osx/PropertyInspectorController.m new file mode 100644 index 0000000..039a30f --- /dev/null +++ b/tikzit-old/src/osx/PropertyInspectorController.m @@ -0,0 +1,280 @@ +// +// PropertyInspectorController.m +// TikZiT +// +// Created by Aleks Kissinger on 17/07/2011. +// Copyright 2011 Aleks Kissinger. All rights reserved. +// + +#import "PropertyInspectorController.h" +#import "StylePaletteController.h" +#import "TikzDocument.h" +#import "SFBInspectors/SFBInspectorView.h" +#import "PickSupport.h" +#import "Node.h" +#import "Edge.h" +#import "NodeStyle.h" +#import "GraphicsView.h" +#import "GraphElementProperty.h" +#import "Shape.h" + +@implementation PropertyInspectorController + +@synthesize stylePaletteController; +@synthesize selectedNodes, selectedEdges; +@synthesize sourceAnchorNames, targetAnchorNames; + +- (id)initWithWindowNibName:(NSString *)windowNibName { + if (!(self = [super initWithWindowNibName:windowNibName])) return nil; + + noSelection = [[GraphElementData alloc] init]; + [noSelection setProperty:@"" forKey:@"No Selection"]; + multipleSelection = [[GraphElementData alloc] init]; + [multipleSelection setProperty:@"" forKey:@"Mult. Selection"]; + noEdgeNode = [[GraphElementData alloc] init]; + [noEdgeNode setProperty:@"" forKey:@"No Child"]; + noGraph = [[GraphElementData alloc] init]; + [noGraph setProperty:@"" forKey:@"No Graph"]; + + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(graphSelectionChanged:) + name:@"SelectionChanged" + object:nil]; + +// [[NSDocumentController sharedDocumentController] addObserver:self +// forKeyPath:@"currentDocument" +// options:NSKeyValueObservingOptionNew +// context:NULL]; + + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(graphSelectionChanged:) + name:@"NSWindowDidBecomeMainNotification" + object:nil]; + + [self setSourceAnchorNames: [[NSMutableArray alloc] initWithArray: [@"north south west east" componentsSeparatedByString:@" "]]]; + + [self setTargetAnchorNames: [[NSMutableArray alloc] initWithArray:[@"north south west east" componentsSeparatedByString:@" "]]]; + + + if ([[NSUserDefaults standardUserDefaults] boolForKey:@"net.sourceforge.tikzit.inspectorsontop"] == YES) { + [[self window] setLevel:NSFloatingWindowLevel]; + } else { + [[self window] setLevel:NSNormalWindowLevel]; + } + + [self showWindow:self]; + return self; +} + +- (void)observeValueForKeyPath:(NSString*)keyPath + ofObject:(id)object + change:(NSDictionary*)change + context:(void*)context { + [self graphSelectionChanged:nil]; +} + +//- (void)willChangeValueForKey:(NSString *)key { +// [super willChangeValueForKey:key]; +// NSLog(@"will: %@",key); +//} +// +//- (void)didChangeValueForKey:(NSString *)key { +// [super didChangeValueForKey:key]; +// NSLog(@"did: %@",key); +//} + +- (void)windowDidLoad { + [[self window] setMovableByWindowBackground:YES]; + + [propertyInspectorView addInspectorPane:graphPropertiesView + title:@"Graph Properties"]; + [propertyInspectorView addInspectorPane:nodePropertiesView + title:@"Node Properties"]; + [propertyInspectorView addInspectorPane:edgePropertiesView + title:@"Edge Properties"]; + [super windowDidLoad]; +} + +- (IBAction)refreshDocument:(id)sender { + NSDocumentController *dc = [NSDocumentController sharedDocumentController]; + TikzDocument *doc = (TikzDocument*)[dc currentDocument]; + + if (doc != nil) { + [[doc graphicsView] postGraphChange]; + [[doc graphicsView] refreshLayers]; + } +} + + +- (void)updateGraphFields { + NSDocumentController *dc = [NSDocumentController sharedDocumentController]; + TikzDocument *doc = (TikzDocument*)[dc currentDocument]; + + if (doc != nil) { + [graphDataArrayController setContent:[[[doc graphicsView] graph] data]]; + [graphDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; + [graphDataArrayController setEditable:YES]; + } else { + [graphDataArrayController setContent:noGraph]; + [graphDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; + [graphDataArrayController setEditable:NO]; + } +} + +- (void)updateNodeFields { + NSDocumentController *dc = [NSDocumentController sharedDocumentController]; + TikzDocument *doc = (TikzDocument*)[dc currentDocument]; + if (doc != nil) { + NSSet *sel = [[[doc graphicsView] pickSupport] selectedNodes]; + [self setSelectedNodes:[[sel allObjects] mutableCopy]]; + [selectedNodesArrayController setSelectedObjects:selectedNodes]; + if ([sel count] == 1) { + Node *n = [sel anyObject]; + [nodeDataArrayController setContent:[n data]]; + [nodeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; + [nodeDataArrayController setEditable:YES]; + } else if ([sel count] == 0) { + [nodeDataArrayController setContent:noSelection]; + [nodeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; + [nodeDataArrayController setEditable:NO]; + } else { + [nodeDataArrayController setContent:multipleSelection]; + [nodeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; + [nodeDataArrayController setEditable:NO]; + } + } else { + [nodeDataArrayController setContent:noGraph]; + [nodeDataArrayController setEditable:NO]; + } +} + +- (void)updateEdgeFields { + NSDocumentController *dc = [NSDocumentController sharedDocumentController]; + TikzDocument *doc = (TikzDocument*)[dc currentDocument]; + + if (doc != nil) { + NSSet *sel = [[[doc graphicsView] pickSupport] selectedEdges]; + [self setSelectedEdges:[[sel allObjects] mutableCopy]]; + [selectedEdgesArrayController setSelectedObjects:selectedEdges]; + if ([sel count] == 1) { + Edge *e = [sel anyObject]; + [edgeDataArrayController setContent:[e data]]; + [edgeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; + [edgeDataArrayController setEditable:YES]; + if ([e hasEdgeNode]) { + Node *n = [e edgeNode]; + [edgeNodeDataArrayController setContent:[n data]]; + [edgeNodeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; + [edgeNodeDataArrayController setEditable:YES]; + } else { + [edgeNodeDataArrayController setContent:noEdgeNode]; + [edgeNodeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; + [edgeNodeDataArrayController setEditable:NO]; + } + } else if ([sel count] == 0) { + [edgeDataArrayController setContent:noSelection]; + [edgeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; + [edgeDataArrayController setEditable:NO]; + [edgeNodeDataArrayController setContent:noSelection]; + [edgeNodeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; + [edgeNodeDataArrayController setEditable:NO]; + } else { + [edgeDataArrayController setContent:multipleSelection]; + [edgeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; + [edgeDataArrayController setEditable:NO]; + [edgeNodeDataArrayController setContent:multipleSelection]; + [edgeNodeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; + [edgeNodeDataArrayController setEditable:NO]; + } + } else { + [edgeDataArrayController setContent:noGraph]; + [edgeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; + [edgeDataArrayController setEditable:NO]; + [edgeNodeDataArrayController setContent:noGraph]; + [edgeNodeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; + [edgeNodeDataArrayController setEditable:NO]; + } +} + +- (void)graphSelectionChanged:(NSNotification*)notification { + [self updateNodeFields]; + [self updateEdgeFields]; + [self updateGraphFields]; +} + +- (void)controlTextDidEndEditing:(NSNotification*)notification { + NSDocumentController *dc = [NSDocumentController sharedDocumentController]; + TikzDocument *doc = (TikzDocument*)[dc currentDocument]; + if (doc != nil) { + PickSupport *pick = [[doc graphicsView] pickSupport]; + for (Node *n in [pick selectedNodes]) { + [n attachStyleFromTable:[stylePaletteController nodeStyles]]; + } + + for (Edge *e in [pick selectedEdges]) { + [e attachStyleFromTable:[stylePaletteController edgeStyles]]; + } + } + + [self refreshDocument:[notification object]]; +} + +- (void)addPropertyToAC:(NSArrayController*)ac { + [ac addObject:[[GraphElementProperty alloc] initWithPropertyValue:@"val" forKey:@"new_property"]]; + [self refreshDocument:nil]; +} + +- (void)addAtomToAC:(NSArrayController*)ac { + [ac addObject:[[GraphElementProperty alloc] initWithAtomName:@"new_atom"]]; + [self refreshDocument:nil]; +} + +- (void)removeFromAC:(NSArrayController*)ac { + [ac remove:nil]; + [self refreshDocument:nil]; +} + +- (IBAction)addNodeProperty:(id)sender { [self addPropertyToAC:nodeDataArrayController]; } +- (IBAction)addNodeAtom:(id)sender { [self addAtomToAC:nodeDataArrayController]; } +- (IBAction)removeNodeProperty:(id)sender { [self removeFromAC:nodeDataArrayController]; } + +- (IBAction)addGraphProperty:(id)sender { [self addPropertyToAC:graphDataArrayController]; } +- (IBAction)addGraphAtom:(id)sender { [self addAtomToAC:graphDataArrayController]; } +- (IBAction)removeGraphProperty:(id)sender { [self removeFromAC:graphDataArrayController]; } + +- (IBAction)addEdgeProperty:(id)sender { [self addPropertyToAC:edgeDataArrayController]; } +- (IBAction)addEdgeAtom:(id)sender { [self addAtomToAC:edgeDataArrayController]; } +- (IBAction)removeEdgeProperty:(id)sender { [self removeFromAC:edgeDataArrayController]; } + +- (IBAction)addEdgeNodeProperty:(id)sender { [self addPropertyToAC:edgeNodeDataArrayController]; } +- (IBAction)addEdgeNodeAtom:(id)sender { [self addAtomToAC:edgeNodeDataArrayController]; } +- (IBAction)removeEdgeNodeProperty:(id)sender { [self removeFromAC:edgeNodeDataArrayController]; } + +//- (BOOL)enableEdgeDataControls { +// NSDocumentController *dc = [NSDocumentController sharedDocumentController]; +// TikzDocument *doc = (TikzDocument*)[dc currentDocument]; +// +// if (doc != nil) { +// return ([[[[doc graphicsView] pickSupport] selectedEdges] count] == 1); +// } else { +// return NO; +// } +//} +// +//- (BOOL)enableEdgeNodeDataControls { +// NSDocumentController *dc = [NSDocumentController sharedDocumentController]; +// TikzDocument *doc = (TikzDocument*)[dc currentDocument]; +// +// if (doc != nil) { +// PickSupport *pick = [[doc graphicsView] pickSupport]; +// if ([[pick selectedEdges] count] == 1) { +// return ([[[pick selectedEdges] anyObject] hasEdgeNode]); +// } else { +// return NO; +// } +// } else { +// return NO; +// } +//} + +@end diff --git a/tikzit-old/src/osx/SelectBoxLayer.h b/tikzit-old/src/osx/SelectBoxLayer.h new file mode 100644 index 0000000..45b43c7 --- /dev/null +++ b/tikzit-old/src/osx/SelectBoxLayer.h @@ -0,0 +1,22 @@ +// +// SelectBoxLayer.h +// TikZiT +// +// Created by Aleks Kissinger on 14/06/2010. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import +#import + +@interface SelectBoxLayer : CALayer { + BOOL active; + CGRect box; +} + +@property (assign) BOOL active; +@property (assign) NSRect selectBox; + ++ (SelectBoxLayer*)layer; + +@end diff --git a/tikzit-old/src/osx/SelectBoxLayer.m b/tikzit-old/src/osx/SelectBoxLayer.m new file mode 100644 index 0000000..a7abe33 --- /dev/null +++ b/tikzit-old/src/osx/SelectBoxLayer.m @@ -0,0 +1,48 @@ +// +// SelectBoxLayer.m +// TikZiT +// +// Created by Aleks Kissinger on 14/06/2010. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import "SelectBoxLayer.h" + + +@implementation SelectBoxLayer + +@synthesize active; + +- (id)init { + if (!(self = [super init])) return nil; + box = CGRectMake(0.0f, 0.0f, 0.0f, 0.0f); + active = NO; + return self; +} + +- (void)setSelectBox:(NSRect)r { + box = NSRectToCGRect(r); +} + +- (NSRect)selectBox { + return NSRectFromCGRect(box); +} + +- (void)drawInContext:(CGContextRef)context { + if (active) { + CGContextAddRect(context, box); + + CGContextSetRGBStrokeColor(context, 0.6, 0.6, 0.6, 1); + CGContextSetRGBFillColor(context, 0.8, 0.8, 0.8, 0.2); + CGContextSetLineWidth(context, 1); + + CGContextSetShouldAntialias(context, NO); + CGContextDrawPath(context, kCGPathFillStroke); + } +} + ++ (SelectBoxLayer*)layer { + return [[SelectBoxLayer alloc] init]; +} + +@end diff --git a/tikzit-old/src/osx/SelectableCollectionViewItem.h b/tikzit-old/src/osx/SelectableCollectionViewItem.h new file mode 100644 index 0000000..4a2c571 --- /dev/null +++ b/tikzit-old/src/osx/SelectableCollectionViewItem.h @@ -0,0 +1,33 @@ +// +// SelectableCollectionViewItem.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import "StylePaletteController.h" + +@interface SelectableCollectionViewItem : NSCollectionViewItem { + IBOutlet StylePaletteController *stylePaletteController; +} + +- (void)setStylePaletteController:(StylePaletteController*)spc; + +@end diff --git a/tikzit-old/src/osx/SelectableCollectionViewItem.m b/tikzit-old/src/osx/SelectableCollectionViewItem.m new file mode 100644 index 0000000..880c37b --- /dev/null +++ b/tikzit-old/src/osx/SelectableCollectionViewItem.m @@ -0,0 +1,54 @@ +// +// SelectableCollectionViewItem.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "SelectableCollectionViewItem.h" +#import "SelectableNodeView.h" + +@implementation SelectableCollectionViewItem + +- (id)copyWithZone:(NSZone *)zone { + SelectableCollectionViewItem *item = [super copyWithZone:zone]; + [item setStylePaletteController:stylePaletteController]; + return (id)item; +} + +- (void)setSelected:(BOOL)flag { + [super setSelected:flag]; + [(SelectableNodeView*)[self view] setSelected:flag]; + + // only fire this event from the view that lost selection + //if (flag == NO) [stylePaletteController selectionDidChange]; + + [[self view] setNeedsDisplay:YES]; +} + +- (void)setRepresentedObject:(id)object { + [super setRepresentedObject:object]; + [(SelectableNodeView*)[self view] setNodeStyle:(NodeStyle*)object]; +} + +- (void)setStylePaletteController:(StylePaletteController*)spc { + stylePaletteController = spc; +} + +@end diff --git a/tikzit-old/src/osx/SelectableNodeView.h b/tikzit-old/src/osx/SelectableNodeView.h new file mode 100644 index 0000000..6b0841d --- /dev/null +++ b/tikzit-old/src/osx/SelectableNodeView.h @@ -0,0 +1,38 @@ +// +// SelectableView.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import "NodeLayer.h" +#import "NodeStyle.h" +#import "NodeStyle+Coder.h" + +@interface SelectableNodeView : NSView { + BOOL selected; + NodeLayer *nodeLayer; +} + +@property (assign) BOOL selected; +@property (strong) NodeStyle *nodeStyle; + + +@end diff --git a/tikzit-old/src/osx/SelectableNodeView.m b/tikzit-old/src/osx/SelectableNodeView.m new file mode 100644 index 0000000..797a137 --- /dev/null +++ b/tikzit-old/src/osx/SelectableNodeView.m @@ -0,0 +1,96 @@ +// +// SelectableView.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "SelectableNodeView.h" +#import "Shape.h" +#import "Transformer.h" + +@implementation SelectableNodeView + +@synthesize selected; + +- (id)initWithFrame:(NSRect)frameRect { + if (!(self = [super initWithFrame:frameRect])) return nil; + nodeLayer = nil; + return self; +} + +-(void)drawLayer:(CALayer *)layer inContext:(CGContextRef)context { +// NSLog(@"got draw"); +// CGContextSaveGState(context); +// +// if (selected) { +// CGContextSetRGBStrokeColor(context, 0.61f, 0.735f, 1.0f, 1.0f); +// CGContextSetRGBFillColor(context, 0.61f, 0.735f, 1.0f, 0.5f); +// CGContextSetLineWidth(context, 1.0f); +// +// CGRect box = CGRectMake([layer frame].origin.x + 2, +// [layer frame].origin.y + 2, +// [layer frame].size.width - 4, +// [layer frame].size.height - 4); +// +// //CGContextAddRect(context, box); +// CGContextDrawPath(context, kCGPathFillStroke); +// } +// +// CGContextRestoreGState(context); + + if (nodeLayer!=nil) { + if (![[[self layer] sublayers] containsObject:nodeLayer]) { + [[self layer] addSublayer:nodeLayer]; + NSPoint c = NSMakePoint(CGRectGetMidX([[self layer] frame]), + CGRectGetMidY([[self layer] frame])); + [nodeLayer setCenter:c andAnimateWhen:NO]; + } + + if (selected) [[nodeLayer selection] select]; + else [[nodeLayer selection] deselect]; + + [nodeLayer updateFrame]; + } +} + +- (void)drawRect:(NSRect)rect { + [super drawRect:rect]; +} + +- (BOOL)acceptsFirstMouse:(NSEvent *)theEvent { return YES; } + +- (void)setNodeStyle:(NodeStyle *)sty { + if (nodeLayer == nil) { + nodeLayer = [[NodeLayer alloc] initWithNode:[Node node] + transformer:[Transformer defaultTransformer]]; + [nodeLayer setRescale:NO]; + } + + [[nodeLayer node] setStyle:sty]; + [nodeLayer updateFrame]; +} + +- (NodeStyle*)nodeStyle { + if (nodeLayer != nil) return [[nodeLayer node] style]; + else return nil; +} + + +@end diff --git a/tikzit-old/src/osx/StylePaletteController.h b/tikzit-old/src/osx/StylePaletteController.h new file mode 100644 index 0000000..05f0684 --- /dev/null +++ b/tikzit-old/src/osx/StylePaletteController.h @@ -0,0 +1,80 @@ +// +// StylePaletteController.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import "NodeStyle.h" +#import "EdgeStyle.h" + +@class SFBInspectorView; + +@interface StylePaletteController : NSWindowController { + NSMutableArray *nodeStyles; + NSMutableArray *edgeStyles; + IBOutlet NSArrayController *nodeStyleArrayController; + IBOutlet NSArrayController *filteredNodeStyleArrayController; + IBOutlet NSArrayController *edgeStyleArrayController; + IBOutlet NSArrayController *filteredEdgeStyleArrayController; + IBOutlet NSCollectionView *collectionView; + IBOutlet SFBInspectorView *nodeStyleInspectorView; + IBOutlet NSView *nodeStyleView; + IBOutlet NSView *edgeStyleView; + IBOutlet NSPopUpButton *shapeDropdown; + NSString *displayedNodeStyleCategory; + NSString *displayedEdgeStyleCategory; +} + +@property (strong) NSMutableArray *nodeStyles; +@property (strong) NSMutableArray *edgeStyles; +@property (readonly) BOOL documentActive; +@property (strong) NodeStyle *activeNodeStyle; +@property (strong) EdgeStyle *activeEdgeStyle; +@property (copy) NSString *displayedNodeStyleCategory; +@property (copy) NSString *displayedEdgeStyleCategory; +@property (readonly) NSPredicate *displayedNodeStylePredicate; +@property (readonly) NSPredicate *displayedEdgeStylePredicate; + +//@property NSString *nodeLabel; + +- (id)initWithWindowNibName:(NSString *)windowNibName + supportDir:(NSString*)supportDir; +- (void)saveStyles:(NSString *)plist; + +- (IBAction)refreshCollection:(id)sender; + +- (IBAction)applyActiveNodeStyle:(id)sender; +- (IBAction)clearActiveNodeStyle:(id)sender; +- (IBAction)addNodeStyle:(id)sender; + +- (IBAction)appleActiveEdgeStyle:(id)sender; +- (IBAction)clearActiveEdgeStyle:(id)sender; +- (IBAction)addEdgeStyle:(id)sender; +- (void)setActiveEdgeStyle:(EdgeStyle*)style; + +- (IBAction)setFillToClosestHashed:(id)sender; +- (IBAction)setStrokeToClosestHashed:(id)sender; + + +//- (IBAction)changeShape:(id)sender; + + +@end diff --git a/tikzit-old/src/osx/StylePaletteController.m b/tikzit-old/src/osx/StylePaletteController.m new file mode 100644 index 0000000..4fe46be --- /dev/null +++ b/tikzit-old/src/osx/StylePaletteController.m @@ -0,0 +1,252 @@ +// +// StylePaletteController.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "StylePaletteController.h" +#import "TikzDocument.h" +#import "SFBInspectors/SFBInspectorView.h" +#import "PickSupport.h" +#import "Node.h" +#import "Edge.h" +#import "NodeStyle.h" +#import "GraphicsView.h" +#import "GraphElementProperty.h" +#import "Shape.h" + +@implementation StylePaletteController + +@synthesize nodeStyles, edgeStyles; + +- (id)initWithWindowNibName:(NSString *)windowNibName + supportDir:(NSString*)supportDir +{ + if (self = [super initWithWindowNibName:windowNibName]) { + NSString *ns = [supportDir stringByAppendingPathComponent:@"nodeStyles.plist"]; + NSString *es = [supportDir stringByAppendingPathComponent:@"edgeStyles.plist"]; + nodeStyles = (NSMutableArray*)[NSKeyedUnarchiver + unarchiveObjectWithFile:ns]; + edgeStyles = (NSMutableArray*)[NSKeyedUnarchiver + unarchiveObjectWithFile:es]; + + if (nodeStyles == nil) nodeStyles = [NSMutableArray array]; + if (edgeStyles == nil) edgeStyles = [NSMutableArray array]; + + if ([[NSUserDefaults standardUserDefaults] boolForKey:@"net.sourceforge.tikzit.inspectorsontop"] == YES) { + [[self window] setLevel:NSFloatingWindowLevel]; + } else { + [[self window] setLevel:NSNormalWindowLevel]; + } + + [self showWindow:self]; + } + + return self; +} + +- (void)windowDidLoad { + [[self window] setMovableByWindowBackground:YES]; + [shapeDropdown addItemsWithTitles:[[Shape shapeDictionary] allKeys]]; + if ([self activeNodeStyle] != nil) { + [shapeDropdown setTitle:[[self activeNodeStyle] shapeName]]; + } + + [nodeStyleInspectorView addInspectorPane:nodeStyleView + title:@"Node Styles"]; + + [nodeStyleInspectorView addInspectorPane:edgeStyleView + title:@"Edge Styles"]; + + [super windowDidLoad]; +} + +- (void)saveStyles:(NSString*)supportDir { + NSString *ns = [supportDir stringByAppendingPathComponent:@"nodeStyles.plist"]; + NSString *es = [supportDir stringByAppendingPathComponent:@"edgeStyles.plist"]; + [NSKeyedArchiver archiveRootObject:nodeStyles toFile:ns]; + [NSKeyedArchiver archiveRootObject:edgeStyles toFile:es]; +} + +- (IBAction)refreshCollection:(id)sender { + [collectionView setNeedsDisplay:YES]; +} + + +- (BOOL)documentActive { + NSDocumentController *dc = [NSDocumentController sharedDocumentController]; + return dc.currentDocument != nil; +} + +-(BOOL)collectionView:(NSCollectionView*)collectionView canDragItemsAtIndexes:(NSIndexSet*)indexes withEvent:(NSEvent*)event { + return YES; +} + + +//=========================== +//= setting SVG-safe colors = +//=========================== +- (IBAction)setFillToClosestHashed:(id)sender { + NSArray *sel = [nodeStyleArrayController selectedObjects]; + if ([sel count] != 0) { + NodeStyle *sty = [sel objectAtIndex:0]; + [sty willChangeValueForKey:@"fillColor"]; + [sty willChangeValueForKey:@"fillColorIsKnown"]; + [sty.fillColorRGB setToClosestHashed]; + [sty didChangeValueForKey:@"fillColor"]; + [sty didChangeValueForKey:@"fillColorIsKnown"]; + } +} + +- (IBAction)setStrokeToClosestHashed:(id)sender { + NSArray *sel = [nodeStyleArrayController selectedObjects]; + if ([sel count] != 0) { + NodeStyle *sty = [sel objectAtIndex:0]; + [sty willChangeValueForKey:@"strokeColor"]; + [sty willChangeValueForKey:@"strokeColorIsKnown"]; + [sty.strokeColorRGB setToClosestHashed]; + [sty didChangeValueForKey:@"strokeColor"]; + [sty didChangeValueForKey:@"strokeColorIsKnown"]; + } +} + +//================================================= +//= setting filter predicates for nodes and edges = +//================================================= +- (NSString*)displayedNodeStyleCategory { + return displayedNodeStyleCategory; +} + +- (void)setDisplayedNodeStyleCategory:(NSString *)cat { + [self willChangeValueForKey:@"displayedNodeStylePredicate"]; + displayedNodeStyleCategory = cat; + [self didChangeValueForKey:@"displayedNodeStylePredicate"]; +} + +- (NSString*)displayedEdgeStyleCategory { + return displayedEdgeStyleCategory; +} + +- (void)setDisplayedEdgeStyleCategory:(NSString *)cat { + [self willChangeValueForKey:@"displayedEdgeStylePredicate"]; + displayedEdgeStyleCategory = cat; + [self didChangeValueForKey:@"displayedEdgeStylePredicate"]; +} + +- (NSPredicate*)displayedNodeStylePredicate { + return [NSPredicate predicateWithFormat:@"category == %@", displayedNodeStyleCategory]; +} + +- (NSPredicate*)displayedEdgeStylePredicate { + return [NSPredicate predicateWithFormat:@"category == %@", displayedEdgeStyleCategory]; +} + + +//============================== +//= getting and setting styles = +//============================== + +- (IBAction)applyActiveNodeStyle:(id)sender { + NSDocumentController *dc = [NSDocumentController sharedDocumentController]; + TikzDocument *doc = (TikzDocument*)[dc currentDocument]; + + if (doc != nil) { + [[doc graphicsView] applyStyleToSelectedNodes:[self activeNodeStyle]]; + } + + [[doc graphicsView] postSelectionChange]; +} + +- (IBAction)clearActiveNodeStyle:(id)sender { + [self setActiveNodeStyle:nil]; + + NSDocumentController *dc = [NSDocumentController sharedDocumentController]; + TikzDocument *doc = (TikzDocument*)[dc currentDocument]; + + if (doc != nil) { + [[doc graphicsView] applyStyleToSelectedNodes:nil]; + } + + [[doc graphicsView] postSelectionChange]; +} + +- (NodeStyle*)activeNodeStyle { + NSArray *sel = [filteredNodeStyleArrayController selectedObjects]; + if ([sel count] == 0) return nil; + else return [sel objectAtIndex:0]; +} + +- (void)setActiveNodeStyle:(NodeStyle*)style { + if ([nodeStyles containsObject:style]) { + [filteredNodeStyleArrayController setSelectedObjects:[NSArray arrayWithObject:style]]; + } else { + [filteredNodeStyleArrayController setSelectedObjects:[NSArray array]]; + } +} + +- (IBAction)appleActiveEdgeStyle:(id)sender { + NSDocumentController *dc = [NSDocumentController sharedDocumentController]; + TikzDocument *doc = (TikzDocument*)[dc currentDocument]; + + if (doc != nil) { + [[doc graphicsView] applyStyleToSelectedEdges:[self activeEdgeStyle]]; + } +} + +- (IBAction)clearActiveEdgeStyle:(id)sender { + [self setActiveEdgeStyle:nil]; + [self appleActiveEdgeStyle:sender]; +} + +- (EdgeStyle*)activeEdgeStyle { + NSArray *sel = [filteredEdgeStyleArrayController selectedObjects]; + if ([sel count] == 0) return nil; + else return [sel objectAtIndex:0]; +} + +- (void)setActiveEdgeStyle:(EdgeStyle*)style { + if ([edgeStyles containsObject:style]) { + [filteredEdgeStyleArrayController setSelectedObjects:[NSArray arrayWithObject:style]]; + } else { + [filteredEdgeStyleArrayController setSelectedObjects:[NSArray array]]; + } +} + + +//================= +//= adding styles = +//================= + +- (IBAction)addEdgeStyle:(id)sender { + EdgeStyle *sty = [[EdgeStyle alloc] init]; + [sty setCategory:displayedEdgeStyleCategory]; + [edgeStyleArrayController addObject:sty]; + [self setActiveEdgeStyle:sty]; +} + +- (IBAction)addNodeStyle:(id)sender { + NodeStyle *sty = [[NodeStyle alloc] init]; + [sty setCategory:displayedNodeStyleCategory]; + [nodeStyleArrayController addObject:sty]; + [self setActiveNodeStyle:sty]; +} + + +@end diff --git a/tikzit-old/src/osx/TikzDocument.h b/tikzit-old/src/osx/TikzDocument.h new file mode 100644 index 0000000..1881994 --- /dev/null +++ b/tikzit-old/src/osx/TikzDocument.h @@ -0,0 +1,37 @@ +// +// TikzDocument.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import "GraphicsView.h" +#import "TikzSourceController.h" +#import "PreviewController.h" +#import "GraphicsView.h" + +@interface TikzDocument : NSDocument { + NSString *tikz; +} + +@property (readonly) NSString *tikz; +@property (weak, readonly) GraphicsView *graphicsView; + +@end diff --git a/tikzit-old/src/osx/TikzDocument.m b/tikzit-old/src/osx/TikzDocument.m new file mode 100644 index 0000000..ef5908d --- /dev/null +++ b/tikzit-old/src/osx/TikzDocument.m @@ -0,0 +1,84 @@ +// +// TikzDocument.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "TikzDocument.h" +#import "TikzWindowController.h" + +@implementation TikzDocument + +@synthesize tikz; + +- (id)init { + self = [super init]; + if (self) { + tikz = nil; + } + return self; +} + +//- (NSString *)windowNibName { +// // Override returning the nib file name of the document +// // If you need to use a subclass of NSWindowController or if your document supports multiple NSWindowControllers, you should remove this method and override -makeWindowControllers instead. +// return @"TikzDocument"; +//} + +- (void)makeWindowControllers { + TikzWindowController *wc = [[TikzWindowController alloc] initWithDocument:self]; + [self addWindowController:wc]; +} + +- (void)windowControllerDidLoadNib:(NSWindowController *) aController { + [super windowControllerDidLoadNib:aController]; + [[self graphicsView] refreshLayers]; + // Add any code here that needs to be executed once the windowController has loaded the document's window. +} + +- (NSData *)dataOfType:(NSString *)typeName error:(NSError **)outError { + TikzWindowController *wc = + (TikzWindowController*)[[self windowControllers] objectAtIndex:0]; + NSData *outData = [[[wc tikzSourceController] tikz] dataUsingEncoding:NSUTF8StringEncoding]; + + if ( outError != NULL ) { + *outError = [NSError errorWithDomain:NSOSStatusErrorDomain code:unimpErr userInfo:NULL]; + } + return outData; +} + +- (BOOL)readFromData:(NSData *)data ofType:(NSString *)typeName error:(NSError **)outError { + tikz = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]; + + if ( outError != NULL ) { + *outError = [NSError errorWithDomain:NSOSStatusErrorDomain code:unimpErr userInfo:NULL]; + } + + return YES; +} + +- (GraphicsView*)graphicsView { + TikzWindowController *wc = + (TikzWindowController*)[[self windowControllers] objectAtIndex:0]; + return [wc graphicsView]; +} + + +@end diff --git a/tikzit-old/src/osx/TikzFormatter.h b/tikzit-old/src/osx/TikzFormatter.h new file mode 100644 index 0000000..4d9ec04 --- /dev/null +++ b/tikzit-old/src/osx/TikzFormatter.h @@ -0,0 +1,29 @@ +// +// NSTikzFormatter.h +// TikZiT +// +// Created by Karl Johan Paulsson on 27/01/2013. +// Copyright (c) 2013 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import + +@interface TikzFormatter : NSFormatter + +@end diff --git a/tikzit-old/src/osx/TikzFormatter.m b/tikzit-old/src/osx/TikzFormatter.m new file mode 100644 index 0000000..cb0865d --- /dev/null +++ b/tikzit-old/src/osx/TikzFormatter.m @@ -0,0 +1,91 @@ +// +// NSTikzFormatter.m +// TikZiT +// +// Created by Karl Johan Paulsson on 27/01/2013. +// Copyright (c) 2013 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "TikzFormatter.h" +#import "TikzGraphAssembler.h" + +@implementation TikzFormatter + +- (NSString *)stringForObjectValue:(id)obj{ + if (![obj isKindOfClass:[NSString class]]) { + return @""; + } + + return [NSString stringWithString:obj]; +} + +- (BOOL)getObjectValue:(out id *)obj forString:(NSString *)string errorDescription:(out NSString **)error{ + *obj = [NSString stringWithString:string]; + + BOOL r = [TikzGraphAssembler validateTikzPropertyNameOrValue:string]; + + if (!r && error) + *error = NSLocalizedString(@"Invalid input, couldn't parse value.", @"tikz user input error"); + + return r; +} + +- (BOOL)isPartialStringValid:(NSString **)partialStringPtr proposedSelectedRange:(NSRangePointer)proposedSelRangePtr originalString:(NSString *)origString originalSelectedRange:(NSRange)origSelRange errorDescription:(NSString **)error{ + NSRange addedRange; + NSString *addedString; + + if(![[NSUserDefaults standardUserDefaults] boolForKey:@"net.sourceforge.tikzit.autocomplete"]){ + return YES; + } + + addedRange = NSMakeRange(origSelRange.location, proposedSelRangePtr->location - origSelRange.location); + addedString = [*partialStringPtr substringWithRange: addedRange]; + + if([addedString isEqualToString:@"{"]){ + NSString *s = [[NSString stringWithString:*partialStringPtr] stringByAppendingString:@"}"]; + *partialStringPtr = s; + + return NO; + } + + if([addedString isEqualToString:@"}"]){ + NSScanner *scanner = [NSScanner scannerWithString:*partialStringPtr]; + + NSCharacterSet *cs = [NSCharacterSet characterSetWithCharactersInString:@"{}"]; + NSMutableString *strippedString = [NSMutableString stringWithCapacity:[*partialStringPtr length]]; + + while ([scanner isAtEnd] == NO) { + NSString *buffer; + if ([scanner scanCharactersFromSet:cs intoString:&buffer]) { + [strippedString appendString:buffer]; + + } else { + [scanner setScanLocation:([scanner scanLocation] + 1)]; + } + } + + if([strippedString length] % 2 == 1){ + return NO; + } + } + + return YES; +} + +@end diff --git a/tikzit-old/src/osx/TikzSourceController.h b/tikzit-old/src/osx/TikzSourceController.h new file mode 100644 index 0000000..84d36da --- /dev/null +++ b/tikzit-old/src/osx/TikzSourceController.h @@ -0,0 +1,71 @@ +// +// TikzSourceController.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import + +#import "GraphicsView.h" +#import "ParseErrorView.h" + +@interface TikzSourceController : NSObject { + GraphicsView *__weak graphicsView; + NSTextView *__unsafe_unretained sourceView; + NSAttributedString *source; + NSTextField *__weak status; + NSDictionary *textAttrs; + NSColor *successColor; + NSColor *failedColor; + NSTextField *__weak errorMessage; + ParseErrorView *__weak errorNotification; + + NSUndoManager *__weak documentUndoManager; + + BOOL tikzChanged; + BOOL justUndid; + + NSError *lastError; +} + +@property BOOL tikzChanged; +@property (weak) IBOutlet GraphicsView *graphicsView; +@property (unsafe_unretained) IBOutlet NSTextView *sourceView; +@property (weak) IBOutlet NSTextField *status; +@property (weak) NSUndoManager *documentUndoManager; +@property (copy) NSAttributedString *source; +@property (copy) NSString *tikz; +@property (weak) IBOutlet ParseErrorView *errorNotification; +@property (weak) IBOutlet NSTextField *errorMessage; + +- (void)updateTikzFromGraph; +- (void)graphChanged:(NSNotification*)n; + +- (IBAction)closeParseError:(id)pId; + +// called by code, these do not register an undo +- (BOOL)tryParseTikz; +- (void)doRevertTikz; + +// called by user, these do register an undo +- (void)parseTikz:(id)sender; +- (void)revertTikz:(id)sender; + +@end diff --git a/tikzit-old/src/osx/TikzSourceController.m b/tikzit-old/src/osx/TikzSourceController.m new file mode 100644 index 0000000..84eb3a5 --- /dev/null +++ b/tikzit-old/src/osx/TikzSourceController.m @@ -0,0 +1,241 @@ +// +// TikzSourceController.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "TikzSourceController.h" +#import "TikzGraphAssembler.h" +#import "Graph.h" + +@implementation TikzSourceController + +@synthesize graphicsView, sourceView, source, status; +@synthesize documentUndoManager, tikzChanged; +@synthesize errorMessage, errorNotification; + +- (void)endEditing { + NSResponder *res = [[sourceView window] firstResponder]; + [[sourceView window] makeFirstResponder:nil]; + [[sourceView window] makeFirstResponder:res]; +} + +- (void)undoParseTikz:(Graph *)oldGraph { + [graphicsView setGraph:oldGraph]; + [graphicsView setEnabled:NO]; + [graphicsView postGraphChange]; + [graphicsView refreshLayers]; + + [documentUndoManager registerUndoWithTarget:self + selector:@selector(parseTikz:) + object:self]; + [documentUndoManager setActionName:@"Parse Tikz"]; +} + +- (void)undoRevertTikz:(NSString*)oldTikz { + [self setTikz:oldTikz]; + [graphicsView setEnabled:NO]; + [graphicsView refreshLayers]; + + [documentUndoManager registerUndoWithTarget:self + selector:@selector(revertTikz:) + object:self]; + [documentUndoManager setActionName:@"Revert Tikz"]; +} + +- (void)undoTikzChange:(id)ignore { + [graphicsView setEnabled:YES]; + [graphicsView refreshLayers]; + [self endEditing]; + [self updateTikzFromGraph]; + [documentUndoManager registerUndoWithTarget:self + selector:@selector(redoTikzChange:) + object:nil]; + [documentUndoManager setActionName:@"Tikz Change"]; +} + +- (void)redoTikzChange:(id)ignore { + [graphicsView setEnabled:NO]; + [graphicsView refreshLayers]; + [documentUndoManager registerUndoWithTarget:self + selector:@selector(undoTikzChange:) + object:nil]; + [documentUndoManager setActionName:@"Tikz Change"]; +} + + +- (void)awakeFromNib { + justUndid = NO; + successColor = [NSColor colorWithCalibratedRed:0.0f + green:0.5f + blue:0.0f + alpha:1.0f]; + failedColor = [NSColor redColor]; + + NSFont *font = [NSFont userFixedPitchFontOfSize:11.0f]; + + if (font != nil) { + textAttrs = [NSDictionary dictionaryWithObject:font + forKey:NSFontAttributeName]; + } else { + NSLog(@"WARNING: couldn't find monospaced font."); + textAttrs = [NSDictionary dictionary]; + } + + + [self graphChanged:nil]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(graphChanged:) + name:@"GraphChanged" + object:graphicsView]; +} + +- (void)setTikz:(NSString *)str { + [self willChangeValueForKey:@"source"]; + source = [[NSAttributedString alloc] initWithString:str attributes:textAttrs]; + [self didChangeValueForKey:@"source"]; +} + +- (NSString*)tikz { + return [source string]; +} + +- (void)updateTikzFromGraph { + [self setTikz:[[graphicsView graph] tikz]]; + [errorNotification setHidden:TRUE]; +} + +- (void)graphChanged:(NSNotification*)n { + if ([graphicsView enabled]) [self updateTikzFromGraph]; +} + +- (IBAction)closeParseError:(id)pId{ + [errorNotification setHidden:TRUE]; +} + +- (void)textDidBeginEditing:(NSNotification *)notification { + if ([graphicsView enabled]){ + [graphicsView setEnabled:NO]; + [graphicsView refreshLayers]; + [documentUndoManager registerUndoWithTarget:self + selector:@selector(undoTikzChange:) + object:nil]; + [documentUndoManager setActionName:@"Tikz Change"]; + } +} + +- (BOOL)tryParseTikz { + NSError *thisError; + + Graph *g = [TikzGraphAssembler parseTikz:[self tikz] + error:&thisError]; + + lastError = thisError; + + if (g) { + [graphicsView deselectAll:self]; + [graphicsView setGraph:g]; + [graphicsView refreshLayers]; + [self doRevertTikz]; + return YES; + } else { + return NO; + } +} + +- (void)doRevertTikz { + [self updateTikzFromGraph]; + [self endEditing]; + [graphicsView setEnabled:YES]; + [graphicsView refreshLayers]; + [status setStringValue:@""]; +} + +- (void)parseTikz:(id)sender { + if (![graphicsView enabled]) { + Graph *oldGraph = [graphicsView graph]; + if ([self tryParseTikz]) { + [self endEditing]; + [documentUndoManager registerUndoWithTarget:self + selector:@selector(undoParseTikz:) + object:oldGraph]; + [documentUndoManager setActionName:@"Parse Tikz"]; + + [status setStringValue:@"success"]; + [status setTextColor:successColor]; + + [errorNotification setHidden:TRUE]; + } else { + [status setStringValue:@"parse error"]; + [status setTextColor:failedColor]; + + NSDictionary *d = [lastError userInfo]; + + NSString *ts = [NSString stringWithFormat: @"Parse error on line %@: %@\n", [d valueForKey:@"startLine"], [d valueForKey:NSLocalizedDescriptionKey]]; + NSMutableAttributedString *as = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat: @"Parse error on line %@: %@\n%@\n", [d valueForKey:@"startLine"], [d valueForKey:NSLocalizedDescriptionKey], [[d valueForKey:@"syntaxString"] stringByReplacingOccurrencesOfString:@"\t" withString:@""]]]; + + NSInteger tokenLength = [[d valueForKey:@"tokenLength"] integerValue]; + // Bit of a mess, offset around to find correct position and correct for 4 characters for every one character of \t + NSInteger addedTokenStart = [[d valueForKey:@"tokenStart"] integerValue] + [ts length] - ([[[d valueForKey:@"syntaxString"] componentsSeparatedByString:@"\t"] count]-1)*4 - tokenLength; + + // Can't see if the error is a start paranthesis as only that will be underlined, underline the entire paranthesis instead + if(tokenLength == 1 && [[as string] characterAtIndex:addedTokenStart] == '('){ + tokenLength += [[[as string] substringFromIndex:addedTokenStart+1] rangeOfString:@")"].location + 1; + } + + // Same if unexpected endparanthesis + if(tokenLength == 1 && [[as string] characterAtIndex:addedTokenStart] == ')'){ + NSInteger d = addedTokenStart - [[[as string] substringToIndex:addedTokenStart] rangeOfString:@"(" options:NSBackwardsSearch].location; + + tokenLength += d; + addedTokenStart -= d; + } + + [as beginEditing]; + [as addAttributes:[NSDictionary dictionaryWithObjectsAndKeys: + [NSNumber numberWithInt:NSUnderlineStyleSingle | NSUnderlinePatternDot], NSUnderlineStyleAttributeName, + [NSColor redColor], NSUnderlineColorAttributeName, + nil] + range:NSMakeRange(addedTokenStart, tokenLength)]; + [as endEditing]; + + [errorMessage setAttributedStringValue:as]; + [errorNotification setHidden:FALSE]; + } + } +} + +- (void)revertTikz:(id)sender { + if (![graphicsView enabled]) { + NSString *oldTikz = [[self tikz] copy]; + [self doRevertTikz]; + + [documentUndoManager registerUndoWithTarget:self + selector:@selector(undoRevertTikz:) + object:oldTikz]; + [documentUndoManager setActionName:@"Revert Tikz"]; + } +} + +- (void)dealloc { + [[NSNotificationCenter defaultCenter] removeObserver:self]; +} + +@end diff --git a/tikzit-old/src/osx/TikzWindowController.h b/tikzit-old/src/osx/TikzWindowController.h new file mode 100644 index 0000000..eab427c --- /dev/null +++ b/tikzit-old/src/osx/TikzWindowController.h @@ -0,0 +1,31 @@ +// +// TikzWindowController.h +// TikZiT +// +// Created by Aleks Kissinger on 26/01/2011. +// Copyright 2011 __MyCompanyName__. All rights reserved. +// + +#import + +@class TikzDocument, GraphicsView, TikzSourceController; + +@interface TikzWindowController : NSWindowController { + GraphicsView *__weak graphicsView; + TikzSourceController *__weak tikzSourceController; + TikzDocument *document; +} + +@property (weak) IBOutlet GraphicsView *graphicsView; +@property (weak) IBOutlet TikzSourceController *tikzSourceController; + +- (id)initWithDocument:(TikzDocument*)doc; + +// pass these straight to the tikz source controller +- (void)parseTikz:(id)sender; +- (void)revertTikz:(id)sender; +- (void)zoomIn:(id)sender; +- (void)zoomOut:(id)sender; +- (void)zoomToActualSize:(id)sender; + +@end diff --git a/tikzit-old/src/osx/TikzWindowController.m b/tikzit-old/src/osx/TikzWindowController.m new file mode 100644 index 0000000..bfacbfb --- /dev/null +++ b/tikzit-old/src/osx/TikzWindowController.m @@ -0,0 +1,66 @@ +// +// TikzWindowController.m +// TikZiT +// +// Created by Aleks Kissinger on 26/01/2011. +// Copyright 2011 __MyCompanyName__. All rights reserved. +// + +#import "TikzWindowController.h" +#import "TikzDocument.h" +#import "GraphicsView.h" +#import "TikzSourceController.h" + +@implementation TikzWindowController + +@synthesize graphicsView, tikzSourceController; + +- (id)initWithDocument:(TikzDocument*)doc { + if (!(self = [super initWithWindowNibName:@"TikzDocument"])) return nil; + document = doc; + return self; +} + +- (void)awakeFromNib { + if ([document tikz] != nil) { + [graphicsView setEnabled:NO]; + [tikzSourceController setTikz:[document tikz]]; + [tikzSourceController parseTikz:self]; + } + + [graphicsView setDocumentUndoManager:[document undoManager]]; + [tikzSourceController setDocumentUndoManager:[document undoManager]]; +} + +- (void)parseTikz:(id)sender { + [tikzSourceController parseTikz:sender]; +} + +- (void)revertTikz:(id)sender { + [tikzSourceController revertTikz:sender]; +} + +- (void)previewTikz:(id)sender { + PreviewController *pc = [PreviewController defaultPreviewController]; + if (![[pc window] isVisible]) [pc showWindow:sender]; + [pc buildTikz:[tikzSourceController tikz]]; +} + +- (void)zoomIn:(id)sender { + float scale = [[graphicsView transformer] scale] * 1.25f; + [[graphicsView transformer] setScale:scale]; + [graphicsView refreshLayers]; +} + +- (void)zoomOut:(id)sender { + float scale = [[graphicsView transformer] scale] * 0.8f; + [[graphicsView transformer] setScale:scale]; + [graphicsView refreshLayers]; +} + +- (void)zoomToActualSize:(id)sender { + [[graphicsView transformer] setScale:50.0f]; + [graphicsView refreshLayers]; +} + +@end diff --git a/tikzit-old/src/osx/ToolPaletteController.h b/tikzit-old/src/osx/ToolPaletteController.h new file mode 100644 index 0000000..6301c6b --- /dev/null +++ b/tikzit-old/src/osx/ToolPaletteController.h @@ -0,0 +1,42 @@ +// +// ToolPaletteController.h +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// +#import + +typedef enum { + TikzToolSelect, + TikzToolNode, + TikzToolEdge, + TikzToolCrop +} TikzTool; + +@interface ToolPaletteController : NSObject { + NSPanel *__weak toolPalette; + NSMatrix *__weak toolMatrix; +} + +@property TikzTool selectedTool; +@property (weak) IBOutlet NSPanel *toolPalette; +@property (weak) IBOutlet NSMatrix *toolMatrix; + + +@end diff --git a/tikzit-old/src/osx/ToolPaletteController.m b/tikzit-old/src/osx/ToolPaletteController.m new file mode 100644 index 0000000..000287d --- /dev/null +++ b/tikzit-old/src/osx/ToolPaletteController.m @@ -0,0 +1,58 @@ +// +// ToolPaletteController.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "ToolPaletteController.h" + + +@implementation ToolPaletteController + +@synthesize toolPalette, toolMatrix; + +- (TikzTool)selectedTool { + switch (toolMatrix.selectedRow) { + case 0: return TikzToolSelect; + case 1: return TikzToolNode; + case 2: return TikzToolEdge; + case 3: return TikzToolCrop; + } + return TikzToolSelect; +} + +- (void)setSelectedTool:(TikzTool)tool { + switch (tool) { + case TikzToolSelect: + [toolMatrix selectCellAtRow:0 column:0]; + break; + case TikzToolNode: + [toolMatrix selectCellAtRow:1 column:0]; + break; + case TikzToolEdge: + [toolMatrix selectCellAtRow:2 column:0]; + break; + case TikzToolCrop: + [toolMatrix selectCellAtRow:3 column:0]; + break; + } +} + +@end diff --git a/tikzit-old/src/osx/UpdatePreferenceController.h b/tikzit-old/src/osx/UpdatePreferenceController.h new file mode 100644 index 0000000..816322f --- /dev/null +++ b/tikzit-old/src/osx/UpdatePreferenceController.h @@ -0,0 +1,34 @@ +// +// UpdatePreferenceController.h +// TikZiT +// +// Copyright (c) 2013 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import +#import + +@interface UpdatePreferenceController : NSViewController{ + IBOutlet SUUpdater *sharedUpdater; + IBOutlet NSDate *lastUpdate; +} + +- (IBAction)checkForUpdates:(id)sender; + +@end diff --git a/tikzit-old/src/osx/UpdatePreferenceController.m b/tikzit-old/src/osx/UpdatePreferenceController.m new file mode 100644 index 0000000..2ff270f --- /dev/null +++ b/tikzit-old/src/osx/UpdatePreferenceController.m @@ -0,0 +1,49 @@ +// +// UpdatePreferenceController.h +// TikZiT +// +// Copyright (c) 2013 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "UpdatePreferenceController.h" + +@interface UpdatePreferenceController () + +@end + +@implementation UpdatePreferenceController + +- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil +{ + self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]; + if (self) { + sharedUpdater = [SUUpdater sharedUpdater]; + } + return self; +} + +- (IBAction)checkForUpdates:(id)sender{ + [sharedUpdater checkForUpdates:sender]; +} + +- (NSDate*)getLastUpdate{ + return [sharedUpdater lastUpdateCheckDate]; +} + +@end diff --git a/tikzit-old/src/osx/UpdatePreferencePanel.xib b/tikzit-old/src/osx/UpdatePreferencePanel.xib new file mode 100644 index 0000000..a9f57bd --- /dev/null +++ b/tikzit-old/src/osx/UpdatePreferencePanel.xib @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tikzit-old/src/osx/main.m b/tikzit-old/src/osx/main.m new file mode 100644 index 0000000..e6b4499 --- /dev/null +++ b/tikzit-old/src/osx/main.m @@ -0,0 +1,26 @@ +// +// main.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// + +#import + +int main(int argc, char *argv[]) +{ + return NSApplicationMain(argc, (const char **) argv); +} diff --git a/tikzit-old/src/osx/test/main.m b/tikzit-old/src/osx/test/main.m new file mode 100644 index 0000000..ad0c1f7 --- /dev/null +++ b/tikzit-old/src/osx/test/main.m @@ -0,0 +1,56 @@ +// +// main.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// + +#import "test/test.h" +#include + +void testCommon(); +void testOSX(); + +int main(int argc, char **argv) { + if (argc == 2 && strcmp(argv[1], "--disable-color")==0) { + setColorEnabled(NO); + } else { + setColorEnabled(YES); + } + + NSBundle *bund = [NSBundle bundleWithPath:@"TikZiT.app"]; + + + PUTS(@""); + PUTS(@"**********************************************"); + PUTS(@"TikZiT TESTS, OS X BUNDLE VERSION %@", + [bund objectForInfoDictionaryKey:@"CFBundleVersion"]); + PUTS(@"**********************************************"); + PUTS(@""); + + startTests(); + testCommon(); + testOSX(); + + PUTS(@""); + PUTS(@"**********************************************"); + endTests(); + PUTS(@"**********************************************"); + PUTS(@""); +} \ No newline at end of file diff --git a/tikzit-old/src/osx/test/osx.m b/tikzit-old/src/osx/test/osx.m new file mode 100644 index 0000000..f9565ab --- /dev/null +++ b/tikzit-old/src/osx/test/osx.m @@ -0,0 +1,64 @@ +// +// osx.m +// TikZiT +// +// Copyright 2010 Aleks Kissinger. All rights reserved. +// +// +// This file is part of TikZiT. +// +// TikZiT is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// TikZiT is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with TikZiT. If not, see . +// +#import "test/test.h" + +#import + +void testOSX() { +// char template[] = "/tmp/tikzit_test_tmp_XXXXXXX"; +// char *dir = mkdtemp(template); +// NSString *tempDir = [NSString stringWithUTF8String:dir]; +// +// NSString *testLatex = +// @"\\documentclass{article}\n" +// @"\\begin{document}\n" +// @"test document\n" +// @"\\end{document}\n"; +// +// NSString *texFile = [NSString stringWithFormat:@"%@/test.tex", tempDir]; +// NSString *pdfFile = [NSString stringWithFormat:@"%@/test.pdf", tempDir]; +// +// [testLatex writeToFile:texFile atomically:NO encoding:NSUTF8StringEncoding error:NULL]; +// +// NSTask *task = [[NSTask alloc] init]; +// [task setLaunchPath:@"/bin/bash"]; +// NSPipe *inpt = [NSPipe pipe]; +// NSPipe *outpt = [NSPipe pipe]; +// [task setStandardInput:inpt]; +// [task setStandardOutput:outpt]; +// +// [task launch]; +// +// NSFileHandle *wr = [inpt fileHandleForWriting]; +// NSString *cmd = +// [NSString stringWithFormat: +// @"if [ -e ~/.profile ]; then source ~/.profile; fi" +// @"if [ -e ~/.profile ]; then source ~/.profile; fi"; +// [wr writeData:[cmd dataUsingEncoding:NSUTF8StringEncoding]]; +// [wr closeFile]; +// +// NSFileHandle *rd = [outpt fileHandleForReading]; +// NSString *res = [[NSString alloc] initWithData:[rd readDataToEndOfFile] +// encoding:NSUTF8StringEncoding]; +// NSLog(@"got:\n %@", res); +} diff --git a/tikzit-old/src/tikzit.rc b/tikzit-old/src/tikzit.rc new file mode 100644 index 0000000..072f825 --- /dev/null +++ b/tikzit-old/src/tikzit.rc @@ -0,0 +1,24 @@ +1 VERSIONINFO +FILEVERSION 0,7,0,0 +PRODUCTVERSION 0,7,0,0 +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "080904E4" + BEGIN + VALUE "FileDescription", "A graph editor for LaTeX" + VALUE "FileVersion", "1.0" + VALUE "InternalName", "tikzit" + VALUE "LegalCopyright", "Aleks Kissinger, Alex Merry, Chris Heunen" + VALUE "OriginalFilename", "tikzit.exe" + VALUE "ProductName", "TikZiT" + VALUE "ProductVersion", "0.7" + END + END + + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x809, 1252 + END +END +id ICON "../tikzit.ico" diff --git a/tikzit-old/text-x-generic.png b/tikzit-old/text-x-generic.png new file mode 100644 index 0000000..928a679 Binary files /dev/null and b/tikzit-old/text-x-generic.png differ diff --git a/tikzit-old/text-x-script.png b/tikzit-old/text-x-script.png new file mode 100644 index 0000000..801dcd6 Binary files /dev/null and b/tikzit-old/text-x-script.png differ diff --git a/tikzit-old/tikzit.icns b/tikzit-old/tikzit.icns new file mode 100644 index 0000000..dc66f7f Binary files /dev/null and b/tikzit-old/tikzit.icns differ diff --git a/tikzit-old/tikzit.ico b/tikzit-old/tikzit.ico new file mode 100644 index 0000000..3132b4c Binary files /dev/null and b/tikzit-old/tikzit.ico differ diff --git a/tikzit-old/tikzit.spec b/tikzit-old/tikzit.spec new file mode 100644 index 0000000..237c543 --- /dev/null +++ b/tikzit-old/tikzit.spec @@ -0,0 +1,98 @@ +Name: tikzit +Version: 1.0 +Release: 1%{?dist} +Summary: Tool for creating and modifying PGF/TikZ-based node-and-edge graphs for LaTeX documents + +# try to choose a sensible group for this distro +%if 0%{?suse_version} +Group: Productivity/Graphics/Visualization/Graph +%else +%if 0%{?mdkversion} +Group: Sciences/Other +%else +Group: Applications/Productivity +%endif +%endif + +%if 0%{?suse_version} +License: GPL-2.0+ +%else +License: GPLv2+ +%endif +URL: http://tikzit.sourceforge.net +Source0: http://switch.dl.sourceforge.net/project/%{name}/%{name}-%{version}/%{name}-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-build + +BuildRequires: gcc-objc >= 4.6.0 +BuildRequires: gnustep-base-devel >= 1.18.0 +BuildRequires: gtk2-devel >= 2.18.0 +BuildRequires: pango-devel >= 1.16 +BuildRequires: cairo-devel >= 1.4 +%if 0%{?suse_version}%{?mdkversion} +BuildRequires: libpoppler-glib-devel >= 0.10 +%else +BuildRequires: poppler-glib-devel >= 0.10 +%endif +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif + +%description +TikZiT is a GTK+ application that allows the creation and modification of TeX +diagrams written using the pgf/TikZ macro library. It is especially geared +toward rapidly creating "dot"-diagrams for use in academic papers. + + +%prep +%setup -q + + +%build +%configure +make %{?_smp_mflags} + + +%install +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} +%if 0%{?suse_version} +# SuSE is particularly fussy about desktop file categories +%suse_update_desktop_file %{name} -r Graphics 2DGraphics +%endif + + +%clean +rm -rf %{buildroot} + + +%files +%defattr(-,root,root,-) +%doc +%{_bindir}/tikzit +%{_datadir}/tikzit/ +%{_datadir}/applications/tikzit.desktop +%{_datadir}/icons/hicolor/* + + +%changelog +* Fri May 17 2013 Alex Merry 1.0-2 +-Fixed license on openSUSE + +* Tue May 7 2013 Alex Merry 1.0-1 +-Bumped version + +* Fri Aug 24 2012 Alex Merry 0.9-1 +-Bumped version +-Bumped requirements + +* Tue Dec 06 2011 Alex Merry 0.7-1 +-Bumped version + +* Tue Feb 08 2011 Alex Merry 0.6-1 +-Bumped version +-Added Pango and Cairo to BuildRequires +-Set minimum version for GNUStep-base + +* Thu Dec 02 2010 Alex Merry 0.5-1 +-Rewrote spec file + diff --git a/tikzit-old/tikzit48x48.png b/tikzit-old/tikzit48x48.png new file mode 100644 index 0000000..056d04b Binary files /dev/null and b/tikzit-old/tikzit48x48.png differ diff --git a/tikzit-old/tikzit_dsa_pub.pem b/tikzit-old/tikzit_dsa_pub.pem new file mode 100644 index 0000000..c97cc04 --- /dev/null +++ b/tikzit-old/tikzit_dsa_pub.pem @@ -0,0 +1,20 @@ +-----BEGIN PUBLIC KEY----- +MIIDOjCCAi0GByqGSM44BAEwggIgAoIBAQDAdRlqLgJYjdAKkDsKtZDXgVlhqwyl +OXWCILHuE/MLh24I/mAaro4hucdhj92V5td9KNdM/R19904yZ3XcLj2/SodDVD7I +lEHPGwC/y+mJd9CaMNI/ARgFbLwJ+3+l/Ia3sraa/ASGAzardJPzYdkkRbZ/1DJn +wtHh2HgmPBdOMZZrbDmw3g4lj69Vacj4Wdz+YDG7750FjAUd+IcOvaDip28B8ogj +ogVirSXGe5YLoYbw078gx92PzSw6vfOZ3b7Gqk7zilYGB0bUJXUPSLOkxa5TMSx1 +Lr2UdW+vXrudI76rBhW52B32i7f801N4/W/qUfg8tw4tUGi/Uw8n2/S5AhUA0F82 +Qxit1jmqP0mZSLAn+qIVPuUCggEAEkSBjRxMo4KRvHOSppZphdaV2RWmQ6w9mxMj +3Z4AGDNU/buQ+TWJEYGVsIXpykI7DYCfgp8XO9uhj1hporfDsU4QGNZd0rG7SLK3 +DHwSf9QTgXY+D5IRQvkBtocxYRgNpuW+mfwl886SPmrRcT3QvsiFaI7/Iw787Tr6 +Yip4D7GjqTvj+epJH6kZq1xbdnrfBEA4dKs5IrZupF75npU8d1EjcdLlTyuzxuoZ +5a3SQWoBvT4l0xvbtR4yv+Af++MB+uxdxBSYMIgtQPgoIjFWtTDRZCwFAig1RWxz +fHEI5Fk4mqGhLAVbROL/pebYYZ5UxTKt9AMjmgmuM10/L5TXbwOCAQUAAoIBAA7t +W96VBoZgbbO2EfSxt5az4EnAJmuua6DNjZzESpcb67/DR7nLd5yveZEPL+9x6c1S +FtduIk8allplryOJtwysf8KkxrPVej83XiVJ9PDLMktsYjtnVksGIk9CS3v98OgT +c3g+xgJpRbwB6dROa5ZMxvoCU100ngfI3F/RUqeYYh7PP5kEL6SfqEHG5udIf1K7 +jUmOycNzI5Fsi+IDh8qtzxoOVTjoMPlN2F4T27xuWXA0BEd/NZqtgGLIFsbww5oD +8VPQIeo9UwQkYo/Qz1/uuaXi1u2PbTbbx2FTUL+zJuqrAv3oqmG2Ktyi0RXZaUAJ +4+P+kdS46Ip2NybQbkE= +-----END PUBLIC KEY----- diff --git a/tikzit-old/tikzitdoc.icns b/tikzit-old/tikzitdoc.icns new file mode 100644 index 0000000..2f8bbcd Binary files /dev/null and b/tikzit-old/tikzitdoc.icns differ diff --git a/tikzit-old/transform-crop-and-resize.png b/tikzit-old/transform-crop-and-resize.png new file mode 100644 index 0000000..4dedd93 Binary files /dev/null and b/tikzit-old/transform-crop-and-resize.png differ diff --git a/tikzit-old/transform-move.png b/tikzit-old/transform-move.png new file mode 100644 index 0000000..ae4201b Binary files /dev/null and b/tikzit-old/transform-move.png differ diff --git a/tikzit-old/updates.png b/tikzit-old/updates.png new file mode 100755 index 0000000..469ae30 Binary files /dev/null and b/tikzit-old/updates.png differ diff --git a/www/htdocs/appcast/rnotes-release.html b/www/htdocs/appcast/rnotes-release.html deleted file mode 100644 index d950029..0000000 --- a/www/htdocs/appcast/rnotes-release.html +++ /dev/null @@ -1,15 +0,0 @@ - - - - - What's new in TikZiT? - - - - - - - - - - diff --git a/www/htdocs/appcast/rnotes.css b/www/htdocs/appcast/rnotes.css deleted file mode 100644 index 2609c78..0000000 --- a/www/htdocs/appcast/rnotes.css +++ /dev/null @@ -1,215 +0,0 @@ -/* Tiger Mac Help task_style.css v2.0f*/ -/* */ - -body { - margin: 2px 12px 12px - } - -h1 { - font-size: 11pt; - font-family: "Lucida Grande", Arial, sans-serif; - margin-bottom: 0 - } - - -h2 { - font-size: 9pt; - font-family: "Lucida Grande", Arial, sans-serif; - margin-top: 0; - margin-bottom: -10px - } - -h3 { - font-size: 9pt; - font-family: "Lucida Grande", Arial, sans-serif; - font-weight: bold; - margin-top: -4px; - margin-bottom: -4px - } - -p { - font-size: 9pt; - font-family: "Lucida Grande", Arial, sans-serif; - line-height: 12pt; - text-decoration: none - } - - -ol { - font-size: 9pt; - font-family: "Lucida Grande", Arial, sans-serif; - line-height: 12pt; - list-style-position: outside; - margin-top: 12px; - margin-bottom: 12px; - margin-left: -18px; - padding-left: 40px - } - - -ol li { - margin-top: 6px; - margin-bottom: 6px - } - - -ol p { - margin-top: 6px; - margin-bottom: 6px - } - - -ul { - font-size: 9pt; - font-family: "Lucida Grande", Arial, sans-serif; - line-height: 12pt; - list-style-type: square; - list-style-position: outside; - margin-top: 12px; - margin-bottom: 12px; - margin-left: -24px; - padding-left: 40px - } - - -ul li { - margin-top: 6px; - margin-bottom: 6px - } - - -ul p { - margin-top: 6px; - margin-bottom: 6px - } - - -a { - color: #00f; - font-size: 9pt; - font-family: "Lucida Grande", Arial, sans-serif; - line-height: 12pt; - text-decoration: none - } - - -a:hover { - color: #00f; - font-family: "Lucida Grande", Arial, sans-serif; - text-decoration: underline - } - -hr { - text-decoration: none; - border: solid 1px #bfbfbf - } - -td { - padding: 6px - } - -#banner { background-color: #f2f2f2; background-repeat: no-repeat; padding: -2px 6px 0; position: fixed; top: 0; left: 0; width: 100%; height: 1.2em; float: left; border: solid 1px #bfbfbf } - -#caticon { -margin-top: 3px; - margin-bottom: -3px; - margin-right: 5px; - float: left; - } - -#pagetitle { - margin-top: 12px; - margin-bottom: 0px; - margin-left: 40px; - width: 88%; - border: solid 1px #fff - } - - -#mainbox { - margin-top: 2349px; - padding-right: 6px - } - -#taskbox { - background-color: #e6edff; - list-style-type: decimal; - list-style-position: outside; - margin: 12px 0; - padding: 2px 12px; - border: solid 1px #bfbfbf - } - - -#taskbox h2 { - margin-top: 8; - margin-bottom: -4px - } - -#machelp { position: absolute; top: 2px; left: 10px } - -#index { background-color: #f2f2f2; padding-right: 25px; top: 2px; right: 12px; width: auto; float: right } - -#next { - position: absolute; - top: 49px; - left: 88% - } - -#asindent { - margin-left: 22px; - font-size: 9pt; - font-family: Verdana, Courier, sans-serif; - } - -.bread { - color: #00f; - font-size: 8pt; - margin: -9px 0 -6px - } - -.leftborder { - color: #00f; - font-size: 8pt; - margin: -9px 0 -6px; - padding-top: 2px; - padding-bottom: 3px; - padding-left: 8px; - border-left: 1px solid #bfbfbf - } - -.mult { - margin-top: -8px - } - -.blue { - background-color: #e6edff; - margin-top: -3px; - margin-bottom: -3px; - padding-top: -3px; - padding-bottom: -3px - } - -.rightfloater -{ - float: right; - margin-left: 15px; -} - -.rules { - border-bottom: 1px dotted #ccc - } - -.dots { - border: dotted 1px #ccc - } - -.seealso { - margin-top: 4px; - margin-bottom: 4px - } -code { - color: black; - font-size: 9pt; - font-family: Verdana, Courier, sans-serif; - } diff --git a/www/htdocs/appcast/rnotes.html b/www/htdocs/appcast/rnotes.html deleted file mode 100644 index 82ba53a..0000000 --- a/www/htdocs/appcast/rnotes.html +++ /dev/null @@ -1,309 +0,0 @@ - - - - - What's new in TikZiT? - - - - - -
- - - - - - - -
-

TikZiT 0.8 (SVN 398)

-
-
    -
  • Added arrow head drawing.
    • -
  • Bezier curves now start and end and node boundaries, as they do in TikZ output.
    • -
-
- -
- - - - - - - -
-

TikZiT 0.8 (SVN 382)

-
-
    -
  • Added many new features, including: -
      -
    • edge styles with arrow heads (currently only mid-line heads shown, this will be fixed soon),
      • -
    • custom node shapes,
      • -
    • node/edge style categories, and
      • -
    • vector-graphcics style node/edge reordering (Bring to Front, Send to Back, etc.).
      • -
    • -
  • Bugfixes: -
      -
    • Fixed nodes and edges not deleting correctly.
      • -
    • Fixed inability to create custom preambles off of a clean install.
      • -
    • -
  • Remaining issues: -
      -
    • When loading a graph with unknown styles, sometimes get (null) instead of style placeholder.
      • -
    • Properties in property inspector do not always remove correctly.
      • -
    • -
-
- - -
- - - - - - - -
-

TikZiT 0.6 SVN 281

-
-
    -
  • Bugfix to unstyled node drawing
    • -
-
- -
- - - - - - - -
-

TikZiT 0.6 SVN 280

-
-
    -
  • Added built-in tikz shapes (for cobordisms), which co-exists with custom shape support
    • -
  • Added node style categories
    • -
  • Manual is now online! Check it. It will be updated with latest features shortly.
    • -
-
- -
- - - - - - - -
-

TikZiT 0.6 SVN 275

-
-
    -
  • Fixed dashed lines on unstyled nodes
    • -
-
- -
- - - - - - - -
-

TikZiT 0.6

-
-
    -
  • Made a release, TikZiT version 0.6
    • -
  • Added support for custom shapes. See forthcoming TikZiT manual - on tikzit.sourceforge.net for details.
    • -
-
- -
- - - - - - - -
-

TikZiT 0.5 SVN 273

-
-
    -
  • Added support for multiple preambles
    • -
  • Added pants and copants shapes
    • -
-
- -
- - - - - - - -
-

TikZiT 0.5 SVN 272

-
-
    -
  • Parses edge directions and primes correctly
    • -
  • Show/hide property inspector and style inspector now in Window menu
    • -
  • Removed style dropdown from property inspector. Use style inspector instead.
    • -
-
- -
- - - - - - - -
-

TikZiT 0.5 SVN 266

-
-
    -
  • Fixed bug with self-loop argument ordering
    • -
-
- -
- - - - - - - -
-

TikZiT 0.5 SVN 265

-
-
    -
  • Multiple shape pre-sets for nodes
    • -
  • New properties inspector virtually eliminates need to edit TiKZ source
    • -
  • Child nodes for edges now show labels
    • -
  • Collapsible inspectors save space
    • -
-
- -
- - - - - - - -
-

TikZiT 0.4 SVN 117

-
-
    -
  • Fixes parser not taking bounding box.
    • -
  • Added GUI support for editable bounding box.
    • -
  • Misc bugfixes re:undo
    • -
  • Replace Greek letters in labels with their unicode.
    • -
-
- -
- - - - - - - -
-

TikZiT 0.4 SVN 111

-
-
    -
  • Improved closest LaTeX color to use [svgnames] in xcolor.
    • -
  • Outputs correct default preamble, even with styles that have - spaces in their names.
    • -
  • Preamble editor, with option to toggle between custom preamble - and default.
    • -
  • Preview LaTeX with CMD-R.
    • -
  • Miscellaneous interface improvements.
    • -
-
- -
- - - - - - - -
-

TikZiT 0.4 SVN 103

-
-
    -
  • Added "set to closest LaTeX color" feature.
    • -
  • Slimmer node stye palette.
    • -
  • Shifted show preamble into the menu.
    • -
-
- -
- - - - - - - -
-

TikZiT 0.4 SVN 90

-
-
    -
  • Fixed undo flip and add edge bug.
    • -
  • Added "Source" button for simple preamble display.
    • -
-
-
- - - - - - - - -
-

TikZiT 0.4 SVN 86

-
-
    -
  • New versioning system, testing automatic updates.
    • -
-
-
- - - - - - - - -
-

TikZiT Release 0.4

-
-
    -
  • Added support for automatic updates.
    • -
-
-
- - - diff --git a/www/htdocs/appcast/tikzit-release.xml b/www/htdocs/appcast/tikzit-release.xml deleted file mode 100644 index e999873..0000000 --- a/www/htdocs/appcast/tikzit-release.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - TikZiT DEVEL Changelog - http://tikzit.sourceforge.net/appcast/tikzit-devel.xml - Most recent changes with links to updates. - en - - - Version 0.8.382 - - http://tikzit.sourceforge.net/appcast/rnotes-devel.html - - Tue, 17 Jan 2012 12:17:05 +0000 - - - - - Version 0.8.398 - - http://tikzit.sourceforge.net/appcast/rnotes-devel.html - - Fri, 20 Jan 2012 16:38:28 +0000 - - - - \ No newline at end of file diff --git a/www/htdocs/appcast/tikzit.xml b/www/htdocs/appcast/tikzit.xml deleted file mode 100644 index 813ec82..0000000 --- a/www/htdocs/appcast/tikzit.xml +++ /dev/null @@ -1,252 +0,0 @@ - - - - - TikZiT Changelog - http://tikzit.sourceforge.net/appcast/tikzit.xml - Most recent changes with links to updates. - en - - - Version 0.4.0 - - http://tikzit.sourceforge.net/appcast/rnotes.html - - Tue, 15 Jun 2010 17:51:49 +0100 - - - - - Version 0.4.86 - - http://tikzit.sourceforge.net/appcast/rnotes.html - - Tue, 15 Jun 2010 18:02:54 +0100 - - - - - Version 0.4.90 - - http://tikzit.sourceforge.net/appcast/rnotes.html - - Thu, 17 Jun 2010 18:30:35 +0100 - - - - - Version 0.4.103 - - http://tikzit.sourceforge.net/appcast/rnotes.html - - Mon, 28 Jun 2010 13:47:40 +0100 - - - - - Version 0.4.111 - - http://tikzit.sourceforge.net/appcast/rnotes.html - - Thu, 01 Jul 2010 18:27:13 +0100 - - - - - Version 0.4.117 - - http://tikzit.sourceforge.net/appcast/rnotes.html - - Fri, 13 Aug 2010 20:57:24 +0100 - - - - - Version 0.5.265 - - http://tikzit.sourceforge.net/appcast/rnotes.html - - Fri, 27 May 2011 21:26:42 +0100 - - - - - Version 0.5.266 - - http://tikzit.sourceforge.net/appcast/rnotes.html - - Thu, 14 Jul 2011 15:37:45 +0100 - - - - - Version 0.5.272 - - http://tikzit.sourceforge.net/appcast/rnotes.html - - Mon, 18 Jul 2011 15:48:16 +0100 - - - - - Version 0.5.273 - - http://tikzit.sourceforge.net/appcast/rnotes.html - - Wed, 20 Jul 2011 18:00:06 +0100 - - - - - Version 0.6 - - http://tikzit.sourceforge.net/appcast/rnotes.html - - Tue, 26 Jul 2011 17:40:47 +0100 - - - - - Version 0.6.275 - - http://tikzit.sourceforge.net/appcast/rnotes.html - - Wed, 27 Jul 2011 23:38:32 +0100 - - - - - Version 0.6.280 - - http://tikzit.sourceforge.net/appcast/rnotes.html - - Tue, 02 Aug 2011 16:03:42 +0100 - - - - - Version 0.6.281 - - http://tikzit.sourceforge.net/appcast/rnotes.html - - Tue, 02 Aug 2011 17:25:08 +0100 - - - - - Version 0.8.382 - - http://tikzit.sourceforge.net/appcast/rnotes.html - - Tue, 17 Jan 2012 12:17:05 +0000 - - - - - Version 0.8.398 - - http://tikzit.sourceforge.net/appcast/rnotes.html - - Fri, 20 Jan 2012 17:09:08 +0000 - - - - - - \ No newline at end of file diff --git a/www/htdocs/bnf.txt b/www/htdocs/bnf.txt deleted file mode 100644 index e5be059..0000000 --- a/www/htdocs/bnf.txt +++ /dev/null @@ -1,31 +0,0 @@ - ::= "\begin{tikzpicture}" ? - * - "\end{tikzpicture}" - - ::= | | | - - ::= "\begin{pgfonlayer}" DELIMITED_STRING | - "\end{pgfonlayer}" - - ::= "[" ("," )* "]" - - ::= * "=" | * - - ::= WORD | number - - ::= * | QUOTED_STRING - - ::= "\node" ? - "at" DELIMITED_STRING ";" - - ::= "(" (NATURAL_NUMBER | WORD) (".center")? ")" - - ::= "(" NUMBER "," NUMBER ")" - - ::= "\draw" ? - "to" ? ( | "()") ";" - - ::= "node" ? DELIMITED_STRING - - ::= "\path" "[use as bounding box]" - "rectangle" ";" diff --git a/www/htdocs/favicon.ico b/www/htdocs/favicon.ico deleted file mode 100644 index bae4e8d..0000000 Binary files a/www/htdocs/favicon.ico and /dev/null differ diff --git a/www/htdocs/images/apple.png b/www/htdocs/images/apple.png deleted file mode 100644 index 1546205..0000000 Binary files a/www/htdocs/images/apple.png and /dev/null differ diff --git a/www/htdocs/images/linux.png b/www/htdocs/images/linux.png deleted file mode 100644 index 3852a6b..0000000 Binary files a/www/htdocs/images/linux.png and /dev/null differ diff --git a/www/htdocs/images/man/bend.png b/www/htdocs/images/man/bend.png deleted file mode 100644 index 711d699..0000000 Binary files a/www/htdocs/images/man/bend.png and /dev/null differ diff --git a/www/htdocs/images/man/bezier.png b/www/htdocs/images/man/bezier.png deleted file mode 100644 index 32023ed..0000000 Binary files a/www/htdocs/images/man/bezier.png and /dev/null differ diff --git a/www/htdocs/images/man/bounding_box.png b/www/htdocs/images/man/bounding_box.png deleted file mode 100644 index 9692eeb..0000000 Binary files a/www/htdocs/images/man/bounding_box.png and /dev/null differ diff --git a/www/htdocs/images/man/compound.png b/www/htdocs/images/man/compound.png deleted file mode 100644 index aade82c..0000000 Binary files a/www/htdocs/images/man/compound.png and /dev/null differ diff --git a/www/htdocs/images/man/new_edge.png b/www/htdocs/images/man/new_edge.png deleted file mode 100644 index 4a0c32f..0000000 Binary files a/www/htdocs/images/man/new_edge.png and /dev/null differ diff --git a/www/htdocs/images/man/preambles.png b/www/htdocs/images/man/preambles.png deleted file mode 100644 index dbbf477..0000000 Binary files a/www/htdocs/images/man/preambles.png and /dev/null differ diff --git a/www/htdocs/images/man/preview.png b/www/htdocs/images/man/preview.png deleted file mode 100644 index 075902f..0000000 Binary files a/www/htdocs/images/man/preview.png and /dev/null differ diff --git a/www/htdocs/images/man/property_inspector.png b/www/htdocs/images/man/property_inspector.png deleted file mode 100644 index 75b2235..0000000 Binary files a/www/htdocs/images/man/property_inspector.png and /dev/null differ diff --git a/www/htdocs/images/man/shape.png b/www/htdocs/images/man/shape.png deleted file mode 100644 index 615a089..0000000 Binary files a/www/htdocs/images/man/shape.png and /dev/null differ diff --git a/www/htdocs/images/man/style_inspector.png b/www/htdocs/images/man/style_inspector.png deleted file mode 100644 index d19a7c4..0000000 Binary files a/www/htdocs/images/man/style_inspector.png and /dev/null differ diff --git a/www/htdocs/images/man/tools.png b/www/htdocs/images/man/tools.png deleted file mode 100644 index 7ae3ccb..0000000 Binary files a/www/htdocs/images/man/tools.png and /dev/null differ diff --git a/www/htdocs/images/source.png b/www/htdocs/images/source.png deleted file mode 100644 index fba1b85..0000000 Binary files a/www/htdocs/images/source.png and /dev/null differ diff --git a/www/htdocs/images/ubuntu.png b/www/htdocs/images/ubuntu.png deleted file mode 100644 index bcd89c9..0000000 Binary files a/www/htdocs/images/ubuntu.png and /dev/null differ diff --git a/www/htdocs/images/web_logo.png b/www/htdocs/images/web_logo.png deleted file mode 100644 index c34b0b3..0000000 Binary files a/www/htdocs/images/web_logo.png and /dev/null differ diff --git a/www/htdocs/images/web_logo_linux.png b/www/htdocs/images/web_logo_linux.png deleted file mode 100644 index 415fe2c..0000000 Binary files a/www/htdocs/images/web_logo_linux.png and /dev/null differ diff --git a/www/htdocs/images/web_logo_manual.png b/www/htdocs/images/web_logo_manual.png deleted file mode 100644 index 779dbfb..0000000 Binary files a/www/htdocs/images/web_logo_manual.png and /dev/null differ diff --git a/www/htdocs/images/windows.png b/www/htdocs/images/windows.png deleted file mode 100644 index f20a414..0000000 Binary files a/www/htdocs/images/windows.png and /dev/null differ diff --git a/www/htdocs/index.html b/www/htdocs/index.html deleted file mode 100644 index 6abe9b1..0000000 --- a/www/htdocs/index.html +++ /dev/null @@ -1,42 +0,0 @@ - - - - TikZiT - - - - - TikZiT - -
- - Apple - - - - Linux - - - - Windows - - - - Source - -
- -

- TikZiT is a graphical tool for rapidly creating an editing node-and-edge style graphs. It was used, for example, to make all of the 2500+ diagrams in this book. Click one of the above icons to download. To comment or contribute, email me at gmail.com preceded by aleks0 and an at-sign. -

- -
- TikZiT Manual | - Project Page | - Issue Tracker -
- -
-
- - diff --git a/www/htdocs/link.php b/www/htdocs/link.php deleted file mode 100644 index d6ec8da..0000000 --- a/www/htdocs/link.php +++ /dev/null @@ -1,24 +0,0 @@ - "$file_root/tikzit-$src_ver/tikzit-$src_ver.tar.gz/download", -'dmg' => "$file_root/tikzit-$dmg_ver/TikZiT-$dmg_ver.dmg/download", -'win' => "$file_root/tikzit-$win_ver/tikzit-setup-$win_ver.exe/download" -); - - -$url = $urls[$_GET['to']]; -if ($url == '') $url='/'; -?> - - - Redirecting... - - - - diff --git a/www/htdocs/linux/index.html b/www/htdocs/linux/index.html deleted file mode 100644 index 040e3d8..0000000 --- a/www/htdocs/linux/index.html +++ /dev/null @@ -1,34 +0,0 @@ - - - - TikZiT - - - - -TikZiT :: Linux - -
-

- There are several options for getting TikZiT on Linux: -

-
-
Ubuntu
-
Use Gard Spreemann's PPA.
-
Debian, Fedora and OpenSUSE
-
Use Alex Merry's OBS Repositories.
-
Arch Linux
-
Use the AUR package.
-
Other
-
Build from the source.
- -
- -
- -
- « back -
- - - diff --git a/www/htdocs/main.css b/www/htdocs/main.css deleted file mode 100644 index a766eee..0000000 --- a/www/htdocs/main.css +++ /dev/null @@ -1,120 +0,0 @@ -body { - background-color: #ddd; - margin: 0px; - font-size: 10pt; - font-family: "Trebuchet MS", - Tahoma, - "Nimbus Sans L", - sans-serif; -} - -a { - color: #555555; - font-weight: bold; -} - -a:hover { - color: #777777; -} - -img.heading { - display:block; - margin:10px auto; -} - -.content { - padding: 10px 30px; - background-color: white; -} - -.info { color: #069; } - -.manual h2 { - clear: both; - margin-top: 1em; -} - -.manual tt { - background-color: #eef; -} - -.whiteblock { - background-color: white; - text-align: center; - padding-top: 10px; - padding-bottom: 10px; -} - -.whiteblock a { - text-decoration: none; -} - -.bigtext { - color: #444444; - font-size: 1.5em; -} - -img.osimage { - vertical-align: middle; - border: 0px; -} - -p.blurb { - margin: 20px auto; - width: 600px; - text-align: justify; -} - -.links { - text-align:center; - margin-top: 2em; -} - -dt { - margin-top: 0.5em; - font-weight: bold; -} - -div.fig { - text-align: center; - padding: 0.5em 1em; - margin: 0em 1em; - border: 1px solid #aaa; - background-color: #ddd; -} - -div.fig img { - border: 1px solid #aaa; -} - -div.fig p { - font-size: 0.8em; - line-height: 1em; - margin-top: 1em; - margin-bottom: 0em; -} - -/* syntax highlight styles */ -.bnf { - white-space: nowrap; - border: 1px dotted #a0a0a0; - padding: 1em; - font-family: 'Monaco', 'Courier New', Courier, monospace; - font-size: 9pt; - line-height: 120%; - color: #000; -} - -.bnf .imp {font-weight: bold; color: red;} -.bnf .co0 {color: #666666; font-style: italic;} -.bnf .coMULTI {font-style: normal;} -.bnf .es0 {font-weight: normal;} -.bnf .sy0, .bnf .re0 {color: #006; font-weight: normal;} -.bnf .sy1 {color: #000066; font-weight: normal;} -.bnf .sy2 {color: #000066; font-weight: normal;} -.bnf .sy3 {color: #000066; font-weight: normal;} -.bnf .sy4 {color: #000; font-weight: normal;} -.bnf .st0 {color: #060;} -.bnf .st1, .terminal {color: #069;} -.bnf .me {1} - diff --git a/www/htdocs/manual.html b/www/htdocs/manual.html deleted file mode 100644 index 1a092d5..0000000 --- a/www/htdocs/manual.html +++ /dev/null @@ -1,197 +0,0 @@ - - - TikZiT Manual - - - - - - - -
- -

NOTE: This manual is currently written for the OS X version of TikZiT. However, we try to make the Linux and Windows ports as similar to the Mac version as possible, so much of the info here should still apply.

- -

TikZiT is a tool for editing graphs written in PGF/TikZ. PGF/TikZ is a -big macro package for embedding all kinds of diagrams in LaTeX. It's included -in most TeX distributions, so if you use TeX, you probably already have it. -Lots of info and examples can be found on texample.net, and the (very extensive) -manual can be found here.

- -

TikZiT uses *.tikz files, which are text files written in a subset of TikZ. Virtually everything TikZiT uses comes from the \node command and the \draw command. Users can edit a graph by using the GUI or editing the TikZ file from within TikZiT and parsing changes.

- -

Basic Graph Editing

- -

TikZiT has four basic tools: Select, Add Vertex, Add Edge, and Crop (Fig. 1). The Select tool is for selecting and moving vertices and edges. For vertices, this works pretty much as you would expect. Edges can be selected by clicking on them directly, which makes their control points become visible in blue (Fig. 2). Click and drag a control point to set the bend property of and edge. The radius of the circles indicates the looseness.

- -
-
- -

Fig.1: The Tool Palette

-
- -
- -

Fig.2: Setting the Bend

-
- -
- -

Fig.3: Bezier Mode

-
- -
-
- -

Double-click and edge to go to Bezier Mode (Fig. 3). The control points in Bezier Mode can be moved independently, and rather than setting bend, it sets the in and out properties of an edge. It is often useful to use the Shift key to select multiple edges, making their control points visible. Editing any of those edges' control points will not deselect the edges. Hold down the ⌘Command key to move both control points at once. This is particularly useful for self-loops.

- -

The Add Vertex tool adds a new vertex to the graph where you click. It is given the style that is selected in the Style Palette. If no style is selected, an Unstyled Vertex is added. Unstyled vertices are represented as dotted lines around a point, and are invisible. They are useful for making complex paths (Fig. 4) and edges that are not otherwise connected to vertices.

- -
-
- -

Fig.4: Unstyled Vertices/Compound Path

-
- -
- -

Fig.5: Adding an Edge

-
- -
- -

Fig.6: Setting the Bounding Box

-
- -
-
- -

The Add Edge tool adds new edges. With the tool selected, click and drag from the source vertex to the target vertex to create an edge (Fig. 5). Although TikZiT doesn't show the direction of the edge, it could still be relevant (e.g. for arrow heads), depending on the style of the edge. Click on a vertex to add a self-loop.

- -

Though TikZ computes bounding boxes automatically, if you wish to set one manually, you can do so using the Crop tool. Click and drag a box to set the bounding box. Click anywhere to remove it. The bounding box itself is implemented using a rectangular path with the use as bounding box property set.

- -

Editing Properties and Styles

- -

All graph, node, and edge properties can be edited using the Property Inspector. This inspector is divided into three parts: one for each type of property. These can be expanded or collapsed using the triangles in the upper left corner of each section. TikZiT handles two kinds of properties: normal properties and atoms. Normal properties are key/value pairs stored with the graph/node/edge. Atoms are just keys, leaving the value of the property itself implicit. Examples are baseline or <-. To add a new property, click the "+" button in the relevant section. To add a new atom, click the "+a" button. Use the "-" button to remove a property or atom.

- -

You can also use the Property Inspector to edit the labels on nodes. After editing a label, you may need to hit Return to apply your changes. Always do this before deselecting the node.

- -
-
- -

Fig.7: Property Inspector

-
- -
- -

Fig.8: Style Inspector

-
-
-
- -

With the Property Inspector you can add a node to an edge by selecting it and clicking the checkbox next to Child Node. This node will be placed in the middle of the edge by default, but you can change this by editing it's properties. Often the atom auto is applied to an edge node to position its label a little off the edge. Again, when labelling an edge node, be sure to hit Return to apply your changes.

- -

The Style Inspector lets you add, remove, and edit styles. You can edit a style's name, shape, foreground colour, background colour, and scale. Note that these properties change how nodes of this style will appear in TikZiT, but not necessarily in the final, built LaTeX. TikZiT styles are meant more as a visual cue for the sake of editing graphs than to produce a nice end result. Use Apply to apply the selected style to the selected nodes and Clear to clear the style.

- -

Editing the TikZ Code Directly

- -

TikZiT supports a small subset of the TikZ language. At any point, you can edit the TikZ code manually in the bottom half of the window. Editing the code will cause the main graph display to ghost, and it prevents editing with the GUI until the graph is re-parsed using ⌘T. If the parse was successful, the main graph will un-ghost, and a message saying success will be displayed along the bottom of the window. If the parse was unsuccessful, parse error will be displayed.

- -

As a reference, here is the complete syntax supported by TikZiT:

- -
- <tikzpicture>  ::= "\begin{tikzpicture}" <properties>?
-                    <expression>*
- -                    "\end{tikzpicture}"
-
- <expression>   ::= <ignore> | <node> | <edge> | <bounding box>
- -
- <ignore>       ::= "\begin{pgfonlayer}" DELIMITED_STRING |
-                     "\end{pgfonlayer}"
- -
- <properties>   ::= "[" <property> ("," <property>)* "]"
- -
- <property>     ::= <symbol>* "=" <value> | <symbol>*
- -
- <symbol>       ::= WORD | NUMBER
-
- <value>        ::= <symbol>* | QUOTED_STRING
- -
- <node>         ::= "\node" <properties>? <node name>
-                       "at" <coords> DELIMITED_STRING ";"
- -
- <node name>    ::= "(" (NATURAL_NUMBER | WORD) (".center")? ")"
- -
- <coords>       ::= "(" NUMBER "," NUMBER ")"
-
- - <edge>         ::= "\draw" <properties>? <node name>
-                       "to" <edge node>? (<node name> | "()") ";"
- -
- <edge node>    ::= "node" <properties>? DELIMITED_STRING
-
- <bounding box> ::= "\path" "[use as bounding box]" <coords>
- -                       "rectangle" <coords> ";" -
- -

Note that DELIMITED_STRING means a string delimited by braces ( { , } ). This string can contain any character, including other braces, provided they are nested correctly. A WORD may contain letters, greater-than ( > ), less-than ( < ), dash ( - ), and prime ( ' ). Question mark ( ? ) denotes optional productions, and star ( * ) denotes repeated ones.

- -

Preambles and LaTeX Preview

- -

Use ⌘R to preview the current graph using LaTex. The preview will be shown in a new window. In the event of an error, the LaTeX output is displayed.

- -
- -

Fig.8: LaTeX Preview

-
- -

The Preamble Editor is used to set up the preamble that the LaTeX preview uses. The default preamble will include minimal style definitions, but you will most likely want to use a default preamble. A good strategy is to define all of the TikZ styles in a single LaTeX file, then \input that file both in your paper and in the TikZiT preamble.

- -
- -

Fig.9: Preamble Editor

-
- -

Use the "+" and "-" buttons to add or remove custom preambles. Double-click a preamble's name to change it. Click Insert Styles to paste in the styles from the default preamble at the current cursor location.

- - -

Custom Shapes

- -

Custom shapes are implemented in TikZiT. To add a custom shape, navigate to the TikZiT support directory: ~/Library/Application Support/TikZiT. If it doesn't already exist, create a directory called shapes. Now, you can add *.tikz files to this directory, and they will be included as shapes in TikZiT.

- -

Not all graphs will made nice looking shapes. TikZiT builds a shape from a graph by extracting all of the paths in the TikZ graph, and drawing them as (filled) bezier curves.

- -
- -

Fig.10: A Custom Shape

-
- -

The best graphs for defining shapes are single cycles, consisting of unstyled nodes. You can draw a shape as big or small as you like. When the shape is displayed in TikZiT with scale = 1, the shape will fit inside a 4x4 square on the grid. If you make a change to the custom shapes with TikZiT open, click Refresh Shapes in the TikZ menu to refresh the shapes.

- - - - -
-
- - - -
-
-
- - - - diff --git a/www/images/apple.ai b/www/images/apple.ai deleted file mode 100644 index 66ac54c..0000000 --- a/www/images/apple.ai +++ /dev/null @@ -1,225 +0,0 @@ -%PDF-1.5 %âãÏÓ -1 0 obj <>/OCGs[13 0 R 30 0 R]>>/Type/Catalog>> endobj 39 0 obj <>stream - - - - - application/pdf - - - apple - - - - - Adobe Illustrator CS3 - 2010-05-11T12:06:28+01:00 - 2010-05-11T12:44:31+01:00 - 2010-05-11T12:44:31+01:00 - - - - 208 - 256 - JPEG - /9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgBAADQAwER AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE 1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp 0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo +DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8A9U4q7FXYq7FXYq7FXYq7 FXYq7FXYq7FXYq7FXYq7FUj8xedNB0FSLyfnc0qtpFRpT8xWij/WOKvN9a/NzX7ssmnImnwmoDAC SUj/AFmHEfQuGkWxG91nV75iby9nuK9RJIzD7iaYVew/lQzHyfED0WaUL8uVf1nAVDMcCXYq7FXY q7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq4kAEk0A3JOKvMPO35olWfT/AC+42+GbUBv8 xD/zV93jhpDzGSSSWRpJGLyOSzuxJYk9SScKrcVdir3r8uLVrfybpysKNIryn5PIzL/wtMBSyXAr sVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVeWfmd55Z3l0HTZKRqeN/Op3J7xKR2 H7X3eOEBDzPCrsVdiqtZ2s13dw2sA5TXDrFGvizniP14q+k7G0is7KC0i/ureNIk/wBVFCj9WRSr Yq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYqxrz/5mOg6E8kLUvromG18QSPif/YD 8aYQrwZmLEsxqTuSepOFDWKuxV2Ks+/KTy+13q76vMv+j2IKxE9DM4p/wqmv3YCoew4EuxV2KuxV 2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV4Z+ZmuNqfmeaJGrbWH+jxDtyX+8P/B7fQMkE MTxV2KuxVFaZpt3qd/BY2ic7idgqDsPEn2A3OKvoTy/oltomk2+nW+6xD45KULud2Y/M5FKY4q7F XYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYqh9Ru1s9Purxt1tonmIPgilv4Yq+a5ZXll eWQ8pJGLOx7kmpOSQsxV2Kq1paXN5cx21rG008rBY41FSScVe2+Q/JEXl60Nxc8ZNVnFJXG4jXr6 an9Z74CUsswK7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FUj88SNH5R1Vl6m3Zf ob4T+BxCvnzJIdirIvLvkTzBrjK8MJgsz1u5gVSn+SOr/Rir1/yt5M0jy7D/AKOvrXbikt5IBzPs v8q+w+muRSn2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KqNze2dqvK5njgU9DI6oP+GIxVL5P N3laMgNq1pU/yzRt08aE4q1H5v8AK0jcV1a0qelZkH6yMVTSC4guIxJBIssZ6OjBl+8YqvxV2KoX VNOg1LTriwnLLDcxmN2SnIBh1FQRX6MVYbD+TnlpCDLc3ch8Ocaj8Er+OG0Un2l+RfKumsr29hG0 q7iWasrV8RzJA+gYLSn2KuxVAX3mDQ7Alby/t4HXqjyKH/4GvLFUqk/MbyWho2pqd6fDHK3/ABFD hpVSP8wPJ0jUXVIgf8oOo+9lGNKmllrOkX21newXJpXjFIjn7gScCozFXYq7FXYq7FXYq7FXYq4k AVOwHU4qwvzJ+aWiaWzW9kP0jdrUH0zSFT7yb1/2NfnhpFvOtX/MXzXqRYG7NpCekNr+6A/2Q+M/ S2GlY3JJJI5eRi7nqzEkn6Tiq3FXYqr2d9e2Uoms7iS3lH7cTFD96kYqzHRfzZ8xWXFL5U1GEdS/ 7uWns6in3qcFKz/RPzH8r6rxT6x9TuDt6NzRN/Z68D99caSygEEAg1B3BGBXYqlmreZdB0lSdQvY oWH+6q8pD8o1q34YqwbWfzljXlHo9kXPa4udh9EaGv8Aw2GkWwfVvOnmbVCwur+T0m/3TEfTjp4c UpX6cKpJirsVdirYJBqNiOhxVkGj+ffNOlFRDetNCv8Aui4/epTw+L4l/wBiRir0by3+auj6iyW+ pL+j7tqAOxrAx/1/2f8AZffgpbZwCGAINQdwR0IwJdirsVdirsVUL+/s9PtJLu8lWC3iFXkY0Hy9 yewxV4x5y/MXUNcZ7SzLWml9PTBo8vvIR2/yRt88lSGHYq7FXYq7FXYq7FXYq7FUw0/X9b04cbG+ nt0/kSRgn/A144qiLnzf5ouY/Tm1S5ZD1USFQfnxpXFUoZixLMak7knqTirWKuxV2KuxV2KuxV2K uxVl/kz8wtQ0KRLW7LXWldDETV4veMn/AIj0xpXtNjfWl/aRXdpKs1vMvKORehH9fEZFKvirsVWT zRQQvNM4jhiUvI7GgVVFSSfbFXhfnnznceYb/hETHplux+rRdCx6eo/ue3gPpySGL4q7FXYq7FXY q7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYqy38v/Ocmg34t7lidKuWAmXr6bHYSqP+JeI+ WJV7kCCAQag7gjIpdiry/wDNrzWSw8v2j/CKPfsp6nqkX/Gx+jCEF5hhV2KuxV2KuxV2KuxV2Kux V2KuxV2KuxV2KuxV2KuxV2KuxV2KuxVUggnuJkggjaWaQhY40BZmJ7ADFXsPkj8trXS1jv8AVlW4 1LZo4j8UcJ7ezOPHoO3jgtWdYEoLW9Ui0rSbrUJd0toy4X+Zuir/ALJqDFXznd3U93dTXVw3Oed2 kkY92Y1OSQo4q7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FVyI7uqIpZ2IVVG5J OwAxV7f5B8kQaDZrdXSB9WnWsjnf0lP+61/42OAlLLsCuxV53+cermHTbPS42o105mmA/ki2UH2L NX6MIQXkmFXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXof5S+WFu72TWrlK wWZ4WoI2M1Klv9gPxPtgKh65gS7FXYq8N/NHUDd+briMGsdoiQJ9A5t/wznJBDEsVdirsVdirsVd irsVdirsVdirsVdirsVdirsVdirsVdirsVdiq5EZ3VFBZmICgdSTir6L8t6Omj6JZ6eoHKGMeqR3 kb4nP0sTkUplirsVdir5u1y6N3rV/ck19a4lf6GckZJCBxV2KuxV2KuxV2KuxV2KuxV2KuxV2Kux V2KuxV2KuxV2KuxV2Kp95EsVvfN2mQsKqsvqsD0pCDJv/wABir6ByKXYq7FXYq+YWJYliak7k++S Q1irsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVZn+U0Qfzcjf76glcfSAv/ABti Ve2ZFLsVdirsVfMGSQ7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYqzH8qJvT8 4RLWnqwyp86Ly/41xKvbsil2KuxV2Kvma8j9O8nj2+CR126bMRtkkKOKuxV2KuxV2KuxV2KuxV2K uxV2KuxV2KuxV2KuxV2KuxV2KuxVO/Jd8LHzVplwTRROsbHwWWsZP3Pir6EyKXYq7FXYq+dPNEH1 fzJqkXZbqbjX+UuSPwySErxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KtgkEE GhG4IxV9E+VtaTWdBtL8EGSRAs48JV+Fx94qPbIpTXFXYq7FXhf5nWn1fzleECi3CxzL9KAH/hlO SCGKYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYqzv8AKvzUum6k2lXT8bO+ Yekx6JP0H0P0+dMBV7JgS7FXYq8s/OjT6T6dqKj7aPbyHw4nmn/EmwhBeZ4VdirsVdirsVdirsVd irsVdirsVdirsVdirsVdirsVdirsVdirsVbBINR1xV7P+XPnhNXtV0y/kA1SBaIzHedFH2v9YD7X 3+OAqzfAl2KsV/MzS/r/AJRuiorJZlblB/qbP/wjNhCvCsKHYq7FXYq7FXYq7FXYq7FXYq7FXYq7 FXYq7FXYq7FXYq7FXYq7FXYqq21zPbTx3FvI0U8TBo5FNGVh0IOKvYvJH5kWmrJHY6oy2+p7Ksho scx/yeyt/k9+3hgpWcYErJ4Ip4JIJV5RSqySKe6sKEfdir5u1bTpdN1O6sJft20jRk+IU7H6Rvkk ITFXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FWeeQfOvmhtVstH9UXl tM4Sk4LPHGBVirghvhUdDUYCr2PAl5J+cGhGDUbfWIl/dXa+jcEdpUHwk/6yf8RwhBed4VdirsVd irsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVel/k5oZe4utalX4Yh9Xtif5mo0h +gUH0nAVD1TAlK/M+hxa3olzp70DyLygc/syruh+/r7Yq+d5oZYJpIZVKSxMUkQ9QymhB+RySFmK uxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KqttbTXVzFbQKXmmdY40HUsxoB9 +Kvony9o0OjaNa6dFQ+gn7xx+1Id3b6WORSmOKuxV5D+bXlr6pqKazbpS3vTxuKdFnA6/wCzUfeD hCC8+wq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq9G/KPy19YvJNcuE/c2x MdpXvKR8Tf7FT959sBUPWcCXYq7FUDrekW2r6Vcadcj93OtA3dWG6sPdTvir541TTbrTNQnsLteE 9uxRx2PgR7EbjJIQuKuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2Ko3RtJutW1O30+ 1FZp2417KvVmPso3xV9D6Tpdrpem2+n2opDboEXxJ6sx92O5yKUXirsVdirsVYN+Z3k/9K2P6Vs0 rqFmv7xB1lhG5H+svUfd4YQh4zhV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV7Z+ Wvk/9Dad9fvEpqV4oJUjeKI7hPYnq33dsBVmeBLsVdirsVdirsVeO/mZ5JOm3LavYR/7j7hv38aj aKRvb+Vj08Dt4YQhgWFXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXoX5Y+SjfXCa3fx/6 FA1bSNh/eyKftU/lU/ecBV67gS7FXYq7FXYq7FXYqp3FvBcwSW86CSGVSkkbCoZWFCDirxLz15Eu dAuGurUGXSZW/dv1aIn9h/4H+OSQxHFXYq7FXYq7FVW3tri5lEVvE80rdI41LMfoFTiqf2n5d+cb peSaa8a+MzJEf+Bdg34Y2qN/5VR5w/31D/yNXG1Qd1+XHnK2Us2nNIo7xPHIf+BVi34Y2qQXNpd2 spiuoZIJR1jlUow+hgDiqjirsVdirsVdirMfInkK51ydLy8UxaRG3xMahpiP2E9vFvu3xtXtcEMM EKQwoI4Y1CRxqKKqgUAAGRSvxV2KuxV2KuxV2KuxV2KrJoYZ4nhmRZIpAVkjcBlYHqCD1xV5l5p/ KNy73Xl9hQ7mxkalP+Mbn9TffhtFPPdQ0bVtOcpfWctuR3kQhT8m6H6MKoREd2CopZj0VRU/hiqd 6X5H806kw9DT5UjP+7Zh6SU8avSv0VxVnmhfk9ZQlZdZuTcuNzbQVSP6XPxt9FMFrTPNO0rTdNh9 Cwto7aLusaha+7HqT88CUVirsVdiqHvtOsL+EwXtvHcxH9iVQw+ivTFWC67+T+mXHKXR5zZydoJa yRH5N9tfxw2imC6l+Xvm6wY8rB7hB0ktv3wPvRfjH0rhtUkk07UIm4yWsqMTTiyMDX6RiqP0/wAo +ZdQYC102dgf92OhjT/g34r+OKvQPLP5RwQOlzrsi3DrutnFX06/5bbFvkPxwWtPRo44441jjUJG gCoigAADYAAYErsVdirsVdir/9k= - - - - - - uuid:07DCA8B2865EDF118B77FD523B43407A - uuid:59d71753-0dab-fa45-a6ff-8e2ddf034430 - - - - 1 - False - False - - 128.000000 - 128.000000 - Pixels - - - - Black - - - - - - Default Swatch Group - 0 - - - - - - Document - - - Adobe PDF library 8.00 - - - - - - - - - - - - - - - - - - - - - - - - - endstream endobj 2 0 obj <> endobj 13 0 obj <> endobj 30 0 obj <> endobj 31 0 obj [/View/Design] endobj 32 0 obj <>>> endobj 14 0 obj [/View/Design] endobj 15 0 obj <>>> endobj 29 0 obj [30 0 R] endobj 5 0 obj <>/ArtBox[-0.807129 1.26172 127.193 129.262]/MediaBox[0.0 0.0 128.0 128.0]/Thumb 38 0 R/TrimBox[0.0 0.0 128.0 128.0]/Resources<>/ExtGState<>>>/Type/Page/LastModified(D:20100511124431+01'00')>> endobj 34 0 obj <>stream -H‰dUMo1 ½Ï¯ÈiÜرãäJAœ*Tqà¬øh‘ -'þ=ÏÎN;­v'Ï“¼ØÏ/Ù›·åæ·ïnËö´ÕÂ2ò»Çϯ/ÛçòÑüyù±Ý|øTË·ßÛSá sñIÒT W¡YÛ(—Ç\ò¸5rE©ÒI}fbÅȽvê³·JìPk+;fN5šÜ‘F%í^°E5LÝY©ª5’tbc<ÉÀΤ:6svPãÅ QP§—]ÉWî—íë›íþTŠuw)Íiö~ª¤REÞµ<#ªuæoŽES *±ë÷Y§‘ê”b =”_Xw„[òæØZrz` Æü2”d”¨¥AZ„¬Ñ­‰w3´˜ÐúuñÔàÀ>¯+'yÆbèù¤Î³Ä·"F]ŠFˆ#ib-QW Ì ÐYŒ¶æ-yH8_ Š  eˆ¢¼"ËÆÐ0HТÆÙ†ÁÑ·Ê­(äk––s¶<10â¢B&è2öâ -m: píà4K8Q¦7£ÑŸ_cUëI>QØ®ptìYu CLB/TÇØ­¢ÐPØŸm·IŽ¤hðo±›Ñ„T»C`IQG6ç„Sž ,ÿ¤\a´HijXÇG0kBïrt÷²Ö³Ýî e­vGvd×ÅÑœz]Î Ûaù2çÈbåðj@,¿N×è3·È6£uÝc#Û±Ns[2¸Â¸¼nˆ%ÄsÄýZ¸›¾Š0.ÍS¯a„Ðv†ý5[´÷°íHŒÊÁzŽHŽˆôö*Rqk…ÉöÁÓà{æ4FEçvy=ía?IM1bèO5ÌhYÔêT‘醎]YSÁÚá˜Áá!Iƒ³qÙBæ±°¦§‘LÈ€À¥ dY)âXh -r”pÙ@ÚS…æÙÚ®–"9œ…wÆÒ«Š—-y¿²ÆÞ‘-. - VJÁ÷µ…$O¤' ÷ó2!vnã|£¾¿ÃßÉýöW€Ó¨6« endstream endobj 38 0 obj <>stream -8;V/BM[]Y?"@T_0Si endstream endobj 33 0 obj <> endobj 36 0 obj [/Indexed/DeviceRGB 255 37 0 R] endobj 37 0 obj <>stream -8;X]O>EqN@%''O_@%e@?J;%+8(9e>X=MR6S?i^YgA3=].HDXF.R$lIL@"pJ+EP(%0 -b]6ajmNZn*!='OQZeQ^Y*,=]?C.B+\Ulg9dhD*"iC[;*=3`oP1[!S^)?1)IZ4dup` -E1r!/,*0[*9.aFIR2&b-C#soRZ7Dl%MLY\.?d>Mn -6%Q2oYfNRF$$+ON<+]RUJmC0InDZ4OTs0S!saG>GGKUlQ*Q?45:CI&4J'_2j$XKrcYp0n+Xl_nU*O( -l[$6Nn+Z_Nq0]s7hs]`XX1nZ8&94a\~> endstream endobj 23 0 obj <> endobj 24 0 obj <> endobj 25 0 obj <>stream -%!PS-Adobe-3.0 %%Creator: Adobe Illustrator(R) 13.0 %%AI8_CreatorVersion: 13.0.0 %%For: (Aleks Kissinger) () %%Title: (apple.ai) %%CreationDate: 5/11/10 12:44 PM %%BoundingBox: -37 -35 164 166 %%HiResBoundingBox: -36.8071 -34.7383 163.1934 165.2617 %%DocumentProcessColors: Black %AI5_FileFormat 9.0 %AI12_BuildNumber: 406 %AI3_ColorUsage: Color %AI7_ImageSettings: 0 %%CMYKProcessColor: 1 1 1 1 ([Registration]) %AI3_Cropmarks: -0.807129 1.26172 127.1934 129.2617 %AI3_TemplateBox: 64.5 63.5 64.5 63.5 %AI3_TileBox: -242 -332 370 460 %AI3_DocumentPreview: None %AI5_ArtSize: 128 128 %AI5_RulerUnits: 6 %AI9_ColorModel: 2 %AI5_ArtFlags: 0 0 0 1 0 0 1 0 0 %AI5_TargetResolution: 800 %AI5_NumLayers: 1 %AI9_OpenToView: -74.3335 242.9985 1.5 416 467 18 0 0 73 75 0 0 1 1 1 0 1 %AI5_OpenViewLayers: 7 %%PageOrigin:0 0 %AI7_GridSettings: 72 8 72 8 1 0 0.8 0.8 0.8 0.9 0.9 0.9 %AI9_Flatten: 1 %AI12_CMSettings: 00.MS %%EndComments endstream endobj 26 0 obj <>stream -%%BoundingBox: 18 10 108 121 %%HiResBoundingBox: 18.5039 10.0117 107.8818 120.5122 %AI7_Thumbnail: 104 128 8 %%BeginData: 20116 Hex Bytes %0000330000660000990000CC0033000033330033660033990033CC0033FF %0066000066330066660066990066CC0066FF009900009933009966009999 %0099CC0099FF00CC0000CC3300CC6600CC9900CCCC00CCFF00FF3300FF66 %00FF9900FFCC3300003300333300663300993300CC3300FF333300333333 %3333663333993333CC3333FF3366003366333366663366993366CC3366FF %3399003399333399663399993399CC3399FF33CC0033CC3333CC6633CC99 %33CCCC33CCFF33FF0033FF3333FF6633FF9933FFCC33FFFF660000660033 %6600666600996600CC6600FF6633006633336633666633996633CC6633FF %6666006666336666666666996666CC6666FF669900669933669966669999 %6699CC6699FF66CC0066CC3366CC6666CC9966CCCC66CCFF66FF0066FF33 %66FF6666FF9966FFCC66FFFF9900009900339900669900999900CC9900FF %9933009933339933669933999933CC9933FF996600996633996666996699 %9966CC9966FF9999009999339999669999999999CC9999FF99CC0099CC33 %99CC6699CC9999CCCC99CCFF99FF0099FF3399FF6699FF9999FFCC99FFFF %CC0000CC0033CC0066CC0099CC00CCCC00FFCC3300CC3333CC3366CC3399 %CC33CCCC33FFCC6600CC6633CC6666CC6699CC66CCCC66FFCC9900CC9933 %CC9966CC9999CC99CCCC99FFCCCC00CCCC33CCCC66CCCC99CCCCCCCCCCFF %CCFF00CCFF33CCFF66CCFF99CCFFCCCCFFFFFF0033FF0066FF0099FF00CC %FF3300FF3333FF3366FF3399FF33CCFF33FFFF6600FF6633FF6666FF6699 %FF66CCFF66FFFF9900FF9933FF9966FF9999FF99CCFF99FFFFCC00FFCC33 %FFCC66FFCC99FFCCCCFFCCFFFFFF33FFFF66FFFF99FFFFCC110000001100 %000011111111220000002200000022222222440000004400000044444444 %550000005500000055555555770000007700000077777777880000008800 %000088888888AA000000AA000000AAAAAAAABB000000BB000000BBBBBBBB %DD000000DD000000DDDDDDDDEE000000EE000000EEEEEEEE0000000000FF %00FF0000FFFFFF0000FF00FFFFFF00FFFFFF %524C45FD48FFAF7E7D597DFD60FFA87D7D527D527D52FD5EFFA87D527D7D %7D527D7D7DA8FD5BFFA8527D527D527D527D527D52A8FD5AFF7E527D7D7D %597D7D7D597D7D7DA8FD58FFA87D527D527D527D527D527D527D53FD58FF %7E7D527D7D7D527D7D7D527D7D7D527DFD57FF7D7D527D527D527D527D52 %7D527D527D7DFD56FFFD047D597D7D7D597D7D7D597D7D7D52A8FD55FF7D %59527D527D527D527D527D527D527D527DA8FD54FF7E7D7D7D527D7D7D52 %7D7D7D527D7D7D527D7DFD54FFA87D527D527D527D527D527D527D527D52 %7D52A8FD54FF7D527D7D7D597D7D7D597D7D7D597D7D7D537DFD54FFA852 %7D527D527D527D527D527D527D527D527D7DFD54FF527D7D7D527D7D7D52 %7D7D7D527D7D7D527D53FD54FF7D7D527D527D527D527D527D527D527D52 %7D527EFD53FFA87D537D7D7D597D7D7D597D7D7D597D7D7D537DAFFD53FF %84527D527D527D527D527D527D527D527D52597DFD54FF527D7D7D527D7D %7D527D7D7D527D7D7D527D7DFD54FF7D59527D527D527D527D527D527D52 %7D527D52FD55FFA8527D7D7D597D7D7D597D7D7D597D7D7D52AFFD55FF53 %7D527D527D527D527D527D527D527D52A8FD55FFA87D7D7D527D7D7D527D %7D7D527D7D7D52A8FD56FFA8527D527D527D527D527D527D527D52A8FD57 %FFFD047D597D7D7D597D7D7D537D7DFD59FF7D527D527D527D527D527D52 %7D7DFD5AFF7D7D527D7D7D527D7D7D527DA8FD5BFF7D527D527D527D527D %7DA8A8FD5CFF7D7D527D597D7DA8A8FD5FFFA87DA87DA8A8FDB1FFA8A87D %A87D847DA87DA8A8FD1FFFA8A87D7E7D7D53FD067DA8A8FD2CFF84A87D7D %527D527D527D537D527D7D7EA8FD19FFA8A87D7D597D527D597D537D597D %527D537D7DA8A8FD26FF7D7D5259527D527D527D527D527D527D527D527D %527DA8FD13FFA8A87D7D527D527D527D527D527D527D527D527D527D527D %59A8A8FD20FFA8A87D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D %527D7DA8A8FD0EFFA87D7D527D527D7D7D527D7D7D527D7D7D527D7D7D52 %7D7D7D527D527D7DFD1EFF7D7D527D527D527D527D527D527D527D527D52 %7D527D527D527D527D527D7DA8A8FD08FFA87D7D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D525952A8FD1BFF7D7D527D7D %7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D537D537D7D %A8A8FFA8A87D7D527D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D %7D597D7D7D597D7D7D597D527DA8FD17FFA8527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D7DFD15FFA8527D527D7D7D527D7D7D527D7D7D527D7D %7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D52 %7D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D %7D527D597D7DFD13FF7D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D52537DFD11FFA8527D7D7D597D7D7D597D7D7D597D7D7D597D7D7D59 %7D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D %7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D59 %7D7D7D537D7DFD0FFFA8527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D7DFD0DFFA8527D7D7D527D7D7D527D7D7D527D7D7D52 %7D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D %7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D52 %7D7D7D527D7D7D527D7D7D527DA8FD0BFFA8527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527DFD0BFF7D7D597D7D7D59 %7D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D %7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D59 %7D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D527DA8FD0AFF7D %7D527D527D527D527D527D527D527D527D527D527D527D527D527D527D52 %7D527D527D527D527D527D527D527D527D527D527D527D527D527D527D52 %7D527D527D527D527D527D527D527D527D527D527D527D527D527D527D52 %7DA8FD0AFFA87D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D %7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D52 %7D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D %7D527D7D7D52A8FD0BFFA87D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D5284FD0CFFA8527D597D7D7D597D7D7D597D7D7D %597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D %7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D %597D7D7D597D7D7D597D7D7D597D53A8FD0DFF527D527D527D527D527D52 %7D527D527D527D527D527D527D527D527D527D527D527D527D527D527D52 %7D527D527D527D527D527D527D527D527D527D527D527D527D527D527D52 %7D527D527D527D527D527D527D527D527D52A8FD0DFFA87D527D7D7D527D %7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D %527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D %7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D52A8FD0EFF7D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527DFD0FFF7D7D59 %7D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D %7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D59 %7D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D537DA8FD0EFF7D %7D527D527D527D527D527D527D527D527D527D527D527D527D527D527D52 %7D527D527D527D527D527D527D527D527D527D527D527D527D527D527D52 %7D527D527D527D527D527D527D527D527D527D527D527D527D527D7DFD0F %FF7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D %527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D %7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7DFD %10FF527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D52A8 %FD0FFFA87D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D59 %7D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D %7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D52 %7DFD10FF7E527D527D527D527D527D527D527D527D527D527D527D527D52 %7D527D527D527D527D527D527D527D527D527D527D527D527D527D527D52 %7D527D527D527D527D527D527D527D527D527D527D527D527D527D527D52 %7D7DFD10FFFD047D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D %7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D %527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D %59FD10FFA87D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527DFD10FFA8527D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D %597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D %7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D %597DA8FD10FF7D7D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D52A8FD10FFA8537D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D %527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D %7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D %527D7D7DA8FD10FF597D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D59FD11FF7D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D %7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D59 %7D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D %7D597D597DFD11FF527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D7DFD11FF7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D52 %7D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D %7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D52 %7D7D7D52A8FD11FF527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D52597DFD11FF7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D59 %7D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D %7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D59 %7D7D7D52A8FD11FF527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D7DFD11FF7D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D %7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D52 %7D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D %7D527D537EFD11FF527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D7DFD11FF7D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D %7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D59 %7D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D %7D597D7D7DFD11FF597D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D52A9FD10FF7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D %527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D %7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D %527D7D7D527DA8FD10FF7D7D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D52A8FD10FFA8527D7D7D597D7D7D597D7D7D597D7D7D597D %7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D %597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D %7D7D597D7D7D597D7DFD10FF7D59527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527DA8FD0FFFA8527D527D7D7D527D7D7D527D7D7D52 %7D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D %7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D52 %7D7D7D527D7D7D527D7D7D52A8FD0FFFA87D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D52FD10FF7D7D597D7D7D597D7D7D597D %7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D %597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D %7D7D597D7D7D597D7D7D597D7D7D597D7DFD0EFFA87D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527DA8FD0EFFFD047D527D7D %7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D52 %7D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D %7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D5284FD0EFF7D527D52 %7D527D527D527D527D527D527D527D527D527D527D527D527D527D527D52 %7D527D527D527D527D527D527D527D527D527D527D527D527D527D527D52 %7D527D527D527D527D527D527D527D527D527D527D527D527D52A8FD0DFF %A87D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D %7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D %597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D %7DFD0DFFA8527D527D527D527D527D527D527D527D527D527D527D527D52 %7D527D527D527D527D527D527D527D527D527D527D527D527D527D527D52 %7D527D527D527D527D527D527D527D527D527D527D527D527D527D527D52 %7D527D527D7DFD0DFF7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D %527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D %7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D %527D7D7D527D7D7D527D7DFD0CFF7D7D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D7DFD0BFFA8527D7D7D597D7D7D59 %7D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D %7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D59 %7D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D7EFD0AFFA87D52 %7D527D527D527D527D527D527D527D527D527D527D527D527D527D527D52 %7D527D527D527D527D527D527D527D527D527D527D527D527D527D527D52 %7D527D527D527D527D527D527D527D527D527D527D527D527D527D527D52 %7D7DFD0AFF7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D %7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D52 %7D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D %7D527D7D7D52FD047DFD09FFA8527D527D527D527D527D527D527D527D52 %7D527D527D527D527D527D527D527D527D527D527D527D527D527D527D52 %7D527D527D527D527D527D527D527D527D527D527D527D527D527D527D52 %7D527D527D527D527D527D527D527D525952FD08FFA87D537D7D7D597D7D %7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D59 %7D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D %7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D59A8FD %07FF7D7D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D7DFD05FFA8527D527D7D7D527D7D7D527D7D7D52 %7D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D %7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D52 %7D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D597DA8FD04FFA87D52 %7D527D527D527D527D527D527D527D527D527D527D527D527D527D527D52 %7D527D527D527D527D527D527D527D527D527D527D527D527D527D527D52 %7D527D527D527D527D527D527D527D527D527D527D527D527D527D527D52 %7D527D527D52FD06FF7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D %7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D59 %7D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D %7D597D7D7D597D7D7D597D7D7D597D53A8FD06FFA8527D527D527D527D52 %7D527D527D527D527D527D527D527D527D527D527D527D527D527D527D52 %7D527D527D527D527D527D527D527D527D527D527D527D527D527D527D52 %7D527D527D527D527D527D527D527D527D527D527D527D527D527DA8FD06 %FFA87D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D52 %7D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D %7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D52 %7D7D7D52FD047DFD08FF7D7D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D52A8FD09FF7D7D597D7D7D597D7D7D59 %7D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D %7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D59 %7D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7DFD0AFFA8527D52 %7D527D527D527D527D527D527D527D527D527D527D527D527D527D527D52 %7D527D527D527D527D527D527D527D527D527D527D527D527D527D527D52 %7D527D527D527D527D527D527D527D527D527D527D527D527D527D527D7D %FD0AFFA87D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D %7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D52 %7D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D %7D527D7D7D53FD0CFF7D7D527D527D527D527D527D527D527D527D527D52 %7D527D527D527D527D527D527D527D527D527D527D527D527D527D527D52 %7D527D527D527D527D527D527D527D527D527D527D527D527D527D527D52 %7D527D527D527D527D52A8FD0DFF7D7D597D7D7D597D7D7D597D7D7D597D %7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D %597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D %7D7D597D7D7D597D7D7D597D7D7DFD0EFFA8527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D7DFD0EFFA87D597D527D7D7D527D %7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D %527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D %7D7D527D7D7D527D7D7D527D7D7D52FD047DFD10FF7D7D527D527D527D52 %7D527D527D527D527D527D527D527D527D527D527D527D527D527D527D52 %7D527D527D527D527D527D527D527D527D527D527D527D527D527D527D52 %7D527D527D527D527D527D527D527D527D52A8FD11FF7D7D597D7D7D597D %7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D %597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D %7D7D597D7D7D597D7D7D597D7D7D597D537DFD12FFA8527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527DA8FD13FF7E527D527D7D7D527D7D %7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D52 %7D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D %7D527D7D7D527D7D7D52FD047DFD14FFA87D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D52FD16FFA87D597D7D7D597D7D7D597D7D7D597D7D7D %597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D %7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D %597D53A9FD17FF7D7D527D527D527D527D527D527D527D527D527D527D52 %7D527D527D527D527D527D527D527D527D527D527D527D527D527D527D52 %7D527D527D527D527D527D527D527D527D527D527D527D527D52A8FD19FF %7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D %527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D %7D7D527D7D7D527D7D7D527D7D7D527D537DFD1AFFA8527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527DA8FD1BFFA8527D7D7D597D7D7D597D7D7D597D7D7D59 %7D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D %7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D537DA8FD1D %FF7D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D7DFD1FFF7D527D7D7D527D7D7D527D7D %7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D52 %7D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D537D7D %FD20FFA87D527D527D527D527D527D527D527D527D527D527D527D527D52 %7D527D527D527D527D527D527D527D527D527D527D527D527D527D527D52 %7D527D527D527D527D527D527D52FD22FFA87D7D7D597D7D7D597D7D7D59 %7D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D %7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D597D7D7D52FD24FF7E %7D527D527D527D527D527D527D527D527D527D527D527D527D527D527D52 %7D527D527D527D527D527D527D527D527D527D527D527D527D527D527D52 %7D527D527D52A8FD25FFA87D597D527D7D7D527D7D7D527D7D7D527D7D7D %527D7D7D527D527D527D7D7E7DA8FD047D537D527D7D7D527D7D7D527D7D %7D527D7D7D527D7D7D527D7D7D52A8FD27FF7D7D527D527D527D527D527D %527D527D527D527D527D527D52A8A8FFA8FD07FFA8A87D7D527D527D527D %527D527D527D527D527D527D527D527D52A8FD29FFA87D527D7D7D597D7D %7D597D7D7D597D7D7D527D7DA8A8FD11FF7E7D527D7D7D597D7D7D597D7D %7D597D7D7D537D7DFD2CFFA87D527D527D527D527D527D527D527D527D7D %FD16FFA87D7D527D527D527D527D527D527D527D7DFD2FFFA87D7D527D52 %7D7D7D527D527D7DA8FD1AFFA8A87D7D527D537D527D527D7DA8AFFD32FF %A8A87D7D527D527D7DA8A8FD1FFFA8A8FD057DA8A8FD18FFFF %%EndData endstream endobj 27 0 obj <>stream -%AI12_CompressedDataxœÝ} [òÈÒèýü‡ ¢ [vÜÅ w–¨¼ ÁÞ™÷Üç~¿ýVwöN:À¹sÎyÆѤSÕ]]U]U]Õ -6[ñ£¾Øâ©ËB¡²$t¦¢TdðSæd4šÉS = -_GZA££“ü›ÚðNä8.âWøe}> C™9Èò`ü)H&w7ƒéH€·Éd$$:ƒˆ†@T:Sx•Ir\’cŽ/¦ÓLó”ÄÙ¸PJâßE&žÊÁ†Ë¦á¿,¼®®ÙÖ&›È³9~I'r©| -Z¦\!…>É$ø,—ƒï*boö-Œ§MIì ²\G¢$™Ò¨Ó`ˆ™·ê`$Àh¾;S¦€†vtÂño¥Ù`Ô¿˜}wfšÍ¢Ç©7üõ­Üù„!àßÑãÜÛÉ7Í­R<“ʱL:Ë*ï  ¿Â_EæB -eŽ¤ikð/+ÇçÑÊÓëÙHnǃ)ôÓ¥ Ðå\ì £"ÃëßVGLü/güTÜt¤Oa -“*ŽfSÌ[yV}totþhž8ÁåD߈w¸ñ\:‘JsÀx…B¸œæ²0¦Ãå1¢\ŠÉeT”FË)°$GC€x¤ Ów) >ã¢Ú½Ü[Mô)…IÈ+?ðyÓí?¥«0êéT«]V*Ÿ›XƒMœ·ãñ¸_¿ÙeÄúÀcà–‘ø©¼ÓÇoàóÙDé=þû f¨) Æfà¿É¿5G3xU“ÄÙädü!Šd7;Ó/`vaÜ—A8•gÊŸŒòþã°@k2xùŸ ½ÜŸRgò5è9!px¯cRÞù@2. Æ÷øOíÿlùç»+Žò·Á¦'ÍŽ4ôFBë<¾½¡U„X¼LdÃOÇ¿…‘81uRÒ÷™ûŽ4q¦éc0`y6È(~OÐ"Ì´¾:wwúUÅ-[l<êŒ;ƒŸë ‘úþ}fUIÊ3hæ £YõÅãî:Ñ÷å Zõ¦F‚HžÅ¿Æø¦?©;³Ñô%Â$/:ß $[Xƒ­ Ë\XuÁÂo×mñ; hK Ë<ü?Ná—_ðè/&Íœ3O/,Ó‡§×´Z=ôI…";& háÿ¸ƒ0"£{žclvF°ò¸Ín€d .É9»¤Ù 4K: – -6œ™lscÀ ™*ŽU^)‚ƒÀü/õ1²=$Wûª™?`—v¡·¤ö7Ì&úkÐCÔèH”¿Î`æ8¾ÜaÂÆð:ÊXtgSÝjz$Iÿ7 VßÔª÷f°$Œ•6<“<ÊèoÑé¤ÐÛðæX~ûÝ‘ä@3ÁÒôwg4ÓÚ¢ç2¡ÝdKi¦öD¶üõ_Jî».q€ˆ`ó]`2xSÈÜ:öÏŽq ®ÅøFbo(ôiƦµ\Ñô/9zÎuôTó:ètG ã{Îä“ S‹:jús1^o&OÅïV“ýûø°(wÙ‚ÖÐB#T†Oóy"%:?£mú) šTg3™T†Ü–3õljëÙI |xBÕ[êÌ7<:iv$`o «ŒböÀð²NPó³Ì‡.À -£ÁX`¦ 4Ü6+UfˬT4&´4½ÿô¾š’ø1 gŸy]eÆ?Ñ´–ø[&(Z+» uXžJâPðhÜ &@2äøþ $ûrÈVõféùñwWèÏõÜ`_KãÖ¬ -¥*B¯ë䌉³tFÂÿ-ô¦0…ÝΨ3îéº0ôD©/ôçu“¼§~^kcKÆFr2‘J€Ã:sö6}%p¯r!ÇkC··3™¦¹±•ÙÒ W„˜¸>ÓýÃT$XK¤ynÿÞXýX'=[OÈÌq"n„ÚY÷¾ý»Ö¾ÍI‰oøÚ­cR?!JŸ ×Ϋm~Ïñ¢½•ÜëŒ –g»ß.=Ç&£Þ2§(mzcÙ¤Ðf -ºB[8¹òó{˜Ñ¶GXƒ„¾G›ä.Œ§‰þÈ2%ŽmdkuT)'Lrb$üF.}‘ÝM×&cá³cT„F=P.8¼îÒfÄõ°^ž[kmíä¯N_L -Ó±ÒVcX7lšÌÜêïI¢»œˆ mê%wˆ“žèÑ@v:nПù1mŸ» °Ô—€³qJ!àÖñX3 c~®•—î}›Gø6ÑJ0÷B—)‹`‹õ™çpëþ²ùa~óî=0e%³ZT¶6°à -Í¡°lw»ÁG#¯@†9í4y:Ò¼´ 1Ñgj{cŽh¾™ôåFcêNMúÔÀ•iÓ¿p3XD(1tÄÇ”ªáTÓY.k­ÒR2V0—Wi«„!£¡8ýÌ!0¼D™oGZs9¸ Ç-MÁ¬ãf œpÄàfŽ„F[ðÁÃÁv"‚Õ¬Tß´0¬©¾ÅbAÕ;%";\ªÁ9ÇbïK¿…Šø×XÙ¼?ŒÕIãy§Aû¶&uþ_áR…£®¨9Ž"¦}z‰×ú*à=’¦‰ÒðÚMBwé.þMt­Kj Þ+1\Ãæ$x;ÔQÆ4ýM±4cLaP;jŠ( ?ÛíL•¢…Ef®dÒ“Žž}|Ê­¿ˆÙL$ºšuæヶïxô. )c­…¾kŠ£rð7Î7·_ûJÅæ¿›j8ðdÜyžï'5Bƒuœ7¹ŸcÇEÅYú)YÏ3ÄšvʼnzMÖ8ÆžFjEf%úؤ=郦| ´µÂ}Ô˜Þ¾‡m ¯•š14ÝHǘgÚ×æ Ñèl[ÿ—SÚ ÝR ?™"fq÷ÞôMÅW?íFßú$™ëÚG7Òà}qï™ÕH{+ Ï)¤è&ðú’¾ z½ -Jó^è¢ò2ï1ÜHÉD³»øŒ›ú@BŒÊøZúV—WkG]C9lµ àÝ|cV-éþŽS˜Ôh:¿gäªþŒ]¼©âkA;«3Ǹd&,!O¨avƈÓøÕÅ£ðÜZs"÷³[êÑëkOÏÒ¸äá2iLct/…rƒñféUt“·.6Í¡EÿÞ|UÄ ,p5~ÇÈj•%ó×—0fäÎoı¹¸™AJ˜éÈè±Z‘T©ê›Ü ô - ?­Àþˆ3f&æ› ðµî³33 ¢ÈôOÇ@f*"=LQã3êüA{ï¨HzÐSLCyÖûBÝ;WpÍ£`ÃÄΠwâ‡~ 3³ñ*%¨%£' &t¨m%29® fUY®f#’‘ÎT¸ùš}wÇÁÈ]°ÌžÀ)!€Î>u¶¦q¿#¹Åz-‚ › àÏÂCÅO)ë˨ŽP÷LyæèDwL[f;‹%µ2Ü׶Qô-ëé\fÒ\<øÓeQ3y8˜tA>\\~ÔL}/ Þ9ºü§bi=“ÃorΕñ“ -ÌX4ˆ!×ED5ÃÓÙé4e a.YBs“VFnYõp¯Í®yß7U|ÀäâP•,•9‹Fi |ÚG¡a\¬©øn‰4ÊG Ĩ}„¿ìy“@ PÒ@iL&Â|[G.7ÓJiFM,¥¹_j)_y“ËœVe‹6M:cmßwg^êŒjMky!­”"|Ú»Öæ'H’Zå““|¦" }Ž F÷3ï¹èÁ]7É&£çÛу¯i -ýƧw¯Š)ýÅ•þ~±“:¸™–*…Ú°¾~½×©|°í}ý-Ý»Î~#©ú^0žÜº„‚Ñýán0rñXƾðêý#ŒÎŠ­`ìü¡Œ³ç<›Ük‡1úL°¹J˼|« Ó—ïû©R>•Ï>f¿wãïU1wŸbûÆ[¶þ&”!IÚßëÅ&§‡gy?_ß½OTÅÇôݱôüÈV«í›êÞÑ^Û>ÊU,©«h9¾} øYÒp•%RÂPl®QC–¤ùÄNØdº¥ Ã虜¯NïøWq¸Éö79ŒùÒ+½°ò.ÀÎÏ¢ûµà&8ž—Ê0‘”óµtþgçüYÁ×íŠé³ôrþ|匴–{ÍO^ŽH_7. ­4;8«…œ‘îÃ’Ì…$g¤Mî9½Æ· ¤VÞŠÇ H3_áÎVûØiºýÀVÙísG¤kÕ~6ÚÈ]G.œÆÊVoî+¤ÙõP³utDBúÎÖÖo ¤0ÚZüp뤛xp$ðó¯NVEÚÜÚ²‘7µ3õ1RàÅî±uNÛÀÉ/üéB™ŸÕÄSzＤiqŽ•^w«D¤™ÑåÚÔ@jp²‚¶#½n†îH«½ìx+›rD*½¤HHë@1ñ©-:uw-,oå6%'¤Òì EÂO/NHÙjáxß@ -X¬³ºÑº“vœ‘¦Û/lõ¥~í8Òµª¼&ïZNH!¶›]Æš]ß>/ # &%yÒÜ@H·çÈ{UÝ>ÈÏinÙÇÚÈ•Ú*Òv" }Š°­¢ c¤ˆÇl>‹?Ÿõ…ØÔiëí`‡ˆôâ¹~ZrBŠ4ú©ÌÞm=ä ¼ÖXŸµ>»ý¼#Ò»'‘ÞÖ’µF9ŒõŒ½›¤ H"w¯÷ïGŽHïºÛNHA'#´ooGÓ{ŸÓìËåMÄéÅå篇Êî¶#Ò—iâ -#EëËüX¿›ÑÍÒ*ûvõ³ëŒôò0"=ÉeRÀ‚ÑÿŠg Î׃÷lCAÚY›Ö¬Bs ÍîŸÒitNh.×w"¯³ï7Êþæždëûöõ†ŠtXض­4›ìùE#å·öÃu+Ò„$ž®#¤q)`QD#|^ÏVé¡<§ -ŸÅ‚‚ô |³‘7xT½ÜR¾L‹§òFn£;õ½SÀh“óªð–‹ç›¿iufG* "*ÒâUÂ:Òúm)´¹‹‘¦n ŒaQƺþ$gºOM„”#ðEasíazuHù9í,uÇ·ÑPj×ùm):¹}Ûx>u|?ëwÙ“çè”ðvkŸëÈÍu§·0ÕX0TÚ¨ ·N¦ÞgsÕ ½Ÿc›µú×D[ʜގ¥ÜåK=c{«Ï~}:Ísû9ç¯O6ƒ‡—÷ÇW„·Ó³“ÓuÙùíû5¢ÑÌŒð>ûvq¸?Û"¼=ûhswqÇ·ù‹GN[Iù˜Åì†>—ñù·ÙÍÛÎÓñ>áínø®¼{h{«S¬QÚ¾ß%Â×õØ[9{óìüöü¨úk/’Š8¿½¸†ù—üv%¼øõ’“<áí÷ -yç·í—föºW¾u ØËö“ÎÝó_¿ýÜiúÐámçß[‹åª$Š ÕéÚ¥àüõûòµõëdÍñmèþª^8½•¤½·«@(ux£÷‰ù÷|éäòªôÞÎ)!éèí[¾lUßÎÞ‹áíÐn𿣼ߋlÞowŒ¯÷'‘݉îñM°’Ú/Ô7~aíÅÖß›eÝ5Ë9¹ffÏ"¸}¶Ãc•ëû`ìîüÊ·þM0ü™¡ßšÈÿ,ãgo` = sÊgû{âzÓ:Äø ÌÉóüx Üчvv°—ô±«£]Oöº°ðÖŽÁÝIZõ¦´Æoí5㪳³!š—àýõRÿ§ßŠ³Óݸš×}3Út䙌t­ú'"e«¥ì%iv¼¤qjçÍ@kAÚ~uAZ fÈHk5©­#M!ë„6__ÿÉΞ5¤µ‘•À/f¤éÖ†™¼W‡×&¤ýÍÍu)`ÙÝ^hmFÜ6qFšn·ÉHתŸ¬E*­h±ï@@ -Þ$ø]Ò)²Ækl‘8Vl‘‘"{ä–DÞ˜T±.¬c=Ù´Í*[£Ç¿©q1ëSµ»\l²Oh¹v¹¤h'ÍÞ†!“¶@cÖµåûéMtáëX8Zå …ûá·2²ÿN0a4Êê_»¼ŸÇÔ¬)|ƒãCȯLÇ®ÍòÔÜõ¸õTVûݹ.AG‹âþ$Ü¿±G})ù%TBèǺŽ`ÛæR£=П§ -·]úUER -Cííï‡L?@3ö¶È25nnþhMÔáê± è2{š …ðÄ GCíÙ¥>‚Jt¿›ª›h¢{í¶ n¢•k¶ñay!wJ¶uÊÖ¥ä`½Ã?z*ñ Å`h ¾ØöQcæMtüãÚì“;Œï€;k8/2ÿèŠáGÒ*}¥3MÌÄÉQ`åÄ0gP u–ì~—ír×YküPÈ»ÔaNîTõF„¹ŒÇ”ê\qcg¶è¦Öœ¦YJÖ E?T-ˆƒØ¼ÑY;爼‘ü£{¶~aN.þzÆÿð¥Ç©ó c¥°ƒfŸË^Òþ0?±M |}+¹êZZÕSCöXs«JX˜¼lF /ökV­jZ–!Ÿó;ÌÏü[Oβï݉…Æ—ôìRaÍe­4úCaÒ¾¯uR—UÙ§A¢I§*ٷٖ«Ío™A/“Ž~þ$}©Jiœ¼ °þVçؽ_-0/¿Ã­_–=q ŒÄóþiXu+ ˜UÓ.I1«FóM15²¥2_zhÇ­Žk‰Ê±ëØè+Žó£þL÷=4‡É uÖcŸu¢yÍØζBÝî‰/!•ŸuþeV:óá(+»¹ó39=´Q=qÿÔ¡wû€6ªm9GZó›6Œ@˾l(’¼PL“›‹gëˆb)9vÅK ÐtÄn[.D/±×:¢ùÈ`IE—¨ÒÃ[ÚŸO®liê!nKÉ{o’_›CÛáÊÔBPãDÙá­ùP7lØ¥@ÈW§T:™Dî×ÉŠŒoÓ¯¿OßAñêÜäJ¢W¦†­@Ï°XòæXÿ"q«a*ȶ)Ü ¬/î±N’Oþë„ýàÖÚüðžÁÊ”Vĉnê%!be– ÖĬ2Þ÷¦6GzŒ;QxÝÞÑ¥S»€“"$n±°“7Ü{C´ßç"$©" -x9Å!ÙSÃ~×8Ù˜@„iÃHó;/B§sËòáïSV‡÷!&A; ÓEŒ.à¥Km~Ò´„!’cy“üÄ@Hñ )^cåd“Þ´D¬¦4JMf­¦ô™Ý”¶?¢0¦Õ9(^­/H;ÍSúCÞ“ò²„-´›œY—Á”Õóµ¯V /gö5p>/^ñ[e¿rÑhtêà6”¢PÀÓÏl‹ÞB -`rXlëÝb„qæ—:‚-‹¨“ó·鶬bY—ºH8jÍ߀Q=´ÜåÎ]꬜ Jxéý |ÛÆ<·+J¯BÀ’4ò¢ð˜{¼c—ÕÉe¬ÇgKò*ž5—%Ï´Çç ÇêHúè±'Žá,-ʳ=foÒÉ~àø\÷Lþ¾0롯EÔ²?ˆWäÖØîR¢g«ÚaÀûȶgáÀ ê+iÓ‡¼ÇG2"n(Ii2?!'ÿ\×hÛíÖ¿F#EH@6V Ñä¡}·šÞ‚wFÞôÑÖJÊ$Œ_ÞR*ƒ‹ÐZ[Vöo4Ú²ë_£9Å.0œå5Úíjö^1œ7âÖÙ!+Lo“˜}ÄÈÖ¥eÂvX¢mÙ:t¶QtÛRíÊ8ÀûÛ¶¤.ÚÄŠœ«‡;¢#M¿%Óé¤dõ¼?5 Àü(Y,ûD5ÛžøÏ~° óÇÖO:ZÚ@A)Q: ã ÇnÈùê ŒEƒ³t -†âh Îï¼{Â!KÑ$wÜMÀÀ|FýÜÖ˜»°®†÷ËØ÷&}þÁkárò°<0]y¯†ŒÆ}$®…Ï€-s)à ˯b÷þCZŽ«Øý2ö½Šº.µŠÝ;Ù÷NP!O8T«¡ûZ¨i˜ÎÚ9¿Ìjh[ QJxÌX U,s¹/ ¥#¡Ñ?8­…ÆZiNž2Ò0ˆ¶ôë•èŽZH‰¥Ò=bœ‹’ÂÒÕt2£H -K@e¼¢ -®ºÖJ±qˆv&mIôˆ(åÜm÷DÅÇäá=AË{§ÓÙ»ä,¤ -'Sˆ—maJ8,Kmâ²DŒ'¦®ìâ¤2×Èþ~ÛžKO"%…p'^zºûF´)oeõc_ZLóâk÷›R3±'ÅhâɤëL"N¶¤ßº#˜åDÒ%ù8e¨ª<‘¤è”[XØE¸ôYƒ’î€Ï|6Køz#Œ}ýj¡Ê¸F0ž¿9UÐB«©¡s¯ ›«Z°†Î½‚Nñ^—¯¡s¯ s«ôSCç^Ag­\¼†Î½‚.ZM {­Zpá:÷ -º@h55tît8»c5tîípõÓ -jèÜ+èÌQ¸ejèÜ+èT{Ì»†ÎšL®0›8YÛ®9ðäJ Ã_]"Ez››’Wâö^7LQ/e²ú–̬mnzd„ÒGzNM?¹ää=¾æ9ÓÌæ«læ3Ͷ)‹Á¢AëŸ °ØÒãìwåýø^òBMtÛfŽw—È•a0—.Í—Ì¡è¨Ï¢9:]ÓŽ™ÄÚ’Û㯀ÊG*ˆ"û¤d×ãÕìÍ)¹£ŽÅDþ†æjºëY7žÅnÖLHAm}Y6b¬»9oÛؽ$Ïb·…RA¬Ú㲯kvM=ÝJ¯fPÖ}ŸÀ¬)Xà³Ö¢Ö›ªÍ'w¨|¤ÔYµ÷“Ó°œa87¡Ub‘©¯SµŽ¶„ÑÛ·¯:íe›ì1{èÌ;p“ôkND‹íX óäÂ~§*0œ«@¬{šº›~êøÜ. Î³ë׈Ææœ+#hE.MÛŸœºäbJ;Eà¡Säx}ê¨æ¯°á•oì~ÖÀº:>Ïš23XjxU`­ñj8ËØù W¦øf]U–¤Ø³‡×â‹bä­߃T5Ú¢³~sÒ\¢Ót_¶Ùc :ŸuÏFUÔ‰qK—z9»¶ 0±òñ†S~xH÷ô`ƒÂ‰ Ð8{s¡]gpF_j¯m.•a9z-fïÕ˜iMÌ¥r ÎÐüÎÙç!—¸y˾79È[Œ6¶'Ãt®‚9Ü,—ºû‘'úi'tv$ÿ"wV;òÄ«*V©r­õÑ*}Æ~Âs®’f)¹È9hrE”Ó ,dA—B´a Ý#Òi¦W÷2»­€G§hédßű²€VaGÅ^•qÄ.Ùê‘Q9›¯ˆŒK—RþV1· -;ºˆŒWv:EQœK—ìgwp§²-"“Ú(L<|:šˆÌw¶¶|–Ú)EDFßãóp¾O—‰ÈXïàζ–šCDÆÈî /Có‘q¨,ü,š lž«¹ŠÔÅêóüDdq~D¯L{Êâ M–Š“é²$gs…æÅ« wÞ8±<9[EMâÁ-çž1@ãh(Q¸³ÕuðÐœ2g­+2MÚ^Ä’œm}™œQ¥.x–ÙRHÕ‚^uuþr3TÏhóõÜëêŒ5εRØ;Aב©2s2]ª`^ß²¥­Ã³°{F–²Ð<Ï÷\E=œ’ã_ºn‘óÇü×Ã9gA¯ºn© Uêz8 ÕÕÃa¼´zÕÃ9žJÌ\´Ξ ¥mÿ­¶ÎáÜQlÅõp§¬ Î4/放×Ã9øb„mIYtƒÎV/Vug êœHÛÃdÛ’&'r.Kb1Ù¿]¾¼)!ÊLHO8n™ÁÔ;¼ŽÍyöÓÝÃp–­±W ÌûÍÎ9ðÞíÖ5 fÏwVeßU ¶òP ›{!ŽEõÛœ+½VRu9 ,oÐkÀîÈ’CÐcD1<~n/PNj³ÆÞ+Ãöd%§c8nbHç½b8Kˆ¡ -á’gÝ(pÈûéΧiÓ¬0ë3^§¡™AÍÖˆFµÅ°Ð3OSÚÍ¡6U¤Þ¯¢"õùg…©lu©Ï?+¨HåÖ2«¨Hí¬ÇÜ¡ÐU¤œ¥ô¦©^ŒêTÏÞ8ºO~+Ré6»ÄÎy}X@\Mõ›d„NÔ)†csbX {L]\K-…#걕–Â!{Ì3£Ç:ÈJáHó²ÚR¸¥â–Ô¥pþüÊEKálg½Iÿ–R8ǨÂÊKáHñ1Jÿ ÖOU`;?Ù¥ðÉš áïDx»=Ö^Ùj¨àL »Ÿ=H@FÀ¬‘/aÃteë!Ãþ6¬ÕèåD’j Ç%uUùÍÅèÌX(Š›m]¢äStÔayP#@WÊ­qŽì¬™~ø‚ÌÜÇÓG®òX½k&§¥Æ±ôº÷¶wSrP¹”<½¯¬ §­ÊA´u³'¾G³ð[­ -·ÊÕ‡çjŸßÚ_«(6!÷šâÉwÅnæZ,T°ƒwµb·õ»vÓ¾²”€íËOmR±Û±ê ÝÌǹTØákµ H³ëèRíR±›G…Ý$EFŠ®Õ&"E—j’j±"Ö -;[±[3ÛZKÀðUÓ:R{±º sDª°KG\*ìÖª)[=Ûm¢ûøBé‹Ê;©ØíÍ­Øm#KFZ»Z4ÎÝǺœwHH¯]È{qvGD -zìøø¶jÕ åÀí7õ6»Ùö^’ª]ªÌÚÚ)òboɾo( F‹âôØX:aÌí´Ý5¼¤-‡µì–sï™rk·`¬™ˆu¨B‘àDWÚ³g;Uc™K¿ÜŸË¹"wªì‘Oêžç¡{¯+»IÎé9Ç3U–ºIÎgnîг…«!Å@ˆõ8GÜš×çz‰œG^ߊ.‘#Žpïe®®g—<ï &:E*¥å,µÅÑë¼|§tWº è¼"½þ«éÃø«¦sòŒ(ܪªéœjéœÏ‡Y¦šÎ)&è /KVÓ9ÕÒ-Qùèc›˜i¿p5,öÚêUÓ9òF–Þ -ÁPˆÇBþà,¶äY¼$ gY ÄPlº›T)ìÙ…yÖºÜÀn/¬Õ(6INsÏ}•¦?+O}Yxd›ã©2ÃMk‘”¿„m))î{u1"µ±gPÃ3û%Mž81‡úÖ—éîrSÞÊn0DkåÊ*6ïDb!ƒÙ—‡T yW>îl/kN”çO)^h·ÃñWÏI¸ÇjîˆâEGe¿'ÑçE<6q/dð¹Ã‹l¯í¹B†­ÏÊJ1\ê†;£¾ÒùŽ»…ÄpÅï­ösË5Žï¸[Eåc%º¢›ò<ćú¦¼•Ô%‘î¸ó=*Ç£½çê’h.šô}ÃÇ}¯±ù–÷ w´§š£$••v©éd°¶³öæQ  /¬í¬uCN¨¥òq…µÏ?NÕí~ϹRàøf9pVPX‹ h‰N7ò¹pæÔÓ™Ä2¦{_õí=±îŠ¾Gâbø°t\Ëtïù`‹@QÄô&Ù|-ë*æYÆ4WF綛æ…è¸?,Œe’ʪ05MÓ›dóÝ÷+Q¡'m“~§ð¼âŠÞ‘³/ÃP©HMЖ1Q†åDÜf",å„ÇZBi¶‰†!λð[ãZzø"žÔàxf½rB;±"ÌÃ-¢Ý±Q(f¿£qÁ2åœ\Ć™ËßðÜ\p½[pùë»2^ò¨ªž½5ZÛõ„)[Õ³[«!½l²úw§•™ eI:àBJ‰ÞÍA®U«í›Êã±txTÏÞœ–K‰^¹\Jž¡4ÎÖD[xB#k÷Ôè’í¶ÛÉèÉ©.BÅiO.Ý]›fV²ÔÃEwz—¤"¼Ì×vh7(šu²µ`‹\û'¯UûI"R¶zSºrB)÷°™«ÄìHßÝ®¹‹LH­Ub’\ŒÊ¦Ø…ý¢»ôÃWc‡Pû·&–¦I³wα(† ¼»ómºsÎV†g»]Ï:Ò'·Ê¿oÞƒµ×þ‰77D¤› á«OB*8!Õî}Ë_\= Ì_<ÕHóuËå…v¤W©iE^Ç¢©vÿ¦açf߹ݱšk­á~nPALGšJ;u™ldŒNMp«³ÑÜÝO®qâC§ÕÎ-m2ªœ.g»ÅlS¤Ís[›Ÿ*Ö}ž"BB.Iú¡í’RáÒ)_©0¤Â&¤ÇV”ZõT!&VYc°‘¤æ–=bêœnfyªøK­r)³Ÿ<¹xUšW†¦šKÅO¢9Íí©øIÙôê’•5ä…šèôYZ8žìV -HŽû”—<­C¥?ó¹±Vu•ç6¯Û1Ó}™Î•\têêõ˜vûÒ%‹Ï[É©qÇhöWTôz¼‚]Úóòñ±×ãœÛsî´eíó\ë#ËöÜÑãUB‹jiëÅ<½Œœ¥E³%tyÑ^5ÛYk¸™VÃtùÙª|dŠp0e0¸JÌ™Svh®¯³ëœ|Ø•SÈSÌíZ|2„% æ}ê‚Ý!zâýšËâè¯,?õ¾3…ºìÕ~Î1»¾k¬¼Œ7K4VëÒ|ýËÖž@<ç€Â7wi.Oi‰R@«¾w,å´sE.\jþ,u[{wñ•1Ã]¶î/,IÑ/ku­ 0ÏËýPÌó~úAò«¤Xj•KÍ• Ï[‡†¼,RH[hÏè^ @ŒÂõÔNÕ ð,;¦ªD³¿x }þH5€¦ ÕªÝk8æöŬ´± -ÑÜσ%ÍÐ27ê)[´ -Ð2%.5€s5VDr,s£žÉG^  -Ü%k¬Ä¶_©ôgnT6ëÉ÷¥|¾nd[øR>ëmYÿ®Kùœ¢ -«¿”ÏûF¶U\ʧøÈ[«¡ñR>¼“èï¼.åsŠÂ­þR>×û‘Wv)íý•K\Êg‰* N5ÒÏ„N]ÞR•nõ[ÅÙPè^¿•Tr­ìl¨åîõ³Í^Ø´@¶­ã½~îQ!‡«…îõ³q¥íV¿Eφ²ßëç"zâ>ïõ#Ìz«él(¿÷úQqòÒ÷ú¹g†˜"WKÝëGQɵ‚{ý”J.R8W__–¼×Ï}hó÷W.v¯Ÿû­~ Ýâp¯Ÿû€œ3Týßëç8M/p¯Ÿ{Æá,h+uhˈÅG&«o©{ýÜ:¼Ë³‚{ýÜoõóyñ^?wW—íû^?§¬)ãV¿¥ïã[AÍ;ý½~îPðì¯à^?÷ SF÷R÷ú¹Î:T¤.t¯Ÿó†Šv«Ÿív†…ïõ›Oƒ3ßê§å)-\ž¢Þëç®Ì¶µkÑ{ý÷itBñ’–¿×Ï=áÚZ‘ºø½~–ú­¹[ýæιZð^?wj7²-{¯Ÿ«¬Ý"N^Ž~î»Ã>îã[âë}|Ë×=8ßêç¿šÃù^?÷-br¶­¿{ýÜ-y¥æ}ù{ýÜoõ[MUšW~F ´š{ýÜ÷›íY‹Þëç~«ß÷ñùHÒp»oéÃtô[ýVrŸ§/MqzÃü½~~®â³i˜åîõ›+¶°Üê§W -y¯ŸÎ^Ž·ú-R•æßÌ!ò˜Ï{ýÜÌœçð÷Wr¯ß*ê^½ïõ£«{]ö^? -åÝè‹Ýëç/çÊá^¿Å‹áõ[ý,÷#›w•|×<¹ÝêçrÊ™¯{ýzL5æV±ïõsOtš‹)-x¯©<.íE1úš§b˜N*—¾×ÏŸ_¹è½~Å5w«ß2Ùƒæ{ýÜ9"@äõº×ÏÝ0Ôw—¼×Ͻ ÖX‘—»×ÏýV?{l¡{ýÜŒ ņYŽ~´6Ìr÷úYgÒ~«Ÿku­{ýÜ*Nê{ýÜÕRB[•‰¹å¡‘vé²².Ìg|ØΕJm†IeÝ7…vñ.&QœÝï­e‹6=–Ž][wo6-bþ6‡¼°bÖ/ÁeZ TÞì¶g¡Š°`ø)2 Æ“[ç‰T£°¡5jÈ’ÄËGÁíOé*7S÷癣L6*$ÅYg«.ä ÛOkÁ“i$xT½N®µ_³ÅÖýz%4·[Â×$e[Ÿ·Ü°ßø<¾_| ­Báâ¹þs×â&g­¯«Á趖<ŸÝ½Õ"á··r4ò«ùuùÝŒî|L¢‡S)Ô -oIRj#¸& -b2Än|íD½»h!zÞÿÙøn Ù+’tPl·_jçA¾t9ŠîôÒ‡l•=Øg«7÷U¶¶.^°µË‹/IÄ¥Ù×þ–¼»è¢ÕJËýŸãè^þâ MI—½±Çw¹7Iþ<]GRy)8*$u^p}é¾<­î  -lòaçßêý›ìüÄÑ¿2"âèkX0÷Äaêàv-Ájº}} ;Cl2“Žà?b‡"üYŒâ?ñ©M×?ðàÃÙˆB ÿ–ÚØÝ}¯¾EžÎØ×ÃÏÃFP‚~Ÿ™;cÇïú‹mó‹r¨«¿@™Ã¦W·\_•0¿øÜûÐ_°¦ñ“/íÅE”«5Ö:ú³(n)Ík¯‰žþ*n‚S›Yô,©. ™ ,}sõlƒGò -ìîkH‡}Ušt':¥ã*nZ_6€YÂè~˜«„Ò¨—-#8W,>6žëÕ/ñŸ*ØÞã‡Ý6Ù®F“ç­a -ÞÞÄð[>’-êd¹IhXØÈFžåG­Ðq¬y=Üaï6Ì,©•c*¦Í{µy6iX XÖ–K®Ë»ÑÛ)»›¾8ʽôÊ/Vâ#­ ÊÉí'þè[lÈGg÷÷ï£ñ‘Y¨á>fL_©ï!›ð^ás¾òxÂ)Pé]fðoÀÉ•Ñ-¯>=½b±ç#·¹5­l¦ªÙ½IȤtùtR¨æTÀœȤwá·ÝÓä<9ÀZ 2ë4/€íþ\•O¿×TtDÙ±Ú=vŠ¥6ª5ºûqŽ%ЄáÏg½MFïꈔÏjFs† ãk6ñ˜ðgn[‘ýÎZ+!#ït²: û¸ØÙ°²ßI -› -ÍÜ®¢“éAá1¼=ï Àˆ õeQí‰!îò Ï‹ÄóÏ’Ãx“ d©tÑ•i‡¡ÞÁ=B˜.9Œ¯™¥4¿’ž©FAÿ\i‰Zï7ïÆ J· -:€±Ðƒxž,«ašo%E;Í®DìC D7 Aöœí €ƒòhÙÙo~-ÉTÍáÌ€"û® Ä 7)]—®¯[?Š½Ÿ©‡•úʨõ|'ÅDf…éa[fºËüjr©:ßÏŠó¼µ×V\aÎÆ1œ¸ê•iŽ¢^“˜©ë~g=Œ]´„ìÑú6ö°Ñ':¸Sÿ,'¡VO蟙¼N³C¶Ÿ†±è}aûápQ{UÜ6^à—öâ0f¼à·ûÚ‹jÂôâeöz¨½h°f,6»)f̵èA;3æZ5n¼Þ‚&ª5’ª'^»dñùc™hj£ð üT»ålð¦;Ó‚ -¢YŽ¢&1ø‘ƒõºy×¼»Ù¶ê>5 Ü<c7¯Yd6sð£þ|àqÉúvêàì]<ƒ‘DD‹à¹,enGEÚ¾L`,©R>•ß^#å¯lõ²4ʯçÍ>+vqÀcÅ !Û¨mÏÀ^'ýƒ«ã›{Ë`³·{ÅòÑíæÎ{ù+w69º9ß#¶/ð¥§íW5 Ô{è±°”ÎhïÆ<# ÓmlÓÏ?f|÷Ç?c訖ˆò[gí‡ù[ÛÊo¥ÇT…ÚÀT»'J_‘·aˆ±Ó«Åa¶ò[ªï«pSTYäaÕDîær¸–HÖš› -¿€¿+k!–Ä4iÇq6 ŽÆ*EcÉ£\}ã×¾"rºdÁ7w¬"whëÓ$p¶ -r>*bèœ:VÇe•õ 0=£Gp‘ÛgÞâe¬š¨]©T"2J€Ø&‹rwX­«\lRf+§»" M.9“T¾*‰I - Ôö¶µñ]D±‚3âóÿ³Ès|ŽÉó™ “¼žéR|ÆL,°HpÜí¸/V%A¸þžVÄÞì[O™"“Ö*ÿ+•ŠÅkQASKZT(©@hqˆôëp2å -µÌú9®PÆN»5;¾¹ÕľH!öXè‘ìëbÊ,Œ´Û)ÒcM$ûõ`,rpã öv±W8ô²Z?áÍmý|ÅLk¢6êü €jm0¤Ã(4Œ$õmZ=æÏóª°£ˆ¤ðK@ûõˆbk|lýà?áG[T68ù­Ãà‹º;YNàsÉöš1L¬äàašP¾A¬ÅÛ=©ãS§0˜°‹3m»Cý^ܪ[)û¹ˆ!½ØD²³¿Õº|SWÎ[.á°£™ÔÖÆ«ïepæ=ÉÒOVÙ¦€•qO±‘ð|d^A\¶² Þ(Í¥7jÙÁ¬õ1-¢µqüš±m X÷âæ^þ̶· NÃzpEnÚ`ïi»–H×´`ûž¸=¿ ?7ÂÀ|¸ÐNY¶@²ëÁPi£¢èmÚ ,¥¤ W}¨qÆžž*|hEFV^r°{Œ­8Ä û˜?µgw?Ú³¶”\Ž£Æî$ªíf±ØˆK„°vR²𞇚ÜmÞow´ ÌTjìݾý€,È·”\¬È’±wÎ#Tàmæ'SQËñßï ÒIƒ¨7CÓö²©5N&á 8kDØY·â´ÛPø´@'"ìyÜøà Øœ;0ÅF”PéÅ–FE¼s¤QÑÌH®;YHá†}˜€oÕ³Àgªû¡Ü6/îò`Þ-UË–†’ˆ=À&•® ðý~‡áï·Ì0n‹Iâ¶:—ŒÄë!ëk{Ôå“o}…—‘nä¡FÜàÝRW…éör}(‡¢Z&ž ålp±F4Fч@È¥·\|™}Z.öšSXÊØ_ö= °fh¹R•ý9“2ëIJ·%/¾qÂaòZ­^2´eví ÿ˜Z‚aQ[VqF;”ñnn×XÛÖ(‹×=•²Ê‚¨ó˜aj¯ šù%Ïní37xl¡É©MŠ4*ÃÌcvõÃäRèǫ¬Æc‹) ”‰ÇÑöAå1{/º¯¡å$¾;áLÓiZ‘éAô6rñåVd®ßK,%ñ½lÙ.®”+2Î’Êpa¾ÔæNð‡Ö¸h˜‹sèö«æŸu/é (¦ûÃà¿W ï´Õä2Ý÷S=ÃLbKû c_EõµLÙk(Q,³Ó2WKO(Ù­œÐ>¬&uGÒœ? -ëЛèŒXÓÑôDϳ¨ùE#ª¤âÙ?3'‘‚"ôo’擲‘$ksñP¼êÂœ[» ëù±ÖüXPz"èEû H4YŹC<}Á)^gýàýye†ÝýŒ"Ê^©Ž)ðbQßaŒãM®b/ÄWI5sõà‘íJÛ»ºÅ`Ñ]*»ë8¨ƒnÒ ©!Ÿx1͉,|äàp‡R‘—t3½.ŸÛGÍÞG£rvl9¸¡ekÐÚvàH‰Ô«»zpÖûȾ!^5öŒpofÚÜj/ùÏ£ÖlcpüØo¢Pû gp/¾7Yäµ_S{ݤ͹©9=ßø>®&¨^•‘z¸Ojl°»/Èáºç´¸ä=.¨1ݧðïzåDFËMÑø’›JŠ¸úáùXåøKa[™=t„ù§…#÷UÓÂï;jä -9 8:VB+`·ãè©LMò•øS š.MqÌ9XÖPu؃ží©Ýà¢g;oA?Ø#s¢ú¡+µÊW+õÅáWä¿%l‘W\r…ŸJ§Žå6•g¾yø-Ï£G¹D&ŸÊ0ùL"Ç¥`(x"<‡°l.ccŽç™‚“f <~”b³Y&Ç'ripÙDž+¤˜l>‘Ëæ²ð€Opl¾e3 ._Ȧ|‚Íœ,Ÿ`FŽ—=S( …\*Ëc6Aßà76ÃÒ‰l–ã˜\&‘âri¦O–437 ÞüGÏ'²¹Ϥr‰B6‹Æž2)ýÉÈò$—É2èï|†Ã8ž1Ã(d9@e‡:rxò€Ñ¤Ó@¬ 4Js€›+%²úƒ~PÈäñ“ zߤ²lÚñAË¡©D–ËT€žbsLOäyÏ& -<_`à}:Ÿ‡¿á×…ÞšždR05tŒ7?ICG8 +ÌHx¹ãH‹år‰ŸÊQ|Z!|:ŸMXü(ó -0{ édyVyßâ¿¡¯øï\&‡¿1=ÊçÓˆøQ>íý(—üy`<ž¦d)¶Àä¹D>FØÓ@!`E`ì\6›U{ÈåFùB"Ç9VéT6ƒiB›O'26þ.D›ËÂo0C@>›ã7§ÒÐó|>‘Éf€QS ÄÉðg¶EL—A=,¤õ™°vÏBŽã -L:›ày>‡þNå³H„à —Ic¤©ôe„ž°,§?H§¡ÿé,þ›‡¾ü ¤2 ÄSð™aø\"Ë"Í¥€?'Ÿ. je¹4šÓ•~ÀŸ˜wŸà¯à ÔÄ@àOAxd1Ÿo8u>—ѹl{22?æä”'¨+ â@ HØØ—Ï ådšLôö'#“Ødó|R€™GÓ2&!Ê ®Á x`3ü$²‚AÀ<å™4¨ ¢âsø6 ÿgÓ9$ã9`[d\2¯'Ô')Ec¤Ò¥E3“ÉsÂÿÓ`E(—ÙDíðTÓƒ€yà0ýÀöéÉ)œ“f Ì€=9Ò×ixžÃjNÑÒÀƒˆY¡ð„ÏCË ¨âŒ•Cº3‡¦‚Ï‚ÀŸ˜·ËSHYå´9ÄÙ<þ>: xè s…âÙH:Ë#‰N€þÎ =ARŒúÈñ¬xdN=˜o6I‘Êñ0I,`)€VN¥%Ö"…FNôjœ3/N¨u -1ÏçñW0i&U@,®,_0èÐ()6X<؉ÇÑß)Åæ)KâDÌdAê%˜$z1ÑÓóŽ4”™áXükÌŒÅ)ó¿ÍV -²S®uS)üt °ä©„ ôAKËÙ|³0,2`â & O€™9Xh¿ñT?Ó5¢2¢8‹ßoÆà Öù6?.„§)Ë7·:=f&|  ¼¡öÌ#̪}b<ÄbhûÆŒ‘èØ´1aä`½±>3Íl)o „Æ3z|:E tÕ!›j> endobj xref 0 40 0000000003 65535 f -0000000016 00000 n -0000012611 00000 n -0000000004 00000 f -0000000006 00000 f -0000013061 00000 n -0000000007 00000 f -0000000008 00000 f -0000000009 00000 f -0000000010 00000 f -0000000011 00000 f -0000000012 00000 f -0000000016 00001 f -0000012662 00000 n -0000012920 00000 n -0000012951 00000 n -0000000017 00000 f -0000000018 00000 f -0000000019 00001 f -0000000020 00000 f -0000000021 00000 f -0000000022 00000 f -0000000028 00000 f -0000015178 00000 n -0000015252 00000 n -0000015426 00000 n -0000016402 00000 n -0000036718 00000 n -0000000000 00001 f -0000013036 00000 n -0000012733 00000 n -0000012804 00000 n -0000012835 00000 n -0000014504 00000 n -0000013443 00000 n -0000054468 00000 n -0000014617 00000 n -0000014665 00000 n -0000014278 00000 n -0000000162 00000 n -trailer <]>> startxref 54637 %%EOF \ No newline at end of file diff --git a/www/images/source.ai b/www/images/source.ai deleted file mode 100644 index 1b574b7..0000000 --- a/www/images/source.ai +++ /dev/null @@ -1,1323 +0,0 @@ -%PDF-1.5 %âãÏÓ -1 0 obj <>/OCGs[14 0 R 69 0 R 107 0 R 162 0 R 186 0 R 222 0 R 247 0 R 283 0 R 308 0 R 344 0 R 369 0 R 405 0 R]>>/Type/Catalog>> endobj 421 0 obj <>stream - - - - - application/pdf - - - Web - - - - - Adobe Illustrator CS3 - 2010-05-11T12:07:51+01:00 - 2010-05-11T12:41+01:00 - 2010-05-11T12:41+01:00 - - - - 224 - 256 - JPEG - /9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgBAADgAwER AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE 1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp 0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo +DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8A9U4q7FXYq7FXYq7FXYq7 FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7F XYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FX Yq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq6uKurirVcVdXFW 64q6uKuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KurirWKuxVquKurirq4q6 uKt1xV2KurireKuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KtVxV2KtVxVquKuxVrFXYq7 FW64q6uKt1xVvFW64q7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq44q1irROKrcVaJxVotirXLF XcsVdyxVsNirYOKt1xVuuKt1xVvFW8VdirsVdirsVdirsVdirsVdirsVdirsVaxVo4qtxVonFVhO KrS2Kra4q7liruWKt8sVXBsVXBsVXA4quBxVsHFW8VbxV2KuxV2KuxV2KuxV5TbefvOd1y+riOTh TlxiG1enf2xVX/xh5+/3yn/Iof1xV3+MPP3++U/5FD+uKu/xh5+/3yn/ACKH9cVaPnDz9/vlP+RQ /rirX+MPP3++U/5FD+uKtHzf5+/3yv8AyKX+uKtHzh59/wB8r/yKX+uKrD5w8+/75T/kUv8AXFVp 84efP98r/wAih/XFVv8AjXzyn2rZHr4xE/8AESMVXx/mXrsBBvtNQp34iSI/e3PFWT6L500nVGEI Jtro9IZafEfBGGx+XXFU+54q2HxVcHxVeGxVerYqqBsVbGKrgcVbGKt4q7FXYq7FXYq7FXjvksf7 2f8APP8A43whWTUxQ6mKupirVMVaIxVojFVhxVYcVU2xVTY4qptQggioOxBxVIdZ0tIl+s268VB/ eIOgr3GBKeeVvOzqyWWqyVQ7RXbHceAkPh/lff7Ks6WT3xVUV8VVFbFVRWxVUVsVVAcVXDFWxiq4 Yq7FXYq7FXYq7FXj/kkf72/88v8AjfCFZPTFDqYq6mKtUxVbTFWiMVUyMVWMMVUnxVRbFVjHFVKR Q6MjCqsCCPY4qk+i6LHqF1d6ezcLpEL28nbkhoVI8GBwJTfQfMd5o9x+itYDLDHRY3O5j8Nx1Tw8 MVZ3HKrqGVgysAVYGoIPfFVZHxVVVsVVlOKqinFVQHFVwxVvFW8VdirsVdirsVeQeSB/vb/zy/43 whWU0xQ6mKuIxVaRirRGKtMMVUiMVU2GKqL4qotiqk2KrCcVQ2iN6PnS1PaVuJH+vGV/XgSzHzJ5 attUgIYcLhB+6mA3HsfEYqxLSNbv/L14dM1NWNqD8J3PAH9pPFD4fx2KrPbeeOWNZInDxuKq6moI 9iMVRKNiqsjYqrKcVVFOKrxirYxVcMVdirsVdirsVeQ+Rh/vb/zy/wCN8IVldMUOpirVMVaIxVaR irTDFVIjfFVNxiqg4xVRcYqotiqw4qgrQ8fN+lkCtZoQQPeSmBL1qaEEYqx/zB5etdTtjFMKMu8c o+0p9v4jCrC9O1PUvK999SvlL2LtXbfb+eM/rGBXoFndQXMEdxbuJIZBVHXocVRaHFVdTiqopxVU GKrhirYxVvFXYq7FXYq8j8iD/e7/AJ5f8b4VZXTFDqYq6mKtUxVaRirTLiqmwxVScYqoOMVUHXfF Ki64qsIxQlt9pJup/V9XhsFpxr0+kYpUk0e9j/ubtlpsKcl/UcCq6f4pg/utRkYfy+q5H3Ntiqlq F/5huLcw6hCLmMbq5QFlP8waOn44qp+XPMl1o1xQ1ks3P76Cvf8AmWvRv14q9S03ULS/tUubWQSR P0I6gjqCOxxVHJiqquKqoxVsYquxVvFXYq7FXYq8k8hD/e7/AJ5f8b4VZbTFDqYq6mKtEYqtIxVo jbFVNlxVTZa4qouuKqDriqiy4pUyuKrSuKuC4quVcUKqjFKldaTZ3ikSoA56SLsw+n+uKoPyxe3O h+Yl0+Vi1tdMI28CX2jcDsa7HAr09MVVVxVUGKrhiq7FWxirsVdirsVeTeQB/vf/AM8v+N8VZdTC h1MVdTFXEYqtK4q1TFVjLiqmVxVRdMVUmTFKi8eKFMpiq0x4q0I8VXBMVVETFVZVxVjXmwenf2kq 7SFaL81aop/wWBL1hMVVVxVUGKrhiq7FWxirsVdirsVeT/l8P97/APnj/wAb4qzCmFDqYq6mKupi q3jirRGKrSuKrGTFVJkxSptHihSaP2xSpmP2xVaY8UNeniq4R4qvVMUqipihi/nNf9N075t/xJcC XrCjFVRRiqoOmKtjFV2KtjFXYq7FXYq8o/Lwf8dD/nj/AMb4qzKmFXUxV1MVdTFWqYqtK4q1TFVp XFVNkxVYyYqsZMVWGPFVhj9sVd6eKtiP2xVcI8VXqmKsU86rS+075t/xJcCvVlGKqijFV2Krhire Kt4q7FXYq7FXlX5dD/jof88f+N8VZnTCrqYq6mKupirXHFWuOKtFcVapiq0piqwpiqwpiq0x4q16 eKtcPbFW+HtirYTFVwTFWI+eF/07Tfm3/ElwK9VAxVcBiq4Yq2MVbGKt4q7FXYq7FXlf5cD/AI6P /PH/AJmYqzSmFXUxV1MVdTFXUxVxXFWuOKrSuKtccVa44qh7u6s7VOdzMkK+LkCvyHfFUPpmpWmp RSS2vIxxv6ZZhSpABqPvxVGFPbFWuHtiruHtirYTFWwmKsP89rS/0z5t/wASXAr1MDFW8VXAYq3i rYxV2KuxV2KuxV5b+Wwr+kf+eP8AzMxVmtMKupirqYq6mKupirqYq0VxV3HFWiuKrJYucbJUqGBX kpoRUUqD44q8u8x6TPpmomGWUziRfUjlavIqSR8Ve4pgVl3kOKmhs1PtzOfnso/hirI+OKtcMVdw xVvjiruOFWGefRS+0z5t/wASXAr1KmKtgYq3irYxV2KuxV2KuxV2KvLvy1H/AB0f+eP/ADMxVm9M KupirqYq6mKupirqYq6mKu44q1xxVrjirAvzGUC9sz3Mbb/7LAqeeRkP+Hoj/M8hH/BUxVP+OFXc cVdxxV3HFXccVYX5/FL/AEz/AGX/ABJcCvUKYq3irqYq3irsVdirsVdirsVeYflmP+Ol/wA8P+Zm Ks4pirqYq6mKupirqYq6mKupirqYq6mKtcRirAfzJFL2y/4xt/xLFU/8joR5atiejNIR/wAjGH8M VT7iMVdxGKu4jFXcRiruIxVhH5hD/T9L/wBl/wASXFXp9MVbpirsVdirsVdirsVdirsVeY/liP8A jpf88P8AmZirOaYVdTFXUxV1MVdTFXUxV1MVdTFXUxV1MVef/mWP9Nsv+Mbf8SwKi9F8zWWl+V7K EKbm+cS+nax7t/evu3WgxVL77zN53IMwtpLODrUW54092kVsVXaT+Yd9HMqakizQE/FKi8XX3oPh OKvQYniliSWNg8cgDIw6EEVBGKruIwq7iMVYN+Yg/wBP0v8A2f8AxJcCvTsVdirsVdirsVdirsVd irsVeZfleP8Ajp/88P8AmZirO6Yq6mKupirqYq6mKupirqYq6mKupirqYq88/M1v9yNmlOkJNfmx /piqefl/p1vDoMd2EHr3LOWkp8VFYoFr4fDirJ6Yq81/MPSraz1KC4t0Ea3SsXVRQc0IqfpDDFWT +QLp7jy6isam3keIH22Yf8TxVkdMVdTFWC/mMP8AT9K/2f8AxJMVemYq7FXYq7FXYq7FXYq7FXYq 80/K0f8AHT/54f8AMzFWeUxV1MVdTFXUxV1MVdTFXUxV1MVdTFXUxV5t+ZrD9MWq9xbgn6Xb+mKs u8koF8r2IHdXP3yMcVTumKsD/NIf8cz/AJ7/APMvFUf+WdDoVwO/1ptv+eceKstpirqYqwP8yB/u Q0r/AGf/ABJMVel4q7FXYq7FXYq7FXYq7FXYq81/Ksf8dT/nh/zMxVn1MVdTFXUxV1MVdTFXUxV1 MVUL29tLKBri7lWGFdi7mgqew8Tiqjpus6Xqas1jcrPw+0oqGHzVgDiqNpiry/8AMp+XmGNf5LdF /wCGc/xxVmvksf8AOsWH+o3/ABNsVTumKsB/NQf8cv8A57/8y8VRf5YD/cTd/wDMR/xouKszpirq YqwH8yh/uQ0n/Z/8STFXpWKuxV2KuxV2KuxV2KuxV2KvN/ypH/HU/wCeH/MzFWf0xV1MVdTFXUxV 1MVdTFXUxVgH5pxXVLCQVNoOYNOgkNKV+Y6YqlH5cxXb+Y1eEH0Y43+sntxIooP+zpir0TW9d0/R rdZ7wvxc8UVF5EkCtOwH0nFXknmHWG1fVZr0p6aPRY06kIooK+/fFWX+SfOWnwWNvpN5yjlRikMo HJWDsSAabg1anTFWdyyRxRPLIeMcalnbwCipOKvK/PXmSy1m5tlsuTQWyv8AvGXjyZyK0B3pRR1x VU8k+bbPRo57a8RzDM4dZIwDxNKGo222HTFXptndQXlrFdQMWhmUNGxBWoPsaHFVamKsA/Mwf7kN J/2f/EkxV6RirsVdirsVdirsVdirsVdirzj8px/x1f8Anh/zMxV6DTFXUxV1MVdTFXUxV1MVdTFV ksEU0bRzIskbbMjgMpHuDiqy2sbS0T07WCOCMmpSJVQV+SgYqqlQQQRUHYg4q4KAKAUA6DFWjGhY MVBYdGpuMVXUxVasSICEUKDuaCmKrqYq6mKupirz78zR/uQ0n/Z/8STFXo+KuxV2KuxV2KuxV2Ku xV2KvOfylH/HV/6N/wDmZir0KmKupirqYq6mKupirqYq6mKupirqYq6mKupirqYq6mKupirqYq6m Kupirz38zx/uQ0j/AGf/ABJMVejYq7FXYq7FXYq7FXYq7FXYq8d8mebLfy/9c9a3ef6z6fHgQKen zrWv+virJv8AlbGnf8sEv/BLirv+Vsad/wAsEv8AwS4q7/lbGnf8sEv/AAS4q7/lbGnf8sEv/BLi rv8AlbGnf8sEv/BLirv+Vsad/wAsEv8AwS4q7/lbGnf8sEv/AAS4q7/lbGnf8sEv/BLirv8AlbGn f8sEv/BLirv+Vsad/wAsEv8AwS4q7/lbGnf8sEv/AAS4q7/lbGnf8sEv/BLirv8AlbGnf8sEv/BL irv+Vsad/wAsEv8AwS4q7/lbGnf8sEv/AAS4q7/lbGnf8sEv/BLirv8AlbGnf8sEv/BLirG/NXmm 31+9sHhgeAW5IYOQa8mXw+WKvYMVdirsVdirsVdirsVdirsVQ/6N07/llh/5Fr/TFXfo3Tv+WWH/ AJFr/TFXfo3Tv+WWH/kWv9MVd+jdO/5ZYf8AkWv9MVd+jdO/5ZYf+Ra/0xV36N07/llh/wCRa/0x V36N07/llh/5Fr/TFXfo3Tv+WWH/AJFr/TFXfo3Tv+WWH/kWv9MVd+jdO/5ZYf8AkWv9MVd+jdO/ 5ZYf+Ra/0xV36N07/llh/wCRa/0xV36N07/llh/5Fr/TFXfo3Tv+WWH/AJFr/TFXfo3Tv+WWH/kW v9MVd+jdO/5ZYf8AkWv9MVd+jdO/5ZYf+Ra/0xV36N07/llh/wCRa/0xVw07Twai1ir/AMY1/piq IxV2KuxV2KuxV2KuxV2KuxV//9k= - - - - - - uuid:09DCA8B2865EDF118B77FD523B43407A - uuid:072cbc4c-0a7a-8240-8a17-4d6b953fe2d1 - - uuid:48c9a86e-fee9-9940-835a-50314be91278 - uuid:71583DE9423FDF119697BF3D5A982C1E - - - - Document - Web - - - 1 - True - False - - 128.000000 - 128.000000 - Pixels - - - - - GaramondPremrPro - Garamond Premier Pro - Regular - Open Type - Version 1.014;PS 001.000;Core 1.0.38;makeotf.lib1.6.6565 - False - GaramondPremrPro.otf - - - - - - Cyan - Magenta - Yellow - Black - - - - - - Default Swatch Group - 0 - - - - White - RGB - PROCESS - 255 - 255 - 255 - - - Black - RGB - PROCESS - 0 - 0 - 0 - - - RGB Red - RGB - PROCESS - 255 - 0 - 0 - - - RGB Yellow - RGB - PROCESS - 255 - 255 - 0 - - - RGB Green - RGB - PROCESS - 0 - 255 - 0 - - - RGB Cyan - RGB - PROCESS - 0 - 255 - 255 - - - RGB Blue - RGB - PROCESS - 0 - 0 - 255 - - - RGB Magenta - RGB - PROCESS - 255 - 0 - 255 - - - R=193 G=39 B=45 - RGB - PROCESS - 193 - 39 - 45 - - - R=237 G=28 B=36 - RGB - PROCESS - 237 - 28 - 36 - - - R=241 G=90 B=36 - RGB - PROCESS - 241 - 90 - 36 - - - R=247 G=147 B=30 - RGB - PROCESS - 247 - 147 - 30 - - - R=251 G=176 B=59 - RGB - PROCESS - 251 - 176 - 59 - - - R=252 G=238 B=33 - RGB - PROCESS - 252 - 238 - 33 - - - R=217 G=224 B=33 - RGB - PROCESS - 217 - 224 - 33 - - - R=140 G=198 B=63 - RGB - PROCESS - 140 - 198 - 63 - - - R=57 G=181 B=74 - RGB - PROCESS - 57 - 181 - 74 - - - R=0 G=146 B=69 - RGB - PROCESS - 0 - 146 - 69 - - - R=0 G=104 B=55 - RGB - PROCESS - 0 - 104 - 55 - - - R=34 G=181 B=115 - RGB - PROCESS - 34 - 181 - 115 - - - R=0 G=169 B=157 - RGB - PROCESS - 0 - 169 - 157 - - - R=41 G=171 B=226 - RGB - PROCESS - 41 - 171 - 226 - - - R=0 G=113 B=188 - RGB - PROCESS - 0 - 113 - 188 - - - R=46 G=49 B=146 - RGB - PROCESS - 46 - 49 - 146 - - - R=27 G=20 B=100 - RGB - PROCESS - 27 - 20 - 100 - - - R=102 G=45 B=145 - RGB - PROCESS - 102 - 45 - 145 - - - R=147 G=39 B=143 - RGB - PROCESS - 147 - 39 - 143 - - - R=158 G=0 B=93 - RGB - PROCESS - 158 - 0 - 93 - - - R=212 G=20 B=90 - RGB - PROCESS - 212 - 20 - 90 - - - R=237 G=30 B=121 - RGB - PROCESS - 237 - 30 - 121 - - - R=199 G=178 B=153 - RGB - PROCESS - 199 - 178 - 153 - - - R=153 G=134 B=117 - RGB - PROCESS - 153 - 134 - 117 - - - R=115 G=99 B=87 - RGB - PROCESS - 115 - 99 - 87 - - - R=83 G=71 B=65 - RGB - PROCESS - 83 - 71 - 65 - - - R=198 G=156 B=109 - RGB - PROCESS - 198 - 156 - 109 - - - R=166 G=124 B=82 - RGB - PROCESS - 166 - 124 - 82 - - - R=140 G=98 B=57 - RGB - PROCESS - 140 - 98 - 57 - - - R=117 G=76 B=36 - RGB - PROCESS - 117 - 76 - 36 - - - R=96 G=56 B=19 - RGB - PROCESS - 96 - 56 - 19 - - - R=66 G=33 B=11 - RGB - PROCESS - 66 - 33 - 11 - - - - - - Web Color Group - 1 - - - - R=236 G=28 B=36 - RGB - PROCESS - 236 - 28 - 36 - - - R=0 G=169 B=157 - RGB - PROCESS - 0 - 169 - 157 - - - R=102 G=45 B=145 - RGB - PROCESS - 102 - 45 - 145 - - - R=139 G=146 B=152 1 - RGB - PROCESS - 139 - 146 - 152 - - - - - - Grayscale - 1 - - - - K=100 - GRAY - PROCESS - 255 - - - K=90 - GRAY - PROCESS - 229 - - - K=80 - GRAY - PROCESS - 204 - - - K=70 - GRAY - PROCESS - 178 - - - K=60 - GRAY - PROCESS - 153 - - - K=50 - GRAY - PROCESS - 127 - - - K=40 - GRAY - PROCESS - 101 - - - K=30 - GRAY - PROCESS - 76 - - - K=20 - GRAY - PROCESS - 50 - - - K=10 - GRAY - PROCESS - 25 - - - K=5 - GRAY - PROCESS - 12 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - endstream endobj 2 0 obj <> endobj 14 0 obj <> endobj 69 0 obj <> endobj 107 0 obj <> endobj 162 0 obj <> endobj 186 0 obj <> endobj 222 0 obj <> endobj 247 0 obj <> endobj 283 0 obj <> endobj 308 0 obj <> endobj 344 0 obj <> endobj 369 0 obj <> endobj 405 0 obj <> endobj 406 0 obj [/View/Design] endobj 407 0 obj <>>> endobj 370 0 obj [/View/Design] endobj 371 0 obj <>>> endobj 345 0 obj [/View/Design] endobj 346 0 obj <>>> endobj 309 0 obj [/View/Design] endobj 310 0 obj <>>> endobj 284 0 obj [/View/Design] endobj 285 0 obj <>>> endobj 248 0 obj [/View/Design] endobj 249 0 obj <>>> endobj 223 0 obj [/View/Design] endobj 224 0 obj <>>> endobj 187 0 obj [/View/Design] endobj 188 0 obj <>>> endobj 163 0 obj [/View/Design] endobj 164 0 obj <>>> endobj 108 0 obj [/View/Design] endobj 109 0 obj <>>> endobj 70 0 obj [/View/Design] endobj 71 0 obj <>>> endobj 15 0 obj [/View/Design] endobj 16 0 obj <>>> endobj 368 0 obj [405 0 R 369 0 R] endobj 5 0 obj <>/ArtBox[-0.333008 -0.000976562 127.667 127.999]/Group 413 0 R/MediaBox[0.0 0.0 128.0 128.0]/Thumb 420 0 R/TrimBox[0.0 0.0 128.0 128.0]/Resources<>/Shading<>/ColorSpace<>/Font<>/ProcSet[/PDF/Text]/Properties<>/ExtGState<>>>/Type/Page/LastModified(D:20100511124100+01'00')>> endobj 412 0 obj <>stream -H‰¼TËnSA ÝÏWx ‹ëx^žñ¶ºªPÕHtÇA#”€J¥¢ü=Çs“´Ia„XäfìÛããsfñþœ×çBgç‚vÖÜ(Jg+F›ŒSKÇúàÀ_ï°£dn¥¼v4cµ½£—D=±”JnJ3ê…%ÑS8¶ýxâ•ze3%3n¹Rol•¶áÈ\e2eëvÜsFÂ:²áż¨rkŽþ_PüØÆñÂ&s»]+5á–vpÔBŠåÙüNkǯ—þp ç6| o@yqu+tÿ„:@Ò*ÙâË¥*W±¦UwÀJ¯FŸ6á쎷+¡Ç]ÞÑM¸A:¡˜úøMþùñy”Vº -‰~R¡k:Ô| ϲe`Y¬yvßØ„ 1‘±dÇtŠmEY«c:%ᄉ£W¯™7 ÷4¤Sª˜_¦9æBSŽ,Ø@Œ™C0Ô¢eïX“£¥^L{mwNu61NšÀ©”9¯Â–¼zâÚ#pð{;Û° -·& Å»ÐÅ÷0ƒ×Á¾l"ÅÑ|”y5äd´¬NÎŒ¹>…ÇLWq‡‚ -ÿ›®¸EjqHÊPü¸—í©7/E¬ãø\æEºS67 ’³vÈæ7«éy‰ô½ÄfŠÌ\i½ÅøLîø/Ƚk%ν€'vCÒuŠKŽ&ÌSÙú–æyOGž'gš6 âˆHì²tVC„ÔùìÔsGÆ -‡.jƒ>”#0‡×∠|†`ºƒ@ÁSÁ>± Yk‡á’™0GTÜ®8œƒ®8v¥£[í9~yG|1?éq~Òÿ áÙr xo±Œºå—P|XÚûµBô ,È®VØËMxë·Ë¯ár9W¾ ¿ÝA endstream endobj 413 0 obj <> endobj 420 0 obj <>stream -8;W"[]+G#c#Xc(C+.O^L_m#/Pj(Dp1NpoA%\^OuH3Y1L=Y_!oo -mPJK.g:(*o;#XWOB:^J]`GF?2!!U*4H2~> endstream endobj 372 0 obj <> endobj 411 0 obj <> endobj 409 0 obj <> endobj 410 0 obj <> endobj 417 0 obj <>stream -H‰|OLÓPÇ[þŒ‰"Ë ÙH÷Œ &&žHÐDåb&^È -í ­ðZ7& Ýƶvc+cc2!Ô QÀ‚‰31,r1cb‚ñàƒþ9¼b9Ø’˜xò^¾ŸßïåûIŽÕTa8Ž7_uövÞt\¸ABÒÃz)¤=ÐY}gWl¸Ò\£´˜,*£´ÔŸ¯E¯ÑÎéòa[V…ã¾\cGâÁ¥ööË “bûià p<íá@—w€…£,$yšj## [Ênš£¡OþÝÌÐ0 ~HK$€ô £5Aš<$)ÚCÂaÀê›Ðý)`¼@ë½^F''¯ 9@z©6­…=¶ °w½›Ì%;Ÿ fÄRb+‰Î¤_Îl,,¦RFI*-—m/Vƒã‹öüÔìpu"¥V‰ãDœ1Þ±¨uz6öˆX“SE›yg3/lÚ–³R.Éø%ûXf*ûÄšx'î%ÞËámÿSM¾æZºckðˇY]‘æQiF]” ê†ü=_GÜ;Q(Ȧúõúý“ëK&ÓþCÓ©? ñ73ú endstream endobj 391 0 obj [/ICCBased 392 0 R] endobj 392 0 obj <>stream -H‰œ–yTSwÇoÉž•°Ãc [€°5la‘QIBHØADED„ª•2ÖmtFOE.®c­Ö}êÒõ0êè8´׎8GNg¦Óïï÷9÷wïïÝß½÷ó '¥ªµÕ0 Ö ÏJŒÅb¤  - 2y­.-;!à’ÆK°ZÜ ü‹ž^i½"LÊÀ0ðÿ‰-×é @8(”µrœ;q®ª7èLöœy¥•&†Qëñq¶4±jž½ç|æ9ÚÄ -V³)gB£0ñiœWו8#©8wÕ©•õ8_Å٥ʨQãüÜ«QÊj@é&»A)/ÇÙgº>'K‚óÈtÕ;\ú” Ó¥$ÕºF½ZUnÀÜå˜(4TŒ%)ë«”ƒ0C&¯”阤Z£“i˜¿óœ8¦Úbx‘ƒE¡ÁÁBÑ;…ú¯›¿P¦ÞÎӓ̹žAü om?çW= -€x¯Íú·¶Ò-Œ¯Àòæ[›Ëû0ñ¾¾øÎ}ø¦y)7ta¾¾õõõ>j¥ÜÇTÐ7úŸ¿@ï¼ÏÇtÜ›ò`qÊ2™±Ê€™ê&¯®ª6ê±ZL®Ä„?â_øóyxg)Ë”z¥ÈçL­UáíÖ*ÔuµSkÿSeØO4?׸¸c¯¯Ø°.òò· åÒR´ ßÞô-•’2ð5ßáÞüÜÏ ú÷Sá>Ó£V­š‹“då`r£¾n~ÏôY &à+`œ;ÂA4ˆÉ 䀰ÈA9Ð=¨- t°lÃ`;»Á~pŒƒÁ ðGp| ®[`Lƒ‡`<¯ "A ˆ YA+äùCb(Š‡R¡,¨*T2B-Ð -¨ꇆ¡Ðnè÷ÐQètº}MA ï —0Óal»Á¾°ŽSàx ¬‚kà&¸^Á£ð>ø0|>_ƒ'á‡ð,ÂG!"F$H:Rˆ”!z¤éF‘Qd?r 9‹\A&‘GÈ ”ˆrQ ¢áhš‹ÊÑ´íE‡Ñ]èaô4zBgÐ×Á–àE#H ‹*B=¡‹0HØIøˆp†p0MxJ$ùD1„˜D, V›‰½Ä­ÄÄãÄKÄ»ÄY‰dEò"EÒI2’ÔEÚBÚGúŒt™4MzN¦‘Èþär!YKî ’÷?%_&ß#¿¢°(®”0J:EAi¤ôQÆ(Ç()Ó”WT6U@ æP+¨íÔ!ê~êêmêæD ¥eÒÔ´å´!ÚïhŸÓ¦h/èº']B/¢éëèÒÓ¿¢?a0nŒhF!ÃÀXÇØÍ8ÅøšñÜŒkæc&5S˜µ™˜6»lö˜Iaº2c˜K™MÌAæ!æEæ#…åÆ’°d¬VÖë(ëk–Íe‹Øél »—½‡}Ž}ŸCâ¸qâ9 -N'çÎ)Î].ÂuæJ¸rî -î÷ wšGä xR^¯‡÷[ÞoÆœchžgÞ`>bþ‰ù$á»ñ¥ü*~ÿ ÿ:ÿ¥…EŒ…ÒbÅ~‹ËÏ,m,£-•–Ý–,¯Y¾´Â¬â­*­6X[ݱF­=­3­ë­·YŸ±~dó ·‘ÛtÛ´¹i ÛzÚfÙ6Û~`{ÁvÖÎÞ.ÑNg·Åî”Ý#{¾}´}…ý€ý§ö¸‘j‡‡ÏþŠ™c1X6„Æfm“Ž;'_9 œr:œ8Ýq¦:‹ËœœO:ϸ8¸¤¹´¸ìu¹éJq»–»nv=ëúÌMà–ï¶ÊmÜí¾ÀR 4 ö -n»3Ü£ÜkÜGݯz=Ä•[=¾ô„=ƒ<Ë=GTB(É/ÙSòƒ,]6*›-•–¾W:#—È7Ë*¢ŠÊe¿ò^YDYÙ}U„j£êAyTù`ù#µD=¬þ¶"©b{ųÊôÊ+¬Ê¯: !kJ4Gµm¥ötµ}uCõ%—®K7YV³©fFŸ¢ßY Õ.©=bàá?SŒîÆ•Æ©ºÈº‘ºçõyõ‡Ø Ú† žkï5%4ý¦m–7Ÿlqlio™Z³lG+ÔZÚz²Í¹­³mzyâò]íÔöÊö?uøuôw|¿"űN»ÎåwW&®ÜÛe֥ﺱ*|ÕöÕèjõê‰5k¶¬yÝ­èþ¢Ç¯g°ç‡^yïkEk‡Öþ¸®lÝD_p߶õÄõÚõ×7DmØÕÏîoê¿»1mãál {àûMśΠnßLÝlÜ<9”úO¤[þ˜¸™$™™üšhšÕ›B›¯œœ‰œ÷dÒž@ž®ŸŸ‹Ÿú i Ø¡G¡¶¢&¢–££v£æ¤V¤Ç¥8¥©¦¦‹¦ý§n§à¨R¨Ä©7©©ªª««u«é¬\¬Ð­D­¸®-®¡¯¯‹°°u°ê±`±Ö²K²Â³8³®´%´œµµŠ¶¶y¶ð·h·à¸Y¸Ñ¹J¹Âº;ºµ».»§¼!¼›½½¾ -¾„¾ÿ¿z¿õÀpÀìÁgÁãÂ_ÂÛÃXÃÔÄQÄÎÅKÅÈÆFÆÃÇAÇ¿È=ȼÉ:ɹÊ8Ê·Ë6˶Ì5̵Í5͵Î6ζÏ7ϸÐ9кÑ<ѾÒ?ÒÁÓDÓÆÔIÔËÕNÕÑÖUÖØ×\×àØdØèÙlÙñÚvÚûÛ€ÜÜŠÝÝ–ÞÞ¢ß)߯à6à½áDáÌâSâÛãcãëäsäüå„æ æ–çç©è2è¼éFéÐê[êåëpëûì†ííœî(î´ï@ïÌðXðåñrñÿòŒóó§ô4ôÂõPõÞömöû÷Šøø¨ù8ùÇúWúçûwüü˜ý)ýºþKþÜÿmÿÿ ÷„óû endstream endobj 375 0 obj <> endobj 402 0 obj <> endobj 373 0 obj [/ICCBased 392 0 R] endobj 403 0 obj <> endobj 404 0 obj <> endobj 376 0 obj <> endobj 377 0 obj <> endobj 401 0 obj <>/ColorSpace<>/ProcSet[/PDF/ImageC/ImageI]/ExtGState<>>>/BBox[31.5 143.5 139.5 35.5]>>stream -q -/GS0 gs -108 0 0 108 31.5 35.5 cm -/Im0 Do -Q - endstream endobj 382 0 obj <> endobj 397 0 obj <> endobj 394 0 obj <> endobj 393 0 obj <>/ProcSet[/PDF/ImageB]/ExtGState<>>>/BBox[31.5 143.5 139.5 35.5]>>stream -q -/GS0 gs -108 0 0 108 31.5 35.5 cm -/Im0 Do -Q - endstream endobj 395 0 obj [0.0 0.0 0.0] endobj 390 0 obj <> endobj 387 0 obj <> endobj 389 0 obj <>/Height 108/Type/XObject>>stream -H‰ì׋–Ô6 `)ÀrmiKK¯(Ðåý0î$±ä_¶ä8i9œž“™™ÌÄÉ·¿lçÂtêÁ×f×f×f×f×f_u³Ò0}a­môÅ4·/¿¦ÿ\ Ösþý Ø×Øû–@;ö4v·ï ã^¬q¯ O†õB«Ó0mÚa/v¡iÅ°g46Ÿ­˜M‰q¯§Á;ðëNùa^(o#œ?w-Ãm;~´î[^£ž§,¿ZŽï2Ty;\¨ÈãøÎ`jîpÞ\2˜ÏñãuÏIÞã‡wÀL@mô¤8É+éQM1ˆX=Íšw¹vÞ¶£ÆÛ xžŠñv¸ŽOì¾uwü­ª 1×Ü[,k¦–ü ZUÀ˜ëh€i5)Ÿ³ùe¡´³aL“hÛ›jŽ¿Ë˜ †\}D2Ñ$Y]Ì[¿ýP°‚îr¾ý•Êåv¯,ÖpÚ‰Æ.—ø§\?ÁÆ8W[›*nmø†Q5{Q¸]mª¸œíí–m†ö]Ž›/F››Êàw¤ÑfûáÍ ’•™P[Wß²ýµì5# -´õµÓTòåp‰?è ™ó3ƒn\ÓRWÆ ¤Tkó~¸-ƒ™ËÚ'Ôf­§:OiS ‡¥Lü·høÄ9~Z+ÕÌsà6JîeÌn®JéÊf¾ùš†Ëw¥|OÛ˜œ‘Óq•r\Ë=—ûí³ŒI'[\ÊàX²Î€2r¶¬Ý&¦”,gçÜ1Êä.µ¼}•³Ü¢Q]I«9\ÿ8¹p¦ãd˜¨Ñf{l>®Á (S€¡ßª1yLëÊ-ÜöÏÜS&Žt\p]R”0»áصÍ7œxôÍr¡F¦”2䤳Kà¸\aG5ÂRšA²iŸ¨t\mPÃŽÓRâ9Núí£jîY`\«KÙj·Uä®cÖ¡rZk®ðÌÙ{YÿžHÇI}ö–Óé¾¥„k¼Úþ™wrg4÷ÚÄÓ ‰’IîO"Ô$¢ÞÔª›¸¢\ÿ—7Éãà„3¦™p§w¬¿o÷¡Þõyçn ÖZ¯Lâ_‰dœ8V0HMÂÕ7VÒmë=NËQmWƒp6•¹MüzÛrÆ:¤•Z*GÐmÄ?R.¥¹EÅ›œý« 6œr#~%ƒ@°¢h®Öp*I2âïIK ÁÄ>¤Õ!Fü’ewÆ£n4_“pT²¼üÎß’†SÍP4ÃaÄø—¦ê©ØÍvXËßsi©~ Ý-v8ü\žUšý ¢…ZÅ™¿E{j4çÏÃb-¯©=Ñž€f•¸Ž= ¸ -[´Ç¨ÕÃ0ŠÖÓdxeùN[gB9XW3œÁˆ•V>ãa}ÍñD|hš9‘Îhºž«¯ªÙ½§úçcZãåll£ºz>6 A›Ò4'N`i¦Uj‘‚å3ZÕŽ+-…_NjUSŽ¶ëY‡4lh}먦[xÚuJ#OþvmvmvmvmvmöÿßìáÖ8à endstream endobj 398 0 obj [/Indexed 391 0 R 1 399 0 R] endobj 399 0 obj <>stream -ÿÿÿ endstream endobj 400 0 obj <>stream -H‰ì×1Ã@CQçþ—N—&c¯´ÌâÑ¿À+(€ëJ)¥tjŸ_]ÎfïÚåÝJvîYrr€dÒ@É¡(Q«IV¦±HŒ¢8¥Œ·Ê˜@U5jµ*˜JU0Ý‚1cã, óP6ÑB0›µÆ|T«µÄ¦Z+¬Ñ²R ,–ŽÅ:‹µ{«• ³Fìkòn>Æzë=ÚjM} VTësiÄ-€²aeÂ-Œò`¨eÀ`JÇ -”Œ•, «QV¥°XŒ¡H¤—ÊšFU4Y‚9„pFéÙ³C7à6'¥”Ò¤¾ :ž] endstream endobj 418 0 obj [/Indexed/DeviceRGB 255 419 0 R] endobj 419 0 obj <>stream -8;X]O>EqN@%''O_@%e@?J;%+8(9e>X=MR6S?i^YgA3=].HDXF.R$lIL@"pJ+EP(%0 -b]6ajmNZn*!='OQZeQ^Y*,=]?C.B+\Ulg9dhD*"iC[;*=3`oP1[!S^)?1)IZ4dup` -E1r!/,*0[*9.aFIR2&b-C#soRZ7Dl%MLY\.?d>Mn -6%Q2oYfNRF$$+ON<+]RUJmC0InDZ4OTs0S!saG>GGKUlQ*Q?45:CI&4J'_2j$XKrcYp0n+Xl_nU*O( -l[$6Nn+Z_Nq0]s7hs]`XX1nZ8&94a\~> endstream endobj 414 0 obj [/ICCBased 392 0 R] endobj 361 0 obj <> endobj 362 0 obj <> endobj 363 0 obj <>stream -%!PS-Adobe-3.0 %%Creator: Adobe Illustrator(R) 13.0 %%AI8_CreatorVersion: 13.0.0 %%For: (Aleks Kissinger) () %%Title: (source.ai) %%CreationDate: 5/11/10 12:41 PM %%BoundingBox: 155 156 356 357 %%HiResBoundingBox: 155.167 156.499 355.167 356.499 %%DocumentProcessColors: Cyan Magenta Yellow Black %AI5_FileFormat 9.0 %AI12_BuildNumber: 406 %AI3_ColorUsage: Color %AI7_ImageSettings: 0 %%RGBProcessColor: 0 0 0 ([Registration]) %AI3_Cropmarks: 191.167 192.499 319.167 320.499 %AI3_TemplateBox: 256 256 256 256 %AI3_TileBox: -140.833 -49.501 651.167 562.499 %AI3_DocumentPreview: None %AI5_ArtSize: 128 128 %AI5_RulerUnits: 6 %AI9_ColorModel: 1 %AI5_ArtFlags: 0 0 0 1 0 0 1 0 0 %AI5_TargetResolution: 800 %AI5_NumLayers: 2 %AI9_OpenToView: 151.8354 350.8311 3 554 659 18 0 0 416 87 0 0 1 1 1 0 1 %AI5_OpenViewLayers: 77 %%PageOrigin:-210.3003 -310.2988 %AI7_GridSettings: 72 8 72 8 1 0 0.8 0.8 0.8 0.9 0.9 0.9 %AI9_Flatten: 1 %AI12_CMSettings: 00.MS %%EndComments endstream endobj 364 0 obj <>stream -%%BoundingBox: 219 207 331 336 %%HiResBoundingBox: 219.7715 207.0586 331 336 %AI7_Thumbnail: 112 128 8 %%BeginData: 13318 Hex Bytes %0000330000660000990000CC0033000033330033660033990033CC0033FF %0066000066330066660066990066CC0066FF009900009933009966009999 %0099CC0099FF00CC0000CC3300CC6600CC9900CCCC00CCFF00FF3300FF66 %00FF9900FFCC3300003300333300663300993300CC3300FF333300333333 %3333663333993333CC3333FF3366003366333366663366993366CC3366FF %3399003399333399663399993399CC3399FF33CC0033CC3333CC6633CC99 %33CCCC33CCFF33FF0033FF3333FF6633FF9933FFCC33FFFF660000660033 %6600666600996600CC6600FF6633006633336633666633996633CC6633FF %6666006666336666666666996666CC6666FF669900669933669966669999 %6699CC6699FF66CC0066CC3366CC6666CC9966CCCC66CCFF66FF0066FF33 %66FF6666FF9966FFCC66FFFF9900009900339900669900999900CC9900FF %9933009933339933669933999933CC9933FF996600996633996666996699 %9966CC9966FF9999009999339999669999999999CC9999FF99CC0099CC33 %99CC6699CC9999CCCC99CCFF99FF0099FF3399FF6699FF9999FFCC99FFFF %CC0000CC0033CC0066CC0099CC00CCCC00FFCC3300CC3333CC3366CC3399 %CC33CCCC33FFCC6600CC6633CC6666CC6699CC66CCCC66FFCC9900CC9933 %CC9966CC9999CC99CCCC99FFCCCC00CCCC33CCCC66CCCC99CCCCCCCCCCFF %CCFF00CCFF33CCFF66CCFF99CCFFCCCCFFFFFF0033FF0066FF0099FF00CC %FF3300FF3333FF3366FF3399FF33CCFF33FFFF6600FF6633FF6666FF6699 %FF66CCFF66FFFF9900FF9933FF9966FF9999FF99CCFF99FFFFCC00FFCC33 %FFCC66FFCC99FFCCCCFFCCFFFFFF33FFFF66FFFF99FFFFCC110000001100 %000011111111220000002200000022222222440000004400000044444444 %550000005500000055555555770000007700000077777777880000008800 %000088888888AA000000AA000000AAAAAAAABB000000BB000000BBBBBBBB %DD000000DD000000DDDDDDDDEE000000EE000000EEEEEEEE0000000000FF %00FF0000FFFFFF0000FF00FFFFFF00FFFFFF %524C45FDFCFFFDFCFFFDFCFFFDFCFFFDFCFFFDFCFFFDFCFFFDFCFFFD96FF %A8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FDFCFFFDA9FFA8FFFF %FFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8 %FFFFFFA8FDFCFFFD99FFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFF %A8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FD %BBFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FDBDFF %A8FFFFFFA8FFFFFFA8FFFFFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FD8FFF7DA87DA8 %7DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA8 %7D7D7DA87D7D7DA87DA87DA8A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFFFFF %A8FFFFFFA8FD2BFFFD297D527D7D7D527D7DA8A8FFFFFFA8FFFFFFA8FD36 %FF7D7D7DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87D %A87DA87DA87DA87DA87DA87DA87DA8FD047D527D7DFFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFFFFFA8FFFFFFA8FFFFFFA8FD1DFF7D7DFFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8AFA8FFA8A9A8FFA8A9A8FFA8A8A8 %AFFD0EA87D7D7DA8FD3BFF7D7DFD24A884A8A8A87DA8A8A87DA8A8FD047D %A8A8FFA8FFA8FFA8FFA8FFA8FFA8FFFFFFA8FFFFFFA8FD25FF7D7DA8A8AF %A8A8A8AFA8A8A8AFA8A8A8AFA8A8A8A9A8A8A8A9FD1AA87D7D7DA8A8FFFF %FFA8FFFFFFA8FD30FF7C7DFD1EA884A8A8A87DA8A8A87DA87DA87DA87DA8 %7DA87D7D527D527DA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %FFFFA8FFFFFFA8FD1BFF7D7DA8A8FFA8A9A8FFA8A9A8FFA8A9A8FFA8A9A8 %FFA8A8A8FFA8A8A8FFA8A8A8A9FD12A8FD057DA8FFFFA8FFFFFFA8FD30FF %7D7DFD26A87DA8A8A87DA87EA87DA87EA87D7DA87D527DA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFFFFFA8FD23FF7D7DA9A8A8A8FFA8A8A8FFA8A8A8FF %A8A8A8FFA8A8A8FFA8A8A8AFFD16A87EA8A87D7DA8A87D7DA8A8FFA8FFFF %FFA8FFFFFFA8FD2AFF7D7DFD20A87EA8A8A87DA87EA87DA87DA87DA87DA8 %7DA87D7D7DFFA87D527DA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %FFFFA8FFFFFFA8FD19FF7D7DFFA8FFA8FFA8FFA8FFA8FFA8FFA8AFA8FFA8 %AFA8FFA8A9A8FFA8A8A8FFFD16A87DA8FFFFA8A87D7DA8FFFFFFA8FD2EFF %7D7DA8A9FD22A87EA8A8A87DA87EA87DA87DA87DA87D7D7DFFA8FFA87D52 %7DA8FFA8FFA8FFA8FFA8FFA8FFA8FFFFFFA8FD21FF7D7DA8A8FFA8A9A8FF %A8A9A8FFA8A9A8FFA8A8A8FFA8A8A8FFA8A8A8A9FD12A87DA8A8A87DA87D %7DA8FFFFFFA8A87D7DA8FFA8FFA8FFFFFFA8FD28FF527DFD22A87EA8A8A8 %7DA87DA87DA87DA87DA87DA87D7D7DA8A8FFA8FFA87D527D7DFFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFFFFFA8FFFFFFA8FD17FF7D7DAFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8AFA8FFA8A8A8FFFD14A87D7D %A8FD05FFA8A87D7DA8FFA8FD2CFF7D7DA8A8A8A9A8A8A8A9A8A8A8A9FD1A %A87EA8A8A87DA87DA87DA87DA87D7E7DA8FD04FFA8FFA8A8527D7DFFA8FF %A8FFA8FFA8FFA8FFFFFFA8FD1FFF7D7DFFA8FFA8FFA8FFA8FFA8FFA8FFA8 %A9A8FFA8A9A8FFA8A9A8FFA8A8A8A9FD0EA884A8A8A87DA8A8A87D7DA8FD %05FFA8FFA9A87D7DA8FFA8FFFFFFA8FD26FF7D7DFD24A87DA8A8A87DA87D %A87DA87DA87DA87D7D52A8FFFFA8FFFFFFA8FFA8A8527D7DFFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFFFFFA8FFFFFFA8FD15FF7D7DFFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8AFA8FFA8A8A8FFFD12A8FD057D %A87DFD04A8FFA8A87D7D7DFD2AFF7D7DA8FFA8A8A8AFA8A8A8AFA8A8A8AF %A8A8A8A9FD16A87DA8A8A87DA87DA87DA8FD0A7D52FD047DA87D7D7DFFA8 %FFA8FFA8FFA8FFFFFFA8FD1DFF7D7DA9A8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8AFA8FFA8AFA8FFA8A8A8FFFD0EA884A8A8A87EA8A8A87DA884 %A87DA87DA8FD097DFD28FF527DFD26A87DA8A8A87DA87DA87DA87DA87DA8 %7DA87DA87DA87DA87DA87DA8FD077DFFA8FFA8FFA8FFA8FFFFFFA8FFFFFF %A8FD17FF7D7DFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8A8A8FFFD22A87D7D7DFD26FF7D7DA8A8A8FFA8A8A8FF %A8A8A8FFA8A8A8FFA8A8A8FFA8A8A8AFFD12A87DA8A8A87DA87EA87DA87D %A87DA87EA87DA87EA87DFD07A87D7D7DFFA8FFFFFFA8FD1FFF7D7DFFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8A8A8FF %FD26A87D7DA8FD24FF7D7DA8FFA8A8A8A9A8A8A8A9A8A8A8A9A8A8A8A9FD %16A87EA8A8A87DA87EA87DA87DA87DA87DA87DA87DA87DA884A87DA8A8A8 %84A8A87D52A8FFFFA8FFA8FFA8FFFFFFA8FFFFFFA8FD15FF7D7DFFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %A9A8FFFD1FA8A9A8FF7D7D7DFD24FF7D7DA8FFA8A8A8FFA8A8A8FFA8A8A8 %FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8A9FD12A87DA8A8A87DA8A8A87DA8 %A8A87EFD0BA87D7DA8FFA8FFFFFFA8FD1DFF7D7DFFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8A9A8FFFD23A8FFA8 %7D7DFD24FF527DA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8 %A9FD16A87DA8A8A87DA8A8A87DA8A8A87DA8A8A87DFD09A8527DA8FFA8FF %A8FFFFFFA8FFFFFFA8FD17FF7D7DFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8A8A8FFA8A8A8 %A9FD13A8FFA8A8A8FFA87D7DFD24FF7D7DA8FFA8FFA8A9A8FFA8A9A8FFA8 %A9A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFFD28A87D7DA8FFFFFFA8FD %1FFF7D7DFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8A8A8FFFD1BA8FFA8AFA87D7DFD24FF7D7DA8 %FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8AFFD %2AA8527DA8FFA8FFFFFFA8FFFFFFA8FFFFFFA8FD15FF7D7DFFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8A9A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8 %FFA8FFA8FFA87D7DFD24FF7D7DA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8AFA8FFA8A9A8FFA8A8A8FFA8A8A8FFA8A8A8FFFD22A8527DFFFFA8FD %21FF7D7DFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8A9A8FFA8A8A8FFA8A8A8FFA8 %A8A8FFA8A8A8FFA8A8A8FFA8FFA8FFA87D7DFD24FF527DA8FFA8FFA8A9A8 %FFA8A9A8FFA8A9A8FFA8A9A8FFA8A9A8FFA8A8A8FFA8A8A8FFA8A8A8AFFD %24A8527DA8FFFFFFA8FFFFFFA8FFFFFFA8FD17FF7D7DFFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA87D7DFD24FF7D7DA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8AFA8FFA8AFA8FFA8A8A8FFA8A8A8FFA8A8A8FFA8 %A8A8A9A8A8A8A9A8A8A8AFA8A8A8AFA8A8A8FFFD04A87D7DA8FD23FF7D7D %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA87D7DFD24FF7D7DA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8AFA8FFA8A9A8FFA8A8A8FFA8A8A8 %FFA8A8A8AFA8A8A8A9FD0BA8A9A8A8A8A9A8A8A8AFA8A8527DFFFFA8FFFF %FFA8FFFFFFA8FD19FF7D7DFFAFFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA87D7DFD24FF7D7D %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8AFA8FFA8FFA8FFA8A8A8FFA8A8A8FFA8A8 %A8FFA8A8A8FFA8A8A8FFA8A8527DFD24FF7D7DFFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8A8A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A87D7DFD24FF527DA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA88452A8A8A9A8FF %A8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8AFA8A87D7DA8FFFFFFA8FFFFFF %A8FD1BFF7D7DFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFF %FFA8FFA9FFA8FFA9FFA8FFA8FFA8FFA8FFA8A8FD047DA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA87D7DFD24FF7D7DA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8A8FD057DA8A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8A97D7DFD24FF7D7DFFFFFFA8FFAFFFA8FFAFFFA8FFAFFFA8FFAFFF %A8FFAFFFA8FFAFFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFFFFFFD047DA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA87D7DFD24FF7D7DA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8A8527D7DA8A8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8A8527DFFFFA8FFFFFFA8FD1DFF7D7DFFFFFFA8FF %FFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFF %A8FFFFFFA8FFFFFFA87D7D7DA8FFA9FFA8FFAFFFA8FFAFFFA8FFAFFFA8FF %AFFFA8FFA9FFA87D7DFD24FF7D7DA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8A87D7D %7DA8A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8A87D7DFD24 %FF7D7DFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FF %FFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFA87D7D7DA8FFA8FFA9FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA9FFA8FFA87D7DFD24FF527DA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8A87D7D7DA9A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8A97D7DA8FD23FF7D7DFD05FFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFF %FFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFA87D7D7DA8FFA8 %FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFA87D7DFD24FF7D7DA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8A87D7D7DFFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FF7D7DFD24FF7D7DFFFFFFA8FFFFFFA8FFFFFFA8 %FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFF %FFA87D7D7DA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8 %7D7DFD24FF7D7DA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8A8527D7DFFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8A8527DFD24FF7D7DFD2BFFA8 %7D7D7DA8FD0BFFA9FFFFFFA9FFFFFFA9FFFFFFA87D7DFD24FF7D7DA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFFFA87D7D7DFFA8FFA8A87D7D7DA8A8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA9A97DA8FD24FF7D7DFFAFFFFFFFA8FFFFFFA8FFFFFFA8 %FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFA8 %7D7D7DFFFFFD087DA8FFFFFFA8FFFFFFA8FFFFFFA8FFA87D7DFD24FF527D %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8A87D7D7DA87D7D7DA87D7D527D7D7DA8FF %A8FFA8FFA8FFA8FFA8FFA8FF7D7DFD24FF7D7DFD2BFFA8FD047DFD06FFA8 %7D7D7DA8FD0CFFA87D7DFD24FF7D7DA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8AF7D %7D7DA8FFFFA8FFA8FFFFA87D7D7DFFFFFFA8FFA8FFA8FFA8FFA8FF7D7DFD %24FF7D7DFD2BFFA87D7D7DA8FD07FFA87D7D7DA8FD0BFFA87D7DFD24FF7D %7DA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFFFA8527D7DFFA8FFA8FFA8FFA8FF7D7D52 %A8A8FFA8FFA8FFA8FFA8FFA8FF527DFD24FF7D7DFD2BFFA87D7D7DAFFD08 %FFA87D7DA8FD0BFFA87D7DFD24FF7D7DA8FFAFFFA8FFAFFFA8FFAFFFA8FF %AFFFA8FFAFFFA8FFAFFFA8FFAFFFA8FFAFFFA8FFAFFFA8FFAFFFA8FFFFA8 %7D7D7DFFA8FFAFFFA8FFFFFF7D7D7DA8FFFFAFFFA8FFAFFFA8FFFFFF7DA8 %FD24FF7D7DFD2BFFA87D7DA8FD09FF7D7D7DA8FD0BFFA87D7DFD24FF527D %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFFFA8527D7DFFA8FFA8FFA8FFA8FF7D7D52A8 %FFFFA8FFA8FFA8FFA8FFA8FF7D7DFD24FF7D7DFD2BFFA87D7DA8FD09FF7D %7D7DA8FD0BFFA87D7DFD24FF7D7DA8FFA8FFFFFFA8FFFFFFA8FFFFFFA8FF %FFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FD04FFA87D7D7D %FFFFFFA8FFFFFFA8FF7D7D52A8FFFFA8FFFFFFA8FFFFFFAFFF7D7DFD24FF %7D7DFD2BFF7D7D7DA8FD08FFA9FD047DFD0BFFA87D7DFD24FF7D7DA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %A87DA8A8FFA8FFA8FFFFA8527D7DFFA8FFA8FFA8FFFFFF7D7D52A8A8FFA8 %FFA8FFA8FFA8FFFFFF527DFD24FF7D7DFD20FFA87D7D7DA8FD06FF7D7D7D %A8FD09FFA87D7DA8FD0BFFA87D7DFD24FF7D7DA8FFFFFFA8FFFFFFA8FFFF %FFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFA8FD057DFD05FFA8FD04 %7DFD05FFA8FFFFFFFD047DFD04FFA8FFFFFFA8FFFFFF7DA8FD24FF7D7DFD %1FFFA8FD057DFD04FFA8A8FD057DFD07FFFD057DA8A8FD09FFA87D7DFD24 %FF527DA8FFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8 %FFFFFFA8FF7D7D527DA8FFA8FF7D7D52FD057D52A8FFFFFFA852FD087DFF %FFFFA8FFFFFFA8FF7D7DFD24FF7D7DFD21FFA8A8A8FD05FFA8FD1EFF7D7D %FD24FF7D7DFFFFCBFFFFFFCBFFFFFFCBFFFFFFCBFFFFFFCBFFFFFFCBFFFF %FFCBFFFFFFA9FD07FFA9FD0BFFA9FD0FFFCBFD05FF7D7DFD24FF7D7DFD47 %FFA87D7DFD24FF7D7DA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8 %FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFF %FFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFF527DFD24FF7D7DFD47 %FFA87D7DFD24FF7D7DA8FD47FF7DA8FD24FF7D7DFD48FF7D7DFD24FF527D %FFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFF %A8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FF %FFFFA8FFFFFFA8FD05FF7D7DFD24FF7D7DFD48FF7D7DFD24FF7D7DFD48FF %7D7DFD24FF7D7DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA8 %7DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA8 %7DA87DA87DA87DA87DA87DA87DA87DA87DA87D7D7DFD24FF7D7D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D527DFD25FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FDFC %FFFD77FFFF %%EndData endstream endobj 365 0 obj <>stream -%AI12_CompressedDataxœì½Ùr%Éq úñ¸2#ÈŒŒÜhc2;«.gšì6.3Ô•µUèîÕ¦ZDq¾þú™q - Ô-a¨y"cñððÝÿîÿùö÷_m^¾ûóÝWÝusþîïvîn?½ûð«+‚^ýúõëÏ?}@Ð/~÷Ë«ž‚‡6¿ž¾“ÿç݇¯Þ½ýý‰þxÄOÿbóúîŸ?^ýW?¾zûÃ݇_^ýâ—ð·?¼úôúþúñÝç/î®o_ýR_ }ìo?Áßú›¶½i›«6þ*µWßþؾûüö%t³}÷o𞾇ï᪣ïþüÿ¾úÝÝÇå3×í0âs×ižá9þ½ãßá3ûw/>¿¹{ûéÛï^Ü}ü¸{÷ú݇¿ºÚýõöíÕon€¿Ü^ýãÝë×ïþrµ}}ûâŸÝGŽïÞ~‚GÿáöÃí›wo_~ûáîÍèÆ=ñÛ»»—w/O>·ùuÿÝñÕë;X¨7·Ÿ®f\µÍ¯ÛøÝöó«×/ûùÍŸï`S3 ¸ûŽÆöÇ0(þŒàñ»_¿Èïï>}‚IÃkpå÷[?RûÅ?ýîî‡W´‹°Êÿû—Òí‡wïßÜ~øgøl;·¼\säåjg^®Øðráó¸{óþ5ì-p„Åwßò̉þúU›šë©ë®¾Jóuß´WCÏ/臘;Ì[p÷¯¯îþò««ß¾{{Ç«³ùðé÷¯þ/Ì·~3ôwŸ_ß}øãÛW¸ªôÊ™×æ7ï^Þ½†gí³Ç×·´$ÔÚü/?ð‡Û?Ü}”y÷úó'BÝ©‘?ÁÚ}û×;Ä„È/øæýÝÛ?¼ûŸ4¾f1u}4ÂéµíUwÕïC?_µ½&µÃÕ4Ê« ;Ân´ÿ1÷[ØÂo>¼úáÕÛ_}ÛæºkX´~Šó4ñ>ÿÇW/ó6ñjâhFדûžõ›‡«ðéÓÝ[Y@¯Ýoº4׿ù=ŒàðöåîÝ܆xÐOÞ -½~÷ÿÍ~¦¿ÀÇ?¿ÿºùæ_>¿ût‡GûõÝÕ<Üüðáö_ïp§n6/_Ý}€¿|¼Ù|€?ßì^ܽ|õúõíÍáöÅçOw7¿ý8~wó>nþhŸ¸åGn©·›Û¯>†|ÿúîßnnó3üù[êü…v~GŸ 7wüÑ;÷Ñ;ûè+îþ?óÊ=óÊžyK݇›wüì;~ö{ö=ûŽ‡ò™ýÌ~Ά›ÏöìËÛ€ -Þ¼„ÞÝݼ€õ¾ùøéîÃkœÅÇ»ˆ‡7þüúõݧ›÷@0 ¯÷?ÞÀ'Þܾ}ùç×°JèCo/o^¼{ÿW@š?ÝÀ‘~y‡‡ø†Ç`¯»~ûîÓË»ïo6‡›o>¾¾ýøc0Ð{ èo^½ýœÒÿÿz÷öæÍç%8¬žÓÿß}xùýtõêíþüæöã‹Ï¯ñ}ààòöù|÷'ùòÝ_ÞÞÜýÛ‹×·oèGÀ®W/n_ÃìSßÑ~õv=Œ€:¾¾{ónï?åßx%€T¿z3ÿøþöÅÝ͆7c#È&ÿnÞ!Ž¼} Cº¹{Cÿ"ÃS§ú ÷I¿e8_¾ú×Wˆ ¶h¶æÿh?}ÿá–wôðùÃ;)7ýFÝ…›ï_Á„=àÍ7ïá=ï^"‚Ð^çsöçÛw6@úýôã»ÏEÂÍÆ¡èÁý¼aÌ8Øà¼4¿fø¯=ºþÚú5?ô ?ôëOçý ?ñG~â¾›?òŸ^âNÁõã>ÍñæöÅÄw üôØí :|¤ùD‡›?¿ýáöÃç7¯o?‚swÃ?ß¼¸…Ï…?ˆ¤öÿý»?|„$_ÝwD¦o_¼CVàWWß-/ßõmüO7«‡nVŸbzþ‡ÿ_tQ_Á\Òþúþ.üS;´r¾¯Ú±»uºû—Ï·¯á—áæÕÛïáœ|ú«;}¸6ôOà`áñ—ÐN-B Ÿ^ݾ~ùêûïo`’oèê¾yÿáÝËÏ/€D¼‚?!±ƒî§ùæ›7w?Ü^…vîo€"à‚»|¼¹}ø7Å<Ýìï^[Û$X §ïÿÞwvSƒ¿¼þî÷}óçw¯¿»áÿåå©÷¼¾ßÁz ›…WIøíû@ìà·¯?ßþáûÏïýöûwáÌ?~{ûéGà àÌ}aüë _¿ú×;†Cøþ—gûû-\÷oþü€j‡úýçWŸîîïè÷/ðvüpµýðùãWx÷ü“ SÀÅçïø–>ðö›·¼Òë7ÉË7›ô“{ <}ú ðÇŸrï»[¸èÚ~õ¢ö‚ÊßíMü·¼ X»wùóô«þZÒÉ~õñMÆFù)Ï‹×w¿ÿ+°oîïm÷=È1nÙzxû¯w¯ß½wƒ4\WWÿëöÃûs]ã6Å| '„Îs^ÆwoÞ£¤wõûoßßÑp?ýx¤'¿¾}{ûáŠàÖ%’À_ g%Ib˜uÚ#Ý÷¤ï«¯B¼Ú¾u„ñøÂMîoïþr¥¿^ýþ/·Ÿ^üxÕþ2œ€……®^kýßBÃ_m›®IMmhÆfjfh›fÛìš}sh›¶mcÛAëÛ.¹Ý´ÛvíÐc᱋)ö!qŒSœã&nã.îÃßç·ð{ðMø®$ïâ·á»ämÐŽÍѽ3Á[{/¼9À‹÷øjyy<ÿ–³:ùyS€)nõMØ#¼¥÷ÇÃqÜ·ÇÍq>NÇñ8ûc:vÇ#jÇÃá°?ìÛÃæ0¦ÃpèéÐâ¡=4ûãþ°ßïwûí~³Ÿ÷Ó~ ûaßïÓ¾ÛÇ}»ovGšÍƒß2žOØå{οå¡ï‘7žR~¼%]ýÝwÛ€nÍõãUìMÓ dÂïJàöchù7{À~‡¿m÷v8¯ë'âoßÞ¾¹{yõƒbÿÇ¡¬œ…Ç}µÖb 4dDTdTtT¤ä€¨©È‰ßzMùø!š¶A0q5ÉIÄï !êÖÆ&F>çãã&j?qÑ:×têɦÝä7už´L<À¬wDxDí˜F9¦%APbt†"<ÑWÈ›K­uSÅT=áYNu–éîšmM>T¯qûŒÕÉnÜNWˆÒý_‡JÛ»¶³¶ @¶D¸ÍÔ&j#µ(EoÔéR  D5n0å@Ú± D>˜€( Q"R’+#Œ§èâÀD‡b¢Ë©òDeª8Q¦”L+•Z -½\PæêTŸn¢nª:Ñ˧zÏ®ÜÖÕ®êÕ —Cy =Éí0ö×qLcyEdà½÷ÄR¤ŒíIÎ -~ü+ðloc0Ü$U0Âîå2JîI ×(D‹O²¬:ÅÆ•ŒÇŸŽ]êúnèÆnêænÓm»]·¼:ÂmS—RêÓ¦4§MÚ¦]Ú§ ¶}ק¾ïÇ~êç~Óïú}@„Û¡ÒÐÃ0 ó°¶ÃŽÉ¦g•xÂ0ñ‹«é S¸'âtÓ -6¯õÜŽ@3[úŽ]W™à®6ÉF˜çFf -óLGœ)>ó”z«ðà•ãkmI&à‡¿ñÔ¿ƒmͰڞđ?N`9…r—üNm€yà,FÚ*Û®¿Ñ…õ7íИ&X­#†k~ñ ¼$ôHGwû°Ûí¶»ÍnÞM»q7ìú]lˆ u4@ÅpQì¶Ûíf;o§í¸¶ý6m»m„SÕu;mÝm¶›ÍfÞL›q3lú°I›nám€ð€íæí¼ñƒ÷Ìîùá×&àï*œMàÄÎL¢: ó ™ä‰ðà…BËðóꟚÀ9¢ŒdÙ¶a/“ÈSXîÃr˽ i„b;ò†ùÿo¹‰ˆ 2xxF:µ;ä iš:pOŒÓŽèòÌS3ê#ù¡ügz „W‚eè`9zX˜h‹µƒE;ŽH¨÷癨°ó£ŸPߨp üïöa;¼¡£?½N@Ô"P" @%ö@-¶@7& !=Вصpÿ€Ê µÙå™âˆ% 7y}ØúP¬R/õ±¡^Fé'eŠDh›uÔ]_í’;•mwPÏH" ½oOdZߙߊïôo,ßêÞWN#ÆwÔzz'½Qvé°9ÂcàZ87îÍ€…[ÀÆ=ìؤ<í_{ÀÛ px¸¼œ>쎀D-œÖ¾G|„S0ÃyØÎïá|Wk,HTÞqê-£{OåMü¢`o*Þ…hÉï»ô]ãÉY¹·íçàçåßv(Îà=Äß‹>ÝB¿¢r]!躀õvÈäÙè.á$l^Þ5:8“pÊK䋸ä%ðÖ+˜ù»€…‡èˆQ¢û7¯$óJ—\Å­ý¯k’W¦\Y¡à$þÈÑ\¾;[£ƒ*ÁTîv%ÒZËlÁ6Ƶ˜,¬³.½°.¼^›’ûÊ«„w)°ËÙ’¶¢È‚q¡…æ£\‰-­ËÿÄ<Û:0Û– g”uƒEmt%”ƒÃ5À¯´XÆZÁ†p‡X¸@«0Ò*(#º¯‰Úk±KäJ'i•RÖJœ YÄr– -Î^˜ôV)9²s€#¯7zæ«ò•¾»çJç Ýñ%¡Æ]­…ÔSk±^¹¢G ‰3œ9óz\¶"Æ£§PX®‰r›Ç*¯v‚[ ²,×yÉZœÂŒ“¸Q®EU×pÏjx…¬G ûÆó|KÆÕqß‚#žw]­GpœŸ­Gq¡lŒý"Œh`"¢ TÎÑþÌtBSÿØàIòÈò±†™y8ø°xˆS=¬èë;Ãzà Š×ßñ¨<ÿEÅÊCËÇ2Ë\’r-‰åÈÜq¦oÊL«gr„±‚gr \ò¹ü–”9£ç‹˜x]•ïí‰gS&â\gÂeo÷„]ÈÁ“Û§À¼B²OöÁûÄ c1Vœr•OF 0„}D¯²®Tæ kZÓ!¤ÿb„û!Ž©oñ‡46ý|Ñnn¯û±Ëê£'ëqûƇ¶~VŸl¤ô„K}3Oås¡—¾½îú¶»JóuꦘG÷DýÑØàŽœêb€¯Ñý€{Ì­ÇæÔ¶äÃÇËQ·Öu×m‚ÏÚ¸ž /Sá\YšU¢xƸÈã”:|ɨoN`j÷ӎ׀ÝcÓô…c2GMlñjH×ÈG:ôö²S= †ëv$HÓÄþñH ÝÉ fœ9~X·G!yƒpï ë Wù^òxÛÓC u %*™­×°›¬³a7ÛŠ¼ÙÚ)]³vrÞXe‰RW¨òœÂ•U‘¢p…+¢ ¦q ¡ÎuK:×#©\#)]á,e¥ë°ªŠ7KT=Û™Æ~ÆqœÆyÜŒÛrÞh6^= Ì#¢`3¥©Ÿ† ž™&ؔʹvô½GÊW®G;ǹ„Is?ÃÛfØhs@ \Ùp·#'€×Ýhxg 4뀌o¢ÖCƒ’î ÞC -þÚ’Bþôãv³“¶—F—³:[ºð˜AG‘í>Ç€Áœ*ÝÉÕ ¢|ÖÍUÅmE£^Ñ9/Õ꤬ÕmVÍú.ë›Ý>«n}#{}(v›•ì´ãA¶|¹é•mGéž÷¹§SûdëeÛÝƯ·¿xçë{OûlëýÆç­÷›/;~ù^f'¥M·/Ôð²—bãÛ;Âå{¨Æ•ÿ"{¹ÜÍp᩼x7ÃIÛÍðÉ»Y(0Öþ+OïÚøíçï_ß]ý·¯½Sʉ?\aäàZvR-»Ç–nÆq/Üd;Ñ»¬wߘH¥BUæ×zã×&Ó¶gŽ-ól}v—´e¶­u¸ŠZÛ -ßFþ-žy©ùg³ ë›~ç½@‚¸Sv'ÙϺëJitr|gpÒâ’õTÆópBXó‡ÖÚwÉ•&éÌ@ƒ±H¥Ïf'ßËæÝX“¸9ö›³wõîåoÙ6Ê挪°$-§ùZ+™TB©¤R‰e\yžd’¹`f‚sÀ«9@,MuU¸’Q ¤aå‘©i¦§Ùp’I*ÕÚMðew» VNؽ ÂiŸšKnƒ<ɃÙAÔ¢ÓV±{M@¡°zäM.íjËÖ±Òø‘÷¼ ²íÙ&”Ý_òöOdtW$À,>HŠëI&£ó¬¢äžÄÉÉ,Lâ ïXœ¤s>Š<©Š!š eGå âäLrùRIàU,?nD;p½ I†`5«X -d¹IŸu9ÒÝ°«E"ׄ™\piÐ-¡ ä—ÈH”}ö´ˆGqheÙXt~B‰î|”YBÞG Òq$Ù(§ÓzHLŽÄs ü;îmQÐEŒ¤)é„&RZ DPBŸô´˜H\Úž‹M'®< v¬`§ -ôß@ -6utdèðîDhàhÑtÄF#4¡¹èàm„Ùö5ˆl´ßÔ‹‚ÿÍ?ÍöÛìB\à@0-K¶¦ãÏ{ûy'ÞS[ñëÌA7ú½gC¹¢·Áù¤ûïD¬@öPÏžêKWŽ³ÊïQ±ƒ. - Th‰‘Jr»qúy) Ú Z\µuTD -v3f߈̑miUDÿFgZ´rážq"Í]$rÜ’½ðHDù@šŸ‘æ-u13D£¢S‰4IÑqîÌ»#÷Îü;ÉcÂÂDáQ›H -,då¸yæç•£÷’6óõÊÙ3o¯Ü½ò÷Ìá Ÿ%oåó•Ó'^ŸVÅI)–¯ÃßV‡ŸD -!9Ä${ ¡«8’’n1ð)ý²XRˆ™^2 "šÔ„“{Ä“µ¸‰òI8/ Ðª0K¾S?É£ð(ºå÷æáÁü -ðÕ}oþH£z£ ÞœÆÆèjØ3³1ä̈YGJBÉ`8™1r:m±§!YÓC{ª›š·u!¨y_q‹(8ýÛ5Õ—`ÆÎÙîÐIfdø¡G‹3Ù"{^‡ÝŒ×ÝÜvW]=÷ÎøDýÑئÿŠ[®[~z£~Ñ -žÚvèOhNÅ7²‘ŒÊ@™R}ñ=D¸]¯d\ÃhKžÍÏæÀgsà³9ðÙøl|6>›ŸÍÿ MHÏæÀÿ<{ù_ÎxÎÜwŸ©ðr‰éîe%@½…þ•šW5X§È“äiæ@Alžîb¸4±âì$ŒÓ;¥£ÚrÐ(€Ë<àë!ºÿÀ±d³ˆ„ÐX‚̬-¶[î]@'¸Ø‰d†¾l\6å­Dó¸!öþK/Ù P„(†2²xYÄèJäÇ>$ký¢ ‹6.Ú´j@˜8xLÛfѶ‹¶ÓÆc©=¶+Ú¾h׎¾ñ.3 ûV~u®%nÞøä$£uˆdi|Wó»JIj„ÿûÐB¾?‡$Ö%íÙô'‡"‹…‰e¬Š¼ÿ¾¹'‚Ÿ×:ïÚr_—û¾Ä ÁîF—ÜoE¹I~ûüÆÊfN9ŸÆ/n-{ÓÎý¤ñ¯;Ël´·Ä?õ³hŽAVºqÁŸ­?êOÑÒo,ÏA*fOkÃÑE~éÏ'I(T"pùSíçmp8žÒe;Tq=ÿVþ~ÅNœ8Ëß]ÓSb¿‡ÅñY¡õA:Û‚üGÁî9ÉJÝç4ª7ØŠÝ—åºH’ÝPxsˆ~ 3ÏD&PÔ°ù³%-ªf±åîÅêÉ6ÏQ9;’çÔì-)mzSÔ(í>íVÓçH”[i7I£ÝH½)Ä<ˆ=7G™kœyi®”|víLÍ•žK4X(ÂÐf—aƒÐ(3±è#p$ÓzK¦õžü2Ð?cK^ˆ ˆ?xu¡°ƒ(§žÂ¿â.£|„Ë…¸ÁþAø6F…/Øð?åÔ¿s‡'-Ô¡ª$«µœÜ`™í®p - M¿hCÑÆ{Ú´la ’›·l›“m[¶ ÿÓߘ›‘Æß,ÎzoŽG;s?Ò¸ëD_k›¸qKÍ9i%mÉZg-Zów!ñÁ¼™´å¡ù¯µ­k×fnAœ r]\ë‹–ŠÖåÆÎS¾•,US¶œOÚaÑöa·_µÚ×ödÛ”-ÈÄ~I:©3º`ÊSêµ2k³ÒJ: H “À)Õ¤W„dUHV†¬öAT"Y)¢jVŒ¨jD•#¬a «HTI"n Á´—¬-ÙšFõ 9íP©Q`õÉž®LÖ*lè*‚¨r.¢D\W$Á·u\`f=‡®|¬Êq“È ¼áçäû²ˆU¶=˜KC©õºoãMé¼PHõ -í—ßúsþ'ëÍW]1k·Ý~ÖŠ©^Œ4c°~Œ5d¬#a@ÆV–™ -{¥ZIÑ @„ Ú¥ -.PSt ’ðãѱýíQ$»B:;›•íÇ­óv'Úú¯ve†ŠkõÚÁº~‰.Fï;¬à¾;·zïòÍ»þSíî­4¾^ë>¿êõë}~s’“ý“Û黃SxߟH°¦ñfàRº°ÿS>þì椟>SûV¼êøÄãiç³M¿ g\-NìÄtO6Ÿj<×x¦é<Ûi擬îox†™|‹ÙLg7Ÿ[=³z^õ¬rLéˆòåM˜h©;XÞ,솴‡ÃÛ -?±ƒ5Äìaõpí°nZ³^Vë ´’*À:E"‘{"ŽÆ$OZ¤†¼6H¢ì‡7Ý릖È’:I¦@”. SúÆÔ¯5¾Ò²á ÚD". “²†'Z”`þRËOš~Ñó—žuj€Lå¯D‹ ü—óØmDúcí$ÉM‘Xu¢®uêq¢J”‚eÅéœiûû[¸ä¡U;óÎýñ¢¯E6âPKQü˜D3ðE%úµÂò2O’±=Áù‘éwÏú’x¯ h™x ¯ ½yD§òAK ¥ç¿¸sþgÿÞ<€Ô!„TG¤7bÇDÎ>ª=RÝ¿iÿÑ4² @IjðʤžŒÃŽýSÏ.úEËN«¾ÊäW‹ »xá]Ø…)æ¼+ÖeKŸðöæ¡kléýâïŠÅo‹Åmñ½éÅŒ/Áì/ëT‘§–_SFΛtŠ9ÅœœŽ s\Í’Ý9Åu÷²PÆw•¬ÙeÞö5H¡ñ¸¤‹lk몕z‡_¬‘Ywøàîë𒉟mg™a&´{ óÐì‹þ¬—ªÒœ©sBÃ;ÐÉŽ$µú€É¬ Å3íSš[d>ƃÄNmQÎ>Ø Næi7‹"”g%dŠ4¡¬fßqx‘Wu‹œ1Kó–”¡äå*çÔSɤêè æR ÚR¹“Ý´¢tgó©ªÝ7ENÙC‘ˆÍ2¸iÞâq•n©„ßëun×gëÔñ¦’R¢—ì…ª¡ =½¶kÛ¢¹B;§Ë_4ÖÐî ç¼ì7Ú9ïÑÒxë,OK'Ò,Ty^ävÏÓÌ 0º e¹ž\–÷@ø›ˆçdv™Þá[¯¨†|ÿØ3\c¥#[‚„Žæ_ºî Ìî$„n$둸 -Âú·¤`HÄt0ωß(siùg žÛ£VÃâÕéwäÞ‰)’®Ÿ A @ ÊFƒéòA=KgÆkÔÂí8¤Žt¬ùïD½ˆÓBuä£XY‘‰_lÕQLŽ„Éš‰p¢˜;lÌ5+Ê(«¨ÚgDÍh:å¦ñÆc¥ ´¾ÞÂ.n]½…(> µëj@kf°¿”á´Hòùç¡é!rÚî¬XÇy4Rû –{u¡¶ 뼫¨«—ÎzÎ]/ÞòÍ¥WZg·½ì¸'ªËàt—KÅõ2z®Ô^–Êkuç“(ºµþÒ+°Yô¯i0³ÛT˜a¡ÃÌYì—Z̳zÌ¬Æ +MælšÌ¥j»¦Ë4M¦ª¹ÃÂi¢ðLÑ:uÌú"ÜÚ5¡b -Y`×*€7‡¬ð+˜A$kƳOhÆ°ìã›Í"KÃÈÊ4²4ŽÔ°LuäëàRÆ3ñ; £ÚÓØT’uå×Û¶Û‚ [¶š8yãÖ8W`]èºñ2êeäc-:cßV²¼Ï ƒS¬{”\ø’aFÞ¦Á̪˜vtŽ˜B~g‘ä¤üÓu˹VᎌW1^£à\>A_á96²å°DÌÕ;ø0ÉFsÁ¶œ –RÀÎÝu|ʃyL'œo°­ï¥‹‰uj&Ç…“Ý’wˆ× –K´ûˆN$­&ÃÕË£œM‡<º/Ûñ4\÷m;ÀŽ_cŠÆ e<6m…Çhpµ9»0•ÒÝJ.\Éu ó¯aº°:c;»=AgªoÙÖê[¶Ï>ß•¯gŸïÓOùzöù~öù~öù~öù~öù~öù~öù~öù~öù~à×O¦Ã‹Ìç }Ï>ßÏ>ßÏ>ßÏ>ßÏ>ßÏ>ßÏ>ß«ËñÙçûÙçûÙçûÙçûÙçûÙçûÙçûÙçûÙçûÙçû‹42Ï>ßÏ>ßÏ>ßÏ>ßÏ>ßÏ>ßÏ>ß—|=û|?û|?û|?û|?û|?û|?û|?û|ÿWóùn»ª×7€}…$ѧ(å(íozoMîÞ*&ÙN¼‘1Ź8%gJ)ìWØeQÍ5‘Å´(. ³ê²Ì~첡us-YV#©J†µ¹Ÿÿžj¨p-²{Ã)\ˆaÁmeÕ’ÉÊW`¾þ¼EX݆ ^› DtÉ1¥—›dºgcjÔT3Äi:{rêà‰$v´ I°¹†¦@ãoÅÄå \:…È&.šÂVL\#pdΛ'¡…ØÐÌÕ¢:3ÀDö2‘1[tP“"œà–,tA³*h0Gܼ÷ê®îöß¼f7â¼>Å0ÍâL;YS#žÒžùzSM‰Ô8¦ì6}kVçd…NVéRÇt:…VG}âU±Ãþ”ªÚÙšjgoªÆT;¢Ü)Ý*ƒSê˜:g¡Èa¯JŠÙ¹õ•{vT¼×Ì*¯¼ÿëÒÄqÚÀ!:öPØ7LÅîê™9Ó†FQ°*Ç›tN—„òÓõ¶)š³ŸµŸ÷©Q¥¥ÁÛv¡XƒSÖY‰’9kùòÅ«n”Hw Þxýpõ=¸ ‰uÄûo옙XÔ£xšÎ¸˜ÅuRæ)Q!c¹•ÅÒ¦™þhYûâ ;xäšêhª•̺w%5kGµGÅ 25WÅ 8ŠÎ³‘‚¼ÍÂÍ;H`@'ÔÖÂXÈ‹‹tñ!+Îû^Q Iáø “^þí¥Xï@e¯ <…`ÙcvmD4Q zn[ùw+ÿ.Ûε½ihAxåjœÂ ÷Á;õæÒ¾ð…¸´9¼%·”•½:3YÒ$Öfâ%éÌå •hnÙ’±ðí²²uÒˆ¥j|•T–vŒI|¹÷¤åäÇ=HIìzq·âÅ=˜õBmÑâ,²k×壺àv Ô¥!]Z›¯°‡DtÑ ¤>ö^î¥Vn$ñò_–lgKË{柹$¤Õ±¦C⊠†EeÈ\õópÒÑrfe‰ÈÎß™ë[óÔ½¹§[¤zoÖaYô`A#IîK2g9·þN.J*¹s#IýRê]aõþÎ*Å%BÜþ½07‘vö=°Û¾¸ìð±'Gý¶÷gV´ûß±ÃóöÖ•`XÜ ¾4á©+#Ç™í—WFÛ;‹³ÈÉë¢bÍ,·5÷½F©š߸0‚8 F(,ÞѾTÜ{çzïV?‰Pg¾ôÁé½½wœ×ð:ï)ïýãK¯øÂÞû¿{wõs÷®íÞ‘]œÖÙK=®éQ¶Î¤pHé:’6ò•[¯ÄŽÏH§•ìEÅn_³›ªvÿ)÷Ÿ®üßÃ÷í‚û‚œç÷.¬£q/Ú»“»*¡—ï^eÿ‚nà#ö¯ØÁà|B+;x¾xü¹ºñZ2>‹ZªœUg¹µZ•ÂZÖ¹RGc{=I¯Ioíò‘RT_—¢z”¢:“¢NÆeYŒ´j‚Êßw9ˆˆŽò=âê™à ±Á{òr`˜ƒe'ã‚÷ÊþpGIü'4öö`nAƒhTÏàÙiå¢*½òñÝ.ÚfÑæE›,„ ÇähàòíO‡’”æXêèþóumìË° -_¥ÛçPrWñ³Y§%ØhðlPIŽ6qUoŸ£€¹lõ»Ù·½åkÓbÑ€0rŒíQXðFñV´:Qt;Úø«wmpì×lÓÅÅwÑ8CFt×ËlË\*Y­³eh¾Œ)|µ#½w2–—³²¤5‹¬µ7y«Œ¹&Æ);|mDòÚ™fð(˜ê;¯\yr¹¨ë캵öÓrÅâs:†—Xtq’c7¹^↺&º‹Ø¡hK·Ó!,Ô¬kEë@×Û,ªÖɧ;ºþŽèoÄÿÒJ6Èʺ#™ÃS¥+óÆŽ ¢ú íÄ'ŽXKa6™éd&YÒ=˜?¤‹eudŽu-’Ö -$Ïú+ã¿eƒÉ IW´>Ùn'iTÈÕTƒ¨iæâ0.Ò„ NÄåÈÑa³³Éã-Ùùa_xw™Æw¢7Ý«ƒÏ‹M8§™š“ž2¾Æ8› \tfK=s“ÙeN×±~Ìå˜ßL V‡™Êáž9ò/3>J´Õ“Fk‰¼ïƒÐðÅp<èFܘ1|» ÕŽ 2F(”á~Æ yn¨Æ]|_ñ„w…eƨ"ºS3F©%ÑÇñA9¤3˜‡K%¢“ÖÄ‚–~9¤5ûå¨Æ2®Q=5浧†÷Õx„§F\¹-ý4Ö^ÓÂSHl®ÁùftÎøJ_ O @µv(”ç}š›XØÆ{ÒéãMãÊð˜NتÎfïëAÝéÑs¤ yUdD;¶Þ“÷¼p¾êzô"ðÿ§éýFô1ó˜Ø‚T³}Ïèz!j™kfù:“å¼Hž¬ËDZÝ]ÝxÑUŒ­S‚«\ᬠ-¯qv³hJ‹°©pAÜÔ–X*ã§ÔÕÛn°1yõ¼W超Ï7Œ0ÃT¥îÞÙ2xÀ=+ñò.n‹ÛX]èÈzûîÅ=¸‘ê÷œ³AååÔoÖȱÛúÁ’<µêwüxõMáU®¼)ÕåHŠ±œUJ,nð°pv-/ñrd2¶<ŽœÏÇ 6¢^”Œª_lL¯è£‡7œ0f²d½é ™}kœ—ÈÞ4„›Ç‹ùÙƒ -ƒJ4Ùœ9&¡lDh‘ŠMLiWöÐÇöó8Ê2׳IÎe>IÉ0ÀGö›¬'˜È¾’ÊrØ¥ ÛIWmp -˜¬‚Y©Ð„µè%!ek)wÂA°ßшvu;B—#ŸŽRó#öš”RýDûpéÏÉ8•ÓN´~Hç&á rŒÈŒ}$|X‡¯àáûe–Çœç1çzl9aœNF³kÎ ·)u)3:VXžè>žÐN‚[&"ã#MI·"<ˆ žå›-:Ò·ÅA‹‡óuË–êÔø‰ùÄ¡yR>}¥ŸS‰œœÈ7ySŠœEå2~u^ů’”\&Koøô©Ð¼ñó¼ù³gQÜrZVÍŸ# Û’­1ŸÙQ³pÎ$œœšëʨÐÚ¤Dߜ¡Ìðv)ù¾i-ìºa9­K'¶³ðâƒ$[Oˆwé’8ã!;ujR¥©z¹[EÒà’ÔÕ÷«6±¬0S&cÉxÍUfkJÙù™£8btËèic¾ˆõòi=3ó¥þÙ³ÉE¬‡Â—K­ÒœÈíÒœxŽüš–†ùèø$o’ßйU®2ÇëE‹Ò³->\Û::¿ä3siSp›yÒSpz -"Ó¦§èŠØñÑTxÕ)¥Õ~ét–Sê„8'œ{ÍÞÑÌŒŽE*AÇ@ ãc)F6ˆf[º«‰›IÞXšÜÓp–÷˜jüå’Ã<«‰ UU ››–ʘñ!6³û¬6©Pè—ÖLsÉ6{ƹžFj -¢aRó§›YNìŒð†@¿S¡ä§UUœ‰ý¹4 -ÒÄ‚…š•Ê³<µ¬@ÛyÒg™²êz³ÒXhfŽµ¹wÙbHå~Þhx^]æUeL¦‰d²±Ð› -½¡°4ó.-„j\q§Éx {’w=©0¦¡Ê™Úò,È­O^¡½‹™+*Å#æ»ÈáR'l@+ë9ëláÎØÈ]²¸ª‘œXdYÃP¤ÔÙ;&_²–]ÔeBW2T9c3§åè³Ò¨V†Ÿe”Ó%-Ó´íÃbQó²~ÙÂn._ØÞ 'D§¼°NðX‹9™–ý·—/, ‡ËrËK ’‡HÒ Ž‡¦"‘ßìÅ™ ‹Á,Ž&G['»_F\ìÂõÀ¯¿}‡¬¯'·©§¶¹Àß>œÈ't¿ý*‘e² ›èÃ+8ñ$<Øãôy+Tå’§]Ö© O»¬›)fø™-ì—.ê‰èð´Ë -\Ù:çÕc–uß„‹—õ k\EO/ÛP´Qš~‘éQÌÌT°irÇÎä’ÇZ5d–‹Ä°iR±^Ö—W8¯²®4­5¯wÐLc„>ã°5—9Ùý¦f8|ÂWˆ–%±;OÆ—‰îjM~ÎNó˜ýHøÓräšä3ðhd¨,“ wª´ÙµÍª‘þbØY;¸)² È4HüzÎè’ÈÁ›½ý9oÑl>JêòªbOˆ¸H˜”d3âØ»Z,\ùåHj®ÁæK`S¼çüÒwþ\B½2N…اË!…ó_•4¤‹”,ê¬)«w•qö‰pg3íü,G€æ¢0&ͳi—VI¦œ³QeÓx¸±ÒÊ*3ËIøÁç¡Ë°ƒŽÛq–Ëäµ! ~Ý<4÷3KšUÊཙ:kådòòðaèÁ]>8)ì|æ2k1;š)+ühÚ@ÅN\„±~'-—G§<˪3åЄN«2 ¬- 9’GX†\ño¶/æÁ„ SPeKä\èÛ.?V΋åÔŠ¡ê¨WQ+®r`ÕB'a•B%Ü¥$ZˆYå‚--Üe«°À -ç«XÚ´eB&b² -糂ú5¨ÄÊ¢÷ᲶG±g²‚òJ0gäBGƒ-1H?÷›ó10k¯7ÙÏàUÉmó {¸§p@xÚ ‡i ¥¯ïObî ÿ_Bpf%B@pÑ*…ý¤þjì®›®}ïÊ>üÆ®¿ž{—e¦Ó“ @cs=¡gTÛ]þºð†ÚeÞÃ~”ÏC¬y<Ä“ªE~‚ö´îÑÏ`U‘å¢v8Õ‚ýx2»`5yo[©§Öqà¬~¥Eë]\­e&u¶¶ â©ñEDµã"(À‡T‚‚ Ñ™JŽO [!ï| ÿ ®îø“(9Xîý)aýE/ÀúS¨{÷U â¿lUŒ®¢ó•ƒàòt“ÕɸŽÄ% -KÃ%æ–h;9ÔehF]ª”`ÈyƒýG2El²á_¶¥¼´Š´9¡ '\Þ‰^ã¨ùL‚¨b&ËL»§H”œv¹E êX¢±‹.`k›ƒµPG\Ö‚ƒ…«kÆ‚éãX×çʳ¤×ì(Å,«Þö¤t‹œ™um¬gCzt@ÏÌiŸN\þEí1®3m»Oçj¿¬ùÛï}hñ Ž¥ö—b„°˜Ð}¿GñÇ•ƒ˜pô,HÔÊ&Ifÿ‹ù'˜¨–%*dõÁŸø9Ú’duâÏ]¾|îð¹ÃwØr¡¸‡%~¾·=m‡ûz]ÄKÚɯ`?]\J±ÈiáÛÄ«S‘è"7gþ°Ä9ùEN€‘“``kƒ¥<Ö ðc5!ÆÞÌ_ä%KnK³x›±ûÒØCZìÉDâ¹d™b—½ìÓtÈ~M$³›ã–ú¤m†@6žÞ2 [  ¹<­ƒçJ°`T秠q‚–yû>ŸCáâ“£ÅÉ'œJ ÀXz뿨=¦Ã*®…(xWhY¶PAÏ%ŠžFÓ -ªÅÖUˆ¬›Œ¬A±Õ!kFÕ®‚ªÇU=¢ªÒ3-Ñ´ôÌc½SöÍ["içýó‚¡h AMWM+>zátö<Ê´Ù1jé§ÇQ +âÙŠ¡ÔE$EÍÉÿ¤íoÖái¥Ìeͪ ‡¢´pÙšÓ­Zˆ…ÉrŠÃê¾Y`»gÜÙ•ê³E!©A,Ý'Û‡c»H:j¾lý¡ÁtÙ=E•Mšh{ÔX_I^¯¦öºï¦þªí¯GÐ\ -š'ê´ÁÖ6kX›åþn,ÿ'½kH#Æ)÷œ÷&^õí5Š¢eÝÓt÷8­rSU+7ebEW={’2ͧq+\6ºªË†U@ -ÞoÃ"ê}LÉž¼+æÂÑXºÏhY":Kõ9 ÆФsÌI<)IçcÅÇu* RIÔ²`àÐ$AèAÅyQ[rVíl=ÆEn2zqà9&Ë…ÁSÊqΧ„ÜqJ'‡¥†/=Á9¨„iP¿sâ>±¤«w:ßK‚¾Èä_Y ¿ƒŒ4êÂÛ£ón+!ìØü[r#ßÂúŒì9¾,n´,Zä+ÕÓõ\X­&6ÚËa4¹ðÚÁ’óå[d»³µ@ŠZº'³Ð—(å¹HAXKB˜§”'TæÔÉÀTê9?r6¶†õäöÑ[‡U‹3m¤ §Vƒ_9W2Z*aQ–³pR ÎO1{*N's꜕¿¢F5†û=½›ÎOÉ@ð7êpaRøR;ÛIk[(~=i®¨¨†ù'³È5UFÝŒQ7h,Lá¬Ánm¶+MwK³ÇÄamsÑ6Ö²1O#ùƼE–/2ê…3ɾÖ)¾ÆÂÀ7“«Žù¸íC¶ö™ÿ{ð¨?S’R³½Ä¾«kÝÆÙOöâåMŠYÍÊHu+“óò¥Ö;“ªÓ(:7b Œâ:üälsËVAìKÛ™bváŒÕ™Ûe¨m¨ªè|qkøê±uè¿Êj%¨n–xé³Íqº„-P¤ÔTZÉÌL_v/U%9”ˆ¬ÏV”€p² 7ŘÇÖçÁœ™·’jšíÏì܉W2—'˜Éï“MÐR -9ÐÒ$ñ0ŸÄ -½GüÖò‘«“¸^yj‹î(õ$ɨáj E=u¼W·ûeFr¾ÀÊü‘êIʽuh‚9Úg'{u±W{ŽSgßúÃñÌ×OÎ@¸ºÔZvº=b„íæä“¡úÀé±ú@®L¦¼ö2,¯W‡©ÖŠùùZ6~ž²‰÷µ‡ ãî÷”œJj4<[)Ÿ;|îðߧÃEìÐÏÀTú$.t×_j{=i‰ »Ë¾.¶œ³“=È>¦Úïp¯…¬´‘­íd©àˆ»PØv±ùš¶E¦oWÞ'Ñö„Ö¶óf4oJ[Ú~Íþk6µlVÛZB/íÎYƒ‘ÍÚ¼]xoK¼5½3»±ám>«ðY‰ŸDfˆf†Ëã£dß‹bß,Ç?9{mÕ~{Ÿ½öÁVÜpUkÎ÷ØsÃ=FÝn§-ñ3,³4ïžñF(,¼ÎÆNx$œ÷IðÖ¢…­7œôJ( ¾güJ·„`fß2 ½„¦TM¿Þø»ªìpÞ|Ie‡²®C .3†æÅX&ä|œ CµX -Á ¥›Àd±m^Fãzû L8gQ¾·UÌÉáÛr®ÜsÞ¼LZøpÖÆ\Z™ÅÎl­jh…­9[›ÏÙ›Íâl*Ôä|̬HÉ”./åm\µ=çAÁ¥LŒ',ЛÍ)©MÇe^⿧­+õ^£.± -Røý|rtu%i--ú~áKâÊÀ/2][iå„FÚTVYžÕ„KU)' 0ŠEŠë/ù4—my¤{H×MJóÓY̵CŽŸâÒå­¯øb¶m«™©™c¯{2uŸ²—?Eg²–W«Yw˜svtEd,±r%ò{, -Ô+û5ý‚K··®€ëz‹ê·E0¯†òRo õþªæ-+.|ðºOq}”²žËé”i¸÷b³ç˜åè3BžJȽ Þö™!+“ ¤}ÞX½B àæÁ—e7«”ˆ­M Éüð]¢G¼k¹Š¸Æž/7Çgz\–îÕ:0®â"§¸ ¬Ï‘׶]?G•Q)t[4o=ŽõdDo5 ÷€"ít«‡±†z«üÅÉëpS»EêðT6«N#È<¹<øœc¼L.yjå”{Сe½ž‹q™bRoöz—4³Œ4ÏâÌó‹j‹\Øœ+¦-çåjì”TM©¥€“¬kZ«LµÈcĬô2ÑQå‘e&¤"’ŸÚB(k¼Õ’äeQ ví:5^p‰Iè¸Rú:ÑÞý©öúj—Ü©ìÌh»cY¾ù}¾‹Ï0N¹óÜË·º÷•Ó–NÓû¸Ü‰šEûK_­Ò^e;\8íDB3¬¼ã’ôZ•7ñ‹‚½i•b‹ßwé»*ɼä]…oLðó*ó¤U2ÙœúòÖ)6k•Eć¥\®¥§uÅ®Hy’3æ ¸® Õ*'±¬Ô¶­÷(‹ç’ÇšaÙ2Ÿá•Š0—\Å9¾.ZÏ‘€~ud…¼“à@äh–¤8œŠzçjC—U³4IN47ÊÂ}2ç»Ú/ -‹ÄX–)+ÛÉŠåUÓjÑv9[r*gJ™9%ñZXùÕJlÅirÇë@n“Š/-­Avž´Ü_Á¡®„rp­T$J‹u`ÜáœÖZÜO+ŠõAü‚fçè³ÏY«ó×Ášêê%‰³/`ö/Àp²HˆçCÔ÷¯—¤ e -l½Î-9ˆÞèõ!ç¯ôeÎh -JZqW¹$ó}kqª@söŒ4¯ÈPMq<™9D^´"Æ£s‚\¯I,|—¼Ú n-Ȳ\ç%kq -3NâF¹9IÌå«áSoSÁ›Ý‚ç[2®Žûñ¼ëj=‚ãül=Š ecì×¹B&B -rN\u™(sô®ÒæfljüXÃ̼zËœ«ìpéc±òÐÉì–Â%)×âK‡HñÏ›2Óê™a¬ÈQú ·A‘$š?Âo)*®,8_ü€[Q¾·çj›®Ø¦–ÛdövOØud~frµ’dNþ™™ÞÌ8{¾ØŒ¢¬È©œ¡¥ö Â>r2RÚ4×Që’­5<¤"uX›+«MãÕÜ^÷£ üx²¹‚œ– kôÉFúGõœÅqä¤ØQ{Ýõmw•–%Úž¨?Ö¢®õš/W‰iREÙ4§¶r-8ªÄÔu×m|ÅæÇ÷Ecê"<‚+µD^Ì%ò-ã7êÛF.šÇÕ¡Æë„UëlLOÐŽiQkH×ÈG:ô§ÊfÙCÂẠÒ4±<hw2(VÀz¨@|á¿IkNô*ßKÏc{z”rµZ,0•HÊpæ@Æ…òOeŽã¢JçrÇNÁeŒU}ls-UûMÆ3fi×w1¥_ðP$—“êgÑ]n½æÒt´¤¥-ë.óHŽŽY>UëZU±N—$½hwOúÛº†YE'—c´,ËSæŒÔÌ™—3ÓçÏÞ‡S‚EÛ, jf/X´…À¥bFÌÙf:'ƒ%¬³Ïô®%«œØ¯¥¶Þý±ü-ËtcQr‘~óun4ÿŸfÔ€š0®ô§YƒºÐáWP¥¦Æ[×T©1t®ªJX)ó²NÒ% 4ö?ë%I£WKqøe©b2œÔ YŠC -f}DªÇzíÇÓÕÓ%‚LXÅuªÿ˜÷Ú¦ETÖ°ŠêÊJܼý“Yp{³Ü’ѶP[N–nvy¶ö¥—þÂI_D48„s -ï1I\œè% -?ýK˜¯éÎËŒù›EÆ| AA|õ5•;‡¥qHšVvçªt†F~R† -¶Yö%/W 헺Ϛ5+¥ÇùÕ-Ñ»%yç q2tÍè>SèÁNS [²ä$Ùí9¥ØódjÖúH–gÎ+¶ÑÌb”“¾uâäbûEz1M0¶E•ƒt*8Vò4X=ȪÁ™jÈï…aï\ä3êw€‹>(ø¬Â²7ˆ˜7Úoª Ôš¹úÓl¿ÍvYçâ´p³ÓùZµ -Íš²éŠ\^ûÞ³¸EwÚ@·d#Š´üˆà›Ó+…äÆé–à;p-¸¨eÓ:‰ÔåäŸYäjþ3¹—:`«B\ùáÁPÁªÓåJ‘âXu>ìV^5‡0ˈF—¾±(j¿_%«ÉNaÞ-LJ)W–ªô óykâùîÅM,¬j)©·ù‹q¸­\OlðÙù¤6|_ ªñ%µ‚e¾ŸŠªZÝbàËŒ÷…o›÷n gÊ?¹P…“[çÊÕ¯*@…³•µxUªÉ•¼¯mvc,2Ô<Ä•¨–•¦t%ª#¥s%Ú9@ȶØS9=ͪ›š·õlåçëqÆb̧Ë?ë,«HI5œ;'¢DÍ^6Íu¯^G#Wx†nÆënn»Uâä'êÆ6Q=iròÉ•¥µÖt—Љþ„Ju—êOy =EgjûªTÛuªéd¨•M¨|@øˆdã­”lJK‹0SC½2ÙªJëÕÌ®uÙOðõÚü?p,™É%=G2g“ù cym±‹:pEµ¿àôÙëRpëKXïm¹G[µ¬0‡/+­Åúèd­_´aÑÆE›VMÊøä¶Y´í¢™ÿ;¥öXÊÑî‹æ‚¾ñ.—w&·òËqKèt‘{¢;c¶.UI¾Vðh¡Üh(yÊl&ΆÑR÷cyd -ÏBSúðÅz¿ø|W¯uÞµå¾.÷}‰‚/Ü.¹ßŠr“üöù•Í.¬N³éÿÔ¦¼)B}†r¤„ú‰Ë·Ko¤ ŽŽÁ²eƒ|+ée¾£õ9HÅìimØâã—Žñ|’T@%—?Õ~&™­[œŒå;²„×p=ÿVþ~+oùÊÁXþîšžû=,ŽÏú­ÒÙä?r@Êþ¡½S°.]`µš¯éÃÚII)ÔY $­k¶a¾•D#é&vÄ¢ûÌà£äΑ*~˜ÆVÊøiŠ¥Ý¡Ý*ÈEy8’E ùcßX;‘=Ô÷§ôþQJ>;g#¦æJÏÅB -Óàì¼ÞvßpÀ[™õèbÍ6Q-2¯–QhxuÊÖCMÍὶ^T¦³cÇ.. –«n»·êPœÐ=;(ÆÒ•z\Ôrºîž¤ _U‹«YãȹZ‹FN”±aGI>ßI ½Á•þ;v!÷ß—)*‚ —f¨`%"˜ªˆ8?ãÖ†ˆô7p«#Ü(E…i¼HMDŠ¢DÉèQQ4K€¯#)ŠZRõ¤eDmã–tˆ ¥§¤¯D”™S |Á¿)Q}KظÁÚn|£ÂløßJññÞáI}K8«z)Õ0eÚŠ&ŽÐô‹6m¼§­ -†J-ĹÒ6'Û¶lAþ#¦¿q)Ñ4Ç›ú¾ì]¶7U¦«/ÌÆò¥Í–5mBìœVšÑUïì­%kµ´UÜXXEˆÕ#Áê¡_• ¯p&¹è©¯2ìˇ~™) V¢À±`‹ˆ0‹ [Fœ×bÌ^OÌ é—¸øŸ1å³åœ*ܵ.ÝåêU­³‡Uš`Ÿ(Ø¥ -vI¬+¥:M¥fµ/sÔ¨ªÕX±¦þâªZcå«×Êë¢d t‡hówR«em[.e¿Ö(°êmOW&k6t•NAT Ù?<×Iðm˜YGÏ¡+«rÜ$òoø9ùã¾ÈŽÊ¶‡œy¶0âÝ·ñ»¢P™+`Nfˆ>§M]o¾êSc¨*uûY«ªzUÒ¬ÀÚUÖ¯²†u„8Š@‘`·@‚R­¤hP BíR¨): †IøñhHáØþö(’]!¿ÍÊvâËH­ÿZT˜©·åº¾Dç£Øûë¸ïέ޻|ó®ÿT»{+¯×º[mØÞ‚í«–~ ΀\lÔýÁ]5>ÓçfËÚü|üYi¯Ÿ>S{ÍÏ'O;Ÿõhi(!qÖ®3]Ç“Ëà™¦ól§™O²sð 3ù{ÈLg7Ÿ[=³z^õ¬rLéˆòåM˜h©;XÞ,솴‡ÃÛ -?±ƒ5Äìaõpí°nZ³^Vë ´’*À:E"‘{"ŽÆ$OZ¤†¼6H¢lUšˆîuSKänGù„7ãÄÕ©“Ð8¥oLÝøZã+-gA@‚6‘H”á7\Í %˜}¨´‘HlD¥Hƒ˜ )R¢Å‹sæKlÑF¤?VÑNpŠÄªu­SU"·Ø‡äÝ©Fþ—-\òЪù -çþxÑ×±la xl ¢ø¢ÆýZayÊOíT¨pá©\}ã"$úL…ã]QçÙUzF>T dŸ,‘mE×~,[öd æÊ‚÷sµÑ$Þ,[U‘ÞH“,÷‹Ë.½2²ÎMËôÊ^™Ô“1`رµõì¢_´ìV䯈®ªù9^¼ðΉÈs¾6ùeKÏ‹¿U'"]û`KïW,~[,þ¸ÈnÍ‹oÆ—`ö—uøÞ©å×0¾¹`“N± §˜“Ó^ŽŽ«Y²;÷¥Ã<ÍBßU²f—ùŽÔ …Æã’.²M¬ZäîT‡_¬‘Ywøàîë𒉟mg™a&´{qZÒˆ8ÖKUiŽžÜŸÐ°ÃÁt²£–Íî¿YÚRþè¬b7‡@:È|ŒñÜ¢œ+ÆòùU5û–Î.çê%@©»Ñ뎫&£Ÿ1r~KÊЩCùœz*¹ ‘t@ýÄ\ªþ€Û@*wŸ‹Þ+ÝÙ|ªj÷Mç{(‚c,ªFcÉÇUdÎR ¿×ëÜ®ÏÖ©ãM%¬|Â`m´¦zzm׶E3]PªÉXCkŽöb#‹æ_×áš“ù§oå‰MHùêOÁïçE¾C%m#¬sÁ—ëÉeÞ„¿‰xNÆa—}¾õŠBdN’¡Z=Ù¥#[‚8¼ª³ë–ï(Òï3fwâ:ZuÙjÈzÉ~ÔjsuYt% ­Ž`³ì -ºG­†y·rÍ‚Ü;±#EÒõw¤ë`¦*ÉââJ—êY:Óø3^£nÇ¢¤ dÍ'êÅÊÒbžêFâ[u“#a²F‡MäAº¡ìÕ;ò#e¼e”UTí3¢f4r[–ñm¸ õõ€tqëê-¬@çRÃ/[»n¡´ö`ûKþG‹$.š”õ¬X§éò.ÏGS‹‡]¨-Ã:öuõ2öÀE—–ì¼æÒ+­;SZ­ò¢¨.ƒÓ].×K_ÐR{Y*¯5ß¡ø„®õ—^Í¢Mƒ™•Ø¦Â fÎ,²ÔbžÕcf5fXi2gÓd.UÛ5]¦i2UÍN…gŠæŽ©cÖáÖ® SÈ»Vq-޲¯`‘yUŠ­u¶7 ›}»Â0²2,#5,Ëŧ–®ÒŒgmpzrAµ¦±©$ëÊ3®)¶m=¶A·l5q:ó*Æ­q®Àº :ñ2êeäÛK‚Ö­áŸb ×§ §X÷(¹ð%£ƒš}ož#†µbf@Îч?jÚ>Ž…Ø¿5^Åx‚séû}‘¿ndOß–l1~zðN¿Æ綟Ka¹swŸò`Ó Ç@¶õ½t`¾£N­Ñ€e8Ùý ËC¼î±\ðó#:‘ø` PÖË£Ð+îÆ#ÒFúCi¡Ÿn¾F„»êÒõÔµE„ðÓtÈ£û²OÃu߶ìøõ0¦øh ZöÇccGmxŒ6áÊgÄ´4˜“Æ'Kü9Ìs¼†éÂꌭË`ù=Êë»ok^ß…!Dõú^¸9žk'Ùz)?ˆ uÊÑnå§*Õ{‰\ÒŠZDq -‹JŠ[q]ÍǬ’é ³PÖ[J!sf –UGòêHé,U"rŠ¦dªÄIê_mDTÛ™#kc:WÝ “Õ»ãX¨{Q)JESE˜V1X_©VljűT+æd—µ¥Çlµ…ª›tÝ;:ûÄ.]A³Ë310{åg˜³>Ç#‹G\ãÑc¶Úš‚ Êbí!22xtˆÄ©©”>ÐÊž­á™È -P)2$Km: ìè†ß#˜ú)kô{ÁS/b"¼Ž¹”¾q~BŠœQð±_î,†UqÔÒmxY&µDu³ž6ì*¯®¥÷oöý=2•°½fîVC;b6ÙeñúÀmÞPµQõU×Ä{dqlo[ÙÛ|ЗûT¼+Ùªw”x‘0>ÞÙ>³SÁQ41º§qz=Õ c‹ë&À¦Š¯ÛÓÎjÔ•Z³Úüçö$üéux¿.[LÙA"'ôù‡w‹Dç ätC—ëN9‡¶°òÕ«zë®zK'½Â5/˜WžwÂ[×ýÎþt[«?¯âõ©U‘f8Ô•Li"¥zò “)$Q’¦»*P/QRMx­‚*qÐ+Míu'®))L™ËƒðNd§[ÚiÝgÞåÁvÙbøl—[Ýå$º‚ÁH¼Ç²Ó’ -Jɧƒêeix–@ÿV^â9å½ü½¸Iõuy³”8srE©r—áõä§r‰\z¯ºRBEN¹O=+¤„BJ¹Xú<-¤„ ¥”,6.™ ?… NN9ÅÑjtÏJ-˜ZUÂ2Äga&Ï¡]ÞBž»Š -€—H«—í}¡}8/™^²ßEõ·7ü!2éI¡¥ ™t¹ßcE*õvêb¿CU.-÷û”dZµZ‡rL)Öv|Yövüö^™u)°†³ÒêYÕ0 Ü§“x¤zZP Ë#^ÙñÚ~W´K¼Ûau¼‡…´ºt€Ù®Î¶WBÃY‰µ®aò;]ìs)Ùj8L&xêV ¯ÓÂw þÐÐœ´y-Ù>Mw’lÑ´žžD²µž'ÙÎUÉvþ%¥)óižõ¯'yÞX’gº®*âäÌ&L’ROðì3"ç¢ 9ÖDì L-?³ÏÎ<¹ºs:¢Hy&{MQg®,’÷e™™­¤\Çl›ZjåZZå™ÿ%¿ò®øÎY—5ár>èÝ·ÿ Ã\Fä½K<¹tÁë¸Ãz6d-ùÑìA(èβãN–w]%Ç®"k©Œ¿$‘qÌ„5[Ÿ(‰q=q¿y.±:eúÒ2s(ò—ÕCÚ‡ä>Ÿ›ð\Z«ҋ~ò§æÄn-H"f9þ'Î3¸&¹ìçQ´mhj´  0×TIaŸØÒ;»º•Ç"ûÏóå -n†²N–)^&ç=¿³2G>Ó˜Ö{bùZËm‚S£ø¨.·Ò5v©’-še ™š¥êæŒd­= £“‹óš\Êè­°µS¹5âSÏ1wèWßK!s.«BE5q캱g&_â¤[qãàŒÌ¤š†&ÉxM2 '£øyLÂeÌÅ·‘Ÿ¶®mʲïAþ+®‹Ú–ÏnÃéÒp×F2ɳ¨±*é‡-`2ŠÎÅ×·’+Ä×ør‰^%5Òï,V¢uš³¡¢ÜIÕ‚ƒ÷¿!}ozUvÀÙ„…ÎLCòÆ÷$HåßÑÆïŠm”, ƒ)RÀîiÓ'ÛôDVlˆËc¦øÀI·)Îb¹Õ4Ùå1›<ËçÍÕM-·õà¥ýÊ-È‹Øß´ùšÔLS‘[ËÁewQh.°F‰A'€8iu­™ÍHîYY'ѨÒÖu–,ÜfàéaQNVHŒ‘àà°©gàd$c?ÕÕî„ÊlÉÓ–ÜBDo{`/\ÁÀÆ+ú[qØMæ–Ä‘·'—ÞA|IA×QPV]Ç&ÒNAH×lþdì ¼•–=Ì6¢&Þ‰#±6ud—ä¿gµÞé¯D5ã+Ëv*ÇùV.EÕ¹tTÛU‚ÈÝ"=¤kAþ[q‰K>qÉ)îªükôi3ÂþU8Ç«ücY ­8,ö´\׳my[¦ÃÎ -¹“ù°)Ú}JlŸ›u]°ÌØ9ãyÎy¾Š›éðƨô$³G»ª‰¨¡ðÉ®öN“ÎúU¤MYÅ–| ò߃Ă“‚A)¨çÁxBL)ë4f!a]|YD…`Ò¢dË"þè”3H·ÜÏPlg-»yÖÊÔrÖû¬õ´kÁ¶¬o äöÈöÆíÃ^tu; dâÛ~#ìÞ„C%´iÐmÉZçZ\4g$ òßßפԼéyÛOUíÑÍw'=”µ)ÝY÷§ÝÕî)ª÷ìœZ^"8 mMUwŸjv¥œ ‹œøç²â/)áŽ+Ù@Ä8ÄXäÉc“Æ)ƪ‚D¸º„eAQÍ E:Ï–í âÛ¶lAþs¹è15gó|4ó¼Êå¸\NÑXln¢ø\­= (DwÏ 9)½¥…ï¤<#6¯ÏÖeë`²cÅa8ç'Õ¹¡|Ÿãι>9ò7I†Ïûjý [×Ê/Tìº,ü‚aèŽQçRQ’¼v®î ›FSTy฽eudþr–9-í°±RãIñÀáÙ/ ¿KÒô¢êålµ\Žt:ÏwµÞâùn×Ò£¾*Í:E—Kw±ÎŸPfz¨'”ÀL8šÁª+£UžNyú”©QC“$–ù ±s=Çqšì±Îqt±ÉÑtæ¤é*g#Ìå=\B_ÛÃÕõ뵲몌ÅþЭåN’(¯Û¡Þ‚¼r;‘ô̹»øƒ¾=,ÚÞì—»UiwÉ ÉZg»Ü©-‹É£]§|‘Ôj¢µ”÷ 9¿-]\nˆÝ lv‚ÛퟟeüÚcfv,ßQ6´-P€Þ$r#!4"øLGá@²bç ‡ËöêDâÝV|ø;Ø1NóÁA¬EIOG Ñz¬å‡Ò;›=O2õ¹$|öäÞH~õcËõ»Y5Kˆ£Ê¢R8IÕU\lëôWÿÀF’aÒ²qâ£2St©m?­oÏé¡YŽÂ:»ùYW%2ãt¥¨OkV¬2¥Å؆Òl‰çýœ¶ë®‘*ŸÖÄæHÛS©Qø_5¦¹v®VzÑ`Ȥ‘‰=!]j?\©œ“çuH£­"*†…’’WC­´/…jÁ™žƒþ¨®Ë ôéjê1>ÒÅ2>]—4ÂAëàXaa³ó9ËŸDMvÙ–ü^sŸ¥5ñéú|”š{jjn€zçTgÇò1aÞõÓëŸK—ÏìÑGš!Ö©cßÒùs0F µ*x¶æºÏújU_v‰c"ýÈõ'ò—?èK‡kàr¢NN©/ù±YXÍfŸlÒT>š¼gëR}fuÅN>ÁŸ]Lz‹nL§ÿó¥5J²J,È2Ï^³‚Z²îƒÈB †fõkÔl@¾Bmi]Õ)Yä¤êÈý“Ü>¹¾îamû¤VG¿®(F›Ë=ä\T[R6Qè£DTœ—øòôÓÕ $íø,k‡ûª»ý •(Œ_\>;Åù*÷Paà༂ë¥]N•tñŒ… *G=Ò`ˤ£y‘ç¬ÙÓ<Ç)ç¯ìåšC+ó®Íy=ßy=U‰µ-½A¬p¼Ý ³úN¤~šb*BÔs¢Q‰Zžƒ§ë’½B4S¬7…·[ýv3z¶‘oÕ×àúp)´óyªÏ]1øî·ïÞ~ûáÕÛO¯ÞþðÕWîæñ¿}éø/ßÞ~út÷á-\I»ï^ü3\>ëh Á$H<®zXα¿j[ào˜Æˆé+šæú™¸ Vø ?ý•~ýïðãÿà_®ÒÕo®þé7W/ þ§ßÁ‹>ß8t{õ5À–ï*òá¯×ý!è-½íüÀÕðowõø7öü`Ûæ7wíêÃG÷h¿~R?­bºåuÌ?I°,Ü'~Lº¥ÑýîQ ÓŸ649œÖ8Ã+æÇŠ´ƒ»…ïa„‘µØSߢ¼@P` ‡h˜[šÅ˜®ñV¸jG`^#¦tÝêzÐÜ"×ÙÓ'ò |C4ˆ€«×"ðÏõ}Ça¦öºm:ê„qoùÕ@Êéã=¬O?— Î<ÌÚOa±ËWûþu(ŒF°Ë5Öù:¶D-dJøÏuj§²_ú´Í‹3úe£áÞ]ÁŠ·ø5´0ÝŒÉZZ¿HÍ ãBÀÕKpZ`` Ùª W)eЄ)LZ¸áórÓ=^·“"|Ç%̽T9Äë)šÖóIÃzâ(I]^q$pˆýõ4Ï©<ù<ž<¶¡‡G‡±2òIŽ -3Á<õ†•¤é46”û£Êïc…\êݼí°8à0¤q¼ÆhAžNe˜:E?%&b†Á&b±/f­¯Ð!Ñ%‡pa -|A&žï*x (äÑEÉ/\mFCšSjúÚò :¦¥<„ºMmëa9‚c§Ùc[ŒÁn?ˆÕ{Š\ц%EUaIykÈSC²ÚQ­™‘¬ÓŧÙ\§¡A} ^"€Á8n¸L¢¤4ð†O1ÞúIúB¶ ÆN¯‘Km;¥Óug™k—ax¥Pש·Ï‚ÄÍcè}G1.ï#½ÛR¼ñÀSˆ¹„­1jf߇p§0„ŒR•!üÞ]mÅ«jlM`ª°*O¶zÕâîö×ù}èvw¬KçŽ?L+ª;Õ@÷1@ßcŸ”£zNñsÄE×`f̃¾÷÷¶[°ê]^ç#.â‚3 -8–£@l¿BžŠ,aU~e¹nJ^”4½q°ÚÝyß}ºì¯Àw…¼ õ+¤¸é°Úõ³<¨K>Âó'/ÞlŃ,ø’Œ -Ž¯{–×L㥟åuv!§ø½RÔŽLß8rX¨ñT¶ÓÏ~]éOßóÇp`…ÈáíKQu|‘Feâ¿l?|þø£öc*ývúeh®6ðý§¿„ÏÐ --I]GB’¯àîî¡ò,eƲÃÝýª›{¼-gþzî@¶nñx•œ['oixß ÅEíIƒGÍ&2jšLIï™shŠ nªÕ`1[B1"mæµ16~O@½ `ýa˜çQzpOxDžH€Q_ $ûg˜ƒ`ì;y[š€1á·q´AŒ6ä®I£ôâbÇÀ &~UÕ n;ÁZñPI£ÃEOj7Àª00 £ôŒ.¿ìQö`àÇw'¤”d2¹ò²uhˆ÷ÕìxhÄ ê¤éuoÜtºBxï1p§^0SÚÁ¸wòq¸ uÍc?È“y!GíqñvÖxçA°0FV ÀðÚ‘Á¨Óæ-AŠ”×¥kÙŒ– ¯2yt µQG.ÝòûŒ*W#Ó÷µÌ¢CFRºˆ€KIyç𢒙ÚÞnºÔÉœ¦¤„ ÍJ‰Q1؉hL-`N£ç Ä»:é ‹‰âMpæú¦+;˜#ôª§änšíŒäE/? Þ23ÛIšº¨} 90p²Ã95@øópbF=ÊÓÀ÷Æ t¸ŸGnžYt¨>àl[3« üÊ#³Qļ ÂE#\Ô/Öqe½£f<z4HSƒöÁqŽîY¶ƒ^‡Hk¨7“v€— ¸ðd6yzÂcT³µ› Q¡e`ç=P•‘ûÞ¹ºâhNA ìcâSw'ÝÉpq´Æ¯à=ݶÜA×áp -f -€À± Á£gp'´ƒ>uÒÁl·šˆ¯ÐV?ÊÚίmêoÛž€'8/vÏ¢LÀ¾E¦L^ÖóQU;7‰?ä{êäÑÔÒ€ðÁ­*ø5# Eà„újÔÈÄ„Á©UäèÓÈ[4®úÑaG¸dee'< è©»oL…á <; K‹Z·IpžŽý¬ ‡Nº@¿D™t,Àq6†Ih§¤KÓµ¤ Cp‹z+e˜r¿Ó8+—hød§xÛ"賈Ø1ý•å=Ù+ÊÜ+ -ÄÚzÔÊúF¸:YÔ‰îNGô‡Q/ 1m'b`NïÀ ì[½\'ØY¶vY‘’W;È´Šyr¶ û6  f@'Zë`œ:~•"lkã´PyÉ>ÙOzÀ#ÛÊœ„¢ÉÓòl£,sD*%Oês@§óŠ´Q^G¥“åŸû(¯"ýuÆ1o*:3+8Îöì$‰*< ÛÔVoÊåRÁ -øZŒîo4*sF`%[Ù¹eå§Ä§Yˆ^É! ¨“°QÐA?åã…®Þ:†ØéOÊN“œ‰AÇÖ=ÉŒ&&aˆÎ™ÊÏ Ó^däFÝ/à{"^—ül«f€spÅÔÝM(I”â[rÍJІyìäÙ±QÚK¨-À¤˜8¶1“¾Ø0‰é屶itJø&›ýÜègáƒϸmz¥°3?ÛñÖó®Œc`7 -L½¾À­ÒÍ•ý Œö²Aˆ=©»B²+w€"žöËÒ6þÎ.Õ)ÊmÐð^²4“Ü3bœ¾Œ1n8â²Ô3°ªLQ?¨/§+g‘&.$ÛI×Ùll{}R??8„’3÷œhâ9˜œì5¶¼0 ±|Ttv#"YVÄš^ƒ$l!w ìJB^?êj¡"‰;èLâ^´$ÎÖ€ä+ª"þò‡áp÷J²€ÇâUHzw÷£¬5nKÒõz¹P;XmáÍò)îpQT{ÐGá3:îK&šFãI†F/>ºz¿p×6þ ™0Eã4òÍÙ¡²DV‡—;÷Og%Æ“v0$ÅÂnâÅî¢“ß ¨ÄY—[©90V€çƪP¥âÄw€Œ¨‘îtuDb¨,vÓÙ‡ÛQ©.Yît´ Ù˜ÞtÓàm’‰`£cÄoкÆÙñ±½1@6ÅÌgâJ€À:éØ2Æ s—Œ7u„§g¦9FæÇx1CÑÎÀ©f„´Ì4Ï°özuôl³øŠ™fQ…I¶ƒ›˜ôlluu¨cꧧQ·Ϭ7píùÐ -kÙ¢a^u[)))F°DºòؽbªVåɤOæÝmÑéÞp–ѰͺR$ÝCà0Ø º^îÙ6¹K=õ|lØ*³B+(ÀÉ/aî bάä&†Àµº6[fž@j'=G¹›Ñô((ÌðÍÕô&½áº ƒˆ^ª¬@ÆjЈ§î•/Š²ßMDÎSe2aËtðTÚñVcñOµ¨6‹*I²Š‘5 kö£^_Ù1–K³2²Ç,×f©: {F:mrøÀ*o—$ë’‹reF݆¢,ÐyQ’Í°ºvtì’ÁOgZÙö"rcÝ)]âçjf•Ã'8¥v‹œåû¹UG1'Vàšé:t¢Ô› RúךF À Õ+xTÅÃ$\ f0Ààä¨p<©ÚÁ}UrÜ+€`ÉZ=ö¦”ÅÛ³q³ägÀÀ-a,yÂë2‹*-ò6LÑ]ãÔ)Yz;znÃ7E/ëSÑ\ Þ±fvjœdMË45ŽwŽ¢ 0é 2æØTÉN¿>£P¬·)ëTHÓ“üûªj{Ñç¯uÌo ÜWôÛQ¯žh ªlApo‚ó8›B»Ó ÂÏ-÷÷"]ôÆBöFÁv’Ì ÀYÇ;LÌÁœ{¢²+ÊÙavË(»½Úþæ«_üòêOÿ«ø‰Ì‡·/ cã}6H‚¢7÷U,Œ‘›"G@y8ð0$ -@Ú{4h…Ž+À/áËà¯à¼§ë±èäØ:yû4†Hê¼E:ÃâŽ}¢#¸gØ„ž"I¨+I¯ïrh¨ðd®ÁÏ;Þƒ8 Å«¾žÐ–¯ÐQžžS›dA{f¬i#òt7"~¶Ã‹€hQoZ~2µdÒc0y1¸­>Û¥^æÖD‘kÁÚ†¯`ÏÀ7òyÆ{¸5—Q£HÀŽ Hã5:ZéÚ¤‰;@+{—d°&Í(R¢¶_öqêd\ÄÒpj[,îñ.(¸Ó#©Š€$Ÿ2%œ]s‘6¹8aºÁ=­¤ç©Ó&ÂuLkÚw>Š<¸ó"u˜€tWóp½µòyäàôËÊ Þ ³¬8^t œc#6ÇžWø…n-'“÷ `œ:ï$ò¾ $M9ÑYM€sj—Ñð- Ã*'Ö,ð–Ï2ªI³EýJÐÑ&’¬á̾2õ¼PÈ?Ò³òìzêéíúÉ–€B®ÎŠ( ¿K˜zéV>/þÑÅí3ú4íhûˆÌ!òËàc1#Ã,ÏHº_éuê ³N@î 1p¹„¤"é)Ô&t΄žŸm á'禸¿¸4vê.4iž‹àu¨°a6`žt`˜àH9¬Öúciíp ÍvRÞ@îûq06:³G#Ú@çQÙ#[ÚcGx¼¤ÉÆpgô 1ú K;²/ -/o“ÕO6wHòì8¤A—†?ŠÓètsÑË;Ê™ìVÃóýµ€»I) :w1¯ŒÄŸù6&£;cgëóå*ôÍ Ïöƒ¢=[W ¼ö¤÷jŒÖÉjy`œa´¼4±B ë%èc;*ÒÌxˆueÆA?Ÿ¯ö!ñ¥ˆvvæ½™‘ -ê¹i“>‹ñÞÚA£ÀÑnŸAÔ 6'c×מÇvÌìÀPÛÎ-"Û¨[Nî½Ô-ŠûÒ>Ý|vTÖ¦­+ƒÑõÊLµ“u@þ¼ˆÂ[ ÊÝPI‡E…TFfÂpØ&iLÓÛA‡ÕèúIÉññÚÁœø4 ÆæNÀÎu|«ÁÑ–)DHvâäÅàž× ,|n¦–·xX“ vQ_Õé¹™"ÒJÙ„‰”÷Ô»b0–zêP5(ô]Öy&2ÆgEŒŒD`›äÉ®UþÀĨðtQÿ"@”‚¹Wôå` 쎠Gë uÊu)?ŠÊ+aªvbà8§¤+«Ì €ayt´3KÂàa¯s«À¤ ø„ÖúA: É 0±¹½±<ûjr½1E0lL£<:d iúGû¸^˜ðñ™Í=&{² «åàÇåY‘…6èçc´ná'y=ù¼óROLø¦žÕýüi“'ä¶gy;awIº8îr„ÇÛN‘8åÄQ •-†ÉC¤aÆQÙÚ÷‚XÁ£­Ú|U"x¶éÎLüæÅdE8g4¼ílõ¢š‘T+õ¨Ý”^‡QfÛŽ|SÑ”C%Ê<‚ÖžUØ+Ay]D G Qú„úF¦‰R¤Ÿt´]2‚(t§0F%êƒò\h¶œTi@) HÞ’L<É€£é2öáFÎÅ!#ã@§#UÄ<²¬,hÐõÖ™õùeH+¾ðlœ'é58NIiß(è5C-W§ö;Š\®óÄ-<*ór3ª‰tYšQûnu ‚óue'o2Ýô+bÇNÏMkRþúYíW±¹g2Itn¢çžgÔûk(Ýi¿™÷Ô‹Ç0´ÊŽLLUŽ_ÉÚæMTZ=êŠMv_%Îhv Sþü<$eü„wgŽžÏDªT^„;˜ªvºÓ¬ïºdW›ìùÌNº ìí¶™M:Ä£ÃBç^χ2pŠi\!#ÜÃäÏ©ô:÷ºÂ P¸! ÖAÛÌ Å&»fVTbmš¹¹i8HŽŽ.WfÉVËàƒ±1Þ¯c¯Y·v‰°í¦»QÞÔ)÷…¦!TvDôج×PÞD½q‘Î8ß¹4X‚§/KH@QêËhˆž€"pê£î¨ºÁ•=ÜA 'H ‚HîÌê,‚-ÀnnEnáI à *L¬~B …zåÓ tƒrˆM´Ï“šQX‹‘ç ‘8¼´lYB`DÉ+Ï€;HƦŽ¬¢“L«ÃA$®NÈÌNÛ­b2‹Œ`î¦Í‚PRWËzÏúqÚåå²ÂuP±ÁùäŽ àÞ ”ù¶ÌtŽ9}k«ÊÓÝÓëf5Ç’+Æ×ÿ?{o&Wq -#±H€F,ƒÁi¤Ñ2=w_4’Ð,ZIƒF ±ˆ¡§ûÎL£žî¡-äÅ/¶ÿ—8!v,¼d!6ö‹óìxÁÎòœ„?v~lÿÁ$6Žó{·I°ÁØ6üשªS÷Þ^oÏÚ=º-fNWÕ=§êÔÙêÔ¹ø8SÐq™ãâ);OvXž)OB迯zwHêÀལàxŽ< ?õq²è‰£€Y”T!Ϙ @byáöR4¯¿§Sq#A–²¦`7^¡("š)úëbƒ*ȆÈÇ=Úbê)EŠ€%œ[&þ¡­ŒA›yUôd#LšŒJÅ–Å8&?+¢ídz¶V£;5OðQ*ßE¦8²ü+`²’ÌnÒrL<î •_Ü `<ö4ñè‚Ž*üÀ£ø¦Pñ ·³øzóÝE|PK‚ûÓËé ,aY¬Îz»››{(kht[±°*Â&‹'…¬˜ŠÝiæˆÇ˜ØÝ™w2Ï(êoÜà颢ç§g´}AB$ÉY&æži‹¹¤£`1M[ô6¼À ®™, @KØÙtÝ°³Î£¬ËLñ?Z„»„–€åEeüÝÍK®pXŠ¾Å›ZœmV*†Í¯·6Ëvfmyj@ÑN·ðÄQ =ƒ¹Eºò(ž%f(XÁÄF•E¶(G©-!|q0RÝrDMÖ¹°×<}é°RAlóà>q˜¦æk/«Hos}ib\ÝÄàTÔãÒd>‹\a8,Ù `ùÀ¸",cÚŽ7.·¸)eMãmKÐk2ÄT™¥XrÊÐDQe„`”gÅ€Šâ©<ƒÃ0B`yçtXAÂ,|•gÏÒJìKgf9½¸bÁcp@° PÐ3 yZ)éy<#U5= |^»É÷l[—F4Œiv¦0Þ`dHcZÏ×fiÙ,–ˆ -ÚZ:žb³°m‘¥g³”D:"1Ëcq×Æàƒn2u¬ªN„lËe6”|U Û[FÖ_Q!ߊ©ÂÈáñVj¾ÈšeüÁrVs€¶U ðZ >*‡TtÜ¡­Ž2šF%ùÃøa³ÅáF ÇUJèBR±ôÒËŸ=®òŠ±¶p-pMðµ/ù¨^œ—%R´tzÀS]ÚV˜ (€¶ -šš<‚N%âúxé…‚1œjbR 1ENä+KAVÖ=. `YØoÖ0]š)*Ì÷†'è;óÛ•ê(¢?½­Â€–ÈpI«‚]/,<¯€¶˜d²fÔQ‰±Ô3QBài–ŸY,,?ÀÁ²©âÒò ͌鱋qñ!ø)²38Ï×x¾=> “sA1ycZ2ªô­T~õÅg¦@iLgÅÂÌM£í…:¯:>Ë…?ÛÆ€[ -”Äé/&êF"øe³ƒ:¨#œÛñh²D@Anx˜%5&ã*ƒa²=€Yçö‚:½ãEAUËwÉê-P ¥%góýi‰°ø ƒx -™…ÇR´­ÈÔBŸ€ŽçÈ2b`‹]‹©Ž­í” -sÛ §b[```ü -×Ëqäi¨`J+=îE OsñÀ‡jû’G…„c@q‹3#L«‡p–ãªÏóL¡ _Žu2XìaB©ÍO94™íÕ€Y¥É¬ö¹®oã™´Ä~§7†m‘nÈ€ªŽ9ˆªRzG\ä$óô7q¢-ùf1Äz -F Ò`âi€ƒ½À‘­0ñ¦©À¹"'™mn„7ˆ¢õ…$‘¦–…©Úxuƒ6Öñi†£zéËüˆšM¤‹FpX/AÕàš5e–ÎM2h©cZ:-5€èÒ¥ð# -¸Ó¯b>.MLg@Gä·Òrï;qlašÈ>3xÑ -¤©‹¬-SÈÔå&´…Ö0C‰F”Ø°ºàB~ÃB€[ÇLnMgUm‘ÜÍ€d¾‘4YVƒ$@¼µecb€MïËÈ,†ðr¶)#^¸£Á/™ÑaE–+OÉ †ÕDš- o”Ó øÙV L#¿AQÕ‘éÀË‘¹<Ô4q.d°;˃‰3yÅ8&]ꬸúÑYx™ME4t¯?OPÑÙñ烂¡ˆ©p ž¼ë¾’¦±ºJìa†ƒ{ÄQð¾"~ ‡âÄŠylàFñ0UÜÓñJ -Ý üzT¸…§`<³Þ1ÓÙ• .Sø•B¼­0ZØÏöåÜ.]ò` þTF(xCd­Ò¶6ƒRŸ–MÜ·4““ )~²-]ÅTiÔ¿ çtq@÷¥w±B%—¿ºê[Z¶;dvq’ 2ÑÜ-³è)z“#T°.$êˆü|Ðf -’=ƒÎÆðZ$uµPŠ+ÂýµªâmGtÒ,V¯ƒ!¦›ž -ö̓® -ÕÿXÒ„éK!XKYóL9ÙQ4߸Ì÷PÄŽçk[Ȉº8ƒOÓÀ»´–©ñ¬êªânãjŒ[lß½[æëâÝ_7i[±óðt¸öÞìr-‘®ƒùmŒ` \qá§5PpAA Z:³ÚDˆÇÆM¢Hľèeî\;Š° @à)ÒãÉ|1¤g‰‡ajÄeKÇ=nc P74ܤxu…Fqy¦-éûïZˆÐDº0õ‰†|yÔG¡+`ó»h°ö,4‘rÕÀÙÒű¥) y™ìdF7LœDqb†p¥¶ŠãAn¹ŠWJtÒ“OÌ9ÑØ!j';#5pežm @}Z_‡ñ5¸å‹p0:¢:fYÒ#a[×pwÀ9¯©à°"v§Ê›G, BÈ4š°ôà¤Zf[Dc—ßñs—à ”)bò¤†‡‘p.oš|¾<±NÓT¶ž`c ;ßÃîä© ÌNÖX€wk4vr9ÀÁ”tN/?Š͹½™Ÿ±3 8u‚¬ nÔi,jÈ€Þ¾QøÆ•MqQMóŽ8d~©•õç~¤¬‹0®æ%2@ù ‹ó†-d¾3Ù°üDehì†#*ü²£&*ôÐÌSÆð¦Þ8²—HB·À+ÌÀ2θÉ]>_êOpYÜ…rŽf!×ÓC€£j®"Í{c(âbº&¤½, Å"¸ƒåÅÙ¶ÇrПf^ŠEàödŸZ&RÀ¯8«QÃ`"9Ü»(¢á Y^°£áæ´ê"^¬³ ,ÙÑM>€—Ǩ GV—¯¼½BÍat5Øó½¤yM(gpàYÜ–…ÂN0PÖ5ÁCxE ÀnSˆU‘اñr# hYîZ1¯^&ºÆ’£#¸‚7iÚ=OlðÊe³´{÷ =ùãi÷N?¦@ µŒ pt\-'Ua÷7 ¼lhòË"pÅ@C…/ê82+ÿÏ¡<ƒXf€³±@oiÍc¼Dd‹K§ºw[ÅbØtéü’éÇJ¤éÂ[«Å¶wÄu¼Œ YkÞBÂ8^¢ûãxØÿ¶ƒmU)àwK}× 4/D`…ÇV5V^º“Þ£Âk‚¼ÄzkàÝo¥uŒLqx?I¹¿ºwa‡—1äÂÔ2Ę×Å 1±Û]ÂQÀ|o[…JXq$Ö]cõë8ÈZ˜´@žS¦ù®^@- •=?›µYVæX?@÷¨4_ª8T–Q–àò¯0¢è¶¦¨»h M  -Öe¾¶ôüÁ–Œë€u: b«øª,í€xv y5K¡In¬¢5\àåÚ(ý™œ†ò8N£wÑÂPÄ©˜Æ\UÊ"0¥a ŠîÐ3J>·¨Tèñ>Œ7Ÿé…R*Vò\¢2‚  ‰Sá¡Û啇n§%‰ þbù‚ªÊK%éÌT±}5vh¸‡ß»Õ™üá-EøÝK•°© ›oòjI:”Dæ›—ïè -°jIàxê¦ÈVÙ _ØwFxŽ:þŠôdŽE‚¸á²Úl4Æ ´½õR¹hb:¡!R4Tïκ)Q*MGÁ¼qÃê% i¦/uÝPé[F9ØÂÄ%ò#ø)bÂåâľlÜþ@CL…Å"“¬ª˜R¡xF¢rím±;Lü˜H5hx]h×Yx ‹èX˜BÃ3ÝÊ蘡SÆóR3ïz‚%EB¯mÙpDºž¸Ç¥ð0 QçÅŠÉâø¨äùˆ˜/@ÚØ 9XQ0[KÆ$KWDVˆ…@Ìc¤ç¥è°ã9¦/'Ce—=l–Û£cNFÉã//]Q‚€…GÀ²ð÷iÉhä!5H¡1¼ŒdqÈA²HU‘y,™¶©ÜáW½{þ´^±)ðpb,ÇnâÓ23ze‘øKøð’ ,Òyit` ò |t[…½Lf?Mp°w$Œ·8¡È?óJ&`È2pVfßñL·Ùþ+«ü ¯¼È-ýkãáÝvDí^“m,_A¨<È-8ÍR€Ú4JbŒ¥•¥ú«ÛpaãkŽÎ’‰¼*Á|ÝÙËȶMëåè -¡ÞúÞÉ䨘T¶1'‚`Íd!Í4wsñr´ÆrjJÀOMH· ‘§ôLòz…ðæw™â -%Øé+ø‘–*L =2E™1<‡9çR~\¡ïÁm-ÀgdÎ@¥ðbYª)®ñÀq A­!&x¨_ùñ·ÕƒÒßñ¹¬…è"óÁFQD2Ÿ÷H&ÚèùÚúèóF-':Ñ6B—沘`ý`Qˆ½ÂY† Dpf 6 }Ù'¯ÿH&SaK©,¥²`Áü™àÑqÄׂT"qbȯüÔT,Ì.)6V±p¨— ¯hÌhe' xŽ…¿ÛÁ"§Û‡}ÃßšX?’JvHaÆ<é†ïªóƒiz°nxƒç$È4˜•i°0d¾C*[éܾÔRMÅó:…Ý»P›Þ»`U®‘Åv·‹¾$TÆœ’Å)3ßJV"·êäøÀ2?®¨L›3â÷3£ÅIAü˜\BQ¹D¿¹U¼¹*YÄÒ¹ò­x€3 ²ìfØ«ž2éÌõôígoÀÀÞyÇ‚kþ¶6»JxR,ØER8~Ñm[8å|Št…©ÊLX‘e)·¡¬¶‘í ¸%l0nÃ"®ýHôî(X|m¼ŒCd‰¨–Ê,u‹Ksxö¢ö Üq*Ê(MÜõË3•ÅÝ PcŠº—2 ŸÝ+1OUVóÀ\ͱœæ@Y`¦u¦Y!wÚ–i× -40KK… 0 ±(ìöŠìUñ€~9êÓ3Xv™ÝW€ŒócE&Mð˜f†zm!ÚÊn\ûFõ€ <°[1ªŸ®ò9H´õzjÌ„E¹]£¥+à'•O¼Å pɈØDž³h&4{’îvQƒË Ì¡RçAvXèœ Ç¾à¤‘¶˜ÁëlÖ†Á€ô(—Ec ªšÅWFÄ®VµŒ±r -T.¤{€‘Ǹ0ì^@Ù B¨©ÊB t,bÇ4‡¾zw·y€:¬$Žå°œ¸üÈßDFãy,3€6”Ãd˪ò"Æ¿¶Ê/ÒÃ\!M¶ÆœT -¤ÎS4X `ÓÒ¼âJt;˲W'ük“½€;­~C*8Àá=¨ÛÂ%EÆ‹Q~ Ãò­m0¤Ña¥«ËjpmÛž£YÞ¥AVŠ0V÷³uöª" -ÄêbHóqéU= -¦àn9M7!±íÈÁU ½Ã”hó¯€Ù[|K«Ã Wx´WpiÊB¢ÍÏ0@®(ˆ¬@Ër´ÆØè‚c̸ÇÛ”u5° tÈ2yFœ·eÌWÑ·¹xÊ´· é -à5:K“1& -I>ŒTKÓñ€ -^vÂÒ£æ8ÍKàgµ”—iT nï±~ bUÌ,‚KÒ,~TAôÍV‘xcºž!L•RŠ"î l ƒ3NL3ç]+€xOïÝÔSVVñJ8ÒrfÞÂB2BëÐä[ÜSæ/Ídù %`¸ê„u/ý`;óS„©,/¬tø…f@”ßÁÖ˜ÑáC.8[`o™ÔT{‹ÍÕ7:7T4Ty+69gêˆñ…˜(Z,f4k*K[+ûfÉÒøÛ4«ƒ}ƒøÀþGúÁ>F)ÚÑ?->!ê³öpòGÓã%KåcjÿÂúð­öReŠà-è–\ÂŒ¼¼Ž•«°µ|0]œAûz—S‡±´àn˜¨Æ÷ûÅv´¹s²N…‚tðV˜h€À„ÂÞ¤aHX6ÅÄ ã×òp܉ eið¬³<‹ªóPe"ËŸÇ#âåV• >˜ 8  tˆEOS«H ?"Ér€Ãû³™Á\*SHeÆ:;˜Šxÿmû'áEf_ ݾkg*M†ië?J›ÛºŽìØŸMºðc*QHe3ñÜ©Z_tK''ÒòU'A+—)ÜüziS[WO./i‘O¥“97ß«RמLÁûþ*œštỹ}½Ôu[&• À!2jf,Øðx<]d-OÕnZ Ú$NQ¬š•Ž“¡é89t(rxJN¤’…ñÐÔðÖMMѸ›/„& ›Ï9M={†{Ò“ãña%,e©$iY‡h3ç¤dGîs…Þl1“$¸õfël¢Q*ÊHÓB>ô‚úl -AQ³ˆÉB17RL»™„vzX×ó‚Ï™ªÂÒ“sóÅtø­‰Íçœ&5,A™âÄD!~Ü Ï¾þ.s¯áb²–¶‘xÞÝ™sï/Ž ¯·KzÍ9…™ìP!UHÔQi•yÚúP*ÝÀú„‘@UQjRYÐû$§{È/Njc\cšXZ¤2uö¡_íAÛ9g¶¡l1—pwåâ“ã©Dx² jˆª‡ŸGIvÒÍÅ Ù\hz¼ó¶kú²“Ù|ªfÓÌÔx©ûì®~wTꎼ½æ #òöš—¢–óöôÈÛ;+¼½Ñ\œ˜ùéýÙT>ò÷šÜß ½'[Ïß \ŠÜ½È݋ܽÈ݋ܽÈÝóóG§ºP¾F(ir—O_p._µË×ëwÓCãñdöÄlóµŽ7ÄT'õ€ŠâIë¨Âìå É~÷x*5`Hû;Í›M°+^ÌçSñL/[ÀV±¥C¯M2¼N·OHx-œœ5܈hvi–Í»…Þ¹ió´íP -[hÃ/$öJƒ ‰l:›Û|bœ¹d!uÍ©tø°(o=çæ'ÝÄbýÐzAh«è/¦ã¹¾l&_ˆg“VÞqœ¥rÇÉÉlÆ•^Ç9§2tæO¾˜'Ü¡D¼‘}èÔJ¾I§"“ωq ÒÜAŽNµ‘ey 4-Ì£ 2˜Me -<|1ñHwˆË¡®[ÈšR ¡ÙÏ4šÝÎ[ VPtHÒl ´]zL ½ÐtîèCR'nâ'DojB꬟¥™]žcá•Ë±–Ð-Í®,ä|:UŒ§ê¹’­§3ã¹Ta|Â-„_©³Vw¶Ž¯Üx˜¸áí7O ¹Ï͹0“-d5*:âZÌQÊÐT#7 $s4{8-4!ÍLS”(c¨%2†ú²ÙtoÎu}<ÝìZöžˆ }Û<O¦Šá§›Ï“›¶ ’½Â’ OÈ|lÊЄ´Š›™L¥ãás ZÑÅÜ—ÍMŽgÓÙ±S-äš,@±¶`„Yø+9M.ÌÜEÄH˜5¥0ë\0¹· ÜÆkrÖØuŠfb¡)‰2n£;û³½Yš}Û‡¶*›~Û‡·[Äx _ÚzUB¯UTE¡Q…)/O &ߺ4–±©ÚM+ùš?#eiÖÐ\Öôš54%­¢Y{BŸ¦öÇ37=ä¦ÝD#‘òŽsNäÁÐ'­S%²¼ã¼é¡þT~2O¸n¦°/>ÙBÊh"N† -}”× -Þ‘,á©ìG%ðcXªéOáM#lÞÄ’²éµWce›Y{…¦¤ÕÂA}põwŠV‘w pV³ï‘ÐzÓï‘Д´Š…þšõÜ^i–Ý7ÚP*Ôh*n$c(=+OŸˆŸªcø·Ï5ÄÀ¬}óFÿ -Ùðav> ½8ÉzYðþÓ¾â|øT¡ÅÊh.;~çÐÆso§‡^˜xiZøè+k=÷׳B‹r2ñøýÿ–ôš‡+N7úÆH"žNìË&Óçu˜‡Èy&´vŠ'ʼnbýÿÂùºÌ9m9—†(B“—L¦ -©ã ':Ì“KϤ&âóV¶UëÐuÚQ2L“yv‰“ ž’V‹~DÉ0Mîm`³4û¶_0É0á)i™€NèÂÖˆ‰Þ!¤2J‡™Óå m¶F:LR¼éÓan]0é0á)iÝ¥ÃDé0Í¢ŒÎ‚tålI‡i@æ7»öZ0é0á)iµ€Pk¦Ã4ÀY;GL:LxJZÅÂk¶t˜¦>ÿilž¶\£ÂcžÖ°«6­Â¬­ÂìUiE˜=æéá­_´±gÏp?­>2ÜXä+”AÔ:**|°¬Eª-ÈšÙQœH¢5 Ñ̳Y¢…&>’h‘D‹$Z“K´9ˆL´H 5»@sQ#yɳ0ò,2Ð"yɳHžµ¾<óê 7v -¿ÀÄZhâÏ¢3¼hÛ„Ù6ÖÙ¼mBm›hÛ ¦NºéÁtüÔpc7›1‹e>_4×%&dÉ=ÉP=Ø@¥¯G+I¾œ;‘­w}<ªõÒ µ^”ð¥8š¿FÊB++¢HJ·*KŠAþ–%ò7ù™üÛM¾ZÊv*“tGS™Tø£“œ;éÆ ý °¥¯ÇœÓRø·z˜ü$”ˆ KcT &*ÓdbšÅ†Z€¯^iäeãMž©ß-­’«,š]4|Óì×Ì M.ÞÙ‰Élž°Šu6{뉆zsßÚf}¸r-$B‡ Õɲñ-4{¯=4!uΡü„èMMHµó¢ÌGÜ!4!áÕ˱ùÐ.S²¡›]eNEÍ´’êœýºs;Î¥ -ãn!¼ÝvÖêÐÖ9â˜ÇFA :Nž‰ãäÆ*K6c¨%:N®E^tœ\>-Ñqrtœ'W.p ¬ÊÝ šè9:BžC2£wŒHÑrt„!W ):BnîXWt„ܼâ`!µ&S££Åðo3ivQÐ 9­"  å5Tå?ÐgÎI;å¦ÓÙaéK§ÆÆ äûΔŠ Mbi·æ]@ÎÀ}ÙL¾Ï„gͲ~sï‡ÖXÅÜ(1pcÒ`§(èÝfa“.¤÷Ü.´ ÓÝc9×Ít ÌíNe’©±l÷ñT6íºsn²;›‹gÆBoµ(×ѸFtz’‹BrsO[’k:\±CŸºÄHM u^]ç_ l?ç|f†¦ÉM“_ -ùøzÌ[¼§?E“øó•ÓÏ¥®tZˆåRØ)?é&ˆ4Ï-À bˆ.øhFh9…ëÜp<£¼ã<¸ƒR¹ãä$±‚¦@¥×±™©Œâ6QÜ&ŠÛDq›†èáQ·áA¾‰â6QÜ&ŠÛDq›(nÅmZ”J7°‚>­¤¢bG­RìHŽ…~5H!^igç”U¶)¼øÍe'ÂïÚx®X/ìÚE ¨°¨tQMò¢ÒE³¤£ÒE³·qs#Å4Ùý­G\`µWpw›Üqê’Ìæ–mýPkø¼žæÎ OG“çŽÉ .w¬ŠZ(wÌSÖÃuj DÇÙ…qLQðÛg æ¨Zh!ñÐÙ=­—£xvÎCâ‘»· Ý½FD`äðE_äðe#‡/røÎZ‡/´ 9|-íð-Ô¼´…èò…®RÑz._hÒ"/òø"/òø"/òøü…ŠÏ×%Mîõ Îëk€¢òúg³É±\<¼Œ\¾–vùä $º#Þä÷wbÅ‹Ð^TñbÎBTƳ!QÅ‹i*e¬± dsT¿£iÅØhš²ì­Ø›GÒñın‰²“ñDªpjsaÆ|áT:|Œ›·žûîFÞÞì;«!bZm3íFl¡½4‚6Íml×4¹vÍÓúŽ} ĨŠÂÙóÎny· îFßxÚäâ ArZE4øº¶¡D¼ƒ4ÐgÎI;1ÞÀö4¾É÷!Ô²ÂÒnÍ»~œû²™|!^﵃þÀCi¿9'1tX¾˜'ÜÆx4Ø©•èŠzfâ¤&Š m‰ös¾ØtC-˜Xfè‚QnšüÒP°Ù×cÞl¬þ -üq>²T@ pIY{óã6þŽÞV1‘";" dùB7lH”wœ‡|ùF©Üqr2›q§@¥×1²—šDÜ.\{)2—"s),C\@µ ½´ ó£§`8E¶`2Bæxi'ì‚«S<Æ·Ðtîo…&¤Nú€Ÿ½™]‰cuZú QšzEÂ+™có¡c=Šiz¥¹ s‡Ó©Â`‚È<,Õ¡XÆ:Jåk6Ñ0nk¥úZc«l!%ükÏ#c{ηӂÔFGFÝÜÎT®B$Ͳ΅øHø5n…€¦*…>ý ´ßÞXÄ2ÐgþJq3‰ƒ-$M—Å,I–Î>ÛñÙ<ò™r¶ˆ³ÞùJ1¡Îܶ>”‹gò£!Þ"Ñ<ü>Å« Í -™Š­Ö -ö'[®9±@£xÈY¡™s=étäëLs F¹š 0OoèõOí={yxG&)^  Ãû³™A2-§ÓÉÀ½îX*ãÿ¢mÿ$ƒ~5tjb$›nëèçÖ·ÉRùÿȉ¶"ùç@›—Lsäùe/ùá>:!éÒ>鮣²”„ÖÛ:-Û4c¶ª©’­kFLÑ[š(k1ÓR €VÌ‘M €jLwd•˜ª+ªØ×Öi˲³ Ûö(X‹ÉŽnù‡ @=¦X¦íXÈcã -°áÄlÓÆqØTbšj)Ràa¦3dÇ–ˆ!°¯‘aj–¿íÛ1MVü­“cÊ1G“­ ¦[ŠÅÇ-›ß¶ÞÂv·e€E’ÒX.žLCP²ÍõR§“ÝrT²dYǘ¬ªšÃדýÝ;ÖÍàCÈÔä˜é§u*:¡ÜÐ ‰gR¬tªs ]‘ŽLzk1ÝÔ̺½²ZYåÞ„¿·ªÇLƒÌz½Þ†sl[“z§ôlMiš¢À³G ßööò…‘u21äk3¦Ù‚o=°“-Eã,ªÈ¦Î†’e›.¢%ÇtÅ6|@Æ_rÌ ûÀœm‡àê‚aJ-Ãÿ°#ÆÆ`2¦b"ßz`'樶%üå¨l“ÄHùË#Ám’ÅþÉ 9b}•ç·*ßêå[MW-M|«ÙŽ¥Wã[‚Žf‘ýï­®h„;Bn`õM|L¬ÁBÀèm–¥®Þl6-uãB$Æ£›ËìÈ@ˆfW1•dFdû0Ú¸þF''³¹Â!n-µ+åMS%_ÈÑã0¯!1††Vž]Ä,šÊ6Ž´/[Ì»RöD¦Ü܉éÀKÀ^á.8WÓ,Õ EN†C5È7º?8&áQ`ÁÈ`jjƒit5¾SQãk h|»’Æ·+k|»²Æ·Ck|­ŠÆwæSãkëaci„³™¶'Ô-ƒh»êfªj‰O¶(×.zU% -;ôB@ªD¶Ê†R·7»2ak¦îåУê³Áæ:±ˆÕ(Â^² -öZ½^™/"ŸD/Å4t«~/"÷ÉÒy&ˆe©vÝ^ºãv˦œ0‹á8¦Ï J¥°Ã$,ùi{2„I>ðƒßP‹€Kc*§µÈ ˜ƒ UÍ€b¡ ªÿ"‘O=“Ü -PÉv$ |lÚ -“u‚*UÑ5©â ô‘™®¨vºöÅóÇ‚ -hO減+¸I¦%¸/šœLAù߸?•%•ʇR™c<²•üU¤ˆ²€|»°}˜ÆÛw¦Òîfü…ªƒñ< ÒE–v ¹ôèû”td?Ü%–æ’îG:*ÉKðÈxõ6bíØ߶u‰²/ ÓNqéâ›%MsÚŽì¹èœ)}VÛ½»o¸ew¯½ÚƒJ[îνåwN¿ç==øÖü]Ý7rðM·¤ßþȧÿî O<ñÅÏ~ú‘ß:¶G¢à•}©ßù_Ÿý§ïüû~ôïßù§ÏþéÛÝž•_{ë‰?ø«/÷¹—^}õ¥ç¾ûä_¼¯0Øð5ƒÇÿ/þÏw~üÒ/ùÒ³ß~âSïÉï_ð«{ÇëCûä7øÌ3?üæ“ŸyÿÛFn^Éž»Ëýõ÷~ìoÿ‡xü¯ÿìݧFú¡ëõ]ý]ï~÷;óø½;µë}„utïÜ;0°§ß^;µ‰9f™0ÇÀ,»‘ LðÀþÊÜ«xF“#í,>ðÀ) øÙgß´ƒ½%¬œá#É_¤}®ÀѾÃ%½˜A33©†]C[$ÛL ‚mÓoÉþEq!M¼Ñý›§tëàÆáÛæà®^Ø5ý`Êd?X*ÙÄ 0d¶gª´kÅþ¶%ð8+¸eüÆ"â -v̯¦ú©Í8SvÆ1™cô¦´Íf ±i"3³ˆÍ 23‚Ø,á3e¬fŸ)`5ø4„Õœá«9Ƨ.Vó‚O ¬æŸjXÍ7F¥(Í7:üÓÌ(Í7"O„R˜O³ásNS¢}¢Oô‰>Ñ'úÌÔ§ÙÔ\s'Ju?Íf~7³‡Ò$X5¿·;ïXUÄg±ªÏ¼`UŸ9Æ*$>s†UCøÌVSÀgV±š2>³Øô‘™AÄf™i"6{È4„Þ »H|ÂÌÁ¢E‹Ï=÷<ú9÷ÜÅu;‘Öç_°ô¢‹—‘ÏÅ]¸äüó×êÍ—.»ìÊ•×^·jÕu×®|ÓåË/Zr>yNõæ.¿âºöNÝÞÜݽÙÖc뤕—·-­ÒeÑâó—¶]yýkçÁ»Gܱ±Ñ‘£‡önS×­º‚t©Ðcѹ\¼bÕç–£Ù7ÿÎé÷¾ï}ï}èÁ·;¼ÛÞ°jÅÅœ[ÚcѹK–_½ÖÚ;\øí?þø_îñÏþñÏýͧþä=o»ÿè^kíÕË—”ôXtîÒK¯ëì½3÷ÛüžòÍïýàßþí_¿÷­¯=ù¹O½ÿí÷ßÑÛyÝ¥K= ý*eû–‡ÿü‹ÿüƒg~òó^|ñ…ŸÿôÙÿîÓ_øó‡ßâîQVz|.]¥{ð#ÿÏÓ?øñÏÿ믾F>¯þò•—~ú£ï?ý÷yðØ€ºêR«E‹/X~20ñ{>ñíg~öò/ϼþý¼~æµ_¾ü³g¾ýÄ£¿71 \·üœ«Åç_|uçžc¿÷é/ÿ¹— 9òôùåKÏ}ÿËŸþ½c{:¯¾ø¼EHÀŠµ½îƒ~ùÏ¿üš×œõyýµ—ŸÿÁ—}Ðí]»‚“±øü¶UÖoùÈßþ•Òö´Ç+Ïÿ‰üÆãºeç/b¸bÃÞûþûo?÷òk¥Íi—×^~î[ŸûÃÌÎu—/*¿ì:ëèo}ú«ÿùÒk¯WÜ2¯¿öÒþÓ'ßzX]yP±xÉeí;³þû?ûe>ˆÕ/~úϾgl›´œàD0º²óà›?þ•gþ«"B ©—þýÉ?9¾·ƒàD:\´R¿ûw>óŸü¢2BÐáÌ+?þÚ§Þz[×›.WsÓ -+}ôÁ¿ùÖ󿬺Òdáž÷îÜ ß;ô–G¿öã—ÏTå¥3/ÿøk¾åP Xƒpëåëö?ô¥¾X§7^}ñ‡_úPq/lØËoØêž~ì›?y¥Ê#ïýä›v·Þì ìzµ<ôëyò‡/¼ZqC¼ñú«/üðÉüú|õE°©‘´¦gìô_ýGÿUq˽þÚýèë}z¬gÍet‹žC&v¥ú¶~éû?©(f~òý/}ômG7K—¢$[tÞ…Wtô>øè“ßc‚ ûpAö½'}p´¿ãŠ ¹ U²lelï±w~’‰Ê׸¬¢ò“ï<¶7¶r™§V¨p•AÿýÓßÿÑO_zå—¯– -cÙ'Z™ø¾d•LÅýžþî¿?ûS"ïâ^^uÉ’Rq Q(wÜÿö÷êsO~í[ßû× *”K––© ¦²ŽÞÿ¶÷üɧþ†è¬Ú*K(E{÷á±ão}ð¡÷ÖSŠ\í^±jºmï¡£#î¨[Gír; íò•ÒºhöºŠwYrÑòËßDl‡ëê›´Ë¢Åç¿äBj„0NXaÿ„1D§ê–—'Y‚ÁÁý¾«Q–÷ eyë¼$\‹cšA¯Ëé1G•áêéeÉß1S6è'òÃ1ü?àW”]v,~ûQsl_*x•ë1ó‘§D><üŽûBöxèc_îåW_;sæµW_~îŸ?ñ®±º]îûã¯=wƯ×Î<ûO¼»æóÆþ矗«Û3Ïõ«?.÷Äó•Í†_=ÿ…b•>ù§^­ÒçW¿zí+•{å¿RÝ"&Á—OVêóµúÝýÕògÕ~{Ö‰ŸC{}%œ·ªß‡ÌÆ?øg~ì^ ÑçW¿zîa_§T[ŸÒÏ¿dEŸñ¯†ìó«—Þ/:=ô“°~õU;}üLýÖüóãw"v_ÝçW¯|’wzçsá;ýêÿã³þðË tzö¬Ó«3wùçå?b>neÙçÕGX§ÿ~ò+}h -ÎL©Óÿœ³NšÂìáD<ÒÈ:á”7ĸ¸ïh„÷žãl~ß?7Ðéi?¿ø3Ü„ïúqèNÏœÆNÉðøýSJ‰G^Ùç¹?ôDØDØ ÿÔ„Oðý᳡ú<ã–ç$¿F,ÿâ )§sNÔPhø9ódP€ª©×çõ§ŽŸSú9õµŸõúS•h¡¦Dý©R•ÆŸõåWªöyíËÕÔûýOü¬JŸŸü¿…*}Î9çØÃ_ýqùÓ^ùÑ?¾¿¦­ã¾ëÑo<ï—¯ýø+v:U« ý¤Þóñ¯=óÂË¿øÅ/^þù3_ýø;Cb縿ûGøà?ø?úÝúÏhÂOSÞ;+_ qqL^Ó¤ÀMú’[cež±yÆÓôŒY pŒe2”fH´êšªë5Š’g©yþëUû w~MŠ¯_Ú~¸iüáYº·kXx'WWá¿Jî±×†ÞBT½ÿB¸ÇŠeZsæ‡< \´H Ö9å;ïü –.]zá…K—.¹¢nÕÛ-½ðâ¶å—\rÉòåË.¾pi•¶‹Î=éEË.¹ìòW¾éÊ+W\~éòe.9¿B$rñy\¸ì’˯¼jå5×\{í5+¯¾êÊË.Yváç-.k¸ä¢¶Ë®¼úšëVÝpƒ$Ýpýªë®!mÛ.ZRÒtÑy4èxÍu×K7­^C>«o’®¿ŽEÏ †f/ ¯ºöziõšµë:ÈgÝÚ57I«®¹Š4 DMŸa4¼qÍÚŽ›:;;7mÚбvÍ×_{D@ûž½tÙeoºæú›Ú×mÜë‚}×Û´aizÍ›.[æ{þâó/ºäÊ•«nlïØëRT|T¥«s#iºjå•—\(…!/¿ê:iͺ1YÕ@ʺ¦Ê1ÒTºî*2(bºèü /¹’<{í†NYÕM˲mË2tUîÜ°ö¦ëW®X.Bå‹/¸ø2²cS4$RÒqlËÔ•®MdÐkßtéE,æS´dÙåW¯"CÆÍ°œÍp¦»Ù± Ú~ãuW‹Ç4—¯XyýêuaH8ûݲ¥»Û±É ±ôñmKÏ-¯¼æ†ÕëÈÃaHÒ4%ƒêj×Æu«QÑò·Ü¶¶4T‚èêë¯ñµ ?&Áóšx¶]¾²*í«®¾\ÐNf©â|4;è|^ŒË Ëþ&‚h•5ºrù…çãj’ǯ¸:¸î†·î—/[*>Î]rñ¥”é/É‚—b;Ú)/ùxÂþ„‘o€¦ÈŸ„éÚo"¬|R°2lŽKÈóo¸iͺ ”ç;7mìX·æ¦Ï,}ÛcñyK/&MÉöXݾ®cùt¬k_M6ÇÕ+.¹8°åàØaÙ¥¤éªn\½¦|Ö¬¾ñ²áHÃ¥ÁmL›^²âM+I[éFò‘nXG´aéÉùK/^~ˆ8h¸îÚk®¾jÅe°ÛËDu 7—©tÕÕW_uÕ•¤L•du-[~É¥—]~ùe—^Ò¶¬ª°#œwþ‘S±tÉùçUt¼é¢Å¤ñK˜œ­-•1µãÜ:Í°qØŒ‘éšÒ¨=ÐhE„ ¦NÓ£VT°È‚¥‡2—½*ªŽ£*ÔdsxùJøK§ÉŽMD]òw•jÒhPgFeö¯&ÖXé<:1ÊÃPã9X¾Êd†¶³5[¶%–¬f™FpTÐòפ`"f‹YêÞ¨ºÎ -à0@ ³´¶¾¶]¾QËç qT¥1hÅ0‹X®ñìäÊÖ­h ÖŽýº5emæŒÛËoh'z¢£]º¼ì«K¥Îm{‡ßqÇá[÷nÛtãeþï–Kæ®Û““'ßü¿ñæ““ÉÛw7´y7õÜ>~âœþƒ|ðƒïÿƒwý_'ÆoÛ¾»/ëè»3û–ÓøØŸÿõc}æÏÿìý§#sG_Ç2öíµ›oŸxë{>üçŸýâÿyê©ÿóÅ¿ûô‡ßý–ômεôË‹6슟|Ç#ŸþÜ—¾ú/ßøÆ׿òÄg?õÈïÚ@çâre`ìÍïþ_ÿû ÿø/ßþÞw¿ýõ§>ÿWúî7 (”²Ëå÷×úÓ¿úüS_ÿÖw¿ó­þòãùá‡~Ýåß^Ô±ãžâïüñ'ûâSOýëO?õÅ¿ýøÿ]¼gG›åk¬Á±ÿöÎ|ü3ÿÅ'žøâßÿïýñïþÚØ y §hÍæ[ÇN¾ý}úاÿò/?ý±¾÷·Ž'7¯^†ß`ì=:ñk¿ùÎ÷ýá¾ï]¿yêØ]»õë½É:ç²5ÎÞÉlñä©b6qûnkM`¢ æ7nÚ¶wðСÁÝÝ›n,_¥sÎYqÚµk×\¿¢ÎJ‡ý4«B™ÑÜHq' Aœê œŠ”*–’/¦c¡CL/ÊB‡˜Vœ…Ž0­HKûp¦ŠÀ·¦AÛ³Gê)²c·Ô¾× $³#î0pÊ‘¼›;î&‡oqO ³F¼rfWéJït P£È6/ É^ –ÍMl&?$³RÞEÝAž©)UÆmpU­<#J}ï9ÁG×h‚£Öh¢˜õ›Èu›˜ëƒ‹°'“/Ä3 wÆðž~²w'gf¢ßi#ÏÌ8¥”ûí8é&Š0hp|²K!Í3Ù Ô’«U~jµY«Wiñ_¨¿î\uj®Ê-&®;1U%[{"Ö옅 -A è1˱.‹^òш¶¡û€Ö,Ͷ5Œ˜¢8JpTˆ`ÍU¦Õ5K -ŒjÚ1Ë¥9dF«ÀÖ×Ö£Ë7jù„‰«2Kœ‚z—ô_SÒ‰ø3TZ•ÙÒ̲¼) A!BòYÿv⌠-ÌQTtÓ!ŽÖj:kEýHY…ÒÄ2$¶A |X1%&ËJVŠ(U Êâ+D±Y¦%þíÄ/8%²¦3U§«vI©Ó­àG,Ì£E66DÐMø¯¼Š_°¡›Þõ+ù™š¡L¥’_x;³Ñ‘gÙCi:8Ì 23‚Æôñ™Y4¦ŒÌl 1df†™m4B"37hÔEf.ѨÌÜ£Q™ùB£©09§™êU4&ç4Se‘&AãœfÂ$úDŸè}¢ÏÙði*]aRòi³­ -ê¦òwæ “Š>༠S “9F¦s‰L]4æ™hÌ62 ¡1{ÈLÇg:8Ì 23‚Ætð™Y¦€ÕÌŒ¹hÑbñ©“®¹hñ¹K—¯¸‚V,_Z£vT&¹jÝÖ[ ÒÏ[¶®»ê’%¥Iôü³xÉŠömC§?ú)þùè鉃[n\V1kõÜe7õ¥Nòñoüdzüóßxü︫óŠ -ß»¬ãÎÓ}㙟½ræuþ9óÊÏþó«ÎôÝ´ìܲÆëïyäég_9ã¯óÆ믽øÝ¿;}gGIshü¡y¡¼Îë¿xöéGîYhοXéfág^ø—š×h ÿHšw,CR/ë¨Ñ˜6äΛ–ð6Knºó‘Ióž>Ý·‚árÓO¿Pó6ä™gK­]J+ð,iO=ölí«»o¼òÍ÷í ƒ/¾dÛéo¼R½ü¹ÇRí€ù¹W }â™z·‚ßx姷]²øœEK×M<þ³ºw8Ï<󉡫Î=gÑò­õ!Óò³Ç'Ö-]´xÅ-ýúד•­Ë-¾bðÑgC\&=ó½eÅbÒúSaZ¿þ죃W4ÐúSMÓšãÝÈœ44ß!×òŸ>CÖ2$Ÿ¼þÜ_^ynH´V,Éßm¾wž«38l5ºȾÜñ¾oÖüõÅ6^´tmùÆ/¾ûá»PDÔÝôgžý¿3(~ê 'ýWÑÆ„U™IÑ ‚ÐU>y\©È²ž²þï¾û♲j^UøM}™3qÿ6­®/¹¢ó.¢Jþó¹Ÿ3]Bš>S]ñ,bjê£ùy¦§ˆŽúäCÕ•U[g˜$úoh[ …I‹r­¸šéW¦[k)cvsƒëîÚzÛߣªMP»"U…›·X“ª<[f¢ ²eæ?c¨~¾¯I¥:ðBNxǶstERb¶chR'›fòbšŽ3àÖ¨bªPrÊÐz!W´`È©Òàm›ºíý ¾!ÔéO¿Û”3P£ÊË®˜¾×Ñ©AƱáh¾TÉÞÞžD¢8q0[ /b$4Ë1½ú–©[aJ¾˜ -Ë°Þi1 KgžÛ`:ó4§j*qøµ˜å¤c©k¶pÐMdsIÂÏðu=fí:èÆÓûâdÄ“4/¾¯gÏ.¾ A^*ûªB*™…¡Â©´;ì=¿bª%^+[ÄüP)ð.ùR±¥)IÕ`•ÛlKcRË•Ù® Ó¾E›,’ÉÓÈ!3NñÙ«­­˜i›¥mþºlߘbg}ÏãW•Äp&ÙÅ–m@Ö] éoëäµ”v¸¾´ËÕéJ Óù¥£d@V¾µlGÁ´-û;̽|µÎÍ¥Ï@ñ”7~þøù§Ì0ù)üÌm¸3ð3¯´õ,mOK¶ýäoYïÇž{þ±Zz½)o¶L±þG30áì¼Ô½i˜q•Þ³kw¯± -~Vï˜üµÿvÿ]ü¼yüm§ú÷uÃÏÚ=o~Ç;þû½:ü|Ãö{ï¿øf‰õÞ°eˆ³…¬PãnTeR -Ÿ‚:aCLU¡°ÞÓP)l€é(•9¼UbØ3y%ewv ÜBñßC‰ÁÝ=.æÉŽ¬8p-‚ØÙ¶Êà˜iª–¾©dÞËL‘ÚWT-fë–ÅìC–m‚_U¶- ,OC‡TC(Û1Ù&&kjLW¥®ÄÙ6+¨|MÕTÖ­˜b¨š6bšŽft%0±M‹P0À­#òX³:XWc -8?Ü 1-Å© ¢d)L¥:8€`ùĈ;¹%¦#<“xºM/—k1]Õl¶/ ®gzà°SeâÓ ” R,ÅÒ³ô¡ªÍ~)y¨Ý¤ -Ø÷кî`£[gO¬{æ™wІ¹ÛDd‚U[§wøMâ@9:·õ ØÐø*A….‰¿Æn±Çl™‹[=fh¶ÂnÁ - nC¥F‡ [•ØÄÚšÊâÎ)á_Ý B\&C‡/Á½ ¥;PaC1 ªÐ2†3 S+ÆUªn©­»E€ÙךÕŽmÙê@!€P¦SO•€‘à‡ÃtÇA¥¡2ÉBä€jó¢ d -M·™1M›µµE¼îy9(ªš¡‹¬{³EäŽN9™SV9Ð6(ÃP}Á²„Ï¤É -Ÿ…øè\:Ž¬²)t (lJàÛdAªk%mÉÌÛšÿaA NÖØð -W ˜Ì†Ê‹ ºÈB0­­élÊ[Žãâ(†¦•´%‹([\íˊ€PîCQÙ*8šé+\ÁM3Fæ›Õ¨ “¨°3˜Š5¢ °¿UbšÃ#䱎ɤ¥(G€j„Ò@¸×–ù¦Ñeβd#8¬‡ƒD‹R™H'[ÑS`žTéD\£E¢ë²Î@Ši•ÀÈœ©†×™C!>"£=…÷ÄÉL*œ/Èô¨LÒr `BS/më bã†QÔc–FŒœ¾Ê&Í%8°vô -»c]7Q†Ÿl“o1‡ ƒÈd8KáSöó€H²Æ6ƒ¿-HCe£ê*ŸpHÆW±¬¡lÆ4Û°‚s5ü ä"sfX~ Ι¬SçoëÑE¼Eµ¤Šsц ·±ê!œ¿FuÎÏ%ÆKÔˆ ;½F,,‰–‹‘É|Á‰ü×l‹ïßhÉÐ6lß ªÑTEãêZS0‚ë6ßJÔÞF.0X=A0·lQ3u ÷ˆØuºÆwˆî¨*c[•0«brÞ° ™MâÕm,yƒ–›E0T5T“2ÙºÊÅ -zËáŒH@¹“m"ËRƒ£âtõU+¤#ó«ì°ÞR";1™-f’R~<>éJÙ¤ësêZ1Jø±Êœ¾¢çø?Áß%æ" DW`öEÅy¨8ce³Û'Æ.ùb@|Qa‘*.gÙÒó±ËY…]‘¯*2`³zC—|1 ¾¨ÀóöFÙ.ê«6Ù0rFêcD- Z/ˆÞ—”†%D!¦ú7‘ACK•e íq°U’(è°OY¦àBO]ª0¤+Ȭ°2 É‚Ûg²¥j@¢éRºÖƒñÂøh*“tsÒP1Up×óE>28Ògv5¯ ¤ˆ‚qÔ/S¤þ6ÔüTÅ Ò1…éb;Ì“ÛŸ-!á UAƒúýìÌ‘¹¹¬’eÚ “E¿`Y˜ËB0[cÌhéšÊG55ƈÄ7°MìºÃz•<ÁÄ -ÎÆl@[å6 çnÏ_"Œ¢Ú<@m>¶cÈÌ©Ì(¶ÀŽ«@|‚ž˜â¼(PÈ‚n'N™àA ÛÀRsèÊd5]æx9*¯j¾CŽØNPr›uYãÛTWrðÍR˜çèÈÌC#ݨÑG1&ìçÕÄ%ˆãl±¸ Ùü8\4,Àa1³“¹2†fOıéþg -NŠ¹ô04îКŠƒviÉp£næt·`EY:8…M@l?ð:ˆ¨:!™Ò¾ˆ¡Ë:1tm†ÎÏ,CßÖÆ%pe£r³,û=Ã2,¯A=8EuxâÊ>WÏÃ0ÜÞ,ç-n(L™»Ð̘2áÄ4¶£`ZŒÙ2׊¬Šó4-fű§Á®ÂFž:ÃâÑ4¶-›®j|?Ÿ¶s`4hF—KþfaÎyÞ¡ÿÞ¨¤f„¥ÌöÊÔسäBLݘ¢ÕTÉu˜R~B :3~~44žeé¥Ñ–ñìGcïû¯àHâ–”Á¨«À5§â¼r0Où­ †—æ(ºY%GÅ^¤; à -Xo°"*ÃdÛŒ|Ÿr"lÌ`-]¢ŠÓØ辪¸Êé] ¦A˜KˆÊe:ŠÆ\¢U=Ê–¼*óù©öã:E¿ŸÞÄÞŸÍ æR™B*3ÖÙé{]ƒÿ‹¶ý“ð;LÉßFîs…6þÞ\1?.í‹gâcnN:Kº¹õµ¿“Ø—}ñt:EìºÉñT‚·b”Œ'Ö) ãÙÜëÓPJùm!*;LÆS¹üÞ›v3É©ómíïÍS8º=‚½îU¬­K¼&“~AûV’‘’ -ïürr(51™r’-¡)5¼8ƒDšê=Y—ë<Ù˜¥'Ó ³Q7„Ê9ÔSšîV#5ÏÞT$³,—¦V4$™ÂhÁ…$_éG$k"Y3²&ü©ts žYØ°-ÉÓÎL™²MÝ(”½¼¾ÄkßTuZü/¾岈Y,`O~´›çf>³û'²ÇÝÝÃ… 4¿îðA²Qâ¬Ü3æ_æñ´{ûð ›K]D¿ŒÉzàÛÝÃ;ã‰B6ç÷(2ʼn¾ìdŠKƒÙìÃàv köº{ZT ^:¼ïá^w4í& -wPçLe³)Ñ0@]¿;–sÝàcéð© ºJ©Ðxî‘H§·ùŠºF:½)tz‹¨gŒÖ÷ŽWÔÔµ n/¸p“\n‚¢!NMo* 7É-m*-ƒ>÷ÂÓŽ„çÙ-Ë„^’7ظ2pYc)çïZA$¼ÆûâcÄ ˆóö -3æØàQú.Ë&ùÀ7¾ªE¼˜EaïÒ¡#n…W7íÚª9RïVÝÀICï´òme2ŠZùº2OÕ,2žj“ñ4S¬”…ΰ#&ÁKåÖbh×VbæoÖqøKt|cÆ |IÂÖŒò7I#iœël>å¾1½— ©ðv 2#À°w«áà\¦2øÌhðá#Áªû`„Oè´áH*L’FgIõä}|«é½Ú… ‰éb:ÛªîÈ»F, ïíCâMJ*Ãœ³.m`djbcâ{eà“t¡¾u_n¯`ƒéb#t¶m… dé¸Ä‹vØéŽcïo’ýÅê8û³(B:L¶‰“ò ¦á´Š‰VÅ{†½wk©âUÚ8œ e Ÿ[üµ?^M@‡ä±Y`£hº RNù8 ¿Úñ1aß‘BñCžîŽŽä{9‘‹¶x³GgL ©ª‰Îß«`éD'_Öd±Â>D ±mœh±ñ1oQ¦»Tò EŽ‚ ̼L2®NéÓZlÝÅK—8ÿ a/úòR"56"çqÊâ Y.áLoËŠ - ?Ýã7¸%Begv¶ApÃEÔɶRl¿Ð“AŒœCQ² ¬2تàî±Pˆ*:î&`(9Vi…“ßq‘Äå>a“€VGˆ&Ëh”QÄÚL>ù§Ž!ˆâAŹs<É'ä¥Ê§* Õ¹jã¯æð u®ª ®RÅË;Ø¿|'![fÄ9eU›ò<ÒGw˜äWO{™> ßT8S ·M§;Ñ¢³’ô˜B  µƒ¢C󫲫AíÀRÚbTñò9ä-“ ¯˜Ž—•4!ÂøB¨Là²Qm@–îQÓ(>ïupb‹qÆó½õ!|¦pB[ˆP¡{…¤&V¥‘…ïf“Å’ð9Ðñ}gÔº¦à­éa¿îJ¶ÒFß|<ôV‡¦óÌÅ@^¢˜/d'æW’ÍnÎÇáøtaÙqÖ÷Á¥‰PY»4?z¢‰µñ5QL³@]`oB‹x®0’ç’RBæeCiAž–ŽeˆóŸ-¤1W¯Ñ4E&9^p¥È8ãUñÈs½Ä@xô>7?.°§èùV‡õÐä@ÅÂ$y~í>ª:šº?'Ò qŠ J’¹À‰2T]µ«Î„¤ä‹a›ŽÑ|(ÚÖ4 ͨÞVñ [·©oغ(ä0,SwTÑR0ß±ž=ƒñao2­yȾ% ïíÿËҨ؄ҩŒ+ˆ<«5à`ÿN“¬–_Þá2šO%ÆsÙÑTÚ½Å=ä~ †oJØ´·ã0š4‘órëÇtEoö¸››„¨s¾v$-O³œë4N¤S“drÁ?I&wŒL\>¸Ñ4î˜q“¥4ú.ûGˆèÙ™%v,o‰ÈäèÞè<îÂ= ‰Âx&!T—/™´DŠ•æšÖýõO—g1uMNæb,P¤¿´M’Ÿp~UD9ÇÒv>ûÚrª¶ò›«P°“,\R9%õçˆB„ûï·eR ¢ªQØ—ö÷T¸\é‰Lª7ò#Rizh#*’8²µq»/;Ä­|Àt.6Az×B,—Œesc±šÈó6ÇËx±´=øñê¶;^sÚh28USX›D&_kJI›‘*¨b*råØıXÓžk´!ÚÊMÖi“ ¦Ou”G3…X2X’Šmòd[sª´JOÊÇÒžT«ˆK>6’‚­Y³IÆ‹{Va•F "\è1A6i%A%x™V.i—'ÝœO`VlÒ*C4L‰$ó·:9 È®J“Mڀ譎8iLdë4È× 6HkÚ5v0é^{ç’92ÅL"”@ ­ã™ žýZÖªžNLøGÇm±¡˜Äò&ˆÕ–”îî:|`ðîõÒqµ6Fd˜I¦É‚J½¤ Q¸n -½"qzOìº=•t³]û²Ä4pëÌ&±_ࢠ™vϯD[¾F Cu½› 5»Ð·÷-LŸÉ$Le:©ÉdèÁÙ:Š•÷Ñ*© â¡1ZÕ°€B¬†òe-sžJ«¡‚Y[\©«J³´†X]eZÒ¬lFA=&Ý|j,/7þKÒ…áÁ•jk$ú8ºÚ“i»x~$U˜ˆ×AДµÉ•¸)Õô9Çp -\Ä|í–˜¡AýV5-™ÍAÊI¼¤á(‘©xŠºÕ[Mfó©ÀXUÌ -‚c:>Yßüàíj˜ TýºðúÃí¦¯éòÖ3L²h¸ Çqñ•ý.kJ¶48 -Aó°2ê“d‹¤2£5Ôm–ó]ªg‹€C7ÏåkíyaØýTW@ !¢m.`ùÖkífÕæñܱ|ë=ÑV¿­ë­KÄ[ão27šÍÔÚºÔä*w±+µ#ò/h+QË«’•’+/4ÖR©åXA¦“Cç¾F;æ)×±t»·¢uÈ "îÍækÈjjy0¯>1qêX ‘æ5̲zh"~Fƒ²pg°›K^<±Ñxlw¹’bJeŽ¥óbSc^LÚ¬¸¼¶rl4çÞ_„Vuª½æZ,•ÌP­±ÕX<] ºE 3²ìCº’ /Ÿ„ÉÈ…BCáhè<TQþú!ëâZ‰Yµ[kDhgòeq÷jCûg¯c0—M¶+[à~BjÛÿþ)â©–iï Ïs¹®J8š©UÑÐJ) ¡¡†›‘Æ­ÑV Î^4´F¸\m`6´àlÔÞóJƒ›Bkdò?Ö‚mÙáz¼¥Õ‹ˆ•/¿ŒÔV·„àzûZõïëzô˜Åw«¿ÚÐ¥B Ž€ñË£ºb‘é‰Æ“’ IÈ /—lx±¦üÊv½þjhI¤•0|]öH…Ûõf²á«wu%3 tÚƒÛ©fó†ä­Z2ýµqQ|š±žt Î`=å¯VPþa87œ|–ƒÛ¹2J)2µ­-8+a…^Âì´”@ý­â±z=£ùEL½ÆJ@Ŭ:2FiHÆhA’ëͽ֨X²SÃÉuµ!¶QÃí%­d/¡-¾'sL‚K"A#Üw¼¼cpŽ€éÉÜ¡2¿ÄkRrÈ×Õ›B«¼g¨oÏÛèwÁÿ‡/õ›¬½kã–Ã[×uÇlÚ«­=ÐÙ»=·kb|óXæƽ;oÜÔ±®/åט·íÞa®Þ¼ý¶]Ûöé7o¸{ݾí¹bÂÚ¹CÝg·+º¾Z–óý÷õm’×lï¾'¶aû–M“ùíù[Ô®¶öíÝ7æ°ÑÞBïØî[¶oÑÝ¡¾ÔÖm‰þXlÝXÙ£’wçYý;Û7[wî*ôßw´W¿³sSÏDv ß³g¨0¾q›¹º¸³__s¸÷¾ôºÃmíý£òÞ‘Šƒ­±œQëö[ﺻçP_ìöêõ·Û|tû–c;nßœMlìßÔ^ÜÙ±+9ÚÖN'kç½ÃŠý£G[½éíé#›G{Ç }ãÖJ`:î]ÛŸPîß¾åæu‡Ù8å|ß=c÷dÉOkïïß“Üsco§}ßšž¡ÎՆÑx²ØÖîÜ×±1±#aÜÚÑ7®woéi×ÖnìÝ¿éÞÛûÖݶ³Ï-nØvûÞÕã݉Düü”Ú¸ct`œ=Y‘»âV.µæÞÍ©{ö&{Óí7¯ëÌm¼»Ø30´ö~Àýöî½ãZ[»Ù}ûÑí=™Äº‰[÷uwYwoMYVW~TëÉ%ö(mVĈ‰þ½ùÛÉ´Yë\ë°&'7§úºâd}•}[;:7¹½ikp‚QpÇ@ûö¾=[VÞ±É1òd]öÜe®ÞfõeïÙ¸åöä]›Õ‘ÕGé°Û2í„ mæ†Õ°$w™‡Í[30OÛz­7;9kÞž•£«÷õwÅ·¬ÝyãÆ;s𾸇ŽB›´µË#7íÑéÏ·íÜÂÚrxÇ-¬yߦ÷²ÁÔ;Ô=„uÈ·mÛ±Ií¿yl+çðÖ-ÝÉûößCWR LÆ;Ðkð§F½{G=”Ž­¡‘«S˜qcoÿ0ê~7³nÞiÞ—è9ÔßÆþÑ®[î߯[ÓkŽÜvë–ÝýÃÛz' -=ƒkûz©Yýëè«IŸä;ŽÜ{sQLãÚ›ÞsÌÌNÇr»qÁîÈöíHÒù$ÃÆ×oܶºû0[!¹­}Ç°²ñö^ýÈÞÛs¹ñÛôÍûßLWÈ6R9“,Þ†M{³Î=¥S$Ü?ï8Olaa¨¶öî[‹;ûÓJ¯¼×ØLþÚ%§Ø8ÛÌ‘ìöîC…›zí-˧²d%}óŽ $w#À9v,ÕS:OŃŽ»³cíäú¾qóà;Fä-úÝ\n“ìn툰é“1°«gx¯B¹mKç½;a§ÞëßsŸg{Ÿ-¨=tÿÄ-=îéÝ·³ot¯-+·Œ$wö%'î Â³ÂìêM›[{c›…­wöî>´zk mí ÷@ÿ®cí.yÔ­[@ÂhòèæÃÙrlKÛ%ÈO› -»&oqœÝúþ’éÞ“ÏŽö¥ò)¤eç]ƒêúÕ{v{Tu»›×N|p=°×¾[÷Þ¹:v7‘cù¶}`îÂpr¢gèÞ½ý]©­;Ù£ëv›=‡öeǶß~hO|çûÖ#mí[6Ê;îÓ1¹cSv¿ºs­¹ùYó¢³#qìþµøºAÒq&˜×Þµn€ˆÇ­ëz¦'7øÛÝßMÄß:Ý:8¾!ÖsËC™¶vŸÇ²Öè¸ÿPÖöö¬»' îÜ9¼þÆqJ‘¹—l)c¤ä[¾úðý±€¦ñõÞ@”è®ìŽM‡[É,Þz˜lì#k6nÛjjôÛž¡MÛ3}©Ô­I íFhr¨ÿ–[vwîܲÃXO¿ZÆ6dXóCû¶·÷¦÷Ê1X«»¼ýiÙ7§6èÛoùÿÙ{ÏÿdšäPô®}ö\Ÿcc{×^{ÖrfÈ9ç 2$‚@€@‘½wßþ×ïíîÉÃÌ0„wŸ{vÕÏïA0¡««º»ºªºªËæ­æëöñ wj1uÚaP’öl²ƒß"`ˆÛÃøtˆÚÍúd”¾Qh¸ïO¢kðg2Å$zýô4JŽ¼FoÓ’ðZ‚¨*²d¼nKªî>oÒð‘àÉðqx!EƒJÀ‡ÊL=[EŒn|„~#ˆ­©¢&¡6\@=q¢)MaØ(H&¼D•1PP|Á& E?IŠÁ\b¢w‚ð.B#Ê’x6Ž â×{°F“ èIC ±pa:/"Ùµ²;‚× - ¯#ˆw ±˜ºˆN\r„VÌOT 9Ë´A¡áöeDhÈIv ÑdôÆŠÊü$ƘàÀ1,àÃ%+f¨ðÇ,‹(±Â¦hæPä38Ç+BDåÍT…†&a˜‡&M“·Š(·5Iæ]t—”ìfÞ±F §W#̨ECJĦJna•fÄ %pÉ :¢jå’šÕÉñ‚HzÒ‘®;"ÄjôÔ¼l¢!(¢ 6Ö=>»¡‚¾ä§1õzÚÖ`àNrÝóÇ¿âõÙ{ˆ•Å oÁˆ7ÛůLÌn_*4YMvhâÖ{X²É±¦ e†‡¦1Ä«˜)Ýî䨥̢f‰,©€¯%±Ÿ#*„ø–`K5³ûÂRLxt@ô3¼ˆjSÞàs)w.Õ¤p2!A¡ñ­ ¸7m1Ï\©btëbCI §ñúW£oò«´©dÓsï~fb~͆R*êFù"ä_šÛx%™¨B†”®V Ja\LY†7ø֪ǽ½B=UØ_…*ˆ»sý|¼øTr2Ù²–f™ÝW¦;Rô+y`ÙîYiÝÁ*­;HkPº tX™×ÛêO‹©Ymß°-ª/@lNo“„¼ít(_¤•!QUH¡a+CÌ…¨v'^ɤ>ž†ÉŇÇœ­4ï@¾5ÚM"¯^o}²†³0ò)Æ6>ûLU`$“•ý)i#mˆ¤Þ-†( æŒ¼A­¢KÎMݤm ȾâÒ‰£‹,Á°·fEð1vTsˆü¨S%bÌ“ƒ“Õ1¥B!Æ93ª¹O Y0ò?Wúg5Ô¿œ“¡‰)ó:ŒøSÙ®wÔñ´wd]üjk˜¡ÇSRˆ1–¦À¾ÖR³–) øt&å0LÒÄ Dš*\üã„´K±yåÍ úFU&ýu|uhü+Ùû!³Úöâó¾• -‰Z5pé®Ê¤‚ìjâµr£I&Ô f°¯µ¸wyWñRq¼atd¾ÍÁñ¼ý’œ÷°€)’©‘Õ·‚´ËGí«3fΠ¥eX:Âsƒ6àÉꇋHRû™±vOö½!’R™=u7Öš)Úm)Mo,Xì*ú8ǸuWâìäôKx爵0?êÔaýÑ1…Cn†n>﨓ý5ÀT”ÁTÑܧ‡û8lé¬,#™Ãý© ÎŽÕx³5êO<Ó‹9Akrš;ó  -ÿ3³ž‰;ýd“š½ìÊdÎ^'Û¢(=q‡'®M]ÓÆÙÙËjœ½ï`$g ÕÏ`&å~v˜"ݾñ´FZ>«Úkö&JÃ9¢'è—ˆ§pLYëK,PþXÒKTÓ£Ì|%IÓ |–Ív½HÙ:ÁEOÝÔ6Ÿ^!=÷d㲩0ÉAŸÂn¸Ì;«J¬bÁ£ìJTŽÎg@êú>m2zf¬‹wp(yÔª­/xÚ.‚³Üø=èdØU›ÐÝýc…­Ø!sדCu³ÖnòI\ôôÃè¿ç`jº©”8áQ•\*xÍ‘*6• xoû³Ô ]Tâ_ýÔ¬™š)4ióúñwÇâ/é·ê§'.‘–ÉwÍ0T¿Ò»·•Ûñf)§¡ßrÚø>¶³øñjÝÖ,¾èñ'#è–xC,Ga1%#Pz­Ì08·ñ:"Ûèäw,¶¾M™°¯ŽqßxónµçÚfòèb 5Õ[KF¿öx·ìãRÞÁTA¯¯°ÉeKâs…ÏÀxY>{"J7Üøí§¨‘ÏÁ~Oz}µµQô!ôH`2oOy¶¤pÿ³.“œz–ñfjdO|úT>ÜaÞ.bJíu‹ÃœŒ"´?~ë¼€I“zŒ×›±íéØPí“‹ðã>ÈhFž¨§“M–“í(-zÈõÅZ¼½¤òoõjÂõä8œtü@…ůeô…hÉŸëe¤Lv¢ ´¢'XTÇg©wUßå l¬I -ŒLUHꃕͦk8è^BµfGw(=¶=o¸’7Ñ2_S«nd†*màgꥇ7dƒ<¥gö'Œz…&ðhr¾Ä›M-Æ,Ñ<]m‰´R‘âD0aêgOd€äT™d¼DÄX¾øXÊÜtÓ6C¢µþe<ÝŒ{ýõw¿ë5±H&pÑGàB0‚ª’ÁòenÒâКíè2ŠlžÀZùù…kª˜&–ºC!áê*[¹pÏ¥“…))æqjÑ[{Ê2_êGzÍžwžØ®†hëèº* "<û™*vVκÕC¼ØµOX@ÃÅò$5YùÍì= Ð2=àò•å;à &¼~»Y3•Þ½ ®©¼þHÍü…ÏÔظÐøK¯»P&þù¥DæPÞx½·ò夭—*C6BTsÔ–LÚ>Ógñº’êÐ'=àüM›'œ‰GÍÆÊ>5'üç³j´é×!/µ¦ŠyepKî -™Õn&†† Ï¿ÆÌh¶¶ßñ;ÀÌq¾‚iõ±ªuõB¹ô6½jï*¦áDfôùUÜ?ï•U™Tõ±‘Ñl\€¹m|A»°¯©Q#ÛËj²}/Ë#ëáC)Ó½S#QíQB9Ù{LY+ókÔF<æuÆh0{€äÒU"ö‰6ƒSÿ[›Ü‚óZlLÙ&ˆ¨#4+þdŒ±—íÍd–ѳ~v'£±Zë©àÏxc¼™ڢã|O¬”¾–¤Ëm¶Ô¬dÖåÉyƒµJ5Þ8¶§ Š{—ʯ{°l%V …ŸžÌë£Æ/.T¡: Ø㤤înJ¦ðù׶·ôx³œy®©}ê§G¯yebeÒ²hjŒ±¤h¹zzÁÚ·çUÆšw'˜Âe6˜3nÈ/S+2bŸ;]'£=n¦ ×14 i³trôÈJïÔšþL||Tc©ü¤vHôú ÜÍûFñÏÑ -‰Féƒ6Q G Ÿ -¯%! –cwª wæxÍ8+äÛÊÎfÇ…ãÏ¿dC¼ù@â”·f <3¯Ç -Ž1'½™þÌJái‚Åþá<'è Á—/`qèèS3íFå9áÌðÓjã@Y Ìï 7öFo``jÀý ¿_œ†/'\£¸K§[ûíOE[Ü—Ý Ûèò£Nloè(SÅB›š†J¦ÃÌÿêKôlØGÏæ Œ+Z¹oÃwý@¹Êå2ÃCß’‰é¦Íxýs½eC U“ö1j/¿úìm_¯†Sïn,½…'²5¦Éa“y#W'šÑ,Œâ^äzMiU­I¡ ǼÊò(€­Mz“u(»Q,Œe’è5ÇÈXM|ZìÍlç¹ó•šÕ ÆôÇîØþq=0thAD±Ççñlíþ` \ÀFqŸÅªLÍl–'Èôñ¯ñûžÙ•*:R!+mÇîÉ “»`UmÖŽÜûO@ ö6Úù—±À{õÄ1OB¿>~°Á÷q=á<Ûâ(zÀôBv>.t=ÆppX†SýEWÅhÌÄ…K`ÿ+;·ÉtÎZr›XRùÏäS|Ÿé9ÞPäê”ðÅ«Ïæ5 ŽÍÛ]té·£rWdwzÜL»™½zägTr¤#[Ö„ \õÇžj&­€Á>Ösü+ŠU3¯ú¾N†^ª€ÍpVãȺ‡ƒ`¾’«{Öà2Í ‹bÿ5 ‡)”ðw(D€ž……©' êËr7rû‡¦ô£ÉfÉŒ GpÝä@e-íFío¥_Ôþ÷§hYÎU¥á>ÚøßÚ›ÎñPX*‘²H¡ƒ”dD©¹µB¿ºj*3¤Î/Ê~Q€Úz1Z|½'Gâ(£ÅT"b‡ªçqýµ~›ïÖ«).I˜°ÕâçL41EjbΨ(f:?™~³© 5¢÷Åh³àÂ3×¾dwCÃîé‹08©IÏæµÿ6¦]¢Cõ/¬…è•‘òÂ$¤H_%Žƒx¹È -rŽ§^jî+øÆÓ™Ó€(Ò¶öS§É:ÆFjÂÓîí· Áó¸gÓ|šŽÛ‹éïÏãÐÜ6*°×á–bpÃD ú ¶sO ò™h“é7ÿ ¯¿ÑPMÐõBá,Ì£''šÙ%Ùs’:Èë",€D ä¬ÑÉÀ„ j_bGû‹6Œ¯!ëg~“œD`¾çÙçœiuýÌQœ‡gbò©‡Á8`á(5½Ê-¾–r–^b`Æ¥"ÔúÛs =Œv€œóéyDÌ*P²Þ?ü~>ýzØþ ŽÑ×›çA&ü0ÚÃËD6h†>‚Ñúø -¬|r+ûÃúø°"Ðߦ„@Õ½ÃDÛ  óF¿úÈópXÃ*Þ¦‹|xôð9ú<p€!îosؼüW -ÒÂTC@û “ˬg øÅþáøµ„Ɇ­²gÆÛn±‘'€òV"–Ò!ɱÐk\–%)6Â92:L›óãjü5Z|JO,¶&ÐdW)O>ÂFj6£¯Éh'uœg"Ð"(P+ÁEBOIÒË()ƒ{ý¬ ,®êÉÐLÏ R¢xÎÊšxŒ{+·ÎaOt4˜ã!ž§ƒÁly{Š »âhCx@ÇJE¹¡£Ãù.1Vàcûåb3óP"À>¶›B=bÊ -låž]H¹++hŽÓñC/ý_kæPL8•¡Š ö¡:íì¹¹„ÄY¹'–„št’Ô¤ëlMš}¦%z”Ð5mmBqKp7öY²ÄÓtF80ÄI]Uê8Yâ%˜Bï0pô:™™ÿ’œ£ƒaØ¡L‹áôYÁQΦñ˜lb_J-â­óäb.Ì;6e3ú¢Î4”ŠÉÄ0,}ôW ‰!ÖDœ)[%çfFš]8ј=ªJÎ`ÃvO8¦uåê±@%vð/2½Ÿ|•îqžÑfK›Ÿ~ú à ¯) 3ꔦ/(Ÿ»”®üÄsÄvµ¼|QïàÏfÜÛÿ_45ð¡ôe±iµG;‡÷ݱvk_t:ô3ýú–/ÀŸAô3áô£ðg…x¸ùü€?ßÐϸ¯æÜ€/z%¬;÷U?fà›! 6š¬Î7ƒïFø²žÕ,ËNðÍ\†o§“‹}Ó¢†ºSÖºe¾Xìèn&9ÝmáÏüiI¿F¶zøe>üî„c>Þ¡Ÿ?h™Ç½bîg’³~ø'ϳg3O›¸2JãVg)jt&l–j¼¹Ýk2é„Ñh­ï§ÇêÀ rHÎ""¦S¡AÄ7ÅUØÜ‘Ê;)õKmÛë?ý¤Ý¨w1§°x÷4-ÝgG³$lóUÄDõ‡B?QÃÎkÍÈÎ3.Ÿ‰‹¬»ê J él¢‹àmp¹ÐÔàòrA=« ÀÞ© Á|i­–D­õ9{e«=›è>×ãõIT›HÛT.ؽõ};0¥"ËpZ»î³‰žç5± Ḻmw‘` %¦Ö -g°^úíºú¼3¡L¾âñß`n.`J?–ìÐÉkJ—2eS}|ûé'Û²PÄL‘ÃÎKRè« æÞ'…Æ»êE¬ÐÀìM?Ï2 ´h+ÎL.ïêÅÞâµæ1˜ßç*é1n>Æ‹]Õ ôä‡)añ×^оôòˆ}:Ÿn͘c†ö÷áôPÖ -rio±¹)‘v̲qûÎpÇä–¥çL%#ü.%úò'4†ÂT»SÙÞV˜r’ûÀ°Ô“ ŒÙ]â…l§’ì+ƒ±¯Ä åÎ3üF4ÆQ¿‚'È«ïÃ_ªŒ~íÃòM±½áÝoYàØÆ´˜RÛ`*sªŒ©¦1¦ñ‚©« WÜ`ìëxÓG?_0Cº±ÆŒÅ 3Õ” ÌÜ´1K/ýYÇf{_„1|U­aö½wŠ9U5æ<¶<˜[*`³j€yíÃæ‹=:1Æ•Ã-l€ßÞ@aaí“‹D -,Ú¿c±/» KŒ),ù¢biíNeªÛ–ÓlzX¾²QaEË1Ž•Fš!VŽš XUëÉcµq|5ò.¬…wZXûø¡Ä:ks{†çJ¯ÓòbƒÚg{mºÍظ]o`“ÎFÍ&‘6_ØR‹ç°U »ÅÖkÛ¾=m±ƒÙ‘SbùÑQ©Ú$•Ú„J«ÔÏ;-¥)Å•–½æU‰?Ž‚J§ýq¥Ð(Ý‚ÒWÖé•ÁÀWOÑBÊØ®»U&çõ†23(º”ù~þSYêå*ÊÊäÑ¥¬Ö¾”­C»©ìâ ž^üS©6°¡r¼gÁ¼C¹h -VªM_¹©úòÊA×ò¨”Z¥uEç*Ãbü¤²4<9•ÝÙõ©ÜZ§Iå[öªÐkp¦ŠÕ?žU©r¡¢Ê5ðŒªô´ «ª½šKÕü[T]•A§êû7JÕ¨:Ú©¦ï•êÃQüPhT_õä\µ×ÆßÕÊJt¦Ö™“ïjÓ ;WãÁâ‡ÚµVjo¸UGŠLLÙuêœ3nQ?šžÜêºyV?YYuÏÖ®ªGÕ‹zöXœ«—¯û£zsÈZ5XðVh4ÚN¹¤1u=½<úÒxq“&TÖF4 |ÖÐdçµ¹æ±6h^kLÓU:šÁçr«™|,<šákU³™½­´ØdäÒê–“šÖª]m´.¯2¨ Tí/ÚØ"®Wh´YO»¨}ì,¿´M­9¬}®eÇÚ¾piߧîíWêɪ=Z O:íþÉ¢³Lm«Ý·ê‚µ`O—(®]º|¥1ÑU{‘¨îi¡ßèÇù£næéšt«R~¨;,cQÀÿt‘0¦·Îü½Çï èþƒ> vô€+ê›_ ­¾×½é'…MIÿ™À=úC¢¨4èÓ7ƒ-iª¼¥RÄì­†ì6µ7T­Ë‰¡SH>^×XÑ°ˆ4ÃöÓç6jR[“Ѫ}Q=ýÔÖ͹–ÆœS=5ִ둱»žŒ@Vî—‹þ‹ñ°¾˜ †÷¾Éá[MÁœrlJ½â3SÙœú4==vv¦‘r¯1}<ú¬¦ƒ²îUhÌú¡*avdòesȲ~1§÷™…¹ò¶W™»ýªÓüöêL›Wãå“EùÕ\Z,šˆÉâ Xâ–xyûd)~ÎÖ–¶»ç´¼öž-Kk}n9¾?ãVSâåÑêÑŽ?­±ù@±Ûú'k»R[GÅVÎúYøú´) ÎÍR¯m¾‰ÊmKs[%ppÚž[… D·m[Œq½>Â-ÕºG¼p¨ªðö{ê לnü Àµkòú’Bc·— 6{¸a˜Ûó#üÑÞZ{ö±=¹¶åªm‡f»ˆ;aÉY§?Åä ëè­YФ½ŽmI¥sR/§Çexu&ݯ-gÕ›(8û~uÌùQz÷¹”O\¡qÙI“+òj]…®IéêÕ×´«Þ»öNõÞmZnÿ“WéÎ&“wËV1¸ß,ï¸{k6z=Fc"êñÙ_sžLÂÖð4ë¡gü©ÿôlý]­×Øsy¼~ÃÆHfÅŽ·q,½“ÝÚèÝOàÚòXyò…r¹¯˜L¸|Ï‘`Ù·(Æ>üªJÌáwL‹UBÛÞøkéyÈÿ:Uƒùî ™ÆE·d”àYÑl ;o‹f8¥ÐÕÅÏuЕÌf‚©”nl¦ú¥àä©  FøS׫ܡXòcªÎßò¡‘¯gmgϯaK´› GŒC¸<š¿…‡mu1¼)¸s¶¸‹„Sã~¤\4æ#ÃçGÐû‘Íb£Z,Ée4RÞõ£•M©eÌ©èn3òÇl•¬-÷:u±†^ƒÅ&«å&Ž ú˸sô²ˆ§'Ý÷øÓûÓ,þ¡ÍºÐò#á¯W‰âß%‰¬*±Ù½™š¤µlt&ãŽR$Ù8 -ÉÙ8ÛN©;ÇIÊ[)ïS…ŠÕšê?Íã©Íëc#mÓFé„ÏhH·zX<½0®ºÝÓÇ>´Íý™òtÙÊŒ+‡} ÂY·Å7Èæ e%Û×¼=f·&Ã.‡û‹É\ªº[æ:ót$·2~¾çÍÍb$7>ò­—·dþßÝ GG¹™ªL…FsÞ/ÌÛÓHQ_yÙÃσvè~À/‡’Þ·ë–ÂCGB¡)5tqciÞ~ùx4رöcd‘H>6[ ÇãG"ˆ•MÞ÷y9îI¿”ŸÜªryê¥*ÖÇL°’àŽÊ‹òh®lÓK]Õ1©ªùhïX‡ÖŸk¾ÌZY«øõ…¦63y u½­Š×£Îo½í³Eë«r«Ð°Mµ­FÖV7æ‰){¦¦¯ 5«}¥ù~˜[Æ·¶ª•x)ZÏX­µk—m÷ lo?Î#í™6ýñdH4\ -ÍSü}Özzöi”O»Y$ÝñäúŠIì¼/ߺ¦Wµ·›ê·ÆÝþ‹Ã÷Œ³çÀ¼}nšëçUÚPz±ÏöÆ—¢ó}ð2Œ#=Cø ë%5‹ç^o¼‰ô±¾U«ÐôƒåÀ¸ßª5JýuóÓ;p<ªA{ž ^ckhmµÒüÞî¾uæ¦Wƒ+|M~Ù—¯ƒ—ÃÛH÷FÑXûiô«6FÇ|µ6Ö«Õq{Ò®ŽwÆqýÍW>´š·ÆÞþò¶.æGùýcR{Ãw“UûÅ0up÷´~NL?“Áú̙۾Í*Oãl9‹9ßgþ½ÒÐß—û56wÖ¾‚óªmÕž.w»…«g.j­ÀËâ«\Ò燧ú–ÿhôL«Í{>¼ôk?'Ëv*î]î?6£ÏPºæûìíÓ•²³Š¬b¡Æj5pd -_:½_÷•ÖÙ{_o6<¼6{­‡u!ç|ZÏÇ‘ÐÆWT›jcøºY›°‚B³õ½FÜÛ§üH¹ÃœÖé.fí·wC£7»7hf~ŽË­®’;\,¿ §Ýåb'Neì\ÁSƒRNéÍÍn Õj"ë5T¥©{ -d‚c_T“M÷«×mm¸Íôh4Eç'üæp…j'}£FC7‚ÎhóHÍüÙeNUR3¼¡ï:LáºgŽéëªf±éù lÜÀÌÃIHæÏ~ÌôfÍÃ[~øÑZ"¸ o4pU¨¡6¸¢•×ž{-Da }èŽÔt—8¦M¥§T15¨»©¥Õ¶wçÿk3N?%¦õ˜mÿ -ô«þÔs*:Fí>k°Ò6’@ÎL¥_^M#»1îýrcIC*?°¤1ê6Í-fžä Bˆß ă¦ÏíÍðgWµÈÆÚ€vV$’£z‚ƒnj „€Ò|olNN“{_æ«éÐû»j Ú¦]»ÞþÝ ûŽ¦HÓºöŽý#E'_ÖùTÍÀÏì§BÞî¦(ÔKûÝ.¸ÞõƒÕ -ns5ôìŽ@@³öž«3/™öß9! _Öãø°a¬Ðñn`3= -' ªÖæ³$t¯x(É'¸æ"5ïW[¨ËÐ1ß*B@wÇ×€Þ¨ a¯<  -‹gðhH„À•ÚœùE€v{x¦™¨ bªÌlšÊⱎúåW<«Z—Dê -%×£y[»Þ›£  -Ù«Ê'§Æ}Ð]ë“^ ¨#$ЪNÇJ®¦7û‰€‚Ù4NsöwýöâÂK Ý­É»MèÀÒ,‹õÚf („‚À†0Ãn0í…VÁRGŽß {]¤kêžCu$‹¸¥®.Cß -®ê‚@•™‘[µõ…€â™b-ÁŠ ½ªqûÜQ Ý!žY7›Â@³ê°¶4·fk>°<‹8§µ`Ö94Ý[fØ@CJÃ^3#òO€æ†+÷Ö¸ÁPïesK¼”/÷I ]‹ž7~½n«õY¨ë9—V5¯0мÌ}_©ûæcÀ²€V>§9Q Eëvcúb¥푊Žù£ÁƒR&Å6ó‹¼(ÐÆ£§ù*¨xø…q-YTÍÉÐÚ„÷¢@ÛúépÃ…ál°ø“%šš6=Å|»¤ Ðgss -gÊf)!‚kσ÷G¯&a åÖbД͂@ƒÎ -ú… v=êßÅ€>â¯éRJh¦eWvµ¼P…f·+[T$رÓÀ›4&¿1í$€Ž”‡,gÒ`ÝÑ™Ä!Pó ÐJX¿¤;14¼Shx`Mu×L]ú< šÙ‹’Xʉ®=Ïeu<]~ÉB P…¬ªe‹úˬ°ÉŸÀéô‡•Õ§Í>æk´ª!ªšd7ÊqXaŽÀ×XäîQ‹9'«ð]—Lšˆ{J¬bB÷w`0<.Dîv«x:TIwOdç0^Š9è.bï¼YùÅKõ¨‹¹Ï½ÇK“¢GìnÄž|Bw!Å\Ïi¼ò–¯‹½=ÄÉåAäî‹o´U˜Ø]+ÞŒ=êIŠ Üwã-lk¾ÂðÝó’wOÙco·°0qN3>+àíwK”¹Ï½[ŸÔþ¸ØÝ2þäI'…î"Š½Tñg•·/ööÞï<Eîö¼xÿcf»ëÇ­ “¢Øéý>ô ý"w‡;»ÕXt‹ÜéíþWÇ£(ÅÆ*{B;Ȉ¼=nØ‹5eAäîÛÚ^^:¢›ìÝ¢Vøm÷à« ž…ï:öULg(”Ñ]‡.¢ÏqïÆ1k.!)vÂû‡O,ä*|°î&-Æ:[ÓOš¦Äz_&ø¡Ÿ¹ÌuÈ“`ÜMˆõDü9õ)±´ƒ]Ô®‰Ùºd¦õvSÏ™n3õœYÁ5<“LXß’É„­hbko¯šOØ'YåÔ!UÐ’rPÓyaxŸíÑ÷¥ÃmáÎÎÀg!ZSUÙá±Ì!ez﫪v»S:t᪅XD žÃ‘Çh°ˆ£CMg- ÔÕíˆUf&6! ´–4—g¢-ÐtFb@_%€f-~Ž<6ÑjU ®Hú§:9@}9(ý) ÙOy•z6PWC€*4,ÐíV®\ HúêQAé¿' ÔÕ%ú”ž•XŠÀ+‡(P$ý‹…Òÿ„ÎìTWr(•kq P¦%/”(†Œ<ÆǵvÒ«ª€™¾‘ã< ã9bÝʪÑÕ+É{ÎP%ž#¸…£äa¸%eÙbMÝÌèÚº—$c A2Á\(Ê23>f7·ìfúã…QÖII ’uÃ1~™¾`u–.RÕ®aó 4Þˆ±_pk4èvç[Fó…5A{RP÷Ë ‡xÖ§ˆ?Ûª‚ŸZ ù1ê°$fÒfFM\ððKÊžîé¤8 «É‘´†ü0?® êÊÏÖ0#0É! ›î Û|šÒÀ Y8tQê¼ä÷“ÏõßðhDMG6%B«á<‰AEw²±äõâ–AÓ…Ä A³PUÐruv¸Ÿ ölw#cd1ãŠ5+ù# ŸÙ•]¹”—¦;k$ßDyH,\”î -ÍybqYu}Âzºæ =Õ -¹½‘†hdYUÐMæ°ƒJ±YÙ5¤Ûƒx;ú i‡Ì¦´K÷ÚmŸ•„ê"€ZÔ^,ÉEàɧ£kQI£F|L«V-±› Hãlu…°bIN¬´Vƒ}Ƨûå“ „¡ÞbƳFð·–Xã<[ÔòduN7¥ Uá„Š¯ÒøôÐPȱCdBC¬l¼—®L´*¢÷¹óξ9™wcÇV΢³Ž5’3Ј”—èËáQd½G3Í“ô"Ãb”qô‰"Ó,I‰Ó¡ðƒl?.äŒ sBO6 |°¸¥I´eø,i}A²R’¸½»áZ®^]Û“.YúvÒkœ ÖC®b¯Î^la—Æb–ÏUá²Dj¯—öï$k©u9¹ÒkÇê´—~ì±Âc½Œ&ÞO<û ¢Û#)ÒÑMRI¬•LçÉX<=—jIÁBuFæg÷à‘î‚þç£a‹Ü±ºCeÓ¶hUh'ñ’ʸ ŠÌvÑk%·²™nÛ¹’Pª»ÅfýóÝ(Æãh—RŒ´lQv˜CdËS\‰Î@” JÇL[Ùû/ =ï9îB/%Ð -/Ð9¸¿’“äcl[PV-•wš•9¸ R¼DQ6ˆôä{ΩK„ÝòjêÈTûIIŒ:C«l3‚.ˆ)HÎ9Ý4×Z˜†(Î5å ÕO¶¼Š&’Ó5DÁÕ [á%êÙK¬vBš!Ú”¤PƒŽ¤h‘ïXP£A›jÏGpQZ>€S£%Ãô÷_|³†$û› y!±ƒÖøä5ŠjÒAu ½¡N¦\þn à#¯Ð p ÑIü&(~ -ÍEDG²Âö R’Whø£6ªOìÆÄGæøíçF¶”gëÑÉÆ“ím¥Ç§B>±ÎOq!b!$9Z$Ö…SœC,î·2œY+WîѺÏZ—œê€R)ÇB"iKX$ô<“¬ˆ…$j' ç çM²5»N¡Sáe£æŒ¶›Ò„Vœ1p8Õþ-~«y£€ ´×7#Ä_S¹¶ÅñD¬tT7Ž\Ž~™Ý‡\_ aÜ—Ù@Dì5!{àH endstream endobj 366 0 obj <>stream -V [¸¢t4P=ðDig´¥á)ßÑóÂ4§6ÅËmf\ÛÑ»ô蔄hWd–AfïUÈ(c!ܹËàuó%Ú -nç›"LÅ]þ.±F“ã¢Ùm?;»ßs¢Ê×V†²wˆžíDJvæU@G ¢Ú+«`°p±£Qh\螣‰tü¬tlîdgDBç qŸ®¬³;ÎC¶}AÌ6~>JŽ·¼‰H.!—BlßQ®z%åʯOíøQ±ýýûA”ätÄKŽÉ`é¼ÈlÁR•xѵÂrâ\G<"ŠïAtµ<ö‘—žñÛÅY:Éž®¢~HhŒ}ä/3ïHDŽqwq¨!ÀÒ+eó‘q§MŒGÎ_j‘‘jM¬bt:g‘¾£òu™E†Ó$þÙáß"C’n¶È 1¶*ÜìÏåTôjQ¥ä02Ն•!}U¸Ù"PséŽ;䇡]b‘,o¶ÈÀ 4'/"õšø<¹…æ\|ž¸EF~pœ/€:—‡çˆ ˶SaÅX‰C•%,¥ýödÆ$jg<À¤u¶Îmyu·uX¨q=g|ze¡f¸È¹Mp})Êt]8>F».HG ž«“Éd%λ€qurâG%'n­qr"…Ï8ˆÁuâ‡T±F²Øüå¹ê©ãkgƒBææÃmñp´.Ɖˆ»Ü§ŽãswÃùcÄÃIŒ±;ÆÃÝÁCUF<œ,Õ›ãá9™wV‚^†R'‚Þ/NØŠ5ï'zîè]ãáPœ…øÂâáN£8Y.}w‹‡ÕÅĶu²íõ"ëáw& -P¶O$¨Ê.O¶”á *sÜaîz7dìX‰‹„'dëâªEØ3ø¢^TWy–מÕssŒ=ª…= %}àÏr4é3€y>ð²<ž 1ò§aº—”& 1 gT@GܬAŠÍtçNM‘ïš¬Û -ÎI>&ꚬÛ^N*('E]. ¼ÇiÀ¨YgËHk¯¨žk¦!¯´ŠÝ> ÛÒk¡àiZ¢nÖí“#fΆfâÚaxþ ¿¯"xí:…ú4"u¤¬‹`,—€O÷ŒH}ºgDêÓ}"R{Û;D¤Ú•–»D¤‚zî‘ -ë¹="ÖrˆT½&ïh–_Ÿhü˜ ‡¦Êw2¢3æq: ‡»»Øµ’È6þ"ê›w§P8r“ãÑÃEò"µ]ò,軅‘ú‹,ÅýúP¸kôÊËCáÏ º{(œ„UᎡpgìc2õ³ñ^‚1V@ì%ñŽ¤Ÿ¸2O„–ÇNŽ¾ú@5XÕV-Ç¢(À +;ˆWu™ Óå2,ssA(±ÉØ‘:²r³ä Ľžnæ5‰—ÁE`D^ÐÒË£7'ÐÉð¸ÑÕ^˜/¼y©„Y|–¡Bƒ‹A;fNÕŸè,éMÌØŒ{à·*|2‰YŠC7në,½äb^/ÙM¦,NÜtq¬X,ÂË v«Úp6•9qg{zÍN€Ê vÓÕõ¥X„ËГ -vXD♄§"Ô£b¢#ìRÁn˜[h6»ëÒ@§ùøÄãÎBX_"‰Z-Vg奋 ~¶Ê,éÂÉ&Œ=7b!`]©`·w\(¯Ÿ°Ó,mí±БÐ,àÈ–ühÂ÷‚J(ÖSyZbä5KEØ)3y-¯Wátµ ðè‰wœÈz®¢šr}zÅžTV˜ŒwÇáRÃZ:!·ÕˆœjÿÒÆÕˆ -|èÔûHÐvš-K ÑÝå1k< ¡s®ä‰ä—¤¹;ÇaP¢»›QShnv„’‘æNŽráæ4wd§t¢»›ÓÜÉ·(Þ’æŽoQLt'?VI$Í/öM8ÑÝe›G`]Pñp¾âœ«âã,6Å;Ö P»C,OQ†/†BN ¨ï¡|_kØç7§È)Jûþ²ñ¹.2¥uÏ †­ûEl¶„.Ÿûíõåò»`ä£éfqÕ"éÕyI=·Ÿ@ÔsC¶j¦~žÄ ñð&ˆX Ãu;¼@ö:†àšX Ãeøk3Üñã+ù9înˆ'jß1oµ¬ wg¥ñ»d¸#"ÅsÜɼ‘Êpwi¦¼ëâ‰N3åÝ< 2܉Å%Ɉ¹ ü|¯We¸“{ªy¶·½K`—TÌÈ…µv¥¸Þ¨ÐÈt¸•]‘%](òq*~ø–üÈGNtû•ç\¡zä[³ÄψxºK`íCrt±óõˆŸ G¸Ö(¨Qt>¾ýĹF~º<…Fh -8×À`©–ô&n×:Éû&ÆtIS‡ÙiZÅ$˜„H €ŽÏïÈø9aLºð\†»  Ú~2+AeK³RFS‡ÑÝoÖ+‡; -¼âlS@o•ˆÜ•'2VШóaL†ã=#2PÀջĸ:ɑױ,¿‹Kc\“Ö3~vBçÀKD„Ý|4›bwK÷8Þó"\oa’V¾yRÔ8)#·àPþÙI"󳋼¡îã -š$uv‡ìWföFÜ_‚ðÈ(íw;ÇABôÌRðwat_~Ä0Ó›µÃú’(¶Ïê,ùÕt×iy#¿qBÓv{»fÇžŸ*§õ •‡Méø…“¿…”ZÑx¸ÝñÕ*„g -9ÞkžÌËÃ&–]F‰=KEþ}Øy@‘—û7+7Djí…á›ЉD^9ÑàØ.¸¡i{Õ|*çËE¶ê)/ÎÀÂ#ö÷i‡¢@ñŒ/‹õ¨Ôõ•c „×Wh¤bÿö.q Yók[¨nª÷ΠNžU -hI' -t·oE0Q `¾Äú–&§W§~ -kôìCòy²’óÜà¸úâ=Gò1ΓÕvîTÎÖèž“ãŽ\&aˆL/Î:ýêĪ’9îÄ—(z¡“é6©'qá콤Υ “›P«ªËpw¬Î¹ I$ ãȼ‚Mâäo”\GL‘.’óƒ~ËHŸÇ#w‹*%äX%dƒ•aIzIM‚Âî: ‹Òé2×*‰0ãÝ¢Ò$=4™sze'þ¦—LüNcF†g}ÒåFÝQr·Ø|‘Ot9Þl,{²T£Ä¼¹p¾%²Ò$:õå²+Ã0i~Δ+U‰´ŒãhÏÛ`»æÃÍÆ-Šbé^[Z›–»o¾Ë.O×Âw©¹Â>–¾Ç¹03{¯:×E^bÐö…Q€gì<ï½’¾$^ìœÖ’–ôÒ’eã:ØO÷vÆŽí¹q.ÃŒ2÷Ó‘ÇN¥œŽ?R>ò»bï&\xØ –ÄQø“‹bRV•¥oÃO+Ã70JÉ#¤Ô'ÝFIn§L_~ ÚIœdÏJnrÉ|G¡õãÊ«±œs˜&‰Å¿,ýâçÈÆ9Mš«¸¶ñ«BÉ@@.¿Šß—ñlÎáþðíYúvgud†Œ\iò+“΢#]+UÙu#^˜bgcyä·‹es‡Ê$w./¤˜D@ÚI¸0g‡÷–(@¹Ò!+íª(@zVž‰䞪qi Ü@Fê»& -P¸ÿNcO˜gä>ãI*)ßEù+¯NÊÇ·*ÀFME“jƈ֜ >ÉêGf1»ÇÙPYý.‰ä’ÊëwÙÙP×æõBígCñòú]é§ta^?áQIeõ»íl(&¯Ÿ´1âÌÙP²óú‹¯¼O^?é¬~Ü‘|}^?iÏ…\ƒî™¼~²#¹îä­(”Õ¿¾\›×O5±ü•—æõ¦ñ=2€°óúI#DfgCHv^?ñ‰ ³úÝ#¾ò|",…LŸ³syý¤g/›pc^?é…Ž‘ÇnËëÇ„\ ™…¯;ê4¯Ÿ´ª‹vî×O"šc4<ë-7¯ßí1ïròúÉÎÇwS^?ºÁ¬~§'µ^—×O:pV4"õ¼~ÒYý„ü.®Éë'æGdõãœCr}xJSv&£›òúIìÓ‚½ûvK^?i‡k¡ˆÔkòúÌxNV?îù0Ç=L©¼~geË»äõ“5÷oÎë‘Ìêwy>¾kNñÊÇw{Ü?«ßµÑü¼~BqÌ®î9o[¹yý¤%y– ö¦¼~Òçy ŸÞ;äõ“Îê§Ð\6 ÅòúIï7 {\ž×O°Oé#–oÎÇ'ËICF>¾ÛÓ‰Ðùøî×OZ—–}zÃi^?y©ø9̵yý„ݨ¬~¼ˆ¡«óúñ‡7«ß Qiˆ9”ÛóúI‹9DdýíyýL’Yý.ÌÇweîi>¾ëòúñkárß«óñ]…+Æ-OòúÝ cï“ך†ÂYý ^y—˜'ɬ~Тx¼~ÒŽNbþ0—æõ“RÛ!Åîó$‘ÕO–Ý’K1Á¼~×è•—çõବ~·{&OÏŒ–8mþ¶¼~çbEï“×O: –¿"_›×O”tV?qyì²¼~r,Š·çõ»L†¹6¯ŸPO28r¢kåäõ“¬LF·åõ“^¸±oÙ)§‘¸&¾8ë‰Ç×° W±VÀÆ7í‚kÓYÚñž¶G‹mx6,Ð9Õ$3í9&/Ó›(L€)¿’$=©ªhf8Mîv‘ú"f;„ -q»ï©áÐE”)ôŒ§Ê™šÕÑÓôLZ ‚0Ý 7Ǭá¸)ÙúM¡`½kj.–k<þ°áéKÏk)<³^”Ų5¿/åËC¼´š½ã•Ïéo<:ýx3¿hã­ý|†·ñÃ'Þ„ø“¥­ÇŸÍ-Þ++ø`Йáúó€¿:;:üõQ_ÛíviÛnß[wGûW{wúô -Í^çÕB‘ ~€±:Ëb’«äÊþY¬Ý~ÇŒZM§ªö?šj#[ÐΗ¥Òo+ëUŸoš¼Ë¯­Œ?:©‘ -ÄŽæ«üŠº„HxÏ4‡Ñàêé\­®yÙ/(¾t¿‡á¤%Ì’èºX) É<‚„±©.@±6~Ü⯡a·+[L<\Ù˜º SÈ©‹á™D1gfo<[)¯öªg #W1^d›6…}åÜ–b0&p<ÝöQš?ÜV™šyó‰;}8)û^õ+ÆÞÊBY}h:ÀÌ’Žƒ3„Ê.ÌbÓµaÌm -S§|6ÌlˆÅàµfª)Ë0ì¶ oD1KÜ9ÁÌfܪ¦£­Ó™#äÝä›j»1i&#›ê/™á0,a;Ô9™´ãѾ56vóû{|ko‘ZÛ–J+zÛ©ö¯8®·ÚÐOÈõä·©¼‘3é:gº­ þ4Á]è-ð‚…üYr‘U.pH¿-·~ÜæÎãñÕº´Ÿžú€ ü¨¡¸-â507 À° ÝPhˆ[#u2LÝJZ˜w‰çV”º‘·17€ìõ§nTìôè0Í'nˆÌ5èÃÀÎ&ÍÌ-6älÞ -èm6‚¥¬gõ¨ ŽþþãnÔíè§3ÚÂÀÏjŒ©{ˆDDp-cF±<*#²§ ÄM +ônZò†T][­Ø eÙŒ^ð³…ª5c«¾8m¥¼Û}  -©à]`]á¶nÉ¢Ø+åt¼çÙ’²BÚÀû—®• ¥],–I0Ôl§ÆV\)í•ýJ~Še’õ)47×HqUT£¡à«ù}ÙLL7m¦ò25%ÉÝŽ¿M‡)eÖ3ú\>ï0|UäðêŽ\4½Gìá5®X ‰Ì€¨Þ/ð³e#‡ý¸ƒÛÇ¥¼|{±S;V¶ñÀñç ·Æ#'úÆ]ù’ì…Œ"ö´§g¥À´G“^¡˜ö!ø­?¢ÄÜ7o7áiÏÏškÓBÔô¤3eÜˈf XdF„?bðÜr˜ÓÓ£*œÑ§ô(34¼ád·Â)¬'’kN÷KèÖœ3’3Ú®´9R–˜Ça3ê dé…3ˆ àjÒ -Å’¡Cƒ)»36a“àÔ– ʼfªKEw0Íôú€BCÍßBCoO!êZÌŒ®$ë[ð3ce1…þ~¼L|*¿2vó&‰§ -¡5~Ê€ºM1À ì@€œ±lBýÆ–ÌlåV¦k#á†'œê@8Ë'XûûZ£ÿF?u?2ŽÔsÞd·JÀnÖ'ƒhPQñØ…Õé¤AÔ1Ûm s ‚rþ ox¡Òk X9¹äæÛõ¨Ÿü“x i&ÜHOð‰æ+µÛ…߸Éh¡$*ÚzØ‘lŽ]li]…Ù…©*^5ü*Žãꬾ¾#‘=Zûì(°„t wW”´²o¡H}ÆÚ'«[eWá^gøU8ó/L "ØŸ”VEàH&¹@f¨sV /œ(@R²gï8œ^òêhk$¯-•&8”ܦt»“ƒÃfÂpBœ¯@Üåd=îkÊGTÀeavÏ úèË'Ë-åÊ%Ž«Híô© 0 ´_ɤX† Už×@u'qà‚·n(39…9ù“É”H>Bg[b³BU¶ˆŒræÅœ,„4!lÍ–ù‰Ó¦NÛ͢m¦‡ÍÜø²sŽ)a2À9Aã5°§…·Ó8Ðû¡àªN h†¼¥â¥&G·½°l7Jv„ÝŠ:‚× ¤‰3Ú<à7t¹Lî9$àI”Ä>±ä…÷‘¹C¸…'HÙäùS—rx.ÕÓ ¾¸Ïà§#›ÔLÔ˜CTNzŸ§ -“ -Ý/ýC À¢r´U*1­á¾«ç¾«'M´7X¢»ö<‹lœº Ü· ¤AˆþIؘéŸtÝè' õ9–ßÀeà o²ÈúÉÁÊÈÅÊÈm—‘ö§.p[fä¶ÌˆZF@#²‘R[)t°#Í—wŒ)“q%¤˜¸FÈ~‡}²’«¡#uº¸O‡4 JÌš6!«v–¤Ú—Ml=È«ó½Å ´U_Ž´1] ¨ƒ”=‚d“,s ¼Ëˆ*¼f ßc}] -q~(l1(!Š@, '¯ŽFÞ ÉÌF5¹i%°Â jn·©ö!S+¸£5‡5A1ݦ¥E§N9Yòî1­+ï„Kþ¥u³4‹áÑı5íä*ÝÁU´h” ¸”˜î¶êhÏ.eî~"-‚ÖKé©Æ‚L -ºƒp -W<µ©:‚è4QgÕíLøœ>oy #(PÛdo±€Ê¼I:µ»ç2r]>=Äx!ë5P]ôtÀÛ¬\P5ÔW”ð†”¦¶Ž ZÅx·R€kÀd{œ%#v‹Æ_C åS´-Æ­ŒýͶ"u†0ö³žk)­È‘~®‡ª‡û•,]?RÑ›O„].BÛw•ö\L—t&´k *tg&ðÈg€B¸46乇FÚ(ú®)ê0¸š ^Æ‹úÄêh¾³gß]|6ÄâNí¢1ñz³ŠáÅÀ -õZGwt -M×é®°,^èfb n³膙”3žŽºZ§§h›¯5rëÐm×SJ(4„¨¸m¡ÊdAeF/qª®þ}êNç¼Ìh£bE‰aJÊèA['[ ÃHöIO¨x´ÒËV€*Ó/4p cq s3œšB÷ƒÊ|ÛJ*{D¯ªt”f¡Ò¡0€š‹XdEbk4hÐOrª»c¨˜‡·¿Ÿ¢‰ –èPè•ÐgƒØ;eg*²jÆ¿^éFö¤fLß0³o´ì…†¾eeßzÏè8ë†EŸS7Ê„Êž-)Gô5ëáìÀú†n 1V¶°om8¼Fó¬2ŽTa{ÎSrÀŸ«³ºîš‰xd¼±C!¿f¡¹…šZÅÀU+ñЛ' ë©á(Ðþ–« ŸdµoÏ/vÒ0Ñ͘h™à+O`BåðRÇgèûi³ß0ˆñ¶šÍ³és¼üdç’á›6^BõqN;[#.Äï=‘–«÷ö'z‚Qže¾yq°-WÌðrŽ“%…úk°8R¹0èŸˆÑ µj;1ìSo7ùí³å ¿_h†9Ò†ÑñN/yyK ¹´†»„é̈8šFjX46ä#`šŸÝè5—r'Øšáæè„ÃCd eÉ4 i…¶ž¸¶’-†õÉÙ”´š‘ êèC€·uV·(ý&d‚pªƒé‚°¿¥3Ú.‰QD  @ñîNL­H¦¬¬¤U™ß ó*aX¡-«ÃDò6Ü=.F‰ñ¶sÉ×e|€n”u4`€ƒåQ0ŸPZz!žËrü¿# -¯ß鶺|.—ü±ÕŸÓ]e·x_|=˜A…-ž·Û[_“uf76§ÿÏ!µ~;®¦_‡‡Àƒ-ÞHæó>wjú¶žLÌhž½2]i$WzrÉu -,çzQM¤fþì2§ª‡G©Þðå8}]u@†9 •˜ÛƒfNò˜¡üì‡ú<¼å‡Bs%ÌB¼ BBšB‹¦Q•šîÇ´é±ô”*æ±#k!CŠBãmfÃé§Ä´³íßC¶\ü¹˜zδ1Û_#å–æø[-Čû»ä,ÛÃâ•A“k›%6bFÓ³¾€™²Û¦ŸàVÌÒˆ¶1‹Ï‚ç~{4`ؘÌf؉± Ù‹¢^]@»v¸gzJlÛ ÝÆ”ÉïÛiG.®=b³V³Ïy^Ë&¿;ÍøÕõI²_P¡Ã*K@ä7¥å®ƒ„½ó‹ä$?×:¡P+áÏ·*4ÌJøó­ƒÈâE®„?ß:HhŠÄJø󭃊äºuŸu›#úçZÑ^¹þ|ë é}€V“ýw)73+¥§=šô@Ž#¦½ÛBÛ耙m¢h£jEpÚÓ|…°y#ð;bÉ” Ö“‘²€fª‰ö¢‚.`VØ%Ð(ÚÛ -(e¶í‘K â‘Ñ|„ÁJçö‰?R6\äže@¿¥ö,ctD,ôq(¹žMs{G­¬Þa ˜µ/‚na€ôèí-í\˜´›usZ4°§µÿ€pqÙ⪹d‚ó©Hì«ÚÍû6Ö -¬ö/?‰½ ¶1XÑÚ눙ÈešêxqÇ -JP -‰-¢‚ --ò¤UZ¨3ï„»“Iƒ~V×6hqO#V¿ÅÖwâvBÌ+ü½ŒËÇ$C¬w±3ÐLCo´9v5rÇ~o`Wa^¤yU˜’êhšµI¢÷w¼-¥2ÍR[$k#o‹D¡Ù+3 S>Uºm¼*:jœ®b¡çq€ìJl¡’î-NmðÅvÊ ¹=åy„®:¶•¸Úßh¾P‚ëðÀ¤éñ"s2;>CdYé‘' aŒ‡¢§+KXé¹<¢û\ÿ¦®ù Pqb3 CZ²íãcÓj…FjçÂ˸ XÞ%X'g¿Hí1Fï 퉙›åÚÔ‰wrꪎ0Y=© a¯¬Âé -ôcu½‡v!«0Ý8 fN¿H¶B¬ -‹\4P¨_øUXoEçU@îÚñ[ϽšÅ(Ɔf±6v}ˆ[šéÆ“;†"û…f»x’H2çý˜ (b¤ ²Å$”ÍÈjÒ—3X¥š´r0B XÜc{ÒžËÎÞÌÑloýêXã*§j -û-Rè)ÿÊw -Ú+äÄÂÀ8®æd%æxÅ<%ÚÄ,a‚æxŠPç1ˆn¦eZ#"D£7nÏα"4ØÉEðn²ÁÝŠ•1ÁzZá X¼¥ ~QÒqcƒ(æþO´@¹ì6~fÝã¯cC,h¹f$]suıür¸^ºp¯ãk ½K\̳ݘ|y†Rí3o=çl@P¾5„WËì\í’b¯…c!O#Ë ±)ÁŽ¦X½8 +gÁEóÈÐk7-Ã~¼Ð·iŸ=‹‰kB‡P}}´}b+¯ë, zgrÃXŒCOÛÆíΩ™}5Èé*e +2ñ$! ÑO"›3ÀâˆNGó³ýY¥—RŒ#‚šv:gܨŸãµ<‹‚%¿“rÆŸjÅP%bæëD€!24!ÏÆoÈÁQðš3 p»œñ²3çÔ†ŠuHT0÷š·MÄ©M^II‚OyƒP¾óe„;µNgÔ=*¡&ðg‡¨Œ¡/ÂïÕaP[ ”Í!o&õJ¶7(‡›§Ã,9÷d*‰OŸÊÇâØ„3.ÜOC•ñcqY|³n#Wä»ÕØÂyürû×äÜ[Ü€‘ÜŒ=—‰ã€4(¼u´-ÅI¯WvÿŽKf–W%ád:®[ ‡J0ÿ Ä·‘²m!<[ÍŒÃ!Ú„s¬‹LÙ”šòøÅ]Zdïr£Ø¨½Bå…²ª¥ý•÷—°¾'¤»-`„ªO[ó(?0ÍèÙU!œ˜k0h ¡e%O܇ -Ò31ù„ÏJÊá(¬…>ÕR7  âÙòM„OYý}ßL^m!÷$¾­ÏF9.–pÚöng[ë[{ߟÜQ0‰„8ÞÖ›?J@nÚâ»CjñvX¬¿F»?<à¥Îc©•O=ˆ†Î!ñBðAš…Á+à¾Úó‡ ©Cþÿ;¿Wá× ø¨€ÿunõ‡ÿ¡¤pxV§Óùàð{­vÜîA—p«ßïˆûýV‡× nz|V—Óë~pâ 2§ßÿð_ -‡Çmõ;ì~p ÔêsºÁS¸ÕîôxÑ—Ëç}è*ÜêõÚÝ̵sÍa·[½>Ÿ^ó»­—Ë.|Íë°Úý Ä5§Ëî×\V7À 4|ñúáS€î†mó;­>» ê ÷{ *|rt‰1èh}yúû‡ìn4YÀ]–ÆïG‡·ùƒÝ€(ìÇY£~&ÞÜŠÃâz4ôxÀ ðð¸ï¼ˆe÷AôL:+ò-§Û÷à³ûA3q¿OôE÷ƒÅë÷¹¬^‡Ãûx»bâ2ˆDç¸vn¬p<$ƒ°å•ÐÀã~µY¿&ûùh3}X­'SÖ(>ÚâVŸ›¤¬ö‡ß-³øœXs®>ÚÀ¤ÓàsY…-5ý¯ÅÛ´žM0UAozÑã.ð<xjAjtœ.0êüÿþ¿Ëwù.ßå»|—ïò]¾Ëwù.ßå»|—ïò]þ„Êÿ%Y~tëþÿ[¤éöMO‰ré¾éI”;RïϘ?õþˆùG£ÞŸ$%õþ”(ù£éÇ”M‰kʦ™@ùÑ$¹¬ühjI•M¹åGÓéLùÑä9_~4…ä–M'Ñò£ sYùÑÔ.?š*—M0~ùÑô¸¾ühÊ‘åG“á¦ò£‰G–M†[˦ßÿñ$Ê7 ïR¾ x—òMÃÛË7 ïR¾ x—òMÃÛË7 ïR¾ix—òMÀÛË7 ïR¾ix{ù¦á]Ê7 o/ß¼Kù¦áí囆·—oÞ¥|ÓðöòMÃÛË7 ïR¾Éx{ù¦áí囆·—oÞ¥|ÓðöòMÃÛËÝiøgHÆoÞ¥|ÓðöòMÃÛËÝiøgHÆoÞ^¾ix{ù9høçFÆoÞ^¾ix{ù™høçCÆŸ€ß4ü¦¡üò³ÒðÏ„Œß4¼±üÜüs ㇆Údü¦áåFÀ?a2þ‘iø'IÆoÞXþøüÓ#ã¢áŸ  ÿ4Èø£éG–M†›Ê&S~4%®,?šlüò£éqqùÑ-?š0”M*©ò£i#«üh"É*?šHRåGÓæ²ò£©Å/?š×—M9²üh2Ü¡|SïŽå›zw,ßÔ»où&ÝÝË7ݾËwù.ßå»|—ïò]¾Ëwù.ßå»|—ïò]¾Ëuå^ƺïò]¾Ëwù.÷/¿ Ë ÎÏ ïÐÏOÒÝÁqkþ ¢ü,àNÁ0å¾Ð$ñáÝ Yñ_²Ë]¡ñ ý¥@á‚»Òÿ`¸¡@¢€üò—¿äÀ» è—üB»Š„ëþŸÜB‚ãA» Š€kÿ¿Ù…G"w=0.(¬ÿ¯X…€G wj|P$PÿÿbBŽ‡ÚU°hP¨ÿ³ -Äíj`  $Pÿ_£ò7Ä‚F£v!0 ô7ó7 -¢€oÁ‘ÐX¨]L@ -0þ–. Bír`,X,PÒßþíßò÷ À¿$8  Æv, --  @ùU @âF F»1.ZV¤_ýê׿þõ?Àþ"p7„ÚUÀHXZpX@P„óTð~qC„<v I´HPÒ?þão~óODùÍo8 ò:`ZI Å€‚þéŸþùŸÿù· €?€ö+†ÈTäB‹!ýö·ÿB„Æv b\Rh  ¤ý×Cå_ÿ€ûç`ˆŠr !¤ ê_ ÿ÷ÿÿøð Áh40ºËd#Æ!! -€ó;¢xÿ†€ý†Æ¦¢LÄ`h‘ ~÷ŸÿùŸà“€FcSQ&b¿8E£AýÂPð~‡PCd„T¼±“¡HÑ„XAHJ¥R¥‰Ù?þ âň±`¡¡ñ׬ßü  „¤R©Aà0€ö›üõ¯¨áÁAL6,º» Z¿ûO @ÒÀÀA`³ù-ì2fxÈEL$Z*I €>]û{V]  ’ E€Òét©H!F÷Á<®„G! !B BÒ#h¢"‰ŸˆgG¢(¬#`A¬ô° ` bp(²F‡\"ŠÂÝ…ÐÒSÀb¿û0o "5æ™±AâEÂ2 0Ôc Y#ñRX¿$ç ‹ê/DCˆÈõ+>¬sÀø< -Îeb~ÁqHŒ €—–‰€w é|Ñ à‡ˆGýö_þí?Èc‡† ë˜vÁlˆb¨ËÈA¯$XÇ ¬+Çÿb3)Šq ÉŒ@1Œ3èÙ°dñ—\"BÄÎAs)5KqוK`qˆH!&À}9¬þ2X죉H Fc–ŒX08½lX|"¢#—0ŒZ.1´8³×æë`ýGºù{Èë!0€Ùï8bäPÿò[jQa3_9°XDü%Wj£ÄZ¾ùÝïØÂÔß Ê7òÖf1‚w""’E…ä6$qCƒÇ£.”o‰þ×”<ú¯„<úïP¥A±Ðº1¶ú€€h” ý¯Pò´/‘깈quMR¸dh°TËÿAP‘ ìHÅ蟑^„ ±@¢%S¨?Õ-Ih´Æ÷–ÆGhΗ벿àP‘&ªÉþ=­ÉÒhÉ$!1GCÿ5¡ “: ê:Œ´< h,ÓÃß“––éá^lTù…0´Ý6•¿c™TþškÀ¹ØÌñ40’ŽÈ*EؤhK‘‚²LýÕõ¶"60Žµ°!ˆC˜ÀþškqcºÖ‰Á’²"þ5«Ð¶=Ƹw±%‘Œ‚†¬£\£% éÄŽ(ßÈƘ}ÿŠký+ÒÕ x–s®9ûÄÈü?¹ôKAñwØfzžñœéjóù/N Û'›¿Øò¸ ½ÛÁßîàm®\½q -»_t²Cïˆ]‹·;Eo„ñw§x®Ý âA“ØwûÅ­ XÐX—'Û{÷Ä&¶QÊzàö}Yve|x¿¸+¤Sp"å>䀻#$ixw$ðgƒó]¾Ëwù.ßåÿ¤¢Ñ¤¿&©Ña¤èäšxÞ=¿ë£ýaºS”G…ñ¨°?¤øCü·?àè_çàÇ»Âá·[N·ëÁáí.—ßû°R8|v«Ûá„×üV—ÏáøT8¼N«Óùÿu[E½mÛ@øð?Ü‹»XhRE©y²tðæ CRoîŠBP"Æõ:K$Çõ†ý÷}”,;uTÄØЗ>Ȧ>~÷Ýñîx¶"/2\ -ÐàQ¤%°ˆ{Æ`3¹¯Œ&% ¦¢ˆ~Ksc„+à¾Ð!yÆçZE° =x" mFàÉ&£tv&à¡JzKÁ2˄܈À‰‡ÿŽÝ1g«ó[íÁ9i®¼æï¢ÖÜóÝÂx\Fÿ]Còå.FèÑS©6¾A>û³,KV6¥E‘¤K›U êÄú9n²Ü|ŽÌ@U)Cí·\i%é¬]xä2ØEU'u¾b:8¦¡öû‰Õ™Ö¾á2ˆ•ôÀA&Æ·ÿÅÝøw®¼Z˜;®ÂÚ×Úh•ô)Ë7eyEN±fnŠ^ì&©ñ#á&ª } `·Àõ ±ˆîGsÿý–U‘¸4~ÔéŸÿÞ}*ÁõÓsIÜ8’‘Ç}\Û“ZLÙ5“‘l°Pµ¬ÑÁžu˜^ë½®òÄ‘n‹<ÖÅ%<ÒU_ÑU^x¤«:t•ŒŽt÷È3º‡<¨Ž<´*‡<ì‘NÝÃêZÞ5-‚–i¤×û%YØ·E²üWhQ&–’ m‘Tö;øƒaK´«Å`È7IKÇ_¿7¯Ù¿´y(w endstream endobj 416 0 obj <> endobj xref 0 422 0000000003 65535 f -0000000016 00000 n -0000037508 00000 n -0000000004 00000 f -0000000006 00000 f -0000039918 00000 n -0000000007 00000 f -0000000008 00000 f -0000000009 00000 f -0000000010 00000 f -0000000011 00000 f -0000000012 00000 f -0000000013 00000 f -0000000017 00000 f -0000037559 00000 n -0000039767 00000 n -0000039798 00000 n -0000000018 00000 f -0000000019 00000 f -0000000020 00000 f -0000000021 00000 f -0000000022 00000 f -0000000023 00000 f -0000000024 00000 f -0000000025 00000 f -0000000026 00000 f -0000000027 00000 f -0000000028 00000 f -0000000029 00000 f -0000000030 00000 f -0000000031 00000 f -0000000032 00000 f -0000000033 00000 f -0000000034 00000 f -0000000035 00000 f -0000000036 00000 f -0000000037 00000 f -0000000038 00000 f -0000000039 00000 f -0000000040 00000 f -0000000041 00000 f -0000000042 00000 f -0000000043 00000 f -0000000044 00000 f -0000000045 00000 f -0000000046 00000 f -0000000047 00000 f -0000000048 00000 f -0000000049 00000 f -0000000050 00000 f -0000000051 00000 f -0000000052 00000 f -0000000053 00000 f -0000000054 00000 f -0000000055 00000 f -0000000056 00000 f -0000000057 00000 f -0000000058 00000 f -0000000059 00000 f -0000000060 00000 f -0000000061 00000 f -0000000062 00000 f -0000000063 00000 f -0000000064 00000 f -0000000065 00000 f -0000000066 00000 f -0000000067 00000 f -0000000068 00000 f -0000000072 00000 f -0000037635 00000 n -0000039651 00000 n -0000039682 00000 n -0000000073 00000 f -0000000074 00000 f -0000000075 00000 f -0000000076 00000 f -0000000077 00000 f -0000000078 00000 f -0000000079 00000 f -0000000080 00000 f -0000000081 00000 f -0000000082 00000 f -0000000083 00000 f -0000000084 00000 f -0000000085 00000 f -0000000086 00000 f -0000000087 00000 f -0000000088 00000 f -0000000089 00000 f -0000000090 00000 f -0000000091 00000 f -0000000092 00000 f -0000000093 00000 f -0000000094 00000 f -0000000095 00000 f -0000000096 00000 f -0000000097 00000 f -0000000098 00000 f -0000000099 00000 f -0000000100 00000 f -0000000101 00000 f -0000000102 00000 f -0000000103 00000 f -0000000104 00000 f -0000000105 00000 f -0000000106 00000 f -0000000110 00000 f -0000037706 00000 n -0000039533 00000 n -0000039565 00000 n -0000000111 00000 f -0000000112 00000 f -0000000113 00000 f -0000000114 00000 f -0000000115 00000 f -0000000116 00000 f -0000000117 00000 f -0000000118 00000 f -0000000119 00000 f -0000000120 00000 f -0000000121 00000 f -0000000122 00000 f -0000000123 00000 f -0000000124 00000 f -0000000125 00000 f -0000000126 00000 f -0000000127 00000 f -0000000128 00000 f -0000000129 00000 f -0000000130 00000 f -0000000131 00000 f -0000000132 00000 f -0000000133 00000 f -0000000134 00000 f -0000000135 00000 f -0000000136 00000 f -0000000137 00000 f -0000000138 00000 f -0000000139 00000 f -0000000140 00000 f -0000000141 00000 f -0000000142 00000 f -0000000143 00000 f -0000000144 00000 f -0000000145 00000 f -0000000146 00000 f -0000000147 00000 f -0000000148 00000 f -0000000149 00000 f -0000000150 00000 f -0000000151 00000 f -0000000152 00000 f -0000000153 00000 f -0000000154 00000 f -0000000155 00000 f -0000000156 00000 f -0000000157 00000 f -0000000158 00000 f -0000000159 00000 f -0000000160 00000 f -0000000161 00000 f -0000000165 00000 f -0000037785 00000 n -0000039415 00000 n -0000039447 00000 n -0000000166 00000 f -0000000167 00000 f -0000000168 00000 f -0000000169 00000 f -0000000170 00000 f -0000000171 00000 f -0000000172 00000 f -0000000173 00000 f -0000000174 00000 f -0000000175 00000 f -0000000176 00000 f -0000000177 00000 f -0000000178 00000 f -0000000179 00000 f -0000000180 00000 f -0000000181 00000 f -0000000182 00000 f -0000000183 00000 f -0000000184 00000 f -0000000185 00000 f -0000000189 00000 f -0000037859 00000 n -0000039297 00000 n -0000039329 00000 n -0000000190 00000 f -0000000191 00000 f -0000000192 00000 f -0000000193 00000 f -0000000194 00000 f -0000000195 00000 f -0000000196 00000 f -0000000197 00000 f -0000000198 00000 f -0000000199 00000 f -0000000200 00000 f -0000000201 00000 f -0000000202 00000 f -0000000203 00000 f -0000000204 00000 f -0000000205 00000 f -0000000206 00000 f -0000000207 00000 f -0000000208 00000 f -0000000209 00000 f -0000000210 00000 f -0000000211 00000 f -0000000212 00000 f -0000000213 00000 f -0000000214 00000 f -0000000215 00000 f -0000000216 00000 f -0000000217 00000 f -0000000218 00000 f -0000000219 00000 f -0000000220 00000 f -0000000221 00000 f -0000000225 00000 f -0000037938 00000 n -0000039179 00000 n -0000039211 00000 n -0000000226 00000 f -0000000227 00000 f -0000000228 00000 f -0000000229 00000 f -0000000230 00000 f -0000000231 00000 f -0000000232 00000 f -0000000233 00000 f -0000000234 00000 f -0000000235 00000 f -0000000236 00000 f -0000000237 00000 f -0000000238 00000 f -0000000239 00000 f -0000000240 00000 f -0000000241 00000 f -0000000242 00000 f -0000000243 00000 f -0000000244 00000 f -0000000245 00000 f -0000000246 00000 f -0000000250 00000 f -0000038012 00000 n -0000039061 00000 n -0000039093 00000 n -0000000251 00000 f -0000000252 00000 f -0000000253 00000 f -0000000254 00000 f -0000000255 00000 f -0000000256 00000 f -0000000257 00000 f -0000000258 00000 f -0000000259 00000 f -0000000260 00000 f -0000000261 00000 f -0000000262 00000 f -0000000263 00000 f -0000000264 00000 f -0000000265 00000 f -0000000266 00000 f -0000000267 00000 f -0000000268 00000 f -0000000269 00000 f -0000000270 00000 f -0000000271 00000 f -0000000272 00000 f -0000000273 00000 f -0000000274 00000 f -0000000275 00000 f -0000000276 00000 f -0000000277 00000 f -0000000278 00000 f -0000000279 00000 f -0000000280 00000 f -0000000281 00000 f -0000000282 00000 f -0000000286 00000 f -0000038091 00000 n -0000038943 00000 n -0000038975 00000 n -0000000287 00000 f -0000000288 00000 f -0000000289 00000 f -0000000290 00000 f -0000000291 00000 f -0000000292 00000 f -0000000293 00000 f -0000000294 00000 f -0000000295 00000 f -0000000296 00000 f -0000000297 00000 f -0000000298 00000 f -0000000299 00000 f -0000000300 00000 f -0000000301 00000 f -0000000302 00000 f -0000000303 00000 f -0000000304 00000 f -0000000305 00000 f -0000000306 00000 f -0000000307 00000 f -0000000311 00001 f -0000038165 00000 n -0000038825 00000 n -0000038857 00000 n -0000000312 00000 f -0000000313 00000 f -0000000314 00000 f -0000000315 00000 f -0000000316 00000 f -0000000317 00000 f -0000000318 00000 f -0000000319 00000 f -0000000320 00000 f -0000000321 00000 f -0000000322 00000 f -0000000323 00000 f -0000000324 00000 f -0000000325 00000 f -0000000326 00000 f -0000000327 00000 f -0000000328 00000 f -0000000329 00000 f -0000000330 00000 f -0000000331 00000 f -0000000332 00000 f -0000000333 00000 f -0000000334 00000 f -0000000335 00000 f -0000000336 00000 f -0000000337 00000 f -0000000338 00000 f -0000000339 00000 f -0000000340 00000 f -0000000341 00000 f -0000000342 00000 f -0000000343 00000 f -0000000347 00000 f -0000038244 00000 n -0000038707 00000 n -0000038739 00000 n -0000000348 00000 f -0000000349 00000 f -0000000350 00000 f -0000000351 00000 f -0000000352 00000 f -0000000353 00000 f -0000000354 00000 f -0000000355 00000 f -0000000356 00001 f -0000000357 00000 f -0000000358 00000 f -0000000359 00000 f -0000000360 00000 f -0000000367 00000 f -0000050112 00000 n -0000050188 00000 n -0000050389 00000 n -0000051403 00000 n -0000064916 00000 n -0000130505 00000 n -0000000374 00001 f -0000039883 00000 n -0000038318 00000 n -0000038589 00000 n -0000038621 00000 n -0000041529 00000 n -0000046044 00000 n -0000000378 00001 f -0000045752 00000 n -0000046288 00000 n -0000046385 00000 n -0000000379 00001 f -0000000380 00001 f -0000000381 00001 f -0000000383 00001 f -0000046792 00000 n -0000000384 00001 f -0000000385 00001 f -0000000386 00001 f -0000000388 00001 f -0000047411 00000 n -0000000396 00001 f -0000047524 00000 n -0000047336 00000 n -0000043066 00000 n -0000043103 00000 n -0000047038 00000 n -0000046972 00000 n -0000047305 00000 n -0000000408 00001 f -0000046856 00000 n -0000048953 00000 n -0000048999 00000 n -0000049054 00000 n -0000046491 00000 n -0000045898 00000 n -0000046081 00000 n -0000046178 00000 n -0000038397 00000 n -0000038471 00000 n -0000038503 00000 n -0000000415 00001 f -0000041768 00000 n -0000042051 00000 n -0000041643 00000 n -0000040481 00000 n -0000041222 00000 n -0000050075 00000 n -0000000000 00001 f -0000144511 00000 n -0000042320 00000 n -0000049511 00000 n -0000049561 00000 n -0000041286 00000 n -0000000324 00000 n -trailer <<7B155ECB16434278808966F5BBF58F42>]>> startxref 144646 %%EOF \ No newline at end of file diff --git a/www/images/tikzit.ai b/www/images/tikzit.ai deleted file mode 100644 index c88998d..0000000 --- a/www/images/tikzit.ai +++ /dev/null @@ -1,1563 +0,0 @@ -%PDF-1.5 %âãÏÓ -1 0 obj <>/OCGs[13 0 R 35 0 R 43 0 R 56 0 R 103 0 R 125 0 R 133 0 R 146 0 R 193 0 R 215 0 R 223 0 R 236 0 R 283 0 R 305 0 R 313 0 R 326 0 R 373 0 R 395 0 R 403 0 R 416 0 R 463 0 R 485 0 R 493 0 R 506 0 R 553 0 R 581 0 R 589 0 R 602 0 R 649 0 R 677 0 R 685 0 R 698 0 R]>>/Type/Catalog>> endobj 737 0 obj <>stream - - - - - application/pdf - - - Basic RGB - - - - - Adobe Illustrator CS3 - 2010-04-01T23:35:52+08:00 - 2010-04-02T00:08:44+08:00 - 2010-04-02T00:08:44+08:00 - - - - 256 - 248 - JPEG - /9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgA+AEAAwER AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE 1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp 0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo +DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8A9U4q7FXYq7FXYq7FXYq7 FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7F XYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FX Yq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXY q7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq 7FXYq7FXYq7FXYq7FXYq7FUJqmr6VpNk99qt5BYWUX95c3MiQxL83cqoxV495s/5y5/KjRTJDpsl zr90mwFlFwh5DxmmMe3ugbFXmGo/85mee9VufqvlXytbRSPXhHKZ7+Y79QsP1cfgcVQ6/mB/zmRr vxWOnX9lFINgulwW6kMBQh7qLl71DYqv/Rf/ADmzenl6l8hTb/enTbcfd6kdcVaN7/zmxpy86X7h fgp6Wm3R2/yeMtenXFVr/wDOQ/8Azkr5YBfzH5d9SBPty6hplxbrSvUSQmBPau+Ksn8t/wDObmiy lI/Mnly4tOzXFhKlwvz9KUQkD/ZnFXs/kz85vy084lItD123kvH2FhOTb3NfBYpQjP8A7CoxVmuK uxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KoTVtY0rR9Pm1LVbuGxsLdeU91c Oscaj3ZiBv2xV8z/AJk/85iF520j8t7I3Mzt6S6xdRMeTNsPq1t9pj4GQf7DFWKaR+Qf51/mbeJr fnzVZdNt5fiVtQLS3IU9orJSiQr/AJJKf6uKvZvKP/OLn5S6AqSXVg+u3i7mfUXLpXvSBOENP9ZW +eKvU9L0rSNJtha6XZW9hbDpBaxJDGKf5MYUYqjPUxV3qYq71MVd6mKsU8z/AJW/lz5nV/035esr qWSvK5EQiuN/+L4uEv8Aw2KvE/Ov/OGejzh7nybrEljP1Wx1D97CT2CzIBIg/wBZXxVhtn+Y3/OQ f5K3kVj5mt5dT0IEJEl8xuLd1Ha3vV5Mhp0Riad0xV9E/lb+fvkP8wkS2srg6drpWsmj3ZCykjr6 L/YmX/V+Km5UYq9JxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KsF/Nb84fKn5b6R9a 1WT6xqc6k6fpETATzkbVPX04wftOwp4VO2KvliGz/N//AJyH8wG7u5vqHlq2kIVyHWwth/LDHWs8 3Hqa18Sopir6S/LX8mfI/kC3VtKtfrGqlaT6vdAPcNXqENKRL/koB7164qz31MVd6mKu9TFXepir vUxV3qYq71MVd6mKu9TFUPfWljqFnLZX9vFd2c6lJ7adFkjdT2ZGBUj54q+cPzU/5xTiLvrv5cyG 0vIm9Y6M8hVSynlytZiaxsD0VjTwI6Yqt/KD/nKLVtI1BfKH5oiWOSBxbprM6lZ4XGwS9UirD/iz r/NX7WKvqiCeC4gjngkWWCVQ8UqEMjowqrKw2II3BGKr8VdirsVdirsVdirsVdirsVdirsVdirsV dirsVebfnd+dOkflp5fElEvPMV6Cul6aW+YM8wBqIkP0sdh3IVfOP5XflT5m/NvzBL548+3M8mkS ycubnhJeshp6UVKenAlOJK0/lXepVV9ZabYafpdhBp+nW8dpY2qCO3t4lCIiDoFAxVFepirvUxV3 qYq71MVd6mKu9TFXepirvUxV3qYq71MVd6mKu9TFXmv5w/kr5e/MOwM1EsPMcCUs9VVa8gOkU4FC 8fh3XqO4Krxn8n/zi8y/lJ5kk8hefo5V0JJOAZ6u1kzHaWEivO3fqVX/AFl3qGVfZEE8FxBHPBIs sEqh4pUIZHRhVWVhsQRuCMVX4q7FXYq7FXYq7FXYq7FXYq7FXYq7FXYqxj8yPzA0byF5SvPMWqHk sA4WtqCFe4uHr6cKV/mO5NNlBPbFXyR+W3kvzB+dPnu986ecXaTRYZh66/EqSsu6WUG/wRRqfioa ge7VxV9a20Nva28VtbRrBbwIscMMYCoiKKKqqNgAOgxVU54q7nirueKu54q7nirueKu54q7nirue Ku54q7nirueKu54q7nirzv8AOf8AKbTfzC0AqgSDzBZKW0y9NBU9fRlNCTG//CnfxBVeb/8AOMf5 v6l5d1s/lb5xLW6rM1vpDz7Nb3XKjWjn+SRv7v8Ayttwwoq+scVdirsVdirsVdirsVdirsVdirsV diriQBU7AdTir4n/ADY806r+df5vWvlXQZifL2nStb2kq7x8UP8ApV8w2r9mieIApuxxV9MeWtA0 vy3oVlomlRCGxsYxHEu1TTdnYilWdqsx7nFUz54q7nirueKu54q7nirueKu54q7nirueKu54q7ni rueKu54q7nirueKu54q+fv8AnJ38sfrdmPPejRlNRsAo1YRVDPAtAk44/tQ9GP8ALv8As4q9c/5x 3/Nf/lYPkaN76QN5h0gra6sNgZDT91cUH+/VBr/lBu1MVepYq7FXYq7FXYq7FXYq7FXYq7FXYq8h /wCcn/zGbyd+W89rZycNY8wFrCzINGSIr/pMo7/DGeII6MynFXn3/OMXkFNE8qN5lu0pqWugGGo3 js0PwAf8ZW+M+3HwxV7Tz98Vdz98Vdz98Vdz98Vdz98Vdz98Vdz98VQ1/q2m6dB6+oXkNnB09W4k SJP+CcgYqkzfmV+X6mh8y6Z9F3CR+DYqjNN84eVdTmEOnazZXk5/3TBcRSP/AMCrE4qm3P3xV3P3 xV3P3xV3P3xV3P3xV3P3xV3P3xVTuIoLm3lt7hFlgmRo5YnAZWRhRlYHqCDir5Y8tao/5Gfnw8Fx K6+V7s+ncMQz8tOuTWOUqoZma3cb0Wp4sB1xV9Bv/wA5Xfkirso1mZwCQGFldUPuKxg4qn2g/n9+ TuuSLFY+abRJX2VLv1LIknsPrSwgn5Yqz6KWKWNZYnWSNwGR1IKkHoQR1xVdirsVdirsVdirsVdi rsVfF3586hP+Y/8AzkDZ+ULaWun6W8emgqagEfvr6Qf5S7qf9TFX0daw29pbQ2tugit4EWKGNeio g4qo+QGKqvqYq71MVd6mKu9TFXepiqF1TWNO0qwm1DUbhLWyt15TTyGiqOn0knYAbk4q+fPPv/OR es30ktl5UX9H2Iqv6QkAa5kHSqA1WIH6W71HTFXj9/f6hqNy11f3Mt3cv9ued2kc/NmJOKobjiru OKs48n/nD558sOiQ3zX2nrQGwvCZY+I7IxPOP24mniDir6P/AC//ADR8vedLQmzJttShUNdadKQZ EHQsh25pXbkPpArirL/UxV3qYq71MVd6mKu9TFXepirCvzB/Kjyp57urC51o3CSaeHVGtnWMyJIQ eEhZXJUEVFKdcVSRP+ccPylVAp02ZyOrNdT1P3MBiqQa5/zir5Luo2bR9RvNNuCPhEpS5hB/1SI3 /wCHxVg/1H88/wAkZ/r2k3rXfl5G5SiItcWDAnf17dqNET0Lins+KvpD8mP+cgfLP5jwixdRpfma JOU+lu3JZQo+KS3c05r3K/aX3G+KvVcVdirsVdirsVdiqC1zVrbR9F1DV7ra2062mu5zWn7uCMyN v8lxV8Z/840WNxrfnjzB5uv/AN5cxqxaQ97i/kZ3cV78UYf7LFX0pzxV3PFXc8VdzxV3PFVktxHF G8srhI41LO7GgCgVJJPYYq+VvzY/Mu884au1vbSMmgWbkWcG6+ow29eQd2b9kH7I961VYDxxV3HF XccVdxxV3HFUZpGralo+pQalps7W17bNzhmTqD0IIOxBGxB2IxV9a/lz58tfOHl2O/TjHfRUi1C2 H7EoHVa78H6r93UHFWU88VdzxV3PFXc8VdzxVKdd83+W9AjEmsajBZ1FVjkb94w6VWNau30DFWMf 8r0/LT1OP6Vbh/vz6vccfu9Pl+GKso0PzX5e16Iy6PqMF6AOTrG45qD/ADxmjr/shiqZyBJEaORQ 8bgq6MKgg7EEHtir5w/OT8pbjyneL578kNJZR2kqz3VvbEq1pJWongp0j5faX9n/AFfsqvor8hPz eg/MjygLi44x+YdNKwaxbqKAsR8E6D+SUA7dmBHhVV6ZirsVdirsVdirzP8A5yS1dtL/ACV8zTIa SXEMVmo33FzPHC4/5Fu2KvIv+cZNNFp+Xst4R8eoX0sgbvwjVYgPoZGxV65zwq7nirueKu54q7ni rzP8+vNMml+U00y3fhc6w5iYioP1eMAy0p/NyVT7E4FfNvHFXccVdxxV3HFXccVdxxV3HFWffkr5 pk0Lzpb27sRZasRZ3C705sf3L08RIaV8CcVfUHPCrueKu54q7nirzj83PzRbytarpmlkNrl2nISE Blt4yaCQg7MxoeIPzPgQr5uvLu8vrqS6vJ3ubmY8pZpWLux8SxJJxVR44qiLC+vtPu47yxnktrqE 8o5omKsp9iMVfSn5S/mefNdk9jqPFNcs0DSlaKs8fT1VUdCDQOBt3HWgVZ9PHDcQSQTxrLBMrRyx uAVZGFGVgeoIwq+cPJF9N+UH/OQcVl6jLoGozLayVJ4tZXrUidvH0JKVP+SfHAr7gxV2KuxV2Kux V4V/zmTd+h+UcMVafWtVtoqUrWkU0tPb+7xVJfyQhW3/ACt0KMbExyyGtK/vZ5H7f62Ks654Vdzx V3PFXc8VdzxV8+f85AXzz+b7W15VjtbNPg7B5HdmP0rxwK8w44q7jiruOKu44q7jiruOKu44quQs jq6kqykFWGxBHcYq978j/nlpV1axWXmVvqd+gCfXQCYZabcm41KMe+3H3HTFXo9p5g0S8QPaahbX CEV5RTI4/AnCqI/SNl/y0R/8Gv8AXFUBq/m3y7pFs1xqGowQIoqFLqXb2VBVmPyGKvlfzTrc2veY b/V5a1u5mdFbqsY+GNNv5UAGBUq44q7jiruOKp35K18aB5u0nUDKIlW4SOX3ilPpyCnf4GOKvq6S 6LbDYYVeA/8AOT+mx89C1dBSUia1lbuQvGSP7iXwK+wvJOrvrXk3QdYkNZNS060u3r15TwJIa/S2 Kp1irsVdirsVeAf85qgn8q9LIFQNctyfYfVLoYqk/wCU81Py70Eq3S2AqPEMQcKszS97OK+4xVWW dH+ya4qu54q7nirueKvnn88Ld088tIek9tC6/Ick/WmBXn/HFXccVdxxV3HFXccVdxxV3HFXccVZ L5V/LzzL5m/eWMAjsweLXs5KRVHULsWY/wCqDirP7P8A5x8i4g3utEt+0kMFAPkzOa/8DiqK/wCh ftG/6u1x/wAi0xVLtX/ICaO3eTSdUE0yiq29xHw5e3qKxofmuKvJZreWGZ4ZUMcsbFJEYUKspoQR 4g4qs44qoz3NvbisrhfAdz9GKpVda6xqtsvEfzt1+gYqo6LDcahr+n24Jee5uoYkruSXkCj9eKvt j1MKHjf/ADkvcp/h7R7c/be7eRfkkRB/4mMCX1B+T1s9t+VPlCJ/t/oeyYilCOcCPQg+HKmKsvxV 2KuxV2KvFv8AnLywa5/Jq6nFaWN9aXDU8Gcwb7eM2KvOfyUvRP8Alvpa1+KAzxN9E7kf8Kwwqzr1 MVd6pGKqqXsq9TyHviqqt+h+0CPxxVWW4jbowxV5J+fOjs36N1lFqAGtJ28OskX/ABvgV5DxxV3H FXccVdxxV3HFXccVdxxVNfK+hvrfmCx0xa8biUCUrSoiX4pGFfBATir6htLe2tLaK1tYlht4VCRR IKKqjoAMKqvPFXc8VWtcRr1YYq+e/wA79FfRdXbXbO3aXT9SesrDZY7g7sG6/wB59oe9cCvI7jWr 6bYMIl8E2P39cVQJYsSWNSepOKtYq9Y/IfyPPf60vmW8jK6fp5P1PkNpbilKgEfZjrWv81PfFX0P 6mFXgn5yzXHmv8x9F8o6afUnRorRabgXN661rTsE4E4FfdGnWNvp+n21hbjjb2kSQQr4JGoRR9wx VEYq7FXYq7FWEfndoTa5+UvmrTlXnIbCS4iSlS0lrS5QD3LRCmKvl7/nHfVRJ5f1PTSfitbkTAd+ M6AfriOKvWfUwod6mKu9TFXepirvUxVLPMukx67oV3pMsjRLcpSOVa1SRTyRxQj7LAGnfpir5Y1O fzBoupXGm3/wXVq5SWN1B6bgg0FVYbg9xgSsTzLdD7cSN8qj+JxVWXzMv7VufmH/ALMVVB5lte8T j5UOKrh5ksabxy1+S/8ANWKuPmSx7Ry1+S/81YqtPmW17ROfnQYq9u/JbR3t7BvMd5bmOe9XhYo5 3EBNTJSn+7CNvb2OKvTjqUnZQMKFhv5z+1T5DFVNriRvtMT9OKrfUxVQvrWzv7SWzvYUuLWZeMsM gDKw9wcVeOeZ/wDnH1Xmefy5fLFGxqLK75UX2WVQxPsGX6cCWKD8jfP/AKvD0LcLWnq+uvH5/wA3 4Yqy7yv/AM4/QxTJceZL1bhVNTY2nII3+tM3FqeIVR88Vew2kFrZ20draRJBbQqEihjUKiqOgAGw woSXzt50sfK2hS6jcEPOapZ21d5ZSNh8h1Y+GKpN/wA4l/l5f695pvfzL1xDJDbPKmnPIP729m/v ZQP5YkYqP8ptvs4EvrjFXYq7FXYq7FVskccsbRyKHjcFXU7ggihBxV8G+TrSTyJ+c+seU7hisJmn sYy5pyCN6ttJ/s4wKf62Kva/Uwq71MVd6mKu9TFXepirvUxV5f8Ann5XtLzQf8QRoFvtPKJK4/bg kcJQ/wCq7gj6cVeCYFdirsVdirsVZf8AlZ5ZtfMPm6G1vF52VtG11cxfzrGQoU+xd1r7Yq+m1ZVU KoCqooANgAMKt+pirvUxV3qYq71MVd6mKu9TFXepirvUxViHm/8ANPy15cjeNphe6kNlsYGBYN/x Y26oPnv7Yqw78vvy189fnd5mXVtXaSy8r2z8Z74LxjVAam3s1bZ5D+02/Hq3ZSFfbehaHpWhaRaa PpNutpp1jGIba3Toqr+JJO5J3J3OKo7FXYq7FXYq7FXYq+Rf+cxfKFzo3m7RfP2nL6YveFvdSr+z eWnxQufd4hQf8Y8VTfQNdt9a0az1S3/u7qMPxrXi3R0PurAjChMPUxV3qYq71MVd6mKu9TFWFfnD qUdt5EvYmNHvHigiHifUEh/4SM4peIeVvJmu+ZbkxabCPSjNJrqQlYUr2LUNT7AE4Fegj8gG9EFt cAmpuotqrXwr6oP00w0qXyfkL5hDkR6jZsnYt6qn7gjfrwUqMtPyBuWWt3rMcbfyxQGQfezx/qw0 qS+afyc8waPA91YyLqlogq4jUpMoHf06tUf6pPywKu/I/Uo7Tzk1u5p9dtZIox/lqVlH/Co2Kvf/ AFMKHepirvUxV3qYq71MVd6mKvK/zR87eYIfMWneXvLU0i6ixUSJAAzyTXBCwwhSDU71pTuMUuay /wCcn4iYX0LUWcbeoNPjbr/lJHwwKirb8m/+cmvNREV/FNYWkho8l3cw2sXWnxRQH1CP+eZxV6j+ Xn/OG3lnSpYr7zlfHXLpCGGnW4aGzBHZ2r6su/8AqDxBxV9DWVlZ2NpDZ2UEdtaW6iOC3hUJGiLs FVVAAA9sVVsVdirsVdirsVdirsVYn+afkS089eRdU8uT8VmuY+djM3+6rqP4oXr1pyFGp+ySMVfG f5T67eaJrN95N1hGt7hJpFiik2MdzEeMsR+fHb3Hvir1v1MKHepirvUxV3qYq71MVePefLm686ed 7Xyxpz/6JYEi4lG6q/8Au5z/AMYwOI/ytu+BL1TRtLsNH02HTrCMRW0C0Udye7Me7MdzhQjfUxV3 qYq71MVd6mKvH/zL8syeXtYtvN+iIIkWdHuYlHwpNWoeg/Zk6N7/ADwJep6JrdprGlW2pWprDcoH A7qejKfdTscKEb6mKu9TFXepirvUxVL/ADBr9pomj3Op3R/d26EhO7udkQe7NtiqS/8AOKvkO983 efbz8wdaX1LPSZWa3Zh8Mt/KKgL7QI3L2JTAl9j4q7FXYq7FXYq7FXYq7FXYq7FXYq7FXyf/AM5f /lpDpl7Z/mRpEi2s9xNHbanEGCO1wqkwXEYru3GPi4HgG/mOKpP5G82DzFoUd26lLqI+jdilF9RQ DVfZgQfbCrIfUxQ71MVd6mKsX8/+c4vL2jP6Tj9J3KlLOPqQTsZCPBP14pS38p/Lf6N0Y6rciuoa oBJyb7Sw9UFT/P8AbP0eGKs69TFDvUxV3qYq71MVd6mKobUrO11GwuLG6Xnb3KGORfYjqPcdRil5 f5D1qXyl5jvfKmrShbaSX/Rpm2USEDid+iypT5H6cVes+pih3qYq71MVd6mKvIfNWoal5/8APGne TtGYLE92tpCZW4I1wzcHlev7KCtO/WnWmBL7m8h+StI8leVNP8t6Uv8Ao1jHxeYgB5pW+KSZ6ftO xJ9ug2GKp/irsVdirsVdirsVdirsVdirsVdirsVfD3/OQHnS9/Mr8118t6bNXRNFkeztiN0Mi/71 3B8d14r4hRTrirJtKsLPS9PhsLNPTt4F4oO58WPiSdzhQk/nDz1p/lu2UOPrF/KKwWqmhp/O534r +v76KvItX/MLzZqcpZ7+S2jP2YLUmFAPD4Tyb/ZE4EpVDr+uwuXh1G6jc9WSaRT94OKoe4vLm7uf rF7NJcSsR6kkjF3IH+U1Tir6U0++s7qxguLJ1e0kQGFl6cabD2p0p2woRPqYq71MVd6mKu9TFXep irvUxV4n+bt5Y3PmlRbMHlgt1iuivQSBmbifcKwr92BLF/8AEOviBbcaldCBBRYvWk4AdKBeVMVV LPzP5js3DW2p3MdDXiJXKn5qSVP0jFXofk782nnnjsfMHBWc8Y9QUBFqeglUbCv8w29u+KvTPV98 KHmX5p+Wngli80aXyguYXQ3bREqwYEenOpHRlagJHsfHFL69/Iv8yB5//L2x1adh+lratnqyCn+9 MQFXoOglUq/007YFeg4q7FXYq7FXYq7FXYq7FXYq7FXYqxr8y/MjeWfy/wDMGuxtwnsLGaS2Y9PX KFYf+SjLir4g/J3Tl4X+rSDlIzC2jY9ezyffVcKvRbu9itbWa6mNIoEaWQ+CoCx/AYofO+s6tdat qdxqF0ayzsWp2VeiqPZRtgSgsVdirsVekflF5hlS5n0SZ6wyKZrUE/ZdftqP9YfF9GFXqXqYod6m Ku9TFXepirvUxVJfN+vnRvL91exkfWKCO3r/AL8fZTv/AC/a+jFLwF3eR2kkYu7kszMakk7kknAq 3FXYq7FXs/5XeYZNR0JrSdi9xpxEfI7kxMCY6/KhX6MKssv7aC+sp7OcVhuI2jcezCmKHf8AOGmv 3Ol+fNf8p3DUivbYzBO31iyk4GnzSVq/6owJfYOKuxV2KuxV2KuxV2KuxV2KuxV2KvLP+coXdPyK 8zlWKkiyFQabNf24I+kHFXzB+V5C+VVpsWnkJ+ew/hhQmvnGV/8AC2p8OpgYfQdj+GKvCMCXYq7F XYqyL8v2dfN+nlOvKQH5GJq/hir271cKHerirvVxV3q4q71cVYP+bUjHQLVf2PrSk/P03p/HEpeT 4FdirsVdirPvyikkXVL9R/dmBS3+sH2/WcIV6l6uKEh/IeVoP+cm7KOI0S4l1BZPcGymlPT/AClw JfcWKuxV2KuxV2KuxV2KuxV2KuxV2KsB/PvRJNa/J7zVYxqXkWyN0qDqTZut1QDuf3OKvjr8q78P o9zaVq9vNzp/kyKKfijYQrL7+3S8sbi0kqEuI3iYjqA6laj78UPBr2zns7uW1uF4TQsUdfcfw8MC VDFXYq7FWb/lfpLy6nLqjr+5tVMcTb7yuKGnyQmvzGEK9Q5nFCVf4t8vCZ4W1CFJI2KOrtxowNDu 1B1xVWTzDoj7pqNswHWk0Z/jiqyTzT5fjFW1K222IEqE/cCTiqI0/V7HUYWmsplniVijOtaBgAab +xxVLPOulSar5euIIlLTxUmgXuWTqB7lSQMVeK4EuxV2KuxV6n+WGlSWmlTX0qlXvmHpg/77jqAf pJOFWZmSgqdgOpxQh/8AnFSyk1r88bzWUB9Cytry7Ldh6zCFF+6U/dgS+1sVdirsVdirsVdirsVd irsVdirsVWyxxSxPFKoeORSro24KsKEEe4xV+fmuaFP+V/5tajoF5VdMMhW3matGs5jzt5a9+IoG 8CGGKvQBACARuD0OFDFvOfkGLW1+tWjLBqSCnJvsSqOivToR2b6Pkq8n1TQ9X0uX0tQtZLdq0DMP hb/VcVVvoOBKCAJNAKnFWUeXPy913VpVeaJrKy6tPKpViP8AIQ0LV8emKvXdM0W002yisrROEMQo O5J7sx7k4UIDzbrEWh6LNdsR9YYenap3aVht9C/aOKqn5Ff843W/5ieWb3zFrt/dadbyTmHS2gEZ 9Ux19aVvUDclD/CKU3DYEs9n/wCcH9BLgwea7mNKbh7WNzX5iRP1YqiIP+cIvKQA9fzLfOeNCUih Qcqdd+e1e344q8F8rpfeUPOupeUdaHozJO1s/wDKJ4jRGUn9mRfsnv8ADir0r6v7YUPPvOf5azXM 0mo6MoMsh5T2ZIUMT1aMnap7g/2Ypeb3djeWcxhu4JLeUdUlUofuOBVOKKWWRY4kaSRjRUUEkn2A xVnPlT8sdQupo7rWYzbWa/ELY7SyezAboPGu/wCvCr1KOzSNFjjUIiAKiqKAAbAAYoYx+YetJpOh SRI1Ly+BhhXuFI/eP9CmnzIxV7j/AM4geQ20DyJceYr1BHfeZJFkgVqchZwVEJ8R6jM7+444Evey yjckDFXc0/mH34q7kviMVbqPHFXVGKuxV2KuxV2KuxVSmfjiqElu6Drvirxr/nIj8qo/P+gR32mq o8zaUrGzJoPrER3a2ZjTqd0J2DezE4q+cvInnr6i/wDh7zHytZrZjBDPMCpjKnj6MwbdeJ2BPToc KHqAgBAI3B3BGKuNsCKEVHhiq1bGJSSqKpPUgAYqv+r4ql+t6rpei2LXmozCGIbKOrO38qL1JxV5 voGheYPza84pEqta6JaEfWJxultATv12aaSmw7/6owJfZOiNp+iaRaaRpkZt7CxiWC2hXoqIKD5n xPc4qjf04387/firX6Z92xV4R/zkb+VsnmVF826BCz63aRhL+2QfHcQx/ZdAOskY2p1ZduoAKrzn 8v8Az/b6nHHperSCLU0okMzmgnptuT0k/XhQ9A+r4q01qrCjKCPAiuKtJZxoKIgUeAAH6sVXfV8V SjzJ5g0ny/Ym6v5KMQfRt1oZJG8FH6z0GKsK/LzyXq/5p+cTqmrK0Xl2zcfW3FQvFTVbWE92avxH sN+pAIS+xLbUo7aGKC3UQwQqscUSDiqIgoqqo2AAGwxVEfppj+0xr1FTiqtHrBK0qfl/mMVRMWqF juTiqMiva03xVGRT8qYqih0xV2KuxV2KuxVCXrU+7FUkuZ2Fd8VSu4uGr1xV5L+a/wCTGgedS+o2 7DTfMAWn1xFrHNx6CdBTl4BxuPcCmKvC5x+an5byfVtQtWm0tDRHcGe0I7enMu6eykj/AFcVTrTv zw0SRANQ064t5O5gKTLXx+IxH9eG0UjX/OnyaqkrDeOR0URJU/fIBja0kWp/nXeXLfVtC0vjNIeM ckxMjknYcYkpv/sjja0ivLn5N+e/OV9Hqnm64l06yO59cD6yy1rxig6RD/WAp14nAl9CeW9C0fy3 pUWl6Nbra2ke5C7s7kAF3Y7sxpuTiqafWn/mxV31l/5jirvrL/zHFXfWX/mOKvIfzO/IvTvMM02s aA6afrMhLzwNtb3Dnctt/due5Gx7jqcVeYJ5q/MfyLMth5hsJJrZDwj+tA7gdorleSsP+CxtWR2P 52eV5VUXdpdW0h+1RUkQf7IMrf8AC4bRSIn/ADl8lxpWMXUzfypEB/xNlxtaY5qf5yatfyCz8u6Y UmlPGN3BnmJP8kSilf8AgsbWk18o/kd5q8y3y6x51uJbS2chmgdq3cqjotDUQr89/wDJHXAl9BaP p2m6NpsGm6XbpaWNuvGKGMUA7knuSTuSdycVRouGr1xVUFy3jiqvDcv44qjbe4YHriqaW87Hviqc WcpNMVTeM1QYquxV2KuxV2KoW8jLYqlFzaMxrTFUtuLBzX+hxVL5NOkPav0HFUHLprElWWqnYgjs fbFWLap+UfkTUi0l1oFmzsfjkjhELE16louBJxVLk/Ir8tkYMNBhqOzPOw+4uRirIdI8kaBowppW mWtiTszQQqjH/WZRyP0nFUz/AEdJ/mDirv0dJ/mDirv0dJ/mDirv0c/+YOKrv0ZJ4H7jirv0ZJ4H 7jirv0ZJ4H7jiqncaGlxC0NxCs0L7PHInJSPcGoxVimofkf+Xd+xafy/bqT19ASW439oWjxVDQf8 4/8A5ZwPzTQlJ8JJbqQfc8rDFWUaT5L0bR4ymladb2KkUb6vCsZb/WKgE/TiqYfoyXwP/AnFXfoy XwP/AAJxV36Nkodj9xxVtNPfuPwxVXj02TlSn0UOKo6LTnFNqfQcVTK2sXFP6HFU2tbcrTFU0QUU Yq3irsVdirsVaKg4qsMCHFVNrKI9cVWHTLc9BT/P54qpnR4Ca1p7f5nFXPotowI3H44qp/oG18fw xV36BtfH8MVXfoKy9/w/pirv0FZe/wCH9MVd+grL3/D+mKu/QVl7/h/TFWxodmOhb8P6Yq79CWni 33jFXfoS08W+8Yq79CWni33jFXfoS08W+8Yq79CWni33jFWxotmB0J964q3+hrLwP3nFXfoay8D9 5xVo6LZkEUO/virk0a2HUlvwxVv9EWwao+7FVQadAO1fniqotrEvQYqqCNR0xVdirsVf/9k= - - - - - - uuid:44F4E52A333FDF119697BF3D5A982C1E - uuid:807614af-ea61-034d-bdc9-4644d641c546 - - uuid:a2b8dcac-7818-4055-b6a1-3efa106255e8 - uuid:9E3E5C9A8C81DB118734DB58FDDE4BA7 - - - - Document - Basic RGB - - - 1 - True - False - - 512.000000 - 512.000000 - Pixels - - - - Cyan - Magenta - Yellow - Black - - - - - - Default Swatch Group - 0 - - - - White - RGB - PROCESS - 255 - 255 - 255 - - - Black - RGB - PROCESS - 0 - 0 - 0 - - - RGB Red - RGB - PROCESS - 255 - 0 - 0 - - - RGB Yellow - RGB - PROCESS - 255 - 255 - 0 - - - RGB Green - RGB - PROCESS - 0 - 255 - 0 - - - RGB Cyan - RGB - PROCESS - 0 - 255 - 255 - - - RGB Blue - RGB - PROCESS - 0 - 0 - 255 - - - RGB Magenta - RGB - PROCESS - 255 - 0 - 255 - - - R=193 G=39 B=45 - RGB - PROCESS - 193 - 39 - 45 - - - R=237 G=28 B=36 - RGB - PROCESS - 237 - 28 - 36 - - - R=241 G=90 B=36 - RGB - PROCESS - 241 - 90 - 36 - - - R=247 G=147 B=30 - RGB - PROCESS - 247 - 147 - 30 - - - R=251 G=176 B=59 - RGB - PROCESS - 251 - 176 - 59 - - - R=252 G=238 B=33 - RGB - PROCESS - 252 - 238 - 33 - - - R=217 G=224 B=33 - RGB - PROCESS - 217 - 224 - 33 - - - R=140 G=198 B=63 - RGB - PROCESS - 140 - 198 - 63 - - - R=57 G=181 B=74 - RGB - PROCESS - 57 - 181 - 74 - - - R=0 G=146 B=69 - RGB - PROCESS - 0 - 146 - 69 - - - R=0 G=104 B=55 - RGB - PROCESS - 0 - 104 - 55 - - - R=34 G=181 B=115 - RGB - PROCESS - 34 - 181 - 115 - - - R=0 G=169 B=157 - RGB - PROCESS - 0 - 169 - 157 - - - R=41 G=171 B=226 - RGB - PROCESS - 41 - 171 - 226 - - - R=0 G=113 B=188 - RGB - PROCESS - 0 - 113 - 188 - - - R=46 G=49 B=146 - RGB - PROCESS - 46 - 49 - 146 - - - R=27 G=20 B=100 - RGB - PROCESS - 27 - 20 - 100 - - - R=102 G=45 B=145 - RGB - PROCESS - 102 - 45 - 145 - - - R=147 G=39 B=143 - RGB - PROCESS - 147 - 39 - 143 - - - R=158 G=0 B=93 - RGB - PROCESS - 158 - 0 - 93 - - - R=212 G=20 B=90 - RGB - PROCESS - 212 - 20 - 90 - - - R=237 G=30 B=121 - RGB - PROCESS - 237 - 30 - 121 - - - R=199 G=178 B=153 - RGB - PROCESS - 199 - 178 - 153 - - - R=153 G=134 B=117 - RGB - PROCESS - 153 - 134 - 117 - - - R=115 G=99 B=87 - RGB - PROCESS - 115 - 99 - 87 - - - R=83 G=71 B=65 - RGB - PROCESS - 83 - 71 - 65 - - - R=198 G=156 B=109 - RGB - PROCESS - 198 - 156 - 109 - - - R=166 G=124 B=82 - RGB - PROCESS - 166 - 124 - 82 - - - R=140 G=98 B=57 - RGB - PROCESS - 140 - 98 - 57 - - - R=117 G=76 B=36 - RGB - PROCESS - 117 - 76 - 36 - - - R=96 G=56 B=19 - RGB - PROCESS - 96 - 56 - 19 - - - R=66 G=33 B=11 - RGB - PROCESS - 66 - 33 - 11 - - - - - - Grayscale - 1 - - - - K=100 - GRAY - PROCESS - 255 - - - K=90 - GRAY - PROCESS - 229 - - - K=80 - GRAY - PROCESS - 204 - - - K=70 - GRAY - PROCESS - 178 - - - K=60 - GRAY - PROCESS - 153 - - - K=50 - GRAY - PROCESS - 127 - - - K=40 - GRAY - PROCESS - 101 - - - K=30 - GRAY - PROCESS - 76 - - - K=20 - GRAY - PROCESS - 50 - - - K=10 - GRAY - PROCESS - 25 - - - R=241 G=241 B=242 - GRAY - PROCESS - 12 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - endstream endobj 2 0 obj <> endobj 13 0 obj <> endobj 35 0 obj <> endobj 43 0 obj <> endobj 56 0 obj <> endobj 103 0 obj <> endobj 125 0 obj <> endobj 133 0 obj <> endobj 146 0 obj <> endobj 193 0 obj <> endobj 215 0 obj <> endobj 223 0 obj <> endobj 236 0 obj <> endobj 283 0 obj <> endobj 305 0 obj <> endobj 313 0 obj <> endobj 326 0 obj <> endobj 373 0 obj <> endobj 395 0 obj <> endobj 403 0 obj <> endobj 416 0 obj <> endobj 463 0 obj <> endobj 485 0 obj <> endobj 493 0 obj <> endobj 506 0 obj <> endobj 553 0 obj <> endobj 581 0 obj <> endobj 589 0 obj <> endobj 602 0 obj <> endobj 649 0 obj <> endobj 677 0 obj <> endobj 685 0 obj <> endobj 698 0 obj <> endobj 699 0 obj [/View/Design] endobj 700 0 obj <>>> endobj 686 0 obj [/View/Design] endobj 687 0 obj <>>> endobj 678 0 obj [/View/Design] endobj 679 0 obj <>>> endobj 650 0 obj [/View/Design] endobj 651 0 obj <>>> endobj 603 0 obj [/View/Design] endobj 604 0 obj <>>> endobj 590 0 obj [/View/Design] endobj 591 0 obj <>>> endobj 582 0 obj [/View/Design] endobj 583 0 obj <>>> endobj 554 0 obj [/View/Design] endobj 555 0 obj <>>> endobj 507 0 obj [/View/Design] endobj 508 0 obj <>>> endobj 494 0 obj [/View/Design] endobj 495 0 obj <>>> endobj 486 0 obj [/View/Design] endobj 487 0 obj <>>> endobj 464 0 obj [/View/Design] endobj 465 0 obj <>>> endobj 417 0 obj [/View/Design] endobj 418 0 obj <>>> endobj 404 0 obj [/View/Design] endobj 405 0 obj <>>> endobj 396 0 obj [/View/Design] endobj 397 0 obj <>>> endobj 374 0 obj [/View/Design] endobj 375 0 obj <>>> endobj 327 0 obj [/View/Design] endobj 328 0 obj <>>> endobj 314 0 obj [/View/Design] endobj 315 0 obj <>>> endobj 306 0 obj [/View/Design] endobj 307 0 obj <>>> endobj 284 0 obj [/View/Design] endobj 285 0 obj <>>> endobj 237 0 obj [/View/Design] endobj 238 0 obj <>>> endobj 224 0 obj [/View/Design] endobj 225 0 obj <>>> endobj 216 0 obj [/View/Design] endobj 217 0 obj <>>> endobj 194 0 obj [/View/Design] endobj 195 0 obj <>>> endobj 147 0 obj [/View/Design] endobj 148 0 obj <>>> endobj 134 0 obj [/View/Design] endobj 135 0 obj <>>> endobj 126 0 obj [/View/Design] endobj 127 0 obj <>>> endobj 104 0 obj [/View/Design] endobj 105 0 obj <>>> endobj 57 0 obj [/View/Design] endobj 58 0 obj <>>> endobj 44 0 obj [/View/Design] endobj 45 0 obj <>>> endobj 36 0 obj [/View/Design] endobj 37 0 obj <>>> endobj 14 0 obj [/View/Design] endobj 15 0 obj <>>> endobj 648 0 obj [698 0 R 685 0 R 677 0 R 649 0 R] endobj 5 0 obj <>/ArtBox[0.0 0.0 512.0 512.0]/Group 730 0 R/MediaBox[0.0 0.0 512.0 512.0]/Thumb 736 0 R/TrimBox[0.0 0.0 512.0 512.0]/Resources<>/Shading<>/ColorSpace<>/Properties<>/ExtGState<>>>/Type/Page/LastModified(D:20100402000843+08'00')>> endobj 729 0 obj <>stream -H‰ÜW˲7 Ý÷WøÚ×’üÜr¬HŠº‹°¿•„ÅL(‚ßÏ9î¶{¦¤*• u™‘Æ’õ<’~ytoƒ{ñòÑ-—à’hÿ[ùß_¿-¿º?Áøé)¸?>-¯¯Á½ü°¼]^½ÀÃ&.›ø[ÔèM›Óš} ꮓÅWg͇*NCð¹6—Í·lNrñYÜórO_–$¾…è$™¯àÇèS©N,ÔIJöb â'Æe0ŠùÌ•æSLΪ–¨Â†A=/÷ôe‘”}‰2×äsCpš¯w´ì­˜kÁk7ýĸ,¢¯¡¸Ú¼ÀvCH²«Õ§†à6‰ƒz^îiH"”Ê<ÎÀÅÖ•AW,^k¿KJ¢ô=â©øÚ"­ÍVz>l±âK€*>¤6Èçåĸ,–£—fS Ñ W!¨ß)¤!0î'Æe2¨)Žì·Ôóh ‘ˆ¦µ§Y^(8q¨! ä!‹¯>*ÔµäÔ‚çAˆ"ƒwb ï~Ãm|‹. -ë w•?O -òw4ijv¹y¾1 ¸õÞA×â-5œ8—É1$2¢‡NËŒIÞmÔ°aЇÍ&í8R?Ó×Ôƒ ÐkìÉ{n9b‰>hqÑ"ÊÚú Œ~°Ž¶¢ä¬ÂÁ@ˆ"szHlílÈDŽÍÚýù€ !\¬}ÒîVøàSˆµ"ÍwÄq}ƒü¦¬ÃB…R˜u]^¼sOïƒûôÞ½zçÞv¨ù:V=<âêÇ'ú?÷ôøó"Á}vѽqÓ®NúÏ[%¤ÖFàSåmü麬ÉÓ:·¢ª¢%g’ HT~‚„ÇkL¨-uéiàâçDª/(ÁUP1Oroªy„ÑÔ‚Rt Ü'½6}ì2ƒ%jžZ Í‘ú(ˆ’28)õ,÷+kÇ´Õˆ¤poU½@ˆÕ -šH4ÕvæÄæ-l6N^SÄ_,"Q‰+þLÑICHQâ!<Ž˜uØËR+¼Ô¼*¿à@jC¥jÒ’;Š­Š}:§òÒ=Š“14¶¨·‡’´1LVÿÂÛ>Š¡ÈJH›MD«UL;²w³ ðiÞ$Ú?Cl‰ÞÇeU´-@…™™ŒØzèÙ`!Ô­Qˆ˜™ õ!SqJé_nh"¬7¡{'hêH_ Linì£uÈùÒCíFJO` S×i„Âñ a éà” -À¥¸G1)Ý?Y߃i»üÖ^ÏËûåé´ è±  % ’€Idp¨$uŠJŽHüè×/ZR1;rÅ åìSÖÿhÉÀëscòRÊ0®°'÷ÏýƒYqdŒ’X?:åúáXû¯Œõ.½éêw’í±]¿3”܂ò;¼ŽÂÙÏî‡rlËö z¢áCA™|Í#åÌeb8:k&ôã3 WæŠe.Îß©©È”ÞÉîÎþ}Õm«’ëIõzèÞïœ0eDý8ÞlÙé[xC³À8P »×Å‚t Q@dà^]FÃ0g9Èû%GðNc%;q.ˆ‡œ¡eçÌ[8°¼;Œ3³OË3çÒ-ã’§“ª¸IcøY¿íÞX†Wfݼõú5˾´~Hœ¼5ÃŒ§E¥ŒùR4¦ Oñ|°Ò×䇖b ˆ]Æè“n蛧n^ŒÌ¡cp6ý^È(v¨žü½Ù²”ЉÓ9§¼•ð}eXi‡o€\ªzÇ -år³NÉÝ:õßÀš»fæúÃeíÛ=Sï{&Ÿ{&Ý÷ŒÞ÷ŒÞôŒîu_Ü<÷Ê GÏÔÉ Sö¡ú{wë -ù‚Í·júŠ—!^ Jß2°'c{j|+aÑÀ,àòÔ·StEȬú3¯ËŠ Á)l”ÜØ°ép,'½TÑR\I¤·ö/ -ìý|ÕBé‰;QtÜkJÝ€ êàzCÈþê \êíxâLB$ejŠ<*´£á„?€ -íDµo0wæÐCûAO¹flP¶{>Eèô‘/|-åÀçìÀ²ŒýÉ÷ZYÎèÀû@i`,iš[_ª÷i:·8˜I­×‚T³vá<M`£ðÝ0D2Pkí(Œ•®•š &Φ×ÿ¡é…%ƒô|¯Ýñ¦ÿÞÝ:š^REë,á+8˜K%ß”¹Ä‚–8ZC"¦L´Ù:b|¼ä›v;s¨#ô÷ÝhQ‰”•ÙÂ|dävÛöguàŠÉ9 BÐ…–îPBÝ¨È 6ÔqÏŽ 0¡¡„ïWÀË@5F ˜ Šç¯£Ûîiˆ39ùhO>$Y£{Ùf±Ývü™CðTâr´£­œË;Šœ“tîùõ_š~½ézŒúŒE,À5¼"=µDIG×ÛìúÛ§šOµà’hÿ[ùßÞúÝ£1¯¯â^~o½·Ëß ç—R, endstream endobj 730 0 obj <> endobj 736 0 obj <>stream -8;Z,&d?2Bj#c+,oa&e?#d#[RaB+beY,+!]4bi(8I*k3b9'O(Bp66aak3mps2f^eM[ -C6G)+*gm<.;ml`'KSY&89n37_GBt39a1fY<"2>/h2nlou)P1l%I:RluS/%DVr7QT2 -knQ?TJ389e?PL<48N2K,fr&8V&>]GiUgL`B.Tp3IQ[($+PJL_=nCP-]Rf&(/Id\9VRcd1c -i8o63Q6-8!mOIjUI)Rl0cR-F3mLuN*32mtXdk+0.[.Tt"o`,1F@V5-/;D$RQ$UC:( -(*K>&Io&C[(@Xn/<.M=Q@Jro=?^-!g.1PQ\qY8tQ;TT;1r]fOpMuW(&U^$_bBMM.h -qZY3Q.<=&Db_ICUKsjAFd?ki]AngBQKXq1W5H<F92Lbds.Es$\m<1eCY=& -CN2P!\lCfX`Rs>T#'_Rl\f4h1QE`%[*$Knl%4E1p`rXs]+q"cM"/'l/4TI:Wb$4~> endstream endobj 672 0 obj <> endobj 673 0 obj <> endobj 689 0 obj <> endobj 718 0 obj <> endobj 716 0 obj <> endobj 715 0 obj <>/ExtGState<>>>/BBox[-46.8945 565.894 536.576 244.91]>>stream -0 g -1 i -/GS0 gs --46.895 565.894 583.471 -320.984 re -f -q -/Fm0 Do -Q - endstream endobj 717 0 obj [0.0] endobj 705 0 obj <> endobj 714 0 obj <>/ColorSpace<>/ExtGState<>>>/BBox[-46.8945 565.894 536.576 244.91]>>stream -q -419.6 365.446 m -414.319 365.446 409.165 364.915 404.179 363.916 c -374.027 434.636 303.875 484.212 222.14 484.212 c -112.892 484.212 24.329 395.649 24.329 286.402 c -24.329 241.821 39.081 200.689 63.963 167.609 c -51.904 153.863 44.578 135.862 44.578 116.139 c -44.578 73.004 79.545 38.036 122.68 38.036 c -156.741 38.036 185.693 59.849 196.373 90.261 c -204.807 89.163 213.406 88.591 222.14 88.591 c -230.657 88.591 239.049 89.13 247.283 90.175 c -257.895 59.637 286.907 37.708 321.059 37.708 c -364.193 37.708 399.16 72.675 399.16 115.81 c -399.16 135.448 391.896 153.38 379.928 167.104 c -390 180.404 398.426 195.017 404.91 210.641 c -409.67 209.734 414.576 209.241 419.6 209.241 c -462.734 209.241 497.701 244.209 497.701 287.343 c -497.701 330.478 462.734 365.446 419.6 365.446 c -W n -q -0 g -1 i -/GS0 gs --0.0000153 446.5039062 446.5039062 0.0000153 261.0146484 37.7080078 cm -BX /Sh0 sh EX Q -Q -/CS1 CS 0 0 0 SCN -1 i 10 w 4 M 0 j 0 J []0 d -/GS0 gs -q 1 0 0 1 419.5996 365.4458 cm -0 0 m --5.28 0 -10.435 -0.531 -15.421 -1.53 c --45.572 69.19 -115.725 118.767 -197.46 118.767 c --306.708 118.767 -395.271 30.204 -395.271 -79.044 c --395.271 -123.625 -380.519 -164.756 -355.636 -197.836 c --367.696 -211.583 -375.022 -229.583 -375.022 -249.307 c --375.022 -292.442 -340.055 -327.41 -296.92 -327.41 c --262.858 -327.41 -233.907 -305.597 -223.227 -275.185 c --214.792 -276.283 -206.193 -276.855 -197.46 -276.855 c --188.942 -276.855 -180.55 -276.316 -172.316 -275.271 c --161.705 -305.809 -132.692 -327.738 -98.541 -327.738 c --55.406 -327.738 -20.439 -292.771 -20.439 -249.636 c --20.439 -229.998 -27.704 -212.066 -39.672 -198.342 c --29.6 -185.042 -21.174 -170.429 -14.689 -154.805 c --9.93 -155.711 -5.023 -156.205 0 -156.205 c -43.135 -156.205 78.102 -121.237 78.102 -78.103 c -78.102 -34.968 43.135 0 0 0 c -h -S -Q - endstream endobj 708 0 obj <> endobj 657 0 obj [/ICCBased 658 0 R] endobj 658 0 obj <>stream -H‰œ–yTSwÇoÉž•°Ãc [€°5la‘QIBHØADED„ª•2ÖmtFOE.®c­Ö}êÒõ0êè8´׎8GNg¦Óïï÷9÷wïïÝß½÷ó '¥ªµÕ0 Ö ÏJŒÅb¤  - 2y­.-;!à’ÆK°ZÜ ü‹ž^i½"LÊÀ0ðÿ‰-×é @8(”µrœ;q®ª7èLöœy¥•&†Qëñq¶4±jž½ç|æ9ÚÄ -V³)gB£0ñiœWו8#©8wÕ©•õ8_Å٥ʨQãüÜ«QÊj@é&»A)/ÇÙgº>'K‚óÈtÕ;\ú” Ó¥$ÕºF½ZUnÀÜå˜(4TŒ%)ë«”ƒ0C&¯”阤Z£“i˜¿óœ8¦Úbx‘ƒE¡ÁÁBÑ;…ú¯›¿P¦ÞÎӓ̹žAü om?çW= -€x¯Íú·¶Ò-Œ¯Àòæ[›Ëû0ñ¾¾øÎ}ø¦y)7ta¾¾õõõ>j¥ÜÇTÐ7úŸ¿@ï¼ÏÇtÜ›ò`qÊ2™±Ê€™ê&¯®ª6ê±ZL®Ä„?â_øóyxg)Ë”z¥ÈçL­UáíÖ*ÔuµSkÿSeØO4?׸¸c¯¯Ø°.òò· åÒR´ ßÞô-•’2ð5ßáÞüÜÏ ú÷Sá>Ó£V­š‹“då`r£¾n~ÏôY &à+`œ;ÂA4ˆÉ 䀰ÈA9Ð=¨- t°lÃ`;»Á~pŒƒÁ ðGp| ®[`Lƒ‡`<¯ "A ˆ YA+äùCb(Š‡R¡,¨*T2B-Ð -¨ꇆ¡Ðnè÷ÐQètº}MA ï —0Óal»Á¾°ŽSàx ¬‚kà&¸^Á£ð>ø0|>_ƒ'á‡ð,ÂG!"F$H:Rˆ”!z¤éF‘Qd?r 9‹\A&‘GÈ ”ˆrQ ¢áhš‹ÊÑ´íE‡Ñ]èaô4zBgÐ×Á–àE#H ‹*B=¡‹0HØIøˆp†p0MxJ$ùD1„˜D, V›‰½Ä­ÄÄãÄKÄ»ÄY‰dEò"EÒI2’ÔEÚBÚGúŒt™4MzN¦‘Èþär!YKî ’÷?%_&ß#¿¢°(®”0J:EAi¤ôQÆ(Ç()Ó”WT6U@ æP+¨íÔ!ê~êêmêæD ¥eÒÔ´å´!ÚïhŸÓ¦h/èº']B/¢éëèÒÓ¿¢?a0nŒhF!ÃÀXÇØÍ8ÅøšñÜŒkæc&5S˜µ™˜6»lö˜Iaº2c˜K™MÌAæ!æEæ#…åÆ’°d¬VÖë(ëk–Íe‹Øél »—½‡}Ž}ŸCâ¸qâ9 -N'çÎ)Î].ÂuæJ¸rî -î÷ wšGä xR^¯‡÷[ÞoÆœchžgÞ`>bþ‰ù$á»ñ¥ü*~ÿ ÿ:ÿ¥…EŒ…ÒbÅ~‹ËÏ,m,£-•–Ý–,¯Y¾´Â¬â­*­6X[ݱF­=­3­ë­·YŸ±~dó ·‘ÛtÛ´¹i ÛzÚfÙ6Û~`{ÁvÖÎÞ.ÑNg·Åî”Ý#{¾}´}…ý€ý§ö¸‘j‡‡ÏþŠ™c1X6„Æfm“Ž;'_9 œr:œ8Ýq¦:‹ËœœO:ϸ8¸¤¹´¸ìu¹éJq»–»nv=ëúÌMà–ï¶ÊmÜí¾ÀR 4 ö -n»3Ü£ÜkÜGݯz=Ä•[=¾ô„=ƒ<Ë=GTB(É/ÙSòƒ,]6*›-•–¾W:#—È7Ë*¢ŠÊe¿ò^YDYÙ}U„j£êAyTù`ù#µD=¬þ¶"©b{ųÊôÊ+¬Ê¯: !kJ4Gµm¥ötµ}uCõ%—®K7YV³©fFŸ¢ßY Õ.©=bàá?SŒîÆ•Æ©ºÈº‘ºçõyõ‡Ø Ú† žkï5%4ý¦m–7Ÿlqlio™Z³lG+ÔZÚz²Í¹­³mzyâò]íÔöÊö?uøuôw|¿"űN»ÎåwW&®ÜÛe֥ﺱ*|ÕöÕèjõê‰5k¶¬yÝ­èþ¢Ç¯g°ç‡^yïkEk‡Öþ¸®lÝD_p߶õÄõÚõ×7DmØÕÏîoê¿»1mãál {àûMśΠnßLÝlÜ<9”úO¤[þ˜¸™$™™üšhšÕ›B›¯œœ‰œ÷dÒž@ž®ŸŸ‹Ÿú i Ø¡G¡¶¢&¢–££v£æ¤V¤Ç¥8¥©¦¦‹¦ý§n§à¨R¨Ä©7©©ªª««u«é¬\¬Ð­D­¸®-®¡¯¯‹°°u°ê±`±Ö²K²Â³8³®´%´œµµŠ¶¶y¶ð·h·à¸Y¸Ñ¹J¹Âº;ºµ».»§¼!¼›½½¾ -¾„¾ÿ¿z¿õÀpÀìÁgÁãÂ_ÂÛÃXÃÔÄQÄÎÅKÅÈÆFÆÃÇAÇ¿È=ȼÉ:ɹÊ8Ê·Ë6˶Ì5̵Í5͵Î6ζÏ7ϸÐ9кÑ<ѾÒ?ÒÁÓDÓÆÔIÔËÕNÕÑÖUÖØ×\×àØdØèÙlÙñÚvÚûÛ€ÜÜŠÝÝ–ÞÞ¢ß)߯à6à½áDáÌâSâÛãcãëäsäüå„æ æ–çç©è2è¼éFéÐê[êåëpëûì†ííœî(î´ï@ïÌðXðåñrñÿòŒóó§ô4ôÂõPõÞömöû÷Šøø¨ù8ùÇúWúçûwüü˜ý)ýºþKþÜÿmÿÿ ÷„óû endstream endobj 709 0 obj <> endobj 664 0 obj [/ICCBased 658 0 R] endobj 710 0 obj <> endobj 711 0 obj <> endobj 712 0 obj <> endobj 713 0 obj <> endobj 655 0 obj /DeviceGray endobj 670 0 obj <> endobj 669 0 obj <>/ExtGState<>>>/BBox[13.0 121.0 507.579 6.42187]>>stream -0 g -1 i -/GS0 gs -13 121 494.579 -114.578 re -f -q -/Fm0 Do -Q - endstream endobj 671 0 obj [0.0] endobj 654 0 obj <> endobj 668 0 obj <>/ExtGState<>>>/BBox[13.0 121.0 507.579 6.42187]>>stream -q -/GS0 gs -/Fm0 Do -Q - endstream endobj 656 0 obj <> endobj 660 0 obj <> endobj 667 0 obj <>/ColorSpace<>/ExtGState<>>>/BBox[7.97656 77.3076 507.01 8.75195]>>stream -q -7.977 8.752 m -113.295 8.752 l -408.581 8.752 l -507.01 8.752 l -507.01 37.756 l -507.01 77.308 l -408.581 77.308 l -113.295 77.308 l -7.977 77.308 l -7.977 37.756 l -h -W n -q -0 g -1 i -/GS0 gs -1 0 0 -1 0 0 cm -BX /Sh0 sh EX Q -Q - endstream endobj 661 0 obj <> endobj 666 0 obj <>stream -þý €‰þý 1}þý Òpþý ÒpüÔ“4 Òpû—)I ÒpúY¿] 1}úY¿]€‰úY¿]úY¿]û—)IüÔ“4€‰üÔ“4 1}üÔ“4 1}û—)I€‰û—)I úY¿]€‰úY¿] 1}úY¿] ÒpúY¿] ÒpùUr Òp÷Þë‡ Òpö¡› 1}ö¡›€‰ö¡›ö¡›÷Þë‡ùUr€‰ùUr 1}ùUr 1}÷Þ뇀‰÷Þë‡  Òpþý bùþý ‚ó‚þý „ þý „ üÔ“4„ û—)I„ úY¿]‚ó‚úY¿]bùúY¿] ÒpúY¿] Òpû—)I ÒpüÔ“4bùüÔ“4‚ó‚üÔ“4‚ó‚û—)Ibùû—)I ÒpúY¿]bùúY¿]‚ó‚úY¿]„ úY¿]„ ùUr„ ÷Þ뇄 ö¡›‚ó‚ö¡›bùö¡› Òpö¡› Òp÷Þë‡ ÒpùUrbùùUr‚ó‚ùUr‚ó‚÷Þë‡bù÷Þë‡ ;;;ö¡›€‰ö¡› 1}ö¡› Òpö¡› Òpõd° Òpô&­Ä ÒpòéCÙ 1}òéCÙ€‰òéCÙòéCÙô&­Äõd°€‰õd° 1}õd° 1}ô&­Ä€‰ô&­Ä---òéCÙ€‰òéCÙ 1}òéCÙ ÒpòéCÙ Òpñ«Ùí Òpðnp Òpï1 1}ï1€‰ï1ï1ðnpñ«Ù퀉ñ«Ùí 1}ñ«Ùí 1}ðnp€‰ðnp---333 Òpö¡›bùö¡›‚ó‚ö¡›„ ö¡›„ õd°„ ô&­Ä„ òéCÙ‚ó‚òéCÙbùòéCÙ ÒpòéCÙ Òpô&­Ä Òpõd°bùõd°‚ó‚õd°‚ó‚ô&­Äbùô&­Ä;;;PPP--- ÒpòéCÙbùòéCÙ‚ó‚òéCÙ„ òéCÙ„ ñ«Ùí„ ðnp„ ï1‚ó‚ï1bùï1 Òpï1 Òpðnp Òpñ«Ùíbùñ«Ùí‚ó‚ñ«Ùí‚ó‚ðnpbùðnp---PPPXXX333„ þý „”þý $µˆþý (…V{þý (…V{üÔ“4(…V{û—)I(…V{úY¿]$µˆúY¿]„”úY¿]„ úY¿]„ û—)I„ üÔ“4„”üÔ“4$µˆüÔ“4$µˆû—)I„”û—)I---„ úY¿]„”úY¿]$µˆúY¿](…V{úY¿](…V{ùUr(…V{÷Þë‡(…V{ö¡›$µˆö¡›„”ö¡›„ ö¡›„ ÷Þ뇄 ùUr„”ùUr$µˆùUr$µˆ÷Þ뇄”÷Þë‡---PPP;;;(…V{þý -çþý 1†wþý 6þý 6üÔ“46û—)I6úY¿]1†wúY¿]-çúY¿](…V{úY¿](…V{û—)I(…V{üÔ“4-çüÔ“41†wüÔ“41†wû—)I-çû—)I333---(…V{úY¿]-çúY¿]1†wúY¿]6úY¿]6ùUr6÷Þë‡6ö¡›1†wö¡›-çö¡›(…V{ö¡›(…V{÷Þë‡(…V{ùUr-çùUr1†wùUr1†w÷Þë‡-ç÷Þë‡---333XXXPPP„ ö¡›„”ö¡›$µˆö¡›(…V{ö¡›(…V{õd°(…V{ô&­Ä(…V{òéCÙ$µˆòéCÙ„”òéCÙ„ òéCÙ„ ô&­Ä„ õd°„”õd°$µˆõd°$µˆô&­Ä„”ô&­Ä;;;PPPfffPPP„ òéCÙ„”òéCÙ$µˆòéCÙ(…V{òéCÙ(…V{ñ«Ùí(…V{ðnp(…V{ï1$µˆï1„”ï1„ ï1„ ðnp„ ñ«Ùí„”ñ«Ùí$µˆñ«Ùí$µˆðnp„”ðnpPPPfffnnnXXX(…V{ö¡›-çö¡›1†wö¡›6ö¡›6õd°6ô&­Ä6òéCÙ1†wòéCÙ-çòéCÙ(…V{òéCÙ(…V{ô&­Ä(…V{õd°-çõd°1†wõd°1†wô&­Ä-çô&­ÄPPPXXXnnnfff(…V{òéCÙ-çòéCÙ1†wòéCÙ6òéCÙ6ñ«Ùí6ðnp6ï11†wï1-çï1(…V{ï1(…V{ðnp(…V{ñ«Ùí-çñ«Ùí1†wñ«Ùí1†wðnp-çðnpfffnnnuuunnn6þý h…Fþý ›„ þý ÍÂþý ÍÂüÔ“4ÍÂû—)IÍÂúY¿]›„ úY¿]h…FúY¿]6úY¿]6û—)I6üÔ“4h…FüÔ“4›„ üÔ“4›„ û—)Ih…Fû—)I3333336úY¿]h…FúY¿]›„ úY¿]ÍÂúY¿]ÍÂùUrÍÂ÷Þë‡ÍÂö¡››„ ö¡›h…Fö¡›6ö¡›6÷Þë‡6ùUrh…FùUr›„ ùUr›„ ÷Þë‡h…F÷Þë‡333333XXXXXX6ö¡›h…Fö¡››„ ö¡›ÍÂö¡›ÍÂõd°ÍÂô&­ÄÍÂòéCÙ›„ òéCÙh…FòéCÙ6òéCÙ6ô&­Ä6õd°h…Fõd°›„ õd°›„ ô&­Äh…Fô&­ÄXXXXXXnnnnnn6òéCÙh…FòéCÙ›„ òéCÙÍÂòéCÙÍÂñ«ÙíÍÂðnpÍÂï1›„ ï1h…Fï16ï16ðnp6ñ«Ùíh…Fñ«Ù후 ñ«Ù후 ðnph…FðnpnnnnnnuuuuuuÍÂþý Ѷé¤þý ÕìDþý Ú!8äþý Ú!8äüÔ“4Ú!8äû—)IÚ!8äúY¿]ÕìDúY¿]Ѷé¤úY¿]ÍÂúY¿]ÍÂû—)IÍÂüÔ“4Ѷé¤üÔ“4ÕìDüÔ“4ÕìDû—)IѶé¤û—)I---333ÍÂúY¿]Ѷé¤úY¿]ÕìDúY¿]Ú!8äúY¿]Ú!8äùUrÚ!8ä÷Þë‡Ú!8äö¡›ÕìDö¡›Ñ¶é¤ö¡›ÍÂö¡›ÍÂ÷Þë‡ÍÂùUrѶé¤ùUrÕìDùUrÕìD÷Þë‡Ñ¶é¤÷Þë‡333---PPPXXXÚ!8äþý ÞVXþý ⋨øþý æÀИþý æÀИüÔ“4æÀИû—)IæÀИúY¿]⋨øúY¿]ÞVXúY¿]Ú!8äúY¿]Ú!8äû—)IÚ!8äüÔ“4ÞVXüÔ“4⋨øüÔ“4⋨øû—)IÞVXû—)I---Ú!8äúY¿]ÞVXúY¿]⋨øúY¿]æÀИúY¿]æÀИùUræÀИ÷Þë‡æÀИö¡›â‹¨øö¡›ÞVXö¡›Ú!8äö¡›Ú!8ä÷Þë‡Ú!8äùUrÞVXùUr⋨øùUr⋨ø÷Þë‡ÞVX÷Þë‡---;;;PPPÍÂö¡›Ñ¶é¤ö¡›ÕìDö¡›Ú!8äö¡›Ú!8äõd°Ú!8äô&­ÄÚ!8äòéCÙÕìDòéCÙѶé¤òéCÙÍÂòéCÙÍÂô&­ÄÍÂõd°Ñ¶é¤õd°ÕìDõd°ÕìDô&­ÄѶé¤ô&­ÄXXXPPPfffnnnÍÂòéCÙѶé¤òéCÙÕìDòéCÙÚ!8äòéCÙÚ!8äñ«ÙíÚ!8äðnpÚ!8äï1ÕìDï1Ѷé¤ï1ÍÂï1ÍÂðnpÍÂñ«ÙíѶé¤ñ«ÙíÕìDñ«ÙíÕìDðnpѶé¤ðnpnnnfffnnnuuuÚ!8äö¡›ÞVXö¡›â‹¨øö¡›æÀИö¡›æÀИõd°æÀИô&­ÄæÀИòéCÙ⋨øòéCÙÞVXòéCÙÚ!8äòéCÙÚ!8äô&­ÄÚ!8äõd°ÞVXõd°â‹¨øõd°â‹¨øô&­ÄÞVXô&­ÄPPP;;;PPPfffÚ!8äòéCÙÞVXòéCÙ⋨øòéCÙæÀИòéCÙæÀИñ«ÙíæÀИðnpæÀИï1⋨øï1ÞVXï1Ú!8äï1Ú!8äðnpÚ!8äñ«ÙíÞVXñ«Ùí⋨øñ«Ùí⋨øðnpÞVXðnpfffPPPXXXnnnæÀИþý êõø7þý ï+×þý ó`hKþý ó`hKüÔ“4ó`hKû—)Ió`hKúY¿]ï+×úY¿]êõø7úY¿]æÀИúY¿]æÀИû—)IæÀИüÔ“4êõø7üÔ“4ï+×üÔ“4ï+×û—)Iêõø7û—)I æÀИúY¿]êõø7úY¿]ï+×úY¿]ó`hKúY¿]ó`hKùUró`hK÷Þë‡ó`hKö¡›ï+×ö¡›êõø7ö¡›æÀИö¡›æÀИ÷Þë‡æÀИùUrêõø7ùUrï+×ùUrï+×÷Þë‡êõø7÷Þë‡ ;;;ó`hKþý ÷•ëþý ûÊ·‹þý ÿÿÿÿþý ÿÿÿÿüÔ“4ÿÿÿÿû—)IÿÿÿÿúY¿]ûÊ·‹úY¿]÷•ëúY¿]ó`hKúY¿]ó`hKû—)Ió`hKüÔ“4÷•ëüÔ“4ûÊ·‹üÔ“4ûÊ·‹û—)I÷•ëû—)I ó`hKúY¿]÷•ëúY¿]ûÊ·‹úY¿]ÿÿÿÿúY¿]ÿÿÿÿùUrÿÿÿÿ÷Þë‡ÿÿÿÿö¡›ûÊ·‹ö¡›÷•ëö¡›ó`hKö¡›ó`hK÷Þë‡ó`hKùUr÷•ëùUrûÊ·‹ùUrûÊ·‹÷Þë‡÷•ë÷Þë‡ æÀИö¡›êõø7ö¡›ï+×ö¡›ó`hKö¡›ó`hKõd°ó`hKô&­Äó`hKòéCÙï+×òéCÙêõø7òéCÙæÀИòéCÙæÀИô&­ÄæÀИõd°êõø7õd°ï+×õd°ï+×ô&­Äêõø7ô&­Ä;;;---PPPæÀИòéCÙêõø7òéCÙï+×òéCÙó`hKòéCÙó`hKñ«Ùíó`hKðnpó`hKï1ï+×ï1êõø7ï1æÀИï1æÀИðnpæÀИñ«Ùíêõø7ñ«Ùíï+×ñ«Ùíï+×ðnpêõø7ðnpPPP---333XXXó`hKö¡›÷•ëö¡›ûÊ·‹ö¡›ÿÿÿÿö¡›ÿÿÿÿõd°ÿÿÿÿô&­ÄÿÿÿÿòéCÙûÊ·‹òéCÙ÷•ëòéCÙó`hKòéCÙó`hKô&­Äó`hKõd°÷•ëõd°ûÊ·‹õd°ûÊ·‹ô&­Ä÷•ëô&­Ä---ó`hKòéCÙ÷•ëòéCÙûÊ·‹òéCÙÿÿÿÿòéCÙÿÿÿÿñ«Ùíÿÿÿÿðnpÿÿÿÿï1ûÊ·‹ï1÷•ëï1ó`hKï1ó`hKðnpó`hKñ«Ùí÷•ëñ«ÙíûÊ·‹ñ«ÙíûÊ·‹ðnp÷•ëðnp---333ï1€‰ï1 1}ï1 Òpï1 Òpí€/Õ ÒpëÏY” ÒpêƒS 1}êƒS€‰êƒSêƒSëÏY”í€/Õ€‰í€/Õ 1}í€/Õ 1}ëÏY”€‰ëÏY”333---êƒS€‰êƒS 1}êƒS ÒpêƒS Òpèm­ Òpæ¼ÖÑ Òpå 1}å €‰å å æ¼ÖÑèm­€‰èm­ 1}èm­ 1}æ¼ÖÑ€‰æ¼ÖÑ--- Òpï1bùï1‚ó‚ï1„ ï1„ í€/Õ„ ëÏY”„ êƒS‚ó‚êƒSbùêƒS ÒpêƒS ÒpëÏY” Òpí€/Õbùí€/Õ‚ó‚í€/Õ‚ó‚ëÏY”bùëÏY”333XXXPPP--- ÒpêƒSbùêƒS‚ó‚êƒS„ êƒS„ èm­„ æ¼ÖÑ„ å ‚ó‚å bùå Òpå Òpæ¼ÖÑ Òpèm­bùèm­‚ó‚èm­‚ó‚æ¼ÖÑbùæ¼ÖÑ---PPP;;;å €‰å 1}å Òpå Òpã[*O ÒpáªT Òpßù}Í 1}ßù}Í€‰ßù}Íßù}ÍáªTã[*O€‰ã[*O 1}ã[*O 1}áªT€‰áªT ßù}Í€‰ßù}Í 1}ßù}Í Òpßù}Í ÒpÞH§‹ ÒpÜ—°u ÒpÚæÚ4 1}ÚæÚ4€‰ÚæÚ4ÚæÚ4Ü—°uÞH§‹€‰ÞH§‹ 1}ÞH§‹ 1}Ü—°u€‰Ü—°u Òpå bùå ‚ó‚å „ å „ ã[*O„ áªT„ ßù}Í‚ó‚ßù}Íbùßù}Í Òpßù}Í ÒpáªT Òpã[*Obùã[*O‚ó‚ã[*O‚ó‚áªTbùáªT;;; Òpßù}Íbùßù}Í‚ó‚ßù}Í„ ßù}Í„ ÞH§‹„ Ü—°u„ ÚæÚ4‚ó‚ÚæÚ4bùÚæÚ4 ÒpÚæÚ4 ÒpÜ—°u ÒpÞH§‹bùÞH§‹‚ó‚ÞH§‹‚ó‚Ü—°ubùÜ—°u „ ï1„”ï1$µˆï1(…V{ï1(…V{í€/Õ(…V{ëÏY”(…V{êƒS$µˆêƒS„”êƒS„ êƒS„ ëÏY”„ í€/Õ„”í€/Õ$µˆí€/Õ$µˆëÏY”„”ëÏY”XXXnnnfffPPP„ êƒS„”êƒS$µˆêƒS(…V{êƒS(…V{èm­(…V{æ¼ÖÑ(…V{å $µˆå „”å „ å „ æ¼ÖÑ„ èm­„”èm­$µˆèm­$µˆæ¼ÖÑ„”æ¼ÖÑPPPfffPPP;;;(…V{ï1-çï11†wï16ï16í€/Õ6ëÏY”6êƒS1†wêƒS-çêƒS(…V{êƒS(…V{ëÏY”(…V{í€/Õ-çí€/Õ1†wí€/Õ1†wëÏY”-çëÏY”nnnuuunnnfff(…V{êƒS-çêƒS1†wêƒS6êƒS6èm­6æ¼ÖÑ6å 1†wå -çå (…V{å (…V{æ¼ÖÑ(…V{èm­-çèm­1†wèm­1†wæ¼ÖÑ-çæ¼ÖÑfffnnnXXXPPP„ å „”å $µˆå (…V{å (…V{ã[*O(…V{áªT(…V{ßù}Í$µˆßù}Í„”ßù}Í„ ßù}Í„ áªT„ ã[*O„”ã[*O$µˆã[*O$µˆáªT„”áªT;;;PPP---„ ßù}Í„”ßù}Í$µˆßù}Í(…V{ßù}Í(…V{ÞH§‹(…V{Ü—°u(…V{ÚæÚ4$µˆÚæÚ4„”ÚæÚ4„ ÚæÚ4„ Ü—°u„ ÞH§‹„”ÞH§‹$µˆÞH§‹$µˆÜ—°u„”Ü—°u---(…V{å -çå 1†wå 6å 6ã[*O6áªT6ßù}Í1†wßù}Í-çßù}Í(…V{ßù}Í(…V{áªT(…V{ã[*O-çã[*O1†wã[*O1†wáªT-çáªTPPPXXX333---(…V{ßù}Í-çßù}Í1†wßù}Í6ßù}Í6ÞH§‹6Ü—°u6ÚæÚ41†wÚæÚ4-çÚæÚ4(…V{ÚæÚ4(…V{Ü—°u(…V{ÞH§‹-çÞH§‹1†wÞH§‹1†wÜ—°u-çÜ—°u---3336ï1h…Fï1›„ ï1ÍÂï1ÍÂí€/ÕÍÂëÏY”ÍÂêƒS›„ êƒSh…FêƒS6êƒS6ëÏY”6í€/Õh…Fí€/Õ›„ í€/Õ›„ ëÏY”h…FëÏY”uuuuuunnnnnn6êƒSh…FêƒS›„ êƒSÍÂêƒSÍÂèm­ÍÂæ¼ÖÑÍÂå ›„ å h…Få 6å 6æ¼ÖÑ6èm­h…Fèm­›„ èm­›„ æ¼ÖÑh…Fæ¼ÖÑnnnnnnXXXXXX6å h…Få ›„ å ÍÂå ÍÂã[*OÍÂáªTÍÂßù}Í›„ ßù}Íh…Fßù}Í6ßù}Í6áªT6ã[*Oh…Fã[*O›„ ã[*O›„ áªTh…FáªTXXXXXX3333336ßù}Íh…Fßù}Í›„ ßù}ÍÍÂßù}ÍÍÂÞH§‹ÍÂÜ—°uÍÂÚæÚ4›„ ÚæÚ4h…FÚæÚ46ÚæÚ46Ü—°u6ÞH§‹h…FÞH§‹›„ ÞH§‹›„ Ü—°uh…FÜ—°u333333ÍÂï1Ѷé¤ï1ÕìDï1Ú!8äï1Ú!8äí€/ÕÚ!8äëÏY”Ú!8äêƒSÕìDêƒSѶé¤êƒSÍÂêƒSÍÂëÏY”ÍÂí€/ÕѶé¤í€/ÕÕìDí€/ÕÕìDëÏY”Ѷé¤ëÏY”uuunnnfffnnnÍÂêƒSѶé¤êƒSÕìDêƒSÚ!8äêƒSÚ!8äèm­Ú!8äæ¼ÖÑÚ!8äå ÕìDå Ѷé¤å ÍÂå ÍÂæ¼ÖÑÍÂèm­Ѷé¤èm­ÕìDèm­ÕìDæ¼ÖÑѶé¤æ¼ÖÑnnnfffPPPXXXÚ!8äï1ÞVXï1⋨øï1æÀИï1æÀИí€/ÕæÀИëÏY”æÀИêƒS⋨øêƒSÞVXêƒSÚ!8äêƒSÚ!8äëÏY”Ú!8äí€/ÕÞVXí€/Õ⋨øí€/Õ⋨øëÏY”ÞVXëÏY”nnnXXXPPPfffÚ!8äêƒSÞVXêƒS⋨øêƒSæÀИêƒSæÀИèm­æÀИæ¼ÖÑæÀИå ⋨øå ÞVXå Ú!8äå Ú!8äæ¼ÖÑÚ!8äèm­ÞVXèm­⋨øèm­⋨øæ¼ÖÑÞVXæ¼ÖÑfffPPP;;;PPPÍÂå Ѷé¤å ÕìDå Ú!8äå Ú!8äã[*OÚ!8äáªTÚ!8äßù}ÍÕìDßù}ÍѶé¤ßù}ÍÍÂßù}ÍÍÂáªTÍÂã[*OѶé¤ã[*OÕìDã[*OÕìDáªTѶé¤áªTXXXPPP---333ÍÂßù}ÍѶé¤ßù}ÍÕìDßù}ÍÚ!8äßù}ÍÚ!8äÞH§‹Ú!8äÜ—°uÚ!8äÚæÚ4ÕìDÚæÚ4Ѷé¤ÚæÚ4ÍÂÚæÚ4ÍÂÜ—°uÍÂÞH§‹Ñ¶é¤ÞH§‹ÕìDÞH§‹ÕìDÜ—°uѶé¤Ü—°u333---Ú!8äå ÞVXå ⋨øå æÀИå æÀИã[*OæÀИáªTæÀИßù}Í⋨øßù}ÍÞVXßù}ÍÚ!8äßù}ÍÚ!8äáªTÚ!8äã[*OÞVXã[*O⋨øã[*O⋨øáªTÞVXáªTPPP;;;---Ú!8äßù}ÍÞVXßù}Í⋨øßù}ÍæÀИßù}ÍæÀИÞH§‹æÀИܗ°uæÀИÚæÚ4⋨øÚæÚ4ÞVXÚæÚ4Ú!8äÚæÚ4Ú!8äÜ—°uÚ!8äÞH§‹ÞVXÞH§‹â‹¨øÞH§‹â‹¨øÜ—°uÞVXÜ—°u---æÀИï1êõø7ï1ï+×ï1ó`hKï1ó`hKí€/Õó`hKëÏY”ó`hKêƒSï+×êƒSêõø7êƒSæÀИêƒSæÀИëÏY”æÀИí€/Õêõø7í€/Õï+×í€/Õï+×ëÏY”êõø7ëÏY”XXX333---PPPæÀИêƒSêõø7êƒSï+×êƒSó`hKêƒSó`hKèm­ó`hKæ¼ÖÑó`hKå ï+×å êõø7å æÀИå æÀИæ¼ÖÑæÀИèm­êõø7èm­ï+×èm­ï+×æ¼ÖÑêõø7æ¼ÖÑPPP---;;;ó`hKï1÷•ëï1ûÊ·‹ï1ÿÿÿÿï1ÿÿÿÿí€/ÕÿÿÿÿëÏY”ÿÿÿÿêƒSûÊ·‹êƒS÷•ëêƒSó`hKêƒSó`hKëÏY”ó`hKí€/Õ÷•ëí€/ÕûÊ·‹í€/ÕûÊ·‹ëÏY”÷•ëëÏY”333---ó`hKêƒS÷•ëêƒSûÊ·‹êƒSÿÿÿÿêƒSÿÿÿÿèm­ÿÿÿÿæ¼ÖÑÿÿÿÿå ûÊ·‹å ÷•ëå ó`hKå ó`hKæ¼ÖÑó`hKèm­÷•ëèm­ûÊ·‹èm­ûÊ·‹æ¼ÖÑ÷•ëæ¼ÖÑ---æÀИå êõø7å ï+×å ó`hKå ó`hKã[*Oó`hKáªTó`hKßù}Íï+×ßù}Íêõø7ßù}ÍæÀИßù}ÍæÀИáªTæÀИã[*Oêõø7ã[*Oï+×ã[*Oï+×áªTêõø7áªT;;; æÀИßù}Íêõø7ßù}Íï+×ßù}Íó`hKßù}Íó`hKÞH§‹ó`hKÜ—°uó`hKÚæÚ4ï+×ÚæÚ4êõø7ÚæÚ4æÀИÚæÚ4æÀИܗ°uæÀИÞH§‹êõø7ÞH§‹ï+×ÞH§‹ï+×Ü—°uêõø7Ü—°u ó`hKå ÷•ëå ûÊ·‹å ÿÿÿÿå ÿÿÿÿã[*OÿÿÿÿáªTÿÿÿÿßù}ÍûÊ·‹ßù}Í÷•ëßù}Íó`hKßù}Íó`hKáªTó`hKã[*O÷•ëã[*OûÊ·‹ã[*OûÊ·‹áªT÷•ëáªT ó`hKßù}Í÷•ëßù}ÍûÊ·‹ßù}Íÿÿÿÿßù}ÍÿÿÿÿÞH§‹ÿÿÿÿÜ—°uÿÿÿÿÚæÚ4ûÊ·‹ÚæÚ4÷•ëÚæÚ4ó`hKÚæÚ4ó`hKÜ—°uó`hKÞH§‹÷•ëÞH§‹ûÊ·‹ÞH§‹ûÊ·‹Ü—°u÷•ëÜ—°u endstream endobj 681 0 obj <> endobj 690 0 obj <> endobj 694 0 obj <> endobj 697 0 obj <> endobj 691 0 obj <>stream -H‰b`Ú ÀÀ endstream endobj 682 0 obj <> endobj 683 0 obj <> endobj 684 0 obj <> endobj 676 0 obj <>/ExtGState<>>>/BBox[13.0 121.0 507.579 6.42187]>>stream -/CS0 cs 0 0 0 scn -1 i -/GS0 gs -507.579 6.422 -494.579 114.578 re -f - endstream endobj 728 0 obj <>/ExtGState<>>>/BBox[-46.8945 565.894 536.576 244.91]>>stream -/CS0 cs 1 1 1 scn -1 i -/GS0 gs -q 1 0 0 1 536.5762 405.4023 cm -0 0 m -0 -88.638 -130.614 -160.492 -291.735 -160.492 c --452.856 -160.492 -583.471 -88.638 -583.471 0 c --583.471 88.637 -452.856 160.492 -291.735 160.492 c --130.614 160.492 0 88.637 0 0 c -f -Q - endstream endobj 704 0 obj <> endobj 653 0 obj <> endobj 734 0 obj [/Indexed/DeviceRGB 255 735 0 R] endobj 735 0 obj <>stream -8;X]O>EqN@%''O_@%e@?J;%+8(9e>X=MR6S?i^YgA3=].HDXF.R$lIL@"pJ+EP(%0 -b]6ajmNZn*!='OQZeQ^Y*,=]?C.B+\Ulg9dhD*"iC[;*=3`oP1[!S^)?1)IZ4dup` -E1r!/,*0[*9.aFIR2&b-C#soRZ7Dl%MLY\.?d>Mn -6%Q2oYfNRF$$+ON<+]RUJmC0InDZ4OTs0S!saG>GGKUlQ*Q?45:CI&4J'_2j$XKrcYp0n+Xl_nU*O( -l[$6Nn+Z_Nq0]s7hs]`XX1nZ8&94a\~> endstream endobj 731 0 obj [/ICCBased 658 0 R] endobj 642 0 obj <> endobj 643 0 obj <> endobj 644 0 obj <>stream -%!PS-Adobe-3.0 %%Creator: Adobe Illustrator(R) 13.0 %%AI8_CreatorVersion: 13.0.0 %%For: (Aleks Kissinger) () %%Title: (tikzit.ai) %%CreationDate: 4/2/10 12:08 AM %%BoundingBox: -47 -36 548 566 %%HiResBoundingBox: -46.8945 -36 548 565.894 %%DocumentProcessColors: Cyan Magenta Yellow Black %AI5_FileFormat 9.0 %AI12_BuildNumber: 406 %AI3_ColorUsage: Color %AI7_ImageSettings: 0 %%RGBProcessColor: 0 0 0 ([Registration]) %AI3_Cropmarks: 0 0 512 512 %AI3_TemplateBox: 256.5 255.5 256.5 255.5 %AI3_TileBox: -50 -140 562 652 %AI3_DocumentPreview: None %AI5_ArtSize: 512 512 %AI5_RulerUnits: 6 %AI9_ColorModel: 1 %AI5_ArtFlags: 0 0 0 1 0 0 1 0 0 %AI5_TargetResolution: 800 %AI5_NumLayers: 4 %AI9_OpenToView: -745 843 0.5 979 715 2 0 0 73 75 0 0 1 1 1 0 1 %AI5_OpenViewLayers: 3333 %%PageOrigin:0 0 %AI7_GridSettings: 72 8 72 8 1 0 0.8 0.8 0.8 0.9 0.9 0.9 %AI9_Flatten: 1 %AI12_CMSettings: 00.MS %%EndComments endstream endobj 645 0 obj <>stream -%%BoundingBox: -47 6 537 566 %%HiResBoundingBox: -46.8945 6.42188 536.5762 565.894 %AI7_Thumbnail: 128 124 8 %%BeginData: 15460 Hex Bytes %0000330000660000990000CC0033000033330033660033990033CC0033FF %0066000066330066660066990066CC0066FF009900009933009966009999 %0099CC0099FF00CC0000CC3300CC6600CC9900CCCC00CCFF00FF3300FF66 %00FF9900FFCC3300003300333300663300993300CC3300FF333300333333 %3333663333993333CC3333FF3366003366333366663366993366CC3366FF %3399003399333399663399993399CC3399FF33CC0033CC3333CC6633CC99 %33CCCC33CCFF33FF0033FF3333FF6633FF9933FFCC33FFFF660000660033 %6600666600996600CC6600FF6633006633336633666633996633CC6633FF %6666006666336666666666996666CC6666FF669900669933669966669999 %6699CC6699FF66CC0066CC3366CC6666CC9966CCCC66CCFF66FF0066FF33 %66FF6666FF9966FFCC66FFFF9900009900339900669900999900CC9900FF %9933009933339933669933999933CC9933FF996600996633996666996699 %9966CC9966FF9999009999339999669999999999CC9999FF99CC0099CC33 %99CC6699CC9999CCCC99CCFF99FF0099FF3399FF6699FF9999FFCC99FFFF %CC0000CC0033CC0066CC0099CC00CCCC00FFCC3300CC3333CC3366CC3399 %CC33CCCC33FFCC6600CC6633CC6666CC6699CC66CCCC66FFCC9900CC9933 %CC9966CC9999CC99CCCC99FFCCCC00CCCC33CCCC66CCCC99CCCCCCCCCCFF %CCFF00CCFF33CCFF66CCFF99CCFFCCCCFFFFFF0033FF0066FF0099FF00CC %FF3300FF3333FF3366FF3399FF33CCFF33FFFF6600FF6633FF6666FF6699 %FF66CCFF66FFFF9900FF9933FF9966FF9999FF99CCFF99FFFFCC00FFCC33 %FFCC66FFCC99FFCCCCFFCCFFFFFF33FFFF66FFFF99FFFFCC110000001100 %000011111111220000002200000022222222440000004400000044444444 %550000005500000055555555770000007700000077777777880000008800 %000088888888AA000000AA000000AAAAAAAABB000000BB000000BBBBBBBB %DD000000DD000000DDDDDDDDEE000000EE000000EEEEEEEE0000000000FF %00FF0000FFFFFF0000FF00FFFFFF00FFFFFF %524C45FDFCFFFDFCFFFDFCFFFDFCFFFDFCFFFDFCFFFDFCFFFDFCFFFD57FF %A8FFA8A87DA8A8FD72FFA8A87D522727FD0BF852527D7DFD68FFA87D2727 %FD09F827FD0BF8527DA8FD61FFA87D27FD06F852527D7DFD04A8FFA8A87D %A87D522727FD05F82752FD5DFFA85227F8F8F827527DA8FD13FF7D52FD05 %F852A8FD58FF7D52FD04F827A8A8FD07FFA8FFFFFFA8FFFFFFA8FD09FF7D %52FD04F827A8FD55FF52F8F8F8277DA8FD1FFF7D27F8F8F852A8FD51FF52 %F8F8F8277DFFFFFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFFFFFA87D27F8F8F852FD4EFFA827F8F8F87DFD28FF7D %27F8F8F8A8FD4BFF52F8F8F852FFFFFFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFFFFFA852F8F8 %F87DFD49FF27F8F8277DFD05FFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8 %FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FD04FFA827F8F852FD46 %FFA8F8F8F852A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFFFFF27F8F827 %A8FD43FFA8F8F8F87DFD04FFA9FFFFFFA9FFFFFFA9FFFFFFA9FFFFFFA9FF %FFFFA9FFFFFFA9FFFFFFA9FFFFFFA9FFFFFFA9FFFFFFA9FFFFFFA9FFFFFF %7DF8F827A8FD41FFA8F8F8F87DFFFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FF7DF8F8F87DFD3FFFA8F8F8F8A8FFFFA8FFA8FFFFFFA8FF %FFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFF %A8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA827F8F8A8FD3DFFA8F8F8F8A8FF %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF7D27F8 %F8A8FD3CFF27F8F8A8FFFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA827F827FD3BFF27F8F87DFFFFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF7DF8F827FD39FF52 %F8F87DFFFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FF7DF8F852FD37FF7DF8F852A8FFA8A8A8FFA8A8A8FFA8A8 %A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FF %A8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FF52F8F87DFD36 %FF27F827A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FF27F8F8FD35FF52F8F87DFFA8FFA8A8A8FFA8 %A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8 %FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8 %A8F8F827FD33FFA8F8F852FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFFF7DF8F87DFD32FF27F8 %F8FD46A8FFA827F827FD31FF7DF8F87DA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF7DF8 %F87DFD30FF27F827FD49A8FF27F8F8FD2FFFA8F8F87DFFA8A8A8FFA8A8A8 %FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8 %FFA8A8A8FFA8A8F8F87DFFA8FFA8FD2AFF27F827FD1EA8FFA8A87D7DFD07 %52A8A8FFFD1FA827FD07F827277DA8FD24FFA8F8F87DA8FFA8A8A8FFA8A8 %A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FF7D522727F8F8F827 %F8F8F82727527DFFA8FFA8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8 %A8FFA8A8A8FFA8FF7DFD0BF827A8FD22FF52F827FD1EA82727F8F8F827F8 %27F827F827F827F8F8277DFD1EA8527D7DA87DA87D522727F8F8F852A8FD %20FFF8F852FFFD1BA87DF8F8F827F827F827F827F827F827F827F827F852 %A8FFFD1BA8FFA8FFA8FFA8FFA8FFA87D27F8F8277DFD1EFF7DF8F8FD1CA8 %52F827F827F827F827F827F827F827F827F827F827F8277DFD27A852F8F8 %F852FD1DFF52F827A8FFFD17A8FFA852F827F827F827F827F827F827F827 %F827F827F827F827F8277DFFFD25A8FF8427F8F852FD1CFFF8F852FD1AA8 %52F827F827F827F827F827F827F827F827F827F827F827F827F8277DAFFD %27A852F8F852FD1AFFA8F8F8FD1AA87DF827F827F827F827F827F827F827 %F827F827F827F827F827F827F827A8A9FD17A8FFA8A87DFD04A8A9FD07A8 %52F8F8A8FD19FF7DF8F87DA8A8A87DA8A8A87DA8A8A87DA8A8A87DA8A8A8 %7DFD05A8F8F8F827F827F827F827F827F827F827F827F827F827F827F827 %F827F852FD04A87DA8A8A87DA8A8A87DA8A8A87DA8A8A87DA8A87D5227F8 %27F82727527DA8A8A87DA8A8A87D27F827FD19FF52F827FFFD17A8FF5227 %F8272727F8272727F8272727F8272727F8272727F8272727F8272727F8FD %14A8FFA852F827F827F827F827F82752FD06A8FF7DF8F87DFD18FF27F852 %FD04A87DA8A8A87DA8A8A87DA8A8A87DA8A8A87DA8A8A87D27F827F827F8 %27F827F827F827F827F827F827F827F827F827F827F827F8F827A8A8A87D %A8A8A87DA8A8A87DA8A8A87DA8A8A87D52F827F827F827F827F827F8F827 %FD05A87DA827F8F8FD18FFF8F87DFD18A852F8272727F8272727F8272727 %F8272727F8272727F8272727F8272727F827F8277DFD12A852F8272727F8 %272727F8272727F82752FD07A8F8F87DFD16FFA8F8F87DA8A87DA87DA87D %A87DA87DA87DA87DA87DA87DA87DA87DA82727F827F827F827F827F827F8 %27F827F827F827F827F827F827F827F827F827F852A8A87DA87DA87DA87D %A87DA87DA87DA8A852F827F827F827F827F827F827F827F8F852A87DA87D %A88427F827FD16FFA8F8277DFD17A87D27F8272727F8272727F8272727F8 %272727F8272727F8272727F8272727F8FD0427FD11A82727F8272727F827 %2727F8272727F827F8277EA8A8A87DA852F8F8FD16FF7DF8F8A8A8A87DA8 %7DA87DA87DA87DA87DA87DA87DA87DA87DA8A852F827F827F827F827F827 %F827F827F827F827F827F827F827F827F827F827F827F82727A8A8A87DA8 %7DA87DA87DA87DA87DA85227F827F827F827F827F827F827F827F827F87D %A8A87DA87D7DF8F87DFD15FF7DF8277DA8A8A87EA8A8A87EA8A8A87EA8A8 %A87EA8A8A87EA8A8A852272727F8272727F8272727F8272727F8272727F8 %272727F8272727F8272727F8FD04277DFD0CA87E27F8272727F8272727F8 %272727F8272727F82752A87DA87DA87D27F87DFD15FF52F827A87DA87DA8 %7DA87DA87DA87DA87DA87DA87DA87DA87DA87D52F827F827F827F827F827 %F827F827F827F827F827F827F827F827F827F827F827F827F827F82752FD %097D5227F827F827F827F827F827F827F827F827F827F8277DA87DA87DA8 %27F852FD15FF7DF8277DFD17A8FD2627F827F8272727F8272727F8FD1327 %F8F827A87DA87DA87E52F852FD15FF52F827A87DA87DA87DA87DA87DA87D %A87DA87DA87DA87DA87DA87D27F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F827F827F827F827F82727522752275227 %27F827F827F827F827F827F827F8272727FD05F8277DA87DA87DA827F852 %FD15FF7DF8277DA87DA87DA87DA8A8A87DA8A8A87DA8A8A87DA8A8A87DA8 %5227F8272727F8272727F8272727F8272727F8272727F8272727F8272727 %F8FD0527F827527D7DA87DA8A8A87DA8A8A852272727F8272727F8272727 %F827FD06F827A87DA87DA87D27F87DFD15FF52F8F8A87D7D7D7E7D7D7DA8 %7DA87DA87DA87DA87DA87DA87DA87D52F827F827F827F827F827F827F827 %F827F827F827F827F827F827F827F827F827F827F8527DA87DA87DA87DA8 %7DA87DA87DA82727F827F827F827F827FD09F8527D847D7D7D84F8F852FD %15FF7DF8277DA87DA87DA87DA87DA87DA87EA87DA8A8A87DA8A8A87DA852 %FD2127F87DA8A87DA8A8A87DA8A8A87DFD04A87DF8FD0527F827FD0AF852 %A87DA87DA87DF8F8A8FD15FF7DF8F8FD047D847D7D7D847D7D7DA87DA87D %A87DA87DA87DA87D7DF827F8272727F8272727F8272727F8272727F82727 %27F8272727F8272727F827F8277DA87DA87DA87DA87DA87DA87DA87DA87D %27F827FD0FF87D7D84FD047DF8F8A8FD15FFA8F8F87DA87DA27DA87DA27D %A87D7E7DA87DA87DA87DA87DA87DA87D52FD202752A87DA87DA87DA87DA8 %7DA87DA87DA87DA852FD10F87D7D7E7DA87DA827F827FD16FFA8F8F853FD %157DA87DA852272727F827F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F87D7DA87DA87DA87DA87DA87DA8FD067D27FD0EF852FD %057D7E7DF8F87DFD17FFF8F852A87DA87DA87DA87DA87DA87DA87DA87DA8 %7D847DA87DA87D7DFD1E27F852A8A87DA87DA87DA87DA87DA87D847DA87D %847DA828FD0CF8527DA87DA87DA87D52F827A8FD17FF52F827FD197D52F8 %F8F827F827F827F827F8FD0F27F827F8277DA87D7D7D84FD0F7DA85227FD %09F8FD097DF8F852FD18FF52F8277D7D7E7D7D7D7E7D7D7D7E7D7D7D7E7D %7D7D7E7D7D7D7E7D7D7D27FD0BF827F827F827F827F827F827F827F827F8 %F852A8FD0D7D7E7D7D7D7E7D7D7DA87D7D2727002727525284FD077D8427 %F8F8FD19FF7DF8F8FD1A7D52FD1CF8FD287D7E27F8F87DFD19FFA827F87D %7D7E7D7D7D7E7D7D7D7E7D7D7D7E7D7D7D7E7D7D7D7E7D7D7DA852FD1AF8 %FD047D7E7D7D7D7E7D7D7D7E7D7D7D7E7D7D7D7E7D7D7D7E7D7D7DA87D7D %7D7E7D7D7D7E7D7D7DA852F8F852FD1BFF27F827FD1B7D27FD18F852FD28 %7D27F8F827FD1CFF7DF827FD1C7DFD17F827FD287D27F8F852FD1DFFA8F8 %F8527D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D52FD %17F8277D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D52FD077D %59FD057D5227F8F8F852FD1FFF27F827FD1B7DFD17F852FD1C7D52FD057D %525227F8F8F827A8FD20FF7DF8F8527D527D7D7D527D7D7D527D7D7D527D %7D7D527D7D7D527D7D7D52FD10F827FD06F8277D7D7D527D7D7D527D7D7D %527D7D7D527D7D7D527D7D7D527D7D7DFD05F827FD05F82752FD22FFA8F8 %F852FD1A7DFD04F8277D7D7DFD04522752527D7D7D5227F8F8F827FD1A7D %52FD08F82752A8FD25FF27F8F87D537D527D527D527D527D527D527D527D %527D527D527D527D27F8F800527D537D537D53FD057D537D527D5327F8F8 %F87D527D527D527D527D527D527D527D527D527D527D527D527D5227F827 %FD057DA8FD28FFA8F8F852FD187D27F82753FD127D52F8F852FD187D52F8 %F8A8FD2FFF52F827527D527D527D527D527D527D527D527D527D527D527D %7D52F8F8527D527D527D527D527D527D527D527D527D527D7D27F827527D %527D527D527D527D527D527D527D527D527D527D597DF8F827FD30FFA8F8 %F8527D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7DF8F8277D527D %7D7D527D7D7D527D7D7D527D7D7D527D7D7D5227F852FD047D527D7D7D52 %7D7D7D527D7D7D527D7D7D527D27F8F8A8FD31FF52F8F859527D527D527D %527D527D527D527D527D527D527D27F8F87D527D527D527D527D527D527D %527D527D527D527D527D27F8F87D527D527D527D527D527D527D527D527D %527D527D52F8F852FD33FFF8F8277D537D7D7D527D7D7D527D7D7D527D7D %7D527D5327F8537D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D53 %7D27F8277D7D7D527D7D7D527D7D7D527D7D7D52FD047D27F8F8A8FD33FF %7DF8F8277D527D527D527D527D527D527D527D527D5227F827527D527D52 %7D527D527D527D527D527D527D527D527D527D5252F8F8527D527D527D52 %7D527D527D527D527D527D7D52F8F87DFD35FF52F8F8527D527D527D527D %527D527D537D527D7D52F8F8527D527D527D527D527D527D527D527D527D %527D527D527D527D7D52F827537D527D527D537D527D527D527D527D527D %F8F827FD36FF7DF8F827527D527D527D527D527D527D527D5252F8F8277D %527D527D527D527D527D527D527D527D527D527D527D527D527D52F8F827 %527D527D527D527D527D527D527D527DF8F8F8A8FD36FF27F827527D527D %527D527D5252FD052752F8F8F87D7D7D527D527D527D527D527D527D527D %527D527D527D527D527D527D27F8F8FD062752527D7D7D527D527D527DF8 %F827FD35FF52F8F8527D5253527D525227FD0BF8527D5259527D5259527D %5259527D5259527D5259527D5259527D52535252FD0BF852527D527D5253 %5252F8F852FD33FFA8F8F8277D527D527D5252FD0DF87D527D527D527D52 %7D527D527D527D527D527D527D527D527D527D527D27FD0CF827527D527D %527D5227F8F8A8FD32FF52F8F8FD0452535252FD0EF8277D525352525259 %525252595252525952525259525252595252527D52FD0EF8275252525952 %5352F8F87DFD32FF27F852537D527D5252FD10F8277D527D527D527D527D %527D527D527D527D527D527D527D527D5227FD0FF827527D527D527D27F8 %27FD31FF7DF8F8527D5252527D27FD11F8527D5252527D5252527D525252 %7D5252527D5252527D52525227FD11F8525259FD0452F8F87DFD30FF52F8 %277D527D527D52FD12F82E527D527D527D527D527D527D527D527D527D52 %7D527D5252FD12F8277D527D527D5227F87DFD30FF27F827FD055227FD13 %F8FD16525927FD13F8FD0652F8F827FD30FFF8F8277D527D527D27FD13F8 %527D527D527D527D527D527D527D527D527D527D527D5227FD13F852527D %52595252F827FD2FFFA8F8F8FD065227FD13F8FD16525927FD13F827FD05 %5227F8F8FD30FFF8F8277D5252527DFD14F8525352535252525352525253 %525252535252525352525227FD13F8FD0452535252F827FD2FFFA8F8F8FD %065227FD13F8FD1752FD14F827FD055227F8F8FD30FFF8F8277D5252527D %27FD12F8275252525352525253525252535252525352525253FD0452FD13 %F8FD0452535252F827FD30FF27F827FD0652FD13F8FD175227FD12F805FD %065227F827FD30FF27F827FD065227FD11F8FD0A527D5252527DFD0A52FD %12F827FD065227F852FD30FF7DF8F828522752525227FD10F82752522752 %525227F8F82700FD0727F827525227525252FD11F852525227525252F8F8 %7DFD30FFA8F8F85252535252527D27FD0EF8275252525352525227FD0DF8 %525253FD0452FD0FF8FD045253527D27F8F8FD32FF27F8F8FD0752FD0EF8 %2753FD055227F8F827522727F82727522752F8F827FD065227FD0DF8FD08 %5227F852FD32FFA8F8F8277D527D5252527D27FD0AF827527D527D525252 %7DF8F827FD0AFF27F8275252527D52535252FD0BF8FD04527DFD0452F8F8 %7DFD33FF27F827FD07527D5227FD07F8525253FD05525327F8F8A8FD0AFF %7DF8F8FD095227FD06F82727FD0952F8F827FFA8FD07FFA8FFFFFFA8FD26 %FFA8F8F827527D527D527D527D527D52525259527D527D527D527D527D52 %F8F852FD04FFA8FFFFFFA8FFFFFF27F8F852527D527D527D527D527D5252 %527D527D527D527D527D527D27F8F8A8FD04FFA8FD2CFFA8FFA8FF52F8F8 %27527D5252527D5252527D527D527D5252527D5252527D52F8F827A8FFA8 %FFA8A8A8FFA8A8A8FFA8A8F8F8F852527D5252527D5253527D5259527D52 %52527D5252527D27F8F852A8A8A8FFA8A8A8FFA8FFA8FFA8FFA8FFA8FFA8 %FD20FFA8FFFFFF27F8F82E527D527D527D527D527D527D527D527D527D52 %7D5227F8F87DFFA8A8A8FFA8A8A8FFFD05A87DF8F8F859527D527D527D52 %7D527D527D527D527D527D537D27F8F827A8FFA8A8A8FFA8A8A8FFA8FFA8 %FFA8FFA8FFFFFFA8FD1AFFA8FFA8FFA8FFA8FFA8A827F8F827527D527D52 %7D527D527D527D527D527D527D27F8F8F87DA87DA8A8A87DA8A8A87DA8A8 %A87DA8A87DF8F8F852527D527D527D527D527D527D527D527D527D27F8F8 %27A8A87DA8A8A87DA8A8A87DFD08A8FFA8FFA8FFA8FFA8FD1AFFA8FFA8FF %A8FF27F8F82752FD057D527D597D52FD057D27F8F8277DFFFD11A87DF8F8 %F852527D7D7D597D527D597D527D7D7D5952F8F8F852FD13A8FFA8FFA8FD %1AFFA8FFA8FFFD08A852FD04F852527D7D7D537D7D7D527D5227F8F8F827 %7DA87DA87DA87DA87DA87DA87DA87DA87DA87DA8A87DFD04F82752527D7D %7D527D7D7D527D2727F8F8F8527DA87DA87DA87DA87DA87DA87DA8A8A87D %FD08A8FFA8FD1AFFA8FFFD07A8FF7D27FD05F852275227522727FD05F87D %A8A87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA8A8A852FD04F82727 %FD05522727FD04F8277DA8A87DA87DA87DA87DA87DA8A8A87DFD08A8FFA8 %FFA8FD18FFA8FFFD0AA87DA87D7D27FD0CF827527D7DA87DA87DA87DA87D %A87DA87DA87DA87DA87DA87DA87DA87DA87D52FD0DF82752A87DA87DA87D %A87DA87DA87DA87DA87DA87DA87DA87DFD06A8FFA8FD1AFFA8FFA8FFA8FF %FD08A87D7D27522727F8272752527DA8A87DA87DA87DA87DA87DA87DA87D %A87DA87DA87DA87DA87DA87DA87DA8A8A87D522727F8F8F827275252A8A8 %A87DA8A8A87DA8A8A87DA87DA87DA8A8A87DFD08A8FFA8FFA8FD18FFA8FF %A8FFA8FFFD06A87DA87DA87DA8A8A87DA87DA87DA8A8A87DA87DA87DA87D %A87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA8A8A87D %A87D7D7DA8A8A87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DFD08 %A8FFA8FFA8FD18FFA8FFA8FFA8FFA8FFA8FFFD57A8FFA8FFA8FD1AFFA8FF %A8FFA8FFA8FFFD0EA87DA8A8A87DA8A8A87DA8A8A87DA8A8A87DA8A8A87D %FD2BA87DFD0CA8FFA8FFA8FFA8FFA8FD1EFFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFFFFFA8FD28FFA8FFFFFFA8FFA8FFA8FF %FFFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFFFFFA8FFFFFFA8FF %FFFFA8FFFFFFA8FFFFFFA8FFA8FFA8FDFCFFFD16FFFF %%EndData endstream endobj 646 0 obj <>stream -%AI12_CompressedDataxœì= CÓÈóÿ/ÐïPõPP)Éf³Ix(}"Zß,m€Ji±»ó÷éÿ3»;›´I=…cN¦›Éî¼gv6»µ½»˜otÂE'ge3ssÅnXëwºËY Ín¶Zƒ^¿‹ ù…¬ £`P~Óß×_‡Ý^³Ó^–É+x÷|¾žô²Ïš½^³}v²ó ðÙ^³ß -áÓ~óäÍ~®Ö\ GŽR­Ÿñ%¶d[Y›-[~6ÿ>/tí`)tþ]Î.r/»èˆ¬Ëý¬+|ü¤¹öFƈœp76ÐE .uêƒÓ°Ýßîvêa¯Wì´:ÝÞr¶ø½ÖÎ>¯Á'µì»°Õêü“-´jõ“ ¬Õݯ4[!,ë´ÖϸÆü¦Íö ƒf«ñbpzÂz¹%ììKŒ¯z€ -°âÏöö7O²öû0GxÒig£Ÿå5ÿa'-h´ÝÎÙi­{ÒSÃ\›á_õÙ^xzÖÚɵ3Wä\øוÿšŸõHX‡¢kemˆË -W#ŠˆþÝ ÿYξè´CE|·¿Ûü¬)ödwgÐ -»¯ÚÍ>LK®?PëÞi„- so¥U;êÑ -íè_5`¯Ö= -ûÀÅNkЗÂä[ú# oµö=Dqõ€­³°½×y-ç·è“}îd-XgàYφõJôž“õ\ý [>LÏïÇ» ­€ÛÀŸ­nó¨Ù^Öóòö7ºÍFÄ3e}õœzÎý 诚#,·ßÛš +Åç1Þ[¹ç»ðÄr»Qìœ"½{(äÀô6ÈC«s¤>3?ËOàöÁ™Z€ü}X³Ým¶gæ…üÄßßn à£ngp¶Ù>ìdæ•o×úÇ Ía»Ñ5T0õkVÝÐjóïPÁ@)Ï~ˆo¯[«Ãc³[_ÃznÖ€è§ÝA³^Žh·Ždêf ÝAï8»×é´Ìü†?2ÓÔ` ÅñÓñŒmyC{«­(}þIzÀè“@1¦î)0úâ'À‡ÓŒ½XkµšGÝÚÙq³>îc>7ORŸMð0ÐñnÝ/¥ÿ'Ëï§V³wIc ²]ëö›õV¸û½×O/ÇV -Á;ÅÈ&¡åößa«s›¤ÔÚì›Z÷ìG¨‘M‡Ív4DêsDÆÎéºÛìîqí,”ÓíWäÈÝbܪµkݬ„”h~@~Áž ›$3HÝ}0ŒqÓ·¸˜±³…vÌ0ntk&ØT2^µÛµÓ°‘=Ò ¬c-dÆBÁž;ÙB#ó!³š Jpƒ\ù |p+^ 7àp9 ìÀ -,¿â—ý’_„«àçýÀ÷}.á»>÷ŸÁeû–Wñʯ佂—<~æ<ÁŒS#m £¡0Øó<Ṟã1Ïö,Q«,J¢WAäá -„/<ˆ„+¸p¶°ÔF…³8‚Sau=®1Ûsi3àV¨3„Ý­¸ùÇw„ÃÁu2ÇbVbEV`,Ûc.ãÌa6³ìŠ]²‹vÁÎÃá1¶ksÛ±™mÛ–mY«l•¬¢U°òV>ƒ4µ<¸DRøxƒÇr˜€™ø0§<Ì®³,‹ -Œ´aö¬Â…‰z°²ÖX€µ–`Õß0 /J  ¸Ÿ&åYE`[Y=a2ü?ÄŽÈ3„ݯŠÎþ‡Øy†°ƒ2xÏÎíºð Ký±-f9·\¸ÐÒ·PVó@â"ºd·ü°Áv ï`N˜TV•ÜÎ0g€‹xéOóÀÙ"+³Šc96pœ;.ðÞ œ¼StJNÙ©p‹ÛœqÎ].¸¢ð/ò/ó -ÌÆθŽË]qÏõݼ[pKnX1ùÇD:ÇäÌ¥ˆVž¦UŒŠ\ »¨Á.è2ª‚º—Z^D—첬‘’HK.iIÔÌj–@|‘¢qš*ªúšª…Œ"«]‘„µi%eýeK†¶ÌP7¢o!Fa+#‰ì\Lf— ÑÙwIë"Ruwˆâ ˜MtEvMø ä3Ò¯HJG¨ŸœŠMŲ‘Jü—MŸè¨¨HtŒSÑCÅa:&¤bþ'©¨é˜‘¶2NÉ’¦dDÍQQ¦©Ö|EÕa*þ¢?WˆÐº˜¹œ˜,¸Cò %"1,$ q¥BYPr ¤@É€’ä¿â½p”«­T*åJ©R¬*ùJPñÂÈ+N…Ulð@•r¹\*Ë…r¾”ý²We·ÌËN™•mðO•R¹T*K…R¬„Ÿá%·ÄKN‰PZÅJ±\,‹ÅB1_ ð@Ü"/:EVÕ*T -åB©P, -y06~Á+ˆ‚[à§ÀÀBX™|%_ΗòÅ|!ŸÏy?ï ¹yžwò,oç­ ”u@Bሠ-Ft(b†d†¢(²0!ˆöÿ<W”ç×EPÌí Ä¿”ŽÏý2:þ*^HÇLÉÿ¥tdÈ_IÇŒŽ‹ÏÓñ§(<2VŽ{X³²I"p73·? ,ô`ã -à‹œŽ!9úŒ¶Ä 3¿Ãg…’É?(ÃøA5ƽ0'©6Û¡Ì~tòaCFrÏd”£:YhçÇ,fd3ÁwfŒóD׉Γ\ç°ÛvšûKí"w)¤³T®2lŒ‰/Žá3ÃîP†N,À3á° òƇyB†yèe@Tó2Ò“±pĸ‚±ˆ´Tñv@Èñ_nßñ÷ñÖ¼úSJÿÏÈ  %ê*é«,¯ -^â q‚ •ë—˜#œÍŒF*4:0‘ÃçC#;cØ,dp™ÿAX„AQ,,Šq;–õd.-ǧnQt!ß3Q‡l1þ<ëãS”ž÷’ïÃú8ã#ÖÇ™¯9þ_ÂÜ RÅËq©Â¸ w˜“ã‚\ˆp3#‰Âe¼DNÆy©.Jt˜‹J¬Ô˜¹<àòË\âmF2Ù«²\(wå0ñ˜¸L|ÖJŽ¼Îʱ[2<¦î¤òRéoR°}Q¨-´LÆ,L†Är¬ëPBY–ÑP;òJ§á+KÁs¤Ì)'QB²Æ¥gȃ|¡tÙ S˜ð D%ÇÁ -H„Lx<ü2°ž»=`o!(I¥å £>èb ¬¬ ¡‹ aL!Mé¿«Wf «¿9Ì ²¬Sì+ƒ=(‚eȃºù`)X –ƒW-^¢•Àª€×pܾ»`sln90Fe0IŠئJ¿~>¡úAÆÄÆdL 3&ASÑÕÆ{øúRqA¤PŒÿ¡Ñ)ƒU0ì.Ùæbxe@Âðâ±Ë5—З'ÿÒ%ã—’ A¤¸æãWFþ¯ %¹0ÁUú- Ž^¾|sy±KD—ÚÑA‡ÎUíL“%•Šôç\gÒŸKî€Ìy:ÓÃ2>3%ü<½ ¡Ë€T ¹mR‚¨Ï peq¾ B;í×]éÙóÀˆÒd\æÈ(coŒ¶Ë2“ ÊÉ€ªº ² ; ¼(qY¥®`áT¤”„_ò^qžxž×<ñ:£ÙmÅ™­9í ñYœ»`Q’jj§Kîu•å^—/·U„ÞéŠv¹Šzƒ T¢2†`×9^B šEwµ^¯ú¦Ò¡²©‚®cðZ6¬•±Õ•`a,ËMš¥vº|82(èÂm-@¤«s/Œw!ÿÊÈ _.ƒ_LÅ0óäÞ ÂT>Á€¸¨dG¥ÚfÓ4&ÃdHÖ22_£ÍÏdà˜¹¡ºaöV”\I†MµY!3Ò¦}аSŒDãw¦qíBOtyd1ÎeŒ/ú©Øâ¼3Ê\[çh“98¿Í,©&ý@üò.¼ü ¯ º2ñ_´qw.¼Fþd†<Ѹ«|ÁUe´]wÙ\,ºâ;ËJÚe%ÆÑ[}*iWi»ÐµOWh0…dŸ7©|Q§óÒîg(«7™ýøÜ^e÷ñ ßUtbUÌH®_–*Bù¾5”ï«2_TíQõž¨Ô'+>™|~¨äS)ò•¨È+ñ¡@æòr¥ŸRž -RÓŒtWÄ¥þ¥ãRW]Ò‘)g¿XìmÉsמ.wøšõ2Çl ´u™Þ1…@t_TÒ-¢Ã’>¼˜ÑŒtK‘C*ë6 thFý¡Œ2â¦tê—þùM!«3)_)&|¶L÷(Ù+È„O¥{Ò=Hö Õ‹%z:Ïs3&ÑÃ4¯ Ó¼á$é$O¥x˜à¹2Á“éÎí0³ó¤Òs¬übZWû®Ô“N”EUsàK· Sfmè'ÑG2鋀ÈånÞœ­Ë'ñM8Å›ŠÞ‘vnx#.3f'Ž õªFÛpÑFqÈ2»êÔmæftÓ™b˜Û—+˜½¹’në£ÝWµKgëè_eŸÒ”ÛÒ›¡a)JŸ†A»'{¹²ÔÒFu?p 27u4ÃÕŒ¡+-/Ó¥’Š6µhfU€ËbÉ…å’I‚³Ÿøó åléâ+¿µþ=yü\ ü|ûÏÅUðquðs»™‘ÄEˆ1MïªÁ=µ d£(¢œ‡›:o¼Ò%åQ²eÑ#u¿¨êçŒTü¢J.Õqó¦‹þ‘žY:TUŽÒ~V†êòR~=²òÎÊS£ÏVÞ[yråÕÕcFy~è˜@Å*VPqƒŠ"TD¡â Š7€þ£ Ÿ=æbç.çÜÅãWFÿàŽ¹Ä¹ËsùÃWÆÔ÷F¯ü˜«0ö*ƯŒþa|ñ£|ÁU‰_‘³@µ•¢^bŽBîÈü "óƒ‚ÌPªQ¦Õ1”g%ËÑá •/èJZF¦ žŒÎ™.¤Q,ž—ùƒ§#oµ£c›P›‚l -°ux­ ŒYÄŽŒø^çß;ä}3ã°¬€TLåÃ1^Xùa?Vê B‡.rÈl'FÜJÉ\Qñ*ª†äÍ¥:8¢°z4˜Öat†bèXü<:GAs2S¥C¦V…ÉJ³)@.èÐ8»: ¦pØÒq0EÁQl¢ßŒ~GßòHÄKñ.źé:câÜr&æJ»=麰¥sE]öru¯7…1F­1H*#WyôŠ ïMŒw>ÅûžÆ7˜Œëë9zë{ê|:ßÅFQW,8–±Ïèð+Sû¢ -£Y…bQ˜u¹EÁr9cÎP`FMo®Ì¾U€6¢QV6}põMetT­Ú§tÔ&Ý j¤Š‡m*tSW!Âã\FÇrñ«2zÅ•jÌx ™™=uX;Ç\ßÇ^ÙœLá.~ÌÀ2Yv®ùögÈF]Ïc.Ç#Ô¶Ÿã`;]Wc‘÷ÚY¼´ñf;çB¶ŸõñÁ¾Mã?c’óq­À·8SÏqüxrK- î9Ï<ëú¹À5ÿ,|:’MJ’:¸Ž“åÅd[0÷ä­Y8Á–ÇvޓߣŸ!ì 3žÃ„@ÝÀrŠ88Ï ˆ?$ùMú)H…kf%G:N+;ÙxßÀÇMÒ1°?ÕZÃ=ÖçaY;í±N{¬Óë´Ç:í±N{¬ˆ0í±N{¬Óë™íËM{¬o/ÿ¸ëõP_ÖýÓ“11̘tuZ»KkwiínJjwé.ÅoÜ¥HûÒ~äÒ~´_ íøcûÒÓéi‰XöáðŸô´Ä(Âô´DzZ"=-‘ž–HOK¤§%¦ã´Dú.ô]é»4¦aú.ô]é»4få]~i7ìÕõïþöNäëíµžºÎóëìÃOÜ1pî[tl1î»uš¾Ë:í³Nû¬Ó>ë´Ï:í³¾aÚgöY§}Ö3Û››öYß^þq}Öºs:`9Çò¼‘~j‚Fï´vÜä‘þHW6A”IÿÓ~«³£>Ñßí ™×Öáa/ìgw¿ jÝ°G_ú Éרï ws–çÛòÿ¾eÃŒru¶þJî·ßå¯Oáǯü'˳ϳ>YÙ†„¿ÝÑ´8•ÿ×X²UømóÌ’¿Yúÿmùó–LQ…®:ä„N‰å¬·mOÄRçøsWȬZf×ok¿`.‡ð÷þ@2®$'d™T9çÉ'ë/·r\=‘‰„"ë‚(€ɧŒ9ò!1;9iáöq0º·:ÍÊ’b0k†u -\µ#†ß`o ‡@ÕÈa9µ^ºs,v«$À«a*Œ<átüã0n"cæÛ6ë³-$ ÜÀsÌõ|õ,»H „(ù”DÒ~¹Y°¬Ø7¦¸hÓá‚Uc0X6Ä‹Š?tï8XüÞóZ£*è8;2Û¨Éqµøà•‰ONc°Ë4„~¾,Þ‰x'# «ûèã|²ÐP5‘¨Æî‹ß:ÎB<áô‚[Ç=bÌLÆÌ7 -"d´>€Œ°¶å6ÄöVÁÈÇTc÷ŽƒÅïý‘ê^3ŽNæô‚‡˜Éø¸e52é1°ø½£îEÎ89G!@,¢â4·ä”å@t!Рj ´;$Ôõã`±[q6¯2e•¸@¦£“ŸÊ||õI¡;è³Ã$¡˜ã,@æ–‡¿oÿÉ 2C ÍøtF&3‹}qpf ×>ç ê®‹Ú¸ˆÖØ -& WGÀ £&_‚ãH.$í ŠÍ_r!À'rv=—ˉƒÆ(ˆÃÁ€ªa܇ðQ]´¿ÃãÊi¾ŽZ¢;®€¸Ÿ©€¶SûðbæPÆÔ²sMNC‰~²Àj#P@D øÔXÇ‚åYs€áJQ"ðAÁ*°Ël븴6WÔ@›û&,˜¸º?€ÐÜòÕìÀE2ø® 1>ä\r¬¯nÎ…DÈâ%s‡ëÉⶶ{³‡¨ã» %Ì×äu=æh cÛ¯‹VxLLãNà걌AÒ¨€¨[è ¢yà×3 v™‹›„À'``ûèú\ßÏsXX×CÑwi`Dy ´§ X@oB 3W…@ž¦ ÊÐ,·­€K…1‹æÅ\Eq3 …y®K 0.]qDN#¸K@ ä40 ‰E 3’/m'ýh™–#?гá`$`ÍõýH¶Ðs ¸¦!š”‡‚¯ï×Â…zá›ûUä DÖ¦ûE îÇØ‹¹ á=¹D ¤ÂkžïI™)θ äŽ¯ Mž¦µÏ„AI,°mÄ„>ž£Ç™Fºx­VQ€ÜrõlË'¼Ø® tÌD -,|KÏB¦ -8$I¾ð"s×&žÐ’„`d©š/(¯Æ 1Vm<ÜÀ×(8òD¡pO– æ´bøi --h©ïòÑÐ1&Pšl dž­' ¬ƒ/ÐÓµl_è)1Øv•ÔÀH›Gœä´^´Ä° j,ˆ=wF½ZH#|‡–€%…¢.HĘç鱞kÅѸk ï‘Ž‰‚À!Cã;j¾ŠÉ 5[¹ëÓ“Ò}Û–ÖýÀ×Rãç€pÎ9Øo¢˜#9E¥:¾2 lÇ&9PÆ^ÊæDÔVä"1L;rR]ß±ñHÉ pãp€P¸žG„5À€{¤»†µ˜QÍð©Iä²iR?Yl’"ÏR¢®°JŠÙIiP#ôR¹0\˜UÂíŽsãm˜²S0Ò×¥éê):AFÆc’"! Gqå.„á¦Z€g`‘í6N ÀN H“ebDú¢mŸÊíøAlN -€m”Ó¶ËH_°ë7ûNõÀ瓧ÑxAå7ëkdÒ7´4êYà,Á:Zs¿‹Äò>žô ¤ÇÂö ‚ÀrHçAyäX¸1Ȩ€ŽçéG9‰ sh«g¹˜òŒ’ÐfúNÌ*€L¤0hèгŒn[Bh ·†ü!Ì„htªŒ‡³tø41'ˆ2–mðz&b±I9¯M"KþÞ&ˆŽÂ#Ú ?Ò -°;h⦼ëYÜØMZXJ"ÇŒz{˜Àû$tBp=»ë‰4*ðCŒ"1YQÀrrãÕ¸¯½€ÁnX¸„‚be4þ*n``üŒŒ‚ oàq­ŒæR„0WØãû 4¬¡O~•mì{nlb -èq"«6ÖòÉ}ÙžoîÉ%Êx‚î\»ÍÍÊsŒxƒù!õ?«àÛ E@æ{(\ƒ q+ðtä`îÙ^Ž)˜Ïl'FDŒXÎÑYZײÝÖ²°¥8Ú Â“ÀýP0eû°ÉN¸:¶`àØ(@!èCZm‘§ÂÎ"…ÀÇÍ‹eÓ}™È š–ò)´| -ydO84 (Ì•Ý¡Îyz ¾cœèíc¼©`WÑ´)½ ©—U$ t=Ê!½0žGÑóµóRÐådÓ³4Ì=r6®¯,0ŽÕiœk¢AÚ¤ ¾Mñ;€e ¢–ˆ@õ0VXFH‰ .Áó Y@ŠG}ÇÕ0¦,àœ(KÁ €ñM9zbŽžFˆ¤!Bxˆ5 œpÃÏ\ yÌX˼E£ÇÃM!…€›àf â;ßÅ=[±Öv ÐñQÀ9LíwUƒ¹C–Cº1ô8%!2‰t¿Ç ZaRFZ8-²Z¾2{>ª4 gÂ%cm -¤,( zö–Ð⎾ŽÔØ3vçdl¬™<Üf B Cq2—"i“Xš= Ð(ëG.­žëàF"0ÂfB# ›˜bdP€ú -’2ÂÄ箊n ÏÈ {vW ì(åÀÔW}>º5/N´´Æˆ(õeO}\Ð…ŒF †Î1Ö…&À…mpàrSô°tó -ìi)öS‡ÙàŬ´FƒðJ:k­×´AjD[—èq³ZrUÆ\].B\B*Ï#á´< $Ó’¤ø&'BáÖ¦ÜÈFêL €ÜhœçQˆæ±2ÐâÆ =Ì“,•²D6R"@°EvGæ\ -h™pNëÂl’DŸQ‹÷äRÚdFñ|K‰=€$œF`8‚Š¾­t €žëÄm·Ê -›vT¤xVòŠ¨Úhs⢣d ð´!p„q«Ê¯ŒJŽÀYáª0ô”äÓÐK¨û˜ºŸZ@à¹äQ$‹0@¿¯Ÿd›û±ãVG!:O g„ŒÜÑ@O—Ú)U„Ü7Â…V¦ªÁ’÷P®6â8$±Žåj mŠ?ò…K€äQí§Å62U@W'»0ˆk5,=r1< ˜n¦ UkÒõ¸£Dp`–x„À31ŒÐÉ"±y‹„ˆÜT€¦Ú¡yamScdMäæ -Í€âSߦò¬œm„^"+î?(ºè$6Í{¥ ªÃº¦è }7QÛ\‚GQ«+(â -`â>W׳“iYäU=;Ð@ªd ¤pÁ–cÔÎ%»{´zhý¦8‹bà À|Ú«*[QÕ`®ãN¡ª -È|*‰yž//NK×Ix¹I4\í\(bŽëªH.À"‘åÄdN!ÀÚ»‰§™ÞÝÀÑä®bšçÇ*{®N*È -ƒ„ÉñÏ­ØH³¬'+ ù¤*7]‹Ìíoy’cÀ9J*<]êÂGqr7Ò%æqŒ”ô Œ¿ -tj&g`’G÷c·øpä`Fq6…¾ŒJJ¾I@‚¬*Ðœe5ÐáƵižÐw(ðq· b¹a ónr—ÓXµ„@‡qïœ0‚o~\O5Ö€ÊÁh¢i@ Û -F$øÆfZŒŒuT—°PM›ø˜€TDeèY&öì†îƉžOÆ KߨŸäP@nBï *×I£§… &Ì“vÆ€#Ÿk&ë›8?F¨l Å&§7 Ûøa™Ú) U…*õÈ­; û"¸¶:oG`T P"òH¸uL*Á"ï P[˜VTG4’ˆ@†tRó\ ã,Ðq¦ÅtaIɽJ‘!´´É`5 ,£©¼T¤À¼†&‹‚E “¦G.9iÕ@ÆL¶Aá ‚I=uý AT®3©-)ÑÁ3ݘ…¡«cJôBÐ(K˧HH‚u|Ä¢‘~ÛXC 71½Pû‹ -V° µGÍ@íÈUÑ´ &Ôv¾B€’NÌÖ¤vUs…fµ& &†6ò>Q3O˸0ùJ  –« /2›*¤\j*x†×ÑP\”Ú¿¶P§Mþâé`ÁœùZÞØj­ž §‡€Qºlb&ËÜYV¸4–1 dš¯žÚùR|¥=09ÔøÊ@%Œt=Û8Ž€z)ʼnF°Œîͳª“ ôö - .Øbƒ@Ñ”5s­àº<° -£Ýöi¨6œt,cMmÁÈí¸—!®¯ò©$S"hë8°‚aåÆ°B€Û,&¹å¶^W uXÙPE”јšÅZŠ½a *©€üÎH§ z<©æ«ã3‰ÀÆ&3 -¯tâ¿›=8¡ŠÑ -[-jŠB`ÕàÄd‹3‚¬µÇT ÇÆF¸ž²6nÚ„×Ó[s äÒQÅ':6'ƒä1ÚŽ QW*‹Œ:´ð<=Ôu9 ¸ÚWB ¾á9¶B@aªP:@Wu„JPFuÚðèœY‚u¤£"7ûu0ƒÀÑ°h´PY¬ÖôèvÉåápSnÕ1Bi.SÖ -LÛ“‘’âbM­H¨H_ÎÕ¦Ò¿©ÜËÇ´+1/¹´g¦mâ¥= µ›,o´×"›¨Šߎ-†qÕ{#Z&¹åѬä~ŽZsév×Ø3•D"0(Ö`¶C÷»Æ§ -]uǡˆ¦7x3±%î¸ÒóST$®éÆ1…=:Í4rŠržIn•ùDZ–CÚ¥²*F¶€›ÆÆ8â[Ç2HõN‘gÛ¤šy„‹nÇc¹úQÌ£çÓþ“ˆss2Ò:èlô_¾›«2›¦%K§ -0›ž‚6.$VßUÀ“b$´#¶Wt´v ìÛ6†„î‡`…&É€0A&®– û#íVÙ]‡‚nfüºË!g«zR`{fKHäôížê‰SÝ.‹d1tÿBiN¤˜é’£×{gtbEÂÀ ¤ Ag ´T»jKP‚8[Lø:ù«)­ UðW@ÆI$×èÁA@q‡Pû·ñëb‚¢8@DÆ+~»ãГÀ jN芊œ#iö"N 'Kæ ª¡Q”.È+ak†«W¥y 4Ï2›2lSK£§êZȉ,dz|³)6Ý Ìý¾EyŠyËhÞ›ì+?­9o)É…¼’ÙÄœ‰ðB_(n‚ѲÑ@SQ»‹@5 Å=ˆ×x;Û76%@cK*i9Ž þ”Ö+ÌÄd{¥^(öt+ŸPy• -;rx®†Q}@D»­I\[X”™èš¼z–3åÙ˜Z - ô¼˜ ÓtÏA@mùz^,KÍH¿Ÿ Z—§Jòä¹ʬ©)ñrÊ`˜:½9'‘$ÊtQˆ‘ÑõIFá³n) ˜­öâuì*¢Ärv¡7öq´%Lr‹õŒ*6-vº!flS>æk«-_UɽàX*åL…è˜=Gµ#";¦ãÀˆ8âõ©ôF|›Â)½ÝŽ@Ïvýˆê~fjB1Ž±Xˆ#«­ -Huµ!‘‰JåB…¡ -(\2µ¸ÒfL€QÚŽc ËdMR?Ì%-´ÓcØEGY«)“(ÆR©Ö²°Ä^Òq<Âa Ú!ó(¦•';lò;¶Y®ˆª¼ªPN‹›Âíèʱ‚” p¬Muf]?—2U} TœX1U7´ Ï#k Ê;fSY,ˆ¤À–‰Þ›è8”STæOr)sFD÷sÛÜð@:õö…câÚ­@0µÿµ»¬œœ˜j;Q02³f/O¢µÉÑúêH«W`)3ãF`jªÂ¥Qè=dEnöÖtŸ½z7m¹è–#ö.“¡¼ -1”‡ª…aVD‘£žM¼hBÏ‚XÔ¢Ÿí“û“5K3%FÑ µèãŒtáK¨^D40‰ŽDkb¦˜`Ì6>Ì3Eáh Ü¾T@ý概Ž þTúŒü‘ÑÓÓšq­ZøWf®)Ïko¯€Â#¢ -S=C°yW-AȳzÞí/ñ™(™a•Øµñnló„늮U«îî¾A`Tòºôc!Î7Ôh6̆ˆ¤Œk™ ß5ä¢ýf#ÌôÀ˜Â^YÓ®ú‹ä¬|ªiRªÂ\ã¥õ¹ Z‚¦õK"ˆZtùœZbVÈU”S`Ç"~E}bº[EP²)A!@á1»÷¾6YBµjjwhgðýîH-R8VFÕLPª9,È×»DØÈ›y17-3 ŒÕì=íK¼˜×‰* Ì3;‘B5Ÿ) ³‹ómB•Ä\SC>É¡Þ’’cuV”¯"00¥4I„ ÚÍuUÓŠœ­Œšr/V—FÛÌÀ¥Ú•-è~ª6š– ´i›_nõªû}µ‹íÇ‹Ì3m£ndap QW‚!0r¨_”9¸Æ¦?Gïªû±¨GBàè<Õæ›}E­‰ä‚:%¢:4€£ýhè:¤vt·Ç©ßÅ"Wê`éÏô#낃#“šæ—€QÇÄæN<‚”Jû²c1•c+@˜µéGVê @˜½hªÜáPÏ£6m:¶!›N Ë'¬Që²Þ –@Aë’uB5NYÚFÐw©é5Ð!ŽäÔýíû8Ø¿M=¾BoPàásFgodSºÒ–³nW˜9ë¤g[Õà¨óÌáBᨶE5Vå”ãÜ„ÐÆ"Ø¡sd²žTÕàHeáÄ€MK²>„@Ÿ›zÕÍ„@à.-“ЪׯÒÙ(jªC°íÒÉ$WW6èš“`Ú¢âtm:´áÓ3‰ÖôNév\$MTTÓ-¶„8žXv„€,5º~Ï!£9‹!§ª»ôÑMB@ý1è •EÄè]!ìöÖäÂŽ:d'³bâ/5\r*Õà´⪸¬Â6ƒ ºßœ&‘›Z:\OO€a¯šÒ¾;Õ<}IÝí2dÕÂhS ¹¬~„Ò9EsO‚]ÇÓÇQ¤2XÄîØ ð =L÷U Ηqu\BÛÍ:©„mKð˜h) 3Ç:…jî—6¦³¦cUŽ5geN«‚ôVvqj#¥÷Õp¤íD6‘9ÄníÑÎqs €G†Ò¥sƒÌT̤ýå,ÆÚª3ÝÌË#›’tƒOt;ÇLqÂÜX:æ›Þü! t‘ -…<¸3Fª(Sí*ù@ÝËêDé':V:»AuTÚÆpÈ­9 -dbtàÌ„®:üw”U@7 ÚÊ.FŠÝ€ŽKé™}ØAåÚžði®´…™¦Kö ÇÓ+ÃT•´ÑàeJZ{(xŽ:¸¹êõ&¼‘æÑÞ#êj/„•í…õI*XP™œ›m8,ƒè½XEX–‰9·™îr°Ó20¥y8Y‚U‰,}yÊ 8ºC–ôtk ¦!UÔ˜y˜n ‘5A‹Ž§Éí™EUTtÉNšc ª4ê^Õg‹@—yZŽtW±,ØÚ‚ÖEO²ä««>Ž)]aùZŸCCÞ{T/–½«Ù´tMàá¨GBC‘îS[¤"ÜlŒ˜:—pT9bê¤C[‘¸+/„¦WdÖeÓ`'Ðí5ž‰óôìEݘÀôZeõ+йGí[V5X.]¯Wïá#Ð×x)/°ô»š='ì™ÐA£ª†‹²i#Ò¡;9ô!5'Úà°ôVu¿Î$-nʸ,jcÖéC°º_•ZY¤f*´zG€£ غ@@¡:‚ûÇ7'Û"´E(o‡ÄK71“8ª B!`&7ÁJ ²à±ÆŸa7ÒEvNö‘ÔËM€ ±b·2qQv½)–9”ÎŒµ·¬˜cÑÒ¡ºâHï˜i5óÌÖ­Cñv‰2A+°u¯Œ¤æ|sÑï ¨j0×'¯5`1Õ‹õz„ R#ˆº“Ê:æb½Ú@ŸÖ0É õ|Ó2MÔœÔÃÒ'=°‡Û#)’;ª]„ÔÈCp@ÊaS±mÚúåÝ5Ðó<ÒZCרÝQ­Qª»*¸F6eÓ½nkpT"ªàK†HgäΟnºw‰zKX ]j“x]ÂëÙúôF`Î09ªÏS0pÈá›wøx”Í7PÕ?Œ@‰±>˜­[G½O!ðÍS':«â©ãŠ\\Ÿ@rã³2Mº>©=7Ç‚è 2ö¬©]<ª$Hˆ\óŸ›óð¨ÿ~@c£ès¥±#PNT¤@°ÐÕU\˜jÐ „(D‹‘Ïc<ˆÎ¶ây+½áD§“¸éüu¢ã:¦á•;Ý -cºº½½)Ov¹ä©ÛÛwÌKJœœ9cP½“ Ãuª&Ú4pÔ®Û¢©‘>¦õxRÓ#ímè‹ê̯Þ×ÁÛ¢<M;€,v žësPV;òEº‡™³¹":ÊÌÔ!‰@óõ;s¤Ñ1NoU Ã½Ž:aM˜eLœêAGX$†Ü¼•é_'Šœ%Z]4fºU¾ì! Ñ¢–}êŽ2;xï±ð”³g´7‹/Í îfZöÝÀœ¢b±Fq70.3 ¨‹¾&ˆ’|cLÉwÉw„èTž©bD•À\%ŒLí˜YÄzG-—æ멦GÒî‹j|%Šlq“`Æàka|ÆÉ/ë¦l|5ŽîÝb±c®·Ô–:MÍS˜bTŠÅ÷ðÈ=JM[r*\˜cN=c}Æ"·êÑÛ¢W-i¡8¦GÆdè>?÷Ö¡×òuD½Ô7ÉÙ©ËPE·%N'Ð¥ýÑ#zDÔ(ƒ`aSš/Ì›’˜Ït‚¨5zÌ Ô›’0 „éŒF#zJ`לñ-ªÉR„‚í²jjt©1ÆŠ6Y=…M©,Õo£F. -j&´L‹‹Î« Sˆb²…ºÆÊ’GV@K&ꃧöh;ÆLBÄú#˜n0Ç}F=ŽevìÏá­êò)deòTƒ=ÓÎë¹´%ã¹Ô:$O0-ê"&HÍ댛¸NÐ,µ§CÛWÔçv~E33JÊt_ -ÍŒ¢Ó‰uÓÎëx*e(Š´]kÎâé)Úf MLnÞñ"ä©·±Ï§‰Sñ©¡Wrà”À6M̳¨Ç€qÚ15›{¶éb”;¦”ñG;™¦'ÃVG=|ÕÛéEaäñz^Cí*®š ËÑ0ËdüPÕ°‰Æ:’i£«¦YÅ¥¥@ªP“¥”?:å RTú™•;uv*ÌÒÆj°˜£pÐ1ÁèÕ -²BPDc÷-ób/WÅP§L¦=:ljï!0=hú• ³Ç…µT¥µ^‡”ñC«z;oÌôKÞ<'v®Næ§Ì»#ð¬B•À>UîäOÕñHpݯÔÿÊíÆÐûþ~潶¥>Ú}½Qi¶MfÉü˜]Î,½}^}Ñi„øc©Yï7;íZ÷û>XÉÎÿ{ÚjÃG‹0­nó`Ð{ Ù‡™¥|·[Q?n¶Ý°Ÿ³ìÒf»}†ÿô¿Ÿ…øÙ¼5·]zÕnÖ¸ XÛGÃÿ®µjä÷Ä"â8˜Äw9«i]Ç¿‰×ñï5¬Ã¶’¯äŸf£œx5zôT¯è8l÷/‰†_ùšò›ûùÖÙqmßNº²fF^²såKé| ëýBgÐnÀÜ -KÔ#ZÑ¡4e0´ßKÌ°¡{&XÑ´˜Éþ {0h…íz˜”<êÖ„t¡ç\ê’®§ö­äªIï|MíÎn¿Ù¯_b£uõäè½f+L.ÆC÷\½«ƒŒ;éêj½°Ò ¿ @t“;ð‘»®|…,éòÚƒÓ­z¿ö÷¼‹ß’Ä]0ûóoèc–3Ü‹›“OøÄ¿b®ìvÝz¸Ñ­7ë‰ý^;1gší)7Íö%‚9´v «¹ŒÚÑZ:ga·Öït/(ºáÚ´¦Ø9=ëôšý$Jó;& ƒ—KŸ½T -³+i¶7ëH³½é]ÑÌe{<Íöþˆlï°[ƒ±õ¢Óì¥ù^šï]{¾—¸Ê4›é^b³š¦{WÈ•4ÝKÓ½4Ý›éto‘Ý”„o’•LyÊÇo\Ê7ÁŠf(å+„‡­ÝãZ£óÏïØæ›lH2¾)aÀAkp‰+œ½D(qÝë7JáßÍNh‚(~ӵŵA¯×¬µ Š³K'æM#¹ój\‡÷šDq¦Ýt{a¿ð'›‚Fò¨¯ñýÕ~K²j†¾…q v Ö;­NwùŸc•Æ$´Ïß[ÉK‰ztj þÃZzga}kp‰bÏžHÜ%Òtkõp·^›Dð†nº†¦Ä«îZµnùß³N;l'gÜù¯~•“.²Øi÷úµŸXdtã,å&‹¶nHÃ`)Ó]äXd“°å‰×ò¿kŒA¶;Ív¿ªË×Q wµªVup1CñЄvÚ†Ÿ*‰Lûn ‚ÒM’i3‰ƒš“ä*sr“ØÃ\²äøBìk³g7l¯wbŸ3í:¹¸]RŠ‹¿†…´šýíZó²$eö\MrÃæ$gs ©u›ýãÓ°ŸÜü±¾svråÉëÝ[økbäó°{"%g(šÔÞD^ü¾ ¤-C?[¹™ ™cÚËi‰2ÝÅ4ÛN;†f¢c¨Øé´ -Ý0ü_â­¾ôœÎnfωعÄ'•»µFsœ$4|6*›Ó]H¾Fò…\‡R&^ȬäËf«–¼/bSÌçîÙq§Õ9ú>C©É 4k7Ƙ%?½2åÆìÆDLÙT³ Ž{M¹æOvašU?ñJfE÷ÓŽÛëÖó›zfµŸv–8ªœz–<>žö'¼E!1Ófó- -‰»½Ó·(\!W.ÙèiÔdÍ÷×ÔuÿGz£©o :H,eSïY¯dV<ëNâMÈâq­Ý[»a+¬OR8ãÕo~%Þ2þÙEž¿ñÚüP©Ù;kÕêáiØî?¯Í3:­ªÄ[y3‘%·|Óî&{¹à4ÛðÄ+™neéÊžûÑú1éÊåOÉão~­’­N÷9™Y±wèÔ´[‡ÄÙÝÔ[‡Ä+™ëüŒîÕ¼xeZ´ïp¢V¨Ãf«5IÇPë:üÀ%;VB¯~J^:R£§Wr»ÓäÌ‘ƒ¯¾þ•˜9Ë:àã›0ƒëȧÛÈ~'y„Þ¹†…ÔZÿÔ¾'f ˜ð~­;‘ÉWã¯|]ÝP¦€IVk4šýæßÉÓ©è†kØ -h'_W½>8\Þ÷_Yì–k8xÖk‰¿Ôk­úóN#ùÚ¢®þ°câØ"Æ=zü ¹„¤ ¾ëšR’Z»yZ»¶WÃÎê{ènL3LýÆ4Ã$_ɬäC‹~Ú sí©×Íl†™@í§Ý€Ý˜f˜ä+™ö'4ÃÜô¯LþzÀ´æ -Ù’84˜v˜?ÒM};LýÆ´Ã$_ɬøÖ´&m‡™gtóÚa&°|ÓînL;Lò•ÌŠ ¿¤&m‡™R{7NM»u¸1í0ÉW2+ÖaÚÚa¦zÿgvºy&P¹IÇ5ñpß8A`Ê…ßÆ…ß÷6‘`Âï›À5=|ö_Ú˜ßÜ/É·ìOVùJÍŽ‹J^,›‘·ÝÈײ§ïÉI-ÚMüÉ-ñâS‹–Z´Ô¢M¹E+w†h©A›vƒ¢ ¦ö,µgIìY ¥ö,µg©=›}{ßÔÙŸ¬ÿà†™µÄ‹ÿƒöðRµI¢6ÞŸ¬6‰ŸªMª6ÛÍÃÖv«ö}²³ŒÓØÅr_tÕ¯f°²nâ¾65Õ ZÛbwÌ’å놧Ë^o¾ë'rmïzÉÚ+ÌÊÚ.ükeáï -ü ÿ_²¿½OóÊOÝ —ÁÜÔw¨4Ûð°Ùn&ß:é†ga­_š€c±;®|}é;bÔºfì1½3|KLÒÕÍÒ;bF#Ú b¦%†º_½x0É—Oy§þ$k™•^ý´`1½æ`"Ý™r;ð“»JSмszÖéA»5¸DÙgÏ4\&R³½aV$ÎÍAH\&6ùJf%8nwvûÍ~ý’*báF˜´›ÿþŽô¥¤×mÆ[Ȫ/!^>hÕê'+YêœÕêÍþ÷å ª‹½þ÷Vò·}õ}'ùÂåi7-槭Â5)Sq†ti2Éš Wúsoç™öÊhO¾ß±x“ ÁÍÒrö´Ù»›”9Lúu­Sn&\Î¬Ø€Ä 6½A÷°VwëµI"Ò¡›®¾Rž8RÌ-vÚ½~í²¯~ŒgF£÷]ùÿ9žà”~ «ûðùb‚¸*¶ÊÑÛ¦—J&“Ñ¡{f©€.ÙrcÞe;‰MQíÍÓÁufü•/J$~ÛPØ‚_&*6Ç«Ô”v¯ª7¯£kæ mpU©4Ú›•oNC¤)‘þŒø!±&1.ÿ{Öi‡D‚çoœÞ(‰æ:q¸{þÆ™‹—Òp) —þèpiWëð ÆK?cL{Øt#Û¤op,˜–̧Í($v'ÉÕæä:´&qøvrÉÈøBìk³i7¬±sÒÝŒ©7ÒÉõæ’n•¸¸ñkXH«Ùß®5/ËbfÏÕ$gÐ%oÅŠ3ȹ†…ÔºÍþñi8Á—Œ¤¾sÚ\ΔûÎäº2å¾sRc6ínó§R¶ÔuN©´ÍŠëLn×R×yS\çìÔ¡ÓoiœÆXè·{ÞàÅï›À ÂM}Ñ üNö½‰_<+ÌÍÇÒ«îT}ÓÜo±ì3ù’¥Ó JüF†Y0ì“[Ái·ëpkïò.ªÙ3ëvÖÒ׸Ÿ $é²åOÉ ¿ÆD¯Õé>'œ‹q§›|ª-}ÅÇôªÒâyÇÇ•”o®xM[7þÄëbâœ#}=Æ´Äv7Wk¦§ +󸲽øë´•oÚLÃÏHÛ´[‡øšŸÕœ²sÉÏF¥Ávêi.½= »•f÷÷W†fg?¹_;HÎãY(h²lâÒ¹\ûëÉÊ`C÷\ß«¸íúÎ Y“'e9/keÿ 9ÛHåìåÌþSÌYáºZLd²ƒ§®÷ºµvï0Á·HL¼ÿLP3íÚOžš…jˆZÚ•D i=䯇Èι|«•æ:ÿQÓ^ÍI&pMŸèëŸæò›¶µ_n7Ì×@!ÈEÈþ‹N{PÈ7Î,*p!·?¿hå,ù'ƾB!_¯Nw:}S¾›ÛÆíg^e‚ìüBö훡ŸÆb&N9Û ‰a·½üêõ»éž–­¹}v~ ¾‰§Û†XÙ¥B§ÓÓÆàycÐl(õÖ3¤YER¦äãgDÌWŸl·ðï–üf ³Fç ̺ƒÞqöy­]; -»Ù­näÿÇŸeÕ‡ÅZ«Õµ”}ÕF›ÔÐc¶‘àtÁÜs`˜+`¶+ùZ¥lVrÁ{`çXÔþõKW¨O`%»ø•½ÌÒ³v矶üôj~W¾­”õ¬Az5к¿Cú|IKƒvÃ|Á®¾ÙΪm©qÞKzÈÃq7íökõ“ßT¨õšõøÝÎIøÃ[˜ü¹µÕÕcÇ°¦N'¬w@cø¡¦—–MjšåˆFFy›l&;CCŽž -ž(»´]ëöǬ¥Øi7ÍþˈßøSäyÒäÇ7üJx{D£­LÔœˆ×> Ç Î`F²üª–ÿÛ[FBj*Ý,u;gY’^{h}óø™ú(Wkžp+5‚¡óù¡Û—öšýÖ¥òcÓŒÏjÍ®^‚ô4õ^·.Ãո䥰cŽ;ÝÿÉ19î ¿õca,‰Á½˜€œ ÈBx–ëûðC`Ù0ÿÔïÕ[rÖœ¦£Þ9 ë²,5jÝ“Ñ•üvûñˆî Õ¾ˆSãå_¡¶ÿA@åý“jqD‡èö W‘Y*ÿÖ8ùþžÑaËù 5Èš>ÅŒçnóô¬eŒçÚ³3¿ó‰ùmk~Ë“k±YKN#ò—º‘íZ+„˜HÎ}û ùlç?Ä#²O rÙoÿ—…g¶ëçé2ÿF¾~R~6:;Á³Jˆ…ÁÉz’d¶²³QÈî„ ÛÌã2¨È‚{–гˆÆ¾ [-Œýåp9:Â·Ñ !ÙQÃ\Ûd«m’Z.~¯ÑXßgŽë`ž |@kÿ¦ÁL…Ô`F+÷!zð…™D4ø9Ä…í~M·5Î\à[N€D Ô|`áðG¦'ˆŸo»,àH^9yqÍœìÆšd kÜ%¢!.~ðh™ðÀ‚Ú<”ãÜ”ƒœhcù€Ï†S^ ,OrÔ!p0ÀŽ™Ø"m¬A8„ÈÕ Yáš±š®Z Rü!D8#þL–Áäh©ó5Éc8sB -üÀ0Çs‘‹3ÂÖÜ€hBåjʨDPaB®Ç` '’l„‰!‘I%‡x©ï‰q§§‰d²ÐaD¶¤6ãqD®ÑÃ@$Ž^¯GDbjæZ ¸…k pFÂ1Š©.)â} †˜H˜"—ÂäJjû6 ò8é€ÖB=|<®ÐjjZºHü"9!ŽÄDl²9‡ÈjÍàF¦ä[H+„)%Š¡³P.ɹ‡kR÷h$#xÚ,OQAaq¸Ym<$7É 7³Ai¢Õ‹só¨wÀ!2?’ñRôtðg=ËÈ,úHOWãáJ(qFŒ "¸2c—,d–›ˆíàD|Ÿm_M`ji6fl296 Ö|Ôó€—Ëõq5-ÅwFÔÐò‡†©…¨IÆ…Q˸q´»ŒHf¤²1ÝÌGòSS6B »…ê“À¹9¨•íÇž…fÄÕJ–…l•«¸BÚ㑵9i20r9$ßÆd -K©“£(¬¹> µÆ,([†xÌÍb}eŸâ¤S$óÀˆvAdùŒ½dšTCV]»¶—"7êŽä³ÉWi_™£ÿkM"±0ÂlRT})ó´>©alX^#ï%b@­TD)ô[¶Ã¥&zÆôiQri=Â`ãvÈt8q·ZnYé¬Ä}A²%´ñÊqÍÈœcL˜fSWaõq²RG…;J>Çx£bZð"[-¢)EEi£"uƒŒ¤c8HÖÈS DûD,Ñ4àÊ’àôe¹B㨻¶ô*>#´d†Œµö‰f)äcÌ’´¯ˆûébŒÅsHÙ EÇt(p!c -~ƘÇ!Ž¡pJ¯L–-eø ¡zCÇ8Bâ¡£m€$P”%Ârb­GSô‰c‚‚ã¿pE§í‚É)훤žX…´.ž -›‚â¹¼SŽüï3ˆæÿÌîÌHU^}xñCôäKúàD¥Të×p³~—û K#û±]Íó^¸9(·0ÔöàïGñ ð_°‹í¦ŒÛǛ۟¿Ûîíÿ]ëöV.Ø­3›z0á½KvõÌLzC¿Í(uÚöE[¨q´:õ“ð²ïb•³ ‘¯w]Ív&j'XÇnØ!qùúâ£ûÿ#%~´=·ŸhýMÜXL"ø—ru–}ùïĪŽC¯Y¢qyõA¯ß9½^Köûäp¹WÃÚ4úÔŽÂìvçŒXgâÒV,ÃNx6hE"v.+rå»aëI­©v굚ٞü|œÛ7cavaw³ÿxSU|ê9$ó±×Fê&ü,uãg]›ùqAÞv®c_?³Øíœå»a-6¢žùHv Ó,—bmz#´íâUŸòö.ª…Tô½¸¢GÌ’CFl–nƒ¢Yîkç sÖW63îYöiç »¥>Š»¼B“f˜ß-nnún)ÄÃAø!¼u÷ÃÕ7k÷Vjo>uîn-Ö»§ÇËGí[O+·Îß+6k¹Þ_âÕ“²¸³¼þjãÑsþx¹úñÞóõî îUÊì¹?gs~Dzz¥¯¥£‡Ö_ë+Ÿs÷×WžõÖ{ÏØRfn}¥z«Kƒžö GO^V×Wy¸[l®=ª—r¹{GçUm¼ƒçy¥Êܲ÷~£_úú©Àß/>ÌŸvª½üænÿøÁ#qgP)ñ¿Þ¾¶î½ÉÌ•­§c‘ýå‡Þë—>æ÷Š¹×?4>nùÓúêIåÓúr/wú ôpnP™ßhfæ$±*_ö·¥ÃOo¼Bk½õvù°pÜ/{ïí!r|¹[ªÛÕoë«ï½Qx`ʽâç£Ïøéî·ÒfcóVaÑÿúW~wñN[Íám­1ÈÌ_çÔËu÷å|ñ˜ï¯¬æ眻 -/~y°^¼÷ªR ÷½~zçx¥^¯àOÍåÃê±z²m-Õ¼nó¯/ËÍÏO…ÖÜã{‹ÝùêîÝo8ÿ…õ•§ÇNfN¬¼þ´žo×ï>X{¾²ä~\kzÞRïÐÉwë›öƒ“eÛ`¬—žö^Ù¼{¡÷ƱËÍâR øk?_›_|ZÞö©ZÁ»êÜzqsõΛòÃÀí_6?ˆ;¼bçóƒÕ×ËìàÎ'‰öQ{ôHÜ¿ƒ,ù Þˆ—m¤Ó£ÂÉ‚XÔ¢ùºQµìOwž—–j«w+·¼ïâS~ðYb‘C2sÖÁíM.~𨲪Z}S~¦†–¿(dìÛÑ}k=xô¨ü•­i(t‚Ï£¤^xœîD'ÅXD•™[y°6˜¯”ZvÁzê.Ã?VSáy$:ë+{ýÛù½§ýÁyRŽp2FwbüÛî-„íû–kæGé4Ø ÂÊüݳ…â±Øy_>°Vï—Ân÷¡n¯­˜‰(rbT7òûOm)m«‹_*¨©Ïr¥Í¯^Mé¾b¨¿ûíôY~ësáy¥xøÔ·ìgJ±qúNÏ1<Ø(´ÄÚ›·èW×ÞžìÝY™Cffn•6NæBxÔËU´0Žu¸ü¦s~¶£ãêðÓÃþÆÙíƒ x°Â_ŒPde³×9,6{MÖrñÃ6[¸³ù$ZÕJ¸|÷4ygÅëùƒµ§ïŸÒC>‚sàÓ¹êýþ~ã4¿ûåii©¹6_Qï=ù½ç£õ×{›µJÙù63·úÀ*4ä8+?ì¼`•»bù-ð|”ë'ßîÒ¤‚´jÊ0ßýp¯ -æqí^~§uv?>îeí ˜¿{ÜÛ9¾ŸË?{·ÛÎÌÅL8}¾¿¾çÝÝ*V¿íÙC.ãþÝÒaþÞç!°S©ì/Ü:–Ë›ÛA¥Üƒ‘O5÷ñó“!O»û>8ÑNùá^} ¨øò (öÛ¿íbuz"n¯YáÁòcûá|ñ±=ÊÌ ß£FJþZ@£X”7Ê_Ån•½ÄO×äÝæE„ªüêbÅsK;lÿýY‡¬‚MÆá(™GpЋz ->oź™ü#sÇŠ‚³Ù–S’s€µž¼š -.S-'…ÔÙCØŠD=E¢%NyÜC寚bˆqw˜˜òžüT.ãqDJ5'§¨Ø>ZyiH°+éiž²[KļG?dmbFŒ°!37Âu+Â-—!é4LŽ5¹ªèW‰Êù´™öæ%ÄÉzf¯æN6z[aW‡~UQ·ý1gr‡Üs‡g]Pî€È<ïÕ§ðYéðeow©¹ýÂæò·¢Š·vûÓ¡ S¡Ì\<Š$—¦2ì·ù­Jéë›ýbó«XZ9<;‚øö¾ 4yôÅóvœÜbé0v·õ)B’¬‘ݤÌBÜ7õ€G¥£Å…Çê/G_ PÛºW<~ð®¸Ô|´¶¬y5L§¡\äÄ>W‰a°cql?‘䇇:w°xPU2¯…36‘‹’Š»”œG -°ý¤™EÿGÿ±‰'á³",¨ñ òeÿQPÚxçB:^fÛàÏGѾ¼µðq$IQ2V¦Ç~yY:|õ`ìt¥Äe¥2SE(ÃõyõîÉEzåU>º§Rn¾°¹àÔ×Ü_}ø×Òß«WŸ^n¯ÃZ޾РþàÝ\þå‹ÝוÒBƒ>ˆ„½s×òNÛVõÙÁY”#ÖØûàKñøã­å6ö÷I²>倃¹g…“ç ´ß>Œtv+-Ÿ 'líVô)XËÓ–…NäRû}T퀌o̳õ“U¤ô"®ºg¹—¿®}£ìyë+ÏÞ݆ôñøÖ0î­üîFã+ðe­ËÖ_Ý -$$Öæ,D‘;”€{|ÜH&/Á¨ÂS>×Å^¯¼f¬¯¼º—‹ɘۺ½r8Øþšß{U{XnY•ëÌæÉ¢±Î£ŒÌ\Ъt/’ÛŒÜ#í#K¨½N¼¢øcýµ˜Èß-ðp÷RíMµ÷$¹²°ÝZ©”Ü÷ìÁ£wŸîŸÇ˜ Ë¡­Æ´·PÝ?–ô¾<O¥ÜNcq}ùÅ×ã¢öÄíJ»¨Kƒ |‹gß:ÍÒÒÛ•u¢ç½pé8üüéÙÓ“Û(­i úfÍE7Ï -§[À‹ /xakà¼RïôÊî‹Ã˜ÇŠäEIüu盿¾üæ[såðÉÁÑúòÛJ•²Ø*w2sÒc¯>|'žHÜ1ß­GZó§÷ëÀ¿÷+¥ðl«*à q§Êï Œ•ží=¿=Þ{ݪî£{üWyßj*î•3så‡çƒ¼»žÿP®o·FÂ%]™<š;ƒÜözK/^ç÷ªë¨†ÁâùɯίwƒA~{géÓró³sø o”;Z[‰©Þ‡åã«ÊþÊñÒèCÙ£o§Àä£[ëß×ÃèäÕ ïœåì'¯j°â±½¿¾-Væ;ÁÂÈGöAu“E(ŒÅ)¿X,´N­C—“÷âÑòÖ»õ•³À>¿4=ù#=ÿeçþ…ƒäåFãàÛù!ïKVðþ^¥Š“ü^©fZþßb¿5×—·^¶$ÃbæœÉý‰µúÛ 4¥çù½õoçeãN¯Ø\{Þ[_®ÌÕÄcñv£ø¢øú±‰…ö/Þj³þ¡´YßÙ.ð7¬ŽñŸïÜça½¬Ì?}\ ž|¬ôu¬™˜A{&Vžý•?,ÝùĽå³\¡æý•ŒúÙaØA¡û°ºð×Ü>J÷jù`éýÙpä­fæïÝýk·²çî.¬ïÁÇòç¯ýº¬Až§çF¿|P¸?Ÿ™[~þÀùßÛ»{kHXo´U]¥ÒbQUF˜~ýx€<¹S)æ?Aˆ¸¾ùìXéážkj†j¶ÁI¾¼—÷‚£€)œÂ" Ö…CÐÔ0UZXl?Ü3áda{¯Ÿ¬¯>:{¾²Õ¶îŽANîõŸø»Û¯ž¬}ä÷­T‡yCXæsñ)'›/ ý(wâz'Ö;è Ÿb­–ë:w ExD(–mÿÖ‹Ê»í~þÙ;»{èÚ³Rã4xß³€™Íƒ•ß:9Šì¯2Â/ÇnLSÍî…2¸^t¾–ƒ§­ÒÁýæ\PýÒ]­ä[íÛ²:"/À}ÜÊ[~Q\úXzöluI…jìåîb¥lÎW–ó;·‰¡oæÁòï-‰µJþQA̹¥ÍZkîœýim/m>í -Í•žmÞ.‚µV Õ‡ƒíw•u«¿8þøâN¥´ý|·2wÆÁ¸¼ ÖÂ{颃à§(À’{xyo÷N1Ÿ¬¯.æÆ>ÝÝÀbñGTvÎëØ“<Ÿ/¼*Ï÷>¡!±G‰eõ¾—Å]|wáSv«¶p¸7…}ïiSægùÎñÖýxæô#M•bOßßß?È]ä+Õv7>nÌm|òA^N±Áýjåpý/ŠÈ=JŒ“ÅúóRnëx5&µÄÃNåþÂCaŸƒTb½%7W þZoÁ‰§¯â+— ³ÊÊÃÛQNÆânû¬qX™¶Ä™,eõåÇ;øA+¿{pv¨²E&nNoû_c‘Òú“³o¤•‘‘Oyã¬Ö¼•—[ÛùÝÁ+vÞ¡¸ÝÒæi³n«p -3l‰Ê—çsÁÅÀÖòêPìy£zg<»)¦ðƒÎR½|Ðy²xɸ½»o>•k_6oNÜ9h’±XôñøÅ[àt3¶o?‚,¦wçVŠåp˜øäþ7¹7_G–æók÷ÞÛÊÝÁYXàƒd:iÇrr9ätÞ š+· -_¿n¯—6/û¥§óóÜÝTûFùVíT†FåþÝÍ[ô䧈ÆϯÕq¬c»w(wó/ï¬ŸÚqsütз6?l¬Žèƒ^ (õ½åŸ•/ŸÙ)ʘc6ÓßÇEi-,ÄÌ?깢ÜuòœÃÛùÒáݳ;¢ÿ¬¿VÙoå–†žÒüüð¸Ñ»ï-~°‹ûAFùâ,´x-ÏïÝëö›gKy£×Ƕè6ko×{ oo—ž=ýô­®~¾1LÆü_8¸èÃ30—ÄòÁÖݤwã½$WOžTöûŸ+ë÷½üN«ó-.†Uëúíåo¿÷ööm´«k¥#WÜGð±)}»_ÖbS©kïdÌ‘1ad½´¿¦lcûîƒÌÜÚºw»$; -p¶Eo·ÑYÝ8ûëóbT™T\cµûÛ…Ö¢½·ñöýÛvéðe¿•þâŒý48ÆŒ{Ò!ʈCíñ ñÍvÁ,ìVÐÕòþbîvépiñ €ù|ûà¨mþPTîé@F#}ßu?ƒ$“ßWÝ{9þü dÁÞ^D»àdýkÖ}úf¨<‰4þòìÁ™ÕË[«/ÎbT$ÖZáÞ*Äü¥ûÍ¥:dIÏ -yÿá&b¼Ûñ Qž˜£Õ¢ ‚]¨ç·ž=©áNð»Èâ™c5©—·ËõwᇕÚˆM–Ê_a‘A§Yþüöø•ò|ñ¨Á_Ä«­_•ÜíU+GpGƒ1Gî¯tÊu±àž/,4½öæËç+Ý/!R|^¹·1Wùë}yñ¡»³ã¾Q8ñíYíñÚÇR8FoÕ]‹Ásmå`ùd­ô©ùîNLÐ"ÅEæÿÔž²Aà¼,¯7K›­â›|'8?Ô ¥½SÁÏo¿؉­¨æ-°uá^¹>¸ÝDì–öÊn´W?ôä÷>*O2G^ì¨*@ÿŸ½÷ÐNXID¿€°ÈQ(!LÎÉ`¶± &Ù`ršÙ™wÎ~ûë–„’à»ûÎî›;פ¦ª»ºººªºª+”x{öØUöa°oüz“«8RÏ}9»\ L ùÆ$ãa÷{‘b­ðB‡ß[C0–IŽõ(v¿òÕx¥¬„ý@%Ât|’‘ÒaK×P¸Q Ô÷d«žXu/ë8‚û~¬€µìk¨•ý´†~Þv g -šJ=.|ôñÆNáÕŠX¸ ÏÆG3!IļUCˆ"½×'„ŒûÅ<? à«gr}îj…Ün½Lîÿ^ïæ0M‚b%NÑžj?dëEgÖÿ^qiŒÅåàg’®O±‡Îó[½P=x #,W>TYŒÄÕÑëý°¾^ÌFÿ‘í¿2Ø÷ªþÃëDgð·Å1èÎì{6áãÛ)Ý.T׫µ65F9Ì\'¼,C{ÔlX´nGSÀ*mô%’K‚Â˳ÕøòLó³[\Gø+Ù_›wÝ°&šëÍå~òøVÿšì®é&œ­^2 Ð`ªÄuƒL±YR—;| -çNŽvëáàPü ø,d_þKCáû”!ÖSåI8¿±¡Ð~¤}ÀvLÌËàÂ/J/c‰%×MÝ‹˜º§/´å«ß ÄÑ\ûׯŒ_Š °~l­˜(–l¸L€ÙIviÌ"(µ˜LƆ–bã0X;“Dž䧼)Éë0€Nøà0iNËáj0[ð#&%fH?q³¿(òÔ†ãlNÁ$<€Î>¦“‡1w;Ðà"8û‡O'«‡ýà_Í«ÉT=@Ùû0ØÃÇbhÿ)·}híYà¯ØÖLJ E`µM¸éfQsà~àÚ3"ï@&üt¦úá°† F“‡Ù6<,ÿy<ƒÍÈVn%ï£)ì^qô¸ÙÏJÃa[n:‚Þ­¿Eô³ýÃq5‡w£Ævyz´›mÎóÚ4ƒÑ²½3¾Uq2-¹;\nÌ.ƒÊl5¿Ì©/“Ÿê`77¼¸¤[ÀåÖ©£×‰:2ÅÕ÷Z·¥~z™øæn¶¼j¢‚kPÇ“L¨DºëjJb2"›‹ÈoR8à<ûN¡§§}×à@øKŸÿ#ŽBOö(Q˜è‹,ø3¹ÄÒÁÍXÌ#Bìßo“áëlòï{ôËËKHhºÜy ûØëÌÀp…¬Ex½  žØõmbpõ@“ü‰X.Åù)•Ð’kÏu2Z/“‘œ‰ñ ppŠKZxžÃG<$‹B2XCjl`Z­Ä”±ËYggƒÿ]QØßÁá,e[Ùlk° V?:»#l¶ŸÏ6C°éMØl7ÚûdÍ–tÓŸÙ$Fx‹;°¿¡({Óýdæ9¿"ŽÄ)JÚDHpäÍ©¯“ø† Höª—R}¤‹‘­Šä¶]4Õø®Z*dä Avob§ -/‰p-qÍrÕ΃µöqš³ç+›ÿþ÷¿âúÊ ˆÛaFgÉl²•lí¿âÿ„Hìž‹8ø`ÝÁ¯Í$ÓýY€¶gðÇ̧“<Ûû¾$^»[øàp°_³_£b ~°_Sd0‡_k\ãæÇ( ¿ŽØ¯Éà3¹œfû1¬ÿ~ƒO®(üÚ4Ùò4éŸÝ°‘ù%o›?‘à“÷ þ:›ží›~ø•íh ƒ¾øöàƒgßæÒ“Ý~mÁ¯¾ìWlë„àO("¦Ãû•KôŒ,Å÷¹ôw7ú_úƒÞL³Ã&fÎ=fŽI”¬ÄÝdÊï«'›Û½-—M¹ @kg7;´†?ÙSÖLùHöX’±Ä$M6–øž¤™™"Y%2ÖÏ0öõŠ¿ü÷¿öu— éÒì‡núÚDñ¥üÓeÌsš“ þe§N^뛟<÷üƒ{(ykÝÒXÌΞ>ûü<.a:Ê=ðx>;µ5‡áìÔúàMñEì-ÃrKê¹’'ϧÚ/É—qÜžÊú-ìýÙö<™Ø<šµ¯ßÝùT‡þJÍÃcobÛž¥$¬$B­>ƒp%ÃÛç0žâç˜{Ìk4]Á,ÇBØ“­Vp%Âx²•ÜMZ£ÿþ×?/•Oì°cx -­Ja>7åg|0Ù˜e'†B/“ýøÎ¥Ø#ùÛC1ËO¼¥èM5RÜjÙ!æ=&ËmË7˜É_OÊzþdëð(=± S‹€m(óõ…ºpy˜ŸKsel‘©'•%¾óI|çƒYŽCÞïîë™TµSN)7—ÿeyø¿ˆÅ…û‹´DÌãÂ/‚dÞ(À³»4‚ÄKØO3?W.w׌¸žÞ·ˆ;r³<ÎÎ+hÁ¯Xg~³äœë ö_úÍ·ð$ö®Ÿ |僼س½F,ÞÌb%ò÷¸º."ÏÃä i«ÒÂÞ[Èëñ׌¼¯½Yä£,÷ƒôžä«ð"Ã×—2~ßX‘ïq¬‚L׃2·cdno‘u Í#ÛÑÛ9x‰‚)ŽfË&U5ÛS»Ù9}o™=é8föím_f¬:ˆ˜I¼º4ÙÌßpÉ|r8Í‘ðªcŽ9æÄ®½5§§/ s®W¦ÌÅnqa®t -5sm\¥Ì/‹ç•¹uxmšÛ€ÓI.Ìæ~雇K€ù;R$̳°´lºæM=XXŽm17vV‹ŠO-®ÙðÍâkÐ N¶ƒ–€ôX‚ËÁÞòøù¶$^~?,™§RÍRh`9KåmµÔ;Ï”¥ùõYÚ—ÃÒ mÌ–A}°³L~KË/Qþ5Ù,«—ôÔ²·'¬æZüÛê𦬞^~jÅ"å_ki-­¡Nk•7ˆ5ÁÖ™ôY«ž·€õÅ»ZßÐpÞÚñ¿Ö­ƒ°åÓú]-O­ó¯ýѺ9äQ9FM6›ýý©bóþ4XÙèCÒc{|²Çl)ì»aËOŸ§¶j9ê²54ak›ï¶Þb¾µg´í·ÿU·m¾GK;2PvÇ|ülGíËbÌ{¸ŽÚ³¤Ód³çéײ½ú>_Ù›voÔþñœÚØŒ²ÿLŸöUæ µ}®7‡}ÿæsø&þwõÚE‘çHÇ‘*¯)G±Ö;êXÜñ6sn½ã´êø¦ÛDzRì;óDÈ?G,Š8Ñïл“Ñagô7xpfs‘wgHEgsÕ°;;ÁÈ9.m*ÎE -£‡TÙìr¤&#—?í©»˜J%æŠ÷ö¨+¿Íì]ut>v½—Òo®¯5RvÍbM€Åµ]n[fëq£öO‹›îf¶îxš» ¤uâ~¶¯îözÒs•¦ãžÏºŸîúÿéq¹~º"¸î{"óГù¾=OÞÌÂóV}ßyæ½Íó[ ¢žƒù…1ټξ%å%rÅ'ï£oýéÍîs3om´·xÛÝ:é}‘Yïr8ó™W͹Ïg‹y|LØ—ô%Ÿ¶o¾òâ{í{ tHßWç­ê›£/SßñçC=©Ï*JÛ‡ 41Ý,hùÕù†¾V­è Ü* ‹Òjá7—ÈG¿ïåeèŽ-úXèùkáéÿh•z~Àˆÿ¶ÞbNgò#[–9 rXéP·`¯?™7løL°À‹ÛŠÎŠÉ†ãO.?m¸¦xq€UñÖš!ð!ž^ã«Bý•°mgI‚ˆ:ÉdûH3Ó­DÆo%Gä0ÀÞ1§%ð˜HÿÎëÓQñq츷ß_Q_¼ŽÆÜcWôi0Eû¯ÖrtS -1o¾¼‹E3Ãnì©ì.ÆúU0û±Ílcû|éy<ö´ëÆk›J=>Èy3ñÝfJøky"ÉŽDÃiCãå|“DzÝy’|Î’Ùqû'ùöóöüu ¦)Çãü7z>.Så ¶KõRyKj³yL¶4úä&ÓI¢K7‡Rú{˜ÍXßã S{ÚgJ5ÍtߦÉÌæ«ÚÈúí±Y6t»²­’ÌÎÜËvÎñö»ÏEüÓPîi2o况Ã>„]Ñ|Àìå‹®'€%ßµªù­Çµ+`¡rº©ïæ…÷i6VXº?Eo³+&]®ßbës”.þ†ò»’ëH<•b‹§ÔhN»¥éë$VvÖ>÷åèGïµ ¬Ä—³CÅܵ+Ñ>‘2Ù* GÒ]™¾~þV]8òZÍRéj³5#ª¿©òäa~¦OI:ûùô°<=-;™ZÍEj™FÔ>ÍGom›;êÄt`©ãc½èž‘î÷ñ9˜[›Ÿk!§Íd{þöЮ§¿Ž½ÄÉ_æå5è¿,ŸZ¥†bo5òþ—a£Wsmšˆ¹ãi›ñÇf=ì¬5ßÖ{ôji¥>ËáÖG#ñÜÚ5#ó×@/Š¿V§±êë·=ûûæJ5(“í-ùóÝzûÚÌo»ïXö.tßkgäýg^µ=_V¦é¶†íî'ü@³ïð´ÿhzÃëeÖUùÄ¿÷îÏ2ùÓû÷†±Ž+:B:iÛì£Ónb]¤‹ÚM¶nä)<춞•îº¹`zÔ€¶ôjÈÇwoƸ[}´ÕÊö‹NœéÞ§ž/U<~¥Wøü«÷y ¬ÅagO¼¾ >õÆàX¬?#/õúðuüZîÜ×Qðéðj²{üs´.cÚûó;~a»ñòõÓ5¡JX`R~¤&‹täå›,lGßµ·÷ã÷ü;AþYü©5ìýŸù~LÉçUdZ÷/_§‹ùn7£:®Èì¹þœ­ž*@ûü¥ë£âo£ãYþn~ŠÑyȾÏ_3If¾ÿÝ Ùçà¢}Ä'Kóû2¶L<6–Ë‘+­Îc•uàÕÈE×^=¬Kòm=Æ7V³lêþ×fíAJ&Û6ø lߊó!ÑÉ.v_w}7“ß»lß!Ù¹ô™½*NK/÷RÜÛ³¬NWSáÒ[ÂVkñ’+èÒ‰•¿uŽad—Æ[ç¾´3¯E±¤ù#–é‹ôî1¶)wDäåNÒR²KǤwQq­…òƒÕ˜?Ý2v¨$» ^¡£3Ù5U^X´ÖAeñ²7*)ñâg÷øhá¼­ª›GJ+®™abqÍ/SK>TîW—Çzƒsi³Ù¡ÜÍÒÚ.#؆?$á¥8¡æÕƒí$÷2!ÍVÒë5™É7ÙøaøŸ‡Ìnö/¶´¶Žëþ^¼rPÕÃ=RôD»Ñô‚ã‘mÄÞYfÈÏ -½f²¾\ìÐåz¬ÛûÝ]ï~PÝÎómþ%ñ¿«·bkœ`]l÷/ž³6 ½#®Íhµ×#)hsúˆÕ8îg9G÷§"˜:m†ð ãB›ÑNï”ô{u@Ç Ù”¨¶Ù‡§Q©]löèB¼Pµ/{tȺ4u›¬&?ñÎ2F£õêÀÖnÐi³ÀGì)ŠnHh·ŸÆ“äVFÕVðjx8É,½–k¹w0—k;¼t¤Ííœk6¤æâÞ©h¦z†4fã$—àj5d'vÈßý¬wxÅ6”0°.ÀÁ~8;,:6åÚìÎ/PUݾGlTÛ^&¼×o)h÷C¶ -°î–¸ÞAð¡`Ão @Oå»Ùû?U[±†„–†z¸l.ë|;ý€Ýk'+xÿ§±ÕÃmÎìògÓÈoÀ”`Etý3f¶)XÐP—ë‚ê]‡g§3ÝÈ ¶ÙNR+ú’âã†B\‚úŠ´°š.ŠYcADh»“©¹—ZKÅ„jìÛ| ãLä½6ÐXl—ÛJzm µB¸ihz›Ý÷z¥·pYýêüªfµv@úÉ#õˆa Sì”ÂE=.´ü1"† ÅI¡ÃÙe´êí¸ è jlõªª‚œöÛè{Iͪ\¨ãhù=Ù'6\¦êÉSsI¨Áµ%_°Õ³Ùj¾Ø€24'Q(ïE½Ou‰Í1t°8€-€0Ô?k}F&iO€ôÙHKzè'ÑïÝd{3/¶ç:CÄ+£ºö¤½OV{!R‹R•Æ²Á®~NÂûRcRÚØYß­G€ë¸bõ—f »ä%›ò!«Ùw2ú¦=~%íOlC^Õ7ÖB¥3:ã$|¦¶Ê¥#U+)¡ùl-é@ÆN"ÌH70¶Ó’ˆ¥KkI–-¾Dr¯ëCǼÔI ÀêíÉb±þ÷Ef'$Ì~yaÈɯ–iÀ·}\GÁWÒ]6T#œ+Èü‚Œ!®£ûl/n:—D !“GD¯œ»ŒÈuR1©)θ¸åè{"¤xä1šFÄ;¡mþ+9Øø€I¹Dº$`®ï5iŒòU}¡Rf1¸Q\·­¢v59àKŒ„_%o 9õ¦­…j%«F¤…Í(Ûb2Òã(s‰®Ò30éº68S†âº=C ‹Eâ.'eÔ»´ùcÊÍ_á’NŸtñâjþKXK”ðȹ"JkËëXC\}kxtuzgbC»¥OT~=±À㉿ý˜ßSu{âÓ ?Ôãs˜^< ŸØ2Þ<¤2ß¡ü¼`y‰2ßX;&¼%<ÑzŠ¸ÈBñù/&â‰Í×ÓGñNgàÕ×7ŠxŽáâ­¾gV%0´ídÑ´ë™Úû*è\fNÅk_12$ƒô½ü`oŸg3¶Å·X¡?I›l»],:Lz7O¥D9´ ohnýA½fw,ó‘k7sÑdt„»“ÌŠÇBZŸ=iŸûà«ÐZÃå„’•Þƒ¢lTÙïv‘} ñ1?Õà†!ölÌ^‰ÞznÇÆvœÅ\ÁîºØþÀ=± ¤©sàhgÕ‘R®Žç‘øQ©9×£L6Kk³¨¨Ë¥Ê ¤´ÅºÚ¹¢HÛ=,÷ýÔ‘²•a´yäÑŽ—úMU¤ùÑÔ$/ñk~±H/³ò9}œÜ9Æ*­ë|Vmòs»Rj}ÆJ,Å#­; -¤À²¿‘ŠœÌ¡íïºÓUSib@39+®Š´ÿzÑBZ0Ù¬¤3ÒQë#ÒÝ[¦“u¤ÏiWlk]VÔz"‹pLD -æEÎJîøG¢¦Ž”j·±\{REjÎý0Ö—%QSCj²a¹n7§1VÚb›¯ªi-¤,ïýzUGšÇ’Ž‰“i³HM6%oœGÚö9Ž?QQž¼ÙÎ<'CúñˆU‘ºHM¶½¹0YÓ/Ð2%ÿV>?Hi 3çzZH3XÕÝ ±HÙ[£äc-nÉßÝÓ‹*ÒFÄAj"-O$¦†J~êÓ‡5ú.³ÚX÷æraòôùárª"}u¬~4‘6¦Ï_C©Év>ÖÏ<öZÞ<ª#­¶V.ñUGº)™Õ™ Ѿöóæƒ?kØ[¼œQGZeû½çnWi·6/²Háþr>Ößv`œÓ@Ú bÝý§Žôéw³¬…‚¤)À¢í}+Mïl ¢´Ý²³eIiðÉgF]cmx«\4Ç>Óç‘I—bѸ>*7‹”pÄœùH+Ø—;œ„H½"R€¢`·'¡Ý)‘î×ö(ô÷(FŠtŸ.iªå‚л۷bÀТçR©ècÇ -¦g¢°`¦9¤q¼ìSBï†zâvÒN—Y¤ ÖºÛ †+ˆS Ýí’“õ‰Kˆé>ðæwšxøU×¼ž|5M¼þ0ôiy§ --{oÖ|Û~Æ—¯Zo§XáËvßžI~ z3v_ƒ9°{Ò§~ýNÅ[:ˆ÷›üÛýÓ¼üù²-àÛ oŽæúNô¤Öû'î“LŽ+´0Óˆ¯j ó· ÿ ðYñf^ÒðÏk¿ Ö'#x|ƒ—ÔIòíÌ„#Z÷ñòØ92},f!à‡¥%»6 ¥#YþjpåvìûˆV³àû~ðYü³èФ“9»;~¡>™¸Ý™M6-kéh ¥-ÐÎùTGJµ?4‘‚MäWècÒ±²–Ž&R¸å´Ž¥H©°‘%hƒO©†éØn·ˆHYí_@J*È µa¤ù… ©«ÍZ¯R´2G M¤¬ö¯؃@ûï‰HÁXdcíj"ÞSÚH¡ö¯‰ÔdƒúÿT}¬ª‡´âÐDÊê"R¸öeh¡NÑ”Íê$tBÏ~â'•þ/´ë—+éÚ×hI[¶½ì{íb»À”ç;^Z¤À˜;I^Zž-Ý/çRçEâ ‰åŽ;^¸Ø ÅŠ÷Ï,a¯ø'¶qŽ›¼±egïÇ6®ÇÑÉ‚ˆ… -Ö_¶±Pþ3× 1“¢hâÑDz6þ·ºæ°*ð  [‚þ€ÁE7\#…÷ ˆ½”:ÉØ„?/R™÷™Õ„ƈ%/îW)Îû”@—[uðÀÚ£ûDNoçűdu»œ€‚Ç t+l6ödÈ7¹•¤Ö©y¨¨è”´Ký£°nÕK8â˜Ä¦p²$Ò²{L•/þá;Ïó*ãs šã3ÙIJ4gð4 óåù³ãsó<¦6B¨¼¶tˆe|þÖ,r–…AbéÃÝ©ßœ&(“v?+⻊³D¾’íÈgå;Ûë)¯Jw Ü|ðœ|7å‰ÔG¨¤Ow“6±ä¢Çu.zzY¹è!5Eéëf;Å”€B—e´s¢Gv=XAñD`þx³^îO;|¥N»¶ÑÛZ«’õÇ©­m¾~hÒ]ŒmV/‘:_¶ó§ ªÉx£’îb’QMꨟý31šX^×W HMÂÞæÜ»„¶Â2”òù—Ë:÷žÑ˜&ïX¶œŸÿFÂ`Ú»ôt퉞8GÂɬSGn˜(–î’S÷ùº䌮;ýUöÊùý¨;—ÜÛ½ðϧGrHqÆ@2:³eµé“N(ü&TtDŸóŸ Ïy£ö,tIÒ/v,‡¼jÏbùá^k lrhùÏ´°ó)-¾ªç|JÆùKZ˜QÑ3îM6ÍÉ€Î(6ÚÌçAs[2Ù®™ß<¤IázíImíór9­B¬êZÜxuºtˆ—4÷ÊÚ ß#*è’¶Bwš:“ÍØ +_W±¸¤óËfpeÓU,®˜¿|})‚â8ù`•~Ui˜|C¹¶_§^X[߈¹fR­înŠõwH1¹D»²_¹æ‹Ù®‡ØþFíXvþúSP3µZÕ šH½O‘ rL¢`«¯ÊCÜüg«2õ¾µ^g(sç±g3Y€G&‘6пž:m³Ý¨ñ!è–JêÄö¶|Ñ ®BAu½\ž¦Ø^ßÄSt„çäó®\†:¢Ð-o£É…e/ég#{4¶¨Ÿt]^a“s‡’ò #!¶‡èġ >!Ïg¯@ áÔš ¢£Ã¨ŠRÔW;L¶k:e¹QÈ¥%\r݃M[6*Š¢0jïkÏa€ä&cD—é -—ýJM^ôõýá¡ÞÛ_0Uæ€g»û¼(d±pª††MxJåOþÄJXÆ—¸¦ÙÃZI€XW.q±„%Îþ‚´†æ~ù/Á±È—¸ªÕ}Ù»¸ÖlÌC¢çK()]²ÊÞè¹d’eI®ÁkÅ—]²`h’…ÄÏþÕn’ŒK¨uoV’²+¥£|[¾Á½ø`K°b#UÎfËø\)öT ¿É¦ç¥[–àánû.¿$Ëe_ŸBhøk uhCœ,‘›2OÃF¦J'ŽJUð¶3‘—É”iHå²R•¾†vœ>ÆöǦߣþ2Þb -ŽØbWm„e…&|Ûz ?»ô‡v™ÏËâæ'ì/7x£7e徧5 “M‡ÓïÈ7½[@¼e ˜.̹1Âô/8éMŠ­NK—ÔQlt—ö!©.ËE²ÕÁÃ*‡4~Ž -<3 š«NÂÉiÐô:Ÿ÷ù˜ßj»üTÔð$¦åoUó¶r–…–¿»bñ©ÛK`јlwR°³¦¿å™ Ñ’×õ†?çàÜ»9(‚5)B9Éäkà\¿ï ö¾ -0Ù áu›¨ü|ÐÁj^§\ãL³aªrÂfƒOM¶ËËÐÀvèÕg|JŒåt"¥Dý oe»˜R¢íç®3‰¶Ÿ+ð H4UI&±½W¢µD‰v²^¯Ñà•À.K4“Á$ìv‰&¬Êüëú$˜55‰võÚp®—hg¾ Îý B¹ÿì•…£säM9…S¿É¦¦ È6¡×µž-=:T×Q(ï‹<ÞØ·ú…+Ë ,‹;sèô3èX}ìr, Y'ìîÈ©iÛÚ1ðÚ™@Š`]Rõôf.n»åKå6òÍÁ°¥ö«â0êéýÌÈwûë¦NrÆ—QlÜL§ˆ[Æ®ò\QawI›üN^/9Qäg|zÀôã°Œõõ]Êœ3<>…çê|½'ºÿú.id>^ð\éuI-eŽåª¤9C²&«c{®K :\ -ÂÅ©ƒ\ï6Ör³7ƒÝí¯jû,úC3Lv“GB^ëd9Ìù½c.ÙMëØFn%]JvÓ¶Oõ$Ò2« "3M/™!YE6ƒ,SØ0y~~b3$¶—2ɬAî*£—]•ZfïÔ¡¼*Å”Í}«Ì:¼lÛb©e úعëì’ãpÜ(Ü$à·-Õ ÙN¬òšj—f˜DSRæ]T» çñ/ÅÀ_‘Ç7¼”ÿb‘9­´SÓ´“`ôUéóxGtjÑêTB-ES{þ.ÆÀŽ"çåLÕù3šÇÜ]ʉÑcyt:ög¢;ñäC+3å`—9Þ8ÅäÖ;)v1MÔø E‰vÅäŽ_"õÞöÉ -ŠÀz•L.cºì™Ï÷ÜÌ–ú‹ºßR?_NBÀÜ,ß‘U@|=þùÒ]ÝÆž`ñ]0ö~ -†=-ÊÅ@\º̳p«†±T¹›f¨]Þ_N*ú²€)n— &]—4ÌJÓ0âÎØ^/GÎt!ÍÙÀ‘'; ý+OLgæ•ŽÞŸ…ò;3$—œŒhqòoñ:÷ŽŠ©ÄiJäΤŽvFÔAu7¿A+]ñâz×ÔÇ~‹×¹w´Óì”D7ÓizÁÓ`R˜Ú,p¥GFÖ%Y>2èqûC§KòÅ|yÓ¡e´KúÑé—“âôº¤¼»Uø¹”¤¿ðÈ”XÌQj@¶ðÈðg|Òs¬aÔ~GFbï—î÷ÈNèŽ+ÒÐnñÈœe Þï‘ih -ŒVFê¥ü<ê*ŒªŸ¿d =ÇXrLÑ î2' ߃¥:0¹²\•eí¸q#Ê2oy,˜A?'qSþ›H8/ágÇß8uÀÐÂÎ 1½FÒÐn `—î/0LÛ»tEúØYè‚j¶à¥¼º«ƒfÏ#TÙ¼:ƒñzºyu’ÔQLáËNвî%U’Õ+Ñ-uCõêçw‘Âg7ºSλV`ÒßäÃA,S§Ÿwýýc·äéEA×—wGžÅùpzª—½Öw®@ùp*7‚j&qÝž'‹†:ýÆñ×ùpÊ{G¹Œ¸¿Î‡»xKÀŸäÃÉN¬ „ZÞ–§´Å´Žu`&Ûý™õpƒû³˜HJ©¥[‰‰|]Š‰¼´ö÷sò^5 ÍHÜŸÎÂñ^š}ƒpŒä‘hBáô1ÎdrE2èÄÀ_–h0¹NÛ!vï,©e£ñìغÏ"žÛ ¡X„šÞž÷×{–¡˜|$ñ*Ü» 0ÝkeÔä˜æ2loŒ.CmÒû:{Q•Ñþæ6`ÎuËG#Àù“DÈŒßØ.vŽö•À·ii…YŸ_ |ñ64¹WZq[£Ë{îÂÉgú;]4¨…ŒTÜ|k€ˆdÌZ ß”‘:0÷ $‘ÌH˜‡F\Rýþ$#µ³ý›ŒTç/2Ra¾Øý©Ê_d¤B8Æ®V˜Äjq}ìѾ4õê #—Ÿ}ù2|¿{*RáÔåØ_§Â±ñüº=‘ -§:/ž -w»ßRN1}Ûý -»òŽT8éDl2Ü?’ -§âUøRáÔýcí³¶žb(Òû“õŸ¦š±ªFn„—ëciô‚Yd4Ð ‚ -ò(p C`Ú7Û]©Ãœ]2|íá‚$½mðGïv^ ÊÕ¶<Ëåäfe^]Gó:åæpòŽªlâú…Uã¼jøø9`K\ÆjÓüâuÐÏXÆÇl.dMôrÍX=›ð@òçšq¦Í– Ï|dw‰dn–Ò)t”N§üeX„ ±9mG¶…¼Ë¼ÇIž‹¥–u­$>GéS;ï,ø®KÙKžìÕªRç³i`ê¶="k­ ;ªý®—ì6ök"ÅrÍ”^†­6«´~é ÍûB¤Ê\¬°g/ñÂ)“ݨ÷iE¨L¨H3;õ’ÝpTT^/²ÔÊ°£-–-}ìh%»}êe-õ3ìÖͦ&R{e2k!è×ã{~×Fš}úÌk’׺"#}-¤Ïò ;vVÁ‚åGÍ~âùãüt¡ˆœæøÔê¾]*6bt|—k &ú¥:#Š»Ôî¨g|½ä'Ú…ˆ4Ã] Ó÷ôÞ’Mw›æÚl:5;àT‹óï²é Þsg6šOP¹^îϦSË¥»5óQ;›NͯiO6Œ,üšU½ì®l:5Pn¹!›îÆùÊl:µsa¯ü³l:µ\:©½ÿ7Ùtj¹tc{®È¦SóµŸ*°ÿ]6Ú첞Þ?ͦSSn¤±£“M§–K§qÛüÙtç]šZ´5¥[³éÔ”S“í¯³éÔæO%êÎl:%¨‹5…oʦÓÒ-ÿ6›Î8ÅîɦS€Rž‰ÿQ6ÝM»:›N7ÇêϲéÔs«ÿ:›N ÀòÇÙtj§%Šø?ȦSrëõ/²é.œŒüQ6Ýåýå/²éÔˆ!jã•Mw)“ëo²éÔré4ëñÝoúDPV_쪫›´«x©TÖæ0˜ø´½°ØeħÖZµln¯WwÖ¥<åùëzuÚÚ…1:<Ž«è$RI s2/*Y@–  ‘õ¬Õ)E—ŒŠÕåäS7u R tꪲËz]R¤Ð”0:tÒ)»¬!2á.&·ˆâxi¯°ˆHkhs¡°¹¾gN¨–¥Wèîî2w’{® ªä·”¹Ó¬.W6”«d°ÌV&—±D:CúñÉb¡»ûæ*ßÞ©2£ë¥2Tæî¢Gæî2w¼£_èîî2w\îÛ…BwÆ6å?¸çŠŒ·pýI4žgQþ³¥MYT¹oÎåC‹ºŒò§æ),Pw1öðÂ4:h<ëzà %Ò‰h6]Î0Ôâ0œ_°è„^D©£éú“s²± -[³Å¡Ì'‚—¦jŽYín(­óž|}ycb—, -0Õ…xpÃÑPÔÅø1ÃÑP˜±ˆnýÀfVöýIæãýG!°¢ Îuàüì„c¨¶«IdWã/V å,“]5Sør.; ÌPb­V ebmcužXÛXýÝ­€ØŸ2fy ôÖˆ0“î]š¤lª‘òb½W½j÷ù‘.ÌÄ; ÖµÄµb¨'ûùŸd¦7_¯Iœƒªÿª‚!xQ×>"6¼ö[WªÖ:}ƒ…×îV'8(zQWÀùƒ[88÷V«æ œ¡Ú ‡×Ū¶ $2\uÂëò¨,ÃW‰ †<ðwW¸;åWjÕ¸»aªWÜZ·úº -wz™w,ãñîþ¤RÞÅ|"c•òîÍ'*åÝ¿ u*ÜÉó’Œä‡ÜRáN¯Þ+¬qw}…;£·šÃì§ûk;[QÍѲ^ 'Ö`—Õ“E‡«Mw[b­2ó1p¯ÿæVUÓ¡¯»çŠ…sƒÜ<»#Âù“|Î*fÌ»G;V‘ÄdºtÍ[.ïšüvµ$&é©(Þ³ev^˜~­SÝ7ƒiLF’˜ÑžÒ•ìbFҘ䃼à;A ó¢™ÆvÊP×5Û…UvY•F’˜Ñ•Rù¾Õ®|¿*‰I+‚ÖNÔÙi¯S ßùÞ;nåW(†*—%¾·¹‘ãšFµoƒö˵é®*÷È’R[kÿÝÕTmöôír\ÛšWS]¯Ã ÷W•{¼P)ÏcŽ«d} -a²ž/縂.ÎzÖËqå=@p"*Œ:¾“ê3Þ -ÑffŽ§SþÒ[Æ2)5L¶LÜÓhF×_|Ê×Ùì¾Ü{'7&1s†ÛxX×®ÄwÌ’%á=Å_¤Heùp&ÛÞòÚ®K]Uò:láôg[#Î¥„·;~…q¹LV¤áan­Ü?Úbe^\]­$¼Ž&R0snCjŽË[>ZšHÅ!ú£U‡Í%"2¹Dׄ©<5mï`ìbAR‘åèrÆ?jHM6H`eÍ9YÞ@™û'%où±®”¶Ø¨§Ì—èƒUfÄõuæ­´6Òü³åC )[÷-X¥V*‘¾èÕ,¿j#Íf[9Yd@k…ï½Â'> óèŽú峯юLcší¤ù•Ø—;œ4Ñ^²â6 Æܦ”J§pXÃ{{ä›gZÇO,ltÃ&Q.ö4HVÅìrऽÀŽ*›.zH´S’ÎC«4»9Y»Si#©M—›öU™…uè^¨ÌbÔ“”Ñ­Òœº³Ê,Aãš4½¬;ÅÍ“wd¥]ˆÐä¨d2ÆOŠC¯kÇ'x­aÞÝÕU5ºt¥¥\/†‰~U”–ɦ×)m?ñu]ÒR;N‹ïÏYl¬B\e;1·üð:{^3å6SÀ.¸úú‚¶—ý«ËÛ>ÄØ ‡²‘tÝËFOyzÙ{n¢sÏ®Œ»)ÙMýÈúª{­{Ù=Ëò[4aབྷЪݧ™/vÉj9¿+NÇR÷ɃFTŽX¹«êhK˜ÜŸÙȃœRÂÜzêÍ%Üi­cöÄêrù:YÏ”~þË.;¶Ÿ¦W…Úž̃»ëõÚOŽè»öáàu‰dgõ,î(˦ŸÉtUŽUèª{$]Rä¿Œóz¾ã‹Ú¸¬K’P}þ´Z²j¯Lœ[ ¤rJï¹ÒI¼TÒøÂü‰'ïãüåDÃÌ ¨k¬Zeæ -`—ªè8”Ùµ:À»Ê}»˜Ëc|ò“Ë;)v±žÎU«P `géÂjÚ!O±³æ¾‡D+AÌP Ntº,@£9€çþäk²æJo8¼> Ðh ëµ¾9 PÆ*:¦2öº,@£9€b·gŠôÔ—ò«k³æ -6òMY€]:Ë”žWrý9ÕýEùŒWd»§(Ÿd,ÿ`Q¾3¯Â?R”ïRE¶¿)ÊÇåŒè+(÷å3ÙT´Â?/Êw^ùŸ(ʧ]ù/‹òª_yOQ>©WvŠÖìO¢K©ÁÚUýôwC¬ëgèn¨»ëúI†öwCiÕõ».NéÖº~úUýnºJ¥®Ÿ¾WHÝ¿¾®Ÿ:óéÞ uC]¿Ëœüuýô#CÏÕuý.erý‘CW·ªŸÉv•CW³®Ÿþо‹›ëúÉ:rVÕï† - ªuýô¤¡zK]?ÕtD½[ÍÆp¦¬ê]Ð7ÔõÓ¿ùK8¿³®ŸîF—fw±?¨ë§ï¾ê*º~ú¦®jô uýÔÒ$Å¥w_=¾?Èy¿ª®Ÿ>èçÿ‹º~ú*&ÃpîI|Wf¤ÞZ×OEÕ”Tõ“VgÀî¨ë§X†˜¼ªŸìή«ÓS0¡®ßż×?©ë§_ÕOàä;ëúé\K2Rïªë'æo©ñ¢âž«›ëúéÕ`ÿ ®ŸÎZÛÏÉ?ªÇçÖ‡b¸ß…rr†ëñÝU×O€¢º|®Íæ8«ë§“÷p1Úvrm]?}MÞxðuý´öð×ó“ÄÛò· ¨ó§“ÄKËðR]?ýófyÁíuýäÔVZ‹·Öã».HC»ß,¡ªßýõøŒ$1]º½ág¸F0Ÿ -±VcEs®ÿèsC‘»i)[tCÏ-·Ó·t9RÛVøyJZ¶Çtc|úJØÁHÁ^­m_ÛyûÓdc(5 -VsïhÝ!JžúJ½Ì[ñq£J¿M›“§ÀöÕ9ù¶¾%]Tæ×Ü|)ÏËÇ÷õ$î\mûÌÖ¶K¬è'äí)î°’Î*ýPrô¼µPÖ“<~á6w2Q)©‹%îÁç…´"šce3ǤnyýhƬ«?g'¨Ÿ£e1FÆ0“´tJEŽÞ õãÕª+6'IæšMfŒY{¿¾–«ìÅòC«§%Is¢¿U24 ÖÔè£mé£É–ùÈMÞÙšénþå~JÍ ÿá±”ðïÇ‘\È2¯gßdmË/^ß;É œ×í ,W>Ó‰{æ Lel÷‘ -²cG•\®!''Ëoo}Oöõ½?×(LÚõrf},ÐÞ±–æ?8a4BÿÀIbuœ>áNÖw (¬ÀWÆÍfýSÜ€¯Q/+a,°‹}îÀƒ4zúaΟËÕ [À<¯í˜sŠEÜë˜öO-»¤/B‡ðÂ#}QñŒL6á•OúªÇL„~é‹MúGxK^äS[˜]ðä–>k9‡lcvöŸ¼ÒW?Ôøç eëâkƒ[‚/ør$|I´žã…ø üú,…=üñ@Ê>{¹&#+ÎÅ€(„ì•ÂG¾(ùaÞÒÅ‹lÏ<ØÑs‹ “Z-Ú˜[ÌnKVÂ壠öß”…pÅKx¿¤è;Y}W2å"ÒYR8HË W›ÜàL®BîQ àä[!>W¢ÄTàP·NòÝàO²q´Î²ã:G…³ÜËqòÑ=öéÙÀcþv<±W“’ =gF§ {ó±$2Ïi¸¾ùOlÿ`»°6ÛΫ»7^»XÃÏ$÷I¾óÉÏ0í²e/¬J½eÏ.z@1aÙ‡»µµ3û–ª–R®ÅæØÓ…TC›çË^Y5×Áq ;doXu†Q_Ÿ|J`Ûòp,’zïí1ÿÜŒúg溴†– s¢ûìh¾ ±‹cfÝ…à+åb³tñl'¿†=€ãcp{YÒ¿xÅØõR@YµFŽ ¬!ç{(4” ~ —HÄ.qo€•ê„¡›[Ü‹­¾„ÕËÞØ×7m -Oùõt*¸¼Ê¨tíÿDý™ÒãÃü± -††å¸Š€ÀO±öåäz')x^7IKí 0¢:Á²ó™3íl=5R9%"Û €i|9@eãYv©@eŸùÀ³à‘kl˵‹}†œ{@]€ÍßwçQª\bcÛ*³ÛE×néÞÌr~ôU…­³@8CmRT¦¸}Ñ–²fNFvˆ%å—€Àsïy\Ðá MÐ%ܘœìžäŸÅZY–Cý3o8ÆòôéÙëöô¬½óÏj+i}|üÊõ]Ÿe“ ؾOe÷ÃQS.xC‹ ÃâÕÈéfˆ…/ó¼h=IUV¶@-P3 Tå¯B0ÙÜŸ;rxÞ“ã*ÃŽžß’pÊ`çî9HÑ5õ¢Å§ÂÂ…Oâ?˜LIbKÕqêIDüÈ*E³õÓÎûͪVT%âyÌó˜Ù7Nqq…OÔ™ ˆ¯“j%NZP¦†Ö—Ø詼²Ösá+z`md•~³Hù‰hkOD<\?¨H> ¼>¦6ü),"ŒK@$Þ܃Ô§ €;?'óCW¡Ã ü xÆúÀiãç ØÛ»îëí8‘R¬'~FL­°_u6@6Þ:š„b:Œ…µÇÄÎuž«œ.ÞÂò²$zR_Té0-ˆFæ -÷Y‹8*_H‰¨¸µ¿•´ÛƒëÔ©_Ü£rw σ>-ýú;a¤D­PQùye/—È1e¤_±UPúµâ‰H¿ö˜¨ôëO4&ípÅ’F@•6,}ßC¥À€Vû(ýº KaýV -(¹Ò^èJB6/@ëMJ¾{¶ôë'ÌkOÀ” Rm¼ÈÒÓ€´>hÆüÃF ”cÀŒù‡˜ù̘؈­¤ÒˆcfÌ?lĘl¬ó1€Çî‚ḧ«RàßΈ1qfŒšwäÀÉg¶†ãóÛá8OfCuÅs|mâæ¦Äm¸ùeø&<ø êƒñÚ8ËX JAÈ';ñp[†§Â7‡ -žáߧ‡]fÂjò±œÃ®5èo|çG•/»Ø€>·øÔO]E z0Ÿùc»ÓÙP÷)'Ô€Plìt†yÇÂì0œx¶~<=K°ë»Kíe äPAÖtÁX‡óÔ¼ʱ{ÎÉ”¨áB“Ç*eóQ÷É@zò° -–h9üϘ‰ ‘‡ E1þ—ãb²«íf?³Õƒ×1ù“Eo­ÆëÜn2iNþÇ!³—“Õá!üàO6ÒÅb0™ŒÖãÉ{¸øb$W$pØùsC©‹Uv Èqfæ;”Ÿ,/ÑAækÇ$Ǭ1á" QÄçw¼˜lÐïùˆØ&xñNðkŽSï8g«ªï L)í¶d&»Ô1ë©VÞ뉵‹av Là4ç 0¼anú™úz"L9÷‚¯#»7ðþ5™7[â…UqÚ#è`G\OÆ+ì5PQk&èG¼®D>-!žgóâ¡OðEñ%É1â­¾÷ÖÄþ`”-ÂÃÛØi<Â3N®/ˆýúšåeçÏòOŒ5dø½ZÛðׂµíg¿ÂÅâä?ýN /¸øuâØÂ+Í þkØéã× +r¡6ÁƒÊÚádº1‘oÁ"8„NθÄÒĢɋ5=½Hû$n—H}´â§WE¿ø‚´F~’§Š57s°ÄgRÌù´Wâ–ìIqç‹(¹n°x;Ö kð÷^¼àìW2ÞBÀ×zB„ÝçÝõ»–Ý@œ¤XnƒÇ AVE©Á_S[¯ù¡ðò[+øÚbÁº¹Éñ×?Iµ1‡ûSÓ#ÙŸ8ûµ]ñ H¿NXXŽÿËøöðÏÊÑÊ=f©_‰W˜ósbJ_'!&r„@Wi¢<.hÓ0ÄÓ,DW)ø -æs Ǥ™)Ž£¿šÚ︰õìÖc²ñÎÃEß³W{@ CHÙkXó±{¯P [~ží‡ï>¬]àÓ'Îo)à  0WÃ<ÄŸ:W$«Òಇkû‘“c%ø'έ}ïvSS_ö‚\¹zg„k_¶7þ#;£É¦Øÿ‘ÑdSìÿÈÎ(¿R˜õŸªèIOÊå -;Ê°›Œ'ÚÈŽaØž†Ïj·{,¿Iœ^éæ’9½Ë–>VO¾lJÇa}ËúæN®<ûQ:óÎEÛKÁ;×:sïQíºÔ½Xç”Èâ'€;Žlp ø0@V§æ_®ï \Ë9Ô ,½ ò´‹6غùgs³Î_@PEÇ2·$Çýw¸!XùÜñÔÏ è‚5ŸÜCŸ”SÍevî0C×'ÇSûCt<‰—Ž -Ç+C r ¸ÌØ;3/:̼‡ôª#HåªÙS®ÿíJ®,è=Î.ÅQw"Ó`²ÉÇê}œ¬RÑ•‚ÕªZ3éàîÍ“÷»TV»JsÞs}$¡éÔÞ4 îzR²34  bÌý* º -Þ—’\N±Ž²¥ -mÕ Š£×uT#H¯FéY+dCÕJ~q±§êbÝ,|§š)aJÚ]AÀ¥¡bìçwá®Zƒ*9ÐaømôŸTÉOÒòŸUÉ!Å€Rþ«äÿTɹËL‚ÿ°JçEC…þC•\*aþ9•`‘œçÿS*9ä1 ” *yJœ2n¥òJ0°É¹½–[s‰]ÌžS°Ì¿ PM…ygßú%Ç÷ð€Ù±ÎXî|^×,sÆ6(~5…ÛÓjJøØ˸áZûŠñ+ïëÔ^Z€¥÷)OÒÒ_¾{‰Ž ;Û…T–4tßúU<·Ïyä‰óÖr‡Í=f" D ˜×BúkžC ºàcŸµ8œ­.Á”‚>z”W÷ó Tª'=xÿ?c¦ RÇûÙÕXê -2ÙlàIcr8n`ƒ@?5ù™­*ƒÿLv&üÀØá_ò Áÿø€+C““mú@¹*+“­ïOî™Ùè0[¯»ÿ<„á£÷j¥UÌ<„¸¶}Ð6òàÁú 5xå‚î§>è` Lš°‡÷ƒ?Iøe>ÔLÊP!ŒxÀPš R$Î~ÀÁ øÂðÍõüp`:u|ùøR~Á£?PÕ‡Ï.ö0†^LŒAL QŠÀ¨¥ '…/ø'pðAh¨ø*6ýÖxu°Ÿ³ŸÞ£àØnûØÃûb²Ÿ>¼#à#þàìöàWïø*=Ø&ûÙ`õàoþg3áž~’D÷Áߘý—àÏ þ*xW?}Ÿ_N&ÿš&/ùÔƒ?Ý[ƒ4ÄÐôCeÄE¢Xä¿à§wx¥ðPèŸd?Æq%Bêô‹ÓWáL” œˆø.åwƒÿHû„R´†dÀ¯!Èé;.6!‚ ÇLH²Î`¸ÜWÆiü Ь—ÒÌ<‰‹„VÇ£{zŒÖËÍú6ÏýtLìåz<‘Èß«w n8T÷ŒàWl ¸Ñmak:‚¹}áÇðöÄ`v (-Q/<#IL˜(,ušÕÜÁŠC‚Rì/& >"ÌAŒø §À'HÂøð ,¯ ‰Rž ±Kèb">á t§^‰­„Ñœ /múæv·¼ ÈÎ!€,€ªÿWc/° ϬüðN%Tž‘`"lŠJÂí&ˆc`CÇÁª ñ ”ö@v``³ž‘`ˤ Œç᜾K( <‚»5ECqÏCaÅ/$E\¸'ó=[ 9A:š7ü_F‡½ÀßH°¯ƒ}œ5ƒ¸a‡‚ñQE|DÒìfL‚g§ -g°*¦©éÍ´2=›N¦ÅüãÏ­w“ÙϪ6üŒ@J| ^¨ã2x€ÛùÏ>lz(P,ù À~b˜ŽÍÝ`µÿ^ï–àgLˆŠ$Àƒ_ˆ€$0 ïQ$·tÈ=ìÀ`Wƒ Øö !çN¢Ö{L < -Ú(ܲŸ¢8{&”/ó¿T¼\%Â{t ãmVžäþwƒKôûЙKÏwUjK8Éàp³°ʶOOÖÙwÚèç‡þ`ÜÃÜc6<7Ù}_¹5F<;gÉf¹rH͉Д]Ū-¼Ï~³øØgæAvX}e~¥¸+ì Sþ·á½Sø°W ™IgþY¥Z\âä+ x¦ÖÞæÒßq2‡¸‹#¬0` -´eë  Í¿•c^¾Å"èÇRß…ýÓo4ÉÆu½þéšIĶ]×$çz&’‰mª—¡bØ[!~wÎRX0ŒE&/¿>¢»ï#ÙqðÀ<ÎÖÙÈ÷"?K>½9Qf]u ؈ ð6„R‡ïE'ë©tHmk'’•Ô†"YCu»»‘˸Æ5¬L`9·+O'"ÏùN6êI±÷>ÀüHÒ6Z²·ª“à™óXªÖÇRüÛ§3½É–¢=™K"‡MæE/wº9©‡ÃØwú7MZC+VÊã!âË]q°K‡—,iôJÖ03‹`Ä¢öèÉVÉ(JbÖÈÔK6Ž6s.‹ï¬‹òÜñÍôÄa„Kƒ!Š•bƒ FÄóž -”Yº™VÀ¼lá¯}¢ á‘a¯“Lçýyk¦8/ 2z?ë}EºëÏÛ$óŸü)F"T(Y¥Kû\¢¬%ã:2ÈÔJðôëMJTKúKÊ«ôø#ûEoF‰m|”àxÛ—©ŸÂs%ñH>;øtfÈY»ìÐØJïʆi@'Ê ¿1¼â²%vÇœ#“ª¬º,óÁÙeŠ£=Ÿ…Ɉ•Þpúø¼yJ-{îmP<xAâól™4›Uðê¹—\÷ö9ÿ¢xÏ=ÙÈ2N&Ýu2å ø¤ rísƒ àžNÞ6Ï"¹­ƒé÷€b¯ÏqŽõ~bÿ¦b™’Çá‚,îaÞfÍv.ø ØÕ ÖAá1µ°-íÙNjy„”-'_¾ß§Ú³Ä.¿œòëåhA±=¦«ÌÌ~3Ý{gO|=qÂ’Ê|Û×ûLa2)Âh:'ÇT¿Ïy"µ¬Å6Ür~Jß²cç,R¬ZÉçÍ,qŠ¿®–>Õè˜`a»r©åÜ#®—`¤5ùrV{ª×¥’Uq×â™âøÏý;‰L‚Y»ì'xñK}2_å»Å¤Ï®>°\·;ƒK…aÿ"¸˜4±áÔ8}zAÅˬ”{•¿HK^˜l’W“a:ªþ›z8¢þb>(¨¾(㛊–Òá·¢þ›ð ¥ŽeXÌJ_0Ä!ÁjÓìûлB¡A$ËoÝ.àdbÔ÷Â] Ã®ƒ`Óýx×p/ÐûÌ'rÍú'P´NäRó)ÝzzÙ®"öF¦Ÿ™áïútȺý¡¯Ìöÿf±Ÿñî› ¼dl¤cóBñé7錽¶ÚM-º$À:xi&}EL舵a1n£Ü‘i¸Ø±ÇÃ&ÞaxòŽ­ÅH¨¢$ö\ ŠHtá™T9ÊH DBå@ø­ðl¡ï\?p&D£8 ±Î#šÁC- 4Š”Zð,ÈWœž‹XØÓéw@Q¶"ÃiU@= -BË ´b‚8TÐ  ­Ðð Åù–Ètƒ@@|’6‰ÏB@<[˜Ä_žž‰Ð¡®FÃʳ¾§ù!â ]3H€¦¥é{E{Eò[IÎàJ„( ø` ‹xš !&  QTCÀ˜ˆO¨Á7üϳFCïlÄŽ„Û;FKâ!h‹ãžu$­Þaá— è!X9tàá¼ë'º[2E=Y3ÐÉzÁp<ˆb4ÍRVxX¦9I -jÄ!ðL%PâP„'#–vŒ´ÁP ØQáÁ øÿ0 q”„@–íHÑé ì©7B›S‡O@ÎG¥cÀüßC‚ÿ¶ËÿJëŇƒ€~ð‘X€3dèÓ#`ÙsOþO°b¼xþ§—†!ÿa2ù/‘ö¡gw«£ -LÕŠ‰»\ÿ¬^ËÁˆ»H>Ꟶ*ÿ›­"3nvV áF -9ì»ëÌÚÄ=óD‚Í$N÷žÜoø°ÒƒÕl$0UY¶¼K7…>3xÁ†d*¸.“öÙ,–îÕ¦ý(B$¿Øø4ÒoƼÙýà­”\YýþjgJS%ÓÅ=þÙð=Ed>aÙ¶|ÙCd -û e ±…V?ÀLl%¡bG,Ý–-Nã+ †ù±I;Ik´ §Á§Ð7Fä3PË+Š…&Mæ3;²ÐV ÷[J06/.}ayμ!æ—œËsf¾1o,±Ù”h0eƒÏ¾A†k˜Oê\@c•± `6>çùîG¾‘K§BvýàczH*;9õÇ•ôðÝ:óÝmá§ß9KùH¾ä2”õ-õ»pðªU:3Í|7S˜ÔRÎ?ÃØßÍGƶY¦ø9¶g¾}Ÿoh„ôùÈËvcM¹†‡ú[ H¶¾ä†ÕÚ™ËdлYóÆH½¦c[÷³Éæ -´À|MMÕò„úg–4¬.Þ…ŸÂqðiƒ áØ>œë²–´vpÁîqÓ‡J­•Ø&ë@Ò+ž]½ÅÈ®`^†Å‡¯Ñ? Í Œæ1¼Ü^€•ZÊ3¯‹J3Y«¸c™‰;K1‘Që%Ét\©`¯%&îHnrv:÷ÿ>õÒSª_fmXÕ¡múyk+µs\'™î؉M>rLÉý4/kVù4`“]Ø‘/ñ­ôú}±eÉÙ0ÎòÁïýD«b÷"Ö²ý ”^‚êLLì“"ÓH¹)EEÖp¥Üð6ÈÑ.‚Ö‚p½`EOÆe—LðÊ ”32Û×­ø¬À¨Ê *H¦ü¾ ËÙo‚0-Ì­òânpŸÊ‹8L¿WC…î˜*–84»i•a°Jˆ/rYüÛ™ž2¯;¸l¡™³Ë´3ß¡~œÝ¥ÀâjU™\''%~LžCT¢JŠAñQâ«å¨Kä0o3°›2# „~ŸñâãzŒ)Ë;á¦óÒÅ-D)?ae"5bž³‰1d¤8S/†Ä×Ó¨c²±ë çvΈ\v:$Ç›bûn¶~¼¼…Ø0UÓè­âÓJãP¥ (É4Ä*€Ø@ÆÁ@[ -zŒ2O[:Å!> ¢ðÜša¬ª¿P¦n†á8<Ø€-À˜ oB`XžŸ‡@g1N¹ÇhØÐö‚ 4 -(ƒæ8EsªÔ'Éžz(NpG ìé:•¹C - YìÔq˜6A 1’Àš‚‡"¬Y±`UÓ`€§ú@! À# C’íT0@B•VÙu©vP˜‡¬m‡00œ†&,°åàI7lŒBã꼓 p‚Äa„0°mHð†¦Øi£Cì|°q Sƒù£à™4Nq -.´ŽšØ8†a `ÆØF<ý$h † ¹¦'! ewÓ*£Ý=§qöTØYPí P†‚`„1‡ÊŽ0ÁpØ#öK´?Äg'»‡Ë— ˜0z"@‘!©ý T06R|Ä@.fyŠ‡#<íÓ£“épr²-D¢ý!ôFhsêð Èù¨tL°ÿ{Hðÿ›`ÿ¿ ö° ¶üè)L0`輇‰ìã[X6îOÖc¡d&˜3 -4Út -¦î¦SÀ‚ª ¢ÀóÑM°ò‹º¶…I{6›j{ÜJô?i<ßúôu´˜P¬<Û :ý³X- s7qå8x“v²ðÂzÙ–F×'I%vÄs,úXf¶©Rø¹š*4¿òžä¬”¶R­çA2Dü’/ÍìP°0ÙÙGÙ½i“Ž„<(0kºŽô°„&Ù,'`¢¥''£çðšx¤ÉH˜ZºÕÈX+-p¨'ÃëàxŠf'Ëç’YJ§û‹žf¡‰ÐBÖG<=‹Æ–Y›þ†—xîà¢igÊåF;=ýŒ"'È(’Þœ#};¸s¶ÚŽŸ="±æ¾œ]"µH,H6!¨œÅ/ÈØ–XbùÌ9 %k?#£9È ¨oÇsíÉžLêq\Iü¢Ûdùí«K‡½-Àc±ðôù‹pþ,ó`Ý%=09.NôG9 ûvæ¢Ð°öâÞtí÷>…,Fϧ§S€“ÿ‰ó)ÅéXûÿÄù”âtÊdûGΧ§S&Û?r>%=š'B¬™ÍùÔá3­qÖ´Ô8¸rŽóXÊ$Ïù”âtÊdS9Ÿ"H;òÕ ¾x‰pÅ÷âëm6 íå"½.LÛXéÙZà ‰ÇW*Oz„ ;cS÷bŒ}ã½îÝ>OÁ[_Ž“ïSÒi9L¶À>ùòxv>5ÏEôϧþaÀ¨¢aT®`J|ð÷DHjpÁ¸^µ#šeP›6JP´·*ÀTm0FL‡¤¶P()hå@ýÉâÂ)ýM3¢U†Ã T’–@PÑÝ ˆ h&AÕ ÀXç“)….dV°eÒ&Ø]!©Íƒw&HœÌ7Ø« ŸðÞy×¥6Ø9P¨)Ãv^´·ð pÐUb–÷q¡N°Á0 ÞÂèSÁ˜ˆ`ÍX¼É…à fš5x³ ÉÀ–fDù‘4µN†$‚g'cê¼Çéóóœ¡Eó ¶‡¹µ‚wÖqU¬%ò'—(1Ë—ËO¬‚ÉCK˜ÃháIE|‚aæ$¶ø;µgÂ/•lúÇ9£õæ?×$Rô¹ͦ¨™0>Tgÿa“G`Ò¡±œa’æ˜Ö…„g`¶Q†fS#€©@Cû™:ªÃ L -Ê€Ó“‘ žH³¦§G>Šæ¢ò@ÂÝÈ$> vb“x@€§áÙéÁÈ$ôèôHÈ ÊùÐFWå5îƒÿy¯HS¿‘ÐÞÖ‡)*à?jY)ðé-y)¶þ™) 77å¦Øú7e§Øú7姲\Ÿ¡†vKŽ -Ù-Y*àg·ä©€Ÿ]Ÿ©fû–\ð³³Uà/¯ÎW“vcÆ -øåm9+à‡·e­Øú©!›Øwž¹‚Ó\æŠZ⊭/¤®p™+$LJe8–ò8³„8ïKáw0„OëZý—`ù‚ 0»ÿ§F"VœÝhPœ -ž6ZF)@険1ø-U1:@ph!‰þ$ÿ„KÓüÿX2曦¡¤K’SÒ»õfo:î'»1 ßƒ¾X­áÓê`7ß?ÌWë¯VëÃÃÿÃoè`g?‚®Jt~¾dûÃn§¨ëböþñÿû>=SL?é‚Ú.¹¼ºÆf æ o0/hóPH›-³RjЈ#D=ˆÑ™ÉÒ&Z@r= Y˜ ÑfáÐgÕe×v˜á:«V!3 À¨D„ªj@bzjHQbf°—^œX–ª˜ þÄ’Ô  ° H-.É/J¦äürP L¹ªª«¿/L™‰„ endstream endobj 733 0 obj <> endobj xref 0 738 0000000003 65535 f -0000000016 00000 n -0000042656 00000 n -0000000004 00000 f -0000000006 00000 f -0000048922 00000 n -0000000007 00000 f -0000000008 00000 f -0000000009 00000 f -0000000010 00000 f -0000000011 00000 f -0000000012 00000 f -0000000016 00000 f -0000042707 00000 n -0000048755 00000 n -0000048786 00000 n -0000000017 00000 f -0000000018 00000 f -0000000019 00000 f -0000000020 00000 f -0000000021 00000 f -0000000022 00000 f -0000000023 00000 f -0000000024 00000 f -0000000025 00000 f -0000000026 00000 f -0000000027 00000 f -0000000028 00000 f -0000000029 00000 f -0000000030 00000 f -0000000031 00000 f -0000000032 00000 f -0000000033 00000 f -0000000034 00000 f -0000000038 00000 f -0000042778 00000 n -0000048639 00000 n -0000048670 00000 n -0000000039 00000 f -0000000040 00000 f -0000000041 00000 f -0000000042 00000 f -0000000046 00000 f -0000042849 00000 n -0000048523 00000 n -0000048554 00000 n -0000000047 00000 f -0000000048 00000 f -0000000049 00000 f -0000000050 00000 f -0000000051 00000 f -0000000052 00000 f -0000000053 00000 f -0000000054 00000 f -0000000055 00000 f -0000000059 00000 f -0000042920 00000 n -0000048407 00000 n -0000048438 00000 n -0000000060 00000 f -0000000061 00000 f -0000000062 00000 f -0000000063 00000 f -0000000064 00000 f -0000000065 00000 f -0000000066 00000 f -0000000067 00000 f -0000000068 00000 f -0000000069 00000 f -0000000070 00000 f -0000000071 00000 f -0000000072 00000 f -0000000073 00000 f -0000000074 00000 f -0000000075 00000 f -0000000076 00000 f -0000000077 00000 f -0000000078 00000 f -0000000079 00000 f -0000000080 00000 f -0000000081 00000 f -0000000082 00000 f -0000000083 00000 f -0000000084 00000 f -0000000085 00000 f -0000000086 00000 f -0000000087 00000 f -0000000088 00000 f -0000000089 00000 f -0000000090 00000 f -0000000091 00000 f -0000000092 00000 f -0000000093 00000 f -0000000094 00000 f -0000000095 00000 f -0000000096 00000 f -0000000097 00000 f -0000000098 00000 f -0000000099 00000 f -0000000100 00000 f -0000000101 00000 f -0000000102 00000 f -0000000106 00000 f -0000042996 00000 n -0000048289 00000 n -0000048321 00000 n -0000000107 00000 f -0000000108 00000 f -0000000109 00000 f -0000000110 00000 f -0000000111 00000 f -0000000112 00000 f -0000000113 00000 f -0000000114 00000 f -0000000115 00000 f -0000000116 00000 f -0000000117 00000 f -0000000118 00000 f -0000000119 00000 f -0000000120 00000 f -0000000121 00000 f -0000000122 00000 f -0000000123 00000 f -0000000124 00000 f -0000000128 00000 f -0000043070 00000 n -0000048171 00000 n -0000048203 00000 n -0000000129 00000 f -0000000130 00000 f -0000000131 00000 f -0000000132 00000 f -0000000136 00000 f -0000043144 00000 n -0000048053 00000 n -0000048085 00000 n -0000000137 00000 f -0000000138 00000 f -0000000139 00000 f -0000000140 00000 f -0000000141 00000 f -0000000142 00000 f -0000000143 00000 f -0000000144 00000 f -0000000145 00000 f -0000000149 00000 f -0000043218 00000 n -0000047935 00000 n -0000047967 00000 n -0000000150 00000 f -0000000151 00000 f -0000000152 00000 f -0000000153 00000 f -0000000154 00000 f -0000000155 00000 f -0000000156 00000 f -0000000157 00000 f -0000000158 00000 f -0000000159 00000 f -0000000160 00000 f -0000000161 00000 f -0000000162 00000 f -0000000163 00000 f -0000000164 00000 f -0000000165 00000 f -0000000166 00000 f -0000000167 00000 f -0000000168 00000 f -0000000169 00000 f -0000000170 00000 f -0000000171 00000 f -0000000172 00000 f -0000000173 00000 f -0000000174 00000 f -0000000175 00000 f -0000000176 00000 f -0000000177 00000 f -0000000178 00000 f -0000000179 00000 f -0000000180 00000 f -0000000181 00000 f -0000000182 00000 f -0000000183 00000 f -0000000184 00000 f -0000000185 00000 f -0000000186 00000 f -0000000187 00000 f -0000000188 00000 f -0000000189 00000 f -0000000190 00000 f -0000000191 00000 f -0000000192 00000 f -0000000196 00000 f -0000043297 00000 n -0000047817 00000 n -0000047849 00000 n -0000000197 00000 f -0000000198 00000 f -0000000199 00000 f -0000000200 00000 f -0000000201 00000 f -0000000202 00000 f -0000000203 00000 f -0000000204 00000 f -0000000205 00000 f -0000000206 00000 f -0000000207 00000 f -0000000208 00000 f -0000000209 00000 f -0000000210 00000 f -0000000211 00000 f -0000000212 00000 f -0000000213 00000 f -0000000214 00000 f -0000000218 00000 f -0000043371 00000 n -0000047699 00000 n -0000047731 00000 n -0000000219 00000 f -0000000220 00000 f -0000000221 00000 f -0000000222 00000 f -0000000226 00000 f -0000043445 00000 n -0000047581 00000 n -0000047613 00000 n -0000000227 00000 f -0000000228 00000 f -0000000229 00000 f -0000000230 00000 f -0000000231 00000 f -0000000232 00000 f -0000000233 00000 f -0000000234 00000 f -0000000235 00000 f -0000000239 00000 f -0000043519 00000 n -0000047463 00000 n -0000047495 00000 n -0000000240 00000 f -0000000241 00000 f -0000000242 00000 f -0000000243 00000 f -0000000244 00000 f -0000000245 00000 f -0000000246 00000 f -0000000247 00000 f -0000000248 00000 f -0000000249 00000 f -0000000250 00000 f -0000000251 00000 f -0000000252 00000 f -0000000253 00000 f -0000000254 00000 f -0000000255 00000 f -0000000256 00000 f -0000000257 00000 f -0000000258 00000 f -0000000259 00000 f -0000000260 00000 f -0000000261 00000 f -0000000262 00000 f -0000000263 00000 f -0000000264 00000 f -0000000265 00000 f -0000000266 00000 f -0000000267 00000 f -0000000268 00000 f -0000000269 00000 f -0000000270 00000 f -0000000271 00000 f -0000000272 00000 f -0000000273 00000 f -0000000274 00000 f -0000000275 00000 f -0000000276 00000 f -0000000277 00000 f -0000000278 00000 f -0000000279 00000 f -0000000280 00000 f -0000000281 00000 f -0000000282 00000 f -0000000286 00000 f -0000043598 00000 n -0000047345 00000 n -0000047377 00000 n -0000000287 00000 f -0000000288 00000 f -0000000289 00000 f -0000000290 00000 f -0000000291 00000 f -0000000292 00000 f -0000000293 00000 f -0000000294 00000 f -0000000295 00000 f -0000000296 00000 f -0000000297 00000 f -0000000298 00000 f -0000000299 00000 f -0000000300 00000 f -0000000301 00000 f -0000000302 00000 f -0000000303 00000 f -0000000304 00000 f -0000000308 00000 f -0000043672 00000 n -0000047227 00000 n -0000047259 00000 n -0000000309 00000 f -0000000310 00000 f -0000000311 00000 f -0000000312 00000 f -0000000316 00000 f -0000043746 00000 n -0000047109 00000 n -0000047141 00000 n -0000000317 00000 f -0000000318 00000 f -0000000319 00000 f -0000000320 00000 f -0000000321 00000 f -0000000322 00000 f -0000000323 00000 f -0000000324 00000 f -0000000325 00000 f -0000000329 00000 f -0000043820 00000 n -0000046991 00000 n -0000047023 00000 n -0000000330 00000 f -0000000331 00000 f -0000000332 00000 f -0000000333 00000 f -0000000334 00000 f -0000000335 00000 f -0000000336 00000 f -0000000337 00000 f -0000000338 00000 f -0000000339 00000 f -0000000340 00000 f -0000000341 00000 f -0000000342 00000 f -0000000343 00000 f -0000000344 00000 f -0000000345 00000 f -0000000346 00000 f -0000000347 00000 f -0000000348 00000 f -0000000349 00000 f -0000000350 00000 f -0000000351 00000 f -0000000352 00000 f -0000000353 00000 f -0000000354 00000 f -0000000355 00000 f -0000000356 00000 f -0000000357 00000 f -0000000358 00000 f -0000000359 00000 f -0000000360 00000 f -0000000361 00000 f -0000000362 00000 f -0000000363 00000 f -0000000364 00000 f -0000000365 00000 f -0000000366 00000 f -0000000367 00000 f -0000000368 00000 f -0000000369 00000 f -0000000370 00000 f -0000000371 00000 f -0000000372 00000 f -0000000376 00000 f -0000043899 00000 n -0000046873 00000 n -0000046905 00000 n -0000000377 00000 f -0000000378 00000 f -0000000379 00000 f -0000000380 00000 f -0000000381 00000 f -0000000382 00000 f -0000000383 00000 f -0000000384 00000 f -0000000385 00000 f -0000000386 00000 f -0000000387 00000 f -0000000388 00000 f -0000000389 00000 f -0000000390 00000 f -0000000391 00000 f -0000000392 00000 f -0000000393 00000 f -0000000394 00000 f -0000000398 00000 f -0000043973 00000 n -0000046755 00000 n -0000046787 00000 n -0000000399 00000 f -0000000400 00000 f -0000000401 00000 f -0000000402 00000 f -0000000406 00000 f -0000044047 00000 n -0000046637 00000 n -0000046669 00000 n -0000000407 00000 f -0000000408 00000 f -0000000409 00000 f -0000000410 00000 f -0000000411 00000 f -0000000412 00000 f -0000000413 00000 f -0000000414 00000 f -0000000415 00000 f -0000000419 00000 f -0000044121 00000 n -0000046519 00000 n -0000046551 00000 n -0000000420 00000 f -0000000421 00000 f -0000000422 00000 f -0000000423 00000 f -0000000424 00000 f -0000000425 00000 f -0000000426 00000 f -0000000427 00000 f -0000000428 00000 f -0000000429 00000 f -0000000430 00000 f -0000000431 00000 f -0000000432 00000 f -0000000433 00000 f -0000000434 00000 f -0000000435 00000 f -0000000436 00000 f -0000000437 00000 f -0000000438 00000 f -0000000439 00000 f -0000000440 00000 f -0000000441 00000 f -0000000442 00000 f -0000000443 00000 f -0000000444 00000 f -0000000445 00000 f -0000000446 00000 f -0000000447 00000 f -0000000448 00000 f -0000000449 00000 f -0000000450 00000 f -0000000451 00000 f -0000000452 00000 f -0000000453 00000 f -0000000454 00000 f -0000000455 00000 f -0000000456 00000 f -0000000457 00000 f -0000000458 00000 f -0000000459 00000 f -0000000460 00000 f -0000000461 00000 f -0000000462 00000 f -0000000466 00000 f -0000044200 00000 n -0000046401 00000 n -0000046433 00000 n -0000000467 00000 f -0000000468 00000 f -0000000469 00000 f -0000000470 00000 f -0000000471 00000 f -0000000472 00000 f -0000000473 00000 f -0000000474 00000 f -0000000475 00000 f -0000000476 00000 f -0000000477 00000 f -0000000478 00000 f -0000000479 00000 f -0000000480 00000 f -0000000481 00000 f -0000000482 00000 f -0000000483 00000 f -0000000484 00000 f -0000000488 00000 f -0000044274 00000 n -0000046283 00000 n -0000046315 00000 n -0000000489 00000 f -0000000490 00000 f -0000000491 00000 f -0000000492 00000 f -0000000496 00000 f -0000044348 00000 n -0000046165 00000 n -0000046197 00000 n -0000000497 00000 f -0000000498 00000 f -0000000499 00000 f -0000000500 00000 f -0000000501 00000 f -0000000502 00000 f -0000000503 00000 f -0000000504 00000 f -0000000505 00000 f -0000000509 00000 f -0000044422 00000 n -0000046047 00000 n -0000046079 00000 n -0000000510 00000 f -0000000511 00000 f -0000000512 00000 f -0000000513 00000 f -0000000514 00000 f -0000000515 00000 f -0000000516 00000 f -0000000517 00000 f -0000000518 00000 f -0000000519 00000 f -0000000520 00000 f -0000000521 00000 f -0000000522 00000 f -0000000523 00000 f -0000000524 00000 f -0000000525 00000 f -0000000526 00000 f -0000000527 00000 f -0000000528 00000 f -0000000529 00000 f -0000000530 00000 f -0000000531 00000 f -0000000532 00000 f -0000000533 00000 f -0000000534 00000 f -0000000535 00000 f -0000000536 00000 f -0000000537 00000 f -0000000538 00000 f -0000000539 00000 f -0000000540 00000 f -0000000541 00000 f -0000000542 00000 f -0000000543 00000 f -0000000544 00000 f -0000000545 00000 f -0000000546 00000 f -0000000547 00000 f -0000000548 00000 f -0000000549 00000 f -0000000550 00000 f -0000000551 00000 f -0000000552 00000 f -0000000556 00001 f -0000044501 00000 n -0000045929 00000 n -0000045961 00000 n -0000000557 00000 f -0000000558 00000 f -0000000559 00000 f -0000000560 00000 f -0000000561 00000 f -0000000562 00000 f -0000000563 00000 f -0000000564 00000 f -0000000565 00000 f -0000000566 00000 f -0000000567 00000 f -0000000568 00000 f -0000000569 00000 f -0000000570 00000 f -0000000571 00000 f -0000000572 00000 f -0000000573 00000 f -0000000574 00000 f -0000000575 00000 f -0000000576 00000 f -0000000577 00000 f -0000000578 00000 f -0000000579 00000 f -0000000580 00000 f -0000000584 00000 f -0000044575 00000 n -0000045811 00000 n -0000045843 00000 n -0000000585 00000 f -0000000586 00000 f -0000000587 00000 f -0000000588 00000 f -0000000592 00000 f -0000044649 00000 n -0000045693 00000 n -0000045725 00000 n -0000000593 00000 f -0000000594 00000 f -0000000595 00000 f -0000000596 00000 f -0000000597 00000 f -0000000598 00000 f -0000000599 00000 f -0000000600 00000 f -0000000601 00000 f -0000000605 00000 f -0000044723 00000 n -0000045575 00000 n -0000045607 00000 n -0000000606 00000 f -0000000607 00000 f -0000000608 00000 f -0000000609 00000 f -0000000610 00000 f -0000000611 00000 f -0000000612 00000 f -0000000613 00000 f -0000000614 00000 f -0000000615 00000 f -0000000616 00000 f -0000000617 00000 f -0000000618 00000 f -0000000619 00000 f -0000000620 00000 f -0000000621 00000 f -0000000622 00000 f -0000000623 00000 f -0000000624 00000 f -0000000625 00000 f -0000000626 00000 f -0000000627 00000 f -0000000628 00000 f -0000000629 00000 f -0000000630 00000 f -0000000631 00000 f -0000000632 00000 f -0000000633 00000 f -0000000634 00000 f -0000000635 00000 f -0000000636 00000 f -0000000637 00000 f -0000000638 00001 f -0000000639 00000 f -0000000640 00000 f -0000000641 00000 f -0000000647 00000 f -0000073047 00000 n -0000073123 00000 n -0000073301 00000 n -0000074256 00000 n -0000089917 00000 n -0000000652 00001 f -0000048871 00000 n -0000044802 00000 n -0000045457 00000 n -0000045489 00000 n -0000000659 00001 f -0000072382 00000 n -0000058879 00000 n -0000058497 00000 n -0000059180 00000 n -0000055168 00000 n -0000055205 00000 n -0000000662 00001 f -0000059254 00000 n -0000059834 00000 n -0000000663 00001 f -0000000665 00001 f -0000058000 00000 n -0000000674 00001 f -0000059898 00000 n -0000059378 00000 n -0000058954 00000 n -0000058592 00000 n -0000058526 00000 n -0000058856 00000 n -0000052141 00000 n -0000052258 00000 n -0000000675 00001 f -0000000680 00001 f -0000071573 00000 n -0000044876 00000 n -0000045339 00000 n -0000045371 00000 n -0000000688 00001 f -0000070271 00000 n -0000071225 00000 n -0000071346 00000 n -0000071452 00000 n -0000044950 00000 n -0000045221 00000 n -0000045253 00000 n -0000000692 00001 f -0000052372 00000 n -0000070417 00000 n -0000070994 00000 n -0000000693 00001 f -0000000695 00001 f -0000070603 00000 n -0000000696 00001 f -0000000701 00001 f -0000070798 00000 n -0000045024 00000 n -0000045103 00000 n -0000045135 00000 n -0000000702 00001 f -0000000703 00001 f -0000000706 00001 f -0000072318 00000 n -0000052980 00000 n -0000000707 00001 f -0000000719 00001 f -0000055094 00000 n -0000057854 00000 n -0000058037 00000 n -0000058182 00000 n -0000058273 00000 n -0000058378 00000 n -0000053055 00000 n -0000052679 00000 n -0000052613 00000 n -0000052957 00000 n -0000052486 00000 n -0000000720 00001 f -0000000721 00001 f -0000000722 00001 f -0000000723 00001 f -0000000724 00001 f -0000000725 00001 f -0000000726 00001 f -0000000727 00001 f -0000000732 00001 f -0000071850 00000 n -0000049502 00000 n -0000051407 00000 n -0000073010 00000 n -0000000000 00001 f -0000137993 00000 n -0000072446 00000 n -0000072496 00000 n -0000051471 00000 n -0000000640 00000 n -trailer <]>> startxref 138134 %%EOF \ No newline at end of file diff --git a/www/images/tikzit.ico b/www/images/tikzit.ico deleted file mode 100644 index bae4e8d..0000000 Binary files a/www/images/tikzit.ico and /dev/null differ diff --git a/www/images/tikzit.svg b/www/images/tikzit.svg deleted file mode 100644 index a3cc3f7..0000000 --- a/www/images/tikzit.svg +++ /dev/null @@ -1,176 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/www/images/tikzit_bg.ai b/www/images/tikzit_bg.ai deleted file mode 100644 index e4ba7b0..0000000 --- a/www/images/tikzit_bg.ai +++ /dev/null @@ -1,976 +0,0 @@ -%PDF-1.5 %âãÏÓ -1 0 obj <>/OCGs[5 0 R 6 0 R 7 0 R 8 0 R 71 0 R 72 0 R 73 0 R 74 0 R 136 0 R 137 0 R 138 0 R 139 0 R]>>/Pages 3 0 R/Type/Catalog>> endobj 2 0 obj <>stream - - - - - application/pdf - - - Basic RGB - - - - - Adobe Illustrator CS5 - 2011-05-19T22:19:38-05:00 - 2011-05-19T22:22:03-05:00 - 2011-05-19T22:22:03-05:00 - - - - 256 - 236 - JPEG - /9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgA7AEAAwER AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE 1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp 0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo +DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8A9U4q7FXYq7FXYq7FXYq7 FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7F XYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FX Yq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXY q7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq 7FXYq7FXYq7FXYq7FXYq7FUJqmr6VpNk99qt5BYWUX95c3MiQxL83cqoxV495s/5y5/KjRTJDpsl zr90mwFlFwh5DxmmMe3ugbFXmGo/85mee9VufqvlXytbRSPUJHKZ7+Y+4WH6uPwOKodfzA/5zH13 4rHTr+yikGwXS4LdSGAoQ91Fy96hsVX/AKL/AOc2b08vUvkKbf706bbj7vUjrirRvf8AnNjTl50v 3C/BT0tNujt/k8Za9OuKrX/5yH/5yU8sAv5j8u84E+3LqGmXFutK9RJEYE9q74qyfy3/AM5uaLKU j8yeXLi07NcWEqXC/P0pRCQP9mcVez+TPzm/LTziUi0PXbeS8fYWE5Nvc18FilCM/wDsKjFWa4q7 FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYqhNW1jStH0+bUtVu4bGwt15T3Vw6 xxqPdmIG/bFXzP8AmT/zmIXnbSPy3sjczO3pLrF1Ex5M2w+rW32mPgZB/sMVYppH5B/nX+Zt4mt+ fNVl023l+JW1AtLchTTaKyUokK/5JKf6uKvZvKP/ADi5+UugKkl1YSa7eLuZ9Rcule9IE4Q0/wBZ W+eKvU9L0vSNJtha6VY29hbDpBaxJDGKf5MYUYqjPUxV3qYq71MVd6mKsT8z/lb+XPmdX/Tfl6yu pZK8rkRCK43/AOL4uEv/AA2KvFPOv/OGejzh7nybq8ljP1Wx1D97CT2CzIBIg/1lfFWG2f5jf85B /kteRWPma3l1PQgQkSXzG4t3Udre9XkyGnRCTTumKvon8rfz98h/mEiW1lcHTtdK1k0e7IWUkdfR f7Ey/wCr8VNyoxV6TirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVYL+a35w+VPy30j6 1qsn1jU51J0/SImAnnI2qevpxg/adhTwqdsVfLENn+b/APzkN5gN3dzfUPLVtIQrkOthbD+WGOtZ 5uPU1r4lRTFX0l+Wv5M+R/IFuraVafWNVK0n1e6Ae4avUIaUiX/JQD3r1xVnnqYq71MVd6mKu9TF XepirvUxV3qYq71MVd6mKqF9aWOoWctlf28d3ZzqUntp0WSN1PZkYFSPnir5w/NT/nFSIu+u/l1I bS8ib1jozyFVLKeXK1mJrGwPRWNPBh0xVb+UH/OUWraRqC+UPzREsckDi3TWZ1KzwuNgl6pFWH/F nX+av2sVfVEE8FxBHPBIssEqh4pUIZHRhVWVhsQRuCMVX4q7FXYq7FXYq7FXYq7FXYq7FXYq7FXY q7FXYq82/O786dI/LTy+JKJeeYr0FdL00t8wZ5gDURIfpY7DuQq+cfyu/KnzN+bfmCXzx59uZ5NI lk5c3PCS9ZDT0oqU9OBKcSVp/Ku9Sqr6y02w0/S7CDT9Ot47SxtUEdvbxKEREHQKBiqJ9TFXepir vUxV3qYq71MVd6mKu9TFXepirvUxV3qYq71MVd6mKvNvzg/JTy9+YdgZqJYeY4EpZ6qq/aA6RTgU Lx+Hdeo7gqvGfyf/ADi8y/lJ5kk8hefo5V0JJOAZ6u1kzHaWEivO3fqVX/WXeoZV9kQTwXEEc8Ei ywSqHilQhkdGFVZWGxBG4IxVfirsVdirsVdirsVdirsVdirsVdirsVdirGPzI/MDRvIXlK88xaoe SwDha2oIV7i4evpwpX+Y7k02UE9sVfJH5beTPMH50+e73zp5xdpNFhmBnX4lSVl3Syg3+CKNT8VD UD3auKvrW2it7W3itraNILeBFjhhjUKiIooqqo2AA6DFVT1PfFXep74q71PfFXep74q71PfFXep7 4q71PfFXep74q71PfFXep74q71PfFXep74q71PfFXep74q87/Of8ptN/MHQCqBIPMFkpbTL0gCp6 +jKaEmN/+FO/iCq83/5xj/N/UfLutn8rfOJa3VZmt9IefZre65Ua0c/ySN/d/wCVtuGFFX1jirsV dirsVdirsVdirsVdirsVdirsVcSAKnYDqcVfE/5seadV/Ov83rXyroMxPl7TpWt7SVd4+KH/AEq+ YbV+zRPEAU3Y4q+l/LWgaV5b0Ky0TSohDY2MYjiXappuzsRSrO1WY9ziqZ88VdzxV3PFXc8VdzxV 3PFXc8VdzxV3PFXc8VdzxV3PFXc8VdzxV3PFXc8VfP8A/wA5O/lh9bsx570aMpqNgFGrCKoZ4FoE nFP2oejH+Xf9nFXrn/OO/wCa/wDysHyNG99IG8w6QVtdWGwMhp+6uKD/AH6oNf8AKDdqYq9SxV2K uxV2KuxV2KuxV2KuxV2KuxV5D/zk/wDmM3k78t57Wzk4ax5gLWFmQaMkRX/SZR3+GM8QR0ZlOKvP f+cYvISaJ5UbzLdpTUtdAMNRvHZofgA/4yt8Z9uPhir2r1PfFXep74q71PfFXep74q71PfFXep74 q71PfFULf6vpunQevqF3DZwdPVuJFiT/AIJyBiqTN+ZX5fqaHzJpn0XcJH4NiqN03zh5V1OYQ6dr NleTn/dMFxFI/wDwKsTiqbep74q71PfFXep74q71PfFXep74q71PfFXep74qp3EcFzby29wiywTI 0csTgMrIwoysD1BBxV8seWtUf8jPz3eC4ldfK92fTuGIZ+WnXJrHKVUMWa3cb0Wp4sB1xV9Bv/zl d+SKuyjWZnAJAYWV1Q+4rGDiqfaD+f35O65IsVj5ptElfZUu/UsiSew+tLCCflirPopYpY1lidZI 3AZHUgqQehBHXFV2KuxV2KuxV2KuxV2KuxV8XfnzqE/5j/8AOQNn5Qtpa6fpbx6aCpqAR++vpB/l Lup/1MVfR1rDb2ttDa26CK3gRYoY16KiDiqj5AYqq+oMVd6gxV3qDFXeoMVd6gxVC6prGnaVYTah qNwlrZW68pp5DRVHT6STsANycVfPfn3/AJyL1m+klsvKifo6x3X9ISANcyDpVAarED9Ld6jpirx+ /v8AUNQuWur+5lu7l/tzzu0jn5sxJxVD8cVdxxVm/k/84fPPlh0SG9a+09aA2F4TLHxHZGJ5x+3E 08QcVfSH5f8A5o+XvOloTZk22pQqGutNlIMiDoWQinNK7ch9IFcVZf6gxV3qDFXeoMVd6gxV3qDF XeoMVYV+YP5UeVPPdzYXOtGdJNPDqjWzrGZEkIPCQsrkqCKilOuKpIn/ADjh+UqoFOmzOR1Zrqep +5gMVSDXP+cVfJd1GzaPqN5ptwR8IlKXMIP+qRG//D4qwf6j+ef5JT/XtJvWu/LyNylERa4sGBNT 69u1GiJ6FxT2fFX0h+TH/OQPln8x4RYuo0vzNEnKfS3bksoUfFJbuac17lftL7jfFXquKuxV2Kux V2KuxVBa5q1to+i6hq91tbadbTXc5rT93BGZG3+S4q+Mv+cabG41vzx5g83X/wC8uY1YtIe9xfyM 7uK9+KMP9lir6U54q7nirueKu54q7niqyWeOKN5ZWCRxgs7saAKBUkk9hir5W/Nj8yrzzfq7W9tI 0egWbkWcG6iRht68g7s37IP2R71qqwHjiruOKu44q7jiruOKozSNV1LR9Sg1LTZ2tr22bnDMnUHo QR0II2IOxGKvrX8ufPdr5w8ux36BY76KkWoWw/YlA6rXfg/Vfu6g4qynnirueKu54q7nirueKpTr vm7y3oEYfWNRgs6iqxyN+8YdKrGtXb6BirGB+en5aepx/SrcP9+fV7jj93p8vwxVlGh+a/L2vRGX R9QgvQBydY3HNQf54zR1/wBkMVTOQJIjRyKHjcFXRgCCDsQQcVfOP5yflLc+U7xfPfkhpLKO0lWe 6t7YlWtZK1E8FNxHy+0v7P8Aq/ZVfRX5Cfm9B+ZHlAXFxxj8w6aVg1i3UUBYj4J0H8koB27MCPCq r0zFXYq7FXYq7FXmf/OSWrtpf5K+ZpkNJLiGKzUb7i5njhcf8i3bFXkP/OMmnC0/L2W8I+PUL2WQ N34RqsQH0MjYq9c54q7nirueKu54q7nirzP8+vNMml+U00y3fhc6w5iYioP1eMAy0p/NyVT7E4q+ buOKu44q7jiruOKu44q7jiruOKs9/JbzTJoXnS3t3Yix1YizuF3pzY/uXp4iQ0r4E4q+oOeKu54q 7nirueKvOfzc/NJvK1qumaWQ2uXachIQGW3jJoJCDszGh4g/M+BVfN15d3l9dSXV5M9xczHlLNKx d2PiWNScVUeOKoiwvr7T7uO8sZ5La6hPKOaJirKfYjFX0n+U35n/AOK7J7HUeKa5ZoGlK0VZ4+nq qo6EGgcDbuOtAqz+eOG4gkgnRZYJlaOWNxVWRhRlYHqCMVfOHki+m/KH/nIOGy9Rl0DUZltZKk8W sr1qRO3j6ElKn/JPjir7gxV2KuxV2KuxV4V/zmTd+h+UcMVafWtVtoqUrWkU0tPb+7xVJfyQhW3/ ACt0KMbFo5ZDWlf3s8j9v9bFWdc8VdzxV3PFXc8VdzxV8+f85AXzz+b7W15VjtbNPg7B5HdmP0rx xV5hxxV3HFXccVdxxV3HFXccVdxxVchZHV1JVlIKsNiCO4xV715H/PHSrq1isvMrfU79AE+ugEwy 025NxqUY99uPuOmKvSLTzBol4ge01C2uEIryimRx+BOKq/6Qsv8Aloj/AODX+uKoDV/Nnl3SLZrj UNRggRRUKXUu3sqCrMfkMVfLHmnW5te8w3+rS1rdzM6K25WMfDGm38qADFUq44q7jiruOKp15K18 aB5u0nUDKIlW4SOX3ilPpyCnf4GOKvq+S5LbDYYq8B/5ye0xOehaum0pE1rK3cheMkf3Evir7C8k 6u+teTdB1iQ1k1LTrS7evXlPAkhr9LYqnWKuxV2KuxV4B/zmqCfyr0sgVA1y3J9h9UuhiqTflPNT 8u9BKt0tgKjxDEHFWZpe9n+8YqrpOj/ZNcVb54q7nirueKvnr88Ld088tIek9tC6/Ick/WmKvP8A jiruOKu44q7jiruOKu44q7jiruOKsk8q/l55l8y/vLGER2YPFr2c8IqjqF2LMf8AVBxVn9n/AM4+ RcQb3WiW/aSGAAD5Mzmv/A4qi/8AoX7Rv+rtcf8AAJiqXav+QE0du8mk6oJplFVt7iPhy9vUVjQ/ 7HFXks1vLDM8MqFJY2KSIwoVZTQgjxBxVZxxVRnube3FZZAvgO5+jFUqutdY1W2XiP526/QMVUdF huNQ1/T7cEvPc3MMSE7mryBR+vFX2v6mKvHP+clrpP8AD2j25+2928i/JIiD/wATGKvqD8nrZ7b8 qfKET/b/AEPZMRShHOBHoQfDlTFWX4q7FXYq7FXi3/OXlg1z+TV1OK0sb60uGp4M5g328ZsVec/k peif8t9LWvxQGeJ/oncj/hWGKs59TFXepTFVVL2Re/Ie+Kqy38Z+0CPxxVVW4ibowOKvJfz40dm/ RusotQA1pO3h1ki/43xV5DxxV3HFXccVdxxV3HFXccVdxxVNfK+hvrfmCx0xa8biUCUrSoiX4pGF fBATir6htbe2tLaO1tYlht4VCRRIKKqjoAMVVeeKu54qsa4iXqwGKvnz87tFfRtXbXLO3Mun6k9Z WGyx3B3YN1/vPtD3riryO41q+m2DCJfBNj9/XFUCWLEljUnqTirWKvWPyI8jzX+tL5lvIyun6eT9 T5DaW4pSoBH2Y61r/NT3xV9DepirwX85JrjzX+Y2i+UdNPqTo0VotNwLm9dQa07BOBOKvujTrG30 /T7awtxxt7SJIIV8EjUIo+4YqiMVdirsVdirCPzu0Jtc/KXzVpyrzkNhJcRJSpaS1pcoB7lohTFX y7/zjxqok8v6lppPxWtyJgO/GdAP1xHFXrPqYq71MVd6mKu9TFXepiqWeZdJi13QrvSZZGjW5Skc q1qkg+JHFCPssAad+mKvlnU5/MGi6lcabf8AwXVq5SWN1B6bgg0FQw3B7jFVieZbofbiRvlUfxOK qy+Zl/atz8w/9mKqg8y2veJx8qHFVw8yWNN45a/Jf+asVcfMlj2jlr8l/wCasVWnzLa9onPzoMVe 2/kto729g3mK8tzHPerwsUc7iAmpkpT/AHYRt7exxV6adSk7KBiqw385/ap8hiqxrh2+0xPzOKrf UxVQvrWzv7SWzvYUuLWZeMsMgDKw9wcVeO+Z/wDnH5Xmefy5fLFGxqLK75UX2WVQxPsGX6cVYoPy O8/erw9C3C1p6vrrx+f834Yqy3yv/wA4/wAMUyXHmS9W4VTU2NpyCN/rTNxaniFUfPFXsNpBa2dt Ha2sSQW0KhIoY1CoqjoABsMVSXzt5zsfK2hy6jcEPOapZ21d5ZSNh8h1Y+GKpP8A84lfl5f695pv fzL1xDJDbPKmnPIP729l/vZQP5YkYqP8ptvs4q+uMVdirsVdirsVWyRxyxtHIoeNwVdTuCCKEHFX wb5PtJPIn5z6x5UuGKwmaexjLGnII3q20n+zjAp/rYq9q9XArvVxV3q4q71cVd6uKu9XFXl/55+W LS80H/EEaBb7TyiSuP24JHCUP+q7gj6cKvBcVdirsVdirsVZf+Vvlm18w+bYbW8XnZW0bXVzF/Os ZChT7F3Wvtir6aV1VQqgKqigA2AAwK36uKu9XFXerirvVxV3q4q71cVd6uKu9XFWI+bvzT8teXI3 jaYXupDZbGBgSG/4sbdUHz39sKsO/L78tfPX53eZl1bV2ksvK9s/Ge+C8Y1QGpt7NW2eQ/tNvx6t 2UqvtvQtD0rQtItNH0m3W006xjENtbp0VV/Eknck7k7nFUdirsVdirsVdirsVfIv/OYvlC50bzdo vn7Tl9MXvC3upV/ZvLT4oXPu8QoP+MeKptoGu2+s6NZ6pb/3d1GH41rxbo6H3VgRiqYepirvUxV3 qYq71MVd6mKsK/OHUo7byJeRMaPePFBED3PqCQ/8JGcVeI+VvJmu+ZbkxabCPSjNJrqSqxJXsWoa n2AJxV6APyBb0QW1sCam6i2qtfCvqg/TTFUvk/IbzCHIj1GzZOxb1VP3BG/XiqNtPyCumWt3rKRt /LFAZB97PH+rFUk80fk55g0eB7qxkXVLRBVxGpSZQO/p1ao/1Sfliq/8kNSjtPOTQOafXbWSKMf5 alZR/wAKjYq9+9TFXepirvUxV3qYq71MVd6mKvLPzR87eYIfMWneXvLU0i6ixUSJAAzyTXBCwwhS DU71pTuMVc1l/wA5PxEwvoWos429QafG3X/KROGKom2/Jr/nJnzUwiv4prC0kNHku7mG1i60+KKA +oR/zzOKvUvy8/5w28s6VLFfecr465dIQw063DQ2YI7O1fVl3/1B4g4q+hrKys7G0hs7KCO2tLdR HBbwqEjRF2CqqgAAe2Kq2KuxV2KuxV2KuxV2KsT/ADT8iWnnryLqnlyfis1zHzsZm/3VdR/FC9et OQo1P2SRir4y/KfXbzRNZvvJusI1vcJNIscUmxjuYjxliPz47e498Vet+rgV3q4q71cVd6uKu9XF Xj/ny5uvOfna18sac/8AotgSLiUbqr/7uc/6gHEf5W3fCr1PRtLsNH02HTrCMRW0C0Udye7Me7Md zgVG+rirvVxV3q4q71cVeQfmX5ak8v6xbeb9FQRIs6PcxKPhSatQ9B+zJ0b3+eFXqWia3a6xpVtq Vqaw3KBwO6noyn3U7HAqN9XFXerirvVxV3q4ql+v6/a6JpFzqd0f3duhITu7nZEHuzbYqk3/ADir 5DvfN3n28/MHWV9Sz0mVmt2YfDLfyioC+0CNy9iUwq+x8VdirsVdirsVdirsVdirsVdirsVdir5P /wCcv/y0h0y9tPzH0mRbWe4mjttTiDBHa4VSYLiMV3bjHxcDwDfzHFUm8jeax5i0KO7dSl1EfRux Si+ooBqvswIPtirIfUxV3qYq71MVYx5/85Q+XtGf0nB1O5BSzj6kE7GQjwT9eKpZ+VHlv9G6MdVu RXUNUAk5Nuyw9UFT/P8AbP0eGKs69TFXepirvUxV3qYq71MVQ2pWdrqNhPY3S87e5QxyL7EdR7jq MVeYeQ9al8peY73ypq0oW2kl/wBGmbZRIQOJ36LKlPkfpxV6x6mKu9TFXepirvUxV5D5pv8AUvP3 nfTvJ2jMFje7W0hMrcEa4ZuDyPX9lBWnfrTrTFX3P5D8laR5K8qaf5b0pf8ARrGPi8xADzSt8Ukz 0/adiT7dBsMVT/FXYq7FXYq7FXYq7FXYq7FXYq7FXYq+Hv8AnIHzre/mT+a6+W9NmromiyPZ2xG6 GRf967g+PxLxXxCinXFWSaVYWel6fDYWaenbwLxQdz4k+JJ3OBUo84eedP8ALluocfWL+UVgtVND T+dzvxX9f30KvItX/MHzZqcpZ7+S2jP2YLUmFAPD4Tyb/ZE4qlcOv67C5eHUbqNz1ZJpFP4HFUPc Xlxd3Pr3s0lxKxHqSSMXcgf5TVOKvpPT76zurGC4snV7SRAYWXpxpsPanSmBUR6uKu9XFXerirvV xV3q4q71cVeKfm5eWNz5oUWzB5YLdYror0EgZjxPuFYV+7CrGP8AEOv+gtuNSuhAoosXrScAOlAv KmKqln5n8xWbhrbUrmOhrxErlT81JKn6Rir0Lyd+bTzzx2Ov8FZzxj1BQEWp6CVRsK/zDb274q9M 9XArzP8ANLy28EsXmjS6wXMLobpoiVYMCPTnUjoytQEj2OFX17+Rf5kDz/8Al7Y6tOw/S1tWz1ZB T/emICr0HQSqVf6adsVeg4q7FXYq7FXYq7FXYq7FXYq7FXYqxr8y/MjeWfy/8wa7G3CewsZpLZj0 9coVh/5KMuKvh/8AJ7Tl43+rSDlIzC2jY9ezyffVcVeiXd7Fa2s11MaRQI0sh8FQFj+AxV886zq1 1q2p3GoXJrLOxanZV6Ko9lG2KoLFXYq7FXo/5R+YZUuZ9EmesMima1BP2XX7aj/WHxfRir1H1MVd 6mKu9TFXepirvUxVJvN+vnRvL91exn/SKCO3B/34+ynf+X7X0Yq8Cd3kdpHYu7kszMakk7kknFVu KuxV2KvZ/wAr/MMmo6E1pOxa404iPkdyYmBMdflQr9GKsqv7aC9sp7OccobiNo3Hswpiq7/nDTX7 nS/Pev8AlO4akV7bGYJ2+sWUnA0+aStX/VGKvsHFXYq7FXYq7FXYq7FXYq7FXYq7FXln/OULun5F eZyrFSRZCoNNmv7cEfSDir5f/K8hfKy02JnkJ+ew/hiqa+cZX/wvqfDqYGH0HY/hirwnFXYq7FXY qyH8v2dfN+nlOvKQH5GJq/hir231cCu9XFXerirvVxV3q4qwj82ZGOg2q/sfWlJ+fpvT+OFXlGKu xV2KuxVnv5RySLqd+o/uzApb/WD7frOKvUfVwKkf5DytB/zk1ZRxGiXEuoLJ7g2U0p6f5S4VfcWK uxV2KuxV2KuxV2KuxV2KuxV2KsB/PvRJNa/J7zVYxqXkWyN0qDqTZut1QDuf3OKvjn8rL4Po9zaV q9vNzp/kyKKfihxVl1/bpeWVxaSVCXEbxMR1AdStR9+BXhF7Zz2d3La3C8JoWKOvuP4eGFVDFXYq 7FWb/lfpLy6nLqjr+5tVMcTb7yuKGnyStfmMVenczgVK/wDFnl4TPC2oQpJGxR1duNGBod2oOuFV ZPMOiPumoWzAdaTRn+OBVOTzR5fjBLalbbbECVCfuBOFURp+rWOowtNZTLPErFGda0DAA03+eBUt 86aVJqvl+4giXlPFSaBe5ZOoHuVJAwq8WxV2KuxV2KvUvyx0qS00qa+lUh71h6YP++46gH6STirM zJQVOwHU4FUP+cU7KTWfzxvNYQH0LK2vLst2HrMIUX7pT92FX2tirsVdirsVdirsVdirsVdirsVd iq2WKOWJ4pVDxyKVdGFQVIoQR74q/PzXNBn/ACv/ADa1HQLyq6YZCtvM1aNZzHnby1PXiKBvAhhi r0EWwIBG4PQ4qxbzn+X8etr9atCsGpIKcm+xKo6K9OhHZvo+SryfVND1fSpfS1C0kt2rQMw+Bv8A VcVVvoOKoEAk0AqfDFWUeXPy817V5VeaFrKy6tPMpViP8hDQtXx6Yq9e0zQ7TTbKKytI+EMQoK7k nuzHuTiqX+btXh0LRZrtiPrDD07VO7SsNvoX7RxVU/Ir/nG23/MTyze+YtdvrrTreScw6U0CofVM dfWlb1A3JQ/wilNw2Ks+n/5we0MuDB5ruo0puHtY3NfmJE/ViqvB/wA4Q+VAB6/mW/c8aEpFCg5U 6789q9vxxV4N5WjvvKHnbUvKOtj0Z0na1ev2RcRGiMpP7Mq/ZPf4cVelfVfbFXn3nP8ALOe5mk1H RVBlc8p7MkKGJ6tGTtU9wf7MVebXdje2cxhu4JLeUdUlUofuNMVU4oZZpFjiRpJGNFRQSSfYDFWd eU/yw1G7lju9ZjNtZj4hbNtLJ7MOqDxrv+vFXqUdkkaLHGgREAVFUUAA2AAxVjH5h6zHpGhSRIwF 5fAwwr3CkfvH+hTT5kYq9x/5xA/L+XQfIdx5jvY+F95kkWSAMNxZwVEJ8R6jM7+444q97xV2KuxV 2KuxV2KuxV2KuxV2KuxV2KvH/wDnI38lR+YXlxL7SkUeadIVmsa0X6zCfia2ZjTqd4ydg3gGJxV8 weQ/PR0+U+XPMoa0ntXMEU04KNGyHiYZw26lSKAnp0OKvUhbggEbg7gjFXG1BFCKjwxVYthEhJWN VJ6kADFV/wBW9sVS/W9U0vRLFr3UZhDCuyjq7t/Ki9WOKsA8m+UPNH51eeEt4Ee00GzIN5dAVjtb cnfc7NNJT4R3/wBVdlX3doWiaZoWjWej6XCLfT7CFILaEfsogoKnuT1J7nFUdirsVfPH/OUn5GXX ma3HnXyzA0uv2MYTUrOIfHc28YqskYHWWIbU6suw3UAqvGPy9/MC31SOPStXkEWppRIZn2E9Ntye kn6+2KvQfq3tirTWasKMoYeBFcVaSxjQURAo8AAP1Yqu+re2KpR5l8waT5esTdX8lGIPoW60MkjD so/WegxVi/5Sflrrv5x+d21XVkeDytYODfTCoQqp5LZwN3dgfiP7I3O5UFV90W9vBbW8VtbxrDbw oscMKAKiIgoqqo2AAFAMVVMVdirsVdirsVdirsVdirsVdirsVdirsVeRfnP/AM45+WfzDD6paOuk eaAtBfolYrjiPhW5QULbbBx8QH8wAGKvmPVdI/Of8p5Tbaxp8k2jxnjHOytcWJHb050/u69lYg/5 OKo/Tfz00ORANR064t5O5gKTLXx+IxEfjiqOf87PJaqSsN65HRREgJ++QDFUh1L87b67cWnl/ST9 YlPCF5iZZGZjQBYYx9rw+I/LFWUeRv8AnGn8zfP2oRax55nm0XSmoSLgD666VrwhtjtAD4uBTrxb FX1x5P8AJvlzyfocOieX7NLOwh3Kru8jkANJK53d2puT+rFU6xV2KuxV2KvAvzq/5xY0nzbcXHmD ynJHpPmGUmS5tXFLS6c7ljx3ikbuwBUnqKktir5+udb/ADX/AC3uV0zzZpMxt0PCI3iniwA6QXac kcfS2Kp5Y/nh5VmVRd2l1ayH7VFSVB/sgyt/wuKomf8AOnyTGlYxdTt/KkQH/E2XFWOah+cutanM th5Z0lhczHjCSDcTsT04QoKV/wCCxVm35c/84s+d/NuoR67+YlxNplg5DNZu1b+ZR0Uqarbp8/iH 8o64q+tvL/l7RfL2kW2j6LaR2Om2i8ILeIUUDqSe7Mx3ZjuTucVTDFXYq7FXYq7FXYq7FXYq7FXY q7FXYq7FXYq7FVsnp+m3qU9Oh58qceNN617Yq8Y85/8AQqH1iX9P/wCHfrdf3/1Th63Ku/P6l8fL xrvirF7f/oSj1k4fo7nXb1P0hw+nn8P34q9d/L//AJU/6Z/wH+hOVP3n6L+retSn+7fT/eVp/Pir NMVdirsVdirsVdirsVQmrfon9Hzfpf6v+j6f6R9b4ejx/wAv1Php88VeDea/+hM/Xf8ASn6H9Tfl +i/rHGtRWn6N+H7sVSbS/wDoR76wPq31f1Nv96v0xw6/8vPwYq9w8gf8qs+qt/gP9D+jx/ffon6v ypX/AHb6Pxdf5sVZbirsVdirsVdirsVdirsVdirsVf/Z - - - - - - xmp.did:F77F11740720681192B09C5D161A8504 - uuid:f539c125-b860-0645-ab61-1ebd5b69fd84 - uuid:44F4E52A333FDF119697BF3D5A982C1E - proof:pdf - - uuid:807614af-ea61-034d-bdc9-4644d641c546 - uuid:44F4E52A333FDF119697BF3D5A982C1E - uuid:44F4E52A333FDF119697BF3D5A982C1E - - - - - saved - xmp.iid:F77F11740720681192B09C5D161A8504 - 2011-05-19T22:19:39-05:00 - Adobe Illustrator CS5 - / - - - - - - Document - Basic RGB - - - 1 - True - False - - 1024.000000 - 768.000000 - Pixels - - - - Cyan - Magenta - Yellow - Black - - - - - - Default Swatch Group - 0 - - - - White - RGB - PROCESS - 255 - 255 - 255 - - - Black - RGB - PROCESS - 0 - 0 - 0 - - - RGB Red - RGB - PROCESS - 255 - 0 - 0 - - - RGB Yellow - RGB - PROCESS - 255 - 255 - 0 - - - RGB Green - RGB - PROCESS - 0 - 255 - 0 - - - RGB Cyan - RGB - PROCESS - 0 - 255 - 255 - - - RGB Blue - RGB - PROCESS - 0 - 0 - 255 - - - RGB Magenta - RGB - PROCESS - 255 - 0 - 255 - - - R=193 G=39 B=45 - RGB - PROCESS - 193 - 39 - 45 - - - R=237 G=28 B=36 - RGB - PROCESS - 237 - 28 - 36 - - - R=241 G=90 B=36 - RGB - PROCESS - 241 - 90 - 36 - - - R=247 G=147 B=30 - RGB - PROCESS - 247 - 147 - 30 - - - R=251 G=176 B=59 - RGB - PROCESS - 251 - 176 - 59 - - - R=252 G=238 B=33 - RGB - PROCESS - 252 - 238 - 33 - - - R=217 G=224 B=33 - RGB - PROCESS - 217 - 224 - 33 - - - R=140 G=198 B=63 - RGB - PROCESS - 140 - 198 - 63 - - - R=57 G=181 B=74 - RGB - PROCESS - 57 - 181 - 74 - - - R=0 G=146 B=69 - RGB - PROCESS - 0 - 146 - 69 - - - R=0 G=104 B=55 - RGB - PROCESS - 0 - 104 - 55 - - - R=34 G=181 B=115 - RGB - PROCESS - 34 - 181 - 115 - - - R=0 G=169 B=157 - RGB - PROCESS - 0 - 169 - 157 - - - R=41 G=171 B=226 - RGB - PROCESS - 41 - 171 - 226 - - - R=0 G=113 B=188 - RGB - PROCESS - 0 - 113 - 188 - - - R=46 G=49 B=146 - RGB - PROCESS - 46 - 49 - 146 - - - R=27 G=20 B=100 - RGB - PROCESS - 27 - 20 - 100 - - - R=102 G=45 B=145 - RGB - PROCESS - 102 - 45 - 145 - - - R=147 G=39 B=143 - RGB - PROCESS - 147 - 39 - 143 - - - R=158 G=0 B=93 - RGB - PROCESS - 158 - 0 - 93 - - - R=212 G=20 B=90 - RGB - PROCESS - 212 - 20 - 90 - - - R=237 G=30 B=121 - RGB - PROCESS - 237 - 30 - 121 - - - R=199 G=178 B=153 - RGB - PROCESS - 199 - 178 - 153 - - - R=153 G=134 B=117 - RGB - PROCESS - 153 - 134 - 117 - - - R=115 G=99 B=87 - RGB - PROCESS - 115 - 99 - 87 - - - R=83 G=71 B=65 - RGB - PROCESS - 83 - 71 - 65 - - - R=198 G=156 B=109 - RGB - PROCESS - 198 - 156 - 109 - - - R=166 G=124 B=82 - RGB - PROCESS - 166 - 124 - 82 - - - R=140 G=98 B=57 - RGB - PROCESS - 140 - 98 - 57 - - - R=117 G=76 B=36 - RGB - PROCESS - 117 - 76 - 36 - - - R=96 G=56 B=19 - RGB - PROCESS - 96 - 56 - 19 - - - R=66 G=33 B=11 - RGB - PROCESS - 66 - 33 - 11 - - - - - - Grayscale - 1 - - - - K=100 - GRAY - PROCESS - 255 - - - K=90 - GRAY - PROCESS - 229 - - - K=80 - GRAY - PROCESS - 204 - - - K=70 - GRAY - PROCESS - 178 - - - K=60 - GRAY - PROCESS - 153 - - - K=50 - GRAY - PROCESS - 127 - - - K=40 - GRAY - PROCESS - 101 - - - K=30 - GRAY - PROCESS - 76 - - - K=20 - GRAY - PROCESS - 50 - - - K=10 - GRAY - PROCESS - 25 - - - R=241 G=241 B=242 - GRAY - PROCESS - 12 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - endstream endobj 3 0 obj <> endobj 10 0 obj <>/Resources<>/ExtGState<>/Properties<>/Shading<>/XObject<>>>/Thumb 153 0 R/TrimBox[0.0 0.0 1024.0 768.0]/Type/Page>> endobj 141 0 obj <>stream -H‰Ü—Ë’Ý4†÷~ -½€5ºtë²e¸¬•šìS@g  ‹¼>_˶|Ž PE± ™ªøôo«¥¾ü­î§ïžÝÓ›çà¾øòÙ-_½á¿§ ŠôÛ’zó)‰“|w¯Sεøœ\ŽÉ÷Z\Îêck<«oÊ3$Cuï–+r[rR_{s©5ŸKDGóR“K5 Ÿ¢_òPqAn'ª×À14{ÉÝÅš¼fu¹¯U¦ŒŽ r[$›¶2ÑîbŸ¥:á8©pÌ$¾jGÇAGm¾†’}ÁiÕç]­;a×eÊè¸ ·EƒxÕ45—JÞt¦æ4Ek»l~·\täè+kíìíZ‚oøÅlK¡8ŒŽ r[Jnìß&R*çQ>Ž5Ÿ2QÈ¡¡ãŠÜN¤tl@G±Pir 6WSK„+D_‚™rEPQ@:!ŒI4²$ž(È ÓH@!ãòvŒG-{-†ˆOdii–.ˆÙW²¤t²¥Ë”QqAnKÍï÷‰Ô½v²sD¼NYˆE3åŠÜN¤È É¡SºyGæ9ù<ǘ)ð-žˆ™FpL”˜‡7Áh)QvoÜ#¨ê;>V‚2’£V_ n€D5ÎÝÅ3Ew¶µBvÕ8J€B (Í=–ˆwË÷î -ÇÓ7/ÁýüaYƒü‹äÚ* ƒ´FZ?ç7šñUägÉû~A¤ãß×å‹ÜÓËûà>¼w_ýàÞ.oÙ%¸ -!c`ûÕ~ýþãØþéù%ºçÆŸ{yþv‰Á}tâÞ¸y²ß\¯ãˆ¸{Ù²êu±W¯ËªÞÎçÖ¨0ê0²!ª'Ð<±y%÷*š‹;(¯kRÍ‚RzõðáYN…4ó“ÜÙ -÷âÕD6Oy­Ý‡‘'Gmà4¹qž±c±šT@TGY[¶\ƺR}!×9o#¹ªäÄšŒVˆtؼqb=y!§×,a|Í ƒ¢½)$×”Y”Jÿü$g˜lœÔ«mšÉûQíÚб ¾×ž +¸Ü~à¡x Í6ݽ8–qé±tÿ‘¹Dã†ähž°˶]9Ž¿¨˜A·Cµ`Ì 'í¦Tr`%¯Õ 8–á\ åî›ÆÅ3ï…«àSѤhµDíãâ´+™ ¯ã©‡È–…[œ;ûx¯Õ.›}õ.sößëxö•ëEõzêÞ÷>0מqúÿX³Eǘ§¦ko‡Ñ{]” -¨T:J1}!…xˆÜ[b7¼õž}Ê´äv"‰‚Û­ÝšZvdnBW*”äã\äôœ–¾Wä6F#ÁÓÅM9ÒjrWS8c±96}ýÄÁ>qø}Ñ d›cÒ麒Do-\ˉPzÛ` ÖÂêhYk°Ê¨ÉëÝ”E³ÅSv,ý^ÇŽl:ƾv7à»y®Ý˜‹µw]V´¢ éµË–‘>žê܉/W(Mt,ÜYvnºTôì¦âC7õ¯+5S™Ý¹¬Ôd÷_S¦=R¦\)£”I”Iw”I{ÚWw¬¼RåÊ´‰„¹öo õçnÖ]%ndŒH9V+äfˆ6ßl¬ÒØÕN÷Iñ³EÉÐÂ͟ᎎõŠÀYšpå©Ù¨¡ô~!ç1&ª€O6Ë6º–E¬o$Úhஈé üjkÌ(­6šN¬R’2W“Ñ­c–½ VMÄ1ÖÔ£zX"çFoÈtA›c¶¤1ÂXEzD̺ºž+À¥æ!F/-úEÚºÌw‘r¬ª£ËÌt›±¤aÛ#b*è›è`mM¥éTØžDF°Û]Âtey°R˜GNàç†Gi¢©±•jA£mp` MÊ¥µv™(ñ…Ø~“÷é¿á½XÖ$ úL ò¼ÿÜÍ:yo×i&!ö$~]ìáš;Ó\˜Nú5„ÑÕ&€ƒ:xÒžt»"èˆ6ƒÄIQkœ*^;(,Ì´ÚïiEìÊÆY*ì",uVaˆ´rµ—Óð ^ÚˆrÖ'UÚrÔ4Ô£KgÍ6UîèvEÐQìj®ie¸=lDËï$ý±cT.{…B$¹ö($—]I¿þë×;ÚÃ_åÜ¥‘—•«Ÿ®Ì¦µIû> endobj 153 0 obj <>stream -8;Z]!;3HST$q,.Ym_`Jq0DG!#?=uR>,U-"6VVR<81mJu=2/-AbFPfHZ:ad$(7jNE6 -ApK.(fsgOIit\ad;7ooj\K,@bVfGV7-.+GtS]'eTW4e -SZ54aAJ7[XPOq(AAD38]N11UZbj=]8W/PSZa,60Pf+*,/Ls,gF=JK=_Y0"5p8P_=B -UgqPoTOcn<9^/!YQ]n_\7"^*A\YFS;T(P%0_Da_/gF$gAFpG"MR-+%H\KTgaD!;/_s^dMW`sc<8_&c6H9u -fXt((Anm5,Zm'&W<;D8j%^u)Tj!r4SbbT0@Ag04`h`5!2;p%7F%d'!5dPuQ,8]m*g -arY0EpP@#4@ra7N?1rXNiHOinp/?/$O*qHXn#%B81ob,VmZL,5:ad"bL&S?+"onpA6MC~> endstream endobj 155 0 obj [/Indexed/DeviceRGB 255 156 0 R] endobj 156 0 obj <>stream -8;X]O>EqN@%''O_@%e@?J;%+8(9e>X=MR6S?i^YgA3=].HDXF.R$lIL@"pJ+EP(%0 -b]6ajmNZn*!='OQZeQ^Y*,=]?C.B+\Ulg9dhD*"iC[;*=3`oP1[!S^)?1)IZ4dup` -E1r!/,*0[*9.aFIR2&b-C#soRZ7Dl%MLY\.?d>Mn -6%Q2oYfNRF$$+ON<+]RUJmC0InDZ4OTs0S!saG>GGKUlQ*Q?45:CI&4J'_2j$XKrcYp0n+Xl_nU*O( -l[$6Nn+Z_Nq0]s7hs]`XX1nZ8&94a\~> endstream endobj 152 0 obj <>/ExtGState<>>>/Subtype/Form>>stream -/CS0 cs 1 1 1 scn -/GS0 gs -q 1 0 0 1 810.4707 539.9004 cm -0 0 m -0 -88.638 -130.614 -160.492 -291.735 -160.492 c --452.856 -160.492 -583.471 -88.638 -583.471 0 c --583.471 88.637 -452.856 160.492 -291.735 160.492 c --130.614 160.492 0 88.637 0 0 c -f -Q - endstream endobj 157 0 obj <> endobj 145 0 obj <> endobj 144 0 obj [/ICCBased 158 0 R] endobj 158 0 obj <>stream -H‰œ–yTSwÇoÉž•°Ãc [€°5la‘QIBHØADED„ª•2ÖmtFOE.®c­Ö}êÒõ0êè8´׎8GNg¦Óïï÷9÷wïïÝß½÷ó '¥ªµÕ0 Ö ÏJŒÅb¤  - 2y­.-;!à’ÆK°ZÜ ü‹ž^i½"LÊÀ0ðÿ‰-×é @8(”µrœ;q®ª7èLöœy¥•&†Qëñq¶4±jž½ç|æ9ÚÄ -V³)gB£0ñiœWו8#©8wÕ©•õ8_Å٥ʨQãüÜ«QÊj@é&»A)/ÇÙgº>'K‚óÈtÕ;\ú” Ó¥$ÕºF½ZUnÀÜå˜(4TŒ%)ë«”ƒ0C&¯”阤Z£“i˜¿óœ8¦Úbx‘ƒE¡ÁÁBÑ;…ú¯›¿P¦ÞÎӓ̹žAü om?çW= -€x¯Íú·¶Ò-Œ¯Àòæ[›Ëû0ñ¾¾øÎ}ø¦y)7ta¾¾õõõ>j¥ÜÇTÐ7úŸ¿@ï¼ÏÇtÜ›ò`qÊ2™±Ê€™ê&¯®ª6ê±ZL®Ä„?â_øóyxg)Ë”z¥ÈçL­UáíÖ*ÔuµSkÿSeØO4?׸¸c¯¯Ø°.òò· åÒR´ ßÞô-•’2ð5ßáÞüÜÏ ú÷Sá>Ó£V­š‹“då`r£¾n~ÏôY &à+`œ;ÂA4ˆÉ 䀰ÈA9Ð=¨- t°lÃ`;»Á~pŒƒÁ ðGp| ®[`Lƒ‡`<¯ "A ˆ YA+äùCb(Š‡R¡,¨*T2B-Ð -¨ꇆ¡Ðnè÷ÐQètº}MA ï —0Óal»Á¾°ŽSàx ¬‚kà&¸^Á£ð>ø0|>_ƒ'á‡ð,ÂG!"F$H:Rˆ”!z¤éF‘Qd?r 9‹\A&‘GÈ ”ˆrQ ¢áhš‹ÊÑ´íE‡Ñ]èaô4zBgÐ×Á–àE#H ‹*B=¡‹0HØIøˆp†p0MxJ$ùD1„˜D, V›‰½Ä­ÄÄãÄKÄ»ÄY‰dEò"EÒI2’ÔEÚBÚGúŒt™4MzN¦‘Èþär!YKî ’÷?%_&ß#¿¢°(®”0J:EAi¤ôQÆ(Ç()Ó”WT6U@ æP+¨íÔ!ê~êêmêæD ¥eÒÔ´å´!ÚïhŸÓ¦h/èº']B/¢éëèÒÓ¿¢?a0nŒhF!ÃÀXÇØÍ8ÅøšñÜŒkæc&5S˜µ™˜6»lö˜Iaº2c˜K™MÌAæ!æEæ#…åÆ’°d¬VÖë(ëk–Íe‹Øél »—½‡}Ž}ŸCâ¸qâ9 -N'çÎ)Î].ÂuæJ¸rî -î÷ wšGä xR^¯‡÷[ÞoÆœchžgÞ`>bþ‰ù$á»ñ¥ü*~ÿ ÿ:ÿ¥…EŒ…ÒbÅ~‹ËÏ,m,£-•–Ý–,¯Y¾´Â¬â­*­6X[ݱF­=­3­ë­·YŸ±~dó ·‘ÛtÛ´¹i ÛzÚfÙ6Û~`{ÁvÖÎÞ.ÑNg·Åî”Ý#{¾}´}…ý€ý§ö¸‘j‡‡ÏþŠ™c1X6„Æfm“Ž;'_9 œr:œ8Ýq¦:‹ËœœO:ϸ8¸¤¹´¸ìu¹éJq»–»nv=ëúÌMà–ï¶ÊmÜí¾ÀR 4 ö -n»3Ü£ÜkÜGݯz=Ä•[=¾ô„=ƒ<Ë=GTB(É/ÙSòƒ,]6*›-•–¾W:#—È7Ë*¢ŠÊe¿ò^YDYÙ}U„j£êAyTù`ù#µD=¬þ¶"©b{ųÊôÊ+¬Ê¯: !kJ4Gµm¥ötµ}uCõ%—®K7YV³©fFŸ¢ßY Õ.©=bàá?SŒîÆ•Æ©ºÈº‘ºçõyõ‡Ø Ú† žkï5%4ý¦m–7Ÿlqlio™Z³lG+ÔZÚz²Í¹­³mzyâò]íÔöÊö?uøuôw|¿"űN»ÎåwW&®ÜÛe֥ﺱ*|ÕöÕèjõê‰5k¶¬yÝ­èþ¢Ç¯g°ç‡^yïkEk‡Öþ¸®lÝD_p߶õÄõÚõ×7DmØÕÏîoê¿»1mãál {àûMśΠnßLÝlÜ<9”úO¤[þ˜¸™$™™üšhšÕ›B›¯œœ‰œ÷dÒž@ž®ŸŸ‹Ÿú i Ø¡G¡¶¢&¢–££v£æ¤V¤Ç¥8¥©¦¦‹¦ý§n§à¨R¨Ä©7©©ªª««u«é¬\¬Ð­D­¸®-®¡¯¯‹°°u°ê±`±Ö²K²Â³8³®´%´œµµŠ¶¶y¶ð·h·à¸Y¸Ñ¹J¹Âº;ºµ».»§¼!¼›½½¾ -¾„¾ÿ¿z¿õÀpÀìÁgÁãÂ_ÂÛÃXÃÔÄQÄÎÅKÅÈÆFÆÃÇAÇ¿È=ȼÉ:ɹÊ8Ê·Ë6˶Ì5̵Í5͵Î6ζÏ7ϸÐ9кÑ<ѾÒ?ÒÁÓDÓÆÔIÔËÕNÕÑÖUÖØ×\×àØdØèÙlÙñÚvÚûÛ€ÜÜŠÝÝ–ÞÞ¢ß)߯à6à½áDáÌâSâÛãcãëäsäüå„æ æ–çç©è2è¼éFéÐê[êåëpëûì†ííœî(î´ï@ïÌðXðåñrñÿòŒóó§ô4ôÂõPõÞömöû÷Šøø¨ù8ùÇúWúçûwüü˜ý)ýºþKþÜÿmÿÿ ÷„óû endstream endobj 148 0 obj <> endobj 149 0 obj <> endobj 150 0 obj <> endobj 151 0 obj <> endobj 160 0 obj <>stream - endstream endobj 159 0 obj <> endobj 161 0 obj <> endobj 162 0 obj <> endobj 136 0 obj <> endobj 137 0 obj <> endobj 138 0 obj <> endobj 139 0 obj <> endobj 169 0 obj [/View/Design] endobj 170 0 obj <>>> endobj 167 0 obj [/View/Design] endobj 168 0 obj <>>> endobj 165 0 obj [/View/Design] endobj 166 0 obj <>>> endobj 163 0 obj [/View/Design] endobj 164 0 obj <>>> endobj 146 0 obj <> endobj 147 0 obj <> endobj 171 0 obj <> endobj 172 0 obj [0.0] endobj 173 0 obj <>/XObject<>>>/Subtype/Form>>stream -0 g -/GS0 gs -227 700.392 583.471 -320.984 re -f -q -0 Tc 0 Tw 0 Ts 100 Tz 0 Tr /Fm0 Do -Q - endstream endobj 174 0 obj <> endobj 175 0 obj <>/ExtGState<>/Shading<>>>/Subtype/Form>>stream -q -693.494 499.944 m -688.214 499.944 683.06 499.413 678.073 498.414 c -647.922 569.134 577.77 618.71 496.034 618.71 c -386.787 618.71 298.224 530.147 298.224 420.9 c -298.224 376.319 312.976 335.188 337.858 302.107 c -325.798 288.361 318.472 270.36 318.472 250.637 c -318.472 207.502 353.439 172.534 396.574 172.534 c -430.636 172.534 459.587 194.347 470.268 224.759 c -478.701 223.661 487.301 223.089 496.034 223.089 c -504.552 223.089 512.943 223.628 521.178 224.673 c -531.789 194.135 560.802 172.206 594.953 172.206 c -638.088 172.206 673.055 207.173 673.055 250.308 c -673.055 269.946 665.79 287.878 653.822 301.602 c -663.895 314.902 672.32 329.515 678.805 345.139 c -683.564 344.232 688.471 343.739 693.494 343.739 c -736.629 343.739 771.596 378.707 771.596 421.841 c -771.596 464.976 736.629 499.944 693.494 499.944 c -W n -q -0 g -/GS0 gs --0.0000153 446.5039062 446.5039062 0.0000153 534.9091797 172.2060547 cm -BX /Sh0 sh EX Q -Q -/CS1 CS 0 0 0 SCN -10 w 4 M 0 j 0 J []0 d -/GS0 gs -q 1 0 0 1 693.4941 499.9438 cm -0 0 m --5.28 0 -10.435 -0.531 -15.421 -1.53 c --45.572 69.19 -115.725 118.767 -197.46 118.767 c --306.708 118.767 -395.271 30.204 -395.271 -79.044 c --395.271 -123.625 -380.519 -164.756 -355.636 -197.836 c --367.696 -211.583 -375.022 -229.583 -375.022 -249.307 c --375.022 -292.442 -340.055 -327.41 -296.92 -327.41 c --262.858 -327.41 -233.907 -305.597 -223.227 -275.185 c --214.793 -276.283 -206.193 -276.855 -197.46 -276.855 c --188.942 -276.855 -180.551 -276.316 -172.316 -275.271 c --161.705 -305.809 -132.692 -327.738 -98.541 -327.738 c --55.406 -327.738 -20.439 -292.771 -20.439 -249.636 c --20.439 -229.998 -27.704 -212.066 -39.672 -198.342 c --29.6 -185.042 -21.174 -170.429 -14.689 -154.805 c --9.93 -155.711 -5.023 -156.205 0 -156.205 c -43.135 -156.205 78.102 -121.237 78.102 -78.103 c -78.102 -34.968 43.135 0 0 0 c -h -S -Q - endstream endobj 176 0 obj <> endobj 177 0 obj <> endobj 179 0 obj <> endobj 180 0 obj <> endobj 181 0 obj <> endobj 182 0 obj <> endobj 178 0 obj [/ICCBased 158 0 R] endobj 143 0 obj <> endobj 183 0 obj <> endobj 184 0 obj <>stream -%!PS-Adobe-3.0 %%Creator: Adobe Illustrator(R) 15.0 %%AI8_CreatorVersion: 15.0.2 %%For: (Aleks Kissinger) () %%Title: (tikzit_bg.ai) %%CreationDate: 19/05/2011 22:22 %%Canvassize: 16383 %%BoundingBox: 10 58 594 592 %%HiResBoundingBox: 10 58.2061 593.4707 591.3921 %%DocumentProcessColors: Cyan Magenta Yellow Black %AI5_FileFormat 11.0 %AI12_BuildNumber: 399 %AI3_ColorUsage: Color %AI7_ImageSettings: 0 %%RGBProcessColor: 0 0 0 ([Registration]) %AI3_Cropmarks: -217 -109 807 659 %AI3_TemplateBox: 256.5 255.5 256.5 255.5 %AI3_TileBox: -11 -121 601 671 %AI3_DocumentPreview: None %AI5_ArtSize: 14400 14400 %AI5_RulerUnits: 6 %AI9_ColorModel: 1 %AI5_ArtFlags: 0 0 0 1 0 0 1 0 0 %AI5_TargetResolution: 800 %AI5_NumLayers: 4 %AI9_OpenToView: -199 623 1 979 695 18 0 0 73 154 0 0 0 1 1 0 1 1 0 1 %AI5_OpenViewLayers: 7777 %%PageOrigin:0 0 %AI7_GridSettings: 72 8 72 8 1 0 0.8 0.8 0.8 0.9 0.9 0.9 %AI9_Flatten: 1 %AI12_CMSettings: 00.MS %%EndComments endstream endobj 185 0 obj <>stream -%%BoundingBox: 10 58 594 592 %%HiResBoundingBox: 10 58.2061 593.4707 591.3921 %AI7_Thumbnail: 128 120 8 %%BeginData: 14118 Hex Bytes %0000330000660000990000CC0033000033330033660033990033CC0033FF %0066000066330066660066990066CC0066FF009900009933009966009999 %0099CC0099FF00CC0000CC3300CC6600CC9900CCCC00CCFF00FF3300FF66 %00FF9900FFCC3300003300333300663300993300CC3300FF333300333333 %3333663333993333CC3333FF3366003366333366663366993366CC3366FF %3399003399333399663399993399CC3399FF33CC0033CC3333CC6633CC99 %33CCCC33CCFF33FF0033FF3333FF6633FF9933FFCC33FFFF660000660033 %6600666600996600CC6600FF6633006633336633666633996633CC6633FF %6666006666336666666666996666CC6666FF669900669933669966669999 %6699CC6699FF66CC0066CC3366CC6666CC9966CCCC66CCFF66FF0066FF33 %66FF6666FF9966FFCC66FFFF9900009900339900669900999900CC9900FF %9933009933339933669933999933CC9933FF996600996633996666996699 %9966CC9966FF9999009999339999669999999999CC9999FF99CC0099CC33 %99CC6699CC9999CCCC99CCFF99FF0099FF3399FF6699FF9999FFCC99FFFF %CC0000CC0033CC0066CC0099CC00CCCC00FFCC3300CC3333CC3366CC3399 %CC33CCCC33FFCC6600CC6633CC6666CC6699CC66CCCC66FFCC9900CC9933 %CC9966CC9999CC99CCCC99FFCCCC00CCCC33CCCC66CCCC99CCCCCCCCCCFF %CCFF00CCFF33CCFF66CCFF99CCFFCCCCFFFFFF0033FF0066FF0099FF00CC %FF3300FF3333FF3366FF3399FF33CCFF33FFFF6600FF6633FF6666FF6699 %FF66CCFF66FFFF9900FF9933FF9966FF9999FF99CCFF99FFFFCC00FFCC33 %FFCC66FFCC99FFCCCCFFCCFFFFFF33FFFF66FFFF99FFFFCC110000001100 %000011111111220000002200000022222222440000004400000044444444 %550000005500000055555555770000007700000077777777880000008800 %000088888888AA000000AA000000AAAAAAAABB000000BB000000BBBBBBBB %DD000000DD000000DDDDDDDDEE000000EE000000EEEEEEEE0000000000FF %00FF0000FFFFFF0000FF00FFFFFF00FFFFFF %524C45FDFCFFFDFCFFFDFCFFFDFCFFFDFCFFFDFCFFFDFCFFFDFCFFFD5BFF %A8FD76FFA8A85252FD0427F827F8272752527D7DA8A8FD6AFF7D52FD13F8 %27277DA8FD63FFA85227FD07F827277D527D7DA87D7D52522727FD06F827 %7DA8FD5EFF7D52FD05F85252A8A8FD0FFFA87D2727FD04F827A8FD5AFF7D %27FD04F8527DFD0BFFA8FD0BFFA8A85227F8F8F8277DFD56FF7D27F8F8F8 %277DFD1DFFA87D27F8F8F827A8FD52FFA827F8F8F827A8FD04FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFFFFF7D52F8F8 %F827A8FD4FFF7DF8F8F8277DFD26FFA827F8F8F852FD4CFFA827F8F8F87D %FFFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFFFFF7D27F8F827FD4AFF7D27F8F827FD05FFA8FF %FFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFF %A8FFFFFFA8FFFFFFA852F8F8F8A8FD47FF52F8F8F852FFFFFFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFFF7DF8F8F87DFD45FF52F8F827A8FFFFFFA9FFFFFF %A9FFFFFFA9FFFFFFA9FFFFFFA9FFFFFFA9FFFFFFA9FFFFFFA9FFFFFFA9FF %FFFFA9FFFFFFA9FFFFFFA8FFFFA827F8F852FD43FF27F8F827A8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFFFFF27F8F852FD41FF27F8F852 %A8FFCFFFA8FFCFFFA8FFCFFFA8FFCFFFA8FFCFFFA8FFCFFFA8FFCFFFA8FF %CFFFA8FFCFFFA8FFCFFFA8FFCFFFA8FFCFFFA8FFCFFFA8FFFFFF52F8F852 %FD3FFF52F8F852A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FF52F8F852FD3DFF7DF8F852FFFFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFFFFF52F8F87DFD3BFF7DF8F827A8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF27 %F8F87DFD39FFA8F8F827A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FF27F8F8A8FD37FFA827F8F87DFFA8A8A8 %FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8 %A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFFD04A8 %F8F8F8FD37FF7DF8F87DFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFFFA8F8F852FD35FFA8F8F852FFA8FF %A8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8 %A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FF %A8A8A8FFCF52F8F87DFD34FF27F8F8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA827F827FD33 %FF52F8F87DFD45A8FF7DF8F87DFD31FFA827F852A8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FF52F8F8FD31FF52F8F87DFFFD48A8F8F852FD30FFF8F852FFA8A8A8FF %A8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8 %A8FFA8FFA8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FF %A8A8A8FFA8A8A8FFFF7DF8F8A8FD2EFF52F8F8FD22A8FFFD07A8FFFD21A8 %F8F8527D7D527D7DA8A8FD27FF27F852A8FFA8A8A8FFA8A8A8FFA8A8A8FF %A8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8FF7D7D27522752275227527DA8 %A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FF %A8FF52FD08F827277DFD24FF7DF8F87DFD1EA87D27FD0CF8527DFFFD1EA8 %F8F8F827F827FD05F82752FD22FF27F827FFFD1BA8FF7D27F827F827F827 %F827F827F827F827F82727FD1CA8CFA87D7DFD05A87D7D27FD04F8A8FD1F %FFA8F8F87DFD1CA827F8F827F827F827F827F827F827F827F827F8F8F87D %FD26A87D52F8F8F852FD1EFF7DF827A8FFFD1AA82727F827F827F827F827 %F827F827F827F827F827F827F87DA8FFFD23A8FFA8A827F8F852FD1DFF27 %F827FD1BA827F8F827F827F827F827F827F827F827F827F827F827F827F8 %7DFD28A827F8F852FD1CFF27F87DFD1AA82727F827F827F827F827F827F8 %27F827F827F827F827F827F827F87DFD1DA8FFFD09A8FF52F8F852FD1AFF %A8F8F87DA8A8A87DA8A8A87DA8A8A87DA8A8A87DA8A8A87DA8A8A87DA852 %F8F827F827F827F827F827F827F827F827F827F827F827F827F827F8FD05 %A87DA8A8A87DA8A8A87DA8A8A87DA8A8A87DFD05A8FD057DFD05A87DA8A8 %A827F8F87DFD19FF7DF8F8FD18A8FF7D27F8272727F8272727F8272727F8 %272727F8272727F8272727F8FD0427FFFD16A87D522727F827F82752FD08 %A8FF27F8F8FD19FF52F827FD04A87DA8A8A87DA8A8A87DA8A8A87DA8A8A8 %7DFD04A852F827F827F827F827F827F827F827F827F827F827F827F827F8 %27F827F8F87DA8A8A87DA8A8A87DA8A8A87DA8A8A87DFD05A827F8F827F8 %27F827F8F8F852A8A87DFD04A87DF8F852FD18FF27F852FFFD17A87DF827 %2727F8272727F8272727F8272727F8272727F8272727F8272727F827F852 %FD14A82727F827F8272727F8272727F852FD07A852F827A8FD16FFA8F8F8 %7DA8A87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA827F8F827F8 %27F827F827F827F827F827F827F827F827F827F827F827F827F827F87DA8 %A87DA87DA87DA87DA87DA87DA87DA87DA827F8F827F827F827F827F827F8 %27F852A8A87DA87DA87DF8F87DFD16FFA8F8F87DFD18A827F8272727F827 %2727F8272727F8272727F8272727F8272727F8272727F827272752FFFD0F %A8FF5227F8272727F8272727F8272727F827F87DFD06A827F827FD16FF7D %F8F8A8A8A87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA8A87DF827F8 %27F827F827F827F827F827F827F827F827F827F827F827F827F827F827F8 %277DA87DA87DA87DA87DA87DA87DA87DA87D27F827F827F827F827F827F8 %27F827F82727A87DA87DA87D7DF8F8A8FD15FFA8F8277DA8A8A87DA8A8A8 %7DA8A8A87DA8A8A87DA8A8A87DA8A8A852272727F8272727F8272727F827 %2727F8272727F8272727F8272727F8272727F827F8527DA8A8A87DA8A8A8 %7DA8A8A87DA8A852F8272727F8272727F8272727F8272727F82752A87DA8 %7DA87DF8F8A8FD15FF52F8F8A87DA87DA87DA87DA87DA87DA87DA87DA87D %A87DA87DA8A852F827F827F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F82752A8A8A87DA8A7A87DA8A7A8A8A82727F8 %27F827F827F827F827F827F827F827F8527DA87DA87DA8F8F852FD15FF7D %F8277DFD17A8FD2427F827277D7DA87DA87DA87DA87D7DFD1527A87DA87D %A87D27F87DFD15FF52F827A87DA87DA87DA87DA87DA87DA87DA87DA87DA8 %7DA87DA87D27F827F827F827F827F827F827F827F827F827F827F827F827 %F827F827F827F827F827F827F827F827F827F827F827F827F827F827F827 %F827F827F827F827F827F827F8F8F8277DA87DA87DA827F852FD15FF7DF8 %277DA87DA87DA87DA8A8A87DA8A8A87DA8A8A87DA8A8A87DA82727F82727 %27F8272727F8272727F8272727F8272727F8272727F8272727F8272727F8 %272727F8FD042752275227522727F8272727F8272727F8FD0727FD05F8A8 %7DA87DA8A852F852FD15FF52F8F8A87D7D7DA87DA87DA87DA87DA87DA87D %A87DA87DA87DA87D52F827F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F827275252A87DA87DA87DA87DA87D52F8 %27F827F827F827F827F827FD07F8277DA87D7D7DA827F852FD15FF7DF827 %7DA87DA87DA87DA87DA87DA8A8A87DA8A8A87DA8A8A87DA852FD232752FD %05A87DA8A8A87DFD04A852FD0A27FD08F827A87DA87DA87D27F87DFD15FF %7DF8F8FD047DA87D7D7DA87D7D7DA87DA87DA87DA87DA87DA87D7DF827F8 %272727F8272727F8272727F8272727F8272727F8272727F8272727F827F8 %2752A87DA87DA87DA87DA87DA87DA87DA85227F827F827F827FD0BF8527D %A8FD047DF8F87DFD15FFA8F8277DA87DA87DA87DA87DA87DA87DA87DA87D %A87DA87DA87DA87DFD2227A87DA87DA87DA87DA87DA87DA87DA8A8A8FD04 %27FD0DF8277DA87DA87DA852F8F8FD16FF7DF8F8FD127DA87DA87DA87D7D %2727F827F827F827F827F827F827F827F827F827F827F827F827F827F827 %F827F8527DA87DA87DA87DA87DA87DA87DA87DA87D52FD10F852A8FD057D %27F827FD17FFF8F852A87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA8 %7DA8A87DFD20277DA87DA87DA87DA87DA87DA87DA87DA87DA87D52FD0EF8 %27A87DA87DA87D7DF8F852FD16FFA827F852FD177DA77D27F827F8272727 %F8272727F8272727F8272727F8272727F8272727F8FD0427A87DA87DA87D %A87DA8FD0B7D27FD0CF827FD067DA852F8F8A8FD17FF27F827A87DA77D7D %7DA77D7D7DA77D7D7DA77D7D7DA7FD057DA827F8F827F8FD1A277D7DA87D %A87DA87D7D7DA7FD077DA77DA77D52FD09F82752A87D7D7DA77DA87D27F8 %52FD18FF52F827FD1A7DFD0DF827F827F827F827F827F827F827F8F8F852 %FD187D2727F8F8F827F852FD097D27F8F8A8FD18FF7DF8F87D7DA87D7D7D %A87D7D7DA87D7D7DA87D7D7DA87D7D7DA87D7D7D52FD1BF827FD077DA87D %7D7DA87D7D7DA87D7D7DA87D7D7D7E7DA8FD057DA87D7D7DA87D7D7DA87D %52F8F852FD19FFA8F8F852FD1A7D27FD1AF852FD287D52F8F827FD1BFF27 %F852FD1B7D27FD18F852A8FD277D52F8F8F8FD1CFF52F8F87D7D7D527D7D %7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D52FD18F87D7D7D527D %7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D %527D7D7D5227F8F8F8A8FD1CFFA8F8F852FD1B7DFD17F852FD237DA87D7D %5227F8F827FD1EFFA827F8527D7D527D7D7D527D7D7D527D7D7D527D7D7D %527D7D7D527D7D7D5227FD16F8277D7D7D527D7D7D527D7D7D527D7D7D52 %7D7D7D527D7D7D527D7D7D52FD077D5252FD04F852FD20FF52F8F8FD1B7D %FD17F852FD1B7D27F8FD0527FD05F852A8FD21FFA8F8F8527D527D527D52 %7D527D527D527D527D527D527D527D527D527D52FD05F8275252522727F8 %27275252522727FD04F8277D527D527D527D527D527D527D527D527D527D %527D527D527D7D52FD09F82727A8FD24FF27F827FD197D52F8F8F852FD10 %7DF8F8F827FD1A7D27F8F87D5252277D7DA8FD27FF7DF8F8527D7D527D52 %7D527D527D527D527D527D527D527D527D527D27F8F8527D7D527D527D52 %7D527D527D527D527D7D7DF8F8F8527D7D527D527D527D527D527D527D52 %7D527D527D527D527D52F8F87DFD2FFF27F8277D7D7D527D7D7D527D7D7D %527D7D7D527D7D7D527D7D7D52F8F852FD047D527D7D7D527D7D7D527D7D %7D527D7D7DF8F8277D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7D52 %7D7D27F827FD30FF7DF8F8277D527D527D527D527D527D527D527D527D52 %7D527D7D27F8277C7D527D527D527D527D527D527D527D527D527D7D52F8 %F8527D527D527D527D527D527D527D527D527D527D527D5252F8F852FD31 %FF27F8277D7D527D7D7D527D7D7D527D7D7D527D7D7D527D7D7DF827527D %527D7D7D527D7D7D527D7D7D527D7D7D52FD047D52F827FD047D527D7D7D %527D7D7D527D7D7D52FD057D27F827FD32FF7DF8F8527D7D527D527D527D %527D527D527D527D527D527DF8F8277D527D527D527D527D527D527D527D %527D527D527D527D5227F852527D527D527D527D527D527D527D527D527D %527D27F8F87DFD33FF52F8F87D7D7D527D527D527D527D527D527D527D52 %7D52F8F87D527D527D527D527D527D527D527D527D527D527D527D527D27 %F8F87D527D527D527D527D527D527D527D527D527D52F8F852FD35FFF8F8 %F87D527D527D527D527D527D527D527D527D52F8F852527D527D527D527D %527D527D527D527D527D527D527D527D527DF8F8277D527D527D527D527D %527D527D527D527D5227F8F8A8FD35FFA8F8F8277D527D527D527D527D52 %7D7D7D527D7D27F8277D7D527D527D527D527D527D527D527D527D527D52 %7D527D527D7D52F8F8527D7D7D527D7D7D527D527D527D527D7C52F8F87D %FD36FF52F8F852527D527D527D527D525227FD045227F8F8277D527D527D %527D527D527D527D527D527D527D527D527D527D527D5227F8F8277D5252 %2752527D527D527D527D527D27F8F87DFD35FF7DF8F827527D527D527D7D %522727FD09F87D527D527D527D527D527D527D527D527D527D527D527D52 %7D527D527D27FD04F826F8F8F8272752527D527D527D527D27F8F8A8FD34 %FF27F8275252527D527C5227FD0CF85252527D5252527D5252527D525252 %7D5252527D5252527D5252527D5252FD0CF8277D5252527D5252F8F827FD %33FFA8F8F8527D527D527D5227FD0DF852527D527D527D527D527D527D52 %7D527D527D527D527D527D527D527D27FD0DF8527D527D527D5252F8F87D %FD32FF27F8F87D5252527D5227FD0FF852527D5252527D5252527D525252 %7D5252527D5252527D5252527D27FD0FF8527D527D52525227F852FD31FF %A8F8F852527D527D5252FD10F8277D527D527D527D527D527D527D527D52 %7D527D527D527D527D52FD10F827527D527D527D27F8F8FD31FF7DF8F8FD %0652FD12F827FD185227FD11F8FD0752F8F87DFD30FF52F8277D527D527D %27FD12F827527D527D527D527D527D527D527D527D527D527D527D5252FD %13F87D527D527D5227F852FD30FF27F827FD055227FD13F8FD16527D27FD %13F8FD065227F827FD30FFF8F8277D5252527D27FD13F85252527D525252 %7D5252527D5252527D5252527D52525227FD13F8FD04527D5252F827FD2F %FFA8F8F8FD065227FD13F8FD1752FD14F827FD055227F8F8FD30FFF8F827 %7D5252527D27FD12F827527C527D5252527D5252527D5252527D5252527D %52525227FD13F8FD04527D5252F827FD2FFFA8F8F8FD065227FD13F8FD17 %5227FD13F827FD055227F8F8FD30FFF8F827FD055227FD12F827FD1852FD %13F8FD0752F827FD30FF27F827525227525252FD12F8275227FD07522752 %525227FD0752275227FD12F827525227525252F8F827FD30FF52F8F8FD06 %5227FD11F8FD0A527CFD0E5227FD11F827FD065227F87DFD30FF7DF8F827 %525152525227FD10F827FD0652FD05F827F827F827F8F8F827FD0652FD11 %F8FD0752F8F87DFD31FF27F8FD075227FD0EF827FD05527652FD0EF8FD07 %52FD0FF8FD06527D27F8F8FD32FF27F8F8FD075227FD0CF827FD075227F8 %F8527D525227FD04527DF8F827FD065227FD0DF8FD0852F8F852FD32FFA8 %F8F8277D527D527D527D5227FD09F852527D527D527D527CF8F852FD0AFF %52F827527D527D527D5252FD0AF8277D527D527D527D5252F8F8A8FD33FF %52F8F85252527C5252527D5252F827F8F8F8272752527D5252527C527DF8 %F8F8A8FD0AFFA8F8F8275252527C5252527D2727F827F8F8F827527CFD08 %52F8F827FD34FFA8F8F827527D527D527D527D527D527D527D527D527D52 %7D527D527D27F8F87DFD0CFF52F8F8527C7D527D527D527D527D527D527D %527D527D527D527D527D27F8F8FD36FF7DF8F827527D527D5252527D5252 %527D5252527D5252527D527D27F8F827FD0EFFF8F8F8FD04527D5252527D %527C527D5252527D5252527D527D26F8F87DFD37FF52F8F827527D527D52 %7D527D527D527D527D527D527D7D7D5227F827A8FD0EFFA8F8F8F8527D7D %527D527D527D527D527D527D527D527D7D7D27F8F852FD39FF27F8F82752 %7D527D527D527D527D527D527D527D527D27F8F827A8FD10FFA8F8F8F852 %527D527D527D527D527D527D527D527D527DF8F8F852FD3BFF52F8F8F827 %7D7D7D767D7D7D52FD067D52F8F8F827A8FD12FFA8F8F8F827527D7D7D52 %7D7D7D52FD067D52F8F8F852FD3DFF7DFD04F852527D76FD057D527D2727 %F8F8F852A8FD14FFA827F8F8F8275252FD077D52522727F8F8F87DFD3FFF %A852FD05F852275227522727FD04F827A8FD18FF7D27F8F8F82727FD0552 %2727FD04F827FD43FFA85227FD0BF8277DFD1BFFA87DFD0DF8527DFD46FF %A8A85252FD0527527DA8FD20FFA87D2727F827F827277D7DFD7AFFA8FD2E %FFFF %%EndData endstream endobj 186 0 obj <>stream -%AI12_CompressedDataxœì= CÛÆÒßðp›’@Œ´’VZÈÏ\NB€\Mj°cmó~ý73»³’ÀmEbôšãÕhçعvV^øick¹ØìîÆË^ÁÉçʽ¸1èöVóÍ?k·‡ýAA‹›Ky7(80¨ø,Ú1ߎ~«ÛY¥ ->¬áÝ‹Åv|ÔÏ¿hõû­ÎAÜ[Ê/.ÁgÛ­A;†O­£ÿµ;»…Fk‰Ÿ -h*|ìª'XŽëæ…Xˆ´ÜèüÙ\ÿÃ¥y+u‡&`/uÿ “¢| |øoxÚÚŒû“# -‘. ñ -~è„ð‹[ð”pá†Jwoxw½î^Üï—»ín¯¿š/ktò/ðI#ÿ1n·»åKíÆÞQ¸ìÔZí>n ò®‹¼)>sÅNiØj7_ wc`…§‚½Bù¶¸-þŽàpçÙ1@¶âÁ& -Dþn>)¥§@º?mÆ-ðêó’AÛëž7zGpï²pÃü²ë¨|ÄÉÀ>ig‰ "…þ è_û» äШeàý²+ܼtà¿ÐÕ'<ŠÿlÅ­æ_u;±fD±7ØÒÒñ}ÇÑÿêO6‡í¸÷¶ÓÀ%‚”æÄËn3nÃx{­Ý Ðå&ÿêÛÞA<¡vÛÃi\ÄON×ßb—¯ðú$îlwßÑ—]¥òRx€L…ð› -ònDØC€¾} ›ü«ñ"ÄÁÈCøél€¼^÷Z­Îª™]¸ó¤×j&2 E>Òÿ…(õŸâÿôLèÁ î>€î”_¦tÁ)¼Ü‚'V;Ír÷9ßG½%è€~´»ú3û;}·O4ô÷i£×ê ÎÜ+ú$ÚÙhá£'½îðäYg¿›[ÔË}»×؃aù×»Ä{X´ü¶5l bXµ'Kg"²zq^7ÓŸüÿçß]‰÷aM%·khµógÜÐZH£ÓÌ¿oôNÎG½Ñnt½<Á-æzëOø¤šáAÁ!˜Ÿ¸Óì[ÜúÏщkØùø¶öPûzùRoØ?Ìow»m‹vô#‹Ý€ Šã³ñŒ º¡óº£4ù$3`üI`u2÷}úàÃ,c/7ÚíÖA¯qrØÚ›ö€)ŸÛ'éÏ.¢Xߎw»íVÿ8ѧd£Ñ´öÚñÖ·þ >> rc¿Õi‚"’uKfÛ=>Á"¿uØ8‰ çà°F#·,Â`,pÚÆ./çÜ|©“²ÀOzf Œ7>o;ÆqÜÌPÞs–rS¡à8¼|©™û”{S.\NTƒ« -W%*ÃUŠŠp©B¸dÀåÃåE.7¬ÁU +a9,ÁU &sa—z¡]¸Yƒ«*˲$‹¹GðÄPÂ…Cô æØaUY¡4.W„Ã%þpùÒ“.W:Ò jpUsA®2\¥ —‚+‚IÈ |ýDü‘fbÓžZ¡§–ÆžªŸæÑÓøyU¸*¹±çEæyÉáCü~ànàøU¿â—ý’¯€¡/}ß÷|ỾãU½ŠWöJ^bÏx¾çy®çˆš¨ÂUåœ(‰¢PÀû¨„/È+É)`I”AœÕœ¨yHX€¤x’W ÿèAô¡æ; 4Ä÷ЕtFùEО2hQÕ¯0Ð*ºåƒÒÉi_zX­DݬªÖˆe ÓÒlÓŒ«â0ŒKX's†{,³„‡š‹š>ÙI6ÙÙ -Ù“ša«K4|–“!ñ²ò9Z5ͧyõ§žrë¹Óýúùž}šcÏYÏ~)ß>éÚs³úv)š© •¯M•«u,dú -O½¢S/•\¹ôÆÚN»J§^c?9û[唫zÊU›~å¬mŸ¼ÜS.‘\é½ TG®Zr)'u¹ö¶â1Zõr¶°Å5P¾"{)SI®’)”M‘¤bë¤ÕÖK’šI‘–7•M…©y¦€ª‹¨ya]LÅrjhJªº¬j -«º´ªË«|URW• ®¦èêG/.lùU{s¸räÔÑ­óÏWÑüËŸ/|UíUÓWŽ"Óþ­l¬E:BÐQ‚‰þ‰RRæ™P]mq*çÕ¨ÄX5µ-–¨ÜX¤’£2µmg%ÙÚÀT´½&þCî@dQ#ó[%LúG⢠v#[x–d˜É4›8C}vudBW5GõËŠ1×%2Ù:Ú‰¨šjõ§@É·F\P0å’¤jdЫDÌ"GQ™þQÖ‡´~ª|ú𠪺É6šIíh’'Žf‰jl«ªbsC»-Š aÎìY…6<½ïr¼o°8¶AJ)^ÎltÝÛôʣ㛢%»!Z³MÂ^n¬Ox²SxZòiÊ2 -sf“sZǰ錶;Õå±]j]û -9ÆÖå¯ÜDõ‹ÛŠ¶îU35/ª]“mÉÜ—"Í^7w¥M…$NÚs$¢ð$ÉLof£¤<]#Ì‘pF[õvõøî"Ëà,þûh»Ç»´MCñßm& .ý¤› ÝOP3'Nn¬¥ Ù„æhj^§KoF—̆t™‹º´È°— …EÛ¥³p´Ü¨;:G;]&ûŒvYd0Äd‚«´Bµá r°‚Ñ.•ÉÀFdZÑ ^“÷½ÒÏ5 $ÎsN¦¬Â©—7vùæ -F¯ü#G®päb_ã›M§Óf'CŸcflòFªú’?úƒ³P<Ê9ÿønÚÅ÷Ó&vÔrèrFvÔNßS›¶«6±¯–+ÂR†Kí¯q%Î"­#á%Y¾°¹}z@¦*XIYjrW¨Jn~t[Èì -yc»BÉ~2»Aéý r²”ãí » ”ìÿ$»>¼­ƒÆ::êÑŽ†ôcNGL:z2±”›ZréE¥—Òèêþ§VçDï#-0éËO_¹‘î˜ÑKN\á”+½r©î÷Ñ«8å*M½Êé+g~™^þ«žrÕÒWâdqÙ’‚Onk½NJË‚<“CÙòhU™éŠr9gKÊ|®Íœ1£l†s½pÖâšj²NV8Q1IŠŽÕ ½8¿àOnìïš½ôOeäJ~¦Á4B4‚.fˆSœM«¼S⪑È*7=¸¢*eÍÖ%=a¥÷“‚#±¼ˆ3M)@š•#IMm -Õã¹Í”Ì&gÓš$¥¡t&•Íp&ÃyLdl‘4ÖÉ7öŠ²—œN^ŒñçÌ¥dr–Èä,I¾âwÀ™JÕ&)&AÉ™ …ó“tv’ÎP¦ä'¦lŒ?Q’œäFòß–¥9S¦lm–¹2l³•îd·ÁTŒsäzF¯‰±ϼJ§\Ó7È2WNUþÙ~j£W.ùµæœ{M[âîè˜Ü h.tý7­Áp¦÷iÏÖÕ[Iuõê^K?7Òni›òÇzz“ÎüÑ®Þj:i¥œÕÏ™¤5¶r£~uJOoJ_“®ÞÒHWoªuŸûz¹³—{{Ç»{“+éñ5‰VÎd»:ßÒí¾:ëÒyW¨s'»eö…ìŽM²EhìPΤfé«6~¥ )#7*½ßVâF¡ðôëQ -"ˆ"<Rp@(>},¼@¨¼˜zää*Hèx -ì)F¸|ªÀ_?ovBPBHhpxp?t[ ÌG€ô"™Õu"¥Y±¿¨¦àŽ¢w¼„"ðñ%/Ž&Ø`…Е>¾…HE©Ã6WA‚³@ÆF®ï…xJ4®Bè+"Iß釄)ïÃ#Àq§šÉ.u»yr ”K’T¾Å7·ú*r<•Ü+ -š“HŒRéG_ê~ól« G+X‘²/ Ò÷x^«¹ùt×ܬw\¤[n~k´GÏ)MÂòîüœÒüœÒüœÒüœÒüœÒüœÒüœÒüœÒüLKÖδÌeúýÉt~Né_9§4Ëù£YÏ2]:óS2/±DØ)óšW‰çUây•x^%žW‰¯X%žï·N.ÿqßñ]ï·Î»Úæ]mÿ*ÂyWÛ¼«mÞÕ6ïjû‘ºÚæ§Zç§ZÏðˆs„û™ŸjŸjŸj½±ç§Zç§Zç§Zç§Zç§Z3qªuþÆ¿ùÿæoüË(Âùÿ.uûüó7þÍßøw#Þø÷é?ÿñ_ŸmùNôdãDÓ 9ý•…“r3wËM|Ǭ+§}ó,@çß©4?«4?«4?«4?«4?«4?«4?«4?×’½s-s™~2ŸUú·¿SI‰‚ç„ᔳHüÉèw+yäŽ~4å„rVF€ô×ß./Ÿñ½¸ð‰§?Ùh q¯Üëýý~<Èo}6zq?o>€$î”(• ‚‚F.ý1ÀÂÎ(Õ…'ÿáýù~ý€åýüËü§ÏN¾Ið›†/ÇôÿK¾a9ô—cþ¿C¿¿ÖI¸p"J¯!÷)÷†XÊ °<*7LËAÃÌy!ž¤¢_°pð¡q “Ù‡ÿîIzš„ƒÊÑ…Š¢G’T©R£Ÿ(dÁõ=3è(=aB|PÂì jÁTß[Ÿ‚gåЄÌZ`9©öèaA!RŽôTOå¾ Ûç{.XU´~ ±‰bX= ƒY*%Ø8é{§ÁR÷ŽªÊbÏÅ%Ç)Øyë‚?/ÎI$F¬ö€|[Äbc ª' ¶ÿõÔÓ`é[§è±'Ÿrë´GL™É”ù&ÁEà -ØKîB¸oaõŒ]L=uï4Xú޳칱âødŽOyˆL„»bc“žKß;îlÈd`Ù4ï˜}>TG @ ¢ã3wÿ´½P¸ß1¨žoÀúH=Esç4XêVœÍÛ\Ug,â˜ìãR)O¤?)õ†ýCÆc·¨ŠÉͤpEøïÃ_¹an$“™žÇP³ Q—. –uäû°ÒƒWã2ÚØ‚ãƒHÀõ1°À )"pÉ)`‹¤“Cµ¹rø¢±K ®°C”B`qLà@C<ˆóz˜¹¾hvGgækû[æ {š¡gç ƒÖ‚ -=¦Vs€¾˜ÙzNÄx±ñA¯1rh°Œ3 Êj4wK Ãe¨.#¥Ñ$£Hõ|añ¼$€e5Æ#P‘Aá£L4ŠÀ Pb}@#žE+GŸ¦ÑÂ*?Å4 ô¬ $›m€"tÍ´µÓ`pfºŽI3å°€Ý@k ŒtýD’>Ó‹Ö¶Aµ÷ÅÊh¨…ì!ò˜¬-h¶ø’UL„¡s»F!¯1™B <64‘§'éP\Ãpek Dü$ÅkÁ®cÖ¾ŠŒÖD`œ7»V SF@SÔK'Òæ€Êõ\Ömì¥Ò6'á¶F PŠ,0ãDèóÒ<‡°¼`‘,ϳGXe†ÌX T~Èkײ Ž° Ç\!7™].O -f‹ËZ:ZÕ5V¥µ€‰$“¨T‹0¤úÒ"`^{ƒ–œð­ÂF™×Zý,p–`­½?@fŒxŸ<(¯cé†r<^ó°xh,Ü&„ dtÈ@/ Í£b¥“Ò7cñÔ³F~ˆ@p$F¥,§o½šï`°[ –£àX¿ŽÛ¨¬Ÿ¡(˜ñªÐ7‹ÑÃd -æJV{ßÕ–€.ök¿*˜·ŽÂ 51 }fM`6Ö‰Ø}¹adïÍe΄’ïO\»ë žè'{ŸD6˜ rPïóó¾8 Qh2°wTh"Gû¡&ᘆEÂõRLÔ@)Xä>:kF8n0&Eõ,ƒÀ3ž)7²¤Ëv"0±•ç „‰Àòj‡=¶iî8>#Ð6=¢DNò´´O qÈCq<#ð}eXÀa.õ™r8"· |æw„ñ¦F€%^ÍXmB¯:ŠM=•‘ Ðü(× €ñœ‘™X¤4 "å+8¤`à³M“¸U¡@€²³ "mq¬Iã "Ð啹¿˜M®’ÊŒ 1ÖXGȉ ’†UFâÑȳA5Œ† P¾ÏœåàÀ^Ä Xo€¯i<Īx…HŸpÃïƒ@?e¬)oÑÀ$ä q7H#ðmp3Ðñ]à«Eëzè…‚‚9¤f„ö»nÀ¾Ç–ƒÜ˜†>'!J›D„I¾?­´)#SN‹­V¤Í^„Kš(´áR„±6¤ ˆ}ñF[¥Qwôu¼ŒCk7qNÖÆÚÉÃm®d& 8’Ž0‰åÙÀ³~D0õ¾ nU6Xº,«ƒ–¯d `ó m|èè–D‚ rˆawÁž^˜úê /B·¦¹ ŽY12‰D#êÝO¯# £1Šar ‚uá øÒµ|àú¶ê`ró-µPGŦ¬t„FƒñŸÍª7¼AjUÛ”ú–ZvUÆ\ˆ ƒ‹@HåýD9ÐyÅMÒ"›¡rSîÇWl#M¦@ß®¸0ä-R©R™‚ -q?†Õ£S–ÄF;lw(çÒ@džsfÍ!ÌeMŒ'±x¿b—"ÑÖh ° /r´ÚÐS¬1¸Ñhx’‹‘«×ÃÀKÛn ¤ -›qT¼ðV{E\ÚˆÛ„ÆDjE Ç#žY`ž´nUûu€qÉ$+M@OÉ> ½„¾_€Ùáû9 aÀ…D¤ -ý¾y’kïÇæ[…˜<€¾` d䞆¦Ô†H¹"¤p#Ü*Z™ºCÊÞC»ZÅóXc='0@×èK€ìQ”ñSLbŠF500É.LâZƒK¾†NÂ(·0…*Øt=í(¬,¹*d¡a¤Iˆ ]¬D즚jç…µMƒU²5¡Ýžǧ‘ËåYšk•^"+n@h¾˜$.ÏÛ¦-®Ã¶è¡Ð¾[ƒhì’rÔHŽ¸L<âàÊóÍlÁd:{ÕÐUÈ• ôƒŽ#Øñì² Ķ³<Ìú’¶8‹jà1À|+ãUµ­¨°oâN©«(".‰…¡Q¯0N“ëd¼¾M4ã\( 't$§°Häx)Ó°önãia¶7p4»«ÔÊ‹R•½À$‡AÒæø“cë ¶ÚLõd ô›O®r0p#ÀÜŽñ&‘';œƒä¤"4¥.|”Ïî†\2#3Ga¤df`ý•2©ÍÀ.H?¹_R:¹*ÌÂ8ÎæЀII)² ˆR`U¹ €æ,o€žo]›‘9#ŸÀz•Ê •É»è>Õ[Aô„N(#øF¥×©Áª¸¬L €@µ\Gi("ˆ¬PvZ‚uR—p ¸¦ÍòR6 ‡%bŠ2 ûaVÃ÷KëDTñ¤õÂäÍ“<Èmè­’r=£œµaÙ N|®ldãü “²©!?Œ¦˜6 Êmý0¥vÈ•A©K=´uç`_„o¬„ÉÛ˜j¤b'+·‰I ,õVJïa:IÑj"òIO, ÌÊÄ™Ž0…% f÷J*Ãhy“ À5 ,£é¼\¤À¼†'‹‚Ä‘©Å‘*`Ç@ÆQÂf"˜—§©?!ˆËu6µE § &xæÛ•-PX¾z¶D/u]³L>GB6ñ 0‹g@ÁëÛÅj}ÓK½¿¨`Ûr[yz&h' ¯‹¶ä]0©÷ó5Ôt¶au »+Œ¨  3Œ‘˜˜y:Ö…QäK@É9¬¯7¼(\®dðâ"¨­àYY'C‘(½íàš¶ùKh‚Qû"2úÌÖ´†6œ&é²™L¹³a¬ x¬(Œ\C½ó¥åÊ{`4ÔúJ¥F¡k‡b¤¡²¥6ѦèÞ>«n )Í@o¯Áà‚ƒ$6Pšßä¬Ù7«\W2ViW7€#j '=ÇZSW -únÚË0‚@*Æ«}*Ù”HÞ:VŽJ1–6†5Üf±É­ïº”VÔÑ…€–›×¼ðr([³C˱·Ä£Û„Àu¬vJ®Ç#k¾&>#VŠÃ+“øÃßvNêb´¦¨Å•¢Ød581êmF°‡µ6–˜®3áXemDjáâæ ËxC³5G$'—ž.>!Ðs}6H¡` ëIŽM5¡Td4¡Eš¡Aೂë}%†˜y%0S¥.Цª#u:¨ÕÃcrf›H;ÅEßî×Á ”g` ¼P*V~+¾¤×çëê­HWÙ½àØ+åB…èÙ=O·#"Ð÷lÇUqÄqéAIÁ"—Ã)³ÝŽÀÐ ¢DŒú~akB)‰‰TˆCÕV äºÚˆÊ$¥r©ÃP ”|‡’òfL@pÚŽc­È¨&ið*WÆé ì¢ã¬Õ–I4k©të ÙÀX/¯q<ÂáHÞ! 9¦¥“.û×’+“*¯n¤iù¶ðÀ;º4VúceërÙÔÏéQ¶ªO@ÀKSMC ñŒ²ê¼a.—ÅT¢vlôæ¹ÌoåI[NÑ™7>)àÌMßï»ö~å+34éd4Ûc”žx·ÁÜþ#õî²úìÄtÛ‰†±™µ{y„ÖeGé#5¬_¦¥ÍL€¹5Vê -—Aaö5ÿ}»·fíõ“|Û–‹n‰1bï2;Ϋ£â·0¤¬P 9§ÁžÃòJúÄL· - -&‰ ¨)A#@å±»÷‘1YR·jwè°dð; [¤p,E5BПº9ªÈ×ÌØÄ›…)7M¦jö¡ñ%aÊë$PÚH©›Ï4P¸ÖÅE.#HJb-‰!‚ˆõÐlIÑXÓ£•ä«T¶”ƒ&‰$»¹nZ¡ÙFjÜ”‡©*8m;ƒ€kW®äû¹Úh[èò6?mõêû#½‹¥‹"´m£Abap ‚à®C -`õÐ8¾$s¬/P¶?Çìêû±¨ÇJà™<ÖÙ}E³èKî”HêÐNö£y`àñ*p“»CŸû]v¥–þl?²)8xtœÔ6? Tv¹x66÷Ò$(}îËMÅTž« aÖ¶Y/oJe÷¢¹r‡CÃÛ´ùØ ¶@NÄX“Öe³AM@ÉtQÑ&SŽ±ÑŒnzU&$Ñ>wGŠcû·¹ÇWš -<{.øì 5¥k o9›öq@سNf¶uN:Ï<_ižn[ÔcuN 0ß·!´µ†öøÕ“êœè!N,ض$›@Œ|ÛC¯»™ÒeÒ|VZýJX>ÅMuv>™˜Ê&{ÌXTœ®Ë‡6">`Fhmï”iÇEÖ$E5Ób‹@ˆãã&ØR£ë½16Ú³4UÓ•`În2îAg¨-"ÎÀì -a··av¼ð!;ÊŠY¾Üpés©'`¯‹Ë(];P©ä~{š„6/Œv¡™€À^5 ä}w?U?òðø%w·SÈj”Ñårª~°†ò9E{ÀƒSKÎŒ™ã(´wjxŠfú*ÈçË|}\ÂØ#>©„]Gú)ÕÒ@auJÝÜO6Â島c•ÆÚ3‚”Ó äuK]œÆH™}5éz‰M‹Ûx`´s¾=à'†2àsƒÂVÌÈþú"%Úº ÓÌë'61 dퟠL;€ŸŽ™”u¾µt"²½ù#@r‘˜„<¸3ÆK‘Rí:û@ÓËê%é':V>»ÁuTºÖpÐÖ2)>ø†®&ü÷´ÕÀ@1o©‹‘£Á@ñq)ÓàCÙ‡k¨$×eÄså(Ì4¶Bz¡¡ SU^¯ÐÚ¢ÅÃÁsÒÁíë^oÆ›¬<Þ[`Â]ã…°²`¼°9 à .“ûvË f¯ã˱1‡§ã6[â1@vZ*[Š¡ÃÉÖM$Tú -µAðL•ôLk á!WÔ„}˜i ¡š ÃÇÓh{fY¶“öØ‚.zŒW÷Ù"0¡Ñ#ÓUL[W2]ÜøD%_Sõñlé -Ë×æÊ>äz1õR¬vÓ2°‡§óÌe½/ã’™¨ì†Ÿ){º±ÕnšØÕÓ‘º®* -Ûqâé-Ôe½CjÚ†<­ÀË´ïªÌ‚GÙo¦:&rñtqƒwy9õ¸Ç’6„#ßc&F F—ÑÚÚî)ÌGÚz]¦ÝçDi8ÒÃ}j‡—ˆo7FÌK¸ª1M Òã­HÜ•—Òð+1ëÔD ØS¦½&´qž9ƒ½l„¡•z¸_ÏÕxzß²nÀDº¡×ìá#02x9/pÌ»Ú='ì™0A§«†ËÔ´‘¬i.vr˜Cj^²Áᘭú~“I:¾-㊤DgÁš~Une¡•©Ñš†‚'àš9¥9èî_œÄ\‡ð!5Þ(ÕË4 ›xº B#67ÁJ ¶à©ÆŸQŽoµ‹íõ±ÖÓ&À©X±[™¥H]oc¥ kí'åXŒvè®8^w¶š…vëÖãø»D…d -\Ók‡#¯{¾Y%‡DÌ{ê웓ׂ°ƒ˜ëÅž~=‚Bi$]ŒžMe={Q%¯6 ãÓFÒÐÏ·-óØDíóòpÌIìáY‹hC·kƒ’ZâãaV¼8\n vm[Ÿ§½»†aÈ«Öò5éC÷tk”înç -®ÕMjº7m žND5|ɯÚù3M÷³Àl Њ0àö7Â0ÞÐ5§7”=Ãäé>OsÀÀc‡oßaáQ¶ÈBuÿ0ýDÍ e·n=ý"< ²N½ä¬J¨;hvùæRž•mÒüÔ²÷í± >ˆŒ=kºC*IV¢À¾Ä òíyx\ÿ‘â±B0æ\iê”—),Mu Ó úä#‚…5Šü” ’³­xÞÊlFxÉé$ßvþzÉq SØðÒN·FàÙ®.ÏloÒÉ®€=0w{Gž}I‰W°gìjvL¸ OÕ$›žÞu[¦Swœyë#éS«Oj†¼:¨ }YŸù5ã&x[¦óѼ(R'±ðà¹9`½@/0=„ž͕ÉQf¡y Â7ïðì‘J:ÌC!|~«îõô kF kât:Â5ôí[„iñõ’șК¢±0}¨ô²ŪÅ-û4e"uðßcjg/xo_šÁÝ!¶ìÊž¢©Fñ@ÙWØ4E_D‚ÈSö]ôŽ“Ê ]Œ¨3Ø× £Ðû ËßÑ@'àù†ºé¼{ ’€_‰B-n6a ¾&>ûeÓ”¯Æ1½["uÌ"pÒ–Úѧ©}e S‚K±øÚ£4¼e§âK["ðì©g¬Ï8ìVC~;Pò®%c#4ÏöÈØ =ò'Þ:ôŽ^G¤ø ‘MÎŽ ˜B=Þ‘\”P>Ÿ@'ûcFzü"ˆ¤QÁÒå4_Ú7%‰H˜Ѭè)3ÐoJÂtRIÛFô˜Á=19\“åÛeõÔpcŒ“l²†›sY:©ß&\”ÜLèØ ‘œW—¶%¨…»ÆgÉc0iÒ¦R¿Wð˜Á!oÇØIÈT„0 æ¸ ¸çÀsìŽýÞºy ŸbU& 8´í¼aÀ[2aÀ­Ct‚iÙl É@n^¾ë$ŸÁÒ{:¼}Å}n“(Û™qRfúRxfÅØ.H¬Øv^/Ô)¨@UäíZ{ÏlLñ6obúö/’N½M}>O œJÄ ½$c»<±ÐááóŽ©ÝÜsm#í˜rÆŸìdÚž WõˆtoÏ- -c7óiW ô¤YŽ96㇠Œ¦¨†M4AÒ‘ÌX°Í*w()}¨BO–Sþä”?6Hqé{lVZíôÙA®0“;6à@Ù£pð1ÁäÕ -T!¨OGb°GŽ}±W c¨cfÓžœãÄ÷Ø4óÊ„¹SŽÂ::Š2«Þ„”éC«f;oÊÌKÞB/u®Žóc+ûî<«PgpÄ•;ú­> ÒýV¿ò¯ÚiŽ¼ðï2/týÑÖ»'µVÐäVì¯ùÕÜʇ—õWÝf ¿.îp)¿²5ùÅ¿ÛølÿÁ7 .åïç¦úg£=¤ÝüʳÎ`ôÃÁ·úl¥Øë5¾?4Þöv‡í¸³ÿ ^K>ß;lµ›½¸CŸWZ{ƒV·ÓèÏOcXyÛiíä¬é-Ò„œqƒ±¸¶§®ôZ»ÃAÜÇaðŘ¢ª÷‡íÁèÊE<ûQšúƒÖ`ïp»ÕÆq3ÖénÑ=™"n„ŒQ -;Ãã×{ƒÆŸ3(2EYzú£„í6úq­Ââù6#mXSÈycDÜ?kðý1XîŸtû­A&M`÷$î5ÝÞŒ‚iu2%–dö£L?oš–ž­î°·?é5N[{™"­Õ™$êœ%Ÿ]£NS?gÑ\Xuÿj5ç˜wË×q2Å3ùQ Æ­ƒÃY=wæHâÙÒô÷¬&?[Äü=NÇÌ®+[t|›°"ÍsÜÐbñÙN±}rØØq3E Nüþ”œf8˜5fêîþï JÝa§ ƒJÝs”ó_¦p„ž3­åJ%Þϯͳ½*ÛÛï5 ˜m¿ê¶úó|ožïe"ßó3EÙuç{Ùò5ótožîÍÓ½yº7O÷æéÞ¢ã*é^¶Œyº—ùtïIcØï·R{øo<üÂãB‰Ñ®&";êqZbԬĶˆãF&£\)Ž#³•)âtwdA‡ù_<]"£t3–PsÖ%[ §9£4g R2FÈd2ëºÏœ‘¾ð‚ß:‰÷†íF¯ŽÁ3Ìþ_wÚÝVgP7‰Gæ¬Î¬Ks9p'Sšpé b2»ŒÑ2±@ÿ7+-"s´üïú+r}Xð¯‡çŒÎ„_ì¾µgÝ ióµ¼×mw{«êzgvH4ÄŒQ8ìí7öâ­½ÆÌ„f« i”€1âŒg©þ}ÒíÄÙëJÙ¢p‚ŠéT–»þ 1;•™$2!⇇2½[òú|(‹‚ºÊöOv‹!çï}¯Æ Ýl4Z繧LXƒ£Yõ,[>ôHLrΓ=›lâNrN½&«„ø„x7Sµ¼+zÌF¯58<Žë1˜·OÜ xࢾóeÜ;ø7ü攧âŸYôØ3ëuF·/.œL}ÒÈdì4ƒ,®úŒº'ÊÏX¯Ê5ôDe¤«õD-‹Œ‘sù=¬Qr¹¾¨RügÜÞ:l4»eò0ÌÍkzÙívÛ݃oYtQ½F³5œµ¹Ì-dë6O~ŠžÏ”³dŠ˜Éî¿ •_²E̵Ta›­v#c{l×”Of±ryÑÀ{nÖ2jÖ2v0âjf-[ÄÌÍÚð>ßQOêì«>‹Ñúå—}¶¨9¥«væÜðûéFÍ!^çóÓúÿ´H¦ÖŸÝ†e+»ª Ë5ó·ÜÈþÇë~ë@¶”râ­—óJÙŠ.ì–*­þI»±ÇÁËÆI}Sÿ Äç´@üÛ¦aZçðßåÃF§··âv¼7{궙)Ê&‰Ûº¸‘ÅL9IÄeƒ‹l©åUƒ‹lQ3=¸¸Ùür­5‹ú.Ó‘Úîö^6`ÐßYtDH’Ž™ˆìˆcZzDS˜58uò|å'~uG~ÍÝLãemw¶ -(WµÝ٢檶;[žèÂÁ÷¿üJôÃÖq#›­ÿû­v{æZTÿ/[U(=û±t¿6bV+{Ž9þ·³d=õ1Ííuod¯¹žøX)ý¼>Ô¤:“-ÑÐÄGitod¡ §=áÔÞÌ (í¿ß²%KÀ(]f³5hý9kÙ‹©8“)ÊFIÛk´÷^v›³’ÖnuâF¶:À -Æ„¶·7<ž¿sžªSw2&³c´ñÐW4ùÙŽpÌüV¬›ÌQb®ûM³ç Ù2¯WͲE͵½©-[¡Éµ¼©-céÝØ ³—-µºâÚÏ5Wm†‰2EͼfÞ óoV{g·aÛH¸¢ Ë5óf˜Yã³lí#ühß¹x)¿”±xáGo‡ÉV¼3o‡™·Ã‘ÈضÝËlQsÅ-ÕLð˵Ãd,î›·ÃdJ×ßãþí0{«0^Ñvg‹š«Úîly¢¬·Ãüƒ5àl¥vW]$Ù¢f¾ÿscìÙå^©ö/wÂ}//rËØ2ýA_§—±ÍòT -7îW}Æ?ý6C7co˜›¿Íp|k;È5—™aÖär¹—–»Ýv){Ýéóïy¿´ñJ.øBo7ËV=bú»ÍæoÐÊü‹æ¯7î™É|WHÌ;ÙRàùkhÿs‹&3¥s‹6·h´hÙRà¹EûÏ-Z¶\ܵX´¸×=ïÚÜ ÝxƒVE)Ï#´¹=ûî#´¹=ûqìY¶Ô÷¦Ú³¬w’\¢[![;ûãÝ -ÿÁzIËx'[Ü™/›Ì,›0SŠ‘µe“-îÜÌeó}¼I«wÏ{-MÞ¤u¡m7ï® 'ï𯓇ÿÖàwøÿ5ø Ÿ)R§7eo¯ ›ýM[nÆÈ™òª­ùªŒÝønßPÕ?ÁwTeŠ²ùªf|-›çyŠÿúõT£öä$n *3›ÈV§ï·:­ŒmÝ¥Èø1Ï~ìfî{ͯøö¯¬Ñsmç?²•ü\Ëùïæ+>ËÝã“n¿•Í´êb§§˜’×ÃsnÉÄ:ºàÖÄyšyÓö%2gí®r>Ë›,? ÿ=„lAœnŽfU·ls$&9g‚I-%[„¸„œ³Û‘UBü BÎéÞȪjyWôš^kpx2f•¯ì=3ë\Ý‹f1¦¾¨Ÿ®¾ÂéêÌzílž.i/r£õwÜÞh7¾ídŒ¥?Ú)¹IRÏ­&_%âäƒl) -æÛÉ×h,ðídRtÜPÎZö”~¾…<–2dŒœùò¸…<ÿ’£ùòõÒ8ßBžo!g šo!eó-ä,•9Æ_å¿¿?ìÇu|«L~žÆYÖüØiÜ·¸ÝîþµvЋãΘ¦x ü`ë »ög«ÛŽk½¸¹Öí5:Ù¢{žßåwÙÿ6Þy~7Ïïæù]F󻶉 –÷ð[²Eè<É;#ª“ÔÔÍ›>3\5þ×:Îþ^Õ([Ed;ûQ¶Çm˜ÈÒ"™-ªRÓÿGŽ\ÎÂ’¦ÎF2Å—+¦õY$é”Ì~ØÛ‡dëßœ–­×xpÉÌ>se˜)á¿V©r·CVþFv‡MÐ0JâE⎱œ5SdŽÓ1Í\dÁeKˆ#ó¿P€²uïAÚ›×æu§ñ@«LºîdŠPT~š×æu§+¸›yÝi^wÊeóºÓ¼îÔ×þ«àjæBDûüïÈùÏËó"ÚUD»PÕ©oò«¬1º¶Ê“{sJO,‹êß'à´g¯×dŒÂ *¦SyѪT¶Öï$ßoñR56È¿3EÖdíáÊ÷s\þfÙûüõYÖüüï÷eÚ­ÁF£už+΄E˜ùõÙ -®ðúŒlíäÌ_Ÿ‘9Bæ¯Ï8ËÓdó}M—÷ŸYl™ûÎNÆÞb1÷T&MõÜyfMµæÎó¥Wñ›ÙÍ¥çïú÷Þ;•Moý]¼s꜅øŸï‚Îß9uzwvæ^¿s£ß9•ýw'Ìß7@”eËdÍß7^B¯÷÷ûq&{ƒ.´xºDÚ^ÜÌžX¦/¥æ9žÎR—­ï‰ÄiòífòíÒë?sÆú žÞ\>½É¸µ¹œ.Üx©d}#âF&ž[‡f÷¯ù›ŽÿÛ¬sžšÍS³$5“™"kžšÍS³l,¥™S³(SÄ\!5Ë!óÔlžšÍS³ïE*óÔìbŒý«Õœý ¡ï,dŠ¥fò£š|Ÿ‚3!ÉËI<ûQšf–Ý [äLD ³ ™£d2L¸@Q#[ûRó¢Fæ‹ÛÃÞî°wöþíèlþ~¤N%'Þ´ßëÏÚ.ZÈÖ¡`=õ± pæ—_dÿAƒîÌ‚ÉÖ—àÄï×Pæ¯;š¿îhþº£,¾îh·Ñk½øë|ý9±ñümGÿáÛŽ.­èÉÎÄœý^coÐh¿ê¶2v Ìb¼Ì‹”ö²žô\ho!cÔœ¶-×ìn·Ú37 -wº[tO¦ˆ!c”ÂÎðø5¬•?g&0co™IÏ”² 8‚Ì&c4\r[e/c- -¤gú(ìþ–Œ™ñõ½+ßÿ™©Ø:hdíØæ¼Ô:/µ^É^_ ¤ ÉŽ‚LK".z#]™¢h|ßÈNŸëŽ½Œßó5 b¹rÈš9ó7Zÿ‰Þ'c(×Ð[“5’®Ö[“1b.ÝY“1:.×W“í;缧hžð;ï4á»QûFó”ï‡Hù²uîþºS¾lQ7Ïøæß<ã›g|óŒožñÝ :®œñe«î:Ïø2Ÿñeý3÷ÔeïÄñÕºê2Gϵ½î"[™Â5¾î↭½)/¼˜Ùt™„ ‰ájÆ ãêçoVÌ$!?òë;jín÷¼Ø9ÛV,{_ò}Õs™#è´æÛÌ߸»j¦¿fsu·ÝØ;ZËkP÷¤±×|[ÍZaÔ÷ýDg^O}zß@9sJø#†?x;{–ð*eìŒkàÅ¿t¦¢¿v®n¾Eù_¯ÉTZô5ÛuS^¾¹&—¾‡:cÇJ&¬mã­ãáì[^¶J¬vö£DÅm˜ÈE^Aš­³€©éÿ#ÇefaI&¿|òj±BI:%öö{ñÖ^cæP<[ër”€ï+ ©h•*w;ä³fµ¢™¢j‚†QÛ&Xž!l³þu˜µ:Œ“1ÍŽ\d½eK†#ó¿P´·e¾,qî]K¸—)­˜G{?x´w¡ð(«_›ú†H,Šêß'ÝN<{\‘-Åž¤b:•7:zš$âûv¿ÛPð{Ù øŽíý^3Ϫ°~ÔðïÕ(ð·¦gJ Ó-ÂѬz–­¨èHLrND“Ñȧ=FÈ9›ýY•ˆ?AÈ9G‡³JˆwE¯Ù赇ÇqÖÞ•ueï™õÕËùÏ,îgÌ}ç÷å;3ær.ï;3f©ç¾3kª5÷7Ȫ]Åmf7•¾¨ëœIãänݬjù¶½Ëè—J†ÍÕwæ. Íù›ˆþi¡^ùMDÛÙ|©îü}D7s³ôz_H”ùWÐ^¡Œó8k:†ó²ƒþ¾áöý˜‰ÈŽ4¦YvšÂÌ–!ï˜kÚo’)¢™À+8´'0•þùí4™ðg3›ŒŒzé [Œ¬¿¨äBš–Ù¬kþ’Àùf÷ZD¯³]À¸âK1–³µ‚®ðVŒålEâWx-Ffuíûú"¶ Y¤å²µ7ƒÎ»ønLˆ}•Í”Œ{¡‹ï©|WvÚ:dë úµEÚnƾéôZbíÌZõËyZ<ü±ÝktúûÿÁ+>kÃÎÞfWòªlƒÆnÆ|Æ´"ÍòÝE*m"Ÿ­"ü{áhÙ“¹–eRË -aÞÉg‹®+éYi®gÙÔ3÷›³>ýÞ¿ÖêeKòWÜ^ÈrB÷ÃÖCt¥ú†¨Ú^ɬa¸úÁÆl7™÷˜þ{ÝŒ6F×ÕÓxiCM.¶Û™âJb¢¯—3úö§ cßÊs ßþ”5’®öíOËnÆȹô÷?eŽ’Ë}Ôûn·yÐkd,6šýS2Ô|ýÓBñ™ëìT;Mû5P -²óªÛÙŠèÅ,Ë\ŠZô¹W'„Ã×m};Þí¶Az½î_K9'_„ÿ>ü•Òåä_çœB$¥ôdÞ)øÊ•¾äö½‚ï{®Â/¡‡?ù\Òå÷áüñ~ù@åýüËü§ÏN¾‰è7sËA!„»eÞ-‘¯dþ8…)ÇÏ×sB"øžà82‚)Ô“QËÉ°ÆØÆ÷Nƒ¥@ãó¨çös ; ßÁˆv—qø“ZM¥Rqoox¼ÙØÍŠ…ÑNîmNå—òÞü6s` „âm€Ôã^gDÓôé¶Ñ¹…19ß Õ$CœüJ©ÛmŽé` ãÉ°ÕÔªdfȳJJ«Âe´)ÒŸl´‡ðïkZp RÍînœ/õ†ýÃüËF§q÷ò¯{͸·tögyýa¹Ñn·t`Fni+ù 2(äkíÆ`Å ž¾îµ‡0n)¿œ[L—½½n£½²”/è™i#ó¼fzO™6ЕÌ{ d¸p¡(úŸ¹þ­Y¦9–š"sk ÷Vòo;hE›fÌ2œ/˜{¿èáRÑ/¯àÓh¿î™Ç\ÞlÆ{]XjMüP3ÈŸj½]gÔ|ÓfN»¤|.¿˜ÂÃÞ - î*¿²Ñè ¦PVîvšÃÖ`¢ÒX®.£±y ».p÷™ÜD\ /_ç’Îw¼Îr“ vGlQ#{­•Û«Æ×ÍæŒ\׫¿Òëžäy5¸§S»ˆõ¸B£u+G¯Q›5´8‚ke»58ŸO\RØmwhÞ¢xe3nEÆ=J*\ÇaP³Ñ;ZšÊÞ‚r…b|F¡hŠ¤«"ŠITèË™}Î÷÷ÚT›óy>ú-ƒ£Ó>ìöþG’)øÃð |LEKë¤Ñêñý{ýÞÞ)r›þë¸4Kí¸Ó¼.å%d¶ Ÿ’ûO¥)·Rý;Þâè󅦣Vú@ÃöàsÊPoµŽOÚÖPŸ²´6/ Å™#U×è©MÍšü 8¨ÄÛœë²6í"2šûÆîì³]ü”Ž?/Ùþ—‡ç6ö&ù²øž^IŸ]`½€8Áq1Ê‚ò¥ïâÿ»RDʪÜ|RÊoÆMóG^ŸÒ¸Jf.ÉØq»© —~ø¡Å—÷¤C2¥‡¡9au/0e -qtù[ƒ+Ïw"œlèCLoÓ•Ôà¦xz°ï(bè†2”vÉØ—›v 3Ü•‘ -#"ÎæD‘ðtr -äIˆ)€ß<šªPÄ57: ʇ®òòOz*_zèiK’‰ẚx·ÀÛ9ø™ë»€Êà ¶'Ex‘®ÖkA†ÜŽT‰´‘J3LO“m„`Ž©Äþ)/pP`IŠPzc¶]Pxh¬;bÚ=â¼pÙh ' -ô¢Ò'sƋ̱#]7";Áú!þ†¿X¯£H[#R˹À¤O¨¤¤e nÈ¡…^(ôHùQÆ^ø¨/V:2×óiiòŠò}éEš ðˆt¯öÌÈ—vu#ÀXn/í`‘£7B G¡U”À#‹ø§UÀ…HC4T6iF2B›a5©ÒR•¬}ÂñeDÏïâ/h¢OË!ò#RBkÁ%ÎÇø"%'4âÀ@Òa£)€P‡L€‚Xø"]8¡+ðixàkƒ‚Ó§ŠÁ+q!»äk"aµ,: Ó’î ¥ã“Ð<Š RžÇc÷j†Dðˆ'ï8}šâÂÓ³Mó|Ä“w bs%¿õuØèÅý¼)?/àÒקâÏù“SoÕ.,Ý"ææ7p¹Å)¯äjÝ‚ÐGü·§ÿùo_ÿ-ùï@ÿðßRÿí[¯§ÿæ ¶é¿ÿ­xBü7!äÐÿÅ Á×|Ú(ÙT‘3‹”5ëñ¥³d[לHIiä¥6‡œôæ¢ù?»C4¶] ?<ý!fò•îÞðT¥Ò4p„ÿ¦ •± ‘Ô~ßÂÎâ­¦{Î.æÂÎ9, ;êŒ-=ښћzã38Ž&Lüê8«™æŒ üÙèµpg+¦]Ïÿ|ÿùþM.œ²Å;©¶§îÝâG÷'iYí7°ª…Kâ_ìÌ$Îï9š‹·;ý½aÐ=^;epjÎgí²ÿb`&ÅA¬þ9y ‡ý¬‡4ÜŸE/©íîÞQ|^K Œët;§µþ‡,âÙOY,ÃWDÀy´í¶¨™ÄÍ}i*þI-¸€-Èòb™‘I£´÷÷ÿúÏ<`¿ÝÚû.Ü¢;{©7+“4N™[PÏž¦t0ýìvaFÔݶ ŽSeÛPÏ&+”a!‘1²’6Ô u.I®“1bþžFÇ·séXv½°@eÙl‘óm9»ÝD†õxðº×: ~Ós¤ÄÛç¡j’€ŒøYpK7ÜÍ^Ÿ¯¹¦É§jÄf7(8‘bòQñYmØns9ã]ÜërøÔ0;°&f>:‰©áìI¯ÕÜyÚíµþ×írÕ¹÷à¤ß5:­þ!è> ÓèÞÈ÷gB°Ñnt âC:Ž"T@±Ý=IÝOìpê‚jµA9¶A|ö]$ȋ߶9lÇ=ížušñßµV¯ÎüÆoÙŠ÷º£•!¶D7™ÍÀ\þiM‰d8›dIÇ®$ZÂpEÙ&8F…;ó$¶t~êVÿôuõ®ÿÄVZøÃ{vyŸµbk½¸Ø9hŸ;˜(}ª -Xª§*íf΢ žq5pòË·SžqÜnà¤üÓtátÛKžpÁY[Û{&[»{–‰¦¡)»+N—“pSÇ$ÜüF/îǽ?ãüvü÷ _m¶ -†ÑÒX»q±†'ùz£s0lÄùîÉðÄ —^äÙ{ø†r£óg£Ÿ8ñt†?~Ô¤Øìv½æ´d'¥elI’J d¸ÝÝÔöD _IÀKÂ5å„ùe×™ý>a™fÄ_Ücã³>OÙlK%³dîÁ:;i7¾½4ͼäv¢|FѸb¦lâXHÇ!Ö¢/÷º'Å^ÜÐ-ýcáO©ÇMí½¬B¥NʨüIã$îåû­ãa;uÇKzqÐëáàd8Èo6úƒb7˜ßŒûÝö0¹Ç Fîy÷ϹÃÑE8ó-F ¿‹mµ y³…/"«[*ß`M¡ïáÎ >^ ™6ºJðó¾Yì¤ÑïÈÀZ^üo’Qéùuº{G]àÇA¯Ëš¿øéeÜl S4~NËÓ‡KܧU8È'š3¾,8ì !ÓÐ.¹±;@íÚ­NœïÓ©œ¬Ö‘¹l wA¯jÝΠ¿‰+ÐÎÇ9û¼ÁØa'Óý3î๙·Ÿ’ŒY ¸ZÞ ˆ4_ÿŒÛ£+vdï[{‡§²zd(ÎfÑ·¦ÇÆ/OÚ]êf|2l'ŸN&Fj[qûic«¹Þ…TWm?e–O Ó{Ï*é‘é·qoŸ:Í~›5mÀSŸBÄxêg:"M}¼†Û“c”ŽŒH)ÊD¼yØýëi«9TL ë4N.J¤U4HnØhý·á)û1³Êì•4v´ðGw·{2Ðk)mEþyw7ÿZtšµä/ó•¤J²(ôZ'»`Ž–ÎF -ßhEN&41O‚#¸®5ÿŒßÁÆ,u×y“à[ú£BÖ±=‘óêÁòìõã.]MœE•x`˜ý¬³ßÍ'Z=UÀ¸êÆV;µðLf¾Ñiê(t"®HkÞòzÌŒŒfŒmÐB´:C›6øúíèVÞiS_J›úÑH€&aLåö¤©œ³5b¬'†•Ñ ”ØL{Y¢ -ÄpF(‘âžÈƒKgÞ¨LhÈ " &nºÃé–ù­§}&»G†œÊmuf‚³yÖnâïò­¹yó–42:¥œâVùÙ³(¨Ä¸ØñCÿñëÛŸî=xÿðÎZãÃýçÞí×Ë¥õÞ“ãÃÕƒÎOÏk?Ý_¼Sn5 -ý_äÛ§Uykuýí“G/ýÇ«õßî¼\ï ÷ÂZU¼Œ\ß¿å8ýÊ•ƒûÎ/ëk_ -w×Ü?é¯÷_ˆ•ÜÂúZý§z>(<}S_àÇ[åÖÃG{•BáÎÁÄ£êÍð¼°R[X }2¨üñ¹äÿº|¿xÜ­÷‹Ï¶‡÷É[ÃZÅÿå}éö÷¹…ʾó|w*²_Bµ¾{óé·âv¹ðîô‡¦Ç­~^pTû¼¾Ú/ß«Ü_ÖŸ4÷s ĬÚï;¯‡•ýÏïÃR{½ýau¿t8(†¿º#ìøýveÏ­]ðøÎ{¦Ü/9øÒ…ßn­û©´ýñKqkùVGÏáC£9Ì-¨?ïíU÷‚7‹åCgíAqÁ»}¯ôêþï÷ÖËwÞÖÊñðî£wÏo®íí5Žð·Ö½ê~ýP?ÙuVa¯õËï«­/Ï›¥öÂã;˽{¿ ‹õ­Û_qþKëkϽ܂\{÷y½ØÙ»s|ïá˵•ðø·‡­0\éï{ÅÞÞ3÷ÞѪk1îUž÷ßÛÂ;qøÞsš«­òJäë¾|¸¸|?.µÃcMÁÇúÂzùÙƒ[ï«÷Uй<û$o= -ËÝ/÷¼k~Z»·>ÚG 葼{ EòI¾—o:ȧG¥£%¹lTó]³î¸Ÿo½¬¬4Ü®ýtï×>Eâ_ É-8»??óé÷{jÌoÞW_èáåûÕß52ñQ<ÕýàÜ{ô¨z_T<4xÞ?|°ÖüãÕ’¤0à{] -ÌS`Pé¹ÀçdîâÃMû ~*UvˆÕ•¸ÿØ—¿Ê?öŠÛ•?îUöW^|­6w~)ÉÝ·o<­ì<*nî Š¿ì½,n ¤_ ?¼÷4­~øýñвHk툚~9JEíBï) ìc·²¿Um?mcéÞ£[k﵄sn¡ºãÞ{Wò?<¯­÷z‡oýÕ—ï“„¢ Õ“ ¼»÷êË8+G Oóù¤‹¨r k÷k•¶[rž«ðϧ¥ñ<’»ÝõµíÁÏÅíçƒá$+Ç$™â; þCï'„mƒûZhÇù4ÜTqmñöÉRùPnþZÝuܭĽÞ}'Þx¸f'¢Ùa™QRÜyî’¶=Xþ½†+õE¡òì°¡×¾h´õõøEñõ—ÒËZyÿyä¸/v›µróø#Ï)2xRjˇïÜrPøkééö­‡csÈ-À,âו'G 1<êÍ´0ž³¿ú¾;9Ûñq{ðÛýÁ““Ÿw•º·æ¿ãÈÚ³~w¿Üê·$ZËåObéÖ³§ UkñêícXÉ›K¨^/ï=|þës~èÁo`Ç<øt¡~÷É`§y\Üúýye¥õp±¦ìßy*‹Û/»ëﶟ5jÕè͇܃{Nõ7ËŽ“êýî+Q»-W?€Ì‡ªºwôõ6?€H»¡ óíOwê`Þ)n¶Oî¦Ç½i<ówÇ7ïŠ/>nur )Οï¬o‡·_—ë_·Ý—q÷ve¿xçˈجÕv–~:$2ÀævbXRÁîاFúøùш§IÝ}œè“nõþöÞCàâ›÷°°?ürïÑCéѧŭûër«õ¦‰¤ý„C¶+/^<]®=¨Kô)Òrp·£‡o¿\_(µŸ;”Õ§d}†ÑãÖ]ýÝîJ¸ñô妻ûåmÑ»ýÓ/U±ôË—²û¤\_Çߊ»xwõ±{±üØÂåFïÑ# †–Ð(–éFúSnÕÅüô!ÝmPFXI£*>X®…ÁreSìüzRÅ!À&ãpTì£J8èU‚G?Ÿ7ŠbÝNþ‘½c†àl6hJ4 ðõTLM0N -¹³°5B–<…PŒ³§<í¡ô§ábÜe&ݳ†ŸVêÁ89ÍÅÎÁÚË‚-â§}ʃ-‰ð)Ú™1&†Ü˜ ô=Ȭ7‘A|eÇC¢*ù“PÙ'?Iæ[•å£i*w¦Hô”é7K•~hò§Ö±©Š1ƒZàລ*Q•qÕ´œÊ¬‡šRZ9ÌŽ‡ Í8øõ4¦Ž­ÔÜ‚eáÃ12-OVGQ<M9¹—>{¨‘K²îR3"ÕG‰ÖÒ`äDqÊRY³3Ü°ÆC+©¦¥F|$´³²:5‡3õ…XÒG>Zܦ@"Í.Í‹©! Dsì}ÍqSFîÒkúM³ßRÊw…}0àxÆï©b§¸¹ðÂÊ'c£¸ýîE§¶îºG¹…' Ov€'Á¢LÅ&Ã7 j;ƒí»ëkÎÆO÷ªï>–WZ®Yòi$9µ/Ô’DìXZO‰ýðPïêZçr¦&rZRqû‘Öódlüí§Õ{žìì°f}.€ /JG/ïAh¿±Ÿ¬ÙU¬´|)‰‡?%ØB€³Ú;öø°?$!«7`Tá)_€b»_Ý9qw××ÞÞ)¤Šd"hÿ¼¶?Üø£¸ý¶ñ°Úvj¿­{0›§ËÖ:0r ª]ë1®¹Í«7lÆÕë¥+Šg¯_GÈâíÊ®o»zSÁÕ{š\[Úh¯Õ*Á¯âÞ£ŸïNbœ!ËO¡­§Vo©¾sHü¹<’χ•Âfsy}õÕGÖEmËŸk²) ‚ò-Ÿ|í¶*+ÖÖ™Ÿwâ•ÃøËïÈϾ™Ü“ÊCcAß? ÐÍ‹ÒñëGàÅFW~éõÐûX½Ù¯Þ»+÷S+Ñ;T%ùË­¯Ñúêû¯­µý§»ë«jiTÚbëÜ]íæÈc?¸ÿQ>%Ü)ßmF:‹§ö@~¿®Uâ“×u -'ä­º a¢òbûåÏÉãÃwíú68ºÇ¿TwœÎçÊþve?·P½ß}9,ëÅOÕ½öÒX¸d*“ G`PÕÏaåÕ»âv}—¡ZžœüƒÅõÞ²76W>¯¶¾Dû ñ÷wA.©ðF»£‡+ 1õ» üö¶¶³v¸2þPñèë1ùà§õ¯÷âä”Õ°ížܧïîˆâ±í_¾.×»jiì#w·þL$(¬Å)¿Z.µ}З£_å£Õ×××N”;Iš‡r‘aô¦{÷ÔA4dµÙÜý:9ä×劣~½S+Çò¨¸]i¸¥vt+rÄý¯­õÕ×oÚ$°”…™Ð"ÚŸx¸÷á,šÊËâæöú×IݸÕ/·¾ì¯¯Öò±üð¤üªüî±¥ñ/áƒÖާʳ½Í’ÿ^ &ÿåÖOà<œ7µÅçëêéoµ ‚  h/äÚ‹_Šû•ƒ[Ÿýpõ¤P†p¨u7AEQ"Û»¨tŸ,ý²°ƒÚý º»òëÉhä­gmßþe«¶sëöÐwï·ê—?{Tƒœäç“Au·tw1·°úòž÷©¸½}û§eyüÌ¢­›*•Q‹º6Âüço§(ÈÓ[µrñ3„ˆëÏ>€«ÜßlÍPÏV«ÛÅPm(ÿ÷Ò1YrN‚Ž ©ÒÒrçþ¶ Ï Û~÷øhýÁ£“÷à+ÛçöqéèÎàyÉÿøóÛ§óïÌD© óF°,~ç={éGµ›^wr½‹Þð9Ö:ÜÀ»)¯*A±êF?½ª-}Ü_|t›©‡>|ñªYi«ûé= ˜Ù"Xù×G‰ýÕF¸ûûaZ©v÷BÜ{¯ºTöÕóve÷nkAÕï=¨ÛŸ©:¦/ }ÜÊ[}U^ù­òâŃª‰7[˵ª»¿X[-nþÌ}¿–{E>¬•äÂIPyÖh/LØŸöÆðæó&ÚÒBåųŸË`-GЃûõug°2ïìÖ~º{ß…ö-Þ£¬ïwX†£Zïîâ’N.Ãíð ï]­/Œî¾&¬ÕŸÕáo¯nÕ*/·j '>—÷ñÁºWúÕOÖ¢ ƒà·$À¢=¼b¸uëÿÙ{ïý„•]Qø x‡˜^¦÷Þ„’5z;ûîõÇyö;c7lcBöý¾ß=w­½²Á¤F#i¤Q: þ+$"Ô¡ˆ6²æ¡³ø4Ê’×kÌ´LRöT;k?ŽzPàrbaG÷;3`ázºªXš•ᘵAà¶ÒšÌåäv^sŠ-'­•Ê°ýÅâÓd|ÞùþÁœÀ¹"2Ãfþ3oÉ÷€_–gQãS%׳Ÿ03ªsF õd:QÍ µyDĵ1Ú½Í9n¨A”˜‰sØžÇîŽ.µÅ#» âD.ì6 -ü‰·íÝd–³—óAñ$3¼Úø4Á«ds´›±Ö"A¿SkcàG¤)% -»ýeU -û ƒå•Œ ýáF­žlžÛÄõ†â;dŠëÅl[©5èáŠÎ}U-Au  Š¼ŠU'“òt_tŠ@pëgGÛ‚çF»–õµ—~©µË*Ú /<&Ò>âÏo`¦¢s{0Ѻ»)ÜPf0‰ç¨ÜÅçˎ̈ϟƒí-g=ï¦)꜖°´E69Ódm ŠfW©ŸŸz"Sœ4N™’ÝžƒÇ EöÜ(¹®Õ({²‘ æÒhã×ÊkEIƒåÔ؃iùÎl8`‡¯q±8.OXñ#‘­n,@A·BÏýÑ9÷Õ'ÖÇHþ0ý]ÌJÑiJ$þá:gé`Á–`sx³gfÖ‰>•OÑÜ`…z%X}÷7˜£Ó껚ð<È%ŸÒ±!B@ “”Ͷ â¯eo2?ž`ØPèŠÃ·ÄÑñfÌ”K½}fé… ctþ/ -lѳŸ^:4ªYõþþ6Œ«B!78õ<¹„mÚ’ÆÑÌBa%ÌÅ0¨ƒ­9á™>w>ÿh}fG­äkæÛg]Ȥ/¸.2‹ß¥Y9ÅMI–™ ƒ…9‚LÏ?"û\²žØ…ªÇóVê¤é=|ÉŒÓÃeƹðŽý2;;ϊYÞ=É4i‚ßÌÁ½i˜ xP#ô…ä±ÅP¬þîo}¼¹Ì9ÉK6€Æaódr›dìŸ-GjŽx8Eñ¸æ¹57XiÈmS>GÎ äØ$”ùIKî}ËÄQ™£];ù²­|ѱ½c)6™!S¶H%ë½OkÁ9Ë 콟 @±ØÞYʌަ/`µÅ -ùî`÷ÅÈH~ù¨PžŸÎOÜ“3чF!TŸ8Ñå}ŠéÒÅ;J4ì'ÈOº]ŸxÁJm»sÜìæÆ‹;SBf˜xlãNwö³$³%ä,H›o x,g}ÿÞdfÛž‹q)ú¯9QŸ -@ïp+FwýdùÝf†Ø²ã³±¨ÈVt—¹»’…‡ÓÊneÛ¶ÎWú{ž³ÁSË<€On÷G/Œî¨ez‹®I|Z-€PiØ© -ã—˜Ñ  ÿVs¶¼%WXóf0^Íh¦ä2ùĘW'svô-åõ— Qr!G¤âf (ÃÜò"Ð\åwŠØ¸; -n#ä~õ 9¾û–dk«¡ˆ—”Z/íÿûo»PB{¹F( ÑðTþ{z±~îdJ´­Rº˜G™|Šû§ÎkiT¼º/¹ߣu–p ›[|×Ô¼LD•?3Óãi±á.xS[ìK%·\€Þ7å/‚’¢ÅbJââæ’—0§H‹®‘ÓÃ{ÝÕbª¥Î^]nÛ¸MÔæi¸™ ::'¥¤¾åátOÓÖü¼m†‹•†b/㬖è¶#n¢}7…l LÑœúwea8öÖLÂ@ütšOŸ8ê pœ‡ãÓ¿æÓÍÓqø_pe 7Oâ} Šë§á>nú¸ÜÅ„>µ HðW -ìßÛóÓˆ¯'°@§ìt3¨Ypß°pòB‚Èýñ?Ý€©~:m!ˆñôiÁdðŸVÃÃ{Ÿ†»X)ìâ?žÇsؽâ&ÃØOÛpÓôn;Ð/ŽOçÍ–~Eõmóôø°Ø]߉¡Ê¦•…Ö½$Â|±Â3yÐÐí/_¦ßð -3Ý+%%uÙ©¯O =ŠbßÖ ¸/kJ¯f"øÖµúÒ:,Öw RP”ujl"y+’îšš’ps‹ÓíQ0Ë0Å; •œÔb]ã¤s \Þ £Ð$2ÅD *ã ØÙ+M~[¢¢tûñëtïµÔ#Õ`g¤Bíw:ÿíÆ߶r{°@1&`Kä Ô\6¬ -¹U¸ÝQÍ¥+çï×éÍ]—b¸•;VåMUðUMÒ¼¡À1N ×y#U¸±‰Õ¸Ÿ®w¨PÉn‚Ú 7—ƒ­ RÉžƒõRj€tc12ã­‚áÜÐrˆ¦š³ª©B†ŸäðŠ!Vªð’Õ§à"Wýü'PëžçÌ©÷?ÿüƒ Ž¯ ‚8mF±—ŒKÀWÉÖþþX"qhqðÁ|€_[Iï{>Xà1O%¦y¦?Ö9|ïKtz{ø`³1_³_ãb ~ 3_Sd ‡_klãÖû8¿Ž™¯É@ƒÜv#„Iê?3ðÉ…_[KÞ†&Ýà³62¾ä-Ëg|r?Ã_gÓ‹cË ¿2õeÐÏ|ðàÌÛ\zzØïmøÕ“ýŠííðÃü úRÄ|t`¾2c ‚žÑ¾µð>—žõ¢ÿÐïônžµ0c.’9'Q²w’)¯§žlí–\6å$­í½ìÈú`¢q3å3ÙgHÆ“„!#€ø®¤ ™™"Y%2æöÕÁ_þùǺ3Wáë˜ë2 üËL1œ¼öŒ›<çò}(zk>Ò˜ŒÎ®óü<.aÚÊ}ðx¹¸´5†àìÔàMñEè­Ÿá–T£ŸÏ(žOuß_’/“¸5•õš(Ø;ú½ï»2±e4kݾ9ó©Oú+µ M܉}w‘±’µø  b]¸ûïs.’+Öhº<†·áB®lµ‚Ãl¿+[É=Ó¤ù<þçï²TF\±ÓÁ Ð(…¸; ¾''ƒÅ¿þŒ¡0dÔŸ}ŸåRLhž·72ê¼4‘ÉÛÎŒÌ&± -2ßOÈÒŠu¨»G¶54ìǯ{ää& -F¤8<M»TÕhM™¬Fûü­mt¥ã˜Ñs´|±ê0l$ñêÚ`1ú~B%càÙf7†C›OcÌ6Œ‡îÞ˜ž¿4¹~™2{Å•±òY¨k“*e|Y56Æö©Ó2v1ç3¹2Md`­æY¸Hm`mÚõŒ»z °œlmÚdlÌ&+Ÿ›‹Ñ«ÉÓ¤ &œìL>+é2Öã)òž™/?ï¦Ìs©f*4±œ©òºŒšêŸ ÊÔú‰zL]“ÃfêwFÓ°><˜¦ß͵é‡(ÿ,¦ÍKzn:Z“ßfc->3ÛÜéo³«ŸŸ›±pùÇìCÚksðs°7ÇÊ;ÄœÎà6sLzÌU׫Ïüâ>Fͯh(oþôvêæaÈôažUËsóòëx6ïNyÔ‚„ÏQƒÅb}{®X\gÛ§n,ô)é²Dž­1K -›5-ùycn©–£KÓ&,]ãéÍÒ_-÷–ÉÏ‚¶ü ¾ê–Ýl¼¶"“!eµ-' +j]ﬔ߶†êø‡5±HÚ kžî”­Õ·åÆÚ²º£Ö÷F~db Êú=õ}X7™WÔzö8^mÖã«Çæ™zßlT§‡ÚÂð§-UÞR¶b­9±Õ?cqÛë¾³õÏóªmFw]¶u¥8°–‰8¶X±£³à›Ò!{ô'p²gsá7{HE{kÓ´Ú??‡cû¤´«ØW)Œ¶ŸRe£Ã–šŽÞ´«îðW*1G¼Dù}æ訣ˉ㭔~u|m‘²ck,Žý*àsZ2{—µ~˜œt/³wÆ ÔÒY ÍSgú:»Ûiß9Z ?ËEïÃyÚ>\ÇwÏE¶W¸`¹2_ØÌõìά\¯Õ·ƒkh0¥ÜD®øìŽx¶îì1·p×ÆG“»Û«“îñ™u¯GËWqÓZz<–˜Ëãy’žäóþÕS^ͶžŽï“ô|}¾V=Kôeî9¿c¨+õQEiëh…&æ;€-wì¯h§1£Ãr»€®J›•×X"#^ÏËËȘ˜|Þô¹Ð÷ÖB'ÒûÞ.õ½€}Þ}½?Âìöd#Û¦%÷ sXéT7aïÌ+6j>lðâ–¢½b°àø³Ã‹G›Ž9^bU¼½õøOoñM¡Þ!,ûE’ ¢6ÛfWD9ÝïoN4Oí×Oì+&éÈ47$M9¾È´ï«MÖý©Ù šäOå;@_k˜ÁByOiø­T©ë2RoNó‰švÍGêHš>×Òyò_ýF_>¶øÚÞšÃ7ö|c¾½Ûé§ÎTœà_:—ò6éÖKs@Vö½v­~ç'EûƒŽ ¼°$ß/¿ù;1b韶Nÿq÷–jí5)vr:EÞcáçÀ¢œø šj "HLËõ`ÊÚÙÙy$ø55ƒõˆ¸CÎE· -åŒYñ|¨;ïB‹V4c°„ÍåÕ6L¥ó¹p&c;†[™^%2æΗ±hfÔ‹=—ÅØའ-f?¶[ì¬q'½ŒÇž½xmW©Ç‡9w&~Ø ƒ o-ïM$ý¤-Ñ´[Äd½Ü%‘~o™$‡‹dvÒýN¾~¿Î’?¶áFÔ>ŒgwmŸ]ÚêÄ|hªãŸçúàÔ?5ÞìÜä¶ÆF-h·,™‹v¼Ø½uì%Nþø_:oüeýÜ.5½Sk»™÷¾Œšýšc×BŒŸ®V ´ê!{­õ}šÚÎqÇÔN}”Cí÷f¢Ñ>´ÂËŽ¯Å;Õy¬Ú™Y³?¯ŽT“2X^“ß³öë{Àb|=ÌbÙ7ºÐûy«¹ìá·ïeuÜu}™ýÝL¯=êö>ˆÀ;2\ÌÞCóJü½åmß×YGåŸeò»ÿ1ébŸŽèùL[£]¬‡ôP«ÁÒ ?‡F½v£Yém[+ŸÒ¦~ yŸõ~g{€¶ÛÙAÑŽûã·¹ëËAÏ_é ¾üêœÆCsqô9Œ':¯Ã÷D½9<ëQø¥^u&úèཌϧŽÁ2nññ¶\Nh÷÷Ϥ1Æ“uçÃ1¥J˜oZ¾§¦«tøeFöãYíõí<[Îä7IÅïZÓ:ø^·ÈœllÂóºwÝ™¯–‡Ã‚út„vèc±y®í󇮋?ÍO×úg÷]Œ.ƒÖÕdÙÉ$ýËãÏn¸ŠdU÷ŒO×Æ·ulˆ4×ë>‘+mlö m“µáŸ›±‹nÝ~ô´-È×í|‹ì¬fÚÕ›ƒ¯ÝÖ…” –}à+æÛ¿‡ÆB¢ÓCíu§?tXfAIó•U«;ŠYÑ•´Ø,WÇ -þC‡«Óxuà -(G÷ -ÍIƦHBmµ ãRèJn1ìÓa¸ -cÑ7€“èì0ÝŸ—2†úÄý™L7Gq™ mlï©ËÙîÍÁ**Q…-©S¢Õ–öÃx`<=ŸÒÿŠk¹©M°$úG/êî;Éléž)üj¦ôuמP¯ÑsBÆgJ~(qß…–Úp±Kø–¾¥DÈ–’v70¦Ó¢;¯o­%I_0”V °ׯ mšH(x«/"O$ϼÝéjµý×Mö%Dì«t0˵ Øn/ˆ+v“¢ø CÜ%c0éÚ¾E÷ÅQH ¹%b‰<Ò!zusŽJ}Ëz¶R6ÿ)6òæ~£»(­þ>‘ÒmI)‚QÎìwÐFºòôõ¿«5© bfÑ9KúúAܳ­cwL !íÆ-îÀïZÊÄÕÌhöZL=žk«Ãoõ{“oq±Øº±N1ñ:ÅQÿ-¸CPcÒÍKPz6BaMè™W]ŒKJHkóÇ䛿öj&D¹D@7˧Êâxz’ÔA¹Ü¨ßþ×´z^»Õ4)-c¾V·ÃK²d7“‹Ê5uøÇ©é÷b+ \Þ˜2ñÅc'WÌ÷åwÅ;#/æuUÝ®øüDÂOi„HþEƒÿļ“ñÖ)•™óË‚é%:ÌÌ°nŒK¸¢/ôq…(âñÚ^ Ä[FÇó{qÏàÕ× E\çPqWß2ˆ«˜7Úµ3è}HÚÑ ŽÄ± -:—YRñÚWŒLÈýN¯ß™»²™ !…·Xa0M,‡C,:JºwÏ¥D9xŒ -‘W4·}§:ÙÃç;–yÏu[¹h2:ÆIÿ†ÃBš®´ÇùðUhµá²BÉJÐ om7ª‡ð±¸‹˜—j²Ãzv äN¢¿]Z±‰g0×°‡vŒØ³+–G¬ÌÀ™yÉ,Qï1§ûðøš__w3R¤Ÿ‡^õ³¡Œ4ïïûBÅ>ªˆ´o~®,2´RzQÎ[”‘Fûáˆ[ÊHëø'e$BN©Á" =ÚÜU -RßÜ>´u³ÊH)ǧ+B|+Ô˜ëS‹©½[U”ÆŠåRå„ -RÚdÞQ¤Ý>–›=7¤L m‰XñÒ ¥ˆ4_ Zªä%Þc­/)àÅQV:§¯€“?ϱ -D븞U{—üXနÚ^±RKqHë6› ©Ï·ì¤'³h‡Þ|ÓRAšÒþœWDÚ½¨!-,fÒþTkéMóé‹2ÒFÚÛ›×%¤®ð*‚y‘²’3þž¨)#¥º],Äž‘sß~óËš¨)!5X°\¯—S+m²,7Õ´Ò!–wu”‘汤mj÷w¤‹œÀ'“;Î!ízì2ÇŸ©(GÞìç2'AúÁ*~‘:eH –£±0ÝÒ/CÐúwrþ­|¼UÒ&ÿr’ë«!Í`Ug/È eŽµ¸%~Ï/ŠH›a©Š´UßçË—úÛù°oã)vý>IXßǪo+®MœP;ªÍÂÂ[ÅhSÍ8T~(X ‘ö‘};³íƒ²ß¶]‹‹r:á+ŠµG¥æFé=+å2®åAõí«eäEÔß~fBÑ ÅÞYú~³êÛŸS}WP}»ì©†ðöŠbëe.ÖWû5èR#ìS}["¨Ø›:Å,ãͨYQûµ±?ªo³Éêhªú¶Dĸ:Å’av„TÞú -X6꼌9dËÞºZcœ{›F#òUYh}åIá=u¤Ü/R ,MliNþ|YVðíŽ3Gs+zRÛã3ûI"Lj“Z˜iÄS -v…ùÓ‚Pø,‡¸3/iø畱ßx땾áKê"ùF­{8yì‰>3‘6ðÃÒšYÐÒ­o5°±;öí D«Ñ -ðÍ"<>“w9€t2fç/Ô#·£Á" e,¤´ Ú9ÊH©î»*R°‰üà2}L¢:>ƒE!óGu/ó×4Þž??>'ÇcJ#„Êk[ƒXúçoËð'kYè$–0Ü™úÉ©‚2èa÷ ±Âž»8Kà+ÉŽÌrVþs?åé”›wŽ“¦<‘z–´énP'–Tô8®EO?+=¤ªè1ÜbÝìgñ & ße ­¬èQ¦]Ö{»X¥?ýÃÑß(Ó®ëATŶڪdüqŠCëïšxcGÆ;­ê-RçËVî4A±#—lTâ]L4ªiµr³%F³Kg{×€”$ à`ν‰hË/C1Ÿ9¬ so•irïð¡ÙV`úÀúùIL}—žo]Ñ çˆ8™qê(ÃõSÅÐ]tÊã¼^wÃœÞu§½êÀ^94¾5çÒ„»Û¸þùp‰)®ØHF{¶¬4€bâ …À„ -ŽèkÞãã¥à5oÔ|—DýbÆrÊ+ö,–Õ™À¦§¶÷J »žÁ⫺®§d’¿¥…é=ËÀÑ`QݘtèŒBc Í|œT·%ƒåžùÍCšîמ”Öþ$/•Ó -Īn…W£K§xIu¯¬½pýÑ£Ò.©+t—©3XôÍ °ò5‹[:¿d7MÅâŽùË××(–“ÖÜèèX•º€I7”{ûu9áå€uµ˜{)Öê¦Øàð‡“J´;ûµ“úa¾ü‡+Ãõ;þR;–œ¿€þ”ŒA5…Vqƒ&Rosä†)ØÊ«ò7þÙªL½íÍ÷ÊìyìÕLà‘IE  ´Äï§N×hÕk|𺥜:±#¿-ßt#(+†™PP\/·§)vÔ6ñdá8ùº+7¤€®ŽÈtËßÑäƲu„µ‘]*[Ôwº®?î°ÉÙCIiÛCôŽ#TäПŠç³w PqjMÑÐaŇÊ)j«Ë=2ýRH¥%\r½“E{[Ö+Š‚Ðkï«Ï¦ƒä}D—è -·ýrM^ðõýá¡Þë_0Uæ„g{Ǽ $±pŠ†ŠMxNêåOîÄJ‹Xú—¸ªÙÃXI€Xw.q ±ø%Îü‚4—^é/Á±H—¸¢Õ}Û»¸Ö¨ÏC¢åK(É]²òÞh¹de’uIªÁ«Å·]²`h¢…ÄÍþÝn’ŒK¨êuoðV’¼+¥³t[þ…{ðÁž`ÄDª\Í–þ¹’í©*~ƒEËK·.ÁÃÝîC~H–Û¾>™(Pñ×@êк8Y$7%ž†D•Nœåª4àug"'“u(ÓÊe¹*}íX}ŒéE»?zý d¼í·É8Bd‹Ýµ–ešðïÖK¨áÐÚm>/ ›¿¿ü½+Ë÷=µ,œxGºéýFÄÛŸáÆœë#Ìà†“Þ ÛêÔtY@ÙFwkë²ìXD[<¬²‰ã7à¨À3=Ì ºêDœœýAïóy_ù­©´ÛIOEuA`jþV%o+kY¨ù[!°;Ÿ²½Áòð!3kÚ[žA7©!y_o¸3qΣ+…Â[“”‹L¾Îýûoï+“œÞ·‰JÏmŒvá¶K5Î4¦ú'' i&øÔ`¹½ ul7Þ}Ƨ¢DÀXN§.RŠÔÏÐ^²‹É%Úq鸒hÇ¥üO‡DSô¤aûG%Z[hëõ ^ì¶D3è-`ÚqXúÆÇøúneÎéŸÌsu½^ôÝ{—T2ox®´º¤”2ÇrWÒœ.Y“•…‚±=÷%Pî -aãǃAîw«9™›ÁöWu=&í¡t&»I#!ïu 2œ æüQ1›ì¦vl#µ’n%»©Û§Ú"i™Õ ‘˜¦·Ì¬,›A’)¬˜4 ¿>±û[™údÖ0w—ÑˬJ5³wDª‡PÞ•bÊä¾UufÞ¶í±”βy}ìÚuvËq¸ ìdnðÛ¶bÐì/N¬òªj—j˜HS’çÝT»tçñoÅÀß‘Ç7º•ÿb’8­ÔSÓÔ“`´Uéëx[tnRëTB)ES}þnÆÀëŽ"˜ä¥LÅùÓ›Ç8ÜʉÑbit:ög¢áäC-3å`·9^?ŤÖ)v3MTÿ ‰ö+ŠI¿Dê­ë‘:dõ -™\útÙ+Ÿïµ™Å/õe¿¥v¾œ „ -€¥Qº#+€ø"ú8ü󥹺 :Œ=Þâ»aì}t{jä1Š¿qëj0Ïü­úRå~5CìöþrQi”—Lq»íd0hº¤aVšŠwÅöZ9r†iÎ:Ž<™i_yb¸2¯4ôÈÐñ*”ßž9é ¹èdD“Š÷¹wL%VSº‘ w%uÔ3¢NŠ»ù/ô±¢Þ/¬wU}ì§xŸ{G=ÍNAôk:Íox 2SBîôÈHº$ÉG"îqhtIº˜oïbt¢ôvI;:ývRœV—äww 2ÿ/›’ô™ã‘y0J hÂfîŒïFzŽ9„ZñȈìýÒãÀ®ÝqGÚo<2WÙ‚{d`šÌ#£–‘z+?ºË#£èç/éHÏÑ—œSôÀ‚»ÍÉúÂ÷`©Lª,—eY=n\²LÆÛ.“fÐÎIÜ•ÿ&’ÎK¨aû§ZÈ~#¦WOÚ/ØÅû L S÷.Ý‘>vº ˜-x+¯îî ÙëU&¯Ng¼žf^(uT#Sø¶´¬yI•hõŠtKÍP½úõ]¤ð™Îî’ó®˜ô7ùpË_ÄÔiçÃÝÿØoòᔢ ëë¿Î‡{ ÏâŽ|8­տˇƒ^ëW Ž|8…AU“¸~Ÿ'‰†ºüÆö×ùpò{GÙŒ¸¿Î‡»yKÀŸäÃIN¬t„Zþ.Nn‹©ëÀL¶Ç3ëá÷g1‘”4&RM·ÔÙÙꊉ¼µöKòQ5 ÍH<žÎÀqßš}pô䑨Baõ1Îdr]E2hÄÀß–h0¹NÝ!vï,ªe£ñlÛ;¯"žmû![„ªÞž·Î#ËPH>y]†˜æµ2JrLuvwz—¡†6é}Ÿ½¨Èhs0ç¾å£’ àüI"dÆ«o» GýJ`•Û´Ô¬¯¯¾yšÔ+-»­Ñá¾öaÁä3í‹nÔ|F*nüm€ˆhÌj ÿ*#uhèH"Õ™‘:4Žô¸ n¤úýIFêçþo2R!œ¿ÈH…ùbg¤B(‘‘ -áè»Zf+Åõ1 DýÒÔ»ƒŒnö¥Ëðíáe(K…S–c -ÇÄókFôüE*œâ¼üy*Üïý–RŠiÛîwØ•¤Â‰ï b’áþ#©p -^…ÿ@*œ²L§}ÖÕR Å¢@|²VâÓ\5VUÏðR},Þ0‹ôzAP>]EdLýf»;u˜«K†ï=\e£wuáhÝÎ D¹Ò–'`¹Ü,Ï«ûT½G¾9\¼£ -Ûƒ°~aÕ8·>n˜—±Ú<¿ê ÓäœÍ͉~®«gÞ“ Hþ\+îï2eÃ3ïÙC"Y [¥t -§Ó)o!hî.Û‘e%í2çq’æb)eA+‰ËQúPÏ; 4Bu1{I“ÝÂãZUì|!õÍ–²UË°£ºoZÉn¯*R,×JieØYj‹êP é—Ò¼'(B*ÏÅ -¹Ž"/œ<Ùz›WøÊ„²0£]+Ù GeH¥õøÂkµ ;ÚdÚÓçOµd·­¬³µv†Ý¶ÕREj­Lç5¤Síz|7u¤Ùç¼*yÍ2¾_“¸U9ÿUCð¢®~D¬{í·ï*T­vú ¯=¬N°P´¢:ï€ó·°p­VÍB¹,B¥ï‹UmëHd¸ë„×áRX†‰ º<ðW¸»äWªÕ¸ûÅ2T®ømÝêû*Üie>>° /ŒÆU¸û“Jy7ó‰ôUÊ{4Ÿˆ¯”÷ø2Ô¨p'ÍKÒ“ò› -wZõ^a»û+Üé½Õf?=žXû¹Ô5ëUwb-v[Í1èQtØÚt¿K¬•g>úõÁüªb:ô}÷\1p~!7¯îˆ€pþ$Ÿ³Šé³ÅnÂQÏ…•%1n]3Á”Ë»'¿])‰I|* -„ûj†ì7&B‡_ëR÷Mg“ž$&[´/·DE»˜ž4&é oøNPü¼¨¦1…ìº2Ô5Ív~U†ìzV¥ž$&[t#W¾kW¾Ý•Ä¤Ak'jì´÷)†o\ï·òËC…Ëߺl ˆ¿ÈqM£ê·ŠAûåÞŠtw•{dH©®uÿîjª.súöG9®]Õ«©î×aFÇ»Ê=Þ¨”çýeŽ«h}òa:²žo縂.éÎzÖÊqå<@p"*~e|Õf¼¢­ÌO§¼¥×ŒiZj,™¸«ÙŠn¿\4ø”¯3Ù}¹·ÏÜ„°ÅŒvãa\»"ß1÷I’„÷#•äÃ,GS§[»ª¤uØBé®J>œC= ïpþ -áR™,KÃÃœj¹´ÉìqôÔ’ð>U‘‚±s;Ru¬XÞôÞVEj+ŽÐoµ:l)ŸÉ%¸î#DH¥©iG›ß*Ô$eYŽ{üc¥„Ô`–ל“¤á å¹bò–#u¤´ÉB=g¾¬<#n 4o¦Õ‘æ¦w%¤LÝ·@A’Z)Gú¢UG°ÜQGšÍ¶s’È.€Ö ß»ùO\æÙõJg_¥™ÆTÛ‰ó+±/g(©¢+´=e…mŒ¹KÉ•Nþ°†óöH7Ï´†Ÿ˜ßèt†M¢úÌi¤ŠÙíÀI{3€•'6Ýô¨§$]‡V©v r²z§ÒzR›n'6ÿª2 ãнQ™E¯')£Z¥:uW•Y‚æ=!hZYw²›'ÈJ»¡ÉRÉ Ÿd‡^÷Ž÷Zü»»«,ªté*JK¾^tý®(-ƒE«Sê~âûº¤¥zœן«ØX™¸Ê~ÆœÒÃëìu͔ߙvQÇÕ×7|°ýì_]ÞØõ ún8Ô‘¤é^Ö{ÊÓÏ>r­“xueܯ’Ý”¬ïº×ºŸý¥gYz‹&Ì|ôZ¥»âTóÅnY-×wÅi@Êþ1iЈÂë0wW½u “û3y˜“K˜ßžz³ wjë˜9±º]¾NÒ3¹Ÿÿ¶ËŽ©Ç§êU¡öWËÀá~}D¥ö“-ú¦~8x_"ÙU=‹ʲig2Ý•c¼ëžQ—dù/“¼–ïø¦6.é’(TŸ;­­Ú;S—f©œâ{®4Ro•4¾1ÂÉû$;QG73Èê+V™¹Ø­*:6yv­0Ù®òÅnæòè¤ôäòAŠÝ¬§sÅ*Ô§ -°«ta%í£Ø/³õæ꾇D-ALW FtºŽ,@½9€×þä{²õæŠo8¼? Po ãµþu „U4,Lyì}Y€zs!Å~Ÿ(ÐS[nHs¬îÍÔ›ÈÛÈ¿ÊTéÒU ø¼’íÏõ¨/ʧ¿"Û#EùDcùå»ò*üGŠòݪÈö7EùØœmåñ¢|‹‚VøçEù®ë#ÿ'Šò©×GþË¢|ºêW>R”OìU€¢U;Å‘èVj°zU¿Çï†*ýÅÝP:ëúéºêáº~¢¡ýÁÝPjuýî‹Súm]?íª~¿ºJ¡®Ÿ¶WHÙ¿¿®Ÿ2óiÞ õ‹º~·9ù/êúiG†ðž«ëúÝÊäú#‡®fU?ƒå.‡®j]?í¡É|¿®ë'éÈUU¿_TQ¬ë§= ¥ÕßÔõSLGÔºÕ\?atgÊ*Þý‹º~Ú7ñgâÖõÓÜèÒÌ.öuý´ÝÂwÝ@¥Q×OÛÔUŒ‚þE]?¥4Iaé=VïrÞïªë§ úùÿ¢®ŸöŠA7œGßå©¿­ë§ jŠªú‰«3`Ôõ“-CLZÕOrg×Ýé)_×ïfÞëŸÔõÓ®êÇsòƒuý´®E©Õõò·”xQvÏÕ¯ëúiÑ`ÿ ®ŸÆZ;.É?ªÇçÔ†¢»ßrrºëñ=Tׇ¢¸|îÍ渪맑÷p3Úvzo]?mMÞxðuýÔöðÎõIâïò·t¨ó—“Ä[ËðV]?íófiÁïëúI©-·[ï¾ õz|°|øª~×ãÓ“Ätëö†ëXûJñÉ3R«ë'ql_Uõc3†¯ëǧJiÕ}¸®Ÿ¶š£Âcw×õÓ®ê÷ð­M\]¿}}:ëúéÈ{ýƒº~ÚUýî®Ç÷«,\™´¼®ë÷ûdxQU?–‡êú]»’ÅUýÔn9»·®Ÿvx—lûu]?í@'™Oé×uýæETÕOû^8ýuý~ï·”Rìþœ'»òº~‚àRªê÷ëèAY]?MŽUy¬®Ÿ¶bÈZ¯×õÓNˆåvä‡ëúI)¯êw¥é¾ÉJZ×O] bu˜7Yé¬ë§K‡y¸®Ÿx&¯p4²kUÖ§r]?íÍA3‹óÏbÙ}ß«°=¼kéhµ¶rćü^©9{£¢l¯OÕ]»Ú÷²´E 7]xL8½‰Ewâb®ÆŠ(fß ÞñÇŽ"óR.¶êm§Ý³vØRûVø~Nšöç|'$øô•°øႵZÛ¿øöËî‡Áâ÷¡Ô8Pͽ¡eô€ø*yê+õ²lÇ'Í*ý:oMŸ}ûŽ}:3¿&TæÇØz)/C«ÈÛv·oöÿÞrHlègäõ9n3“ö´Më¦Î{+fÞ¼9+A}ŸM« 2™¤¥Kr(rvï¨g¯VÝ09‰H2×jY0ótÂØûõ­TeßÉ–Z=-Jšü­¢¡±¦D‡mIŸ –Ì{núÆÐL÷ò/oôszbLxO‘RÂ{œ„sAÓ²ž}M}@¶M,¿ê¼}& 42p:û X¶|¦w-ý0•±ÛO„+ÈUr½…œœ,¿¾\ÙÎ[~®¯P˜´ëfÍú˜¯{`,'Ì{²Ãh„Á‰•Ä^j»|ÂíŒïPÄ¿_ýN&ëœâ|º c²]ìã¤ÑËsÞ\–¨Øæʸ-眽P,ânÛ|péhÙ!~< ù.ñ‹Škl°ð¯<âW}ÿ”á¿Ø¥¿ù¸èE>µ‡ÙÏNñ³¶}Ä4ffÿÙ-~õMM.pžQ¦¾!^0'0¸%˜ñ‚'GÂ8DÛ%^ˆ¿À¯ 1ìÑ· R¶áf›ŒÍþ.D!d¯>öDqØÈ ó–Öø8^„dkp`Ç6&µFLÚ.˜[ÌlKfÂá¡ öß‘…pÄaKx¿¤Vè·3YÏ*™ri -,É ¤¥†«Ejp¦G!Q‚8ù·•(1å;ÕÍÓ|ï=ðlžÍ‹ìû¤ŽÁQá ÷²œüEôÎýDz1ô☷Û'/ìÕ¢DCÏÄýãË„½z™Fî€¯Þ Û¿Ø£¬ÍöŠsê®ï•Ó.¶ð3É¢XÙðš_ß9ˆƒ13ñïÞ˯ß1þ“ˆÛ`XìâÒ›w’ya°p¯2Ksv¼Ü1ïòÇwË;W^s˜±jZ²î ,l¬c»j¾ì܉*; áçúã£;b¾*ô‡´:j¬=ð§ûj‡Ÿpþ!nWý¦à3J¡7ÜW§›Î¸ŽK¶Ú ˆ5n+O‹Õo ©Ä»ïpPÝ}ÁÞ{²"ŽÈ3…x¼¶Ü…3 bÎ"ÜŽ[Æá«âÞïjðøš$'ˆ»úV@œ{ÓA´_ù éµÂEc¿ÌPuɨÚÔÉ®![V–ä$#Xâ0¼ËS•1ÍsÇsû0\Î;³R¡Ö=`'‹ -ú«ˆŒçÃÅHF^üy˜¥ÎGÆwQ{ã§ÌÁ_i©laúŠÔÖœ‹ââ§À¼1Ê£ÏQlb·‡¸E 1ÒÙOEû¡ÈåiÂÍ<Ã|Ùƒ¯E/æ•ár-£R‘‰eJ‘-šÔpf«®Ï®mvêòQ'?1(ô\œÖÇŠ°|…bè™] x~‚Kîüñw -é¯er -ˆ:9/"Ød¼œµ9‡=ÌÐÔ•ßòJô<‹µµlß–ÊË ju Éí ·=àY¬J¶¹u(‹4\ær²yõ+”3R…ä›X6™Ã!ºuŠ• ¦bvÄs¹mžÑ{°K -z+«‚XRæÌÄØz"å­òjNϽåq^Y†A×P°3Ü #‡cí,£ÈxîPŒQK.Ï:û˳îÁ»¨m\¤9ùb¸›ŒwžË펙rÀK/‚ˆPÕV GØ;"Þ «¨½j?‹­¦0Ðè ´¼ÔÖþ8#<ûéʱ%¤a7¯¯£à® -àæh«tM¹>ô¥Æ&wÇó劊oL¢25ÙõÅ"¾’¸>¶TB¿aMpy(DæØä•eÙ !A95X ˆ¯‹%. -(Ð[Gæ—O SQyyYíÂWô¤Üo)˜ø¢+L ˜l"â¡úé‘‰àŽ»Y!ÜÅߪ@$^à F¨€`êXÌÀ/}¸êƒô–3æ²AI/îìsMÚ50/ºA0Ž¥_‘’;ßÇfíWèÃNÄý@vê`Cܶ¸„vB5yˆmœí<[¤^¸ðæeMôÅíÀF ÖC–J`ík/]¹ˆs¨ò…”€ -Òi/j´qÇ¥K?¸KzIŒdöÁÆK‹¿þLýây©PQñ×~".mîÅ6ñ9240Ââ÷}Tüõ;w¹b Š¿¶í!ñ×>*̇ˆxöá¾(† L 1l`Oˆû] + ñ×øKRôuÔ·ˆ; ˜bøh‡‹»,ˆø«'*îȘN‹;,qGÆ…ZBB1`’$™ý‡1‰T/2“§×4Õa˜r§¢˜¦: S0/š¦: S)–_™¦: S0/š¦: S†“3Mu¦ÌÉûc¦©ÃÔð¸iªÃ0½X|˜¦: S8/š¦: S0/š¦: S†Ç3M¥†)¼¢bšrqÎ;“ê2‹ @fWÎÐXr0œ|![gy…À½ù<·^~ö?ÁWÿGŒÊÊ\C%ˆ#æ^…&ÅÀ†*Èž£­/áa®ƒ{×;XrÎ7­û#¬4…Å°°½}ÊÈË‹AæU^.Áåae³ŽÁç½Ø~9”Ñ=Ò\®R+ã&·ô¹à…{vˆm¿ŠåÌÞ|Âù ÊøïÑÀìÍç<ÎþÌWxûóã¤]™ó †“w¬ã¿cô=(Êÿä}9¯¦‡Úañ½Ø<¹ aƒ7YÄñöf²Í¦ÓÖô2Ûñy=ÝœžBOÞd3],|™éx;™>1§Ó¾/?¯˜»9“–;xŸQHNäY!™óË‚é%:ÌÌ°nLt^Ϙˆ¶]k¸ç?ƒqQ âL>7‘k"öÂÑ ¿vYÝÙµ§ü ¬3ÚiÊL©sÖU­¼Ê$cú¿Zù¨Á’}MM_ÞãwÄ[H¾—3ï¹N3á=a[–¥Yµä8Hä¹ËïâEÜŽD‚u¹¸Æg8¾ge¿ ïØaM?+ábWàË0's~‡­oÙb` ~ÇØÅÆnûK#Êü°àú„avÔË.! Ú¹O?S¸_œóŶ‡l^pq_CvÈá–Ãa´`…â@€…uº¬Â"&p;Vž‚§‰ß!¼ u‰^ ÍéèåEÈ`á‘zoÇ/¯Š^ñš -'//dŽ¨7å£Ná™s>íùõûbÜù" -e”(;Ÿ.v±õŽ?gÆÛÂ|e-˜·ž`˜ð@ð,Ç(JNADB¹`tÉJ¯˜ÚzÍ …› Ø›Á×6ÖÉNŽ·þAz«Í%ÜwZ.‘*Àú%ºôë‚…av¸ke¼Ãˆ5ô½±µs‘,õ#:Va]Xßï»xÆøS èá&-@T‚ÇF=ë†x¹á”è(Á@>—°M[™â$Šp«©û†óû³×¨ÆÈD7§»ŽÚ^ŽíGo>ªàÓÎmM£>  0W£!<å>O(7µË¢‡ _߼ܯ—ØåS_à¶a‹Wb\o–Rô¢0è"¾ª{ËEXÓŒ¸"S2žö³ôœÎÕR«€) ’‡ìÚ·}¤/ÛÙ婉(zý*Z/cŽYN} Ïã ;ø4Ä/Ÿ&„ÐŽÛEN?ÔUo|§NÎ鈅ý±šûªZ‚|Ä¡t‚|q¤CÆ•u±gà—Ã>±.î·…¬[‚ÒwßâÖ™q}T„9¸{£÷¸‹ƒWÕRæ<¬×À«h<4¿LÒ½’©Û›×ùݹœ†¡_ aÎZ£†Ü¥„0¶×oÔ»”Öòþ…r—ÂÜö5D¶Ukr•VñɃù._­.é 2³•»¢ÍìDÃå)³Á¬Ï8ÝQbûžyjÚÓçêÄ—Eâ<ªï÷6çÜ~'JWÎíhwÍ;·ÛŒïRˆæ`ÜÛݺ„o›“ƒ ‹ˆ&ëþä²EʲR.7°ŽuÊO^àE¾ÿAµÄÁ=îܳ¥Ñ6°‘çòðTGŸ#óSÊýxŒ-xí»í 1ŒvÔxñ¯Šœºv—Ôã Æ¢ìsF·ßm÷]ðÝJ/H&àío[®>öö_÷mŸ³›gÎ1©p)öåV’+?˜}ÞÇÃÃÏ–0~Äʦcÿ~"lì}¼#ŸÐcp§®ð¸VUÁÜñ):Ü€ÐÑÆÂË»T{¡£â‰Uýúš TÎ#t“ -Yï…b=÷‹‰®Á†v1e%ðÀª”¶ƯyÒcgú¨ÒëA²'Tò¥+°VÈ4G<ªìP‰Ý Ù.µRü”t{W³/ ’†¡ÙˆÞ)TQ9Þ®T„ÞHk—…°qa}¼ËyZ²I`;¤¿vpALüW6ƒšÿÊÃf¾ÍÄ^Åñ9¤¨2T¤9”.‹¾JF唎ÊÉö‹Ñ€Íæå"E7‘ßc/êµYßÞoíE½Ö¢Áòˆ½¨×Z°üÆ^Ôk-Bû½½¨×Z„X~o/êµ Ù‹z­EVëû­½¨×Z„û½½¨×Z¼ä¹þÎ^Ôk-,Ø‹z­E±]y¿½ÈÆKUwŽ"Ñ.+KW&ílÄób¡5w\£áÞãâB+)»p~Å:Ùàýt{(Ž\œ8‚¡D"qÔÝ¢ìÑ•-ô8K=»™m’è#Eïâ턲©a wÈÅ'@TdKJ׺0q2òÂmÎd²Kì¹âxL&¸˜C5 ³ØP" œ/YƒLrÒ…ñá>€t—ºœƒ1ÈØõâ“ÀY:æÛvè3ü®±ç[lìÐ7…r§ZŒUfN\ŒÂ| c¥“È…–owçñ¿c†0IÇÙÍDì6X,àIsz:ï`ß 5ý^l*ÃOü‰ýÿâOä“?ÿGø|à»>¬Œ v¦éåxªl –7y8eãÓb»þý‚Þª•v1ózbÛ@Ûð“t€Öà•:¡ ƒö”ÿ½ýËPI±Ýc~åñÜèÎtŒíâU÷ˆ;ºGèéöTÿ½04ˆ”ŸzÂPÀO€4(¤|ú)ÚÏtüþ¿|ù7øR~žpìé_OÔSõ飇=M ðå§Q*H’Š <­Á3%p2(<£hÅ|AšyBá žà(æ'‰'2O€´"As‚—Š“ùD‚~:è4 -¢~£žÅHŠžŒ 8 >hZx H€…ÀQœòûø$Ž£`0~uyDÐ~”ăäSШàÅàG8¡˜#ðÅ1@¹´Ç¨Ðì !i|Àp”òĆ:L‰žP8J“€® —gÁêÃÀ+Ð#£IÔÇáùüàÃåÁØh~îóóŠ@}Ѐ%á|>ý§Ÿp܇ú}è!ºáÇp§PšÆ³ù1”Ä°ó ‚ù'[Àú|¸¸¤ER,$ð›'£PÜï÷3øh?øHðÒâ°S`ÒO`âÐn XÃïGƒ>çŒ pb°€xyDù ‡P~Hæ@"’#øÿŒ†ŒE“O§/€üàÈÓ -¦Œ@i §![QàYò=^R>@?#ÁTc¨§Xv `2à0Š€þ0­†¿#}(AÔdlÊÁV`Ì$àžýù'cƒjAú]žù|ê ‚‰$ §‚ßóHœ@ÎüŒ惌hÂÖÑÕjR# ]ìíÍf¸žNž¾ÃÉž‘˜ƒY¿ž &’<ìßÔ·Áƒ¡ø‡xò@òø0*>y"ý€fÜ;Ð@p¦OüÊz[s?¼ÿä °¯8FýÇ@Øn!'¦ÆĸÿÉÈ û´ÌcN]0ÜOœð _ó§8A&ó ¿¼£Ï _ú˜ ÄS*¥,‘±'o›ÁOãíz·=o&OÇùp7}Zo'S‘<¾{—Ààö€å] ¿c›Àõl{ÃüÇnß*Àµü'!Á€8„R#Àž²ùü`æü@ €Åî£hÈÇR$”â~ YqZxäX-¸ÏOÏð`Å!Ûð„'t@²^ž1bŽ°k‘Ä,Ü ! »<ø>]]zÍC¹YÚ0c÷ѧ¼p ½ÿ7Åêÿ,*y&áøH¼¤¡èÆ/<#PºHø %Àâ%±º~°¯ÀUÌ?2ìýF‹ZµHQZ‰"€F@…‚¢ ”ç 1R—„»ÅÿüîÒ+þßsÒõø4xá"1Ž<+àë ªöqŠô³ƒBY-<ª@'ÊG’àÿKþÙêZÅ07¼6††!ødw<½½‘µ7xsÛÃtñ½©~¦ãø“·3=L‚¨~ÜÇn†Üg/– Ô–'ÚGC-ðþ“÷¥unŽ³ía ~æ‡û,°3Ið‚W!€ö]¨KõÏ„³ÀÆt7°£=ySPþACofxB)ë>':J -7mÇ“ç(ξ™É:ÿCÅëM"tD×Ѐܸ’ÇŸŒP)Ño#{.½ˆªÔž°'’Ñneñ•-®¬}`·Ð¡‹~÷;G¹H6´4£ݽÅÂ/…Ž+y.#ž¯Ü#öE²U± –Ð1;cð1& y_'ù÷óOóâq¤e¼fîF&ñiàßÕ‘%3ÃÞQ˜&VÞ§[<œÁÓo™YÒÜ»ýkoòe[ù¢c{gC°iq%RÀJ§ ‰Íð—°Œ˜#/Ù<·(Æ~Xvï9GƒH&ö©~†ŠažR.Ñ -Ô‘¸- ¾’6Öú- ý¯Ôi¶(%BoöE - „°ðôåÇä«„³Àº§Ùê3ëª|"Ú00BDÖ™¿/5X·:›¹ŒcRÃÊg7çtäéD¸‘ÿÌF])&ËÝæÏGÊGší÷+æH)>3ÇéŒË¿­:†KŠve‚Þù6‘æˢ›õöMë!fÀiÒÜx°RÃð|˜Çtò_Ù^Í•žÑ{:’1ÃÈÙÇ£h¤R(…ÍëQ&Sœ|ãÙ‘÷ýÀL,˜8¡ÌX…©sÕì¦çQ„óS‘¥t|XiTIÙH#H&_ƒiÜ=púÉT W'SA³ñî63kŽ÷‰Ðóà1Æó'¾™µRX,Œ¾]î—j@—ʉf¾ÆöŸ­aE=®Éå-xñºÌ¥gqS,±äì…’‹ñ:€ï‹Lñcbc™y>ÞàÁ,ÐÔWµu2àÞmvvÅî¬ÀÉLo˜OLîRK{¿î_t€:ï»´ÄòXaJƒOÁ†Û’»œ•Î}‡'?Ï}ƒ%=§eøÃ^fêÌ~ ÷)|ƒvƒ}"Œµ/íF!Ì5ÅðÔè[@dÞ1éX¼5#`:4îý.Eûg6 ©Ðsêüš}ŸØáb­ÐN6v‹Ä%9Œ¿É†ÿT£cxj]‹íˆÌ´góÙìß“äK+;2“¸Õe°ü£ðϧˆ1[yM‰ÆÄFFï:ð“ŸŠyÏ«poûñ }4 :t¡`Þ{¶ô¨„&Ù+FäÓSÖÁT¥çíàøìN‡‡™Z : áQÿ3™Î{óæLqY21rÍYl³áÙ*¿HVýuŠo9­³PžÁ)ß” "äúí#ü«#`ÿù -’Çnñ‹ ¸ˆüðȬã%Â/ÇÍ(:ã^Ô‹(û©0¢S¢e; `QxóD‡3]æ\J/ð|ûèSU#´"?>~‰ø•^YgŠV~ùŠ‰^ÄÛácjeI˜áe°„§ýú®9[¸l.í¡kv ·•a¦„€uÃ(Ànc±HžÓú6ÝòtÚþ—¹Ã ²Íª¶7Ü]™¤ñq1Þ#†ÛÍš‘•¾¿‘EôÖý†ÉÅñœ="ôæ;Ù¡·žzwÏ=Ÿ¹ÑþjÌŽÇõB²éH¹p7c7:·ý•ãÞ30†ÅÄ@s›8T.‚@?¦øà¯HmàŸ‰õ:€bAê üoùg+x׊ƒó Ô$Åh°›“Оiwm ÀGŠ@Ó< àЉty‚£“†føåwDš¡ŒÆ„@QÆà‡ h~ôk¨:c¬Š¿êÿ=màŸÍ<ž¬ ¢_qÏÈ@ñ–4ýtÝí47:ü)c ¯M€ð¬ rÌ•+ÌñïøÞ\úБôáhvÂ1?cñA¨À$Š)V·eŸ`gép?ƒÎ&,HAÏlä£i -4òÛ?óÓ(Êc½îGZ¹¿Â/¹gt‚@)`ë<]õüBQ+(•~`Að„'|àwü3¨€ C\ –#t—€//}º<º}s=8 ëæ%þ?6mþO7¬`ôÑO¸;‡¾<¢öÉÿFNÇG•>,gB%Á§a‘˜”ìv½FŽâ¯ %#‡øB‚ib°Ž€Z½-“ÖÅõÿoF‘™´z2#‡p"…TTÉŒyaná®e"Á¤à¥ûÏÎWvôñ6Jí8‘ej]ôRøø#’ -B\ƺˆ¥ûµù ŠÉŸ‡­˜;{¾6 -Ëàcó×[ý܇±Ò²‡).ïbô–"2°†U¾ì"2…c€2™ª“ |ÔÿH™óc¨ä!–Ìh›€ŽÂ,6úØX£\Õ•h¥ZaóÎëaØâ2¾Âèb8³"ë;–N©ïB£b°$"dÃÆ%nE2`â‡]bPøŽÁ˜P[’´vÖ4>Ú}Da"FZ³t+#î9ýNOÞ³_ônœØÇÇ)ÖˆVÔ!;²ùöÒ»b9ÂŒ4 Œ´Û•ÞwŠÛmn :¾ÁðŠÃ’8œs¶Lª²ïCÞ(„§­V5µò7pq…ÅÓ_KvdBkṘ÷úó‹eyÉI“~Ší{îŸB´ŽâßÏ!¯ÀݺŒ£«§*,dˈY耡‚¡œ¶üÙ±‰6c¸×T‚V¤/TúÂò,gùLô¶P4X|;<°È œ”#øspv1"ž·ËÈ„‚eü±Ì÷ÞóÍ\:´bT3ëcàdfñ9ÁÀñ!©ì”ë qL -½¿ðea„>PÃðš¼wÞPráxÁŠ®ŒÃº½˜¥QÖZreö½ð¬Æ¨Â *D8V}Š3p¤¿ 0Ž …!N( ÂåŒ+ü"“¡=ŠXb0pÜ¥ô‚pŒßHáE.‹Ïì鹿s€;ÃÕ€¨#73 âÌŽ£w@±mrZâVð´¤aKŸnY¢3ÂyÍé-ýÙ¢[…åžÏxšôfWªƒ¤E·‘öŒLa¥#O‹–ÿ¥\3âÅá`‰Ðà;™ŽÕ¿±™ƒ¬ƒO͉Á;†r@øÚD.;Ÿ‡““]±J|Uéµû„· ¦h,ý×C ø0 1”èЕ}Œ@ý€ x„Wa|Õd€ö?á>¨`•Ø@ýÀ) —‘´”¤ mvMÑ6ƒÖ t2¨>_10 >óq”ððJ@7H -è«8<ÿõCÅÕ?è%(’`ZÑ0( -ÀÀAVm$É { QˆE@û‚*$ i0’µ9VŒÆêh`@€ÏMÐ%Š¦L—HÆ‘÷[b›]Á£¢0ÖâƒÇýÀØóCº ÆÖÍ̘/ð™¼+x¼}&†ÄÁ ¼¡ hQ“0°ÎOͱ cMsz䎺ƒ@‘& ÑMÒà÷~x$c&0hÀV~xf <g"%Øê«þ¦ÆúKÂóvæCZ -AùPž·Ã>á4Ô®z®Ã@#`HÁ,ž]Œ ˜¡îǃF]›À'6Kp4VƒAQ+°±rÕ’ðD0K„g{‚‡t19xt‚YÂ÷éòHèöÌõà4 ´ÿq”øÚÿ3Ðþï6ÐÖï}™Ì ·‘¼†Ýãü` 4¦¯ êEx:›Ò)`_U†ÿ»¹3íK âð'à;€¹Ò›Kn ê"ˆ;^ ˆåpö·ß~«s(qvÌ΋}!`7Õ©t*zÒýE´´ø¯€vÒË>.™M£•,íE!·‰ÕHëò6 )¨Z†V¢Ç¤q'dzF©S–-1PkF  XfÛçÅC¼ß )Ò«ãòq¡¼¦ÝR±p"½TÛ¹îYõ¸?j%+F»å/»šÏ\õÎE°‘B³ÎG¿…˜êÓ,vhO9Trõ¡]€NÍs•QWΞÝó -{j€7ýTÖŠˆéA&kì“béå®;ªÅÒ¼‘<ïQû´Å`¿…ôï&ՌՊ¸ Ïq{®/kNÁìÕï–›ú±®«žÚ§n+ÚÜžIñÛõ…¹œÕr®—^_7Gñ­ÎÊ3Î\± ´ùnÅ}ʼ˜ðÑÌbJÕ¬Hò®Å<·¶ù¦Æ >áßõITn6r²ÄYá“323¿¥åukîá£w?{æ!¤ŸÌÑiÞ&^÷3¸÷Qg_LºdÛG@çíd,‡ƒ£ÇF*ýÊ¢ÍÒ ¿®ò׹较Ds¦¢”× u!ÒdXkB“pq9¤E"µôafÔšÅî`#wÓZÝüÊ4GÇY£œW/4a•™4q¯6ÇííçôÑÁ÷í9sc.ý†O½fâ°‰ƒQªdpéÒ²sVhÖ¦I¹Ì••ol»|4²Ûéx‡>œ€±½ÑŸÝŠÓ¨•4#È‹¶9x€ BB§Né á§5•Jpõ¯hookŸlå„LëŸTàŠmœpшÛˆ®Æ¶!½âÍõÙo¸ëº—ÕvÅD¾Èš~9\F ø*ã2M—ßvœù´g÷'!ñÅ¥ßtÁ–€QyÑf>²è°b4pu1 ²Vx¦(àtì×®»5ŸÝwq’…Pä)BG¾9erà®ã¾¨vé†h¸²2¹MBà%3kÍðE@íà Då[É©[ÂCìsŠ‚íØù•9–Ãô7 4“åêﯨ4†–Á¯J5XÇ ¾Ò° Cm5®g‰w¦”‚e1’œ2¼7BE -•"Ãè (XœBeIFâO œŒ<ÊCxÎ-#¬Û|v¶ês±ºÀ¡Á¶ðÜiÝ)™„œ2ÇO§¥Ý½™÷ú÷ù™¶y¶WdW—ËY8®.~èë­>µúÙ)®m<³‹¯ŠðòjÖCdâ[_¿ ”AÏÁa†¨’7?a –“Æ€e@q 8Hà ƒ d°‚IdÐòë"fL&v…2`P*à ‰eàà’Ë€] Á ؔ̀e@Ñ 3 (›ÀÂfXcÐùˆgˆh‰güµ3ÌÐQÏXâ8Ÿ-) õHI r _Ýãx5w Q‡bÉPX…~j*†Ó2 ½(*{U'îf‰yy‚3Wà~²]> endobj 6 0 obj <> endobj 7 0 obj <> endobj 8 0 obj <> endobj 71 0 obj <> endobj 72 0 obj <> endobj 73 0 obj <> endobj 74 0 obj <> endobj 107 0 obj [/View/Design] endobj 108 0 obj <>>> endobj 105 0 obj [/View/Design] endobj 106 0 obj <>>> endobj 103 0 obj [/View/Design] endobj 104 0 obj <>>> endobj 101 0 obj [/View/Design] endobj 102 0 obj <>>> endobj 42 0 obj [/View/Design] endobj 43 0 obj <>>> endobj 40 0 obj [/View/Design] endobj 41 0 obj <>>> endobj 38 0 obj [/View/Design] endobj 39 0 obj <>>> endobj 36 0 obj [/View/Design] endobj 37 0 obj <>>> endobj 140 0 obj [139 0 R 138 0 R 137 0 R 136 0 R] endobj 187 0 obj <> endobj xref 0 188 0000000004 65535 f -0000000016 00000 n -0000000302 00000 n -0000042665 00000 n -0000000009 00000 f -0000120388 00000 n -0000120458 00000 n -0000120528 00000 n -0000120598 00000 n -0000000011 00000 f -0000042717 00000 n -0000000012 00000 f -0000000013 00000 f -0000000014 00000 f -0000000015 00000 f -0000000016 00000 f -0000000017 00000 f -0000000018 00000 f -0000000019 00000 f -0000000020 00000 f -0000000021 00000 f -0000000022 00000 f -0000000023 00000 f -0000000024 00000 f -0000000025 00000 f -0000000026 00000 f -0000000027 00000 f -0000000028 00000 f -0000000029 00000 f -0000000030 00000 f -0000000031 00000 f -0000000032 00000 f -0000000033 00000 f -0000000034 00000 f -0000000035 00000 f -0000000044 00000 f -0000121790 00000 n -0000121821 00000 n -0000121674 00000 n -0000121705 00000 n -0000121558 00000 n -0000121589 00000 n -0000121442 00000 n -0000121473 00000 n -0000000045 00000 f -0000000046 00000 f -0000000047 00000 f -0000000048 00000 f -0000000049 00000 f -0000000050 00000 f -0000000051 00000 f -0000000052 00000 f -0000000053 00000 f -0000000054 00000 f -0000000055 00000 f -0000000056 00000 f -0000000057 00000 f -0000000058 00000 f -0000000059 00000 f -0000000060 00000 f -0000000061 00000 f -0000000062 00000 f -0000000063 00000 f -0000000064 00000 f -0000000065 00000 f -0000000066 00000 f -0000000067 00000 f -0000000068 00000 f -0000000069 00000 f -0000000070 00000 f -0000000000 00000 f -0000120673 00000 n -0000120746 00000 n -0000120819 00000 n -0000120892 00000 n -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000121324 00000 n -0000121356 00000 n -0000121206 00000 n -0000121238 00000 n -0000121088 00000 n -0000121120 00000 n -0000120970 00000 n -0000121002 00000 n -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000051269 00000 n -0000051343 00000 n -0000051417 00000 n -0000051491 00000 n -0000121906 00000 n -0000043254 00000 n -0000045170 00000 n -0000055534 00000 n -0000047113 00000 n -0000046999 00000 n -0000052042 00000 n -0000052156 00000 n -0000049799 00000 n -0000049945 00000 n -0000050139 00000 n -0000050334 00000 n -0000046474 00000 n -0000045234 00000 n -0000120351 00000 n -0000045910 00000 n -0000045960 00000 n -0000046935 00000 n -0000047150 00000 n -0000050921 00000 n -0000050530 00000 n -0000051042 00000 n -0000051148 00000 n -0000051924 00000 n -0000051956 00000 n -0000051806 00000 n -0000051838 00000 n -0000051688 00000 n -0000051720 00000 n -0000051570 00000 n -0000051602 00000 n -0000052283 00000 n -0000052349 00000 n -0000052372 00000 n -0000052668 00000 n -0000052746 00000 n -0000054814 00000 n -0000054888 00000 n -0000055497 00000 n -0000055034 00000 n -0000055179 00000 n -0000055270 00000 n -0000055376 00000 n -0000055610 00000 n -0000055788 00000 n -0000056786 00000 n -0000071100 00000 n -0000121957 00000 n -trailer <]>> startxref 122098 %%EOF \ No newline at end of file diff --git a/www/images/tikzit_bg.psd b/www/images/tikzit_bg.psd deleted file mode 100644 index e66cf1c..0000000 Binary files a/www/images/tikzit_bg.psd and /dev/null differ diff --git a/www/images/tikzit_doc.ai b/www/images/tikzit_doc.ai deleted file mode 100644 index 9900f1d..0000000 --- a/www/images/tikzit_doc.ai +++ /dev/null @@ -1,2195 +0,0 @@ -%PDF-1.5 %âãÏÓ -1 0 obj <>/OCGs[14 0 R 23 0 R 26 0 R 43 0 R 96 0 R 176 0 R 185 0 R 188 0 R 205 0 R 258 0 R 338 0 R 347 0 R 350 0 R 367 0 R 420 0 R 480 0 R 489 0 R 492 0 R 509 0 R 562 0 R 622 0 R 677 0 R 737 0 R 792 0 R]>>/Type/Catalog>> endobj 821 0 obj <>stream - - - - - application/pdf - - - Web - - - - - Adobe Illustrator CS3 - 2010-04-02T00:02:42+08:00 - 2010-04-02T00:18:24+08:00 - 2010-04-02T00:18:24+08:00 - - - - 200 - 256 - JPEG - /9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgBAADIAwER AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE 1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp 0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo +DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8A9U4q7FXYq7FXYq7FXYq7 FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYqtlmiiXlK6xr05MQBX6cVUf0jp/8Ay0xf 8Gv9cVd+kdP/AOWmL/g1/rirv0jp/wDy0xf8Gv8AXFXfpHT/APlpi/4Nf64q79I6f/y0xf8ABr/X FXfpHT/+WmL/AINf64q79I6f/wAtMX/Br/XFXfpHT/8Alpi/4Nf64q79I6f/AMtMX/Br/XFXfpHT /wDlpi/4Nf64q79I6f8A8tMX/Br/AFxV36R0/wD5aYv+DX+uKrlvLZzRJUb5MD+rFV3qL44q2JBi q4NXFW8VdirsVdirsVdirsVdiqU+ZT/oCj/LH6jiFYxTCh1MVdTFXUxV1MVdTFXUxV1MVdTFXUxV 1MVcRiqm+wxV0Or3dqw4yEp3QmoxVkFjrkcyqSaVwJTaG5Vx1xVEq1cVXYq7FXYq7FXYq7FXYqlP mT/eJf8AXH6jiFY1TCh1MVdTFXUxV1MVdTFXUxV1MVdTFXUxV1MVcRiqlKu2KpVesVriq3Q9RU3n 1OQ/DN/dnwcb/jirJbbUJbWURzE8T9l/H2wJZFaXiSKCD1xVHK1cVXYq7FXYq7FXYq7FUq8xf7xr /rj9RxVjdMKHUxV1MVdTFXUxV1MVdTFXUxV1MVdTFXUxV1MVWOuxxVJ9SQhTirEbu+ltLpJozR4m Dr81NRir1OSGG8tI50FYp0WRD7MAw/XilC2t9NYzCKYkxk0R/wCB98Csosr1JUBBxVHqwIxVdirs VdirsVdiqVeYf95F/wBcfqOKsephQ6mKupirqYq6mKupirqYq6mKupirqYq6mKupiq1hiqWalHVD irz3zCCpfFL1byBOb7yTpU53IiaL/kS7Rf8AGmBUZf2CSoyMKg4VS6xu59PnEExJQn93J4+x98Cs stLxZEBBxVHKwIxVdirsVdirsVSvzB/vIv8Arj9RxVj9MKHUxV1MVdTFXUxV1MVdTFXUxV1MVdTF XUxV1MVaI2xVAX6VQ4q898zRfb+RxV6N+TfJ/I0St/uu4nVflz5f8bYEstngBB2xVKL+wSRSrCoO FUFZX01lMIJiSpPwOe4wKyizu1kQEHFUcrVGKt4q7FXYqlmvf7yr/rj9RxVIKYUOpirqYq6mKupi rqYq6mKupirqYq6mKupirqYq4jFUJdpVDirC/MFkXD7dsVZn+VN1p9n5UFvPdQxSrcSs0byKrAMd jQnvgSzNJrW4FYJUlFK/Awbbx2xVDzwAg7Yqk9/YJIpVht28QcKofTbqa1lEExr/ACN4jArKLacO oOKopTXFW8VdiqW67/vKv+sP1HFUhphQ6mKupirqYq6mKupirqYq6mKupirqYq6mKupirqYqpSpU HFUk1HT/AFAdsVYnqflsSE/DilIZvKZDclWhG4IxVFWkfmGxI+q6hdQgdkmkUfcDTFWR6d5u82QU Wa4F0g/ZmRT/AMMvFvxxVkdr5hivFAuYTDJ2dDyFfHxH44qyXSb8EBCwPgR3GBWQRPyAOKquKuxV Ldc/3mX/AFh+o4qkdMKHUxV1MVdTFXUxV1MVU7m5trWIzXMyQRL9qSRgij6WIGKpFN+YHk+GQxtq Klh14JK4/wCCVSv44pai/MHydI4RdRUMenKOVR/wRUDFU9tbu0u4hNazRzxHpJEwdfvUkYoVaYq6 mKupirRWuKqTwK2KoWTT0btiqGfSYz2xSoSaLGf2cVUDoyg7LihUj0/gemKUxtQ8RBU0IxVlelXY kjAJ3HXAqaDFW8VS7Wv951/1h+o4qktMKHUxV1MVdTFXUxVifnPz3a6Cv1W2VbjU2FRGfsRg9Gen 4Lil5HqmsanqtwZ7+4eeTfiGPwqD2VR8Kj5YqgqYq6mKovTdU1HTLgXFhcPbzD9pDsR4MOjD2OKv WfJXn6DW6WV6Fg1MCqgbJKB1KV6MO6/d7Ksxpih1MVdTFWuOKtcBirvTGKrTED2xVYYFxVY1uPDF VoipiqP0uQx3PHxAP8MCWTRmqjFV2KpfrP8AvOv+sP1HFUmphV1MVdTFXUxVKfNGuR6HotxfsAZF HC3Q/tStso7bDqfYYq8Eurme6uJLm4cyTzMXkc9SxNScCqVMVdTFXUxV1MVXwyywTJNC5jljYPG6 mhDA1BBxV7x5P18a7ocN41BcL+6ulHQSKBUj2YEHCqd0xV1MVdTFUp8xeZdL0G0E965LvUQ26UMj kdaDwHcnFXm2ofmx5gndvqcUNnF+zt6jj5s3wn/gcVa0/wDNjzDA6/W44byL9oFfTf6GX4R/wOKv SPLfmfTNftDNZsVljoJ7d6c0J+XUHscVTYriqwriq612v1H+SP1nArKYvsDFV+KpfrH9wv8ArD9R xVKKYVdTFXUxV1MVeYfnFfsbjT9OUkKqNcSL2JY8E+7i334q83pgV1MVdTFXUxV1MVdTFWY/lv5o ttF1Ca3vn9OyvAoMpqQkiV4k+AIJB+jCr2OKSOWNZInWSNxVHUgqR4gjFV9MVWyOkaNJIwREBZ3Y 0AA3JJOKvn/zPrk+t6zcX0hPpsxW3Q/sRKfgWn4n3wKlVMVdTFUz8ua1caLq9vfwk0RqTIP24z9t T8x098VfQSlXUMpqrAFSO4OFW+OKrbdf9yC/6o/WcCsoi+wMVXYqgNX/ALhf9YfqOKpTTCh1MVdT FXUxV5D+b4P+JLU02+ppv/z1lxSwXArsVdirsVdirsVXIju6oilnYgKoFSSegAxVnHl/yL5+WMSW 1w2lRvvxeZ4yQfGOPl/w2FWSL5T/ADB4ivmSh7ijH8SMVSrzD5L/ADAls5DJqh1KFRVrZZHVmA32 joFY/TirzbArsVdirsVfR2kxSR6XZxyf3iQRq9f5ggBwoRVMVWQ/8dFP9UfrOBLJo/sDFV2KoHVv 7lf9YfqOKpVTCrqYq6mKupirzn84dKZ7Sx1NFqIGaCY96P8AEh+QKn78VeWYFdirsVdirsVdir0j 8odBSWW61mePl6JEFqTQ0cisjD3CkAH3OFXqNMVdTFXUxV4h5/8AKk2i6tJPFGf0bdsXt3A+FGbc xHwp+z7fTirFcCuxVk3kTyrNrmrRvIh/R1swe6kI2am4jHiW7+2FXudMVdTFVOL/AI6Kf6o/WcCs lj+wMVXYqgtU/uh/rDFUrphQ6mKupirqYqhdU0y21PT57C6XlBcIUenUdwwr3U7jFLwDX9DvdE1O Wwu1+JDWOSlFkQ/ZdfY/r2wKl+KuxV2KuxVG6No19rGoxWFmnKWU7sfsoo+07HsBir3/AEXSLbSN Lt9Ptv7uBacj1ZjuzH3Y74VRtMUOpirqYqpXdna3lu9tdRLNBIKPG4DKR8jirCdR/KDQ53L2VzNZ 1P8AdmkqD5cqN97Ypa0/8n9EhcPe3U13xNfTFIkI8DTk33MMVZtZ2NpZWyW1pEsFvGKJGgoBihWp irqYqpJ/x0k/1B+s4Eskj+wMVXYqgtT/ALpfniqXUwq6mKupirqYq6mKvOvzlt4Tp2nXBA9ZZnjU 9+DLU/iowK8rjiklcJGhdz0VQST9AxVzxSRsUkQo46qwII+g4q0kTuwVFLM2yqoJJ+VMVblhlifh KjRv14sCD9xxV6Z+TFvCV1SegMwMUYPcKeR/Ej8MVem0wq6mKupirqYq6mKupirqYq6mKupirqYq h1/46Sf6g/WcCskj+wMVXYqg9S/ux88VS+mFXUxV1MVdTFXUxV5f53S481eb7Xy/YGsdirG5m6qj PQyMafygKP8AW2wKzzQfLWk6HaiCxhCtSks5AMkh8Wb+HTCqZPFG4o6hh1owB/XirkijjBCIFB68 QB+rFUBrfl/StatGtr+ESKQeEmwkQ/zI3Y4q898pwXHk/wA7SaPetW11FQlvP0VyCfSb51qlPE4F ep0wq6mKupirqYq6mKupirqYq6mKupirqYqhh/x00/1B+s4FZHH9gYquxVCah/dj54qgKYVdTFXU xV1MVSHzl5mg8v6PJcFlN5KClnEerSEfap/KvU/24FQH5c+XX03SDf3dW1LUz687tuwRt0Uk99+T e59sVZbTCrqYq6mKupirGPzA8tHWdEaS3X/cjY1mtWX7RpuyD/WA29wMCqnkbzRFr+jI7sPr9uBH eJ35Do9PB+vzxVkdMKupirqYq6mKupirqYq6mKupirqYqhT/AMdNP9Qf8SOBWRR/YGKrsVQt/wDY HzxVA0wqpXVzb2ltLc3EgighUvJI3QKBUnFXkHmf809Xvpng0hjY2QJCyAD1nHiW/Y+S7++BWKnz D5gLczqd3yrXl68la/8ABYqpSaldXd5FcalNLecGXmZnZ2KA1K1YnFX0Xp99aX9lDeWkgltp1Dxu PDw9iOhHbCqIpirqYq6mKupiqjd3VtZ2st1cyCK3hUvLI3QKOuKvnafVJotXur3S5ZbMSyyNCY2M brG7EhaqR2wK3/iHzBz5/pO751ry9eStfGvLFWTeWvzR1vT5ki1N21CxqA5ehmUdyr7cvk33jFXs Nje2t/ZxXlpIJbedQ8bjuD/Ed8Kq9MVdTFXUxV1MVdTFXUxVCN/x1E/1B/xI4FZDH9gYquxVDX32 R88VQVMKvO/zk1SaDTbLTYzRLx3kmIPVYePFT7Fnr9GBXkmKuxV2KvUfyZ1aRhfaTIxKIBcwDwqe En/GuKvTqYVdTFXUxV1MVec/nJq0sNjZaXG1FumaWcDqVjoEB9izV+jArybFXYq7FXqf5M6tI8d9 pMjVWPjcQA9gTxkHyrx/HFXplMKupirqYq6mKupirqYqg5P+Oon+oP8AiRwKyCP7AxVdiqGvPsj5 4qhKYq8v/Ou2k/3E3ABMY9aNm7AngQPp3xV5firsVdir0T8l7ORtYv7wD93FbiEn/KlcMP8Ak0cV euUxV1MVdTFXUxV5X+dNm4udMvACY2SSEnsCpDD7+R+7FXmeKuxV2KvRvyXs5G1XULwf3cUCwn/W kcMP+TeKvWqYq6mKupirqYq6mKupiqCl/wCOrH/xjH/Ejiqfx/YGKrsVQ930HzxVDUxVKfM/l621 /R5tPnPBmo8EtKlJV+y1PwPtirwLWdD1PRr1rPUITDKv2T1Vx/MjdGGKoCmKozStI1DVbxLOwhae d/2VGwHTkx6KB4nFXvflDyxB5e0dLJGEk7H1LqYftSEUNK/silBiqd0xV1MVdTFXUxVKPNPly31/ RpdPmPBz8dvL14Sr9lvlvQ+2KvAtZ0TUtHvXs9QhaGVfsk/Zdf5kbowxVA0xVGaTo+o6teJZ2EDT zv2Xoo/mY9FA8Tir3vyj5Zh8vaNHYowkmY+pdSj9qRgK09hSgxVO6Yq6mKupirqYq6mKupiqXzf8 dWP/AIxj/iTYqn8f2Biq7FVC66DFUPTFXUxVD32m2F/AYL23juYSa8JVDAHxFeh98VSA/ln5IL8/ 0YK9aerPT7udMVT3T9K07TofRsLaK2jO5WJQtSO5p1PzxVFUxV1MVdTFXUxV1MVdTFUNfaZYahD6 F9bR3MXXhKocA+Ir0OKpD/yrPyTz5/owV609Wen3c6Yqnun6Vp2nQ+jYW0VtEdysShakbVNOp+eK oqmKupirqYq6mKupirqYq6mKpdcf8daP/jGv/EmxVPo/sDFV2KqNz2xVQpirqYq6mKupirqYq6mK upirqYq6mKupirqYq6mKupirqYq6mKupirqYq6mKupirqYq6mKpbc/8AHWj/AOMa/wDEmxVPY/sD FV2KqM/bFVKmKupirqYq6mKupiqD1XVtO0mza81CX0bZSFaTiz7saDZAxxVI/wDlZfkj/q5f8kLj /qnirv8AlZfkj/q5f8kLj/qniqbaV5i0bVrSa70+49a3gJWV+DpQheR2dVJ28MVXaNr2ka1A8+mT /WIo24O3B0o1AaUdVPQ4q1p3mHRtSvLqysrj1bmyYrcx8HXiQxU7soB3HY4qmJoBU7AdTiqT6d5t 8valfvYWN39Yuk5c1jjlKgLsT6nHhT35YqhLr8wvJ9pdTWtxqHCeB2ilT0ZzR0JVhUIQaEdsVUv+ Vl+SP+rl/wAkLj/qniqYaN5u8u61cPbaZd/WJo09R09OVKKCBWrqo6sMVTimKupirqYq6mKupiqW XX/HXj/4xr/xJsVTyP7AxVdiqlN1GKqdMVdTFXUxV1MVdTFVG7srO8hMF3BHcQkgmKVFdSR0PFgR irGPOflzy/b+VtSnt9MtIZo4SUljgjVlNRuGCgjFUD+W2g6HeeUrae7061uJ2eUNLLDG7kCQgVZg TirK5NN0+x0y7jsrWG1jaN2ZIY1jBPAipCgb4qw78mB/uCvv+Yr/AJlriqj+XVB5x80E7ATPX/ke +Ku8x+YtS80ai3lryya2+4v78EhCvRgGH7H/ABLoNuqrMfLXljTvL+nraWi8nNDcXDD45H8T7eA7 Yqqy+WvLs0ryy6VZySyMXkkeCJmZmNSSStSScVYl5+m8raDp4gtdJsW1a7HG2jFtCSgO3qEce3Rf E/TiqO/LryZ+g7A3l2tNUu1/eD/fcZoRH8+7f2YqzCmKupirqYq6mKupiqV3n/HYj/4xL/xJsVTu P7AxVdiqnL9oYqspirqYq6mKupirqYq6mKpF57H/ADqGq/8AGBv1jFUu/Kof86Xaf8ZJv+ThxVk2 oj/cfdf8Yn/4icVYL+S//HCvv+Yr/mWuKsStLLzBqXmrXdJ0ljFHe3Uq31xvRIVmetWHY16dT08c VTny7cT+RPNUuiai3LS78qYbsqFFTsjk9h+y47dcVerUxVLfMWvWWhaVNqF0aqm0UYPxSSH7KD5/ qxVhXkXy/ea3qb+b9dHN5G5afAegoaBwD0Veiffir0emKupirqYq6mKupirqYqlN7/x2I/8AjEv/ ABJsVTuP7AxVdiqx/tDFWqYq6mKupirqYq6mKupiqQ+fB/zp+rf8YG/WMVS78qR/zpVp/wAZJv8A k42Ksn1Ef7j7r/jDJ/xE4qwP8lR/uBvv+Yr/AJlriql+XH/KZ+af+Mz/APJ98VZP548qReYtGeBQ BfQVkspDtR6boT/K/Q/f2xVJfy082yXds+h6oSmp6cCq89meJPhINf24+h9vpxViGpeZ9I8z+a0l 1q7Nn5fsyTbwFJGaQA9xGrUL9z2G2KvQI/zL8hRosceohEQBURbecAAbAACPFUy0Xzf5c1u5e20y 7+sTRp6jp6cqUUELWrqo6sMVTmmKupirqYq6mKupiqT3/wDx2Yv+MS/8SbFU6j+wMVXYqsb7YxVu mKupirqYq6mKupirqYqp3FtBcQvBcRJNDIKSRSKGVh4FTUHFVtpZWlnAILSCO3gWpWKJFRASamiq AMVVWRWUqwDKwoyncEHscVULLTNPsI2jsbWG1jY8mSCNYwTSlSFA3xVq20vTbWaWe2tIYJ5zWeWO NEdyTWrsoBbc13xVE0xVB/oTRxeG++oW/wBdJJN16SerUihPOnLpt1xVDf4T8r/9Wex/6Rof+acV d/hPyv8A9Wex/wCkaH/mnFURZaJo1hI0tjYW1rKw4s8ESRsVrWhKgbbYqjaYq6mKupirqYq6mKpN qH/HZi/4xL/xJsVTmP7AxVdiqlM/pjnStOwxVLJfMCoxX6s5p3qMVWf4lX/llk+8Yq7/ABKv/LLJ 94xV3+JV/wCWWT7xirv8Sr/yyyfeMVd/iVf+WWT7xirv8Sr/AMssn3jFXf4lX/llk+8Yq7/Eq/8A LLJ94xV3+JV/5ZZPvGKu/wASr/yyyfeMVd/iVf8Allk+8Yq7/Eq/8ssn3jFXf4lX/llk+8Yq7/Eq /wDLLJ94xV3+JV/5ZZPvGKu/xKv/ACyyfeMVd/iVf+WWT7xirv8AEq/8ssn3jFXf4lX/AJZZPvGK u/xKv/LLJ94xVRFwb3UEnEZjVUCUbfoSe3zxVP4/sDFV2KtOoYUOKoZrCImvEYq1+jof5Rirv0dD /KMVd+jof5Rirv0dD/KMVd+jof5Rirv0dD/KMVd+jof5Rirv0dD/ACjFXfo6H+UYq79HQ/yjFXfo 6H+UYq79HQ/yjFXfo6H+UYq79HQ/yjFXfo6H+UYq79HQ/wAoxV36Oh/lGKu/R0P8oxV36Oh/lGKu /R0P8oxVfHZxxmoAxVEAUxV2Kv8A/9k= - - - - - - uuid:71583DE9423FDF119697BF3D5A982C1E - uuid:48c9a86e-fee9-9940-835a-50314be91278 - - uuid:35a6de60-2c31-1147-8d98-60227d267e1a - uuid:59F173019111DE119E68F347B0389EBB - - - - Web - Document - - - 1 - True - False - - 14400.000000 - 14400.000000 - Pixels - - - - - Helvetica - Helvetica - Regular - TrueType - 6.1d18e1 - False - Helvetica.dfont - - - - - - Cyan - Magenta - Yellow - Black - - - - - - Default Swatch Group - 0 - - - - White - RGB - PROCESS - 255 - 255 - 255 - - - Black - RGB - PROCESS - 0 - 0 - 0 - - - RGB Red - RGB - PROCESS - 255 - 0 - 0 - - - RGB Yellow - RGB - PROCESS - 255 - 255 - 0 - - - RGB Green - RGB - PROCESS - 0 - 255 - 0 - - - RGB Cyan - RGB - PROCESS - 0 - 255 - 255 - - - RGB Blue - RGB - PROCESS - 0 - 0 - 255 - - - RGB Magenta - RGB - PROCESS - 255 - 0 - 255 - - - R=193 G=39 B=45 - RGB - PROCESS - 193 - 39 - 45 - - - R=237 G=28 B=36 - RGB - PROCESS - 237 - 28 - 36 - - - R=241 G=90 B=36 - RGB - PROCESS - 241 - 90 - 36 - - - R=247 G=147 B=30 - RGB - PROCESS - 247 - 147 - 30 - - - R=251 G=176 B=59 - RGB - PROCESS - 251 - 176 - 59 - - - R=252 G=238 B=33 - RGB - PROCESS - 252 - 238 - 33 - - - R=217 G=224 B=33 - RGB - PROCESS - 217 - 224 - 33 - - - R=140 G=198 B=63 - RGB - PROCESS - 140 - 198 - 63 - - - R=57 G=181 B=74 - RGB - PROCESS - 57 - 181 - 74 - - - R=0 G=146 B=69 - RGB - PROCESS - 0 - 146 - 69 - - - R=0 G=104 B=55 - RGB - PROCESS - 0 - 104 - 55 - - - R=34 G=181 B=115 - RGB - PROCESS - 34 - 181 - 115 - - - R=0 G=169 B=157 - RGB - PROCESS - 0 - 169 - 157 - - - R=41 G=171 B=226 - RGB - PROCESS - 41 - 171 - 226 - - - R=0 G=113 B=188 - RGB - PROCESS - 0 - 113 - 188 - - - R=46 G=49 B=146 - RGB - PROCESS - 46 - 49 - 146 - - - R=27 G=20 B=100 - RGB - PROCESS - 27 - 20 - 100 - - - R=102 G=45 B=145 - RGB - PROCESS - 102 - 45 - 145 - - - R=147 G=39 B=143 - RGB - PROCESS - 147 - 39 - 143 - - - R=158 G=0 B=93 - RGB - PROCESS - 158 - 0 - 93 - - - R=212 G=20 B=90 - RGB - PROCESS - 212 - 20 - 90 - - - R=237 G=30 B=121 - RGB - PROCESS - 237 - 30 - 121 - - - R=199 G=178 B=153 - RGB - PROCESS - 199 - 178 - 153 - - - R=153 G=134 B=117 - RGB - PROCESS - 153 - 134 - 117 - - - R=115 G=99 B=87 - RGB - PROCESS - 115 - 99 - 87 - - - R=83 G=71 B=65 - RGB - PROCESS - 83 - 71 - 65 - - - R=198 G=156 B=109 - RGB - PROCESS - 198 - 156 - 109 - - - R=166 G=124 B=82 - RGB - PROCESS - 166 - 124 - 82 - - - R=140 G=98 B=57 - RGB - PROCESS - 140 - 98 - 57 - - - R=117 G=76 B=36 - RGB - PROCESS - 117 - 76 - 36 - - - R=96 G=56 B=19 - RGB - PROCESS - 96 - 56 - 19 - - - R=66 G=33 B=11 - RGB - PROCESS - 66 - 33 - 11 - - - - - - Web Color Group - 1 - - - - R=236 G=28 B=36 - RGB - PROCESS - 236 - 28 - 36 - - - R=0 G=169 B=157 - RGB - PROCESS - 0 - 169 - 157 - - - R=102 G=45 B=145 - RGB - PROCESS - 102 - 45 - 145 - - - R=139 G=146 B=152 1 - RGB - PROCESS - 139 - 146 - 152 - - - - - - Grayscale - 1 - - - - K=100 - GRAY - PROCESS - 255 - - - K=90 - GRAY - PROCESS - 229 - - - K=80 - GRAY - PROCESS - 204 - - - K=70 - GRAY - PROCESS - 178 - - - K=60 - GRAY - PROCESS - 153 - - - K=50 - GRAY - PROCESS - 127 - - - K=40 - GRAY - PROCESS - 101 - - - K=30 - GRAY - PROCESS - 76 - - - K=20 - GRAY - PROCESS - 50 - - - K=10 - GRAY - PROCESS - 25 - - - K=5 - GRAY - PROCESS - 12 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - endstream endobj 2 0 obj <> endobj 14 0 obj <> endobj 23 0 obj <> endobj 26 0 obj <> endobj 43 0 obj <> endobj 96 0 obj <> endobj 176 0 obj <> endobj 185 0 obj <> endobj 188 0 obj <> endobj 205 0 obj <> endobj 258 0 obj <> endobj 338 0 obj <> endobj 347 0 obj <> endobj 350 0 obj <> endobj 367 0 obj <> endobj 420 0 obj <> endobj 480 0 obj <> endobj 489 0 obj <> endobj 492 0 obj <> endobj 509 0 obj <> endobj 562 0 obj <> endobj 622 0 obj <> endobj 677 0 obj <> endobj 737 0 obj <> endobj 792 0 obj <> endobj 793 0 obj [/View/Design] endobj 794 0 obj <>>> endobj 738 0 obj [/View/Design] endobj 739 0 obj <>>> endobj 678 0 obj [/View/Design] endobj 679 0 obj <>>> endobj 623 0 obj [/View/Design] endobj 624 0 obj <>>> endobj 563 0 obj [/View/Design] endobj 564 0 obj <>>> endobj 510 0 obj [/View/Design] endobj 511 0 obj <>>> endobj 493 0 obj [/View/Design] endobj 494 0 obj <>>> endobj 490 0 obj [/View/Design] endobj 491 0 obj <>>> endobj 481 0 obj [/View/Design] endobj 482 0 obj <>>> endobj 421 0 obj [/View/Design] endobj 422 0 obj <>>> endobj 368 0 obj [/View/Design] endobj 369 0 obj <>>> endobj 351 0 obj [/View/Design] endobj 352 0 obj <>>> endobj 348 0 obj [/View/Design] endobj 349 0 obj <>>> endobj 339 0 obj [/View/Design] endobj 340 0 obj <>>> endobj 259 0 obj [/View/Design] endobj 260 0 obj <>>> endobj 206 0 obj [/View/Design] endobj 207 0 obj <>>> endobj 189 0 obj [/View/Design] endobj 190 0 obj <>>> endobj 186 0 obj [/View/Design] endobj 187 0 obj <>>> endobj 177 0 obj [/View/Design] endobj 178 0 obj <>>> endobj 97 0 obj [/View/Design] endobj 98 0 obj <>>> endobj 44 0 obj [/View/Design] endobj 45 0 obj <>>> endobj 27 0 obj [/View/Design] endobj 28 0 obj <>>> endobj 24 0 obj [/View/Design] endobj 25 0 obj <>>> endobj 15 0 obj [/View/Design] endobj 16 0 obj <>>> endobj 736 0 obj [792 0 R 737 0 R] endobj 5 0 obj <>/ArtBox[6944.5 6943.5 7456.5 7455.5]/Group 813 0 R/MediaBox[0.0 0.0 14400.0 14400.0]/Thumb 820 0 R/TrimBox[0.0 0.0 14400.0 14400.0]/Resources<>/Shading<>/ColorSpace<>/Font<>/ProcSet[/PDF/Text]/Properties<>/ExtGState<>>>/Type/Page/LastModified(D:20100402001818+08'00')>> endobj 812 0 obj <>stream -H‰ÌTMk1½ëWèجь4ÒÕŽ[J %d¡¡WÓ&„º% üï;cÙ^;+hõ‚Wû¤ù|ó4|^ùáf~y½òîÙGf8þ/Úë÷7÷ÅÿÔÝáÃø‡7¼ß‚¿þånõyvAsòÂýÖ ÄDÊ„ý˜°\K -¥ˆa”Û²‡ITŒˆ–u«9TÝ£õ ÈA²u3ÈÌRÕÔH!Ì!%ÖK(`HÌ!Rõ;7Ç̨Š€É ˜%€c(Aʾ¦˜r`óËXCÊÚ„È*¨%Ç–½f6ÃÌ’RÐ Ãj¨håjŽEê¡gÉ|!hð> endobj 820 0 obj <>stream -8;ZDn5n8Q%#Xr[bqqub`b/80=;($?!jb&^sa.Zql_#&N/..W[3'Ysus-M`3.2Eb"L -q*_q)ZSJUm&m'Y%pMK!6m9CTXmP"0#>Qnr9NA&odQ,cqR<5_epo:Z4Bs6;iuN"l?, -Q;(',"?ZpJ?CtN@G0K+\nqE,*CV+uF/!NQ27r\92Vd5<'n3/1%I[#<7Is:lcq+uO< -rVt+>#!\Q)ph(9dq.U([b^[D-d endstream endobj 743 0 obj <> endobj 800 0 obj <> endobj 773 0 obj <> endobj 797 0 obj <> endobj 810 0 obj <> endobj 811 0 obj <> endobj 817 0 obj <>stream -H‰T– xOWÀÏö—…H¬‰ååÝ÷'Ô'¢•Ú5vB¨ØR²J¤$A4-5ѪªÆZÛø[ZkQK‡Ô´b):ƒ¢%±}„ˆDÞ\ÿÄŒyßwî¹ç.çž{¿ßy÷€dCd¿Í[ø…aºå²–¸Ä´øôZë -°€3;qR†úüNØJ€G859}dÚmY| ñ›ÞÆÈÔ)ÉÓ|J6¼Õ€²R’âGdgÿå @h®ö×*E7x;}?x›µÝ0%-#3:·Z„¶XëRÇ&ÆCÍ¥©ƒÖö†´øÌt¿³•½&OÐãÕ˜ø´¤„ÃË=µý€# }ì„Œ99›ÖLÛ P>>)ýÀÌ1o\]¤ã;\š‰óÁ¡Ç.q„ê]–k> ɯ׀ìHÈŒ~e§O?:W U‚²uðŽÇRÌU€_÷Ó§%Í?¼ŒÆ=PÇ/÷2^ž#ø…”ëêmÊuÍ.åºvŸrU®ëÆ•ëú£´öÌÐÚÐNg€øæé³{¨ãó„‡zˆ—^ÃG÷Í€5°Ž@.œ‚³ùpJÐX}Ы£&ZØ›b3lŽ-°%¶Æ¶ØßÁNØ»aì…Øâ`|‡c,Æãdœ‚ÓpfáLœsp.Îø—áJ\…«Ñ…q+nÇݸ÷cÁËøo¼·ð>ÀB|‚ÏÈŸê‘A&) -¥6Ԏ¨ u£Ô‹"¨õ§A4„¢)ž’i4¥Ñ$šAYô}BÙô)Í£/h-¢¿ÒRZN«i¹h3m¡m´‹öÐ^ÚO§Ct”ŽS.ýBçèåÑUú~§Ût—Ðc*¢b*¥2®ÄžìÍU¸*WçÚÀ7à ~ƒƒ¹¿Í­¸=‡q'îÍ}y æ!ü>çXŽçDËùOÉ…l‹Ÿô“XI’$MÆÉ™,SäKùJ–É -Y-kåoò­l•í²SvÉÙ+ûå äÈa9.§å¬œ—ÉE¹$Wåºü!w¤@žH‘‹í@Gª 4¼ŒªFMÃߨk˜F´k¤£1Æc¢1Õ8dä?. \XlÖ2 ³»Ù×|ÏjF›ÃÍéæwæó°yÄjâQkjKí©3u¥îÔ“zSŠ¤ECi%ÑHMüXʤ5ñ3éÏ4‡æº‰_H‹Ýį¤5´ž6Ò7´•¶ÓnúžöÑ:H9tŒþI'é,§‹t‰®Ñ úƒîÐ=ýo(¤gôœ^ÍÈö`/®Ì>ìË5ØŸë°“r#nÂÍ8”[rkîÀ¹3Gð»<ˆ£x(Gs Çqà žÊÓ4ñ³x6ÏÑÄÏã/y-ÃÛxâÃ|‚ñ©&‘’ É2JÒe¼dH¦Ì—²H–Ë*Y#ëd“l‘m²C¾“Ýò½ì“rHÿ£œ’3rN~• ’'—åšü&·%_îÊSy&epø¹‰÷ÔÄW3j†at5†ñÆ(#Õç&þ &þH . \e‚`*3ÜŒ¬ >ÖÌ2w›?˜ÿ0™¹æóWóŠyݼg>2Ÿš/(/UYù©šªŽ2TÕ\µSTÕK TQj¨¦bT‚¥ÒU†š¯V© j³ÚnEÄ׶êXJßÈj¢‰oguÖÄ÷µb­xk¦&¾’Ó÷5âG¸‰M¼oP ÿ -âÛjâã‚GO ú.pyº|\Õ]ªh•&ÿK<ÚÅö3û‰}Ó¾ñêö©ÈƒWÙEºí±]¦ËR;Ï~Ñv ¤ØÅÚ.‚ˆŠ9OµÇBÓÒÇ~dÇØ¡¹ýÐ^aϲïêÞû}Q]† °žÏë¬Ç -mûꉿhùLËl®¥[7C¦®—j)qœ„bGÙM´UhGŠ ÷Ü~¹šÊS]yìuÔ†ÿwd¹}ïÛ˵,‘›ŽzöBíè¸{D+jéÖ^›ÕFKýòzWx˜ãî p×ÇH¸îIÓ¢ße£ËüonÙÕ²ºÔ÷fÙÅ×#Á}zž~‰`"Æè8jÙõôž¯—ycWíõ8ýHÇ`+l!#lÔ²²tÿ0€z]šLSh§ÎÝú–¿H¥³y ¥ë¼NÑù¥ÛûP‚ÎöH -§(íý}ê¯Ë¾v’a_±ïØ=¹™ÝÝ>e_²;“ŸÝ‘šÙÛ¨öóz] -Z4,0ò‹ jäŸÉ? ÿr~^þÅüºÖ-¿Ë­@€[ÿa¿< «*ò0þ}sgî¼Ý¤7¤+HWE""% R -ÒKȆŽ€"u¤)²Ò‹”ÐD‘^BMhÉ#<¤‰ú¿ï%‘€°gìÙãžÌ9ó¿sÛËÜ{¿üæûòº¢]íímm/Zæ©MÏK•¿¨ ø›ú_ð7Nyr‰´ß$à9 $­IÚ uÝéÔ÷~ê€ôØÄwN­ž/¢³·M˜”1)S`¹ŒåÚ„ñÞÑ„ÁÇ£¢žK(w¼LÒ˜¤ŠþþUþOüËýKý‹ýOÅË÷H|6þµøañ=ãÅõohu®U¢ÔÏ2ÇØ}f½ïsß&ßÆëIýæIêKY±‹Ë[¯$”ªí´w"¡¿w†¤} -§O¨zÔšÓ:X[Ýp¤ièËÞØ¥F¤ÔÐ~êÕÒìÕvê$j&oÃœr´®.þÁûµÖNwoFÁ>ð¦Ùö -ÍU8;Xê`gH¶#eìõÑÎÛŽçU';ï;âc¹Î"©Kœ•Á{VüÖ¥.sV©ÜÛ#}¿×£N‚ãorMÔ.gtÐÚ&×”¹ü”扮†ºÔË¡‘Îz§÷ykKûëwnÎñ[ŽìImKÞn¾íÝ‹‚5ôä­81ÁQLòÙ•Î:g³#ÿ7ò®:×µOgÐt!™[a]48ÇâÁZTWЕ´¤–üaºÆo[]3åhJ½SÓ%ÿÝÁö±Ðv(†1„¯c¬ÐvªðfG`¤øø×ð.ã -Æ`"ÞÀ&Ç%LÃ\|ƒ«øV<ÿ|lÅX€Öhƒ7ÑÛÑ[°MRÀœA{É{°W8ÖAÒÂ8ŸtÅ)]ÀtF'tA"ÑU¼T7¼Œîè '¢Ñ ½%CôA?ôE¼‚X‰™$9c0^ÅyI«©$™ð±„ø¤‡Äa ’¤PkØ–£mKYù—™Ö˜í¶Ð[õ*ÕÃ.VålEUÑγsíÇ⊪ˆwYÅÙJê[Ú–²•ù¦zP•Ò»ùO½Kïÿ5Ööõòƒíg'©Üz¯éªòèX½ÏtTM;·¹Ê«ò‰Ç˜§wÚh½C0$qÐU~}ÈDš(ÛS2L{ÛßNµSLõ€xðæ³é¢Øö=w—¸îxýµí-Þã;5FÅ -|¢OŠ ÷ëk8ŒD$^ü¬­frA¼ õ/úºxÎÄá„ícŒq6Ê8&ƒ²ÝlWi»è¯ôE'Ÿ±6ÌV·OØ'm ÛÁö`”$¨Çžü‘×ù–øÅküßóI<£L¾+)h„äŸáŠ&³É¢”2&«¦\•YeT¯³¿êmrÚév†É¥²¨¬ºŸî¯²«l*‡îe²IrÊéî´3íû&·ýÀÎR¹LÕS6Mvm?´Ù9zƒ ®ó1ÛÂm £Ýp·‰ŽÀÝIUåp®s1NÒÛ&ðŒx[²»=Ëó:7/ñ -'é<Œ¯{”‰ây½¼÷¥$¾Ó<Ç ://óª“_ßkKêü¾0_ _u_-_3Ÿ¶y•â ½DÔSWsóë×ô =Ô-¦‡éÁúu·¬¨_ѯê!z€8ågT=ɳKU}ÕIuÔ#õ(__C,Ãr_¸¯†àS —즪cž¬´ U86«'$YÖ’TYMÖÜ:z5Öa½ÛTVU¤ä¬·™)£º Æ7%La=Fu#$…vUQæ>s¿)bþnŠšb¦­k뙂¶¶­eëÛæ^“×ä3eín{Øž°‡ð=j¬ß³ÇíIw7ÖÚDoãìA{Ä×Äp¿PS}téáî~w»»ÓõîV5]uÓ#LcÓDÍ0MmÌ1˜lš« ¸h×Ûuv\õWDÚU0xH%îÜBw:‚^V²Ò_$-ý $1eÂ=ÈŒ,ÈŠlÈŽȉ\È<È‹{‘OòTÜ'™ª -á~FE1G ”Äx¥P¡ ʢʣ*¢Æ#¨Œ*xUñG5<êÓ¨§PµPO£Žxк¨‡úh€p4D#<‹çð<£ š¢"Ð-ð^DK´ÂK2em…cí…Z…Q…R‘©®Â¨îB)QÑB)Q}„Oý„P„Q…O†5…©BÓáÂL££0Z:VFŽÃxaêÛxGˆ;QrÖLÆõ®Pw¦ g -U?À,5³ÅûÍÏÅ<áô|¡ìB,ÂbO—ž=U -Wa5Ö k=½a6Š67á3É¥›…Ì[„ÏÛ„Ê;°Srêî c…ʇâ°%N(GqLØ~Bx’T‚s%8¿«„ØÛè!] ~%dNWÂ]P¹ÿ‘Έ‹º néü]PBÖt%üI™p ß{.?â§ÿ€ ¸­²ýA%¤û„ßWBRª7(aNªN¥*áôMJøY”ðKZ%0ê&%ÄŠÒRV‡7E7KnPÂul•’F ä-L˜"jñ”°E”RÂ}éL¸ JøXŠ¦3á¿Â„T%P³ã”@ÃNÄ1²3»ÜÇX:=EÊCLâdNá{œÊiœÎœÉ÷ùgñCÎæ¿8‡q.çñcÎç.ä".æ.å2.ç -~•žøMŠx,¤^ä×¢„#<š¢ÇD~ËL`"ý<É$žb€§ù%Ïܪžå9žç~u“>ç%^æ^ÕÃÇxæ*®æÆp-×q=7p#?å&~ÆϹ™_p ·r·swrws÷2–û¸Ÿx‡DQžÎ TtÐŽnˆ ´²RGÊ£ý,«nw¶e;f@432ïaVôe¶&0's…˜Àì739‚LÈÏb,Î"A%e© N²,˱<+ð!–aeVáÞø½A U†…|’ßÌVc >ÅÚA&<Íš¬%¾ÄcÂ)Öá3âÂÙP˜Ài6ú„&ŒÀ~6g ¾ÀÙRV³ó,ÍöðÿÊ{¹EuÝqü<î¹» Øîb( ¨ÙÛ›Uñ‘­¬¸‹ÔîZÔ]‘È8i"CR38ŒÕWB›ZÛ’™Úi¬Õ¶ÜÿXLqˆ£µ¶6Õ¦±mêLK¦ÓÖI›h&Šìí÷\ÇqøÃq/‡óúÝßùÏïw—~•N"}¢—8EÉ­$SÉ—7óÏHïË<±Ö¼&Îgb«ù_^VÝ2±D±߯/á¾Ñ ¿A9<bìFØWk/Ñ)ð`+"#oœ§¦y{î ß„=ìvº¼³q±’´S¯¹u?Ê›É.󇈇 Ùoo$íäºùóMôVÁ‹’Í)òª³7”‰æÏÍs«¡sz.š+ÍNÄ[.bBz~9I½ü}³qWë:p"ocö;éq³Þl6/˜}ˆq7â±O VwïT^0;Ìš ÈF4V!Jöc×> -Û;I/%`ÿ$m¢ûéæg;Ùqe·HO €ÃtD ŒÁ§ÇAê4ù˜Ü¢17wò&~Æœg~‚µ!£SΤgL3"ffxŒ¼EUÄÂø®…~‡ ï²l- ±gÙsì¯à5üëü]e›Ò%ÚÄA59qÓ|Ës.Ä0wêžØMê×ÿ=¶%:Ô¢z7‰,JGÄ -ú‡ËÍ9œ[¯—þmÕuwpTê´ÙxĘ]VÒ O q’“['ŽÊД¶‡ãÔÜ'ÉݸYðMÑ+C­!€ñQÉËEà ¥™¹žR(.•±â‰ybË·Ä<¥žz“âµrtÔÅÂù X'²#úÃY#źpx!ôäK=Š¥'††Æ! –(€Ð¬Ü2LsjehuÈh dþ@^@øöV†Œ^8.†TÁˆ¥È[ÜC6φÍ3P˜3¨¥: "‹ ÖtÍèŲbr Öã”ÜÝàjˆKˆÆik¥ÕÕªkYsM×`VX2‹Ž¨8™wÂóG~Öη/x@„ ÇCxá¸Ý›°6IÂ_zx„!\|ÂþÑ„ÃZ¿E¸ä^2ÂqÞ›p)lJÂKáec/¿?ᣠ—ÁÚᕈpùxWŒ‹ðª{®„Í«$áÕpÕÂÕ÷'¼f4áµ°vExÝ"üåñ‹pøÞ„×Ãæ°$ü•Âþ,ƒŒ&ÜzPòÀ‘׌BŽp î¡ð1ƉÃ9qbχìÎ8!de~9N$‚²í297Y—sZòYs\škR‰Ò¿ówÑs{I\)ïR×_B¿m“Ž/ás—ÌÌ!ƒêYþ¬‚‰s\ú¹sçäkèì ×ê|¾œðoW…WL³/³…lÏŠùAǽüC[òa~XaBdÛ§;Ž8n1a6»pð?0*„j·ÛŒesîMU‡*„7MBqÈœÙT‡]0%Iá”%ÙTû“êóê?T®fN IÞd’‘2á’ּѓSqÃW>à˨p^Ûà&Å>þRÓ ©+½Ð¾§|fŽhqžÙ3Ó£8˪žÛ~Æi÷Ù}³È3Oo OoÀ”¨æ µ¹ôŽSì<8ðkJ $þuJô ÌeçŒ;ûY__Âb¤Á˜?¸ÎõgRu -±1ÅîHOÏ$ýŒ{…Ò¯fØÛ`S…óFù ߀ïFE°.pK fÑ4Í¥»´yʹ„ë× —èé¼ý±ø\§üÔ`$ºC·ƒ$‘ZÿütáVIU½©™ª\”M‘\ˆ:Åî°'ñ¤$P™)¼ÁA2’S~ µ_¢ñA…óSßéÔÂüÁ‘ dÀ"©……{fæìi9 S6ï»I\v«¾©ü›VþKí—>«»3-ùeû-T§)¢NOL'$…¢÷zòËÃz†ö‘*#/I×ÙI•² ¶¿m2)ëH˜î!ì(iG -ðɤBù)©ìQÔ×"ï”ïJy¤ÓCyÒ\¤¤r¤²¡òrÈ^‘ :&I=V¾tØ%}k -Ò«â,Yô:ÊÊÒ©’ÚÿQ^6°U–W?}ï½ï½—KŸ"T¯Nlc+P"åÃÐQ>ˆ¶%¤0d€#¥ù˜[h„´”ˆŒ-âT3æ6¥a[%£¡V…) 1€ [`àâdBñÝï<÷yËåö ßäŸÿó>Ÿç9ÏyÎ9ÿÛw((2újãÖ˜¾Õ´O×¾†¤–r1ãúS®¡œÞ$p¦‚úæ)wò¼wàœ@¬Öý²—Àº÷•¬1 -òé£òëÓÞiÚË)W±þz­£Ì¸2Í­ð»šÐ×RLŸZPCý=쟹_Ò1:ž¹:Ùuv%±ÚùÓØÍ·p?ਠ3d±^>h—¹2ïÜôZ^ÖPïÁÛµò‰]}dìÛQ5v‚0Wµ?c»‰}$Î,qwV0þIaw§Ì¯½o¢÷FÇê½ñçVSÛñYÏ[÷¨6ÕŒSúš;™oúïR{kýõSÙì‡û¬ö ‡l–ÅRüË0™¸WžBæáèä3Æ -¼€sïù¹‡ÅûJï¿s¯¬SæÜ:ž†oÒúg¥JïýJÿtÒ³Ò{Êê;ôþÂážö\“înOs¿•ÏZÞì³÷µüNÙø¥sÿÍÙúçîs³õ¸—"DÿÆE l¹¹>¾Ëí7‹àÁ°Æ-jKIg z«2¾TŒL¾¾ŒÒj¼3ÎCrV}¼ïó¬/Lø‘‘ðcÌ=š¹ª Ü -.•'´T±F\¼Ï°úâx$(ÝÙ—êç¥åão -Þ´1:Œ+ײ¶=´-àÇCGd rZ™ãt©dµ‘éîô)2ŒòZ‹x0.é¡'èSfoùçôË7}EzºoÈáî¦mªÌAžJó¦³n%mŠtS·ÊÄ¥¸®§{×õÑá¾´D¿f_büvt|™³Ü÷%]ew«¥’ºO?Ÿ¹Tæt;W\Ǹ=%ÝÖ©­¨­Æ­¼qbteâì“¡6qóW 3a/MvTq»íhc[Õ¶ßÆ$;[˜R7§[.²}7%Ö01He\Ç٬Î6X®Òr0‹’%;ŽTFz7Õ¾‹¹«]¬ŽÕŽ^1Œýÿ$y -Úg¿X%­oNÜ“¸ä¹ñ¿/J¹ÛAfà?÷Êdó¾|^²Ô‡¥åÊc¬_êc®ñó—­&®Mµþ¿ÀĽ©õ¡§¤Ô›\'ѯÀÄš“ò»´>Òæ—”Wµ‰ÔÏÌ»YsïZ`™ì1>Mׯ78E–ƒ2ã£ÏË[j§á{°³E2 -½Ï½¼(OPŽÃGÁpœ—€ö{L¢|üÍžíP—„z‹i2ÿ:OYAŒ -²ˆ³€œPmZ7ùÎbåïÖχ™˜Nð@五Dî’õ;&Ÿ[.‡Ü7åPx³‰Q¹pnôÉí˜fÊZ— gR§~¼ÚÏ 5÷Ó8¯±!T`üÖz›kÅÂ/H,Z`Ê·Õ©¿ócžænÑs²"R'ÓÂgdDø´<z]Jk23ò…”ºWùß.û±YûâÛ¼¤Xqg¾>%¦jΤyï‡}ÿ›‹¸ûïEÊ‘F) ß@ÞDœðÑÍçÒ1§…8~[¢o aMº¿•ƒ¤ržñ­ö}]B_¯2ö>pWSÌLa?¦&Ø{ÅòÛ–÷«ÍªÝ¥rRìm‘ï@¿»¬þvYýùyŒò:Ë“,ߚϴƷå9Mì³üÅ÷¸¹æZöóžöØÚM,…›åIMlÎJ:Û÷V=ëVs[ÃÞ‘¶ÛïˆÛ³½çYçjkíÈøø5hPÖöY{·ÖîÇ€ö8õlšâe;œôþhoßßRy&ô™l Vç+dmx tU‘§ò?>‰ŸÑ>‘SÒÛý”3ŸÆÝë Ú±k}v Ø'ýø/v%wZ*á^Íx§Ì þT‡óeŸ+²©ÉGÞºkz¦8¼ƒÈªwü ös¾Ÿ-çSÞ^K5W£n·æXÌñžÖÓ®ùX©–mÿ™Á³Ä½BÆ“Ï…fòÎyyódã;h=}fƒZôÒ^¯ -l’IšÿòÆÝL¿ÝÔ)2¨Û 뛵”r ÐsšbÊ»hgUÔu‚7»e‰®£õðËΉÏ{éœi?‘ -?×Ó²sXz;oKï@H6ºò?@²AN /ÿó¥„÷—áðpö!sÝ<ïŠÚ¥æFÄê˼-«Áe›çû÷ ­»€¯¸ -Î0Çš6|˜ÿ>5v©÷½ÉòŒ2KÞŒ?äWñÅòrà2;ðOéè'˜O>nú’ß3WÈŸóîþ‹ RD.z‡E¾í'r=fá*RÇ©NTOöL|ÿ2*x‚œâAyyð]ø#ó–z~Ž1ø® JôZ#ôÜ+CCY24¼œ8UŒÉ8Æ;ªž8±—wÖÙhÀ¾Ó*e5ã"6?ÙìßöÕýhn茔q`¬|î]&{<’v@q>—¨ƒþh› -¦9…ÒÉbæ’…œ»ÁŸ‹¸rž±…2’1Ѧ¾þØda.›Gþ6›% 4NLàÆ«¶m¢ígóÆæy.o”© -÷´Ôé¹Ð~>rQªÍ9õ‘¿†’N¾9Ë[˯Ýg¬ýèÓô§¬ñ9Öx¥²g£“,ËÀ«³~`>}tìÝßg¼;ZºØü¡Úä£ø?ò×ÁуáBÞ-ØEø™É™mrÕB™Å/u·’w¼)¹Ú75^c_Ž¹d»3VKõ%Î;”yùka#™ -Í]¬Oi¡:) -ýYŠÂÜùðJ‹Mà0wû7ø’2ãCšÁ­ç"+@(‹x¯7¾§U„ñŠÈp|NɆèýR¢Pd1ä1ßãw@èI€Ì¡‡Ád°·Â6ã[D˜1Š(㢌‹2.:ÙÈ»·-˜=V%öÙ+%êGÛBx ë€èx0d‚‡@%û«4²$tïëÒêÅßw’̉õí¼íc¤‹E:JQT×þ¬ÛÀßY÷˜™¯Ís1:1ü{Œó‰á÷cøý>^ÑÞ¾£‡b?ÈûXö3~Ò¾[²A¯À](ÙîD–±Iyƒ_7÷™åäØÉùQ~8ÒxšãÎy¡Öµ½¯ÆögåA»ÑKìn<*ý%=Tº„žf°M!ýTƒô ÔE×2ÌVë·Qy_j×RúpûZ"Ïj\ ÛÙbŸ«î‘g ×;ä)Ü¡<€êo ~?®×áuïâÚÉoº'Ï?¹èj4Àg¬Àxöa{ 1½˜Þé:ŒG‘ªŸç÷43<<,Ñ.cŽ^‚T÷ÐÓŽpeà \°Ü'Á6LQbÑ@æ 7Iè-Ö#Uûuµ -´×fñZ²‡å#N×€Âø¥(Ž÷aÑDŠYÈàÙÎE’íèhŒA—Xyý -†K …zˆó["úÄ…ô…¯Ï.U6q±Œi=påq¦«ÉMþüÒ3†…<’a~#‚þp!}ôt×Ï ÍÕžªƒŒ=Üb Û{ãÜq¹gÄöö£#×i‡4žmBßJV]Mš¸þšãÍgà¤ò‘Ù$“ôþYj;n”©ù^Àq™¡Îéj½àzÙÁóÅL³¿“G\às—c¨'Cd\‘è›0R_ι¾š–ê¡(–jgQª½w gj4Ãk½Œå¯C[¡{1^YúN$ºÙþ&dëk°Œc]b3æ:D—ÇÙó™ÀØç‘ç!û{“èÙœcÉ]|ÏdÜN=“ô%ƒ%Ú9®³sªL1sµC\c/c.¯%ýxÍ´Ô²®X‡¦³õ†ÊrÌ÷èb9ï%3Ì82•±©¿¹Á\Oê|ö>Ïd'Ph\DA\#X6A¶%NÂ/ŸuÝ3Ë|£?ãÓo‘"Ϲr Å%pM¾!ÆAú•‹<æwÝÀïÍ‹dí´cH’ç5®Ëi7J]Ã/=œ»Æú(žô¼Êq‹`”V¯Î‘£ˆH=†L5¼ŒÍMz’¾ñ1ì£Nåÿ뛫nÓ­£-wpppppppppppppppppppppppppppppppøŸ"O!Äc>â !…ÿs€¸Ó i0d.z‹*•Óá±µ`ÏØZcM¿­uôD¥­ –yÔÖ.Ö„­Ý¼¿ÆÖq„ ¶Nåý7š4âñ–­ûôŽ­5´Á_m­£>±µTÑViÁgéJËž‰éJëÔ^±JiƒºPlSÚE'Î)í–e´JÇɺڽ¬' ƒOrkë•vS·ÑžVZŽX’V§t¼ºÿ’Ò‰r$µ]J'©2•NQ÷ßUºu‚ö‘Ò©êù—”n/ËèšÒd]=UéNJ÷Pº«lKï§tšºŸ/µGõS'uR‚º?9/×WîË·|Ïš¾‚oÎ ¯7Ï]SSe™cCÕ5µQ+lN -–åš2?ßgN CÑÅ5–9z‚iW)ð™3åÒPUm4 -FT…‰VÕB+(óÏ°*j«üáæëaf¬Éa&[+Èñæå *hÎþOa"¦ß [{c•›Ñ°¿Üªö‡ç›¡y×v¨¹Æ”@…?Z¶"|…êPÐl¾žV[}?_¨´Æ_VL‡jBaÙe•Ù”™ -†"Ìf3ö«ý°"Q³6h™lzA­e–¯® EV3µZí»5­@PRa±ÏVЊ˜³üa+¸Ä -”UZAV ·^÷ëlH¶SVÙ¯öGCfyàFm™ŸWaÙe-+\nVúƒåVU¤ÚâH-ô[¯¹2lZÑh¬ ‹­°l¸¶zex¾eÎÛxƒþñEjƒ~ÕCsÿÊý7 K¶rµK5bUo—DU•¯pPZÖ} kð‰o¡a”#€ Þ§šÆHF5£IfÀBj©ü-rd^ •’!»¤åýÀ»Å{ÊÛུ{é¶.{·^ó¤UËV®ÑFÃgŒáü-¸6gnþc¿))mQOk -ˆŸØÊcªŒDrŒ02®xш$$3†µeLkLjמ1¬#:¡3º +º¡;nCz0ŠšHGz!½‘…>è‹lôC @r1^ø;ãv A†"(Ä0a8F`$Fa4Æ`,Æa<îÀLÄ$LF1¦`*ߤ„±üNŽL)fâ.ÜYŒæŸÅ=˜{ÿçâ>|Žïy?Ê8;æqü*9zp—¨â95XÀш Ê‘]ˆEx‹±ŸÇR|_Ä2,ÇCøÆ#ø2¾Â}`ÃJ|«ð5¬f_ƒµø¾‰uxOàI¡3†oÄSÂ…oái<ƒoc3¾ƒïâ{ˆ8üÏâGø1êðlÁsø)~†çñ¶âçx¿ÀKø%~…—±Mx°¯àU¼†Ø)âEva7öàwxûË^ìÃï±ð¼‰?r—ùâãŽâÞæ^ógG=Nà]¼‡“8Åoó/8œÁY|Àýçoø;þñ>Æ?ñ/œÃy\À¿q‘ûÑ%\Æ4 -î["Q$‰dÑF´)¢HíEÑQtEÑUtÝÅm"Mô=…)ÒE†è%2Eo‘%úˆ¾"[ôýÅ‘#rÅ@ñ)ƒõ 0Ô€ôÿp³Íec-k¹ÖZ®eÛ¶m×rË^¶mÛ¶m­ó'~CfdAVdCvä@NäBnäA^üŽ|È(ˆB(Œ"(ŠbøÅñ'Jà/”D)”F”E9”GTÄߨ„ʨ‚ª¨†ê¨š¨…Ú¨ƒº¨‡úh€†h„Æh‚¦h†æh–h…Öhƒ¶h‡öè² Ñ Ñ]Ñ ÝÑ=Ñ ½Ñ}Ñý11ƒ1C1 Ã1#1 -£1c1ã1ÿ`"&a2¦`*¦a:fà_ÌÄ,ÌÆÌÅ<ÌÇ,Ä",Æ,ÅX†åX•X…ÕXƒµX‡õ؀؄ÍØ‚­Ø†íØØ…Ý؃½Ø‡ý8€ƒ8„Ã8‚£8†ã8“8…Ó8ƒ³8‡ó¸€‹¸„˸‚«¸†ë¸›¸…Û¸ƒ»¸‡ûx€‡x„Çx‚§x†çx—x…×xƒ·x‡÷ø€ø„Ïø‚¯ø†ïøÁ‚¤h ÅРð ÇðŒÀˆŒÄȌ¨ŒÆèŒÁ˜ŒÅ،øŒÇøLÀ„ü…‰˜˜I˜”ɘœ)˜’©˜ši˜–阞˜‘¿2cffaVfcvæ`Næbnæa^þÎ|ÌÏ,ÈB,Ì",ÊbüƒÅù'Kð/–d)–f–e9–gVä߬Äʬª¬Æê¬Áš¬Åڬú¬ÇúlÀ†lÄÆl¦lÆælÁ–lÅÖlölÇöìÀŽìÄÎì®ìÆîìÁžìÅÞìþìÇþÀÄÁ¡ÆáÁ‘ÅÑñÇñœÀ8‘“8™SBFsjÈdN ™Âé!Ó9#dþÏW-äLÎâlÎá\Îã|.àB.âb.áRþÇe\Î\ÉU\Í5\Ëu\Ï ÜÈMÜÌ-ÜÊmÜÎÜÉ]ÜÍ=ÜË}ÜÏ<ÈC<Ì#<Êc<Î<ÉS<Í3<Ës<Ï ¼ÈK¼Ì+¼Êk¼Î¼É[¼Í;¼Ë{¼Ï|ÈG|Ì'|Êg|Î|ÉW|Í7|Ëw|ÏüÈOüÌ/üÊoüÎ -DIV P -­0 -«p -¯Š¨HŠ¬(ŠªhŠ®Š©XŠ­8Š«xŠ¯J¨_”H‰•DI•LÉ•B)•J©•Fi•Né•Aõ«2é7eVeU6eWåT.åVåÕïʧü* ‚*¤Â*¢¢*¦?T\ª„þRI•Ri•QY•SyUPEý­Jª¬*ªªjª®ª©Zª­:ª«zª¯j¨Fj¬&jªfj®j©Vj­6j«vj¯ê¨Nê¬.êªnê®ê©^ê­>ê«~ꯨA¬!ªa®©Q­1«q¯ úG5I“5ES5MÓ5Cÿj¦fi¶æh®æi¾h¡i±–h©þÓ2-× -­Ô*­Ö­Õ:­×mÔ&mÖmÕ6m×íÔ.íÖíÕ>í×Ô!ÖÕ1× Ô)ÖÕ9×]Ô%]Ö]Õ5]× ÝÔ-ÝÖÝÕ=Ý×=Ô#=Ö=Õ3=× ½Ô+½Ö½Õ;½×}Ô'}Ö}Õ7}ׇ¦e;p(‡v‡u8‡wGt$GvGu4Gw Çt,ÇvÇu<Çw'ü¹DNì$NêdNîNéTNí4NëtNï Îè_éçT2;‹³:›³;‡s:—s;óþ¼K>çwt!vu±Ÿ£)î?]âçjJº”K»ŒËºœË»‚+úoWreWqUWsu×pM×rm×q]×s}7pC7rc7qS7ss·pK·rk·q[·s{wpGwrgwqWwsw÷pO÷ro÷q_÷sð@ò`ñPópðHòhñXóxOð?žèIžì)žêižîþ×3=˳=Çs=Ïó½À ½È‹½ÄKýŸ—y¹Wx¥Wyµ×x­×y½7x£7y³·x«·y»wx§wy·÷x¯÷y¿ø ù°ø¨ù¸Oø¤Où´Ïø¬Ïù¼/ø¢/ù²¯øª¯ùºoø¦où¶ïø®ïù¾ø¡ù±Ÿø©Ÿù¹_ø¥_ùµßø­ßù½?ø£?ù³¿ø«¿ù»! -A¨ t&„ ‚ˆA¤ r%ˆD ¢1‚˜A¬ v'ˆÄ â ‚„Á/A¢ q$H$ ’)‚”Aª u&H¤ Ò‚ŒÿSMÝMÖm¡w÷ÐRAdŠà@Ù{ï¥J ¥e¯4MÛ@š”4a9ظe¹T”½Aq(CP¶²Ü d)>š¤´ß?¿»ç7îžñ¾hˆFhŒ&hŠfhŽh‰Vh6h‹vhèˆNˆCgtAWģЉèžHB/$#½Ñ©è‹4¤£úcbc†b†cÈ€™p! ÙÈ#1 -ä ò0~ä#€ Æ`,Æa<&à<ˆ‡ð0&b&c -¦b¦cÁ£x ã <‰§ð4žÁL̳˜9xÏc.æa>`!^À‹x /㼊×ð:a1–à ¼‰·°oã,Ãr¬ÀJ¬Âj¬ÁZ¬ÃzlÀFlÂflÁ»x[ñ>>À‡øc¶ãìÀ§ø ;± »±Ÿc/öá |‰ý8€ƒ8„Ã8‚£ø -_ãŽãNâ¾Á·øßãüˆŸð3~Á¯ø §q¿ã,Îá<.à"þÀŸ¸„Ëø Wpãü‹ÿp%xK²£’¢±4£Ã2ŒåÍ,Ër¼…åy++°"+±2ocVåí¼ƒÕx'«³ïâݼ‡÷²&ïãý¬Åڬú¬ÇúlÀ†lÄÆl¦lÆælÁ–lÅÖlölÇöìÀŽìÄ8vfve<»1Ý™ÈìÉ$öb2SØ›}˜Ê¾Lc:û±?p q0‡p(‡q8GÐÁ :™I³˜Íº9’£èa.½ô1£ég> r ÇrÇsàƒ|ˆs"'q2§p*§q:gð>ÊÇø8Ÿà“|ŠOóÎä,>ËÙœÃçø<çrçsò¾È—ø2_á«|¯ss ßà›|‹Kù6ßá2.ç -®ä*®æ®å:®çnä&næ¾Ë÷¸•ïó~Èø1·q;?á~Êϸ“»¸›{ø9÷r¿à—ÜÏ<ÈC<Ì#<ʯø5ñ8Oð$Oñ~Ëïø=àü‰?óþÊßxšgø;ÏòÏó/òþÉK¼Ì¿x…Wù7ÿá¿ü×TB7©¤J)J%™J+Z1*£Xݬ²*§[T^·ª‚*ª’*ë6UQUÝ®;TMwªºjè.Ý­{t¯jê>ݯZª­:ª«zª¯j¨Fj¬&jªfj®j©Vj­6j«vj¯ê¨NŠSguQWÅ«›Ô]‰ê¡žJR/%+E½ÕG©ê«4¥«Ÿúk€jkˆ†j˜†k„ÊS™r)KÙÊ‘[#5JåÊ+Ÿò4Z~å+  Æh¬Æi¼&è=¨‡ô°&j’&kŠ¦jš¦k†Ñ£zLë =©§ô´žÑLÍÒ³š­9zNÏk®æi¾h¡^ЋzI/뽪×ôºi±–è ½©·´Toë-Ór­ÐJ­Òj­ÑZ­ÓzmÐFmÒfmÑ»zO[õ¾>ЇúHk›¶ëíЧúL;µK»µGŸk¯öé }©ý: ƒ:¤Ã:¢£úJ_똎ë„NꔾѷúNßëý¨Ÿô³~ѯúM§uF¿ë¬Îé¼.è¢þПº¤ËúKWtUëý«ÿtÍJØMVÒJY”Áh2³Òm1VÆbíf+kåì+o·Z«h•¬²ÝfU¬ªÝnwX5»Óª[ »Ëî¶{ì^«i÷ÙýVËj[«kõ¬¾5°†ÖÈ[kjͬ¹µ°–ÖÊZ[kkí¬½u°ŽÖÉ⬳u±®oÝ,Áº[¢õ°ž–d½,ÙR¬w‰m%¶[Kµ¾–féÖÏúÛhƒl° ±¡6̆ÛsX†9-Ó\–eÙ–SÆçÉîõ\£ƒOÙ‚ ÏḞLwVVlAœÌÍuÜ>oèªÛpeûž˜‚ÀïÈt;#Ïyy~߸LT|Ðï+?:x]5ßíÍöd8ò] ®ß)ÚÊ̸±¡¸\‡ÓïóÊFÆeø]c\t„@q¾lŸ×5JŽ0ÆtqºýÎ`n–Ç5.ÆYÄ£»dú§Óå D;oPvu: -$3C øˆ“+âvr… :¾HÁuƒ*>âï -#ãÊ®Ä$Ë&»X6 EZÙ7¨%8]™nÇaÙÂl‡3pÅt/&“SÄ£ºg8üQ9×&ÜžLÝ!Pb¤w#IºÃX2±GI÷ȘÅTGqëY˜Æ¨Â4’BiÐK*<÷Ü8í AtRQqž¢V'‡5¼aäB o¡FrXÃnœ×‘çËø}y9.¥DªðEÆ’‹/±)9Ao¶ÃÌõ8‚X_ñˆ©aOØ3µÐÓ_è™öô‡¡oøv~¸ç}‹u'¿XwÒ -U…*iáçD¥Ì$P0“ôðL‚ᙤGªFªHW Òý× ÖØôÿ«(XZâÆ¿þ‚@©y>€$~$Špë^¯q«„wO;µEØ» ¸ÍF)\åÎUJGéÀuâ³ÕCG9ЧI¥Yq «W/Mjáz83(~”ð2B¸-Ù9p#Ѳ³gvCΡ¹´Wˆ4‰ª"ÙB<ñÇ@/cœ×¿+h_iþ-õéßÆ3Ò†ç,Šd‘õ~ó—8¼…Ýt[_‡v߈ -êIï´¾'‚ ‚Á„"Þ:ôoDÒ Isr¢Ÿýœèh\“oNôs¢¿$ú+j'ú—ý¥CÿÌ¡¿pè/jôÇMúŸ]ú‹&ýü/ú -*!.h Bÿì‘BZî^ ©½oÔ""®~SÏg„þ•3Aêàkg„=Ç<¦MîÝÄ]¯tÿÒ±tp´u<¹vÂÁ´v\‚ª¦öÆÎëEŽòú,æÕZ&&´,š–·*1êäÅÄ“."*Yí iy²ˆe)ØS&»¡¶£ÏG[ÞÉd' 2Úÿ@‡—ìÁ òkÎ’,ªäôÊÉOÅFjª´¡¶J²ª°šyÚâ¡-aÖГuÌ*µxЙªhV{C¥;¨mµ½ZÇ>ªÆZ-Ð…ÖªSª•Ã=ùÎZrµ•d}§­õÊÙÞÈÑP9²ë‘sB³Sn¼¥€T)»†-+ÖbųDÕ8°½Žàâ¹L–¬™P¿Ê’ý£Ÿÿ]…=Ö`  ®ø£—yðhÊ¡Ž­›R·22×2XɨS¾Ðj'7j×ì»\Ö˾úÚÔMà-’ŸLö -i—Æa™s˜Qnˆ¬ªí'3ßÆÈg-ýE*J^”býÖÁÖ¹k³›×^¬˜åɺìiBœÈà:c6‡„Æ2?âii®H«Hû^;åF´K-_…E¼;•5|·’ß`º.X¹u2ƒË¶ŒàùÁҞ°^kRp¥}¥2¸'"eù{H¡+–Vô-žW"Õ—çµXȽ•ÜÙ–¼%ï¯ód…YVnêáþÑABSÛÇ"ž÷ TTÞÛ_¾”Ï!(¹ ùã·§ÌÒf]IkW?ŒÀÙÀš×I -G}Ó‚Â!²(ÐÂ6ú*˜8M¹ åøu#çl 'L»Ó-‡ÇÞê^ûûF´yV¬ÙŒÃŸ§–ÚþÁHÛÿ“‘ÇF~¶žDe¬†½A¨¯ÌMF—|–BåOHœËB¥f©Ïf=û#n|à$M`ÄO286¹x`ðbT½?uìí7†±‘_;ÐI^ÚUûÔœwnO¸:¨B~õõÿxläÁ;™7c–Îep˜û¬Qn­zȧ##?ùÑÈOFן>ùÅÈ‘‘'F~5rldhä©ÉPÇïÍE#iöÖ)Õ„a$6pzfKLÉPðu¨¶Â1¼Ö{áX ‡uˆW"’•ÍâaV­ä½•u÷Œç¹²2¸EÿU,ýß*íÊ߬ì!K£d>7¦aQÉÒ ÿÆ0{ ·ÚŽ rÉm·.Øz‹?®WOþÏ@j‡ûìÍYœó,æIÙ‚ò”d œ<±bYçn#ðî ‹¶uOE•”<™~·ÉÝï®q¦a(ÙѯthZý0Åžþ݆§Æ“:€zCAŽ <íë©´¡•ÚC›ch… ­ Ð8…–ah¥ ‡;¡•ÍÐŽMhÇ&´ã°_Æ¢*äCDõß«ÇA{¼Õ2ÒrçêÛÎÕãNú¸sýmçúq'{lTC‹iq¡E¢ÅD ¡ÅT‹J‰ÁÔ>Xô“aPÕõÛÕ(¨ê*¶*gÔªUlUO)jUê`Ô˜™Õuo5Â@†°3 - `\ƒÖ™^ÏB‹K-–š¯‰XÀ/ÛB˾ÑõȾpµÖ£¦v|¿3ÞîDÛÖ™ZbëZEÛÊ”ðF2©!lB-W²7Ño­GéŽìë´Ë, -Fø˜“u+`5µâŽ#Âú^q#qQ‘ÔGLp„À“úQqƒ#rqS‘×GLqD…#¦õUMmë­ŒõVÊlxxøÉÈc#?ùÅÈ‘‘'F~5rldh¤Næ‡GûFyh¤.&‡a8\³TÌâ%ýŽðE¯€†'pDÙL&Bïa÷Äþt,òNðñï= ìñü3uLú3WóÆä;"ßcô¡ï1ùŽvÆÆ['2`8nüe £†¡g®™Ú§wÓ¢7w”aØôÊ?¤ßŸî‡&0µñ}îjÞ)­~Ž°}¦'n/LŠ8§^1qtŽňÎmž›AsËPl€N?]~ìà g á࢞“šÚºÔb©“À%ƲĻ¤["ì^aÏÔ¢ÚLÞLëºwEžè?sxÕÜ›´ah}×1®ô™ûN|®ˆÏïÏ -#¿¦žõ¼Æžõ¤È2ŠìºYÖ<5ųŠË„m·L¢¦ö&î¡®2qO°p”Ö-Öšƒ´²5Á‚9­÷×›ãNÝ4v*oìÔ ñ‘¼%ÿù¿Eÿú¿UabŸAÑÐoUætÚëúôI¦â/“wG°¤xî0ž÷÷ŽQÒþÞ5÷·lè Õª¦úSçÆU„‡Ó¦ßªyn¦Î¹©¦š;Í ªë­ŸªoëI‰îO\é“E­_úQ°Ñâ—>5}»a~ÙXäý"‰Ùî/ô¼Aÿ¥ž¨ç¿èóúüM=Ÿú÷D‚¿%ܽǹ¶8×=í×–`L駴“índ¥Û}–ß Há"Ql#ôÌÐó(bÉàçÈc‡#ŠG Ö48=µnexçô@ÇïØ F×—ÚH×—2¼uzØÈß²¿mþHå}Ž˜ƒµ]Åeìæe«0F2`uÝŒS1˜q -Ún§ XM…‡ EhóBâ™ü·t•mi¯nUÖ$ó¦!l²Î›¬‡/±Î_b=l²Î›¬‡/°Îÿ¶y´¶!Ä„8Ã%ÇYbî˜nE¬û¦KXª1-‡Ù–Ÿ~‹ªs¡H2©ü¿¬IQU¿ÊÅ¡ÊêPå¢WeÕõNžù«xÏÏmÍû¶æçƒüþÐ+ϼWöx6¿ÿ;ßnc1vÓÇvÕ›X±#„:ŸÃò#ˆªÁ×¼«o›˜µxs´¸zðFhݨç^ÛÍë¹DÃÈÇ°¯ø‘ôý[ZÃ0çö]ŒÝ|CïBècÈ×ç@ëûסP1"OB$Fø -ú.¬×ìè-·p‚f5ŒÜ/6ÕvåUšDUÙF«±è­;²jK1v÷çèn?<·IûŸœG‡ë“ßùsró'ûóNrfêÙK+Mìd·‰>8qM~‰Ò4:ó⤌Öy¿ú»‚ÐýúÃ7z÷ا#¾nèÕ‡nß“_£Ý.:ù-J_VÑÑïÕÑÕÑÈéSJêµ;úLŽÿÜd“/„±Ž¿FÕé‚KÞc—þ>äì)ל4«%ÛO*Œm¿"VâK]âº.q²ªKÕ' Úœ+¶=ógTÁ³ªxfç³íšŸîا»\eÕKRwÞ›vÓm˜ÍCÑ&ø&ø&ø&ø&ø&ø&ø&ø&ø&ø&çK2וT V†U`Õó,Y}ç×sä49 -4Î’ðKf£áüDwúÎÚ–, KóKþœ’<ÏòÓFß)³}žÀz°+n'A½w\¼$z!Q²¤¯¾·é¿›d6WWq±)þ[Eeý†Î‹xõý\K¢’lO ßInèf–ÄEñwkÙëu’•e””Å£Ÿ„H£7Í_I±aYíUsït],s²cs•¾±Q+ÁÊ° -¬ -«Áê°¬ kÁÚ°¬ ‹/·9¾ôæø¢“À—À—À—À—À—À—À“À“À“À“À“À“¡/C_†¾ }ú2ôeÌOÆüdðdðdðdðdð䆇ùɘŸ¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾¾ -¾ -¾ -¾ -¾ -¾ -¾ -ž -ž -ž -ž -ž -ž} úô5èkÐ× ¯a~槣A_ktQ¿}ú:ôuèëÐס¯C_‡¾Žùèà蘞ŽùèàêX?|||||||||||||||<<<<<<<<<<<<<³áa¾&ækooooooooooooooooƒoƒoƒoƒoƒoƒoƒoƒoƒoƒoƒoƒoƒoƒoƒoƒï€ï€ï€ï€ï€ï€ë€ë€ë€ë€ë€ë€ëBÏ…ž =z.ô\è¹Ðs¡çBÏ…ž‡z=ÔëA߃¾]ºt=èzÐõ ëCχž=z>êõ±þ>ô}èûÐ÷¡ïCßoôQwݺtèÐ  @/€^½À=‹’Ý&b'ŒY¼+=Ä1秸äÑ)Ép5ËRR¹SuŸei¼æƒÎ샞ßÕó½°Õ{êê-ºzO­ÞuoND,rr/x‘ǯÔÝ.ã4ÊßΗQÓï‚ÞÎJB$ÚÆå,IÉj•Äì¤÷!¡ŸwI”¾¬"¾ýÓv¼bK’FumG9‰>vÙuÔµûa€¥Ý £Ã\ -&Ñý0 ä²hËë`S6èòàn3ÜÝÀg9·ƒà ‘±îþ0ñPPýçtêòà×·îŠ~ÐíKò6Lã…|Ή¼Ð?Ll e…î¢u뛭׫òÃø·}—éÜôcý,¿í»ƒ¬¶¾<Óµ¼î…êAÿêEzµöóY1bˆé>ˆqQö(†FÚ94–ùª©‡|êzè%³¢„Ó¼ÂB:«èAˆˆéméWö°ãíAÇÛÃŽx×£Ã\ÞñÀ{h0{Ðñv¿ãíAÇÛcot¼=èx{¬ãí‘Žö;>ü‡ŽŽu|8Òñá ãñŽG:>ìw|Øëøp¼ãÃ~LJ#Šö;>éøPìø…Øñ½ëø^¤ßñ ¡ÅïW1.*ðŽC# -‡Ž_ß°Žïú¿6òƒá-+„…tÞñBDLoK¯?d‰sei.÷¹åÇUêk°ðçlü\áÇ»¹l{VÙv= H-÷9I²œ½v>ŒŸB©md ÈÍa¥“úƒ%{…«Ÿ?Ge#q¾?\_ûtë ¯$^µ‘x9ÿ\özw¸¾~®Š„”e·‘ý0ò©3Tý´ÿ§;¬f—4©•`eXV…Õ`un ø|~ð¤Ö„µ`mXÖ½û¶‰Wq±Œ·«8oŠ¹{ Þ~‰½Ä~ÄØÛHÌߊ±x$æ#ãFb_Gj)ÿÏwÕü4’\ñnðâæs€aHÖÓ¬,âjw·a´Ã(R†ÉfH„DÛ4v¦›mÛ0&—9$‡Õ(R’•²+mö’•fÈDMœióqÊ%—ÜrK”Dù36¯»ml0ÛRÕ¯Þ{Uｪ~Uõª o¥/…˼‘T»•Éµaö­ -ç[j"†¾O9±næ ç±W¹Èñ‚ZöŸ„ñq²{@·™Ó‹~F݈žÜU’±5ý -Áî‚~ÍÊÎ)£™ºÑðºuÌJ{þКžÕK…]³±"C»9îjêÙÝ‚{rXÍ«y‰i^÷ËÒÜWIûïåÒù¬ÊÍÔ€fl{·A­$r4±‚^ÜqL+Ú°ó…P•ªÚÌY3ßèWm!G}éÅ݃}û ö‘Oi ö‘i úYúzËôsE›ê^ç·{r FÙ=K‘‚¥úð¤+êeÓºA'îä -Árg úu¹½ì@éý -ýö€¼V2tÚ‘Å€FZ‡(—½rî!ºì -»BAQ®${µ£Bà|'µ{&šÚ¡mªP¾g[‚FGÕ Qž÷±i«—ð5-‰v#îmz>öœ?ÜzΟFÝGHK:ßל {ÿAUƒ‡tn¥=Ònåwô±ÅAZßÜîE‚T -"PA*ˆ ƒ#_ÂO(ãÀ`òlÑÎívUXš!ÉŒÆ}#ÑEЋ-c@_i4‰Ó0) 9§rd˜Ží3P„‚ŽÙd,T4Ì8p¡Û;ÎKfÞz8]jç¡íÉq) -d>FAGZÆ€2PªÀ80 Ô€ô²@ïp˜&)ô‡}û öì3Øg°Ï —AoðTÂÑÂd<¥ü½ÂÒ©(e Tqàp˜IµI¼¶Û0½Ý'Ç€ÐÀ ‘tÂGÿî!„G2<’á‘ dŒ—1^Æ')`ˆ™Ë¬€‚P$ ì+°¯À¾û -ì+°¯À¾û -ì+°«À®» |> øÐÏ ŸÁ/¿übðK…\…\…\ äð[…^zUø­Âß(è(ôE1Ÿ(ü‹£ŸŠy©XWóPƒ~‡?qøW†Þ¯Øe£h씃³vØãÐ]à2õ¢{‹¿é±Jtj)Ã7æ÷LDZëAÇ&ÞØ%uŒ_Ö -IxÅ©X¦>âîYŠÍ—öéht¯­¬ýhØs3™™÷rÁ(ëƒn¤j±Ì|V/”)w7ßtÆRÚü=£\q¬ÛëÕ½¬]Ž ÇžÒʹ¦\¤lÈÅî2]+Gر+Žß0ü>%ó‘קDÞ[^Ëp_^'ËôEÈ^&“`ón¦zhn—éíç樻fÕ°wßò¥òE©e Cã…esר”ëÜú\[¥²DE¡27—ãóŸq?§ò)•NÎäŸpU*Pù•P£õ”Êø'§!aùs¾Ê}¿³Üc=½âßë|×ËOÄŒýû5?ÎõsÿâÇOû¹îDÿ)ÿkn›ùßpSü·ÂÍðÍÅ-=åö©<¦ÒéÕ<ÿôô¦$~Á“› -ñ4æw3Ä¿ÿÇn‹ÿeõþTüËt=Dðç›D-_ÿùDüc$/~AåÄ=›­»cžFŠâ‡7ëüG§â/#už¿ð¡¡¡¯Ä½Ùcq›yò»ÇõŽ“Sq‘äï-÷ŠêÂÛ¢ùø­éºÀ};rW|‡ýMüFÄë6AJ§–‡Ä·"Šï’èfD›~—Êkþÿ1÷ÿñéÔñsjÒtÏVgŽëüÏVfØT?ZVWfŽgW¦§fïŠS³™éij¿÷×ðOÂ? -'ÂRx.<¾~;üõðˆ0, -BŸÐ#B¸ÎÿötIìzÍŸpK´,'gB—ðFÿ1C¯ùçóùï…Ð!pÂHý˾ä8ž©ó'/Ý5^uy­®:ÿüÌg=_Cn+ä ;Üš*ª¹^èàîp5þgõ.KcKÃßZ̤¯ª¶Z깫¿1>R;^[P{Ù¨InãËÈFCøý¯\¡ÊHÎÍ­Ý«žì?ÜÑŒImkR3¨lÕžÆj³/‰Zç­­l®à¢nÔö'tíádzâÅÁNñŽ+>˜L¿àv´û^ì,éÓƒåmROoœe“Îf‹­¶œdeIW™ãÚÊn¶oºâ¬kkÓµµéÚÊ.g=[î<5s=Y*StNhæÚDmf½¶ú½>¨Mèé:ÿ1Ó•ÿ^ZîÆ endstream endobj 753 0 obj [/ICCBased 754 0 R] endobj 754 0 obj <>stream -H‰œ–yTSwÇoÉž•°Ãc [€°5la‘QIBHØADED„ª•2ÖmtFOE.®c­Ö}êÒõ0êè8´׎8GNg¦Óïï÷9÷wïïÝß½÷ó '¥ªµÕ0 Ö ÏJŒÅb¤  - 2y­.-;!à’ÆK°ZÜ ü‹ž^i½"LÊÀ0ðÿ‰-×é @8(”µrœ;q®ª7èLöœy¥•&†Qëñq¶4±jž½ç|æ9ÚÄ -V³)gB£0ñiœWו8#©8wÕ©•õ8_Å٥ʨQãüÜ«QÊj@é&»A)/ÇÙgº>'K‚óÈtÕ;\ú” Ó¥$ÕºF½ZUnÀÜå˜(4TŒ%)ë«”ƒ0C&¯”阤Z£“i˜¿óœ8¦Úbx‘ƒE¡ÁÁBÑ;…ú¯›¿P¦ÞÎӓ̹žAü om?çW= -€x¯Íú·¶Ò-Œ¯Àòæ[›Ëû0ñ¾¾øÎ}ø¦y)7ta¾¾õõõ>j¥ÜÇTÐ7úŸ¿@ï¼ÏÇtÜ›ò`qÊ2™±Ê€™ê&¯®ª6ê±ZL®Ä„?â_øóyxg)Ë”z¥ÈçL­UáíÖ*ÔuµSkÿSeØO4?׸¸c¯¯Ø°.òò· åÒR´ ßÞô-•’2ð5ßáÞüÜÏ ú÷Sá>Ó£V­š‹“då`r£¾n~ÏôY &à+`œ;ÂA4ˆÉ 䀰ÈA9Ð=¨- t°lÃ`;»Á~pŒƒÁ ðGp| ®[`Lƒ‡`<¯ "A ˆ YA+äùCb(Š‡R¡,¨*T2B-Ð -¨ꇆ¡Ðnè÷ÐQètº}MA ï —0Óal»Á¾°ŽSàx ¬‚kà&¸^Á£ð>ø0|>_ƒ'á‡ð,ÂG!"F$H:Rˆ”!z¤éF‘Qd?r 9‹\A&‘GÈ ”ˆrQ ¢áhš‹ÊÑ´íE‡Ñ]èaô4zBgÐ×Á–àE#H ‹*B=¡‹0HØIøˆp†p0MxJ$ùD1„˜D, V›‰½Ä­ÄÄãÄKÄ»ÄY‰dEò"EÒI2’ÔEÚBÚGúŒt™4MzN¦‘Èþär!YKî ’÷?%_&ß#¿¢°(®”0J:EAi¤ôQÆ(Ç()Ó”WT6U@ æP+¨íÔ!ê~êêmêæD ¥eÒÔ´å´!ÚïhŸÓ¦h/èº']B/¢éëèÒÓ¿¢?a0nŒhF!ÃÀXÇØÍ8ÅøšñÜŒkæc&5S˜µ™˜6»lö˜Iaº2c˜K™MÌAæ!æEæ#…åÆ’°d¬VÖë(ëk–Íe‹Øél »—½‡}Ž}ŸCâ¸qâ9 -N'çÎ)Î].ÂuæJ¸rî -î÷ wšGä xR^¯‡÷[ÞoÆœchžgÞ`>bþ‰ù$á»ñ¥ü*~ÿ ÿ:ÿ¥…EŒ…ÒbÅ~‹ËÏ,m,£-•–Ý–,¯Y¾´Â¬â­*­6X[ݱF­=­3­ë­·YŸ±~dó ·‘ÛtÛ´¹i ÛzÚfÙ6Û~`{ÁvÖÎÞ.ÑNg·Åî”Ý#{¾}´}…ý€ý§ö¸‘j‡‡ÏþŠ™c1X6„Æfm“Ž;'_9 œr:œ8Ýq¦:‹ËœœO:ϸ8¸¤¹´¸ìu¹éJq»–»nv=ëúÌMà–ï¶ÊmÜí¾ÀR 4 ö -n»3Ü£ÜkÜGݯz=Ä•[=¾ô„=ƒ<Ë=GTB(É/ÙSòƒ,]6*›-•–¾W:#—È7Ë*¢ŠÊe¿ò^YDYÙ}U„j£êAyTù`ù#µD=¬þ¶"©b{ųÊôÊ+¬Ê¯: !kJ4Gµm¥ötµ}uCõ%—®K7YV³©fFŸ¢ßY Õ.©=bàá?SŒîÆ•Æ©ºÈº‘ºçõyõ‡Ø Ú† žkï5%4ý¦m–7Ÿlqlio™Z³lG+ÔZÚz²Í¹­³mzyâò]íÔöÊö?uøuôw|¿"űN»ÎåwW&®ÜÛe֥ﺱ*|ÕöÕèjõê‰5k¶¬yÝ­èþ¢Ç¯g°ç‡^yïkEk‡Öþ¸®lÝD_p߶õÄõÚõ×7DmØÕÏîoê¿»1mãál {àûMśΠnßLÝlÜ<9”úO¤[þ˜¸™$™™üšhšÕ›B›¯œœ‰œ÷dÒž@ž®ŸŸ‹Ÿú i Ø¡G¡¶¢&¢–££v£æ¤V¤Ç¥8¥©¦¦‹¦ý§n§à¨R¨Ä©7©©ªª««u«é¬\¬Ð­D­¸®-®¡¯¯‹°°u°ê±`±Ö²K²Â³8³®´%´œµµŠ¶¶y¶ð·h·à¸Y¸Ñ¹J¹Âº;ºµ».»§¼!¼›½½¾ -¾„¾ÿ¿z¿õÀpÀìÁgÁãÂ_ÂÛÃXÃÔÄQÄÎÅKÅÈÆFÆÃÇAÇ¿È=ȼÉ:ɹÊ8Ê·Ë6˶Ì5̵Í5͵Î6ζÏ7ϸÐ9кÑ<ѾÒ?ÒÁÓDÓÆÔIÔËÕNÕÑÖUÖØ×\×àØdØèÙlÙñÚvÚûÛ€ÜÜŠÝÝ–ÞÞ¢ß)߯à6à½áDáÌâSâÛãcãëäsäüå„æ æ–çç©è2è¼éFéÐê[êåëpëûì†ííœî(î´ï@ïÌðXðåñrñÿòŒóó§ô4ôÂõPõÞömöû÷Šøø¨ù8ùÇúWúçûwüü˜ý)ýºþKþÜÿmÿÿ ÷„óû endstream endobj 767 0 obj <> endobj 789 0 obj <> endobj 765 0 obj [/ICCBased 754 0 R] endobj 790 0 obj <> endobj 791 0 obj <> endobj 768 0 obj <> endobj 769 0 obj <> endobj 763 0 obj <>/ColorSpace<>/ProcSet[/PDF/ImageC/ImageI]/ExtGState<>>>/BBox[7019.5 7438.5 7386.5 6963.5]>>stream -q -/GS0 gs -367 0 0 475 7019.5 6963.5 cm -/Im0 Do -Q - endstream endobj 788 0 obj <>/ColorSpace<>/ProcSet[/PDF/ImageC/ImageI]/ExtGState<>>>/BBox[7200.5 7459.5 7400.5 7240.5]>>stream -q -/GS0 gs -200 0 0 219 7200.5 7240.5 cm -/Im0 Do -Q - endstream endobj 808 0 obj <>/ColorSpace<>/ExtGState<>>>/BBox[6993.56 7475.74 7394.86 6932.33]>>stream -q -7057.596 7099.508 273.096 209.19 re -W n -0 g -1 i -/GS0 gs -q 1 0 0 1 7215.085 7252.1313 cm -0 0 m -0 30.937 -24.805 55.74 -55.738 55.74 c --86.672 55.74 -111.477 30.937 -111.477 0 c --111.477 -30.931 -86.672 -55.735 -55.738 -55.735 c --24.805 -55.735 0 -30.931 0 0 c -f -Q -0 G -2.152 w 10 M 0 j 0 J []0 d -q 1 0 0 1 7215.085 7252.1313 cm -0 0 m -0 30.937 -24.805 55.74 -55.738 55.74 c --86.672 55.74 -111.477 30.937 -111.477 0 c --111.477 -30.931 -86.672 -55.735 -55.738 -55.735 c --24.805 -55.735 0 -30.931 0 0 c -h -S -Q -q 1 0 0 1 7330.0449 7252.1313 cm -0 0 m -0 17.401 -13.952 31.354 -31.354 31.354 c --48.753 31.354 -62.705 17.401 -62.705 0 c --62.705 -17.399 -48.753 -31.351 -31.354 -31.351 c --13.952 -31.351 0 -17.399 0 0 c -f -Q -q 1 0 0 1 7330.0449 7252.1313 cm -0 0 m -0 17.401 -13.952 31.354 -31.354 31.354 c --48.753 31.354 -62.705 17.401 -62.705 0 c --62.705 -17.399 -48.753 -31.351 -31.354 -31.351 c --13.952 -31.351 0 -17.399 0 0 c -h -S -Q -Q -q -7211.721 7233.068 m -7216.488 7246.162 7229.019 7249.389 7242.954 7249.389 c -7242.954 7249.389 l -7242.954 7254.877 l -7229.019 7254.877 7216.488 7258.102 7211.721 7271.198 c -7211.721 7271.198 l -7216.299 7258.628 7216.299 7245.64 7211.721 7233.068 c -7251.665 7254.877 m -7242.954 7254.877 l -7242.954 7249.389 l -7251.665 7249.389 l -7259.5 7249.389 7266.549 7248.776 7269.226 7241.408 c -7269.226 7241.408 l -7266.657 7248.482 7266.657 7255.784 7269.226 7262.86 c -7269.226 7262.86 l -7266.549 7255.492 7259.5 7254.877 7251.665 7254.877 c -W n -q -0 g -1 i -/GS1 gs -1.7462616 0 0 0.7655792 7167.9610901 7213.7898407 cm -BX /Sh0 sh EX Q -Q -q -7057.596 7099.508 273.096 209.19 re -W n -0 g -1 i -/GS0 gs -q 1 0 0 1 7260.373 7131.4561 cm -0 0 m -0 17.4 -13.953 31.353 -31.354 31.353 c --48.753 31.353 -62.707 17.4 -62.707 0 c --62.707 -17.399 -48.753 -31.353 -31.354 -31.353 c --13.953 -31.353 0 -17.399 0 0 c -f -Q -0 G -2.152 w 10 M 0 j 0 J []0 d -q 1 0 0 1 7260.373 7131.4561 cm -0 0 m -0 17.4 -13.953 31.353 -31.354 31.353 c --48.753 31.353 -62.707 17.4 -62.707 0 c --62.707 -17.399 -48.753 -31.353 -31.354 -31.353 c --13.953 -31.353 0 -17.399 0 0 c -h -S -Q -Q -q -7169.1 7197.119 m -7182.827 7199.518 7191.867 7190.263 7198.814 7178.181 c -7198.814 7178.181 l -7203 7170.9 l -7206.906 7164.11 7209.889 7157.692 7204.84 7151.697 c -7204.84 7151.697 l -7209.685 7157.452 7216.016 7161.093 7223.43 7162.387 c -7223.43 7162.387 l -7215.709 7161.039 7211.666 7166.84 7207.757 7173.636 c -7207.757 7173.636 l -7203.571 7180.917 l -7196.628 7192.995 7193.175 7205.466 7202.151 7216.126 c -7202.151 7216.126 l -7193.534 7205.896 7182.277 7199.418 7169.1 7197.119 c -W n -q -0 g -1 i -/GS1 gs -0.6034698 -1.4769897 1.0452271 0.8527527 7116.6908875 7204.9374695 cm -BX /Sh1 sh EX Q -Q -q -7057.596 7099.508 273.096 209.19 re -W n -0 g -1 i -/GS0 gs -q 1 0 0 1 7121.0269 7131.4561 cm -0 0 m -0 17.4 -13.953 31.353 -31.353 31.353 c --48.754 31.353 -62.706 17.4 -62.706 0 c --62.706 -17.399 -48.754 -31.353 -31.353 -31.353 c --13.953 -31.353 0 -17.399 0 0 c -f -Q -0 G -2.152 w 10 M 0 j 0 J []0 d -q 1 0 0 1 7121.0269 7131.4561 cm -0 0 m -0 17.4 -13.953 31.353 -31.353 31.353 c --48.754 31.353 -62.706 17.4 -62.706 0 c --62.706 -17.399 -48.754 -31.353 -31.353 -31.353 c --13.953 -31.353 0 -17.399 0 0 c -h -S -Q -Q -q -7115.121 7180.917 m -7110.935 7173.636 l -7107.027 7166.84 7102.98 7161.039 7095.26 7162.387 c -7095.26 7162.387 l -7102.672 7161.093 7109.005 7157.452 7113.854 7151.697 c -7113.854 7151.697 l -7108.802 7157.692 7111.784 7164.11 7115.692 7170.9 c -7115.692 7170.9 l -7119.876 7178.181 l -7126.821 7190.263 7135.865 7199.518 7149.59 7197.119 c -7149.59 7197.119 l -7136.411 7199.418 7125.155 7205.896 7116.539 7216.126 c -7116.539 7216.126 l -7125.515 7205.466 7122.066 7192.995 7115.121 7180.917 c -W n -q -0 g -1 i -/GS1 gs --0.6034698 -1.4769897 1.0452271 -0.8527527 7097.6098328 7290.2126923 cm -BX /Sh2 sh EX Q -Q - endstream endobj 798 0 obj <> endobj 801 0 obj <> endobj 802 0 obj <> endobj 805 0 obj <> endobj 807 0 obj <> endobj 803 0 obj <>stream -H‰b`Ú ÀÀ endstream endobj 774 0 obj <> endobj 786 0 obj <> endobj 783 0 obj <> endobj 782 0 obj <>/ProcSet[/PDF/ImageB]/ExtGState<>>>/BBox[7200.5 7459.5 7400.5 7240.5]>>stream -q -/GS0 gs -200 0 0 219 7200.5 7240.5 cm -/Im0 Do -Q - endstream endobj 784 0 obj [0.0 0.0 0.0] endobj 781 0 obj <> endobj 749 0 obj <> endobj 780 0 obj <>/Height 219/Type/XObject>>stream -H‰ì׿«,Kð®Ù_Š¢ˆˆ ‚ ˆ‚‚hðA ^ ˆ&ˆ` ‰b ˆ&ˆ ˆ É ^  ˆ¢øãyýÃÎÎL;]õ­êêžÙÝÞ{vîáÌîÙ{î½{ïÎç|«ºº)¼‚‹ž?äùCž?äùCž?äùCž?äùCž?äùCþ?¤xc\éCs5}Èâ›®Ð<ɹw4jž„äâM´`ž€dö·éê{¿l¹¿„Nþ¦¼ÿK–{KèÄ÷vÅÅo¯ûÛ]§?„N·D8g¹¯„ªoæoŒÅ/ç,w•PùkùÛúækSë‡Üô:ñ!åÓÒ[‹Û?o¹¿Ä½–ÙèÇòå厒š@‹o5Â%Ëý$.ÿU½Y￲,Pî-ÀýR¼»‚˜gÁr7I ¡*¹ -A<Ëý%î9§Ä$Ç—þÕ¯…©"¡‚² ‰þÛEËÝ%QÊi‰-Pî*‘Ò­;J!)±N¦ ÜI2‹„©^½âì10‹²ÂuVBž’%¤÷)|‘U”{JÊHò¯hý€MOeÁ””»KÈS¨JE31ˆÃTãåN-®2RŒï+.…øó}G‰—9Lã(Ú ö¥.7ôùõÞ‹D–‹õ¼æ!/úí¬Yž†DsŠ—Äâךò$%£¢T²vå)H<¥«(:®Šò$$ t™’§~¬$ã) -ÑÒIòJÊÚꌢKÊËCÆ,q¢zŸGI—)˜LF¾k(Fˆò’Ìï"Z8HÞG¢ŽÎuK0 -3&—¿…À~}È“S bÑÊ3Î(ƾ»$Ý=(¹[ÒÛ´S 2=ÊváuÕ6ÿ•Ht‡XJ:PœE}¢8ÆXä"?µÖú”s’*’ôT‘î&Š:Ô’û™Ì_÷’8Gç)rwN2Âc±ðF›¸>åäùd&cF©$#–D¡M}by%„2—¸ËSÐòc–ŒE,Ó_Ó6®O9#)×`½6f!ô¼ dÐ\2…¶a}ÊIIp>C6s -$–ÈàsaK ]\ŸrBâ6õ“l”²‘ÕXvT1ŒeÉPQhק,m¸«FáE8'"MECÑL‘ …öa}Jƒ¤Œd³±dJºKA9Ö÷tˆëSNK\£ð -,¤§¥Òa×b†iÐ÷ô¶¸>eñ8g¡¤ê±>‘D6ú‚ÓåK%îiFoåÕK‚ï1à¡ ¼`€Q -½c\Ÿ²(‘Ú²-dWK¶%ý)N2 Ä˜BïŒëSNJª!/}bŽ­£Øò…>™®¾Œ…Þ5®O¹$ ¹º6&ÙV” ñÍ%IÞKÊ]¿,)ËKv+©°4"‰\º C¢^é=~¶ÒvZ2(LIŽ-?Ñø]*é¶ÒŠ;xIoÍBïקœX(:P˜‚ÚR -WS8ٮѫ%ý½o\ŸrFâ–aTW'‘e›¾G«ð]EW]Ó–Ô÷ôþq}ÊI˜W×Ö.í©/Ž\^ -éµ[èÃú”S’²¼\&[%Ë<”„à/¥Ðu²¬H9'ñåUd²ÃSd/)’¨«p/—´Ë@²!É’U('%ØC?­¸vé¹S -‡B:½±Ð‡‡Áíóס\¿xéÒ•»L™‡’îÿè(ô‘¾8²¬B9+ÉÛa’ÉŽ%™‚Io¡ÀpT -}¬V§œ–èÅ5ŠeÂÉS%‰§±ô¼AÄ2ÐÇP[ÀnN¹( vÖr™D,:¹¾xë…69š…>ÙëÌkñ­O^ç%å~Åg’®=‡c–h£@"úty?Œ«QÎH\yuÖò²t©(E–/›(G÷ ×t´ŒëQ.KB‘É ¿ÉžS™…’%üBŸé+ -$·¤œ“h(~¶L˜²G*hú ¡8 gò¹¾¤X(7¤4KdÞæLôõËBÁpD L¡/`ÑeJ‹$¸ex¢ìÉ~¯”*“0d¢Ðë:Z¦¿W¢4H‚[†uHzÑ®Çé1”å%}Q1Ù†­D9+qå¥C~£K JÑP¦é˜z¾GyAòe¬ÈƒÎ•(­Ý ku‰B8¨/é”´eÉÉW¹e¬íW¡´K(g²u¦L„™¢"åuìXò5éüš¢’›PZ$¶óB£XÔ"›%†ÜóœÊd¡oקœ—ˆ#Ôm’)Z_¼,Ba -}ëè(6V™#6“¤\”T-}—T×)rær 1o½„Bßa´ÊQ&$v“c’Ü„Ò,ÉÅ:þ€š~S…b’#}—‹ìh+Ø”+%î…÷š (Ú)ÊJº÷Ô'߇¶ -¥I"CÞN(:O˜!†NÁ‰K§ã±—–§>¨Ä(=Ž+¼ß‚rA’[>ŸPrÇ ä M?m¿Ê…x3J’üøáXRtØßrY’L‘шEøàC™6’ݦÜ#úé‘Cy8Ú„E7Æc|4åj‰nW´¸\(\^K¡ÐÏÄñP¬Åy®Ü„r…„üvEª‹)®Sêc -–/ú…—±›,+¦´KÈe²µêr¡ð–¥<¦€B¿r’¬ÅõÉë±”FIÈ'ÝBZ$ -æ|(úP¦“Öo²ä¡ìúÛQÚ$!ŸP°]AuI$2Süœ/C¡ß á¡+õ!òq”K’ù2Œb¬_åœ×é(MOoxÈC^Àü!RÖbµûº½$W— ”Ãá0+¯tvœÊËBIIz[IŸ -ö-½Ûñ”ÉÉrØW[½ä쨡ôô{Ùµ8K?Ûãñq”k$ÅQøÀµáPHÏŽcú¡O’?êIÅzÞZ[0Ùƒ=†r…¤Au©$QèO¼q± -$#8™â6-W××U¿z¥Í—³ˆCÚ™tWâéãé1ÊdqÝ2èýë†XN*:é¯>vµJ´Qå%õ¥”­”ÖV2éd&Ù±MOo¥H…Y,þ²é8¼T( ßò¹ç¢Ï­tIÚvÉh츻M™¼Á?Ù8:‹¶þP@zøMqkÓ·K|yIÓó€ÜîðØ‘pŸð1%=›¶øaD,H%×DØÜuyµ5ý•×)š -#væØ…lõJÿú×2©YR•˜–Ù`Õå;{––új–XyÙJ, ˜»Ë0(ôË€éKLVäÁ3f’+ö÷-’%w’,gW{Ž¶y~üy¬…5—IŒB¾ý§¿ócÌŠ³/á…â);%@#î¯þ½ï õxh &Yi *øcK%e¯dí@{ª½çñ~£Á‰Zú½0Ûv{Éï–( Œ\ýÕúuc&‚fùþ‚³¬ƒ®ô>XÊxøS¿ðtãš(&›&IåˆÄY ÕÏaí¸ê€œd˜‘»I¼%ŒÞ)?Äs:eé· ²9Íeè)QtX?êák…µV<åB õ ,Õ´””…Ò×þÅ×]î¿ ð=/£>x†ø9ÖJ ”0å¤$\¢ªÕ'W*¾è¼¬4\-QWa]}‚w!17PŠp\)]jÍÉ;;Àê4´ô$b¡ÜQ2¼`}‘DˆÁ(-|_|‰ºnåÂD“lK¢-–¢\%áQW>. ‘’Zìƒo~óÉKYÑÆsÌÝX2Ib¨j/²žß‡Û05—è]Y”cR‘C‡ƒ’ì’B¼3>\‚’u·áAy£*LM U,Ü{ùŠùH%Ù®Èú®’U2¬Ç<¿\Ë)¡j>stream -ÿÿÿ endstream endobj 787 0 obj <>stream -H‰ìÑMÃCÑfÿ¥­@ ”6ÉùÎŽñŸÀO¾ÝRJ)¥”RJË:ö˜“-Ïb:ÚSÄå,¯ס¼U\C²‹!/Ù«—aK2T%Ç’3 EÉI‡ä,CLR`HAJI‘!);4 u††â€`tˆA‡ÀdÎÁ…L’Á”€4ÚÁ‚À$ÞÁ48(Òâ @zó&Ç8¤Ë1 is¢æ˜…4:F!Ž@Ôƒ^Ǥوšc -Òî°¸8QsÌ@¨9Qs @f¨9QstCƨ9z!ƒŽ@Ô¨9!³Ž>È°#5GdÜÑ™w¢æh0Š£Âq¢æ€CX4„æCx,„è€B˜ˆ‹ ¡:€®!;`¶a3P¶bA؈ÅLjšaÅ¡å¨CØ€¯âÐrGS.Ž„=~U‰£'‡ ÄÅQ°§orqØ@\{ù¶GKç6öòm9ÄÆ¡)8l ìé›\©8l ìíë\)9ÁWsè@ŠIÙáшC@rÐ%0›‚„0-`‚wp0MŽqM«c’3™ð :Z1ÓŽ. ÅÑ€á9°®Fa+î¹86à;GQ¿΄Q°—ÿÈÅqÂÞý+ÆI{ô³\' ìÅäâ8 -aÏý»é`}• ㄽôM&Œ½öÌ™0ö@Ø ÷桸½†°·ËCñ™‡âžâ‘"¥”RJ)¥”RJ—ëC€=€F endstream endobj 744 0 obj <> endobj 759 0 obj <> endobj 756 0 obj <> endobj 755 0 obj <>/ProcSet[/PDF/ImageB]/ExtGState<>>>/BBox[7019.5 7438.5 7386.5 6963.5]>>stream -q -/GS0 gs -367 0 0 475 7019.5 6963.5 cm -/Im0 Do -Q - endstream endobj 757 0 obj [0.0 0.0 0.0] endobj 752 0 obj <> endobj 751 0 obj <>/Height 475/Type/XObject>>stream -H‰ì×ËrÛÈ`ñ*REѯ]•­wYú²ñ+¤ü®Ê#x™ð>»Ì ¤jòÎ>SÙeªR%’"ˆÈ9§ð"Jâú´Ñ´$Jžz¾9õ÷ßк ê œºê—½àÕo5^ðúV“’¶qü‚ÝwRÌáê…¿Hö¾Õgm8Cú shíùa²ñ%Ùü‰F+5Î^)·tèn¿l}Ñ ]1ãgàOktÝ v¢”³×úKC+ôàŠÿ@/ú/m~—ºò+¡ìbׇœ©ùE Ø_Šøûõûµ÷ÎRüù¨W¾xºÛdÝl6Ss!Þ¸Íß©òŽ·ÿdðZ“7_£v«Õl±9HñÆíÜø†„ñóGúF±kAÎáÝl°Õn·[mD&þ)«ò$ÕŽ#õñ¥žEK•‹œ†Þ·;ÝN»Ójµ8È«ÝÖ >gï²8I¥‘z½˜]%KµäÐÀòÙjw:ð‡n¯Ûí¢8λ(ñ/ü…œÀc5Ö¨¼¢×J}:yÅC®‡»{ ¼¾¾îu:퇊˜ƒ³_ÓŽ”iœðbép†ô)5WÁR!9˜ÍV§Û»î÷áOý~ÅÕˆW¶¥ã|ã/I6á” <ݤ†A!±+òìø¬f« pœïÁàæþ|Ó¿îuÛ~%f¾iÁ÷Úíîup{w{ zãMI]œü½‘šqšá*OÈ{IË_’ºšò*“œÀ)ÁÉ{8¼»ƒ¿0T¨ - -q’ƒ_3ð<ÄSðeà/}ß÷ð󒧜NÏÊb…ÎL¬(½ÁÍíýp4¼¿…¿ ztlª—!Îpð#­…¡Bâ4à¨íáBv"§\‰«Štm6;kðûÑht?¼…\wÛ\ÅËßÍ9+çÇf§µFœÁq¹.™c²ø?‚oBUÄ -·Ú”(÷÷÷÷·øÑ“Žÿ-ÿÍÄó!GZ<,)P\ÏuÜõ‰œb%ª&V¨b)ìc¢ŒÆãÑýíMþÓ žÀD¥J#ÎÉU¨ 8¸ã 9“s’W+ -¼×¿¹Ãîïnú=ø_ZS„­œy®¤âxlú ŽËÅ1§!§ºR…8·Û>¼¿Cð!‚·a.ŽƚL' –rïIW†Foää±rrNä^¹ë’87ò2Å_¿ÂD©àVÈ‚Ü/r\\È—ÜUÐ{Aä(î—/¾ ŽŽ‡æ\²8­D}↩XÁ>Ž3¾ Eâäe‹ï‚¯3¢g<]ª±P'gñ€Äm·+å‹?Wµ0­áˆg}…/Axò}Ìq·pÈ+ÜñF+8ã(nÛ–·KÜñtȱ FØȱ³8‚[ˆ¿n†x#Éc%§PAslä势 nŽ8D::Sq«ñ·ÁodG'å8—Ãyâ€"žÅJ>ãTU楋nš8æ8öñŠÄ7H¼¡êaÀâTË? Ü$ñ<Ç«?Ü0ñxU™ø¡àµxQÛ9Üqî㕉^‹³™ÃÁkñBörx-^ÄVŽ¯Å ØÉQàµøù9¼?{G‚×âçnãXðZüÌ] ^‹Ÿ·‰ãÁkñ³öpx-~ÎN¯ÅÏØÁIàµøé8 ¼?ù÷Ÿ^‹ŸúëO¯ÅOüí'ƒÿ<âQR øàÆ‹Û®âÅÏÿIÄèHñ³À Gpk±p\Ï‚U‘âç›*¾X°¸µqr%~&¸¹âÈ=ÏfSÿ®Qˆø¹à&‹Ïçë“3Š×ÜPqÛÆP¡XaqÊñ‚êøùàfŠ;4ã8âsšqS¥(ñÀ§PQ9Žâ«‚Ä‹7P|I©Bm<_TÇ /Ü0ñ( -CwHœgÜv</@XÏ/Ü<ñ ðPÜJSÅqÆWEˆnš8¥ -ŠóÁ‰]ea».]9 / -Üq|‘xH⪒8^9‹/ Ü$ñ8aqßw(U¸S÷ñt¶xqàf‰G;âTU -/Ü q•ãáré9êä¤+g1âE‚&¾bq׶- -òŠ;þùâ…‚'NWN—ºŠÅU¥ñbÁÍç ÏøZÜ[ž)^0¸aâ«,Ç‹/Ü$ñXå8¥Jqâ…ƒ›*n-Š/Ü8qur%~pCÄñý%Ä/^‹¿ö+.^‹¿ò.^‹¿ü .^‹¿øü ×â/=þRàµø O¿x-¾ÿá—¯Å÷>û‚àµø¾G_¼ßóä‹‚×âÏ|YðZüÙs/ ^‹ï>öÒàµøÎS/^‹o?ôòàµøÖ3K¯Å7Yx-¾ñÄRÀkñõ˯Åóç•^‹g+ ¼OŸVx-®Vx-ÎÏ*¼o” ^‹— ^‹— ^‹— nº¸í¦âQ²_¼tðŸC<Œ¢x¿xùà?¸dâZ€›+ŽàÖbáx@9¾O¼ -pCÅ ·Ò“3Œèä|*•€+nqª,Ç÷ñääTÙ¯Ü\ñ9¾òT‰8UvP ¸™â¶‰2'qÕU¢(zãU)î8ãsŠžqª*»1^¸™â6ŠÓâTYáó¯Ü<ñ%‹[,nٶ穪²*‚›%Ea¸ô©Ž[ó'w\®*;¡R%¸qâ‰c7|zBóŠc¨¬¢í¯Ü0qLßǃÓzšÏpÈQÜ÷nã#^-¸1âø"ñPœó'Z–CìŒxÅà‰Ç œ(N¡2š±8†Ê2ÜñªÁ"ª*Žƒ)>ÃÞ€¨®V›#^9¸9â”ãã*xlÎf3:8©©lxõàF‰SŒ{¥øŒÄ1T<;Å57IœCÅs1Åg³él†mÜõ°Òí'ûw47HœÛ8›>¥PÁC¼‰f™¢¸9âÜ yÄŸfÓ … -¥8vñ/2Á‰oƒ?Âg™àrÄwÀ'ðI&¸ñ]ð|” .Eüø>È"þ܆÷2Áeˆïwa$\„ø>p2Á%ˆï +\€ø~ð´d‚ë/þxW2Áµ < ®»ø‹à ‹ -×\üep—®·ø+à  -®µøkà(.\gñWÁÑ[&¸Æâo_É×WüÍ oÉ×VüÍ ‡®Lp]ÅßoÂ@&¸¦âoƒ·`$\OñÀ;ð^&¸–⇀÷àƒLpÅïÃG™àŠ~Ÿd‚ë'~ ø>Ë×NüPð|‘ ®›øÁàcø*\3ñÃÁßÁ7™àz‰>†ï2Áµ?üü"\'ñ£ÀÇðO™à‰>‚É×GüHð!ü&\ñcÁoàw™àºˆ Þ‡©LpMÄï-\ñÀ;àË×Büð„2Áu? ¼ ‘Lp ÄO¿‚øÿì×ÉuÛH€a7P¤.¾øìœSpÂ98çàœðÙ'q‘(RÜáFƒ”@‰ Ð]½P¿ÆÖ\¦§Þ÷ú›4ÁÝ‹«‚;\5׃+ƒ»\9ǃ+ƒ»\=·ƒ«ƒ³¸Rà,®’8‹+¤ÎâùÓgñÜi‚³xÞtÁY|p?›p?— p?“p?p?™!p?•)p?‘1p?ž9p?šAp?–Ip?’QpŸYp—ap›ip“qp?Ì<8‹dœÅÓÙgñTVÀYü5;à,þ’%pßg œÅwYgñ${à,.³Îâq6ÁY<° Îâ¶ÁYÜ68‹Û/½¸uð²‹Û/¹¸ðr‹»/µ¸ð2‹»/±¸#ðòŠ»/­¸3𲊻/©¸CðrŠ»/¥¸Sð2Š»/¡¸cðò‰»/¸s𲉻/™¸àå÷¼Tâ^€—IÜð‰{^q_ÀK#î xYÄý/‰¸Gàå÷ ¼â^—AÜ/ðˆ{^|qßÀ /îxÑÅý/¸¸‡àÅ÷¼Ðâ^‚YÜOð‹{ -^\q_Á +î-xQÅý/¨¸ÇàÅ÷¼â^ƒQÜoðŠ{^‚Ï4Á©ˆ¿€O4Á‰ˆ¿‚4ÁiˆŸA—&8 ñcàshÓ§ ~| !MpâÇÁ×P£ î¿ø ð Th‚{/~ -| @Üwñ“à‘%î¹øip)NÜoñ3à÷Zü¸§ î³øYpáMÜcñKàšàþŠ_¼á5šàÞŠ_¼áÒ÷Uü"xÚ4Á=¿ ^ƒ.Mp?Å3€7à#Mp/ų€7áMpÅ3·à3Mpų_Úàþ‰g¿ƒ¯4Á½Ï -Þ…o4Á}Ï Þ‡ï4Á=Ïþ~Ð÷K<x~Ò÷J<øøEÜ'ñ\à}øMÜ#ñ|à]øCÜñœàwð—&¸7âyÁ¯áMp_Äsƒ·`HÜñüàMx¢ xæ4Á½W¯ÁŠ&¸âJàUØÐ÷@\ ¼[šàîÅUÁ®šëÁ•Á]®œãÁ•Á]®žÛÁÕÁY\) pWIœÅÒgñüé³xî4ÁY8‹ç -œÅó„Îâ9BgñìဳxæÀY8‹ŸÍ8‹ŸË8‹ŸÉ8‹ŸÎ 8‹ŸÌ8‹ŸÊ8‹ŸÈ8‹Ï8‹Í 8‹Ë$8‹É(8‹¿Ï,8‹¿Ë08‹¿Í48‹¿É88‹fœÅ²Îâél€³x*+à,þZNðÛ%pi>yÌÞ¹Ûƒ,®TìÁÆÀû>ôºÊà,ž” ïïÁ!^)|ÇsÅ+%Ê ÞOíðÜ7\¶EÜn˜ƒ¿Þp±Ã'Àöï‰ÞÓ`ƒ7¸ÕOƒÅ -ðé" ^©×›­›Û¼/>4Õž…ûÁWhƒÛ qð×gáx0ˆÁ'³ùjµ=¿¾ëôÄJéIðº2xs´Áí†7¸_Ið¡X)Ãq¼RÀå¿íôz}~«ÀÖà–CüüQ€†Ãñ£Üáàaëú¦Óí÷úÝÎÍu+lÔ*Êà ‘·Öà|»^.fO“ñh0ŒÆ“§Ù"ÕZ=lµo:âŠ÷:›ö•¸áàüÃÜzHƒKðÕüy:‡â‚'ÓÙbµÞD/àÕFãª}sÛév»ñÍ«P<€¿(ƒÛgð|ñÕFãÇÉôy¹Ü¼‚WjõF³-vÊ]÷Nl”v³!Àå•—¡üÆàÒ<&°|9ŸŠò0ze:_®ÖÛxP©Tëx§ÜÞÝÝÞÞ´“WaEÃ[ü‡¿5w•öàR|›¼ §“ÇLJ‡Çx£,W›í6؃‹wax‹‹Ÿv»îŸáêK%€_šƒ»J{ðhÿ_̧B|{?/âWá\|Õ¬ÖÃðªÝ¾µ®ša½Z…Šw|îOÍÁ]¥?xl£Ífµ˜?ÏžDÓéób±Úˆ/š\¾ «âaؼjµÚ­–X(â‚WAã3s7øÝÁ¥?¸XÖqÅÅR™Í¦³Ùó\< -7»Waò©Y·xx'¼ã7ŠÞ -Oþ®;¸£ôß-ñøcs9Ž[Ä|³ûÌ”K\ˆ‹‡J£6ÃP,ðä‚ëÞpqò7í#ܤ;x”\q±Æ‹ùb¾Oá¬p¹Äã+^«5Ä-j5ù×÷GE8ÄEºƒGò).ÄWKq»—ëµ¼à;ðx§Äââ’×ëµz-~Š…‚ÀŒS¤9x$—Š¸ã«õj%®w²P¢ýáòsS’תbày‹³?ãœc=ÍÁwâ›õf-¹·© þ".ÍåoÍ7x:ø„sŽõ´OÞâ[i¾‘¿ÓÞñRñø'ÑN8–øGœs¬§1¸|¨DÑÎ<Š‚(å_ñd“Ë’}‚ä-êbd9Á¥¸üè”ÿÈëu!1o4îøð6âa6Ó>stream -H‰ìÐÁiÃÁsÿMça0F“G´ä™ -–oñ¸‰í¿°½èïmý`{ÍU¶¿žÛ¾r©í¹GÛ?Û‹ßl¯hl_~ÙQÙþü´}!´½z¾êöã ßs;fwËî˜Ý-·[vÇìnÙݲ;fwËî–Ý-»[v·ìnÙݲ»ewËî–Ý-»[v·ìnÙݲ»ewËî–Ý-»[v·ìnÙݲ»ewËî–Ý-»[v·ìnÙݲ»ewËî–Ý-»[v·ìnÙݲ»ewËî–Ý-»[v·ìnÙ²»ewËî–Ý-»[v·ìnÙݲ»ewËî–Ý-»[v·ìnÙݲ»ewËî–Ý-»[v·ìnÙݲ»ewËî–Ý-»[v·ìnÙݲ»ewËî–Ý-»[v·ìnÙݲ»ewËî–Ý-»[v·ìnÙݲ»ewÊî–Ý-»[v§ìnÙݲ»ewÊî–Ý)»[v§ìnÙ²»ewÊî”Ý-»Sv§ìnÙ²;ewÊî–Ý)»Sv§ìNÙ²»ewÊî”Ý)»Sv§ìNÙ²;ewÊî”Ý)»Sv§ìNÙ²;ewÊî”Ý)»Sv§ìNÙ²;ewÊî”Ý)»Sv§ìNÙ²;ewÊî”Ý)»Sv§ìNÙ²;ewÊî”Ý)»Sv§ìNÙ²;ewÊî”Ý)»Sv§ìNÙ²;ewÊî”Ý)»Sv§ìNÙ²;ewÊî”Ý)»Sv§ìNÙ²;ewÊî”Ý)»Sv§ìNÙ²;ewÊî”Ý)»Sv§ìNÙ²;ewÊî”Ý)»Sv§ìNÙ²;ewÊî”Ý)»Sv§ìNÙ²;ewÊî”Ý)»Sv§ìNÙ²;ewÊî”Ý)»Sv§ìNÙ²;ewÊî”Ý)»Sv§ìNÙ²;ewÊî”Ý)»Sv§ìNÙ²;ewÊî”Ý)»Sv§ìNÙ²;ewÊî”Ý)»Sv§ìNÙ²;ewÊî”Ý)»Sv§ìNÙ²;ewÊî”Ý)»Sv§ìNÙ²;ewÊî”Ý)»Sv§ìNÙ²;ewÊî”Ý)»Sv§ìNÙ²;ewÊî”Ý)»Sv§ìNÙ²;ewÊî”Ý)»Sv§ìNÙ²;ewÊî”Ý)»Sv§ìNÙ²;ewÊî”Ý)»Sv§ìNÙ²;ewÊî”Ý)»Sv§ìNÙ²;ewÊî”Ý)»Sv§ìNÙ²;ewÊî”Ý)»Sv§ìNÙ²;ewÊî”Ý)»Sv§ìNÙ²;ewÊî”Ý)»Sv§ìNÙ²;ewÊî”Ý)»Sv§ìNÙ²;ewÊî”Ý)»Sv§ìNÙ²;ewÊî”Ý)»Sv§ìNÙ²;ewÊî”Ý)»Sv§ìNÙ²;ewÊî”Ý)»Sv§ìNÙ²;ewÊî”Ý)»Sv§ìNÙ²;ewÊî”Ý)»Sv§ìNß¡±»dwÊîÔø»KãwhÆïÎØ]¿Cs°ÝskÇÙ~_éä¶áW9Ÿmù>­†{ù`"2zƒ endstream endobj 818 0 obj [/Indexed/DeviceRGB 255 819 0 R] endobj 819 0 obj <>stream -8;X]O>EqN@%''O_@%e@?J;%+8(9e>X=MR6S?i^YgA3=].HDXF.R$lIL@"pJ+EP(%0 -b]6ajmNZn*!='OQZeQ^Y*,=]?C.B+\Ulg9dhD*"iC[;*=3`oP1[!S^)?1)IZ4dup` -E1r!/,*0[*9.aFIR2&b-C#soRZ7Dl%MLY\.?d>Mn -6%Q2oYfNRF$$+ON<+]RUJmC0InDZ4OTs0S!saG>GGKUlQ*Q?45:CI&4J'_2j$XKrcYp0n+Xl_nU*O( -l[$6Nn+Z_Nq0]s7hs]`XX1nZ8&94a\~> endstream endobj 814 0 obj [/ICCBased 754 0 R] endobj 729 0 obj <> endobj 730 0 obj <> endobj 731 0 obj <>stream -%!PS-Adobe-3.0 %%Creator: Adobe Illustrator(R) 13.0 %%AI8_CreatorVersion: 13.0.0 %%For: (Aleks Kissinger) () %%Title: (tikzit_doc.ai) %%CreationDate: 4/2/10 12:18 AM %%BoundingBox: -36 -36 548 548 %%HiResBoundingBox: -36 -36 548 548 %%DocumentProcessColors: Cyan Magenta Yellow Black %AI5_FileFormat 9.0 %AI12_BuildNumber: 406 %AI3_ColorUsage: Color %AI7_ImageSettings: 0 %%RGBProcessColor: 0 0 0 ([Registration]) %AI3_Cropmarks: 0 0 512 512 %AI3_TemplateBox: 256 256 256 256 %AI3_TileBox: -140 -50 652 562 %AI3_DocumentPreview: None %AI5_ArtSize: 14400 14400 %AI5_RulerUnits: 6 %AI9_ColorModel: 1 %AI5_ArtFlags: 0 0 0 1 0 0 1 0 0 %AI5_TargetResolution: 800 %AI5_NumLayers: 2 %AI9_OpenToView: -147.8892 674.8887 0.6667 554 659 18 0 0 225 81 0 0 1 1 1 0 1 %AI5_OpenViewLayers: 73 %%PageOrigin:-210.3003 -310.2988 %AI7_GridSettings: 72 8 72 8 1 0 0.8 0.8 0.8 0.9 0.9 0.9 %AI9_Flatten: 1 %AI12_CMSettings: 00.MS %%EndComments endstream endobj 732 0 obj <>stream -%%BoundingBox: 75 20 456 516 %%HiResBoundingBox: 75 20 456 516 %AI7_Thumbnail: 100 128 8 %%BeginData: 17068 Hex Bytes %0000330000660000990000CC0033000033330033660033990033CC0033FF %0066000066330066660066990066CC0066FF009900009933009966009999 %0099CC0099FF00CC0000CC3300CC6600CC9900CCCC00CCFF00FF3300FF66 %00FF9900FFCC3300003300333300663300993300CC3300FF333300333333 %3333663333993333CC3333FF3366003366333366663366993366CC3366FF %3399003399333399663399993399CC3399FF33CC0033CC3333CC6633CC99 %33CCCC33CCFF33FF0033FF3333FF6633FF9933FFCC33FFFF660000660033 %6600666600996600CC6600FF6633006633336633666633996633CC6633FF %6666006666336666666666996666CC6666FF669900669933669966669999 %6699CC6699FF66CC0066CC3366CC6666CC9966CCCC66CCFF66FF0066FF33 %66FF6666FF9966FFCC66FFFF9900009900339900669900999900CC9900FF %9933009933339933669933999933CC9933FF996600996633996666996699 %9966CC9966FF9999009999339999669999999999CC9999FF99CC0099CC33 %99CC6699CC9999CCCC99CCFF99FF0099FF3399FF6699FF9999FFCC99FFFF %CC0000CC0033CC0066CC0099CC00CCCC00FFCC3300CC3333CC3366CC3399 %CC33CCCC33FFCC6600CC6633CC6666CC6699CC66CCCC66FFCC9900CC9933 %CC9966CC9999CC99CCCC99FFCCCC00CCCC33CCCC66CCCC99CCCCCCCCCCFF %CCFF00CCFF33CCFF66CCFF99CCFFCCCCFFFFFF0033FF0066FF0099FF00CC %FF3300FF3333FF3366FF3399FF33CCFF33FFFF6600FF6633FF6666FF6699 %FF66CCFF66FFFF9900FF9933FF9966FF9999FF99CCFF99FFFFCC00FFCC33 %FFCC66FFCC99FFCCCCFFCCFFFFFF33FFFF66FFFF99FFFFCC110000001100 %000011111111220000002200000022222222440000004400000044444444 %550000005500000055555555770000007700000077777777880000008800 %000088888888AA000000AA000000AAAAAAAABB000000BB000000BBBBBBBB %DD000000DD000000DDDDDDDDEE000000EE000000EEEEEEEE0000000000FF %00FF0000FFFFFF0000FF00FFFFFF00FFFFFF %524C45FDFCFFFDFCFFFDC6FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFFFFFA8FFFFFFA8FD26FFA8A9A8A8A8A9A8A8A8A9A8A8 %A8A9A8A8A8A9A8A8A8A9A8A8A8A9A8A8A8A9A8A8A8A9A8A8A8A9A8A8A8A9 %A8A8A8A9A8A8A8A9A8A8A8FFA8FD2CFFFD36A884FD04A8FFA8FFA8FD26FF %A8A8A8A9A8A8A8A9A8A8A8A9A8A8A8A9A8A8A8A9A8A8A8A9A8A8A8A9A8A8 %A8A9A8A8A8A9A8A8A8A9A8A8A8A9A8A8A8A9FD0BA8FD28FFFD38A87DA87D %A8A8FFA8FFA8FFFFFFA8FD20FFA8A9A8FFA8A9A8FFA8A9A8FFA8A9A8FFA8 %A9A8FFA8A9A8FFA8A9A8FFA8A9A8FFA8A9A8FFA8A9A8FFA8A9A8FFA8A9A8 %FFA8A8A8A9FD07A8FFA8FFA8FD24FFFD38A87DA87D7EFD05A8FFA8FFA8FD %20FFA8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8 %A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8A9FD06A87DA87DA8A8 %FFA8A8A8FD22FFFD36A87DA87DA87D7D7DA8A8A87DA8A8FFA8FFA8FD1EFF %A8FFA8AFA8FFA8AFA8FFA8AFA8FFA8AFA8FFA8AFA8FFA8AFA8FFA8AFA8FF %A8AFA8FFA8AFA8FFA8AFA8FFA8AFA8FFA8AFA8FFFD06A87DA87D7D84FFA8 %AFA8A8A8FD20FFFD38A87DA8FD047DA8FFA8A87DA8A8FFA8FD1EFFA8A8A8 %FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8 %A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFFD04A87DA87D7D7DFFA8FF %A8A87EA8A8FFA8FD1CFFFD38A87DA87D7D527D7DFFA8FFA8A87DA8A8FFA8 %FFFFFFA8FD18FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFFD %04A884A87D7D52A8FFFFA8FFA8FFA8A8A8FD1CFFFD38A87DA87D7D527D7D %FFA8FFA8A9A8A87DA8A8FFA8FFA8FD18FFA8FFA8A9A8FFA8A9A8FFA8A9A8 %FFA8A9A8FFA8A9A8FFA8A9A8FFA8A9A8FFA8A9A8FFA8A9A8FFA8A9A8FFA8 %A9A8FFA8A9A8FFA8A8A8AFA8A87DA87D7D527DFFFFA8FFA8FFA8AFA8A8A8 %FD1AFFFD3AA87D7D525252FFFFFFA8FFFD04A87DA8A8FFA8FFA8FD16FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFFD04A87D7D527D %A8FD05FFA8FFFD05A8FD18FFFD3AA8FD047D52A8FFFFA8FFA8FFA8FFA8A8 %7DA8A8FFA8FD16FFA8AFA8FFA8AFA8FFA8AFA8FFA8AFA8FFA8AFA8FFA8AF %A8FFA8AFA8FFA8AFA8FFA8AFA8FFA8AFA8FFA8AFA8FFA8AFA8FFA8AFA8FF %FD06A87D7D5252A8FD07FFA8FFA8A87DA8A8FFA8FD14FFFD3AA87D7D537D %52A8FD04FFA8FFA8FFA8FFA8A87DA8A8FFA8FFFFFFA8FD10FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8AFA8A87D7E7D7DA8FD09 %FFA8FFA8FFA8A8A8FD14FFFD05A8A9A8A8A8A9A8A8A8A9A8A8A8A9A8A8A8 %A9A8A8A8A9A8A8A8A9A8A8A8A9A8A8A8A9A8A8A8A9A8A8A8A9A8A8A8A9A8 %A8A8A9FD04A8FD047D52A8FD04FFA8FFFFFFA8FFA8A9A8A87DA8A8FD14FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFFD04A87D847D %7DA8FD09FFA8FFA8FFA8A9A8A8A8FD12FFFD3AA87DA87D7D52FD04A8FFA8 %FFA8FFFFFFA8FFFD07A8FFA8FFA8FD0EFFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8AFFD04A87D7E7D7D527D527D527D7DA8A8FF %A8FFA9FFA8A8A8FD12FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FF %A8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8 %A8FFA8A8A8A9FD04A87DA8FD047D527DFD07527D7DA8A8FFA8A8A8FFA8FD %10FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFFD06 %A87DA8FD0F7DFD04A8FD10FFFD3CA87EA87DA87DA8FD0F7DFD04A8FFA8FF %A8FD0CFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFFD06A87EA8A8A87DA87DA87DA87DA87DFD04A8FFA8FD0EFFA8FF %A8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8 %A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFFD0AA87E %A8A8A87DA87DA87DA87DA87DFD06A8FFA8FD0CFFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8A8A8FFA8AFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8A8A8FFFD13A8FD %0EFFA8A8A8A9A8A8A8A9A8A8A8A9A8A8A8A9A8A8A8A9A8A8A8A9A8A8A8FF %A87D527DFD05527D7DA8A8AFA8A9A8A8A8A9A8A8A8A9A8A8A8A9FD1FA8FF %A8FFA8FD0AFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FF7D7DFD05527DFD05527DA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8AFA8FFA8A8A8FFA8A9A8FFA8FD %0CFFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8FD10 %527DFFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8 %FFA8A8A8A9FD0DA8FD0CFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA87D5252527D5252527D5252527D5252527D525253FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8A9A8FFA8FFA8FD0CFFA8A9A8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8 %A8A8FFA87D27FD1452AFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FF %A8A8A8FFA8A8A8FFA8A8A8A9FD0BA8FD0CFFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFFFA8527D527D527D527D527D527D527D527D527D527D %52527DFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FD0CFFA8FFA8A8A8FFA8A8A8FFA8A8 %A8FFA8A8A8FFFD04A8FD18527DFFA8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8 %A8FFA87D597D527D7DA8A8FFA8FFA8A8A8FFA8A8A8FFA8A8A8FD0CFFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFFD05527D5252527D5252527D %5252527D5252527D5252527DA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %7D7DFD07527DA8FFA8FFA8FFA8FFA8FFA8FFA8A8A8FD0AFFA8A8A8FFA8A8 %A8FFA8A8A8FFA8A8A8FFA8A8A8FF7DFD1952287EA8A8A8FFA8A8A8FFA8A8 %A8FFA8A8A8FFFD0A52277DA8FFA8FFA8A8A8AFFD05A8FFA8FD0AFFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA97D527D527D527D527D527D527D52 %7D527D527D527D527D527D527D52FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF7D %52527D527D527D527D527D527DA8FFA8FFA8FFA8FFA8FFA8FFA8FD0AFFA8 %A8A8FFA8A9A8FFA8A9A8FFA8A9A8FFA8A9A8A9FD1C52A8FFA8FFA8A9A8FF %A8A9A8FFA8FF7DFD0E52A8A8FFA8A9A8FFFD05A8FD0CFFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA87D5252527D5252527D5252527D5252527D52 %52527D5252527D5252527DA8FFA8FFA8FFA8FFA8FFA8FFA97D527D525252 %7D5252527DFD0552FFA8FFA8FFA8FFA8FFA8FD0CFFA8FFA8A8A8FFA8A8A8 %FFA8A8A8FFA8A8A8FFA87DFD1D527D7DFFA8FFA8FFA8FFA8FFA8A8FD1052 %A8FFA8FFA8A8A8FFA8A8A8FD0CFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FF7D52527D527D527D527D527D527D527D527D527D527D527D527D527D %527D525252A87EFD07A85253527D527D527D527D527D527D527D52A8A8FF %A8FFA8FFA8FFA8FD0CFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA87D %FD205227FD075227FD11527DFFA8FFA8FFA8FFA8A8A8FD0CFFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FF7D52527D5253527D5253527D5253527D52 %53527D5253527D5253527D527D52537D7D7DFD06A87D527D5253527D5253 %527D5253527D525252A8FFFFA8FFA8FFA8FFA8CAA8FD0AFFA8A8A8FFA8AF %A8FFA8AFA8FFA8AFA8FFA8AFA8A8FD1D527D7DFFA8FFA8FFA8FFA8FFA8A8 %FD1052A8FFA8AFA8FFA8AFA8A8A8FFA8FD0AFFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA87D527D527D527D527D527D527D527D527D527D527D52 %7D527D527D527DA8FFA8FFA8FFA8FFA8FFA8FFA87D527D527D527D527D52 %7D527D525252FFA8FFA8FFA8FFA8FFA8FFA8FD0AFFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFFD1C52A8FFA8FFA8FFA8FFA8FFA8FFA8FF7DFD %0E52A8A8FFA8FFA8FFA8FFA8A9A8FD0CFFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA87D527D527D527D527D527D527D527D527D527D527D527D52 %7D525252FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF7D52527D527D527D527D52 %7D527DA8FFA8FFA8FFA8FFA8FFA8FD0CFFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FF7DFD1A527DA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFFD0B %527DA8FFA8FFA8FFA8FFA8FFA8A8A8FD0CFFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FF7D52527D527D527D527D527D527D527D527D527D527D %527D527DA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF7D7D527D527D5252 %527DA8FFA8FFA8FFA8FFA8FFA8FFA8FD0CFFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8A8FD18527DFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA87D537D527D7DA8A8FFA8FFA8FFA8FFA8FFA8FFA8A8A8FD0CFFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA9A8527D527D527D527D52 %7D527D527D527D527D527D52527DFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFFFFFA8FFAFFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8A8A8FD0A %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA87DFD1552FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8A8A8FFA8FD0AFFA8FFA9FFA8FFA9FFA8FFA9FFA8 %FFA9FFA8FFA9FFA8FFA87D527D527D527D527D527D527D527D527D527D52 %A8FFFFA9FFA8FFA9FFA8FFA9FFA8FFA9FFA8FFA9FFA8FFA9FFA8FFA9FFA8 %FFA9FFA8FFA9FFA8FFA9FFA8FFA8FFA8FD0AFFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FF7D52525952525259525252595252525952 %52527DA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FD0CFFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8A8527D527D5252527D527D527D525252 %7D52527DFFFFFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FD0CFFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF7DFD04527DFD07527D7D7D5252527D %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8A8A8FD0CFFAFFFA8FFFFFFA8FFFFFFA8FF %FFFFA8FFFFFFA8FFFFFFA87D527D7DFFFFFFA8FFA8FFA8FFFFFFA8A85252 %52FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FF %FFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FD0CFFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8A852527DFFA8FFA8FFA8FFA8FFA8FFA8FFA8A8 %52527DFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8A8A8FD0CFFA8FFAFFFA8FFAFFFA8FF %AFFFA8FFAFFFA8FFAFFFA8FF7D527DFFFFFFA8FFAFFFA8FFAFFFA8FFAFFF %FFA8527DA8FFAFFFA8FFAFFFA8FFAFFFA8FFAFFFA8FFAFFFA8FFAFFFA8FF %AFFFA8FFAFFFA8FFAFFFA8FFAFFFA8FFA8A8A8FD0AFFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8527DFFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8A852A8A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8A8A8FFA8FD0AFFA8FFFFFF %A8FFFFFFA8FFFFFFA8FFFFFFA8FD04FF7D52FD05FFA8FFFFFFA8FFFFFFA8 %FFFFFFA8FFFF7D52FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFF %FFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFA8FFA8FD0AFFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFFFA828A8FFFFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8527DFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FD0EFFA8FFFF %FFA8FFFFFFA8FFFFFFA8FD05FF527DA8FFFFFFA8FFFFFFA8FFFFFFA8FFFF %FFA8FFFFFFA8FF7D52A8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8 %FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FD0CFFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA9FFA8FFFFFF7D527DFFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8A8527DA8FFA8FFA8FFA9FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8A8A8FD0EFFA8FFFFFFA8 %FD05FFA8A87DA87DA87D7D7DFD05FFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFF %FFA8FFFF7D527DA8A87DA87DA8A8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8 %FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FD0CFFA8FFA8FFA8FFA8FFA8FFFF %A8FD09527DA9FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF7D %FD08527D7DFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8A8A8FD0CFFA8FFFFFFA8FD04FFA85252527D527D527D527D52 %FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA97D527D527D52 %7D527D52527DFFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8 %FFFFFFA8FFA8A8A8FD0AFFA8FFA8FFA8FFA8FFAFA8FD0C527DFFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA97DFD0C527DFFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8A9A8FFA8FD0AFFA8FD07 %FF527D527D527D527D527D527D527DA8FD14FFAF527D527D527D527D527D %527D527DA8FFAFFD19FFA8FFA8FD0CFFA8FFA8FFA8FF7D52527D5252527D %5252527D5252527DA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF7D52 %527D5252527D5252527D5252527DA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FD0EFFA8FFFFFFA87D527D527D527D527D %527D527D527D52FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA87D527D %527D527D527D527D527D527D52FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FF %FFFFA8FFFFFFA8FFFFFFA8FD0CFFA8FFA8FFA8FFA8A8FD05525352525253 %5252525352527DFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8A8FD055253 %525252535252525352527DFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8A8A8FD12FFA87D527D527D527D527D527D527D527D52A8 %FD12FFA87D527D527D527D527D527D527D527D52A8FD1AFFA8FD0CFFA8FF %A8FFA8FFFFA8527D5252527D5252527D5252527D52527DFFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFFFA8527D5252527D5252527D5252527D52527DFF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA9A8A8FD0CFF %A8FFFFFFA8FFA87D527D527D527D527D527D527D527D52A8FD04FFA8FFFF %FFA8FFFFFFA8FFFFFFA8FFA87D527D527D527D527D527D527D527D52A8FD %04FFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFA8A8A8FD0AFF %A8FFA8FFA8FFA8FF7D52527D5252527D5252527D5252527DA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FF5252527D5252527D5252527D5252527D %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FD11FFA8527D527D527D527D527D527D527D7DFD14FFA8527D527D527D %527D527D527D527D7DFD1BFFA8FFA8FD0CFFA8FFA8FFA8FFFF7D527D5252 %527D5252527D525252FFFFFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %FF7D527D5252527D5252527D525252FFFFFFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FD12FFAFFFFF7D527D527D527D527D %527D52FD15FFAFFFA87D527D527D527D527D527D52FD1DFFA8FD0CFFA8FF %A8FFA8FFA8FFA8FFA87DFD0952FFFFFFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA87DFD085259FFFFFFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8A8A8FD18FF7D7D527D7DA8A8FD1DFF7D %7D527D7DA8A8FD1FFFA8FD0CFFA8FFA9FFA8FFA9FFA8FFA9FFFFFFA8FFA8 %FFFFFFA8FFA9FFA8FFA9FFA8FFA9FFA8FFA9FFA8FFA9FFA8FFA9FFA8FFA9 %FFFFFFA8FFA8FFFFFFA8FFA9FFA8FFA9FFA8FFA9FFA8FFA9FFA8FFA9FFA8 %FFA9FFA8FFA9FFA8FFFFA8A8FD62FFA8A8A8FD0AFFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FD60FFA8FFA8FD0C %FFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8 %FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFF %FFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFA8FD62 %FFA8FD0CFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFFFA8A8FD62FFA8FD0CFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFF %FFA8FFFFFFA8FFFFFFAFFFFFFFAFFFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8 %FFFFFFA9FFFFFFAFFFFFFFAFFFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFF %FFA8FFFFFFA8FFFFFFA8FD24FFA8FFFFFFA8FFFFFFA8FD17FFA8FFFFFFA8 %FD19FFA8A8A8FD0AFFA9FFA8FFA9FFA8FFA9FFA8FFA9FFA8FFA9FFA8FFA9 %FFA8FFA852527D527D527D5252527DFFA852A8FFFF7D7DA8FFA8FFFFFF7D %527DFF7DFD04527D5252527D7DFFA8FFA9FFA8FFA9FFA8FFA9FFA8FFA9FF %A8FFA9FFA8FFA8FFA8FD22FF7DA8A8A87D7D7DA87DA8A8FFA87D7DFFFFA8 %52FD05FF7D7D7DFFFFFF7DA87DA8A8A87D7D52A8FD16FFA8FFA8FD0CFFA8 %FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FD06FF7D52FD06FFA852 %A8FFFF7D7DA8FFFFFF7D527DFD0AFFA852A8FFFFA8FFFFFFA8FFFFFFA8FF %FFFFA8FFFFFFA8FD05FFA8FD28FF7D7DA8FD05FFA87D7DFFFFA852FFFFFF %7D527DFD0AFFA8527DFD18FFA8FD0CFFA8FFFFFFA8FFFFFFA8FFFFFFA8FF %FFFFA8FFFFFFA8FFFFFFA8FFFFFFA87D52FD06FFA8527DFFFF7D52A8FF7D %527DFFFFFFA8FFFFFFA8FFFFA8527DA8FFA8FFFFFFA8FFFFFFA8FFFFFFA8 %FFFFFFA8FFFFFFA8FFFFA8A8FD28FF7D7DA8FD05FFA87D7DFFFFA852FF7D %527DFD0BFF7D7DA8FD19FFA8FD0CFFA8FD1CFF7D52FD07FF527DFFFF7D52 %527D5252A8FD09FF7D527DFD1BFFA8FD28FF7D7DA8FD05FFA87D7DFFFFA8 %527DA8FF527DA8FD07FF7D527DFD1BFFA8A8A8FD0CFFA8FFFFFFA8FFFFFF %A8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFF7D52FFFFFFA8FFFFA852A8 %FFFF7D527DFFFFA8527DFD04FFA8FFA85252FFFFFFA8FFFFFFA8FFFFFFA8 %FFFFFFA8FFFFFFA8FFFFFFA8FD05FFA8FFA8FD26FF7D7DA8FD05FFA87D7D %FFFFA852FD04FF7D52A8FD05FF7D52FD1DFFA8FFA8FD27FF7D52FD06FFA8 %52A8FFFF7D52A8FFFFFFA87D52FD04FF7D52A8FD1EFFA8FD28FF7D7DA8FD %05FFA87D7DFFFFA852FD05FFA8527DFFFFA852A8FD1EFFA8FD0CFFA8FFFF %FFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FD04FF7D52FD06FF %A8527DFFFF7D52A8FD05FF7D527DFF5252527D5252527D52527DFFFFFFA8 %FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FD28FFA8A8FD07FFA8A8 %FFFFFF7DFD07FF7DA8FFFD05A87DA8A8A87DFD17FFA8FD64FFA8FD62FFA8 %A8A8FD62FFA8FFA8FD60FFA8FFA8FD62FFA8FD0EFFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FD0CFFA8FFFD57A8FD0EFFA8FFFF %FFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8 %FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFF %FFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FD10FFA8FFFFFFA8 %FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFF %FFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8 %FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FDD4FFFF %%EndData endstream endobj 733 0 obj <>stream -%AI12_CompressedDataxœì½Ùn%É‘ úþ¼ HEFxxl ³öhnI%h™ÑÜÆ @e²ªr”[ç"µúë¯ínáçð0IuWu“f’Æ8¾˜›Ûnÿðÿüæw_m^¾ûÓÝWÝusþávîn?½ûð‹+‚^ýòõëÏ?}@ÐÏ~ûó«ž‚‡6¿œ¾•ÿç݇¯Þ½ýý‰þxÄOÿlóúîϯþßW?¾zûý݇Ÿ_ýìçð·ß¿úôúþúéÕŸÿíÕ§o_¾{q}ûêçúZègû þžnâMÛ\µñítµùü}ûîóÛ—ÐÓöÝ¿þâê«n ï>Mø þï¯~{÷ñžgöï^|~s÷öÓo>¼{q÷ñãîÝëw>þâj÷·Û·W¿ºýþr{õ¿ï^¿~÷׫íëÛv9¾{û ýïw¯ÿr÷éÕ‹[÷§_ßݽ¼{¹~`óËþÛã«×w°on?]͸4›_¶ñÛíçW¯_þúó›?ÝÁ2¥f@p÷-æa0"üÁã·¿|ßÝ}úÓ‚þqyûO[?RûÙ?ÿöîûW´U°ŒÿççÒí‡wïßÜ~øóG~¬o#~óß~÷æýkXnZ®Øþ[ž€ñób¶©¹úªo®†:¤ƒ¼ wyu÷×_\ýúÝÛ;žùæç߽ú7˜K›RÓð¿ü—ß~~}÷áo_árÑkfžû¯Þ½¼{ ÏÛç¯o¿ÿ¨³kó¿üÀïo?|÷ 6ýÝëÏŸÿ&}¬í×·»Ã½ü‚oÞß½ýý»ÿIc„©Œ×Ó4Ç«aLðÃ4^5×Ã0ŒW}Ÿ`~ó ¾,ÆþjÒ÷¶ônv‡é[ƶå7°Qß|xõý«·¿ø*¶Íu×4 üçiâÝü§¯^æÍãÕÄÿÐ[®'÷=ë7OÖâÓ§»·²<€D»_9¤h®õ;ÁáíËÝ»7¸!ñÀ6¼Dyýî{þ›ýL~þ9tóÍ¿|~÷éOé뻫y¸ùþÃí_îàèM7›—¯î>À_>Þl>ÀŸov/î^¾zýúöæpûâ󧻛_L¾»ùF 7°OÜò#·ÔÛÍí‹WW¾{}÷¯7·ùþü-uþB;¿£O†›;þèûè}ôwÿŠŸyåžyeϼ¥îÃÍ;~ö?ûÎ=ûΞ}ÇCùÌ~æG?çGÃÍg{öåí÷@Ðn^Âïîn^Àzß|üt÷á5ÎâãÝ ÄÆ›?}~ýúîÓÍûÛ¸ï¸O¼¹}ûòO¯a•>ÐA…Þ^Þ¼x÷þo€4?|ºƒûòê Á^wýöݧ—wßÝl7ß||}ûñ‡` ÷@›ß¼zû9?¤ÿÿíîíÍ›ÏKpX=§ÿ¿ûðò»;èêÕÛ;üùÍíÇŸ_ã/úÀ-Àåíÿòùî#Nò廿¾½¹ûׯoßЀ]@ù^ÃìSßÁÁ~õv=Œï¾¾{ó.ƒï>åßx%€¿z3ÿøþöÅÝ͆7c#È&ÿnÞ!Ž¼} Cº¹{Cÿ"ÃS§ú ÷I¿e8_¾úË+D[4[óÿm?}÷á–wôðùÃ;)7ýFÝ…›ï^Á„=àÍ7ïá=ï^"‚Ð^çsö§Ûw6@úýôûÏEÂÍÆ¡èÁý¼aÌ8Øà¼4¿dø/=ºþÒú%?ô ?ôëOçý ?ñ~â¾›?ðŸ^âNÁM~ã>ÍñæöÅÄw¸è±Ût øHó‰7?|~ûýí‡Ïo^ß~þçn‰?ß¼¸…υ߈¤öÿãÛß„»$_!Ý·D¦o_¼Ã+ýWßÚÝênÙ¾Éà›üß¿ÿÿ¸# }ÚÍÕï?|¾ûýßÞß…n‡VŽðU;v7°wÿòùö5ü2ܼzû…Os §O}NÖ íÔâ9ƒsþéÕíë—¯¾ûîæñ†îà›÷Þ½üü¨À+èñÒ3è~šo¾ys÷ýíUhçþ=ž™«vonßÃþUF1O7û»×À‘Ä6 ¢Âû·;८bjðá×€ºßþîooþôîõ·7ü1óž—ð[XÒßÀ~àm~ý>óö›×ŸáOÿôáÝç÷¿|ûÝ»ð3æö~sûé`~àX}†aüë _¿úËÀu{ÿó³ýýN.û7ú¿@áÃÈ?ýîó«Ow÷wô»x~¸Ú~øüñ‡«ß¿{÷ÚÆWþɆ)`‚âó?Žwü†>ðö›·¼Òë7ÉË7?ô£{ <}ú ðÇsï»[¸dèf~õ¢ö‚ÊßíMü·¼ ¸·wùóô«þZÒÉ~õñMÆFù Rž¯ï~÷7à(ÞÜßÛþî;Hܲôðö/w¯ß½wƒ4ÜHWÿëöÃûs]ã6Å| '„Îs^ÆwoÞ£Pvõ»nßßÑp?ýp¤'w¿¾}{ûáŠàÖ%’À_ g%Ib˜uÚ#Ù÷¤ï«¯B¼Ú¾u„ñŸøÂeâè¯ïþz¥¿^ýŸ^üpÕþ<œ€£ppµ} Üó µMlº&5=´¡›©™¡mšm³köÍ¡mÚ¶m­oG¸4ævÓnÛ´C{ŒM„?Æ.¦Ø‡8Ä1NqŽ›¸»¸ÿ˜ßÂïÁ7á»’¼‹ß†ï’·A;6G÷Îoì½ðæ/Þã«ååñü[NÌêä[äM¦¸Õ7að–Þs<ÇýqwÜ7Çù8ÇãpìéØ#Œ¨9‡Ãþ°;l›Ã|˜á?¤Cwˆ‡öÐìûÃ~¿ßí·ûÍ~ÞOû1ì‡}¿Oûn÷í¾Ùi6~Ëxþ=a?–ï9ÿ–‡¾GÞxJùMð–tõßn?º5×ãŒRçãã&j?qÑ:×têɦÝä7už´L<À¬wDxDí˜F9¦%APbt†"<ÑWÈ›K­uSÅT=áYNu–éîšmM>T¯qûŒÕÉnÜNWˆÒý_‡JÛ»¶³¶ @¶D¸ÍÔ&j#µ(EoÔéR  D5n0å@Ú± D>˜€( Q"R’+#Œ§èâÀD‡b¢Ë©òDeª8Q¦”L+•Z -½\PæêTŸn¢nª:Ñ˧zÏ®ÜÖÕ®êÕ —Cy =Éí0ö×qLcyEdà½÷ÄR¤ŒíIÎ -~üðloc0Ü$U0Âîå2JîI ×(D‹O²¬:ÅÆ•ŒÇŸŽ]êúnèÆnêænÓm»]·¼:ÂmS—RêÓ¦4§MÚ¦]Ú§ ¶}ק¾ïÇ~êç~Óïú}@„Û¡ÒÐÃ0 ó°¶ÃŽÉ¦g•xÂ0ñ‹«é S¸'âtÓ -6¯õÜŽ@3[úŽ]W™à®6ÉF˜çFf -óLGœ)>ó”z«ðà•ãkmI&à‡¿ñÔ¿ƒmͰڞđ?N`9…r—üNm€yà,FÚ*Û®¿Ó…õwíИ&X­#†k~ñ ¼$ôHGwû°Ûí¶»ÍnÞM»q7ìú]lˆ u4@ÅpQì¶Ûíf;o§í¸¶ý6m»m„SÕu;mÝm¶›ÍfÞL›q3lú°I›nám€ð€íæí¼ñƒ÷Ìîùá×&àï*œMàÄÎL¢: ó ™ä‰ðà…BËðóꟚÀ9¢ŒdÙ¶a/“ÈSXîÃr˽ i„b;ò†ùÿo¹‰ˆ 2xxF:µ;ä iš:pOŒÓŽèòÌS3ê#ù¡ügz „W‚eè`9zX˜h‹µƒE;ŽH¨÷癨°ó£ŸPߨp üïöa;¼¡£?½N@Ô"P" @%ö@-¶@7& !=Вصpÿ€Ê µÙå™âˆ% 7y}ØúP¬R/õ±¡^Fé'eŠDh›uÔ]_í’;•mwPÏH" ½oOdZߙߊïôo,ßêÞWN#ÆwÔzz'½Qvé°9ÂcàZ87îÍ€…[ÀÆ=ìؤ<í_{ÀÛ px¸¼œ>쎀D-œÖ¾G|„S0ÃyØÎïá|Wk,HTÞqê-£{OåMü¢`o*Þ…hÉï»ô]ãÉY¹·íçàçåßv(Îà=Äß‹>ÝB¿¢r]!躀õvÈäÙè.á$l^Þ5:8“pÊK䋸ä%ðÖ+˜ù»€…‡èˆQ¢û7¯$óJ—\Å­ý¯k’W¦\Y¡à$þÈÑ\¾;[£ƒ*ÁTîv%ÒZËlÁ6Ƶ˜,¬³.½°.¼^›’ûÊ«„w)°ËÙ’¶¢È‚q¡…æ£\‰-­ËÿÄ<Û:0Û– g”uƒEmt%”ƒÃ5À¯´XÆZÁ†p‡X¸@«0Ò*(#º¯‰Úk±KäJ'i•RÖJœ YÄr– -Î^˜ôV)9²s€#¯7zæ«ò•¾»çJç Ýñ%¡Æ]­…ÔSk±^¹¢G ‰3œ9óz\¶"Æ£§PX®‰r›Ç*¯v‚[ ²,×yÉZœÂŒ“¸Q®EU×pÏjx…¬G ûÆó|KÆÕqß‚#žw]­GpœŸ­Gq¡lŒý"Œh`"¢ TÎÑþÌtBSÿØàIòÈò±†™y8ø°xˆS=¬èë;Ãzà Š×ßñ¨<ÿEÅÊCËÇ2Ë\’r-‰åÈÜq¦oÊL«gr„±‚gr \ò¹ü–”9£ç‹˜x]•ïí‰gS&â\gÂeo÷„]ÈÁ“Û§À¼B²OöÁûÄ c1Vœr•OF 0„}DDZ®Tæ ÷YÓ!¤ÿbDg7û!Ž©oñ‡46ý|¯¦ñjn¯û±Ëê£'ëqûƇ¶~VŸl¤tvK}3Oås¯ÐgñºëÛî*Íש›bÝõGcƒ;r¨‹üóè”7ÁÜzüaNmKnz¼ uk]wÝ&ø¬ë ú¢1uÁ•¥Y%úgŒ‹- N³49‚DÀ‰1À®n‡n`Ólò ûº§C›àŒNp÷@e[Ò{ÄfËLDÿ2G¢›pÂb³4\l® Îб°ØÔ 60õ `ŒO€ýNBçâ'¯À ®Ôh€eKp®"œ¯ÎÚÎÜNßÎÈË +Ëœ`±#,yÔøË¿ƒMØÀVLðç¶% ]€Sß‚èy„ÝÚÞmaçfØ¿v±_h÷÷ ý~¿Ðð“Ž?¬ô¢ž?¡œ)æßÇ)ìq;¹mBÝòöeûˆÛ.ÚÇ‹v‘71<É.î³½#\¾‡j\ù/²—ËÝ žÊ‹w3<Ñ™´Ý 9‘¼›…cí¿òô®¿ùüáý뻫ßàöµwJ9ñ`»Šì¤Zv-Ý&Œã^¸Év¢wXï¾1‘J…ªÌ¯õƯM¦mÏ[æÙúì.„iËl[ë8pµ¶¾ü[<óRó5Î…gA×7ýÎ{q§ìN²ŸuוÒèäøÎà¤Å%ë©Œçá„°æ)­µï’*M2Ò™&c‘JŸÍN¾—Í»±&qsì7gïêÝËß²5l”ÍUaIZNóµV2©„RI¥˸ò<É$sÁÌç€Ws€Xšêªp%£@HÃÊ "SÓLO³á$“T"ªµ›àËîw¬œ°{„Ó>5—Üy’³ƒ¨ D§;.¬b÷š€BaõÈ›\Ú=Ô6–­c¥ñ#ïydÛ³M(»¿äíŸÈè®( H€+X8|דLFçYEÉ=‰“’?X˜ÄÞ±8Iç|yRC(4AÊŽÊAÄÉ™äò¥’À«X~܈và(z A6’ Áj V°Èrÿ(’>ër¤»aW‹D® 3¹&àÒ [BÈ/!‘‘(û$ìiâÐʲ±è<ü„Ýù(³„¼%Ž@¥ãH²1PN§õ ‘8˜4‰ç@ùw"ÜÛ¢ ‹ISÒ M¤´@ >ˆ „>èi1‘¸´ <› -N„]+xìXÁNè¿þlêèÈÐá݉ÐÀÑ¢éˆFh2BsÑÁÛ³íkÙh¿©ÿ›ší·Ù… ¸À`Z–lMÇŸ÷öóN¼§¶â×™ƒnô{φ*rEoƒóI÷߉Xì¡ž=Õ—®g•ß£b]¨Ð#•ävâôÓR@´´¸j먈ìf̾™#ÛÒªˆþδhå"Â=âDš»Hä¸%{ᑈò4?;"Í[êbfˆFD§i’¢ãÜ™wGîùw’Ç„…ˆÂ%¢6‘XÈÊqóÌÏ+Gï%mæ땳gÞ^¹{åï™Ã?KÞÊç+§O¼>­Š <’R,^‡¿­?‰BrˆI"0ö@CWq$ $Ýbà;Rúe±¤3½dD4© '÷ˆ'kqå“p^@¡Ua–|§~’GáQtËïÍÃù6à«û&Þü‘FõF%@¼99ÐÕ°3ffcÈ™³Ž”„’Áp2cät!ÛbO=B²¦‡ö4T75oëBPó¾ã :Qpú¶kª1.ÁŒ³ÝQ6ü~èÑâL¶È†×a7ãu7·ÝU×_Ͻ3>Q4¶©Å¿bR–ë–ŸƒÞ¨_´‚§¶úšSñlä#£2P¦TF_›ŸÍÏæÀgsàBÒ³9ð?Ï^þ—3ž3÷Ýg*¼\bº{Y P¯A¡ÿA¥&ÂU Öã)ò$yš9PP'›§»˜0î @,‚8; ãôN騶4 -àòDøzH‡.Dã?p,Ù,"!4‡`'3k‹í–{—ƒà .v"™¡/Û—My+Ñ9Éh"YßÕü®R’áÿ1´Ð€ïÏ!‰uI{6ýÉ¡Èbab«"ï¿oî‰àçµÎ»¶Ü×å¾/ñBð…»Ñ%÷[Qn’ß>¿±²ÙE„SÎç£ñ‹[ËÞ´s?iüëÎ2í-ñÏAý,šc•n\ðg+ÁúS´ôËsŠÙÓÚpt‘_:ÆóI -•\þTûyŽçŸtÙU\Ï¿•£ŸC±'Æòw×ô”Øïaq|ÖGh}ζ ÿQ°{ÎE²R÷9Íê ¶b÷e¹.’d7Þ¢èLã3‘ 5lþlI˃*€Yl¹{±z²ÍsEÎŽäùc 5{KJ›Þ5J»B»Õô9åVÚ GÒh7Ro -1bÏÍQæg^Fš+%Ÿ]`;Ss¥ç Š0´ÙeXà 4 -Ó04‰¾Ëñwy L…Sí(ÂϤ=öÚ6zQÕ9å âêžLû¤º§ÞôO3ZQ(Š1h•¶g\ë¡œ&ª'.–qÊi¢X§DaÀ*ʼnÔ¨{:’î©%¼ê³6¤qÚ—ÍØ…¼w/ê%T.ÁA¯Hz¤QÌêˆ`jTg• ãÖ†ˆô^”ºáÖ Jñ Ã:™Ö‘ú³ÀL,úÉ´Þ’i½'¿ ôÏØ’×ââ^](ì Ê€ðé§ð¯¸Ë(ár!n°¾Qá 6üßO9õïÜáI u¨*Éj-'7Xf»+œÂBÓ/ÚP´ñž6-[Xƒäæ-ÛædÛ–-ÈÄô7æf¤ñ÷‹³Þ›ãÑÎÜ4îz#Ñ×Ú&nAÜ’FsNÄEI[²ÖY‹Öü]H¼A0o&myhþkgmëÚƵ™['¨ÜF××ú¢¥¢u¹±ó”o%KÕ”-çß“vX´}ØíW­öµ=Ù6e ò1¤_’NêŒî#˜òã”úc­ÌÚ¬´’NÈ$pJ5é!Y’•!k'„}•HVŠ¨Z„#ªQå«GXAÂ*U’ˆ[B0í%kK¶¦Q`}BN;TjX}²§+“µ -ºJ§ ª…œ‹(×Iðm˜YGÏ¡+«rÜ$òoø9ùã¾,b•mæÒPj½îÛxÓc:/R}…Bûå·þœÿÉzóUFLÁÚmF·Ÿµbª#ÍX¬c ëȆ@q€•e¦Â^ A©VR4(!ˆv©‚ ÔC‡$üx4¤pl{É®ÎÎßfe»Àqë|‡Ý‰¶þ«]™¡âZ½v°®_¢ƒË‡Ñûë¸ïέ޻|ó®ÿT»{+¯×ºÏ¯zýzŸßœäd¿ðävúîàÞ÷'¬i¼™¸”.ìÿ”?»9)ÅçƒÏÔ¾¯:>ñxÚù¬GÓoÃW‹û#1]ǓͧÏ5ži:Ïvšù$«ûža&ßâA6ÓÙÍçVϬžW=«ƒS:¢|@y&Zê–÷ »¡íáð¶ÂOì` q{X=\»¬Û†Ö¬—Õ:­¤… -°N‘H䞈ã„1ÁÉ“V©!¯ RÁ†èûáMD÷º©%r‡¤E’)¥KB㔾1uãk¯´lxC‚6‘H„ˤ¬!Á‰%˜†¿Ôò“¦_ôü¥gàSù+Ñb‚ÿ布û:¼dâgÛYf˜ í^Â<4û¢?륪4gêܟаÃÁt²#I­>`2+CñLû”æBE™ñ ±S[”³v‚“yÚÍ¢eÇY ™"M(«Ùw^dÇUÝ"gÌÒ¼%e(y¹Ê9õTrA#é€ú#:ˆ¹T#¨¶Tîd7­(ÝÙ|ªj÷M‘SöP$b³ nš·x\e[*á÷zÛõÙ:u¼©äƒTè%{¡jèÇBO¯mãÚ¶h®PÁÎéò5´ûÂ9/ûvÎ{´ôÞ:ËÓÒ‰4 Už¹Ý³Å4óŒ°.hY®'—å=þ&â9‡]¦wøÖ+ª!ß?ö ×Ø_AgAéÈV£ !‚£ù—î…;h³; ¡Éz$®‚°þ-)1Ý#LàÅ„Ásâ7ÊÁ@ZþY‚çö¨Õ°x@uú¹wbGŠ¤ëgCPƒ²Ñ @º|PÏҙƟñµp;©#] kþ;Q/â´P¹Á(VVdâ[u“#a²f"œ(æsÍʆ2Ê*ªöQ3šN¹i¼ñXií¯·°¤‹[WoaŠhíº…ÐÚƒì/eø-’<@þ¹Dhzˆœ¶;+Öq͇Ô>¨å^]¨-Ã:ïêêꥳžs× ¤·¼Dsé•ÖÙm/;î‰ê28ÝåRq½Œž+µ—¥òZÝù$Šn­¿ô -lýk̬Ä6fXè0sû¥ó¬3«1ÃJ“9›&s©Ú®é2M“©jî°pš(L²Ñ\°-ç‚¥°swŸò`Ó çÛlë{éÀb"GZ£Éqád÷ƒ$Çâuˆåí>¢ÉE«ÉpõÃò('•Í“¶FúÓ¶B?Ý|wÕ¥ë©k‹l´OÓ!îËv< ×}Û°ã×Øâ£1hÙC[á1Ú\mÂÅ® d¥t·’ WrÃ<Çk˜.¬ÎØÎn`OÐÙ£ê[¶µú–í³ÏwåëÙçû´ÅS¾ž}¾Ÿ}¾Ÿ}¾Ÿ}¾Ÿ}¾Ÿ}¾Ÿ}¾Ÿ}¾Ÿ}¾øõ£éð"sàyCß³Ï÷³Ï÷³Ï÷³Ï÷³Ï÷³Ï÷³Ï÷êr|öù~öù~öù~öù~öù~öù~öù~öù~öù~öùþ"̳Ï÷³Ï÷³Ï÷³Ï÷³Ï÷³Ï÷³Ï÷%_Ï>ßÏ>ßÏ>ßÏ>ßÏ>ßÏ>ßÏ>ßÏ>ßÿÕ|¾Û®êõ `_!Iô)J9Jû›Þ[“»·†ŠI¶odLq.NÉÙ£R -ûvYÂFsMd1-ŠKcÃl£º,³_»lhÄ\K–ÕHª’amîÁ'¿§*\‹ìÞpÊFbXp[ÙEµd²ò˜¯?oV7€!È…×f]rÌDéå&™îÙX£†5Õ $ñDšÎžœ:x"‰-hl®¡)Ðø[1q9—N!²‰‹¦°×H™„ófÀIh!64sµ¨Î 0‘½LdÌÔ¤'¸% ]Ь -Ì7ｺ«»ý7¯Ù8¯ÏE1L³xÓNÖÔˆ§´ƒg¾äTES"5Ž)»MßšÕ9Y¡“U:¤Ô1N¡ÕQŸxUì°?¥ªv¶¦ÚÙ›j§1ÕŽ(wJ·Êà”:¦ÎY(rØ«„bvn½Dåžï5s„JÅ+ïÿº4qœ6pˆŽ=ö S±»zfδ¡Q¬Êñ&Ó%¡ütý„mÊæìgíç}ª@Tiið¶†](Öà”µAV¢dÎZ¾|ñêƒ%Ò]ƒ7$^?\}.hbñ>Ç;ff'õ(ž¦3.fq”yJTÈXnAe±ô£iF&‚?ZÖ¾øÂy¦úšj%³î]IÍÚdíÇQq‚ …CEÍUqçBŽ¢ól¤ o³psäÐ µõ0òâ"]|ÈŠó¾WATCRø>褗{)Ö;PÙ«AOFáXö˜]ÛMÔ‚žÛVþÝʿ˶sm/GZ^F¹§ðÂ}ðN½¹4¤/H;ñ‰#ÖR˜Mf:™ E–´CGæO#éb™G™c] F§äµɳþÊøoÙ`rBÒ­Ov€ÛIÚr5UÇ jš¹8Œ‹4!ƒqg9rtØìlEòxKv~ØÄÝ@¦ñèM÷êàÄóbÎi¦æ¤§L…¯1Î&ÙRÏÜdöF™Óu¬s9æ7ˆÕafG#€r¸gŽüËŒmõ¤ÑšÇG"ïû 4|GA1º÷f ÄÅ.hµcƒŒ -e¸ŸñBžªñCGß—C<á]a™1ªˆîÔŒQjIôq|EPgé æáR‰è¤51‡ ¥ŸFiÍ>A9ª±ŒkTOyí©á}5á©W.BK?µ—Æ´ð›kp¾3¾Ò×ÂSP­ -åyŸæ&¶ñžtúøCÓǸ2<¦¶ª³ÙûzP7‚AzôiB^ÑŽ­÷ä=/œ¯º½¼Åÿiúc¿}̼&¶ ÀÕlß³Cº^ÈŸZæšÙd¾NÀd9/’'ëòqlwW7^tãEë”àªWE8«ÂkœÝ,šÒ"l*\7µ°%–ÊøÆ)uõ¶lL^=ïºmáó # Å0U©»w¶ pOÇŠF¼¼‹Ûâ6ÖD:²Þ¾{1An¤ú=çlPy9õ›5rì¶~°$O­ú?^}Sx•†‡+oJuD9’b,g•‹<,œ]ËK¼™Œ-#§Åóqã¨%£êÓ+úèá 'Œ™,GozCfßç%²7 áæñb~ö Bç ¤M6gŽI(Z¤bSÚ•=ô±ý<Ž²Ìõl’s™OR2 0Ç‘ý&ë &²¯¤²véÂvÒUœ&«`V*4a-zIHÙZŠÄpìw4¢ÝGÝŽÐåȧ£Ôüˆ½&¥T?BDç>\úsrNå´­Ò¹I8ƒœ#2#@cß Öáëxø>Çc™å1çy̹[N§“ÑìšóÂmJ]cÊŒŽ–':†'´“à–‰ÈøHSÒ­ˆÏbƒgùf‹…ŽômqÐâ!Æ|Ý2¥z5~b>qhž”O_é'†ÄT"''òMÞ”"gA¹Œ_Wñ«$e—ÉÒ>}*4oü:>É›ä7tn•«ÌñzÑ¢ôÆl‹׶ŽÎ/ùÌBÚÜfžôœž‚È´é)º"v|4^uJiµ_:å”:!ÎƉç^³7F43£c‘JÐ1ÐÆBçøXŠ‘ ¢€Ù–îjâf’7–&÷4œå½¦¹ä0ÏjbBUÃ榥2f|ˆÍì>k§M*ú¥5Ó\²Ížq®§‘š‚h˜Ôüéãf–;c| !ÐïT¨ùiUgb.‚4±`¡f¥ò,O-+ÐvžôY¦¬ºÞ¬4š™cmîF¶R¹Ÿ7žW—yUÙS£i"™l,ô¦Bo(,ͼK ¡ÚWÜi2èžäÝ@O*Œi¨r¦¶<‹rë“Whïb¦ÆŠJñˆù.r¸Ô ÐÊÀzÎÄ:[¸36r—,®j$'YÖ0)uöŽÉ×…¬åA×u™Ð•ƒ UÎØÌi9ú¬4ª•ágåtIË4mû°XÔ¼¬_¶°›Ë¶÷È Ñ)/¬<ÖbGgN¦eFÿíå CÆá²ÜÄòÒƒä!’tDƒã¡©Hä7{qfÂb0˃£ÉÑÖÉî—Ñ»p=ðëïß!ëÅëÉmê©m.ð·'ò Ýão¿J$d™lBÅ&úð -N< ö8½GÞ -U¹äi—ujÂÓ.ëfÊ…~b û¥‹z":$<í²W¶Îyõ˜eÝ7áâe}ÄÂ×EÑÓË6m”¦_dz3$3lšÜ±3¹¤Ã±„V ™å"1lšT¬—õåΫ¬+MkÍë4Ó¡ƒÏ8lÍeNv¿i†ŸðU ¢åAIìΓñe¢»Z“Ÿ³Ó<&A?þ´¹&ù <*ˤFÃ*mvm³j¤¿vÖnŠÇ€ì2 ¿ž3º$rðfoÎ[4›’º|£êØ".&%ÙŒ8ö® W~¹’šk°ùXÁï9¿ô?—P¯Œ“@!öÀérH!ÁüW% é"%‹:kÊêpeœ}b#ÜÙL;?Ë ¹(ŒIólZÁ¥U’)çlAÙ4n¬´²ÊÌr~ðyè2ì ãvœå2¹AmÈã‚_7OÍýÌ’f•2xo¦ÎZ9™<…<|zðc—N -;Ÿù£ÌZÌŽfÊ -?Z6P±áA¬ßIËåÑ)ϲêLc94¡ÓªLkËBŽä–!WüÀ›í‹y0!HçTÙ9ú¶ƒË•ób9µb¨:êUÔŠ«XµÐIX¥P w©‰Ö²aV¹`ËF wÙ*,°Âù*–6mY‡‰˜¬Âù¬ ~ *±²è}¸¬íQ¬Ã™¬ ¼Ì¹ÐÑ` B ÒO=Àæ| ÌÚëMö3xUrÛüHÂî)ž6èaCéëû£X…{Ã?Â…œY‰P\´ -]‡u(ÅãÂ`ºP+mö€•X­E(|À{ï±Ð^5‡¥”¼Зªï¯1~àjê®á^ryMj„Oa?©¿»ë¦ëFß»ƒ²¿±ë¯çÞe™)ÁôdÐØ\OèÕv×°¯.¼¡öG‡÷Å°ßåók±ð¤*B‘Ÿ =m‡{ô3XUd¹¨Nµ`?žÌ.XMÞÛVê©u8«_iÑz××Fk™I­mƒxgj<@@í¸ -ð!•`€à#Èct&Ï•­Üåù6o¤ä^³©çqØxŠ²ñ6¨•¯w¹à[š]¢¾—ìãyv,ó’lÈYÀûœ"¸wYl9-Ëõ,ÁïE\"¢’ãÓÂVÈ;_ƒ«;þ$J–{LX¿FÑ °þêÄã}Õ‚¸Á/[£«è¼@å ¸<Ädu2®#q‰Â’Åp‰¹%ÚNuÙšQ—*%òFEÞ`Fÿ‘L›lø¤m)/­"mNh —w¢×8j>“ ª˜É2Óî)%§]îEÑ‚:–ƒhì¢ ØÚæ`-ÔÑ—µà`áêš±`Gú8ÖÆõ¹ò,é5;J1˪·=)Ý"çDf]ëÙPdžÐ3sÚ§—Q{L‡ëLÛ®ÃÓ¹Ú/kEþö{Z<ƒc©ý¥a,&tßïQüqåß &} õŸ²ÉGR‡Ùÿbþ fªe‰ÊY}ðÄ'~Š¶$YøS—/Ÿ;|îðÁ¶\(îa‰ŸïmOÛá¾^ñ’vò+ØO—R,rZø6qàêT$ºÈÍ™?,ñEN~‘`ä$ØÚ`)5(üXMˆ±·óyÉ’ÛÒ,Þfì¾46ƃ{2‘x.Y¦Øe/û4²_Éì渥>i›!§· È(h.Oë`Á¹,Õù)hœ eÞ¾ÏÅçP¸øä¨Aqò §(0ÖŸÞú/jé°Šká -žFÅZ–-TÐs‰¢§Ñ´‚ªA±µDÕ"ë&#kPluÈšQµ« ê±@U¨„ªôLK4-=óXï”}ó–HÚyÿ¼`(ZCÐEEÓUAÓŠ^8}$2­GvŒZúé±GTÊxv‡bg(uÑIQsò?iû»uxZ)sY³j¡(-\¶æt«b!Ú°*œ°üZ^DÛ¢­J©P\/M¼.K¼.F¼¨?%‡ÝUj·bIx2ÍX'jJ[^fiʇü`Îz°õHOæ:›O²œâ°ºo–Øîwv¥úlQÈAjÐ E÷ÉöáØ.’‡Žš/[h0]vOQe“&Ú5ÖW’WÇ«©½î»©¿jûë$4—‚æ‰:$m°…µÍÖf¹¿ËÿIïÒˆqÊ=罉W}{¢hB÷4Ý=N«ÜTÕÊM™GÑUÏž¤LóiÜ -—®ê²a‚÷Û°ˆzS²'ïʃ¹p4–î3Z–ˆÎR}Á‚14iÄsOJÒùXñq -ƒTµ,x4IzPq^Ô–œU;[q‘›†ŒÞAÜxŽÉrað”òDœƒ†ó)!wœÒÉaéŸáKOpŽ*aÔO,éêÎ÷’ €/2¹ÆÄWÃïà#M§ºðöè¼ÛJÈ#;ö0ï–ÜÈ·°>#{Ž/‹-‹ùŠCõt}V«‰6ÁrM.¼v°ä|9ÄÖÙ.Âl-P¢–G£îÉÅ,´FÀ%Jy.RÖ’æ)å •¹u20•úDÎO£œ„M-†a=¹}ôÖaÕâÌ_)Ã©Õ ÅWÎÕ„Œ–JgX”å,œƒóSÌžŠÓ‰ÀÆœ:g寨Qá~Eï¦óc2ü:\˜¾ÔÎvÒÚŠ_Oš+*ªácþÉ,r@ BÕ€Q7cÔ  ÓF8k°[›íJÓÝÒì1qXÛ\´µlÌÓH¾…1o‘å‹ŒzáL²¯uŠ¯±0ðÍ䪣F>nû­}æ¿Ã<êÏ”¤Ôl/±ïêZ·qö“½x9A“¢CV³2RÝÊä¼|F©õÇΤê4ŠŽÁØ£x‡?:ÛܲUûÒv¦˜]8cuævjj„*:ŸFܾzlÝúo…²Z j›%^úlsœ.a‹Å)5•ÖA²3Ó—‡ÝKUI%"ë³% ¤lÂÄD1æ±õy0gæ­¤šfû3{'wâ•Ìå fòûd´”B´4I<Ì'±BïÅ¿µ|äê$®WžÚ¢;JF=I2j¸ÚB‘@OïÕí~™‘œ/°2$¤z’roš`ŽöÙÉ^]ìÕÁžãÔÙ·þp<óõ£3®nµ–náC»9ùd¨>pz¬>«“)¯½ ËßëÕaªµb~º–Ÿf‡lbÅ}íáÂã¸û=%§’ ÏVÊçŸ;ü÷ép;ô0•>I‡ Ýõ—Ú^OZbÃ‹-gçìd²©ö;Ük!+mdk;Y*8â.¶]l¾¦m‘éÛ‡÷I´½a‡µí¼͛Җ¶_³ÿšM-Õ¶–ÐK»sÖ`gds†6oÞÛoMgïÌnlxEÏ*|Vâ'‘¢™á²Åø(Á÷¢Ø7ËñÎ^[µßÞg¯}°7œEÕš³Á=öÜpQ·[àiGKü ä,Í»g¼ - ¯³ñ† ç}¼µhaë '½Jƒï¿„Ò-!˜Ù·LB/¡)UÓ¯7þ®*;œ7_RÙ¡¬ëƒËŒ¡y1–É9gÃD-–BpCé&0ÙDlÛŸ–Ѹ޾@ÎY”ïmsr¸À¶œ+÷œ7/“>œµ1—Vf±3[«šCakÎÖæsöf³8[ -593+Rr¥ËKyWmϹDPpD)£Ã ôfAsJjÓq™—xÆïiëJ½×¨K,H‹~?Ÿ]]IZK‹¾_ø’¸2ð‹L×VZ9¡‘6•U–g5áRUÊ Œb‘âúK>Íe[iàÒu“Òütsí㧸tyë+¾˜mÛjfjæØëžLݧìåOÑÙ£¬åÕjÖæœ]K¬\‰ü‹ÂõÊ~EM¿àÒí­+àú€Þ¢úmÌ«¡¼ÂH½¿ªyËŠ ¼îS\¥¬çr:eî½Øì9f9úŒ§r/ƒ·}fÈÊ$iŸ7V¯P¸yðeÙÅÍ*%bkH2?|—èïZ®"®±çËÍñ™—¥{µŒ«¸È).ƒësäµm×OQeT -ÝÍ[c=Ñ[ è= HûÅÝêa¬¡ÇêqòðêÜÂn‘:ü•ÍªÓ2E@.>ç/“Kžš@¹åthY¯çb\¦˜Ô›½^ÁÄ%Í,#Íó†8óü"Ú"6çŠi‹Äy¹;%UÓGj)à$ëšÁ*SD-ò1+½LtTyd™ ©È…䧶Êoµ$yYˆ]»N\âÆE:®”¾N´wª½¾Ú%w*;3ÚîX–o~Ÿ¯Áâ3ŒSî<÷Æò­î}å4‚¥Óãô>.w¢fÑþ’ÄW«´WÙN;‘Ð +ï¸$½VåMü¢`oZ¥Øâ÷]ú®J2/yWáü¼ÊÈmP$‰æð[ŠŠ+ Î? ÅV”ïí¹Ú¦+¶©å6™½ÝvÙŸŸ™\­$™“f¦73Ξ/6£(+r*gh©=†°\ Œ”6ÍuÔºdk ©H–ƦÇÊjÓx5·×ýè?ž¬G® §%è}²‘þQ=gqù)vÔ^w}Û]¥e‰¶'ê5€¨€k½æËUbšTQ6Í©m§\ Ž*1uÝu›_±ùñ}јºàÊF-‘s‰¼AËøú¶‘‹æqu¨ñ:aÕ:Óô…cZTÄÒ5ò„ý©²YöÐã°`¸nG‚4MìÚ Š°^'*_øoÒš€½Ê÷’ÇóØž¥\­ Le ’2œ9Gq¡üS™ã¸¨†Ò¹Ü±SpcUÛÄ\ EÕ~“ñŒYÚðå]Lé|Éå¤úÙAt—[¯¹4-iiË:„Ë<’£c–OÕºVU¬ÓeI/ÚÝ“þ¶®aVÑÉå-Ëò”9#5sæÁåÌôù³÷Ãá”`Ñ6Ë‚‡šÅ m!p©˜s¶™ÎÉ`I ëì3½kÉ*'ök©­w,Ë2ÝX”\¤ß|Íÿ§5 fŒ+ýiÖ .txÁT©©ñÖ5Uj «ªVʼ¬“tIýÏzIÒèÕR~YªG§˜ 'uÃ_–â‚Y‘ê±^ûñtõÇt‰ Vq]§ê?æ½öic•‡5¬¢º²7oÿdÜÞ,·d´-Ô–“e‡›]ž­}饿pÒ× áœÂ{L$'zG‰…‡ÂOçækºó2cþf‘1HP_}MåÎai’¦•Ý¹*„¡‘Ÿ”F ¡‚m‡}ÉËH»Æ¥î³fÍJéq~uKônIÞyBœ ]3ºÏz°Óè–,9Iv{N)¶Å<™šµ>’å™óŠm4³å¤oÝ„8¹Ø~‘^LŒmQ@åà -N„„< V²jp¦ò{aØ;yÀŒ:ŠĢ ->«°ƒ,Á "æö›êµf®þ4Ûo³]Ö¹8-ÜlÁtA¾Ví†BG³¦lgº"W„×¾÷,nQÁ6Ð-Ùˆ"-'bøæôßãJ!¹qº%ø\ .jÙ´N"u9ù'–¹š…ÿL.ä¥تW~x0T°êt¹R¤øV»•×FÍ!Ìr€¢Ñ¥ïF,ŠÚïWÉj²S˜w “RJÁ•¥*}Ã|ÞšxA¾{q «ZJê-Fþbn«Ç|v>© ßW‚j|I­`™ï§¢ªV·ø2ã}áÛæ½Û™òO®TáäÖ¹rõ« -Pále-^•jr%ïk›Ý‹ 5q%ªe¥)]‰êHé\‰vFN'²-öÔ#dNO3„ê¦æm=[ùùzœ±óéòÏúKç*RR çÎI (Q³—MsÝ«×ÑÈž¡›ñº›Ûn•8ù‰ú£±MTOšœ|rei­5Ý%tE¢?¡R@Ý¥úSCOÑÙã„Ú¾*ÕöEj:j@e*>"Ùx«%›RÇÒ"ÌÆÔP¯L¶ª’ÆzÅA5³k]ö|=¤C§6ÿKfòEIÏ‘ÌÙd~ÂX^[ì¢\Qí/8}öºÜúÖ{[îÑÇV-+ÌÆáËJk±>:YëmX´qѦU“2>¹mm»hæÿÎc©=V„r´û¢y§à£o¼ ÁåÉ­üòAÜ:]äžèΘ­KU’¯|±Þ/>ßãUÅkwm¹¯Ë}_â…à w£Kî·¢Ü$¿}~ce³ «Ólú?µ)oEŠPŸ¡)¡¾DâòíÒi‚£c°ìF٠ߊAz™ïh}R1{Z¶øø¥c<Ÿ$P‰ÀåOµŸÉcfë'cùŽ,á5\Ï¿•£ŸÃÊ[¾r0–¿»¦§Ä~‹ã³>Bëƒt¶ù²hï¬KX­fãkú°vÒûÀ¢nRJ uVIëšíE˜o%‘ÀHº‰±è>3ø(¹s¤Š_ ¦±•2~š"Gi÷Ah· -òcQFŽdQB~àØ7ÖNdÏõý)½”’ÏÎÙˆ©¹Òs±Ð…Â48;¯·Ä7ðVf=ºXD³MT‹Ì«eZ ^²õPSsøc¯m£U§éìر‹Ë‚åªÛî­:'´GÏJ€±t¥×µœ®»')ÈWÕ"ÇjÖxr®Ö¢‘e¬@EØQ’ÏwRCop¥ÿ†]Èý÷eŠŠ è¥*XI„¦*"ÎOÁ¸µ!"½ÇÜê·JQa/R‘¢(Q2zTÍÄ ÆëHŠ¢–E=iQÛ¸%$âBCéé#é+eæÃ_ð¯GJTßv n°¶ßƨðþ÷R|ü‡wxRßΪ^J5L™¶â„‰#4ý¢ Eïi«Â‡¡R q®´Íɶ-[ÿˆéo\J4Íñ¦¾/{—íM•éê ³±|i³eM›;§ƒ•ftÕ;{kÉZ-$m7VbõH°zèW%è+œI.z*ä« ûò¡_f -ˆ•(°E,Ø""Ì"Öçµó‡…„×S'3Cú%.þgL9Ál9§ -w­Kw¹zUë,Áa•&Ø' -v©‚]ëJ©NS©YíË5ªj5V¬©¿¸ªÖX¹Æ굲ĺ(ÙÝaÚüÔj™EÛ–KÙ¯5 -¬zÛÓ•ÉZ… ]¥SÕBöOÄuE|[ÇfÖÑsèÊǪ7‰¼À~Nþ¸/²£²í!gž-Œx÷mü®(Tæ -Ø…“¢ÏiS×›¯úÔªJ`Ý~Öªª^•4«°v•õ«¬aa@ÆŽ"P$Ø- T+)ˆD»TÁjŠƒ¡C~<R8¶¿=ŠdWHgço³²]`†ø²Rë¿fêmy®/ÑÁù(ö¾Ãúî»s«÷.ß¼ë?ÕîÞJãëµnÁV¶·`ûê„¥_‚3àupWÍ€Ï4À¹Ù²6?VÚ+ÅçƒÏÔ^sÄó‰ÇÓÎg=ZZJÀGœµëL×ñdç²x¦é<Ûi擬Æ<ÃL¾Å2ÓÙÍçVϬžW=«ƒS:¢|@y&Zê–÷ »¡íáð¶ÂOì` q{X=\»¬Û†Ö¬—Õ:­¤… -°N‘H䞈ã„1ÁÉ“V©!¯ RÁ†è[•&¢{ÝÔ¹ÛQ>áÍ8quê$4NéS7¾ÖøJËY M$åDø WóÂE f*mDd'Qi'Ò ¦ÁBŠ”h1Áâœù[´éU´“œ"±êD]ëÔãD•È-ö!ywª‘ÿe —<´jg¾Â¹?^ôu,[XÛ‚h¾¨±D¿VXžòS;*\xªW߸‰>SáxWÔyv•žQ€ÕÙ'Kd[ÑõË–=Y‚¹²àýœDm4‰7ËVUG¤7Ò$Ëý"Á²K¯Œ…l£3dÀ2½²W&õd vlm=»è-»ù+¢«j~Ž/¼s"2Åœ¯M~ÙÒóâoÕ‰H×>ØÒûÅß‹ß‹?.²[óâ›ñ%˜ýe¾wjù5Œo.ؤS,È)æä´—£ãj–ìÎ}é0O³PÆw•¬Ùe¾#5H¡ñ¸¤‹l«¹;ÕákdÖ>¸ƒû:¼dâgÛYf˜ í^œ–4"ΟõRUš£'÷'4ìp°ì(…e³ûoV†¶”?:«ØÍ!2ãA<·(g犱|~U;¥³Ë¹zÉP*ÆnôÀºãªÉègŒœß’2ô@êP>§žJ.h$PD1—ª?à6ÊÝç¢÷Jw6ŸªÚ}SÄùŠà‹ªÑXòq™³TÂïõ:·ë³uêxSÉ+Ÿ0X­©ž^ÛƵmÑLä‡j2$ÖК£½ØÈ¢ù×uE¸ædþé[gybR¾úS0Çûy‘oãPIÂë\ðåzr™7áo"ž“qØe߀o½¢™“d¨VOvAgAéÈV£ ¯êìºå;ŠôûŒÙ8„ŽV]ö€²E²õ„Ú\]]AIBk…#¤Ä,»‚îQ«aÞ­ƒ\F³ ÷NìH‘týéúA ˜©J²¸¸Òåƒz–Î4þŒ×¨…Û±ƒ(éYó߉zq ²´˜§z£„øÅVÅäH˜¬Ñayn({õŽüHoeUûŒ¨M§Ü–¥A|.h}½… ]ܺz +йÔðËÖ®[¨­=˜ÁþR†ÿÑ"ÉäŸK„¦åG=+Öiº¼ËóÑÔâajË°Ž…½@]½Œ=pÑÁ¥%;¯¹ôJëΔÖG«¼(ªËàt—KÅõÒ´Ô^–ÊkÍw(>¡ký¥W`³è_Ó`f%¶©0ÃB‡™3‹,µ˜gõ˜YVšÌÙ4™KÕvM—išLUs‡…ÓDᙢ¹cê˜õE¸µkBŲÀ®U\‹7‡¬ð+˜Ad^•bk†í ÃfŸð®0Œ¬L#KãH Ërñ©¥«4ãYœž\Pmil*ɺòŒkŠm[mAÐ-[MœÎ¼Šqkœ+°.HE¼Œzùö’ ukø§èõ邇Á)Ö=J.|É(Ç fß›çˆa­˜sôᚶã_áöoW1^£à\ºÆ>A_ä¯ÙÓ·e'[ŒŸ¼Óo£ñ¹-ÇçRXîÜ]GÀ§<˜ÇtÂ1Ѐm}/˜‡ï¨Sk4`Nv?HÀò¯;@,üüˆN$>X”õÃò(ôŠ»ñˆ´‘~ÀPZ觛¯ᮺt=um!ü4òè¾lÇÓpÝ·í;~=Œ)>ƒ–ýñØØQ£M¸ò1- æ¤ñÉó¯aº°:cë2X>EgòúîÛš×7@aQ½¾nŽçÚÉD¶^Ê"Hr´[ù©JõÄ^"—´€¢QœÂ¢’âV\WsÁ1«†dzÂ,”õ–RÈœYƒeÕ‘¼:R:K•ˆœ¢)™*q’úWÕvæˆÅŤÎÕ@wÃdõ„ðî8*Å^TŠ…RÑT¦U ÆWªÛ…Zq,ÕŠ9™Çemé1[m¡ê&]÷ŽÎ>±KWÐìòL Ì^ùæl„ÏñÈâQ×x4Ę­¶¦`ƒ²X{AˆŒ "qj*¥t§²gk¸@æòc TŠ ÉR›N‚;ºá÷ˆ¦~Êý^ðÀÔ˘¯c®¥oœ†Ÿ"g|ì—;‹aUµt^–I-FݬgÁƒ »Ê««Eéý›}L%l¯™»ÕÅŽ˜AvY¼>p›7TmT}Õ5ñÁYÛÛVö6ôÁå>ïJ¶ê¥^$Œw¶ÏìÄTpMŒîiGœ^OõÂØ⺠°©âÀëö´³u¥VƬ6ÿ¹= |Þ¯ËSDvÈ }þáÝ"ÑEÇù9ÝÐå:†Ó_Ρ-¬|õªÞz…«ÞÒI¯pÍ æ•çðÖu¿³?ÝÖÅêÏ«x}*Qí»:߇"(rãr²j8¤¦—µÜ¬šÕåsðÇÁü麢¢·w©ó¾U*A6Á9n ¯:s®ržUæWeé£.lít¨{¯ïîE{ -¯ËKw6{FæŒú²¯Á¥Ò?½¯º³ëÊí¹n»¤èÐDeÅö¬(OÑügTõ´uIñig58¹¦Ȫ§ÕÎ>´(ÅéBŽÙ µâ ÷úá.÷ÝíxpÛí·Ú{×.w9ïq¹Ã´¿a¹Á'v·ÜÛÚ™•\ö•R•¸³eŸ:9¯GÌŸó‚W^°²§¥¢×HÚ¤ù«’Š©–A*iú°¤©¤’ŠY˜–Ë+"ž¦;Ö˜¼g ¬\ö²±é§ÉòV¹Êc‚v>ýøž'?Vsaôòã½òâBXŒ¡"+Þ')NÒªbb(äÄ‹¥ÄÓBb°úÉ^JôâÁv!'rAä¸9ŒÄƒãJR -IQXȵ¬X8ÿˆ°ªN(ÃR^7uJ…z¢ì/‘*/’$½éãk'秽”WÒ£ U‹³ðœôøÙÑ‹•è*²c2é‘eSH^Pjz.ÁŠ„B~4Y£5†ä⺦ÂþËõ±M„ :Ø/äH'EÞbÙW,»-‰†áËeÍeX¥+}X¶AU¤$u%SšH©žü‚ÁdÊI”¤é® -”ÁK”T^«`§JôJS`{݉kJ -$Sæò ¼ÓÙé–vZ÷™wy°]¶>ÛåVw9‰®`0ï±ì´¤‚R²Àé zÙcGž%пW‡—xNy//n’G}]Þ,%Îœ\QªÜÄex=ù©\"—Þ+‡.…”P‘Sî“@Ï -)¡R.–>O )áB)%ËŸK&èÅOagƒ“SNq´ݳ’A ¦VD•° ñY˜Ésh—·çÀ®¢à%Òêe{_hÎK¦—ìwQý-ä ˆLzRhiCE&]î÷X‘J½ºØïP•KËý>%™V­Öá„SJ§µ_–}„¿D†½Wf] -¬á¬´zFV5 (÷ßé$$©žTÃòˆWv¼¶ßíïvXïa!­.`¶«³í•ÇpVb­k˜üNû\J¶ƒ“ žúƒÃë´ð]‚?4ô'm^K¶OÓÝ£$[4­§'‘l­§ÇI¶sU²NiÊ|šg½ÇëIž7–䙮녊89³É“¤Ô<ûŒÈ¹(HŽ5Ñ°+(SËÏì³3O®îœŽ(RžÉÞFSÔ™+‹ä}Yff+)Wç1Û¦–Z¹–V9ÇFæɯ¼+¾sÖeM¸œƒz÷íÂ0—yïÒO.]ð:î°ž YK~4ûc -º³ì¸“eÆ]@Éñ‡«ÄZ*ã/Idœ3aÍÖ'Jb\ÏA\ÆožË@¬N™¾´ÌŠüÃeõö!ù‡Ïç&<—–ðªô"‚¤ü©9q [ ’H„YŽÿ‰ó ®Iî#ûymšm(Ì5URØçöƒ…ôήnå±Èðîó|¹‚›¡¬“eŠ—ÉyÏï¬Ì‘Ï4¦õžX¾Ör›‡àÔ(>ª‹óá°dÍ]ªd‹¦AH¦f©z£9£YkEÂèäâ¼&—2z+líÁTnøÔsÌúÕ÷ÁRHçœËªPQM»nì™É—8éVÜ88#s'©¦¡…I2^“Œ0HàÉ(~“p³Dñm䧭k›²ì{ÿŠë¢¶å³Ûpº4ܵ‘Lò,j¬Júa ˜Œ¢sñõ­ä -ñ5¾ÜE¢WÉFô;‹•hæl(‚(wRµààýoÈDß›^•p6a¡3ÓP ¼ñ= Ryãw´ñ»bÛ#%KÂ`Š°{ÚôÉ6}#‘âò˜)>pÒmŠ³Xn5MDvy Å&ϲÁysuSËm=¸Fi¿r òßâö7m¾&5ÀTäÀÖrpEÙ]‚ ¬QbÐI NZCkfóÒD€{VÖIA4j´uÄ% ·$xzcX”“c$øÄ8ìBêÙ°ðÉØÏGuµ;¡2[ò´%·ÑÛØ W0°ñŠþVv“¹†%qäíÉ¥w_’AÐu”U×±‰ôSÒ5›?;o¥e³¨‰wâH¬MÙ¥ùïY­wúëQÁøʲÊÁq>•KQu.Õv• r·HéZÿV\â’O\rŠ»*ÿ}ÚŒp†ÎqÅÁ*ÿXh+ ½0-WÅõl[Þ–é°³Bîd>ìEŠvŸÛ'ÅfE],3vÎxžsžï…âf:¼1*=IÆìÑ®j"êA(|²«½S㤳~iSV±eß‚ü÷ ±à¤`PŠêy0žSÊ:YHX_Q!˜´°(Ù²ˆ?:å Ò-÷3ÛYËnžµ2µœõ>k=íZ°-ëÅ(¹=²½qû°]ÝN™ø¶ß»7áÐF m$ôD[²Ö¹ÍIƒü÷5)5ozÞöSU{tóÝIemJwÖýiwµ{Šê=;§–„NC[SÕݧš])gÃ"'þ¹¬øKJ`¸ãJ611y²ÀØĤqŠ±ª ®.aYPTsC‘γeû‚„ø¶-[ÿ\îzLcÍÙ<Í<ï£r9.—E4››(>WkÏÀ -ÑÝsBNŠAoiá;)OÀˆÍë³uÙ:˜ìXqÎùIun(ß'Ƹs®OŽüM’ás#Á¾ZÿÃÖµò ». ¿`:ÆŸcÔ¹Tg”$¯«ûæÑU8noYÝ™¿œeNK;l¬ÔxÒDejÔPÅ$‰e>HìGÏqœ&{¬sFlr4ÝÀ£9iºÊÙsy—†Ð×öpu=º°G­¬Çºªc±?tëC¹“$Êëv¨·à¯ÜN$=sî.þ o‹¶7ûånUZÄÇ]rB²ÖÙ.wjËbòh×)_$µšh-åýBÎoKÆE„â@7ÛàÀ6DûgÀ§D¿ö˜™ Äw” m  ‡7I…ÜH>ÓQ8¬ØÃùÂá²½:‘x·þvŒÓ|pÐk‘AÒÁÓH´Gkù¡ôÎfÏ“L}. Ÿ=¹7’_ýØrýnV`͒⨲¨NRuÛ:ýÕ?°‘d†´lœø¨Ì]jÛOëÛszèE–£°Î.ÅE~ÖU‰Ì8])êÓš«ÌAi1¶¡4[ây?§„íºk¤Ê§5±ùRÇöTjþWi®«•^42idbÏE`H—Ú×cjçäùDÒèF«ˆŠa¡¤äÕPD+íK!‡Zp¦ç ?ªë2}ºšzŒt±ŒO×%pÐ:8VXØì|Îò'Q“]v€%¿×ÜgiM|º>¥æž†šš Þ9ÕÙ±|L˜wýôúçÒå3{ô‘fˆ5BêØ·tþŒÑŸDC­ -ž­¹ƒî³¾ZÕ—]â˜H?2Aý‰üåúÒ!ä8‡œ¨“SêK~lV³Ù'›€4•&ïÙºTŸY]±“Oð'Ç@“Þ¢Óiàÿ|i’¬‹²Ì³×¬ –¬û ²ÈA„¡Yý5¯P[Ú@WuJ9©:rÿ$·O®¯{XÛ>i£Õѯ+ŠÑær9Õ–”ÍGú(ç%¾<ýôEuDI;>‹ÇÚá¾ênÂE% -cÇ—ÏNq¾„Ê=TØ88¯àzi—S%]|cá‚ÊQ4Ø2éÁh^ä9ëAö4ÏqÊù+{¹æPçʼks^Ïw^OUbmKo+ow¬¾©Ÿ¦˜ŠPõœhÔc¢–çàéºd¯Í”0ëM`áíV¿ÝŒž­Fä[õ5¸þ#\ -mç¼CžªÇsW ¾ýõ»·¿ùðêí§Wo¿ÿê+wóø?„_¿Ç¿tü—ßÜ~út÷á-\I»î^ü.Àu´„`’$W=,çØ_µ-ð7 LcÄôÍsýL\P+|ÐÿF¿þøñÿð¯WéêWWÿüš«—ÿãoá¿EŸoHº½ú`Ëw•@ùð×ëþô–Þö ~àê{ø·»ú+ü{~°mó›»võá£{´_?©ŸÖG1]„ò:æŸ$HXî?¦?ÞÒè~û(†éšNkœáóŒcEÚAƒÝÂ÷0ÂÈZì©oQ^ ?(°…C4Ì-ÍbL×x+\µ#0¯‘@Sºîu=hn‘ëìé“À?y¾¡DÀÕkø§ú¾ã0S{Ý6u¸€¿·üj åôñÖ§ŸKÐgfí'‚°ØÎå«}ÿ:F#Ø‹åšë|[¢2%ü Œç:µSÙ¯ýÚf‚Åý²Qpï®`Å[üaZ˜nÆd-­_¤f†Žq!àê%8- -0°ƒÎlU†«”2hÂ&-Üðy9é¯ÛI¾‰ãæ^ªƒâõ”#ÐÐy²A.·ä͉[¿½2FD£WÂÁQñ£s›N!o Çkè‚s™‡ë4a—0`Žl. lS?Çb@øIàhà}ì®,aŒ+ôÙ¾[ãOZ¡ÙâØ9PFj|3 ÏKœF ÔQ¾Y¾½õ¯‚Óà×Ü€„SóäÆÙfŒFšñ5)U€C¹e¶îøp mW¬;®¾ ÎZ^ø~,:&X7] ä|Ôæ•Úˆû?ÇrôŒOMëù¤a=q”¤¿® ¯88ÄþzšçT‰|O[„P‰CŠ£ÃXù$G‡Œ™`žzÃJÒtÊýÑå÷±B.Œ -õ‰nÞvXpÒ8^c´ O§2L¢ŸŽ‚ 1Ã`±¿Ø³ÖWèè’C¸0¾ “Ï÷‚G/À`7\¦ QRxçoý$}![c§ƒ×È%„¶R‹é:Ž³ÌµË0¼R¨ëÔÛgAâæ1tƒ¾£—Ž÷ŒÞm )Þxà)Ä\ÂÖµ@³ï¸ÆS  -F©Ê~箶âU5¶Š&0 UX•'[½jqwûëü>t»Œ;Ö¥óǦÕj û ï‚±OÊQ½ §ø9â¢k° -3æAßù{Û-Xõ.¯óqÁËQ ¶_!OE–°*¿²\7%/JšÞ8Xíî¼ï>]öW`»BÞ„úRÜt XíúYÔ%áy‹“ï¶âA|IFÇ×½ Ëk¦ñÒÏò:»SüN)jG¦Æo 9,Tˆx*[ƒég¿®ô§ïùC8°Bäðö¥¨:¾H£2ñ_¶>üAû1•~;ý<4Wøþã_Ãgh…–¤®#! ÉWpw÷Ðù–2cÙáî~ÕÍ=Þ–³½w [·x¼ÊNN€­“·4¼oÐâ¢ö¤AŒ#ƒf5M¦¤÷Ì94E7Õj0Œ˜ Ž- ¡ Œ6óÚŒ¿£? ^0‡þ0Ìó(½¸§<"O$À¨¯ÈýÎ3L‹A0ö¼-MÀ˜ðÛÆ8Ú FrפQzq±c࿪Žê… ·`­ø¨¤Ñá¢'µ€`U˜†QzF—_ö({0p‚㻓RJ2™\yYŠ:4Äûêv<4bPuÒôº7 -n:]!¼÷8ŒS¯@˜©m`Ü;ù8\кæ±äɼ£ö¸x»k¼Žó Ø #+`xíÈ`Ôió EÊëÒµlÆK†W™<:ÐÚÀ¨#—nù}F•+ƒ‘éûZfÑ!#)]D2ÃÄ^ÞÕ „Ä·‘›®pêÁ)É,š!õúl¯SkæÜÁÜi¯HÀ^PpL>;¶4KÈÃ’ßiéø¡F'…àfTp—¢>;v£Ž¨ÕþÚ.êKbþ<Ù°yQú~¦ga¥Åû¹—T­é›ðBáz¼AŒj,6“ i{Ê4¡×å@ðÞFÏÇ4a‚`üÃ0ĘÉhVÄDQ•?àFO˜b”g»iÐgg…¥¶‘ƒ Ǥ—ã5ÁP.&ªÔ|>3»©Ó37èñúnP|OƒÏ~ŽzÀÓ Tbjû¨Àv°f%€C£Vv˜”$ ‘ö€ð¨N«àXe´H;È”®G$`š†{ÛJiê­‹¡‹n $‰“ûÅ°t´^—F0{^U_ÆØŠ$=âXÄÖnN×và—M€ºà¤Cà|Ý£â\¼Uj=Ö6Ú/ª-dsö Ü)À8{ú LE­KÐIˆÉTîø\ÊbÖ)H“®ì(Ø™OB&›p¶‡¡W`do‡°+éñHS­öÚFß…4B<¶½ر‹Ju‡Æ¨ig6M§(,‚;wÀ¥Ç¤¼søHÑ ÉLmo7]êdNSRBf¥Ä¨‹ìFŠD4¦0§Ñs Pâ]tˆÅDñ&8s}Ó•ÌzÕÓr7ÍvFò¢—Po™‚í$M]ÔG>Ð8Ùᜠüy81£åià{c:ÜO‹#7Oˆ,:Tp¶­™ˆÕ~ å‘Ù¨aBÞ€@á¢.ê€ë¸2áÞQ3ž?½ ¤Ç©Aûà8G÷, ÛA¯C¤5Ô‚›I;ÀKŠ\ø2›<=ᱪÙÚÍ…¨Ð2°s‡¨ÊÈýÆï\]q4§ ö1ñ©ƒ»“îd¸8ZãWðžn[î ëp83@àXàѳ ¸NˆÚAŸ:é`¶[MHÄW胫emç‰×6õÆ·áMÏÇ Àœ»gQ¦`ß"S&/ëyȨŽŒª›ÄŸGò=uòhji@øàVüš‘†"pB}µjdbÂàÔ*rôiä­× ýè0Œ#\²²²ôT„Ý7¦Âpž…¥E­Û$¸OÇ~Ö‡C'] _¢Ì:à8Ã$´‹ÀSÒ¥éZÒ„!¸E½•2L¹ßiœ•K4 |²S¼mƒwÒAì˜þÊòžìeîbí=je}#\,êÄFw§#úÃÀ¨ÐŒ˜¶±0§w`ö­^®ì¬[»¬HÉ«dZÅ<9 [†‹À}Ð3 ­u0NŠ ¿J¶µñZ( -€¼dŸì'=à‘må NBÑäiy¶Q–9"•’'õ9 ÓyEÚ(/ƒ£ÒÉòÏ}”W‘þƒÀ?È:ã˜7™g{v’ƒD‰• †Îmj«7er©`|-F÷7•¹#0ˆ‚ƒ’έl‚܃²òSâS,D¯äPTIØ(è ŸòñBWoCìôˆ'e§I ÎÄ cëžäF“‹0DçLå燆i/2r£îð=¯K~¶Õ3À9¸bj„î&ŠŽ$Ê ñ­F¹f%héŸ - -É™Ç{Î4ñœLNö[^˜„X>*ºF»‘,+bM ¯A¶;v%!¯uµP‘Ät¦ q/Zgë€@@òUùÃp¸{%YÀcñªÀ$½»ûQÖ·%éú ½\¨¬¶ðfùw¸(ª=è£ð÷%M£ñ$C£]½_ ¸kˆL˜¢qùæìPY¢«ÃËûˆ§³ãI;’ba7ñbwÑÉïÔâ¬Ë­Ô+ÀscU ¨Rqb ‰;@FÔHwº: "1T»éìÃí¨T—,÷:Ú†lLoºÆip€6ÉD°Ñ1â7h]ãìøØÞ ›bf€3q%@`tl c†¹KÆ›:ÂÓ3Ó#óc<‰˜ˆ¡hgà‰T3BÚ?fšgX{½:z¶Y|ÅL³¨Â¤ ÛÁMLú6¶º:Ô±õÓÓ(‹ÛŽŽgÖ›¸ö|h…µlÑ0¯º­””#ØN"]ù l‡^±U«òdÒ'óî¶èto8ËhØf])’î! plP]/÷l›Ü¥žz>¶l•Y¡àd‹—0w1gVrC`‹Z]›-3O µ“ž£ŒÜÍhzføæjz“Þp]†AD/UV c5hÄS÷ÊEÙï&"ç©2™°e :x*íŽx«±ø§ÚT›E• -¤YÅÈš5ûQ¯¯ˆìË¥YÙÎc–k³THÀ=#69|`•7ÈË@’uÉE¹2£nCQè¼(ÉfX]»@:vÉà§3­l{¹±î”.qˆ ŒÆs5³ÊáœR»ÆÅÎòýÜŒª£˜+pÍt:QêMÈ)ýkM£`ê<ªâa.³ -`prT8žTíà>Ž*9îÀN°d­{SÊâmÈÀÙ¸Yò3àà–0–<áõŒÀ™E•y¦è®qê”?,½½F·aŠŽ›"—õ)h.ïX3;5N2¦ešÇ;GÑF˜tó lªd§_ŸQ(ÖÛ”u*¤éIþ}Uµ½èó×:æ7î+úí¨WO´U¶ ¸7ÁyœM¡ÝéaŠçŠ–û;‘.zc¡‰{£`»Ifà¬ã&æ`Έ=QÙåì°»e”Ý^íFóÕÏ~~õÇÿUüDæÆÃÛ—…±ñ>$AÑ›û*ÆÈ‹M‘# <x˜  í=´¿BÇà€ðeð× pHÞÓõXtrl¼}C$uÞ"‚ÎaqÇ>ÑÀÜ3lBO„$Ô•$Š×w94Tx2×ÎàŽç‡ïÇÀˆÁâU_OhK„Wè(OÏ©M² =3Ö4Šy:Š?ÛáÅ@´¨7-?™Z2é1˜<ŒÜÇVŸíR/sk¢ÀȵŽ`mÃW0€gà‚ù<ã=܀˨Q$`Ç ¤ñ­tmÒÄ •½K2X “f”@© QÛ¯û8u2.bé 8µ­÷xÜé‚‘TE@’OˆŠNƒ®¹H›Üœ0ÝàžV ÒóÔi“aŽ:¦5í»FE\€yÈ:L@º«y¸ÞÚù £¬5ì†tàÖ¶ …Œ!a;yÝ­ "Ü2[^mÔ‡5ºÚ¤ç~#ßU<Þ©Ñ~#ó¦ÜïÌç•oŽ—µ”zÝš~¢õ;$=ÏÃÐDëwB7 -&è“Ï@Ò0pĺèo×é)²‘-ßöµ€Iå’“Àž‰¶QÍÅ`jÇ`8…2ܾ´ƒdXK:5)ïdÒù"uÐZ>ºÃ€1ͳ"£Ì–,æ:…~И˜ÙãÑÆ‘X˜¾ÑGâ.ÀI§×Aêtˈ")gF.Äüò¦YÏ>‚È -x¬™ÙðQv’MT2Õ¡zŒ;˜yˆ|t&&Ä(AÅ&öÃÌ4'¯¶v€1ô2¹D˜ñ;ôÖ²'eXoë€ü¹¸t¤àˆr÷8êÂ0%="½.Á(æø‚LVS—‹o„¥N—¥U,FuîužôY¥“BØíP”O]’‘oN£>ËÈ À>Ùm™NXÚAÖ•œ<8´Q‰r%Úk¯¯J|]ŽâiË –i·]JžfEÌ¡c3¢ÆÞ΋Ð>NÝ4»1q‘í·r4ÚNŸz^(HäÓ³òìzêéíúÉ–€B®ÎŠ( ¿K˜zéV>/þÑÅí3ú4íhûˆÌ!òËàc1#Ã,ÏHº_éuê ³N@î 1p¹„¤"é)Ô&t΄žŸm á'禸¿¸4vê.4iž‹àu¨°a6`žt`˜àH9¬Öúciíp ÍvRÞ@îûq06:³G#Ú@çQÙ#[ÚcGx¼¤ÉÆpgô 1ú K;²/ -/o“ÕO6wHòì8¤A—†?ŠÓètsÑË;Ê™ìVÃóýµ€»I) :w1¯ŒÄŸù6&£;cgëóå*ôÍ Ïöƒ¢=[W ¼ö¤÷jŒÖÉjy`œa´¼4±B ë%èc;*ÒÌxˆueÆA?Ÿ¯ö!ñ¥ˆvvæ½™‘ -ê¹i“>‹ñÞÚA£ÀÑnŸAÔ 6'c×מÇvÌìÀPÛÎ-"Û¨[Nî½Ô-ŠûÒ>Ý|vTÖ¦­+ƒÑõÊLµ“u@þ¼ˆÂ[ ÊÝPI‡E…TFfÂpØ&iLÓÛA‡ÕèúIÉññÚÁœø4 ÆæNÀÎu|«ÁÑ–)DHvâäÅàž× ,|n¦–·xX“ vQ_Õé¹™"ÒJÙ„‰”÷Ô»b0–zêP5(ô]Öy&2ÆgEŒŒD`›äÉ®UþÀĨðtQÿ"@”‚¹Wôå` 쎠Gë uÊu)?ŠÊ+aªvbà8§¤+«Ì €ayt´3KÂàa¯s«À¤ ø„ÖúA: É 0±¹½±<ûjr½1E0lL£<:d iúGû¸^˜ðñ™Í=&{² «åàÇåY‘…6èçc´ná'y=ù¼óROLø¦žÕýüi“'ä¶gy;awIº8îr„ÇÛN‘8åÄQ •-†ÉC¤aÆQÙÚ÷‚XÁ£­Ú|U"x¶éÎLüæÅdE8g4¼ílõ¢š‘T+õ¨Ý”^‡QfÛŽ|SÑ”C%Ê<‚ÖžUØ+Ay]D G Qú„úF¦‰R¤Ÿt´]2‚(t§0F%êƒò\h¶œTi@) HÞ’L<É€£é2öáFÎÅ!#ã@§#UÄ<²¬,hÐõÖ™õùeH+¾ðlœ'é58NIiß(è5C-W§ö;Š\®óÄ-<*ór3ª‰tYšQûnu ‚óue'o2Ýô+bÇNÏMkRþúYíW±¹g2Itn¢çžgÔûk(Ýi¿™÷Ô‹Ç0´ÊŽLLUŽ_ÉÚæMTZ=êŠMv_%Îhv Sþü<$eü„wgŽžÏDªT^„;˜ªvºÓ¬ïºdW›ìùÌNº ìí¶™M:Ä£ÃBç^χ2pŠi\!#ÜÃäÏ©ô:÷ºÂ P¸! ÖAÛÌ Å&»fVTbmš¹¹i8HŽŽ.WfÉVËàƒ±1Þ¯c¯Y·v‰°í¦»QÞÔ)÷…¦!TvDôج×PÞD½q‘Î8ß¹4X‚§/KH@QêËhˆž€"pê£î¨ºÁ•=ÜA 'H ‚HîÌê,‚-ÀnnEnáI à *L¬~B …zåÓ tƒrˆM´Ï“šQX‹‘ç ‘8¼´lYB`DÉ+Ï€;HƦŽ¬¢“L«ÃA$®NÈÌNÛ­b2‹Œ`î¦Í‚PRWËzÏúqÚåå²ÂuP±ÁùäŽ àÞ ”ù¶ÌtŽ9}k«ÊÓÝÓëf5Ç’+Æ×úºÁ tBÓ°_µ±=yf?S5O¢êwúãèÔ¡Êû¹Õ-È‚üÿÏÞ›€ÉQ]‡ÂH, ‹À @P=ÒH£¥{ªêÖ*!Á,ZIƒF€X„ÜÓ]3Ó¨§»Õ‹¶¼øÅöÿ'ÄŽ…—,ÄÆ~qž/ØYž“ðÇÎí?øáÄÆq~ïvâ/ 6Û@Àaÿ÷Ü­ªz­ž­»GÕ©ûÔ½·Î½÷ܳÝsÏ%î§AÖ-²£C{@µ ÒUÁϨ @¬yñå¥ ·¾+SùB‚( Nš‚Üt¸BQx2!êkb*œ2t#{´ÇÔŠS·”ýCY™;y,jUÐå¶PaHT0*–,àm²½"RNá@öÖêT'ê •ÊV‘!v Lï 4%3¥€:⊴ͩ ž¯ •Ü `¾íið­ Òª°;˜4àBÅm€œÎbóÍV¶AMY0^ŸN§¸4` -%Ȥy¦Ð]ÝLÝÃ@q¥Ûäk«ÂíaPù¦Syu9â&¯nˆÈ;™E€”Ëo¾ÀÒå‚žížÐò8 y—,eaðØ3RI`R³‘4ÎX õu·A -pkuÃÐz6™7^Yc^V“F¦x_-Ü]⚀éze¼Õ ®°iˆ¾ÉŠšŒ-š*†Ž¯;v¦eYh@¹žnò[ð j™Ü”'@ñ.±1CÀ -lT©g‹™—ÚÌÇóÀÕM[ÔG²Æ˜=rå¥MSÑÅÃ׉M%5›{Ye@rú›ÉKKíjw®AFmÑ. 6`£È†Mƒ |š´+Ü2†e»íbvË¥Œ+k›¢¿EL•iˆ%ëWQT™:!hÏÀ²¢@EqEžÎ`ÜC`ºû¤Yf·á°°M˜Wž¾ •éyªLÏ ¹2›·ë*j,Å'º¹iAÄ&RñÖ‡4ÏŒ¨S€6Ûp7…m -'¯ÍmUDgð :Ò¨mówiT-'·9[p $Ã<”thV -@²O»ª.«Ý`›ûÖ…®K<ÌÃì ¡¼AËhǪ -áDœlφ”¯Šn¹ÓHë«Â+ä™1U(9Ìß -@äñ¬yHÆë,§9HYEç ®b­òí0Œ€Ê w(«qM¼’ìel³Ù¤“Gp¢†á*%¤Á©hø ÉáOßWYÆXK˜¼„¸[ˆè—¬U×ÏKƒ Zšp=ð]]RV¨ ÜQe®j2:y•ðëóC/ÌÝ©j ‘†9Ž•©pRÖ\*À`Yèoˆ2k.d‡ -µ½áM:·ÙéJµQŸœV¡@S8d§UA¯š߯€²<È ;Ì ¨q!FCO(Ìà‚ïæ‘fÙž‘IÝòà ,*ŸZv ™€yx¬I}\¬ ¶‹lÆtáûk,Þž¿‹ç‚`rÛ4e.B¸m¥²£/5Rc|TL¹ `®{q¯WmæÂÞmq‡ñ[ -”Äî/ÔŒ„óË¢¤Q[;–íöÉÁ¸áe¦pÔ”ªtº…I×:°ëÔaQªD*·"ÅÐ=«E¨Ø#—˪.\ôLÞ¬)>¨Šð Xqe®±²äмOöôì#v®)«MëçòºgÅf^-è«X$G*ïnsCXaîÈŒoë‰ê+›"ddtYl2Xº.TÅTm€ÁN¸E­T·¾f‰PpeD°²x4*7WT]Èivz‚7ÀUAFpØ €cðð!Ž#™Ï1+tu(˜À'äæ¥rÒbLË ›L ʼM¶¡b¸T@Rª²I :ŸjR¤ŸMzj -)!ÏL &V-¯ßÞdÒÄòÈ× ªšžÝHšoME9‹­OS¸ÅÀfàn1h€…™|[Š”‘ZÜf -Ü9²Ì1°ÄŽ®IEÃֲ˙¹åñ„¶-0йÿŠÏ—×ãÈÂPá!­d»—# »’‹9>TË<*8 lŠS<<2À${#9&ú\ÛÁÒÀöÄè#ƒÖÇ(µØ.’éZõ©UH¦¹×Xœ -àø6ß“–èorbØᆨj<Q碔œ1ÉÌåõ ¾¹%ÙbÑʼnzæ¤NÙÓ0»Ž#K¡ì ©@¹"&™.n „D¹öÅ»„‹š&ÕæG7Ha¿M·x«nø2Û¢&@ƒ÷‹xx³n€ªÎ84"ó,©dPRãaé$Õo@3y¿¶EgúUKÓ)Ðñ­$„œ7ÀÏ;1liLj>ÓYÒ$¡‹´,Èòr ZðB#¡D‹$î6 ˆƒéHp{Y‚EP‹³,—ä >‰¼“Àôˆ>5 Þv|ÄÖiŽ -ÁáîAÄ/¤qÁ6â Óª ±FS$Ðd[3Xn#†,‡m7½9BÍ`d6èûÝ y$„3¢ X·irf;(kHÐ?"`›/ƒ‡«"°±t#hš&_µb\ÝHtDƒ£({pm’°{Øà¦Ë¦a÷:_3dç…Ýë|ئ0šœQË<Ž´«sÍIUèù H/¤s24Øa8b€¸Ày l™¦ÿgPA,SÀÈX À7oIÎc~ˆÈ‡N5÷´ŠI<ÐáÒØ)$Ë•Ó…[«Å²·Åq~¢Öl~ -‰ïÀ±5¼>?ëß²yYUå=`gK=Ǡ뢰Â|«ˆ¦—Ž’sTü˜ KñGî¸ç[I#ƒ³8~>I±¿š{`‡¥1dÌÔÔE<®‹%b¢§»„¡Àã½-$•ÐäH´:¢ùë\ua˜ù¦¢»nQrpε€˜®§ôx(½gÕÃiM“¯ˆ¥ç~mN›Dy‹’ãÐ|yÎbÁásv -ÒKRÒ€d,Š‰ó¹†î¡-r̃4`@F4.&ø±JÊ| iæ<šðE"7›²`q*Oã`ºd¨‰Ì ¦Ì{ 4gÒ¬ÁIƒjC›“Ú ‹)Cž£ËÂäžíÍZ4 +gæ<€,ÎQ!O¨8d–9/áG È\¾B‰" X‚™rÙEò„˜\AÜ(!`MfsKö?8Ø”ù<ð<±Uçøª4ì€|ï¹ -5$K!An¬r5r¸ÀåÚœûS> éqL>ŒîA ]»bˆšª”…c -qG,$Ý!{”ll¹P!Ûû¼Ãüä39Ù”Ê3y.A@bÇTXèVeæ¡;IJ"ð¿˜窲TIUU,OŽâîaçn5ÊXIá~wCel(ÜÌ7X¶$ R"³ÅËVt h¶$0<5CÄF«ô -ÖÅ™£N¼¿"<™¡@ ®»›¬m‚¹SÚõÞº¡\4x8¡.B4T÷̺!Q* Gáqã6w«—õ€wÍð„®ë*¹e”M¾#0E|Ûå¢@î…w¹Ø±¯hw˜½PCaRÏä«*©Pu¾G¢2émÒ3LQ¶M¤¨»]\¯3ù),º£còéV‰À ÀŒe,.…cæO0²èµL‹ûl®'Nã±m)¾ÉÀ·0u‘çÅŒÉbû¨ìý1.à}£:2°¢ðh-™)˜š"¢BLäqŒd¿”ì|Ó“¡ÒÃíÑxLFÙë9^n¸ -G B&ß–…½ORFS s©AîF$‹MÌE¨ŠÌ|ɤ¬%`¿êžó'ùŠ Ñ€‹%9zrïq°›–©Ò+‹À_²ÅÇ Ê"œ—x†«7ÂZ·d‘ØË úÓ»[Âü'ä!ñgnÊî²ô„•©ÅV<•m–÷È*ÛÈ«‚KòFRÿZ|s”î)¶Eî–“‚-ž¾‚|®ÞÈ0I8ÃT€h©¹s+Sõf·aÌÆ F¶Fƒ‰†ÝªÁ<Õéedºft9º‚{·¾GY€a“ªM攌 êÒL33—ŽF4¦¦ ŒXhBºk¿¥?ÇòÂÍï2ÁR°“/ +øJR¦¸?2A™&1<‡1gRv€\!÷ˆðe-Ààg¤Î@¤°dYª!ŽñÀv N´!L0W;;òã-«ù$¿ù{i5ÑDäƒÛŒ¢ˆ`>÷•˜èò¡ç)ëéŸÛje§]cdúa\!Š æ_ß+ìeÈÐ F X‡!—}²üx0:å:ACª! -ÔŸ)æçøšJ$v Ù‘?€Šé‚é¡ ÅâY,lbåBÀ+WfPÅÀ ßÇâ¿- ÓíÁŠÜðÁÜ·ÏI8;ƒ=¤PeWãwÕyÁ$1ô\@é!DU¥®Ú6ObG7M®^gÕ-–€ 6M‰cÚ4æ?²›Èˆ?F†Ђt˜tZU–ÄÀ<ñ¯¥²ƒô0V¼O¢F*Gg‚ù)uâ,°a"7¹YβìæÉûÚ`@×áN²ß£ -6p˜Cò¶PCI‘ùÁ(/ЦñV‰.Âèx¦›g—E°mY ƒL÷Ð ÍNE6Ž0˜g÷³4zUòìb Hâù ’£z,LÁÙrn‚bË–ý³@r†)Ñå1Ó[08WIâõ™Z†0h„K)Š8'°a? ö8y˜9«ZÄjºwSO[XÅ«áHÒ™ÙüÌO$#¤ >±Ä9eæøB_(ÃQ'ž÷Ò f¾3o¯ü0•Æ…•·?HôDpAú^šGtxóè[QUAߢãEäÆ”•+ª¬‚31ÄØDL•AMê3öƒ‘JÃÖÊÁžQ2»M³6ØÓˆì}¥ì!” -¬iÿgD'Xüó¨=>ø”¢ÉÅ8zÙTyˆÚ;±|k½Ô"¸ݔˈфËëXR¹*KËÓÄ´§veï¸/Í¿¦jÑý>±-fœ¯S!!ÜŠ P]è›Ä 3@‡+dìXowÊß3ß0x:¬Ñ8‹šãPc +ßÇ<╬É<0°5@ê“ì¦Öà^Dšãå:ìËfFò©L1•™ˆF)˜°x}9x¢ÈôÑè;w¤Ò¸™®>ñUÚÜÕwhïð¾lÒ¯C©D1•ÍÄó§ê=Ø"õžœJgð£(F+Ÿ+ÂziSW_>/+‘˜L¥“y'ÏU©ow¦è>ƒ¿Š§r<ë•{ÖK}wdR Å­f&üÇÓ%ZòTý‚ Õ FâÁª]ûq2p?N¶ Š¼''RÉâdàÞ°ÒmÝ£I'51Y Ü%^|ÞûÔ¿ûH:7?¢íY*‰K6è”™÷®dÇpÅl)“ĸ d,·Gã„•á¢ÅBà óÕÙ GíÂ&‹¥üX)ídNÐá¡UŽ O z´?y§PJ_š¼ø¼÷I Ú¡Lij¢?î'_o•ù—p1YÚ·±xÁÙ‘wŽ•0Å—Ûeµæ½‡™ìh1UL4in/ ¤ôÁTº‰)ôÕ ÂjtD©Ó‘êŒÞÃ9ƒ^vRã:³ÐÆÜ"•i°½bÊÎ;±fKù„³3ÏM¦Á»ÕD¯ZЩFø¹=Éæœ|¼˜Íî[¡e«f0;•ËRÅ ‹f. ÊKÃw÷ 9ãÒ–ÐÚk~„Ö^ûö¨ã¬=-´öÎ ko<Çj~z_6Uí½6·÷¯Éγ÷;—Bs/4÷Bs/4÷Bs/4÷¼ôUŠÁ×LOÚÜäÓœÉ×D:ÈäpŽ;éÑÉx2{b.¶ù:Ç¢¢“XÀ EpŽ¥K Dá6„ -Åäs<„šP¤½•Z¦쌗 -…T<3@'°StéÀs“ .†“­ÃÁ;\ -'[!†›áíÎͲãã§80<­EË~?éa-ø…D^iÐÁ â1‘Mgó›OLR“, ¬9•îe¥ç½‡…œ“Ø_j°:O#¬µBÿKéx~0›)ã™à]«¬Ø‚ §f{¹ýd.›q¦ÑK·â¼÷2päO¡”'œÑD¼™uç«ÔI¶IT‘ñgø8ô&ºÒÞNŽ¨ÚÌ´œÜ—Ó-ÔAF²©Lq˜¹/ZátFf¹ƒô¡iùÚ}O¡Iµ¡Ýõ¼ª…›$íÆ ë¥GQà©€¢ó¿E¸# ü&ÞŽhmÝ‘sçíˆÒÎ&ÏÑàÂåhGÈ–v– r>*ŽÄSLÉΓ™ñ|ª89åƒÏÔ9+;;ÇVnÞMÜôòkÑDîuòŒd)AͲŽ…8s‡@24]ÏMÁíîN Ü‘öv¦)J1ÔCƒÙlz ï8§o…çD»Ž='¢ÄŸ6ÏÇ“©Rð!áÅ[d¦-¨`¯àIïH+eàŽtŠ™™L¥ãÁc :ÑÄÜ›Íç&³éìÄ©2M [[0Ì,ø‘œ6gf î bÈÌÚ’™ELìm§ñÚœ‡5wœ¢™Xàž„·á™ý¹^,í¾ìk•m¿ìƒëÇ¢¼Ž/í¼, -ç*Ì¢P«a…iOOƒ&ϼ4±ÍCµÛ–óµDÊ’¬©¬í%kàžtŠdí¼›:8Ïdœô¨“vÍx*+Î{'Þin'++¶L ¥ -¹t<áL9™âÞx®ƒ„ÑT7x+¯¬#Y⤊¯ŠïkÐ^“oÁU#^¼9eÛK¯æÒ*¶³ô -Ü“Ns ÂÑß½œ}t -¿k‚²Ú}6ÐÛ~îI§hxÁYÏOâ•vY}ãM…B§Òéf"†Ò-˜éxúDüTÝÀG¿Åx¾)¦åÛ×ûWÌW³­èHàÉI6Š‚÷îö•ZaSf+ãùìTð•C -Ï¿žxbÆàÒ´àÞWZzþgfånÏÄë÷üö°¬V Ž8eœxà#‰x:±7› Þ=·B <ç™ÀÒ)žH”¦J<¼ç©2ï}Ë;ÄE¸{Édª˜:ÞDçD…™$ñLj*Þ²Ô°š‡.j…Á0mfÙ%L0Lðžtš÷# †iwo‹¥Ý—ý‚ † Þ“ŽqèÞ,è¼h˜ðI/Ãp˜yžÀúgg„Ã4ÁÅÛ>fÉÖ¼'"[Ãp˜0¦]„Ñ9£œ+á0Mðüv—^ &&xO:Í!Ô™á0MPV»¯‘¼'¢áµ[8L[ïÿtN4OK®YæÑ¢9ìĬMĆ³0g³0wÙD:`æ½¼ó“6öï>2D²iÎóH!êÜYÖ!Y‹dÎì0ONÈÑšàhƹÌÑw>äh!G 9Z›s´íy U´¡µ;Cs€PC~ò³ ü,TÐB~ò³Ÿu>?ónêin~±µÀ?‡öðÂedÙ˜çò² ÜùpÙ„Ëf$uÒI¤ã§Ž4w°£XtYÒ‡Òé;ÐDT¡§Æ¼w-¼ )Øyó©l£ããa®—vÈõ¢OÅÑþ9RZZER¶¨²¤èøoYÂÿoÁßñ¿[ði¡…l§2Ig<•Iß:É;9'^j‚,=5æ½å\§'ˆ)ä ELÐ>† bÂ1m– ¦]t¨xõâX3—·y¤~3}é”XýÐaÑîì é˜v?fÞKhsö–ÈN岬Àî/5XìÇ}go˜ ò™ë †ØMx´A”g* èü[í;Ò`ÊÛ­­;Ò`î¼QZáwÜ‘àâåh+¤Ë´tèv™Ó3$:ç>oà|ûŽó©âä”S ®·³2´s¶8¦E±áÀf·“gc;¹¹Ì’íèj ·“ku3ÜN®>4ávr¸n'W声¡¬Ê[šâ©ár¸…<Ý ï‘Â-äp 9ÜB®Ò¥p ¹½}]árû²ƒ…´×šL—‚ßfÒÉît -7œž®PÊcåa´¹4ÿ¾Jí»KF‡¿¹¾ùêÌ{×N9étöDÐþ¥S“Eü<š€<¸»X^­}'­ÎÁl¦PŒg‚¯»Šz¡Ó-tºÍ/¤{nšÓ²Ò-yÇÉlÁ˜³%•I¦&²[Ž§²i§¸%ï$·dóñÌDà¥zãÚÃ×ŒØ ]r¡KnþûºäÚÎW¬À».ñÓ©©R±ÁÕuÞÙàåçÎŒÀ}rÒøGS.O–ù{†RD†ßªˆ˜!jK 3¡ÓA$¿ÜN…œ“ÀÜ<¿#üƒ_sÊ¡i{¸²b l¥f{¹ýd«Óè¥[±{ÙŽ7l2Í»k*ôÛ„~›Ù_¥¡ß¦mý6ÌKCý6̉CÜ7¡ß&ôÛ„~›ÐoúmB¿M‡ûmÒÌ¡± B(B'ÔÜ;¡F™iÛ^¨yxî¨ÐÃæИÞЉ94‚glsh´YLV»çÐ>#mžC£ÙHÛ¶š òN“tª8O5Ú¥è<™æÎhWÙæŸj7ÙæŸj7Ù9-û¬Ýåg³¢¦SDg˜wêÜ•³½ß4µ†9§šA E/_9§F'ãÉì‰pQ˜•)Ì.°`´€ÀùßÂùó¾„_¬™<<üëT ˆ,xGðRoGN¶9hwn–/8EXy'ÙŸž6okÑòßOzznÓŸÕ…h ´Ë¬ÌϦBLHhšµiUôž $\Ïh…šÑLO‚+­Ð3MÜ“©dᄬôü÷ïѤÓ8òÐÓ%^|Þûä:5:?‹vèÔ ûÒ)N #tj´­*l-§FðŽ„N0C§FûŠÝЩюœÇó٩ેnÁë…»¨ ¦.ªÛ½0uÑ ä0uÑúmœƒ¥üX)WçùXî•&ÌÝ67Üü$s¹d;ßÕ<®§½£Ç‚÷£ÍcÇä;ÖD:(vÌÖGä@·)² c›¢èÕÏÌ&ôj¡¹ÄG÷tžG\]âÙyw‰‡æÞ‚6÷ša¡Á|¡Á— ¾Ðà;g ¾À*Xhðu´Á·PãÒ¢É8KEç™|»Z|¡ÅZ|¡ÅZ|¡ÅçM¬°Pl¾fzÒæVŸ¾à¬¾&zÔAVß]Ùlr"ÎcC“¯£M¾yDSgÄÛüüÎBÌxØÀ 3^Ì;CÓxÖëH˜ñb†B™çX¼9ÌßѶll<Yz+öæ±tíÓc´+ ˜þÔ´ÿ¶JÓ -\»¯#ðÌÃT\€i¬ÃP¾vc Ó¡¶NZA5vÊR‚_{*Û󾜤4:4îäw¤òíà"i—y.ÆÇ‚Ïq'84U)ðîéûÍy,}uZ—Š«”Iè n²à¨,fJ²tnÐÙÎÎZHgʹÂÎZbBŒ8R~0ÏÆÜ"Ñ>ô>Í£ íî -™Ž®Ö ú'®yÑ@CÈ9î!‘sýéthëÌp †±šÍ Т—7uýSOÿnE>²=“×@HÈ‘}ÙÌn‚¤)‰Rð€3‘Êxtí˱6È£ÑSScÙtWï@<¿¾K–úñÿ‡Nt•ð?û»Ü`šC§ð=øËtBÒ¤½Ò½‡e) ¥tEMË0b–ŠTÉÒSbISe`3LÕ–hÆlÙ@Tcš-«hÇTMQ=ÀÁ®¨%ËJÌÔ-Ë&`“mÍô6ZL1 Ëû2!FÛ`ÝŽY†ÅÛ`C‰!ÕT$ßË 5¦Ë¶%ùãÀÁ.Ú ™Þ²ÃlŬxKûÇc6’M?#¦™ŠÉÚ­ßá®1Lv½wd€D’ÒD>žLaEP²ŒõRTŽÉŠfÚ*ž²¨ç1&«*²Ù|Ò¿&º |p7‘3lü¶¨¢ážëH—Ø3ƒ`¥ TÕ˜­kŠthÊWÅ4 kÛx¶t<Ë omU‹:õFµu+f[’¦õn¤ÅRx÷8¦Û61²†?6bÈtë‚õ˜l*ˆ‘¨"mJ–-2‰¦ÓK÷)}É1#ì3r¶lŒ«§ „!5uïË|@†mW€ñ`ŠÁéÖÛ1[µLÉ÷2 /[¥‹D Æ„¾Ünpðp—¯Ë¢ ïàˆ—ù€ ±Áêã[“n5Ð-ÒT)‚n‘e›Z-ºÅè ¯/uaêPpw}³oð×㪮à¡[¨¹‚^Õ¯­Ë¸O*~ ¦ŒŠ)†¬4¬¥áÑC6žL¯Ð˜¬ãÎ4®e`œLÄj)xDTÔ°’nbÆ…g¿4O60±µ5Ì]t#Š9”jɇS«jX†÷Á‡· â.G,t0ˆpGLl¸„¢‘º&þJ¾ @L¨øÌ¥1sÄ_0ß0TS:ÇÔfÛxfl$‹†GÛf«Ù¶˜­é^𰬫1K`ÑH °ÛÈ8<°0ŸÆŒ è˜z©[žk6ão¤X42^Ö žcUö”ËzZ —`ÑÈx×]¶Ô»^:tþÖskƒEŸÒÛs„«@X·@#Xwtò™XÃ(ódë Ó†zŽÈRß@6›ö•Üž_ÎÎR*IµÍž#jes>/_tÂÊЕ«Q¦ºŽ#íÍ– -Ž4”=‘©TwbÐÂÔ%å"dª:‘( -P§P?Ñløb˜FC…©­¦ñY”øvU‰šøV5‰oU—øVu‰o–ø¨†Ä·[)ñÑzXXS6•öø…š©ciW[MUuÌññeÒE«)DaÅ‚\ðÉCóVYWÖÆlWÆdMŽøeD|6Y<ªaXm¢G¼–¬‚¾Ö¨–ŽÇ ó'QK1tÍl\ ó}«­]· ߶kÀZíB¥›ïË¿ùwμûÝ=ø–½[" Ü}[úm|êï>ÿÄ_ø̧ù­£»%^9˜úÿõ™úö¿ÿð‡ÿþíúÌŸ¾Íé_ ðµ·Ÿøƒ¿úÒwž{éÕW_zî;OþÅ{‹#=_3rü÷ÿâÿ|ûG/ýâ/=û­'>ùî¾5¿v`ò·>ø·O~ãÏ<óƒo<ùé÷½uì–•ô½;_ÏGÿöñø‡ÇÿúÏÞujlˆ#t£¶Óùµ·½ó]ïzÇoãt£§c½[vìÞ=d­ÞÀœ£ŒÕc –]œ -0LÐÀ¾šª ×XliGéôéSPG é9Z‘ÐEŽÚˆÿÂåóEZH´0œÊu’eŠÐîÌq'_¬¦S¹\ -òUûÀC©(K¬ô‚Õ‘2|¨B3;©Ž^CJ$» á ‚†-ëÉÞ%âqÁEÜֽ˲|Qò%Éä°}+ÍñJ3U¼Ò° Ët5Ö( ZŠþmI`q*¦1z—¢‰Ù¬Å_M÷SŸ$§Ýì¬c2ÏèMkÏb3Dfv›Edf±9ÂgÚXÍ)>ÓÀjði -«yÃ' VóŒOC¬Z‚O¬ZˆO-¬ZQ9J­F‡}Ú¥V#âû„(ù´>çµ%Já'ü„Ÿð~ÂÏl}ÚM̵§r¢ÔðÓnêw;[(m‚Uû[»-Ǫ*>-Ī>-Áª!>óŒU@|æ «¦ð™¬¦Ïœb5m|æ±™#3‹ˆÍ.23Dlîi -½Ynv‘øƒE‹Ÿþäsþù‹VÂ¥/¼hé%—.ßK/¹xÉ…,®WŠ/]vÅÕ+¯¿aÕª®_ù†+—_²äBüžÚÅ/^~Õ =QÍÚ¼eËfK‹­“V^Ùµ´F•E‹/\ÚuõÌîs&&ÆÇܳM]·ê*\¥JEç_téŠUìÛgßô;gÞóÞ÷¾ç¡ßr|â®]Ö†U+.½èüò‹Î_²üÚµæž#ÅßþãýõgÿÜçÿìß|òOÞýÖc‡÷˜k¯]¾¤¬Æ¢ó—^~Ctàžüo?òŸÿò7¾ûýû·ýî7¿úäg?ù¾·»{ zÃåK}5 ü*e·óæ‡ÿü ÿüýg~ü³^|ñ…ŸýäÙÿÎÓŸÿó‡ßììVVùj`|._¥}ðÃÿÏÓßÿÑÏþë篾†?¯þâ•—~òÃï=ý÷~ðè°ºêr«E‹/Z~ƒ2<õ{>ñ­g~úò/ξþKòyýìk¿xù§Ï|ë‰GojX¹aùE|¬_xéµÑÝGïS_úÞs/AqNgPç/=÷½/}ê÷ŽîŽ^{é‹xV¬p|ôKßþå×Üâ´Î믽üü÷¿ôèƒÎÀÚ¬‹/ìZeÞóæ?ñ½ç_)/Oj¼òü÷žøðoÒoXvá"ú‚«6ì9öðßë¹—_+/Nª¼öòsßüìfv¬»r ôbÑ…Ën0ÿÖ§¾òŸ/½özÕ%óúk/ýç?}â-w©+/^,^rEÏŽìßûÞOQÇêç?ùögÞ=±MZŽqÂ]=ð¦}ù™ÿªŠEê¥òOŽïéÅ8á -—¬ÔîûOýÇ?¯ŽT8ûʾúÉ·ÜÑ÷†‹Ï_´è‚K¯·g>óÝŸ½Z븿øÉ7ÿæÁÃÚÊK Â²6¿çñï¿P#üŠWöÝÏ>”°®Çs‡+¬ºy⽟û·ëUxí…}ü=ã[nXÆ*LþþçTxñß>÷Þ‰›W5Sáó¿?9ƒ -ûàCé†-x”þµî(ù: óðÐgë΃oXa¦?ø7ß|þ5gOÜóîÄñbßüèWôòÙš´töå}õÑ7Œi`j½rÝžÒ¿øƒkâôËW_üÁ?XÚ ÖÃò›¶:gûÆ_©ñ -L{?þÆcgœ­7y¹^+þú‡ŸüÁ ¯V]¿|ýÕ~ðä‡}T¾öXÔ‹ð -ZÓ?q毿öÃÿªºä^í¿~øµ¿>3Ñ¿æ -²DÏûR9ñÈãß~®‚iP¶ñÜ·äĈ¼’ñÌÇ.—6~ëG¾ø½We3?þÞ?òÖÛ¥Ë9'[tÁÅWõ?øè“ߥŒŒ×aŒì»O>úàøPïU3F¢dÙÊØž£ïøe•¯1^)Xå'ÞqtOlå2W¬æ*3þû§¿÷ß¼ôÊ/^-gƲ‡µRö}Ù*™°ûÏ?ýö'˜ßûؽ¼ê²%åâ2,Pî>ö¶÷}ò³O~õ›ßý×õ ”Ë–Vˆ *²{ë»ÿ䓃eV}‘%„¢µë®‰ãoyð¡÷4ŠLì^µjºmÏÁÃcθÓ@ì2= ëÊ•ÒºHö†‚UYrÉò+߀u‡«¤Ê¢Å\¸äb¢PNh¡ÿQD¥Ú -–ñ‡þèÃ}ž£a”÷,Eyk,%‹cH'Çå´˜­ÊptÈ°õŠàï˜!ëäÌ~nëÞ/üéŽ&Û&;ýˆlË -^ãxLí8åÙ -L6 ˆÚԤÒŽ$½z`²[@´ý;@`²júô#“[ú™|ÇÃ|yøí¬ñÐG¿öÜ˯¾vöìk¯¾üÜ?ü «<ðÇ_}î¬Wúœ}öëWÝ÷M<üÏ?«ŠgŸÿÊ×~]þ‰ç« ÷_=ÿùR:…§^­QçW¿zíËÕk¾\[QÁ‚ûK'«ÕùÇzu°„ýJå»ê¿‡¾ëD“ï!µ¾\ðÛ?5®ƒGã¼#?ñ¯¨ó«_=÷°§ÒûkÍOùç_²¢ÎäWÖùÕKï•úqÐJ¿úŠÃ+}ìlãÒìó£wp쾸ί^ù«ôŽç‚WúÕÿÇFýá—›¨ôìÛi¥Ô&îÊÏËD+}0ØÌÒÏ«ÐJÿ3øàaRúà4*V¥ÿ9o•>8ÑãñH3óć¼)Šà“ûöfhï9Fæüs•žælâcÁGâçÆá;¸Ò3gx¥dpüþ)%˜Ä#/¬óܺ,l*è‚jÊÃøþðÙ@užñ2Ëó’_ –þù”·Òy'ê4þ9û¤_€¨iTçõ§ŽŸWþ9õõßõúSÕh±.Gý©r‘ÆÞõ¥WjÖyíKµÄû±'~Z£Îÿßb:çwôá¯ü¨òm¯üðßWW×qÞùèן÷òŒ×~ôå?;“ªW…|RïþØWŸyáåŸÿüç/ÿ왯|ì±óœßý£÷àxÿýnãw´áç;wöƒàà˜ì?8†$ßIú²Sc–±ZÆ3´Œi0ŒeÜÒ%’uMÕ´:Éñ»T¿ÿëfû g~ ‚/‚‡–×"ns»ºÉÏäj*üWÍX}±MÖá¢×½áŠež÷/¾ð’Ë®^¹*ÒÓ»1Ö§¨T¥/º]µòêË.B“W^sƒ´fÝƘ¬"ຆT9†‹J7\ƒå˜.ºðâË®Æï^»!*«šaš–ešº¦ÊÑ k»o\¹b¹ph/¾èÒ+ ÉÞM}Pó2Û¶LCSú6áF¯Ãå—\´˜ Ñ’eW^» -7SnÚ›açu³mê7Ú¹áZñzŒæò+o\½n#4 ;´7ß¼e‹máFcÉë»–^ J^}ÝM«×á—C“¸ .ŠÕÔ¾ëV¢¢$tÈ[rÛ6RRW1¢«o¼ÎS2x›ÏëâÙuåÊš}_uí•¢ïx”ªŽ'F³—Œç¥|:aÚ߀­1GW/¿øB>›øõ+®õÏ»îÎû•Ë–Ší‰ó—\z9!:LK² ¥ØÆÞBKZç<&ä› h”Ó'&ºžnLÊWà&)Ã⸠¿ÿ¦î5ë6šnÚØ»nM÷M˜æ1–žå±ø‚¥—â¢xy¬îY×»z×õ¬Æ‹ãÚ—]ê[r°9°ìr\tÕM‘ÕkzðgÍêÈMxÁá‚Ký˘½lÅVâ²R¤›V£Ÿ,ßÖ¸pé¥Ë¯Û7\ݵ׬¸V{k­.Áìæ -Ì•®¹öÚk®¹—ÃŒ©#¬î’eË/»üŠ+¯¼âò˺–Õdvƒ .\""–.¹ð‚*œŽ]´¾h å³õ¹2À8¿A1^8h\ÇÌ?ç˜R»¿ÙŒ~ L¡F´(’S ¤.»YTm[UˆÊf³ô•ð•§N“m‹lˆ(šéïªå¤AgF¥ú'' F4uí˜éaˆòìO_åRE[YÈÒüe±&‹LC÷·êšÞœ4Œ¸bRMÝmUÓhH5m­§¬Û/O«•ch›¬4:ÉëebÍaûK®®ÝŠ2¢åèß´[CF³§Ü^yS–½=Ò•.—¢ÛöŒÞu÷ÝwݾgÛ¦ÈÞgË%cçÉÜÉ7ýÆo¼éd.yçNý¦.·â¦þ;'Oü3ðþ|à}ðÎÿëÄä·näÕ—õÞ“}ó™÷ôÏÿú±Ç>ýçö¾3¿‘¹{°w}zýæ;§Þòîýùg¾ðžzêÿ|áï>õ¡w½9}‡}=yxɆñ“oäSŸýâWþåë_ÿÚ—ŸøÌ'ùÝ“ñÈX\© O¼é]ÿëþÿå[ßýη¾öÔçþêOßõ¦‰a…ôìJyØùõ‡þô¯>÷Ô×¾ùoóŸ¿ôø_~è¡_wØÓKz·ß_ú?þøc_xêé¯}í駾ð·{ø·K÷o北|92ñßÞñþ}úï¿ðÄ_øûÿýÑ?þÝ_›1®c=Z³ùö‰“o{ï?ú©¿üËO}ôïù­ãÉ‘Í«—ñߤï9<õk¿ùŽ÷þá¾÷¿yêè½»´ÝÁ:ïŠ5öž»ÙÒÉS¥lâÎ]æß@cÌ#›¶í9xpd×–M‘ÊY:ï¼7­Y»vÍ+ÌtÐϹ'Pf‡57“œÇöI»¶ÃF„0«–²Óñ±&fæe!MÌÈÏBZ˜‘§¥çH¦†à·¦`Þ¿[ê/³%äÔiÏu#œF’Ù1çPÊþ±‚“?î$Üæœ:B ±„˜}åo(ÿµu„{£ÈKI¯Ëæ§6ã/Éì”Tp+–/­“;2“\³nëmûGÈgÿm[×]sÙ’òð|öY¼dE϶ѩ3ù$û|äÌÔ›#˪ÆÞ¿¬{0uæý?žeŸÿøúãû½Ñ«ª4þ²Þ{Î<öõg~úÊÙ×Ùçì+?ýϯ|(3ؽìüŠÂëïäég_9ëÍóË×_{ñ;wæžÞ²âPøƒÿòBe -œ×þìÓÜ¿ÞWœ~±Ú™Å_ž}á_>è+^§04ÿ".Þ»Œwuñ²Þ:…IñGîé^ÂrØ,é¾ç‘:…qñž>3¸‚ârþŠÁ3O¿P÷œåÙgK­]J2ð,éI=ölýCÁ¿|åïÝN_|Ù¶3_¥v$Úøs¥zóó¯ýø3Îÿò•¯ŸÙvÙâó-]7õøOž=ûÌÇG¯9ÿ¼EË·6FËOŸZ·tÑâ·}ä?|T¶._´øª‘GŸ pLõì|䶋qéO)ýú³Ž\ÕDéO¶Mi†w3cÒÔxœË_þìs<—éäõçþò®•ç¤A@{xÅâ€ôÍÐfkç¹ÃR#«¯ËíïýFýÆ_Q,ãEK×6X˜¿üùw>t/g ýÙgÿïL”³ŸF ØÉÐU‚µQfU…g40#tY•‡WKrG™¬Ë¯ÿ»ï¼x¶"›W Þ=˜ùe÷¿äEk ‡ÅK®ŠÞ‹EÉ>÷3*KpÑgj žETL}ä/?Gå–QŸx¨¶P#"pëð]*±üÝVG`’¤\+®¥ò•ÊÖz˜ž a²»¾ÜöÖ¨©ÔÏHUåä-ÏIU-3ÕÑ2­j¯ÃrR©6\È wl›1[S$%fÙ:’¢t˜ñ?ŠaØvL‡ó¨Š¡BÊ))ä@®aÁS…à¶MÍr¿ˆ'¸wƱ¸ Y1|9ªÜXàªá{½QǺª]Šû6Z<•vŽ¸ïg‘¬Í‘›ƒjŠkeK<>TòÝ%_ζ‚»£ê4s›e"ʵ¨:UG¬btEÛe†Åƒ*“Tu:+¦žµ]I*¬íªtU•+ˆÕmºìÁ°xP…櫬ŠU4Xk°¡å„lò{å^XÎòC—;2L̲ª{Álõ`ùÎ[Õ-ÔLŽi‰Èö±‘,ó²2’™­ã8¦ÆÌq².¸Ú©(ò€y¿„Ýmk¶Tu j¦»î%9lôâýQ²ù j23èMib““ÁzgØ©øõšÍü÷dø¢dO‚mµp ß“0‘Êʪ˜ÞâiÕr ¸jÍÁ˜ÇèúZõ š‹o€]l=e=Ýu[­`±A:½…L1 Ûg„k°€)ñS´5x˜‡;#ºEˆ ˆ‰}eU¦›i˜'ªÅËo^0°Öl“oªX–Ø¥ÆïFtÿˆ¡^Õb¡‡4†—‡˜=P4“‡@€µXô‚ #åÙbfûr¶BwÐ4*1ù–½ŠÕi_çGù.b±òxNM× -¢›cååUŒ€Ìv4 èwõ#º³‚ËÛÒxyˆšÆÄŒ ©y¿É>˜ †òe9šË£’æbÛä`|¬ŒË*Þd«ZPŽibaa’°ÐB`ÿzÊÆÃ…›Q—lÒáÂ@ˆÝžJœ4b²Ð /lbÈàÇDŠLÚ•ñ4[¶âoB–éÞµïe CŒ¶+À¼ÃÕ{7 ‘þU¯Ö²•õdÈlº9àK¾éÞ¥¥bÍ/ÉÔ0¿Ár€= ŒÁTËßvhÊ[ÕRU†MtKHà)B yjZÀ— Lá*˜ŠuX= ª˜1UÅ«TÁj5–=Jƒ*Û°'U@‹5µFU`׳"Rze`zhPCÇ c:h~Ütˆ"Àzù@Â=-Q? °õ—=pé¿üÁ4Vi¢Ú f´ -hUÖAž Ù ÂÓ™ªišE"HdØH€ä¿ T˜ª®“»OˆÐ’!­ºl[$µ3K{¯Û†ŒU…eBw öJÝæ¢ÃcQ@l’á20ˆºŽ±–E„*˜x Ëð) À¶I<Ì8FÊö5aÙ0aÈö½Ì dˆA»0ïÆpõÞ±8°£2ŽJ/Ê‹ ówÔ&·`EYµÙkTµæ¨r±ÃLpL1ϲ°Uêã¯QPáTóZ·²…§\Áï ,Vú*ÂÅš+ÅJe]¿©J -.j7¬„ oÛr+©6‰¼ª_BRD®CÐU‚K¬°úyrбF:Öe½Œ+‡Œ¸#6C ‘x±èä3°^X(扵vðTÎ) ¹÷”Üžàû¥TÒaØjesÛOæ²ù¢ÛPÓši*íT»ì"‹ $Ü¡¢ñËTtÄ 8Ϲ,‘©çÛZÄ­^ËÙ»jU×m±o(Lz0S•`üÆÙO ¶-ì*`37L¤„±Q{¼ ̬²`ŽÉpu‡É>`• ’Átd–£i`åbË‘–²U…øI°‚Ïä•J×€nÅ,pƒN5‰B1ÂV¶I jÞöpõW‚,”á¨dmvéž^øâF²AÌeWk°â«!N=SZ{ß\¡f§7¢˜–ç•ÃÕ1¡½²¨þýR8Ë|ïÑû~àìIL“ÒiïªÐGÉ©:® ÌB~«ƒáÒE3j“ä¸X‹d…qw„Ú̈JqF#[§¬`-Ÿ¢ªÃØ캪º€*^éÀ†ÀÍ%Ø ¡2³J\¢T£.TLyMâó4RìÅušv?9ãud_63’OeŠ©ÌD4ê¹®Áû k_žXôÉHº„ÿÞ?ö€“(v±gò¥Â¤´7ž‰O8yi>éä××&чƒñt:…õºÜd*ÁJIJ¥OR¥\1&í?Çß+‹®—¢¸ oy½ny_QDŠ’&v¤ãņåiÓUŠ’&jµÜþ Û&M˜•ðtîÏÀn€¯ôàd<ŸÈº]$¥HEGœL"•–¢ÒÁÉT¦~«qÒD&ƒ§GiT””RûÖK1J˜†|1Ë„Ucà0¹‚`SþØ’—þc½žÓz-Ä@^‹ðÿá/•çð¥„@Ä[Y&ÿ{þÌú{uguIç~,{®_*&^ªF1çC:‹°ý÷šeƒlâ?MòlR~µˆñb+P!+ Oâ¦1-ƒ‹KzŸÄÿèu„Ue¡d•ðÿ§?›õ‘Uk"‹üȪL‰7™g‚ênHŒMÎ-®œ·ÖÄUuqú$éSç -# /CK±ªc —¦éÔ¦OxºŽBWßm™ì‰ ù• b_®—úöaÜ°e×בãÚ7È6Áw¤ÒØ „òx°S‰ Pê!ïcE6U«4ZŒ'ŽÖ¯4/¤ÞùìQ§n•|Oïϳ²¸‘z¹Púh1Ö5)x|-qLô 9ãÒ©Kêõ4¶ð‰¼UÚÒ%õÄóÅ*}Ìf’¥T±F7êT„îÕµzÆþgûq'³?INØ“AsGau ºîuØÕîÀ6(nØd¨Ø(!.wÅûk _¡‹n(ŸÍI£“ñdö²p¤žÑG±x*‡ ›. H+ÁH¼×W½ï`ª˜nH;ÜÁ2–Î1ÔiÞ©Ò$ %ãy’¸@A2–.嫼`—†àñ&Xöà af2˜¦ãÁÝá.$Òäí` qŒ²¹x`Q™ÌæO¯§DCzš(äI ‘ç!OåÒû@ÚÉ$§O·}¤~³ëÔí°[½&uõ‰Ë1ÉR·g”UÑCö²Ç&Ùã>ç„ÄóhI£'âÅĤTg+yáqH3‡ÔÛAª¨œA†ü±T5ÙÃGSS¹´`tui¢é¹ÁL´ØðÍJƒ7ksöfµÁ›Í9z3Ù…Q[£i wçH°æb¡š`s̃†º5ŃHß…ÄÙÉžsÈkB^Ó^oÎö2ÆGmÇzUMηÉ'a”:÷!bQå,”ÈR-ªÐUḛ>-t–²g‡üªMøU'Ùî2?d`Ûª¢CüºÍ tøÊLu…ïÃU?ÛÚìÕmvMž=“=ª(M˜ì†ÙœÅgs;¸ÙçÕ`oáb’+ºögÛ:TêÉ…ó*Ø<„ìG°{„ EÌDfדÛILÁc"΂#¯)7žÜ¤¯IÞ¹ÇT¹Mð̾®ò0ÂØ‹¤ˆ’cH‡|Ê– ÓÈAE[ŸVÖέ®-µý][±9 â -åM(oZ"oZ/nÐ\ø5:RÖÄ€ÉÀÉ4~\šoxwã܆Øò¦çßXÆÕ«1©í™ãN:›s$¼h¥»âù\M*…‡MÄÓá#é ¢¤þf©nuq³ -¥ -¹tüýI,\QNàç]Ù|ê´—]P°‚*UKŽoa38c Œ»«³ hMpw]mŽ¹cú/¯ÑÐÃPѹs€Åk­gñÀ¾,#äòsdQèë%w+©mãÙ”¹•ó |¯“(?Âas2ã1…Ç쉔´2·Üj°…ÞþùˆÐkÊÐÒ›4´Ê£íÂø<.÷ìVíÚ8X—F³ãÅp߶…û¶u‘îpF?+ÑùºB6uTDé1’âQ‰©¦nΉ+tž£]‚yôg›hW÷œ"d-™¬è+}jvÕW=°C‰ðè2ÅtUlgÇ \|0~NMœ·Ž"g"Õ%«3VÊÏ©¸òÒØ´ -¬– ¬sE50«u{~c ÚrŸ9¤êbA­Ù´í35Üœ;gqHç „ —¦“;Ä¥ ·n;ªÜ‘4WÊëhKˆ¼ö_Mk©H‡0pCF6¹ËÁ¤aà-ؽny:+¹3Ïù Ó]$ü £¡ðÄ¡VI>Ô¤ä‹UÔhì¤/ïÜBtÒ·ÊÙ±3?%‘ˆ”l¦ˆG‡§ø«Ÿ, ºur¡H4 JuÑ0ØÜè<£®Ìê‚w‡>¦ÐÇÔ¦»ýmª¸¨1Å(×\ô -Åî¯  »°³*½Þ†é/2ü::ÚŠY™ŸØ‹>×W”iè+ç””ºCã¥tñpÞ^±64¡ŸÖ¸y«J•Lž$§ßžIº©éæ·Áz Öñî#cÁ±í½×{Úáõ¤Û‡Nw•Ã»F•ãÒ{×$ÜçNž5¡¾ãéÄâ„7ÉÓ*‚. È–ˬm™…Û@iELå&/{·“Nc^@‹ÜVs%+/·ëºVLWàz0ÒªÂñŠ®AáÁSq^Öâ6Ÿi@/É ^xBkia•÷œÝ}Å‘p ïO`5 ÎÊ+¬Í˜mEé9L,øOL~u–¸(K¡w›‘·ÂUz;·"[تé|иuZý´2nE­~\·§"·§Z¸=dˆ™2¹1l‹ApC¹‘@Ì×íÜŠÕ_Câ¦3›]jæi3¦óKÛ:?¼!ÀHÁã–dÑbTg±!÷´é^ú¦Âmcˆ7¤F€áÀVÝæc…‰Jg#ƒàÃZ‚Y÷À0aã-©0HˆŒâsÉêxfÓ½j £ÉÃÅ| )d´UÍÛ.V˜@ɽ NÜl§RÌh2ôÍŒ $&¿ç ®ü%õø-`ü²9¸†‹¶¤“ѶÜ©ñ5 .>£/'2ŽÞ§'{“Õ1ò§ „4lƒ6ç1ćU ´*î}wï:TÙ­ïns2 ”ÎéÜd×°¹w¬Š¼iÑ=: -´¤‰ÞAÈ)k§É[è]| Xwx†8û!OVCGò\'Ø¢%nºÃíh”(#U5ø€³{ntÁÈÀðËóLš8Ѓˆ‚Ëâ->[”É*•<ÌAá,Gá…uá̼ Ü®Fú§Q´è¼‹Kðý#¡/º!‘ˆ¶Èhœ8ðE–Ë(Ó]²"ÂÀOsé N‰Áˆ]†å‡‘Üø$jxY)–—éÉÀFtF¡œ³p^¥ÓYá«ÇäLTÑøê¡ †tÇ,Ïð`°3.’8ÜÂÒ-ÜôÕlò2âeå(ŠÎZ”?y‡Ž"ÈÙƒÊÇÎv9Ÿà—**Wg¢]•äeêˆÌªpY¥ŠË”è¿l%q²Ä,:gÛ„T-Bó¼d…©~zu¥—á²EÅG -ä–‚4²MÁú)é¼?†`œ€…Øá¬yÅ^Õ v`*-Ѫ¸ ”Ó–Á˜WL㇕`al"TÊpi« KÖ¨¡—Ÿ{=§XbŒð<·r)> @-˜©µÁ™$3ȹ‘ÉïʔŔ°1Ðøý“ÌmÍÚ5`í*DªX*o–³!Á­->¢+7Žªâ.H!cˆˆñÅ&FTHL$î®eÌîaæìÑ7c@œD*sEO ;&ˆP½$!ŸCÙ3¶6 Y>°ŸZ“£hñŽ}.†¸˜7–ÒVÉÀ"Âké2¢^ðÆóîíJýŸ*åY[þ%âSMo¶²¼‹"¸ºÊ^Û¨µ*5ÜöˆÛ¯¹«V©Úñ‘R[fRY4_£¼ wpÒIÅýaîðõ¾vèŸ{=–r•uܾ׹ɤ&vÕëP±Ú{—3& fÓY—l)~‘‘‰¤",ß(×ãgOÏ™ ñ=ÃìÈÐ.²…ʉå¼;¼@xÄ¿ÏVšèê½Í£Ž(ÀelL¥¿-þÑߦ,dùmðß:ý­óßý­ u‡þæÖKÌ¢¿UþÛæñß¼Aò{d@x¸±ßÌõvÃؘ÷:@D|bmÿw¯¾ð<ûbó+ä¥Ó¹›ÏK:4s \,f3ëùio¶Tp¤¡ì €Œ‘Ëóôﲇä’õÞ]Ù)øgwöĈcƒt$›ËÁ)[üó¤Ääúò‹…éëkwƒôP6QšÂƒ3/Æáöbþ[ÚL~yÜcðûÐÞá}Ù¤Sõá©÷äT:ƒG1×ɧÆJE~}_æd>š˜…ö=¥“©t2ïdhZÍŸÂ_ÅS9‡>í]›)9϶xŽD{‹çç˜qY€j”ƒ]ZŒaRðýêÐÑÉd3N€IgAp^rSkû5–Ê$1¢J€¾aâuŠûH'÷Ï[z–¦†#¡Ô‰@ýOÅ1÷Bø gµ“úæã—:m1EC÷¥B1;ÕZN6wt¸¹‡íyx‰%Ç9_—6Be!¬ÒÂø‰6–Æ-^…t*Ñé¼8ª(1Å͵ºz*Èäžj5çÕ올ëf£Îœ D©-ïŒlÄlMCzs"•,Né+ØÚ^éŠáž5œ£I'51„›‹’­í—º¨Õ¡±,¶^§†ñâþ| -ÛAºVY§ „?áz£ÙR>á @ÔSË¥?–Q­FaÊ)Æ“Xš)ö ñXdÞ‡ Ôå)L*ß»×I¦JSÒ§M—X`ˆh¦·¢H¹՛RNÚ‘÷hÆÉK#yÎY»Æ–ˆH#õø›¤n:^t¤1íaIÎðð»Xý»mi¯S˜”Ä E'Ÿ:M6œê64ƒmÚl©(MPW*E²¯ñý¥b¨ß¼¡ëHgs•âùâX6žOJ â¨U0þ|ÌUO1y‹ãéLœÂ(¤’R…:hr‚ĨP&©jªU»¬êy}âÍ4›çȊ’Šo"ä;ÒAçdQÚžLãc©tªxJÌk²’–†ã™‰R|‘F²9>u¢ñ£ý»GâyL\xÎ -n‰ßS¨J ²4.ˆB:•q¤"F¦^ƒ#C; ML -^dùÄúŠÞ5™JLŽä³ã©´s›ÃJjž‘bK–Ìí¥8´& ƒ«´r´¼˜æø¸e;ù¸ õ+ð®HXkƒÂ‰t*‡g,¶“xæ&ðÀü|Ï×ÇíScN²¼žÓ¾Â£¥1¼ðwd1Æ`-‰ -¦K?>dòdáE;…/ÅÓñLÂñ“Ç`>›ëÏ;qÕ\!ÙzÝàdÚHé•ß-M3càšÇÕ¼ø¸Ì1Dñ^x{m¹¢î°£NzW¼ˆ y8›ˆ§ù¼u«—Å]tò»‡¼%½‚õoek–úÎtÖ'WJ»”_ŽÁ¡¹x2Y¶:¦ÈÉl¨Ë–¯ L³Œ8L¾’¹TÌOé˜ äêý»¥þR1+Xj¥°¥\<‡ç¾š*¥ã.›Uj²ÞxŸ'œ´¬»åѦ>ú·¥LÖ]LR*Cè?[H¹¨l(íT w¬Ž„ó®6Rv–Ù [f¼ËÌ»HQ:T}wÒE0à]>YHK‹­CÈJJ…c™¼ -"»·ŒÖëŽOLÒ÷Âv­ÔŸ§ï%½ü½~îo¨=•e÷3&6êebÞ±¢Å-Þx´ü]¥µ÷µñ‰M6é.g¬ïÎTÒÉöíÍbâÀLÜ‘I%°þÅ'¤ÏUÜû0½Ãq%ܲ¶ÈxËŠéX’¾‚µÃIoýæ¡+ïjAêä’Søq:©\2pãÔ;*jˆéð–Ëåò±ÔÖbig¼¨`1ËCQë—Ì»6£i7(K­°:$ ì‰,I5Ô¨ØdY±Š} ;†G´šÈx¥Z£ ™Ø1f…Õš#QHôúo&åâ…±Tq*ž«_”–ÉW*æ¥é|,‘ÍÀq 8…ú%×#ñâ´ÿfÕÒùd,›‡µo€.8Ž?1AÄjÕRDDxÛª2ðVŒc:ž‹M,w¼6n¹‰©£1l˜a©lý -t¹ó¤ž´"™a¸xR WÅK8³ÇcTõ^"©Ìx¶A±¼ç\Aƒ¢D‹ç õÖ<ÄCæ$ñzjÈ |…“PÖÃ&”ö2 -£fñ©xþhÁu€Â.kk\Öƒu€Òeì­bNÆ3ÅX2Ëg3õ–n®KT1̪•Ãüì .êÈ%OæbùröB~µ’A.ÇøÏ$¬SŽÚWµ[Ì'óÿêUª8)Æm B^˜Šq[01uêh–æÌÒ´I5KÊ.j¿Ê01ÞP€z˜BÑéõÊBºyÌM’ÒØ)i(Mº|n…ëg¼ž¤Z"×Çžj \Ç·†+ -ÇM N -’χ[UšS#ÑŸh,>p™ãöwy)ÝÆÛjX®Ž(¢…réÄ©:JÊ$2…zCŠËSiáÞ«Éé ül_2„»6’ùl®6Ê”ù¦¤j™BiŒ÷ -Ug\iדSƒµ¥À>¨[$ãLÄ]¿FMVŠÕµLý2i%A¼VFM9»Œ'¼ÇITµ”Ÿ#›Õ$Ì}þšZ¬3ª£:âÙ\¢Žº@ -êtH–êZ¾uV0®^Sf]Ê$1R:žÉpGŠkuW”jÄ…1Ow©´÷ŽØhL¢ÁÁñ"fž÷õŽÞµä¾õÒqµA ¢Á£ëW3p0 SÜù¿E8pÁ]ÒÏ J®#ªYßms¹R©ÌÑt¡ˆ;ªÆÜ]£*]»eåØxÞ9VŸ{í9u‹£Xªà­õÚVcñt3t¤eÙƒt5âë^>žƒÁÈBCahhÌ WUq÷"‚çƒÏ¾3ë—FXòg ->úZM{G¯w$ŸM`ž!¶V'~oGê/=ï1 ¬Þªò6 –¥»hΫ¬ÏÄmj¦”¦ÐPƒHáÖ)«øG¯¨*W› äúk^irQ fOñb-È–žHoD[¨‘2Z9ýl$µœ¨¬ÃÖµê]×úë#OÖˆZM—3 Æ˲EÜMO\KíÒ‰l)pÁËe ^Ì)K Ш¾˜¡2‚oHÂnWá4M£‘l‚ù"ÿª®¦B”»9Õ-Þ¿Uˆ¿>.ŠG26â.þl$üÕ*Â?åãϲ97BF)G¦¾€ü£DPheÄNRU4^*.©7b1ÈËbV|ü(f6à1JS<ù»ÜhìQ³Z`ÙJ Æ×Õ¦ÈF ¶–PÙZâºøîÌQ !y”pï†i™ž‹g¸mÚ7âjwÿèàîÝ–>䀱#‘Èö’=²gàHäîmÛÐPßþ]ö–ñžüÖÑñ½«‡Ñ–}‘Hþ.9²VÛuàÖÍûo-Ú©{ï;mí¿»4¹cíÎáÜéÓ§#‘õoŠD6¬ëŽDz÷twõXúðöý§Ý~KD½5ûnY“‡ŸûÍÃiü¥çvüW·µsàVg'Ágí$<×o½óð±õø˺uäçö7&vïŸ[ÈÏdm¹~Þ“Ø ?äg¿u;Êá/½ÝÐöÍýÖÈãøÛú­ðó`WÏÎu±þMøû(Ô}`gÏÑ}Û´joLöÁO‚¨>;-à/Q…<Ý1èäÁÏ;àgtû·ë…/qü—­¨“cyò“ôÅƘú”û|Çàøá­§{ŒÜäö±ƒr÷Ž›‡Jý14|Ë4Ðé?x¬Ð³cûÀuïáíck6ß;4¾nWÏÐm%t?22˜¨«‡ þÆþÕ‘Iuh7Ú«­¹w³üÆ;•§O¯Í­Éßj{RÆÁèÝ÷¨Û#Ѿɩmù|tõÀßdŠaòîg“·áè=èyº&‡fu7ŒóÆ#ˆkcðÜÍu·ÝÁGS¼l÷f˜ýGð“Ý\lMB-·Þb¡ûöÅ”wßs ÿ@ò–µÛûVk€OolâØý‡¶ݺ}möІ÷o8º9¹éÖcw§<¤ä¶ºÓ´ëé~ríÑcýSÙ‰ÒŽ›wìÞo·%îLmݵyãö½ÃÊ­ÇnI˜·ïØg 5¥ÄéÓ}G÷ÜÙ¸­˜7ÙeölîÝtkf05‘,võ˜S÷m‹ 9…[Ìí÷Œï¸uó¾ŽöÝ6¾Q3§îUî(Ãfï–Ý…]û·É›Jý·Ý½zÏä¢öí÷íNî^×Õ3¾5ÒzϘiöÆQ>±[ÙxÔ> Ë£ûö=øÍÃÙþÑRdrãÀvu|g¿’n¼upÝX¿uGïCC{÷n+ŸR:—§ ŸŽ¬^¯D#«±=éNîz ºKÃ4›ŒDnÙS<»Ù\­ßp¸;²~ß¡c‘ ›í „ÆɼâlÅö†_«wôf-ù´qW4½ñÖÂú E¶#k#ÝkoŽ¬Þ4´/²FÝ8é1ñÒ]»u¿ŽiÝfyg¤÷–ô½‘õÛG³‘ ·m‰E6ÞÞ=ÙtçýwF¢÷m ‹®ôM¤¶Fä©‘Û#JÁt"huqM•î0"úÚ›÷DŒM«ï˜Ê‘|ĺu/ŠØ;´]‘ÍwDîlI$ð E¶®½ËŒlÛ¶gä–;·NDnÍ(#›7 Eï]}$²}m~MdÇȱ[#»zr÷EvïÏ­ŽÜ-õG†ã=G"ûnÙ¸>2²Öع}¬?ݽW‹Ü!º#rgéîÈ¡ì¦í‘{ŽlÄo¹ïÐfäþÛÓ÷EÞxPß»óÀh$y(·&2žÜ6™ÌÆ‹‘£kå]‘©Íw‹d÷ÇvFŽ%î:)nRwuGvÇKÝ«s{»×¬^ÛÝ;yèŽîƒ·ÈÝÑBÏ»å½ñ-ÝHÙ;ÕÕÓ­?°yO·µo]o÷–Í™ûº·­‹ßÜ}kþîc݃“F»wܛֽûðît÷ð}»þöÞ³=u]kØ=ŸÏuñ&½ƒé½÷’¡§@ ! !ByŸwyþú9’M±m hnÖœkÜûÚslÔ544¤!UT•×·êî«6U5W­†ªK¡p_*U¿®ì«†ß(æ·PÁ©7Qßêù“j^õP,+}Ó«VÕµÎûPÇöÚZ÷æÕWׯöè\fµÿ{°T‡ŸCoêøÝç½:}[¬¨óu*«.·'uõ±æV7>#VuWmÔ«Ÿs•zP,Ô£÷ú·úÓYúThÕÓ»Ô‡z©K¼kT•Ø›FoI½k̽܇† -•>5eó[xìÿh¢¥¹R“J;ôš¼+aÕܘÛÍeÑ´mÁœæÑÞªjAõƒæí¦ô¡™UH¬:tñq ÐêrÞVIwÓ™Lu %¢»¯å†º5vëÞGžÝ4ݶéÖVc[¯[¶­zëÈÞÑ»[O6}¨zÔ'K3·¾P©¿ê«Ñ˜¾=6Ìõ½õÇþÍÛ5ë¿Ë…¾~5‰ÇüÓG#Jƒí-Ð1xÞ !òé_2ÙPÇpƒ¤¢¡1­ë ƒÃkq^6|%)¯a•,©ŒúäèÅhO™«F_¹5ÆzK›1÷“^«¶É«±SLµÏ3eÉ8Ž6P,ÆŸ/¿Ç¤Mÿ˜M6݃Úä}Jÿ˜by÷Ä”wiF¦šn60ug£žiø5x4MÆO¦Õ¬ÿ`6ߟÌNÿ¬oåUCsú™z3ßZÒ_æöMga¨–Zóçßf^©î| -­ÅÐW'-ÎláÖ¶Î,™evl©¼,Õ–îSÕeyyve,ßÃIÛªš6&V«6j¶ú‚Ö„5qûÓ¶–¾ÞfÖ–çÑe}~lßX'¶»ëúýž²™“76¯nøe‹ÌQ,¶RËжµÊamPjæm_Åé—]Ut…íÖ»»¡ÝÿªöØSë|Ï^ ®\öûf±gG Ñcÿ©ö†”ÁS®¦zBÅ<ƒ,U\UÕTë=ݦ†5—‡š¢xÚ‚¡¬Ð:·F»#R7~8 -êÆÑœùœŽ¡#5sLóÕ–Sû3N8½Ùe¾œ¥T¯ëì˜l9çë¨îsþ”Õz—1]Ÿº¼nã³+åynºª¾dÑõÐÄ]Ÿåw¿[Õ®P -­Û¾J™Ý‘°Oç.vÍ*wǤY¹G]ÍÒ½ti–óÄ´òÚ>•'—Ji=M{Åèy±¾Sž‹Éç5™’1¯ßñœ÷f“öº·qWï{‡_†/ïO «ó™Ý^_ÀøšEãY®WêøZQçÄ÷º˜™|ËW<¶ÜTÚþp>?÷—RI·ÿ>ºõKñÏ€ºwœ£R5ÔµæZæ#xiP÷‡-AÓ¸[ ³*%’Y±\°;ú˜ÇHZ¡ iJ_³;•Ë†Òiý2ÔH?•C¯í¢>´Pí0eP{ÂñÔç8\ýx)„þGcøçíþ9buS‘¨éÕ¹|¼Dú-M)2/z\QK®´ˆFÒçèmÉTˆöïoPíGçã¹.fµ¦&±èíâ)V™—«±AÖ’Ž-æƒ@Ü^ÉÙã ŸK¯´Êøë÷džPöž& ×àaœÈ¼vßí÷ö[âS?øHêÓÏd ¶þN–æÔ"ÙKæÔÉùâŬЦl·&W*á,GSõÕª˜zæZiMgýšöUn—ébÅfK?µ?éùóM=c×EÇ™¤ßdÌ4•‰ÌØôÝÍêÛŸËlÈþÈÞŽ&Íì°²Zæ”Ac$ç±ú{¹‚ñÅ’{Ò¾Üä~ÌÆEž -”Rùtu1Éw>2Ñü·éë½`i”¢…„ÑøYh>¼¤ -ŸÜ¢h\;o‹Ñ‘Ú\¬7>žŠ­Q´d¨<,K‘û^«„&#$/Ç«²Á¿è–#}gR¡-×õ Sù£õðyct([7Ñq2uÓhŽ7ŸÉòÖì{ÿ¸Mx3·múöö;ü˜®Øn²¡JºG9+ªµ¥ò“™è«ÎºZˆ=®«ýUoUS>½­kþìLU« Z…¶öföï ö*us}úîZ~{ìîû¶Y¬ÛGºf=g¿Ö{㼡T=šþF,ܨ •ÆûêmØ4½´ÔÍäC)ؼ¯ÇkÍE#4iyzGëæ#zÓzÓe>ÛÆdݭжïoÍö½_«j/Þ¢™Ž7ÿôÙ©˜ ¡Îûäæ¥k~Öøºé§æ°ûôàôß+ã·ûàG9vß°g÷ßcùÁñ¶4=”\ｇ×Þ0úhŒ¼(SÚñýããp}R>Ùt -íSè68|jÖêå§YãË×s¼ê^EyÿÖûL;­ÙÌô ‡¯ÿÒù0?Ý…õsjê˜<÷V/Maø8ˆÅ[íÁ}¼Z¬ ÕÚ0tW­[¯­êpaÞ½øoW-…ö¥¾t<¼ÌJ…Á«×òþùZ{¡¯ß­ãÈ]¤<£jä>9úJ…îÞ\ùŸ—·J»³~›¼Å]ï.§«ð^©ëúï“åLùáªMCUûwëãk²XŒÝÆÐ¸Ö >Œ§·e¤}~z«/…Ïú£ùûsþ^ˆLº¯×I+ðM–ŸóÁW8Sóu׎ѷªóýŽ‡ëßß=g¶8ÕúiFïxœ¾Ø©ÈÌâ³­fż«=ûFÃs'UQÏ«õþó|fVÚÿsÔóÓ. T ¥Ë6ZÄmO­EßäË-Ú·ÀÿFw³Yç~ººÙYþ+MûËÐf‡{¿…^èպЦbÞ&ÒÆÁŽŽý+¼Mõ›Ãˆ«éìf,Þ5›¯˜½ªÜ=ÀÅÙðW…y$µ÷Wp++%öÖ>­GVÉ„MôF½Áûh1˜¾K,Åâ×–“ñíS‰UüÚb„Šh9:b-Äoâݪƒí&jîª!**|Æ -Ë\áóìŠeæ¾N¥ÌîXE÷`·#úРc)ºtk2¾È}ߧÊbVi1èSãm©ñ6ó¯:oæ¢7îX°ü¨¿‰/Ö/¾lÆyã×¢¦¦¨eú3ýn¡4ñPÏfŠ‡-óe|YrÚÚx¨¬\l_*®’ïùZ9vêh2}IÛlú÷ƒ¨Ê¯]Ÿ/Õ}÷¹Uúó)é¾·ZÐl´¼Lê«sÔ«^gÓnM;ùù¥o+´é7ª8 Lã ¼ùZµ‡ÇD#ek‰GÊ~/øO²OñàÒömN[´ë¬!÷ú¦ÐÒ…•}îWÖé·§¶ÏB;Á·äÇ*õá»wpŠãY—~q”âa¤¨2á $/S½÷Þ ý¥ûÁYeÒêÿÔ$êVõ”ICgðºVhŸóKæÅS3¤>ÜýP8¡uéÌÉ[Ë3žÁ6³©ÑÚmÕhÚ6˜à¿ÆæÌ[ùƒ‰ÙAÙ¾ÅXó÷Š¯É/mLo]˜׉r]÷ƒÓoŒ‡Š.…Öj=ÅÓý·9r²£ùydÌ™L»_ÒÅe ›O?òµ]Ôkpœ²Pý:n"«e”üòU¿™tËÚxªV·3–€M‚Ó…¯:êKÍzæpëõ!誟è`£S-ÊPÔkRã*y𶽵).§hrbôZ7M³õZ¦Oê›´}Öe•æûŽÅ‹ôèPèWZj¨*¸é¿ÍÑlxóW¸)1¯§,™g&0g×Y@M·C™£ÑŒÅ™Ž½G6á´#áÐëçm®É]‚Qx•¤g z)YÜ%àiŸ‡!r‡_¹éï<ÊdºO5¶w¸½÷ÞÏ—D#ýiN¿ÙK?™Á@¯Iz‡ÍZ8ŸîG—U¢ªy¹I4œ.Tû ßSW~ózŸé<ÇÖ»"bZ-§™ö&ûÀü_¶E~[aÝYú­žy¥Ë;0š£êP›©!²B›é;Ì­¤»SÌÆ‹¦;xÓŽÑ5ä÷Œ^Ty&‹99 ôøEÉÍ8»Ü·åÄT, -©¯æÈÚM9’TÑDÿä¨1NÔ;œÅC•*Ñ(®Ö‡EÉ«IV¹o+¾³PâïHŽýØÆ ~9­ï£¬A77¦>¼w÷™!6¥G‹……BJ@h—¦8v…QÎ%úEÝÚÂÖç,î©%[ºðé0}Ÿ©Pýç»”¨ô’7ÙÔ[ÑO9JÃ×lêõ»K O:È%¿¼‘ö>l戴‘|Cá¥A¡E©UÒ¹‰v„¢ª…i;õlÏSËïýeYåæªa `¹oy%*,go©ñrìÅÒÒúPuÕ…ü>W¡QP÷zò7¯s¤x_ÜFúþˆä˜ =Õ–M¹Uÿõ;Q.¦íãˆ!Ëð¦Ï{›Ù{¼Õ( ²­£Ð†ÍTæqWóŒevëÌê¼Áªóu ó2ùÑm# ;È×€̺}‰Çˆ>q÷57±ß« òHüéݾ»“-QêÖ§hZ±áÛçýx竤Ê? gÈ0éÒo }3Üe³}£òƒÎ’¹ÓêRž!ïé¦öñó g¤aýÚ„ÑÜ,ci¼DP)ÖÚ¨cw4æhÄ뢟nl¡ãÚ+Κ¿ÒH—Jyk6œñé§8/ï¦)ózã&®M~)®«‡}ÿôùcc“;ÞÚ}ÕüÍcØk&\:¥&ã4jz)G.UŽã¿¢¨‰;"ÔhŒ9,†Tl÷R¹¿aÞ¤¿Ã“X(¦èÒ½õ²³†ŸFè_ï"Háï’LP‰°5ëóXÓwÎþý<ƒ_ #™Œ_Ç_¤wQ%ñK·ûp˜Xp|Ü â»ÄGw¿ѯàÔTé$Ñi@yAá$˜¤àl2Ɖ¥ÓÀß…èÀö±ÐAð‹'Y(Rúã¦ÄpˆunaÒ¿ á§t6bû¢d^ƉcJqúªíŠ N—ç.–0+/ûÊ‹JV­ìŠàUƒBË«æ7¸°öaÓ٠ˉ[:WûtP»˜sû4(´ÜºŒ -59É*a’LÿµËéþ#ÓƆŒf_.ïrµo*ü6ËäE´°"LNéž³-ŽÈ>ÏøåŠP¡òzªB»+Â/›»2 rƒˆqS“Úÿ–~Ê‹tS/û~Çj1œZî[-ý2.‰„@W íRXÝ ¦‘2yÉÒåH+·¨Yil/t‘£ÚÇå¸ ;*$é¬íºæiÍ®¦Ä»è4Þyýc…þ‹)þ]N}Þ–í ðO×fÜ $¦‰»·÷R+KsÞ€‘h´JÓlÜá˜(´9m®ÊÄcð²t“uMÎöW SýÊÆÚùvRqgÜO¾˜ -ŸD%•¬bf£]}s -Í@±ÆÍ)KÙð…^šw ßcñ.]\˜ž…HxòO…D©]Czò&eMí$·¬ŒÕ¯ìM¢aûѶ›;ؤçÒ3¬]lç80Ÿ¯ù4*¥ßj˺}\}@jsæ'ÅèÛ.§êAz2$:RhÙ“¡} ÅYcfØD%›þl÷SãO¯=ôö­}Gú­ÉÊ$úìóݽÎpâ¬{ýh£ÆÖ¿žöA¡–¼ ìošYxM;{@4ýn5Ƙj®è3RÔ*úÔ‡¹›²£‘ম¸åÄ™‹LP³·e÷a$ÇØuPÍÓÅ"u©±ñ Ì´ùMãd%DlR¡‹2í|ߪù/4³Øëÿ\ퟕÐÀdTJ¡ ½š³Ïýh ëúÞÐt<㤜9÷ ?ØšÒøÈ›¤0m,³ö¹–~kšsHNgÓNãk†éôLFpõº‰X¿òe{O&u63]?;µoÿ¦öÃýÁï{)“µjå¥û}»™à¯»ÚDí¶Þʦ¯ÛûÆ>ÓQ¾ÉzX¥Ê¥á|?GæÛœ÷T/©GeÐÍõûÛ–õdC5h+%'7f¤ÚWßö}6ˆ--½äÄQîì Tðõû‹ÂƒÈ-.íû½µÍøâ&3£)ݲ»îÜV3ÇZƒŸm _Æ](5yëN:ó  -mà+;{k1ŽÝ›mïe&³÷ºØEéþK9½ ]zèÕö^VBpï}G-9k¬~…²iϽÓí>™C”1Ëg[fõÞd¹ÿA—'ª—¨·¸NÛî^­ô¾›ÝÕðª²ÓÔÆ4ˆŸuþ3§íP|[žú‘ýcÔ{Æå¹Ü$.—Žl$h;âÁü3ù]‰¢QŒ£xܺ“•µëõÝ2c6yßX#Ö¾Ýá¦äÕ¨üñ`ûgzËßãÁN–#±™¹{`¨ÐÒ#vØÒõæé°Yc÷æMÊ€æé«T÷¡ôh^)Óê„W]v«ñwÎt©q£ÚGïk}•h ‹i2}jú”~k¤ßÚŒev³Nx≇ÌKõËÈS—6–Éwí Ԁʷ´ß¶rwÀõ0ñaC|a ¬Õ;ûSpÜó¿¡o›P½°Ôf8ŠØQ‹)›‚òØÌöCv~¤ÎèÏ7ªäw%Þ5Ú?ÀuµNø‡ów›#ß²l¾CUŒô±†æÇš5ÌFÞ#Ç°\pîƒØ¯8É·Öä×7õ†ÚËäÞ VºñÐ<à8ÌÚæ=\/èMŸ¿63‰¾D¿|}þ¾roMS{}65òNôÀ‘üò«ý”Óò3Ž+µ/ºÂXæ Ñë‘—Îê4é›Ä]#þsØ6ÔËÔ8r³Œ³Ú7æíäR·©Vl§z7ã‹/<~yH^îªIwÛ¹:¨øžZ‰ª–5cå@þ1»Ú(Á›J´¡†Vò†JšÄ[ú]ýäöç¶R‡Æ¦}P´Ö‡{Íp£{5Ú>nÝáÌÐ~?çjÞLÊü ¦ží«uu”?óc¦÷¹z¡m‡å™[e†I“A¡ Þ˜]‰FC§ä4–Xalyc¥Ú4‹2#„·EH^M%žŠ/tK[žÍIm`’È4¾ÀÝ{ÀýœüF™LR¢¯à`€§JFëÔÒØ©ghÖhÅ&ñptÞÆÛþ¦”N ˆQr¢_“™<ºõ²rºQó8¡l8–IáM?23v¿óÆgx4,Ò;HQÿu©Ñá>°"èð+o³Ænu•(u¯¬H#¥Û×ôëwÀÂ^³@)3 )_™¼ïå/#„gÏVOÝ­^0×|;ûL¿Š_é¡i¬ ”Ÿálâkª¢Í¡¼ö‚j/åoSöÇt©¶3ªš³V·f3Ž7C6˜¸Sm+´m@’¿a÷F²‰hÒ«{Ò…Á—ö@þ|U¨lžî°,µ¥KU -IKn -[ÖÕn6N­ú¨Î§Ã¬Òdq )lÿ&àD=ÇõŒºaÌÏ -Öe2™É¥¯áëm×®âZîêÛ¦BYCá;øx¼UgÓÕ›zV;w#áÒ½Ç]É{÷¾/nÔ ô×^Á¢×ð¾º:•@ÿÏÇÃV›Q0ü’.‡Å襌방' ·!ÙÌ–Ã',Hü¢––{ºPǵvEc©—“Nã[C0‡¾øŠ§Ì¥Äì£bbÏœ¤z*Ýì·3>Ɇ¿3¾?Ы¸®œéA=÷˜Óæžü¨½LÖ¬—Wåìªý¸†VEè5J¬'{ã7i[å#ÌjµQ¯e–5-^¤¹µh*ÿ¢C£ÀKk³ç-6Ù9e› bÎlÈ¢ÚOàÚ{Øž¿¾e ¥\€]Ét[­=ªñƒ¯D}8cf‹N¯ê=ù­ò²4¥x~þ³í•ûñ…Ž¥í -|¡Z¥š¨¯›ÎÃųH¾ÇK4l%¿Q -¿¼Ùçm@\¨Ãw¨Än^ËjáêÞêþÀÌþ’ÎòÖ#ï5tí§Ì๠J~›u¬zÛÆXÚG춃jzÌZ·çÆêw9ÅÊ[UbÞôƒTîÂívD¦ÅççBßÉêÖóQÒ½N¢™ši³æäô+ß?’ ¶ÌWòó³O^k«tÑ`Èâeгn”ø|ÓªQf¥+(·1×H?T^ËBìF]¨_q»³$j¦>!_¾lq\\¯¨ÂC.Ì뛼 奼í ×Ùçžó·1×n1ýžÝ”"£$Küã~Δƒ–š< Á¡cH¿éæj華Šdû_6;'–qÏòŽjciò{æ:^2óëÅeœºBà$Üzý,àh—ì n¹ÂÛBWtâKcG•.Ÿ~Ò£pOµ¯0Zçv£!úmŽÄÇ£ÝVtr@“«|>Û_=Y³qý¨‘¸ûšý°›!šUoìcÛµü꽯Ñ_O±\¤ß=^ÇÞè)³i6Ù—Íè´G;¶•^›ñz;Û¨êÌ -m$îS¥é8µ)_ýuÎÍ5=ëÞ2ÉÔšs`ª&¿¬ŽF®sß™¦ßj«äÞôǮاõíJ@ˆ´ÆÁ¬ñy½?Ž@‰…z`ƒ¿€ÝÚÆÀ˜ß—û¥Qɦ¢ß(2›@[‰º§‡Z2ªä.Uµ5÷yÍ‚}}Ù&ñÏ2Ê÷w›cžÄeüÜFò`N-TøvÎ2 âŠ$õa¤ó§Mcû š%•’ ¿¥€CÔy#ˆXÉo+gÓ-2¨a'_•R~€W‚»{Aˆ/jbUSe^º£‡Ð t{æe20gz&3ò±sÀ¼üìmV>™v×(gyaï_ÆsäUh–yñ=É£qì›jæCKw iŠ7Y}N›ÕÜg¬]ÿ;RÝ]VVíï:œ÷§4ˆEÓ#za?/»pL‘Ð08‰¤ŸÆ]5«¡í;.‚øÿvp“¼ ÀUK}Ä_­éÂWª˜%Þ œÝP›Ñ)éOTï-3Vþ96o/Þº Ï¼¬Uc<"{2ÃFƳ_«çÄ|ïGŠJþ•ž#[gŒ }ˆ·kf€Á>ˆÆOKbSV³Ï†''î é¢òb%nv¿*TòwÞ`§9Dyei‹âÓs7µRV¤Þ±aDýä—m’ög43Û?AåþPæ¹áB¾í‡åÏ:Àz_¬£LùQË8]ªâ·‡r'^³á`Uüg´=[ï´šK²NŠ< HþQÏRéÅUD›c´%çÄ¿£/ÑLÑ^ìøwÕÙ×xë |Z>R§Imµ‰íôdn65¦/_ktÊŽpßt„Ï“ê÷ÍGðX=áÞ/³é=­Ü-'Nµ¸Ä9r&Ó¶¨™>‹šÄ+}¨gáu4]ßÆÛ=ÎÒ¹¦Ëûäl³âÅ}OW›êÆ2†]Ó'åà $92›—þË„vywV¥á¡ð….>ÊuêÝÅ¢DŽ8æK,VLø.nj0gn$΢܇CŸ{|3@}šu(‡ðÁ§Û5ãoü‹ö‘ƒ·UÔ\Žèx¬ï¤2·Ò/iÊÇóžE·=¶Æ£ÿ9ž‡Æb0ŸoÙsz¤ÄøbÕýþýco Ê,™Ù¾cŽýÏ­äa-œ&ŸÜ+tüÆþÕƒ ’btÑ}ÏÁI¹@'j¼nî™Ø’øÔÃ2ûX[Ñ„mÛ«t¾C²!¹Q`ð{$ÕwGÎÌ弜¬ú5X âüýÚ¢ú 5,®–¿þçc4ýµüÜ6Ó_lÙI»6 –øë½CÒö*Û/$Wpè_n`ÿ™­Í‘*õ ©#F*ÒQ3Á½ÆS|Ý+"Ë/Ùî§ST<¿V3ÄËèט¾aðëkð|m’(kŒŠ¹\¿|àä¦iú8ò}0LlST±ø²åÙÛ>úñò×z:™¢AÇ&»g¼,ÆsyŠ,oDcM^$%ý3®È’T?q¬Fõ÷p:Éh63Šëþyz®Pn¤Za}5˜¾Rçæs:ÂN•EÓNô%3ßIí†ãí³ƒ‰dhw©7÷~k8sï5öaÛ>SБ²¿tæ2G=Ï>s¬5´SvóÉûX¹ð_Nw¸tíÔvÑB®Xc•L¿r“¼ú.2H¿QÝèî©Ó¹ó~( &ÒrÓé*´Jó‹­ª´8³)¥9VRöH×HGåQ¦Œ5÷Ò¹¼A IOܱÊsÔ•ô»üÞ{ï÷=íLA öO©|”Z,¢ƒiî«õ9L>ßÔ Ë,kFSþvJÕ±ç÷¥DÞKe1w'n_…—è×Åo*ÿ\Mí"­0 ¥sE5~ìj°H½å•‰J¯Ñ̆3îÏmžËËŹ(Í÷†"ÎKî'ª4¼R6¥µk)­~+¥´||6”Öd׳f`gÍm¹Ã%¦Äc‚ÎF4×|ò2´T>éÓN}T•¦(´û—lö¥?猩ó=ô1÷E½êºivÊBËÖâñË_¢ìî:3+XNÛqÅkú™cÊÊ8®!…vñ”2Åm®²mŽæ”º}EБºgwõ©X¤½ÅSÿ£.iäÙócšSt¤ --/ÚEÏ{_‹4¯þÚï…# +–êV·*©B»ô×"úh0õPÊ«9ôâ‹Dêù0ibîáHÝÝ•¥L7t¤ôB'¯ªì«Wã»3Þ -EJeí´H¤^µ¶ZO$„"Eõ‚¢}¦rêû¦`«rÖ¸¾0´u„"]<~¼›H«z=¯N]¡Õ×+©B‹šä0íÕîâÉY¼Å‘kÕöàŽÜ¤Ì(R÷ŒéS/œŠT¡¥£õ|UT+:ZH‹žNÛ‰4ûâê½.ÁH—‰')–cyÍ»gÝ™p¤a•a©÷éB‘.ÖÏ­Ñ{xâEŠb¡›R8t'˜WºVÕ?ë{Ÿp¤îî•-…«‚9Ue¿Z÷mº¦Ð -å•ÊÎÆEÑHu7•QN,Ò•«©ïy‘¢X˜¾mSÚ‰½UG‘úæ¼H—ú\ßµ‰´k5ð"õüLêwL¤™ÇI–é}”*. ŠÖt×üäÇçNÆÜB‘Råï·‘h¤þ›LoÈ‹Dz‰¶GU¾*uáHKúû’Í6[FZ¿qùD#-çÜ%7=V -åõÁM5 -u£H¤ëU½œ{ð FÚ¢Vc^¤t,›h£[û‡X¤ªÕÓG…#-ô-ƒò6&iÛÚÒ¡^)–×vÂR‹E:¦î-‘žp¤·…ѧòÅdØGªÐ²¢}ªnD#¿ôE‘HcT¯—p GZ1«Ú¹ ‰wÁ¼>»:ÑHUÝžÉ.iX©\,²Õ ŽÔLGJ»½ï¤RÅ7«üáið‡/•ÖŽiké$`âEúÓ÷}/èHÑhoÈsrj¬¢ÚÎV­å@Þ6ìÚÊøæE_òsš¹S›HW13Oj)MŸé4ΧU°ˆG1¶€¨Q™L3‹#µŠB­R?2øº(Òìš?¦FìÖ6iÌQ²ò"UhUbƒ®X³\æ¨S«©Ò™Z½àH©ƒœ¶\ŸtØ„"-*ùÅ»XdÌÛ1µú} ](ÂÛþ9ÿ©ë¥`}jŽFf_BO·’?ZÕ-DMe¯–íÓú.PŽç¶O[â½|×èïz¥Ðó×çñ§7ʯw‰§nmÿô Ä¨Êzò)þëz+xú‘I -=ݔո›UD½XYœÛA-×=MßÏöé#¿›Q­÷Ôz_b‡ÏÛšªFâ©÷Ñ ñ4ÿ‘Þ?=,±{σYü×OCEüiÏàî=Ý–Xï½7ý5Þ£Qñ§î–u þ4b{kJ”˜#p»ÅŸÞF]3ñ§•Ÿ`H¢Ä‚ºù¬/úk¥ÎœòlŸöü§š›èdût¸<(1¥“JsŸÏy30,fîvSXý4:7†çH:ÝL7¢gp—Üüõ\ŒíæHŽEé‰#•´Ûiõ¨XOÇÌõ†ßªÔ­Ñ_¹*šaêSÙÎcöu?CA¨õ“gµ}Q%ª2HžÇîxúØBåÔGªVF÷Â3VIDÕ.==¥…+žçt÷×~ãŸêÑÔ³³ÆÃn^oa¡HÑÌbýtp.;Rz¦#©Wç9O"‘v÷‘Òú'¯ªìÜ%)žçˆFŠç9ïÛHs_ûHñ,)¬4²óê®kØ\õ8Y‘¾êtjVñbí©‹©çkÿ_{}Œ-.à'ñHUÙM4RZûŠ”ž%¡!ÒÿŸ…òŠ ¸/iNãkÿ,}ÌÅkJX§ˆEz'Q¼·¥–P¤[9†u -n­jðsËî/ëF]2Eì²Þs¥(Nß{“z62B¤U­½´À–7Ë*„;î^SºÑÓ¥³7ËD¹NÊ©Q\0.¾¹,jÉXXÿ¤¬¦Ôn²^Ã' -Öðwwl«ÇhNΖ·L*Ð_il7ÈÐ1óDŠ¾YEuXn¬MÛx+5UÝŲy©g[ŸØ£Š­vÿOtnxml4f:œ}ÇE/£dƘW86A:ÁI…Öþ1JÓÿ¨w¥c²õ¡<¤>¿+@';ÉÑŒvóåfÆK×Ã$*»M‡¥é°àØ6®9.ò˜!SÚXH$ -þgÐIïçÕBùsiB¥²tþ›l«A½JFýáþÙfÏi¶ùÛÎÅ6ªú-YX²ë}ŽZûö‰G±c…%ØrÒ–ÑØÇ K7sdž–¹Ó[wDfZVÈvIÉsʽ¿à•;«^N,ù·”íA®d mJœÂÚ Fôd£&®èÉðEÏ.÷¢¢‡Ñúk£kYp -p—d®èUm:F);,» žK8½’ŸžþZdûeWv‘²ëeœOëdIXl‹ôJÆ'5«ê’¬¡XèÌÅ‚µ›cEýlÔÑ}H¬Œç»ÆÏÕ6/Ì?¹’nSû²=󘶞™!VKÎÐÓ9vKßuCN;×áîD«‰zs¨º¼bÙŒ•'ŒÔ(4lMäƾÍxðG¼%ÏÉû@ñ¤ÀD{Bë¨rfn¿ËžÞï„Ó:t®÷}_¸.ícuÐBÿ³‘‚ô"…@³¨ú*éêdûwlCôAOÎHAv`qj´jÚÒ5tEÆýêÆ)Ú`í3säP “¨ZOdzå¾JrÇ´0Ù¢ç5ç0%?iS›kÛ_NÒY/Oü+éa‰.@…VFý¢Ä÷Ö—hO¬¾ŸÛKj±Â2±^ñ$Tâce|—*]n¯Ò&©r·ë³Lý1kâ5xL¥“WXŽMGTr¹ý%¾e -j£ÃœØ…‡΋D`v2™Thq`¹s,1'És]’ÉÍ°¼³ÃX'®ïyêU?È\¢3iMvðÁ³r§ÂrlSÊP¯[¸W¾ç¹cü%½rÓœ8Q¦×cKg%X6Ìø"·tt²'ܲÙkJ¨ºGƒ~SædAP1Dyé öcvM -;!ò¦x¼„ìf⛤vÝÓÂÓ-qBtËcer¤§òg†Õ*·Ña¸CTž6]Ÿ2'7 l2Únj2¤XëÓ?¤X©}Z¾¯N‰@̨ñYØO­t!ñ!ÖAž–?ü1^(IXòMÔÅ€‘–5¬+œj)ÍßÊ ;m¾/ž?W¬Õ¸‘+±wûa ýãȈÌoµ"š|ÅZ32ŠzÓÿt„$Þ '8ñ™“£Ö¿:ѬˆŠ -Õ‹Ha¹ÉÝÁå• endstream endobj 734 0 obj <>stream -…ÅëâŽâ’×Á]šÀ|½­}©Y÷qëÒw‘k=µHÙ\š A#9i”c’eÆÊ"_ƒ¶È0É~¹ú»‹Ó÷ešIPÖ܆Ó͸q’–O·û v°ÞO)é ±Ö,NÈPàÇ%:²ûŽbEzq÷B»*–· á^ÒÖÇœ=·t$ì5ì–¼[[O™Æ¿±ªÒóW•Œ€^qd]ÅkšÕ–ݼÄ+EÒ#Ó¾ Öô¢-B¡=i DY ^Þ_æ%î(RÔ’í<ÖÔ:x¹bë–2­Ñ¥ƒqïh†vEN†øƒÞ XSîG»í -ïYã•!èn»k³"¥ÃÕeC‚ºìVS‹UÜý5æ;™ýNº×áã }ó¥ë)TMnqÉÇXGå.AâÀ‚2 -om”É8°ÈêB¹Ò©ï—($e²´-ךÌ!O¡=w"y^jP,÷@:5+ûPZùálG¾ÓÇ=î¸OÆ]!%ïå”U”lõÓÌŸÊ;<%úî‰Æ­—åäÜU¼½Ü8ØRÁšïŸº©V^Ë•hÛñEd*…«*/•hMÜ_.^vŵ&)Ñäö}Îùm7Ááh8k¯t8\‰ÆYz©íWqöºkãW™¤‘Œ³tȱ¸í›sww<͇ -}§Ej6×E³$iiÍ W'%Ý™òÅ, -L|¹TZȬ½âÀN›4 -væÌã#kÚì¾Þ[›š¤Boc­ÓU{‘Ppí“çØ„Z!3œƒ­GòUrÎj1[5Îß~,ÜË1ô-ýË1ûå3¾$éŒ?Òû.DFÃãû)dî¦HÑ{H†—Ú :mé±Pî(†j퓧ö è÷(±ðôQ ‡#¥ß …²³'óÂ9u4¯0i{òi£!N¼U`,ìÐc!G?{4ì/$ÆBKÒ@¯ï³7bH濃 uy‘t±‹rß!ÅWßR(Ò¡´F)[ÓEA}¨åH~9½6·¡ îµ–(19êîá|P¨%÷²ú¹Ôê)î -6þn¨·Óñ’$ÑI7-IKñî؆ËÃIÚp)cXRȘR6¾)ò¤k¼ùþpÉ]ô-J«Kp·- -ìøÚ‚7}[½Á9Je2’áR–=Yde€[“öýæ[I,˜ˆŠ÷ˆkúœÁZMJ”Ì!¾W•e»ÀQö Ï,8þr¾·‡7_ú>ÛªÇí«d9³èEúÒt --:i:Æcèr:i:Ô’‰øÐI{Ðx žéC'íA‡ÏT!áCw)ǃŽ™ñ]îC'íAÇœ©r¹Ýa¤l:!oÁs|è¤=èX¾oùÐI{Ðq|x/ð¡Ûý%èA'¹^y‚YÒƒŽkO–Þ,îö™KOz÷À‹{u­¹3“Äž½¢D¥¤§õjŽ€÷—Zòv¹Ì‘eû -ð-½ÂÆY–Þ4´?¯êè“ŽêÒ;Íä–ÓŒëeÃõÝñòœÁêS¹å´Jpþ’>¾KvþèIÇ -w°@nþÅÝDwûúä%êèæ>‰$ñ<X®$ÊIÒenëÉuÄv,SÖd ‚.2üÃG¨ÎÜ -"0ãëZ•gš³ÖUÉÙ¥v$kr·‚0¾¢¢În/üg6gªpv;ºl£ãì&¡óË[pÀkiÙéiJp–»Ù7.#0î,Ó¡1ÈŠÎÉO“ÉY¾ë’ÌI¯ÐÞžAV†“©,Ó¡ó‡å—téÜ–ÄZv¥¶±™ÎD ‡îŸ3ÉÄ¿à©g¯X¡\uÄ—ü¤½À8,ãšvLí’ïÇÇÛsu®Ç nrGü_pÃ5°ôdñDq÷:žáZ¸³ÀOjÑDí«N^ýq-˜{àåÚVs| ¦dýóã;æ#¯1лÓq`œs.iYB.2Ü5‹SÛUV‰ øÌœ_bK!'gòð(„SJŒgø]Eø¾3ÉNOP±ô1y -ö*º–ÑÙyþ`\»åQ9¡ ¸ž$Âõ|¬vô?Gzw²óÃïÝÒ“˜Ý©³½;/²'¬Šå÷(žÄÑ£Qöõ|'â3"æ*wB E—’~â\•F¸[`·c}ŸU¢^iÇ&qûâá#·é•¢Å!¥¹à Iy²Í°mœ«G -¬v~ŽyÅr´Hñ–\8Ѽ#åwÄcˆ+uD=¢2â£ù©úØÓJ+ÉIpq“¯N4ٙõÜDç–Sz%jÞá5#–«Â©á$á^‰ÝÙŽœeÄÝH$I¸3‹ŽbåtšEFtwzáT‹ 'I\‹ŒK˜ØùgwÉXd\š JÅmcg¹6d‘¡w‰¹ç8J:2…eΡ¿Ð€ñ]”¶È(䘰ڑ½ŽrÎS*’ØÇÝÐD,2\ÔãþyçYdØx\0¹î93v®‹»Ã‰·dy®æÁêŠï‡kjù{if|r”e¤Í©Oj ‚¦t¦Qç°EÌK´IGÌsŠQeÍplO¯7´K7°3{à•”ØÉa§¸‰oæx ó«;ûÜ°ýŒûÕº_OȯNHX x -5‚âÒñÔ{é]â[õ +©õÓ:áù i8q;?I8Ùç]äÇÚ]'á="ìwúÕsüá„öõa§1²þpz Êô‡Swâ"àÇöGÞ{ı{ ¸­†ëw‰†'ä'vJY8… G)8þ\LdY'upbñ¹þb¤4‰NStO$O·”³'²)kOäѾߚ]ì^…YæNÈ£áðŽµ8g…— çb, -‘/\X¥Ã‘>‹”µþøŽgì\'n“p'Ø­Wò»aw~Ø Ñw2»!¯ò­=)Ñ] 'zDq:áþtÓ3ºaKî±2 -Ý°uz7<ÔÆqy_Þ ÑnÕéåŸL‡#·JÌ^™pH8BZxðœ³nèpdx‡sOÓÝf_v=:KàŸÖ¨8û‹•¥0y«OôÍ,*¡÷\8Ù#Õ¡’åD*Ï#Õ¡r_]v"ã&9¡$íÏT!r“œL+\úøj™å2훫œ}}²/‘¾€k…;ÿ¹£ùcÝû&x§Êù;z×€üB—½³”N’¨Uáøýqò“ä8v³¤àvWIo:!_:AKïEÞt'ÙaÎö¦ò¥ã•o:¡¬±ÖÄ yÓ Ma·ý…œ7ÏÇ3—±¹#2 o:!_:¶mœŒ7üB.ñ¦;mD>×›î°:Y4¯$ìM'¶2BÖ›NÈ?MzoÏ9ÞtBŠ¡ˆoÂÞtÜÚe|鎜«p†7r£ îM'”$Þió¼é„|é4¥‹½é„”S¶¥—Œ7PýíuRÞtB¾tw -_èM'”,ÿÊ“¼éŽ–o:!_º Kì¨b(]bç{Ó -£Þ\ÌêYgyÓqØøÒ±uË“ƒ8r/÷Þ—n7"ó¦Z-a4%’Þtb³W²ÞtÂ+#¤½éDÇ¢ÞtB…A¯&õ¦* qo:!-’Ÿçâ  ói9´q'€ÌýbG.Þ•éH7UŠ–»B{¸r+îHw´³³ ß(ª]¸¯n—$í1;Ì%÷Õ µOÅQ÷CFf9ñüÄ? Ç ™MàCÆ}¯G•¼ªN4Iâ·Ë½êUn’pÊ)gåt¤3ó%ŒT¢ÊîÇ“Eæœ+až#+þŒ;UÛf-Ç2÷]$°JÆ5w¬3U¤Uò‹®¹;¸]NÖúð©×Ü Þ_yÌ‘îä3Á÷' \twN†8×ÜIÝ2#e¥:íš;Q‹"û¢»ã;GŽ\s‡5¥£Ý]|ͤţß7þœs®fzÄ€*ßÏÂkúd8¿ÊØ¢TÚ|ª/Êšñt+*•§tÒÞC‘ö‰êœ;y°À˼ î!+i´÷|<²±Yžç£ÑÀ³*œŽIFj2¹ܟ“‘É"¥#~7ÛSXÆÎ.˜üÍf» X#2ϱÖx8òuOD‘ºÈ§ ³Soš-ÊW“OŽp½°'’R{¨cÆžxAñ­ìB3qÑ=Ô­Ù™ª;ÿ¦<ñ\Ÿxƒárâ§[ÊñØ\NäÜÓu¬ïœ{|¶çãåê}}›„#ƒÜÕj:§Ðá\|[5ÊÁÕZ¬Y’WN……(Ñù÷+¼zØ/%]€r-ð¨"ÈÜpwlG„|"©îN¼·úÌî„</¾¢‹ÃÝ%7åÉ÷'’¾)ïìnÈ {¥‘çØ w -¹þ!Ýp'tßëã᪾ŒîdžjŽ½Ÿîd\}Ô!ëPÍ9óÜQ|Ü jÓ’EöÅŽµ›6FÀ±Ö¡²Š:ÖÊ?çŠçkÖÖjM‡CŸÓ*´ÑI`.v4‰e '¦ž|Xegú· -DÓ:LqØ ÑwtCŽÚÃJ\Ž º1I¸ä â3Q,ÇNpc¢3yú´]´^P`„6cÑó—“ܘ$KÌKj^‰ê²%çmÞŠ1ÏOßž(áÆtšJ’Cªp†k²ÓµòÃýÖ ‰S›äÍφKéëw{HäÞHwÖuÂúÊæDzZ$ÿºÇÝž#EY>®ÉÎêˆ&$[‡éžyÝ£À>Xìêyùuø>:î'îõ|ÜÇ%éøu›½p’ÃÃ~ÞŒ·×–—ñmT?즤4•BÚE»õÕ•–þkCij$¼Ø¯ÿZÝx÷•úÊÞ™ø6ú_d6a'ok]âÞÃf÷‡óWí×vÁ½èN¯™ÍÙú&ç6ÃPs7»æNðÆ9údcÚa«'îûGe“ÞŠH¤^µfê -õÅœðzt¤¬Úçøþå”ñHs¹Ew)ß Oýã]?ò\Ó°³)à' ß¿Zœ} ×5ÍújŠ9áy>Lñ¶i¾—ü|7ùΔ®EÜ1Z¶ 6CÌ©—ÙO%O8”1îZU2²vd•'Cà$Ú®eÎò®½ÄÙíȼYι֙‹-ËôÞQìxé1и`dû‹µàÀÄwiɱñ¼fÏŠËžyßÁ¡„¨:¢‡òœ4GÎîÁÒ§ËXõÆwâ{æ6Ó¾ƒý–bV•ìÿ“‚­.n«Ñ|¸à5wôÔ }„;Gžøù÷ô²,@':’=¬¸kIgŸs;~ô >V'],"”$f|ÉaÏœ¢˜íø¨6ÎMÇÜéäêc'ºjNråd< ÄjpJ朊œÀúþ%Aä^cö¸B`ÇnÑ9𮕠-¬+}ƒ÷i%vÌ—ç„L -¯\žYbÇîÓ9©ÄF+±À܅ŵÃUôÇr¾ \Àcçˆqâz³×¼åú²$ÿ^€r}ÛÅ•³¼åúʾÅLÔíMŽàf|k'G¼åúÊô²/Y>€§šËð”ëˆçÈç{r“$î6´ó:¬d‚—ò¿‘Ä¥|ø$ŠåêÁuÎ¥|;«Âo½”OäF6—ò‰Ë1’—ò)Ø뺿íR¾­Ö÷{/哾-‹Ô¥|’÷W^p)7Iü“[¸;B˜ôq ¦ïõãÎrù·ú}6ï^¿³=¹yEà[ýH %}«ŸÜݶÇîõ“µOéâ{ý¶uNàl(‰{ýN8ê‚{ýØ5tx«gwú÷úI;61;î.¿×OZaÙAtò½~ÙeÝê'fS:õ^?éšTÈ2è¿×O:kLK¾ü^?é[ýäß"}¯Ÿt†X£ØE÷úí«IúTóËîõ“Þq&î“xÉÁÙü[ý6ìÅ÷ú‰ù¶™Éx¥¹\E"û*9÷úIOuÙ» /¹×UÚ]ï¼ûø.÷y?ï^?ÁPvCÞ¥÷ñÉ[PÙ¬%I„CÂñ}c·¼ø^?é[ýðê‰{ý6ÝPäV?ö9$—Üë'½I÷}÷úí†AbÛ+/½×Ï,¹ášž¿¸×Oza˜ñà¾ü^?é….A_Ñ3îõr“Üëï—ÝÇ'wuøè}|—žâ±½È½~ÒJ¼Ê¾×OZÊöJ;rü…´šÃmcçßë'.Ö­~çžÚÄ¿×ï\¿×Óîõ“ -¥5#sß±©µÜûø.s†g¤åá½~œ5ãÓœánõ;ñìtÑ{ýö±Ýê'm—¯Ÿ˜`³Âu¯ŸôF§Íîô‹ïõã”ØÁ­~‚çÂq¯ßÉv˳îõ“1¯$p¯Ÿô­~'ï¹×OZ1äʱóïõ“V Wϸ×OúV?‰•‘Sb%nõÛ•Þë'½XÔ»öÄ{ý¤oõ“µ–$ó -=q È¡w­Hÿ‚˜‘–ìááiù.jVŒ3WìÓi—âv™±òAÊ´{dã=×m1Ë3i¥hÖ~?¿ö‹Óí±Ò¶ÛCÌæM!YõTgûòäÍD±ï[ÞoUêÖ -m¦l+Ñ·õùæ¥þ(µXDœÉhó©kPj§>·R¤²JÓ¬^S:ƒõsè+˜4G#‹¸¹YúÐS™Û¹‹Ê2q*ûô”§r–õUö%¨òÃý ucZ¢z¡ê!½‡ª÷cIªù9|¥ZúéÕ*;~¨Ö¼¨¡Ú±ašzªLJÔÓÊÖ¡úë”z6Ýi©çpϸXÜZõ‹eâÉ»XÎt…Å:¸zXªçÉ7›«ì_o<;ßgUT/^½ò¦™Ô:}†~TU·îQÍtaÏêœîþ­þ¹ô«Å«¹‘­ê£µðÈkÞ¹êó£ÇŒÕWÖ}¢*1g±Û›U¹?Ùµ•ñÍ­î ZzÙþ¥ÆñW@iþr×8W@âû$ÝÆ®9¶ ‹. ”]õ|c¨Ñ9UhEój½¸Ñ¯©X”Ê6ÚY*§žUKû•ö$Ý9‡6Ì»•¾‹RÅø$f2ŸöÅòqÂß©N6fzɾûD#s–G<£Nlì­å{MF LOÙ5¾³C_Ÿ‰½koÚ¥Á:PaÛ"þ'„/Õ¬*­v][߶ùˆ/Ò àäíg¢zF›­â~º®ß³ò2Qj·{æ´E»Îò…š~?*´Ù¾ñ¡„út׃u –0hÂý¬¶23§¨çq‰?Ú7BØ“×ïþ2àü¾°-_ª“71^¿h¼¶à–ÍÇ”ÍFÏ_ò¶ÝíæL«“ÇéytÅZódj<°;({ÔmØ%ô‰z5‚ÛAÓþ#Ó †·â–ýz/\9º}”µí¡Áªß>(SûìèsA#Ω‘s.nÞ—³B»}”µîÑ5ú®lgÆ{®BáÓàÌ.Mà{…>68l’+«À&€jÊŒ_± |Sô±`ÝÊ’õö3ômÙF¿D_cƒ>ÞQXf;Ð?¯øc‡ ÖkLmLý56#=)¤ìÝ]“(–”#´‰´[±Ñ±¸’~—_¡ zÆ·Ô‡7[I~ùÕ~V“¤«‹T&0þìu+ùQˆwö}ˆBáílã²ClRû½ÍH0•hêBÏ©_ižh$¦mº79“¦Óz/±B•• Ô¼®]ózf×ï°¼o,Ô5mßè»;." vã12 T-+ý*òº‰ù+yïÊã®Þ¥÷ö„ ü‘;Ô¡ß ºÝvûàIÝžîô¨ïoï ¨ŸëQ·_iû¼ÒbŒ5º=ÿÖÜM Œt t‹@YKèV²íõùÖ/É>øÁ»Hñ¯º ”}e@ÔÓ_e3Îÿ¦³ãÛLFŸ#ìæ‘72^ºoúú#ú§;£ M3ãÊ'º6p·Ð³Nº¨ð.µÎÊÆL¤Ç– ™™HáË…L"¨ÂnKLÙýƒ4Q,>Ôâ>#K0='A:?ëÛª€$z4EW£U^3¶íû;å–ðx^B -Š¯•O=O¯<)€ß ®:j%~SŠ¹¦ÁO·ä÷ -O7áÎ'tuâq)ªNà9÷Îçp iŽ9í§áýÎDçtgQŒtë!Ì5F»k -…µòͯûY™€!}ûÑ<åÙÆ™››ã,½@ç™eYÚý*•P¡Þ­ðË-Î -LFv–q†³.FÁ)MŒQýhMÊit]û±’þN¥ŠÆrÔ«všFÊÔÌÄÖ(‘‚…´‹¬v5Ryììéo;jbÄØÀ© Ô7p‹ &Ô-BV—.ôà@í%mqäz6fNJ‡†Á–ùîiÙwÑ5‰ÆÊM·è¯8]­ß_ ½Ó$žöJÒ=*7”½2R\¼ª™s®áæ$ŠÅú9Ž£½™ÒŒ†ØnØîzà°qTmºBq½0L#]Š9M¡®²U`Ú_ *ÅW;û\ÎÊ[;&Cée]ìÜ 3/ÝÛTܽpt¯e’gìí“Ç»Goœ\0µFÁ9kb@ë–̽ÜXCß•È»ö™=“‡éî±+â«y+Vv‘ mªA¡=ZF+mXù¼ "âÜ×$>›äQ,³BË -‚κ@’i°ÈHƒB+™ -ë¥Ù°mö]ˆæñlP"µÁ¹9<ÿlá–˜XCÄoZd†hÛ¾‡z†ïÎx»;Uƒ{v zÓ!¢¬LZœû¨èÊÞB“+¥8oÚM¬DM]¡êö‘onâîG#÷£»fñlä÷u‹‰ûÑÊýhç~ä–}k…Û}aá~äf猶6_Âع…`wq>:ÍÜ–ýÄ ïqúô£${ g¾Z¿‘n0.,?Z÷mºæLvÍ3÷pþ0zÖy꙳ÿ­Œb5ÕÆ< Œ?å°«Ñø67C‹àûTß̆3î3–êçMÖJMÚ·Tê*iW¼`±u¥Æ7΢Xe¸C©Y6%”a]d±·ªPvM¿Í†χ»_™—ÉO`kÒ*{ÔXÝ®(›»9pÍEVhÜ÷ÖFš(=ÒÒÚó^¡÷ÝbÚ@Ã]()R%Çwë5Nç³Ë•`Í›±ÒÉ %”¼kݲ,Wt´5ºÐñ|ÉÆ}PÚh«ê’Ù>î6Ë{ÄŽmÕ”cX~H¸t‹§£Æ1Zû=ŠYK2ìߤgÜî˜ï~pd -uðÓfWò5ÌL€h³á­%pé\Þ ¾Èf†÷ïú"päÞ{I‡å'P¢-[hZkÊ9µ²ON8Ì>|©Û£§z´ä¿™îÿþ~Ú‡ZÌ3±ÛZ1è)žo§8›YjöÛ¿ú£Í¤Âã£ç~zúîZ<ŸðD,ÌL'Ùy@*'eÛþ0kßÍ—(–}Å¢ÿèoç¤%#ûA`5Ø=0ÓnÉ<*›_v¬ìßô|£Ý;ûÁ<õ¾{à`=È%ð¨qkÚ‡ò‚¦1Ãíë·öëïî×Ý=Ywä5qŠ™ýä­Yíx‰p±Õ6Á¾Ôšt°ø®°š¶]àÓ«´ˆÕ5“†•]bNc,ÚwÃä—íÝ”¨¾¼•Ó¥‚²¾—É»ó«RÜ¥:-wq7é4æ³á}x --kåÈ.ĤgUÕŒrO÷þ÷D}­gî_«Ý’w’µ_¶½ªÛsm›Wý/oÔ?}»¦Ò¶2’6]Ka5¶mß6û6Ò£†OøŽ‡¶c·ÊãiÓw†ÿr11â*Û÷l͘ôñ}vÝf¾Äüìfºiñ•‘‰©’…„n/XŽYiÆCÑA¸bíÌ`#%}ÛÆfˆ-HhX¸6C;-Âèn¶ëMVºåÐ} /t6¹Ê•Œ»½p¨ó opò¨ÍHïSÚnV¢­ŒøPÏÀHç”g[¤µ 5^¯¼û9°(.‡“ä—jšÅ=JÃ3 -½Rqìm‚LSaJ61¡Þô‰Çý[3=$ì§íÿUø.ÍóËïvûÐìwë¯Ñ¢²¿§¿,ŠÂž(8Íéë,»£ÿ»JÏ^ÖߣéêWð—=QO -~Ozô2{ý¢{ŸçÙ·ŠL›l†Z—˜5Šié·@n’WßEé7ª=0Õ»òl•Bý›¤ÂJíÈQÂÊIÌ2Ó;ÆÎ[žczÍ3ªV¯I-’ëŒù¦Üæõ)Zåò| 3?éû¬'¯Ð&òž 63<$Ÿou_)³ /Vz|` mÜ(Ö!”{³<ÛP±Ò)á[7ÎF §‰H³òÛ•c<¾1¹ÕT·Ø¼v‹Ä°ÍýUi¹é䕦õê~N7qš!É2³fû;Ñ_ÑíYÁXÞFñŽ[Aëg3MTŒá–1S›þˆ;Œaó×çÈ´1¾Ñ}eo|£? ÖM_A±wsÙ½ â­\ÑJÝX¦u–šgOÛç 1³MjšTdû ee[Ûxæ5–i]zOlðúÖýP—`™ÖY1çRŒÅB?bÅ+Ø°Ø5¡üh¦õ¨~®Ñƒ;ýÑk*ÑÇj|vŸ^|FßeéñÛ„´›Q’nmx¡ÑOŸcYö£A¾‚ª¶Z±3æv|&úØt0öuÆŠ_}pÙoêþ¾Ñ‘»WDt¡u3oàMPܽ«Ûþ°­ÓƒŒ9RϼbßÆPüÂ=¬/æ‡Km–±:ÕºyÆj|öîÍ6€g-?€õ°úC›ÄQ½0Fñ{g‘oUWFºß;«zóÀªîîV˜å]…&…Qg‚ØN=Œ^Ít¾l_ï4~'}¸…¹Þ;…Û´qóÝàÇ´ùn¢2ãúóìÔÑWι¯Lë?ËRËÒ›%í´()K­AÈBwhŸ³Í¤íâ»uÉ!9› ÑöÉm†´aåŒu]7½‘ò¨]œofÜÛóyÉàrgdÛÅCßw¸®”øA‡Ùupx$³»c/÷©ÞÛó·¶ÈME8l¢>ê$ƒ¹BË[»`.<»`ñƒ¹ª‰›Ü’å›íõìõŠÒÀÚ·¯gWíYÙ`.(JºÄdeClùâ‰×öÙEÎ-±Gþ›e+â>÷ôç»#µxïá{+ÄÓ('“†}“£òéúpÕtÿ£Ã÷ËjT¶‘ÜUI÷i'àRX1¶oFH×}’J¾_Ëû*ùVZþ^•—RʳJÎÒù£JÎœiãÿÍ*9®š J®àïÇú-*9Šeoúm*9ncH)ß©äÉ}•1=u££99óC¤×2=p *ÒÙ¼}u3Ô^lXMÅùv{V6˜ßãfÑØã`„ú'2ßdQˆu÷¦7 ?ÛÞ·Ò§ïã¾vãÖb»Ä·‘¨ë=p=ƒv»“ßzñÇî¬Û¹ ¥° ×.`½5ï ·;³­•±ØÒú6Öî÷#•ì¬&H‚~1Š±USøØ\;›PÒ‘+«lu?7o6£0zðò£Š*¥‚ÃÑÏL_Ù¦ …V‹¾©Vë9~ÁÓOŽÞÇÓòà?£…ÂñËñ‹¢ÿÿuþò~9=üê—Y* ô«¿\¿^fóÿ•§ -mßžX¬Òã—Õx6,þó+ˆ¿êÜ”›…ô¯à/æ}WŸùAè—%‹ê£Ÿ çFlˆê£¤öQä õ«ó?蟄bþ‡þ;GßR6§k“¢ÎЗEôç'úð?¿Ü¿n~=Ï/wÀóëé—ËëûåFŸPˆBÏñÇí;ÛÿúQi ¢óÑo»ÑÿÐK¨˜éøÓƒÕ øËãt|~E§ðÿþ,ÿü®Ý®ÿ×nhÀ¿‘k·z€0×nP€¹v?.åÚ-¸v·NãÚídqíŽáÚ NãÚ=åÚMÎáÚýàsíqíl¸vC2\»' L€¿‡kw¦5×®| ϵ{Õ¿”kW;ü®Ý±þ\»Îà7ríîõïâÚµ ¿—k÷° ×®gøopí~ö¯àÚ• ÿ=®ÝÛþr®]½ð_åÚîoæÚu ÿm®ÝçþZ®]±p®ÝóþB®]¥p5®Ýùþ6®]ŸpM®Ýÿþ*®]™pe®Ýÿ®]“p}®Ý ÿ®]ðàÚñoàÚuÿ®Ýÿx®]ðâÚÝñÏæÚµÿ,®Ý#ÿ`®]uðãÚòOåÚõÿD®Ý/ÿH®]iðåÚ]óÏãÚ5ÿ\®Ý;ÿ0®]]ðæÚôOâÚuÿt®ÝGÿ®]QðpínúgpíZ€?ƒk÷Ô?€kWü1\»³þÓ¹výÀŸÄµûë?škWüa\»Ëþs¹vÍÀŸÇµ{í?”kW ü‘\»ãþ¹vÀŸÊµûî?ŽkWüÁ\»ûþ³¸vmÀŸÍµ{ð?ˆkWüñ\»ÿS¸v=ÀßÀµûñ?‚kWü%\»+_Ÿk×ü=\»7_™k?üU\»C_“k—=üm\»O_k<ü…\»[_‡k—:ü\»g_k9üµ\»sÿ·¹vyÀß̵û÷•k6üå\»‹ÿ÷¸vIÀßϵ{ù‰k3ü+¸vGÿopí2€ ×îë¿k0ü‹¸vwÿ½\»tàßŵ{üoäÚE ÿ:®Ýé×.Wø7rí~ÿ[¸v¡À¿”kw}ò\»Dàß˵{?a®]œð¯æÚ€$×.Kø·sm@Œk$üÛ¹¶ Ƶ €¿Dž\»À\[àÚEÀ†k ƒK¹vù°çÚòà"®]xp¸¶H8Ÿk—|®-ÎäÚÅ€× çpí2@˜kˆ“¹v ʵÅÃi\»´âÚâ®]TáÚBB.×.'Žsm9!‹k²¸¶¨8εK¹\[ZáÚÅÀ \[`Hqí²à4®-3D¹vÁp2×Â\»T8‡kK®]$œÉµ…Ÿk—çsmùÁáÚ…ÀE\[„ì¹vIp)×–"®] àÚ‚sí2€ ×–% Làï„ ¤a)@˜@ -&„ ¤a)@˜@ -&„ ¤a)@˜@ -&„ ¤a)@˜@ -&„ ¤a)@˜@ -&„ ¤a)@˜@ -&„ Da)@˜@ -&„ Da)@˜@ -&„ Da)@˜@&„ Da)@˜@&„ Da@˜@ -&„ Da)@˜@&„ Da)@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜@&„ Da@˜ðÿ·w&pRT×þFQA[PMÀž¥gŸž®ê}ö¥g߇fcöéÙ÷]öMTEQ4 ¢ˆ@T\A“ü£FMbŒ5’gÔ§11ïýÏ­ªÞ{`f¨©;ËùúAšêê®úýι§î­å¶(`1AD°˜ " -XL,&‚ˆAD‹ ‚ ¢€ÅAQÀb‚ ˆ(`1AD°˜ " -XL,&‚ˆAD‹ ‚ ¢€ÅAQÀb‚ ˆ(`1AD°˜ " -XL,&‚ˆAD‹ ‚ ¢€ÅAQÀb‚ ˆ(`1AD°˜ " -XL,&‚ˆAD‹ ‚ ¢€ÅAQÀb‚ ˆ(`1AD°˜ " -XL,&‚ˆAD‹ ‚ ¢€ÅAQÀb‚ ˆ(`1AD°˜ " -XL,&‚ˆAD‹ ‚ ¢€ÅAQÀb‚ ˆ(`1AD°˜ " -XL,&‚ˆAD‹ ‚ ¢€ÅAQÀb‚ ˆ(`1AD°˜ " -XL,&‚ˆAD‹ ‚ ¢€ÅAQÀb‚ ˆ(`1AD°˜ " -XL,&‚ˆAD‹ ‚ ¢€ÅAQÀb‚ ˆ(`1AD°˜ " -XL,&‚ˆAD‹ ‚ ¢€ÅAQÀb‚ ˆ(`1AD°˜ " -XL…ÿs„öî 2,ù?hï‚ Ã,&‚ˆADÁµ˜`=A¤¿¸­$XLé/½¬'‚ôKT¬'‚ô‘ËV,&‚ô…¾¬'‚\š>V,)‚ôFËÖA\p%Á’‚ Ï•—,,2jŒ‚ ‚ " ´{R"WhûØ„=ýÅ0gx˜.8}5ášaËÕO2eòä['M¼åæ ão"¦å-§í3©$c®³'LœT ܾqü-“§Ïôðöõ V*C†#JepPP€¿ŸÂËS>kÆmÓ¦Ü:ñ– 7ÝxÃØ뇎áàö5ׂÛ§Îôô Që ¡á‘Ȉðð°Pƒ^«aUÊ _…x>mÊ$âø¸ë¯ §í6Iîëo?qÚ,ï@FmJJIKÏÈ~dd¤§¥¦$%ÆÇÅD†‡ê5lH¿—|æô)“n†sN;Á¯ºŠ$·ì–©³|‚µáq)Y¹Å¥eå•ÃŒŠŠŠò²Ò’¹Esr³3ÓRM1¡:uH ¯·|ÆÔ[oá §žà|rO˜<Ó;X•”]Xfnhiëèêz†dw»:;;ÚZ›ëk«+J‹ ò²3Rb#Œš@ϙӈác¯»–v‚_õ ’ܧ{j£RrKëÚz/[¹fíºõÃŽuk׬^µrùÒ% çuw´4ÖV—çç¤'ÅEèÙ _0|ÒÍ7Ý`©(ÔÜ»¯7~òL&<)·¼©géÚM[¶íعk×îáÅ®]»عãþm[ï½{Ó†u«Wܱh^gK}uYáìô„h£:Ø×cÆ”‰PQ„§f7ôo¼yªG ..»´iÁªÍÛ÷ì;xèð‘£G>9|€½=zäÈá'=öèþGöîÙµã¾{7ݹfùâyíÕ%s2“¢lâöé“ù§WÁ‰Ý×C-ñ O)¬ëYuÏ®GŽŸ8yêôàìðà ÏéÓ/žzáùçž}úØSGÜ¿w÷Ž­›ï\µd^k]yAVb”Aåï5sêDRÁér¤{Ó¤¾ê謲¶¥›wühxñ!ðÁïßïÝßýö7ï\xóõs/yáı#=üÀÖ+¶×•æ¦Æ™¯™PÁo€§SPˆÝp¤”’ -oÚsää¹·ßûèãO>ýìóáÆgŸ}öé_>ùóÇúãG¼ÿîÿûõ…7_}éôsÇïß}ßÆ Z«‹²I‚ß>mÒÙ8J…ôÇM˜âšRܲl˾ãgÏ¿÷ÇO¿øêë‹n\¼xñë¯ÿöÕ—_þõóÏþòç?ýáÃ÷÷ëó¯½tê™#vo½sYwCy^j¬AåçqÛdj…·{ª§2<­´m嶃'Îýæ£O¿¼øÍ·ß}?ìøî»ï¾ýöÿøæ¿ÿ~ñ믾üëgùø¿ÿÝ;o¾üâ3Gö?pÏšEm梬„pu 7ÒC¡à7±ûbwDzYÇš‡N¾ñîÇ_\üÇ÷?üøÏáÇÀ?üÏÿ|ÿÝ·`úÅ¿}ùù_>þè½_¿ùò©ã‡ön߸¼»¡,79J§$e<¿-v‡Dd”w­ÝyøÔ[ïòÕ7ßÿøÓ¿þ=üø᧟~ß žó÷¿}ùÙŸÁð7~õüSîºgÍÂÖª‚ô8£ÊO>}Ò„ÇJï7TÞpóT¯ÈÌŠîu»Žœ>ÿÁ§_ûÃOÿþùçÿ ;~æà}ÏÁòoÿûâ—Ÿÿù£wß~íô3Oìݶaigíܬø0Ößó¶['ÜÈuP$õ›·{±»²{ý®£g.|øÙÅï~ü˜ý¿Ã‹ïÄóŸþùÃÿ|ûÍÅ/?ûøƒß¾õòóOx`óÊye³“"Ô^3&ß,½ßŽvï>zæí>ÿû÷ÿü÷ÏÄmÚ·0ö ׉åã`ø×_üåï½óÚé§pËÚE-•sR¢´œß2©ýîÍîÿ 3³°ZŽÿëŸ?|ÿíß¿úüÍ_8òÈö;ïh¯.H‹ÖySðÛÞîžõ»ŸvsX‡ ÿá;.Áß½ðÊ OØyײΚÂô}°÷LÉýv¶û¬ÕnÚv‰1üçŸÿõT”¿õÙŸ~ÿë×N?¸kóŠîÚ¢ŒX~»ØýÎH²[0œTHð¿~òáoß<ûÌ¡=÷¬ê©+¦â÷H·ûÿøŠ þý?.~ù—?üîüK'žxèÞÕóêçfÆIï÷ˆ·Û’à?ýó¾ýï¯>ûã{^~îðÞ-«ç5Ðð{ØM ·”¿}þ§÷ß~åù#{·®™Oü6Hì÷¨°ûÿ„.ÊßCÿø÷ïœ;yôa:~»-…ð¿þù÷¿&~ßGÃïQb·µ üÏ?.~ñç~ýê à÷Zéý5v[ýþöâŸPó{ôØÍpÎï¿ó~?IÁïQd7À¤ë÷h²Ûâ÷ôüUvÓ÷{tÙÍw)ú=Êì¦í÷h³›²ß£Înº~>»©ú= -í¦é÷h´›¢ß£Ònz~N»©ù=Jí¦å÷hµ›’ߣÖn:~^»©ø=Ší¦á÷h¶›‚ߣÚnéýÝvKî÷(·»~‹úüÎh·»w¿-÷Šú¼Ô¨·ûr~‹û|ÚíÎoî~6rÿ÷ŒÉâ>ˆv»ú-Ü?˜«òšqë„E|Þíþ?w~o]3¿¾8#FäuÛ­ÈóÅ"ÍvÜù=¯®(=Fèyyž{ ñí '¿O}xËꞺ¢´hM€ÇôI7«ûvó8ú}î䑽[VuפF©ý=¦MÍo´[ÀÅï‡î]ÙeÎO‰`ýäSoËo´Û‚ßþý;çž?üàÝ+:«ç$‡3¾·O½E&Žßh·Áor¿=øýÊsOìÙ¼¬½271Lå;kÊ-âœ>A»mØüþëŸßûåïÚ´´­bvBhˆÏ¬)✮B»í°øý‹ýø½ /=óØ—´”çÄC3Åñí¶Çò|Ã?¾þüOïž?ûôÁ7—e›ŒJ‘üF»°<¿~ÿñÝ7Ï?pÿúEM¥Y&ø-Æéo´ÛÞï¿ÿæoŸýáwoœ>¶ûº…%Yq"ùv;ayÞõ›¿}ú‡ÿ÷ú‹¿Ü·mÝ‚Æ’L‘üF»üþî¿¿úËG¿}ýÔSl[» ø,‚ßh· V¿¿üˇ¿yíÔ“X/§]¹ßh·+¼ß?|÷÷/?¿_°óûŠ/£Ýnüþ–óûU1ýF»Ýa=}ò%9M4¿Ñn·8û-Öí'h·{év´Û=ƒt{ÚÝ ƒã7Ú݃â7ÚÝ+ƒá7ÚÝ;ƒà7Ú} Ä÷í¾¢ûv_±ýF»/È~£Ý—A\¿ÑîË!ªßh÷eÓo´ûòˆè7ÚÝÄóíî ¢ùv÷ ±üF»û†H~£Ý}D¿Ñî¾"ŠßhwŸÃo´»ïˆà7ÚÝ®Üo´»?\±ßhw¿¸R¿Ñîþq…~£ÝýäÊüF»ûËùv÷›+ñíî?Wà7Ú=.;]X¯Ó³¡ÝaÀÓ…¡ÝâR~Ï°úv‹Åå¦g»Þ½ßh÷¹ÌôlÜta®åí(n§ ã¦g ô⧠sS¾ÑîãÆïÕdz¶hm §uº0´[4\¦gÛ»euOmaZ”Ú_>L§äZ¾Ñî+Àuz¶{Wu×éÂnŸÂuOœË Ú}%8ùýüá‡îYÑY—¦ò™9y‚›òv_ŽÓ³Y¦ ›o ö†Ã¥kùF»¯ ‡éÙ¸éÂîZÒR–« ô€òíRNÐî+Änz¶ß¿ðÒ3wÞ¹°±—~³ |_ï”Þh÷•b7=ÛŸÞ{ëìñÛÖöÔä'……xÏ ½AÇôF»¯»éÙþø»7^|êá{WtTæ˜ô¤œ8§7Ú}åÓ³qÓ…ýöµ“‡÷lZÒ\’ÅúÎœ<Þ)½Ñn°NÏöÕ_>|ç•gÛ±n~m~Rh°×ô‰²±év‹múª?¿þì±G¶¬h/ÏŠÑøÍrNo´[,Ó)]üë÷ú ‡wo\ÔP˜¦ôšîT½Ñnqàü†Ãåß>ýð×/?óè¶Õ•Ù±Þ·ŽGúÞh·ÈpÝÁ¿‡ròÞ[§Ÿ|pÓbHïÐ`Ïi7ßCKk5A»ÅüæÊÉçøí¹·¯î¨ÈŠf}fL‚¡¥­š Ý¢Á—“o¾úäý·N}ð®…usô·Ov¨&h·hðåä;Hïß¼òÌ­+ZKÒ•^¤š\c­&h·xp儤÷{ož:üÀºžªì5WMl}´[D„ôþì£w~õ˽›×ç[ª Ú=ôþç÷ÿýÅŸþß«'ݺ¢enjX°ÇÔ 7\w Ú=@zÿôÃ?þöÉûo¾ðÄε™‘*oéØ–h·˜üïÿòÕä÷Ï>¹gã|óìX(Þe×[{Þh·˜Õä¯üÍËǹ{ oÿ¬[o²+ÑnQáªÉ7_~ü»× x/o.J6:+ÑnQáú&ßBñ~ãäã÷¯j/M ö˜2Á6ÐA»EE(ÞŸ~pþEèywÁ±2:¶® Ú-*|ñþûç‘cå†yÕÙь¾k‚v‹ 7°„cå¯_:¶÷®…5¹qjŸÛìº&h·¸ðãø/þôÛWž~äîÅõsâµ~3'¡Ýƒ?ЮɫÏî¿wicA¢^è ¢Ýƒéšüð¯þüîëÏq=Á$CÀíh÷ ÁuM 'øÞÏ?¶meëܔР¹]ÇíÞî¯ÿòþ›/ºU[IjX| -Ú=Xðï¯?ýý[§žØ±ºÃ:ÎA»ËI*2ÎÙ¹¦³,=\é9Õ6¬D»Å…çs‚Ny`mgyF±û´{pà‡•¼Ý»`Ÿ‚v–Qü‡oŸ9ºk}7wÒí<ÜÙm;G…v‹ŒõÕ™£»×wW:D»Eí–›ÝOî^߃v2h·¤ Ý’b±û³h· Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)h·¤ Ý’‚vK -Ú-)ý´ûm´ûŠ°ØývŸì>cµýÿkµûÌåìî^¿û(Ú}eØÙ}t÷úî¾Úý3ø†÷ðì??÷Ýî]GÏ\øð³‹ßýø¯ŸÿCüFúËþóó¿~üîâg^8stWovO%vWt¯Ûuäôù>ýúÛ~ú÷Ï`8Òo~þùß?ýðíן~pþô‘]ëº+ˆÝSì¾ö† S=C"2Ê»Öî<|ê­÷?ùê›ïüé_ÿF¿~úñûo¾úäý·NÞ¹¶«<#"Äsê„®u²[‘^Ö±fÇ¡“o¼ûñÿñý?þ?þðý?.~ññ»oœ<´cMGYz„ÒÙîqÄîð´Ò¶•Ûž8÷›>ýòâ7ß~÷=2¾ûö›‹_~úÑoÎ8¸me[iZ8±{œ£ÝS<‚CSŠ[–mÙwüìù÷þøé_}}ñïÈ@¸øõW_|úÇ÷Ο=¾o˲–â”Ð`)öv_}í¸ñ“冤‚†Å›ö9yîí÷>úø“O?ûŸ}úÉǽ÷ö¹“GölZÜPd”O?îÚ«mvë,)×ܳvûc§ÎÿÍ»ïðáGÈ@øðƒ÷ßýÍùs§Žؾ¶ÇœkÒùϺuüX;»ÇŒ½iÒ _utVYÛÒÍ»;yöÜo¿ð6ðÒˆeοõƹ³'ܵyi[YV´ÚwƤ›ÆŽ±Ø}ÕÕc®—MœîžRX׳êž]Ž?qòÔé3ÀY¤ÓNŸ:yâø‘»îYÕSW˜â=}¢ìú1W_eµûºožê¨‹Ë.mZ°jóö=û:|äèÑ£O"ý\;røÐÁ}{¶o^µ ©4;Nè1õ毳٠ÃJ8VÎôa“rË›z–®Ý´eÛŽ»víF®];wlÛ²iíÒž¦òܤpÆg&)É ’³›ë Ž…jâ¨JÉ-­këY¼låšµëÖ#cÝÚ5+—-îi«+ÍM‰ÒzB-kéòÇÊëo˜0y¦w°.*)»°ÌÜÐÒÖÑÕ ô ý…ØÖÕÑÖÒ`.+ÌNŠÒ{Ïœ<á†ë-GJ®x“ô¾eê,Ÿ`mx\JVnAqiYyE%20*ÊËJ‹ r³RâµÁ>³¦ÞB’[(Ý\ñ&é=~â´YÞŒ.<Ú””’–ž‘‰ ”Œô´”$St¸Ž ôž5mâx>¹»I5ô¾qüÄ©3=}CÔ:ChxDD$2P""ÂC :uH çÌ©ÇßH’ÛRK„ô¾ü¾eòô™Þ¾þÁJe2p”Êà@_o™Ó'ßn_gŸÜV¿oM˜8yêô³äžžž^È@÷<ä³fLŸ:yâÙ În“r~_{=>þ打n_l`4%x+¶j`›Œí×&-±ÑjÉk ‰bcey2£ÜÏ_^¯e!1]¦úª®úÖ–ŠŽòPX¤’‡$ƒi~1ÉŒJ^ÕÚÜÖÚÝR-שׂh3Ë›[«Íþò X+ þȸ|¬–é„/T”¹ËLE™»Ü„¥®Ù û”ŸŠ²¾e¨¢ÌMŽÚ-´¦$ì¹kžÚ-´e*¿ð²¹ -«õ)[e-Wø`GÿXSÓÝÕ*ç+GýBX%dvWG}K-0ø®êÖJsYL²±,³²ÓÜÑc®.K5/(ãWê´‹+4 ˜–Ö9Ã2Z.²Ý°H‰$´¨A\J¨o2‡ò/c͵õ-BÑ‚l€ue!&sO}•9'1V^!+¶6:V«“CÈKä¬J%g¡ @Õ¹]üÛ²’åoÈwÒ‚õÜêøV’)Ü2*gÔ ˜-+HGûöpAAAAAAAA¡Boe£½›È0à -o—¤½ûÈÐâ -Ó s qb02 -l4#AFav6$N*Ì®­Œ²‡¶ˆÈÐN(h›ˆí!ý€v²ôÚ†!—‡vŽ Ú¶!—v‚\´ÍCÜC;/D€¶…ˆh'…8Ðvq€v:ˆ m;Ú‰ >´E´³`P mêh‡vüÚÖŽjhp¡íîè…väÚRh‡] -h{<ê pI¡mö(‚v¨¥†¶ß£Úq¦mËG´ƒLÚ®|hG˜´áÐ/Mh{?’¡[ÊжÄB;°ô¡‘ í¨ haB;¤CÚqiÐŽç‚v(F´ƒ9´ í`-hGcä@;’CÚ!ÐãP„vLF´c8D¡–‘íQh‡eØC;€CÚ‘ÞÐŽÞ†vp†1´C7Ô¡Ÿa íÐ uhÇg¸B;nÃÚ!–ÐÚð€v”†%´ƒ6  ¢a í  hGiXB;hÃÚQ~ÐŽØ°v †´Ã5œ «aíp 'hÇj8A;Và ÚáNÐŽÕ0ƒv¸† ´5ü ±áí( Khmx@;JÃÚAÐÑp…v܆´C4\¡·¡íø ch‡nHC;8ÃÚÑÒÐÎð†vô†.´#3ì¡À! -í°ŒhÇpˆB;,#Ú1ŠÐŽÉv‡"´c2B Æ!퀌hGrhA;# -ÚÁBÐÅHƒv<‡´C1Ò Ï¡í8Œ@h‡tH@;#ÚQ¥íŒXh–>´#0b¡XÊж$C;¶4¡íý‡vx©AÛø‘íÓ¶ë£ÚA¦m×G´ƒLÚ–hÇYjhû=Š jI¡möè‚v´¥ƒ¶Ó£Ú—Ú6FhÇ\ -h{´Eh'‚Èж "CÛNÄí\Úv"6h炘Ðöq€v:ˆm#ghg„8Ðvq†vFˆm7ÐN - m!âÚyq¥Ðöqí¼¸Rhû‡ô -íÔ¸Rhû‡ô -íÔ¸"h›‡ô -íÔ¸"h›‡\ -ÚÙ1ph;‡\Ú 2@hÛ†\Ú 2ph;‡\Ú 2@hÛ†\Ú 2@hÛ†\Ú92h{†ô Úi2h{†\Ú92h{†ô ÚiÒoh†ô ÚiÒoh†ôÚ™Òoh†ô ÚiÒoh†ôÚ™Ò?h»…ôÚ™Òoh†ôÚ™Ò?h»…ôÚ™Ò?h»…ôÚ™Òoh†ôÚ™Ò?h»…ôÚ™Òoh†ôÚ™Ò?h»…ôÚ™Òoh†ô Úi2h{†ô ÚiÒoh†ô Úi2h{†\Ú92@hÛ†\Ú92h{†\Ú92@hÛ†\Ú 2ph;‡\Ú 2ph;‡\ -ÚÙqEÐ6éÚ©!´-DÜ@;)Ķ‹ˆh'…hÐ6q€v:ˆ m;Ú‰0(Ð6™yÅCÛÚQ íàKmG)´Ã.)´ÍEÐ5h»>ò¡á!í Œ@h‡tˆB;,ÃÚNÐŽÕ0ƒv¸†=´8D¡–‘íxhÇa„C;¼Ô müè‚v´¥ƒ¶Ó£Ú‘\h»‹ŒÀ£í(âít ÚF"n "@ÛB¤Wh§ÆAÛ<ä2ÐNBÛ6äòÐΑ~CÛ0¤¯ÐΔþAÛ-¤ÐN–~@Û*¤ÐΗ¾BÛ'¤ßÐN™ËCÛ!d€ÐNœË@ÛdàÐÎKAÛ䊠>î¡í -"´“È ´-AÄv9@Û DLhg“ ÚN bB;›hÛ€ˆíœÂ¤±`^!ƒ&2`R!ƒ&2H`R!ƒf2H`R!ƒf2x`F!ƒ -¦2¨`:!‚ ‚ ‚ ‚ ‚ ‚ ‚ ‚ ‚ ‚ ‚ ‚ Wòô‚ ‚ ‚Œ®²‡öÎ «ÜA{§ú‹[ÃNË¥T ).{ý `ø)q‘`ÇðQr .Rhïë%p'âjwZhïno8«¸Ú…a¡¤×pô"…ö>»ÁQ†½+R†ªÂÎáqÐ2„…ØÉ°©ãŒUÊPUb—TÜŽ_ë€E‹“Ú;o‡ƒ A·ë×ÙaÑ"e†ÄY† ‚ìüõ6-|P†dH¬:ìdXDŒµÂKáƒâÚ -8œÂÁÃ*bœ;)c†¤ÇpÁ°ˆ¸ÁŠAÉb’UB0ˆ -ØûmX´X”XC24„¸„à N„ÌN‹£û BV ÁàDÜŒ'œ‹kH†ˆ7á°Èà4L°À‹‘qA%¶ !îÂAd@,87·Ür ù‹ˆ!Qá”XCb×Hh˸Ê9¼ "$LàÔ@X8%]$$NBè)qL+!‚ P1qâ¤I“nå™4‰há•v"„ÄÒHè -qJ+¾m€ h˜œ êÕ‚ZÍ2‚o.·¸Ö>„¸ÓAÒŠ„ß“¡Öhu:= Ói5jFE”øò!™FÉ„ñ´…ØÆQît@8‚”*V­Õé Fchh¨ÑhÐë´œ’^È$úBì -–­^ : ­ ! È0CÃÂÃ#"ÂÃÃB¢$$˜„„ϭɼ( -±5®ðÚë{BZ‘p€ P R8%$$[CHˆ]!Çs^Ç,¢# („Ñ€Œðˆ¨è˜Øظ¸Øؘ計pP¢aUÁ[· !Î ÝN‡—Â/0¡7†G‚ -“)>!!!Þd)‘D ‰¿/×H¦òŠB\é_Mâuøø*µÎŸ˜” $%&ÄÇÅ‚£^ÆF ™8„p:®½Ž/XÐ/áu@ó`4úÐp"#1)%55---55%91ÁfЪIn)¼ä|ýu/Dr–†NtL…vNt„°ZCXd4ÈHNMKÏÈ22ÒRS’L1Q$$Œ‰—|ÖBËÚÐtèŒáQ±&‘ž™•CÈÎÊÌHKIŠãB†ùû²E[ˆ]bY:ô¯x*µÎ—2²gçæåÍ™“——;;'+#-9Ñ !ÑqB¼é qH,®¡CÁ²éЇFĘSÒ@F^~A!¡ N.(IMN€uÐH|{"][wH,¾¡ß:…×LtDÆÄ'¥f€Œ‚Ââ¹sç–Ì[\T@”¤§$šb"BõV!Óí…XÆì’ qL,¾L™6ãvO>,*6!9-3'¯ hnIYY9PV:·¨pNnvFjR|Ld´vNÈíô…p_xA‡‚è0„EÅ%¤¤gçæÍ--¯¨ªªª®ªª,/+).˜3;+-9!6*ÌekÂ%ßйˆ§ÂèŠKL…p—–WV×ÔjÌUe%Eù’”ĸèpƒê/9´SâX|C‡Â;ËCÐmJJËš_TR^e®­khhlll¨¯­©®(›[8''35É­]ËÂDA_ˆ-±Há -–‡·ŽÜ‚â²Jsm}cs ¡¹©¡””ççf¥A#q"£!Ä)±,ËÛ70DMt$§gç–”W×Ö7µ´µwím-Í uæʲ¹yÙéÉDH…Œ£"Ä1±HC—{zNGÎœ¢ÒJ3‘ÑÑÕÝÝÓÓÝÕÙÞÚÜP[]QR4''#%!62Ô*d5!Ž‰Å5(X^>Jµ>,:>9#'¿¸¬ª¶¡¥­³{ÞüÀüyÝ]í­Mõ5•[B¬D -B,‰‡tk¹  J–×1;nyu]S+ÈX°hñ’%K/Z8¿§«½¥±¶ª¬8v¦Mˆ7e!N d*)¼þÁ¬. ò*cvÁÜ -sCs{×¼…‹ïXºlùòeËîX J:ÛšêªËçÌÎLub;ù ¡‡G8¢O‡ÂëÌè¢8%•5­= ß±lÅÊUÀÊåK—,œßÕÞ\o®()ÈÍLM„}-»³(Ò«¬‰emèSøÂËhC9…¥•µMm]óݱ|åêµë€µ«W-_ºxAOGKCMeIanVjb¢„L¦%DH,[C—“¯#·°´ª®¹½{Á’e+׬»sÆ7ܹnͪåw,š×ÕÖX[YZ˜—•f/ä6:Bì‹k |Áò TiŒ‘‚ŽúæŽy‹–®X½îΛ6›6nX·få²Å ºÛšj«J‹zr !Bá:Ñ:⸼ª®o霿xÙªµwÞµùž{·lÙrï=›ïÚ°nõò;v·7ÕU•¹r“ÄBœ4t(X>p@ˆKâu´v-X²bõú›ïÙrß6à¾-÷lÞ¸~ÍÊ¥‹z:šëªí…pãîtÔBœ_°à@hˆˆMJŸ]XVÝÐÚ½péʵ6ݳuÛý;vîܹãþm[ïÙ´aݪe‹æu´Ô Bb­BfÒbß@àH  -9€èÃcym cÕºwoݶcç®ÝÀ®÷oÛr÷Æõ«—-ž×)áʯ–ŒG¼ä…Xº¥`1DG)èèY´lõ›î½ïþv?øÐÞ½=´g÷Îûï»gÓk–/™o/ÄH„øÐâÔСg  º°˜„´œ^Çò56oÙ¾s÷ƒ{Ù·oß#ï}p׎m[6oX³ÂAtãa¨KGˆcC·,8€„E[u,^¾vãÝ÷íØõàÃû< -ØÿÈÞ=lßz÷†µ+–,° -Ipr£dBl „kèBÁ -„at|jv>¯cÅÚ»îÙ¶sÏÞ}>~èÐã?öèþ‡!$÷ݳqíÊ;t !¶†.,Rx5Æ(¢£„×±î®{·?ðà#;ôÄá#G?qè±G÷íݽsÛ=w­s#Äß"äf^ˆ$ç°]:)XPxသ’5§¤ŠèX¹nÓ–ûwïÝwðÐá£O>õÔSO=|èàþ‡÷ìÜv¯è4&¡®Š2}*w1„Hr2Þ¹¡Ož6S®ð‡Ð3çÌ­ªoëY²rý¦­;ö<|à±'Ž>õËcÇûåSG?þè#>°Ý&¤´0Æ#1 !.‹^r‰ys+ë[!ë7oݹç‘GyêØÓÏ<ûì³Ï?öÔ‘C÷=´kû½›ÖƒhìUœø˜p:B¬ ÝZ°Háå„IyÅ•u¼Žûv>¸ïàO{úÙÏ=ÿüs'ž9þË£OÜÿЮû·B꜄xÞÎ /™‡‚%^FGtäWÔµvs:xhÿcGž:þìs'_N>â™cO~lÿ^"Rk¾“ …ÄBì:_° ðBÏ„‰é¹Eu-Ý‹Wð:?úËgNœ<õâéÓ§_ÿ‹gÎgNŸ:yâé_yü} RI„$Û ™!w…—@Bɽ°¼¦¹kÑŠu¼Ž'Ÿ8ùâ™_½ôòË/¿ô«3/¾ðÜ3œ]¤jA¥£¹–bŠ׫UA®gLSˆ›ÂK Ü0§ ŒèXÎéxô‰'Ÿ~î…Óg_zåðÊKgOÛ .ʼŽ&"$'„„éÕ!Ò -±A¬:fSJvA©¹©sáòu›8O=ýÜ©3 ãµ×^íÕs/ÿêÌ©ç‰ýDÈƵ+Ïk!sósÒ“LQ’ ±ëaY -/×s':²ò‰ŽËÖnÚÊéxæùSg_>÷Úëo¯¿úÊK!=°ížk–/îioª©°bÆT!N…W8€ᜒêÆŽËÖܵuçÞDÇ‹g_~õõ7Þ|ë­·Þ|ýµs‚Lj»7¬Y¶¨§­±¦¢xNvzRœUˆíD£ÃÉxѯ…:ö ys«Úç/]s×–ñ:~õÊ«o¼yþü…óçßzƒmäðcûÜyßÝV/[ÔÝÖh.!0dºÌS±…\âÂÊú¶yw¬ÞxïŽ÷zòi¢ãµ7Þ:áí·/\€pBž~êðÁGܹuó«—.ìnm0»œDᄸœ1YˆCáu9€À½gɪ ÷ÞÿàþÇ¡^½xt€ŒwÞyçí çß„ˆœ~áÄñ'Ÿxô‘=;¶nZ¿ -úŒ­vCvëIÇ3¦ƒ"ıðZzîp‰Š'8.^yçÝÛwï{ìèñç ó:~M„@j½ò«Ó'O?zèÀû{(–áˆEÈd7BDmën Px¹‘á¶]qôØÓ'žáÔé3äŒÃ™3§_|áäs'žæÎÌíßKN–r—F¸€X.MÛŽ"ÎMdŒx±×ápÕ–\}NÉâ2ÿŽUë7m¹×Cû’ÓŠÏ<ûÜó/¼p - '³ž{öéãÜ©Ò} cû–ÍÖ®\º´ê²â99Éñö™e;ŠˆÝD\:wµS¸JHRO®®¾sÓ–í»Èi÷'Ž>uìø3Ïž8ñpâ¨82=và‘½»AÇÝ!±ÏïlîH#£CËéR¾øÚ¯«f97t¾p·gDÇ“€”×4¶ó—׶l'×A}ü‰#ü)맟~š;oýä‘ÃäbÂÃîÞI.®[ ‰ÕÝÆ]˜v¾Ãið2˹¡O´Ü‡E.£C@òK*ëš;æ-æ¯r¦=øø‡=ú$pô(¹$òøÁû~hÏ÷ßwïfNI¬z3”,¾Ãè|˯șåÜ@,÷ý(Y. ™¹ÜýD¹p»e(ÙûȾ>öØã‡?þØArµÈر¿*Mtp7¡” ÷Α€¦né‹?¨ºÊq–Ä’ó7*FÄ&¦eÏ).ã„,ZºríäJúríöáGöíÛ¿ÿ°Ÿ»úùОÝDƽ›ïºs-¯£Õr£W² Ö;~7 N7Æq7”é dAfÍ).¯®onïY¸dùªuîºûÞû¶ß¿óÝ{ö<øÐCí…?îÙ³{¨Ø¶õÞ»ïî@áu”[Ër3£—]@DnꮉÅ„¿ã’¿ÃÜGnaZºbõÚ;7nºûÞ­÷mÛÎÝáðÀp÷9Ü¿í¾­Üí'ë¹[‚æww´4Ö’ûÍrIbAK×;Þ/~S·Óa¹•—¿µ:˜Ñ#bR„[[:º¹›±È]Lwmº›Ü9³uë}„­[É=4woº‹¿³iéâ…óºÚ[H< -ó²¡bÅEñ7.;¶qS°o ü½îü=û¾\fEÆ!½£­ dá’¥ËW®^³ný6Þu×&î~¦Í›7mºkã†;׃ -þ¦¹îŽ¶æú‹r¶ð¸…×%råBìïŸHî÷à2KÏ !7óÎ-¯ª%í]=óÉ ‹ËW¬\½zÍÚµëÖ­çX·níšÕ«W®X¾”ÜÅØÝÙÖÒh¹Ù7#•{HAxÚÂz œ€XKˆpÓ>'$>Ùr—xM}c3¹ŸwÞ‚…‹–ܱ”Ü~¹bÅŠ•„+–/_¶ôŽ%ä®ÒîÎö–¦zîîk‹h ÜI -ëI¢Ä!±ŸÎ žj!Oƒä%•ÕÜâm fþü .Z´x1¹-vÉâÅ‹-\0^¹a¹¥±¾¶Â!ÜØ:ìHšîp + WÙ%–õ±/.³|‚ÉcFáÑqÜó ¹ù…s¹'êê›@L{;Èán¶îé™7o^OOwwWggG[kKSCÈ(/pÌæ~±è°&ÖD‡çñÅ ˆããR·N™6ƒ"<¿f{Ш¨¸¤¬¢²Ú\S[ßÐrš[Z[[ÛÚ@T;ü¿µµ¥¹©T˜9äÑ—Ì´ä„8‹ááCÇÄ1 ŽÏ¯ñÏK͸ÝÃÛö@¡ð÷Ìh)-+¯¬ª"rjëêêA÷pECC}}]mmM5ÿÜKa>y)•{Ð-”è Qz9óèMÖI"'ó3úÙ&ÃãåxÛË!z@("ð36qÓOAR‘éÍøyÚ&“ºë2už(g­ÂÃÂ̼ÂT°ã-Óv’ /§ð³,’ -9ör8= ˆ^rÓùòS›É¹™ó,çÙë= ö3>óJ¸ H-©’9H5ŽräDŽ/LJ›™ì¾0=›Â6×Üm´yö:DKë*[j !fKæ¤ðZl³ÂNr’3Ökü„Þ6¼¼<==<æ1Dn¦v·ÎÂ-L_-ãgæÔXä¸ È!“0Zà'cœe›XÒE‡cMˆÇ Åo¼Ñ2´eÞa‹¡ ðó“òrìáfÇfúœì4ýª}Cë*‚‹«ûÙÑíÔŒwPÃM{k a†7÷*™GVˆ;â^ÁuUrÍ«ë¤ûã\å¸Ä†Ì€ËMË…h:?.™Ø×a^ßÁÒabû]kì´¿åà$Ç¢füxkM³¨á'%æ$Ùf'æ£!¤•‹1ï °)qþ‰k¯u‘c¯ÆÖn5Â4Ñ“9ÜtÑü|ÑS_Ö$ÞŽJ~yFø•;9 ÇIŒuâîI< Þd2òñãùiÕS‡M‰EŠå·€,¿9c/Ǣƻ©ÔmÜl•!f‡ÌIÕ¯ºÊE‹íç™å\k÷"vb¬ŸÝþf ü4÷œ §ùúiâÕ«Üiq#ÇAŒµX €íçlsõ[dð:®sÕ1$¸c“ã$Æm“áÅðj,?Ÿp£-ƒ¯ÃYŠ‹5c5öZø³¸‰§—´`Š{1îRÍ7ZlbxüOŒŒuÕ!Ѭ½«±‰é-Çnpø¡Û/¥ØòJò ´zQã˜cÎa±ûåN…-.?”"õ¤«nÄô–±Ö_²¨°È¿ÁÓ»·Q±ûU$ឆˆW1®RÛ -§Åéwª†Ò;¹H±$˜-(×;üÜ–å§Ã†àT¹“â:†!Zl¿€v­£Ž«†‚Žÿréc:¦×u6)Ž¿ãvcÙ¥/ƒà Ä)»lRl¿­7äÒÊŠ‹×Q¥íÝý@ mVì•8 ¹Ö^…SZ 5.ç,•8þôäÐý½FBoBÆ8©Úáø/÷Bì‘×Úý¨éPÖá^ˆó³^ã*c¨épâªÄéÇr‡¨ŽÞ„X¤\ã$ch¦ÁEˆóo0»‘1u8q«Dáuî„ØI¹z¸ÈpâpúëjCUGoB®v’1ÄÃñ_ÎBœ•üâÃ#nÎ{ÿÂEÄpáN§å®*†´ ׯ3W n/D¸Q1ÔeôržËIÄЗñ_½œ~tZH{ûÄU—…öö•‘¡â¿.-„ö¾õ‘¡‚02TpŒ<#B‚ ‚ ‚ ‚ Ã…"¾¥ÚTÑU!+H’)b’µeðÎ.s‡,CÖ- è–1r“L%Ï„?Œ\ÅýW°þQ+Ó¨ÔJµŠÕËÕV©WÔòf™ZkTjtF½\Ãê•ZFÇÈ›dj–UjU¬\£Ó*Y£–§ÉÔ £4jÕŒ\£×)U:F®V©”•N-×¥AÍhåsdjµZ©…‘¬\ ßhÔhÔrµQ­ÔÎ Zy•Ìe%J«T© Œ°@«“k½R¯ýQë4JƒAÏÂÇ4ŒZ©3hµrµ^£Tõ°ÿ.â -e5°žA©†ÏÀgÕJVÇèA²†e”z½6©…-pBa ¿–†ßõBn%ƒZXGg„u\¾©G[ fûåµ´T4›«åµÕõæ–.¹ÎŸs]£…ð!àÿ[ )=R„¿x¡fŒjy°õ«3(µF (Ò²Jƒ¤4Ë´-ØÍÂ?l¯Ü|6X«5ðû¬U! #­Øfcû¼Yµ -Õ‘P ;#Ùd ¤\l¬, O–'3ÊýüåùðJQÓÑeª¯êªom©èX …E*yH2Øæ“̨äU­Ím­Ý-ÕòκŠ6³¼¹µÚì/‚µÂàŒËæj™NøBE仢Ì]b+ÊÜ¥6,uMnXاô†õúŸàd‹JqÕ§$W”µpúÅ´´¶®¸K{XÚ—ÄçW»lê»ÛjÀÅ>ØQÁÖ”ÇtwµÊùÂV¿V ™ÝÕQßR˧|Wuk¥¹,&ÙX–YÙiîè1W—¥š”ñ+uÚe c·‹¶LL‹µÏ´ŠæŽà`þß±æÚún‰Œ‘3víW#g!äÞ ´diZ¥Ì[W®õ—§µ¸Rž–—l’‡ÊùuË`Ý0Þ‹2XÞrHïøS0OÖ¥¼^Z*y­s5O °hìYº¼¸D%¯&ŸÌ‘±z4{È•A©S3¤)X©J2mŠœÕh•zƒJÍ¥›ZÏ0r–¼Óèô¶%U2Æ VVg[Æ@‹bTí›lK,›ƒÏY–AµPêUfÖobIm1ê´¶íY—Tɬ{e[KØq빈‹ãêLüI”±JF˵` ¤Yú¨3¢Óš*BVÈÔ­R«Ñí-°-c¡ÒA1„âÂ@ág œ£¼¥Õ(£Jc[BŽ :¥ÞÈÚ­uÔ 6ì¾ÈºÄfukd”¬š%ßÉ‘ÂrÖ[¶f]³ì“m-Ë~Û¾ÈEÝ%’aôYÑiM#*#¤£…ÝS œvl >j]–f[¦†C#c„zŸfû¬uY“›ïK“ÕÉòe-²lk}m‡ÿBZ;Ìõµ-™• æª.(†Œ¦7j¹ùä!™õP­a! ý£F íCeTªµ`–V¥‚c´M8XÉCbɧV !=gRnƒº£=‹˜Ÿê£Ru¨”ÖUââ½C*½eŠ¸úŠh>ј¸ `}kfzxB\u Ÿ¶1Ô'”TxÙ‹‹-ÑLæÎ(MXMRHnLj~SŽ/iÕ…:¯P½)Á#ÈÏ—ûz™BW¤k.12!Ö,ò‹µª”̹~!uµÙúüúÜ“¶ˆ ŒbRºH£)I,)N×Çèò g“ïabš[Ó:cr‚;òM5>­¦$³9Ì÷÷ãâ'S¨²ÙØ̬„*SŠ[+$†2Ìò0%u7̆5}$.¡Lb»o?w®.¤Þ‹‰R{‡jbBê+Û²Øê”<ÖNnlAq÷ -%1m±~¥Y2…¾¹¸°¢UÔç§NP%U†ÆÁ+cŠ jo‹ÕékTª&3;¡Ü¯„mŠnª%m?L•Ù¢Š«oÐ…¨˜ÔÊjð¸!3º#±¹NÅÄVÖšÌñåD†‚5uFÊ‘ís3 -âC õñ庸òø £¿R­h.7)•ÁBKÌö#饃&ÔQÁÔ¦WBùT˜g$G‡•”ÖYVNõZ¥å•Œ ›ÊÍçv¥×5ùõ:C[â™o“"¸..]©jPÕúdX_³Þ#¢<¯ ÆÈ6hcrrã+cfw{wFÏÉŽR’­D´Í!¯õš¨Êöpë[îuM\Zcr= ŽžüÏ—55G¥°¾Q©QÞ†eðFV²’•T©‹µ{#Õ¯¶âæ-ƒ*¥²Tíö3æÆ„@wo0U9ázwo°åù¡n·¢g<²Ãܽ¡ö P¹ÝJb^§Ö°ÎØ&E´7W¬dŠ0siV‰¯oXªwJ{`dBw3i¦¤ntk˜‰ÉSE†'²*s·w9“¬‰)ÕvÔV–êµJE»®UWX¤Ï1ÆyB±®ÉMg볚̹¬¿wiŽ>'¦¡A¦`ª¼Lê¸Äºj¶¢$¦ž-kV§©}ÔMZïÒ(£"<)ß3¾ª*+)f¶,˜ÕÕàÔVÙ§O+¹#R&sM³,Œ.Z¾»©Ö »Ž‚u™}GA£ã»³i¶ÏZ—5¹ù>׎Œß¡£Ô³¤3Ë£·QC6Ë’œzR ½"Û–¨4Ðí"[·|Ž5Â[}¾“¥Òp/ÞëµÐ%b`°MFÖ°À`dà‹Tz%£ƒ^„uIœÌ¶Œ±žì¼õsÂÛ7“sF®“ç¼ßq‚eYDÆ_Zo#÷5¤3 ²´¶Y—@ZZvɺÌ*ÄòE.Ê.5šM.ÐÈH9” f½R­SëäÁ¤q£e´R~ÉHÒ1‰µ¥qLP[\¨:¦<*EíSØ1Ð!Û/s;¤‰ò÷׆Ôge&@·&*,1"¤¾°6ò†5Uç–8 i O’” ª)óP›¼ë½s™ÀÆèh®?WšÏT¦•Æª£ò”·DÇËÐ×*‰eª {É$)·º?iQLª%zÒ±¬©XDz¬)©Ó_åm„GP^q4Œ‹cXSw±¶R’H¶’ÉTE%WÃŽæ©#uE0¢ªLHŒÎÍ ón æÒ¢/©ÒÒ÷öŽ³ï{'š" BIà˜Ñœ«/Ž¯òÒy«˜¯P¨Ô†¦”«£ÃÒ<:Tlãìœÿ€?S*(2º­-U)ÐoÈ®0ñ«hÍYü`#]籠h7&–%ÎNˆ‹5úÀ(‹dŠ„x6Ý õˆ7[ö' Þn ïZM5³«Ú£C39ç¡Ç‘“`ÒxçÇ64ùЙêL5¹±*ûa³¥_OºÎ°:èEõ¦äâjSMpq¾Ø0Z#=é2þ{R g·AR UÊÚ£ÃTyüpªƒîŸÆ¬b›2›c Am­\#„vœ -#‡€l™"$C› ]â¸ØÀH¯ %ŒŠââÉ€¼ -‚Wõ²?¡0H(±vßk¿>@ו–™Ý“¥Ôi’ÓLBº%WØÒâbMX¦rND´ ($Ó“ ÔaTTØ-5%Q?§)-7&3- ’ŒŠ4ú°ª¼œýÜ.ÒR™D&Ú¬b|cÚ|t µaÕ ¥quš²TN¸LÑ‹ôÙlLv»´Ô¹Ý­1ú’j?•¹(AkJ ȨVÎRú¸yUE†~%¶á÷.¸®©õHP¨ø<£-(‹ÎKó òðNõÉ÷ЦäÜ'1ÛcKûlÒÆÆt¼Àþ¬"ëÐþ—0'˜õÏQ%šü}êíÞ¨‰Sòã£@SûœvÛÐ#ܼ¡1ÀÐ Ø i?càN]¸y#œ©lc‚ݼ¥@ïnó¬?"·[‰bãÚunÞe‚½“YÛ0è¬ñ‹«ÓÏé GƒöØæÌH-DW_hª1–EqG)2‚VÓcNˆ9Û¨‰Œ)*bÓ - R§æ2UÊ¢"¶7­È5ä©RÛsgë sfµokäÖ?:wŽ.Ô£¹SÛå‘S©Ž5ú³¦dU¦ÎÀ„•Ààœ´ƒ„¿z6!¾®.,¦º-9MU“›WÔÅäy(Tn‡G4º|Ò‡Ã]µ„¾½šUB—:VðqƒJK¾œH6’Þt®”*½‘!ƒ=ô±4~¦×k5d‹Nßæv8Æê¡“¡&=}Æ 4¬ -®ÊBWDkTà+@‡AO–¨ùK§¬yÜùm•Hd¹î¥–¿rH.s0F5ô&u°û*rÒ›U)u 9×­5(ák` Q©É™k–\eÔ‚¬ZÅUšø~*¹B†”îl8£d•‘ß#2ÀqÞk‡Á˜ËW‚&-ñŠ.³6ÍŒÄ4­F ãØôÙt~dë¸Mn¾Ì:ÓÂHFËÂW‚Ñ:–sN[QëN8?†Íéõruúw,‘À’‘Šï{è‹ëb« JÁçHrp½v é‚­, (¹ -뺷qnTÁk¹°“Ë]Ð?1’Ñ”:½ÎÀe‚QG^8ïzc ¤˜–ÕíÇ!ÖeÖñµz kbÀ.+½Fm?ýWX»á -—ß,c7¤±.±ŠØ–Y†Öo²Ž2¬Û³‹X÷ʶ–Uõ›\ô]bL6ÍÀ¡ÍFüЬ¹¨Ôih ‚P6>Ê›-+öc󊃡›š ßâÄÄÏ5ø…ÔGfÆÀ7w¦sWšX­JÉŠ 'àã™ &'†IŠN -î`³##ÂSõí±)¡Ùé±I¹å‰1õ)qÞš¼ì -7gýUvçü#U©Aƪî 8™Bf TÂp§Ä7®2EÃ_—bãÌ–ÁPלèp:,”­ô*QifÇk¹Ñ›¶+³»Ë2 늶^ÄòãòÜ.jð) %~NARLF½ÑlÝÖa|£âê#"›ãt5‘]‘¤ÑšRSgÆÕGxX6àÑÌ¢ ߸ˆ þò‘ýÕ¦jŸèFz[¯ô¨ÕÞÆæ.èŠ&—“ÄöŠŒn+NðKJ äÆ•äBKEo×oêù¬d”í1©ùå%ºÐ <ȱÈкìrÖ¯¶9Ú]L dGr[V• RÕø%Dw—Îe½ìÛykDŸZ&pn¢¢1±+,¡BQfuDms29RiJ ôõ'þ@Ûµ8a¨™Û¤hö‰ŸÛÜ囓SSP~§ÔÛ_9êöR‚#ݱM-¦æ˜Ü¸ÒSHE¸O`ë™ìîªÍ:ômü5éŒØîüø¢j¿ú°ä̤¼˜ì¶úh²²Õ~ûW`¾'¿#ÖõdŠ^Öl ´5CCXž¹Ü¯«¥SSZ¢‰I÷ðÈŒrºþÊ—:r¡ÅRê̶7dŠÄ’ä˜`…ÖÐR¤J()±† þz&±-Ô¬`4ÕqÖÑV$¸˜êKFoŽoĹÃÜmä†ÿn>“æþ®â8·o¤†6'¹ï:±—­¤†y$ºßJer¼ýz¶ ÆÜ™uñ•A-üH;5¿¤DÅV•‘CË\®²Ë†\ŸàÂÀÈ VîJ–®ÓT¥Ó礴{°•Þ¬¿Ú/²±‚ 4ª³oe=“¤,™£ªm®©fê;æ’q\6“Øž_«Ä”鳚ºJØ€Ní&I¯+Ñg5ÇU©ã²È=…jß´9jh9¹ÑáÁÉzþ -£¹1!L¡ « M.¬:ƒ3讫4Z»!V³Ì½g£Qo?cŒäB‡Jo?b#Ým­Ž\˜†bMn¾ÍíðŒÑ‘‹Mܽ.Â0 ú™: |‰ÖhŒ10hz•Â€Ñª„Qƒe€DnP3(52*ãQ\?FR¶a£Ó)¡W£µuâ WËÀ†ý˜ˆ!s Z»aÙ'µŠëé -C?×=·¢¹~+é?CgWO\² ÇH‡”#Ù Û\÷²ÉÍ÷YGiäö[#c° ·`KFriB£³ ÊlG«SÛndôÌÝ›ÅÈ} Í´:Û(ŠÑ“°’‹&–‘–ëîƹ‘»k€­°d`kÝ‘]‚„díF€.;îvÖË]¸Ü ¦ÖÔ•Ç´qc9r—8KzÀ é -kõ¤ÝÀ"=¹3Úº(ͺˆÜ±l 1L³}ÒÝ2»ò{Øû.e_â=hä0öVÉYËm¯m>$&™arÍóI¯_%Iè0›óZª[I·Ÿü«¢ÙœÜRmžÏÿ{vWkÇË¿¡~\j£wÚ:lÒý}Ãjþ¾á¸ŽÖ¶NYw§¹£¾VBÞhi%KÓ+:;å-­óZä-­]òE¶;}»á? W*õ#TȽA혼P‘s *%ô·IBñ{æWœ[ììê¨ »_âÏÝ£\Päþ.aâ¡Ë}ÂÁä6æfY0Œ]T¥Ù°5“¿Ô:nínén²¶–a…õÉ+þZ–á>¢Õ\>BÞã?CÞµ|†üÍŠ{ÕËçT§TÖÏpûƽpÙ;Û«%òú>> -EVE­ÆvõMæYmgEY^Ñ1¨è2·Á;òÚs'¤†YÞY×:,XVW(âa0òÿxµ endstream endobj 816 0 obj <> endobj xref 0 822 0000000003 65535 f -0000000016 00000 n -0000040233 00000 n -0000000004 00000 f -0000000006 00000 f -0000044932 00000 n -0000000007 00000 f -0000000008 00000 f -0000000009 00000 f -0000000010 00000 f -0000000011 00000 f -0000000012 00000 f -0000000013 00000 f -0000000017 00000 f -0000040284 00000 n -0000044781 00000 n -0000044812 00000 n -0000000018 00000 f -0000000019 00000 f -0000000020 00000 f -0000000021 00000 f -0000000022 00000 f -0000000029 00000 f -0000040355 00000 n -0000044665 00000 n -0000044696 00000 n -0000040426 00000 n -0000044549 00000 n -0000044580 00000 n -0000000030 00000 f -0000000031 00000 f -0000000032 00000 f -0000000033 00000 f -0000000034 00000 f -0000000035 00000 f -0000000036 00000 f -0000000037 00000 f -0000000038 00000 f -0000000039 00000 f -0000000040 00000 f -0000000041 00000 f -0000000042 00000 f -0000000046 00000 f -0000040497 00000 n -0000044433 00000 n -0000044464 00000 n -0000000047 00000 f -0000000048 00000 f -0000000049 00000 f -0000000050 00000 f -0000000051 00000 f -0000000052 00000 f -0000000053 00000 f -0000000054 00000 f -0000000055 00000 f -0000000056 00000 f -0000000057 00000 f -0000000058 00000 f -0000000059 00000 f -0000000060 00000 f -0000000061 00000 f -0000000062 00000 f -0000000063 00000 f -0000000064 00000 f -0000000065 00000 f -0000000066 00000 f -0000000067 00000 f -0000000068 00000 f -0000000069 00000 f -0000000070 00000 f -0000000071 00000 f -0000000072 00000 f -0000000073 00000 f -0000000074 00000 f -0000000075 00000 f -0000000076 00000 f -0000000077 00000 f -0000000078 00000 f -0000000079 00000 f -0000000080 00000 f -0000000081 00000 f -0000000082 00000 f -0000000083 00000 f -0000000084 00000 f -0000000085 00000 f -0000000086 00000 f -0000000087 00000 f -0000000088 00000 f -0000000089 00000 f -0000000090 00000 f -0000000091 00000 f -0000000092 00000 f -0000000093 00000 f -0000000094 00000 f -0000000095 00000 f -0000000099 00000 f -0000040573 00000 n -0000044317 00000 n -0000044348 00000 n -0000000100 00000 f -0000000101 00000 f -0000000102 00000 f -0000000103 00000 f -0000000104 00000 f -0000000105 00000 f -0000000106 00000 f -0000000107 00000 f -0000000108 00000 f -0000000109 00000 f -0000000110 00000 f -0000000111 00000 f -0000000112 00000 f -0000000113 00000 f -0000000114 00000 f -0000000115 00000 f -0000000116 00000 f -0000000117 00000 f -0000000118 00000 f -0000000119 00000 f -0000000120 00000 f -0000000121 00000 f -0000000122 00000 f -0000000123 00000 f -0000000124 00000 f -0000000125 00000 f -0000000126 00000 f -0000000127 00000 f -0000000128 00000 f -0000000129 00000 f -0000000130 00000 f -0000000131 00000 f -0000000132 00000 f -0000000133 00000 f -0000000134 00000 f -0000000135 00000 f -0000000136 00000 f -0000000137 00000 f -0000000138 00000 f -0000000139 00000 f -0000000140 00000 f -0000000141 00000 f -0000000142 00000 f -0000000143 00000 f -0000000144 00000 f -0000000145 00000 f -0000000146 00000 f -0000000147 00000 f -0000000148 00000 f -0000000149 00000 f -0000000150 00000 f -0000000151 00000 f -0000000152 00000 f -0000000153 00000 f -0000000154 00000 f -0000000155 00000 f -0000000156 00000 f -0000000157 00000 f -0000000158 00000 f -0000000159 00000 f -0000000160 00000 f -0000000161 00000 f -0000000162 00000 f -0000000163 00000 f -0000000164 00000 f -0000000165 00000 f -0000000166 00000 f -0000000167 00000 f -0000000168 00000 f -0000000169 00000 f -0000000170 00000 f -0000000171 00000 f -0000000172 00000 f -0000000173 00000 f -0000000174 00000 f -0000000175 00000 f -0000000179 00000 f -0000040644 00000 n -0000044199 00000 n -0000044231 00000 n -0000000180 00000 f -0000000181 00000 f -0000000182 00000 f -0000000183 00000 f -0000000184 00000 f -0000000191 00000 f -0000040718 00000 n -0000044081 00000 n -0000044113 00000 n -0000040792 00000 n -0000043963 00000 n -0000043995 00000 n -0000000192 00000 f -0000000193 00000 f -0000000194 00000 f -0000000195 00000 f -0000000196 00000 f -0000000197 00000 f -0000000198 00000 f -0000000199 00000 f -0000000200 00000 f -0000000201 00000 f -0000000202 00000 f -0000000203 00000 f -0000000204 00000 f -0000000208 00000 f -0000040866 00000 n -0000043845 00000 n -0000043877 00000 n -0000000209 00000 f -0000000210 00000 f -0000000211 00000 f -0000000212 00000 f -0000000213 00000 f -0000000214 00000 f -0000000215 00000 f -0000000216 00000 f -0000000217 00000 f -0000000218 00000 f -0000000219 00000 f -0000000220 00000 f -0000000221 00000 f -0000000222 00000 f -0000000223 00000 f -0000000224 00000 f -0000000225 00000 f -0000000226 00000 f -0000000227 00000 f -0000000228 00000 f -0000000229 00000 f -0000000230 00000 f -0000000231 00000 f -0000000232 00000 f -0000000233 00000 f -0000000234 00000 f -0000000235 00000 f -0000000236 00000 f -0000000237 00000 f -0000000238 00000 f -0000000239 00000 f -0000000240 00000 f -0000000241 00000 f -0000000242 00000 f -0000000243 00000 f -0000000244 00000 f -0000000245 00000 f -0000000246 00000 f -0000000247 00000 f -0000000248 00000 f -0000000249 00000 f -0000000250 00000 f -0000000251 00000 f -0000000252 00000 f -0000000253 00000 f -0000000254 00000 f -0000000255 00000 f -0000000256 00000 f -0000000257 00000 f -0000000261 00000 f -0000040945 00000 n -0000043727 00000 n -0000043759 00000 n -0000000262 00000 f -0000000263 00000 f -0000000264 00000 f -0000000265 00000 f -0000000266 00000 f -0000000267 00000 f -0000000268 00000 f -0000000269 00000 f -0000000270 00000 f -0000000271 00000 f -0000000272 00000 f -0000000273 00000 f -0000000274 00000 f -0000000275 00000 f -0000000276 00000 f -0000000277 00000 f -0000000278 00000 f -0000000279 00000 f -0000000280 00000 f -0000000281 00000 f -0000000282 00000 f -0000000283 00000 f -0000000284 00000 f -0000000285 00000 f -0000000286 00000 f -0000000287 00000 f -0000000288 00000 f -0000000289 00000 f -0000000290 00000 f -0000000291 00000 f -0000000292 00000 f -0000000293 00000 f -0000000294 00000 f -0000000295 00000 f -0000000296 00000 f -0000000297 00000 f -0000000298 00000 f -0000000299 00000 f -0000000300 00000 f -0000000301 00000 f -0000000302 00000 f -0000000303 00000 f -0000000304 00000 f -0000000305 00000 f -0000000306 00000 f -0000000307 00000 f -0000000308 00000 f -0000000309 00000 f -0000000310 00000 f -0000000311 00000 f -0000000312 00000 f -0000000313 00000 f -0000000314 00000 f -0000000315 00000 f -0000000316 00000 f -0000000317 00000 f -0000000318 00000 f -0000000319 00000 f -0000000320 00000 f -0000000321 00000 f -0000000322 00000 f -0000000323 00000 f -0000000324 00000 f -0000000325 00000 f -0000000326 00000 f -0000000327 00000 f -0000000328 00000 f -0000000329 00000 f -0000000330 00000 f -0000000331 00000 f -0000000332 00000 f -0000000333 00000 f -0000000334 00000 f -0000000335 00000 f -0000000336 00000 f -0000000337 00000 f -0000000341 00000 f -0000041019 00000 n -0000043609 00000 n -0000043641 00000 n -0000000342 00000 f -0000000343 00000 f -0000000344 00000 f -0000000345 00000 f -0000000346 00000 f -0000000353 00000 f -0000041093 00000 n -0000043491 00000 n -0000043523 00000 n -0000041167 00000 n -0000043373 00000 n -0000043405 00000 n -0000000354 00000 f -0000000355 00000 f -0000000356 00000 f -0000000357 00000 f -0000000358 00000 f -0000000359 00000 f -0000000360 00000 f -0000000361 00000 f -0000000362 00000 f -0000000363 00000 f -0000000364 00000 f -0000000365 00000 f -0000000366 00000 f -0000000370 00000 f -0000041241 00000 n -0000043255 00000 n -0000043287 00000 n -0000000371 00000 f -0000000372 00000 f -0000000373 00000 f -0000000374 00000 f -0000000375 00000 f -0000000376 00000 f -0000000377 00000 f -0000000378 00000 f -0000000379 00000 f -0000000380 00000 f -0000000381 00000 f -0000000382 00000 f -0000000383 00000 f -0000000384 00000 f -0000000385 00000 f -0000000386 00000 f -0000000387 00000 f -0000000388 00000 f -0000000389 00000 f -0000000390 00000 f -0000000391 00000 f -0000000392 00000 f -0000000393 00000 f -0000000394 00000 f -0000000395 00000 f -0000000396 00000 f -0000000397 00000 f -0000000398 00000 f -0000000399 00000 f -0000000400 00000 f -0000000401 00000 f -0000000402 00000 f -0000000403 00000 f -0000000404 00000 f -0000000405 00000 f -0000000406 00000 f -0000000407 00000 f -0000000408 00000 f -0000000409 00000 f -0000000410 00000 f -0000000411 00000 f -0000000412 00000 f -0000000413 00000 f -0000000414 00000 f -0000000415 00000 f -0000000416 00000 f -0000000417 00000 f -0000000418 00000 f -0000000419 00000 f -0000000423 00000 f -0000041320 00000 n -0000043137 00000 n -0000043169 00000 n -0000000424 00000 f -0000000425 00000 f -0000000426 00000 f -0000000427 00000 f -0000000428 00000 f -0000000429 00000 f -0000000430 00000 f -0000000431 00000 f -0000000432 00000 f -0000000433 00000 f -0000000434 00000 f -0000000435 00000 f -0000000436 00000 f -0000000437 00000 f -0000000438 00000 f -0000000439 00000 f -0000000440 00000 f -0000000441 00000 f -0000000442 00000 f -0000000443 00000 f -0000000444 00000 f -0000000445 00000 f -0000000446 00000 f -0000000447 00000 f -0000000448 00000 f -0000000449 00000 f -0000000450 00000 f -0000000451 00000 f -0000000452 00000 f -0000000453 00000 f -0000000454 00000 f -0000000455 00000 f -0000000456 00000 f -0000000457 00000 f -0000000458 00000 f -0000000459 00000 f -0000000460 00000 f -0000000461 00000 f -0000000462 00000 f -0000000463 00000 f -0000000464 00000 f -0000000465 00000 f -0000000466 00000 f -0000000467 00000 f -0000000468 00000 f -0000000469 00000 f -0000000470 00000 f -0000000471 00000 f -0000000472 00000 f -0000000473 00000 f -0000000474 00000 f -0000000475 00000 f -0000000476 00000 f -0000000477 00000 f -0000000478 00000 f -0000000479 00000 f -0000000483 00000 f -0000041394 00000 n -0000043019 00000 n -0000043051 00000 n -0000000484 00000 f -0000000485 00000 f -0000000486 00000 f -0000000487 00000 f -0000000488 00000 f -0000000495 00000 f -0000041468 00000 n -0000042901 00000 n -0000042933 00000 n -0000041542 00000 n -0000042783 00000 n -0000042815 00000 n -0000000496 00000 f -0000000497 00000 f -0000000498 00000 f -0000000499 00000 f -0000000500 00000 f -0000000501 00000 f -0000000502 00000 f -0000000503 00000 f -0000000504 00000 f -0000000505 00000 f -0000000506 00000 f -0000000507 00000 f -0000000508 00000 f -0000000512 00000 f -0000041616 00000 n -0000042665 00000 n -0000042697 00000 n -0000000513 00000 f -0000000514 00000 f -0000000515 00000 f -0000000516 00000 f -0000000517 00000 f -0000000518 00000 f -0000000519 00000 f -0000000520 00000 f -0000000521 00000 f -0000000522 00000 f -0000000523 00000 f -0000000524 00000 f -0000000525 00000 f -0000000526 00000 f -0000000527 00000 f -0000000528 00000 f -0000000529 00000 f -0000000530 00000 f -0000000531 00000 f -0000000532 00000 f -0000000533 00000 f -0000000534 00000 f -0000000535 00000 f -0000000536 00000 f -0000000537 00000 f -0000000538 00000 f -0000000539 00000 f -0000000540 00000 f -0000000541 00000 f -0000000542 00000 f -0000000543 00000 f -0000000544 00000 f -0000000545 00000 f -0000000546 00000 f -0000000547 00000 f -0000000548 00000 f -0000000549 00000 f -0000000550 00000 f -0000000551 00000 f -0000000552 00000 f -0000000553 00000 f -0000000554 00000 f -0000000555 00000 f -0000000556 00000 f -0000000557 00000 f -0000000558 00000 f -0000000559 00000 f -0000000560 00000 f -0000000561 00000 f -0000000565 00000 f -0000041695 00000 n -0000042547 00000 n -0000042579 00000 n -0000000566 00000 f -0000000567 00000 f -0000000568 00000 f -0000000569 00000 f -0000000570 00000 f -0000000571 00000 f -0000000572 00000 f -0000000573 00000 f -0000000574 00000 f -0000000575 00000 f -0000000576 00000 f -0000000577 00000 f -0000000578 00000 f -0000000579 00000 f -0000000580 00000 f -0000000581 00000 f -0000000582 00000 f -0000000583 00000 f -0000000584 00000 f -0000000585 00000 f -0000000586 00000 f -0000000587 00000 f -0000000588 00000 f -0000000589 00000 f -0000000590 00000 f -0000000591 00000 f -0000000592 00000 f -0000000593 00000 f -0000000594 00000 f -0000000595 00000 f -0000000596 00000 f -0000000597 00000 f -0000000598 00000 f -0000000599 00000 f -0000000600 00000 f -0000000601 00000 f -0000000602 00000 f -0000000603 00000 f -0000000604 00000 f -0000000605 00000 f -0000000606 00000 f -0000000607 00000 f -0000000608 00000 f -0000000609 00000 f -0000000610 00000 f -0000000611 00000 f -0000000612 00000 f -0000000613 00000 f -0000000614 00000 f -0000000615 00000 f -0000000616 00000 f -0000000617 00000 f -0000000618 00000 f -0000000619 00000 f -0000000620 00000 f -0000000621 00000 f -0000000625 00001 f -0000041769 00000 n -0000042429 00000 n -0000042461 00000 n -0000000626 00000 f -0000000627 00000 f -0000000628 00000 f -0000000629 00000 f -0000000630 00000 f -0000000631 00000 f -0000000632 00000 f -0000000633 00000 f -0000000634 00000 f -0000000635 00000 f -0000000636 00000 f -0000000637 00000 f -0000000638 00000 f -0000000639 00000 f -0000000640 00000 f -0000000641 00000 f -0000000642 00000 f -0000000643 00000 f -0000000644 00000 f -0000000645 00000 f -0000000646 00000 f -0000000647 00000 f -0000000648 00000 f -0000000649 00000 f -0000000650 00000 f -0000000651 00000 f -0000000652 00000 f -0000000653 00000 f -0000000654 00000 f -0000000655 00000 f -0000000656 00000 f -0000000657 00000 f -0000000658 00000 f -0000000659 00000 f -0000000660 00000 f -0000000661 00000 f -0000000662 00000 f -0000000663 00000 f -0000000664 00000 f -0000000665 00000 f -0000000666 00000 f -0000000667 00000 f -0000000668 00000 f -0000000669 00000 f -0000000670 00000 f -0000000671 00000 f -0000000672 00000 f -0000000673 00000 f -0000000674 00000 f -0000000675 00000 f -0000000676 00000 f -0000000680 00000 f -0000041848 00000 n -0000042311 00000 n -0000042343 00000 n -0000000681 00000 f -0000000682 00000 f -0000000683 00000 f -0000000684 00000 f -0000000685 00000 f -0000000686 00000 f -0000000687 00000 f -0000000688 00000 f -0000000689 00000 f -0000000690 00000 f -0000000691 00000 f -0000000692 00000 f -0000000693 00000 f -0000000694 00000 f -0000000695 00000 f -0000000696 00000 f -0000000697 00000 f -0000000698 00000 f -0000000699 00000 f -0000000700 00000 f -0000000701 00000 f -0000000702 00000 f -0000000703 00000 f -0000000704 00000 f -0000000705 00000 f -0000000706 00000 f -0000000707 00000 f -0000000708 00000 f -0000000709 00000 f -0000000710 00000 f -0000000711 00000 f -0000000712 00000 f -0000000713 00000 f -0000000714 00000 f -0000000715 00000 f -0000000716 00000 f -0000000717 00000 f -0000000718 00000 f -0000000719 00000 f -0000000720 00000 f -0000000721 00000 f -0000000722 00000 f -0000000723 00000 f -0000000724 00000 f -0000000725 00001 f -0000000726 00000 f -0000000727 00000 f -0000000728 00000 f -0000000735 00000 f -0000093423 00000 n -0000093499 00000 n -0000093700 00000 n -0000094675 00000 n -0000111924 00000 n -0000177513 00000 n -0000000740 00001 f -0000044897 00000 n -0000041922 00000 n -0000042193 00000 n -0000042225 00000 n -0000000741 00001 f -0000000742 00001 f -0000000745 00001 f -0000046612 00000 n -0000084952 00000 n -0000000746 00001 f -0000000747 00001 f -0000000748 00001 f -0000000750 00001 f -0000079393 00000 n -0000000758 00001 f -0000085581 00000 n -0000085506 00000 n -0000069698 00000 n -0000069735 00000 n -0000085198 00000 n -0000085132 00000 n -0000085475 00000 n -0000000764 00001 f -0000085016 00000 n -0000084021 00000 n -0000084067 00000 n -0000091501 00000 n -0000073123 00000 n -0000000766 00001 f -0000072676 00000 n -0000000770 00001 f -0000072384 00000 n -0000072920 00000 n -0000073017 00000 n -0000000771 00001 f -0000000772 00001 f -0000000775 00001 f -0000046851 00000 n -0000078764 00000 n -0000000776 00001 f -0000000777 00001 f -0000000778 00001 f -0000000779 00001 f -0000000785 00001 f -0000079506 00000 n -0000079318 00000 n -0000079010 00000 n -0000078944 00000 n -0000079287 00000 n -0000000795 00001 f -0000078828 00000 n -0000084122 00000 n -0000073434 00000 n -0000072530 00000 n -0000072713 00000 n -0000072810 00000 n -0000042001 00000 n -0000042075 00000 n -0000042107 00000 n -0000000796 00001 f -0000000799 00001 f -0000046976 00000 n -0000077770 00000 n -0000000804 00001 f -0000046737 00000 n -0000077834 00000 n -0000077948 00000 n -0000078533 00000 n -0000000806 00001 f -0000078142 00000 n -0000000809 00001 f -0000078337 00000 n -0000073745 00000 n -0000000815 00001 f -0000047090 00000 n -0000047290 00000 n -0000045532 00000 n -0000046131 00000 n -0000093386 00000 n -0000000000 00001 f -0000212308 00000 n -0000047545 00000 n -0000092822 00000 n -0000092872 00000 n -0000046195 00000 n -0000000515 00000 n -trailer <<1EA52B84F23E44FB9AB5F45C60ABD7DF>]>> startxref 212443 %%EOF \ No newline at end of file diff --git a/www/images/ubuntu.ai b/www/images/ubuntu.ai deleted file mode 100644 index ec2af9a..0000000 --- a/www/images/ubuntu.ai +++ /dev/null @@ -1,274 +0,0 @@ -%PDF-1.5 %âãÏÓ -1 0 obj <>/OCGs[13 0 R 30 0 R 47 0 R 64 0 R]>>/Type/Catalog>> endobj 73 0 obj <>stream - - - - - application/pdf - - - ubuntu - - - - - Adobe Illustrator CS3 - 2010-05-11T12:05:06+01:00 - 2010-05-11T12:45:57+01:00 - 2010-05-11T12:45:57+01:00 - - - - 252 - 256 - JPEG - /9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgBAAD8AwER AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE 1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp 0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo +DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8A9U4q7FXYq7FXYq7FXYq7 FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FVskkcUbSysEjQFndiAqqBUkk9AMBNJjEk0NyXhnn /wD5yGdJpdP8oKpVKq+rSryBPjBGdtv5n6+HfNZm1x5Q+b6N2N7EggZNV/pB/vj+gfN45rHmnzJr UjPqupXN5y6pLIxQfJK8V+gZgSmZczb3el7P0+nFYoRj7hv8+aXRTSwyLJC7RyL9l0JVh8iMi5co iQoiwzTyt+cnnrQJUAv21GzU/HaXpMwI/wAlyfUT2o1PbL8epnDkXn+0PZfRakH0cE/50dvs5H5f F9D/AJf/AJl6F5zsi1ofq2pQrW606Qgunbkp25pX9ofSBm2wamOT3vl3bXYObQT9XqxnlIcj7+4+ XyZdmQ6N2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KvBP+cg vzEma6PlDTZikMYV9WdKguzAMkNf5QCGb3oOxzVa7PZ4ByfSvYvsQCP5rINz9H6ZfoH7Xh2a99Ed irsVdiqO0PW9S0PVbfVNNmMN5auHjcdD4qw7qw2IwxkYmxzcbV6THqMRx5BcZfj5vsTyb5ntPM/l uy1q2HAXKfvYq1McqnjIh+TDbxG+b/DlE4gvhXanZ8tJqJYZfwnY946FOstde7FXYq7FXYq7FXYq 7FXYq7FXYq7FXYq7FXYq7FXYq7FULe6rpdgvK+vIbVetZpEjH/DEZXPNCH1ED3luxabJk2hGUvcC Ugu/zQ8iWteerRuR0EKyS1+lFYZiS7T04/i+92eL2f1s+WM/Gh95S6T86PIyV4zTyU6cYW3+XLjl J7ZwefycuPsprD0iP85TT87fJLGhN0g8WhFPwY5EdtYf6Xy/ayPsnrB/N+f7EXbfm/5CmIDX7Qk9 BJDKPxVWGWx7X05618C0T9mNbH+C/dIfrT/SfNHl3V3Mem6jBdSheZiRx6gUGhbgfipv4Zl4tVjy bRkC6zU9n58AvJCUR31t80wuJ47e3luJNo4UaR6deKipy6UqFuLCBlIRHMviLV9TudU1S71K5Nbi 8meeXv8AFIxYgV7Cu2c4TZsv0NpsEcOOOOP0xAHyQmBudirsVdirsVe7f84y6zKRrWiuaxD07yBf Bj+7l++iZsez57mPxfOPb7Sj91mHPeJ+8fpe7ZtHzh2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2Kux VCanq+maVbG61G6jtYB+3IwWp8AOpPsMry5oYxcjQb9PpsmaXDjiZS8nm/mD89dOgLRaHZtduNhc 3FY4/mEHxt9PHNLn7ciNsYvzL1mi9j8kt80uHyG5+fL73nus/mZ501UsJdRe3iP+6bX9ytPCq/Gf pY5qM3aObJzlXu2eo0vYGkw8oCR75b/ft9jGZJJJXMkjF3bdnYkkn3JzCJt3EYgChyWYpdirsVdi r0b8inVfOFyD1ewkVfn6sR/UM3HYh/fH+r+kPK+2AvSR/wCGD7pPZ/MkTy+XdUij/vJLOdU+bRMB nS5x6Je4vn+hkI58ZPITj974kzn36EdirsVdirsVdir17/nGiGU+cNTmB/dJp7I43pyeeIr7dEOZ 3Z/1n3fqeH9vJD8rAdfE/wB7L9b6OzbvlLsVdirsVdirsVdirsVdirsVdirsVdirsVdirB/za8on XfL5u7ZOWo6aGlhA6vHT95Ht3oOQ9xTvmq7V0ni4+IfVH7ur0fs32n+Wz8Mv7vJsfI9C+ec5J9Rd irsVdirsVdirsVZV+WOqppvnbTZZCFinc20hP/FylF/4cjM3s7LwZ4k+75um9oNMcujmBzA4vlv9 z6UIBBBFQeoztXyR8Zee/LU3lvzZqOkupWKGVmtT2aBzyiYf7EgH3rnO5cfBIxffOx9eNXpoZRzI 3/rDn9qQZB2TsVdirsVdir6O/wCccfLMtj5bvNbnQrJqsgW3r/viCoDf7J2b7s2vZ+OgZd75T7c6 8ZNRHDHljG/9aX7K+b17Ng8O7FXYq7FXYq7FXYq7FXYq7FXYq7FUNqGo2lhbNcXThEHQd2Pgo7nM XV6zHp4GeQ0Pv8g24cEskuGI3YJe+ctSnv454j6VvC/JIAdmHfme9Rnn2q9pc+TMJx9MInaPf/W9 /wBj0mLsvHGBid5Hr+pntjew3tpFdQmscq1Hse4PyOeh6XUwz4xkh9Mnms2I45GJ5hXzIa3zv+av lD9AeYWnto+Om6hWW3oPhR6/vI/oJqPY5x3aek8HJt9MuX6n1T2c7T/M4OGR/eQ2PmOhYTmuegdi rsVdirsVdiq5WZWDKSrKaqw2II7jFBF7F9M+QfNMfmPy5b3hYG8jAhvkHUSqNzTwf7QztdBqvGxg /wAQ5vkPbPZx0uoMP4DvH3fs5Mc/OP8ALL/FulrfacijXrBSIa0X14q1MJbxrule/wA64dXp+MWP qDtfZft/8lk4Mn9zPn/RP879f7Hy7c21xa3EltcxPBcQsUlhkUq6sNirKaEEZpiKfYceSM4iUTcT yIU8WbsVdirNPyz/AC11Pzlqy/C0Oi27j69e02oN/SjPd2/Dqfe/BgOQ+ToO3u3cegxd+WX0x/Sf L7+T6ysrO1sbOGztIlhtbdFigiXZVRBRVHyGb2MQBQfFMuWWSRnI3KRsnzVsLW7FXYq7FXYq7FXY q7FXYq7FXYqhNU1O2020a5uD8I2VB9pm7KMw9drsemxnJPl957g36fTyyy4YvNNX1e71S6M1w3wi oiiH2UHgP4nPLO0e0cmrycc+XQdA9ZptNHDGo/2oHMByWUeSda+rXX6PmakFwf3RP7MnSn+yzrPZ ftTwsngzPpny8pft+90/aul448Y5x5+79jPM9CebSHzx5Xh8yeXrjT2AFyB6tnIf2ZlHw/Q32T7H MTXaUZsZj16e92fZHaB0mcZP4eUvd+N3zHPBNbzyQTIY5omKSxtsVZTRgfkc4kgg0X1+ExICQ3BU 8DJ2KuxV2KuxV2Ksi8k+cr7ytqwu4R6trLRLy2rQSID28GX9k5l6PVywT4hy6h1fa3ZcNZi4TtIf Se4/q730domt6ZrWnRahp0wmt5R2+0rd0cfssO4zscGeOWPFE7PlGr0mTT5DjyCpD8WPJj/nb8rv Knm9fUv4DBqCiiahb0SWg7PUFXH+sPlTI5tLGfkXZ9k+0Gp0O0DcP5p5fDu+HxeQ6x/zjX5ogkJ0 rUbW9h3oJucEnttSRf8Ahs189BMcqL3Gl9u9NIfvYSgfKpD9B+xLYf8AnHf8wpJArfUolPV3nJA/ 4FGP4ZAaLIejly9t9CBtxn/N/WWbeVv+cbdLtpUuPMd+b8rubK2Biir4NIT6jD5BcycfZ/8AOLz/ AGh7dZJjh08OD+lLc/LkPtewafp9jp1nFZWMCW1pAvGKCJQqqPYDNhGIiKHJ4XNmnlmZzJlI8yUR kmp2KuxV2KuxV2KuxV2KuxV2KuxVTubiG2geeZgkUYLOx8BlWbNHFAzkajHmzhAzkIjmXmOu61Pq t4ZX+GFKiCL+Vf6nvnlXa3ac9Xl4jtEfSO4frPV67R6UYYUOfVLc1bluxVsEggg0I3BGINbhD0zy zrQ1PTlLn/SoaJOPE9m/2Weq9h9pjVYAT/eR2l+v4/reS1+l8HJt9J5Jvm5cF4p+dnlD6rfJ5itE /wBHuyI70AbLMB8L7dnAofce+cz2zpOGXiDlLn7/ANr6F7J9p8cDp5H1R3j7u74fd7nlmaN7J2Kr 44pZW4xIzsBUhQSafRiBbGUgOZpe9ndopZ4JFUblirAD8MPCUDLE7AhRwM3Yq7FU38ueadb8u3n1 rS7gxltpYW+KKQeDp0Pz6jtl+n1M8UrgXC13Z2HVQ4cgvuPUe4vX/Lv53aBeKsWsRPptxsGkUGWA n2Kjmv0j6c6HT9tY5bTHCfseE13slnxm8R8SPyl+r8cmb2PmTy9fqGs9StpweySoT9K1qM2cNVil ykD8Xns2gz4/rhIfAop9QsEUs9zEqjqxdQB95yZyxHUNIwzOwifkkOr/AJkeS9LRjNqcU0g/3TbH 13J8Pgqo+kjMXL2lghzlfu3dlpuwtXmO0CB3y9P3vMPNn506vqKNa6JG2m2rVDXBINww9iNo/oqf fNJqu2Jz2h6R9v7HsOzfZTFiPFmPiS7v4f2/jZnX5Xefl8xaf9RvnH6ZtFHqE7etGNhKPfs33982 nZmv8aPDL6x9rzntD2N+VnxwH7qX+xPd+pnWbV5t2KuxV2KuxV2KuxV2KuxV2KsD8664bi5/R0Df uID++I/akHb5L+vPPfaftXxJ+BA+iP1ecu74ff7npOytJwx8Q8zy937WL5ybuHYq7FXYqmWgau+l 6ik4qYW+CdPFD1+kdRmz7I7ROkzif8J2l7v2OJrNMM2Mx69HqEciSRrJGwZHAZWHQg7g56zCYkBI bgvHyiQaKE1rSbTV9LudNu15W90hRvEHqrD3U7jIZsIyQMTyLfpdTPBkjkh9US810P8AIeyjb1Na v2uKHaC2HpqR25O1W+4D55pcHYYH1y+T1ur9sZnbDDh85b/YznTPIfk/TAv1XSbcOvSSVPVf58pO RzaY9BhhyiPv+953UdsarN9WSXw2HyFJ5HFHGoSNAiDoqgAfcMyhEDk62UiTZXYUIK+0PRb9St7Y W9yG6+rEjn7yDlU8GOf1RB+DkYdXmx/ROUfcSGI6z+TPk6/VmtY5NNnO4aBiyV9435D/AIGma7N2 Phl9PpLvNL7U6vH9RGQefP5j9NvNPM/5R+aNFV7iBRqdktSZbcH1FA7vEfi/4GuaXU9lZcW49UfL 9T13Z/tLptQeGX7ufceXwP66YQQQaHrmteiaxV2KuxV2KuxVG6Nq97o+p2+pWT8Lm2cOh7Ed1bxD DY5ZiyyxyEo8w4+q00M+M45i4yfT/lvXrPXtGttUtTSOdfjjrUo42dD7qc7fTZxlgJjq+P6/Rz02 aWOXMfaOhTLL3DdirsVdirsVdirsVdiqV+ZNW/RulyTKf38n7uAf5R7/AEDfNT212h+V05kPrO0f f+zm5mh03i5AOg3LzAkkkk1J3JOeUEkmy9e1gS7FXYq7FXYq9G8mLqSaSEu04xA1tSx+IodzUdhX pnpvs1HPHTVlFR/h76/V3f2PK9qHGctx59U+zoXWuxV2KuxV2KuxV2KuxVhPnf8AK3RvMKyXVqFs dXNSLhR8Eh8JVHj/ADDf59M1et7Lhl3j6Z/f73oeyfaHLpSIy9eLu6j3fq5e54LrWi6louoSafqM JguYuqncFT0ZSNip8c5XNhljlwyFF9L0urx6jGMmM3EoHK3IdirsVdirsVej/kv5rOm64dGuHpZ6 mf3Vei3AHw/8GPh+dM2/Y+q4MnAfpl97yntV2b4uHxoj14+f9X9nP5vd86t82dirsVdirsVdirsV dirzvzpqRutWMCmsNoPTA7czu5/h9Geae0+t8XU8A+nHt8ev6vg9R2Vg4MXEecvu6MfznHaOxV2K uxV2Ksu8oeWVm46jepWLrbxH9oj9th4eGdn7OdhidZ8o9P8ACO/zP6HR9p6/h/dw59T+hm2d28+7 FXYq7FXYq7FXYq7FXYq7FWP+dPJuneaNLa1uAI7uMFrO7p8Ubn9an9ofxzD1ujjnjR+roXadldqZ NHk4o7xP1DvH6+583axpF/pGpT6dfR+nc27cXXsfBlPcEbg5xuXFLHIxlzD6zpdTDPjGSBuMkFlb e7FXYq7FV8UskUqSxMUkjYMjjYhlNQRiDSJREhR5F9R+UNeTXvLljqYp6k0YE6jtKnwyD/ghtnc6 PP4uIS/FvjfaejOm1EsfQHb3dE4zJcB2KuxV2KuxV2KofULtbOxnum6QoWA8SBsPpOY2s1Aw4pZD /CCW3Bj45iPeXkruzuzueTsSzE9ydznjk5GRJPMvbAACgtyKXYq7FXYqm/lnRTqmoBXB+rQ0ec+I 7L/ss3XYfZn5rPR/u47y/V8XB1+q8HHt9R5PTFVVUKoAUCgA2AAz1MAAUHkibbwodirsVdirsVdi rsVdirsVdirsVef/AJu+Sl1nR21W0j/3J6chYhRvLAN2X3K/aX6R3zUdraPxIcY+qP2h6f2Z7VOD L4Uz+7n9kuh+PIvAc5R9NdirsVdirsVewfkLrZ/3I6JI2wpd26/dHL/xpnQdh5t5Q+P6/wBDwvtl pPozD+qfvH6Xr2dE8K7FVK7u7Wzt3uLuZILeMVeWRgiqPcmgyM5iIsmgzx4pTkIxBlI9AwbVfzq8 nWUjR2xn1BxtygQBK/60hT8Ac1eXtnDHYXJ6PTeymryC5cMPed/stLE/PvRCw56ZcqvchoyfuJGU Dt2H80uYfY3N0nH7WT6F+Z3k7WZFhhvPq1y+ywXQ9JiT2DElCfYNmbg7Tw5DQNHzdPrPZ/V4BZjx R747/t+xlLKrKVYBlYUKncEHM8gEUeTpga5MK80eUlgR77T1/dDea3G/Ed2X29u2cJ277OiAObAP T1j3eY8vLo9B2f2lxEQyc+hYjnGu7dirsVdir03ytpgsNIiDCk0/72Xxqw2H0DPVewdD+X00Qfql 6j8f1B5HtDUeJlPcNgm+blwXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXzT+Y/lsaB5ruraJeNpP/pN oB0EchPwj/VYFc4rtDT+FlIHLmH1zsLX/mdNGR+qPpl7x+sbsXzCdw7FXYq7FWUflpqp03ztpcpa kc8v1aTwInHpivyYg5m9nZeDPE+dfPZ0/b+n8XR5B1A4v9Lv9z6WztXyNKvM3mTTvLukS6lfN8Cf DFEPtSSH7KL7n8BvmPqdTHDDik5ug0OTVZRjhz+4d75082ec9a8zXpnvpSturE29mpPpRg+A7tTq x3zjtVq55pXI7d3c+q9m9lYdJCoD1dZdT+O5IcxnZOxV2KvR/wAufzTu9Jni0zWpWn0lyFjnclng J6bncx+I7dvDNv2f2mcZ4Z7w+79jynbns7DODkwjhy93SX7fv6vdlZJEDKQ6OKgjcEHOq2IfNyCC 8482aKNO1DnCtLW4q0YHRT+0v9M8x9oezPy2biiP3c9x5d4/U9V2bqvFhR+qKR5oHYuxVHaJZi81 a1tyKq8gLj/JX4m/AZn9labx9TCB5GW/uG5+xxtXl8PFKXk9Wz194x2KuxV2KuxV2KuxV2KuxV2K uxV2KuxV2KvLvz30dZtHsdWRR6lrMYJD39OYVFfkyfjmi7cw3CM+409j7HarhyzxHlIX8R+w/Y8S zmn0N2KuxV2KqttPJb3EVxEaSQusiH/KU1H6sING2OSAlExPIin1l9ch+o/Xd/R9L1vfjx5fqzvv EHDxdKt8R8I8fB1ungn5weZpNW80SWEb/wChaUTAijoZv92sffkOP0Zyna2pOTKY9I7frfTPZjs8 YdMJn68m/wAOn6/iwPNW9I7FXYq7FXYq94/JTzNJqOgy6TcPyn0sqIiepgevAf7Agj5UzqextSZw MDzj9z5t7WaAYswyx+nJz/rDn8/1st83WIutEmNKyW/75D/q/a/4WuQ9odKM2kl3w9Q+HP7LdH2b m4Mw7pbPNM8tetdirJPIcIfWXkP+6oWI+ZIX9ROdP7J4uLVGX82B+8B1PbEqxV3l6Bno7zLsVdir sVdirsVdirsVdirsVdirsVdirsVSDz7otxrXlLUNOtY/VupUVoEqq1eN1cDkxUCvHxzD1+E5MMoj m7PsbVx0+qhkkaiOfuIp4nF+UHn968tOWOnTlPAa/wDAu2c0OydR/N+0frfQpe0+hH8d/wCbL9Ss n5M+emJ5W8Ke7TJ/xrXJDsjUd32hrPtVoh1l/pSrR/kl52YnkLVPdpj/AMaqckOx8/l82B9rNGP5 x+H7VWP8jPOLE8p7GOndpZP+NY2yQ7FzH+b8/wBjCXtfpB0mfgP+KV4vyH80En1b6xUduLTN+uNc kOw8vfH7f1NcvbHTdIz/ANj/AMU9c/RN7/hL9Eeqn136h9U9bf0/V9H0+Xjx5b50Hgy8Hg/i4a+N U8N+Zh+a8WjweJxV1riuve+Xbq4kubqa5k3kmdpH+bkk/rzh5Gzb7HjgIRERyApSwM3Yq7FXYq7F XoX5H3UkXnF4V+xcWsiuP9VlcH/hc23Y0qz13gvL+12MHSA/zZj9Ie73aCS1mRujoyn5EEZ0+eIl jkD1BfNsZqQPm8gzxZ7l2Kss/L7/AHtu/wDjGv8AxLOx9j/7zJ/VH3ul7a+iPvZxnevOuxV2KuxV 2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KvkvVLF7DUruxcEPazSQsD1qjFf4ZwGSBjI xPQvt2nzDJjjMfxAH5oXINzsVdirsVdir0f8jLF5vNdxdU/d2tq9T/lSMqqPu5Zt+xYXmvuDyntf mEdMI9ZS+6/2PcL+UQ2NxKekcbsfoUnOk1WQQxSkekSfsfOsMeKYHeQ8izxh7h2Ksn8gShdVnjP+ 7ISR81YfwOdX7I5K1Eo98PuIdP2zG8YPcWe56G827FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FUl85 +Yf8O+V9R1oIsrWUXNI3JCs7MFVSR4swyrPk4IGTsOy9F+a1MMN1xn9rxZf+cm9Z5DlodsVruBK4 NPnQ5rf5Qn3B78+wOL/VZfIK3/Qz19/1L8X/AEkt/wBU8l/KEu4Nf+gCH+rH/S/8ebX/AJyevOQ5 eXoytdwLpgafP0jj/KEu5T7AQ/1Y/wCl/wCPK3/Q0P8A37P/AE/f9m+S/lH+j9v7Gv8A5N//ALf/ ALD/AI+2n/OUCFgH8tELX4iL2pA9h6A/Xj/KP9H7f2IP/A/NbZv9h/x961/iYf4K/wAT/Vjx/R36 T+p8vi4+h6/p8qfapt0zO8T0cVdLeJ/If4X+W4v8pwcX+dw28o/OrylLZ6uNft0rZ39FuaDZJ1FK n/XUV+dc5vtjSmM/EH0y+/8Aa9t7KdpDJi8CR9UOXnH9n3U8zzTPXOxV2KuxVsAk0HXFX0T+VHlO TQPLYkuk4ahqJE9wp6olP3aH5A1PuTnX9laU4sdn6pb/AKnyv2j7SGp1FRPohsP0n8dyaeddQW20 gwA/vbo8AO/Ebsf4fTmv9p9YMWmMB9WTb4df1fFwuysPHl4ukXneeaPUuxVNfLF2LXXLV2NEdvTb 5OOI/E5t+wtR4WrgTyJr57fe4XaGPjwyHx+T0/PV3kHYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq8 r/5yL1tbPyTFpob97qlyilK9YoP3rH6HCZga+dRA73s/YfSHJrDk6Y4n5y2+63zPmpfW3Yq7FXYq 2iM7qiAszEBVHUk9BigkAWX2z+iB/hv9D7U+p/VPanpenm/8P93w+VfY/Pv5n/CPF/p8X22idS02 y1Oxmsb2ITWtwpSWM9x8+xHY5LLijOJjLkWrBnnhmJwNSi8E87flVrOgySXNij3+k9RKgrJGPCRR 4fzDb5Zyms7MniNj1Q/HN9L7J9o8OpAjOoZe7ofcf0MFzWPRuxVWtLO7vLhLe0hee4kNEijUuxPs BvhjEyNAWWGTLHHEykRGI6l7H+XP5SNZTRav5hRWuUo9rYbMEbs8vYsOy9vn06Ls/srhInk59B+t 4Ltz2l8QHFgPp6y7/IeXm9TmmihieWVgkaAs7HYADN5kyRhEykaiHjYxMjQ5vMPMOsNqmotMKiBP ggU9lHc+5655T2x2kdXnMv4BtH3fteu0WmGHHXXqlmapzHYq2CVIINCNwRhBINhBD1bRtQXUNMgu gfidaSDwddm/HPX+zdYNRgjkHUb+/q8ZqsPhZDH8UjcznHdirsVdirsVdirsVdirsVdirsVdirsV fLn59+aV1nzs9lA/K00ZPqq0NQZieUxHyNEP+rmk1mTin7tn2L2O7PODR8cvqyni+H8P6/i82zFe sdirsVdirI/y40k6t560SxpVXu45JB4xwn1ZP+EQ5ZhhxTA83VduanwNFln/AECPidh9pfZOdC+D OxV2KpHqvkjylqrtJfaXBJK9ecqr6bmvi8ZVvxzEy6HDM3KI+77nY6ftfVYRUMkgO7mPkbS1Pym/ L5GDDSRUeM9wR9xkIyr+StP/ADftP63LPtJrj/lP9jH/AIlkGl6Ho2lRlNNsobRT9r0UVS3+swFW +nMvFghj+kAOs1Gsy5jeSUpe8o1mCqWPQCu25ywmhbjgPOvMfmibVGMEIMVkpqF/acjoW/pnmfbX bstUeCHpxD5n3/qep0PZ4w+o7z+5Ic552TsVdirsVZN5K1kWl2bGZqQXJHAnosnQf8F0zqvZftMY sngyPony/rft5fJ1Haul448Y5x+5n2eiPNOxV2KuxV2KuxV2KuxV2KuxV2KuxViP5n+eIfKPlee9 Vh+kbgGDTYjvWZh9sj+WMfEfu75jarN4cfM8neez/ZJ12pEP8nHeXu7veeX29HyHLLJLI8srF5JC Wd2NSWJqSSe5zRvuMYgChyC3FLsVdirsVex/8416A1x5g1HW3X91YQCCIn/fs5qSD/kohB/1sztB C533PB+3es4cEMI5zlZ90f2n7H0Tm3fLXYq7FXYq7FXYq7FXmPmfTvqGsTRqKRSn1Yv9V+30Gozy nt3Rfl9VID6ZeofH9tvX9n5/ExA9RsUpzTua7FXYq7FWwSDUbEYg0h6F5T8xLqEAtLlqXsQ2J/3Y o/a+Y7/fnpXs/wBsjUw8OZ/ex/2Q7/f3/N5jtHQ+EeKP0H7GQ50jq3Yq7FXYq7FXYq7FXYq7FXYq gdb1rTdE0u41TUphBZ2y85ZD9wVR3ZjsB3yGSYgLLkaTSZNRkGPGLnJ8kfmH55vvOPmCTUZwYrSO sdhak1EUVe/bk3Vj/QZos2U5JWX2/sTsiGhwDGN5HeR7z+odGMZU7d2KuxV2KuxV9c/lD5WPlzyN Y28qcL27BvLwHqJJgCqn3WMKp9xm70mPhgPPd8Q9pu0PzWslIH0R9MfcP1myzPMp0DsVdirsVdir sVdirH/Oek/XNN+sRrWe1qwp1KH7Q+jrnOe0vZ/j4OOI9ePf4df1uz7L1PBk4Tyl97zvPNHqXYq7 FXYq7FV8M0sMqyxMUkQ8kddiCMnjyShISiakGMoiQo8npXljVrrU9O9a5j4ujcPUHR6D7QHbPUuw +0MmqwccxRBq/wCd5vJ6/TRxZKif2Jvm5cF2KuxV2KuxV2KuxV2KpN5p83aD5X01tQ1i5EMXSKIf FLK38sadWP4DvlWXNGAsuf2d2bm1mTgxRs9/QeZL5d/Mb8zNY86ahWWttpMDE2enqahe3OQ/tOR3 7dB3rpc2eWQ78n2HsPsHFoIberKfql+gdw+/qw7KXfOxV2KuxV2Ks4/J7yWfNHnC3SePnpenkXV+ SPhIU/BEf+Mj7Efy1y/TYuOddHnfaftX8npSYn95P0x/SfgPtp9aZvnxN2KuxV2KuxV2KuxV2KuI BFDuD1GJCvNPNGinTNQPpr/os9XgPYeKf7H9WeWdvdmHS5vSP3c94/q+H3PW9n6rxYb/AFDn+tJs 0jnuxV2KuxVE6fYzX15Fawj45WpXwHdj8hvmTo9LLUZY4485H+0/BqzZRjgZHo9Ws7WG0tYraEUj iUKo+Xf6c9f0+COHGIR+mIp4vLkM5GR5lVy5gxPSvzV8g6nezWUGrwx3MMjRcZz6KuVPGsbvRHDU 2oa5jQ1eMmrd3qfZ3W4YCcsZMSL23r3gbhlgIYAg1B3BHQjMl0hDsVdirsVS3WvM3l/RIfV1fUIL JeoEzhWb/VX7TfQMrnljDmXL0ugz6g1ihKfuH6XknnD/AJyPsokktvKtqbiXoNQugUjHukX22/2X H5HMDLr+kQ9v2Z7DTJEtTLhH82PP4nkPhfveIa5r+s67fvqGrXcl5dv1kkPQdeKqKKq+yima+UjI 2X0PSaPFp4CGKIjHy/G/xS/IuS7FXYq7FXYqvhhlmmSGFGkmlYJHGoJZmY0CgDqScWMpCIJJoB9c /lZ5Gj8oeV4rSRQdTuqT6jIN/wB4RtGD/LGPhHvU983mlw+HHfmXxD2h7XOu1JkP7uO0fd3/AB5/ Z0ZhmS6J2KuxV2KuxV2KuxV2KuxVBavpcGp2L2suxO8b91cdDmD2joIarEccvge497kabUHFMSDy +9sriyupLa4XjLGaEdj4EexzyfVaWeDIccxUg9fiyxyREo8ioZjtrsVdirO/I+j+hatqEy0luBSG vUR+P+yOeg+y3Zvh4zmkPVPl/V/b91PN9raril4Y5R5+/wDYynOtdO83/PHz1/h3yu2n2knHVdXD QxU+1HDSksntseK+5r2zC1ubhjwjmfuer9kuyPzWp45D93i3Pmeg/Sf2vlvNO+xprpHmzzNo9Bpe q3Vmi9I4pXVN/FK8T92SjMx5GnC1PZ2nz/3mOMveBfz5sntPzx/M23HH9L+soFAJYIG+nlwDfjlw 1eQdXUZPZLs6X+Tr3Sl+tWk/Pr8zGQquoxIT0dbaCo/4JSPww/nMvf8Ac1j2O7PB+gn/ADpfrSfU fzT/ADC1FWW5166Ct9pYWFuD9EIjyuWeZ5kufg9ntDi+nFH4+r/dWxiaaWaVpZnaSVzV5HJZifEk 7nKnbxiIigKCzFk7FXYq7FXYq7FXYq93/IT8smUx+b9XiIJB/RFu47H/AI+CD7bJ/wAF4ZsdFp7P Gfg+b+2Pb4N6XEf65/3v6/l3vdc2j5y7FXYq7FXYq7FXYq7FXYq7FXYqk/mTy9FqttySiXkQPoyd j/kt7fqzSdtdjx1kLG2SPI/oPl9zn6HWnDLf6TzebzwTQTPDMhjljNHQ9Qc8wy4pY5GExUhzD1UJ iQsbgqeVs0x0DSX1PUo7ff0h8c7Dsg6/f0GbPsjs86rOIfw85e79vJxNZqRhxmXXp73qSIqIqIAq KAFUbAAdBnrUYiIocg8eSSbKleXltZWk13dSCK2t0aWaVtgqIKsT8gMZSAFlnixSySEYi5SNB8d+ f/N9z5s8z3WrS8lgY+nZQt/uuBCeC/PfkfcnOfy5DORJfduxuzI6LTxxDnzke+XX9XuY7lbtHYq7 FXYq7FXYq7FUbo2iatrWoR6fpVrJd3kv2IoxU07sxOyqO5OwwxiZGg4+q1eLTwOTLIRiOp/H2Pcv J/8AzjhZRolz5qu2nmO50+1JSMezy/ab/Y8fmc2OLQdZF877T9uZkmOmjQ/nS5/Ach8b9z0/SvIf kzSUC2Gi2kJUUEhiV5Ke8jhnP0nM2OnxjoHj9T2xq8x9eWZ+ND5DZNzp9gQQbaIg7EFF/pk/Dj3B whmn/OPzSLWfy38i6wrC+0S1Lv1miQQS/wDIyLg345XLTY5dHY6Xt3W4D6MsvcTY+RsMItv+cc/K 9v5jgvhdzTaRGeb6ZMAxZwaqplHGsfiONffMYdnx4ufpehye3GplgMOEDKf4x3e7v+PwetIiIioi hUUAKoFAAOgAzYAU8SSSbLeKHYq7FXYq7FXYq7FXYq7FXYq7FXYqlGv+XLbVouX91doKRze38reI zTdr9jY9ZG/pyDlL9B8vuc7R66WE98e551fWF3Y3DW91GY5F+4jxB7jPM9Xo8mnmYZBR/HJ6nDmj kjxRNh6D5S0f9H6cHkWlzc0eTxA/ZX6M9H9n+zfy2C5D95Pc/oH46vM9parxclD6Yp3m+dc8V/5y I89G2s4vKdlJSa6Am1JlJqsQNY49v5yKn2Hvms1+b+AfF9A9iOyOOZ1UxtHaPv6n4fjk+fc1r6c7 FXYq7FXYq7FXYqmflzy7qnmLWLfSdMj9S6uGoCahUUfadyK0VRuclCBkaDia7XY9LiOXIajH7fIe ZfWnkTyDonk7ShaWEYe6kAN7fMP3kzj/AIio/ZUbD51ObzBgGMbc3xPtjtnNrsnFM+kfTHoP295T nU9XsNNi9S6kC1+wg3dvkMp1vaOHTR4shruHU+4OvwaaeU1EMUvPzAuWYiztkRezSksfuUqBnIan 2vmTWKAA/pb/AGCv0u6xdjR/jl8kEPPGu1ryjPtw/tzB/wBFWr/o/JyP5Jw+fzTGw/MB+QW+thxP WSGop/sWJ/Xmy0ntebrND4x/Uf1uLm7GH8Evmyux1CzvoBNayiWM9adQfAjqDnX6XV4tRDjxy4h+ Ofc6XNhnjNSFFEZktTsVdirsVdirsVdirsVdirsVdirsVdirsVULuws7sILmJZRGwdOQ6EGuY+o0 uLMAMkRKjYbMeacPpNWr5kNaV+aPMNj5d0G81m9P7i0jLBAaF3OyRrXu7EAZXlyCESS5nZ+inqs0 cUOcj8u8/APjXXNZvta1e71W/fnd3khllI2AJ6Ko7BRsPbOflIk2X3rSaWGnxRxQ+mIoIHA5DsVd irsVdirsVdir6Y/IHyTHpHlka9cx/wC5HWAHjJ6pag/uwP8AX+2fanhm20OGo8R5l8k9su1jn1Hg xP7vF9suvy5fN6JrusRaVYtOw5St8MMf8zf0HfIdq9ox0mEzO8uQHefxzeW0mlOafCOXV5leXtze 3D3Fy5eVzuT29h4DPKtVqsmeZnM3IvXYsUcceGIoKGUNjsVdiqM0vVbvTbpbi3ah6Oh+yy+BzN0H aGTS5OOB946EOPqNPHLHhk9O0zUYNQso7qD7DjdT1Vh1U/LPVtFrIanEMkOR+zyeRz4JYpmJ6IrM tpdirsVdirsVdirsVdirsVdirsVdirsVdirsVY3588jaf5y0ddNvbme2WOQTRPARTmAQC6kEMKE5 RnwDIKunbdj9rz0GXxIRjKxRvu8u54B5o/ITzvo5eWxjTWbRdw9rtNT/ACoW+KvshbNXk0c49L9z 6Z2f7Y6PPQmfCl/S5f6b9dPO7q0urSdre6he3nQ0eKVSjqfdWAIzFepx5IzjxRIlE9RupYs3Yq7F XYq7FUboemvqmtWGmISGvriK3BHUeq4Sv44YxJNBx9XnGHDPIf4ImXyFvtu2t4ba3it4FCQwoscS DoFUUUD5AZ0cYgCg/Pc5mcjI8zu8+86X7XOsvCD+6tR6aj/KO7H79vozzT2m1Zy6ox/hx7fHr+r4 PT9lYeDFfWW6QZzrs3Yq7FXYq7FWV+QtQaO8lsWP7uZfUQeDr1+9f1Z1/slrDHLLCfpkLHvH6x9z pe2MNwE+o2+DOc79512KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxVBapoejatD6GqWMF7F/ JPGsgHy5A0yE8cZcxbkafV5cJvHKUD5GmD6t+Qn5c35ZorWbT3bctazMBX2WX1VH0DMaWhxnlYeh 03tjr8fOUZj+kP1UWL33/OMWnNU2OvTQ+AngWXx2qrxfqyg9nf0vsdzi9v8AIPrxA+6VfoKUy/8A OMmsgt6WuWzinw8onWpp3oWplZ7Pn3hzY+32Lril8wpx/wDOM3mIk+rrFmo7cUlb9YXH8hPvH4+D OXt9g6Y5/YjrX/nGGckG78wKo7rFbFq/7JpV/Vk49nnqXGye34/hw/OX/HWW+VfyE8r6Bqtrq31y 7u72zcSwhzGkXMdCUVeW3+tl2PQxiQSbIdJ2j7Y6nU4pYuGEYSFHnfzv9D0zM55F5LqrFtUvGO5M 8hJ/2ZzxztA3qMh/py+8va6cVjj/AFR9yFzEb3Yq7FXYq7FU38qEjzDZkfzMPvRhm59nzWtx+8/7 kuD2j/cS/HV6bnqryLsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVd irzDzPaNba5dqRQSOZV9xJ8X6znlHbunOLVzHeeL57vX6DJx4YnuFfJKs1DmuxV2KuxV2Ksg8kWj Ta2s1Pgt0Zye1WHEf8Szo/ZbTmeq4ukAT89v0ur7WycOGv5xeiZ6W8u7FXYq7FXYq7FXYq7FXYq7 FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYqx3zlob31qt1bryubcGqjcunUj5jqM5n2k7KOo xjJAfvIfaP2dPi7XsvVjHLhl9Mvvee55u9M7FLsVdiraqzMFUFmY0UDcknDGJJoc0E09L8r6L+i9 PpIP9Kno8/t/Kv0Z6n2F2Z+Uw1L+8lvL9A+H63ku0NV409vpHJOM3TguxV2KuxV2KuxV2KuxV2Ku xV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxVjOv+TYb12ubEiC5bd4z9hz47fZOct2t7NQ zk5MXon1HQ/qLt9H2ocY4Z7x+1h17ouqWbFbi2dQP2wOSH5MKjOJ1PZeowGpwl7+Y+Y2d7i1WPJ9 MggwCTQbk5gAW3phY+X9XvWAhtnCH/djjgn3n+GbLS9j6nOfTA13nYfb+hxs2txY+cma6B5TtdNI nmInvB0enwp/qg/rzu+yfZ/HpfXL15e/oPd+t5/Wdoyy+kbR+9Ps6F1rsVdirsVf/9k= - - - - - - uuid:05DCA8B2865EDF118B77FD523B43407A - uuid:56750efc-9bfc-a24b-9ea9-5d1017376019 - - - - 1 - False - False - - 128.000000 - 128.000000 - Pixels - - - - Cyan - Magenta - Yellow - - - - - - Default Swatch Group - 0 - - - - - - Document - - - Adobe PDF library 8.00 - - - - - - - - - - - - - - - - - - - - - - - - - endstream endobj 2 0 obj <> endobj 13 0 obj <> endobj 30 0 obj <> endobj 47 0 obj <> endobj 64 0 obj <> endobj 65 0 obj [/View/Design] endobj 66 0 obj <>>> endobj 48 0 obj [/View/Design] endobj 49 0 obj <>>> endobj 31 0 obj [/View/Design] endobj 32 0 obj <>>> endobj 14 0 obj [/View/Design] endobj 15 0 obj <>>> endobj 63 0 obj [64 0 R] endobj 5 0 obj <>/ArtBox[0.0224609 0.0644531 128.023 128.064]/MediaBox[0.0 0.0 128.0 128.0]/Thumb 72 0 R/TrimBox[0.0 0.0 128.0 128.0]/Resources<>/ExtGState<>>>/Type/Page/LastModified(D:20100511124557+01'00')>> endobj 68 0 obj <>stream -H‰\UËŠ%7 Ý×Wx°ÚzX¶·é„¬†0d‘¸ä“ Lòÿ#U¹ª M_ß#[ï#Ý·ŸßËÛ§÷V¾ÿá½ߎVXfþ×øøç·ã×ò7¤&ãcyiåËñöÓ/­üñïñ­@ˆ?.ƒI[ƒ&7’Ååõ5”Ê×Ch…fé4ŒâvZ™4d˜"åuLò©pHªŽ;ï#ÀÄq!×ücr…$]$V¤Sç ^‡,âî«PWšÔ†í2.ÚR¼6¦ÁA”̸¢…ah mN©UÓT†íA£!p·ò×!°‘Àé4/l$zún½#ùýíuTÃK¹u Í3êÅž™i¸&C†x/(Rçx°àªÂx¡Bc¤›žMhñ¼+ÍCÈp2£þÕ ÷[R#ÕiyŠénÉŶ°£ü_¯ã÷ïŽÏG£,ÔTÔ¤âCAƒ³ŽZJ5[(X'±M0ÐÁ9”Ï<…ýdZé½DßááBàíTaÇ, -Æc7DÕ[¶ç€ –ýÃÙ‹ßÍ“m‚³C9YV¼ƒžƒÜÈqÍne uט† Þ€ã9Žº¨*ú®ÄRz¿ˆE ì@5•e#ÐÏnœ\tXg‘;ø4И…è8æÆWŒÓŸG—K… -íÃÈ$ð(b‘øþŽ¬<"ÛÙ˜p9µN¢j¹,nˆÑ”ê#0mÜÊnÛ‡ßK3ãùèC)–ÒÄå ÀÒ i,9óþ±6Ê3xv Â=µ*8ʼnv -ãêƧ¹õ¼ ß’Óñ©¾çýµ 9F¬M°¡ãöjCQ­jÕÉı-È8Á Æ‹‚˘SÍ&×é´$ű‘6zÅ0Hë· úÐ1Tua Úʕȹc›­s$Ö•b ƒp‚}CËÞ^»÷ÂÐÁꜶ>>stream -8;VFa0bV8E#lFYQ2u!SZd`EdKb^QGjm9Q&6-qP]#[Jn=m:H& endstream endobj 67 0 obj <> endobj 70 0 obj [/Indexed/DeviceRGB 255 71 0 R] endobj 71 0 obj <>stream -8;X]O>EqN@%''O_@%e@?J;%+8(9e>X=MR6S?i^YgA3=].HDXF.R$lIL@"pJ+EP(%0 -b]6ajmNZn*!='OQZeQ^Y*,=]?C.B+\Ulg9dhD*"iC[;*=3`oP1[!S^)?1)IZ4dup` -E1r!/,*0[*9.aFIR2&b-C#soRZ7Dl%MLY\.?d>Mn -6%Q2oYfNRF$$+ON<+]RUJmC0InDZ4OTs0S!saG>GGKUlQ*Q?45:CI&4J'_2j$XKrcYp0n+Xl_nU*O( -l[$6Nn+Z_Nq0]s7hs]`XX1nZ8&94a\~> endstream endobj 57 0 obj <> endobj 58 0 obj <> endobj 59 0 obj <>stream -%!PS-Adobe-3.0 %%Creator: Adobe Illustrator(R) 13.0 %%AI8_CreatorVersion: 13.0.0 %%For: (Aleks Kissinger) () %%Title: (ubuntu.ai) %%CreationDate: 5/11/10 12:45 PM %%BoundingBox: -36 -36 165 165 %%HiResBoundingBox: -35.9775 -35.9355 164.0234 164.064 %%DocumentProcessColors: Cyan Magenta Yellow %AI5_FileFormat 9.0 %AI12_BuildNumber: 406 %AI3_ColorUsage: Color %AI7_ImageSettings: 0 %%CMYKProcessColor: 1 1 1 1 ([Registration]) %AI3_Cropmarks: 0.022461 0.064453 128.0234 128.064 %AI3_TemplateBox: 64.5 63.5 64.5 63.5 %AI3_TileBox: -242 -332 370 460 %AI3_DocumentPreview: None %AI5_ArtSize: 128 128 %AI5_RulerUnits: 6 %AI9_ColorModel: 2 %AI5_ArtFlags: 0 0 0 1 0 0 1 0 0 %AI5_TargetResolution: 800 %AI5_NumLayers: 1 %AI9_OpenToView: -99 182 3 979 715 18 0 0 73 75 0 0 1 1 1 0 1 %AI5_OpenViewLayers: 7 %%PageOrigin:0 0 %AI7_GridSettings: 72 8 72 8 1 0 0.8 0.8 0.8 0.9 0.9 0.9 %AI9_Flatten: 1 %AI12_CMSettings: 00.MS %%EndComments endstream endobj 60 0 obj <>stream -%%BoundingBox: 5 4 119 120 %%HiResBoundingBox: 5.33301 4.12793 118.0449 120 %AI7_Thumbnail: 128 128 8 %%BeginData: 14866 Hex Bytes %0000330000660000990000CC0033000033330033660033990033CC0033FF %0066000066330066660066990066CC0066FF009900009933009966009999 %0099CC0099FF00CC0000CC3300CC6600CC9900CCCC00CCFF00FF3300FF66 %00FF9900FFCC3300003300333300663300993300CC3300FF333300333333 %3333663333993333CC3333FF3366003366333366663366993366CC3366FF %3399003399333399663399993399CC3399FF33CC0033CC3333CC6633CC99 %33CCCC33CCFF33FF0033FF3333FF6633FF9933FFCC33FFFF660000660033 %6600666600996600CC6600FF6633006633336633666633996633CC6633FF %6666006666336666666666996666CC6666FF669900669933669966669999 %6699CC6699FF66CC0066CC3366CC6666CC9966CCCC66CCFF66FF0066FF33 %66FF6666FF9966FFCC66FFFF9900009900339900669900999900CC9900FF %9933009933339933669933999933CC9933FF996600996633996666996699 %9966CC9966FF9999009999339999669999999999CC9999FF99CC0099CC33 %99CC6699CC9999CCCC99CCFF99FF0099FF3399FF6699FF9999FFCC99FFFF %CC0000CC0033CC0066CC0099CC00CCCC00FFCC3300CC3333CC3366CC3399 %CC33CCCC33FFCC6600CC6633CC6666CC6699CC66CCCC66FFCC9900CC9933 %CC9966CC9999CC99CCCC99FFCCCC00CCCC33CCCC66CCCC99CCCCCCCCCCFF %CCFF00CCFF33CCFF66CCFF99CCFFCCCCFFFFFF0033FF0066FF0099FF00CC %FF3300FF3333FF3366FF3399FF33CCFF33FFFF6600FF6633FF6666FF6699 %FF66CCFF66FFFF9900FF9933FF9966FF9999FF99CCFF99FFFFCC00FFCC33 %FFCC66FFCC99FFCCCCFFCCFFFFFF33FFFF66FFFF99FFFFCC110000001100 %000011111111220000002200000022222222440000004400000044444444 %550000005500000055555555770000007700000077777777880000008800 %000088888888AA000000AA000000AAAAAAAABB000000BB000000BBBBBBBB %DD000000DD000000DDDDDDDDEE000000EE000000EEEEEEEE0000000000FF %00FF0000FFFFFF0000FF00FFFFFF00FFFFFF %524C45FD61FFCAC3BBB5FCB0FCB5B5C3CAFD73FFCABBB0FCFCFCB0FD06FC %B5CAFD70FFC9FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCC2FD6EFFBC8CFCFCFC %8CB0FCFC8CB0FCFC8CB0FCFC8CB5CAFD6BFFC2FCB0FCB0FCB0FCB0FCB0FC %B0FCB0FCB0FCB0FCB5FD6AFFC3FCFCFCB0FCFCFCB0FCFCFCB0FCFCFCB0FC %FCFCB0FCBCFD68FFCFFCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FC %B0FCC9FD67FFBBFC8CB0FCFC8CB0FCFC8CB0FCFC8CB0FCFC8CB0FCFC8CFC %FCFD66FFCAB5FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0 %C3FD65FFC3FCFCFCB0FCFCFCB0FCFCFCB0FCFCFCB0FCFCFCB0FCFCFCB0FC %BCFD51FFCACAC9C9C3C9C9CAC9CFCFFD09FFBBB0FCB0FCB0FCB0FCB0FCB0 %FCB0FCB0FCB0FCB0FCB0FCB0FCB0B0FD4AFFCAC9C2C2BBBBFD06B4FCFD04 %B4BBB4BBBBC9FD05FFB58CB0FCFC8CB0FCFC8CB0FCFC8CB0FCFC8CB0FCFC %8CB0FCFC8CB0C9FD46FFC9C2BBBBB4B4FCFD04B4BBB4B5B4BBB4B4B4BBB4 %B4B4B5BBFD05FFB0B0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FC %B0FCB0FCCAFD43FFC3C2B4B4FCFD15B4FCBCFD04FFCAB0FCB0FCFCFCB0FC %FCFCB0FCFCFCB0FCFCFCB0FCFCFCB0FD04FCC3FD40FFC9C2FD05B4BBB4B4 %B4BBB4B4B4BBB4B4B4BBB4B4B4BBB4B4B4BBB4B4BBFD05FFB0B0FCB0FCB0 %FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCCAFD3DFFCAC9BBB4FC %FD1CB4BBCAFD04FFB5FCFC8CB0FCFC8CB0FCFC8CB0FCFC8CB0FCFC8CB0FC %FC8CB0FCB0C9FD3DFFCAFCB4B4BBB4BBB4BBB4BBB4BBB4BBB4BBB4BBB4BB %B4BBB4BBB4BBB4BBB4BBB4B4B4FD05FFBCB0FCB0FCB0FCB0FCB0FCB0FCB0 %FCB0FCB0FCB0FCB0FCB0FCB0B5FD3FFFC2FCFD1FB4C9FD04FFC9FCFCFCB0 %FCFCFCB0FCFCFCB0FCFCFCB0FCFCFCB0FCFCFCB0FCBCFD3FFFCABBB4BBB4 %B4B4BBB4B4B4BBB4B4B4BBB4B4B4BBB4B4B4BBB4B4B4BBB4B4B4BBB4C3FD %04FFCFB5FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0C9FD %40FFC2FD1FB4BBFD05FFBCFCFCFC8CB0FCFC8CB0FCFC8CB0FCFC8CB0FCFC %8CB0FCFC93FD38FFC9FD09FFBBB4B4BBB4BBB4BBB4BBB4BBB4BBB4BBB4BB %B4BBB4BBB4BBB4BBB4BBB4BBB4B4C9FD05FFB5B0FCB0FCB0FCB0FCB0FCB0 %FCB0FCB0FCB0FCB0FCB0FCCAFD36FFCFC0C0C9FD08FFC9FCFD1DB4FCBBFD %05FFCAFCFCFCB0FCFCFCB0FCFCFCB0FCFCFCB0FCFCFCB0FCC2FD36FFCEC0 %C6C0C7FD09FFC2FCBBB4B4B4BBB4B4B4BBB4B4B4BBB4B4B4BBB4B4B4BBB4 %B4B4BBB4B4B4B5B4CAFD05FFC9FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FC %B0FCC2FD36FFC89EC6C0C09EC9FD08FFC9FD1FB4BBFD06FFC9FCFC8CB0FC %FC8CB0FCFC8CB0FCFC8CFCFCC2FD36FFC8C0C7C0C7C0C7C0CFFD08FFC2B4 %B4BBB4BBB4BBB4BBB4BBB4BBB4BBB4BBB4BBB4BBB4BBB4BBB4BBB4BBB4B4 %C2FD06FFCFB5B0FCB0FCB0FCB0FCB0FCB0FCB0B0C9FD35FFCFC8C0C6C0C6 %C0C6C0C6C1FD09FFFD20B4C2FD07FFC3BBFD09FCB5C2FD37FFC8C0C7C0C6 %C0C7C0C6C0C6C9FD08FFC9FCBBB4B4B4BBB4B4B4BBB4B4B4BBB4B4B4BBB4 %B4B4BBB4B4B4BBB4B4B4BBB4B4C2FD08FFCFC3C2BBBCBBBCC2CAFD38FFC8 %C0C09EC6C0C09EC6C0C09EC6CAFD08FFBBFCFD1FB4C2FD47FFC8C0C7C0C7 %C0C7C0C7C0C7C0C7C0C8FD08FFC9B4B4BBB4BBB4BBB4BBB4BBB4BBB4BBB4 %BBB4BBB4BBB4BBB4BBB4BBB4BBB4BBB4B4BCFD15FFC3FD2FFFC9C0C6C0C6 %C0C6C0C6C0C6C0C6C0C6C0C9FD08FFBBFD22B4C3CFFD10FFCABBFCBCFD2D %FFCFC0C6C0C7C0C6C0C7C0C6C0C7C0C6C0C6C0FD09FFFD05B4BBB4B4B4B5 %FD0BB4BBB4B4B4BBB4B4B4BBFD05B4BBC2FD0DFFC3BBFD04B4C3FD2BFFCF %9EC6C0C09EC6C0C09EC6C0C09EC6C0C09EC0C8FD08FFC2FCFD05B4FCB4FC %B4B4FD05BBB4BBB4B4FCFD10B4BBC2C9C9CFCACAC9C9C2C2B4B4FCFD05B4 %C9FD2AFFC1C6C0C7C0C7C0C7C0C7C0C7C0C7C0C7C0C7C0C6CAFD08FFBBB4 %B4FCB4BAC2C2CACAFD07FFCFCFC9C9BBBBB4B4B4B5B4BBB4BBB4BBB4BBB4 %BBB4B4B4BBB4BBB4BBB4B4B4B5B4BBB4BBB4BBB4BBFD29FFC8C0C0C6C0C6 %C0C6C0C6C0C6C0C6C0C6C0C6C0C6C0C7FD08FFC3B4B4C2C3FD11FFCAC9BB %BBFCFD1DB4FCC2FD27FFC9C6C0C6C0C7C0C6C0C7C0C6C0C7C0C6C0C7C0C6 %C0C7C0C9FD08FFC3FD17FFCAC9BBB4B4BBB4B4B4BBB4B4B4BBB4B4B4BBB4 %B4B4BBB4B4B4BBB4B4B4BBB4B4FCCAFD26FFC79EC6C0C09EC6C0C09EC6C0 %C09EC6C0C09EC6C0C09EC6C0CFFD22FFC3BBFCFD1CB4FD25FFC9C0C7C0C7 %C0C7C0C7C0C7C0C7C0C7C0C7C0C7C0C7C0C7C0C6C8FD24FFC9B4B4B4BBB4 %BBB4BBB4BBB4BBB4BBB4BBB4BBB4BBB4BBB4BBB4BBB4B4C2FD23FFCFC0C0 %C0C6C0C6C0C6C0C6C0C6C0C6C0C6C0C6C0C6C0C6C0C6C0C0C9FD24FFCABB %FD1BB4CAFD22FFC8C6C0C6C0C7C0C6C0C7C0C6C0C7C0C6C0C7C0C6C0C7C0 %C6C0C7C0C9FD26FFC2B4B4BBB4B4B4BBB4B4B4BBB4B4B4BBB4B4B4BBB4B4 %B4BBB4B4FCC2FD21FFCAC09EC6C0C09EC6C0C09EC6C0C09EC6C0C09EC6C0 %C09EC6C0C09EC9FD28FFC2B4FCFD17B4FCCAFD20FFC9C0C7C0C7C0C7C0C7 %C0C7C0C7C0C7C0C7C0C7C0C7C0C7C0C6C0CFFD2AFFC3B4B4BBB4BBB4BBB4 %BBB4BBB4BBB4BBB4BBB4BBB4BBB4BBB4B4C2FD1FFFCFC0C0C0C6C0C6C0C6 %C0C6C0C6C0C6C0C6C0C6C0C6C0C6C0C6C0C9FD2CFFC3FD19B4CAFD1EFFC8 %C6C0C6C0C7C0C6C0C7C0C6C0C7C0C6C0C7C0C6C0C7C0C6C0CEFD2EFFC2FD %04B4BBB4B4B4BBB4B4B4BBB4B4B4BBB4B4B4BBB4B4FCC2FD1DFFCFC79EC6 %C0C09EC6C0C09EC6C0C09EC6C0C09EC6C0C09EC6C0C8FD30FFBCFD18B4FD %1DFFCFC0C7C0C7C0C7C0C7C0C7C0C7C0C7C0C7C0C7C0C7C0C7C0C8FD32FF %BBB4B4BBB4BBB4BBB4BBB4BBB4BBB4BBB4BBB4BBB4BBB4B4C9FD1CFFC8C0 %C0C6C0C6C0C6C0C6C0C6C0C6C0C6C0C6C0C6C0C6C0C6CAFD32FFCFFD16B4 %FCC2FD1BFFCFC7C0C6C0C7C0C6C0C7C0C6C0C7C0C6C0C7C0C6C0C7C0C6C9 %FD34FFC9B4B4B4BBB4B4B4BBB4B4B4BBB4B4B4BBB4B4B4BBB4B4B4CFFD1A %FFC99EC6C0C09EC6C0C09EC6C0C09EC6C0C09EC6C0C09EC6C1FD36FFBBFC %FD15B4C2FD1BFFCEC0C6C0C7C0C7C0C7C0C7C0C7C0C7C0C7C0C7C0C7C0CF %FD36FFC9B4B4BBB4BBB4BBB4BBB4BBB4BBB4BBB4BBB4BBB4BBB4C2FD1CFF %CFC0C0C0C6C0C6C0C6C0C6C0C6C0C6C0C6C0C6C0C8FD38FFBBFD16B4FD0C %FFC9C9C2C2BBC2C2C9C9FD08FFCFC0C6C0C7C0C6C0C7C0C6C0C7C0C6C0C7 %C0C6C9FD38FFC9B4B4B4BBB4B4B4BBB4B4B4BBB4B4B4BBB4B4B4BBB4B4C9 %FD09FFC9BBB4FCB4FCB4FCB4FCB4B4C3CFFD06FFCFC0C09EC6C0C09EC6C0 %C09EC6C0C09EC6C0FD39FFCABBFD14B4FCC3FD07FFCAC2B4B4B4BBB4BBB4 %BBB4BBB4B4B4BBC9FD06FFCEC0C7C0C7C0C7C0C7C0C7C0C7C0C7C0C9FD3A %FFC2B4B4BBB4BBB4BBB4BBB4BBB4BBB4BBB4BBB4BBB4B4C2FD06FFC3B4FC %FD0DB4FCB4C2FD06FFC8C0C6C0C6C0C6C0C6C0C6C0C6C0C6CAFD3AFFCAFD %15B4BBFD05FFC2FD04B4BBB4B4B4BBB4B4B4BBB4B4B4BBB4B4C2FD05FFCF %C7C0C7C0C6C0C7C0C6C0C7C0C6C1FD3CFFBBB4B4B4BBB4B4B4BBB4B4B4BB %B4B4B4BBFD05B4FD04FFC9B4FCFD13B4C2FD05FFC8C09EC6C0C09EC6C0C0 %9EC6C0C8FD3CFFBBFD15B4C9FFFFFFBBB4BBB4BBB4BBB4BBB4BBB4BBB4BB %B4BBB4BBB4BBB4BBCAFD05FFC0C7C0C7C0C7C0C7C0C7C0C6C9FD3CFFC9B4 %BBB4BBB4BBB4BBB4BBB4BBB4BBB4BBB4BBB4BBB4C9FFFFC2FCFD15B4FCC2 %FD05FFC8C0C6C0C6C0C6C0C6C0C6C0CFFD3CFFC9FD07B4FCB4FCB4FCB4FC %B4FCB4FCB4FCB4C2FFFFFD05B4BBB4B4B4BBB4B4B4BBB4B4B4BBB4B4B4BB %B4B4B4CFFD04FFC9C6C0C7C0C6C0C7C0C6C0C7CFFD3CFFCFB4FD06BBC2BB %C2BBFD04C2C3C2C9C2C9C3CFFFC2FD19B4C2FD05FFC0C09EC6C0C09EC6C0 %C09EFD3FFFCAFFFFFFCAFD11FFC2B4BBB4BBB4BBB4BBB4BBB4BBB4BBB4BB %B4BBB4BBB4BBB4BBB4C2FD05FFC8C0C7C0C7C0C7C0C7C0C8FD55FFFD1BB4 %FD05FFC8C0C0C6C0C6C0C6C0C0C1FD55FFB5B4B4B4BBB4B4B4BBB4B4B4BB %B4B4B4BBB4B4B4BBB4B4B4BBB4B4CAFD04FFC9C0C6C0C7C0C6C0C7C0C7FD %55FFFD1BB4CAFD04FFC8C0C0C09EC6C0C09EC6C1FD55FFBBB4BBB4BBB4BB %B4BBB4BBB4BBB4BBB4BBB4BBB4BBB4BBB4BBB4BBCAFD04FFCEC0C7C0C7C0 %C7C0C7C0C7FD55FFFD1BB4CFFD04FFC8C6C0C6C0C6C0C6C0C6C0FD3DFFCA %CAC3C9C3FD07CAC9FFCFFFCAFFCAFFCAFFFFFFC2B4BBB4B4B4BBB4B4B4BB %B4B4B4BBB4B4B4BBB4B4B4BBB4B4B4BBFD05FFC8C0C7C0C6C0C7C0C6C0C7 %CFFD3CFFCAFCB0FCB0FCB0FCB0FCB0FCB0FCB5B0B5FCB5FCB5FCC9FFC2FD %19B4BBFD05FFC0C09EC6C0C09EC6C0C09ECFFD3CFFC3FC8CFCFCFC8CFCFC %FC8CFCFCFC8CFCFCFC8CFCFCFCC2FFCFB4BBB4BBB4BBB4BBB4BBB4BBB4BB %B4BBB4BBB4BBB4BBB4B5B4CAFD04FFCAC6C0C7C0C7C0C7C0C7C0C6C9FD3C %FFC3FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCC9FFFFBCFCFD15 %B4FCBBFD05FFC9C0C6C0C6C0C6C0C6C0C6C0C8FD3CFFBBFCFCB0FCFCFCB0 %FCFCFCB0FCFCFCB0FCFCFCB0FCFCC3FFFFCAB4B4BBB4B4B4BBB4B4B4BBB4 %B4B4BBB4B4B4BBFD04B4C9FD05FFC0C6C0C6C0C7C0C6C0C7C0C6C1FD3CFF %B5FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0B0FD04FFC2FD15B4BB %FD05FFC9C09EC6C0C09EC6C0C09EC6C0C0C9FD3AFFC98CFCFCFC8CB0FCFC %8CB0FCFC8CB0FCFC8CB0FCFC8CB5FD05FFBBB5B4BBB4BBB4BBB4BBB4BBB4 %BBB4BBB4BBB4B4BBFD06FFC7C0C7C0C7C0C7C0C7C0C7C0C7C0CEFD3AFFBC %B0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0BCFD06FFBBFD11B4BB %FD06FFC9C0C6C0C6C0C6C0C6C0C6C0C6C0C0C0FD3AFFB5FCB0FCFCFCB0FC %FCFCB0FCFCFCB0FCFCFCB0FCFCFCC3FD07FFC2B5B4B4B4BBB4B4B4BBB4B4 %B4B5B4B4C2FD06FFCFC0C7C0C6C0C7C0C6C0C7C0C6C0C7C0C6C9FD38FFC9 %FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0C3FD08FFC9C2B4B4 %FCFD05B4FCB4B4C2C9FD07FFC0C09EC6C0C09EC6C0C09EC6C0C09EC6C0C7 %FD38FF93FCFCFC8CB0FCFC8CB0FCFC8CB0FCFC8CB0FCFC8CFCFCFD0BFFCF %C2C2BBBBB4BBBBC2C2CFFD08FFC7C6C0C7C0C7C0C7C0C7C0C7C0C7C0C7C0 %C7C0CFFD36FFC3B0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCBC %FD0FFFCFFFCAFD0AFFCFC1C6C0C6C0C6C0C6C0C6C0C6C0C6C0C6C0C6C0C0 %C1FD36FFB5FCB0FCFCFCB0FCFCFCB0FCFCFCB0FCFCFCB0FD04FCC2FD1BFF %CFC0C6C0C7C0C6C0C7C0C6C0C7C0C6C0C7C0C6C0C7C0C6C9FD34FFC3FCB0 %FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCCFFD1BFFC1C0C0C09E %C6C0C09EC6C0C09EC6C0C09EC6C0C09EC6C0C0CAFD32FFCA8CFCFCFC8CB0 %FCFC8CB0FCFC8CB0FCFC8CB0FCFC8CB0FCBBFD1CFFCFC0C7C0C7C0C7C0C7 %C0C7C0C7C0C7C0C7C0C7C0C7C0C7C0C8FD32FFB5B0FCB0FCB0FCB0FCB0FC %B0FCB0FCB0FCB0FCB0FCB0FCB0C3FD1CFFCFC7C0C6C0C6C0C6C0C6C0C6C0 %C6C0C6C0C6C0C6C0C6C0C6C0C9FD30FFBCFCFCB0FCFCFCB0FCFCFCB0FCFC %FCB0FCFCFCB0FD05FCFD1EFFC8C6C0C6C0C7C0C6C0C7C0C6C0C7C0C6C0C7 %C0C6C0C7C0C6C0CEFD2EFFC2B0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FC %B0FCB0FCB0FCC2FD1EFFCF9EC6C0C09EC6C0C09EC6C0C09EC6C0C09EC6C0 %C09EC6C0C09ECEFD2CFFC3FC8CB0FCFC8CB0FCFC8CB0FCFC8CB0FCFC8CB0 %FCFC8CB0FCFCC9FD1FFFC9C0C7C0C7C0C7C0C7C0C7C0C7C0C7C0C7C0C7C0 %C7C0C7C0C7C0CEFD2AFFC3B0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0 %FCB0FCB0FCB0BBFD20FFCAC6C0C6C0C6C0C6C0C6C0C6C0C6C0C6C0C6C0C6 %C0C6C0C6C0C6C0C9FD28FFBCFD04FCB0FCFCFCB0FCFCFCB0FCFCFCB0FCFC %FCB0FCFCFCB0FCCAFD21FFC8C6C0C6C0C7C0C6C0C7C0C6C0C7C0C6C0C7C0 %C6C0C7C0C6C0C7C0C9FD26FFBCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0 %FCB0FCB0FCB0FCB0FCBCFD22FFCF9EC6C0C09EC6C0C09EC6C0C09EC6C0C0 %9EC6C0C09EC6C0C09EC6C9FD24FFCA8CFCFCFC8CB0FCFC8CB0FCFC8CB0FC %FC8CB0FCFC8CB0FCFC8CB0FCFCC9FD23FFCEC0C7C0C7C0C7C0C7C0C7C0C7 %C0C7C0C7C0C7C0C7C0C7C0C6C8FD24FFC3FCB0FCB0FCB0FCB0FCB0FCB0FC %B0FCB0FCB0FCB0FCB0FCB0FCB0FCB0BCFD25FFC7C0C6C0C6C0C6C0C6C0C6 %C0C6C0C6C0C6C0C6C0C6C0C0C0FD23FFC2B5FCFCFCB0FCFCFCB0FCFCFCB0 %FCFCFCB0FCFCFCB0FCFCFCB0FD05FCFD26FFC9C6C0C6C0C7C0C6C0C7C0C6 %C0C7C0C6C0C7C0C6C0C7C0CEFD08FFCACFFD16FFCAC3B5B0FCB0FCB0FCB0 %FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCC9FD27FFC8C0C0 %C09EC6C0C09EC6C0C09EC6C0C09EC6C0C09EC8FD09FFB58CBCC3FD11FFCA %C9BBB08CFCFCFC8CB0FCFC8CB0FCFC8CB0FCFC8CB0FCFC8CB0FCFC8CB0FC %FC8CB0FCBCFD29FFC7C6C0C7C0C7C0C7C0C7C0C7C0C7C0C7C0C7C0C7CFFD %08FFC3FCB0FCB0FCBCC2C9CAFD07FFCACFC3C3BBB5FCB0FCB0FCB0FCB0FC %B0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB5FD2AFFCFC0 %C0C0C6C0C6C0C6C0C6C0C6C0C6C0C6C0C0C2FD09FFFCFCFCB0FD07FCFD05 %B5FCB0FD05FCB0FCFCFCB0FCFCFCB0FCFCFCB0FCFCFCB0FCFCFCB0FCFCFC %B0FCFCFCB0FCFCFCB0C9FD2BFFCFC0C6C0C7C0C6C0C7C0C6C0C7C0C6C0C7 %C0CFFD08FFBCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FC %B0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FC %B0C2FD2DFFC9C0C09EC6C0C09EC6C0C09EC6C0C09EC9FD08FFC9FC8CB0FC %FC8CB0FCFC8CB0FCFC8CB0FCFC8CB0FCFC8CB0FCFC8CB0FCFC8CB0FCFC8C %B0FCFC8CFCFCFC8CB0FCFC8CFCFCFC8CFCFCFC8CFCBCFD2FFFC8C0C7C0C7 %C0C7C0C7C0C7C0C7C0C7FD09FFBCFCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0 %FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0B0BCC2CACACFCACF %C9C9BCBCFCB0FCB0BBFD31FFC8C0C6C0C6C0C6C0C6C0C6C0C0C9FD08FFC9 %FCFCFCB0FCFCFCB0FCFCFCB0FCFCFCB0FCFCFCB0FCFCFCB0FCFCFCB0FCFC %FCB0FD05FCB5C2FD0CFFCFC2B0B5FD33FFC8C0C7C0C6C0C7C0C6C0C6C7FD %09FFB0B0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0 %FCB0FCB0FCB0FCB0B5CAFD10FFCFFD34FFCFC79EC6C0C09EC6C0C09ECFFD %08FFBCFC8CB0FCFC8CB0FCFC8CB0FCFC8CB0FCFC8CB0FCFC8CB0FCFC8CB0 %FCFC8CB0FCFC8CFCBCFD49FFC8C0C6C0C7C0C7C0C9FD08FFCAB0FCB0FCB0 %FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0 %C9FD4BFFC9C0C0C0C6C0C6CAFD08FFBCFCFCFCB0FCFCFCB0FCFCFCB0FCFC %FCB0FCFCFCB0FCFCFCB0FCFCFCB0FCFCFCB0FCB0C9FD08FFCFC9C8C1C8C8 %C8C9CFFD3CFFCEC0C6C0C6C9FD08FFCAFCB0FCB0FCB0FCB0FCB0FCB0FCB0 %FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0CAFD07FFC9C7C0C6C0C6 %C0C6C0C6C0C8C9FD3BFFCFC0C09EFD09FFB5FC8CB0FCFC8CB0FCFC8CB0FC %FC8CB0FCFC8CB0FCFC8CB0FCFC8CB0FCFC8CB0FCFCC2FD06FFC99EC0C0C0 %9EC6C0C09EC6C0C09EC0C1CFFD3BFFC7CFFD08FFC3B0FCB0FCB0FCB0FCB0 %FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0BCFD06FFC9C0 %C7C0C7C0C7C0C7C0C7C0C7C0C7C0C6C0CFFD43FFCAB5FCFCFCB0FCFCFCB0 %FCFCFCB0FCFCFCB0FCFCFCB0FCFCFCB0FCFCFCB0FD05FCFD06FFC9C0C0C0 %C6C0C6C0C6C0C6C0C6C0C6C0C6C0C0C0CFFD42FFC2FCB0FCB0FCB0FCB0FC %B0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCC3FD05FFCEC0 %C7C0C6C0C7C0C6C0C7C0C6C0C7C0C6C0C7C0C6C0CFFD40FFCAFCFC8CB0FC %FC8CB0FCFC8CB0FCFC8CB0FCFC8CB0FCFC8CB0FCFC8CB0FCFC8CB0FCB0CA %FD04FFCFC0C09EC6C0C09EC6C0C09EC6C0C09EC6C0C09EC6C0C09EFD40FF %B5B0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0 %FCB0FCB0BCFD05FFC8C6C0C7C0C7C0C7C0C7C0C7C0C7C0C7C0C7C0C7C0C7 %C0C6C9FD3FFFC9B5FCFCB0FCFCFCB0FCFCFCB0FCFCFCB0FCFCFCB0FCFCFC %B0FCFCFCB0FCFCFCB0FCC9FD04FFC9C6C0C6C0C6C0C6C0C6C0C6C0C6C0C6 %C0C6C0C6C0C6C0C6C0C7CFFD40FFC9BCFCB0FCB0FCB0FCB0FCB0FCB0FCB0 %FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB5CFFD04FFC9C0C7C0C6C0C7C0C6C0 %C7C0C6C0C7C0C6C0C7C0C6C0C7C0C6C0CFFD42FFCFC2BCFCFC8CFCFCFC8C %B0FCFC8CB0FCFC8CB0FCFC8CB0FCFC8CB0FCFC93FD05FFC1C09EC6C0C09E %C6C0C09EC6C0C09EC6C0C09EC6C0C09EC6C0C0C2FD46FFC3C2B5B0FCB0FC %B0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCB0FCBCFD04FFCFC7C0C7C0C7C0C7 %C0C7C0C7C0C7C0C7C0C7C0C7C0C7C0C7C0C7C0C8FD49FFCAC9BCBCB5B5FC %B0FD07FCB0FCB0FCBBBBC2C9FD04FFCFC0C0C0C6C0C6C0C6C0C6C0C6C0C6 %C0C6C0C6C0C6C0C6C0C6C0C0C0FD50FFCACAC9C9C3C9C3CAC9CFCAFD09FF %CAC7C0C6C0C7C0C6C0C7C0C6C0C7C0C6C0C7C0C6C0C7C0C6C0C7C0C7FD64 %FFCF9EC6C0C09EC6C0C09EC6C0C09EC6C0C09EC6C0C09EC6C0C09EC6C0FD %64FFCFC7C0C7C0C7C0C7C0C7C0C7C0C7C0C7C0C7C0C7C0C7C0C7C0C7C0C7 %FD65FFC0C6C0C6C0C6C0C6C0C6C0C6C0C6C0C6C0C6C0C6C0C6C0C6C0C6C8 %FD65FFC8C0C7C0C6C0C7C0C6C0C7C0C6C0C7C0C6C0C7C0C6C0C7C0C6C0CE %FD65FFC9C09EC6C0C09EC6C0C09EC6C0C09EC6C0C09EC6C0C09EC6C0C0CA %FD66FFC1C7C0C7C0C7C0C7C0C7C0C7C0C7C0C7C0C7C0C7C0C7C0C6C8FD67 %FFC9C0C6C0C6C0C6C0C6C0C6C0C6C0C6C0C6C0C6C0C6C0C6C0CFFD68FFC8 %C0C7C0C6C0C7C0C6C0C7C0C6C0C7C0C6C0C7C0C6C0CEFD69FFCFC79EC6C0 %C09EC6C0C09EC6C0C09EC6C0C09EC6C0C8FD6CFFC8C0C6C0C7C0C7C0C7C0 %C7C0C7C0C7C0C7C0C9FD6EFFC9C0C0C0C6C0C6C0C6C0C6C0C6C0C0C0CEFD %70FFCFC8C6C0C6C0C6C0C7C0C6C0C7C8FD74FFCAC99FC6C0C09EC7C1C9CA %FD12FFFF %%EndData endstream endobj 61 0 obj <>stream -%AI12_CompressedDataxœÝ}‰zòJ®à¼ï „lv!ì@ B6Âb–°Æ†sú¿óÍ}öQ•wc³ôœ¾Óýü`R•JRI*©Êf©7¼™áªOyƒ>Âl²Ùr4ÕÛ¬è„?5ßÍç[fC£GŽg§™„VÐ(sër _(š™®– ü -¿,¢_;2sjƘ+S†™.Çí4;œð®9ÝÌ)x»ío—›­¯7uò(F¾·wa?IúIÂL¡°¹þ ²«ír`²«%ÌÞ`ÿGFÂè?x]ž>SŒ¢MØFÃì‡`µ ùˆ@0Ä~ˆ„àgùÕ`» –›:½P “[ÍW4“0çþô–æ‡ÞÞôÌj>_ým‚‡»Å霂±-zs 4sGºÙít>|Ü.ú :DDÐã`Ãj1à¡Ïèq´{·€' j³~&D¬ÜC§"íБû¿ãý™O1í6ŸN2½Z/zô ýEHô! -…ƒ@²7Hô ý¤I-Ös -¦ Œ>lŽÑþ× -FÇÒ. -Ý‚s0J˜C‚}/R‹úkJý0?®–K˜ ½iLÿ † -hÑìÓç휢[Ë麊ÉgÉò°Ró„9 ü¶8ïajàÿ“â_¶A³G© Lðj¾Ý`F‹Ü+ {µ÷‡B“F²jkjÙ\½àþyãq3ƒQ˜ãѸ9JÄ0ðhÐ œÁ¢!1*’…‡~~ËÂüÔaÆjôt<]&¸.E»%z:g10ÇØ?¸×¾˜ä¿8ÿÛ=éfC-¹î÷ä$Ü@ø€±°æV Dj±>ðÀd¾³ï„Ïø ü|»f{¿waVêôt‰`šñ›X·>ß«½Ú®ï–£•ÉÁŠv½·™˜³sj9d@:ÙgìW3û xZþE±Ï@V×N]xMº7´æZÿ‡làÇÜñSc;ÝPû5ˆL´9Ko™‰¹¹ZÍ…þÉ_ Ýä㧨ýŽ:þÁ²¶d)½‹‰k Ä2ñ‡Zkc€—ÿÉÐs½ù|:¦{ëÉt †@å½€‰}w2qš¿òÿ`Ë?‹þj>e"7JžÔ{ôf:˜S?̆Z쇖§F°^IȆŸ–QóÕZÒIáIo94·{ôZ4š¦Ñt9 Áò,’qµX£EØܘôÖîîfRÄ-ØxÞ[öh3~.€Dêøô™\%±Ï á.(F©êózõuâÁ?ˆ³oÐJ·ù3§“¿²\ý½Ä_Ì “ãHÝÛÎ7ŸN³ÿ±· Ì“¿1…u—â›暉à¹|z6ñ ^ÅÄ/{„ùõ|¹‡?ðèosÈü`~ÿ$ÌCxúúlB«ÕëÐäg)rm2û-ü‹;#»·wŒõÞV -w¢Þ7i¨KŒiÇ©Lõ¬€„‡u«NJ¶1àÇLI°¯XÁA`þ÷)jçúÊ›<`—öL¶®Ÿÿ³‰¾Mˆ=úûýõ¡ú¦êËk³ã_‹ù^{AÓÓþvCÁ¢ëAM34Ýûâ ð%­°|ijɶ ˜ýw@á-ú³ùƒÔzë¸Z2Ý¿z4s òÑè`&ÈšþÕ›où¶è9£Ñn ²Å6ãzÂȾý¥NŠ]Òq€ˆ`ó=b2짴µçŸãÜ㛯3jhdl|Ë3Mÿ‰£'uGoh^§½þœ2Âø{gò’ 'þ2,ê¨é?ÌÅhxƒ-³Y-þYMöïãÃÓCf Zó@ueÇ»\@_þƒºòÿƒ”2£¿ÿƒWãX ˜ùtð?]‡|d 7ûŸ©Þ\{¤ŒÌíŸZñ†}Á`pßPþeˆMÿé¡dÀ%ɽó÷t¸™×ðŸUØ‹È}£šPÓñĈ*ZþÃã2û³«•Î€ú« XUj´aÃÄF†¶û›ÿ€•«¼ÆjK(¼—ò/ý°@ýÓ]XP›Þ,¡Sû?±—C.ô`„»$eœ¹#Is¦Šþ‹27©mÌ…átÓëOçÓ §á ®£¸­ïÀ» æjo9ÞöÆ”¹¾Z£´=Ú–ÊÐT/’ùµÃ´>¾E˜Iÿ'n_±›UÁ8ÚÏã6°‚1³ýŒà^ˆÃæÆ(àC(8"½?PÃéva÷ŠP4®µœ€B<ÕÔÆmËP4KYâ0+tM0Â+¸uo8hÀxÑcfŠGÌz¥œ†Þ|ÊIu”W=ÃõÔÇ­sÜ“ÁjN š¹3g¶›•ù¹Çl(zú_”Iæ.n^÷ÖÐfºØÎqNÎÿ¨EÞôW=zh ]¸@žo̳%øÖ«íÆ…К#¡¡„uö˜þt³èéhÔ”mC+| ­å´/)äç1ú-Ûµ?ï f:mñj>Eé§{ÐCÃ(ÐÉŠþ/¹÷¨lµ^1S, z8ï­÷Û\;û¯µÔm—“vqÆâ#Φ‘ßÀ”mPR1×_ ¬Êõ¨)4ò -䶠z×× ÓåHgíÁÍhIZÌ>ÃùdýÍèI¼`Å€4íU²Æ‚Š0Ж–™¹ûZKÕDD³9ÎI–÷Ú@cQ±ío+éµÖ -å¦aé­éÑj©'¸Ø¾Úõ’ÕÚö“FØÌR3Ih¥rÁáµ–c#jÙQ¬’ùç:íX·xY#“^USµ~8וÑÑÔØÌ`]øÁâžî®6JñK”ö–á››‘ƒ{tØRÌ*Ô(à„#ÍŠMÁvÊ;×™Fîî.ÎSHU¡—¡ÛÚÕ»;Ù¾±_÷^=÷Á«š7›¦K‹Ib¼´Ü-‡=7íùk¤U.D.éV)õºMT?ìiz;ˆ ‡˜ …. ‚ÉÿäÇš¾þò¹ÒIÏšI3•€ßdK_W-4ßè~“—Ÿªédˆjä¦7©AÞç³wPU‡ÀÍm‰è[i“ÿù̆޼žÌbUe2wÍÄŠ\n‹ùµý™ÛÛ&[~DÜ÷UY£ñQôåéý#ÓÌù^´‘JÛ%>ÓÉYñ3`| wÞcÛ¥áÈdÃÄ*~wkÛüè³ÍÎÓó×Ä(;Ùä&Ñ7RFŽï«ü€¬þ¦“·ö6 ºÌä¾Æ_+øtõ›¿ÞY²ÞØ5Óð^.Ù>¼ö†[“-þãp -ƒð“#7 u¯“[ðÊ}ô|»Ó9{«˜£¶®ÔËýåäz0èÍЧ©»0ªNXÌ$áïEé©õ;1ýºfç¶[»—vl3ÕÆÕ/ê¿3}}? šl‘ë—Ïtf9°/Ü7×þèâãfú™Q0CîH÷,A -ù{æȵSÑv&¦9æ—|¸qx=Tv­/Øtª¶tî.yÙ.xâaæåî=r™ŠæV_îäËð=è_~b°©¥ ”Š¸.Ñ”¼GÚ‘§%¢S*;sF¼k¾ «ùyù÷÷’WE‹ûFX"èņ‚›˜lDÿâ.„?»SÅ$÷)Ù.TØæ9Oá›èî€u_ w*Uðò·ãNû&y=üyüÂ3)tàÕ²a 4ÊÞ ø;@:nžQ#*„Ÿ…-Ù|“:O1·¡È[ägiæÜù‘¿ò[èõìÖl¤ßzŠ×m¯­L-—­çGéoú÷316Ù²¡N³Ëó-2|+tI÷K6ôš©ó?ínnúñ_¶q17r‘@ÀÔw4ú<\‰øbßE%S«º*żsXaiÚå}˜ýÍÚ÷ä¾}éý²JEb½ôuss‘iÞo¶»CSPVB~"^i ª’SËmL¶ÂÛÐ6|'oóDñ#Ä,üNóÀ.;»Š)çJNYéÄòÁrÎí„Ùb*ÁX¤tº¯–2Ý{sLÒ½¾þ.:F_†H6ßNëW’툜‘ísœ*:®ÖÎÜ$ò<+¸«¾¢È© Ò0Âqh„jqC»tæÆ“½´ž3Ñ·@[9õòüEû¢Tðzúqµ)‰Ï¨JÎdË4†nÐ0©x>[íÌÔz‹[JÚ•:ÑM!@J¡‡]ÎÙÔ‹Îúüº˜¿Ü©Ò·×dÇ£ŒŠ…|8šxk/XáøÈò‹#Íû¿×®ìÏf¸ÈΗ/«Lsòj·`]ð¬Å+oô=ó<šØágŸWÙˆ»:aµ¥3?²—#ÐÛÕ„Õ‚…—×2¯ÂAå³,¦Ç7¯HÁçû¡I;Ó² y»«Ìsó}û™{“X£‰ `߯î‰dvæXO‹Ééèö·gWOJXK$Êš$úÛ‚ãæ·-®4Š·ÀÉŽMt Ý£;ïcßîë;f{pÎ’Ûù{¦ñ}ŸãÞÆ3ßéd9çƒ&ß/ ªWYòmÛÍ4¶Íø7=iz¸bgK*ŸþNò¶–[F£•Þ%q¿yOÇ¢†Y¢B3ì§ûÎM>½¦àY/-}FŽ³ø€EÚ²Çý°âçøþÀ'g¼Îþ†û5€…Ã[¡Ýí3|úɳM¸Æk‹Ð=ÔH -cYä• $~q?æ¹Þ°]BÃP  ;L uÊ™m°Ï8`xT úµ’DB—•H«IŽ6åýVòëûM- Z·ðç=#%%FïøJóTL>IHÀÒóÍþÈCùʈ”,ò‰RŸÚC'B1 –€¥Ä :Ê5Oñt’‘ƒm'~eùs¼Û±™<ö‘{+ûŠØÍ‹cè°Å›¥*•È*»ÄÂ/5b±cÅ”àÉ!3j¬JTÌ’1s(¦5ü†Ã'€÷F"¤ìpßS2¤‹ô5…åEœ-ù¬²´CÙæ@ 5Qáý €”I1ªv^ÐûCI½—_0É_Ù¡‰<&L¼øV ǹ£ØO 7\L1,É·3Rã?á¡a°#µÈM?W¦ùRYÓvª –þ( ]0â™%¬•ãjñû¡“(Z\>XŪŸˆñ«½× -–K~–n_¶Æ¹éW7]Ì~¯Ø¥LbN„7umwFjv¸ÛØ_LîÐàŽæÇ^ç-kúÕïœâ'ó¶ˆËô‹ÝÏM¶ÏoùJå7+P¶Kež—ùZºñE÷Á‚§¤‹û‰GbÞMz¿‹+å[ÿ…óœÐ—uaàiú³OÀ+ñÉlœ§\…²h[!Ké~ ÃYa±šÄu“àš"ß6>/®F¬y¶à5?ó®üÏÔ/°”ÀZ¿âœpM¥t¢sbÀ5á¬>C½hh¬Ë,ó}¿f¢‡›ûè27-ÛŒ³^ï³ØŒé$‚úÿ˳ÀŽ4ïO•?ò•lÄœýìSúÝ•}²}n°9LܗȨ -¤¾fûT¤âËßýD{"ÙÀ³@„ãÈŸY–£/ój3SkU€ÝA:Yæ;¢åT°ôLE".AJÙydüŽ­“M´ÿw;JÕò¥™ñzJ¢ Æ>y6¥õE?w_‡å`«NJÒÎj˜R¦1O»á×ã_rð|[ ¤[–8ç©6]kÚãôÞf—¹É‡%îvùÙÿôÁp} ûÙÙƒ‘ú($H9_ÙYàÆ"¾˜H sMÓ½ÌGŽd‹É‡O€-~}º.‹…å¤2`‹/b,gy¬þ÷XtP½Ï>ÕÓõ€³³xä:ºíØ2Oäkó/Ú?AŽÆ«+":ÛöëDuí›—˜E+0sR©À}nÌ&›À’Å4MOZ¡ÄCû#¸&n¯¿‘w—#FñÜvm-gCÛ,AzZŒE6ï_™øuÅ+¼h†~}Ó öÅ -ž4}q_.ºœž¨«6ø7žáV§çb±ë´LÐHƒédÿk™n?¹¯wc -‹_üó¹D;ï0ÊÞü=íúfyl—c,…ÛR_0cÒˆd®ð -ˆâ0ûä7(õ¥WÒ$½à -®F¹)3 ¨‚÷ì‡ÂoNÑ€—/ûd•›—Þ YÊUæ¸I‚ŒYAöú&SéCvo*Ãüp÷ðÌç¸?ý–ÈçÊ—ìbä]YR>6ÀFÏÚ7áõ}Eqt*×ýٹ%6;L6ãc+öYè~ÙÞ¡ócKú7ûåV¬‰Àw u#VP"~‡Öœq¡ï›Êm¬±ß±ïέ×Õ1XJÑöú!_»Ù–Ñd°@¾jý.Ø&×Hጜ…›øÈ„ñ'Pík p胗éämë*·˜¾gÃ/¯¾Ì“«>Î<7ÝE[é3š‘CZjª° Ê?÷^u!cã7íœl¨u>Ö¼²6ŠÝË«N~ôÊÎcVOþÞát`ãF}lIŒm3à‰øÅõÈÚ˜¨ Á"úÌÜ®ÈHº¼¡¹Zw³_éëf#`®Â-‘Mµ_6Üôye¯ìâî½”ä@ë+ŽÐ>üŒF‰©ýéL:O¦˜ï”]jC“µ »M¶ëÏÕû‡^£Wôqp]S4¹¦¾œ3GK<Ž¯§ÏêÍ&3pñ³´Ø¸ì¨Ý¯av¸è’µäaÂ2·‘×Rî1÷r«à n÷‚¶¼ƒÙüû “œþ•X‡(Âäm¯M6¼¢2>ÏJ$rSü-'óójX4‚¹Iüº´äGïUnza c‡j™eên¥ÆCh^ÓÕVƒuüaä'3µD¡’¾Î®¥–7׳¤#M{ã[¤“Ó™èçð1?Šû oÔæJAÏømoºÿÕɬ&5PLÎ,‚¹„¿~ˆ‡NÝÞI¸$u ª1H|–)43Ñø36»ùÑ+2«*¸Þ–/‹¹Ì縘KŸËÖò.÷Ï2êM2®ŸôKó®WLæ7’Þ€&¾¼H'ÚÔ8[Ó]—ÜÅR8]x®€‹ê£#eÍ<9”diþ°p§¢¥2¬/¿o×a¢‚ ( -Ó?wü\¥_FÍ­v*r¿Íûž‡Þtâñg&1ÎáO3rQ\渭A\3*ÌþV?ùísÿ„úúæIM…¤ä(׶ùòÃä=ýb!é´ÚZÀ‹ß좖 -ïòËÓ,_³7d)]“Ðs!˜jM~Ô¤ÁÙ#F ‰Þ1Ÿß%[ÑRIÓ—_›ühEûT6«æ؉öv^‹¹ÑmPÎAÆAbY«h}ý™ðl’/¥l˜ñƒ¼¼1Øë¢ãnØFÎåÒ¯y*ù…\…­[tù]ž Ëጅéë6XE¥ŸLÌÁ;¥“©õ¥Ty3> ý*Œç-’j… -™°·ò„¹‹7Âý*šªkÒE±º, ÂKÀìõ9UˆeÏDE˜ƒN=³ÊŒêX€ò•˜XOÄ8ñàÂJÚ¼²’TÛ³ó¢ÅøBðØ€7—"p[|¦ú& -ƒΧËë_¾±g… ºËH¥NzŽ79ëÂ}sÿv/¡¬:ŸÙy4mÅ®·‘A› Q×é‹ç„w”¤…‘JCe'‘Ï×ß -^ä1ɲÝ/ô‰¤]jÁs#ì‹Ì¼G¡]‰K´YCdžWÕMÞSûò–Òl+ôZº¾`,W…ÁEä< ],ÄžËJcã·ü\ÅŽòõhqunûOD´…T,€ÐØžlÀ¢cS\· îšÝ üòêµK=€V¬€¹èSÃl² ¸Ûéä¼è”ÚàJ` m¹C"ü›{,Ä¿ñ‚âN1oqQ9‚¶DCºq<9;ÈCyôO/IΠå»stddžŽ¾Ž ™X‰Ù ­ooÑqï}É‘­sM%®0æg§sêw­H¤“o”\[n3±þz,Y°Â}{ê•ÁÖ[×£-E+UïÊ•÷K~!l c¦1Ù"¿d¼öv£XLÉÛæp?ÿF°Ó‹é€ü€`Ÿvì‘äC¦áIüŒ]K)Ìœ…Áö¢›‰y}È Œ(Ø –£%• ͆ÃÈKëó%½Í•s“÷áò°.ÒɧàW¾RI^›ÅÊŸ=Vì]Òן-0;£On"àù€–›Áš;Zgžçá¶L ÷^ÓŒóõ"_¹Û_f×òU…Áˆ RŒ•T$õëºÏr½YÞ5õvt– ®M%(©Y2@ý-Úü¾¤‘ÃåJ_ß‘_‚™–Ÿ´/& êWî›LarÞÌ´óãÐç ¦i“–%Ù&5ûgÁ‰NA­¹.د¬ -‰ápÐL<~õ·ÅïÏíå* ïìHg}€‰Õ¹ÌÎòöŸÂÛ ÿ¦qä/{‹™g ÍåPÈÀ"ÍÞ•YºÇ:R| ¶%~ì~-¡]ÿ•zÎþü¤Ê¥fÜ^ÞQÆT~-ô¾×n˜°U"Úúr7ø€&&V›Ìνd³ôk¶‚ûFð x¢®ßb²8`ô)/Là òɱAÌŒ´êC?ÈlË#÷Ýa ð/#ôSùy¯öÛ+ž€Õé¯?=ä?|YEóX –kN¢ooùb,õ¦;R™dŸ2ÖH6Ä,#Ñhs=TZGú̲›-ŽÛJgÿéã²è¨dc™ZÅÕF 5S`ûFO”D˜—Q–¶+k)œ¯J¡˜ï¿´@ôÓוXO„ç5o²ðù*E;ò+‹åR¬vWóã—FíÓ/Ï8ÓÌ3.‰3«Øy¯.9æx1— YO…  ¢g_£`)¦«äP¾l’žm¾_t4-Žh{Úì`a€ÂÛ»W²üb}iûnÉL²c!ƒô6?¾ü°² Êùî=è±AxÊFÒŸt¬Q*]|Yì‚Riç² ‰lt¬öfq£®÷ÁÿðñFJø>Ä„V`L~º<Л'/ ü{ Ì>vÛÈpðþÄa^Ü…w,ïìHåz óå¿SBÆ]À|¿ê›kk”~Șó¸Ú@e™Z J¢«ç‹]¾üXr¬0ªAž.ǹޚ­DžR:™„<œ‡Õr5˜Ð«•_ý½d¬©L—\¶b  – Íÿ¶D÷þˆ¿Âgòfú+¾ÊF5·”ÿi '¹o†Þü½¢gÏbRªFwU^›Âw‰+^†÷lñ²Xl¡Qæc¸¼6dˆþ’"Rq$õ¿JÔj0Pf@¯ú½ {Tï13—•$«–0/ÌÔë/b6 ‰ž¶½ÝÂXÅïèwø¨äN×E¿«¯æS¾Öî°q6õêÝø_qØï&W{·€<ïöÓ0B‘uÔ³¦õä~‡}T³©Õ¥ß ëí­-éâD½ÖÖ8{ªxR³2 ,1ĵwCj¹™Ž¦|’´þ¨1½¶/¼fJGÓtŒt¦Á$#:[ÑÿÓ”vU(Qp¼K"óñumz¤¯³Ej=EáÈ­:þGMzº@¿hï)IæIÛb(Œ§)©¥Õx!—ýÜ?ö"(Í6ÕG‡ªïC“î­×|ÁA ¬§>£ëÂûZ«êƒÃæ¿ýcl¾1«f…Bµú`±éîa ºêOô6;'í,ƒÂƒ‰ëð -jÆ̦ë>È¡NMjFSÈ PïTkê€TH»J*êHé\ ñkŸ¼7/Wâɪ•(6Ûy ¤‘K[½‘Éh!ý&J—o-).~Ж¼iû]ß÷ªJàŸ^„CZ·Ûä ^oæCŒx±_Ïi8ù3pÿˆÐ:wgÕ÷ºyȹihµÃJ_É¢&Òð¼v±‘ŠœÌ¢íÑ_W¶ ¤ÅAdiU‘2™Ï Ò2PlõÞY©5yá`ìÑ+Z )½ý&mNÇíû§R¢/¤D¤€E>«ÖÆ }­Ž4Ôù$ŠŸågÕ‘^™kÛÌÿÒPCj²%ÏöQc¬‘K;5N×4FjñÓ̺nEH];ä}*ºn£iË ®M6åX«Ñl‡CÚñ:H#êì…EZø˜e#}KÕ÷BX ©ÉÆ\”™èìò)‚Ñ*‘>¸è©&Òô¬›Ëh }wÅ`¤ˆÇ®x?*CʳQEÚèÞ^k"}ü(ßgÕ"ÍzÏ/öט*/ª—ÛƸ?Œ©"}©’+M¤­’¿4ÇHM6•±Vˆ—u0­ôÖùòÕþΨ"mßö]jHA'#´ÝnfÓÖ ðGˆø¬5êHkãŸ×|Ò¥Šôsã{ÂHÑú²;ÖEÝ}õª…´HtŸ~“êHki'ýžar -¤(Å¡-üx#Ž•-íG¢Ê"í]lJr¡¹¥·í÷BêÞšÚåµók»è‚T¯nhåX¿]ÏVé,îR¬4WÄÃc# ØSŽ²©fÆ÷—©WD -X8QõY>.#E@šfvTáÇ*Î"½u< -òZ2ÅšEú¹IÜËÈël¹¯Ë7÷€ÐúwUa‹ôF«W?€´¸U"¥§·NiâÉ'i¹•µ]%1Òàm«ZÅHv¬—ïL¸ÿ^GH‰?Ư.^7Ow€4°£éLÙrÛ‚Iõ·ÙèäN«úq¯ú~Û³$‰»÷Fã­=Eö˜ú¥Ú[˜¢ÇbËZóè­š†)÷—‘hÑJ¢÷;lsQž¬ù¥Líí’ŽÖ>ËaÅ[aöË›MŒL½EÕ}weI×Ú…'·›ëÊÝý%£þ¶B|šlU·;¼Õxé>¦S[»ÆÛʨžˆ¾xUßÆßH~% xT(V%¬Â\zwßF®Z½÷BJãmÒñ’K¶ÓŠ·ŪYWÛJO³¿.{º¹HóCýíC¦øsã :Õß>>ÊüÃt n÷¯?‹ ãh¼]ü®¼3*¦þ¶óY<÷¼ìoU(öéz¸{÷×Ýß^ª¼í½n.<Ñ¢Ũ×Çâæ¢F©ÿzD|Nì?wªomí§á‹Ãòx«ö–¦oºO&[0ýäp ÷¾Ý÷ì]í)»@ow”é.˧=¯úvûp¸lIË7~»C1xãt¥Û®žøëÔÚ™\ ß+©T¼lýÁÚ‹(×s‚kUsͤž…ÅU¹&-žüsÛâyù¿²;lZïÎ-úTGþgÎâ­tÁzEÙŸ¥nV3èM#ñ‰˜ý±¥ÜÑ×-vv°—4J -h/ýÓ›¾,¼‹¸;~¹Þ¤/ö›º—sv¬+霺 "õ¿`¾õy&]÷¥hCÎm¤Å/¯&R¢˜Ô4F.ÁKZ¯»"ZÒΗÒ’%¬´T¢;Ò ².$hcåËßÈöƒGZšË ü)EjX¥ä}J?K¯®.E¤€åzÞzÑ*Œ¸m­Ž4Ôéh#½(Ž ™TÊÑbßA)x“à;ôµö4‘"k¼D$4ÇŠ-M¤Èii‘×#"e­ ùX﮳JzÀÖÀèñ'n"·CCíj—”Bö5Z^Ôn,ÚÑÛîÌ&ÑhÌ‚¶ü¾¿Uˆ.üÚãpgWÌ#Ëýð)‡ì¿;Lž²‚Ä—jÏ@ã÷ç–„op|ù•!ϳTžêW íï9®ß½ç,t4±J­æ2jè³þ •·¡?——"ÌÅE{ ?ïyÒ•ý)¢FA„¨öR©‚Mò4£hos,IãúÕ/ß„®»€.÷a› ÿAÌ s4¸žÕ„äÝ©~°,! „î¥V¾^¡•këÂø°¼hwŠQtJÑ%”îÁXz²ñ Edh ¾˜+SÝî':þó,õÉUÆwKVªjã3Ù¤#Äz¯yµç/xûÒ|Ø7žŽ_?„xlw„ÐÛk—>±ŒÏ_©±„±D,`/ÚÌn²`w‘XÄÈþûj”³D¾(&å¬Ù³ÚËQ^‹î~‘“O¦|ŸÑ§»IX -ÕÓñ,•ª§ð‘[K£—«“mïl|ÈÂ'S@Õ Xª\qF™ªT>jÝþ`ÝîAÞ¥A×Ú]QSÛÚRéÔZÐz]©44ù*Æ’úãr?©¯XÒêAõº-qTR“Êy…G¥®F;žµ|™Ø3 SøÈûdFCŸTÝw%·Õ¥Ó”*}üb²ñäã3J8Þ´Vé'i<NvëËùÞ SR'‹Á¦ú•RîzÕ_r§/u˜“{E¡‘Æ\z -ö7WäR-úÁ µéD–’|BÑN â ¶ -oô.HMÞðOVîE¿0''~5zø dßâ÷êƒôd*V˜rJd{I©Yl­˜øu‹ÖÕµFUO Ùcu{QcaÚg3ÊxqX’kUɲd²8¿³ØöpëI]ö¡ó}‹>±Ðøü{»¿ÐY+Åþ0éßäR«KiNöΠ¦IÇ)ÙîÖ®kóËfpŸIg|þha© -òœ| -°¡½WÐï—ÉfØ>¿C¯_²=q L‹ç¤hÕbrM{"Åäí`Šq‘-ŽÑÙ׎W‘¨·ŽÅ¾â8?êÏ&µGsH Zu=6.kš×&ÛŽ­n+”•žø R9.>·ÙÊŽ2»›»;“›[›HÎ?œ:ÆÝ>  g[îP§T_ #hŒ%ňJAK^ L“ž‹§èk)©veŸ0Ò¥myMö‰=ßÞGKÊ©ºDe_»¡Ã|rvKSqËrH¾x“üYÚvä7‡!Ðjܱ;¼¥Ô‡†€€v¡Ù%“í N©“ˆÜÏÝ™ŒïêP_s|·‰§}’› =¿mCñ ™%/õ>™ y¦ìH ìú¢ëÔòÉîˆyÑ1ÀŸ¦ý3˜ßqM·‡ó’±Â'k-Uß7…€#=FÞo xÝû£K÷J׊èÅÀN¶ê÷FÓ~߉­ (ØçÉÞ‹ö;Ïɇ‡I„Ãhxi~õEè~gY>"¼±¸'(fÖ6Ù4bFt¿5£3í‰Ò­ñßQÂh’céÒ‡Ä@´â5@­xœ“%zSi›Ò(5™›Ò¥)-'¾ÉfÀ˜ææ ñty$íx{ŒíöžÔ>KXF»uE¾ å¾ØA aâé òRQ®GðyâÉ‚ß²û•ÇF£ƒ·-[ÐÀ€Lúœ^Q,zG)€u°(Ö»ã£,4í.u¶,¢Nô°uH°eY{L¾Ô9nyþŒêµ¡/wúR'çdPÂ'ïO à»W1æ]Q£ñ*ÌoD^XÓ·"`Ä©:9‡õXz{"¯âYÓYò${|ûáÈÉz#î‰c8'K †ò¡ŒÙKtò!p\÷$þ¾ -0ùáA‹¨l¯È¥Ò¥DÏεÀ÷‘ ÎÑÔW­Mí=>-#âµi”óÓdSóÏæRÑh­Ã5šV„dã ™)w«[ð*À´7}øµÒà8ÝRʋи8Uö[jíÙo®ÑÔbÎé­už½W §«¹u–&¨MËÙǤÙªÉ&ìšÐô e[‡ê6Š`[r]±ƒœr)’ºŒ&>ȹz}Ñt¤oÉÃtª)Y!˜š`‡(Y,ûšj¶³><ûA)Ì#ûoÈd;Ù@A)ncf/¥!wPoðñÖ,œ“S 0UKpwç}/mÉÑ4ÉUw0°£~zk¡‡‹]ÈWÃö)ö½ŒI?~ñZxšÇ‡<¬= ˜ Çö¯†Ìˆû¨¹Ê< vrÌ%3DYO_ÅÚ‡‡´TW±ö)ö½ -·ž´ŠµÕì{5(&Û^8†VCýµ×0½‹‡À)«¡b-D)áq-ä°ì侕Ž„Fÿª¶Šk¥4yJLÃд __šî¨Œ”X*õ#ÈYØcQ°ty À ¤K@…÷Etu­œbK›Ñ™dµ¥¦GôjPÎõvOAP|Œ™µ5´üþt:e—Ô…”ådâ¥X˜|*ËRGsYÒŒ'k.L}FÇIÓÈ\Óö÷;Ê\z-R.ðij¯3}ßÈhÊ[@ý*—ɼ´{ƒ€m 3ñ^Š‰'kí Ègq²,ýV˜†‰‘óùu’o#P†*Ç~Ò ë—°"s1 Ñ``“ÂUðIÏfq<[£Ïä§*ãªoÌÛU« 3ÙÎSC§_A·S1td ~뽞^C§_A§W-xH ~¼Zðø:ý -:“í<5tútŠjÁ£kèô+èL¶óÔÐéWÐáìŽ3ÔÐé·ÃÕOg¨¡Ó¯ “FáN©¡Ó¯ ãì±ý5tò„dí -³µšµ­›¯] ”þ=¨KZ‘Þú½/qû¦ï0P/%±úN̬­_íÉ5é:ÕÉ%×Þã«Ûµ3Í¢Ón•Ín¦™Ë`1˜Û@E¾Ç§Ìsòø°»¿rÎøø|ûäÅ0Ñ›9û»¤]ù¸' ¦Ó¥Ý’9=°hΘ®éx$b-Ëí9¬€ê€TVöµ’A¾ -çÙ›csGU‹‰š®é.dÝì-v“gBä×—S#Æ|±›ú¶ÒKÚ[ìvT*ˆ\[atöu¥®é^7ªØuÿ@`ò,ðYKnùŽMQá“«T>ÔY½‹Wý‰Ók’a¸3¡EÍ"ÓƒJL¹:>£%Œû}û¢Ú^¶ÄS†ÎöÝ»a’aI­€è¸«YL»°_­ - ç*hÖ½oô͉Cêøô.0œg7,ifKs®Ä •viZjs{¯Ñ%SZ-ÒΦÎÐüÅ­ûrà¨ã[êŸ5py@ßÞšmfÕðrÀËóp–¸ó¡]™r0ùªr"Å>öx-QL{+äàAríXŠÉ¿Qz'Ñi“böØ‘ĸ¼·€‘u͸¥N½œR[hŽfåc“dÿì‘îÍ­Õ€c2âìí„vuœ=3"ÙÎÅÕ) P–ª×"õ^ř֠‰´TîÈÚÝÑöy´KÜöËþ~rho1*Ø^“’sö‘CÏr)ëy"œvbÌŽ |2}ŸÜŽ¼ÛWËV éÖúð•>ËCÂ;®o)éÈ©híŠ(µ8ʃ.ÙŒ†-{L“N‡QqÕ/³³›ötÊ(”»8rà+ì ±À¾Ê8Í.)ê‘Q9ÛA.[Åô*ìŒEdöe§(ŠÓé’òìŽ[òžQDd‚ÖøzOg$"sKV.NÏR»7‘öøö¸ ‹ûS"2ò»ÈŠýô¡©DdÄìãeh‡GdTªã¿Ç&Kçj§"õ¸ú¼C"2q~D˜}™ö‹s€6Cœl,K"½Ý)4OƒvÖg9 ÃÑCcÞ+†s‚J¡€žxÖ G{?]ý4-Í4kL~Ä̾ÓФ vNkD#t+bXèÙ^SZÏ¡–T¤¶ÏQ‘úñ{ÆŠTv¾ŠÔß3T¤’ásT¤ö.<úPŒU¤œ“ô¦¤^ÌЩ"{{£ê>Z‘jüh©K¬ž×‡DçÐÔC“ŒÐ‰: ‡gG Ž=a,®Å•Âiê±³–Â!{loF|G”ÂiÍËyKáNŠ[.…;̯<¶NqQ—þ·”©FÎ^ -§3èŸÁúiD(ÎOÖ)|’'Hv"¼Òëœí@5TpƇõÏ4@FÀä‘Ÿ`Ãôù!Çm.È«Ñs>¿¡-ÔTå·£“b1Pܬè’AŽDGU–.ôÄÞ§Êμé‡/ÈŒŽÞGÑü[ñ¥‘öo²ÕýuÓ½iæg¤É–ËúïÛùK꾑¿u7š7«ow>•êÐÒž+¾~‡{ê"ÏÚ„8Ü+‰'¿¨»=ÞJk±PÁÞIä‹Ý._:uiøJV–JäÞ;ZÅn¯šUgèf>R§Â_«­4r‰.ÕþÔ*vÛSa·j#E×jk"E—jµj±œò -;E±[= •—€á«¦¤Êb7tAæ\«Â.äÔ©°»(ö|šH‰b%Y×@Šîã³…óßZÅn]½b7kDiééòMDºsŸ­6}èi!}Ö!ïcåE)è±B¡U”Ϫ•=°€ÿÄÝf·uÝø µ æE;V^”-‰oW"c¢;±ÚÄ¥ÆÜ ) QÑK²«,¨9½œû½)·J ÈvÊ÷ˆòœŒ•öÜ(NÕ8åÒ/ý£Äwr®´;•Û“OªŸç!x¯g»INí9Õ3UNºIîÀ(ÜΡgGWC®L6bÏ9âò¼>ÝKäöäõé9ÍñiÜûf0Wwo—öÞ5`˜èR)eg©œqyYí;/_-ÝÕØtû"½‡WÓ‡9¬šNÍ£p窦S«¥S?æ”j:µ˜ Š¼œXM§VKwBåãÛØš™öGWÓ)È¢¬­>S5¨½'„\M§æÔ[‘©¦SÛ§‘¬•gª¦S«¥S쌜¡šN-Î"?îÕtj±vÑ{=W5Î9Wg¬¦S«¥“玞£šNmÑƳÖj:µ.)O6>½šNmþL¶ƒÌSÕtjó§š uR5Ý.¨½w -QM§m[ž³šî Š]M· -¥vîjºc)vX5š‡e:{5\[}Öj:5¦³WÓ©í–ìäÀŸ\M§VK§ô^O¯¦S+“£šN­–N¹¾œ^M§F ÙmYg©¦3PÉu†j:µZ:ûøNwoy;€ŠûÅÆ{L ƒbÝUîæ0VødX[°ÖŹï«Së’®uqÔ}uºÖ…1:í½ÙVƤ•”uâw c,߈ -šUÏêÚí’!U`èv¹ƒøI­KlvÇzz£tRK¤ÐÓ0:t¢ŒJ¯¬’Kî©ì=/îåK‚JšµNdN²Ši_tw@Íšú5wòs®Œ™ä‡_s§­aî ì½æN§’ËX!¡3Áõ󓹋îNÐý(vjq‹kîŒDï¿îG3¢¨sÑ‘Z¥œÞ5w|íÛ!yÀšQ¡àmË}©6æƒÎ¹ZWÎVgq›x2Tüº?E †–pœ\˳®ÊÅþrGÕ éö\W°Ÿ?+\>ÿ -éöæþš Uj'q­JC„‰œ%‰¬¢úSr²‘¶°ŽÜ­'ª/4:õ³¡´ö{P¹šïˆ ”ÙPóeC5Ι Õ0˜ µ'±¹¾0*|{*'o…`(šÇ›l‡Á9nÉ“yIΩˆ¡(t·V¥ðþÌ. la­Î ìÊÂZáˆb‰ä ¯nôWiã§"`¹ÍAž¶Í€ e†KÖ.MRþP.) Ü÷ªcD kÍ©Ì †gÊKšöxâš9Ô­ƒLw›òÎvƒ!Z+ÏV±ù²Ò,d8Dö™™¡‹†öW>^»N5'r»§µ[áVÏ©qÕÎÅÇŽJyOâñ(D¿áÀ^d{¹v -ì¿{+S ŠáI7܉õ•êwÜ%†;7Üoõ!7ÜéXãøŽ»sT>æÝgº)oø¾)ï,uIZwÜ<*Õ£½wê’Œ\4yð w{î{õìÆ°ößpgôTs”¤r–Â..]CÛ{5^XÛ»èî©…5/¬í]ôUCœPYåã -k?~ÕªÛ=犅sh4K팀s†ÂZ…OtÒ÷ÅöÃÑ>NšZ#9R³Œ©}P}»ŠD¯å»¢ßN¯Š¾ž×’Üû¦}°ŒÌ 0PÄÔ¥¾–|Û[Æ´SfÌm—Ì‹¦ãþzr2–D*_ …©1ui…ï~¼_‰ -=1 w -ï*. è‹¶b>È0d+R}F˘ †9ŸWa",9ßžµÄ aØÑ4 qÞÅ¡5®Ù׉æI ªgÖ³'´kV„íq‹ŒîØ°SÞÑxdR NcÃìäoìÝ\н[ðôëû ^ò U=ï×hݦUÏz5®¢ôþb׫†/3£r4}KÚؽæm´c²åߊfþ­@§3åHó>—õ r¹¬¿‚Ò8k~á±ÍåÝã¢KŠ{ØZëù»Z=œÉ†ŠÓÞu.º{JÔ¥¬$«‡s_jZExá‰Ë–´¬¤:Y^°¥]ûÇ\‡~M¤D±™}RCj²±÷°I«Ä”H¿õ®¹óÆ%HåUb4“p3’Ø…ò¢»Ðë¤z­QûwáÐ,M£·ß¤jP 8y½Ü9§(ÃSÜ®'é»^åß" ‹Á*kÿVͦ&Ò«*5j!¥Ôò÷¾ÅŸ^5 LßKHceÙå…J¤O©dE¾Ä¢ÉuâŠ0;³¯ÞîZ³—kÍãþ¨‚rÖÙvÜ2Y¨¼à·ó»ŸtãÄiµÕN/mÒÍž.§¸Åìje4Lom~ÏË÷"$Ú%I¿F»ÄV@ètê T­Â&¤ÇΔZõž×L¬’Ç` D’êve -š©S»™å=Xj•N˜òäÉã«Òöehry°†øi¥`Îcs{ò‡¤lîë’œ5UäÅ0Ñgiáx²^) vœø@yÑÉÓJ³ýÙÍ•«+ßjgóºã‘Ü—©^ÉeL]}Œn_êÄ`ñ¹qg95®€fÿLÕH_…3ìòÀÐ>N}Îpn#̹ږõçZYVæŽÎq-ª4Z/¶×kAÀ´³´ŒÄÇI#ýÀJY5Û»¨êÙ¨†é¶çò‘ „ƒ ƒ‹š9sìn‚‘ëëdÄzÐ>ìJ-d‡)¦w­ >B–@PÚê‚ÒÑôć%Åñ°B²Øfÿ)† ɾ”爳{pÕ>ãMå»´[ÿb¿¡4Ï90`K»´“§tB) \ß«–r*ιÒ.ÖG¶Ÿ‡Nš—òáÄÃnÀ;âR>µ(Üù/åÓ½ùl—ò½¿ò„KùdQÔ©jèC£Sµ–¡Ò`[ýÎq6º×ï,•\g;ê´{ýäCS6‘m«z¯Ÿ~TH¥Æê¨{ý\©¸Õïس¡”÷úéG…4=ñïõÓ˜!îV?­³¡½×Ï'Ÿ|¯Ÿ~fˆ$ruÒ½~*¹Îp¯[É¥ÎÖ—ïõÓÚîý•ÇÝ맫ßQ7€¨Üë§? õ ÕÃïõS&ýS͸×O?ãLã,h9uŒ–iI¬¾“îõÓ_èð.ÏîõÓ¿ÕïÀ¨4ïõÓwu5² ¾×O-kJ¼ÕïäûøÎPónü^?}(xöÏp¯Ÿþ†Š$£û¤{ýô gU*Rº×O}C…¿ÕOq;ÃÑ÷úí¦ÁIoõãó”Ž.OáîõÓWf&ÅÚuì½~ªû4‚ ÁzI§ß맟p-¯H=þ^?YýÖέ~;ç\y¯Ÿ>ùÙN½×OWÖZˆ“Ïq¯Ÿþîð÷ñpŠ‡ü>¾ÓëÔoõ;¼šCý^?ý-bílÛÃîõÓ·äÙš÷ÓïõÓ¿ÕïLG¸Õï,÷ñíõ¥ œÞ°{¯ß!Wñ)4Ìi÷úí[Ènõ*†N¼×O`/Õ[ýŽ©J;ÜÌÑä±ïõÓ3s>~Áß?˽~ç¨{ݯŸ±º×Sïõ ¼ý¸{ý˹R¹×ïøbxáV?ÙýÈÒ]¥ƒkžônõÓ9åì {ý4ôgì¬bGÞ맟è´S:ò^?­ò¸Ð>Š¯yJ8ŒIåÉ÷úæW{¯ŸLqíÜêwJö ô^?}Ž0 òî»×Oß0vO¼×O¿ V\‘O»×OÿV?{ì¨{ýôŒ Ö†9ǽ~Fm˜Óîõ“ϤòV?ÝêÚîõÓ_öTq¾×Oqà,%´UéÛYª!.³ëÂnƇâ\© 5>ó³ë¾$´‹w15ÅY?ñ^^¶¨Ðc!ϳ|÷æJ&öŽ…4ä…³p!.àK bÒ`·2ƒU„YïέÅë·?ø‚Õ¸•oTeh:Àd,®1ýä÷ÚWÁöC8Ž¸™ÉµíÙËT,îº}·¾]Xî6NK¦øì¿è|EÖFû2o›-U;5Y{M¶H£úÛΆÕqzöý8©Pxüñ£üûÒ ×•Qcò4·Jþ‡íK·ätt»9·ó§þ©-êîëÑÚý–Þж†ÃNÓA«åbE­ü6Â:¹v¾U/î¸ûÁ‘úµ.ªHöm˸…«´LýÜ7±Çw4%\öF^¢]šß_"©¬Qª -‰›\_šb6ù·b¦Z¼ÉÜ Ä+ Ù{íÙßgubÍÉPcÒ²‚L§—‘GKû±âV+;Òí·Ï꺲½Ö­±ëyÖVo”îíß»›Püê!âŠCaš> -ÞhõêØÂ]d.Šw^ =ýNFœÏ°´Ôh¹<å¤âóm›Ëb«Èœàâ­Yqhâê#¥ÃmÔnÆYB…vö÷%í߸òîx¨ïÏå4<{¸OZÍÇL9òý莇on‹qëó0÷yYÆ# d;î+ÖxW%Uj;Ð'‡;ï±m‹ŽòÝYøJ$M¶Ü´ç'Ñä, ƒÙoœð¿Î¼nyè!ü½_/Zã­(#‹~ æÍj¼m]ø0X^·_Ú±3DøÃ!'þ -K¯àk¿âS›žáAñDʃ?­Éäw±ë|¯£¯ô8}]µÐÐ£bù-¼pI_äl}áÊ–¼j‘Cá•Oúb|3^’^ëÝ„ñèÄ#%KÕ‹žðÌ›llóÒ—o ¼òJà”Ö =ósKBø‘@K ²©Ð× »ÿe`?¹Ù&ý5‰NéxòJÖ+0‹Ýóäc "9ç‰ÀÇÆ“ƒr åÀÞÞIì¦þNÑíhÌ‚ð¶éÁoÎHB KÓÇc!œÖ˜7lOÜù•¾&^¬R–äË1YSá½*¼NëW5,!Kú/™¤»uMGR­Ðc&ú9t°¾X6à|kX8Nî¼2‹U•ÉTÚío‘ÑÎípÆ¡í§./ß ›°Íòy ÿvG²ÔÂøpr~Þ -pO·ï_Xìg¯»³¢•MR5{³¶I€ Ÿj -Õ¼ƒ -ØQáP>%ïÓ~f}‹µ@~Û«×T€âþ\Žï¬k*ÚÉîXYAÝc©uó^~Aœ=>4øúÁ ·~wá嵌HùÁe4‡I¾f߈ _£.Vö{†Œ¼ÐÉÜl€ìãbkdS¼ÁÊþB³lJÕ£IVyŽZ‰wÕàh†ŽK„?èé±OüHŽrÙoPÌ·âºü ºƒ>¦rXÿ8À¯nÝrš/uç'ÂýÊ-«RÑ—rî{–‚í¸ÎrMJ 'šœì%U£@Ëd©åˆÁüŽkŠ]55Dj´ìøó\ˆ{·¶¯7þl{á‹• ê"ì×Oü ÝvûÄ-ä7´[jð`ÉÛ†À݇Ç'õøðz—ju](ÇøyƒÌ—–¬lœ5i.áYlËš>Wo{ÉòÆÈ'k"eÍ;±•(_•E“Ñ„­§G3ú×ó€e$úÐSv£O>á™_xæiü"ëbã YF#¾7 åùQãþù3 nÊ|X⎾õù$TRv€ŒEn@!ç'¾™·vб¼¡ãì —œ4o=Ê Ì«7/YgE°.ÊŸ¾‹Ÿ6,=‚”~}…{c²É.LÆFiÊÅR,­Í¸‚ýÀ–DH/ÄS.Ð~Á÷FRñï’àö1 @àë«E"8soÃ/ž>¯Œ¡__RÆO Þ¤$àÏÜàwS›Ôï>"ô’"‚ïs2¦ÌŒ– •Ü¿àO¢Ð#‚OäþWËÊ_`ù€ÎvÞñAz‹£p˜µ·‘–ó~%áU‡Ø®Y*~h1Ò+ËcZ ðöü>z^VZ_ŽÑY‹¡/¼(A|üž8Œ.-ЖJ]}Æè0¸;¸wAP›‡1Ù*XŠ÷+3ÕÜr8WÊ¢Ö©úËòHéætVj`,ÆA|¬OÕ0õ®†’2:õ>­Ù“ÍØ0(fïl¸¬·¹ß•lg$UŸœÈTõÙV+ûº V–ý¤Ô]òè A[†: Q~è ¤-;ït$½%ŠŸeùýÈݵ@YRÊcÜ’h€0J{~ òXgÂœ69™öìJxLÄr{Š¸â»Ñé#”†¬Û ý>°<¦'*ýþ±Ï˜Ð" bfd:uWäþrsŠÄ€ßí©+r§ÿ+ýúvy)C@ý²6v*\v°õ•nùùN¬‰LP›t [f‚Ëü%q©zÖÅë<Ûo:¬+ŒÂÙ8†ãå¼2ÞQjÃeÁï,;°kƒöƒ=Zvaíq¢ÃËîk· µ²Oø™Äë”:d©ŒEèè'1t8ü«„K|c\ü‹´G|°ßVSü‹¢Oòâsû•æ_T )…GˆÝ)æRÚ-ÒNŠ¹TôŠ/€€-ÐD¥ªŸóÄK5Ÿ?v­ñðS©@°Á›îmâˆzΚxàOÖëú—÷î¶.Î}ªW}¸ xÆ®?Èl&áÏ}} à’KWð¶ ö.žA§ÕçäcEwx.KŽ¼ævj>Œ%˜c×Ô—s”›DŠµì¡"ü•8Ø,vŽsƒZÛF×èf±l~/ÍÊ—Ï7½üˆè¤$ Wg°|ƒ¶”À°¸S³¤Åùø·x&Sxõ=òYÜÛDÃâyxÍ[¼ÄC<áŽêƬDÞ"‹·¤÷»¸Š¶ƒÄP%Ò˜ºég<ëÇût%ΤbådÛW\½…^ -ôÇOøÄ»1XóìnVãš»dì€\ŸEða?¯ÏËW:ß~µ8¼½ 4¾{ôçÚâÍë0ê«/‹s:OY¼Ë§‹{à‹£eÏft¥â#ó‡¬U‡¯Thö]«_©¤ëŽÑµêð• -°¼V¾R Yë¬U‡¯T–}‹ -šZ­EÅÀ"e²Ñøúœlp…:e}2ÙTW(q§]ž¿¹åÅ>a@ì±Ð#ÙÄ”™i·{¤ÇêHöËó¶©"öV¥Ø³úŽ]- ¼£éÎW 7Ö\£Þ/ -¨vÐCÈBÃHR»›b!ðã„E$© -픬­1²ÿâ¯ð§³b78ö´å“ÛÌùð¹d7u&–úºñ± ßÔ“pãíž õºp¯–öXá·;¸?èE‹ÛJIE¢ôbkÉNêÆÍw¹âáVÎéSÙÑôókc•ö2Héždö7ÂnSÀÊèÂãc­Ad |d¤+ˆÎV¶ÈÙôF>;˜ß!ÆG´¬…¯°bk@¾·à•n bÅނŲqÁ¦®€½'WÉ*gø`ûÍʵ» â}ÃÀG¼”mD.-¶¬5Ï\) ,Y¿Y|-‘âž'|hEFVžšj°‡$…ù“öòË?ëÐþiméw'Qm/0‹ÌFSýì`»¡/ÒÝR®œá„a°‰Ø»R© ß_qè0TòýNF+á×ÜÖCç’ñ•&ÚU@ùäö‰ãéFªSÞ-Õ߸NëCÎææ3ñ Î驺=ú`²éô¢EzOÙ§%=_Q–¥Äý僇ÖŒQ®ädÄ:Gì%¥Þ’çµÞ‘sQ*gEm¹D;è¿’–`X9¹–ÅRl‡ò1¾¥íª.ž²xÝã(Ë.ˆé¦ôå32¿Ú³[‡¼"59¥uˆÊò˜DÙšöŸ4Œ²·Hðp<¦ìEÿËvšÄ÷פd:%+²qkÔ{ÚŠL¼7¾“$~É)ÅÕàŠŒ³¤Â¤#íwø‡ò¸¨ƒtÏ¢èÎï?,/© üaðßæ¬Çˇw:\r™àûqžaØgç?‘ì«p¾–${ %Š…o<|æjöõ%»å|ü‹~Á‘”æÂ:ÔNy:šèYqK_TÝl -)žýŠ4‰)%üÆ/}±Î‰I² -Å«¥ù±¥–CÈ}”çÇ‚2A}ØO@¢I°Î5ÈâéG’õ:Ë·Ïèë“vìF”}âSàÅ„°ÃèyÀ›\YÄ^ˆ'žü\æêí"ÛvðÔÂ`Ñ]*ÉKÔA7éظ7„˜¦)!KÀy›¾Æ¡Tä%57ÏÙ¹oìÊÔ£j¾rgi¨¸¡9yÐZqàH6à,“BpV ûÈC|ªÞˆáÞð¦n¥JŸo±q¦±µN oÃ: -µ7I‘{ñ½ÉB ¯óäÙ«’æ¦ÞF…|㶗KP}Ê!õÐöólßØýOäpµI>.ÙÆ+Ìcí þ,TN„ùÜÔŸÿŠMç~ø°ä8¾F¹Ø)BG˜_pZ8r .-¼]èq‘+ä,à訃 ­€ÝŽ£§b0ÕÈ{ßÝXÐiòbÎÁ²†ªÃ^…lOþw=Åy ÂÁá;Õ=qU¾|©/¿"ÿͧˆ¼â‘’…¯á;î0’E/+„lœäÏd“H ˜jÏæ즄"cœßoÈ¢ÕÞǯ”vãÔQ>1˜ùï” ¸m7t Ë¡t«Ád³Á“µÙ®Qƒp7K§ËjïE›H3ûþþFãf23£½ ÂFO«}“·5“Nsui²uýz“Ÿ6ÓÕ²Gÿ1'Уׇjë.oN˜Ù¶]h{mv@oˆ.´†WN´¿Ñ…vM„9ÿ½þmÚš\[øTƒÿ_ ÐûâÀ83\ Õør~àÑßæùÁüþI˜‡Ðñ×gõ…¡ 9ò…bæ…)ŽG,ç¾â¾0‰˜#q‚ ß¾`,5Lü“pØ À¿üïÄ/‡yøü÷‰$|ÑH˜ž„}Á` üw‡ð„ëí£|ň榑)Jú‚-I„’„Q»@,žD£>2g¿D$fŽÁ¿xPÅ}¡H ÁÆ}ñX0b¾x¡‡áþ -†$ߣ¾8‹r?'ñ˜/™cQ_8 šã¤“ðofŒ ßi_(žDÐ BË€/@ÆÐ÷ˆ/@ƒô7ŠGK}Œšc- D"aüdŒˆ¢1…âA4¦Œ †‰²P&èP<ĉD cÑ)õ!`Ü¡P8hŽ…}á`”D= a< ùï‚eGƒŸD‚Ðu"`Ž¾`4lÃÐöXÌ ñ,"Ð4{0ŸÑ XÃ_4ˆ Šø‰eþ+°(ÖþI ‰KÏ4'Cˆb‘0Ìt'LÑ8AI ~'ÆÐŒ‚^ £/ÀaQü¸ï óA#Àោ£@7$Á1èX8‚T:°9@òº( „`Q€@Ú@Dâ0Ä›hr@K#Ä€€”ÿŽe#BÀÄóOШAÁ£É #µ†”YÄp…ì - ˜€¹Ê“‘‰W¿d€Àºx$ -ÄE_±Š'¡H H/9üQ»KžÁ€áÇf°sŒŒ„DÏ}Ǻ !áI,ä‹’±˜C| ñ½á ¾J‡1 ŠãЖº½á@+úŸÓìolèérlvd³™<Ï«M5e Ô–ÙÿLõæȉ›ïë½1gWÛå6›Õ‚méE|®Ó¶J6L¤òµ6Wk¶] Ök÷<O6³(nv8ͯmS5ËZi`³a[ÊëE߃¬Õ–£WkÆ´e(z1ûÑ‹å -=}èÑ3Æ<[®þ^š—«ùKí,df= Æžãý`1êӉ쬆ºÑEÀ¤fÌ./°V=0 ¼â.L^àpôP|V5!˜ì˜– „@O£ŸÃa¤àÅgè§ðPö‹–@­ˆLS]ŠŽ¤Š L ®½ø(Úi/Å…JqáŸHI‹Ÿá—.ñ‘Q\: -ÈTé(€–ÐQ|¦OGñÓÿ1OG,O±e³Õ{cªI÷¦sð -ÆLï/ÊÜ[.‘,QkxcÓ³YÑ”™™¬þFOà'|sð/jEÓÿ3!Âç endstream endobj 69 0 obj <> endobj xref 0 74 0000000003 65535 f -0000000016 00000 n -0000024017 00000 n -0000000004 00000 f -0000000006 00000 f -0000024841 00000 n -0000000007 00000 f -0000000008 00000 f -0000000009 00000 f -0000000010 00000 f -0000000011 00000 f -0000000012 00000 f -0000000016 00000 f -0000024068 00000 n -0000024700 00000 n -0000024731 00000 n -0000000017 00000 f -0000000018 00000 f -0000000019 00000 f -0000000020 00000 f -0000000021 00000 f -0000000022 00000 f -0000000023 00000 f -0000000024 00000 f -0000000025 00000 f -0000000026 00000 f -0000000027 00000 f -0000000028 00000 f -0000000029 00000 f -0000000033 00000 f -0000024139 00000 n -0000024584 00000 n -0000024615 00000 n -0000000034 00000 f -0000000035 00000 f -0000000036 00000 f -0000000037 00000 f -0000000038 00000 f -0000000039 00000 f -0000000040 00000 f -0000000041 00000 f -0000000042 00000 f -0000000043 00000 f -0000000044 00000 f -0000000045 00000 f -0000000046 00000 f -0000000050 00001 f -0000024210 00000 n -0000024468 00000 n -0000024499 00000 n -0000000051 00000 f -0000000052 00000 f -0000000053 00001 f -0000000054 00000 f -0000000055 00000 f -0000000056 00000 f -0000000062 00000 f -0000027078 00000 n -0000027152 00000 n -0000027326 00000 n -0000028303 00000 n -0000043362 00000 n -0000000000 00001 f -0000024816 00000 n -0000024281 00000 n -0000024352 00000 n -0000024383 00000 n -0000026404 00000 n -0000025227 00000 n -0000065792 00000 n -0000026517 00000 n -0000026565 00000 n -0000026122 00000 n -0000000190 00000 n -trailer <]>> startxref 65962 %%EOF \ No newline at end of file diff --git a/www/images/web_logo.ai b/www/images/web_logo.ai deleted file mode 100644 index e06e707..0000000 --- a/www/images/web_logo.ai +++ /dev/null @@ -1,1057 +0,0 @@ -%PDF-1.5 %âãÏÓ -1 0 obj <>/OCGs[13 0 R 19 0 R 88 0 R 94 0 R 163 0 R 167 0 R 173 0 R]>>/Type/Catalog>> endobj 240 0 obj <>stream - - - - - application/pdf - - - Basic RGB - - - - - Adobe Illustrator CS3 - 2010-05-11T11:22:14+01:00 - 2010-05-11T11:30:49+01:00 - 2010-05-11T11:30:49+01:00 - - - - 256 - 144 - JPEG - /9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgAkAEAAwER AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE 1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp 0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo +DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8A9SPd20bFHlVWHUE74qt+ vWf+/k+8Yq769Z/7+T7xirvr1n/v5PvGKu+vWf8Av5PvGKu+vWf+/k+8Yq769Z/7+T7xirvr1n/v 5PvGKu+vWf8Av5PvGKu+vWf+/k+8Yq769Z/7+T7xirvr1n/v5PvGKu+vWf8Av5PvGKu+vWf+/k+8 Yq769Z/7+T7xirvr1n/v5PvGKu+vWf8Av5PvGKu+vWf+/k+8Yq769Z/7+T7xirvr1n/v5PvGKu+v Wf8Av5PvGKu+vWf+/k+8Yq769Z/7+T7xirvr1n/v5PvGKu+vWf8Av5PvGKu+vWf+/k+8Yq769Z/7 +T7xirvr1n/v5PvGKu+vWf8Av5PvGKu+vWf+/k+8Yq769Z/7+T7xirvr1n/v5PvGKpJq3/HQl/2P /ERiqExV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2Ku xV2KuxVF6t/x0Jf9j/xEYqhMVdirsVdiqQebPPvk/wAp23r+YNUhsqiscLHnM4/yIU5SN8wtMVYD F+dvmnzGafl/5E1LWrdtk1O7paWpI8HIZG+mRTiqMjtP+cqtSFRY+XNEDUASaSWV1qf2jG1ypI9h iq5tA/5yqs/jF15Y1LofTH1henbeO3+188VQs/5gfnh5eHPzR+XT3lqu8l5ok4novdhChuHp/rFc VT3yf+dv5feaLhbK2vjYaqTw/Rmor9Wn59OC1JR2/wAlWJxVnmKuxV2KuxV2KuxV2KuxV2KuxV2K uxV2KuxV2KuxV2KuxV2KuxV2KovVv+OhL/sf+IjFUJirsVaZlVSzEBQKknYADFXj+tfmj5p8563N 5T/KiFJ3h+HU/NUw/wBDtgdqxEhgx8DQ1oeKkfFirJ/JH/OPvk7RLkax5iZ/NnmeU87jU9T/AHqc /wDiuFy67di/JvAjFXqyyqqhVAVVFFUbAAYq36+Ku9fFXevirD/PX5WeQvPFuya/pcUl0RSPUYQI rtPCky7kD+Vqr7Yq8mvI/wAzfyab1pppvOX5dofjlbfULCOv7RJ3RR78dv8AdfdV6x5a8z6H5m0e DV9Fuku7GcfDIvVWHVHU7q613U74qmmKuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2 KovVv+OhL/sf+IjFUJirsVeKeetd138yfNs35b+Urk2miWf/ACl2uR7gLWhtoyKV6FSK/EdtlVqq vX/KXlnQfKeh2+iaHbLbWVuKDu8jn7UkjftO3c/wxVOPX98Vd6/virvX98Vd6/virvX98Vd6/vir TyK6FHAZGBDKdwQeoIxV4H5u8u6l+UHmJ/O/lKJ5vJl9Io8y+X4/swBjQTwDoqgnb+U7fYPwqvZd H1fTtZ0u11XTZluLG8jWa3mXoysK/QexHY4qjMVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdi rsVdiqL1b/joS/7H/iIxVCYq8+/Ozz3c+U/J5XTOTeYNYkGn6PGm7iWXYyKPFF6f5RXFUb+VXka0 8keUbbSkpJqEv+kapdDrLcuPiNf5V+yvsPEnFWYetirvWxV3rYq4zgCpNB44q0LhW6NX5Yq362Ku 9bFXetiqldxW15azWl1Gs9tcI0U8MgDI6OOLKwPUEHFXjP5a6h/yrnz7qv5cardCPQLsNqfle5uH 4qqMSZIObn2P0qT+1ir2HT9e0PUTTT9Rtbw9aW80cvTr9gnFUdirsVdirsVdirsVdirsVdirsVdi rsVdirsVdirsVdiqL1b/AI6Ev+x/4iMVQmKvEr4/4u/5yGKS0k0ryNaKY16qb24AavzHL74xir1v 1sVd62Ku9bFXjn5tfnpJol1NoPlkpJqcVUvNQYB0gb/fcan4WkH7Vdl6UJrRV8+avrWtaxdG61W+ nvrg/wC7J5GkIHgOR2HsMVQ1tPdWsyT2szwTxmscsbFGU+IZaEYq9g/Lb8/9a066h07zXM1/pbkI L9gWuIOwZyN5V/mrVvc9MVfRkN5DPDHNDIskMqh45EPJWVhUMpGxBGKr/WxV3rYqxjzl+Xvk/wA5 SWb+YbL64bHn6FJJIjSSnIFomRiPhHfFWL6j/wA47/lbcpWzsZ9LuRul1aXM3NWHQgStKm3+riqT f4h/MP8AKS7h/T13L5r8hSOsRv3BN9ZcjReZJJZe3xEg9BxOxVe46ZqVhqmn2+o6fOtzZXcazW86 GqujioIxVE4q7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYqi9W/46Ev+x/4iMVQmKvC/yLk+vS+c fMj/AN7q+t3G5/33GeaD5D1mAxV6p63vhV3re+Kse/MDzNL5f8n6nqkBpcxRcLY7GksrCNGoevFm 5fRgV8iPzkdnkYu7kszMakk7kknFVvp4q708Vd6eKvof/nH/AM2teeX59BupeVxpjcrUMRyNvISa CpqfTevyBUYq9X9b3wql3mLzFZ6Fol5q94T6FnGXKjqzV4og92YhRgV8rebvP3mjzTdvLqN262pP 7qwiYrboO1Eruf8AKapxVAaD5l8waBdLc6Rfy2kgIJVGPpvTs8Zqjj2YYq+mvJfmuw89+TmlvoEr IHtNUtDvGX4jlSu/F1YEfd2xVJfyGu7nQPMHmb8t7qVpYdJkF/opY1P1S4ILL/sS6H/WZsVe04q7 FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYqi9W/46Ev8Asf8AiIxVCYq+fP8AnHq6MP5fhT9sXlx6 wP2uVR9r3pir1FL2Nu9D4HCqp6uKvP8A88Vml8iv6f2Y7qF5f9X4l/4kwwK+d+GKu4Yq7hiruGKp 55P0LzLqmrovl71I7yH4zdI5iEQ6cmkHSv44q9w0/QfzYigCXPmq35ACg+qJNTx+MrGx+nFWJ/ml oX5iLoD3Op63HqWlQujT28US25Uk8Vcqo+MBj3b3pirx5+Ea8nYKo6kmgxVLbrWreOqwD1W8ei4q 9o/5xuuL6TS9cuZmJt3uIUiHRQ6Ixen0OuKsv8pv63/OR92Yd/S8v0uqbbmaOnLx+0uKvcsVdirs VdirsVdirsVdirsVdirsVdirsVdirsVRerf8dCX/AGP/ABEYqhMVfOX5XE6XqPnDy22z6VrNwUH/ ABVKSqEex9GuKs++sYVXreSL9liPbFUD5jgGtaDe6VLxpdRFUY1osg+KNjT+VwDir5avdUfT76ex 1C0kt7u2cxzRbEhl+6o8DgVpde009Sy/Nf6VxVeNa0oj++p7cW/pirR1vSx0lJ+St/EYq+hPyk0q PRfLX1m4jeO91MrPIjCjLGBSJWFetCW/2VMVZs2qL+yv3nCqE1CWO/s57O5QPbXCNFNHvurChFeo +jFXzn5u/JTzbZ3skulV1iwJJibmqzov8roxWp7VStfAdMCpdof5MeeNSukS5tBpttX95c3DLsK7 8Y1Jdj4bU9xir3vSrTy/5E8p+iJPR0+wRpbi4f7cjn7TmnVmOwHyAwqjf+cfNE1C9fXPzC1WEw3H mSUJp0LblLKHZT/sqAf7GvQ4FeyYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYqi9W/46Ev+x/4 iMVQmKvnzz9aN5U/PCLUSOGmecbURs1KILy3CpT5nin0virIvrGFDvrGKu+sYq8R/P60sBq2lXUC KL+5jlW64j4mWMoIi1Op+JhX2p2wJYQfy+86i2S5/Q10Y5N1ASr/AExj4x9IxV1t+Xvna5YrHo10 pAqfVQxD6DJxBxVH/l/owj/MTTNP1q1aMxyu0lvOpX40id46qeo5qvzxV9LfWMKHfWMVd9YxVj3m rz/pXluazguobi5mvOZSG1VZHCxirOVLLt/bilKY/wA1JdQb0dA8tavqt02yotuVSv8AlMvqEe/w 4qnvl/8AJ7zn5yv4NT/Mdl0/RYG9S28sWz1Mh/Za4dGIHX+Yt1HwYFe8QwwwQpDCixQxKEjjQBVV VFAqgbAAdBiq/FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FUXq3/HQl/2P/ERiqExVgn5zeQG8 5+TJrW0+HWtPYXukSg0YTxA/By7eovw/Oh7Yq8o8lebf09o6yzD0tStj6Go27DiyTJsSVNKBuv4d sKsg+se+KFkt5HFG8sjhI0BZ3Y0AUCpJOKsF8rQJ5m8x3PnK9jrawk22hRONhHGSDNTxLE08DXwG KWe/WPfFDvrHvirEvP8A5fbUbOLVtOULr2ksLiylA+JxGeRiPiD1A8fmcUp15c8yW2uaNbalAaCZ f3sfdJBs6H5HFUz+se+KFK61G3tbaW5uJBFBCpeWRtgqqKknFWvyH8vXXmLzHf8A5l6nE0dtRrHy 3E/UQrVZZvp3X5l/bAl7xiqGn1PT4J/QnuI4peIfjIwX4SSOpoO2Krf0xpP/AC22/wDyNT+uKu/T Gk/8ttv/AMjU/riqrb3tnclhbzxzFKcvTYNStaVp8sVVsVUbu8trSBp7h/TiXq1CevsKnFUDYeY9 Pv7sW1sJHahYuVooA8amv4Yqj7q6t7WFp7hxHEpAZjXbkaDp7nFVH9MaT/y2wf8AI1P64q79MaT/ AMttv/yNT+uKq1vd2lwGNvNHMF+16bBqV8aE4qq4qhH1bTI5pIZbqOOWIgOjsEO4qPtUrse2Ku/T Gk/8ttv/AMjU/rirv0xpP/Lbb/8AI1P64qrW91bXCl7eVJkU8SyMGFaVpUfPFVXFUXq3/HQl/wBj /wARGKoTFWNfmR5wj8n+StU8wMFeW0ipaxtWjzyERxKab05sOXtXFXzv5Psf0XpdzrurzmTVtU5X 2q3kp3+KshB+XIlvevthVgHmX82dfvrl49KkNhYqSEKgGVx/MzEHj8l6e+BWOXPm/wAz3VnJZXOp 3E1tL/eRu5PIeBPWnt0xV7Z5F1vT7/yxZGyHprbRrbyxHqkkagMNutete9cKp/8AWPfFDvrHviql d6lBaW0t1cOI4IEMkrnsqipO2Kvn+TzdqlrqWozaLcy2FpfTvMIEPQMxI23AND2wJRukfmZ5u06Z We9a9hr8cFz8YI/1/tj6Dir1qz1LSPOXll+Sk2t2pjuISfjjkWhpUd1NGB+WFDPf+ccfNN6+nan5 H1ST1L7y06izkOxkspalP+AP/Cso7YEvZcVSg6JHc6zPe3sSyRKqJbI1GBAFWYj5+OKpH52s7S2+ pfV4I4efq8vTULWnClaAeOKpn5a0zTp9Dt5JrWKSR+fJ2RSx/eMOpFemKoW48tX0Vnf29jsssyPE vIDnEFPwVPgW7+GKpt5csb2y0xYbtqyciVSvLgppRa/jiq/zDdpbaPcu25dDGgPdn+H8OuKpR5Gs uFvPeMN5W9OM/wCSu5+8/qxVNdesJ7+2htYxSN5lNw9QOMa1JpX3xVVj0TRoowos4Sqj7TorHbxZ gTirBtTeLUdX9LToESMkRQrGoUN/lGgHX9WKs2s9JFlpL2ds3GZkas3cyMtOX0HFUs8raPqtjcXE l4eMbigTkG5NWvPYntiqLs9Bge8u7y/hSWWaVvSV6OojGy7GoqcVY35ytre31SJIIkhQwKxVFCiv NhWg+WKsm07R9Kn0i19S0iLSQRl3CKHJKAk8gK1xVU8v6bJp1k9vJ19V2U1BqvRTt4gYqmeKovVv +OhL/sf+IjFUJirxr/nKh2/wDpUJakVxrdrFOvZk9GdqH6VBxV5Z+YVw48naiEJUkRjbwMyAj7sK vEMCuxV6P+T00iPqi1PpkQkjty+PCFelfWMUO+sYqxf8yrib/CN0sf2WeISH/J9Qfxpil4tgV2Kv TPyeuJVh1WMk+kGhZR25EOG/ADCFelflNM8X57uIBVbrRZBdU2pxlUgmvX+7UYCr6RxV2KsS8/f8 eP8Az1/40xVNvKf/ABwLX/np/wAnGxVZ5rudQtdPE9pN6QDcZaAFiG6UJ6UxVR8lSyS6ZO8jl3a4 bkzEkn4E6k4qgPPN7WS3sVOyj1ZB7n4V/jiqs9zqtpoaNp4SC0tkAM8lOchJ3ZFIIoWO1euKozyp q1/qFvObujmJlCSgBa1BqKCg2xVQ84az9Xt/qELfvph+9I/Zj8P9l+rFVnk3RvSi/SMy/vJRSAHs ndv9l+rFU/1A3IsZjbOI51UsjsOQBG/TFWK+UL27u9amkuZWlb6u1ORqB8adB0GKsyxVg3nn/jrQ /wDMOv8AxN8VZdo//HJsv+YeL/iAxVF4q7FUXq3/AB0Jf9j/AMRGKoTFWAfnp5SufM/5a6nZ2al7 +0431mi9We3PJlFO7R8lX3xV4Ro0tp5n8tK7nmlxGYbtB1WSlHHtvuPowoeXeYPJOu6NcOrW73Fp X93dRKWQr25UrxPscCUv0/y/rWoTCKzsppWJpUIQor/Mxoq/ScVev+VfKqeXtIKTSL67/vbybooI HQE/sqPH54UInyZ5P/Mvz5bX+teXr6zstIiuTb2KX6solCAcmUpFI1N+/fbtgSm+q/k1+d1npd5e nU9Kma1heZLazEsk0pRS3BBJAq8jT4fE4qx7SmtPNXlcGQ8luY/SulFKpKo327EN8S/RhQ8u17yZ r2j3DpLbPNbA/u7qJSyMvatK8T7HAlCab5d1zUphFZ2UshJoX4kIv+s5oo+k4q9g8r+V10DSBA7g ymst1N0XlTehP7KgfxwoZt/zjfpE2qeZPMXnd0IsmUaVpbkU5opV5mAP+om/uR2wJe/4q7FWJefv +PH/AJ6/8aYqm3lP/jgWv/PT/k42KqXnL/jiP/xkT9eKqPkcgaRMT09dv+IJiqQqk+s6/NNFGsyq TJwckKY02VTQHrtiqLs7v/EF20OpT/V7eFeccEdEQ8TQ1LV6DFWRfXNL03RvrFsALVAfSC1HNq0F K7mp7/TirENJs59c1hpLglkr6lw3t2UfPoMVegqqqoVRRQKADoAMVSttWW5u72zhAaK3gJklB/3Y duOKsb8jf8dab/mHb/iaYqznFWDeef8AjrRf8YF/4m+Ksu0f/jk2X/GCL/iAxVF4q7FUXq3/AB0J f9j/AMRGKoTFXYq8B/MX8ofMXl/XLvzZ5Cthe2V6xl1by2ux59WktgOtdzxG4P2QQeIVYnp/5ieU 7hjDfSvpV9GeM1peI0bIw6gtTj99D7YbQiL7z35Is4y76pFKQKhIKysfb4AR9+Ku0Pyj5y/NCZIo Laby/wCSyQbnUrheM90nXjCh6g+I+Edyfs4pfSmh6JpehaRa6RpcC22n2UYit4V6BRvUk7kk7knc nfAqOxV4F+Y35ReYdA1y782+QrYXtnesZdX8uLsS/wBppLYd6kk8AKg/ZBB4hVienfmH5TuS0N5M 2l3sZKzWl6jRsjDYgtTj18TX2w2hE3vnnyRaRGR9Vhk8EhJlY/Qgb8cVU9D8secPzQnS3sbWbQ/J jEfXNVuF4zXMYO6QKetem1V8T+yW1p9KeX9A0ry/o1po2lQC3sLKMRwRjc06lmPdmJJY9zgSmGKu IqKdPfFUmufK1ndMGuri4nZdlLuuw9gFAxVEafokNgy/V7if0lqfQZgYySPDjX7jiq7U9Gg1GguJ ZREAP3KMAhIr8RFDvviqnY+X7SySWOGWb0ZlKvEWBWrCnIUANaYqv0nQ7LSxJ9X5sZacmcgmg6AU AxVDN5T0drxrlkduTcjCW/d1O/QCv44qr6roNrqSxJNJJHHCKJHEVVfnQqcVQtv5StLfl9XvLuHl 9r05FWtPGijFVRvLispVtSvip6gzVH/EcVdbeWLO2t5YIZ50E5BlcMoYgAjjUL0+LFXWflaws51n tpZ45F60YUIrUqfh6HFU2lQyRsgdkLAjmlOQr3FQcVSafynp9xIZbia4mlOxd3BNP+BxVHafpSWP wxXEzxBeKwyMGRflsD+OKo3FXYqi9W/46Ev+x/4iMVQmKuxV2KpVrXlTyvrgH6Z0iz1EqKK11BHM yj/JZ1JH0YqgtM/LryDpc4uNP8u6dbXCmqzJaxCRSP5X48h9GKsixV2KuxV2KpRrXlDyrrpB1nR7 PUWAAV7mCOVwB4Mylh9BxVA6f+Wn5e6fOLiy8t6bDOv2ZVtYuS/6pKkj6MVZKAAKDpirsVdirsVd irsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVTm90mae5eVXUK1KA1rsAPDFVD9BXH+/E/H+mK u/QVx/vxPx/pirv0Fcf78T8f6Yq79BXH+/E/H+mKu/QVx/vxPx/pirv0Fcf78T8f6Yq79BXH+/E/ H+mKu/QVx/vxPx/pirv0Fcf78T8f6Yq79BXH+/E/H+mKu/QVx/vxPx/pirv0Fcf78T8f6Yq79BXH +/E/H+mKu/QVx/vxPx/pirv0Fcf78T8f6Yq79BXH+/E/H+mKu/QVx/vxPx/pirv0Fcf78T8f6Yq7 9BXH+/E/H+mKu/QVx/vxPx/pirv0Fcf78T8f6Yq79BXH+/E/H+mKu/QVx/vxPx/pirv0Fcf78T8f 6Yq79BXH+/E/H+mKu/QVx/vxPx/pirv0Fcf78T8f6Yq79BXH+/E/H+mKu/QVx/vxPx/pirv0Fcf7 8T8f6Yq79BXH+/E/H+mKv//Z - - - - - - uuid:5776C8C7815EDF118B77FD523B43407A - uuid:47866ebc-44f4-1341-ae6e-48dad307a28b - - uuid:a2b8dcac-7818-4055-b6a1-3efa106255e8 - uuid:9E3E5C9A8C81DB118734DB58FDDE4BA7 - - - - Document - Basic RGB - - - 1 - True - False - - 500.000000 - 256.000000 - Pixels - - - - - AGaramondPro-Bold - Adobe Garamond Pro - Bold - Open Type - OTF 1.007;PS 001.000;Core 1.0.30;makeotf.lib1.4.1030 - False - AGaramondPro-Bold.otf - - - AGaramondPro-BoldItalic - Adobe Garamond Pro - Bold Italic - Open Type - OTF 1.007;PS 001.000;Core 1.0.30;makeotf.lib1.4.1030 - False - AGaramondPro-BoldItalic.otf - - - - - - Cyan - Magenta - Yellow - Black - - - - - - Default Swatch Group - 0 - - - - White - RGB - PROCESS - 255 - 255 - 255 - - - Black - RGB - PROCESS - 0 - 0 - 0 - - - RGB Red - RGB - PROCESS - 255 - 0 - 0 - - - RGB Yellow - RGB - PROCESS - 255 - 255 - 0 - - - RGB Green - RGB - PROCESS - 0 - 255 - 0 - - - RGB Cyan - RGB - PROCESS - 0 - 255 - 255 - - - RGB Blue - RGB - PROCESS - 0 - 0 - 255 - - - RGB Magenta - RGB - PROCESS - 255 - 0 - 255 - - - R=193 G=39 B=45 - RGB - PROCESS - 193 - 39 - 45 - - - R=237 G=28 B=36 - RGB - PROCESS - 237 - 28 - 36 - - - R=241 G=90 B=36 - RGB - PROCESS - 241 - 90 - 36 - - - R=247 G=147 B=30 - RGB - PROCESS - 247 - 147 - 30 - - - R=251 G=176 B=59 - RGB - PROCESS - 251 - 176 - 59 - - - R=252 G=238 B=33 - RGB - PROCESS - 252 - 238 - 33 - - - R=217 G=224 B=33 - RGB - PROCESS - 217 - 224 - 33 - - - R=140 G=198 B=63 - RGB - PROCESS - 140 - 198 - 63 - - - R=57 G=181 B=74 - RGB - PROCESS - 57 - 181 - 74 - - - R=0 G=146 B=69 - RGB - PROCESS - 0 - 146 - 69 - - - R=0 G=104 B=55 - RGB - PROCESS - 0 - 104 - 55 - - - R=34 G=181 B=115 - RGB - PROCESS - 34 - 181 - 115 - - - R=0 G=169 B=157 - RGB - PROCESS - 0 - 169 - 157 - - - R=41 G=171 B=226 - RGB - PROCESS - 41 - 171 - 226 - - - R=0 G=113 B=188 - RGB - PROCESS - 0 - 113 - 188 - - - R=46 G=49 B=146 - RGB - PROCESS - 46 - 49 - 146 - - - R=27 G=20 B=100 - RGB - PROCESS - 27 - 20 - 100 - - - R=102 G=45 B=145 - RGB - PROCESS - 102 - 45 - 145 - - - R=147 G=39 B=143 - RGB - PROCESS - 147 - 39 - 143 - - - R=158 G=0 B=93 - RGB - PROCESS - 158 - 0 - 93 - - - R=212 G=20 B=90 - RGB - PROCESS - 212 - 20 - 90 - - - R=237 G=30 B=121 - RGB - PROCESS - 237 - 30 - 121 - - - R=199 G=178 B=153 - RGB - PROCESS - 199 - 178 - 153 - - - R=153 G=134 B=117 - RGB - PROCESS - 153 - 134 - 117 - - - R=115 G=99 B=87 - RGB - PROCESS - 115 - 99 - 87 - - - R=83 G=71 B=65 - RGB - PROCESS - 83 - 71 - 65 - - - R=198 G=156 B=109 - RGB - PROCESS - 198 - 156 - 109 - - - R=166 G=124 B=82 - RGB - PROCESS - 166 - 124 - 82 - - - R=140 G=98 B=57 - RGB - PROCESS - 140 - 98 - 57 - - - R=117 G=76 B=36 - RGB - PROCESS - 117 - 76 - 36 - - - R=96 G=56 B=19 - RGB - PROCESS - 96 - 56 - 19 - - - R=66 G=33 B=11 - RGB - PROCESS - 66 - 33 - 11 - - - - - - Grayscale - 1 - - - - K=100 - GRAY - PROCESS - 255 - - - K=90 - GRAY - PROCESS - 229 - - - K=80 - GRAY - PROCESS - 204 - - - K=70 - GRAY - PROCESS - 178 - - - K=60 - GRAY - PROCESS - 153 - - - K=50 - GRAY - PROCESS - 127 - - - K=40 - GRAY - PROCESS - 101 - - - K=30 - GRAY - PROCESS - 76 - - - K=20 - GRAY - PROCESS - 50 - - - K=10 - GRAY - PROCESS - 25 - - - R=241 G=241 B=242 - GRAY - PROCESS - 12 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - endstream endobj 2 0 obj <> endobj 13 0 obj <> endobj 19 0 obj <> endobj 88 0 obj <> endobj 94 0 obj <> endobj 163 0 obj <> endobj 167 0 obj <> endobj 173 0 obj <> endobj 174 0 obj [/View/Design] endobj 175 0 obj <>>> endobj 168 0 obj [/View/Design] endobj 169 0 obj <>>> endobj 164 0 obj [/View/Design] endobj 165 0 obj <>>> endobj 95 0 obj [/View/Design] endobj 96 0 obj <>>> endobj 89 0 obj [/View/Design] endobj 90 0 obj <>>> endobj 20 0 obj [/View/Design] endobj 21 0 obj <>>> endobj 14 0 obj [/View/Design] endobj 15 0 obj <>>> endobj 162 0 obj [173 0 R 167 0 R 163 0 R] endobj 5 0 obj <>/ArtBox[0.0 1.0 499.0 256.0]/Group 231 0 R/MediaBox[0.0 0.0 500.0 256.0]/Thumb 239 0 R/TrimBox[0.0 0.0 500.0 256.0]/Resources<>/Shading<>/ColorSpace<>/Font<>/ProcSet[/PDF/Text]/Properties<>/ExtGState<>>>/Type/Page/LastModified(D:20100511113049+01'00')>> endobj 230 0 obj <>stream -H‰Ü—M$G†ïõ+ò¸{¨šüþ¸îxABZ5-a»kèü÷yÞ¬Êê®òHF¶/v_º#:#2"2ÞøxøÓ£yøðhÍ»/Íd—š‹ù4=üþÉšOßMÖX“¬5>eóßL§÷8õ°Ê¸UæÛiý_çæíàŸÍ¿§wÔe)»¸¯­qæòqšíbƒ7—gS“‘r¾|pÆWsy™Þ\¾y{ùg?ïÖóVG1ª5Î^þ>½ù×8p§Ðu…}ó—oÞÎο¹¼ýÛåÓûËÁV¿Úú%Öz»øœ m©Þ™—áÊR]0¾,)6Óø²ÕèW·¸RÌót¤¯SK­¦Ä%4g‚4y“¢iP)-%W‰èë C\b‰&rŸO#0*WL©ñ<ÈëTÓ’CÜÈ֖括n¥gÓâZ5Ñ/­yDOŒ+Œ¶„ň\çÂ’mÿÛa”bÀ©Bú@#ìùåã~Üg\(]W@…з$ét 0ÅÉÖŠÇ.Ëä‡(Ëy)Éñ#ùZùUÃãZ°M Îí$ñÍ6#b\wïÃ3[·ïõtN—´DŒ“©¶‡“Û IÛ¥ÔbjYb“|\Z̦ťXâoëâd›%ýÑÎ48‹¨8ŽÇB…óŠ®ÈN¥%ñ{Ù—Üv†O˜êý*ïzGG’ªvïOœë“Ý’** éw6j·`£e¾_J¯qÍz8è®Ï– Ѷ–‚#‡'l¸l=²èIuQæZÒȽAîÉ7×)c½ ܶ@šDsÂõs/B*NŸz•àãR Bq.úâcvGâvÆqs¶p³^³%PÏ/Ó»¯ÌÃÓgk¾ûlÞe¾ìåõò÷ðøäÌãS¯rÖ˜§Ç?NÉ|o¢ù@ɤx‰ëzÌCÛ:È%úëeš}O[´‚à„±k¹˜Ë’ TIŠ>TU(  ÆvOÒWj§›ÌßIŽ£j‰”Ìq@yîN“Πh§gâh{o,Çòå€@•ETÁîgW6u@·åÜ­rü—¤˜DuUJ8£’B½çø°Ø²‰ ^Õ¹ñ#«ZènϲÂÅÜómçHÎ7ªêᔲ·èGRWë"h%G’ý’³—²x™‡Ð)¬ù•“uñÂ)ç»MãLm˜½ EêéŒVéwµncQb¶Õ &×zŸÈ«Í… -9GÞ$–C¯[– ´ÝÏà„mk|R¿q£‰!¹ºú´rˆsŠÝ&l,ëSôˆ6·úÕ\îüá”,¼çzEÔ•”Rlè3zÊ‚k¾çPì8’§=â%ßá%oIïÍ<ãdÐ'¼ø/þGÊó¯Ù§»à5Ô¾Ç$FP‚òžI ZK©qÖEÃ<Ñ­c2©L¢ŒDÁv¨$*»na"a¾ð}µÒD”˜Ì˜br¹©Ç8Þ×D¦¤B!Åi©»§%¬í³i‘«Z·ˆve2¦[­Pø`¯}m}«<0$Ï ûyU U œÒh˸¥iY£ÍÄ /%G†œ©fMØé´Æ[gZës¨‚Ó+` }ªlÚv«ëþ9RáPY»L–¬Ê„ -‰â-dŸ^ä5$k¯±EóÝŒÁ¾5 ôØ|­¡/;‰åÕQ&IRP^’ý>‹/-Üí:þçB›3. -òOFAþÅ‘ýkvélR8¢iMÜ—©².0Çï‰][Àà¢F¼¡¤°›êk€êH_'Ž D«g5ñ lFZ`w<iîU ýÚAÊ^0®¶4 -Çót¤‘e³ 핦±Ø0…Êdµxù½n95¸x£3(² †˜vèÑt£Ê†LÀéƒ70ŸXÀóÅ´Ã_Vµáð¯xþÏ7… FíU.ËëU¦v‡ŒY˜S’ÕHÎ ·ßêb¯‹~÷bÍÿáìû†¯ÿ 0zÎJå endstream endobj 231 0 obj <> endobj 239 0 obj <>stream -8;X-@gC;%S#\6R%X2E_"L<2VcVr8A0SB/(V+Tb;U*8nR*57W1XCZHY*Dm2qqLf8Fk -ZWG,O:sW%ZLm*4>fDd5q"4Y3l8JLqM]mdk?[ -mkGe*KmE.Z7Y@WBRggj[o7T8!D9mo]RgoT`?Gm=IXJ,*Pk2<,h;T6q4XPM%iHfa'i -X\EQrY+Ooc^p3>8DpI*VTr"7G[E,qd40]6Ml;=]L3=37JGt5drVgZNJ&Mpj,%lh_a -_%d7Em(q=q8mSYQisojS\b@_&DtE\SWD'Y3d`P$BT?dLK89;i~> endstream endobj 216 0 obj <> endobj 224 0 obj <> endobj 227 0 obj <> endobj 228 0 obj <> endobj 206 0 obj <>/ExtGState<>>>/BBox[-14.8945 277.798 273.146 119.338]>>stream -0 g -1 i -/GS0 gs --14.895 277.798 288.041 -158.46 re -f -q -/Fm0 Do -Q - endstream endobj 229 0 obj [0.0] endobj 193 0 obj <> endobj 205 0 obj <>/ColorSpace<>/ExtGState<>>>/BBox[-14.8945 277.798 273.146 119.338]>>stream -q -215.399 178.843 m -212.793 178.843 210.248 178.581 207.787 178.088 c -192.902 213 158.27 237.475 117.92 237.475 c -63.987 237.475 20.267 193.753 20.267 139.821 c -20.267 117.813 27.549 97.508 39.833 81.178 c -33.879 74.392 30.262 65.505 30.262 55.768 c -30.262 34.474 47.525 17.21 68.819 17.21 c -85.634 17.21 99.927 27.979 105.199 42.992 c -109.363 42.45 113.608 42.168 117.92 42.168 c -122.124 42.168 126.268 42.435 130.332 42.95 c -135.57 27.874 149.894 17.048 166.752 17.048 c -188.047 17.048 205.309 34.311 205.309 55.605 c -205.309 65.301 201.723 74.152 195.814 80.927 c -200.787 87.493 204.946 94.707 208.147 102.421 c -210.498 101.973 212.92 101.729 215.399 101.729 c -236.694 101.729 253.955 118.992 253.955 140.286 c -253.955 161.581 236.694 178.843 215.399 178.843 c -W n -q -0 g -1 i -/GS0 gs --0.0000153 220.4262695 220.4262695 0.0000153 137.1108398 17.0478516 cm -BX /Sh0 sh EX Q -Q -/CS1 CS 0 0 0 SCN -1 i 10 w 4 M 0 j 0 J []0 d -/GS0 gs -q 1 0 0 1 215.3994 178.8428 cm -0 0 m --2.606 0 -5.151 -0.262 -7.613 -0.755 c --22.498 34.158 -57.129 58.632 -97.479 58.632 c --151.412 58.632 -195.133 14.911 -195.133 -39.021 c --195.133 -61.03 -187.851 -81.335 -175.567 -97.665 c --181.52 -104.451 -185.137 -113.338 -185.137 -123.075 c --185.137 -144.369 -167.875 -161.633 -146.581 -161.633 c --129.765 -161.633 -115.473 -150.863 -110.201 -135.851 c --106.036 -136.393 -101.792 -136.675 -97.479 -136.675 c --93.275 -136.675 -89.132 -136.408 -85.067 -135.893 c --79.829 -150.969 -65.506 -161.795 -48.647 -161.795 c --27.353 -161.795 -10.09 -144.532 -10.09 -123.237 c --10.09 -113.542 -13.677 -104.69 -19.585 -97.916 c --14.612 -91.35 -10.453 -84.136 -7.252 -76.422 c --4.902 -76.87 -2.479 -77.113 0 -77.113 c -21.294 -77.113 38.556 -59.851 38.556 -38.557 c -38.556 -17.262 21.294 0 0 0 c -h -S -Q - endstream endobj 197 0 obj <> endobj 198 0 obj [/ICCBased 199 0 R] endobj 199 0 obj <>stream -H‰œ–yTSwÇoÉž•°Ãc [€°5la‘QIBHØADED„ª•2ÖmtFOE.®c­Ö}êÒõ0êè8´׎8GNg¦Óïï÷9÷wïïÝß½÷ó '¥ªµÕ0 Ö ÏJŒÅb¤  - 2y­.-;!à’ÆK°ZÜ ü‹ž^i½"LÊÀ0ðÿ‰-×é @8(”µrœ;q®ª7èLöœy¥•&†Qëñq¶4±jž½ç|æ9ÚÄ -V³)gB£0ñiœWו8#©8wÕ©•õ8_Å٥ʨQãüÜ«QÊj@é&»A)/ÇÙgº>'K‚óÈtÕ;\ú” Ó¥$ÕºF½ZUnÀÜå˜(4TŒ%)ë«”ƒ0C&¯”阤Z£“i˜¿óœ8¦Úbx‘ƒE¡ÁÁBÑ;…ú¯›¿P¦ÞÎӓ̹žAü om?çW= -€x¯Íú·¶Ò-Œ¯Àòæ[›Ëû0ñ¾¾øÎ}ø¦y)7ta¾¾õõõ>j¥ÜÇTÐ7úŸ¿@ï¼ÏÇtÜ›ò`qÊ2™±Ê€™ê&¯®ª6ê±ZL®Ä„?â_øóyxg)Ë”z¥ÈçL­UáíÖ*ÔuµSkÿSeØO4?׸¸c¯¯Ø°.òò· åÒR´ ßÞô-•’2ð5ßáÞüÜÏ ú÷Sá>Ó£V­š‹“då`r£¾n~ÏôY &à+`œ;ÂA4ˆÉ 䀰ÈA9Ð=¨- t°lÃ`;»Á~pŒƒÁ ðGp| ®[`Lƒ‡`<¯ "A ˆ YA+äùCb(Š‡R¡,¨*T2B-Ð -¨ꇆ¡Ðnè÷ÐQètº}MA ï —0Óal»Á¾°ŽSàx ¬‚kà&¸^Á£ð>ø0|>_ƒ'á‡ð,ÂG!"F$H:Rˆ”!z¤éF‘Qd?r 9‹\A&‘GÈ ”ˆrQ ¢áhš‹ÊÑ´íE‡Ñ]èaô4zBgÐ×Á–àE#H ‹*B=¡‹0HØIøˆp†p0MxJ$ùD1„˜D, V›‰½Ä­ÄÄãÄKÄ»ÄY‰dEò"EÒI2’ÔEÚBÚGúŒt™4MzN¦‘Èþär!YKî ’÷?%_&ß#¿¢°(®”0J:EAi¤ôQÆ(Ç()Ó”WT6U@ æP+¨íÔ!ê~êêmêæD ¥eÒÔ´å´!ÚïhŸÓ¦h/èº']B/¢éëèÒÓ¿¢?a0nŒhF!ÃÀXÇØÍ8ÅøšñÜŒkæc&5S˜µ™˜6»lö˜Iaº2c˜K™MÌAæ!æEæ#…åÆ’°d¬VÖë(ëk–Íe‹Øél »—½‡}Ž}ŸCâ¸qâ9 -N'çÎ)Î].ÂuæJ¸rî -î÷ wšGä xR^¯‡÷[ÞoÆœchžgÞ`>bþ‰ù$á»ñ¥ü*~ÿ ÿ:ÿ¥…EŒ…ÒbÅ~‹ËÏ,m,£-•–Ý–,¯Y¾´Â¬â­*­6X[ݱF­=­3­ë­·YŸ±~dó ·‘ÛtÛ´¹i ÛzÚfÙ6Û~`{ÁvÖÎÞ.ÑNg·Åî”Ý#{¾}´}…ý€ý§ö¸‘j‡‡ÏþŠ™c1X6„Æfm“Ž;'_9 œr:œ8Ýq¦:‹ËœœO:ϸ8¸¤¹´¸ìu¹éJq»–»nv=ëúÌMà–ï¶ÊmÜí¾ÀR 4 ö -n»3Ü£ÜkÜGݯz=Ä•[=¾ô„=ƒ<Ë=GTB(É/ÙSòƒ,]6*›-•–¾W:#—È7Ë*¢ŠÊe¿ò^YDYÙ}U„j£êAyTù`ù#µD=¬þ¶"©b{ųÊôÊ+¬Ê¯: !kJ4Gµm¥ötµ}uCõ%—®K7YV³©fFŸ¢ßY Õ.©=bàá?SŒîÆ•Æ©ºÈº‘ºçõyõ‡Ø Ú† žkï5%4ý¦m–7Ÿlqlio™Z³lG+ÔZÚz²Í¹­³mzyâò]íÔöÊö?uøuôw|¿"űN»ÎåwW&®ÜÛe֥ﺱ*|ÕöÕèjõê‰5k¶¬yÝ­èþ¢Ç¯g°ç‡^yïkEk‡Öþ¸®lÝD_p߶õÄõÚõ×7DmØÕÏîoê¿»1mãál {àûMśΠnßLÝlÜ<9”úO¤[þ˜¸™$™™üšhšÕ›B›¯œœ‰œ÷dÒž@ž®ŸŸ‹Ÿú i Ø¡G¡¶¢&¢–££v£æ¤V¤Ç¥8¥©¦¦‹¦ý§n§à¨R¨Ä©7©©ªª««u«é¬\¬Ð­D­¸®-®¡¯¯‹°°u°ê±`±Ö²K²Â³8³®´%´œµµŠ¶¶y¶ð·h·à¸Y¸Ñ¹J¹Âº;ºµ».»§¼!¼›½½¾ -¾„¾ÿ¿z¿õÀpÀìÁgÁãÂ_ÂÛÃXÃÔÄQÄÎÅKÅÈÆFÆÃÇAÇ¿È=ȼÉ:ɹÊ8Ê·Ë6˶Ì5̵Í5͵Î6ζÏ7ϸÐ9кÑ<ѾÒ?ÒÁÓDÓÆÔIÔËÕNÕÑÖUÖØ×\×àØdØèÙlÙñÚvÚûÛ€ÜÜŠÝÝ–ÞÞ¢ß)߯à6à½áDáÌâSâÛãcãëäsäüå„æ æ–çç©è2è¼éFéÐê[êåëpëûì†ííœî(î´ï@ïÌðXðåñrñÿòŒóó§ô4ôÂõPõÞömöû÷Šøø¨ù8ùÇúWúçûwüü˜ý)ýºþKþÜÿmÿÿ ÷„óû endstream endobj 200 0 obj <> endobj 177 0 obj [/ICCBased 199 0 R] endobj 201 0 obj <> endobj 202 0 obj <> endobj 203 0 obj <> endobj 204 0 obj <> endobj 196 0 obj /DeviceGray endobj 220 0 obj <> endobj 222 0 obj <> endobj 223 0 obj <> endobj 236 0 obj <>stream -H‰bd`ab`dd”wŽrÓvtO,JÌÍÏK (Ê×uÊÏIñ,IÌÉL)Ñþ!ÍøC„EîaW<ÓÑßÞ¿Ê°,ø%Ä*ËÀ°v ï÷×üßß ^þ)-ÄÀÄÈøæ—s~AeQfzF‰‚F²¦‚‘ˆ4TpLÉOJU®,.IÍ-VðÌKÎ/*È/J,IMÑSpÌÉQi*VJ-N-* †êëåóJ\R‹õŒÌu, Œô Áœ¬Y¬šY’‘Z¤¨P”šž 4¿(5E¡¤(1%57±([!$ƒÄMÃã…Ì< Y -¡y™ ^p P°X!1/EhJ>Ø–äüÒ¼’¢L ‹ôÝ‚C* R RRÓ€À‡ ° ~Œª?:º÷þx³—HªìeîfùÑñ3àOÛ÷¾ßGEÛ}ŸÌúýÛo…ßD¿ƒ8&±ÿa‹³¿ÛýòÙ~ì±~ƒx|?koÜÛøÝøRwù÷«åB‹~tý–ø.!|GøÖŸF¢Ñ™õùÉòÙ¥yyŹlﾯ›w`ƺÙ[%'vôµôÈEuªTd×5·t7õ5/¯–˜ÛØÛPŸþ;ðÏ!‰ì†íÍK¤ç-ì›5Q~ËWÖ¥S'L](=}BM]Ÿüäô)YÓ‹9Š§/¨Y.}íÔéÝ‹å;§5Liêà()ÍÍ+—Îo:¹©I¾srϤI½k§ì›µq5Çú•ó×n’ÚX°>PNø•‹èÜ™ e¹Ùy)ò9±©¥Ò m}ý¦ÌŸ>Kþú±ë×Ió•Ïÿ©1û÷Š™ß3f^ëþ½}.Û÷“þÜ™u}Ò§éìÕ³Arëf~ÏÉ­É–›yÒëéœr ܧ6ÿçá<Àõ]Œ»‡‡ ÀUœ7½ endstream endobj 221 0 obj <> endobj 235 0 obj <>stream -H‰|P}Hg¾sz^·4cÞâŒé’¡¥]jƒ}vs¶J[ÒÔ²ÉH“k39¹djÚN­É]îrIÌ]bmˆmuÕ²~¤ë´¥J‘†°±mPG‘2ÊdŒÂ -ëï™ ¸;Ë`íýãá÷üž÷}Þ‡E*+Emïw8>lÝÑÜæ¢]>Êïé ©—Þ¥z=šØ ›PùùJy‹Î 4)Å-•'J/T½ˆ ùéÍpõYøçs÷K[k -}Tj¡úB´÷XwlsoM;5´ƒfu„ŽP Hú`ŸßMÑ}í -’hîíµGp t¿¶ì´9lªî‚=dÀ^¶¿º³éµFÛ£coÞ`7I Éc^ÕŸ&= H»<¤ÏE(Mù=ú?Q€×T/Ðé÷jÌT—àò{v©.ÔÆ/nêSöª‰vµ:…úH`oò(¢žW7ý…"ï!­°Ëœ°$?ZBU´.=%TÊÜZG™Ã`RùÆ ì†é*øS€R0@”¥ê2æܘánEå˜|Ç MŠÆôkFniAÖ+ZFųRzm+qWE«ÁÆŒ:Y³“ 3B0Í—wâ·–b?ꬒ(|Ý©:§È¤ÖËíÕ³Éäó·ØJ¶ëÀ¤%¾˜Hepâ1ÿµô`<'ùÈcb¸µwûGOÆö™Ê8ö676ÉZ’Q6ΚX–碖ˆ‡mïo‡Îñ"~ïÒÔü=Ó÷Ø XôrIX¤úᛧåý‹ÉšqY!nÀ²\2Ìdø(ñ‘!K¨ç£wB”òR¨#‚>gWËÉã<“ KN\Mä®Ä &˜Â–‹1~Õ’›™þC,FNŒ ‡q¥êwh»É†½>’JOÌ\ íˆÂ·~úâJnÒy‘MâÄ þxo¬Õ¤ÌaÍìØyÆN~&D£§ŸêÜ+ŽLGϤñÕüÔeˆ›ôpŽûR®Í¿C«0Ps6(fX[”ˆ+° Ä ñ[‰Kf1ªæ3ùB{úº†"Œ’˜ìhݹaaØ]¯ì¨Þíá̃¼Ö†1^MÜŒ/,ÎŮ鬵ÿ°8˜¨ëIF3ËõD¾]>opwû?¶7Ìún}u}涙ÈÏS—]fý‰ÜÚ¶œòEvŸýYPæ'1ø“Tþ-û«ôw¦ú‰v- ýÙAÉgqøT~]•þšØdžj¯ë6ž†µÏÀÚ3ºÍqþ·C¸6 endstream endobj 179 0 obj <> endobj 184 0 obj <> endobj 187 0 obj <> endobj 189 0 obj <> endobj 185 0 obj <>stream -H‰b`Ú ÀÀ endstream endobj 180 0 obj <> endobj 181 0 obj <> endobj 182 0 obj <> endobj 219 0 obj <>/ExtGState<>>>/BBox[-14.8945 277.798 273.146 119.338]>>stream -/CS0 cs 1 1 1 scn -1 i -/GS0 gs -q 1 0 0 1 273.1465 198.5684 cm -0 0 m -0 -43.758 -64.479 -79.23 -144.02 -79.23 c --223.561 -79.23 -288.041 -43.758 -288.041 0 c --288.041 43.757 -223.561 79.23 -144.02 79.23 c --64.479 79.23 0 43.757 0 0 c -f -Q - endstream endobj 192 0 obj <> endobj 237 0 obj [/Indexed/DeviceRGB 255 238 0 R] endobj 238 0 obj <>stream -8;X]O>EqN@%''O_@%e@?J;%+8(9e>X=MR6S?i^YgA3=].HDXF.R$lIL@"pJ+EP(%0 -b]6ajmNZn*!='OQZeQ^Y*,=]?C.B+\Ulg9dhD*"iC[;*=3`oP1[!S^)?1)IZ4dup` -E1r!/,*0[*9.aFIR2&b-C#soRZ7Dl%MLY\.?d>Mn -6%Q2oYfNRF$$+ON<+]RUJmC0InDZ4OTs0S!saG>GGKUlQ*Q?45:CI&4J'_2j$XKrcYp0n+Xl_nU*O( -l[$6Nn+Z_Nq0]s7hs]`XX1nZ8&94a\~> endstream endobj 232 0 obj [/ICCBased 199 0 R] endobj 156 0 obj <> endobj 157 0 obj <> endobj 158 0 obj <>stream -%!PS-Adobe-3.0 %%Creator: Adobe Illustrator(R) 13.0 %%AI8_CreatorVersion: 13.0.0 %%For: (Aleks Kissinger) () %%Title: (web_logo.ai) %%CreationDate: 5/11/10 11:30 AM %%BoundingBox: -36 -99 535 228 %%HiResBoundingBox: -36 -99 535 228 %%DocumentProcessColors: Cyan Magenta Yellow Black %AI5_FileFormat 9.0 %AI12_BuildNumber: 406 %AI3_ColorUsage: Color %AI7_ImageSettings: 0 %%RGBProcessColor: 0 0 0 ([Registration]) %AI3_Cropmarks: 0 -63 499 192 %AI3_TemplateBox: 250.5 63.5 250.5 63.5 %AI3_TileBox: -56 -332 556 460 %AI3_DocumentPreview: None %AI5_ArtSize: 500 256 %AI5_RulerUnits: 6 %AI9_ColorModel: 1 %AI5_ArtFlags: 0 0 0 1 0 0 1 0 0 %AI5_TargetResolution: 800 %AI5_NumLayers: 3 %AI9_OpenToView: -55.6665 241.6665 1.5 979 715 18 0 0 114 73 0 0 1 1 1 0 1 %AI5_OpenViewLayers: 777 %%PageOrigin:0 64 %AI7_GridSettings: 72 8 72 8 1 0 0.8 0.8 0.8 0.9 0.9 0.9 %AI9_Flatten: 1 %AI12_CMSettings: 00.MS %%EndComments endstream endobj 159 0 obj <>stream -%%BoundingBox: -15 -73 507 214 %%HiResBoundingBox: -14.8945 -72.334 506.334 213.7983 %AI7_Thumbnail: 128 72 8 %%BeginData: 15860 Hex Bytes %0000330000660000990000CC0033000033330033660033990033CC0033FF %0066000066330066660066990066CC0066FF009900009933009966009999 %0099CC0099FF00CC0000CC3300CC6600CC9900CCCC00CCFF00FF3300FF66 %00FF9900FFCC3300003300333300663300993300CC3300FF333300333333 %3333663333993333CC3333FF3366003366333366663366993366CC3366FF %3399003399333399663399993399CC3399FF33CC0033CC3333CC6633CC99 %33CCCC33CCFF33FF0033FF3333FF6633FF9933FFCC33FFFF660000660033 %6600666600996600CC6600FF6633006633336633666633996633CC6633FF %6666006666336666666666996666CC6666FF669900669933669966669999 %6699CC6699FF66CC0066CC3366CC6666CC9966CCCC66CCFF66FF0066FF33 %66FF6666FF9966FFCC66FFFF9900009900339900669900999900CC9900FF %9933009933339933669933999933CC9933FF996600996633996666996699 %9966CC9966FF9999009999339999669999999999CC9999FF99CC0099CC33 %99CC6699CC9999CCCC99CCFF99FF0099FF3399FF6699FF9999FFCC99FFFF %CC0000CC0033CC0066CC0099CC00CCCC00FFCC3300CC3333CC3366CC3399 %CC33CCCC33FFCC6600CC6633CC6666CC6699CC66CCCC66FFCC9900CC9933 %CC9966CC9999CC99CCCC99FFCCCC00CCCC33CCCC66CCCC99CCCCCCCCCCFF %CCFF00CCFF33CCFF66CCFF99CCFFCCCCFFFFFF0033FF0066FF0099FF00CC %FF3300FF3333FF3366FF3399FF33CCFF33FFFF6600FF6633FF6666FF6699 %FF66CCFF66FFFF9900FF9933FF9966FF9999FF99CCFF99FFFFCC00FFCC33 %FFCC66FFCC99FFCCCCFFCCFFFFFF33FFFF66FFFF99FFFFCC110000001100 %000011111111220000002200000022222222440000004400000044444444 %550000005500000055555555770000007700000077777777880000008800 %000088888888AA000000AA000000AAAAAAAABB000000BB000000BBBBBBBB %DD000000DD000000DDDDDDDDEE000000EE000000EEEEEEEE0000000000FF %00FF0000FFFFFF0000FF00FFFFFF00FFFFFF %524C45FDFCFFFD86FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFFFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8A8FFA8A8A8 %FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8 %A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8 %FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8 %A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8 %FFFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8A8FFFD1FA8FFFD5EA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFFFFFA8FFA8FD05FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFFFA8A8A8FF %A8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8FFA8FFA87D52522727F8272752 %527DA8FFA8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FF %A8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8 %A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FF %A8A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA87D27F8F8 %272752527D52522727F8F827527DFFFFFFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFFD12A8FFA8A827F8F8277DA8A8FD08FFA87D52 %F8F827A8A8FFFD52A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA852 %F8277DFD11FF7D27F8277DFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8FF7DF8F87DA8FFFFFFA8 %FFFFFFA8FFFFFFA8FFFFFFA8FD04FFA8F8F852FFA8A8A8FFA8A8A8FFA8A8 %A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FF %A8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8 %A8FFA8A8A8FFA8A8A8FFFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF52F827 %FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FD05FF52F827FFFFFFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8A8FFFD0EA8F8F87DFFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF7DF8F8FD4FA8FFA8FF %A8FFA8FFA8FFA8FFA8FFFFFF27F8A8FFA8FFFFFFA8FFFFFFA8FFFFFFA8FF %FFFFA8FFFFFFA8FFFFFFA8FFFFFFA827F8A8FFFFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFFFA8A8A8FFA8A8A8FFA8A8A8FF27F87DFFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA827F8A8A8FFA8 %A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8 %FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8 %A8A8FFA8A8A8FFA8A8A8FFA8A8FFA8FFA8FFA8FFA8FFA8FFA8FF27F8A8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA827F8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFFD0AA8FF52F87DFF %A8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8 %A8FFA8FF7EF827FFFD4AA8FFA8FFA8FFA8FFA8FFA8FFA8F852FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FF7DF87DFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8A8FFA8A8A8FFA8A8A8 %27F8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8 %A8A8FFA8A8A8FFA8A8A8FF27F8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8 %FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8 %A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFFFA8FF %A8FFA8FFA8FFFF7DF87DFFFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8A8F87DFD04FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8A8FFFD07A8FF2727FD14A87DFD14A852F87D527D7DA8A8FFFD42 %A8FFA8FFA8FFA8FFA8FF7DF87DFFA8A9A8FFA8A9A8FFA8A9A8FFA8FFA87D %2727F8FD04277DA8FFA8FFA8A9A8FFA8A9A8FFA8A9A8FFA827F827F8F8F8 %52A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFFFA8A8A8FFA8A8A852F8FD0EA8FF7D27FD05F827F8 %F8F8277DFD0FA87DA8A8A87D52F8F852FFA8FFA8A8A8FFA8A8A8FFA8A8A8 %FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8 %A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8FFA8FFA8FFA8FFA8FF %F852FD0DA8FF7D27F827F827F827F827F827F8277DFFFD0DA8FFA8A9A8FF %A8A852F852FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFFD06A8FF7DF87DA8A8A87EA8A8A87EA8A8A87EA8 %7DF8F827F827F827F827F827F827F8277DA87EA8A8A87EA8A8A87EFD05A8 %7DFD05A852F852FFFD3EA8FFA8FFA8FFA8FFFF7DF8FD0CA8A9A827F82727 %27F8272727F8272727F827F827FD0BA8FF7D52272727527DFFA8FF52F87D %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8A8FFA8A8A8FF2727FD04A87DA8A8A87DFD04A87DF827F827F827 %F827F827F827F827F827F87DFD04A87DA8A8A884A852F8F827F827F8277D %A8A8A8F827A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8 %FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8 %A8A8FFA8A8A8FFFFA8FFA8FFA8FFA82727FD0DA8FD0427F8272727F82727 %27F8272727F82727FD09A85227F827F8272727F8277DA8A87DF8A8A8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8A8FF %FD06A8F852A8A87DA87DA87DA87DA87DA87D27F827F827F827F827F827F8 %27F827F827F8277DA87DA87DA87DA88427F827F827F827F827F852A8A87D %F852FFFD3CA8FFA8FFA8FFA8FFA82752FD0CA87DF8FD132752A8A8A87DA8 %A87DF8FD0A27A87DA82752FFFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFFFA8A8A8FFA8A8F87D7DA87DA87DA87DA8 %7DA87DA85227F827F827F827F827F827F827F827F827F827F8F8F8FD0527 %F827F827F827F827F827F8277DA87D2727FFA8FFA8A8A8FFA8A8A8FFA8A8 %A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FF %A8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8FFA8FFA8FFA8FFA8F852A87D %A87DA8A8A87DFD04A87DFD1227F82727FD067D52FD0627F827F8F8F8A87D %A82752FFFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFFD07A8F852FD057DA87DA87DA87DA87D27F827F827F827F827 %F827F827F827F827F82752A8A8A87DA87DA87D27F827F827FD05F8277DA8 %7DF827FFFD3CA8FFA8FFA8FFA8FFA82752A87DA87DA87DA87DA87DA87DA8 %FD1327A8A8A87DA884A87DA852FD09F852A87D7DF87DFFFFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8A8FFA8A8A8 %FF2727FD0D7D52F827F8272727F8272727F8272727F827F8527DA87DA87D %A8FD047DFD08F82E847DA827F8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8 %FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8 %A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFFFA8FFA8FFA8FFA852F8A87DA87D7D %7DA87D7D7D7E7DA87D27F827F8272727F8FD0727F8277DA87DA87D7D7D7E %7D7D7DA82727F8F8F82752A87DA87DF852FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8A8FFFD05A8FF52F8FD0E7D %27FD0FF827FD0E7D5252FD067D27F8FD3FA8FFA8FFA8FFA8FFA8A8F8FD0E %7DA827FD0DF827A8FD0F7DA87D7D7DA87D27F8A8FFFFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFFFA8A8A8FFA8 %A8A82727FD0F7DFD0DF8FD157D27F8F8A8A8FFA8A8A8FFA8A8A8FFA8A8A8 %FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8 %A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8FFA8FFA8FFA8FFA8FF %52F8FD0F7D27FD0BF827FD0F7D5227522727F8F827FFFFFFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFFD09 %A8F8527D7D527D527D527D527D527D7D52F8F8275252522752527D27F8F8 %7D7D7D527D527D527D527D527D7D52F827F82727527DFFFD42A8FFA8FFA8 %FFA8FFA8FFFF52F8FD0D7D27F852FD097D52F827FD0D7D2727A8FFA8FFFF %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8A8FFA8A8A8FFA8FF7DF8277D527D527D527D527D %527D52F8277D527D527D527D527D527D27F8527D527D527D527D527D527D %52F852FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8 %A8FFA8FFA8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FF %A8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFFFA8FFA8FFA8FFA8FFA8FF52F852 %7D527D7D7D52FD047D27F87D527D7D7D527D7D7D527D7D7DF8277D7D527D %7D7D52FD047D2727FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFFD05A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8A8FFFD0AA8F827527D52 %7D527D527D5952F852527D527D527D527D527D527D5252F852537D527D52 %7D527D5227F8FD09A87DA87DA87DA87DA87DA87DFD04A8FFA8A8A8FFA87D %527D7DA8A8FFA87D7DA87DA87DA87DA87DFD08A87D7DA87DA87DA87DA87D %A87DFD07A8FFA8FFA8FFA8FFA8FFA8FFFF52F87D527D7D7DFD0452F8277D %7D527D527D527D527D527D527D7D27F8FD04527D7D7D537DF827FFFFA8FF %A8FFA8FF7D7D7DA8FD057DA87D7D7DA87DA8A8FFA8FFA8FFA87D7DA8A8FF %A8A87DA87DA87DA8FD047DA8FFA8A87DA8A8FF7D7D7DA87D7D7DA8A8A87D %7DA8FFA8FFA8FFA8FFFFA8A8A8FFA8A8A8FFA87DF852527D5228FD06F827 %7D5259527D5259527D5259527D527D27FD06F827527D5252F87DA8A8A8FF %A8A8A87DA8FFA8FF7D7D7DFFA8FF7DA87D7D52FD04A8FFA8A8527DA8A8A8 %FF7D7DA8FFA8FFA8A87D7D7DFFA8A8527D7DFF7D7DA8FFA8A87D7D7DFFA8 %A87DFD04A8FFA8A8FFA8FFA8FFA8FFA8FFA8FF2727527D5227FD07F82752 %7D527D527D527D527D527D527D5227FD07F827527D7D27F8FFA8FFA8FFA8 %A87DFFA8FFA87D7D7DA8FFA8A87DA87D7DA8FFA8FFA8FF7D7D7DFFA8FFA8 %A8A8FFA8FFA8A87D7D7DFFA8FFA87D7DFFA8A8A8FFA8FF7D7D7DA8A8FFA8 %A8A8FFA8FFA8FFA8FFFD08A8FF7DF8277D5252FD09F827FD0D5227FD09F8 %52527D52F87DFFFD0AA87D7D7DFD06A8FFFD07A87D7DA8A8FFA8A8A8FFFD %04A87D7D52FD04A8FFFD0AA8527D7DFFA8FFFD08A8FFA8FFA8FFA8FFA8FF %FF7DF853527DFD0BF87D527D527D527D527D527D527DFD0BF87D527DF87D %FFFFA8FFA8FFA8FFA8FFA8A87D7DA8FFA8FFA8FFA8A8A8FFA8FFA8A87DA8 %A8FFA8FFA8FFA8FFA8FF7D7D7DA8A8FFA8FFA8A87DA8A8FFA8FFA8FF7D7D %7DA8A8FFA8FFA8FFA8FFA8FFA8FFA8A8FFA8A8A8FFA8FF52F8525252FD0B %F82753FD0A5227FD0BF85253522727FFA8A8A8FFA8A8A8FFA8A87D7D7DA8 %A8FFA8A87D7D52A8A8FFA8A87D7D7DA87D7D7DA8A8FFA8FFA87D7D7DA8FF %FD04A87D7D7DFFA8A8A8FFA8A8527D7DFFA8FFA8A8A8FFA8A8A8FFFFA8FF %A8FFA8FFA8FFFF52F87D5252FD0BF852525352525253525252535252FD0B %F852527D2727A8FFA8FFA8FFA8FFA8FFA87D7D7DA8FFA8FFA8A87D7DA8FF %A8FFA87D7DA87DA87D7D7DFFA8FFA87D7D7DA8FFA8FFA8FF7D7D7DA8A8FF %A8FFA8FFA87D7DA8A8FFA8FFA8FFA8FFA8FFA8A8FFFD07A8FF52F8525252 %FD0BF827FD0B5227FD0BF85252522727FFFD0AA87D7D7DFD04A8FFA87D52 %FD05A87D7D7DA8A87D527DFD04A87D7D7DFFFD06A87D7D7DFFFD06A87D7D %7DFFFD0AA8FFA8FFA8FFA8FFA8FFFF7DF852525200FD0AF8FD065253FD06 %52FD0AF827525253F852FFFFA8FFA8FFA8FFA8FFA87D7DA8A8FFA8FFA8A8 %7D7DA8FFA8FF7D7D7DFFA8A87DA8A8FFA8A87D7D7DFFA8FFA8FFA8FFA87D %7DA8A8FFA8FFA8FFA87D7DA8A8FFA8FFA8FFA8FFA8FFA8FFFFA8A8A8FFA8 %A8A8FF7DF827525252FD09F852525227FD07F82752522EFD09F852525227 %F87DFFA8FFA8A8A8FFFD04A87D7D7DFD04A8FFA87D52A8A8FF7D7D7DA87D %7D7DA8A8FFA8A87D7D7DA8A8FFFD06A87D7D7DFFA8FFFD04A87D7D7DFFA8 %A8A8FFA8A8A8FFA8A8FFA8FFA8FFA8FFA8FFA8FF272752535252FD07F852 %52535227F87D5252527D272752595252FD07F85252535227F8FFA8FFA8FF %A8FFA8FFA8FFA87D7D7DA8FFA8FFA8A87D7D7DFFA8A87DA87D7D7DA8FFFF %A8FFA87D7DA8A8FFA8FFA8FF7DA8A87D7DA8A8FFA8FFA8FF7D7D7DA8A8FF %A8FFA8FFA8FFA8FFA8FFFD0AA87DF828FD04522727F82705FD0552F87DFF %FFA8FFFF7DF827FD0452F827F82727FD0552F852FD09A8FFA8A87D7D7DFD %04A8FFA87D52A8A8A87D7D7DFF7D7D7DA87DA8A87D7D7DA8FFA8FFA8FF7D %7DA8A87D7D7DFFA8A8A8FFA8A8527D7DFFFD0AA8FFA8FFA8FFA8FFA8FFA8 %FFFF52F852597D527D527D527D527D527DF852A8FFA8FFA8FFFF52F85259 %7D527D527D527D527D527DF827A8FFA8FFA8FFA8FFA8FFA8A8FD057DA8A8 %FFA8A87D7D7DFFA87D7DFFA8A87D7D7DA8A8A87D7D7DA87DA87DA87D7D7D %FF7D7D7DA8A8FFA8FFA8A8FD047DA8FFA8FFA8FFA8FFA8FFA8FFA8A8FFA8 %A8A8FFA8A8A8FFA827F852527D527D527D527D5352F827A8FFA8FFA8A8A8 %FFA827F852527D527D527D527D5352F827A8FFA8FFA8A8A8FFFD04A87DA8 %7DA8A8A87DFFA8A87DFD05A87DA8A8FFA8A87DFFA8A87DA87DA87DA87DA8 %7DA87DFD05A87DFD05A87DA87DA87DA8A8FFA8A8A8FFA8A8A8FFFFA8FFA8 %FFA8FFA8FFA8FFA8FFA852F827527D537D7D7D5227F827A8FFA8FFA8FFA8 %FFA8FFA852F827527D597D7D7D5227F827A8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8A8FFFD0BA8FFA87DF8F8F805F827F8F8F87DA8FFFD09A8FFA87D %F8F8F827F827F8F8F87DA8FFFD4CA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %FFFF7D7D27524B7D7DFFFFFFA8FFA8FFA8FFA8FFA8FFA8FFFFFF7D7D2752 %27527DFFFFFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFFFA8A8A8FFA8 %A8A8FFA8A8A8FFA8A8A8FFA8FFA8FFA8FFA8FFA8A8A8FFA8A8A8FFA8A8A8 %FFA8A8A8FFA8FFA8FFA8FFA8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8 %A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8 %FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8 %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFFD7FA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8A8FFA8A8A8FFA8 %A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8 %FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8 %A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8 %FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FDFC %FFFD04FFFF %%EndData endstream endobj 160 0 obj <>stream -%AI12_CompressedDataxœì=‰BÛFÓÿ øÜ/¥Í…­Õ-ÈÏ4‰H G›¦TØ\|ÅGÚôéÿ™•l –Ólª¨MÌxw´;÷ÌŽÄÆw{û›¥Vÿ(Ú´ -F>·±QFá¸?ÜÊKhþi§3‡ºýúN^À(Tzêªo£á¨Ýïmɯä—uœ}»Ô‰ÎFùçíѨÝ;‰†wò·ïÀwíq'‚oÿŒŽ;ý“~!lßá›–j8†o¢Eaä…زŒ|é (÷'½ *÷ÿÚÊoZn~3òŽåäMÓ‡¯j¿ŽF ÆTûÍI7ê÷†ýf4Uúþp´•¯| {ùá |æŽ:þŸùr'lž%¦Ôû½1 -= ‡a·ßkŠÍr¿Ó‚!÷ÎCŸŽÃN»™˜þ2ŠZQë딞:‡õv'¢vÃq>@ -—ž -ó°ˆ90Dz̼l× ¯cEŸÛÑŸ[ù—ý^D( Çûí¿Q4 к}=éDÃ7½6’U‚Úÿ‹~+ê€@ê¹õN(·-/ÿMÂáI4êw&c)ʾ¡¾ú6Â/ʉE7ØD½ƒþ[¹¾MÇ)¸® µ}°ßÀ òž€Ï>ÝHØyÏR÷ò¾jaˆ -ñ<Ͼì§v‡í“voËÈ»6ñïÉ°ÝŠÙç™yŸþ’»(ø‰ÿþŸ– ;£ž"ˆMåEB ŒÂ‹}¸e­×ªô»Húªð¿¢êIßéÏò˜>ä>䬠øiÒG¨Þ(¸Å“aø9Ê Ó/–ZíhߌŠ¥!|]¬4£V»Ó ‹µ°9GÅ—cݨ¸ËÃrÅ7zFHCB‰­6ÛCŠãNôW1ŒÇÐüP"o2òHÎÌ#š%¦Fzj›Ð·iL;1¦­Çô$ú\±Ocû4¶ŸÛ×cû´” ÐÐI<4Wœè±­ð,a± Œ¢bè]£aw1Šš({Å£I§‹0€kpZ„Ý°×:ꕆR5[«Øì¾€”œŽ‹ ª­•³Hkз+ôúãVt\,ÕŠ»£N8:ÍiÐŒz·Ý›Äƒøß/Q¯ØÌ‚sçÆñ¿ýaë8Tí^„Ÿ»á¨9éà< ¸ºû§I4ÂM¶úöŠÑ_ÍNØ•AºÚÍ°ô¬cPãvïü2NÀêu¢n¼Èñ8þ‰(Æ»=Àa3*–ˆ%%lêŸZ±2ÒkÁ’ŠQWþ#H,‘ò„Sþà Øjn£€h¢išÿ¬?Câhm2ìË•JMÑë–?It¹âq6¬Äî\À}ú-ÉëXÏŽÂQ¤(€¡ãÓþd"’+–"ZK|.‘dÔôâjDš§šקzÐS´Kƒvøxß»4â x“Dó†¾j!§ (&f#ºasˆòÆ^ ›R!H¥I£sÅÓIï$Nºp2=pVl†0/wP“FÔyvx0¯; ëPš©Z¯ÙÇ``+xηÎñÁŠç‡ÏO$+~ð Ýl#߆¢¥ƒ/ƒèë—E.ÿÂP`Þé«ó U¨Ò,÷ƒp…2IyáYE`môivà·Øîƒj¿$ ²S{AÈ -þ¾@»vkÜ;­öñqЕQDq0ì·&M°jmÀ8Fû èý ¸ÛNÂ|NNŒÚ*¼b8€ ©U~±u 63…­ Æß•àw ÜU<ÜÿÒ=êw‹ô¯òõ´u‡h¼ØùBï—{9ÈÉ(v¯3¯ž û“ÁÓÞq?w›ÂÞ½p| -a ˜‰D®£ó4 öçˆ`Åî\Šï¬Ò}÷è0ô0YâOû“ö8ZŒh¿‰}˜/'£ÓüA¿ßÑë›þJ/S%ǯÆ=öä„Þn(}þNjÀì š[¹»Àè‹ï_®2öJNSF`/æÜ`Î÷úNôÝ7ƒhtÅóåüo -±”šÝuciL@öÐò4;Ñþˆº‹±U£cH©d“ÐZïsÔé‹Ôð°ùwáppjdXÌhˆÔ瘌ýîÓÓüþi8ˆärǧu9r?…wÂ^8ÌK¸F‰æäìÙ´I"˜Fê ÝOš¾Í͜ȗ{ Ãø/8_ÈËßôza7jåO(owrs¡`]­|PØÚu«nÖx z­V«Ö*µr­T j~Í«¹5§f׬šYàŸêÕZµZ­TËÕX ?ÂïVª]µª&¥Q©Wj•j¥R)WJ•ÂÔÈ©Ø«b‚U5Êõr­\-WÊår Œ_öÊnÙ)Ûe«l‚…0r¥z©Vª–*¥r©T -J~ÉrJvÉ*™%Q2‚zPS ‡#Œ¨PD"* ÉME!qd¡CåÿíD\QÓž_Eq@±T9ˆ!þU:æd<÷¯ÑñŸPñB:æªþ¿JG3‡ùoÒ1§ââótü*JÆχœQ°=ˆÚ#‘$÷s‡ÓÀòF™6|·àƒcˆGÎ~£A4:ý3|W®êüƒ3ŒKª1Î…9I£Ý‹dö£’ÉyÜÓä|DÕåB;?a1c› ¾3§'ºNtžì:§Ýæ´Ó¼Ø_Bh»KW:Kr•É`cN |q Ÿ›v‡2Ä°ž‡u7?Ìse˜^Dµ$#=ë×@ŒëËH ¤ˆ·BŽøztã øˆ¿SKô§,•þÍÉeкªêªÉ«ŽWY†8hœàBåúWÌÎæf# -ÎFçLäðùÐHä4›]\–. ‹0(J„E n'²žÜ¡åüÔ-N€.ä{.Nâí ÆŸg} c|ŽòÏó^ò=§YŸd|Ìú$óÇÿI˜{Aª@¼œ—*Ì r§99/È…77“(,â%r2ÉKº8YPa.*1©1+rm&Àµ¸ÌÛœd.²—²\*w›å0ó˜¹Ì|VJŽ¼Î%˜³[2<¡î¬òRéoR°}Q¨í*™LX˜‹å\×AB[–ÙP;ö$UÎðÕ¤àYRæÈITÑA€¬ÙÒ3”@¾PºÈ&üQÄG€à8 0X©€˜ e¿¬7Ý°·T¥ÒÚ £>èb¬¬€ÐÅ0&€¦úÏ‚Õ+ -³¦‚ÕofÍY)Öœ.öÕÀTÀ2”@Ý|°.X ,‡ \5ì:­ -V¥ ¼€ãðÝ›cA¸ lêƒ1ªIªäÀ6•@J|d† -‡B–kªxXRåC— -ˆk‘x¬|úæ¹…‹ÀCfa.=Á‹É2ð„—ß8‰„dü_ÒIÍÍÜ2IÜœJÂÎg`Sé××'T—dL朌ÉÄŒÉ匩⨠ãNŒ=|uQ\P)W’@¨@tj @u »«B_&^90¼ìÄåèËU—'ÿçKÆ/U‚Hq-%¯œü§,%¹¼ÄU™ú)Æ Î^º|}y‰Ë/:ÑA‡nSíL“U•ºôç¶Ê¤?—Ý™óT¦‡e|S—ðK@ô„f¤Ú•Ç&Uˆúh€#‹óe -í”_w¤g/_ J“q™%£pŒ½1Ú®ÉL -3(+ªê€Ê‚î€ò Äe`d”ºŽ…CPqZPv~É{â<ó¼¤xžàuN±ÛH2[qÚšâ³{î‚MIªÑI—<ëªÉ³._«¸ê¤+>媨.PaˆÊL<»æÈñzÕ Ž¸ã¨õâxÕוʦʪJŒÁkM°FNÐJ°0–µušE']¾Jœ™”Ua„ ÒU¹Æ»åd -†¯-ƒ_LÅ0óäÙ Â\>Á€¸B²C©¶>‡À4Í”a2$k9™¯ñᎧ3pÌÜPÝ0{«È ®*æ:VÈÀ -¤´)4í…æÅ3QÅü“ii|I§ò•ÎK»Ÿã¬^göós{ÊŸ¨è$ª:¹™\¿&U„ó}c*ߧ2_\í¡zO\ê“Ÿ\©4Uò)Ïùª\äK”øÐ  Ûòr¤Ÿ"O©iNº«@â¢?é¸èª¡ãK:2rfÉËL\ -¹ŠuçãË™¾Ö½Ì±…*Ó[ºˆî‹KºtXÒç±—3š“n)vH5Õ†Žͨ?ÕƒQCÜœNý«¾BÈêtÊ@ʇ Ÿé'{e™ðQºçBºÉ¤z‰DOåyNN'z˜æ•eš7ä™*É£©¬¬ZµJÒJ’)¦–-ðÒ9Y±µ¥³FwmJ—-P"±OedKÆ¡,]xIš]_:rOžå8Ò›£?·rÊ¥ ŒÏ0 Àz™ ‘+Ò½—åÙI <ºyrôèêÑÙ[2ŠÂHÆà²PN:éûËÒ*ÒÃx’J® •l9™2 Ô´.#¬ª - ÊÒ¦ädl@Ñ-ÕǤAF 'T¥Š•¥KT¼àÉÑ‘ñ¢¥â{NÆî½—eŸZlS“‘¼-ÕÝ”ª¯4“½›§/Åĺ£.IÀº¥.¹/© tÕ¤âÔäŸ(JU*K%¡0%Y% d¥•ÇS -DGÆTÏÄÚ VOLYAÁ ·ÑA]S°œR•šVQ©eœ7Æù" #+-¶ÌŒ,%PÔ€ÔÁDJ_jý!ý,©É—šê©øË‘k+ÏeÊòŒD&7XËÉJMUúIúS’5¬ÚøÒ©’zÛÒõšÔ -€ª. ¬uI£*•Ysúì®$ƒ_VwÈ8²ÆcËÀÀ”•›<¦J/d|:»˜Î-â¼"Î)êªz.t*áp_§3ÎâC:>Ü™=Þážøˆ'qÈóút6yØ“<îñ¦:š¦ï¬ÙžÅó yóŽî.êŒÄž°Äym¢{qª›ñ*2Š«Ë¨Í”qš#£3>„ÅP¬šKtMà|E@¨j€SqgZ%Eâ$Ïé茎B±tR™9¡ã¸R¢ßHädÙ$y¦ŸÃ U>IÂoêê`Dڹ郸ܜ“8sªW5>†‹â˜C†>Uçn3'§šÎˆa~â\®¬Ï檪­O_é”N¨èŸ²OiÊ…ôfhX*Ò§aÐîÉ^`›,µ´ÑÕ(£lë: šá2õcèãHËkªRI]™Z4³T°e±äÂrÉ2ÁÙWüùå„tñõoZÿ^¾~®~¾ýçâ*ø¼:ø¹SÜL â‚"Äœ¦wªDØéÄ(N†8ç±u7Yé“ò8ÙŽ³è™º_\õ³f*~q%—ë¸%]ˆÅ ÿHÏ,*•£”Ÿ•¡º¼È£G&ïLž}6yoòääÕi€1GžŸ¢P|@±Å EPDAñÇ@ÿÙ„O̹Ìs—uWN}pæ\î¹Ë›sùÓWN×÷f¯Òœ«<÷ª$¯œú0¿øQ»àª'¯ØY ÚJQ/K1G!·d~P—ùAYf(Õ(ÓôÊ3Érüðå ª’–“iƒ'£sSÒ8/ÉüÁS‘7èjsͶ -¯•˜E\òèÀŒïµ.ð½SÞ77ßË -H]W>,í…Éû‰R:T‘Cf; âÖ«úŠ‹Wq5¤¤/êàˆÃêÙ`Z…Ñ9Ž¡ñótèÍqÈÌ=–›Z -“I³9@.«Ð8;* æpØPq0GÁq¬£ßœ -~gßÚLÄËñ.ǺéZsâÜZ.æJ»=骰¥rEUörT¯›­ c&·Æä 5ªÏ\µÙ+!tF²71Ùù”ì{šß`2¯¯æÑ“DßÓTçÓù.6ŽºÁ±Œ½ìœ -¿’á1·/R€‡ÈŠÅarÜå˵œ~€3nzsdöMÚlˆÆAZM÷ÁÜ7•SQ5µO©¨MºAj¤J†mºÑUN„p•d —S±\òªÏ^IeĆZ ¤)\|õ† döè©ã‚éø>öÊ `Šíà×&X¦ ožk¾ýZ²Q×óLÇÆ—}¿Ç`;Ga‘sEÇ/N²ý¼7ö­xÿ“\c¾aóËU -6þŒ¯"aäm f»O¸vÞñ Ÿh0þZxw$›”$zÅ -.Ö S¶Ûžœš·'ØòÄÉ{ú9ê® ÒãmX°Ð³@ÄÁuAò&é'©» Ž^•iY¬ìä“}—[¦cà5| -;Ó=Öçay‘õXg=ÖYuÖcõXg=Ö—"Ìz¬³ë¬Çzmûr³ë›ÃËÿ\õe=Ô‹ú¯¿:c2çdL&fLªÇ:«Ýeµ»¬v·"µ»ì”âžRdýY¿@ú?Y¿@Ö/õ ügû²§%²§%.±ìÂé?ÙÓ³³§%²§%²§%²§%²§%²§%Vãi‰ì]Ù»4²wi¬(Âì]Ù»4²wi¬Ë»4>ü«Ý°W׿ûÍ;‘¯·×zå:ϯ³?uÇÀ¹ß¢#Üy¿[ Ù»¬³>ë¬Ï:ë³Îú¬³>ë³>ë¬Ï:ë³^ÛÞܬÏúæðò?×g­:§³`ž7ÓOÍÐøÖ–S€<ÒŸéÊfèe™Ôùß`zéouV¿k[ýn_ȼvGÑ8¿ÿi£ÿÒ_H¾.øB¦ŽS0<_È}CÀŠ'rwBýné÷_äÏàãü3oç_ä?|4ò- ÿZÑ¢+ÿUXò øióÌ?êßžü¼+STWU -®J‰]ÎY=[ÏM¤ÎðçŽ+³j™]¿ÿ…µÃÿw'’qU¹ C§ÊOÞYd„îhºܼ¢R$ïÎ03(Ø ³U€¦ÏƒñÜÆ|¼*C.È„U›X§À][òfNÁ ×bP#²Ì‚¸´_ž9–˜* ðfš -3wèΟ9ïó2g½=½?a I`‚]0ϧ{ÙÀsË×°FfûË„…ç΃%çöx‹JèòX'¸<£`iÄ–ìFËdzø%Ue`¹?)¶ÃŽ ˆÃ›yÑnk@Á F·wýÀ¡¥«™ó`‰©ç%Ã4k,jaøâGaj]€I]äZA”ÜÀ¶ò@4ÏwHD& -h›QýB`j̓ñÜÆ|Ó"j{Lò°'ǧ›YXi35¨‘Ù…Àñ Ú2ÏœKL'¢ÿÜr̬QÒHb5“÷fPr‰ó¶2gÇzÙ†Z1 ]\Ô•¢H%Q®â/¤ó G-¨a‹ È›ÄYÑÖ,˜²0¨‘¹p 3Ðt”3çÁSÏI&«P¥Z\#„\žoKZË¢­QðQW¥^Á±‘ç» Ø´µ5ô˜Æœyç,ˆ=ØT´¶CX žƒ›aX# ƒUYÙ4ÑÜy°ÄÜiÉB~B0’*¡îщŸ jÄ iþy/`›/¯‚50¶ÃÄÜy°äÜXaÀy€û E)¨ÓDžØ>;H „|J¢¸Ò~9y°¬Ø7F\pg˜Â°FÛ†x‘øÃsçÁ’sÏk UÐqul¶Q““j <ðÁ ’ž‰Oº Ø" áÏ‹â˜w2²p°º>Îg °5b;€Fb怰²åb{ k$`ìc‰¹ó`ɹ—©î˜qv1Ý n¢ãã‘ÕÌ¢çÀ’sgÝ Šœv8r1(Ž*B€X„â4 äÈr º(P#Ú€ri‰jæ„ ¤jã&XØ» & 7fÀè _‚“H.k$½ŠÍ?_¹ë‚OÀ†Ø8c[. ¢„X6Pfû>J ƒöwza&â -¯×¢Ý!J°ãÄóL -–8÷æ•Ü1E@_Ø9rHÌVÁ4`‘„¸ñÑXËr%Ðgg(̆+‰ÀYWH`Ç<Örxo®Ð@aû -æ°pšï@hnø´8–ëAŒ9—ëÁ|Ç/80€iYß)`ÝG°0”î>I pÖ9Øo¢€˜#0¹DRŸÌa –2öžC6'¦6!À˜×a†)'‚@›U×· FÀü€EÒ,K;ÀtÏcÂj``{¬»š5L­8Äp5™\‚I“E°y.‰:a HŠÛIi (‹j«¶«8°.KÂíŽÛÚÛ˜d§`¤®KÑÕrI2Ð šlü0&©0¾•MîAnÒ< ‹m·vJ¶—5Ù"À Öeû.ïå LyfH@GEÊH£Ý€ ==Cë¶áº -hSþ‹¸¦ Ðè4ÎRa@àó¬ `ÊBãõtÄ"X9¯`‘eï›:ˆŽÃ# -˜´écùÂ*=ÃÖöA‘YÊ"gjõöQU|:×µÕXì®gÒPàçK—ÁÌÅ!À¬F{5ÛWÞÀ`·ì:Œ‚ce4þ·0Ð~FFÁŒ7ðl¥ŒæR„0×e±Ç÷( XCŸýªÉ´°ï9‰…г™4ŽbØXÃg÷%<_Ï%fÊx.Ï]»°M^•gióÆA+ÈzÄÏ+ øvF`0Ðô= t q#ðTä`Û^ŽÌ7…• "]“Yn£³f´Ž!œÖPaK!°È âÀýp0%|Àl'[0°„º è‚SbO…E -ØtaØŒ€l:Máò²È§Ðð9ä‘q<#°í@‘€Ã\ú‡soÁ+˜6ÓÛÇx“Ø!€H™JoÀXlêeI-“oei½ñÐV*0hÚ‚ŸðRб٦¹¦Á\€Ícgãødq¬Jã, "P°&ø‚ãwË@…¶¸ëaLXF -ȉ nÁó4Y@šŠGý@Õ0¦€f`ÛLYNŒoÊQ ³Ô -0Bd qU€‡XÖ×æÀðY!›``$ŒµÌ[‡< -IVÁæÅ’ÞÀ3A¬–ZžÉ@SQ¡Úaúh¿ -l[l9¤# gsID˜Ëó=S£5uÊh«ÅƒÓb«å“Ùƒ¹FÀäép ÀÂç @Ê P«7\wš¬Æž¶›¸&mcõâaEÂe* ép$ícË«‡ -gýˆÀáÝÛ*¸‘´°éÐÀ®`¦° bk€ã²(ó€#µO’Ñ-#ðM6È†Ý [¤Xí  /@ƒé%©@@CiŒG¢E[ëÈh”`¨#@}`{ NHh¶pm]ô°tóö”+¦N³ÁJXiã•tVZ¯hƒ#´h«=[ï–]‚1W—›ðÑŽ…Óð5NI!°uN„ÂM¦ ÷cl#U¦@[kœçqˆ8‰2PâÁ ßÌ#‚»”²Ä6’Ø`»#s.:œc˜`IôMNbq~À.ÅE[C@S+žo(±w!>c‰Ø2Ð,—‹¾P:c%m7e…M9*­xX!Ø+¢j+ °™‹–’YZ<2À§ åj·J~`\rvºíÀGOÉ> ½Í÷Áìð|hç°G‘,"`€~_ÝIèùØq«¢•'Ð6è»jUàeT© ‘rEÀØÀ”°2 † ”½¹Ú<Še±ÄZ†£€BäB‹%@ö(òSŒcÐQÉ.,âZªÛx|h»É˜_ÛTÂmR¡ -œ®'¥z»Ç<ø”,"›·Xˆ”›B°cZ¼.¬m*¬.[y¸Â+àøÔª—Äúú Φb4»EM!VY .L¶8#8ÀZsŒêL86Ð6ÂñÈF<Œ×sYÀËÉ¥EÅ'ZÂfƒä™ –Ë¢aêù²È¨B -hž€Ø,àt®„@|ÃsbŒ€ÃT› -t -ªêØ”PFuÊð¨œY‚U¤S_* SªK",ÞŸß#T«½ž.¹<µªTEUÄA¬¹&5Z˜'JÐ1Ù9éãZ—þuå^Þ.àÃXÙˆÁx!Èå33¶ix¶¤@tš,§»|Ö"›¨*NǵZ†ÙÔ{#:¹µãUÉóÚEr«ÚžQ‰À àXÃÏÚ§ÚªêŽC]-š,nx#SÇ–xâÊ÷tQÑU’Hí¸BB¹6}Z¼ÒØ)Êx:¹%óc ‹µKeU¦HØ[‡0&&§ßZ†FÀ"¨NŠä8!X5-öMÇÇrÕ­è„|þd'9é¦ÉFšƒný—/k% )xY²tJL}èióÁ…ÄêkCB<‰ AB#^À^ÑRÚeb߶6$<‚^@,¦‚là¼áòüX»U6„ÝÂݦöë&žœ±TO+¨„° Ç Ÿ…ÍÔ™¦)‹l1TÿByM¬¨wìèÕÙ­D‘0Ð(¹ÇÂæÎ3Jª:” › ‹pY&è亴fSÁŸ€¦ÍÒ ¹Æ7Ž;\:¿MÞX»ÇqMfjºeñÀ *NpE×d²4{1'г¥GsÐPÐ8JW§tÕ‘ˆ­yê{éC ÜÒèQ]Km& ›[Ê£M÷=ß78Oñµ·4|à@›m2ŽõÙ×ØT´Å‘ ¡ Äœ‰ñ®Ë~!à¸I6¸s̲”»p¨Ñ`*îA¼ÚÛ _Û-«¤A%$|–ÀÓûuõÂd{¥Ú(öT+ŸMy];`ǧ­N;±±83Q5yº—5噘ZºðºÜD˜¦zhùÌt:Ú¢–b¤›œoº¼/Jò´-v-œY!R]âµ9ƒh,têpN" 8H”''t´QH8 Ð"ÃõIÆá³j) LÎâUìêÆ+Häì®ÏÖ2^W'·XÏhðhÝbÇ¡bÆÆ1òy¼^:´|ª$j÷c=®”›ª(@KwèYÔŽˆ@ÛÒ±ˆ{X¡d›ïšŒÀN ¶ØI ÇÙHó}]JpÌO„8²ÚJ@®«M‰L\*·) % ë°ApÃV@> ƒ˜œ¶ãXÍ2Y“T7sXËvzØEÇYk\&‘´¥2”3€ð×cöj÷é„À׉#ð-Á~Gèíºq•—å²l]xà]9ÖµgÊ8Vp™ëçx+]Õ—@B$Š©»èÃK>A ¼a‚ËbA,6tôf ¦w`¹ºœB™7ÞÉáÌMÏ·…žØw2li1ª×qŸV ˜Ûl:]V@›µŒÍ¬>Ë“h;ZŸ©!0½‹ÌŒƒ¹5Ö¦ -—B¡Î¥ Z†>[S}öòN–¡ÛrÑ-)Œø(‰Á„ó*ÄpªBÌŠ8ò3¹g§3M؃[ò±¬DÔ¢îí³û“5K½$“£AnÑǩ—M½ˆ -i ?ˆ÷dêb›my3Oiäù;åñ%i÷›#˜ :6÷§"Ð7Ù± PëŠnM ,AŸòÊ–Ðåyåí èzLTWWÏ,bÏC'S=«7åy` ï2ÿL%[x0åÏØxK$OlUѽ*µø¯—¼]Uú±çëj Ô ñˆePÞF`Ów4¹øüG…Ùó50¶B¸._7S‘\•Ï5MNUÈ^Z=7Á;à@P·~Iq ƒ*ÿ!Ðæ†Ø -Y‚(G`Ë`~Å}bª[GP²)˜øø>é'“…@Á™5§fP:/ä)+FUL ˆÏR’Ó‚ŒQLXíÍ,+á¦eDÀDÍÞ#_bY ¯W@-KŸDÚÔ|F@Shç F—Ä]C>Ë!IÉw3ºÃXeó$Ñ$1‚ø4ס¦¹Z?˜1å¸/]—F[¯ÀáÚ•py>WuK€ ->æ—G½4_bûÉ¢‡eé¶Q+¶0²°d'€ŒR-‡äø¬8sàÄÀrtŽ:+¤ùXÔc!°Ô ‡å’®NU´]ëÐŽÏ£y c±ˆx¶gs¿‹Á®ÔÂÒŸîGVœï²rŽ#µºX:6·’¤4Päa¼DLe eàðÑXÝ®Ê;t}Í•;êyܦÍmÈÁºÈðkܺÌÔty_²ÎÀhãÆ)ƒm´G‡~´,’áH›»¿ý€c û·¹Ç×Už°ð³7²)€|ä¬ÚÇ ¯ŸuR«m(pÜyfÙ¡¨m‘ÆRN 0ÛÖ!tl z´›î†õ¤†Çr( '¬[’Õ@ômÝCOÝLîòÖl-´ØÈ$³¸©ÁÂá'“UÙ £Ÿc‹Š?´áóf­îRí¸Hš¸¨¦Zlq<#0DŒ€-5¶v{Ö õ³r©ª+Á¤§U÷ÇÀØ"úúT¹°ã…²“Y1ó—.M.Õà”2©¸¬€®Ðƒ ž¯Ÿ&‘‡J:O-ÀÄ^5ò¹»™¨Øõ¸»]†¬J·ËêK(?§èÄÑ‘)ι›ÅÏŒ©ÇQ¤2ÌîÄ -ð(¾÷UŸ/Sº)›¢X Ìx¶0\;!Zª5¹ÔÜ/m„àg1tǪ«Ÿ”9­º¬·²‹S)u®†#…ÛDÓbv³ÆÜW?`džÒáçM]1“ö×6¬m(°©šyÍØ&&Zºª0Ž™í„ÍØÒÙº7 -(]$ãƒMVE™j7ت^V¡ÓOéXùÙ ®£ZhEØpÈ£9dt°Mºªð_% 0me#GƒNÀKqƒfB#â\Ûs}^+Ÿ@a¦é°ý3]Kõ$ÈT•µQãõIZˆ=\ ‰;¸Mêõf¼±æñÙcê*/„•å…= à .“›úË ê¬i¤ªì®Ž9ÅmºÄ£:vZº#N–`ÕD‚¥/ ‚à ,é©Ö@EC®¨™úfÜ‚5AƒO“Ç3›TTtØNêǨ4j1^ás½Ô1=%Gª«Xl…ËûÒOXòUU—®,ý&8׋e/…Âʇ–x& Ay&ñÑqÇe"úÀO•¿5¶êÃA» -ŠÔéÐÒ×'‚ŽP7é„Tµ )Þ”ç®:@2ÛáÃTCE.‚Š|ÊË©¨àKy ìÛÁd´`t­®á™²Ãt”G¯›òô9ŽôðœÚ`±õÁˆ°uçìÁ!G,lý(€à£H<•w]E¯Ø¬Ë&S­€dl7¼+n‚€j¯²ûø¹Aç– –[WûUgøô^Î „z8›€úÌ {&TP'¨j¸)›6b½qùP\è‡ÔD|ÀPÓcãLRºŒkèj¼!’zVP¿*·²HÍ$´êD€žÉ ª@@W=èI)¾9‰ƒð¡l¼ ,/Õ äëÄ@P!ðun‚i±êu‹¦¶–.¶s²Çˆ¥^\ˆ»•™‹²ë¸ú¡tC[{ÆŽ…¥CvűޙºÕÌÒG·Bdž - ©¡K¾y‰Ež•ÙˆÔ›ÑP`[=ympvs½XÐëhÛ®B`èvé@§²B?€į62“RmÍFÀ²·ÌûÚ9 zyƒêáöXŠä µkƒjâÇðrÏã†snëäÝÐó<ÖZýôL܇®Z£¨»+¸Z6eÓ½jk”ˆìëŒ<ùSM÷“@ K f¡|Þ–ãõ„zzÃÑÏ0 êóTXìðõ; |”Í×PÕŸïPb¬àè£[AïÃ#¶~àTÄϪ¨ˉ\¶zI$W¥Ä Œ„ÚÛú± ~Yà«èh†>t@Âóùyx<_÷kš¼õ\iâ()ìªê*nL5èúA¬O)12<ˆŸmÅç­Ôa„ˆŸN2t篈×Á>6¼ò¤["ðÝÕ%Ôñ¦|²Ëa¬º½È/)‘}òzº¡NT¸@O9Ƈ‚NÝ6åSwœ ŽõÈô±ÖË'5=ÖÙ†¾IÏüªƒqƒ‚·Mù|4Ÿ‰'±ðÁsõ€é$@¾h@õúÙ\/~”Ù ‡<$òcõN¡©D Á44M›ßªÀ÷ -zš˜†6qê~æJèPå@—-4Gέ*ªU¾ì!`ÑR)ªŽ2#ñà¾ÇÂ#goðÙ,¾4ƒ»C ýî×ÑOQq£8‚9Â5ôƒMTE_DI¾6¦†^A*•7¨Ñ`°M £Aç 6 æƒ~G‡&†×ëQÓ#ùôÀˆj|%Šlq“`Æàka|Óf¿¬ƒÂWã¨Þ-#~ÌÂwܤ¥6èijÇÑ…)ƒK±¾<ÌÓ;Y$☋Ÿz–¸Ø­zêí@‰W-)!Øî‘Ñúœ·½•¯#Â÷™‰âiª—$ªÐxÃå¢D`óèÒþ¨‘¿"n”A°+8Íwõ›’LßT ¢Òè9+ 7%a:¸º3h—ÁŽ~bDu¨Ëú¯nNVKC Ã1†>dµ6sY:®ßÆ\–jÉ¢‘ºEÊŸW·ãB”lGá®ñ€³ä™ðÖLFØô‚Á.ƒ=>ŽÑ‹0ý¦j0Çs“{,ƒOìÏãm¨ RÈÊdW=ÝÎë9|$ã9Ü:$Ÿ`" wÈÍëÖÝ©ê,:Óáã+îs;¿€Š^'eª/…WÆQŒî‚Ä:€nçµ· 9úlæþjaØdàsC¯ä@—Á‚æÜc`Ú|bʇ{˜Ç«.FybÊ|’©[õð©·Çæ…™Ûóº’í*ŽZ–„<>6tÆñ8UÐŒM4NÜ‘ÌXÐÍ*w(9ôP-–Sþø)lÒÇþÓ«"±£g¹Â,m\W@?J?&¿ZAVó‘(쾫_ìeQ ÕU`6íñsœø݃ƯLpuÙ2ù(,¢uù`ÙP!¥Ÿ|hUçÍY€zÉ›$ž«“y—Á~w>«Ð`°Ï•;ù©1 îû ½ñ¯ÖkM½ïïkÞ( újÿí“z»hrEý1¿•+¾ÑxÙoEø±ÚnŽÛý^8ürÙÛùÛu;=øj–5lMÆÑèNþ~®XÙÍÓv§5Œzø½™/>íãïð¯ñ—A„ßÝ66îä‹ozí&÷kïdzàç°3¡‘_.ˆ/DÄq°ˆ/rU«º¿Rïã¯k؇0ÒïäÏvk|šz7jôJïè4jŸœŽSo‰‡_ùžJOKÁix(Òî¬Ý‚‘ ¶ƒc®|+ý£?¢æ¸ÜŸôZ°¶rzÄ;:–¦ †ŽG©65ç~Š­Š™O†G“NÔkFiÉCSSÒ…ïs »J»Ÿa4štÒ«&¿ò=™i7Ô›tw›ãðs”^|“S®ÞÃA¢voGá(ª£OØô~{fÖ•ï°×ß·ÇÍ.-ÞåHŽ>hw–`áÔœ4肈K62ßÐ',gt4'—¯ø.¬°µh÷èaÒíáØ+¶ýþdØŒž ÃÁi»™~[Kìê6µh}ñNúƒhŽûÃÔû‰'\›ÖTúÝAÔ§Qšo±¼,¼w±ç·³lo5ö‘e{«»£µËöì,ÛûOd{ÇÃÂüÎË~{”å{+žï¥ÖÉõË÷R—²t/K÷²t/K÷²t/K÷’ò±iÞ”„o™¬xÊg߸”o‰­QÊWŽ>GýÓ°Õÿó[ó­O6D®SfÀ7Åqu& \á N„FãV5úÜqAKÒÉI×< '£Q;앉ëK§æM+½n]‡N¿‘ô^¸unx °êÖ¬|<ŠÆå«°iפö»r‡k¤ð7I¼:ƒaÇc³ßé·þ<¥”,¥¯ùÒI_U£¯|‡£AÔÜ,Їõ‹RG­¸ÿI'Vú½Ñ8ì¥ßÚù‰×pà´ì.k ú½è+vO¼ò]¦îüM†Ça3Úo†ËèÝÔ¤uÊM6…nHÃYb+«]äØ4—aËß©÷ò÷5Æ {ývoÜPå‹ë¨GFûÊ5”C^£xè«j«~¦°dØ°êqÞ ‚²C’U3©ãÒ3+5+pèÕѧÞÈ‚ºIr#öJodï’«œòœ¥w.gká[VÝYÞÈøN{¼¶¥’ëç3Ãa{|ÚÆé9õŸõë“+/_&^Zý®‰‘/¢áI„”\£ hYÓqyñíµ }måf‰fŽU/§¥ÞÈjÓ„È:†Ö¢c¨ÒïwÊÃ(ú;õñXöœ®nmŸ…ÔO›ÃV{’ž$<üšÒ´Õì•~#­ô¹¥L½‘uI3[íN˜¾—`SÌýáà´ßéŸ|Y£ÔäšµcÌÒ?’³âÆìÆ=ˆ˜³•4f›7¦÷v‰§ñV܆-÷8Å*±Ô;É:n³gö¿µ²¬ºÚ§Ž*W^íÓÇÇk¼¤î/]¿·(¤æUö…‹ö˜½Eá«Ù³ ƒ)Á—å:¶¹U{e-ßêw¤Ü ÏšZÊVÞ³¦ÞɺxÖRêÓÔÊiØëEý¨5—© œŸxå›|ú¤õk7y~âµù¡j{4è„ͨõÆ/ÂÁ9£n¨Rå­CvdäùÊŸû(¦>¦Ýµü”>4âá+l)WÞ{-÷ZÅUö^©w²nå  ->úû‚ÍǺػ%$kÕu$u‚¾ò:’z'ëá¥Ìúj^¼²*Úw¼T+Ôq»ÓY¦c¨s œ;†_ÄSò;‡K 0_Ýê߸Ÿ> ì_ÇFR3§µ¨ >yÚ7¹Žœ*µY9ö»é5G¾ú8=5cŽð—¦¥¯¾Òè«<+µ)w¦oÿR®?ågf]Ã#N½(LýÄH3ì4_ô[é·O¸†Êy/µw -›ÍIw²¸Á#ɸĔ+ßÛ0’%ŠÔÛkµÚãöç%6§'\SJöÚÝðÚ^ »®ï¡Ûô³f˜Ëìš7¦&ýNÖ­ú‘5ìH¹w eYuµ¿1Í0éw²6Ô‡ë× “ýÉé]fí0WÊžÔñçz´Ã,aÅW¾æùÖÓ“~'ëâ[³v˜¬fUœÑ FüWÚa–°ù«î½nL;Lú¬[Ah=Ûa–¬UבÓ“~'ëá­Z;ÌJŸÿ¬O7Ï*·¬ñ¸&®ã[—è̸ð͸ðíÞ&²Løv ¸¦›¯ÿKKO«òí#‡ËU¾RDëã¢ÒËÖä­E7òÙÙ{r2‹¶„EsÿË-õæ3‹–Y´Ì¢­¸E« …h™A[uƒ¡ fö,³giìY eö,³g™=[{–<Ô9\îþ†™µÔ›ÿáej“Fm¼ÿ²Ú¤Þ|¦6™ÚìµÿŠ:{ðËárO®bËuþº «~Å„‘wRwOÒR_/Ñ@™˜±N–ouû‹ÏÞõ² -ïzé_űúïH¹i¯y±myáÀßFþ߆Ïðï6|‘¿i-Ûí^+:n÷ÚéN†Ñ -ÇÕ%Ä21ãÊ÷—Òø¯û bF|ELÚ=f/ˆÉ^³b/ˆY•êþêÅ£e~ÙøŠwê/³—uéÕÏ -«n–>‰YõÇÌ—2 +nÞšýî ?‚vw²@Ù×Ï4,¢ýz˜U˜skdR— ÏtÙ$XC¯>kO½‘çPÉØ+½‘¼KnD\GÝ!õFÒ»—³ëð._C¯ºËü7³N®óÛ¿7ðªkÇÃöø´ÓÇmÿYº>G_%±Ù€Ë, ;Nþ7Ž“—{³ä*–Z²ãä˶—'Ÿ'Kvœœ'gÇÉs (›ÆöR†&;BÎŽ¯p›ÙïÉgGÈÙrv„>ž¤ÿm&«n -–ÜκXƒ%KùûK½åjΕoíKÔéôÿL»¿Nûät ßo6ñU±©·8;mu¨¸ÒïÆa/½hž›wõYqj5C€»œNOÊŠnYÑí(éMú=·7­èF~bûdE½mˆÀ¢ív¯Õ>éon÷;Ñx{µ¶ûðw’ZÕ²jÜjTã–ñéYI.+É]ýÞ²’ÜÊåàÂO}êþÝîNÆ ~u]’<þÊåÌM½§¨?,UòI̸¶zOµ-““üëꈩR¢ÔPNgDþ&•Fƒ¨ Ö|x;ü!½ñÕŒÔvŠù¼t=ãüÄkH—Ýeí¯DA_±Ëxâ*ï2«Ûdu›¬n“Õm–ÚªÒPÝFqdù&«Ûdu›¬n“Õm²ºMV·YóºMG4nD EV„úöE¨}•÷­aêF> -ü娬–½Cã›Ø†u|‡Fú76dïÐX±†³U‡FzŽ¬ø;4–í´]y§y#§I§=Þ Û‹Jøëç3³wg¬ªïÌÞ?µj¾3{ÿÔªùίÊÏVÝ.ëjÖÅufïúïúÎõ9Þ_ZZ³wN-³€kºùxçÔþiØêÿ™ýþ¢7ÿä…Sëc‰þãoX—( õûß²'ò¯\…RÿbÍÖ—ôí__®AÈÒod-Mn䯷«nÍúÇÇ£hŒ*1ŒZKÙ鯶mפþ»r§ÿàë¹z3UáÊÕ*¬C²ÔlåR³Mál¤ÉôqÆu„Ëì$} qq†°Ô;ù³ÝZ¢P¾úYéwt-îõœ™uåìõ÷ÇíqsA8YñÀÑíÎœš³N^!{ÙѺ¼ìÈ(¤þÕ ã~z§Ý¿†­Ü¨×6¥7ŸÇÃ~7½öÈÁ×ðˆõÍ~wÑ.,{uÑ¥ÛË^]ôröê¢oX·‰&ãI´ýêˆ7ìÝ+K¤»+ž¸gï%ù–*»þ¥Öô}=«Ý=–~+Þ;fܸޱ%v´F½c±³>\ð„옢3Ž)ÆÉøìÆRà®nZIçÆe}Kìh²¾wý~ëd¦·±YÊ·Ö)ßüK=#¾âÏïÜÄ7^¤Nð²7^\¹AÈ^ãyÙF²7^üC§Ì︶9{ÇÊš±ã²ô[±·Ž:aól;O þ l¶Ç_¶–(3ŽÆ_:ékÜjôÕ÷p/óÀW]³–Ú̺)Sqt韼ÐfÕ £ËiÍŠ{ב|¿cå&‚kp±Y9ûšÊÙ«bïnRÀ½ìo<]qs°ävÖÅ,ùëÚö›áéÔœ+ßÚŸ§K<ÀÞÁÂ7|¿™Â-'v8;muù§ä·ÒïÆá¢_;˜,<Ìλò-¦îM†Ça3ZNF§'­S]X©)þÝîN–8ÚÒ㯜ÙR¡nÌ+°ÜÔ/ŒŠ:ðÃRÅæÄŒk‹±ªmiêñ:º` Ò@5”%΢½ëI—ÿ½ë"eqÄ”“UŒ^:8?ñúå—Ýeí¯A¿}Å.ã‰Y¼´"æöæÆKY¸”…Ki×°¯ ÔÆK7²?ú+§,ÌJæYÉœÚI˳/I°‡^ýÓG©7² } ¹{•S‰³#“+Í‘ôNæì:|̲G1+ï4odïp§=Þ Û‹rÍõó™á°=>íFKü’‘Ìw®š¥Î|çªmdÅ}gzÑZqßùUùÙªûÏe]Mæ:3×¹â®s}êÐÙoi\ÅXè››Ä5àÅ·[À ÂM}Ñ üìK¿&x]ÿÍýMsÙkugv™½déJÙÓ Uê72¬ƒayC]ó>iHÚ-ËOéE‘‡¯ñ_uwö¦Ž7ã¬ïã‡òù°¬€ëb1n`àt“ŸjË^ñ±ºª´™:ö[õw|lÞ˜—|\I!êŠ÷´›½cUMÀ׳fõU–àV]°2¬:¸¯±ÎZùVÍ4|´­“¥~¬q]TH¤ÿµçY°}åêt#½ÑûãhXoW¡D²*|‡Géy¼M3ŸúôCîýírË©9×÷*®I¯ùz¬É“²‚—7òÿ 9{’ÉÙ5Ê™ø¯˜³òuµ˜ÈdŸ¶>†½ÑqŠß"±:òþ•2¬z)äkbµuˆ?‰]Wfõÿx=DvΕ:,×ù‡*˜õj.³€kºùR¿þi£ôT‡µ^Kÿ(99|Ùïí -ù:M—£“v/ùEîå@á_íéõ;¹ÛÀÝþŸwrF¾ÿ¿ÿ37‘—‘ßÍßóm b¹‚c:vÀ}5€¤ÏÂ?ù÷a.n¿yÿ~xþПy;ÿ"ÿᣑo!ö×¹M/°Ý‚g[fÞ7«` '߆Ú^Á²œ|¡Â/[¸8Ö.|ߘìš×uf¡Ž[p|u­‚ïøöÅPZÄ,†ç6AÆSŠ¾qx{Ó(òO‚}år©Ùœt_÷Ǻ|·qŒ;̽ÉùÛwòïßM}š‹ÙÈËý~'Xeí*FÃ^­‡ï“I»E*¹qÈ#9è¯A8>P²·q(Îy Œ‡ruñ@¹B^U,e$_#b>}³×™Àß»ò7œµúGQ¾<œŒNó/Â^x ó»ÃÈÿåßåéËJØé´O(dT#€Lż“Œ ùz'ÕP énv| -ãîä7s·ãÁ•ÓpØì‡â|V -[›Zç¿¼ß – ûŠ×}ûÙ¸P}ùŸº®j•IŠ%–ÈÔºƒõ©bþMmRKÙC‚ók/€I0ùÁŽÈh5Šù¼ä‚{ -fÜ©÷¯î. o`'ûø+F¹âó^ÿÏžüôêv©'‹ð/aèÓöÛÝA'âoÉÚ¹ù“Ôv ǽoåŠòù 0Îúwô¿kÞ´¼wö¾Ùýwöÿý;ïË÷¢'î[ûöYß·(ÃÒI¯¥•!ÊY»—§uåq9E5äþ¼Iûã°yvù¤r8j7“3†ý³èÒ)¦üÜÙª±÷§#<ØSü:jöÁ6µ$Iå0µµ|zB’’|ù\þv »|¸«$ñ^8ÏÙK¥ßkMÚã ¶‘œøUäž¹Òäò —QI{´7£¨ö9êí¶èE[ˆ5&Ýn.näÅk‰ ‚SÓScNIM²‚ÕagéSû»ßÑW…°=á&ƒ"%æ·§¦ÚãÎBùa}ÔéI’˜ˆuŠ¯£ˆõ9ÊDEƒZáð A6èmšóH qL`€­-¸¹žáø>| ¸š°ÿ€Ê£fGÞB‡W„¿ðev'§ýáßwHän›£aS…Î$ƒ°=¼€Só?Îò¯Ü‰z­¯Тœ¿¬Ç„ˆ§_¸‹\±öWÔœà.¶œB~úñr£}^M^/ÁðRj†‹ ì½ô¶àžc_»Ðaï…"P¹ö½£ô«½ý!²~¼#·ýþïÜ,<·×ˆ¨Ÿé>ËÕœ‚¬Îð$G5 -íø`é…M!Г‡pO!r”DÀ†AVlÅXE‡6ˆˆ?ŒW$àoÀdhL–’:_‘<³àJÁƒ&fÓ#rpE¸ÂòC'`ZP9Š2”r&äzr"ÉƘL$’%©d1/Õœ7qyŠH:ߟF$$µM;‰ÈÑZ£ˆÄQûõ˜H&­\‰màÞ\‘kiŤ›KDÄ@œg"à €Iä"LŽ¤¶/‘g³(-dÑÃÛã…KKSÒÅâOˆä‚l$¶ËÄf{P°˜¬šÐ&L4Ili…0R¢: å°œ{¸'š£lÌ•j½=¢a±l½;!4–ƒåÆÖ«AiâÝ»çÖã¢Þ‡ØüHÆKMPËÁÏj•±Yô‘žŽÂc“PâŠLÓe‚“»¸8$óÁÄB„… ñ}&´V|e4]¨¥ù„qlrV|Tër¯-÷gÓ²ˆï&SCɤ¢f·£’q)âh Þš‘ÌXe fº^ŸË,l„vÕkc&Ú VÂO=͈£$”- Û*‡¸ÂÚã±6k¹–om2]ƒÔÉ" -+DŽˆp¯6 dË^¢Þ¬Oö)I:Z ›“iÄ–OÛKS‘jʪ+×V°¥%º%y` -öUÊWø_¥I,Z˜õæ‚@Šª/ež÷'5Ìœ–×Ø{¹  R*¦ú-aÙR=mú”(9¼W`ívØtXI·ZnYék¬Ì}—eËUÆ«`+F,mÂ#L2¸„ÕÇÅJuYòYÚëhS‚Ûj—!ŠRLP”0*R7ØHZšƒl<Ú Ú'f‰¢M–—/ C -¯‹º+¤WñMFËfH[kŸ‰ ·Â>FoIùŠ¤‘.F[<‹•MST{L‹6¦àg´yœâ -§ôÊ(`X†O±j¡×T±´#d ÚH¢,ÖfÖz¼DŸ9ærÇnˆÝ4ÒèVIXKÚZR£òQÎÌßn´{Q8„3lµ!ºÃ§cã€9~€¶Œ¡r97g¼ÂÅÁeùѾ†¯!ËKöüø‹—h.¹D3Ý¡=?ѪÇ8òûŸ&á0åUMýÎ&º>$Ð~Ì.œJ+Ùµ*ò{¸Š“Üíç O$Àæµ`ÒÏ>ÿlÑÏž¡ÍüÙåŸúÙáŸ]úÙÖžŽ~æÀUVág“xAü³DÈá3þMtÚ+ë|Ó¾e*· Hë’©°.(žË;åÈ~†hþOŸƒÍœЗßD-¾ÚoNº *Õpâ±ÿ,OtŠ3'<‰óãó_^x +‹è öÛ£øð_p^]Í;1Ý8¼ýCotø9Ž¶/8Õǧ0á£ç§z%£©ŸÖ”:Gí^ ¶*Rˆ¸_J2,¦PrôýëÝc¯ß»hÉÉýuúͳhÑoö•«à‘ÿûÿáî/ëØ8LÅ×6§ü…œ\'EßúœZÕqè5K1n¯9ûÝëµdßN·F!Ö¦ÑçéH+Žß\/ö>|•K¹ Z::þs…½ñ5«Á¨Ón®»-Þ¶[0\_,^´Ù/iØûåºm/l§àñ¡ä…›JX¯{7Ž) -¦é/ÜÍŸí–üõ] w¤^ï®,Ï/bñ®N£¿9J®‚G^ï¾ô¡öE:ê!&hDÇãÝaûD¶é.ÜÚù9+àÿ¥á£Æä26˜\{n꺗ÐÆa ⡺Žà®ãVK ÒHWbð”—ž -‘ßF£hø9ÊDóµV{µ;í±2òFÜd*òºêqÏdo„½“Ixå÷úƒÉ`z|eØ”†QH½aç„övâ%~ªÏ6Ï ·y˜üÑþx§mºÖ¹¶\µK}G¼‰ºá¬žÒšý¨óS8†=Á‚£áÓê(9sþÈF¿v0‡NŽM8À¨ïªL;[¿'þQØy &‘î¾ýáEÔjOºù×Ѩߙ¨ÍÏy$ÇvÒqÔ‹†Ä·q>‘ÐÏlÖÒý9ƒ°ÕÒÜ!ÖwÃÑÙŒ4Œýñ̨°ÓVöÆc£Ø´ ²¹Û§O]B’¥§ùÒdÜÏ¿G@Óöß³F³ô4ȬÔîN:‰6긛9ȇÃñQ?¶òú7ÇN·M‹Å8^*ÃÕi¦÷?;¦EJ^…É[Ÿ—ˆ®½àÂQÉ`õv5:ƵòG_òÕ!¸Ã9OÎθ1ïÍ™•\<(¹y䑃¤IR‹½|mô¦×vagXèö[—®~Ø*ô‡'…K¯Æ|>'‹³£äÉãZ8îó%+—ƒæ—‹%…Æ4{£ËH -cÆ`UØÅÌ•Ê“îYaÄ-¥—ŒoµŒiBèsñ’{ãB«3Å’¹cF ÖjWÖ¼; -تÍ]˨pÔFÕ¼tH/: ã˜ð‚AM0.ò”à’1Ñ”üœWž7: [Ñ0a0çŽBkÕ3cÉ’£þ¦l×é%2™‹JÆ©JÊE<Ò|)ÂptÔwÃK,¥1Ù¬ä"÷ ÖŸNÁŒptùH»ÉžúK]bˆÍ6 …Á€ò3%2‡ž;J¾ú ‰ë‚VØ ‹c 5î’ø@úÚH>ª›N{È9Kõ‰¹™f°lŒÏ©µLg®ÔãPPhÌ -¦cÁùK€‚´{Ç—ø9l˜xòbQàÙÛQ8]¦ñ:ŠmZh¦k‘bìp*Ì]4:i&Ü ‡wÃáÙhzÕ)džmñØĪSŒž1nDzƒáq¿w™âÊøê|>=oX¿éÀH†YóB’á¬q‘…•y#OÒ˜!Œ£È -Meò—Œ£´xAX3¥½sCAŠ~Tê:ºÄRË0ƒRøf÷Ëe¶/ØŸFÉb™¬¿âÃW%ž‹‡Ë–^äÆó vï¬3C(tfâò³;Wâ±Fá8ù»ˆæï:nÚ£) -]†Û,„1x+ f#±èy)ËÔö†á /_9fB-ÃVÕž¹ö7¹à›kQð.mÑîΕØ/B¤Þí½a¿ b©Ÿàšn'7ry°Ÿ$‘R¤Ëâø$b â4!%_Eº=˘b)N‰¥–a¦£ÈŒà^2VLSoÁ2¬e¤Ü\‚Ö45.×y±¤RXËO$W­Å–½\$[Ö¢ò×yö[ÓeÙ‹ðÎlx‘^›I½^´ß)aI<}êY#°ÀÀ$íÑB³ÛŒMã%DiB:’Rá…×Ü{ðîáÛáûûϬv7Ë;Ã'ÝÓ­“ÞwÏêßÝ¿ýc¥Fß»o~ª¹·¶vÞí»uºÝl†gø©}¯vÜ8¥; £zÃö÷¿oµ{Ö*w6ÿ¸9¼÷ë¤ÔØÿá®ÿÎÎö³S+·án¿ý¸Sê5ìÞ{øb»èu}Øö¼âèØ* ›OŽ³-¡16«ÏFolÞ‘÷Î2Z[íJ1þŠooÞÊo¯K;ø¹±±SyúàÖ»ÚýÀ_ž~po=ò*ýßî=xÛú°eÝú(Ñ>êmÀ†¹wo!K>¸ïÜW=¤Ó£òÙwS‰æÛVÃo½¨Ã?Ô¿»÷Ëïââ¿I,rHnÃ8úßS[~¾÷¨þ@}zð®öœ†Wî×~'dæÏæSÝ÷ƽGj÷Íê㓇 -Ï»‡¶[¼üMrR/ðí–uT~¦ð1^€¸ýð5Šl s¾+W%©«Ñè±íþâþÑ,Tÿ¸W=.>ÿT ÿ/»Go^=ø©zø¨tpÚ—ö¾o¾(˜p¿ä}üùÌiýR{ÿûã‰&I픘þv#ó;…áOÌ°ŸûÕãýZKÒІwî=ºµýŽ8„˜sµCqïmÙ~ÿ¬¾3ž¾±·^¼{,9ä;í¡ Ì»{ÿ^¹ü6KÊé'éÎt"Æ"ªÜÆö½‡“ÛõjG”gÎüõÄhžGîQgû`ü¿ÒÁ³ñä<)g8™ ;3þýð;„€ûTh—fé4yDõÛ? îTNÝ׿ԎŒw«Ñpx߈önë…941OJ‡Ï„”¶›¿×QSŸªOÿðBÒ}b¨¿ÿ©û¼´û[ùE½rüÌ7Äó£V½Òêþ,ç<)w܇ïbÜî¸ñð—òO·ά!·«ˆv«OÎ6"¸Õ«ha,ãxë]ÿüjgÇ5áÓýñ“ÁÿŽ‚àÞ¶ýr†"ÛOGýãJ{ÔvÑZn~Ø3ïÜzúS¼«íhë‡.hòë;(^/î=|öË3¾éɯ`Ç,øv£q÷Éø°Õ-íÿþ¬Zl?¼]'Ç?þä–^ôOvÞ< ë5ÿÕûÜƃ{FíWMŽAí~ÿ¥YÿÁÝz<ŸµæÙ§øRA:!æ>üØóøðÇÒëÎànrÜ«ð'0?ÚÞëÓ»…ÒóŸ÷{¹„ çïw¼v+ObÊeÜý¡z\úñ·)ðº^?¼óÝ©ÜØÜ^*åÍ|«¸ßŸMyšÄì»àDŸôk÷šŠ¯Þb¿ÿþÞ£‡®%¿-íßßéUÚíW-ÜÚw8ä úüùO›õ5çŽü÷rr·GÃ^ìl”;ÏŒòêC¬Ÿžÿ¸}×Þy{Tôö~zñZýö¦dýðÝ÷5óÎ÷¿UÄ“Jc?=èh뱸»òXÃå6¦çÐH ÃËh+r¢üÑÝo˜¯ðÛ‡r¶¾AaeBUz°Y÷œÍêkóð—A ‡<›ŒÃPÕ·*ã —1º ÞoÅŽ^ü#=c[ÁÕìÉ%É5À^O‰–‚Û¤ ã¢:Û–Èâ»H³$Â%Ï»©üQQ 1îOSÎÙÆoå6Ǥ¤Á¸8¢bïdû•&Á¾¤§¾ËƒÄ^bæ=º”µ©1ÆÜÆ #h+Æ-·!é4MŽ‡rWñ•¾ó“x ¹i^>š'r—²„–,?é]ÑMãIÆæ -F -±ÀÁ ½«XTfe–ör!±ÒN¥æ09Æ{ÆÁ»óˆ:£©¹ M‡3ÛÔ4ÙšFñxz5•x®üv榊/±Þ%$fŠ«b©•ƒ‘¥9ª²­W¸§ )í¥.é(Ѧ%ub —Ê‹$9pé¨q?šgåÖ´j.'†’!D±úr¯]_ÜÙ•Ÿˆüz§žû¶p üKù½ Ô+½>>yaåóÁŒÃ(¼}Þ«ïq–Ûx²ñähâÜv±ÉäÕƃúáøàîζ±÷ݽÚÛ÷?±+Ûü>N$¢‚Ù,)9$ -_ÀßK¤f"€„åyÙýB¿;.̦¼í_õ’uöý3™LoèžLr~ÿ™áÕ6ïÛÕç?ÙÉ»”£ÒëÞþ›Òþøi·v¯Q¼=ým§¾l 8©x}'N¾èO?|*íVÊ{èèª;EÈ@1 -›Þi"Øð¶›o^—¼_Ÿ½®>Þý}‚’óÓǧ¥çï^Aœ¬VöfãìÉh7ªÐ¯á–ÁmÿZйCáòÜáòÌ£ Ιç½ù=¯¿íÛ{ l®}ªP¼m™ÿûpy2ta*”ÛH&C±„âÖ(Ã~_Ú­WÿxwXiÿá·»'ßÞ@“G¿{ÞëV·ÇG*ŒÝï|ŒQ$+d7)³pïêzÀ£êÉæÇtƒWÖ£ß!PÛý±rzïçJ±ýèá–âÕ4¦r‘3ûB=N„ÁŽ%y°÷“$?ÜÔº…ŃɼÎÄB.J*~xDr+ÀÞOÈ,âø:úO,48‹žW`C­{õßÕ'?{ÇŽ×LÃ|b¿˜Eûê»;¿Î$)$c5¾íﯪÇoî=;]¯šwZ5Ò@™©¢Èpýöà‡³‹ôÊ«ÿöñî­z­7ùÝܺ¾âþƒûß?ø^³ñ¬üjoöòs÷¥Jð'?o”^½Ü[¯Þiñ±°÷0¼³ÉÑžÑx~4ˆsäÙšƒùËð¥rúëw[÷=93~¡ ÆV«Û1Љ¼DjÿW; ã›sïûÎ)½Lªî ðêÞã·á'¾Á·³ýüçÿAúxúÝ4îÝÒþ“ÖÀ—‡CsçÍwääÀÃÛ3B‘;–_€{|:šH&¯À¨Â]~ ÅÁ¨v8G;Ûo~,$Šd¦ÓùßöñdïÒÁ›ðg¸ÁVǨÿºcÁj~ÚÔÖy¶€‘Û:õþñE#ôÈÖÞ$²”Úk%+Š—ë¯aº¥ªGv´¿P{ Aí=I®ßÙël׫Î/æ½G?¼{cŠ,?¶‘ÐÞrãðTÒøòÈ}6©^·6w¶^þq¦]Ôû¿z¯¢Jƒ |›ƒOývµø~{‡éùcT<~ûé9R‹{R}¨,軇ºy³ÜÝ}^l*ðxi—w'Ö/@ê×£Ú½»îqÂcÅr‡¢ä~ë“¿³õîS{ûø§£“­÷õ$*²Ø”»G¹ é±ÜÿÙýIâNøn5Ò¸ yú¸ üûe» v2œpo5ì[3«Ï^ü/¾½÷¶Ó8G÷øûÚ¡ÑûX=>¨ç6j÷û/&%g§ô¡ÖÜëÜ™ —Teòdã jð?oT|ù¶tÐØA5 6Ï/þÁíáf0)í½.~ÜjÿæÇßݾ$ÂrG‹ 1» üú¦~¸}Zœ½©ùèS˜|òÝΧÇÍ(þy5)ùGƒ“‚øéí}C¾H-u·7pp&8´¶rMQRll1ßC¢ë…,zÃRw(=q}„’7Ý3_Ó¨odF:cŒÏÖO¿/SÊyÏì%=IXÍC l#zñfÓˆˆ%šg›-1V*†,J4¾]öe$§Ë$ã "ÆòÀÇRö¦‡µÒ½õoâéfÜë_úÝ_‰-d•}nc¨*Y;{“Ï€Öüˆnb¡È¡ öÊŸj”hbžØ˜.…„»«måÂ}·IÕH1OЊÙÙ‡P6ù -P?Ò{þº#c{¸ ­ ×C耊ðéçš`>¤’±tk—x±‹Íx@ÃÅÊ,5Ûúíü3 Ð33àòÕÍ’ã¿4Þ­<¼•Êž^Ð ×VÙ§þÂOjb]ü¥¯S(ÿÙi)s¨ˆ^Àìã¼@%é꧊ŋÕðzÑIc s&×Þ&´mœ¿é"Ùx$AžT~üc¸ã??5 ÀÍàòRgª˜×&·. ýZëfbèeæ|7É V;TØüƃ•C|eõñš%¬f ­\z›Þáíì*fž¾1HfÌùmÜ¿êWt™T­ÜÈnÀ\ÚóeŒH|º¹µÈˆAà'`QgxqoC—Œƒÿçb!‡Ó" ¾dÌBcq¼”&îטnw›­´ù<@F‚‰‘…žíŸÔ €…ëèÊBi”¸eÑ”l3fPe.Æ÷«ª•¯9)­TŠìoŸ"á³Æ÷u -ç -OÙ~Öø½l®¼—/¥ÌÌ~LO‰"Ô%”“ÉX9嬮B<ªö}Æj±“@ r€*û¡ƒsÿôƒ9‚# -þHù&ˆ(ž ÚµœGcümû0[dÌŬŸ?É­Öû:øà'Þ˜´¶ˆ“Úeb«õ}ó$¥Xîp¼­Jn¡ ´‰ÐجWkñƵ…ßo(žS*¿]ŸÁ¶•Ø‚þ™¯²Á//T¡w€±ò¬¤“žî›Láóï]ÓôdŸs7ŠÿŒ·”h”¾óÈ rá -¤ñ{áµ$%Á2bìI7ƒtg×­#°CN·Ÿ®4߈Dë P¦Í@e8¹f¾†øÒÁ¦òI)v;˯}z›£ëòÕpjé!µ`#è¯ÉÈÑšfÈ&3ev'–±,ìƽ˜ýú¦mÔŒ6!ójS”GìmÒÛ˜íCÙƒ~èà,“ô¬áck-ñãÀšÙÎgg—ZÔ/ ÎôÇŸØÁu=0LÔ†HIôI1°…Fn`ã¸ÏáÔ¦.G2s|7Yž¹£QER11‚ ÓèG¼áJ“Ü»j³~>o-ØÛäpçßľK`ÜÛ¶À< qüÕüà€žãh¨ràP!²Â SÈü)ëÚ5ZR1÷Ùó°EãZ´ƒÈaþ69̲HÂNLãÕbn O‚»#„IjéNÕµéiwÞ ŽÛ@6q¥¿Á ýûuzØYµè?úå/²Uí}Ót×,eú¢¶¹—¡Ž| îÓSÒâI”-–µw—¯Ûî-Ýu )–3¦¬!£ÿL;º¾%Ý oöÙG‹ãh¸Ÿš›Ó aâ±°íXÃÁI`N Ö]и… · Àþ·˜°ËlD=¹ŠÍ©üO²ßÇf7³;%|ñÚ§}Ï¿ÀæMB×SzzÕ®áŽìIOšiwV/€üé‚JnFéÈŽ=mBwý±vÝf”0ØÀ¾ñmï¢H-óeàp1ôSdò:Ç´=óÕÜ;è´&`,ó eQ|e!©1BY]B!Âô¼‘’Ý@•»‘Ç?²¥Ë6?Xu6;e8‚û~$kz+ÝÓû—íèYÎ U¥!í>úø?Ö›+ì'oÕŒH9¿¥¨œI*¢T¤ÜZ¡_]-•ÝRå~®T€Úþó­wËäø@g-ZÏ"vní”÷»ýtuÚoç©ývt’ËâzÇDá¸TÄáí[˜Ê›û*cNã“ý-š]Òóö)#<àÆO—ÿìO›w.øK¦»ê2z<~ë—¹„N'Ä5Ë„Ó«Nx#ås~^ZnxyÄ UdçQC@ñéi?_JãÿÎo¡‹ÏÍ\‚ˆ'™*@}¥þBb㡈I.£ø¿K°Ì$å]¿«íÖ7'ÝçÆÙTÊ+qûŠö|7™|3ùݬçû~ªÈ‘Žtt¢Òº¿#ɨEéÕ¯’ôæðq+„½–ç8¢‰o¨¦×,,*IÅLçgóÝe½Xß"”GMáûéaóàÂk» 3ÝÇðgú©ܵ¤†g‹úÿÓ.±¡Àæo#zû}þ%Ô×èdå1X‹¼ éxðÛGÍÓz ¿h?HýsCmë<§à4y9k”<ëÞþ - >{0Íö|ò±žÿçñš§ñáp ìÅ=Jì.b0ÔyƒÍºöèmI^£rØLÃÿª›oŠTl@½T8 ÷ê]ú2L‘ýqi»¨¬]OH”@Îß®<&`¨}‰í/Û±½*„¬?Ìò¦¸ˆÀzÏóó<èõûƒT‚—bòo/:àQiyј[ï6_½f\)BMbü·¹RÑÛøйš¿1 bÞ©@ÉúüöŸÕ|÷vÿ?6Æ»7>σLøm|†·é -» ›oÑùø -lü6ößýõíD 7 ¾ÍižM7·„Å‹×@ö7ŒýtÐóvÙÃ&¦ó·õ¾<~ûÿ¦\  Ï×é -v/¿KQ9Z¸fhh;0±Wлý‚¿>¿]wXµÕ©zeLOëƒ:T´ñ”EŽE}&dYŠb#\#ã˼¹ºn'»ñúGyañ5&/7¥:ùTj4JTظŒw³ñI)™`!°"(P+ÁMZOI²Û(#ƒ{ý¼ ,¡êÉáÌÌ)Ý Ì³²§_æ]¶ HõÄFƒáoñ< ÖàËs¨Ü[\ÈØ/òÂ4>P|«åF% LäRVàkçÍú0ëP!À¾všC=bÎ l殨‚Ü•4'˜ 8~ù —þ·ÝžË€ —2TqajŸÛ¤=L’KPHŒ{7iI¨I'Mú¯IóXR¯Òº¦ëƒVÜÅŸ8–~›-(HœÑU•rÇÒÁgo€SQI˜Å©É ÃUâ€~Y ÷ïJR9Wôkª‘E¿þ,¶è¯£‹`ûå§M9Œw·†J1™‚¤¯þZ!1Bº‘‘rUsþ`fl8…EYW"‚9µQÄèνÇÕØſΔûÿøªÝë*cÌ–ÿüó‚X¾Rb5iÄ\Ðj >O)]ý‡û€‚à±S=ú¼lƽƒåøa¨ƒ?Z_6›g©þWð¹'ö18ZÀ“‰ºLMóx¤.„/…—Uúåæç4/§ÔeÜW'à‡Y ÛÅ}µïøe Ã˦Æ59ãvðÛ -_Ò¾g › -~Ù+ðëtr}nºà%ÕQOÊùî8ƒŒzšIÎOGxÙ‚—ŽôWäh†?Æàß“ÀW“uIÅzFz¶ÜóLr1ÿC~’‡UzÒDµ™Pêw¥¨•H¸µxóx6dÒ +pm¤'ú@rH¯ÄB…LBc o‹ëžÊe<¥ïЯìýŸŒý)F’…õ’l:ºŸxq$\«mÄv›þ¥¦N^kÁLžuóIßä=ÕŸjtZˆgÛˆº ¾· `˜¦âÜÞ¬oïjpvª#ð$ÿÎõÖKQK¢Þˆúˆ~ʼneÝÏ÷øû,jL¤]:7ìÙ¹<m©È&œ6î;Öl¢O~%6™=vì®GÄú²­íÑ¿ÛÏa}ÛÈêû®š~Ðõô‹rq¥ß|¯úÃ%ë4 ÁkXc0;•’Áv5õ Xe¼3—¸Íª#†ºh²«úÊP.†-††×3tµ—Žaø³9fßkÒð=úª‹éÖˆÌÆn£i3«ÆíÁèöjƒÆ@ ëcë¸Yc0fÉ¢±ÜÙìŒM£=lü¬g'Æ1ºv—sOϸKµÆ«ÃÒ6Ïm‡É1wuLîÓ¬û¦Dqï6å«™©ÖDMíµù`^WeÓ‚ìÚLÛR~dºlbQÀÿL‘0bv.ü3é'æð·ïbNg‚spEss×0šûýñÔ<+JæŸJš/‰¢ÖbJ̧WÒV³xK¥ˆ%:<;-Ùcêl©973K§l[¾öHѲŽ4ËñÇç±RG›Õiìé¬ä u´Fsî5GèçÖºq?¶v÷ó¡ÈÊ}ëf=èY/ûQÏf±,6Ü·Ù‚9íÄ–úB¶Š=õck—;'ÛX{6ؾË>§í¢}÷j vóH—°ã™|Årì{öô9³¶W§g½;¨ö鑶o'›¶C»knCÄæðqG¼rl;Š?‹½ãÃÓ'_ývÙ±q¾¯×å'ê´%ze'iœü8c«€â,~˜ÛÎRHï[9çOa÷ãÒˆËñþ>qùf:+yÍ ]ÕÀ…p}¶ -C DëXNP³9B‰–nƒF=ã Z¸ÔtèÇ2ÕF'uƒî\Ì7—4 «X\X¸aYaù1ZÆZ{/ŽM°äÛåj¸á¸ŽãxØdÃ#ûô^L»xÇêÌâ@“öâÇ’ÎDXRAº-_DÒóÕ"jÞDøõ1â»´ô¹µí*ª1¸]—¤ÍyîBצuw¬ú‹{ÞÕŸÝgBöØ6Ö‹Çßöj=ÙdÒài¹ªÏÔ±D=G»ÕKZ­‰(éþrd&ájÍ÷ƈœü˜È£¿kôZûnÒë·Ì`ŒdvXìx?"øÆ;;í­Þó î-åjÛÊå¾b2áö}F‚ߺûöëª1ÜÏ‹5Âøqð×Ó«ÿk®ëݲ¬ën=ÈhÀ³¢Ù@w¾:ÖÍpJcê‹?û ;™ÍS)Ó9ØL JÁY»` -^Æh;„šužP,ù½ÕVÓ|hìë[BÇÅçWØí&ÃëÌ®ŒWÓðèC_  -"bÏO‘pj2ˆTŠÖ|dôY³9¬ƨÑÜD#•Ó Z=”jÑqÆžŠžcÌUͺbq/aŠ5Ì$6Ûnqd8ØĉqoOϺËx{Ù^Ä¿MãUÂÚ|'üõë6Q< §Ä0‘Õ%§©McH:+V"ÇK‘dãr)$“ìGJß¹ÎRÞjåœ*TÎÔ ½Š§_åFÚeŒ¬Ó ŸÕ’nõ‘xzmÝv3¦ö÷9t­ü™Ê|ÓÊLª—s XÂYÃ7Ìæ-%;0LËÙ£ÍrÊ¡þb2—ª6¹Î*Ém­?˼½YŒäãËw¾Õ›&óßþì©`¹â•Bd®³ÍÕ °ú˜GŠæjï\ ?Š@ð~¹¾”̾S·á ¡Ô0Å­¥ÕGï»lÁrdH–›­5^þN‘ŠÍ»\UâdºWi{t•Ê6ÔOUåL°š¢xµ§½Ú«ÇôÆTÃWc]-í_k£ËðRG‹kÝ—ÙkëU¿Ù 1Ô6ÒònvÕÐ÷(ñí}ÿð¹¢ïÛJ«ÐpÍ­FÖõ>i «–CÑömM_3jÖæjsyYLZÖ釮•è­ÏF¬Þ:5ƒ›Ï0Œ}”W‘òǘþn[ ·ÆÐŽ/­ö§Ï mŸ‘t‡Ì ¾;U›9ØYnÊÓ®íKïí¦­IwÐÃ}ŸÈx½ø ¬JÑϦ=°ÿܦ-¥¶8[{Eb9ì͆“Hßž"ý¤aýÙïO‘2p5†A°˜ ZõFi°oþx‡î1©V‘ÏÅpíµ¶FÎV+=Ê›1ïhÚYÙ¾,îüõ+¹Ã6_ÃÞe:Öç'ýq4öÑÆjñ5_«O‚ïµÚäcöQ›œ¬“÷©¯rùЦ3Ö›î‹ùñŒ´/¿gõ)zšm?z–¹»€zæµðgbþ“ ¾/ˆÜqº¨¶;×Åf#–Nä—Õ†q´Üœ÷ÈŠ¨ï‚«škû±úÙœNkwß\×[ÞzW)éó›¬Móß¾mû}Xæÿñg¶ùHŽ›ó÷aüJ×}?Ý+6ßj;ÛÈ6jl·CøO±¯¾ÁO³ q¸LÄ0Ç‚ðÞ;¼§Gq¢„ØËb{ÏéPW¸k¦zãA’–ºûŒŸË ¯©;ZýŠ áºæö“Ê.ByäPcaž£¹Ñ¦>3ž\<ç ÀøV½ÄWox‹±(Ø4lS‡ÄÐÔ/bÙM3±?Wx¦äN­QWgã¿ç÷Ô÷Ü`¾«-’EŒÜ ~ù²øµû5—Ùefì¦øÍÏÓÀ’*£.wÃÌ:˜5ð­íÓ­ÅVð¶ãMtÐ"SR@ØÁzêÄæD•úu/- É ù>và’@Ͼ6F…ór7ÖœÛoˆo¤†´Æ³I¿?H=]¿œzóDÿÞP X[/IŽ%uºÏŠG¨»û‰fdUr¤ÚÌ·O¿#‚5j^îÆŠfÓœ,P#îî¦å€ÎÐlöÔPhgŽ-<Ùœ@ îýݬš¶hÍd‘qúp­( ˜5>I ç´w¤>àXXËý¬ºåzÈd’4¨…P°ÓÓЇu¤VÒVÝ‘¼–¥€žÂœ‘š‹â;ì“Zûcu[º¶àO«"RØbµ­c) hÆŸŽˆ€2Ü’šU}ãã”Ú ™Aî]r¤ÚÌ9hظ>’@³ök¬Jé±’:Ó|«J !®ÓùPÓC Ö;ôÖ3Ö¨7†@ôzP fp`KÞD—Úu˜E@ÉFióAM÷7ÁH?ch©—öHÕæŽg fltu’ËZ¶žÖ²@c›Q2.´gAù™J%dÁýâln¿HmŒ¢AY •~®š”üaêø¤ÇZÒ]ËÉÌ' ô£„íe¶²®ìðÁÑ“µ| Û_qI íèÄ* HF£ø¥-3Ö¾T›i •êò»“ -Y%.Î:Ì‹ì¶f3vä€fÐQý’ZYN½ø9)ÌKúÛAʌ՗CÚ´Dk/Yᢉž®ížµÝ-šª.h^·#4 dñX¿¬ïzèÆoõ¬Œh™ÙipSÄœužÎË‚uˆ€j €A”œH_GfØØùnWíïý4Ш9m¡‰gª&èà(aËÌ… ¨‹ -4±Âæð–Œßhæ*zZG- Ð@Ý)i®•0CP"Ú*•8 «®wöLz5½gú~£¶s©çPüŽ;Ÿâ“]Ëf BÒO>S·Uê¨ùþùuŒ„Ð|ßv‘yjŠ`ãsM'õÌ@ÆŽú|*Åar“éÍè1øüŽl´¹ÕÜ™HBæéîä­r©§pös—‹‹|z¥¿Î‘Xµ®Ë<½‹ù‚î,ý´ˆJ6›çJcLâ99ªÄ"W“ÌÓâ¢ð~8$Ÿú*Ÿ˜Åí àS»ÆJ¨žK1̓§¤±5î¥#2OCæd¨“z -1VJXÛúÓ:!óuÎ>J’;ôÓr<ó¶駕÷Õ÷y”¶Ñ“xÞùÞg.ót{Ü;6sŸôÓî v“™§BŒ ¬=Š¾¥¿?nüPâ鸃‡µvoFcóN%sÑVçÒ_/ÐÁÊô×J>5´ë³3R‰J==£:«›Í4Æœ÷ÏñD¾ZOláS×ýŠmÏÈÀ”âžF–ЧA6ñçôߌþBkhI‡õp¥’WNõf”kk1ˆ!öÔ{;5ûhÖDÌ=ËþªA èšÅ‘‡§½EÂû 5–FŒ‚ÈÁv•};P;WÈÑÍ€=.B,PkžX€Œ¦MŸ}5—ó´¸)\sТ-ÔsòXDG˜(å“ÚF ¦³á.¨ÛÒ—ªÍ R@-‰Òtx\žˆ¶@ÓÉí€fˆ’ùc¥4(!êËAé¿šý¢wÀênè) ƒàzì7֙Ѩã€RÒ¿ PÏ -Jÿi în—ÊÊc7°7/QY ”ô/”ÔAé"JYh°c©±ÞŒdR2…,P(Q´8yLŒ`»ÐLÞ("%̤ -<õ‹™†Êuv7ûÒoVus5-j«aDö=0û웧ëhcàñ 8jÎ.$Z¸àk»™g–¿’P‚ËSh¹a–YïCÄŸ­¾,—íÌŸ(šçÔuÆÎ涿óWSÍœ©—dú0~O€nö‘ƒyÖ3&>¡1¸VóõGÇ°Jò@oz)ÌšøÎÀWí 0½H$màý|‘“˜ëš›ÕŒ{½f<Þ^bÌu-x ê$ª ´õ¤l‘ ‘c,Ww˜Ï¶jàÒW«¨S]:+wɵÖìú£´ÍEd¤‘^ºÊ"E9õç¯UßÆwãÉÔ£X±Ä#ÉñQÆ”òüÑf™›?NãΠ½ÌP ­ÓHŽ/hU;7 ‰ü f»ç%Ñ€Â4ö!OîO;º0;"¼3v˜§)kõ¦Ü£•sÃ;„¢€y×߬Ê::9ÿY"ÖÓµïĬ'ÝOà)€ÿ“³1LcéÁ9Ë6@ˆ¨¹¡0[42B™îÒýêE±7Ô`‡z|³©ÄªLC-¸(ŸåV¥Evh„>X,qC“[•†Ö×=F´‘^Cô^)Õt>µŽÊb¤F%Mì]ûÛ&hŒ‰gKÝ€RN³ËP@çè¼H…Òz•7M‘lÿøb$Ѳ˜o–Þ{ÄTë,Ùp»´M¡±¤³'Û-](5&Zw|/^wcméÁ˜5*×Ý8þ"¹îÏJÛé?Ì\ÑG4Y)yBhÕL(üÃì>”Z‚6ÆÚ2Æ5%˜øܵÚÛÂ÷= ¥ v‚ñħ¿ =H{ÂL‰_ƒP -Sš’ï šðmë¤ÈiiÖCϾ$óa_ÏBÄdd‚Ç#wš^Ÿe…|õ~cRš_þËßU´-±ò˜@~R!=ÎOedÁñÑÛ ï\L¢S~­ì^ÉõFE—¨Ù_éä:ãÖ¬šù“è(™²ÙÑÕ¤<ƒÜü‰D:óÇrþ»<±›ÕËÄp‚ób§ÿ¦1Y½ƒÝ÷ŸiìiŠWÀØ#¹î)Œ yíK 9ÚÓcìZ ¡á‰N×!T\sp©¤eµA½t|‰ˆ9‡¼@+ÇÇ–9õ¶´¤kâ/¬Êe\Å'e÷^ŽÆ.QÃ/±Ãõ†ã7 öØÉÖ¶jUÙ±DΘ‚šŽ|°ZÒã®Èvä¸uD^¶ÌÝÉ–¿êƒ1µº!”£,’»f¢3r+“ŠæN7¤%nF7êPÇÜï|ö9uQA‹>¡YƒÅN*¸ÙGF ó x¤¼;¨N¥å÷xI}X¾K÷ @¨ï«fßù§€Æ 5Bv|Æ¿\/zù¤st +)h ÒT+#Ëãƒó -{~|Ì9òÝ f»‡gìr:ùw]`Ú®P³ø=²”÷uÍSÈòü’hž,\âáËÝÇ -WJš¬u‰g!)ˆ—øó¶ 'ë¥z¥‹g• -BpxVFê”Gr)Äü¯†fæÖþ#‡ÜT¸Û–ẽ’c[@ççMûÅÁt¥ÊV:vBï?º•)P£1£Ó3–G±½†ãü; -)V °4Eiè‰r¢4mµ.Š…éGdDiÀÞuÖËcÜeϤ”·A)‹â¡(Üe(B Ë íÖKQ¼ÊѹƠ@é:"Üþ~CçÑ–ZzUZ8æJ´åÉÙú-œ‡"µß½Âhéyd.T'ËBìxUQ²:YÖb¶ ý7À¨: ÙUÇj|jUXÀ„Ÿç|B_88ªùxäP¦µ»lÊ¥n½<¶·ÂÆÐ×yrà3v}ÅOÍ 5oª6=%Š§ZžòNEŸlçÑ -”j…ï¡zkçå“ -ªþ¾'Ð+Uî|‚Æ„çƒ2Mñ,WJfñlc'–7á=µ' ·”³{ÁÆ^Ýnnz%Õ[xìóÌŸ,*›"TÊÏ ÿ˜[‰£Y%8ZKÄÑ„þcÏq´½ZŽFÏ‹ä.ÅJ×ßp4Xöò¼ÁÔl˜j8Úyƒ¿.)%‚Ðо¾ö[ÂÑZ"Ž&OcÛQÏÑxš¸D;¯s´ÅÑ„^‚£t~i¹*’–„De5h()ñŽ¥¥†˜Ž˜€±Šœº(ÇÙ?åsÕùø¥-<{úÊA®¸)–É*žï?–êac"辶4„iè©ó@iT±˜¡öÚOÙ^n¶"/Æi Ï´£ÚBÔ -ÏCµó€ «ìxåÜð*Šä¢ÆT[ýnþcJ»¡]b7l?¥US{¥ìnØ?¾lÙ€öHãS-߃Æu4¦b7ýbùâ’¨YkçúWù}[´þvkËÊ÷Ïíbí_Ê÷÷­ôj|á·3’u$¡÷BAõn8Ö–qÙe¨¼j R»!t -·‹vÃ;ß—'œÅ’RGi7äûaqn²£ý^…'‰üž  nAÊX, ª )Qòudõ«;`Vµ %Öö½U4æQј -zÛä1ö”rÙQ!ójžŸ‚Å dºVå™ÇYz©NÉ‹¬*DMѶää¶%”î™{¡J)Ú–„RßÍwMÁs?%]Η^•|/5ybIt6ʺ‘zo[ØØQÅÖ"ïP/hêbø# IW•=Ì$·ïËy!‚¹Tå|Ë…¤ˆƲH:]Bo)IoFÎîA—$ÌÂ%?^^Œˆ“(i§p xüh9ó»Þ«1Àd3 WB>Çè—1tÊtT¤ðÄÐ1ðd"茽C§AGåTùƒ:I lÝMã{5†N9‚î–SåÕ:I lÝMy5†N9‚î-øj rl´à“1tÊïi C§A'Éõ«:ehö¼òÅ:‘C²h¿îÈ5ãA…ÚË—ëäã€bGá.öD§„]:= -{ O̾M vÊù<Ò¥»$8Ê¡ü“‹tyòãõ¢.hNYl‘«œ·m×~zÕê—æX+·Wªr¹ŸƒaZÅÙœFÙ¸ëPJ$74zí§Õ:ƒ(»Éº‚=!»=8øWcéMÿ…© -Ƨ)Éüê£pà £†ÈSòAE„–¼N#tÁòØX›µ …ˆÌ#\%{k; -6%5j/¯KCL5*ƒLÇ¥³ìG†3±¥7£è Æp&4Ú#°ßϲ@Ä ìæ}6 ÐXï¢, >Ç'4·ÜïHX+?Žï¡ìUÞsF+….]¢Q—xú¾šàB^—ä}àÙ©cçïAŸþÑžûDßNö0ù©õ™•‰áË–O4ö ‚¸)6S«dc² ¨îuöúÀ«þ™AJGÌücòG!¿À؃TÊýâ~)žì=ݹ:]"󋨑e—9Êæ«1Ä.vÙ&…-2 Èž‹-sN£ÿ<àΗ¨^£&ÄM…²'2íŠ&‘=M`ÄIQ OtµF•ª¾Œ b©ÖZdpò(PN£f’Å'#òL€›ªµÿŸ‘üã^)‹Ž§¶7©3 šÃäT¬sµr$>8OœB)2Ogœ–‹½“#å#}vò!ðbJV ?z'ä:<Rtöúÿ£ðdÐ%ƒ‚<öÜŠ\Ìj–«æa|9mú%žDþÉßù'Í;ÏFÆ £ŸvŠ g{Ê"º¤¹ÏtÏtŠxOL—Ä9U~§AqbË• SB‹L+œEBï?(»­‹iL.<+¾d¶ › Æ~žs?Û‚¬EFh»PžƒMÏM¬W^·ÈÀ04‘Eæ7ù”`ÚwÑ€$#R a‘ñg7‹ŒœNbÔçÜü”dÃsvÈ\Jn³[ö±ë]j Ž<ò”S#,Š“maÊž[:^Ö&e­¥øJÞ0ÑŽ|(ªð}8´°E44žEQ%…ŠÏç »Ï ç\ÁuA}\[$]ü2®N½ïº¬–ãêT„È…Ž -q5 Y#èÃà:‘£€¬3‰ÎQÁ=óö¢º³²‡ñpªòõ½'ðOf#âþ:î·4ö\<œ¼‡ê_Æý&NEDêÄÃqÑ‚¯E‚ ºtgö–ä–2ý>ŽJ{.TãÉx8¥<$GÏ‹8"î¯ãáh(∸_ë@KŠ$'z>^,£®îÙùyéþYá‰Ìo©&‘¡fr&"—=KRÁ‰“N—¬S­lšà»htèy ¿É<¹9À¨:H<¯›_ù 2 :]3N’œ9;ªÈ¥wÑ[xSŸ™FÌuI”Ò§axn¦6X2á*´oUÒÍðþËF‚_ÙxÏ”Ìtú™nŠhSôfD™{yödÖ¦$v«DùÑX¢`7ÝG·Æ7_ À"d¯+u#ìÜ–ŽlÜÙéúÀd¢ÔZ–JêôÞwË@6®«aw äfuŸ-) L„)?q.墱, -Án5Î* ;›¼ÆOR»Á"—?2qg…;mfì”ÊÖã+†¸Y½ vsWR_rÁn#¥rqzR`EØeëºO ¾œ¡º.倾+Öã«?dŒ¦Ó­ŒpVõtº‚Û/&ïj »¤Þƒ4&z“H¢*ZD¿¬¸Š÷lý%ÍÏÓ FÝu‹EQöGb;M*ùÜó]ner© %X€TExF”zʽI¹ŽUXEªæE¿¨.ÑP”’‰«íIÊû“Jù\½VINJú½ËÞðr%9ÞÔ±{½\¥<Õx&={ès¥P •Ë#.éקX÷íŠÈÝšºsžKãjé`ÿ°Ø|T*ÙN=¨5 ºK*êŒð‰ãª¤‹§êÕI <*¤‹'ëÕI¹Oðêñ=¨W§OR•mE~°*ñôP°‘€LXÊM¶í³]‚DÏÓ¥d—wÍ3z$ÈvIÀa¨’wò®Ïái~QÍaÞå4"‰“çmA¸%HWª2ƒý¶Ìc2…îžÉEeîÔÕyµÌbµ¬[¡»W‚©%ü²²ª2wý“a ÝË!eƒŠBwê£Ü YiBÎMá×eîn{eR©ÐÝ-¨ê×V!¾ÔGD[6Ý‹Äp(þYœE4PWüÊŠÜT†Ci¡ -`~yhÔÖ)ç« >NMµ¾ÖŧÒðËzÛªóþUX¸0¾PέG}TDÌ+Á¯|OÈ¢Ê •ñDµ-§(su¬j[٭«9Å3ù ïôÆ_zC5þΪ¡Òêgxm+ëõ\ä£å©£Q+7}¶órL-ÝŠÄ–'ä–*ÛQ\ªë$Zþ¦Ð$Ý”UsK•µ ŠÁ½ðé²ÂÆ’ÊÁ+êˆÐ®ªÆÏ\$ªÂGæ÷ܪ*F™§H*yPiÍO…>Ôàîƒ"M*ZœèþJdÊÇþ+~ìÿ°‚áÇþåÛ’…†ž| ZŸwïk Ýå)þUèh…wDüëîûÅ -­@ýE¡a`…úB¦è°ñ”˜CžTWUX;ÖN$ ÏÕznÿ2?Õ]äã_ÖÂVÖ¬ßù\ÁvžQ­årtSí¼X [QÊ ÷\|{[ñ :¹å“ñí‰eØQ¶ki ê—aÀ¬2då.ˆIj´­'ƒ˜:”Ú.˜—_'ž)ªílVsUŠ{ç—ALÒSÖÞÕ1ÌNf½<Æ$b\ŸòŒ™£êN©¤IÁ­ô͉†I§ã.Æ5é|Xó[I0VÊû»r‰Î -‘?y6Æ5锯¿ÊØ0¾pb\“NUÁâr>ÐØKæI>ÆÞ/VÊS—¤JÇœVËl°HÞ‹å9Í‚êÔĸr«ueFi’[ ÙU -âálÁiµ,ô´Öa3„½\Å9ùÈ¿³63s‰€RùùÙØ¿f¢.”Ô ¢ÄÄ@¿”ÊÜ9üË•¸[ÀvfŠCÓÜU)(ù§5‹BÓ謳l”#&†G#8ÜÊWœS¨­çîö4¥Ø¿­|À!šÙ7›²@¥ùjÆc€+D9Vêy éJ/+‹^AP¼P<Öúݬ‚¥É€§~1tP~ò1æÍ ªÝý’º÷,5ú½[l^"%ÄÎÛÒÍ\Ä['k'–bGR»¸¢PZµÝç—«÷Ï»MJW1{ä -#¶ÈGÿ¹ìs¯ør‚.=vÄÔu¥ÔºV©¨ÌÒK½ìZuÓIì€¦à ©Œ')ת_F¥=åZ¥•öÈGS==íeIó9ßžÔ3åx]’Ð,`§Ôz ?êÒHt–ô{¤«ðÒR¹^~Z"5›îͽž#ÎâÜß±«®ýð6æaZ\3å6XµYãÔÔ~J¿|nÍq˜aúåS0´þëö±aú—v-¡} ÌùËGÖR–å;n©. -ðÉ$´R{%Œü£”°©¤³'k‡Q]’û&TOð½8fv¬-V«â0üúW:òËÆ`ž?£è5÷œ!&!ÃEvþg3 m*tfAöÞÎÿBt›‚ܦ&Gïõïòr sŽ|—ì•«{áMX¿Rd•n›Ëæ9P%ó;%â÷r¡€*æúŽòùý ¡œ~ùÂ[lNHÕ¡€Žç‰A¦Ê hìa-õýâe¢x½1ùóÁ_`L²¾Ïo1ö00H}¿ˆ¿Ä˜[c\;Lc2òá+õxñ/¿ˆTÏ+¨6Pcx% -ð7öäç£Å$ (Y]u ¬ ç õ«(@µ1€¬§Ê¯¢Õâó¶Wþ. -P´rd©MFGV¨6PBGVŽdzs7*‘ô$,ÊGÓXþ©¬UÏ哤dŨ­ßå“Ò,þ¾(Ÿ‚Nuàðã¢|”_ ž^*ÊÇI}ÿfQ¾V¸?*ʧ3ò‡EùÿEù$ó+á©äîËÉÎ-u¹¡^¨ë§¬åÒQ¯×õûÃÜP -uýžÍ õ»º~â¡ýAn(‰º~ÊV!i9ùùº~Òsõ¹¡øuý”ÍeÊñ•êëú=òþ›º~·E*]ÕO!KóÝCñê‹©¨ë§lsDrýU Ò]U¿_Õ¯”¨ë÷¼Ýò7uý$£îX‹“bu†'êú)/\yÕçêúÉÎнâ/gCì(GÌh¬_µuý”é\$ýº®Ÿê¨´—êúñ^–¨ê'cç,·Šêúý–Æž«ë'ç0Õø›˜w¦®Ÿšx±×ëú)·ÂÕã{y*TõŸXý¶®Ÿ²››Ršgêú)kj²¾ÖOÖõS -OiìTV2zX×/¢XÕO*í7uý¤˜—ðùl©º®ßëk_M]?•õø^{P¨ê÷t=¾_¥¨Ç÷zÜÃ]U?Ñ߯ëúI]q'œ•²ü£º~Ò¿-B¶.Ï‹uýTD¥ýA]¿[ü–tU?%>öL]¿ç¥ñßÔõ“ -Gäá‹õø'ÓQYïÕÌ·z|Q×OÙþÅF¦¼X×ï7už¯ë§¬P‹2þº®Ÿ`ÌwUý$´×_ÕõSs4T×ïQÖ¦¿©ë§\Õï¹z|¿å›âz|¿Ÿ¶"VŸ~ás%Q×ïQ0<”.þ¢®Ÿ²wsšðr]?Å`øÎ}5“WbžäªúÑ»Øëuý”Õv:üëuý”ÕvZy½®ß cÒUý~¡WJÖõ“Õ+åNEU×O©Ký£ÊlóªCùª~bEU×õSÔHl(¿©ë§+)ý¢®ŸÜ¼ÐUý[ÕÕõSˆ}J†Q¨ë§|¸pŸèwuýÄëSXÕOÙßR}]?eŠYGs¥”Üλ͡äVˆê¦÷¶^’lS¡÷o\"Ӯ⦤ã=¿¾˜0pQì%,´aËÞ¼å¼(ÆÌA\¤pÉÇ7w uQ†˜{–+âp™ÊN¢ä×ß^)O'üG¬ËSÝå0ŒD»ì‰{HÛy•wí¯cSnîók ÖhOÿ©Eò ϼ»´Ý!Ð7Úº”a³k”LóÕÁA6JÇ‘w3+-c›¯Êª8oøý•~îøÑÀÅEcU_ÿ´²®òõc”µ˜G£¤ÍòÝõ|W·5[pq°}Æ.ÃÉÐ0›N'Bh÷ó½Ë€êWAËgiúaóÛÊæÈQ¿-¡3Ã.u:E5Ä:È–ìöË$‘êY‰ê§Þ’ñ†-sÖfòä´¸`ç;ØZª'ájJò—Ï—áG`Y…ÂcmMÀUy·ÿð1õšÆ=îN·ǘëbMÙüî‰+‘Æs1p¯\ˆ-ZÍJãÇìÁÌC¡ª`Bóx­ôŠknªm¨Ó™Ù+ž -°†’Ä'ØÏ?Nq‚?ÞÍ2­@Oòäðƒ>E ƶq3p$1»iå‚ë×Â_Øþ ´ôù‹Ô^²ÁÕTtÐkÃ>ôÎÙµð~ä’_›ø Š'@ßOühwŠð¸$?jò +pâ)Gφº²1œµ27ñ´d"Ô'ZjIV˜ |zïMÛtñaMƒo"ZÈÚh¥`¹§æJÇu¾(MY³F'n^¾[‰xÚåh‘‘`ùBÒ,®ð÷A˜íf%öâÙ>ŒNR ÀyQÝÄäüKTÞ,½‘ìJf6øÙG õ÷ªÈ°6â‘+•‡D¶Å9Ûùî'÷ž°ø8|oÈö$]M^qéž´,¨-T®ÜòßëöYÊêöù]äDUe³5²›mì—ó‹àòôæCðr­»ç.)îÉIð|%h¬¶¹ -º<:.'GÁå\ÐTwuÎ~w#h»»¶}ô»{Õò/?u:þåd"èÈd~bl²te²9 .w‚ŽLŽ×Û¾Ÿ3ÃÐ%Üè=<ùÝŒàìãç bÇ3EÄÚŒËé耓g72ð¶2wj U3%¨ ¥h%Á·êdÎ,ˆ„ð‘­p oƒ»›øÝ8P›±çg235ûÓ,Éé4M7‘Ü^;ð¥‡nˤñ²OdQcZPDg…Þ‘‚ 7Y»h›$Œ•PB¬†°"¾ÆXîL­L(íÞÓ¸éÐ2"öÕwnêQcŒ|4ºÚ„ -ÆH°TÇ -j ö䎥1 ómÔ¡4(·Ó"•"=Š{pJv›èŽàËg‹–‚¯î÷e3ñz²—*æ‘PzùÓ)žh ©¨­ÑL%sý‡Öá1I›ÒáQ‹Y?žèY‡Puùä¤LΪKO ;·U3¶ n¢nceM¨w’)0³G4Ùg´Ë(ëãc›?/yS¿›ïòÁFk¢ -GàÀì椗=b…”³¸ükŸ#%rÐ`âý£LI.ÜzäÏu¯ðT-îú‹;Šº(axhÐKà£OOÏ>eµ>Ù˜÷jy'¥ñðÞ£t6!d!8ØŽ -œÚ„.µÆnÈ¢¦Öã`Ö¥¡è*6×:RŠRÉï€F°Œa9o4 eŠZ³¸%#ÙøÊ‹¹ hÇâ£ì+mhѵö$3øhšñåäÃ&Ëe †-zéÆÒ¡)cXšŸ7&Ðöw·èÇI8ñ@2«-ìxÚJS½¾VÓ³õî Žì¿GT L×z/ç«!7*ègù(6…ü°#q˜.V˜+z\_ÁÙ˜Òa4@¨Ìgx^ùž€ãɸՑ!ÆOa ‘×jaŽ¡Å¤×‡ÙÞFê-ƯÚã4q„tc6è×ä:»P¥æT)æ\ÞLC%”‡~VŒ£&ÙûmÊ…'M̵¶»ã`,–Ïwü1:\X6™ ¢…M)ÌG:u¾ßÙ|Ø"?.þeéxÙší=J£ŸõÂ`ö³¥ï œU(—ç6íKO8 ÷,M%Œ™s­³­/G³£ Äì-\òa #Ÿów˜MWÞ]ëZ>‰Æ+fnQƒ[˜¨æ³³èÌüÞ¥íq$Gíû|¢c>d |ӼăÛ^YØr3M-a¶æJë)Å›â0åkűFˆ/þÇIï%ô>åé2°¸œÚCýíf¦Ø6 WPYšóŠ›ÐFÉD§ IçíÃŒ‹æ¥`è|K¡Ý´±f‘ ‚5è1vµD°æÂ"ß\(²Ið’œ9ãG¨•UxvPHc-3k ­ð-¡Ù¥›5øUœTî6,§¡´(È >Àh I.ú/ë|ëdiƒ˜­ÛovË©Þ`$ {yOG¦Ž0_r16Êh¢­Î4;­·¨faÖ¼ŽÚ:)ÛmQ³8ÜÐJÓtð19gB Âr\ï‰çÒ¯M%jkåm¢·¢%I¡_›AèšÀ-¹LˆkZ{^n±^ -³-&<—š~ž|ú–ñÆU¿NÎj(Eɬè0aŒ1¹w‡Ä¼šn¾=2êeI¥í`L’õ$TåÛ®Ù·Q ~,ðÆÆYxÚ”%iô¯Û ™çfÜÃñ¹ŒôQóYyÇP|un¥§ÄnX™eè…:4f{Pæ 3\b=öäÑ›- ZÀnN]¨+â6ƒ%Üuf08Ž¨a˜ùG‘˜¶ŽšA'’q²¼fMÚV š*„ö(x¥Š±¯ iR¡1› [ÁjúŽÐÇ7c!}$ô?×ïÆÞ|¸Çóæz¿þÌOÕÓz¹Þ½Ù5A+žÇ°Ön¶Ïœæóæüÿ\Rûéu;ß]Þo®x#™Ïû<©ùt?›¿Q+ÏóååYeh茼JÈ©4e¦þì&§{S ´ŸbZˆ\žb‚5Ø"›b˜cE(g7àe†V0iC¶èš^1”„dÕ¥æ§Ä5m+—Ú¢õtS:ÒG txrC<ç @xÕK|Uð†·‹ÚÁåÔq3ÇÙTè²·Y/k)ëV@³ºK¨â†Ãø€½N±èS>b·Äbðn±ÕµÄ6uVàƒ(âˆ3Ä^îäëQw‚RªO°DpÍ ˆd'3bÙ~mOÑ25/f_.#´ Þ‹6Z'õ5¡÷o/ÐBè¢ ãP~f~}Ï!ÏY˜ub:BÕ.gc.f³NÀ%ô*¹™&­Àåf[ϣ݂Epñß(ÜkáðG ÛxÆúdøö Ö7o$>[ÑÛ£¼‹{@èƒËøíhM@,îr6i§(Ô#ì,à˵‚ÅÛ§N -` ~_ÁƒwŒº$¢-\Öb\Û#Ê]ÜËP{·õ¦ˆ¥6ð´ÁGg0õQG´à¥ª ².;pÔƒËÕ¬•žW­G°gd6Þþ43:zÝ-9¸Ó$º÷ 0–rCFVMýæø*)Ïdoø%ôp—äZ”j>1PÝâM—¨¤1Ó¼™ÊψXcÆ…»îÏHw;H»Ù¡ùä5©R§¸vF š´\ ÙO:(6)å-àWc¶”Éøó8˜«É˜€Qà÷ãSóÛ²gW¥Êe×vˆæcø'J¯}ûñP•^ö,_yzg„kÿ¶7þ{;#ïìËòï팷7þ{;£0&ìÑi)c_’6‰±ëáfÑ 6[¸‘žq§RSãý©T±ÍJáÉæÄ-:Ø‚«Ë·¾ ⮓ÚñÑ©‚„»[…ƒ-w·Æ?•òì3âˆ|n€¶6¸ÔÌŒÍ ÊÔôâËŒL¸e›ðB -5cÙá…4maîVæÞFkƒóçaEÑ™ Ó Mýô¹LãËÄÚÖ1åýÝfÔÎÇžüðœÇ(™™gÕgŽk†Üq € Þr6æÛ¼:½÷ÝR¹¥_¢‰Ã¹W¶Æ³6c*9äãƒ&*cá}¿ûÂÎÙE§I”,Ìœƒ º8¿tÚB§ú¸õšï‹Db19e'‚®]¬8¢ifa+‹öbMž>z3qG‹\èÓù^ˆ›k³¶çûÀ‹Ø0ñ§öWÀ,Ó!…Jú¼HÍ0h¿Çû&"Úç£\ˆ±¾øM ÜJµÈ^ñx×LeÎí£šAš9’Cs©Æ„µãÞ£eÚ3Œ+À¾9`\ -Æ.f wÝO‰ä@†a¶ÑS$¿qËW$‡Bù¿,’ódþQ$§#5}ÿ²HçEF„þC‘œÏaþ=‘@áìAÿšHi å¬Hžà¦ìÇhOÒ}ìÇ4òîcè<ÆóB»ýÞyìü?M`)a£ônÆ7i p§1¿\ðÏ(1_®w¥ñç' öFÿ‡‚ÿ°7üÍëƒv&ðúæ7K™zõ°¼•vÃÈ?]Rëée½ßOÿ} À[r©•O½ÞèwGàÝà›t·Á# 4?@Gô-þßù€?€_U êô‘$é!Þ–”é xá¿à¢~|ƒ[ÿys¿•ßzôm¿}×xPÒIî7‡§þÝj -~ì{óû°}pëö™Ä-î»…¦” ÐFÇáx€8ì†5)ÄáO Wƒ8Êèg´¾¹ éšÁ›ÔÕx;ÏïfóÿC_7.ûÓo×Aj SoÌ4ä›ÙòÖi?âÃ}fîp‚=L N®ð'CNo ÷N¯Ûâo¨“ôúÜFý@=>øáG1?É"!.Ï=FpÌã$ü~@=˜Ûésƒ¡mÁ=ÜéõÜ-îöQ7<> êuz}SwP@JRƒùqªo˜ÛïDQÔó†y|NÜû†y §Ûë†/{~@¥Ü©†$œ~Ÿ—àná [ÆýN¯Ðîí†×ãôá¾¹ÝñN†{Þp¯ÓãX §õ‚ýNîp˜×ë}O@'Á Áâñcä[Àñ7 |@}É\;@‡ Ü ì-ÐNºßÜ -îö¿9Ü$ÀÎéÀÁ§ÌåTãó8IÂMÜn€ÅèÇIðœ (±zœ+høý8CýN‚„ Üó¸ýÅ„“DÁ÷ð‡´Û©Ãq'†»¹WpôÕKÒ­0Nr œ› ÓãE ªCà jš|~‚¤:ì÷à€ÊIÐsløvÀòù@ ¤Ÿ»Æâ$P?Fa†ôù=¼;>€^·‡ž#æþƒÅQÌéÅ!9 ÑC&sÄ4¦’à#@â>/€ˆÁú£n§ßMp‚¼¨\ûœ˜Ûëy#|N7ŽB²ƒ´éöƒÁO^Ð>¤^ -aà†‡Ý»‘øíèÀé'|Ü;€–üöæý`ÚÙ^€[ QÁÞòJð¡€To­ðŠx5M5‰ `"æÖnXØìmyÏÖð(ƒ@-ÔòtøQƒAßK…+…8Äîƽp*A_Ij­Ó ¢»Ã.ΖùSàð¡>̉a¨OáSî+ÚãKLo@á˜L›‡"º‡P[öKš&PÒK(|èíóy¼Ü‡ª»KÓ `| · þ–HHs[°CäŠ)öú6Ýoûënöv^ó·í~6çñÚ#`²GÀ -—`’Àîí³Ô¬ûH@½[î–™ =?JBöèqz Z¢@wgªÄí%!šn·¼àsÒ³ÍÜ®o¦šÛ0Z܆kÀCQœƒÂ\ƒµyëÉí[Wo-Ü ' äj'yËjñ€5¶€¤òÿ‚¡Ÿ™”šj¸Rl€ )rcfoùà&†É0W’ ½°÷^lo8ÜQ°1Ýn@fÄ,ÒO²·à^Hº‹¸µÂÞàÆÌÞ"ÝMp£cZcÛ'Òí€të ûέ¿l+â1)Ìùÿ’ñŸÙ üƒð>zS÷øHfÀ>Ìëæ{Ø›°s‚{·OÙ[?÷­•4+M[³ÓÔ5~FÂ<‚ÿ\™ýi¾^ïùŠ·Ø›ëc~:†¥YÐ꧷æ7h,Ô„àî·7×{ó4ÞûÓ|FŸðà{t÷X¿›€;2+<`ûñ è6zæ/& <ƒ]©ñe ™ ýChQðܘn?UÂeLHͶÙow´æÛÅgçÔìlñó÷<-/‰9“\‡Ne÷7Çâ¾ÉáÇà)z¶´yd6õ±üôZ'™P:°ÑBŽ¯ÌÅëæu¼Y,]Ü¿¢\Œ‚yK¾lœÓ -u…Tˆ.ôQ2e£Àk Ò–òƒ±Ä2è|“·Óf±y-@Éo†¾s …,„'tðïâÁ¿Òƒª-¹ d(ý¢™1O{“p¨”+õÛI*•Ÿ-±ôÄõy¢&Ì œPj¬ìÔnó/ã ÅŒñYŸ¸Ö±`¾1öœ[/ZˆWÆÔךüß'kÅ£YS¼ì­Ñ'~(zBì+É´Þ5ÑÓÇt1šÐ°¤ÝáÝWË¡Lrf3{˜oYÇ:ŽÐ¨yá-5?GÝÁEÎÕŒÛ?ï ½”f]Rð¦2ˆÝl¢š×ÈOrû÷cg—à‹ŠIC Õ¾ÙµZÖÇÞöºÙͤ<ŸÔ¡Å.šAvÐ+{ãd»Û ¬R´¥êÝqj§Æý9•›ÏóðTÒLÍŸÆ€~׳x¢ZËLSËaÙÈBRÙÏëwƒ6¤y `Ù£©˼‘®µ‹ú€;îZO5|Vhá¼áBÿ=êÐÏâ‡ÄÆ<¬i Þm¯{³õyHš GÍMIðË¿@qûñ ½ ]`ÕzæË<À?±Ÿ%\ûA´Ù¡Éõ7éB±âdpü]²ÛŠ%&ËÔÜšþ¢ŒbÐó5¢1DŽýJ7“øÖé/2ù£^„aÛ ¥œNljYcÙ:´4_H°¤ìß¹ð0Æ–å  "ãÎy% †«ÛËl`ìís @5ÛTWdߤß;²»L;éSÇ*Yv¢ßèÒXñábš{‘ðW«÷ãßžø{3=.kçØG=JÁ>ào¯;:9†ØGg@î«j ~ 'Ç ÿ˜ðÔ6ZÀMÑbTï ;ÌÊþÊMÈïAÑÜqj |ha2$$¿™o26©Øô=ä•z€UÚI(^ÜŠÔƒR£ÕŠJBɶÎÞƒh+xNübzŠYi Áù°¶‚ók -õ…#ô ØÂ1NJ…ÂSX „2{Zòé>±œ—,Æõ×ØëÙVמÓ*nð/“ éKi'è"EtÐÂe˜Áì#SŸô• g›Œ¢SÒwؼ^SÆ€[ HO2ïý0ê7„rmmz:­åâ K ëò­µ&×–·4  Œb³ÔO°ûÁîéļ¤/%Ünñ…”Z7…öKöÞÏ}k÷R‚õ -¤!¨\úß|n'áòÍ–’0(X^°?€í›»¯à”MBúi£-R¡> îƒW<8´ªø  ÄMÝðƒþ€@ "Æí:©aïÑ @‡Ù˜[\³~'P·ýoâÎ&™ao) æ…vgAl5b ¥; %Þg\?Ä-݇AÃÇçóŒ’8I©*^hè Þ@Ã„ß mOÌ hucP!`>•ÇKRJxóá|Z0Ò-n[â$%ûÉ~vÃ×­]Д€f&q‡o³¶²" -ðÇê(>hbýo¯§Ì\[îž4‡C;”=$TãqnÌõ”•×ç!Ù7Ünð…㚸Ý`á€Ø{¤= E±Í@Ys$Š½¾»u‡{‹ÛÒݸ””ÒÿEHø¿¬¥ü©§8(…ž„¶GõÐ* y»Eú|ôÿ?è+v,»&¡WX€ˆE „qb;ýV_‘lLR_‰Z,׺V…)›¢Álصî.Kÿ—õ<5kDú -8rt1Bˆ”~­ob¶M,F «ÉaÅÚÆ&¥!¬át¥$–¦¬ l -dG,g@p"áÛ¨°Ž$‡ÕÕ(Œàñh6º -Žš{úc0‡®´û÷`ˆ"— -Ü&8,ûXƒ W Q$wÙº’¿À«¿õUÿÃSÿðÔß›§F­û žjiÆi1yL Ýržâ¯xŠ¤Á<µò˜ªaå‡Nº)੨þyªvqÔ›Hqå[±Xî·eõGQãÈ¥Í당KQó¬p+ø:_›5h?$“„¾÷M[èC?ès˜±ú©ô¨é/øM·)nš›B­öãÆêݦöÜö†`¶"¥C+õ]|¶Pøx¶]]Oß‹ÂÀÁ~¬<àÂÞOgß·¥Àq5Ìa]ÝÏ<*}gUÒÅÞsµë‡¶4`¥ã½óx•ñ32a †ÎàWdù%PJ!%GHĪ'I仹¿¾Ï'©Ž³ 5¾+KƒòÜ[=XUø¤r»’‹J·äR»½ÆN0A¿¢kKD}¶"¥ak‡ˆ\+,ï -{59³{ÈœÅÞó[˳¢{WžËŸôRK약{y¬×+ :P®÷ŠÍÇÈØÁãÚu»-Ó§N-wüÎî“Øå·è ~¯sÂ}Kú¬ð$Ó >«Zë½ È9«J½.”Ü´u¢OZƒ¾\ æ_HEÍ ÕlA¦;³2J`ÿ¦Kƒ•½ ÍX‡C×g´¨\ÖÉãë}î–Ï=‚}pq™MF+†ã󳥄¤†½xåæéÿƒ¨  Ý.| -ºŽù@O`(È*k”Å-g mvñi¸Ý˜'Qaì+†E»p4ò1Ê#i?Æòê–|e`ð3Òð0ÇY²¤4ú4EXÄÐoÈ ËÇ ;~ê æ0dU(!›è)[Ú¦šëµÑ\ c,`&8E5¡ÎŪM†›€‚QÐ% @É.Ì\˜L y—@ ƒ †yòÁ †ª9¢©ÊŠà ÚY[ú}&4­ÁØ Ü’œtb®€lSOOrjˆ£e²CÁGA) gµ3 ÄxР悬ŠNDµNM ó„¤WÙš¨»è<ã=y$§«”ƒt²Hb þf pTDD<5 yúÒ&[ˆ2€ ÛƒGëN¬™¢ðÀ#§5Q4c:á³nIã~MuÕ†(=ùVe°æ -`ã6Cañ&¾:p»%eç¨#ŠVᶳ}YO@Þ §ÝÙÀ–ÍO&C 2þÝžÎíg'<–¸ÅÖ°ÿöÖ¿:ÅâìBÖ}n}ÒÜÂf -~\ -þw¿_Hc@™µiƒ~dÿOøÏ+mKwI\€FwJ]:»$/€–_N_:;$0€ÐWS¤Î.I 8)»¤1€Ü.‰ ¶[*î˜Ì€s¶C:Š}=¡—ñ) ¶KRˆí–Ö uò|ßo§6ÝImðÊl:"·ÁIm€±pâýMïO˜³AÄ,5GBs–©äItÙ3ßÅj2ÃTѧŒ;s ا}¼h:,ôü—ºÄ-¯éðл…wˆCó_ÉO: øç>Ûà–†œÎ—'a+foæ2È~áø—yrdÝ„müÂc×;—Nqré¬éämæ[Ììé34á?ŠñKO»ÓÁÌ?O~ŽýãÉÜÿïõì·Å×ÒÞ·ÐÙl>í¢–í ¿øfË;æyûº£pk€9òEñf¢£Müj¢…2ÌÕ1yÉÊZ <>–"xäˆÀý‹PʶDpY:2ܾ]ʨ¦¹”âGŸÈ9ê¡œ«ží(ȶT\ýáï¿8““äL‰$u_íËi·?´§¾×Y÷wÛßÃDtçöÔÀ¦¶góÉÔ†Õ9ù‰% âž.IÅzÉ÷'!Bè endstream endobj 234 0 obj <> endobj xref 0 241 0000000003 65535 f -0000000016 00000 n -0000039027 00000 n -0000000004 00000 f -0000000006 00000 f -0000040445 00000 n -0000000007 00000 f -0000000008 00000 f -0000000009 00000 f -0000000010 00000 f -0000000011 00000 f -0000000012 00000 f -0000000016 00000 f -0000039078 00000 n -0000040286 00000 n -0000040317 00000 n -0000000017 00000 f -0000000018 00000 f -0000000022 00000 f -0000039149 00000 n -0000040170 00000 n -0000040201 00000 n -0000000023 00000 f -0000000024 00000 f -0000000025 00000 f -0000000026 00000 f -0000000027 00000 f -0000000028 00000 f -0000000029 00000 f -0000000030 00000 f -0000000031 00000 f -0000000032 00000 f -0000000033 00000 f -0000000034 00000 f -0000000035 00000 f -0000000036 00000 f -0000000037 00000 f -0000000038 00000 f -0000000039 00000 f -0000000040 00000 f -0000000041 00000 f -0000000042 00000 f -0000000043 00000 f -0000000044 00000 f -0000000045 00000 f -0000000046 00000 f -0000000047 00000 f -0000000048 00000 f -0000000049 00000 f -0000000050 00000 f -0000000051 00000 f -0000000052 00000 f -0000000053 00000 f -0000000054 00000 f -0000000055 00000 f -0000000056 00000 f -0000000057 00000 f -0000000058 00000 f -0000000059 00000 f -0000000060 00000 f -0000000061 00000 f -0000000062 00000 f -0000000063 00000 f -0000000064 00000 f -0000000065 00000 f -0000000066 00000 f -0000000067 00000 f -0000000068 00000 f -0000000069 00000 f -0000000070 00000 f -0000000071 00000 f -0000000072 00000 f -0000000073 00000 f -0000000074 00000 f -0000000075 00000 f -0000000076 00000 f -0000000077 00000 f -0000000078 00000 f -0000000079 00000 f -0000000080 00000 f -0000000081 00000 f -0000000082 00000 f -0000000083 00000 f -0000000084 00000 f -0000000085 00000 f -0000000086 00000 f -0000000087 00000 f -0000000091 00001 f -0000039220 00000 n -0000040054 00000 n -0000040085 00000 n -0000000092 00000 f -0000000093 00000 f -0000000097 00000 f -0000039291 00000 n -0000039938 00000 n -0000039969 00000 n -0000000098 00000 f -0000000099 00000 f -0000000100 00000 f -0000000101 00000 f -0000000102 00000 f -0000000103 00000 f -0000000104 00000 f -0000000105 00000 f -0000000106 00000 f -0000000107 00000 f -0000000108 00000 f -0000000109 00000 f -0000000110 00000 f -0000000111 00000 f -0000000112 00000 f -0000000113 00000 f -0000000114 00000 f -0000000115 00000 f -0000000116 00000 f -0000000117 00000 f -0000000118 00000 f -0000000119 00000 f -0000000120 00000 f -0000000121 00000 f -0000000122 00000 f -0000000123 00000 f -0000000124 00000 f -0000000125 00000 f -0000000126 00000 f -0000000127 00000 f -0000000128 00000 f -0000000129 00000 f -0000000130 00000 f -0000000131 00000 f -0000000132 00000 f -0000000133 00000 f -0000000134 00000 f -0000000135 00000 f -0000000136 00000 f -0000000137 00000 f -0000000138 00000 f -0000000139 00000 f -0000000140 00000 f -0000000141 00000 f -0000000142 00000 f -0000000143 00000 f -0000000144 00000 f -0000000145 00000 f -0000000146 00000 f -0000000147 00000 f -0000000148 00000 f -0000000149 00000 f -0000000150 00001 f -0000000151 00000 f -0000000152 00000 f -0000000153 00000 f -0000000154 00000 f -0000000155 00000 f -0000000161 00000 f -0000054960 00000 n -0000055036 00000 n -0000055214 00000 n -0000056174 00000 n -0000072236 00000 n -0000000166 00001 f -0000040402 00000 n -0000039362 00000 n -0000039820 00000 n -0000039852 00000 n -0000000170 00001 f -0000039436 00000 n -0000039702 00000 n -0000039734 00000 n -0000000171 00001 f -0000000172 00001 f -0000000176 00001 f -0000039510 00000 n -0000039584 00000 n -0000039616 00000 n -0000000178 00001 f -0000049297 00000 n -0000000183 00001 f -0000052532 00000 n -0000053494 00000 n -0000053615 00000 n -0000053721 00000 n -0000000186 00001 f -0000052678 00000 n -0000053263 00000 n -0000000188 00001 f -0000052872 00000 n -0000000190 00001 f -0000053067 00000 n -0000000191 00001 f -0000000194 00001 f -0000054295 00000 n -0000044305 00000 n -0000000195 00001 f -0000000207 00001 f -0000049794 00000 n -0000046391 00000 n -0000046465 00000 n -0000046502 00000 n -0000049151 00000 n -0000049334 00000 n -0000049479 00000 n -0000049570 00000 n -0000049675 00000 n -0000044380 00000 n -0000044004 00000 n -0000000208 00001 f -0000000209 00001 f -0000000210 00001 f -0000000211 00001 f -0000000212 00001 f -0000000213 00001 f -0000000214 00001 f -0000000215 00001 f -0000000217 00001 f -0000043583 00000 n -0000000218 00001 f -0000000225 00001 f -0000053842 00000 n -0000049823 00000 n -0000051241 00000 n -0000050035 00000 n -0000050208 00000 n -0000043697 00000 n -0000000226 00001 f -0000000233 00001 f -0000043811 00000 n -0000043938 00000 n -0000044282 00000 n -0000041043 00000 n -0000042995 00000 n -0000054923 00000 n -0000000000 00001 f -0000121995 00000 n -0000051517 00000 n -0000050492 00000 n -0000054359 00000 n -0000054409 00000 n -0000043059 00000 n -0000000240 00000 n -trailer <]>> startxref 122136 %%EOF \ No newline at end of file diff --git a/www/images/web_logo_linux.ai b/www/images/web_logo_linux.ai deleted file mode 100644 index a862d9f..0000000 --- a/www/images/web_logo_linux.ai +++ /dev/null @@ -1,1038 +0,0 @@ -%PDF-1.5 %âãÏÓ -1 0 obj <>/OCGs[5 0 R 6 0 R 7 0 R]>>/Pages 3 0 R/Type/Catalog>> endobj 2 0 obj <>stream - - - - - application/pdf - - - web_logo_linux - - - - - Adobe Illustrator CS5 - 2011-07-26T17:17:50+01:00 - 2011-07-26T17:17:50+01:00 - 2011-07-26T17:17:50+01:00 - - - - 256 - 84 - JPEG - /9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgAVAEAAwER AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE 1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp 0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo +DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8A9KXerzwXLxKikKdia16V 8cVUf07cf77T8f64q79O3H++0/H+uKu/Ttx/vtPx/rirv07cf77T8f64q79O3H++0/H+uKu/Ttx/ vtPx/rirv07cf77T8f64q79O3H++0/H+uKu/Ttx/vtPx/rirv07cf77T8f64q79O3H++0/H+uKu/ Ttx/vtPx/rirv07cf77T8f64q79O3H++0/H+uKu/Ttx/vtPx/rirv07cf77T8f64q79O3H++0/H+ uKu/Ttx/vtPx/rirv07cf77T8f64q79O3H++0/H+uKu/Ttx/vtPx/rirv07cf77T8f64q79O3H++ 0/H+uKu/Ttx/vtPx/rirv07cf77T8f64q79O3H++0/H+uKu/Ttx/vtPx/rirv07cf77T8f64q79O 3H++0/H+uKu/Ttx/vtPx/rirv07cf77T8f64qh9T/wB7pvmP1DFULiqnc3NvawSXFzKkFvEpeWaR giKo6szNQADFWFx/mPfa47R+RPL115kjViraq7LY6ZUGjcbqcVl4nr6aNiqPTSPzynAdpfLFhXf0 St/eMK9i4a1FR7DFVksX526d+8m0vQ9fiHWLT7qexnPuq3SyxfQZMVdon5kaLfaouialBc+X/MLC qaTqsfoSS0NCbeSrRTrXp6bk+2KssxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV 2KuxV2KuxV2KuxVFan/vdN8x+oYqlmpajY6ZYXGoX8y21laRtNcTuaKiIKsxxVgWi6Dd/mNPD5h8 2QyQeUwyy6D5Wk2WdBul3qKj7ZfZki+yo61qcVeqxTRQxJDCqxxRqEjjQBVVVFAABsABiq76574q 76574qlHmjy95e806W+ma7Zx3lq26cxR437SRSCjxuOzKQcVYNomra15Q8wWvlHzNePqOmagSnln zFP/AHkjqK/UbxgAPXC7o/8Auwf5W2Ks/wAVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsV dirsVdirsVdirsVdiqK1P/e6b5j9QxV5h58I8yectH8lN8WlW6DW/MKfsyxQycLS2bsVknBdlPZM VZ2LoAUGwGKofUtdsNMsZr/ULhLazt15zTyGiqP7TsB3xV5Fq/8AzlL5ct7potM0q6v4VJH1h3W3 VqHqikSNQ/5QB9sVZD5J/Pzyj5nvI9PcS6XqUtBFDdcfTkc/sRyqaFvAMFr2rir0T6374qknnXQb TzR5avNGuG9N5l5WtyuzwXEZ5wzIRuGRwDt8sVY3YeefzNstOtzrXkl7p4IkW+ubC/tpJZJFUCSS O2bhsx3CiSuKsu8qectA802Ul1pM5ZoH9K8tJkaK4t5R1jmhejI23yPauKp3irsVdirsVdirsVdi rsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVRWp/73TfMfqGKvJ/LE31jz3561Rq1+v2+mx1/Z SytIzQexedm+nFWW/Wj44q8J/wCci/MV5Pf6f5fjelnHF9cnUH7cjsyJy/1FUkf62KvGPRxVtY2V gymjKagjqCMVfT35d/mpouqeXLOPVdTgg1mCMRXaXEgjZ2TYSAvxDc1AY071xVCfmh+bcGi6OkPl 69t7nVrtiqyxOkwgjA3cgFhyPRQ23XwxV4zpv5p/mDp+oLejW7m4KtyeC5kaWFgTUqY2NAD/AJNC O1MVe0jW4F1zyf580tBA+vS2ula1bIfhmhvvhhLdOT285HFqV417Yq9nxV2KuxV2KuxV2KuxV2Ku xV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KorU/8Ae6b5j9QxV4lYStp3nrzrpxajfpCHUFPcpeWk VD225RMPoxVPk1Zx9qjfhirx38+YQLux14oxtjH9UndVBCOrM6Fj1+IOR9GKvJxq+lH/AHdT5q39 MVbXVNMZgqy8mY0ACOSSfoxV9GeRPKXl/RtBtfrtjBNq0i+pdTSRrI6s24QFwePAUU8e4riqX/mf 5Nh13SFl0K0t4dXtSWjHFYhMpFDGzLTfYcSxp8q1xV4jbflz+Y2rX/1KTTpbVQ1JJZ6RQKK7nl+2 B/k8jir3fStMW41ryf5G01/rH6CltdT1W4A2ig08Boy+54tPPx4r4V7b4q95xV2KuxV2KuxV2Kux V2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KorU/8Ae6b5j9QxV4x+bli2h+aNL84oKafeRjR9 af8AZjJcvZzN7c2aNmPSoxVB/XffFWNfmHfLL5XudNWMT3eqlbOygO/KWQ7Nv09MAvXtTFWEQ/kT pxgi9bVpBccf3/CNSnL/ACakGg98VWSflzbeT9T0zzFBcNf2VhOjajHKgDIhPH10ArtHXlTtSuKv Xlv1ZQysGVhVWBqCD3GKoLW/MdvpOl3F/PVlhX4Ix9qRzskajxdiAMVTjSvyp/MC/wBMtZdY82iw luIke8s7SwjEsTOoLRLcPK61WtOXp4q9B8neS/L/AJU057TSI2Zp39S8vZ3MtzcSjYyTSndm/Adg MVT7FXYqpy3NtEwWWVI2YgKGYAknYUriq/kvLjUcqVp3pireKuxVoMp3BB3pt4jY4q3irsVdirsV dirsVdirsVdirsVdirsVdirsVdiqK1P/AHum+Y/UMVeU/n5q0kflO28vwUEvmW6WxlkIDenbIpmu HUEEcuMfEfOvbFXzt58/MTVtKvhoeiv9VSzRFluGAkdqoCFBflsFIqetcVSnyd551O483WEutTNe 8la0tmYKPSedgOahQBU04k+BxV7J9d98Cpb5j16207Q728uY/XgjiIaDs/P4Ah67MWocKvE7H8wf OFjbw21tqLpb26hIYyqOAo6LV1YkDoK4q9G07zbc675dg16NEXWvLtyl8kJ3heW2pIKoa7OlQO4P TFX1ppOpQappVlqdvX6vfQRXMNevCZA6/g2KpJrui2Np5fncRK10vAtcUoxZpF5HvStemKqul6HY XOj2UojWO4HCT1gvxEq1SD41G2KozS2LalfEagLtGIZYF3EQJNBXce22KpfciC782KzcVh0+MPNI aAc+q1Y+BYYqmb6fp2o3QvJDHdQrH6cSghkBqSxqCQe2KschsLPV9eZbWFI9OtacygoHofb+Y/hi qf3RA1q0VL8QqqlTYr1Y0J3A9vHFULq2i2MGkXs7RLJdNzlacj4uTNXbwpXFVDRdDsL3y7AzRKtw /I+vxqwKyGn4CmKsmd1RS7kKiglmJoAB1JOKoKHXtDn0xtVg1G1l0tAzPfpNG1uoTZiZQeA4998V RNrd2t5bR3VpMlxbTKHhniYPG6noyspIIPtirxn8+NJ0weY/K0y2sSzahcSpfSqoVplRrdVEjDdq KxAr2zD1MRYew9nM8/ByizUQK8vq5PZrS0tbO2jtrSFLe2iHGKGJQiKo7Kq0AzLAp5Gc5TJlI2Sx DQpW/wCViawp8zrqKS2/OHQYyWFsI2RWZqEojKWpTYtyqemVR+s7/B2upj/gkP3XBR+v+dz+J/RS fP5t8rxzXcMuq2sT2JjF4ZJURY2l5cFZ2IXkfTb4a1yfHHvcIaLMQCISPFdbc6/tV7rzBoNosD3W pWtutype2aWeNBIigFmQsw5AAipGEyA6sIabLK+GMjXPY7NP5h0CO9Fi+p2iXrFAtq08YlJlp6YC FuXx8hx23x4xdWo0uUx4hGXD30a25/JRbzb5VW7azbWbEXiOYntjcwiQOpoyFOXIMCNxg448rDMa LPw8XBPh7+E0iNM1zRNV9Q6XqFtf+jT1vq00c3DlXjy4FqV4mlcIkDyLXm0+THXHGUb7wR96OyTS 7FXYqitT/wB7pvmP1DFXkH/OQWnXP6B0jX4VLw6HfepfACvC2uY2geWg3PBnUn2qcVfNnn/ybrc+ qtq9jbve292EJ9AGRlZUCj4VqSpC1qMVQfkzyL5gn1m3urq0ls7a0kWZmnQxszIeSqqsATUjf2xV 6z5f0Lz35lgur/y/ptvdaXBcNax3E1z9XMrxgeo0dUcMit8Na9cVSjzPoPmCVtU8o61BHY6uIYri ERyGWKWJiGSRHKqSokUo+2xxV5HN5N81QztC2k3TOpoWSJ3T6HUFT9+Ks/0Xy/qXl/ytLavHz1jV 3EFtaoQXaecelFEOzEE1OKvr3y1pI0by5pWkA8hp1nb2nIdD6ESx13/1cVUvNhA0C6qevp0/5GLi qt5dIOiWdDX92P14qk2gTRW+qa5KxCxxO7mn8qu52xVLLaSROFxdoijVpGIuZfjSMA0LemaCvxbE npiqPv7i10zSI9M0x2ee9NeZ2Yqx48u32qUX2xVOdKt7HR9LCvKgKj1LiSo3am/3dBiqVXMyTea9 LnVSgmgV+LUDDkHpWnfFU58xEDRLypp+7P68VUfKZB0C1oenqV/5GNiq/wA0/ov/AAxq/wCluX6K +pXH6Q9OvP6v6Terx4/FXhWlMVeOeWx+T4/IDXTafpU+UDcOdSWbh+kBcc4eATh+66+lx/Z/m/ax V6T+Uo8sj8utFHlg3B0P0nNp9cp9YqZXMnq0+Hl6vL7O3htirCfz8mij1vya0jhVjuJ3kJP2V9S3 3Ptscw9Vzi9Z7NRJx5q7h90npmtea9F0mx+tzXCSl2SK3gidWklkkYKiIK7kk/dvmTKYAed0+iyZ ZcIFd5PIAPOvJ4jH5+eaQoAU2T1ApQkvbFvxrXMfH/el3+uv+S8X9b/i2L+UtH0a4sPzRM1nBJ9S jmaxLIp9HiLplMRp8NCi9PAZXCIqf473Za3PkjLS1I+oi/P6OfzKD1kvN+QWhsayGDVXUnrwUi42 9hUjIy/uh723Bt2pk88f/Esg8/a5ol75z/L6ezvbeeOCa3a4ljkRhGvrwkeoQfh6HrlmWQMo04PZ unyQ0+oEokWJVt5S5Jl+ctqn16x17y5I3+I9Nhe6upbUiosAKeq7Dw50X+ZS3ZclqBvY5j7nH7Bm eGWLN/dTNC/5/cP09xrvZ/5C1LQdR8qWFxocaw2Pphfq4pyjkH21fxbl1J69e+X4iDEU6PtLFlx5 5DJvK+feyDLHBdirsVRWp/73TfMfqGKoG4t7e5t5ba4jWa3nRo5oZAGR0ccWVlOxBBoRirya/wDy Q1TTZ3bydq8UGnMSY9G1SN54Yq/swzoyzKngrcqYqp2v5LeZdTkCeZtcgg07/d1ho8TxvMv8rXMz F1U9+Kivjir1fStK07SdOt9N023S1sbVBHb28YoqqOw/ie+KpD55/L3RPN9tB9aaSz1OyJbTtVti FngZuoFah0anxI2x+e+KsBb8qPzMhYww6to13ENlu57e4hlI8Wijd0r8mGKso8lflLY6Hqa67q96 2t6+islvcPGsNvbK/wBoW0ALcGI2LlixHhvirPsVUZ7KzuCDcQRzFdlMiKxA9qg4q6Gzs4FZYYI4 lf7aoiqD86DfFVNdK0tTVbOBTQiojQbEUI6YqqNZ2jRpG0EbRx/3aFVKrT+UU2xVbNp2nzOZJrWG SQ9XeNWO23UjFVn6H0n/AJYrf/kUn9MVbfS9Mdi72kLOerGNCfvIxVUuLO0uOP1iCObjXj6iq1K9 aVBxV1vZWduWNvBHCW+0Y0Va08aAYqquiupRwGRgQykVBB6gjFUFDoOhwaY2lQadaxaW4ZXsEhjW 3YPuwMQHA8u+2Kom1tLWzto7W0hS3toVCQwRKEjRR0VVUAAD2xVL73yp5Xv7hrm+0exurl/tzz20 MjmnizKTkTCJ5hycetzQFRnKI8pELIPJnk+3njng0LT4Z4mDxSx2sCurKahlYJUEHvgGOPcGUtfq JCjkmQf6R/W3F5P8pRTGeLRLCOYhgZVtYVajgq/xBa/EGIPjj4ce4IOuzkUck6/rFankvydGkiR6 FpyJMoSVVtIAHUMGCsAm45KDv3GPhx7gk6/UGryT2/pH9arB5W8sW9tPa2+kWUNtdcRdQR28Sxyh K8fUULRqVNK4RCPcxlrM0iJGciY8jxHb3Lh5Z8uL6PHSrQC3BEAEEdIw1OXAcfhrQVpjwDuR+bzb +uW/Pc7qT+T/ACk8k0j6JYNJcV9d2tYS0lWDHmSvxVYV374PDj3BkNdnAAE57cvUVfTfL+g6W7ya ZptrYvIAsjW0EcJYDcBiirXCIAcgwy6rLkFTlKXvJKYZJodirsVTW9/Rn1qT1fV9So5caU6Yqof7 h/8Ai78MVd/uH/4u/DFXf7h/+LvwxV3+4f8A4u/DFXf7h/8Ai78MVd/uH/4u/DFXf7h/+LvwxV3+ 4f8A4u/DFXf7h/8Ai78MVd/uH/4u/DFXf7h/+LvwxV3+4f8A4u/DFXf7h/8Ai78MVd/uH/4u/DFX f7h/+LvwxV3+4f8A4u/DFXf7h/8Ai78MVd/uH/4u/DFXf7h/+LvwxV3+4f8A4u/DFXf7h/8Ai78M Vd/uH/4u/DFXf7h/+LvwxV3+4f8A4u/DFXf7h/8Ai78MVd/uH/4u/DFXf7h/+LvwxV3+4f8A4u/D FXf7h/8Ai78MVd/uH/4u/DFXf7h/+LvwxV//2Q== - - - - - - xmp.did:F87F1174072068118C14EFFD1C30758F - uuid:9810d403-9ad5-7442-a0bb-f823d61aba53 - uuid:5776C8C7815EDF118B77FD523B43407A - proof:pdf - - xmp.iid:F77F1174072068118C14EFFD1C30758F - xmp.did:F77F1174072068118C14EFFD1C30758F - uuid:5776C8C7815EDF118B77FD523B43407A - proof:pdf - - - - - saved - xmp.iid:F77F117407206811871F8EF6BC9F2E8A - 2011-07-26T16:52+01:00 - Adobe Illustrator CS5 - / - - - saved - xmp.iid:F77F1174072068118C14EFFD1C30758F - 2011-07-26T17:16:31+01:00 - Adobe Illustrator CS5 - / - - - saved - xmp.iid:F87F1174072068118C14EFFD1C30758F - 2011-07-26T17:17:48+01:00 - Adobe Illustrator CS5 - / - - - - - - Document - Basic RGB - - - 1 - True - False - - 854.666992 - 255.000000 - Pixels - - - - - AGaramondPro-Bold - Adobe Garamond Pro - Bold - Open Type - Version 2.074;PS 2.000;hotconv 1.0.57;makeotf.lib2.0.21895 - False - AGaramondPro-Bold.otf - - - AGaramondPro-BoldItalic - Adobe Garamond Pro - Bold Italic - Open Type - Version 2.074;PS 2.000;hotconv 1.0.57;makeotf.lib2.0.21895 - False - AGaramondPro-BoldItalic.otf - - - - - - Cyan - Magenta - Yellow - Black - - - - - - Default Swatch Group - 0 - - - - White - RGB - PROCESS - 255 - 255 - 255 - - - Black - RGB - PROCESS - 0 - 0 - 0 - - - RGB Red - RGB - PROCESS - 255 - 0 - 0 - - - RGB Yellow - RGB - PROCESS - 255 - 255 - 0 - - - RGB Green - RGB - PROCESS - 0 - 255 - 0 - - - RGB Cyan - RGB - PROCESS - 0 - 255 - 255 - - - RGB Blue - RGB - PROCESS - 0 - 0 - 255 - - - RGB Magenta - RGB - PROCESS - 255 - 0 - 255 - - - R=193 G=39 B=45 - RGB - PROCESS - 193 - 39 - 45 - - - R=237 G=28 B=36 - RGB - PROCESS - 237 - 28 - 36 - - - R=241 G=90 B=36 - RGB - PROCESS - 241 - 90 - 36 - - - R=247 G=147 B=30 - RGB - PROCESS - 247 - 147 - 30 - - - R=251 G=176 B=59 - RGB - PROCESS - 251 - 176 - 59 - - - R=252 G=238 B=33 - RGB - PROCESS - 252 - 238 - 33 - - - R=217 G=224 B=33 - RGB - PROCESS - 217 - 224 - 33 - - - R=140 G=198 B=63 - RGB - PROCESS - 140 - 198 - 63 - - - R=57 G=181 B=74 - RGB - PROCESS - 57 - 181 - 74 - - - R=0 G=146 B=69 - RGB - PROCESS - 0 - 146 - 69 - - - R=0 G=104 B=55 - RGB - PROCESS - 0 - 104 - 55 - - - R=34 G=181 B=115 - RGB - PROCESS - 34 - 181 - 115 - - - R=0 G=169 B=157 - RGB - PROCESS - 0 - 169 - 157 - - - R=41 G=171 B=226 - RGB - PROCESS - 41 - 171 - 226 - - - R=0 G=113 B=188 - RGB - PROCESS - 0 - 113 - 188 - - - R=46 G=49 B=146 - RGB - PROCESS - 46 - 49 - 146 - - - R=27 G=20 B=100 - RGB - PROCESS - 27 - 20 - 100 - - - R=102 G=45 B=145 - RGB - PROCESS - 102 - 45 - 145 - - - R=147 G=39 B=143 - RGB - PROCESS - 147 - 39 - 143 - - - R=158 G=0 B=93 - RGB - PROCESS - 158 - 0 - 93 - - - R=212 G=20 B=90 - RGB - PROCESS - 212 - 20 - 90 - - - R=237 G=30 B=121 - RGB - PROCESS - 237 - 30 - 121 - - - R=199 G=178 B=153 - RGB - PROCESS - 199 - 178 - 153 - - - R=153 G=134 B=117 - RGB - PROCESS - 153 - 134 - 117 - - - R=115 G=99 B=87 - RGB - PROCESS - 115 - 99 - 87 - - - R=83 G=71 B=65 - RGB - PROCESS - 83 - 71 - 65 - - - R=198 G=156 B=109 - RGB - PROCESS - 198 - 156 - 109 - - - R=166 G=124 B=82 - RGB - PROCESS - 166 - 124 - 82 - - - R=140 G=98 B=57 - RGB - PROCESS - 140 - 98 - 57 - - - R=117 G=76 B=36 - RGB - PROCESS - 117 - 76 - 36 - - - R=96 G=56 B=19 - RGB - PROCESS - 96 - 56 - 19 - - - R=66 G=33 B=11 - RGB - PROCESS - 66 - 33 - 11 - - - - - - Grayscale - 1 - - - - K=100 - GRAY - PROCESS - 255 - - - K=90 - GRAY - PROCESS - 229 - - - K=80 - GRAY - PROCESS - 204 - - - K=70 - GRAY - PROCESS - 178 - - - K=60 - GRAY - PROCESS - 153 - - - K=50 - GRAY - PROCESS - 127 - - - K=40 - GRAY - PROCESS - 101 - - - K=30 - GRAY - PROCESS - 76 - - - K=20 - GRAY - PROCESS - 50 - - - K=10 - GRAY - PROCESS - 25 - - - R=241 G=241 B=242 - GRAY - PROCESS - 12 - - - - - - - - - Adobe PDF library 9.90 - - - - - - - - - - - - - - - - - - - - - - - - - endstream endobj 3 0 obj <> endobj 9 0 obj <>/Resources<>/ExtGState<>/Font<>/ProcSet[/PDF/Text]/Properties<>/Shading<>/XObject<>>>/TrimBox[0.0 0.0 854.667 255.0]/Type/Page>> endobj 10 0 obj <>/Resources<>/ExtGState<>/Font<>/ProcSet[/PDF/Text]/Properties<>/Shading<>/XObject<>>>/TrimBox[0.0 0.0 500.0 256.0]/Type/Page>> endobj 25 0 obj <>stream -H‰ÜWËnEÝÏWôÒYL»ß,ã$„A‘¯DB,.ä×AÁBæó9§¦»ïÌ`)ˆ°I¼ñTÝ®gש®ºüöJ]Þ\õìù•šŒ.)«×Óå—·F½¾ŸŒ2*£\Lê_¦WÓõ N].2v‘yv€X¢ÐÁþd”U‡WÓl´ñNŽª}<¨µáŸóV¹¢wÓÅáí“ï"hA#2<WjåçÏÓÅo}§ÞÑ…•ñ³%ªö¶„fïŸXwñö žüxøjº¼BÇ{9l”º?¾›.ž>¥©%ž %ÎõS:•´:ùµ¸~ñn9o<Ÿ—åu5¥9ÿç_ÍûuîÜ’»ÉíRRÖW]œUwƒa³.Ö+—u UUüƒNžBB‹Õ6guœ¶ôiò^—¢rоZå©É©!;£Î©PtCŸ:íƒ9¨{.*8§R+¥ÇiCžp|hd­ººL¯k®Êš¨m-*8]«ƒèŽqw”æ¬×ÉÈÏN18Õ(Hoh;|¹0Ž»„²èòP†ˆ¼—ã5RzCCÚ#1ÙÒׂˆ-ª¥TÏ8L€²”tŽ®“ß2 _ -¾rg8„æMe½µƒD~“Iß1NƒûÁ5«³s¼:K#5"ÇQ#é„õ-ƒÒFç’UÉ:TÊ]CR5èlS´¥o¹KÛs Áˆ’cqYPa³KR¨¨C' ¾&!ë“Nu0\DÉGÞ_Á½®è€¢*ýŽs:s’Õ± a]eFy…á@£†¦ûNg¹¯~šyq EŸÉ’ Ò¦dIÁ–ƒ+¬Ù8ÈBO,š•ë‘Ð{íur_gœ¦ÿËY ã¶z”IP;\¥S±ƒ½–öˆ?=ÚΗ]HvKœÏX°ÖÜ,ÆB2HÔñnzöR]Þ¾1êþº~©^HCy¼GJ»ºíÝîöê›)ªÔšÞ£q’k%美K@ß„þt7ÍNÊZàhÙìØ.欒*Gf 1 ¨ -Q€„â0|w(ú‚Ó•îÇ¡JëÆÖ¹õå  zFäñÌBá ßÎ(ô]Ð÷³Í6ú­¥$^Yü©0 æå*$£é[âª6‰~°,Üçb"ÐfAI17xgx•¡9©¡ &pDJz2AãY¯í‹D;Ôvgxô dŽUÒßIù/okcðaKì"½è8½™n§p¸!ƒgÀSá®02]ÇqÆ™x© !¶Ã’ðVœâ³$vў᧲¹ýoÿv¢¡2~GTÏp—n¤‘«^¾gùMuÁy§y>«n¦;ÇtÑ%ôWÛÉ3õ >› –û\µB"0áçÇ¢ÁÓci(„ F-ÿ]'aÓX­iüð2p¦j”`Ú÷Ük’óNõ|Ö½˜î 3DÏWô¹ÄrF^C@c%‡âœà¾åûR0´ BÎ=M¬ZœÀ%W€—OAòiÐxÆwœÓ™ƒÁ0ŽCKã +À4÷™áGDK’öœ“xfB¾Üƒæ]„•Ž tàÊælõî1Ïþé}—Zqà-'˜ž 9í@ĀåÒ0îÅ/CùŽ³ÌES9e¼sjиÛ`W:ðDø×:gÑ!Ñà%ÀK>¼ê9ÝE»°ZîŸè¸Xkr«ƒÆ—Â\âu‰ÉâoY*ÞèìÒy"²›‰è¿4èÂQÙBOËôÿ%`ü0y ˜´LZ&µªwªKîÒé`ÜŒû@þ”cZ5Ç9 È"1Û&P.¥„‰‚{)šœ±Aa ï0šŒ¢˜‰¼¬n¨T,»(3…ÃÉnÅ‘(b4È -¡ KEz†‡=cRF'EÐT·¦)Ìõ³r“+Ü·í‚ÑÏ•çî‘€ -çækWª¬•å1Ä9ÏvÁ6 8ÛbÞâ¸ÌÙ¿$ä@¶’-ƒÁÁY%x„æ|kU­2ˆ29•Y1D6áÇÖFEL¬VâÙr¨ÂBe™DYö væ›ÐÞÝÈcPæbƒ&£Là°«µ"±X¹íDl¯Âæ n³p¹ä_KBëÐv mœIˆñcQþ3 -ÒÿŽìO9¤3°Qš–½› -z<ùQØÃЀ¸ð%n(ÉXNù¯ƒjKŸ&#ˆ‹Ãnâ:@±qƒxÞÒ°ËgÌwôs É£3À¹RcoÇiKC«:Ñè4› Æ°Þ™ 7/7ú–å V0ÚsE¬ƒ>Ä=¼ºm¡!à %­À¼cÀ\_ˆþ\±Bï › x ÄóP<ŸaŒäFcR`[N¼ ,¯¦ÃØo`Œýƒ -P&øh¸]ŒGÔzP7Š^8zqùÅQχàõ͕¿¿<ÓmÌ endstream endobj 26 0 obj <> endobj 28 0 obj <>/ExtGState<>>>/Subtype/Form>>stream -/CS0 cs 1 1 1 scn -/GS0 gs -q 1 0 0 1 273.1465 198.5684 cm -0 0 m -0 -43.758 -64.479 -79.23 -144.02 -79.23 c --223.561 -79.23 -288.041 -43.758 -288.041 0 c --288.041 43.757 -223.561 79.23 -144.02 79.23 c --64.479 79.23 0 43.757 0 0 c -f -Q - endstream endobj 30 0 obj <> endobj 15 0 obj <> endobj 14 0 obj [/ICCBased 31 0 R] endobj 31 0 obj <>stream -H‰œ–yTSwÇoÉž•°Ãc [€°5la‘QIBHØADED„ª•2ÖmtFOE.®c­Ö}êÒõ0êè8´׎8GNg¦Óïï÷9÷wïïÝß½÷ó '¥ªµÕ0 Ö ÏJŒÅb¤  - 2y­.-;!à’ÆK°ZÜ ü‹ž^i½"LÊÀ0ðÿ‰-×é @8(”µrœ;q®ª7èLöœy¥•&†Qëñq¶4±jž½ç|æ9ÚÄ -V³)gB£0ñiœWו8#©8wÕ©•õ8_Å٥ʨQãüÜ«QÊj@é&»A)/ÇÙgº>'K‚óÈtÕ;\ú” Ó¥$ÕºF½ZUnÀÜå˜(4TŒ%)ë«”ƒ0C&¯”阤Z£“i˜¿óœ8¦Úbx‘ƒE¡ÁÁBÑ;…ú¯›¿P¦ÞÎӓ̹žAü om?çW= -€x¯Íú·¶Ò-Œ¯Àòæ[›Ëû0ñ¾¾øÎ}ø¦y)7ta¾¾õõõ>j¥ÜÇTÐ7úŸ¿@ï¼ÏÇtÜ›ò`qÊ2™±Ê€™ê&¯®ª6ê±ZL®Ä„?â_øóyxg)Ë”z¥ÈçL­UáíÖ*ÔuµSkÿSeØO4?׸¸c¯¯Ø°.òò· åÒR´ ßÞô-•’2ð5ßáÞüÜÏ ú÷Sá>Ó£V­š‹“då`r£¾n~ÏôY &à+`œ;ÂA4ˆÉ 䀰ÈA9Ð=¨- t°lÃ`;»Á~pŒƒÁ ðGp| ®[`Lƒ‡`<¯ "A ˆ YA+äùCb(Š‡R¡,¨*T2B-Ð -¨ꇆ¡Ðnè÷ÐQètº}MA ï —0Óal»Á¾°ŽSàx ¬‚kà&¸^Á£ð>ø0|>_ƒ'á‡ð,ÂG!"F$H:Rˆ”!z¤éF‘Qd?r 9‹\A&‘GÈ ”ˆrQ ¢áhš‹ÊÑ´íE‡Ñ]èaô4zBgÐ×Á–àE#H ‹*B=¡‹0HØIøˆp†p0MxJ$ùD1„˜D, V›‰½Ä­ÄÄãÄKÄ»ÄY‰dEò"EÒI2’ÔEÚBÚGúŒt™4MzN¦‘Èþär!YKî ’÷?%_&ß#¿¢°(®”0J:EAi¤ôQÆ(Ç()Ó”WT6U@ æP+¨íÔ!ê~êêmêæD ¥eÒÔ´å´!ÚïhŸÓ¦h/èº']B/¢éëèÒÓ¿¢?a0nŒhF!ÃÀXÇØÍ8ÅøšñÜŒkæc&5S˜µ™˜6»lö˜Iaº2c˜K™MÌAæ!æEæ#…åÆ’°d¬VÖë(ëk–Íe‹Øél »—½‡}Ž}ŸCâ¸qâ9 -N'çÎ)Î].ÂuæJ¸rî -î÷ wšGä xR^¯‡÷[ÞoÆœchžgÞ`>bþ‰ù$á»ñ¥ü*~ÿ ÿ:ÿ¥…EŒ…ÒbÅ~‹ËÏ,m,£-•–Ý–,¯Y¾´Â¬â­*­6X[ݱF­=­3­ë­·YŸ±~dó ·‘ÛtÛ´¹i ÛzÚfÙ6Û~`{ÁvÖÎÞ.ÑNg·Åî”Ý#{¾}´}…ý€ý§ö¸‘j‡‡ÏþŠ™c1X6„Æfm“Ž;'_9 œr:œ8Ýq¦:‹ËœœO:ϸ8¸¤¹´¸ìu¹éJq»–»nv=ëúÌMà–ï¶ÊmÜí¾ÀR 4 ö -n»3Ü£ÜkÜGݯz=Ä•[=¾ô„=ƒ<Ë=GTB(É/ÙSòƒ,]6*›-•–¾W:#—È7Ë*¢ŠÊe¿ò^YDYÙ}U„j£êAyTù`ù#µD=¬þ¶"©b{ųÊôÊ+¬Ê¯: !kJ4Gµm¥ötµ}uCõ%—®K7YV³©fFŸ¢ßY Õ.©=bàá?SŒîÆ•Æ©ºÈº‘ºçõyõ‡Ø Ú† žkï5%4ý¦m–7Ÿlqlio™Z³lG+ÔZÚz²Í¹­³mzyâò]íÔöÊö?uøuôw|¿"űN»ÎåwW&®ÜÛe֥ﺱ*|ÕöÕèjõê‰5k¶¬yÝ­èþ¢Ç¯g°ç‡^yïkEk‡Öþ¸®lÝD_p߶õÄõÚõ×7DmØÕÏîoê¿»1mãál {àûMśΠnßLÝlÜ<9”úO¤[þ˜¸™$™™üšhšÕ›B›¯œœ‰œ÷dÒž@ž®ŸŸ‹Ÿú i Ø¡G¡¶¢&¢–££v£æ¤V¤Ç¥8¥©¦¦‹¦ý§n§à¨R¨Ä©7©©ªª««u«é¬\¬Ð­D­¸®-®¡¯¯‹°°u°ê±`±Ö²K²Â³8³®´%´œµµŠ¶¶y¶ð·h·à¸Y¸Ñ¹J¹Âº;ºµ».»§¼!¼›½½¾ -¾„¾ÿ¿z¿õÀpÀìÁgÁãÂ_ÂÛÃXÃÔÄQÄÎÅKÅÈÆFÆÃÇAÇ¿È=ȼÉ:ɹÊ8Ê·Ë6˶Ì5̵Í5͵Î6ζÏ7ϸÐ9кÑ<ѾÒ?ÒÁÓDÓÆÔIÔËÕNÕÑÖUÖØ×\×àØdØèÙlÙñÚvÚûÛ€ÜÜŠÝÝ–ÞÞ¢ß)߯à6à½áDáÌâSâÛãcãëäsäüå„æ æ–çç©è2è¼éFéÐê[êåëpëûì†ííœî(î´ï@ïÌðXðåñrñÿòŒóó§ô4ôÂõPõÞömöû÷Šøø¨ù8ùÇúWúçûwüü˜ý)ýºþKþÜÿmÿÿ ÷„óû endstream endobj 20 0 obj <> endobj 21 0 obj <> endobj 22 0 obj <> endobj 23 0 obj <> endobj 32 0 obj [/ICCBased 31 0 R] endobj 34 0 obj <>stream - endstream endobj 33 0 obj <> endobj 35 0 obj <> endobj 36 0 obj <> endobj 5 0 obj <> endobj 6 0 obj <> endobj 7 0 obj <> endobj 41 0 obj [/View/Design] endobj 42 0 obj <>>> endobj 39 0 obj [/View/Design] endobj 40 0 obj <>>> endobj 37 0 obj [/View/Design] endobj 38 0 obj <>>> endobj 18 0 obj <> endobj 19 0 obj <> endobj 44 0 obj <> endobj 45 0 obj <>stream -H‰bd`ab`dd” -p÷pÖvtO,JÌÍÏK (Ê×uÊÏIñ,IÌÉL)Qý!ÍøC„EîaW<ÓÑß>¿Ê°,ø%Äúýÿ÷‹‚çüb`bd¼öØ9¿ ²(3=£DÁÈÀÀ@D‚IsÇ”ü¤T…àÊâ’ÔÜbϼäü¢‚ü¢Ä’Ô=Çœ°¶b…¢ÔâÔ¢2° XÌY -™Å -©™%©E -‰@Eé™@sŠRSJŠSRs‹²òA2HÜ4™õû ¶ß -¿ˆ~qþLbÿÃf·û ä³ýØ/ -býñø~4ÖÞ¸·ñ»ñ¥îòïWË…~È~—¾óÃ燑htf}~²|vi^^q.GÛ»ïë昱nöVɉ}-=rQ*ÙuÍ-ÝM}ÍË«%æ6ö6Ô§ÿüsH"»a{óéy ûfM”ßò•uéÔ SJOŸPS×'?9}JÖôbŽâé j–K_;uz÷bùÎi Sš:8JJsóÊ¥ó›Nnj’ïœÜ3iRïÚ)ûfm\ͱ~åüµ›¤6¬”~cã":wfCYnv^J|Nljc©tC[_ÿ„)ó§Ï’¿~lçúuÒ|åó¨Ìœ:÷»ÏÌù³7u³ý^8ëú¤OÓ0Lb¯žýCnæÒ™ßÝÀ2¿μ?é5H†SnûÔæÿ<œ¸¾‹q÷ððÓ&} endstream endobj 43 0 obj <> endobj 46 0 obj <>stream -H‰|R}lg>§‰}Æh¹98vuwbÞh,ë&Qle]hJ[ -…tEYB ‹]çËvf;IÝÄvüq÷Þïξ³óá9m¾Kš&ÍMšE a*j¥ªš6ÖhLB•Zÿ{o»Há¨Bâþøé}~¿û=Ïó>w:¤¸Ñétå?­9süUÏ=Þèkt{=Ž3>ïó¯yÛ…!©ØtÊÓÅÊA£Y}IÝ>XÜóÅWKào¿ï?õÁAýÇ¥H‘Nwÿ“*oGÐ×âj/:tè…úâ~ýyÔá}ÓIÖý§ÛOžð4y}^_cÀé¨ ¶·“ûk~Òçô;}]ûÍý…Ç^È?él 4;}d£ö’«Eãñ9dÀ×èpº}m¤·0ùxþÿH’-Rã"_÷´PM@kúÉFãÅ»¯Òäíô|-NÅ Õ5gƒN²’t8Ï#Ú£ClÈóÈ7‘ï"'‘#çZäI-@ä4ò#„ÒYt[Eî¢ÏÜ,ö—€“ÉMåï›:­Ú7$‹æó3»ŒŠê{fõÌ”À‡z•T·Ì°veî¾aÿ ¨Ö+·Ì…“Z@&“ú^V~+uïÀÃ`Yȼ1wmý×­Ëu .Wý+mËdŠ7ææÖÖ÷{çߨ[q/¦‘äòµ>doï£>dÝÛ(õ‹¥PŸÁêa¿2d~(eÖd|*•‘’ãq©¼–­åêêjùŸí*触e’bÖ]Ô€ WPñ -wÒ%ØËqJd)«noòë6hÕô)Çn¹+Ò·ƒT<Šªè/sÈöZ03&Ây0{ÓjúÙCžÕ,Ui–.É¥Ú…ŸÁîhÕn® b 4Þ@Ç5é U~W¸Åo¬mr2ÚeÍ^BjJ[$*óЪœ6L‰âþ{ýý\ý©a"¿"¤³(öˆ}WþKÿ<*²‰e£Žv§+ÖË°í¢úï1©ašÍÓ6šf@$ôé®j)|™”Ð{WG—ïÙnë'’´Ÿ0½“,öò€rr]ì.íWTlî*_˜'³, :&‚­u¯½j­ºeÁî†úªÞ‹,%ÆeÅæ„ü,¿eƒiýÝmŽÝ!ò“cŸHÛ‰îT$Žª%g[Â_·Uè¿Ó—Î N.>‚/P_ùš¶ïç‡Ëy‰•hÅVØ‹í\µM]Ò¥S#CI¢ç¢¯_8&õ¡ º3?:Q›Ie”²l²û¯Ðžì.}>«â°l[Æfa+Ü2c\ãoWq hþlîà÷;êà *”©\Ìr9’Œ4YÕç Ç@¬•Á/°…ø³Tùœ°Ê¯­/q׌öìþßqA°´Š {׊͟VFÌMÍž_Øê›Sî×'7pl~Ù;Óˆ›z™ø‡¹åîùîÒXvC~°odg¢æc îxÏc…k -¿º1ËÍMaÛ -. ƒ’ŒdF†~eÛisê+†³ xù÷þ´°Ä/o¬þ×¾+2w­ðUöÙÆw+^ßîÄ)&J3 +$vlG'rÖ%á Výo¦®Ð=¸¾0Uˆ± Za¶¦´Á?›…9þ.stØ(wÝL`ï·p±Àù3‰kY å˜åO QЛ q*ÞöÚN%V7l ~Û°À_&ñ4GË” x"´[cðÐÍL+MpäØ°L$$úœU=b8<ÿË·¯O.áRPq®‡<•¢ewfSÿ †ÒÜBL@A¤„m~fêw„‰dáÇ :žúüá¥F)6g%n**¢>ö-Îçz‹÷íQÀú²Ôcég$XiP1¼ÇÑ …FB—ÃchbM§¬¢,fx|P¸ÉHªÜÅ6s®³¼Cc`’2=J[ÆèËñ‘ößTZÆ]Ù°FÅ$¨(ê:WÝÛ‹v%.2>`‰ÆÅÎ,ÎüøÌUnÚhϤ„IíS‰–„´UJe39|h,7žÍ†ºrh&œŠ+`@ˆÁ;A>}}5—Í÷¿šN¡¦ž¼bÏå†á‰KùüRR¯ŽåÈŸe•Ù MðÜTVçF´ ªMväOD~=Þß3>±õ$,û,2~™7š`âiå¶ùŸ %ôMü endstream endobj 16 0 obj <> endobj 27 0 obj <> endobj 47 0 obj <> endobj 48 0 obj [0.0] endobj 49 0 obj <>/XObject<>>>/Subtype/Form>>stream -0 g -/GS0 gs --14.895 277.798 288.041 -158.46 re -f -q -5 w 4 M 0 j 0 J []0 d -0 Tc 0 Tw 0 Ts 100 Tz 0 Tr /Fm0 Do -Q - endstream endobj 50 0 obj <> endobj 51 0 obj <>/ExtGState<>/Shading<>>>/Subtype/Form>>stream -q -215.399 178.843 m -212.793 178.843 210.248 178.581 207.787 178.088 c -192.902 213 158.27 237.475 117.92 237.475 c -63.987 237.475 20.267 193.753 20.267 139.821 c -20.267 117.813 27.549 97.508 39.833 81.178 c -33.879 74.392 30.262 65.505 30.262 55.768 c -30.262 34.474 47.525 17.21 68.819 17.21 c -85.634 17.21 99.927 27.979 105.199 42.992 c -109.363 42.45 113.608 42.168 117.92 42.168 c -122.124 42.168 126.268 42.435 130.332 42.95 c -135.57 27.874 149.894 17.048 166.752 17.048 c -188.047 17.048 205.309 34.311 205.309 55.605 c -205.309 65.301 201.723 74.152 195.814 80.927 c -200.787 87.493 204.946 94.707 208.147 102.421 c -210.498 101.973 212.92 101.729 215.399 101.729 c -236.694 101.729 253.955 118.992 253.955 140.286 c -253.955 161.581 236.694 178.843 215.399 178.843 c -W n -q -0 g -/GS0 gs --0.0000153 220.4262695 220.4262695 0.0000153 137.1108398 17.0478516 cm -BX /Sh0 sh EX Q -Q -/CS1 CS 0 0 0 SCN -10 w 4 M 0 j 0 J []0 d -/GS0 gs -q 1 0 0 1 215.3994 178.8428 cm -0 0 m --2.606 0 -5.151 -0.262 -7.613 -0.755 c --22.498 34.158 -57.129 58.632 -97.479 58.632 c --151.412 58.632 -195.133 14.911 -195.133 -39.021 c --195.133 -61.03 -187.851 -81.335 -175.567 -97.665 c --181.52 -104.451 -185.137 -113.338 -185.137 -123.075 c --185.137 -144.369 -167.875 -161.633 -146.581 -161.633 c --129.765 -161.633 -115.473 -150.863 -110.201 -135.851 c --106.036 -136.393 -101.792 -136.675 -97.479 -136.675 c --93.275 -136.675 -89.132 -136.408 -85.067 -135.893 c --79.829 -150.969 -65.506 -161.795 -48.647 -161.795 c --27.353 -161.795 -10.09 -144.532 -10.09 -123.237 c --10.09 -113.542 -13.677 -104.69 -19.585 -97.916 c --14.612 -91.35 -10.453 -84.136 -7.252 -76.422 c --4.902 -76.87 -2.479 -77.113 0 -77.113 c -21.294 -77.113 38.556 -59.851 38.556 -38.557 c -38.556 -17.262 21.294 0 0 0 c -h -S -Q - endstream endobj 52 0 obj <> endobj 53 0 obj <> endobj 54 0 obj <> endobj 55 0 obj <> endobj 56 0 obj <> endobj 57 0 obj <> endobj 13 0 obj <> endobj 58 0 obj <> endobj 59 0 obj <>stream -%!PS-Adobe-3.0 %%Creator: Adobe Illustrator(R) 15.0 %%AI8_CreatorVersion: 15.0.2 %%For: (Aleks Kissinger) () %%Title: (web_logo_linux.ai) %%CreationDate: 26/07/2011 17:17 %%Canvassize: 16383 %%BoundingBox: -15 -70 864 214 %%HiResBoundingBox: -14.8945 -69.667 863.5 213.7983 %%DocumentProcessColors: Cyan Magenta Yellow Black %AI5_FileFormat 11.0 %AI12_BuildNumber: 399 %AI3_ColorUsage: Color %AI7_ImageSettings: 0 %%RGBProcessColor: 0 0 0 ([Registration]) %AI3_Cropmarks: 0 -63 854.667 192 %AI3_TemplateBox: 250.5 63.5 250.5 63.5 %AI3_TileBox: 121.3335 -331.5 733.334 460.5 %AI3_DocumentPreview: None %AI5_ArtSize: 14400 14400 %AI5_RulerUnits: 6 %AI9_ColorModel: 1 %AI5_ArtFlags: 0 0 0 1 0 0 1 0 0 %AI5_TargetResolution: 800 %AI5_NumLayers: 3 %AI9_OpenToView: -214 552 0.6667 979 715 18 0 0 114 134 0 0 0 1 1 0 1 1 0 1 %AI5_OpenViewLayers: 777 %%PageOrigin:0 64 %AI7_GridSettings: 72 8 72 8 1 0 0.8 0.8 0.8 0.9 0.9 0.9 %AI9_Flatten: 1 %AI12_CMSettings: 00.MS %%EndComments endstream endobj 60 0 obj <>stream -%%BoundingBox: -15 -70 864 214 %%HiResBoundingBox: -14.8945 -69.667 863.5 213.7983 %AI7_Thumbnail: 128 44 8 %%BeginData: 11026 Hex Bytes %0000330000660000990000CC0033000033330033660033990033CC0033FF %0066000066330066660066990066CC0066FF009900009933009966009999 %0099CC0099FF00CC0000CC3300CC6600CC9900CCCC00CCFF00FF3300FF66 %00FF9900FFCC3300003300333300663300993300CC3300FF333300333333 %3333663333993333CC3333FF3366003366333366663366993366CC3366FF %3399003399333399663399993399CC3399FF33CC0033CC3333CC6633CC99 %33CCCC33CCFF33FF0033FF3333FF6633FF9933FFCC33FFFF660000660033 %6600666600996600CC6600FF6633006633336633666633996633CC6633FF %6666006666336666666666996666CC6666FF669900669933669966669999 %6699CC6699FF66CC0066CC3366CC6666CC9966CCCC66CCFF66FF0066FF33 %66FF6666FF9966FFCC66FFFF9900009900339900669900999900CC9900FF %9933009933339933669933999933CC9933FF996600996633996666996699 %9966CC9966FF9999009999339999669999999999CC9999FF99CC0099CC33 %99CC6699CC9999CCCC99CCFF99FF0099FF3399FF6699FF9999FFCC99FFFF %CC0000CC0033CC0066CC0099CC00CCCC00FFCC3300CC3333CC3366CC3399 %CC33CCCC33FFCC6600CC6633CC6666CC6699CC66CCCC66FFCC9900CC9933 %CC9966CC9999CC99CCCC99FFCCCC00CCCC33CCCC66CCCC99CCCCCCCCCCFF %CCFF00CCFF33CCFF66CCFF99CCFFCCCCFFFFFF0033FF0066FF0099FF00CC %FF3300FF3333FF3366FF3399FF33CCFF33FFFF6600FF6633FF6666FF6699 %FF66CCFF66FFFF9900FF9933FF9966FF9999FF99CCFF99FFFFCC00FFCC33 %FFCC66FFCC99FFCCCCFFCCFFFFFF33FFFF66FFFF99FFFFCC110000001100 %000011111111220000002200000022222222440000004400000044444444 %550000005500000055555555770000007700000077777777880000008800 %000088888888AA000000AA000000AAAAAAAABB000000BB000000BBBBBBBB %DD000000DD000000DDDDDDDDEE000000EE000000EEEEEEEE0000000000FF %00FF0000FFFFFF0000FF00FFFFFF00FFFFFF %524C45FD82FFA8FFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FF %FFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFF %A8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FF %FFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFF %A8FFFFFFA8FFFFFFA8FD04FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFFD7FA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFFFFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8A8FFA8A8A8FFA8A8A8FFA8FFA8FFFD067DA8FFA8FFA8FFA8A8A8FF %A8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8 %A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FF %A8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8 %A8FFA8A8A8FFFFA8FFA8FFA8FFA8FFA8FFA8FFA85227FD0752277DA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFFD0DA8272752A8A8FD05FFA87D272752FFFD64A8FF %A8FFA8FFA8FFA8FFFFA8277DA8FD0BFFA85227A8FFFFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8A8 %FFA8A8A8FFA8A8A87DF8A8FFFFA8FFA8FFA8FFA8FFA8FFA8FFFF7DF8FD04 %A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FF %A8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8 %A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FF %A8A8A8FFA8A8FFA8FFA8FFA8FFFF7D27A8FFFFA8FFFFFFA8FFFFFFA8FFFF %FFA8FFFF7DF8A8FFFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFFD07A8F8A8A8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFFF7DF8FD61A8FFA8FFA8FFA8FF277DFFFFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFFF5252FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8A8FFA8FF5252 %A8A8A8FFA8A8A8FFA8CFA8FFA8A8A8FFA8A8A8FFA8FFA8277DFFA8FFA8A8 %A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FF %A8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8 %A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FF %FFA8FFA8FFA8277DFFA8A8A8FFA8A8A8FFA8A87DA8A8FFA8FFA8A8A8FFA8 %FF52277D7DA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFFD06A87D27FFFD08A85227F8F8F8277DFD09A827522727 %27FD5BA8FFA8FFA8FF527DFD08A82727F827F827F82752FFA8A8A8CFA8A8 %A8FFA8FFA85227FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8A8FFA8A8A8277DFD07A827F8F827F827F827F8F87DFD07 %A8525252A8A85227FFA8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8 %FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8 %A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8 %FFA8A8A8FFA8A8FFA8FFA8A827FD07A87D27F827F8272727F827F852FD06 %A82727F82727A8A8277DFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8A8FF7D52A8A87DA87DA8A852F827F827F827F827 %F827F87DFD04A827F8F827F8F852A82752FD58A8FFA8FFFF7D27FD07A852 %FD0C2752527D52FD0527F852A87D52FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8A8FF52527DA87DA87DA8A852F827F8 %27F827F827F827F827527D5252F827F827F8F827A85252A8A8A8FFA8A8A8 %FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8 %A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8 %FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFFFA8FFA87D27A87DA8 %7DA87DA852FD0927F8277DFD04A852F827F8F8F852A85252FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFFD04A8FF7D27FD087D %F827F827F827F827F82727A87D7D7DA87D27F8F8F8277D7DF8FD59A8FFA8 %FFA8FF277D7DA87D7D7DA87D52F827F8F8F827F8F8F8FD047DA77DA87D52 %277D7DA82752FFFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8A8FFA8A8A85252FD087D27FD07F852FD097DA87D7D2727A8FF %A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FF %A8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8 %A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8FFA8 %FFA8FF5227FD077DA827F8F827F827F8F852FD087DFD042752A8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFFD05A8 %F87D7C7D527D527D5227277D527D527DF8527D7D527D527D7C52277D7DFD %10A8FFFD4CA8FFA8FFA8FFFF7D277D52FD047D5227FD077D27FD077D27A8 %FFFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFAFFFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8A8FFA8FFA827277D527D5252F87D527D527D527D525227 %7D527D527D2752A8A8A8FF7D7D7DA87DA87DFD04A8FFA8A87DA8A8A87DA8 %7DA87DFD04A8FF7D7D7DA87DA87DFD04A8FFA8A8A8FFA8A8A8FFA89A6F94 %9BAEA8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8 %A8FFA8A8A8FFA8A8A8FFFFA8FFA8FFA8FF27527D52F827F8277D7D527D52 %7D527D52FD04277D7D2752FFA8FFFD04A87DA8A8A87DA87DA8A8FFA87DA8 %FFA8A8A8FF7D7D7DFFA87DFD04A87D7DA8A87DFFA8FFA8FFA8FFA8FFA8FF %A8FFA28C69FFA8FFA8CA68A1A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFFD06A8FF52275227FD05F8FD0952FD05 %F85252277DFFA8A8A8FFA87D7DFFFD08A87DFD04A8FFA87D7DA8A8A87DA8 %A8FFA87D7DFD04A8FFA8A8A8FFFD08A86893A8FFA8AEA19AA1AFA8FFA8AF %A8AFA8AFA8FFA8A8A8FFA8A8A8FFFD0EA8FFA8FFA8FFFF52277DFD06F827 %7D527D527D527DFD06F8277D277DFFFFA8FFA8FF7DA8A8FFA8FFA8FFA8FF %7DA8A8FFA8FFA8A87DA8A8FFA8A8A8FFA8FF7D7DA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA88D6FFFA8FFA8FFA1A8A8FFA1CAA8FFA8CAA8FFA8CAA8CA %A8CAA8CAA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8A8FFA8A8A8FF275252FD06 %F827FD0752FD06F827522752FFA8A8A8FFA87D7DFFA8A87D7DA8FFA87D7D %A87DA8A8A8527DFD04A87DA8A8FFA87D7DFD04A8FFA87DF87DA82727FFA8 %A8A8CA6893A8FFA8AFA18C9AFF6F8D948D6FFF6F93A1A168A1A19368A169 %A1A8A8A8FFA8A8A8FFA8A8A8FFA8A8FFA8FFA8FFA8525252FD06F8275252 %7CFD0452FD07F87D2752FFFFA8FFA8FF7DA8A8FFA8A87DFFA8A87DA8A87D %A8FF7D7DA8FFA8FF7D7DA8FFA8FF7D7DA8FFA8FFA8FF7DF852FF2727A8FF %A8FFA88D93FFA8FFAFA868A1AF9468CA948CA8A168CAA88C9AFFA18C93A1 %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFFD04A8FF27275227FD05F8525227 %F827F8275227FD05F82752277DFFFD05A87D7DA8A8FF7D7DA8A87D7D7DA8 %A8FF7D7D7DA8A8FFA8A852FD04A87D7DFD06A8FFFD0AA86894A8A8A8FFA1 %6876FF6F68A89B68A87668A2A8689AA8AF6F68A8AFFD0EA8FFA8FFA8FFA8 %7DF87D5227F8F8F8525252277D527DF87C5227F8F8F827525227A8A8FFA8 %FFA8FF7DA8A8FFA8A87DFFA87D7D7DA8FFA8A87DFFA8FFA8A8A87DA8FFA8 %FF7D7DA8FFA8FFA8FF7D277DFF2752A8FFA8FFA88D93FFAFFF9ACA68A1AF %9A68FF9A8CA8A168CAA18C9AFFA8A1689AAFFFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8A8FFA8A8A827277DFD0652F8A8A8FFFF52F87D52522752527DF8 %7DA8A8A8FFA8A87D7D7DA8A8FF7D7D7DA87DA87D7DA8A8527D7DA87D7D7D %A852A8A8A87D7D7DA8A8FFA8A8A87DF87DA827F8A8A8FFA8A1688D9AA16F %9A9A686FA86968A19A68A1A18C6F9A689AA193769A689AA8FFA8A8A8FFA8 %A8A8FFA8A8A8FFFFA8FFA8FFA8FFA82727FD047D52F87DFFFFA8FFA852F8 %7C7D7D7D52F852A8FFA8FFA8FFFD05A8FFFD05A8FFA8A8A8FFFD07A8FFA8 %A8A8FFFD05A8FFA8FFA8FFA8A8A8FFA8A8A8FFA8FFA1A2FD04A1A8CAA1A8 %A1A2A1A8A1A8A1FFA1CAA8A8A8CAA1A8A1A8A1CAA8FFA8FFA8FFA8FFA8FF %A8FFFD08A8FFA852FD05277DA8FFA8A8A8FFA852F8FD04277DFD07A8FFA8 %A8A8FFA8A8A8FFFD07A8FFA8A8A8FFA8A8A8FFFD07A8FFFD07A8FFA8FFFD %05A8FFA8AFA8FFA8AFA8FFA8AFA8FFA8AFA8FFA8AFA8FFA8AFA8FFA8AFA8 %FFFD0EA8FFA8FFA8FFA8FFA8FFFFA87DA8A8FFA8FFA8FFA8FFA8FFFFFF7D %7D7DFFFFFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8A8FFA8A8A8FFA8A8A8FFA8FFA8FFA8A8A8FF %A8A8A8FFA8A8A8FFA8FFA8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8 %A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FF %A8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8 %A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFFF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FF %%EndData endstream endobj 61 0 obj <>stream -%AI12_CompressedDataxœì} cGÏð÷üÜ·M …8;³7ŠO®iŽ–§M{“¸8vêƒBý§c4»>’8°gŸ‡&ò¬VÒhtf½òÝæöj¹ÝßKVÝ’S,¬¬TIsÔÜ)´ø¸ÛGÝغYT~ÉAåÇÑ®ø* ;ýÞú¨¤áÃÞ}£ÜMÞ ‹O;Ãa§w noÜ„Ïv:£nŸþ›ìívûýÝn§7þPjvnÊ£W­9‚1:XsÂ5í(UTáâ€fï}þ«À\€Uúã^Qé¸S\U~q5tŠQàµòàãG­d85Æ+E±ƒ¸! vK> wKaL(kýÖø(é6ýV2VûÝþ`x§XýØìŸ5à“fñ·¤Ûíÿ[¬t›­w™[ýÞ†–6Í£~¯ (V+ýn†Üš…>5»VæöçIÒNÚCR~ìï6:ÝÄԕ™*?Vz·2îtÛÏÇG{ LŒÇvw‰­—CàXÃßî>>Èv2¼€œí­‡•¬(H×·[ÉA‡”&í›í |Ô¼Ã{AÄn1ò=³Š5ØIŽŽ»0Å4Úw@ø<öW3˜¡1J«’ëº0c®«`Hèºð·WôGƦS–¼ï$ÿÞ)>ï÷–Iy0Úfñ<Çáù“­q7¼ìuPØ‚bʳ~;éÂx{£Û$YÐ¥ÒyÀNspŒ@ÍúÝñˆ–B$O¡o4?&¨=.?àÅqÒÛé¿"WAE‹¾¯‹$‡q1 V?>UÀ¦Ë(‡Sz¶ ¬÷ÚÕþʈ+´¢ -ë›?³¿Ó'pûø¸ð¶àÆkÿŒû£íC7)ÆÁÚÁ ù>ÙŽÖÊíN2€O†kå|¼Vm%íN·Û\«7[ãQ²ö|¬½a…µ—öŽ&i¶µf«3ÕØï&֚龿IÈ[‚<¡; k ßšdnMì­Fßá1̘ŽÓ#ô…µ>íóØ~flߎí3)c:æ¡ãthamlǶ›`J×Ú@`’¬µ@ÞkÃQ2è"ä…Ê·¶7îv“ÑÚ1X Àu|¸w5{í½.Hi@ °µ×Zýã %‡£5XÀí—ìÓ`WêõGíd­\_{1ì6‡‡ :¯p¦;$ÿý˜ôÖŽÆÓàÂÌ8ùoÐÞOU§—àïGÍakÜÅ?d@àæéÿŒ“!2ÙîÿÛ[K>´ºÍ#ú´«Ójvá{×>¬ãNo–Œ°…Ýä¨nh”þÅ’›Þ9F·ÇÍV²VæÉ(e3ÿ©¯õQGzm i-9¢ÿ"ƒˆ ©üÁ8é¯ÎÀvç}Ä -ÍÊü7ûÛþ É3ZúD)­K7ýEè -kû`بáûxÉ#^fѼäÚ8Sàò×2wóD5[Ôw°ø4¬Ù¢ÁKšWtaípÜ;hÆGÝæxëœÂ»µVî+ìÔɈúOvw†à:Ráî’™ª÷Z}Œîwg\î×üvmvØÚìlÉw~çm”Çp¸µóñ8¹8Y œ!Ì#‘?š%Ô Z„Ü·*PÆ$A æ®ÁÔ&ÿŒ›]ø#Xëôöai>f N' {ñè -þQP‘B»vkÔivÛýý5ÀÅkǃ~{Ü«ÖŒ#´Ï€>Š×^%ÍbAÅþ1´f„kÍc¸áƒ¡"ŽÖjIB6ð¶fáÁø/¨´¨=wa)în<Úëww×ø¿Æë2ë>Ë~æbô ½_áùqÂàÍî>z8è÷öû…7ïÀêE9½Øû 3D¿þ¶=|ožŠð )ò‡p3ý)ÿ=ûîZ²á`z;Cë½÷I·œAk!`Š¯›ƒã³Qov›½æ Hp‹y£|³ 2Jq§°B sŒžì½7õ€Sd>ZàAÍÑ!Dï`Ƈ7ÿ9I8ÃÎÆ·ÝÂ8iP¬ ÆÃÃâN¿ßµh'?²Ø ˜ 8>Ïؤz/z, Ù'™ÓO‚(9wOÑ'?>Ì3öjb -àÀ ÏyÀœÏí“ø³ó(™¼Îð(Õ§ dMr«›l„Ðñè4l( °÷mPD²n)µý£cÌÁ‹Û‡Íã„pŽ4rÛ"ôÑÁdmìêjA+½Œ~ˆV¼üâ—½^ó(i ¨è:7 s¡`ÆÝb\tán!Vp9Q®:\µ¨ -W%*ÃGøÂD>\\n¤áRa®zX «a®rã0H·‚BèÃå…n¨C—4àªÕ ” ÷á‰aáA8̱ÃêA †Ò`¸b¸"à—¸†KNàø ¸ê¿W®Š_†+†+"ß÷=~"þ†°yO­ÑS+SO姹ô4y^®Zaêy‘y^úDø?@ ç»¾ò¯îÕ¼ªWñbcèžç¹žö”ç¸u·æVÝŠ[v#7„ú®ɽrÝÐu¸jºZÐ]Ö1È>î}íiWk­´£ªNO -5Ðê9ý1pR®jÀ_xUÀ³ Üû ‰æ*†Y«À ÖÃFäD -fÕ…ùõa®C˜õ¸ -PU¨R4b”DÇnìpƒ8¼Ì«'=³ -wâ3ù‰Î…žyá'zÅ•ÝÊìàr\Çs|ЃȉŠSujNC9J)­\å)Ô=‚ÕTVUUuÕ€ùÑ0OÌW3à Vt¦³^Ð ×Ö0Ó>Ìx3ÃüW@j  ÏÍР!žçƒ®„ 3±Wí©‚Õ½†t€ViÐ-”.(ö… ‡eÐJÔÍ©jƒD– --+6\—€\*º `¤'s–Ê¥ÈrôÈ.d#ð'&»Q!R#{Ò0bU4FŽÚJ2$Y–áBy¢DëF¦©T#W–,ʶFÒ4…Œˆƒ !“˜áb9£¤]+k–¶È›%nd^˜¼ˆ^„⧠˜˜3 $ÿˆìÎΙ -™ˆìTˆód¤ÓÁš,“’™˜9r)VÎ kf*?eÄçæH°FlXM• Ê5Vt–…â+Lɯl•wZz"?‘`H,gô˜X°Ô$Á¬:OÊ­AíD²eS9^Ý*À¤d/¹\ºHHÈ»Cì y-*˜ÀØ,œH³ -4Ÿ<£lixNqVy^ef§çÖ™¿4 -feȬ¦sš±?™E h,MNNNS•äØh4êZ£Ú¨4ÊÖ|²÷aš]ÐÕpêz½^«Wë•z¹ƒ]AÇýºëN×UÝ©5jõZ­V­UjåZ\‹ -µ¦ÐmqA UÍ©6ªõj­Z­Vªåj æ%„¥âÃzta©«ªSiTê•Z¥Z©TÊ•¸APÀ -ô@A5Ø §PqÊr½\+WË•r¹ƒ -A_|PL·¬A|N܈ëq-®Æ•¸Çq¶/€¥ì¥Ð&Dâðƒ#p‘‰‹8&R‘“‰ˆ8 -MœÃ¡c" Žm8ÂlD£–rü¦äxµRÄPæJ¥8iøó¶à”¼ê^Aчÿ8~°]XÙý 2„ÑÚKQPŠÀФwÌûîR)Ô¢Ÿ€Á˜JÍfE’÷œRŒòOÌ”6:½„ -5&%R'ÍÂà™Z²¤/ž’µ!à5)´Æàš“ˆqƒbã…?ePõ -(<¬7PýzÜ W¨`9hXAøH2,|F\.`åÀê‚5‹VSÖT<§‚%†‘‰‡!,»–â.Ãb„õ -˲þ¥‚QšõIÇËs?7œºÁè\%©³ª˜Œ‹s.ɺ‚E©qòÅjR°*‰¨ «È¤‚4Œr¸¤Àã Œy&'Wñ¼°Øʼn¼1UrxNËTÝÁY­ef3O™ÑS?—˜tfùËܲ˜]ü ³ø/¤û6Hφéi^¹&A:è -{TTب*‚¦éǕ̵’Ͳ3Á|â\6`]˜2œ®2LS½@«Ïm É£®ƒ84XÝ€ìmìlxuAWCЈ2K5š_,@;Wˆv ]S¬™Bdœ-BÂôkª:6lݱl+~¦öØH«ЮlRÛd ôñ”ú£ª-çt9§ËDê„DjîŒ^p>q: ›Op;•‰¤n~F7“Î]>1;%óÒs2/™W ™WÕ3=“Ò²G—ÂÄ 6åjÅ^üS#WΦڨ9æ `äV€04£ˆ«FQT-°E:µÈ\Ž”AuñBœüS§«zýþº®Ì¿xis¹öò2—?qÓWÁþÒÿÓkf¨½2iÝ‚"T‰‡RLì ÆH¹Jaƒ6! ÚMÀXÓ§`cË:D -šÒ‚ÀÄ ‚ $Ô)t)Hà0¡‚!Gš…€â:Žè0VW&‰ÃÎ$oœ¸QÚf“¶lÊ™”­Â)\ LÊÀ(`F……{Ñ -Ò‰‚Q‰i¥H‚U¨Ŵj°ÔxáøváÔ(Z«@ìAçCT§•rpU!ŒqE¾¹?Wºæ!Ççzî%áõç¦)ÿ³™ª$ iâqÒÞ@6娒ÞÖ9ë༣ ”Im1ùàôCIA"[ºâ'#5²Z “’˜ô·À°¦ Zå(˜¥D”©`®‚)±”8j3eÞ7ÂR˜‚Í“y Iê1™¦ŠÙŒ“¼2g›;Ó¦IÍøóI>ϧOyõ §žqë…“ýúÙž}žc/XÏ~!ß>ëÚ ‹úv˜S4S!*M•b]# ™½Â¯èÄ+N¯Böcmç]•¯©Ÿ‚ý­vÂU?ájÌ¿ -Ö¶Ï^ê„K§Wvïßõ‰«‘^±“¹”½´­xLV=ü‚-lI T®È^±)Š¤WÅHª¦HR³uÒzë%iͤL˛ʦÚÔÇ\S@å"ªO^˜‹©XN MI•Ëª¦°Ê¥U.¯ÊUË\u)¸š¢«C>½¸¶åWöæpÈ©£[—+2^®²ùW¾\|ÕíÕà«@‘€ƒéüV5ÖŒ¢Ž8J0‘§(%åγä!:;4êèÞbÚD©(|æt[è®ÐQ¡:áªD‡„?¾ÙE–ÔôJEX§È¿jTŸ3b̉1#Ö6#†œ¸@I1š N‰µMŠë”W0!¦|ƒ3bòmrâ*-€r&#ö -IqÕ&ÅiJLIq&#ŽiQcF왌Xòa\oå™Ð:NI…+`¤éÏ5Í~5ò’xHôÊtô•É'b¢þã*ÔõæcÏø¾õ»…àñ\òuU°DèáÀ·[«‚…ü$}yÓú¯¡šseb~n¶äàN›Kq¨m¶l˜”µfš.¹í’/¥õ2Ê6}Lߧôbê‰~LÓ‘i2«änÒ&ЈöM¸~æÓ^ -Wœ)Œ´qË…²ò…iUJ‰Ë¬a¸†‡l´y´‡£)tShÆ(|«(d­RW!oSh’®ôzkŠê¸d#½ÜUÈ[Çâq"ÊqžG´æhâ=Žø$5-SÜÇ‘_HÆÓ§Èß5 Ä€N£Yæ -5všp•ÉüFMõO•n£™DÑn¦yâd–OmUÕlnh·E1!,˜=«Ðæ‚'÷]N÷ –§6H)Å+˜nf£»f›^ectzS´b7D¶IØ-Lõ Ïv -ÏëO>©C9ˆÂ‚Ùäœ×1l:£íNuuj—šk_¡ÄØ\þ*ÌT¿¤]¡lë^ Sór©Ú5Û–,})Ùë–®m¢©¦“öi -qòš3ÞÌÆ™r¹FX É™lAæíêéÝE™ƒÓäï¡ížîÒ6 $5ÙL@]úi7A¶Ÿ aOœÂTKAº -ÑÔ¼NoFW̆tUŠº´È°û— …EÛÅY8ZnÔÎÀÑNWÉ>£]fƒ †˜LpV(^¿+HSqíR• lD¦ êyßKý\B’Xq0çdÚÉ*œx¹S—g.ò*À?ÁÄN\âk<³étòà òaÈù9fÆ&o¤ª/ù£Oœ†â~Áùä»içßO›ÙQ+ Ë™ØQ;yOmÞ®Ú̾ZaªwB.³¿&•8{Dˆ´Ž&/ÍòµÍí³{A¦‚•–¥fw…êäæ'·…Ì®;µ+”îÅf7(»TM÷ƒ -²dwÒýŸt×G¶uðÂX‡£Ž€8bc#&ŽžL,¥2K.»¨x)M®ÿtjuFô>Ñ“½¼ìU˜èŽ™¼‚™+œsE“W!Óý>y•ç\•¹W5{Ì/óËõ®FöJ,.[RðÙMcÖë´´¬É39”-OV•åÐW”«[R–smæŒe3’Ãpö"Y‹2ÕdNV$Q1I -ÇꩆL^ƒŸó§0õwÃ^üS›¸ÒŸy0FˆFPa†8÷ÀÙܸÊ=!®šˆ¬ -óƒ+ªR6l]ÒµVv1-8J¡Ë‹HiF²¢œHjs¸žÎmæd6›Ö¤) ¥3™lF2Éc"c‹cäŽ^4ç„“|rZF€ì×ß®®žò½¸ð‰ËŸl6G£dЃ îÅþþ0·ÿ7É°h>€$î„(•ôý’FŠþA °²;&N¹ðáß|¤?ŸÀ¯ðߢW|V|û‡SlüÍ–‘Ëý×`)nÀ_S˜'`ýå˜ÿöè÷œ„k'¢ô’qroˆ¥\Ëaì@à†i9h˜9/Ä~Ó/X8xÓ¼böáÿ?iöjD„ƒ±Ã…Š¢' Y¥J ?Q%å¹0Í  `ôté¸ä¢f·Q‹öçÂäÞ9ø„*‡Ò@µÆrríÒÃüR;+  ÈÕ%/˜_¹s,s+ à夦žp4ÿÎy˜GÈz{–?å H௤ý0âgy0çnda˜•Ü@1¹w,{oOX4Z‡Zæ@lçbÊ`.¢éF£¥±Hæs©ÈUø›™vàȉ4>,ŒY&ðX2 md@ðø Š}&ÝÜ9–¹uZ©ZiÔÅRä{*ò™J{JÛEÿõL&t(ˆ=·Ò -#ŸuS`ª„öÚH3Ü°¦æÁäÞ9ø&uÓ K˜*?⇹XÍÓ´‘y¥ØæUîœËÜ:O7¯ÀfLIBlXnÌ<\@Yçñ2‡eK·cHF/ä{4Q„e úÕçú«”ñ{ÖCÇ7D‚8<ÇE­@‘puIƒçÐF€FëØ -’îœËÜ:cùBâ‚„§Á"QTÅ>Õ ÁñôHèT%FF`µøfq„%‹©òߣ lÒÞ:vÌÆœûflŸç*°ªh!=Ÿ±–B™ØFTƱãÄ÷΃eîT1œWˆ=‹ -«òG¼Tq^´‘‚ȆFÀæÎy°ì­½Â•6΢Ð_Ö’Ò]®@G¦\POšL@¬RâãZˆØ*ÉSvus˜˜Â65N‰Êø B.D„ô,˜¶H!^ÛÈÀÄodîËÞ›.Ô²Ï×Å¡)ƒ§†ÙG „Õ’dýò‹`R!04nKÁámd`À-ä<-rïÎ1˜cŒVª„ÀeÈ`_+ëúÂDQÀ´kÑ“Oc´°J#ßË®5d³ P‡ÊÀÖŽÁà ¹ŽŠCBìÈ+ßhM Œ¥3é~C fe"À6ÐØÔÞócQFæ6F®°€µFà–p‡ÓP«ÃÐŒ }G$ŽÆÝ£PÖXA»bh"— ð8g®lz~$OŠeí#X9fíÇk Apî ìZ1@L ‘ÈK'bóÀX¹Jô€}è³ÍI¥Í0èõeÂŒA 'K7rA ó "‹d¸®u8€øa(‚µÀØ eíZÔÑváð„¤)âRBän"%Z¬êŒ5f-`j'É$2j†U/°| KƲr‡°Æ=ëm4Û)‚ë2ruÖ t‚ZŒf¨UA òØ]"ãMf ´°Ôv[§`7d%»lb§ëÅؾ·Åš€U(‹S)WÆjY/xJ¨ø›‚ÏOcðÂ’ÓžUØÈÀÀ ËzCKÃÏg ÖQÐÚû}Æ„÷ ɃÊ:ThÄŽ+kŽ°mLÛ@†CºahåºFºB¤áô¬HaÎ3%Bú&²0¦@öIJ`ÐÐ30tìÚÆ•ž3á¿5?²º ÑÙ0`<@i€8ÂÜ8É8Êâ mÄ¢dq ^%*+þ>Ò6ŠNÃ#*Ð D´íýÂjCdzöÁˆ§TTNÛåáR‰Dé‚À3cñÔ„ˆ†¿ˆ\†L.–>¦5Ö«y‘ñ»%àÀ+£ñç¸ €±õ3 Þ8ôÌbt1™B „¹¨½§ØòEXõV‘øU-²púÂz"ßLØX'÷¥ÂÈÞ‹X$rêÚ•§…*ÐOñ>éÜøheÝ€ð‹¾]8ÔQho¤*îÄ¡‰ì…*LÃ1†EZ¹!20Ð2å:kAë;ÊŸš®g.D|¸ ¦TdJì„ob Æ®2À$pJâ©°íÈ ›®O°MG VÅ>€N$!Åñ‚Àób# s¹Î…ÂBXÒžÈ;Âx“Øg€Ji³nÀXÇbê©Œd€®–G¹vÝ„h+  4³e|…„Ôô=±inU0ÐBq6~ÄÇš4뵄 •¬„HIü` -T˜Ý8ˆÍØs`Æ -22@Il…0´¨‚4F± ªa,Ìuìy"Y NìF²ðHôèÊ - L€‡XcY!'8€áwƒ€˜`ìdŒ5å- LCžwƒ‚Mpy1É;V¸E xj•kn¨¨jf„ö{À=W,¹1†ž$!1›D„r¨-ZmSFÏNK¬VÄfîubQ Ð†KV‘¤ ľx£­«;µ,ãÐÚM¤ÉÚXKs¡§Ÿ†^‚ïÀìÈýЂÐBSÄÀý¾y’²÷có­‰BLž@O 0 - UàeL© ‘JEÀØÔ”±2 ¨xvµ1x×uß•-þÐ-ŒK€âQb㧘Æ62Ð7É.q-×m,šd ˆ0¿ž6Ê­¹P…@I×3Ž’À±e7Ahc˜€“EbC—(‘qSöµ+tamÓ` ÄšÐîŠP ñi¤Ly–)PVé©AXq‚åÂI8•ÐŠmÓÔa])z ;w'ì±JÔê&â©C &Á•ëjÁU8ŽxÕPÅ(• C'mŽk—/lë1˃Ö¥8‹jàŠ 06^•mņ{&îô¸ªÁ@II,4•zÚpš\§àõl¢á³sE`Ëäø¾ 0Œ7£sŒ}Œ§µlo8®uWvåáØ´²çsR@íJHŽ?g솀­6S=™n,æÓT¹è;Z`n'xÓÈÓ8¢!¤"Œ\AÉ% íŠpbŒ” Ö_Åœš1vAzéýø’҉ȑ#q¶ }˜–”"I@bÇ«* yŠèzÖµ™9`äJàãë0E`sØónz¾'cÍVƒµo/œQFðA”]§k,åà˜Úè€ ¨E œxJCAd=@lÉÒb¬m]Á~,5m™/ßä0s\”A`èØس¹?°N$#! °^˜|£y’+y§ H¹Î-É~Am˜GvÆ‚SŸk‰lœŸaZ6 5”‡‰“<¶õÔÚ1P*ƒ—zA+È3VÂäíL‹1j$±O”;ö-‚(HÕ;Ž ci1£‰\¢œ˜0³+êÄBPh¹eÍkÏ(‡okSh%öÆhÂcÕNOêñ”š¯‰Ï$;±„WžÌcd÷à<.F30Ã-®F`“Õ aÔÛŒàkm2c\g±±µ~È6Báæ ¼a -I.].>!ÐUž¤P P¹DˆŽ¶÷S‘Ñ„Ð*ÜñDÁy_ !f^)‚@ÂT t©êxœ2¢:cxLÎL`i§RÄW؆ë’Ký{„R±ÚÈ;–Ûi–'@ IULEL¤+Ws‡5ƒe{2³HcÞfc;g"}¤UIéßVîéq±lÆR#†à… WöÌĦáÞ’ñn2ÝÈ^ uQUO¼iu% ó¸÷†:6¹õRªh?‡9àhƒXµöŒ“HƱÄZ¹r¿²>Õ3UwXÕuÃi[⎫ËnÊXIOcÈu-z"1=žÝ”G›ÆöþÈ‘<%²ÞRCÐàÉ܉MƱ‘ø‹¶84T€˜3 ^|gŠ¸‰›¨¯]ª`®kÜ…ÏqâµÞNEÖ¦øhleI:\BÂ#¡å7°„Q{¥áL‡¦•Ï㼊Jžo`RðÒÝ -BkßË0–f&¦&ÏÏr§¢<©e`±ÐdÂ4Ós€@7’Iç­-蚉 ²÷ë@ø -¹$@Ï×"™"µ%^O2€¦Jg6çi,A"íœ0зF!£à€ÀªŒÔ'˜†Ï¦¥4Ö!ïÅ›Ø5H)ÈäìA$Ö2ÞÀ&·XÏØѶÅNB7ÄŒcìó„Þ;´"®$Z÷cC©”kS k;ô\nGD çÚŽƒTÅC¬PŠÍ´ ˆ”„SJ,6dÒÊÒiäû#[ÊÌX” q¨ÚÊ@©«M¨LZ*÷8 e`à‹AÀw( l†ZÒvk§Œj’æa¾¬òXœvÑIÖš–IµTŽqþ†2½vG¼CÙÄBD®¿£,»AZååF@"˳…ÙÑ¥±7U&À±JêÌR?ÇGÙª>Aœ)¦†â¢c /eóN„))‹Å©رћ«DÞ±Ør -gÞø$_2g4Ar¿§ìý±›¡i'c,–£z7Èn‚¥ýÇãÝeôĉqÛ ÃÄÌÚ½7­µQÎ"{ÖÉP»aÀiç™ëÅŒ"æ¶EË9%À<φЩ5ŒùD7? ëIœê!N,ض$›@Œ<ÛCÏÝL„ÙÖ<«´Ø("s¥©ÁÊ—“I¾©lз'ÁÄ¢b&‡6"9`Fhmï”iÇEѤE5Ób‹@ˆã£Rb©±µ;t§ÄhÏb©¦+AóiA ý1ÀXÄÈî -aƒƒv¼È!;ÊŠe~¥áRK© 0HsqÙeÆqz¿=MB›F;üР±W²ï®3õ#¡t·SÈj”QI 9U?DC圢ŸFGn¤ø3KÏŒ™ã(´™î xJ&}”óe樛±)f -”NïVNàeT‹0ƒ†¦€›ûÉF(9‹a;Vi¬=#H9­²n©‹Ó)³¯†#•›ÚDíÊt‹ÆÜ×ðRCé˹Am+fd=™Ú Ö¦™W§61 ´Úísí”iÌä['¬SKçÙÞü ¹H¦!›²)ÕÞhzY•M?ɱÊÙ ©£ºhEÄpÐÖœ29xÚ†®&üWl`èÇ"[êb”hÐ帔4ø`ö¡,‚8͵à Ze -3M_ìŸ\Ó“@©ª¬F‹7bmáé‘IÚÁ­¹×[ð¦+OöÖ˜J×x!¬,/¬ø$Œ,¤L®í6–AÌ^ ÊÈTÙs(ŽÛl‰Çt)ì´Œm)†'Ø4‘`é+dƒ ¤Kz¦5ÐÈP*jÚ>LC°&èÈñ4ÚžY墢/vÒ[àÒ¨+xU$õR_‡FLW1lU |ÙÆ',ùšªJKW®=‡† N(õbê¥0XeÓ÷Là¡8ÏD ¾ËÛDˆ±Ýð3åoÅ­vsÐÄ®Š#uÞ´Œlljâ-ÔUÞ!5mCFWiß56Š²ÙLuL䢸¸!»¼’Š*鱤 áÈsEZЂÑ´¶v†{ʾȑ¶^Wi÷9U‰ôpŸÚ‘%âÙåÙÎ%àÁgG¬<{@ÉV$îÊ‘WjÖ©‰@°s‚ŒíJpÓ&hx¥éWs5Š÷-7 ˜X7üš=|F¯äÊÎf Ýsž Ô)®®RÓFºnÙWöšJ78ªCQ0É$•c˸Ž­Æ;"™C°ŠûU¥•…V&£5; - µ L€9èI)¾8I(GÈ!5ÞÄ®¨—iŠlb ¸ ‚D67Á´Øôº¥?“Ïj—Ø9ê1­§M€±b·²Ì"u½1‚ÀJw¬µ`êXD;¨+NÖ¶­f®ÝºU6>pLddÈ ]ôÂ%QyYÌNzHDqoƆ{æäµ# ØA,õbůG` çcÛ¥c›Ê*{1N_m (“2mÍN,º¶ÌGÖ9+~yƒéáE‹hƒÛµAI­Éñ0Dz8TJù´õ)ö¬Z{z&íC7­QÜÝ.\«›ÔtoÚ'¢Œ »#k†vþLÓ½/"0[´SHçmã ÞP™Ó¾=ä¸ÏÓ0pÅáÛwÄx”-²PÓŸï³0jlðíÖ­âá1Ï8UéYs°œÅå™H*K•=ˆ;™eïÙcArYá«è˜ÇîÀ)Þ ‘ûå<<î¯G±ŒÕZ80çJ3G TZ¤@p`ª«È˜iÐwìA¬O5r2sžmÅóVf3B¥§“Ûù«Òã:؇"†—vº AÛ®.e¶7éd—/Øt{#P^RB}òövÇì$˜pO9¦›ŠwÝVéÔd@Jb}J#}ºêé¤f(«ƒÚÐWù̯Ùw8x[¥óѲèdNbáÁss -_:꺶‡Ð±gsÃô(³Ã‡<Aù±y'€²G*èˆ µöä­ -r¸Wñ kA kâÌ :b{æJÙ¨40 -‘3¡5EcÇô¡ÒËbQ-“Ðt”9™ƒø‹½#{³øÒ éqì»ßž¢rÒFqK„ë؃M4E_D‚ÈSÇRAIå.FlØã„ÑáýkGæÁ¾£Ã#ô†Üôˆ@Ù=pÒ€_‰B-n6a ¾&Òžøes -_cz·œô˜EäYKíðijß·…)GJ±mæYJœ -‰$æ’SÏ„KÜjhÞ”y×’±„À‹mŒÍÐç¼u轎ßS¤3Å­ÍK’Ux¼HQ"öä:Ù3Ò•A¤2”¤ù}S’Ž´IÍŠžC¿) ÓÉ8°ÑhDìÛ#¦C꿶9Ù†@_c»Éêl –²tZ¿M¹\Ó’Å#m‹†›žW÷ÒBµ£H×x,Yòš¶i„Çï<p(Û1–éЦÁ÷´ô¸ŽìØÏâÝ0t2¢ Ê䑇¶7ôeK&ô¥uˆN01”æuÛîTs‹÷tdûJúÜf ¨ZÊ$)3})B™D1¶ ë¶× My•¾JÚ$[Ë¥)Ùf0›˜ø¬HZ†|»6õ|C6DÒÐK3p$`%„…ŽôhOvLesóxÓÅH;¦’ñ§;™6± ù¨GĽ=ž´(L=^èʶ«ø†(, …² ìØŒâqš ›hü´#Y6:°:`›U|éPòùP+)zʤì¶ÿ$U¬v|vP*Ìd㎠ØíQ - 8ä˜`újªlÌGb°G}±—Ë1Ô‘‹iOÏqâ{lš¼2!°eËìQXDÈƲcBÊ({hÕlçÍ!À¼ä-Œ3çê(0?plßg6IåŽ~Û˜ù~ɯü«÷Ú/ü»È‹•Ãm¿zØètMaÍþZ¼SX{ólãy¿À¯7ö x³¸¶=ÅŽº=ølÿÁ7 Þ,Þ.Ìÿô}³;¦Uqíqo4ùáèã1}¶V š§šìŒ{ãnÒk%ŸáÑëéç­ÃN·=Hzôy­Óuú½æ`š>Æ°ö²×iä4ònŒ²Œœrƒ¥X_Å™A +ƒÎÞx” q|`1f¸ê^´FÍ÷8h!Þt®XÊ’?ÉØ Ž»£sLX®øê'yÚk“Æ ùg ªõqAÖðÀT®X›bb’Ãá¨3jîtº ëc¯¿M÷äŠÇ 6nŸ6ôö” ¬öŽûÃÎ(—&°Ó;cõçwAé·§¸Y™íþxÐJšÇ‡Vθšfªœ š£þ`AÖÎ’Ágæ'¥þŒEsnÕ=L:‡‹ºå8+¹’‹P?9×ÿvÚ£3ì^~Y2ÄOr´°SË/3n¬Ó>Ã|ß(?Þ-w›»*Wœ á·çä@áhQÜßû;i*ýq¯ ƒ*ý¹âp‚ŸIVÏ 4¯Ú÷á k¹VKö‹ëËlïSe{ûƒ&¤ ÝçýÎð+Ì÷¼\±´Ì÷Î4N¥|y”eº·L÷¾@³L÷–éÞ2ÝËKËtÓ½|…SËtïúiß5M÷6ÇÃa§Ù«tÇŸãáçöçÊö˜‰ü(Åüüa8j×’÷&⸖éÞ$—ŠçÈüæŠ9ŽæΑ,ðw˜_ûÅÓ'6*×c -¬e¹3 ³ÉB{Ñx+_F =oµuÝ9cä,×=½à·“Ö¸Ûl`:Ôv§½ÙïôF&•ÊÕYTW!rœ\©ÂŒJ/ªÑ«~ÞXù0ÍÊ‹²¢s7-ÿ]}%â\®q þÅøŒÑK¿xÅ~q8úØ]t³§kLñj«ßíîü{ȵÛü°g˜™âp<Øo¶’íVsaFóÕ46ÉÀsÆKVû½á¨Ù[¸ê—/g˜˜ÏdýÃq¿—,Îd¾ìë,_ÏnÉWkèÝÊož}ñ½ <ÎÓ7» ôµƒng´ÙìœeÓ¯™5ÈçÊYî -Ïa­9茒QÎøÊÚ…,wïÜká!ÙSŒœQžJw òň7ÃÈ’Î+#j†‘E­[ÎTKŸÓw>KŸÃoÎy*þ™G½°#ÈéöŹw“¾ŽÙÈeì´À\\öŸ¼'ÊËYÛÃôDå¥KõD­êœqs±®¨Jò>én6Ûýsfá=š¼MÍ5mzÖö»ýƒytQçJñóU»ä–N~ }—L„Ûn3gÛ9'%Ád\¯ŸæÍÕA³Ý/ÚkªJùzý„¾Àûë1kù:ôqI³–³•²4fy×·¥1ûjzR÷ò•{\¶ç&WÌÌZ²Å×{¾¦evÁ/ÜR»š³VÔç\çËÓúŸzJ®ä´~¾º¶®è´þ^ÎüäžÕÏgßàYý‹ùל¹¥K8Ø|) ;Øs¸¥ZgxÜm¶’£¤7zÖ<Σo:Ÿ©;£·!¦nñ& ¼©×%ú¾¢5Ÿ/› ª‡çhSÏ/Ãyý髇Í^/én'ݤµxý¦œ+Îf™˜Ú»“[¹br–‰sv¤vûƒgMô!ŽèIÒ‘0‘Ÿ¹™—ϵæ+¿l‰'_†ï2î(_ó2뎈€Es§(WqæW5ñk®¸Ïeï>ó+=²oö:GÍ|¶þïwºÝ…kQIò_¾ªPLýT‘ó¬VÇ´ütÆ2ùÜUÎñLœZëY¿½¨#ìvzI3_ž)3ÎpÔ,ÜÒý·ù1_³e˜äkÔ¿–µO${Ê`úGײ½œ Ÿ*wâWÉ,êó¥g†ôI~ì¨çDõbGœ~½ÒgæpŠ™)NÛíΨó~Q& ØòÅŸeaŠµVk|4>»í!S¡î匳 _ôM{ù²¦Wö~³|YÖ+y¿YÞ¨K¤‚ùRºsïF|%Í0­|-’e3L.§å2Í0Q®8Y6Ã|Í09{ùÍuôòµ§ºü¦Âo¾&oŽé.6_kë›o‡iåk—ë²í0yS¯K´Ã|Ek>_:v¹v˜|ÖËv˜e;̲æ“ÌÍ¥ÛaZùª^²È“7#~ w”¯y¹êvµl‡¹‘w¾RñåþÏõ±—°}ùRºs§ßË×ê]üEny›ûÞEæþÚÏBÞv`¿ÍYÈã›H.ß‹rµÝ,ßüÛ UÎXºÜÛ ó6A{›aµßïVò×Ô½üš×ETÐÏ—._Úø%]ðWüºÿkôb°s½O+_%Àߦu~ ^ÄÕhŠwó%‘3Óé¥E[Z´¥EËð䊥&ÝnÿßõƒA’ôÖÁ%ë®túëï;ýn2Z$íõþ Ù;È—z.ó»o-¿ë³ÚÂ×õçŠÇe’·Lò¾²$¯ÖCÔm˜w—æ.¸jþ×9/þÒ(_ÕIKý¤Ø“.rŽ/ÈWò¯úÈå¹rú6g$¹’Íe¿6wiâÅSÞ¦2q^CÕ~ÜôµœÄΠl'-Ü˺Ӳ;]¿º“©2qÝÉ¡¨ü´¬;}‡º¬;-ëN˺Ӳ;\-œåvÏþÖŸ/žã.‹hË"ÚIbšü*oçñ¾þBÚ*Oêú”žD¯Î[ºÈ×*åb>—õÇz,ÎeÎæq†‹+¨µAb—+&g mçW¾žãò×ÍÞˇåó:WËwh|eF¡Ûm6;g¹¯kfr¹ÿx kç]Ò|­ïÎÈW0»|wFÞ¶F/ñÍÈyßñõùÎ|iÖeg~CÏ‹;Ð\F9Kßy=,õÒwæ‘å{§>±ßüß;•OoýU¼sêŒÕ÷ÅwA—ïœ:¹£9wïu¹ÖïœZ¾;áK$7xwB¾LÖ7ðî„sD9/ö÷‡I.{ƒÎµxúÄÚAÒÎß´|ýmí ò’¯ï¼D²§9#üÈ+#–éÍgKornmÎí¾ŽYÉûÎݵL<·›íþ¿Ë7Ù¬s™š-S³O’š¹bk™š-S³|,¥o25‹rÅÈ%R³œ1²LÍ–©Ù25[¦f‹ ö09û¼cºÏî:+¹’©P?©ËÿvÚ‹ŽôrÆ’!~’£EýêªòóÅÍŒg=O) _»9ß\) Ëê¢ñPîð¬ˆ(§Eñ`oÜMz­Ï-ßôé×%Þ´|=Ò—{=Ò×ú’ QÑ>ÑR¾¾“ ŸòăþÑÂÌäë¬6“>ÉÎE^w´×&AòÏœÆáâòmGWËßòmG ¾æo;:w´ÂÄ.$œýA³5jvŸ÷;9;Ýj1føê^µïîEÍÙ@²ôÏøùÅ÷ZùJNçï-œÃ'äÖ?Nñ0½Ùµw:Ý…µ±×ߦ{rÅãÜjå¬qbv[uÑ7°åliû‹µr}öÛ~KÞTë[}ïÊùÕv¡²ñ¨™·S³ß\ÑxYj½Z{}Ž4b”e$? -r%ID¾ú,®(‡À Ë_W™E8Ë4â §Ë5/s™5wFb´~šÞ'g(WÐ[“7–.Õ[“3^.ÖY“»»g¼·g™(}ÚDé"Ý59SÁeoÍ—Mø¾î}£|z^¦|g§R¾fl™ñ-3¾eÆ·Ìø–ß2ã[f|˜ñå«"»Ìø®Ÿ -^ÓŒoùŠˆÏŸB\àùÊ®ðù=Žz¡­Üià¹[´–/¼X¾ðâ³.™¾(\Ž¸™‰¿–oVüÂŒœ÷õn¿V+–¿ïg?Áp-ÜÀœ;†f×úpôqáo©ÝG5ã¯Ù¼³×m¶Þ­Ô?n¶:£wòVú5Ì}=Ño!*X´ä›sö.Õžž?Ãñ—~/dÛ‡ôj’jþ&ê¼)P¿MsÃ|‹òg¯ÉÔ:ôܦ`ž;“»°FÐ÷Pçì\ÉŒ»oþ×9/^ÆwóU*¶ÔO2•tó¼‚4_'Q3ä_õ>Ô¹â…<~¯î²të陓OŒûÍV²Ýj.œVäËÆL20¯Åç<¼åë0îý“¬uÿ_] ö´Üý{˜·9L³1Uâ%Tí÷(渖s8Ãù¢½móõ¯ËpïJ½\iÆ2Ú[F{‹G{yý"è¯?âûªC$Q«kícg™˜ÏdýÃq¿—,Îd¾,Ñ,ßHHøMî\7{ÿ-w~çu®¾æ]€oÒ(È·¦çjV.krY(»„5¸N½ƒç´ÍAgtx”äímM'í¾;ã¬tÚ®+vì)FÎèÓÈ+#Þ #g$9M0ì)Fµn9›½ôyšËúÎüFž÷Ÿ¹œ¨¥ë¼†zé:óÆÈÅ]gÎTë¼®sù%s^ðµ4‹^D®ý¬äØ3_~gî³¹|ѧžÔå7XœÈÕN>_|u/$Z¾‚öóóxßd‘ßs×<ºýÁ³& úpÍíû‘0‘ŸÙ˜gÙÏeÿ!ó{1raþ^;95ê³U"`a\tÌ5ï7 ÉËÂà¹,ÆWõ¢’Üf]Ë–|Î÷+yÅÇ‹|0.é®rË׬ÃZøå«ùÊ:.ñvŒÕ|Ù·s¿ãëÙsDNp­ìäíÕ —Ýw̹y»Ìöc>ó‹e+ß×hg­C¾¢_Y¤­rö­´WkçÖª_ ÒuÄg vÍÞpÿ ¼â³1ò¸’ÏQe5÷ræ-æÙˆÊWç)ßèb¾6P&88ß ×@Ë.µ,—ZV -‹N1_|]JÏ*K=˧ž©klÎ>} ú¼£3È×Ì_²L•çTî›­‡p¥úÚ¨ÚùÎ5æóÔÏÅ‹!¹µ ËzȲÇô’ÝŒ96FWÕÓxaCM3\îvs%•ÔD_­dÎ÷íO~ξÛå -¾ý)o,]êÛŸVUθ¹Ø÷?½î÷ÛƒfÎÜÔòËŸ®£.øõO+åÇÊÙ­÷Úök ä#d÷y¿· |ЋYV\I:½ì…çÇ„Ãã¶?íõ» ÌƒAÿß›§X†ÿ¿ù·0¦Ë)¾(8¥(7(:%/VHOXÉó\å†ðKèâOñM³¶Ž½ù<_þпE¯ø¬øö§ØFô[…U¿ÂÝAQ•üÈ‹ƒâQ - -KAà;^q£ u)‚á ŽD@ÂF:j5–ÂÀäÞy° hšŽÂ~aefu41q+»7V‘ -üÉØ…J¥Üj¶ú#»Y±² s´[xYˆ‹7nß¼žøm.fQ/˜wf=ôðíAƒÑŽÑ±•]vÈÌÞp4 ç¦âZ¥ßïN"ëa ãá¸ÓfU2 -U©B±*\D›"þd³;†_é•j÷÷’be0Ÿ5{̓dP|1h'ƒ›§Vä«Ín·sÀ©š¹¬­ýâñ¨Tlt›£53dú¢Ü¸›ÅÕÂtpõ°9hõ›Ýµ›ÅS -¬MÐyÅüž@6ð•Ò}».}¸p¡Äô?s}.*³Ë(Òº‰û -kÅ—=4—m3f.Ð^‚ů}úE+?ˆéß‹áÓ"Í‚‚•¯J:ÓOŠ1äSðó'ÀÛ6~GÅ°°ö´×ÿ·G k(÷hKô9ð„–y»stÜMäS6uAñ`a†ãÞ´ ktÚ -,³ý‚¾Ù§•žñd0²*ŒÈÈêØæY’öiFV9§0tÏ P;: 4N)N´ù.þDY‘?eÞY”à€"C8" R‚&:úÓæŸA˜ -¢˜æ4ö¡´Ë®üxUœV~sQ¤¾Ž=’mx¡úToÓ÷+dˆ.ƒ#zo‰^£&D|öë%Ñ tzEÐ0ß/‰ô¬™!TxÕvÀà ÂY Û£fëÝ90TšÃN+{û ÿ.Yü~Mt_ ÌS°Þm%­>øš6M 3(žCà œÄ\,odðH¸¥©ØlFs8«ö{íqg´SY,—Ÿ£):P\ç¸ûTi"®T–/ -éy¼.¢ÑVÀ5Š×†9/‡Iý}Ò{Ñn/(uvµAÿ¸(«AÌí ÈãJÍÎ1¬vR0:1kèÆ®µÎèl9i° ŵ­¤ ¼OTPŽ# vsðAžøý«óä[Š•öBŒÃ¬3Ú½@Å9Œ8ô‚P¤}Ñ[]z<8#_HÂo§Ê–÷º½¶™ú»5Èç”sÔ ¾….ˆÐÒpë̘m³ÙM %!Ú7÷§öÆÛl¶óÇMbûÍ…ixa³5+—¯éí©ôÙ9– L'8.AYŠ½€œ3dÀ:Š­zàÀ­‡•âVÒ6OpbÀëQèû*ÆP„#;ö·¤ÛÅ\›†ƒ«÷½ÐâËŽ{8H’žæ‡Ä8„Uù®oqtõcSÇ®çDHlèARkóõÌà -V6x°çÄqˆ±{a`‰HÇ>ƒä¬7jšá— inlÝS±[|xÏ‹•{žŸp qf"_+Åòû5ÞîÄ‘ãQØ©•Á£aÚÞÓàq‹'„gúDWºQĈ<0`ph š@ ‡÷ ›@ä; -Xû0Dîâ‡Ì "Ö,"¤HÁ¿€É±˜ÜÀHÅ"Ð5_3¦âzd)ˆÐøEcœï -&IB+÷üXT+ðC—¦…zh0™¨É1Wa0 #¹ &RrIL®ÁÏ®S¬]W¤,¥(Dâf)7ÌQ‘¯=Ñö(rbÓ¯&ôF•b)`?–ù÷ä-FŠA‚°aeÂÊ¡_µÆCL¢šÅŘ|7¨zå$ Œ(ò`þYW\Zé1¤>Jß,•5¦U@tÁc‘å¡ÈyƒœðfWë8Ô„Îcy - 랃C˜BÕÏ¢sP\¾/\º¾ÉíJ´Žøv%g¹d}e4®g™TÊ"Âl%ëx¾O÷Â-ad2ë,%Xûdݦ -pÝ ,ÿ($"´"°oLMीń“LéãóXG‘2­‘Øây¬¤\$)ŠÄ|…¾Ï–%öCÖLÇq"2*rܘLBŒ³™N¥¡(|qè1Ad³0q<‡±£Uú´R-DçˆÊ»Œ×¨Øb2 °ˆ´/ä9t·—Ú: Œ…Qz—!Ì ’&³è»1arד±,b«|žY<¡O˜.ƒÇ…e¹”þ¢1vèvHŠÙ½kœ ˆÑSóð²»Ös…1Ó¹¾¯X¯5rG;AŒˆTV`L¦Ø-‹Sû»¾ƒšKR‡;eÛÙ€ÂÃ@cÕ„iwIòZ‰ÑÒNäó¢ÕG挙c'P*";!úÄøþb½NLÚ‘ú[Éù^x„*hYƒrh¡ƒ -]R~œc/<Ô;>:2åz´4eEy^àFÌxDº—ý£ y]Ý0–ÛÍz#Xäèp†£Ð*Šï’Eõ=íÑ*õ}BÄd •@Lš™Íf˜±FH*-Õ@´O;^ÑãÁó+*™€&z´"/"%´<@ -qŒ§3ó„F$à´DÄhj`Ô!hM¢ü±®Piü%02ðLýȧ¢ÁàBVäk"mµ,:M†tO8Mš«AâŒçqŽ’õ<äx¬‹¬Iã+¶q>šiš'å“5³ŽÞÇh•šœ1ÔVòÕ?€e'íÁ%CVȃ)¤© • -XìÆ;š5 -‹*mŒ`ÁŠ\a…€mE¾)R…ÈËwiÞB·™rC¨’åå°Ùeœ$U—¬-/ªÊ^AoltzIsñf³ÝPÏú§1tú:P,ŽV*…9wljVñ| yÞ9ÏÞq2™úÜdêÅÈ<ñìˆØ¸+nÿ3n’aÑì¿ÜœÀÅ×Û â?ŠÇ'ÞÊ.,Û#©Š›HÅAáÆÓŒWR £[Òüw$»üw({üw ûü·/ü·g½ÿ-Am)⿵ü Aò7!”ÐÿÅ Ác9mVlª(áyêúñe³d[לIIiä…vGìî(¢ùv‹tj¿Œ?<ù!†øZ¿5>U©5GMÜ”¿ipmjG0³Ÿ½²{ãû¶{FCÂÊî­\+»ñ);Ù´7É{ÙÓ%£f¿<§u“BÀûæ ƒ›˜Û 50|q"¾8 ŸS -'t6̪í‰Í øÑíY^î ›XÕÂ%ñ™'va–&)Æ{Î&óƽánk<õÖOœ¡ù´æ’O0 ÂÃìtÐwÞ/Æèá0¯Ì!·QÇ jA·ßz—œÕãzýÞI½·_PDBýœõØÀ2|N œÅÛ^‡úÂTþøËrñ)µà¶ Ï‹eA!Mò>Üÿ÷‹yÀa·Óú*Ü1­íÔf™Kž&I¶=اÓé†$ÚnóåDßÓìi¾¤ût¶"`ËÓ-Ðœ°eû°§¹úx&G«Ê Jnàº9céãÜødvJQþ&èè½FpÔüœiæ=Â_Irܘ7G_/ž$~V;ù”Á¡¾“3ÆRÂg™:ÂÊbÕ|ùìÁë÷ úÉ_èšeb–Å^ÿÙâLæmî&‰Ÿe®Óƒ©í6[×P-³¤ÊÔ Ô?YЀ.`m¿ì:¶ŒÌj¤¿z\[DfÈÿ’æw†þ«UŠdþ(_óÄÿ Hûtâ3»!1Eù±RÅÍA2Lï“âNòaT¬·;£æ^§Û}œ\4ÖîÀ€Ž‹ÍÞÁ¸y7ûÇãcƒ$æU³×Š a&úà»#Ï[Éf·ÙK*T4Ì 9‰7{Þ¡n{Ô%¯zž‡ïôx2MêÉ>鶌#Ük'ÁðŒ'Mß²´ú½¶ >‰×›´8‡h ²šáâ3M*zé©&,óçú\x¶ù -³·/6é)“³î¼ì^u’qˆÝFMúŠ'^þ§­ÒF³•”{]««¾ÄX§–`Pö>!E›'ï“ŸI\Í<ôí²˜¿„õ4b‘Rˆ…fc‘‰Q¯;­ÃÍA«LOó,/ÿ™È -C¡_ÇM亸‘¼Oº³™÷<‰éDôt<5øXöþûdpŒ“rCš¬L½=Þƒ ¦Ñ‡[h!,áaæ)Ù' (r^}º1,„iéâ>‰¨V·s 1/ö¦}€HúĘ²1+ÇúÑ^Òž–ãŒfLý­‚0 µJ‰Þn¼.>Úy¶Q¬4[ï0"™"p6ž7ôñÕ.š²œÑw;üå01ãÊÃ̽ÓiÓ‰”3öcý¤‘éþÙ<1èÙ§È LÚ³æ1®4ŸœÇˆ½8ªnoOwNFÆÞÞ)£·ÁjÁ¼B¸?êÀrœÏ‰š¤+•-hè~¿‹¯²™Gÿã^«;n'Å7Ï6OÐ$eÛÍ÷8ëxàœ›¢ý6€"2S æÍÞY79Æ*œïQá…îòÍ]ιî2Õ­ÏuWÄwÅ Þ3mS§ó=HªD‹>‰ïrƒ;×MÞÔz;…“ÆvP ‡7§-Æ”vfÒäŒ&)ÄF¥“ üŸãœ Ž3ïSó5êÌûÜy+þŒÛæÊþ¤[&4ã¼Ôy¼ÏŸžé©›q_8¼Ú?þ8cÕÏ°ZosT„tòÃ\“•ôºÓk÷ÿž9î¿"ÃMæÓ‰jÒrÕÆÇÀ5–R¾+É!è¼8B‹˜Õ0ét°í¦ü3ë~šóà·d÷áÔi>ÉXx`õhb®NÄ¿S{-\ÙRÔ©Nïa¢\åtp -Óõ£ãÑGŒà‡S¢œ=õY¶Ú–ù|Zù0dÚé¥j=— ~«³N{ƒ<û -Ž)}~CÇù7pÖ*AUÞ®>~ùµ7ðCï—?¾½u÷õ½ŸÖ›on?q|±Zy0xxtxç ÷Ý“Æw·oüTí4K—êÁ÷w¼|xÿ™÷ËÿýôìÁ`Ü -uý,ZQž÷½ã k×n;?XrèV‚õW<(÷Z?ݺ÷l}-<úß½N® ÷Ýò õXÝzwGYŒ­Ú“á+[øS¾vöNu­ ó«žÝ»±z;©tÃÍ#æà·•ÕÇw¿]¿ûC˜—Çoƒïï‡ÕþŸ·î¾j¿½£÷¾ÿƒÐÞï­C÷ƒŸ¿Ç)y¼~í¡œîWÞÝ Vj¾jo8êïŸÕÖšwl|wë÷>%Àþ$,4¤°âìýßc~¿u¿q×üv÷uý)¯Þ®ÿÅÈôoú1¨îçÖýûõÛºöËÁ=ƒçõ½»ëí¿ŸÿI3i |/*¾y - ª<±ü‘ nÜÛÂA‰G0ÿ»Jm—D]K†¿xÁïÁß­òNíï[µýµ§ÿԛ͟~¨{/½û¨¶{¿¼sØ•7h=+ïhf¿þñÛ÷pOû÷ú›¿~[±ÖN¨éŸïRdQ·4x$ö[¿¶¿]o“<móæ­û߯¿æBÌ…•ú®ºõªâ½yÒx0¾ôî<{ý ÍPäwLÞÏ·oUúñŸÓ¢œd<+w‘O,¢*¬¬ßº7¾Ñ¨uUÅyâß:Æs?Øë?Xßý_yçÉh<+Ê©™ÌÈ]&þÍà;„í€û§Ô)OËi¼'?߬[¿×÷œ»?×’ÁඓlÞ[·„°8¬06–wŸ(Ò¶»«5p¥>-Õÿ6yíó„FÛÿ=-¿ø³ò¬QÝ9êé^»QmýFÆsÎ<¬tƒ{¯SÜÁhãÞï•G;ßß›¢¡°T$/jß­$ð¨_qý;¯û³ÔNkÁo·Gÿo/Žo­{ϧ$²þxØ߯v†­åêÛM}óûÇR®Ö“;?ÁJÞº‰êõìÖ½'¿?‘‡üì˜ Ÿ®lüüp´Û>*oÿõ¤¶Ö¹w£Áöz”wžõ¼ÚyÜlÔ£_ßVîÞrêÿ³â8®ßî?׃;o`ÎÇq½õîŸå´@ºM6Ì?¾ýiÌ㽟Ê[Ý㟳ã~m>ó÷“nþ\*?ým»WXɘpù|÷ÁNøã‹êÆ?;jÂeüücm¿üÓŸ>`«ÑؽùÝ!±6·—À’ò÷¦>5³Ÿ¿›ð4™»'ú°_¿½ÓºRüõ5,ì7?ܺ/péÓòöí½j§ókYû‡ìÔž>}´Ú¸[÷oÒ§ÈËÁÏ=¾óìÁJ¥ûÄ)á\½M×gýÒùÙ{ðjo-Ü|ôlKíýù²ìþøÝu}ó‡?«êauãþvT\Ýs’½;¿¨Û7ª¿XØýÂÊä=<’`øgb•n¤?ƒí ý+~z"¬Â¨ÊwW¡¿ZÛÒ»¿×qÈ]°É85û¨ -zžâá§àó&Q<°Äß·w¬Ó¤f“H"€ÀSfRMf‰Béì l¥O!Ó"B’ç=”þ4CŒÛ“¤{ÖñSbã—T”<‰c)öÖµ"Ø&yÚ§ÜÍð’NÞýS§vቘš†ÂÊÔDð=(¬7±AršÇ=â*ý“PÙ'?Li(¬LÎåýy*wê”0Éô›åŠšþÉ:6W1P ¼a¹JUeZg™—…u9¥•#⸗òŒƒ_ÌêÔJ-¬XÞ›bÓÊäÎ$Š_&©©¦÷Ò§S5ó’®»ŒÆLÌêýTki0J¢öimíÍ£_à£_o»?>ý«ù´ÿ£¾ïm:O÷ŽÁp­ê×ÕºóËú_•nïUÕÙ«íìcv\yTñÆGÝ~9üNÈ%˜—·–ãõ§«ö«ì÷ÿ -ߘ¦w^&[—~½õË«æ?‚e'ÄÊÕÓßþ´ÿð;«Yw° ò¢¼ý°ý7Äí÷úÁËïb"ôîíÖÞÞ»1Ö $v?îó¿Ç$cÊÎÑïÅ$mØ۪Г +óž}ÕO/fŸ-*TÏÿJöaãÏ?~þ¾QïÿÒ+ñQ”âŽÂÖƓʯ›À9þvôÜTRp~}¾ýŠTŽ> ,I<Ÿ^½Ó¯>®u߀vüºZÞ©¾|YoþupëVýÕ›GbïŽþ¾öW¿qãéÃNüçIýŸ*Rã¦ÖÙdËÛÝ?̪ttPþ±¶ç%Ûó4&^½¿ÿ`²“E¶àê-¬d|à©ëØx´Z{òÿÉûî-õuÑ'à&ôN -½÷^‡>À0tzûÎÙûïÙ¯„4’`îZw­{ö:óƒÄX¶,É’,Y'óÏcîå r/Ðù7µ©ö%ãÅáM÷£¿Gè_ñp¥“V·Åy‘rÚÔ­^¸;V{êà}ôÜmÇ>–~êÇ}¸ÀO¿Ü®(‰MY߀_AÐÓüÄݻ閖Ԥf -A¯ÂüfìG‰@]ŸLëeòY|ã5˜8àI÷M*i"‘FÉü¹fUéóìxõ·ÀŽO.Ì1Ï`aâ¨*Ô†â£'›ï -”M6©¦Æ ƒYdð ”A/ýR=™éFçÀòo`*]ÜæŸõÆMi ½¶žjôß`c®{ ùkÒþ9µEýåß5g{ƒkåV§w ÚÓK?ÒÒv¬R€Ðj×d"«Ñ±¯lû`cVºÈî¯äúU5-‹Åb#.Hàl÷S£Ú}Œléôw’¨&®Ì×H_|ã@Pãhexà¨L¹ÀtSê¸Óå?Ò¼ÏJ˜{*‚'–É -2M05v|Dh(“€pƒÔ]Uü©B4?p´ÃÛþ‚%¬¦h`Ь‚Îlûû5ðT¿£A7Ò d¼DƒQ‚éEô®â£Ôm±›LÁžúÕ«ÐàЭõA*BH¢óºN6yô⎸;™D9ÑÂXÍ›¦Õ…n ȧ2Ùëé&çó.‚O"´!¸ïWÖ-(a}|bé³Ý‚æ‘3ø"í´ºQ %“î ðK+²ŽǤJDXÀ›úšŒ¿8£ÅÝ5à¡Ù"ê¹ íLlYr¦Óº'ÚÄ» tXs{f<*}ëXªóø>í(ó+´ã%A€X4=¸ð¥ø¶v)›)­æñ{ùˇp/êrÁYõ¯oË”µE[…Ίu‡ÂÓ™·‹ðq ØlD‘ÉŒÔpyLJËkÔê7<§’ћѥÌý¡¡Cs½Lþ5­°Sèð—ÑÍ0¬¯‡NAk7hõ-ûšC²Ÿ¯³¡¾Ð Ü+kÆU¬Ú ÷cõkãJ«jîššLÂX|ó;]3 êÕ7QG¬â[x%{lKÆ¡óžö¿¬5­¤,…:Áêó(C4Z7õG¼n­Ú¡óýGŸpOý†ÍŒt9§.úrëöÇ«4³éØç>4Œ¹r1y6Å€*‹xrš´º P Q½[«éDl°H'"7‡oj›£`Á€ ,‚õó  ßïÉЇí¨#œPz×á1CÌS×ç“óX -hóaèYšuÌ•äàO%9Xu5bPJÆXÝ9ÌHt¡¿ÄêšD>¶Ëšé`zrV©ì‹O–ð1´{„×G.LÚ‘–ÿ)“…AƒH÷5ŒÛØÛjkiUä;?»ÐL›@»¨]m;kƒ±ÚH'öÙ–Ìå:ZhJl’³à·:V3;Z@.5PIÂ\;‹#y›)×ΓQg:ºuHþžÆ¸Ûvs@¥MüE†=ÖòEh,-ÚZtg51¯ 3ð4%dÍžñ1û e£IZ^°ý}6­"Š °€Q ·­/8Bw:Ujyå4SH˜Ù/~•XnF§8šà¡HS›ÌW>év€² ±K²Gù§ÕBØ™DVÔ8:¸°³irrã;áLá†b7ùK¢k4t5fG&9Þµ>&Ê©Ú"¾.Y´Ð&7@wY'aëf0Ɔ!æµæpwÝÀS J˜&:¨àÒéƒ5uyânK‘…섶ؽò*ªÁÒ´õÈÞ!£K7ñÍvïå‹ã¹c9ûþð3—ªÞŠU ƒ”ÍíÙS‡4±OäD"†GJù&w~¤¤Í6>åäù nñ@A›ì'Ó1}>Ì&ì|(µ¾lËq/{¶$d*óýºü8X›bŸ;‡>ÔOú÷ÉÜ´vIæÆ4yzœœ!+ÂÓ[¼€nÈRr(úS·Yñl£†Ò_“¿Ms£Nôlê¨ÁþB €Š¸L…–07àúåi ¯;(®BÉ…Ë­Z¯ý•;|4§„Ò‹\ŒÌºíÒ´œ:Óf$X •.õ¨“dDÊ á©O÷ÁÌAûmc]ƒþétÒðã#s5¾±aL竳KÎk—8랤š”¿Ç×ôÏຄÒBŠ- -cn÷óÕ6SO§£èeD…] ¤—­ ðÔ4Ævã« ðzüÆ·éĉU -ÙT}º89$x¹/5¨š:5éÎzQ{ÿ›t¤~Á$}ûU껳lsÆÖåÍ€jüãnVz¿Ô–Ð(¦û‚¾ÙÆc¦K`Ÿš¸M®xÉdZyv¹šåÞM‰zàxíWÊÖõ.âÎ6aã¬þêÛº‚òlv £ঙˆÿ &œ Ó9û×!vÛôãimŠ€¥¶[Œ?d¦¢–XF§`Ü$Ú±}lnäEC± úeÝsæÏ3£ÝÐEaHM®êk±gõ<È_^ ¢³`G&­–›SöËm×,z2p‡ïéö ú×ÛE*Ðõ8d†~2ÌQÎà辇ß\%ûéöwšc0—YØȹóà'I–ytÕ%зqfêökŠÂ\¾¡%U²ø×Y¬€‡@SJMÂ@ó4õ­¯™êi}‹ö Œ,ë„êþ7>Æø¿á[̆ä÷ãʆÑ?’äµÍÂ`¼ÑÿÌJ×ÍeuØÌn{÷1˜‹ ±«®þ;ÛTg§ùŒÉ<áf†cØGªZgïCí¦t®¸ ;œ›¥Aý†Êlv´¨üŒ87?ƒŸ7 WèÜ’Æ}¶Î]›ºTþ ÕŒŒXLÐIŸÜ$%9È°™Äc6Ü,G,÷Qd·ðRñ©&ð®z>I⎼¾B6ŸúÑc„?¨d§å`ïÚpüîÇö¬É;Ú-á¥Âf§˜Úy¶?1 ˜DËózuƒÕ]Ë7#Ñ4ÚÐq¹Æû !„?¸e©sû¨ïÑÍ‹6Ÿì7~ yÅè²Xn7ß°™X\Ê&×F!aSô!K×¼&’dM¶z‡ªÉ䉚½bb·gS¶>V;2] -Þ£!–R ÇËÅødk¿eƒí/K9jâ´œlÿYó8 áSLf¥±i¯Û?Ú³1@XØéGßXoWª}ÓÇÿˆÜ‡_åiMf¢ÿ=Øïï©4Ø¦× Îz˜ì¥gÀÌ?ùû,ØIå6Ê¢[ròJ]-'Ì&w±–'aKFè -Óï‰æ@‘Œ<Á€F@ðÛq¶.aÓål3ùþ6Ø„L\mpw!/O—m#Èq•h·›-Fì59Ædš=A‰³™¯bÌwûù:æü ›L7‡Ó|—rߌ•$nQtCÜŽNë3ä@ê.VÅÍOl¢‰‚Ö—ýAqÛÍlÎ"@¢1#7¸£VÐüÄKyÔšµ‚¶¼Q‹ ;òœñè$Gܰ݉SôAS¨`­€ñò‰3IL·±ã.É Ogs¨Bp.Œ–Ò|Æ«ËvtJ›› üúK +ÿµ²[«ä4Ï·Òº2mx[—èÒONS;Ô\6£ƒý¶“ÁlvYm˜»ŽDÐæ<™ìä„Õæ°¹ÝD‹‰‹YªÙh3»ýa»å£9žñÚÐýˆm8°É¾DM~†€þ·¢ÏÒ­ö'hÓ<à¡Éædg4Ð1Y«W¶ímç>ì/2L [²¢Wõ!¯µ°FÇ™b)ö GËÓi™vcºh€ìéì¼Zìaòp8ÙÉ›ÐäÈ6Zî9WHI7û²fËÙ‰NuÆJ+cr6òkú1þç#y{úéx?g×Çs»<ð¾™1ÍßE±îFLË;ÓŽÝ…dFÊÅ™Ì9HÕßA“)uy¡Œ<ž0UΗ Ýüp1`34ÓNAÏ -dË ç~U?‚l2;íîÜ2R¢ÚßlNv9Ëp¿ÙÌH[—Ws†ã+ˆÝs¼|åORà:Ï„~%ÇÇs=q=uñ› ïsc/·Ù\I-fúx bØ£rV“éáÍ`”m‰Á–¥ýn?Yžö[`dþgGU +¬„·–~©ì6ÛÍn€aÍE$y{Bl¼ÿùÉ‘¿¼ÝBËA#¼Š -1:PÒ®nf’¨R}눺±/ &Èâ?ûÓú“å~§"œqnb‘&aÂ)¿TÁÜc@o.ÅÑ?³ÓË^[§ìED”SŠ¥1Qø‰€\’˜PpÕ© õpOߟôÊšÇ9Û’Dþ¼¢'Aj9gòæ´ÍjòÏãÒ?©<úÆ#òº!ÀçfØàX˜ŠÇ) ç§ä‡¨g]¡ PHoÄrÊ„£–>²¿%1õô€É5¥Ø¼ú7½¾×¸Kû`ßå÷ÈqJš¹)èq5_1»ë3½ÜG‰ø`AˆBÜ%GlpÉ»g>GÑEÖ£ aß~Ú8­¶ðžè6_–‘¯¤ŽÂ^f%ñ…ÍóŒüMã‘ÊÌå¦R<KHÇöl /N|<ŽÆit8Ì”i|DôXH¤.+#òKœñí(Û'åéù‡¥G1Ç! ãîâ…p’³3ÐFÕJVä±wä‘Wä=ÆÀå À[[Rm+ÊzÌ^±øÀ§BnLc|hrdM {µ[+Aœï”ìÐur•³’Ê7gŠ–X¡‰¦± -ÐÇèйœ}ІËÇùvÓÏ–³ÝÇ™ºi´ûà*òPx~ŒÎðqlºÏ>æ2n;yÝ…ìœßÙ?ûëǨL@šQZ, šên1Zíàñõc~º¨ü¸ìa“ÙÇŠ<+}lFÿÀ‹¿D o{‚ÊÕù:YÂáå`Ìéj±c»¡ íÀj]ÁèösüêüqÝ­w@ÈÛ3Óä´:(Sá;+Lä÷ògüÍCVQ„<2ºÌËëv¼­62.>ܸ«_õH#}„"ñU¿[”{Ó¦a49`ƒ‡”¶ž`lCš†Yò£@§ñž²R…'Ò\–#i1'{Çhņ©P:ÇÖeËwø„FF»»»Lï®!ÞXïD“åþ?ÙÕÍe(wã‚ ©«¯š‘n8L$•¬/éN¡x}^Ò‰@ANmÑ;³ŸQ%zñ­Ò¥þ¿ÞJ÷ºLë3Åÿÿþ‹ ¦Ÿ$‚˜ j1æÕ*×ULUþeÿ  xôTËaàƒö¿6`vÎ|ÐÕÀµ7Î2äxôKøÞm Ž&ðÁ` ¿¦~&¹<ü ¿Æ o ¿V¨Æ¯‰~_cÞqŒjØw0æ­þÎÁ'S~m¨tƒ=fŸÍ°‘ú3£[— ðÉZ†¿N%Vç†~%êJÚ?mgðÁ†‘oÓ‰Ùé¿6áW[ê'|4Â#ðÇçŠãËñ‰üJÎÅFævmÙ÷éÄ|ú×ýå>,SãªN“ט(FÌDÜa«Ædz.Š›q€kã 5Öú{ð*]²p%¾I”‘È$T:ù–˜YâÉQ“ڞýiaŸÿþ«?hOQ·;¿Z¸¶îžBlqÇr¶ÜÖC¥ƒÉ%†‹×œÓ‹g^Q9oµ'€âÙ2$‚_ƒÇy0MCá<^¯nmÕ~¸:•!x“ûdGë!©%^«G¼D¿lÇ2ñî×gìsÑÇSŽÇh_¿-Éð:”Òï;æL¼ïþ‰¯ýSkôØ]Å9¤ÄöZtûåLª_cÛý⚦s·»0׋eý–T©ˆÁ%UL—Ý„ö:ù÷_Ç:_@,áËÉCch—÷Ó—Â,¦•Î³í‡í0|Γúš§ãdz—£0·8=ÛÖŒ¦ȳ•Ôµ^c…®fVò×·ùj=2ªÆäG7D|ãÒyAv¾du- ÷±úYZâ)|ž‰a'¼^lL¼ÚúD2^*……KJ­å¿$ ÿ‹hL˜ Ñ8&[D=Íþ"H²í4{J H$ãTÓke2Ôˆ©Ü9"f¿ÏLÒ8¹® ͱÆü¦I÷^ô_wÛ¶±DϦ…¾²AÚFôˆZ?ð#k²ŒhqËÑyëêC }ƒÍ ÆȦ‡˜Rõ=b.숥¦Ž#ÖÖw ±õS¿ˆ}l3!ŽÅ*„ Ûj ÁΞBh.Z„¸6݈KÌ#n«æñ`Ãâ–Ä—vfùF“ X!$¤o{p8_A"­Ð‰î0 ÷›“H¢§")ýI‹¤«Ç(’ÕúH®rÐ Û5†Gº!RŽXLHUïÎ!µql…Ôs%'ÒD;M¤uýU#½5…| CK¥ßizïÚ¦ü4\VdÜú¬#ÓÎA‹Ì§á"²Ü.ÈZf‘­¿{Dö{9NÚGäbųj$7ºª5‡xI­kôjã²ÓT[Tm;ë~ÔhiPXi«Ò©]¿þ¼Ú[6Õÿ®¯FAuôÔ=ªËϺ:ý]pªsƒÜF]ìg+êÊ´äTnj;uóÒj¨»(è§Û¨ÕÃ:2T·ò<ÃÕ«&è`«9 Ô‡ª7 \ M·F]?i5zgd©1­Æm­îÎj0¢ëÕ¸ô„EãݎΚàO`®‰~þ~i’å|E“­£iM±½iªýšSÓø Ù4]É øjͨ::if‹úVó‹~U:Íî3±Ôœõ±…V]‰Ìµkb¡µ|g–Z4PøÕºæVëëÚpá€hIÌ Í1›¶di»´ŸÖsHÛ¶û3Ú¾£UÕŽüšžv^*,µëŸóU{¸dì:$p ©t:}§\ÔY®†¾+v:÷%fÑËú°.ŽÎëºÌ²¶Ô• -!“®î±Gu]õ¥£ûÞ¬ºéïÊ­ûþTu‡ùd«G¦#§Þ°žÖôvýö wzÔ½¿ŠõôÑŲÒé3îVA_ê¬wú†ÞÒÕ2cý]9õ‹™«§ß%ÛvýÕfjôç¶Í`›9:gk`7j¾!^Ø; ¹J}j¨öÃC{e<¾¯Ë’aîîZ Ûbnh¸¬£ ÿ áb´Ï}£ÛçöC¿Þ‹1•tŒ% ]]oì÷Gã4(7qÔm¼Ä j“!>›˜ KÕä)æÈ÷ÙnÊ“gSÕ¾žš:ùDÛô³G -¦U¸ ˜Ž¯Ë¬K-f»¾§1»É£9’u®ÍYB;3×ôû‘¹»Ÿ}›Ç›Qß¼^ zæË~س˜L‹÷@V=¶$й¥lMn,íRçd©Ï:ËoÉk·\ÔŸ•ÎjjâV<+[ƒ¶}Ïš:§WÖÊ䬱vUÂ:ù!RÖíxݶ©wµÍ¦ [l¿-f‹•m[a3ßÛZ®>aûé·K¶µýsi».¾P»%Þ+ÙÝúñÆ]{¡elÛ[Å Ö>*4³öM~·q¨óDÐaûü;¼SË‘¸f¿ÿ…p|5óß@ˆ.DZú=FÆX%šš5qÒhþRÕ ­E²Žk„ ݸ˜.g,ªtV69°PÝ´Är#´„5÷c‰=¶ËV[¸î¸ŠáxÈ`ÁÃûÔ/$¾»xÇlÏà@ç÷àÇ¢Æ@˜’õávš~ˆ„ë§IT=ñ<1ði£ÄoqáuªÛT¥s:. ‹3ôèù®Eí옵笫=;Ï„ö첬Í—¯íQ»2‰„ÎÕtTL®‰mºŽV³Çm6Ç#n/ö“u§ãŽº»ñYºÇãÆ}ôuõsßéöøLSxTæ»Ðñ´ÂøÚ3=íÍžóî-¥JÛÌfÞB"îô~…eïªýõi*QÜ‡Ï -U_\ß:øj©eÐ÷3Ó~÷­~óª[óûÓjȬHÆß-þU#”TéÚÂfp&2é@2i8ÉA10mç ËmQ£ÆŒ&~WÁêr’ Ž¼}Sð8ÿú Ù"ÝD(lžšBåÑr¶´…Ð!ï"ÂÖLá%ǃp¹`Î…‡_%°úáÃê Øl‰u$\> "•C±¥­ÉÈé0òE•Œ#ó†hݨC¢ÓíúC¾ë1ê­b©iwk/Úóدa´Œ‚ë߸¯vÝÆ ôÿŽg4ñÃibQéö²™HÄðb8Q¿\ò‰ù8ÓJj;×iÒS)Ÿ“ùŠÝž´—±äá§TO9ôáU*î5›RÍ>K­ÌÛnÚÐþ=§Ž¥/]ž­›éqårÎ ~S(ã²y¿39S@É t“Ræh1²¨¯È&«§u¶³L…³[óf‘³6 -á\ÌdúÍ5{“Dî×—9åMW¼œÏ4–|½±ä—­Y¸`¬ôÎ…Ð×w«,"—«KÑè=u‹¡!WéŠuCÌ\\¶z¿%†´JáU[^Gäs[næ뎙¾YÏ8>ÇõïŠéÐ@Ô}KÃÛˆU¿±ÒX\æã¦yÒÒ4㽂¿ùUÖš§F`Ýr}‡°Vi.µæúÔoÛ¯;Uºvl1o¶¿¼:uû4§:îìà·S±ź4éZ~´žnrÐw=Üû…ŒVó/ÿ²ùjXýû¯mÊTìaó³¹W ß½é÷8Ü7…&H?¡[}õûãCx€ ìz•n(ûǃf­^ìÏ·säÖ|W¯ù÷ÊcníÍfj˜3bžá¤³´ü˜œ¹ëOb‡­¾{—ÉH›÷G‘h«=úŠVë£k®Z>«ÕqkÚªŽOæñçÄ[¾´TºIýŒõ&ûBn4u[¿ÓÚ=M·­žiæÌ£®Y5ôŸmÏ9‘=Næ•vç:_ϣĂÀ‰Ü¢R×ëóYµ]`Yul[ËÍútZ9û¦ÀªÖô÷V»rhŸ¿îê$÷[ï[¶¿‡E.´öé7Óu+ó¬Ï¿‡Ñ&˜ªy7Ý+6Ûª;Ûð6¬o·ßx:¿3}†]Ê€õwÚ[=öË>Ÿ%Úûå8<àhEs¨Ö‡?‡½É«tGïOØulçFêBØg§¨}Ð: ÍžÌÙ¤›ûx !wö1›òà,X,eµ[oÎ;ø·³eJÝ¢Þ¶-jŸŸfÇ+ë«sp°Í ûêÌw?è·6—ÉæD(éå ZÌeË›Þità¤6<FÃy;áy„‘Ñ}©¦lÈŽšu¢]vü0ût¶;ßUé‘š"w F@O“ÙùüQ-`Ä–I<êûsùx)îŒù‡J–Ÿ.Cðx0Œ¯dU±§Æ‚)[*åËŠñ—õQÇŽp¸ý*G4qÇgJZߪ<<Æk¼öÜPpeCa…Cåq*Êðy Òà¶|nÎèsòçÉ;&z„Émþ„@8z$Ì94&ƒ“ [òò–Q3‹Ôm6ûÿ<\%\±$"ža–ä»ÇìJ,ÿ£ÍÙü•Pº2™‹òeÁ£Á`ÂÁÈk+J„¿B%ø êyÀ ŸTŠOü3Ú=¤w”OïJ„¥ÂY`ÜY<Â=ñ¬x'f”l -øSd£Pm ¼t òÌíÖÅÕù‰î Ü+Ò˜bï¦vÓ›2upøÆñÙbµƒŸ·w*òXûDô@Évýx,‘ÖØ:,%«%²¼ðî Öüó¢Æ|"_ˆHãOÎ}™5¼Ìo”œ£Ý0ó·„>ÝKÄph4Kx øO -±.Áƒ/£±9 D7ÃðÙ'|¦El1¢ˆXK"bùÌjPG¨k$GãB¦šóŒŸK`¬Éµ3Rù q/áu¹·_d•23Ÿœ ýÍg‰Ó){æ_§Kª/å“šY¾žŒXðœP-ù’_ÉÈÒMÆÄ w=€ßæ·hö§š`€V¨¹GMZ/¼èç¤Ò%æ™>«|7šé`Êù{CLñ|:áç-bÛÕƈOÇø3- –‰=Øò¾‰;Qô¡ƒúŒj$Pzè?ùµ.^²ArvŠ_S–R±,ä:ùžœ©Ýqve]›qê˜üJ»²±¬Ë¯ó[öâ?e¼î)D#Vðub™Úü¤ÒA,;©iÆ÷ç2gÂÔ„œÉêè¬=Â&p}OýQÏ ¦á½ZÂDÏ®—7ƒ_»?cð5³P¦ún’ÛmàÜ9 LÉêpÖÜ©ƒU¿µ|9Õ¸ß ~†í8 A4ÝI1 * ÖU#Ö'¬ПÓàxiJMŒÝŸ#. -ôìmc$P¸.wsÍ:}ºØZhP­?´ûƒÐÓõÇ®5ŽµŸ}P‚µñ¢è\P·FÓú*»Ä:»_h:ÎTþõjwD J®ËÝ\Ñô|’•ªÇÝ”Ð)šÉœº  -…àô±‰'cÔ¹¿[UÃÖO­ R"N-Ç’Š™cãM{§A²çÀšîWÕ9p^ìM›8ÐC6/ Ô]FP…;9}{±Ž8Ðrʬ9º¯%1 gÍ!ž–šà;ì‹ä}‘¹:M]K`Ó,‹¤2™£móH (šö¥Â ´´$WU[o@»4=È~ŠÎT>tkG«. -4c½–WŠÏÕ­1ÌÑŠ8Ð â8U-j¾Co-mŽx¢D¯ç@Ué8`‹žx—Úµ@ÝõâºEMõ×iÞL¿¢h±—r‰Ugg•Î³ÖÔÜ,XÐ’ù´’]1  =Z÷ÏÎ,P²¨¶`ë¦3ëEh} H-÷³ù¸Ð ä–¡ãŸkQs­/ÆS¯(ÐVÛKmf™ Ðlmˆ¨Ј©õÝþ‰‰mGÆfI @3Æ.m‰¹öè Ò0‰-W¿dÐ, -tp±×X `]ø`·U‹¾#4kÇ 8ÐJÔtêÅÎ 1 `]R¿6·Ä\½Y¤]F‹Бú’á3Mätm÷œ¨åŽi*š€éûº ¡¼–?×ó§–ºö™y@]K=Z¢wÜ6fù@í§ó"¯@m *E;Ò׸Ólô|·«ö÷> -hĘ² -ЋÄÒtpñçù‚°i dCyÔiL( -›˜ÍSÔÿ é«èi1Ñ@ý5;¦Ùf\§’@‰H³Xdªt`®šÞÙ5îU!Xô^èûôêÎ¥–@ñ;é|ŠwM‹ŽŠ¿{ Ýf±Ÿ'wäû÷×Ds}ËEâ­!ŒÎUØ[°i+¢‹k“𭘄ɎwnOZ‹Á÷wd£Î.îÁMH¼Ý<•AÖ%ö®~örñbá/ø¯sz$Zi§jo/B.¯9‹¿- ƒ¢ÅâºRyï–£á«Aâma^õ{Z6Ñ·Þòf2FzøÖ*‚±"ªeÖRHóà­[ßõRa‰·Ac+lGÅÞBŒãæ¶ö´ŠKü:k&ܾøÛR,ý2&ñ·åÏåïy˜²PyßùÝg.ñv{ÜÛÖ3¯øÛî zÓé·|Œ Ì=’¾Å=<¶nòPäí¨ƒ‡ÔVOZ -c³N9}QWfâ¿ž£ƒ¥á7§}«kצ-#RŽˆ½=BíÆì÷ïñx®R‹oá[Ç=Ç·gd`H²oÃSðÀ±À ˜ û²Ú_Ú~¡,´„Íü ¤RÑ#ezÓƵ¹Àkò³ ´êˆu8m Æžé -?U¡… lÍÂÐűÞ¡ýšœK=JBda;JÞ˜‚+”èF çA¨Æ± -M@GS§ÎÞªƒ/ùNjܪÚ(ÕÚ9<},¬! ¤ñIn#ÐÒY³— ÔiêKU§¿mb@i+‰´t8Rž ¨¶ÀÒJí~ËÍ .%sçJZ: P‚Ô›…Úÿ4³á£wÀê¬kI *àZô“3ש^¯a’Ú¿P×jÿq În—Êèc7°7/PI ¤ö/Ô­ÚÿX”ô*P`Gbs½!õK%u -I P£h²ú˜ÁV éœ^@J˜h $xò½ åëônõÅ[V43%=ª+!D²,.rkyº×:Ž¼€³fýBÆ¿¶9nð)5¸‰–fi~Wé¾Lå`¹d¥ÿDÐk®Ó~6§õ“ËMU=p†^‚Ãè3†é߇ÆiC(˜ø¸JçXÎ’ä À,æÈ£é%1sü7 ›<ßzápJÇùä"«1×T7¯Û¼ª?ÞÑf‡Œæ]:ùÏTàûúÀ ’–ð˜ÈÒž«;ÌgšUðUW³`P"C:ËɱÒø­*ê -£”ÏEà¤^¼J"A9ùç“kUßæw“Éä #X¡È!Ñù‘F¤üú‘V£Ä®kññWÐZ¢)†²iDç0+]¿›‡Dz3õÝsÈé -@¡;kI“ûSÄŽÎ ÇŽï´æiÊÚc#­!ûˆsnx‡Pd0ïøÎ!½£ãóËȈž®u'=©~⃠YÌüŸ\ï–œ3L„ª -3=­”‰à.Õ¯\dGCîVø§Çu›Špe -ZÁ1Á-Å•&É©Ú@¡ÈNMŠ+L­¯yŒh=ÅCÔ^)6t66Îʤ'g%Nì]ëÝ&(Œ WKÙ„’v3lÈ£sX­IiŒ«­W8ËÎôO!F-s¿ñæé½GL¥Æ »K[d:KØ{’]QÚ…\g¾ã{!ßÔÅsV)ä»Qši"Êw@f¥¬Ôz­¨# -Š,ø”<&ÔJþ¡wÒ -B#u c»â­ |ïXî-¡û‘ùâ;ÆxüË—Ÿ¤5n$Õ/•Ž¯…É-ÉÚ{, ømó$+i)ÑC­¾¨ðašg bÒ -Ác‘=Mͧ¾\½ß˜äÖ—Ûxí½ -¶%FãéO -´'0ø1",8?j䜋‰ ʧ–Ü+ÙÑ(¹úKÔ ¢,Ï*Y?)…ŽÔù¡˜^ ò+È®Ÿ@¥S°~Œä¿[Á³Y½M '¸.†Qêo:“´;˜}ÿ™Îž¦xŒ=ÒëžÂ_Ö¾Õ_¢=1Ú¯Eïtm|Ã5 Y%%i•¨tʵãKX(9¤Z)9¶È*W°Å5…¬Ðƒ+Y|pž0”{)»Dt/b‡ +#nì ØÉT·JMɹ„Ï„‚’´+éñP$òH -Ü"­[fïtË—BcL©mõ(“è®ï ò¤¢º³ ©cI^˜Ñúýä1÷'×±mL^ТŠ €ïÖ`°“ƒnæ‘Sƒ#<¨€ÉèrP)é=^Ô–Ò½àÛûŠÀoî) Ò‰Í™ŸþoæùÅ_+½ƒt–$5•Nœj%ty|p^bÏÏ>G¾[ÁL÷ðŒ?CÊ&ÿÍ¡sLÝå[¯#K~_W=…,׋Ä@Éd>‹‡.w,Žå¯ -Œ4IïÇC’²øó¾ 'kÅFµ‹g -Bë·ë;8^Fò”G”•òB þ¥©YÞäàÚ‚òwÛ²„{C¥“splóèì¼n¿9¡ü`LÖK§ÀïCh}G§<ª"fxzÆó(ô×°’`GÆc#& -xž¾* #±QV•¦¼Ö¡2ý€„* Ä»æ¿<Æ]AòLJ~ó( -üP‚"xš°ÔÔþ€_ -ÂPŠÎU:J÷×þö÷ -Gš:èéUèá”Y+Á–'åë“õp -ä~÷Ž ´ ä‘»P™. ±ãQDÉÊtY“ÑÂß³êÔ%¹Ž±ø”š°@?/ùø±ppV³ÑÐ&OJw;Ø•C¿<ö·ÂÎÐ÷erà3z}ÇO® ¹nŠ6=9Š'{áŸrNEŸìçŠõÂP½õóöIÙ wßãÙ• -w>^güóA‰®8ž+9·x¦¾ê›ð™ÒVZJù½`gïn77»’-<öyæŒO• *¥×…{Ì-'ÑÌ"­)hüø±ç$Zk¯T¢Që"ºËAµÒñ7 Ìt†)Ù0•H´ó_SJ¡®~Ÿ÷›"Ñš‰&McûQ.Ñ8–¸H?ïK´&)ÑøQ¼£tvi:h*×ø @%-h¨)qŽŵšè€6 ‚ºÈÀɉ?sÕi½hFóÏ^Á‚¾s+슲²çûµzØ™ úA¬+ÕeFê<003´^ûIËÛýÀ^¤Õ8•î™~‡@záøaÈ~a…£rÎÝ ¯¬J.èL±×ï?&·ZEvÃöSV5¹WJî†ýãÛž haa,>Åú=èŒPFc -vCÐÙ ìÃËK"Wu¤žiß•÷mÁ^øê.Ö–ÔïŸÛÅÚ/ê÷÷½ôJbá÷3” $¡öB•Nñn8R—pI6”ß U:±Ý…[»á]ìËA€BM©#·rã°Ø0 ÉÙƒq}_ù'‰Ü‘ñ –!%<ÐTÕ(¹6²rîö1¤oß{@g.) €±NcO—:¯êáù)`9×µ¢È<ÖÓKJZeU j -¶%;»-q tÿÈÝ MJÁ¶Ä×ún±k2‘kÜ%é²±ôò¨äF©IK¼³–·”GÛÂÎŽ -¶é€z^WÝyHºŠüÉ`%Ù}_* -¬¥¢à[š,DU 0—yÂîàGK‰F3²ñs†$âf)ù1{Ñ V£¤‚ÂEàq³åŒŸZJ/›©Ãܸ"bóÚ†/æÐÉgБ™ÂCGÓȠ£1öv|y§ÊäЉe2ènß»9tòt·;UÞÍ¡ÊdÐÝì—wsèä3ènÙ‚ïæÐÉgÐIf >™C'ßN¥û›:ù :‘L®—rèäã¡™óÊ7sèÉ‚ýš¿#Wõf/W¯“Ίù»Øƒâéô(í-46r¢Ô¤3¦þ&~J˪^IL¨’\s¬*KÎ9åQˆ'Ã83OÜûaÄð$Üè…¡EpW–„gœñ½CO«üüT¢3ŸHæœÒùq}JpPöç‘.>$ÞQŸü*Ò¥ÈùEYÒœ¼Ú, W©hÛ®õô®×/ÅŠVv¯T r¿ß)gs*enã®MQ*‘ÔÔ(ÞO) ‘Ov“ áGB>Jv{pð¯ÄÓ›ú WÌO“Óù•#FæÀA ‘¦äƒ‚ -i›†‚ô±‘:cá+éG6¹Bñ0Rwd|JJÌ^Χ˜ª&™ŽÒrgÙgBOoZ60@‰ãŒï6´Ð†ç¿Ÿfþ.ˆ“ØÏ¿wôÙ<0@c½‹¼&øLßÝr¿#=­Ü<¾‡ºWiÏ:­d†t‰äCâØûJ’ 9C’Žg–ŽY¿y|ÚG{îy|;ÉÃä§ø3#™ÃÕ-ŸèìÁ-®˜›ZE;{p ‚âq‘g¯¢êŸ™¤xÆÌ‹“> -yc®BÇñKÊdÏé.Ôé~x¿ˆ]v‘%}¾²C ³Kvñ(m‘î@ò\l‘}(põçt¾D´*%)n -Œ=kW°ˆÌi­&ˆªbx¼«Ö+4õ%|°0K±Õ"“G‰r*%‹,<‘¶x$Üñþ#|v†ÒGŒwv¥$:žÚÞÄÎ$( “UÀçJõH|pÛùZdŽºqZ:/öN”ÎôÙI§À )Y6ýèQz_êpHÁÙëoîÒ“Át2úØs?¸•°«êa~1exO‚øäßÜ“îg3ãøÙOE§³=å‘CRÝßtOŠxOô„wª¼Ž§IqBÏoP|LËŸBë;ȇ­ iL*=+¼å¶ › Æ^JϹ_ƒm^Ò#Ã÷](HÏÁ -†ç§&´+óï{d`šÀ#óÊ}J0 íA8‡`B¢©ù¿ðÈÀü³›GFÊ § 1J“snqJ’é9;î7BJn«cûèõ.Õ_CEÊ)Q–…¿ÈIŒ41ùÈ- çÖ&y«¥ðνa‚ùPP;ûpj!“`j¢B -=ž¿7ìþNH¸æ2¡ Êóêœíâż:å±ë’VÌ«SB"•:ÊÇ ´,$ “ëz²Æ 8GÏŒÛ1ŠÊÎÊæÃ)º¯ïí|8^|2“÷×ùp¯ÒØsùpÒª™÷~„ª’|8©Çf ¾— ÎÒÛ[TZJtöz>“•ö\ªÆ“ùpr÷ü]>µ.ÂŒ¸¿Î‡£ 3â^<ÖžQIô|¾XZ~΢^FQÝ2qwÉðë1‘d”Äû¼ßT ¿«1ôö5¤¤öóîµd/ãY"O\A?/åØ 2¹`?ÊŽòK´&Ë„¢·i=ñl°!ÂvcBé(ElBIF”êq.Ó{s<Š°³òGl˜êw…!ÓÏkãßO›Ñ"7´ƒ]ün&{¹1áëÖ+Ù>qwÕÏ›W]½ÀXë?Qí©!ñ/˜¹¿{ð‰+fàü,|ö0'Q™I sþ"#µü³ŒTÐÕße¤ö’‘Š©•$Ý<ÌH©KÖ·û½HËÍ'2RA?¯f’ò2RA?.Q8á}\‹OA.·€A$/MIdsÙÐo´Þ±¡ßø`SmûW©pô.Æ&ýÑߤÐwúò]ÐO¥Â©&ºþE*‹±ÝSµ žK…“±+%×+©pÒ^…¿L…£t~N2åa*œRÅ0a—Ë­~òFx˜WÇ œŒ<ŸW÷ì‰ôºtÿ¬ðDÞo©ä"C%:ÌøÌ¿ˆ\ò,I$NØ’Aµ’×ße£ÃÈéMæÉÍfÕAŠàDݼƒJ{€jTÍ8Qrf#îÈ"—žyoîI~¥[õ¨ã/¦Nß¡a¨‘\c‰¸#ß¾UI¯7Bû‹|ÊTA;C"Ý駧¸!¬NR›éîåø“Ÿ/Ù­áfc ’Ý4­n•ë¾â%€…ý‰^W,ë fØ9Mɼ³ÓõÇIEÓ¨¹$Ô­Ñz>MÉ »®l†ÝšÑ|5Å€Òv†ÜؾÊÆ2É$»U]8(?ìlðèOMI˜ì‹\n$òÎL2vêôÈ.”©ÇW²«z—ìæ,'¤’݆råâ´nž^a—©i¾$€z³ºÊª4’ú)[¯\hI"M¥šiþªj©ë -nŸèL¼«9äkiLÐ’H  -zDÌþ˜‚vÿþ’âÞÓ fÝu -UQæGd;MÈÅÜsCn%îRãk°©.ÿŒ(ùTx“|«‚«šý"‡DA‘»L\qjOB:žT,æê½JrbÚïÝí oW’ã,³×KUÊSŒ'þ¥gc®dꢡR÷ˆ‹ÆõÉÖ}ûƒ"r·®î‚§…Ú¸R:Ø?,6Ây•ä ÔP<$uF!ý6$™PÊçøeÿè¾|±`W Lñ´¾?ɦ“:MøÛl:1m[¥ûël:1‡—ˆ§÷Íl:±\:©›'_Ϧ Q|'›Ž»V·cìwݼM÷´×ú¥l:iJþËl:±\ºû(èw³éÄV€–0˜M'f7‹ep¿—M'£Òg¯¯fÓ‰åÒÉ猼’M'Pnœ -¹˜M'¶ºB{ÿýl:Y,¯IÕKz=›Ž¡N.gGþ£l:±õcbHþ,›N,—îNSz;›N¬+:æê³é¤Oxÿ2›N,ŸæŒ=Ò ŸÂØ“Ùtòû«l:±\:8—¿Í¦ã+n]ž¿É¦“Œ†úÓlºG9#“M'–ûug½¾M'–K'r–ôf6Ø - b­ÿ ›Nï¿M'† þÉû_dÓ‰åÒ)¸ƒHêøI¡È?$ï“'aáÝÁyñ@ÅK£‰N7¦gŽtâ+-iOÕ«SxhOÖ« ŸàÔã{P¯N)žÄ*Û -â`âé¡b! ‰{H`)7ÉJ´Ï F=O—¢C’Ý}TÏ ê‘ 9$ž„!KÞI‡R<‡§ÙE±„ù”²ˆDNž·yþ– v^©È öj™;>Æ$ -Ý=¯’ ÊÜ)«3òn™;ÙjY·Bwï$=’,üv|²¢2wã“a"ÝÛ)e*‚BwÊ#“Ü ZiB*Láå2w·½2!Wèî–Tõ²Wˆ«õ‘¦Eó&1 -–gñ×%¿2*7yá¸Ò ¦æ7¾=5r딊UPžH§¤Ú΃XëÂS×ðKNFÛ*‹þ•a\˜_(Ö£<+ "æäWn$dAaŒÂ|¢ê–5”Ù:VÕ­äV÷ÌFÓÕì•|!:½þ—ÑPõ¿‹†ª+Œ†z^ÝJB=—ùhzê(DÐËÍÞ‡ý¼SKõ"²åñ¥¥Â~d9PqDÓßš¤º‚ºêci©0±Vä‚bð,tú£[ag ùäJqÆ è WTcˆã.Tá"ówfV”£Ì1$å"¨¶f‚'‰üjðôA‘&…‰ MVu'3¥µÿà -†­ýV0líß¾ b[´ÐÐó™óóêî}¡»{Š_J½pŽˆ_Î྿ X¦h¿ÈôÃO¬P^ˆçβ Di*ƒ¢DÃÑ,`BJ{° -ÙPºÂÝSù•/W¸Ï}û£ºÕL…»÷´q¥îd>þA…;ªRÞÛ1*Ü=W)ïOò’DjÜ=ŸÂt… $Ìs½PáN$êFiþ¦VŒ@99&°ñ”šCæ¾ WU”X;REÏÕzn¿x?Õ]æã_$ÖÂ^xÞ¬×b®`?ϘÖRwt“ý¼ŸX {‘»î¹üö¶ìAtJË'óÛm"lØ‘÷k©tÊÙÐoT˜²r—Ä$¶‹ O2ÖÖ“ILÒlç­ËËÏÎdÍvæVsE†{çÅ$&qŒÉ[ïÊ“˜üF;Í/O¥1 ÀgKZ0³¡R<(…!ª2•¾YÕ0a·Ýå¸&ìk~Ë)†üJyWî1ÞY"Ò'#Ïæ¸&ìÒõWÙ:îQŽk®(Y\*fƒ:{Ë=ÉÅ/zãÍJyÊ.©ÒЧÕÛ,’÷f¹GÖ² õ9®,÷¢ŽôÐ&CrK4›%N§¦£’ôO7ù•î6’_©S4–u7ò‰¸}’HÄÆY?Ü6݆?8Ú»3§H~¹Õak6=ñâoA¤'Sæ®æ¯r©’—g L*%~¤=¿›.ˆì¥*ÎIgþÕé©C”¼ŸŸÉýkÄk@Ý^–˜è\™;›ç¹Öaó[Î Pajš³³,$2ÿÔFAjuë,“刉¦áQ¶Òçdjë9»=•N.÷o+pˆ¦÷†$P}q¶œ²@Á\x`g2YŽåZGhªÜËH¢W¥ã/εv·ª€5iðä'šÎýòí £[õè앵3U©v·Ü¼èQ;o¬›¾n„['ã'Gb»°¢_[µÜß/WÕ¯bö(Fè!‘Îþ9²·Ï½Ë †ô8S¥{|Ô•TZ¥ 2K/ùvhÕ OašL$¤<žÄB«^ÌJ{*´J6+íQŒ¦rzÚK’æs±=ÉgÊp†$bYÀA)~4¤¡à,éu¤+ˆÒRÈ/¼8-™MæÞÎÞbß߉«®õð>æï”°fÊ >X¥·Æ)©ý”zûÜš•0ß©·OyÀÔúïûǾS/úµøþ1°æoY‹y–拉²,À'/¡Û+aà]Ù»JØ{’~Å%¹oJõß sfGêâñÑiµ" 3Ưe#¿í æøùÓ²QsÏ9à%d¸ÀÏÿìÍC|Ÿ -u3/€ sïç#»MFoSrG§ùÚ{y;‘Œ>G¾»ì«{å_¿Rà•În›IÞs HçJ ï¥R¬ŒåÊû7R9}Ò…·˜;!§¶lσD•ÐÙà -ZÊÇŹ‰âýΤÏ_À˜h}ŸW1ö01Hù¸ˆ¿Ä˜Scl?tgúá;õ8ù//d*Í„畯g*ÍTéÞÉ|ÅŸü| ¤rE+°+Δ´¤¢¡^ÊTšÈDª¼”¨Ÿ·½òµ,@çHR›„¬0 Pi ˆ,ŸHænVí‰_”¢±ÜS·V=_”O”’e³¶^)Ê'fYü}Q>/œâÄáÇEùH?¿<½U”Õúþoå{à…û£¢|29#X”ïþVóÿEùDï—ÃSÑÙ—Ò›Êî†z£®Ÿ¼•Ke ¼_×ï©ë÷ìÝP¯ÕõNíë'ïדŸ¯ë'¾Vq7·®Ÿ¼»L>¿Ry]¿G‘ÃS×ïƤâUýdni~¡{(üA}1uýä}¼L®¿JDº«ê÷RýJ‘º~Ïû-_©ë'šuÇxœd«3,=í[®Ã‹ÌLA˜$Àf -½\w7ß…aˆ±gº"6‡¡d'Š>í­Iñ|:áçb^œj›Î¯'Ú%WÌ嶜—9Çþ:2dg^ŸJgŽô´_j$w1!±ô§CÝývûµõ¶&©[ïêEÃly°¹ëÅãгžÑõOyY˜Õ}¾r?{lÕ±Ca^_ÖV›fÆQº¶†“q8LXL¿]×oe[µæËWô¢Òtu£át"´ˆz?Û;t¨v0}'-‹ÏR2†ÚmêvÉÓ)â¯"æA¦„àñÊƘ8£h„Ñt£F3š}ÍTÊËÓi±®Ë°ál°–Çpâ]ÏS–·ÜƒK‚iohªåžÎ‹¼uTf¢²^2»4|¾$¿Ò±b: MØdª¦Jg2ÄŸâÈÚ`Îú²©=ž¢;wi— é™^ìZ³^שj½M\W­gò†Ÿz.äôéKn6#Õµ ÕOÙíç41Èk²äLñx×’¢µ>ª^8Ó6£%iÕ]ÓÆl.‡¥¾ýÁÄjäÀàâìR“õч::k>ÌN­¨ct´Á=^ #"lð·`à í×D¤©¶“‡5ì­³i ¡—ÓD~‹îÁW¿…ü -Øùó¾FmÔ×Áyf%?Ú`ð'=4õ -èü;ºˆŠÈ ŒºÀ¦Ýý¨tÌ+3÷UB7f^X¹/šØ”yaç¾X„æÌ ”ó¦Í-Y(e9W,ST˜gNóÌ·}¼°q_ü(|æ ·W… K[,ë.âð+ÔÇȾÇß:¦ïš…j4>`𞎚8Z@*FX¦f§šLÜ ØO %/Ç&Ù -ù§:|õ0ú”utÓG©¾&Àû†•|›Ü~1 ;5i½(¾©ëRVŸé;@[Z.A‘I TÒ³^iÉzt¼Ý#¿?ô Iöˆ94ç ¥8¹ÃMg9æL$?᦯:BÓo·‡Ç¶ûâ9Vh·XòÂM×éú6ñ6‡Tðd65Á¶^<ù•Ã(ÂON*.úÓ¦‰ÓŸ®½o’Ùñ”i4¤?á ìÂEu0üŠÂ¿ìdŽ ->ÜÓüíðú‰Q^k-þcê,oãùÂ9ãù L™NKªÕɹŒ9sùi# (WðªâÏøƾ0Ǫ“y1YÈ!unÖz»Ò1Áxéô×ßMÇ Ý57»8(>×ãM'9VBè¹èOÉÑŠiGÐ#ô­mL8žJ¢1H'7êIì³Ñ7¤Æ¶h›Õ¨œ¯~ƒqWÌÞëçÇ)‰ì¾æAúŠX—¿ÄÚúN!ÖR»ƒ˜Ê_F¸#çËìg@ËÍ"VS¤˜V›0bÛÕúˆeb÷ñök Ð¤µåuä\‹‘"Ó|ãäún$#øÚÖMÕiD#\îá%ÂK^ð)k€¡Gx©$t>gM$ãBg¡…\—,xÚÝÛiÉE´LØ­d - >¸sŽUçb§leõ[HM‰ÐRy1 hºåÉö7Þ§üÆi“Ž?{L [ À–àÂ:²pžÔ¹x– E´F£®ãõ.Y¿=3ŽÈ {ZÙÄÏ:6UéØCœÞA2~äîYЗâ!,Ó4zÁª-*PöYi©ºpBŒ•© Ëj£Žd>¸GA/‚7™.bdÏPŽeš8EÊh'(­·Á(tÞ2§À/šÏX\tì(ÀI?FnþЩq­Òq8<épãâÓLÄR¶ˆ¸ºKj£w®2,ñÈ¿”ÜèCŽ_r.dÅlt¦v9XÕˆ| ×h-t²puY²ƒ`¤Îé ×·Ú¹ÞQR‘ 7‡f<þyši“w#¥­jÀ3ï•â+ýžçh.ÔÝÁ -Ûu™Ë•dW^Y}–ÕÕ!N¨«È¥Z}Ì5{‰ -TÕ7ŒpWŸ.Qq?n(½°ø@b!È`;‘ e€«¯`!àä­‹>·‹Àö“é #Ùéëë˜.R]ÈŽ¡”[M^²‹áéiX¨jŒ’ÈT6¥Äjp¯y!1Víä ñÆ%C ‚åõÚÍηvÝ/®]ɯó[îÉ•1îIÍ€ÚryÍ–ºnËnŸ¡¬.gIÐô +¼¿^FÃû:»ðï ÊlÞxZ¼æÕîž÷u|â}]^x_×Wþºt‡Þ ÆGÞׯ³îòÌûºæõÝÝ]y_O_Ât¯jîû/†ûu<æ d<ã d¼ä d¼æ d¼`l|¼Þöý¬f‰YàFïâø”xûÙ±âébnÄüˆétŒ"ÌE´I¯¾(#¶¼oŠ¨15ä—ÎÚÃ(üθú&WgÌ$¬”ÆvµŽ¬fBúIéåj,SaŠß-gÈÎä -ÄBöÈ·’¤Ú ›Š|AĽ„×Ý ù±¦>°»Wõ d¨¸6ã©>ù•þ2òL.ê®›Ée­¸JK·ƒQÊ+×AÐË÷ÝEw@xGJ1;»U°7úr0.43οØšé`ʹ§tᩇê|êÎþ¢§u=R)^-|£ ¤ªaÍæd¶"¿œ7‹zK8öRwA}SõœÁÐêݦ¼·æófÒ±Z¢GZ@WeO§phœŒXêd"Û°¸aÂY·zâð(Á­÷ÌßPñÿbõHÖk/8tg¾320$iwÊèè¥Ù#}¥2¸3.ÆpÅIë€ã âÄy¼N†¤Wá!¾M†‚ªIÿ™Àgøˆ òd¨ÒÉ"”R—åªñ·»¯H ˱ÊôHŸ*fU“n •ŽvLŒ;(:;Ý -xìÙ©õÏð–³}ÔŽ:\˜ñÒ§_øWµ=”ñÒXkÀÞÇ“Ÿ„›k|ŠÈ°« ”÷LMÏ·ÙþŠ+íô¶üvŸ3¬ÁÒŒZÚC¢ÁSD£tsOêyá?\ž-HsyÑÐMü»¸ÒÖ· -ÄÿØãv¿Zè £Ï1BÝ:×£VUwYþ¼™¿?_ÂnÜ -VßN†Ñë¹0nò’]BO 1–BIO¯ ÐKË åJ› ôgŸôÒ!uKÁ+s!ÃLøðë7†›´SxúŸV~unÅSæ`ŠIj%όշv£íSaÛ‘Ñ2 û›ä§¬®YxDîc5\ÒAC®/í»€¨¼›†ËF“. ES¶8Váb„¼®OÚQ`ïg=?fmöâ`Pç4åÈ3DÌ܉ºé£µ‹±ËE -8V®DNÒÌú}ˆbãÅ" -Í=TW©à„> -˜×À/œ »²f>büSÒ{–ær LGü úÒèÜ8-p½£´êC!•e<7± /Oh}7˜u3 ÄÐçÄÌI¤\–¤' PD<&䣣΅Î.£6±¸“hÁß , -VÈûÆÅ4 ¸m }NÜ°›ž5XI˘ˆ4‘ë )ß uQvE}¸éÓ3З`.˜eˆ`6]$ N×i°k—€ò~²öÀOGÀK%b - Ï3S{ÈPË®ÀãÄÑ“€×ÄuD,ىܤ|iÀ§c´ëž€Rù=éëã®*,“k¦–†4æÆlÚs›ô -E°$@•9-™÷ZüÅÀZº³`;jæ‰Xé{Hú#a¦ÞÍ_r!tÞ<ç %ãDÌl‹¨ÿòúŸŸ’cÕí¥aÖ³÷Ž~GC'+˜Xߺ#O¾ 3ÆAû:IqÅu(`¢$pCüYuI#=eäßÞðc2J6âÅ×?hbkBk æÓÔÝ’ÔÀD‰G°“2]_†Ø /×ù!ƒæ«E0«°ÓÈõA29¼ÜÓjæûâfÓä··!S_xàõ¡Ýï›çµ´c|µCæPà‡ä—R¨}šòKÛõ¬_šöZÃ… ?%î{´Øå1S‡v” Ø¢ÎæÉõNàkÂÎøÆ]iƒîá™Õ°2.b÷…ïÂœq¸çgÖ¢…9?+Pçg*ýŠëovpsH°'„÷Ì-~„ÄPæ fšFæh°Ì9？Y8™30èƒ*ôAS‡4Xð|ÑÎéÈ'üZãö=^X fk´;{¢õøiö°–öô /6±…0ØÈAÛErm5ºÛI­Iv /’ jH•ô1Sú»Éæ„{sƒs°·¥€àE¥ûˆ¨4:þžzšMå‘,Tn‚òkÅÓcÜu©jg™Á—w«_µ«Ô×´Šrm6@¿`ßÿŽ2~þî7q#¯†“{Dñ0ÄҶѧtµ$mÇì¡Ò9˜à'ìvbÓ&¥×~"ÈO¤Ö×vR]¤[7aÜ:ü›9û"¸/’k-©ìù¬]·¹|¹_9eÿOEv.¿zS¢uþtÛPn0æç`‘ЗNøÌ)2šZú§ÕM$-^S:*µXG@œÌM M‰›MKã$¿¥…Pˆ)Ωóäé¿åÖ¤u„”c‡Ó0’f -|ë`V¿OŸMqDž¿¸à=Ì¡O Õ©#H¨iCʵ‘—6Ãè¤/Àr­Óíäˤö®yÓßË&ƒ{åw´/D0|E˜CDzYD—’Y$ÛïvvNÛI ¸¨Á § u‚c 8‘7 !à ì@íYPG&jaÏÏèð‰Lš<Œ3Ñö~ì4®qre½EdÝE¶ï›íèäÃ*ω}xq—ëÃñyÝÌN•Ój±Ú}XU•#–ðænºOŸf³Æì¿—ä~rÝÎv—ÿ‡#VOär^Wr6ÙOgd…ׇٿ­ôI[n„@÷a^PB 9÷eÖYÍgh”œ£Ý°ð×DdCðÄì—ð¸6ˆèfXšßuø5Mù\™IÝûFHm߬IÎNñkÊR*¶Âëf¦ŽÀteÁÚd]~°z—½øO¯{ -ш|Øn'T¼cÆ›¥$å!$Ý=b -–p-8ê$˜‹6éu VS4JG×Ôexô\†/"ˆ-FLk©“EÌG͉ëÉJÊT[(Žt ÏWÓCf‡­îo^¨Ô\„)f£¶ýµÚNÖk}Û ©§Q,uúÓïÌL«5<˜¶PÇÒäW¿"#KQ8©_:é.c]n\˜CÙÃc s_|ô@'Íì ÇÍÚDèö"aë¼Âã_ÍÈíUÎÁ¾`…Á‹ -Ƽø¦ýJ™™}Æ…œIX9œùÍ…ÉÙ¡Œ2Ó¦d¶Áù¨­™OŒ:‰¦´Øj”í{H&k€giRQ2³Ê%/uº—R“ÕŠƒ´Š€£|m’Ýš©ÅqT{¡cá¨S½lÝ¢eáyt¾Æ’ŽQPÏx¯~¾¡ûSì;wá.Áö(Öå¹VÜã-¬çuŠfdnBîE œ»“á¦ÍPs ã9™©¸ä5®2ÑJë®ã¦ƒ&ûqÅÆÅœ |êaôÖ4þÆþÖj<"`Ž%õyê$» —výIöh#ãcÁ׎ƒþõº‡Þ>}³Ô6&b1Lf=%8/¾bæBÅ蔎7Ïßzëf=UÙ·ižXºÓ•øÆ«ñJº9„ž¶KÇÎá— M,—oË`Q2ÂnŸ¦l0Ô„ÞE.¿Î»Ñ¸.­´ÙxZ6u)ýSÒùø1ý\sI褢4?ÆY§<žÑå ‚OÁ¼Juœ2¬1yU+¢LÀä‹JyÊûH y[ !#o©!o+!ðžî‡jÈÛJ©ù=RCä•Ç”Cåò]‡Œè¹¹Ÿ[BõÔô3áÅwS11*ýƒlŒ'c§0&& K“”n]üè„]\ÇÕ£|L ‚„º[AP ?&ÆÙ­r»píÓÂ.ˆ\í¢ÎVà  f))—pÓ6îQPWÎ|/P¨–˜è§££™~¶V[ ÆÅP÷”‡y¨]P1!~ÌÂÆ„DÛæä ££m¤ŠA&’‘N–i rb -èp‘on¸È¦Y„‹0Ëi¼­‹[£õ|šÊ¤ÞOÖ{Y <åξDˆÇw€? r¡jóXEÆÝçÏjQƒã?‹j€ÕWªAÝé&2n(½˜\Á2ÐçP·FßX.øÃÄô߇þpº`B›^Y)3cy>üˆí‚»°€¹ÈwïtmïLƒLo¹aŒ×Å@@ý\¤Ë¡Q -³~Í$Ð’¿lp™‘JÁáÝ$©X%!ë²$‡f“õ1jÇoG%°u°˜vFÀ% â ý°ÐËé|ÞúQjûÐñÖ/Z?Jm•îëG©íÃByÅúQjû·/[?JmåuëG©ísWó)ëG©íCé0¯Z?Jmˆ±×­¥¶ãëÉúQjû¨tïX?Jm®•ô¼õC*Á‚0$±*ê/³,"9´]ù‡Yb9\?Ìßd ˆåPüò—Y¼óÿ†U0“† S»)×½©ÒéÀ“úìr=À®a|¶X튣f'öAý‡‚ÿ°üÃãû€¾Sðúá‚‹c•‘lúA˜>Š;•nèˆ.ÉÕä²ÚïF§>üàöáˆï÷›c,WO·?Rÿ=ìO—êg­Õy5ÞÌ>ûD½n‚®UÙöÜvŽN©ØÌ%?üÔ†` ø+ ‚Q€WT;0ñ¡ -ýˆÿwþæ;€Oj÷ºÝnñ±P¡ôAƒÀ—<øð ýçÃùQúè Ð)üí§Êë&ì®›Ûgw»=[•Ík÷„ÏË<*²p·áϨŸÝ=`4WãòÁRs±Ù,v[ ±ÅÀÿX \ÉbNwH`l臺ޡ ´$¿¶³Ün:û/õ½~ÙŸþ¹}Ç?ðw±Ýe5Ú¬FçÕnAºñ¯%ÙbªrMöó €BÌc¸—\‡»ÀþXLÉ -\áGš!>Vì> wzœ¨Ýãõ¸q05»óy øàó8¹ÒȉcÚuisÙ ŸÏùaN»× P¶Ïp»ÇG°p µãN/ùÀåÅy£0·›|‚z²*̇Û}(ðîôÙQu}`.¯÷|`ÂF {À |>öÉD˜Íçõì#€rÞqŸÝã"œÌËîÅ1üæöÄEؽÀî±»œ^ïõ€}€ÍÁsóx<`là $˜$ -&‹¹?ØŽ`àä/éï@@àîÄæ‡ w;?œ -îô}Øœn€7%ø)ýu¢òºìnÂIÜø|vîï ·Å!6P—,–ôˆü€qœ¡>;á&ò™Ëéƒ(&ìnü>³`‘v{0Qa8n„À6ÁÝ`¬7Õ‹Ûæ FO8 -v @.»Ëƒä€À/Èeòú79`Ÿ Üã#wÁŽoO,¯ôàö±ÏÀ\ìêÃH̸½>牠×é¢Öˆ~†àdq³{pH¨sá`Å}`A1'@Œ›ÂTüˆ¤lƒŒGvŸÓMÀò ðÝkÇœ×áµ;q’¤M§Lžxò€þ!õ’<8ÞÄoÀèÜ>Â˶´äs¹°èËÎ<ðÜzÝÌ# / -HõÖ ‡Q„Ü4QÅÇ@8›»˜ÓÅi4]ÁƒK5‘ìió¡<ÁÿÆ* -y…XäîÄ=p1ÁhÝ€än¯€p£Ä0OgKÿ‹`ó¢^ÌŽa¨Wæ§^ÜyÚåûˆOn@á0X8Iv¡Æ·Ì/)ª@ÝBæ‡6@Ò^¯ËÃþPñp)*$08Ú1Øgâqq9v¤@2)`?&ûíaÝM?ÎËÑaö±ÝOgi{bö„á,Ð@\`½Q‚\w¯Ðï–}äDG@ñ¨Ï‡º¡€tÙ=„ËK2)Ð|쓉 -·Ç Ñt{ä?wûp¦›Û÷¤‰êöÌ÷éߺðPg¡ÐßwÞFrkqê­‡»é$€>Cî%".À…`SH*ý0õ3½•’K wBRn@Šìœ™G^¸á@«âÕM€ÍŒÞC€ ‡Û -¶¦Û(î€þèö¹™Gp7t;¸õÂ<`çÌPµПA€!P/P; ¨H@þ9?>ŸÓhwžïO[ð3*\€/˜P¸ËúœÜ“fá E?°Õ»0ÏTV<ƒ†Žäè2‚BÐz"tkyuNL³ŸLË!ŒtS$§Û̯3Rõî¢þ³} Íý%vþÝÀ蘼»36¦«à©ä<âÆhÌ;>lt®‚®gI‡F»6²¸¿<æq:˜ò¯U:À·N8ð™mYb×ü5hûIïQ¼f\ÅE¢óŸÿO{W¢”H³¬Ÿ€wFZªªw¥›fÅFYEÁs"ÎÓßÌjº‘™Ƹqî‰ÿž‰l²º²²¶îür)òcÞìnËÝü w3,6ߟ®;Ö1…Á‹ýK<¤"‡NèãY_°Æ¤ó ÖééÒä–“¤Es·ÖØ´ÿºvܸšW”ô2|éY hT8)‘Êz(’1½Jqî‰ Ü¸~¯KÜÚ­,š…£Kfd—fÇ’Ò$Z)dëZ-{’ æà«´m¥žz#­ÇÓJ6qššDKäèê) -‚ WÉüPAéì>©Þûq´1(ckXÇjÇVýâ0|]°Ž†52êë…ðQQÉ&/‹÷ùTļ •¢ÂÈ aZ²»‹?cfw7œkœN*™q £XŸ ÎÏŽz¦±ôødž-ÑsùØ6ÐŽ.¼×xòÕkØÒ”xxÓLrÞ{_‰äÆÊR9)fx_ -¡A«Ÿ:©–*ÉÀKß²ÊÃGšïÇ›o>Á›_Þao~a®ïr“VÊ¿1-–ýÏîDȤr‘5i±±’í¯§¡—Sf OTѸÑsô¸VESk_ÀÇKÀ'JîæÖøz°Ì&Οž¹Ù×AÃ×M’NÆšÎÑ£—h[+ükzy_ïY±Xôms‹S -7Ï…Ü8sÎ.“­B¨T‰lŽÜ¢æÔ*·†‡Ö8ÚºE±NجöbhÇ‹9_Ý‘ôåqÞë8—†_D2æs¨s¡¾´îÞ`œš‹\H$ERê'rp¥±/AcQ8T -ÉáÓy'7‘º§X±mÂùïlÏ=W¸¯»Ì&Iù¯ŸPpYŒ5ûLj®ÒÛ}‰×¾ÃŒ ;^.LE2îúÍĹù~“oCÓd¹Vj—‹ivs΄wâ„{USÒÔ|©¥Ìµƒ>A†‡ÆU=߈ô0ò¯Ý>ái‡êÿž¯Þ:{’9 Ï]e\f08yñ¯T)Ÿ%ÛóÖ=ز>AIê‘Ì|;˜ëWbZ ¬˜ÙÖÁ3eÒÐïǹdϪUÐú[Jö;÷F®/¬òså€?æÔ“é<ŸÏŠSãL½°O­%òóè Ð:Ÿê#WžØ–<™þòÄ-XÁF˜Ìx¢€ ëå)n'?‚ÌzÉTX0sš h©ØxSpQŽÙW¥¾îVÑièv«È-Ðè1­Fö¨°¥ { 6kO+9µ–ì«3¸*%÷°¼x¾·ëýñ­dÉ•9²þ4KŽ:ÜsÁäi ²D»ú ¾ezVÅ?&<¢öpƒ¤OŠ­o:ŠÝÊË5ë(‹Uf 0å}¬Ô…ÄP4NH‘YeófIª„–bÁzletmOE3ÞnÓR6S%“H¼M˽îPt2:<éo¾çƒ‹’q}dFèqîf~¼è¿7Ôj›ÛfwíQð)¼¡ux¹Æ¨ªhÛJ„CÚÖ!ˆ°œ¢áÖti³ÏÜ>+áwP–}êß4)&JÜÀ‰êU©ðú€·»÷naaÛUݶzØÑt o‘š]4´‘Hœ ƒ<@˜ˆó=çs) Ù¡µv+mH[=x\ÿ¶+lnÓ#úÍòQ % -s›xñí6ZýÔhu«š'Ç.'gà(Z†dMÿ¦Ãˆ*LáHFEKˆø ‹ºŠÆ© AS¢ˆ6•Ðþ«*cÀ=TcïAóUd4-HÞhíJÛ+§[Í/‡/CD´Cí -ì X¸ñA•$0~.„ÑÐÇÔoQ5ƸìÅ£IÀŽ¡!ÕH›D”ϼl¾øX©š¬¸wHÔP©ÇÂ!¸í@%—FqíÈrÙ *L%Qñšr)PÏÇ»Ëí…ËéS¿~…Yÿ Âÿ1ˆùw˜(Çû -'E"ÛˆFqHŠ¦Ù”¿œIRÚ¯vL1 ¸ê•Ù° -ý.œÙ[›íƒ3ìÁ¯çX÷%£²pÐØÿvÈGQŸín¼ëwׯ¨i¿Z=²oï… eV—\¥ä¨^?3gêe7WF,z5c®6,ºjrXYWkìÒ¸ˆ)R¹jÙ D‘ký­}—NÔº‰IªYÌ&ëëïÆéÍÛ@YŸ>— õ~í÷ΈÜú}%çêñ²§¼_.ÎA”(‹:äGè‘Êåt¨&+—E£0F[})…^ ©fË[Ÿ¢q®<ø„|ÿ°‡@༜M¶;4º'ƒ~¸J/ÛÇO¥T'™¢ç‰¸·ºú|¤þd ­í%ôFbšÖGuµ•(²ßÌ6Ò°•áI³] ç14ì0ž@Õt1|~DÙÑ)G¬£ÃéVÁ8³ÑNÄZþXzüÔÏR‚Í:Æ}ª£aþ~xOACÍÙf:&ÁÒ=5Nø¹·{[Icxzd_;ÜŠ^A!OÇ¡ÜDýñ†o†%âeÔ¾zgõn†¿±÷4aÄæƨ²ÙÁ£K]ÊÒÑ-©ÞçýŠ–(¶Ô‹ÙzBªj¾¦ªÁœ@&á·>=fâ®Ás qþ8RôÀýP^‡‡O4VˆñÁõC½ô¿S®'¡%‹˜¯o>!½Jàáš²B~2IÃEùŒ=œ)/ÇkÚð d/ú·ë!zzÑ š(ï¨ì¡’)ò·¨¬Ùžä*7FË” W\R7œ¨_DôðH¢Aƒ»Üöã.° ¹²È4×+¢Éè¹Ab€7Tfè×@צ†p‡{ÀeT•M¼ j˜ “ª£—,ìeP_¯€G Eâ“1Å3àXú_ÅŸö‘᪰q8ŽV)9.ÅëˆGêõèzy0tºŠoã‘ â¨Ý‡þœLç«?“(“y²óÏ”õì‰"&¬Ð&¢_ÒVY¹%»XœªÈg•ÄûäSÛÞæõȽ+MÂ+ð ÂÉûü´÷B‚ŒzÂÓ–‚I`ì(–Œáü(àá"L§áþÝ •--Ý‚,ùxèSÁE*ËOØÙS„)lhGŸ 'ø3,ä3³DjA1›åÙv•È碂ñ³ ×fÐ-Xä{Íw£nÈ&<`oÊ¥Ô½xÓ2­ñ0üƒc*tµ> -¯VûqrÇw±V»”yù{=ä/Ë̺ -Vè°v½sò][UÞžýòrl(‹'•È~:i«ª;bV«}‡o‚;Z®Éwôx½gÒÒrêÏR?µR‡¸KW¢E±Ø.QA6kÒ?È×U­dtþ3 – -°AB_‡ƒ“^|"ú•(ý§@s h[°‹«Òpíà©Ùgf{!FÎb°¶ƒ–^|ãq¸. RÕMï6€KÅÀ!Mw1³=)„Z ,Ê.NÒЩ£Q®ä|4ǃWH£Q‰ä"2‚èèFÛ ¶]1·Õ3ècŽ ¢àI‡2gíJ4Ûeâ"*YDä³AG€¨…n‚Þë (fAÆ Âd ƒ º fàƒTI¦.îÁðN‰ˆ.0ú(]î“ü3Ÿ¬e{€R -Õ=„¶+ç^(Õp¯6É–P2E· J§ªˆëA.˜ ꑪ.‰ÂZg:¬½ªWsm«ê‘qÓ5è·Û°ïnÔ;÷òT3½‹óyf¿ñüe–ÝVU½7û¾|=á¢÷8ª¿õ¦³Ñ›ïqÕûÇè[ïõu¾î­G (Å5Z­ço#£ù?‘UœÛ!_+øþ¤) endstream endobj 29 0 obj [/ICCBased 31 0 R] endobj 11 0 obj <>stream -H‰ÜWK$žׯÈãì¡r2òÉq‡Åò€Ð´äùÐö²˜žEöÊZ~>ß—ê®òJXÀæ2Q‘ñú"#î¿|0÷μüôÁ,Îj.æ»åþ/OÎ|÷~qÆMÑfp}Jæ?ÿ\Þ,¯qò¾ËI—{y‚h¦àIþӛeuÖoNg3~|€*Ó5ÄøbNÏËÝéû§5Aé‚®Éð<Ì©•?ÿ±Üý0O õßÜ}ýBüÝ÷'óâÛÓçËý,>¿oú1ïÏï–»O>¡L7ìÎ4ùyÊfÍ7'ÿÚl¸{×Ï»@ Öþド6:Vü÷'yuÚÁ÷ ü{ñÎúœµêÅÛZª—¬T5Ql­¢ÆŒjCŽdD\'Áf×> Œ)Ð6)Hïh{oÅÇí8nõ¨:ê¢Að(„v¼&JïhH‡dSÚªðX"bYýp‘Þe[’Ÿ$Ä÷ È«âW™ ׂ« `ÙH"ÁeÈ—üG±Å{&OxMMˆr2¥÷ï”w¶h1šm¬òÑÖ˜M ¶8dÀ©Zµ±¥íÈq%Ç!]¨5ñŒ/ÉF%'ñ[²!Û\7†OQM=eбѨP¯Íÿçrådg“"Se)VãfÀ 6 Mó½-ÌØv%ÌÔnú\i"íT[ö$±Âeç麑¤–µ 3bI³ú&¹•ßd\– ûõ*0‘ •%s@öyù›yÀ£I¶>‡?Á©Õã\ôÅÇ,{âzFB±"NÓ/‹Ù!PççååksÿôÖ™÷oÍ«×æ«å«vûîìÁëh¼½õ²‡§Ùñž¾X’A·2hEFWZÜCÝá•ñÓó²úV¼Î¬Àq6<6µØŒ^ª$F -~ °Ð®"N)Ã~ÒWt -œ®.l$ŽC•ÈÀ<ÀZ—ÇQÒÀÒF¯¨×byeeaÏ]Ea+-RÊð¦ÿ¸-çf•à[¢z@%ò¬(•à OzËñÁº2Ä&/ª¹âGÆe…—àöL+$æVs‡r¾¢·îN±‚ $>›ƒ:Ê¡Ñ~Ê9t”ÉËHO±7Tß9™n ˆø¾Ù4Ïh…ÙC(¢«®ðÃ1"í®ÚlD7Q_»A•®eDÍånsAŸ\#rË•ÁìXºÛ8ájOj71ô¡tŸ:qN±ÙKOE‹hEøº_Ur“Àa± ŸýŠÈ;%ÅØë™Ê×|«¡ØpL†²è{x -X¯ã»ˆõ¨íÉ:S‚¾T[ø'Ùþ·v0€}Vúî:/o—§¥ƒùÛó1”T˜Û -‘.~âØ¿âLÞ+‡©†-Q3^ì gŽñqj÷¢E³‰0uãÿø·3/Òí;¼*xû¦ô ]Kuÿ½¶of -®ÍëUõ¸zrÜí®¿Û¾=UÌŸÆ©žÏ›VHf|þ˜7x~„wå€Ô4D·ÿ~’¸%QkÞ¾G¼Ïœ¬†ð ›3ã÷:¿ Éõ z½êîWO†ÛD¯)ú³ørE^D@µ¶q/• ó…ï‹âG_ãì#hbUj{7+À˧ ‡¼Ñxʜ˕ƒñ°(Ç‹MËàl· Ëq9ÙìÀi.9—f™‹µÉðõÞhXâŽá tà*îzëóÇ,û_ë§Ô ÖrŠ™1ÀT2$ 9R9{‘ö0¬æNŸ$Ç&¼7Ñ]åF–…Ë­ŽÁé:š7ۚ´jÆôàíí„…R¸P¢ãb)£0*â¡VƯKÊ‚?Îjã`gñù:Én*ú5 Z9."Z u%ªÿ'`Â0e˜¼L¾LUïÍ”<eÒÀø 0þúóÙ§›&à9h[f ˜„ÐKÉ|ø1qH45wë@Å(Š-¸†Õ=•ŠšE™ÅÌÒö+ŽD £YQ•ÐõQL‰M-·EŒINSÝ-Ma`$TnsÊ ¯¢b4.,B6( Âƒ×ËkmËåŽAy q±½¡(œRl°˜·8.sþosiÛLö :£ g¨ò¶éIä|+¦jDœÊ¨8"»ãS.`1±JógÏ¡ -Jm2™²\tÙIoBû‘A™Ë Ö˜‚2Á¾ÖŠÀbiðtáÆ“°Á*FUóÙT.˜È zgFëÝ í+´q&ÃÇߊ‚ü«Qwdÿ‘]º[1ÐCS/ÜçhLä·ÂkÀ É—x ¤`9å¿ ª=}Y¸ÍDƒŠ‰² ¸€ì†ç={ùŒ…‰~.!eë 0YaÌhçeOCJ(4;MÅfƒ1lv&ÇÍËo}KøÂÅ9€"~…˜6èáÕl ™OÔ|æ }1mðçŠgoØ%àc ^ÅëÆWr.G¶å̽ –©™0;c?@‹Ô„ðpf'1°Û H¨÷h -ñ­˜Óåsú`î?{væÓ¡æÕãƒÁ¿Ÿå‘gy endstream endobj 12 0 obj <> endobj 24 0 obj <>/ExtGState<>>>/Subtype/Form>>stream -/CS0 cs 1 1 1 scn -/GS0 gs -q 1 0 0 1 273.1465 197.5684 cm -0 0 m -0 -43.758 -64.479 -79.23 -144.02 -79.23 c --223.561 -79.23 -288.041 -43.758 -288.041 0 c --288.041 43.757 -223.561 79.23 -144.02 79.23 c --64.479 79.23 0 43.757 0 0 c -f -Q - endstream endobj 63 0 obj <> endobj 17 0 obj <> endobj 64 0 obj <> endobj 65 0 obj [0.0] endobj 66 0 obj <>/XObject<>>>/Subtype/Form>>stream -0 g -/GS0 gs --14.895 276.798 288.041 -158.46 re -f -q -5 w 4 M 0 j 0 J []0 d -0 Tc 0 Tw 0 Ts 100 Tz 0 Tr /Fm0 Do -Q - endstream endobj 67 0 obj <> endobj 68 0 obj <>/ExtGState<>/Shading<>>>/Subtype/Form>>stream -q -215.399 177.843 m -212.793 177.843 210.248 177.581 207.787 177.088 c -192.902 212 158.27 236.475 117.92 236.475 c -63.987 236.475 20.267 192.753 20.267 138.821 c -20.267 116.813 27.549 96.508 39.833 80.178 c -33.879 73.392 30.262 64.505 30.262 54.768 c -30.262 33.474 47.525 16.21 68.819 16.21 c -85.634 16.21 99.927 26.979 105.199 41.992 c -109.363 41.45 113.608 41.168 117.92 41.168 c -122.124 41.168 126.268 41.435 130.332 41.95 c -135.57 26.874 149.894 16.048 166.752 16.048 c -188.047 16.048 205.309 33.311 205.309 54.605 c -205.309 64.301 201.723 73.152 195.814 79.927 c -200.787 86.493 204.946 93.707 208.147 101.421 c -210.498 100.973 212.92 100.729 215.399 100.729 c -236.694 100.729 253.955 117.992 253.955 139.286 c -253.955 160.581 236.694 177.843 215.399 177.843 c -W n -q -0 g -/GS0 gs --0.0000153 220.4262695 220.4262695 0.0000153 137.1108398 16.0478516 cm -BX /Sh0 sh EX Q -Q -/CS1 CS 0 0 0 SCN -10 w 4 M 0 j 0 J []0 d -/GS0 gs -q 1 0 0 1 215.3994 177.8428 cm -0 0 m --2.606 0 -5.151 -0.262 -7.613 -0.755 c --22.498 34.158 -57.129 58.632 -97.479 58.632 c --151.412 58.632 -195.133 14.911 -195.133 -39.021 c --195.133 -61.03 -187.851 -81.335 -175.567 -97.665 c --181.52 -104.451 -185.137 -113.338 -185.137 -123.075 c --185.137 -144.369 -167.875 -161.633 -146.581 -161.633 c --129.765 -161.633 -115.473 -150.863 -110.201 -135.851 c --106.036 -136.393 -101.792 -136.675 -97.479 -136.675 c --93.275 -136.675 -89.132 -136.408 -85.067 -135.893 c --79.829 -150.969 -65.506 -161.795 -48.647 -161.795 c --27.353 -161.795 -10.09 -144.532 -10.09 -123.237 c --10.09 -113.542 -13.677 -104.69 -19.585 -97.916 c --14.612 -91.35 -10.453 -84.136 -7.252 -76.422 c --4.902 -76.87 -2.479 -77.113 0 -77.113 c -21.294 -77.113 38.556 -59.851 38.556 -38.557 c -38.556 -17.262 21.294 0 0 0 c -h -S -Q - endstream endobj 69 0 obj <> endobj 62 0 obj [/ICCBased 31 0 R] endobj 8 0 obj [7 0 R 6 0 R 5 0 R] endobj 70 0 obj <> endobj xref 0 71 0000000000 65535 f -0000000016 00000 n -0000000168 00000 n -0000038754 00000 n -0000000000 00000 f -0000046768 00000 n -0000046838 00000 n -0000046908 00000 n -0000124332 00000 n -0000038812 00000 n -0000039354 00000 n -0000119039 00000 n -0000121051 00000 n -0000054296 00000 n -0000042590 00000 n -0000042477 00000 n -0000050907 00000 n -0000121620 00000 n -0000047326 00000 n -0000047682 00000 n -0000045273 00000 n -0000045416 00000 n -0000045615 00000 n -0000045807 00000 n -0000121113 00000 n -0000039889 00000 n -0000041908 00000 n -0000051020 00000 n -0000041970 00000 n -0000119004 00000 n -0000042414 00000 n -0000042625 00000 n -0000046000 00000 n -0000046425 00000 n -0000046035 00000 n -0000046543 00000 n -0000046648 00000 n -0000047210 00000 n -0000047241 00000 n -0000047094 00000 n -0000047125 00000 n -0000046978 00000 n -0000047009 00000 n -0000048855 00000 n -0000047853 00000 n -0000048147 00000 n -0000049165 00000 n -0000051145 00000 n -0000051208 00000 n -0000051230 00000 n -0000051552 00000 n -0000051629 00000 n -0000053625 00000 n -0000053697 00000 n -0000053840 00000 n -0000053981 00000 n -0000054071 00000 n -0000054176 00000 n -0000054370 00000 n -0000054544 00000 n -0000055568 00000 n -0000066793 00000 n -0000124297 00000 n -0000121557 00000 n -0000121745 00000 n -0000121808 00000 n -0000121830 00000 n -0000122152 00000 n -0000122229 00000 n -0000124225 00000 n -0000124367 00000 n -trailer <<253D8FF030F94C288CF0E5758F8AED53>]>> startxref 124545 %%EOF \ No newline at end of file diff --git a/www/images/web_logo_manual.ai b/www/images/web_logo_manual.ai deleted file mode 100644 index 9452295..0000000 --- a/www/images/web_logo_manual.ai +++ /dev/null @@ -1,1109 +0,0 @@ -%PDF-1.5 %âãÏÓ -1 0 obj <>/OCGs[5 0 R 6 0 R 7 0 R 71 0 R 72 0 R 73 0 R 135 0 R 136 0 R 137 0 R]>>/Pages 3 0 R/Type/Catalog>> endobj 2 0 obj <>stream - - - - - application/pdf - - - Basic RGB - - - - - Adobe Illustrator CS5 - 2011-07-26T16:51:59+01:00 - 2011-07-26T16:56:15+01:00 - 2011-07-26T16:56:15+01:00 - - - - 256 - 84 - JPEG - /9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgAVAEAAwER AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE 1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp 0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo +DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8A9KXerzwXLxKikKdia16V 8cVUf07cf77T8f64q79O3H++0/H+uKu/Ttx/vtPx/rirv07cf77T8f64q79O3H++0/H+uKu/Ttx/ vtPx/rirv07cf77T8f64q79O3H++0/H+uKu/Ttx/vtPx/rirv07cf77T8f64q79O3H++0/H+uKu/ Ttx/vtPx/rirv07cf77T8f64q79O3H++0/H+uKu/Ttx/vtPx/rirv07cf77T8f64q79O3H++0/H+ uKu/Ttx/vtPx/rirv07cf77T8f64q79O3H++0/H+uKu/Ttx/vtPx/rirv07cf77T8f64q79O3H++ 0/H+uKu/Ttx/vtPx/rirv07cf77T8f64q79O3H++0/H+uKu/Ttx/vtPx/rirv07cf77T8f64q79O 3H++0/H+uKu/Ttx/vtPx/rirv07cf77T8f64qh9T/wB7pvmP1DFULiqnc3NvawSXFzKkFvEpeWaR giKo6szNQADFWFx/mPfa47R+RPL115kjViraq7LY6ZUGjcbqcVl4nr6aNiqPTSPzynAdpfLFhXf0 St/eMK9i4a1FR7DFVksX526d+8m0vQ9fiHWLT7qexnPuq3SyxfQZMVdon5kaLfaouialBc+X/MLC qaTqsfoSS0NCbeSrRTrXp6bk+2KssxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV 2KuxV2KuxV2KuxVFan/vdN8x+oYqlmpajY6ZYXGoX8y21laRtNcTuaKiIKsxxVgWi6Dd/mNPD5h8 2QyQeUwyy6D5Wk2WdBul3qKj7ZfZki+yo61qcVeqxTRQxJDCqxxRqEjjQBVVVFAABsABiq76574q 76574qlHmjy95e806W+ma7Zx3lq26cxR437SRSCjxuOzKQcVYNomra15Q8wWvlHzNePqOmagSnln zFP/AHkjqK/UbxgAPXC7o/8Auwf5W2Ks/wAVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsV dirsVdirsVdirsVdiqK1P/e6b5j9QxV5h58I8yectH8lN8WlW6DW/MKfsyxQycLS2bsVknBdlPZM VZ2LoAUGwGKofUtdsNMsZr/ULhLazt15zTyGiqP7TsB3xV5Fq/8AzlL5ct7potM0q6v4VJH1h3W3 VqHqikSNQ/5QB9sVZD5J/Pzyj5nvI9PcS6XqUtBFDdcfTkc/sRyqaFvAMFr2rir0T6374qknnXQb TzR5avNGuG9N5l5WtyuzwXEZ5wzIRuGRwDt8sVY3YeefzNstOtzrXkl7p4IkW+ubC/tpJZJFUCSS O2bhsx3CiSuKsu8qectA802Ul1pM5ZoH9K8tJkaK4t5R1jmhejI23yPauKp3irsVdirsVdirsVdi rsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVRWp/73TfMfqGKvJ/LE31jz3561Rq1+v2+mx1/Z SytIzQexedm+nFWW/Wj44q8J/wCci/MV5Pf6f5fjelnHF9cnUH7cjsyJy/1FUkf62KvGPRxVtY2V gymjKagjqCMVfT35d/mpouqeXLOPVdTgg1mCMRXaXEgjZ2TYSAvxDc1AY071xVCfmh+bcGi6OkPl 69t7nVrtiqyxOkwgjA3cgFhyPRQ23XwxV4zpv5p/mDp+oLejW7m4KtyeC5kaWFgTUqY2NAD/AJNC O1MVe0jW4F1zyf580tBA+vS2ula1bIfhmhvvhhLdOT285HFqV417Yq9nxV2KuxV2KuxV2KuxV2Ku xV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KorU/8Ae6b5j9QxV4lYStp3nrzrpxajfpCHUFPcpeWk VD225RMPoxVPk1Zx9qjfhirx38+YQLux14oxtjH9UndVBCOrM6Fj1+IOR9GKvJxq+lH/AHdT5q39 MVbXVNMZgqy8mY0ACOSSfoxV9GeRPKXl/RtBtfrtjBNq0i+pdTSRrI6s24QFwePAUU8e4riqX/mf 5Nh13SFl0K0t4dXtSWjHFYhMpFDGzLTfYcSxp8q1xV4jbflz+Y2rX/1KTTpbVQ1JJZ6RQKK7nl+2 B/k8jir3fStMW41ryf5G01/rH6CltdT1W4A2ig08Boy+54tPPx4r4V7b4q95xV2KuxV2KuxV2Kux V2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KorU/8Ae6b5j9QxV4x+bli2h+aNL84oKafeRjR9 af8AZjJcvZzN7c2aNmPSoxVB/XffFWNfmHfLL5XudNWMT3eqlbOygO/KWQ7Nv09MAvXtTFWEQ/kT pxgi9bVpBccf3/CNSnL/ACakGg98VWSflzbeT9T0zzFBcNf2VhOjajHKgDIhPH10ArtHXlTtSuKv Xlv1ZQysGVhVWBqCD3GKoLW/MdvpOl3F/PVlhX4Ix9qRzskajxdiAMVTjSvyp/MC/wBMtZdY82iw luIke8s7SwjEsTOoLRLcPK61WtOXp4q9B8neS/L/AJU057TSI2Zp39S8vZ3MtzcSjYyTSndm/Adg MVT7FXYqpy3NtEwWWVI2YgKGYAknYUriq/kvLjUcqVp3pireKuxVoMp3BB3pt4jY4q3irsVdirsV dirsVdirsVdirsVdirsVdiqn9Zt/rAtvVT6wVMgh5DnwBALcetKsN8PCavox4hdXuqYGSK1P/e6b 5j9QxV5T+fmrSR+U7by/BQS+ZbpbGWQgN6dsima4dQQRy4x8R869sVfO3nz8xNW0q+Gh6K/1VLNE WW4YCR2qgIUF+WwUip61xVKfJ3nnU7jzdYS61M17yVrS2Zgo9J52A5qFAFTTiT4HFXsn133wKlvm PXrbTtDvby5j9eCOIhoOz8/gCHrsxahwq8TsfzB84WNvDbW2oulvbqEhjKo4CjotXViQOgrir0bT vNtzrvl2DXo0Rda8u3KXyQneF5bakgqhrs6VA7g9MVfWmk6lBqmlWWp29fq99BFcw168JkDr+DYq kmu6LY2nl+dxErXS8C1xSjFmkXke9K16Yqq6Xodhc6PZSiNY7gcJPWC/ESrVIPjUbYqjNLYtqV8R qAu0YhlgXcRAk0Fdx7bYql9yILvzYrNxWHT4w80hoBz6rVj4FhiqZvp+najdC8kMd1CsfpxKCGQG pLGoJB7YqxyGws9X15ltYUj061pzKCgeh9v5j+GKp/dEDWrRUvxCqqVNivVjQncD28cVQuraLYwa ReztEsl03OVpyPi5M1dvClcVUNF0OwvfLsDNEq3D8j6/GrArIafgKYqyZ3VFLuQqKCWYmgAHUk4q gode0OfTG1WDUbWXS0DM9+k0bW6hNmJlB4Dj33xVE2t3a3ltHdWkyXFtMoeGeJg8bqejKykgg+2K vMfzf0Wt9Yajp0CJexxXF1dSooDutu0ADN/NwD9+2bzsnN6ZRkfTYA+NvP8AbOD1RlEeqiT8OH7m daN5nsb/AMsRa87iOAQmW6/yGjB9RfoINM1mbTShl8Pre36HbYdVGeIZOlb/AKXnXkm1OpfmbqU+ s2ySXH1c3iRSKGETu0LRih/ajR+ObfWS4NNEQO117+f3ul0MOPVyMxvV+7lXyeqS6rpkN0lpNeQR 3Um0du8iLIxPghPI5ohikRYBp6A5YA8JIvut1/qunaesbXtwkHrOscQc7u7EAKq9Tue2GGKU/pFr kyxh9Rq3W2q6XdTSQWt5BPPF/exRSI7r/rKpJGCWKURZBAWOWEjQIJ96muvaG/q8dRtW9AM09Joz wVCA5ff4QpIBr0yRwT29J38mI1GPf1DbzCtZ6hYXqGSyuYrlFNGeF1kAJFaEqT2yM8co/UCGcMkZ 7xIPuW22q6ZdTvb215BPPHvJFHIjuo/ylUkjGWKURZBARHLCRoEE+95/5Wiji/ODzAka8V+qu1B4 s8DH8Tm21JvRw9//ABTptIANbkr+b/xL0rNM71Fan/vdN8x+oYq8g/5yC065/QOka/CpeHQ771L4 AV4W1zG0Dy0G54M6k+1Tir5s8/8Ak3W59VbV7G3e9t7sIT6AMjKyoFHwrUlSFrUYqg/JnkXzBPrN vdXVpLZ21pIszNOhjZmQ8lVVYAmpG/tir1ny/oXnvzLBdX/l/Tbe60uC4a1juJrn6uZXjA9Ro6o4 ZFb4a164qlHmfQfMErap5R1qCOx1cQxXEIjkMsUsTEMkiOVUlRIpR9tjiryObyb5qhnaFtJumdTQ skTun0OoKn78VZ/ovl/UvL/laW1ePnrGruILa1Qgu0849KKIdmIJqcVfXvlrSRo3lzStIB5DTrO3 tOQ6H0Iljrv/AKuKqXmwgaBdVPX06f8AIxcVVvLpB0Szoa/ux+vFUm0CaK31TXJWIWOJ3c0/lV3O 2KpZbSSJwuLtEUatIxFzL8aRgGhb0zQV+LYk9MVR9/cWumaRHpmmOzz3przOzFWPHl2+1Si+2Kpz pVvY6PpYV5UBUepcSVG7U3+7oMVSq5mSbzXpc6qUE0CvxagYcg9K074qnPmIgaJeVNP3Z/Xiqj5T IOgWtD09Sv8AyMbFV/mn9F/4Y1f9Lcv0V9SuP0h6def1f0m9Xjx+KvCtKYq8c8tj8nx+QGum0/Sp 8oG4c6ks3D9IC45w8AnD9119Lj+z/N+1ir0n8pR5ZH5daKPLBuDofpObT65T6xUyuZPVp8PL1eX2 dvDbFVfU2t5/PenWctHV9OuxJExFCsjxilPcKczcdjBKQ/nR/S4GWjqIxP8AMl+hhflTSNXtfMuo eTH+LRYbhb2dmBq0KUaNe396fT5fI++bLVZYSxxzfx1Xx/Zu6vSYZxyywfwA8Xw/btaO0CeOP84t eqft2zqCu5qohY7f7E5Vnjejh7/1tunkBrp+79TE/MGp6Ve+WU/RiC3ii1QE3FzN6moSO0bMZnAA 4p07ncZn4Mc45fVv6Og9PPl73XajLCWL0bevmT6uXP3Mp/NL9H3et+U5YzFPHPcPHJIvF1eMSwji SK1Ucm/HMHszijDINxQ/QXYdq8MsmIijZ/SF0tpaWH50abFZRJbRS2zmWOIBFJMM3VVoP2RiJmWi kZG9/wBISYRhroiIoEfoK3Sr2w0/83tea/mjtYpbYqrTEIrFvQenxUG6qTjlhKekhwi9/wBaMU4w 1s+I0K6/5qTeSdQ0u2/LzXRfvKYvrCmSG1cJOysI1G56KWNGPhmTrMcpaiHDXLry6uLockI6afFf Ppz6IrSdSsn/ADD8v3qm1sLN9O2ihlDKqGOYJHM5CD1BtUEeGV5ccvy847yPF3e7l5NmHLE6nHL0 xjwdD5HY+abeW2X/AJXHr+43tSB772+Uaj/E4e//AIpydMf8Oyf1f+Jek5pneIrU/wDe6b5j9QxV A3Fvb3NvLbXEazW86NHNDIAyOjjiysp2IINCMVeTX/5Iapps7t5O1eKDTmJMejapG88MVf2YZ0ZZ lTwVuVMVU7X8lvMupyBPM2uQQad/u6w0eJ43mX+VrmZi6qe/FRXxxV6vpWladpOnW+m6bbpa2Nqg jt7eMUVVHYfxPfFUh88/l7onm+2g+tNJZ6nZEtp2q2xCzwM3UCtQ6NT4kbY/PfFWAt+VH5mQsYYd W0a7iGy3c9vcQykeLRRu6V+TDFWUeSvylsdD1Ndd1e9bW9fRWS3uHjWG3tlf7QtoAW4MRsXLFiPD fFWfYqoz2VncEG4gjmK7KZEViB7VBxV0NnZwKywwRxK/21RFUH50G+Kqa6Vpamq2cCmhFRGg2IoR 0xVUaztGjSNoI2jj/u0KqVWn8optiq2bTtPmcyTWsMkh6u8asdtupGKrP0PpP/LFb/8AIpP6Yq2+ l6Y7F3tIWc9WMaE/eRiqpcWdpccfrEEc3GvH1FVqV60qDirreys7csbeCOEt9oxoq1p40AxVVdFd SjgMjAhlIqCD1BGKoKHQdDg0xtKg061i0twyvYJDGtuwfdgYgOB5d9sVRNraWtnbR2tpClvbQqEh giUJGijoqqoAAHtiqEk8v6DJd/XJNNtXu+Qk+stBGZOY3DcyvKop1y0Z8gFcRr3tJ0+My4jGPF30 EYLa2E0kwiQTSqElk4jkyrXirHqQORoMr4jVXs2cIu63S+Lyt5YikSWLSLKOSMhkdbeIMrA1BBC7 EZcdTlIoyl8y0jSYgbEI/IKr6BoUnqc9NtX9ZucvKGM82/maq7n55EZ8g/iPzZHT4z/DHfyCyfy3 5duGVrjSrOZlUIrSW8TEKOgBK9BhjqMg5Sl8yiWmxS5xifgG28ueXmufrTaXaG65CT1zBGZOYNQ3 LjWvvj+YyVXFKveU/lsV3wxv3BXl0vTJrtLya0hku49o7h40aRQP5XI5DIDJICgTTI4oE8RAvvW2 +jaRbwtBBY28ULKUaNIkVSp6ggDcYZZpk2Sb96I4YRFCIr3LE0DQkMZTTbVTD/ckQxjhT+X4dvow nPk/nHfzQNPjFemO3kFkflny3FOtxFpVnHOjB0lW3iDhwahgwWoNe+E6nIRRlKveUDS4gbEY37gm WUt6a3v6M+tSer6vqVHLjSnTFVD/AHD/APF34Yq7/cP/AMXfhirv9w//ABd+GKu/3D/8Xfhirv8A cP8A8Xfhirv9w/8Axd+GKu/3D/8AF34Yq7/cP/xd+GKu/wBw/wDxd+GKu/3D/wDF34Yq7/cP/wAX fhirv9w//F34Yq7/AHD/APF34Yq7/cP/AMXfhirv9w//ABd+GKu/3D/8Xfhirv8AcP8A8Xfhirv9 w/8Axd+GKu/3D/8AF34Yq7/cP/xd+GKu/wBw/wDxd+GKu/3D/wDF34Yq7/cP/wAXfhirv9w//F34 Yq7/AHD/APF34Yq7/cP/AMXfhirv9w//ABd+GKu/3D/8Xfhirv8AcP8A8Xfhirv9w/8Axd+GKu/3 D/8AF34Yq//Z - - - - - - xmp.did:F77F117407206811871F8EF6BC9F2E8A - uuid:d491ebd2-73a1-e043-8f31-e5076d21243c - uuid:5776C8C7815EDF118B77FD523B43407A - proof:pdf - - uuid:47866ebc-44f4-1341-ae6e-48dad307a28b - uuid:5776C8C7815EDF118B77FD523B43407A - uuid:5776C8C7815EDF118B77FD523B43407A - - - - - saved - xmp.iid:F77F117407206811871F8EF6BC9F2E8A - 2011-07-26T16:52+01:00 - Adobe Illustrator CS5 - / - - - - - - Document - Basic RGB - - - 1 - True - False - - 854.666992 - 255.000000 - Pixels - - - - - AGaramondPro-Bold - Adobe Garamond Pro - Bold - Open Type - Version 2.074;PS 2.000;hotconv 1.0.57;makeotf.lib2.0.21895 - False - AGaramondPro-Bold.otf - - - AGaramondPro-BoldItalic - Adobe Garamond Pro - Bold Italic - Open Type - Version 2.074;PS 2.000;hotconv 1.0.57;makeotf.lib2.0.21895 - False - AGaramondPro-BoldItalic.otf - - - - - - Cyan - Magenta - Yellow - Black - - - - - - Default Swatch Group - 0 - - - - White - RGB - PROCESS - 255 - 255 - 255 - - - Black - RGB - PROCESS - 0 - 0 - 0 - - - RGB Red - RGB - PROCESS - 255 - 0 - 0 - - - RGB Yellow - RGB - PROCESS - 255 - 255 - 0 - - - RGB Green - RGB - PROCESS - 0 - 255 - 0 - - - RGB Cyan - RGB - PROCESS - 0 - 255 - 255 - - - RGB Blue - RGB - PROCESS - 0 - 0 - 255 - - - RGB Magenta - RGB - PROCESS - 255 - 0 - 255 - - - R=193 G=39 B=45 - RGB - PROCESS - 193 - 39 - 45 - - - R=237 G=28 B=36 - RGB - PROCESS - 237 - 28 - 36 - - - R=241 G=90 B=36 - RGB - PROCESS - 241 - 90 - 36 - - - R=247 G=147 B=30 - RGB - PROCESS - 247 - 147 - 30 - - - R=251 G=176 B=59 - RGB - PROCESS - 251 - 176 - 59 - - - R=252 G=238 B=33 - RGB - PROCESS - 252 - 238 - 33 - - - R=217 G=224 B=33 - RGB - PROCESS - 217 - 224 - 33 - - - R=140 G=198 B=63 - RGB - PROCESS - 140 - 198 - 63 - - - R=57 G=181 B=74 - RGB - PROCESS - 57 - 181 - 74 - - - R=0 G=146 B=69 - RGB - PROCESS - 0 - 146 - 69 - - - R=0 G=104 B=55 - RGB - PROCESS - 0 - 104 - 55 - - - R=34 G=181 B=115 - RGB - PROCESS - 34 - 181 - 115 - - - R=0 G=169 B=157 - RGB - PROCESS - 0 - 169 - 157 - - - R=41 G=171 B=226 - RGB - PROCESS - 41 - 171 - 226 - - - R=0 G=113 B=188 - RGB - PROCESS - 0 - 113 - 188 - - - R=46 G=49 B=146 - RGB - PROCESS - 46 - 49 - 146 - - - R=27 G=20 B=100 - RGB - PROCESS - 27 - 20 - 100 - - - R=102 G=45 B=145 - RGB - PROCESS - 102 - 45 - 145 - - - R=147 G=39 B=143 - RGB - PROCESS - 147 - 39 - 143 - - - R=158 G=0 B=93 - RGB - PROCESS - 158 - 0 - 93 - - - R=212 G=20 B=90 - RGB - PROCESS - 212 - 20 - 90 - - - R=237 G=30 B=121 - RGB - PROCESS - 237 - 30 - 121 - - - R=199 G=178 B=153 - RGB - PROCESS - 199 - 178 - 153 - - - R=153 G=134 B=117 - RGB - PROCESS - 153 - 134 - 117 - - - R=115 G=99 B=87 - RGB - PROCESS - 115 - 99 - 87 - - - R=83 G=71 B=65 - RGB - PROCESS - 83 - 71 - 65 - - - R=198 G=156 B=109 - RGB - PROCESS - 198 - 156 - 109 - - - R=166 G=124 B=82 - RGB - PROCESS - 166 - 124 - 82 - - - R=140 G=98 B=57 - RGB - PROCESS - 140 - 98 - 57 - - - R=117 G=76 B=36 - RGB - PROCESS - 117 - 76 - 36 - - - R=96 G=56 B=19 - RGB - PROCESS - 96 - 56 - 19 - - - R=66 G=33 B=11 - RGB - PROCESS - 66 - 33 - 11 - - - - - - Grayscale - 1 - - - - K=100 - GRAY - PROCESS - 255 - - - K=90 - GRAY - PROCESS - 229 - - - K=80 - GRAY - PROCESS - 204 - - - K=70 - GRAY - PROCESS - 178 - - - K=60 - GRAY - PROCESS - 153 - - - K=50 - GRAY - PROCESS - 127 - - - K=40 - GRAY - PROCESS - 101 - - - K=30 - GRAY - PROCESS - 76 - - - K=20 - GRAY - PROCESS - 50 - - - K=10 - GRAY - PROCESS - 25 - - - R=241 G=241 B=242 - GRAY - PROCESS - 12 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - endstream endobj 3 0 obj <> endobj 9 0 obj <>/Resources<>/ExtGState<>/Font<>/ProcSet[/PDF/Text]/Properties<>/Shading<>/XObject<>>>/TrimBox[0.0 0.0 854.667 255.0]/Type/Page>> endobj 10 0 obj <>/Resources<>/ExtGState<>/Font<>/ProcSet[/PDF/Text]/Properties<>/Shading<>/XObject<>>>/TrimBox[0.0 0.0 500.0 256.0]/Type/Page>> endobj 153 0 obj <>stream -H‰Ü—ËŠddž÷ç)rÙ³8§ó~ÑrZ#ƒ¡mDXH#ÊžYÕcäÁÌëûûóÜê”$$m¤^tUDeDFDÆ—û¿>˜ûÇk^þ`;Õ\Ì»áþOOÖ¼û8XcM²Öø”Íþ9¼Þž? wŸ}¦«fîL7n?5Åø_B™Os÷(}ß}øïw—®¯äç}‰ÝÞN>gãB›ªwæyc¸2UŒ/SŠÍ4>l5:EÔª›\)æ<éËÂT«)q -Í™ MÞä„hZ©”¦’«Dôe¥Cœb‰&rŸO#0*WL© qä…¨N9Ä…lmj¾ÈêVšq6M®UýÔšGô†qÁCä(Fä:¦lûÏ£N-ÒaÏ7·ã>ãBéºÊð(„~¼%Ih¤)N¶V‘g› rŒ¼I,;C¯[¦ ´ÝÎà„ms|R¿q¡‰!¹:û4sˆsŠÝ&l,óSôˆ6Â7ûÕ\îüà”,¼ç|EÔ•”Rlè3zÊ‚k¾çPì8’§=&_&/YïÍ*y ”•¾Œßã¢>ÿž}º*^s@í‹Lb¶&(ï©ÄD¡½”"g]4 Ý:F“Jr0Û±zd©,»¤™aÀð}·ÒH”Í‘bt¹© Ç<Þ÷DƤB%Åi©»¦%¬õ³i“«Ú·ˆve4¦]íTø`˜¯}m}­<0$Ïûy• • œÒl˼¥qY³ÍÄ o%G†œ©gMàé´æ[gZ냨‚Ó+d ~*mZw«ëþ9RáPY»L–¬ê„*‰â-hß¼ÈKPÖbà -SH ö­5ËÒàtѶ“Ø^+Âæm±ãö5Öv¨Úþ×B›3- -ò/FAþÍ‘ý{vi6)Ñ4'îóP©ñ ò[bWÆ°¸¨/(),§úXAu¤/Ç¢ƒÕ³›ø ¬FÚ`7<iîU +úµ„”­2`\mi-çáH#ËjA%Ú*Mc³¡g­•Éjóò[Ýrêpñ -F· È:bÚ G×* 2O¬ù -Ì7 ,àùbÚà¯+®µáð/xü ;Œ n²6åÈå™ÁÛÒy4(¬0³0¨ @šðeÁí|y"×£y4²ÂËŠû/ž­ùüß¾y|0|üO€MÎh endstream endobj 154 0 obj <> endobj 156 0 obj <>/ExtGState<>>>/Subtype/Form>>stream -/CS0 cs 1 1 1 scn -/GS0 gs -q 1 0 0 1 273.1465 198.5684 cm -0 0 m -0 -43.758 -64.479 -79.23 -144.02 -79.23 c --223.561 -79.23 -288.041 -43.758 -288.041 0 c --288.041 43.757 -223.561 79.23 -144.02 79.23 c --64.479 79.23 0 43.757 0 0 c -f -Q - endstream endobj 158 0 obj <> endobj 143 0 obj <> endobj 142 0 obj [/ICCBased 159 0 R] endobj 159 0 obj <>stream -H‰œ–yTSwÇoÉž•°Ãc [€°5la‘QIBHØADED„ª•2ÖmtFOE.®c­Ö}êÒõ0êè8´׎8GNg¦Óïï÷9÷wïïÝß½÷ó '¥ªµÕ0 Ö ÏJŒÅb¤  - 2y­.-;!à’ÆK°ZÜ ü‹ž^i½"LÊÀ0ðÿ‰-×é @8(”µrœ;q®ª7èLöœy¥•&†Qëñq¶4±jž½ç|æ9ÚÄ -V³)gB£0ñiœWו8#©8wÕ©•õ8_Å٥ʨQãüÜ«QÊj@é&»A)/ÇÙgº>'K‚óÈtÕ;\ú” Ó¥$ÕºF½ZUnÀÜå˜(4TŒ%)ë«”ƒ0C&¯”阤Z£“i˜¿óœ8¦Úbx‘ƒE¡ÁÁBÑ;…ú¯›¿P¦ÞÎӓ̹žAü om?çW= -€x¯Íú·¶Ò-Œ¯Àòæ[›Ëû0ñ¾¾øÎ}ø¦y)7ta¾¾õõõ>j¥ÜÇTÐ7úŸ¿@ï¼ÏÇtÜ›ò`qÊ2™±Ê€™ê&¯®ª6ê±ZL®Ä„?â_øóyxg)Ë”z¥ÈçL­UáíÖ*ÔuµSkÿSeØO4?׸¸c¯¯Ø°.òò· åÒR´ ßÞô-•’2ð5ßáÞüÜÏ ú÷Sá>Ó£V­š‹“då`r£¾n~ÏôY &à+`œ;ÂA4ˆÉ 䀰ÈA9Ð=¨- t°lÃ`;»Á~pŒƒÁ ðGp| ®[`Lƒ‡`<¯ "A ˆ YA+äùCb(Š‡R¡,¨*T2B-Ð -¨ꇆ¡Ðnè÷ÐQètº}MA ï —0Óal»Á¾°ŽSàx ¬‚kà&¸^Á£ð>ø0|>_ƒ'á‡ð,ÂG!"F$H:Rˆ”!z¤éF‘Qd?r 9‹\A&‘GÈ ”ˆrQ ¢áhš‹ÊÑ´íE‡Ñ]èaô4zBgÐ×Á–àE#H ‹*B=¡‹0HØIøˆp†p0MxJ$ùD1„˜D, V›‰½Ä­ÄÄãÄKÄ»ÄY‰dEò"EÒI2’ÔEÚBÚGúŒt™4MzN¦‘Èþär!YKî ’÷?%_&ß#¿¢°(®”0J:EAi¤ôQÆ(Ç()Ó”WT6U@ æP+¨íÔ!ê~êêmêæD ¥eÒÔ´å´!ÚïhŸÓ¦h/èº']B/¢éëèÒÓ¿¢?a0nŒhF!ÃÀXÇØÍ8ÅøšñÜŒkæc&5S˜µ™˜6»lö˜Iaº2c˜K™MÌAæ!æEæ#…åÆ’°d¬VÖë(ëk–Íe‹Øél »—½‡}Ž}ŸCâ¸qâ9 -N'çÎ)Î].ÂuæJ¸rî -î÷ wšGä xR^¯‡÷[ÞoÆœchžgÞ`>bþ‰ù$á»ñ¥ü*~ÿ ÿ:ÿ¥…EŒ…ÒbÅ~‹ËÏ,m,£-•–Ý–,¯Y¾´Â¬â­*­6X[ݱF­=­3­ë­·YŸ±~dó ·‘ÛtÛ´¹i ÛzÚfÙ6Û~`{ÁvÖÎÞ.ÑNg·Åî”Ý#{¾}´}…ý€ý§ö¸‘j‡‡ÏþŠ™c1X6„Æfm“Ž;'_9 œr:œ8Ýq¦:‹ËœœO:ϸ8¸¤¹´¸ìu¹éJq»–»nv=ëúÌMà–ï¶ÊmÜí¾ÀR 4 ö -n»3Ü£ÜkÜGݯz=Ä•[=¾ô„=ƒ<Ë=GTB(É/ÙSòƒ,]6*›-•–¾W:#—È7Ë*¢ŠÊe¿ò^YDYÙ}U„j£êAyTù`ù#µD=¬þ¶"©b{ųÊôÊ+¬Ê¯: !kJ4Gµm¥ötµ}uCõ%—®K7YV³©fFŸ¢ßY Õ.©=bàá?SŒîÆ•Æ©ºÈº‘ºçõyõ‡Ø Ú† žkï5%4ý¦m–7Ÿlqlio™Z³lG+ÔZÚz²Í¹­³mzyâò]íÔöÊö?uøuôw|¿"űN»ÎåwW&®ÜÛe֥ﺱ*|ÕöÕèjõê‰5k¶¬yÝ­èþ¢Ç¯g°ç‡^yïkEk‡Öþ¸®lÝD_p߶õÄõÚõ×7DmØÕÏîoê¿»1mãál {àûMśΠnßLÝlÜ<9”úO¤[þ˜¸™$™™üšhšÕ›B›¯œœ‰œ÷dÒž@ž®ŸŸ‹Ÿú i Ø¡G¡¶¢&¢–££v£æ¤V¤Ç¥8¥©¦¦‹¦ý§n§à¨R¨Ä©7©©ªª««u«é¬\¬Ð­D­¸®-®¡¯¯‹°°u°ê±`±Ö²K²Â³8³®´%´œµµŠ¶¶y¶ð·h·à¸Y¸Ñ¹J¹Âº;ºµ».»§¼!¼›½½¾ -¾„¾ÿ¿z¿õÀpÀìÁgÁãÂ_ÂÛÃXÃÔÄQÄÎÅKÅÈÆFÆÃÇAÇ¿È=ȼÉ:ɹÊ8Ê·Ë6˶Ì5̵Í5͵Î6ζÏ7ϸÐ9кÑ<ѾÒ?ÒÁÓDÓÆÔIÔËÕNÕÑÖUÖØ×\×àØdØèÙlÙñÚvÚûÛ€ÜÜŠÝÝ–ÞÞ¢ß)߯à6à½áDáÌâSâÛãcãëäsäüå„æ æ–çç©è2è¼éFéÐê[êåëpëûì†ííœî(î´ï@ïÌðXðåñrñÿòŒóó§ô4ôÂõPõÞömöû÷Šøø¨ù8ùÇúWúçûwüü˜ý)ýºþKþÜÿmÿÿ ÷„óû endstream endobj 148 0 obj <> endobj 149 0 obj <> endobj 150 0 obj <> endobj 151 0 obj <> endobj 160 0 obj [/ICCBased 159 0 R] endobj 162 0 obj <>stream - endstream endobj 161 0 obj <> endobj 163 0 obj <> endobj 164 0 obj <> endobj 135 0 obj <> endobj 136 0 obj <> endobj 137 0 obj <> endobj 169 0 obj [/View/Design] endobj 170 0 obj <>>> endobj 167 0 obj [/View/Design] endobj 168 0 obj <>>> endobj 165 0 obj [/View/Design] endobj 166 0 obj <>>> endobj 146 0 obj <> endobj 147 0 obj <> endobj 172 0 obj <> endobj 173 0 obj <>stream -H‰bd`ab`dd”÷urrðÕvtO,JÌÍÏK (Ê×uÊÏIñ,IÌÉL)Qý!ÍøC„EîaW<ÓÑß>¿Ê°,ø%Äúýÿ÷‹‚çüb`bd¼öØ9¿ ²(3=£DÁÈÀÀ@D‚IsÇ”ü¤T…àÊâ’ÔÜbϼäü¢‚ü¢Ä’Ô=Çœ°¶b…¢ÔâÔ¢2° XÌY -™Å -©™%©E -‰@Eé™@sŠRSJŠSRs‹²òA2HÜ4™õû ¶ß -¿ˆ~qþLbÿÃf·û ä³ýØ/ -býñø~4ÖÞ¸·ñ»ñ¥îòïWË…~È~—¾óÃ燑htf}~²|vi^^q.GÛ»ïë昱nöVɉ}-=rQ*ÙuÍ-ÝM}ÍË«%æ6ö6Ô§ÿüsH"»a{óéy ûfM”ßò•uéÔ SJOŸPS×'?9}JÖôbŽâé j–K_;uz÷bùÎi Sš:8JJsóÊ¥ó›Nnj’ïœÜ3iRïÚ)ûfm\ͱ~åüµ›¤6¬”~cã":wfCYnv^J|Nljc©tC[_ÿ„)ó§Ï’¿~lçúuÒ|åó¨Ìœ:÷»ÏÌù³7u³ý^8ëú¤OÓ0Lb¯žýCnæÒ™ßÝÀ2¿μ?é5H†SnûÔæÿ<œ¸¾‹q÷ðð™<&g endstream endobj 171 0 obj <> endobj 174 0 obj <>stream -H‰|Rkp×^[Ú$ªÒz‘+k™ÝíTùÑ&uH& 4 @IꄆǀmŒ%dÙ–äHòCø!YÒ¾w%íJ~(¶1Æ6 ø‰_Ø×&$n 3”0IÏ4Ó™ô5dòç -–w­”ék¦÷Ç™ósÏwÎýîÑ@ÙYF£É/ܱcç¾Â§·ï)ó”9Ý.ë>ûG;ÜÕÖµ$‘F5éõÙé z£ò¼²´!»ñÁwsÀÕ'Áï|¶AçÍ…²4šÛ_ìt×ø={…x~ãÆϬÙç2v±Ýê>n#öû½>›ÓKìu•»=5nO™Ïf- ¶WW™2/á±ymžºL0SðhÂá%l_…ÍC”©—ì•Çc³>O™Õæ,óTîµÌ¿Áÿ§%áp*qÐåXCû}jÐK”¹¬Ïª,îL—rw­ËçqؼÏîÞÀ_c#6VÛ H=… - ¡-Ðè5¨z:=¡J¨ºo@¤¦'kWÖ×ëƲ·dwå”hGø…ôß4ªµ,¬ã³ÓÌý}-ˆ*•m ‘¾Ô*„²hk࡬{¨-Íø`›¢bmúŠqÍSÖÁ Ì4ƒÍŸƒÍšËà¥u ¯Ù8?<:7S9Y\j·—MUMâ€ÉžžËÄNO9'qxÀŒ×Ô­f‚Ð*ôTÊ_½-§LÈå«÷³“‘¾¦·ÌÙ—éŸaä3Ì TYH’‡C~Æ¢øw:ixR¼ ]˜áÆõ–D\<–­’©\"S æ…{Â2&\.Æ–aQ‹4]UòÀ“Š0¡|¦¥v6‰&äh,Žÿlýlù=x­¹,*9oð£$æ¤[#‚¯ƒÊŸ—„ÙË3ÜœÞÒãÏ„U1“5N÷³s0 rYãæÅÞŽ){?žhãO¥|;{”«tú¸£zKí‹žCÅ–ÃJ–©f_cu‹·yÀþq¨w/øžéí?W|tÝlg\|eÑ1Á¡·Þ›Æ¿09V³v¡¹9WUýûÈ ÕZŒd¨”ÂJ©0ÉûdþMñŠ0?»À-ë-²ÄŸ‰HåqS©D&¾4§ uƒÑh?ö¡övªäõn<>+Æ“0ò{MþCÛe#1%Ž¥qäF]¨‰Û‹>„µ?ebÝ¥)B)Šeh°üËÜ!°þO«P“ªï*„€™J@ŸñëxÑô&ôÕŸ;j¸·Á[õŽ¹Y -v÷Lt´¿‹%e))vÁ3òéT?:ón±-À¹ Î…©ˆŸr‡Ýa[ÞQ[]}ؼëWŒŸ;ÕÙƒ! r›‹£ñKÊ82å;ÛE¯]ºÐÕG“dGH„C­L­wõü.†#³Šá„±š#ýÕ¨Û÷ÞÐ¥‰îY —áaƒÒÍŒ¥ó’|ý…¯Ï½žR0·$#C ,‘Of…‹â9L¢UqQ§ÿÕš’–Éûe22 -ðr³ò´nªd°vmw’dþ°8-ÌÎMp£zKRÝ°Ô š*£tò¦)L÷Ë+\oãÈôñAçÅ ãó22é>_†”fìþ&YóéÚë>°ñ¿ˆGUâ™ÙinøñIÑT£7Íé·t Óâ§#"‰©}Ó{¬õ›A»[M½>Xn6ðÌøhx²~¤>wä]”ïfº²’i¶ÓXã¿M ÓóCÜùGE“G}Á’ìÑõˆ’Œµ'z;ßCz«¬¸²Uw€ŽøhÌÏü³þ}qB˜œŸþz{fPðŠ¹w£ìÚæ£%5-µÉ´R ʼނ¬ÈÑþ”ù¥]þÿ«´l¾æÆ×¾)˜A2›®¿5Ž‹ÃB&sTœFIgªÀ‘;U´¶³šó&")Ö4FÉ!õ«~¡k¥›"F†[Üèë‘éyu=ÀucÂYq‹s”L¢´+@9UUÁTr­®AuÒ¦þˆD2+Ût/»{}ôÌÀ&Åi2Ì5²\ c”ÌÁÑ•¡ØßñÎ87¦î h¢[P/3økÜÐØ•¶¤RÝ`oOWׯUúRwå{ÉtŽ¬S3Xj0v§zÕ ¬fVä¿v¤!ù1ìôž¶ðªþ±ÅÇAÞ ¯Sÿ-Ao‘õéKÆ0ß ’S endstream endobj 144 0 obj <> endobj 155 0 obj <> endobj 175 0 obj <> endobj 176 0 obj [0.0] endobj 177 0 obj <>/XObject<>>>/Subtype/Form>>stream -0 g -/GS0 gs --14.895 277.798 288.041 -158.46 re -f -q -5 w 4 M 0 j 0 J []0 d -0 Tc 0 Tw 0 Ts 100 Tz 0 Tr /Fm0 Do -Q - endstream endobj 178 0 obj <> endobj 179 0 obj <>/ExtGState<>/Shading<>>>/Subtype/Form>>stream -q -215.399 178.843 m -212.793 178.843 210.248 178.581 207.787 178.088 c -192.902 213 158.27 237.475 117.92 237.475 c -63.987 237.475 20.267 193.753 20.267 139.821 c -20.267 117.813 27.549 97.508 39.833 81.178 c -33.879 74.392 30.262 65.505 30.262 55.768 c -30.262 34.474 47.525 17.21 68.819 17.21 c -85.634 17.21 99.927 27.979 105.199 42.992 c -109.363 42.45 113.608 42.168 117.92 42.168 c -122.124 42.168 126.268 42.435 130.332 42.95 c -135.57 27.874 149.894 17.048 166.752 17.048 c -188.047 17.048 205.309 34.311 205.309 55.605 c -205.309 65.301 201.723 74.152 195.814 80.927 c -200.787 87.493 204.946 94.707 208.147 102.421 c -210.498 101.973 212.92 101.729 215.399 101.729 c -236.694 101.729 253.955 118.992 253.955 140.286 c -253.955 161.581 236.694 178.843 215.399 178.843 c -W n -q -0 g -/GS0 gs --0.0000153 220.4262695 220.4262695 0.0000153 137.1108398 17.0478516 cm -BX /Sh0 sh EX Q -Q -/CS1 CS 0 0 0 SCN -10 w 4 M 0 j 0 J []0 d -/GS0 gs -q 1 0 0 1 215.3994 178.8428 cm -0 0 m --2.606 0 -5.151 -0.262 -7.613 -0.755 c --22.498 34.158 -57.129 58.632 -97.479 58.632 c --151.412 58.632 -195.133 14.911 -195.133 -39.021 c --195.133 -61.03 -187.851 -81.335 -175.567 -97.665 c --181.52 -104.451 -185.137 -113.338 -185.137 -123.075 c --185.137 -144.369 -167.875 -161.633 -146.581 -161.633 c --129.765 -161.633 -115.473 -150.863 -110.201 -135.851 c --106.036 -136.393 -101.792 -136.675 -97.479 -136.675 c --93.275 -136.675 -89.132 -136.408 -85.067 -135.893 c --79.829 -150.969 -65.506 -161.795 -48.647 -161.795 c --27.353 -161.795 -10.09 -144.532 -10.09 -123.237 c --10.09 -113.542 -13.677 -104.69 -19.585 -97.916 c --14.612 -91.35 -10.453 -84.136 -7.252 -76.422 c --4.902 -76.87 -2.479 -77.113 0 -77.113 c -21.294 -77.113 38.556 -59.851 38.556 -38.557 c -38.556 -17.262 21.294 0 0 0 c -h -S -Q - endstream endobj 180 0 obj <> endobj 181 0 obj <> endobj 182 0 obj <> endobj 183 0 obj <> endobj 184 0 obj <> endobj 185 0 obj <> endobj 141 0 obj <> endobj 186 0 obj <> endobj 187 0 obj <>stream -%!PS-Adobe-3.0 %%Creator: Adobe Illustrator(R) 15.0 %%AI8_CreatorVersion: 15.0.2 %%For: (Aleks Kissinger) () %%Title: (web_logo_manual.ai) %%CreationDate: 26/07/2011 16:56 %%Canvassize: 16383 %%BoundingBox: -15 -70 864 214 %%HiResBoundingBox: -14.8945 -69.667 863.5 213.7983 %%DocumentProcessColors: Cyan Magenta Yellow Black %AI5_FileFormat 11.0 %AI12_BuildNumber: 399 %AI3_ColorUsage: Color %AI7_ImageSettings: 0 %%RGBProcessColor: 0 0 0 ([Registration]) %AI3_Cropmarks: 0 -63 854.667 192 %AI3_TemplateBox: 250.5 63.5 250.5 63.5 %AI3_TileBox: 121.3335 -331.5 733.334 460.5 %AI3_DocumentPreview: None %AI5_ArtSize: 14400 14400 %AI5_RulerUnits: 6 %AI9_ColorModel: 1 %AI5_ArtFlags: 0 0 0 1 0 0 1 0 0 %AI5_TargetResolution: 800 %AI5_NumLayers: 3 %AI9_OpenToView: -213.3862 551.3853 0.6667 979 715 18 0 0 114 134 0 0 0 1 1 0 1 1 0 1 %AI5_OpenViewLayers: 777 %%PageOrigin:0 64 %AI7_GridSettings: 72 8 72 8 1 0 0.8 0.8 0.8 0.9 0.9 0.9 %AI9_Flatten: 1 %AI12_CMSettings: 00.MS %%EndComments endstream endobj 188 0 obj <>stream -%%BoundingBox: -15 -70 864 214 %%HiResBoundingBox: -14.8945 -69.667 863.5 213.7983 %AI7_Thumbnail: 128 44 8 %%BeginData: 11082 Hex Bytes %0000330000660000990000CC0033000033330033660033990033CC0033FF %0066000066330066660066990066CC0066FF009900009933009966009999 %0099CC0099FF00CC0000CC3300CC6600CC9900CCCC00CCFF00FF3300FF66 %00FF9900FFCC3300003300333300663300993300CC3300FF333300333333 %3333663333993333CC3333FF3366003366333366663366993366CC3366FF %3399003399333399663399993399CC3399FF33CC0033CC3333CC6633CC99 %33CCCC33CCFF33FF0033FF3333FF6633FF9933FFCC33FFFF660000660033 %6600666600996600CC6600FF6633006633336633666633996633CC6633FF %6666006666336666666666996666CC6666FF669900669933669966669999 %6699CC6699FF66CC0066CC3366CC6666CC9966CCCC66CCFF66FF0066FF33 %66FF6666FF9966FFCC66FFFF9900009900339900669900999900CC9900FF %9933009933339933669933999933CC9933FF996600996633996666996699 %9966CC9966FF9999009999339999669999999999CC9999FF99CC0099CC33 %99CC6699CC9999CCCC99CCFF99FF0099FF3399FF6699FF9999FFCC99FFFF %CC0000CC0033CC0066CC0099CC00CCCC00FFCC3300CC3333CC3366CC3399 %CC33CCCC33FFCC6600CC6633CC6666CC6699CC66CCCC66FFCC9900CC9933 %CC9966CC9999CC99CCCC99FFCCCC00CCCC33CCCC66CCCC99CCCCCCCCCCFF %CCFF00CCFF33CCFF66CCFF99CCFFCCCCFFFFFF0033FF0066FF0099FF00CC %FF3300FF3333FF3366FF3399FF33CCFF33FFFF6600FF6633FF6666FF6699 %FF66CCFF66FFFF9900FF9933FF9966FF9999FF99CCFF99FFFFCC00FFCC33 %FFCC66FFCC99FFCCCCFFCCFFFFFF33FFFF66FFFF99FFFFCC110000001100 %000011111111220000002200000022222222440000004400000044444444 %550000005500000055555555770000007700000077777777880000008800 %000088888888AA000000AA000000AAAAAAAABB000000BB000000BBBBBBBB %DD000000DD000000DDDDDDDDEE000000EE000000EEEEEEEE0000000000FF %00FF0000FFFFFF0000FF00FFFFFF00FFFFFF %524C45FD82FFA8FFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FF %FFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFF %A8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FF %FFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFF %A8FFFFFFA8FFFFFFA8FD04FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFFD7FA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFFFFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8A8FFA8A8A8FFA8A8A8FFA8FFA8FFFD067DA8FFA8FFA8FFA8A8A8FF %A8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8 %A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FF %A8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8 %A8FFA8A8A8FFFFA8FFA8FFA8FFA8FFA8FFA8FFA85227FD0752277DA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFFD0DA8272752A8A8FD05FFA87D272752FFFD64A8FF %A8FFA8FFA8FFA8FFFFA8277DA8FD0BFFA85227A8FFFFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8A8 %FFA8A8A8FFA8A8A87DF8A8FFFFA8FFA8FFA8FFA8FFA8FFA8FFFF7DF8FD04 %A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FF %A8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8 %A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FF %A8A8A8FFA8A8FFA8FFA8FFA8FFFF7D27A8FFFFA8FFFFFFA8FFFFFFA8FFFF %FFA8FFFF7DF8A8FFFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFFD07A8F8A8A8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFFF7DF8FD61A8FFA8FFA8FFA8FF277DFFFFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFFF5252FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8A8FFA8FF5252 %A8A8A8FFA8A8A8FFA8CFA8FFA8A8A8FFA8A8A8FFA8FFA8277DFFA8FFA8A8 %A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FF %A8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8 %A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FF %FFA8FFA8FFA8277DFFA8A8A8FFA8A8A8FFA8A87DA8A8FFA8FFA8A8A8FFA8 %FF52277D7DA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFFD06A87D27FFFD08A85227F8F8F8277DFD09A827522727 %27FD5BA8FFA8FFA8FF527DFD08A82727F827F827F82752FFA8A8A8CFA8A8 %A8FFA8FFA85227FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8A8FFA8A8A8277DFD07A827F8F827F827F827F8F87DFD07 %A8525252A8A85227FFA8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8 %FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8 %A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8 %FFA8A8A8FFA8A8FFA8FFA8A827FD07A87D27F827F8272727F827F852FD06 %A82727F82727A8A8277DFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8A8FF7D52A8A87DA87DA8A852F827F827F827F827 %F827F87DFD04A827F8F827F8F852A82752FD58A8FFA8FFFF7D27FD07A852 %FD0C2752527D52FD0527F852A87D52FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8A8FF52527DA87DA87DA8A852F827F8 %27F827F827F827F827527D5252F827F827F8F827A85252A8A8A8FFA8A8A8 %FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8 %A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8 %FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFFFA8FFA87D27A87DA8 %7DA87DA852FD0927F8277DFD04A852F827F8F8F852A85252FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFFD04A8FF7D27FD087D %F827F827F827F827F82727A87D7D7DA87D27F8F8F8277D7DF8FD59A8FFA8 %FFA8FF277D7DA87D7D7DA87D52F827F8F8F827F8F8F8FD047DA77DA87D52 %277D7DA82752FFFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8A8FFA8A8A85252FD087D27FD07F852FD097DA87D7D2727A8FF %A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FF %A8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8 %A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8FFA8 %FFA8FF5227FD077DA827F8F827F827F8F852FD087DFD042752A8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFFD05A8 %F87D7C7D527D527D5227277D527D527DF8527D7D527D527D7C52277D7DFD %10A8FFFD4CA8FFA8FFA8FFFF7D277D52FD047D5227FD077D27FD077D27A8 %FFFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFCAFFA8FFA8FF %CAFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8AF %A8FFA8FFA8FFA8A8FFA8FFA827277D527D5252F87D527D527D527D525227 %7D527D527D2752A8A8A8FF7D7D7DA87DA87DFD04A8FFA8A87DA8A8A87DA8 %7DA87DFD04A8FF7D7D7DA87DA87DFD04A8FFA8A8A8FFA8A8A8FFA85A2F84 %A8A8A8FFA8362F84A8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8 %A8FF7E0E5AFFA8A8A8FFFFA8FFA8FFA8FF27527D52F827F8277D7D527D52 %7D527D52FD04277D7D2752FFA8FFFD04A87DA8A8A87DA87DA8A8FFA87DA8 %FFA8A8A8FF7D7D7DFFA87DFD04A87D7DA8A87DFFA8FFA8FFA8FFA8FFA8FF %A8FF840E0DFFA8FFCA840D5AA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8A90D5ACAFFA8FFFD06A8FF52275227FD05F8FD0952FD05 %F85252277DFFA8A8A8FFA87D7DFFFD08A87DFD04A8FFA87D7DA8A8A87DA8 %A8FFA87D7DFD04A8FFA8A8A8FFFD08A80D0E5AFFA8A82F0E5ACFA8FFFD05 %A8CAA8FFA8A8A8FFA8A8A8FFA8A8A8FFA8CA840E5ACFFD04A8FFA8FFA8FF %FF52277DFD06F8277D527D527D527DFD06F8277D277DFFFFA8FFA8FF7DA8 %A8FFA8FFA8FFA8FF7DA8A8FFA8FFA8A87DA8A8FFA8A8A8FFA8FF7D7DA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA85A0D36A8FF7E5A0D84CAFFA8A9A8FF %A8AF84FFA8FFA8AFA8FFA8FFA8FFA8FFA8FFA8A90D60CAFFA8FFA8A8FFA8 %A8A8FF275252FD06F827FD0752FD06F827522752FFA8A8A8FFA87D7DFFA8 %A87D7DA8FFA87D7DA87DA8A8A8527DFD04A87DA8A8FFA87D7DFD04A8FFA8 %7DF87DA82727FFFD04A85A7E0784CA5A7E0E5AFF7E5A2F5AA8A80D36350E %5ACF5A145A840D5AA88435365ACF840E5ACFA8FFA8A8FFA8FFA8FFA85252 %52FD06F82752527CFD0452FD07F87D2752FFFFA8FFA8FF7DA8A8FFA8A87D %FFA8A87DA8A87DA8FF7D7DA8FFA8FF7D7DA8FFA8FF7D7DA8FFA8FFA8FF7D %F852FF2727A8FFA8FF8460A80E36A95AA90D84A83684600DFFA80E36AF2F %14A8A90D84CA0E36FF36A95A0EA8A90D84CAFFA8FFA8FFFD04A8FF272752 %27FD05F8525227F827F8275227FD05F82752277DFFFD05A87D7DA8A8FF7D %7DA8A87D7D7DA8A8FF7D7D7DA8A8FFA8A852FD04A87D7DFD06A8FFFD09A8 %8435FF350E0DA8840E59FF84842F0EA8A80D5ACA5A0DA8840E59FF0D5AA8 %A87E360DCF840E59FFFD04A8FFA8FFA8FFA87DF87D5227F8F8F852525227 %7D527DF87C5227F8F8F827525227A8A8FFA8FFA8FF7DA8A8FFA8A87DFFA8 %7D7D7DA8FFA8A87DFFA8FFA8A8A87DA8FFA8FF7D7DA8FFA8FFA8FF7D277D %FF2752A8FFA8FF845ACFA90D5ACFA90D60A8365A600EFFA8145AFF5A14A8 %A90D84A80E36FF0E5A5A36A8A90D84CFFFA8FFA8FFA8A8FFA8A8A827277D %FD0652F8A8A8FFFF52F87D52522752527DF87DA8A8A8FFA8A87D7D7DA8A8 %FF7D7D7DA87DA87D7DA8A8527D7DA87D7D7DA852A8A8A87D7D7DA8A8FFA8 %A8A87DF87DA827F8A8A8FFA85A0DA8A8367EFF5A0E0D840D36350E5A840D %36A8360DA8A8360D5A0D367E362F5A0D845A0E2FFD04A8FFFFA8FFA8FFA8 %FFA82727FD047D52F87DFFFFA8FFA852F87C7D7D7D52F852A8FFA8FFA8FF %FD05A8FFFD05A8FFA8A8A8FFFD07A8FFA8A8A8FFFD05A8FFA8FFA8FFA8A8 %A8FFA8A8A8FFA8AF848484FFA8FFA8FD0484AF84A884A9848484A9848484 %FFA884A8A9A8AFA8A9A8A884A9848484FFA8FFFD08A8FFA852FD05277DA8 %FFA8A8A8FFA852F8FD04277DFD07A8FFA8A8A8FFA8A8A8FFFD07A8FFA8A8 %A8FFA8A8A8FFFD07A8FFFD07A8FFA8FFFD05A8FFA8CAA8FFA8A8A8FFA8CA %A8FFA8CFA8FFA8CFA8FFA8CAA8FFA8A8A8FFA8CAA8FFA8CAA8FFA8CAFD04 %A8FFA8FFA8FFA8FFA8FFFFA87DA8A8FFA8FFA8FFA8FFA8FFFFFF7D7D7DFF %FFFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8A8FFA8A8A8FFA8A8A8FFA8FFA8FFA8A8A8FFA8A8A8 %FFA8A8A8FFA8FFA8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8 %A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8 %FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8 %A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFFFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FF %%EndData endstream endobj 189 0 obj <>stream -%AI12_CompressedDataxœì} C7Óð÷üÜ·¥Mš+í’4>s‘„9Ú<-]ìÜ›úH›þúov}&fIÌ>OjÏJ³šÑh.Ö+ßlí¬VÚýýtÕ]sÊ¥••Ú MFýÁ2AË»Ýñp4@Ðí›eå¯9Шò8Ú3 _¥ƒa§ß»C·Ö4Ülbï•núnX~Ú;½Ãtp³|ã&ÜÛ팺)Üý;Ýßëöû{ÇIoœt×’ÎMy6 «'#h¤ƒu'\׎ReÜñlôÞ'€ñ_¸­7rVí{mxFµÿÏòªòË«¡SŽ¯¬•·u¶ÓáTo-Š=hÄkABcw͇æîZÊz¿5>N{£­A¿•‡µ~·?Þ)×>$½ò³äî$å_Òn·ÿw¹ÚMZïr]šýÞšV&ƒä¸ßkŠÕj¿Û†&·f¡GI·ÓÊuž¦í´ýqH*ý½f§›ÿ“QY)œªÊc¥÷ªãN·ý||¼ŸÂ̸qŒ`wÈz9z€4üŒàpïñ1@vÒÑøƒÀéÞ~Xͳ€tÝx»vH:`Ò~»iÐú'ÇÉàö»åÈ÷ˆÍ*ÖÜb7=>éÂÓlhßæó ئCm”Vk®ëÂŒ¹®‚&¡ëÂw¯ìŽ´Í¦,}ßIÿ¾S~Þï¥Ì“Ê`´ÃãyŽÃÿòíq7¼ìuÙ‚bfʳ~;íB{Û¿ÙMˆt©ì_n°› ÓˆY¿;ÑZˆä ÀôÍäCŠÒãò^œ¤½Ýþ+ã*Êœºìû@aä»eX¼ŠÃ¸‚,«ˆ¦¼²‚e*û—ŸƒX§<, C˜·-˜ÉƒÎa§wÇ)ÏïÃA§Mo¨ËÿC­E¹ÿÇò90a4J{†/ Vµg91qÖžíÀ#½v­Œ31ĵ òÑÑ¥Î÷ìgºÝÇ'¥·%7^ÿkÜ¥¨*ºi9ÖÉûæ=Z¯´;éî ×+¸½^k¥íN·›¬7’Öx”®?l§ë/¤Yiý¥í‘p“„°­'­Î„ä ›þ³ždm¸BÈ[‚<¥ž¥õ”»¦¹®©íÚaônÓɵéØ6=B_ZïsÛ>·íçÚömÛ>eÌMÇÜtœ5-­mÛvrZu½ LÓõð{}8J]¤b˜¶P ×÷ÇÝn:Z?}¸NŽÖ¡èÛö~¸4 ¥ ØÚë­þÉ’£Ñ:,åvŠ‹wÇ`·ÖëÚéÁz¥±þbØM†G% :qÜé³Fòßioýx< .Í´“ÿöíƒPuz)~>N†­q¿HƒàæéÓ!ÙîÿÝ[Oÿiu“cúÒÕi%]è`{ÀŠîôf‡qZ±›÷Á"Œ²oÌ Ðî¤|x’´Òõ -OFÅ›ùOc½2ÒkÃÖÓcú 2°˜ÊÆIß28Û÷Ë4Ëó_짃AÂ3Úú4RZ)vÜôЕÖ:@°xòú <§ßF¡¹ÎÖÙ~2Líé 4õÇC‘Òz%'¢Üç -KFîÁ¬yÌðÇyq}l=æF/¸Ñ‹>¡û·xÉ-^æѼä[mœ)0þë¹Þ<ÇIk€òºŸš%-Z¼¤yE—ÖƽÃd0>î&ã¬C0ïÖ[ ô+í6H‰úOöv‡`D2Ûáî‘šjôZ}ôî”÷fŒï#ýv}¶ÙúlGÖ仿òƒ@7ÊcØóÚýp’~ü°Ø'8ÕW˜7D¾5;Pƒj‘á¾U2*©¬Bw¦6ý Ü;ø¬wz°´Gr -§“€¾Ïd¿”T¤Po€Þu’n»sp° 8&/cýdÐo[ Õ:€q„úÐGñú‹ãô0)—T쯃CG¸žœ@‡Ì(âh½žvÁy×Ð,ê­nÒKe‚[Ì›°à[ ð(ÃÁ@ -ŽÌ Z²÷2¸©œÑ wk%£#ðãA-nþ:9p†o§…~Ò \Œ‡GåÝ~¿kÑNÞ²Ø ˜ Ø¾ÏØ¢½=fÐì“Lƒé'¿\¸§@ëÓŸ7‹Œ½–€/B¨á9˜sß>‰ï]D°Håu†Ç™<å [¨’[Ýt縎ÇgaCn€¾oƒ ’vËFÛ?>Áh¼¼s”œ¤„stÔ¤–;¡&¯cWWKª\íå4ðCÔò`åï”o¼ìõ’ã´]>4 ²ëÜ,Í…‚wËU0Ñ¥»¥XÁåDM¸pÕ£\Õ¨Wá_Wùpyp¹‘†K…M¸a=¬…U¸*aŒÍ Ü -J¡—º¡\NЄ«Ô‚jP)݇'†\Ø„a3Ç6kuhJáŠáŠ°y€>\^à.8ã7áj”ü:\5¸ª~®®ø¾ïññ/0›÷Ô:=µ:õT~šKO“ç5ગ¦ž™çeO„›xžïúÊw¼†W÷j^Õ‹¡xžçzÚSžã6ܺ[s«nÅÜ軄ùÊutS7àªëZIWuEÇÀû¨÷µ§]­µÒŽjª=F¨a¬Œ"g ”Tª:Ð×ZÐìõ>p"„¹ŠaÖª0ƒ°9‘‚Yua~}˜ëf=.TAê ÍØ!ѱ{ÀÜ /óÄÚiÏ,ÀúL~¢óQÏüè'z啽êìàŸr\Çs|ƒÈ‰ªSsêNS9J)­\å)Ä=‚ÕTQUUS Õ„ùÑ0OÌW3à Vu ¦³QÒM×Ö0Ó>Ìx3ÃüWAê MÏÉÐ !žçƒ¬„ 3±Wé©5¼¦ã©Ò []P"é A+ •(›uÕ&±,cZžm̸.øŒuAÉpOæ,ã!s‘ùè‘^HGà_Lz£J:¤Nú¤iتh µådH¼¬À…üDŽ6 O3®†¯ÌYäm¸ hJ9L&6ÃÅ|FN»–×Ìmá7sÜð¼4Åxa½0ÙO01fˆÿ霜R2ù© æÉȦƒ%Y&%?-21sø(\¬žÃA–̌ʰÏ-Íá`8Ø´’:ËAäK¬È,3ØWšâ_Å -ï4÷„ÂÁ8XÉÉ11°d9¨‰ƒyqžä!kƒú©üÇqðÆNieoöFu­µ—£`-E“õ˜wz© jÑOÀ Mµn£"‰{ÎHFù§FJ›^J‰)ˆ“faðL-QÒçpÏqɆZð8€äZ£sÍAD€¸A°ñ¿ -ˆzÖˆ~#n’)T°4, -ô |2,|F\©”`åÀê‚5‹VSÖT,§‚%†ž‰‡.,»–â®Àb„õ -˲ñ¹œQšõIÃËs?׺Îè\!i°¨˜ˆ‹c.‰º‚A©sðÅbR² -‰ˆ ‹È¤€4p¸$@ãgsŒy&'Wñ<·Øʼn¼Ž1erxN+”ÝÁY­çf3›O™Ñ3?§˜tnùËܲ˜]üM³øÏî¤ûÖIϻ陓^½&N:È -[؈ -‚¦éǕ̹’&Ͳ3Á|â\6a]˜2œ® -LS£D«Ïi I£n;4hÝ€ômôlhuAVCˆ -8KupššŸÍA»‹v ]“¬›DdœOBÂôkÊ:6mÞ±b3~.÷Ø̲%®|RÛdäñŒü£ª/çt9§Ë@ê”@jîŒ~ä|ât–>n>ÁìT'‚ºùÝL8wùÀìŒÈKω¼4F^D^5Ï\äô OJËMJƒØTjU{ñ_L ›Z³î˜ 8€ž[ þA׌<®:yQõÀ^äéÔ#s¡;RÑÅ qò_ƒ®&^hõKøȺ2ÿâ¥ÍåÚËË]þÄL_%û1¤ÿg×LS{åÒºA¨Ñ -1±F=å¹ Ú¸ è0Ti7}MŸœô-à)h - ã'4KÆMŒ“Ð gÐ%'Ý„*º|àiròëØ£C_]™ C8¼qàFa› Úò![dB¶*‡lp51(¥€&îE*H&JF$¦…" #Ó¢Á\ã…ãÛ…S'o­ -¾[~œ^VÊiÂU0Æ Dp]pûæþ]µëZ8„ìŸë¹—¸×ÿõ˜Š0©J’§í äCŽÉmƒ£Ž;JJ™Ðƒ?$‘$²© I^p0R'­Õ4!‰ KkÚСUPŒ‚QJD‘ -Æ*KŠ£>“æà}# ` „)Ù8™·$ï“jªšÍ8‰›!r¶±3m*׌=Ÿ´èólú”UŸ0ê9³^:Ý®ŸoÙçö’µìeÛgM{iQÛsŠj*$E屪R,k¤!óWxêzÅÙUÊ1ÚvÞU=õšú+ÙOõS®Æ)WsþU²º}öR§\:»ò{ÿÆhL\ÍìŠÜ¥ì¥mÆc2ëá—lbKr rEöŠMR$»ª&AR3I’ºÍ“6J˜/Ér&ZÞ”6Õ&?æš*'Q}²ÂœLÅtjhRªœV5‰UN­rzU®zîjHÂÕ$]²áhŵM¿²5‡«DFͺ\‘1ðrUÌ¿bðåbç«a¯&_%ò äSÍh3òØC`/Áx -Ÿ"•T8ËRx„hìP©£y‹i¥Z"÷™ÿÐl¡¹BC…â„« þùfdZBÓ+ý[aƒ<ÿš}Žˆ1&ƈXÛˆbâŨ.8$Ö6(nPP\Å€˜â Žˆ=ŠK´‰‰k´*¹ˆØ+MÅ5g!1Źˆ8¦E±g"b‰‡q½UJ dBk8%®‚’¢?×ûÕÉJF`!Ñ>*SÑW!›ˆØC.Œ«RÕ›5o`ûêTï‚ÅsÉÖÕ@¡…Ûf­ò“ÔaMê¿„jΕóù¹Ø’;m.ÅU ¶Ø²iBÖº)ºä²K.¼”ÒË(_ôY2uŸR‹©'ê1ME¦)Ȭ‘¹ÉŠ@#Ú7áü™O{)à\•Œs¦ÐÓÆ-ŠÊëä¦Õ($®³†î:l첡ÓæÑŽ&×M¡#÷­Q"—µF^\•¬mL®mH²Ó둬ɫã”Ôv²sW%k³‹Ç(ûyyК½=ò÷Øã“дB~{~!)OŸ<×x€à:ÍD +ÔÙhÂU!õñ¼ +I-£ÛΑ;ŽÖÉ íe&±é›‹ØtÍEt5iM‡/PˆMRŠðWâ܉qÞئ³+Á®LDÄ,ÕÁ) Κ¸¤>5©Pζ8uðóš”bl˜Ü {‹UJ7V(å›\ëÙ€t­o²?¬oµñÿ;àY4Iý6ÿ±"®g7²‰ç€3©fãghÒÏŠ=º%Ê_Öº®’Êfo'¢lfÈâOŽ’g•¸&gJÑL5I¡7ˆ E‰¼2þ‹­†iýø”ùôÈáÓ”ÿTÙ6š íh'NF‰ñÔVUÝƆv[Â’Ù³ -m,xzÝåtÝ`ejƒ”B¼’Ùèög6ºë¶èU6F§7E«vC´i‹„ÝÒTðl¥ð¼úäÓ*”ƒ(,™MÎyæ2ÚîTצv©9÷ŠÍé¯ÒLöKÊ*6ïÕ49/—²]³eÉR—˜½n©JÑÆ› -i:iÏ‘¦'/ 9ãÍlœ)—s„%šœÉdÞ®žÞ]”98‹ÿêîé*mSP@üW“ÅT¥ŸUäë š¦ðÄ)M•d›Ð²MÅëtñftÕlH×$©K‹»O~ jXÔ]…£æFÙáõtô3êeVÈ ˆI7h…²âõK°‚4%Q/ÕHÁF¤ZQ¡^‘õ½Ôß $ÎuNª´Â©—;uyæò'¯üL\áÄ%¶Æ3›N§?Ì Ï†ŸcdlâFÊú’=úÁY(î—œO¾›vñý´™µšœ‰µÓ÷ÔæíªÍì«•¦’p§¤árûk’‰³G„Hêhò²(_ÛØ>¿ä2XYZjvW¨Af~r[Èì -¹S»BÙ~PlvƒòûAµl?¨$ÛAv(ÛÿÉv}d[/ôuØëaˆ½! `,±ÇÄÞ“ñ¥TnÉå/¥ÉÕüŸ­ÎñÞ'J`ò——¿JÕ1“W0s…s®hò*åªß'¯Êœ«:÷ªå¯’ù0?ý×8åjæ¯ÌÈâ²%ŸÝ4f¹ÎRËš,“CÑòdVYqF¹V²)e9×fΘQ4#1 G/µ(“Mæ`E¤°¯žIÈä%>øÿJSß›öâ¿úÄ•ý̓1BT‚ -#ĹÎæúUî)~Õ„gUšï\Q–²ió’®õ°òû‹YÂQ˜^Ä‘æ Ïʉ ¦9‡êéØfNdS²aMÒP8“‹f$’‘8&2º(0ÚÉ3úŠ¢—/FùKäR51Kdb–,^q9H¥aƒ ”L„"ñI>:ÉG(sâ“6Æ¿( NJñ‰gÓÒ©h“¶6Ë<6l³™îl·ÁdŒKdz&¯™?öX*g^ÕS®ù¤™ë§ -ÿbÍÉ«”}l:ç^󖸚lSZÍ…®ÏƒÐ* g~öbU½õ\U/×Zz¥‰rK[”?UÓ›UæOVõ6òA+Ŭ^É­ù°U -õsjzý\øšUõV'ªzs¥ûR×+•½RÛ;]Ý›XY¯ ´J&Úåx‹Ë}9êâ¸+äØÉnF™}!»c“m=T2¡YþjN_yEŠÇHÀŒ®ïÕRQ¨]~¥Èšö£O…¬90)ÝÖ®¯ã²ž{ää2Hèx -ìÆ -Z¨lªÆ¾ê;;! -!$4Ø -,¸*Á£Ö|ˆËà¹ÈFu•Hi”¾ï‚o!¯X[ó|'¦·‘…Ú÷ðudl0k¡ -¼²­ÅQî°Íeà(±‘òÜ;á¡ôˆq­…^L$qO/$Le†;WLöQÝÍ“ý8V4“±§AðMW/Ž7Îúê5æ$ÇùGTóìV¶ŽaýE±}Ý÷¡÷î¹n9_5·h‹TËmç¤;yNiVVËsJËsJËsJËsJËsJËsJËsJËsJË3-E;Ó²œÓ/oN—ç”þ“sJ‹œ?Zô,ÓGG^zNä¥ovŠ¼–Yâe–x™%^f‰—YâKf‰—û­³ËÚv|Ñû­Ëª¶eUÛŠpYÕ¶¬j[Vµ-«Ú¾¦ª¶å©Öå©Ö3,âáÅþ–§Z—§Z—§Z¯-Âå©Öå©Öå©Öå©Öå©ÖBœj]¾ñoùÆ¿åÿ -ŠpùÆ¿ê¾|ãßòË7þ]‹7þ½ýäç?>÷Ù–Ït¢§'š®Éé¯"œ”[¸Znæ7fU0ï—gºüM¥åY¥åY¥åY¥åY¥åY¥åY¥åY¥å¹–âkYÎé—7§Ë³Jÿõo*ÅzÍuÂpÎY$¹3ùÛJ®±£Í9á$wΊÈÿùÛÕÕ3~î¸|g+ÒA"¸ÃtTÞùkœ ÒaÙÜ€ î”JúþšFŠþ°²7&J9ñá”ß| ¯OàãŸü»ì•Ÿ•ßþæ”Û³mørLÿ5XÊ›ðm -óÌ¡oŽùo>¿à \;…׌{{ƒ/åú˜c7 ËAÂ|ŒyÁŸðƒ˜>`âàMrƒ9€ÿÿ8¦Ù«ÓˆÀŒNT„àÅ8Í*ejø‰:XSž Ó 2FO˜Ž×<Âì®×¢ý¹0é»9ŸŒÊ¡iµÆtRíÒÃüµ(vW@›9«×¼8`z¥ç,Œ™'ðX" mæ@ðø Š}ºé9–ë:-‰”­‹4ÊâZä{*òy”:ö”¶‹þëá0y CAì¹eàVù,›Sk¨¯ 7#À kjLúnÎÁ7)›^¸†¡Rˆñ#~˜‹ÙôYçdÜfèôú2aƈ Г¥¹Ž ù€F²\לÀ ü0ÆZ`ì…²v- êh»pxÂÜv)ÄnÂ%R,êŒ5f)`¦'I%2r†T/°|—´eáa{ÖÚhÖSÐ2Óeøê,hµ(?ŒPk‚@å±¹Dú›L@ha™î¶F ÀnÈJvYÅ0ÎÖ‹Ñ}!,n7ŠscbV¡,N¥\i«e½à)¡ò/¦m6_,Á KN{V`#…,ë 5 ? Œ%hGAkûûÈŒ ë’•u¨Ð"ˆWÖ<,laÙ˜¶Ž »<tÃÐ<Êu4te†Ó³"…1Ï èϨBFÑsË‚AEÏÀбkTz΄ýTüÈâ‚JgÓ€ñ¥qâHæƱpÆQoh=%‹ñ*Y±÷‘¶^tæPüˆ{$¬0HŸÈf:žÕ†µ8¥"rÚ.ï—J$Bži‹§&„5ìøEd2dr1õÁ0¬±VÍ‹Œõ0è-¾ _•?ûmŒ­!/XðÆ¡g£‹ÁÁÍ Dì=Åš/¬·ŠÄ®já-€£ÐÏ Œ¡'¬ñÍ„Žu"1_*ŒlXÄ™0þ™iWž–Q|ŠõÉæÆG-(ë˜_6@°í‚À ŽB |‹ q'ç`/TaæŽ1,ÒÊÍ1‘–)÷ÐX ZßQþÔÔp>Ë pY!â“Àüˆ3¥"‹ P¢'|ã[0v•° €QK…eGètåx‚€u:µ -dXlSèDâò/hUI( ËS6@׳¦ÍÌ9#W_‡Æw#Ðó=ik¶‚Ì}{áŒ0‚m ¢ü:5XcIÇìÐz¤@-åÄSŠ"kb;,-ÊÚæåìÇ’Ó–ùò­C3ÇI†Žõý0ª‘þ5"qÉk…É6š'¹â‡qF€¤ëÜ5Ùï!¨uóHÏXpfsí`#ëççX˜¥ H åa4ÄI -ÛÚa -í(™AS=Œ €ä-aâvfÉ€%’X‰'ÂûAdâdž°,˜“D.‘O<0³ÇE”$Æ52Xt!̨Ú‹,$ËÊ‘jm£ q,ËÓäŸ$é:Ú"PBão ÈÅ¢‘‰:újSk'ü¨=‘š5yp‹ßðþmþÁ&Ù… ÌÈr2Ý]Wž -ÑÌ„dTpLZ¤9Ìfí¸hzT›šyéf÷Ùñl @û,»)C`%5!çµè [DõxvSuzÛþ‘#qJd­¥§Á“¹Œm#±5'm±%H¨1f¼øÎ1+â7Q]»dÁ\ט Ÿ &üÄk­Š¬NñQÙÊ’t8…„GBKo`F商2qPšR>ã**3x¾I~ÀËv+­ |/GX™˜œ›’ÒX‡¼o|× A.f"Ñ6ñ6¸Å|Ʀ´¶%vâº!f,c›'ã ¹B+âL¢5/Ð6”L¹6I!º¶BÏårDz®­8ÈD<Ä ¥èü@ ‚H‰;¥DcC$­ü(›FîÙœPnÆ¢œ‹CÙVJ^mBd²T¹Çn(_¾CÉe3  %lǶvÊ('iæË*ÅèaD­Yš„XMåcîo(Ók×xÄ;‘ ,Aä*±;Ê’dY^.¤ay6ñ ;ºÔ6ð¦ÒØVIžYòçø(›Õ' #ˆsÉÔPLtŒî¥ì p܉0%i±8“;Ö{s•ð;v›NáÈŸäKäŒ*Hú{Êö½Ø4Í*cÑ´èÕ[¿Av+,å?ï. 'FŒËN&jÖîåZ%†6â#5 æ—i±šñ3°”Æzœá2(Ì2É ëؽ5ShOOr[–‹fÉ`ij$Ž‰«c,q¨qQ0*ÏOKÍ&vžˆwé4VÎk1ÏŽÄüQÎÒI‹7(%ú8"“øò¸Ñ m ÅMÚ&DmÓÃB›¤¡ýwÒö%¯©7G°$t<©OE`¤ÅÉ -@ ]+¶4%v>a•]eÓóÆÚ30…©Íž!Xe–‡w¦\>¢7ay aÈüië%»¸1MéxWå6O<“ÑBZͲDqd8±¤¼“úqñÕ|¾M f@»Ámˆ¸Çm Ö‘oÙ%û?ÆÍFX›†™ÂqE¶œë‹hT‘ä4%T XisnB(GЖ~‚¬„Á¤ÿèI C¦…\Åœc°ëÈ|eub¦Z'&ó ¨(h<~gwúYe!PId-჋” ¥D -ÛÒYT3 ìñ¹¦RrR±0Jk­™ëæÌ4E@ ÌåìC¶%®›³:YÔuíN¤ÇÅg ÔÊš¸H ‚,%æÛ”"ˆDeKŠÞX¾`¥âI¢JÙn®ÏE+4Ú(žRåH—Í‚“Ò¶#ð%w¥é/ÙF[@@%Ûü´ÕËýÍ.v”Oz¸®-u3 C‰%/X9dÃçf‘ƒ” Æ®oësÌ^!÷Ǥžkv8Ü€×ê„S@/J‰, àl?Zú®¬•õ=©wqÄ”º˜ú³õÈ&á€ýY†ƒcK»\\ë›»y’[˜0çS¹Ê(8<k+ÂMz€Al÷¢%s‡MÃPÊ´åØ5¶•@N$X³ÒeÙ F` tQžAÐf…SŽèè7ýxXÆ%ÖžTG±ø>.ÖoKo`6(\Üa‘³7T”Î@Ùr6å㌠²gÌh7 8«iÓ€39¤Ä‰Û’ds‘gk蹚 0»Bšg… …e®Õ!Xùr2É7™Múö$˜hTôÀäÐF$Ì­­2å¸Èš,©fJl~¼ pT†@45–v‡îíY ª©JÐ|ZEH} P 1²»BXà`Ø…/rÈŽ¢b™_)¸Ô’ªÁ¤9¹l€² ã8ëoO“Ðæ…‘?4ÐX«Æ@Ùw×¹ü€ƒPªÛÉe5¨¤„œ²"¡rNÑϼ£7Rü™‡egÆÌqZ ŽLwnxJ&u”óe樛Ñ)f -”Îz+'ðr¢Å@˜A3¦€‹ûIG(9‹a+V©­=#H1­²n©ŠÓ()³¯†-•›éDíÊt‹ÆØ×ð2Eé˹Am3f¤=›ÚMÖ¦˜Wg:1´Òísî”™Ïä[#¬3MçÙÚü ™Hf.:›²)ÔÞhjY• ?É°Ê٠ɣº¨EDqÐÖœ829>xÚº®ÆýW¬`èÇÂ[ªboÐ帔ø`ô¡,‚8‹µÃ ’±ÊFš¾è?¸¦&BUYoÄÒÂÓ# ’¬‚[s­·àÍVžì­0ã®±B˜Y0VXñIIXHš\Ûm8Lƒ˜½ä‘ɲÖçPì·Ù©RXiÛT N&°)"ÁÔWÈ -AI¦ôLi á¡dÔ´}˜†`NБãi´=³ÊIE_ô¤=¶À©QWðªHò¥¾™ªbJت@è²…O˜ò5Y•¥®\{ œPòÅTKa°Ê¦%î ÇCqœ‰@|—·c»ágÒߊ [íæ ñ]{ê¼iÙŠÅ[¨«¼CjʆŒ¯Ò¾kl6E;²™êÏEqrCvy%URcI‘ç -´ ¥+hmî ÷”}á#m½®Òîs&4âéá>µ#Kij#ʳ•K@ƒÏ†Xyö(€’­HÜ•ïL­S6`7æË ” ÀÍŠ  ¡¡•j¤^AÎÕ(Þ·Ü4`"ÝÐköð¼(s8›vÏ k&ŒS§8k¸JEÙº dS\ÙCj*Ûà¨EÀ$’TŽMã:6dÁ*®W•RZ™ŒÖì(0Ô2eä ÌAGJñÅI‚@9‚@¶©ð&vE¼LPdÅEŒ ²± †Å¦Ö-+ü™DàxVºDÏQ‘H=mœŠ«•e©êöPºcµ=3Ã"ÒAUq²î´-5síÖ­²þc\ ÃC.è¢.‰ÈËbv²C"Šk36 Ø3'¯)À -bÉ+~==/0[.ÛPVÙˆqöjE‘”)kvb‘í¬d>²ÆYñËL w(RD;\® BjeHŽ‡!8–Å¡ÂP -Î¥¬O±u7À0 eÕÚÓ3Yº)âêvÉàZÙ¤¢{SÖ 8eèY3´ógŠî}aÙ& B:o+_ð†ÊœÞðí&Åužæ€+߾à ƣl‘…šú|Ÿ€c3ßnÝ*~#ðìS•U1Ë™]ž9¤ò£²qc'·ì={,H"+|À±;pŠ7H¤¿œ‡Çýõ(–¶Z æ\iî”Ê’Lv 3úŽ="ˆù)#FNn²³­xÞÊlF¨ìt’c+Uv\ëPDñÒN7!ˆb[Õ¥Ìö&ìòÅ›joÊKJ¨NÞvwÌN‚qø”c¶i x×m•NÝI¤Ä×G Òg«žNj†²:¨ }•Ïüšq‡·U:-;€Nî$<7ç ð¥3,¡kk{67ÌŽ2;|ȃ›w({¤ŽðPkOÞª ‡{Ÿ°Ú±*μ #¶g®”=€J ÑÐâ9Z“4vL*½ì!Ñ2!ME™“;xï±ÙØ;²7‹/ÍêǾ; ðí)*'+G°x¸Ž=Ø„@“ôµN!ˆ¬2uìÀ 2¡¼ÃɈM{0:¼ÿ!`íÈ<Øwtø bd¼!="PvœÌ¡ÆW¢P‰ƒ¯…‰´'vÙƒÂWã˜Ú-';fùA^S;|šÚ÷mbÊ‘TlD›y£BI"ñ¹äÔ3᳚·åÞµdt!ðb[#c#ô9ozE¯#Â÷é\ò@kó’$‡]nï’”ˆ=9NúÇ´tåEY¡ ‚%a~`ß”¤#mD³¢çŒ€ß”„ádØÊhT¢Çöí‰S¡Nù_[œl††@_ -c»Éêl –´t–¿Í -¹\S’Å-m‰†›W÷²D•£HÕx,QòBš¶a„Çï<p(Û1v:W¡M9îh©9pÙ±ŸÅ»ièäXA™Écm9oèË–LèKé`b (Åë¶Õ©æ ïéÈö•Ô¹Í fG&A™©K‘‘‰c« 1`ËyÝФWé·¡¤L"°¹\Ú˜’m³‰‰ÏŠ¤dÈ·[`SÏ7Ã"ƒH -ziŽ¬d`¡#5Ú“SÙÜÃ8ÞT1ÒŽ©DüÙN¦ lC>êqm'% -S—qåËU|3(L …² ì؈üq§‹hü¬"Y6:0;`‹U|©PòùPVBþì”?HÙmÿÉQ±ØñÙAÉ0“Ž;6`?¶G)Ðác‚Ù«(C°9‰ÁöÅ^.ûPÇ,ª=;ljï!°5hòÊ„À¦-óGam ËŽq)£ü¡U³7gæ%oaœ;WGŽù±€cûî<«°)àH2wôis>¤û%¿ò¯ÑkO¼ðïc^¨¾µóêa³Ó4¥uû±|§´þæÙæó~;…7x³¼¾3‡åÿw{poÿÁ7 Þ,ß.Í¿û>éŽé¶*¯?î&oŽ>œÐ½õÊ`|˜~hº;ì»i¯•þÞÈî·Ž:Ýö íÑýz§5êô{É`z|Œaýe¯ÓÈYû1ÊrF;b}e#Î5YtöÇ£tˆÍà†Å˜£jÇÝÑè*E2úIšzãã­Qò›-D—.QùáO¶Ÿ Óæ ýk ¢õaAÚðÀT¡È›"b’Âá¨3jívº Ï]¯¿C} -Eã·Ïjz{JÖúÇ'ýagTHØé³RŠ«)hè·§¨Y˜þxÐJ’“£N«`TMÕ?Iɨ?X´óxðÓ“þœEsaÑý»Ó£#,S”㬊-fð“3}”vµÜ…#IF?IÓÂF­XÄ̘±Nûõ}£òx¯Ò=9JöT¡(Áßž ÀG‹ZäþþŸikTí{mhTíÿS( -'è™$õœUúþ9G[®×ÓƒòÆ2ÚûTÑÞÁ w½û¼ß.ã½kïy…"êªã½bY”e¸· ÷>ƒ³ ÷–áÞu–á^±îË„{År=–áÞõ“¾kî=LÆÃa'éU»ãÿâᶠ-Œö™ˆâÅüÀè‚.i¨B‘5ëð Gízú¾“`ÿkíMp¡`ÃüÚ/ž>‘Qý–PáTÂìÚi/êokÅ´gü­ö¢¦»`„œgº§üÎIÚw“Á&:Ï0úÿÜhoõ;½Ñ¦ < -§uçU‡§P¢0#Ò‹Jôª_4Rþ™&åßEIÑ…›–¯>q!Ó8„ÿb|Në¥]¼rŸòCwÑÍž®QÅ«­~·?¸ó÷çn‹Cž!fŠÂñà i¥;­daB‹U46IÀqÆJÖú½á(é-œ#+3DÌ'²ñÏI¿—.Nd±ôë,_ÎnÉ«èÝ*náã÷‚Š8O_í.Зª ºÑVÒ9O§_3mPÌ•³ÜžCZ2茎ŽÓQÁèÊë…ŽÈíB9KÄ+R»ýÁ³ýSDCt éXˆ(ÎÜ\.<*Vô}YÓZ,j.›â)– -Ÿ5G4€E#§,Wy棚øX(ª…Æ é»ÿø•ù‡'½ÎqRÌÒÿƒN·»p.*Mÿ-VŠG?£œFÉ`á -îßɇs–˯¡˜€IºFýk™¹ÁaOe¡Ï«EÍ()ÖÄÐÀ§ÔÊ |-‹°yàS©4üÁ•E-G±¦Æ }’oZÏúíEÝÈn§—&Å*“Î(˜¤Ì6|Nƒ_ìˆÓÂï"ú‰œ"fŠÒv»3ê¼_”ÈAJ ¶bÑgI˜"­ÕϯÈåu{£,GÁU¿‰bñh©Xöî²ÑR±¨¹l´T¬ØïJ^ÐV,;þE¾ máµß*Öd\r팚e1 ²Š’e1Ì—U Ó*Ø^Ý%uX±¨¹¢b˜‚½˜hù›‹Ër˜âù _u9L«`ûB—ÔâÅ¢æ²å03J—)‡)äšÿØr˜b9ÖËr˜e9̲æ“ÌÍ夂%/iZ‹EÍ%“<s®ºF-ËaŠïy+x½¬z(5—UÅRvËýŸåkõÎV: v±–éWú:½‚m–¥³PÄx\¾åj«Y.ô6CU°²-ßf8½#\4r>îm†µ~¿[-^Q÷òg^A¿X¸|iãç4Á_ðëþ¿Ô÷i+q¶àÛ´>.‹sžªÓï‹#l…–m©Ñ–m1º‚B‘TV,Ž,5ÚR£}–úç²»Ž -­XÉgUh œá¥‡¶ÔgK}v}õY±Ü‘è³b1äºê³¢W’|ıÊ.´ÇÿiÖK~Ž÷ŠÅå²)̲ %E[6ÅâÎõ\6_Æ›´éqÿ¼WšàMZªUeµ¡²òá_§ ÿ߀Ïðß ¸Q.©Y¹ì×ðÚ°Å߶¥ -öN§9¯ÛúÊßP5<ÁwTŠ¬«|C[”íóTÎòõTWKßWòzªIe’&£úª±Ók§^§`Ûv92¾Î³û…û]óK¾ý«hô|5?YúuE»ÓG_OúÃN1ê‹žJ^ŒÏéRu´è Š¼Ùr‰ßö(šº»ôÎÑy¤Æm£¯^!ëàÞÕh„"šÖK¼Ü¤¨êûÒz!tFGÇé¨`Êû´måwçTzô0,{Šsöª²lQ±ñf9‡ÓE%DͲ¨‚+˜hé ÚÐåéêKœ®.¬Õ.æéÒ…ö"·:ÿ¤Ý­nòa¯`,ýšû-˜òÎ~Å)ûÅÒð9 -–ÛÉW¨,¿òídtÜPÖÎFñ„~¹…|ŠÏV°M×åò4I_ø-·? }Ë-äår±Ü§årQèYn![ÈõÎÁÁx˜nâ[•€ŒegYóu‡qÒn·ÿ÷Æá M{ šÒ °ƒÃþÆûN¿›Ž6i{£?Hz‡Å¢{ßßÿy—ñÝ—ßuYmáëú Eæ2È[y_XWè6Í›> ç\%ÿvŽÇ‹¿W5*VÙŽ~’íir"(U¹á’#—‹°¤ÍÑH¡ørÉ°¾ˆ$]öb‹–©˜Ò`‡w.ð›VÅz%ù$óäï"´«p`bü“¤]ÄMœŠU Eâ4Sqë„Z¿GfúZNâ rPvNÒ8nƒeÞi™wšvÄ1ËÄy'“„¢ôÓ2ïôy4õ2ï´Ì;-óN˼Ó2ï´Ì;]û¼Ó‰ˆîù¿‘óÙÓË$ÚW•D»PÖihâ«¢Ç[fžæ:É…¢é¬Ô“ÈÕESÅZ¥³Ţ²ñÏ ¸‹SY°yœ¡â -rmŠÈÙDÛÜ•/ç¸üuÓ÷_óaù¢ÎÕò_˜RèvF[Iç<óuÍ4B÷S/£ Šü‚ Kêƒ/õÝÅrf—ïÎ(ÚÖè%ÞQ°¹è»3¾<ÛY,ɺ¬ñ,®ëùñ´^ÎÒv^M½´E#dùÞ©Ol7¿Ä÷NÓZïœ:gõ}ö]Ðå;§N¯h.Üëw®õ;§Šÿî„åû -¹U0MÒG¼o XZøïxqp0L Yt¡ÅÓ'2P ÒvñdîË/³hX–býæ%{ŠsÜ¢òÏ2¼ùÏ›‚k›âœ/qVŠ¾sw-Ï£¤Ýÿ{ù¦ãÏu.C³eh¶ ͬ@/IËЬàÎÒ24³´D…"ä¡YÁY†fËÐlš-C³Åûw§½øABÏY)KÍà'%ù(=ÿgF’[0’dô“4-jWW•_,rf,ëERÅÚúøêRyRõ‡ -'€çyDMjìŽûãnÚký×ÞÙòýHŸnqͼéK}KШ¿hâZ±^§ŸŠ~¡Gñßwt0è/<1Å:ÑÌCŸ$gùº£oÀw­ö–!_áNr_uÈW,ê–ß2â[F|ˈoñ-#¾eć_±2²Ëˆïú‰à5øŠþŠˆ…kêŠwürUu…£çJ^wQÜÓ§—|áE±¼/ò… «‚¾Pœ ¹¤2(øúåë; -ª¾Þ7+6»ýþy1@±µXñ~›ý²ç -GÐ|½5}XøWjPÌøg6ïìw“Ö»2ƒú'I«3úp§h©_CÜ”]t= éÍ µÂ á×é,šÅ.8y—ª¸/ž(~­ÙìI}Wç_ÓÜ4¿¢üŸçdêúîM“^¾¾*—~‡º`çJf´mòoçx¼øÖ„[¬T±ý$Qir‘÷uë´cnøŸä¸Ì",)äoê^ÎW("I_~î`8$­t§•,VKÇL0Oþ.B[±Ž°NŒ’´®±ÿ« 8j–º¿Šö"‡i2¦òA¬jýù×rgh¸··c~þuéî]‰»W(ÉXz{_¹·w!÷¨¨?½t‘®µ‹$bu­mì,ó‰lüsÒ屢Y,M4KÅWâ~)»_´¾ÿš+¿‹:WË”ù¦äWÓ 5+—ÕELü]F\§b êƒdЧE{[S^/ä©{wÎYé¬\»Päà°§9§N£¨„x3„œ84ÀÀaO²¨v+ØŒè¥í,Ò|\Öv×óüxûYȉZšÎ롨—¦³h„|¼é,˜h]Ôt.¤qÎ ¾”ÊÊ‘…k?+¶Ì—ß™»Àl.ßDô©'õÒo"Ú-æKu—¿ÿp>qËWÐþ÷4^Åï?wgçÂ9nð,Fÿ\sý~,Dg6.­ÙÂ@†ç×bB±/¼v -j®f³4€…ÍTÙ1×¼OR(’…À iŒ¢¿¨äB ¬°Qו¼ä£xd-_ñq=^ñq¡Eô¢Ø ŒK.¥ÂÒu‰—c¬+ê¸ÄÛ1V‹¥ .üzŒ/gÏ)Áµ²[´Wƒ^vß±àêí2ÛÅŒ/–¥|_ž£×Å:ˆ~I÷ °jïJ\mU°ß§½„³M–Ïì’Þðà3¼â³9‹¸’/e%û³ó’l4ÊWIßèr±¶&(¸Ø ×@Ê.¥¬R¶–r±èº”œU—rVL9S×X}zGô XÿfgP¬™¿¤ZäPî«Í‡pþÚˆÚÅÎ5óÔÏÇ'C -«–ùeé%« ¬Œ®ª¦ñ£5Íp¥Û-W2}µœ¹Ð¯?ùûi—+øõ§¢‘t¹_ZU#çã~ÿéu¿ß>$3S˺Ž¸àÏ?­T+g¯ÑkÛŸB½çýÞÐA/fYep5=ìôò7JÏO‡Ç·v>ï÷» ̃Aÿï›%§\ÿ¿ù»4¦Ë)¿(9kQnPvÖ¼X^ 5akžç*7„¡‹å7I)+{ó¾<èï²W~V~û›Sn#úíÒª¿Bï ¬ÖüÈ‹ƒòq -ׂÀw¼òfIëµnÃ'ˆ`›Y«Õ¬Yl“¾ó`9Ðô86K¥•=˜ÕÑÄÄ­ìÝXÅQà_N/T«•Vk|¼ÝÙÄþÊÌÑ^ée).߸Y~ózâÓ\Ì"^0)îÌz:èáÛƒ£]#c+{Ny½Úïw'Ûô05ñpÜi³„¬ìù³ˆ¶aŽ‡£.CG#”QeÅ¢ð1Òñ­îþ}AªDªÝßOËÕÁxxT~–ô’ÃtP~1h§ƒ›gß+óÍZÒív9T3-wëe¿|2Z+7»ÉhÝ4ž¾èÅGÐîfyµt#k\;J­~Ò]¿Y^ã‘iã¼bzO6Еû&V]úpáB‰éæú¯F™çXnˆÂ­›¸¯°^~ÙCuÙ6m¶árÁØ×`ñkŸ>hå1}ð½î–i¬|µ¦sõ¤ø!Ÿ‚Þ˜ïm;øÃÒúÓ^ÿï}AÓPéÑöás  5óNçø¤›Ê]VuAùpa†íÞ´KëtÚ -4³ý¾Ù§–•žódP²*ŒHÉêØæ)YâöYJV95Âú]‹Üø* ŸÞÛñ­Sj û«ƒ('^™4ÍÏâxÖM -_u†ÐPˆpÃÎ(i½»†j2ì´òÝýwéâý5Ý辘ŽS†Hï¶ÓVTP›fˆš”/Àp‡Nl.—Ê7rxÄŠÃci*¶’Áheµ~¯=îŒ!*åòs45d×zŸÅMk½^ÓÆû´÷¢Í*>"cñ‹RV}Ž×Ǻå»E½ ×Y+Öý“²¬u:µ7°!·[K:'°rXwAëÔ¬¡¸Öw;£óù$©–ýn¯mR/Ì·“¤C9'Ç4h -rL×ÀsYßNhsÔü‹0OüÒÎyl^‹•öBt«Â( 4jð@Åi™8ô‚P˜~™¶º<æ5Ï—!áOaŽ# v2x7MÊût0:eÞ朞Íj7íµ¯Hx× Ù…5Aƈ¬ÿ©4•Öÿ¤­1Žát-ý É¸;úílC2»†¶/0ã•…­Ÿ:ŶÃYásMùVÒMÁ[¥±oí/>Úoóîío7‰ì7ÿ–¦á¥­Ö,_n¼¦—jÒ½ ,˜N0\‚r-öOáU £ØŠ6Ü~X-o§mó'¼YôØWqà›±dmI»] Á¨yà…¾Z|ùv)„–Ü̈½«ò]ß T(ÄÖµ‰4Ž]ωp°¡±Ž ãr«ðrcωã]º0 ÂÀ"kû |öÞ(1ÍUÅä½Ä¾£#Œ#írБĈɇO. UÇÄ5å=»å‡÷ܸ\½çùyg&òµRÌ?ì­±»GÞSžT†i{xOG€Ç ,žžéÓ¸¢Ð"Fäù€>¸v@ˆôðøæˆ|GiØÛ cA„iŸ DDšE„#Rð/`r,&7ð±dÍ׌)wI -b¤>htÿ\ÁäãpˆÕ{~,¢ø¡KS„L94˜`˜(É1çèœß“F.¹Ä&×`‚gUŒ)Ö®« RæRâàf)b7ÌQ‘¯=‘ö(rbÓGˆ Í"Å\Æ8~,óï9H[Œ# -QÌ6L†• +‡>j3†˜D4³‹1ùÄnõê½Ð3ˆ"æŸeÅ¥•ë ô‘û/,á0}¿:<–ÑÑ°­$ Ñ9"ò.ã5"Oza˜º˜Ô,"íËðêíeºFÆʽƒËæ‡&³è»1arÓ“Ó,¢«|žY<¡(O˜.ƒÇ…e¹eZi Œê„.›·Àa‰s±#² `jÞCÒb×Z®0æñD®ï+–kMŠÜÑN#$b%•gSt„ŽÅ™þ‹]ßAI€%©ÃÀÒí¬@áa ±jBµ»Äy­Dii'òyÑêÀ#uÊ‹Ô±(‘žùbü„¬Õ‰IZ#Ë9ß‹P-k0C-t°B¡KÂs`ô…‡òbçÂGC¦\–¦¬(Ï Üˆ ‹H}Ù>º0"/°«Fs»yk‹­ÎpZAñ]Ò¨¾§=Z¥¾\ˆ‚¤¡ˆJ33£Y 3Ö‡JK5éÓŽDôx°ü -?ø ‰-‡È‹H­p„ØÆÓ¹yB%ðZ"¢45ê -´&V~‡H×N¨4~ FªÔ䌡´’­ÿô;I.ÒBL!M]¨TÀl7ÖѬQXTkcä3Vø -+t+ÒMž*x^¾Kó»Í”›*Y^«]ÆI\uIÛò¢ªî—tùÆf§—&ð7“v\=<žùÐÙ)qÌ™U«¥9= 6q5«GˆxnCœwij=N¦¾ð0õbÃ<ñlDlÎa•wþ'ƒtX6©ù›¸øz›Cü[ùäÔ®lÂò¥sª¼…£8,Ýxš³JŠ¢t×4ä»ËßCùîñ÷@¾ûüÝ—ï÷¬ÕãïâÔ®Eü]Ë÷X$ß ¡¸Öø/: ói«jCE‰/’îÝ„ˆ/%Û¼æLHJ-?jÓÌÉoš!šÿgwΦ¶Qøæé1ƒ¯÷[ãc•z2JpwH¾ÓÆÐúÔFÑôw×fLNN©­ì…²›Ô>é¬1È“¬QŸ32¹í¤ãdøn -”t;f;ɦŸ†'ý‘Ù8ÂÍ¥re<ê—·“!ˆbç_³¥”Û‚]Ù»ñmÛÐqÎúÊÞ9ÕG+{ñ›¯´ÆÛ¯Ó#8NGI˜zùœUuÆÞ'ƒnÐí¤´çþÙñÙÇð_rá”ÍøÙ%tê~;Þš•ë÷w† fÜp¹þÇ»0I“#Æ>çóÆ÷½á^k<õ7NiœóYõŸ`„†Ùé wÞ/FÈá°¨Ä! ·Ç”‚n¿õ.=¯  Úõú½ÓÊE?#‹dôsÖc2€eøœ8¶ý•2©âÑ—§âSJÁtA‘Ë‚Lš¤}xð÷g³€Ãn§õE˜?"„«±©2°4MYʆÏfFšg•w[6›,ÈŠ}Œ¬¬txš®ç’´ª¼`Í \·`4}˜ëŸ,BÎZT<Áûg5ûýø‡›éÁèÅ sH5ÏggÈ‚P5KÀG’þɨsÜù—¶–ÁjcDÿùâ»Q28LGŸ}[Ïj¯Ù'ÿe˜ù‘ásh5óë›ç¸Bß6é¯xŽPžˆYíõŸ-N¤S°U:9øYâFø”“d`^V}½TÐäàg‰ëôFé ›´ÖŠ6où¡ÏÆ'6®!YÙÀ?ehOIT  hÛÏË.KÈœµ;a¯×‘†™áÎå;3þ«ŠDþ(_óÀÿ3pûìÁçvCˆw¾­~ÝJøãpXmÿpÐiï=ê:ÿö{rÒ å¯9k:7%ï*›ãnW¶Š^ôEGƒ)“Wy¬TykÓÁû´¼›þ3*7ÚQ²ßévF&×µµ›O àã“òfÒ;'‡iy«2>1È7rméPKzï“áN¶”s§QU£ý~2hÏ{£øóܺW±f.mõÁ²l§ÝÝþ6»íèDÞØÂwm^º«Lï{kA–Wwá®Ú2ÍÌHe{Š‡2d³µø|F;Õ;Ónòᙩe^Ù ±ö%r&ÆAÏÞwÓÁdô1Ož2.Íy³Å%¹ä;pÈ»fÂGó®IôµAÿ¤2H>¸bèÔžŽ¬¨ÆåDXJ?Y_ÖekÔÏmyH%·‹µÝŸ df›MêP¼Ÿ÷ áqvyhWSnAÇå“ä$ÀÍãq7wäÐÍ -ê±Ñ‹ñèd<²[´Ô°¼ûÝqÖGù}ž¥Ã£sz8šE”Z¹­’Q -”§”a?³ñ»^¿õ®ƒ;ôE©Üxû,mwÆǹþ–Ówótž¢¥=`)¸Q9¹À÷]ÿôRÙ¼ŸÛ27ïç¶ÝŸ±ÓÊ=;éžjji·›éQåŸÕ®Ö‹I9_³Ûïämí¼úOkJy‘“¤em’| -)ØvÛ.Ÿ(ŽÔ «g­¼3Z>Ì­³sHÊÔÕ!hýùh©µê¹-³±z~ž6Vjšlt&WÿŒ¬ñ?£é6ý|[ç”Çã¹wQ jZN7Þáú Ò¹¡Â’žHÅøŸsúáÀ_%½Îð!53F–{Gž· ’­nÒK«”z›Efà"hvû'9§ñÇ6§#>äí쌒Qzv/šÔ‹wË٫ǽvúO³3ž3¾é.;i«ß“úØ'öºàö-ÎTyɉ‚pñ™&¹»ôT–+˜ë Ïäd_h0;|?×Ý;}ݽê¤áࢌúm^þg­èfÒJ+½Ãš©Ö§Š…¥|®Fž»¸dd¸¦Eœ?_¼…3ú§è^¼OiQÌ“Óõ3=zÆøgmõó™¬ÉtóYjœšæu³Œóa·¿Ÿt·Ó“qwh]š™°y"rÝI»’¸›}Тèb sÎç)mcìq=ß2{k¡ð©³n’S>°n ¸HÝN/- l›r!þÛJ0xÎp«ÞÄ£¿0Yù°n~[lÞRF½x*­^uZG[ƒ>frž¦¡—s}Œï…¾ÙÏãZÞLߧÝÙðsAC:=]b8ÕøD¢Öþûtp‚…“Ò!st'½3Þ§Ù‡†Û¸ôíÀO{B«Û9ß ‹¹þðx’i–)ãý´=Í”0÷Â<îyÑ«ïA*Á5¡ËÔÊy%*ÃP« ñNóuùÑî³Ír5i½CŸ¹×.çRãy/y^ÓÇÇÀ'²œ7Ûüå05í*Ã\ßé æÔ‘”sJjã´–ÙÕ<6èÙ§HÚ³ä×àÜXd¶ PTÛÙ™ÎpœŽ:óÌgæcò1«@àú]|aɼá<ãvZ~ól낽‰aí$ïqñü8E2eûÎ÷2Ž­˜õz±^á¼)<¯“óQòM/çB½LFBë õŠ¸W¼`§a9 ¨.ö É|,ú$îå£w¡NÞÔò9ƒ3wP ‡7§À”tæââŒ&Gˆµ=§ðŽ£çKƹýÜùl<·Ÿš·€Ïé6—÷§u™Œ‹Rå}d?z¦OÝŒÃæµþɇ%==µSÚÈâMFå×^»ÿ÷|Üùvcþ3Wµå=ã×9ä¨ÉÝvHr\ªO€jÌetWÓ#y±k!50«aÒ†xg(öp?Áj›tú(é.ÜåU:Áкç~»A~¯Ke“ŒIÞOLî©øw믱ü+¿p¦Ñ{ØßXx?lœArãødôÄáï'ZOÝËçãr÷§¥½¬Ý~YR·sÉà—a3k´7Ðɳ¯à˜ðé7tÀíjGnUvjG~=ÅŒ9Þô~zñýÛ[w_ßûa#ysû‰ûý‹ÕêƒÁÃã£;‡½ož4¿¹}ã‡Z'Y~¼|Ô¾½óàåÃûϼŸîlþï‡gãVØlègÑŠò¼ogXÿ³~xÛùîÁÆïk?>¸{ûdø`øT¯—Vll~3FOFÕÃG?o>¸ë¥;µÎ½û­úÚÚ‡3ÚlÿÏ ëÍ•;á¯Gõ?«z¿®Þ®÷7‡À™ÑÑ­ûÁ·ãfÝûîuõÏî¯K+õçÉþ\dß…ñAøêç·ÿ«ìÖÖ^þÐ|»;¿=¸û®ùÛƒ;õã[õÛ+ãæ‡íƒÒ -1«ùÇÞ‹qýà·×aµû ûæÎAõhT; -UìøãûzKmþõàîO?¼f<0äaí÷Ãßûðéû¿êÛ¿©®F~WÙYý¶Çcx“´Ç¥•øÏ·Z–ÿóÚ‘··q·²â~«úüö·Ô~xÙ¬¥ãï¿zòíÑF«•¼ÃO[ƒÍ#~²rÖ“pÐùî;ߟ´«Ý•Ÿ~XÜú߸²¹óý_8þ›6ž¹¥•`ãÕo*½ÖÇ·î=ÛXÿw¯†ë÷2h=V·ÞÝQc«þdø -Øþ†¯]§}§S[O`~Õ³{7Vo§Õn¸uÌü²¹ò öøî·¯·cóòømðíý°ÖÿýÖÝWí·wôþ·¿Úû½ è~ðã·8%oƒ×ÁÏ=äÓýê»›ÁªÍWíMGýöí³úzr÷ûæ7·~àS¼ñ;a¡&¥gÿÿ{ôùÖýæ]óéîëÆSn^»Ýøƒ‘é_ôcÝ7έû÷·uý§Ã{Ïë{w7Ú>ÿfÒð½¨úæ)ШúÄà·lêƽml”zó¿©Ö÷ˆÕõtø“üüÙªìÖÿ¼U?XúW#I~ø®ì¿üùî£úÞýÊîQkTÙú®õ¬²«]˜ýJøÛ/ßBŸö¯7ü4¶,b©ÓßßeÈ¢îÚà‘LØ/ýúÁN£Mü´ÉÍ[÷¿ÝxÍ3„˜K+=uëUÕ{ó¤ù`08zéÝyöú'š¡Èï ˜¼oߪöãߧY9IxžïÂ'žXDUZÙ¸uo|£Y着óÄ¿ÿÚýöÞÔJ+0ŠôEýổõó]Ô0®spçuv´ÓíZðéöèáÉÿíÇñ­ ïùG6ûµÎ° ¶\}»¥o~ûøQFÕFzçûcXÉÛ7Q¼žÝº÷ä×'òÐÃÿsáîÊæG{íãÊÎOêë{7šŒàà‡GAe÷YÿðÁ«ÝÇI³ýü¦´r÷–ÓøŸeÇIãvÿ¹n~Üys>Ž­w}/ ÒMX1ÿö‡MP÷~¨lwO~Ì·û9yêï/Ü>úq­òô—^i%§ÂåþÞƒÝðûµÍ¿vÕ„ÉøñûúAå‡ß'lÀv³¹wó›#"tn/…%åïOÝ5³÷ßMXš\ïÁˆ>ì7nï¶î~ ûÍw·îß \º[Ù¹ý Wët~n#iß`“ÝúÓ§V›wþMº‹´þØãæ»Ï¬T»Oœ5œ«·Ùú £Ÿ:?z^í¯‡[žm«ýß_VÜï¿ù®¡o~÷{M=¬m>ÀO÷AÄÕ='Ý¿ó“º}£ö“…Ý/­Löá–ïUTŠ5êH_ƒMý3Þ½G½íj«2ªÊÝÕfè¯Ö·õÞ¯' lrt26G@Ý>ªŠžgxø)ø¼IìàïÛÔG³EC¢1-€§ÂCA2™`rga„,{ -¡˜fyÞCé«ábÜ™d&õÙÀ»DÆO+¹1Ž¹Ø;ÜøÙ²`‡øiŸr7GK6y÷Ϝڅ'bjJ+SÁ}Yn"ƒø4ÉŽ{DUö•PÙ'?ÌÆPZ™œËûóDîÌ)á!Ó'K?4ûÊ26W0 l¼i©ÊDeZf™–S™u)¥•#츗ь_ÌcêÔJ-­XÞ›"ÓòäÎ$ŠŸ&GSËúÒÝ©‡šyÉÖ]Nb&fõ~&µÔ9Q™³T6ì·¬ò`!eZšÄGB»(«sc8S^ˆå0ûÈG‹ûþ<H¤Ù¥y11¤ aŽÝµ 1n‘ºù‚>1û-¥aðjíøŸ®±{q¥WÙ>8| -nåÓ“)ƒQÙ}õ´×| Ô»ÒÊÕ‡{ÀÿFóMÆ?¯Ümîv|°ál}“"Ô»~¸zó'v¡^Ôª[ÖÙ8>µø–/[›§ÄS«ßeJÜmöØÍS}+©ê^ZÙîݬÕÚƒûÿC¿ý(3ÐáƯ› cžr繪wÀV¾º7ñçÛ¯~¸ñ°qëy¿ýèÛí{Sw«ÝnR ^¿ýíNýɽo¾› -ÒÂÖËíJø¿ÛÐVηⷠäØýkŠÒ\h¦ªû‡õôÇÆöi†´¶·ªÞk½!‘Åý €˜öÝÚ­ý;GáU»Íè]L8ΟÄm.­L9Îâ6iìn`lûܼãï„7¾Å赇¥w§}üîž . ¼ùãÓfýfûiÆ%ˆ÷ÙGDr‹Æq0/—ˆäãJ+6’[ͼÂE#‹ >=ú_ýi5øäæ>‰½£zø‰=ÌþÄ<`öÿÚþöfíð¨142ÿ«~=5ø]úÔÏk3Î_®¼3 BðùO *rÝzÔ}•Å ®V;µ£·5ƒgÌ¢m5onu7šuÿW}ëþÃ?VŒ9êðÿŽð±Oëëoý·~¾í~ÿüõÏænÿ{'|7Þßr6ŸîŸ€âZÕ§®« ç§?ªÝÞ«šs×ÛÙÿÊì¤ú¨ê«Žºýrø,ßÖ`^Þþ^‰7ž®ÚVØïÿ†»?¦0Mï¼\´8:YûùÖO¯’¿Ënˆ™«§¿üHÿÑ7V²î`BåEeçaûOðÛï ôƒ—ßÄ4л·¿[{ïÆX§Ø}À7~:Ž‰Ç£Ý‹‰Ûþ°·]¥'—Væ=ûªŸ VÌ>[D2¨žÿ­Ù„ÍßûñÛf£7þC¯ÄÇQ†; -[›Oª?o=ãøËñs“IÁøùùÎ+9ºAQ’X>½z§_{\ï¾éøyµ²[{ù²‘üqxëVãÕ›G¢ïŽþºþG¿yãéÃNüçI㯎ÆÍ´³‰–wº¿™Uéè ò}}ßKwæIL¼zÿàÁd&lÁÕ[ZÉÙÀ3×/ñhµþdðãç¯ÞÜ@põ‚Ïq^ûÿ“÷kÊë:£WÀ=Lèzï½}€aè0ôöí½ÖïÚB -I0ç9?Î^Ïž#Ù²,K²dY€Ô û’ñâp‰¦ûQ‚:=v¡±¾7·`¹«×Öû$éIY¯N %>Ï)‹Ù=g·(ÛaÿŽ¶´— Å|¡Bã˜t¤ ‡˶¬°IÆîà¹ìJ3ßäêP“t¢¶y‡:Ö>_ñp¥“V·Åy‘rÚÔ­^¸;V{êà}ôÜmÇ>–~êÇ}¸ÀO¿\P”Ħ¬o°^n>‚à§ù‰»wÓ--©IÍ‚^…øÍغ>™Ö;Êä³øÆk0qГî›TÒD&6’ùsͪÒæÙñ"êo;€Ÿ\˜cžÁÂÄQU¨ Å4FO6ß(›6lRM³Hç@))(ýR=™éFçÀòo`*]ÜæŸnê›Ò$zm==Ôè¿Á4Æ\÷Hóפýsj‹úË¿kÎöçÊ­Nï´§—~¤¥íX¤£Õ®ÉDV£c_ÙöÁ*v›é"»¿’ófÕ´H,‹qŒ¸ U@w°Üjô1²¥ÓÜI6¢š¸2_?"M|ñq@£”á 2åÃM©ãN—ÿH¯}VÂÜs<°LVpÑScÇ×A„7€2 7hAÝÕXÅŸ*DñG;dö,a5Eƒf³íïçÀg|RýŽÝH/ñ›LO¢w¥~l‹ Ød -öÔ÷¨^…v‡‡h­rB2×u -´É£wÄÝÉ$ʉÆjÞ4¯.tkÀ>5ÉÎ`XO79Ÿ×pzÑ  9À}¿²nA ëã3KŸ šGr·Îi§Ã%”Lºg°^Z‘u4>$U: ÂÞÔ×düÅé-îÖ¨Áš-¢ž ÚÎÄ–%g1­{¢M¼Ë@'5·ç›ç‘"¥oK5bß'à1°e~c…v¼$˜EÓƒ_Šo+a—²‘ÒjÊ X>„{Q—+¶ÈªÍLSÖm:+Ö -Og\áã,³=F&3RÃ5æìZ£f¿á9•ŒÞŒ.e&8äšëe‚ô¯i…"‡¿Œn†a}=t -Z»A«oÙ×’…ü| õ¸€_à^Y3®bÕ^¸«_WZUs×ÐÔdÆâ›ßéú6¡ÞX}uÄ*¾…7Q²÷À¶d:ïyÿË -—¦•”¥¨Ì>åàbˆCëàþˆ×­U;t¾ßãèî©?а™‘.çÔEŸC°?¾X¥™MÇ>÷¡aÌ• ŒÉ³)ÖTéX"À““xФÕM€jˆêÝZ͘H'bƒE: ¸9k‘QƒÜ ‚²æσ.|¿'CG l´£ŽpBé]Sdbžº>ŸœÇR@“˜C÷ÄÒ¬c®ì x*ÉÁª«ÃR2ÆêÎaF„þ«kùØ.k>¦ƒéÉYÉJ…l³ødC»G(p}Ôá¤iùñŸb0Y4ˆ´q_ø}±-ࡶ–VE¾óS°‹Í´ ´‹ÚÕ¶³6nVéÄ>Û’¹\G M‰MrüVÇjfG ˆÂ¥*I˜kgq$™‘r]è<u¦£‹P‡4àïyŒ»m7çUÚÄŸd±F/@ciÑÖ¢;«‰ym˜§)!köŒï¶¿PX6š¤ÅáÛßgÓ*²¡ØÀ0ªá¶õ{èN§J-¯œ`Ê 3ûůÓ}Ó)Ž&x(ÒÔ&ó•€Oºà¬hG,Á”ìQþiµw&‘U'5Ž.6MN˜u')ÜPì&ÉBôb†®vÛ‘ÉïZåTm_—,Zh“ »,È“°u3ècÃóZs ¸»nà)ˆ%ÌFTpéôÁœºô§n³âÙF ¥¿&›6æFèÙÔQƒý…!?p!X(´„a ƒê—§1¼î ¸ -%.·:h½öWîðÑœJ¯›àºÉ,f—¦åÔ™6#Á\¨t¡¨G$# -@W O}ºfÚoëôO§“†™«ñ kd:_]r^»ÄY÷$Õ¤ü=¾¦×%ŒÀ0¾RlQs»˜¯´™z:E/# *ìj ½lm@§¦1¶/X…ñߦóÁ‰» ¤! ´«»¾¯¤ëê¸Ò’~ ¦§ÁÒηŽþÁ¸·mžÉ iüÓŠá=ÇÐ`ùÀqÎ’Œ7@˜WŽ Ð -q¸Ú Dý*¶_VÌìò‘¢<39´Ú‘*i|«²#¨út!p²Kð²^ªS5ujÒõ£öþ7éHý‚Aúö«ÔwgÙ挭ËÕøÇݬô~©-¡QL÷°ÙÆ€b¦K`Ÿš¸M®xÉdZyv¹šåÞM‰zXñÚ¯”­ë]ÄmÂÆ™ýÕ·uåÙì>F°šfF þƒ˜p,78æP`ì_‡Øm[ÇÓÚÁ’Ún1~—oˆZb‚p“hÇö±¹‘ Å -€ê—uÏ?ÏŒvC…!5¹ªW¬YÄžÕó0yˆÎ‚™´Z§ì—/Ú®YôdàßÓíô¯5¶‹ U ë p¸úÉ<2G9£a¿¹JöÓíï4Ç`,³4°‘sçÁO²-/òèªK&€ oãŒÔí× …¹|CKªdñUg±‚5ÔšRjšw ©?h}ÍTOë[´O gY'T÷¿©ðÐÇÿ 31xþ‘ß?*wþH’Wße ïölÅÇjG&<ÀÜná]+öèf¥ëæ²:lfL´ÞYB¨ìŽnJ‹‹ýAuõßÙ¦:;ÍgLî /kÀNUëðnv.ø1ÚM©; îò–¹Ý?©sD\÷`oW²C°Tª³ìƒCã}¾ƒ½êÁñ»Û™”à ‰ \Ø”ìîh³‰SZØ|²ßlî…N3@‡ólº%%Ha?¯W‡ñf´[+ë¤0Ó䮬ÞÊŽ9p»y2`ÒÜn¾ÿ`3ž¸Y3ÔäPY玕/çæËð³ÈÉÙ¦óˆ÷‰QwmêR¹FT32:5Aç}rs€”d¤C2iè6Å?b¹;.å3?ÙDï»î~ô˜³¹'¢ÞT·eÉÍk"Im²Õ;Ä&ÈÐúÁÚcðÃb»¶7³Ùt?ŸÛ¯çSqøUf)N¶v&1mYÊ­2NËÉöŸ5?ùDÐÞ›uK«46íuûG{6¤+~úÑ7ÖÛ•jßôñ?"7Ü¡$óÓd»µ?—!^gûŒ,,=•™Žü÷`¿¿¿IÐ`˜^48?‚0ÙK4€ ~ò ö;Xh’ÊG”ÅE·ä¤bº$Z.N‚µG®r±–'aËÛ*4ä¥Þ.aá±òÙsw³³ ï‚F`ÍðÛqD°érv‘™<¼ 6!“ dÚ]ÈKÅeÛòR%Úíf‹{¿‹D£1™ -@P¢ãl¶ªùîb?_ÇÂ,~a“éæpšïïR9î›±KÎ-Jn(‰¶£Óú %uG©âæ'69D|ƒ&W4u³¿I‰"C¶ívû‹ Ç‘˜|W9®£^wźìŠÛnfsáý'Ò"žKXÍO¼¬›G­o½VЖ×kñ}‰¼Sf<:É­?ØîÄ)sú )TÒV@{„ùĉ̦I·±ã.ÉOgs¨pî°–Ò\Ç«Ëvt -ÄŒJ⿾ÀÊÊÊA-v›”晩Ø+Ó†·SŠNýä4µC l3:ØÿGa;jÁf—ÕævÉ’è&Úœ'“œü¢Ú6Ì%¤˜øN@5mfL߶[>ãiñ˜  GlO„Môeò#üw`ÊbK·ÚŸ úü` M6'ûÍ’“%€eÛ2ÊÅa‘S(AKvwP`bÊ+V¬Ñv¦–”ûŽ£1Šé§·vcú¾9ÜÓÙyµØ=¢äáp²“×ɱl´Üsî­’nöeÍ–³ÆJ+cr6òkú1þç#yjÇéx?gçÇÃ\Ìw߈ÌÜæoô؃Æw£[Ë;Ñ­» Éô”K3™>rˆ&jj&Sêb@y -=¡¦œ/ºùá0•F ›Ñ¨oí@má²Üp®FUð#¸Lf§Ý@ªCT{ÆÌâTw—³òö›ÍŒ´uyåb8—Ó˜ërñøxî®çskçóV4€æ¬&ÓCÆxf“Ûl®¤b²?}¼>0 ŒÄXÚïö“åi¿†ûvTU®ÂŠIˆÇq±ƒù-,›ÈþŠ¼1!6Þÿ<Öç.CË\ÅÊ!¼"1:P·²®“KTûeQ÷ù¥Áàc§Ëö§õ'»L%l:Å·B:Ñœs“Kôç] `öF!ʵ£ŒzÆ€Ò:]Š£f§{° - -î¹5Å•ßñóÜÜÅ9û€Üh!ÓrÈNß¼$û;þŽ¼¢'Aª#gòJ´Íj"ÿ3Œó3q|Ï°±—QD˜nÒw+‘·$ûé~¢Ÿ,;Š»^ä䇨·U¡‘:¥a!ѱœ²8a¯e$—ìoIJIwøÁÇÌ%D?MI<7ºój¾’s†ò -^ƒŸÐÓ :w¦ŸêÄ$%²_@! ¥,ZæçÓj /1ns5£§VCQÖüge©@TìåT? IÒ<ÏÈß4X‡·~1ÆÌ㾤¨kÏÆðšÄwXåñ§ÑáÀ(¸KnÙÃņ:cµ—G­EeÄÃõ¿9aú“rÉüÃò£˜’ÅqwSŽB<ÉÙh#Â$+òØ;òÈ+òdÌæ¤N÷aå¯-”볚äLA^_>yvôê‹:Çuv=«t¦è±ÚÉÿLSÀœ‘ɉEÎL*ßœ)^"…fšÆèB£ üröA[g榟ÿ,g»3u‹Òh÷ÁUÏ¡ðüáãØt?ž}·ëºíäw8Ø?ûëÇ(=@šQZ,‰š·­v0Þ€ƒÈúÝ~º„ü¸ì!ˆÉìcE'Œ>6£àÕà@ -×CAÝì|,a÷r0FuµØ±`(l;0±WлýœE¿:\wëòvÅ‹irZîÞb;+Ldµ7¸:F—YcyÝŽw£s×’¼”#QñÅœ¬ ¦–aã®ÆÐ#½ò‰Ñôª_F»)÷:§ëë¦S<¤”üÄÍâ£y˜e?ªôîî)+UxÌ5`ï%-Tóq*‡ÑŽ9ò!0'{€Å¨Pš×"–¹W -AÔÕWÍLJH7&’ŽJÖHt§P¼>/iŠD Œ §6ŠèÙϨ¿½øVéRÿ_o¥{]¦õ™âáßÿEÓOAÌ5‚ój•Îë*¦*ÿ²ÿXèjàÚ›‰Gg²?ú%|Gø`0_S?“\~ _ã„7_+TãÆ×Ä¿Nȯ1o8€F5„Œy«¿sðÉ‚_*]Æ`YÁg3l¤þÌèÖe|²–á¯S‰Õ¹á€_ÉŽº’öOÛ|°aäÛtbv:¯MøÕ–ú ðÃüñ¹âør|"¿’cñž¹][ö}:1„þu¹ËÔ¸ªÓÁä5f'Š3wت±Æñ¬K§âfÐÚ8Hµþ¼°E—,\‰o’d$1 •Ž$¾%¦A–x2G”ð¤¶çGZØç¿ÿêÚSÔíίû…§[ܱ܆-Ì|¨tð/9ÅpòšszòÌë/ê!ç­öH£QC:[†äCðkð8†i(|ƒÇëÓV퇳S‚7¹O¶·’[âµzÄKôËv,ï~}Æ>§}<åÐ8aŒöÅñÛ’ ¯C)ý¾cÎÄûîŸøÚ?µFÝUœÃJ,Ô -à3—3ü©~}Œm÷‹k:˜ÎUÜîÂ^"–õ[R¥"3=<–T1]vÚëäßë|±„/'M¡]ÞO_ý²˜^T:϶¶Ã 9OêkžŽ“I\ŽÂÜâôl{XSЛR wÎVRcÔzºš9˜É_KÜæ«õÈØUyÝñK7æ…Òùpy¨ky€¹¸Õ¯ÈÒOáóL ;Ùà%bc:¬ÕÖ'’ñR),œRj.ÿ%yø_DcÂlˆÆ1Ù"êiöA’m'àÙSA"ù 짚ž+“y FLåÎ1û}f’ÇÉy-èkÀoš´qïEÿu·mKôlZxá+ämD¨õ?¢±&ˈ·Œ,]}¨â¼oð£ÄÙôSª¾GÌ…€±ÔÔqÄÚún!¶~ê±m&ıX…t[­!ØÙ3CÍE‹צqéƒyÄmÕ|#lxB¼ÑøÒÎ,âo"ßH`23„„ômç+H¤Z ÑfAâ~sIô4C$¥?i‘tõE²ºCÉU¤`»ÆâH7DÊ‹ ©êÝ9¤6Ž­z®äDšh§‰´®¿j¤³·¦¯ah °ô;Mò]Ûô‘Ÿ†ËŠŒ[ŸudÚ9h‘ù4\D–ûÑYëÑ,²õwȾbÏ ÇIûˆ\¬xVäFWµæ/©õq^m\všjK"‚ªmgÝ-j+mU:µëןW{Ë£:àßõÕaÃ(¨ŽžºGubùYW§¿ NunÛ¨‹ýlE]™–œêÏMm§n^Z upú±Z=¬#Cõx 0Ï9\½j[Ía >T½9€åbhº5êúI«Ñ;#Ki5nkluwVƒ]¯Æ¥',ïvtÖsMôó÷K“,ç+šlMkŠíuHSíלšÆoȦéjLÍÀwPkFÕÑI3[Ô·š_¼ð«ÒivŸ‰¥æ¬-´êJd®5X ­å;³Ô¢Â¯Ö…4·Z_xÔ† D›Hbm–ˆÙ´%KÛ¥ý´žCڶݟÑö­ªvä×ô´óRa©]ÿœ¯ÚÃ%c×!kH¥Óé;å¢Îr5ôuXy´Ó¹/1‹.XÖ‡uqt^×e–µ¥®T™tu=ªëª/Ý÷f}ÔMWnÝïð§ª;Ì'[=29õ†õ´¦·ë·½Ó£èýU¬§®bF•NŸq· -úRg½Ó7ôÖþ«–ëGèÊ©_Ì\=ý.Ù¶ë¯6SÛ ?·mÛÌÑ18[»!P ô ñÂÞiÈUêSCµŽÚ+ãÁð}]– sw×bØsCÃeùg‡£}îëÝ>·ßúõ^Œ©t c,©hlìêzc¿?š§ùCѸ‰£nã%^P› ñÙÄäHXª&O±6E¾ÏvSæ˜<›ªöõÔÔÉ'Ú¦Ÿ=R0­Â €ÅtÜx]f]òh1Ûõ=Ù=HÍ‘¬smÎÚ™¹¦ßÌÝýìÛ<ÞŒúæõjÐ3_öÞÅdZ ,¸w?´²ê±%ùƒÎ-ekrci—:'ËH}ÖY~K^»å¢þô¨tVãP·âé\Ù´í{ÖÔ9½²V&gµ;¨ÖÉ‘²nÇë¶M½k¬m6]Øbóøm1[¬|lÛ -›ùÞÖrõ ÛO¿]²­íŸKÛuñ…Ú-ñ^ÉîÖ7öèò°Ø -cÛÞ*µöQ¡™µoò»C'‚ÛççØáj\ŽÄ5ûí¨ø/„ã«™ÿvFt9ŽÕï1j4Æ‚(ÑԬшk”Fó—ªm-’mt\#\èàÅt9cQ¥Ã°²É…ê¦%–¡%¬¹÷àØKì±]¶ÚÂuÇU ÇC Þ§6x!ñÝÅ;f{šº?5”¬ï·ÓôC$\?M¢ê‰ç‰O%~‹ ¯SÝ® *ÓqIXœ¡ GïÌw-jgǬ½8g]íÙy&´g—em¾¸|mÚ•I$t®¦£brMl Ôu´š=n³9q{±Ÿ¬;wÔÝÏúÐ=Þ7«÷˜ûN·ÇgšÂ{ž2ß…Ž§Æמéioöœ§po)UÚÞ`6{ðq§÷+({W…è¯OS‰â>|V¨úâúÖÁWK-ƒ¾Ÿ™¬woÐê7¯º5¿?­F€ÌŠdüÝÙòà_5BI•. -lög"“$“†s ‘ÓvÞ¸ŒÐv5j\Áhâw¬.'¹àÈÛ7ó¯Ÿ-ÒM„Âæ©)T-'¡aK[ò."lÍNáPr<— æ\xøU³>¬úˆÍ–XGÂåÓ R9«‘QÚšŒœ#_ÔQÉ8¢1aˆÖ:$:Ý®1ä{°Ž£Þ*–šv±ö¢=ýF˸!¸þûj×m¼p@OñïxF?œ&•.a/›‰D /†õË%Ÿ˜3­¤¶s&=•ò9™¯ØíÉA{K~Jõ”C^¥â^³)Õì#±ÔÊ¼í¦ íßs:àXúÒåÙº™W.ç â7…2.›÷;“3•–Ì@7)eŽÓ)‹ú -‰l²zZg;ËT8»5o9k£ÎÅL¦ß\³7Iä~}™SÞtÅËùðLcÉ×ËA~Ùš… ÆJï\}}· -ÀŽñy¹ºÞS·âq•®X7ÄÌÅe«÷[2aH«^Å¥Fs…—~ã¤lñ,–å˜;Õ+·]šryì'+öR:PI~£x¥§¾Z+ÇÔÚPÅ—#M5é_«ÃË÷¥† æך7½W×*>£N¥«Í-nÓ§ÑQE?#įç³åuD>·åf¾î˜é›õŒãs\ÿ®˜ DÝ·4¼H°Qõ+Åe>nš'-M3Þ+ø›_õh­yjÖ-×wk•–áRk®Oý¶MñºS¥kÇófûË«S·OópªãÎ~;‹1ÐY¬K“®åGëé&ÍqwÐý_Èh5ÿò/‹‘¯†Õ¿ÿÚ¦LÅ6?›{bñÝ›~Ã}Sh‚ôºÕW¿?>„ÈÀ®W鲺檵qà³Z·¦­êødN¼åKK¥›ÔÏXo²/äFS·uñ;­MÐÓtÛê™fÎ<êšUC_ñÙ&øœÙãd^iw®óõï‘%QÛ–UǶµÜ¬O§•³o -¬jMoµ+öùë®Nr¿õ¾eû{XäBkŸ~3]·’1Ïúü{m‚©šwÓ½b³­º³ o£Áúvû§ó;ƒÑgØ¥ X7q ¡½Õc¿ìóY¢½_ŽÃÁŽV4‡j}øsØ[¼Jwôþ„]Çvn¤>!„}vŠÚ­ÓÐìÉœMº¹—öqg¯²¹·èí»z8Ëý²«){¨&ÑlÇÄŒ<8  YíÖ›óÅþÁíl)P·¨w€m‹Úç§ÙñÊú*Äls¾:³Õ`ãöÑæ2Ùœ%QN§Å\¶¼áFNž…SôÈ€ zÄ«þ#×£ûìTÖg.50»G6aŸÎvç»ÚŸR£¤c˜hï à¶Éì|þ(0\Ê$nʈXÍw©¶0PŠ}4jþÁ…Àžj?5U˜2r -W¦-Æ'ý#ÀÊ©A<³ °3=¬…ÀŸ›BÀ·q*hï'® …඼…ì Ÿ\(_<’/8O¾Ø1ÑInó'ÄJ“2D™°õ(‘}jÁ\N¼Mhw¶ÙìÿópFñA“B¾¼È·r;Å_¤v·h¨Úüq‘Í_ɺ žj)ë &쌼@ð©¢d[Q¸œ îr¾±{âŸÑî!³£\f·{ŒÏ‘ú…=¡Æü!?¢=ñ¬x·R•l Ê6”ßúñŽÁ_KL4fn·þ(®ÎNfà^‘À”|ß0µ›2j=ÔæáC Æg‹Õ&^2ïTä±÷‰èÑ”%ìúñX"­±uXJVKdy!à'ܬù‰Û‹Úíù"@D—xrîˬáå£äí†ooqKèÓ½D ‡F±„×Àdÿ¤ëò<ø2Z›ÃÐAt3,Ÿ}ÂgZÄ#ŠˆµÔ)"–Ϭu„ºF²7.$aª9Ïø¹úš\;#•Ÿ0÷^÷—{ûEV% 3ùɱÐïÑìp–8¡±gþuº¤ÚñR>©™åëɈÏùÕ’/ù•Œ,Ý„ñ`L r×øm~‹fª‰Ò -5rà¨Ië…TºÄ<ÓGb•ïF3L9Âϧ~Þ"¶]mŒXñtŒ?Òb™Øˆ-ïë4±Eø:è ÷©F"¥»þ“Póâ% $g§ø5e)ÛÉB©“ïÉ‘ÚgWÖµ§ŽÉ¯´+˺ü:0¾e/þSÆëžB4b_'6‘¡ÈO*¤²“f|.sL È™\¡ŽÎÚ#lç÷Ôõœ`Þ«%œAôì ~y3øµû3_3€eªï&¹`çÎi`J–P‡³näÌø­åË©Æýfð3lÇ™é éNŠ!UéH´®±>‘hEþœÇKSibìþÙpQ¤go#‘Ây¹kÖéÓÅÖâHƒjýÙ ÝÄž®?v­q¬ýì ,­%ˆEÇ -º5šÖWÙ%ŽÔÙýBÓqwEt¤êô¯W»#Ur^îÆŠ¦ç“¬$R=î즤NÑLæÔ X(§M<ÑC¤Îýݬ¶~iÕ`°qj9–$ŖøsÚ; ’-8€Öt?«ÎóboÚÄ‘²yI¤î2ÐB,4ÚÉéÛ‹uÄ‘–SfÍÑ}-‰!=kñ´Òlßa_äÚ«ÓÔµ6ͲRÀJ!“9Ú6Ä¢i_*,@JKKrVµõÖ) ´;@Óƒì§èHÕés@·v´ê¢H3Ök¬Jñ±º5†Ù"ZGD§ó¡ª…HÍwä­¥ÍOäõH¤*mÑïÒH»6£©»^\·(¤©þ:ÍéW-öR.Q¤êìñ¬ÒyÖšš›EËAZ2ŸV’H£ëa"&´gBëþÙ™EJ!»¡-Øú…éÌzEZF’HËýl>.…48¹eèxÅÇZÔ\ë‹ñÔ+Š´UÄö’H›GfÃ"<ÆC[@["*4bj}·b¢HÛ‘±Y)ÐŒ†±K[b¬}':¨4LâHË•Åo'4‹"\ì5)˜>ÚmÕ¢ïH!M£ÃÚ1(Ž´5z±sB )˜—Ô¯Í-1Voi—Ñ"…t¤¾dø‹&rº¶{NˆÔr·h*š€éûº¤¡¼Æ?Öó§–Fºö™yH]K=Z¢wÜ6fùHí§ó"¯Hm¤*E;Ò׸Ómô|·«ö÷> -iĘ² -È‹ÄÒ…tpñçù‚°i dCyˆÔyL( -›˜ÍSÔÿ¤é«éi1ÑHý5;¤Ùf\§’H‰H³Xd‘ªt`¬šÞÙ5îU!Zô^èûôêÎ¥–Hñ;é|ŠwM‹ŽŠ¿{ Ýf±Ÿ'wäû÷×Ds}ËEâ­!ŒÎUØ[0i+¢‹k“𭘄ɎwnOZ‹Á÷wl£Î.îÁMH¼Ý<•AÖ%öÎ~örñbá/ø¯sz$Zi§jo/B.¯9‹¿- ƒ¢ÅâºRyï–£á«Aâma^õ{Z6Ñ·Þòf2FzøÖ*B±"ª½Í¥çÁ[·¾9ê¥ÂoƒÆV"ØŽŠ½…+ÆÍmíi—øuÖ:L¸}ñ·¥Xú7d"LâoËŸËßó0e¡(&ò¾ó»%Î\âíö¸·­g^ñ·ÝA•Ñé·|Š Ì=’¿Å=<¶y(òvÔÁCj«'-E±Y§œ¾¨+3ñ_ÏÑÁÒð›S‹¾ÕµkÓ–)GÄÞžN¡aˆÖŒFŠböû÷x0‚¤%<&²´çêŽò™f|ÕC§ÆÕ,è”H—Îò]r¬4~«Šú‡¢(ås8)¢¯’D¿‘œüóɵª™ñ12™a+9,":>òϨ“”Ÿ?"Òj”Øùc->þ ZK4ÇP6èøf¥óÇxH¤g0Sß=G,P ¬%ÍîO1;:7;ºÓ~˜§9k´†ì£•ÃÐb‘¡¼ãoVéŸ_&–@ôt­;¡èIõ–È"¸ÿÉÙøNa©Á9s@¨bH˜)èi¥L„v©~å"Ûr°Â?=®ÛTdU¦ \ÜR«Ò$94B(Ù¡I­ÊCëkZO­!j¯ë -: ›GeÒ“£gö®õÀnÅ„³¥l@I;ÏoËÇç°º“òW[¯p¦)œéŸ"Œ(Yæ~#ãé½'L¥vcv—¶ÈKØ{’ (íB˜`Ýñ½pÝÔÅcV)\w£ô­‰èº2+e¥þÐsEQPlÁçä1¡V2¡ð½ûnhÞ©K Š7/ð½c¹·„î{æ?Š3ì?âñ/_^|Ö¸‘T¿T:¾&7%kïA0%à·Í“¬¤¥D5û¢ÂçÖ< “–PkŒìih>ÍðåêýÆ$7¿ÜÆkïU°-Ýô1žþ¤@{#òĂ㣶Aι˜H§|jɽ’í‚.‘³¿ÔHu*Ê®Y%ó'¥Ð‘:?³Ã«A~Ùù¨t -æï&ùïfðtÛ¬Þf†œÃ(õ7À$íŽÛ¾ÿ °§9^†bôº§(Æ—µoãK´§)FûµhFÃã®o¸fáRIIZ%*ríøJi…VJŽ-²ÊlqM!+´ÄßX•‹,>¸Æ OÊν]"º©Ãö†•Œûu2Õ­RSAr,áó#¡ ¤#­›•ô¸+’y$˜ŽHë–Ù;Ýò¥ŽÐSjB=Ê$ºkÆ;C§<«¨îlCêX’fÄp¿Ÿ<æþä:¶É‹^TqðÝ7êä ›yäÔà*`C@2ºƒìTJzµ‡¥»t/øö¾bð›{J¨tb#¼Oÿ7ãƒëÅ_+½Ct–$5•Nœk%ty|p^bÏ>G¾›ÁL÷ðŒ?CÊ&ÿÍ¡sLÝå[¯K~_W=E,׋Ì@Édþ]î–8–¿*0Ò$½KI^¸ÄŸ÷%=Y+Ö¨]n¶œñSëQéàe3u˜WDl^ÛðÅ:ù :2Sørèh|t4ÅÞΡ“Ï #ïTùƒ:Q¤· :Æâ{7‡N>ƒŽ¹SåÝ:Q¤· :Æ~y7‡N>ƒŽÉ|7‡N>ƒN2[ðÉ:ùv*ÝßäÐÉgЉdr½”C'};¯|3‡N,دù;rUP`örõ:é< è‘¿‹=Ñ)~—NÒÞBc#'JM:cêoâW¡´¬ê•Ä„*É0Ǫ¢±äœS…t2<ˆ3céĽFŒNÂ^Z÷xeIxÁß;ü°ÊO%:BÑñ‰dÎ)ק;ežèâ]âåñɯ]Úüx½(Kš“W›ì*mÛµžÞõú¥XÑÊî•Š‚Aîçà;¥àlN¥Ìmܵ)J%’µöSJƒAä“Ý$CAø‘’Ýü+ñô¦þÂUóÓät~å„‘9p0C¤9ù  CKÚ¦á‡`}l¤ÎXøJDú‘M®P<ŒÔŸ’³—Ó¥Ç)¦*…I¦£´ÜYö#Ç™ÐÓ›– Pâ8ã» -´„áù慄¿K â$öóï}6 ðXï"¯ >“ÇÇw·ÜïHD+7ï¡îUÚ³N+™.]"yA—8ö¾’äBN—¤càoSw›¿y|ÚG{îy|;ÉÃä§ÖgF2'†«[>ìÁ-BP·›ZE=¸Aq¿È³×QõÏ R_ÙŒ¡Ûb—ñ(m‘ y.¶È>8 Œúó@:_"Z•’7ÆžÀµ+˜ÄÛi­&ˆªbx¼«Ö+4õ%|°0K±Õ"A“G‰r*%“,<‘¶x$Ü­ýGôì ¥ïìJIr<µ½‰IP&«`+Õ#ñÁylçk‘9êÆié¼Ø;=R:Óg'/ädÙô£Géq|©ÃQ g¯¿¹?JO]ÒÉècÏ­øÁŨd¹ªæS†é$ˆOþÍ=éÞy63ŽŸýô°St:ÛSÐ%ÕýM÷t§ˆ·éDwIx§Êëtz'ô\ñ:Å÷ÈD°üYà‘!´¾ƒ|غǤÒs°Â[n 2± Rì¥ôœû9Øæ%=2|ß…‚ô¬`x~hB»2ÿ¾G¦¡ <2¯Ü§ÓЄs$š‘šÿ Ì?c<2R^8e„QšœÃÄ)I¦çê¸ß)afŸYöÑë]ª¿†<Š”S¢, -‘“ibò‘[έMòVKá{Ã;ò¡  vöáÐB&ÁÐ8E…z(<oØýpÎeB”çÕ9ÚÅ‹yuÊc×%­$˜W§ …D*u”OhYH:A&× õfApŽ -ž·b••=̇St_ßÛùp¼øä[FÜ_çýÊcÏåÃIG¨þe>ÜûªJòád¤þA>›-ø^&8¯KwnoQi)ìõ|¸[VÚs©OæÃÉÝCòwùpÔ¼3âþ:ŽÂ"̈{ñXzRD%Ñóùbiù1‹zEuËÄÝ%ïÇD’Qï¯ý¦ý]õð舡·¯!%ý0λ×ZPƳDž¸8/åØ 2¹ eGy%Z“]„¢·i=ñl,C:…Y„ÒQŠ–!˜%QªÇ¹Lï]Ìñ(B`-ä–aªß†L?¯z?mF‹ÜÐvñ?¸ ˜„Â,Â×­WŽÔ2|âî -ΛW]P`¬õŸ¨öT—øÌÜß=øÄ3p| >{˜“¨Ì¤†9H‘‘Ú?þYF*õw©ýãŸd¤bj%I73RGê’õm8Š´Ü|"#Ày5“”—‘ -à<¸PDao„÷p->¹Ü‚"yiª ÈH"›C¸ ýFëÝ2ôl`J£mÿ*ŽÞÅØd¸#zøƒúN_¾ ú©T8ÕÃD׿H…c)¶{ª¶Ás©p2v¥„àz%NÚ«ð—©p”ÎÏI†»ay˜ -§T1LØår«Ÿ¼æÕñ$'#ÏçÕ={b#=/Ý?+<Ñ÷[*¹ÈP‰3>ó/"—Þ$_Ç*¤àªæE¿È.QXä.WœÚ“Ž'‹¹z¯’œ˜ö{w{ÃÛ•ä8SwÛë¥*å)¦ÿÒ³‡1W2uÑP©{ÄEãúdë¾ýA9Ô]ð´PWÊû‡ÅF¸ã#o ’ìÔƒZŠ»¤ ÎÈ#¢3]’ ¥|n½ìÝ—/ì -”)žÖ÷'ÙtR§ ›M'¦m«tM'æðñô¾™M'–K'uóäëÙtb â1ŠïdÓqçŠ9Æ~p×Í ÙtO{­_ʦ“æä¿Ì¦Ë¥»‚~7›Nlh ó‡Ùtbv³X÷{ÙtÂ~A1*}öúj6X.|ÎÈ+ÙtåÆÁ©û‡Ùtb³+´÷ßϦc‰Å®5©zI¯gÓݸ„“KÇÙ‘ÿ(›Nlþn1$–M'–Kw§)½M'ŠŽ¹úÃl:é޿̦˧y‡bt§(öd6<Åþ*›N,—Žåo³éÄÖ·.ÏßdÓIFCýi6Ý£œ‘¿É¦Ëýº³^ßΦË¥9Kz3›Nl†±ÖM§hí¿M'F þÉû_dÓ‰åÒ)¸ƒHêøvI¡È?$ï“'aáÝÁyñ@ÅK£‰N7¦gŽtâ+-iOÕ«SxhOÖ« ŸàÔã{P¯N)Ä*Û -â`Òé¡b!`‰{H`)7ÉJ´Ïv F=Ï—¢]’Ý}TÏtê‘ Ù%ž„!KÞI‡RÅ$ -Ý=¯’ ÊÜ)«3òn™;ÙjYL¡»w’É%üv|²¢2wã“a"ÝÛ)e*‚BwÊ#“Ü ZiB*Láå2wÌ^™+tÇ$U½ìâj}D¤iÑ¼É ‡ÂŸåYDü5Eɯ7•›¼áP\éCóß¹uJÅ*(O¤SRmçA¬uá©kø%£m•EÿÊ,\˜_(Ö£<+ æäWn$dAaŒÂ|¢ê–5”Ù:VÕ­äV÷ÌFÓÕì™|!:½þ—ÑPõ¿‹†ª+Œ†z^ÝJB=—ùhzê(D…±÷!œ·sj)("[_Z*„#»×I4ýM¡I -ÔUKK…‰µ"ƒg¡ÓÝ -%ä“Wt*Å'®¨ÆÇ]$¨Â%æï̬(G™cHÊEPmÍOù1Ôàéƒ"M -š¬êþNfJkÿ‡ [û?¬`ØÚ¿}A¤¶h¡¡ç3æçÕÝûCw÷¿”: pŽˆ_Î྿ X -´_dàð+”â¹³,È¢4•AQ"ƒáh,BJ{0 -—¡t…»§ò+_®p'žûöGu«oîÞÓÆ•V¸Sùøî¨JyoÇX<¨p÷\¥¼?ÉK©q÷|~È &0Ï{¡ÂHÔÒü L­˜€rrL6`ã)5‡Ì}*(®ª(±v¤‹: ž«õÜ~ñ~ª»ÌÇ¿H¬…PxÞ¬×b® œgLk©;ºI8ï'ÖB(r÷Â=—ßÞ–=ˆŽBiùd~»MdväýZ*òeè7*LY¹KbÛņ'këÉ$¦i¶óæåå‹ç0Y³ýv«¹"ýób“8Åä­wåIL~£^/O¥1  gKZ0³¡RÜ)…!ªÞ*}³ªaÂn»ËqMØÖü–S ù•òþ®Üc¼³D¤OFžÍqMإ믲'6t,Ü£ׄ]Q²¸TÌ/"{Ë=É¥/zãÍJyÊ.©ÒЧÕÛ,’÷f¹GÖ² ;õ9®ìêEé¡M<†„I4›%N§¦£’ôO7ù•î6’_©S4–u7ò‰¸}’HÄÆY?0nÃïí]‚™Säzaê°5›žxñ· Ò“)sWóW¹\ɡ³&•?Òž_‡MDöRç¤3ÿÎêôÔ!@JÞÏËýkÄkHÝ^–˜é\™;›ç¹Öaó[Î7¤ÂÔ4ggY Hdþ©‚Ô4êÖÙ[–#&š†G8ØJWœ“©­çìöT:¹Ü¿­tÂ!šÞ7’HõÅÙrÊ"cá¡Éd9–ki¤©r/#I^•ŽW¼P8ÖÚݬ‚¥I£'?Ñ|î—oåÝ2 ¢³_TÖÎT¥Ú1¹ xÑ-¢v2K7}ݷΛŸXL‰ívŠ|mÕr¿\U¿>lR¼ŠÙ£P¡‡D:ûçÈÞ>÷N,'èÒã@L•îñQWRih•‚Ê,½äÛ¡U Â4™HHy:‰…V½˜•öTh•lVÚ£Måü´—dÍçb{’Ï”?àtIIJ€R%ü¨KCÁYÒëDW¥¥p½ðâ´f6Õ›{;GxCˆ}'®ºÖÃ_ø˜¿Sš)/ø`•Þ§¤öSêískVÂ|§Þ>åCë¿ïûN½è×âûÇÀœ¿}d-æY¾“–ʲŸ¼„Vl¯„Y€te#•°÷$ý0ŠKr3Jõß sfGêâñÑiµ" 3Ưe#¿í æøùÓ²QsÏ9à%d¸ÀÏÿìÍC|Ÿ -u3/€ sïç#»MFoSrG§ùÚ{y;‘Œ>G¾»ì«{å_¿Rà•În›IÞs HçvJ ï¥RÌŒåÊû7R9}Ò…·nwB*NlÙžg‰*3Øà -ZÊûŹ‰â}`Òçƒ/PL´¾Ï«{˜¤¼_Ä_RÌ)C1 LB?|§¢'ÿå…,@¥9€ð¼òõ,@¥9€*Ý;Y€¯ø“ŸÏ²€T hvÅY€’v€T4ÔKY€Jso‘*/e*¥'³W¾–(X9’Ü&a#+ÌTš(b#ËgÒ½¹•@{âå£x,÷Ô­UÏåådÙ¬­WŠò‰Y_”OÆ §8qøqQ>Òϯ„Noåcµ¾ÿ›Eùxáþ¨(ŸLÎÈ廿ÕüÿFQ>ÑûÆåèTtö¥t禲»¡Þ¨ë'oåRYï×õûû¡dêú={7Ôkuý„Cûƒ»¡DêúÉ{…Äõäçëú‰ÏÕ_Ü Å­ë'ï.“ϯT^×ïQäðßÔõc©xU?™[šŸpè -P_LA]?yŸ/“믑îªú½T¿R¤®ßó~ËWêú‰fÝÝör]?ÅYioÕõã4©ê'á笷 -êú½ÊcÏÕõ“ -˜ªÿMÎ;]×OI¾Øûuýä¡°õøÞ^2Uý„'V¯Öõ“s“»…智~ò–šd¬õ“uýäÒSê;…•ŒÖõ ËVõÎË«uý²UýDü0²×3‰º~Ïg¥½R×OLx°>?Ð-×õ{í+©ë§°ßûy2Uýž®Ç÷Ò•"õøÞÏ{¸«ê'8ã{¹®ŸØÙ{©R¨Ë?ªë'>pfÞêò¼Y×OAVÚÔõcò·Ä«úÉɱgêú=¯¿R×O,‘]„oÖã{|™ŽÂz|ïÞìÁÔãû‹º~òþ¯[fÊ›uý^¹Qçùº~òµà†Ã—ëúñÆ|WÕOÄz}©®Ÿ¼š£ú£º~nmú›º~òUýž«Ç÷ªÜÖã{5–Eh>½s%R×ïQ2<Ô.þ¢®Ÿ|t}šðv]?ÙdøÎ}5“wrž¤ªúQ»ØûuýäÍvêø÷ëúÉ›í”ýò~]?†bâUý^°+EëúIÚ•R§¢/Õõ“ëRÿ¨ð¶yEŠ¡tU¿¹¢Šëúɧ?ªD6”WêúÉ'ÄŠêc/Ôõ“šªªßc¢²º~ò ±Oé02uýäîoz­®Ÿp}ò«úÉÇ[*¯ë'Ïï¨ì])E§ýns(:e²º©}áV/IòS¡õ­×®ì¦hà=·¾?qQ%Ì÷aéyËÞ¸å:¼HÁ|+“ØLᢗëîæÛ¢0# 1öLWÄæ0”ìDѧešϧ~Ž!æÅ©æ°éüz¢]rÅ\nËy™sì¯#Cvæõ©tæHOû¥FrK:ÔÝo·_[ok’ºõ®^4Ì–›»^<=ëiq]ÿ”—…YÝç+÷³ÇV;æõemµif¥kk˜1‡Ã„ÅôÛuýV¶UK`~°|E/*ÝIW7N'B‹¨÷³½C‡j—ÓWqÒ²ø,%cø¨ÝÑ©n—<"þ*bdJ¯l,‰3Š¦ÑHM7Úi4£Ù—ÑL¥¼:o6ʱ¬û§lñ¹B‘´Oû9M òš,9R<Þµ¤h­ª…δð„ÅhIZu×´1›Ëa©o0±9089»Ôd}ô¡ŽÎÚ†³S+êmp׈ü-Ø0Cû5iªíäa {ë¬Æ@C¨Ãå4‘_Å¢{ðÕo!¿‚åüy_£6êëà<³’Ÿm0ø“šztþ]DEäz]àvÓŠî~TºÛ+3÷UB7¾½°r_4±éí…ûbšß^ œ6mnÉb)›È±b™¢zt{fá4Ï|Û'·6…Ïô–à*£0ai‹eÝE~…ú {ü­»Á®Y¨Fãïé¨ÙnG XÅ«ÃÔìT“‰;áÔPòÒxl’­_q -è䫇ѧ<¨£›¶8Jõ5Þ7¬ä{ÜäößÓ°SXP“֋⛺.eõ™¾£´¥å2$™”@%-L1ë•–ü¢ãmˆ|x( IBÄšsÐÒ œÜᦳó ¦Fr=᦯:Bóo·‡Ç¶ûâ9Vh·XöÂM×éšx›Ã*x2‚š`ÛNÏ žüÊaã''ýiÓÄéO×Þ7¹Øñ”i4¤?á ᢠ¿¢â—ÌQÁ‡`º“¿^?1Êk­ÅL%ÓŸ/œÓŸŸÀô÷öÂiIµ:Y8–1g,?m$åJ^UüßØæXu2/& 9¤ÎÍ@™+7/žãúcÄqœÐ]s3éÀA­s=Þt’}%ôž‹þ”­níšb„¾µ ûSI4éäF=‰}6ú†ÔØm³úµ‘óÕoÐïjâ¶÷úùqJ"»¯y¾"Öåo±¶¾SˆµÔî ¦ò—îÈyÄrûÐr³ˆÕi ¦Õ&ŒØvµ>b™Ø}¼ýètim9B]#9V Âb¤È43+¹~ ›É¾vuSuQÇŧ{xI§ð’|Ê`Dè^* ÏY¹p¡³ÐBÎK<íîí´dŒ"Z&ìV2…\ƒ9Ǫs±S¶²ú-¤¦Dh©¼˜… 4Ýr\öÌÚ§üÆi“Ž?{L·e1[‚ëpÈÂy6RçàY‚ÑFºŽoÔ»4fýöÌ8"3ìie?ëØT¥hqzÉøMpu—ÈúЀï¼ÔÂ2M£ÌÚ¢eŸ•–ª '¤X™ÚP°¬6êHæƒ{@© ½ Œt#!C9–iâw(ã ´Þc ÐyËœ¿ch>cqѱ£€&ý¹ùCC¤ÆµZHÇáð¤Ã‹O3KÙ"âê.©Þ¹jhÌ°Ä#ÿFPr£9~ɱ³Ñ™Úå`U#ò,d\£u´ÐÉÂÕeIÁH ×·Ú¹ÞQR‘ 7‡f<þyši“w#¥­jÀ3ï•ZWú/<ÏÑ\¨»‚u™»*IWˆ¬>Ëêê&ÔU äÔ­¾ŒƒÅkÈšµÀOöÛ3Çí`4kýgÿbD`ûyБ@úúº‡ˆÙ>ôò}`«ÉK‚žÞ†…ªÆ(ILeÃXJÌ÷š’bÕþAž™U2”`XDÐnvfÚu¿¸v%¿Î;l¹G$!*[¸'õ Õ–»öÑl©;á¶ìöoœÕåL šd…÷× Âhx_gþD™ ÂëO‹×¼ÚÝó¾ŽO¼¯Ë ïëúÊŸ—îðÀÁøÈû:ãë.ϼ¯kìîîÊûzBø¦{Usßi4ܯã1¯#ã¯#ã%¯#ã5¯#ã€bãã•Ù÷³F˜%f½‹ãSâígÄŠ§ ˆ¹ó#¦Ó1Š0sÑ&½>¨¦[ÞW‚cŠš}­´ÂÀëL® yì/\¤KñNqÀ.Áéæn~££—sbÅï-W¡¥:BÐzçèïÜõ Ügqðâh™nSÞ[óy3éX-Ñ#Ò×ÊžNáÐ8±ÔÉD¶?`Ono– Êu–nýöáñžù*¢_¬^ÃújÙC`þ}°@9#C’6ðÁXé ÃÏÐæ“) Ü „¸ëRÕÎ2ƒ¯ño|ãÕx!Q5pÖFˆu8m Ö‘ËΫ—DŠ©Õ:Vée‡5]XÛãŒáHÈM'ÄÒYC½u䛦R×ÖdÅN¾ â^Âën†ü‰XSØ1mý@ª]®ÍxªO~¥¿Œ<+—ºùìSEŸÍ†­ÕWSìv0ÊbàzÅ ‘>_Œ™DˆïHÙ"`:­¬•ö'úr²HèO™šž¯6Ço§Ì•Ùòö<`Ä·ÙP¥aD£€±!yS• 󀇓/DïÌÙý&\ä2$serQt®DÙšñ$žçŸ‹q—Wzpò7†ÅþfĸØAÂBÕVÚÐA5BCJ•›Lt´ <Ô­s1Uu—evÆr"ç·¢—Œ¿Ös!nò’ž@BO 1Òa@ŸŒNÂ{8-/¤|›‹ôgŸSÒ9ß½0bX&|øõÃMÚ)<6Îó°:‡g)s0uˇ$ÕLËQ‚6ÇAKºh!@°ºfá٪݂IËž\9¤Ñ«ÒQļ†ËFû¦H,š²Å± -#äM—xÒ¶ˆbYOÄY›½8èÒ9My€ s²—›>“¹»$ÁX(šÑd‘4>œ¤=À¤>D±ñb…9Ê -X*8¡½È³óÚÀ®+kæ÷ És/ %Þ¸¤¹+f²ý}itnœ¸Ž5z×¼'êxlÛ /Oh}7s3 Dëç¤LfÒ‘*¤ðD<䣣΅Î.£6±¸Ú´àï… @+dé4 $è*@:+¸±DŒÔVÒ¤‚ci"W†%)³žò¬“IД{šDÝâù×–)þfÁDô-·ð 8…\ØeWÔ‡›> p£_ú° –K€Ñ]â,pÁríPFìÁìÎkü|¿Þù,SÀÝeðõ`¢ûg˜T5@ó—\7Ï9È;83ÛÙô_^Bÿ3o9VÕèÒh‰cVÿwO!µ&™ž½£¤eŒ;p@ê^˜Ð³^Ë.»cøO»‘…‘µÄˆN¡Ž=ä)ï ¹ªm6|ÁÏ/±V Ý+âÞE¬~Õ®R_Ó*<»j`·S‡°»~GU:ÚÉÛý&öj8¹g(ÏYÚ6ú¥–€k¿í`ت¤ã ~—z›8{ø‰ â”ÈÏN -D*°uÃS"cpJ¾nGk_èíÆ=AÁ¿o‡_÷Er­Ué胢õ¯‹Ë—û•c+öðØj`ç®Boª@²ÀŸn -»vû„sÛ•NøÌ)Ò›Zú§ÕM$-^S:*µ¼œˆˆ8£3º5M“ü– -@í¤VÎH'g-L“ÖrŽÃHîCð­ã6û}òð@E $òü x©NAeëHSÖµ‘·êÂð‘/°äZ'æh¤¶›yÓß“ˆƒGûBÃP„9D¤—EDpÙH™E­cë"Ä.„Ó`^Ø•²¡Ž8àá/çè’Ÿ¢l¦¨¶­¯gA™¨…=à Ï·3iò´ÄDÛ°Ó¸ÆjUÂs_R>¹‹,lFC|ò¿a•ÇçÄ>¼¸Ëõáø¼nf§ÊiµXí>¬ª€ÊËaXs7ݧO³YcößKr?¹ng»Ë‡ÿë'r9¯+9›ì§³ò -}×ç¶åZé ’¶W)ï%’s_fÕ|†FÉ9Ú ÙLD6Ô€@ƒ¾“ ¢›axîV'])”Sì6¨{Ô©Íšä쿦,¥b[ :u´ nšY—_ Çe/þSÆëžB4b_'6æwÄØ#  éºèS°ì„ÃhÁ^'ÁX´I¯±š¢Qú¼°¦.óÁ2|Al1bŠXK,b>jN÷Ž ÜB­(À—Z6¦‡·¶º'%‹Š:4,¸S‹Úö×j;ušªõm/¤rE-!¨ôП~gfZ­øàÉ!}nH~õ!1²‡Ã Ò¢“Ö…Y…9”åu Ù^|tGGìçÚDˆy‘°q0Ù›æUÎÁ]QÌ©xQÁn/¾igH&dfŸq1gÖ›Q_qpgrv(£Ì´‚Ûàü 4ÍÌ'FRŠg5ÊÂ’~ð,M*JfV@B¹ä¥Lr/¥Û:ªi}@\ ¾6I°fjrÕq ¡°pT©Þ6ƒnÑÆðœ"_€bIÇ(¨÷/v†f:˜rþ²¾úôRx̨祛àEèá.ÁBƒG9ÊCdâŽxŽ›¨aÖHæ¦!Dè˜cƹŠnÚ 5LœÅÈyúˆË^ã -)­´î:n:h¶wPl\Ì™À§FoMão<ìËá`®Æ#&ÁQŸ§N=µëO¢ `_;ú×ëÊ|úf¹m L±b˜îÍzJp^|#Är.ðŸÒñ¦ -lݬ—/0û6ÍKwºB;…¤Ü>ìêžõì]:ÜfB3ËåÖc Œ0æÓ”V™Ð»Èå×y××¥•6›ÂO˦.¥J:?èšk)•® ÚKÍ8󔜹œAð)˜W颎ó!BÆ%¯£jE4äìÑö¢B¹I¥Õ¿QBÈÐ5äo”x‘²œò7J™6(£†(PBsíÀtIxÒo¢‡a*r?·„ê©)´0Ñß-Ú·Sã,žhŒÂ …,¬Qb@üè„ ®ãêQ>hABÝ­ ê´àìV¹ \û´‘ë± êl‰ÚQ)KI¹ôЀ›¶q<&7‚yÉ|/P¨–˜è§££™~¶V[ ÓÄuãî)òP» íý˜…=´¶Í#2 -†¯ÚHC¥»­o8aܤ%È9ô¥Ïó¿¹çù›fYpž›N#3/nÖói*“1dAŽÊSîì{Áq­øa-yIóÃ(ªxŠU¤ß}~÷¬EAþ³ØI:˜}¥géÔ¥["ý&‘ÒÙɉLm’CÝ}c" TÜ®TdÆ-èú>6ƒâ{òbÈR†Ëóñ!,îÄJc‘ïtmï ƒÌ?`(Æ1p?—è2lh”¢ì€_Ô´dÇ/ýc¤r$Ä{x7H*˜D¸tY–C³Éúø†jÇoGEh³…Šní7—€ˆãvÜê:Ÿ·~”Ú>t@ì‹ÖRÛçæÂzÉúQjû°X^±~”Ú>dHäËÖRÛbyÝúQjûÜL|ÊúQjû0‡°¯Y?JmH±×­¥¶Ï-Pù%ëG©íÝׯ[?Jm®•ô¼õC*Á‚€P± n*há/ø-"AÜ´]ù‡aÜbAÜ\?Ìß„q‹qSëå/øyAÜçÿ «`$9 ¦vS®{S¥Ó'õÙåz€ \Ãøl±ÚGÿÌN*ìƒúÿaø‡Ç÷}§àôÃÇ*#Ùôƒ0}w*ÝÐ;]’«ÉeµßNÿ|øá£N©ØÌ%?üTÛ!hø0‚ΠCм2A—êûpÄ÷û |SO·?Rÿ=ìO— -|ku^7³Æþ#Q¯?nÏm>T¡1ðÿÎÀ˜bð©¢Bí^·Ûí">*”#hðø’~Á£ÿ|8?J½ú1…¿ýTyÝ„Ýõasûìn·çc«²yí^‚ðyoŠì#ÅíA¸À3êgwØÍÅ Gv¼§¦L94›íÁ4ảMþÄ4áÿ/§‰tÇC>}C?Ð)ó %ùm´åvÓÙ©ïõËþôóÿpÀßÅv—Õh³W»éà—¡±Òù'[LUî£é£Ó~~jP8'î%gènn°'æû97Wø‘^D€*v†;=ÎÔîñzÜ8šÝù¼„|ðyœ€ÅiâÆÄ)íº§4Ž¹ì„ÏçüÀ0§Ýë$Û‚g¸Ýã#ØG8†Úq§—|àòb€ñQè‚ÛM>A½€Ø æÃí>twúì(Šº>0—׎{>0a½†=`>ûd¢ Ôçõì# rCȸÏîqÎÛËîÅ1ü†yâ"ì^ P÷Ø]N¯÷ƒ‹õ€}@4€çæñx@ßÀÐI0H sŽ`àä/éï@¨àîÄ’Û#Ðîv~8Üéû°9Ý€:n 0ðSúëDåuÙÝ„“`ø|vîï ·Å!5P—L–@Ä}@?ÍPŸpùÌåôAv7 -~Ÿ€Q°DcLTŽÛ#°Mp7è«ÇMAq»À8Aï §PA°á²»<(Avü‚œ&¯p“ö¹p°zÜ ç.˜ypy½‚ÛÇ>c±¨#)ãöú\œ'^@^§‹š#úþƒÅQÌîÁ!; vÌ…ƒ÷ Åœ€0nŠR ð#’³À >ÐuÚ}N7'ȃzÀw¯sz\„×îÄQÈv7>0xÐÉàCî% xpØ=†Å™ w€náeÛ^ò¹\؇ ôi¿=ðÚzÝ·G>À ^°*…³P„«i¢Šp26w; J§‹Óhº‚‡j"—§Í‡òü_¨l(\C(¤2`w'î“ zë,ǼÂêÐmñt¶ô 0 6/êÅì†ze~êÅ]pM»|ñ ƒþó‰s‘l÷k|{û%ŨÛCÈüÐXÚëuyØ*î.Å…{;;P<..ÇÁ^•D&÷Çd¿=쯻éÇy9:Ì>¶ûéŒ#m@Ì0\€iZ‹ Ì7Jóîuþݲ|€é(¾÷ùP7.»‡pyÉE -4ûd¢ìíqC21<àçn~Ã|g0MTÌ0Z܆πøPg±ÐßÁêdz´`ºÊ@¸Nè@ä^ò‘Q)â«l -€H¥ÿ†~¦·RrªáNH - X‘óí‘nc8ÐÄxu`s½÷`ƒÃá6ˆ‚­‰yÅÐ9Ý>÷íÜ ÝN $(·ì˜oÜNH&çÇ -Ø@9˜˜Ó›[¦¿7(Â1ÉÌùÿ'ã?ß&ȘßÔ¶îòºé{1“}VdŸa`w"0Ò˜`~z{´¹‡VT-UmÕNUSùhÝõþs¤÷§Ùj±«Œg¨hu°5;À‚z5€ú¨Í€þ àzÚA`@EòÏùñáølœF»ó|Ú‚ŸQ!6=xq ¯»¬ÏIÀ=h.°¹Pôƒ[½ ó|@%ÈÁ3hèHŽ.#(­×(‚@W˜WçÄ4ûÉ´ÂH×FrºÍü:#Uï.ê?Û·ÐE°³ÄοQ“wwÆÆtb<•œGÜyLJÎUÐõ,)ãШs×F÷—Çšk¬×³é‚Y4ù?í] Sêʶþü‡ÍA0ݙÔ„QDATfEÁ{«î¯k5$AdïsŽõê¾[çÝ]µ1¬N¯^=%ë[C3ä¹1¹Ò¸qî™ 0Þ¸þ¨ ÌB­,Zv¤F }i>ZB†‹—m½®TõTö8_ùã}£Ø“o…õxZÖµ»ðÔäKŽ®žã Èp•ÌÕ”Îîó±Ê½G9v†u,?zê^†¢×¶V¹ÑËsÃŽF -’ž¬îóé˜yÉ• B{ ‚„a¿»ùÇÇJ UÎŽYÉŠù‚òü<Ò3¥˜¥žNæº K'£îèRc½ÆãŒÞâÀ–¤È •onÔÏ™ÔlUŠMž&9:«¦bùs>-«¹6HNâ¥àO;OÞ0/Ašoú"åº;Kä¨2lJGšlÙþ“ð1ÚStI;i(™d¢Õef-hYKÓH»xË&EBN´^ ® -2oª‘Ffy_ëæ¦éÌ«/˜E¥1ú·Ö¸LÛÖXmØǹô…›ì¾Xݧ!®*e~ZãÐ|eG£ÒNés­(<´ÏeCºm^3ÏÆuoú‚v7ü@Í™>ã™–Àêq3«ô9±4În»³©“NJ½MwE»/_ -ë¤Ý v0*u¥ßÔ²º¸Á+ÖK@±óš2…¾t¥\£#|ðµMõ÷Âëd;&ÞÁ"Ÿ®`$ê=+‘ˆ¿;÷ÕÐP¸†u}ÛÛeðq”ÀÞvúò„{:É•³1j•cÇx¨ÎŒçhñÆoÔ·2G»)4µÀçs6>]=ÕzÉÑã%´2JY¢ßrùþiëÝ{‰+ÿúúÏ<@Ü¡úýþRÆ* Ÿcä=$Xt¸÷PjñžÅì CöO§xÞMéº'.¯°b³üÇÖÜ]úy¤º¡!G_-f…«ë+;µÃð9ÉlžL$w—çÕó”Æ×Õ[®¬g»—êæ‘+›=´0VÁ‘gôâ Zx(ñ ¨¼µ8ûáaŠ›Hf0 Ô‰0Ì9Bæóì˜+Û7;h/äq£µ}¸ |©%ôKù_´2ê7r‡ë¼ô* ÎÂÏg‡ HÛØ-éZOrÕ ¬ì»þÉÿRØ+°´:'ø’¸Ç‡dQ©‡âMÌϘãîI+kÀ“Ò8£Vvu+]/#IKk!r²¬O¨}vÞäC©÷¶¤ù—A!£Ôš’v1‚•Í‡O®› w5Û§5iÑí=aRH—›ü4$~ý‡]zU×Sñ’ Ëk¼uE -ÑäD+5ÌŒ»o†"KáŬÂ;5AdIÙÕÒ®êÀñ€Æ ªnM—6ûÊí«îý A§úC¼Àl¡¨5 `— o x©{ßáÊ€õ¦Š¤nŒE‹STo)Z[4Œ ‚<@tŠ‡ó=çs) Ð¡‘v+mI[50\ý±/lnÛ#òÃòí#u›xõí7ZùÒhe§š'Ç>'gà„DEý¡ÂˆJTbFFÿóªŒ6©-AUS ¶•ÐT,K ZÀ=D¡ïA«‘D´(ÞhíK;(§[Í/‡/Ãñh~ÚØ°hã“ÉÁø¹ÈEAÓ•Äåeæ¯W&;ŠöÔElÁ=õz°ý>`c%+¢äÞ!PC& ‡à¶•\ÁµØÊeƒ0xÉkÊ¥@=Gï.·.§/ýúTý4ÿÇØå߉^â æKh“ä9qd$‡$)ʆò7@1IBú•G“h‚W½–Ãá?‹bÖ¦‡P íúÕí¼fÞTæg|húúOC1ÔÖ>£“FýE›wü¼˜ê$ö¢ëLëË=^Do7½Ï6 =Ï~KúÁt’²H1è§N_§™ÜcuÒIû©1¶ÙI²SÏœäW½ÛkÐul‹ ϧ§ç÷KÐ|_*Y<Ž1v:íß™Ôjóøºg W° -¨øÚhë¤ÿØ3x3tœ„V -P4hà™Œ=Óê¤৾}Óëf=Xà9©°,œþû Ð¶¹0uõµ\©cŽ[•×æS±V½5Å׎mÖoÁÄ÷š´S|Ê`P&ôØÀ4[‰ôí4fæq|(/f®H-iØè°èËìÀDh¡r„k¾çûÇâÒ[L×Ó$+ö9¢v–  5ºÛ³à·¥#¦ #XélñÍë7„Do©D‚úû‡}l™•å#SÞ’£zýܜɵƒ0bñ«u¡ïB¨´®TúÒ¸LHB©bm±’Xíï컌Víh“t« 'ë럠,¾¤õÙKÑï×~}ø"飶¸Qâ,‚*ÄŽCãʵéPNW.‹lŒvúR ¿AS­¶·>yãBê‚ÞÚõi]”ôäÃケ‡“çbú1™&OÚ©·ºÿòÙ§þb [»KèsN-ù_ÔQ]nçGR–,c¼…¨•»\a³²hÁJƒ´Å’/(.ˆ2µ;Q!¢>¿G›ÍŽsù(Û¸ýRxh®íœ©†8á:/2>Ö8;¡Œè7ó£­4texÒìˆyL¸Ž˜QõŒúd°6.?ŽúÞ˜0•;&]söf½õÜãË?ˆeé‘i\ï&Fm1Õ9çW½s¢Ý«ßºÎ¬R»¾tX(ë½×¶­y˜°G!³X?šÂ‹}Ø;ôžµlÑ*G/úÞ’¸lµe¨láù­`üéò[øÊÿžÃrÇ])ÎÓoc‰ëêÇz„Ï%#X)f%’$5’“ -ÌìòZë®ô&ócjå^O{,g³Ï›”Èsi}£§$>©ÑþÑÇûhå•û@ôÅâLF>«|à´@>ÕÝm^Ý»Òh^/L}Ì# ½Û7êŸw°L¥=*Ãy$àá"̼anÝcK/.OÜ‚4ºGÃ_ -.Ó:žñ}¨!SÔP"_ ´þ¤÷•™–>\PÐu–˜WŽ}-²_X¸6Ý‚E¾×m}uC4á{[*¦ïù+˜†´i‡Ñ†© /ä)øf=_»5øU:Ìéyoõ®îÒðñÁâiaÒðÏ~þ…<¬³3¸Á€ÊŸCyHýNæ0ýVîA°óìò/ç;ßÈ@€J5!ØùNNÊwò Þw2 Ú÷r â7³pξ‘€ÕþzF.ãoä$@µïd%@µïå%;fŸe&}ÍM Ò&7ápjB°ã&'lr`46ûª°O”ÍqçéîÕ­‡ÁþÛXò‹šè]W84•Šœ‚±þn›îMLP~Ù&ÌŒ(ÁR7ÿR“¸éE ^! E°qpþW ‚üwÞAðPÁÔ|_onâœÜ0kºêõg£á^ÊXeúöò…˜›M‹éÛÓ‹ÒÛ?Fïkçn–¹¦vðqþ)½ìO¼›œGvUÕÆoòýÔß$ð/{O£ú{o:½ûžV½Œ~ôÞÞæëÞz´€X£Õzþ>‚Aÿ)PŹ=ÌWmßÿÈÚ‡ž endstream endobj 157 0 obj [/ICCBased 159 0 R] endobj 139 0 obj <>stream -H‰ÜWËŽE Ý÷WÔr²èšz—+Ë  i@h®!„.„w‚ Bù}ΩWßn"6!‹Ìµ»ì²]>~Ü~~§nïïŒzöÑZŒ–”ÕOËí'Fýôz1Ê(‰A'p]Œê—Ëó{œ¼mr¶É=;A4Qðd¿3ʪӋe5Úx§NgÕ¼*Õ4*ç­rY—›ÓÏON¿TAÛM•áy˜S -þ°Üü:NuõßÜ|ýĺ›ŸOêÉ·§O—Û;X|~]õ¥^Ÿ_-7OŸR¦v£ªüvJ‡àñö¹þææžú¾õç÷—ªñùiç©kžþ¾8£]JÊzÑâ¬zœ ›´X·t E•¤£å‹8/FÛœÕyÙÓ—Å{-¢²×¾Xå©É© …ðç$ÝÑ—ACCÈA\뢂0*Á6+8/;ò²HÔɇN–¢ ^Â%]rQÖDm‹¨`u)¢ÆŒ¢} -d\g½N¦~¶0ÊÚ mƒ‚ôŽ†°sÚº0ãV‡Ô¢.¼¯ÇK¤ôŽ†´:fK[Û€XO?L wIçè ñ=ò"ø•ÃÁ5o -è­$ÓÝ$È—ÉÀûxC«³s|<ËkJD”£Ê- ¸Ï <òM²’¤C º„¤Š×ÙàŒhKë 6Ôg;r Á"o 9Ï…\³Žñ%Y©¨Ã ~MBÖ'Êd¸èÕØž :& uRý?p.'*sÖ¦štšæ;ùbó[¢z£‚ºG)B!$×Ö¸û2 /â§Çeu5yZãƒ[ÑX³N¨U rd¤à å*à”à0ìwH}A¥Àé’áÂ$qªtÀ ŒÌuëá8RXšôŠÜ15–+YôØJ‹ÄåŒ xÓÜ–RµÊâ[¤z@%ð¬*Áïåšã¼6¹‹ ^TSÁ„Ë2/Áí‰VØjÎMå\AmÝbgþˆì•ƒÊ¡Ñ~ÊTŸÈKxžbm(®q/î!œ ˆø®Ú4ÎHÙ]( ª®ðÃ0"õ®RmD5WšA…®%DͤfsF\Þ$äÁ×ÍÚ3uç8aJ‹O¬7v1t>7ŸqŽ¡Ús{ŠÑ‚ð5¿ŠMU,“ïÙ®¼SRŒMÖŽO™áš«9*ŽÉ&} O&p<óµÿbѹ=@gŒÐK ÿ ëßÚa;Øg¦wé óòryXèðþ^BmŸ“G¹5éìþˆý g6¢_Œ.,‰’б'Î /bsª÷¢D³ˆðéúßþn'^$ó;¼Êè}Cº“¦>uû½Öoj®Í릺_=8fˆ6×_ÀmW[Õõ¿qª½çU)$>¿Í´Ë»r@j*¢ë_7H܈”(%Íïý™“Uîdu¦ÿ^Ç·.¹T¯›îvõ`˜)º=ÑÿÅ— i舀j©ã^Ì æ[öAG]ãìcQÄŠ-µo€—­ ù4i´òç²q0fáx1µtμUŽÈ´muáȹTËL(U†Ý{Ò°Ô‡+Ýè@Êf»õñm–ýÝú!uŵœbF 0•ôCŽ-œ½H;VGó§ÍF6…*ãS“¨®öJ–òµŽÎi:ª7ۊ°jÄôàíõ„­ÑrkDÅÅ ’{&`TD£ÆÝ%&4K¦4'Wô…e›Šìn*ú7Z8."ZyeEþ!`ü0y˜´LºLêYïÔ<eÐÀ¸ ÷Žúü!ûtUç©ËLäï[*€&TIÍ:PØÙ¼©XÝ3©ÈY¤™Ì,u¿âH1šeÑA]‡EåPÕr[Ę”PIá4Õ]ÓF|á6'ܹУqf²@Î+t/'¥.—;å1Ä…z>´‚"pJ°ÁbÞâ¸Ìù¿Î¥u3Ù3èŒTœ!Ëë¦gç[«ŠÔA”Á)ŒŠ!²^1åF«­þì9Ta¡RªL¢,]VÆ›Ð>¼ÈÛ ÌåkLFšÀ`WJA`±48:sã‰Ø`£*‡y“ƒñœ†3Öt­ Úî}¡3 >¾/ -Ò¿FAúÏ‘ý!»´[0ÐCSKÜÇhŒägb‚5 Ðd'î(ÉXNùg€jO_n³QÇ  #Q¶pƒxÞÓ¸—mÌôs ɳ2Àd1½pœ—= Y(¡Ð¨4› zÖ¨L†›—›u˲Å+9€"~ù'ôÐuËBG&À$]ùÀ€x¾'ü¹b…Qvð6¯ï@ñºÁáŠÆÄpyâ^€ÎÃAaÀØï`Œý%R"ÂÙDÇn3 "߃ºW´ÄÑ’Ûúè7?¿¿Søó—ÃŽ_^ endstream endobj 140 0 obj <> endobj 152 0 obj <>/ExtGState<>>>/Subtype/Form>>stream -/CS0 cs 1 1 1 scn -/GS0 gs -q 1 0 0 1 273.1465 197.5684 cm -0 0 m -0 -43.758 -64.479 -79.23 -144.02 -79.23 c --223.561 -79.23 -288.041 -43.758 -288.041 0 c --288.041 43.757 -223.561 79.23 -144.02 79.23 c --64.479 79.23 0 43.757 0 0 c -f -Q - endstream endobj 191 0 obj <> endobj 145 0 obj <> endobj 192 0 obj <> endobj 193 0 obj [0.0] endobj 194 0 obj <>/XObject<>>>/Subtype/Form>>stream -0 g -/GS0 gs --14.895 276.798 288.041 -158.46 re -f -q -5 w 4 M 0 j 0 J []0 d -0 Tc 0 Tw 0 Ts 100 Tz 0 Tr /Fm0 Do -Q - endstream endobj 195 0 obj <> endobj 196 0 obj <>/ExtGState<>/Shading<>>>/Subtype/Form>>stream -q -215.399 177.843 m -212.793 177.843 210.248 177.581 207.787 177.088 c -192.902 212 158.27 236.475 117.92 236.475 c -63.987 236.475 20.267 192.753 20.267 138.821 c -20.267 116.813 27.549 96.508 39.833 80.178 c -33.879 73.392 30.262 64.505 30.262 54.768 c -30.262 33.474 47.525 16.21 68.819 16.21 c -85.634 16.21 99.927 26.979 105.199 41.992 c -109.363 41.45 113.608 41.168 117.92 41.168 c -122.124 41.168 126.268 41.435 130.332 41.95 c -135.57 26.874 149.894 16.048 166.752 16.048 c -188.047 16.048 205.309 33.311 205.309 54.605 c -205.309 64.301 201.723 73.152 195.814 79.927 c -200.787 86.493 204.946 93.707 208.147 101.421 c -210.498 100.973 212.92 100.729 215.399 100.729 c -236.694 100.729 253.955 117.992 253.955 139.286 c -253.955 160.581 236.694 177.843 215.399 177.843 c -W n -q -0 g -/GS0 gs --0.0000153 220.4262695 220.4262695 0.0000153 137.1108398 16.0478516 cm -BX /Sh0 sh EX Q -Q -/CS1 CS 0 0 0 SCN -10 w 4 M 0 j 0 J []0 d -/GS0 gs -q 1 0 0 1 215.3994 177.8428 cm -0 0 m --2.606 0 -5.151 -0.262 -7.613 -0.755 c --22.498 34.158 -57.129 58.632 -97.479 58.632 c --151.412 58.632 -195.133 14.911 -195.133 -39.021 c --195.133 -61.03 -187.851 -81.335 -175.567 -97.665 c --181.52 -104.451 -185.137 -113.338 -185.137 -123.075 c --185.137 -144.369 -167.875 -161.633 -146.581 -161.633 c --129.765 -161.633 -115.473 -150.863 -110.201 -135.851 c --106.036 -136.393 -101.792 -136.675 -97.479 -136.675 c --93.275 -136.675 -89.132 -136.408 -85.067 -135.893 c --79.829 -150.969 -65.506 -161.795 -48.647 -161.795 c --27.353 -161.795 -10.09 -144.532 -10.09 -123.237 c --10.09 -113.542 -13.677 -104.69 -19.585 -97.916 c --14.612 -91.35 -10.453 -84.136 -7.252 -76.422 c --4.902 -76.87 -2.479 -77.113 0 -77.113 c -21.294 -77.113 38.556 -59.851 38.556 -38.557 c -38.556 -17.262 21.294 0 0 0 c -h -S -Q - endstream endobj 197 0 obj <> endobj 190 0 obj [/ICCBased 159 0 R] endobj 5 0 obj <> endobj 6 0 obj <> endobj 7 0 obj <> endobj 71 0 obj <> endobj 72 0 obj <> endobj 73 0 obj <> endobj 105 0 obj [/View/Design] endobj 106 0 obj <>>> endobj 103 0 obj [/View/Design] endobj 104 0 obj <>>> endobj 101 0 obj [/View/Design] endobj 102 0 obj <>>> endobj 40 0 obj [/View/Design] endobj 41 0 obj <>>> endobj 38 0 obj [/View/Design] endobj 39 0 obj <>>> endobj 36 0 obj [/View/Design] endobj 37 0 obj <>>> endobj 138 0 obj [137 0 R 136 0 R 135 0 R] endobj 198 0 obj <> endobj xref 0 199 0000000004 65535 f -0000000016 00000 n -0000000260 00000 n -0000038121 00000 n -0000000008 00000 f -0000123867 00000 n -0000123937 00000 n -0000124007 00000 n -0000000011 00000 f -0000038179 00000 n -0000038742 00000 n -0000000012 00000 f -0000000013 00000 f -0000000014 00000 f -0000000015 00000 f -0000000016 00000 f -0000000017 00000 f -0000000018 00000 f -0000000019 00000 f -0000000020 00000 f -0000000021 00000 f -0000000022 00000 f -0000000023 00000 f -0000000024 00000 f -0000000025 00000 f -0000000026 00000 f -0000000027 00000 f -0000000028 00000 f -0000000029 00000 f -0000000030 00000 f -0000000031 00000 f -0000000032 00000 f -0000000033 00000 f -0000000034 00000 f -0000000035 00000 f -0000000042 00000 f -0000124882 00000 n -0000124913 00000 n -0000124766 00000 n -0000124797 00000 n -0000124650 00000 n -0000124681 00000 n -0000000043 00000 f -0000000044 00000 f -0000000045 00000 f -0000000046 00000 f -0000000047 00000 f -0000000048 00000 f -0000000049 00000 f -0000000050 00000 f -0000000051 00000 f -0000000052 00000 f -0000000053 00000 f -0000000054 00000 f -0000000055 00000 f -0000000056 00000 f -0000000057 00000 f -0000000058 00000 f -0000000059 00000 f -0000000060 00000 f -0000000061 00000 f -0000000062 00000 f -0000000063 00000 f -0000000064 00000 f -0000000065 00000 f -0000000066 00000 f -0000000067 00000 f -0000000068 00000 f -0000000069 00000 f -0000000070 00000 f -0000000000 00000 f -0000124077 00000 n -0000124150 00000 n -0000124223 00000 n -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000124532 00000 n -0000124564 00000 n -0000124414 00000 n -0000124446 00000 n -0000124296 00000 n -0000124328 00000 n -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000046200 00000 n -0000046274 00000 n -0000046348 00000 n -0000124998 00000 n -0000118563 00000 n -0000120558 00000 n -0000053905 00000 n -0000042007 00000 n -0000041893 00000 n -0000050486 00000 n -0000121134 00000 n -0000046776 00000 n -0000047130 00000 n -0000044693 00000 n -0000044839 00000 n -0000045033 00000 n -0000045228 00000 n -0000120622 00000 n -0000039298 00000 n -0000041317 00000 n -0000050600 00000 n -0000041381 00000 n -0000118526 00000 n -0000041829 00000 n -0000042044 00000 n -0000045424 00000 n -0000045852 00000 n -0000045461 00000 n -0000045973 00000 n -0000046079 00000 n -0000046658 00000 n -0000046690 00000 n -0000046540 00000 n -0000046572 00000 n -0000046422 00000 n -0000046454 00000 n -0000048308 00000 n -0000047303 00000 n -0000047599 00000 n -0000048622 00000 n -0000050727 00000 n -0000050793 00000 n -0000050816 00000 n -0000051142 00000 n -0000051220 00000 n -0000053222 00000 n -0000053296 00000 n -0000053442 00000 n -0000053587 00000 n -0000053678 00000 n -0000053784 00000 n -0000053981 00000 n -0000054159 00000 n -0000055195 00000 n -0000066477 00000 n -0000123830 00000 n -0000121070 00000 n -0000121261 00000 n -0000121327 00000 n -0000121350 00000 n -0000121676 00000 n -0000121754 00000 n -0000123756 00000 n -0000125041 00000 n -trailer <]>> startxref 125182 %%EOF \ No newline at end of file diff --git a/www/images/windows.ai b/www/images/windows.ai deleted file mode 100644 index 3f5e8f7..0000000 --- a/www/images/windows.ai +++ /dev/null @@ -1,1435 +0,0 @@ -%PDF-1.5 %âãÏÓ -1 0 obj <>/OCGs[13 0 R 187 0 R 370 0 R]>>/Type/Catalog>> endobj 545 0 obj <>stream - - - - - application/pdf - - - Basic RGB - - - - - Adobe Illustrator CS3 - 2010-05-11T11:57:26+01:00 - 2010-05-11T12:42:12+01:00 - 2010-05-11T12:42:12+01:00 - - - - 256 - 232 - JPEG - /9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgA6AEAAwER AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE 1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp 0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo +DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8A9U4q7FXYq7FXYq7FXYqg dR13SNOH+m3UcTf77Jq//AirfhmLn1uLF9cgPv8Ak5ODR5cv0RJ+75scu/zIsgStjbPN1HqSEIPm AORP4ZpNR7Rwj9ESffs7XF2FP+OQHu3SyXzlrtxuJEgXusSj9bcj+OaXP7QamXIiPuH67cyPZeGH Ti96UXmranLX1LuZwexkYj7q5rp67PP6pyPxLnYtNjHKI+SR3MrEkkknxymyXY44pZPPIpqrkEdC CcmHLhAFTj80+YbIj6rqNxEB0AkYj7iaZlYtVlh9MpD4s5dnYMn1QifgnmmfnN5ms2C3qxX8Q68l 9N6ezJQfeM3Gn7Zzx5kS9/7HXaj2W0+T6LgfmPtZ55e/NzypqzLDPKdOum29K4ICEnssn2fvpm80 /a2Of1ek/Z8/108zrfZrU4N4jjj5c/kzVWVlDKQykVBG4IzaAg7h0BFN4UOxV2KuxV2KuxV2KuxV 2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KvKfPfnXWP05c6ZYXRgs7crGxi+F2cAF6v9rYmm2cr2t2 hk8QwjKojue17H7JxeDHJONzlvv3dNvtYrCXduTksx3LE1JznJl3UqHJMrdemY8i4cymC/CmUFxj zQdw3XJBvgEruG65YHMgEruX65MOZjCVztucsiHNgEFM2ZcA5EQl1w3XMzGG0J35W/NfzN5VkVIp fremg/HYzElad+DdVObPTZJ4/pPw6Or7Q7A0+rFkcM/5w/T3vfPI35neWPOEA+ozejfqtZtPmIEq +PH+ce4zd4dVGex2l+OX4vyfOe1ews+iPrFw6SHL9jLcynTOxV2KuxV2KuxV2KuxV2KuxV2KuxV2 KuxV2KuxV2KuxV2KqV3cx2tpNdS19KCNpXp14oCx/VkZzEYknkGeLGZyERzJr5vnqS4lu7ya6mPK WeRpHbxZzU/rzzzNkM5GR5l9SjAQgIjlEUjrdemYsi40ymduvTMeRcOZRUholMqaY80uuG65MOVA JZct1ywOZAJVcv1yYc3GEtlbLoBy4hAztmXAN4S25frmbjDbEJLfSds2GIOVjDMvyL0U6p+Y1g5r 6Wnh7yQg0P7sUT/h2XM/Tw4ph572s1XhaOQ6zPD+v7H1lm1fInYq7FXYq7FXYq7FXYq7FXYq7FXY q7FXYq7FXYq7FXYq7FWKfmbqX1PyrNGppJeututDQ0PxN9HFSPpzWdr5uDAf6WzuuwMHiakHpAX+ r7S8ftk6ZxEi93kKa269Mx5Fw5lM7demUSLhzLdw3XIhEAllw3XLA5kAldy3XJhzMYSq5bJhzcYS +U5kQDkxCAuG65mQDeEsun65m4w2xCR3T1k+WbDGNnKiNnsv/OPuiv6N1qX2XuZ0t4nGzBY/icg/ 7Ifdmz0cdiXzb221fFmhiH8Is+8vavO2qyaZ5bup4XMdw4EMDr1DSGlR7hanDr83h4iRzeEySqLw /S/zE8waFrUzWs5mswwSS1lJaNuA4sR/KSe4zRaLLPHAEHnv83BOUxOz2Tyr+Yvl/wAwIkaSfVL4 0BtJiASfBG2Dfr9s3mDXQnsdpfjk5WPURltyLKczXIdirsVdirsVdirsVdirsVSLWPPHlfSCVvL5 Ay/bWOshUDqW41pT78xZ6zHE8N7+TRLU4xLhv1dycWl3bXltHdWsqz28yhopYyGVlPcEZkxkCLDe Cq4VdirsVdirsVeU/m5qIm1ez09CCLWIySU6h5T0P+xQH6c5ft7Nc4w7hfze19mcHDilkP8AEa+X 9rELZemc3Iu8yFNLdemY8i4cymUQotcok4kkPcN1whtgEruG65YHMgEruX65MObjCVTtucnEOZAI KZsyoByYhLrhuuZuMNoSq7egOZ2MN8Akrks57knbM6Icg7B9X/lHoQ03QdPgK0eG3EslevqzfEQf lyIzcYY1EPiHbGq8fVZJ9DLb3DYKH5wauIUtLMH+5R7yVfcArH99GGaXtufFw4x1/s/W6XPLkHhs VWJZjUnck+OY0nXSKYW9VIIND2IyiTRIs58u/mP5k0xViklF7bCg9OerED/JevIfqy7F2hkx9bHm 2Q1k4eYZ/pf5paFdKBeRyWUn7RI9RPoKjl/wubPF2xiP1en7fx8nMx9o4zz2ZHa+YdCuqehfwOx/ Y9RVb/gSQ34ZnQ1WKXKQ+blxzQlyIR6srAMpBB6EbjMgFtbJAFTsB1OKoSfWNJtzSe9giPg8iA/c TlUs+OPOQHxYHJEcyEpvPPvlq2DUuGndeqRIxP0FuK/jmHk7UwR637miesxx6sc1L81nHJdPsgP5 ZJ2rUf6i0p/wWYOXto/wR+bhZe1K+kfNhus+b/MGphkubx/SaoMMfwJQ9iq0r9Oa7LrMuT6js6nU a7LPmdmG+YZmFl6KkepcuI1r79f15doo3O+7du7IxXMy7n0l5U0ldG8tadptOJtYEWQdg5HJ+v8A lE50+ONRAenCbZNXYq7FXYq7FXgPmHUv0p5hvr4MWjllYREih9NPhT/hQM4LX5vEyyl5vpuhweDg hDqBv7+v2tWy9M10imZTS3XpmPIuHMo0/DHlLj9UBcN1yYcmASy4brlgcyASq5frkw5mMJZM3XLY BzIhAzNtmXAN8UuuG65mYw2xSa+k2OZ+IOTjCt5P0n9L+Z9OsCvKOWZTKP8AitPif/hQczsUeKQD g9tavwNLOfXh2952D7F8uW/p2JkpvKxI+S7D+Obl8ReJ/mpq4vNYvmUgq0wto9/2INmp/s1r9Ocr nn4mpJ6R/s/W4GaVksJgXpjIuHIo+FemUSLRIphCvTKJFokUdENsoLSVdKjoaZFmFVNm5DZvEdcb LaCVWnIgt8RHQnc4DIlmCqMTTc4LZFDyHJhokUNIcsDjzKElOWBxplC6Rb/pDztpltTnFaEXEqsK qeHxUb7qZuuzse195+56XsnFw4r73uEFzeahewxTSFkZgWQbLQbnYbdBm+dqyvFXYq7FXYqlHm7U zpvlu/u1JEixFIiDQh5PgUj5Fq5i63N4eGUvJzuzNP4uohHpf2Dd4TbLnASL6TkKaW69MokXCmUz t16ZjyLhzKtO1BTKwwgEtuG65YHLgEruW65YHMxhKrl+uTDm4wl0rZfAOVEIGdsy4BvCWXL9czcY bYpJevVqZsMQcqAeh/kXo5uNZvdTZaraxCGI/wDFkx7f7FT9+bLSRs33PEe22rrHDEP4jZ9wfSeo 3S6PoE9xt/okBK+7hfh+9sy8+TggZdwfNZGhb5n8wTmW+WMty9JasfF3+In7qZymlHpMu8/ds63I UNAvTLJFxpFMIFyiRaJFHwLmPItEijEG2VFrCsoyLYFZRgbAqqMWwOkOIWSGkOWBx5FDSHLA48yh JCO/QdfllgaOHikB3pl+VVmbi+1TWXGzsIIW6gitSR9w+/Op0ePhAHcHtcMOGID2Dy1ByuZJj0jX iPm39gzObWRYq7FXYq7FXnn5walxsrHTVI5TSGeQV3Cxjiu3gSx+7ND27mqEYd5v5PU+zGC5zyHo K+f9n2vOrZemclIvVZCmluvTMeRcOZTOBaCuUSLhzKncN1wBnAJZcN1ywOZAJXct1ywOZjCVXDb5 IObAICZsyoByIhAXDdczMYbglV0+xzNxhuiEknblIc2EBs5Q5Pov8itB+reXrKR1o95I13JXrxGy D5UUH6c22ljUfe+Q+1Or8bWyA5Q9P6/tZh+amo+hocNkGKteSjnT/fcXxMfobjmB2zm4cVDnL9H7 aeWzHanz3LMbi6lnP+7GLAeAJ2H0ZrIx4YiPc66ZtFQLlci48ij4FyiRaJFHwrmPItEiilGVoCso wNgVVGBsCsuBsCnIckGEihpDlgceRQshywONMpXrFz9XsJ5K0bjxX5tsMy9NDimA5HZ2LjzDyeh+ QdL/AEd5WsoiAJJl9eSncybg/wDA0zqcA9N971wel6BB6Wnqx+1KS5+XQfqy5UyxV2KuxV2KvE/z E1L6/wCbblVblFZhbZNqUKbuP+DZs4ztjNx5yOkdvx8X0LsPB4elj3y9X6vspKbZOmaWRc3IU0t1 6ZjyLhzKYL8MeUFxjzQdw3XJBvgEruG65YHMgEruX65YHMxhK5m3OTiHNgEDM3XMuAb4hLrhuuZu MN0UovZKA5nYg3wCAsrSa9voLSEcpbiRY0HiXNBmdEXsnVZhixymeUQS+xvJWmRWdkscQ/dW0aW0 XyRR/QZuoihT4RmyGczI85G/m89/OPV/U1OeFTVbSFbdRX/dk3xP/wAI34ZzfaU/E1Aj0j/b99Ov zy3eWwLlci4Mij4F6ZRItEij4V6ZRItEij4htmPJoKIUZFkFZRgbAqqMDYFToMWahIckGmRQ0hyw NEihZTlgcWZSi+gfUNU03S0JrczKXNKjiDTfNp2fjsk/D5u77Gxeky73tUEAAjgiWgHFI1H3AZ0g FO+Z1DGsUSRr9lFCj5AUwquxV2KuxVQv7yOysbi8kFY7eN5WA6kIpag+7IZJiETI9A2YcRyTEBzk QPm+ehLJcXEk8rFpJWLux6lmNSc89yzMiSer6lwiMREcgmFsnTMWRcWZTS3XpmPIuHMomU0SmVNM eaXXDdcsDlwCWXLdcmHMgEquX65MOZjCWytl0A5cQgZ2zMgG8Jbct1zMxhtikt9J2zYYg5WMMm/K LSfr/nKCVlDRWCNcvXxHwp9zsDmw00bm837XavwtGYjnkNfpL6v0tEtNKSSQ8V4mWRj2B3r/AMDm zJoWXyUvnHznqb31+0rfauZZLlx4cmIUfRuM5HFLjySmfx1/U63JJJ4V6ZZIuLIphCvTKJFokUfC uY8i0SKNjG2UlqV1GBmFVRgbAqqMDYFzmgxCSh5Dkw0SKFkOWBx5lCyHLQ401XyDafX/ADjc3pBM WnxcEbqC7fD/ABzoezsdRHzev0OLgxgPYdDg9XUYyfsx1c/R0/HNs5jLMVdirsVdirEPzS1L6p5X a3Uj1L6RYaVoeA+NiP8AgQD881XbGbgwEfztne+z2Dj1Il0gL/R+Pc8ktk6ZxUi9xkKaRJ6aepIR HGOruQo+85SQS4UpWaG60+ZdGhf00lNzN2jt1MhPyI2/HLMehyT5AtctPKrlUR5mlddR1i5NLXQb lwehuGFuP+G/rmzw9hTPOJ+Ozhyz6aHPLH4DiX+h5selNEtUFf8Adkwf/iLZnR7EmP4Y/Nq/lPSD /KT+EVsth5qNOWi2DjuEkIP4kZM9jT/mwTHtbSj/ACmT5JfeaXfqK3Xl6ZAeslpMJj/wA5Zi5exs g/h+Rc3D2vhJ9OYf50a+1Irm005pDElw9rOOtveoYmHzb7Oa/Jp54zuC7nBrDIXQkO+Jv7Ep1HT7 21HKWMiM/ZlX4kPh8Q2yWKQPJ2OLPCfI7pFcv1zYYw5cQkd09ZM2GMbOXEbPaPyE0M/o65vmFHvp 1gjJH7EfUj2Jb8M2mkjsS+Ze2mr488cQ5Qj9p/Y9h8/ah9Q8q3QQ8XuALaID/izZh/wAbI9pZeDC fPb8fB4fKai+cNUm9bU5jWqofTX5Jt+J3zQYI1jHnv8AN12Q7roFxkXGkUfAuUSLRIo+Bcx5FokU YgypgFVRgbArKMDaFVRizC2Q4QiRQ0hyYceRQshy0OPMoK7mWGGSVjQRqWJ+WW448RA70abHx5QG U/lVpxg8vPeuoEuoStISO6rsv48s63Txofjo9pEUHqnlmCkU05/aIRfkNz+vMhKd4q7FXYq7FXnH 5rWepXF1YMlpcXVpGjLFHaRGVzM5+INT7I4qtK++aDtnT5cpiIC4/peo9n9TixRnchGR7z0H4LE7 Ty55luDQRw6PF05PS4uPu+wPvrmLg7Bkd5mnL1PbuCP03kP+lj+tNbbyJoysJb9ptSnG/O5clQfZ F4insa5ucPZeHH0t02bt3UT2iRCP9FPbWzs7RDHawRwIdykSKgr8lAzOjEDkHUzySmbkST5ouO0u pPsQu3yUnJMFddH1JukDfTQfrOKF/wCgtV/3x/wyf1xVY2j6mvWBvoIP6jiqBv8ASkmiMV/aCSL+ SaPkv/DDIyiCKItsx5ZQNxJB8mMXvkS0AZ9Jnewc/agP723b/WRjtXxB+jNXqex8OTceku803tBm jtkHiD5S+bAvMnk54mIuoRp052S5jq9lIT0FesRPgc02XT5tMfUOOHf1ez7N7chl+k8XkfqH63ne q6VqGn3XoXcJjdv7tuquPFWGxGZuDLGYuJt6nFqITjcS+pvyt0Iabo+nWhWjWtuHlB/37J8TD72O b7FHhiA+Jdqarx9TPJ3yPy6ID84tX9JrW0U7W8b3UgrsWPwx/wDET9+aPtqfFKOPv/H3W6fPLd4l CCTU9cx5F18ij4FyiRaJFHwLlEi0SKPhXMeRaJIlRkFCsowNoVVGBsCqNhizUpDkg1yKFkOWBx5F CynLA40yk2vOzWqW0dfUupFiFBU0PXM/Qxud/wA0Ox7HxXMy7nsOlWK2Gm2tmtKQRqhpsCQNz9Jz p4R4YgPTM80uD0LCGPoePJvm2/8AHJqisVdirsVdiqy4dkgkdPtKpK1IAqB3J2xV5vf+ZvK9gxSf UkuZxv8AV7IfWGPj8dViB+b5nYuzs096oee37XWZ+2NPjNGVy7hv+xBL5xWZqWViqrXaS5dpCR/q R+kFP0nModmRj9R+Ti/ywZfTGverSarqjRGt08YO4EIWEj5NEEc/STk46fGDsP0olqchG5/R9ySa hcTTAieWSf3mdpD97ljmVCIHIU4mSZPM2x+7itxWkSCtSfhHfMqJLgzpJ5riS2Ja3YwsNwYzx/Vm RGIlz3cPJkMeRpdZfmJ5109ybbWLgjskz+uo+Sy8wMGTQYZc4j7vuRp+09TE7TPx3+9mOif85A6l Cwj1ywjuYtgZ7YmOQDuSrclb5DjmszdixP0Gve9Bp+2p/wAYB9234+x6PoHmryP5sSmnzxm6Iq1s /wC6uBtX7P7VO9KjNNqNHkxfUNu/o7vBq8eTkd+5Eah5W5xusRWeJwQ8EoBqD23+E/TmIRblxkQb GxYFffl1phuhHIGjs1YSNp8ih0VwagxFt0r3pmtPZWLxOONx93V3mP2hzxxmPOVVxda8+96V5bg4 WbykbytsfZdv11zZuheH/mfrAvdXvnVgVln9GP8A4xwUG3zYA5ymWfiamUukf7P1uBmlZLDoF6YZ Fw5FHwr0yiRaJFMIVyiRaJFHRDbKC0lXUZFmFVRgbArKMDYF52GLIoeQ5MNEihpDlgceRQkpywON MqGhWf6S87WMJBMNivryHtUbgH6ds3fZuPa+8/c9N2Vi4cQPe9jsoPXu4ouzsOXy6n8M3rtWa4od irsVdiqS+c/MB8veV9Q1dVDy20X7lG6GRyESvTbkwr7ZkaXD4uSMO8uPq8/hYpT7h/Y+bNY86+af ML11S/kljJBFup9OEU6UjSi19+udjh0eLF9I/W+faztDNm+uRru6fJdpEPKQHwyWU7OHpo3K2b6V D0zWZC9Hp4ptcNxWnhlEXNkk92/XMiIcaZSS8frmRAOJkLH9Rk2I8cy8YdZqJJQ5y0sMEUPKcgXa 4ghfrE0MqywuY5EIZHU0IINQQRkSLc+Aen+Rf+cgdU0xo7HzKG1CxFFW8H+9CDxav959O/vmo1XZ MZ7w9J+z9jtcGpnHY+ofb+Pf83uunaj5f8z6Yl7p88d7aPss0Z+JTStD+0rb9DnPZcUscuGQouzx 5BMWEd9VeLT2trZ+EojKxSMK0cjZiPnvlUgSNmZfOHm/QNY06/FvqkDWzJVbeb7UMo7srgd9vl3p nNHSSw897cGeCVJLHE6MAwocoJtwZghHQLlMi48ij4FzHkWiRRiDbKi1hWUZFsCsowNgVVGLYHSH ELJDSHLA48ihpDlgceRQsjDv0G5ywNAjxSA702/Kmz9ZtT1lwCZ5PRiYfyruw/4jnU6PHwj3Cv1v bYYcMQHrPlqDndvMekS0Hzbb9VczmxkmKuxV2KuxV5J/zkLrXpaRpujIw5XczXEwB+IJCKKCPBmf /hc3nYeK5mfcPvdB7QZ+HEIfzj934Dxa1TpnSl4bIWUaJBsD45iZ5OboYbWzXTIgFB8M1uQvQYIr 7t+uCIbJlJbt+uZEQ4sykl7J1zJgHDyFjt/JV6eGZcBs6rMbKAc4S5WCKFlORdljCCmbA5+MICds XMgH1F/zjzoP6N/L+O8cUm1SeS4JI4sI1PpIp9qozD55yfamXjzEd2ztsMai9NZlWnIgV2Fdt81s pAcy3AJZ5j0hNW0xrOSJJo2PJopBUGgPQ9jvscZRBFFDyHXPy4uLd3bS2pQktY3HT/YOf4/fms1H ZwlvH8fjzasmGMubFZoJrGb0b6B7SXsJAeJp3VhsR/nXNNm0uSHMOtzaGX8KMtwGUMpDL/MDUfeM 183WZcco8xSKUZW1hWUYGwKqjA2BWXA2BTkOSDCSBubq3i/vJVT2J3+7rl0IGXIIjpsk+QS5tTWa QQ2cMlzM32URTU/ICrH7szMWjnJysfZV/Wfkmll5M8yakK3ZXT7ZuqneQgj+QH/iTDNtg7Lrcuzw 6SGP6QzrRNHtdI06OxtizIhLF2pyZmNSTSmbfHjERQckM38vQenYBz1lYt9A2H6smqZ4q7FXYq7F XzT+cus/pTz9dRK/ODTkS0joKUK/FJ9PqOwzr+yMXBgB/nbvEdv5+LPX80V+ljNpHUgeObEvNz3L MtHgAC5r8sneaWFBldsvCGuYEty7mAoIO7frlkQ1zKS3b9cyIhxZlIr2TrmVAODlLH7h+Tk5lDk6 0byQsh2yJdlhihJWyLscYQMzYubjCGit5bu7htoV5yzOsaIDQksaAZHJPhiSejnYo2afZHkTTv0f pcdnGxNvaRRW8YPQlFpy+e2cNOXFIk9XbMS/MrW5v0hcRRSlUtUWGMAkfvJBVyKd+JP3Z5925l8f WjHzhjHL7fvIB9z0PZuLhx31Kj5U/M++tVS11cG6txQLOP71R7/zZdpu28mm9MvXj7uo9x6+4/MB dR2bGe8fSfsej29zouuWwkgkS4SnUGjr/EZ1mj7Qw6kXjlfl1Hw/AdJmwTxmpBK9T8piWNkVUuoG 6wygH9fwnMwxB5tLCdR/LvSPVLRpNp057xMVH/AtXb5UzEy6HHPmEGIKUy+R9bi/3l1KOYfyzx8f +GXmcwJ9jQPJx5aPGegUH8uecI9ljtJfdWcf8SK5jHsQ9/3fqaj2fjWjRPOv/LJbf8H/AM34P5EP efmP1JGgh5qo8r+cpOtxaQD25E/ijZbHsQdfv/UzGkgOiqn5fahMAb3V2/yo4kNKfMsP+I5lY+yY Rbo4YjkExs/y+8uW55SRyXR2I9ZzQEeycB9+ZsdJjHS2dJ/a2dnaR+nawRwRk1KxqEFfE0pl+0R3 BkAjbOyuLxmEChuOzmoAFfHKsOpxZb4JRlXOiDXyZShKPMEJxa+WkFGuZOX+Qmw+85ewTqONIo1j QURAAo9hiq7FXYq7FUPqN7DYafc301fRtYnnkp14xqWP4DJQiZSAHVjKQiCTyD5Cmup76+uL2di8 9zK80rnqWdixP3nO+hARiIjo+Z6nKZzMj1NpnpkXKVfbIZDQcXFHimzfSYdlzW5S9Fp4p/J8EQHt mKObsjsEou365fEOPMpLeSdcyIhw5lINQlopzKxh1+eWySOanMguNhG6HlOVl2mIIOZsDsMYQMzY ubjDJfyn0gal52tWdQ0ViGupAexTaMj5SFc1vauXhwkfztnZaaO9vrPSlSz0gSy/CvFppD7UrX/g RnIzmIRMjyG7ngWaDxDzPfSXVyGcnnPI9zIP9ZiF+74s8x00zknkynnI/tP3j5PXY4cMQEvgXplG plu2hOtMuLm1lWW3kaKQdGU0OYBmYm4miOoRKIkKO7ONK886lGAl2i3Cj9r7LfeM3Wk9q9Th2nWS PnsfmP0gutzdl45fT6WRQ+atIuU4zoyA9Q681/Cv6s6LT+2Gkn9fFA+6x9m/2Ovydm5I8qLbReWr jdZY4ie4fh+Dbfhm3x9t6OfLLD4mvvpxTpsg/hKi2i6Y1fSvlFPEo36iuZI1+nPLJD/TD9bDwp9x +Sg+kWi7/pGCnuwH/G2Ql2npY88uP/TR/WkYJ/zT8lB7Owj+3fpTtwVn/VmFm9otDj55B8LP3Bsj pMh6KDtp6bCSSU+yBB95Zj+GanUe2uljtCMpn4Afj4N8OzpnmQENJdJuI46A/wAx5EfdxH4ZodV7 a6me2OMYD/TH9X2OXj7NgOZtDSSyOdz17DYZzmq7S1GoP7ycpeV7fLk52PDCHIUo/l/9YvfOmo3a SMLS1i9Mqp+FmJooYd6fEc7v2W0vCInyJ+fT9PwcDtGfpp6dnbuldirsVdirsVYD+dusjT/IlxAp pLqUkdqlDQ8SfUc07jilD882fZOLjzg/zd3V9sZvD08u+W3z/Y+drZOmdeXz3IWSaLDVuVMxcxbd FCzbNtLh6ZrchejwRRt0/XK4hyJlJbt+uZEQ40ykl5J1zIgHDyFj2oSdszMYdXnkljHJlswRQ0py Ds8QQUzYHPxhATti5sA9k/IHQ2Nleaiw+O8nS2hqKEKgqxB7hi4+7Ob7Zy3MR7na6eNRt7X51uxZ +XJo02a4428YHg32h/wAOcX7Q6nwtJLvl6fnz+y3Z6DHxZR5bvDr+T1dQlNSVQ+mu9dk+Hb5kVzj cMeDEB15/Pd6ZWtl3Ga3NKyyTa1TpmFMqmtqnTMSZVMohQZjyapFVGQYKilvE4eI97EhWjHc5n6e Pe1yWymrZi6mVyTFTOUMwpthZBC39yttaTTtsI0LfTTbL8GPjmIjqUnk3+X1xc2GhyTRhVmvpDK8 tKtQbL128c9j7GwCGMkddh7o/tt0Gvnc67mc+XvWm9a6mdnYkIpY16bmn4ZuHBTjFXYq7FXYq8G/ 5yC1kXGv6dpEbBlsYTNKB1Ek56H/AGCA/TnTdh4qhKfea+TyntHn3jDu3ecWqdM3ZeQyFluiwUVd swc0na6PHQDMbFOMdfbNdMu9xCgo3b9clELMpLdv1zIiHEmUjvZOuZMA4WUsevH5SHMuI2dZM3JB udsS52GKFlbIOyxhAzNi52MIGUkmg6nYY25mMPq38p9B/Ruh6XaFSrW9v6swbciWX42BPszn7s4n VZePJKXm7iIoUu/M/VBHNBbgilrE1wwPQu3woD9K/jnBe1GXxM2PAPefj+wH5u87Kx7GTyqBeman UzdwEztU6Zp5lkm1snTMSZQmtsuwzFmVKOUUGUFpKoMixXqN8QLLEohdlzaQ2i1FRY1OauRs22BY cDIKbZIMgkHm6dhYR2qf3l1IqADwGbrsTFxZuI8oi2OQ7MmsrZbWzht16RIqfcM9g02Lw8cY9w+3 q8xlnxSJZvpMHoafClKMV5N823y9rReKuxV2KuxV8m+ctZ/Tnm/VNSDF4pp2WBiKH0o/gj/4RRnc 6PF4eGMfJ877Vz+JnlLzr5bKVjFykUe+XSOzqQLkAzXSIaBc1uUvQaaDJVHCAe+YfV2o2CW3b9cu iGmZSW8frl8Q4mQpDfSUBzKgHAzSSGVqscynBxiyh5DkC7TFFBzNkXYYwgZmxc3GEb5O0j9Mea9N sGAaOSYNMp7xR/HIP+AU5i67L4eKRdhp43J9h+WoONrJMRvI1B8l/tJzjHZPJ/PmqfW9Ru5Faonn 9NNuscNB+NFOebZs3j6zJk6R2H3D7Afm9TpMfBjAY5AvTMTUycoJpap0zWTLJNrZOmYkyhNYF6Zi yLGSKGVNRXjAxVIxvlmGNyYyVnNEzN1Eqg1jmoHNY2LGyQZBTY5IMgx+Vfr/AJwtYOsdkvqP/rdd /ppnb+y+luif4pfZH9fJw9bk4YFmlpB691FD/OwB+Xf8M9JefZsAAKDpih2KuxV2KpB5+1o6N5O1 bUFJEscDJCQaESS/u0I+TODmTo8XiZYx83G1mbwsUp9w/sfKlstdz1zuS+aZCn+kQ8pAadMoynZG ljcrZxpUP2c1mQvR6eKa3DUWnhlEXNkk12/XMiIcaZSW8k65kQDh5Cx/UZNiPHMvGHW6iSUOctLH BFDynIF2mIIKZsDn4wgZ2xc3GHo35E6R62rahqrj4baJYYqjbnKSSVPiFQj6c0fbWXaMPi7TSx6v o/UJ/wBE+W5pR8MkEB4/8ZG2H/DtnI9o6jwdPOfUR29/Ifa7DT4+OYHm8J1eTneLFvSFAN/FviP6 wM870UeHFf8AOP7HrGrddxmJnlZZBNrVOmYEylNbVOmYsyhM4V2zGkWuRVxkGtcMihXiGZmmi1yL pTvTBq5b0iKkcxGxY2EMgpOwVSzfZUEn5DfJxG7JJvJcZuLjUNUcVM8nCNv8kbn+Getez2l8OP8A ViB8Tuf0Ol7Rych8XoHluDnetKekS7fNtv1VzpXVslxV2KuxV2KvI/8AnIbWfS0nTNGQjldzNcTC vxBIRxXbwZpPwze9h4rnKfcPvef9oc/DiEP5x+54xap0zpC8PkLKNEg2Bp1zEzyc3Qw2tmumxUUH wzW5C9Dgiuu364IhnMpLdv1zIiHFmUjvZOuZMA4eQsev5KtTwzLgHVZjZQDnCXKwRQspyLs8QQUz YHOxhATti5kA+jPyQ0A2nlrTw6FZb6RruYHf4Tsu/gUQH6c5HtLLx5j5bO3xRqIZp+ZN8sen21mW oJ5DJLvT93EN6/S1fozhPazUEYo4hzmfu/aQ7jsvHczLueMhzNM8pFDIxcj/AFjXNDkAhERHQU75 H2yb5p8hZptbJ0zDmUJtbJsMxZlUfGKDMctJVRkWK4YGJRMYoM2mCNBqkpOasc12WVyLMKZyDILG yTIJT5ju/q2kXDg0Zx6a/Ns2HZmHxM8R8fksjQTDy1ZfU9EtYiKOyeo/zf4s9i7Nx8OEH+dv8+X2 U85q58WQ+TOvLsHp2JkPWVifoGw/jme4yaYq7FXYq7FXzT+cms/pTz9dRq3ODTkS0joKUKDlJ9Ik dhnX9kYuDAD/ADt3iO3s/Hnr+aK/SxzT7WaZwkUbSN4KCxp9GbCcgBZee8OUzUQSfJkkeo6LpKj9 JX8Fsy9YufqSf8i4+bfhmvnIy+kEvS6Ts/IBuKRNv+Y2my8odH0zUdXkXvbw0X7/AIm/4XMWeIj6 pRj7y7nHo9lcat59vU52nk301I2N5dhW+lawH6MqOXDHnk+Q/tbxoh3KMtn+Z0wBHlzS4gRurzzM 1fmtzTEazAP45fIfqU9nQP8AD9pQsul+fuLGfylbSKBv6F5xPvQNM/6ssjrcXTIfjH9jTPsnGf4f tY5qRW2BfVNG1PSAWp6zoJ4B/suMP6zmfi1XFtGUZfYf0uszdgRuwSEEsMF0tdPuorwUr6aErLT/ AIxOFf8A4GuX+L3inFOgyY/MJdcBlYqwKsNiDsQcnbbjigJmxc3GFKys5dQ1K1sYaerdSpFHXpyd gorTK82TggZdwc/DGyA+xPJunQ2sQjhXjBaxJbwjwVQAB9AXOHlIk2XasK/M3VPV1O5RTtAiWqf6 zfE/4Fh9GefdsZvG19dMY+79p+x6Ls3Hw4r72CwLmv1M3YhNLVOmamZZJtbJ0zEmUJrbrsMxZlBR ijKS0leMDFUQb5LGLLEq52TNlM8MGvqoHNS2LGwhkFjZIMgxzzEDeanp2mL0kk9SSnYf7WdP7O6Y zkT31EfFpzz4Y33MxVeiqPYAZ6yAAKDzJLN7aEQ28cQ/YUL9wwoVMVdirsVdir5bvPKvnabWb7/n Xrq4vzM73V7ffubX1HcsWRuQWUVNdn38M6z8/ijAVIAV05/secj2LxzMsm5JvyT2y/KnWrxANf1t o4DWthpoEUYr/lkCv0ofnmty9rD+CPxlu7fDooQFAV7mT6T+XHkvSwPq+lwySClZbgeu1R3Hqcgp /wBUDMDLrs0+cj9zlDGB0ZIqqihVAVVFAoFABmIzbxVesEzfZjY/IHFV31O7/wB8Sf8AAt/TFVjR SKKsjKPcEYqxjXfy58oayGa4sEguTUi6tf3MoYmvIlfhY/6wOZeHXZcfI7dx3a5Y4lgPmH8s/M2n oZLN/wBP2CDaGT4L2NRX7Db86D7/AOXNxpu1IS2l6D9jgZtADuHntzahjJ9X5FoyRNbSLwnjI6hk PWniM28ZW4PCYGpMl/JzSTf+c0uWWsOnxPO1RVSx+BBXxBfkPlmt7Xy8OKv5xdlpY72+qNKEdlox uJdlCtPIf8kCv/ERnKZcghEyPKIv5OwjEk0Hh3mO8luboGSvOZnuJP8AWdj+qh+/PMdJIzM8sucp ftP3/Y9bjiIxACDgXplGplu2hNbZOma6ZSm1snTMSZQmkC5jSLCRRAytrXjAxVYhvmRp42WElSU7 Uy7VyoUxioHNe2LGyQZBYckGQSHQ1+vear296xWq+lEfc/D/AFz0r2X0vDGJ7gZfE7D7PudX2hkq Nd7OtGg9bUYgR8KHm3+x3/XnbOlZdirsVdirsVdiqV67bXd0sMMCFlqWc1AApsOvzOKoGHyzct/e yqnsoLH+GKo2Ly3Yr/eM8h+YA/D+uKoqPSdOj+zbof8AWHL/AIlXFUSkUSfYRV+QA/Viq7FXYq7F VGWytJf7yFG9yor9+Kpfc+XLR6mFmhbw+0v47/jirBPO35XadrCGW8g9K8QfudUttpVPbkf2h7N9 FMy9NrcmE7HbuYZMUZiigfInkSLy766C5+uXt86LLP6YiBCkhfgBff4zyNd8Os1hzkGqAY4cIxig z3zvdiy8tvBHs1wUt4x7Hdv+FUjOV9o9T4WkkOs/T+v7A7Ls/HxZR5bvD7uQTX0rj7Ibip8Qvwg/ TTORxx4MQHl9+70qItl3GazLKyyTa2TpmFMpTa2TpmJMoTGIUGY8mqRVRkGC8YGKvENs2Gmjs1yK 2Q1bMbUyuSYqZyhmFNsIZBCahci2sp5z/utCw+dNsyNPi45iI6lJNBDeSLQxaP8AWH/vLp2kJ8QN h/HPY+x8IjjMu818Bt99ug187nXcz/yxB/fTkeEan8T/AAzbuCnuKuxV2KuxV2KuxV2KuxV2KuxV 2KuxV2KuxV2KuxVBfoi0F4l1GvBkJJQfZJp4dsVSrzpoN9qtnE9iUa5tubJDIaKxYDcduQ47V23z Rdudky1kY8Mq4L27783O0WpGIm+rxy60pra5aCaNrS5Q/HDICBvv36ZxuphmxkxmD+n9vwd/jzCQ sL4YHQgOpBzUylbfaaWydMxZlU2tl2GYkygo5RtlJaivGRYr1G+IFliUQuy5tI7Raiok1OauRs22 BYcDIKbZIMgx7zZdB7BLWBg73EqoeJrSny9zm87FwE5uI/whjkOzKbK2W2tIbdekSKn3Cmev6fF4 eOMe4f2vMZJ8UiVHX9S8z6LcILDUEitDoeqaubVrdHPq2H1cIvMnlR/rVT/q5cwRHknztr+t+Y0s byFIbe2sp7e/XgVY6tYywJdmMn/dI+srw8d8VZ/ih2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV 2KuxViPmzQRezPNdQiWEgBJF+0gAp1G4/VmPqNLjzCpi23FmlA3EsIufLWoWtWsZBcQ/75koD+Ox /DOW13szxb4zf2H9Rdph7SH8WyEjvooZPTuoXtpO4INPnQ75yOq7KzYzRH6P2O0x54yGxtOLO4tZ aelKjnwBFfu65psuKUeYIbDK0eAcx6LWV4yLFUjG+W4Y2WElSWRET4mA+ZpmZnlUaYxFpfcarp8F fUmWo/ZBqcw8emyS5BspKrnzTADxt4zIexOw+7Njh7IyS5psBQEPmTUtghghPd/gXxG3U/dnS6L2 YmdyK9+37XFya7HHrfuTLTvK0NvKs9zM08qkMFGyAjceJNM6vSdhYsRBPqI+Adbm18pChsGQ20Jm uI4h+2wX7zm8cFmb2ttJ/eRI9EaL4lB/dvTkm/7LcRUd6YobW3gR/UWNFf4viCgH4yC2/wDlFRXF V+KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2Ku64qld7oFrPV4f3Mh8Psn6O30YqkGoaHc IhW5txND40Dr8/b6cjKAkKIsMoyI3DH7jyrpE26o8JJqTG38G5DNbl7H08+le5yoa3JHraH/AML3 UZ/0fUpY07IQf1hh+rNXl9lsEuR/2IciPaZ6ha2h6+Nl1AEdq8q/qOYZ9kMfQj7f1tg7THct/QGv Ns+oADvQt/QYx9kId8fkf1pPag7m/wDCU8hBn1B3HdeJP4lv4ZmY/ZjEOZ+UQ1ntM9AiYfKWkxmr iSb2dqD/AIUKc2OPsTTx5gy95/U48tfkPkmVtYWVt/cQJGaU5Ko5U9z1ObHFgx4/piA408kpczaJ VWYhVBJPQDc5cwR1toeoT0JT0l/mk2/DrihOtP0OC0kWZnMky9D0UVFOmKplirsVdirsVdirsVdi rsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVQ1xptjPUywqWPVhsfvFMVQMvlq0beOR09jRh/D FUM/liUfYnU/NSP4nFVn+Gbv/fsf4/0xVseWLnvMg+QJxVWj8rp/uy4J9lWn6ycVRUXl/To/tK0h /wApv6UxVHQ28EIpFGqD/JAGKqmKuxV2KuxV2KuxV2KuxV//2Q== - - - - - - uuid:02DCA8B2865EDF118B77FD523B43407A - uuid:866e4198-7c14-f44b-9a2d-58a7167ba7e7 - - uuid:a2b8dcac-7818-4055-b6a1-3efa106255e8 - uuid:9E3E5C9A8C81DB118734DB58FDDE4BA7 - - - - Document - Basic RGB - - - 1 - True - True - - 128.000000 - 128.000000 - Pixels - - - - Cyan - Magenta - Yellow - Black - - - - - - Default Swatch Group - 0 - - - - White - RGB - PROCESS - 255 - 255 - 255 - - - Black - RGB - PROCESS - 0 - 0 - 0 - - - RGB Red - RGB - PROCESS - 255 - 0 - 0 - - - RGB Yellow - RGB - PROCESS - 255 - 255 - 0 - - - RGB Green - RGB - PROCESS - 0 - 255 - 0 - - - RGB Cyan - RGB - PROCESS - 0 - 255 - 255 - - - RGB Blue - RGB - PROCESS - 0 - 0 - 255 - - - RGB Magenta - RGB - PROCESS - 255 - 0 - 255 - - - R=193 G=39 B=45 - RGB - PROCESS - 193 - 39 - 45 - - - R=237 G=28 B=36 - RGB - PROCESS - 237 - 28 - 36 - - - R=241 G=90 B=36 - RGB - PROCESS - 241 - 90 - 36 - - - R=247 G=147 B=30 - RGB - PROCESS - 247 - 147 - 30 - - - R=251 G=176 B=59 - RGB - PROCESS - 251 - 176 - 59 - - - R=252 G=238 B=33 - RGB - PROCESS - 252 - 238 - 33 - - - R=217 G=224 B=33 - RGB - PROCESS - 217 - 224 - 33 - - - R=140 G=198 B=63 - RGB - PROCESS - 140 - 198 - 63 - - - R=57 G=181 B=74 - RGB - PROCESS - 57 - 181 - 74 - - - R=0 G=146 B=69 - RGB - PROCESS - 0 - 146 - 69 - - - R=0 G=104 B=55 - RGB - PROCESS - 0 - 104 - 55 - - - R=34 G=181 B=115 - RGB - PROCESS - 34 - 181 - 115 - - - R=0 G=169 B=157 - RGB - PROCESS - 0 - 169 - 157 - - - R=41 G=171 B=226 - RGB - PROCESS - 41 - 171 - 226 - - - R=0 G=113 B=188 - RGB - PROCESS - 0 - 113 - 188 - - - R=46 G=49 B=146 - RGB - PROCESS - 46 - 49 - 146 - - - R=27 G=20 B=100 - RGB - PROCESS - 27 - 20 - 100 - - - R=102 G=45 B=145 - RGB - PROCESS - 102 - 45 - 145 - - - R=147 G=39 B=143 - RGB - PROCESS - 147 - 39 - 143 - - - R=158 G=0 B=93 - RGB - PROCESS - 158 - 0 - 93 - - - R=212 G=20 B=90 - RGB - PROCESS - 212 - 20 - 90 - - - R=237 G=30 B=121 - RGB - PROCESS - 237 - 30 - 121 - - - R=199 G=178 B=153 - RGB - PROCESS - 199 - 178 - 153 - - - R=153 G=134 B=117 - RGB - PROCESS - 153 - 134 - 117 - - - R=115 G=99 B=87 - RGB - PROCESS - 115 - 99 - 87 - - - R=83 G=71 B=65 - RGB - PROCESS - 83 - 71 - 65 - - - R=198 G=156 B=109 - RGB - PROCESS - 198 - 156 - 109 - - - R=166 G=124 B=82 - RGB - PROCESS - 166 - 124 - 82 - - - R=140 G=98 B=57 - RGB - PROCESS - 140 - 98 - 57 - - - R=117 G=76 B=36 - RGB - PROCESS - 117 - 76 - 36 - - - R=96 G=56 B=19 - RGB - PROCESS - 96 - 56 - 19 - - - R=66 G=33 B=11 - RGB - PROCESS - 66 - 33 - 11 - - - - - - Grayscale - 1 - - - - K=100 - GRAY - PROCESS - 255 - - - K=90 - GRAY - PROCESS - 229 - - - K=80 - GRAY - PROCESS - 204 - - - K=70 - GRAY - PROCESS - 178 - - - K=60 - GRAY - PROCESS - 153 - - - K=50 - GRAY - PROCESS - 127 - - - K=40 - GRAY - PROCESS - 101 - - - K=30 - GRAY - PROCESS - 76 - - - K=20 - GRAY - PROCESS - 50 - - - K=10 - GRAY - PROCESS - 25 - - - R=241 G=241 B=242 - GRAY - PROCESS - 12 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - endstream endobj 2 0 obj <> endobj 13 0 obj <> endobj 187 0 obj <> endobj 370 0 obj <> endobj 371 0 obj [/View/Design] endobj 372 0 obj <>>> endobj 188 0 obj [/View/Design] endobj 189 0 obj <>>> endobj 14 0 obj [/View/Design] endobj 15 0 obj <>>> endobj 369 0 obj [370 0 R] endobj 5 0 obj <>/ArtBox[-0.112305 -0.0820312 127.888 127.918]/Group 538 0 R/MediaBox[0.0 0.0 128.0 128.0]/Thumb 544 0 R/TrimBox[0.0 0.0 128.0 128.0]/Resources<>/Shading<>/ColorSpace<>/Properties<>/ExtGState<>>>/Type/Page/LastModified(D:20100511124212+01'00')>> endobj 537 0 obj <>stream -H‰´WËŽ$Ç ¼×WÔÙ@×$óW­lŸ ÃÐÁº7,ï¡G†¼Àû÷ŽVM=¦Ö„ÅN™/&3$_þþi~ùÛ§0ÿðã§yúm -³Å®ÿ7þù￦οBÿòןÂüï/ÓË_^Ãü㦜uöDŸè’ë^>Asÿ2‡¥þ4þ‰¥Ìó—û¯œnœþÛ 5þÙlÖ—â˜-„¥×çûëÄ¡×émé0v,!·ù–â’CÅï2Ú˜o™ƒm¦2Í÷IrÍ”¡• ¤šû:w@ê!s®¶êܪ4üàœÚâ|ë°¶Ð\Œ…%%Ø2…%ÔÉuëw’ñ÷éÜ÷L ÊZ´´ ¿é~Ö—œ[Âq>·~¿ ¼ƒ›`,zL¸ç¼g] -ŽÂ0!AÑ–hySÀUÔXäšÏÓ/‚ |‰V`#üÒ’°üuª8·«u‰ðȃrÃvs(s-K0It>¤”+z¦7Ïòcju±ª½#ôÁÃFsE†Ë ¶>\¬”jÌ›tŸÎ²çT³c[×›/׸ïpna£0‘Îîð\璘m´ÁUct"§g>sµ”èú~ž_~úæ/Ÿç?ÿ<»ïžGÆÉÏ^ø#–a{ŠÝ¯6êÊÙŒŸXõ’ÀúÜõŽúÈ”K+š–ø׊~ÜÄŸ(ðââäuð×"Bˆ”Qp0抌ûÓ»p“¼‹½ß¦‹B“ʺ êušùxác19FãÛžŽ”Ö×ç7AiݬF¾ú Xq姷,‡âÝ\lMÆ”]²Ž -­¯– òŠ­fc¾xç¶J«Q1j-ôÓ×6ª[E ÃO*Ö€/ÛÁe'p‘á¢ÑJ³Eœ§°%Œ•%ã üX[Fw±Gúéªyh‹ÒÌ—=!wD"å20qÕøša¾¦ƒ4£&7 y›®_Ó‹+ð‚Ãp¬².9h|IË]ËUkjôÑ\&‘oò}ºj|´î±­‰=­²{ìèÓëS€·—Hrg -J6Êõs› ­r´Þʺ=XëþšñÃkúí@1é5@WçþŽnüM»ç“YZ–œF’ÓΚÇ7ÜØËúæݯ|<øëGôÆ:FÔåœÖËéó}˜‡§Üj¡iܬÖÒØ/œ¾‹Sf -Kuˆ†ã7ó|„™+˜†~zçF$µ`–ëº÷ÒfæÀF_ï"»Ûžïðz -ҌĩxÅKε¨ã5â4¼ì!ç’F±ÈD­‘º$$¯¯4„C*V>dp 9‹d–“ %8ëí˜zõœ0žèe…DAAÐR§Âš'…#f¬oë!sÆÇקˆ¦4i²ÛKÜYò9©Ì³Þ®1ÂûמK éø´°•mçØRÞÁ‘ÿp€" ãx®û¡Dº±a‰†»G´[Æ+"'`ÞXé(7Fd/0èÍyŸu^Q… «h™œw…E¬ÉLíIe\Ȫ¾n9,/ÛˆšŠ"Br.9™`AåÈÉØ11Ä2Qõá–›Måff#CÎ4R üp \²Ö¦B—دKBÕ -ä¡wJ*©-›1(]aãK-Àˆ Hs8n÷ê -¤A(P‘¬ÃàsæÚ¯ÓEñb˜‚h¥u}.Y N -_Ъ-xÌs?—Þ¦³ìÓ¼‡éÖµºö?ËÖ  iM9Õ‰ByÿÚFu‹1BŒyõ6jwFpD—3¿Ó NÌž¯ºdt…)îˆÕîÌ’ºœÂ®‚Nƒ•î”ƒâñÜK½ëbAµÓéÄk˜F ,Oe”YŠÇÏ÷ažƒç+ë=ÃpŠ¿g=ÝÝÑ… -?+‹¡KIpvA³@õ"ìÖe]–" [TÂ>+üJ–õ’">l×s½¿üAñ˜:α¹x‚³+˜ge°H3Q ®È.>(šI,Y?¡—`ÍéJW¼0`SLHõ -”ÛAö…h7°£ñH“vȇí»(ïifúHy8Ó ôßÞ ï=Auö—¸‘c¼9È9jî¤ LÂ+g¤RxáFÒ$Ñ€£ ñ¹%:+â5à -Ú¢yˆìÀ' lm`I¿'m² â4BbCddêZR&“ÌG©cIÅG{q© >Øã8‚×IÍ%`@¡ÚÏ ¾³‰VE7 n{D†¤UoWóéÓì@èW냛ºy»UY4†µä¾ oæ4•KV¯”J¢‚A@ êuœ…¸0#t:½OÏòC!GøT9£À«l±2§¡ ›+èÞH–g™¥ÏG^h¥–A -h¬àäœýkÅFµ¢k2zzB7Ðvt÷+-d4멯’“lìÚ©U¾äQS䌬*þ,{¨¢ÔÒl©TmÚ"E߶ òƒ¬µFÂŒÐå2#â$8†J—tîA–[ ydŸÍs) !‡ë=é") uG‹ùò¹M Sá缬¯C•4.=C[hPIï©Øhw¢N º¦Fïÿ¦Zµwk;¶V­®‡4oÕëÞeoÕŽ_baœÖ„”VÙæ«áÏrð(i†<Td;}m£àl8>ddÞ¹GÞ$€¸ÞÝeá š禆ðE~È`®^—ˆê¶ ºª­©FŽQ¶›. -¿$sš_ŠÉgT8?ÍÃÀ„¦\‡\å=6ŽanáÎò“0Lƒ‰³‘À³q *Tÿþyš`ä5Á£ ì¥0ù=©Æ@êAÎ 0¿™j: Èrª×S+Ô¢S­s!SV(ITK²æöv¢6¼ ‡bÎÌñ9 ç -kˆ£Øæt ›.M*º½ ceÝì&d2Kxò(À!³DÎÔ6 ÷:?‹‚ÎZ>(£=›To÷üNÉOD¦_=÷ðr’VË.vWYdÐLߣxåEGØ€‡[²¦)v8û]ÚQx¤W¤šHªoýü«Ÿ¹ÔÜéæïuã(Tó]„¹Oe#]ãY7¸‡j*[G°šéY×»†’Ö仧ªš-61´.±\Jî½C±ÕîU¤AQšcWÇ08“Õ£—A!G;¼ÞâoÆ#,&"ûC£šÂj@ gaw  ‚7Š–”÷é$¢,kÚ'!Lpü ¸9™ÏØAŒ2tÄ·gùA¹ ô€ÌÂRC¸°ëmŽ2äVÌ—î"V‚z xg#WãQX-jý€«tŸÎ2 fpÚ&ƒÊ«ìíºéÁ%JnC#‰\P¶’{—U¨%ƒE[ ;Æ?‚QL´à,Ñê!q½ˆt¹8îmf¡—HÝÍTPgn Ap;<™Máu¿•€Ï”Õ"B„.ÈG–¤´r8hßÁÇl¿ƒOòh‚U”ÇØ؈2laq×"»Ù@d#ñ-Ïyˬ̑…?Ä Â{q*’1[ã¸. xCwƶ–Åα{ø†ûÏädGÍ-í¶Â4,Dü;ã25þö*Éq#F‚w½Bhƒ[ryOƒ9È×üû‰ˆdId•„ ·’Å5—È@#ì’u(}+צ+ E =†ü–²#“Ø"®àF›^)ûQÙ–xµv¹™µ_= ±°8Ò‚^x+±ž -˜LÞyA„˜ÂDn"—r· –¤n*K_‹)2,”7ä9FÙ‡‰Äì䀀*ó“ø‹Ä!ÎD´Õ«x~ ™ÔQPªiÒ@pgþF—ÝFcî Úd`^Fîu :ðÚS÷Màxš›e´Â{âÑ0á´(¢š¤K`ó1´‘®°jH´¨ý`É ¢ê»µHÆŠ¸"á ß bônÌí°P{›ý¸áîÔtÚ ÄŒ²R¿Þw^H+ªº@&ö@‚ ÀÒÆús™`Œ[ËÔ °ÐZØŸ@•ÿ ak”Y~ª}§ ±ŒMyoÞõ<‘\̦Áí½7–6aÆéOÕ—…ô’½A4+×è\Â÷Pjï9Ù]úU0‡ß²“8BEnFÇJ=‘‚ú†»ýP~÷zð Ù½h/«Ú«+v•„eµ®ä;ø]ƒ=¯í?ƒn¤°™/`þc‰[ù«¸1¤C­}ŒÛØR¶2âXð„0ŒwJúÕxr l•‘#;„ƒq™T ª‚§ÇÉbÙÁ‰è1vºâjå¿ðÕ& -éÿ_p[$‰ú -É­ ƒ“‹R(A4ñUxh…!€f+¤¥–Ç´vDî‘ûD^˜#à(bnCUź´ -\ >rqGä±´Ýye¶eµƒ[.43ŽáÅ: â|$Ç QE‚"Sƒ³H\H3Z,¦£z‹°\»J‹ŠÉ3ð“œ'Výäe0 PŠQÄ ¾*Š!Z% ÊZ2 -pš@¨¤>ÇO JQ¼;(ÔHvØBVŸ2ø™Ÿ•iT}È”37 Õ€ó ­F]ÕD;¿ÄÈ($´,6Ê_lg :…[©}X¤1Ñ4Q‰0ç° ™¨t%À¯S“ ¿Í„M” ZMFÔhŸŠ“U³OmDo°j÷¹E KZâ˜ì91;yQˆ×&úâí}ˆ<9—bGadú]ôv™Å^‰ü.îB(7s®xo•”¢º α’TŒë­–V³×p{UÃ=½¯Ú>O}\rõê $ZÙ‹f5/U*„«xe%àH¯„ ëË”wwý§×ð4—*Ò¶ùx>­¢CâÔ»Ý%ëEjÆ2ùëöäßâð¹Ã¤ž²žg|˜äzÑ‹²¡ÐiíÚYäxqs½…Ì!Aassh~G«Þº€,ù#rópw}+¹ÞŸQ€Ê=ô§†ù²Tä©j¾ÂsðÝÅÎÝYÜß1x$Ó3C¶pp /ÏåEö²u牥½†V8íÏÒ‹¢$<Ôž“Ö÷qIt!u(¯cåÈ7îBr ý’J”ŸÀ ¤taÞtXŠUòÃîNœøÅc L“¯‚ÈDÍ3‘CeÙd¥]ãyéÔ›ŸËd~¿ï^ÔÈÓè¯AÆú[6òO6uA×CiR!ÁÌMv¶ïÛi@D¶ -ˆ6Õ ™ì;d!ÝH󼊟ñjïÅ‹«26îÝ}]ì/NÑ”o<¯$¼ylܽkƒu¡'Ö›…Ö¦À ÒX—…©~XX†jQ@½\N*8ö׬RÕ…ÁóÂ>>]•å€‚ç8UÕe¡Wí›…’².ÁÈ|/ ­XtbsPp—…Žw×…}°ÞÞüzõ*«÷ÃB®«íî‚ï²ÎAøÍ:RNé§øç…íCÞtѳ’ŠZï5oXÂïꎾìºÊ>$M7¾/+Ù#¶¾,ÌŸîYš Oäº,L’æmX†·W•à@ÛGrù·lì›Í+R„âÿÀUT’tD”a±®næÔ0!™ñµªGgqvZÂâÍ|Ü -v]‰—É…ÒEWQÈΈœ»ý ©m‡ÐÎøGÊ " -ì~y6¿ækkàà$º—èðzkÒo¸aÄN°¬O~¶ØÚ,W6hWV,FM K7Kók+PË -L’׈o{<¾OB f€¥±ý¿› [θˆ÷Z à%Äì_1õŒá=§ÛX•ËÜœÄq(”P1¬Â9‚›j ÝÉô`“©ÿy)¬ új– ü‰à&‘‘&DÊ“W/F†i”RÔvØ¢%£sÉmHh–^¥#1)ÑúØ©I&A[ 9­XÚªÜ4P05]hò¥¶hÂÙŠKî–xTÕÕÈJ©"Œ9ù@9Ç|(ª”€F­4žx‹­ZiUÙTà]¥pU -ãzJð®WÒîöã&o 9+%^¤¸MÏÃ.†{* qÐ,Ó½à±9O“*ï4€»dÀ`@àŒÆï™*õä…s.áaÐMÿ˜„WÖ´þ\&àž±’ nk¦”ewݲ{€š”c.Þ‡Mj;áU£"Š¬LÚ²ÛÙ|d¦öM ‡ÿÜv[³S”¸HüA]¨½˜g° L.:ßv[k *v÷“XpÈ·0Ò½ÛO -º—!ßö7þœ}ËVžÍœÅöŒ¨¹N:~¾¾sÛ1:ÏàQ@O²Ï—kÛßGfAToÑýnȽ»'s µOâ!®ú’¨ ÚåŸ[ôÖ c¾>h#Z0‹T•°2âü³–b X-`†^l,E H` °;"eq˜A÷Ʀs¶Ô@Õçss~o¬4x¹`xø–b †t 98#ÕûéFçÐ ¨^¬¹Z:~-Hšï|ø¾Å)C÷Ä­ 4B @á&Z!ÌX§ô5$‚ÎiࡼrAnZÐé¸J›nØ|ÁÐüÀ¬¥L0– Þ¼Ûsv”Y|6¹Í^æôeÀçw„ÜêŒ -\Òe²Ð,Èíiús–__B[ä¢ó +t÷Þ¹‘Å£mì:ãüó˜ ºº±Ÿe!¸„m\ÂÖ“’³Ç2³õH–é($SWdkçtüy—Žo\GÖÃÈ´ÉבÞ I-ÆÐ~QµYNi¬?_ßytÁ-ÃP€çfŸúÿ¤ŠE³A/zæ ”À­ &+#ü„bYh%ÒñÙQpšá—H¿P&/°æfeirÒ‚ £ l3`Âþ¦]ØÀ;ºIw+‘l #joöƒ½'—ÊÙ”:°À;""ç.–f"t‹}ZZ?·Ý~Èu™]£|YË/}—ê¡ôo¨f£ÙöëøÊë%ü¦;–ì8ôŒg -Ov¦ð±)8$y®‘ÓÂäÔxÓ)@Ê‚0ø•¡eŠ[¿…jhe²9¤ìBÉK @J öäßÐ)¤Þ0—[Qn& ƒ¯Åc¾ª¢Ç&©$ Ü—.Rã”߼áñŠß·ÿˆ«¾ë~¯Vè¤ -’ –5¸~ézM<Òª¸ñýþb7ëý ˨`’ãPâ6‚‹ZÝóµ¦_&!TŒéjQ‚.4×Kx±íŠç'W}M²z’Aú¸Ù`‹ð)1©on&Ð=žh4s‰ñêa}ßvûA»åu¶rl´Þÿ]òö/(:=’¯õ×ñNŽÀ%ÐŒ{íNZh °ôŒ»Á!:L–€b>à )Dõ¥à_ÄÛb¨,MåÒgñ3Có%yñÕûQüÓš(ÝÛä‚>Pçúì#t ›Þ—_ë:?ƹü~zÞ;§¦‘-JcÕ -ÖnÛ¯ãk ”m’sȃ~EÜ^^MÿâI¹ë¦²ãBÄêLQù'³kó¯’ê«U9rØ’²‡’™Ó‘"œŽ@S!ñ¢KøýõjÉ+†aû9EÖ°åÿºè²7™u€Ü¾$å‰í—)ÐÝdcËY¢(¸¦4Îl|¤E³øË3þã¨=‰‰CíÞm4ï’}v®Û“ºä££Æ©òVÈ ·QX„:ëGT˜X³o{½Pý¹Öbx†{d öÀ­Ï5>XôC"b±’Ã)Kpðý!É`IòÀ *¦“„ILeêC ¼µ†Ì)dâŸj2¥+I?Xï8(6MNjÝMeÈpw -ŸÂ†7°áBlªîN¤á='›쮹Õón¤ä…uÃ[ó¼‚\¨øUŠ$¼RÕåz~™:ùqá‡cçKì,ä@^ê ¹éÂnZÚ>;ÙsáÓý×ìÍ8b ‰4ÎȼoØ=rUÓi#‹; æo¥kSßXê˜ Ú_Ò'³(áÝbF°ne®Ã•H{¢9}GŽ"ðøÆPM¬k ÷Ψå,ô’ BæZW•nr–e$<§ã‘ð– cÑNxŒYüCAÆI%ixÒØvbÁlR@h YjDÜÈÈ¡f³Ó}WʉÁCbÀòaÀàÎÝ+q(Ú ÕH›óÁ±7úãvbDÍÒ3[Qîcâ â¨íXÅåàÄÔ_¨¡ö­ò­tØùõŶ¡©Ë$¹–GÙ5_9ygªJfô£SkDa4\Ê‚îÏHç}@¡¼®©Ø°î[šùlåNMʤ€I"9{LÛ »mÔíIüŒúà§ÊBÁs’H¶–mˆö9~LòrM -í~/ÚÀ^lŠwY_Ïan1 ýª¶QB‚–Së•l›!u -¸$ "Ä/¬â59&¨¸·Žfõ ìÔŒw;ñãÖQƒØa¸é@à9lIÞóBÓ»9inøq•DX jì‘aNþe•wIµ†Ù…!óèvâᘳ4ÁFŠø„Œ½>· £ã“>C7GJM­µªýß>„”ŸA$…%ØâÉ -Qkµ8/tð1Ò„YÃì>8+‹D"›\Jä ×!©ûdx_xƒ’ÕÒÕƒ›‚ùÄ·¤gA ï·KX³œq6¬)ʃ®‚—Ô£”ç=¡kûÚÝ°qnqÃ26ÖOKbï†Ä}š»< O@Zq$Û ë¼#­Ù&¶#‚8ñJ´¶»E5¯àbÇ×s”§ECËn‚×qr[ÑÓ¿Uc"YF3ý]’Õ®½¬®åJ-Õ-ˆÂÙ‰áöE€\Q™-ŸšÍ/ÐçRœZ¼Â°ÚÀý œ­öò su–´c3KÌ‘¢âGz,kᆘ¿ÀàŸôÊçþ”¹\js -¸‹bžYËÎI·+üúýó ?Z·z endstream endobj 538 0 obj <> endobj 544 0 obj <>stream -8;Ul;0abc_&4O9`>>=8e`$-$(lr=fF,BsGVJAQIiJ8'2]/PVEcA!:af9q&VQZVa9P -YNGBS^h"k -Fp9,YjS0,`Z<<)9~> endstream endobj 375 0 obj <> endobj 379 0 obj <> endobj 533 0 obj <> endobj 380 0 obj [/ICCBased 381 0 R] endobj 381 0 obj <>stream -H‰œ–yTSwÇoÉž•°Ãc [€°5la‘QIBHØADED„ª•2ÖmtFOE.®c­Ö}êÒõ0êè8´׎8GNg¦Óïï÷9÷wïïÝß½÷ó '¥ªµÕ0 Ö ÏJŒÅb¤  - 2y­.-;!à’ÆK°ZÜ ü‹ž^i½"LÊÀ0ðÿ‰-×é @8(”µrœ;q®ª7èLöœy¥•&†Qëñq¶4±jž½ç|æ9ÚÄ -V³)gB£0ñiœWו8#©8wÕ©•õ8_Å٥ʨQãüÜ«QÊj@é&»A)/ÇÙgº>'K‚óÈtÕ;\ú” Ó¥$ÕºF½ZUnÀÜå˜(4TŒ%)ë«”ƒ0C&¯”阤Z£“i˜¿óœ8¦Úbx‘ƒE¡ÁÁBÑ;…ú¯›¿P¦ÞÎӓ̹žAü om?çW= -€x¯Íú·¶Ò-Œ¯Àòæ[›Ëû0ñ¾¾øÎ}ø¦y)7ta¾¾õõõ>j¥ÜÇTÐ7úŸ¿@ï¼ÏÇtÜ›ò`qÊ2™±Ê€™ê&¯®ª6ê±ZL®Ä„?â_øóyxg)Ë”z¥ÈçL­UáíÖ*ÔuµSkÿSeØO4?׸¸c¯¯Ø°.òò· åÒR´ ßÞô-•’2ð5ßáÞüÜÏ ú÷Sá>Ó£V­š‹“då`r£¾n~ÏôY &à+`œ;ÂA4ˆÉ 䀰ÈA9Ð=¨- t°lÃ`;»Á~pŒƒÁ ðGp| ®[`Lƒ‡`<¯ "A ˆ YA+äùCb(Š‡R¡,¨*T2B-Ð -¨ꇆ¡Ðnè÷ÐQètº}MA ï —0Óal»Á¾°ŽSàx ¬‚kà&¸^Á£ð>ø0|>_ƒ'á‡ð,ÂG!"F$H:Rˆ”!z¤éF‘Qd?r 9‹\A&‘GÈ ”ˆrQ ¢áhš‹ÊÑ´íE‡Ñ]èaô4zBgÐ×Á–àE#H ‹*B=¡‹0HØIøˆp†p0MxJ$ùD1„˜D, V›‰½Ä­ÄÄãÄKÄ»ÄY‰dEò"EÒI2’ÔEÚBÚGúŒt™4MzN¦‘Èþär!YKî ’÷?%_&ß#¿¢°(®”0J:EAi¤ôQÆ(Ç()Ó”WT6U@ æP+¨íÔ!ê~êêmêæD ¥eÒÔ´å´!ÚïhŸÓ¦h/èº']B/¢éëèÒÓ¿¢?a0nŒhF!ÃÀXÇØÍ8ÅøšñÜŒkæc&5S˜µ™˜6»lö˜Iaº2c˜K™MÌAæ!æEæ#…åÆ’°d¬VÖë(ëk–Íe‹Øél »—½‡}Ž}ŸCâ¸qâ9 -N'çÎ)Î].ÂuæJ¸rî -î÷ wšGä xR^¯‡÷[ÞoÆœchžgÞ`>bþ‰ù$á»ñ¥ü*~ÿ ÿ:ÿ¥…EŒ…ÒbÅ~‹ËÏ,m,£-•–Ý–,¯Y¾´Â¬â­*­6X[ݱF­=­3­ë­·YŸ±~dó ·‘ÛtÛ´¹i ÛzÚfÙ6Û~`{ÁvÖÎÞ.ÑNg·Åî”Ý#{¾}´}…ý€ý§ö¸‘j‡‡ÏþŠ™c1X6„Æfm“Ž;'_9 œr:œ8Ýq¦:‹ËœœO:ϸ8¸¤¹´¸ìu¹éJq»–»nv=ëúÌMà–ï¶ÊmÜí¾ÀR 4 ö -n»3Ü£ÜkÜGݯz=Ä•[=¾ô„=ƒ<Ë=GTB(É/ÙSòƒ,]6*›-•–¾W:#—È7Ë*¢ŠÊe¿ò^YDYÙ}U„j£êAyTù`ù#µD=¬þ¶"©b{ųÊôÊ+¬Ê¯: !kJ4Gµm¥ötµ}uCõ%—®K7YV³©fFŸ¢ßY Õ.©=bàá?SŒîÆ•Æ©ºÈº‘ºçõyõ‡Ø Ú† žkï5%4ý¦m–7Ÿlqlio™Z³lG+ÔZÚz²Í¹­³mzyâò]íÔöÊö?uøuôw|¿"űN»ÎåwW&®ÜÛe֥ﺱ*|ÕöÕèjõê‰5k¶¬yÝ­èþ¢Ç¯g°ç‡^yïkEk‡Öþ¸®lÝD_p߶õÄõÚõ×7DmØÕÏîoê¿»1mãál {àûMśΠnßLÝlÜ<9”úO¤[þ˜¸™$™™üšhšÕ›B›¯œœ‰œ÷dÒž@ž®ŸŸ‹Ÿú i Ø¡G¡¶¢&¢–££v£æ¤V¤Ç¥8¥©¦¦‹¦ý§n§à¨R¨Ä©7©©ªª««u«é¬\¬Ð­D­¸®-®¡¯¯‹°°u°ê±`±Ö²K²Â³8³®´%´œµµŠ¶¶y¶ð·h·à¸Y¸Ñ¹J¹Âº;ºµ».»§¼!¼›½½¾ -¾„¾ÿ¿z¿õÀpÀìÁgÁãÂ_ÂÛÃXÃÔÄQÄÎÅKÅÈÆFÆÃÇAÇ¿È=ȼÉ:ɹÊ8Ê·Ë6˶Ì5̵Í5͵Î6ζÏ7ϸÐ9кÑ<ѾÒ?ÒÁÓDÓÆÔIÔËÕNÕÑÖUÖØ×\×àØdØèÙlÙñÚvÚûÛ€ÜÜŠÝÝ–ÞÞ¢ß)߯à6à½áDáÌâSâÛãcãëäsäüå„æ æ–çç©è2è¼éFéÐê[êåëpëûì†ííœî(î´ï@ïÌðXðåñrñÿòŒóó§ô4ôÂõPõÞömöû÷Šøø¨ù8ùÇúWúçûwüü˜ý)ýºþKþÜÿmÿÿ ÷„óû endstream endobj 450 0 obj <> endobj 453 0 obj <> endobj 458 0 obj <> endobj 462 0 obj <> endobj 410 0 obj <> endobj 467 0 obj <> endobj 416 0 obj <> endobj 470 0 obj <> endobj 421 0 obj <> endobj 477 0 obj <> endobj 424 0 obj <> endobj 482 0 obj <> endobj 427 0 obj <> endobj 485 0 obj <> endobj 430 0 obj <> endobj 489 0 obj <> endobj 433 0 obj <> endobj 436 0 obj <> endobj 440 0 obj <> endobj 445 0 obj <> endobj 493 0 obj <> endobj 496 0 obj <> endobj 502 0 obj <> endobj 505 0 obj <> endobj 508 0 obj <> endobj 512 0 obj <> endobj 517 0 obj <> endobj 522 0 obj <> endobj 528 0 obj <> endobj 408 0 obj [/ICCBased 381 0 R] endobj 529 0 obj <> endobj 530 0 obj <> endobj 531 0 obj <> endobj 532 0 obj <> endobj 523 0 obj <> endobj 524 0 obj <> endobj 525 0 obj <> endobj 526 0 obj <> endobj 527 0 obj <> endobj 518 0 obj <> endobj 519 0 obj <> endobj 520 0 obj <> endobj 521 0 obj <> endobj 513 0 obj <> endobj 514 0 obj <> endobj 515 0 obj <> endobj 516 0 obj <> endobj 509 0 obj <> endobj 510 0 obj <> endobj 511 0 obj <> endobj 506 0 obj <> endobj 507 0 obj <> endobj 503 0 obj <> endobj 504 0 obj <> endobj 497 0 obj <> endobj 498 0 obj <> endobj 499 0 obj <> endobj 500 0 obj <> endobj 501 0 obj <> endobj 494 0 obj <> endobj 495 0 obj <> endobj 446 0 obj <> endobj 447 0 obj <> endobj 448 0 obj <> endobj 449 0 obj <> endobj 441 0 obj <> endobj 442 0 obj <> endobj 443 0 obj <> endobj 444 0 obj <> endobj 437 0 obj <> endobj 438 0 obj <> endobj 439 0 obj <> endobj 434 0 obj <> endobj 435 0 obj <> endobj 490 0 obj <> endobj 491 0 obj <> endobj 492 0 obj <> endobj 431 0 obj <> endobj 432 0 obj <> endobj 486 0 obj <> endobj 487 0 obj <> endobj 488 0 obj <> endobj 428 0 obj <> endobj 429 0 obj <> endobj 483 0 obj <> endobj 484 0 obj <> endobj 425 0 obj <> endobj 426 0 obj <> endobj 478 0 obj <> endobj 479 0 obj <> endobj 480 0 obj <> endobj 481 0 obj <> endobj 422 0 obj <> endobj 423 0 obj <> endobj 471 0 obj <> endobj 472 0 obj <> endobj 473 0 obj <> endobj 474 0 obj <> endobj 475 0 obj <> endobj 476 0 obj <> endobj 417 0 obj <> endobj 418 0 obj <> endobj 419 0 obj <> endobj 420 0 obj <> endobj 468 0 obj <> endobj 469 0 obj <> endobj 411 0 obj <> endobj 412 0 obj <> endobj 413 0 obj <> endobj 414 0 obj <> endobj 415 0 obj <> endobj 463 0 obj <> endobj 464 0 obj <> endobj 465 0 obj <> endobj 466 0 obj <> endobj 459 0 obj <> endobj 460 0 obj <> endobj 461 0 obj <> endobj 454 0 obj <> endobj 455 0 obj <> endobj 456 0 obj <> endobj 457 0 obj <> endobj 451 0 obj <> endobj 452 0 obj <> endobj 382 0 obj <>/ExtGState<>>>/BBox[19.1694 110.624 71.2021 65.4663]>>stream -/CS0 cs 0.137 0.122 0.125 scn -1 i -/GS0 gs -q 1 0 0 1 60.562 65.4663 cm -0 0 m -10.64 37.68 l -1.279 44.186 -9.111 49.378 -30.739 40.206 c --41.393 2.452 l --21.167 8.852 -9.371 6.468 0 0 c -f -Q - endstream endobj 390 0 obj <>/ExtGState<>>>/BBox[6.62988 66.2847 58.6763 21.127]>>stream -/CS0 cs 0.137 0.122 0.125 scn -1 i -/GS0 gs -q 1 0 0 1 17.2969 61.333 cm -0 0 m --10.667 -37.799 l -10.942 -32.325 21.37 -33.738 30.739 -40.206 c -41.379 -2.526 l -32.018 3.98 21.628 9.172 0 0 c -f -Q - endstream endobj 398 0 obj <>/ExtGState<>>>/BBox[53.5962 54.8711 110.25 9.63965]>>stream -/CS0 cs 0.137 0.122 0.125 scn -1 i -/GS0 gs -q 1 0 0 1 64.2354 54.8711 cm -0 0 m --10.639 -37.68 l --1.278 -44.187 13.732 -49.489 35.361 -40.317 c -46.015 -2.564 l -24.391 -11.734 9.37 -6.467 0 0 c -f -Q - endstream endobj 406 0 obj <>/ExtGState<>>>/BBox[66.1211 99.2104 122.775 53.9785]>>stream -/CS0 cs 0.137 0.122 0.125 scn -1 i -/GS0 gs -q 1 0 0 1 76.7617 99.2104 cm -0 0 m --10.641 -37.68 l --1.279 -44.185 13.732 -49.491 35.36 -40.318 c -46.014 -2.564 l -24.39 -11.734 9.369 -6.468 0 0 c -f -Q - endstream endobj 402 0 obj <> endobj 394 0 obj <> endobj 386 0 obj <> endobj 376 0 obj <> endobj 542 0 obj [/Indexed/DeviceRGB 255 543 0 R] endobj 543 0 obj <>stream -8;X]O>EqN@%''O_@%e@?J;%+8(9e>X=MR6S?i^YgA3=].HDXF.R$lIL@"pJ+EP(%0 -b]6ajmNZn*!='OQZeQ^Y*,=]?C.B+\Ulg9dhD*"iC[;*=3`oP1[!S^)?1)IZ4dup` -E1r!/,*0[*9.aFIR2&b-C#soRZ7Dl%MLY\.?d>Mn -6%Q2oYfNRF$$+ON<+]RUJmC0InDZ4OTs0S!saG>GGKUlQ*Q?45:CI&4J'_2j$XKrcYp0n+Xl_nU*O( -l[$6Nn+Z_Nq0]s7hs]`XX1nZ8&94a\~> endstream endobj 539 0 obj [/ICCBased 381 0 R] endobj 363 0 obj <> endobj 364 0 obj <> endobj 365 0 obj <>stream -%!PS-Adobe-3.0 %%Creator: Adobe Illustrator(R) 13.0 %%AI8_CreatorVersion: 13.0.0 %%For: (Aleks Kissinger) () %%Title: (windows.ai) %%CreationDate: 5/11/10 12:42 PM %%BoundingBox: -37 -37 164 164 %%HiResBoundingBox: -36.1123 -36.082 163.8877 163.9185 %%DocumentProcessColors: Cyan Magenta Yellow Black %AI5_FileFormat 9.0 %AI12_BuildNumber: 406 %AI3_ColorUsage: Color %AI7_ImageSettings: 0 %%RGBProcessColor: 0 0 0 ([Registration]) %AI3_Cropmarks: -0.112305 -0.082031 127.8877 127.9185 %AI3_TemplateBox: 64.5 63.5 64.5 63.5 %AI3_TileBox: -242 -332 370 460 %AI3_DocumentPreview: None %AI5_ArtSize: 128 128 %AI5_RulerUnits: 6 %AI9_ColorModel: 1 %AI5_ArtFlags: 0 0 0 1 0 0 1 0 0 %AI5_TargetResolution: 800 %AI5_NumLayers: 1 %AI9_OpenToView: -99 181.6665 3 979 715 18 0 0 73 75 0 0 1 1 1 0 1 %AI5_OpenViewLayers: 7 %%PageOrigin:0 0 %AI7_GridSettings: 72 8 72 8 1 0 0.8 0.8 0.8 0.9 0.9 0.9 %AI9_Flatten: 1 %AI12_CMSettings: 00.MS %%EndComments endstream endobj 366 0 obj <>stream -%%BoundingBox: 5 9 123 115 %%HiResBoundingBox: 5 9.63965 122.7754 114.8643 %AI7_Thumbnail: 128 116 8 %%BeginData: 20464 Hex Bytes %0000330000660000990000CC0033000033330033660033990033CC0033FF %0066000066330066660066990066CC0066FF009900009933009966009999 %0099CC0099FF00CC0000CC3300CC6600CC9900CCCC00CCFF00FF3300FF66 %00FF9900FFCC3300003300333300663300993300CC3300FF333300333333 %3333663333993333CC3333FF3366003366333366663366993366CC3366FF %3399003399333399663399993399CC3399FF33CC0033CC3333CC6633CC99 %33CCCC33CCFF33FF0033FF3333FF6633FF9933FFCC33FFFF660000660033 %6600666600996600CC6600FF6633006633336633666633996633CC6633FF %6666006666336666666666996666CC6666FF669900669933669966669999 %6699CC6699FF66CC0066CC3366CC6666CC9966CCCC66CCFF66FF0066FF33 %66FF6666FF9966FFCC66FFFF9900009900339900669900999900CC9900FF %9933009933339933669933999933CC9933FF996600996633996666996699 %9966CC9966FF9999009999339999669999999999CC9999FF99CC0099CC33 %99CC6699CC9999CCCC99CCFF99FF0099FF3399FF6699FF9999FFCC99FFFF %CC0000CC0033CC0066CC0099CC00CCCC00FFCC3300CC3333CC3366CC3399 %CC33CCCC33FFCC6600CC6633CC6666CC6699CC66CCCC66FFCC9900CC9933 %CC9966CC9999CC99CCCC99FFCCCC00CCCC33CCCC66CCCC99CCCCCCCCCCFF %CCFF00CCFF33CCFF66CCFF99CCFFCCCCFFFFFF0033FF0066FF0099FF00CC %FF3300FF3333FF3366FF3399FF33CCFF33FFFF6600FF6633FF6666FF6699 %FF66CCFF66FFFF9900FF9933FF9966FF9999FF99CCFF99FFFFCC00FFCC33 %FFCC66FFCC99FFCCCCFFCCFFFFFF33FFFF66FFFF99FFFFCC110000001100 %000011111111220000002200000022222222440000004400000044444444 %550000005500000055555555770000007700000077777777880000008800 %000088888888AA000000AA000000AAAAAAAABB000000BB000000BBBBBBBB %DD000000DD000000DDDDDDDDEE000000EE000000EEEEEEEE0000000000FF %00FF0000FFFFFF0000FF00FFFFFF00FFFFFF %524C45FD27FFCFCFC9C9C2C8C1C1C0C1C0C1BAC2C2C9C9FD6BFFCFC9C8C1 %C7C0C1C0C1C0C1C0C1BAC1FD04BAB4BABAC1C2CAFD64FFCFC2C8C1C1C0C7 %C1C7C1C7C1C1C0C1C0C1BAC1BABBFD04BAB4BAB4C1C3FD5FFFCAC2C1BAC0 %BAC1C0C1C0C7C0C1C0C1C0C1BAC1FD06BAB4BAB4BAFD04B492C2CAFD5AFF %C9C2BAFD04C1C7C1C7C1C7C1C7C1C7C1C1C0C1C0C1BAC1BABBBABBBABBB4 %BBB4BBB4B5B4BBC2FD57FFC3BABBBAC1BAC1C1C1C0C1C1C7C0C7C0C1C0C1 %C0C1BAC1FD06BAB4BAB4BAB4BBB4B492B58CFC92C9FD55FFBBBBBAC1BBFD %06C1C7C1C7C1C7C1C1C0C1C0C1BAC1BABBBABBBABAB4BBB4BBB4BBB4B5B4 %B5FCB08CBCCFFD52FFC9BBBABBBAC1BAC1BAC1C0C1C0C7C0C1C0C1C0C1BA %C1BAC0BABBBABAB4BAB4BAB4BAB4B492B592B58CB58CB08CB5C2FD51FFC9 %BAC1BBFD06C1C7C1C7C1C7C1C7C1C1C0C1C0C1BAC1BABBBABBBABBB4BBB4 %BBB4BBB4B5B4B5FCB58CB08CFCC3FD50FFBBBBBABBBAC1BAC1C0C1C1C1C0 %C7C1C1C0C1C0C1BAC1BAC0BABBBABAB4BAB4BAB4BBB4B492B5B4B58CB58C %B08CB08CCAFD4FFFCABBBAC1BBC1BBFD04C1C7C1C7C1C7C1C1C0C1C1C1BA %C1BAC1BABBBABAB4BBB4BBB4BBB4B5B4B5B4B58CB5FCB08CBCFD50FFC9B4 %BBBAC1BAC1BAC1C0C1C0C7C0C7C0C1C0C1BAC1BAC1BAC1FD04BAB4BAB4BA %B4B492B5B4B48CB58CB08CB08C8C9AFD50FFC2BBBBC1BBFD06C1C7C1C7C1 %C7FD06C1BAC1BAC1BABBBABAB4BBB4BBB4BBB4B5B4B5B4B58CB0B0B08CA8 %AFFFFFFFAE8282FD48FFCABBBABBBAC1BAC1C0C1C1C1C0C7C1C1C0C1C0C1 %BAC1BAC1BAC1BABAB4BAB4BAB4BBB4B4B4B5B4B58CB58CB08CB08C93A7FD %04FF82565733A7FD46FFCABAC1BBC1BBFD04C1C7C1C7C1C7C1C7C0C1C1C1 %BAC1BAC1BAC1BABABABBBABBB4BBB4B5B4B5B4B58CB5FCB08CB09AAEA8FF %FFFF578133573282AEFD29FFAEFD1AFFC2BABAC1BAC1BAC1C0C1C0C1C0C7 %C0C7C0C1C0C1BAC1BAC1FD04BAB4BAB4BAB4B4B4B5B4B48CB58CB58CB08C %B08CA1A8FFFFFFA78156572D572C5782CFFD24FFA88339577DFD19FFC2BA %C1BBC1BBFD04C1C7C1C7C1C7C1C7FD04C1BAC1BAC1BAC1BABABABBB4BBB4 %BBB4B5B4B5B4B5FCB5B0B08CB5A8FD04FFA75657335733FD0457ADAEFD1F %FFAEAD5E5D395D2D7CFD18FFCFBABBBAC1BAC1BAC1C1C1C0C7C1C7C0C7C0 %C1C0C1BAC1BAC1FD04BAB4BAB4BAB4B4B4B5B4B58CB58CB08CB08CFC93A8 %A8FFFFFF7B7B2D57335733573357325D82AECFFD19FFA8AD5E5D39393339 %57517CFD18FFC3BBBBC1BAFD06C1C7C1C7C1C7C1C7C1C1C0C1C0C1BAC1BA %BABABBBABAB4BBB4B5B4B5B4B5FCB5FCB08CB08CA1A8FFFFFFA88157572D %575757335D575D335D578282CFFD14FFA7AD5D5E395D395E395D395851A8 %FD18FFC2B4BBBAC1BAC1C0C1C0C1C0C1C0C7C0C1C0C1C0C1BAC1FD06BAB4 %BAFD06B492B58CB58CB08CB08CB0A1A8A8FFFFA756572D572D5733573357 %335D335D335D325D828383AEA8FFA8FFFFFFA8FFA8AE83AD82825D5D395D %335D395D335D395D2D52CFFD18FFBBC1BBC1BBFD04C1C7C1C7C1C7C1C7C1 %C7C1C1C0C1BAC1BAC1BABBBABBBABBB4BBB4BBB4B5B4B5FCB5FCB08CB093 %A8A8FFFFFF8281575733FD04575D575D57FD0A5D825D8282825D825D825D %815D815D825D5E5D5E5D5E395E395D57527CFFFFFFA8FD14FFC9BBBAC1BA %C1BAC1C1C1C0C1C1C7C0C7C0C1C0C1C0C1BAC1FD06BAB4BAB4B4B4B5B4B4 %92B58CB58CB08CB08C9AA8FFFFFFAE8156572D5733573357335D335D335D %5D5D39FD0C5D815D815D81FD065D395D395D335D395727A7A8A8A8FD15FF %C9BABBBAFD08C1C7C1C7C1C7C1C1C0C1C0C1BAC1BABBBABBBABAB4BBB4BB %B4B5B4B5B4B5FCB58CB08CB0A1FD04FFCF57572D5757573357575D335D57 %5D57FD085D815D5D5D825D815D825D815D825D5D5D5E5D5D395E395D395E %5152A7FFA8A8A8FD14FFBBBBBABBBAC1BAC1C0C1C0C1C0C7C0C1C0C1C0C1 %BAC1FD06BAB4BAB4BAB4BAB4B492B592B58CB58CB08CB08CA8A8FFFFFF82 %8151572D57335733573357335D335D335D395D33FD085D815D5D5D81FD06 %5D395D395D335D3939335151FD04A8FD14FFCABBBBC1BBFD06C1C7C1C7C1 %C7C1C7C1C1C0C1C0C1BAC1BABBBABBBABBB4BBB4BBB4BBB4B5B4B5FCB58C %B0FCBCA8FD04FF82575733FD04575D575D57FD085D5E5D5D5D825D815D88 %5D825D885D825D885D5E5D5E5D5E395E395D395E5183A8FFA8FD15FFC9B4 %BBBAC1BAC1C0C1C0C1C1C1C0C7C1C1C0C1C0C1BAC1BABABABBBABAB4BAB4 %BAB4BBB4B492B5B4B58CB58CB08CB09AA8A8FFFFAE577B2D572D57335733 %57335D335D335D33FD0C5D815D815D81FD065D395D395D395D39392D527D %FD04A8FD14FFC2BBBAC1BBFD06C1C7C1C7C1C7C1C1C0C1C0C1BAC1BABBBA %BBBABAB4BBB4BBB4BBB4B5B4B5B4B58CB08CB08CA8A8FFFFFFA781FD0457 %33575757335D575D57FD0C5D825D815D825D815D825D5D5D5E5D5D5D5E39 %5D395E395751FD04A8FD14FFCABBBABBBAC1BAC1BAC1C0C1C0C7C0C1C0C1 %C0C1BAC1BAC1BABBBABAB4BAB4BAB4BAB4B492B592B58CB58CB08CB08C93 %A8A8FFFFFF8256572D57335733573357335D335D335D395D33FD0C5D81FD %085D395D335D3939335D2D7CFD04A8FD14FFCABAC1BBFD08C1C7C1C7C1C7 %C1C1C0C1C1C1BAC1BABBBABBBABBB4BBB4BBB4BBB4B5B4B5B4B58CB0B0B0 %9AAFA8FFFFFF81812DFD04575D575D575D57FD065D5E5D5D5D825D815D88 %5D825D885D825D885D825D5E5D5E5D5E395D395E57527DFFA8A8A8FD14FF %C2BBBABBBAC1BAC1C0C1C1C1C0C7C1C1C0C1C0C1BAC1BAC1BABBBABAB4BA %B4BAB4BBB4B4B4B5B4B58CB58CB08CB08CA1A8FFFFFFA78157572D573357 %33573357335D335D33FD0C5D815D815D81FD0A5D395D3939395751FD04A8 %FD15FFC1BAC1BBC1BBFD04C1C7C1C7C1C7C1C1C0C1C1C1BAC1BAC1BABBBA %BAB4BBB4BBB4BBB4B5B4B5B4B58CB5FCB08CB5A8AFFFFFFFA75657335733 %575757335D575D57FD0C5D825D815D825D815D825D815D5E5D5D5D5E5D5D %395E395D517CA8A8A8FD15FFCABABBBAC1BAC1BAC1C0C1C0C7C0C7C0C1C0 %C1BAC1BAC1BAC1FD04BAB4BAB4BAB4B492B5B4B48CB58CB08CB08CFC93A8 %A8FFFFFF57572D572D5733573357335D335D335D395D33FD0C5D815D81FD %085D335D3939333933517CA9A8A8A8FD14FFC3BBBBC1BBFD06C1C7C1C7C1 %C7FD06C1BAC1BAC1BABBBABAB4BBB4BBB4BBB4B5B4B5B4B5FCB5B0B08CC3 %A8FFFFFFAE81575857573357575D575D575D57FD045D5E5D5D5D825D815D %885D825D885D825D885D825D825D5E5D5E5D5D395E395851FD04A8FD15FF %C2BABBBAC1BAC1BAC1C1C1C0C7C1C7C0C1C0C1C0C1BAC1BAC1FD04BAB4BA %B4BBB4B4B4B5B4B58CB58CB08CB08C8DA1AFFFFFFFA756572D5733573357 %3357335D335D335D5D5D39FD085D815D5D5D815D815D81FD065D395D3939 %395D2D52FD05A8FD14FFBBBBBBC1BBFD04C1C7C1C7C1C7C1C7C0C1C1C1C0 %C1BAC1BAC1BABABABBBABBB4BBB4B5B4B5B4B58CB5FCB08CB093A8A8FFFF %FF8281575733575757335D575D57FD0C5D825D815D825D815D825D815D82 %5D5D5D5E5D5D395E393933527CFFA8A8A8FD14FFC3BABABBBAC1BAC1C0C1 %C0C1C0C7C0C7C0C1C0C1BAC1BAC1FD04BAB4BAB4BAB4B4B4B5B4B48CB58C %B58CB08CB08C9AA8FFFFFFA88156572D572D5733573357335D335D335D33 %FD0C5D815D815D81FD065D335D395D3339395727A7A8A8A8FD15FFC3BAC1 %BBC1BBFD04C1C7C1C7C1C7C1C7FD04C1C0C1BAC1BAC1BABABABBBABBB4BB %B4B5B4B5B4B5FCB5B0B08CB0A1AFFFFFFFAE5781335733FD04575D575D57 %FD085D5E5D5D5D885D815D885D825D885D825D825D5E5D5E5D5E395E395D %5158A8FFA8FD16FFBBBBBAC1BAC1BAC1C1C1C0C7C1C7C0C7C0C1C0C1BAC1 %BAC1FD06BAB4BAB4B4B4B5B4B58CB58CB58CB08CB08CA8A8FFFFFF82812D %57335733573357335D335D335D5D5D39FD085D815D5D5D815D815D81FD06 %5D395D395D3339335152FD04A8FD14FFCABBBBC1BAFD06C1C7C1C7C1C7C1 %C7C1C1C0C1C0C1BAC1BABBBABBBABAB4BBB4BBB4B5B4B5FCB5FCB08CB08C %9AA8FD04FF8257572D575757335D575D33FD0C5D815D815D825D815D825D %815D825D5D5D5E5D5D395E395D395E5183A8FFA8FD15FFC3B4BBBAC1BAC1 %BAC1C0C1C0C1C0C7C0C1C0C1C0C0BAC0FD06BAB4BAB4BAFD04B492B58CB5 %8CB08CB08CFC9AA8A8FFFFAE56572D572D57335733573357335D335D335D %5D5D33FD085D815D5D5D81FD065D335D395D335D39392D527DFD04A8FD14 %FFBBBBBBC1BBFD04C1C7C1C7C1C7C1C7C1C7C1C8C1C8C1C2C1C1BABBBABA %BABBB4BBB4BBB4B5B4B5FCB5FCB08CB08DA8A8FFFFFF8381575733FD0457 %5D575D57FD085D5E5D5D5D825D815D885D825D885D825D885D5E5D5E5D5E %395E395E395852CFA8FFA8FD14FFCABBBAC1BAC1BAC1C0C1C0C7C1C7C1C8 %C1C2C1C2BBC2BBC2BBC2C1C2C1C1BABBB4B4B4B5B4B492B58CB58CB08CB0 %8C93A8A8FFFFFF8256572D572D573357335D335D335D575D39FD0C5D815D %815D81FD065D395D395D395D395D277DFD04A8FD14FFCABABBBAC1BBFD04 %C1C7C1C1BBBBB4BB99BB99BC99BC99BC99BB93BBBBC1BBC1BBBBB4B5B4B5 %B4B5FCB58CB08CB09AAFA8FFFFFF7B812D5757573357575D335D575D57FD %0C5D825D815D825D815D825D5D5D5E5D5D395E395D395E57527DFFA8A8A8 %FD14FFC2BBBABBBAC1C1C1C0C192BB929A9AA1A1FD0BA8A1A19A9992BBBA %C1B4B58CB58CB58CB08CB08CA1A8FFFFFF838157572D5733573357335733 %5D335D335D395D33FD0C5D81FD065D335D395D335D3939335751FD04A8FD %15FFC2BAFD05C1BABB9AA1A1CBA8AFA8FFA8AFA8FFA8AFA8FFA8AFA8FFA8 %AFA8CA9ABC98C1C1BBB4B5FCB58CB0FCB5A8FD04FFA757572DFD04575D57 %5D57FD085D5E5D5D5D825D815D885D825D885D825D885D5E5D5E5D5E5D5E %395D395E517DA8FFA8A8FD14FFCABAC1C1C192BB9AA1A1A9FD17A8AFA8A1 %99BBBAC192B08CB08CB093A8A8FFFFFF57812D572D57335733573357335D %335D33FD0C5D815D815D81FD085D395D395D393933517DFD04A8FD14FFC9 %C198BB9AA1A8AFA8A8A8FFFD07A8CFA8CAA8FFA8CAA8FFFD07A8FFA8AFA1 %C299C1BAB58CB08CA1A8FFFFFFA881FD045733575757335D575D57FD0C5D %825D815D825D815D825D5D5D5E5D5D5D5E5D5D395E395751FD04A8FD16FF %A1C3A1FD0AA8CAA8FFA8AFA8FFA8FFA8FD07FFA8FFFD08A899BBBABB8C8D %A1A8A8FFFFA756572D57335733573357335D335D335D395D33FD0C5D81FD %085D395D335D3939335D2D58FD05A8FD18FFA8A8A8FFA8FFA8FFA9AF84AF %85855A615A61366136615A8585AFFD08FFA8FFA8AFA1BCBABB93AFA8FFFF %FF8281FD0457335D575D575D57FD065D5E5D5D5D825D815D885D825D885D %825D885D825D5E5D5E5D5E5D5D395E57517CFFA8A8A8FD18FFA8A8A8CFA8 %FF84855A8560615A615A615A613636363714140E140E363685A9FD05FFFD %05A8A199A7A8FFFFFFA88157572D57335733573357335D335D33FD0C5D81 %5D5D5D81FD0A5D395D3939395751A7FD04A8FD19FFCAFF858536615A8584 %8585855A855A615A6136373637FD04140E140E365AAFFD06FFA8A8A8A9A8 %A8A8FFFFAE56572D5733575757335D575D57FD0C5D825D815D825D815D82 %5D815D825D5D5D5E5D5D395E395D517CFD04A8FD19FF843D143636605A85 %60855A855A615A61365AFD043614140E140E140E0E0D0E0D3684FD05FFFD %05A8FFFFFF82572D572D572D573357335D335D335D335D33FD0C5D815D81 %5D81FD065D335D39393339335152FD04A8FD16FF85611414143D36615A85 %61FD05855A855A61366136373637141414370E360E3630300D3036A9FD06 %FFA8FD04FF82FD04573357575D575D575D57FD045D5E5D5D5D825D815D88 %5D825D885D825D885D825D825D5E5D5E5D5E395E395E51A7A8A8A8FD15FF %AF14140EFD04143D36615A8584855A855A615A61365A36373636FD04140E %360E300D300D300730075AA8FD05FFA8FFFFAE56572D5733573357335733 %5D335D335D5D5D39FD085D815D5D5D815D815D81FD065D395D3939335D51 %52A7FD04A8FD14FF36FD041415143D3661608560858585608560615A6136 %5B36373636141514360E360E360D3030302F3007305AFD07FFCF83517BFD %0457335D575D57FD0C5D815D815D825D815D825D815D825D5D5D5E5D5D39 %5E3939395852A8A8FFA8FD14FFA9360D140E141414363636615A855A855A %855A615A5A365B3636143614140E140E140D300D300D300730073007292F %A9FD07FFA85157575733573357335D335D335D33FD0C5D815D815D81FD06 %5D335D395D33393957277DFD04A8FD14FFA90EFD04141B143D3661608584 %85858560855A615A61366136373615143714360E3630360E3030302F3029 %30292954FD09FF7C7C577B575D575D57FD085D5E5D5D5D885D815D885D82 %5D885D825D885D5E5D5E5D5E395E5D815158A7FFA8FFA8FD14FF5A0E0EFD %04143736615A85608560855A615A615A5A365B3636143614140E140E300D %300D300D3007300730292907A8FD08FFA8A87D7C5157575D335D335D5D5D %39FD0C5D815D815D81FD065D395D5D5D577B51587CFD04A8FD15FF360E14 %1415141536615A6160858585608560615A615A6136613637141514140E36 %0E360E3630300D302F302930292FA8FD09FFA8A9A8A87C5757815D5D39FD %085D815D5D5D825D815D825D815D825D5D5D5E5D5D577B515852A7A8FFA8 %CFA8A8FD14FFA90D140E140E14143636615A855A8560855A615A60365BFD %043614140E140E140D360D300D300D300730072907292FFD05FFA8CFFD04 %FFFD04A87D7C5157575D565D395D39FD085D815D5D5D81FD045D575D5757 %5151517D7DFD08A8FD14FF84FD041415143D366160856085858560856061 %5A615A61363D3637141514360E360E360E3630302F302F302930297EA8FF %FFFFCFC7C0C9FD06FFA8FFA8A87D7C517B57815D815D815D885D875D885D %875D88818157815757517C7C837DFFA8FFA8FFA8A8A8FFA8FD15FF5A0D14 %0EFD04143636615A85848560855A615A613661FD043614140E140E140D36 %0D300D300D300730292907297DA8A8FFFFC89E9F98C7C9FD05FFA8A8A8CB %A8A87D7D515751FD08577B575751575157517C7C83A7FD0CA8FD16FF0E14 %0EFD04143D36615A858585848560855A615A6136613637143714140E360E %360E3630300D302F302930292929A8A8FFFFFF9FC6999F98C0C7FD07FFA8 %A8A8FFA8A8A8A77D837C7C527C7C7C527D7C837DFD04A8FFA8A8A8FFA8A8 %A8AFA8A8A8FD18FF840E0E140E141414366136615A8584855A855A613661 %FD043614360E140E140D360D300D300D300730072F07290753A8FFFFFFA8 %C69E99749F989E9EC8CFFD05FFA8FFFD1BA8A9A8A8A6C8CFFD19FF850E14 %1415141514615A6160858585848561855A615A6136613637143714140E36 %0E360E3630302F302F30293029297DFD04FFCE9EC1999F9E9E9EC09EC6C8 %CFFD06FFCAFFA8A8A8FFA8A8A8FFA8CBA8FFA8A8A8FFA8A8A8FFA8AFA8CF %C8CDC6FE9EC8FD19FF30140EFD04143636615A615A8584855A855A613661 %3636363714140E140E140E360E300D300D300730292F072929A8A8FFFFFF %9FC6989F989F9E9E9EC09EC09EC7C9FD09FFA8FFFD0BA8A9A8A8A8CEC8C7 %FD04C6A49F9FFD18FFA9140EFD04143D36615A856185848585855A855A61 %36613637363714140E360E360E3630300D302F30293029300754A8FD04FF %C79E9F999F9EC09EC09EC69EC69EC6C6CDC8CFCFFD0FFFCFCFC9CDC7CCC6 %FEFD06C674C9FD18FF850D140EFD04143736615A8584855A855A615A6136 %5AFD04360E140E140E360E300D300D300730072F072F072953A8A8FFFFCE %9E9E749F989E98FD049EC09EC69EC6C0C6C6C6C7C8C8CEC9CEC9CFC9CEC8 %CEC8CDFD0EC69E9FA8FFFFFFA8FD14FF5A140E151415143D36615A858585 %848561855A855A6136613637363714140E360E360E3630302F302F302930 %293029A8A8FFFFFFC8C69F9F9E9F9EC09EC09EC6C0C6C0FD04C6FEC6C6C6 %FEC6C6C6CCC6FEC6CCC6CCC6FEC6FEC6FEC6FEC6FEC6C6C6FEC69F9FFFFF %FFA8FD14FFA8360E140EFD04146136615A8584855A855A615A61365A3637 %363614140E140E360E300D300D300730292F072F072FA8A8FFFFFFC79E9F %749F989E9EC09EC09EC69EC69EFD10C6CCC7C6C6FEFD0CC674A7FD04A8FD %14FFA90EFD041415143D36616085848585855A855A615A61365B3637FD05 %14360E360E300D302F3029302930292953CFA8FFFFCF9EC1999F989F9EC0 %9EC69EC69EFD08C6FEC6C6C6FEC6FEC6CCC6CCC7CCC6FEC6FEC6FEC6FEFD %06C69E9FA7A9A8A8A8FD14FF5A0E0EFD041436366036615A855A855A615A %615A5A365A363614360E140E140E0E0D300D300730072F07300729077EA8 %FFFFFFA6C0989F989E98FD049EC09EC09EC6C0C6C0FD0CC6C7C7C7FD0FC6 %9E75FD04A8FD15FF360E141415143D36615A856185848585855A855A615A %61363736371415143714360E3630302F303030293029302954A8FD04FFC8 %9E9F999F9EC19EC09EC6C0C6C0FD08C6FEC6FEC6FEC6FEC6CCC7CCC7CCC6 %FEC6FEC6FEC6FEC6C6C6FEC6C674A6A8A9A8FD15FFAF0E140EFD04143D36 %615A8584855A855A615A615A5A365B3636FD04140E360E300D300D300D30 %072F0730292953A8A8FFFFFF9EC0749F989E989E9EC09EC69EC69EFD10C6 %CCC7C7C6FEFD0CC69E75A0A9A8A8A8FD14FF7EFD041415143736615A8560 %858585608560615A615A6136373636141514140E360E360D3030302F302F %302930297EA8FFFFFFC9C69E9F989F9E9E9EC09EC69EC6C0C6C0FD04C6FE %C6C6C6FEC6FEC6FEC6CCC7CCC7FEC6FEC6FEC6FEC6C6C6FEC6C6C6C775A8 %A8FFA8FD15FF5A0D140EFD04143636615A855A855A855A615A5A365B3636 %143614140E140E140D300D300D3007300730072907297DA8A8FFFFC89E9F %749F98FD049EC09EC09EC6C0C6C0FD0EC6C7C7C7FD0EC674A0FD05A8FD14 %FF0EFD04141B143D3661608584858585608560615A613661363D36371415 %14360E3630360E3030302F30293029302FA8A8FFFFFF9FC6999F98C19EC0 %9EC69EC69EFD08C6FEC6FEC6FEC6FEC6CCC6CCC7CCC6FEC6FEC6FEC6FEC6 %FEC6FEC6C6C69FA0FFA8FFA8FD14FF840E0EFD041437365A366160858485 %5A855A615A5A365B3636143614140E140E360D300D300D300D3007302929 %077EA8A8FFFFCAC09E9F989F98FD049EC09EC69EC6C0FD0EC6CCC7C7C6FE %FD0DC69E74A7A8A8A8FD15FF850E1414151415146136615A858585608560 %855A615A6136613637141514140E360E360E3630300D302F30293029297D %FD04FFCE9E9F989F9E9E9EC09EC09EC6C0C6C0FD04C6FEC6C6C6FEC6C6C6 %FEC6CCC6CCC7CCC6FEC6FEC6FEC6C6C6FEC6C6C6FE9E9FA8FFA8A8A8FD14 %FF0D140E140E14143636615A615A8560855A855A603661FD043614140E14 %0E140D360D300D300D3007300729072929A8A8FFFFFF9FC0989F989E989E %9EC09EC09EC69EC69EFD0EC6C7C6C7FD0EC69E9F7BFD04A8FD14FFA9360E %141415143D3661606160858585608560615A615A6136613637141514360E %360E360E3630302F302F3029302954A8FFFFFFCFC79E9F989F9EC09EC09E %C69EC6C0FD06C6FEC6FEC6FEC6FEC6FEC6CCC7CCC7CCC6FEC6FEC6FEC6FE %C6FEC6C6C6C775A7A8FFA8FD15FF850D140EFD04143636615A8584856085 %5A615A613661FD043614140E140E140D360E300D300D300730292907297D %A8A8FFFFC99EC1759F98FD049EC09EC09EC6C0C6C0FD0CC6FEC6C7C7CCC6 %C6C6FEFD0AC69E9FA7FD04A8FD14FF36140EFD04143D36615A8585858485 %60855A615A6136613637143714140E360E360E3630300D302F302930292A %29A8A8FFFFFFA6C6999F9E9F9EC09EC09EC6C0C6C0FD08C6FEC6C6C6FEC6 %FEC6CCC7CCC6FEC6FEC6FEC6C6C6FEFD05C69F7BCFA8A8A8FD14FFA8360E %140EFD04143D36615A8584855A855A615A61365AFD04360E140E140D360E %300D300D300730072F07290753A8A8FFFFCAC79E99749F989E989E9EC09E %C69EC69EFD10C6C7C7FD0FC674A0FD05A8FD13FFA90E1414151415146136 %6160858585848561855A615A6136613637143714140E360E360E3630302F %302F302930292953FFA8FFFFCF9EC1999F9E9F9EC09EC09EC6C0C6C0FD04 %C6FEC6C6C6FEC6FEC6FEC6FEC6CCC7CCC6FEC6FEC6FEC6FEC6FEC6C6C6FE %9E9FA7FFA8A8A8FD14FF5A0E0E140E14143636615A615A8584855A855A61 %5A613636363714360E140E140E360E300D300D300730292F0729297EA8FF %FFFFA6C69899989F9E9E9EC09EC09EC69EC6C0FD0EC6C7C7CCC6C6C6FEFD %0BC69F75FD04A8FD15FF360EFD04141B366136616085848585855A855A61 %366136373637141414360E360E3630300D302F30293029300753A8A8FFFF %FFC79E9F999F98C09EC09EC69EC69EFD08C6FEC6C6C6FEC6FEC6CCC7CCC7 %CCC6FEC6FEC6FEC6FEFD06C674A0FD04A8FD14FFAF0E140EFD0414363661 %5A8560855A855A615A61365AFD04360E140E140E140E300D300D30073007 %2F072F072953A8A8FFFFCF9E9E749F989E98FD049EC09EC69EC6C0FD0EC6 %C7C7C7FD0EC69E75A0A9A8A8A8FD14FF84140E151415143D36615AFD0785 %6085618560615A613637141414360E360E3630302F302F3029302930297E %A8FFFFFFC9C69E9F9F9F9EC09EC09EC6C0C6C0FD04C6FEC6C6C6FEC6FEC6 %FEC6FEC6CCC7CCC7CCC6FEC6FEC6FEC6FEC6C6C6FEC69F75CAA8A8A8FD15 %FF5A0E140EFD04143D36615A8584857E857E7E5A7E545A537E5A5A5A6136 %140E140E300D300D300730292F073007297EA8A8FFFFC89E9F749F989E98 %C09EC09EC69EC69EFD10C6CCC7C7C6FEFD0CC6749FFD05A8FD14FF0EFD04 %1415143D5A858484545429292930292F2953292F295429292954545A3636 %0E300D30303029302930292A53CAA8FFFFFF9EC6999F989F9EC09EC09EC6 %9EFD08C6FEC6C6C6FEC6FEC6FEC6CCC7CCC6FEC6FEC6FEC6FEC6C6C6FEC6 %C6A49FA0AFA8CAA8FD14FF840E0D140E1414615A5AFD05297E7DA87EFD09 %A87D7E2929292F2F5A30300730073007300729027EA8A8FFFFA7C0989998 %9E98FD049EC09EC09EC6C0C6C0FD0CC6C7C6C7FD0FC69E74A7FD04A8FD14 %FF850E1514615A5A2929297E7EA8A8FFA8FFA8FFA8CFA8FFA8CFA8FFA8FF %A8FFA8A853542954305A30302F30293029307ECFA8FFFFC99EC1999F9EC1 %9EC09EC6C0C6C0FD08C6FEC6FEC6FEC6FEC6CCC7CCC7CCC6FEC6FEC6FEC6 %FEC6C6C6FEC6FE9EA0A8AFA8FFA8FD14FF0E3630542929297E7EA8A8CFFD %15A8CAA87E2929295A2F2F0730292929A8A8FFFFFF9FC0989F989E98FD04 %9EC69EC69EC6C0FD0EC6CCC7C7C6FEFD0DC69F7BFD04A8FD15FF5A292929 %7E7EA8A8FFA8A8A8FFA8A8A8FFFD0FA8CAA8A8A8FF7E5429303030293029 %7EA8FFFFFFCFC69E9F989F9E9E9EC09EC09EC6C0C6C0FD04C6FEC6C6C6FE %C6FEC6FEC6CCC7CCC7CCC6FEC6FEC6FEC6C6C6FEC6C6C6C775A7A8FFA8A8 %FD15FFA27E7EFD16A8FFA8A8A8FFFD07A8CAA87E29292F3007297DA8A8FF %FFC99E9F749F98FD049EC09EC09EC69EC6C0FD0EC6C7C7C7FD0EC69E9FA7 %FD04A8FD18FFA8FFA8A8A8FFA8A8A8FFA8FFA8FD13FFA8FFA8A8A8FF7E30 %293029A8A8FFFFFFA6C69F9F98C19EC09EC69EC69EFD08C6FEC6FEC6FEC6 %FEC6FEC6CCC7CCC7FEC6FEC6FEC6FEC6FEC6FEC6C6C69F9FCFA8FFA8FD18 %FFFD07A8FFA8FD1BFFA8A8A8CFA853297EA8A8A8FFCFC79E9F989F98FD04 %9EC09EC09EC6C0C6C0FD0CC6CCC6C7C7CCC6C6C6FEFD0AC674A6FD04A8FD %19FFA8FFA8FD23FFA8CFA8A8A8CFA8FFFFCF9EC1999F9E9E9EC09EC09EC6 %C0C6C0FD08C6FEC6C6C6FEC6FEC6CCC7CCC6FEC6FEC6FEC6C6C6FEC6C6C6 %FE9E9FA7FFA8A8A8FD18FFA8FD27FFFD05A8FFFFFFA6C09899749F989E9E %C09EC09EC69EC69EFD0EC6C7C6C7FD0FC69F75FD04A8FD44FFA8CAFFFFFF %C7C09F999F9EC09EC09EC69EC6C0FD06C6FEC6FEC6FEC6FEC6FEC6CCC7CC %C7CCC6FEC6FEC6FEC6FEC6FEC6C6C6C775A0A8FFA8A8FD45FFA8FFFFFF9E %C09E9E98FD049EC09EC09EC6C0C6C0FD0CC6FEC6C7C7CCC6C6C6FEFD0AC6 %9E9FA0A9A8A8A87D527DA8A87DFD44FFA09F9EC09EC09EC09EC6C0C6C0FD %08C6FEC6C6C6FEC6FEC6CCC7CCC6FEC6FEC6FEC6C6C6FEC6C6C6FEC69F75 %CAA8A8A8FFA87D7D7D527DFD45FFA79F989E9EC09E9E9EC69EC69EC6C0FD %0EC6C7C7C7FD0CC69EC6749FFD05A8FF7DA8527D7DFD46FFA8A79F9F9EC6 %9EC7C0C6C0FD04C6FEC6C6C6FEC6FEC6FEC6FEC6CCC7CCC6FEC6FEC6FEC6 %FEC6FEC6C69EC19E9FA0FFA8A8A8FD4CFFFD04A8A09F9E9E9EC6C0C6C0FD %0EC6C7C6CCC7C6C6FEFD06C6FD049E74A0A1FD05A8FD4DFFA8A8A8A9A7A7 %9F9F9EC7FD07C6FEC6C6C6FEC6FEC6CCC7CCC7CCC6FEC6FEC6C69EC79E9F %9EA0A0A8A8FFFD05A8FD4EFFFD06A8A0A0749E9EC09EFD0CC6CCC7C7C6C6 %A4C69E9E989E749FA0A7A8A9FD07A8FD52FFA8FFA8FFA8CAA1A09F9F9EC0 %9EC7FD08C6C0C79EC79E9F9E9F9FA6A0CAA8AFA8FFA8A8A8FFA8A8A8FD54 %FFFD05A8A9A8A8A1A7A0A0759F9E9F749F989F749F9F9F75A0A0A7A1A8A8 %A9FD0BA8FFA8FD56FFA8A8A8FFA8A9A8FFFD04A8A7A7A1FD04A7FD04A8FF %A8A9A8FFA8A8A8FFFD05A8FFA8FD5AFFFD0FA8A9FD13A8FD62FFA8FFA8A8 %A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8CAA8FD68FFA8FFFD11A8CA %A8FD74FFA8FFFFFFA8FDADFFFF %%EndData endstream endobj 367 0 obj <>stream -%AI12_CompressedDataxœì½ sãF–.¸ÿÞ°7¦ddâmÏܾäÛwd»Âåžé‰ŽŽ -ZbUq,‘5”ä²û×ïyf&@P%•Dʬ2u$òyž_žüâÿ~ýæÕðbõËüUr¢/¾¯ç³›Õú›Q¹¼¼½¾Y#éËŸ¾¸ nþ¥|+7þÇ|}½X-¿¡¯èËS|úËáåü×ëÁ¿/®¯Ë÷óõWƒ/¿‚ï~^Ü\ÎáÛO‹åÅêÓõÉlñ•¾ -™ÌnàËìkc¾6ñÀØoR;xý=Ü0ZÝ./ œÑê÷o¯’‚~Mžâ/|ý¿?ͯ÷ä'ÆØ„>Ä¥…““², -úP™2ƒÇ&«óÛ«ùòæõzu>¿¾¯.Wëëoã?fËÁ÷³÷ðÍlð_óËËÕ§ÁèrvþkíÎÞž..çÐÄ«ÙÍ ÂöÿbìÛÑíâòâ‡Û«_æÐö4Αœ¼¥ÿz EA©øÉÅÛ¿\åÍüæj ïÃ>ûé»QX Òõåßš¿_PÿC÷üã+)v½úx5[ÿ -ϾŠ©™q†Ÿ qb ß -i*|à¦âS?ϯ>^BSÿäéI6€žÈü'¹ ZÇ=h¡ó_%‰$Eùþ ¼qº¼¯®°¿¯qÀ\XÂ4¹\½çïÜgú¿ýȵ§¿ßÂм^/–Xfô}S¾}}y _}·^Ý~üËòÝ*ú’—ùëÙ͘äóåÅ5¬T¦ñŸ~¨g‹ßæLƒeûñ«;Ëûy=;‡×~üå¿çç7ð°ü§7·‹›ùî‚Þœc7­£õíõ‡ÁÏ«Õ¥«_ý+WM!ï?Œw¼¦–?.¹§7ß$74ß ãàÞwo|yÈ¥g——‹÷ëÙÇ‹ó¶´|ïÞÄßíñ2Xã빞þÔÿw˜–\ý²º\\_ùÙP^ÏÖ7‹óËù›?®oæW»K›ÌßÐ -º¨ÓåoóËÕÇ ’Ž2[^ þs¶þxWÑ8Lï@”à -¡õì»quõåñà͇ÙÇ9U÷æÃ)Ýù¦Ã4¾œ-gëÑ]‘È~`þ?«³$¦¹B³·ÀCÖ÷êUd«ÁhpÆïÖ³‹0UPD¾[ÏçËï¡„¯¢à30ït0ºˆþýkTNàšÂï)^U\¸¸Ò*«r¸ -¸ðg(×®1\¸¦rV§Ã.3Œ#øÇ ­\‰\)ýò•Ño6Ìé—®èAMâ$Nã,.âŠÅãxjbcLbR“›ª54c31Ssjµ6±™Íma+xÏÈŽíÄN“Ø$IÒ$Kò¤Œ’^=JÆÉ$™&§iœšÔ¦Iš¦Yš§EZ¦Tg”ŽÓI:MO³83™¥šœŽàÃ5‘k -WøSÿkçOÔø›‹›RÑcyþ;„~,è7?͸Oîþ1ÁeéJèJ©'³8‡ û†•û4‚nÄÓø”ºÖRçfÔ½%uðº;8¦.N¹‹©&%S@ÍŠ)\¸ÆpàÂ…“¤„ r¸2¸ ‡‹.¢Ê/ "9´+ŸÂ5É'Q>†kNœi%\ø4þdpÁ å0Ž9T!‡*b[¨&ãúj:šŒÆ£ÑhÓ±„jä£l”Ž’‘™Q<<N‡“áx8aÊ–PÅœ¦]Sæ(ÌØ ÌàÌæª*#¨}“=…IoaòÇ°pAŒËQ9,«”M¨ZV¦eRÚÒP7L©&0‘ø -’ÚeƒËÔ®Ø_É)_‘|˜פvƒkÄÔ$|ñv´† -A·ç0% džf Ã4-Naè,Ô=…6äЖÚ4‚ÖMàIЪ)ò žÅq™BÃa=CïMÇÓÉ”~N \°|pìhvV8WñYxhk×µvÎüqFW*7ËÒeè‚ÉÊý<…kß -¼^ ˸Li²á|ÁÑ;Ä2Õ´V×Ú@ofšç#šá8»sèáz¯–råî*N³àÊ¡çpP-\Г°ôùgÌbêëŠúWVà ] Ãq -‹ÆÀòI uÛFÖ4FvÈc 23·ÊÊa¬¨3Gø3¦k"UdÄŒ(–‹G€GC§÷?Z.WʃTÊU×°vj×8¸&µ ‡{ -£îGòïÐçyWhi$Öd9™ÀÜÊ>ß®Rƒ_ÀØñ¼Ú  tbA&€dØ>qŒ¥åñö‘J]C½2½Ÿ'U¦ÀXÉDÊbSåøe¡wÙ"ÎÊ’ËÈs0Ü|\Õ'¢Mk¥È£XJí-°”2†u€­ÄB,—’$'Iâëóà’¨>¹>ìK)l–VTJÊ= -¥$øƒ­*-Èo.%¯‡”õMœú¤úQ»ÊôÃüÓ@ÿ¼ù4»9ÿ0° >µÓ¡ðœU)¨öƒu#€3ÅY˧W‰¢‚Ó,–jíyU÷eëWtÇü»çå -äõŽ,W×82e¿vOI›B} -/P"HJâ vÔ²*+A ¬²]ÀP¢l×4›æ1pMCŠ~Tµ³R€ -* -¨4ŒèB.„²ë”ØeL,™¦H*dkRDgFªltL,ÔˆpDÊìS™§c =*Òz§¤ç¢Z›F P ^Œ@͘ §£TØZu*@%©@5W5ÄG‘oãr<ö;OAÃŒ'fbA´§4?Ūþ:j½†¯ª~EM‚»ÊÎW^‘ûÀZée§$J&¤ICC µ4ÔÓJÒÕ -¸Œ4¶”´6ÔÛPsÝ /¬}„‚zÕ8TäF¤Ì É)I¥+H­ËÉ–HI¹KHÁ³d€¾+í›’º7‰ÈjjPu»kzM€TÛ„”Ú˜ÔÙ ê±)±ÍÒ””Vƒóæó&÷ˆ¦z s1‡Ef , “Å°P¦¤ÕŒH—)I‡ÉH‡´ªˆ¨ z!ˆlÄ"ó0Èc€×˜œY ‰H%Š$bkieµë~œ `(xíø¡žW]žº¯ ]¬V07 !…«¨Óðb®Á?¬s'to‰àb5Èv¨GýŊŨ¡1VÈxÒ–¤‹¦¤wâôÝjTˆIÁE!ÆšlH°‚™E¢]òÄâiÅ“ -§O¨ M&žJ8‘`éŠß¶@ýÕ}õõ’ÛÙJpQÏÐZãU7¦kB©«R-UZ´†–¯ƒ„û›‡’y4´8"¦Xc¬ˆ9‰A6•Ñ†*Ê’Flsï”dH3¢‚‚rEÆ)Ì&C¢"…‰’“ˆ¨H@Œau¢]Ó¢£V5ºi"m(ÒÁBô¢>!åמ,B\¤7¢¨Ç”ù èšq*³\À бXW u†u…ê -ÕZÔØ–C -ÚÊ(²G© -ƒ5((ãgE öš/ó7~6³'¾÷/áÞïO‹‡¾ŸJ¨D¢:uá €JÍžVV\ˆm‰{óК´ÍÎû”òP¥½Ü¢´—¨´gêÿ$éå=fì-cÿ#9Êj®2u”©«l8ËÄa‰[²$Ç$º&'èš´§I ó”Vœ”ì¦DYIz]‡ÄBÇâíAÿÏi„U#>H%¨ƒ³ '¶û7[½›ÂA…FÀ@Cö¹É<Û\Û9g¡ -ÍÔ==¤ûzP»þ¨•=«è‰1§1z_"t¿tq±îýÕô¢Ð+›8‡Ÿ÷Í4ãxÎñ¬ãyÇ.ZšyN=îUnÐXÌ€Š4òt¨”L†wJÎ¥1¹–Ô±”ƒY•Âl²S3É¥=L&ã$îTãÌôÉf -%0]Í$Ÿ‚u2k ²yš3kJ™xêÐCºaEgB)ÏÎü–ç6ŸÚÃyžÛÓº÷ö>Î[Té#TÃxX›ÐcÞ:" ˜°ëœçÈØ|!"ײfÈ8`‘Gùsåc`Ÿˆ…O$¼Ö#d¡WsCi×Ïw)øw\Ñ^·ï¶°W­%žhl\5w8u…^yí*‚«ä+’Cê5¾Fµk\“Úuê/]‰·=ú×årv5¿¼WÛÓ`©J [tëºô+s¬f!­M^)yDsY£ºJaFâe´BÝiFQ–v·Ù@Îy¶aJ :RSÐcf”ÉWŽá3£O]0•èìN°9”ž×ݽ€óú»sjˆ¤‹|¦¨=Ûó‘uøh‡wøˆ‡‹yD.ìáúh÷<0ÒÝ)ðwØ3màÅhzÑ„¹¡’³£F#•y-ËëY¡¦ºV$ÊV¨n•5©ª\¬ -ž -lt, -á0€‹T4¤hˆ%„h]UÊÉÚ·ôö¾³N_nŠž–#Æ–‚ÚÅbÌ»ZDÎ QˆªšyuŸÇÆåãV6×ø¼è ã X¶Å5:l™¥&||—±¯F|}ÿdliݼò-WÖ¼Úw'oߩܾg9¸¢úæ†Åî¶.r°FöªWÙù™-Û”-6ú= à-†ôk?¢‹ü¡‚&i4ÉÝšÓ,…„<œÊÐz?õ~¸¨Á?ÚTÊ1¬hB­ -™i5ÔzJh§ŽÚ ¡íÓ:Ú -ã&6š§z^&@"Þš®Yî‰>Þe<½K}Üô'n%Ã^Þ®•ÛôÒÙXsi°TŸFDxçÖ !hI•æŽ.EüIWߥìvdˆ²¡Èx·f´uekCU‡ÎD{ök`Û*a…u`¡§1:/QÃU" 70†ßÔ¾«§û³/QéN[yaZ÷N$~ê"àF"à>ž9ÍX3Ú”¢;W¢K;;rJ¶W»·_ªÅ‡ -zCão˜4Qar!þ„cyÃS”žFï<¨ ÐC¶ß€çE‚ý¶n÷ÈdÃuÕ¶ þ#Õ"RŽRçƒl Nj1¯k"›Ê=æîO ô‘(Û¥À;à©[Þ¹mgBž#ð‚¨†Ìi$ÐiÆÛåøT9[P–‘ƒY† K±l ^}³Î¨d 7qú‰Ë@p_Th»äÜéu'’´;êí–w§–y‡ð[SõF²UW¶éªMÖ=O×fä|›Ø–ê(QV£ž“g‹æ»USÞø‰äÿÚ¸»¶éï[ôýè±!÷ÐähBîü¢à­Þ’¤–àÒÚMûn€×Mò½ÚM«¾þ"ù?;&‘Ï2ŽY¬ñkBEL ‹†@Ç$:%3öGFŒ‘p¹ŠØòFéâˆØÞ®¶¶‚ÞS·ÝÑï[ÊÜÖB¿“)kÙÁä÷+U|E“àkLÉ<†äc wQŽˆ‹eG%ü4³ÝÅèŽtD"e䊜ÀÉÁ^Ií’ý¡§É¼0º_‚¡0Åä¦Ó¶-­d#d-“¤ìi‹‚$’#w¹<­‚×RÄ–Cmµä>~CKz ûJ{Šû‰{‰û(È’C²‚{g" -~†IŒ]†•â˜”æXòÒ€%ÖbQègL4…kLûü5Óâ¸öï8Ƚ¨ZGÁùiω·EcÙlxMèYž³2“ýçλK1[ý2 -öäêl7rÙÆUŸ”õ ›5®Ælo.†úR¹;P˜ùç¾A’ÍÄ9’6ç¾A’–‰ì–¹óÙ5nißÓÄÙÒäŽ6`¶­ [YX¡è•‹FÆQÙõnœgQ½‹J Àù’†´+)w@NyÔÕh)Ã@,NøÓˆRL( ÁöXžºšÙ7¿‘Âg…ðy!xWm=/e…RBˆÛ%r[£îÎê Ê6×ÁOàpº6g©gÛ¡q éfƒ'¢ Þß|Ȫ‹ /õÍkg•’kC¶Yà©÷Þú:þw ¼™Q±ƒo~LÂnd0²ë8 ÂÒ>Û€Ï7à39"âNqªÂ§}=ÿ2¼l¶çwÃTŒöËÃ¥uxØ5¬_Q“p÷USÍQuûÎ$ùꮢŸ¦ºËÕnAuÝ÷ùFf%UžÂm¼›#HòZ´ï¾gAõÚH2ÕÜ^SHÖ*¹€)ç›Ðæ•Â»ø¤V¹"œHƒ %=+ö…|ØØÀ÷°rfŒ´¢Þ’¸fŽôÛˆ‚ûúmDÇ°H·.Dºu!2”ç·.DºuãÁΣ­Yàï°yÚ¼?âû‰¶c’5¤æõ¨Œ\wœ£ÉŠVåu+Õ°ŒdsâO±j]üoÿðBš’"¦ÿNhW’!5~wÎÈÝ÷Í7jW}Ý—R³]* qÈ%!fíW²Kkæyþ‘<Ñr»k¢‰§)ߊ¦Ÿæ5K½ÄÑ—Ðê×ôËñƒ’àL¥‹´ïO¢lÈå%ÂfÔ‰9×Ôï¤>'öœþ•ÝLªg焈R, ŠœQ$çÃ…§IY2”BPðIR%!Å{Ót_Ú”v¥ap8x3íC‹äÌ(//bÍ*ê¶glþßÿ÷á ià(Õ2iíÿiƒZÏÿ×hTøúâ|ãR“- _åR4ÿ¥5 -k˜új šÿç:†MÒǦ¹ Ú‹Ö¨& ãÏž»`o˜X‹§°ÛÙKÝsUG{HÓNÙª£š<¥ðá˜ØçKP‡r˜3!uy¬žšY;ˆkĹ“¸Âs¸²¶s¸‚l -á1\C¸"9Ã7<…«y×TÏàÒ#¸ds}ó2o\N£æ®å`Ó2m[&?åˆfΰæoØâqˆ<žºT¶ÈQC Á§¥;ŽS=*êUÉd£Dø²³F -Ñ^•/ù˜Ö #þ4 - $ -!‰æ{ofzoæwoduo¦r÷ Ü£Fîvý‘“—ÆrÄÍ/c:Ïüi­z^+̹ÈO»ÐTi±¶§:ðˆ*Ž„Mx&‘)ƒ€ñ¼FÚÎ!¢,BœÕãf‡r`XI&zæ0X–„XL[·y_ûÄím’ø+d+wÆò‘ó9Ä°úOƒœiÉšVûÓ -²sͼO-É+ª$’TjÓV2 ”à7í¶|qDÙt±hÃ÷I üŒž)é¥cìþ5h¹¿‘Œ±­HºU„Ë®“»÷=,Ú€9Ý ääõΨc¦ /«îCÓýgþ\u¢º‘cÔU]Í)—ª¬ ´jÔh¢g³É©l6Ð^5lT64X§Ã†*läbD¡+!ÖaÙ"VÅU•WM¦_O’_ÇŽÖQ£C…+ -q¡d\OÙÀv(˜XX¬h£Â•#‹þ'WÁ9¤K9Óºr8™¡cýÀCöEÞE*pÓñä`?¿)X±²]ï}ª'; -R9a=Ò ¢Á©úrj! - ,¨ÜæÀÈ«J°˜ˆÄœÂH! -YnBákd´ÈdsĦ"ò2¢S¯™¥9—sЩ„’’—œÿƒÑ–È-qO7jR¨GMý®ŠÍ¬9ö¾~˜GóB -÷ðÁF¢lE -Ö“e×êõ:™6ÑF\½Y¯ÅÖ‚0nì3ƒ÷hî‡GàhÂÐÜöÍ{Â6CKš%Ús É6¬ç0ñ¤çD!Òä“⽊jù'à ”M:w-o=³íLvsÝãTÊy{'©:b$ÓU…þŒ:¸£šsiï'AY³¨&t¾“ÆŸõWl ï[Õ ÐTéšNžÓ4_'™¦+Zèкçóôî$6{œôhõdµ‚µÒ:X«µûÞû€Q0êFµŸ>`ô€€‘F6"l„§š»³–9²©dŒTB¼À°Sqß°Sñha'óÈÝð"Ãa­‰Ò²¹ÕŸ0ÜÆö›G¸$’£Ñ›Û·UTS 6vtlßÓ‘59JT18¢¦òð¨?Ñã+¡®ÐMiè®28…ݲ¡Â°¡$ÜuÄí]ª‚UWö9öo‡¢€zBÔ¦(<¬»a²vC,°Çÿ† _ÍkkÝ!¬Á ©ÛÏHÕÄnÍdCþŒÔv„s-Bœ½/käŽ0ݵé|Âh‹ÐÜ.2CéË®Üf5(= -"B¤|±ú&Ö3¬ˆ‰*¦Á-pÄ‹]ÒÒ×’âËŽˆ7U»FµÓ;u¶þ[m\á÷ºC»”|YDƒj?§Âu§ªÕ¢huÊk5•¬ÐÓ1¬!ÚÙ؆ 7GÄ~U¯¦½Ñ“‹ÃÍn•„ø*$4à|­ŸâJ}Ú}z4HœýÒÜ•÷ÏWÆî¨HŸÊn=>ñQ5+ƒÚͳ;ö}îª:­çÒe¢£ àHAÀ‘‚€#õê8À[“ûäy”d'Íã¬k-ÛÓ¦A:º²¾»¬¹KŒaÿK7ö$Fö›d“@[ŠˆÚ¾±‰Å¢úMaé>›ÔXòsƒ…Ì1BNŠ"„“>k.욤Õ6uÍoÇpÔ2µÐ}Z˜-¹‹ëéÒîÊ|°;{^Tù¨+°'ÅMÈUú°ý8ZÈ Ü-µs³¬¶[`S‹nÙGŸH¨ ?M›KOæ%‹+Ú’ž³=¾KVõt{òòh#Â3–“‚î@IºèNº®Ž:§å°-î%§å0—潕&Ø…œ¸„jl¹d´g³ %»‡gE¹1Ô’‘ÐŒ‘Û¦,gÏ; cJŒ1—a*IcªüℳMô"&æ4‘ý4Ø"G·¨‘¼S²s,¡Ó`\õÄe°§#>t™Æø·vÁ8‡ZLI[/h¬}>ý©Äl(ÀJÙó5s…&#­Üÿ95©ÿ·tÿ–BáDvC—Ð?Q²âHþô—Þ>\µ¼°rw”R%J¥¹œš]£þ¯æÚÈÉç± ]dÃ&@=Fµ/4š¬pDÄÜep¸·™Ád/ç~ËéÎÑce5UÐc´o6¨] Ç;öGïzd„œU ›À×ðà!ôPƒ=G=MÝQO£¨vÚS Ôb€Y ­>E‚Sô(ÅÉ°~æSåÎ|ÊkÀÄÆ¡O -IŒD¢?LŠ∄è!ˆN{âÞë†+ÜŽ, °…xE›ØÂ;Ð…»ñ…Uä@8Û†Û1†­(ÃÈ ùÝ8ÃHÚ^ܾ8|j°»ÆfÊÈ–e±¸Ž ðipj#LÂêqBÚ€A½€0!zvƒBK93„qJ’‰Ð‚îä'Å ŽÙ›§pÁÊÁ3y§?tÕ -ô?¿Ó©C R’PEî VÍ¡ˆ[ÊgM0&ÞtÚ†À½$ö¹µC ×¯T¸;szúäÐïyðÉ_,GŠšl)É=Vº«ˆ}†§2r½M…díSäŽ |>fðµhPÝÂsÍs$@u;Ï¡ÍWÕôVµãrÒ:pèu¹h¸è÷¶„¹®Üž†F[R]MƒÀ¨™òªÙ–hÒÁè ¢'Ž5N5…Ÿ‡z(a'´Žñ&3ÎÜ@ ëðÂbX9Î/@ú\¨ÿ&Qy—4eT&Y‹Šmî·{>_O²+ÄGs"¡÷HÊ-ÙBDÈYil  ¥•r¤fy«Á˜÷h¡?vÂõh¡E uï膷ÔyMÕßà ÿ4ð×4¦±‹s” ôáÀz0ЇGµ0U#0Ã`àæ†ÌáxsCfm;f·  ¹+(Ø€¹Dêa‹$Ž@uÕ8B¤q„#‰ÞìƒK©'BÚÿѽ£7öžÑ{HÑ=_õP™Ô ->Éêà“?Y4EOä`eÝERDqŸúƒ¢ô„wN‡qήSÿ)Ò›Ü5 ö!²LCõ¾oTz“¼A9"Ó¯y*ðĈvƒ¡É æ>Ì{4æèÐ’&ÖŹS—VA…#ëN$Öì”.„rÈßóÓ@`F¨V­ ›,± ÿ s{—`ê÷#7OÇ“z'mÁÇ€ú£@õ8P=tèÕÃAÇîˆP=&tê %aâMG#—u‡‡ÞÓÜšÖº=kËk}çùž›gUì<Ê3j=ų%$d9£T¤js¤¥"U­#Í(iF©# ìÝ#ö•g‹åÎÒyx¾®ÇÍþõXõzÔj=Pæ­{9rÚË‘9묩Qî¬7Ô©ëöÙ6}zR§ò)[+uÉá -Á[Ubw5|gµ0‚ÝJœ)¿ŠT%V¸¢”Ê-Ø«:.+ü~èU戡]Ÿ€¹?ür'ørRD!øR³ø$º>Z 'ÛéNa Dœ¾@~Nlh²Šùgæ2¥ä‚ÅRdã´†Ó $sJÄÉSîoôpÂNx pÂ?Á>½,¸$»Ÿå—<½AÛïy˜dÞê(Îó»Ïog7Ùfv!9g3ÃQxø‘5™ãfÄ}ØÕÉjCý, ŠNI… “æÑåÍ=üÌ[ZwµD¤xÇøÖðXK> ·;@R‹£C±‹ô Ècœ› dБó$n.ñAS»hM°]ÔlïØìt+êµÞ< Ûïs;”V,î¡D™ËÎÌ8­Jk"É+öØC•n„SBHߎóqîʃ8¤3™Ûs!f‘8?$Jý™¶fÝ÷‡Î𾂾úÄ)öt¾÷t{Œ™&ŸwÇ×Fn>Elží½™æ<8í5ªç:ÿ¼ÉŽKciTÇ¥}Þýi ´Û ¼îHó—DuÌ›ßöÆP‹ÙiÌœµžÑ›0RFš Óí¤´bÎÕ£R{˜¨¤†I„+_ˆ\bK‚‡ÖE’fÑ8IÝáPUl*:òH¿ÊÙC%÷ CÄ2ßISÜ}6Ú4åÏý˜°i nõ#¹ƒ4m¡Uª6iVK×fœë]³ldvŒDùò›Þ·o{¿;(¡ÀÈa_}ò„Þ©G\zÛ&Àóî¼–úŠB«ýþy-ÞÕ[ϘƄ˜xI íÝ)¬B>§¯¢èÁ^âèþ¦Cšâ¡u„Ô5¢AÛ±à¢7OUôÚppˆÔ£zâý‹mbÅ"QÍ»»4¶¥¢§F¤^À©ñÀ¹Ð2Ø7³ÅÎÞˆê† -k}žè:ÈbpçÔÁ;ÕWŠçDó3²›DüÔÃ>Gnþñ ¬ÇÇÂY8 fa0}„ÌÔqß7ú^“+{?ÉÙ®,U´=ÐL¯ZÍô*¯E ú£úB–ÚÕ÷bê»{ JgßÜ~²¡™DùtkLt„28Ímâ5+ø”W@)+"§ƒý`•D¬j1È@wÁ219äPÇ0NeFkóœçýi›êR[8º¶é³- -Áý„¿îÃÝGVî<:;Ú8@°–«qÜ[8øpÃ0®*^½€Í"‘±$eýNàà4úڡᑛdžGº”!‘;&°vHàãl6?lÜž'÷mìù½çó÷:pðþ‡Úì±6›G†—¸ñ¹ªZõžª~HbpÀaëñ‡áÁˆÃ€RÊaŠ…®(¹"Ñv‚ Xj¬&†Ë›¬y‹¹:$¼\âå"Ñqd“Ú5M«FwmèIéãàttCˆ¸úõrÔ|ÑŽxk§Ä‰c‡ykDW"Ñg¦M‘lŠ_SÔaÕLMáiÛ1”¢Åt¶À:Df¹¶ ¶ ™ÖK•Í¶0ìÒ’NaËáS°(g#XY~m…«kä0Ƨ‚'fÝ-­§ú62ý7sýûlÿŠ ·ó1^dèNb¡ìÿ#Ñæt—Ÿž0èW,žœ -P7ÛŒ š¤óÛM†[%#‰zZs´o¦Î“g´…ò\¸Íøù -·'ÏhO„Ù"òæ ·'J÷­­ãŒuª€røÍ¡÷g<´½e·—?èÁ¼úpðeÄ»åhcóŽdýtß‘†M¶¤ŸlMƒ²#pºyxÇîD(áXò¥aÓ ráE\Õâ¦êÑ¥¬£êÎ’ GVV´ŒmT¬¥[Ø<¾ÍÖ1ÖQÖqÎóˆ‚ÁöÃ=”›.w]ò´è{{ܦ™ùy lß%VÇú=ÝŽÃD:-[EOJÏYx.òLQf•<«d„žÝ)M¼„æ\)Û9KJ’aHÉW8ñ -WÁ$£ LtÝa.)L s¢@xêcLis -Þ(›¸hSÚÝ=¢¤X Ú Ô¸ -,æÉÃÇ[BÇÑã&5AÁî“š>SZ“Ž‰M¢»ÎjÚó472$¢»tkËâð™A2’£8zÌô48ŒÑc¦§ÁAŒeƒØeÔ} Õ¿ø'Ëæhn˧rïÑŒiMºÑŒöY‘<š5#7u;ÐSÀh2ü—ûÖý½;¥iÙ‹‰àp¹ZLîȼpëq˜ƒX7 ëOÛFäà€­¨q–?e«~ÒVîRûµäÃZòŒ!îm×,a.Ý׸ö—/A -l^îlÃÔCaú!=ï–zJçɲñ7¡°ç^ck€ä9Iô„Òª±¥7¥´y)Iô’N{‚ªa#˜Õ9Ìð!¥Ç3°@¨“L'ÕNäzF’}ãâ½ëš½µí üm¸ÉÃôf¦Ÿ'E·7Æ:’áŽÃÁ–‘Njãœo\Ð(vW%œîÇÁSÐEåÏöˆÈC¸K}ë]ǬŠv{œ3Ñg¯µn×W›Âõ%[ÇS§ÀÆ‘K{h]ÊC5³r’R gEªéεÛý¡Í‘ ÷ê6¤Ü~uûQó¸æ‰?®ÙaÙô³4r¶0Ù<°9H~(˜ùpã¿FA5/…ÚtŠ»NúívÖïýNûœ,z¤ó~÷= ¥qÞ/šóÆUl½Ê­Wå¯(üC˜KÛ5Úz5~¢š$j»¦[®Óö+ÒDq-—ÙrùdsõÝýÖùÁÕÎF;›íê/¼g\"aVå±AÓH­zgÙ·Ûö™Oì-üðÔÎÀ«5lý)-µ÷ãš½Ïn>ïíÉäeõ÷Ç'k.ŸQÃÉùÂc?9±Wxô'^Uä6‘ñ62èDc¼.¿J,—©]6¸ðøßq²q¥îü…ðw»›ã8 -Ôœ|‰s–”Çu(b Cd1>ÃR -ØhDbÉ $Á•ÐÆçÌa¥Ùí2õ'x<òÏg*Lš¿¤ ƒÏ¹§ÆÞ(Ø‹œƒ¹ÆöìBæ$™‘3ôÐÌãÄ–u#ÏŠ‘Ç&^IG³òᬆŽgЭ•d(MÑó‹fÝøŠÒ‚„¨Š,jL™[Pl‚À$« å$ÊHK²iÅœ—èîÆcZAFÆ—†äÞPªxSQº% ™¦PUf¹9(!"«²?”¼©F²ùž -ByJÒxByLþבìa©H:—¹ R:"mJš·®YòæÆ$¶Oi[Ì„„÷˜øˆ¸aEb\÷&£]©ã$‘®Û“O)z\‚‡Pðb -nŸÂn¡ÈÁR’R9(Šß›îKs{ÒjÈPw‚wÔ€‡&An D}&ÎÊ)ë%àD#ÒÝ=`yKJ•ZV¦J·Â]2ˆñÎ$þ­çÔò¹†×_’Ž~"I¨È"?Ìsës܆¹mü¶.Ÿ­Oe+9ƒüµ>s­·½½è“Ôúä´>%-%£õ©h}ZM<ëSÎúCí}"â$LF,éˆaGä©ñ9‰¨Ûf83±æP< •h›OPìRG.v§Á0Sq˜«Øe+f‰)æ…$V­‹ºmQ5’¨OœEæMÏ" é΂ð;`¦µ0éFxG<>Äy|˜Ço ƒ=a¸§Ž®­ï’hc“\sƒ\[èn[×ýøÛñè üÜ$ºG:×zî=DÒ}ÂH¿UÒ'÷7‚ Ž«íŽŒj™ ›¹ MK.ȱs£p’F .j‰ÄÙÚöE†ó8¡ØEÕy”2ÜȘÑpå.›Så†Íã_¦–¤ÉIšˆ•9[”S2Œ9vJ»Y€Sæ,•$Jf¸)³bdà Ò/QõáÄÇV\%§Âj‘Ͳ %gIÇÍQ}„ž3$âO?«ÿ{x‡tûÛ½àm~ð¨FÔpAlqBþðzœ*-8 -äB6cŸ`²žb2ôôz£ÜÛÞŠnøý¼×/ixü¼'×'@Ó»tÇa’cŸÜ8LiìA¢8Ÿ·˜¥:WvñòÏ© æbAÎÑ’Æé}™èªo@ÿ7 ¾Í=T›YEÛÒ‡§áɇ¬åÊ7®¢å*ëWœ¸Q¿†-רõ‡W$ÚÓ-×ix…Iƒþ5¢©>¢iŽ“—ƱäÒøû£¢aŸ¿ûÙ‘ÈÏ‹µ>8äùsâð·"€&¹~õêŽì×ðMÂß¼žÝÜÌ×Ëo_þøîÝõüfðængëùõ@¾ø*ÚöU:ËNâ¢4ôÿ26и[š_¼ âÁßþ ?ÿ|üo ~¤ƒïÿG<¸ úß~DÄý_JœÁ_’k´˜þŠåÿKúü#ul.kå$—̵§‹Ïw -üĸ|è4'þ6{„º¼ƒßÿï–@ >UÊ 0Lk|3-ZÖüF›Ÿ€Ò™2{’·§·+ÍV'iTrr2o£é³g-åi­bª…Z[\]Øê„^–á!Sy¢¤³€”X`>9·WŸl£RüµÞ 7\µ?Ùö‚¶Š´ÔwéÚgðè_¤°šŠ’ߕ˜'¥£´´ìƒ‡Zƒ—÷I‰ç幒μ>/«Œ«.O¶Ñ‚G7g¢žVéNp®¤bø‘OF×µÿçåBu…©”WxŠezR”OQ¥™Ô£¤Seƒ©ÔJÓgÏZÊ«OQ?h‰ MYÉ/KP>XG: HéI•17YŸl£¶MчsŽF©¨T¾[IaÛšÒÒbWíXj¬“Ϋ"4å܆BgM и’Ð ÓA ˜ÎÒ·öÄ‚2ª¤³€”Ã+låú‘žl£nÌ:×­F ¬£Ñƒò‚T t|˜/â$K*¾òÿ«€V綱»ç¬å¹ ÎÓx*òG®T*ž8ÚYHƒZB·*kâgÛhÁ³õ™…ã vÃz ׿‘ÇSIgžD쯎•'Ûhá£Ë¨e&‹$T‡<ÇŽKÑ»J>=g0-|åIX“ †U«à­JÛV»–F4JkŒF|’€†S' ÞÃV,WhgMùðYðl-|Ö/jˆ.wÚc?û³âi~R§äÄ¿@<¡h¢7Ã#J; hÐl0ìx|ôÙ6ZøìæªÑÃ&=ÛÆ•.ëŠO©dÝÐO®Ú®¢Ÿwé;~ìH³ÈP'EW*‡ƒÕ‘ΟWü<¼ÊÚLˆv<Q’s¼P”Íy$™yR -±LóBúº´¹+f¤©„‰ÑKy]j¥\E¢­åÞÆïãLj›Ä¥–›€ÊÅk,QƒÉyK-È|`b•èL*ó‚‰`ÎgF (r™IHÆ!åúÂâ•rShh*õµYUJ)Ž ‘%…stp6qÅæõ·q±¨-eiÐiLL $–-D[©s;&ƒ,êƦ̥ -U¬l2™54ÌdªíëÌ ð¾¦}šU:¥µpñD›€.. :ÁЦÔÖ…Ü[d±ö82w!–…®±<( J”Ñ” U Y'g®l&¦Y©oªtí#ÙIJö«’g ¡ã’èŒt&¢ Pyé”Ìþ€X™Äè<`fŸæ9¾·¹ƒ£¨&B‰©.Ý2‰µoèàH®€$q'2ó¬(´c±J ]»® €[·pxÀ½©Ýe´R`Äi·E¹å©Î¥V<‹rðIb‰L$g„45Í]ÔKïåÉãÜqÒÆ2Ÿ‚; ]Ò¯IN3#Ç©g•ù¡N2ÖôU)‹K$eª_”…£yÞí„“*וœ0‹bå׋ð¾wRVA¸ ›B§1‰Þku½`¬zð_ro2_%” KΦn–B†¬ë 9 ¿ „%pG-Ö=ŸagÔ¤ONT×qn -W@'ºæañн "YëVy€˜…¼*It -€¨L´`ó» -4yš]ÖŸh -¹€â$É+]0Èè™XÄnmÃK„˜Æ5ù¥äÖ©Èt΄ŒBQªR+–T•öLl\¹…ÓXŒ[P®Ñ)«ò>/íÕ# ˜?ª¹®-諸‰[öåÞ"N®­`HuÊY¿¼ÑŠ,uÒåy*÷"&D»†?,Àª&F>.8gê¤ZZŠô2ð-%癡º22ÖÛ€X99CZ°–[©,Æm©WˆÀ€:ê´Ç]9BnXª\µÒ·H.‹,¨‹T»&㢴gŠÒ=‹X{¦Èõy/ÚMjµVE⨛ Ôu?"Èv- V¢- GÌ3W€ŸâqUˆæä´0…WǘVZ“ÈÄÜê§(¬µØ,6Y}hðÞBU›0CÄ7øQeÊ”®€Ü(ŸÈD·b•!æ° ‰ˆŠ°J*„°IÀÓMœjÌÓ‘hM®Õb™ĸT•‡ôx- M+éUs ”eªÎÚhMªý]¢¾É`/q¤'äfb\)«'/’«¯JtÝXñLÈÀ ¹ i +T¥b–*OËm¬£ -Z¡Â&+™ã½bÆ%ND¢Ñ•PÕßLŠ -7·Ê+¹·@˜K…>¢6Ø„¢p©¦™SªQ]Í2!Ú*MµgU92î%RÔu…ä¢àa©•®rš(ç 1ÆÄ"U#¤b–ˆ´\Ÿ/¬+¶t&c*•¡¥\«d¶ÏÆ•N Â©K@6¥*4˜˜U•Ôäy¦D«Ë¸p|ëäx¬«<ÔÈäZ€¨â@´™jÒh%ºÚà R€ZýX@¦­OE¹¡Üdsªs£ƒâæ` Ë7× ì¡túyÂÚ­PZeȪÝgJNxq@#bVú -kEØ LŒeŤ^E*ò¿Ž˜˜E#Cl wÑ -¤¹q¤NÁMÓ È$æ™\È,®xPëÃP\ºD¦¡åR?˪—¾Aꦶ¸X¤®µNTUl«S#ˆá¾Bä¬?9ãBˆºâd&Q@V›'7³‚ÄOZ)K ˆ©[qE¡*Zi²‡ -10£/+¨ÃKË&‹ç‘\cå;ds11vꜬ9¤‰¥U#Ÿ¯T¤äÈk˜hÝÂ+cžö%ªj:cÊR:’sur”†×X‰Còn&’‡M•.¼=•JE\ÚB4©ŽbÂs‰‰ÞY!FF Hr'VY®—‰s9ÂÈæ·Y˜Q™†R‚Ÿ‡NNôyUhKœ'*Qhˆ˜X¡Ü—7÷<",E ;ˆ©Ub™K­0Ò«XÏÔ#d„\æLÈ`ªô`Q[‚DI±Iœ Ñ8ç=ÂÅ¢ P%J%r -ˆ^·!m”‰™»PÐk¥€8Zš×+ì7µ2¹­8ªÊ™론Dråš[Z@át˜\ŒE "ÌR'‘Š©Yu¢õBߦ”š+7¡àŠÖ@õÓÒ¨{–j`ܤgG–Šñî1‘h´®Þw¨6qN –©cˆÂw° …j­Y®W  Tå*I¥¶ *âX¥ja*!ª''¤ªãHŽ·ì2- Gt,Y_¥sÎâ4H´€}W"U™Wœ 9½3e¯m©.±¢éUê4‰N-7u†F&ˆy¥ƒ“e¬É•è$Š“`ÎQúÞ>m%ºw«¸ò+¯ŠÏ^&Fm¢jPîlüÍ{Ï”ìf3ù“™˜TÊ>ÕË]!¨ÂjhÛi¹^óTÁ€uÈÕ¨(ÄÕ…¯rGÉZ€M´s*Ô”¤N^UbšQ Ü‚Lýó¸'¡®¹Vh…©ž­ª/½K©tHe€«ªC¡(YQGb’:ÑÆcŽÄ2QÅ'SiCd••ØÝ@L³TïåP›ÍÉd£á:•R+uW¢ ÑiÄ@]&®ê3” -(¨\µ¬2kï—rV©O[ÇË8…y9;J€XÄN÷C«FŸÏ©ŠR+;)L²QÞ”¨BîTïÊ»ë’ïAªSóˆÏ8²—¹®²¥Óóƒ.ônš†ú2ªbV ±&ÓŽ‰êLÙÕà'%.¡v;½3 ÂÉDäéäVɹŸÞU% ó~Ä`&¢—ªrVI&´ÔV¢gÆVKDVñJSF‹Õ Yk¨’PG»¨Jœ“•­,~ŽµaÌj+ü¤‚˜#ßh­³6œ:d]žê’ºë¼i D5ADyÖÇ+ç pýš9}Êt&V±®¯ !Yôè,­­®oƒÞ8$æN§O9¾È êÚõvÅÎÁª`¥ˆ©8m¨Q°”Ãù\ÈK­–ø&ñÎ\!…v`Á!L¾ÔÁ˜ÄN„±æ‹Ä\mØT^@´F=~q•®µ¿Åêp…¶¦³_ -UFœÚRæ;t6·µrêtèÍe¯3™lgéØ<Ó{­¢•q­8òÅãêb`x«“••Œ@Ì -ãG¥…•sÅx]±vïÞu&Ô`f ´'$AŒH¯PØ’‰j5§´ -f‹BKÍeu¹Ô[…q"1‰75$«‰˜šPÊhY^i¹,S‘¨¬$ÕÐ1È‚ c)0Ì`˜Å·©‘vž¨áB@bnuÍÛ”&Ý)>‹F±ª{cL1嬛©ú㑨>_ÑϸŒ¨z%†?¨½.—²3š‰Akq¥p@«+Fg$gèkÓc?Þ[9‘%· ƒƒFË-$4Gäj\&ì|BbbReH…U¢IrÕcëž''£¨E!·fYªœãJHļdA ´USÅA'ˆW'es‰¤Õ 㛙Ȣi½˜»xÔ J„æ ñ{¤’³Zú»ÒÇi”ë È»UÊŠVÀÏÒ)A qð†ˆ~u³5„Ä,Q¥Ûª\Grá܆ýI ®\H½÷J*u²Yµ4‘lê.üRµNºÐÒUA/±3$&“°rE*Æ"Uä+™Õ‡‰”*c1‚á®â‹£?k-e‡?mª³FM_\Uªwä¿ _,Î.$y= ÷Ì+|y~WÒÐò š–¹#VZ/¨i‚9@bRê sh‹oLd óðy›k» -vÉ#1MT´ˆeE…:o* Rý¤“àZ©’H‘&fŽ)ñ:eÄ?‰D¯> ¤X=ÇâEwÍ} ›=—À>ÞçθEÆ™Þí vªºŽ±ÌÓú -B«dO¢Š¼·PO¹e§‡ÐKŽˆÄ4qˆ?Åk§®‡*·Z@iT’p; “•~ùùÔù„‚K‡¼­LT¿ZmÊxWyÊj(óLBžÅ©5†´Í\~ÈÈ')/Ët•W"ô ¢èÔjun.Àq*†ž€H„ŽÕáuk<åAé - LŒÊãš›{//©Z©s ®öªE§žN‚„#ÆZ^«5¥ -wÌ犔p~h$ûx´Þ˜%º -ŒºHï«(µègqxdq8àó¹.CµÁ­@˹žN7·¡I Š·}%N•fp–æ®Ã#óò¶¸&],Z=wxkQ(L[·mÐÍ —Zª‡.K€šˆ¹¶‹ü Z¬NÅ£­ý¸Z¢’á©¢¿ËJu‹zˆb|sP‹*µî½!P:5ä,ðq. u{¤¶gBöȳ$­¸ˆŒa‹|/Û”¸‡;u*´ã†ºµ›ß†þ¤3!ûyHŽGvdÙ„Ä2uzF3!FW›–ºI‹@í²DAuH6™îLÊij ÄÌ펊Õ5ºi£Ô fT¬ÃN »Æ;Õb‹DÐãµ€Øø”S#´»HÝèöbPU•`y·Š øÜRÀk Q!D{Kw!âE7Ù‘U¬ã«€K«®¬€ ËÎe!æÆÝXUþy·›„‚2;²B*`«ÆD»ÛÀdÑ-¢èvRYe2…“÷Cg¨îSt»ñˆœ)9x™ß3&ÛQh1Ä:ÜA P˜éËWDÝ_fy»„ðÝ©„7š8Oƒ©ÅDA©SÎà~ân¯§C¬Ò½n Ù´BÌuÝŠS˜”ÄÕðN“xžhn‘ÀÈçR· õŒ2Ó}ƒÖÿÿ¦6Ú3![óZÏC¢›Ý†}§Lt:f -!l=§‹6¿F$ÉD§ò ¹Ð¥H¦ö™Ê@Á²o~¢`Õ½êG¢qŒƒBsªÈýZ§ºŠúo˜Á21«´o ŨÚ`Vév)øõa\•·µ‹¼Ôºj --ÍLùŸÍ“B 4Uu5ºrÅkÇãʳGp[Æzk¹~åilͤAïŠ2¤}dR/ÇÐ «hÐ0ºA$VƒPÑ°¬Ó9 ëmÎÅ#H BZVÎC›“‰Ì r}ÌŒ0È¥'Ð@éCõ¨Y÷2†O0ÖíižA"¦mP>é¶-°k4ÑrM©þÒÌ2Jµì0‰P®íRà¹|Åëcœë -Ýײ Ú"® ô“ÛL{+uAËÂ)†íÌW—I³\;±r?q °ÕEw5¬©³§=uˆÃ!ÔW!Øá üŠâ®• Y;LEs1ìÜÐ(¯š¢F1–.ÓD;Áj±ÀtµXç;Ør¦ýH¡×W}ö“F5=ŒSǺDR‰r ý©,ˆãØm0Š¤¨|žKY«xis½*×TNÏ3l +0ÁJ[ ƒ xÝWc8ny&djº´W,H,¥\± ¨ÜJkàbN„™¥Î°×A~Ýä‚´E$‡lR3.ÀT[èÓMDUîܸ±‡1€Š$›` ãUÊB+“‹•ý@,¬VÀ°ƒ‰¹ltk3'i&ÖûOÀ›*Ñé%¡Ô†A\@êl ‚uóÀŸzqêf—ÂÓ c¤³ž‚[KEp—Ž"¡Þ¸ë6¥ÇÊí‘è‹›ˆŠÓug|¶r¡[£ú¢Dm®-0vF‚®·¿¹ô›D c3΄œÊÎëXˆ V±áôLLÓ\ -p(F„%'Ê¥tbéSÐvZ¡Ñhðû=d>uÂÙpò&‡Pf‚ŒW׆IêænCr¥‹Ã(€8q°>ÃÒ]ˆEQèªuýêq膡Q¯Ý®\?7t/°ÙµÏ ÜÓ5C‘?&‚~"D Ñ !í·ÕâLË- ïÞ(ÛÃ$8O&æ‰ -|—àĭl¥£ -~X€Lc©€q¡[Ãùð¸€Øm85~¯JÅÛ¸»RÙT„µr Ý"–}ê¶éFdTÖ¡‹[•rD™Kb@;˜”œ³`%¢µÚÙWl2ÞIä\¼«Ø0Ù˜»-‚¸…‚§ýø½­¸ßJ‚ÆïNÊò×øí:ˆCQÆK‘n. s¨.#áMÚÙ•©V´w‘¹$%æÄí±GªDD]à]5>h`8êöŠvÝ©dT×G¢éƒU;5 ]CÅ{~%0³òöŠöGk0vbáÆsÙdŽP¢ÁÆ™ù­Ì1oò 2°%'€q[*‘kZ›jVÝÜkx‡µ`cÇâ$AGæö\d¥såЪ9S±â4Ž‡JÑZ -Ùgÿ¿²B·ñ"Ø9Ë9ŽÍÆddeæÙÇ)-ÖRÅqž‰†» H§¯S¢¨€Ò1S'»pèÅ”Ùq¦ä” ƘãJ¶±ŽƒËÑ=ši} =oLÄDôº´dˆ‘UIQ°§*—”©q»Û,Rrê˜wS§Æ9¦buÅbŠQJߪPIJç"0n×sR  -  W³ùTKÂ#¸€Ìadœ…Þ’uè?(æ)²óÀZI’”³ªÂ÷ǹ:%ªTw ÿ‘;Má2HΚù¹Ë”dK+¢¬è–p¦$4'«Ü!£‘‰^)9s;FÊX}²ª¡ \–«†ÄL1±²V\“Å-øo= ‰¹‚ cÑðûÕSçˆ2GQÔx¥Vr£Ú´Ò™)'¼Rr¡á­=>Â2ÀœâV1Iì"öåžÉ ó +È3y%äÂÁy‹LC2E¦Ð!ÚÁôJE6Wb¦‘¦Üéu©îÁ☎†¯ç¶Y±«™e‚KÑš©ãPèppÞ¤4G WaºOSfÐ fîr¼¤´ë­õýZ1Ü檀^+%­X+ÆÀ¦1uÁ½Ä¡)bª¿d:L†lõ(Û“*D¡ñz­WWɤR¨eŽÅ_ÅŽ(N5Ñd‘¬ô8°J¦%Û*¸²jòû]þraÿz­xÚñÞAõ0»rV¹­¨pè6AŸZ<gí…Hé…u‰½Ö¡®„¬¬ÝïãÄ<ƒ¦)¬s[†[a±Ø\˱¨”E¸iUÂy-$oyì«#ÅüJÉ•Ë{Δ\ªçŽ>µ‚íþ+gü›./jùþî“7ÐÄüÕ›ÿøîtq ÅD_»ƒo¢¯ÿöýÙ«‹9~œ,Îo«ålýÇ]_|;øò÷«Ë%|õ -ªµ^ür{3¿þjð/Ñ×ÃõzÖ¸ãüÃâòb=_â÷vðõ_–7þ;üçæsüîËø‹¯_ÿu¹8â(uù¾~ão³Ë[¾ó»oÄ„ˆxTâªÕ¡¶ã÷ÎíøýÚaâî-ù´¸¸ùй5r÷A·èÃ|ñþÃMç&éíOÞ¦á_Þ/?~˜½5][¶¸€;w4ïyò¦¬~ùïùùÍhu»¼€ºV;–‡oÑ;bepëÍuç«=ó/Zt(lòævýËíå|y>ïÚ=ühÇ~Ñ÷{¯³s©7÷zs¯7÷zs¯7÷zs/œ¯ìK1øöiÉ›|é‹3ùöhÑ™|£ùoóË7f«OŸ#Ìw<Ö‹N²€_Šàüåòv‡(|Á†ÐõÍÅdþÛb†ÚC‘z6à»Ùíõõb¶ñ‹.Ýyl.º‹á‹çÃÝÒ] -_<‡Þ‡:7[½{w=¿=O{¦eÿ#µðˆüKš^—¨ƒ!âñ|u¹Zóé›deÍ—ÝÝ¢r÷“·ðúãüüÇÛëáø4‚ÎZ+¶ÿör¶¯–×7³e÷¦m>ø §}[9ýýãj9¿G+ýƒOÞÊÎÈŸëÛõ»ÙùüÍùlŸuW{è˜l“W&†ŸâãÈöhÊa;9^Ù}†åŸÛòÏgÔA^¯Ë›3q_<‡?rþFøЙä#Ò‡îåC8ô˜Âžjáëy/T êƒ$‡Æ :륿&‡o}ú}ç†ì𛄠Iº!;Æ.lˆ9d“ç×îÂå×£-‡.,_dþrqóz¶ØeJŸÌœ­7®æ7ÝGêO+;ÇVÞßM¼÷ò{¦ü~¾~?Çž<"%h_ÖñÇâóU ‡ Ý×s³˜ãÐÝirØÎ4czÄÐQ †Æ«Õåh=Ÿÿ³sx¬ß'‚µ;Ú}"æ¤ónóõìbqÛ½Kôög2Ó^Ø«{C.º7ä9e熋™y±¸œuÇ£‰ùýjýñÃêrõþ#2M^ [{1̬û–œgf/n#bÏÌ’™½z1ØÛ=vã8Ûo;Å!3±Î-é·ýžýϽX}ÙwÖ*~Ùw×DyéŒ/=¾, -ǪϢ°­}…{ÏS0.û!¶ª}°œïð)/H²vže/Y;·äX$ë°s4uüa¶\Î/ßÌ/ççûx6|òFþÔ9ÒzßFn>ølrh²¸þx9;Ÿ_Í—7ßÏ>‘0ºšAQCyÇ`ŽMíc×VӧÞ~Àœòà¥×~iYzunɱ¹ƒÆ¸õ÷{eÇÂïö˜Y‡¾F:è¿F:·äX4¼îÛ¬Ÿ&ñÊ¡¬¾w{A¡Þ-./÷A ]>ÃHÏ.?ÍþØ¡ÔæïÍl½×æû×ûw³ê®®ž£!çb ->ŒöÝ>‡MÕ™­¼[¯®º¯ºùéõôÎó šÖÝûÊw?ýö¬Î¬Ü·Ì½þªÇ6žz†-NËù¬óŽ‘óÙåù÷«‹îÍó<ƒç|ÙY:ÍÎÏo¯nw< yò¶­çä¢èܼ‹‹ÅÍâ·=çx&“d¶\\Íž-5ì±æ¡{Uö`˜³ìÎ_ ¦{KŽÍûуaÄÝ»Çb9ôeÿbÀ0Ý[r4ÎÁ‚ãCÃôgHÖ[ÙÃažtx:ëŸÇ‡Ùƒ‹<æÉÖ‡éÞ’c‘­=¦‡ÃŠ0úÀaÌŸ³Ï?téõbà0Ý[rl¡ã„Ãì1³}¼8L÷–‹†whp˜ƒŽÿšg%·/óx¦1<Ƭ{àûQøl£ðù²‰Á |¾ -<ÓË?iãð/o'”}äí~ž¯N -Ññˆ¨îβ#ÉZô"sf÷yrzŽ¶GËÿÌ­sã{ŽÖs´ž£8G›®Ð«h=C;t†6ljÚ󳞟uág½‚Ö󳞟õüìøùYÔy»_þ…±µÎÿÅðúeÓeÙæeÓ¹ñý²é—ÍëÅïóË×—³?Þî·ðQ,Ïy\ÐS§˜ˆYgô$Wõ§=”ÁÇÄùÖó«Õ®íã}®—CÈõbº§â8ü)/-­ˆ˜om<0üà÷[ø ÿÿ¾¼4Èöby1·X.º‡NÖóóÙÍdi<ñäíëÈü=AÌõGLÓµ}‚˜>AÌ%ˆ9ê½øË>‡8RŸ¶ V¿wX:;Ø;sèÛÌ÷b ÎÞÎWWW× Àþx»c±kØÕ÷Ç0ëÈCèì&üuÊ& -¼õé­öÎ Ù‡ -’tCvŒ]Øó~‡Î é.^~}ér/úÐEæ}ÄÌ1‰ÎÏŸ7ð©}ÇëÅ͇«ùMw½íO+C'Äq¯Ûoܧ}8ù1ÂÉûe–l_WB>\vð’b­‹wïn»Ÿfrè¬`Ïæ 7ØÓ•ÿf¯,ÿµgž¼iÌ//WŸº¶ïrñþà |ÿêSÅvnbó±Ã@™ÀãÕòúf¶ì>57ž{z«¸³Äº]¿w¿IZ¨wºõN·Ï°H_Ò9·/ÍéÆrâÛ÷ëù|ù-h`óoË‹ÅûÕ·¿-V—ó›o×ó‹oWëÙò}ç¥Ö{ã÷Lï]r½KîéÛÖ»äÎ7eç¨Ë쟋«Û›G×…£¡÷?ù<Ë;·i~ ìåò žx6ÏdAÆÉ2üçBÄLØP:¡sDSþ%¹®?ÎÏ›¯_ ÂÑïÍȩ̀tœ÷ögl>ø æྭœþþ´ {´Ò?xÈ­ìý6½ß¦÷Ûô~›½Ú#^öÛˆ‡Ü7½ß¦÷Ûô~›ÞoÓûmz¿Í‘ûm.Å¡ñ" ½êó;¡ÞˆÝw„^¨¹øî¨ÞÃÖçÐø,¼áshtÏØÐçÐ80ÀÙ¡çÐè>"žCc_¤íÁ Íy¦Éåâæõl±Ë…|2³Ïq¨²³Ï?uh²³Ï?uh²ó^öÙ¡ËÏ}EͱˆÎ>ïÔŸWvOxïÙÚçœÚ§Ïôò‘sê͇ÙÅêS~Ñ_’pêx8ÑŸ<»À±hó¿õ;òŸ| u>Xóâîð¯?ža’uoÈ^6ä÷ç‡ÎÍVïÞ]ÏopI¬ç{ñé{ó¶gZþ?RKÿÀýGõ%Z‡2*OT8‚éM³ƒ3Í^™ì‹®S²»žñjÆ>-é®h<‡žaÒ¸sK>-.ö€ÊÝOߢ¤{‹>Ìw#ƒ&éíOÞ&ïÔè³h÷N#5^¢S#ï« -—/ũѽ!½SãÌßÞ©q¸b·wj"'ï½SãPhšÝÌöÀ¶ô†ÙQfïÖ³ó›Ùå«Ew,:?ܱgôMOÜ®óÏäyê–ìç#9à­¤Ý[r,ör÷ÌGËÛ«a¡ý¶G¦Šð‘§=ŸtNôËìz~ºžÿÏí|yÞÝôl<õä \®ÞÜ,nÎw8€CÞýóâr¬=sLR¡Ovt,ÉŽâ“ÎGƒÜ¬º íÕ34åE¥mêÎ>ß­WWÝWÝü [¬_vî¢=DXŸºèÎæõ©‹>“@îS}F¿ÍüçÛõ/·—°úÏøÂr¯ìaî¸áÞç%ùœKöø]­Ýq=‡ëÞŽÇŽÅ/;¶G‹Ž;æ…õÛ9ú0Åêe„)nBýìÅ)°U/Í%ÞÝs|ñ¸w‰¯žÜ%Þ›{/ÚÜÛ‡ö_oðõߪ7øzƒïOkðuVÁzƒï¨ ¾—ŠK{‰&_ç,ÇgòunZoñõ_oñõ_oñõ_˜Xá¥Ø|û´äÀ­¾ìÅY}{´èˆ¬¾ÿ\­.Þ¯gÝyloòµÉ÷"Økøïßy‰/:x}Æ‹'g}Ï»Òg¼x PÖ</‚7÷ù;–½»E–OÅþæ—ËÙù¯ß˜´ú8;_ÜüñÍnÆë›?.»û¸åî§Çpïsø¡¯¬½sl‹é'â­¥‡$´9tÇè~«æÀ¥ë5åw¿$Fð "¶wg?“;ûPøÝKR¸÷=ñôÀÙÁžÍ9°çqmoÎg{(¤µgž¼iŸ>ì±ýßðý«b9haó±Ã?™¿ãÕòúf¶ëØÁÐñÐ|îÉ›Øv}»~7;Ÿï7Gë“Ý${föÏÅÕí¡-wÿ“6-¨“+ïœ0j~ ìålžx6k² ¦p&AÆç@ @ˆA 'îµ½ç1÷?£÷XT¤^¨ Y轉͟/¿o+§¿\-ç÷h¥°×—„ݾ\}©W—zu©kÞƒ:B}éEâ£ï¡8õº`ï2ï]æºi§ë€üº#yL0xëÓï>êÜð°!é!›¿î¸3lˆ9èé.d~}³o(æà…æ‹Ä_.n^Ï»lÍã“™³õâæÃÕ|CFzÙyhœº—‡Ö—ݧÖËÎ{Ùg‡.?÷5½èìEç‹ÎãñC÷§4¢.ôÙYâŒÅç«ÀM„—šŠèžÉþóÞi‚Eð¿Ü“æú´ºVöI–žtx®fPTçŒ ÇÀØÍ –«í“£tm2}ê>õö#`þ‡.ξƒG¯wƒqŽwû!íû^à±pŒ¨8½ä]m}ŠÃ]J¯:ë~‡žããÕ‹Iòñ$Ž¨'nÓ}zŒCe÷šÃ«ì­Àú:BÏ<ÕÏ/0uå;4ÖpŸÙvL+¨ó¶ÆcYB¦û±ç½²ýäËéEJ£¿½›¯OëCp‘Ê8ßÌ~é>ÆÇàдƒÎÑjûì籬=ó|©¸n—ç?7yq³ì¤ă?Ç<û®ŸgÏ8ÏÌŸ…ž bBÆî¶þy=[^¿ëpŠÄáÌ÷{ne8tWÈ}tµcÐ?y¸žDíý!r!熗—½­óÀ%Øc5÷©À3½|¯ãŸ¾þÅÄo§Ë w ’2¤¼ýaµ| EP:WLÍß/–áÑ¥ úêÍW¿¬.£/atWŸ¾ŠâÁ~ÿö)º¥+üÅ'eQ¦ èr'™ÍÒJq5')0%NŠ›E~ó·?àÿþHŸéàûÁßÿ.°ôŸ¢W¥IìI‘&vPÚ,9IM6¸ªSÓâ$I²ÁRãôĤ&Ç{Ó“ª‚ïÏê7çö$ϳ&5ËO²R¨iuRfeºÊ•h– ÔwÑoaÜÔúo¿|ŸÄô ßh4µ–¾­V—ƒ/a¨’×°çëåt‰ -ïw·‹ ^’_¼UŽÞôûÇÕúæg™{_¼5›·ü}³¦Úù©†Z+?Ëx~ÜgŠ•üÍëË[ø÷G:æÙÅê—ù`´¾½þ0ø~¶œ½Ÿ¯?®/`þßýÝ€¿Ï./ïYe”;†núz >Þœ N/g7_˭Ч?.¡Åྯ¯¢/ýÍã³õùjvùõWƒ®)4­VÏGnï–jC»|½¿B<[.ŸŠþ“ë©jöXPEí­¯Ð?õõà¯KäIrÏkìp½ î'ÀlF¬ÉòŠ> ×øz0 Q0À̉õH½Gm]Åß@KÞà‘×Ñ×ÿ¾\}ZÒ°®¾|CÙºa±þm ©«î·¹~ÿ5)K·Ë wÀ¶~±ð §Â©±Þ_Ë-ÿÒöЛ›Ùù¯w?4š]/ÎÃ'Ö«_çw>béóåk¹÷_êz´iuóÓü|+æ¿äÛ¤iƒ®¬™î¸ˆXÚ ¢Á—A1*ˆà­ ‰_¿ž­oZÚ2^-/n7[š>x¯în¼ ûäîîê%Çgÿz=Ÿþ6_þxÁ韰Tßu?F^Š×¢ï«õ§+¹coòÚœ¬W:{M­}_âwüÕÉlñ&7/#¸a.ÓüËÚã_ÿ¼¸¹Ü9Tpür¹¤.±' ¿þi>ƒÎúm¾&õÙı’.fë_‘”*s<¶u%H×*p’«b‘qV–ð¡ŠM•»Ž}@/_Ÿ_ÒÛAMÉ´Fx I³%Vë~Åó€Z{~½>…ŽçÅÇÙb½e¤Ú?6Çot9_^Ü‚~MÏﻊ}GøÇ·¶"úzúûüü«@_È9£uÎùw ÎÀjúGÀ<ß,®>^:æ¹e™ü´Ç€;¸‘§kA­I€Ðð`§y=»œƒ^DuýK÷Ú~ù÷P‘úÇWÔì¿ý3jÒ£×ç›ýòåRnMúnõà ’E‹]„lA]fÜ-?}7ü4¿²ãÜ))'Užq.µð÷þ×üòuºîöå…÷}·žƒ±Ã·e¦€Â¨TãŒmÞ<þc¦÷–¥M²턼„⤾ÞÐpø!ó Â÷›ÌV)v/U^Jü7S%ƒïþ-©£K3í4,Ëú†…6^¥à—&†—¦ø!5P¤”gÁ&úîßl å%¹©¢Êã‚FÔuÂI•fP|H\Åjé»5°VP&3 s%••NȸaP„52ð/”»’™u¥tyPæIN>X´ñ-(Ãa Gÿ–UÚW0©2é6¹$õ€ó„ºMK²ØI õR¢c)Ï£‰Õ“NrVh½ C½mÓ° Ì­7€Ø9ÒÞB;ÉrÍe¤1¶­Âå‰[˜ür*ˆŸ³8`X’NËÝÅ%eÔÛ¥‚ŠT×€¬Bzøzl¡É¹j2»túsAT¡;;×ÎV~p’h·ºŽ¶ð åùÆØWHãEcGe:Ï l?#<ˆ4x)Ú5{KIR×:c\9:ob7©« Î&m}¾QŸ×Œ²xZ Rü,µôl±Äþ̤œ”'%ÖÈÚ\;œÙØv—Y)AEL‚)Kíh·ð…iÂpá*ÌÁ(Ë1z³Œ£Ô+‡rSj_ÊÕâq·Ú2ÿ‘`oaÑ:Ç.Qæ8Mqä o5f¦_²±º«_êçTy„Lö—T릃˜Â²2eÈôbd#™ÌPå,Ê«2]=…2Q“êêaCÍÑùíXfÓ$æå”pKAY a[+ǘ—a9®Š®±%ó§°ë¸‚ʬö]å9Ÿã—VºªÆÕE´¤4…B¦žÐX£²Jdå‰þ_V’N 7™]㪊¦jIs^ÛG+ÌÖç«—^y@”E¥=…rË$)­Ä±>™J™¶'wÌ@'°;Ê:’PìÀªF±ƒCYºRuôs[¹0¯“Tò$q,LÂ2ÃåRK¬,­Ñ°4~æep}¹8?v^\¡õŸhLr[Kÿè2¶<7ãÍv5cW~ós7Øâ¤(²tWk>-.踬-’Ÿ¹Uqvb-ÂqînÕ‡y‡“š¨zç3·KÃõÛôËê4³ù»›׋÷‹ÝÙ´Íg@ê»c ð¡3Ï.öA8=w®æ7³ ЂZêõø.ÄíÐev7×fðð/Æ ^¯ç×óõoóÁÏóßoÓ‹ÅÍì—ÅåâF¸{ìAfà| íÜ~œÍ–ÿ?w﹧0®3_÷0B/Iè½÷Þaè†ÞÎyÎ~ø_ûk'!$! a˜ýòîþvˆ#Ù²$K²e-oãåü«|8ÞŽÜö±óá9ÏÇÔ©·'¦e_¨GŸký2Æ9¾pÂeñàn;ºÝ.§Ç¡‡¯ÁF˜wØmÓ£d0B$4Bþ²Ë‘šÚ|›_Á˜@‡ççLüÂ~S¸eþ0o¡çÌnËnP‡¶ ÄÊ[¡RÛÃd¼­Î·í…9©«ëæ³õm÷U_Û}¶ƒ™O!’Ãã›×ù~~¦æíúÅrãyƒµ1'ŽãÙŒ™jêwã蠂 —ãáÊk5Þ®i}ãº+ÅÙqm¡~²ßÏ1¨óO$!"™¯ÈízøªŽ/€¦ëæ<ˆ‘Œçë8>‚þ_Ö»Û–ulùqzØó5>_'‡ñyöÅTjåSÆ¿îýµÙÿp»~-Ï -5]"¯ó¯ <§´†UùH¼æ`D]˜_VLïÉî±f‡zÆqÞ(Ý®G€_ú‚5º+L ;ŽÏðîTÐíõ ÐâN(a'Ü¢”ø"@çor›.ÉS4d[§Ãasˆ·ÅY`_6e}Ù…ó=ó*Ó’áÇM$SŸ{²^àñMÀðÙaÏ1öµ`Ä°Âv½Ÿ]6“XŽ'!L0[lmwŸ&NÓÖj=]•Ï‡Åz;ÏÍÿÇå~8Z(¡ÐVncí+?ÿÏ|û¬nÙ==Þïá?óó†š/Ò/܇v!ɾh<Ý®€¸Ðkÿ?@Ü% Ü…+hœ1&v“ùŒ?FÖ™KNãÚmTOòz\…ìμàzL1§3gR6Ìÿ™O¯`²"“7ŠR:ÃÊ:‚ÈÓbüŠ/ßWëÃ^²g ᎟ßfFmCÐüŠ÷¡óÛ±¬k—G´ÛXÕÅç 0q³¯Éÿ¾âg° -dõñß,à˜Š)¯'âØ"ÙˆTItg¥ûös˜pûö p{¶ì3ÉÞŸg–Ãyi‘ì<Ýæ?O¼ÈoEî§Ýa½l÷‰ž“ŽÛéÿÄ9…j3Ý_¤H -Ú\V¹/1‚\¹Üm,—ûaY‰6`µšÏ^´™ÓG¼Ë‹ýÕ2Ûr¦D°Íˆ5=*›¦‹eûÐj‚}¹X&k(š’MöóåøaŠ4šåBî H´ÙâSRƒ?­Ê¼v—Õx6?³¦`+¨­ö`…ái2v«ÿ;Z8ºKˆØ  T½â ÇéáEƒ‹ÄÐɳ›¤ )!Áàui>Ï΀·ýT–B [÷û»ñø°_ŸZ½ÒÂÓKqè–šå«5Ÿ|ÅÀj›}õtµV©ÜÓýG /ŸæH­dÜE×,¸óõÝ'â:—‚}Ønçä -ô0¼…†r¹nï -¹´Ïϲˆ _£Û?æHÎ;ǤÜv/»SÇ™làÔ´1o‹XDÖ;à ±¸Êjx½ë,‰µ–jy~¬`+.Õ–Š¤¼\9ô•ž/ÖN^³'ŠÂÕp6¿¬—{–'#ÖœØ I›#¦!‹%Ž/“õu7–Ð8°)ÕæÌóJÄ–o }aÞ ô/Ò-ÛuBf H.‰‡3L[2¹iÂæ6{ ÒÆ>›D´ IÙñlÀÐ![Ùx ÿ’…C…é;¯(ù†òµq¥ZÈ à“+N’ÍßÒ·üÒ}ÁY+ã+íÂ¥à«ÅŸXüåp®<ýŒqÅùUgp~g¤­—*r -;ÙÉló×¢ò`õW*ÆÆV1¯ã}dq½Ð1ø[:ÆÆò+ÚÛÞµy’*O¯o± !O–l‡þ?|h•4]£¿ÐúÆmSÖ¦)™£ásj·ò.÷H6‰˜tÚØzl¹¨t©ò†©`Áòæ{ÚBø|›º’ ¢àFq»]…a—øO|iÂÔaßÀbûMÇKø’#¬ -4ìË#ç{£ì5ºLWòa¿}^‹­ÁiÜbÑ.ŸPåg€ÏO¢^×wêÿéGíßfSdwÈ_"™Úue :U·dÜ®nE¶Ú–/°ìD˜ÚåY¸š•n/RYšâHÙí¼ý°“쇽ËÎ7¡·¤.5[(P’XÉÑ°t‹/ú-WtÞ¶½‹èê[¹¾q9FšøÏŸÂþ¶EÁ]¾ÄËÁ|Òœâ™Y‰šÝ?êHͬÚS}hg7êùѧ‰©£¢‹­ìCŸ?‚Ú4ÆhÑ42†cÚF26¿‚ͬjå›NÇøimL,ò+ -3ŽYÇ®óZ=ò®ÙYt‹†´æ³±w‹äkšì¿>ìË®l -ÔéköÑýT»3 ->«k× ¬].ëea‹œ§ܸñâ Äi<{i²¹´sWˆͼë˜u æ/tfÓ<ºu•wÔ:y4ËøU­„É㸀yÉtª +výÍY×KLT}lp‚œ’®³å¬ì!‚ÑÞi¦Y³9Ëcx_Uˆ[Ç~M1~Ÿ!'|0 ¡M(6Qfìägc0é§?ù[‰Õ Fê«é5RVO ‘:a³qõ;*ðÎì;Ñ…n ‰(®å°é`óæÞZÎéû„uñE-1#é ÀŽõÆ Ê×¢fBV ‰!nlFííl2|>¯vo¡"gÈíXŸ`ò &côàðIÉ8›îw:Q A)PŸ1pÓ%ã[<Še^ð'…­)8AçäöÕ¯ÊH={½=“’7“,ºß'¾}Fàou ÇN–u„O§[Õ3Oê4G}lå¬~'&˜ßŸŸÏ&l^ø˜ŽPä`ˆ‘OE†Yœä6¿y”„’š³Ä3?®1%ûÔ„ºk§].RD ÉØ"ëÆðÜd–ŒÍvRy -ÌA*ºuZØÎk>ðM×U^(èżOmÐ9@UñC cÃÞÖá¹·üvSðÉtM•Çè³yñe.‡El}Y;¡¶4wË„^•I?Få›{5; ÉU=d¯‚1ýÎÞ‘.{@ÙÀS4oH]‡³]¤6ÊÆ­ë€.IXhÓÎH½pX†›õÌ8™pWÚ -ÔoÄ=†Ç„éP$’§· æüæIL7'Í) Û1¥˜5]m¨Ç€6RÝ ìv•q¨?­ÝU],‘\§¶W ,~> ×]šR,ªãœ%à‰/"Úg ¨&“C=²"‡tî~DÊ1á=¥g>ßpVÖÛ°ˆ¦ S}T¬´€`·ÕÆ`Ài#ŸFj¦ð>¶^WfphlRçrisÒŸpèɧp,KÞj^/„Ñè6‹Yà\uòér‡Ö{¸9±ºÊéBŸ ›Q'½zÃS±|~ -ÇØ|â á&],ÄüT Üw¨–äoðk*Åù"ùÕYËø4@¾Í ˆÁߢ¨ˆßœt9Ìñ*1ü>&`?ÐÉ°9ü!ΠŠÂFÅ - ÄÇf:dÞð‘M`oÊd—È>€±8ª+p˜Ô€a§ uêð7 ì…Á'ì²Rò+M1±Æ%&ùŽ>%‡z’j ;GQq¿ôUÔHz2Xü¬±<&/(9µ²'‚7 -”7Ô;XØä0H:qÉ GõøJ‚b0§}P Ü¹ -±œä”P]&?1£¢>¾R<&È2Ø6Î3£z° -Ÿg©±ˆ+@””œ;91ÃÆ%!¢ò$U2$ ð†ÉÐÄËâö&öx—|ÊCJÏËCîXÙÕàƒkÉÆQñ1=,3ʃbRj,I’Ž$X¹¤fõA’_H’ƒÙ‡td`… 94F4ßcCrB(Šùd«N7®/‘Ÿ(ò3#u9›–Pà?6zÝóDö‘êb™feîÈ[0"õfnŸ ãøF¦ÐÔÐÄ¡s²l“[õ'‡×º!ìÃʈ1Ñl§ïK™YÍ2'XVßKb·œ Ê|K°‘åšáà°ä¢N-0ýô]QoÊåûÎ'#¶:KúÜIAºYÌ•0›öx.t²³±D‡óHu_kDj×Ì.aÌ[uܧÛd؃ïNEUÿp¾(™ný)Å¢ehÃÐÖÕŽCàB+Œ;R–±áòMÕˆ«—­Æ³gÃH@Ä‘îg"¹VØÉtÏè&u)ÍÏ´é—wFÁ²Ý³0¾ƒEÚwö uq÷ 0—«ÑŸçâ‹Ê¥f]—»ÀlNœb”½m#”]igHÔR lgèÁ¡ph”‡ÝŽ”’ñŸÖ0¶þqZ}‹ºö­4 Ž\®êì;g~ØG´[Ûö 'ÓÀþÿäY8 L< _šõ! -AÅC­¤­Œ˜u xé¹âÒ‰ã‹lÛ[’Gè1ö”Ó$ùR› -òÏÓÌÉꈘS¡ R|þ€rz <‹‡ýϵþYõlæ¹Ð̘ ƒžxªãZwÝÔ]a_®£îã -áÂ.Ej©Ù˜—À™79ä t7bYnA>z,´ºÜÈIöT€RXc¢~I ø$ìkh-¬ áØ*}‹[ù'RoŒ;w‹%{aèMÚÌhg~Cz¶ÉÃBŒcp¦eý.½l`2¥×ÆŽ(JË/F8#šøÄ>¯½”^VG ô.''õå­/w|Æ`§ox†(ÃËgͳ¤7š®Hz‚y :³·¸¥:3‡½ÅŸ ³DÕÊä>F‡ó™§Ã:nmûÂwzjçÖÕ|0‚ô¼ÐKÅ´mp™'¢»R¬bãh–n¶o@êê%a48¬ëÁw•œjÕÉö¶Nkß"=Y†½í$¥±)ßÝ3Q äŠí7uœi6kí¦[b:à§_§`þ¾}ñù±”'Í §*oWÁ߈x®^P>лšÛ|,t!ubˆíûñE=¾P  Ó¡p‹8‘nbZÞêyæ™\¢ P=J×ÅZlFêù0Cù¹ó~]ølöÜ"媵ï]Ü 0ã-˜–yC-G+à˜¼(½Frè[YùH‰ài&y‰„O¡éüñÎÕ-âž—<Ý4Ñ¿)öX]}2'už÷Ÿä3ij¾Â.ÍÑí[~Ù|;ƒÞR'ì;zðç¡Ñíༀ–.wå`mD6ñÎf“Ós“osó|k“±¹s©ÇÇxtëV¹1ÂtZ‡½¥Ê–œ0–†yâ"r"0mwÐÄ ‘j=|zæ Õ%¶.ao;CÎv*VŒ5CŒuè¤×—=íÆ3Ój9joק‰¨°x`•¤.Ê{Ò½ä•6‚éI´FË9}9ud_ªúv—÷h‰shmx€"­>l1?@¦ëúõjt¹ÛŸ˜X¿\˛ꙻ®Q×’C•¦Ægì%?×)ƒ|¦gꚘD :ê-mÝH½®A8ÌÊ0`ót”Šf‹<¥„ï_{" ’V%c‘>0Ù6ÐcqSÝÁÄ ©Þz6‘D=âòT—û(ºƒŒb¢MàB0†®’Þ¼7Õó xaõfhö-°Vn÷˜FÄ<ºÑ^³Q{GÙHzv­¬‘ÒfŠÎÒƒX6™"p?¶Ü9øfa¬ ×aSáÛóáÅÝH1©ï”¯‘\Ÿ±rÅY|¶ó˜Ø{ g: åK›åCÿRJø0Z9X’Êì^P -×X<üÄžì6>1¬QO~tö'#Û½’ ‡òøÌ>ÜÊócÖ^<—ó[)S¨ÔÌɾÐ%½‘ªò>¡-Ðüu«3Œ£NôèˆgÆ[ôIÿlËz@›~êRK<—QÆ€¶ä -ßt+w’aì:s¾Ÿ$ƒ .l¾ã!€äØF@ CnX›A§§œKWÝ5¸ï]…QîîM_R—ÙE<«^Q•Œ— µ$z´åÒš/öè·ý!‹´>= ,r/⪩bð_:ì7[ô‚X`#M -‹{ QÂö,cªMÄ®‹6ºË¤ Î'v1}“3×ÜÅRËG ý¢.×fgÐeÎE«’í9II*ÉöwO’ñ™à{—Ü€sEÄǵT/…¦únÀ/›«ñ5ŸìƒÙ«IS„Ü£„v²3\ˆ[J+?‹kƒNÓ!iЛœÀ ²£À•oÉÍFßÜ3mÒ[pÎlƒ=Rv"D$}&åÃâ1ö²}œ-’º\ÊÞd’W+=|°Ô&Çå-Nå2ºSºX–R8}<Ý¥ò±¾XZ6ÿØ嫔ʑڭABÅ6˜é5kßžŒ%wO#… Êb&1m8“;S¼¯È¤úü9kÛIÍí8ÚoQàéO›å““Mv:7Р–Ä6úóSÇ3³Ê5žÕé’p4CíE¶ãi%®š rÇœ½küÙxÍ Y°´{VÍ ß™"ìÓÎVÇÙÛËtS~ž<ÐcÊ´î-&·äh@ì Ù˜Íôo6+æQ–ú‡rNÑÅ6]°8´uñ…æ¨r^s×@r¸µX9XÖÓÌÆÅàòŒ5¸däÏ‹M¿·ƒÀ>ŽØµÚƒoå¬wêr…Ç€A—·Ã}[Ïeû§øÜ?P>&Œ´ùGv°D/Ž@}ô¬N襤‘û6|ל«t:9¼öÍÉ°v^T·‡› WMÇÇî{ùåoW}xÛC½ˆ/N%XzkgðdHÐl“œÒ«£Žv×^ôz}÷6Ê£ „]Ê8y¢ö6æªÍþÔQ=0?"“Ô¬cC9º5ãõTû»½/*×è#ôÇžØþmO`hÉ‘´8¨=>§ó„{j@-Ô’pGÜf‹2¾°š[Pè"ûÉòòØ•d-mÈÐ@›‘šc8Lr¬ªõÊû¼¼`WýA;Ï&ü“ãÞµ8áIHãQ èƒ#v‰`þâ‘@…Ä -Dµ~`óÇ këxI¹hÄmÊ@ˆš5o£ü}rh±HÆŽN#¥\z w‚;E¯¦¥:UQ&¦y×7nÛÄšøƒôÖ‰A{Õ V>ö¨Æ#g£Ôý¡ø®žOöx°¡|õS§Þ-èõk×>S1>Gº+ÀR,$µ)4©þN˜;î%0ÝmfÖì3ç<åÆ¡@/>×¥çÇùcaྉwˆ÷׋т —  þw8·Ë [%¶ -ÏÌñÌ6ÖŠ" ç4½:EÝ‘ò·éÀ?'æí„G´‰éM¹†+²#1©'½zæo70TÒ3ÒG6¨*øÕnUŒ€½¬?¦È>„”“#]Ÿ€ÂЋg‘Æê {8ðeJéªÓÛnLÀXæI2¢Ø¥ «ÑFY[B#Bô̬‘:½ª¾¬ãFÏИ(=@êŒ&2p×ý`khŽjO#ÑU{–­3èYÚ]¥u|ôñÿ™ÓtÄWö0ù*aFÊå+NÞ™$#KEèX+R·­ç;w8…Ãþ0]»yüðß=uµen½§³‚B(ãðþ.¼ÀûñVæœF&‡{6»àyÌû«ÔíçI€7r¾þ÷pÞTÉ_"Ý•w£Çû9à÷.=n.¡®z$5‹¤Ó˾ðFèÌù3ýY׺<&€u#µŒÛyä0Pdz>LÆ×üøó{êâ{3e%â ^ ÿ©þBfc‘ˆ¾\Fò=¾ƒi™1òt9|¯|Ø®ï‡tßg]ê^‰û[4¶÷»Iß7“ÙO ƒ¡ÎkÌ­k¯Z ê™Ã¦+4þOÞ|“¬eê…ÒYMŸ®/Ã%ÕßãÚ.òÖ®·F,J`gŸWœ £0Õ>ÏÎöíØ_%RÖ_Þò&)D@Þ3ì{^ôºúâ*Nãè‹œü{cÀ¬1J‰E¹õ~óºé1#RjsÈÑ¿õ°Š¾Æg@ÎÕü‹¾ æ ° -´¬/_ÿ]Í÷_—ñ oŒ÷_l•ð×ø¦j4Ì}‹–/ W Hð— ì‡Ûט@_À|›S<‰š·„e™×D¦/€ŒyuÈóu=@Óù×ú -¿¶ãÿÁk C£LÃËmº‚ÝËìãä-0¶=˜ØèÝañ@¿¾|ÝöXÖ"[2¦çõQžÊ[‰XN‡¤Æ"_ãª,I³ÊÈø:¯¯n»É~¼ÞJ Û¨³î¦”gŸ -FŠ k×ñ~6>K]&ÄÆn%ø‘òSbÌ2JÛà.+ ‹ëz>h¦{0)Þ³r šqï]åBà\õÄdƒ_‘ “ VcÛs˜X«GÊØ/î1„×ø@óL¬T–y1Px`"—¼›]6ëãÈ¡D‚;lvžC?bÎJlåÞ]Hµ++iŽ3püâ7\z¾ö‡Ç ˜P”¡‹ ¯ö¹OÚËKrIã>MZ zÒ1Ú“®²=iö–dSÊ×´6)Ç-ÊqÜØÇR­™’a€Åi_UêîXê%X½í (pò%òfþKrî †i‡2i@5'Âs[A.gÓŠj&›XTów©E½õš\웄yצÇûû†R9™‚$nžr6:D:Á -n-¥=¾ä=¢µEA•·ùŠrnaˆÆž®†½¥ðÕ³Nzÿ¸KÛ*©Iåÿüó‚èGq1h•¢Ë*¨Û‘O”þyü° Dø\Éààƒú ¿Ö#®þr > ðGéNEÃóÙÍ ->w„›ý“|Ðjɯ‰Ñ4“…_}äרÍí Á¯%ªqý{ê…_§ä׈»b;‚:%„í¸Ë? ðI€_ë -4¥µDLà³6RVSè¦hŸLEøv"¶¾Ô­ð+ÙQGÜR5_À3N>MÆæçüÚ€_͉Qð¤ƒÆàÇ%V“3ù•‹ôÌéØ=ž'c‹~àç·ó¸JLê˜2éß"[>d°E­ær¤~º ÉDÔ@Zëú‰‰ÚÛ%Äs7Û€$IL›%‰oŒ¨ÏØ -D\Ýõb£&^ýçÍQ};ÙõÒY7w¾‰bŽZW» ñ> -þ%§N^cAOžaóMýÈzª>Ò¨”ÎÆ!ù#xüœÃÔæàçÍúÞVé…³S‚'™ê£·.’[¢•ZÈmë-x*Úù®Fª³&š°ªì°?:Ëò40ƃ›@BshRÑžsÝxg¦ð©³Ž²Xéµø Âe ¦ÙÀ£>Ë[ÒŸÌ”œÎÜ&ঽÆD!ÃL.c"Ÿ,:mêÛôŸ¬›l1¯gM¡}ÖK§M-gWêÚõ‚`v%¾É(¹hÍ-Œv×®‹7x½)ø2—t)1ÁL·H®£Z€™ü1FÍžJ—Ü÷§<Â[[të@'œ0´§ÅCYÉÌùC¤vCVÆh‚X¤"øÙ p'ô–¹g‹G … J©¹ü‡äá•7#*ët‡(g鉷ì€gÏ1 e¯°ŸJz®ô†¾ÑÛ'ÄàõH'ç´ %VׇßTIÝÁýãl™·ÆðE¿tÃGfÈÛˆQjú^DeŠ5aœ ¨ ˆ®&PrÞ×z±¢ m»ˆ>Q; †œÏ‚+Ê(bjšˆ¹—øA,³±.×Û•+~qÍ›êªFl·†qhüYÄiR ><#îpÁ†x’ö4âm Ä7‚Bš– ³%$Ô ,‘ð7"Q¯!ŽÄºª!’ÐœÕH²| -#iôØC2¥£ -É™o$?F‡H1dÔ#e3ƒT&‘5RËìHk7æíG‰´¦ò= ¬–^»áB•mÕ&dÒ¬ÖYû¨F³`YÆWd£ÁÒÈÎÛ9!‡’%…œ¦­r5i%’ß”ªc´ ÔDU¥nÕn(±¦4_Б+Œ}J^Ø)P¥ãÇ›Uº‹ZÒçÝ÷”Aíد Ÿ;'elU­)“ƒœ]™ég¶Ê|/]R–f»²º­ì•k³®ì`N/²U*‡5d¨œìæ…/C(× `§:ö•Ç²;°\µ §JY;«U{h¥Ò¯'-•¹æL«p[Ç­rhlF•{7¾¨ü#ßB®þ|«âÅlI•®aIU¾µ ¨Ê½Š]Uÿ ˜U•^«ê{ŽJÕ¸<>«æËÚNõCä~¨j_­TMd©V–B µÖ[ªƒÔJùr?jÒØ©=½áIÌu,ŽkÕi[Ĭ.[uÕt ¨[oJݳ6Ëê±WÕU/ -¹•z3ºÜÔÇkÊ‚"¾[@¢šv1oÚŠÇ{ÔyQQD£Ø¢†¦V•ZÈôhÍe £åµ¶›:ûY;џᨌÓ™íífVÑX4»£ÆîRú4Þ2ÞÕ„×Õ¤œÍœ¦ÐÞì5u) ù®¤&š1¶¶k–sGW³·,š›YßÒj.-³Ö<·¶µöfߢõU|=m4w°k3¥ÚL[îCÚÖZwÔn«‚váìµ»|f¨½nÂ! ÿ´Á¢³,ÂÆ¢)¾5¶ -í³q¬¼ ÆŸ‚Ûb¼*«.jÒ UQ‘ÌM~ó¡kJ\’kSizQ™:ý²Í4Ù¦ÝdÓ2+÷õÙŒf—×1GŠ§–9·]ÌMGÏfõZóÆR]™oËoÌbŒv §f²µ„WG€Å’kêZ–fÞ¯¶Œs´e›Ýo­Ê¬Ío5W««{¦rXc·ôÀZò^mÖïFv`Œè°žÊƒ ¦ÓEü˜­¡Ú`!Ç8‰e¯eÖ\Æ[ؤbs`{€G3º¼Åñ¢ÞŠjúžc¼qpøð}ºÜ$ÐÓ:B­‘["tˆ¶Á’"€'í"Ny•Ö¦×ö6§]?²Å£†­ìŠfm}:lûÉ/Ýve«„)P»õ3Ú~—Æží•ö¶A}µÏ;ê‹ýbS_Æáêð´\JG*C kI—˜ãd2¸œC4ät㣴3µÖœõjmèœlu[çÉÓѸ =»ÓåÑÏ`Ždjk»šAbãš×e×–B©åö§ÓGw.µ»¿ƒ¾¢{ ÿxT¥0á!æ¹²'ªi=•ÄÊïÍÕ@ÞÝ~“×°îT¼Þ¤:+”òvæ«£w]ĨOÛ|öX*é‹Çµ_=ÞÏûf­¬Öwc-?¦S9üáØÏÚ_^M3þ±»§÷Ÿߣ€9Ô‰‚†™>P¯¦aS ³[Дʃø¤,æ ™àð»f?x\5!³9¶ ‹ç~¨tÌ—Cã¤):Çž°µ”²†#.›6\Ó¡Hx¶Û#È ¿‰ØÆÝu$1ë,#­ekùÑŽWQ­óõTn»hƒhJ=ž§F³ ¶X„Ècµë5R͸º}›Å]¥â%ž-Y,ñ~k‰G…Zª ®Q·AŸhôHbmØu’ÚÖÏ%é³®<Éâ|ÓHNJ×K -ñê)‡Ù=HeôE€%ÕG§…Ôɨ?§1O.–Ž—Ï›t{•¦w†í2cªç‚™ˆ^ÿ“it§±Ì'uÎêoD1œ«ŒÙZ}ÕÏ®šó`NWê^rïA3üЗëk^ç>wò!U ùš6bȯšÝŸ‚Gš…à:+Ôk¢ðõ!E£k¹*Fœ‰n±åP‹;/^²’¾R|€¥®òf*m™XUåL¨w+¯ƒké/nwò ¬”<:TVF§¾ª³–±jÈöãª6ÝÖPuWldkÖ¹¦QKY«“Ú ¤?ÖeÏXw×CþzÙ«+Õ—×Ťa˜6Uh7çm|וƹîÛ4ƒÞ,¬‚…æB“øié£5»mE–‹FëÛ*[çE0Ñv¦û?í’Qçk/7…iÇ8R»:ñ~cÒéw ÷72^/¾½«|è»nò¾w }¾‹/.†nζtgƒI°§L‘^ ]÷z“c°ô-Ú÷½“~£RË÷õ­k`;Uƒò½¬]†ÆÐÒh$†îNÛ+ãHoÏÜF±=¾ º×éX™ôÆ¡p³5þ—kã[¦\™øªåò¤9k–'gä:u¯M:­]ðîôËŒgNÓògV™bçÙ®ÙÕÏíYÌ1/¾£ómÌW]ØÒ§é¢Ôjß›Eض´¶Ì²TÓ —›ËYÙ*{ߪlÝ5WÛÍù¼¶÷ô¾u¥áí®÷Å<°>œåiæ§Ö3î~ŽËL`ãÑlg›f<âÚ\~Žã­?Qqo;7|¾S¶wÁ]Ø_ÛíD2»×ê<Ú}B‹÷öS+8˜\–ë!›¶µ«IÐ$°’êX® GǃÉ*Г{tœZ™±òŒØ,ósØÒož‡Wê¢GΑ Æ]¥w¸Xç&l¸ÝÎN<5}Ĺ|Ï%SR›[¿ºÕT]kèJߟ)ÈûA7ÙtŒ\ÆPsbŬƂÁZ]mða÷W¼6æA…ùD>ðÙBõk4¾ð¤6iU50Ž/°NyJUç -ÑÛÒÄlÕV¡i nüÀ(ÿö ¦Õ<-€Ñ|óÖS¡GÌXÀ¬ŽŽDï@búŠýB\ - sñ=TmQ·Í œËÝ7yyçñKç1zÚt1‹ÙpÎs ºÓþ–%yø¶7çÞ7ÿNvêÉ@$0Å מÆbSWŒ1³¡ -ðåbÃ¥œYlå7Ê_Îgߥ˜2˜Õ^£†ñèÙż6‰Á˜Ò3 Nb.=ÀžûØÅ`»oÆ` -Ñ'ç%¾±X/î”Ý}òý€¯©-x»ç"íû…^EiÊ5px3‹ ÒºŒÚRç:—B…‘úÝù‚£ga¤e¼gW^Ã)0´­©`AêXéÆÚNB©]ß3ú‰¥ðH T§ªqÜæ…ÆŠ%£¹°R§J½?ë"H;,¹(ÖHÉ«¾´)įÁ³Ãº ÒTš¨‹’—øÖG$RÀ‹“wN[€“{·`¢Õ?Ϫ®cënq=@j?<±R‹ÒHËZ-©Ã±HœL¡žû«}]ixìt%Õ¸ ÒAhTCšV j›Î׫é_T«yUi%¦žÔ»¼R£oë >‚yá²’!ô. #µw:XÒƒ‘*“K—ºº#JBH(–ì÷“"cuªÐ;C:ÆR¦QSi -‹hç:W‡Dª@ù¾ªL!iǬã8T´hò&z›$é·Ë»Ì8Djà!U ez~pVÇf uùü›ï~E:U®Í,9CÇ -†¾‡DJ¦pÇš9yÃ?çbUiͧµ‰"ÍÍk6L)Ôüö®« õJ¡±^”¹ô¼ØýÖë‘6µû¥(ÒÚª2šHËô4Ön -kæŽ~a¤yÚH†ýa¤Ç¬R)ÐÉms˜R^EÜ-a­P..Œ´L •~_i¿´ÉHáúò<ÖŸŽc–AÚscýËÖ,Œ´øsÜ•'{ˆã!=Ÿ#óóéÅñã¥Wš·bá‘Wy˜ê -Ú~˜‡Nn§Ò Íàà}ک໦ØÓ–¡·ÇÓ'ÍTo\#ò6˜1vï×ÏÜÅ{êtãÃ:ýô²q?I¥s¿R¶…žSJ±œñöDŸº Cu$þt5hŠ=?šï©èÓ¼q"ÄŸNJ ßã)bNUI9¤EÞv§5iãB=]hOÞ» ãúnœ.p¥÷‰bI¶¶zNi¹¸qs}ÚB'VDüi/î Ü)&ð|„\jѧ?×ò1-útÓ$¢•ÇÓ'Ší6Éà@ìmÐ¥ŠÏ!ú4K؃mqŠ¡Óý¤–{[ƒh2=ƒèÓD¤0™‹>Í!%.N±B¨õ^‘§Ž4–îcöê|¼§Æz墟Æ,~¾T¦ë£”!òxn¿ØMU®ÃfÚnŒÖ?#t Ÿiw49tPª'z¸©O=F\ÕÐÃŒ!欧<ÌŸ:üc¿%S¼ƒZ¤ÿÆxo”Ž ñ«Ñ»æ;+ m l¦õ9ðs8öXPeÓ‚³;R6 §Ã’kÁ½×?¶}ªU©ø~ŸÊºLô@;)çÛÈbæ¨Û³R>Ð’žŽR§ -ú9]a¤öη(R°ˆüà<{Œ=VÒÓE -—¼©Ò©½|dZw1Zc!i4ªRÒúgÚxä…Ö?3ÒÔ–ƒTß!½W6Z„(RÒúA -üA`ýHÁX8cí‹"¾ØÅ‘Bë_©…öÿJx¬~Ä"…4¯EJÚ¤Pö9h¡MQçÌêÜsGO~¢'Bûžíä´Üv{¶ì‹´tªNƒD»ô²cEó­-¢`̽­-ŸDw¤ÛAêTYš`òv¦•‹¦æI¼u­òš‚GݬN;ëP'Qþ~ð¨÷ˆ:DГVÿ½zRÝ8P\ãÄl{¨&}0ÒL…€4ïÛô .p¤ñ¢O@íE­«yeþTÙ33+1ãKŠ=ÜQ6DÇ”@—eðƒ´7Ã:”ÝN«cÖÊ.™ˆè0–u (ù2d‹ë% ujãÉð:ÅîÒð¦¬[0ÚÆŠ£ñÂ$ɶìߢ¹WD‡èÎSμÀø´ˆèøèc„äѼÏ_MùzþTÌø 4 ¯ bÉŸ¿ÉŸ”g!“XÀpCô') -J!‡ÝïÄò™ßâ¬_qVdŠ³R½Óû”¤;0n¾iNþ˜òDôÛ“•¦»BœX\Õ£V=ƒWõØDUâë&z™3›€L—9ÔPªG˜vx%îÀ"ý1%LÔšvø^˜v3"ª¶Å¤’ŒÇ ­£|hìUŒœ-Ô¬^‘:•Óл ‚‰y£b¯b¬QÍË =ûOj4°4o HHÃÞî\›E[F Ù|>Òk@çÚq‘i2ñ±Z›&û@ÅùIL|•^Œ;ç°8™ êÃåEÒµËcx–»qR®ÜIKX+ÇÊöMr.U¸©›àŸ®‘µIñÄ@3ê9¡écO(ü&ôˆ~æ 0>F >óF©Ât‰Õ/r,×”`Ï‚©ÉElal~mXŸ¬°ç)yx|ãó”ÌR¯¬0¹ªgã¾(PÑ…I†Íøh ¬™îUtYR ïÌo -Ò$ý¾õ$$û³WO «px,¼]º†²¢ke©J÷GŽIº$nÐݧNÊ›AàåK¯l~Î îQIÃâùK•wP'¬¶—Ñ/ •²€q”wûußá¥u¤˜wɶê>¦Øðü‡ãj´7ûuäÆaF®ó“ãz ^~isö_@ÒBΠ˜A+¸@Ñö -y¡ÇX¶°T^CÊ?“Êhû¤~ÏQ¦öcŸf2 ·LòÚ@Oü}êt”¹Îc[ò©¼0ËòË0‚°a˜æ)Ayy=MÁ‹´‹ÇëÍÉÏ]y¡du„g[þŽ&/ÄžÕÊG6Š,QË4 ]wßðÉ©MIî!#ælÑ¿L,¬€6ø”<ŸxHPX‚ˆ„ #¨>D$#mv(Ðw:¥ú¥àjK(rý+*½,ËU™‡ëï‹O+ƒä -yDçØ -¯ã|KþëûÉÀM½Ö_0UüŠ'ú—ÔC3pΠ:>">9àý•M.Ò;VRÄ’/â¢né%b½)âb1"N¾aS{6V®€gáX¸".èu¿Ž.®UÊ‹HŲü,¿7R!Y^„d—åZð"Nñë,KèÙ;L’…ç -rÃŒ—ÄïJöÆ]–Þ|p"È‘'UžfKþ\ñÖT‘¸•ŠÒí²ps·óQÜ’åu¬§ -Dâ5:NYœÌÒ›œHÑcJ‡o|Sðx0‘ÖÉ2ŒiHåß”~‡v”=Fö•îÜø‚-ÔpiyÁòÅÞZsæøëžØ€¨§Þá.z¿Q¡êP¼˜sy„¾Ò+xK˜- ¨Ã[è^­Cl[– k©ƒ›UZöù 8*ð›f•:'Ç@,ïżŸÇÜ® ­vÜ]QÙ[˜X¼U(ÚJybñVì áö—€Ð(Ð7)ÈY“^ò²ápÉ÷zCï‰Sp>•@ - -ãM> Üuò;pÞ_÷_g‡ð½E”»?¨%­ “ŽkqÆÈcª²Ã#Ÿ*Ð×b(c¹ÀËÛ{|"F<ËiEJ–ùé=qV1¾F»lôOí²áoàÉÐh‚’ Løô©Fk<4ÚÝ{}Ç‚ç{­Ñ2w °ßk4F*SÍÃh40kBímÙpÞ×hO± -Îç Bù|ï•„#±dŠê˜]«²8‹Pó åA³·…m»©Ê=o |ž§Ø8üíÓ Øûú²ÐžÄÕLË,ä¼tf*ÿžšÀšÈ[JVŠªÙ_ž~à -s“ô¥9žøo 0k¼CMbæ5y¦½(2à|~‚„"âPóvÞ_ÃánºË / ì&Àþ"VM­…`|Fh]pWCð«ùûžÅ¤ceõò±Ç×nÉf±b¢«aë-û^: }nß÷NBkừœµ÷CZÏ«„ó‰}ς¬…¿_ÅH8ö½Æ{#w5”^ I Ó;}¼rÖÂ!Ÿ˜Ä~ý“ãHPÿžÃ¢×JÎá©Ç1 Q[`x–˜6)M2vßÚíObÕ¼8?ö©t³ú% ÛÒg­%(&ËܽÏ$Ä"æ¹´È’s‰ÝÓ gÓ*¹’qœŽ×%QŽ Ïö¼/þ³˜Ÿ–¥˜Å*˯”±0ÑöLôxžøÉ5ôŒGJÂ5¹üÝi[LtöÈ=P€ÙÔ¾\þ/"$€b®÷L ‘3ˆp&‡Y1X -˜ˆ°w$ßR¡¸ÇïeuJ&G< ½"S¢ûXÏ‚ŽÂ^г ç€Ì–»,ó¾2„&sÄ6€ys ¡ :êæ–ÏsèØ«Øs/cè×9tÒt¤Nþƒ:Q¤dh¶à›9tÒtìlÁOrè¤3è8Vß9tÒtœlÁrè¤3è$²ßÊ¡“Π#³ÿ ‡Nº[ýqÝ“àr2èÏâÃ:é :Ò{CÇ9,‘aVÖ&…¬mñ3ðâ™@¼Ã.2º$é¿>¸m—/•äùÈ¿> ç[¿Á¹‘Þnœ»Ú¿7u¬=¾8ÿÀƯéä3pØ•›+ʬñ:9É`óŸyóU…»Ç'Lú–¼ñ‘±¾W™s²ÇÇ‹\=Ë‹|¢[ßï’Hæã‹È•T—„RæàXÞJš“¥k¼£ ³=ï%P]ß: -B< ò~ØX,hLÞ öq¼ªcVIM!3Ù{òÝÀ ÉÉ`Î?SÉnbÛ6\/éU²›¸*½áÀÒ– Éà ×ô•’àe3p2…åãÁŸwl&ÄéUæ£<5N¾åô’R)æöNlâG(ßJ1%sß -2³_ûö€XB{ÙŒ=ö:{8ܸ¼0 x·!xhö;V)Q³K4 Œe)ñóÀ^š]²óøn¯ÎÀ¿‘Ç7y•ÿ¢â­ÄSÓÄ“`¤Méç3ðÚÀJ%Ö©°PŠ¦øü½</ûÁ,Å` -ΟÜ<>÷ùUNŒ3pO§C`–!z~ì|ˆe¦¼ì5Ç˧7Àú!Å^¦‰ÊäC£ýŠbÜÀ/mwÌ܃NiÞÁzL.y¶ìSÌ÷ÙÍbD½*·”Ηã°QrWd#b€Ã?#IéNËpöï…³·LËvöÄðÏ(þÄ««QÀ<3·jÈK•ûÕ ±×ëËݤ ˜âö:È  Iì4'î‰í¥rä/Òœely’’¾òDñä^IØ‘ÞËÓQ~]ü*ƒä¬1NþɼÞp•(KéE‚Ü“Öψº -®æ¿°Ç2r%þ!ï¢öØOæ½ðŽxšÿѯé´ziPð\ qx3"Ãé'tŠx'ü!Ñ%®0¿^Å$èd—Û%éÓ鯓⤺Ŀ»Ã‹ÿR)I‘É’™O©KX-#"Cïñ½HÏQ{-šO"2,?ûyDÐIœîx# í7™§lÁÏ#20 ‘ËH}•Ÿg+"#çÏÊHÏ‘—œSô€À½ædyÇ÷`©Œk,çƲø¹q9Ʋ-Ô0ªd0ƒtNâ1÷7'à¼x+Ú¿ ꀡyu/ÎôÊICûåvöúÈÄ£Ko¤=]Ì|•W÷ö¡Ùçªd^Ìóz’yu¬ÔQ‰Lá×AÐœä%U,éeÙ–’GõÊÏw‘Âßd.t÷œw±ƒI“±üÅ™:é|¸÷ïûM>œÐ)èòî¯óá>ȳx#Nê„êßåÃÁ¨õ‡(#NàFPÑ$®ßçÃqNCÝßÑþu>ÿÞQ*#î¯óá^Þð'ùpœ+G-—Ç÷ÅĶu`&Ûç™õpû³3‘÷L¤˜m)çLdó ëLä+Ù¿llŸš1ò€ÄçÙè$Ó«Ù— GN‰(Ê#áüA&×ÓI‰3ð¯5L®ˆ=ŸwfÕ²9ñ¬=žN“¾Øé¥CÍd¤âÊßaYìbá_e¤Ž•CI¤23RÇʉœÁ‹T¿?ÉHíþ&#Âù‹ŒT˜/öyF*„ò©Ž¼k y.±Ð¹>R@Ä/M}û‘ÞLÏ>W Û‹!/NXýu*yž_òDÏ_¤Â ÎËŸ§Âý>nÉ¥˜´ïþ†_ùA*û"2î_I…ˆ*ü ©pÂñ1™þYGÊ0d«öýÉR‰O+ѳªrn„çÚc1Ë ·HîA/Ê!+¢(#€ ‰ßl÷¦ ótÉð»› ¬lôŽÌ-©Ûy*ZòX^'7óóêz¢×áð‡{tT`yxÈ/¬gÂGÏYâ2XZ¥¶Íñ0®šÝI:̦Š òååól:¡\ºßf>ŠgÓ Åâ…OÚ’MÇ! -³‚÷}”M'êÅ !¿È¦ûåŠüf6Ð> ³VþY6P.Ûßÿ›l:¡\:™g{ÞȦŠµß+°ÿ]6Ðì’‘Þ?ͦ2nØgGÿ&›N(—Nä¶ù²éž»´R‰[J¿Í¦2Nè_gÓ ÍŸÀi¨³éø ^ÖþU6˜mù·Ùtò)öI6Oü²é~E±·³é$s¬þ,›N8·ú¯³é„,œM'´[Â;ÿÙtBêë½þE6Ý‹‘?ʦ{½¾üE61Öø_eÓ½Êäú›l:¡\:Ñz|Ÿ;€æ‡È©/öÖÕMâU¼ž‹TòksÈL|:½vñí±Z6¿¯W÷Ô¥+ÜåùëzuâÖ…<:]Ú·èô ç$$ÌÉ|iXÈdN‚‚HÖ³X§x]’« -dT—ãnLýªKb So•]–ê’ðA -Q #A'‰²Ë"*®b\(„g/<Ȧö_6—ŽÌ1Õ²¤ -Ý}\æŽuÏ•L“ü7eîD«Ëådå*É,s'–É%/‘NÖ éóÉBwŸÍUªs”SeF2J%«ÌÝˈ"$ÌÇeîhFºÐÝÇeî¨Ü·…îämspÏ•-ÔÀ¥'Q~žEîÏŽ(s“û×¹<`h½\þÝåê^ž=|ÅŸ0:Ï’xY‰trN4+^gŠâ_°H;|㤎hèËÉò*lÌ*-?Ÿ^š*:f¡»¡Äö{RåÝ/»8§¡S½8.û4õòü˜ìÓP˜¼ÝÒ›IÝ÷'™Ÿo…ÀŠ‚×Ó³/Ž¬Ú®BPX'»j!$”§LvÁLá×¹ì$0Y‰µb5 ø‰µµýsbmmÿw·B`RȘä1Ð[9ÊŒ½v‰’².DÊ—õ^¥ÎPž·ta&Þó jIO\ì õü²ù“Ìææã÷-‰gPùÛ_U0Êâ[IJe¿ñV¡j±Ý7Xxícs‚‚"uªó 8pKçÓjÕ”» -ÝpøÞYÕ†ŒD†·vxõF1lÊHdÿ¸ÂÝ=¿R¬ÆÝ/ÄPàpÅoëV¿WáN*óñ1¼3]áîO*å½Ì'’W)ïÓ|"¦RÞçb(Q᎛—$'?ä7î¤ê½ÂwïW¸“{«9Ì~ú<±¶wz˜9bÞ«ìÄZìµ™£cèPµé~—XËÏ|t|?‚ù…Átè÷î¹"áüBo>ÝáüI>g“狽„#ž ËKbR¼ºf‚,—÷N~»P{W*Ó“zu/&BF\ë^÷Mf“œ$&m`À÷DY«˜œ4&î _ÄN ˜yMcòêde¨KºíŒTzur¤RN“6°çß¿õ+Ûo%1‰ ‚µ%VÚ÷ Ã6ÃûÁ­ü<ÃPà²Äv‡ªñ9®1‹ø­bÐy·"Ý[åIRŠÛc¿»šªCî¾ýQŽkGôjª÷m˜Éå­r/*åY™ãÊ’O憌¬ç×9® K²³ž¥r\霈¼KßÝôƒoé@=¾ÁcQk¶Wͳ5kõÀadt‚O©2™Ý—l÷’3BTÆ©…‡ í²bÇô'N^1Te#åäÃ)ЋªÙ)³CUÜ:lÞX·#’§OÂ;ßF^œ«“yix˜A,÷Ï©R»ªú¾X^O)‹2y´‰ŽK©¾¢Hµ™‰e)V‡Mÿ@Êdr=\v,¤ÜÔ´‹Ö¥yÔ´ñ²õºPw+„TBókÎqÒðÆüÜ?6ysþ²R§ -µã£G –Ÿ7”@šR;Å‘¦*ªo!¤dÝ7wš“ZÉGZ•ª#˜kŠ#M$IÎÉ.€V Ÿ›˜OtæÍ°rg_¤-†‰¶cçWb#ƒ7"¢Ñ{¸&Ë$sÇÎ7:™Í:ÚÃ]è)­7¸9VïfÊÍd|ä_eŠté)½_IõçyTŸå“_‘í“¢|¬±ü‹Eùž¢ -ÿJQ¾WÙþ¦(•3"m |^”O -X…^”ï¹>ò¿Q”O¼>ò_å“U¿ò“¢|ì¨ì”S´S4‰^¥‹Wõûün¨ì_Ü %³®Ÿ¬»¡>®ëÇÚÜ %V×ï½sJ¿­ë']ÕïWwC Ôõ“Ž - {âï×õf>É»¡~Q×ï5'ÿE]?é“!Läêú~¯2¹þ( +YÕO¾Ð­ë'=4^ìâ×uý8yªê÷‹ - ‚uý¤$tBõ7uýÓ¥n5—OÙ™²‚wAÿ¢®ŸôÍ_Ìžø‡uý$º¹ŠýA]?é°ð[7PIÔõ“vuOAÿ¢®ŸPšäCô>«Ç÷9ïoÕõ“†ãüQ×OzCE!Î'‰ïüŒÔßÖõ05YUýØÕ°êúñÄãVõãÜÙõvz -ÆÔõ{™÷ú'uý¤«ú1œüa]?é׬ŒÔêú=ò·„x‘wÏÕ¯ëúI´`ÿ ®Ÿ„¬]6¶?ªÇg†"»ß‹rr²ëñ}T×"(>ïfs<Õõ“È{xyÚvþn]?iKÞxðuýÄÖðæóNâïò·d˜ó÷ÄWbøª®Ÿô~3÷Áïëúq©Í÷[ï½Câõøþ@|˜ª~Ÿ×ã““Äôêö†ç³ï•âãg¤~V×Ø~ªêGe }^×I•’ª+úq]?i3G„ÇÞ®ë']Õïã[›èº~ÆúdÖõ“‘÷úuý¤«ú½]ïWY¸=È«ë'ɬ - ŸÕõ“6 )ïõóº~Ò ±ôŠüq]?î ùUýžì1Ù7Yqëú‰A” óâ&+™uýdÙ0×õcÏäóŽDv­ˆ| -×õ“^$³8ÿ,!–Z÷­Ë÷”VjŸøàß+µ¢nTä­•àWñЮôÁ{^Ú"‡›î<öؽ ŽìŠV7ЬVp¶VõyÑqjêæ u+¢·Ç”õjnãÝúÛ‡yH·? ]'ôÞ;‹H«Òªmº”]t3ým¥êÚ½¹—–}2·3بךˆÅ8#ÄòÔ4úmÚ0–Œæ¢Xr1Íb)§¦z><ºóÅÝÊ\Tçäâ˜tËL¦eÝ°š[[Þ£¼§½ýXÏ—Þ›ó¨¨ÜêgÂÉ/õ}燞ȴr„5SÖ“¼pÔ ç³BÄ"‰†{ÕÀy±©ѱ’º±v^V5¿ëAõþlMjûò¦ÚÎÌ$ÍÞ“C‘›éh/Âój…=™“ˆD’õ:Š©ç3Òß/¸&û‘'>`hå+iîoe ¨5!:hì¦@ãßÉy›, 맪mg16S†­W6l½Ì|IjSN´Â¶ Û>˜Ú6Û½HÚ‰Lœæé–*Ÿ©ÃLeì ¾»Ã)ZÈú†xZÆà’ ÆÓæ¤ >À&:lðt¨ -¿VØ°'K#¤lÅD5™ª]^f_ ¨BÈ^Q|jà°‘æ-íði(ÉV¡ÁN+ ,Ljõ« µ0·˜\–Ô„Þl‡ÖEB -û(,>¸á]n-KC¤<]äã¹ R{°$³-ã:®(×áŒútÒ/pòo!VòbÔq-«ç©þ·{©ÝÔëÄ÷¬ŒÁQá$÷Rœ<"ú·A8¶[qÌÚØîìU·³†¹¦÷ k™IñJ ®€-ëí[ö¤k³µpÚÜu´hëâ?Û¨OÜ•»‡©áˆ=#•RbO -= #öÞ~é K´¢…lT¿=Ã{g:šÀ,õg±çWÍÕRhˆ¸ÉVõ÷a”÷˜X¶Œ‹DÛƒ fÝ(-Öµ²¬±©=»+†é,—ÄtsòÂNžc&Ã…à«]Oféâ‰^~õÇÿ¡›]Òo41R^ÒÒ,'G,¤#§è(§­"!‘4Æ0ˆ†Þ’ªƒG7O¸ Ûé%olƒr`Š¡æWZž€MÅ+gaËþ2`gý ³óæ˜äBZZË¥ -‚ƒ…Òcpè½{âiÛ$Æö'À<Ì ’Ÿ‚iOòÀÔH¥ŒˆÄÀ¦±z…ÆF…s©@þ3ƒßÜ7ª±fêαÌ.ò7䪻0Ê<dþ¾!e±§#;l†îãçsà``¯Íd!g¿¹À,iBçéØƵ.¢Quü`ªá€X¢V<ÙNጠibÙÁ…IG®IÖu°‘ 9Ôº6yƒ$Oßkžî¿uÎÖuio´©ýþQr¨ïæ(ð}‹9÷ÃQÛõð.ò(6 ‹W#÷›!<*ºÌó¶Qd›¬dZ8 `f@­J_… @ ݳmxÞ˜¤*ÃŽ>ß’pÏ`§î9ˆ:KÂE‹ï…™ %Š;"–ÇH"KÕQ°D,9•¢ÉúiÏý& UóªÑê‰?SDÃkœ Ї#‹÷Æ¢˜#Bem”±S§*§?na©îˆ;ÖM:L ¢œ¹ÂÍê N£J¥£T”ìŸX-Áò ¿wê7 -Ü]Bsàxèdý™»ØDÍÛÜýÊA8ÄvåbÅönö×¼ÑÇþ:pØ_— »Ãy¥‡}Šš´^öó… Xµ~ö×£— Ø·lØÀÈe÷:í̇9ó¬Þëëd€zØ_—F/m=W‚ˆvð ION °ú ó/;1P7æ_vb`æ#pcþe'æá%ý›N  tcþe'F’nÌ¿ìÄû¢<'H%ÿÿž£ Ü!'®ÈŽ{ÌìÇgÕÀ9ÐÝ݆žæøÒÜ@M‰6P3Ðbø&<˜¡éƒÑÖ¸-ÔJŒI jAÈi9ñpY†»Âi… -îáqs×HŠ#Mf’sHYƒñÆ6=ªTNOèSPÂ'¼ëâÈ`0‚Y¡·íî{wÀÜ·ë dÁf:—¦qÐKC‡'^ÿý·0)ïÔ]jÕø!iatMŒu²‰n•û$¹æÜ]‰Î4P¬BQ60ܤ¢‘4°žÃÿ *Ü8áúrÇ—µzÛÎÏ¥óz¹Þ™>…5’ÁñÆ~vHžçóúüÿ®ñÃô¶›ï¯_Þ/k¤ËdÜŽø|z˜Í¿ÈÍ5ÇÈź"ÂNï²C¬œ EŠ3ã Oj“VUãøëYÛ¤3¡·¥ˆÙª­*P÷ô#èÏ!¦ÕO ~MRælŒñÀ”: ªøü½%Œ…|‹'O¤wàØN'à; ;Ÿvxá s«ntT$j®\8d_§frm ãkœh6+ -+´NÐUƒèýE;Fö˜(ˆ:î¶"&}8 Í"ÆŠ²ˆ§–"|BÌÛ 1ÚiÄpRµ?>¹9"Bi;†ûhÆIµ_>¼¬ â™`A^IG†^‹ · ßf¼m+ù -‹Žþô3‡J<­§åD{‚Wš§ôW¯ÎLË ©r¡5AƒÆÚõîºg°ß!¸zîîÒ?°G YÆêXàþ ff-¸}"úÝÝe¬6µo¹?àÉ\Ì8<~ccNÅL¬°ä€;•±@•kÂÛ3’n8ÁŸxPÅɯ¶P_Ëáì!®('IY6 p%¹ n/¸I%ïK| Lm¹d…ÊËœÔàkƒk &ÇZîÚ¬…Ú®Ou#k}¢ü×NÞÌ ݱÿ (·Žýïr¯m$ý û+*LÅŒ)5Å读c69< ‡ûØ¢<êЦlˆ÷ Iˆú¬»âq§’aí¼ÏÌ-M6Î,=¹ô(P:x¸ªhöêŒíÌÐÇlöš”ÌäÚ@T“†•fûIÃ'ùŒ|êâô’2AO†s5ÃMøYnp…%•2ÅʶŸÒcYø'Dɾét, ‹=£WÞ^¡ìsÖÆeeT ¼µñ_Y(omüWVFî•ÂdüThG½ èàáKØ}W†\dŒZbí‰Ä¬Îg®Å -zÅê;'èåH«NÎ[á`„òÜ&å›»‡ò4ßDö):èì˜è\ã)¼gï”Ùá=Ç!É`Ët)ÔvdAs4!mjJø’C-¡ßE]CuÀÓ[b§õôoã“þm£4Âùs0¦èŒ–¤¸ÿƒ0i3?ž}C€F`G•÷ð+&¥ -™=Ì,‡{à©óý<=.e¶W&@åÈ™‘wf¾ ˜™X3UNÀU³÷\ÿß(©² Ÿs¨GɉàMƒåŽUûˆq’qHDŸ bZ*ˆÍ¤–º7ÛêRYñ^ðAŒ•)ãû}`Eв§öWà®w %I1YÃ&ÆÆ*¢Ïã}6ɹëñ[ -ÐVâcô’jàIõQÎ u–ÃÒñÚ„Aµç^\l,èÉ0 Ý©z”™’NŸQp1h[鄹«V¦Ilzý7Mò»¶üwMrH1`”ÿË&9ËæÿMrê2÷¿l’Ãy1¡ÿÐ$gk˜Ï$XXûùÿ–Iy åŒI}L%©´ |rêE`×R8VfIa6Þ›1übf*\È{øÔÊÚ¾ï\g2Kí/Ãëš9ÁØš–&¯ît—¦°™¼ŒÊÚ70Œ›t¬w^vÑÚˆ^—›¤É¤¿,ác;k˜T– ßZ"·FãóÉ3­¥6›®9ë -áj¦c£Md5è–2ŒÍêÌŠ ¶ê™xPÆè-´¹Ÿ -¡¹P¸ÛÁ—ÿTø•28>LìgìPEÁ/µùõv„ Ãè|¹ÞçÇÿ›Ÿøõ/þ…]ž/œpÁXö倿æ' -Ùö ×å÷ -thœ¯ñõôº>ìÇçÿ}yáOíB¾‘‰y¿¨¶CÐÖ÷¥½Á† 5x¤‡ñ§!èáP}EÀíÿ*n -ÂaßÎàkIYœ7fó|.»‡ÿ·yÜ >¸ì8î‚p›‹ì›'p‡ÓC~pØ=_í±Â ¾ä@ðÿYðáŒê¿_ö¯ÂW·}Í ÞªÂ‰YNâËé°ØNÛ×NáÂ-F:`6 nw:¾ò -'nqÛ17øÉcq:Û—·Ø˜ë Çíà‰ø"<7AÀÐaÂþSà îôØ¿œ.‹wC06ÅævÙ-6Üm‡Ppnÿ=6;þÅëJL±Pà. áC=°Ù`ïœ'áqƒI±Y6€8¯ ÜÂñX0Ìåþ²¹-N'è6á²8àN|ˆ×­` -Äq»€›ëÚZÀtn@m6‚ ñŠa9·n!Š¡ gž'-îºw\œý’¸“Ø¥åÖ·ôÅ/½p¹›øK#‰È“DÛ@îdãÑc'1ÀOÜÉ”*×°K¸ëÄ’°TmBí TMXP -ã•JʔƫS\I³¥Z‹ÝƒÝØw„_Äw!á(ð³¥ÀIñ›]ã .4¡x­1ñy¢| -à<Ï*ã¾¹d`–8ð7ÞšRäñe b³¥äÚìøŠ›gîxæ[Xî®n~‡½ùɯ޽{óøö‹Ã—ïß|ñ ½|j,‚3œ° w¸ùòêÈCËøŸ[ÝrÖmÂ%Š¸]ž÷„+hh‡}jdà7WÇÚ®¸Ï ¤T0%ìè¦[j]ãýt8ÔÊ 4ïæsNè4#3–çæ»ydŸz´>Xk:ÓÈŽ¸ümöȸY=¯Ó¾K NÓ€TÖÑ)ãÀûí+ˆs>Ó ¤¾ñ§ó æ7/Û .¥‚N£pßsˆP77òæ™Ìø‹¯÷ö·ÿù³oÿçOoûôÒ){þnop+4㩧7n/Ž‘˜2®IäášÔî­%Sà;ØõNÆþ’9íR©CÀàëYXAÂü`*Ñ¥yhF³…øåÚÙ~ßÐ/ë÷’5/IÔ1“ȼÚÔ}"K+$ç`[®>ã äÞžs¼%Æso 7oo•ÃÉ3p§{Mg௵enZ*÷BbXŸZ°«ÅFj@ñÏ ÎìF1X-äRjÁ9ân°­{o05Ç[²[ßÃ%ÄÉ;:¿Glœ9Xºãô±5¸£GÌš -.‚³……Šƒã„Ü#º“* ˜dL?««T,°ø}ß#8A½nœd#˜Œ³ÿËæ½yñ¼ì[Á\µ‹Læ5nw®Ä5(B56®®äa´ µùBšÉ·(YBî¤vÔ5Y¿Â•Ü ÉÙN¿ùx“î/ž~³ÓÑ%k¡th<†nSí0‘‡ÄœD Àž!YQ<‚¦Š®AOÀVWÐÊcÁéA®jaß5'haÐɈ2e]#lÁ¬7/ž•]=»–à_—ûh”‰6 -|ÑHâòË`ùqŠ`}`Œâýˆ’/–H=ʨT-K¤)攞J<)­I¹âk"Á;J1uk3Ö)Sôˆ¿PL‰„ÃOÝ*®Äw¨äy™¸*o ¶q„P:;`ˆŽš4¤ Îí%Y˜Ja‚I­|0Ÿ;*'sͦb-‘µ³r8*Ds’ßít\…½´þ\¬Q%çX¡»€JÜ#JÁ÷váüЋbLÙ^Ê’!¨â.^Õn %árØApñÂÅ0.\=sáQº>öåHG‡ââ„°Ël‚ -WŒ»æ€B‡#äDLšÏöh1ó³èÛKG¿yéès±Ëw܃ -]$`;iˆeZ“J–ºÍœÞ©n;ª÷¹‚–droèS†ÖTÀ+(VQšFÔAQÈgè5Í;Ôs¡ â®A!á´)TÓ ñ'Þ½â}4}u«äh¢*2þ"ÓÑõIpCëS!pÌù bø™Y)ÌR:¤*á/Ê*´"À DègV=°gÀ´mqodÈÂÞ€£TÝÜ©““úÖ)¬³)yáæ+«-^´Riϼö`ôÚüŠ…7i`CXG\e©ºáÕî •4ï²&˜} Šz–ù$°ÿnª‹÷¯÷gäøȽu2¡ÑE¨18!¨…Ø™(‘ÓØH%CR|  ¥ ; -6ûºï×b€Â’¡³äYi0»ñæ…3z7ìSìWÓëËÔÛszTSs´ÆàX&jfÍ$ç•Š¹l(€Ç†¢Dh7îÕÀ8¸n鬸pâ>ŠKóò™‡‚˜(bà·Òil8âx ‘GH ™²¢w¦W*Qy8ÀºkèèèWhÚ„Ž»ë˜¡Xð/ÜH=Nü£g¼yáŒä¼v -‡¯J—çý F¡j÷ÛSáý:]Кœ h | ™³,#^´æw£9²RŠâvÐŒä  M ÇÏLº‹Ÿ •ÑžõC䙓:ý-í…¼ŠdŒ\¬qhüÌÃ8¸ƒü¢Úïë§ÃZ¼Cé&RåÇ¿£§A3<Á^  Jƒê‹^ñ“¡È´óÍwqZ¸ÔBׇ.€’äÚÓ굞\!ž¼v~æ§yš÷õŒ_?Tº”‘—¬œ†Ì²¢™ö¤éÄñb¶/šwÉÔC÷f£uȉ;j'Ns) -©Žñ1íï°®ß]5 À¤û¤u°Ñ -M.àuÝ‚!÷Ò9é·Ñ¸¨q¡ÅŸlqÏ/?7šè’ñÔd¯dz~ô, ŸL7NÁçÁ˜›AïÒŒ%§”&y•Äש¡Ñ÷`’¹ÖÜM±vðß›kʧ$ëh³5Q\I¤chñ¥›‘>ËÌŽ«hFÛ•Íþ^VüQßîª,´«A)aÛU³Éd•0›Û å"ÿZõQp` ož>p¶Á\³¦i$Œ‚Pê‰G÷í ˆ®|*1tÄóü×L|ºbã!xbo€Q$˜ -¶›,ªY@M1‹D ²ƒר€`o{áJBFä¹Á hÒ9ÌóœQæ:ÎøÌ|ÃÂWe@Àƒ9ׇ^(vjuöE¤¼€\ël/y9±“\ÌÍ —.Ö]%s¬ûõñ¤A”Ÿ˜#\ªàjé†8X9\vôÙˆ`ïs¼&ø&4ŠcøkX”#TR«0‘¶äö -6`/xQ^,è»ðqÑEF3…@ç¬pú´ "‚ŠDzvž&-¬ j“«ªyix¸ÑÁô‹#ðnåp®ç1‚ÚQKl‡"Ö¢7#VœÙaÀp° ÏO+åÑÓ7Ô/ujHgûµ‰Œ`ñššÒ ZÔeôƒxÞëÙùÀ"kÕ 6°pö{á25I&Ðù5ÑPR<æÑ<º´GÔ©©8Ú4†ÝüqZ’‡MXž}Ùv¢oƒò¯ä\“…Ç—5e7Ýek_xÖóèr1Ï#-dt›1. AŤ¨¢™K’`Éå{b€.à6@ ôä„]G(ÊKáqOcz -SýùØ9o^8'õ©ëè(ûëøŸÍ–‡©ÒF1—±T±}ÑÏDýÖ)OÙèv-PG¹[£“r+· òr6‰Ê©/ Ù~‘d ÇÝÕ®~}õîê_—¸‰§ -Æ íÁX…;R-<^ ©Êœs´8\ß •|@H9?!€¸•%ÒœÉ ¼‰™ä"¸ezÐþþíÛw¿xóÕ»a¯ BgÔ`éI1*‰„‰¶Bg`ªd~â.ð’1À#†·ðd6´5Š™t¢!îzFÕ`c(é0ŽåÙ‰¹Ïu…`¬)…ì,}’õ¡^·íSÉܺ6WV§›® {>/ëè¯w?¶Q;~o -—옖,Úì(ãL8þ@ˆR 5éŠh›jAfoÆ@ R£m-2³¥QÊ…lJMÏ -4‚˜ˆûv¥7({cãjÅnCàêô ñ šÐ¬ì|;Éý[Sv-e÷…¶/ÒµzÇÄ ñ×l²)|Aø,³OÀ6p:=>àk… ˆ¯Eé©@SÐc±)²k˜ï0é6ÞÀã 4ý‹•k“×ãŽw0š(Ý%‚&ŠA p´Yo˜ ¯ ~ºd÷[„SŸbËæµÆm´kÝDžW`Xœë=c¢cÖM…NJj’«¹%(?yQí<¼12{C…ç3£·‚‚;mˆÃ -.ûƒ±*nO6t§ì[,ì|=«ìe¸Î²gÓmðêdBª.Ó…”¾×ì¨;Au]ª¡§ƒa ”G¹ÃI¦¤¥@^-I´œæ Ú(–gÓIiàȉÏÅŒïR£®"ç šÊ].F…)ºÃù†ÖäâK%‹¸n "ù³É†ƒ~7N.F/•DÔ”,²@XŒ+i²M¢ÆÀ!ãk]Ô’`&³êˆðjeС¬äXMmmOhs¦·;(.Æó¦gÔ’”!€éœÔ’Np¦ïò}bŒçVl¿óÒÚÈ\p)úç]·Úi#¦v ¥$1^ÈœK<¿Jɸ@6òÌtÒ.èd3s"¡¶]ÄáÀØ|7QT}hȯt;yxlºøl&hP|?â_²(¼‹—ì.òz„ ÷ÿ[EµwgE¼4 .¦fzäÄØmBÜLˆ¡¥…SÿËòÄE;GE]òZN$JBì˜bÂxj°$B àh -±%Ä D½ÝA±·3XÒ£éÉ÷€(ˆƒô•Ñ_2Š‘¹ÀÒ–Fƒ6yŸöH -C§Èž›[G!RýŒˆËVåuácˆ6˜ª6Á™Í|„BláZK撾˾§<>e{ÓÁøÊ´.W£¾ -3%m }·´ööT(y* Ê­âTm·Ó^6>ˆÄ¼ |kGfÐÄzö§8¤Jq‘<ŸÍ™-€&nç Dz~ô›>×ú×±`8JôÀbÊI̤#2÷Ü¿Äô/ŽÎH?§ðÜî°z!?¹ƒ¨ÐF.ái6LÝtÑZèÑïqH s0o…vdaæ¼)ÐåV"¹>*ïN–eðÇ¡nÙg‰Q¤ XUÞo™{À:'õ‰zü -Óã—ÛØ–_¦§ÖO1¤TîÄÁNÓ~‘ÔAá›@–ñxU[ÖÍû,ÆtÇ&,4šùš6A6Èøm¢Ôh1C¥ -ƒ„ÆF ^øM1.ÝdëíÌ›¸AžÎ ÏŒ -pPOät¨táSk¥´äñåáRFt9•›ämìhQ!ÄSuAÔRgåÄî|†œÃ÷£7”[Î<7æ:0ù¡Di…²ò1Ñ¡(©0F Ý ŸE\š„²’/r®Ò% -¬<ˆD!ŠBpõz£’(“ nñçË$Dï›ý=wõh šÅZHÿc·DF½~›vÝmŸe!ñföâ¬T¨QÒVJt·nPjhé)iÌÔ(ˆDæ[y[®jJÆV™B;è-5…‚qoèm¢•Œö²Jk& HŒÏ‹ÚÝâçÆìÑhÇ•@ -(?ÈÝYiù¯ŠË“.MgDˆ½ˆ#[œW^¢´k>øœÁŒøœãè‘hífK5†¢xc={= eø<¸Ad*}hÔÄCk6¤)-{î•¢a¹QëˆÅäÜõÀ8Ô@g¼a…´fÀ2Xˆk7]ü†Y ÊZÁ ªÞ²zîOQrDÖ´¥(o$¶7ávZLHRñF”ó¨èH»j15)"°Ù3£"î¹C@ví©S*ÍÈt½±©wÜ2…¤t³Œ<즹·3¤2ù¨gXª‹·E¦d‹Ls‘a¬‘Í,4|&¦[¬^Ì}Ë1XKöꑺQLÏÈJ>× šê»2PYÜoT6ËéF ) -ÌÚµ\¶ô®ÓhÌ‘!3bRß ÆKJÍà>‘¯õRÊþPV"‚ד<7NN²[¢<0@{X4ÔŽ­2ÖȨª·7°qzƒ¶Ž:ùìä}´²'²Å¢¬BðzT`ªÎ9{!'óe=ÑÍ°…Xq4Ê&s–U¬X–ú`=›»HdDl£èr I6S64ŲÔA8öŒƒM–;,Æ~jµ¡ «›ÞØjiÈœÛ/±bÞFYxgæ@?¡4/r´éö½ŽçL¾KÂ@ÒÁçRÅ}"sÆ Ý<Ÿ“Ù -C>؃¦¢V¨BEµê@Ï(.ä j)ÊÙ@u/ ›âT$[*M,¶Úz-Iù]e2úc < ¤©ÞRø;³µ×MYJ9gUìéù&v¼ÛeWÁ-¡ÞñéÄÊÕ`›ÁÝKƒ°( ;@6°%™V€œiZÀÝ.J°MÒ´µ4kê7e¾,} V’ñeÕ¤¹¬`8Ó´@º]Õ‹ñ’…Ì1ýË6‘° ý*]¼¢e[È8ç2×ÂŒ3M °Û% ²)4.¹øͦd‘ÿñKÈþ’ïºd [ëÒœN9ÓôîvQ‚m±—ÍJÍäY‚6Óuó”q‡umš&Ý€V·ø~¦eu»"6¦\¶¥q”qBîD7'΃÷¶Œ-ˆœ|b[Æu®iz»¶CFßÁ³Ѭ6+xÎ4-Po×ö{Ù…é;TÜÓìþ¸Ya$*ÅXu‹ÃæxQIï”w°·l¨Ê‘èVˆãöœ¼Æ¦¼0°¨nëéïÏ[„msÚ›r´ÚG‘±•Iê¡Ê!µX™†8,Tx.U0ÅÀ¨ ;µÌOÛ±ØbIkÙ}ú"…l2PÙòŒò™QË]£¼à4‡‹t3²ŽMb¦’ÌmU•,S>½V¨ŸWÛ‹L‡w´Dú7¨ùÄØLó™­LçU£lÊYLMÏ:•íNÍ(€zûýáçÓûÙ÷o¾ýüÓž{> Ó(nNvæ%˜NQ*\ÝV£@€Dµ¡Æõ›3 öåeF(*ÙxЛÇ+Ù7¯ÑwR¸1O¯Ѫ°~OÞIÆ=~x¸8íqO¯….us-Ÿ¼waÉó¤NÖûj!?š1YJ´î|OvÉÌERíƒ xñY3²áºTö{kQ¬àFI}Ø<µ¶!!¤ÉG&µ^im“Û[ à–~†ÂÝ›òz(S{õ‘öÅtÈTó’µ âZdäa%9Æu -q4êÀ; -öp•eG° £q»TcW7/\—2-)eûõÈÊOõª.0‘sÃàÊ»©Èñä¢ Ór,÷2*á´ëÀ`7F–Ë2ÇäµÈbSlQÔ³$|Åž'{ÌŒØíØBVRQàrÏVFÐËGÃÀ¥^F|¯=‚eó˜È«Î8Ü*S_* e øE©Ÿ>RVW9W%°ò³rè/RY…ÔHEU³°ÂˆVi`¦ßŠøOK?‹#¶ÃÔ4›$°íÈ|VKkgQj3uøcg¼yéŒèÂü+Ýù©hÄicyâx‹¾I6!•tÑ7Åiu~n ^fP† -ß•fTL?Ò™GÚÀx :‹ºLAJgŒ&Ó+´in}'‹ñ¼ßÍ$ƒ¯Þbqˤ·m J;7=¬#õDI†œŒi‰÷zGŸ v *¯VŒ‚g}ŒôÌbÂ*ßi½\G2« Jà^Ï~wKùˆB# ‘p+ÜÒž@ÚÔ‰X&³KÎui¡Ó|m©cxW-eìÜø™«›—?–ûšI[Yq‰™ñݪäh\LÐgëyåQ[ò^¯H5à+–×°f=Ûurôð2¹X‚í­úGµ´”0r5ëCÏŒ a”vfàh -ÊfH¿M-Ê©*rl°’Ù„gY4ëõ\¬PÇ €EP?o…¸:Ãø”YG«iùæ‡'ä%SúÏmÔÿò‹y¤0ˆMêeßó˜ Žš/³zÏûàÓ(ÿh˜5s.̚Ƭ¾ê_/˜Uµ$Tå„ÕOÊk€ÚåãùKŽ¦òÅKnpB?˜Ùg竬ÌxÌh51²UAá‘›+k3ÛEâ0ÏürÙ/HóY œžÚ5÷08l6ã­j²ªŠ>`BWuPhœ1=ýXÐvʾcN¬¿C·!Àh-fѯ8’?YC9õ “ -Çù—6êb¼`R«1R©ËÓùšÌ-Nu. ù“qwÑôÊT•’9‹Nù=+'é š^%:Ô‚¡‡øÕÀW-ò¸ ZÁæ-ïÅžo½ª²¶ã.5t;ë»ñÎÞ¥0ö4¢Ê;c QQÜƉ±êiÎ=“ï=XÙJe‰QIª¨eR[$sÁ3B#¬æ¸”Ÿ+ÏäÕrŠ“ ‘1‘W~CtzVŠ«ždõy܈t„®Eñqß *Å_å<ØÐ,Ïó‘3Þ¼lÆ>Š˜³æGxÕ`שj ¾ì3~Ü›+sšƒU3‹<ÍÄ"ùÊYKI b•Q£: œì -cUÄmW$>·,½RQ‹ï9c~hí¥RršT¸*ŒbF, ‹kТ•ÍJD—v‰‰‚f#uƒ!Æ+Ò°[…åüPÑÓò=¼’7à"5ý‘•Ú•?¤Ä\Z³·è0*-¨EQ:Á[Pçhiª,ß-f;òrIY“$¨¤1îy£#s`fÃ1”ÌŠ¾ƒ´5>éÂŒ>h@Ò.«èƒ«v,Q52‚…u)>£(£\Y!²8éÄ©ZHÌ -ÖÚÂqÑnPÜ3©æL0¹××<#2#Ì£90‘’fXä“rï08+pˆó¶¥}?RÑîã‘©Ô&iÍ2×ÍÉí4ç³SZQŒôò­‹*Wg–Ç®ÎY±ëÀPº3½\g®¥3÷õsÁœDÁj¹ozQ²zá¥iwxvS²7“v ›ô5I 9£zY1©L5+¸Q>2ëRz»ÈVÍÖ ÕK"L0yÙ1\ )LyÙ›TãclC²Íb‡Ñül¡Jd?ÐÅíTé)è[¸. Fí´ =*2†ç£Úú ÏTèd$‰ë£2Õh¦~[’9K$^}P1E˜n»ņz¬%Yy)÷‘3Þ¼lÆY}Ê‚Ô^5÷û‡KDÓØ´2=ªÈ‘¡¹La*΢#}Rqž¶Ø0È®…R‡dýצìWZJMǬV ß‘$rZ5Y«L¶& ›T:Ë­Y£¢Y£RßÙ³m,QÈ„§êLœ*J¦h¦ý>â=-.1hžh£Æ)¶S^bÅFÚ°ŠB(QQg¡DÅ€®í4—ë;BÌÀÃsJaq¨#ëKÓ|v”Ž -ÍÂA†!^Z”Èö‰Ñ,–Êot]kö<0‡mGè8ÉJ/ÕÉX–úw;åÍK§ìÕŠÊxfÄ”W5b ɹÐlO¹8*Ût†+òŠ•lºœÍNvØ¡*w ”¢´ê )HPS9Ù§[hBÆp3µXÊŒ?ƳŠ‡`ŒFže0tWÊ{¶H+´è Uä3/z@ø||±mcT:3ˆ@3”h¿]çå"ù®–çÝI¢/·e®6-em±iÁ«W/ž”Ë›/ry)ùŽ9ÊåqY«×èQ%-xzíÂÔóOæ}5J¦À¹D@>“Ìxº:C žbçÌo¸dKyóu‘Ìòk¤’˜ 9/êÀYµXnwźbfoêM=$?ÝÂ'ß’Ì0¦Ð~¬üFn¨3ŸˆWÅ-Ñß?ŽüQ3!稔 µ\HM¢óI1¹™ &jf¹.·bö=û°j3_`îývÐ¥6ݶ磉õARµ$K ñMŒÖê’æQ—›ÍØüÌ ŽÎ<2“û³àÍÛ¿ðR¦©{¦4]+rל¼d®12A„»>Ϥ‘¾DV›ŽY+ôë×Hš[ÜõË9$+1=pf‰œµéÆ”Ns>;åø„÷¥šÏ¸Òý|®UüpÃòtLe­¸³Ë“ 78«zróÂå¡_`îeqÿªŸ ®¨^H°’Jºšž‘Þü:–œüBFyÏÍKÉ® aj¾d Ö#Ây¯j•újEðì&jzåš{ó -¯Â@@HûŒÚ -ª‹ä=µ©ã¢œS•û.;~¤ÝàH˜TA›¶Ø^™ÜX@EEê -¿óeÕۨͳàmzÁÝ°Ò¢d–æ¬Õ(R—X8[Eêœ})â™YGºtcÍ@~)Ž„eT¨«ü¾†*ÔefÝí&G2“Ÿ{ê^´Æ<2…T6ؽf…º?«€§3Í@EaX#7š£•ÅÕÄäé¤Î¥¤<ªèÝJúI]VÁFYçŽ#Ô¤ÏíXm>~·Æw ÈÂÔ*>4“Ûwoú bÆ@Ó"©²òf§™ç÷éT8²jFq}FÐIG"ýÚõ«½…jYI ry8±#Ãd$t‹ÏNHRô\m8/0¶•qô -Dï YˆP¢Â(j¶°Œ(7K'T—ÄØY~Z'05zÛƒ¹ÇyœQœÚâó;‘³ÝQÀ}M)hûI¾¿QT}·|OöLK„’½ÜdÅ6ÚH)<²H*?Œ˜FnÚÚÌa¥ø÷0f+;ÇÌéhÓicô£8ìYWp\JÊÿ8s°,ž¬ÜÌbë´BŠ u|äS5i”¨Ù©ÛZff]vû‚«–K˜ìû ¹GÛÓ†‰ÒL=Ýü_ÛyO«Sì´¥:‡£˜éeNåäK¶Áe’åä­Åå³Ã5YªEûK-h5¦¯ Ø;ÃZôÑ‚ìyäý'‹TÌéÀ’®Y¬2À¢ Ë÷ Ø—«:•gü 5yÓ „ëyÑ󻮪¡¡¼MPYìcc•…à±" •úÝt3'<°êH%;ø4‹³ÔV´ÖÅ2>áõ¡ ç—ÆŠrCÀÞ̉²ï¤\YvJeùÎô›+=Û™n,Y¢ ®[7/\‹\³$l®1÷×)à„ÏñžùN©UàŽ…5?>o¢&)Ú©â…~¡©ØÇwœ7çâÙ–¥ÛÐâÏ4MîöPͨ˯<u4LY¬^ÒI ˵f -D®jJæñ8y)]‘wÝp -“bJÒ¹¦ÀŠ¡ª& ¯R‰~õÖ¨esÚT,Œò´ãhZ¿µZðº:ÈÝ}>úgï¾ÐGžG>Gûœôíû¯ÿ뛫ï¾yûþ `×áïø‡w_³õoÞÿñ›Ãß}ýý»Ã»¯¿=üïé ¿»jn|ú—*eùe¦î,ÕfΖþýä?~‰9¿ùöýâñ~*Jó›ß|(w|Ú]çý' Ýb8ŽÊ$b, veÛxwõ™( Z!Ü»µOÑËòô>[Ý¡9¿§AŸL°´­Ç÷,6^}jä×E绫KJ²G=þd¾¼nc/}°N­O<µ=;þé-¬÷híd‹žÚÎîÐÓoÿwøê÷†IÀ,ãO>ù—7_¾ý·÷o¾úÓÛ÷W_~óæ¿ßÞ¼ö¼ùöíá/à:o¿ùöë÷oßüáëïÙ‚.óõO>ùÙ?ÿÃÕÿµäh endstream endobj 541 0 obj <> endobj xref 0 546 0000000003 65535 f -0000000016 00000 n -0000046146 00000 n -0000000004 00000 f -0000000006 00000 f -0000046795 00000 n -0000000007 00000 f -0000000008 00000 f -0000000009 00000 f -0000000010 00000 f -0000000011 00000 f -0000000012 00000 f -0000000016 00000 f -0000046197 00000 n -0000046652 00000 n -0000046683 00000 n -0000000017 00000 f -0000000018 00000 f -0000000019 00000 f -0000000020 00000 f -0000000021 00000 f -0000000022 00000 f -0000000023 00000 f -0000000024 00000 f -0000000025 00000 f -0000000026 00000 f -0000000027 00000 f -0000000028 00000 f -0000000029 00000 f -0000000030 00000 f -0000000031 00000 f -0000000032 00000 f -0000000033 00000 f -0000000034 00000 f -0000000035 00000 f -0000000036 00000 f -0000000037 00000 f -0000000038 00000 f -0000000039 00000 f -0000000040 00000 f -0000000041 00000 f -0000000042 00000 f -0000000043 00000 f -0000000044 00000 f -0000000045 00000 f -0000000046 00000 f -0000000047 00000 f -0000000048 00000 f -0000000049 00000 f -0000000050 00000 f -0000000051 00000 f -0000000052 00000 f -0000000053 00000 f -0000000054 00000 f -0000000055 00000 f -0000000056 00000 f -0000000057 00000 f -0000000058 00000 f -0000000059 00000 f -0000000060 00000 f -0000000061 00000 f -0000000062 00000 f -0000000063 00000 f -0000000064 00000 f -0000000065 00000 f -0000000066 00000 f -0000000067 00000 f -0000000068 00000 f -0000000069 00000 f -0000000070 00000 f -0000000071 00000 f -0000000072 00000 f -0000000073 00000 f -0000000074 00000 f -0000000075 00000 f -0000000076 00000 f -0000000077 00000 f -0000000078 00000 f -0000000079 00000 f -0000000080 00000 f -0000000081 00000 f -0000000082 00000 f -0000000083 00000 f -0000000084 00000 f -0000000085 00000 f -0000000086 00000 f -0000000087 00000 f -0000000088 00000 f -0000000089 00000 f -0000000090 00000 f -0000000091 00000 f -0000000092 00000 f -0000000093 00000 f -0000000094 00000 f -0000000095 00000 f -0000000096 00000 f -0000000097 00000 f -0000000098 00000 f -0000000099 00000 f -0000000100 00000 f -0000000101 00000 f -0000000102 00000 f -0000000103 00000 f -0000000104 00000 f -0000000105 00000 f -0000000106 00000 f -0000000107 00000 f -0000000108 00000 f -0000000109 00000 f -0000000110 00000 f -0000000111 00000 f -0000000112 00000 f -0000000113 00000 f -0000000114 00000 f -0000000115 00000 f -0000000116 00000 f -0000000117 00000 f -0000000118 00000 f -0000000119 00000 f -0000000120 00000 f -0000000121 00000 f -0000000122 00000 f -0000000123 00000 f -0000000124 00000 f -0000000125 00000 f -0000000126 00000 f -0000000127 00000 f -0000000128 00000 f -0000000129 00000 f -0000000130 00000 f -0000000131 00000 f -0000000132 00000 f -0000000133 00000 f -0000000134 00000 f -0000000135 00000 f -0000000136 00000 f -0000000137 00000 f -0000000138 00000 f -0000000139 00000 f -0000000140 00000 f -0000000141 00000 f -0000000142 00000 f -0000000143 00000 f -0000000144 00000 f -0000000145 00000 f -0000000146 00000 f -0000000147 00000 f -0000000148 00000 f -0000000149 00000 f -0000000150 00000 f -0000000151 00000 f -0000000152 00000 f -0000000153 00000 f -0000000154 00000 f -0000000155 00000 f -0000000156 00000 f -0000000157 00000 f -0000000158 00000 f -0000000159 00000 f -0000000160 00000 f -0000000161 00000 f -0000000162 00000 f -0000000163 00000 f -0000000164 00000 f -0000000165 00000 f -0000000166 00000 f -0000000167 00000 f -0000000168 00000 f -0000000169 00000 f -0000000170 00000 f -0000000171 00000 f -0000000172 00000 f -0000000173 00000 f -0000000174 00000 f -0000000175 00000 f -0000000176 00000 f -0000000177 00000 f -0000000178 00000 f -0000000179 00000 f -0000000180 00000 f -0000000181 00000 f -0000000182 00000 f -0000000183 00000 f -0000000184 00000 f -0000000185 00000 f -0000000186 00000 f -0000000190 00001 f -0000046268 00000 n -0000046534 00000 n -0000046566 00000 n -0000000191 00000 f -0000000192 00000 f -0000000193 00000 f -0000000194 00000 f -0000000195 00000 f -0000000196 00000 f -0000000197 00000 f -0000000198 00000 f -0000000199 00000 f -0000000200 00000 f -0000000201 00000 f -0000000202 00000 f -0000000203 00000 f -0000000204 00000 f -0000000205 00000 f -0000000206 00000 f -0000000207 00000 f -0000000208 00000 f -0000000209 00000 f -0000000210 00000 f -0000000211 00000 f -0000000212 00000 f -0000000213 00000 f -0000000214 00000 f -0000000215 00000 f -0000000216 00000 f -0000000217 00000 f -0000000218 00000 f -0000000219 00000 f -0000000220 00000 f -0000000221 00000 f -0000000222 00000 f -0000000223 00000 f -0000000224 00000 f -0000000225 00000 f -0000000226 00000 f -0000000227 00000 f -0000000228 00000 f -0000000229 00000 f -0000000230 00000 f -0000000231 00000 f -0000000232 00000 f -0000000233 00000 f -0000000234 00000 f -0000000235 00000 f -0000000236 00000 f -0000000237 00000 f -0000000238 00000 f -0000000239 00000 f -0000000240 00000 f -0000000241 00000 f -0000000242 00000 f -0000000243 00000 f -0000000244 00000 f -0000000245 00000 f -0000000246 00000 f -0000000247 00000 f -0000000248 00000 f -0000000249 00000 f -0000000250 00000 f -0000000251 00000 f -0000000252 00000 f -0000000253 00000 f -0000000254 00000 f -0000000255 00000 f -0000000256 00000 f -0000000257 00000 f -0000000258 00000 f -0000000259 00000 f -0000000260 00000 f -0000000261 00000 f -0000000262 00000 f -0000000263 00000 f -0000000264 00000 f -0000000265 00000 f -0000000266 00000 f -0000000267 00000 f -0000000268 00000 f -0000000269 00000 f -0000000270 00000 f -0000000271 00000 f -0000000272 00000 f -0000000273 00000 f -0000000274 00000 f -0000000275 00000 f -0000000276 00000 f -0000000277 00000 f -0000000278 00000 f -0000000279 00000 f -0000000280 00000 f -0000000281 00000 f -0000000282 00000 f -0000000283 00000 f -0000000284 00000 f -0000000285 00000 f -0000000286 00000 f -0000000287 00000 f -0000000288 00000 f -0000000289 00000 f -0000000290 00000 f -0000000291 00000 f -0000000292 00000 f -0000000293 00000 f -0000000294 00000 f -0000000295 00000 f -0000000296 00000 f -0000000297 00000 f -0000000298 00000 f -0000000299 00000 f -0000000300 00000 f -0000000301 00000 f -0000000302 00000 f -0000000303 00000 f -0000000304 00000 f -0000000305 00000 f -0000000306 00000 f -0000000307 00000 f -0000000308 00000 f -0000000309 00000 f -0000000310 00000 f -0000000311 00000 f -0000000312 00000 f -0000000313 00000 f -0000000314 00000 f -0000000315 00000 f -0000000316 00000 f -0000000317 00000 f -0000000318 00000 f -0000000319 00000 f -0000000320 00000 f -0000000321 00000 f -0000000322 00000 f -0000000323 00000 f -0000000324 00000 f -0000000325 00000 f -0000000326 00000 f -0000000327 00000 f -0000000328 00000 f -0000000329 00000 f -0000000330 00000 f -0000000331 00000 f -0000000332 00000 f -0000000333 00000 f -0000000334 00000 f -0000000335 00000 f -0000000336 00000 f -0000000337 00000 f -0000000338 00000 f -0000000339 00000 f -0000000340 00000 f -0000000341 00000 f -0000000342 00000 f -0000000343 00000 f -0000000344 00000 f -0000000345 00000 f -0000000346 00000 f -0000000347 00000 f -0000000348 00000 f -0000000349 00000 f -0000000350 00000 f -0000000351 00000 f -0000000352 00000 f -0000000353 00000 f -0000000354 00000 f -0000000355 00000 f -0000000356 00000 f -0000000357 00000 f -0000000358 00000 f -0000000359 00001 f -0000000360 00000 f -0000000361 00000 f -0000000362 00000 f -0000000368 00000 f -0000075851 00000 n -0000075927 00000 n -0000076105 00000 n -0000077095 00000 n -0000097752 00000 n -0000000373 00001 f -0000046768 00000 n -0000046342 00000 n -0000046416 00000 n -0000046448 00000 n -0000000374 00001 f -0000000377 00001 f -0000054800 00000 n -0000075186 00000 n -0000000378 00001 f -0000000383 00001 f -0000054924 00000 n -0000055150 00000 n -0000055187 00000 n -0000073363 00000 n -0000000384 00001 f -0000000385 00001 f -0000000387 00001 f -0000075122 00000 n -0000000388 00001 f -0000000389 00001 f -0000000391 00001 f -0000073767 00000 n -0000000392 00001 f -0000000393 00001 f -0000000395 00001 f -0000075058 00000 n -0000000396 00001 f -0000000397 00001 f -0000000399 00001 f -0000074174 00000 n -0000000400 00001 f -0000000401 00001 f -0000000403 00001 f -0000074994 00000 n -0000000404 00001 f -0000000405 00001 f -0000000407 00001 f -0000074584 00000 n -0000000409 00001 f -0000062070 00000 n -0000000534 00001 f -0000058420 00000 n -0000071154 00000 n -0000071321 00000 n -0000071442 00000 n -0000071558 00000 n -0000071669 00000 n -0000058712 00000 n -0000070447 00000 n -0000070593 00000 n -0000070709 00000 n -0000070820 00000 n -0000059004 00000 n -0000069437 00000 n -0000069534 00000 n -0000059296 00000 n -0000068717 00000 n -0000068814 00000 n -0000059588 00000 n -0000068281 00000 n -0000068378 00000 n -0000059880 00000 n -0000067698 00000 n -0000067795 00000 n -0000060172 00000 n -0000067140 00000 n -0000067237 00000 n -0000060318 00000 n -0000066787 00000 n -0000066908 00000 n -0000067024 00000 n -0000060464 00000 n -0000066278 00000 n -0000066424 00000 n -0000066545 00000 n -0000066666 00000 n -0000060610 00000 n -0000065769 00000 n -0000065915 00000 n -0000066036 00000 n -0000066157 00000 n -0000057836 00000 n -0000073146 00000 n -0000073243 00000 n -0000057982 00000 n -0000072637 00000 n -0000072783 00000 n -0000072904 00000 n -0000073025 00000 n -0000058128 00000 n -0000072277 00000 n -0000072398 00000 n -0000072518 00000 n -0000058274 00000 n -0000071785 00000 n -0000071931 00000 n -0000072052 00000 n -0000072167 00000 n -0000058566 00000 n -0000070936 00000 n -0000071033 00000 n -0000058858 00000 n -0000069654 00000 n -0000069842 00000 n -0000069963 00000 n -0000070084 00000 n -0000070205 00000 n -0000070326 00000 n -0000059150 00000 n -0000068934 00000 n -0000069080 00000 n -0000069196 00000 n -0000069317 00000 n -0000059442 00000 n -0000068499 00000 n -0000068596 00000 n -0000059734 00000 n -0000067916 00000 n -0000068039 00000 n -0000068160 00000 n -0000060026 00000 n -0000067357 00000 n -0000067480 00000 n -0000067585 00000 n -0000060756 00000 n -0000065559 00000 n -0000065656 00000 n -0000060902 00000 n -0000064924 00000 n -0000065095 00000 n -0000065216 00000 n -0000065332 00000 n -0000065443 00000 n -0000061048 00000 n -0000064716 00000 n -0000064813 00000 n -0000061194 00000 n -0000064498 00000 n -0000064595 00000 n -0000061340 00000 n -0000064155 00000 n -0000064276 00000 n -0000064387 00000 n -0000061486 00000 n -0000063666 00000 n -0000063812 00000 n -0000063933 00000 n -0000064044 00000 n -0000061632 00000 n -0000063183 00000 n -0000063329 00000 n -0000063445 00000 n -0000063553 00000 n -0000061778 00000 n -0000062581 00000 n -0000062749 00000 n -0000062856 00000 n -0000062962 00000 n -0000063070 00000 n -0000061924 00000 n -0000062107 00000 n -0000062253 00000 n -0000062364 00000 n -0000062470 00000 n -0000055038 00000 n -0000000535 00001 f -0000000536 00001 f -0000000540 00001 f -0000047704 00000 n -0000054378 00000 n -0000075814 00000 n -0000000000 00001 f -0000158843 00000 n -0000075250 00000 n -0000075300 00000 n -0000054442 00000 n -0000000182 00000 n -trailer <]>> startxref 158984 %%EOF \ No newline at end of file diff --git a/www/sourceforge/README-SOURCEFORGE.txt b/www/sourceforge/README-SOURCEFORGE.txt deleted file mode 100644 index 9c9f3cd..0000000 --- a/www/sourceforge/README-SOURCEFORGE.txt +++ /dev/null @@ -1,3 +0,0 @@ -TikZiT is no longer being hosted on Sourceforge.net. To download the latest version, -go to http://tikzit.github.io . - diff --git a/www/sourceforge/README.mkd b/www/sourceforge/README.mkd deleted file mode 100644 index fb11cd4..0000000 --- a/www/sourceforge/README.mkd +++ /dev/null @@ -1,22 +0,0 @@ -TikZit is a cross-platform application that allows the creation and modification of TeX diagrams written using the pgf/TikZ macro library. It is especially geared toward rapidly creating "dot"-diagrams for use in academic papers. - -It comes in two flavours: MacOSX (Cocoa) and GTK+. Note that you will need to build from source on UNIX systems (or use distribution packages, if available). - -## Requirements - -### GTK+ flavour -* GNUstep (base libraries - 1.18.0 minimum) -* GTK+ (2.18.0 minimum) -* poppler (including glib bindings - tested with 0.12.4) -* An Objective-C compiler (eg: gcc-objc) - -## Changes since 0.9: - -### GTK+ flavour: -* UI overhaul: multiple documents can be open at once, and there are GIMP-like separate toolbox windows -* Better keyboard shortcuts for changing tools -* Support for edge anchors -* Option to drag-select edges as well as or instead of nodes -* Error highlighting in code pane -* Various bugfixes including crashes, memory leaks and parsing issues - diff --git a/www/sourceforge/index.html b/www/sourceforge/index.html deleted file mode 100644 index 2d65884..0000000 --- a/www/sourceforge/index.html +++ /dev/null @@ -1,9 +0,0 @@ - - - TikZiT ... redirect - - - -

TikZiT is now being hosted at GitHub. Click here to go there.

- - \ No newline at end of file -- cgit v1.2.3 From 738ecbd5fad2b46836bfd6a94aeebf165ae2bbca Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Thu, 4 Jan 2018 16:00:52 +0100 Subject: relocated source code to the root --- Makefile | 1139 ++++++++++++ README | 12 + bison.pri | 14 + flex.pri | 8 + images/AH_latex_head.png | Bin 0 -> 6334 bytes images/AH_latex_tail.png | Bin 0 -> 6324 bytes images/AH_none.png | Bin 0 -> 6183 bytes images/AH_plain_head.png | Bin 0 -> 6298 bytes images/AH_plain_tail.png | Bin 0 -> 6320 bytes images/ED_arrow.png | Bin 0 -> 6357 bytes images/ED_none.png | Bin 0 -> 6190 bytes images/ED_tick.png | Bin 0 -> 6258 bytes images/customshape.png | Bin 0 -> 1281 bytes images/draw-ellipse.png | Bin 0 -> 3493 bytes images/draw-path.png | Bin 0 -> 920 bytes images/emblem-important.png | Bin 0 -> 717 bytes images/emblem-unreadable-grey.png | Bin 0 -> 3554 bytes images/engine.png | Bin 0 -> 1546 bytes images/format-indent-less.png | Bin 0 -> 767 bytes images/preamble.png | Bin 0 -> 851 bytes images/select-rectangular.png | Bin 0 -> 499 bytes images/text-x-generic.png | Bin 0 -> 744 bytes images/text-x-script.png | Bin 0 -> 1416 bytes images/tikzit48x48.png | Bin 0 -> 2606 bytes images/transform-crop-and-resize.png | Bin 0 -> 1132 bytes images/transform-move.png | Bin 0 -> 638 bytes images/updates.png | Bin 0 -> 1953 bytes src/data/edge.cpp | 306 ++++ src/data/edge.h | 89 + src/data/graph.cpp | 172 ++ src/data/graph.h | 56 + src/data/graphelementdata.cpp | 170 ++ src/data/graphelementdata.h | 66 + src/data/graphelementproperty.cpp | 59 + src/data/graphelementproperty.h | 40 + src/data/node.cpp | 79 + src/data/node.h | 49 + src/data/nodestyle.cpp | 32 + src/data/nodestyle.h | 26 + src/data/tikzdocument.cpp | 82 + src/data/tikzdocument.h | 43 + src/data/tikzgraphassembler.cpp | 33 + src/data/tikzgraphassembler.h | 31 + src/data/tikzlexer.l | 181 ++ src/data/tikzlexer.lexer.cpp | 2535 +++++++++++++++++++++++++++ src/data/tikzparser.parser.cpp | 1938 ++++++++++++++++++++ src/data/tikzparser.parser.hpp | 139 ++ src/data/tikzparser.y | 262 +++ src/data/tikzparserdefs.h | 18 + src/gui/commands.cpp | 0 src/gui/commands.h | 4 + src/gui/edgeitem.cpp | 131 ++ src/gui/edgeitem.h | 36 + src/gui/mainmenu.cpp | 96 + src/gui/mainmenu.h | 43 + src/gui/mainmenu.ui | 187 ++ src/gui/mainwindow.cpp | 99 ++ src/gui/mainwindow.h | 48 + src/gui/mainwindow.ui | 199 +++ src/gui/nodeitem.cpp | 124 ++ src/gui/nodeitem.h | 32 + src/gui/propertypalette.cpp | 43 + src/gui/propertypalette.h | 28 + src/gui/propertypalette.ui | 30 + src/gui/tikzscene.cpp | 384 ++++ src/gui/tikzscene.h | 62 + src/gui/tikzview.cpp | 84 + src/gui/tikzview.h | 32 + src/gui/toolpalette.cpp | 50 + src/gui/toolpalette.h | 34 + src/gui/undocommands.cpp | 162 ++ src/gui/undocommands.h | 80 + src/main.cpp | 14 + src/test/testmain.cpp | 22 + src/test/testparser.cpp | 163 ++ src/test/testparser.h | 18 + src/test/testtest.cpp | 10 + src/test/testtest.h | 17 + src/test/testtikzoutput.cpp | 97 + src/test/testtikzoutput.h | 17 + src/tikzit.cpp | 105 ++ src/tikzit.h | 70 + src/util.cpp | 48 + src/util.h | 24 + target_wrapper.sh | 6 + tikzit.pro | 98 ++ tikzit.qrc | 8 + tikzit/Makefile | 1139 ------------ tikzit/README | 12 - tikzit/bison.pri | 14 - tikzit/flex.pri | 8 - tikzit/images/AH_latex_head.png | Bin 6334 -> 0 bytes tikzit/images/AH_latex_tail.png | Bin 6324 -> 0 bytes tikzit/images/AH_none.png | Bin 6183 -> 0 bytes tikzit/images/AH_plain_head.png | Bin 6298 -> 0 bytes tikzit/images/AH_plain_tail.png | Bin 6320 -> 0 bytes tikzit/images/ED_arrow.png | Bin 6357 -> 0 bytes tikzit/images/ED_none.png | Bin 6190 -> 0 bytes tikzit/images/ED_tick.png | Bin 6258 -> 0 bytes tikzit/images/customshape.png | Bin 1281 -> 0 bytes tikzit/images/draw-ellipse.png | Bin 3493 -> 0 bytes tikzit/images/draw-path.png | Bin 920 -> 0 bytes tikzit/images/emblem-important.png | Bin 717 -> 0 bytes tikzit/images/emblem-unreadable-grey.png | Bin 3554 -> 0 bytes tikzit/images/engine.png | Bin 1546 -> 0 bytes tikzit/images/format-indent-less.png | Bin 767 -> 0 bytes tikzit/images/preamble.png | Bin 851 -> 0 bytes tikzit/images/select-rectangular.png | Bin 499 -> 0 bytes tikzit/images/text-x-generic.png | Bin 744 -> 0 bytes tikzit/images/text-x-script.png | Bin 1416 -> 0 bytes tikzit/images/tikzit48x48.png | Bin 2606 -> 0 bytes tikzit/images/transform-crop-and-resize.png | Bin 1132 -> 0 bytes tikzit/images/transform-move.png | Bin 638 -> 0 bytes tikzit/images/updates.png | Bin 1953 -> 0 bytes tikzit/src/data/edge.cpp | 306 ---- tikzit/src/data/edge.h | 89 - tikzit/src/data/graph.cpp | 172 -- tikzit/src/data/graph.h | 56 - tikzit/src/data/graphelementdata.cpp | 170 -- tikzit/src/data/graphelementdata.h | 66 - tikzit/src/data/graphelementproperty.cpp | 59 - tikzit/src/data/graphelementproperty.h | 40 - tikzit/src/data/node.cpp | 79 - tikzit/src/data/node.h | 49 - tikzit/src/data/nodestyle.cpp | 32 - tikzit/src/data/nodestyle.h | 26 - tikzit/src/data/tikzdocument.cpp | 82 - tikzit/src/data/tikzdocument.h | 43 - tikzit/src/data/tikzgraphassembler.cpp | 33 - tikzit/src/data/tikzgraphassembler.h | 31 - tikzit/src/data/tikzlexer.l | 181 -- tikzit/src/data/tikzlexer.lexer.cpp | 2535 --------------------------- tikzit/src/data/tikzparser.parser.cpp | 1938 -------------------- tikzit/src/data/tikzparser.parser.hpp | 139 -- tikzit/src/data/tikzparser.y | 262 --- tikzit/src/data/tikzparserdefs.h | 18 - tikzit/src/gui/commands.cpp | 0 tikzit/src/gui/commands.h | 4 - tikzit/src/gui/edgeitem.cpp | 131 -- tikzit/src/gui/edgeitem.h | 36 - tikzit/src/gui/mainmenu.cpp | 96 - tikzit/src/gui/mainmenu.h | 43 - tikzit/src/gui/mainmenu.ui | 187 -- tikzit/src/gui/mainwindow.cpp | 99 -- tikzit/src/gui/mainwindow.h | 48 - tikzit/src/gui/mainwindow.ui | 199 --- tikzit/src/gui/nodeitem.cpp | 124 -- tikzit/src/gui/nodeitem.h | 32 - tikzit/src/gui/propertypalette.cpp | 43 - tikzit/src/gui/propertypalette.h | 28 - tikzit/src/gui/propertypalette.ui | 30 - tikzit/src/gui/tikzscene.cpp | 384 ---- tikzit/src/gui/tikzscene.h | 62 - tikzit/src/gui/tikzview.cpp | 84 - tikzit/src/gui/tikzview.h | 32 - tikzit/src/gui/toolpalette.cpp | 50 - tikzit/src/gui/toolpalette.h | 34 - tikzit/src/gui/undocommands.cpp | 162 -- tikzit/src/gui/undocommands.h | 80 - tikzit/src/main.cpp | 14 - tikzit/src/test/testmain.cpp | 22 - tikzit/src/test/testparser.cpp | 163 -- tikzit/src/test/testparser.h | 18 - tikzit/src/test/testtest.cpp | 10 - tikzit/src/test/testtest.h | 17 - tikzit/src/test/testtikzoutput.cpp | 97 - tikzit/src/test/testtikzoutput.h | 17 - tikzit/src/tikzit.cpp | 105 -- tikzit/src/tikzit.h | 70 - tikzit/src/util.cpp | 48 - tikzit/src/util.h | 24 - tikzit/target_wrapper.sh | 6 - tikzit/tikzit.pro | 98 -- tikzit/tikzit.qrc | 8 - tikzit/tikzlexer.h | 345 ---- tikzlexer.h | 345 ++++ 176 files changed, 10629 insertions(+), 10629 deletions(-) create mode 100644 Makefile create mode 100644 README create mode 100644 bison.pri create mode 100644 flex.pri create mode 100644 images/AH_latex_head.png create mode 100644 images/AH_latex_tail.png create mode 100644 images/AH_none.png create mode 100644 images/AH_plain_head.png create mode 100644 images/AH_plain_tail.png create mode 100644 images/ED_arrow.png create mode 100644 images/ED_none.png create mode 100644 images/ED_tick.png create mode 100644 images/customshape.png create mode 100644 images/draw-ellipse.png create mode 100644 images/draw-path.png create mode 100644 images/emblem-important.png create mode 100644 images/emblem-unreadable-grey.png create mode 100644 images/engine.png create mode 100644 images/format-indent-less.png create mode 100644 images/preamble.png create mode 100644 images/select-rectangular.png create mode 100644 images/text-x-generic.png create mode 100644 images/text-x-script.png create mode 100644 images/tikzit48x48.png create mode 100644 images/transform-crop-and-resize.png create mode 100644 images/transform-move.png create mode 100644 images/updates.png create mode 100644 src/data/edge.cpp create mode 100644 src/data/edge.h create mode 100644 src/data/graph.cpp create mode 100644 src/data/graph.h create mode 100644 src/data/graphelementdata.cpp create mode 100644 src/data/graphelementdata.h create mode 100644 src/data/graphelementproperty.cpp create mode 100644 src/data/graphelementproperty.h create mode 100644 src/data/node.cpp create mode 100644 src/data/node.h create mode 100644 src/data/nodestyle.cpp create mode 100644 src/data/nodestyle.h create mode 100644 src/data/tikzdocument.cpp create mode 100644 src/data/tikzdocument.h create mode 100644 src/data/tikzgraphassembler.cpp create mode 100644 src/data/tikzgraphassembler.h create mode 100644 src/data/tikzlexer.l create mode 100644 src/data/tikzlexer.lexer.cpp create mode 100644 src/data/tikzparser.parser.cpp create mode 100644 src/data/tikzparser.parser.hpp create mode 100644 src/data/tikzparser.y create mode 100644 src/data/tikzparserdefs.h create mode 100644 src/gui/commands.cpp create mode 100644 src/gui/commands.h create mode 100644 src/gui/edgeitem.cpp create mode 100644 src/gui/edgeitem.h create mode 100644 src/gui/mainmenu.cpp create mode 100644 src/gui/mainmenu.h create mode 100644 src/gui/mainmenu.ui create mode 100644 src/gui/mainwindow.cpp create mode 100644 src/gui/mainwindow.h create mode 100644 src/gui/mainwindow.ui create mode 100644 src/gui/nodeitem.cpp create mode 100644 src/gui/nodeitem.h create mode 100644 src/gui/propertypalette.cpp create mode 100644 src/gui/propertypalette.h create mode 100644 src/gui/propertypalette.ui create mode 100644 src/gui/tikzscene.cpp create mode 100644 src/gui/tikzscene.h create mode 100644 src/gui/tikzview.cpp create mode 100644 src/gui/tikzview.h create mode 100644 src/gui/toolpalette.cpp create mode 100644 src/gui/toolpalette.h create mode 100644 src/gui/undocommands.cpp create mode 100644 src/gui/undocommands.h create mode 100644 src/main.cpp create mode 100644 src/test/testmain.cpp create mode 100644 src/test/testparser.cpp create mode 100644 src/test/testparser.h create mode 100644 src/test/testtest.cpp create mode 100644 src/test/testtest.h create mode 100644 src/test/testtikzoutput.cpp create mode 100644 src/test/testtikzoutput.h create mode 100644 src/tikzit.cpp create mode 100644 src/tikzit.h create mode 100644 src/util.cpp create mode 100644 src/util.h create mode 100755 target_wrapper.sh create mode 100644 tikzit.pro create mode 100644 tikzit.qrc delete mode 100644 tikzit/Makefile delete mode 100644 tikzit/README delete mode 100644 tikzit/bison.pri delete mode 100644 tikzit/flex.pri delete mode 100644 tikzit/images/AH_latex_head.png delete mode 100644 tikzit/images/AH_latex_tail.png delete mode 100644 tikzit/images/AH_none.png delete mode 100644 tikzit/images/AH_plain_head.png delete mode 100644 tikzit/images/AH_plain_tail.png delete mode 100644 tikzit/images/ED_arrow.png delete mode 100644 tikzit/images/ED_none.png delete mode 100644 tikzit/images/ED_tick.png delete mode 100644 tikzit/images/customshape.png delete mode 100644 tikzit/images/draw-ellipse.png delete mode 100644 tikzit/images/draw-path.png delete mode 100644 tikzit/images/emblem-important.png delete mode 100644 tikzit/images/emblem-unreadable-grey.png delete mode 100644 tikzit/images/engine.png delete mode 100644 tikzit/images/format-indent-less.png delete mode 100644 tikzit/images/preamble.png delete mode 100644 tikzit/images/select-rectangular.png delete mode 100644 tikzit/images/text-x-generic.png delete mode 100644 tikzit/images/text-x-script.png delete mode 100644 tikzit/images/tikzit48x48.png delete mode 100644 tikzit/images/transform-crop-and-resize.png delete mode 100644 tikzit/images/transform-move.png delete mode 100644 tikzit/images/updates.png delete mode 100644 tikzit/src/data/edge.cpp delete mode 100644 tikzit/src/data/edge.h delete mode 100644 tikzit/src/data/graph.cpp delete mode 100644 tikzit/src/data/graph.h delete mode 100644 tikzit/src/data/graphelementdata.cpp delete mode 100644 tikzit/src/data/graphelementdata.h delete mode 100644 tikzit/src/data/graphelementproperty.cpp delete mode 100644 tikzit/src/data/graphelementproperty.h delete mode 100644 tikzit/src/data/node.cpp delete mode 100644 tikzit/src/data/node.h delete mode 100644 tikzit/src/data/nodestyle.cpp delete mode 100644 tikzit/src/data/nodestyle.h delete mode 100644 tikzit/src/data/tikzdocument.cpp delete mode 100644 tikzit/src/data/tikzdocument.h delete mode 100644 tikzit/src/data/tikzgraphassembler.cpp delete mode 100644 tikzit/src/data/tikzgraphassembler.h delete mode 100644 tikzit/src/data/tikzlexer.l delete mode 100644 tikzit/src/data/tikzlexer.lexer.cpp delete mode 100644 tikzit/src/data/tikzparser.parser.cpp delete mode 100644 tikzit/src/data/tikzparser.parser.hpp delete mode 100644 tikzit/src/data/tikzparser.y delete mode 100644 tikzit/src/data/tikzparserdefs.h delete mode 100644 tikzit/src/gui/commands.cpp delete mode 100644 tikzit/src/gui/commands.h delete mode 100644 tikzit/src/gui/edgeitem.cpp delete mode 100644 tikzit/src/gui/edgeitem.h delete mode 100644 tikzit/src/gui/mainmenu.cpp delete mode 100644 tikzit/src/gui/mainmenu.h delete mode 100644 tikzit/src/gui/mainmenu.ui delete mode 100644 tikzit/src/gui/mainwindow.cpp delete mode 100644 tikzit/src/gui/mainwindow.h delete mode 100644 tikzit/src/gui/mainwindow.ui delete mode 100644 tikzit/src/gui/nodeitem.cpp delete mode 100644 tikzit/src/gui/nodeitem.h delete mode 100644 tikzit/src/gui/propertypalette.cpp delete mode 100644 tikzit/src/gui/propertypalette.h delete mode 100644 tikzit/src/gui/propertypalette.ui delete mode 100644 tikzit/src/gui/tikzscene.cpp delete mode 100644 tikzit/src/gui/tikzscene.h delete mode 100644 tikzit/src/gui/tikzview.cpp delete mode 100644 tikzit/src/gui/tikzview.h delete mode 100644 tikzit/src/gui/toolpalette.cpp delete mode 100644 tikzit/src/gui/toolpalette.h delete mode 100644 tikzit/src/gui/undocommands.cpp delete mode 100644 tikzit/src/gui/undocommands.h delete mode 100644 tikzit/src/main.cpp delete mode 100644 tikzit/src/test/testmain.cpp delete mode 100644 tikzit/src/test/testparser.cpp delete mode 100644 tikzit/src/test/testparser.h delete mode 100644 tikzit/src/test/testtest.cpp delete mode 100644 tikzit/src/test/testtest.h delete mode 100644 tikzit/src/test/testtikzoutput.cpp delete mode 100644 tikzit/src/test/testtikzoutput.h delete mode 100644 tikzit/src/tikzit.cpp delete mode 100644 tikzit/src/tikzit.h delete mode 100644 tikzit/src/util.cpp delete mode 100644 tikzit/src/util.h delete mode 100755 tikzit/target_wrapper.sh delete mode 100644 tikzit/tikzit.pro delete mode 100644 tikzit/tikzit.qrc delete mode 100644 tikzit/tikzlexer.h create mode 100644 tikzlexer.h diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..ff6108f --- /dev/null +++ b/Makefile @@ -0,0 +1,1139 @@ +############################################################################# +# Makefile for building: tikzit.app/Contents/MacOS/tikzit +# Generated by qmake (3.0) (Qt 5.7.1) +# Project: tikzit.pro +# Template: app +# Command: /usr/local/bin/qmake -o Makefile tikzit.pro +############################################################################# + +MAKEFILE = Makefile + +####### Compiler, tools and options + +CC = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang +CXX = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++ +DEFINES = -DQT_DEPRECATED_WARNINGS -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB +CFLAGS = -pipe -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -mmacosx-version-min=10.8 -O2 -Wall -W -fPIC $(DEFINES) +CXXFLAGS = -pipe -stdlib=libc++ -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -mmacosx-version-min=10.8 -O2 -std=gnu++11 -Wall -W -fPIC $(DEFINES) +INCPATH = -I. -Isrc -Isrc/gui -Isrc/data -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers -I. -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/OpenGL.framework/Headers -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/AGL.framework/Headers -I. -I/usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang -F/usr/local/Cellar/qt5/5.7.1_1/lib +QMAKE = /usr/local/bin/qmake +DEL_FILE = rm -f +CHK_DIR_EXISTS= test -d +MKDIR = mkdir -p +COPY = cp -f +COPY_FILE = cp -f +COPY_DIR = cp -f -R +INSTALL_FILE = install -m 644 -p +INSTALL_PROGRAM = install -m 755 -p +INSTALL_DIR = cp -f -R +DEL_FILE = rm -f +SYMLINK = ln -f -s +DEL_DIR = rmdir +MOVE = mv -f +TAR = tar -cf +COMPRESS = gzip -9f +DISTNAME = tikzit1.0.0 +DISTDIR = /Users/alek/git/tikzit/tikzit/.tmp/tikzit1.0.0 +LINK = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++ +LFLAGS = -headerpad_max_install_names -stdlib=libc++ -Wl,-syslibroot,/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -mmacosx-version-min=10.8 +LIBS = $(SUBLIBS) -F/usr/local/Cellar/qt5/5.7.1_1/lib -framework QtWidgets -framework QtGui -framework QtCore -framework DiskArbitration -framework IOKit -framework OpenGL -framework AGL +AR = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ar cq +RANLIB = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib -s +SED = sed +STRIP = strip + +####### Output directory + +OBJECTS_DIR = ./ + +####### Files + +SOURCES = src/gui/mainwindow.cpp \ + src/gui/toolpalette.cpp \ + src/gui/tikzscene.cpp \ + src/data/graph.cpp \ + src/data/node.cpp \ + src/data/edge.cpp \ + src/data/tikzgraphassembler.cpp \ + src/data/graphelementdata.cpp \ + src/data/graphelementproperty.cpp \ + src/gui/propertypalette.cpp \ + src/main.cpp src/data/tikzlexer.lexer.cpp \ + src/data/tikzparser.parser.cpp \ + qrc_tikzit.cpp \ + moc_mainwindow.cpp \ + moc_toolpalette.cpp \ + moc_graph.cpp \ + moc_node.cpp \ + moc_edge.cpp \ + moc_tikzgraphassembler.cpp \ + moc_graphelementdata.cpp \ + moc_propertypalette.cpp +OBJECTS = mainwindow.o \ + toolpalette.o \ + tikzscene.o \ + graph.o \ + node.o \ + edge.o \ + tikzgraphassembler.o \ + graphelementdata.o \ + graphelementproperty.o \ + propertypalette.o \ + main.o \ + tikzlexer.lexer.o \ + tikzparser.parser.o \ + qrc_tikzit.o \ + moc_mainwindow.o \ + moc_toolpalette.o \ + moc_graph.o \ + moc_node.o \ + moc_edge.o \ + moc_tikzgraphassembler.o \ + moc_graphelementdata.o \ + moc_propertypalette.o +DIST = /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/spec_pre.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/qdevice.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/device_config.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/unix.conf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/mac.conf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/macx.conf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/sanitize.conf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/gcc-base.conf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/gcc-base-mac.conf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/clang.conf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/clang-mac.conf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/qconfig.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dcore.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dcore_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dextras.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dextras_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dinput.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dinput_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dlogic.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dlogic_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquick.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquick_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickextras.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickextras_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickinput.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickinput_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickrender.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickrender_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3drender.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3drender_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_bluetooth.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_bluetooth_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_bootstrap_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_charts.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_charts_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_clucene_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_concurrent.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_concurrent_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_core.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_core_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_datavisualization.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_datavisualization_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_designer.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_designer_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_designercomponents_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gamepad.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gamepad_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gui.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gui_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_help.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_help_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_location.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_location_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_macextras.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_macextras_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimedia.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimedia_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimediawidgets.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimediawidgets_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_network.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_network_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_nfc.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_nfc_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_opengl.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_opengl_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_openglextensions.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_openglextensions_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_packetprotocol_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_platformsupport_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_positioning.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_positioning_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_printsupport.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_printsupport_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_purchasing.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_purchasing_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qml.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qml_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmldebug_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmldevtools_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmltest.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmltest_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quick.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quick_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickcontrols2.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickcontrols2_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickparticles_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quicktemplates2_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickwidgets.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickwidgets_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_script.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_script_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scripttools.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scripttools_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scxml.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scxml_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sensors.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sensors_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialbus.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialbus_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialport.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialport_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sql.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sql_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_svg.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_svg_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_testlib.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_testlib_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_uiplugin.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_uitools.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_uitools_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webchannel.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webchannel_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webengine.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webengine_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginecore.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginecore_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginecoreheaders_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginewidgets.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginewidgets_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_websockets.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_websockets_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webview.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webview_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_widgets.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_widgets_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xml.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xml_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xmlpatterns.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xmlpatterns_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/qt_functions.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/qt_config.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang/qmake.conf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/spec_post.prf \ + .qmake.stash \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/exclusive_builds.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/sdk.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/toolchain.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/toolchain.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/default_pre.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/default_pre.prf \ + flex.pri \ + bison.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/resolve_config.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/default_post.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/default_post.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/objective_c.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/resolve_target.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/testcase.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/warn_on.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/qt.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/resources.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/moc.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/unix/opengl.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/uic.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/unix/thread.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/file_copies.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/rez.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/asset_catalogs.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/testcase_targets.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/exceptions.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/yacc.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/lex.prf \ + tikzit.pro src/gui/mainwindow.h \ + src/gui/toolpalette.h \ + src/gui/tikzscene.h \ + src/data/graph.h \ + src/data/node.h \ + src/data/edge.h \ + src/data/tikzgraphassembler.h \ + src/data/graphelementdata.h \ + src/data/graphelementproperty.h \ + src/gui/propertypalette.h \ + src/data/tikzparserdefs.h src/gui/mainwindow.cpp \ + src/gui/toolpalette.cpp \ + src/gui/tikzscene.cpp \ + src/data/graph.cpp \ + src/data/node.cpp \ + src/data/edge.cpp \ + src/data/tikzgraphassembler.cpp \ + src/data/graphelementdata.cpp \ + src/data/graphelementproperty.cpp \ + src/gui/propertypalette.cpp \ + src/main.cpp +QMAKE_TARGET = tikzit +DESTDIR = +TARGET = tikzit.app/Contents/MacOS/tikzit + + +first: all +####### Build rules + +$(TARGET): src/data/tikzlexer.lexer.cpp src/data/tikzparser.parser.cpp src/data/tikzparser.parser.hpp ui_mainwindow.h ui_propertypalette.h $(OBJECTS) + @test -d tikzit.app/Contents/MacOS/ || mkdir -p tikzit.app/Contents/MacOS/ + $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) + +Makefile: tikzit.pro /usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang/qmake.conf /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/spec_pre.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/qdevice.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/device_config.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/unix.conf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/mac.conf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/macx.conf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/sanitize.conf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/gcc-base.conf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/gcc-base-mac.conf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/clang.conf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/clang-mac.conf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/qconfig.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dcore.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dcore_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dextras.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dextras_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dinput.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dinput_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dlogic.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dlogic_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquick.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquick_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickextras.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickextras_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickinput.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickinput_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickrender.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickrender_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3drender.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3drender_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_bluetooth.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_bluetooth_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_bootstrap_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_charts.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_charts_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_clucene_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_concurrent.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_concurrent_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_core.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_core_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_datavisualization.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_datavisualization_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_designer.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_designer_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_designercomponents_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gamepad.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gamepad_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gui.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gui_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_help.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_help_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_location.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_location_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_macextras.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_macextras_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimedia.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimedia_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimediawidgets.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimediawidgets_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_network.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_network_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_nfc.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_nfc_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_opengl.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_opengl_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_openglextensions.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_openglextensions_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_packetprotocol_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_platformsupport_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_positioning.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_positioning_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_printsupport.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_printsupport_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_purchasing.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_purchasing_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qml.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qml_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmldebug_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmldevtools_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmltest.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmltest_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quick.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quick_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickcontrols2.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickcontrols2_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickparticles_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quicktemplates2_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickwidgets.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickwidgets_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_script.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_script_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scripttools.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scripttools_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scxml.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scxml_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sensors.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sensors_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialbus.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialbus_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialport.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialport_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sql.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sql_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_svg.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_svg_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_testlib.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_testlib_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_uiplugin.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_uitools.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_uitools_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webchannel.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webchannel_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webengine.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webengine_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginecore.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginecore_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginecoreheaders_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginewidgets.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginewidgets_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_websockets.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_websockets_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webview.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webview_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_widgets.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_widgets_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xml.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xml_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xmlpatterns.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xmlpatterns_private.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/qt_functions.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/qt_config.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang/qmake.conf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/spec_post.prf \ + .qmake.stash \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/exclusive_builds.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/sdk.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/toolchain.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/toolchain.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/default_pre.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/default_pre.prf \ + flex.pri \ + bison.pri \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/resolve_config.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/default_post.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/default_post.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/objective_c.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/resolve_target.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/testcase.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/warn_on.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/qt.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/resources.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/moc.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/unix/opengl.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/uic.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/unix/thread.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/file_copies.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/rez.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/asset_catalogs.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/testcase_targets.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/exceptions.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/yacc.prf \ + /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/lex.prf \ + tikzit.pro \ + tikzit.qrc \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/QtWidgets.prl \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/QtGui.prl \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/QtCore.prl + $(QMAKE) -o Makefile tikzit.pro +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/spec_pre.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/qdevice.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/device_config.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/unix.conf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/mac.conf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/macx.conf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/sanitize.conf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/gcc-base.conf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/gcc-base-mac.conf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/clang.conf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/clang-mac.conf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/qconfig.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dcore.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dcore_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dextras.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dextras_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dinput.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dinput_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dlogic.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dlogic_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquick.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquick_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickextras.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickextras_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickinput.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickinput_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickrender.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickrender_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3drender.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3drender_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_bluetooth.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_bluetooth_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_bootstrap_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_charts.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_charts_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_clucene_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_concurrent.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_concurrent_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_core.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_core_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_datavisualization.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_datavisualization_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_designer.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_designer_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_designercomponents_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gamepad.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gamepad_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gui.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gui_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_help.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_help_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_location.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_location_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_macextras.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_macextras_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimedia.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimedia_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimediawidgets.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimediawidgets_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_network.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_network_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_nfc.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_nfc_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_opengl.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_opengl_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_openglextensions.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_openglextensions_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_packetprotocol_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_platformsupport_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_positioning.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_positioning_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_printsupport.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_printsupport_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_purchasing.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_purchasing_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qml.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qml_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmldebug_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmldevtools_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmltest.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmltest_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quick.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quick_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickcontrols2.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickcontrols2_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickparticles_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quicktemplates2_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickwidgets.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickwidgets_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_script.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_script_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scripttools.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scripttools_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scxml.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scxml_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sensors.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sensors_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialbus.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialbus_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialport.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialport_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sql.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sql_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_svg.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_svg_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_testlib.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_testlib_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_uiplugin.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_uitools.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_uitools_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webchannel.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webchannel_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webengine.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webengine_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginecore.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginecore_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginecoreheaders_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginewidgets.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginewidgets_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_websockets.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_websockets_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webview.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webview_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_widgets.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_widgets_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xml.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xml_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xmlpatterns.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xmlpatterns_private.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/qt_functions.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/qt_config.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang/qmake.conf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/spec_post.prf: +.qmake.stash: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/exclusive_builds.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/sdk.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/toolchain.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/toolchain.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/default_pre.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/default_pre.prf: +flex.pri: +bison.pri: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/resolve_config.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/default_post.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/default_post.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/objective_c.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/resolve_target.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/testcase.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/warn_on.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/qt.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/resources.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/moc.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/unix/opengl.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/uic.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/unix/thread.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/file_copies.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/rez.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/asset_catalogs.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/testcase_targets.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/exceptions.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/yacc.prf: +/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/lex.prf: +tikzit.pro: +tikzit.qrc: +/usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/QtWidgets.prl: +/usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/QtGui.prl: +/usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/QtCore.prl: +qmake: FORCE + @$(QMAKE) -o Makefile tikzit.pro + +qmake_all: FORCE + +tikzit.app/Contents/PkgInfo: + @test -d tikzit.app/Contents || mkdir -p tikzit.app/Contents + @$(DEL_FILE) tikzit.app/Contents/PkgInfo + @echo "APPL????" > tikzit.app/Contents/PkgInfo +tikzit.app/Contents/Resources/empty.lproj: + @test -d tikzit.app/Contents/Resources || mkdir -p tikzit.app/Contents/Resources + @touch tikzit.app/Contents/Resources/empty.lproj + +tikzit.app/Contents/Info.plist: + @test -d tikzit.app/Contents || mkdir -p tikzit.app/Contents + @$(DEL_FILE) tikzit.app/Contents/Info.plist + @sed -e "s,@SHORT_VERSION@,1.0,g" -e "s,@FULL_VERSION@,1.0.0,g" -e "s,@TYPEINFO@,????,g" -e "s,@BUNDLEIDENTIFIER@,com.yourcompany.tikzit,g" -e "s,@ICON@,,g" -e "s,@EXECUTABLE@,tikzit,g" -e "s,@LIBRARY@,tikzit,g" -e "s,@TYPEINFO@,????,g" /usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang/Info.plist.app >tikzit.app/Contents/Info.plist + +all: Makefile \ + tikzit.app/Contents/PkgInfo \ + tikzit.app/Contents/Resources/empty.lproj \ + tikzit.app/Contents/Info.plist $(TARGET) + +dist: distdir FORCE + (cd `dirname $(DISTDIR)` && $(TAR) $(DISTNAME).tar $(DISTNAME) && $(COMPRESS) $(DISTNAME).tar) && $(MOVE) `dirname $(DISTDIR)`/$(DISTNAME).tar.gz . && $(DEL_FILE) -r $(DISTDIR) + +distdir: FORCE + @test -d $(DISTDIR) || mkdir -p $(DISTDIR) + $(COPY_FILE) --parents $(DIST) $(DISTDIR)/ + $(COPY_FILE) --parents src/data/tikzlexer.l $(DISTDIR)/ + $(COPY_FILE) --parents src/data/tikzparser.y $(DISTDIR)/ + $(COPY_FILE) --parents src/data/tikzparser.y $(DISTDIR)/ + $(COPY_FILE) --parents tikzit.qrc $(DISTDIR)/ + $(COPY_FILE) --parents src/gui/mainwindow.h src/gui/toolpalette.h src/gui/tikzscene.h src/data/graph.h src/data/node.h src/data/edge.h src/data/tikzgraphassembler.h src/data/graphelementdata.h src/data/graphelementproperty.h src/gui/propertypalette.h src/data/tikzparserdefs.h $(DISTDIR)/ + $(COPY_FILE) --parents src/gui/mainwindow.cpp src/gui/toolpalette.cpp src/gui/tikzscene.cpp src/data/graph.cpp src/data/node.cpp src/data/edge.cpp src/data/tikzgraphassembler.cpp src/data/graphelementdata.cpp src/data/graphelementproperty.cpp src/gui/propertypalette.cpp src/main.cpp $(DISTDIR)/ + $(COPY_FILE) --parents src/gui/mainwindow.ui src/gui/propertypalette.ui $(DISTDIR)/ + + +clean: compiler_clean + -$(DEL_FILE) $(OBJECTS) + -$(DEL_FILE) *~ core *.core + + +distclean: clean + -$(DEL_FILE) -r tikzit.app + -$(DEL_FILE) /Users/alek/git/tikzit/tikzit/target_wrapper.sh .qmake.stash + -$(DEL_FILE) Makefile + + +####### Sub-libraries + +check: first + /Users/alek/git/tikzit/tikzit/target_wrapper.sh $(TESTRUNNER) ./$(QMAKE_TARGET).app/Contents/MacOS/$(QMAKE_TARGET) $(TESTARGS) + +mocclean: compiler_moc_header_clean compiler_moc_source_clean + +mocables: compiler_moc_header_make_all compiler_moc_source_make_all + +benchmark: first + +compiler_flex_make_all: src/data/tikzlexer.lexer.cpp +compiler_flex_clean: + -$(DEL_FILE) src/data/tikzlexer.lexer.cpp +src/data/tikzlexer.lexer.cpp: src/data/tikzlexer.l + flex --header-file -o src/data/tikzlexer.lexer.cpp src/data/tikzlexer.l + +compiler_bison_make_all: src/data/tikzparser.parser.cpp +compiler_bison_clean: + -$(DEL_FILE) src/data/tikzparser.parser.cpp +src/data/tikzparser.parser.cpp: src/data/tikzparser.y + bison -d -o src/data/tikzparser.parser.cpp src/data/tikzparser.y + +compiler_bison_header_make_all: src/data/tikzparser.parser.hpp +compiler_bison_header_clean: + -$(DEL_FILE) src/data/tikzparser.parser.hpp +src/data/tikzparser.parser.hpp: src/data/tikzparser.y + bison -d -o src/data/tikzparser.parser.cpp src/data/tikzparser.y + +compiler_rcc_make_all: qrc_tikzit.cpp +compiler_rcc_clean: + -$(DEL_FILE) qrc_tikzit.cpp +qrc_tikzit.cpp: tikzit.qrc \ + /usr/local/Cellar/qt5/5.7.1_1/bin/rcc \ + images/draw-ellipse.png \ + images/transform-crop-and-resize.png \ + images/draw-path.png \ + images/select-rectangular.png + /usr/local/Cellar/qt5/5.7.1_1/bin/rcc -name tikzit tikzit.qrc -o qrc_tikzit.cpp + +compiler_moc_header_make_all: moc_mainwindow.cpp moc_toolpalette.cpp moc_graph.cpp moc_node.cpp moc_edge.cpp moc_tikzgraphassembler.cpp moc_graphelementdata.cpp moc_propertypalette.cpp +compiler_moc_header_clean: + -$(DEL_FILE) moc_mainwindow.cpp moc_toolpalette.cpp moc_graph.cpp moc_node.cpp moc_edge.cpp moc_tikzgraphassembler.cpp moc_graphelementdata.cpp moc_propertypalette.cpp +moc_mainwindow.cpp: src/gui/tikzscene.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QWidget \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qwidget.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QGraphicsScene \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qgraphicsscene.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QMainWindow \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qmainwindow.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QGraphicsView \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qgraphicsview.h \ + src/gui/mainwindow.h \ + /usr/local/Cellar/qt5/5.7.1_1/bin/moc + /usr/local/Cellar/qt5/5.7.1_1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -D__APPLE_CC__ -I/usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang -I/Users/alek/git/tikzit/tikzit -I/Users/alek/git/tikzit/tikzit/src -I/Users/alek/git/tikzit/tikzit/src/gui -I/Users/alek/git/tikzit/tikzit/src/data -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/8.0.0/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include -F/usr/local/Cellar/qt5/5.7.1_1/lib src/gui/mainwindow.h -o moc_mainwindow.cpp + +moc_toolpalette.cpp: /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QToolBar \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qtoolbar.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QAction \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qaction.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QActionGroup \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qactiongroup.h \ + src/gui/toolpalette.h \ + /usr/local/Cellar/qt5/5.7.1_1/bin/moc + /usr/local/Cellar/qt5/5.7.1_1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -D__APPLE_CC__ -I/usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang -I/Users/alek/git/tikzit/tikzit -I/Users/alek/git/tikzit/tikzit/src -I/Users/alek/git/tikzit/tikzit/src/gui -I/Users/alek/git/tikzit/tikzit/src/data -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/8.0.0/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include -F/usr/local/Cellar/qt5/5.7.1_1/lib src/gui/toolpalette.h -o moc_toolpalette.cpp + +moc_graph.cpp: src/data/node.h \ + src/data/graphelementdata.h \ + src/data/graphelementproperty.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QPointF \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qpoint.h \ + src/data/edge.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QMultiHash \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qhash.h \ + src/data/graph.h \ + /usr/local/Cellar/qt5/5.7.1_1/bin/moc + /usr/local/Cellar/qt5/5.7.1_1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -D__APPLE_CC__ -I/usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang -I/Users/alek/git/tikzit/tikzit -I/Users/alek/git/tikzit/tikzit/src -I/Users/alek/git/tikzit/tikzit/src/gui -I/Users/alek/git/tikzit/tikzit/src/data -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/8.0.0/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include -F/usr/local/Cellar/qt5/5.7.1_1/lib src/data/graph.h -o moc_graph.cpp + +moc_node.cpp: src/data/graphelementdata.h \ + src/data/graphelementproperty.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QPointF \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qpoint.h \ + src/data/node.h \ + /usr/local/Cellar/qt5/5.7.1_1/bin/moc + /usr/local/Cellar/qt5/5.7.1_1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -D__APPLE_CC__ -I/usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang -I/Users/alek/git/tikzit/tikzit -I/Users/alek/git/tikzit/tikzit/src -I/Users/alek/git/tikzit/tikzit/src/gui -I/Users/alek/git/tikzit/tikzit/src/data -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/8.0.0/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include -F/usr/local/Cellar/qt5/5.7.1_1/lib src/data/node.h -o moc_node.cpp + +moc_edge.cpp: src/data/graphelementdata.h \ + src/data/graphelementproperty.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ + src/data/edge.h \ + /usr/local/Cellar/qt5/5.7.1_1/bin/moc + /usr/local/Cellar/qt5/5.7.1_1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -D__APPLE_CC__ -I/usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang -I/Users/alek/git/tikzit/tikzit -I/Users/alek/git/tikzit/tikzit/src -I/Users/alek/git/tikzit/tikzit/src/gui -I/Users/alek/git/tikzit/tikzit/src/data -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/8.0.0/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include -F/usr/local/Cellar/qt5/5.7.1_1/lib src/data/edge.h -o moc_edge.cpp + +moc_tikzgraphassembler.cpp: src/data/node.h \ + src/data/graphelementdata.h \ + src/data/graphelementproperty.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QPointF \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qpoint.h \ + src/data/graph.h \ + src/data/edge.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QMultiHash \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qhash.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QHash \ + src/data/tikzgraphassembler.h \ + /usr/local/Cellar/qt5/5.7.1_1/bin/moc + /usr/local/Cellar/qt5/5.7.1_1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -D__APPLE_CC__ -I/usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang -I/Users/alek/git/tikzit/tikzit -I/Users/alek/git/tikzit/tikzit/src -I/Users/alek/git/tikzit/tikzit/src/gui -I/Users/alek/git/tikzit/tikzit/src/data -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/8.0.0/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include -F/usr/local/Cellar/qt5/5.7.1_1/lib src/data/tikzgraphassembler.h -o moc_tikzgraphassembler.cpp + +moc_graphelementdata.cpp: src/data/graphelementproperty.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ + src/data/graphelementdata.h \ + /usr/local/Cellar/qt5/5.7.1_1/bin/moc + /usr/local/Cellar/qt5/5.7.1_1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -D__APPLE_CC__ -I/usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang -I/Users/alek/git/tikzit/tikzit -I/Users/alek/git/tikzit/tikzit/src -I/Users/alek/git/tikzit/tikzit/src/gui -I/Users/alek/git/tikzit/tikzit/src/data -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/8.0.0/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include -F/usr/local/Cellar/qt5/5.7.1_1/lib src/data/graphelementdata.h -o moc_graphelementdata.cpp + +moc_propertypalette.cpp: /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QDockWidget \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qdockwidget.h \ + src/gui/propertypalette.h \ + /usr/local/Cellar/qt5/5.7.1_1/bin/moc + /usr/local/Cellar/qt5/5.7.1_1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -D__APPLE_CC__ -I/usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang -I/Users/alek/git/tikzit/tikzit -I/Users/alek/git/tikzit/tikzit/src -I/Users/alek/git/tikzit/tikzit/src/gui -I/Users/alek/git/tikzit/tikzit/src/data -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/8.0.0/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include -F/usr/local/Cellar/qt5/5.7.1_1/lib src/gui/propertypalette.h -o moc_propertypalette.cpp + +compiler_moc_source_make_all: +compiler_moc_source_clean: +compiler_uic_make_all: ui_mainwindow.h ui_propertypalette.h +compiler_uic_clean: + -$(DEL_FILE) ui_mainwindow.h ui_propertypalette.h +ui_mainwindow.h: src/gui/mainwindow.ui \ + /usr/local/Cellar/qt5/5.7.1_1/bin/uic + /usr/local/Cellar/qt5/5.7.1_1/bin/uic src/gui/mainwindow.ui -o ui_mainwindow.h + +ui_propertypalette.h: src/gui/propertypalette.ui \ + /usr/local/Cellar/qt5/5.7.1_1/bin/uic + /usr/local/Cellar/qt5/5.7.1_1/bin/uic src/gui/propertypalette.ui -o ui_propertypalette.h + +compiler_rez_source_make_all: +compiler_rez_source_clean: +compiler_yacc_decl_make_all: +compiler_yacc_decl_clean: +compiler_yacc_impl_make_all: +compiler_yacc_impl_clean: +compiler_lex_make_all: +compiler_lex_clean: +compiler_clean: compiler_flex_clean compiler_bison_clean compiler_bison_header_clean compiler_rcc_clean compiler_moc_header_clean compiler_uic_clean + +####### Compile + +mainwindow.o: src/gui/mainwindow.cpp src/gui/mainwindow.h \ + src/gui/tikzscene.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QWidget \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qwidget.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QGraphicsScene \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qgraphicsscene.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QMainWindow \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qmainwindow.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QGraphicsView \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qgraphicsview.h \ + ui_mainwindow.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QDebug \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qdebug.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o mainwindow.o src/gui/mainwindow.cpp + +toolpalette.o: src/gui/toolpalette.cpp src/gui/toolpalette.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QToolBar \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qtoolbar.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QAction \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qaction.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QActionGroup \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qactiongroup.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QLayout \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qlayout.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QVBoxLayout \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qboxlayout.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o toolpalette.o src/gui/toolpalette.cpp + +tikzscene.o: src/gui/tikzscene.cpp src/gui/tikzscene.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QWidget \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qwidget.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QGraphicsScene \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qgraphicsscene.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o tikzscene.o src/gui/tikzscene.cpp + +graph.o: src/data/graph.cpp src/data/graph.h \ + src/data/node.h \ + src/data/graphelementdata.h \ + src/data/graphelementproperty.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QPointF \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qpoint.h \ + src/data/edge.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QMultiHash \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qhash.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o graph.o src/data/graph.cpp + +node.o: src/data/node.cpp src/data/node.h \ + src/data/graphelementdata.h \ + src/data/graphelementproperty.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QPointF \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qpoint.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QDebug \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qdebug.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o node.o src/data/node.cpp + +edge.o: src/data/edge.cpp src/data/edge.h \ + src/data/graphelementdata.h \ + src/data/graphelementproperty.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o edge.o src/data/edge.cpp + +tikzgraphassembler.o: src/data/tikzgraphassembler.cpp src/data/tikzgraphassembler.h \ + src/data/node.h \ + src/data/graphelementdata.h \ + src/data/graphelementproperty.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QPointF \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qpoint.h \ + src/data/graph.h \ + src/data/edge.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QMultiHash \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qhash.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QHash + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o tikzgraphassembler.o src/data/tikzgraphassembler.cpp + +graphelementdata.o: src/data/graphelementdata.cpp src/data/graphelementdata.h \ + src/data/graphelementproperty.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QDebug \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qdebug.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o graphelementdata.o src/data/graphelementdata.cpp + +graphelementproperty.o: src/data/graphelementproperty.cpp src/data/graphelementproperty.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o graphelementproperty.o src/data/graphelementproperty.cpp + +propertypalette.o: src/gui/propertypalette.cpp src/gui/propertypalette.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QDockWidget \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qdockwidget.h \ + src/data/graphelementdata.h \ + src/data/graphelementproperty.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ + ui_propertypalette.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QDebug \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qdebug.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers/QCloseEvent \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers/qevent.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QSettings \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qsettings.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o propertypalette.o src/gui/propertypalette.cpp + +main.o: src/main.cpp src/gui/mainwindow.h \ + src/gui/tikzscene.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QWidget \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qwidget.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QGraphicsScene \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qgraphicsscene.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QMainWindow \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qmainwindow.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QGraphicsView \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qgraphicsview.h \ + src/gui/toolpalette.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QToolBar \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qtoolbar.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QAction \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qaction.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QActionGroup \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qactiongroup.h \ + src/gui/propertypalette.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QDockWidget \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qdockwidget.h \ + src/data/graph.h \ + src/data/node.h \ + src/data/graphelementdata.h \ + src/data/graphelementproperty.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QPointF \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qpoint.h \ + src/data/edge.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QMultiHash \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qhash.h \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QApplication \ + /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qapplication.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o src/main.cpp + +tikzlexer.lexer.o: src/data/tikzlexer.lexer.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o tikzlexer.lexer.o src/data/tikzlexer.lexer.cpp + +tikzparser.parser.o: src/data/tikzparser.parser.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o tikzparser.parser.o src/data/tikzparser.parser.cpp + +qrc_tikzit.o: qrc_tikzit.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o qrc_tikzit.o qrc_tikzit.cpp + +moc_mainwindow.o: moc_mainwindow.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_mainwindow.o moc_mainwindow.cpp + +moc_toolpalette.o: moc_toolpalette.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_toolpalette.o moc_toolpalette.cpp + +moc_graph.o: moc_graph.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_graph.o moc_graph.cpp + +moc_node.o: moc_node.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_node.o moc_node.cpp + +moc_edge.o: moc_edge.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_edge.o moc_edge.cpp + +moc_tikzgraphassembler.o: moc_tikzgraphassembler.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_tikzgraphassembler.o moc_tikzgraphassembler.cpp + +moc_graphelementdata.o: moc_graphelementdata.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_graphelementdata.o moc_graphelementdata.cpp + +moc_propertypalette.o: moc_propertypalette.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_propertypalette.o moc_propertypalette.cpp + +####### Install + +install_target: first FORCE + @test -d $(INSTALL_ROOT)/usr/local/Cellar/qt5/5.7.1_1/tests/tikzit || mkdir -p $(INSTALL_ROOT)/usr/local/Cellar/qt5/5.7.1_1/tests/tikzit + $(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/Cellar/qt5/5.7.1_1/tests/tikzit/tikzit.app + + -$(INSTALL_DIR) tikzit.app $(INSTALL_ROOT)/usr/local/Cellar/qt5/5.7.1_1/tests/tikzit/tikzit.app + -$(STRIP) $(INSTALL_ROOT)/usr/local/Cellar/qt5/5.7.1_1/tests/tikzit/tikzit.app/Contents/MacOS/$(QMAKE_TARGET) + +uninstall_target: FORCE + -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/Cellar/qt5/5.7.1_1/tests/tikzit/tikzit.app + -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/Cellar/qt5/5.7.1_1/tests/tikzit/ + + +install: install_target FORCE + +uninstall: uninstall_target FORCE + +FORCE: + diff --git a/README b/README new file mode 100644 index 0000000..ecd6713 --- /dev/null +++ b/README @@ -0,0 +1,12 @@ +Building on OSX: + +You'll need QT5 and poppler with QT5 bindings. QT5 can be installed with Homebrew: + +$ brew install qt5 + +whereas poppler should be built from source to get the QT5 bindings. To compile, clang needs to have C++11 features enabled. I built using: + +$ CXXFLAGS="-std=c++11" ./configure +$ CXXFLAGS="-std=c++11" make + + diff --git a/bison.pri b/bison.pri new file mode 100644 index 0000000..3fcfc36 --- /dev/null +++ b/bison.pri @@ -0,0 +1,14 @@ +bison.name = Bison ${QMAKE_FILE_IN} +bison.input = BISONSOURCES +bison.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.parser.cpp +bison.commands = bison -d -o ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.parser.cpp ${QMAKE_FILE_IN} +bison.CONFIG += target_predeps +bison.variable_out = GENERATED_SOURCES +silent:bison.commands = @echo Bison ${QMAKE_FILE_IN} && $$bison.commands +QMAKE_EXTRA_COMPILERS += bison +bison_header.input = BISONSOURCES +bison_header.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.parser.hpp +bison_header.commands = bison -d -o ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.parser.cpp ${QMAKE_FILE_IN} +bison_header.CONFIG += target_predeps no_link +silent:bison_header.commands = @echo Bison ${QMAKE_FILE_IN} && $$bison.commands +QMAKE_EXTRA_COMPILERS += bison_header diff --git a/flex.pri b/flex.pri new file mode 100644 index 0000000..6a42c0f --- /dev/null +++ b/flex.pri @@ -0,0 +1,8 @@ +flex.name = Flex ${QMAKE_FILE_IN} +flex.input = FLEXSOURCES +flex.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.lexer.cpp +flex.commands = flex --header-file -o ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.lexer.cpp ${QMAKE_FILE_IN} +flex.CONFIG += target_predeps +flex.variable_out = GENERATED_SOURCES +silent:flex.commands = @echo Lex ${QMAKE_FILE_IN} && $$flex.commands +QMAKE_EXTRA_COMPILERS += flex diff --git a/images/AH_latex_head.png b/images/AH_latex_head.png new file mode 100644 index 0000000..b25cf6d Binary files /dev/null and b/images/AH_latex_head.png differ diff --git a/images/AH_latex_tail.png b/images/AH_latex_tail.png new file mode 100644 index 0000000..0825cda Binary files /dev/null and b/images/AH_latex_tail.png differ diff --git a/images/AH_none.png b/images/AH_none.png new file mode 100644 index 0000000..6322374 Binary files /dev/null and b/images/AH_none.png differ diff --git a/images/AH_plain_head.png b/images/AH_plain_head.png new file mode 100644 index 0000000..8a398fa Binary files /dev/null and b/images/AH_plain_head.png differ diff --git a/images/AH_plain_tail.png b/images/AH_plain_tail.png new file mode 100644 index 0000000..45b1876 Binary files /dev/null and b/images/AH_plain_tail.png differ diff --git a/images/ED_arrow.png b/images/ED_arrow.png new file mode 100644 index 0000000..153d2e1 Binary files /dev/null and b/images/ED_arrow.png differ diff --git a/images/ED_none.png b/images/ED_none.png new file mode 100644 index 0000000..f95140c Binary files /dev/null and b/images/ED_none.png differ diff --git a/images/ED_tick.png b/images/ED_tick.png new file mode 100644 index 0000000..a3882fe Binary files /dev/null and b/images/ED_tick.png differ diff --git a/images/customshape.png b/images/customshape.png new file mode 100644 index 0000000..cff8275 Binary files /dev/null and b/images/customshape.png differ diff --git a/images/draw-ellipse.png b/images/draw-ellipse.png new file mode 100644 index 0000000..d8e3e6f Binary files /dev/null and b/images/draw-ellipse.png differ diff --git a/images/draw-path.png b/images/draw-path.png new file mode 100644 index 0000000..ec5e691 Binary files /dev/null and b/images/draw-path.png differ diff --git a/images/emblem-important.png b/images/emblem-important.png new file mode 100644 index 0000000..81e9ed2 Binary files /dev/null and b/images/emblem-important.png differ diff --git a/images/emblem-unreadable-grey.png b/images/emblem-unreadable-grey.png new file mode 100644 index 0000000..09572ab Binary files /dev/null and b/images/emblem-unreadable-grey.png differ diff --git a/images/engine.png b/images/engine.png new file mode 100644 index 0000000..1e45370 Binary files /dev/null and b/images/engine.png differ diff --git a/images/format-indent-less.png b/images/format-indent-less.png new file mode 100644 index 0000000..7ced16f Binary files /dev/null and b/images/format-indent-less.png differ diff --git a/images/preamble.png b/images/preamble.png new file mode 100644 index 0000000..d940d24 Binary files /dev/null and b/images/preamble.png differ diff --git a/images/select-rectangular.png b/images/select-rectangular.png new file mode 100644 index 0000000..866b602 Binary files /dev/null and b/images/select-rectangular.png differ diff --git a/images/text-x-generic.png b/images/text-x-generic.png new file mode 100644 index 0000000..928a679 Binary files /dev/null and b/images/text-x-generic.png differ diff --git a/images/text-x-script.png b/images/text-x-script.png new file mode 100644 index 0000000..801dcd6 Binary files /dev/null and b/images/text-x-script.png differ diff --git a/images/tikzit48x48.png b/images/tikzit48x48.png new file mode 100644 index 0000000..056d04b Binary files /dev/null and b/images/tikzit48x48.png differ diff --git a/images/transform-crop-and-resize.png b/images/transform-crop-and-resize.png new file mode 100644 index 0000000..4dedd93 Binary files /dev/null and b/images/transform-crop-and-resize.png differ diff --git a/images/transform-move.png b/images/transform-move.png new file mode 100644 index 0000000..ae4201b Binary files /dev/null and b/images/transform-move.png differ diff --git a/images/updates.png b/images/updates.png new file mode 100644 index 0000000..469ae30 Binary files /dev/null and b/images/updates.png differ diff --git a/src/data/edge.cpp b/src/data/edge.cpp new file mode 100644 index 0000000..6802b2d --- /dev/null +++ b/src/data/edge.cpp @@ -0,0 +1,306 @@ +#include "edge.h" +#include "tikzit.h" +#include "util.h" + +#include +#include + +Edge::Edge(Node *s, Node *t, QObject *parent) : + QObject(parent), _source(s), _target(t) +{ + _data = new GraphElementData(); + _edgeNode = 0; + _dirty = true; + _basicBendMode = true; + _bend = 0; + _inAngle = 0; + _outAngle = 0; + _weight = 0.4f; + updateControls(); +} + +Edge::~Edge() +{ + delete _data; + delete _edgeNode; +} + +Node *Edge::source() const +{ + return _source; +} + +Node *Edge::target() const +{ + return _target; +} + +bool Edge::isSelfLoop() +{ + return (_source == _target); +} + +bool Edge::isStraight() +{ + return (_basicBendMode && _bend == 0); +} + +GraphElementData *Edge::data() const +{ + return _data; +} + +void Edge::setData(GraphElementData *data) +{ + delete _data; + _data = data; + setAttributesFromData(); +} + +QString Edge::sourceAnchor() const +{ + return _sourceAnchor; +} + +void Edge::setSourceAnchor(const QString &sourceAnchor) +{ + _sourceAnchor = sourceAnchor; +} + +QString Edge::targetAnchor() const +{ + return _targetAnchor; +} + +void Edge::setTargetAnchor(const QString &targetAnchor) +{ + _targetAnchor = targetAnchor; +} + +Node *Edge::edgeNode() const +{ + return _edgeNode; +} + +void Edge::setEdgeNode(Node *edgeNode) +{ + if (_edgeNode != 0) delete _edgeNode; + _edgeNode = edgeNode; +} + +bool Edge::hasEdgeNode() +{ + return _edgeNode != 0; +} + +void Edge::updateControls() { + //if (_dirty) { + QPointF src = _source->point(); + QPointF targ = _target->point(); + + float dx = (targ.x() - src.x()); + float dy = (targ.y() - src.y()); + + float outAngleR = 0.0f; + float inAngleR = 0.0f; + + if (_basicBendMode) { + float angle = std::atan2(dy, dx); + float bnd = (float)_bend * (M_PI / 180.0f); + outAngleR = angle - bnd; + inAngleR = M_PI + angle + bnd; + _outAngle = outAngleR * (180.f / M_PI); + _inAngle = inAngleR * (180.f / M_PI); + } else { + outAngleR = (float)_outAngle * (M_PI / 180.0f); + inAngleR = (float)_inAngle * (M_PI / 180.0f); + } + + // TODO: calculate head and tail properly, not just for circles + if (_source->style()->isNone()) { + _tail = src; + } else { + _tail = QPointF(src.x() + std::cos(outAngleR) * 0.1, + src.y() + std::sin(outAngleR) * 0.1); + } + + if (_target->style()->isNone()) { + _head = targ; + } else { + _head = QPointF(targ.x() + std::cos(inAngleR) * 0.1, + targ.y() + std::sin(inAngleR) * 0.1); + } + + // give a default distance for self-loops + _cpDist = (dx==0.0f && dy==0.0f) ? _weight : std::sqrt(dx*dx + dy*dy) * _weight; + + _cp1 = QPointF(src.x() + (_cpDist * std::cos(outAngleR)), + src.y() + (_cpDist * std::sin(outAngleR))); + + _cp2 = QPointF(targ.x() + (_cpDist * std::cos(inAngleR)), + targ.y() + (_cpDist * std::sin(inAngleR))); + + _mid = bezierInterpolateFull (0.5f, _tail, _cp1, _cp2, _head); +// midTan = [self _findTanFor:mid usingSpanFrom:0.4f to:0.6f]; + +// tailTan = [self _findTanFor:tail usingSpanFrom:0.0f to:0.1f]; +// headTan = [self _findTanFor:head usingSpanFrom:1.0f to:0.9f]; + //_dirty = false; + //} +} + +void Edge::setAttributesFromData() +{ + _basicBendMode = true; + bool ok = true; + + if (_data->atom("bend left")) { + _bend = -30; + } else if (_data->atom("bend right")) { + _bend = 30; + } else if (_data->property("bend left") != 0) { + _bend = -_data->property("bend left").toInt(&ok); + if (!ok) _bend = -30; + } else if (_data->property("bend right") != 0) { + _bend = _data->property("bend right").toInt(&ok); + if (!ok) _bend = 30; + } else { + _bend = 0; + + if (_data->property("in") != 0 && _data->property("out") != 0) { + _basicBendMode = false; + _inAngle = _data->property("in").toInt(&ok); + if (!ok) _inAngle = 0; + _outAngle = _data->property("out").toInt(&ok); + if (!ok) _outAngle = 180; + } + } + + if (_data->property("looseness") != 0) { + _weight = _data->property("looseness").toFloat(&ok) / 2.5f; + if (!ok) _weight = 0.4f; + } else { + _weight = (isSelfLoop()) ? 1.0f : 0.4f; + } + + //qDebug() << "bend: " << _bend << " in: " << _inAngle << " out: " << _outAngle; + _dirty = true; +} + +void Edge::updateData() +{ + _data->unsetAtom("loop"); + _data->unsetProperty("in"); + _data->unsetProperty("out"); + _data->unsetAtom("bend left"); + _data->unsetAtom("bend right"); + _data->unsetProperty("bend left"); + _data->unsetProperty("bend right"); + _data->unsetProperty("looseness"); + + // TODO: style handling? + + if (_basicBendMode && _bend != 0) { + QString bendKey; + int b; + if (_bend < 0) { + bendKey = "bend left"; + b = -_bend; + } else { + bendKey = "bend right"; + b = _bend; + } + + if (b == 30) { + _data->setAtom(bendKey); + } else { + _data->setProperty(bendKey, QString::number(b)); + } + } else { + _data->setProperty("in", QString::number(_inAngle)); + _data->setProperty("out", QString::number(_outAngle)); + } + + if (_source == _target) _data->setAtom("loop"); + if (!isSelfLoop() && !isStraight() && _weight != 0.4f) + _data->setProperty("looseness", QString::number(_weight*2.5f, 'f', 2)); + +} + + +QPointF Edge::head() const +{ + return _head; +} + +QPointF Edge::tail() const +{ + return _tail; +} + +QPointF Edge::cp1() const +{ + return _cp1; +} + +QPointF Edge::cp2() const +{ + return _cp2; +} + +int Edge::bend() const +{ + return _bend; +} + +int Edge::inAngle() const +{ + return _inAngle; +} + +int Edge::outAngle() const +{ + return _outAngle; +} + +float Edge::weight() const +{ + return _weight; +} + +bool Edge::basicBendMode() const +{ + return _basicBendMode; +} + +float Edge::cpDist() const +{ + return _cpDist; +} + +void Edge::setBend(int bend) +{ + _bend = bend; +} + +void Edge::setInAngle(int inAngle) +{ + _inAngle = inAngle; +} + +void Edge::setOutAngle(int outAngle) +{ + _outAngle = outAngle; +} + +void Edge::setWeight(float weight) +{ + _weight = weight; +} + +QPointF Edge::mid() const +{ + return _mid; +} + + diff --git a/src/data/edge.h b/src/data/edge.h new file mode 100644 index 0000000..d2913b8 --- /dev/null +++ b/src/data/edge.h @@ -0,0 +1,89 @@ +#ifndef EDGE_H +#define EDGE_H + +#include "graphelementdata.h" +#include "node.h" + +#include +#include + +class Edge : public QObject +{ + Q_OBJECT +public: + explicit Edge(Node *s, Node *t, QObject *parent = 0); + ~Edge(); + + Node *source() const; + Node *target() const; + + bool isSelfLoop(); + bool isStraight(); + + GraphElementData *data() const; + void setData(GraphElementData *data); + + QString sourceAnchor() const; + void setSourceAnchor(const QString &sourceAnchor); + + QString targetAnchor() const; + void setTargetAnchor(const QString &targetAnchor); + + Node *edgeNode() const; + void setEdgeNode(Node *edgeNode); + bool hasEdgeNode(); + + void updateControls(); + void setAttributesFromData(); + void updateData(); + + QPointF head() const; + QPointF tail() const; + QPointF cp1() const; + QPointF cp2() const; + QPointF mid() const; + + int bend() const; + int inAngle() const; + int outAngle() const; + float weight() const; + bool basicBendMode() const; + float cpDist() const; + + void setBend(int bend); + void setInAngle(int inAngle); + void setOutAngle(int outAngle); + void setWeight(float weight); + +signals: + +public slots: + +private: + QString _sourceAnchor; + QString _targetAnchor; + + // owned + Node *_edgeNode; + GraphElementData *_data; + + // referenced + Node *_source; + Node *_target; + + bool _dirty; + bool _basicBendMode; + int _bend; + int _inAngle; + int _outAngle; + float _weight; + float _cpDist; + + QPointF _head; + QPointF _tail; + QPointF _cp1; + QPointF _cp2; + QPointF _mid; +}; + +#endif // EDGE_H diff --git a/src/data/graph.cpp b/src/data/graph.cpp new file mode 100644 index 0000000..ba9a4c6 --- /dev/null +++ b/src/data/graph.cpp @@ -0,0 +1,172 @@ +#include "graph.h" + +#include +#include +#include +#include +#include + +Graph::Graph(QObject *parent) : QObject(parent) +{ + _data = new GraphElementData(this); + _bbox = QRectF(0,0,0,0); +} + +Graph::~Graph() +{ +} + +// add a node. The graph claims ownership. +void Graph::addNode(Node *n) { + n->setParent(this); + _nodes << n; +} + +void Graph::addNode(Node *n, int index) +{ + n->setParent(this); + _nodes.insert(index, n); +} + +void Graph::removeNode(Node *n) { + // the node itself is not deleted, as it may still be referenced in an undo command. It will + // be deleted when graph is, via QObject memory management. + _nodes.removeOne(n); +} + + +void Graph::addEdge(Edge *e) +{ + e->setParent(this); + _edges << e; +} + +void Graph::addEdge(Edge *e, int index) +{ + e->setParent(this); + _edges.insert(index, e); +} + +void Graph::removeEdge(Edge *e) +{ + // the edge itself is not deleted, as it may still be referenced in an undo command. It will + // be deleted when graph is, via QObject memory management. + _edges.removeOne(e); +} + +GraphElementData *Graph::data() const +{ + return _data; +} + +void Graph::setData(GraphElementData *data) +{ + delete _data; + _data = data; +} + +const QVector &Graph::nodes() +{ + return _nodes; +} + +const QVector &Graph::edges() +{ + return _edges; +} + +QRectF Graph::bbox() const +{ + return _bbox; +} + +bool Graph::hasBbox() { + return !(_bbox == QRectF(0,0,0,0)); +} + +void Graph::clearBbox() { + _bbox = QRectF(0,0,0,0); +} + +QString Graph::tikz() +{ + QString str; + QTextStream code(&str); + + code << "\\begin{tikzpicture}" << _data->tikz() << "\n"; + if (hasBbox()) { + code << "\t\\path [use as bounding box] (" + << _bbox.topLeft().x() << "," << _bbox.topLeft().y() + << ") rectangle (" + << _bbox.bottomRight().x() << "," << _bbox.bottomRight().y() + << ");\n"; + } + + if (!_nodes.isEmpty()) + code << "\t\\begin{pgfonlayer}{nodelayer}\n"; + + Node *n; + foreach (n, _nodes) { + code << "\t\t\\node "; + + if (!n->data()->isEmpty()) + code << n->data()->tikz() << " "; + + code << "(" << n->name() << ") at (" + << n->point().x() << ", " << n->point().y() + << ") {" << n->label() << "};\n"; + } + + if (!_nodes.isEmpty()) + code << "\t\\end{pgfonlayer}\n"; + + if (!_edges.isEmpty()) + code << "\t\\begin{pgfonlayer}{edgelayer}\n"; + + + Edge *e; + foreach (e, _edges) { + code << "\t\t\\draw "; + + if (!e->data()->isEmpty()) + code << e->data()->tikz() << " "; + + code << "(" << e->source()->name(); + if (e->sourceAnchor() != "") + code << "." << e->sourceAnchor(); + code << ") to "; + + if (e->hasEdgeNode()) { + code << "node "; + if (!e->edgeNode()->data()->isEmpty()) + code << e->edgeNode()->data()->tikz() << " "; + code << "{" << e->edgeNode()->label() << "} "; + } + + if (e->source() == e->target()) { + code << "()"; + } else { + code << "(" << e->target()->name(); + if (e->targetAnchor() != "") + code << "." << e->targetAnchor(); + code << ")"; + } + + code << ";\n"; + } + + if (!_edges.isEmpty()) + code << "\t\\end{pgfonlayer}\n"; + + code << "\\end{tikzpicture}\n"; + + code.flush(); + return str; +} + +void Graph::setBbox(const QRectF &bbox) +{ + _bbox = bbox; +} + + diff --git a/src/data/graph.h b/src/data/graph.h new file mode 100644 index 0000000..8856e5c --- /dev/null +++ b/src/data/graph.h @@ -0,0 +1,56 @@ +/** + * A graph defined by tikz code. + */ + +#ifndef GRAPH_H +#define GRAPH_H + +#include "node.h" +#include "edge.h" +#include "graphelementdata.h" + +#include +#include +#include +#include +#include + +class Graph : public QObject +{ + Q_OBJECT +public: + explicit Graph(QObject *parent = 0); + ~Graph(); + void addNode(Node *n); + void addNode(Node *n, int index); + void removeNode(Node *n); + void addEdge(Edge *e); + void addEdge(Edge *e, int index); + void removeEdge(Edge *e); + + GraphElementData *data() const; + void setData(GraphElementData *data); + + const QVector &nodes(); + const QVector &edges(); + + QRectF bbox() const; + void setBbox(const QRectF &bbox); + bool hasBbox(); + void clearBbox(); + + QString tikz(); +signals: + +public slots: + +private: + QVector _nodes; + QVector _edges; + //QMultiHash inEdges; + //QMultiHash outEdges; + GraphElementData *_data; + QRectF _bbox; +}; + +#endif // GRAPH_H diff --git a/src/data/graphelementdata.cpp b/src/data/graphelementdata.cpp new file mode 100644 index 0000000..3ce72c7 --- /dev/null +++ b/src/data/graphelementdata.cpp @@ -0,0 +1,170 @@ +#include "graphelementdata.h" + +#include +#include + +GraphElementData::GraphElementData(QObject *parent) : QAbstractItemModel(parent) +{ + root = new GraphElementProperty(); +} + +GraphElementData::~GraphElementData() +{ + delete root; +} + +void GraphElementData::setProperty(QString key, QString value) +{ + GraphElementProperty m(key, true); + int i = _properties.indexOf(m); + if (i != -1) { + _properties[i].setValue(value); + } else { + GraphElementProperty p(key, value); + _properties << p; + } +} + +void GraphElementData::unsetProperty(QString key) +{ + GraphElementProperty m(key, true); + int i = _properties.indexOf(m); + if (i != -1) + _properties.remove(i); +} + +void GraphElementData::add(GraphElementProperty p) +{ + _properties << p; +} + +void GraphElementData::operator <<(GraphElementProperty p) +{ + add(p); +} + +void GraphElementData::setAtom(QString atom) +{ + GraphElementProperty a(atom); + int i = _properties.indexOf(a); + if (i == -1) + _properties << a; +} + +void GraphElementData::unsetAtom(QString atom) +{ + GraphElementProperty a(atom); + int i = _properties.indexOf(a); + if (i != -1) + _properties.remove(i); +} + +QString GraphElementData::property(QString key) +{ + GraphElementProperty m(key, true); + int i = _properties.indexOf(m); + if (i != -1) { + return _properties[i].value(); + } else { + return 0; + } +} + +bool GraphElementData::atom(QString atom) +{ + GraphElementProperty a(atom); + return (_properties.indexOf(a) != -1); +} + +QVariant GraphElementData::data(const QModelIndex &index, int role) const +{ + if (role != Qt::DisplayRole) + return QVariant(); + + if (index.row() >= 0 && index.row() < _properties.length()) { + const GraphElementProperty &p = _properties[index.row()]; + QString s = (index.column() == 0) ? p.key() : p.value(); + return QVariant(s); + } +} + +QVariant GraphElementData::headerData(int section, Qt::Orientation orientation, int role) const +{ + if (orientation == Qt::Horizontal && role == Qt::DisplayRole) { + if (section == 0) return QVariant("Key/Atom"); + else return QVariant("Value"); + } + + return QVariant(); +} + +QModelIndex GraphElementData::index(int row, int column, const QModelIndex &parent) const +{ + return createIndex(row, column, (void*)0); +} + +QModelIndex GraphElementData::parent(const QModelIndex &index) const +{ + GraphElementProperty *p = static_cast(index.internalPointer()); + if (p == root) return QModelIndex(); + else return createIndex(0,0,static_cast(root)); +} + +int GraphElementData::rowCount(const QModelIndex &parent) const +{ + if (parent.isValid()) { + return 0; + } else { + return _properties.size(); + } +} + +int GraphElementData::columnCount(const QModelIndex &parent) const +{ + return 2; +} + +Qt::ItemFlags GraphElementData::flags(const QModelIndex &index) const +{ + return QAbstractItemModel::flags(index); +} + +//bool GraphElementData::setData(const QModelIndex &index, const QVariant &value, int role) +//{ + +//} + +//bool GraphElementData::insertRows(int position, int rows, const QModelIndex &parent) +//{ + +//} + +//bool GraphElementData::removeRows(int position, int rows, const QModelIndex &parent) +//{ + +//} + +QString GraphElementData::tikz() { + if (_properties.length() == 0) return ""; + QString str; + QTextStream code(&str); + code << "["; + + GraphElementProperty p; + bool first = true; + foreach(p, _properties) { + if (!first) code << ", "; + code << p.tikz(); + first = false; + } + + code << "]"; + + code.flush(); + return str; +} + +bool GraphElementData::isEmpty() +{ + return _properties.isEmpty(); +} diff --git a/src/data/graphelementdata.h b/src/data/graphelementdata.h new file mode 100644 index 0000000..1139a00 --- /dev/null +++ b/src/data/graphelementdata.h @@ -0,0 +1,66 @@ +#ifndef GRAPHELEMENTDATA_H +#define GRAPHELEMENTDATA_H + +#include "graphelementproperty.h" + +#include +#include +#include +#include +#include + +class GraphElementData : public QAbstractItemModel +{ + Q_OBJECT +public: + explicit GraphElementData(QObject *parent = 0); + ~GraphElementData(); + void setProperty(QString key, QString value); + void unsetProperty(QString key); + void setAtom(QString atom); + void unsetAtom(QString atom); + QString property(QString key); + bool atom(QString atom); + + QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE; + QVariant headerData(int section, Qt::Orientation orientation, + int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + + QModelIndex index(int row, int column, + const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + QModelIndex parent(const QModelIndex &index) const Q_DECL_OVERRIDE; + + int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + + Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; + +// bool setData(const QModelIndex &index, const QVariant &value, +// int role = Qt::EditRole) Q_DECL_OVERRIDE; +// bool setHeaderData(int section, Qt::Orientation orientation, +// const QVariant &value, int role = Qt::EditRole) Q_DECL_OVERRIDE; + +// bool insertColumns(int position, int columns, +// const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; +// bool removeColumns(int position, int columns, +// const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; +// bool insertRows(int position, int rows, +// const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; +// bool removeRows(int position, int rows, +// const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; + + void operator <<(GraphElementProperty p); + void add(GraphElementProperty p); + + QString tikz(); + bool isEmpty(); +signals: + +public slots: + +private: + QVector _properties; + GraphElementProperty *root; +}; + +#endif // GRAPHELEMENTDATA_H diff --git a/src/data/graphelementproperty.cpp b/src/data/graphelementproperty.cpp new file mode 100644 index 0000000..a50af58 --- /dev/null +++ b/src/data/graphelementproperty.cpp @@ -0,0 +1,59 @@ +#include "graphelementproperty.h" + +#include + +GraphElementProperty::GraphElementProperty (): + _key(""), _value(""), _atom(false), _keyMatch(false) +{} + +GraphElementProperty::GraphElementProperty(QString key, QString value, bool atom, bool keyMatch) : + _key(key), _value(value), _atom(atom), _keyMatch(keyMatch) +{} + +GraphElementProperty::GraphElementProperty(QString key, QString value) : + _key(key), _value(value), _atom(false), _keyMatch(false) +{} + +GraphElementProperty::GraphElementProperty(QString key, bool keyMatch) : + _key(key), _value(""), _atom(!keyMatch), _keyMatch(keyMatch) +{} + +QString GraphElementProperty::key() const +{ return _key; } + +QString GraphElementProperty::value() const +{ return _value; } + +void GraphElementProperty::setValue(const QString &value) +{ _value = value; } + +bool GraphElementProperty::atom() const +{ return _atom; } + +bool GraphElementProperty::keyMatch() const +{ return _keyMatch; } + +bool GraphElementProperty::matches(const GraphElementProperty &p) +{ + if (p.atom()) return _atom && _key == p.key(); + if (p.keyMatch()) return !_atom && _key == p.key(); + if (_keyMatch) return !p.atom() && _key == p.key(); + return !_atom && _key == p.key() && _value == p.value(); +} + +bool GraphElementProperty::operator==(const GraphElementProperty &p) +{ + return matches(p); +} + +QString GraphElementProperty::tikzEscape(QString str) +{ + QRegExp re("[0-9a-zA-Z<> \\-'.]*"); + if (re.exactMatch(str)) return str; + else return "{" + str + "}"; +} + +QString GraphElementProperty::tikz() { + if (_atom) return tikzEscape(_key); + return tikzEscape(_key) + "=" + tikzEscape(_value); +} diff --git a/src/data/graphelementproperty.h b/src/data/graphelementproperty.h new file mode 100644 index 0000000..01b6e5a --- /dev/null +++ b/src/data/graphelementproperty.h @@ -0,0 +1,40 @@ +#ifndef GRAPHELEMENTPROPERTY_H +#define GRAPHELEMENTPROPERTY_H + +#include + +class GraphElementProperty +{ +public: + GraphElementProperty(); + GraphElementProperty(QString key, QString value, bool atom, bool keyMatch); + + // construct a property + GraphElementProperty(QString key, QString value); + + // construct an atom or keymatch + GraphElementProperty(QString key, bool keyMatch = false); + + QString key() const; + QString value() const; + void setValue(const QString &value); + bool atom() const; + bool keyMatch() const; + + bool matches(const GraphElementProperty &p); + bool operator==(const GraphElementProperty &p); + + static QString tikzEscape(QString str); + QString tikz(); +signals: + +public slots: + +private: + QString _key; + QString _value; + bool _atom; + bool _keyMatch; +}; + +#endif // GRAPHELEMENTPROPERTY_H diff --git a/src/data/node.cpp b/src/data/node.cpp new file mode 100644 index 0000000..f94a3df --- /dev/null +++ b/src/data/node.cpp @@ -0,0 +1,79 @@ +#include "node.h" +#include "tikzit.h" + +#include + +Node::Node(QObject *parent) : QObject(parent) +{ + _data = new GraphElementData(); + _style = noneStyle; + _styleName = "none"; +} + +Node::~Node() +{ + delete _data; +} + +QPointF Node::point() const +{ + return _point; +} + +void Node::setPoint(const QPointF &point) +{ + _point = point; +} + +QString Node::name() const +{ + return _name; +} + +void Node::setName(const QString &name) +{ + _name = name; +} + +QString Node::label() const +{ + return _label; +} + +void Node::setLabel(const QString &label) +{ + _label = label; +} + +GraphElementData *Node::data() const +{ + return _data; +} + +void Node::setData(GraphElementData *data) +{ + delete _data; + _data = data; + if (_data->property("style") != 0) _styleName = _data->property("style"); +} + +QString Node::styleName() const +{ + return _styleName; +} + +void Node::setStyleName(const QString &styleName) +{ + _styleName = styleName; +} + +void Node::attachStyle() +{ + if (_styleName == "none") _style = noneStyle; + else _style = tikzit->nodeStyle(_styleName); +} + +NodeStyle *Node::style() const +{ + return _style; +} diff --git a/src/data/node.h b/src/data/node.h new file mode 100644 index 0000000..ee70835 --- /dev/null +++ b/src/data/node.h @@ -0,0 +1,49 @@ +#ifndef NODE_H +#define NODE_H + +#include "graphelementdata.h" +#include "nodestyle.h" + +#include +#include +#include + +class Node : public QObject +{ + Q_OBJECT +public: + explicit Node(QObject *parent = 0); + ~Node(); + + QPointF point() const; + void setPoint(const QPointF &point); + + QString name() const; + void setName(const QString &name); + + QString label() const; + void setLabel(const QString &label); + + GraphElementData *data() const; + void setData(GraphElementData *data); + + QString styleName() const; + void setStyleName(const QString &styleName); + + void attachStyle(); + NodeStyle *style() const; + +signals: + +public slots: + +private: + QPointF _point; + QString _name; + QString _label; + QString _styleName; + NodeStyle *_style; + GraphElementData *_data; +}; + +#endif // NODE_H diff --git a/src/data/nodestyle.cpp b/src/data/nodestyle.cpp new file mode 100644 index 0000000..7eca791 --- /dev/null +++ b/src/data/nodestyle.cpp @@ -0,0 +1,32 @@ +#include "nodestyle.h" + +NodeStyle *noneStyle = new NodeStyle(); + +NodeStyle::NodeStyle() +{ + name = "none"; + shape = NodeShape::Circle; + fillColor = Qt::white; + strokeColor = Qt::black; + strokeThickness = 1; +} + +NodeStyle::NodeStyle(QString nm, NodeShape sh, QColor fillCol) +{ + name = nm; + shape = sh; + fillColor = fillCol; + strokeColor = Qt::black; + strokeThickness = 1; +} + +NodeStyle::NodeStyle(QString nm, NodeShape sh, QColor fillCol, QColor strokeCol, int strokeThick) +{ + name = nm; + shape = sh; + fillColor = fillCol; + strokeColor = strokeCol; + strokeThickness = strokeThick; +} + +bool NodeStyle::isNone() { return name == "none"; } diff --git a/src/data/nodestyle.h b/src/data/nodestyle.h new file mode 100644 index 0000000..00d1b20 --- /dev/null +++ b/src/data/nodestyle.h @@ -0,0 +1,26 @@ +#ifndef NODESTYLE_H +#define NODESTYLE_H + +#include + +enum NodeShape { + Square, UpTriangle, DownTriangle, Circle +}; + +class NodeStyle +{ +public: + NodeStyle(); + NodeStyle(QString nm, NodeShape sh, QColor fillCol); + NodeStyle(QString nm, NodeShape sh, QColor fillCol, QColor strokeCol, int strokeThick); + bool isNone(); + QString name; + NodeShape shape; + QColor fillColor; + QColor strokeColor; + int strokeThickness; +}; + +extern NodeStyle *noneStyle; + +#endif // NODESTYLE_H diff --git a/src/data/tikzdocument.cpp b/src/data/tikzdocument.cpp new file mode 100644 index 0000000..13d4c6e --- /dev/null +++ b/src/data/tikzdocument.cpp @@ -0,0 +1,82 @@ +#include +#include +#include +#include +#include + +#include "tikzdocument.h" +#include "tikzgraphassembler.h" + +TikzDocument::TikzDocument(QObject *parent) : QObject(parent) +{ + _graph = new Graph(this); + _parseSuccess = true; + _fileName = ""; + _shortName = ""; + _undoStack = new QUndoStack(); +} + +TikzDocument::~TikzDocument() +{ + delete _graph; + delete _undoStack; +} + +QUndoStack *TikzDocument::undoStack() const +{ + return _undoStack; +} + +Graph *TikzDocument::graph() const +{ + return _graph; +} + +QString TikzDocument::tikz() const +{ + return _tikz; +} + +void TikzDocument::open(QString fileName) +{ + _fileName = fileName; + QFile file(fileName); + QFileInfo fi(file); + _shortName = fi.fileName(); + QSettings settings("tikzit", "tikzit"); + settings.setValue("previous-file-path", fi.absolutePath()); + + if (!file.open(QIODevice::ReadOnly)) { +// QMessageBox::critical(this, tr("Error"), +// tr("Could not open file")); + _parseSuccess = false; + return; + } + + QTextStream in(&file); + _tikz = in.readAll(); + file.close(); + + Graph *newGraph = new Graph(this); + TikzGraphAssembler ass(newGraph); + if (ass.parse(_tikz)) { + delete _graph; + _graph = newGraph; + foreach (Node *n, _graph->nodes()) n->attachStyle(); + foreach (Edge *e, _graph->edges()) e->updateControls(); + _parseSuccess = true; + } else { + delete newGraph; + _parseSuccess = false; + } +} + +QString TikzDocument::shortName() const +{ + return _shortName; +} + +bool TikzDocument::parseSuccess() const +{ + return _parseSuccess; +} diff --git a/src/data/tikzdocument.h b/src/data/tikzdocument.h new file mode 100644 index 0000000..f574f5c --- /dev/null +++ b/src/data/tikzdocument.h @@ -0,0 +1,43 @@ +/** + * This class contains a tikz Graph, source code, file info, and undo stack. It serves as the model + * in the MVC triple (TikzDocument, TikzView, TikzScene). + */ + +#ifndef TIKZDOCUMENT_H +#define TIKZDOCUMENT_H + +#include "graph.h" + +#include +#include + +class TikzDocument : public QObject +{ + Q_OBJECT +public: + explicit TikzDocument(QObject *parent = 0); + ~TikzDocument(); + + Graph *graph() const; + QString tikz() const; + QUndoStack *undoStack() const; + bool parseSuccess() const; + + void open(QString fileName); + + QString shortName() const; + +private: + Graph *_graph; + QString _tikz; + QString _fileName; + QString _shortName; + QUndoStack *_undoStack; + bool _parseSuccess; + +signals: + +public slots: +}; + +#endif // TIKZDOCUMENT_H diff --git a/src/data/tikzgraphassembler.cpp b/src/data/tikzgraphassembler.cpp new file mode 100644 index 0000000..c05a5c8 --- /dev/null +++ b/src/data/tikzgraphassembler.cpp @@ -0,0 +1,33 @@ +#include "tikzgraphassembler.h" + +#include "tikzparserdefs.h" +#include "tikzparser.parser.hpp" +#include "tikzlexer.h" + +int yyparse(void *scanner); + + +TikzGraphAssembler::TikzGraphAssembler(Graph *graph, QObject *parent) : + QObject(parent), _graph(graph) +{ + yylex_init(&scanner); + yyset_extra(this, scanner); +} + +void TikzGraphAssembler::addNodeToMap(Node *n) { _nodeMap.insert(n->name(), n); } +Node *TikzGraphAssembler::nodeWithName(QString name) { return _nodeMap[name]; } + +bool TikzGraphAssembler::parse(const QString &tikz) +{ + yy_scan_string(tikz.toLatin1().data(), scanner); + int result = yyparse(scanner); + + if (result == 0) return true; + else return false; +} + +Graph *TikzGraphAssembler::graph() const +{ + return _graph; +} + diff --git a/src/data/tikzgraphassembler.h b/src/data/tikzgraphassembler.h new file mode 100644 index 0000000..79b89b0 --- /dev/null +++ b/src/data/tikzgraphassembler.h @@ -0,0 +1,31 @@ +#ifndef TIKZGRAPHASSEMBLER_H +#define TIKZGRAPHASSEMBLER_H + +#include "node.h" +#include "graph.h" + +#include +#include + +class TikzGraphAssembler : public QObject +{ + Q_OBJECT +public: + explicit TikzGraphAssembler(Graph *graph, QObject *parent = 0); + void addNodeToMap(Node *n); + Node *nodeWithName(QString name); + bool parse(const QString &tikz); + + Graph *graph() const; + +signals: + +public slots: + +private: + QHash _nodeMap; + Graph *_graph; + void *scanner; +}; + +#endif // TIKZGRAPHASSEMBLER_H diff --git a/src/data/tikzlexer.l b/src/data/tikzlexer.l new file mode 100644 index 0000000..8dd23c6 --- /dev/null +++ b/src/data/tikzlexer.l @@ -0,0 +1,181 @@ +%{ +/* + * Copyright 2010 Chris Heunen + * Copyright 2010-2013 Aleks Kissinger + * Copyright 2013 K. Johan Paulsson + * Copyright 2013 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "tikzparserdefs.h" +#include "tikzparser.parser.hpp" + +#include + + +#define YY_USER_ACTION \ + yylloc->first_line = yylloc->last_line; \ + yylloc->first_column = yylloc->last_column + 1; \ + yylloc->last_column = yylloc->first_column + yyleng - 1; + +%} + +%option reentrant bison-bridge bison-locations 8bit +%option nounput +%option yylineno +%option noyywrap +%option header-file="tikzlexer.h" +%option extra-type="TikzGraphAssembler *" + +%s props +%s xcoord +%s ycoord +%s noderef + +FLOAT \-?[0-9]*(\.[0-9]+)? + +%% + + /* whitespace is ignored, except for position counting; we don't + count formfeed and vtab as whitespace, because it's not obvious + how they should be dealt with and no-one actually uses them */ + + /* lex will take the longest-matching string */ +\r\n|\r|\n { + yylloc->first_line += 1; + yylloc->last_line = yylloc->first_line; + yylloc->first_column = yylloc->last_column = 0; +} +[\t ]+ { } + +\\begin\{tikzpicture\} { return BEGIN_TIKZPICTURE_CMD; } +\\end\{tikzpicture\} { return END_TIKZPICTURE_CMD; } +\\begin\{pgfonlayer\} { return BEGIN_PGFONLAYER_CMD; } +\\end\{pgfonlayer\} { return END_PGFONLAYER_CMD; } +\\draw { return DRAW_CMD; } +\\node { return NODE_CMD; } +\\path { return PATH_CMD; } +rectangle { return RECTANGLE; } +node { return NODE; } +at { return AT; } +to { return TO; } +; { return SEMICOLON; } + +\([ ]*{FLOAT}[ ]*,[ ]*{FLOAT}[ ]*\) { + yylloc->last_column = yylloc->first_column + 1; + yyless(1); + BEGIN(xcoord); +} +{FLOAT} { + yylval->pt = new QPointF(); + yylval->pt->setX(strtod(yytext,NULL)); + BEGIN(ycoord); +} +, { } +{FLOAT} { + yylval->pt->setY(strtod(yytext,NULL)); +} +\) { + BEGIN(INITIAL); + return COORD; +} + + /* when we see "[", change parsing mode */ +\[ /*syntaxhlfix]*/ { + BEGIN(props); + return LEFTBRACKET; +} += { return EQUALS; } +, { return COMMA; } + /* technically, it is possible to have newlines in the middle of + property names or values, but in practice this is unlikely and + screws up our line counting */ +[^=,\{\] \t\n]([^=,\{\]\n]*[^=,\{\] \t\n])? { + char *str = (char*)malloc(sizeof(char)*yyleng + 1); + strncpy(str, yytext, yyleng + 1); + yylval->str = str; + return PROPSTRING; +} +\] { + BEGIN(INITIAL); + return RIGHTBRACKET; +} + +\( { + BEGIN(noderef); + return LEFTPARENTHESIS; +} +\. { + return FULLSTOP; +} + /* we assume node names (and anchor names) never contain + newlines */ +[^\.\{\)\n]+ { + //qDebug() << "nodename: " << yytext << " size: " << strlen(yytext); + char *str = (char*)malloc(sizeof(char)*yyleng + 1); + strncpy(str, yytext, yyleng+1); + yylval->str = str; + return REFSTRING; +} +\) { + BEGIN(INITIAL); + return RIGHTPARENTHESIS; +} + +\{ { + std::stringstream buf; + unsigned int brace_depth = 1; + unsigned int escape = 0; + while (1) { + char c = yyinput(yyscanner); + // eof reached before closing brace + if (c == '\0' || c == EOF) { + return UNCLOSED_DELIM_STR; + } + + yylloc->last_column += 1; + yyleng += 1; + if (escape) { + escape = 0; + } else if (c == '\\') { + escape = 1; + } else if (c == '{') { + brace_depth++; + } else if (c == '}') { + brace_depth--; + if (brace_depth == 0) break; + } else if (c == '\n') { + yylloc->last_line += 1; + yylloc->last_column = 0; + } + buf << c; + } + + char *str = (char*)malloc(sizeof(char) * yyleng + 1); + strncpy(str, buf.str().c_str(), yyleng + 1); + //str[len] = 0; + yylval->str = str; + //qDebug() << "got delim string: " << str; + return DELIMITEDSTRING; +} + +\\begin { return UNKNOWN_BEGIN_CMD; } +\\end { return UNKNOWN_END_CMD; } +\\[a-zA-Z0-9]+ { return UNKNOWN_CMD; } +[a-zA-Z0-9]+ { return UNKNOWN_STR; } +. { return UNKNOWN_STR; } + + /* vi:ft=lex:noet:ts=4:sts=4:sw=4: + */ diff --git a/src/data/tikzlexer.lexer.cpp b/src/data/tikzlexer.lexer.cpp new file mode 100644 index 0000000..7ff1d18 --- /dev/null +++ b/src/data/tikzlexer.lexer.cpp @@ -0,0 +1,2535 @@ +#line 2 "../tikzit/src/data/tikzlexer.lexer.cpp" + +#line 4 "../tikzit/src/data/tikzlexer.lexer.cpp" + +#define YY_INT_ALIGNED short int + +/* A lexical scanner generated by flex */ + +#define FLEX_SCANNER +#define YY_FLEX_MAJOR_VERSION 2 +#define YY_FLEX_MINOR_VERSION 5 +#define YY_FLEX_SUBMINOR_VERSION 35 +#if YY_FLEX_SUBMINOR_VERSION > 0 +#define FLEX_BETA +#endif + +/* First, we deal with platform-specific or compiler-specific issues. */ + +/* begin standard C headers. */ +#include +#include +#include +#include + +/* end standard C headers. */ + +/* flex integer type definitions */ + +#ifndef FLEXINT_H +#define FLEXINT_H + +/* C99 systems have . Non-C99 systems may or may not. */ + +#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L + +/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, + * if you want the limit (max/min) macros for int types. + */ +#ifndef __STDC_LIMIT_MACROS +#define __STDC_LIMIT_MACROS 1 +#endif + +#include +typedef int8_t flex_int8_t; +typedef uint8_t flex_uint8_t; +typedef int16_t flex_int16_t; +typedef uint16_t flex_uint16_t; +typedef int32_t flex_int32_t; +typedef uint32_t flex_uint32_t; +typedef uint64_t flex_uint64_t; +#else +typedef signed char flex_int8_t; +typedef short int flex_int16_t; +typedef int flex_int32_t; +typedef unsigned char flex_uint8_t; +typedef unsigned short int flex_uint16_t; +typedef unsigned int flex_uint32_t; +#endif /* ! C99 */ + +/* Limits of integral types. */ +#ifndef INT8_MIN +#define INT8_MIN (-128) +#endif +#ifndef INT16_MIN +#define INT16_MIN (-32767-1) +#endif +#ifndef INT32_MIN +#define INT32_MIN (-2147483647-1) +#endif +#ifndef INT8_MAX +#define INT8_MAX (127) +#endif +#ifndef INT16_MAX +#define INT16_MAX (32767) +#endif +#ifndef INT32_MAX +#define INT32_MAX (2147483647) +#endif +#ifndef UINT8_MAX +#define UINT8_MAX (255U) +#endif +#ifndef UINT16_MAX +#define UINT16_MAX (65535U) +#endif +#ifndef UINT32_MAX +#define UINT32_MAX (4294967295U) +#endif + +#endif /* ! FLEXINT_H */ + +#ifdef __cplusplus + +/* The "const" storage-class-modifier is valid. */ +#define YY_USE_CONST + +#else /* ! __cplusplus */ + +/* C99 requires __STDC__ to be defined as 1. */ +#if defined (__STDC__) + +#define YY_USE_CONST + +#endif /* defined (__STDC__) */ +#endif /* ! __cplusplus */ + +#ifdef YY_USE_CONST +#define yyconst const +#else +#define yyconst +#endif + +/* Returned upon end-of-file. */ +#define YY_NULL 0 + +/* Promotes a possibly negative, possibly signed char to an unsigned + * integer for use as an array index. If the signed char is negative, + * we want to instead treat it as an 8-bit unsigned char, hence the + * double cast. + */ +#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) + +/* An opaque pointer. */ +#ifndef YY_TYPEDEF_YY_SCANNER_T +#define YY_TYPEDEF_YY_SCANNER_T +typedef void* yyscan_t; +#endif + +/* For convenience, these vars (plus the bison vars far below) + are macros in the reentrant scanner. */ +#define yyin yyg->yyin_r +#define yyout yyg->yyout_r +#define yyextra yyg->yyextra_r +#define yyleng yyg->yyleng_r +#define yytext yyg->yytext_r +#define yylineno (YY_CURRENT_BUFFER_LVALUE->yy_bs_lineno) +#define yycolumn (YY_CURRENT_BUFFER_LVALUE->yy_bs_column) +#define yy_flex_debug yyg->yy_flex_debug_r + +/* Enter a start condition. This macro really ought to take a parameter, + * but we do it the disgusting crufty way forced on us by the ()-less + * definition of BEGIN. + */ +#define BEGIN yyg->yy_start = 1 + 2 * + +/* Translate the current start state into a value that can be later handed + * to BEGIN to return to the state. The YYSTATE alias is for lex + * compatibility. + */ +#define YY_START ((yyg->yy_start - 1) / 2) +#define YYSTATE YY_START + +/* Action number for EOF rule of a given start state. */ +#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) + +/* Special action meaning "start processing a new file". */ +#define YY_NEW_FILE yyrestart(yyin ,yyscanner ) + +#define YY_END_OF_BUFFER_CHAR 0 + +/* Size of default input buffer. */ +#ifndef YY_BUF_SIZE +#define YY_BUF_SIZE 16384 +#endif + +/* The state buf must be large enough to hold one state per character in the main buffer. + */ +#define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type)) + +#ifndef YY_TYPEDEF_YY_BUFFER_STATE +#define YY_TYPEDEF_YY_BUFFER_STATE +typedef struct yy_buffer_state *YY_BUFFER_STATE; +#endif + +#ifndef YY_TYPEDEF_YY_SIZE_T +#define YY_TYPEDEF_YY_SIZE_T +typedef size_t yy_size_t; +#endif + +#define EOB_ACT_CONTINUE_SCAN 0 +#define EOB_ACT_END_OF_FILE 1 +#define EOB_ACT_LAST_MATCH 2 + + /* Note: We specifically omit the test for yy_rule_can_match_eol because it requires + * access to the local variable yy_act. Since yyless() is a macro, it would break + * existing scanners that call yyless() from OUTSIDE yylex. + * One obvious solution it to make yy_act a global. I tried that, and saw + * a 5% performance hit in a non-yylineno scanner, because yy_act is + * normally declared as a register variable-- so it is not worth it. + */ + #define YY_LESS_LINENO(n) \ + do { \ + yy_size_t yyl;\ + for ( yyl = n; yyl < yyleng; ++yyl )\ + if ( yytext[yyl] == '\n' )\ + --yylineno;\ + }while(0) + +/* Return all but the first "n" matched characters back to the input stream. */ +#define yyless(n) \ + do \ + { \ + /* Undo effects of setting up yytext. */ \ + int yyless_macro_arg = (n); \ + YY_LESS_LINENO(yyless_macro_arg);\ + *yy_cp = yyg->yy_hold_char; \ + YY_RESTORE_YY_MORE_OFFSET \ + yyg->yy_c_buf_p = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \ + YY_DO_BEFORE_ACTION; /* set up yytext again */ \ + } \ + while ( 0 ) + +#define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner ) + +#ifndef YY_STRUCT_YY_BUFFER_STATE +#define YY_STRUCT_YY_BUFFER_STATE +struct yy_buffer_state + { + FILE *yy_input_file; + + char *yy_ch_buf; /* input buffer */ + char *yy_buf_pos; /* current position in input buffer */ + + /* Size of input buffer in bytes, not including room for EOB + * characters. + */ + yy_size_t yy_buf_size; + + /* Number of characters read into yy_ch_buf, not including EOB + * characters. + */ + yy_size_t yy_n_chars; + + /* Whether we "own" the buffer - i.e., we know we created it, + * and can realloc() it to grow it, and should free() it to + * delete it. + */ + int yy_is_our_buffer; + + /* Whether this is an "interactive" input source; if so, and + * if we're using stdio for input, then we want to use getc() + * instead of fread(), to make sure we stop fetching input after + * each newline. + */ + int yy_is_interactive; + + /* Whether we're considered to be at the beginning of a line. + * If so, '^' rules will be active on the next match, otherwise + * not. + */ + int yy_at_bol; + + int yy_bs_lineno; /**< The line count. */ + int yy_bs_column; /**< The column count. */ + + /* Whether to try to fill the input buffer when we reach the + * end of it. + */ + int yy_fill_buffer; + + int yy_buffer_status; + +#define YY_BUFFER_NEW 0 +#define YY_BUFFER_NORMAL 1 + /* When an EOF's been seen but there's still some text to process + * then we mark the buffer as YY_EOF_PENDING, to indicate that we + * shouldn't try reading from the input source any more. We might + * still have a bunch of tokens to match, though, because of + * possible backing-up. + * + * When we actually see the EOF, we change the status to "new" + * (via yyrestart()), so that the user can continue scanning by + * just pointing yyin at a new input file. + */ +#define YY_BUFFER_EOF_PENDING 2 + + }; +#endif /* !YY_STRUCT_YY_BUFFER_STATE */ + +/* We provide macros for accessing buffer states in case in the + * future we want to put the buffer states in a more general + * "scanner state". + * + * Returns the top of the stack, or NULL. + */ +#define YY_CURRENT_BUFFER ( yyg->yy_buffer_stack \ + ? yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] \ + : NULL) + +/* Same as previous macro, but useful when we know that the buffer stack is not + * NULL or when we need an lvalue. For internal use only. + */ +#define YY_CURRENT_BUFFER_LVALUE yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] + +void yyrestart (FILE *input_file ,yyscan_t yyscanner ); +void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); +YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ,yyscan_t yyscanner ); +void yy_delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); +void yy_flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); +void yypush_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); +void yypop_buffer_state (yyscan_t yyscanner ); + +static void yyensure_buffer_stack (yyscan_t yyscanner ); +static void yy_load_buffer_state (yyscan_t yyscanner ); +static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file ,yyscan_t yyscanner ); + +#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER ,yyscanner) + +YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ,yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len ,yyscan_t yyscanner ); + +void *yyalloc (yy_size_t ,yyscan_t yyscanner ); +void *yyrealloc (void *,yy_size_t ,yyscan_t yyscanner ); +void yyfree (void * ,yyscan_t yyscanner ); + +#define yy_new_buffer yy_create_buffer + +#define yy_set_interactive(is_interactive) \ + { \ + if ( ! YY_CURRENT_BUFFER ){ \ + yyensure_buffer_stack (yyscanner); \ + YY_CURRENT_BUFFER_LVALUE = \ + yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \ + } \ + YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ + } + +#define yy_set_bol(at_bol) \ + { \ + if ( ! YY_CURRENT_BUFFER ){\ + yyensure_buffer_stack (yyscanner); \ + YY_CURRENT_BUFFER_LVALUE = \ + yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \ + } \ + YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ + } + +#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) + +#define yywrap(n) 1 +#define YY_SKIP_YYWRAP + +typedef unsigned char YY_CHAR; + +typedef int yy_state_type; + +#define yytext_ptr yytext_r + +static yy_state_type yy_get_previous_state (yyscan_t yyscanner ); +static yy_state_type yy_try_NUL_trans (yy_state_type current_state ,yyscan_t yyscanner); +static int yy_get_next_buffer (yyscan_t yyscanner ); +static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner ); + +/* Done after the current pattern has been matched and before the + * corresponding action - sets up yytext. + */ +#define YY_DO_BEFORE_ACTION \ + yyg->yytext_ptr = yy_bp; \ + yyleng = (yy_size_t) (yy_cp - yy_bp); \ + yyg->yy_hold_char = *yy_cp; \ + *yy_cp = '\0'; \ + yyg->yy_c_buf_p = yy_cp; + +#define YY_NUM_RULES 35 +#define YY_END_OF_BUFFER 36 +/* This struct is not used in this scanner, + but its presence is necessary. */ +struct yy_trans_info + { + flex_int32_t yy_verify; + flex_int32_t yy_nxt; + }; +static yyconst flex_int16_t yy_accept[259] = + { 0, + 0, 0, 0, 0, 16, 16, 18, 18, 0, 0, + 36, 34, 2, 1, 1, 25, 33, 14, 20, 34, + 33, 33, 33, 33, 29, 23, 1, 23, 22, 23, + 14, 21, 20, 23, 24, 23, 23, 23, 23, 16, + 34, 16, 19, 17, 18, 34, 18, 27, 2, 1, + 25, 28, 26, 27, 14, 20, 27, 27, 27, 27, + 27, 2, 1, 0, 0, 0, 0, 0, 33, 32, + 32, 32, 32, 32, 32, 12, 33, 33, 13, 23, + 0, 0, 23, 23, 23, 23, 23, 23, 23, 23, + 23, 23, 12, 23, 23, 13, 0, 16, 16, 16, + + 0, 18, 18, 18, 27, 2, 27, 27, 27, 27, + 27, 27, 27, 27, 27, 27, 27, 12, 27, 27, + 13, 0, 15, 0, 0, 0, 0, 0, 32, 32, + 32, 32, 32, 33, 33, 0, 23, 23, 23, 23, + 23, 23, 23, 23, 27, 27, 27, 27, 27, 27, + 27, 27, 27, 27, 27, 0, 0, 32, 32, 31, + 32, 32, 11, 33, 23, 23, 23, 23, 23, 11, + 23, 27, 27, 27, 27, 27, 27, 11, 27, 32, + 7, 0, 8, 9, 33, 23, 7, 8, 9, 23, + 27, 7, 8, 9, 27, 30, 0, 0, 33, 23, + + 23, 27, 27, 0, 0, 0, 33, 23, 27, 0, + 0, 0, 0, 33, 23, 27, 0, 0, 0, 0, + 10, 10, 10, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, + 0, 0, 0, 4, 5, 0, 3, 0 + } ; + +static yyconst flex_int32_t yy_ec[256] = + { 0, + 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, + 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 5, 1, 1, 1, 1, 1, 1, 1, 6, + 7, 1, 1, 8, 9, 10, 1, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 1, 12, 1, + 13, 1, 1, 1, 14, 14, 14, 14, 14, 14, + 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, + 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, + 15, 16, 17, 1, 1, 1, 18, 19, 20, 21, + + 22, 23, 24, 25, 26, 14, 27, 28, 14, 29, + 30, 31, 14, 32, 14, 33, 34, 14, 35, 14, + 36, 37, 38, 1, 39, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1 + } ; + +static yyconst flex_int32_t yy_meta[40] = + { 0, + 1, 1, 2, 1, 1, 1, 3, 4, 1, 3, + 5, 1, 4, 5, 1, 1, 4, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 2, 1 + } ; + +static yyconst flex_int16_t yy_base[265] = + { 0, + 0, 0, 39, 0, 70, 73, 105, 137, 175, 0, + 694, 896, 83, 896, 688, 81, 0, 896, 896, 74, + 655, 656, 663, 653, 896, 92, 96, 213, 896, 224, + 102, 896, 104, 263, 896, 302, 87, 88, 89, 113, + 671, 115, 896, 896, 117, 670, 119, 0, 129, 675, + 127, 896, 896, 341, 0, 0, 380, 419, 109, 118, + 119, 148, 896, 149, 156, 163, 664, 227, 0, 0, + 651, 639, 641, 639, 650, 0, 646, 646, 0, 167, + 214, 457, 239, 240, 250, 630, 294, 300, 450, 305, + 464, 478, 627, 233, 67, 625, 645, 145, 643, 246, + + 642, 322, 639, 327, 0, 215, 354, 361, 368, 432, + 613, 425, 482, 495, 499, 512, 526, 609, 238, 319, + 607, 549, 896, 450, 628, 556, 238, 440, 614, 614, + 600, 599, 585, 586, 574, 468, 527, 549, 563, 543, + 567, 580, 318, 573, 605, 612, 619, 369, 612, 626, + 606, 630, 643, 322, 572, 157, 473, 578, 568, 562, + 575, 570, 0, 575, 658, 671, 688, 682, 708, 558, + 100, 323, 721, 734, 751, 693, 771, 557, 287, 558, + 0, 336, 0, 0, 554, 745, 756, 776, 782, 247, + 787, 793, 798, 804, 354, 541, 553, 550, 551, 817, + + 229, 837, 277, 408, 546, 526, 524, 405, 459, 527, + 524, 519, 509, 518, 396, 431, 516, 510, 507, 494, + 0, 490, 489, 489, 478, 484, 484, 479, 475, 487, + 482, 470, 465, 454, 456, 470, 457, 453, 440, 427, + 417, 417, 398, 404, 388, 351, 353, 329, 328, 896, + 309, 209, 205, 896, 896, 131, 896, 896, 136, 97, + 875, 880, 885, 890 + } ; + +static yyconst flex_int16_t yy_def[265] = + { 0, + 258, 1, 258, 3, 1, 1, 1, 1, 258, 9, + 258, 258, 258, 258, 258, 258, 259, 258, 258, 260, + 259, 259, 259, 259, 258, 261, 261, 261, 258, 262, + 261, 258, 261, 258, 258, 262, 36, 36, 36, 258, + 258, 259, 258, 258, 258, 258, 259, 263, 263, 263, + 263, 258, 258, 264, 263, 263, 258, 264, 58, 58, + 58, 258, 258, 258, 258, 258, 258, 258, 259, 260, + 260, 260, 260, 260, 260, 259, 259, 259, 259, 261, + 261, 261, 261, 261, 261, 36, 34, 34, 34, 34, + 34, 34, 36, 36, 36, 36, 258, 258, 258, 259, + + 258, 258, 258, 259, 263, 263, 263, 263, 263, 263, + 58, 57, 57, 57, 57, 57, 57, 58, 58, 58, + 58, 258, 258, 258, 258, 258, 258, 258, 260, 260, + 260, 260, 260, 259, 259, 261, 261, 34, 34, 34, + 34, 34, 36, 36, 263, 263, 263, 263, 57, 57, + 57, 57, 57, 58, 58, 258, 258, 260, 260, 260, + 260, 260, 259, 259, 34, 34, 34, 34, 34, 36, + 36, 263, 57, 57, 57, 57, 57, 58, 58, 260, + 260, 258, 260, 260, 259, 34, 34, 34, 34, 36, + 57, 57, 57, 57, 58, 260, 258, 258, 259, 34, + + 36, 57, 58, 258, 258, 258, 259, 36, 58, 258, + 258, 258, 258, 259, 36, 58, 258, 258, 258, 258, + 259, 36, 58, 258, 258, 258, 258, 258, 258, 258, + 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, + 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, + 258, 258, 258, 258, 258, 258, 258, 0, 258, 258, + 258, 258, 258, 258 + } ; + +static yyconst flex_int16_t yy_nxt[936] = + { 0, + 12, 13, 14, 15, 13, 16, 12, 12, 12, 12, + 17, 18, 12, 17, 19, 20, 12, 21, 17, 17, + 17, 17, 17, 17, 17, 17, 17, 17, 22, 17, + 17, 23, 24, 17, 17, 17, 17, 25, 12, 26, + 13, 14, 27, 13, 28, 26, 29, 26, 26, 30, + 31, 32, 30, 33, 34, 35, 36, 30, 30, 30, + 30, 30, 30, 30, 30, 30, 30, 37, 30, 30, + 38, 39, 30, 30, 30, 30, 25, 26, 40, 41, + 42, 40, 41, 42, 62, 64, 144, 62, 65, 66, + 67, 68, 71, 81, 72, 73, 81, 81, 63, 86, + + 81, 70, 74, 81, 75, 81, 81, 12, 81, 95, + 12, 43, 44, 45, 46, 47, 94, 190, 96, 86, + 86, 86, 97, 98, 97, 100, 101, 102, 101, 104, + 106, 107, 86, 106, 108, 109, 67, 110, 119, 120, + 69, 111, 12, 43, 44, 45, 46, 47, 121, 62, + 111, 111, 62, 64, 97, 98, 65, 66, 67, 68, + 122, 156, 123, 123, 124, 125, 126, 127, 81, 257, + 65, 81, 67, 68, 12, 48, 49, 14, 50, 49, + 51, 52, 48, 48, 53, 54, 55, 48, 54, 56, + 57, 48, 58, 54, 54, 54, 54, 54, 54, 54, + + 54, 54, 54, 59, 54, 54, 60, 61, 54, 54, + 54, 54, 12, 48, 81, 81, 106, 82, 81, 106, + 65, 83, 84, 85, 80, 81, 256, 80, 81, 80, + 80, 127, 80, 80, 65, 80, 67, 68, 80, 80, + 81, 81, 127, 136, 81, 65, 65, 255, 84, 85, + 137, 81, 208, 143, 136, 97, 100, 65, 154, 84, + 85, 86, 80, 80, 81, 86, 80, 81, 80, 80, + 111, 80, 80, 87, 80, 201, 87, 80, 80, 86, + 87, 88, 87, 89, 90, 87, 87, 87, 87, 87, + 87, 91, 87, 92, 87, 87, 87, 87, 87, 87, + + 209, 80, 80, 81, 195, 80, 81, 80, 80, 111, + 80, 80, 87, 80, 87, 87, 80, 80, 87, 111, + 87, 138, 87, 87, 87, 87, 87, 172, 87, 123, + 87, 101, 102, 140, 93, 87, 101, 104, 155, 170, + 80, 105, 105, 178, 105, 105, 105, 254, 105, 105, + 86, 111, 105, 105, 111, 105, 105, 105, 107, 253, + 252, 108, 109, 67, 110, 145, 197, 123, 198, 146, + 125, 147, 148, 148, 251, 108, 108, 67, 110, 105, + 105, 105, 203, 105, 105, 105, 111, 105, 105, 250, + 112, 105, 105, 112, 105, 105, 105, 112, 113, 112, + + 114, 115, 112, 112, 112, 112, 112, 112, 116, 112, + 117, 112, 112, 112, 112, 112, 112, 222, 105, 105, + 105, 249, 105, 105, 105, 248, 105, 105, 86, 247, + 105, 105, 215, 105, 105, 105, 148, 86, 210, 108, + 211, 67, 110, 112, 127, 112, 112, 65, 246, 245, + 128, 118, 223, 112, 156, 112, 123, 105, 81, 125, + 126, 82, 244, 111, 65, 83, 84, 85, 87, 81, + 87, 87, 136, 243, 242, 65, 241, 156, 87, 123, + 87, 139, 87, 157, 87, 87, 216, 240, 239, 238, + 237, 111, 87, 141, 87, 142, 87, 236, 87, 87, + + 112, 235, 112, 149, 234, 233, 87, 232, 87, 231, + 112, 230, 112, 112, 229, 112, 112, 112, 228, 112, + 112, 111, 86, 112, 227, 112, 150, 151, 81, 112, + 112, 136, 112, 112, 65, 226, 225, 137, 224, 221, + 112, 152, 112, 153, 112, 220, 112, 112, 219, 218, + 217, 214, 213, 122, 112, 123, 112, 124, 125, 126, + 156, 87, 123, 167, 87, 125, 126, 87, 212, 87, + 87, 87, 165, 87, 207, 206, 205, 87, 204, 87, + 166, 87, 199, 87, 87, 87, 196, 168, 87, 111, + 86, 87, 185, 87, 184, 87, 183, 87, 87, 182, + + 87, 87, 181, 180, 179, 171, 164, 163, 87, 145, + 87, 123, 169, 146, 125, 147, 172, 162, 123, 161, + 160, 125, 147, 172, 112, 123, 175, 112, 125, 147, + 112, 159, 112, 112, 112, 173, 112, 158, 157, 111, + 112, 111, 112, 174, 112, 111, 112, 112, 112, 103, + 176, 112, 103, 99, 112, 99, 112, 86, 112, 86, + 112, 112, 86, 112, 112, 135, 134, 133, 132, 131, + 130, 112, 129, 112, 128, 177, 87, 63, 87, 87, + 103, 99, 79, 186, 78, 77, 87, 76, 87, 87, + 63, 87, 87, 258, 258, 258, 258, 258, 258, 87, + + 87, 87, 87, 188, 258, 187, 87, 258, 87, 87, + 87, 112, 87, 112, 193, 258, 87, 258, 87, 258, + 258, 112, 258, 112, 258, 182, 87, 258, 87, 87, + 258, 258, 189, 258, 258, 258, 87, 258, 87, 112, + 258, 112, 112, 258, 258, 258, 191, 258, 258, 112, + 258, 112, 112, 258, 112, 112, 258, 258, 258, 258, + 258, 258, 112, 87, 112, 87, 87, 258, 192, 112, + 258, 112, 112, 200, 87, 87, 87, 87, 258, 112, + 258, 112, 258, 258, 87, 258, 87, 258, 182, 112, + 258, 112, 112, 258, 87, 194, 87, 87, 258, 112, + + 87, 112, 87, 87, 87, 112, 87, 112, 112, 258, + 87, 112, 87, 112, 112, 202, 112, 112, 112, 112, + 258, 112, 112, 112, 112, 112, 112, 258, 112, 258, + 258, 258, 112, 258, 112, 87, 258, 87, 87, 258, + 258, 258, 258, 258, 258, 87, 258, 87, 258, 258, + 258, 258, 258, 258, 204, 112, 258, 112, 112, 258, + 258, 258, 258, 258, 258, 112, 258, 112, 258, 258, + 258, 258, 258, 258, 204, 80, 258, 80, 258, 80, + 86, 258, 86, 258, 86, 105, 258, 258, 105, 105, + 111, 258, 258, 111, 111, 11, 258, 258, 258, 258, + + 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, + 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, + 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, + 258, 258, 258, 258, 258 + } ; + +static yyconst flex_int16_t yy_chk[936] = + { 0, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 5, 5, + 5, 6, 6, 6, 13, 16, 95, 13, 16, 16, + 16, 16, 20, 26, 20, 20, 26, 27, 27, 95, + + 27, 260, 20, 31, 20, 33, 31, 5, 33, 38, + 6, 7, 7, 7, 7, 7, 37, 171, 39, 37, + 38, 39, 40, 40, 42, 42, 45, 45, 47, 47, + 49, 51, 171, 49, 51, 51, 51, 51, 59, 60, + 259, 59, 7, 8, 8, 8, 8, 8, 61, 62, + 60, 61, 62, 64, 98, 98, 64, 64, 64, 64, + 65, 156, 65, 156, 65, 65, 65, 66, 80, 256, + 66, 80, 66, 66, 8, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 28, 81, 106, 28, 81, 106, + 28, 28, 28, 28, 30, 30, 253, 30, 30, 30, + 30, 68, 30, 30, 68, 30, 68, 68, 30, 30, + 83, 84, 127, 83, 84, 127, 83, 252, 83, 83, + 84, 85, 201, 94, 85, 100, 100, 85, 119, 85, + 85, 201, 30, 34, 34, 94, 34, 34, 34, 34, + 119, 34, 34, 34, 34, 190, 34, 34, 34, 190, + 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, + 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, + + 203, 34, 36, 36, 179, 36, 36, 36, 36, 203, + 36, 36, 87, 36, 87, 87, 36, 36, 88, 179, + 88, 88, 87, 90, 87, 90, 90, 172, 88, 172, + 88, 102, 102, 90, 36, 90, 104, 104, 120, 143, + 36, 54, 54, 154, 54, 54, 54, 251, 54, 54, + 143, 120, 54, 54, 154, 54, 54, 54, 107, 249, + 248, 107, 107, 107, 107, 108, 182, 108, 182, 108, + 108, 108, 109, 148, 247, 109, 148, 109, 109, 54, + 57, 57, 195, 57, 57, 57, 195, 57, 57, 246, + 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, + + 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, + 57, 57, 57, 57, 57, 57, 57, 215, 57, 58, + 58, 245, 58, 58, 58, 244, 58, 58, 215, 243, + 58, 58, 208, 58, 58, 58, 110, 208, 204, 110, + 204, 110, 110, 112, 128, 112, 112, 128, 242, 241, + 128, 58, 216, 112, 124, 112, 124, 58, 82, 124, + 124, 82, 240, 216, 82, 82, 82, 82, 89, 136, + 89, 89, 136, 239, 238, 136, 237, 157, 89, 157, + 89, 89, 91, 157, 91, 91, 209, 236, 235, 234, + 233, 209, 91, 91, 91, 92, 92, 232, 92, 92, + + 113, 231, 113, 113, 230, 229, 92, 228, 92, 227, + 113, 226, 113, 114, 225, 114, 114, 115, 224, 115, + 115, 223, 222, 114, 220, 114, 114, 115, 137, 115, + 116, 137, 116, 116, 137, 219, 218, 137, 217, 214, + 116, 116, 116, 117, 117, 213, 117, 117, 212, 211, + 210, 207, 206, 122, 117, 122, 117, 122, 122, 122, + 126, 140, 126, 140, 140, 126, 126, 138, 205, 138, + 138, 140, 138, 140, 199, 198, 197, 138, 196, 138, + 139, 139, 185, 139, 139, 141, 180, 141, 141, 178, + 170, 139, 164, 139, 162, 141, 161, 141, 142, 160, + + 142, 142, 159, 158, 155, 144, 135, 134, 142, 145, + 142, 145, 142, 145, 145, 145, 146, 133, 146, 132, + 131, 146, 146, 147, 151, 147, 151, 151, 147, 147, + 149, 130, 149, 149, 151, 149, 151, 129, 125, 121, + 149, 118, 149, 150, 150, 111, 150, 150, 152, 103, + 152, 152, 101, 99, 150, 97, 150, 96, 152, 93, + 152, 153, 86, 153, 153, 78, 77, 75, 74, 73, + 72, 153, 71, 153, 67, 153, 165, 50, 165, 165, + 46, 41, 24, 165, 23, 22, 165, 21, 165, 166, + 15, 166, 166, 11, 0, 0, 0, 0, 0, 166, + + 168, 166, 168, 168, 0, 166, 167, 0, 167, 167, + 168, 176, 168, 176, 176, 0, 167, 0, 167, 0, + 0, 176, 0, 176, 0, 167, 169, 0, 169, 169, + 0, 0, 169, 0, 0, 0, 169, 0, 169, 173, + 0, 173, 173, 0, 0, 0, 173, 0, 0, 173, + 0, 173, 174, 0, 174, 174, 0, 0, 0, 0, + 0, 0, 174, 186, 174, 186, 186, 0, 174, 175, + 0, 175, 175, 186, 187, 186, 187, 187, 0, 175, + 0, 175, 0, 0, 187, 0, 187, 0, 175, 177, + 0, 177, 177, 0, 188, 177, 188, 188, 0, 177, + + 189, 177, 189, 189, 188, 191, 188, 191, 191, 0, + 189, 192, 189, 192, 192, 191, 193, 191, 193, 193, + 0, 192, 194, 192, 194, 194, 193, 0, 193, 0, + 0, 0, 194, 0, 194, 200, 0, 200, 200, 0, + 0, 0, 0, 0, 0, 200, 0, 200, 0, 0, + 0, 0, 0, 0, 200, 202, 0, 202, 202, 0, + 0, 0, 0, 0, 0, 202, 0, 202, 0, 0, + 0, 0, 0, 0, 202, 261, 0, 261, 0, 261, + 262, 0, 262, 0, 262, 263, 0, 0, 263, 263, + 264, 0, 0, 264, 264, 258, 258, 258, 258, 258, + + 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, + 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, + 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, + 258, 258, 258, 258, 258 + } ; + +/* Table of booleans, true if rule could match eol. */ +static yyconst flex_int32_t yy_rule_can_match_eol[36] = + { 0, +1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; + +/* The intent behind this definition is that it'll catch + * any uses of REJECT which flex missed. + */ +#define REJECT reject_used_but_not_detected +#define yymore() yymore_used_but_not_detected +#define YY_MORE_ADJ 0 +#define YY_RESTORE_YY_MORE_OFFSET +#line 1 "../tikzit/src/data/tikzlexer.l" +#line 2 "../tikzit/src/data/tikzlexer.l" +/* + * Copyright 2010 Chris Heunen + * Copyright 2010-2013 Aleks Kissinger + * Copyright 2013 K. Johan Paulsson + * Copyright 2013 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "tikzparserdefs.h" +#include "tikzparser.parser.hpp" + +#include + + +#define YY_USER_ACTION \ + yylloc->first_line = yylloc->last_line; \ + yylloc->first_column = yylloc->last_column + 1; \ + yylloc->last_column = yylloc->first_column + yyleng - 1; + + + + + +#line 776 "../tikzit/src/data/tikzlexer.lexer.cpp" + +#define INITIAL 0 +#define props 1 +#define xcoord 2 +#define ycoord 3 +#define noderef 4 + +#ifndef YY_NO_UNISTD_H +/* Special case for "unistd.h", since it is non-ANSI. We include it way + * down here because we want the user's section 1 to have been scanned first. + * The user has a chance to override it with an option. + */ +#include +#endif + +#define YY_EXTRA_TYPE TikzGraphAssembler * + +/* Holds the entire state of the reentrant scanner. */ +struct yyguts_t + { + + /* User-defined. Not touched by flex. */ + YY_EXTRA_TYPE yyextra_r; + + /* The rest are the same as the globals declared in the non-reentrant scanner. */ + FILE *yyin_r, *yyout_r; + size_t yy_buffer_stack_top; /**< index of top of stack. */ + size_t yy_buffer_stack_max; /**< capacity of stack. */ + YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */ + char yy_hold_char; + yy_size_t yy_n_chars; + yy_size_t yyleng_r; + char *yy_c_buf_p; + int yy_init; + int yy_start; + int yy_did_buffer_switch_on_eof; + int yy_start_stack_ptr; + int yy_start_stack_depth; + int *yy_start_stack; + yy_state_type yy_last_accepting_state; + char* yy_last_accepting_cpos; + + int yylineno_r; + int yy_flex_debug_r; + + char *yytext_r; + int yy_more_flag; + int yy_more_len; + + YYSTYPE * yylval_r; + + YYLTYPE * yylloc_r; + + }; /* end struct yyguts_t */ + +static int yy_init_globals (yyscan_t yyscanner ); + + /* This must go here because YYSTYPE and YYLTYPE are included + * from bison output in section 1.*/ + # define yylval yyg->yylval_r + + # define yylloc yyg->yylloc_r + +int yylex_init (yyscan_t* scanner); + +int yylex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner); + +/* Accessor methods to globals. + These are made visible to non-reentrant scanners for convenience. */ + +int yylex_destroy (yyscan_t yyscanner ); + +int yyget_debug (yyscan_t yyscanner ); + +void yyset_debug (int debug_flag ,yyscan_t yyscanner ); + +YY_EXTRA_TYPE yyget_extra (yyscan_t yyscanner ); + +void yyset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner ); + +FILE *yyget_in (yyscan_t yyscanner ); + +void yyset_in (FILE * in_str ,yyscan_t yyscanner ); + +FILE *yyget_out (yyscan_t yyscanner ); + +void yyset_out (FILE * out_str ,yyscan_t yyscanner ); + +yy_size_t yyget_leng (yyscan_t yyscanner ); + +char *yyget_text (yyscan_t yyscanner ); + +int yyget_lineno (yyscan_t yyscanner ); + +void yyset_lineno (int line_number ,yyscan_t yyscanner ); + +YYSTYPE * yyget_lval (yyscan_t yyscanner ); + +void yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner ); + + YYLTYPE *yyget_lloc (yyscan_t yyscanner ); + + void yyset_lloc (YYLTYPE * yylloc_param ,yyscan_t yyscanner ); + +/* Macros after this point can all be overridden by user definitions in + * section 1. + */ + +#ifndef YY_SKIP_YYWRAP +#ifdef __cplusplus +extern "C" int yywrap (yyscan_t yyscanner ); +#else +extern int yywrap (yyscan_t yyscanner ); +#endif +#endif + +#ifndef yytext_ptr +static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner); +#endif + +#ifdef YY_NEED_STRLEN +static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner); +#endif + +#ifndef YY_NO_INPUT + +#ifdef __cplusplus +static int yyinput (yyscan_t yyscanner ); +#else +static int input (yyscan_t yyscanner ); +#endif + +#endif + +/* Amount of stuff to slurp up with each read. */ +#ifndef YY_READ_BUF_SIZE +#define YY_READ_BUF_SIZE 8192 +#endif + +/* Copy whatever the last rule matched to the standard output. */ +#ifndef ECHO +/* This used to be an fputs(), but since the string might contain NUL's, + * we now use fwrite(). + */ +#define ECHO fwrite( yytext, yyleng, 1, yyout ) +#endif + +/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, + * is returned in "result". + */ +#ifndef YY_INPUT +#define YY_INPUT(buf,result,max_size) \ + if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ + { \ + int c = '*'; \ + yy_size_t n; \ + for ( n = 0; n < max_size && \ + (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ + buf[n] = (char) c; \ + if ( c == '\n' ) \ + buf[n++] = (char) c; \ + if ( c == EOF && ferror( yyin ) ) \ + YY_FATAL_ERROR( "input in flex scanner failed" ); \ + result = n; \ + } \ + else \ + { \ + errno=0; \ + while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \ + { \ + if( errno != EINTR) \ + { \ + YY_FATAL_ERROR( "input in flex scanner failed" ); \ + break; \ + } \ + errno=0; \ + clearerr(yyin); \ + } \ + }\ +\ + +#endif + +/* No semi-colon after return; correct usage is to write "yyterminate();" - + * we don't want an extra ';' after the "return" because that will cause + * some compilers to complain about unreachable statements. + */ +#ifndef yyterminate +#define yyterminate() return YY_NULL +#endif + +/* Number of entries by which start-condition stack grows. */ +#ifndef YY_START_STACK_INCR +#define YY_START_STACK_INCR 25 +#endif + +/* Report a fatal error. */ +#ifndef YY_FATAL_ERROR +#define YY_FATAL_ERROR(msg) yy_fatal_error( msg , yyscanner) +#endif + +/* end tables serialization structures and prototypes */ + +/* Default declaration of generated scanner - a define so the user can + * easily add parameters. + */ +#ifndef YY_DECL +#define YY_DECL_IS_OURS 1 + +extern int yylex \ + (YYSTYPE * yylval_param,YYLTYPE * yylloc_param ,yyscan_t yyscanner); + +#define YY_DECL int yylex \ + (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner) +#endif /* !YY_DECL */ + +/* Code executed at the beginning of each rule, after yytext and yyleng + * have been set up. + */ +#ifndef YY_USER_ACTION +#define YY_USER_ACTION +#endif + +/* Code executed at the end of each rule. */ +#ifndef YY_BREAK +#define YY_BREAK break; +#endif + +#define YY_RULE_SETUP \ + YY_USER_ACTION + +/** The main scanner function which does all the work. + */ +YY_DECL +{ + register yy_state_type yy_current_state; + register char *yy_cp, *yy_bp; + register int yy_act; + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + +#line 49 "../tikzit/src/data/tikzlexer.l" + + + /* whitespace is ignored, except for position counting; we don't + count formfeed and vtab as whitespace, because it's not obvious + how they should be dealt with and no-one actually uses them */ + + /* lex will take the longest-matching string */ +#line 1025 "../tikzit/src/data/tikzlexer.lexer.cpp" + + yylval = yylval_param; + + yylloc = yylloc_param; + + if ( !yyg->yy_init ) + { + yyg->yy_init = 1; + +#ifdef YY_USER_INIT + YY_USER_INIT; +#endif + + if ( ! yyg->yy_start ) + yyg->yy_start = 1; /* first start state */ + + if ( ! yyin ) + yyin = stdin; + + if ( ! yyout ) + yyout = stdout; + + if ( ! YY_CURRENT_BUFFER ) { + yyensure_buffer_stack (yyscanner); + YY_CURRENT_BUFFER_LVALUE = + yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); + } + + yy_load_buffer_state(yyscanner ); + } + + while ( 1 ) /* loops until end-of-file is reached */ + { + yy_cp = yyg->yy_c_buf_p; + + /* Support of yytext. */ + *yy_cp = yyg->yy_hold_char; + + /* yy_bp points to the position in yy_ch_buf of the start of + * the current run. + */ + yy_bp = yy_cp; + + yy_current_state = yyg->yy_start; +yy_match: + do + { + register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; + if ( yy_accept[yy_current_state] ) + { + yyg->yy_last_accepting_state = yy_current_state; + yyg->yy_last_accepting_cpos = yy_cp; + } + while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) + { + yy_current_state = (int) yy_def[yy_current_state]; + if ( yy_current_state >= 259 ) + yy_c = yy_meta[(unsigned int) yy_c]; + } + yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + ++yy_cp; + } + while ( yy_base[yy_current_state] != 896 ); + +yy_find_action: + yy_act = yy_accept[yy_current_state]; + if ( yy_act == 0 ) + { /* have to back up */ + yy_cp = yyg->yy_last_accepting_cpos; + yy_current_state = yyg->yy_last_accepting_state; + yy_act = yy_accept[yy_current_state]; + } + + YY_DO_BEFORE_ACTION; + + if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] ) + { + yy_size_t yyl; + for ( yyl = 0; yyl < yyleng; ++yyl ) + if ( yytext[yyl] == '\n' ) + + do{ yylineno++; + yycolumn=0; + }while(0) +; + } + +do_action: /* This label is used only to access EOF actions. */ + + switch ( yy_act ) + { /* beginning of action switch */ + case 0: /* must back up */ + /* undo the effects of YY_DO_BEFORE_ACTION */ + *yy_cp = yyg->yy_hold_char; + yy_cp = yyg->yy_last_accepting_cpos; + yy_current_state = yyg->yy_last_accepting_state; + goto yy_find_action; + +case 1: +/* rule 1 can match eol */ +YY_RULE_SETUP +#line 56 "../tikzit/src/data/tikzlexer.l" +{ + yylloc->first_line += 1; + yylloc->last_line = yylloc->first_line; + yylloc->first_column = yylloc->last_column = 0; +} + YY_BREAK +case 2: +YY_RULE_SETUP +#line 61 "../tikzit/src/data/tikzlexer.l" +{ } + YY_BREAK +case 3: +YY_RULE_SETUP +#line 63 "../tikzit/src/data/tikzlexer.l" +{ return BEGIN_TIKZPICTURE_CMD; } + YY_BREAK +case 4: +YY_RULE_SETUP +#line 64 "../tikzit/src/data/tikzlexer.l" +{ return END_TIKZPICTURE_CMD; } + YY_BREAK +case 5: +YY_RULE_SETUP +#line 65 "../tikzit/src/data/tikzlexer.l" +{ return BEGIN_PGFONLAYER_CMD; } + YY_BREAK +case 6: +YY_RULE_SETUP +#line 66 "../tikzit/src/data/tikzlexer.l" +{ return END_PGFONLAYER_CMD; } + YY_BREAK +case 7: +YY_RULE_SETUP +#line 67 "../tikzit/src/data/tikzlexer.l" +{ return DRAW_CMD; } + YY_BREAK +case 8: +YY_RULE_SETUP +#line 68 "../tikzit/src/data/tikzlexer.l" +{ return NODE_CMD; } + YY_BREAK +case 9: +YY_RULE_SETUP +#line 69 "../tikzit/src/data/tikzlexer.l" +{ return PATH_CMD; } + YY_BREAK +case 10: +YY_RULE_SETUP +#line 70 "../tikzit/src/data/tikzlexer.l" +{ return RECTANGLE; } + YY_BREAK +case 11: +YY_RULE_SETUP +#line 71 "../tikzit/src/data/tikzlexer.l" +{ return NODE; } + YY_BREAK +case 12: +YY_RULE_SETUP +#line 72 "../tikzit/src/data/tikzlexer.l" +{ return AT; } + YY_BREAK +case 13: +YY_RULE_SETUP +#line 73 "../tikzit/src/data/tikzlexer.l" +{ return TO; } + YY_BREAK +case 14: +YY_RULE_SETUP +#line 74 "../tikzit/src/data/tikzlexer.l" +{ return SEMICOLON; } + YY_BREAK +case 15: +YY_RULE_SETUP +#line 76 "../tikzit/src/data/tikzlexer.l" +{ + yylloc->last_column = yylloc->first_column + 1; + yyless(1); + BEGIN(xcoord); +} + YY_BREAK +case 16: +YY_RULE_SETUP +#line 81 "../tikzit/src/data/tikzlexer.l" +{ + yylval->pt = new QPointF(); + yylval->pt->setX(strtod(yytext,NULL)); + BEGIN(ycoord); +} + YY_BREAK +case 17: +YY_RULE_SETUP +#line 86 "../tikzit/src/data/tikzlexer.l" +{ } + YY_BREAK +case 18: +YY_RULE_SETUP +#line 87 "../tikzit/src/data/tikzlexer.l" +{ + yylval->pt->setY(strtod(yytext,NULL)); +} + YY_BREAK +case 19: +YY_RULE_SETUP +#line 90 "../tikzit/src/data/tikzlexer.l" +{ + BEGIN(INITIAL); + return COORD; +} + YY_BREAK +/* when we see "[", change parsing mode */ +case 20: +YY_RULE_SETUP +#line 96 "../tikzit/src/data/tikzlexer.l" +/*syntaxhlfix]*/ { + BEGIN(props); + return LEFTBRACKET; +} + YY_BREAK +case 21: +YY_RULE_SETUP +#line 100 "../tikzit/src/data/tikzlexer.l" +{ return EQUALS; } + YY_BREAK +case 22: +YY_RULE_SETUP +#line 101 "../tikzit/src/data/tikzlexer.l" +{ return COMMA; } + YY_BREAK +/* technically, it is possible to have newlines in the middle of + property names or values, but in practice this is unlikely and + screws up our line counting */ +case 23: +YY_RULE_SETUP +#line 105 "../tikzit/src/data/tikzlexer.l" +{ + char *str = (char*)malloc(sizeof(char)*yyleng + 1); + strncpy(str, yytext, yyleng + 1); + yylval->str = str; + return PROPSTRING; +} + YY_BREAK +case 24: +YY_RULE_SETUP +#line 111 "../tikzit/src/data/tikzlexer.l" +{ + BEGIN(INITIAL); + return RIGHTBRACKET; +} + YY_BREAK +case 25: +YY_RULE_SETUP +#line 116 "../tikzit/src/data/tikzlexer.l" +{ + BEGIN(noderef); + return LEFTPARENTHESIS; +} + YY_BREAK +case 26: +YY_RULE_SETUP +#line 120 "../tikzit/src/data/tikzlexer.l" +{ + return FULLSTOP; +} + YY_BREAK +/* we assume node names (and anchor names) never contain + newlines */ +case 27: +YY_RULE_SETUP +#line 125 "../tikzit/src/data/tikzlexer.l" +{ + //qDebug() << "nodename: " << yytext << " size: " << strlen(yytext); + char *str = (char*)malloc(sizeof(char)*yyleng + 1); + strncpy(str, yytext, yyleng+1); + yylval->str = str; + return REFSTRING; +} + YY_BREAK +case 28: +YY_RULE_SETUP +#line 132 "../tikzit/src/data/tikzlexer.l" +{ + BEGIN(INITIAL); + return RIGHTPARENTHESIS; +} + YY_BREAK +case 29: +YY_RULE_SETUP +#line 137 "../tikzit/src/data/tikzlexer.l" +{ + std::stringstream buf; + unsigned int brace_depth = 1; + unsigned int escape = 0; + while (1) { + char c = yyinput(yyscanner); + // eof reached before closing brace + if (c == '\0' || c == EOF) { + return UNCLOSED_DELIM_STR; + } + + yylloc->last_column += 1; + yyleng += 1; + if (escape) { + escape = 0; + } else if (c == '\\') { + escape = 1; + } else if (c == '{') { + brace_depth++; + } else if (c == '}') { + brace_depth--; + if (brace_depth == 0) break; + } else if (c == '\n') { + yylloc->last_line += 1; + yylloc->last_column = 0; + } + buf << c; + } + + char *str = (char*)malloc(sizeof(char) * yyleng + 1); + strncpy(str, buf.str().c_str(), yyleng + 1); + //str[len] = 0; + yylval->str = str; + //qDebug() << "got delim string: " << str; + return DELIMITEDSTRING; +} + YY_BREAK +case 30: +YY_RULE_SETUP +#line 174 "../tikzit/src/data/tikzlexer.l" +{ return UNKNOWN_BEGIN_CMD; } + YY_BREAK +case 31: +YY_RULE_SETUP +#line 175 "../tikzit/src/data/tikzlexer.l" +{ return UNKNOWN_END_CMD; } + YY_BREAK +case 32: +YY_RULE_SETUP +#line 176 "../tikzit/src/data/tikzlexer.l" +{ return UNKNOWN_CMD; } + YY_BREAK +case 33: +YY_RULE_SETUP +#line 177 "../tikzit/src/data/tikzlexer.l" +{ return UNKNOWN_STR; } + YY_BREAK +case 34: +YY_RULE_SETUP +#line 178 "../tikzit/src/data/tikzlexer.l" +{ return UNKNOWN_STR; } + YY_BREAK +/* vi:ft=lex:noet:ts=4:sts=4:sw=4: + */ +case 35: +YY_RULE_SETUP +#line 182 "../tikzit/src/data/tikzlexer.l" +ECHO; + YY_BREAK +#line 1385 "../tikzit/src/data/tikzlexer.lexer.cpp" +case YY_STATE_EOF(INITIAL): +case YY_STATE_EOF(props): +case YY_STATE_EOF(xcoord): +case YY_STATE_EOF(ycoord): +case YY_STATE_EOF(noderef): + yyterminate(); + + case YY_END_OF_BUFFER: + { + /* Amount of text matched not including the EOB char. */ + int yy_amount_of_matched_text = (int) (yy_cp - yyg->yytext_ptr) - 1; + + /* Undo the effects of YY_DO_BEFORE_ACTION. */ + *yy_cp = yyg->yy_hold_char; + YY_RESTORE_YY_MORE_OFFSET + + if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW ) + { + /* We're scanning a new file or input source. It's + * possible that this happened because the user + * just pointed yyin at a new source and called + * yylex(). If so, then we have to assure + * consistency between YY_CURRENT_BUFFER and our + * globals. Here is the right place to do so, because + * this is the first action (other than possibly a + * back-up) that will match for the new input source. + */ + yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; + YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin; + YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL; + } + + /* Note that here we test for yy_c_buf_p "<=" to the position + * of the first EOB in the buffer, since yy_c_buf_p will + * already have been incremented past the NUL character + * (since all states make transitions on EOB to the + * end-of-buffer state). Contrast this with the test + * in input(). + */ + if ( yyg->yy_c_buf_p <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] ) + { /* This was really a NUL. */ + yy_state_type yy_next_state; + + yyg->yy_c_buf_p = yyg->yytext_ptr + yy_amount_of_matched_text; + + yy_current_state = yy_get_previous_state( yyscanner ); + + /* Okay, we're now positioned to make the NUL + * transition. We couldn't have + * yy_get_previous_state() go ahead and do it + * for us because it doesn't know how to deal + * with the possibility of jamming (and we don't + * want to build jamming into it because then it + * will run more slowly). + */ + + yy_next_state = yy_try_NUL_trans( yy_current_state , yyscanner); + + yy_bp = yyg->yytext_ptr + YY_MORE_ADJ; + + if ( yy_next_state ) + { + /* Consume the NUL. */ + yy_cp = ++yyg->yy_c_buf_p; + yy_current_state = yy_next_state; + goto yy_match; + } + + else + { + yy_cp = yyg->yy_c_buf_p; + goto yy_find_action; + } + } + + else switch ( yy_get_next_buffer( yyscanner ) ) + { + case EOB_ACT_END_OF_FILE: + { + yyg->yy_did_buffer_switch_on_eof = 0; + + if ( yywrap(yyscanner ) ) + { + /* Note: because we've taken care in + * yy_get_next_buffer() to have set up + * yytext, we can now set up + * yy_c_buf_p so that if some total + * hoser (like flex itself) wants to + * call the scanner after we return the + * YY_NULL, it'll still work - another + * YY_NULL will get returned. + */ + yyg->yy_c_buf_p = yyg->yytext_ptr + YY_MORE_ADJ; + + yy_act = YY_STATE_EOF(YY_START); + goto do_action; + } + + else + { + if ( ! yyg->yy_did_buffer_switch_on_eof ) + YY_NEW_FILE; + } + break; + } + + case EOB_ACT_CONTINUE_SCAN: + yyg->yy_c_buf_p = + yyg->yytext_ptr + yy_amount_of_matched_text; + + yy_current_state = yy_get_previous_state( yyscanner ); + + yy_cp = yyg->yy_c_buf_p; + yy_bp = yyg->yytext_ptr + YY_MORE_ADJ; + goto yy_match; + + case EOB_ACT_LAST_MATCH: + yyg->yy_c_buf_p = + &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars]; + + yy_current_state = yy_get_previous_state( yyscanner ); + + yy_cp = yyg->yy_c_buf_p; + yy_bp = yyg->yytext_ptr + YY_MORE_ADJ; + goto yy_find_action; + } + break; + } + + default: + YY_FATAL_ERROR( + "fatal flex scanner internal error--no action found" ); + } /* end of action switch */ + } /* end of scanning one token */ +} /* end of yylex */ + +/* yy_get_next_buffer - try to read in a new buffer + * + * Returns a code representing an action: + * EOB_ACT_LAST_MATCH - + * EOB_ACT_CONTINUE_SCAN - continue scanning from current position + * EOB_ACT_END_OF_FILE - end of file + */ +static int yy_get_next_buffer (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; + register char *source = yyg->yytext_ptr; + register int number_to_move, i; + int ret_val; + + if ( yyg->yy_c_buf_p > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] ) + YY_FATAL_ERROR( + "fatal flex scanner internal error--end of buffer missed" ); + + if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 ) + { /* Don't try to fill the buffer, so this is an EOF. */ + if ( yyg->yy_c_buf_p - yyg->yytext_ptr - YY_MORE_ADJ == 1 ) + { + /* We matched a single character, the EOB, so + * treat this as a final EOF. + */ + return EOB_ACT_END_OF_FILE; + } + + else + { + /* We matched some text prior to the EOB, first + * process it. + */ + return EOB_ACT_LAST_MATCH; + } + } + + /* Try to read more data. */ + + /* First move last chars to start of buffer. */ + number_to_move = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr) - 1; + + for ( i = 0; i < number_to_move; ++i ) + *(dest++) = *(source++); + + if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING ) + /* don't do the read, it's not guaranteed to return an EOF, + * just force an EOF + */ + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars = 0; + + else + { + yy_size_t num_to_read = + YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; + + while ( num_to_read <= 0 ) + { /* Not enough room in the buffer - grow it. */ + + /* just a shorter name for the current buffer */ + YY_BUFFER_STATE b = YY_CURRENT_BUFFER; + + int yy_c_buf_p_offset = + (int) (yyg->yy_c_buf_p - b->yy_ch_buf); + + if ( b->yy_is_our_buffer ) + { + yy_size_t new_size = b->yy_buf_size * 2; + + if ( new_size <= 0 ) + b->yy_buf_size += b->yy_buf_size / 8; + else + b->yy_buf_size *= 2; + + b->yy_ch_buf = (char *) + /* Include room in for 2 EOB chars. */ + yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ,yyscanner ); + } + else + /* Can't grow it, we don't own it. */ + b->yy_ch_buf = 0; + + if ( ! b->yy_ch_buf ) + YY_FATAL_ERROR( + "fatal error - scanner input buffer overflow" ); + + yyg->yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset]; + + num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - + number_to_move - 1; + + } + + if ( num_to_read > YY_READ_BUF_SIZE ) + num_to_read = YY_READ_BUF_SIZE; + + /* Read in more data. */ + YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), + yyg->yy_n_chars, num_to_read ); + + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars; + } + + if ( yyg->yy_n_chars == 0 ) + { + if ( number_to_move == YY_MORE_ADJ ) + { + ret_val = EOB_ACT_END_OF_FILE; + yyrestart(yyin ,yyscanner); + } + + else + { + ret_val = EOB_ACT_LAST_MATCH; + YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = + YY_BUFFER_EOF_PENDING; + } + } + + else + ret_val = EOB_ACT_CONTINUE_SCAN; + + if ((yy_size_t) (yyg->yy_n_chars + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { + /* Extend the array by 50%, plus the number we really need. */ + yy_size_t new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1); + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ,yyscanner ); + if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) + YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); + } + + yyg->yy_n_chars += number_to_move; + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] = YY_END_OF_BUFFER_CHAR; + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR; + + yyg->yytext_ptr = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0]; + + return ret_val; +} + +/* yy_get_previous_state - get the state just before the EOB char was reached */ + + static yy_state_type yy_get_previous_state (yyscan_t yyscanner) +{ + register yy_state_type yy_current_state; + register char *yy_cp; + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + yy_current_state = yyg->yy_start; + + for ( yy_cp = yyg->yytext_ptr + YY_MORE_ADJ; yy_cp < yyg->yy_c_buf_p; ++yy_cp ) + { + register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); + if ( yy_accept[yy_current_state] ) + { + yyg->yy_last_accepting_state = yy_current_state; + yyg->yy_last_accepting_cpos = yy_cp; + } + while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) + { + yy_current_state = (int) yy_def[yy_current_state]; + if ( yy_current_state >= 259 ) + yy_c = yy_meta[(unsigned int) yy_c]; + } + yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + } + + return yy_current_state; +} + +/* yy_try_NUL_trans - try to make a transition on the NUL character + * + * synopsis + * next_state = yy_try_NUL_trans( current_state ); + */ + static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state , yyscan_t yyscanner) +{ + register int yy_is_jam; + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* This var may be unused depending upon options. */ + register char *yy_cp = yyg->yy_c_buf_p; + + register YY_CHAR yy_c = 1; + if ( yy_accept[yy_current_state] ) + { + yyg->yy_last_accepting_state = yy_current_state; + yyg->yy_last_accepting_cpos = yy_cp; + } + while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) + { + yy_current_state = (int) yy_def[yy_current_state]; + if ( yy_current_state >= 259 ) + yy_c = yy_meta[(unsigned int) yy_c]; + } + yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_is_jam = (yy_current_state == 258); + + return yy_is_jam ? 0 : yy_current_state; +} + +#ifndef YY_NO_INPUT +#ifdef __cplusplus + static int yyinput (yyscan_t yyscanner) +#else + static int input (yyscan_t yyscanner) +#endif + +{ + int c; + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + *yyg->yy_c_buf_p = yyg->yy_hold_char; + + if ( *yyg->yy_c_buf_p == YY_END_OF_BUFFER_CHAR ) + { + /* yy_c_buf_p now points to the character we want to return. + * If this occurs *before* the EOB characters, then it's a + * valid NUL; if not, then we've hit the end of the buffer. + */ + if ( yyg->yy_c_buf_p < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] ) + /* This was really a NUL. */ + *yyg->yy_c_buf_p = '\0'; + + else + { /* need more input */ + yy_size_t offset = yyg->yy_c_buf_p - yyg->yytext_ptr; + ++yyg->yy_c_buf_p; + + switch ( yy_get_next_buffer( yyscanner ) ) + { + case EOB_ACT_LAST_MATCH: + /* This happens because yy_g_n_b() + * sees that we've accumulated a + * token and flags that we need to + * try matching the token before + * proceeding. But for input(), + * there's no matching to consider. + * So convert the EOB_ACT_LAST_MATCH + * to EOB_ACT_END_OF_FILE. + */ + + /* Reset buffer status. */ + yyrestart(yyin ,yyscanner); + + /*FALLTHROUGH*/ + + case EOB_ACT_END_OF_FILE: + { + if ( yywrap(yyscanner ) ) + return 0; + + if ( ! yyg->yy_did_buffer_switch_on_eof ) + YY_NEW_FILE; +#ifdef __cplusplus + return yyinput(yyscanner); +#else + return input(yyscanner); +#endif + } + + case EOB_ACT_CONTINUE_SCAN: + yyg->yy_c_buf_p = yyg->yytext_ptr + offset; + break; + } + } + } + + c = *(unsigned char *) yyg->yy_c_buf_p; /* cast for 8-bit char's */ + *yyg->yy_c_buf_p = '\0'; /* preserve yytext */ + yyg->yy_hold_char = *++yyg->yy_c_buf_p; + + if ( c == '\n' ) + + do{ yylineno++; + yycolumn=0; + }while(0) +; + + return c; +} +#endif /* ifndef YY_NO_INPUT */ + +/** Immediately switch to a different input stream. + * @param input_file A readable stream. + * @param yyscanner The scanner object. + * @note This function does not reset the start condition to @c INITIAL . + */ + void yyrestart (FILE * input_file , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + if ( ! YY_CURRENT_BUFFER ){ + yyensure_buffer_stack (yyscanner); + YY_CURRENT_BUFFER_LVALUE = + yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); + } + + yy_init_buffer(YY_CURRENT_BUFFER,input_file ,yyscanner); + yy_load_buffer_state(yyscanner ); +} + +/** Switch to a different input buffer. + * @param new_buffer The new input buffer. + * @param yyscanner The scanner object. + */ + void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + /* TODO. We should be able to replace this entire function body + * with + * yypop_buffer_state(); + * yypush_buffer_state(new_buffer); + */ + yyensure_buffer_stack (yyscanner); + if ( YY_CURRENT_BUFFER == new_buffer ) + return; + + if ( YY_CURRENT_BUFFER ) + { + /* Flush out information for old buffer. */ + *yyg->yy_c_buf_p = yyg->yy_hold_char; + YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p; + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars; + } + + YY_CURRENT_BUFFER_LVALUE = new_buffer; + yy_load_buffer_state(yyscanner ); + + /* We don't actually know whether we did this switch during + * EOF (yywrap()) processing, but the only time this flag + * is looked at is after yywrap() is called, so it's safe + * to go ahead and always set it. + */ + yyg->yy_did_buffer_switch_on_eof = 1; +} + +static void yy_load_buffer_state (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; + yyg->yytext_ptr = yyg->yy_c_buf_p = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos; + yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file; + yyg->yy_hold_char = *yyg->yy_c_buf_p; +} + +/** Allocate and initialize an input buffer state. + * @param file A readable stream. + * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE. + * @param yyscanner The scanner object. + * @return the allocated buffer state. + */ + YY_BUFFER_STATE yy_create_buffer (FILE * file, int size , yyscan_t yyscanner) +{ + YY_BUFFER_STATE b; + + b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ,yyscanner ); + if ( ! b ) + YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); + + b->yy_buf_size = size; + + /* yy_ch_buf has to be 2 characters longer than the size given because + * we need to put in 2 end-of-buffer characters. + */ + b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2 ,yyscanner ); + if ( ! b->yy_ch_buf ) + YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); + + b->yy_is_our_buffer = 1; + + yy_init_buffer(b,file ,yyscanner); + + return b; +} + +/** Destroy the buffer. + * @param b a buffer created with yy_create_buffer() + * @param yyscanner The scanner object. + */ + void yy_delete_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + if ( ! b ) + return; + + if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */ + YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; + + if ( b->yy_is_our_buffer ) + yyfree((void *) b->yy_ch_buf ,yyscanner ); + + yyfree((void *) b ,yyscanner ); +} + +#ifndef __cplusplus +extern int isatty (int ); +#endif /* __cplusplus */ + +/* Initializes or reinitializes a buffer. + * This function is sometimes called more than once on the same buffer, + * such as during a yyrestart() or at EOF. + */ + static void yy_init_buffer (YY_BUFFER_STATE b, FILE * file , yyscan_t yyscanner) + +{ + int oerrno = errno; + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + yy_flush_buffer(b ,yyscanner); + + b->yy_input_file = file; + b->yy_fill_buffer = 1; + + /* If b is the current buffer, then yy_init_buffer was _probably_ + * called from yyrestart() or through yy_get_next_buffer. + * In that case, we don't want to reset the lineno or column. + */ + if (b != YY_CURRENT_BUFFER){ + b->yy_bs_lineno = 1; + b->yy_bs_column = 0; + } + + b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; + + errno = oerrno; +} + +/** Discard all buffered characters. On the next scan, YY_INPUT will be called. + * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. + * @param yyscanner The scanner object. + */ + void yy_flush_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + if ( ! b ) + return; + + b->yy_n_chars = 0; + + /* We always need two end-of-buffer characters. The first causes + * a transition to the end-of-buffer state. The second causes + * a jam in that state. + */ + b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR; + b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR; + + b->yy_buf_pos = &b->yy_ch_buf[0]; + + b->yy_at_bol = 1; + b->yy_buffer_status = YY_BUFFER_NEW; + + if ( b == YY_CURRENT_BUFFER ) + yy_load_buffer_state(yyscanner ); +} + +/** Pushes the new state onto the stack. The new state becomes + * the current state. This function will allocate the stack + * if necessary. + * @param new_buffer The new state. + * @param yyscanner The scanner object. + */ +void yypush_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + if (new_buffer == NULL) + return; + + yyensure_buffer_stack(yyscanner); + + /* This block is copied from yy_switch_to_buffer. */ + if ( YY_CURRENT_BUFFER ) + { + /* Flush out information for old buffer. */ + *yyg->yy_c_buf_p = yyg->yy_hold_char; + YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p; + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars; + } + + /* Only push if top exists. Otherwise, replace top. */ + if (YY_CURRENT_BUFFER) + yyg->yy_buffer_stack_top++; + YY_CURRENT_BUFFER_LVALUE = new_buffer; + + /* copied from yy_switch_to_buffer. */ + yy_load_buffer_state(yyscanner ); + yyg->yy_did_buffer_switch_on_eof = 1; +} + +/** Removes and deletes the top of the stack, if present. + * The next element becomes the new top. + * @param yyscanner The scanner object. + */ +void yypop_buffer_state (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + if (!YY_CURRENT_BUFFER) + return; + + yy_delete_buffer(YY_CURRENT_BUFFER ,yyscanner); + YY_CURRENT_BUFFER_LVALUE = NULL; + if (yyg->yy_buffer_stack_top > 0) + --yyg->yy_buffer_stack_top; + + if (YY_CURRENT_BUFFER) { + yy_load_buffer_state(yyscanner ); + yyg->yy_did_buffer_switch_on_eof = 1; + } +} + +/* Allocates the stack if it does not exist. + * Guarantees space for at least one push. + */ +static void yyensure_buffer_stack (yyscan_t yyscanner) +{ + yy_size_t num_to_alloc; + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + if (!yyg->yy_buffer_stack) { + + /* First allocation is just for 2 elements, since we don't know if this + * scanner will even need a stack. We use 2 instead of 1 to avoid an + * immediate realloc on the next call. + */ + num_to_alloc = 1; + yyg->yy_buffer_stack = (struct yy_buffer_state**)yyalloc + (num_to_alloc * sizeof(struct yy_buffer_state*) + , yyscanner); + if ( ! yyg->yy_buffer_stack ) + YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); + + memset(yyg->yy_buffer_stack, 0, num_to_alloc * sizeof(struct yy_buffer_state*)); + + yyg->yy_buffer_stack_max = num_to_alloc; + yyg->yy_buffer_stack_top = 0; + return; + } + + if (yyg->yy_buffer_stack_top >= (yyg->yy_buffer_stack_max) - 1){ + + /* Increase the buffer to prepare for a possible push. */ + int grow_size = 8 /* arbitrary grow size */; + + num_to_alloc = yyg->yy_buffer_stack_max + grow_size; + yyg->yy_buffer_stack = (struct yy_buffer_state**)yyrealloc + (yyg->yy_buffer_stack, + num_to_alloc * sizeof(struct yy_buffer_state*) + , yyscanner); + if ( ! yyg->yy_buffer_stack ) + YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); + + /* zero only the new slots.*/ + memset(yyg->yy_buffer_stack + yyg->yy_buffer_stack_max, 0, grow_size * sizeof(struct yy_buffer_state*)); + yyg->yy_buffer_stack_max = num_to_alloc; + } +} + +/** Setup the input buffer state to scan directly from a user-specified character buffer. + * @param base the character buffer + * @param size the size in bytes of the character buffer + * @param yyscanner The scanner object. + * @return the newly allocated buffer state object. + */ +YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size , yyscan_t yyscanner) +{ + YY_BUFFER_STATE b; + + if ( size < 2 || + base[size-2] != YY_END_OF_BUFFER_CHAR || + base[size-1] != YY_END_OF_BUFFER_CHAR ) + /* They forgot to leave room for the EOB's. */ + return 0; + + b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ,yyscanner ); + if ( ! b ) + YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); + + b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ + b->yy_buf_pos = b->yy_ch_buf = base; + b->yy_is_our_buffer = 0; + b->yy_input_file = 0; + b->yy_n_chars = b->yy_buf_size; + b->yy_is_interactive = 0; + b->yy_at_bol = 1; + b->yy_fill_buffer = 0; + b->yy_buffer_status = YY_BUFFER_NEW; + + yy_switch_to_buffer(b ,yyscanner ); + + return b; +} + +/** Setup the input buffer state to scan a string. The next call to yylex() will + * scan from a @e copy of @a str. + * @param yystr a NUL-terminated string to scan + * @param yyscanner The scanner object. + * @return the newly allocated buffer state object. + * @note If you want to scan bytes that may contain NUL values, then use + * yy_scan_bytes() instead. + */ +YY_BUFFER_STATE yy_scan_string (yyconst char * yystr , yyscan_t yyscanner) +{ + + return yy_scan_bytes(yystr,strlen(yystr) ,yyscanner); +} + +/** Setup the input buffer state to scan the given bytes. The next call to yylex() will + * scan from a @e copy of @a bytes. + * @param bytes the byte buffer to scan + * @param len the number of bytes in the buffer pointed to by @a bytes. + * @param yyscanner The scanner object. + * @return the newly allocated buffer state object. + */ +YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len , yyscan_t yyscanner) +{ + YY_BUFFER_STATE b; + char *buf; + yy_size_t n, i; + + /* Get memory for full buffer, including space for trailing EOB's. */ + n = _yybytes_len + 2; + buf = (char *) yyalloc(n ,yyscanner ); + if ( ! buf ) + YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); + + for ( i = 0; i < _yybytes_len; ++i ) + buf[i] = yybytes[i]; + + buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; + + b = yy_scan_buffer(buf,n ,yyscanner); + if ( ! b ) + YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); + + /* It's okay to grow etc. this buffer, and we should throw it + * away when we're done. + */ + b->yy_is_our_buffer = 1; + + return b; +} + +#ifndef YY_EXIT_FAILURE +#define YY_EXIT_FAILURE 2 +#endif + +static void yy_fatal_error (yyconst char* msg , yyscan_t yyscanner) +{ + (void) fprintf( stderr, "%s\n", msg ); + exit( YY_EXIT_FAILURE ); +} + +/* Redefine yyless() so it works in section 3 code. */ + +#undef yyless +#define yyless(n) \ + do \ + { \ + /* Undo effects of setting up yytext. */ \ + int yyless_macro_arg = (n); \ + YY_LESS_LINENO(yyless_macro_arg);\ + yytext[yyleng] = yyg->yy_hold_char; \ + yyg->yy_c_buf_p = yytext + yyless_macro_arg; \ + yyg->yy_hold_char = *yyg->yy_c_buf_p; \ + *yyg->yy_c_buf_p = '\0'; \ + yyleng = yyless_macro_arg; \ + } \ + while ( 0 ) + +/* Accessor methods (get/set functions) to struct members. */ + +/** Get the user-defined data for this scanner. + * @param yyscanner The scanner object. + */ +YY_EXTRA_TYPE yyget_extra (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + return yyextra; +} + +/** Get the current line number. + * @param yyscanner The scanner object. + */ +int yyget_lineno (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + if (! YY_CURRENT_BUFFER) + return 0; + + return yylineno; +} + +/** Get the current column number. + * @param yyscanner The scanner object. + */ +int yyget_column (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + if (! YY_CURRENT_BUFFER) + return 0; + + return yycolumn; +} + +/** Get the input stream. + * @param yyscanner The scanner object. + */ +FILE *yyget_in (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + return yyin; +} + +/** Get the output stream. + * @param yyscanner The scanner object. + */ +FILE *yyget_out (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + return yyout; +} + +/** Get the length of the current token. + * @param yyscanner The scanner object. + */ +yy_size_t yyget_leng (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + return yyleng; +} + +/** Get the current token. + * @param yyscanner The scanner object. + */ + +char *yyget_text (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + return yytext; +} + +/** Set the user-defined data. This data is never touched by the scanner. + * @param user_defined The data to be associated with this scanner. + * @param yyscanner The scanner object. + */ +void yyset_extra (YY_EXTRA_TYPE user_defined , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + yyextra = user_defined ; +} + +/** Set the current line number. + * @param line_number + * @param yyscanner The scanner object. + */ +void yyset_lineno (int line_number , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + /* lineno is only valid if an input buffer exists. */ + if (! YY_CURRENT_BUFFER ) + yy_fatal_error( "yyset_lineno called with no buffer" , yyscanner); + + yylineno = line_number; +} + +/** Set the current column. + * @param line_number + * @param yyscanner The scanner object. + */ +void yyset_column (int column_no , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + /* column is only valid if an input buffer exists. */ + if (! YY_CURRENT_BUFFER ) + yy_fatal_error( "yyset_column called with no buffer" , yyscanner); + + yycolumn = column_no; +} + +/** Set the input stream. This does not discard the current + * input buffer. + * @param in_str A readable stream. + * @param yyscanner The scanner object. + * @see yy_switch_to_buffer + */ +void yyset_in (FILE * in_str , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + yyin = in_str ; +} + +void yyset_out (FILE * out_str , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + yyout = out_str ; +} + +int yyget_debug (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + return yy_flex_debug; +} + +void yyset_debug (int bdebug , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + yy_flex_debug = bdebug ; +} + +/* Accessor methods for yylval and yylloc */ + +YYSTYPE * yyget_lval (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + return yylval; +} + +void yyset_lval (YYSTYPE * yylval_param , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + yylval = yylval_param; +} + +YYLTYPE *yyget_lloc (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + return yylloc; +} + +void yyset_lloc (YYLTYPE * yylloc_param , yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + yylloc = yylloc_param; +} + +/* User-visible API */ + +/* yylex_init is special because it creates the scanner itself, so it is + * the ONLY reentrant function that doesn't take the scanner as the last argument. + * That's why we explicitly handle the declaration, instead of using our macros. + */ + +int yylex_init(yyscan_t* ptr_yy_globals) + +{ + if (ptr_yy_globals == NULL){ + errno = EINVAL; + return 1; + } + + *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), NULL ); + + if (*ptr_yy_globals == NULL){ + errno = ENOMEM; + return 1; + } + + /* By setting to 0xAA, we expose bugs in yy_init_globals. Leave at 0x00 for releases. */ + memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t)); + + return yy_init_globals ( *ptr_yy_globals ); +} + +/* yylex_init_extra has the same functionality as yylex_init, but follows the + * convention of taking the scanner as the last argument. Note however, that + * this is a *pointer* to a scanner, as it will be allocated by this call (and + * is the reason, too, why this function also must handle its own declaration). + * The user defined value in the first argument will be available to yyalloc in + * the yyextra field. + */ + +int yylex_init_extra(YY_EXTRA_TYPE yy_user_defined,yyscan_t* ptr_yy_globals ) + +{ + struct yyguts_t dummy_yyguts; + + yyset_extra (yy_user_defined, &dummy_yyguts); + + if (ptr_yy_globals == NULL){ + errno = EINVAL; + return 1; + } + + *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), &dummy_yyguts ); + + if (*ptr_yy_globals == NULL){ + errno = ENOMEM; + return 1; + } + + /* By setting to 0xAA, we expose bugs in + yy_init_globals. Leave at 0x00 for releases. */ + memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t)); + + yyset_extra (yy_user_defined, *ptr_yy_globals); + + return yy_init_globals ( *ptr_yy_globals ); +} + +static int yy_init_globals (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + /* Initialization is the same as for the non-reentrant scanner. + * This function is called from yylex_destroy(), so don't allocate here. + */ + + yyg->yy_buffer_stack = 0; + yyg->yy_buffer_stack_top = 0; + yyg->yy_buffer_stack_max = 0; + yyg->yy_c_buf_p = (char *) 0; + yyg->yy_init = 0; + yyg->yy_start = 0; + + yyg->yy_start_stack_ptr = 0; + yyg->yy_start_stack_depth = 0; + yyg->yy_start_stack = NULL; + +/* Defined in main.c */ +#ifdef YY_STDINIT + yyin = stdin; + yyout = stdout; +#else + yyin = (FILE *) 0; + yyout = (FILE *) 0; +#endif + + /* For future reference: Set errno on error, since we are called by + * yylex_init() + */ + return 0; +} + +/* yylex_destroy is for both reentrant and non-reentrant scanners. */ +int yylex_destroy (yyscan_t yyscanner) +{ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + + /* Pop the buffer stack, destroying each element. */ + while(YY_CURRENT_BUFFER){ + yy_delete_buffer(YY_CURRENT_BUFFER ,yyscanner ); + YY_CURRENT_BUFFER_LVALUE = NULL; + yypop_buffer_state(yyscanner); + } + + /* Destroy the stack itself. */ + yyfree(yyg->yy_buffer_stack ,yyscanner); + yyg->yy_buffer_stack = NULL; + + /* Destroy the start condition stack. */ + yyfree(yyg->yy_start_stack ,yyscanner ); + yyg->yy_start_stack = NULL; + + /* Reset the globals. This is important in a non-reentrant scanner so the next time + * yylex() is called, initialization will occur. */ + yy_init_globals( yyscanner); + + /* Destroy the main struct (reentrant only). */ + yyfree ( yyscanner , yyscanner ); + yyscanner = NULL; + return 0; +} + +/* + * Internal utility routines. + */ + +#ifndef yytext_ptr +static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t yyscanner) +{ + register int i; + for ( i = 0; i < n; ++i ) + s1[i] = s2[i]; +} +#endif + +#ifdef YY_NEED_STRLEN +static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner) +{ + register int n; + for ( n = 0; s[n]; ++n ) + ; + + return n; +} +#endif + +void *yyalloc (yy_size_t size , yyscan_t yyscanner) +{ + return (void *) malloc( size ); +} + +void *yyrealloc (void * ptr, yy_size_t size , yyscan_t yyscanner) +{ + /* The cast to (char *) in the following accommodates both + * implementations that use char* generic pointers, and those + * that use void* generic pointers. It works with the latter + * because both ANSI C and C++ allow castless assignment from + * any pointer type to void*, and deal with argument conversions + * as though doing an assignment. + */ + return (void *) realloc( (char *) ptr, size ); +} + +void yyfree (void * ptr , yyscan_t yyscanner) +{ + free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ +} + +#define YYTABLES_NAME "yytables" + +#line 182 "../tikzit/src/data/tikzlexer.l" diff --git a/src/data/tikzparser.parser.cpp b/src/data/tikzparser.parser.cpp new file mode 100644 index 0000000..7d77d0c --- /dev/null +++ b/src/data/tikzparser.parser.cpp @@ -0,0 +1,1938 @@ +/* A Bison parser, made by GNU Bison 2.3. */ + +/* Skeleton implementation for Bison's Yacc-like parsers in C + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ + +/* As a special exception, you may create a larger work that contains + part or all of the Bison parser skeleton and distribute that work + under terms of your choice, so long as that work isn't itself a + parser generator using the skeleton or a modified version thereof + as a parser skeleton. Alternatively, if you modify or redistribute + the parser skeleton itself, you may (at your option) remove this + special exception, which will cause the skeleton and the resulting + Bison output files to be licensed under the GNU General Public + License without this special exception. + + This special exception was added by the Free Software Foundation in + version 2.2 of Bison. */ + +/* C LALR(1) parser skeleton written by Richard Stallman, by + simplifying the original so-called "semantic" parser. */ + +/* All symbols defined below should begin with yy or YY, to avoid + infringing on user name space. This should be done even for local + variables, as they might otherwise be expanded by user macros. + There are some unavoidable exceptions within include files to + define necessary library symbols; they are noted "INFRINGES ON + USER NAME SPACE" below. */ + +/* Identify Bison output. */ +#define YYBISON 1 + +/* Bison version. */ +#define YYBISON_VERSION "2.3" + +/* Skeleton name. */ +#define YYSKELETON_NAME "yacc.c" + +/* Pure parsers. */ +#define YYPURE 1 + +/* Using locations. */ +#define YYLSP_NEEDED 1 + + + +/* Tokens. */ +#ifndef YYTOKENTYPE +# define YYTOKENTYPE + /* Put the tokens into the symbol table, so that GDB and other debuggers + know about them. */ + enum yytokentype { + BEGIN_TIKZPICTURE_CMD = 258, + END_TIKZPICTURE_CMD = 259, + BEGIN_PGFONLAYER_CMD = 260, + END_PGFONLAYER_CMD = 261, + DRAW_CMD = 262, + NODE_CMD = 263, + PATH_CMD = 264, + RECTANGLE = 265, + NODE = 266, + AT = 267, + TO = 268, + SEMICOLON = 269, + COMMA = 270, + LEFTPARENTHESIS = 271, + RIGHTPARENTHESIS = 272, + LEFTBRACKET = 273, + RIGHTBRACKET = 274, + FULLSTOP = 275, + EQUALS = 276, + COORD = 277, + PROPSTRING = 278, + REFSTRING = 279, + DELIMITEDSTRING = 280, + UNKNOWN_BEGIN_CMD = 281, + UNKNOWN_END_CMD = 282, + UNKNOWN_CMD = 283, + UNKNOWN_STR = 284, + UNCLOSED_DELIM_STR = 285 + }; +#endif +/* Tokens. */ +#define BEGIN_TIKZPICTURE_CMD 258 +#define END_TIKZPICTURE_CMD 259 +#define BEGIN_PGFONLAYER_CMD 260 +#define END_PGFONLAYER_CMD 261 +#define DRAW_CMD 262 +#define NODE_CMD 263 +#define PATH_CMD 264 +#define RECTANGLE 265 +#define NODE 266 +#define AT 267 +#define TO 268 +#define SEMICOLON 269 +#define COMMA 270 +#define LEFTPARENTHESIS 271 +#define RIGHTPARENTHESIS 272 +#define LEFTBRACKET 273 +#define RIGHTBRACKET 274 +#define FULLSTOP 275 +#define EQUALS 276 +#define COORD 277 +#define PROPSTRING 278 +#define REFSTRING 279 +#define DELIMITEDSTRING 280 +#define UNKNOWN_BEGIN_CMD 281 +#define UNKNOWN_END_CMD 282 +#define UNKNOWN_CMD 283 +#define UNKNOWN_STR 284 +#define UNCLOSED_DELIM_STR 285 + + + + +/* Copy the first part of user declarations. */ +#line 1 "../tikzit/src/data/tikzparser.y" + +/* + * Copyright 2010 Chris Heunen + * Copyright 2010-2013 Aleks Kissinger + * Copyright 2013 K. Johan Paulsson + * Copyright 2013 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "tikzparserdefs.h" + + +/* Enabling traces. */ +#ifndef YYDEBUG +# define YYDEBUG 0 +#endif + +/* Enabling verbose error messages. */ +#ifdef YYERROR_VERBOSE +# undef YYERROR_VERBOSE +# define YYERROR_VERBOSE 1 +#else +# define YYERROR_VERBOSE 1 +#endif + +/* Enabling the token table. */ +#ifndef YYTOKEN_TABLE +# define YYTOKEN_TABLE 0 +#endif + +#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED +typedef union YYSTYPE +#line 43 "../tikzit/src/data/tikzparser.y" +{ + char *str; + GraphElementProperty *prop; + GraphElementData *data; + Node *node; + QPointF *pt; + struct noderef noderef; +} +/* Line 193 of yacc.c. */ +#line 189 "../tikzit/src/data/tikzparser.parser.cpp" + YYSTYPE; +# define yystype YYSTYPE /* obsolescent; will be withdrawn */ +# define YYSTYPE_IS_DECLARED 1 +# define YYSTYPE_IS_TRIVIAL 1 +#endif + +#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED +typedef struct YYLTYPE +{ + int first_line; + int first_column; + int last_line; + int last_column; +} YYLTYPE; +# define yyltype YYLTYPE /* obsolescent; will be withdrawn */ +# define YYLTYPE_IS_DECLARED 1 +# define YYLTYPE_IS_TRIVIAL 1 +#endif + + +/* Copy the second part of user declarations. */ +#line 52 "../tikzit/src/data/tikzparser.y" + +#include "node.h" +#include "edge.h" +#include "graphelementdata.h" +#include "graphelementproperty.h" + +#include "tikzlexer.h" +#import "tikzgraphassembler.h" +/* the assembler (used by this parser) is stored in the lexer + state as "extra" data */ +#define assembler yyget_extra(scanner) + +/* pass errors off to the assembler */ +void yyerror(YYLTYPE *yylloc, void *scanner, const char *str) { + // TODO: implement reportError() + //assembler->reportError(str, yylloc); + qDebug() << "parse error: " << str; +} + + +/* Line 216 of yacc.c. */ +#line 233 "../tikzit/src/data/tikzparser.parser.cpp" + +#ifdef short +# undef short +#endif + +#ifdef YYTYPE_UINT8 +typedef YYTYPE_UINT8 yytype_uint8; +#else +typedef unsigned char yytype_uint8; +#endif + +#ifdef YYTYPE_INT8 +typedef YYTYPE_INT8 yytype_int8; +#elif (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +typedef signed char yytype_int8; +#else +typedef short int yytype_int8; +#endif + +#ifdef YYTYPE_UINT16 +typedef YYTYPE_UINT16 yytype_uint16; +#else +typedef unsigned short int yytype_uint16; +#endif + +#ifdef YYTYPE_INT16 +typedef YYTYPE_INT16 yytype_int16; +#else +typedef short int yytype_int16; +#endif + +#ifndef YYSIZE_T +# ifdef __SIZE_TYPE__ +# define YYSIZE_T __SIZE_TYPE__ +# elif defined size_t +# define YYSIZE_T size_t +# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +# include /* INFRINGES ON USER NAME SPACE */ +# define YYSIZE_T size_t +# else +# define YYSIZE_T unsigned int +# endif +#endif + +#define YYSIZE_MAXIMUM ((YYSIZE_T) -1) + +#ifndef YY_ +# if defined YYENABLE_NLS && YYENABLE_NLS +# if ENABLE_NLS +# include /* INFRINGES ON USER NAME SPACE */ +# define YY_(msgid) dgettext ("bison-runtime", msgid) +# endif +# endif +# ifndef YY_ +# define YY_(msgid) msgid +# endif +#endif + +/* Suppress unused-variable warnings by "using" E. */ +#if ! defined lint || defined __GNUC__ +# define YYUSE(e) ((void) (e)) +#else +# define YYUSE(e) /* empty */ +#endif + +/* Identity function, used to suppress warnings about constant conditions. */ +#ifndef lint +# define YYID(n) (n) +#else +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static int +YYID (int i) +#else +static int +YYID (i) + int i; +#endif +{ + return i; +} +#endif + +#if ! defined yyoverflow || YYERROR_VERBOSE + +/* The parser invokes alloca or malloc; define the necessary symbols. */ + +# ifdef YYSTACK_USE_ALLOCA +# if YYSTACK_USE_ALLOCA +# ifdef __GNUC__ +# define YYSTACK_ALLOC __builtin_alloca +# elif defined __BUILTIN_VA_ARG_INCR +# include /* INFRINGES ON USER NAME SPACE */ +# elif defined _AIX +# define YYSTACK_ALLOC __alloca +# elif defined _MSC_VER +# include /* INFRINGES ON USER NAME SPACE */ +# define alloca _alloca +# else +# define YYSTACK_ALLOC alloca +# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +# include /* INFRINGES ON USER NAME SPACE */ +# ifndef _STDLIB_H +# define _STDLIB_H 1 +# endif +# endif +# endif +# endif +# endif + +# ifdef YYSTACK_ALLOC + /* Pacify GCC's `empty if-body' warning. */ +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) +# ifndef YYSTACK_ALLOC_MAXIMUM + /* The OS might guarantee only one guard page at the bottom of the stack, + and a page size can be as small as 4096 bytes. So we cannot safely + invoke alloca (N) if N exceeds 4096. Use a slightly smaller number + to allow for a few compiler-allocated temporary stack slots. */ +# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */ +# endif +# else +# define YYSTACK_ALLOC YYMALLOC +# define YYSTACK_FREE YYFREE +# ifndef YYSTACK_ALLOC_MAXIMUM +# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM +# endif +# if (defined __cplusplus && ! defined _STDLIB_H \ + && ! ((defined YYMALLOC || defined malloc) \ + && (defined YYFREE || defined free))) +# include /* INFRINGES ON USER NAME SPACE */ +# ifndef _STDLIB_H +# define _STDLIB_H 1 +# endif +# endif +# ifndef YYMALLOC +# define YYMALLOC malloc +# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ +# endif +# endif +# ifndef YYFREE +# define YYFREE free +# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +void free (void *); /* INFRINGES ON USER NAME SPACE */ +# endif +# endif +# endif +#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ + + +#if (! defined yyoverflow \ + && (! defined __cplusplus \ + || (defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL \ + && defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) + +/* A type that is properly aligned for any stack member. */ +union yyalloc +{ + yytype_int16 yyss; + YYSTYPE yyvs; + YYLTYPE yyls; +}; + +/* The size of the maximum gap between one aligned stack and the next. */ +# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) + +/* The size of an array large to enough to hold all stacks, each with + N elements. */ +# define YYSTACK_BYTES(N) \ + ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \ + + 2 * YYSTACK_GAP_MAXIMUM) + +/* Copy COUNT objects from FROM to TO. The source and destination do + not overlap. */ +# ifndef YYCOPY +# if defined __GNUC__ && 1 < __GNUC__ +# define YYCOPY(To, From, Count) \ + __builtin_memcpy (To, From, (Count) * sizeof (*(From))) +# else +# define YYCOPY(To, From, Count) \ + do \ + { \ + YYSIZE_T yyi; \ + for (yyi = 0; yyi < (Count); yyi++) \ + (To)[yyi] = (From)[yyi]; \ + } \ + while (YYID (0)) +# endif +# endif + +/* Relocate STACK from its old location to the new one. The + local variables YYSIZE and YYSTACKSIZE give the old and new number of + elements in the stack, and YYPTR gives the new location of the + stack. Advance YYPTR to a properly aligned location for the next + stack. */ +# define YYSTACK_RELOCATE(Stack) \ + do \ + { \ + YYSIZE_T yynewbytes; \ + YYCOPY (&yyptr->Stack, Stack, yysize); \ + Stack = &yyptr->Stack; \ + yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ + yyptr += yynewbytes / sizeof (*yyptr); \ + } \ + while (YYID (0)) + +#endif + +/* YYFINAL -- State number of the termination state. */ +#define YYFINAL 5 +/* YYLAST -- Last index in YYTABLE. */ +#define YYLAST 52 + +/* YYNTOKENS -- Number of terminals. */ +#define YYNTOKENS 31 +/* YYNNTS -- Number of nonterminals. */ +#define YYNNTS 21 +/* YYNRULES -- Number of rules. */ +#define YYNRULES 36 +/* YYNRULES -- Number of states. */ +#define YYNSTATES 70 + +/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ +#define YYUNDEFTOK 2 +#define YYMAXUTOK 285 + +#define YYTRANSLATE(YYX) \ + ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) + +/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ +static const yytype_uint8 yytranslate[] = +{ + 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, + 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, + 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, + 25, 26, 27, 28, 29, 30 +}; + +#if YYDEBUG +/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in + YYRHS. */ +static const yytype_uint8 yyprhs[] = +{ + 0, 0, 3, 8, 11, 12, 14, 16, 18, 20, + 23, 25, 28, 32, 33, 36, 40, 41, 45, 47, + 49, 51, 55, 63, 64, 67, 72, 74, 77, 78, + 82, 90, 92, 96, 99, 100, 104 +}; + +/* YYRHS -- A `-1'-separated list of the rules' RHS. */ +static const yytype_int8 yyrhs[] = +{ + 32, 0, -1, 3, 36, 33, 4, -1, 33, 34, + -1, -1, 42, -1, 47, -1, 51, -1, 35, -1, + 5, 25, -1, 6, -1, 18, 19, -1, 18, 37, + 19, -1, -1, 38, 39, -1, 38, 39, 15, -1, + -1, 40, 21, 40, -1, 40, -1, 23, -1, 25, + -1, 16, 24, 17, -1, 8, 36, 41, 12, 22, + 25, 14, -1, -1, 20, 24, -1, 16, 24, 43, + 17, -1, 44, -1, 16, 17, -1, -1, 11, 36, + 25, -1, 7, 36, 44, 13, 46, 45, 14, -1, + 40, -1, 40, 21, 40, -1, 48, 49, -1, -1, + 18, 49, 19, -1, 9, 50, 22, 10, 22, 14, + -1 +}; + +/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ +static const yytype_uint8 yyrline[] = +{ + 0, 124, 124, 130, 130, 131, 131, 131, 131, 133, + 133, 136, 138, 140, 141, 148, 154, 156, 163, 169, + 169, 171, 172, 192, 192, 193, 200, 201, 203, 204, + 212, 250, 250, 251, 251, 252, 254 +}; +#endif + +#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE +/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. + First, the terminals, then, starting at YYNTOKENS, nonterminals. */ +static const char *const yytname[] = +{ + "$end", "error", "$undefined", "\"\\\\begin{tikzpicture}\"", + "\"\\\\end{tikzpicture}\"", "\"\\\\begin{pgfonlayer}\"", + "\"\\\\end{pgfonlayer}\"", "\"\\\\draw\"", "\"\\\\node\"", + "\"\\\\path\"", "\"rectangle\"", "\"node\"", "\"at\"", "\"to\"", "\";\"", + "\",\"", "\"(\"", "\")\"", "\"[\"", "\"]\"", "\".\"", "\"=\"", + "\"co-ordinate\"", "\"key/value string\"", "\"string\"", + "\"{-delimited string\"", "\"unknown \\\\begin command\"", + "\"unknown \\\\end command\"", "\"unknown latex command\"", + "\"unknown string\"", "\"unclosed {-delimited string\"", "$accept", + "tikzpicture", "tikzcmds", "tikzcmd", "ignore", "optproperties", + "properties", "extraproperties", "property", "val", "nodename", "node", + "optanchor", "noderef", "optnoderef", "optedgenode", "edge", + "ignoreprop", "ignoreprops", "optignoreprops", "boundingbox", 0 +}; +#endif + +# ifdef YYPRINT +/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to + token YYLEX-NUM. */ +static const yytype_uint16 yytoknum[] = +{ + 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, + 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, + 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, + 285 +}; +# endif + +/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ +static const yytype_uint8 yyr1[] = +{ + 0, 31, 32, 33, 33, 34, 34, 34, 34, 35, + 35, 36, 36, 36, 37, 38, 38, 39, 39, 40, + 40, 41, 42, 43, 43, 44, 45, 45, 46, 46, + 47, 48, 48, 49, 49, 50, 51 +}; + +/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ +static const yytype_uint8 yyr2[] = +{ + 0, 2, 4, 2, 0, 1, 1, 1, 1, 2, + 1, 2, 3, 0, 2, 3, 0, 3, 1, 1, + 1, 3, 7, 0, 2, 4, 1, 2, 0, 3, + 7, 1, 3, 2, 0, 3, 6 +}; + +/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state + STATE-NUM when YYTABLE doesn't specify something else to do. Zero + means the default is an error. */ +static const yytype_uint8 yydefact[] = +{ + 0, 13, 0, 16, 4, 1, 11, 0, 0, 0, + 12, 19, 20, 14, 18, 2, 0, 10, 13, 13, + 0, 3, 8, 5, 6, 7, 15, 0, 9, 0, + 0, 34, 0, 17, 0, 0, 0, 0, 31, 34, + 0, 0, 23, 28, 0, 0, 0, 33, 35, 0, + 0, 0, 13, 0, 21, 0, 32, 0, 24, 25, + 0, 0, 26, 0, 0, 36, 29, 27, 30, 22 +}; + +/* YYDEFGOTO[NTERM-NUM]. */ +static const yytype_int8 yydefgoto[] = +{ + -1, 2, 9, 21, 22, 4, 7, 8, 13, 38, + 37, 23, 51, 35, 63, 53, 24, 39, 40, 32, + 25 +}; + +/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing + STATE-NUM. */ +#define YYPACT_NINF -20 +static const yytype_int8 yypact[] = +{ + 9, -4, 15, -3, -20, -20, -20, -2, -12, 0, + -20, -20, -20, 3, -1, -20, 1, -20, -4, -4, + 4, -20, -20, -20, -20, -20, -20, -12, -20, 5, + 7, -12, 2, -20, 6, 12, 8, 16, 10, -12, + 14, 17, 19, 18, 20, 21, -12, -20, -20, 22, + 23, 24, -4, 26, -20, 11, -20, 31, -20, -20, + 25, -14, -20, 32, 34, -20, -20, -20, -20, -20 +}; + +/* YYPGOTO[NTERM-NUM]. */ +static const yytype_int8 yypgoto[] = +{ + -20, -20, -20, -20, -20, -17, -20, -20, -20, -8, + -20, -20, -20, -19, -20, -20, -20, -20, 13, -20, + -20 +}; + +/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If + positive, shift that token. If negative, reduce the rule which + number is the opposite. If zero, do what YYDEFACT says. + If YYTABLE_NINF, syntax error. */ +#define YYTABLE_NINF -1 +static const yytype_uint8 yytable[] = +{ + 14, 29, 30, 67, 15, 16, 17, 18, 19, 20, + 42, 11, 1, 12, 3, 5, 6, 10, 26, 33, + 27, 34, 31, 36, 41, 43, 28, 49, 45, 52, + 42, 46, 44, 48, 62, 60, 64, 54, 56, 50, + 0, 59, 61, 55, 57, 65, 68, 58, 69, 0, + 66, 0, 47 +}; + +static const yytype_int8 yycheck[] = +{ + 8, 18, 19, 17, 4, 5, 6, 7, 8, 9, + 24, 23, 3, 25, 18, 0, 19, 19, 15, 27, + 21, 16, 18, 16, 22, 13, 25, 10, 12, 11, + 24, 21, 24, 19, 53, 52, 25, 17, 46, 20, + -1, 17, 16, 22, 22, 14, 14, 24, 14, -1, + 25, -1, 39 +}; + +/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing + symbol of state STATE-NUM. */ +static const yytype_uint8 yystos[] = +{ + 0, 3, 32, 18, 36, 0, 19, 37, 38, 33, + 19, 23, 25, 39, 40, 4, 5, 6, 7, 8, + 9, 34, 35, 42, 47, 51, 15, 21, 25, 36, + 36, 18, 50, 40, 16, 44, 16, 41, 40, 48, + 49, 22, 24, 13, 24, 12, 21, 49, 19, 10, + 20, 43, 11, 46, 17, 22, 40, 22, 24, 17, + 36, 16, 44, 45, 25, 14, 25, 17, 14, 14 +}; + +#define yyerrok (yyerrstatus = 0) +#define yyclearin (yychar = YYEMPTY) +#define YYEMPTY (-2) +#define YYEOF 0 + +#define YYACCEPT goto yyacceptlab +#define YYABORT goto yyabortlab +#define YYERROR goto yyerrorlab + + +/* Like YYERROR except do call yyerror. This remains here temporarily + to ease the transition to the new meaning of YYERROR, for GCC. + Once GCC version 2 has supplanted version 1, this can go. */ + +#define YYFAIL goto yyerrlab + +#define YYRECOVERING() (!!yyerrstatus) + +#define YYBACKUP(Token, Value) \ +do \ + if (yychar == YYEMPTY && yylen == 1) \ + { \ + yychar = (Token); \ + yylval = (Value); \ + yytoken = YYTRANSLATE (yychar); \ + YYPOPSTACK (1); \ + goto yybackup; \ + } \ + else \ + { \ + yyerror (&yylloc, scanner, YY_("syntax error: cannot back up")); \ + YYERROR; \ + } \ +while (YYID (0)) + + +#define YYTERROR 1 +#define YYERRCODE 256 + + +/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. + If N is 0, then set CURRENT to the empty location which ends + the previous symbol: RHS[0] (always defined). */ + +#define YYRHSLOC(Rhs, K) ((Rhs)[K]) +#ifndef YYLLOC_DEFAULT +# define YYLLOC_DEFAULT(Current, Rhs, N) \ + do \ + if (YYID (N)) \ + { \ + (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ + (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ + (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ + (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ + } \ + else \ + { \ + (Current).first_line = (Current).last_line = \ + YYRHSLOC (Rhs, 0).last_line; \ + (Current).first_column = (Current).last_column = \ + YYRHSLOC (Rhs, 0).last_column; \ + } \ + while (YYID (0)) +#endif + + +/* YY_LOCATION_PRINT -- Print the location on the stream. + This macro was not mandated originally: define only if we know + we won't break user code: when these are the locations we know. */ + +#ifndef YY_LOCATION_PRINT +# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL +# define YY_LOCATION_PRINT(File, Loc) \ + fprintf (File, "%d.%d-%d.%d", \ + (Loc).first_line, (Loc).first_column, \ + (Loc).last_line, (Loc).last_column) +# else +# define YY_LOCATION_PRINT(File, Loc) ((void) 0) +# endif +#endif + + +/* YYLEX -- calling `yylex' with the right arguments. */ + +#ifdef YYLEX_PARAM +# define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM) +#else +# define YYLEX yylex (&yylval, &yylloc, scanner) +#endif + +/* Enable debugging if requested. */ +#if YYDEBUG + +# ifndef YYFPRINTF +# include /* INFRINGES ON USER NAME SPACE */ +# define YYFPRINTF fprintf +# endif + +# define YYDPRINTF(Args) \ +do { \ + if (yydebug) \ + YYFPRINTF Args; \ +} while (YYID (0)) + +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ +do { \ + if (yydebug) \ + { \ + YYFPRINTF (stderr, "%s ", Title); \ + yy_symbol_print (stderr, \ + Type, Value, Location, scanner); \ + YYFPRINTF (stderr, "\n"); \ + } \ +} while (YYID (0)) + + +/*--------------------------------. +| Print this symbol on YYOUTPUT. | +`--------------------------------*/ + +/*ARGSUSED*/ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp, void *scanner) +#else +static void +yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp, scanner) + FILE *yyoutput; + int yytype; + YYSTYPE const * const yyvaluep; + YYLTYPE const * const yylocationp; + void *scanner; +#endif +{ + if (!yyvaluep) + return; + YYUSE (yylocationp); + YYUSE (scanner); +# ifdef YYPRINT + if (yytype < YYNTOKENS) + YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); +# else + YYUSE (yyoutput); +# endif + switch (yytype) + { + default: + break; + } +} + + +/*--------------------------------. +| Print this symbol on YYOUTPUT. | +`--------------------------------*/ + +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp, void *scanner) +#else +static void +yy_symbol_print (yyoutput, yytype, yyvaluep, yylocationp, scanner) + FILE *yyoutput; + int yytype; + YYSTYPE const * const yyvaluep; + YYLTYPE const * const yylocationp; + void *scanner; +#endif +{ + if (yytype < YYNTOKENS) + YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); + else + YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); + + YY_LOCATION_PRINT (yyoutput, *yylocationp); + YYFPRINTF (yyoutput, ": "); + yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp, scanner); + YYFPRINTF (yyoutput, ")"); +} + +/*------------------------------------------------------------------. +| yy_stack_print -- Print the state stack from its BOTTOM up to its | +| TOP (included). | +`------------------------------------------------------------------*/ + +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yy_stack_print (yytype_int16 *bottom, yytype_int16 *top) +#else +static void +yy_stack_print (bottom, top) + yytype_int16 *bottom; + yytype_int16 *top; +#endif +{ + YYFPRINTF (stderr, "Stack now"); + for (; bottom <= top; ++bottom) + YYFPRINTF (stderr, " %d", *bottom); + YYFPRINTF (stderr, "\n"); +} + +# define YY_STACK_PRINT(Bottom, Top) \ +do { \ + if (yydebug) \ + yy_stack_print ((Bottom), (Top)); \ +} while (YYID (0)) + + +/*------------------------------------------------. +| Report that the YYRULE is going to be reduced. | +`------------------------------------------------*/ + +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yy_reduce_print (YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule, void *scanner) +#else +static void +yy_reduce_print (yyvsp, yylsp, yyrule, scanner) + YYSTYPE *yyvsp; + YYLTYPE *yylsp; + int yyrule; + void *scanner; +#endif +{ + int yynrhs = yyr2[yyrule]; + int yyi; + unsigned long int yylno = yyrline[yyrule]; + YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", + yyrule - 1, yylno); + /* The symbols being reduced. */ + for (yyi = 0; yyi < yynrhs; yyi++) + { + fprintf (stderr, " $%d = ", yyi + 1); + yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], + &(yyvsp[(yyi + 1) - (yynrhs)]) + , &(yylsp[(yyi + 1) - (yynrhs)]) , scanner); + fprintf (stderr, "\n"); + } +} + +# define YY_REDUCE_PRINT(Rule) \ +do { \ + if (yydebug) \ + yy_reduce_print (yyvsp, yylsp, Rule, scanner); \ +} while (YYID (0)) + +/* Nonzero means print parse trace. It is left uninitialized so that + multiple parsers can coexist. */ +int yydebug; +#else /* !YYDEBUG */ +# define YYDPRINTF(Args) +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) +# define YY_STACK_PRINT(Bottom, Top) +# define YY_REDUCE_PRINT(Rule) +#endif /* !YYDEBUG */ + + +/* YYINITDEPTH -- initial size of the parser's stacks. */ +#ifndef YYINITDEPTH +# define YYINITDEPTH 200 +#endif + +/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only + if the built-in stack extension method is used). + + Do not make this value too large; the results are undefined if + YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH) + evaluated with infinite-precision integer arithmetic. */ + +#ifndef YYMAXDEPTH +# define YYMAXDEPTH 10000 +#endif + + + +#if YYERROR_VERBOSE + +# ifndef yystrlen +# if defined __GLIBC__ && defined _STRING_H +# define yystrlen strlen +# else +/* Return the length of YYSTR. */ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static YYSIZE_T +yystrlen (const char *yystr) +#else +static YYSIZE_T +yystrlen (yystr) + const char *yystr; +#endif +{ + YYSIZE_T yylen; + for (yylen = 0; yystr[yylen]; yylen++) + continue; + return yylen; +} +# endif +# endif + +# ifndef yystpcpy +# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE +# define yystpcpy stpcpy +# else +/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in + YYDEST. */ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static char * +yystpcpy (char *yydest, const char *yysrc) +#else +static char * +yystpcpy (yydest, yysrc) + char *yydest; + const char *yysrc; +#endif +{ + char *yyd = yydest; + const char *yys = yysrc; + + while ((*yyd++ = *yys++) != '\0') + continue; + + return yyd - 1; +} +# endif +# endif + +# ifndef yytnamerr +/* Copy to YYRES the contents of YYSTR after stripping away unnecessary + quotes and backslashes, so that it's suitable for yyerror. The + heuristic is that double-quoting is unnecessary unless the string + contains an apostrophe, a comma, or backslash (other than + backslash-backslash). YYSTR is taken from yytname. If YYRES is + null, do not copy; instead, return the length of what the result + would have been. */ +static YYSIZE_T +yytnamerr (char *yyres, const char *yystr) +{ + if (*yystr == '"') + { + YYSIZE_T yyn = 0; + char const *yyp = yystr; + + for (;;) + switch (*++yyp) + { + case '\'': + case ',': + goto do_not_strip_quotes; + + case '\\': + if (*++yyp != '\\') + goto do_not_strip_quotes; + /* Fall through. */ + default: + if (yyres) + yyres[yyn] = *yyp; + yyn++; + break; + + case '"': + if (yyres) + yyres[yyn] = '\0'; + return yyn; + } + do_not_strip_quotes: ; + } + + if (! yyres) + return yystrlen (yystr); + + return yystpcpy (yyres, yystr) - yyres; +} +# endif + +/* Copy into YYRESULT an error message about the unexpected token + YYCHAR while in state YYSTATE. Return the number of bytes copied, + including the terminating null byte. If YYRESULT is null, do not + copy anything; just return the number of bytes that would be + copied. As a special case, return 0 if an ordinary "syntax error" + message will do. Return YYSIZE_MAXIMUM if overflow occurs during + size calculation. */ +static YYSIZE_T +yysyntax_error (char *yyresult, int yystate, int yychar) +{ + int yyn = yypact[yystate]; + + if (! (YYPACT_NINF < yyn && yyn <= YYLAST)) + return 0; + else + { + int yytype = YYTRANSLATE (yychar); + YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]); + YYSIZE_T yysize = yysize0; + YYSIZE_T yysize1; + int yysize_overflow = 0; + enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; + char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; + int yyx; + +# if 0 + /* This is so xgettext sees the translatable formats that are + constructed on the fly. */ + YY_("syntax error, unexpected %s"); + YY_("syntax error, unexpected %s, expecting %s"); + YY_("syntax error, unexpected %s, expecting %s or %s"); + YY_("syntax error, unexpected %s, expecting %s or %s or %s"); + YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"); +# endif + char *yyfmt; + char const *yyf; + static char const yyunexpected[] = "syntax error, unexpected %s"; + static char const yyexpecting[] = ", expecting %s"; + static char const yyor[] = " or %s"; + char yyformat[sizeof yyunexpected + + sizeof yyexpecting - 1 + + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2) + * (sizeof yyor - 1))]; + char const *yyprefix = yyexpecting; + + /* Start YYX at -YYN if negative to avoid negative indexes in + YYCHECK. */ + int yyxbegin = yyn < 0 ? -yyn : 0; + + /* Stay within bounds of both yycheck and yytname. */ + int yychecklim = YYLAST - yyn + 1; + int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; + int yycount = 1; + + yyarg[0] = yytname[yytype]; + yyfmt = yystpcpy (yyformat, yyunexpected); + + for (yyx = yyxbegin; yyx < yyxend; ++yyx) + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) + { + if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) + { + yycount = 1; + yysize = yysize0; + yyformat[sizeof yyunexpected - 1] = '\0'; + break; + } + yyarg[yycount++] = yytname[yyx]; + yysize1 = yysize + yytnamerr (0, yytname[yyx]); + yysize_overflow |= (yysize1 < yysize); + yysize = yysize1; + yyfmt = yystpcpy (yyfmt, yyprefix); + yyprefix = yyor; + } + + yyf = YY_(yyformat); + yysize1 = yysize + yystrlen (yyf); + yysize_overflow |= (yysize1 < yysize); + yysize = yysize1; + + if (yysize_overflow) + return YYSIZE_MAXIMUM; + + if (yyresult) + { + /* Avoid sprintf, as that infringes on the user's name space. + Don't have undefined behavior even if the translation + produced a string with the wrong number of "%s"s. */ + char *yyp = yyresult; + int yyi = 0; + while ((*yyp = *yyf) != '\0') + { + if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) + { + yyp += yytnamerr (yyp, yyarg[yyi++]); + yyf += 2; + } + else + { + yyp++; + yyf++; + } + } + } + return yysize; + } +} +#endif /* YYERROR_VERBOSE */ + + +/*-----------------------------------------------. +| Release the memory associated to this symbol. | +`-----------------------------------------------*/ + +/*ARGSUSED*/ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static void +yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp, void *scanner) +#else +static void +yydestruct (yymsg, yytype, yyvaluep, yylocationp, scanner) + const char *yymsg; + int yytype; + YYSTYPE *yyvaluep; + YYLTYPE *yylocationp; + void *scanner; +#endif +{ + YYUSE (yyvaluep); + YYUSE (yylocationp); + YYUSE (scanner); + + if (!yymsg) + yymsg = "Deleting"; + YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); + + switch (yytype) + { + + default: + break; + } +} + + +/* Prevent warnings from -Wmissing-prototypes. */ + +#ifdef YYPARSE_PARAM +#if defined __STDC__ || defined __cplusplus +int yyparse (void *YYPARSE_PARAM); +#else +int yyparse (); +#endif +#else /* ! YYPARSE_PARAM */ +#if defined __STDC__ || defined __cplusplus +int yyparse (void *scanner); +#else +int yyparse (); +#endif +#endif /* ! YYPARSE_PARAM */ + + + + + + +/*----------. +| yyparse. | +`----------*/ + +#ifdef YYPARSE_PARAM +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +int +yyparse (void *YYPARSE_PARAM) +#else +int +yyparse (YYPARSE_PARAM) + void *YYPARSE_PARAM; +#endif +#else /* ! YYPARSE_PARAM */ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +int +yyparse (void *scanner) +#else +int +yyparse (scanner) + void *scanner; +#endif +#endif +{ + /* The look-ahead symbol. */ +int yychar; + +/* The semantic value of the look-ahead symbol. */ +YYSTYPE yylval; + +/* Number of syntax errors so far. */ +int yynerrs; +/* Location data for the look-ahead symbol. */ +YYLTYPE yylloc; + + int yystate; + int yyn; + int yyresult; + /* Number of tokens to shift before error messages enabled. */ + int yyerrstatus; + /* Look-ahead token as an internal (translated) token number. */ + int yytoken = 0; +#if YYERROR_VERBOSE + /* Buffer for error messages, and its allocated size. */ + char yymsgbuf[128]; + char *yymsg = yymsgbuf; + YYSIZE_T yymsg_alloc = sizeof yymsgbuf; +#endif + + /* Three stacks and their tools: + `yyss': related to states, + `yyvs': related to semantic values, + `yyls': related to locations. + + Refer to the stacks thru separate pointers, to allow yyoverflow + to reallocate them elsewhere. */ + + /* The state stack. */ + yytype_int16 yyssa[YYINITDEPTH]; + yytype_int16 *yyss = yyssa; + yytype_int16 *yyssp; + + /* The semantic value stack. */ + YYSTYPE yyvsa[YYINITDEPTH]; + YYSTYPE *yyvs = yyvsa; + YYSTYPE *yyvsp; + + /* The location stack. */ + YYLTYPE yylsa[YYINITDEPTH]; + YYLTYPE *yyls = yylsa; + YYLTYPE *yylsp; + /* The locations where the error started and ended. */ + YYLTYPE yyerror_range[2]; + +#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N), yylsp -= (N)) + + YYSIZE_T yystacksize = YYINITDEPTH; + + /* The variables used to return semantic value and location from the + action routines. */ + YYSTYPE yyval; + YYLTYPE yyloc; + + /* The number of symbols on the RHS of the reduced rule. + Keep to zero when no symbol should be popped. */ + int yylen = 0; + + YYDPRINTF ((stderr, "Starting parse\n")); + + yystate = 0; + yyerrstatus = 0; + yynerrs = 0; + yychar = YYEMPTY; /* Cause a token to be read. */ + + /* Initialize stack pointers. + Waste one element of value and location stack + so that they stay on the same level as the state stack. + The wasted elements are never initialized. */ + + yyssp = yyss; + yyvsp = yyvs; + yylsp = yyls; +#if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL + /* Initialize the default location before parsing starts. */ + yylloc.first_line = yylloc.last_line = 1; + yylloc.first_column = yylloc.last_column = 0; +#endif + + + /* User initialization code. */ +#line 75 "../tikzit/src/data/tikzparser.y" +{ + yylloc.first_column = yylloc.last_column = 0; +} +/* Line 1078 of yacc.c. */ +#line 1337 "../tikzit/src/data/tikzparser.parser.cpp" + goto yysetstate; + +/*------------------------------------------------------------. +| yynewstate -- Push a new state, which is found in yystate. | +`------------------------------------------------------------*/ + yynewstate: + /* In all cases, when you get here, the value and location stacks + have just been pushed. So pushing a state here evens the stacks. */ + yyssp++; + + yysetstate: + *yyssp = yystate; + + if (yyss + yystacksize - 1 <= yyssp) + { + /* Get the current used size of the three stacks, in elements. */ + YYSIZE_T yysize = yyssp - yyss + 1; + +#ifdef yyoverflow + { + /* Give user a chance to reallocate the stack. Use copies of + these so that the &'s don't force the real ones into + memory. */ + YYSTYPE *yyvs1 = yyvs; + yytype_int16 *yyss1 = yyss; + YYLTYPE *yyls1 = yyls; + + /* Each stack pointer address is followed by the size of the + data in use in that stack, in bytes. This used to be a + conditional around just the two extra args, but that might + be undefined if yyoverflow is a macro. */ + yyoverflow (YY_("memory exhausted"), + &yyss1, yysize * sizeof (*yyssp), + &yyvs1, yysize * sizeof (*yyvsp), + &yyls1, yysize * sizeof (*yylsp), + &yystacksize); + yyls = yyls1; + yyss = yyss1; + yyvs = yyvs1; + } +#else /* no yyoverflow */ +# ifndef YYSTACK_RELOCATE + goto yyexhaustedlab; +# else + /* Extend the stack our own way. */ + if (YYMAXDEPTH <= yystacksize) + goto yyexhaustedlab; + yystacksize *= 2; + if (YYMAXDEPTH < yystacksize) + yystacksize = YYMAXDEPTH; + + { + yytype_int16 *yyss1 = yyss; + union yyalloc *yyptr = + (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); + if (! yyptr) + goto yyexhaustedlab; + YYSTACK_RELOCATE (yyss); + YYSTACK_RELOCATE (yyvs); + YYSTACK_RELOCATE (yyls); +# undef YYSTACK_RELOCATE + if (yyss1 != yyssa) + YYSTACK_FREE (yyss1); + } +# endif +#endif /* no yyoverflow */ + + yyssp = yyss + yysize - 1; + yyvsp = yyvs + yysize - 1; + yylsp = yyls + yysize - 1; + + YYDPRINTF ((stderr, "Stack size increased to %lu\n", + (unsigned long int) yystacksize)); + + if (yyss + yystacksize - 1 <= yyssp) + YYABORT; + } + + YYDPRINTF ((stderr, "Entering state %d\n", yystate)); + + goto yybackup; + +/*-----------. +| yybackup. | +`-----------*/ +yybackup: + + /* Do appropriate processing given the current state. Read a + look-ahead token if we need one and don't already have one. */ + + /* First try to decide what to do without reference to look-ahead token. */ + yyn = yypact[yystate]; + if (yyn == YYPACT_NINF) + goto yydefault; + + /* Not known => get a look-ahead token if don't already have one. */ + + /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */ + if (yychar == YYEMPTY) + { + YYDPRINTF ((stderr, "Reading a token: ")); + yychar = YYLEX; + } + + if (yychar <= YYEOF) + { + yychar = yytoken = YYEOF; + YYDPRINTF ((stderr, "Now at end of input.\n")); + } + else + { + yytoken = YYTRANSLATE (yychar); + YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc); + } + + /* If the proper action on seeing token YYTOKEN is to reduce or to + detect an error, take that action. */ + yyn += yytoken; + if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken) + goto yydefault; + yyn = yytable[yyn]; + if (yyn <= 0) + { + if (yyn == 0 || yyn == YYTABLE_NINF) + goto yyerrlab; + yyn = -yyn; + goto yyreduce; + } + + if (yyn == YYFINAL) + YYACCEPT; + + /* Count tokens shifted since error; after three, turn off error + status. */ + if (yyerrstatus) + yyerrstatus--; + + /* Shift the look-ahead token. */ + YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); + + /* Discard the shifted token unless it is eof. */ + if (yychar != YYEOF) + yychar = YYEMPTY; + + yystate = yyn; + *++yyvsp = yylval; + *++yylsp = yylloc; + goto yynewstate; + + +/*-----------------------------------------------------------. +| yydefault -- do the default action for the current state. | +`-----------------------------------------------------------*/ +yydefault: + yyn = yydefact[yystate]; + if (yyn == 0) + goto yyerrlab; + goto yyreduce; + + +/*-----------------------------. +| yyreduce -- Do a reduction. | +`-----------------------------*/ +yyreduce: + /* yyn is the number of a rule to reduce with. */ + yylen = yyr2[yyn]; + + /* If YYLEN is nonzero, implement the default value of the action: + `$$ = $1'. + + Otherwise, the following line sets YYVAL to garbage. + This behavior is undocumented and Bison + users should not rely upon it. Assigning to YYVAL + unconditionally makes the parser a bit smaller, and it avoids a + GCC warning that YYVAL may be used uninitialized. */ + yyval = yyvsp[1-yylen]; + + /* Default location. */ + YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen); + YY_REDUCE_PRINT (yyn); + switch (yyn) + { + case 2: +#line 125 "../tikzit/src/data/tikzparser.y" + { + if ((yyvsp[(2) - (4)].data)) { + assembler->graph()->setData((yyvsp[(2) - (4)].data)); + } + ;} + break; + + case 11: +#line 137 "../tikzit/src/data/tikzparser.y" + { (yyval.data) = 0; ;} + break; + + case 12: +#line 139 "../tikzit/src/data/tikzparser.y" + { (yyval.data) = (yyvsp[(2) - (3)].data); ;} + break; + + case 13: +#line 140 "../tikzit/src/data/tikzparser.y" + { (yyval.data) = 0; ;} + break; + + case 14: +#line 142 "../tikzit/src/data/tikzparser.y" + { + (yyvsp[(1) - (2)].data)->add(*(yyvsp[(2) - (2)].prop)); + delete (yyvsp[(2) - (2)].prop); + (yyval.data) = (yyvsp[(1) - (2)].data); + ;} + break; + + case 15: +#line 149 "../tikzit/src/data/tikzparser.y" + { + (yyvsp[(1) - (3)].data)->add(*(yyvsp[(2) - (3)].prop)); + delete (yyvsp[(2) - (3)].prop); + (yyval.data) = (yyvsp[(1) - (3)].data); + ;} + break; + + case 16: +#line 154 "../tikzit/src/data/tikzparser.y" + { (yyval.data) = new GraphElementData(); ;} + break; + + case 17: +#line 157 "../tikzit/src/data/tikzparser.y" + { + GraphElementProperty *p = new GraphElementProperty(QString((yyvsp[(1) - (3)].str)),QString((yyvsp[(3) - (3)].str))); + free((yyvsp[(1) - (3)].str)); + free((yyvsp[(3) - (3)].str)); + (yyval.prop) = p; + ;} + break; + + case 18: +#line 164 "../tikzit/src/data/tikzparser.y" + { + GraphElementProperty *a = new GraphElementProperty(QString((yyvsp[(1) - (1)].str))); + free((yyvsp[(1) - (1)].str)); + (yyval.prop) = a; + ;} + break; + + case 19: +#line 169 "../tikzit/src/data/tikzparser.y" + { (yyval.str) = (yyvsp[(1) - (1)].str); ;} + break; + + case 20: +#line 169 "../tikzit/src/data/tikzparser.y" + { (yyval.str) = (yyvsp[(1) - (1)].str); ;} + break; + + case 21: +#line 171 "../tikzit/src/data/tikzparser.y" + { (yyval.str) = (yyvsp[(2) - (3)].str); ;} + break; + + case 22: +#line 173 "../tikzit/src/data/tikzparser.y" + { + Node *node = new Node(); + + if ((yyvsp[(2) - (7)].data)) { + node->setData((yyvsp[(2) - (7)].data)); + } + //qDebug() << "node name: " << $3; + node->setName(QString((yyvsp[(3) - (7)].str))); + node->setLabel(QString((yyvsp[(6) - (7)].str))); + free((yyvsp[(3) - (7)].str)); + free((yyvsp[(6) - (7)].str)); + + node->setPoint(*(yyvsp[(5) - (7)].pt)); + delete (yyvsp[(5) - (7)].pt); + + assembler->graph()->addNode(node); + assembler->addNodeToMap(node); + ;} + break; + + case 23: +#line 192 "../tikzit/src/data/tikzparser.y" + { (yyval.str) = 0; ;} + break; + + case 24: +#line 192 "../tikzit/src/data/tikzparser.y" + { (yyval.str) = (yyvsp[(2) - (2)].str); ;} + break; + + case 25: +#line 194 "../tikzit/src/data/tikzparser.y" + { + (yyval.noderef).node = assembler->nodeWithName(QString((yyvsp[(2) - (4)].str))); + free((yyvsp[(2) - (4)].str)); + (yyval.noderef).anchor = (yyvsp[(3) - (4)].str); + ;} + break; + + case 26: +#line 200 "../tikzit/src/data/tikzparser.y" + { (yyval.noderef) = (yyvsp[(1) - (1)].noderef); ;} + break; + + case 27: +#line 201 "../tikzit/src/data/tikzparser.y" + { (yyval.noderef).node = 0; (yyval.noderef).anchor = 0; ;} + break; + + case 28: +#line 203 "../tikzit/src/data/tikzparser.y" + { (yyval.node) = 0; ;} + break; + + case 29: +#line 205 "../tikzit/src/data/tikzparser.y" + { + (yyval.node) = new Node(); + if ((yyvsp[(2) - (3)].data)) + (yyval.node)->setData((yyvsp[(2) - (3)].data)); + (yyval.node)->setLabel(QString((yyvsp[(3) - (3)].str))); + free((yyvsp[(3) - (3)].str)); + ;} + break; + + case 30: +#line 213 "../tikzit/src/data/tikzparser.y" + { + Node *s; + Node *t; + + s = (yyvsp[(3) - (7)].noderef).node; + + if ((yyvsp[(6) - (7)].noderef).node) { + t = (yyvsp[(6) - (7)].noderef).node; + } else { + t = s; + } + + Edge *edge = new Edge(s, t); + if ((yyvsp[(2) - (7)].data)) { + edge->setData((yyvsp[(2) - (7)].data)); + edge->setAttributesFromData(); + } + + if ((yyvsp[(5) - (7)].node)) + edge->setEdgeNode((yyvsp[(5) - (7)].node)); + if ((yyvsp[(3) - (7)].noderef).anchor) { + edge->setSourceAnchor(QString((yyvsp[(3) - (7)].noderef).anchor)); + free((yyvsp[(3) - (7)].noderef).anchor); + } + + if ((yyvsp[(6) - (7)].noderef).node) { + if ((yyvsp[(6) - (7)].noderef).anchor) { + edge->setTargetAnchor(QString((yyvsp[(6) - (7)].noderef).anchor)); + free((yyvsp[(6) - (7)].noderef).anchor); + } + } else { + edge->setTargetAnchor(edge->sourceAnchor()); + } + + assembler->graph()->addEdge(edge); + ;} + break; + + case 36: +#line 255 "../tikzit/src/data/tikzparser.y" + { + assembler->graph()->setBbox(QRectF(*(yyvsp[(3) - (6)].pt), *(yyvsp[(5) - (6)].pt))); + delete (yyvsp[(3) - (6)].pt); + delete (yyvsp[(5) - (6)].pt); + ;} + break; + + +/* Line 1267 of yacc.c. */ +#line 1719 "../tikzit/src/data/tikzparser.parser.cpp" + default: break; + } + YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); + + YYPOPSTACK (yylen); + yylen = 0; + YY_STACK_PRINT (yyss, yyssp); + + *++yyvsp = yyval; + *++yylsp = yyloc; + + /* Now `shift' the result of the reduction. Determine what state + that goes to, based on the state we popped back to and the rule + number reduced by. */ + + yyn = yyr1[yyn]; + + yystate = yypgoto[yyn - YYNTOKENS] + *yyssp; + if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp) + yystate = yytable[yystate]; + else + yystate = yydefgoto[yyn - YYNTOKENS]; + + goto yynewstate; + + +/*------------------------------------. +| yyerrlab -- here on detecting error | +`------------------------------------*/ +yyerrlab: + /* If not already recovering from an error, report this error. */ + if (!yyerrstatus) + { + ++yynerrs; +#if ! YYERROR_VERBOSE + yyerror (&yylloc, scanner, YY_("syntax error")); +#else + { + YYSIZE_T yysize = yysyntax_error (0, yystate, yychar); + if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM) + { + YYSIZE_T yyalloc = 2 * yysize; + if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM)) + yyalloc = YYSTACK_ALLOC_MAXIMUM; + if (yymsg != yymsgbuf) + YYSTACK_FREE (yymsg); + yymsg = (char *) YYSTACK_ALLOC (yyalloc); + if (yymsg) + yymsg_alloc = yyalloc; + else + { + yymsg = yymsgbuf; + yymsg_alloc = sizeof yymsgbuf; + } + } + + if (0 < yysize && yysize <= yymsg_alloc) + { + (void) yysyntax_error (yymsg, yystate, yychar); + yyerror (&yylloc, scanner, yymsg); + } + else + { + yyerror (&yylloc, scanner, YY_("syntax error")); + if (yysize != 0) + goto yyexhaustedlab; + } + } +#endif + } + + yyerror_range[0] = yylloc; + + if (yyerrstatus == 3) + { + /* If just tried and failed to reuse look-ahead token after an + error, discard it. */ + + if (yychar <= YYEOF) + { + /* Return failure if at end of input. */ + if (yychar == YYEOF) + YYABORT; + } + else + { + yydestruct ("Error: discarding", + yytoken, &yylval, &yylloc, scanner); + yychar = YYEMPTY; + } + } + + /* Else will try to reuse look-ahead token after shifting the error + token. */ + goto yyerrlab1; + + +/*---------------------------------------------------. +| yyerrorlab -- error raised explicitly by YYERROR. | +`---------------------------------------------------*/ +yyerrorlab: + + /* Pacify compilers like GCC when the user code never invokes + YYERROR and the label yyerrorlab therefore never appears in user + code. */ + if (/*CONSTCOND*/ 0) + goto yyerrorlab; + + yyerror_range[0] = yylsp[1-yylen]; + /* Do not reclaim the symbols of the rule which action triggered + this YYERROR. */ + YYPOPSTACK (yylen); + yylen = 0; + YY_STACK_PRINT (yyss, yyssp); + yystate = *yyssp; + goto yyerrlab1; + + +/*-------------------------------------------------------------. +| yyerrlab1 -- common code for both syntax error and YYERROR. | +`-------------------------------------------------------------*/ +yyerrlab1: + yyerrstatus = 3; /* Each real token shifted decrements this. */ + + for (;;) + { + yyn = yypact[yystate]; + if (yyn != YYPACT_NINF) + { + yyn += YYTERROR; + if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) + { + yyn = yytable[yyn]; + if (0 < yyn) + break; + } + } + + /* Pop the current state because it cannot handle the error token. */ + if (yyssp == yyss) + YYABORT; + + yyerror_range[0] = *yylsp; + yydestruct ("Error: popping", + yystos[yystate], yyvsp, yylsp, scanner); + YYPOPSTACK (1); + yystate = *yyssp; + YY_STACK_PRINT (yyss, yyssp); + } + + if (yyn == YYFINAL) + YYACCEPT; + + *++yyvsp = yylval; + + yyerror_range[1] = yylloc; + /* Using YYLLOC is tempting, but would change the location of + the look-ahead. YYLOC is available though. */ + YYLLOC_DEFAULT (yyloc, (yyerror_range - 1), 2); + *++yylsp = yyloc; + + /* Shift the error token. */ + YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); + + yystate = yyn; + goto yynewstate; + + +/*-------------------------------------. +| yyacceptlab -- YYACCEPT comes here. | +`-------------------------------------*/ +yyacceptlab: + yyresult = 0; + goto yyreturn; + +/*-----------------------------------. +| yyabortlab -- YYABORT comes here. | +`-----------------------------------*/ +yyabortlab: + yyresult = 1; + goto yyreturn; + +#ifndef yyoverflow +/*-------------------------------------------------. +| yyexhaustedlab -- memory exhaustion comes here. | +`-------------------------------------------------*/ +yyexhaustedlab: + yyerror (&yylloc, scanner, YY_("memory exhausted")); + yyresult = 2; + /* Fall through. */ +#endif + +yyreturn: + if (yychar != YYEOF && yychar != YYEMPTY) + yydestruct ("Cleanup: discarding lookahead", + yytoken, &yylval, &yylloc, scanner); + /* Do not reclaim the symbols of the rule which action triggered + this YYABORT or YYACCEPT. */ + YYPOPSTACK (yylen); + YY_STACK_PRINT (yyss, yyssp); + while (yyssp != yyss) + { + yydestruct ("Cleanup: popping", + yystos[*yyssp], yyvsp, yylsp, scanner); + YYPOPSTACK (1); + } +#ifndef yyoverflow + if (yyss != yyssa) + YYSTACK_FREE (yyss); +#endif +#if YYERROR_VERBOSE + if (yymsg != yymsgbuf) + YYSTACK_FREE (yymsg); +#endif + /* Make sure YYID is used. */ + return YYID (yyresult); +} + + + diff --git a/src/data/tikzparser.parser.hpp b/src/data/tikzparser.parser.hpp new file mode 100644 index 0000000..aaf0e10 --- /dev/null +++ b/src/data/tikzparser.parser.hpp @@ -0,0 +1,139 @@ +/* A Bison parser, made by GNU Bison 2.3. */ + +/* Skeleton interface for Bison's Yacc-like parsers in C + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ + +/* As a special exception, you may create a larger work that contains + part or all of the Bison parser skeleton and distribute that work + under terms of your choice, so long as that work isn't itself a + parser generator using the skeleton or a modified version thereof + as a parser skeleton. Alternatively, if you modify or redistribute + the parser skeleton itself, you may (at your option) remove this + special exception, which will cause the skeleton and the resulting + Bison output files to be licensed under the GNU General Public + License without this special exception. + + This special exception was added by the Free Software Foundation in + version 2.2 of Bison. */ + +/* Tokens. */ +#ifndef YYTOKENTYPE +# define YYTOKENTYPE + /* Put the tokens into the symbol table, so that GDB and other debuggers + know about them. */ + enum yytokentype { + BEGIN_TIKZPICTURE_CMD = 258, + END_TIKZPICTURE_CMD = 259, + BEGIN_PGFONLAYER_CMD = 260, + END_PGFONLAYER_CMD = 261, + DRAW_CMD = 262, + NODE_CMD = 263, + PATH_CMD = 264, + RECTANGLE = 265, + NODE = 266, + AT = 267, + TO = 268, + SEMICOLON = 269, + COMMA = 270, + LEFTPARENTHESIS = 271, + RIGHTPARENTHESIS = 272, + LEFTBRACKET = 273, + RIGHTBRACKET = 274, + FULLSTOP = 275, + EQUALS = 276, + COORD = 277, + PROPSTRING = 278, + REFSTRING = 279, + DELIMITEDSTRING = 280, + UNKNOWN_BEGIN_CMD = 281, + UNKNOWN_END_CMD = 282, + UNKNOWN_CMD = 283, + UNKNOWN_STR = 284, + UNCLOSED_DELIM_STR = 285 + }; +#endif +/* Tokens. */ +#define BEGIN_TIKZPICTURE_CMD 258 +#define END_TIKZPICTURE_CMD 259 +#define BEGIN_PGFONLAYER_CMD 260 +#define END_PGFONLAYER_CMD 261 +#define DRAW_CMD 262 +#define NODE_CMD 263 +#define PATH_CMD 264 +#define RECTANGLE 265 +#define NODE 266 +#define AT 267 +#define TO 268 +#define SEMICOLON 269 +#define COMMA 270 +#define LEFTPARENTHESIS 271 +#define RIGHTPARENTHESIS 272 +#define LEFTBRACKET 273 +#define RIGHTBRACKET 274 +#define FULLSTOP 275 +#define EQUALS 276 +#define COORD 277 +#define PROPSTRING 278 +#define REFSTRING 279 +#define DELIMITEDSTRING 280 +#define UNKNOWN_BEGIN_CMD 281 +#define UNKNOWN_END_CMD 282 +#define UNKNOWN_CMD 283 +#define UNKNOWN_STR 284 +#define UNCLOSED_DELIM_STR 285 + + + + +#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED +typedef union YYSTYPE +#line 43 "../tikzit/src/data/tikzparser.y" +{ + char *str; + GraphElementProperty *prop; + GraphElementData *data; + Node *node; + QPointF *pt; + struct noderef noderef; +} +/* Line 1529 of yacc.c. */ +#line 118 "../tikzit/src/data/tikzparser.parser.hpp" + YYSTYPE; +# define yystype YYSTYPE /* obsolescent; will be withdrawn */ +# define YYSTYPE_IS_DECLARED 1 +# define YYSTYPE_IS_TRIVIAL 1 +#endif + + + +#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED +typedef struct YYLTYPE +{ + int first_line; + int first_column; + int last_line; + int last_column; +} YYLTYPE; +# define yyltype YYLTYPE /* obsolescent; will be withdrawn */ +# define YYLTYPE_IS_DECLARED 1 +# define YYLTYPE_IS_TRIVIAL 1 +#endif + + diff --git a/src/data/tikzparser.y b/src/data/tikzparser.y new file mode 100644 index 0000000..420b8a0 --- /dev/null +++ b/src/data/tikzparser.y @@ -0,0 +1,262 @@ +%{ +/* + * Copyright 2010 Chris Heunen + * Copyright 2010-2013 Aleks Kissinger + * Copyright 2013 K. Johan Paulsson + * Copyright 2013 Alex Merry + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "tikzparserdefs.h" +%} + +/* we use features added to bison 2.4 */ +%require "2.3" + +%error-verbose +/* enable maintaining locations for better error messages */ +%locations +/* the name of the header file */ +/*%defines "common/tikzparser.h"*/ +/* make it re-entrant (no global variables) */ +%pure-parser +/* We use a pure (re-entrant) lexer. This means yylex + will take a void* (opaque) type to maintain its state */ +%lex-param {void *scanner} +/* Since this parser is also pure, yyparse needs to take + that lexer state as an argument */ +%parse-param {void *scanner} + +/* possible data types for semantic values */ +%union { + char *str; + GraphElementProperty *prop; + GraphElementData *data; + Node *node; + QPointF *pt; + struct noderef noderef; +} + +%{ +#include "node.h" +#include "edge.h" +#include "graphelementdata.h" +#include "graphelementproperty.h" + +#include "tikzlexer.h" +#import "tikzgraphassembler.h" +/* the assembler (used by this parser) is stored in the lexer + state as "extra" data */ +#define assembler yyget_extra(scanner) + +/* pass errors off to the assembler */ +void yyerror(YYLTYPE *yylloc, void *scanner, const char *str) { + // TODO: implement reportError() + //assembler->reportError(str, yylloc); + qDebug() << "parse error: " << str; +} +%} + +/* yyloc is set up with first_column = last_column = 1 by default; + however, it makes more sense to think of us being "before the + start of the line" before we parse anything */ +%initial-action { + yylloc.first_column = yylloc.last_column = 0; +} + + +%token BEGIN_TIKZPICTURE_CMD "\\begin{tikzpicture}" +%token END_TIKZPICTURE_CMD "\\end{tikzpicture}" +%token BEGIN_PGFONLAYER_CMD "\\begin{pgfonlayer}" +%token END_PGFONLAYER_CMD "\\end{pgfonlayer}" +%token DRAW_CMD "\\draw" +%token NODE_CMD "\\node" +%token PATH_CMD "\\path" +%token RECTANGLE "rectangle" +%token NODE "node" +%token AT "at" +%token TO "to" +%token SEMICOLON ";" +%token COMMA "," + +%token LEFTPARENTHESIS "(" +%token RIGHTPARENTHESIS ")" +%token LEFTBRACKET "[" +%token RIGHTBRACKET "]" +%token FULLSTOP "." +%token EQUALS "=" +%token COORD "co-ordinate" +%token PROPSTRING "key/value string" +%token REFSTRING "string" +%token DELIMITEDSTRING "{-delimited string" + +%token UNKNOWN_BEGIN_CMD "unknown \\begin command" +%token UNKNOWN_END_CMD "unknown \\end command" +%token UNKNOWN_CMD "unknown latex command" +%token UNKNOWN_STR "unknown string" +%token UNCLOSED_DELIM_STR "unclosed {-delimited string" + +%type nodename +%type optanchor +%type val +%type property +%type extraproperties +%type properties +%type optproperties +%type optedgenode +%type noderef +%type optnoderef + +%% + +tikzpicture: "\\begin{tikzpicture}" optproperties tikzcmds "\\end{tikzpicture}" + { + if ($2) { + assembler->graph()->setData($2); + } + }; +tikzcmds: tikzcmds tikzcmd | ; +tikzcmd: node | edge | boundingbox | ignore; + +ignore: "\\begin{pgfonlayer}" DELIMITEDSTRING | "\\end{pgfonlayer}"; + +optproperties: + "[" "]" + { $$ = 0; } + | "[" properties "]" + { $$ = $2; } + | { $$ = 0; }; +properties: extraproperties property + { + $1->add(*$2); + delete $2; + $$ = $1; + }; +extraproperties: + extraproperties property "," + { + $1->add(*$2); + delete $2; + $$ = $1; + } + | { $$ = new GraphElementData(); }; +property: + val "=" val + { + GraphElementProperty *p = new GraphElementProperty(QString($1),QString($3)); + free($1); + free($3); + $$ = p; + } + | val + { + GraphElementProperty *a = new GraphElementProperty(QString($1)); + free($1); + $$ = a; + }; +val: PROPSTRING { $$ = $1; } | DELIMITEDSTRING { $$ = $1; }; + +nodename: "(" REFSTRING ")" { $$ = $2; }; +node: "\\node" optproperties nodename "at" COORD DELIMITEDSTRING ";" + { + Node *node = new Node(); + + if ($2) { + node->setData($2); + } + //qDebug() << "node name: " << $3; + node->setName(QString($3)); + node->setLabel(QString($6)); + free($3); + free($6); + + node->setPoint(*$5); + delete $5; + + assembler->graph()->addNode(node); + assembler->addNodeToMap(node); + }; + +optanchor: { $$ = 0; } | "." REFSTRING { $$ = $2; }; +noderef: "(" REFSTRING optanchor ")" + { + $$.node = assembler->nodeWithName(QString($2)); + free($2); + $$.anchor = $3; + }; +optnoderef: + noderef { $$ = $1; } + | "(" ")" { $$.node = 0; $$.anchor = 0; } +optedgenode: + { $$ = 0; } + | "node" optproperties DELIMITEDSTRING + { + $$ = new Node(); + if ($2) + $$->setData($2); + $$->setLabel(QString($3)); + free($3); + } +edge: "\\draw" optproperties noderef "to" optedgenode optnoderef ";" + { + Node *s; + Node *t; + + s = $3.node; + + if ($6.node) { + t = $6.node; + } else { + t = s; + } + + Edge *edge = new Edge(s, t); + if ($2) { + edge->setData($2); + edge->setAttributesFromData(); + } + + if ($5) + edge->setEdgeNode($5); + if ($3.anchor) { + edge->setSourceAnchor(QString($3.anchor)); + free($3.anchor); + } + + if ($6.node) { + if ($6.anchor) { + edge->setTargetAnchor(QString($6.anchor)); + free($6.anchor); + } + } else { + edge->setTargetAnchor(edge->sourceAnchor()); + } + + assembler->graph()->addEdge(edge); + }; + +ignoreprop: val | val "=" val; +ignoreprops: ignoreprop ignoreprops | ; +optignoreprops: "[" ignoreprops "]"; +boundingbox: + "\\path" optignoreprops COORD "rectangle" COORD ";" + { + assembler->graph()->setBbox(QRectF(*$3, *$5)); + delete $3; + delete $5; + }; + +/* vi:ft=yacc:noet:ts=4:sts=4:sw=4 +*/ diff --git a/src/data/tikzparserdefs.h b/src/data/tikzparserdefs.h new file mode 100644 index 0000000..9d4bfe8 --- /dev/null +++ b/src/data/tikzparserdefs.h @@ -0,0 +1,18 @@ +#ifndef TIKZPARSERDEFS_H +#define TIKZPARSERDEFS_H + +#include "graphelementproperty.h" +#include "graphelementdata.h" +#include "node.h" +#include "tikzgraphassembler.h" + +#include +#include +#include + +struct noderef { + Node *node; + char *anchor; +}; + +#endif // TIKZPARSERDEFS_H diff --git a/src/gui/commands.cpp b/src/gui/commands.cpp new file mode 100644 index 0000000..e69de29 diff --git a/src/gui/commands.h b/src/gui/commands.h new file mode 100644 index 0000000..73bfaa7 --- /dev/null +++ b/src/gui/commands.h @@ -0,0 +1,4 @@ +#ifndef COMMANDS_H +#define COMMANDS_H + +#endif // COMMANDS_H diff --git a/src/gui/edgeitem.cpp b/src/gui/edgeitem.cpp new file mode 100644 index 0000000..497fa07 --- /dev/null +++ b/src/gui/edgeitem.cpp @@ -0,0 +1,131 @@ +#include "tikzit.h" +#include "edgeitem.h" + +#include +#include + +EdgeItem::EdgeItem(Edge *edge) +{ + _edge = edge; + setFlag(QGraphicsItem::ItemIsSelectable); + + QPen pen(Qt::black); + pen.setWidth(2); + setPen(pen); + _cp1Item = new QGraphicsEllipseItem(this); + _cp1Item->setParentItem(this); + _cp1Item->setRect(GLOBAL_SCALEF * (-0.05), GLOBAL_SCALEF * (-0.05), + GLOBAL_SCALEF * 0.1, GLOBAL_SCALEF * 0.1); + _cp1Item->setVisible(false); + + _cp2Item = new QGraphicsEllipseItem(this); + _cp2Item->setParentItem(this); + _cp2Item->setRect(GLOBAL_SCALEF * (-0.05), GLOBAL_SCALEF * (-0.05), + GLOBAL_SCALEF * 0.1, GLOBAL_SCALEF * 0.1); + _cp2Item->setVisible(false); + + readPos(); +} + +void EdgeItem::readPos() +{ + //_edge->setAttributesFromData(); + _edge->updateControls(); + QPainterPath path; + + path.moveTo (toScreen(_edge->tail())); + path.cubicTo(toScreen(_edge->cp1()), + toScreen(_edge->cp2()), + toScreen(_edge->head())); + setPath(path); + + _cp1Item->setPos(toScreen(_edge->cp1())); + _cp2Item->setPos(toScreen(_edge->cp2())); +} + +void EdgeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) +{ + //QGraphicsPathItem::paint(painter, option, widget); + painter->setPen(pen()); + painter->setBrush(Qt::NoBrush); + painter->drawPath(path()); + + if (isSelected()) { + QColor draw; + QColor draw1; + QColor fill; + + if (_edge->basicBendMode()) { + draw = Qt::blue; + draw1 = QColor(100,100,255,100); + fill = QColor(200,200,255,50); + } else { + draw = Qt::darkGreen; + draw1 = QColor(0, 150, 0, 50); + fill = QColor(200,255,200,150); + } + + painter->setPen(QPen(draw1)); + + float r = GLOBAL_SCALEF * _edge->cpDist(); + painter->drawEllipse(toScreen(_edge->source()->point()), r, r); + painter->drawEllipse(toScreen(_edge->target()->point()), r, r); + + painter->setPen(QPen(draw)); + painter->setBrush(QBrush(fill)); + + painter->drawLine(toScreen(_edge->tail()), toScreen(_edge->cp1())); + painter->drawLine(toScreen(_edge->head()), toScreen(_edge->cp2())); + + //painter->drawEllipse(toScreen(_edge->cp1()), r, r); + //painter->drawEllipse(toScreen(_edge->cp2()), r, r); + + _cp1Item->setPen(QPen(draw)); + _cp1Item->setBrush(QBrush(fill)); + _cp1Item->setVisible(true); + + _cp2Item->setPen(QPen(draw)); + _cp2Item->setBrush(QBrush(fill)); + _cp2Item->setVisible(true); + + r = GLOBAL_SCALEF * 0.05; + painter->setPen(QPen(Qt::black)); + painter->setBrush(QBrush(QColor(255,255,255,200))); + painter->drawEllipse(toScreen(_edge->mid()), r, r); + } else { + _cp1Item->setVisible(false); + _cp2Item->setVisible(false); + } +} + +QRectF EdgeItem::boundingRect() const +{ + float r = GLOBAL_SCALEF * (_edge->cpDist() + 0.2); + return shape().boundingRect().adjusted(-r,-r,r,r); +} + +QPainterPath EdgeItem::shape() const +{ + // get the shape of the edge, and expand a bit to make selection easier + QPainterPath oldShape = QGraphicsPathItem::shape(); + QPainterPathStroker stroker; + stroker.setWidth(5); + stroker.setJoinStyle(Qt::MiterJoin); + QPainterPath newShape = (stroker.createStroke(oldShape) + oldShape).simplified(); + return newShape; +} + +Edge *EdgeItem::edge() const +{ + return _edge; +} + +QGraphicsEllipseItem *EdgeItem::cp1Item() const +{ + return _cp1Item; +} + +QGraphicsEllipseItem *EdgeItem::cp2Item() const +{ + return _cp2Item; +} diff --git a/src/gui/edgeitem.h b/src/gui/edgeitem.h new file mode 100644 index 0000000..b017265 --- /dev/null +++ b/src/gui/edgeitem.h @@ -0,0 +1,36 @@ +/** + * A QGraphicsItem that handles drawing a single edge. + */ + +#ifndef EDGEITEM_H +#define EDGEITEM_H + +#include "edge.h" + +#include +#include +#include +#include +#include +#include + +class EdgeItem : public QGraphicsPathItem +{ +public: + EdgeItem(Edge *edge); + void readPos(); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, + QWidget *widget); + QRectF boundingRect() const; + QPainterPath shape() const; + Edge *edge() const; + QGraphicsEllipseItem *cp1Item() const; + QGraphicsEllipseItem *cp2Item() const; + +private: + Edge *_edge; + QGraphicsEllipseItem *_cp1Item; + QGraphicsEllipseItem *_cp2Item; +}; + +#endif // EDGEITEM_H diff --git a/src/gui/mainmenu.cpp b/src/gui/mainmenu.cpp new file mode 100644 index 0000000..c9e83ba --- /dev/null +++ b/src/gui/mainmenu.cpp @@ -0,0 +1,96 @@ +#include "mainmenu.h" +#include "tikzit.h" + +MainMenu::MainMenu() +{ + ui.setupUi(this); +} + +// File +void MainMenu::on_actionNew_triggered() +{ + tikzit->newDoc(); +} + +void MainMenu::on_actionOpen_triggered() +{ + tikzit->open(); +} + +void MainMenu::on_actionClose_triggered() +{ + // TODO +} + +void MainMenu::on_actionSave_triggered() +{ + // TODO +} + +void MainMenu::on_actionSave_As_triggered() +{ + // TODO +} + + +// Edit +void MainMenu::on_actionUndo_triggered() +{ + if (tikzit->activeWindow() != 0) + tikzit->activeWindow()->tikzDocument()->undoStack()->undo(); +} + +void MainMenu::on_actionRedo_triggered() +{ + if (tikzit->activeWindow() != 0) + tikzit->activeWindow()->tikzDocument()->undoStack()->redo(); +} + +void MainMenu::on_actionCut_triggered() +{ + // TODO +} + +void MainMenu::on_actionCopy_triggered() +{ + // TODO +} + +void MainMenu::on_actionPaste_triggered() +{ + // TODO +} + +void MainMenu::on_actionDelete_triggered() +{ + // TODO +} + +void MainMenu::on_actionSelect_All_triggered() +{ + // TODO +} + +void MainMenu::on_actionDeselect_All_triggered() +{ + // TODO +} + + +// Tikz +void MainMenu::on_actionParse_triggered() +{ + // TODO +} + + +// View +void MainMenu::on_actionZoom_In_triggered() +{ + if (tikzit->activeWindow() != 0) tikzit->activeWindow()->tikzView()->zoomIn(); +} + +void MainMenu::on_actionZoom_Out_triggered() +{ + if (tikzit->activeWindow() != 0) tikzit->activeWindow()->tikzView()->zoomOut(); +} diff --git a/src/gui/mainmenu.h b/src/gui/mainmenu.h new file mode 100644 index 0000000..d85e271 --- /dev/null +++ b/src/gui/mainmenu.h @@ -0,0 +1,43 @@ +#ifndef MAINMENU_H +#define MAINMENU_H + +#include "ui_mainmenu.h" + +#include + +class MainMenu : public QMenuBar +{ + Q_OBJECT +public: + MainMenu(); + +private: + Ui::MainMenu ui; + +public slots: + // File + void on_actionNew_triggered(); + void on_actionOpen_triggered(); + void on_actionClose_triggered(); + void on_actionSave_triggered(); + void on_actionSave_As_triggered(); + + // Edit + void on_actionUndo_triggered(); + void on_actionRedo_triggered(); + void on_actionCut_triggered(); + void on_actionCopy_triggered(); + void on_actionPaste_triggered(); + void on_actionDelete_triggered(); + void on_actionSelect_All_triggered(); + void on_actionDeselect_All_triggered(); + + // Tikz + void on_actionParse_triggered(); + + // View + void on_actionZoom_In_triggered(); + void on_actionZoom_Out_triggered(); +}; + +#endif // MAINMENU_H diff --git a/src/gui/mainmenu.ui b/src/gui/mainmenu.ui new file mode 100644 index 0000000..c9b6f44 --- /dev/null +++ b/src/gui/mainmenu.ui @@ -0,0 +1,187 @@ + + + MainMenu + + + + 0 + 0 + 476 + 22 + + + + + File + + + + + + + + + + + Edit + + + + + + + + + + + + + + + Tikz + + + + + + View + + + + + + + New... + + + Ctrl+N + + + + + Open... + + + Ctrl+O + + + + + Close + + + Ctrl+W + + + + + Save + + + Ctrl+S + + + + + Save As... + + + Ctrl+Shift+S + + + + + Undo + + + Ctrl+Z + + + + + Redo + + + Ctrl+Shift+Z + + + + + Cut + + + Ctrl+X + + + + + Copy + + + Ctrl+C + + + + + Paste + + + Ctrl+V + + + + + Delete + + + Backspace + + + + + Select All + + + Ctrl+A + + + + + Deselect All + + + Ctrl+D + + + + + Parse + + + Ctrl+T + + + + + Zoom In + + + Ctrl+= + + + + + Zoom Out + + + Ctrl+- + + + + + + + + + + diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp new file mode 100644 index 0000000..19b6a59 --- /dev/null +++ b/src/gui/mainwindow.cpp @@ -0,0 +1,99 @@ +#include "mainwindow.h" +#include "ui_mainwindow.h" +#include "tikzgraphassembler.h" +#include "toolpalette.h" +#include "tikzit.h" + +#include +#include +#include +#include +#include +#include + +int MainWindow::_numWindows = 0; + +MainWindow::MainWindow(QWidget *parent) : + QMainWindow(parent), + ui(new Ui::MainWindow) +{ + _windowId = _numWindows; + _numWindows++; + ui->setupUi(this); + setAttribute(Qt::WA_DeleteOnClose, true); + _tikzDocument = new TikzDocument(this); + _tikzScene = new TikzScene(_tikzDocument, this); + ui->tikzView->setScene(_tikzScene); + _fileName = ""; + _pristine = true; + + // initially, the source view should be collapsed + QList sz = ui->splitter->sizes(); + sz[0] = sz[0] + sz[1]; + sz[1] = 0; + ui->splitter->setSizes(sz); +} + +MainWindow::~MainWindow() +{ + tikzit->removeWindow(this); + delete ui; +} + +void MainWindow::open(QString fileName) +{ + _pristine = false; + _tikzDocument->open(fileName); + ui->tikzSource->setText(_tikzDocument->tikz()); + + + if (_tikzDocument->parseSuccess()) { + statusBar()->showMessage("TiKZ parsed successfully", 2000); + setWindowTitle("TiKZiT - " + _tikzDocument->shortName()); + _tikzScene->setTikzDocument(_tikzDocument); + } else { + statusBar()->showMessage("Cannot read TiKZ source"); + } + +} + +void MainWindow::closeEvent(QCloseEvent *event) +{ + //qDebug() << "got close event"; + QMainWindow::closeEvent(event); +} + +void MainWindow::changeEvent(QEvent *event) +{ + if (event->type() == QEvent::ActivationChange && isActiveWindow()) { + tikzit->setActiveWindow(this); + } + QMainWindow::changeEvent(event); +} + +TikzDocument *MainWindow::tikzDocument() const +{ + return _tikzDocument; +} + +TikzScene *MainWindow::tikzScene() const +{ + return _tikzScene; +} + +int MainWindow::windowId() const +{ + return _windowId; +} + +TikzView *MainWindow::tikzView() const +{ + return ui->tikzView; +} + +bool MainWindow::pristine() const +{ + return _pristine; +} + + diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h new file mode 100644 index 0000000..f27677a --- /dev/null +++ b/src/gui/mainwindow.h @@ -0,0 +1,48 @@ +/** + * A top-level window, which contains a single TikzDocument. + */ + +#ifndef MAINWINDOW_H +#define MAINWINDOW_H + +#include "tikzscene.h" +#include "tikzview.h" +#include "graph.h" +#include "tikzdocument.h" + +#include +#include + +namespace Ui { +class MainWindow; +} + +class MainWindow : public QMainWindow +{ + Q_OBJECT + +public: + explicit MainWindow(QWidget *parent = 0); + ~MainWindow(); + + void open(QString fileName); + bool pristine() const; + int windowId() const; + TikzView *tikzView() const; + TikzScene *tikzScene() const; + TikzDocument *tikzDocument() const; + +protected: + void closeEvent(QCloseEvent *event); + void changeEvent(QEvent *event); +private: + TikzScene *_tikzScene; + TikzDocument *_tikzDocument; + Ui::MainWindow *ui; + QString _fileName; + bool _pristine; + int _windowId; + static int _numWindows; +}; + +#endif // MAINWINDOW_H diff --git a/src/gui/mainwindow.ui b/src/gui/mainwindow.ui new file mode 100644 index 0000000..56a5c2d --- /dev/null +++ b/src/gui/mainwindow.ui @@ -0,0 +1,199 @@ + + + MainWindow + + + + 0 + 0 + 640 + 480 + + + + TikZiT - untitled + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Qt::Vertical + + + + + + Courier New + 10 + + + + QTextEdit::NoWrap + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Courier New'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'.SF NS Text'; font-size:13pt;"><br /></p></body></html> + + + 20 + + + + + + + + + + New... + + + + + Open... + + + + + Close + + + + + Save + + + + + Save As... + + + + + Undo + + + + + Redo + + + + + Cut + + + + + Copy + + + + + Paste + + + + + Delete + + + + + Select All + + + + + Deselect All + + + + + Parse + + + Ctrl+T + + + + + Zoom In + + + Ctrl+= + + + + + Zoom Out + + + Ctrl+- + + + + + + + TikzView + QGraphicsView +
tikzview.h
+ + zoomIn() + zoomOut() + + + + + + + actionZoom_In + triggered() + tikzView + zoomIn() + + + -1 + -1 + + + 237 + 103 + + + + + actionZoom_Out + triggered() + tikzView + zoomOut() + + + -1 + -1 + + + 237 + 103 + + + + + diff --git a/src/gui/nodeitem.cpp b/src/gui/nodeitem.cpp new file mode 100644 index 0000000..71226f3 --- /dev/null +++ b/src/gui/nodeitem.cpp @@ -0,0 +1,124 @@ +#include "tikzit.h" +#include "nodeitem.h" +#include "tikzscene.h" +#include + +#include +#include +#include +#include +#include +#include +#include + +NodeItem::NodeItem(Node *node) +{ + _node = node; + setFlag(QGraphicsItem::ItemIsSelectable); + setFlag(QGraphicsItem::ItemIsMovable); + setFlag(QGraphicsItem::ItemSendsGeometryChanges); + readPos(); +} + +void NodeItem::readPos() +{ + setPos(toScreen(_node->point())); +} + +void NodeItem::writePos() +{ + _node->setPoint(fromScreen(pos())); +} + +QRectF NodeItem::labelRect() const { + QString label = _node->label(); + //QFont f("Courier", 9); + QFontMetrics fm(Tikzit::LABEL_FONT); + + QRectF rect = fm.boundingRect(label); + //rect.adjust(-2,-2,2,2); + rect.moveCenter(QPointF(0,0)); + return rect; +} + +void NodeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) +{ + if (_node->style()->isNone()) { + QColor c(180,180,200); + painter->setPen(QPen(c)); + painter->setBrush(QBrush(c)); + painter->drawEllipse(QPointF(0,0), 1,1); + + QPen pen(QColor(180,180,220)); + QVector p; + p << 2.0 << 2.0; + pen.setDashPattern(p); + painter->setPen(pen); + painter->setBrush(Qt::NoBrush); + painter->drawPath(shape()); + } else { + QPen pen(_node->style()->strokeColor); + pen.setWidth(_node->style()->strokeThickness); + painter->setPen(pen); + painter->setBrush(QBrush(_node->style()->fillColor)); + painter->drawPath(shape()); + } + + if (_node->label() != "") { + QRectF rect = labelRect(); + QPen pen(QColor(200,0,0,120)); + QVector d; + d << 2.0 << 2.0; + pen.setDashPattern(d); + painter->setPen(pen); + painter->setBrush(QBrush(QColor(255,255,100,120))); + painter->drawRect(rect); + + painter->setPen(QPen(Qt::black)); + painter->setFont(Tikzit::LABEL_FONT); + painter->drawText(rect, Qt::AlignCenter, _node->label()); + } + + if (isSelected()) { + QPainterPath sh = shape(); + QPainterPathStroker stroker; + stroker.setWidth(4); + QPainterPath outline = (stroker.createStroke(sh) + sh).simplified(); + painter->setPen(Qt::NoPen); + painter->setBrush(QBrush(QColor(150,200,255,100))); + painter->drawPath(outline); + } + +} + +QPainterPath NodeItem::shape() const +{ + QPainterPath path; + path.addEllipse(QPointF(0,0), GLOBAL_SCALEF * 0.1, GLOBAL_SCALEF * 0.1); + return path; +} + +QRectF NodeItem::boundingRect() const +{ + QRectF r = labelRect(); + return r.united(shape().boundingRect()).adjusted(-4,-4,4,4); +} + +Node *NodeItem::node() const +{ + return _node; +} + +QVariant NodeItem::itemChange(GraphicsItemChange change, const QVariant &value) +{ + if (change == ItemPositionChange) { + QPointF newPos = value.toPointF(); + int gridSize = GLOBAL_SCALE / 8; + QPointF gridPos(round(newPos.x()/gridSize)*gridSize, round(newPos.y()/gridSize)*gridSize); + _node->setPoint(fromScreen(gridPos)); + + return gridPos; + } else { + return QGraphicsItem::itemChange(change, value); + } +} diff --git a/src/gui/nodeitem.h b/src/gui/nodeitem.h new file mode 100644 index 0000000..9a3edb0 --- /dev/null +++ b/src/gui/nodeitem.h @@ -0,0 +1,32 @@ +/** + * A QGraphicsItem that handles drawing a single node. + */ + +#ifndef NODEITEM_H +#define NODEITEM_H + +#include "node.h" + +#include +#include +#include +#include + +class NodeItem : public QGraphicsItem +{ +public: + NodeItem(Node *node); + void readPos(); + void writePos(); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *); + QVariant itemChange(GraphicsItemChange change, const QVariant &value); + QPainterPath shape() const; + QRectF boundingRect() const; + Node *node() const; + +private: + Node *_node; + QRectF labelRect() const; +}; + +#endif // NODEITEM_H diff --git a/src/gui/propertypalette.cpp b/src/gui/propertypalette.cpp new file mode 100644 index 0000000..5fc763f --- /dev/null +++ b/src/gui/propertypalette.cpp @@ -0,0 +1,43 @@ +#include "propertypalette.h" +#include "graphelementdata.h" +#include "ui_propertypalette.h" + +#include +#include +#include +#include + +PropertyPalette::PropertyPalette(QWidget *parent) : + QDockWidget(parent), + ui(new Ui::PropertyPalette) +{ + setWindowFlags(Qt::Window + | Qt::CustomizeWindowHint + | Qt::WindowTitleHint); + //setFocusPolicy(Qt::NoFocus); + ui->setupUi(this); + GraphElementData *d = new GraphElementData(); + d->setProperty("key 1", "value 1"); + d->setAtom("atom 1"); + d->setProperty("key 2", "value 2"); + + QModelIndex i = d->index(0,0); + ui->treeView->setModel(d); + + QSettings settings("tikzit", "tikzit"); + QVariant geom = settings.value("property-palette-geometry"); + if (geom != QVariant()) { + restoreGeometry(geom.toByteArray()); + } +} + +PropertyPalette::~PropertyPalette() +{ + delete ui; +} + +void PropertyPalette::closeEvent(QCloseEvent *event) { + QSettings settings("tikzit", "tikzit"); + settings.setValue("property-palette-geometry", saveGeometry()); + QDockWidget::closeEvent(event); +} diff --git a/src/gui/propertypalette.h b/src/gui/propertypalette.h new file mode 100644 index 0000000..7910d70 --- /dev/null +++ b/src/gui/propertypalette.h @@ -0,0 +1,28 @@ +/** + * Enables the user to edit properties of the graph, as well as the selected node/edge. + */ + +#ifndef PROPERTYPALETTE_H +#define PROPERTYPALETTE_H + +#include + +namespace Ui { +class PropertyPalette; +} + +class PropertyPalette : public QDockWidget +{ + Q_OBJECT + +public: + explicit PropertyPalette(QWidget *parent = 0); + ~PropertyPalette(); + +protected: + void closeEvent(QCloseEvent *event); +private: + Ui::PropertyPalette *ui; +}; + +#endif // PROPERTYPALETTE_H diff --git a/src/gui/propertypalette.ui b/src/gui/propertypalette.ui new file mode 100644 index 0000000..83d586e --- /dev/null +++ b/src/gui/propertypalette.ui @@ -0,0 +1,30 @@ + + + PropertyPalette + + + + 0 + 0 + 194 + 341 + + + + Properties + + + + + + + 0 + + + + + + + + + diff --git a/src/gui/tikzscene.cpp b/src/gui/tikzscene.cpp new file mode 100644 index 0000000..3431c0c --- /dev/null +++ b/src/gui/tikzscene.cpp @@ -0,0 +1,384 @@ +#include "tikzit.h" +#include "util.h" +#include "tikzscene.h" +#include "undocommands.h" + +#include +#include +#include + + +TikzScene::TikzScene(TikzDocument *tikzDocument, QObject *parent) : + QGraphicsScene(parent), _tikzDocument(tikzDocument) +{ + _modifyEdgeItem = 0; + _drawEdgeItem = new QGraphicsLineItem(); + setSceneRect(-310,-230,620,450); + + QPen pen; + pen.setColor(QColor::fromRgbF(0.5f, 0.0f, 0.5f)); + pen.setWidth(3); + _drawEdgeItem->setPen(pen); + _drawEdgeItem->setLine(0,0,0,0); + _drawEdgeItem->setVisible(false); + addItem(_drawEdgeItem); +} + +TikzScene::~TikzScene() { +} + +Graph *TikzScene::graph() +{ + return _tikzDocument->graph(); +} + +void TikzScene::graphReplaced() +{ + foreach (NodeItem *ni, _nodeItems) { + removeItem(ni); + delete ni; + } + _nodeItems.clear(); + + foreach (EdgeItem *ei, _edgeItems) { + removeItem(ei); + delete ei; + } + _edgeItems.clear(); + + foreach (Edge *e, graph()->edges()) { + EdgeItem *ei = new EdgeItem(e); + _edgeItems.insert(e, ei); + addItem(ei); + } + + foreach (Node *n, graph()->nodes()) { + NodeItem *ni = new NodeItem(n); + _nodeItems.insert(n, ni); + addItem(ni); + } +} + +void TikzScene::mousePressEvent(QGraphicsSceneMouseEvent *event) +{ + // current mouse position, in scene coordinates + QPointF mousePos = event->scenePos(); + + // disable rubber band drag, which will clear the selection. Only re-enable it + // for the SELECT tool, and when no control point has been clicked. + views()[0]->setDragMode(QGraphicsView::NoDrag); + + // radius of a control point for bezier edges, in scene coordinates + qreal cpR = GLOBAL_SCALEF * (0.05); + qreal cpR2 = cpR * cpR; + + switch (tikzit->toolPalette()->currentTool()) { + case ToolPalette::SELECT: + // check if we grabbed a control point of an edge + foreach (QGraphicsItem *gi, selectedItems()) { + if (EdgeItem *ei = dynamic_cast(gi)) { + qreal dx, dy; + + dx = ei->cp1Item()->pos().x() - mousePos.x(); + dy = ei->cp1Item()->pos().y() - mousePos.y(); + + if (dx*dx + dy*dy <= cpR2) { + _modifyEdgeItem = ei; + _firstControlPoint = true; + break; + } + + dx = ei->cp2Item()->pos().x() - mousePos.x(); + dy = ei->cp2Item()->pos().y() - mousePos.y(); + + if (dx*dx + dy*dy <= cpR2) { + _modifyEdgeItem = ei; + _firstControlPoint = false; + break; + } + } + } + + if (_modifyEdgeItem != 0) { + // store for undo purposes + Edge *e = _modifyEdgeItem->edge(); + _oldBend = e->bend(); + _oldInAngle = e->inAngle(); + _oldOutAngle = e->outAngle(); + _oldWeight = e->weight(); + } else { + // since we are not dragging a control point, process the click normally + views()[0]->setDragMode(QGraphicsView::RubberBandDrag); + QGraphicsScene::mousePressEvent(event); + + // save current node positions for undo support + _oldNodePositions.clear(); + foreach (QGraphicsItem *gi, selectedItems()) { + if (NodeItem *ni = dynamic_cast(gi)) { + _oldNodePositions.insert(ni->node(), ni->node()->point()); + } + } + } + + break; + case ToolPalette::VERTEX: + break; + case ToolPalette::EDGE: + break; + case ToolPalette::CROP: + break; + } +} + +void TikzScene::mouseMoveEvent(QGraphicsSceneMouseEvent *event) +{ + // current mouse position, in scene coordinates + QPointF mousePos = event->scenePos(); + + switch (tikzit->toolPalette()->currentTool()) { + case ToolPalette::SELECT: + if (_modifyEdgeItem != 0) { + Edge *e = _modifyEdgeItem->edge(); + + // dragging a control point + QPointF src = toScreen(e->source()->point()); + QPointF targ = toScreen(e->target()->point()); + float dx1 = targ.x() - src.x(); + float dy1 = targ.y() - src.y(); + float dx2, dy2; + if (_firstControlPoint) { + dx2 = mousePos.x() - src.x(); + dy2 = mousePos.y() - src.y(); + } else { + dx2 = mousePos.x() - targ.x(); + dy2 = mousePos.y() - targ.y(); + } + + float baseDist = sqrt(dx1*dx1 + dy1*dy1); + float handleDist = sqrt(dx2*dx2 + dy2*dy2); + float wcoarseness = 0.1f; + + if (!e->isSelfLoop()) { + if (baseDist != 0) { + e->setWeight(roundToNearest(wcoarseness, handleDist/baseDist)); + } else { + e->setWeight(roundToNearest(wcoarseness, handleDist/GLOBAL_SCALEF)); + } + } + + float control_angle = atan2(-dy2, dx2); + + int bcoarseness = 15; + + if(e->basicBendMode()) { + float bnd; + float base_angle = atan2(-dy1, dx1); + if (_firstControlPoint) { + bnd = base_angle - control_angle; + } else { + bnd = control_angle - base_angle + M_PI; + if (bnd > M_PI) bnd -= 2*M_PI; + } + + e->setBend(round(bnd * (180.0f / M_PI) * (1.0f / (float)bcoarseness)) * bcoarseness); + + } else { + int bnd = round(control_angle * (180.0f / M_PI) * + (1.0f / (float)bcoarseness)) * + bcoarseness; + if (_firstControlPoint) { + // TODO: enable moving both control points +// if ([theEvent modifierFlags] & NSAlternateKeyMask) { +// if ([modifyEdge isSelfLoop]) { +// [modifyEdge setInAngle:[modifyEdge inAngle] + +// (bnd - [modifyEdge outAngle])]; +// } else { +// [modifyEdge setInAngle:[modifyEdge inAngle] - +// (bnd - [modifyEdge outAngle])]; +// } +// } + + e->setOutAngle(bnd); + } else { +// if (theEvent.modifierFlags & NSAlternateKeyMask) { +// if ([modifyEdge isSelfLoop]) { +// [modifyEdge setOutAngle:[modifyEdge outAngle] + +// (bnd - [modifyEdge inAngle])]; +// } else { +// [modifyEdge setOutAngle:[modifyEdge outAngle] - +// (bnd - [modifyEdge inAngle])]; +// } +// } + + e->setInAngle(bnd); + } + } + + _modifyEdgeItem->readPos(); + + } else { + // otherwise, process mouse move normally + QGraphicsScene::mouseMoveEvent(event); + refreshAdjacentEdges(_oldNodePositions.keys()); + } + + break; + case ToolPalette::VERTEX: + break; + case ToolPalette::EDGE: + break; + case ToolPalette::CROP: + break; + } +} + +void TikzScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) +{ + // current mouse position, in scene coordinates + QPointF mousePos = event->scenePos(); + + switch (tikzit->toolPalette()->currentTool()) { + case ToolPalette::SELECT: + if (_modifyEdgeItem != 0) { + // finished dragging a control point + Edge *e = _modifyEdgeItem->edge(); + + if (_oldWeight != e->weight() || + _oldBend != e->bend() || + _oldInAngle != e->inAngle() || + _oldOutAngle != e->outAngle()) + { + EdgeBendCommand *cmd = new EdgeBendCommand(this, e, _oldWeight, _oldBend, _oldInAngle, _oldOutAngle); + _tikzDocument->undoStack()->push(cmd); + } + + _modifyEdgeItem = 0; + } else { + // otherwise, process mouse move normally + QGraphicsScene::mouseReleaseEvent(event); + + if (!_oldNodePositions.empty()) { + QMap newNodePositions; + + foreach (QGraphicsItem *gi, selectedItems()) { + if (NodeItem *ni = dynamic_cast(gi)) { + ni->writePos(); + newNodePositions.insert(ni->node(), ni->node()->point()); + } + } + + //qDebug() << _oldNodePositions; + //qDebug() << newNodePositions; + + _tikzDocument->undoStack()->push(new MoveCommand(this, _oldNodePositions, newNodePositions)); + _oldNodePositions.clear(); + } + } + + break; + case ToolPalette::VERTEX: + { + int gridSize = GLOBAL_SCALE / 8; + QPointF gridPos(round(mousePos.x()/gridSize)*gridSize, round(mousePos.y()/gridSize)*gridSize); + Node *n = new Node(); + n->setPoint(fromScreen(gridPos)); + + QRectF grow(gridPos.x() - GLOBAL_SCALEF, gridPos.y() - GLOBAL_SCALEF, 2 * GLOBAL_SCALEF, 2 * GLOBAL_SCALEF); + QRectF newBounds = sceneRect().united(grow); + qDebug() << grow; + qDebug() << newBounds; + + AddNodeCommand *cmd = new AddNodeCommand(this, n, newBounds); + _tikzDocument->undoStack()->push(cmd); + } + break; + case ToolPalette::EDGE: + break; + case ToolPalette::CROP: + break; + } +} + +void TikzScene::keyReleaseEvent(QKeyEvent *event) +{ + if (event->key() == Qt::Key_Backspace || event->key() == Qt::Key_Delete) { + QSet selNodes; + QSet selEdges; + getSelection(selNodes, selEdges); + + QMap deleteNodes; + QMap deleteEdges; + + for (int i = 0; i < _tikzDocument->graph()->nodes().length(); ++i) { + Node *n = _tikzDocument->graph()->nodes()[i]; + if (selNodes.contains(n)) deleteNodes.insert(i, n); + } + + for (int i = 0; i < _tikzDocument->graph()->edges().length(); ++i) { + Edge *e = _tikzDocument->graph()->edges()[i]; + if (selEdges.contains(e) || + selNodes.contains(e->source()) || + selNodes.contains(e->target())) deleteEdges.insert(i, e); + } + + //qDebug() << "nodes:" << deleteNodes; + //qDebug() << "edges:" << deleteEdges; + DeleteCommand *cmd = new DeleteCommand(this, deleteNodes, deleteEdges, selEdges); + _tikzDocument->undoStack()->push(cmd); + } +} + +void TikzScene::getSelection(QSet &selNodes, QSet &selEdges) +{ + foreach (QGraphicsItem *gi, selectedItems()) { + if (NodeItem *ni = dynamic_cast(gi)) selNodes << ni->node(); + if (EdgeItem *ei = dynamic_cast(gi)) selEdges << ei->edge(); + } +} + + +TikzDocument *TikzScene::tikzDocument() const +{ + return _tikzDocument; +} + +void TikzScene::setTikzDocument(TikzDocument *tikzDocument) +{ + _tikzDocument = tikzDocument; + graphReplaced(); +} + +void TikzScene::refreshAdjacentEdges(QList nodes) +{ + if (nodes.empty()) return; + foreach (EdgeItem *ei, _edgeItems) { + if (nodes.contains(ei->edge()->source()) || nodes.contains(ei->edge()->target())) { + ei->edge()->updateControls(); + ei->readPos(); + } + } +} + +void TikzScene::setBounds(QRectF bounds) +{ + if (bounds != sceneRect()) { + if (!views().empty()) { + QGraphicsView *v = views().first(); + QPointF c = v->mapToScene(v->viewport()->rect().center()); + setSceneRect(bounds); + v->centerOn(c); + } else { + setSceneRect(bounds); + } + } +} + +QMap &TikzScene::nodeItems() +{ + return _nodeItems; +} + +QMap &TikzScene::edgeItems() +{ + return _edgeItems; +} diff --git a/src/gui/tikzscene.h b/src/gui/tikzscene.h new file mode 100644 index 0000000..6817792 --- /dev/null +++ b/src/gui/tikzscene.h @@ -0,0 +1,62 @@ +/** + * Manage the scene, which contains a single Graph, and respond to user input. This serves as + * the controller for the MVC (TikzDocument, TikzView, TikzScene). + */ + +#ifndef TIKZSCENE_H +#define TIKZSCENE_H + +#include "graph.h" +#include "nodeitem.h" +#include "edgeitem.h" +#include "tikzdocument.h" + +#include +#include +#include +#include +#include +#include +#include + +class TikzScene : public QGraphicsScene +{ + Q_OBJECT +public: + TikzScene(TikzDocument *tikzDocument, QObject *parent); + ~TikzScene(); + Graph *graph(); + QMap &nodeItems(); + QMap &edgeItems(); + void refreshAdjacentEdges(QList nodes); + void setBounds(QRectF bounds); + + TikzDocument *tikzDocument() const; + void setTikzDocument(TikzDocument *tikzDocument); + +public slots: + void graphReplaced(); + +protected: + void mousePressEvent(QGraphicsSceneMouseEvent *event) override; + void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; + void keyReleaseEvent(QKeyEvent *event) override; +private: + TikzDocument *_tikzDocument; + QMap _nodeItems; + QMap _edgeItems; + QGraphicsLineItem *_drawEdgeItem; + EdgeItem *_modifyEdgeItem; + bool _firstControlPoint; + + QMap _oldNodePositions; + float _oldWeight; + int _oldBend; + int _oldInAngle; + int _oldOutAngle; + + void getSelection(QSet &selNodes, QSet &selEdges); +}; + +#endif // TIKZSCENE_H diff --git a/src/gui/tikzview.cpp b/src/gui/tikzview.cpp new file mode 100644 index 0000000..fe6c401 --- /dev/null +++ b/src/gui/tikzview.cpp @@ -0,0 +1,84 @@ +#include "tikzview.h" +#include "tikzit.h" + +#include + +TikzView::TikzView(QWidget *parent) : QGraphicsView(parent) +{ + setRenderHint(QPainter::Antialiasing); + setDragMode(QGraphicsView::RubberBandDrag); + + _scale = 1.0f; +} + +void TikzView::zoomIn() +{ + _scale *= 1.6f; + scale(1.6,1.6); +} + +void TikzView::zoomOut() +{ + _scale *= 0.625f; + scale(0.625,0.625); +} + +void TikzView::drawBackground(QPainter *painter, const QRectF &rect) +{ + // draw the grid + int step = GLOBAL_SCALE / 8; + + QPen pen1; + pen1.setWidth(1); + pen1.setCosmetic(true); + pen1.setColor(QColor(230,230,230)); + + QPen pen2 = pen1; + pen2.setColor(QColor(200,200,200)); + + QPen pen3 = pen1; + pen3.setColor(QColor(160,160,160)); + + painter->setPen(pen1); + + if (_scale > 0.2f) { + for (int x = -step; x > rect.left(); x -= step) { + if (x % (step * 8) != 0) painter->drawLine(x, rect.top(), x, rect.bottom()); + } + + for (int x = step; x < rect.right(); x += step) { + if (x % (step * 8) != 0) painter->drawLine(x, rect.top(), x, rect.bottom()); + } + + for (int y = -step; y > rect.top(); y -= step) { + if (y % (step * 8) != 0) painter->drawLine(rect.left(), y, rect.right(), y); + } + + for (int y = step; y < rect.bottom(); y += step) { + if (y % (step * 8) != 0) painter->drawLine(rect.left(), y, rect.right(), y); + } + } + + painter->setPen(pen2); + + for (int x = -step*8; x > rect.left(); x -= step*8) { + painter->drawLine(x, rect.top(), x, rect.bottom()); + } + + for (int x = step*8; x < rect.right(); x += step*8) { + painter->drawLine(x, rect.top(), x, rect.bottom()); + } + + for (int y = -step*8; y > rect.top(); y -= step*8) { + painter->drawLine(rect.left(), y, rect.right(), y); + } + + for (int y = step*8; y < rect.bottom(); y += step*8) { + painter->drawLine(rect.left(), y, rect.right(), y); + } + + painter->setPen(pen3); + painter->drawLine(rect.left(), 0, rect.right(), 0); + painter->drawLine(0, rect.top(), 0, rect.bottom()); +} + diff --git a/src/gui/tikzview.h b/src/gui/tikzview.h new file mode 100644 index 0000000..fc3cba4 --- /dev/null +++ b/src/gui/tikzview.h @@ -0,0 +1,32 @@ +/** + * Display a Graph, and manage any user input that purely changes the view (e.g. Zoom). This + * serves as the view in the MVC (TikzDocument, TikzView, TikzScene). + */ + +#ifndef TIKZVIEW_H +#define TIKZVIEW_H + +#include +#include +#include +#include +#include +#include +#include +#include + +class TikzView : public QGraphicsView +{ + Q_OBJECT +public: + explicit TikzView(QWidget *parent = 0); +public slots: + void zoomIn(); + void zoomOut(); +protected: + void drawBackground(QPainter *painter, const QRectF &rect); +private: + float _scale; +}; + +#endif // TIKZVIEW_H diff --git a/src/gui/toolpalette.cpp b/src/gui/toolpalette.cpp new file mode 100644 index 0000000..3c08bce --- /dev/null +++ b/src/gui/toolpalette.cpp @@ -0,0 +1,50 @@ +#include "toolpalette.h" + +#include +#include +#include +#include + +ToolPalette::ToolPalette(QWidget *parent) : + QToolBar(parent) +{ + setWindowFlags(Qt::Window + | Qt::CustomizeWindowHint + | Qt::WindowDoesNotAcceptFocus); + setOrientation(Qt::Vertical); + setFocusPolicy(Qt::NoFocus); + setGeometry(100,200,30,195); + + tools = new QActionGroup(this); + + select = new QAction(QIcon(":/images/select-rectangular.png"), "Select"); + vertex = new QAction(QIcon(":/images/draw-ellipse.png"), "Add Vertex"); + edge = new QAction(QIcon(":/images/draw-path.png"), "Add Edge"); + crop = new QAction(QIcon(":/images/transform-crop-and-resize.png"), "Bounding Box"); + + tools->addAction(select); + tools->addAction(vertex); + tools->addAction(edge); + tools->addAction(crop); + + select->setCheckable(true); + vertex->setCheckable(true); + edge->setCheckable(true); + crop->setCheckable(true); + select->setChecked(true); + + addAction(select); + addAction(vertex); + addAction(edge); + addAction(crop); +} + +ToolPalette::Tool ToolPalette::currentTool() const +{ + QAction *a = tools->checkedAction(); + if (a == vertex) return VERTEX; + else if (a == edge) return EDGE; + else if (a == crop) return CROP; + else return SELECT; +} + diff --git a/src/gui/toolpalette.h b/src/gui/toolpalette.h new file mode 100644 index 0000000..ba6aed5 --- /dev/null +++ b/src/gui/toolpalette.h @@ -0,0 +1,34 @@ +/** + * A small window that lets the user select the current editing tool. + */ + +#ifndef TOOLPALETTE_H +#define TOOLPALETTE_H + +#include +#include +#include +#include + +class ToolPalette : public QToolBar +{ + Q_OBJECT +public: + ToolPalette(QWidget *parent = 0); + enum Tool { + SELECT, + VERTEX, + EDGE, + CROP + }; + + Tool currentTool() const; +private: + QActionGroup *tools; + QAction *select; + QAction *vertex; + QAction *edge; + QAction *crop; +}; + +#endif // TOOLPALETTE_H diff --git a/src/gui/undocommands.cpp b/src/gui/undocommands.cpp new file mode 100644 index 0000000..736c258 --- /dev/null +++ b/src/gui/undocommands.cpp @@ -0,0 +1,162 @@ +#include "undocommands.h" +#include "nodeitem.h" +#include "edgeitem.h" + +#include + +MoveCommand::MoveCommand(TikzScene *scene, + QMap oldNodePositions, + QMap newNodePositions, + QUndoCommand *parent) : + QUndoCommand(parent), + _scene(scene), + _oldNodePositions(oldNodePositions), + _newNodePositions(newNodePositions) +{} + + +void MoveCommand::undo() +{ + foreach (NodeItem *ni, _scene->nodeItems()) { + if (_oldNodePositions.contains(ni->node())) { + ni->node()->setPoint(_oldNodePositions.value(ni->node())); + ni->readPos(); + } + } + + _scene->refreshAdjacentEdges(_oldNodePositions.keys()); +} + +void MoveCommand::redo() +{ + foreach (NodeItem *ni, _scene->nodeItems()) { + if (_newNodePositions.contains(ni->node())) { + ni->node()->setPoint(_newNodePositions.value(ni->node())); + ni->readPos(); + } + } + + _scene->refreshAdjacentEdges(_newNodePositions.keys()); +} + +EdgeBendCommand::EdgeBendCommand(TikzScene *scene, Edge *edge, + float oldWeight, int oldBend, + int oldInAngle, int oldOutAngle) : + _scene(scene), _edge(edge), + _oldWeight(oldWeight), _oldBend(oldBend), + _oldInAngle(oldInAngle), _oldOutAngle(oldOutAngle) +{ + _newWeight = edge->weight(); + _newBend = edge->bend(); + _newInAngle = edge->inAngle(); + _newOutAngle = edge->outAngle(); +} + +void EdgeBendCommand::undo() +{ + _edge->setWeight(_oldWeight); + _edge->setBend(_oldBend); + _edge->setInAngle(_oldInAngle); + _edge->setOutAngle(_oldOutAngle); + + foreach(EdgeItem *ei, _scene->edgeItems()) { + if (ei->edge() == _edge) { + ei->readPos(); + break; + } + } +} + +void EdgeBendCommand::redo() +{ + _edge->setWeight(_newWeight); + _edge->setBend(_newBend); + _edge->setInAngle(_newInAngle); + _edge->setOutAngle(_newOutAngle); + + foreach(EdgeItem *ei, _scene->edgeItems()) { + if (ei->edge() == _edge) { + ei->readPos(); + break; + } + } +} + +DeleteCommand::DeleteCommand(TikzScene *scene, + QMap deleteNodes, + QMap deleteEdges, + QSet selEdges) : + _scene(scene), _deleteNodes(deleteNodes), + _deleteEdges(deleteEdges), _selEdges(selEdges) +{} + +void DeleteCommand::undo() +{ + for (auto it = _deleteNodes.begin(); it != _deleteNodes.end(); ++it) { + Node *n = it.value(); + _scene->graph()->addNode(n, it.key()); + NodeItem *ni = new NodeItem(n); + _scene->nodeItems().insert(n, ni); + _scene->addItem(ni); + ni->setSelected(true); + } + + for (auto it = _deleteEdges.begin(); it != _deleteEdges.end(); ++it) { + Edge *e = it.value(); + _scene->graph()->addEdge(e, it.key()); + EdgeItem *ei = new EdgeItem(e); + _scene->edgeItems().insert(e, ei); + _scene->addItem(ei); + + if (_selEdges.contains(e)) ei->setSelected(true); + } +} + +void DeleteCommand::redo() +{ + foreach (Edge *e, _deleteEdges.values()) { + EdgeItem *ei = _scene->edgeItems()[e]; + _scene->edgeItems().remove(e); + _scene->removeItem(ei); + delete ei; + + _scene->graph()->removeEdge(e); + } + + foreach (Node *n, _deleteNodes.values()) { + NodeItem *ni = _scene->nodeItems()[n]; + _scene->nodeItems().remove(n); + _scene->removeItem(ni); + delete ni; + + _scene->graph()->removeNode(n); + } +} + +AddNodeCommand::AddNodeCommand(TikzScene *scene, Node *node, QRectF newBounds) : + _scene(scene), _node(node), _oldBounds(_scene->sceneRect()), _newBounds(newBounds) +{ +} + +void AddNodeCommand::undo() +{ + NodeItem *ni = _scene->nodeItems()[_node]; + _scene->removeItem(ni); + _scene->nodeItems().remove(_node); + delete ni; + + _scene->graph()->removeNode(_node); + + _scene->setBounds(_oldBounds); +} + +void AddNodeCommand::redo() +{ + // TODO: get the current style + _scene->graph()->addNode(_node); + NodeItem *ni = new NodeItem(_node); + _scene->nodeItems().insert(_node, ni); + _scene->addItem(ni); + + _scene->setBounds(_newBounds); +} diff --git a/src/gui/undocommands.h b/src/gui/undocommands.h new file mode 100644 index 0000000..ffff876 --- /dev/null +++ b/src/gui/undocommands.h @@ -0,0 +1,80 @@ +/** + * All changes to a TikzDocument are done via subclasses of QUndoCommand. When a controller + * (e.g. TikzScene) gets input from the user to change the document, it will push one of + * these commands onto the TikzDocument's undo stack, which automatically calls the redo() + * method of the command. + */ + +#ifndef UNDOCOMMANDS_H +#define UNDOCOMMANDS_H + +#include "tikzscene.h" + +#include + +class MoveCommand : public QUndoCommand +{ +public: + explicit MoveCommand(TikzScene *scene, + QMap oldNodePositions, + QMap newNodePositions, + QUndoCommand *parent = 0); + void undo() override; + void redo() override; +private: + TikzScene *_scene; + QMap _oldNodePositions; + QMap _newNodePositions; +}; + +class EdgeBendCommand : public QUndoCommand +{ +public: + explicit EdgeBendCommand(TikzScene *scene, Edge *edge, + float oldWeight, int oldBend, + int oldInAngle, int oldOutAngle); + void undo() override; + void redo() override; +private: + TikzScene *_scene; + Edge *_edge; + float _oldWeight; + int _oldBend; + int _oldInAngle; + int _oldOutAngle; + float _newWeight; + int _newBend; + int _newInAngle; + int _newOutAngle; +}; + +class DeleteCommand : public QUndoCommand +{ +public: + explicit DeleteCommand(TikzScene *scene, + QMap deleteNodes, + QMap deleteEdges, + QSet selEdges); + void undo() override; + void redo() override; +private: + TikzScene *_scene; + QMap _deleteNodes; + QMap _deleteEdges; + QSet _selEdges; +}; + +class AddNodeCommand : public QUndoCommand +{ +public: + explicit AddNodeCommand(TikzScene *scene, Node *node, QRectF newBounds); + void undo() override; + void redo() override; +private: + TikzScene *_scene; + Node *_node; + QRectF _oldBounds; + QRectF _newBounds; +}; + +#endif // UNDOCOMMANDS_H diff --git a/src/main.cpp b/src/main.cpp new file mode 100644 index 0000000..b676211 --- /dev/null +++ b/src/main.cpp @@ -0,0 +1,14 @@ +#include "tikzit.h" + +#include +#include + + +int main(int argc, char *argv[]) +{ + QApplication a(argc, argv); + a.setQuitOnLastWindowClosed(false); + tikzit = new Tikzit(); + + return a.exec(); +} diff --git a/src/test/testmain.cpp b/src/test/testmain.cpp new file mode 100644 index 0000000..56491ed --- /dev/null +++ b/src/test/testmain.cpp @@ -0,0 +1,22 @@ +#include "testtest.h" +#include "testparser.h" +#include "testtikzoutput.h" + +#include +#include +#include + +int main(int argc, char *argv[]) +{ + TestTest test; + TestParser parser; + TestTikzOutput tikzOutput; + int r = QTest::qExec(&test, argc, argv) | + QTest::qExec(&parser, argc, argv) | + QTest::qExec(&tikzOutput, argc, argv); + + if (r == 0) std::cout << "***************** All tests passed! *****************\n"; + else std::cout << "***************** Some tests failed. *****************\n"; + + return r; +} diff --git a/src/test/testparser.cpp b/src/test/testparser.cpp new file mode 100644 index 0000000..e220e2e --- /dev/null +++ b/src/test/testparser.cpp @@ -0,0 +1,163 @@ +#include "testparser.h" +#include "graph.h" +#include "tikzgraphassembler.h" + +#include +#include + +//void TestParser::initTestCase() +//{ + +//} + +//void TestParser::cleanupTestCase() +//{ + +//} + +void TestParser::parseEmptyGraph() +{ + Graph *g = new Graph(); + TikzGraphAssembler ga(g); + bool res = ga.parse("\\begin{tikzpicture}\n\\end{tikzpicture}"); + QVERIFY(res); + QVERIFY(g->nodes().size() == 0); + QVERIFY(g->edges().size() == 0); + delete g; +} + +void TestParser::parseNodeGraph() +{ + Graph *g = new Graph(); + TikzGraphAssembler ga(g); + bool res = ga.parse( + "\\begin{tikzpicture}\n" + " \\node (node0) at (1.1, -2.2) {};\n" + " \\node (node1) at (3, 4) {test};\n" + "\\end{tikzpicture}"); + QVERIFY(res); + QVERIFY(g->nodes().size() == 2); + QVERIFY(g->edges().size() == 0); + QVERIFY(g->nodes()[0]->name() == "node0"); + QVERIFY(g->nodes()[0]->label() == ""); + QVERIFY(g->nodes()[0]->point() == QPointF(1.1,-2.2)); + QVERIFY(g->nodes()[1]->name() == "node1"); + QVERIFY(g->nodes()[1]->label() == "test"); + QVERIFY(g->nodes()[1]->point() == QPointF(3,4)); + delete g; +} + +void TestParser::parseEdgeGraph() +{ + Graph *g = new Graph(); + TikzGraphAssembler ga(g); + bool res = ga.parse( + "\\begin{tikzpicture}\n" + " \\begin{pgfonlayer}{nodelayer}\n" + " \\node [style=x, {foo++}] (0) at (-1, -1) {};\n" + " \\node [style=y] (1) at (0, 1) {};\n" + " \\node [style=z] (2) at (1, -1) {};\n" + " \\end{pgfonlayer}\n" + " \\begin{pgfonlayer}{edgelayer}\n" + " \\draw [style=a] (1.center) to (2);\n" + " \\draw [style=b, foo] (2) to (0.west);\n" + " \\draw [style=c] (0) to (1);\n" + " \\end{pgfonlayer}\n" + "\\end{tikzpicture}\n"); + QVERIFY(res); + QVERIFY(g->nodes().size() == 3); + QVERIFY(g->edges().size() == 3); + QVERIFY(g->nodes()[0]->data()->atom("foo++")); + QVERIFY(g->edges()[0]->data()->property("style") == "a"); + QVERIFY(!g->edges()[0]->data()->atom("foo")); + QVERIFY(g->edges()[1]->data()->property("style") == "b"); + QVERIFY(g->edges()[1]->data()->atom("foo")); + QVERIFY(g->edges()[2]->data()->property("style") == "c"); + Node *en = g->edges()[0]->edgeNode(); + QVERIFY(en == 0); + delete g; +} + +void TestParser::parseEdgeNode() +{ + Graph *g = new Graph(); + TikzGraphAssembler ga(g); + bool res = ga.parse( + "\\begin{tikzpicture}\n" + " \\begin{pgfonlayer}{nodelayer}\n" + " \\node [style=none] (0) at (-1, 0) {};\n" + " \\node [style=none] (1) at (1, 0) {};\n" + " \\end{pgfonlayer}\n" + " \\begin{pgfonlayer}{edgelayer}\n" + " \\draw [style=diredge] (0.center) to node[foo, bar=baz baz]{test} (1.center);\n" + " \\end{pgfonlayer}\n" + "\\end{tikzpicture}\n"); + QVERIFY(res); + QVERIFY(g->nodes().size() == 2); + QVERIFY(g->edges().size() == 1); + Node *en = g->edges()[0]->edgeNode(); + QVERIFY(en != 0); + QVERIFY(en->label() == "test"); + QVERIFY(en->data()->atom("foo")); + QVERIFY(en->data()->property("bar") == "baz baz"); + delete g; +} + +void TestParser::parseEdgeBends() +{ + Graph *g = new Graph(); + TikzGraphAssembler ga(g); + bool res = ga.parse( + "\\begin{tikzpicture}\n" + " \\begin{pgfonlayer}{nodelayer}\n" + " \\node [style=white] (0) at (-1, 0) {};\n" + " \\node [style=black] (1) at (1, 0) {};\n" + " \\end{pgfonlayer}\n" + " \\begin{pgfonlayer}{edgelayer}\n" + " \\draw [style=diredge,bend left] (0) to (1);\n" + " \\draw [style=diredge,bend right] (0) to (1);\n" + " \\draw [style=diredge,bend left=20] (0) to (1);\n" + " \\draw [style=diredge,bend right=80] (0) to (1);\n" + " \\draw [style=diredge,in=10,out=150,looseness=2] (0) to (1);\n" + " \\end{pgfonlayer}\n" + "\\end{tikzpicture}\n"); + QVERIFY(res); + QVERIFY(g->nodes().size() == 2); + QVERIFY(g->edges().size() == 5); + QVERIFY(g->edges()[0]->bend() == -30); + QVERIFY(g->edges()[1]->bend() == 30); + QVERIFY(g->edges()[2]->bend() == -20); + QVERIFY(g->edges()[3]->bend() == 80); + QVERIFY(g->edges()[4]->inAngle() == 10); + QVERIFY(g->edges()[4]->outAngle() == 150); + QVERIFY(g->edges()[4]->weight() == 2.0f/2.5f); +} + +void TestParser::parseBbox() +{ + Graph *g = new Graph(); + TikzGraphAssembler ga(g); + bool res = ga.parse( + "\\begin{tikzpicture}\n" + " \\path [use as bounding box] (-1.5,-1.5) rectangle (1.5,1.5);\n" + " \\begin{pgfonlayer}{nodelayer}\n" + " \\node [style=white dot] (0) at (-1, -1) {};\n" + " \\node [style=white dot] (1) at (0, 1) {};\n" + " \\node [style=white dot] (2) at (1, -1) {};\n" + " \\end{pgfonlayer}\n" + " \\begin{pgfonlayer}{edgelayer}\n" + " \\draw [style=diredge] (1) to (2);\n" + " \\draw [style=diredge] (2) to (0);\n" + " \\draw [style=diredge] (0) to (1);\n" + " \\end{pgfonlayer}\n" + "\\end{tikzpicture}\n"); + QVERIFY(res); + QVERIFY(g->nodes().size() == 3); + QVERIFY(g->edges().size() == 3); + QVERIFY(g->hasBbox()); + QVERIFY(g->bbox() == QRectF(QPointF(-1.5,-1.5), QPointF(1.5,1.5))); + + delete g; +} + + diff --git a/src/test/testparser.h b/src/test/testparser.h new file mode 100644 index 0000000..a40a58f --- /dev/null +++ b/src/test/testparser.h @@ -0,0 +1,18 @@ +#ifndef TESTPARSER_H +#define TESTPARSER_H + +#include + +class TestParser : public QObject +{ + Q_OBJECT +private slots: + void parseEmptyGraph(); + void parseNodeGraph(); + void parseEdgeGraph(); + void parseEdgeNode(); + void parseEdgeBends(); + void parseBbox(); +}; + +#endif // TESTPARSER_H diff --git a/src/test/testtest.cpp b/src/test/testtest.cpp new file mode 100644 index 0000000..59173c0 --- /dev/null +++ b/src/test/testtest.cpp @@ -0,0 +1,10 @@ +#include "testtest.h" + +#include +#include + +void TestTest::initTestCase() { qDebug("initialising test"); } +void TestTest::myFirstTest() { QVERIFY(1 == 1); } +void TestTest::mySecondTest() { QVERIFY(1 != 2); } +void TestTest::cleanupTestCase() { qDebug("cleaning up test"); } + diff --git a/src/test/testtest.h b/src/test/testtest.h new file mode 100644 index 0000000..69a0bc8 --- /dev/null +++ b/src/test/testtest.h @@ -0,0 +1,17 @@ +#ifndef TESTTEST_H +#define TESTTEST_H + +#include +#include + +class TestTest: public QObject +{ + Q_OBJECT +private slots: + void initTestCase(); + void myFirstTest(); + void mySecondTest(); + void cleanupTestCase(); +}; + +#endif // TESTTEST_H diff --git a/src/test/testtikzoutput.cpp b/src/test/testtikzoutput.cpp new file mode 100644 index 0000000..f086786 --- /dev/null +++ b/src/test/testtikzoutput.cpp @@ -0,0 +1,97 @@ +#include "testtikzoutput.h" +#include "graphelementproperty.h" +#include "graphelementdata.h" +#include "graph.h" +#include "tikzgraphassembler.h" + +#include +#include +#include + +void TestTikzOutput::escape() +{ + QVERIFY(GraphElementProperty::tikzEscape("foo") == "foo"); + QVERIFY(GraphElementProperty::tikzEscape("foo'") == "foo'"); + QVERIFY(GraphElementProperty::tikzEscape("foo bar") == "foo bar"); + QVERIFY(GraphElementProperty::tikzEscape("foo.bar") == "foo.bar"); + QVERIFY(GraphElementProperty::tikzEscape("foo-bar") == "foo-bar"); + QVERIFY(GraphElementProperty::tikzEscape("foo >") == "foo >"); + QVERIFY(GraphElementProperty::tikzEscape("foo <") == "foo <"); + QVERIFY(GraphElementProperty::tikzEscape("foo+") == "{foo+}"); + QVERIFY(GraphElementProperty::tikzEscape("foo{bar}") == "{foo{bar}}"); +} + +void TestTikzOutput::data() +{ + GraphElementData d; + QVERIFY(d.tikz() == ""); + d.setAtom("foo"); + QVERIFY(d.tikz() == "[foo]"); + d.setAtom("bar"); + QVERIFY(d.tikz() == "[foo, bar]"); + d.setProperty("foo","bar"); + QVERIFY(d.tikz() == "[foo, bar, foo=bar]"); + d.setAtom("foo+"); + QVERIFY(d.tikz() == "[foo, bar, foo=bar, {foo+}]"); + d.unsetAtom("foo"); + QVERIFY(d.tikz() == "[bar, foo=bar, {foo+}]"); + d.unsetProperty("foo"); + QVERIFY(d.tikz() == "[bar, {foo+}]"); + d.unsetAtom("foo+"); + QVERIFY(d.tikz() == "[bar]"); + d.unsetAtom("bar"); + QVERIFY(d.tikz() == ""); +} + +void TestTikzOutput::graphEmpty() +{ + Graph *g = new Graph(); + + QString tikz = + "\\begin{tikzpicture}\n" + "\\end{tikzpicture}\n"; + QVERIFY(g->tikz() == tikz); + + delete g; +} + +void TestTikzOutput::graphFromTikz() +{ + Graph *g = new Graph(); + TikzGraphAssembler ga(g); + + QString tikz = + "\\begin{tikzpicture}\n" + "\t\\path [use as bounding box] (-1.5,-1.5) rectangle (1.5,1.5);\n" + "\t\\begin{pgfonlayer}{nodelayer}\n" + "\t\t\\node [style=white dot] (0) at (-1, -1) {};\n" + "\t\t\\node [style=white dot] (1) at (0, 1) {};\n" + "\t\t\\node [style=white dot] (2) at (1, -1) {};\n" + "\t\\end{pgfonlayer}\n" + "\t\\begin{pgfonlayer}{edgelayer}\n" + "\t\t\\draw [style=diredge] (1) to (2);\n" + "\t\t\\draw [style=diredge] (2.center) to (0);\n" + "\t\t\\draw [style=diredge] (0) to ();\n" + "\t\\end{pgfonlayer}\n" + "\\end{tikzpicture}\n"; + bool res = ga.parse(tikz); + QVERIFY2(res, "parsed successfully"); + QVERIFY2(g->tikz() == tikz, "produced matching tikz"); + + delete g; +} + +void TestTikzOutput::graphBbox() +{ + Graph *g = new Graph(); + g->setBbox(QRectF(QPointF(-0.75, -0.5), QPointF(0.25, 1))); + + QString tikz = + "\\begin{tikzpicture}\n" + "\t\\path [use as bounding box] (-0.75,-0.5) rectangle (0.25,1);\n" + "\\end{tikzpicture}\n"; + QVERIFY(g->tikz() == tikz); + + + delete g; +} diff --git a/src/test/testtikzoutput.h b/src/test/testtikzoutput.h new file mode 100644 index 0000000..dff1db1 --- /dev/null +++ b/src/test/testtikzoutput.h @@ -0,0 +1,17 @@ +#ifndef TESTTIKZOUTPUT_H +#define TESTTIKZOUTPUT_H + +#include + +class TestTikzOutput : public QObject +{ + Q_OBJECT +private slots: + void escape(); + void data(); + void graphBbox(); + void graphEmpty(); + void graphFromTikz(); +}; + +#endif // TESTTIKZOUTPUT_H diff --git a/src/tikzit.cpp b/src/tikzit.cpp new file mode 100644 index 0000000..42d16e8 --- /dev/null +++ b/src/tikzit.cpp @@ -0,0 +1,105 @@ +#include "tikzit.h" + +#include +#include + +// application-level instance of Tikzit +Tikzit *tikzit; + +// font to use for node labels +QFont Tikzit::LABEL_FONT("Courrier", 9); + +Tikzit::Tikzit() +{ + _mainMenu = new MainMenu(); + + _activeWindow = 0; + QMainWindow *dummy = new QMainWindow(); + + _toolPalette = new ToolPalette(dummy); + _propertyPalette = new PropertyPalette(dummy); + + loadStyles(); + + _toolPalette->show(); + _propertyPalette->show(); + + _windows << new MainWindow(); + _windows[0]->show(); +} + +//QMenuBar *Tikzit::mainMenu() const +//{ +// return _mainMenu; +//} + +ToolPalette *Tikzit::toolPalette() const +{ + return _toolPalette; +} + +PropertyPalette *Tikzit::propertyPalette() const +{ + return _propertyPalette; +} + +void Tikzit::loadStyles() +{ + _nodeStyles << new NodeStyle("black dot", NodeShape::Circle, Qt::black, Qt::black, 1); + _nodeStyles << new NodeStyle("white dot", NodeShape::Circle, Qt::white, Qt::black, 1); + _nodeStyles << new NodeStyle("gray dot", NodeShape::Circle, Qt::gray, Qt::black, 1); +} + +void Tikzit::newDoc() +{ + MainWindow *w = new MainWindow(); + w->show(); + _windows << w; +} + +MainWindow *Tikzit::activeWindow() const +{ + return _activeWindow; +} + +void Tikzit::setActiveWindow(MainWindow *activeWindow) +{ + _activeWindow = activeWindow; +} + +void Tikzit::removeWindow(MainWindow *w) +{ + _windows.removeAll(w); + if (_activeWindow == w) { + if (_windows.isEmpty()) _activeWindow = 0; + else _activeWindow = _windows[0]; + } +} + +NodeStyle *Tikzit::nodeStyle(QString name) +{ + foreach (NodeStyle *s , _nodeStyles) + if (s->name == name) return s; + return noneStyle; //NodeStyle(name, NodeShape::Circle, Qt::white); +} + +void Tikzit::open() +{ + QSettings settings("tikzit", "tikzit"); + QString fileName = QFileDialog::getOpenFileName(0, + tr("Open File"), + settings.value("previous-file-path").toString(), + tr("TiKZ Files (*.tikz)")); + + if (!fileName.isEmpty()) { + if (_windows.size() == 1 && _windows[0]->pristine()) { + _windows[0]->open(fileName); + _windows[0]->show(); + } else { + MainWindow *w = new MainWindow(); + w->show(); + w->open(fileName); + _windows << w; + } + } +} diff --git a/src/tikzit.h b/src/tikzit.h new file mode 100644 index 0000000..deb683e --- /dev/null +++ b/src/tikzit.h @@ -0,0 +1,70 @@ +/** + * Tikzit is the top-level class which maintains the global application state. For convenience, + * it also inherits the main menu. + */ + +#ifndef TIKZIT_H +#define TIKZIT_H + +#include "mainwindow.h" +#include "mainmenu.h" +#include "ui_mainmenu.h" + +#include "toolpalette.h" +#include "propertypalette.h" +#include "nodestyle.h" + +#include +#include +#include +#include +#include +#include + +// Number of pixels between (0,0) and (1,0) at 100% zoom level. This should be +// divisible by 8 to avoid rounding errors with e.g. grid-snapping. +#define GLOBAL_SCALE 80 +#define GLOBAL_SCALEF 80.0f + +inline QPointF toScreen(QPointF src) +{ src.setY(-src.y()); src *= GLOBAL_SCALEF; return src; } + +inline QPointF fromScreen(QPointF src) +{ src.setY(-src.y()); src /= GLOBAL_SCALEF; return src; } + + +class Tikzit : public QObject { + Q_OBJECT +public: + Tikzit(); + ToolPalette *toolPalette() const; + PropertyPalette *propertyPalette() const; + + MainWindow *activeWindow() const; + void setActiveWindow(MainWindow *activeWindow); + void removeWindow(MainWindow *w); + NodeStyle *nodeStyle(QString name); + + static QFont LABEL_FONT; +// Ui::MainMenu *_mainMenuUi; +// QMenuBar *_mainMenu; + + void newDoc(); + void open(); + +private: +// void createMenu(); + void loadStyles(); + + MainMenu *_mainMenu; + ToolPalette *_toolPalette; + PropertyPalette *_propertyPalette; + QVector _windows; + MainWindow *_activeWindow; + QVector _nodeStyles; + +}; + +extern Tikzit *tikzit; + +#endif // TIKZIT_H diff --git a/src/util.cpp b/src/util.cpp new file mode 100644 index 0000000..64716d2 --- /dev/null +++ b/src/util.cpp @@ -0,0 +1,48 @@ +#include "util.h" + +float bezierInterpolate(float dist, float c0, float c1, float c2, float c3) { + float distp = 1 - dist; + return (distp*distp*distp) * c0 + + 3 * (distp*distp) * dist * c1 + + 3 * (dist*dist) * distp * c2 + + (dist*dist*dist) * c3; +} + +QPointF bezierInterpolateFull (float dist, QPointF c0, QPointF c1, QPointF c2, QPointF c3) { + return QPointF(bezierInterpolate (dist, c0.x(), c1.x(), c2.x(), c3.x()), + bezierInterpolate (dist, c0.y(), c1.y(), c2.y(), c3.y())); +} + + +float roundToNearest(float stepSize, float val) { + if (stepSize==0.0f) return val; + else return round(val/stepSize)*stepSize; +} + +float radiansToDegrees (float radians) { + return (radians * 180.0f) / M_PI; +} + +float degreesToRadians(float degrees) { + return (degrees * M_PI) / 180.0f; +} + +int normaliseAngleDeg (int degrees) { + while (degrees > 180) { + degrees -= 360; + } + while (degrees <= -180) { + degrees += 360; + } + return degrees; +} + +float normaliseAngleRad (float rads) { + while (rads > M_PI) { + rads -= 2 * M_PI; + } + while (rads <= -M_PI) { + rads += 2 * M_PI; + } + return rads; +} diff --git a/src/util.h b/src/util.h new file mode 100644 index 0000000..2952214 --- /dev/null +++ b/src/util.h @@ -0,0 +1,24 @@ +/** + * Various utility functions, mostly for mathematical calculation. + */ + +#ifndef UTIL_H +#define UTIL_H + +#include +#include + +// interpolate on a cubic bezier curve +float bezierInterpolate(float dist, float c0, float c1, float c2, float c3); +QPointF bezierInterpolateFull (float dist, QPointF c0, QPointF c1, QPointF c2, QPointF c3); + +// rounding +float roundToNearest(float stepSize, float val); +float radiansToDegrees (float radians); + +// angles +float degreesToRadians(float degrees); +int normaliseAngleDeg (int degrees); +float normaliseAngleRad (float rads); + +#endif // UTIL_H diff --git a/target_wrapper.sh b/target_wrapper.sh new file mode 100755 index 0000000..1793274 --- /dev/null +++ b/target_wrapper.sh @@ -0,0 +1,6 @@ +#!/bin/sh +DYLD_FRAMEWORK_PATH=/usr/local/Cellar/qt5/5.7.1_1/lib${DYLD_FRAMEWORK_PATH:+:$DYLD_FRAMEWORK_PATH} +export DYLD_FRAMEWORK_PATH +QT_PLUGIN_PATH=/usr/local/Cellar/qt5/5.7.1_1/plugins${QT_PLUGIN_PATH:+:$QT_PLUGIN_PATH} +export QT_PLUGIN_PATH +exec "$@" diff --git a/tikzit.pro b/tikzit.pro new file mode 100644 index 0000000..b14822b --- /dev/null +++ b/tikzit.pro @@ -0,0 +1,98 @@ +#------------------------------------------------- +# +# Project created by QtCreator 2017-01-11T17:30:16 +# +#------------------------------------------------- + +QT += core gui +CONFIG += testcase + +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets + +TARGET = tikzit +TEMPLATE = app + +# The following define makes your compiler emit warnings if you use +# any feature of Qt which as been marked as deprecated (the exact warnings +# depend on your compiler). Please consult the documentation of the +# deprecated API in order to know how to port your code away from it. +DEFINES += QT_DEPRECATED_WARNINGS + +# You can also make your code fail to compile if you use deprecated APIs. +# In order to do so, uncomment the following line. +# You can also select to disable deprecated APIs only up to a certain version of Qt. +#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 + +FLEXSOURCES = src/data/tikzlexer.l +BISONSOURCES = src/data/tikzparser.y + +include(flex.pri) +include(bison.pri) + +SOURCES += src/gui/mainwindow.cpp \ + src/gui/toolpalette.cpp \ + src/gui/tikzscene.cpp \ + src/data/graph.cpp \ + src/data/node.cpp \ + src/data/edge.cpp \ + src/data/tikzgraphassembler.cpp \ + src/data/graphelementdata.cpp \ + src/data/graphelementproperty.cpp \ + src/gui/propertypalette.cpp \ + src/gui/tikzview.cpp \ + src/gui/nodeitem.cpp \ + src/gui/edgeitem.cpp \ + src/tikzit.cpp \ + src/data/nodestyle.cpp \ + src/gui/commands.cpp \ + src/data/tikzdocument.cpp \ + src/gui/undocommands.cpp \ + src/gui/mainmenu.cpp \ + src/util.cpp + +HEADERS += src/gui/mainwindow.h \ + src/gui/toolpalette.h \ + src/gui/tikzscene.h \ + src/data/graph.h \ + src/data/node.h \ + src/data/edge.h \ + src/data/tikzgraphassembler.h \ + src/data/graphelementdata.h \ + src/data/graphelementproperty.h \ + src/gui/propertypalette.h \ + src/data/tikzparserdefs.h \ + src/gui/tikzview.h \ + src/gui/nodeitem.h \ + src/tikzit.h \ + src/gui/edgeitem.h \ + src/data/nodestyle.h \ + src/gui/commands.h \ + src/data/tikzdocument.h \ + src/gui/undocommands.h \ + src/gui/mainmenu.h \ + src/util.h + +FORMS += src/gui/mainwindow.ui \ + src/gui/propertypalette.ui \ + src/gui/mainmenu.ui + +INCLUDEPATH += src src/gui src/data + +DISTFILES += + +RESOURCES += tikzit.qrc + +test { + QT += testlib + TARGET = UnitTests + SOURCES -= src/main.cpp + HEADERS += src/test/testtest.h \ + src/test/testparser.h \ + src/test/testtikzoutput.h + SOURCES += src/test/testmain.cpp \ + src/test/testtest.cpp \ + src/test/testparser.cpp \ + src/test/testtikzoutput.cpp +} else { + SOURCES += src/main.cpp +} diff --git a/tikzit.qrc b/tikzit.qrc new file mode 100644 index 0000000..9f98a38 --- /dev/null +++ b/tikzit.qrc @@ -0,0 +1,8 @@ + + + images/draw-ellipse.png + images/draw-path.png + images/select-rectangular.png + images/transform-crop-and-resize.png + + diff --git a/tikzit/Makefile b/tikzit/Makefile deleted file mode 100644 index ff6108f..0000000 --- a/tikzit/Makefile +++ /dev/null @@ -1,1139 +0,0 @@ -############################################################################# -# Makefile for building: tikzit.app/Contents/MacOS/tikzit -# Generated by qmake (3.0) (Qt 5.7.1) -# Project: tikzit.pro -# Template: app -# Command: /usr/local/bin/qmake -o Makefile tikzit.pro -############################################################################# - -MAKEFILE = Makefile - -####### Compiler, tools and options - -CC = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -CXX = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++ -DEFINES = -DQT_DEPRECATED_WARNINGS -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -CFLAGS = -pipe -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -mmacosx-version-min=10.8 -O2 -Wall -W -fPIC $(DEFINES) -CXXFLAGS = -pipe -stdlib=libc++ -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -mmacosx-version-min=10.8 -O2 -std=gnu++11 -Wall -W -fPIC $(DEFINES) -INCPATH = -I. -Isrc -Isrc/gui -Isrc/data -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers -I. -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/OpenGL.framework/Headers -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/AGL.framework/Headers -I. -I/usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang -F/usr/local/Cellar/qt5/5.7.1_1/lib -QMAKE = /usr/local/bin/qmake -DEL_FILE = rm -f -CHK_DIR_EXISTS= test -d -MKDIR = mkdir -p -COPY = cp -f -COPY_FILE = cp -f -COPY_DIR = cp -f -R -INSTALL_FILE = install -m 644 -p -INSTALL_PROGRAM = install -m 755 -p -INSTALL_DIR = cp -f -R -DEL_FILE = rm -f -SYMLINK = ln -f -s -DEL_DIR = rmdir -MOVE = mv -f -TAR = tar -cf -COMPRESS = gzip -9f -DISTNAME = tikzit1.0.0 -DISTDIR = /Users/alek/git/tikzit/tikzit/.tmp/tikzit1.0.0 -LINK = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++ -LFLAGS = -headerpad_max_install_names -stdlib=libc++ -Wl,-syslibroot,/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -mmacosx-version-min=10.8 -LIBS = $(SUBLIBS) -F/usr/local/Cellar/qt5/5.7.1_1/lib -framework QtWidgets -framework QtGui -framework QtCore -framework DiskArbitration -framework IOKit -framework OpenGL -framework AGL -AR = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ar cq -RANLIB = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib -s -SED = sed -STRIP = strip - -####### Output directory - -OBJECTS_DIR = ./ - -####### Files - -SOURCES = src/gui/mainwindow.cpp \ - src/gui/toolpalette.cpp \ - src/gui/tikzscene.cpp \ - src/data/graph.cpp \ - src/data/node.cpp \ - src/data/edge.cpp \ - src/data/tikzgraphassembler.cpp \ - src/data/graphelementdata.cpp \ - src/data/graphelementproperty.cpp \ - src/gui/propertypalette.cpp \ - src/main.cpp src/data/tikzlexer.lexer.cpp \ - src/data/tikzparser.parser.cpp \ - qrc_tikzit.cpp \ - moc_mainwindow.cpp \ - moc_toolpalette.cpp \ - moc_graph.cpp \ - moc_node.cpp \ - moc_edge.cpp \ - moc_tikzgraphassembler.cpp \ - moc_graphelementdata.cpp \ - moc_propertypalette.cpp -OBJECTS = mainwindow.o \ - toolpalette.o \ - tikzscene.o \ - graph.o \ - node.o \ - edge.o \ - tikzgraphassembler.o \ - graphelementdata.o \ - graphelementproperty.o \ - propertypalette.o \ - main.o \ - tikzlexer.lexer.o \ - tikzparser.parser.o \ - qrc_tikzit.o \ - moc_mainwindow.o \ - moc_toolpalette.o \ - moc_graph.o \ - moc_node.o \ - moc_edge.o \ - moc_tikzgraphassembler.o \ - moc_graphelementdata.o \ - moc_propertypalette.o -DIST = /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/spec_pre.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/qdevice.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/device_config.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/unix.conf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/mac.conf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/macx.conf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/sanitize.conf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/gcc-base.conf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/gcc-base-mac.conf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/clang.conf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/clang-mac.conf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/qconfig.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dcore.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dcore_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dextras.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dextras_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dinput.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dinput_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dlogic.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dlogic_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquick.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquick_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickextras.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickextras_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickinput.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickinput_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickrender.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickrender_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3drender.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3drender_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_bluetooth.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_bluetooth_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_bootstrap_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_charts.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_charts_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_clucene_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_concurrent.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_concurrent_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_core.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_core_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_datavisualization.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_datavisualization_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_designer.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_designer_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_designercomponents_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gamepad.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gamepad_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gui.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gui_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_help.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_help_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_location.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_location_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_macextras.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_macextras_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimedia.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimedia_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimediawidgets.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimediawidgets_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_network.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_network_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_nfc.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_nfc_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_opengl.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_opengl_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_openglextensions.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_openglextensions_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_packetprotocol_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_platformsupport_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_positioning.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_positioning_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_printsupport.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_printsupport_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_purchasing.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_purchasing_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qml.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qml_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmldebug_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmldevtools_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmltest.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmltest_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quick.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quick_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickcontrols2.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickcontrols2_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickparticles_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quicktemplates2_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickwidgets.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickwidgets_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_script.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_script_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scripttools.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scripttools_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scxml.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scxml_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sensors.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sensors_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialbus.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialbus_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialport.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialport_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sql.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sql_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_svg.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_svg_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_testlib.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_testlib_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_uiplugin.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_uitools.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_uitools_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webchannel.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webchannel_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webengine.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webengine_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginecore.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginecore_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginecoreheaders_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginewidgets.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginewidgets_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_websockets.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_websockets_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webview.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webview_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_widgets.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_widgets_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xml.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xml_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xmlpatterns.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xmlpatterns_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/qt_functions.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/qt_config.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang/qmake.conf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/spec_post.prf \ - .qmake.stash \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/exclusive_builds.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/sdk.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/toolchain.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/toolchain.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/default_pre.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/default_pre.prf \ - flex.pri \ - bison.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/resolve_config.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/default_post.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/default_post.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/objective_c.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/resolve_target.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/testcase.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/warn_on.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/qt.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/resources.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/moc.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/unix/opengl.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/uic.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/unix/thread.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/file_copies.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/rez.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/asset_catalogs.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/testcase_targets.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/exceptions.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/yacc.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/lex.prf \ - tikzit.pro src/gui/mainwindow.h \ - src/gui/toolpalette.h \ - src/gui/tikzscene.h \ - src/data/graph.h \ - src/data/node.h \ - src/data/edge.h \ - src/data/tikzgraphassembler.h \ - src/data/graphelementdata.h \ - src/data/graphelementproperty.h \ - src/gui/propertypalette.h \ - src/data/tikzparserdefs.h src/gui/mainwindow.cpp \ - src/gui/toolpalette.cpp \ - src/gui/tikzscene.cpp \ - src/data/graph.cpp \ - src/data/node.cpp \ - src/data/edge.cpp \ - src/data/tikzgraphassembler.cpp \ - src/data/graphelementdata.cpp \ - src/data/graphelementproperty.cpp \ - src/gui/propertypalette.cpp \ - src/main.cpp -QMAKE_TARGET = tikzit -DESTDIR = -TARGET = tikzit.app/Contents/MacOS/tikzit - - -first: all -####### Build rules - -$(TARGET): src/data/tikzlexer.lexer.cpp src/data/tikzparser.parser.cpp src/data/tikzparser.parser.hpp ui_mainwindow.h ui_propertypalette.h $(OBJECTS) - @test -d tikzit.app/Contents/MacOS/ || mkdir -p tikzit.app/Contents/MacOS/ - $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) - -Makefile: tikzit.pro /usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang/qmake.conf /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/spec_pre.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/qdevice.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/device_config.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/unix.conf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/mac.conf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/macx.conf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/sanitize.conf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/gcc-base.conf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/gcc-base-mac.conf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/clang.conf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/clang-mac.conf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/qconfig.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dcore.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dcore_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dextras.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dextras_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dinput.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dinput_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dlogic.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dlogic_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquick.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquick_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickextras.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickextras_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickinput.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickinput_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickrender.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickrender_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3drender.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3drender_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_bluetooth.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_bluetooth_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_bootstrap_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_charts.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_charts_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_clucene_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_concurrent.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_concurrent_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_core.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_core_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_datavisualization.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_datavisualization_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_designer.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_designer_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_designercomponents_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gamepad.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gamepad_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gui.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gui_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_help.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_help_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_location.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_location_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_macextras.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_macextras_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimedia.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimedia_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimediawidgets.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimediawidgets_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_network.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_network_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_nfc.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_nfc_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_opengl.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_opengl_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_openglextensions.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_openglextensions_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_packetprotocol_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_platformsupport_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_positioning.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_positioning_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_printsupport.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_printsupport_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_purchasing.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_purchasing_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qml.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qml_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmldebug_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmldevtools_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmltest.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmltest_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quick.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quick_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickcontrols2.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickcontrols2_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickparticles_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quicktemplates2_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickwidgets.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickwidgets_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_script.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_script_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scripttools.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scripttools_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scxml.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scxml_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sensors.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sensors_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialbus.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialbus_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialport.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialport_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sql.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sql_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_svg.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_svg_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_testlib.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_testlib_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_uiplugin.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_uitools.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_uitools_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webchannel.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webchannel_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webengine.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webengine_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginecore.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginecore_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginecoreheaders_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginewidgets.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginewidgets_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_websockets.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_websockets_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webview.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webview_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_widgets.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_widgets_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xml.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xml_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xmlpatterns.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xmlpatterns_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/qt_functions.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/qt_config.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang/qmake.conf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/spec_post.prf \ - .qmake.stash \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/exclusive_builds.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/sdk.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/toolchain.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/toolchain.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/default_pre.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/default_pre.prf \ - flex.pri \ - bison.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/resolve_config.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/default_post.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/default_post.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/objective_c.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/resolve_target.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/testcase.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/warn_on.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/qt.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/resources.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/moc.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/unix/opengl.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/uic.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/unix/thread.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/file_copies.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/rez.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/asset_catalogs.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/testcase_targets.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/exceptions.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/yacc.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/lex.prf \ - tikzit.pro \ - tikzit.qrc \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/QtWidgets.prl \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/QtGui.prl \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/QtCore.prl - $(QMAKE) -o Makefile tikzit.pro -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/spec_pre.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/qdevice.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/device_config.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/unix.conf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/mac.conf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/macx.conf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/sanitize.conf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/gcc-base.conf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/gcc-base-mac.conf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/clang.conf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/clang-mac.conf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/qconfig.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dcore.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dcore_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dextras.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dextras_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dinput.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dinput_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dlogic.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dlogic_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquick.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquick_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickextras.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickextras_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickinput.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickinput_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickrender.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickrender_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3drender.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3drender_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_bluetooth.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_bluetooth_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_bootstrap_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_charts.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_charts_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_clucene_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_concurrent.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_concurrent_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_core.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_core_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_datavisualization.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_datavisualization_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_designer.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_designer_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_designercomponents_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gamepad.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gamepad_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gui.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gui_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_help.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_help_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_location.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_location_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_macextras.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_macextras_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimedia.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimedia_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimediawidgets.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimediawidgets_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_network.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_network_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_nfc.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_nfc_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_opengl.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_opengl_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_openglextensions.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_openglextensions_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_packetprotocol_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_platformsupport_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_positioning.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_positioning_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_printsupport.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_printsupport_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_purchasing.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_purchasing_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qml.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qml_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmldebug_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmldevtools_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmltest.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmltest_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quick.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quick_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickcontrols2.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickcontrols2_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickparticles_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quicktemplates2_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickwidgets.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickwidgets_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_script.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_script_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scripttools.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scripttools_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scxml.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scxml_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sensors.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sensors_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialbus.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialbus_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialport.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialport_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sql.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sql_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_svg.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_svg_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_testlib.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_testlib_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_uiplugin.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_uitools.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_uitools_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webchannel.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webchannel_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webengine.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webengine_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginecore.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginecore_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginecoreheaders_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginewidgets.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginewidgets_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_websockets.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_websockets_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webview.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webview_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_widgets.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_widgets_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xml.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xml_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xmlpatterns.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xmlpatterns_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/qt_functions.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/qt_config.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang/qmake.conf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/spec_post.prf: -.qmake.stash: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/exclusive_builds.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/sdk.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/toolchain.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/toolchain.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/default_pre.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/default_pre.prf: -flex.pri: -bison.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/resolve_config.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/default_post.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/default_post.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/objective_c.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/resolve_target.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/testcase.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/warn_on.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/qt.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/resources.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/moc.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/unix/opengl.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/uic.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/unix/thread.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/file_copies.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/rez.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/asset_catalogs.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/testcase_targets.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/exceptions.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/yacc.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/lex.prf: -tikzit.pro: -tikzit.qrc: -/usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/QtWidgets.prl: -/usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/QtGui.prl: -/usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/QtCore.prl: -qmake: FORCE - @$(QMAKE) -o Makefile tikzit.pro - -qmake_all: FORCE - -tikzit.app/Contents/PkgInfo: - @test -d tikzit.app/Contents || mkdir -p tikzit.app/Contents - @$(DEL_FILE) tikzit.app/Contents/PkgInfo - @echo "APPL????" > tikzit.app/Contents/PkgInfo -tikzit.app/Contents/Resources/empty.lproj: - @test -d tikzit.app/Contents/Resources || mkdir -p tikzit.app/Contents/Resources - @touch tikzit.app/Contents/Resources/empty.lproj - -tikzit.app/Contents/Info.plist: - @test -d tikzit.app/Contents || mkdir -p tikzit.app/Contents - @$(DEL_FILE) tikzit.app/Contents/Info.plist - @sed -e "s,@SHORT_VERSION@,1.0,g" -e "s,@FULL_VERSION@,1.0.0,g" -e "s,@TYPEINFO@,????,g" -e "s,@BUNDLEIDENTIFIER@,com.yourcompany.tikzit,g" -e "s,@ICON@,,g" -e "s,@EXECUTABLE@,tikzit,g" -e "s,@LIBRARY@,tikzit,g" -e "s,@TYPEINFO@,????,g" /usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang/Info.plist.app >tikzit.app/Contents/Info.plist - -all: Makefile \ - tikzit.app/Contents/PkgInfo \ - tikzit.app/Contents/Resources/empty.lproj \ - tikzit.app/Contents/Info.plist $(TARGET) - -dist: distdir FORCE - (cd `dirname $(DISTDIR)` && $(TAR) $(DISTNAME).tar $(DISTNAME) && $(COMPRESS) $(DISTNAME).tar) && $(MOVE) `dirname $(DISTDIR)`/$(DISTNAME).tar.gz . && $(DEL_FILE) -r $(DISTDIR) - -distdir: FORCE - @test -d $(DISTDIR) || mkdir -p $(DISTDIR) - $(COPY_FILE) --parents $(DIST) $(DISTDIR)/ - $(COPY_FILE) --parents src/data/tikzlexer.l $(DISTDIR)/ - $(COPY_FILE) --parents src/data/tikzparser.y $(DISTDIR)/ - $(COPY_FILE) --parents src/data/tikzparser.y $(DISTDIR)/ - $(COPY_FILE) --parents tikzit.qrc $(DISTDIR)/ - $(COPY_FILE) --parents src/gui/mainwindow.h src/gui/toolpalette.h src/gui/tikzscene.h src/data/graph.h src/data/node.h src/data/edge.h src/data/tikzgraphassembler.h src/data/graphelementdata.h src/data/graphelementproperty.h src/gui/propertypalette.h src/data/tikzparserdefs.h $(DISTDIR)/ - $(COPY_FILE) --parents src/gui/mainwindow.cpp src/gui/toolpalette.cpp src/gui/tikzscene.cpp src/data/graph.cpp src/data/node.cpp src/data/edge.cpp src/data/tikzgraphassembler.cpp src/data/graphelementdata.cpp src/data/graphelementproperty.cpp src/gui/propertypalette.cpp src/main.cpp $(DISTDIR)/ - $(COPY_FILE) --parents src/gui/mainwindow.ui src/gui/propertypalette.ui $(DISTDIR)/ - - -clean: compiler_clean - -$(DEL_FILE) $(OBJECTS) - -$(DEL_FILE) *~ core *.core - - -distclean: clean - -$(DEL_FILE) -r tikzit.app - -$(DEL_FILE) /Users/alek/git/tikzit/tikzit/target_wrapper.sh .qmake.stash - -$(DEL_FILE) Makefile - - -####### Sub-libraries - -check: first - /Users/alek/git/tikzit/tikzit/target_wrapper.sh $(TESTRUNNER) ./$(QMAKE_TARGET).app/Contents/MacOS/$(QMAKE_TARGET) $(TESTARGS) - -mocclean: compiler_moc_header_clean compiler_moc_source_clean - -mocables: compiler_moc_header_make_all compiler_moc_source_make_all - -benchmark: first - -compiler_flex_make_all: src/data/tikzlexer.lexer.cpp -compiler_flex_clean: - -$(DEL_FILE) src/data/tikzlexer.lexer.cpp -src/data/tikzlexer.lexer.cpp: src/data/tikzlexer.l - flex --header-file -o src/data/tikzlexer.lexer.cpp src/data/tikzlexer.l - -compiler_bison_make_all: src/data/tikzparser.parser.cpp -compiler_bison_clean: - -$(DEL_FILE) src/data/tikzparser.parser.cpp -src/data/tikzparser.parser.cpp: src/data/tikzparser.y - bison -d -o src/data/tikzparser.parser.cpp src/data/tikzparser.y - -compiler_bison_header_make_all: src/data/tikzparser.parser.hpp -compiler_bison_header_clean: - -$(DEL_FILE) src/data/tikzparser.parser.hpp -src/data/tikzparser.parser.hpp: src/data/tikzparser.y - bison -d -o src/data/tikzparser.parser.cpp src/data/tikzparser.y - -compiler_rcc_make_all: qrc_tikzit.cpp -compiler_rcc_clean: - -$(DEL_FILE) qrc_tikzit.cpp -qrc_tikzit.cpp: tikzit.qrc \ - /usr/local/Cellar/qt5/5.7.1_1/bin/rcc \ - images/draw-ellipse.png \ - images/transform-crop-and-resize.png \ - images/draw-path.png \ - images/select-rectangular.png - /usr/local/Cellar/qt5/5.7.1_1/bin/rcc -name tikzit tikzit.qrc -o qrc_tikzit.cpp - -compiler_moc_header_make_all: moc_mainwindow.cpp moc_toolpalette.cpp moc_graph.cpp moc_node.cpp moc_edge.cpp moc_tikzgraphassembler.cpp moc_graphelementdata.cpp moc_propertypalette.cpp -compiler_moc_header_clean: - -$(DEL_FILE) moc_mainwindow.cpp moc_toolpalette.cpp moc_graph.cpp moc_node.cpp moc_edge.cpp moc_tikzgraphassembler.cpp moc_graphelementdata.cpp moc_propertypalette.cpp -moc_mainwindow.cpp: src/gui/tikzscene.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QWidget \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qwidget.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QGraphicsScene \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qgraphicsscene.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QMainWindow \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qmainwindow.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QGraphicsView \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qgraphicsview.h \ - src/gui/mainwindow.h \ - /usr/local/Cellar/qt5/5.7.1_1/bin/moc - /usr/local/Cellar/qt5/5.7.1_1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -D__APPLE_CC__ -I/usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang -I/Users/alek/git/tikzit/tikzit -I/Users/alek/git/tikzit/tikzit/src -I/Users/alek/git/tikzit/tikzit/src/gui -I/Users/alek/git/tikzit/tikzit/src/data -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/8.0.0/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include -F/usr/local/Cellar/qt5/5.7.1_1/lib src/gui/mainwindow.h -o moc_mainwindow.cpp - -moc_toolpalette.cpp: /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QToolBar \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qtoolbar.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QAction \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qaction.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QActionGroup \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qactiongroup.h \ - src/gui/toolpalette.h \ - /usr/local/Cellar/qt5/5.7.1_1/bin/moc - /usr/local/Cellar/qt5/5.7.1_1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -D__APPLE_CC__ -I/usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang -I/Users/alek/git/tikzit/tikzit -I/Users/alek/git/tikzit/tikzit/src -I/Users/alek/git/tikzit/tikzit/src/gui -I/Users/alek/git/tikzit/tikzit/src/data -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/8.0.0/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include -F/usr/local/Cellar/qt5/5.7.1_1/lib src/gui/toolpalette.h -o moc_toolpalette.cpp - -moc_graph.cpp: src/data/node.h \ - src/data/graphelementdata.h \ - src/data/graphelementproperty.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QPointF \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qpoint.h \ - src/data/edge.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QMultiHash \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qhash.h \ - src/data/graph.h \ - /usr/local/Cellar/qt5/5.7.1_1/bin/moc - /usr/local/Cellar/qt5/5.7.1_1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -D__APPLE_CC__ -I/usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang -I/Users/alek/git/tikzit/tikzit -I/Users/alek/git/tikzit/tikzit/src -I/Users/alek/git/tikzit/tikzit/src/gui -I/Users/alek/git/tikzit/tikzit/src/data -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/8.0.0/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include -F/usr/local/Cellar/qt5/5.7.1_1/lib src/data/graph.h -o moc_graph.cpp - -moc_node.cpp: src/data/graphelementdata.h \ - src/data/graphelementproperty.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QPointF \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qpoint.h \ - src/data/node.h \ - /usr/local/Cellar/qt5/5.7.1_1/bin/moc - /usr/local/Cellar/qt5/5.7.1_1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -D__APPLE_CC__ -I/usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang -I/Users/alek/git/tikzit/tikzit -I/Users/alek/git/tikzit/tikzit/src -I/Users/alek/git/tikzit/tikzit/src/gui -I/Users/alek/git/tikzit/tikzit/src/data -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/8.0.0/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include -F/usr/local/Cellar/qt5/5.7.1_1/lib src/data/node.h -o moc_node.cpp - -moc_edge.cpp: src/data/graphelementdata.h \ - src/data/graphelementproperty.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ - src/data/edge.h \ - /usr/local/Cellar/qt5/5.7.1_1/bin/moc - /usr/local/Cellar/qt5/5.7.1_1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -D__APPLE_CC__ -I/usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang -I/Users/alek/git/tikzit/tikzit -I/Users/alek/git/tikzit/tikzit/src -I/Users/alek/git/tikzit/tikzit/src/gui -I/Users/alek/git/tikzit/tikzit/src/data -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/8.0.0/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include -F/usr/local/Cellar/qt5/5.7.1_1/lib src/data/edge.h -o moc_edge.cpp - -moc_tikzgraphassembler.cpp: src/data/node.h \ - src/data/graphelementdata.h \ - src/data/graphelementproperty.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QPointF \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qpoint.h \ - src/data/graph.h \ - src/data/edge.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QMultiHash \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qhash.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QHash \ - src/data/tikzgraphassembler.h \ - /usr/local/Cellar/qt5/5.7.1_1/bin/moc - /usr/local/Cellar/qt5/5.7.1_1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -D__APPLE_CC__ -I/usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang -I/Users/alek/git/tikzit/tikzit -I/Users/alek/git/tikzit/tikzit/src -I/Users/alek/git/tikzit/tikzit/src/gui -I/Users/alek/git/tikzit/tikzit/src/data -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/8.0.0/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include -F/usr/local/Cellar/qt5/5.7.1_1/lib src/data/tikzgraphassembler.h -o moc_tikzgraphassembler.cpp - -moc_graphelementdata.cpp: src/data/graphelementproperty.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ - src/data/graphelementdata.h \ - /usr/local/Cellar/qt5/5.7.1_1/bin/moc - /usr/local/Cellar/qt5/5.7.1_1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -D__APPLE_CC__ -I/usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang -I/Users/alek/git/tikzit/tikzit -I/Users/alek/git/tikzit/tikzit/src -I/Users/alek/git/tikzit/tikzit/src/gui -I/Users/alek/git/tikzit/tikzit/src/data -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/8.0.0/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include -F/usr/local/Cellar/qt5/5.7.1_1/lib src/data/graphelementdata.h -o moc_graphelementdata.cpp - -moc_propertypalette.cpp: /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QDockWidget \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qdockwidget.h \ - src/gui/propertypalette.h \ - /usr/local/Cellar/qt5/5.7.1_1/bin/moc - /usr/local/Cellar/qt5/5.7.1_1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -D__APPLE_CC__ -I/usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang -I/Users/alek/git/tikzit/tikzit -I/Users/alek/git/tikzit/tikzit/src -I/Users/alek/git/tikzit/tikzit/src/gui -I/Users/alek/git/tikzit/tikzit/src/data -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/8.0.0/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include -F/usr/local/Cellar/qt5/5.7.1_1/lib src/gui/propertypalette.h -o moc_propertypalette.cpp - -compiler_moc_source_make_all: -compiler_moc_source_clean: -compiler_uic_make_all: ui_mainwindow.h ui_propertypalette.h -compiler_uic_clean: - -$(DEL_FILE) ui_mainwindow.h ui_propertypalette.h -ui_mainwindow.h: src/gui/mainwindow.ui \ - /usr/local/Cellar/qt5/5.7.1_1/bin/uic - /usr/local/Cellar/qt5/5.7.1_1/bin/uic src/gui/mainwindow.ui -o ui_mainwindow.h - -ui_propertypalette.h: src/gui/propertypalette.ui \ - /usr/local/Cellar/qt5/5.7.1_1/bin/uic - /usr/local/Cellar/qt5/5.7.1_1/bin/uic src/gui/propertypalette.ui -o ui_propertypalette.h - -compiler_rez_source_make_all: -compiler_rez_source_clean: -compiler_yacc_decl_make_all: -compiler_yacc_decl_clean: -compiler_yacc_impl_make_all: -compiler_yacc_impl_clean: -compiler_lex_make_all: -compiler_lex_clean: -compiler_clean: compiler_flex_clean compiler_bison_clean compiler_bison_header_clean compiler_rcc_clean compiler_moc_header_clean compiler_uic_clean - -####### Compile - -mainwindow.o: src/gui/mainwindow.cpp src/gui/mainwindow.h \ - src/gui/tikzscene.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QWidget \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qwidget.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QGraphicsScene \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qgraphicsscene.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QMainWindow \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qmainwindow.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QGraphicsView \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qgraphicsview.h \ - ui_mainwindow.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QDebug \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qdebug.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o mainwindow.o src/gui/mainwindow.cpp - -toolpalette.o: src/gui/toolpalette.cpp src/gui/toolpalette.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QToolBar \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qtoolbar.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QAction \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qaction.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QActionGroup \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qactiongroup.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QLayout \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qlayout.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QVBoxLayout \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qboxlayout.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o toolpalette.o src/gui/toolpalette.cpp - -tikzscene.o: src/gui/tikzscene.cpp src/gui/tikzscene.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QWidget \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qwidget.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QGraphicsScene \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qgraphicsscene.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o tikzscene.o src/gui/tikzscene.cpp - -graph.o: src/data/graph.cpp src/data/graph.h \ - src/data/node.h \ - src/data/graphelementdata.h \ - src/data/graphelementproperty.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QPointF \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qpoint.h \ - src/data/edge.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QMultiHash \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qhash.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o graph.o src/data/graph.cpp - -node.o: src/data/node.cpp src/data/node.h \ - src/data/graphelementdata.h \ - src/data/graphelementproperty.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QPointF \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qpoint.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QDebug \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qdebug.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o node.o src/data/node.cpp - -edge.o: src/data/edge.cpp src/data/edge.h \ - src/data/graphelementdata.h \ - src/data/graphelementproperty.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o edge.o src/data/edge.cpp - -tikzgraphassembler.o: src/data/tikzgraphassembler.cpp src/data/tikzgraphassembler.h \ - src/data/node.h \ - src/data/graphelementdata.h \ - src/data/graphelementproperty.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QPointF \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qpoint.h \ - src/data/graph.h \ - src/data/edge.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QMultiHash \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qhash.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QHash - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o tikzgraphassembler.o src/data/tikzgraphassembler.cpp - -graphelementdata.o: src/data/graphelementdata.cpp src/data/graphelementdata.h \ - src/data/graphelementproperty.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QDebug \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qdebug.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o graphelementdata.o src/data/graphelementdata.cpp - -graphelementproperty.o: src/data/graphelementproperty.cpp src/data/graphelementproperty.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o graphelementproperty.o src/data/graphelementproperty.cpp - -propertypalette.o: src/gui/propertypalette.cpp src/gui/propertypalette.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QDockWidget \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qdockwidget.h \ - src/data/graphelementdata.h \ - src/data/graphelementproperty.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ - ui_propertypalette.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QDebug \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qdebug.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers/QCloseEvent \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers/qevent.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QSettings \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qsettings.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o propertypalette.o src/gui/propertypalette.cpp - -main.o: src/main.cpp src/gui/mainwindow.h \ - src/gui/tikzscene.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QWidget \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qwidget.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QGraphicsScene \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qgraphicsscene.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QMainWindow \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qmainwindow.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QGraphicsView \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qgraphicsview.h \ - src/gui/toolpalette.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QToolBar \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qtoolbar.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QAction \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qaction.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QActionGroup \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qactiongroup.h \ - src/gui/propertypalette.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QDockWidget \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qdockwidget.h \ - src/data/graph.h \ - src/data/node.h \ - src/data/graphelementdata.h \ - src/data/graphelementproperty.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QPointF \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qpoint.h \ - src/data/edge.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QMultiHash \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qhash.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QApplication \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qapplication.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o src/main.cpp - -tikzlexer.lexer.o: src/data/tikzlexer.lexer.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o tikzlexer.lexer.o src/data/tikzlexer.lexer.cpp - -tikzparser.parser.o: src/data/tikzparser.parser.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o tikzparser.parser.o src/data/tikzparser.parser.cpp - -qrc_tikzit.o: qrc_tikzit.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o qrc_tikzit.o qrc_tikzit.cpp - -moc_mainwindow.o: moc_mainwindow.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_mainwindow.o moc_mainwindow.cpp - -moc_toolpalette.o: moc_toolpalette.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_toolpalette.o moc_toolpalette.cpp - -moc_graph.o: moc_graph.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_graph.o moc_graph.cpp - -moc_node.o: moc_node.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_node.o moc_node.cpp - -moc_edge.o: moc_edge.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_edge.o moc_edge.cpp - -moc_tikzgraphassembler.o: moc_tikzgraphassembler.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_tikzgraphassembler.o moc_tikzgraphassembler.cpp - -moc_graphelementdata.o: moc_graphelementdata.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_graphelementdata.o moc_graphelementdata.cpp - -moc_propertypalette.o: moc_propertypalette.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_propertypalette.o moc_propertypalette.cpp - -####### Install - -install_target: first FORCE - @test -d $(INSTALL_ROOT)/usr/local/Cellar/qt5/5.7.1_1/tests/tikzit || mkdir -p $(INSTALL_ROOT)/usr/local/Cellar/qt5/5.7.1_1/tests/tikzit - $(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/Cellar/qt5/5.7.1_1/tests/tikzit/tikzit.app - - -$(INSTALL_DIR) tikzit.app $(INSTALL_ROOT)/usr/local/Cellar/qt5/5.7.1_1/tests/tikzit/tikzit.app - -$(STRIP) $(INSTALL_ROOT)/usr/local/Cellar/qt5/5.7.1_1/tests/tikzit/tikzit.app/Contents/MacOS/$(QMAKE_TARGET) - -uninstall_target: FORCE - -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/Cellar/qt5/5.7.1_1/tests/tikzit/tikzit.app - -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/Cellar/qt5/5.7.1_1/tests/tikzit/ - - -install: install_target FORCE - -uninstall: uninstall_target FORCE - -FORCE: - diff --git a/tikzit/README b/tikzit/README deleted file mode 100644 index ecd6713..0000000 --- a/tikzit/README +++ /dev/null @@ -1,12 +0,0 @@ -Building on OSX: - -You'll need QT5 and poppler with QT5 bindings. QT5 can be installed with Homebrew: - -$ brew install qt5 - -whereas poppler should be built from source to get the QT5 bindings. To compile, clang needs to have C++11 features enabled. I built using: - -$ CXXFLAGS="-std=c++11" ./configure -$ CXXFLAGS="-std=c++11" make - - diff --git a/tikzit/bison.pri b/tikzit/bison.pri deleted file mode 100644 index 3fcfc36..0000000 --- a/tikzit/bison.pri +++ /dev/null @@ -1,14 +0,0 @@ -bison.name = Bison ${QMAKE_FILE_IN} -bison.input = BISONSOURCES -bison.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.parser.cpp -bison.commands = bison -d -o ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.parser.cpp ${QMAKE_FILE_IN} -bison.CONFIG += target_predeps -bison.variable_out = GENERATED_SOURCES -silent:bison.commands = @echo Bison ${QMAKE_FILE_IN} && $$bison.commands -QMAKE_EXTRA_COMPILERS += bison -bison_header.input = BISONSOURCES -bison_header.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.parser.hpp -bison_header.commands = bison -d -o ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.parser.cpp ${QMAKE_FILE_IN} -bison_header.CONFIG += target_predeps no_link -silent:bison_header.commands = @echo Bison ${QMAKE_FILE_IN} && $$bison.commands -QMAKE_EXTRA_COMPILERS += bison_header diff --git a/tikzit/flex.pri b/tikzit/flex.pri deleted file mode 100644 index 6a42c0f..0000000 --- a/tikzit/flex.pri +++ /dev/null @@ -1,8 +0,0 @@ -flex.name = Flex ${QMAKE_FILE_IN} -flex.input = FLEXSOURCES -flex.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.lexer.cpp -flex.commands = flex --header-file -o ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.lexer.cpp ${QMAKE_FILE_IN} -flex.CONFIG += target_predeps -flex.variable_out = GENERATED_SOURCES -silent:flex.commands = @echo Lex ${QMAKE_FILE_IN} && $$flex.commands -QMAKE_EXTRA_COMPILERS += flex diff --git a/tikzit/images/AH_latex_head.png b/tikzit/images/AH_latex_head.png deleted file mode 100644 index b25cf6d..0000000 Binary files a/tikzit/images/AH_latex_head.png and /dev/null differ diff --git a/tikzit/images/AH_latex_tail.png b/tikzit/images/AH_latex_tail.png deleted file mode 100644 index 0825cda..0000000 Binary files a/tikzit/images/AH_latex_tail.png and /dev/null differ diff --git a/tikzit/images/AH_none.png b/tikzit/images/AH_none.png deleted file mode 100644 index 6322374..0000000 Binary files a/tikzit/images/AH_none.png and /dev/null differ diff --git a/tikzit/images/AH_plain_head.png b/tikzit/images/AH_plain_head.png deleted file mode 100644 index 8a398fa..0000000 Binary files a/tikzit/images/AH_plain_head.png and /dev/null differ diff --git a/tikzit/images/AH_plain_tail.png b/tikzit/images/AH_plain_tail.png deleted file mode 100644 index 45b1876..0000000 Binary files a/tikzit/images/AH_plain_tail.png and /dev/null differ diff --git a/tikzit/images/ED_arrow.png b/tikzit/images/ED_arrow.png deleted file mode 100644 index 153d2e1..0000000 Binary files a/tikzit/images/ED_arrow.png and /dev/null differ diff --git a/tikzit/images/ED_none.png b/tikzit/images/ED_none.png deleted file mode 100644 index f95140c..0000000 Binary files a/tikzit/images/ED_none.png and /dev/null differ diff --git a/tikzit/images/ED_tick.png b/tikzit/images/ED_tick.png deleted file mode 100644 index a3882fe..0000000 Binary files a/tikzit/images/ED_tick.png and /dev/null differ diff --git a/tikzit/images/customshape.png b/tikzit/images/customshape.png deleted file mode 100644 index cff8275..0000000 Binary files a/tikzit/images/customshape.png and /dev/null differ diff --git a/tikzit/images/draw-ellipse.png b/tikzit/images/draw-ellipse.png deleted file mode 100644 index d8e3e6f..0000000 Binary files a/tikzit/images/draw-ellipse.png and /dev/null differ diff --git a/tikzit/images/draw-path.png b/tikzit/images/draw-path.png deleted file mode 100644 index ec5e691..0000000 Binary files a/tikzit/images/draw-path.png and /dev/null differ diff --git a/tikzit/images/emblem-important.png b/tikzit/images/emblem-important.png deleted file mode 100644 index 81e9ed2..0000000 Binary files a/tikzit/images/emblem-important.png and /dev/null differ diff --git a/tikzit/images/emblem-unreadable-grey.png b/tikzit/images/emblem-unreadable-grey.png deleted file mode 100644 index 09572ab..0000000 Binary files a/tikzit/images/emblem-unreadable-grey.png and /dev/null differ diff --git a/tikzit/images/engine.png b/tikzit/images/engine.png deleted file mode 100644 index 1e45370..0000000 Binary files a/tikzit/images/engine.png and /dev/null differ diff --git a/tikzit/images/format-indent-less.png b/tikzit/images/format-indent-less.png deleted file mode 100644 index 7ced16f..0000000 Binary files a/tikzit/images/format-indent-less.png and /dev/null differ diff --git a/tikzit/images/preamble.png b/tikzit/images/preamble.png deleted file mode 100644 index d940d24..0000000 Binary files a/tikzit/images/preamble.png and /dev/null differ diff --git a/tikzit/images/select-rectangular.png b/tikzit/images/select-rectangular.png deleted file mode 100644 index 866b602..0000000 Binary files a/tikzit/images/select-rectangular.png and /dev/null differ diff --git a/tikzit/images/text-x-generic.png b/tikzit/images/text-x-generic.png deleted file mode 100644 index 928a679..0000000 Binary files a/tikzit/images/text-x-generic.png and /dev/null differ diff --git a/tikzit/images/text-x-script.png b/tikzit/images/text-x-script.png deleted file mode 100644 index 801dcd6..0000000 Binary files a/tikzit/images/text-x-script.png and /dev/null differ diff --git a/tikzit/images/tikzit48x48.png b/tikzit/images/tikzit48x48.png deleted file mode 100644 index 056d04b..0000000 Binary files a/tikzit/images/tikzit48x48.png and /dev/null differ diff --git a/tikzit/images/transform-crop-and-resize.png b/tikzit/images/transform-crop-and-resize.png deleted file mode 100644 index 4dedd93..0000000 Binary files a/tikzit/images/transform-crop-and-resize.png and /dev/null differ diff --git a/tikzit/images/transform-move.png b/tikzit/images/transform-move.png deleted file mode 100644 index ae4201b..0000000 Binary files a/tikzit/images/transform-move.png and /dev/null differ diff --git a/tikzit/images/updates.png b/tikzit/images/updates.png deleted file mode 100644 index 469ae30..0000000 Binary files a/tikzit/images/updates.png and /dev/null differ diff --git a/tikzit/src/data/edge.cpp b/tikzit/src/data/edge.cpp deleted file mode 100644 index 6802b2d..0000000 --- a/tikzit/src/data/edge.cpp +++ /dev/null @@ -1,306 +0,0 @@ -#include "edge.h" -#include "tikzit.h" -#include "util.h" - -#include -#include - -Edge::Edge(Node *s, Node *t, QObject *parent) : - QObject(parent), _source(s), _target(t) -{ - _data = new GraphElementData(); - _edgeNode = 0; - _dirty = true; - _basicBendMode = true; - _bend = 0; - _inAngle = 0; - _outAngle = 0; - _weight = 0.4f; - updateControls(); -} - -Edge::~Edge() -{ - delete _data; - delete _edgeNode; -} - -Node *Edge::source() const -{ - return _source; -} - -Node *Edge::target() const -{ - return _target; -} - -bool Edge::isSelfLoop() -{ - return (_source == _target); -} - -bool Edge::isStraight() -{ - return (_basicBendMode && _bend == 0); -} - -GraphElementData *Edge::data() const -{ - return _data; -} - -void Edge::setData(GraphElementData *data) -{ - delete _data; - _data = data; - setAttributesFromData(); -} - -QString Edge::sourceAnchor() const -{ - return _sourceAnchor; -} - -void Edge::setSourceAnchor(const QString &sourceAnchor) -{ - _sourceAnchor = sourceAnchor; -} - -QString Edge::targetAnchor() const -{ - return _targetAnchor; -} - -void Edge::setTargetAnchor(const QString &targetAnchor) -{ - _targetAnchor = targetAnchor; -} - -Node *Edge::edgeNode() const -{ - return _edgeNode; -} - -void Edge::setEdgeNode(Node *edgeNode) -{ - if (_edgeNode != 0) delete _edgeNode; - _edgeNode = edgeNode; -} - -bool Edge::hasEdgeNode() -{ - return _edgeNode != 0; -} - -void Edge::updateControls() { - //if (_dirty) { - QPointF src = _source->point(); - QPointF targ = _target->point(); - - float dx = (targ.x() - src.x()); - float dy = (targ.y() - src.y()); - - float outAngleR = 0.0f; - float inAngleR = 0.0f; - - if (_basicBendMode) { - float angle = std::atan2(dy, dx); - float bnd = (float)_bend * (M_PI / 180.0f); - outAngleR = angle - bnd; - inAngleR = M_PI + angle + bnd; - _outAngle = outAngleR * (180.f / M_PI); - _inAngle = inAngleR * (180.f / M_PI); - } else { - outAngleR = (float)_outAngle * (M_PI / 180.0f); - inAngleR = (float)_inAngle * (M_PI / 180.0f); - } - - // TODO: calculate head and tail properly, not just for circles - if (_source->style()->isNone()) { - _tail = src; - } else { - _tail = QPointF(src.x() + std::cos(outAngleR) * 0.1, - src.y() + std::sin(outAngleR) * 0.1); - } - - if (_target->style()->isNone()) { - _head = targ; - } else { - _head = QPointF(targ.x() + std::cos(inAngleR) * 0.1, - targ.y() + std::sin(inAngleR) * 0.1); - } - - // give a default distance for self-loops - _cpDist = (dx==0.0f && dy==0.0f) ? _weight : std::sqrt(dx*dx + dy*dy) * _weight; - - _cp1 = QPointF(src.x() + (_cpDist * std::cos(outAngleR)), - src.y() + (_cpDist * std::sin(outAngleR))); - - _cp2 = QPointF(targ.x() + (_cpDist * std::cos(inAngleR)), - targ.y() + (_cpDist * std::sin(inAngleR))); - - _mid = bezierInterpolateFull (0.5f, _tail, _cp1, _cp2, _head); -// midTan = [self _findTanFor:mid usingSpanFrom:0.4f to:0.6f]; - -// tailTan = [self _findTanFor:tail usingSpanFrom:0.0f to:0.1f]; -// headTan = [self _findTanFor:head usingSpanFrom:1.0f to:0.9f]; - //_dirty = false; - //} -} - -void Edge::setAttributesFromData() -{ - _basicBendMode = true; - bool ok = true; - - if (_data->atom("bend left")) { - _bend = -30; - } else if (_data->atom("bend right")) { - _bend = 30; - } else if (_data->property("bend left") != 0) { - _bend = -_data->property("bend left").toInt(&ok); - if (!ok) _bend = -30; - } else if (_data->property("bend right") != 0) { - _bend = _data->property("bend right").toInt(&ok); - if (!ok) _bend = 30; - } else { - _bend = 0; - - if (_data->property("in") != 0 && _data->property("out") != 0) { - _basicBendMode = false; - _inAngle = _data->property("in").toInt(&ok); - if (!ok) _inAngle = 0; - _outAngle = _data->property("out").toInt(&ok); - if (!ok) _outAngle = 180; - } - } - - if (_data->property("looseness") != 0) { - _weight = _data->property("looseness").toFloat(&ok) / 2.5f; - if (!ok) _weight = 0.4f; - } else { - _weight = (isSelfLoop()) ? 1.0f : 0.4f; - } - - //qDebug() << "bend: " << _bend << " in: " << _inAngle << " out: " << _outAngle; - _dirty = true; -} - -void Edge::updateData() -{ - _data->unsetAtom("loop"); - _data->unsetProperty("in"); - _data->unsetProperty("out"); - _data->unsetAtom("bend left"); - _data->unsetAtom("bend right"); - _data->unsetProperty("bend left"); - _data->unsetProperty("bend right"); - _data->unsetProperty("looseness"); - - // TODO: style handling? - - if (_basicBendMode && _bend != 0) { - QString bendKey; - int b; - if (_bend < 0) { - bendKey = "bend left"; - b = -_bend; - } else { - bendKey = "bend right"; - b = _bend; - } - - if (b == 30) { - _data->setAtom(bendKey); - } else { - _data->setProperty(bendKey, QString::number(b)); - } - } else { - _data->setProperty("in", QString::number(_inAngle)); - _data->setProperty("out", QString::number(_outAngle)); - } - - if (_source == _target) _data->setAtom("loop"); - if (!isSelfLoop() && !isStraight() && _weight != 0.4f) - _data->setProperty("looseness", QString::number(_weight*2.5f, 'f', 2)); - -} - - -QPointF Edge::head() const -{ - return _head; -} - -QPointF Edge::tail() const -{ - return _tail; -} - -QPointF Edge::cp1() const -{ - return _cp1; -} - -QPointF Edge::cp2() const -{ - return _cp2; -} - -int Edge::bend() const -{ - return _bend; -} - -int Edge::inAngle() const -{ - return _inAngle; -} - -int Edge::outAngle() const -{ - return _outAngle; -} - -float Edge::weight() const -{ - return _weight; -} - -bool Edge::basicBendMode() const -{ - return _basicBendMode; -} - -float Edge::cpDist() const -{ - return _cpDist; -} - -void Edge::setBend(int bend) -{ - _bend = bend; -} - -void Edge::setInAngle(int inAngle) -{ - _inAngle = inAngle; -} - -void Edge::setOutAngle(int outAngle) -{ - _outAngle = outAngle; -} - -void Edge::setWeight(float weight) -{ - _weight = weight; -} - -QPointF Edge::mid() const -{ - return _mid; -} - - diff --git a/tikzit/src/data/edge.h b/tikzit/src/data/edge.h deleted file mode 100644 index d2913b8..0000000 --- a/tikzit/src/data/edge.h +++ /dev/null @@ -1,89 +0,0 @@ -#ifndef EDGE_H -#define EDGE_H - -#include "graphelementdata.h" -#include "node.h" - -#include -#include - -class Edge : public QObject -{ - Q_OBJECT -public: - explicit Edge(Node *s, Node *t, QObject *parent = 0); - ~Edge(); - - Node *source() const; - Node *target() const; - - bool isSelfLoop(); - bool isStraight(); - - GraphElementData *data() const; - void setData(GraphElementData *data); - - QString sourceAnchor() const; - void setSourceAnchor(const QString &sourceAnchor); - - QString targetAnchor() const; - void setTargetAnchor(const QString &targetAnchor); - - Node *edgeNode() const; - void setEdgeNode(Node *edgeNode); - bool hasEdgeNode(); - - void updateControls(); - void setAttributesFromData(); - void updateData(); - - QPointF head() const; - QPointF tail() const; - QPointF cp1() const; - QPointF cp2() const; - QPointF mid() const; - - int bend() const; - int inAngle() const; - int outAngle() const; - float weight() const; - bool basicBendMode() const; - float cpDist() const; - - void setBend(int bend); - void setInAngle(int inAngle); - void setOutAngle(int outAngle); - void setWeight(float weight); - -signals: - -public slots: - -private: - QString _sourceAnchor; - QString _targetAnchor; - - // owned - Node *_edgeNode; - GraphElementData *_data; - - // referenced - Node *_source; - Node *_target; - - bool _dirty; - bool _basicBendMode; - int _bend; - int _inAngle; - int _outAngle; - float _weight; - float _cpDist; - - QPointF _head; - QPointF _tail; - QPointF _cp1; - QPointF _cp2; - QPointF _mid; -}; - -#endif // EDGE_H diff --git a/tikzit/src/data/graph.cpp b/tikzit/src/data/graph.cpp deleted file mode 100644 index ba9a4c6..0000000 --- a/tikzit/src/data/graph.cpp +++ /dev/null @@ -1,172 +0,0 @@ -#include "graph.h" - -#include -#include -#include -#include -#include - -Graph::Graph(QObject *parent) : QObject(parent) -{ - _data = new GraphElementData(this); - _bbox = QRectF(0,0,0,0); -} - -Graph::~Graph() -{ -} - -// add a node. The graph claims ownership. -void Graph::addNode(Node *n) { - n->setParent(this); - _nodes << n; -} - -void Graph::addNode(Node *n, int index) -{ - n->setParent(this); - _nodes.insert(index, n); -} - -void Graph::removeNode(Node *n) { - // the node itself is not deleted, as it may still be referenced in an undo command. It will - // be deleted when graph is, via QObject memory management. - _nodes.removeOne(n); -} - - -void Graph::addEdge(Edge *e) -{ - e->setParent(this); - _edges << e; -} - -void Graph::addEdge(Edge *e, int index) -{ - e->setParent(this); - _edges.insert(index, e); -} - -void Graph::removeEdge(Edge *e) -{ - // the edge itself is not deleted, as it may still be referenced in an undo command. It will - // be deleted when graph is, via QObject memory management. - _edges.removeOne(e); -} - -GraphElementData *Graph::data() const -{ - return _data; -} - -void Graph::setData(GraphElementData *data) -{ - delete _data; - _data = data; -} - -const QVector &Graph::nodes() -{ - return _nodes; -} - -const QVector &Graph::edges() -{ - return _edges; -} - -QRectF Graph::bbox() const -{ - return _bbox; -} - -bool Graph::hasBbox() { - return !(_bbox == QRectF(0,0,0,0)); -} - -void Graph::clearBbox() { - _bbox = QRectF(0,0,0,0); -} - -QString Graph::tikz() -{ - QString str; - QTextStream code(&str); - - code << "\\begin{tikzpicture}" << _data->tikz() << "\n"; - if (hasBbox()) { - code << "\t\\path [use as bounding box] (" - << _bbox.topLeft().x() << "," << _bbox.topLeft().y() - << ") rectangle (" - << _bbox.bottomRight().x() << "," << _bbox.bottomRight().y() - << ");\n"; - } - - if (!_nodes.isEmpty()) - code << "\t\\begin{pgfonlayer}{nodelayer}\n"; - - Node *n; - foreach (n, _nodes) { - code << "\t\t\\node "; - - if (!n->data()->isEmpty()) - code << n->data()->tikz() << " "; - - code << "(" << n->name() << ") at (" - << n->point().x() << ", " << n->point().y() - << ") {" << n->label() << "};\n"; - } - - if (!_nodes.isEmpty()) - code << "\t\\end{pgfonlayer}\n"; - - if (!_edges.isEmpty()) - code << "\t\\begin{pgfonlayer}{edgelayer}\n"; - - - Edge *e; - foreach (e, _edges) { - code << "\t\t\\draw "; - - if (!e->data()->isEmpty()) - code << e->data()->tikz() << " "; - - code << "(" << e->source()->name(); - if (e->sourceAnchor() != "") - code << "." << e->sourceAnchor(); - code << ") to "; - - if (e->hasEdgeNode()) { - code << "node "; - if (!e->edgeNode()->data()->isEmpty()) - code << e->edgeNode()->data()->tikz() << " "; - code << "{" << e->edgeNode()->label() << "} "; - } - - if (e->source() == e->target()) { - code << "()"; - } else { - code << "(" << e->target()->name(); - if (e->targetAnchor() != "") - code << "." << e->targetAnchor(); - code << ")"; - } - - code << ";\n"; - } - - if (!_edges.isEmpty()) - code << "\t\\end{pgfonlayer}\n"; - - code << "\\end{tikzpicture}\n"; - - code.flush(); - return str; -} - -void Graph::setBbox(const QRectF &bbox) -{ - _bbox = bbox; -} - - diff --git a/tikzit/src/data/graph.h b/tikzit/src/data/graph.h deleted file mode 100644 index 8856e5c..0000000 --- a/tikzit/src/data/graph.h +++ /dev/null @@ -1,56 +0,0 @@ -/** - * A graph defined by tikz code. - */ - -#ifndef GRAPH_H -#define GRAPH_H - -#include "node.h" -#include "edge.h" -#include "graphelementdata.h" - -#include -#include -#include -#include -#include - -class Graph : public QObject -{ - Q_OBJECT -public: - explicit Graph(QObject *parent = 0); - ~Graph(); - void addNode(Node *n); - void addNode(Node *n, int index); - void removeNode(Node *n); - void addEdge(Edge *e); - void addEdge(Edge *e, int index); - void removeEdge(Edge *e); - - GraphElementData *data() const; - void setData(GraphElementData *data); - - const QVector &nodes(); - const QVector &edges(); - - QRectF bbox() const; - void setBbox(const QRectF &bbox); - bool hasBbox(); - void clearBbox(); - - QString tikz(); -signals: - -public slots: - -private: - QVector _nodes; - QVector _edges; - //QMultiHash inEdges; - //QMultiHash outEdges; - GraphElementData *_data; - QRectF _bbox; -}; - -#endif // GRAPH_H diff --git a/tikzit/src/data/graphelementdata.cpp b/tikzit/src/data/graphelementdata.cpp deleted file mode 100644 index 3ce72c7..0000000 --- a/tikzit/src/data/graphelementdata.cpp +++ /dev/null @@ -1,170 +0,0 @@ -#include "graphelementdata.h" - -#include -#include - -GraphElementData::GraphElementData(QObject *parent) : QAbstractItemModel(parent) -{ - root = new GraphElementProperty(); -} - -GraphElementData::~GraphElementData() -{ - delete root; -} - -void GraphElementData::setProperty(QString key, QString value) -{ - GraphElementProperty m(key, true); - int i = _properties.indexOf(m); - if (i != -1) { - _properties[i].setValue(value); - } else { - GraphElementProperty p(key, value); - _properties << p; - } -} - -void GraphElementData::unsetProperty(QString key) -{ - GraphElementProperty m(key, true); - int i = _properties.indexOf(m); - if (i != -1) - _properties.remove(i); -} - -void GraphElementData::add(GraphElementProperty p) -{ - _properties << p; -} - -void GraphElementData::operator <<(GraphElementProperty p) -{ - add(p); -} - -void GraphElementData::setAtom(QString atom) -{ - GraphElementProperty a(atom); - int i = _properties.indexOf(a); - if (i == -1) - _properties << a; -} - -void GraphElementData::unsetAtom(QString atom) -{ - GraphElementProperty a(atom); - int i = _properties.indexOf(a); - if (i != -1) - _properties.remove(i); -} - -QString GraphElementData::property(QString key) -{ - GraphElementProperty m(key, true); - int i = _properties.indexOf(m); - if (i != -1) { - return _properties[i].value(); - } else { - return 0; - } -} - -bool GraphElementData::atom(QString atom) -{ - GraphElementProperty a(atom); - return (_properties.indexOf(a) != -1); -} - -QVariant GraphElementData::data(const QModelIndex &index, int role) const -{ - if (role != Qt::DisplayRole) - return QVariant(); - - if (index.row() >= 0 && index.row() < _properties.length()) { - const GraphElementProperty &p = _properties[index.row()]; - QString s = (index.column() == 0) ? p.key() : p.value(); - return QVariant(s); - } -} - -QVariant GraphElementData::headerData(int section, Qt::Orientation orientation, int role) const -{ - if (orientation == Qt::Horizontal && role == Qt::DisplayRole) { - if (section == 0) return QVariant("Key/Atom"); - else return QVariant("Value"); - } - - return QVariant(); -} - -QModelIndex GraphElementData::index(int row, int column, const QModelIndex &parent) const -{ - return createIndex(row, column, (void*)0); -} - -QModelIndex GraphElementData::parent(const QModelIndex &index) const -{ - GraphElementProperty *p = static_cast(index.internalPointer()); - if (p == root) return QModelIndex(); - else return createIndex(0,0,static_cast(root)); -} - -int GraphElementData::rowCount(const QModelIndex &parent) const -{ - if (parent.isValid()) { - return 0; - } else { - return _properties.size(); - } -} - -int GraphElementData::columnCount(const QModelIndex &parent) const -{ - return 2; -} - -Qt::ItemFlags GraphElementData::flags(const QModelIndex &index) const -{ - return QAbstractItemModel::flags(index); -} - -//bool GraphElementData::setData(const QModelIndex &index, const QVariant &value, int role) -//{ - -//} - -//bool GraphElementData::insertRows(int position, int rows, const QModelIndex &parent) -//{ - -//} - -//bool GraphElementData::removeRows(int position, int rows, const QModelIndex &parent) -//{ - -//} - -QString GraphElementData::tikz() { - if (_properties.length() == 0) return ""; - QString str; - QTextStream code(&str); - code << "["; - - GraphElementProperty p; - bool first = true; - foreach(p, _properties) { - if (!first) code << ", "; - code << p.tikz(); - first = false; - } - - code << "]"; - - code.flush(); - return str; -} - -bool GraphElementData::isEmpty() -{ - return _properties.isEmpty(); -} diff --git a/tikzit/src/data/graphelementdata.h b/tikzit/src/data/graphelementdata.h deleted file mode 100644 index 1139a00..0000000 --- a/tikzit/src/data/graphelementdata.h +++ /dev/null @@ -1,66 +0,0 @@ -#ifndef GRAPHELEMENTDATA_H -#define GRAPHELEMENTDATA_H - -#include "graphelementproperty.h" - -#include -#include -#include -#include -#include - -class GraphElementData : public QAbstractItemModel -{ - Q_OBJECT -public: - explicit GraphElementData(QObject *parent = 0); - ~GraphElementData(); - void setProperty(QString key, QString value); - void unsetProperty(QString key); - void setAtom(QString atom); - void unsetAtom(QString atom); - QString property(QString key); - bool atom(QString atom); - - QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE; - QVariant headerData(int section, Qt::Orientation orientation, - int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; - - QModelIndex index(int row, int column, - const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - QModelIndex parent(const QModelIndex &index) const Q_DECL_OVERRIDE; - - int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - - Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; - -// bool setData(const QModelIndex &index, const QVariant &value, -// int role = Qt::EditRole) Q_DECL_OVERRIDE; -// bool setHeaderData(int section, Qt::Orientation orientation, -// const QVariant &value, int role = Qt::EditRole) Q_DECL_OVERRIDE; - -// bool insertColumns(int position, int columns, -// const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; -// bool removeColumns(int position, int columns, -// const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; -// bool insertRows(int position, int rows, -// const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; -// bool removeRows(int position, int rows, -// const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; - - void operator <<(GraphElementProperty p); - void add(GraphElementProperty p); - - QString tikz(); - bool isEmpty(); -signals: - -public slots: - -private: - QVector _properties; - GraphElementProperty *root; -}; - -#endif // GRAPHELEMENTDATA_H diff --git a/tikzit/src/data/graphelementproperty.cpp b/tikzit/src/data/graphelementproperty.cpp deleted file mode 100644 index a50af58..0000000 --- a/tikzit/src/data/graphelementproperty.cpp +++ /dev/null @@ -1,59 +0,0 @@ -#include "graphelementproperty.h" - -#include - -GraphElementProperty::GraphElementProperty (): - _key(""), _value(""), _atom(false), _keyMatch(false) -{} - -GraphElementProperty::GraphElementProperty(QString key, QString value, bool atom, bool keyMatch) : - _key(key), _value(value), _atom(atom), _keyMatch(keyMatch) -{} - -GraphElementProperty::GraphElementProperty(QString key, QString value) : - _key(key), _value(value), _atom(false), _keyMatch(false) -{} - -GraphElementProperty::GraphElementProperty(QString key, bool keyMatch) : - _key(key), _value(""), _atom(!keyMatch), _keyMatch(keyMatch) -{} - -QString GraphElementProperty::key() const -{ return _key; } - -QString GraphElementProperty::value() const -{ return _value; } - -void GraphElementProperty::setValue(const QString &value) -{ _value = value; } - -bool GraphElementProperty::atom() const -{ return _atom; } - -bool GraphElementProperty::keyMatch() const -{ return _keyMatch; } - -bool GraphElementProperty::matches(const GraphElementProperty &p) -{ - if (p.atom()) return _atom && _key == p.key(); - if (p.keyMatch()) return !_atom && _key == p.key(); - if (_keyMatch) return !p.atom() && _key == p.key(); - return !_atom && _key == p.key() && _value == p.value(); -} - -bool GraphElementProperty::operator==(const GraphElementProperty &p) -{ - return matches(p); -} - -QString GraphElementProperty::tikzEscape(QString str) -{ - QRegExp re("[0-9a-zA-Z<> \\-'.]*"); - if (re.exactMatch(str)) return str; - else return "{" + str + "}"; -} - -QString GraphElementProperty::tikz() { - if (_atom) return tikzEscape(_key); - return tikzEscape(_key) + "=" + tikzEscape(_value); -} diff --git a/tikzit/src/data/graphelementproperty.h b/tikzit/src/data/graphelementproperty.h deleted file mode 100644 index 01b6e5a..0000000 --- a/tikzit/src/data/graphelementproperty.h +++ /dev/null @@ -1,40 +0,0 @@ -#ifndef GRAPHELEMENTPROPERTY_H -#define GRAPHELEMENTPROPERTY_H - -#include - -class GraphElementProperty -{ -public: - GraphElementProperty(); - GraphElementProperty(QString key, QString value, bool atom, bool keyMatch); - - // construct a property - GraphElementProperty(QString key, QString value); - - // construct an atom or keymatch - GraphElementProperty(QString key, bool keyMatch = false); - - QString key() const; - QString value() const; - void setValue(const QString &value); - bool atom() const; - bool keyMatch() const; - - bool matches(const GraphElementProperty &p); - bool operator==(const GraphElementProperty &p); - - static QString tikzEscape(QString str); - QString tikz(); -signals: - -public slots: - -private: - QString _key; - QString _value; - bool _atom; - bool _keyMatch; -}; - -#endif // GRAPHELEMENTPROPERTY_H diff --git a/tikzit/src/data/node.cpp b/tikzit/src/data/node.cpp deleted file mode 100644 index f94a3df..0000000 --- a/tikzit/src/data/node.cpp +++ /dev/null @@ -1,79 +0,0 @@ -#include "node.h" -#include "tikzit.h" - -#include - -Node::Node(QObject *parent) : QObject(parent) -{ - _data = new GraphElementData(); - _style = noneStyle; - _styleName = "none"; -} - -Node::~Node() -{ - delete _data; -} - -QPointF Node::point() const -{ - return _point; -} - -void Node::setPoint(const QPointF &point) -{ - _point = point; -} - -QString Node::name() const -{ - return _name; -} - -void Node::setName(const QString &name) -{ - _name = name; -} - -QString Node::label() const -{ - return _label; -} - -void Node::setLabel(const QString &label) -{ - _label = label; -} - -GraphElementData *Node::data() const -{ - return _data; -} - -void Node::setData(GraphElementData *data) -{ - delete _data; - _data = data; - if (_data->property("style") != 0) _styleName = _data->property("style"); -} - -QString Node::styleName() const -{ - return _styleName; -} - -void Node::setStyleName(const QString &styleName) -{ - _styleName = styleName; -} - -void Node::attachStyle() -{ - if (_styleName == "none") _style = noneStyle; - else _style = tikzit->nodeStyle(_styleName); -} - -NodeStyle *Node::style() const -{ - return _style; -} diff --git a/tikzit/src/data/node.h b/tikzit/src/data/node.h deleted file mode 100644 index ee70835..0000000 --- a/tikzit/src/data/node.h +++ /dev/null @@ -1,49 +0,0 @@ -#ifndef NODE_H -#define NODE_H - -#include "graphelementdata.h" -#include "nodestyle.h" - -#include -#include -#include - -class Node : public QObject -{ - Q_OBJECT -public: - explicit Node(QObject *parent = 0); - ~Node(); - - QPointF point() const; - void setPoint(const QPointF &point); - - QString name() const; - void setName(const QString &name); - - QString label() const; - void setLabel(const QString &label); - - GraphElementData *data() const; - void setData(GraphElementData *data); - - QString styleName() const; - void setStyleName(const QString &styleName); - - void attachStyle(); - NodeStyle *style() const; - -signals: - -public slots: - -private: - QPointF _point; - QString _name; - QString _label; - QString _styleName; - NodeStyle *_style; - GraphElementData *_data; -}; - -#endif // NODE_H diff --git a/tikzit/src/data/nodestyle.cpp b/tikzit/src/data/nodestyle.cpp deleted file mode 100644 index 7eca791..0000000 --- a/tikzit/src/data/nodestyle.cpp +++ /dev/null @@ -1,32 +0,0 @@ -#include "nodestyle.h" - -NodeStyle *noneStyle = new NodeStyle(); - -NodeStyle::NodeStyle() -{ - name = "none"; - shape = NodeShape::Circle; - fillColor = Qt::white; - strokeColor = Qt::black; - strokeThickness = 1; -} - -NodeStyle::NodeStyle(QString nm, NodeShape sh, QColor fillCol) -{ - name = nm; - shape = sh; - fillColor = fillCol; - strokeColor = Qt::black; - strokeThickness = 1; -} - -NodeStyle::NodeStyle(QString nm, NodeShape sh, QColor fillCol, QColor strokeCol, int strokeThick) -{ - name = nm; - shape = sh; - fillColor = fillCol; - strokeColor = strokeCol; - strokeThickness = strokeThick; -} - -bool NodeStyle::isNone() { return name == "none"; } diff --git a/tikzit/src/data/nodestyle.h b/tikzit/src/data/nodestyle.h deleted file mode 100644 index 00d1b20..0000000 --- a/tikzit/src/data/nodestyle.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef NODESTYLE_H -#define NODESTYLE_H - -#include - -enum NodeShape { - Square, UpTriangle, DownTriangle, Circle -}; - -class NodeStyle -{ -public: - NodeStyle(); - NodeStyle(QString nm, NodeShape sh, QColor fillCol); - NodeStyle(QString nm, NodeShape sh, QColor fillCol, QColor strokeCol, int strokeThick); - bool isNone(); - QString name; - NodeShape shape; - QColor fillColor; - QColor strokeColor; - int strokeThickness; -}; - -extern NodeStyle *noneStyle; - -#endif // NODESTYLE_H diff --git a/tikzit/src/data/tikzdocument.cpp b/tikzit/src/data/tikzdocument.cpp deleted file mode 100644 index 13d4c6e..0000000 --- a/tikzit/src/data/tikzdocument.cpp +++ /dev/null @@ -1,82 +0,0 @@ -#include -#include -#include -#include -#include - -#include "tikzdocument.h" -#include "tikzgraphassembler.h" - -TikzDocument::TikzDocument(QObject *parent) : QObject(parent) -{ - _graph = new Graph(this); - _parseSuccess = true; - _fileName = ""; - _shortName = ""; - _undoStack = new QUndoStack(); -} - -TikzDocument::~TikzDocument() -{ - delete _graph; - delete _undoStack; -} - -QUndoStack *TikzDocument::undoStack() const -{ - return _undoStack; -} - -Graph *TikzDocument::graph() const -{ - return _graph; -} - -QString TikzDocument::tikz() const -{ - return _tikz; -} - -void TikzDocument::open(QString fileName) -{ - _fileName = fileName; - QFile file(fileName); - QFileInfo fi(file); - _shortName = fi.fileName(); - QSettings settings("tikzit", "tikzit"); - settings.setValue("previous-file-path", fi.absolutePath()); - - if (!file.open(QIODevice::ReadOnly)) { -// QMessageBox::critical(this, tr("Error"), -// tr("Could not open file")); - _parseSuccess = false; - return; - } - - QTextStream in(&file); - _tikz = in.readAll(); - file.close(); - - Graph *newGraph = new Graph(this); - TikzGraphAssembler ass(newGraph); - if (ass.parse(_tikz)) { - delete _graph; - _graph = newGraph; - foreach (Node *n, _graph->nodes()) n->attachStyle(); - foreach (Edge *e, _graph->edges()) e->updateControls(); - _parseSuccess = true; - } else { - delete newGraph; - _parseSuccess = false; - } -} - -QString TikzDocument::shortName() const -{ - return _shortName; -} - -bool TikzDocument::parseSuccess() const -{ - return _parseSuccess; -} diff --git a/tikzit/src/data/tikzdocument.h b/tikzit/src/data/tikzdocument.h deleted file mode 100644 index f574f5c..0000000 --- a/tikzit/src/data/tikzdocument.h +++ /dev/null @@ -1,43 +0,0 @@ -/** - * This class contains a tikz Graph, source code, file info, and undo stack. It serves as the model - * in the MVC triple (TikzDocument, TikzView, TikzScene). - */ - -#ifndef TIKZDOCUMENT_H -#define TIKZDOCUMENT_H - -#include "graph.h" - -#include -#include - -class TikzDocument : public QObject -{ - Q_OBJECT -public: - explicit TikzDocument(QObject *parent = 0); - ~TikzDocument(); - - Graph *graph() const; - QString tikz() const; - QUndoStack *undoStack() const; - bool parseSuccess() const; - - void open(QString fileName); - - QString shortName() const; - -private: - Graph *_graph; - QString _tikz; - QString _fileName; - QString _shortName; - QUndoStack *_undoStack; - bool _parseSuccess; - -signals: - -public slots: -}; - -#endif // TIKZDOCUMENT_H diff --git a/tikzit/src/data/tikzgraphassembler.cpp b/tikzit/src/data/tikzgraphassembler.cpp deleted file mode 100644 index c05a5c8..0000000 --- a/tikzit/src/data/tikzgraphassembler.cpp +++ /dev/null @@ -1,33 +0,0 @@ -#include "tikzgraphassembler.h" - -#include "tikzparserdefs.h" -#include "tikzparser.parser.hpp" -#include "tikzlexer.h" - -int yyparse(void *scanner); - - -TikzGraphAssembler::TikzGraphAssembler(Graph *graph, QObject *parent) : - QObject(parent), _graph(graph) -{ - yylex_init(&scanner); - yyset_extra(this, scanner); -} - -void TikzGraphAssembler::addNodeToMap(Node *n) { _nodeMap.insert(n->name(), n); } -Node *TikzGraphAssembler::nodeWithName(QString name) { return _nodeMap[name]; } - -bool TikzGraphAssembler::parse(const QString &tikz) -{ - yy_scan_string(tikz.toLatin1().data(), scanner); - int result = yyparse(scanner); - - if (result == 0) return true; - else return false; -} - -Graph *TikzGraphAssembler::graph() const -{ - return _graph; -} - diff --git a/tikzit/src/data/tikzgraphassembler.h b/tikzit/src/data/tikzgraphassembler.h deleted file mode 100644 index 79b89b0..0000000 --- a/tikzit/src/data/tikzgraphassembler.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef TIKZGRAPHASSEMBLER_H -#define TIKZGRAPHASSEMBLER_H - -#include "node.h" -#include "graph.h" - -#include -#include - -class TikzGraphAssembler : public QObject -{ - Q_OBJECT -public: - explicit TikzGraphAssembler(Graph *graph, QObject *parent = 0); - void addNodeToMap(Node *n); - Node *nodeWithName(QString name); - bool parse(const QString &tikz); - - Graph *graph() const; - -signals: - -public slots: - -private: - QHash _nodeMap; - Graph *_graph; - void *scanner; -}; - -#endif // TIKZGRAPHASSEMBLER_H diff --git a/tikzit/src/data/tikzlexer.l b/tikzit/src/data/tikzlexer.l deleted file mode 100644 index 8dd23c6..0000000 --- a/tikzit/src/data/tikzlexer.l +++ /dev/null @@ -1,181 +0,0 @@ -%{ -/* - * Copyright 2010 Chris Heunen - * Copyright 2010-2013 Aleks Kissinger - * Copyright 2013 K. Johan Paulsson - * Copyright 2013 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "tikzparserdefs.h" -#include "tikzparser.parser.hpp" - -#include - - -#define YY_USER_ACTION \ - yylloc->first_line = yylloc->last_line; \ - yylloc->first_column = yylloc->last_column + 1; \ - yylloc->last_column = yylloc->first_column + yyleng - 1; - -%} - -%option reentrant bison-bridge bison-locations 8bit -%option nounput -%option yylineno -%option noyywrap -%option header-file="tikzlexer.h" -%option extra-type="TikzGraphAssembler *" - -%s props -%s xcoord -%s ycoord -%s noderef - -FLOAT \-?[0-9]*(\.[0-9]+)? - -%% - - /* whitespace is ignored, except for position counting; we don't - count formfeed and vtab as whitespace, because it's not obvious - how they should be dealt with and no-one actually uses them */ - - /* lex will take the longest-matching string */ -\r\n|\r|\n { - yylloc->first_line += 1; - yylloc->last_line = yylloc->first_line; - yylloc->first_column = yylloc->last_column = 0; -} -[\t ]+ { } - -\\begin\{tikzpicture\} { return BEGIN_TIKZPICTURE_CMD; } -\\end\{tikzpicture\} { return END_TIKZPICTURE_CMD; } -\\begin\{pgfonlayer\} { return BEGIN_PGFONLAYER_CMD; } -\\end\{pgfonlayer\} { return END_PGFONLAYER_CMD; } -\\draw { return DRAW_CMD; } -\\node { return NODE_CMD; } -\\path { return PATH_CMD; } -rectangle { return RECTANGLE; } -node { return NODE; } -at { return AT; } -to { return TO; } -; { return SEMICOLON; } - -\([ ]*{FLOAT}[ ]*,[ ]*{FLOAT}[ ]*\) { - yylloc->last_column = yylloc->first_column + 1; - yyless(1); - BEGIN(xcoord); -} -{FLOAT} { - yylval->pt = new QPointF(); - yylval->pt->setX(strtod(yytext,NULL)); - BEGIN(ycoord); -} -, { } -{FLOAT} { - yylval->pt->setY(strtod(yytext,NULL)); -} -\) { - BEGIN(INITIAL); - return COORD; -} - - /* when we see "[", change parsing mode */ -\[ /*syntaxhlfix]*/ { - BEGIN(props); - return LEFTBRACKET; -} -= { return EQUALS; } -, { return COMMA; } - /* technically, it is possible to have newlines in the middle of - property names or values, but in practice this is unlikely and - screws up our line counting */ -[^=,\{\] \t\n]([^=,\{\]\n]*[^=,\{\] \t\n])? { - char *str = (char*)malloc(sizeof(char)*yyleng + 1); - strncpy(str, yytext, yyleng + 1); - yylval->str = str; - return PROPSTRING; -} -\] { - BEGIN(INITIAL); - return RIGHTBRACKET; -} - -\( { - BEGIN(noderef); - return LEFTPARENTHESIS; -} -\. { - return FULLSTOP; -} - /* we assume node names (and anchor names) never contain - newlines */ -[^\.\{\)\n]+ { - //qDebug() << "nodename: " << yytext << " size: " << strlen(yytext); - char *str = (char*)malloc(sizeof(char)*yyleng + 1); - strncpy(str, yytext, yyleng+1); - yylval->str = str; - return REFSTRING; -} -\) { - BEGIN(INITIAL); - return RIGHTPARENTHESIS; -} - -\{ { - std::stringstream buf; - unsigned int brace_depth = 1; - unsigned int escape = 0; - while (1) { - char c = yyinput(yyscanner); - // eof reached before closing brace - if (c == '\0' || c == EOF) { - return UNCLOSED_DELIM_STR; - } - - yylloc->last_column += 1; - yyleng += 1; - if (escape) { - escape = 0; - } else if (c == '\\') { - escape = 1; - } else if (c == '{') { - brace_depth++; - } else if (c == '}') { - brace_depth--; - if (brace_depth == 0) break; - } else if (c == '\n') { - yylloc->last_line += 1; - yylloc->last_column = 0; - } - buf << c; - } - - char *str = (char*)malloc(sizeof(char) * yyleng + 1); - strncpy(str, buf.str().c_str(), yyleng + 1); - //str[len] = 0; - yylval->str = str; - //qDebug() << "got delim string: " << str; - return DELIMITEDSTRING; -} - -\\begin { return UNKNOWN_BEGIN_CMD; } -\\end { return UNKNOWN_END_CMD; } -\\[a-zA-Z0-9]+ { return UNKNOWN_CMD; } -[a-zA-Z0-9]+ { return UNKNOWN_STR; } -. { return UNKNOWN_STR; } - - /* vi:ft=lex:noet:ts=4:sts=4:sw=4: - */ diff --git a/tikzit/src/data/tikzlexer.lexer.cpp b/tikzit/src/data/tikzlexer.lexer.cpp deleted file mode 100644 index 7ff1d18..0000000 --- a/tikzit/src/data/tikzlexer.lexer.cpp +++ /dev/null @@ -1,2535 +0,0 @@ -#line 2 "../tikzit/src/data/tikzlexer.lexer.cpp" - -#line 4 "../tikzit/src/data/tikzlexer.lexer.cpp" - -#define YY_INT_ALIGNED short int - -/* A lexical scanner generated by flex */ - -#define FLEX_SCANNER -#define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 35 -#if YY_FLEX_SUBMINOR_VERSION > 0 -#define FLEX_BETA -#endif - -/* First, we deal with platform-specific or compiler-specific issues. */ - -/* begin standard C headers. */ -#include -#include -#include -#include - -/* end standard C headers. */ - -/* flex integer type definitions */ - -#ifndef FLEXINT_H -#define FLEXINT_H - -/* C99 systems have . Non-C99 systems may or may not. */ - -#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L - -/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, - * if you want the limit (max/min) macros for int types. - */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS 1 -#endif - -#include -typedef int8_t flex_int8_t; -typedef uint8_t flex_uint8_t; -typedef int16_t flex_int16_t; -typedef uint16_t flex_uint16_t; -typedef int32_t flex_int32_t; -typedef uint32_t flex_uint32_t; -typedef uint64_t flex_uint64_t; -#else -typedef signed char flex_int8_t; -typedef short int flex_int16_t; -typedef int flex_int32_t; -typedef unsigned char flex_uint8_t; -typedef unsigned short int flex_uint16_t; -typedef unsigned int flex_uint32_t; -#endif /* ! C99 */ - -/* Limits of integral types. */ -#ifndef INT8_MIN -#define INT8_MIN (-128) -#endif -#ifndef INT16_MIN -#define INT16_MIN (-32767-1) -#endif -#ifndef INT32_MIN -#define INT32_MIN (-2147483647-1) -#endif -#ifndef INT8_MAX -#define INT8_MAX (127) -#endif -#ifndef INT16_MAX -#define INT16_MAX (32767) -#endif -#ifndef INT32_MAX -#define INT32_MAX (2147483647) -#endif -#ifndef UINT8_MAX -#define UINT8_MAX (255U) -#endif -#ifndef UINT16_MAX -#define UINT16_MAX (65535U) -#endif -#ifndef UINT32_MAX -#define UINT32_MAX (4294967295U) -#endif - -#endif /* ! FLEXINT_H */ - -#ifdef __cplusplus - -/* The "const" storage-class-modifier is valid. */ -#define YY_USE_CONST - -#else /* ! __cplusplus */ - -/* C99 requires __STDC__ to be defined as 1. */ -#if defined (__STDC__) - -#define YY_USE_CONST - -#endif /* defined (__STDC__) */ -#endif /* ! __cplusplus */ - -#ifdef YY_USE_CONST -#define yyconst const -#else -#define yyconst -#endif - -/* Returned upon end-of-file. */ -#define YY_NULL 0 - -/* Promotes a possibly negative, possibly signed char to an unsigned - * integer for use as an array index. If the signed char is negative, - * we want to instead treat it as an 8-bit unsigned char, hence the - * double cast. - */ -#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) - -/* An opaque pointer. */ -#ifndef YY_TYPEDEF_YY_SCANNER_T -#define YY_TYPEDEF_YY_SCANNER_T -typedef void* yyscan_t; -#endif - -/* For convenience, these vars (plus the bison vars far below) - are macros in the reentrant scanner. */ -#define yyin yyg->yyin_r -#define yyout yyg->yyout_r -#define yyextra yyg->yyextra_r -#define yyleng yyg->yyleng_r -#define yytext yyg->yytext_r -#define yylineno (YY_CURRENT_BUFFER_LVALUE->yy_bs_lineno) -#define yycolumn (YY_CURRENT_BUFFER_LVALUE->yy_bs_column) -#define yy_flex_debug yyg->yy_flex_debug_r - -/* Enter a start condition. This macro really ought to take a parameter, - * but we do it the disgusting crufty way forced on us by the ()-less - * definition of BEGIN. - */ -#define BEGIN yyg->yy_start = 1 + 2 * - -/* Translate the current start state into a value that can be later handed - * to BEGIN to return to the state. The YYSTATE alias is for lex - * compatibility. - */ -#define YY_START ((yyg->yy_start - 1) / 2) -#define YYSTATE YY_START - -/* Action number for EOF rule of a given start state. */ -#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) - -/* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE yyrestart(yyin ,yyscanner ) - -#define YY_END_OF_BUFFER_CHAR 0 - -/* Size of default input buffer. */ -#ifndef YY_BUF_SIZE -#define YY_BUF_SIZE 16384 -#endif - -/* The state buf must be large enough to hold one state per character in the main buffer. - */ -#define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type)) - -#ifndef YY_TYPEDEF_YY_BUFFER_STATE -#define YY_TYPEDEF_YY_BUFFER_STATE -typedef struct yy_buffer_state *YY_BUFFER_STATE; -#endif - -#ifndef YY_TYPEDEF_YY_SIZE_T -#define YY_TYPEDEF_YY_SIZE_T -typedef size_t yy_size_t; -#endif - -#define EOB_ACT_CONTINUE_SCAN 0 -#define EOB_ACT_END_OF_FILE 1 -#define EOB_ACT_LAST_MATCH 2 - - /* Note: We specifically omit the test for yy_rule_can_match_eol because it requires - * access to the local variable yy_act. Since yyless() is a macro, it would break - * existing scanners that call yyless() from OUTSIDE yylex. - * One obvious solution it to make yy_act a global. I tried that, and saw - * a 5% performance hit in a non-yylineno scanner, because yy_act is - * normally declared as a register variable-- so it is not worth it. - */ - #define YY_LESS_LINENO(n) \ - do { \ - yy_size_t yyl;\ - for ( yyl = n; yyl < yyleng; ++yyl )\ - if ( yytext[yyl] == '\n' )\ - --yylineno;\ - }while(0) - -/* Return all but the first "n" matched characters back to the input stream. */ -#define yyless(n) \ - do \ - { \ - /* Undo effects of setting up yytext. */ \ - int yyless_macro_arg = (n); \ - YY_LESS_LINENO(yyless_macro_arg);\ - *yy_cp = yyg->yy_hold_char; \ - YY_RESTORE_YY_MORE_OFFSET \ - yyg->yy_c_buf_p = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \ - YY_DO_BEFORE_ACTION; /* set up yytext again */ \ - } \ - while ( 0 ) - -#define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner ) - -#ifndef YY_STRUCT_YY_BUFFER_STATE -#define YY_STRUCT_YY_BUFFER_STATE -struct yy_buffer_state - { - FILE *yy_input_file; - - char *yy_ch_buf; /* input buffer */ - char *yy_buf_pos; /* current position in input buffer */ - - /* Size of input buffer in bytes, not including room for EOB - * characters. - */ - yy_size_t yy_buf_size; - - /* Number of characters read into yy_ch_buf, not including EOB - * characters. - */ - yy_size_t yy_n_chars; - - /* Whether we "own" the buffer - i.e., we know we created it, - * and can realloc() it to grow it, and should free() it to - * delete it. - */ - int yy_is_our_buffer; - - /* Whether this is an "interactive" input source; if so, and - * if we're using stdio for input, then we want to use getc() - * instead of fread(), to make sure we stop fetching input after - * each newline. - */ - int yy_is_interactive; - - /* Whether we're considered to be at the beginning of a line. - * If so, '^' rules will be active on the next match, otherwise - * not. - */ - int yy_at_bol; - - int yy_bs_lineno; /**< The line count. */ - int yy_bs_column; /**< The column count. */ - - /* Whether to try to fill the input buffer when we reach the - * end of it. - */ - int yy_fill_buffer; - - int yy_buffer_status; - -#define YY_BUFFER_NEW 0 -#define YY_BUFFER_NORMAL 1 - /* When an EOF's been seen but there's still some text to process - * then we mark the buffer as YY_EOF_PENDING, to indicate that we - * shouldn't try reading from the input source any more. We might - * still have a bunch of tokens to match, though, because of - * possible backing-up. - * - * When we actually see the EOF, we change the status to "new" - * (via yyrestart()), so that the user can continue scanning by - * just pointing yyin at a new input file. - */ -#define YY_BUFFER_EOF_PENDING 2 - - }; -#endif /* !YY_STRUCT_YY_BUFFER_STATE */ - -/* We provide macros for accessing buffer states in case in the - * future we want to put the buffer states in a more general - * "scanner state". - * - * Returns the top of the stack, or NULL. - */ -#define YY_CURRENT_BUFFER ( yyg->yy_buffer_stack \ - ? yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] \ - : NULL) - -/* Same as previous macro, but useful when we know that the buffer stack is not - * NULL or when we need an lvalue. For internal use only. - */ -#define YY_CURRENT_BUFFER_LVALUE yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] - -void yyrestart (FILE *input_file ,yyscan_t yyscanner ); -void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); -YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ,yyscan_t yyscanner ); -void yy_delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); -void yy_flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); -void yypush_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); -void yypop_buffer_state (yyscan_t yyscanner ); - -static void yyensure_buffer_stack (yyscan_t yyscanner ); -static void yy_load_buffer_state (yyscan_t yyscanner ); -static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file ,yyscan_t yyscanner ); - -#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER ,yyscanner) - -YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner ); -YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ,yyscan_t yyscanner ); -YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len ,yyscan_t yyscanner ); - -void *yyalloc (yy_size_t ,yyscan_t yyscanner ); -void *yyrealloc (void *,yy_size_t ,yyscan_t yyscanner ); -void yyfree (void * ,yyscan_t yyscanner ); - -#define yy_new_buffer yy_create_buffer - -#define yy_set_interactive(is_interactive) \ - { \ - if ( ! YY_CURRENT_BUFFER ){ \ - yyensure_buffer_stack (yyscanner); \ - YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \ - } \ - YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ - } - -#define yy_set_bol(at_bol) \ - { \ - if ( ! YY_CURRENT_BUFFER ){\ - yyensure_buffer_stack (yyscanner); \ - YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \ - } \ - YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ - } - -#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) - -#define yywrap(n) 1 -#define YY_SKIP_YYWRAP - -typedef unsigned char YY_CHAR; - -typedef int yy_state_type; - -#define yytext_ptr yytext_r - -static yy_state_type yy_get_previous_state (yyscan_t yyscanner ); -static yy_state_type yy_try_NUL_trans (yy_state_type current_state ,yyscan_t yyscanner); -static int yy_get_next_buffer (yyscan_t yyscanner ); -static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner ); - -/* Done after the current pattern has been matched and before the - * corresponding action - sets up yytext. - */ -#define YY_DO_BEFORE_ACTION \ - yyg->yytext_ptr = yy_bp; \ - yyleng = (yy_size_t) (yy_cp - yy_bp); \ - yyg->yy_hold_char = *yy_cp; \ - *yy_cp = '\0'; \ - yyg->yy_c_buf_p = yy_cp; - -#define YY_NUM_RULES 35 -#define YY_END_OF_BUFFER 36 -/* This struct is not used in this scanner, - but its presence is necessary. */ -struct yy_trans_info - { - flex_int32_t yy_verify; - flex_int32_t yy_nxt; - }; -static yyconst flex_int16_t yy_accept[259] = - { 0, - 0, 0, 0, 0, 16, 16, 18, 18, 0, 0, - 36, 34, 2, 1, 1, 25, 33, 14, 20, 34, - 33, 33, 33, 33, 29, 23, 1, 23, 22, 23, - 14, 21, 20, 23, 24, 23, 23, 23, 23, 16, - 34, 16, 19, 17, 18, 34, 18, 27, 2, 1, - 25, 28, 26, 27, 14, 20, 27, 27, 27, 27, - 27, 2, 1, 0, 0, 0, 0, 0, 33, 32, - 32, 32, 32, 32, 32, 12, 33, 33, 13, 23, - 0, 0, 23, 23, 23, 23, 23, 23, 23, 23, - 23, 23, 12, 23, 23, 13, 0, 16, 16, 16, - - 0, 18, 18, 18, 27, 2, 27, 27, 27, 27, - 27, 27, 27, 27, 27, 27, 27, 12, 27, 27, - 13, 0, 15, 0, 0, 0, 0, 0, 32, 32, - 32, 32, 32, 33, 33, 0, 23, 23, 23, 23, - 23, 23, 23, 23, 27, 27, 27, 27, 27, 27, - 27, 27, 27, 27, 27, 0, 0, 32, 32, 31, - 32, 32, 11, 33, 23, 23, 23, 23, 23, 11, - 23, 27, 27, 27, 27, 27, 27, 11, 27, 32, - 7, 0, 8, 9, 33, 23, 7, 8, 9, 23, - 27, 7, 8, 9, 27, 30, 0, 0, 33, 23, - - 23, 27, 27, 0, 0, 0, 33, 23, 27, 0, - 0, 0, 0, 33, 23, 27, 0, 0, 0, 0, - 10, 10, 10, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, - 0, 0, 0, 4, 5, 0, 3, 0 - } ; - -static yyconst flex_int32_t yy_ec[256] = - { 0, - 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, - 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 5, 1, 1, 1, 1, 1, 1, 1, 6, - 7, 1, 1, 8, 9, 10, 1, 11, 11, 11, - 11, 11, 11, 11, 11, 11, 11, 1, 12, 1, - 13, 1, 1, 1, 14, 14, 14, 14, 14, 14, - 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, - 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, - 15, 16, 17, 1, 1, 1, 18, 19, 20, 21, - - 22, 23, 24, 25, 26, 14, 27, 28, 14, 29, - 30, 31, 14, 32, 14, 33, 34, 14, 35, 14, - 36, 37, 38, 1, 39, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1 - } ; - -static yyconst flex_int32_t yy_meta[40] = - { 0, - 1, 1, 2, 1, 1, 1, 3, 4, 1, 3, - 5, 1, 4, 5, 1, 1, 4, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 2, 1 - } ; - -static yyconst flex_int16_t yy_base[265] = - { 0, - 0, 0, 39, 0, 70, 73, 105, 137, 175, 0, - 694, 896, 83, 896, 688, 81, 0, 896, 896, 74, - 655, 656, 663, 653, 896, 92, 96, 213, 896, 224, - 102, 896, 104, 263, 896, 302, 87, 88, 89, 113, - 671, 115, 896, 896, 117, 670, 119, 0, 129, 675, - 127, 896, 896, 341, 0, 0, 380, 419, 109, 118, - 119, 148, 896, 149, 156, 163, 664, 227, 0, 0, - 651, 639, 641, 639, 650, 0, 646, 646, 0, 167, - 214, 457, 239, 240, 250, 630, 294, 300, 450, 305, - 464, 478, 627, 233, 67, 625, 645, 145, 643, 246, - - 642, 322, 639, 327, 0, 215, 354, 361, 368, 432, - 613, 425, 482, 495, 499, 512, 526, 609, 238, 319, - 607, 549, 896, 450, 628, 556, 238, 440, 614, 614, - 600, 599, 585, 586, 574, 468, 527, 549, 563, 543, - 567, 580, 318, 573, 605, 612, 619, 369, 612, 626, - 606, 630, 643, 322, 572, 157, 473, 578, 568, 562, - 575, 570, 0, 575, 658, 671, 688, 682, 708, 558, - 100, 323, 721, 734, 751, 693, 771, 557, 287, 558, - 0, 336, 0, 0, 554, 745, 756, 776, 782, 247, - 787, 793, 798, 804, 354, 541, 553, 550, 551, 817, - - 229, 837, 277, 408, 546, 526, 524, 405, 459, 527, - 524, 519, 509, 518, 396, 431, 516, 510, 507, 494, - 0, 490, 489, 489, 478, 484, 484, 479, 475, 487, - 482, 470, 465, 454, 456, 470, 457, 453, 440, 427, - 417, 417, 398, 404, 388, 351, 353, 329, 328, 896, - 309, 209, 205, 896, 896, 131, 896, 896, 136, 97, - 875, 880, 885, 890 - } ; - -static yyconst flex_int16_t yy_def[265] = - { 0, - 258, 1, 258, 3, 1, 1, 1, 1, 258, 9, - 258, 258, 258, 258, 258, 258, 259, 258, 258, 260, - 259, 259, 259, 259, 258, 261, 261, 261, 258, 262, - 261, 258, 261, 258, 258, 262, 36, 36, 36, 258, - 258, 259, 258, 258, 258, 258, 259, 263, 263, 263, - 263, 258, 258, 264, 263, 263, 258, 264, 58, 58, - 58, 258, 258, 258, 258, 258, 258, 258, 259, 260, - 260, 260, 260, 260, 260, 259, 259, 259, 259, 261, - 261, 261, 261, 261, 261, 36, 34, 34, 34, 34, - 34, 34, 36, 36, 36, 36, 258, 258, 258, 259, - - 258, 258, 258, 259, 263, 263, 263, 263, 263, 263, - 58, 57, 57, 57, 57, 57, 57, 58, 58, 58, - 58, 258, 258, 258, 258, 258, 258, 258, 260, 260, - 260, 260, 260, 259, 259, 261, 261, 34, 34, 34, - 34, 34, 36, 36, 263, 263, 263, 263, 57, 57, - 57, 57, 57, 58, 58, 258, 258, 260, 260, 260, - 260, 260, 259, 259, 34, 34, 34, 34, 34, 36, - 36, 263, 57, 57, 57, 57, 57, 58, 58, 260, - 260, 258, 260, 260, 259, 34, 34, 34, 34, 36, - 57, 57, 57, 57, 58, 260, 258, 258, 259, 34, - - 36, 57, 58, 258, 258, 258, 259, 36, 58, 258, - 258, 258, 258, 259, 36, 58, 258, 258, 258, 258, - 259, 36, 58, 258, 258, 258, 258, 258, 258, 258, - 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, - 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, - 258, 258, 258, 258, 258, 258, 258, 0, 258, 258, - 258, 258, 258, 258 - } ; - -static yyconst flex_int16_t yy_nxt[936] = - { 0, - 12, 13, 14, 15, 13, 16, 12, 12, 12, 12, - 17, 18, 12, 17, 19, 20, 12, 21, 17, 17, - 17, 17, 17, 17, 17, 17, 17, 17, 22, 17, - 17, 23, 24, 17, 17, 17, 17, 25, 12, 26, - 13, 14, 27, 13, 28, 26, 29, 26, 26, 30, - 31, 32, 30, 33, 34, 35, 36, 30, 30, 30, - 30, 30, 30, 30, 30, 30, 30, 37, 30, 30, - 38, 39, 30, 30, 30, 30, 25, 26, 40, 41, - 42, 40, 41, 42, 62, 64, 144, 62, 65, 66, - 67, 68, 71, 81, 72, 73, 81, 81, 63, 86, - - 81, 70, 74, 81, 75, 81, 81, 12, 81, 95, - 12, 43, 44, 45, 46, 47, 94, 190, 96, 86, - 86, 86, 97, 98, 97, 100, 101, 102, 101, 104, - 106, 107, 86, 106, 108, 109, 67, 110, 119, 120, - 69, 111, 12, 43, 44, 45, 46, 47, 121, 62, - 111, 111, 62, 64, 97, 98, 65, 66, 67, 68, - 122, 156, 123, 123, 124, 125, 126, 127, 81, 257, - 65, 81, 67, 68, 12, 48, 49, 14, 50, 49, - 51, 52, 48, 48, 53, 54, 55, 48, 54, 56, - 57, 48, 58, 54, 54, 54, 54, 54, 54, 54, - - 54, 54, 54, 59, 54, 54, 60, 61, 54, 54, - 54, 54, 12, 48, 81, 81, 106, 82, 81, 106, - 65, 83, 84, 85, 80, 81, 256, 80, 81, 80, - 80, 127, 80, 80, 65, 80, 67, 68, 80, 80, - 81, 81, 127, 136, 81, 65, 65, 255, 84, 85, - 137, 81, 208, 143, 136, 97, 100, 65, 154, 84, - 85, 86, 80, 80, 81, 86, 80, 81, 80, 80, - 111, 80, 80, 87, 80, 201, 87, 80, 80, 86, - 87, 88, 87, 89, 90, 87, 87, 87, 87, 87, - 87, 91, 87, 92, 87, 87, 87, 87, 87, 87, - - 209, 80, 80, 81, 195, 80, 81, 80, 80, 111, - 80, 80, 87, 80, 87, 87, 80, 80, 87, 111, - 87, 138, 87, 87, 87, 87, 87, 172, 87, 123, - 87, 101, 102, 140, 93, 87, 101, 104, 155, 170, - 80, 105, 105, 178, 105, 105, 105, 254, 105, 105, - 86, 111, 105, 105, 111, 105, 105, 105, 107, 253, - 252, 108, 109, 67, 110, 145, 197, 123, 198, 146, - 125, 147, 148, 148, 251, 108, 108, 67, 110, 105, - 105, 105, 203, 105, 105, 105, 111, 105, 105, 250, - 112, 105, 105, 112, 105, 105, 105, 112, 113, 112, - - 114, 115, 112, 112, 112, 112, 112, 112, 116, 112, - 117, 112, 112, 112, 112, 112, 112, 222, 105, 105, - 105, 249, 105, 105, 105, 248, 105, 105, 86, 247, - 105, 105, 215, 105, 105, 105, 148, 86, 210, 108, - 211, 67, 110, 112, 127, 112, 112, 65, 246, 245, - 128, 118, 223, 112, 156, 112, 123, 105, 81, 125, - 126, 82, 244, 111, 65, 83, 84, 85, 87, 81, - 87, 87, 136, 243, 242, 65, 241, 156, 87, 123, - 87, 139, 87, 157, 87, 87, 216, 240, 239, 238, - 237, 111, 87, 141, 87, 142, 87, 236, 87, 87, - - 112, 235, 112, 149, 234, 233, 87, 232, 87, 231, - 112, 230, 112, 112, 229, 112, 112, 112, 228, 112, - 112, 111, 86, 112, 227, 112, 150, 151, 81, 112, - 112, 136, 112, 112, 65, 226, 225, 137, 224, 221, - 112, 152, 112, 153, 112, 220, 112, 112, 219, 218, - 217, 214, 213, 122, 112, 123, 112, 124, 125, 126, - 156, 87, 123, 167, 87, 125, 126, 87, 212, 87, - 87, 87, 165, 87, 207, 206, 205, 87, 204, 87, - 166, 87, 199, 87, 87, 87, 196, 168, 87, 111, - 86, 87, 185, 87, 184, 87, 183, 87, 87, 182, - - 87, 87, 181, 180, 179, 171, 164, 163, 87, 145, - 87, 123, 169, 146, 125, 147, 172, 162, 123, 161, - 160, 125, 147, 172, 112, 123, 175, 112, 125, 147, - 112, 159, 112, 112, 112, 173, 112, 158, 157, 111, - 112, 111, 112, 174, 112, 111, 112, 112, 112, 103, - 176, 112, 103, 99, 112, 99, 112, 86, 112, 86, - 112, 112, 86, 112, 112, 135, 134, 133, 132, 131, - 130, 112, 129, 112, 128, 177, 87, 63, 87, 87, - 103, 99, 79, 186, 78, 77, 87, 76, 87, 87, - 63, 87, 87, 258, 258, 258, 258, 258, 258, 87, - - 87, 87, 87, 188, 258, 187, 87, 258, 87, 87, - 87, 112, 87, 112, 193, 258, 87, 258, 87, 258, - 258, 112, 258, 112, 258, 182, 87, 258, 87, 87, - 258, 258, 189, 258, 258, 258, 87, 258, 87, 112, - 258, 112, 112, 258, 258, 258, 191, 258, 258, 112, - 258, 112, 112, 258, 112, 112, 258, 258, 258, 258, - 258, 258, 112, 87, 112, 87, 87, 258, 192, 112, - 258, 112, 112, 200, 87, 87, 87, 87, 258, 112, - 258, 112, 258, 258, 87, 258, 87, 258, 182, 112, - 258, 112, 112, 258, 87, 194, 87, 87, 258, 112, - - 87, 112, 87, 87, 87, 112, 87, 112, 112, 258, - 87, 112, 87, 112, 112, 202, 112, 112, 112, 112, - 258, 112, 112, 112, 112, 112, 112, 258, 112, 258, - 258, 258, 112, 258, 112, 87, 258, 87, 87, 258, - 258, 258, 258, 258, 258, 87, 258, 87, 258, 258, - 258, 258, 258, 258, 204, 112, 258, 112, 112, 258, - 258, 258, 258, 258, 258, 112, 258, 112, 258, 258, - 258, 258, 258, 258, 204, 80, 258, 80, 258, 80, - 86, 258, 86, 258, 86, 105, 258, 258, 105, 105, - 111, 258, 258, 111, 111, 11, 258, 258, 258, 258, - - 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, - 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, - 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, - 258, 258, 258, 258, 258 - } ; - -static yyconst flex_int16_t yy_chk[936] = - { 0, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 5, 5, - 5, 6, 6, 6, 13, 16, 95, 13, 16, 16, - 16, 16, 20, 26, 20, 20, 26, 27, 27, 95, - - 27, 260, 20, 31, 20, 33, 31, 5, 33, 38, - 6, 7, 7, 7, 7, 7, 37, 171, 39, 37, - 38, 39, 40, 40, 42, 42, 45, 45, 47, 47, - 49, 51, 171, 49, 51, 51, 51, 51, 59, 60, - 259, 59, 7, 8, 8, 8, 8, 8, 61, 62, - 60, 61, 62, 64, 98, 98, 64, 64, 64, 64, - 65, 156, 65, 156, 65, 65, 65, 66, 80, 256, - 66, 80, 66, 66, 8, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 28, 81, 106, 28, 81, 106, - 28, 28, 28, 28, 30, 30, 253, 30, 30, 30, - 30, 68, 30, 30, 68, 30, 68, 68, 30, 30, - 83, 84, 127, 83, 84, 127, 83, 252, 83, 83, - 84, 85, 201, 94, 85, 100, 100, 85, 119, 85, - 85, 201, 30, 34, 34, 94, 34, 34, 34, 34, - 119, 34, 34, 34, 34, 190, 34, 34, 34, 190, - 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - - 203, 34, 36, 36, 179, 36, 36, 36, 36, 203, - 36, 36, 87, 36, 87, 87, 36, 36, 88, 179, - 88, 88, 87, 90, 87, 90, 90, 172, 88, 172, - 88, 102, 102, 90, 36, 90, 104, 104, 120, 143, - 36, 54, 54, 154, 54, 54, 54, 251, 54, 54, - 143, 120, 54, 54, 154, 54, 54, 54, 107, 249, - 248, 107, 107, 107, 107, 108, 182, 108, 182, 108, - 108, 108, 109, 148, 247, 109, 148, 109, 109, 54, - 57, 57, 195, 57, 57, 57, 195, 57, 57, 246, - 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, - - 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, - 57, 57, 57, 57, 57, 57, 57, 215, 57, 58, - 58, 245, 58, 58, 58, 244, 58, 58, 215, 243, - 58, 58, 208, 58, 58, 58, 110, 208, 204, 110, - 204, 110, 110, 112, 128, 112, 112, 128, 242, 241, - 128, 58, 216, 112, 124, 112, 124, 58, 82, 124, - 124, 82, 240, 216, 82, 82, 82, 82, 89, 136, - 89, 89, 136, 239, 238, 136, 237, 157, 89, 157, - 89, 89, 91, 157, 91, 91, 209, 236, 235, 234, - 233, 209, 91, 91, 91, 92, 92, 232, 92, 92, - - 113, 231, 113, 113, 230, 229, 92, 228, 92, 227, - 113, 226, 113, 114, 225, 114, 114, 115, 224, 115, - 115, 223, 222, 114, 220, 114, 114, 115, 137, 115, - 116, 137, 116, 116, 137, 219, 218, 137, 217, 214, - 116, 116, 116, 117, 117, 213, 117, 117, 212, 211, - 210, 207, 206, 122, 117, 122, 117, 122, 122, 122, - 126, 140, 126, 140, 140, 126, 126, 138, 205, 138, - 138, 140, 138, 140, 199, 198, 197, 138, 196, 138, - 139, 139, 185, 139, 139, 141, 180, 141, 141, 178, - 170, 139, 164, 139, 162, 141, 161, 141, 142, 160, - - 142, 142, 159, 158, 155, 144, 135, 134, 142, 145, - 142, 145, 142, 145, 145, 145, 146, 133, 146, 132, - 131, 146, 146, 147, 151, 147, 151, 151, 147, 147, - 149, 130, 149, 149, 151, 149, 151, 129, 125, 121, - 149, 118, 149, 150, 150, 111, 150, 150, 152, 103, - 152, 152, 101, 99, 150, 97, 150, 96, 152, 93, - 152, 153, 86, 153, 153, 78, 77, 75, 74, 73, - 72, 153, 71, 153, 67, 153, 165, 50, 165, 165, - 46, 41, 24, 165, 23, 22, 165, 21, 165, 166, - 15, 166, 166, 11, 0, 0, 0, 0, 0, 166, - - 168, 166, 168, 168, 0, 166, 167, 0, 167, 167, - 168, 176, 168, 176, 176, 0, 167, 0, 167, 0, - 0, 176, 0, 176, 0, 167, 169, 0, 169, 169, - 0, 0, 169, 0, 0, 0, 169, 0, 169, 173, - 0, 173, 173, 0, 0, 0, 173, 0, 0, 173, - 0, 173, 174, 0, 174, 174, 0, 0, 0, 0, - 0, 0, 174, 186, 174, 186, 186, 0, 174, 175, - 0, 175, 175, 186, 187, 186, 187, 187, 0, 175, - 0, 175, 0, 0, 187, 0, 187, 0, 175, 177, - 0, 177, 177, 0, 188, 177, 188, 188, 0, 177, - - 189, 177, 189, 189, 188, 191, 188, 191, 191, 0, - 189, 192, 189, 192, 192, 191, 193, 191, 193, 193, - 0, 192, 194, 192, 194, 194, 193, 0, 193, 0, - 0, 0, 194, 0, 194, 200, 0, 200, 200, 0, - 0, 0, 0, 0, 0, 200, 0, 200, 0, 0, - 0, 0, 0, 0, 200, 202, 0, 202, 202, 0, - 0, 0, 0, 0, 0, 202, 0, 202, 0, 0, - 0, 0, 0, 0, 202, 261, 0, 261, 0, 261, - 262, 0, 262, 0, 262, 263, 0, 0, 263, 263, - 264, 0, 0, 264, 264, 258, 258, 258, 258, 258, - - 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, - 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, - 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, - 258, 258, 258, 258, 258 - } ; - -/* Table of booleans, true if rule could match eol. */ -static yyconst flex_int32_t yy_rule_can_match_eol[36] = - { 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; - -/* The intent behind this definition is that it'll catch - * any uses of REJECT which flex missed. - */ -#define REJECT reject_used_but_not_detected -#define yymore() yymore_used_but_not_detected -#define YY_MORE_ADJ 0 -#define YY_RESTORE_YY_MORE_OFFSET -#line 1 "../tikzit/src/data/tikzlexer.l" -#line 2 "../tikzit/src/data/tikzlexer.l" -/* - * Copyright 2010 Chris Heunen - * Copyright 2010-2013 Aleks Kissinger - * Copyright 2013 K. Johan Paulsson - * Copyright 2013 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "tikzparserdefs.h" -#include "tikzparser.parser.hpp" - -#include - - -#define YY_USER_ACTION \ - yylloc->first_line = yylloc->last_line; \ - yylloc->first_column = yylloc->last_column + 1; \ - yylloc->last_column = yylloc->first_column + yyleng - 1; - - - - - -#line 776 "../tikzit/src/data/tikzlexer.lexer.cpp" - -#define INITIAL 0 -#define props 1 -#define xcoord 2 -#define ycoord 3 -#define noderef 4 - -#ifndef YY_NO_UNISTD_H -/* Special case for "unistd.h", since it is non-ANSI. We include it way - * down here because we want the user's section 1 to have been scanned first. - * The user has a chance to override it with an option. - */ -#include -#endif - -#define YY_EXTRA_TYPE TikzGraphAssembler * - -/* Holds the entire state of the reentrant scanner. */ -struct yyguts_t - { - - /* User-defined. Not touched by flex. */ - YY_EXTRA_TYPE yyextra_r; - - /* The rest are the same as the globals declared in the non-reentrant scanner. */ - FILE *yyin_r, *yyout_r; - size_t yy_buffer_stack_top; /**< index of top of stack. */ - size_t yy_buffer_stack_max; /**< capacity of stack. */ - YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */ - char yy_hold_char; - yy_size_t yy_n_chars; - yy_size_t yyleng_r; - char *yy_c_buf_p; - int yy_init; - int yy_start; - int yy_did_buffer_switch_on_eof; - int yy_start_stack_ptr; - int yy_start_stack_depth; - int *yy_start_stack; - yy_state_type yy_last_accepting_state; - char* yy_last_accepting_cpos; - - int yylineno_r; - int yy_flex_debug_r; - - char *yytext_r; - int yy_more_flag; - int yy_more_len; - - YYSTYPE * yylval_r; - - YYLTYPE * yylloc_r; - - }; /* end struct yyguts_t */ - -static int yy_init_globals (yyscan_t yyscanner ); - - /* This must go here because YYSTYPE and YYLTYPE are included - * from bison output in section 1.*/ - # define yylval yyg->yylval_r - - # define yylloc yyg->yylloc_r - -int yylex_init (yyscan_t* scanner); - -int yylex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner); - -/* Accessor methods to globals. - These are made visible to non-reentrant scanners for convenience. */ - -int yylex_destroy (yyscan_t yyscanner ); - -int yyget_debug (yyscan_t yyscanner ); - -void yyset_debug (int debug_flag ,yyscan_t yyscanner ); - -YY_EXTRA_TYPE yyget_extra (yyscan_t yyscanner ); - -void yyset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner ); - -FILE *yyget_in (yyscan_t yyscanner ); - -void yyset_in (FILE * in_str ,yyscan_t yyscanner ); - -FILE *yyget_out (yyscan_t yyscanner ); - -void yyset_out (FILE * out_str ,yyscan_t yyscanner ); - -yy_size_t yyget_leng (yyscan_t yyscanner ); - -char *yyget_text (yyscan_t yyscanner ); - -int yyget_lineno (yyscan_t yyscanner ); - -void yyset_lineno (int line_number ,yyscan_t yyscanner ); - -YYSTYPE * yyget_lval (yyscan_t yyscanner ); - -void yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner ); - - YYLTYPE *yyget_lloc (yyscan_t yyscanner ); - - void yyset_lloc (YYLTYPE * yylloc_param ,yyscan_t yyscanner ); - -/* Macros after this point can all be overridden by user definitions in - * section 1. - */ - -#ifndef YY_SKIP_YYWRAP -#ifdef __cplusplus -extern "C" int yywrap (yyscan_t yyscanner ); -#else -extern int yywrap (yyscan_t yyscanner ); -#endif -#endif - -#ifndef yytext_ptr -static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner); -#endif - -#ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner); -#endif - -#ifndef YY_NO_INPUT - -#ifdef __cplusplus -static int yyinput (yyscan_t yyscanner ); -#else -static int input (yyscan_t yyscanner ); -#endif - -#endif - -/* Amount of stuff to slurp up with each read. */ -#ifndef YY_READ_BUF_SIZE -#define YY_READ_BUF_SIZE 8192 -#endif - -/* Copy whatever the last rule matched to the standard output. */ -#ifndef ECHO -/* This used to be an fputs(), but since the string might contain NUL's, - * we now use fwrite(). - */ -#define ECHO fwrite( yytext, yyleng, 1, yyout ) -#endif - -/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, - * is returned in "result". - */ -#ifndef YY_INPUT -#define YY_INPUT(buf,result,max_size) \ - if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ - { \ - int c = '*'; \ - yy_size_t n; \ - for ( n = 0; n < max_size && \ - (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ - buf[n] = (char) c; \ - if ( c == '\n' ) \ - buf[n++] = (char) c; \ - if ( c == EOF && ferror( yyin ) ) \ - YY_FATAL_ERROR( "input in flex scanner failed" ); \ - result = n; \ - } \ - else \ - { \ - errno=0; \ - while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \ - { \ - if( errno != EINTR) \ - { \ - YY_FATAL_ERROR( "input in flex scanner failed" ); \ - break; \ - } \ - errno=0; \ - clearerr(yyin); \ - } \ - }\ -\ - -#endif - -/* No semi-colon after return; correct usage is to write "yyterminate();" - - * we don't want an extra ';' after the "return" because that will cause - * some compilers to complain about unreachable statements. - */ -#ifndef yyterminate -#define yyterminate() return YY_NULL -#endif - -/* Number of entries by which start-condition stack grows. */ -#ifndef YY_START_STACK_INCR -#define YY_START_STACK_INCR 25 -#endif - -/* Report a fatal error. */ -#ifndef YY_FATAL_ERROR -#define YY_FATAL_ERROR(msg) yy_fatal_error( msg , yyscanner) -#endif - -/* end tables serialization structures and prototypes */ - -/* Default declaration of generated scanner - a define so the user can - * easily add parameters. - */ -#ifndef YY_DECL -#define YY_DECL_IS_OURS 1 - -extern int yylex \ - (YYSTYPE * yylval_param,YYLTYPE * yylloc_param ,yyscan_t yyscanner); - -#define YY_DECL int yylex \ - (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner) -#endif /* !YY_DECL */ - -/* Code executed at the beginning of each rule, after yytext and yyleng - * have been set up. - */ -#ifndef YY_USER_ACTION -#define YY_USER_ACTION -#endif - -/* Code executed at the end of each rule. */ -#ifndef YY_BREAK -#define YY_BREAK break; -#endif - -#define YY_RULE_SETUP \ - YY_USER_ACTION - -/** The main scanner function which does all the work. - */ -YY_DECL -{ - register yy_state_type yy_current_state; - register char *yy_cp, *yy_bp; - register int yy_act; - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - -#line 49 "../tikzit/src/data/tikzlexer.l" - - - /* whitespace is ignored, except for position counting; we don't - count formfeed and vtab as whitespace, because it's not obvious - how they should be dealt with and no-one actually uses them */ - - /* lex will take the longest-matching string */ -#line 1025 "../tikzit/src/data/tikzlexer.lexer.cpp" - - yylval = yylval_param; - - yylloc = yylloc_param; - - if ( !yyg->yy_init ) - { - yyg->yy_init = 1; - -#ifdef YY_USER_INIT - YY_USER_INIT; -#endif - - if ( ! yyg->yy_start ) - yyg->yy_start = 1; /* first start state */ - - if ( ! yyin ) - yyin = stdin; - - if ( ! yyout ) - yyout = stdout; - - if ( ! YY_CURRENT_BUFFER ) { - yyensure_buffer_stack (yyscanner); - YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); - } - - yy_load_buffer_state(yyscanner ); - } - - while ( 1 ) /* loops until end-of-file is reached */ - { - yy_cp = yyg->yy_c_buf_p; - - /* Support of yytext. */ - *yy_cp = yyg->yy_hold_char; - - /* yy_bp points to the position in yy_ch_buf of the start of - * the current run. - */ - yy_bp = yy_cp; - - yy_current_state = yyg->yy_start; -yy_match: - do - { - register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; - if ( yy_accept[yy_current_state] ) - { - yyg->yy_last_accepting_state = yy_current_state; - yyg->yy_last_accepting_cpos = yy_cp; - } - while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) - { - yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 259 ) - yy_c = yy_meta[(unsigned int) yy_c]; - } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - ++yy_cp; - } - while ( yy_base[yy_current_state] != 896 ); - -yy_find_action: - yy_act = yy_accept[yy_current_state]; - if ( yy_act == 0 ) - { /* have to back up */ - yy_cp = yyg->yy_last_accepting_cpos; - yy_current_state = yyg->yy_last_accepting_state; - yy_act = yy_accept[yy_current_state]; - } - - YY_DO_BEFORE_ACTION; - - if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] ) - { - yy_size_t yyl; - for ( yyl = 0; yyl < yyleng; ++yyl ) - if ( yytext[yyl] == '\n' ) - - do{ yylineno++; - yycolumn=0; - }while(0) -; - } - -do_action: /* This label is used only to access EOF actions. */ - - switch ( yy_act ) - { /* beginning of action switch */ - case 0: /* must back up */ - /* undo the effects of YY_DO_BEFORE_ACTION */ - *yy_cp = yyg->yy_hold_char; - yy_cp = yyg->yy_last_accepting_cpos; - yy_current_state = yyg->yy_last_accepting_state; - goto yy_find_action; - -case 1: -/* rule 1 can match eol */ -YY_RULE_SETUP -#line 56 "../tikzit/src/data/tikzlexer.l" -{ - yylloc->first_line += 1; - yylloc->last_line = yylloc->first_line; - yylloc->first_column = yylloc->last_column = 0; -} - YY_BREAK -case 2: -YY_RULE_SETUP -#line 61 "../tikzit/src/data/tikzlexer.l" -{ } - YY_BREAK -case 3: -YY_RULE_SETUP -#line 63 "../tikzit/src/data/tikzlexer.l" -{ return BEGIN_TIKZPICTURE_CMD; } - YY_BREAK -case 4: -YY_RULE_SETUP -#line 64 "../tikzit/src/data/tikzlexer.l" -{ return END_TIKZPICTURE_CMD; } - YY_BREAK -case 5: -YY_RULE_SETUP -#line 65 "../tikzit/src/data/tikzlexer.l" -{ return BEGIN_PGFONLAYER_CMD; } - YY_BREAK -case 6: -YY_RULE_SETUP -#line 66 "../tikzit/src/data/tikzlexer.l" -{ return END_PGFONLAYER_CMD; } - YY_BREAK -case 7: -YY_RULE_SETUP -#line 67 "../tikzit/src/data/tikzlexer.l" -{ return DRAW_CMD; } - YY_BREAK -case 8: -YY_RULE_SETUP -#line 68 "../tikzit/src/data/tikzlexer.l" -{ return NODE_CMD; } - YY_BREAK -case 9: -YY_RULE_SETUP -#line 69 "../tikzit/src/data/tikzlexer.l" -{ return PATH_CMD; } - YY_BREAK -case 10: -YY_RULE_SETUP -#line 70 "../tikzit/src/data/tikzlexer.l" -{ return RECTANGLE; } - YY_BREAK -case 11: -YY_RULE_SETUP -#line 71 "../tikzit/src/data/tikzlexer.l" -{ return NODE; } - YY_BREAK -case 12: -YY_RULE_SETUP -#line 72 "../tikzit/src/data/tikzlexer.l" -{ return AT; } - YY_BREAK -case 13: -YY_RULE_SETUP -#line 73 "../tikzit/src/data/tikzlexer.l" -{ return TO; } - YY_BREAK -case 14: -YY_RULE_SETUP -#line 74 "../tikzit/src/data/tikzlexer.l" -{ return SEMICOLON; } - YY_BREAK -case 15: -YY_RULE_SETUP -#line 76 "../tikzit/src/data/tikzlexer.l" -{ - yylloc->last_column = yylloc->first_column + 1; - yyless(1); - BEGIN(xcoord); -} - YY_BREAK -case 16: -YY_RULE_SETUP -#line 81 "../tikzit/src/data/tikzlexer.l" -{ - yylval->pt = new QPointF(); - yylval->pt->setX(strtod(yytext,NULL)); - BEGIN(ycoord); -} - YY_BREAK -case 17: -YY_RULE_SETUP -#line 86 "../tikzit/src/data/tikzlexer.l" -{ } - YY_BREAK -case 18: -YY_RULE_SETUP -#line 87 "../tikzit/src/data/tikzlexer.l" -{ - yylval->pt->setY(strtod(yytext,NULL)); -} - YY_BREAK -case 19: -YY_RULE_SETUP -#line 90 "../tikzit/src/data/tikzlexer.l" -{ - BEGIN(INITIAL); - return COORD; -} - YY_BREAK -/* when we see "[", change parsing mode */ -case 20: -YY_RULE_SETUP -#line 96 "../tikzit/src/data/tikzlexer.l" -/*syntaxhlfix]*/ { - BEGIN(props); - return LEFTBRACKET; -} - YY_BREAK -case 21: -YY_RULE_SETUP -#line 100 "../tikzit/src/data/tikzlexer.l" -{ return EQUALS; } - YY_BREAK -case 22: -YY_RULE_SETUP -#line 101 "../tikzit/src/data/tikzlexer.l" -{ return COMMA; } - YY_BREAK -/* technically, it is possible to have newlines in the middle of - property names or values, but in practice this is unlikely and - screws up our line counting */ -case 23: -YY_RULE_SETUP -#line 105 "../tikzit/src/data/tikzlexer.l" -{ - char *str = (char*)malloc(sizeof(char)*yyleng + 1); - strncpy(str, yytext, yyleng + 1); - yylval->str = str; - return PROPSTRING; -} - YY_BREAK -case 24: -YY_RULE_SETUP -#line 111 "../tikzit/src/data/tikzlexer.l" -{ - BEGIN(INITIAL); - return RIGHTBRACKET; -} - YY_BREAK -case 25: -YY_RULE_SETUP -#line 116 "../tikzit/src/data/tikzlexer.l" -{ - BEGIN(noderef); - return LEFTPARENTHESIS; -} - YY_BREAK -case 26: -YY_RULE_SETUP -#line 120 "../tikzit/src/data/tikzlexer.l" -{ - return FULLSTOP; -} - YY_BREAK -/* we assume node names (and anchor names) never contain - newlines */ -case 27: -YY_RULE_SETUP -#line 125 "../tikzit/src/data/tikzlexer.l" -{ - //qDebug() << "nodename: " << yytext << " size: " << strlen(yytext); - char *str = (char*)malloc(sizeof(char)*yyleng + 1); - strncpy(str, yytext, yyleng+1); - yylval->str = str; - return REFSTRING; -} - YY_BREAK -case 28: -YY_RULE_SETUP -#line 132 "../tikzit/src/data/tikzlexer.l" -{ - BEGIN(INITIAL); - return RIGHTPARENTHESIS; -} - YY_BREAK -case 29: -YY_RULE_SETUP -#line 137 "../tikzit/src/data/tikzlexer.l" -{ - std::stringstream buf; - unsigned int brace_depth = 1; - unsigned int escape = 0; - while (1) { - char c = yyinput(yyscanner); - // eof reached before closing brace - if (c == '\0' || c == EOF) { - return UNCLOSED_DELIM_STR; - } - - yylloc->last_column += 1; - yyleng += 1; - if (escape) { - escape = 0; - } else if (c == '\\') { - escape = 1; - } else if (c == '{') { - brace_depth++; - } else if (c == '}') { - brace_depth--; - if (brace_depth == 0) break; - } else if (c == '\n') { - yylloc->last_line += 1; - yylloc->last_column = 0; - } - buf << c; - } - - char *str = (char*)malloc(sizeof(char) * yyleng + 1); - strncpy(str, buf.str().c_str(), yyleng + 1); - //str[len] = 0; - yylval->str = str; - //qDebug() << "got delim string: " << str; - return DELIMITEDSTRING; -} - YY_BREAK -case 30: -YY_RULE_SETUP -#line 174 "../tikzit/src/data/tikzlexer.l" -{ return UNKNOWN_BEGIN_CMD; } - YY_BREAK -case 31: -YY_RULE_SETUP -#line 175 "../tikzit/src/data/tikzlexer.l" -{ return UNKNOWN_END_CMD; } - YY_BREAK -case 32: -YY_RULE_SETUP -#line 176 "../tikzit/src/data/tikzlexer.l" -{ return UNKNOWN_CMD; } - YY_BREAK -case 33: -YY_RULE_SETUP -#line 177 "../tikzit/src/data/tikzlexer.l" -{ return UNKNOWN_STR; } - YY_BREAK -case 34: -YY_RULE_SETUP -#line 178 "../tikzit/src/data/tikzlexer.l" -{ return UNKNOWN_STR; } - YY_BREAK -/* vi:ft=lex:noet:ts=4:sts=4:sw=4: - */ -case 35: -YY_RULE_SETUP -#line 182 "../tikzit/src/data/tikzlexer.l" -ECHO; - YY_BREAK -#line 1385 "../tikzit/src/data/tikzlexer.lexer.cpp" -case YY_STATE_EOF(INITIAL): -case YY_STATE_EOF(props): -case YY_STATE_EOF(xcoord): -case YY_STATE_EOF(ycoord): -case YY_STATE_EOF(noderef): - yyterminate(); - - case YY_END_OF_BUFFER: - { - /* Amount of text matched not including the EOB char. */ - int yy_amount_of_matched_text = (int) (yy_cp - yyg->yytext_ptr) - 1; - - /* Undo the effects of YY_DO_BEFORE_ACTION. */ - *yy_cp = yyg->yy_hold_char; - YY_RESTORE_YY_MORE_OFFSET - - if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW ) - { - /* We're scanning a new file or input source. It's - * possible that this happened because the user - * just pointed yyin at a new source and called - * yylex(). If so, then we have to assure - * consistency between YY_CURRENT_BUFFER and our - * globals. Here is the right place to do so, because - * this is the first action (other than possibly a - * back-up) that will match for the new input source. - */ - yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; - YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin; - YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL; - } - - /* Note that here we test for yy_c_buf_p "<=" to the position - * of the first EOB in the buffer, since yy_c_buf_p will - * already have been incremented past the NUL character - * (since all states make transitions on EOB to the - * end-of-buffer state). Contrast this with the test - * in input(). - */ - if ( yyg->yy_c_buf_p <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] ) - { /* This was really a NUL. */ - yy_state_type yy_next_state; - - yyg->yy_c_buf_p = yyg->yytext_ptr + yy_amount_of_matched_text; - - yy_current_state = yy_get_previous_state( yyscanner ); - - /* Okay, we're now positioned to make the NUL - * transition. We couldn't have - * yy_get_previous_state() go ahead and do it - * for us because it doesn't know how to deal - * with the possibility of jamming (and we don't - * want to build jamming into it because then it - * will run more slowly). - */ - - yy_next_state = yy_try_NUL_trans( yy_current_state , yyscanner); - - yy_bp = yyg->yytext_ptr + YY_MORE_ADJ; - - if ( yy_next_state ) - { - /* Consume the NUL. */ - yy_cp = ++yyg->yy_c_buf_p; - yy_current_state = yy_next_state; - goto yy_match; - } - - else - { - yy_cp = yyg->yy_c_buf_p; - goto yy_find_action; - } - } - - else switch ( yy_get_next_buffer( yyscanner ) ) - { - case EOB_ACT_END_OF_FILE: - { - yyg->yy_did_buffer_switch_on_eof = 0; - - if ( yywrap(yyscanner ) ) - { - /* Note: because we've taken care in - * yy_get_next_buffer() to have set up - * yytext, we can now set up - * yy_c_buf_p so that if some total - * hoser (like flex itself) wants to - * call the scanner after we return the - * YY_NULL, it'll still work - another - * YY_NULL will get returned. - */ - yyg->yy_c_buf_p = yyg->yytext_ptr + YY_MORE_ADJ; - - yy_act = YY_STATE_EOF(YY_START); - goto do_action; - } - - else - { - if ( ! yyg->yy_did_buffer_switch_on_eof ) - YY_NEW_FILE; - } - break; - } - - case EOB_ACT_CONTINUE_SCAN: - yyg->yy_c_buf_p = - yyg->yytext_ptr + yy_amount_of_matched_text; - - yy_current_state = yy_get_previous_state( yyscanner ); - - yy_cp = yyg->yy_c_buf_p; - yy_bp = yyg->yytext_ptr + YY_MORE_ADJ; - goto yy_match; - - case EOB_ACT_LAST_MATCH: - yyg->yy_c_buf_p = - &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars]; - - yy_current_state = yy_get_previous_state( yyscanner ); - - yy_cp = yyg->yy_c_buf_p; - yy_bp = yyg->yytext_ptr + YY_MORE_ADJ; - goto yy_find_action; - } - break; - } - - default: - YY_FATAL_ERROR( - "fatal flex scanner internal error--no action found" ); - } /* end of action switch */ - } /* end of scanning one token */ -} /* end of yylex */ - -/* yy_get_next_buffer - try to read in a new buffer - * - * Returns a code representing an action: - * EOB_ACT_LAST_MATCH - - * EOB_ACT_CONTINUE_SCAN - continue scanning from current position - * EOB_ACT_END_OF_FILE - end of file - */ -static int yy_get_next_buffer (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; - register char *source = yyg->yytext_ptr; - register int number_to_move, i; - int ret_val; - - if ( yyg->yy_c_buf_p > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] ) - YY_FATAL_ERROR( - "fatal flex scanner internal error--end of buffer missed" ); - - if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 ) - { /* Don't try to fill the buffer, so this is an EOF. */ - if ( yyg->yy_c_buf_p - yyg->yytext_ptr - YY_MORE_ADJ == 1 ) - { - /* We matched a single character, the EOB, so - * treat this as a final EOF. - */ - return EOB_ACT_END_OF_FILE; - } - - else - { - /* We matched some text prior to the EOB, first - * process it. - */ - return EOB_ACT_LAST_MATCH; - } - } - - /* Try to read more data. */ - - /* First move last chars to start of buffer. */ - number_to_move = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr) - 1; - - for ( i = 0; i < number_to_move; ++i ) - *(dest++) = *(source++); - - if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING ) - /* don't do the read, it's not guaranteed to return an EOF, - * just force an EOF - */ - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars = 0; - - else - { - yy_size_t num_to_read = - YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; - - while ( num_to_read <= 0 ) - { /* Not enough room in the buffer - grow it. */ - - /* just a shorter name for the current buffer */ - YY_BUFFER_STATE b = YY_CURRENT_BUFFER; - - int yy_c_buf_p_offset = - (int) (yyg->yy_c_buf_p - b->yy_ch_buf); - - if ( b->yy_is_our_buffer ) - { - yy_size_t new_size = b->yy_buf_size * 2; - - if ( new_size <= 0 ) - b->yy_buf_size += b->yy_buf_size / 8; - else - b->yy_buf_size *= 2; - - b->yy_ch_buf = (char *) - /* Include room in for 2 EOB chars. */ - yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ,yyscanner ); - } - else - /* Can't grow it, we don't own it. */ - b->yy_ch_buf = 0; - - if ( ! b->yy_ch_buf ) - YY_FATAL_ERROR( - "fatal error - scanner input buffer overflow" ); - - yyg->yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset]; - - num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - - number_to_move - 1; - - } - - if ( num_to_read > YY_READ_BUF_SIZE ) - num_to_read = YY_READ_BUF_SIZE; - - /* Read in more data. */ - YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), - yyg->yy_n_chars, num_to_read ); - - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars; - } - - if ( yyg->yy_n_chars == 0 ) - { - if ( number_to_move == YY_MORE_ADJ ) - { - ret_val = EOB_ACT_END_OF_FILE; - yyrestart(yyin ,yyscanner); - } - - else - { - ret_val = EOB_ACT_LAST_MATCH; - YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = - YY_BUFFER_EOF_PENDING; - } - } - - else - ret_val = EOB_ACT_CONTINUE_SCAN; - - if ((yy_size_t) (yyg->yy_n_chars + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { - /* Extend the array by 50%, plus the number we really need. */ - yy_size_t new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1); - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ,yyscanner ); - if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) - YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); - } - - yyg->yy_n_chars += number_to_move; - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] = YY_END_OF_BUFFER_CHAR; - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR; - - yyg->yytext_ptr = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0]; - - return ret_val; -} - -/* yy_get_previous_state - get the state just before the EOB char was reached */ - - static yy_state_type yy_get_previous_state (yyscan_t yyscanner) -{ - register yy_state_type yy_current_state; - register char *yy_cp; - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - yy_current_state = yyg->yy_start; - - for ( yy_cp = yyg->yytext_ptr + YY_MORE_ADJ; yy_cp < yyg->yy_c_buf_p; ++yy_cp ) - { - register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); - if ( yy_accept[yy_current_state] ) - { - yyg->yy_last_accepting_state = yy_current_state; - yyg->yy_last_accepting_cpos = yy_cp; - } - while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) - { - yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 259 ) - yy_c = yy_meta[(unsigned int) yy_c]; - } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - } - - return yy_current_state; -} - -/* yy_try_NUL_trans - try to make a transition on the NUL character - * - * synopsis - * next_state = yy_try_NUL_trans( current_state ); - */ - static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state , yyscan_t yyscanner) -{ - register int yy_is_jam; - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* This var may be unused depending upon options. */ - register char *yy_cp = yyg->yy_c_buf_p; - - register YY_CHAR yy_c = 1; - if ( yy_accept[yy_current_state] ) - { - yyg->yy_last_accepting_state = yy_current_state; - yyg->yy_last_accepting_cpos = yy_cp; - } - while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) - { - yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 259 ) - yy_c = yy_meta[(unsigned int) yy_c]; - } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 258); - - return yy_is_jam ? 0 : yy_current_state; -} - -#ifndef YY_NO_INPUT -#ifdef __cplusplus - static int yyinput (yyscan_t yyscanner) -#else - static int input (yyscan_t yyscanner) -#endif - -{ - int c; - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - *yyg->yy_c_buf_p = yyg->yy_hold_char; - - if ( *yyg->yy_c_buf_p == YY_END_OF_BUFFER_CHAR ) - { - /* yy_c_buf_p now points to the character we want to return. - * If this occurs *before* the EOB characters, then it's a - * valid NUL; if not, then we've hit the end of the buffer. - */ - if ( yyg->yy_c_buf_p < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] ) - /* This was really a NUL. */ - *yyg->yy_c_buf_p = '\0'; - - else - { /* need more input */ - yy_size_t offset = yyg->yy_c_buf_p - yyg->yytext_ptr; - ++yyg->yy_c_buf_p; - - switch ( yy_get_next_buffer( yyscanner ) ) - { - case EOB_ACT_LAST_MATCH: - /* This happens because yy_g_n_b() - * sees that we've accumulated a - * token and flags that we need to - * try matching the token before - * proceeding. But for input(), - * there's no matching to consider. - * So convert the EOB_ACT_LAST_MATCH - * to EOB_ACT_END_OF_FILE. - */ - - /* Reset buffer status. */ - yyrestart(yyin ,yyscanner); - - /*FALLTHROUGH*/ - - case EOB_ACT_END_OF_FILE: - { - if ( yywrap(yyscanner ) ) - return 0; - - if ( ! yyg->yy_did_buffer_switch_on_eof ) - YY_NEW_FILE; -#ifdef __cplusplus - return yyinput(yyscanner); -#else - return input(yyscanner); -#endif - } - - case EOB_ACT_CONTINUE_SCAN: - yyg->yy_c_buf_p = yyg->yytext_ptr + offset; - break; - } - } - } - - c = *(unsigned char *) yyg->yy_c_buf_p; /* cast for 8-bit char's */ - *yyg->yy_c_buf_p = '\0'; /* preserve yytext */ - yyg->yy_hold_char = *++yyg->yy_c_buf_p; - - if ( c == '\n' ) - - do{ yylineno++; - yycolumn=0; - }while(0) -; - - return c; -} -#endif /* ifndef YY_NO_INPUT */ - -/** Immediately switch to a different input stream. - * @param input_file A readable stream. - * @param yyscanner The scanner object. - * @note This function does not reset the start condition to @c INITIAL . - */ - void yyrestart (FILE * input_file , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - if ( ! YY_CURRENT_BUFFER ){ - yyensure_buffer_stack (yyscanner); - YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); - } - - yy_init_buffer(YY_CURRENT_BUFFER,input_file ,yyscanner); - yy_load_buffer_state(yyscanner ); -} - -/** Switch to a different input buffer. - * @param new_buffer The new input buffer. - * @param yyscanner The scanner object. - */ - void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - /* TODO. We should be able to replace this entire function body - * with - * yypop_buffer_state(); - * yypush_buffer_state(new_buffer); - */ - yyensure_buffer_stack (yyscanner); - if ( YY_CURRENT_BUFFER == new_buffer ) - return; - - if ( YY_CURRENT_BUFFER ) - { - /* Flush out information for old buffer. */ - *yyg->yy_c_buf_p = yyg->yy_hold_char; - YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p; - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars; - } - - YY_CURRENT_BUFFER_LVALUE = new_buffer; - yy_load_buffer_state(yyscanner ); - - /* We don't actually know whether we did this switch during - * EOF (yywrap()) processing, but the only time this flag - * is looked at is after yywrap() is called, so it's safe - * to go ahead and always set it. - */ - yyg->yy_did_buffer_switch_on_eof = 1; -} - -static void yy_load_buffer_state (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; - yyg->yytext_ptr = yyg->yy_c_buf_p = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos; - yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file; - yyg->yy_hold_char = *yyg->yy_c_buf_p; -} - -/** Allocate and initialize an input buffer state. - * @param file A readable stream. - * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE. - * @param yyscanner The scanner object. - * @return the allocated buffer state. - */ - YY_BUFFER_STATE yy_create_buffer (FILE * file, int size , yyscan_t yyscanner) -{ - YY_BUFFER_STATE b; - - b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ,yyscanner ); - if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); - - b->yy_buf_size = size; - - /* yy_ch_buf has to be 2 characters longer than the size given because - * we need to put in 2 end-of-buffer characters. - */ - b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2 ,yyscanner ); - if ( ! b->yy_ch_buf ) - YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); - - b->yy_is_our_buffer = 1; - - yy_init_buffer(b,file ,yyscanner); - - return b; -} - -/** Destroy the buffer. - * @param b a buffer created with yy_create_buffer() - * @param yyscanner The scanner object. - */ - void yy_delete_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - if ( ! b ) - return; - - if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */ - YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; - - if ( b->yy_is_our_buffer ) - yyfree((void *) b->yy_ch_buf ,yyscanner ); - - yyfree((void *) b ,yyscanner ); -} - -#ifndef __cplusplus -extern int isatty (int ); -#endif /* __cplusplus */ - -/* Initializes or reinitializes a buffer. - * This function is sometimes called more than once on the same buffer, - * such as during a yyrestart() or at EOF. - */ - static void yy_init_buffer (YY_BUFFER_STATE b, FILE * file , yyscan_t yyscanner) - -{ - int oerrno = errno; - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - yy_flush_buffer(b ,yyscanner); - - b->yy_input_file = file; - b->yy_fill_buffer = 1; - - /* If b is the current buffer, then yy_init_buffer was _probably_ - * called from yyrestart() or through yy_get_next_buffer. - * In that case, we don't want to reset the lineno or column. - */ - if (b != YY_CURRENT_BUFFER){ - b->yy_bs_lineno = 1; - b->yy_bs_column = 0; - } - - b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; - - errno = oerrno; -} - -/** Discard all buffered characters. On the next scan, YY_INPUT will be called. - * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. - * @param yyscanner The scanner object. - */ - void yy_flush_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - if ( ! b ) - return; - - b->yy_n_chars = 0; - - /* We always need two end-of-buffer characters. The first causes - * a transition to the end-of-buffer state. The second causes - * a jam in that state. - */ - b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR; - b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR; - - b->yy_buf_pos = &b->yy_ch_buf[0]; - - b->yy_at_bol = 1; - b->yy_buffer_status = YY_BUFFER_NEW; - - if ( b == YY_CURRENT_BUFFER ) - yy_load_buffer_state(yyscanner ); -} - -/** Pushes the new state onto the stack. The new state becomes - * the current state. This function will allocate the stack - * if necessary. - * @param new_buffer The new state. - * @param yyscanner The scanner object. - */ -void yypush_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - if (new_buffer == NULL) - return; - - yyensure_buffer_stack(yyscanner); - - /* This block is copied from yy_switch_to_buffer. */ - if ( YY_CURRENT_BUFFER ) - { - /* Flush out information for old buffer. */ - *yyg->yy_c_buf_p = yyg->yy_hold_char; - YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p; - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars; - } - - /* Only push if top exists. Otherwise, replace top. */ - if (YY_CURRENT_BUFFER) - yyg->yy_buffer_stack_top++; - YY_CURRENT_BUFFER_LVALUE = new_buffer; - - /* copied from yy_switch_to_buffer. */ - yy_load_buffer_state(yyscanner ); - yyg->yy_did_buffer_switch_on_eof = 1; -} - -/** Removes and deletes the top of the stack, if present. - * The next element becomes the new top. - * @param yyscanner The scanner object. - */ -void yypop_buffer_state (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - if (!YY_CURRENT_BUFFER) - return; - - yy_delete_buffer(YY_CURRENT_BUFFER ,yyscanner); - YY_CURRENT_BUFFER_LVALUE = NULL; - if (yyg->yy_buffer_stack_top > 0) - --yyg->yy_buffer_stack_top; - - if (YY_CURRENT_BUFFER) { - yy_load_buffer_state(yyscanner ); - yyg->yy_did_buffer_switch_on_eof = 1; - } -} - -/* Allocates the stack if it does not exist. - * Guarantees space for at least one push. - */ -static void yyensure_buffer_stack (yyscan_t yyscanner) -{ - yy_size_t num_to_alloc; - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - if (!yyg->yy_buffer_stack) { - - /* First allocation is just for 2 elements, since we don't know if this - * scanner will even need a stack. We use 2 instead of 1 to avoid an - * immediate realloc on the next call. - */ - num_to_alloc = 1; - yyg->yy_buffer_stack = (struct yy_buffer_state**)yyalloc - (num_to_alloc * sizeof(struct yy_buffer_state*) - , yyscanner); - if ( ! yyg->yy_buffer_stack ) - YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); - - memset(yyg->yy_buffer_stack, 0, num_to_alloc * sizeof(struct yy_buffer_state*)); - - yyg->yy_buffer_stack_max = num_to_alloc; - yyg->yy_buffer_stack_top = 0; - return; - } - - if (yyg->yy_buffer_stack_top >= (yyg->yy_buffer_stack_max) - 1){ - - /* Increase the buffer to prepare for a possible push. */ - int grow_size = 8 /* arbitrary grow size */; - - num_to_alloc = yyg->yy_buffer_stack_max + grow_size; - yyg->yy_buffer_stack = (struct yy_buffer_state**)yyrealloc - (yyg->yy_buffer_stack, - num_to_alloc * sizeof(struct yy_buffer_state*) - , yyscanner); - if ( ! yyg->yy_buffer_stack ) - YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); - - /* zero only the new slots.*/ - memset(yyg->yy_buffer_stack + yyg->yy_buffer_stack_max, 0, grow_size * sizeof(struct yy_buffer_state*)); - yyg->yy_buffer_stack_max = num_to_alloc; - } -} - -/** Setup the input buffer state to scan directly from a user-specified character buffer. - * @param base the character buffer - * @param size the size in bytes of the character buffer - * @param yyscanner The scanner object. - * @return the newly allocated buffer state object. - */ -YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size , yyscan_t yyscanner) -{ - YY_BUFFER_STATE b; - - if ( size < 2 || - base[size-2] != YY_END_OF_BUFFER_CHAR || - base[size-1] != YY_END_OF_BUFFER_CHAR ) - /* They forgot to leave room for the EOB's. */ - return 0; - - b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ,yyscanner ); - if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); - - b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ - b->yy_buf_pos = b->yy_ch_buf = base; - b->yy_is_our_buffer = 0; - b->yy_input_file = 0; - b->yy_n_chars = b->yy_buf_size; - b->yy_is_interactive = 0; - b->yy_at_bol = 1; - b->yy_fill_buffer = 0; - b->yy_buffer_status = YY_BUFFER_NEW; - - yy_switch_to_buffer(b ,yyscanner ); - - return b; -} - -/** Setup the input buffer state to scan a string. The next call to yylex() will - * scan from a @e copy of @a str. - * @param yystr a NUL-terminated string to scan - * @param yyscanner The scanner object. - * @return the newly allocated buffer state object. - * @note If you want to scan bytes that may contain NUL values, then use - * yy_scan_bytes() instead. - */ -YY_BUFFER_STATE yy_scan_string (yyconst char * yystr , yyscan_t yyscanner) -{ - - return yy_scan_bytes(yystr,strlen(yystr) ,yyscanner); -} - -/** Setup the input buffer state to scan the given bytes. The next call to yylex() will - * scan from a @e copy of @a bytes. - * @param bytes the byte buffer to scan - * @param len the number of bytes in the buffer pointed to by @a bytes. - * @param yyscanner The scanner object. - * @return the newly allocated buffer state object. - */ -YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len , yyscan_t yyscanner) -{ - YY_BUFFER_STATE b; - char *buf; - yy_size_t n, i; - - /* Get memory for full buffer, including space for trailing EOB's. */ - n = _yybytes_len + 2; - buf = (char *) yyalloc(n ,yyscanner ); - if ( ! buf ) - YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); - - for ( i = 0; i < _yybytes_len; ++i ) - buf[i] = yybytes[i]; - - buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; - - b = yy_scan_buffer(buf,n ,yyscanner); - if ( ! b ) - YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); - - /* It's okay to grow etc. this buffer, and we should throw it - * away when we're done. - */ - b->yy_is_our_buffer = 1; - - return b; -} - -#ifndef YY_EXIT_FAILURE -#define YY_EXIT_FAILURE 2 -#endif - -static void yy_fatal_error (yyconst char* msg , yyscan_t yyscanner) -{ - (void) fprintf( stderr, "%s\n", msg ); - exit( YY_EXIT_FAILURE ); -} - -/* Redefine yyless() so it works in section 3 code. */ - -#undef yyless -#define yyless(n) \ - do \ - { \ - /* Undo effects of setting up yytext. */ \ - int yyless_macro_arg = (n); \ - YY_LESS_LINENO(yyless_macro_arg);\ - yytext[yyleng] = yyg->yy_hold_char; \ - yyg->yy_c_buf_p = yytext + yyless_macro_arg; \ - yyg->yy_hold_char = *yyg->yy_c_buf_p; \ - *yyg->yy_c_buf_p = '\0'; \ - yyleng = yyless_macro_arg; \ - } \ - while ( 0 ) - -/* Accessor methods (get/set functions) to struct members. */ - -/** Get the user-defined data for this scanner. - * @param yyscanner The scanner object. - */ -YY_EXTRA_TYPE yyget_extra (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - return yyextra; -} - -/** Get the current line number. - * @param yyscanner The scanner object. - */ -int yyget_lineno (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - if (! YY_CURRENT_BUFFER) - return 0; - - return yylineno; -} - -/** Get the current column number. - * @param yyscanner The scanner object. - */ -int yyget_column (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - if (! YY_CURRENT_BUFFER) - return 0; - - return yycolumn; -} - -/** Get the input stream. - * @param yyscanner The scanner object. - */ -FILE *yyget_in (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - return yyin; -} - -/** Get the output stream. - * @param yyscanner The scanner object. - */ -FILE *yyget_out (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - return yyout; -} - -/** Get the length of the current token. - * @param yyscanner The scanner object. - */ -yy_size_t yyget_leng (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - return yyleng; -} - -/** Get the current token. - * @param yyscanner The scanner object. - */ - -char *yyget_text (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - return yytext; -} - -/** Set the user-defined data. This data is never touched by the scanner. - * @param user_defined The data to be associated with this scanner. - * @param yyscanner The scanner object. - */ -void yyset_extra (YY_EXTRA_TYPE user_defined , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - yyextra = user_defined ; -} - -/** Set the current line number. - * @param line_number - * @param yyscanner The scanner object. - */ -void yyset_lineno (int line_number , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - /* lineno is only valid if an input buffer exists. */ - if (! YY_CURRENT_BUFFER ) - yy_fatal_error( "yyset_lineno called with no buffer" , yyscanner); - - yylineno = line_number; -} - -/** Set the current column. - * @param line_number - * @param yyscanner The scanner object. - */ -void yyset_column (int column_no , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - /* column is only valid if an input buffer exists. */ - if (! YY_CURRENT_BUFFER ) - yy_fatal_error( "yyset_column called with no buffer" , yyscanner); - - yycolumn = column_no; -} - -/** Set the input stream. This does not discard the current - * input buffer. - * @param in_str A readable stream. - * @param yyscanner The scanner object. - * @see yy_switch_to_buffer - */ -void yyset_in (FILE * in_str , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - yyin = in_str ; -} - -void yyset_out (FILE * out_str , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - yyout = out_str ; -} - -int yyget_debug (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - return yy_flex_debug; -} - -void yyset_debug (int bdebug , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - yy_flex_debug = bdebug ; -} - -/* Accessor methods for yylval and yylloc */ - -YYSTYPE * yyget_lval (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - return yylval; -} - -void yyset_lval (YYSTYPE * yylval_param , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - yylval = yylval_param; -} - -YYLTYPE *yyget_lloc (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - return yylloc; -} - -void yyset_lloc (YYLTYPE * yylloc_param , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - yylloc = yylloc_param; -} - -/* User-visible API */ - -/* yylex_init is special because it creates the scanner itself, so it is - * the ONLY reentrant function that doesn't take the scanner as the last argument. - * That's why we explicitly handle the declaration, instead of using our macros. - */ - -int yylex_init(yyscan_t* ptr_yy_globals) - -{ - if (ptr_yy_globals == NULL){ - errno = EINVAL; - return 1; - } - - *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), NULL ); - - if (*ptr_yy_globals == NULL){ - errno = ENOMEM; - return 1; - } - - /* By setting to 0xAA, we expose bugs in yy_init_globals. Leave at 0x00 for releases. */ - memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t)); - - return yy_init_globals ( *ptr_yy_globals ); -} - -/* yylex_init_extra has the same functionality as yylex_init, but follows the - * convention of taking the scanner as the last argument. Note however, that - * this is a *pointer* to a scanner, as it will be allocated by this call (and - * is the reason, too, why this function also must handle its own declaration). - * The user defined value in the first argument will be available to yyalloc in - * the yyextra field. - */ - -int yylex_init_extra(YY_EXTRA_TYPE yy_user_defined,yyscan_t* ptr_yy_globals ) - -{ - struct yyguts_t dummy_yyguts; - - yyset_extra (yy_user_defined, &dummy_yyguts); - - if (ptr_yy_globals == NULL){ - errno = EINVAL; - return 1; - } - - *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), &dummy_yyguts ); - - if (*ptr_yy_globals == NULL){ - errno = ENOMEM; - return 1; - } - - /* By setting to 0xAA, we expose bugs in - yy_init_globals. Leave at 0x00 for releases. */ - memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t)); - - yyset_extra (yy_user_defined, *ptr_yy_globals); - - return yy_init_globals ( *ptr_yy_globals ); -} - -static int yy_init_globals (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - /* Initialization is the same as for the non-reentrant scanner. - * This function is called from yylex_destroy(), so don't allocate here. - */ - - yyg->yy_buffer_stack = 0; - yyg->yy_buffer_stack_top = 0; - yyg->yy_buffer_stack_max = 0; - yyg->yy_c_buf_p = (char *) 0; - yyg->yy_init = 0; - yyg->yy_start = 0; - - yyg->yy_start_stack_ptr = 0; - yyg->yy_start_stack_depth = 0; - yyg->yy_start_stack = NULL; - -/* Defined in main.c */ -#ifdef YY_STDINIT - yyin = stdin; - yyout = stdout; -#else - yyin = (FILE *) 0; - yyout = (FILE *) 0; -#endif - - /* For future reference: Set errno on error, since we are called by - * yylex_init() - */ - return 0; -} - -/* yylex_destroy is for both reentrant and non-reentrant scanners. */ -int yylex_destroy (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - /* Pop the buffer stack, destroying each element. */ - while(YY_CURRENT_BUFFER){ - yy_delete_buffer(YY_CURRENT_BUFFER ,yyscanner ); - YY_CURRENT_BUFFER_LVALUE = NULL; - yypop_buffer_state(yyscanner); - } - - /* Destroy the stack itself. */ - yyfree(yyg->yy_buffer_stack ,yyscanner); - yyg->yy_buffer_stack = NULL; - - /* Destroy the start condition stack. */ - yyfree(yyg->yy_start_stack ,yyscanner ); - yyg->yy_start_stack = NULL; - - /* Reset the globals. This is important in a non-reentrant scanner so the next time - * yylex() is called, initialization will occur. */ - yy_init_globals( yyscanner); - - /* Destroy the main struct (reentrant only). */ - yyfree ( yyscanner , yyscanner ); - yyscanner = NULL; - return 0; -} - -/* - * Internal utility routines. - */ - -#ifndef yytext_ptr -static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t yyscanner) -{ - register int i; - for ( i = 0; i < n; ++i ) - s1[i] = s2[i]; -} -#endif - -#ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner) -{ - register int n; - for ( n = 0; s[n]; ++n ) - ; - - return n; -} -#endif - -void *yyalloc (yy_size_t size , yyscan_t yyscanner) -{ - return (void *) malloc( size ); -} - -void *yyrealloc (void * ptr, yy_size_t size , yyscan_t yyscanner) -{ - /* The cast to (char *) in the following accommodates both - * implementations that use char* generic pointers, and those - * that use void* generic pointers. It works with the latter - * because both ANSI C and C++ allow castless assignment from - * any pointer type to void*, and deal with argument conversions - * as though doing an assignment. - */ - return (void *) realloc( (char *) ptr, size ); -} - -void yyfree (void * ptr , yyscan_t yyscanner) -{ - free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ -} - -#define YYTABLES_NAME "yytables" - -#line 182 "../tikzit/src/data/tikzlexer.l" diff --git a/tikzit/src/data/tikzparser.parser.cpp b/tikzit/src/data/tikzparser.parser.cpp deleted file mode 100644 index 7d77d0c..0000000 --- a/tikzit/src/data/tikzparser.parser.cpp +++ /dev/null @@ -1,1938 +0,0 @@ -/* A Bison parser, made by GNU Bison 2.3. */ - -/* Skeleton implementation for Bison's Yacc-like parsers in C - - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ - -/* As a special exception, you may create a larger work that contains - part or all of the Bison parser skeleton and distribute that work - under terms of your choice, so long as that work isn't itself a - parser generator using the skeleton or a modified version thereof - as a parser skeleton. Alternatively, if you modify or redistribute - the parser skeleton itself, you may (at your option) remove this - special exception, which will cause the skeleton and the resulting - Bison output files to be licensed under the GNU General Public - License without this special exception. - - This special exception was added by the Free Software Foundation in - version 2.2 of Bison. */ - -/* C LALR(1) parser skeleton written by Richard Stallman, by - simplifying the original so-called "semantic" parser. */ - -/* All symbols defined below should begin with yy or YY, to avoid - infringing on user name space. This should be done even for local - variables, as they might otherwise be expanded by user macros. - There are some unavoidable exceptions within include files to - define necessary library symbols; they are noted "INFRINGES ON - USER NAME SPACE" below. */ - -/* Identify Bison output. */ -#define YYBISON 1 - -/* Bison version. */ -#define YYBISON_VERSION "2.3" - -/* Skeleton name. */ -#define YYSKELETON_NAME "yacc.c" - -/* Pure parsers. */ -#define YYPURE 1 - -/* Using locations. */ -#define YYLSP_NEEDED 1 - - - -/* Tokens. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - BEGIN_TIKZPICTURE_CMD = 258, - END_TIKZPICTURE_CMD = 259, - BEGIN_PGFONLAYER_CMD = 260, - END_PGFONLAYER_CMD = 261, - DRAW_CMD = 262, - NODE_CMD = 263, - PATH_CMD = 264, - RECTANGLE = 265, - NODE = 266, - AT = 267, - TO = 268, - SEMICOLON = 269, - COMMA = 270, - LEFTPARENTHESIS = 271, - RIGHTPARENTHESIS = 272, - LEFTBRACKET = 273, - RIGHTBRACKET = 274, - FULLSTOP = 275, - EQUALS = 276, - COORD = 277, - PROPSTRING = 278, - REFSTRING = 279, - DELIMITEDSTRING = 280, - UNKNOWN_BEGIN_CMD = 281, - UNKNOWN_END_CMD = 282, - UNKNOWN_CMD = 283, - UNKNOWN_STR = 284, - UNCLOSED_DELIM_STR = 285 - }; -#endif -/* Tokens. */ -#define BEGIN_TIKZPICTURE_CMD 258 -#define END_TIKZPICTURE_CMD 259 -#define BEGIN_PGFONLAYER_CMD 260 -#define END_PGFONLAYER_CMD 261 -#define DRAW_CMD 262 -#define NODE_CMD 263 -#define PATH_CMD 264 -#define RECTANGLE 265 -#define NODE 266 -#define AT 267 -#define TO 268 -#define SEMICOLON 269 -#define COMMA 270 -#define LEFTPARENTHESIS 271 -#define RIGHTPARENTHESIS 272 -#define LEFTBRACKET 273 -#define RIGHTBRACKET 274 -#define FULLSTOP 275 -#define EQUALS 276 -#define COORD 277 -#define PROPSTRING 278 -#define REFSTRING 279 -#define DELIMITEDSTRING 280 -#define UNKNOWN_BEGIN_CMD 281 -#define UNKNOWN_END_CMD 282 -#define UNKNOWN_CMD 283 -#define UNKNOWN_STR 284 -#define UNCLOSED_DELIM_STR 285 - - - - -/* Copy the first part of user declarations. */ -#line 1 "../tikzit/src/data/tikzparser.y" - -/* - * Copyright 2010 Chris Heunen - * Copyright 2010-2013 Aleks Kissinger - * Copyright 2013 K. Johan Paulsson - * Copyright 2013 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "tikzparserdefs.h" - - -/* Enabling traces. */ -#ifndef YYDEBUG -# define YYDEBUG 0 -#endif - -/* Enabling verbose error messages. */ -#ifdef YYERROR_VERBOSE -# undef YYERROR_VERBOSE -# define YYERROR_VERBOSE 1 -#else -# define YYERROR_VERBOSE 1 -#endif - -/* Enabling the token table. */ -#ifndef YYTOKEN_TABLE -# define YYTOKEN_TABLE 0 -#endif - -#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE -#line 43 "../tikzit/src/data/tikzparser.y" -{ - char *str; - GraphElementProperty *prop; - GraphElementData *data; - Node *node; - QPointF *pt; - struct noderef noderef; -} -/* Line 193 of yacc.c. */ -#line 189 "../tikzit/src/data/tikzparser.parser.cpp" - YYSTYPE; -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ -# define YYSTYPE_IS_DECLARED 1 -# define YYSTYPE_IS_TRIVIAL 1 -#endif - -#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED -typedef struct YYLTYPE -{ - int first_line; - int first_column; - int last_line; - int last_column; -} YYLTYPE; -# define yyltype YYLTYPE /* obsolescent; will be withdrawn */ -# define YYLTYPE_IS_DECLARED 1 -# define YYLTYPE_IS_TRIVIAL 1 -#endif - - -/* Copy the second part of user declarations. */ -#line 52 "../tikzit/src/data/tikzparser.y" - -#include "node.h" -#include "edge.h" -#include "graphelementdata.h" -#include "graphelementproperty.h" - -#include "tikzlexer.h" -#import "tikzgraphassembler.h" -/* the assembler (used by this parser) is stored in the lexer - state as "extra" data */ -#define assembler yyget_extra(scanner) - -/* pass errors off to the assembler */ -void yyerror(YYLTYPE *yylloc, void *scanner, const char *str) { - // TODO: implement reportError() - //assembler->reportError(str, yylloc); - qDebug() << "parse error: " << str; -} - - -/* Line 216 of yacc.c. */ -#line 233 "../tikzit/src/data/tikzparser.parser.cpp" - -#ifdef short -# undef short -#endif - -#ifdef YYTYPE_UINT8 -typedef YYTYPE_UINT8 yytype_uint8; -#else -typedef unsigned char yytype_uint8; -#endif - -#ifdef YYTYPE_INT8 -typedef YYTYPE_INT8 yytype_int8; -#elif (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -typedef signed char yytype_int8; -#else -typedef short int yytype_int8; -#endif - -#ifdef YYTYPE_UINT16 -typedef YYTYPE_UINT16 yytype_uint16; -#else -typedef unsigned short int yytype_uint16; -#endif - -#ifdef YYTYPE_INT16 -typedef YYTYPE_INT16 yytype_int16; -#else -typedef short int yytype_int16; -#endif - -#ifndef YYSIZE_T -# ifdef __SIZE_TYPE__ -# define YYSIZE_T __SIZE_TYPE__ -# elif defined size_t -# define YYSIZE_T size_t -# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -# include /* INFRINGES ON USER NAME SPACE */ -# define YYSIZE_T size_t -# else -# define YYSIZE_T unsigned int -# endif -#endif - -#define YYSIZE_MAXIMUM ((YYSIZE_T) -1) - -#ifndef YY_ -# if defined YYENABLE_NLS && YYENABLE_NLS -# if ENABLE_NLS -# include /* INFRINGES ON USER NAME SPACE */ -# define YY_(msgid) dgettext ("bison-runtime", msgid) -# endif -# endif -# ifndef YY_ -# define YY_(msgid) msgid -# endif -#endif - -/* Suppress unused-variable warnings by "using" E. */ -#if ! defined lint || defined __GNUC__ -# define YYUSE(e) ((void) (e)) -#else -# define YYUSE(e) /* empty */ -#endif - -/* Identity function, used to suppress warnings about constant conditions. */ -#ifndef lint -# define YYID(n) (n) -#else -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static int -YYID (int i) -#else -static int -YYID (i) - int i; -#endif -{ - return i; -} -#endif - -#if ! defined yyoverflow || YYERROR_VERBOSE - -/* The parser invokes alloca or malloc; define the necessary symbols. */ - -# ifdef YYSTACK_USE_ALLOCA -# if YYSTACK_USE_ALLOCA -# ifdef __GNUC__ -# define YYSTACK_ALLOC __builtin_alloca -# elif defined __BUILTIN_VA_ARG_INCR -# include /* INFRINGES ON USER NAME SPACE */ -# elif defined _AIX -# define YYSTACK_ALLOC __alloca -# elif defined _MSC_VER -# include /* INFRINGES ON USER NAME SPACE */ -# define alloca _alloca -# else -# define YYSTACK_ALLOC alloca -# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -# include /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 -# endif -# endif -# endif -# endif -# endif - -# ifdef YYSTACK_ALLOC - /* Pacify GCC's `empty if-body' warning. */ -# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) -# ifndef YYSTACK_ALLOC_MAXIMUM - /* The OS might guarantee only one guard page at the bottom of the stack, - and a page size can be as small as 4096 bytes. So we cannot safely - invoke alloca (N) if N exceeds 4096. Use a slightly smaller number - to allow for a few compiler-allocated temporary stack slots. */ -# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */ -# endif -# else -# define YYSTACK_ALLOC YYMALLOC -# define YYSTACK_FREE YYFREE -# ifndef YYSTACK_ALLOC_MAXIMUM -# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM -# endif -# if (defined __cplusplus && ! defined _STDLIB_H \ - && ! ((defined YYMALLOC || defined malloc) \ - && (defined YYFREE || defined free))) -# include /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 -# endif -# endif -# ifndef YYMALLOC -# define YYMALLOC malloc -# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ -# endif -# endif -# ifndef YYFREE -# define YYFREE free -# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -void free (void *); /* INFRINGES ON USER NAME SPACE */ -# endif -# endif -# endif -#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ - - -#if (! defined yyoverflow \ - && (! defined __cplusplus \ - || (defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL \ - && defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) - -/* A type that is properly aligned for any stack member. */ -union yyalloc -{ - yytype_int16 yyss; - YYSTYPE yyvs; - YYLTYPE yyls; -}; - -/* The size of the maximum gap between one aligned stack and the next. */ -# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) - -/* The size of an array large to enough to hold all stacks, each with - N elements. */ -# define YYSTACK_BYTES(N) \ - ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \ - + 2 * YYSTACK_GAP_MAXIMUM) - -/* Copy COUNT objects from FROM to TO. The source and destination do - not overlap. */ -# ifndef YYCOPY -# if defined __GNUC__ && 1 < __GNUC__ -# define YYCOPY(To, From, Count) \ - __builtin_memcpy (To, From, (Count) * sizeof (*(From))) -# else -# define YYCOPY(To, From, Count) \ - do \ - { \ - YYSIZE_T yyi; \ - for (yyi = 0; yyi < (Count); yyi++) \ - (To)[yyi] = (From)[yyi]; \ - } \ - while (YYID (0)) -# endif -# endif - -/* Relocate STACK from its old location to the new one. The - local variables YYSIZE and YYSTACKSIZE give the old and new number of - elements in the stack, and YYPTR gives the new location of the - stack. Advance YYPTR to a properly aligned location for the next - stack. */ -# define YYSTACK_RELOCATE(Stack) \ - do \ - { \ - YYSIZE_T yynewbytes; \ - YYCOPY (&yyptr->Stack, Stack, yysize); \ - Stack = &yyptr->Stack; \ - yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ - yyptr += yynewbytes / sizeof (*yyptr); \ - } \ - while (YYID (0)) - -#endif - -/* YYFINAL -- State number of the termination state. */ -#define YYFINAL 5 -/* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 52 - -/* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 31 -/* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 21 -/* YYNRULES -- Number of rules. */ -#define YYNRULES 36 -/* YYNRULES -- Number of states. */ -#define YYNSTATES 70 - -/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ -#define YYUNDEFTOK 2 -#define YYMAXUTOK 285 - -#define YYTRANSLATE(YYX) \ - ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) - -/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ -static const yytype_uint8 yytranslate[] = -{ - 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, - 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - 25, 26, 27, 28, 29, 30 -}; - -#if YYDEBUG -/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in - YYRHS. */ -static const yytype_uint8 yyprhs[] = -{ - 0, 0, 3, 8, 11, 12, 14, 16, 18, 20, - 23, 25, 28, 32, 33, 36, 40, 41, 45, 47, - 49, 51, 55, 63, 64, 67, 72, 74, 77, 78, - 82, 90, 92, 96, 99, 100, 104 -}; - -/* YYRHS -- A `-1'-separated list of the rules' RHS. */ -static const yytype_int8 yyrhs[] = -{ - 32, 0, -1, 3, 36, 33, 4, -1, 33, 34, - -1, -1, 42, -1, 47, -1, 51, -1, 35, -1, - 5, 25, -1, 6, -1, 18, 19, -1, 18, 37, - 19, -1, -1, 38, 39, -1, 38, 39, 15, -1, - -1, 40, 21, 40, -1, 40, -1, 23, -1, 25, - -1, 16, 24, 17, -1, 8, 36, 41, 12, 22, - 25, 14, -1, -1, 20, 24, -1, 16, 24, 43, - 17, -1, 44, -1, 16, 17, -1, -1, 11, 36, - 25, -1, 7, 36, 44, 13, 46, 45, 14, -1, - 40, -1, 40, 21, 40, -1, 48, 49, -1, -1, - 18, 49, 19, -1, 9, 50, 22, 10, 22, 14, - -1 -}; - -/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ -static const yytype_uint8 yyrline[] = -{ - 0, 124, 124, 130, 130, 131, 131, 131, 131, 133, - 133, 136, 138, 140, 141, 148, 154, 156, 163, 169, - 169, 171, 172, 192, 192, 193, 200, 201, 203, 204, - 212, 250, 250, 251, 251, 252, 254 -}; -#endif - -#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE -/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. - First, the terminals, then, starting at YYNTOKENS, nonterminals. */ -static const char *const yytname[] = -{ - "$end", "error", "$undefined", "\"\\\\begin{tikzpicture}\"", - "\"\\\\end{tikzpicture}\"", "\"\\\\begin{pgfonlayer}\"", - "\"\\\\end{pgfonlayer}\"", "\"\\\\draw\"", "\"\\\\node\"", - "\"\\\\path\"", "\"rectangle\"", "\"node\"", "\"at\"", "\"to\"", "\";\"", - "\",\"", "\"(\"", "\")\"", "\"[\"", "\"]\"", "\".\"", "\"=\"", - "\"co-ordinate\"", "\"key/value string\"", "\"string\"", - "\"{-delimited string\"", "\"unknown \\\\begin command\"", - "\"unknown \\\\end command\"", "\"unknown latex command\"", - "\"unknown string\"", "\"unclosed {-delimited string\"", "$accept", - "tikzpicture", "tikzcmds", "tikzcmd", "ignore", "optproperties", - "properties", "extraproperties", "property", "val", "nodename", "node", - "optanchor", "noderef", "optnoderef", "optedgenode", "edge", - "ignoreprop", "ignoreprops", "optignoreprops", "boundingbox", 0 -}; -#endif - -# ifdef YYPRINT -/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to - token YYLEX-NUM. */ -static const yytype_uint16 yytoknum[] = -{ - 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, - 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, - 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, - 285 -}; -# endif - -/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ -static const yytype_uint8 yyr1[] = -{ - 0, 31, 32, 33, 33, 34, 34, 34, 34, 35, - 35, 36, 36, 36, 37, 38, 38, 39, 39, 40, - 40, 41, 42, 43, 43, 44, 45, 45, 46, 46, - 47, 48, 48, 49, 49, 50, 51 -}; - -/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ -static const yytype_uint8 yyr2[] = -{ - 0, 2, 4, 2, 0, 1, 1, 1, 1, 2, - 1, 2, 3, 0, 2, 3, 0, 3, 1, 1, - 1, 3, 7, 0, 2, 4, 1, 2, 0, 3, - 7, 1, 3, 2, 0, 3, 6 -}; - -/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state - STATE-NUM when YYTABLE doesn't specify something else to do. Zero - means the default is an error. */ -static const yytype_uint8 yydefact[] = -{ - 0, 13, 0, 16, 4, 1, 11, 0, 0, 0, - 12, 19, 20, 14, 18, 2, 0, 10, 13, 13, - 0, 3, 8, 5, 6, 7, 15, 0, 9, 0, - 0, 34, 0, 17, 0, 0, 0, 0, 31, 34, - 0, 0, 23, 28, 0, 0, 0, 33, 35, 0, - 0, 0, 13, 0, 21, 0, 32, 0, 24, 25, - 0, 0, 26, 0, 0, 36, 29, 27, 30, 22 -}; - -/* YYDEFGOTO[NTERM-NUM]. */ -static const yytype_int8 yydefgoto[] = -{ - -1, 2, 9, 21, 22, 4, 7, 8, 13, 38, - 37, 23, 51, 35, 63, 53, 24, 39, 40, 32, - 25 -}; - -/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing - STATE-NUM. */ -#define YYPACT_NINF -20 -static const yytype_int8 yypact[] = -{ - 9, -4, 15, -3, -20, -20, -20, -2, -12, 0, - -20, -20, -20, 3, -1, -20, 1, -20, -4, -4, - 4, -20, -20, -20, -20, -20, -20, -12, -20, 5, - 7, -12, 2, -20, 6, 12, 8, 16, 10, -12, - 14, 17, 19, 18, 20, 21, -12, -20, -20, 22, - 23, 24, -4, 26, -20, 11, -20, 31, -20, -20, - 25, -14, -20, 32, 34, -20, -20, -20, -20, -20 -}; - -/* YYPGOTO[NTERM-NUM]. */ -static const yytype_int8 yypgoto[] = -{ - -20, -20, -20, -20, -20, -17, -20, -20, -20, -8, - -20, -20, -20, -19, -20, -20, -20, -20, 13, -20, - -20 -}; - -/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If - positive, shift that token. If negative, reduce the rule which - number is the opposite. If zero, do what YYDEFACT says. - If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -1 -static const yytype_uint8 yytable[] = -{ - 14, 29, 30, 67, 15, 16, 17, 18, 19, 20, - 42, 11, 1, 12, 3, 5, 6, 10, 26, 33, - 27, 34, 31, 36, 41, 43, 28, 49, 45, 52, - 42, 46, 44, 48, 62, 60, 64, 54, 56, 50, - 0, 59, 61, 55, 57, 65, 68, 58, 69, 0, - 66, 0, 47 -}; - -static const yytype_int8 yycheck[] = -{ - 8, 18, 19, 17, 4, 5, 6, 7, 8, 9, - 24, 23, 3, 25, 18, 0, 19, 19, 15, 27, - 21, 16, 18, 16, 22, 13, 25, 10, 12, 11, - 24, 21, 24, 19, 53, 52, 25, 17, 46, 20, - -1, 17, 16, 22, 22, 14, 14, 24, 14, -1, - 25, -1, 39 -}; - -/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing - symbol of state STATE-NUM. */ -static const yytype_uint8 yystos[] = -{ - 0, 3, 32, 18, 36, 0, 19, 37, 38, 33, - 19, 23, 25, 39, 40, 4, 5, 6, 7, 8, - 9, 34, 35, 42, 47, 51, 15, 21, 25, 36, - 36, 18, 50, 40, 16, 44, 16, 41, 40, 48, - 49, 22, 24, 13, 24, 12, 21, 49, 19, 10, - 20, 43, 11, 46, 17, 22, 40, 22, 24, 17, - 36, 16, 44, 45, 25, 14, 25, 17, 14, 14 -}; - -#define yyerrok (yyerrstatus = 0) -#define yyclearin (yychar = YYEMPTY) -#define YYEMPTY (-2) -#define YYEOF 0 - -#define YYACCEPT goto yyacceptlab -#define YYABORT goto yyabortlab -#define YYERROR goto yyerrorlab - - -/* Like YYERROR except do call yyerror. This remains here temporarily - to ease the transition to the new meaning of YYERROR, for GCC. - Once GCC version 2 has supplanted version 1, this can go. */ - -#define YYFAIL goto yyerrlab - -#define YYRECOVERING() (!!yyerrstatus) - -#define YYBACKUP(Token, Value) \ -do \ - if (yychar == YYEMPTY && yylen == 1) \ - { \ - yychar = (Token); \ - yylval = (Value); \ - yytoken = YYTRANSLATE (yychar); \ - YYPOPSTACK (1); \ - goto yybackup; \ - } \ - else \ - { \ - yyerror (&yylloc, scanner, YY_("syntax error: cannot back up")); \ - YYERROR; \ - } \ -while (YYID (0)) - - -#define YYTERROR 1 -#define YYERRCODE 256 - - -/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. - If N is 0, then set CURRENT to the empty location which ends - the previous symbol: RHS[0] (always defined). */ - -#define YYRHSLOC(Rhs, K) ((Rhs)[K]) -#ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - do \ - if (YYID (N)) \ - { \ - (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ - (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ - (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ - (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ - } \ - else \ - { \ - (Current).first_line = (Current).last_line = \ - YYRHSLOC (Rhs, 0).last_line; \ - (Current).first_column = (Current).last_column = \ - YYRHSLOC (Rhs, 0).last_column; \ - } \ - while (YYID (0)) -#endif - - -/* YY_LOCATION_PRINT -- Print the location on the stream. - This macro was not mandated originally: define only if we know - we won't break user code: when these are the locations we know. */ - -#ifndef YY_LOCATION_PRINT -# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL -# define YY_LOCATION_PRINT(File, Loc) \ - fprintf (File, "%d.%d-%d.%d", \ - (Loc).first_line, (Loc).first_column, \ - (Loc).last_line, (Loc).last_column) -# else -# define YY_LOCATION_PRINT(File, Loc) ((void) 0) -# endif -#endif - - -/* YYLEX -- calling `yylex' with the right arguments. */ - -#ifdef YYLEX_PARAM -# define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM) -#else -# define YYLEX yylex (&yylval, &yylloc, scanner) -#endif - -/* Enable debugging if requested. */ -#if YYDEBUG - -# ifndef YYFPRINTF -# include /* INFRINGES ON USER NAME SPACE */ -# define YYFPRINTF fprintf -# endif - -# define YYDPRINTF(Args) \ -do { \ - if (yydebug) \ - YYFPRINTF Args; \ -} while (YYID (0)) - -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ -do { \ - if (yydebug) \ - { \ - YYFPRINTF (stderr, "%s ", Title); \ - yy_symbol_print (stderr, \ - Type, Value, Location, scanner); \ - YYFPRINTF (stderr, "\n"); \ - } \ -} while (YYID (0)) - - -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ - -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp, void *scanner) -#else -static void -yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp, scanner) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; - YYLTYPE const * const yylocationp; - void *scanner; -#endif -{ - if (!yyvaluep) - return; - YYUSE (yylocationp); - YYUSE (scanner); -# ifdef YYPRINT - if (yytype < YYNTOKENS) - YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); -# else - YYUSE (yyoutput); -# endif - switch (yytype) - { - default: - break; - } -} - - -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ - -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp, void *scanner) -#else -static void -yy_symbol_print (yyoutput, yytype, yyvaluep, yylocationp, scanner) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; - YYLTYPE const * const yylocationp; - void *scanner; -#endif -{ - if (yytype < YYNTOKENS) - YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); - else - YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); - - YY_LOCATION_PRINT (yyoutput, *yylocationp); - YYFPRINTF (yyoutput, ": "); - yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp, scanner); - YYFPRINTF (yyoutput, ")"); -} - -/*------------------------------------------------------------------. -| yy_stack_print -- Print the state stack from its BOTTOM up to its | -| TOP (included). | -`------------------------------------------------------------------*/ - -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_stack_print (yytype_int16 *bottom, yytype_int16 *top) -#else -static void -yy_stack_print (bottom, top) - yytype_int16 *bottom; - yytype_int16 *top; -#endif -{ - YYFPRINTF (stderr, "Stack now"); - for (; bottom <= top; ++bottom) - YYFPRINTF (stderr, " %d", *bottom); - YYFPRINTF (stderr, "\n"); -} - -# define YY_STACK_PRINT(Bottom, Top) \ -do { \ - if (yydebug) \ - yy_stack_print ((Bottom), (Top)); \ -} while (YYID (0)) - - -/*------------------------------------------------. -| Report that the YYRULE is going to be reduced. | -`------------------------------------------------*/ - -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_reduce_print (YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule, void *scanner) -#else -static void -yy_reduce_print (yyvsp, yylsp, yyrule, scanner) - YYSTYPE *yyvsp; - YYLTYPE *yylsp; - int yyrule; - void *scanner; -#endif -{ - int yynrhs = yyr2[yyrule]; - int yyi; - unsigned long int yylno = yyrline[yyrule]; - YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", - yyrule - 1, yylno); - /* The symbols being reduced. */ - for (yyi = 0; yyi < yynrhs; yyi++) - { - fprintf (stderr, " $%d = ", yyi + 1); - yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], - &(yyvsp[(yyi + 1) - (yynrhs)]) - , &(yylsp[(yyi + 1) - (yynrhs)]) , scanner); - fprintf (stderr, "\n"); - } -} - -# define YY_REDUCE_PRINT(Rule) \ -do { \ - if (yydebug) \ - yy_reduce_print (yyvsp, yylsp, Rule, scanner); \ -} while (YYID (0)) - -/* Nonzero means print parse trace. It is left uninitialized so that - multiple parsers can coexist. */ -int yydebug; -#else /* !YYDEBUG */ -# define YYDPRINTF(Args) -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) -# define YY_STACK_PRINT(Bottom, Top) -# define YY_REDUCE_PRINT(Rule) -#endif /* !YYDEBUG */ - - -/* YYINITDEPTH -- initial size of the parser's stacks. */ -#ifndef YYINITDEPTH -# define YYINITDEPTH 200 -#endif - -/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only - if the built-in stack extension method is used). - - Do not make this value too large; the results are undefined if - YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH) - evaluated with infinite-precision integer arithmetic. */ - -#ifndef YYMAXDEPTH -# define YYMAXDEPTH 10000 -#endif - - - -#if YYERROR_VERBOSE - -# ifndef yystrlen -# if defined __GLIBC__ && defined _STRING_H -# define yystrlen strlen -# else -/* Return the length of YYSTR. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static YYSIZE_T -yystrlen (const char *yystr) -#else -static YYSIZE_T -yystrlen (yystr) - const char *yystr; -#endif -{ - YYSIZE_T yylen; - for (yylen = 0; yystr[yylen]; yylen++) - continue; - return yylen; -} -# endif -# endif - -# ifndef yystpcpy -# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE -# define yystpcpy stpcpy -# else -/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in - YYDEST. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static char * -yystpcpy (char *yydest, const char *yysrc) -#else -static char * -yystpcpy (yydest, yysrc) - char *yydest; - const char *yysrc; -#endif -{ - char *yyd = yydest; - const char *yys = yysrc; - - while ((*yyd++ = *yys++) != '\0') - continue; - - return yyd - 1; -} -# endif -# endif - -# ifndef yytnamerr -/* Copy to YYRES the contents of YYSTR after stripping away unnecessary - quotes and backslashes, so that it's suitable for yyerror. The - heuristic is that double-quoting is unnecessary unless the string - contains an apostrophe, a comma, or backslash (other than - backslash-backslash). YYSTR is taken from yytname. If YYRES is - null, do not copy; instead, return the length of what the result - would have been. */ -static YYSIZE_T -yytnamerr (char *yyres, const char *yystr) -{ - if (*yystr == '"') - { - YYSIZE_T yyn = 0; - char const *yyp = yystr; - - for (;;) - switch (*++yyp) - { - case '\'': - case ',': - goto do_not_strip_quotes; - - case '\\': - if (*++yyp != '\\') - goto do_not_strip_quotes; - /* Fall through. */ - default: - if (yyres) - yyres[yyn] = *yyp; - yyn++; - break; - - case '"': - if (yyres) - yyres[yyn] = '\0'; - return yyn; - } - do_not_strip_quotes: ; - } - - if (! yyres) - return yystrlen (yystr); - - return yystpcpy (yyres, yystr) - yyres; -} -# endif - -/* Copy into YYRESULT an error message about the unexpected token - YYCHAR while in state YYSTATE. Return the number of bytes copied, - including the terminating null byte. If YYRESULT is null, do not - copy anything; just return the number of bytes that would be - copied. As a special case, return 0 if an ordinary "syntax error" - message will do. Return YYSIZE_MAXIMUM if overflow occurs during - size calculation. */ -static YYSIZE_T -yysyntax_error (char *yyresult, int yystate, int yychar) -{ - int yyn = yypact[yystate]; - - if (! (YYPACT_NINF < yyn && yyn <= YYLAST)) - return 0; - else - { - int yytype = YYTRANSLATE (yychar); - YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]); - YYSIZE_T yysize = yysize0; - YYSIZE_T yysize1; - int yysize_overflow = 0; - enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; - char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; - int yyx; - -# if 0 - /* This is so xgettext sees the translatable formats that are - constructed on the fly. */ - YY_("syntax error, unexpected %s"); - YY_("syntax error, unexpected %s, expecting %s"); - YY_("syntax error, unexpected %s, expecting %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"); -# endif - char *yyfmt; - char const *yyf; - static char const yyunexpected[] = "syntax error, unexpected %s"; - static char const yyexpecting[] = ", expecting %s"; - static char const yyor[] = " or %s"; - char yyformat[sizeof yyunexpected - + sizeof yyexpecting - 1 - + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2) - * (sizeof yyor - 1))]; - char const *yyprefix = yyexpecting; - - /* Start YYX at -YYN if negative to avoid negative indexes in - YYCHECK. */ - int yyxbegin = yyn < 0 ? -yyn : 0; - - /* Stay within bounds of both yycheck and yytname. */ - int yychecklim = YYLAST - yyn + 1; - int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; - int yycount = 1; - - yyarg[0] = yytname[yytype]; - yyfmt = yystpcpy (yyformat, yyunexpected); - - for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) - { - if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) - { - yycount = 1; - yysize = yysize0; - yyformat[sizeof yyunexpected - 1] = '\0'; - break; - } - yyarg[yycount++] = yytname[yyx]; - yysize1 = yysize + yytnamerr (0, yytname[yyx]); - yysize_overflow |= (yysize1 < yysize); - yysize = yysize1; - yyfmt = yystpcpy (yyfmt, yyprefix); - yyprefix = yyor; - } - - yyf = YY_(yyformat); - yysize1 = yysize + yystrlen (yyf); - yysize_overflow |= (yysize1 < yysize); - yysize = yysize1; - - if (yysize_overflow) - return YYSIZE_MAXIMUM; - - if (yyresult) - { - /* Avoid sprintf, as that infringes on the user's name space. - Don't have undefined behavior even if the translation - produced a string with the wrong number of "%s"s. */ - char *yyp = yyresult; - int yyi = 0; - while ((*yyp = *yyf) != '\0') - { - if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) - { - yyp += yytnamerr (yyp, yyarg[yyi++]); - yyf += 2; - } - else - { - yyp++; - yyf++; - } - } - } - return yysize; - } -} -#endif /* YYERROR_VERBOSE */ - - -/*-----------------------------------------------. -| Release the memory associated to this symbol. | -`-----------------------------------------------*/ - -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp, void *scanner) -#else -static void -yydestruct (yymsg, yytype, yyvaluep, yylocationp, scanner) - const char *yymsg; - int yytype; - YYSTYPE *yyvaluep; - YYLTYPE *yylocationp; - void *scanner; -#endif -{ - YYUSE (yyvaluep); - YYUSE (yylocationp); - YYUSE (scanner); - - if (!yymsg) - yymsg = "Deleting"; - YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); - - switch (yytype) - { - - default: - break; - } -} - - -/* Prevent warnings from -Wmissing-prototypes. */ - -#ifdef YYPARSE_PARAM -#if defined __STDC__ || defined __cplusplus -int yyparse (void *YYPARSE_PARAM); -#else -int yyparse (); -#endif -#else /* ! YYPARSE_PARAM */ -#if defined __STDC__ || defined __cplusplus -int yyparse (void *scanner); -#else -int yyparse (); -#endif -#endif /* ! YYPARSE_PARAM */ - - - - - - -/*----------. -| yyparse. | -`----------*/ - -#ifdef YYPARSE_PARAM -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -int -yyparse (void *YYPARSE_PARAM) -#else -int -yyparse (YYPARSE_PARAM) - void *YYPARSE_PARAM; -#endif -#else /* ! YYPARSE_PARAM */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -int -yyparse (void *scanner) -#else -int -yyparse (scanner) - void *scanner; -#endif -#endif -{ - /* The look-ahead symbol. */ -int yychar; - -/* The semantic value of the look-ahead symbol. */ -YYSTYPE yylval; - -/* Number of syntax errors so far. */ -int yynerrs; -/* Location data for the look-ahead symbol. */ -YYLTYPE yylloc; - - int yystate; - int yyn; - int yyresult; - /* Number of tokens to shift before error messages enabled. */ - int yyerrstatus; - /* Look-ahead token as an internal (translated) token number. */ - int yytoken = 0; -#if YYERROR_VERBOSE - /* Buffer for error messages, and its allocated size. */ - char yymsgbuf[128]; - char *yymsg = yymsgbuf; - YYSIZE_T yymsg_alloc = sizeof yymsgbuf; -#endif - - /* Three stacks and their tools: - `yyss': related to states, - `yyvs': related to semantic values, - `yyls': related to locations. - - Refer to the stacks thru separate pointers, to allow yyoverflow - to reallocate them elsewhere. */ - - /* The state stack. */ - yytype_int16 yyssa[YYINITDEPTH]; - yytype_int16 *yyss = yyssa; - yytype_int16 *yyssp; - - /* The semantic value stack. */ - YYSTYPE yyvsa[YYINITDEPTH]; - YYSTYPE *yyvs = yyvsa; - YYSTYPE *yyvsp; - - /* The location stack. */ - YYLTYPE yylsa[YYINITDEPTH]; - YYLTYPE *yyls = yylsa; - YYLTYPE *yylsp; - /* The locations where the error started and ended. */ - YYLTYPE yyerror_range[2]; - -#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N), yylsp -= (N)) - - YYSIZE_T yystacksize = YYINITDEPTH; - - /* The variables used to return semantic value and location from the - action routines. */ - YYSTYPE yyval; - YYLTYPE yyloc; - - /* The number of symbols on the RHS of the reduced rule. - Keep to zero when no symbol should be popped. */ - int yylen = 0; - - YYDPRINTF ((stderr, "Starting parse\n")); - - yystate = 0; - yyerrstatus = 0; - yynerrs = 0; - yychar = YYEMPTY; /* Cause a token to be read. */ - - /* Initialize stack pointers. - Waste one element of value and location stack - so that they stay on the same level as the state stack. - The wasted elements are never initialized. */ - - yyssp = yyss; - yyvsp = yyvs; - yylsp = yyls; -#if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL - /* Initialize the default location before parsing starts. */ - yylloc.first_line = yylloc.last_line = 1; - yylloc.first_column = yylloc.last_column = 0; -#endif - - - /* User initialization code. */ -#line 75 "../tikzit/src/data/tikzparser.y" -{ - yylloc.first_column = yylloc.last_column = 0; -} -/* Line 1078 of yacc.c. */ -#line 1337 "../tikzit/src/data/tikzparser.parser.cpp" - goto yysetstate; - -/*------------------------------------------------------------. -| yynewstate -- Push a new state, which is found in yystate. | -`------------------------------------------------------------*/ - yynewstate: - /* In all cases, when you get here, the value and location stacks - have just been pushed. So pushing a state here evens the stacks. */ - yyssp++; - - yysetstate: - *yyssp = yystate; - - if (yyss + yystacksize - 1 <= yyssp) - { - /* Get the current used size of the three stacks, in elements. */ - YYSIZE_T yysize = yyssp - yyss + 1; - -#ifdef yyoverflow - { - /* Give user a chance to reallocate the stack. Use copies of - these so that the &'s don't force the real ones into - memory. */ - YYSTYPE *yyvs1 = yyvs; - yytype_int16 *yyss1 = yyss; - YYLTYPE *yyls1 = yyls; - - /* Each stack pointer address is followed by the size of the - data in use in that stack, in bytes. This used to be a - conditional around just the two extra args, but that might - be undefined if yyoverflow is a macro. */ - yyoverflow (YY_("memory exhausted"), - &yyss1, yysize * sizeof (*yyssp), - &yyvs1, yysize * sizeof (*yyvsp), - &yyls1, yysize * sizeof (*yylsp), - &yystacksize); - yyls = yyls1; - yyss = yyss1; - yyvs = yyvs1; - } -#else /* no yyoverflow */ -# ifndef YYSTACK_RELOCATE - goto yyexhaustedlab; -# else - /* Extend the stack our own way. */ - if (YYMAXDEPTH <= yystacksize) - goto yyexhaustedlab; - yystacksize *= 2; - if (YYMAXDEPTH < yystacksize) - yystacksize = YYMAXDEPTH; - - { - yytype_int16 *yyss1 = yyss; - union yyalloc *yyptr = - (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); - if (! yyptr) - goto yyexhaustedlab; - YYSTACK_RELOCATE (yyss); - YYSTACK_RELOCATE (yyvs); - YYSTACK_RELOCATE (yyls); -# undef YYSTACK_RELOCATE - if (yyss1 != yyssa) - YYSTACK_FREE (yyss1); - } -# endif -#endif /* no yyoverflow */ - - yyssp = yyss + yysize - 1; - yyvsp = yyvs + yysize - 1; - yylsp = yyls + yysize - 1; - - YYDPRINTF ((stderr, "Stack size increased to %lu\n", - (unsigned long int) yystacksize)); - - if (yyss + yystacksize - 1 <= yyssp) - YYABORT; - } - - YYDPRINTF ((stderr, "Entering state %d\n", yystate)); - - goto yybackup; - -/*-----------. -| yybackup. | -`-----------*/ -yybackup: - - /* Do appropriate processing given the current state. Read a - look-ahead token if we need one and don't already have one. */ - - /* First try to decide what to do without reference to look-ahead token. */ - yyn = yypact[yystate]; - if (yyn == YYPACT_NINF) - goto yydefault; - - /* Not known => get a look-ahead token if don't already have one. */ - - /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */ - if (yychar == YYEMPTY) - { - YYDPRINTF ((stderr, "Reading a token: ")); - yychar = YYLEX; - } - - if (yychar <= YYEOF) - { - yychar = yytoken = YYEOF; - YYDPRINTF ((stderr, "Now at end of input.\n")); - } - else - { - yytoken = YYTRANSLATE (yychar); - YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc); - } - - /* If the proper action on seeing token YYTOKEN is to reduce or to - detect an error, take that action. */ - yyn += yytoken; - if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken) - goto yydefault; - yyn = yytable[yyn]; - if (yyn <= 0) - { - if (yyn == 0 || yyn == YYTABLE_NINF) - goto yyerrlab; - yyn = -yyn; - goto yyreduce; - } - - if (yyn == YYFINAL) - YYACCEPT; - - /* Count tokens shifted since error; after three, turn off error - status. */ - if (yyerrstatus) - yyerrstatus--; - - /* Shift the look-ahead token. */ - YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); - - /* Discard the shifted token unless it is eof. */ - if (yychar != YYEOF) - yychar = YYEMPTY; - - yystate = yyn; - *++yyvsp = yylval; - *++yylsp = yylloc; - goto yynewstate; - - -/*-----------------------------------------------------------. -| yydefault -- do the default action for the current state. | -`-----------------------------------------------------------*/ -yydefault: - yyn = yydefact[yystate]; - if (yyn == 0) - goto yyerrlab; - goto yyreduce; - - -/*-----------------------------. -| yyreduce -- Do a reduction. | -`-----------------------------*/ -yyreduce: - /* yyn is the number of a rule to reduce with. */ - yylen = yyr2[yyn]; - - /* If YYLEN is nonzero, implement the default value of the action: - `$$ = $1'. - - Otherwise, the following line sets YYVAL to garbage. - This behavior is undocumented and Bison - users should not rely upon it. Assigning to YYVAL - unconditionally makes the parser a bit smaller, and it avoids a - GCC warning that YYVAL may be used uninitialized. */ - yyval = yyvsp[1-yylen]; - - /* Default location. */ - YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen); - YY_REDUCE_PRINT (yyn); - switch (yyn) - { - case 2: -#line 125 "../tikzit/src/data/tikzparser.y" - { - if ((yyvsp[(2) - (4)].data)) { - assembler->graph()->setData((yyvsp[(2) - (4)].data)); - } - ;} - break; - - case 11: -#line 137 "../tikzit/src/data/tikzparser.y" - { (yyval.data) = 0; ;} - break; - - case 12: -#line 139 "../tikzit/src/data/tikzparser.y" - { (yyval.data) = (yyvsp[(2) - (3)].data); ;} - break; - - case 13: -#line 140 "../tikzit/src/data/tikzparser.y" - { (yyval.data) = 0; ;} - break; - - case 14: -#line 142 "../tikzit/src/data/tikzparser.y" - { - (yyvsp[(1) - (2)].data)->add(*(yyvsp[(2) - (2)].prop)); - delete (yyvsp[(2) - (2)].prop); - (yyval.data) = (yyvsp[(1) - (2)].data); - ;} - break; - - case 15: -#line 149 "../tikzit/src/data/tikzparser.y" - { - (yyvsp[(1) - (3)].data)->add(*(yyvsp[(2) - (3)].prop)); - delete (yyvsp[(2) - (3)].prop); - (yyval.data) = (yyvsp[(1) - (3)].data); - ;} - break; - - case 16: -#line 154 "../tikzit/src/data/tikzparser.y" - { (yyval.data) = new GraphElementData(); ;} - break; - - case 17: -#line 157 "../tikzit/src/data/tikzparser.y" - { - GraphElementProperty *p = new GraphElementProperty(QString((yyvsp[(1) - (3)].str)),QString((yyvsp[(3) - (3)].str))); - free((yyvsp[(1) - (3)].str)); - free((yyvsp[(3) - (3)].str)); - (yyval.prop) = p; - ;} - break; - - case 18: -#line 164 "../tikzit/src/data/tikzparser.y" - { - GraphElementProperty *a = new GraphElementProperty(QString((yyvsp[(1) - (1)].str))); - free((yyvsp[(1) - (1)].str)); - (yyval.prop) = a; - ;} - break; - - case 19: -#line 169 "../tikzit/src/data/tikzparser.y" - { (yyval.str) = (yyvsp[(1) - (1)].str); ;} - break; - - case 20: -#line 169 "../tikzit/src/data/tikzparser.y" - { (yyval.str) = (yyvsp[(1) - (1)].str); ;} - break; - - case 21: -#line 171 "../tikzit/src/data/tikzparser.y" - { (yyval.str) = (yyvsp[(2) - (3)].str); ;} - break; - - case 22: -#line 173 "../tikzit/src/data/tikzparser.y" - { - Node *node = new Node(); - - if ((yyvsp[(2) - (7)].data)) { - node->setData((yyvsp[(2) - (7)].data)); - } - //qDebug() << "node name: " << $3; - node->setName(QString((yyvsp[(3) - (7)].str))); - node->setLabel(QString((yyvsp[(6) - (7)].str))); - free((yyvsp[(3) - (7)].str)); - free((yyvsp[(6) - (7)].str)); - - node->setPoint(*(yyvsp[(5) - (7)].pt)); - delete (yyvsp[(5) - (7)].pt); - - assembler->graph()->addNode(node); - assembler->addNodeToMap(node); - ;} - break; - - case 23: -#line 192 "../tikzit/src/data/tikzparser.y" - { (yyval.str) = 0; ;} - break; - - case 24: -#line 192 "../tikzit/src/data/tikzparser.y" - { (yyval.str) = (yyvsp[(2) - (2)].str); ;} - break; - - case 25: -#line 194 "../tikzit/src/data/tikzparser.y" - { - (yyval.noderef).node = assembler->nodeWithName(QString((yyvsp[(2) - (4)].str))); - free((yyvsp[(2) - (4)].str)); - (yyval.noderef).anchor = (yyvsp[(3) - (4)].str); - ;} - break; - - case 26: -#line 200 "../tikzit/src/data/tikzparser.y" - { (yyval.noderef) = (yyvsp[(1) - (1)].noderef); ;} - break; - - case 27: -#line 201 "../tikzit/src/data/tikzparser.y" - { (yyval.noderef).node = 0; (yyval.noderef).anchor = 0; ;} - break; - - case 28: -#line 203 "../tikzit/src/data/tikzparser.y" - { (yyval.node) = 0; ;} - break; - - case 29: -#line 205 "../tikzit/src/data/tikzparser.y" - { - (yyval.node) = new Node(); - if ((yyvsp[(2) - (3)].data)) - (yyval.node)->setData((yyvsp[(2) - (3)].data)); - (yyval.node)->setLabel(QString((yyvsp[(3) - (3)].str))); - free((yyvsp[(3) - (3)].str)); - ;} - break; - - case 30: -#line 213 "../tikzit/src/data/tikzparser.y" - { - Node *s; - Node *t; - - s = (yyvsp[(3) - (7)].noderef).node; - - if ((yyvsp[(6) - (7)].noderef).node) { - t = (yyvsp[(6) - (7)].noderef).node; - } else { - t = s; - } - - Edge *edge = new Edge(s, t); - if ((yyvsp[(2) - (7)].data)) { - edge->setData((yyvsp[(2) - (7)].data)); - edge->setAttributesFromData(); - } - - if ((yyvsp[(5) - (7)].node)) - edge->setEdgeNode((yyvsp[(5) - (7)].node)); - if ((yyvsp[(3) - (7)].noderef).anchor) { - edge->setSourceAnchor(QString((yyvsp[(3) - (7)].noderef).anchor)); - free((yyvsp[(3) - (7)].noderef).anchor); - } - - if ((yyvsp[(6) - (7)].noderef).node) { - if ((yyvsp[(6) - (7)].noderef).anchor) { - edge->setTargetAnchor(QString((yyvsp[(6) - (7)].noderef).anchor)); - free((yyvsp[(6) - (7)].noderef).anchor); - } - } else { - edge->setTargetAnchor(edge->sourceAnchor()); - } - - assembler->graph()->addEdge(edge); - ;} - break; - - case 36: -#line 255 "../tikzit/src/data/tikzparser.y" - { - assembler->graph()->setBbox(QRectF(*(yyvsp[(3) - (6)].pt), *(yyvsp[(5) - (6)].pt))); - delete (yyvsp[(3) - (6)].pt); - delete (yyvsp[(5) - (6)].pt); - ;} - break; - - -/* Line 1267 of yacc.c. */ -#line 1719 "../tikzit/src/data/tikzparser.parser.cpp" - default: break; - } - YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); - - YYPOPSTACK (yylen); - yylen = 0; - YY_STACK_PRINT (yyss, yyssp); - - *++yyvsp = yyval; - *++yylsp = yyloc; - - /* Now `shift' the result of the reduction. Determine what state - that goes to, based on the state we popped back to and the rule - number reduced by. */ - - yyn = yyr1[yyn]; - - yystate = yypgoto[yyn - YYNTOKENS] + *yyssp; - if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp) - yystate = yytable[yystate]; - else - yystate = yydefgoto[yyn - YYNTOKENS]; - - goto yynewstate; - - -/*------------------------------------. -| yyerrlab -- here on detecting error | -`------------------------------------*/ -yyerrlab: - /* If not already recovering from an error, report this error. */ - if (!yyerrstatus) - { - ++yynerrs; -#if ! YYERROR_VERBOSE - yyerror (&yylloc, scanner, YY_("syntax error")); -#else - { - YYSIZE_T yysize = yysyntax_error (0, yystate, yychar); - if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM) - { - YYSIZE_T yyalloc = 2 * yysize; - if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM)) - yyalloc = YYSTACK_ALLOC_MAXIMUM; - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); - yymsg = (char *) YYSTACK_ALLOC (yyalloc); - if (yymsg) - yymsg_alloc = yyalloc; - else - { - yymsg = yymsgbuf; - yymsg_alloc = sizeof yymsgbuf; - } - } - - if (0 < yysize && yysize <= yymsg_alloc) - { - (void) yysyntax_error (yymsg, yystate, yychar); - yyerror (&yylloc, scanner, yymsg); - } - else - { - yyerror (&yylloc, scanner, YY_("syntax error")); - if (yysize != 0) - goto yyexhaustedlab; - } - } -#endif - } - - yyerror_range[0] = yylloc; - - if (yyerrstatus == 3) - { - /* If just tried and failed to reuse look-ahead token after an - error, discard it. */ - - if (yychar <= YYEOF) - { - /* Return failure if at end of input. */ - if (yychar == YYEOF) - YYABORT; - } - else - { - yydestruct ("Error: discarding", - yytoken, &yylval, &yylloc, scanner); - yychar = YYEMPTY; - } - } - - /* Else will try to reuse look-ahead token after shifting the error - token. */ - goto yyerrlab1; - - -/*---------------------------------------------------. -| yyerrorlab -- error raised explicitly by YYERROR. | -`---------------------------------------------------*/ -yyerrorlab: - - /* Pacify compilers like GCC when the user code never invokes - YYERROR and the label yyerrorlab therefore never appears in user - code. */ - if (/*CONSTCOND*/ 0) - goto yyerrorlab; - - yyerror_range[0] = yylsp[1-yylen]; - /* Do not reclaim the symbols of the rule which action triggered - this YYERROR. */ - YYPOPSTACK (yylen); - yylen = 0; - YY_STACK_PRINT (yyss, yyssp); - yystate = *yyssp; - goto yyerrlab1; - - -/*-------------------------------------------------------------. -| yyerrlab1 -- common code for both syntax error and YYERROR. | -`-------------------------------------------------------------*/ -yyerrlab1: - yyerrstatus = 3; /* Each real token shifted decrements this. */ - - for (;;) - { - yyn = yypact[yystate]; - if (yyn != YYPACT_NINF) - { - yyn += YYTERROR; - if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) - { - yyn = yytable[yyn]; - if (0 < yyn) - break; - } - } - - /* Pop the current state because it cannot handle the error token. */ - if (yyssp == yyss) - YYABORT; - - yyerror_range[0] = *yylsp; - yydestruct ("Error: popping", - yystos[yystate], yyvsp, yylsp, scanner); - YYPOPSTACK (1); - yystate = *yyssp; - YY_STACK_PRINT (yyss, yyssp); - } - - if (yyn == YYFINAL) - YYACCEPT; - - *++yyvsp = yylval; - - yyerror_range[1] = yylloc; - /* Using YYLLOC is tempting, but would change the location of - the look-ahead. YYLOC is available though. */ - YYLLOC_DEFAULT (yyloc, (yyerror_range - 1), 2); - *++yylsp = yyloc; - - /* Shift the error token. */ - YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); - - yystate = yyn; - goto yynewstate; - - -/*-------------------------------------. -| yyacceptlab -- YYACCEPT comes here. | -`-------------------------------------*/ -yyacceptlab: - yyresult = 0; - goto yyreturn; - -/*-----------------------------------. -| yyabortlab -- YYABORT comes here. | -`-----------------------------------*/ -yyabortlab: - yyresult = 1; - goto yyreturn; - -#ifndef yyoverflow -/*-------------------------------------------------. -| yyexhaustedlab -- memory exhaustion comes here. | -`-------------------------------------------------*/ -yyexhaustedlab: - yyerror (&yylloc, scanner, YY_("memory exhausted")); - yyresult = 2; - /* Fall through. */ -#endif - -yyreturn: - if (yychar != YYEOF && yychar != YYEMPTY) - yydestruct ("Cleanup: discarding lookahead", - yytoken, &yylval, &yylloc, scanner); - /* Do not reclaim the symbols of the rule which action triggered - this YYABORT or YYACCEPT. */ - YYPOPSTACK (yylen); - YY_STACK_PRINT (yyss, yyssp); - while (yyssp != yyss) - { - yydestruct ("Cleanup: popping", - yystos[*yyssp], yyvsp, yylsp, scanner); - YYPOPSTACK (1); - } -#ifndef yyoverflow - if (yyss != yyssa) - YYSTACK_FREE (yyss); -#endif -#if YYERROR_VERBOSE - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); -#endif - /* Make sure YYID is used. */ - return YYID (yyresult); -} - - - diff --git a/tikzit/src/data/tikzparser.parser.hpp b/tikzit/src/data/tikzparser.parser.hpp deleted file mode 100644 index aaf0e10..0000000 --- a/tikzit/src/data/tikzparser.parser.hpp +++ /dev/null @@ -1,139 +0,0 @@ -/* A Bison parser, made by GNU Bison 2.3. */ - -/* Skeleton interface for Bison's Yacc-like parsers in C - - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ - -/* As a special exception, you may create a larger work that contains - part or all of the Bison parser skeleton and distribute that work - under terms of your choice, so long as that work isn't itself a - parser generator using the skeleton or a modified version thereof - as a parser skeleton. Alternatively, if you modify or redistribute - the parser skeleton itself, you may (at your option) remove this - special exception, which will cause the skeleton and the resulting - Bison output files to be licensed under the GNU General Public - License without this special exception. - - This special exception was added by the Free Software Foundation in - version 2.2 of Bison. */ - -/* Tokens. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - BEGIN_TIKZPICTURE_CMD = 258, - END_TIKZPICTURE_CMD = 259, - BEGIN_PGFONLAYER_CMD = 260, - END_PGFONLAYER_CMD = 261, - DRAW_CMD = 262, - NODE_CMD = 263, - PATH_CMD = 264, - RECTANGLE = 265, - NODE = 266, - AT = 267, - TO = 268, - SEMICOLON = 269, - COMMA = 270, - LEFTPARENTHESIS = 271, - RIGHTPARENTHESIS = 272, - LEFTBRACKET = 273, - RIGHTBRACKET = 274, - FULLSTOP = 275, - EQUALS = 276, - COORD = 277, - PROPSTRING = 278, - REFSTRING = 279, - DELIMITEDSTRING = 280, - UNKNOWN_BEGIN_CMD = 281, - UNKNOWN_END_CMD = 282, - UNKNOWN_CMD = 283, - UNKNOWN_STR = 284, - UNCLOSED_DELIM_STR = 285 - }; -#endif -/* Tokens. */ -#define BEGIN_TIKZPICTURE_CMD 258 -#define END_TIKZPICTURE_CMD 259 -#define BEGIN_PGFONLAYER_CMD 260 -#define END_PGFONLAYER_CMD 261 -#define DRAW_CMD 262 -#define NODE_CMD 263 -#define PATH_CMD 264 -#define RECTANGLE 265 -#define NODE 266 -#define AT 267 -#define TO 268 -#define SEMICOLON 269 -#define COMMA 270 -#define LEFTPARENTHESIS 271 -#define RIGHTPARENTHESIS 272 -#define LEFTBRACKET 273 -#define RIGHTBRACKET 274 -#define FULLSTOP 275 -#define EQUALS 276 -#define COORD 277 -#define PROPSTRING 278 -#define REFSTRING 279 -#define DELIMITEDSTRING 280 -#define UNKNOWN_BEGIN_CMD 281 -#define UNKNOWN_END_CMD 282 -#define UNKNOWN_CMD 283 -#define UNKNOWN_STR 284 -#define UNCLOSED_DELIM_STR 285 - - - - -#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE -#line 43 "../tikzit/src/data/tikzparser.y" -{ - char *str; - GraphElementProperty *prop; - GraphElementData *data; - Node *node; - QPointF *pt; - struct noderef noderef; -} -/* Line 1529 of yacc.c. */ -#line 118 "../tikzit/src/data/tikzparser.parser.hpp" - YYSTYPE; -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ -# define YYSTYPE_IS_DECLARED 1 -# define YYSTYPE_IS_TRIVIAL 1 -#endif - - - -#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED -typedef struct YYLTYPE -{ - int first_line; - int first_column; - int last_line; - int last_column; -} YYLTYPE; -# define yyltype YYLTYPE /* obsolescent; will be withdrawn */ -# define YYLTYPE_IS_DECLARED 1 -# define YYLTYPE_IS_TRIVIAL 1 -#endif - - diff --git a/tikzit/src/data/tikzparser.y b/tikzit/src/data/tikzparser.y deleted file mode 100644 index 420b8a0..0000000 --- a/tikzit/src/data/tikzparser.y +++ /dev/null @@ -1,262 +0,0 @@ -%{ -/* - * Copyright 2010 Chris Heunen - * Copyright 2010-2013 Aleks Kissinger - * Copyright 2013 K. Johan Paulsson - * Copyright 2013 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "tikzparserdefs.h" -%} - -/* we use features added to bison 2.4 */ -%require "2.3" - -%error-verbose -/* enable maintaining locations for better error messages */ -%locations -/* the name of the header file */ -/*%defines "common/tikzparser.h"*/ -/* make it re-entrant (no global variables) */ -%pure-parser -/* We use a pure (re-entrant) lexer. This means yylex - will take a void* (opaque) type to maintain its state */ -%lex-param {void *scanner} -/* Since this parser is also pure, yyparse needs to take - that lexer state as an argument */ -%parse-param {void *scanner} - -/* possible data types for semantic values */ -%union { - char *str; - GraphElementProperty *prop; - GraphElementData *data; - Node *node; - QPointF *pt; - struct noderef noderef; -} - -%{ -#include "node.h" -#include "edge.h" -#include "graphelementdata.h" -#include "graphelementproperty.h" - -#include "tikzlexer.h" -#import "tikzgraphassembler.h" -/* the assembler (used by this parser) is stored in the lexer - state as "extra" data */ -#define assembler yyget_extra(scanner) - -/* pass errors off to the assembler */ -void yyerror(YYLTYPE *yylloc, void *scanner, const char *str) { - // TODO: implement reportError() - //assembler->reportError(str, yylloc); - qDebug() << "parse error: " << str; -} -%} - -/* yyloc is set up with first_column = last_column = 1 by default; - however, it makes more sense to think of us being "before the - start of the line" before we parse anything */ -%initial-action { - yylloc.first_column = yylloc.last_column = 0; -} - - -%token BEGIN_TIKZPICTURE_CMD "\\begin{tikzpicture}" -%token END_TIKZPICTURE_CMD "\\end{tikzpicture}" -%token BEGIN_PGFONLAYER_CMD "\\begin{pgfonlayer}" -%token END_PGFONLAYER_CMD "\\end{pgfonlayer}" -%token DRAW_CMD "\\draw" -%token NODE_CMD "\\node" -%token PATH_CMD "\\path" -%token RECTANGLE "rectangle" -%token NODE "node" -%token AT "at" -%token TO "to" -%token SEMICOLON ";" -%token COMMA "," - -%token LEFTPARENTHESIS "(" -%token RIGHTPARENTHESIS ")" -%token LEFTBRACKET "[" -%token RIGHTBRACKET "]" -%token FULLSTOP "." -%token EQUALS "=" -%token COORD "co-ordinate" -%token PROPSTRING "key/value string" -%token REFSTRING "string" -%token DELIMITEDSTRING "{-delimited string" - -%token UNKNOWN_BEGIN_CMD "unknown \\begin command" -%token UNKNOWN_END_CMD "unknown \\end command" -%token UNKNOWN_CMD "unknown latex command" -%token UNKNOWN_STR "unknown string" -%token UNCLOSED_DELIM_STR "unclosed {-delimited string" - -%type nodename -%type optanchor -%type val -%type property -%type extraproperties -%type properties -%type optproperties -%type optedgenode -%type noderef -%type optnoderef - -%% - -tikzpicture: "\\begin{tikzpicture}" optproperties tikzcmds "\\end{tikzpicture}" - { - if ($2) { - assembler->graph()->setData($2); - } - }; -tikzcmds: tikzcmds tikzcmd | ; -tikzcmd: node | edge | boundingbox | ignore; - -ignore: "\\begin{pgfonlayer}" DELIMITEDSTRING | "\\end{pgfonlayer}"; - -optproperties: - "[" "]" - { $$ = 0; } - | "[" properties "]" - { $$ = $2; } - | { $$ = 0; }; -properties: extraproperties property - { - $1->add(*$2); - delete $2; - $$ = $1; - }; -extraproperties: - extraproperties property "," - { - $1->add(*$2); - delete $2; - $$ = $1; - } - | { $$ = new GraphElementData(); }; -property: - val "=" val - { - GraphElementProperty *p = new GraphElementProperty(QString($1),QString($3)); - free($1); - free($3); - $$ = p; - } - | val - { - GraphElementProperty *a = new GraphElementProperty(QString($1)); - free($1); - $$ = a; - }; -val: PROPSTRING { $$ = $1; } | DELIMITEDSTRING { $$ = $1; }; - -nodename: "(" REFSTRING ")" { $$ = $2; }; -node: "\\node" optproperties nodename "at" COORD DELIMITEDSTRING ";" - { - Node *node = new Node(); - - if ($2) { - node->setData($2); - } - //qDebug() << "node name: " << $3; - node->setName(QString($3)); - node->setLabel(QString($6)); - free($3); - free($6); - - node->setPoint(*$5); - delete $5; - - assembler->graph()->addNode(node); - assembler->addNodeToMap(node); - }; - -optanchor: { $$ = 0; } | "." REFSTRING { $$ = $2; }; -noderef: "(" REFSTRING optanchor ")" - { - $$.node = assembler->nodeWithName(QString($2)); - free($2); - $$.anchor = $3; - }; -optnoderef: - noderef { $$ = $1; } - | "(" ")" { $$.node = 0; $$.anchor = 0; } -optedgenode: - { $$ = 0; } - | "node" optproperties DELIMITEDSTRING - { - $$ = new Node(); - if ($2) - $$->setData($2); - $$->setLabel(QString($3)); - free($3); - } -edge: "\\draw" optproperties noderef "to" optedgenode optnoderef ";" - { - Node *s; - Node *t; - - s = $3.node; - - if ($6.node) { - t = $6.node; - } else { - t = s; - } - - Edge *edge = new Edge(s, t); - if ($2) { - edge->setData($2); - edge->setAttributesFromData(); - } - - if ($5) - edge->setEdgeNode($5); - if ($3.anchor) { - edge->setSourceAnchor(QString($3.anchor)); - free($3.anchor); - } - - if ($6.node) { - if ($6.anchor) { - edge->setTargetAnchor(QString($6.anchor)); - free($6.anchor); - } - } else { - edge->setTargetAnchor(edge->sourceAnchor()); - } - - assembler->graph()->addEdge(edge); - }; - -ignoreprop: val | val "=" val; -ignoreprops: ignoreprop ignoreprops | ; -optignoreprops: "[" ignoreprops "]"; -boundingbox: - "\\path" optignoreprops COORD "rectangle" COORD ";" - { - assembler->graph()->setBbox(QRectF(*$3, *$5)); - delete $3; - delete $5; - }; - -/* vi:ft=yacc:noet:ts=4:sts=4:sw=4 -*/ diff --git a/tikzit/src/data/tikzparserdefs.h b/tikzit/src/data/tikzparserdefs.h deleted file mode 100644 index 9d4bfe8..0000000 --- a/tikzit/src/data/tikzparserdefs.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef TIKZPARSERDEFS_H -#define TIKZPARSERDEFS_H - -#include "graphelementproperty.h" -#include "graphelementdata.h" -#include "node.h" -#include "tikzgraphassembler.h" - -#include -#include -#include - -struct noderef { - Node *node; - char *anchor; -}; - -#endif // TIKZPARSERDEFS_H diff --git a/tikzit/src/gui/commands.cpp b/tikzit/src/gui/commands.cpp deleted file mode 100644 index e69de29..0000000 diff --git a/tikzit/src/gui/commands.h b/tikzit/src/gui/commands.h deleted file mode 100644 index 73bfaa7..0000000 --- a/tikzit/src/gui/commands.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef COMMANDS_H -#define COMMANDS_H - -#endif // COMMANDS_H diff --git a/tikzit/src/gui/edgeitem.cpp b/tikzit/src/gui/edgeitem.cpp deleted file mode 100644 index 497fa07..0000000 --- a/tikzit/src/gui/edgeitem.cpp +++ /dev/null @@ -1,131 +0,0 @@ -#include "tikzit.h" -#include "edgeitem.h" - -#include -#include - -EdgeItem::EdgeItem(Edge *edge) -{ - _edge = edge; - setFlag(QGraphicsItem::ItemIsSelectable); - - QPen pen(Qt::black); - pen.setWidth(2); - setPen(pen); - _cp1Item = new QGraphicsEllipseItem(this); - _cp1Item->setParentItem(this); - _cp1Item->setRect(GLOBAL_SCALEF * (-0.05), GLOBAL_SCALEF * (-0.05), - GLOBAL_SCALEF * 0.1, GLOBAL_SCALEF * 0.1); - _cp1Item->setVisible(false); - - _cp2Item = new QGraphicsEllipseItem(this); - _cp2Item->setParentItem(this); - _cp2Item->setRect(GLOBAL_SCALEF * (-0.05), GLOBAL_SCALEF * (-0.05), - GLOBAL_SCALEF * 0.1, GLOBAL_SCALEF * 0.1); - _cp2Item->setVisible(false); - - readPos(); -} - -void EdgeItem::readPos() -{ - //_edge->setAttributesFromData(); - _edge->updateControls(); - QPainterPath path; - - path.moveTo (toScreen(_edge->tail())); - path.cubicTo(toScreen(_edge->cp1()), - toScreen(_edge->cp2()), - toScreen(_edge->head())); - setPath(path); - - _cp1Item->setPos(toScreen(_edge->cp1())); - _cp2Item->setPos(toScreen(_edge->cp2())); -} - -void EdgeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) -{ - //QGraphicsPathItem::paint(painter, option, widget); - painter->setPen(pen()); - painter->setBrush(Qt::NoBrush); - painter->drawPath(path()); - - if (isSelected()) { - QColor draw; - QColor draw1; - QColor fill; - - if (_edge->basicBendMode()) { - draw = Qt::blue; - draw1 = QColor(100,100,255,100); - fill = QColor(200,200,255,50); - } else { - draw = Qt::darkGreen; - draw1 = QColor(0, 150, 0, 50); - fill = QColor(200,255,200,150); - } - - painter->setPen(QPen(draw1)); - - float r = GLOBAL_SCALEF * _edge->cpDist(); - painter->drawEllipse(toScreen(_edge->source()->point()), r, r); - painter->drawEllipse(toScreen(_edge->target()->point()), r, r); - - painter->setPen(QPen(draw)); - painter->setBrush(QBrush(fill)); - - painter->drawLine(toScreen(_edge->tail()), toScreen(_edge->cp1())); - painter->drawLine(toScreen(_edge->head()), toScreen(_edge->cp2())); - - //painter->drawEllipse(toScreen(_edge->cp1()), r, r); - //painter->drawEllipse(toScreen(_edge->cp2()), r, r); - - _cp1Item->setPen(QPen(draw)); - _cp1Item->setBrush(QBrush(fill)); - _cp1Item->setVisible(true); - - _cp2Item->setPen(QPen(draw)); - _cp2Item->setBrush(QBrush(fill)); - _cp2Item->setVisible(true); - - r = GLOBAL_SCALEF * 0.05; - painter->setPen(QPen(Qt::black)); - painter->setBrush(QBrush(QColor(255,255,255,200))); - painter->drawEllipse(toScreen(_edge->mid()), r, r); - } else { - _cp1Item->setVisible(false); - _cp2Item->setVisible(false); - } -} - -QRectF EdgeItem::boundingRect() const -{ - float r = GLOBAL_SCALEF * (_edge->cpDist() + 0.2); - return shape().boundingRect().adjusted(-r,-r,r,r); -} - -QPainterPath EdgeItem::shape() const -{ - // get the shape of the edge, and expand a bit to make selection easier - QPainterPath oldShape = QGraphicsPathItem::shape(); - QPainterPathStroker stroker; - stroker.setWidth(5); - stroker.setJoinStyle(Qt::MiterJoin); - QPainterPath newShape = (stroker.createStroke(oldShape) + oldShape).simplified(); - return newShape; -} - -Edge *EdgeItem::edge() const -{ - return _edge; -} - -QGraphicsEllipseItem *EdgeItem::cp1Item() const -{ - return _cp1Item; -} - -QGraphicsEllipseItem *EdgeItem::cp2Item() const -{ - return _cp2Item; -} diff --git a/tikzit/src/gui/edgeitem.h b/tikzit/src/gui/edgeitem.h deleted file mode 100644 index b017265..0000000 --- a/tikzit/src/gui/edgeitem.h +++ /dev/null @@ -1,36 +0,0 @@ -/** - * A QGraphicsItem that handles drawing a single edge. - */ - -#ifndef EDGEITEM_H -#define EDGEITEM_H - -#include "edge.h" - -#include -#include -#include -#include -#include -#include - -class EdgeItem : public QGraphicsPathItem -{ -public: - EdgeItem(Edge *edge); - void readPos(); - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget); - QRectF boundingRect() const; - QPainterPath shape() const; - Edge *edge() const; - QGraphicsEllipseItem *cp1Item() const; - QGraphicsEllipseItem *cp2Item() const; - -private: - Edge *_edge; - QGraphicsEllipseItem *_cp1Item; - QGraphicsEllipseItem *_cp2Item; -}; - -#endif // EDGEITEM_H diff --git a/tikzit/src/gui/mainmenu.cpp b/tikzit/src/gui/mainmenu.cpp deleted file mode 100644 index c9e83ba..0000000 --- a/tikzit/src/gui/mainmenu.cpp +++ /dev/null @@ -1,96 +0,0 @@ -#include "mainmenu.h" -#include "tikzit.h" - -MainMenu::MainMenu() -{ - ui.setupUi(this); -} - -// File -void MainMenu::on_actionNew_triggered() -{ - tikzit->newDoc(); -} - -void MainMenu::on_actionOpen_triggered() -{ - tikzit->open(); -} - -void MainMenu::on_actionClose_triggered() -{ - // TODO -} - -void MainMenu::on_actionSave_triggered() -{ - // TODO -} - -void MainMenu::on_actionSave_As_triggered() -{ - // TODO -} - - -// Edit -void MainMenu::on_actionUndo_triggered() -{ - if (tikzit->activeWindow() != 0) - tikzit->activeWindow()->tikzDocument()->undoStack()->undo(); -} - -void MainMenu::on_actionRedo_triggered() -{ - if (tikzit->activeWindow() != 0) - tikzit->activeWindow()->tikzDocument()->undoStack()->redo(); -} - -void MainMenu::on_actionCut_triggered() -{ - // TODO -} - -void MainMenu::on_actionCopy_triggered() -{ - // TODO -} - -void MainMenu::on_actionPaste_triggered() -{ - // TODO -} - -void MainMenu::on_actionDelete_triggered() -{ - // TODO -} - -void MainMenu::on_actionSelect_All_triggered() -{ - // TODO -} - -void MainMenu::on_actionDeselect_All_triggered() -{ - // TODO -} - - -// Tikz -void MainMenu::on_actionParse_triggered() -{ - // TODO -} - - -// View -void MainMenu::on_actionZoom_In_triggered() -{ - if (tikzit->activeWindow() != 0) tikzit->activeWindow()->tikzView()->zoomIn(); -} - -void MainMenu::on_actionZoom_Out_triggered() -{ - if (tikzit->activeWindow() != 0) tikzit->activeWindow()->tikzView()->zoomOut(); -} diff --git a/tikzit/src/gui/mainmenu.h b/tikzit/src/gui/mainmenu.h deleted file mode 100644 index d85e271..0000000 --- a/tikzit/src/gui/mainmenu.h +++ /dev/null @@ -1,43 +0,0 @@ -#ifndef MAINMENU_H -#define MAINMENU_H - -#include "ui_mainmenu.h" - -#include - -class MainMenu : public QMenuBar -{ - Q_OBJECT -public: - MainMenu(); - -private: - Ui::MainMenu ui; - -public slots: - // File - void on_actionNew_triggered(); - void on_actionOpen_triggered(); - void on_actionClose_triggered(); - void on_actionSave_triggered(); - void on_actionSave_As_triggered(); - - // Edit - void on_actionUndo_triggered(); - void on_actionRedo_triggered(); - void on_actionCut_triggered(); - void on_actionCopy_triggered(); - void on_actionPaste_triggered(); - void on_actionDelete_triggered(); - void on_actionSelect_All_triggered(); - void on_actionDeselect_All_triggered(); - - // Tikz - void on_actionParse_triggered(); - - // View - void on_actionZoom_In_triggered(); - void on_actionZoom_Out_triggered(); -}; - -#endif // MAINMENU_H diff --git a/tikzit/src/gui/mainmenu.ui b/tikzit/src/gui/mainmenu.ui deleted file mode 100644 index c9b6f44..0000000 --- a/tikzit/src/gui/mainmenu.ui +++ /dev/null @@ -1,187 +0,0 @@ - - - MainMenu - - - - 0 - 0 - 476 - 22 - - - - - File - - - - - - - - - - - Edit - - - - - - - - - - - - - - - Tikz - - - - - - View - - - - - - - New... - - - Ctrl+N - - - - - Open... - - - Ctrl+O - - - - - Close - - - Ctrl+W - - - - - Save - - - Ctrl+S - - - - - Save As... - - - Ctrl+Shift+S - - - - - Undo - - - Ctrl+Z - - - - - Redo - - - Ctrl+Shift+Z - - - - - Cut - - - Ctrl+X - - - - - Copy - - - Ctrl+C - - - - - Paste - - - Ctrl+V - - - - - Delete - - - Backspace - - - - - Select All - - - Ctrl+A - - - - - Deselect All - - - Ctrl+D - - - - - Parse - - - Ctrl+T - - - - - Zoom In - - - Ctrl+= - - - - - Zoom Out - - - Ctrl+- - - - - - - - - - - diff --git a/tikzit/src/gui/mainwindow.cpp b/tikzit/src/gui/mainwindow.cpp deleted file mode 100644 index 19b6a59..0000000 --- a/tikzit/src/gui/mainwindow.cpp +++ /dev/null @@ -1,99 +0,0 @@ -#include "mainwindow.h" -#include "ui_mainwindow.h" -#include "tikzgraphassembler.h" -#include "toolpalette.h" -#include "tikzit.h" - -#include -#include -#include -#include -#include -#include - -int MainWindow::_numWindows = 0; - -MainWindow::MainWindow(QWidget *parent) : - QMainWindow(parent), - ui(new Ui::MainWindow) -{ - _windowId = _numWindows; - _numWindows++; - ui->setupUi(this); - setAttribute(Qt::WA_DeleteOnClose, true); - _tikzDocument = new TikzDocument(this); - _tikzScene = new TikzScene(_tikzDocument, this); - ui->tikzView->setScene(_tikzScene); - _fileName = ""; - _pristine = true; - - // initially, the source view should be collapsed - QList sz = ui->splitter->sizes(); - sz[0] = sz[0] + sz[1]; - sz[1] = 0; - ui->splitter->setSizes(sz); -} - -MainWindow::~MainWindow() -{ - tikzit->removeWindow(this); - delete ui; -} - -void MainWindow::open(QString fileName) -{ - _pristine = false; - _tikzDocument->open(fileName); - ui->tikzSource->setText(_tikzDocument->tikz()); - - - if (_tikzDocument->parseSuccess()) { - statusBar()->showMessage("TiKZ parsed successfully", 2000); - setWindowTitle("TiKZiT - " + _tikzDocument->shortName()); - _tikzScene->setTikzDocument(_tikzDocument); - } else { - statusBar()->showMessage("Cannot read TiKZ source"); - } - -} - -void MainWindow::closeEvent(QCloseEvent *event) -{ - //qDebug() << "got close event"; - QMainWindow::closeEvent(event); -} - -void MainWindow::changeEvent(QEvent *event) -{ - if (event->type() == QEvent::ActivationChange && isActiveWindow()) { - tikzit->setActiveWindow(this); - } - QMainWindow::changeEvent(event); -} - -TikzDocument *MainWindow::tikzDocument() const -{ - return _tikzDocument; -} - -TikzScene *MainWindow::tikzScene() const -{ - return _tikzScene; -} - -int MainWindow::windowId() const -{ - return _windowId; -} - -TikzView *MainWindow::tikzView() const -{ - return ui->tikzView; -} - -bool MainWindow::pristine() const -{ - return _pristine; -} - - diff --git a/tikzit/src/gui/mainwindow.h b/tikzit/src/gui/mainwindow.h deleted file mode 100644 index f27677a..0000000 --- a/tikzit/src/gui/mainwindow.h +++ /dev/null @@ -1,48 +0,0 @@ -/** - * A top-level window, which contains a single TikzDocument. - */ - -#ifndef MAINWINDOW_H -#define MAINWINDOW_H - -#include "tikzscene.h" -#include "tikzview.h" -#include "graph.h" -#include "tikzdocument.h" - -#include -#include - -namespace Ui { -class MainWindow; -} - -class MainWindow : public QMainWindow -{ - Q_OBJECT - -public: - explicit MainWindow(QWidget *parent = 0); - ~MainWindow(); - - void open(QString fileName); - bool pristine() const; - int windowId() const; - TikzView *tikzView() const; - TikzScene *tikzScene() const; - TikzDocument *tikzDocument() const; - -protected: - void closeEvent(QCloseEvent *event); - void changeEvent(QEvent *event); -private: - TikzScene *_tikzScene; - TikzDocument *_tikzDocument; - Ui::MainWindow *ui; - QString _fileName; - bool _pristine; - int _windowId; - static int _numWindows; -}; - -#endif // MAINWINDOW_H diff --git a/tikzit/src/gui/mainwindow.ui b/tikzit/src/gui/mainwindow.ui deleted file mode 100644 index 56a5c2d..0000000 --- a/tikzit/src/gui/mainwindow.ui +++ /dev/null @@ -1,199 +0,0 @@ - - - MainWindow - - - - 0 - 0 - 640 - 480 - - - - TikZiT - untitled - - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Qt::Vertical - - - - - - Courier New - 10 - - - - QTextEdit::NoWrap - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Courier New'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'.SF NS Text'; font-size:13pt;"><br /></p></body></html> - - - 20 - - - - - - - - - - New... - - - - - Open... - - - - - Close - - - - - Save - - - - - Save As... - - - - - Undo - - - - - Redo - - - - - Cut - - - - - Copy - - - - - Paste - - - - - Delete - - - - - Select All - - - - - Deselect All - - - - - Parse - - - Ctrl+T - - - - - Zoom In - - - Ctrl+= - - - - - Zoom Out - - - Ctrl+- - - - - - - - TikzView - QGraphicsView -
tikzview.h
- - zoomIn() - zoomOut() - - - - - - - actionZoom_In - triggered() - tikzView - zoomIn() - - - -1 - -1 - - - 237 - 103 - - - - - actionZoom_Out - triggered() - tikzView - zoomOut() - - - -1 - -1 - - - 237 - 103 - - - - - diff --git a/tikzit/src/gui/nodeitem.cpp b/tikzit/src/gui/nodeitem.cpp deleted file mode 100644 index 71226f3..0000000 --- a/tikzit/src/gui/nodeitem.cpp +++ /dev/null @@ -1,124 +0,0 @@ -#include "tikzit.h" -#include "nodeitem.h" -#include "tikzscene.h" -#include - -#include -#include -#include -#include -#include -#include -#include - -NodeItem::NodeItem(Node *node) -{ - _node = node; - setFlag(QGraphicsItem::ItemIsSelectable); - setFlag(QGraphicsItem::ItemIsMovable); - setFlag(QGraphicsItem::ItemSendsGeometryChanges); - readPos(); -} - -void NodeItem::readPos() -{ - setPos(toScreen(_node->point())); -} - -void NodeItem::writePos() -{ - _node->setPoint(fromScreen(pos())); -} - -QRectF NodeItem::labelRect() const { - QString label = _node->label(); - //QFont f("Courier", 9); - QFontMetrics fm(Tikzit::LABEL_FONT); - - QRectF rect = fm.boundingRect(label); - //rect.adjust(-2,-2,2,2); - rect.moveCenter(QPointF(0,0)); - return rect; -} - -void NodeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) -{ - if (_node->style()->isNone()) { - QColor c(180,180,200); - painter->setPen(QPen(c)); - painter->setBrush(QBrush(c)); - painter->drawEllipse(QPointF(0,0), 1,1); - - QPen pen(QColor(180,180,220)); - QVector p; - p << 2.0 << 2.0; - pen.setDashPattern(p); - painter->setPen(pen); - painter->setBrush(Qt::NoBrush); - painter->drawPath(shape()); - } else { - QPen pen(_node->style()->strokeColor); - pen.setWidth(_node->style()->strokeThickness); - painter->setPen(pen); - painter->setBrush(QBrush(_node->style()->fillColor)); - painter->drawPath(shape()); - } - - if (_node->label() != "") { - QRectF rect = labelRect(); - QPen pen(QColor(200,0,0,120)); - QVector d; - d << 2.0 << 2.0; - pen.setDashPattern(d); - painter->setPen(pen); - painter->setBrush(QBrush(QColor(255,255,100,120))); - painter->drawRect(rect); - - painter->setPen(QPen(Qt::black)); - painter->setFont(Tikzit::LABEL_FONT); - painter->drawText(rect, Qt::AlignCenter, _node->label()); - } - - if (isSelected()) { - QPainterPath sh = shape(); - QPainterPathStroker stroker; - stroker.setWidth(4); - QPainterPath outline = (stroker.createStroke(sh) + sh).simplified(); - painter->setPen(Qt::NoPen); - painter->setBrush(QBrush(QColor(150,200,255,100))); - painter->drawPath(outline); - } - -} - -QPainterPath NodeItem::shape() const -{ - QPainterPath path; - path.addEllipse(QPointF(0,0), GLOBAL_SCALEF * 0.1, GLOBAL_SCALEF * 0.1); - return path; -} - -QRectF NodeItem::boundingRect() const -{ - QRectF r = labelRect(); - return r.united(shape().boundingRect()).adjusted(-4,-4,4,4); -} - -Node *NodeItem::node() const -{ - return _node; -} - -QVariant NodeItem::itemChange(GraphicsItemChange change, const QVariant &value) -{ - if (change == ItemPositionChange) { - QPointF newPos = value.toPointF(); - int gridSize = GLOBAL_SCALE / 8; - QPointF gridPos(round(newPos.x()/gridSize)*gridSize, round(newPos.y()/gridSize)*gridSize); - _node->setPoint(fromScreen(gridPos)); - - return gridPos; - } else { - return QGraphicsItem::itemChange(change, value); - } -} diff --git a/tikzit/src/gui/nodeitem.h b/tikzit/src/gui/nodeitem.h deleted file mode 100644 index 9a3edb0..0000000 --- a/tikzit/src/gui/nodeitem.h +++ /dev/null @@ -1,32 +0,0 @@ -/** - * A QGraphicsItem that handles drawing a single node. - */ - -#ifndef NODEITEM_H -#define NODEITEM_H - -#include "node.h" - -#include -#include -#include -#include - -class NodeItem : public QGraphicsItem -{ -public: - NodeItem(Node *node); - void readPos(); - void writePos(); - void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *); - QVariant itemChange(GraphicsItemChange change, const QVariant &value); - QPainterPath shape() const; - QRectF boundingRect() const; - Node *node() const; - -private: - Node *_node; - QRectF labelRect() const; -}; - -#endif // NODEITEM_H diff --git a/tikzit/src/gui/propertypalette.cpp b/tikzit/src/gui/propertypalette.cpp deleted file mode 100644 index 5fc763f..0000000 --- a/tikzit/src/gui/propertypalette.cpp +++ /dev/null @@ -1,43 +0,0 @@ -#include "propertypalette.h" -#include "graphelementdata.h" -#include "ui_propertypalette.h" - -#include -#include -#include -#include - -PropertyPalette::PropertyPalette(QWidget *parent) : - QDockWidget(parent), - ui(new Ui::PropertyPalette) -{ - setWindowFlags(Qt::Window - | Qt::CustomizeWindowHint - | Qt::WindowTitleHint); - //setFocusPolicy(Qt::NoFocus); - ui->setupUi(this); - GraphElementData *d = new GraphElementData(); - d->setProperty("key 1", "value 1"); - d->setAtom("atom 1"); - d->setProperty("key 2", "value 2"); - - QModelIndex i = d->index(0,0); - ui->treeView->setModel(d); - - QSettings settings("tikzit", "tikzit"); - QVariant geom = settings.value("property-palette-geometry"); - if (geom != QVariant()) { - restoreGeometry(geom.toByteArray()); - } -} - -PropertyPalette::~PropertyPalette() -{ - delete ui; -} - -void PropertyPalette::closeEvent(QCloseEvent *event) { - QSettings settings("tikzit", "tikzit"); - settings.setValue("property-palette-geometry", saveGeometry()); - QDockWidget::closeEvent(event); -} diff --git a/tikzit/src/gui/propertypalette.h b/tikzit/src/gui/propertypalette.h deleted file mode 100644 index 7910d70..0000000 --- a/tikzit/src/gui/propertypalette.h +++ /dev/null @@ -1,28 +0,0 @@ -/** - * Enables the user to edit properties of the graph, as well as the selected node/edge. - */ - -#ifndef PROPERTYPALETTE_H -#define PROPERTYPALETTE_H - -#include - -namespace Ui { -class PropertyPalette; -} - -class PropertyPalette : public QDockWidget -{ - Q_OBJECT - -public: - explicit PropertyPalette(QWidget *parent = 0); - ~PropertyPalette(); - -protected: - void closeEvent(QCloseEvent *event); -private: - Ui::PropertyPalette *ui; -}; - -#endif // PROPERTYPALETTE_H diff --git a/tikzit/src/gui/propertypalette.ui b/tikzit/src/gui/propertypalette.ui deleted file mode 100644 index 83d586e..0000000 --- a/tikzit/src/gui/propertypalette.ui +++ /dev/null @@ -1,30 +0,0 @@ - - - PropertyPalette - - - - 0 - 0 - 194 - 341 - - - - Properties - - - - - - - 0 - - - - - - - - - diff --git a/tikzit/src/gui/tikzscene.cpp b/tikzit/src/gui/tikzscene.cpp deleted file mode 100644 index 3431c0c..0000000 --- a/tikzit/src/gui/tikzscene.cpp +++ /dev/null @@ -1,384 +0,0 @@ -#include "tikzit.h" -#include "util.h" -#include "tikzscene.h" -#include "undocommands.h" - -#include -#include -#include - - -TikzScene::TikzScene(TikzDocument *tikzDocument, QObject *parent) : - QGraphicsScene(parent), _tikzDocument(tikzDocument) -{ - _modifyEdgeItem = 0; - _drawEdgeItem = new QGraphicsLineItem(); - setSceneRect(-310,-230,620,450); - - QPen pen; - pen.setColor(QColor::fromRgbF(0.5f, 0.0f, 0.5f)); - pen.setWidth(3); - _drawEdgeItem->setPen(pen); - _drawEdgeItem->setLine(0,0,0,0); - _drawEdgeItem->setVisible(false); - addItem(_drawEdgeItem); -} - -TikzScene::~TikzScene() { -} - -Graph *TikzScene::graph() -{ - return _tikzDocument->graph(); -} - -void TikzScene::graphReplaced() -{ - foreach (NodeItem *ni, _nodeItems) { - removeItem(ni); - delete ni; - } - _nodeItems.clear(); - - foreach (EdgeItem *ei, _edgeItems) { - removeItem(ei); - delete ei; - } - _edgeItems.clear(); - - foreach (Edge *e, graph()->edges()) { - EdgeItem *ei = new EdgeItem(e); - _edgeItems.insert(e, ei); - addItem(ei); - } - - foreach (Node *n, graph()->nodes()) { - NodeItem *ni = new NodeItem(n); - _nodeItems.insert(n, ni); - addItem(ni); - } -} - -void TikzScene::mousePressEvent(QGraphicsSceneMouseEvent *event) -{ - // current mouse position, in scene coordinates - QPointF mousePos = event->scenePos(); - - // disable rubber band drag, which will clear the selection. Only re-enable it - // for the SELECT tool, and when no control point has been clicked. - views()[0]->setDragMode(QGraphicsView::NoDrag); - - // radius of a control point for bezier edges, in scene coordinates - qreal cpR = GLOBAL_SCALEF * (0.05); - qreal cpR2 = cpR * cpR; - - switch (tikzit->toolPalette()->currentTool()) { - case ToolPalette::SELECT: - // check if we grabbed a control point of an edge - foreach (QGraphicsItem *gi, selectedItems()) { - if (EdgeItem *ei = dynamic_cast(gi)) { - qreal dx, dy; - - dx = ei->cp1Item()->pos().x() - mousePos.x(); - dy = ei->cp1Item()->pos().y() - mousePos.y(); - - if (dx*dx + dy*dy <= cpR2) { - _modifyEdgeItem = ei; - _firstControlPoint = true; - break; - } - - dx = ei->cp2Item()->pos().x() - mousePos.x(); - dy = ei->cp2Item()->pos().y() - mousePos.y(); - - if (dx*dx + dy*dy <= cpR2) { - _modifyEdgeItem = ei; - _firstControlPoint = false; - break; - } - } - } - - if (_modifyEdgeItem != 0) { - // store for undo purposes - Edge *e = _modifyEdgeItem->edge(); - _oldBend = e->bend(); - _oldInAngle = e->inAngle(); - _oldOutAngle = e->outAngle(); - _oldWeight = e->weight(); - } else { - // since we are not dragging a control point, process the click normally - views()[0]->setDragMode(QGraphicsView::RubberBandDrag); - QGraphicsScene::mousePressEvent(event); - - // save current node positions for undo support - _oldNodePositions.clear(); - foreach (QGraphicsItem *gi, selectedItems()) { - if (NodeItem *ni = dynamic_cast(gi)) { - _oldNodePositions.insert(ni->node(), ni->node()->point()); - } - } - } - - break; - case ToolPalette::VERTEX: - break; - case ToolPalette::EDGE: - break; - case ToolPalette::CROP: - break; - } -} - -void TikzScene::mouseMoveEvent(QGraphicsSceneMouseEvent *event) -{ - // current mouse position, in scene coordinates - QPointF mousePos = event->scenePos(); - - switch (tikzit->toolPalette()->currentTool()) { - case ToolPalette::SELECT: - if (_modifyEdgeItem != 0) { - Edge *e = _modifyEdgeItem->edge(); - - // dragging a control point - QPointF src = toScreen(e->source()->point()); - QPointF targ = toScreen(e->target()->point()); - float dx1 = targ.x() - src.x(); - float dy1 = targ.y() - src.y(); - float dx2, dy2; - if (_firstControlPoint) { - dx2 = mousePos.x() - src.x(); - dy2 = mousePos.y() - src.y(); - } else { - dx2 = mousePos.x() - targ.x(); - dy2 = mousePos.y() - targ.y(); - } - - float baseDist = sqrt(dx1*dx1 + dy1*dy1); - float handleDist = sqrt(dx2*dx2 + dy2*dy2); - float wcoarseness = 0.1f; - - if (!e->isSelfLoop()) { - if (baseDist != 0) { - e->setWeight(roundToNearest(wcoarseness, handleDist/baseDist)); - } else { - e->setWeight(roundToNearest(wcoarseness, handleDist/GLOBAL_SCALEF)); - } - } - - float control_angle = atan2(-dy2, dx2); - - int bcoarseness = 15; - - if(e->basicBendMode()) { - float bnd; - float base_angle = atan2(-dy1, dx1); - if (_firstControlPoint) { - bnd = base_angle - control_angle; - } else { - bnd = control_angle - base_angle + M_PI; - if (bnd > M_PI) bnd -= 2*M_PI; - } - - e->setBend(round(bnd * (180.0f / M_PI) * (1.0f / (float)bcoarseness)) * bcoarseness); - - } else { - int bnd = round(control_angle * (180.0f / M_PI) * - (1.0f / (float)bcoarseness)) * - bcoarseness; - if (_firstControlPoint) { - // TODO: enable moving both control points -// if ([theEvent modifierFlags] & NSAlternateKeyMask) { -// if ([modifyEdge isSelfLoop]) { -// [modifyEdge setInAngle:[modifyEdge inAngle] + -// (bnd - [modifyEdge outAngle])]; -// } else { -// [modifyEdge setInAngle:[modifyEdge inAngle] - -// (bnd - [modifyEdge outAngle])]; -// } -// } - - e->setOutAngle(bnd); - } else { -// if (theEvent.modifierFlags & NSAlternateKeyMask) { -// if ([modifyEdge isSelfLoop]) { -// [modifyEdge setOutAngle:[modifyEdge outAngle] + -// (bnd - [modifyEdge inAngle])]; -// } else { -// [modifyEdge setOutAngle:[modifyEdge outAngle] - -// (bnd - [modifyEdge inAngle])]; -// } -// } - - e->setInAngle(bnd); - } - } - - _modifyEdgeItem->readPos(); - - } else { - // otherwise, process mouse move normally - QGraphicsScene::mouseMoveEvent(event); - refreshAdjacentEdges(_oldNodePositions.keys()); - } - - break; - case ToolPalette::VERTEX: - break; - case ToolPalette::EDGE: - break; - case ToolPalette::CROP: - break; - } -} - -void TikzScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) -{ - // current mouse position, in scene coordinates - QPointF mousePos = event->scenePos(); - - switch (tikzit->toolPalette()->currentTool()) { - case ToolPalette::SELECT: - if (_modifyEdgeItem != 0) { - // finished dragging a control point - Edge *e = _modifyEdgeItem->edge(); - - if (_oldWeight != e->weight() || - _oldBend != e->bend() || - _oldInAngle != e->inAngle() || - _oldOutAngle != e->outAngle()) - { - EdgeBendCommand *cmd = new EdgeBendCommand(this, e, _oldWeight, _oldBend, _oldInAngle, _oldOutAngle); - _tikzDocument->undoStack()->push(cmd); - } - - _modifyEdgeItem = 0; - } else { - // otherwise, process mouse move normally - QGraphicsScene::mouseReleaseEvent(event); - - if (!_oldNodePositions.empty()) { - QMap newNodePositions; - - foreach (QGraphicsItem *gi, selectedItems()) { - if (NodeItem *ni = dynamic_cast(gi)) { - ni->writePos(); - newNodePositions.insert(ni->node(), ni->node()->point()); - } - } - - //qDebug() << _oldNodePositions; - //qDebug() << newNodePositions; - - _tikzDocument->undoStack()->push(new MoveCommand(this, _oldNodePositions, newNodePositions)); - _oldNodePositions.clear(); - } - } - - break; - case ToolPalette::VERTEX: - { - int gridSize = GLOBAL_SCALE / 8; - QPointF gridPos(round(mousePos.x()/gridSize)*gridSize, round(mousePos.y()/gridSize)*gridSize); - Node *n = new Node(); - n->setPoint(fromScreen(gridPos)); - - QRectF grow(gridPos.x() - GLOBAL_SCALEF, gridPos.y() - GLOBAL_SCALEF, 2 * GLOBAL_SCALEF, 2 * GLOBAL_SCALEF); - QRectF newBounds = sceneRect().united(grow); - qDebug() << grow; - qDebug() << newBounds; - - AddNodeCommand *cmd = new AddNodeCommand(this, n, newBounds); - _tikzDocument->undoStack()->push(cmd); - } - break; - case ToolPalette::EDGE: - break; - case ToolPalette::CROP: - break; - } -} - -void TikzScene::keyReleaseEvent(QKeyEvent *event) -{ - if (event->key() == Qt::Key_Backspace || event->key() == Qt::Key_Delete) { - QSet selNodes; - QSet selEdges; - getSelection(selNodes, selEdges); - - QMap deleteNodes; - QMap deleteEdges; - - for (int i = 0; i < _tikzDocument->graph()->nodes().length(); ++i) { - Node *n = _tikzDocument->graph()->nodes()[i]; - if (selNodes.contains(n)) deleteNodes.insert(i, n); - } - - for (int i = 0; i < _tikzDocument->graph()->edges().length(); ++i) { - Edge *e = _tikzDocument->graph()->edges()[i]; - if (selEdges.contains(e) || - selNodes.contains(e->source()) || - selNodes.contains(e->target())) deleteEdges.insert(i, e); - } - - //qDebug() << "nodes:" << deleteNodes; - //qDebug() << "edges:" << deleteEdges; - DeleteCommand *cmd = new DeleteCommand(this, deleteNodes, deleteEdges, selEdges); - _tikzDocument->undoStack()->push(cmd); - } -} - -void TikzScene::getSelection(QSet &selNodes, QSet &selEdges) -{ - foreach (QGraphicsItem *gi, selectedItems()) { - if (NodeItem *ni = dynamic_cast(gi)) selNodes << ni->node(); - if (EdgeItem *ei = dynamic_cast(gi)) selEdges << ei->edge(); - } -} - - -TikzDocument *TikzScene::tikzDocument() const -{ - return _tikzDocument; -} - -void TikzScene::setTikzDocument(TikzDocument *tikzDocument) -{ - _tikzDocument = tikzDocument; - graphReplaced(); -} - -void TikzScene::refreshAdjacentEdges(QList nodes) -{ - if (nodes.empty()) return; - foreach (EdgeItem *ei, _edgeItems) { - if (nodes.contains(ei->edge()->source()) || nodes.contains(ei->edge()->target())) { - ei->edge()->updateControls(); - ei->readPos(); - } - } -} - -void TikzScene::setBounds(QRectF bounds) -{ - if (bounds != sceneRect()) { - if (!views().empty()) { - QGraphicsView *v = views().first(); - QPointF c = v->mapToScene(v->viewport()->rect().center()); - setSceneRect(bounds); - v->centerOn(c); - } else { - setSceneRect(bounds); - } - } -} - -QMap &TikzScene::nodeItems() -{ - return _nodeItems; -} - -QMap &TikzScene::edgeItems() -{ - return _edgeItems; -} diff --git a/tikzit/src/gui/tikzscene.h b/tikzit/src/gui/tikzscene.h deleted file mode 100644 index 6817792..0000000 --- a/tikzit/src/gui/tikzscene.h +++ /dev/null @@ -1,62 +0,0 @@ -/** - * Manage the scene, which contains a single Graph, and respond to user input. This serves as - * the controller for the MVC (TikzDocument, TikzView, TikzScene). - */ - -#ifndef TIKZSCENE_H -#define TIKZSCENE_H - -#include "graph.h" -#include "nodeitem.h" -#include "edgeitem.h" -#include "tikzdocument.h" - -#include -#include -#include -#include -#include -#include -#include - -class TikzScene : public QGraphicsScene -{ - Q_OBJECT -public: - TikzScene(TikzDocument *tikzDocument, QObject *parent); - ~TikzScene(); - Graph *graph(); - QMap &nodeItems(); - QMap &edgeItems(); - void refreshAdjacentEdges(QList nodes); - void setBounds(QRectF bounds); - - TikzDocument *tikzDocument() const; - void setTikzDocument(TikzDocument *tikzDocument); - -public slots: - void graphReplaced(); - -protected: - void mousePressEvent(QGraphicsSceneMouseEvent *event) override; - void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override; - void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; - void keyReleaseEvent(QKeyEvent *event) override; -private: - TikzDocument *_tikzDocument; - QMap _nodeItems; - QMap _edgeItems; - QGraphicsLineItem *_drawEdgeItem; - EdgeItem *_modifyEdgeItem; - bool _firstControlPoint; - - QMap _oldNodePositions; - float _oldWeight; - int _oldBend; - int _oldInAngle; - int _oldOutAngle; - - void getSelection(QSet &selNodes, QSet &selEdges); -}; - -#endif // TIKZSCENE_H diff --git a/tikzit/src/gui/tikzview.cpp b/tikzit/src/gui/tikzview.cpp deleted file mode 100644 index fe6c401..0000000 --- a/tikzit/src/gui/tikzview.cpp +++ /dev/null @@ -1,84 +0,0 @@ -#include "tikzview.h" -#include "tikzit.h" - -#include - -TikzView::TikzView(QWidget *parent) : QGraphicsView(parent) -{ - setRenderHint(QPainter::Antialiasing); - setDragMode(QGraphicsView::RubberBandDrag); - - _scale = 1.0f; -} - -void TikzView::zoomIn() -{ - _scale *= 1.6f; - scale(1.6,1.6); -} - -void TikzView::zoomOut() -{ - _scale *= 0.625f; - scale(0.625,0.625); -} - -void TikzView::drawBackground(QPainter *painter, const QRectF &rect) -{ - // draw the grid - int step = GLOBAL_SCALE / 8; - - QPen pen1; - pen1.setWidth(1); - pen1.setCosmetic(true); - pen1.setColor(QColor(230,230,230)); - - QPen pen2 = pen1; - pen2.setColor(QColor(200,200,200)); - - QPen pen3 = pen1; - pen3.setColor(QColor(160,160,160)); - - painter->setPen(pen1); - - if (_scale > 0.2f) { - for (int x = -step; x > rect.left(); x -= step) { - if (x % (step * 8) != 0) painter->drawLine(x, rect.top(), x, rect.bottom()); - } - - for (int x = step; x < rect.right(); x += step) { - if (x % (step * 8) != 0) painter->drawLine(x, rect.top(), x, rect.bottom()); - } - - for (int y = -step; y > rect.top(); y -= step) { - if (y % (step * 8) != 0) painter->drawLine(rect.left(), y, rect.right(), y); - } - - for (int y = step; y < rect.bottom(); y += step) { - if (y % (step * 8) != 0) painter->drawLine(rect.left(), y, rect.right(), y); - } - } - - painter->setPen(pen2); - - for (int x = -step*8; x > rect.left(); x -= step*8) { - painter->drawLine(x, rect.top(), x, rect.bottom()); - } - - for (int x = step*8; x < rect.right(); x += step*8) { - painter->drawLine(x, rect.top(), x, rect.bottom()); - } - - for (int y = -step*8; y > rect.top(); y -= step*8) { - painter->drawLine(rect.left(), y, rect.right(), y); - } - - for (int y = step*8; y < rect.bottom(); y += step*8) { - painter->drawLine(rect.left(), y, rect.right(), y); - } - - painter->setPen(pen3); - painter->drawLine(rect.left(), 0, rect.right(), 0); - painter->drawLine(0, rect.top(), 0, rect.bottom()); -} - diff --git a/tikzit/src/gui/tikzview.h b/tikzit/src/gui/tikzview.h deleted file mode 100644 index fc3cba4..0000000 --- a/tikzit/src/gui/tikzview.h +++ /dev/null @@ -1,32 +0,0 @@ -/** - * Display a Graph, and manage any user input that purely changes the view (e.g. Zoom). This - * serves as the view in the MVC (TikzDocument, TikzView, TikzScene). - */ - -#ifndef TIKZVIEW_H -#define TIKZVIEW_H - -#include -#include -#include -#include -#include -#include -#include -#include - -class TikzView : public QGraphicsView -{ - Q_OBJECT -public: - explicit TikzView(QWidget *parent = 0); -public slots: - void zoomIn(); - void zoomOut(); -protected: - void drawBackground(QPainter *painter, const QRectF &rect); -private: - float _scale; -}; - -#endif // TIKZVIEW_H diff --git a/tikzit/src/gui/toolpalette.cpp b/tikzit/src/gui/toolpalette.cpp deleted file mode 100644 index 3c08bce..0000000 --- a/tikzit/src/gui/toolpalette.cpp +++ /dev/null @@ -1,50 +0,0 @@ -#include "toolpalette.h" - -#include -#include -#include -#include - -ToolPalette::ToolPalette(QWidget *parent) : - QToolBar(parent) -{ - setWindowFlags(Qt::Window - | Qt::CustomizeWindowHint - | Qt::WindowDoesNotAcceptFocus); - setOrientation(Qt::Vertical); - setFocusPolicy(Qt::NoFocus); - setGeometry(100,200,30,195); - - tools = new QActionGroup(this); - - select = new QAction(QIcon(":/images/select-rectangular.png"), "Select"); - vertex = new QAction(QIcon(":/images/draw-ellipse.png"), "Add Vertex"); - edge = new QAction(QIcon(":/images/draw-path.png"), "Add Edge"); - crop = new QAction(QIcon(":/images/transform-crop-and-resize.png"), "Bounding Box"); - - tools->addAction(select); - tools->addAction(vertex); - tools->addAction(edge); - tools->addAction(crop); - - select->setCheckable(true); - vertex->setCheckable(true); - edge->setCheckable(true); - crop->setCheckable(true); - select->setChecked(true); - - addAction(select); - addAction(vertex); - addAction(edge); - addAction(crop); -} - -ToolPalette::Tool ToolPalette::currentTool() const -{ - QAction *a = tools->checkedAction(); - if (a == vertex) return VERTEX; - else if (a == edge) return EDGE; - else if (a == crop) return CROP; - else return SELECT; -} - diff --git a/tikzit/src/gui/toolpalette.h b/tikzit/src/gui/toolpalette.h deleted file mode 100644 index ba6aed5..0000000 --- a/tikzit/src/gui/toolpalette.h +++ /dev/null @@ -1,34 +0,0 @@ -/** - * A small window that lets the user select the current editing tool. - */ - -#ifndef TOOLPALETTE_H -#define TOOLPALETTE_H - -#include -#include -#include -#include - -class ToolPalette : public QToolBar -{ - Q_OBJECT -public: - ToolPalette(QWidget *parent = 0); - enum Tool { - SELECT, - VERTEX, - EDGE, - CROP - }; - - Tool currentTool() const; -private: - QActionGroup *tools; - QAction *select; - QAction *vertex; - QAction *edge; - QAction *crop; -}; - -#endif // TOOLPALETTE_H diff --git a/tikzit/src/gui/undocommands.cpp b/tikzit/src/gui/undocommands.cpp deleted file mode 100644 index 736c258..0000000 --- a/tikzit/src/gui/undocommands.cpp +++ /dev/null @@ -1,162 +0,0 @@ -#include "undocommands.h" -#include "nodeitem.h" -#include "edgeitem.h" - -#include - -MoveCommand::MoveCommand(TikzScene *scene, - QMap oldNodePositions, - QMap newNodePositions, - QUndoCommand *parent) : - QUndoCommand(parent), - _scene(scene), - _oldNodePositions(oldNodePositions), - _newNodePositions(newNodePositions) -{} - - -void MoveCommand::undo() -{ - foreach (NodeItem *ni, _scene->nodeItems()) { - if (_oldNodePositions.contains(ni->node())) { - ni->node()->setPoint(_oldNodePositions.value(ni->node())); - ni->readPos(); - } - } - - _scene->refreshAdjacentEdges(_oldNodePositions.keys()); -} - -void MoveCommand::redo() -{ - foreach (NodeItem *ni, _scene->nodeItems()) { - if (_newNodePositions.contains(ni->node())) { - ni->node()->setPoint(_newNodePositions.value(ni->node())); - ni->readPos(); - } - } - - _scene->refreshAdjacentEdges(_newNodePositions.keys()); -} - -EdgeBendCommand::EdgeBendCommand(TikzScene *scene, Edge *edge, - float oldWeight, int oldBend, - int oldInAngle, int oldOutAngle) : - _scene(scene), _edge(edge), - _oldWeight(oldWeight), _oldBend(oldBend), - _oldInAngle(oldInAngle), _oldOutAngle(oldOutAngle) -{ - _newWeight = edge->weight(); - _newBend = edge->bend(); - _newInAngle = edge->inAngle(); - _newOutAngle = edge->outAngle(); -} - -void EdgeBendCommand::undo() -{ - _edge->setWeight(_oldWeight); - _edge->setBend(_oldBend); - _edge->setInAngle(_oldInAngle); - _edge->setOutAngle(_oldOutAngle); - - foreach(EdgeItem *ei, _scene->edgeItems()) { - if (ei->edge() == _edge) { - ei->readPos(); - break; - } - } -} - -void EdgeBendCommand::redo() -{ - _edge->setWeight(_newWeight); - _edge->setBend(_newBend); - _edge->setInAngle(_newInAngle); - _edge->setOutAngle(_newOutAngle); - - foreach(EdgeItem *ei, _scene->edgeItems()) { - if (ei->edge() == _edge) { - ei->readPos(); - break; - } - } -} - -DeleteCommand::DeleteCommand(TikzScene *scene, - QMap deleteNodes, - QMap deleteEdges, - QSet selEdges) : - _scene(scene), _deleteNodes(deleteNodes), - _deleteEdges(deleteEdges), _selEdges(selEdges) -{} - -void DeleteCommand::undo() -{ - for (auto it = _deleteNodes.begin(); it != _deleteNodes.end(); ++it) { - Node *n = it.value(); - _scene->graph()->addNode(n, it.key()); - NodeItem *ni = new NodeItem(n); - _scene->nodeItems().insert(n, ni); - _scene->addItem(ni); - ni->setSelected(true); - } - - for (auto it = _deleteEdges.begin(); it != _deleteEdges.end(); ++it) { - Edge *e = it.value(); - _scene->graph()->addEdge(e, it.key()); - EdgeItem *ei = new EdgeItem(e); - _scene->edgeItems().insert(e, ei); - _scene->addItem(ei); - - if (_selEdges.contains(e)) ei->setSelected(true); - } -} - -void DeleteCommand::redo() -{ - foreach (Edge *e, _deleteEdges.values()) { - EdgeItem *ei = _scene->edgeItems()[e]; - _scene->edgeItems().remove(e); - _scene->removeItem(ei); - delete ei; - - _scene->graph()->removeEdge(e); - } - - foreach (Node *n, _deleteNodes.values()) { - NodeItem *ni = _scene->nodeItems()[n]; - _scene->nodeItems().remove(n); - _scene->removeItem(ni); - delete ni; - - _scene->graph()->removeNode(n); - } -} - -AddNodeCommand::AddNodeCommand(TikzScene *scene, Node *node, QRectF newBounds) : - _scene(scene), _node(node), _oldBounds(_scene->sceneRect()), _newBounds(newBounds) -{ -} - -void AddNodeCommand::undo() -{ - NodeItem *ni = _scene->nodeItems()[_node]; - _scene->removeItem(ni); - _scene->nodeItems().remove(_node); - delete ni; - - _scene->graph()->removeNode(_node); - - _scene->setBounds(_oldBounds); -} - -void AddNodeCommand::redo() -{ - // TODO: get the current style - _scene->graph()->addNode(_node); - NodeItem *ni = new NodeItem(_node); - _scene->nodeItems().insert(_node, ni); - _scene->addItem(ni); - - _scene->setBounds(_newBounds); -} diff --git a/tikzit/src/gui/undocommands.h b/tikzit/src/gui/undocommands.h deleted file mode 100644 index ffff876..0000000 --- a/tikzit/src/gui/undocommands.h +++ /dev/null @@ -1,80 +0,0 @@ -/** - * All changes to a TikzDocument are done via subclasses of QUndoCommand. When a controller - * (e.g. TikzScene) gets input from the user to change the document, it will push one of - * these commands onto the TikzDocument's undo stack, which automatically calls the redo() - * method of the command. - */ - -#ifndef UNDOCOMMANDS_H -#define UNDOCOMMANDS_H - -#include "tikzscene.h" - -#include - -class MoveCommand : public QUndoCommand -{ -public: - explicit MoveCommand(TikzScene *scene, - QMap oldNodePositions, - QMap newNodePositions, - QUndoCommand *parent = 0); - void undo() override; - void redo() override; -private: - TikzScene *_scene; - QMap _oldNodePositions; - QMap _newNodePositions; -}; - -class EdgeBendCommand : public QUndoCommand -{ -public: - explicit EdgeBendCommand(TikzScene *scene, Edge *edge, - float oldWeight, int oldBend, - int oldInAngle, int oldOutAngle); - void undo() override; - void redo() override; -private: - TikzScene *_scene; - Edge *_edge; - float _oldWeight; - int _oldBend; - int _oldInAngle; - int _oldOutAngle; - float _newWeight; - int _newBend; - int _newInAngle; - int _newOutAngle; -}; - -class DeleteCommand : public QUndoCommand -{ -public: - explicit DeleteCommand(TikzScene *scene, - QMap deleteNodes, - QMap deleteEdges, - QSet selEdges); - void undo() override; - void redo() override; -private: - TikzScene *_scene; - QMap _deleteNodes; - QMap _deleteEdges; - QSet _selEdges; -}; - -class AddNodeCommand : public QUndoCommand -{ -public: - explicit AddNodeCommand(TikzScene *scene, Node *node, QRectF newBounds); - void undo() override; - void redo() override; -private: - TikzScene *_scene; - Node *_node; - QRectF _oldBounds; - QRectF _newBounds; -}; - -#endif // UNDOCOMMANDS_H diff --git a/tikzit/src/main.cpp b/tikzit/src/main.cpp deleted file mode 100644 index b676211..0000000 --- a/tikzit/src/main.cpp +++ /dev/null @@ -1,14 +0,0 @@ -#include "tikzit.h" - -#include -#include - - -int main(int argc, char *argv[]) -{ - QApplication a(argc, argv); - a.setQuitOnLastWindowClosed(false); - tikzit = new Tikzit(); - - return a.exec(); -} diff --git a/tikzit/src/test/testmain.cpp b/tikzit/src/test/testmain.cpp deleted file mode 100644 index 56491ed..0000000 --- a/tikzit/src/test/testmain.cpp +++ /dev/null @@ -1,22 +0,0 @@ -#include "testtest.h" -#include "testparser.h" -#include "testtikzoutput.h" - -#include -#include -#include - -int main(int argc, char *argv[]) -{ - TestTest test; - TestParser parser; - TestTikzOutput tikzOutput; - int r = QTest::qExec(&test, argc, argv) | - QTest::qExec(&parser, argc, argv) | - QTest::qExec(&tikzOutput, argc, argv); - - if (r == 0) std::cout << "***************** All tests passed! *****************\n"; - else std::cout << "***************** Some tests failed. *****************\n"; - - return r; -} diff --git a/tikzit/src/test/testparser.cpp b/tikzit/src/test/testparser.cpp deleted file mode 100644 index e220e2e..0000000 --- a/tikzit/src/test/testparser.cpp +++ /dev/null @@ -1,163 +0,0 @@ -#include "testparser.h" -#include "graph.h" -#include "tikzgraphassembler.h" - -#include -#include - -//void TestParser::initTestCase() -//{ - -//} - -//void TestParser::cleanupTestCase() -//{ - -//} - -void TestParser::parseEmptyGraph() -{ - Graph *g = new Graph(); - TikzGraphAssembler ga(g); - bool res = ga.parse("\\begin{tikzpicture}\n\\end{tikzpicture}"); - QVERIFY(res); - QVERIFY(g->nodes().size() == 0); - QVERIFY(g->edges().size() == 0); - delete g; -} - -void TestParser::parseNodeGraph() -{ - Graph *g = new Graph(); - TikzGraphAssembler ga(g); - bool res = ga.parse( - "\\begin{tikzpicture}\n" - " \\node (node0) at (1.1, -2.2) {};\n" - " \\node (node1) at (3, 4) {test};\n" - "\\end{tikzpicture}"); - QVERIFY(res); - QVERIFY(g->nodes().size() == 2); - QVERIFY(g->edges().size() == 0); - QVERIFY(g->nodes()[0]->name() == "node0"); - QVERIFY(g->nodes()[0]->label() == ""); - QVERIFY(g->nodes()[0]->point() == QPointF(1.1,-2.2)); - QVERIFY(g->nodes()[1]->name() == "node1"); - QVERIFY(g->nodes()[1]->label() == "test"); - QVERIFY(g->nodes()[1]->point() == QPointF(3,4)); - delete g; -} - -void TestParser::parseEdgeGraph() -{ - Graph *g = new Graph(); - TikzGraphAssembler ga(g); - bool res = ga.parse( - "\\begin{tikzpicture}\n" - " \\begin{pgfonlayer}{nodelayer}\n" - " \\node [style=x, {foo++}] (0) at (-1, -1) {};\n" - " \\node [style=y] (1) at (0, 1) {};\n" - " \\node [style=z] (2) at (1, -1) {};\n" - " \\end{pgfonlayer}\n" - " \\begin{pgfonlayer}{edgelayer}\n" - " \\draw [style=a] (1.center) to (2);\n" - " \\draw [style=b, foo] (2) to (0.west);\n" - " \\draw [style=c] (0) to (1);\n" - " \\end{pgfonlayer}\n" - "\\end{tikzpicture}\n"); - QVERIFY(res); - QVERIFY(g->nodes().size() == 3); - QVERIFY(g->edges().size() == 3); - QVERIFY(g->nodes()[0]->data()->atom("foo++")); - QVERIFY(g->edges()[0]->data()->property("style") == "a"); - QVERIFY(!g->edges()[0]->data()->atom("foo")); - QVERIFY(g->edges()[1]->data()->property("style") == "b"); - QVERIFY(g->edges()[1]->data()->atom("foo")); - QVERIFY(g->edges()[2]->data()->property("style") == "c"); - Node *en = g->edges()[0]->edgeNode(); - QVERIFY(en == 0); - delete g; -} - -void TestParser::parseEdgeNode() -{ - Graph *g = new Graph(); - TikzGraphAssembler ga(g); - bool res = ga.parse( - "\\begin{tikzpicture}\n" - " \\begin{pgfonlayer}{nodelayer}\n" - " \\node [style=none] (0) at (-1, 0) {};\n" - " \\node [style=none] (1) at (1, 0) {};\n" - " \\end{pgfonlayer}\n" - " \\begin{pgfonlayer}{edgelayer}\n" - " \\draw [style=diredge] (0.center) to node[foo, bar=baz baz]{test} (1.center);\n" - " \\end{pgfonlayer}\n" - "\\end{tikzpicture}\n"); - QVERIFY(res); - QVERIFY(g->nodes().size() == 2); - QVERIFY(g->edges().size() == 1); - Node *en = g->edges()[0]->edgeNode(); - QVERIFY(en != 0); - QVERIFY(en->label() == "test"); - QVERIFY(en->data()->atom("foo")); - QVERIFY(en->data()->property("bar") == "baz baz"); - delete g; -} - -void TestParser::parseEdgeBends() -{ - Graph *g = new Graph(); - TikzGraphAssembler ga(g); - bool res = ga.parse( - "\\begin{tikzpicture}\n" - " \\begin{pgfonlayer}{nodelayer}\n" - " \\node [style=white] (0) at (-1, 0) {};\n" - " \\node [style=black] (1) at (1, 0) {};\n" - " \\end{pgfonlayer}\n" - " \\begin{pgfonlayer}{edgelayer}\n" - " \\draw [style=diredge,bend left] (0) to (1);\n" - " \\draw [style=diredge,bend right] (0) to (1);\n" - " \\draw [style=diredge,bend left=20] (0) to (1);\n" - " \\draw [style=diredge,bend right=80] (0) to (1);\n" - " \\draw [style=diredge,in=10,out=150,looseness=2] (0) to (1);\n" - " \\end{pgfonlayer}\n" - "\\end{tikzpicture}\n"); - QVERIFY(res); - QVERIFY(g->nodes().size() == 2); - QVERIFY(g->edges().size() == 5); - QVERIFY(g->edges()[0]->bend() == -30); - QVERIFY(g->edges()[1]->bend() == 30); - QVERIFY(g->edges()[2]->bend() == -20); - QVERIFY(g->edges()[3]->bend() == 80); - QVERIFY(g->edges()[4]->inAngle() == 10); - QVERIFY(g->edges()[4]->outAngle() == 150); - QVERIFY(g->edges()[4]->weight() == 2.0f/2.5f); -} - -void TestParser::parseBbox() -{ - Graph *g = new Graph(); - TikzGraphAssembler ga(g); - bool res = ga.parse( - "\\begin{tikzpicture}\n" - " \\path [use as bounding box] (-1.5,-1.5) rectangle (1.5,1.5);\n" - " \\begin{pgfonlayer}{nodelayer}\n" - " \\node [style=white dot] (0) at (-1, -1) {};\n" - " \\node [style=white dot] (1) at (0, 1) {};\n" - " \\node [style=white dot] (2) at (1, -1) {};\n" - " \\end{pgfonlayer}\n" - " \\begin{pgfonlayer}{edgelayer}\n" - " \\draw [style=diredge] (1) to (2);\n" - " \\draw [style=diredge] (2) to (0);\n" - " \\draw [style=diredge] (0) to (1);\n" - " \\end{pgfonlayer}\n" - "\\end{tikzpicture}\n"); - QVERIFY(res); - QVERIFY(g->nodes().size() == 3); - QVERIFY(g->edges().size() == 3); - QVERIFY(g->hasBbox()); - QVERIFY(g->bbox() == QRectF(QPointF(-1.5,-1.5), QPointF(1.5,1.5))); - - delete g; -} - - diff --git a/tikzit/src/test/testparser.h b/tikzit/src/test/testparser.h deleted file mode 100644 index a40a58f..0000000 --- a/tikzit/src/test/testparser.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef TESTPARSER_H -#define TESTPARSER_H - -#include - -class TestParser : public QObject -{ - Q_OBJECT -private slots: - void parseEmptyGraph(); - void parseNodeGraph(); - void parseEdgeGraph(); - void parseEdgeNode(); - void parseEdgeBends(); - void parseBbox(); -}; - -#endif // TESTPARSER_H diff --git a/tikzit/src/test/testtest.cpp b/tikzit/src/test/testtest.cpp deleted file mode 100644 index 59173c0..0000000 --- a/tikzit/src/test/testtest.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include "testtest.h" - -#include -#include - -void TestTest::initTestCase() { qDebug("initialising test"); } -void TestTest::myFirstTest() { QVERIFY(1 == 1); } -void TestTest::mySecondTest() { QVERIFY(1 != 2); } -void TestTest::cleanupTestCase() { qDebug("cleaning up test"); } - diff --git a/tikzit/src/test/testtest.h b/tikzit/src/test/testtest.h deleted file mode 100644 index 69a0bc8..0000000 --- a/tikzit/src/test/testtest.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef TESTTEST_H -#define TESTTEST_H - -#include -#include - -class TestTest: public QObject -{ - Q_OBJECT -private slots: - void initTestCase(); - void myFirstTest(); - void mySecondTest(); - void cleanupTestCase(); -}; - -#endif // TESTTEST_H diff --git a/tikzit/src/test/testtikzoutput.cpp b/tikzit/src/test/testtikzoutput.cpp deleted file mode 100644 index f086786..0000000 --- a/tikzit/src/test/testtikzoutput.cpp +++ /dev/null @@ -1,97 +0,0 @@ -#include "testtikzoutput.h" -#include "graphelementproperty.h" -#include "graphelementdata.h" -#include "graph.h" -#include "tikzgraphassembler.h" - -#include -#include -#include - -void TestTikzOutput::escape() -{ - QVERIFY(GraphElementProperty::tikzEscape("foo") == "foo"); - QVERIFY(GraphElementProperty::tikzEscape("foo'") == "foo'"); - QVERIFY(GraphElementProperty::tikzEscape("foo bar") == "foo bar"); - QVERIFY(GraphElementProperty::tikzEscape("foo.bar") == "foo.bar"); - QVERIFY(GraphElementProperty::tikzEscape("foo-bar") == "foo-bar"); - QVERIFY(GraphElementProperty::tikzEscape("foo >") == "foo >"); - QVERIFY(GraphElementProperty::tikzEscape("foo <") == "foo <"); - QVERIFY(GraphElementProperty::tikzEscape("foo+") == "{foo+}"); - QVERIFY(GraphElementProperty::tikzEscape("foo{bar}") == "{foo{bar}}"); -} - -void TestTikzOutput::data() -{ - GraphElementData d; - QVERIFY(d.tikz() == ""); - d.setAtom("foo"); - QVERIFY(d.tikz() == "[foo]"); - d.setAtom("bar"); - QVERIFY(d.tikz() == "[foo, bar]"); - d.setProperty("foo","bar"); - QVERIFY(d.tikz() == "[foo, bar, foo=bar]"); - d.setAtom("foo+"); - QVERIFY(d.tikz() == "[foo, bar, foo=bar, {foo+}]"); - d.unsetAtom("foo"); - QVERIFY(d.tikz() == "[bar, foo=bar, {foo+}]"); - d.unsetProperty("foo"); - QVERIFY(d.tikz() == "[bar, {foo+}]"); - d.unsetAtom("foo+"); - QVERIFY(d.tikz() == "[bar]"); - d.unsetAtom("bar"); - QVERIFY(d.tikz() == ""); -} - -void TestTikzOutput::graphEmpty() -{ - Graph *g = new Graph(); - - QString tikz = - "\\begin{tikzpicture}\n" - "\\end{tikzpicture}\n"; - QVERIFY(g->tikz() == tikz); - - delete g; -} - -void TestTikzOutput::graphFromTikz() -{ - Graph *g = new Graph(); - TikzGraphAssembler ga(g); - - QString tikz = - "\\begin{tikzpicture}\n" - "\t\\path [use as bounding box] (-1.5,-1.5) rectangle (1.5,1.5);\n" - "\t\\begin{pgfonlayer}{nodelayer}\n" - "\t\t\\node [style=white dot] (0) at (-1, -1) {};\n" - "\t\t\\node [style=white dot] (1) at (0, 1) {};\n" - "\t\t\\node [style=white dot] (2) at (1, -1) {};\n" - "\t\\end{pgfonlayer}\n" - "\t\\begin{pgfonlayer}{edgelayer}\n" - "\t\t\\draw [style=diredge] (1) to (2);\n" - "\t\t\\draw [style=diredge] (2.center) to (0);\n" - "\t\t\\draw [style=diredge] (0) to ();\n" - "\t\\end{pgfonlayer}\n" - "\\end{tikzpicture}\n"; - bool res = ga.parse(tikz); - QVERIFY2(res, "parsed successfully"); - QVERIFY2(g->tikz() == tikz, "produced matching tikz"); - - delete g; -} - -void TestTikzOutput::graphBbox() -{ - Graph *g = new Graph(); - g->setBbox(QRectF(QPointF(-0.75, -0.5), QPointF(0.25, 1))); - - QString tikz = - "\\begin{tikzpicture}\n" - "\t\\path [use as bounding box] (-0.75,-0.5) rectangle (0.25,1);\n" - "\\end{tikzpicture}\n"; - QVERIFY(g->tikz() == tikz); - - - delete g; -} diff --git a/tikzit/src/test/testtikzoutput.h b/tikzit/src/test/testtikzoutput.h deleted file mode 100644 index dff1db1..0000000 --- a/tikzit/src/test/testtikzoutput.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef TESTTIKZOUTPUT_H -#define TESTTIKZOUTPUT_H - -#include - -class TestTikzOutput : public QObject -{ - Q_OBJECT -private slots: - void escape(); - void data(); - void graphBbox(); - void graphEmpty(); - void graphFromTikz(); -}; - -#endif // TESTTIKZOUTPUT_H diff --git a/tikzit/src/tikzit.cpp b/tikzit/src/tikzit.cpp deleted file mode 100644 index 42d16e8..0000000 --- a/tikzit/src/tikzit.cpp +++ /dev/null @@ -1,105 +0,0 @@ -#include "tikzit.h" - -#include -#include - -// application-level instance of Tikzit -Tikzit *tikzit; - -// font to use for node labels -QFont Tikzit::LABEL_FONT("Courrier", 9); - -Tikzit::Tikzit() -{ - _mainMenu = new MainMenu(); - - _activeWindow = 0; - QMainWindow *dummy = new QMainWindow(); - - _toolPalette = new ToolPalette(dummy); - _propertyPalette = new PropertyPalette(dummy); - - loadStyles(); - - _toolPalette->show(); - _propertyPalette->show(); - - _windows << new MainWindow(); - _windows[0]->show(); -} - -//QMenuBar *Tikzit::mainMenu() const -//{ -// return _mainMenu; -//} - -ToolPalette *Tikzit::toolPalette() const -{ - return _toolPalette; -} - -PropertyPalette *Tikzit::propertyPalette() const -{ - return _propertyPalette; -} - -void Tikzit::loadStyles() -{ - _nodeStyles << new NodeStyle("black dot", NodeShape::Circle, Qt::black, Qt::black, 1); - _nodeStyles << new NodeStyle("white dot", NodeShape::Circle, Qt::white, Qt::black, 1); - _nodeStyles << new NodeStyle("gray dot", NodeShape::Circle, Qt::gray, Qt::black, 1); -} - -void Tikzit::newDoc() -{ - MainWindow *w = new MainWindow(); - w->show(); - _windows << w; -} - -MainWindow *Tikzit::activeWindow() const -{ - return _activeWindow; -} - -void Tikzit::setActiveWindow(MainWindow *activeWindow) -{ - _activeWindow = activeWindow; -} - -void Tikzit::removeWindow(MainWindow *w) -{ - _windows.removeAll(w); - if (_activeWindow == w) { - if (_windows.isEmpty()) _activeWindow = 0; - else _activeWindow = _windows[0]; - } -} - -NodeStyle *Tikzit::nodeStyle(QString name) -{ - foreach (NodeStyle *s , _nodeStyles) - if (s->name == name) return s; - return noneStyle; //NodeStyle(name, NodeShape::Circle, Qt::white); -} - -void Tikzit::open() -{ - QSettings settings("tikzit", "tikzit"); - QString fileName = QFileDialog::getOpenFileName(0, - tr("Open File"), - settings.value("previous-file-path").toString(), - tr("TiKZ Files (*.tikz)")); - - if (!fileName.isEmpty()) { - if (_windows.size() == 1 && _windows[0]->pristine()) { - _windows[0]->open(fileName); - _windows[0]->show(); - } else { - MainWindow *w = new MainWindow(); - w->show(); - w->open(fileName); - _windows << w; - } - } -} diff --git a/tikzit/src/tikzit.h b/tikzit/src/tikzit.h deleted file mode 100644 index deb683e..0000000 --- a/tikzit/src/tikzit.h +++ /dev/null @@ -1,70 +0,0 @@ -/** - * Tikzit is the top-level class which maintains the global application state. For convenience, - * it also inherits the main menu. - */ - -#ifndef TIKZIT_H -#define TIKZIT_H - -#include "mainwindow.h" -#include "mainmenu.h" -#include "ui_mainmenu.h" - -#include "toolpalette.h" -#include "propertypalette.h" -#include "nodestyle.h" - -#include -#include -#include -#include -#include -#include - -// Number of pixels between (0,0) and (1,0) at 100% zoom level. This should be -// divisible by 8 to avoid rounding errors with e.g. grid-snapping. -#define GLOBAL_SCALE 80 -#define GLOBAL_SCALEF 80.0f - -inline QPointF toScreen(QPointF src) -{ src.setY(-src.y()); src *= GLOBAL_SCALEF; return src; } - -inline QPointF fromScreen(QPointF src) -{ src.setY(-src.y()); src /= GLOBAL_SCALEF; return src; } - - -class Tikzit : public QObject { - Q_OBJECT -public: - Tikzit(); - ToolPalette *toolPalette() const; - PropertyPalette *propertyPalette() const; - - MainWindow *activeWindow() const; - void setActiveWindow(MainWindow *activeWindow); - void removeWindow(MainWindow *w); - NodeStyle *nodeStyle(QString name); - - static QFont LABEL_FONT; -// Ui::MainMenu *_mainMenuUi; -// QMenuBar *_mainMenu; - - void newDoc(); - void open(); - -private: -// void createMenu(); - void loadStyles(); - - MainMenu *_mainMenu; - ToolPalette *_toolPalette; - PropertyPalette *_propertyPalette; - QVector _windows; - MainWindow *_activeWindow; - QVector _nodeStyles; - -}; - -extern Tikzit *tikzit; - -#endif // TIKZIT_H diff --git a/tikzit/src/util.cpp b/tikzit/src/util.cpp deleted file mode 100644 index 64716d2..0000000 --- a/tikzit/src/util.cpp +++ /dev/null @@ -1,48 +0,0 @@ -#include "util.h" - -float bezierInterpolate(float dist, float c0, float c1, float c2, float c3) { - float distp = 1 - dist; - return (distp*distp*distp) * c0 + - 3 * (distp*distp) * dist * c1 + - 3 * (dist*dist) * distp * c2 + - (dist*dist*dist) * c3; -} - -QPointF bezierInterpolateFull (float dist, QPointF c0, QPointF c1, QPointF c2, QPointF c3) { - return QPointF(bezierInterpolate (dist, c0.x(), c1.x(), c2.x(), c3.x()), - bezierInterpolate (dist, c0.y(), c1.y(), c2.y(), c3.y())); -} - - -float roundToNearest(float stepSize, float val) { - if (stepSize==0.0f) return val; - else return round(val/stepSize)*stepSize; -} - -float radiansToDegrees (float radians) { - return (radians * 180.0f) / M_PI; -} - -float degreesToRadians(float degrees) { - return (degrees * M_PI) / 180.0f; -} - -int normaliseAngleDeg (int degrees) { - while (degrees > 180) { - degrees -= 360; - } - while (degrees <= -180) { - degrees += 360; - } - return degrees; -} - -float normaliseAngleRad (float rads) { - while (rads > M_PI) { - rads -= 2 * M_PI; - } - while (rads <= -M_PI) { - rads += 2 * M_PI; - } - return rads; -} diff --git a/tikzit/src/util.h b/tikzit/src/util.h deleted file mode 100644 index 2952214..0000000 --- a/tikzit/src/util.h +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Various utility functions, mostly for mathematical calculation. - */ - -#ifndef UTIL_H -#define UTIL_H - -#include -#include - -// interpolate on a cubic bezier curve -float bezierInterpolate(float dist, float c0, float c1, float c2, float c3); -QPointF bezierInterpolateFull (float dist, QPointF c0, QPointF c1, QPointF c2, QPointF c3); - -// rounding -float roundToNearest(float stepSize, float val); -float radiansToDegrees (float radians); - -// angles -float degreesToRadians(float degrees); -int normaliseAngleDeg (int degrees); -float normaliseAngleRad (float rads); - -#endif // UTIL_H diff --git a/tikzit/target_wrapper.sh b/tikzit/target_wrapper.sh deleted file mode 100755 index 1793274..0000000 --- a/tikzit/target_wrapper.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -DYLD_FRAMEWORK_PATH=/usr/local/Cellar/qt5/5.7.1_1/lib${DYLD_FRAMEWORK_PATH:+:$DYLD_FRAMEWORK_PATH} -export DYLD_FRAMEWORK_PATH -QT_PLUGIN_PATH=/usr/local/Cellar/qt5/5.7.1_1/plugins${QT_PLUGIN_PATH:+:$QT_PLUGIN_PATH} -export QT_PLUGIN_PATH -exec "$@" diff --git a/tikzit/tikzit.pro b/tikzit/tikzit.pro deleted file mode 100644 index b14822b..0000000 --- a/tikzit/tikzit.pro +++ /dev/null @@ -1,98 +0,0 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2017-01-11T17:30:16 -# -#------------------------------------------------- - -QT += core gui -CONFIG += testcase - -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets - -TARGET = tikzit -TEMPLATE = app - -# The following define makes your compiler emit warnings if you use -# any feature of Qt which as been marked as deprecated (the exact warnings -# depend on your compiler). Please consult the documentation of the -# deprecated API in order to know how to port your code away from it. -DEFINES += QT_DEPRECATED_WARNINGS - -# You can also make your code fail to compile if you use deprecated APIs. -# In order to do so, uncomment the following line. -# You can also select to disable deprecated APIs only up to a certain version of Qt. -#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 - -FLEXSOURCES = src/data/tikzlexer.l -BISONSOURCES = src/data/tikzparser.y - -include(flex.pri) -include(bison.pri) - -SOURCES += src/gui/mainwindow.cpp \ - src/gui/toolpalette.cpp \ - src/gui/tikzscene.cpp \ - src/data/graph.cpp \ - src/data/node.cpp \ - src/data/edge.cpp \ - src/data/tikzgraphassembler.cpp \ - src/data/graphelementdata.cpp \ - src/data/graphelementproperty.cpp \ - src/gui/propertypalette.cpp \ - src/gui/tikzview.cpp \ - src/gui/nodeitem.cpp \ - src/gui/edgeitem.cpp \ - src/tikzit.cpp \ - src/data/nodestyle.cpp \ - src/gui/commands.cpp \ - src/data/tikzdocument.cpp \ - src/gui/undocommands.cpp \ - src/gui/mainmenu.cpp \ - src/util.cpp - -HEADERS += src/gui/mainwindow.h \ - src/gui/toolpalette.h \ - src/gui/tikzscene.h \ - src/data/graph.h \ - src/data/node.h \ - src/data/edge.h \ - src/data/tikzgraphassembler.h \ - src/data/graphelementdata.h \ - src/data/graphelementproperty.h \ - src/gui/propertypalette.h \ - src/data/tikzparserdefs.h \ - src/gui/tikzview.h \ - src/gui/nodeitem.h \ - src/tikzit.h \ - src/gui/edgeitem.h \ - src/data/nodestyle.h \ - src/gui/commands.h \ - src/data/tikzdocument.h \ - src/gui/undocommands.h \ - src/gui/mainmenu.h \ - src/util.h - -FORMS += src/gui/mainwindow.ui \ - src/gui/propertypalette.ui \ - src/gui/mainmenu.ui - -INCLUDEPATH += src src/gui src/data - -DISTFILES += - -RESOURCES += tikzit.qrc - -test { - QT += testlib - TARGET = UnitTests - SOURCES -= src/main.cpp - HEADERS += src/test/testtest.h \ - src/test/testparser.h \ - src/test/testtikzoutput.h - SOURCES += src/test/testmain.cpp \ - src/test/testtest.cpp \ - src/test/testparser.cpp \ - src/test/testtikzoutput.cpp -} else { - SOURCES += src/main.cpp -} diff --git a/tikzit/tikzit.qrc b/tikzit/tikzit.qrc deleted file mode 100644 index 9f98a38..0000000 --- a/tikzit/tikzit.qrc +++ /dev/null @@ -1,8 +0,0 @@ - - - images/draw-ellipse.png - images/draw-path.png - images/select-rectangular.png - images/transform-crop-and-resize.png - - diff --git a/tikzit/tikzlexer.h b/tikzit/tikzlexer.h deleted file mode 100644 index 6598601..0000000 --- a/tikzit/tikzlexer.h +++ /dev/null @@ -1,345 +0,0 @@ -#ifndef yyHEADER_H -#define yyHEADER_H 1 -#define yyIN_HEADER 1 - -#line 6 "tikzlexer.h" - -#line 8 "tikzlexer.h" - -#define YY_INT_ALIGNED short int - -/* A lexical scanner generated by flex */ - -#define FLEX_SCANNER -#define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 35 -#if YY_FLEX_SUBMINOR_VERSION > 0 -#define FLEX_BETA -#endif - -/* First, we deal with platform-specific or compiler-specific issues. */ - -/* begin standard C headers. */ -#include -#include -#include -#include - -/* end standard C headers. */ - -/* flex integer type definitions */ - -#ifndef FLEXINT_H -#define FLEXINT_H - -/* C99 systems have . Non-C99 systems may or may not. */ - -#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L - -/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, - * if you want the limit (max/min) macros for int types. - */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS 1 -#endif - -#include -typedef int8_t flex_int8_t; -typedef uint8_t flex_uint8_t; -typedef int16_t flex_int16_t; -typedef uint16_t flex_uint16_t; -typedef int32_t flex_int32_t; -typedef uint32_t flex_uint32_t; -typedef uint64_t flex_uint64_t; -#else -typedef signed char flex_int8_t; -typedef short int flex_int16_t; -typedef int flex_int32_t; -typedef unsigned char flex_uint8_t; -typedef unsigned short int flex_uint16_t; -typedef unsigned int flex_uint32_t; -#endif /* ! C99 */ - -/* Limits of integral types. */ -#ifndef INT8_MIN -#define INT8_MIN (-128) -#endif -#ifndef INT16_MIN -#define INT16_MIN (-32767-1) -#endif -#ifndef INT32_MIN -#define INT32_MIN (-2147483647-1) -#endif -#ifndef INT8_MAX -#define INT8_MAX (127) -#endif -#ifndef INT16_MAX -#define INT16_MAX (32767) -#endif -#ifndef INT32_MAX -#define INT32_MAX (2147483647) -#endif -#ifndef UINT8_MAX -#define UINT8_MAX (255U) -#endif -#ifndef UINT16_MAX -#define UINT16_MAX (65535U) -#endif -#ifndef UINT32_MAX -#define UINT32_MAX (4294967295U) -#endif - -#endif /* ! FLEXINT_H */ - -#ifdef __cplusplus - -/* The "const" storage-class-modifier is valid. */ -#define YY_USE_CONST - -#else /* ! __cplusplus */ - -/* C99 requires __STDC__ to be defined as 1. */ -#if defined (__STDC__) - -#define YY_USE_CONST - -#endif /* defined (__STDC__) */ -#endif /* ! __cplusplus */ - -#ifdef YY_USE_CONST -#define yyconst const -#else -#define yyconst -#endif - -/* An opaque pointer. */ -#ifndef YY_TYPEDEF_YY_SCANNER_T -#define YY_TYPEDEF_YY_SCANNER_T -typedef void* yyscan_t; -#endif - -/* For convenience, these vars (plus the bison vars far below) - are macros in the reentrant scanner. */ -#define yyin yyg->yyin_r -#define yyout yyg->yyout_r -#define yyextra yyg->yyextra_r -#define yyleng yyg->yyleng_r -#define yytext yyg->yytext_r -#define yylineno (YY_CURRENT_BUFFER_LVALUE->yy_bs_lineno) -#define yycolumn (YY_CURRENT_BUFFER_LVALUE->yy_bs_column) -#define yy_flex_debug yyg->yy_flex_debug_r - -/* Size of default input buffer. */ -#ifndef YY_BUF_SIZE -#define YY_BUF_SIZE 16384 -#endif - -#ifndef YY_TYPEDEF_YY_BUFFER_STATE -#define YY_TYPEDEF_YY_BUFFER_STATE -typedef struct yy_buffer_state *YY_BUFFER_STATE; -#endif - -#ifndef YY_TYPEDEF_YY_SIZE_T -#define YY_TYPEDEF_YY_SIZE_T -typedef size_t yy_size_t; -#endif - -#ifndef YY_STRUCT_YY_BUFFER_STATE -#define YY_STRUCT_YY_BUFFER_STATE -struct yy_buffer_state - { - FILE *yy_input_file; - - char *yy_ch_buf; /* input buffer */ - char *yy_buf_pos; /* current position in input buffer */ - - /* Size of input buffer in bytes, not including room for EOB - * characters. - */ - yy_size_t yy_buf_size; - - /* Number of characters read into yy_ch_buf, not including EOB - * characters. - */ - yy_size_t yy_n_chars; - - /* Whether we "own" the buffer - i.e., we know we created it, - * and can realloc() it to grow it, and should free() it to - * delete it. - */ - int yy_is_our_buffer; - - /* Whether this is an "interactive" input source; if so, and - * if we're using stdio for input, then we want to use getc() - * instead of fread(), to make sure we stop fetching input after - * each newline. - */ - int yy_is_interactive; - - /* Whether we're considered to be at the beginning of a line. - * If so, '^' rules will be active on the next match, otherwise - * not. - */ - int yy_at_bol; - - int yy_bs_lineno; /**< The line count. */ - int yy_bs_column; /**< The column count. */ - - /* Whether to try to fill the input buffer when we reach the - * end of it. - */ - int yy_fill_buffer; - - int yy_buffer_status; - - }; -#endif /* !YY_STRUCT_YY_BUFFER_STATE */ - -void yyrestart (FILE *input_file ,yyscan_t yyscanner ); -void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); -YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ,yyscan_t yyscanner ); -void yy_delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); -void yy_flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); -void yypush_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); -void yypop_buffer_state (yyscan_t yyscanner ); - -YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner ); -YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ,yyscan_t yyscanner ); -YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len ,yyscan_t yyscanner ); - -void *yyalloc (yy_size_t ,yyscan_t yyscanner ); -void *yyrealloc (void *,yy_size_t ,yyscan_t yyscanner ); -void yyfree (void * ,yyscan_t yyscanner ); - -#define yywrap(n) 1 -#define YY_SKIP_YYWRAP - -#define yytext_ptr yytext_r - -#ifdef YY_HEADER_EXPORT_START_CONDITIONS -#define INITIAL 0 -#define props 1 -#define xcoord 2 -#define ycoord 3 -#define noderef 4 - -#endif - -#ifndef YY_NO_UNISTD_H -/* Special case for "unistd.h", since it is non-ANSI. We include it way - * down here because we want the user's section 1 to have been scanned first. - * The user has a chance to override it with an option. - */ -#include -#endif - -#define YY_EXTRA_TYPE TikzGraphAssembler * - -int yylex_init (yyscan_t* scanner); - -int yylex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner); - -/* Accessor methods to globals. - These are made visible to non-reentrant scanners for convenience. */ - -int yylex_destroy (yyscan_t yyscanner ); - -int yyget_debug (yyscan_t yyscanner ); - -void yyset_debug (int debug_flag ,yyscan_t yyscanner ); - -YY_EXTRA_TYPE yyget_extra (yyscan_t yyscanner ); - -void yyset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner ); - -FILE *yyget_in (yyscan_t yyscanner ); - -void yyset_in (FILE * in_str ,yyscan_t yyscanner ); - -FILE *yyget_out (yyscan_t yyscanner ); - -void yyset_out (FILE * out_str ,yyscan_t yyscanner ); - -yy_size_t yyget_leng (yyscan_t yyscanner ); - -char *yyget_text (yyscan_t yyscanner ); - -int yyget_lineno (yyscan_t yyscanner ); - -void yyset_lineno (int line_number ,yyscan_t yyscanner ); - -YYSTYPE * yyget_lval (yyscan_t yyscanner ); - -void yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner ); - - YYLTYPE *yyget_lloc (yyscan_t yyscanner ); - - void yyset_lloc (YYLTYPE * yylloc_param ,yyscan_t yyscanner ); - -/* Macros after this point can all be overridden by user definitions in - * section 1. - */ - -#ifndef YY_SKIP_YYWRAP -#ifdef __cplusplus -extern "C" int yywrap (yyscan_t yyscanner ); -#else -extern int yywrap (yyscan_t yyscanner ); -#endif -#endif - -#ifndef yytext_ptr -static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner); -#endif - -#ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner); -#endif - -#ifndef YY_NO_INPUT - -#endif - -/* Amount of stuff to slurp up with each read. */ -#ifndef YY_READ_BUF_SIZE -#define YY_READ_BUF_SIZE 8192 -#endif - -/* Number of entries by which start-condition stack grows. */ -#ifndef YY_START_STACK_INCR -#define YY_START_STACK_INCR 25 -#endif - -/* Default declaration of generated scanner - a define so the user can - * easily add parameters. - */ -#ifndef YY_DECL -#define YY_DECL_IS_OURS 1 - -extern int yylex \ - (YYSTYPE * yylval_param,YYLTYPE * yylloc_param ,yyscan_t yyscanner); - -#define YY_DECL int yylex \ - (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner) -#endif /* !YY_DECL */ - -/* yy_get_previous_state - get the state just before the EOB char was reached */ - -#undef YY_NEW_FILE -#undef YY_FLUSH_BUFFER -#undef yy_set_bol -#undef yy_new_buffer -#undef yy_set_interactive -#undef YY_DO_BEFORE_ACTION - -#ifdef YY_DECL_IS_OURS -#undef YY_DECL_IS_OURS -#undef YY_DECL -#endif - -#line 174 "src/data/tikzlexer.l" - -#line 344 "tikzlexer.h" -#undef yyIN_HEADER -#endif /* yyHEADER_H */ diff --git a/tikzlexer.h b/tikzlexer.h new file mode 100644 index 0000000..6598601 --- /dev/null +++ b/tikzlexer.h @@ -0,0 +1,345 @@ +#ifndef yyHEADER_H +#define yyHEADER_H 1 +#define yyIN_HEADER 1 + +#line 6 "tikzlexer.h" + +#line 8 "tikzlexer.h" + +#define YY_INT_ALIGNED short int + +/* A lexical scanner generated by flex */ + +#define FLEX_SCANNER +#define YY_FLEX_MAJOR_VERSION 2 +#define YY_FLEX_MINOR_VERSION 5 +#define YY_FLEX_SUBMINOR_VERSION 35 +#if YY_FLEX_SUBMINOR_VERSION > 0 +#define FLEX_BETA +#endif + +/* First, we deal with platform-specific or compiler-specific issues. */ + +/* begin standard C headers. */ +#include +#include +#include +#include + +/* end standard C headers. */ + +/* flex integer type definitions */ + +#ifndef FLEXINT_H +#define FLEXINT_H + +/* C99 systems have . Non-C99 systems may or may not. */ + +#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L + +/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, + * if you want the limit (max/min) macros for int types. + */ +#ifndef __STDC_LIMIT_MACROS +#define __STDC_LIMIT_MACROS 1 +#endif + +#include +typedef int8_t flex_int8_t; +typedef uint8_t flex_uint8_t; +typedef int16_t flex_int16_t; +typedef uint16_t flex_uint16_t; +typedef int32_t flex_int32_t; +typedef uint32_t flex_uint32_t; +typedef uint64_t flex_uint64_t; +#else +typedef signed char flex_int8_t; +typedef short int flex_int16_t; +typedef int flex_int32_t; +typedef unsigned char flex_uint8_t; +typedef unsigned short int flex_uint16_t; +typedef unsigned int flex_uint32_t; +#endif /* ! C99 */ + +/* Limits of integral types. */ +#ifndef INT8_MIN +#define INT8_MIN (-128) +#endif +#ifndef INT16_MIN +#define INT16_MIN (-32767-1) +#endif +#ifndef INT32_MIN +#define INT32_MIN (-2147483647-1) +#endif +#ifndef INT8_MAX +#define INT8_MAX (127) +#endif +#ifndef INT16_MAX +#define INT16_MAX (32767) +#endif +#ifndef INT32_MAX +#define INT32_MAX (2147483647) +#endif +#ifndef UINT8_MAX +#define UINT8_MAX (255U) +#endif +#ifndef UINT16_MAX +#define UINT16_MAX (65535U) +#endif +#ifndef UINT32_MAX +#define UINT32_MAX (4294967295U) +#endif + +#endif /* ! FLEXINT_H */ + +#ifdef __cplusplus + +/* The "const" storage-class-modifier is valid. */ +#define YY_USE_CONST + +#else /* ! __cplusplus */ + +/* C99 requires __STDC__ to be defined as 1. */ +#if defined (__STDC__) + +#define YY_USE_CONST + +#endif /* defined (__STDC__) */ +#endif /* ! __cplusplus */ + +#ifdef YY_USE_CONST +#define yyconst const +#else +#define yyconst +#endif + +/* An opaque pointer. */ +#ifndef YY_TYPEDEF_YY_SCANNER_T +#define YY_TYPEDEF_YY_SCANNER_T +typedef void* yyscan_t; +#endif + +/* For convenience, these vars (plus the bison vars far below) + are macros in the reentrant scanner. */ +#define yyin yyg->yyin_r +#define yyout yyg->yyout_r +#define yyextra yyg->yyextra_r +#define yyleng yyg->yyleng_r +#define yytext yyg->yytext_r +#define yylineno (YY_CURRENT_BUFFER_LVALUE->yy_bs_lineno) +#define yycolumn (YY_CURRENT_BUFFER_LVALUE->yy_bs_column) +#define yy_flex_debug yyg->yy_flex_debug_r + +/* Size of default input buffer. */ +#ifndef YY_BUF_SIZE +#define YY_BUF_SIZE 16384 +#endif + +#ifndef YY_TYPEDEF_YY_BUFFER_STATE +#define YY_TYPEDEF_YY_BUFFER_STATE +typedef struct yy_buffer_state *YY_BUFFER_STATE; +#endif + +#ifndef YY_TYPEDEF_YY_SIZE_T +#define YY_TYPEDEF_YY_SIZE_T +typedef size_t yy_size_t; +#endif + +#ifndef YY_STRUCT_YY_BUFFER_STATE +#define YY_STRUCT_YY_BUFFER_STATE +struct yy_buffer_state + { + FILE *yy_input_file; + + char *yy_ch_buf; /* input buffer */ + char *yy_buf_pos; /* current position in input buffer */ + + /* Size of input buffer in bytes, not including room for EOB + * characters. + */ + yy_size_t yy_buf_size; + + /* Number of characters read into yy_ch_buf, not including EOB + * characters. + */ + yy_size_t yy_n_chars; + + /* Whether we "own" the buffer - i.e., we know we created it, + * and can realloc() it to grow it, and should free() it to + * delete it. + */ + int yy_is_our_buffer; + + /* Whether this is an "interactive" input source; if so, and + * if we're using stdio for input, then we want to use getc() + * instead of fread(), to make sure we stop fetching input after + * each newline. + */ + int yy_is_interactive; + + /* Whether we're considered to be at the beginning of a line. + * If so, '^' rules will be active on the next match, otherwise + * not. + */ + int yy_at_bol; + + int yy_bs_lineno; /**< The line count. */ + int yy_bs_column; /**< The column count. */ + + /* Whether to try to fill the input buffer when we reach the + * end of it. + */ + int yy_fill_buffer; + + int yy_buffer_status; + + }; +#endif /* !YY_STRUCT_YY_BUFFER_STATE */ + +void yyrestart (FILE *input_file ,yyscan_t yyscanner ); +void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); +YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ,yyscan_t yyscanner ); +void yy_delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); +void yy_flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); +void yypush_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); +void yypop_buffer_state (yyscan_t yyscanner ); + +YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ,yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len ,yyscan_t yyscanner ); + +void *yyalloc (yy_size_t ,yyscan_t yyscanner ); +void *yyrealloc (void *,yy_size_t ,yyscan_t yyscanner ); +void yyfree (void * ,yyscan_t yyscanner ); + +#define yywrap(n) 1 +#define YY_SKIP_YYWRAP + +#define yytext_ptr yytext_r + +#ifdef YY_HEADER_EXPORT_START_CONDITIONS +#define INITIAL 0 +#define props 1 +#define xcoord 2 +#define ycoord 3 +#define noderef 4 + +#endif + +#ifndef YY_NO_UNISTD_H +/* Special case for "unistd.h", since it is non-ANSI. We include it way + * down here because we want the user's section 1 to have been scanned first. + * The user has a chance to override it with an option. + */ +#include +#endif + +#define YY_EXTRA_TYPE TikzGraphAssembler * + +int yylex_init (yyscan_t* scanner); + +int yylex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner); + +/* Accessor methods to globals. + These are made visible to non-reentrant scanners for convenience. */ + +int yylex_destroy (yyscan_t yyscanner ); + +int yyget_debug (yyscan_t yyscanner ); + +void yyset_debug (int debug_flag ,yyscan_t yyscanner ); + +YY_EXTRA_TYPE yyget_extra (yyscan_t yyscanner ); + +void yyset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner ); + +FILE *yyget_in (yyscan_t yyscanner ); + +void yyset_in (FILE * in_str ,yyscan_t yyscanner ); + +FILE *yyget_out (yyscan_t yyscanner ); + +void yyset_out (FILE * out_str ,yyscan_t yyscanner ); + +yy_size_t yyget_leng (yyscan_t yyscanner ); + +char *yyget_text (yyscan_t yyscanner ); + +int yyget_lineno (yyscan_t yyscanner ); + +void yyset_lineno (int line_number ,yyscan_t yyscanner ); + +YYSTYPE * yyget_lval (yyscan_t yyscanner ); + +void yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner ); + + YYLTYPE *yyget_lloc (yyscan_t yyscanner ); + + void yyset_lloc (YYLTYPE * yylloc_param ,yyscan_t yyscanner ); + +/* Macros after this point can all be overridden by user definitions in + * section 1. + */ + +#ifndef YY_SKIP_YYWRAP +#ifdef __cplusplus +extern "C" int yywrap (yyscan_t yyscanner ); +#else +extern int yywrap (yyscan_t yyscanner ); +#endif +#endif + +#ifndef yytext_ptr +static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner); +#endif + +#ifdef YY_NEED_STRLEN +static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner); +#endif + +#ifndef YY_NO_INPUT + +#endif + +/* Amount of stuff to slurp up with each read. */ +#ifndef YY_READ_BUF_SIZE +#define YY_READ_BUF_SIZE 8192 +#endif + +/* Number of entries by which start-condition stack grows. */ +#ifndef YY_START_STACK_INCR +#define YY_START_STACK_INCR 25 +#endif + +/* Default declaration of generated scanner - a define so the user can + * easily add parameters. + */ +#ifndef YY_DECL +#define YY_DECL_IS_OURS 1 + +extern int yylex \ + (YYSTYPE * yylval_param,YYLTYPE * yylloc_param ,yyscan_t yyscanner); + +#define YY_DECL int yylex \ + (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner) +#endif /* !YY_DECL */ + +/* yy_get_previous_state - get the state just before the EOB char was reached */ + +#undef YY_NEW_FILE +#undef YY_FLUSH_BUFFER +#undef yy_set_bol +#undef yy_new_buffer +#undef yy_set_interactive +#undef YY_DO_BEFORE_ACTION + +#ifdef YY_DECL_IS_OURS +#undef YY_DECL_IS_OURS +#undef YY_DECL +#endif + +#line 174 "src/data/tikzlexer.l" + +#line 344 "tikzlexer.h" +#undef yyIN_HEADER +#endif /* yyHEADER_H */ -- cgit v1.2.3 From 1382f4fc322aeda453fd4ae4f5eceeeb47fcddfb Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Thu, 4 Jan 2018 16:13:00 +0100 Subject: updated readme --- README | 12 ------------ README.md | 26 +++++++++++++++++++++++++- 2 files changed, 25 insertions(+), 13 deletions(-) delete mode 100644 README diff --git a/README b/README deleted file mode 100644 index ecd6713..0000000 --- a/README +++ /dev/null @@ -1,12 +0,0 @@ -Building on OSX: - -You'll need QT5 and poppler with QT5 bindings. QT5 can be installed with Homebrew: - -$ brew install qt5 - -whereas poppler should be built from source to get the QT5 bindings. To compile, clang needs to have C++11 features enabled. I built using: - -$ CXXFLAGS="-std=c++11" ./configure -$ CXXFLAGS="-std=c++11" make - - diff --git a/README.md b/README.md index a8e8b64..a237b88 100644 --- a/README.md +++ b/README.md @@ -1 +1,25 @@ -TikZiT is a graphical tool for rapidly creating an editing node-and-edge style graphs. It was originally created to aid in the typesetting of "dot" diagrams of interacting quantum observables (see arXiv:0906.4725), but can be used as a general graph editing program. Click one of the above icons to download. To comment or contribute, email me at gmail.com preceded by aleks0 and an at-sign. \ No newline at end of file + +# TikZiT + +TikZiT is a graphical tool for rapidly creating graphs and diagrams using PGF/TikZ. It was used, for example, to make all of the 2500+ diagrams in this book. It is currently undergoing a port to Qt5 for better cross-platform support. As such, the code on this branch, and the README is a work in progress. + +## Building on Windows + +TODO + +## Building on Linux + +TODO + +## Building on MacOS + +You'll need Qt5 and poppler with Qt5 bindings. Qt5 can be installed using e.g. Homebrew, as follows: + + $ brew install qt5 + +Poppler should be built from source to get the Qt5 bindings. If Qt is setup correctly, the configure script included with Poppler should enable these automatically. Also, note that clang needs to have C++11 features enabled to build successfully. TikZiT has been tested on MacOS with poppler-0.50.0 (available here), built with the following commands: + + $ CXXFLAGS="-std=c++11" ./configure + $ CXXFLAGS="-std=c++11" make + + -- cgit v1.2.3 From 47d8a68613d823bbf93fd5cf6133a5753fbaa5b3 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Thu, 4 Jan 2018 16:13:42 +0100 Subject: ... --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a237b88..e79efea 100644 --- a/README.md +++ b/README.md @@ -15,11 +15,11 @@ TODO You'll need Qt5 and poppler with Qt5 bindings. Qt5 can be installed using e.g. Homebrew, as follows: - $ brew install qt5 + $ brew install qt5 Poppler should be built from source to get the Qt5 bindings. If Qt is setup correctly, the configure script included with Poppler should enable these automatically. Also, note that clang needs to have C++11 features enabled to build successfully. TikZiT has been tested on MacOS with poppler-0.50.0 (available here), built with the following commands: - $ CXXFLAGS="-std=c++11" ./configure - $ CXXFLAGS="-std=c++11" make + $ CXXFLAGS="-std=c++11" ./configure + $ CXXFLAGS="-std=c++11" make -- cgit v1.2.3 From c2e2f01df42ee690c136c577b37bb307b4e9d64c Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Thu, 4 Jan 2018 16:21:10 +0100 Subject: fixed a couple of warnings --- src/data/graphelementdata.cpp | 2 ++ src/gui/edgeitem.cpp | 2 +- src/gui/edgeitem.h | 3 +-- src/gui/propertypalette.cpp | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/data/graphelementdata.cpp b/src/data/graphelementdata.cpp index 3ce72c7..41fcbf0 100644 --- a/src/data/graphelementdata.cpp +++ b/src/data/graphelementdata.cpp @@ -86,6 +86,8 @@ QVariant GraphElementData::data(const QModelIndex &index, int role) const QString s = (index.column() == 0) ? p.key() : p.value(); return QVariant(s); } + + return QVariant(); } QVariant GraphElementData::headerData(int section, Qt::Orientation orientation, int role) const diff --git a/src/gui/edgeitem.cpp b/src/gui/edgeitem.cpp index 497fa07..04ee7b6 100644 --- a/src/gui/edgeitem.cpp +++ b/src/gui/edgeitem.cpp @@ -43,7 +43,7 @@ void EdgeItem::readPos() _cp2Item->setPos(toScreen(_edge->cp2())); } -void EdgeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) +void EdgeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) { //QGraphicsPathItem::paint(painter, option, widget); painter->setPen(pen()); diff --git a/src/gui/edgeitem.h b/src/gui/edgeitem.h index b017265..3701372 100644 --- a/src/gui/edgeitem.h +++ b/src/gui/edgeitem.h @@ -19,8 +19,7 @@ class EdgeItem : public QGraphicsPathItem public: EdgeItem(Edge *edge); void readPos(); - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *); QRectF boundingRect() const; QPainterPath shape() const; Edge *edge() const; diff --git a/src/gui/propertypalette.cpp b/src/gui/propertypalette.cpp index 5fc763f..b06e866 100644 --- a/src/gui/propertypalette.cpp +++ b/src/gui/propertypalette.cpp @@ -21,7 +21,7 @@ PropertyPalette::PropertyPalette(QWidget *parent) : d->setAtom("atom 1"); d->setProperty("key 2", "value 2"); - QModelIndex i = d->index(0,0); + //QModelIndex i = d->index(0,0); ui->treeView->setModel(d); QSettings settings("tikzit", "tikzit"); -- cgit v1.2.3 From ae3f1cfde0626a61c3968a8d797a22ed9fd16175 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Thu, 4 Jan 2018 16:24:44 +0100 Subject: removed some build artefacts from repo --- .gitignore | 3 + Makefile | 1139 ------------------ src/data/tikzlexer.lexer.cpp | 2535 ---------------------------------------- src/data/tikzparser.parser.cpp | 1938 ------------------------------ src/data/tikzparser.parser.hpp | 139 --- target_wrapper.sh | 6 - 6 files changed, 3 insertions(+), 5757 deletions(-) delete mode 100644 Makefile delete mode 100644 src/data/tikzlexer.lexer.cpp delete mode 100644 src/data/tikzparser.parser.cpp delete mode 100644 src/data/tikzparser.parser.hpp delete mode 100755 target_wrapper.sh diff --git a/.gitignore b/.gitignore index 6f9a00e..98bd6b3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ +.qmake.stash build-tikzit-* *.pro.user +Makefile +tikzit.app diff --git a/Makefile b/Makefile deleted file mode 100644 index ff6108f..0000000 --- a/Makefile +++ /dev/null @@ -1,1139 +0,0 @@ -############################################################################# -# Makefile for building: tikzit.app/Contents/MacOS/tikzit -# Generated by qmake (3.0) (Qt 5.7.1) -# Project: tikzit.pro -# Template: app -# Command: /usr/local/bin/qmake -o Makefile tikzit.pro -############################################################################# - -MAKEFILE = Makefile - -####### Compiler, tools and options - -CC = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -CXX = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++ -DEFINES = -DQT_DEPRECATED_WARNINGS -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -CFLAGS = -pipe -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -mmacosx-version-min=10.8 -O2 -Wall -W -fPIC $(DEFINES) -CXXFLAGS = -pipe -stdlib=libc++ -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -mmacosx-version-min=10.8 -O2 -std=gnu++11 -Wall -W -fPIC $(DEFINES) -INCPATH = -I. -Isrc -Isrc/gui -Isrc/data -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers -I. -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/OpenGL.framework/Headers -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/System/Library/Frameworks/AGL.framework/Headers -I. -I/usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang -F/usr/local/Cellar/qt5/5.7.1_1/lib -QMAKE = /usr/local/bin/qmake -DEL_FILE = rm -f -CHK_DIR_EXISTS= test -d -MKDIR = mkdir -p -COPY = cp -f -COPY_FILE = cp -f -COPY_DIR = cp -f -R -INSTALL_FILE = install -m 644 -p -INSTALL_PROGRAM = install -m 755 -p -INSTALL_DIR = cp -f -R -DEL_FILE = rm -f -SYMLINK = ln -f -s -DEL_DIR = rmdir -MOVE = mv -f -TAR = tar -cf -COMPRESS = gzip -9f -DISTNAME = tikzit1.0.0 -DISTDIR = /Users/alek/git/tikzit/tikzit/.tmp/tikzit1.0.0 -LINK = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++ -LFLAGS = -headerpad_max_install_names -stdlib=libc++ -Wl,-syslibroot,/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -mmacosx-version-min=10.8 -LIBS = $(SUBLIBS) -F/usr/local/Cellar/qt5/5.7.1_1/lib -framework QtWidgets -framework QtGui -framework QtCore -framework DiskArbitration -framework IOKit -framework OpenGL -framework AGL -AR = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ar cq -RANLIB = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib -s -SED = sed -STRIP = strip - -####### Output directory - -OBJECTS_DIR = ./ - -####### Files - -SOURCES = src/gui/mainwindow.cpp \ - src/gui/toolpalette.cpp \ - src/gui/tikzscene.cpp \ - src/data/graph.cpp \ - src/data/node.cpp \ - src/data/edge.cpp \ - src/data/tikzgraphassembler.cpp \ - src/data/graphelementdata.cpp \ - src/data/graphelementproperty.cpp \ - src/gui/propertypalette.cpp \ - src/main.cpp src/data/tikzlexer.lexer.cpp \ - src/data/tikzparser.parser.cpp \ - qrc_tikzit.cpp \ - moc_mainwindow.cpp \ - moc_toolpalette.cpp \ - moc_graph.cpp \ - moc_node.cpp \ - moc_edge.cpp \ - moc_tikzgraphassembler.cpp \ - moc_graphelementdata.cpp \ - moc_propertypalette.cpp -OBJECTS = mainwindow.o \ - toolpalette.o \ - tikzscene.o \ - graph.o \ - node.o \ - edge.o \ - tikzgraphassembler.o \ - graphelementdata.o \ - graphelementproperty.o \ - propertypalette.o \ - main.o \ - tikzlexer.lexer.o \ - tikzparser.parser.o \ - qrc_tikzit.o \ - moc_mainwindow.o \ - moc_toolpalette.o \ - moc_graph.o \ - moc_node.o \ - moc_edge.o \ - moc_tikzgraphassembler.o \ - moc_graphelementdata.o \ - moc_propertypalette.o -DIST = /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/spec_pre.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/qdevice.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/device_config.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/unix.conf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/mac.conf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/macx.conf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/sanitize.conf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/gcc-base.conf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/gcc-base-mac.conf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/clang.conf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/clang-mac.conf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/qconfig.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dcore.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dcore_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dextras.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dextras_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dinput.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dinput_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dlogic.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dlogic_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquick.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquick_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickextras.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickextras_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickinput.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickinput_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickrender.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickrender_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3drender.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3drender_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_bluetooth.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_bluetooth_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_bootstrap_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_charts.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_charts_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_clucene_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_concurrent.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_concurrent_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_core.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_core_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_datavisualization.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_datavisualization_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_designer.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_designer_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_designercomponents_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gamepad.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gamepad_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gui.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gui_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_help.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_help_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_location.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_location_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_macextras.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_macextras_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimedia.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimedia_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimediawidgets.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimediawidgets_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_network.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_network_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_nfc.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_nfc_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_opengl.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_opengl_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_openglextensions.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_openglextensions_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_packetprotocol_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_platformsupport_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_positioning.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_positioning_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_printsupport.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_printsupport_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_purchasing.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_purchasing_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qml.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qml_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmldebug_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmldevtools_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmltest.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmltest_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quick.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quick_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickcontrols2.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickcontrols2_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickparticles_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quicktemplates2_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickwidgets.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickwidgets_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_script.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_script_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scripttools.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scripttools_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scxml.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scxml_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sensors.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sensors_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialbus.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialbus_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialport.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialport_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sql.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sql_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_svg.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_svg_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_testlib.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_testlib_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_uiplugin.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_uitools.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_uitools_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webchannel.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webchannel_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webengine.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webengine_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginecore.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginecore_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginecoreheaders_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginewidgets.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginewidgets_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_websockets.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_websockets_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webview.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webview_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_widgets.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_widgets_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xml.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xml_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xmlpatterns.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xmlpatterns_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/qt_functions.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/qt_config.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang/qmake.conf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/spec_post.prf \ - .qmake.stash \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/exclusive_builds.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/sdk.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/toolchain.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/toolchain.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/default_pre.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/default_pre.prf \ - flex.pri \ - bison.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/resolve_config.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/default_post.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/default_post.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/objective_c.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/resolve_target.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/testcase.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/warn_on.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/qt.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/resources.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/moc.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/unix/opengl.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/uic.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/unix/thread.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/file_copies.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/rez.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/asset_catalogs.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/testcase_targets.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/exceptions.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/yacc.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/lex.prf \ - tikzit.pro src/gui/mainwindow.h \ - src/gui/toolpalette.h \ - src/gui/tikzscene.h \ - src/data/graph.h \ - src/data/node.h \ - src/data/edge.h \ - src/data/tikzgraphassembler.h \ - src/data/graphelementdata.h \ - src/data/graphelementproperty.h \ - src/gui/propertypalette.h \ - src/data/tikzparserdefs.h src/gui/mainwindow.cpp \ - src/gui/toolpalette.cpp \ - src/gui/tikzscene.cpp \ - src/data/graph.cpp \ - src/data/node.cpp \ - src/data/edge.cpp \ - src/data/tikzgraphassembler.cpp \ - src/data/graphelementdata.cpp \ - src/data/graphelementproperty.cpp \ - src/gui/propertypalette.cpp \ - src/main.cpp -QMAKE_TARGET = tikzit -DESTDIR = -TARGET = tikzit.app/Contents/MacOS/tikzit - - -first: all -####### Build rules - -$(TARGET): src/data/tikzlexer.lexer.cpp src/data/tikzparser.parser.cpp src/data/tikzparser.parser.hpp ui_mainwindow.h ui_propertypalette.h $(OBJECTS) - @test -d tikzit.app/Contents/MacOS/ || mkdir -p tikzit.app/Contents/MacOS/ - $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) - -Makefile: tikzit.pro /usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang/qmake.conf /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/spec_pre.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/qdevice.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/device_config.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/unix.conf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/mac.conf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/macx.conf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/sanitize.conf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/gcc-base.conf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/gcc-base-mac.conf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/clang.conf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/clang-mac.conf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/qconfig.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dcore.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dcore_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dextras.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dextras_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dinput.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dinput_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dlogic.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dlogic_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquick.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquick_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickextras.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickextras_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickinput.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickinput_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickrender.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickrender_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3drender.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3drender_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_bluetooth.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_bluetooth_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_bootstrap_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_charts.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_charts_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_clucene_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_concurrent.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_concurrent_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_core.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_core_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_datavisualization.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_datavisualization_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_designer.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_designer_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_designercomponents_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gamepad.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gamepad_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gui.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gui_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_help.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_help_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_location.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_location_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_macextras.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_macextras_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimedia.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimedia_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimediawidgets.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimediawidgets_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_network.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_network_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_nfc.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_nfc_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_opengl.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_opengl_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_openglextensions.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_openglextensions_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_packetprotocol_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_platformsupport_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_positioning.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_positioning_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_printsupport.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_printsupport_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_purchasing.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_purchasing_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qml.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qml_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmldebug_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmldevtools_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmltest.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmltest_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quick.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quick_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickcontrols2.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickcontrols2_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickparticles_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quicktemplates2_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickwidgets.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickwidgets_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_script.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_script_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scripttools.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scripttools_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scxml.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scxml_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sensors.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sensors_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialbus.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialbus_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialport.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialport_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sql.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sql_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_svg.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_svg_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_testlib.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_testlib_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_uiplugin.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_uitools.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_uitools_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webchannel.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webchannel_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webengine.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webengine_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginecore.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginecore_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginecoreheaders_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginewidgets.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginewidgets_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_websockets.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_websockets_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webview.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webview_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_widgets.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_widgets_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xml.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xml_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xmlpatterns.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xmlpatterns_private.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/qt_functions.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/qt_config.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang/qmake.conf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/spec_post.prf \ - .qmake.stash \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/exclusive_builds.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/sdk.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/toolchain.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/toolchain.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/default_pre.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/default_pre.prf \ - flex.pri \ - bison.pri \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/resolve_config.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/default_post.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/default_post.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/objective_c.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/resolve_target.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/testcase.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/warn_on.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/qt.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/resources.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/moc.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/unix/opengl.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/uic.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/unix/thread.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/file_copies.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/rez.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/asset_catalogs.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/testcase_targets.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/exceptions.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/yacc.prf \ - /usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/lex.prf \ - tikzit.pro \ - tikzit.qrc \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/QtWidgets.prl \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/QtGui.prl \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/QtCore.prl - $(QMAKE) -o Makefile tikzit.pro -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/spec_pre.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/qdevice.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/device_config.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/unix.conf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/mac.conf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/macx.conf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/sanitize.conf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/gcc-base.conf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/gcc-base-mac.conf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/clang.conf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/common/clang-mac.conf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/qconfig.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dcore.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dcore_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dextras.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dextras_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dinput.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dinput_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dlogic.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dlogic_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquick.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquick_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickextras.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickextras_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickinput.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickinput_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickrender.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3dquickrender_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3drender.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_3drender_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_bluetooth.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_bluetooth_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_bootstrap_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_charts.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_charts_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_clucene_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_concurrent.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_concurrent_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_core.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_core_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_datavisualization.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_datavisualization_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_designer.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_designer_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_designercomponents_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gamepad.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gamepad_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gui.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_gui_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_help.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_help_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_location.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_location_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_macextras.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_macextras_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimedia.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimedia_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimediawidgets.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_multimediawidgets_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_network.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_network_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_nfc.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_nfc_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_opengl.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_opengl_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_openglextensions.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_openglextensions_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_packetprotocol_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_platformsupport_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_positioning.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_positioning_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_printsupport.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_printsupport_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_purchasing.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_purchasing_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qml.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qml_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmldebug_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmldevtools_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmltest.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qmltest_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quick.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quick_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickcontrols2.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickcontrols2_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickparticles_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quicktemplates2_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickwidgets.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_quickwidgets_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_script.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_script_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scripttools.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scripttools_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scxml.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_scxml_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sensors.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sensors_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialbus.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialbus_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialport.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_serialport_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sql.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_sql_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_svg.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_svg_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_testlib.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_testlib_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_uiplugin.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_uitools.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_uitools_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webchannel.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webchannel_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webengine.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webengine_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginecore.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginecore_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginecoreheaders_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginewidgets.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webenginewidgets_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_websockets.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_websockets_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webview.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_webview_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_widgets.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_widgets_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xml.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xml_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xmlpatterns.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/modules/qt_lib_xmlpatterns_private.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/qt_functions.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/qt_config.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang/qmake.conf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/spec_post.prf: -.qmake.stash: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/exclusive_builds.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/sdk.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/toolchain.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/toolchain.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/default_pre.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/default_pre.prf: -flex.pri: -bison.pri: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/resolve_config.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/default_post.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/default_post.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/objective_c.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/resolve_target.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/testcase.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/warn_on.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/qt.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/resources.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/moc.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/unix/opengl.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/uic.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/unix/thread.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/file_copies.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/rez.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/mac/asset_catalogs.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/testcase_targets.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/exceptions.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/yacc.prf: -/usr/local/Cellar/qt5/5.7.1_1/mkspecs/features/lex.prf: -tikzit.pro: -tikzit.qrc: -/usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/QtWidgets.prl: -/usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/QtGui.prl: -/usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/QtCore.prl: -qmake: FORCE - @$(QMAKE) -o Makefile tikzit.pro - -qmake_all: FORCE - -tikzit.app/Contents/PkgInfo: - @test -d tikzit.app/Contents || mkdir -p tikzit.app/Contents - @$(DEL_FILE) tikzit.app/Contents/PkgInfo - @echo "APPL????" > tikzit.app/Contents/PkgInfo -tikzit.app/Contents/Resources/empty.lproj: - @test -d tikzit.app/Contents/Resources || mkdir -p tikzit.app/Contents/Resources - @touch tikzit.app/Contents/Resources/empty.lproj - -tikzit.app/Contents/Info.plist: - @test -d tikzit.app/Contents || mkdir -p tikzit.app/Contents - @$(DEL_FILE) tikzit.app/Contents/Info.plist - @sed -e "s,@SHORT_VERSION@,1.0,g" -e "s,@FULL_VERSION@,1.0.0,g" -e "s,@TYPEINFO@,????,g" -e "s,@BUNDLEIDENTIFIER@,com.yourcompany.tikzit,g" -e "s,@ICON@,,g" -e "s,@EXECUTABLE@,tikzit,g" -e "s,@LIBRARY@,tikzit,g" -e "s,@TYPEINFO@,????,g" /usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang/Info.plist.app >tikzit.app/Contents/Info.plist - -all: Makefile \ - tikzit.app/Contents/PkgInfo \ - tikzit.app/Contents/Resources/empty.lproj \ - tikzit.app/Contents/Info.plist $(TARGET) - -dist: distdir FORCE - (cd `dirname $(DISTDIR)` && $(TAR) $(DISTNAME).tar $(DISTNAME) && $(COMPRESS) $(DISTNAME).tar) && $(MOVE) `dirname $(DISTDIR)`/$(DISTNAME).tar.gz . && $(DEL_FILE) -r $(DISTDIR) - -distdir: FORCE - @test -d $(DISTDIR) || mkdir -p $(DISTDIR) - $(COPY_FILE) --parents $(DIST) $(DISTDIR)/ - $(COPY_FILE) --parents src/data/tikzlexer.l $(DISTDIR)/ - $(COPY_FILE) --parents src/data/tikzparser.y $(DISTDIR)/ - $(COPY_FILE) --parents src/data/tikzparser.y $(DISTDIR)/ - $(COPY_FILE) --parents tikzit.qrc $(DISTDIR)/ - $(COPY_FILE) --parents src/gui/mainwindow.h src/gui/toolpalette.h src/gui/tikzscene.h src/data/graph.h src/data/node.h src/data/edge.h src/data/tikzgraphassembler.h src/data/graphelementdata.h src/data/graphelementproperty.h src/gui/propertypalette.h src/data/tikzparserdefs.h $(DISTDIR)/ - $(COPY_FILE) --parents src/gui/mainwindow.cpp src/gui/toolpalette.cpp src/gui/tikzscene.cpp src/data/graph.cpp src/data/node.cpp src/data/edge.cpp src/data/tikzgraphassembler.cpp src/data/graphelementdata.cpp src/data/graphelementproperty.cpp src/gui/propertypalette.cpp src/main.cpp $(DISTDIR)/ - $(COPY_FILE) --parents src/gui/mainwindow.ui src/gui/propertypalette.ui $(DISTDIR)/ - - -clean: compiler_clean - -$(DEL_FILE) $(OBJECTS) - -$(DEL_FILE) *~ core *.core - - -distclean: clean - -$(DEL_FILE) -r tikzit.app - -$(DEL_FILE) /Users/alek/git/tikzit/tikzit/target_wrapper.sh .qmake.stash - -$(DEL_FILE) Makefile - - -####### Sub-libraries - -check: first - /Users/alek/git/tikzit/tikzit/target_wrapper.sh $(TESTRUNNER) ./$(QMAKE_TARGET).app/Contents/MacOS/$(QMAKE_TARGET) $(TESTARGS) - -mocclean: compiler_moc_header_clean compiler_moc_source_clean - -mocables: compiler_moc_header_make_all compiler_moc_source_make_all - -benchmark: first - -compiler_flex_make_all: src/data/tikzlexer.lexer.cpp -compiler_flex_clean: - -$(DEL_FILE) src/data/tikzlexer.lexer.cpp -src/data/tikzlexer.lexer.cpp: src/data/tikzlexer.l - flex --header-file -o src/data/tikzlexer.lexer.cpp src/data/tikzlexer.l - -compiler_bison_make_all: src/data/tikzparser.parser.cpp -compiler_bison_clean: - -$(DEL_FILE) src/data/tikzparser.parser.cpp -src/data/tikzparser.parser.cpp: src/data/tikzparser.y - bison -d -o src/data/tikzparser.parser.cpp src/data/tikzparser.y - -compiler_bison_header_make_all: src/data/tikzparser.parser.hpp -compiler_bison_header_clean: - -$(DEL_FILE) src/data/tikzparser.parser.hpp -src/data/tikzparser.parser.hpp: src/data/tikzparser.y - bison -d -o src/data/tikzparser.parser.cpp src/data/tikzparser.y - -compiler_rcc_make_all: qrc_tikzit.cpp -compiler_rcc_clean: - -$(DEL_FILE) qrc_tikzit.cpp -qrc_tikzit.cpp: tikzit.qrc \ - /usr/local/Cellar/qt5/5.7.1_1/bin/rcc \ - images/draw-ellipse.png \ - images/transform-crop-and-resize.png \ - images/draw-path.png \ - images/select-rectangular.png - /usr/local/Cellar/qt5/5.7.1_1/bin/rcc -name tikzit tikzit.qrc -o qrc_tikzit.cpp - -compiler_moc_header_make_all: moc_mainwindow.cpp moc_toolpalette.cpp moc_graph.cpp moc_node.cpp moc_edge.cpp moc_tikzgraphassembler.cpp moc_graphelementdata.cpp moc_propertypalette.cpp -compiler_moc_header_clean: - -$(DEL_FILE) moc_mainwindow.cpp moc_toolpalette.cpp moc_graph.cpp moc_node.cpp moc_edge.cpp moc_tikzgraphassembler.cpp moc_graphelementdata.cpp moc_propertypalette.cpp -moc_mainwindow.cpp: src/gui/tikzscene.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QWidget \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qwidget.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QGraphicsScene \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qgraphicsscene.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QMainWindow \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qmainwindow.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QGraphicsView \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qgraphicsview.h \ - src/gui/mainwindow.h \ - /usr/local/Cellar/qt5/5.7.1_1/bin/moc - /usr/local/Cellar/qt5/5.7.1_1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -D__APPLE_CC__ -I/usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang -I/Users/alek/git/tikzit/tikzit -I/Users/alek/git/tikzit/tikzit/src -I/Users/alek/git/tikzit/tikzit/src/gui -I/Users/alek/git/tikzit/tikzit/src/data -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/8.0.0/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include -F/usr/local/Cellar/qt5/5.7.1_1/lib src/gui/mainwindow.h -o moc_mainwindow.cpp - -moc_toolpalette.cpp: /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QToolBar \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qtoolbar.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QAction \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qaction.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QActionGroup \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qactiongroup.h \ - src/gui/toolpalette.h \ - /usr/local/Cellar/qt5/5.7.1_1/bin/moc - /usr/local/Cellar/qt5/5.7.1_1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -D__APPLE_CC__ -I/usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang -I/Users/alek/git/tikzit/tikzit -I/Users/alek/git/tikzit/tikzit/src -I/Users/alek/git/tikzit/tikzit/src/gui -I/Users/alek/git/tikzit/tikzit/src/data -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/8.0.0/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include -F/usr/local/Cellar/qt5/5.7.1_1/lib src/gui/toolpalette.h -o moc_toolpalette.cpp - -moc_graph.cpp: src/data/node.h \ - src/data/graphelementdata.h \ - src/data/graphelementproperty.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QPointF \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qpoint.h \ - src/data/edge.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QMultiHash \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qhash.h \ - src/data/graph.h \ - /usr/local/Cellar/qt5/5.7.1_1/bin/moc - /usr/local/Cellar/qt5/5.7.1_1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -D__APPLE_CC__ -I/usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang -I/Users/alek/git/tikzit/tikzit -I/Users/alek/git/tikzit/tikzit/src -I/Users/alek/git/tikzit/tikzit/src/gui -I/Users/alek/git/tikzit/tikzit/src/data -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/8.0.0/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include -F/usr/local/Cellar/qt5/5.7.1_1/lib src/data/graph.h -o moc_graph.cpp - -moc_node.cpp: src/data/graphelementdata.h \ - src/data/graphelementproperty.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QPointF \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qpoint.h \ - src/data/node.h \ - /usr/local/Cellar/qt5/5.7.1_1/bin/moc - /usr/local/Cellar/qt5/5.7.1_1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -D__APPLE_CC__ -I/usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang -I/Users/alek/git/tikzit/tikzit -I/Users/alek/git/tikzit/tikzit/src -I/Users/alek/git/tikzit/tikzit/src/gui -I/Users/alek/git/tikzit/tikzit/src/data -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/8.0.0/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include -F/usr/local/Cellar/qt5/5.7.1_1/lib src/data/node.h -o moc_node.cpp - -moc_edge.cpp: src/data/graphelementdata.h \ - src/data/graphelementproperty.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ - src/data/edge.h \ - /usr/local/Cellar/qt5/5.7.1_1/bin/moc - /usr/local/Cellar/qt5/5.7.1_1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -D__APPLE_CC__ -I/usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang -I/Users/alek/git/tikzit/tikzit -I/Users/alek/git/tikzit/tikzit/src -I/Users/alek/git/tikzit/tikzit/src/gui -I/Users/alek/git/tikzit/tikzit/src/data -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/8.0.0/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include -F/usr/local/Cellar/qt5/5.7.1_1/lib src/data/edge.h -o moc_edge.cpp - -moc_tikzgraphassembler.cpp: src/data/node.h \ - src/data/graphelementdata.h \ - src/data/graphelementproperty.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QPointF \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qpoint.h \ - src/data/graph.h \ - src/data/edge.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QMultiHash \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qhash.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QHash \ - src/data/tikzgraphassembler.h \ - /usr/local/Cellar/qt5/5.7.1_1/bin/moc - /usr/local/Cellar/qt5/5.7.1_1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -D__APPLE_CC__ -I/usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang -I/Users/alek/git/tikzit/tikzit -I/Users/alek/git/tikzit/tikzit/src -I/Users/alek/git/tikzit/tikzit/src/gui -I/Users/alek/git/tikzit/tikzit/src/data -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/8.0.0/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include -F/usr/local/Cellar/qt5/5.7.1_1/lib src/data/tikzgraphassembler.h -o moc_tikzgraphassembler.cpp - -moc_graphelementdata.cpp: src/data/graphelementproperty.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ - src/data/graphelementdata.h \ - /usr/local/Cellar/qt5/5.7.1_1/bin/moc - /usr/local/Cellar/qt5/5.7.1_1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -D__APPLE_CC__ -I/usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang -I/Users/alek/git/tikzit/tikzit -I/Users/alek/git/tikzit/tikzit/src -I/Users/alek/git/tikzit/tikzit/src/gui -I/Users/alek/git/tikzit/tikzit/src/data -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/8.0.0/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include -F/usr/local/Cellar/qt5/5.7.1_1/lib src/data/graphelementdata.h -o moc_graphelementdata.cpp - -moc_propertypalette.cpp: /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QDockWidget \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qdockwidget.h \ - src/gui/propertypalette.h \ - /usr/local/Cellar/qt5/5.7.1_1/bin/moc - /usr/local/Cellar/qt5/5.7.1_1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -D__APPLE_CC__ -I/usr/local/Cellar/qt5/5.7.1_1/mkspecs/macx-clang -I/Users/alek/git/tikzit/tikzit -I/Users/alek/git/tikzit/tikzit/src -I/Users/alek/git/tikzit/tikzit/src/gui -I/Users/alek/git/tikzit/tikzit/src/data -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers -I/usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/8.0.0/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk/usr/include -F/usr/local/Cellar/qt5/5.7.1_1/lib src/gui/propertypalette.h -o moc_propertypalette.cpp - -compiler_moc_source_make_all: -compiler_moc_source_clean: -compiler_uic_make_all: ui_mainwindow.h ui_propertypalette.h -compiler_uic_clean: - -$(DEL_FILE) ui_mainwindow.h ui_propertypalette.h -ui_mainwindow.h: src/gui/mainwindow.ui \ - /usr/local/Cellar/qt5/5.7.1_1/bin/uic - /usr/local/Cellar/qt5/5.7.1_1/bin/uic src/gui/mainwindow.ui -o ui_mainwindow.h - -ui_propertypalette.h: src/gui/propertypalette.ui \ - /usr/local/Cellar/qt5/5.7.1_1/bin/uic - /usr/local/Cellar/qt5/5.7.1_1/bin/uic src/gui/propertypalette.ui -o ui_propertypalette.h - -compiler_rez_source_make_all: -compiler_rez_source_clean: -compiler_yacc_decl_make_all: -compiler_yacc_decl_clean: -compiler_yacc_impl_make_all: -compiler_yacc_impl_clean: -compiler_lex_make_all: -compiler_lex_clean: -compiler_clean: compiler_flex_clean compiler_bison_clean compiler_bison_header_clean compiler_rcc_clean compiler_moc_header_clean compiler_uic_clean - -####### Compile - -mainwindow.o: src/gui/mainwindow.cpp src/gui/mainwindow.h \ - src/gui/tikzscene.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QWidget \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qwidget.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QGraphicsScene \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qgraphicsscene.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QMainWindow \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qmainwindow.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QGraphicsView \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qgraphicsview.h \ - ui_mainwindow.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QDebug \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qdebug.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o mainwindow.o src/gui/mainwindow.cpp - -toolpalette.o: src/gui/toolpalette.cpp src/gui/toolpalette.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QToolBar \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qtoolbar.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QAction \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qaction.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QActionGroup \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qactiongroup.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QLayout \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qlayout.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QVBoxLayout \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qboxlayout.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o toolpalette.o src/gui/toolpalette.cpp - -tikzscene.o: src/gui/tikzscene.cpp src/gui/tikzscene.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QWidget \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qwidget.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QGraphicsScene \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qgraphicsscene.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o tikzscene.o src/gui/tikzscene.cpp - -graph.o: src/data/graph.cpp src/data/graph.h \ - src/data/node.h \ - src/data/graphelementdata.h \ - src/data/graphelementproperty.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QPointF \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qpoint.h \ - src/data/edge.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QMultiHash \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qhash.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o graph.o src/data/graph.cpp - -node.o: src/data/node.cpp src/data/node.h \ - src/data/graphelementdata.h \ - src/data/graphelementproperty.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QPointF \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qpoint.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QDebug \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qdebug.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o node.o src/data/node.cpp - -edge.o: src/data/edge.cpp src/data/edge.h \ - src/data/graphelementdata.h \ - src/data/graphelementproperty.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o edge.o src/data/edge.cpp - -tikzgraphassembler.o: src/data/tikzgraphassembler.cpp src/data/tikzgraphassembler.h \ - src/data/node.h \ - src/data/graphelementdata.h \ - src/data/graphelementproperty.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QPointF \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qpoint.h \ - src/data/graph.h \ - src/data/edge.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QMultiHash \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qhash.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QHash - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o tikzgraphassembler.o src/data/tikzgraphassembler.cpp - -graphelementdata.o: src/data/graphelementdata.cpp src/data/graphelementdata.h \ - src/data/graphelementproperty.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QDebug \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qdebug.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o graphelementdata.o src/data/graphelementdata.cpp - -graphelementproperty.o: src/data/graphelementproperty.cpp src/data/graphelementproperty.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o graphelementproperty.o src/data/graphelementproperty.cpp - -propertypalette.o: src/gui/propertypalette.cpp src/gui/propertypalette.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QDockWidget \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qdockwidget.h \ - src/data/graphelementdata.h \ - src/data/graphelementproperty.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ - ui_propertypalette.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QDebug \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qdebug.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers/QCloseEvent \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtGui.framework/Headers/qevent.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QSettings \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qsettings.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o propertypalette.o src/gui/propertypalette.cpp - -main.o: src/main.cpp src/gui/mainwindow.h \ - src/gui/tikzscene.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QWidget \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qwidget.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QGraphicsScene \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qgraphicsscene.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QMainWindow \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qmainwindow.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QGraphicsView \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qgraphicsview.h \ - src/gui/toolpalette.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QObject \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qobject.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QToolBar \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qtoolbar.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QAction \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qaction.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QActionGroup \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qactiongroup.h \ - src/gui/propertypalette.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QDockWidget \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qdockwidget.h \ - src/data/graph.h \ - src/data/node.h \ - src/data/graphelementdata.h \ - src/data/graphelementproperty.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QAbstractItemModel \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qabstractitemmodel.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QString \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qstring.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVariant \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvariant.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QModelIndex \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QVector \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qvector.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QPointF \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qpoint.h \ - src/data/edge.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/QMultiHash \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtCore.framework/Headers/qhash.h \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/QApplication \ - /usr/local/Cellar/qt5/5.7.1_1/lib/QtWidgets.framework/Headers/qapplication.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o src/main.cpp - -tikzlexer.lexer.o: src/data/tikzlexer.lexer.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o tikzlexer.lexer.o src/data/tikzlexer.lexer.cpp - -tikzparser.parser.o: src/data/tikzparser.parser.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o tikzparser.parser.o src/data/tikzparser.parser.cpp - -qrc_tikzit.o: qrc_tikzit.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o qrc_tikzit.o qrc_tikzit.cpp - -moc_mainwindow.o: moc_mainwindow.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_mainwindow.o moc_mainwindow.cpp - -moc_toolpalette.o: moc_toolpalette.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_toolpalette.o moc_toolpalette.cpp - -moc_graph.o: moc_graph.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_graph.o moc_graph.cpp - -moc_node.o: moc_node.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_node.o moc_node.cpp - -moc_edge.o: moc_edge.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_edge.o moc_edge.cpp - -moc_tikzgraphassembler.o: moc_tikzgraphassembler.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_tikzgraphassembler.o moc_tikzgraphassembler.cpp - -moc_graphelementdata.o: moc_graphelementdata.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_graphelementdata.o moc_graphelementdata.cpp - -moc_propertypalette.o: moc_propertypalette.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_propertypalette.o moc_propertypalette.cpp - -####### Install - -install_target: first FORCE - @test -d $(INSTALL_ROOT)/usr/local/Cellar/qt5/5.7.1_1/tests/tikzit || mkdir -p $(INSTALL_ROOT)/usr/local/Cellar/qt5/5.7.1_1/tests/tikzit - $(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/Cellar/qt5/5.7.1_1/tests/tikzit/tikzit.app - - -$(INSTALL_DIR) tikzit.app $(INSTALL_ROOT)/usr/local/Cellar/qt5/5.7.1_1/tests/tikzit/tikzit.app - -$(STRIP) $(INSTALL_ROOT)/usr/local/Cellar/qt5/5.7.1_1/tests/tikzit/tikzit.app/Contents/MacOS/$(QMAKE_TARGET) - -uninstall_target: FORCE - -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/Cellar/qt5/5.7.1_1/tests/tikzit/tikzit.app - -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/Cellar/qt5/5.7.1_1/tests/tikzit/ - - -install: install_target FORCE - -uninstall: uninstall_target FORCE - -FORCE: - diff --git a/src/data/tikzlexer.lexer.cpp b/src/data/tikzlexer.lexer.cpp deleted file mode 100644 index 7ff1d18..0000000 --- a/src/data/tikzlexer.lexer.cpp +++ /dev/null @@ -1,2535 +0,0 @@ -#line 2 "../tikzit/src/data/tikzlexer.lexer.cpp" - -#line 4 "../tikzit/src/data/tikzlexer.lexer.cpp" - -#define YY_INT_ALIGNED short int - -/* A lexical scanner generated by flex */ - -#define FLEX_SCANNER -#define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 35 -#if YY_FLEX_SUBMINOR_VERSION > 0 -#define FLEX_BETA -#endif - -/* First, we deal with platform-specific or compiler-specific issues. */ - -/* begin standard C headers. */ -#include -#include -#include -#include - -/* end standard C headers. */ - -/* flex integer type definitions */ - -#ifndef FLEXINT_H -#define FLEXINT_H - -/* C99 systems have . Non-C99 systems may or may not. */ - -#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L - -/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, - * if you want the limit (max/min) macros for int types. - */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS 1 -#endif - -#include -typedef int8_t flex_int8_t; -typedef uint8_t flex_uint8_t; -typedef int16_t flex_int16_t; -typedef uint16_t flex_uint16_t; -typedef int32_t flex_int32_t; -typedef uint32_t flex_uint32_t; -typedef uint64_t flex_uint64_t; -#else -typedef signed char flex_int8_t; -typedef short int flex_int16_t; -typedef int flex_int32_t; -typedef unsigned char flex_uint8_t; -typedef unsigned short int flex_uint16_t; -typedef unsigned int flex_uint32_t; -#endif /* ! C99 */ - -/* Limits of integral types. */ -#ifndef INT8_MIN -#define INT8_MIN (-128) -#endif -#ifndef INT16_MIN -#define INT16_MIN (-32767-1) -#endif -#ifndef INT32_MIN -#define INT32_MIN (-2147483647-1) -#endif -#ifndef INT8_MAX -#define INT8_MAX (127) -#endif -#ifndef INT16_MAX -#define INT16_MAX (32767) -#endif -#ifndef INT32_MAX -#define INT32_MAX (2147483647) -#endif -#ifndef UINT8_MAX -#define UINT8_MAX (255U) -#endif -#ifndef UINT16_MAX -#define UINT16_MAX (65535U) -#endif -#ifndef UINT32_MAX -#define UINT32_MAX (4294967295U) -#endif - -#endif /* ! FLEXINT_H */ - -#ifdef __cplusplus - -/* The "const" storage-class-modifier is valid. */ -#define YY_USE_CONST - -#else /* ! __cplusplus */ - -/* C99 requires __STDC__ to be defined as 1. */ -#if defined (__STDC__) - -#define YY_USE_CONST - -#endif /* defined (__STDC__) */ -#endif /* ! __cplusplus */ - -#ifdef YY_USE_CONST -#define yyconst const -#else -#define yyconst -#endif - -/* Returned upon end-of-file. */ -#define YY_NULL 0 - -/* Promotes a possibly negative, possibly signed char to an unsigned - * integer for use as an array index. If the signed char is negative, - * we want to instead treat it as an 8-bit unsigned char, hence the - * double cast. - */ -#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) - -/* An opaque pointer. */ -#ifndef YY_TYPEDEF_YY_SCANNER_T -#define YY_TYPEDEF_YY_SCANNER_T -typedef void* yyscan_t; -#endif - -/* For convenience, these vars (plus the bison vars far below) - are macros in the reentrant scanner. */ -#define yyin yyg->yyin_r -#define yyout yyg->yyout_r -#define yyextra yyg->yyextra_r -#define yyleng yyg->yyleng_r -#define yytext yyg->yytext_r -#define yylineno (YY_CURRENT_BUFFER_LVALUE->yy_bs_lineno) -#define yycolumn (YY_CURRENT_BUFFER_LVALUE->yy_bs_column) -#define yy_flex_debug yyg->yy_flex_debug_r - -/* Enter a start condition. This macro really ought to take a parameter, - * but we do it the disgusting crufty way forced on us by the ()-less - * definition of BEGIN. - */ -#define BEGIN yyg->yy_start = 1 + 2 * - -/* Translate the current start state into a value that can be later handed - * to BEGIN to return to the state. The YYSTATE alias is for lex - * compatibility. - */ -#define YY_START ((yyg->yy_start - 1) / 2) -#define YYSTATE YY_START - -/* Action number for EOF rule of a given start state. */ -#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) - -/* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE yyrestart(yyin ,yyscanner ) - -#define YY_END_OF_BUFFER_CHAR 0 - -/* Size of default input buffer. */ -#ifndef YY_BUF_SIZE -#define YY_BUF_SIZE 16384 -#endif - -/* The state buf must be large enough to hold one state per character in the main buffer. - */ -#define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type)) - -#ifndef YY_TYPEDEF_YY_BUFFER_STATE -#define YY_TYPEDEF_YY_BUFFER_STATE -typedef struct yy_buffer_state *YY_BUFFER_STATE; -#endif - -#ifndef YY_TYPEDEF_YY_SIZE_T -#define YY_TYPEDEF_YY_SIZE_T -typedef size_t yy_size_t; -#endif - -#define EOB_ACT_CONTINUE_SCAN 0 -#define EOB_ACT_END_OF_FILE 1 -#define EOB_ACT_LAST_MATCH 2 - - /* Note: We specifically omit the test for yy_rule_can_match_eol because it requires - * access to the local variable yy_act. Since yyless() is a macro, it would break - * existing scanners that call yyless() from OUTSIDE yylex. - * One obvious solution it to make yy_act a global. I tried that, and saw - * a 5% performance hit in a non-yylineno scanner, because yy_act is - * normally declared as a register variable-- so it is not worth it. - */ - #define YY_LESS_LINENO(n) \ - do { \ - yy_size_t yyl;\ - for ( yyl = n; yyl < yyleng; ++yyl )\ - if ( yytext[yyl] == '\n' )\ - --yylineno;\ - }while(0) - -/* Return all but the first "n" matched characters back to the input stream. */ -#define yyless(n) \ - do \ - { \ - /* Undo effects of setting up yytext. */ \ - int yyless_macro_arg = (n); \ - YY_LESS_LINENO(yyless_macro_arg);\ - *yy_cp = yyg->yy_hold_char; \ - YY_RESTORE_YY_MORE_OFFSET \ - yyg->yy_c_buf_p = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \ - YY_DO_BEFORE_ACTION; /* set up yytext again */ \ - } \ - while ( 0 ) - -#define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner ) - -#ifndef YY_STRUCT_YY_BUFFER_STATE -#define YY_STRUCT_YY_BUFFER_STATE -struct yy_buffer_state - { - FILE *yy_input_file; - - char *yy_ch_buf; /* input buffer */ - char *yy_buf_pos; /* current position in input buffer */ - - /* Size of input buffer in bytes, not including room for EOB - * characters. - */ - yy_size_t yy_buf_size; - - /* Number of characters read into yy_ch_buf, not including EOB - * characters. - */ - yy_size_t yy_n_chars; - - /* Whether we "own" the buffer - i.e., we know we created it, - * and can realloc() it to grow it, and should free() it to - * delete it. - */ - int yy_is_our_buffer; - - /* Whether this is an "interactive" input source; if so, and - * if we're using stdio for input, then we want to use getc() - * instead of fread(), to make sure we stop fetching input after - * each newline. - */ - int yy_is_interactive; - - /* Whether we're considered to be at the beginning of a line. - * If so, '^' rules will be active on the next match, otherwise - * not. - */ - int yy_at_bol; - - int yy_bs_lineno; /**< The line count. */ - int yy_bs_column; /**< The column count. */ - - /* Whether to try to fill the input buffer when we reach the - * end of it. - */ - int yy_fill_buffer; - - int yy_buffer_status; - -#define YY_BUFFER_NEW 0 -#define YY_BUFFER_NORMAL 1 - /* When an EOF's been seen but there's still some text to process - * then we mark the buffer as YY_EOF_PENDING, to indicate that we - * shouldn't try reading from the input source any more. We might - * still have a bunch of tokens to match, though, because of - * possible backing-up. - * - * When we actually see the EOF, we change the status to "new" - * (via yyrestart()), so that the user can continue scanning by - * just pointing yyin at a new input file. - */ -#define YY_BUFFER_EOF_PENDING 2 - - }; -#endif /* !YY_STRUCT_YY_BUFFER_STATE */ - -/* We provide macros for accessing buffer states in case in the - * future we want to put the buffer states in a more general - * "scanner state". - * - * Returns the top of the stack, or NULL. - */ -#define YY_CURRENT_BUFFER ( yyg->yy_buffer_stack \ - ? yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] \ - : NULL) - -/* Same as previous macro, but useful when we know that the buffer stack is not - * NULL or when we need an lvalue. For internal use only. - */ -#define YY_CURRENT_BUFFER_LVALUE yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] - -void yyrestart (FILE *input_file ,yyscan_t yyscanner ); -void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); -YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ,yyscan_t yyscanner ); -void yy_delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); -void yy_flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); -void yypush_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); -void yypop_buffer_state (yyscan_t yyscanner ); - -static void yyensure_buffer_stack (yyscan_t yyscanner ); -static void yy_load_buffer_state (yyscan_t yyscanner ); -static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file ,yyscan_t yyscanner ); - -#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER ,yyscanner) - -YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner ); -YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ,yyscan_t yyscanner ); -YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len ,yyscan_t yyscanner ); - -void *yyalloc (yy_size_t ,yyscan_t yyscanner ); -void *yyrealloc (void *,yy_size_t ,yyscan_t yyscanner ); -void yyfree (void * ,yyscan_t yyscanner ); - -#define yy_new_buffer yy_create_buffer - -#define yy_set_interactive(is_interactive) \ - { \ - if ( ! YY_CURRENT_BUFFER ){ \ - yyensure_buffer_stack (yyscanner); \ - YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \ - } \ - YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ - } - -#define yy_set_bol(at_bol) \ - { \ - if ( ! YY_CURRENT_BUFFER ){\ - yyensure_buffer_stack (yyscanner); \ - YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \ - } \ - YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ - } - -#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) - -#define yywrap(n) 1 -#define YY_SKIP_YYWRAP - -typedef unsigned char YY_CHAR; - -typedef int yy_state_type; - -#define yytext_ptr yytext_r - -static yy_state_type yy_get_previous_state (yyscan_t yyscanner ); -static yy_state_type yy_try_NUL_trans (yy_state_type current_state ,yyscan_t yyscanner); -static int yy_get_next_buffer (yyscan_t yyscanner ); -static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner ); - -/* Done after the current pattern has been matched and before the - * corresponding action - sets up yytext. - */ -#define YY_DO_BEFORE_ACTION \ - yyg->yytext_ptr = yy_bp; \ - yyleng = (yy_size_t) (yy_cp - yy_bp); \ - yyg->yy_hold_char = *yy_cp; \ - *yy_cp = '\0'; \ - yyg->yy_c_buf_p = yy_cp; - -#define YY_NUM_RULES 35 -#define YY_END_OF_BUFFER 36 -/* This struct is not used in this scanner, - but its presence is necessary. */ -struct yy_trans_info - { - flex_int32_t yy_verify; - flex_int32_t yy_nxt; - }; -static yyconst flex_int16_t yy_accept[259] = - { 0, - 0, 0, 0, 0, 16, 16, 18, 18, 0, 0, - 36, 34, 2, 1, 1, 25, 33, 14, 20, 34, - 33, 33, 33, 33, 29, 23, 1, 23, 22, 23, - 14, 21, 20, 23, 24, 23, 23, 23, 23, 16, - 34, 16, 19, 17, 18, 34, 18, 27, 2, 1, - 25, 28, 26, 27, 14, 20, 27, 27, 27, 27, - 27, 2, 1, 0, 0, 0, 0, 0, 33, 32, - 32, 32, 32, 32, 32, 12, 33, 33, 13, 23, - 0, 0, 23, 23, 23, 23, 23, 23, 23, 23, - 23, 23, 12, 23, 23, 13, 0, 16, 16, 16, - - 0, 18, 18, 18, 27, 2, 27, 27, 27, 27, - 27, 27, 27, 27, 27, 27, 27, 12, 27, 27, - 13, 0, 15, 0, 0, 0, 0, 0, 32, 32, - 32, 32, 32, 33, 33, 0, 23, 23, 23, 23, - 23, 23, 23, 23, 27, 27, 27, 27, 27, 27, - 27, 27, 27, 27, 27, 0, 0, 32, 32, 31, - 32, 32, 11, 33, 23, 23, 23, 23, 23, 11, - 23, 27, 27, 27, 27, 27, 27, 11, 27, 32, - 7, 0, 8, 9, 33, 23, 7, 8, 9, 23, - 27, 7, 8, 9, 27, 30, 0, 0, 33, 23, - - 23, 27, 27, 0, 0, 0, 33, 23, 27, 0, - 0, 0, 0, 33, 23, 27, 0, 0, 0, 0, - 10, 10, 10, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, - 0, 0, 0, 4, 5, 0, 3, 0 - } ; - -static yyconst flex_int32_t yy_ec[256] = - { 0, - 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, - 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 5, 1, 1, 1, 1, 1, 1, 1, 6, - 7, 1, 1, 8, 9, 10, 1, 11, 11, 11, - 11, 11, 11, 11, 11, 11, 11, 1, 12, 1, - 13, 1, 1, 1, 14, 14, 14, 14, 14, 14, - 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, - 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, - 15, 16, 17, 1, 1, 1, 18, 19, 20, 21, - - 22, 23, 24, 25, 26, 14, 27, 28, 14, 29, - 30, 31, 14, 32, 14, 33, 34, 14, 35, 14, - 36, 37, 38, 1, 39, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1 - } ; - -static yyconst flex_int32_t yy_meta[40] = - { 0, - 1, 1, 2, 1, 1, 1, 3, 4, 1, 3, - 5, 1, 4, 5, 1, 1, 4, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 2, 1 - } ; - -static yyconst flex_int16_t yy_base[265] = - { 0, - 0, 0, 39, 0, 70, 73, 105, 137, 175, 0, - 694, 896, 83, 896, 688, 81, 0, 896, 896, 74, - 655, 656, 663, 653, 896, 92, 96, 213, 896, 224, - 102, 896, 104, 263, 896, 302, 87, 88, 89, 113, - 671, 115, 896, 896, 117, 670, 119, 0, 129, 675, - 127, 896, 896, 341, 0, 0, 380, 419, 109, 118, - 119, 148, 896, 149, 156, 163, 664, 227, 0, 0, - 651, 639, 641, 639, 650, 0, 646, 646, 0, 167, - 214, 457, 239, 240, 250, 630, 294, 300, 450, 305, - 464, 478, 627, 233, 67, 625, 645, 145, 643, 246, - - 642, 322, 639, 327, 0, 215, 354, 361, 368, 432, - 613, 425, 482, 495, 499, 512, 526, 609, 238, 319, - 607, 549, 896, 450, 628, 556, 238, 440, 614, 614, - 600, 599, 585, 586, 574, 468, 527, 549, 563, 543, - 567, 580, 318, 573, 605, 612, 619, 369, 612, 626, - 606, 630, 643, 322, 572, 157, 473, 578, 568, 562, - 575, 570, 0, 575, 658, 671, 688, 682, 708, 558, - 100, 323, 721, 734, 751, 693, 771, 557, 287, 558, - 0, 336, 0, 0, 554, 745, 756, 776, 782, 247, - 787, 793, 798, 804, 354, 541, 553, 550, 551, 817, - - 229, 837, 277, 408, 546, 526, 524, 405, 459, 527, - 524, 519, 509, 518, 396, 431, 516, 510, 507, 494, - 0, 490, 489, 489, 478, 484, 484, 479, 475, 487, - 482, 470, 465, 454, 456, 470, 457, 453, 440, 427, - 417, 417, 398, 404, 388, 351, 353, 329, 328, 896, - 309, 209, 205, 896, 896, 131, 896, 896, 136, 97, - 875, 880, 885, 890 - } ; - -static yyconst flex_int16_t yy_def[265] = - { 0, - 258, 1, 258, 3, 1, 1, 1, 1, 258, 9, - 258, 258, 258, 258, 258, 258, 259, 258, 258, 260, - 259, 259, 259, 259, 258, 261, 261, 261, 258, 262, - 261, 258, 261, 258, 258, 262, 36, 36, 36, 258, - 258, 259, 258, 258, 258, 258, 259, 263, 263, 263, - 263, 258, 258, 264, 263, 263, 258, 264, 58, 58, - 58, 258, 258, 258, 258, 258, 258, 258, 259, 260, - 260, 260, 260, 260, 260, 259, 259, 259, 259, 261, - 261, 261, 261, 261, 261, 36, 34, 34, 34, 34, - 34, 34, 36, 36, 36, 36, 258, 258, 258, 259, - - 258, 258, 258, 259, 263, 263, 263, 263, 263, 263, - 58, 57, 57, 57, 57, 57, 57, 58, 58, 58, - 58, 258, 258, 258, 258, 258, 258, 258, 260, 260, - 260, 260, 260, 259, 259, 261, 261, 34, 34, 34, - 34, 34, 36, 36, 263, 263, 263, 263, 57, 57, - 57, 57, 57, 58, 58, 258, 258, 260, 260, 260, - 260, 260, 259, 259, 34, 34, 34, 34, 34, 36, - 36, 263, 57, 57, 57, 57, 57, 58, 58, 260, - 260, 258, 260, 260, 259, 34, 34, 34, 34, 36, - 57, 57, 57, 57, 58, 260, 258, 258, 259, 34, - - 36, 57, 58, 258, 258, 258, 259, 36, 58, 258, - 258, 258, 258, 259, 36, 58, 258, 258, 258, 258, - 259, 36, 58, 258, 258, 258, 258, 258, 258, 258, - 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, - 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, - 258, 258, 258, 258, 258, 258, 258, 0, 258, 258, - 258, 258, 258, 258 - } ; - -static yyconst flex_int16_t yy_nxt[936] = - { 0, - 12, 13, 14, 15, 13, 16, 12, 12, 12, 12, - 17, 18, 12, 17, 19, 20, 12, 21, 17, 17, - 17, 17, 17, 17, 17, 17, 17, 17, 22, 17, - 17, 23, 24, 17, 17, 17, 17, 25, 12, 26, - 13, 14, 27, 13, 28, 26, 29, 26, 26, 30, - 31, 32, 30, 33, 34, 35, 36, 30, 30, 30, - 30, 30, 30, 30, 30, 30, 30, 37, 30, 30, - 38, 39, 30, 30, 30, 30, 25, 26, 40, 41, - 42, 40, 41, 42, 62, 64, 144, 62, 65, 66, - 67, 68, 71, 81, 72, 73, 81, 81, 63, 86, - - 81, 70, 74, 81, 75, 81, 81, 12, 81, 95, - 12, 43, 44, 45, 46, 47, 94, 190, 96, 86, - 86, 86, 97, 98, 97, 100, 101, 102, 101, 104, - 106, 107, 86, 106, 108, 109, 67, 110, 119, 120, - 69, 111, 12, 43, 44, 45, 46, 47, 121, 62, - 111, 111, 62, 64, 97, 98, 65, 66, 67, 68, - 122, 156, 123, 123, 124, 125, 126, 127, 81, 257, - 65, 81, 67, 68, 12, 48, 49, 14, 50, 49, - 51, 52, 48, 48, 53, 54, 55, 48, 54, 56, - 57, 48, 58, 54, 54, 54, 54, 54, 54, 54, - - 54, 54, 54, 59, 54, 54, 60, 61, 54, 54, - 54, 54, 12, 48, 81, 81, 106, 82, 81, 106, - 65, 83, 84, 85, 80, 81, 256, 80, 81, 80, - 80, 127, 80, 80, 65, 80, 67, 68, 80, 80, - 81, 81, 127, 136, 81, 65, 65, 255, 84, 85, - 137, 81, 208, 143, 136, 97, 100, 65, 154, 84, - 85, 86, 80, 80, 81, 86, 80, 81, 80, 80, - 111, 80, 80, 87, 80, 201, 87, 80, 80, 86, - 87, 88, 87, 89, 90, 87, 87, 87, 87, 87, - 87, 91, 87, 92, 87, 87, 87, 87, 87, 87, - - 209, 80, 80, 81, 195, 80, 81, 80, 80, 111, - 80, 80, 87, 80, 87, 87, 80, 80, 87, 111, - 87, 138, 87, 87, 87, 87, 87, 172, 87, 123, - 87, 101, 102, 140, 93, 87, 101, 104, 155, 170, - 80, 105, 105, 178, 105, 105, 105, 254, 105, 105, - 86, 111, 105, 105, 111, 105, 105, 105, 107, 253, - 252, 108, 109, 67, 110, 145, 197, 123, 198, 146, - 125, 147, 148, 148, 251, 108, 108, 67, 110, 105, - 105, 105, 203, 105, 105, 105, 111, 105, 105, 250, - 112, 105, 105, 112, 105, 105, 105, 112, 113, 112, - - 114, 115, 112, 112, 112, 112, 112, 112, 116, 112, - 117, 112, 112, 112, 112, 112, 112, 222, 105, 105, - 105, 249, 105, 105, 105, 248, 105, 105, 86, 247, - 105, 105, 215, 105, 105, 105, 148, 86, 210, 108, - 211, 67, 110, 112, 127, 112, 112, 65, 246, 245, - 128, 118, 223, 112, 156, 112, 123, 105, 81, 125, - 126, 82, 244, 111, 65, 83, 84, 85, 87, 81, - 87, 87, 136, 243, 242, 65, 241, 156, 87, 123, - 87, 139, 87, 157, 87, 87, 216, 240, 239, 238, - 237, 111, 87, 141, 87, 142, 87, 236, 87, 87, - - 112, 235, 112, 149, 234, 233, 87, 232, 87, 231, - 112, 230, 112, 112, 229, 112, 112, 112, 228, 112, - 112, 111, 86, 112, 227, 112, 150, 151, 81, 112, - 112, 136, 112, 112, 65, 226, 225, 137, 224, 221, - 112, 152, 112, 153, 112, 220, 112, 112, 219, 218, - 217, 214, 213, 122, 112, 123, 112, 124, 125, 126, - 156, 87, 123, 167, 87, 125, 126, 87, 212, 87, - 87, 87, 165, 87, 207, 206, 205, 87, 204, 87, - 166, 87, 199, 87, 87, 87, 196, 168, 87, 111, - 86, 87, 185, 87, 184, 87, 183, 87, 87, 182, - - 87, 87, 181, 180, 179, 171, 164, 163, 87, 145, - 87, 123, 169, 146, 125, 147, 172, 162, 123, 161, - 160, 125, 147, 172, 112, 123, 175, 112, 125, 147, - 112, 159, 112, 112, 112, 173, 112, 158, 157, 111, - 112, 111, 112, 174, 112, 111, 112, 112, 112, 103, - 176, 112, 103, 99, 112, 99, 112, 86, 112, 86, - 112, 112, 86, 112, 112, 135, 134, 133, 132, 131, - 130, 112, 129, 112, 128, 177, 87, 63, 87, 87, - 103, 99, 79, 186, 78, 77, 87, 76, 87, 87, - 63, 87, 87, 258, 258, 258, 258, 258, 258, 87, - - 87, 87, 87, 188, 258, 187, 87, 258, 87, 87, - 87, 112, 87, 112, 193, 258, 87, 258, 87, 258, - 258, 112, 258, 112, 258, 182, 87, 258, 87, 87, - 258, 258, 189, 258, 258, 258, 87, 258, 87, 112, - 258, 112, 112, 258, 258, 258, 191, 258, 258, 112, - 258, 112, 112, 258, 112, 112, 258, 258, 258, 258, - 258, 258, 112, 87, 112, 87, 87, 258, 192, 112, - 258, 112, 112, 200, 87, 87, 87, 87, 258, 112, - 258, 112, 258, 258, 87, 258, 87, 258, 182, 112, - 258, 112, 112, 258, 87, 194, 87, 87, 258, 112, - - 87, 112, 87, 87, 87, 112, 87, 112, 112, 258, - 87, 112, 87, 112, 112, 202, 112, 112, 112, 112, - 258, 112, 112, 112, 112, 112, 112, 258, 112, 258, - 258, 258, 112, 258, 112, 87, 258, 87, 87, 258, - 258, 258, 258, 258, 258, 87, 258, 87, 258, 258, - 258, 258, 258, 258, 204, 112, 258, 112, 112, 258, - 258, 258, 258, 258, 258, 112, 258, 112, 258, 258, - 258, 258, 258, 258, 204, 80, 258, 80, 258, 80, - 86, 258, 86, 258, 86, 105, 258, 258, 105, 105, - 111, 258, 258, 111, 111, 11, 258, 258, 258, 258, - - 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, - 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, - 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, - 258, 258, 258, 258, 258 - } ; - -static yyconst flex_int16_t yy_chk[936] = - { 0, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 5, 5, - 5, 6, 6, 6, 13, 16, 95, 13, 16, 16, - 16, 16, 20, 26, 20, 20, 26, 27, 27, 95, - - 27, 260, 20, 31, 20, 33, 31, 5, 33, 38, - 6, 7, 7, 7, 7, 7, 37, 171, 39, 37, - 38, 39, 40, 40, 42, 42, 45, 45, 47, 47, - 49, 51, 171, 49, 51, 51, 51, 51, 59, 60, - 259, 59, 7, 8, 8, 8, 8, 8, 61, 62, - 60, 61, 62, 64, 98, 98, 64, 64, 64, 64, - 65, 156, 65, 156, 65, 65, 65, 66, 80, 256, - 66, 80, 66, 66, 8, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - - 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 28, 81, 106, 28, 81, 106, - 28, 28, 28, 28, 30, 30, 253, 30, 30, 30, - 30, 68, 30, 30, 68, 30, 68, 68, 30, 30, - 83, 84, 127, 83, 84, 127, 83, 252, 83, 83, - 84, 85, 201, 94, 85, 100, 100, 85, 119, 85, - 85, 201, 30, 34, 34, 94, 34, 34, 34, 34, - 119, 34, 34, 34, 34, 190, 34, 34, 34, 190, - 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, - - 203, 34, 36, 36, 179, 36, 36, 36, 36, 203, - 36, 36, 87, 36, 87, 87, 36, 36, 88, 179, - 88, 88, 87, 90, 87, 90, 90, 172, 88, 172, - 88, 102, 102, 90, 36, 90, 104, 104, 120, 143, - 36, 54, 54, 154, 54, 54, 54, 251, 54, 54, - 143, 120, 54, 54, 154, 54, 54, 54, 107, 249, - 248, 107, 107, 107, 107, 108, 182, 108, 182, 108, - 108, 108, 109, 148, 247, 109, 148, 109, 109, 54, - 57, 57, 195, 57, 57, 57, 195, 57, 57, 246, - 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, - - 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, - 57, 57, 57, 57, 57, 57, 57, 215, 57, 58, - 58, 245, 58, 58, 58, 244, 58, 58, 215, 243, - 58, 58, 208, 58, 58, 58, 110, 208, 204, 110, - 204, 110, 110, 112, 128, 112, 112, 128, 242, 241, - 128, 58, 216, 112, 124, 112, 124, 58, 82, 124, - 124, 82, 240, 216, 82, 82, 82, 82, 89, 136, - 89, 89, 136, 239, 238, 136, 237, 157, 89, 157, - 89, 89, 91, 157, 91, 91, 209, 236, 235, 234, - 233, 209, 91, 91, 91, 92, 92, 232, 92, 92, - - 113, 231, 113, 113, 230, 229, 92, 228, 92, 227, - 113, 226, 113, 114, 225, 114, 114, 115, 224, 115, - 115, 223, 222, 114, 220, 114, 114, 115, 137, 115, - 116, 137, 116, 116, 137, 219, 218, 137, 217, 214, - 116, 116, 116, 117, 117, 213, 117, 117, 212, 211, - 210, 207, 206, 122, 117, 122, 117, 122, 122, 122, - 126, 140, 126, 140, 140, 126, 126, 138, 205, 138, - 138, 140, 138, 140, 199, 198, 197, 138, 196, 138, - 139, 139, 185, 139, 139, 141, 180, 141, 141, 178, - 170, 139, 164, 139, 162, 141, 161, 141, 142, 160, - - 142, 142, 159, 158, 155, 144, 135, 134, 142, 145, - 142, 145, 142, 145, 145, 145, 146, 133, 146, 132, - 131, 146, 146, 147, 151, 147, 151, 151, 147, 147, - 149, 130, 149, 149, 151, 149, 151, 129, 125, 121, - 149, 118, 149, 150, 150, 111, 150, 150, 152, 103, - 152, 152, 101, 99, 150, 97, 150, 96, 152, 93, - 152, 153, 86, 153, 153, 78, 77, 75, 74, 73, - 72, 153, 71, 153, 67, 153, 165, 50, 165, 165, - 46, 41, 24, 165, 23, 22, 165, 21, 165, 166, - 15, 166, 166, 11, 0, 0, 0, 0, 0, 166, - - 168, 166, 168, 168, 0, 166, 167, 0, 167, 167, - 168, 176, 168, 176, 176, 0, 167, 0, 167, 0, - 0, 176, 0, 176, 0, 167, 169, 0, 169, 169, - 0, 0, 169, 0, 0, 0, 169, 0, 169, 173, - 0, 173, 173, 0, 0, 0, 173, 0, 0, 173, - 0, 173, 174, 0, 174, 174, 0, 0, 0, 0, - 0, 0, 174, 186, 174, 186, 186, 0, 174, 175, - 0, 175, 175, 186, 187, 186, 187, 187, 0, 175, - 0, 175, 0, 0, 187, 0, 187, 0, 175, 177, - 0, 177, 177, 0, 188, 177, 188, 188, 0, 177, - - 189, 177, 189, 189, 188, 191, 188, 191, 191, 0, - 189, 192, 189, 192, 192, 191, 193, 191, 193, 193, - 0, 192, 194, 192, 194, 194, 193, 0, 193, 0, - 0, 0, 194, 0, 194, 200, 0, 200, 200, 0, - 0, 0, 0, 0, 0, 200, 0, 200, 0, 0, - 0, 0, 0, 0, 200, 202, 0, 202, 202, 0, - 0, 0, 0, 0, 0, 202, 0, 202, 0, 0, - 0, 0, 0, 0, 202, 261, 0, 261, 0, 261, - 262, 0, 262, 0, 262, 263, 0, 0, 263, 263, - 264, 0, 0, 264, 264, 258, 258, 258, 258, 258, - - 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, - 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, - 258, 258, 258, 258, 258, 258, 258, 258, 258, 258, - 258, 258, 258, 258, 258 - } ; - -/* Table of booleans, true if rule could match eol. */ -static yyconst flex_int32_t yy_rule_can_match_eol[36] = - { 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; - -/* The intent behind this definition is that it'll catch - * any uses of REJECT which flex missed. - */ -#define REJECT reject_used_but_not_detected -#define yymore() yymore_used_but_not_detected -#define YY_MORE_ADJ 0 -#define YY_RESTORE_YY_MORE_OFFSET -#line 1 "../tikzit/src/data/tikzlexer.l" -#line 2 "../tikzit/src/data/tikzlexer.l" -/* - * Copyright 2010 Chris Heunen - * Copyright 2010-2013 Aleks Kissinger - * Copyright 2013 K. Johan Paulsson - * Copyright 2013 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "tikzparserdefs.h" -#include "tikzparser.parser.hpp" - -#include - - -#define YY_USER_ACTION \ - yylloc->first_line = yylloc->last_line; \ - yylloc->first_column = yylloc->last_column + 1; \ - yylloc->last_column = yylloc->first_column + yyleng - 1; - - - - - -#line 776 "../tikzit/src/data/tikzlexer.lexer.cpp" - -#define INITIAL 0 -#define props 1 -#define xcoord 2 -#define ycoord 3 -#define noderef 4 - -#ifndef YY_NO_UNISTD_H -/* Special case for "unistd.h", since it is non-ANSI. We include it way - * down here because we want the user's section 1 to have been scanned first. - * The user has a chance to override it with an option. - */ -#include -#endif - -#define YY_EXTRA_TYPE TikzGraphAssembler * - -/* Holds the entire state of the reentrant scanner. */ -struct yyguts_t - { - - /* User-defined. Not touched by flex. */ - YY_EXTRA_TYPE yyextra_r; - - /* The rest are the same as the globals declared in the non-reentrant scanner. */ - FILE *yyin_r, *yyout_r; - size_t yy_buffer_stack_top; /**< index of top of stack. */ - size_t yy_buffer_stack_max; /**< capacity of stack. */ - YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */ - char yy_hold_char; - yy_size_t yy_n_chars; - yy_size_t yyleng_r; - char *yy_c_buf_p; - int yy_init; - int yy_start; - int yy_did_buffer_switch_on_eof; - int yy_start_stack_ptr; - int yy_start_stack_depth; - int *yy_start_stack; - yy_state_type yy_last_accepting_state; - char* yy_last_accepting_cpos; - - int yylineno_r; - int yy_flex_debug_r; - - char *yytext_r; - int yy_more_flag; - int yy_more_len; - - YYSTYPE * yylval_r; - - YYLTYPE * yylloc_r; - - }; /* end struct yyguts_t */ - -static int yy_init_globals (yyscan_t yyscanner ); - - /* This must go here because YYSTYPE and YYLTYPE are included - * from bison output in section 1.*/ - # define yylval yyg->yylval_r - - # define yylloc yyg->yylloc_r - -int yylex_init (yyscan_t* scanner); - -int yylex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner); - -/* Accessor methods to globals. - These are made visible to non-reentrant scanners for convenience. */ - -int yylex_destroy (yyscan_t yyscanner ); - -int yyget_debug (yyscan_t yyscanner ); - -void yyset_debug (int debug_flag ,yyscan_t yyscanner ); - -YY_EXTRA_TYPE yyget_extra (yyscan_t yyscanner ); - -void yyset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner ); - -FILE *yyget_in (yyscan_t yyscanner ); - -void yyset_in (FILE * in_str ,yyscan_t yyscanner ); - -FILE *yyget_out (yyscan_t yyscanner ); - -void yyset_out (FILE * out_str ,yyscan_t yyscanner ); - -yy_size_t yyget_leng (yyscan_t yyscanner ); - -char *yyget_text (yyscan_t yyscanner ); - -int yyget_lineno (yyscan_t yyscanner ); - -void yyset_lineno (int line_number ,yyscan_t yyscanner ); - -YYSTYPE * yyget_lval (yyscan_t yyscanner ); - -void yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner ); - - YYLTYPE *yyget_lloc (yyscan_t yyscanner ); - - void yyset_lloc (YYLTYPE * yylloc_param ,yyscan_t yyscanner ); - -/* Macros after this point can all be overridden by user definitions in - * section 1. - */ - -#ifndef YY_SKIP_YYWRAP -#ifdef __cplusplus -extern "C" int yywrap (yyscan_t yyscanner ); -#else -extern int yywrap (yyscan_t yyscanner ); -#endif -#endif - -#ifndef yytext_ptr -static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner); -#endif - -#ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner); -#endif - -#ifndef YY_NO_INPUT - -#ifdef __cplusplus -static int yyinput (yyscan_t yyscanner ); -#else -static int input (yyscan_t yyscanner ); -#endif - -#endif - -/* Amount of stuff to slurp up with each read. */ -#ifndef YY_READ_BUF_SIZE -#define YY_READ_BUF_SIZE 8192 -#endif - -/* Copy whatever the last rule matched to the standard output. */ -#ifndef ECHO -/* This used to be an fputs(), but since the string might contain NUL's, - * we now use fwrite(). - */ -#define ECHO fwrite( yytext, yyleng, 1, yyout ) -#endif - -/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, - * is returned in "result". - */ -#ifndef YY_INPUT -#define YY_INPUT(buf,result,max_size) \ - if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ - { \ - int c = '*'; \ - yy_size_t n; \ - for ( n = 0; n < max_size && \ - (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ - buf[n] = (char) c; \ - if ( c == '\n' ) \ - buf[n++] = (char) c; \ - if ( c == EOF && ferror( yyin ) ) \ - YY_FATAL_ERROR( "input in flex scanner failed" ); \ - result = n; \ - } \ - else \ - { \ - errno=0; \ - while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \ - { \ - if( errno != EINTR) \ - { \ - YY_FATAL_ERROR( "input in flex scanner failed" ); \ - break; \ - } \ - errno=0; \ - clearerr(yyin); \ - } \ - }\ -\ - -#endif - -/* No semi-colon after return; correct usage is to write "yyterminate();" - - * we don't want an extra ';' after the "return" because that will cause - * some compilers to complain about unreachable statements. - */ -#ifndef yyterminate -#define yyterminate() return YY_NULL -#endif - -/* Number of entries by which start-condition stack grows. */ -#ifndef YY_START_STACK_INCR -#define YY_START_STACK_INCR 25 -#endif - -/* Report a fatal error. */ -#ifndef YY_FATAL_ERROR -#define YY_FATAL_ERROR(msg) yy_fatal_error( msg , yyscanner) -#endif - -/* end tables serialization structures and prototypes */ - -/* Default declaration of generated scanner - a define so the user can - * easily add parameters. - */ -#ifndef YY_DECL -#define YY_DECL_IS_OURS 1 - -extern int yylex \ - (YYSTYPE * yylval_param,YYLTYPE * yylloc_param ,yyscan_t yyscanner); - -#define YY_DECL int yylex \ - (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner) -#endif /* !YY_DECL */ - -/* Code executed at the beginning of each rule, after yytext and yyleng - * have been set up. - */ -#ifndef YY_USER_ACTION -#define YY_USER_ACTION -#endif - -/* Code executed at the end of each rule. */ -#ifndef YY_BREAK -#define YY_BREAK break; -#endif - -#define YY_RULE_SETUP \ - YY_USER_ACTION - -/** The main scanner function which does all the work. - */ -YY_DECL -{ - register yy_state_type yy_current_state; - register char *yy_cp, *yy_bp; - register int yy_act; - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - -#line 49 "../tikzit/src/data/tikzlexer.l" - - - /* whitespace is ignored, except for position counting; we don't - count formfeed and vtab as whitespace, because it's not obvious - how they should be dealt with and no-one actually uses them */ - - /* lex will take the longest-matching string */ -#line 1025 "../tikzit/src/data/tikzlexer.lexer.cpp" - - yylval = yylval_param; - - yylloc = yylloc_param; - - if ( !yyg->yy_init ) - { - yyg->yy_init = 1; - -#ifdef YY_USER_INIT - YY_USER_INIT; -#endif - - if ( ! yyg->yy_start ) - yyg->yy_start = 1; /* first start state */ - - if ( ! yyin ) - yyin = stdin; - - if ( ! yyout ) - yyout = stdout; - - if ( ! YY_CURRENT_BUFFER ) { - yyensure_buffer_stack (yyscanner); - YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); - } - - yy_load_buffer_state(yyscanner ); - } - - while ( 1 ) /* loops until end-of-file is reached */ - { - yy_cp = yyg->yy_c_buf_p; - - /* Support of yytext. */ - *yy_cp = yyg->yy_hold_char; - - /* yy_bp points to the position in yy_ch_buf of the start of - * the current run. - */ - yy_bp = yy_cp; - - yy_current_state = yyg->yy_start; -yy_match: - do - { - register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; - if ( yy_accept[yy_current_state] ) - { - yyg->yy_last_accepting_state = yy_current_state; - yyg->yy_last_accepting_cpos = yy_cp; - } - while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) - { - yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 259 ) - yy_c = yy_meta[(unsigned int) yy_c]; - } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - ++yy_cp; - } - while ( yy_base[yy_current_state] != 896 ); - -yy_find_action: - yy_act = yy_accept[yy_current_state]; - if ( yy_act == 0 ) - { /* have to back up */ - yy_cp = yyg->yy_last_accepting_cpos; - yy_current_state = yyg->yy_last_accepting_state; - yy_act = yy_accept[yy_current_state]; - } - - YY_DO_BEFORE_ACTION; - - if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] ) - { - yy_size_t yyl; - for ( yyl = 0; yyl < yyleng; ++yyl ) - if ( yytext[yyl] == '\n' ) - - do{ yylineno++; - yycolumn=0; - }while(0) -; - } - -do_action: /* This label is used only to access EOF actions. */ - - switch ( yy_act ) - { /* beginning of action switch */ - case 0: /* must back up */ - /* undo the effects of YY_DO_BEFORE_ACTION */ - *yy_cp = yyg->yy_hold_char; - yy_cp = yyg->yy_last_accepting_cpos; - yy_current_state = yyg->yy_last_accepting_state; - goto yy_find_action; - -case 1: -/* rule 1 can match eol */ -YY_RULE_SETUP -#line 56 "../tikzit/src/data/tikzlexer.l" -{ - yylloc->first_line += 1; - yylloc->last_line = yylloc->first_line; - yylloc->first_column = yylloc->last_column = 0; -} - YY_BREAK -case 2: -YY_RULE_SETUP -#line 61 "../tikzit/src/data/tikzlexer.l" -{ } - YY_BREAK -case 3: -YY_RULE_SETUP -#line 63 "../tikzit/src/data/tikzlexer.l" -{ return BEGIN_TIKZPICTURE_CMD; } - YY_BREAK -case 4: -YY_RULE_SETUP -#line 64 "../tikzit/src/data/tikzlexer.l" -{ return END_TIKZPICTURE_CMD; } - YY_BREAK -case 5: -YY_RULE_SETUP -#line 65 "../tikzit/src/data/tikzlexer.l" -{ return BEGIN_PGFONLAYER_CMD; } - YY_BREAK -case 6: -YY_RULE_SETUP -#line 66 "../tikzit/src/data/tikzlexer.l" -{ return END_PGFONLAYER_CMD; } - YY_BREAK -case 7: -YY_RULE_SETUP -#line 67 "../tikzit/src/data/tikzlexer.l" -{ return DRAW_CMD; } - YY_BREAK -case 8: -YY_RULE_SETUP -#line 68 "../tikzit/src/data/tikzlexer.l" -{ return NODE_CMD; } - YY_BREAK -case 9: -YY_RULE_SETUP -#line 69 "../tikzit/src/data/tikzlexer.l" -{ return PATH_CMD; } - YY_BREAK -case 10: -YY_RULE_SETUP -#line 70 "../tikzit/src/data/tikzlexer.l" -{ return RECTANGLE; } - YY_BREAK -case 11: -YY_RULE_SETUP -#line 71 "../tikzit/src/data/tikzlexer.l" -{ return NODE; } - YY_BREAK -case 12: -YY_RULE_SETUP -#line 72 "../tikzit/src/data/tikzlexer.l" -{ return AT; } - YY_BREAK -case 13: -YY_RULE_SETUP -#line 73 "../tikzit/src/data/tikzlexer.l" -{ return TO; } - YY_BREAK -case 14: -YY_RULE_SETUP -#line 74 "../tikzit/src/data/tikzlexer.l" -{ return SEMICOLON; } - YY_BREAK -case 15: -YY_RULE_SETUP -#line 76 "../tikzit/src/data/tikzlexer.l" -{ - yylloc->last_column = yylloc->first_column + 1; - yyless(1); - BEGIN(xcoord); -} - YY_BREAK -case 16: -YY_RULE_SETUP -#line 81 "../tikzit/src/data/tikzlexer.l" -{ - yylval->pt = new QPointF(); - yylval->pt->setX(strtod(yytext,NULL)); - BEGIN(ycoord); -} - YY_BREAK -case 17: -YY_RULE_SETUP -#line 86 "../tikzit/src/data/tikzlexer.l" -{ } - YY_BREAK -case 18: -YY_RULE_SETUP -#line 87 "../tikzit/src/data/tikzlexer.l" -{ - yylval->pt->setY(strtod(yytext,NULL)); -} - YY_BREAK -case 19: -YY_RULE_SETUP -#line 90 "../tikzit/src/data/tikzlexer.l" -{ - BEGIN(INITIAL); - return COORD; -} - YY_BREAK -/* when we see "[", change parsing mode */ -case 20: -YY_RULE_SETUP -#line 96 "../tikzit/src/data/tikzlexer.l" -/*syntaxhlfix]*/ { - BEGIN(props); - return LEFTBRACKET; -} - YY_BREAK -case 21: -YY_RULE_SETUP -#line 100 "../tikzit/src/data/tikzlexer.l" -{ return EQUALS; } - YY_BREAK -case 22: -YY_RULE_SETUP -#line 101 "../tikzit/src/data/tikzlexer.l" -{ return COMMA; } - YY_BREAK -/* technically, it is possible to have newlines in the middle of - property names or values, but in practice this is unlikely and - screws up our line counting */ -case 23: -YY_RULE_SETUP -#line 105 "../tikzit/src/data/tikzlexer.l" -{ - char *str = (char*)malloc(sizeof(char)*yyleng + 1); - strncpy(str, yytext, yyleng + 1); - yylval->str = str; - return PROPSTRING; -} - YY_BREAK -case 24: -YY_RULE_SETUP -#line 111 "../tikzit/src/data/tikzlexer.l" -{ - BEGIN(INITIAL); - return RIGHTBRACKET; -} - YY_BREAK -case 25: -YY_RULE_SETUP -#line 116 "../tikzit/src/data/tikzlexer.l" -{ - BEGIN(noderef); - return LEFTPARENTHESIS; -} - YY_BREAK -case 26: -YY_RULE_SETUP -#line 120 "../tikzit/src/data/tikzlexer.l" -{ - return FULLSTOP; -} - YY_BREAK -/* we assume node names (and anchor names) never contain - newlines */ -case 27: -YY_RULE_SETUP -#line 125 "../tikzit/src/data/tikzlexer.l" -{ - //qDebug() << "nodename: " << yytext << " size: " << strlen(yytext); - char *str = (char*)malloc(sizeof(char)*yyleng + 1); - strncpy(str, yytext, yyleng+1); - yylval->str = str; - return REFSTRING; -} - YY_BREAK -case 28: -YY_RULE_SETUP -#line 132 "../tikzit/src/data/tikzlexer.l" -{ - BEGIN(INITIAL); - return RIGHTPARENTHESIS; -} - YY_BREAK -case 29: -YY_RULE_SETUP -#line 137 "../tikzit/src/data/tikzlexer.l" -{ - std::stringstream buf; - unsigned int brace_depth = 1; - unsigned int escape = 0; - while (1) { - char c = yyinput(yyscanner); - // eof reached before closing brace - if (c == '\0' || c == EOF) { - return UNCLOSED_DELIM_STR; - } - - yylloc->last_column += 1; - yyleng += 1; - if (escape) { - escape = 0; - } else if (c == '\\') { - escape = 1; - } else if (c == '{') { - brace_depth++; - } else if (c == '}') { - brace_depth--; - if (brace_depth == 0) break; - } else if (c == '\n') { - yylloc->last_line += 1; - yylloc->last_column = 0; - } - buf << c; - } - - char *str = (char*)malloc(sizeof(char) * yyleng + 1); - strncpy(str, buf.str().c_str(), yyleng + 1); - //str[len] = 0; - yylval->str = str; - //qDebug() << "got delim string: " << str; - return DELIMITEDSTRING; -} - YY_BREAK -case 30: -YY_RULE_SETUP -#line 174 "../tikzit/src/data/tikzlexer.l" -{ return UNKNOWN_BEGIN_CMD; } - YY_BREAK -case 31: -YY_RULE_SETUP -#line 175 "../tikzit/src/data/tikzlexer.l" -{ return UNKNOWN_END_CMD; } - YY_BREAK -case 32: -YY_RULE_SETUP -#line 176 "../tikzit/src/data/tikzlexer.l" -{ return UNKNOWN_CMD; } - YY_BREAK -case 33: -YY_RULE_SETUP -#line 177 "../tikzit/src/data/tikzlexer.l" -{ return UNKNOWN_STR; } - YY_BREAK -case 34: -YY_RULE_SETUP -#line 178 "../tikzit/src/data/tikzlexer.l" -{ return UNKNOWN_STR; } - YY_BREAK -/* vi:ft=lex:noet:ts=4:sts=4:sw=4: - */ -case 35: -YY_RULE_SETUP -#line 182 "../tikzit/src/data/tikzlexer.l" -ECHO; - YY_BREAK -#line 1385 "../tikzit/src/data/tikzlexer.lexer.cpp" -case YY_STATE_EOF(INITIAL): -case YY_STATE_EOF(props): -case YY_STATE_EOF(xcoord): -case YY_STATE_EOF(ycoord): -case YY_STATE_EOF(noderef): - yyterminate(); - - case YY_END_OF_BUFFER: - { - /* Amount of text matched not including the EOB char. */ - int yy_amount_of_matched_text = (int) (yy_cp - yyg->yytext_ptr) - 1; - - /* Undo the effects of YY_DO_BEFORE_ACTION. */ - *yy_cp = yyg->yy_hold_char; - YY_RESTORE_YY_MORE_OFFSET - - if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW ) - { - /* We're scanning a new file or input source. It's - * possible that this happened because the user - * just pointed yyin at a new source and called - * yylex(). If so, then we have to assure - * consistency between YY_CURRENT_BUFFER and our - * globals. Here is the right place to do so, because - * this is the first action (other than possibly a - * back-up) that will match for the new input source. - */ - yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; - YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin; - YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL; - } - - /* Note that here we test for yy_c_buf_p "<=" to the position - * of the first EOB in the buffer, since yy_c_buf_p will - * already have been incremented past the NUL character - * (since all states make transitions on EOB to the - * end-of-buffer state). Contrast this with the test - * in input(). - */ - if ( yyg->yy_c_buf_p <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] ) - { /* This was really a NUL. */ - yy_state_type yy_next_state; - - yyg->yy_c_buf_p = yyg->yytext_ptr + yy_amount_of_matched_text; - - yy_current_state = yy_get_previous_state( yyscanner ); - - /* Okay, we're now positioned to make the NUL - * transition. We couldn't have - * yy_get_previous_state() go ahead and do it - * for us because it doesn't know how to deal - * with the possibility of jamming (and we don't - * want to build jamming into it because then it - * will run more slowly). - */ - - yy_next_state = yy_try_NUL_trans( yy_current_state , yyscanner); - - yy_bp = yyg->yytext_ptr + YY_MORE_ADJ; - - if ( yy_next_state ) - { - /* Consume the NUL. */ - yy_cp = ++yyg->yy_c_buf_p; - yy_current_state = yy_next_state; - goto yy_match; - } - - else - { - yy_cp = yyg->yy_c_buf_p; - goto yy_find_action; - } - } - - else switch ( yy_get_next_buffer( yyscanner ) ) - { - case EOB_ACT_END_OF_FILE: - { - yyg->yy_did_buffer_switch_on_eof = 0; - - if ( yywrap(yyscanner ) ) - { - /* Note: because we've taken care in - * yy_get_next_buffer() to have set up - * yytext, we can now set up - * yy_c_buf_p so that if some total - * hoser (like flex itself) wants to - * call the scanner after we return the - * YY_NULL, it'll still work - another - * YY_NULL will get returned. - */ - yyg->yy_c_buf_p = yyg->yytext_ptr + YY_MORE_ADJ; - - yy_act = YY_STATE_EOF(YY_START); - goto do_action; - } - - else - { - if ( ! yyg->yy_did_buffer_switch_on_eof ) - YY_NEW_FILE; - } - break; - } - - case EOB_ACT_CONTINUE_SCAN: - yyg->yy_c_buf_p = - yyg->yytext_ptr + yy_amount_of_matched_text; - - yy_current_state = yy_get_previous_state( yyscanner ); - - yy_cp = yyg->yy_c_buf_p; - yy_bp = yyg->yytext_ptr + YY_MORE_ADJ; - goto yy_match; - - case EOB_ACT_LAST_MATCH: - yyg->yy_c_buf_p = - &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars]; - - yy_current_state = yy_get_previous_state( yyscanner ); - - yy_cp = yyg->yy_c_buf_p; - yy_bp = yyg->yytext_ptr + YY_MORE_ADJ; - goto yy_find_action; - } - break; - } - - default: - YY_FATAL_ERROR( - "fatal flex scanner internal error--no action found" ); - } /* end of action switch */ - } /* end of scanning one token */ -} /* end of yylex */ - -/* yy_get_next_buffer - try to read in a new buffer - * - * Returns a code representing an action: - * EOB_ACT_LAST_MATCH - - * EOB_ACT_CONTINUE_SCAN - continue scanning from current position - * EOB_ACT_END_OF_FILE - end of file - */ -static int yy_get_next_buffer (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; - register char *source = yyg->yytext_ptr; - register int number_to_move, i; - int ret_val; - - if ( yyg->yy_c_buf_p > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] ) - YY_FATAL_ERROR( - "fatal flex scanner internal error--end of buffer missed" ); - - if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 ) - { /* Don't try to fill the buffer, so this is an EOF. */ - if ( yyg->yy_c_buf_p - yyg->yytext_ptr - YY_MORE_ADJ == 1 ) - { - /* We matched a single character, the EOB, so - * treat this as a final EOF. - */ - return EOB_ACT_END_OF_FILE; - } - - else - { - /* We matched some text prior to the EOB, first - * process it. - */ - return EOB_ACT_LAST_MATCH; - } - } - - /* Try to read more data. */ - - /* First move last chars to start of buffer. */ - number_to_move = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr) - 1; - - for ( i = 0; i < number_to_move; ++i ) - *(dest++) = *(source++); - - if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING ) - /* don't do the read, it's not guaranteed to return an EOF, - * just force an EOF - */ - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars = 0; - - else - { - yy_size_t num_to_read = - YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; - - while ( num_to_read <= 0 ) - { /* Not enough room in the buffer - grow it. */ - - /* just a shorter name for the current buffer */ - YY_BUFFER_STATE b = YY_CURRENT_BUFFER; - - int yy_c_buf_p_offset = - (int) (yyg->yy_c_buf_p - b->yy_ch_buf); - - if ( b->yy_is_our_buffer ) - { - yy_size_t new_size = b->yy_buf_size * 2; - - if ( new_size <= 0 ) - b->yy_buf_size += b->yy_buf_size / 8; - else - b->yy_buf_size *= 2; - - b->yy_ch_buf = (char *) - /* Include room in for 2 EOB chars. */ - yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ,yyscanner ); - } - else - /* Can't grow it, we don't own it. */ - b->yy_ch_buf = 0; - - if ( ! b->yy_ch_buf ) - YY_FATAL_ERROR( - "fatal error - scanner input buffer overflow" ); - - yyg->yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset]; - - num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - - number_to_move - 1; - - } - - if ( num_to_read > YY_READ_BUF_SIZE ) - num_to_read = YY_READ_BUF_SIZE; - - /* Read in more data. */ - YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), - yyg->yy_n_chars, num_to_read ); - - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars; - } - - if ( yyg->yy_n_chars == 0 ) - { - if ( number_to_move == YY_MORE_ADJ ) - { - ret_val = EOB_ACT_END_OF_FILE; - yyrestart(yyin ,yyscanner); - } - - else - { - ret_val = EOB_ACT_LAST_MATCH; - YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = - YY_BUFFER_EOF_PENDING; - } - } - - else - ret_val = EOB_ACT_CONTINUE_SCAN; - - if ((yy_size_t) (yyg->yy_n_chars + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { - /* Extend the array by 50%, plus the number we really need. */ - yy_size_t new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1); - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ,yyscanner ); - if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) - YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); - } - - yyg->yy_n_chars += number_to_move; - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] = YY_END_OF_BUFFER_CHAR; - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR; - - yyg->yytext_ptr = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0]; - - return ret_val; -} - -/* yy_get_previous_state - get the state just before the EOB char was reached */ - - static yy_state_type yy_get_previous_state (yyscan_t yyscanner) -{ - register yy_state_type yy_current_state; - register char *yy_cp; - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - yy_current_state = yyg->yy_start; - - for ( yy_cp = yyg->yytext_ptr + YY_MORE_ADJ; yy_cp < yyg->yy_c_buf_p; ++yy_cp ) - { - register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); - if ( yy_accept[yy_current_state] ) - { - yyg->yy_last_accepting_state = yy_current_state; - yyg->yy_last_accepting_cpos = yy_cp; - } - while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) - { - yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 259 ) - yy_c = yy_meta[(unsigned int) yy_c]; - } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - } - - return yy_current_state; -} - -/* yy_try_NUL_trans - try to make a transition on the NUL character - * - * synopsis - * next_state = yy_try_NUL_trans( current_state ); - */ - static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state , yyscan_t yyscanner) -{ - register int yy_is_jam; - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* This var may be unused depending upon options. */ - register char *yy_cp = yyg->yy_c_buf_p; - - register YY_CHAR yy_c = 1; - if ( yy_accept[yy_current_state] ) - { - yyg->yy_last_accepting_state = yy_current_state; - yyg->yy_last_accepting_cpos = yy_cp; - } - while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) - { - yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 259 ) - yy_c = yy_meta[(unsigned int) yy_c]; - } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 258); - - return yy_is_jam ? 0 : yy_current_state; -} - -#ifndef YY_NO_INPUT -#ifdef __cplusplus - static int yyinput (yyscan_t yyscanner) -#else - static int input (yyscan_t yyscanner) -#endif - -{ - int c; - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - *yyg->yy_c_buf_p = yyg->yy_hold_char; - - if ( *yyg->yy_c_buf_p == YY_END_OF_BUFFER_CHAR ) - { - /* yy_c_buf_p now points to the character we want to return. - * If this occurs *before* the EOB characters, then it's a - * valid NUL; if not, then we've hit the end of the buffer. - */ - if ( yyg->yy_c_buf_p < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] ) - /* This was really a NUL. */ - *yyg->yy_c_buf_p = '\0'; - - else - { /* need more input */ - yy_size_t offset = yyg->yy_c_buf_p - yyg->yytext_ptr; - ++yyg->yy_c_buf_p; - - switch ( yy_get_next_buffer( yyscanner ) ) - { - case EOB_ACT_LAST_MATCH: - /* This happens because yy_g_n_b() - * sees that we've accumulated a - * token and flags that we need to - * try matching the token before - * proceeding. But for input(), - * there's no matching to consider. - * So convert the EOB_ACT_LAST_MATCH - * to EOB_ACT_END_OF_FILE. - */ - - /* Reset buffer status. */ - yyrestart(yyin ,yyscanner); - - /*FALLTHROUGH*/ - - case EOB_ACT_END_OF_FILE: - { - if ( yywrap(yyscanner ) ) - return 0; - - if ( ! yyg->yy_did_buffer_switch_on_eof ) - YY_NEW_FILE; -#ifdef __cplusplus - return yyinput(yyscanner); -#else - return input(yyscanner); -#endif - } - - case EOB_ACT_CONTINUE_SCAN: - yyg->yy_c_buf_p = yyg->yytext_ptr + offset; - break; - } - } - } - - c = *(unsigned char *) yyg->yy_c_buf_p; /* cast for 8-bit char's */ - *yyg->yy_c_buf_p = '\0'; /* preserve yytext */ - yyg->yy_hold_char = *++yyg->yy_c_buf_p; - - if ( c == '\n' ) - - do{ yylineno++; - yycolumn=0; - }while(0) -; - - return c; -} -#endif /* ifndef YY_NO_INPUT */ - -/** Immediately switch to a different input stream. - * @param input_file A readable stream. - * @param yyscanner The scanner object. - * @note This function does not reset the start condition to @c INITIAL . - */ - void yyrestart (FILE * input_file , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - if ( ! YY_CURRENT_BUFFER ){ - yyensure_buffer_stack (yyscanner); - YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); - } - - yy_init_buffer(YY_CURRENT_BUFFER,input_file ,yyscanner); - yy_load_buffer_state(yyscanner ); -} - -/** Switch to a different input buffer. - * @param new_buffer The new input buffer. - * @param yyscanner The scanner object. - */ - void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - /* TODO. We should be able to replace this entire function body - * with - * yypop_buffer_state(); - * yypush_buffer_state(new_buffer); - */ - yyensure_buffer_stack (yyscanner); - if ( YY_CURRENT_BUFFER == new_buffer ) - return; - - if ( YY_CURRENT_BUFFER ) - { - /* Flush out information for old buffer. */ - *yyg->yy_c_buf_p = yyg->yy_hold_char; - YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p; - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars; - } - - YY_CURRENT_BUFFER_LVALUE = new_buffer; - yy_load_buffer_state(yyscanner ); - - /* We don't actually know whether we did this switch during - * EOF (yywrap()) processing, but the only time this flag - * is looked at is after yywrap() is called, so it's safe - * to go ahead and always set it. - */ - yyg->yy_did_buffer_switch_on_eof = 1; -} - -static void yy_load_buffer_state (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; - yyg->yytext_ptr = yyg->yy_c_buf_p = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos; - yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file; - yyg->yy_hold_char = *yyg->yy_c_buf_p; -} - -/** Allocate and initialize an input buffer state. - * @param file A readable stream. - * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE. - * @param yyscanner The scanner object. - * @return the allocated buffer state. - */ - YY_BUFFER_STATE yy_create_buffer (FILE * file, int size , yyscan_t yyscanner) -{ - YY_BUFFER_STATE b; - - b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ,yyscanner ); - if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); - - b->yy_buf_size = size; - - /* yy_ch_buf has to be 2 characters longer than the size given because - * we need to put in 2 end-of-buffer characters. - */ - b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2 ,yyscanner ); - if ( ! b->yy_ch_buf ) - YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); - - b->yy_is_our_buffer = 1; - - yy_init_buffer(b,file ,yyscanner); - - return b; -} - -/** Destroy the buffer. - * @param b a buffer created with yy_create_buffer() - * @param yyscanner The scanner object. - */ - void yy_delete_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - if ( ! b ) - return; - - if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */ - YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; - - if ( b->yy_is_our_buffer ) - yyfree((void *) b->yy_ch_buf ,yyscanner ); - - yyfree((void *) b ,yyscanner ); -} - -#ifndef __cplusplus -extern int isatty (int ); -#endif /* __cplusplus */ - -/* Initializes or reinitializes a buffer. - * This function is sometimes called more than once on the same buffer, - * such as during a yyrestart() or at EOF. - */ - static void yy_init_buffer (YY_BUFFER_STATE b, FILE * file , yyscan_t yyscanner) - -{ - int oerrno = errno; - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - yy_flush_buffer(b ,yyscanner); - - b->yy_input_file = file; - b->yy_fill_buffer = 1; - - /* If b is the current buffer, then yy_init_buffer was _probably_ - * called from yyrestart() or through yy_get_next_buffer. - * In that case, we don't want to reset the lineno or column. - */ - if (b != YY_CURRENT_BUFFER){ - b->yy_bs_lineno = 1; - b->yy_bs_column = 0; - } - - b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; - - errno = oerrno; -} - -/** Discard all buffered characters. On the next scan, YY_INPUT will be called. - * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. - * @param yyscanner The scanner object. - */ - void yy_flush_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - if ( ! b ) - return; - - b->yy_n_chars = 0; - - /* We always need two end-of-buffer characters. The first causes - * a transition to the end-of-buffer state. The second causes - * a jam in that state. - */ - b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR; - b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR; - - b->yy_buf_pos = &b->yy_ch_buf[0]; - - b->yy_at_bol = 1; - b->yy_buffer_status = YY_BUFFER_NEW; - - if ( b == YY_CURRENT_BUFFER ) - yy_load_buffer_state(yyscanner ); -} - -/** Pushes the new state onto the stack. The new state becomes - * the current state. This function will allocate the stack - * if necessary. - * @param new_buffer The new state. - * @param yyscanner The scanner object. - */ -void yypush_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - if (new_buffer == NULL) - return; - - yyensure_buffer_stack(yyscanner); - - /* This block is copied from yy_switch_to_buffer. */ - if ( YY_CURRENT_BUFFER ) - { - /* Flush out information for old buffer. */ - *yyg->yy_c_buf_p = yyg->yy_hold_char; - YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p; - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars; - } - - /* Only push if top exists. Otherwise, replace top. */ - if (YY_CURRENT_BUFFER) - yyg->yy_buffer_stack_top++; - YY_CURRENT_BUFFER_LVALUE = new_buffer; - - /* copied from yy_switch_to_buffer. */ - yy_load_buffer_state(yyscanner ); - yyg->yy_did_buffer_switch_on_eof = 1; -} - -/** Removes and deletes the top of the stack, if present. - * The next element becomes the new top. - * @param yyscanner The scanner object. - */ -void yypop_buffer_state (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - if (!YY_CURRENT_BUFFER) - return; - - yy_delete_buffer(YY_CURRENT_BUFFER ,yyscanner); - YY_CURRENT_BUFFER_LVALUE = NULL; - if (yyg->yy_buffer_stack_top > 0) - --yyg->yy_buffer_stack_top; - - if (YY_CURRENT_BUFFER) { - yy_load_buffer_state(yyscanner ); - yyg->yy_did_buffer_switch_on_eof = 1; - } -} - -/* Allocates the stack if it does not exist. - * Guarantees space for at least one push. - */ -static void yyensure_buffer_stack (yyscan_t yyscanner) -{ - yy_size_t num_to_alloc; - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - if (!yyg->yy_buffer_stack) { - - /* First allocation is just for 2 elements, since we don't know if this - * scanner will even need a stack. We use 2 instead of 1 to avoid an - * immediate realloc on the next call. - */ - num_to_alloc = 1; - yyg->yy_buffer_stack = (struct yy_buffer_state**)yyalloc - (num_to_alloc * sizeof(struct yy_buffer_state*) - , yyscanner); - if ( ! yyg->yy_buffer_stack ) - YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); - - memset(yyg->yy_buffer_stack, 0, num_to_alloc * sizeof(struct yy_buffer_state*)); - - yyg->yy_buffer_stack_max = num_to_alloc; - yyg->yy_buffer_stack_top = 0; - return; - } - - if (yyg->yy_buffer_stack_top >= (yyg->yy_buffer_stack_max) - 1){ - - /* Increase the buffer to prepare for a possible push. */ - int grow_size = 8 /* arbitrary grow size */; - - num_to_alloc = yyg->yy_buffer_stack_max + grow_size; - yyg->yy_buffer_stack = (struct yy_buffer_state**)yyrealloc - (yyg->yy_buffer_stack, - num_to_alloc * sizeof(struct yy_buffer_state*) - , yyscanner); - if ( ! yyg->yy_buffer_stack ) - YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); - - /* zero only the new slots.*/ - memset(yyg->yy_buffer_stack + yyg->yy_buffer_stack_max, 0, grow_size * sizeof(struct yy_buffer_state*)); - yyg->yy_buffer_stack_max = num_to_alloc; - } -} - -/** Setup the input buffer state to scan directly from a user-specified character buffer. - * @param base the character buffer - * @param size the size in bytes of the character buffer - * @param yyscanner The scanner object. - * @return the newly allocated buffer state object. - */ -YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size , yyscan_t yyscanner) -{ - YY_BUFFER_STATE b; - - if ( size < 2 || - base[size-2] != YY_END_OF_BUFFER_CHAR || - base[size-1] != YY_END_OF_BUFFER_CHAR ) - /* They forgot to leave room for the EOB's. */ - return 0; - - b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ,yyscanner ); - if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); - - b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ - b->yy_buf_pos = b->yy_ch_buf = base; - b->yy_is_our_buffer = 0; - b->yy_input_file = 0; - b->yy_n_chars = b->yy_buf_size; - b->yy_is_interactive = 0; - b->yy_at_bol = 1; - b->yy_fill_buffer = 0; - b->yy_buffer_status = YY_BUFFER_NEW; - - yy_switch_to_buffer(b ,yyscanner ); - - return b; -} - -/** Setup the input buffer state to scan a string. The next call to yylex() will - * scan from a @e copy of @a str. - * @param yystr a NUL-terminated string to scan - * @param yyscanner The scanner object. - * @return the newly allocated buffer state object. - * @note If you want to scan bytes that may contain NUL values, then use - * yy_scan_bytes() instead. - */ -YY_BUFFER_STATE yy_scan_string (yyconst char * yystr , yyscan_t yyscanner) -{ - - return yy_scan_bytes(yystr,strlen(yystr) ,yyscanner); -} - -/** Setup the input buffer state to scan the given bytes. The next call to yylex() will - * scan from a @e copy of @a bytes. - * @param bytes the byte buffer to scan - * @param len the number of bytes in the buffer pointed to by @a bytes. - * @param yyscanner The scanner object. - * @return the newly allocated buffer state object. - */ -YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len , yyscan_t yyscanner) -{ - YY_BUFFER_STATE b; - char *buf; - yy_size_t n, i; - - /* Get memory for full buffer, including space for trailing EOB's. */ - n = _yybytes_len + 2; - buf = (char *) yyalloc(n ,yyscanner ); - if ( ! buf ) - YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); - - for ( i = 0; i < _yybytes_len; ++i ) - buf[i] = yybytes[i]; - - buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; - - b = yy_scan_buffer(buf,n ,yyscanner); - if ( ! b ) - YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); - - /* It's okay to grow etc. this buffer, and we should throw it - * away when we're done. - */ - b->yy_is_our_buffer = 1; - - return b; -} - -#ifndef YY_EXIT_FAILURE -#define YY_EXIT_FAILURE 2 -#endif - -static void yy_fatal_error (yyconst char* msg , yyscan_t yyscanner) -{ - (void) fprintf( stderr, "%s\n", msg ); - exit( YY_EXIT_FAILURE ); -} - -/* Redefine yyless() so it works in section 3 code. */ - -#undef yyless -#define yyless(n) \ - do \ - { \ - /* Undo effects of setting up yytext. */ \ - int yyless_macro_arg = (n); \ - YY_LESS_LINENO(yyless_macro_arg);\ - yytext[yyleng] = yyg->yy_hold_char; \ - yyg->yy_c_buf_p = yytext + yyless_macro_arg; \ - yyg->yy_hold_char = *yyg->yy_c_buf_p; \ - *yyg->yy_c_buf_p = '\0'; \ - yyleng = yyless_macro_arg; \ - } \ - while ( 0 ) - -/* Accessor methods (get/set functions) to struct members. */ - -/** Get the user-defined data for this scanner. - * @param yyscanner The scanner object. - */ -YY_EXTRA_TYPE yyget_extra (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - return yyextra; -} - -/** Get the current line number. - * @param yyscanner The scanner object. - */ -int yyget_lineno (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - if (! YY_CURRENT_BUFFER) - return 0; - - return yylineno; -} - -/** Get the current column number. - * @param yyscanner The scanner object. - */ -int yyget_column (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - if (! YY_CURRENT_BUFFER) - return 0; - - return yycolumn; -} - -/** Get the input stream. - * @param yyscanner The scanner object. - */ -FILE *yyget_in (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - return yyin; -} - -/** Get the output stream. - * @param yyscanner The scanner object. - */ -FILE *yyget_out (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - return yyout; -} - -/** Get the length of the current token. - * @param yyscanner The scanner object. - */ -yy_size_t yyget_leng (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - return yyleng; -} - -/** Get the current token. - * @param yyscanner The scanner object. - */ - -char *yyget_text (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - return yytext; -} - -/** Set the user-defined data. This data is never touched by the scanner. - * @param user_defined The data to be associated with this scanner. - * @param yyscanner The scanner object. - */ -void yyset_extra (YY_EXTRA_TYPE user_defined , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - yyextra = user_defined ; -} - -/** Set the current line number. - * @param line_number - * @param yyscanner The scanner object. - */ -void yyset_lineno (int line_number , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - /* lineno is only valid if an input buffer exists. */ - if (! YY_CURRENT_BUFFER ) - yy_fatal_error( "yyset_lineno called with no buffer" , yyscanner); - - yylineno = line_number; -} - -/** Set the current column. - * @param line_number - * @param yyscanner The scanner object. - */ -void yyset_column (int column_no , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - /* column is only valid if an input buffer exists. */ - if (! YY_CURRENT_BUFFER ) - yy_fatal_error( "yyset_column called with no buffer" , yyscanner); - - yycolumn = column_no; -} - -/** Set the input stream. This does not discard the current - * input buffer. - * @param in_str A readable stream. - * @param yyscanner The scanner object. - * @see yy_switch_to_buffer - */ -void yyset_in (FILE * in_str , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - yyin = in_str ; -} - -void yyset_out (FILE * out_str , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - yyout = out_str ; -} - -int yyget_debug (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - return yy_flex_debug; -} - -void yyset_debug (int bdebug , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - yy_flex_debug = bdebug ; -} - -/* Accessor methods for yylval and yylloc */ - -YYSTYPE * yyget_lval (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - return yylval; -} - -void yyset_lval (YYSTYPE * yylval_param , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - yylval = yylval_param; -} - -YYLTYPE *yyget_lloc (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - return yylloc; -} - -void yyset_lloc (YYLTYPE * yylloc_param , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - yylloc = yylloc_param; -} - -/* User-visible API */ - -/* yylex_init is special because it creates the scanner itself, so it is - * the ONLY reentrant function that doesn't take the scanner as the last argument. - * That's why we explicitly handle the declaration, instead of using our macros. - */ - -int yylex_init(yyscan_t* ptr_yy_globals) - -{ - if (ptr_yy_globals == NULL){ - errno = EINVAL; - return 1; - } - - *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), NULL ); - - if (*ptr_yy_globals == NULL){ - errno = ENOMEM; - return 1; - } - - /* By setting to 0xAA, we expose bugs in yy_init_globals. Leave at 0x00 for releases. */ - memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t)); - - return yy_init_globals ( *ptr_yy_globals ); -} - -/* yylex_init_extra has the same functionality as yylex_init, but follows the - * convention of taking the scanner as the last argument. Note however, that - * this is a *pointer* to a scanner, as it will be allocated by this call (and - * is the reason, too, why this function also must handle its own declaration). - * The user defined value in the first argument will be available to yyalloc in - * the yyextra field. - */ - -int yylex_init_extra(YY_EXTRA_TYPE yy_user_defined,yyscan_t* ptr_yy_globals ) - -{ - struct yyguts_t dummy_yyguts; - - yyset_extra (yy_user_defined, &dummy_yyguts); - - if (ptr_yy_globals == NULL){ - errno = EINVAL; - return 1; - } - - *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), &dummy_yyguts ); - - if (*ptr_yy_globals == NULL){ - errno = ENOMEM; - return 1; - } - - /* By setting to 0xAA, we expose bugs in - yy_init_globals. Leave at 0x00 for releases. */ - memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t)); - - yyset_extra (yy_user_defined, *ptr_yy_globals); - - return yy_init_globals ( *ptr_yy_globals ); -} - -static int yy_init_globals (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - /* Initialization is the same as for the non-reentrant scanner. - * This function is called from yylex_destroy(), so don't allocate here. - */ - - yyg->yy_buffer_stack = 0; - yyg->yy_buffer_stack_top = 0; - yyg->yy_buffer_stack_max = 0; - yyg->yy_c_buf_p = (char *) 0; - yyg->yy_init = 0; - yyg->yy_start = 0; - - yyg->yy_start_stack_ptr = 0; - yyg->yy_start_stack_depth = 0; - yyg->yy_start_stack = NULL; - -/* Defined in main.c */ -#ifdef YY_STDINIT - yyin = stdin; - yyout = stdout; -#else - yyin = (FILE *) 0; - yyout = (FILE *) 0; -#endif - - /* For future reference: Set errno on error, since we are called by - * yylex_init() - */ - return 0; -} - -/* yylex_destroy is for both reentrant and non-reentrant scanners. */ -int yylex_destroy (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - /* Pop the buffer stack, destroying each element. */ - while(YY_CURRENT_BUFFER){ - yy_delete_buffer(YY_CURRENT_BUFFER ,yyscanner ); - YY_CURRENT_BUFFER_LVALUE = NULL; - yypop_buffer_state(yyscanner); - } - - /* Destroy the stack itself. */ - yyfree(yyg->yy_buffer_stack ,yyscanner); - yyg->yy_buffer_stack = NULL; - - /* Destroy the start condition stack. */ - yyfree(yyg->yy_start_stack ,yyscanner ); - yyg->yy_start_stack = NULL; - - /* Reset the globals. This is important in a non-reentrant scanner so the next time - * yylex() is called, initialization will occur. */ - yy_init_globals( yyscanner); - - /* Destroy the main struct (reentrant only). */ - yyfree ( yyscanner , yyscanner ); - yyscanner = NULL; - return 0; -} - -/* - * Internal utility routines. - */ - -#ifndef yytext_ptr -static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t yyscanner) -{ - register int i; - for ( i = 0; i < n; ++i ) - s1[i] = s2[i]; -} -#endif - -#ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner) -{ - register int n; - for ( n = 0; s[n]; ++n ) - ; - - return n; -} -#endif - -void *yyalloc (yy_size_t size , yyscan_t yyscanner) -{ - return (void *) malloc( size ); -} - -void *yyrealloc (void * ptr, yy_size_t size , yyscan_t yyscanner) -{ - /* The cast to (char *) in the following accommodates both - * implementations that use char* generic pointers, and those - * that use void* generic pointers. It works with the latter - * because both ANSI C and C++ allow castless assignment from - * any pointer type to void*, and deal with argument conversions - * as though doing an assignment. - */ - return (void *) realloc( (char *) ptr, size ); -} - -void yyfree (void * ptr , yyscan_t yyscanner) -{ - free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ -} - -#define YYTABLES_NAME "yytables" - -#line 182 "../tikzit/src/data/tikzlexer.l" diff --git a/src/data/tikzparser.parser.cpp b/src/data/tikzparser.parser.cpp deleted file mode 100644 index 7d77d0c..0000000 --- a/src/data/tikzparser.parser.cpp +++ /dev/null @@ -1,1938 +0,0 @@ -/* A Bison parser, made by GNU Bison 2.3. */ - -/* Skeleton implementation for Bison's Yacc-like parsers in C - - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ - -/* As a special exception, you may create a larger work that contains - part or all of the Bison parser skeleton and distribute that work - under terms of your choice, so long as that work isn't itself a - parser generator using the skeleton or a modified version thereof - as a parser skeleton. Alternatively, if you modify or redistribute - the parser skeleton itself, you may (at your option) remove this - special exception, which will cause the skeleton and the resulting - Bison output files to be licensed under the GNU General Public - License without this special exception. - - This special exception was added by the Free Software Foundation in - version 2.2 of Bison. */ - -/* C LALR(1) parser skeleton written by Richard Stallman, by - simplifying the original so-called "semantic" parser. */ - -/* All symbols defined below should begin with yy or YY, to avoid - infringing on user name space. This should be done even for local - variables, as they might otherwise be expanded by user macros. - There are some unavoidable exceptions within include files to - define necessary library symbols; they are noted "INFRINGES ON - USER NAME SPACE" below. */ - -/* Identify Bison output. */ -#define YYBISON 1 - -/* Bison version. */ -#define YYBISON_VERSION "2.3" - -/* Skeleton name. */ -#define YYSKELETON_NAME "yacc.c" - -/* Pure parsers. */ -#define YYPURE 1 - -/* Using locations. */ -#define YYLSP_NEEDED 1 - - - -/* Tokens. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - BEGIN_TIKZPICTURE_CMD = 258, - END_TIKZPICTURE_CMD = 259, - BEGIN_PGFONLAYER_CMD = 260, - END_PGFONLAYER_CMD = 261, - DRAW_CMD = 262, - NODE_CMD = 263, - PATH_CMD = 264, - RECTANGLE = 265, - NODE = 266, - AT = 267, - TO = 268, - SEMICOLON = 269, - COMMA = 270, - LEFTPARENTHESIS = 271, - RIGHTPARENTHESIS = 272, - LEFTBRACKET = 273, - RIGHTBRACKET = 274, - FULLSTOP = 275, - EQUALS = 276, - COORD = 277, - PROPSTRING = 278, - REFSTRING = 279, - DELIMITEDSTRING = 280, - UNKNOWN_BEGIN_CMD = 281, - UNKNOWN_END_CMD = 282, - UNKNOWN_CMD = 283, - UNKNOWN_STR = 284, - UNCLOSED_DELIM_STR = 285 - }; -#endif -/* Tokens. */ -#define BEGIN_TIKZPICTURE_CMD 258 -#define END_TIKZPICTURE_CMD 259 -#define BEGIN_PGFONLAYER_CMD 260 -#define END_PGFONLAYER_CMD 261 -#define DRAW_CMD 262 -#define NODE_CMD 263 -#define PATH_CMD 264 -#define RECTANGLE 265 -#define NODE 266 -#define AT 267 -#define TO 268 -#define SEMICOLON 269 -#define COMMA 270 -#define LEFTPARENTHESIS 271 -#define RIGHTPARENTHESIS 272 -#define LEFTBRACKET 273 -#define RIGHTBRACKET 274 -#define FULLSTOP 275 -#define EQUALS 276 -#define COORD 277 -#define PROPSTRING 278 -#define REFSTRING 279 -#define DELIMITEDSTRING 280 -#define UNKNOWN_BEGIN_CMD 281 -#define UNKNOWN_END_CMD 282 -#define UNKNOWN_CMD 283 -#define UNKNOWN_STR 284 -#define UNCLOSED_DELIM_STR 285 - - - - -/* Copy the first part of user declarations. */ -#line 1 "../tikzit/src/data/tikzparser.y" - -/* - * Copyright 2010 Chris Heunen - * Copyright 2010-2013 Aleks Kissinger - * Copyright 2013 K. Johan Paulsson - * Copyright 2013 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "tikzparserdefs.h" - - -/* Enabling traces. */ -#ifndef YYDEBUG -# define YYDEBUG 0 -#endif - -/* Enabling verbose error messages. */ -#ifdef YYERROR_VERBOSE -# undef YYERROR_VERBOSE -# define YYERROR_VERBOSE 1 -#else -# define YYERROR_VERBOSE 1 -#endif - -/* Enabling the token table. */ -#ifndef YYTOKEN_TABLE -# define YYTOKEN_TABLE 0 -#endif - -#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE -#line 43 "../tikzit/src/data/tikzparser.y" -{ - char *str; - GraphElementProperty *prop; - GraphElementData *data; - Node *node; - QPointF *pt; - struct noderef noderef; -} -/* Line 193 of yacc.c. */ -#line 189 "../tikzit/src/data/tikzparser.parser.cpp" - YYSTYPE; -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ -# define YYSTYPE_IS_DECLARED 1 -# define YYSTYPE_IS_TRIVIAL 1 -#endif - -#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED -typedef struct YYLTYPE -{ - int first_line; - int first_column; - int last_line; - int last_column; -} YYLTYPE; -# define yyltype YYLTYPE /* obsolescent; will be withdrawn */ -# define YYLTYPE_IS_DECLARED 1 -# define YYLTYPE_IS_TRIVIAL 1 -#endif - - -/* Copy the second part of user declarations. */ -#line 52 "../tikzit/src/data/tikzparser.y" - -#include "node.h" -#include "edge.h" -#include "graphelementdata.h" -#include "graphelementproperty.h" - -#include "tikzlexer.h" -#import "tikzgraphassembler.h" -/* the assembler (used by this parser) is stored in the lexer - state as "extra" data */ -#define assembler yyget_extra(scanner) - -/* pass errors off to the assembler */ -void yyerror(YYLTYPE *yylloc, void *scanner, const char *str) { - // TODO: implement reportError() - //assembler->reportError(str, yylloc); - qDebug() << "parse error: " << str; -} - - -/* Line 216 of yacc.c. */ -#line 233 "../tikzit/src/data/tikzparser.parser.cpp" - -#ifdef short -# undef short -#endif - -#ifdef YYTYPE_UINT8 -typedef YYTYPE_UINT8 yytype_uint8; -#else -typedef unsigned char yytype_uint8; -#endif - -#ifdef YYTYPE_INT8 -typedef YYTYPE_INT8 yytype_int8; -#elif (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -typedef signed char yytype_int8; -#else -typedef short int yytype_int8; -#endif - -#ifdef YYTYPE_UINT16 -typedef YYTYPE_UINT16 yytype_uint16; -#else -typedef unsigned short int yytype_uint16; -#endif - -#ifdef YYTYPE_INT16 -typedef YYTYPE_INT16 yytype_int16; -#else -typedef short int yytype_int16; -#endif - -#ifndef YYSIZE_T -# ifdef __SIZE_TYPE__ -# define YYSIZE_T __SIZE_TYPE__ -# elif defined size_t -# define YYSIZE_T size_t -# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -# include /* INFRINGES ON USER NAME SPACE */ -# define YYSIZE_T size_t -# else -# define YYSIZE_T unsigned int -# endif -#endif - -#define YYSIZE_MAXIMUM ((YYSIZE_T) -1) - -#ifndef YY_ -# if defined YYENABLE_NLS && YYENABLE_NLS -# if ENABLE_NLS -# include /* INFRINGES ON USER NAME SPACE */ -# define YY_(msgid) dgettext ("bison-runtime", msgid) -# endif -# endif -# ifndef YY_ -# define YY_(msgid) msgid -# endif -#endif - -/* Suppress unused-variable warnings by "using" E. */ -#if ! defined lint || defined __GNUC__ -# define YYUSE(e) ((void) (e)) -#else -# define YYUSE(e) /* empty */ -#endif - -/* Identity function, used to suppress warnings about constant conditions. */ -#ifndef lint -# define YYID(n) (n) -#else -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static int -YYID (int i) -#else -static int -YYID (i) - int i; -#endif -{ - return i; -} -#endif - -#if ! defined yyoverflow || YYERROR_VERBOSE - -/* The parser invokes alloca or malloc; define the necessary symbols. */ - -# ifdef YYSTACK_USE_ALLOCA -# if YYSTACK_USE_ALLOCA -# ifdef __GNUC__ -# define YYSTACK_ALLOC __builtin_alloca -# elif defined __BUILTIN_VA_ARG_INCR -# include /* INFRINGES ON USER NAME SPACE */ -# elif defined _AIX -# define YYSTACK_ALLOC __alloca -# elif defined _MSC_VER -# include /* INFRINGES ON USER NAME SPACE */ -# define alloca _alloca -# else -# define YYSTACK_ALLOC alloca -# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -# include /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 -# endif -# endif -# endif -# endif -# endif - -# ifdef YYSTACK_ALLOC - /* Pacify GCC's `empty if-body' warning. */ -# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) -# ifndef YYSTACK_ALLOC_MAXIMUM - /* The OS might guarantee only one guard page at the bottom of the stack, - and a page size can be as small as 4096 bytes. So we cannot safely - invoke alloca (N) if N exceeds 4096. Use a slightly smaller number - to allow for a few compiler-allocated temporary stack slots. */ -# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */ -# endif -# else -# define YYSTACK_ALLOC YYMALLOC -# define YYSTACK_FREE YYFREE -# ifndef YYSTACK_ALLOC_MAXIMUM -# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM -# endif -# if (defined __cplusplus && ! defined _STDLIB_H \ - && ! ((defined YYMALLOC || defined malloc) \ - && (defined YYFREE || defined free))) -# include /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 -# endif -# endif -# ifndef YYMALLOC -# define YYMALLOC malloc -# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ -# endif -# endif -# ifndef YYFREE -# define YYFREE free -# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -void free (void *); /* INFRINGES ON USER NAME SPACE */ -# endif -# endif -# endif -#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ - - -#if (! defined yyoverflow \ - && (! defined __cplusplus \ - || (defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL \ - && defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) - -/* A type that is properly aligned for any stack member. */ -union yyalloc -{ - yytype_int16 yyss; - YYSTYPE yyvs; - YYLTYPE yyls; -}; - -/* The size of the maximum gap between one aligned stack and the next. */ -# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) - -/* The size of an array large to enough to hold all stacks, each with - N elements. */ -# define YYSTACK_BYTES(N) \ - ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \ - + 2 * YYSTACK_GAP_MAXIMUM) - -/* Copy COUNT objects from FROM to TO. The source and destination do - not overlap. */ -# ifndef YYCOPY -# if defined __GNUC__ && 1 < __GNUC__ -# define YYCOPY(To, From, Count) \ - __builtin_memcpy (To, From, (Count) * sizeof (*(From))) -# else -# define YYCOPY(To, From, Count) \ - do \ - { \ - YYSIZE_T yyi; \ - for (yyi = 0; yyi < (Count); yyi++) \ - (To)[yyi] = (From)[yyi]; \ - } \ - while (YYID (0)) -# endif -# endif - -/* Relocate STACK from its old location to the new one. The - local variables YYSIZE and YYSTACKSIZE give the old and new number of - elements in the stack, and YYPTR gives the new location of the - stack. Advance YYPTR to a properly aligned location for the next - stack. */ -# define YYSTACK_RELOCATE(Stack) \ - do \ - { \ - YYSIZE_T yynewbytes; \ - YYCOPY (&yyptr->Stack, Stack, yysize); \ - Stack = &yyptr->Stack; \ - yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ - yyptr += yynewbytes / sizeof (*yyptr); \ - } \ - while (YYID (0)) - -#endif - -/* YYFINAL -- State number of the termination state. */ -#define YYFINAL 5 -/* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 52 - -/* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 31 -/* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 21 -/* YYNRULES -- Number of rules. */ -#define YYNRULES 36 -/* YYNRULES -- Number of states. */ -#define YYNSTATES 70 - -/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ -#define YYUNDEFTOK 2 -#define YYMAXUTOK 285 - -#define YYTRANSLATE(YYX) \ - ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) - -/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ -static const yytype_uint8 yytranslate[] = -{ - 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, - 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - 25, 26, 27, 28, 29, 30 -}; - -#if YYDEBUG -/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in - YYRHS. */ -static const yytype_uint8 yyprhs[] = -{ - 0, 0, 3, 8, 11, 12, 14, 16, 18, 20, - 23, 25, 28, 32, 33, 36, 40, 41, 45, 47, - 49, 51, 55, 63, 64, 67, 72, 74, 77, 78, - 82, 90, 92, 96, 99, 100, 104 -}; - -/* YYRHS -- A `-1'-separated list of the rules' RHS. */ -static const yytype_int8 yyrhs[] = -{ - 32, 0, -1, 3, 36, 33, 4, -1, 33, 34, - -1, -1, 42, -1, 47, -1, 51, -1, 35, -1, - 5, 25, -1, 6, -1, 18, 19, -1, 18, 37, - 19, -1, -1, 38, 39, -1, 38, 39, 15, -1, - -1, 40, 21, 40, -1, 40, -1, 23, -1, 25, - -1, 16, 24, 17, -1, 8, 36, 41, 12, 22, - 25, 14, -1, -1, 20, 24, -1, 16, 24, 43, - 17, -1, 44, -1, 16, 17, -1, -1, 11, 36, - 25, -1, 7, 36, 44, 13, 46, 45, 14, -1, - 40, -1, 40, 21, 40, -1, 48, 49, -1, -1, - 18, 49, 19, -1, 9, 50, 22, 10, 22, 14, - -1 -}; - -/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ -static const yytype_uint8 yyrline[] = -{ - 0, 124, 124, 130, 130, 131, 131, 131, 131, 133, - 133, 136, 138, 140, 141, 148, 154, 156, 163, 169, - 169, 171, 172, 192, 192, 193, 200, 201, 203, 204, - 212, 250, 250, 251, 251, 252, 254 -}; -#endif - -#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE -/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. - First, the terminals, then, starting at YYNTOKENS, nonterminals. */ -static const char *const yytname[] = -{ - "$end", "error", "$undefined", "\"\\\\begin{tikzpicture}\"", - "\"\\\\end{tikzpicture}\"", "\"\\\\begin{pgfonlayer}\"", - "\"\\\\end{pgfonlayer}\"", "\"\\\\draw\"", "\"\\\\node\"", - "\"\\\\path\"", "\"rectangle\"", "\"node\"", "\"at\"", "\"to\"", "\";\"", - "\",\"", "\"(\"", "\")\"", "\"[\"", "\"]\"", "\".\"", "\"=\"", - "\"co-ordinate\"", "\"key/value string\"", "\"string\"", - "\"{-delimited string\"", "\"unknown \\\\begin command\"", - "\"unknown \\\\end command\"", "\"unknown latex command\"", - "\"unknown string\"", "\"unclosed {-delimited string\"", "$accept", - "tikzpicture", "tikzcmds", "tikzcmd", "ignore", "optproperties", - "properties", "extraproperties", "property", "val", "nodename", "node", - "optanchor", "noderef", "optnoderef", "optedgenode", "edge", - "ignoreprop", "ignoreprops", "optignoreprops", "boundingbox", 0 -}; -#endif - -# ifdef YYPRINT -/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to - token YYLEX-NUM. */ -static const yytype_uint16 yytoknum[] = -{ - 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, - 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, - 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, - 285 -}; -# endif - -/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ -static const yytype_uint8 yyr1[] = -{ - 0, 31, 32, 33, 33, 34, 34, 34, 34, 35, - 35, 36, 36, 36, 37, 38, 38, 39, 39, 40, - 40, 41, 42, 43, 43, 44, 45, 45, 46, 46, - 47, 48, 48, 49, 49, 50, 51 -}; - -/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ -static const yytype_uint8 yyr2[] = -{ - 0, 2, 4, 2, 0, 1, 1, 1, 1, 2, - 1, 2, 3, 0, 2, 3, 0, 3, 1, 1, - 1, 3, 7, 0, 2, 4, 1, 2, 0, 3, - 7, 1, 3, 2, 0, 3, 6 -}; - -/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state - STATE-NUM when YYTABLE doesn't specify something else to do. Zero - means the default is an error. */ -static const yytype_uint8 yydefact[] = -{ - 0, 13, 0, 16, 4, 1, 11, 0, 0, 0, - 12, 19, 20, 14, 18, 2, 0, 10, 13, 13, - 0, 3, 8, 5, 6, 7, 15, 0, 9, 0, - 0, 34, 0, 17, 0, 0, 0, 0, 31, 34, - 0, 0, 23, 28, 0, 0, 0, 33, 35, 0, - 0, 0, 13, 0, 21, 0, 32, 0, 24, 25, - 0, 0, 26, 0, 0, 36, 29, 27, 30, 22 -}; - -/* YYDEFGOTO[NTERM-NUM]. */ -static const yytype_int8 yydefgoto[] = -{ - -1, 2, 9, 21, 22, 4, 7, 8, 13, 38, - 37, 23, 51, 35, 63, 53, 24, 39, 40, 32, - 25 -}; - -/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing - STATE-NUM. */ -#define YYPACT_NINF -20 -static const yytype_int8 yypact[] = -{ - 9, -4, 15, -3, -20, -20, -20, -2, -12, 0, - -20, -20, -20, 3, -1, -20, 1, -20, -4, -4, - 4, -20, -20, -20, -20, -20, -20, -12, -20, 5, - 7, -12, 2, -20, 6, 12, 8, 16, 10, -12, - 14, 17, 19, 18, 20, 21, -12, -20, -20, 22, - 23, 24, -4, 26, -20, 11, -20, 31, -20, -20, - 25, -14, -20, 32, 34, -20, -20, -20, -20, -20 -}; - -/* YYPGOTO[NTERM-NUM]. */ -static const yytype_int8 yypgoto[] = -{ - -20, -20, -20, -20, -20, -17, -20, -20, -20, -8, - -20, -20, -20, -19, -20, -20, -20, -20, 13, -20, - -20 -}; - -/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If - positive, shift that token. If negative, reduce the rule which - number is the opposite. If zero, do what YYDEFACT says. - If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -1 -static const yytype_uint8 yytable[] = -{ - 14, 29, 30, 67, 15, 16, 17, 18, 19, 20, - 42, 11, 1, 12, 3, 5, 6, 10, 26, 33, - 27, 34, 31, 36, 41, 43, 28, 49, 45, 52, - 42, 46, 44, 48, 62, 60, 64, 54, 56, 50, - 0, 59, 61, 55, 57, 65, 68, 58, 69, 0, - 66, 0, 47 -}; - -static const yytype_int8 yycheck[] = -{ - 8, 18, 19, 17, 4, 5, 6, 7, 8, 9, - 24, 23, 3, 25, 18, 0, 19, 19, 15, 27, - 21, 16, 18, 16, 22, 13, 25, 10, 12, 11, - 24, 21, 24, 19, 53, 52, 25, 17, 46, 20, - -1, 17, 16, 22, 22, 14, 14, 24, 14, -1, - 25, -1, 39 -}; - -/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing - symbol of state STATE-NUM. */ -static const yytype_uint8 yystos[] = -{ - 0, 3, 32, 18, 36, 0, 19, 37, 38, 33, - 19, 23, 25, 39, 40, 4, 5, 6, 7, 8, - 9, 34, 35, 42, 47, 51, 15, 21, 25, 36, - 36, 18, 50, 40, 16, 44, 16, 41, 40, 48, - 49, 22, 24, 13, 24, 12, 21, 49, 19, 10, - 20, 43, 11, 46, 17, 22, 40, 22, 24, 17, - 36, 16, 44, 45, 25, 14, 25, 17, 14, 14 -}; - -#define yyerrok (yyerrstatus = 0) -#define yyclearin (yychar = YYEMPTY) -#define YYEMPTY (-2) -#define YYEOF 0 - -#define YYACCEPT goto yyacceptlab -#define YYABORT goto yyabortlab -#define YYERROR goto yyerrorlab - - -/* Like YYERROR except do call yyerror. This remains here temporarily - to ease the transition to the new meaning of YYERROR, for GCC. - Once GCC version 2 has supplanted version 1, this can go. */ - -#define YYFAIL goto yyerrlab - -#define YYRECOVERING() (!!yyerrstatus) - -#define YYBACKUP(Token, Value) \ -do \ - if (yychar == YYEMPTY && yylen == 1) \ - { \ - yychar = (Token); \ - yylval = (Value); \ - yytoken = YYTRANSLATE (yychar); \ - YYPOPSTACK (1); \ - goto yybackup; \ - } \ - else \ - { \ - yyerror (&yylloc, scanner, YY_("syntax error: cannot back up")); \ - YYERROR; \ - } \ -while (YYID (0)) - - -#define YYTERROR 1 -#define YYERRCODE 256 - - -/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. - If N is 0, then set CURRENT to the empty location which ends - the previous symbol: RHS[0] (always defined). */ - -#define YYRHSLOC(Rhs, K) ((Rhs)[K]) -#ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - do \ - if (YYID (N)) \ - { \ - (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ - (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ - (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ - (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ - } \ - else \ - { \ - (Current).first_line = (Current).last_line = \ - YYRHSLOC (Rhs, 0).last_line; \ - (Current).first_column = (Current).last_column = \ - YYRHSLOC (Rhs, 0).last_column; \ - } \ - while (YYID (0)) -#endif - - -/* YY_LOCATION_PRINT -- Print the location on the stream. - This macro was not mandated originally: define only if we know - we won't break user code: when these are the locations we know. */ - -#ifndef YY_LOCATION_PRINT -# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL -# define YY_LOCATION_PRINT(File, Loc) \ - fprintf (File, "%d.%d-%d.%d", \ - (Loc).first_line, (Loc).first_column, \ - (Loc).last_line, (Loc).last_column) -# else -# define YY_LOCATION_PRINT(File, Loc) ((void) 0) -# endif -#endif - - -/* YYLEX -- calling `yylex' with the right arguments. */ - -#ifdef YYLEX_PARAM -# define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM) -#else -# define YYLEX yylex (&yylval, &yylloc, scanner) -#endif - -/* Enable debugging if requested. */ -#if YYDEBUG - -# ifndef YYFPRINTF -# include /* INFRINGES ON USER NAME SPACE */ -# define YYFPRINTF fprintf -# endif - -# define YYDPRINTF(Args) \ -do { \ - if (yydebug) \ - YYFPRINTF Args; \ -} while (YYID (0)) - -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ -do { \ - if (yydebug) \ - { \ - YYFPRINTF (stderr, "%s ", Title); \ - yy_symbol_print (stderr, \ - Type, Value, Location, scanner); \ - YYFPRINTF (stderr, "\n"); \ - } \ -} while (YYID (0)) - - -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ - -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp, void *scanner) -#else -static void -yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp, scanner) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; - YYLTYPE const * const yylocationp; - void *scanner; -#endif -{ - if (!yyvaluep) - return; - YYUSE (yylocationp); - YYUSE (scanner); -# ifdef YYPRINT - if (yytype < YYNTOKENS) - YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); -# else - YYUSE (yyoutput); -# endif - switch (yytype) - { - default: - break; - } -} - - -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ - -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp, void *scanner) -#else -static void -yy_symbol_print (yyoutput, yytype, yyvaluep, yylocationp, scanner) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; - YYLTYPE const * const yylocationp; - void *scanner; -#endif -{ - if (yytype < YYNTOKENS) - YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); - else - YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); - - YY_LOCATION_PRINT (yyoutput, *yylocationp); - YYFPRINTF (yyoutput, ": "); - yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp, scanner); - YYFPRINTF (yyoutput, ")"); -} - -/*------------------------------------------------------------------. -| yy_stack_print -- Print the state stack from its BOTTOM up to its | -| TOP (included). | -`------------------------------------------------------------------*/ - -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_stack_print (yytype_int16 *bottom, yytype_int16 *top) -#else -static void -yy_stack_print (bottom, top) - yytype_int16 *bottom; - yytype_int16 *top; -#endif -{ - YYFPRINTF (stderr, "Stack now"); - for (; bottom <= top; ++bottom) - YYFPRINTF (stderr, " %d", *bottom); - YYFPRINTF (stderr, "\n"); -} - -# define YY_STACK_PRINT(Bottom, Top) \ -do { \ - if (yydebug) \ - yy_stack_print ((Bottom), (Top)); \ -} while (YYID (0)) - - -/*------------------------------------------------. -| Report that the YYRULE is going to be reduced. | -`------------------------------------------------*/ - -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_reduce_print (YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule, void *scanner) -#else -static void -yy_reduce_print (yyvsp, yylsp, yyrule, scanner) - YYSTYPE *yyvsp; - YYLTYPE *yylsp; - int yyrule; - void *scanner; -#endif -{ - int yynrhs = yyr2[yyrule]; - int yyi; - unsigned long int yylno = yyrline[yyrule]; - YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", - yyrule - 1, yylno); - /* The symbols being reduced. */ - for (yyi = 0; yyi < yynrhs; yyi++) - { - fprintf (stderr, " $%d = ", yyi + 1); - yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], - &(yyvsp[(yyi + 1) - (yynrhs)]) - , &(yylsp[(yyi + 1) - (yynrhs)]) , scanner); - fprintf (stderr, "\n"); - } -} - -# define YY_REDUCE_PRINT(Rule) \ -do { \ - if (yydebug) \ - yy_reduce_print (yyvsp, yylsp, Rule, scanner); \ -} while (YYID (0)) - -/* Nonzero means print parse trace. It is left uninitialized so that - multiple parsers can coexist. */ -int yydebug; -#else /* !YYDEBUG */ -# define YYDPRINTF(Args) -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) -# define YY_STACK_PRINT(Bottom, Top) -# define YY_REDUCE_PRINT(Rule) -#endif /* !YYDEBUG */ - - -/* YYINITDEPTH -- initial size of the parser's stacks. */ -#ifndef YYINITDEPTH -# define YYINITDEPTH 200 -#endif - -/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only - if the built-in stack extension method is used). - - Do not make this value too large; the results are undefined if - YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH) - evaluated with infinite-precision integer arithmetic. */ - -#ifndef YYMAXDEPTH -# define YYMAXDEPTH 10000 -#endif - - - -#if YYERROR_VERBOSE - -# ifndef yystrlen -# if defined __GLIBC__ && defined _STRING_H -# define yystrlen strlen -# else -/* Return the length of YYSTR. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static YYSIZE_T -yystrlen (const char *yystr) -#else -static YYSIZE_T -yystrlen (yystr) - const char *yystr; -#endif -{ - YYSIZE_T yylen; - for (yylen = 0; yystr[yylen]; yylen++) - continue; - return yylen; -} -# endif -# endif - -# ifndef yystpcpy -# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE -# define yystpcpy stpcpy -# else -/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in - YYDEST. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static char * -yystpcpy (char *yydest, const char *yysrc) -#else -static char * -yystpcpy (yydest, yysrc) - char *yydest; - const char *yysrc; -#endif -{ - char *yyd = yydest; - const char *yys = yysrc; - - while ((*yyd++ = *yys++) != '\0') - continue; - - return yyd - 1; -} -# endif -# endif - -# ifndef yytnamerr -/* Copy to YYRES the contents of YYSTR after stripping away unnecessary - quotes and backslashes, so that it's suitable for yyerror. The - heuristic is that double-quoting is unnecessary unless the string - contains an apostrophe, a comma, or backslash (other than - backslash-backslash). YYSTR is taken from yytname. If YYRES is - null, do not copy; instead, return the length of what the result - would have been. */ -static YYSIZE_T -yytnamerr (char *yyres, const char *yystr) -{ - if (*yystr == '"') - { - YYSIZE_T yyn = 0; - char const *yyp = yystr; - - for (;;) - switch (*++yyp) - { - case '\'': - case ',': - goto do_not_strip_quotes; - - case '\\': - if (*++yyp != '\\') - goto do_not_strip_quotes; - /* Fall through. */ - default: - if (yyres) - yyres[yyn] = *yyp; - yyn++; - break; - - case '"': - if (yyres) - yyres[yyn] = '\0'; - return yyn; - } - do_not_strip_quotes: ; - } - - if (! yyres) - return yystrlen (yystr); - - return yystpcpy (yyres, yystr) - yyres; -} -# endif - -/* Copy into YYRESULT an error message about the unexpected token - YYCHAR while in state YYSTATE. Return the number of bytes copied, - including the terminating null byte. If YYRESULT is null, do not - copy anything; just return the number of bytes that would be - copied. As a special case, return 0 if an ordinary "syntax error" - message will do. Return YYSIZE_MAXIMUM if overflow occurs during - size calculation. */ -static YYSIZE_T -yysyntax_error (char *yyresult, int yystate, int yychar) -{ - int yyn = yypact[yystate]; - - if (! (YYPACT_NINF < yyn && yyn <= YYLAST)) - return 0; - else - { - int yytype = YYTRANSLATE (yychar); - YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]); - YYSIZE_T yysize = yysize0; - YYSIZE_T yysize1; - int yysize_overflow = 0; - enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; - char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; - int yyx; - -# if 0 - /* This is so xgettext sees the translatable formats that are - constructed on the fly. */ - YY_("syntax error, unexpected %s"); - YY_("syntax error, unexpected %s, expecting %s"); - YY_("syntax error, unexpected %s, expecting %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"); -# endif - char *yyfmt; - char const *yyf; - static char const yyunexpected[] = "syntax error, unexpected %s"; - static char const yyexpecting[] = ", expecting %s"; - static char const yyor[] = " or %s"; - char yyformat[sizeof yyunexpected - + sizeof yyexpecting - 1 - + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2) - * (sizeof yyor - 1))]; - char const *yyprefix = yyexpecting; - - /* Start YYX at -YYN if negative to avoid negative indexes in - YYCHECK. */ - int yyxbegin = yyn < 0 ? -yyn : 0; - - /* Stay within bounds of both yycheck and yytname. */ - int yychecklim = YYLAST - yyn + 1; - int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; - int yycount = 1; - - yyarg[0] = yytname[yytype]; - yyfmt = yystpcpy (yyformat, yyunexpected); - - for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) - { - if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) - { - yycount = 1; - yysize = yysize0; - yyformat[sizeof yyunexpected - 1] = '\0'; - break; - } - yyarg[yycount++] = yytname[yyx]; - yysize1 = yysize + yytnamerr (0, yytname[yyx]); - yysize_overflow |= (yysize1 < yysize); - yysize = yysize1; - yyfmt = yystpcpy (yyfmt, yyprefix); - yyprefix = yyor; - } - - yyf = YY_(yyformat); - yysize1 = yysize + yystrlen (yyf); - yysize_overflow |= (yysize1 < yysize); - yysize = yysize1; - - if (yysize_overflow) - return YYSIZE_MAXIMUM; - - if (yyresult) - { - /* Avoid sprintf, as that infringes on the user's name space. - Don't have undefined behavior even if the translation - produced a string with the wrong number of "%s"s. */ - char *yyp = yyresult; - int yyi = 0; - while ((*yyp = *yyf) != '\0') - { - if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) - { - yyp += yytnamerr (yyp, yyarg[yyi++]); - yyf += 2; - } - else - { - yyp++; - yyf++; - } - } - } - return yysize; - } -} -#endif /* YYERROR_VERBOSE */ - - -/*-----------------------------------------------. -| Release the memory associated to this symbol. | -`-----------------------------------------------*/ - -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp, void *scanner) -#else -static void -yydestruct (yymsg, yytype, yyvaluep, yylocationp, scanner) - const char *yymsg; - int yytype; - YYSTYPE *yyvaluep; - YYLTYPE *yylocationp; - void *scanner; -#endif -{ - YYUSE (yyvaluep); - YYUSE (yylocationp); - YYUSE (scanner); - - if (!yymsg) - yymsg = "Deleting"; - YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); - - switch (yytype) - { - - default: - break; - } -} - - -/* Prevent warnings from -Wmissing-prototypes. */ - -#ifdef YYPARSE_PARAM -#if defined __STDC__ || defined __cplusplus -int yyparse (void *YYPARSE_PARAM); -#else -int yyparse (); -#endif -#else /* ! YYPARSE_PARAM */ -#if defined __STDC__ || defined __cplusplus -int yyparse (void *scanner); -#else -int yyparse (); -#endif -#endif /* ! YYPARSE_PARAM */ - - - - - - -/*----------. -| yyparse. | -`----------*/ - -#ifdef YYPARSE_PARAM -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -int -yyparse (void *YYPARSE_PARAM) -#else -int -yyparse (YYPARSE_PARAM) - void *YYPARSE_PARAM; -#endif -#else /* ! YYPARSE_PARAM */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -int -yyparse (void *scanner) -#else -int -yyparse (scanner) - void *scanner; -#endif -#endif -{ - /* The look-ahead symbol. */ -int yychar; - -/* The semantic value of the look-ahead symbol. */ -YYSTYPE yylval; - -/* Number of syntax errors so far. */ -int yynerrs; -/* Location data for the look-ahead symbol. */ -YYLTYPE yylloc; - - int yystate; - int yyn; - int yyresult; - /* Number of tokens to shift before error messages enabled. */ - int yyerrstatus; - /* Look-ahead token as an internal (translated) token number. */ - int yytoken = 0; -#if YYERROR_VERBOSE - /* Buffer for error messages, and its allocated size. */ - char yymsgbuf[128]; - char *yymsg = yymsgbuf; - YYSIZE_T yymsg_alloc = sizeof yymsgbuf; -#endif - - /* Three stacks and their tools: - `yyss': related to states, - `yyvs': related to semantic values, - `yyls': related to locations. - - Refer to the stacks thru separate pointers, to allow yyoverflow - to reallocate them elsewhere. */ - - /* The state stack. */ - yytype_int16 yyssa[YYINITDEPTH]; - yytype_int16 *yyss = yyssa; - yytype_int16 *yyssp; - - /* The semantic value stack. */ - YYSTYPE yyvsa[YYINITDEPTH]; - YYSTYPE *yyvs = yyvsa; - YYSTYPE *yyvsp; - - /* The location stack. */ - YYLTYPE yylsa[YYINITDEPTH]; - YYLTYPE *yyls = yylsa; - YYLTYPE *yylsp; - /* The locations where the error started and ended. */ - YYLTYPE yyerror_range[2]; - -#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N), yylsp -= (N)) - - YYSIZE_T yystacksize = YYINITDEPTH; - - /* The variables used to return semantic value and location from the - action routines. */ - YYSTYPE yyval; - YYLTYPE yyloc; - - /* The number of symbols on the RHS of the reduced rule. - Keep to zero when no symbol should be popped. */ - int yylen = 0; - - YYDPRINTF ((stderr, "Starting parse\n")); - - yystate = 0; - yyerrstatus = 0; - yynerrs = 0; - yychar = YYEMPTY; /* Cause a token to be read. */ - - /* Initialize stack pointers. - Waste one element of value and location stack - so that they stay on the same level as the state stack. - The wasted elements are never initialized. */ - - yyssp = yyss; - yyvsp = yyvs; - yylsp = yyls; -#if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL - /* Initialize the default location before parsing starts. */ - yylloc.first_line = yylloc.last_line = 1; - yylloc.first_column = yylloc.last_column = 0; -#endif - - - /* User initialization code. */ -#line 75 "../tikzit/src/data/tikzparser.y" -{ - yylloc.first_column = yylloc.last_column = 0; -} -/* Line 1078 of yacc.c. */ -#line 1337 "../tikzit/src/data/tikzparser.parser.cpp" - goto yysetstate; - -/*------------------------------------------------------------. -| yynewstate -- Push a new state, which is found in yystate. | -`------------------------------------------------------------*/ - yynewstate: - /* In all cases, when you get here, the value and location stacks - have just been pushed. So pushing a state here evens the stacks. */ - yyssp++; - - yysetstate: - *yyssp = yystate; - - if (yyss + yystacksize - 1 <= yyssp) - { - /* Get the current used size of the three stacks, in elements. */ - YYSIZE_T yysize = yyssp - yyss + 1; - -#ifdef yyoverflow - { - /* Give user a chance to reallocate the stack. Use copies of - these so that the &'s don't force the real ones into - memory. */ - YYSTYPE *yyvs1 = yyvs; - yytype_int16 *yyss1 = yyss; - YYLTYPE *yyls1 = yyls; - - /* Each stack pointer address is followed by the size of the - data in use in that stack, in bytes. This used to be a - conditional around just the two extra args, but that might - be undefined if yyoverflow is a macro. */ - yyoverflow (YY_("memory exhausted"), - &yyss1, yysize * sizeof (*yyssp), - &yyvs1, yysize * sizeof (*yyvsp), - &yyls1, yysize * sizeof (*yylsp), - &yystacksize); - yyls = yyls1; - yyss = yyss1; - yyvs = yyvs1; - } -#else /* no yyoverflow */ -# ifndef YYSTACK_RELOCATE - goto yyexhaustedlab; -# else - /* Extend the stack our own way. */ - if (YYMAXDEPTH <= yystacksize) - goto yyexhaustedlab; - yystacksize *= 2; - if (YYMAXDEPTH < yystacksize) - yystacksize = YYMAXDEPTH; - - { - yytype_int16 *yyss1 = yyss; - union yyalloc *yyptr = - (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); - if (! yyptr) - goto yyexhaustedlab; - YYSTACK_RELOCATE (yyss); - YYSTACK_RELOCATE (yyvs); - YYSTACK_RELOCATE (yyls); -# undef YYSTACK_RELOCATE - if (yyss1 != yyssa) - YYSTACK_FREE (yyss1); - } -# endif -#endif /* no yyoverflow */ - - yyssp = yyss + yysize - 1; - yyvsp = yyvs + yysize - 1; - yylsp = yyls + yysize - 1; - - YYDPRINTF ((stderr, "Stack size increased to %lu\n", - (unsigned long int) yystacksize)); - - if (yyss + yystacksize - 1 <= yyssp) - YYABORT; - } - - YYDPRINTF ((stderr, "Entering state %d\n", yystate)); - - goto yybackup; - -/*-----------. -| yybackup. | -`-----------*/ -yybackup: - - /* Do appropriate processing given the current state. Read a - look-ahead token if we need one and don't already have one. */ - - /* First try to decide what to do without reference to look-ahead token. */ - yyn = yypact[yystate]; - if (yyn == YYPACT_NINF) - goto yydefault; - - /* Not known => get a look-ahead token if don't already have one. */ - - /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */ - if (yychar == YYEMPTY) - { - YYDPRINTF ((stderr, "Reading a token: ")); - yychar = YYLEX; - } - - if (yychar <= YYEOF) - { - yychar = yytoken = YYEOF; - YYDPRINTF ((stderr, "Now at end of input.\n")); - } - else - { - yytoken = YYTRANSLATE (yychar); - YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc); - } - - /* If the proper action on seeing token YYTOKEN is to reduce or to - detect an error, take that action. */ - yyn += yytoken; - if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken) - goto yydefault; - yyn = yytable[yyn]; - if (yyn <= 0) - { - if (yyn == 0 || yyn == YYTABLE_NINF) - goto yyerrlab; - yyn = -yyn; - goto yyreduce; - } - - if (yyn == YYFINAL) - YYACCEPT; - - /* Count tokens shifted since error; after three, turn off error - status. */ - if (yyerrstatus) - yyerrstatus--; - - /* Shift the look-ahead token. */ - YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); - - /* Discard the shifted token unless it is eof. */ - if (yychar != YYEOF) - yychar = YYEMPTY; - - yystate = yyn; - *++yyvsp = yylval; - *++yylsp = yylloc; - goto yynewstate; - - -/*-----------------------------------------------------------. -| yydefault -- do the default action for the current state. | -`-----------------------------------------------------------*/ -yydefault: - yyn = yydefact[yystate]; - if (yyn == 0) - goto yyerrlab; - goto yyreduce; - - -/*-----------------------------. -| yyreduce -- Do a reduction. | -`-----------------------------*/ -yyreduce: - /* yyn is the number of a rule to reduce with. */ - yylen = yyr2[yyn]; - - /* If YYLEN is nonzero, implement the default value of the action: - `$$ = $1'. - - Otherwise, the following line sets YYVAL to garbage. - This behavior is undocumented and Bison - users should not rely upon it. Assigning to YYVAL - unconditionally makes the parser a bit smaller, and it avoids a - GCC warning that YYVAL may be used uninitialized. */ - yyval = yyvsp[1-yylen]; - - /* Default location. */ - YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen); - YY_REDUCE_PRINT (yyn); - switch (yyn) - { - case 2: -#line 125 "../tikzit/src/data/tikzparser.y" - { - if ((yyvsp[(2) - (4)].data)) { - assembler->graph()->setData((yyvsp[(2) - (4)].data)); - } - ;} - break; - - case 11: -#line 137 "../tikzit/src/data/tikzparser.y" - { (yyval.data) = 0; ;} - break; - - case 12: -#line 139 "../tikzit/src/data/tikzparser.y" - { (yyval.data) = (yyvsp[(2) - (3)].data); ;} - break; - - case 13: -#line 140 "../tikzit/src/data/tikzparser.y" - { (yyval.data) = 0; ;} - break; - - case 14: -#line 142 "../tikzit/src/data/tikzparser.y" - { - (yyvsp[(1) - (2)].data)->add(*(yyvsp[(2) - (2)].prop)); - delete (yyvsp[(2) - (2)].prop); - (yyval.data) = (yyvsp[(1) - (2)].data); - ;} - break; - - case 15: -#line 149 "../tikzit/src/data/tikzparser.y" - { - (yyvsp[(1) - (3)].data)->add(*(yyvsp[(2) - (3)].prop)); - delete (yyvsp[(2) - (3)].prop); - (yyval.data) = (yyvsp[(1) - (3)].data); - ;} - break; - - case 16: -#line 154 "../tikzit/src/data/tikzparser.y" - { (yyval.data) = new GraphElementData(); ;} - break; - - case 17: -#line 157 "../tikzit/src/data/tikzparser.y" - { - GraphElementProperty *p = new GraphElementProperty(QString((yyvsp[(1) - (3)].str)),QString((yyvsp[(3) - (3)].str))); - free((yyvsp[(1) - (3)].str)); - free((yyvsp[(3) - (3)].str)); - (yyval.prop) = p; - ;} - break; - - case 18: -#line 164 "../tikzit/src/data/tikzparser.y" - { - GraphElementProperty *a = new GraphElementProperty(QString((yyvsp[(1) - (1)].str))); - free((yyvsp[(1) - (1)].str)); - (yyval.prop) = a; - ;} - break; - - case 19: -#line 169 "../tikzit/src/data/tikzparser.y" - { (yyval.str) = (yyvsp[(1) - (1)].str); ;} - break; - - case 20: -#line 169 "../tikzit/src/data/tikzparser.y" - { (yyval.str) = (yyvsp[(1) - (1)].str); ;} - break; - - case 21: -#line 171 "../tikzit/src/data/tikzparser.y" - { (yyval.str) = (yyvsp[(2) - (3)].str); ;} - break; - - case 22: -#line 173 "../tikzit/src/data/tikzparser.y" - { - Node *node = new Node(); - - if ((yyvsp[(2) - (7)].data)) { - node->setData((yyvsp[(2) - (7)].data)); - } - //qDebug() << "node name: " << $3; - node->setName(QString((yyvsp[(3) - (7)].str))); - node->setLabel(QString((yyvsp[(6) - (7)].str))); - free((yyvsp[(3) - (7)].str)); - free((yyvsp[(6) - (7)].str)); - - node->setPoint(*(yyvsp[(5) - (7)].pt)); - delete (yyvsp[(5) - (7)].pt); - - assembler->graph()->addNode(node); - assembler->addNodeToMap(node); - ;} - break; - - case 23: -#line 192 "../tikzit/src/data/tikzparser.y" - { (yyval.str) = 0; ;} - break; - - case 24: -#line 192 "../tikzit/src/data/tikzparser.y" - { (yyval.str) = (yyvsp[(2) - (2)].str); ;} - break; - - case 25: -#line 194 "../tikzit/src/data/tikzparser.y" - { - (yyval.noderef).node = assembler->nodeWithName(QString((yyvsp[(2) - (4)].str))); - free((yyvsp[(2) - (4)].str)); - (yyval.noderef).anchor = (yyvsp[(3) - (4)].str); - ;} - break; - - case 26: -#line 200 "../tikzit/src/data/tikzparser.y" - { (yyval.noderef) = (yyvsp[(1) - (1)].noderef); ;} - break; - - case 27: -#line 201 "../tikzit/src/data/tikzparser.y" - { (yyval.noderef).node = 0; (yyval.noderef).anchor = 0; ;} - break; - - case 28: -#line 203 "../tikzit/src/data/tikzparser.y" - { (yyval.node) = 0; ;} - break; - - case 29: -#line 205 "../tikzit/src/data/tikzparser.y" - { - (yyval.node) = new Node(); - if ((yyvsp[(2) - (3)].data)) - (yyval.node)->setData((yyvsp[(2) - (3)].data)); - (yyval.node)->setLabel(QString((yyvsp[(3) - (3)].str))); - free((yyvsp[(3) - (3)].str)); - ;} - break; - - case 30: -#line 213 "../tikzit/src/data/tikzparser.y" - { - Node *s; - Node *t; - - s = (yyvsp[(3) - (7)].noderef).node; - - if ((yyvsp[(6) - (7)].noderef).node) { - t = (yyvsp[(6) - (7)].noderef).node; - } else { - t = s; - } - - Edge *edge = new Edge(s, t); - if ((yyvsp[(2) - (7)].data)) { - edge->setData((yyvsp[(2) - (7)].data)); - edge->setAttributesFromData(); - } - - if ((yyvsp[(5) - (7)].node)) - edge->setEdgeNode((yyvsp[(5) - (7)].node)); - if ((yyvsp[(3) - (7)].noderef).anchor) { - edge->setSourceAnchor(QString((yyvsp[(3) - (7)].noderef).anchor)); - free((yyvsp[(3) - (7)].noderef).anchor); - } - - if ((yyvsp[(6) - (7)].noderef).node) { - if ((yyvsp[(6) - (7)].noderef).anchor) { - edge->setTargetAnchor(QString((yyvsp[(6) - (7)].noderef).anchor)); - free((yyvsp[(6) - (7)].noderef).anchor); - } - } else { - edge->setTargetAnchor(edge->sourceAnchor()); - } - - assembler->graph()->addEdge(edge); - ;} - break; - - case 36: -#line 255 "../tikzit/src/data/tikzparser.y" - { - assembler->graph()->setBbox(QRectF(*(yyvsp[(3) - (6)].pt), *(yyvsp[(5) - (6)].pt))); - delete (yyvsp[(3) - (6)].pt); - delete (yyvsp[(5) - (6)].pt); - ;} - break; - - -/* Line 1267 of yacc.c. */ -#line 1719 "../tikzit/src/data/tikzparser.parser.cpp" - default: break; - } - YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); - - YYPOPSTACK (yylen); - yylen = 0; - YY_STACK_PRINT (yyss, yyssp); - - *++yyvsp = yyval; - *++yylsp = yyloc; - - /* Now `shift' the result of the reduction. Determine what state - that goes to, based on the state we popped back to and the rule - number reduced by. */ - - yyn = yyr1[yyn]; - - yystate = yypgoto[yyn - YYNTOKENS] + *yyssp; - if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp) - yystate = yytable[yystate]; - else - yystate = yydefgoto[yyn - YYNTOKENS]; - - goto yynewstate; - - -/*------------------------------------. -| yyerrlab -- here on detecting error | -`------------------------------------*/ -yyerrlab: - /* If not already recovering from an error, report this error. */ - if (!yyerrstatus) - { - ++yynerrs; -#if ! YYERROR_VERBOSE - yyerror (&yylloc, scanner, YY_("syntax error")); -#else - { - YYSIZE_T yysize = yysyntax_error (0, yystate, yychar); - if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM) - { - YYSIZE_T yyalloc = 2 * yysize; - if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM)) - yyalloc = YYSTACK_ALLOC_MAXIMUM; - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); - yymsg = (char *) YYSTACK_ALLOC (yyalloc); - if (yymsg) - yymsg_alloc = yyalloc; - else - { - yymsg = yymsgbuf; - yymsg_alloc = sizeof yymsgbuf; - } - } - - if (0 < yysize && yysize <= yymsg_alloc) - { - (void) yysyntax_error (yymsg, yystate, yychar); - yyerror (&yylloc, scanner, yymsg); - } - else - { - yyerror (&yylloc, scanner, YY_("syntax error")); - if (yysize != 0) - goto yyexhaustedlab; - } - } -#endif - } - - yyerror_range[0] = yylloc; - - if (yyerrstatus == 3) - { - /* If just tried and failed to reuse look-ahead token after an - error, discard it. */ - - if (yychar <= YYEOF) - { - /* Return failure if at end of input. */ - if (yychar == YYEOF) - YYABORT; - } - else - { - yydestruct ("Error: discarding", - yytoken, &yylval, &yylloc, scanner); - yychar = YYEMPTY; - } - } - - /* Else will try to reuse look-ahead token after shifting the error - token. */ - goto yyerrlab1; - - -/*---------------------------------------------------. -| yyerrorlab -- error raised explicitly by YYERROR. | -`---------------------------------------------------*/ -yyerrorlab: - - /* Pacify compilers like GCC when the user code never invokes - YYERROR and the label yyerrorlab therefore never appears in user - code. */ - if (/*CONSTCOND*/ 0) - goto yyerrorlab; - - yyerror_range[0] = yylsp[1-yylen]; - /* Do not reclaim the symbols of the rule which action triggered - this YYERROR. */ - YYPOPSTACK (yylen); - yylen = 0; - YY_STACK_PRINT (yyss, yyssp); - yystate = *yyssp; - goto yyerrlab1; - - -/*-------------------------------------------------------------. -| yyerrlab1 -- common code for both syntax error and YYERROR. | -`-------------------------------------------------------------*/ -yyerrlab1: - yyerrstatus = 3; /* Each real token shifted decrements this. */ - - for (;;) - { - yyn = yypact[yystate]; - if (yyn != YYPACT_NINF) - { - yyn += YYTERROR; - if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) - { - yyn = yytable[yyn]; - if (0 < yyn) - break; - } - } - - /* Pop the current state because it cannot handle the error token. */ - if (yyssp == yyss) - YYABORT; - - yyerror_range[0] = *yylsp; - yydestruct ("Error: popping", - yystos[yystate], yyvsp, yylsp, scanner); - YYPOPSTACK (1); - yystate = *yyssp; - YY_STACK_PRINT (yyss, yyssp); - } - - if (yyn == YYFINAL) - YYACCEPT; - - *++yyvsp = yylval; - - yyerror_range[1] = yylloc; - /* Using YYLLOC is tempting, but would change the location of - the look-ahead. YYLOC is available though. */ - YYLLOC_DEFAULT (yyloc, (yyerror_range - 1), 2); - *++yylsp = yyloc; - - /* Shift the error token. */ - YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); - - yystate = yyn; - goto yynewstate; - - -/*-------------------------------------. -| yyacceptlab -- YYACCEPT comes here. | -`-------------------------------------*/ -yyacceptlab: - yyresult = 0; - goto yyreturn; - -/*-----------------------------------. -| yyabortlab -- YYABORT comes here. | -`-----------------------------------*/ -yyabortlab: - yyresult = 1; - goto yyreturn; - -#ifndef yyoverflow -/*-------------------------------------------------. -| yyexhaustedlab -- memory exhaustion comes here. | -`-------------------------------------------------*/ -yyexhaustedlab: - yyerror (&yylloc, scanner, YY_("memory exhausted")); - yyresult = 2; - /* Fall through. */ -#endif - -yyreturn: - if (yychar != YYEOF && yychar != YYEMPTY) - yydestruct ("Cleanup: discarding lookahead", - yytoken, &yylval, &yylloc, scanner); - /* Do not reclaim the symbols of the rule which action triggered - this YYABORT or YYACCEPT. */ - YYPOPSTACK (yylen); - YY_STACK_PRINT (yyss, yyssp); - while (yyssp != yyss) - { - yydestruct ("Cleanup: popping", - yystos[*yyssp], yyvsp, yylsp, scanner); - YYPOPSTACK (1); - } -#ifndef yyoverflow - if (yyss != yyssa) - YYSTACK_FREE (yyss); -#endif -#if YYERROR_VERBOSE - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); -#endif - /* Make sure YYID is used. */ - return YYID (yyresult); -} - - - diff --git a/src/data/tikzparser.parser.hpp b/src/data/tikzparser.parser.hpp deleted file mode 100644 index aaf0e10..0000000 --- a/src/data/tikzparser.parser.hpp +++ /dev/null @@ -1,139 +0,0 @@ -/* A Bison parser, made by GNU Bison 2.3. */ - -/* Skeleton interface for Bison's Yacc-like parsers in C - - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ - -/* As a special exception, you may create a larger work that contains - part or all of the Bison parser skeleton and distribute that work - under terms of your choice, so long as that work isn't itself a - parser generator using the skeleton or a modified version thereof - as a parser skeleton. Alternatively, if you modify or redistribute - the parser skeleton itself, you may (at your option) remove this - special exception, which will cause the skeleton and the resulting - Bison output files to be licensed under the GNU General Public - License without this special exception. - - This special exception was added by the Free Software Foundation in - version 2.2 of Bison. */ - -/* Tokens. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - BEGIN_TIKZPICTURE_CMD = 258, - END_TIKZPICTURE_CMD = 259, - BEGIN_PGFONLAYER_CMD = 260, - END_PGFONLAYER_CMD = 261, - DRAW_CMD = 262, - NODE_CMD = 263, - PATH_CMD = 264, - RECTANGLE = 265, - NODE = 266, - AT = 267, - TO = 268, - SEMICOLON = 269, - COMMA = 270, - LEFTPARENTHESIS = 271, - RIGHTPARENTHESIS = 272, - LEFTBRACKET = 273, - RIGHTBRACKET = 274, - FULLSTOP = 275, - EQUALS = 276, - COORD = 277, - PROPSTRING = 278, - REFSTRING = 279, - DELIMITEDSTRING = 280, - UNKNOWN_BEGIN_CMD = 281, - UNKNOWN_END_CMD = 282, - UNKNOWN_CMD = 283, - UNKNOWN_STR = 284, - UNCLOSED_DELIM_STR = 285 - }; -#endif -/* Tokens. */ -#define BEGIN_TIKZPICTURE_CMD 258 -#define END_TIKZPICTURE_CMD 259 -#define BEGIN_PGFONLAYER_CMD 260 -#define END_PGFONLAYER_CMD 261 -#define DRAW_CMD 262 -#define NODE_CMD 263 -#define PATH_CMD 264 -#define RECTANGLE 265 -#define NODE 266 -#define AT 267 -#define TO 268 -#define SEMICOLON 269 -#define COMMA 270 -#define LEFTPARENTHESIS 271 -#define RIGHTPARENTHESIS 272 -#define LEFTBRACKET 273 -#define RIGHTBRACKET 274 -#define FULLSTOP 275 -#define EQUALS 276 -#define COORD 277 -#define PROPSTRING 278 -#define REFSTRING 279 -#define DELIMITEDSTRING 280 -#define UNKNOWN_BEGIN_CMD 281 -#define UNKNOWN_END_CMD 282 -#define UNKNOWN_CMD 283 -#define UNKNOWN_STR 284 -#define UNCLOSED_DELIM_STR 285 - - - - -#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE -#line 43 "../tikzit/src/data/tikzparser.y" -{ - char *str; - GraphElementProperty *prop; - GraphElementData *data; - Node *node; - QPointF *pt; - struct noderef noderef; -} -/* Line 1529 of yacc.c. */ -#line 118 "../tikzit/src/data/tikzparser.parser.hpp" - YYSTYPE; -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ -# define YYSTYPE_IS_DECLARED 1 -# define YYSTYPE_IS_TRIVIAL 1 -#endif - - - -#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED -typedef struct YYLTYPE -{ - int first_line; - int first_column; - int last_line; - int last_column; -} YYLTYPE; -# define yyltype YYLTYPE /* obsolescent; will be withdrawn */ -# define YYLTYPE_IS_DECLARED 1 -# define YYLTYPE_IS_TRIVIAL 1 -#endif - - diff --git a/target_wrapper.sh b/target_wrapper.sh deleted file mode 100755 index 1793274..0000000 --- a/target_wrapper.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -DYLD_FRAMEWORK_PATH=/usr/local/Cellar/qt5/5.7.1_1/lib${DYLD_FRAMEWORK_PATH:+:$DYLD_FRAMEWORK_PATH} -export DYLD_FRAMEWORK_PATH -QT_PLUGIN_PATH=/usr/local/Cellar/qt5/5.7.1_1/plugins${QT_PLUGIN_PATH:+:$QT_PLUGIN_PATH} -export QT_PLUGIN_PATH -exec "$@" -- cgit v1.2.3 From b727ea087517adbd62fae7df3ca100718841adc4 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Thu, 4 Jan 2018 16:31:23 +0100 Subject: updated readme --- .gitignore | 1 + README.md | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/.gitignore b/.gitignore index 98bd6b3..7957c8f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ build-tikzit-* *.pro.user Makefile tikzit.app +target_wrapper.sh diff --git a/README.md b/README.md index e79efea..c4ecfbc 100644 --- a/README.md +++ b/README.md @@ -17,9 +17,16 @@ You'll need Qt5 and poppler with Qt5 bindings. Qt5 can be installed using e.g. H $ brew install qt5 +This doesn't add Qt binaries to the PATH by default, so you may wish to add this to your shell startup script: + + export PATH="/usr/local/opt/qt/bin:$PATH" + Poppler should be built from source to get the Qt5 bindings. If Qt is setup correctly, the configure script included with Poppler should enable these automatically. Also, note that clang needs to have C++11 features enabled to build successfully. TikZiT has been tested on MacOS with poppler-0.50.0 (available here), built with the following commands: $ CXXFLAGS="-std=c++11" ./configure $ CXXFLAGS="-std=c++11" make +Then, TikZiT is built just like a normal Qt project: + $ qmake + $ make -- cgit v1.2.3 From 1ac83bc560b0640b49baad065cf9e669a08f14b5 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Fri, 5 Jan 2018 10:13:32 +0100 Subject: readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c4ecfbc..57a7255 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # TikZiT -TikZiT is a graphical tool for rapidly creating graphs and diagrams using PGF/TikZ. It was used, for example, to make all of the 2500+ diagrams in this book. It is currently undergoing a port to Qt5 for better cross-platform support. As such, the code on this branch, and the README is a work in progress. +TikZiT is a graphical tool for rapidly creating graphs and diagrams using PGF/TikZ. It was used, for example, to make all of the 2500+ diagrams in this book. It is currently undergoing a port to Qt5 for better cross-platform support. As such, the code on this branch, and these instructions are a work in progress. ## Building on Windows -- cgit v1.2.3 From ae7fdfb3a6dfbf14fc9c2f0810b38975f0346a4a Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Fri, 5 Jan 2018 13:47:13 +0100 Subject: added flex/bison files to .gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 7957c8f..22e1dab 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,6 @@ build-tikzit-* Makefile tikzit.app target_wrapper.sh +src/data/tikzlexer.lexer.cpp +src/data/tikzparser.parser.cpp +src/data/tikzparser.parser.hpp -- cgit v1.2.3 From c0bb77059e3c4afa47fe6bfebbf99e230a01992c Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Wed, 10 Jan 2018 09:40:41 +0100 Subject: added Doxyfile, Illustrator file for icon, and a 512x512 version --- Doxyfile | 2512 ++++++++++++++++++++++++++++++++++++++++++++++ images/tikzit.ai | 967 ++++++++++++++++++ images/tikzit48x48.png | Bin 2606 -> 2435 bytes images/tikzit512x512.png | Bin 0 -> 27019 bytes src/gui/tikzscene.cpp | 11 + 5 files changed, 3490 insertions(+) create mode 100644 Doxyfile create mode 100644 images/tikzit.ai create mode 100644 images/tikzit512x512.png diff --git a/Doxyfile b/Doxyfile new file mode 100644 index 0000000..039ed89 --- /dev/null +++ b/Doxyfile @@ -0,0 +1,2512 @@ +# Doxyfile 1.8.14 + +# This file describes the settings to be used by the documentation system +# doxygen (www.doxygen.org) for a project. +# +# All text after a double hash (##) is considered a comment and is placed in +# front of the TAG it is preceding. +# +# All text after a single hash (#) is considered a comment and will be ignored. +# The format is: +# TAG = value [value, ...] +# For lists, items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (\" \"). + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- + +# This tag specifies the encoding used for all characters in the config file +# that follow. The default is UTF-8 which is also the encoding used for all text +# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv +# built into libc) for the transcoding. See +# https://www.gnu.org/software/libiconv/ for the list of possible encodings. +# The default value is: UTF-8. + +DOXYFILE_ENCODING = UTF-8 + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by +# double-quotes, unless you are using Doxywizard) that should identify the +# project for which the documentation is generated. This name is used in the +# title of most generated pages and in a few other places. +# The default value is: My Project. + +PROJECT_NAME = TikZiT + +# The PROJECT_NUMBER tag can be used to enter a project or revision number. This +# could be handy for archiving the generated documentation or if some version +# control system is used. + +PROJECT_NUMBER = 2.0 + +# Using the PROJECT_BRIEF tag one can provide an optional one line description +# for a project that appears at the top of each page and should give viewer a +# quick idea about the purpose of the project. Keep the description short. + +PROJECT_BRIEF = "A GUI diagram editor for TikZ" + +# With the PROJECT_LOGO tag one can specify a logo or an icon that is included +# in the documentation. The maximum height of the logo should not exceed 55 +# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy +# the logo to the output directory. + +PROJECT_LOGO = images/tikzit48x48.png + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path +# into which the generated documentation will be written. If a relative path is +# entered, it will be relative to the location where doxygen was started. If +# left blank the current directory will be used. + +OUTPUT_DIRECTORY = ../tikzit.github.io/docs + +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- +# directories (in 2 levels) under the output directory of each output format and +# will distribute the generated files over these directories. Enabling this +# option can be useful when feeding doxygen a huge amount of source files, where +# putting all generated files in the same directory would otherwise causes +# performance problems for the file system. +# The default value is: NO. + +CREATE_SUBDIRS = NO + +# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII +# characters to appear in the names of generated files. If set to NO, non-ASCII +# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode +# U+3044. +# The default value is: NO. + +ALLOW_UNICODE_NAMES = NO + +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, +# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), +# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, +# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), +# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, +# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, +# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, +# Ukrainian and Vietnamese. +# The default value is: English. + +OUTPUT_LANGUAGE = English + +# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member +# descriptions after the members that are listed in the file and class +# documentation (similar to Javadoc). Set to NO to disable this. +# The default value is: YES. + +BRIEF_MEMBER_DESC = YES + +# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief +# description of a member or function before the detailed description +# +# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# brief descriptions will be completely suppressed. +# The default value is: YES. + +REPEAT_BRIEF = YES + +# This tag implements a quasi-intelligent brief description abbreviator that is +# used to form the text in various listings. Each string in this list, if found +# as the leading text of the brief description, will be stripped from the text +# and the result, after processing the whole list, is used as the annotated +# text. Otherwise, the brief description is used as-is. If left blank, the +# following values are used ($name is automatically replaced with the name of +# the entity):The $name class, The $name widget, The $name file, is, provides, +# specifies, contains, represents, a, an and the. + +ABBREVIATE_BRIEF = "The $name class" \ + "The $name widget" \ + "The $name file" \ + is \ + provides \ + specifies \ + contains \ + represents \ + a \ + an \ + the + +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# doxygen will generate a detailed section even if there is only a brief +# description. +# The default value is: NO. + +ALWAYS_DETAILED_SEC = NO + +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment +# operators of the base classes will not be shown. +# The default value is: NO. + +INLINE_INHERITED_MEMB = NO + +# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path +# before files name in the file list and in the header files. If set to NO the +# shortest path that makes the file name unique will be used +# The default value is: YES. + +FULL_PATH_NAMES = YES + +# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path. +# Stripping is only done if one of the specified strings matches the left-hand +# part of the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the path to +# strip. +# +# Note that you can specify absolute paths here, but also relative paths, which +# will be relative from the directory where doxygen is started. +# This tag requires that the tag FULL_PATH_NAMES is set to YES. + +STRIP_FROM_PATH = + +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the +# path mentioned in the documentation of a class, which tells the reader which +# header file to include in order to use a class. If left blank only the name of +# the header file containing the class definition is used. Otherwise one should +# specify the list of include paths that are normally passed to the compiler +# using the -I flag. + +STRIP_FROM_INC_PATH = + +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but +# less readable) file names. This can be useful is your file systems doesn't +# support long names like on DOS, Mac, or CD-ROM. +# The default value is: NO. + +SHORT_NAMES = NO + +# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the +# first line (until the first dot) of a Javadoc-style comment as the brief +# description. If set to NO, the Javadoc-style will behave just like regular Qt- +# style comments (thus requiring an explicit @brief command for a brief +# description.) +# The default value is: NO. + +JAVADOC_AUTOBRIEF = NO + +# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first +# line (until the first dot) of a Qt-style comment as the brief description. If +# set to NO, the Qt-style will behave just like regular Qt-style comments (thus +# requiring an explicit \brief command for a brief description.) +# The default value is: NO. + +QT_AUTOBRIEF = NO + +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a +# multi-line C++ special comment block (i.e. a block of //! or /// comments) as +# a brief description. This used to be the default behavior. The new default is +# to treat a multi-line C++ comment block as a detailed description. Set this +# tag to YES if you prefer the old behavior instead. +# +# Note that setting this tag to YES also means that rational rose comments are +# not recognized any more. +# The default value is: NO. + +MULTILINE_CPP_IS_BRIEF = NO + +# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the +# documentation from any documented member that it re-implements. +# The default value is: YES. + +INHERIT_DOCS = YES + +# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new +# page for each member. If set to NO, the documentation of a member will be part +# of the file/class/namespace that contains it. +# The default value is: NO. + +SEPARATE_MEMBER_PAGES = NO + +# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen +# uses this value to replace tabs by spaces in code fragments. +# Minimum value: 1, maximum value: 16, default value: 4. + +TAB_SIZE = 4 + +# This tag can be used to specify a number of aliases that act as commands in +# the documentation. An alias has the form: +# name=value +# For example adding +# "sideeffect=@par Side Effects:\n" +# will allow you to put the command \sideeffect (or @sideeffect) in the +# documentation, which will result in a user-defined paragraph with heading +# "Side Effects:". You can put \n's in the value part of an alias to insert +# newlines (in the resulting output). You can put ^^ in the value part of an +# alias to insert a newline as if a physical newline was in the original file. + +ALIASES = + +# This tag can be used to specify a number of word-keyword mappings (TCL only). +# A mapping has the form "name=value". For example adding "class=itcl::class" +# will allow you to use the command class in the itcl::class meaning. + +TCL_SUBST = + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources +# only. Doxygen will then generate output that is more tailored for C. For +# instance, some of the names that are used will be different. The list of all +# members will be omitted, etc. +# The default value is: NO. + +OPTIMIZE_OUTPUT_FOR_C = NO + +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or +# Python sources only. Doxygen will then generate output that is more tailored +# for that language. For instance, namespaces will be presented as packages, +# qualified scopes will look different, etc. +# The default value is: NO. + +OPTIMIZE_OUTPUT_JAVA = NO + +# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran +# sources. Doxygen will then generate output that is tailored for Fortran. +# The default value is: NO. + +OPTIMIZE_FOR_FORTRAN = NO + +# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL +# sources. Doxygen will then generate output that is tailored for VHDL. +# The default value is: NO. + +OPTIMIZE_OUTPUT_VHDL = NO + +# Doxygen selects the parser to use depending on the extension of the files it +# parses. With this tag you can assign which parser to use for a given +# extension. Doxygen has a built-in mapping, but you can override or extend it +# using this tag. The format is ext=language, where ext is a file extension, and +# language is one of the parsers supported by doxygen: IDL, Java, Javascript, +# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran: +# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran: +# Fortran. In the later case the parser tries to guess whether the code is fixed +# or free formatted code, this is the default for Fortran type files), VHDL. For +# instance to make doxygen treat .inc files as Fortran files (default is PHP), +# and .f files as C (default is Fortran), use: inc=Fortran f=C. +# +# Note: For files without extension you can use no_extension as a placeholder. +# +# Note that for custom extensions you also need to set FILE_PATTERNS otherwise +# the files are not read by doxygen. + +EXTENSION_MAPPING = + +# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments +# according to the Markdown format, which allows for more readable +# documentation. See http://daringfireball.net/projects/markdown/ for details. +# The output of markdown processing is further processed by doxygen, so you can +# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in +# case of backward compatibilities issues. +# The default value is: YES. + +MARKDOWN_SUPPORT = YES + +# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up +# to that level are automatically included in the table of contents, even if +# they do not have an id attribute. +# Note: This feature currently applies only to Markdown headings. +# Minimum value: 0, maximum value: 99, default value: 0. +# This tag requires that the tag MARKDOWN_SUPPORT is set to YES. + +TOC_INCLUDE_HEADINGS = 0 + +# When enabled doxygen tries to link words that correspond to documented +# classes, or namespaces to their corresponding documentation. Such a link can +# be prevented in individual cases by putting a % sign in front of the word or +# globally by setting AUTOLINK_SUPPORT to NO. +# The default value is: YES. + +AUTOLINK_SUPPORT = YES + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want +# to include (a tag file for) the STL sources as input, then you should set this +# tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); +# versus func(std::string) {}). This also make the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate. +# The default value is: NO. + +BUILTIN_STL_SUPPORT = NO + +# If you use Microsoft's C++/CLI language, you should set this option to YES to +# enable parsing support. +# The default value is: NO. + +CPP_CLI_SUPPORT = NO + +# Set the SIP_SUPPORT tag to YES if your project consists of sip (see: +# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen +# will parse them like normal C++ but will assume all classes use public instead +# of private inheritance when no explicit protection keyword is present. +# The default value is: NO. + +SIP_SUPPORT = NO + +# For Microsoft's IDL there are propget and propput attributes to indicate +# getter and setter methods for a property. Setting this option to YES will make +# doxygen to replace the get and set methods by a property in the documentation. +# This will only work if the methods are indeed getting or setting a simple +# type. If this is not the case, or you want to show the methods anyway, you +# should set this option to NO. +# The default value is: YES. + +IDL_PROPERTY_SUPPORT = YES + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default +# all members of a group must be documented explicitly. +# The default value is: NO. + +DISTRIBUTE_GROUP_DOC = NO + +# If one adds a struct or class to a group and this option is enabled, then also +# any nested class or struct is added to the same group. By default this option +# is disabled and one has to add nested compounds explicitly via \ingroup. +# The default value is: NO. + +GROUP_NESTED_COMPOUNDS = NO + +# Set the SUBGROUPING tag to YES to allow class member groups of the same type +# (for instance a group of public functions) to be put as a subgroup of that +# type (e.g. under the Public Functions section). Set it to NO to prevent +# subgrouping. Alternatively, this can be done per class using the +# \nosubgrouping command. +# The default value is: YES. + +SUBGROUPING = YES + +# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions +# are shown inside the group in which they are included (e.g. using \ingroup) +# instead of on a separate page (for HTML and Man pages) or section (for LaTeX +# and RTF). +# +# Note that this feature does not work in combination with +# SEPARATE_MEMBER_PAGES. +# The default value is: NO. + +INLINE_GROUPED_CLASSES = NO + +# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions +# with only public data fields or simple typedef fields will be shown inline in +# the documentation of the scope in which they are defined (i.e. file, +# namespace, or group documentation), provided this scope is documented. If set +# to NO, structs, classes, and unions are shown on a separate page (for HTML and +# Man pages) or section (for LaTeX and RTF). +# The default value is: NO. + +INLINE_SIMPLE_STRUCTS = NO + +# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or +# enum is documented as struct, union, or enum with the name of the typedef. So +# typedef struct TypeS {} TypeT, will appear in the documentation as a struct +# with name TypeT. When disabled the typedef will appear as a member of a file, +# namespace, or class. And the struct will be named TypeS. This can typically be +# useful for C code in case the coding convention dictates that all compound +# types are typedef'ed and only the typedef is referenced, never the tag name. +# The default value is: NO. + +TYPEDEF_HIDES_STRUCT = NO + +# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This +# cache is used to resolve symbols given their name and scope. Since this can be +# an expensive process and often the same symbol appears multiple times in the +# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small +# doxygen will become slower. If the cache is too large, memory is wasted. The +# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range +# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536 +# symbols. At the end of a run doxygen will report the cache usage and suggest +# the optimal cache size from a speed point of view. +# Minimum value: 0, maximum value: 9, default value: 0. + +LOOKUP_CACHE_SIZE = 0 + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- + +# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in +# documentation are documented, even if no documentation was available. Private +# class members and static file members will be hidden unless the +# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES. +# Note: This will also disable the warnings about undocumented members that are +# normally produced when WARNINGS is set to YES. +# The default value is: NO. + +EXTRACT_ALL = NO + +# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will +# be included in the documentation. +# The default value is: NO. + +EXTRACT_PRIVATE = NO + +# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal +# scope will be included in the documentation. +# The default value is: NO. + +EXTRACT_PACKAGE = NO + +# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be +# included in the documentation. +# The default value is: NO. + +EXTRACT_STATIC = NO + +# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined +# locally in source files will be included in the documentation. If set to NO, +# only classes defined in header files are included. Does not have any effect +# for Java sources. +# The default value is: YES. + +EXTRACT_LOCAL_CLASSES = YES + +# This flag is only useful for Objective-C code. If set to YES, local methods, +# which are defined in the implementation section but not in the interface are +# included in the documentation. If set to NO, only methods in the interface are +# included. +# The default value is: NO. + +EXTRACT_LOCAL_METHODS = NO + +# If this flag is set to YES, the members of anonymous namespaces will be +# extracted and appear in the documentation as a namespace called +# 'anonymous_namespace{file}', where file will be replaced with the base name of +# the file that contains the anonymous namespace. By default anonymous namespace +# are hidden. +# The default value is: NO. + +EXTRACT_ANON_NSPACES = NO + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all +# undocumented members inside documented classes or files. If set to NO these +# members will be included in the various overviews, but no documentation +# section is generated. This option has no effect if EXTRACT_ALL is enabled. +# The default value is: NO. + +HIDE_UNDOC_MEMBERS = NO + +# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. If set +# to NO, these classes will be included in the various overviews. This option +# has no effect if EXTRACT_ALL is enabled. +# The default value is: NO. + +HIDE_UNDOC_CLASSES = NO + +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend +# (class|struct|union) declarations. If set to NO, these declarations will be +# included in the documentation. +# The default value is: NO. + +HIDE_FRIEND_COMPOUNDS = NO + +# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any +# documentation blocks found inside the body of a function. If set to NO, these +# blocks will be appended to the function's detailed documentation block. +# The default value is: NO. + +HIDE_IN_BODY_DOCS = NO + +# The INTERNAL_DOCS tag determines if documentation that is typed after a +# \internal command is included. If the tag is set to NO then the documentation +# will be excluded. Set it to YES to include the internal documentation. +# The default value is: NO. + +INTERNAL_DOCS = NO + +# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file +# names in lower-case letters. If set to YES, upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows +# and Mac users are advised to set this option to NO. +# The default value is: system dependent. + +CASE_SENSE_NAMES = NO + +# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with +# their full class and namespace scopes in the documentation. If set to YES, the +# scope will be hidden. +# The default value is: NO. + +HIDE_SCOPE_NAMES = NO + +# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will +# append additional text to a page's title, such as Class Reference. If set to +# YES the compound reference will be hidden. +# The default value is: NO. + +HIDE_COMPOUND_REFERENCE= NO + +# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of +# the files that are included by a file in the documentation of that file. +# The default value is: YES. + +SHOW_INCLUDE_FILES = YES + +# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each +# grouped member an include statement to the documentation, telling the reader +# which file to include in order to use the member. +# The default value is: NO. + +SHOW_GROUPED_MEMB_INC = NO + +# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include +# files with double quotes in the documentation rather than with sharp brackets. +# The default value is: NO. + +FORCE_LOCAL_INCLUDES = NO + +# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the +# documentation for inline members. +# The default value is: YES. + +INLINE_INFO = YES + +# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the +# (detailed) documentation of file and class members alphabetically by member +# name. If set to NO, the members will appear in declaration order. +# The default value is: YES. + +SORT_MEMBER_DOCS = YES + +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief +# descriptions of file, namespace and class members alphabetically by member +# name. If set to NO, the members will appear in declaration order. Note that +# this will also influence the order of the classes in the class list. +# The default value is: NO. + +SORT_BRIEF_DOCS = NO + +# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the +# (brief and detailed) documentation of class members so that constructors and +# destructors are listed first. If set to NO the constructors will appear in the +# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS. +# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief +# member documentation. +# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting +# detailed member documentation. +# The default value is: NO. + +SORT_MEMBERS_CTORS_1ST = NO + +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy +# of group names into alphabetical order. If set to NO the group names will +# appear in their defined order. +# The default value is: NO. + +SORT_GROUP_NAMES = NO + +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by +# fully-qualified names, including namespaces. If set to NO, the class list will +# be sorted only by class name, not including the namespace part. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option applies only to the class list, not to the alphabetical +# list. +# The default value is: NO. + +SORT_BY_SCOPE_NAME = NO + +# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper +# type resolution of all parameters of a function it will reject a match between +# the prototype and the implementation of a member function even if there is +# only one candidate or it is obvious which candidate to choose by doing a +# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still +# accept a match between prototype and implementation in such cases. +# The default value is: NO. + +STRICT_PROTO_MATCHING = NO + +# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo +# list. This list is created by putting \todo commands in the documentation. +# The default value is: YES. + +GENERATE_TODOLIST = YES + +# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test +# list. This list is created by putting \test commands in the documentation. +# The default value is: YES. + +GENERATE_TESTLIST = YES + +# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug +# list. This list is created by putting \bug commands in the documentation. +# The default value is: YES. + +GENERATE_BUGLIST = YES + +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO) +# the deprecated list. This list is created by putting \deprecated commands in +# the documentation. +# The default value is: YES. + +GENERATE_DEPRECATEDLIST= YES + +# The ENABLED_SECTIONS tag can be used to enable conditional documentation +# sections, marked by \if ... \endif and \cond +# ... \endcond blocks. + +ENABLED_SECTIONS = + +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the +# initial value of a variable or macro / define can have for it to appear in the +# documentation. If the initializer consists of more lines than specified here +# it will be hidden. Use a value of 0 to hide initializers completely. The +# appearance of the value of individual variables and macros / defines can be +# controlled using \showinitializer or \hideinitializer command in the +# documentation regardless of this setting. +# Minimum value: 0, maximum value: 10000, default value: 30. + +MAX_INITIALIZER_LINES = 30 + +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at +# the bottom of the documentation of classes and structs. If set to YES, the +# list will mention the files that were used to generate the documentation. +# The default value is: YES. + +SHOW_USED_FILES = YES + +# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This +# will remove the Files entry from the Quick Index and from the Folder Tree View +# (if specified). +# The default value is: YES. + +SHOW_FILES = YES + +# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces +# page. This will remove the Namespaces entry from the Quick Index and from the +# Folder Tree View (if specified). +# The default value is: YES. + +SHOW_NAMESPACES = YES + +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from +# the version control system). Doxygen will invoke the program by executing (via +# popen()) the command command input-file, where command is the value of the +# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided +# by doxygen. Whatever the program writes to standard output is used as the file +# version. For an example see the documentation. + +FILE_VERSION_FILTER = + +# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed +# by doxygen. The layout file controls the global structure of the generated +# output files in an output format independent way. To create the layout file +# that represents doxygen's defaults, run doxygen with the -l option. You can +# optionally specify a file name after the option, if omitted DoxygenLayout.xml +# will be used as the name of the layout file. +# +# Note that if you run doxygen from a directory containing a file called +# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE +# tag is left empty. + +LAYOUT_FILE = + +# The CITE_BIB_FILES tag can be used to specify one or more bib files containing +# the reference definitions. This must be a list of .bib files. The .bib +# extension is automatically appended if omitted. This requires the bibtex tool +# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. +# For LaTeX the style of the bibliography can be controlled using +# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the +# search path. See also \cite for info how to create references. + +CITE_BIB_FILES = + +#--------------------------------------------------------------------------- +# Configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +# The QUIET tag can be used to turn on/off the messages that are generated to +# standard output by doxygen. If QUIET is set to YES this implies that the +# messages are off. +# The default value is: NO. + +QUIET = NO + +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES +# this implies that the warnings are on. +# +# Tip: Turn warnings on while writing the documentation. +# The default value is: YES. + +WARNINGS = YES + +# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate +# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: YES. + +WARN_IF_UNDOCUMENTED = YES + +# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some parameters +# in a documented function, or documenting parameters that don't exist or using +# markup commands wrongly. +# The default value is: YES. + +WARN_IF_DOC_ERROR = YES + +# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that +# are documented, but have no documentation for their parameters or return +# value. If set to NO, doxygen will only warn about wrong or incomplete +# parameter documentation, but not about the absence of documentation. +# The default value is: NO. + +WARN_NO_PARAMDOC = NO + +# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when +# a warning is encountered. +# The default value is: NO. + +WARN_AS_ERROR = NO + +# The WARN_FORMAT tag determines the format of the warning messages that doxygen +# can produce. The string should contain the $file, $line, and $text tags, which +# will be replaced by the file and line number from which the warning originated +# and the warning text. Optionally the format may contain $version, which will +# be replaced by the version of the file (if it could be obtained via +# FILE_VERSION_FILTER) +# The default value is: $file:$line: $text. + +WARN_FORMAT = "$file:$line: $text" + +# The WARN_LOGFILE tag can be used to specify a file to which warning and error +# messages should be written. If left blank the output is written to standard +# error (stderr). + +WARN_LOGFILE = + +#--------------------------------------------------------------------------- +# Configuration options related to the input files +#--------------------------------------------------------------------------- + +# The INPUT tag is used to specify the files and/or directories that contain +# documented source files. You may enter file names like myfile.cpp or +# directories like /usr/src/myproject. Separate the files or directories with +# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING +# Note: If this tag is empty the current directory is searched. + +INPUT = /Users/alek/git/tikzit/src + +# This tag can be used to specify the character encoding of the source files +# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses +# libiconv (or the iconv built into libc) for the transcoding. See the libiconv +# documentation (see: https://www.gnu.org/software/libiconv/) for the list of +# possible encodings. +# The default value is: UTF-8. + +INPUT_ENCODING = UTF-8 + +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and +# *.h) to filter out the source-files in the directories. +# +# Note that for custom extensions or not directly supported extensions you also +# need to set EXTENSION_MAPPING for the extension otherwise the files are not +# read by doxygen. +# +# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp, +# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, +# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, +# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, +# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf and *.qsf. + +FILE_PATTERNS = *.c \ + *.cc \ + *.cxx \ + *.cpp \ + *.c++ \ + *.java \ + *.ii \ + *.ixx \ + *.ipp \ + *.i++ \ + *.inl \ + *.idl \ + *.ddl \ + *.odl \ + *.h \ + *.hh \ + *.hxx \ + *.hpp \ + *.h++ \ + *.cs \ + *.d \ + *.php \ + *.php4 \ + *.php5 \ + *.phtml \ + *.inc \ + *.m \ + *.markdown \ + *.md \ + *.mm \ + *.dox \ + *.py \ + *.pyw \ + *.f90 \ + *.f95 \ + *.f03 \ + *.f08 \ + *.f \ + *.for \ + *.tcl \ + *.vhd \ + *.vhdl \ + *.ucf \ + *.qsf + +# The RECURSIVE tag can be used to specify whether or not subdirectories should +# be searched for input files as well. +# The default value is: NO. + +RECURSIVE = YES + +# The EXCLUDE tag can be used to specify files and/or directories that should be +# excluded from the INPUT source files. This way you can easily exclude a +# subdirectory from a directory tree whose root is specified with the INPUT tag. +# +# Note that relative paths are relative to the directory from which doxygen is +# run. + +EXCLUDE = + +# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or +# directories that are symbolic links (a Unix file system feature) are excluded +# from the input. +# The default value is: NO. + +EXCLUDE_SYMLINKS = NO + +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. +# +# Note that the wildcards are matched against the file with absolute path, so to +# exclude all test directories for example use the pattern */test/* + +EXCLUDE_PATTERNS = + +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the +# output. The symbol name can be a fully qualified name, a word, or if the +# wildcard * is used, a substring. Examples: ANamespace, AClass, +# AClass::ANamespace, ANamespace::*Test +# +# Note that the wildcards are matched against the file with absolute path, so to +# exclude all test directories use the pattern */test/* + +EXCLUDE_SYMBOLS = + +# The EXAMPLE_PATH tag can be used to specify one or more files or directories +# that contain example code fragments that are included (see the \include +# command). + +EXAMPLE_PATH = + +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and +# *.h) to filter out the source-files in the directories. If left blank all +# files are included. + +EXAMPLE_PATTERNS = * + +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude commands +# irrespective of the value of the RECURSIVE tag. +# The default value is: NO. + +EXAMPLE_RECURSIVE = NO + +# The IMAGE_PATH tag can be used to specify one or more files or directories +# that contain images that are to be included in the documentation (see the +# \image command). + +IMAGE_PATH = + +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command: +# +# +# +# where is the value of the INPUT_FILTER tag, and is the +# name of an input file. Doxygen will then use the output that the filter +# program writes to standard output. If FILTER_PATTERNS is specified, this tag +# will be ignored. +# +# Note that the filter must not add or remove lines; it is applied before the +# code is scanned, but not when the output code is generated. If lines are added +# or removed, the anchors will not be placed correctly. +# +# Note that for custom extensions or not directly supported extensions you also +# need to set EXTENSION_MAPPING for the extension otherwise the files are not +# properly processed by doxygen. + +INPUT_FILTER = + +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. The filters are a list of the form: pattern=filter +# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how +# filters are used. If the FILTER_PATTERNS tag is empty or if none of the +# patterns match the file name, INPUT_FILTER is applied. +# +# Note that for custom extensions or not directly supported extensions you also +# need to set EXTENSION_MAPPING for the extension otherwise the files are not +# properly processed by doxygen. + +FILTER_PATTERNS = + +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will also be used to filter the input files that are used for +# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES). +# The default value is: NO. + +FILTER_SOURCE_FILES = NO + +# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file +# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and +# it is also possible to disable source filtering for a specific pattern using +# *.ext= (so without naming a filter). +# This tag requires that the tag FILTER_SOURCE_FILES is set to YES. + +FILTER_SOURCE_PATTERNS = + +# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that +# is part of the input, its contents will be placed on the main page +# (index.html). This can be useful if you have a project on for instance GitHub +# and want to reuse the introduction page also for the doxygen output. + +USE_MDFILE_AS_MAINPAGE = + +#--------------------------------------------------------------------------- +# Configuration options related to source browsing +#--------------------------------------------------------------------------- + +# If the SOURCE_BROWSER tag is set to YES then a list of source files will be +# generated. Documented entities will be cross-referenced with these sources. +# +# Note: To get rid of all source code in the generated output, make sure that +# also VERBATIM_HEADERS is set to NO. +# The default value is: NO. + +SOURCE_BROWSER = YES + +# Setting the INLINE_SOURCES tag to YES will include the body of functions, +# classes and enums directly into the documentation. +# The default value is: NO. + +INLINE_SOURCES = NO + +# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any +# special comment blocks from generated source code fragments. Normal C, C++ and +# Fortran comments will always remain visible. +# The default value is: YES. + +STRIP_CODE_COMMENTS = YES + +# If the REFERENCED_BY_RELATION tag is set to YES then for each documented +# function all documented functions referencing it will be listed. +# The default value is: NO. + +REFERENCED_BY_RELATION = NO + +# If the REFERENCES_RELATION tag is set to YES then for each documented function +# all documented entities called/used by that function will be listed. +# The default value is: NO. + +REFERENCES_RELATION = NO + +# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set +# to YES then the hyperlinks from functions in REFERENCES_RELATION and +# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will +# link to the documentation. +# The default value is: YES. + +REFERENCES_LINK_SOURCE = YES + +# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the +# source code will show a tooltip with additional information such as prototype, +# brief description and links to the definition and documentation. Since this +# will make the HTML file larger and loading of large files a bit slower, you +# can opt to disable this feature. +# The default value is: YES. +# This tag requires that the tag SOURCE_BROWSER is set to YES. + +SOURCE_TOOLTIPS = YES + +# If the USE_HTAGS tag is set to YES then the references to source code will +# point to the HTML generated by the htags(1) tool instead of doxygen built-in +# source browser. The htags tool is part of GNU's global source tagging system +# (see https://www.gnu.org/software/global/global.html). You will need version +# 4.8.6 or higher. +# +# To use it do the following: +# - Install the latest version of global +# - Enable SOURCE_BROWSER and USE_HTAGS in the config file +# - Make sure the INPUT points to the root of the source tree +# - Run doxygen as normal +# +# Doxygen will invoke htags (and that will in turn invoke gtags), so these +# tools must be available from the command line (i.e. in the search path). +# +# The result: instead of the source browser generated by doxygen, the links to +# source code will now point to the output of htags. +# The default value is: NO. +# This tag requires that the tag SOURCE_BROWSER is set to YES. + +USE_HTAGS = NO + +# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a +# verbatim copy of the header file for each class for which an include is +# specified. Set to NO to disable this. +# See also: Section \class. +# The default value is: YES. + +VERBATIM_HEADERS = YES + +# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the +# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the +# cost of reduced performance. This can be particularly helpful with template +# rich C++ code for which doxygen's built-in parser lacks the necessary type +# information. +# Note: The availability of this option depends on whether or not doxygen was +# generated with the -Duse-libclang=ON option for CMake. +# The default value is: NO. + +CLANG_ASSISTED_PARSING = NO + +# If clang assisted parsing is enabled you can provide the compiler with command +# line options that you would normally use when invoking the compiler. Note that +# the include paths will already be set by doxygen for the files and directories +# specified with INPUT and INCLUDE_PATH. +# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES. + +CLANG_OPTIONS = + +# If clang assisted parsing is enabled you can provide the clang parser with the +# path to the compilation database (see: +# http://clang.llvm.org/docs/HowToSetupToolingForLLVM.html) used when the files +# were built. This is equivalent to specifying the "-p" option to a clang tool, +# such as clang-check. These options will then be passed to the parser. +# Note: The availability of this option depends on whether or not doxygen was +# generated with the -Duse-libclang=ON option for CMake. +# The default value is: 0. + +CLANG_COMPILATION_DATABASE_PATH= 0 + +#--------------------------------------------------------------------------- +# Configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- + +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all +# compounds will be generated. Enable this if the project contains a lot of +# classes, structs, unions or interfaces. +# The default value is: YES. + +ALPHABETICAL_INDEX = YES + +# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in +# which the alphabetical index list will be split. +# Minimum value: 1, maximum value: 20, default value: 5. +# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. + +COLS_IN_ALPHA_INDEX = 5 + +# In case all classes in a project start with a common prefix, all classes will +# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag +# can be used to specify a prefix (or a list of prefixes) that should be ignored +# while generating the index headers. +# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. + +IGNORE_PREFIX = + +#--------------------------------------------------------------------------- +# Configuration options related to the HTML output +#--------------------------------------------------------------------------- + +# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output +# The default value is: YES. + +GENERATE_HTML = YES + +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a +# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of +# it. +# The default directory is: html. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_OUTPUT = html + +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each +# generated HTML page (for example: .htm, .php, .asp). +# The default value is: .html. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_FILE_EXTENSION = .html + +# The HTML_HEADER tag can be used to specify a user-defined HTML header file for +# each generated HTML page. If the tag is left blank doxygen will generate a +# standard header. +# +# To get valid HTML the header file that includes any scripts and style sheets +# that doxygen needs, which is dependent on the configuration options used (e.g. +# the setting GENERATE_TREEVIEW). It is highly recommended to start with a +# default header using +# doxygen -w html new_header.html new_footer.html new_stylesheet.css +# YourConfigFile +# and then modify the file new_header.html. See also section "Doxygen usage" +# for information on how to generate the default header that doxygen normally +# uses. +# Note: The header is subject to change so you typically have to regenerate the +# default header when upgrading to a newer version of doxygen. For a description +# of the possible markers and block names see the documentation. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_HEADER = + +# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each +# generated HTML page. If the tag is left blank doxygen will generate a standard +# footer. See HTML_HEADER for more information on how to generate a default +# footer and what special commands can be used inside the footer. See also +# section "Doxygen usage" for information on how to generate the default footer +# that doxygen normally uses. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_FOOTER = + +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style +# sheet that is used by each HTML page. It can be used to fine-tune the look of +# the HTML output. If left blank doxygen will generate a default style sheet. +# See also section "Doxygen usage" for information on how to generate the style +# sheet that doxygen normally uses. +# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as +# it is more robust and this tag (HTML_STYLESHEET) will in the future become +# obsolete. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_STYLESHEET = + +# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined +# cascading style sheets that are included after the standard style sheets +# created by doxygen. Using this option one can overrule certain style aspects. +# This is preferred over using HTML_STYLESHEET since it does not replace the +# standard style sheet and is therefore more robust against future updates. +# Doxygen will copy the style sheet files to the output directory. +# Note: The order of the extra style sheet files is of importance (e.g. the last +# style sheet in the list overrules the setting of the previous ones in the +# list). For an example see the documentation. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_EXTRA_STYLESHEET = + +# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or +# other source files which should be copied to the HTML output directory. Note +# that these files will be copied to the base HTML output directory. Use the +# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these +# files. In the HTML_STYLESHEET file, use the file name only. Also note that the +# files will be copied as-is; there are no commands or markers available. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_EXTRA_FILES = + +# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen +# will adjust the colors in the style sheet and background images according to +# this color. Hue is specified as an angle on a colorwheel, see +# https://en.wikipedia.org/wiki/Hue for more information. For instance the value +# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 +# purple, and 360 is red again. +# Minimum value: 0, maximum value: 359, default value: 220. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE_HUE = 220 + +# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors +# in the HTML output. For a value of 0 the output will use grayscales only. A +# value of 255 will produce the most vivid colors. +# Minimum value: 0, maximum value: 255, default value: 100. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE_SAT = 100 + +# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the +# luminance component of the colors in the HTML output. Values below 100 +# gradually make the output lighter, whereas values above 100 make the output +# darker. The value divided by 100 is the actual gamma applied, so 80 represents +# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not +# change the gamma. +# Minimum value: 40, maximum value: 240, default value: 80. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE_GAMMA = 80 + +# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML +# page will contain the date and time when the page was generated. Setting this +# to YES can help to show when doxygen was last run and thus if the +# documentation is up to date. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_TIMESTAMP = NO + +# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML +# documentation will contain a main index with vertical navigation menus that +# are dynamically created via Javascript. If disabled, the navigation index will +# consists of multiple levels of tabs that are statically embedded in every HTML +# page. Disable this option to support browsers that do not have Javascript, +# like the Qt help browser. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_MENUS = YES + +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_SECTIONS = NO + +# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries +# shown in the various tree structured indices initially; the user can expand +# and collapse entries dynamically later on. Doxygen will expand the tree to +# such a level that at most the specified number of entries are visible (unless +# a fully collapsed tree already exceeds this amount). So setting the number of +# entries 1 will produce a full collapsed tree by default. 0 is a special value +# representing an infinite number of entries and will result in a full expanded +# tree by default. +# Minimum value: 0, maximum value: 9999, default value: 100. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_INDEX_NUM_ENTRIES = 100 + +# If the GENERATE_DOCSET tag is set to YES, additional index files will be +# generated that can be used as input for Apple's Xcode 3 integrated development +# environment (see: https://developer.apple.com/tools/xcode/), introduced with +# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a +# Makefile in the HTML output directory. Running make will produce the docset in +# that directory and running make install will install the docset in +# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at +# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# for more information. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_DOCSET = NO + +# This tag determines the name of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# The default value is: Doxygen generated docs. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDNAME = "Doxygen generated docs" + +# This tag specifies a string that should uniquely identify the documentation +# set bundle. This should be a reverse domain-name style string, e.g. +# com.mycompany.MyDocSet. Doxygen will append .docset to the name. +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_BUNDLE_ID = org.doxygen.Project + +# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify +# the documentation publisher. This should be a reverse domain-name style +# string, e.g. com.mycompany.MyDocSet.documentation. +# The default value is: org.doxygen.Publisher. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_PUBLISHER_ID = org.doxygen.Publisher + +# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher. +# The default value is: Publisher. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_PUBLISHER_NAME = Publisher + +# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three +# additional HTML index files: index.hhp, index.hhc, and index.hhk. The +# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop +# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on +# Windows. +# +# The HTML Help Workshop contains a compiler that can convert all HTML output +# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML +# files are now used as the Windows 98 help format, and will replace the old +# Windows help format (.hlp) on all Windows platforms in the future. Compressed +# HTML files also contain an index, a table of contents, and you can search for +# words in the documentation. The HTML workshop also contains a viewer for +# compressed HTML files. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_HTMLHELP = NO + +# The CHM_FILE tag can be used to specify the file name of the resulting .chm +# file. You can add a path in front of the file if the result should not be +# written to the html output directory. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +CHM_FILE = + +# The HHC_LOCATION tag can be used to specify the location (absolute path +# including file name) of the HTML help compiler (hhc.exe). If non-empty, +# doxygen will try to run the HTML help compiler on the generated index.hhp. +# The file has to be specified with full path. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +HHC_LOCATION = + +# The GENERATE_CHI flag controls if a separate .chi index file is generated +# (YES) or that it should be included in the master .chm file (NO). +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +GENERATE_CHI = NO + +# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc) +# and project file content. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +CHM_INDEX_ENCODING = + +# The BINARY_TOC flag controls whether a binary table of contents is generated +# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it +# enables the Previous and Next buttons. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +BINARY_TOC = NO + +# The TOC_EXPAND flag can be set to YES to add extra items for group members to +# the table of contents of the HTML help documentation and to the tree view. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +TOC_EXPAND = NO + +# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and +# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that +# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help +# (.qch) of the generated HTML documentation. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_QHP = NO + +# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify +# the file name of the resulting .qch file. The path specified is relative to +# the HTML output folder. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QCH_FILE = + +# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help +# Project output. For more information please see Qt Help Project / Namespace +# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace). +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_NAMESPACE = org.doxygen.Project + +# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt +# Help Project output. For more information please see Qt Help Project / Virtual +# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders). +# The default value is: doc. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_VIRTUAL_FOLDER = doc + +# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom +# filter to add. For more information please see Qt Help Project / Custom +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_CUST_FILTER_NAME = + +# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the +# custom filter to add. For more information please see Qt Help Project / Custom +# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_CUST_FILTER_ATTRS = + +# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this +# project's filter section matches. Qt Help Project / Filter Attributes (see: +# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes). +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_SECT_FILTER_ATTRS = + +# The QHG_LOCATION tag can be used to specify the location of Qt's +# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the +# generated .qhp file. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHG_LOCATION = + +# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be +# generated, together with the HTML files, they form an Eclipse help plugin. To +# install this plugin and make it available under the help contents menu in +# Eclipse, the contents of the directory containing the HTML and XML files needs +# to be copied into the plugins directory of eclipse. The name of the directory +# within the plugins directory should be the same as the ECLIPSE_DOC_ID value. +# After copying Eclipse needs to be restarted before the help appears. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_ECLIPSEHELP = NO + +# A unique identifier for the Eclipse help plugin. When installing the plugin +# the directory name containing the HTML and XML files should also have this +# name. Each documentation set should have its own identifier. +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES. + +ECLIPSE_DOC_ID = org.doxygen.Project + +# If you want full control over the layout of the generated HTML pages it might +# be necessary to disable the index and replace it with your own. The +# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top +# of each HTML page. A value of NO enables the index and the value YES disables +# it. Since the tabs in the index contain the same information as the navigation +# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +DISABLE_INDEX = NO + +# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index +# structure should be generated to display hierarchical information. If the tag +# value is set to YES, a side panel will be generated containing a tree-like +# index structure (just like the one that is generated for HTML Help). For this +# to work a browser that supports JavaScript, DHTML, CSS and frames is required +# (i.e. any modern browser). Windows users are probably better off using the +# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can +# further fine-tune the look of the index. As an example, the default style +# sheet generated by doxygen has an example that shows how to put an image at +# the root of the tree instead of the PROJECT_NAME. Since the tree basically has +# the same information as the tab index, you could consider setting +# DISABLE_INDEX to YES when enabling this option. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_TREEVIEW = NO + +# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that +# doxygen will group on one line in the generated HTML documentation. +# +# Note that a value of 0 will completely suppress the enum values from appearing +# in the overview section. +# Minimum value: 0, maximum value: 20, default value: 4. +# This tag requires that the tag GENERATE_HTML is set to YES. + +ENUM_VALUES_PER_LINE = 4 + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used +# to set the initial width (in pixels) of the frame in which the tree is shown. +# Minimum value: 0, maximum value: 1500, default value: 250. +# This tag requires that the tag GENERATE_HTML is set to YES. + +TREEVIEW_WIDTH = 250 + +# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to +# external symbols imported via tag files in a separate window. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +EXT_LINKS_IN_WINDOW = NO + +# Use this tag to change the font size of LaTeX formulas included as images in +# the HTML documentation. When you change the font size after a successful +# doxygen run you need to manually remove any form_*.png images from the HTML +# output directory to force them to be regenerated. +# Minimum value: 8, maximum value: 50, default value: 10. +# This tag requires that the tag GENERATE_HTML is set to YES. + +FORMULA_FONTSIZE = 10 + +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images +# generated for formulas are transparent PNGs. Transparent PNGs are not +# supported properly for IE 6.0, but are supported on all modern browsers. +# +# Note that when changing this option you need to delete any form_*.png files in +# the HTML output directory before the changes have effect. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +FORMULA_TRANSPARENT = YES + +# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see +# https://www.mathjax.org) which uses client side Javascript for the rendering +# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX +# installed or if you want to formulas look prettier in the HTML output. When +# enabled you may also need to install MathJax separately and configure the path +# to it using the MATHJAX_RELPATH option. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +USE_MATHJAX = NO + +# When MathJax is enabled you can set the default output format to be used for +# the MathJax output. See the MathJax site (see: +# http://docs.mathjax.org/en/latest/output.html) for more details. +# Possible values are: HTML-CSS (which is slower, but has the best +# compatibility), NativeMML (i.e. MathML) and SVG. +# The default value is: HTML-CSS. +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_FORMAT = HTML-CSS + +# When MathJax is enabled you need to specify the location relative to the HTML +# output directory using the MATHJAX_RELPATH option. The destination directory +# should contain the MathJax.js script. For instance, if the mathjax directory +# is located at the same level as the HTML output directory, then +# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax +# Content Delivery Network so you can quickly see the result without installing +# MathJax. However, it is strongly recommended to install a local copy of +# MathJax from https://www.mathjax.org before deployment. +# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/. +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_RELPATH = https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/ + +# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax +# extension names that should be enabled during MathJax rendering. For example +# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_EXTENSIONS = + +# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces +# of code that will be used on startup of the MathJax code. See the MathJax site +# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an +# example see the documentation. +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_CODEFILE = + +# When the SEARCHENGINE tag is enabled doxygen will generate a search box for +# the HTML output. The underlying search engine uses javascript and DHTML and +# should work on any modern browser. Note that when using HTML help +# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET) +# there is already a search function so this one should typically be disabled. +# For large projects the javascript based search engine can be slow, then +# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to +# search using the keyboard; to jump to the search box use + S +# (what the is depends on the OS and browser, but it is typically +# , />stream +H‰ÜW˲7 Ý÷WøÚ×’üÜr¬HŠº‹°¿•„ÅL(‚ßÏ9î¶{¦¤*• u™‘Æ’õ:’üðË£{xóÜ‹—nù¸—DûßÊÿþúmùÕý þÃOOÁýñiyx} îå‡åíòê 6qÙÄßâ FoÚœÖìcPwŒ(¾ª8k>Tq‚ϵ¹l¾es’‹Ïâž—{ú²$ñ-D'É|?FŸJub ¤NR²k?1.ƒQ̇`®4ŸbrV}°ìD6 êy¹§/‹¤ìK”y¼&Ÿ‚Ó|¸£eoÅ\ ^»é'ÆeÑ} ÅÕ涫B’]­>5D·IÔórOCÚ¡Tæq.¶® ºbñZû]R¥ïOÅ×im¶ÒóÑ`‹_|Tñ!µA>/'Æe±½4›N¸‚AýN‰ q?1.“DÅHqd¿¥žG‰D4­=Í‚ôBÁ‰C !Y„xõQ¡®% <ϘB¼yðnã£XtQX¹Ó¨DÐøyR¿£!žµËÍóaÀ¨'ðºoѨáĹLŽ!‘58tZfLònà† ƒ†Ú…°]¬¸ iw+|ð)ÄZ‘æ;â8Ü ¿)ë°P¡f]—ïÜÃÓûà>½w¯Þ¹·½Õ|½W=<âêÇ'ú?÷ôøó"Á}vѽqÓ®NúÏ[%¤ÖFàSåmü麬ÉÓ:·¢ª¢%g’ HT~‚„ÇkL¨-uéiàâçDª/(ÁUP1OrÕ<ÂhjA© u Ü'½‚>v™Á5Ï­p¤~# +¢¤ NJ=ËýÊÚ{Újì¤poU½è«€H4ÕvæÄæ-l6N^SÄ_,"Q‰+þ‚ž¢“†¢Ä+Bx1ëm.#H­ðRóªü‚ ÐR»*½P“–ܻتˆ»OçT^ºGq2 &h-êí!†$m  «ám ÅPd%¤Í&v«UL{gïfô§ý&ÑþÁ€bËî}œQVEÛT˜™Éˆ­§ž BÝ…Ø"³¡>dªcŸRúWÑ7´ ±¬7¡{'u¤/P¦47öщ:ä|é¡€v#¥'°„©ë4‰áøŠ&a éà”Š†KpbR º²¾-¤a<îò¼ž—÷ËÓiÐc(JèxH&‘Á¡’Ô)*9"ñ¯_@R1;rÅ åìSÖÿ€dàõ¹1y©eWˆÉýsÿ`–ÑÈ82ÆI¬òƒýðN¬ýWÆz—ÞôNõ;Ixl×ïŒ0%· üïÑGáìg÷C9¶eû¦{ð¡ L¾æ‘ræ²N1ƒÑ8:kfëÇg$®ÌË\œ¿SS‘)½“ÝýûªÛV7$דêõнß=8aʉúq¼Ù²Ó·ð°¢q ²í^ Ò¢EîuÐe4 s–ƒÜ¸_rï4V²çrpÐñ°à‘3´ìœy G–×a‡qföiyæ\ºe\ò´qR7i ?ë·ÝûËð*À¬›·^¿fÙ—Ö©ƒ“70ÌpZTʘ/UAc +¡å)žVúš|âpÃR¬±Ëú¤pSãÔÁÍ‹‘9t Φ£ß å/îÕ“¿7[–²uâtÎ)oe |_VÇáB)P‡ïM³½Û”ÜmSÿ­WsÕÌÜ~¸Ë` }2õ2ù ™t½‡ŒÞ@F÷²/nHž¡2è™:9aÊþc§þÞݺéH|Á¼æÓ%}ÅÃ%ƒOØ“±<5>•°g`pwêË)@2‹þÌÁã²baBp +q’;K®¢‚ݤW*ÅD:°~ T`íç£JOèh\‰¢ãZSêÖB n7ìÒßQ}K'{I葤LM±÷Ž +íÀº»z +íDµo]îÌ¡/ôA/¹fÄ'Ñž…ïCt" õÓ¥øúJAke9s Ï¥Ü±£iB¿Ø²øP½OÓá`&µ^RÍÚ „óØ3Ñ…φØÐB$#µIDh]+Õ Ùž ×ÿôÂ’Az¾Wt|ôß»[è%Ud°Î¾‚ƒ±TòM™K,€Ä ” k:b|»ä¸9Ôúón@T"eeB˜oŒÜnaæP^¡œ£U€QhéÞJ¨9› uÜs #£™ÐŽÙ¡„ÏWb`ïjŒ0›^(ž¿´ÝÓgròO¾#Y½„Yl·ˆ?sh^JÜö.Á@+ÇòÞEÎI:c~ýЯ7¨Ç¤ÏV¬p‰‰\jJàOÔÛDýíKÍŽ—ZpI´ÿ­üo‡~7ÆhÌÃ뫸—ÆSïíò·…‰R endstream endobj 77 0 obj <> endobj 90 0 obj <>stream +8;ZD.gPs,o%!4_eHG&pt:\mXE#6aOKEBq.IT0"9n@!b"'E$!X((QH?s"5?G?K#P20 +O/d)\T,/P1'qS?i"`crJ?H8d*KjRXIZ+u6FTjS-):gaeT(>+?(!Z6FT)AEal%;;Q@ +kb3O4qsuY.N]*EB(@]Z27":::JI9hMb@0>:^nab-+NNs/JHE@q?G;3L!m9!^.::8g +iM>Jef*'=g%mLeUpPAmn5I8u&(:V"^JE7%&U-SUuQX1AZ47 +)b\i'orh[PJOC%+(N\UM53;RTZn-;X. +d$#BDrYE[.o3UD]5(MDElGJ=9>,`#5E]% +cN&-!^1@~> endstream endobj 92 0 obj [/Indexed/DeviceRGB 255 93 0 R] endobj 93 0 obj <>stream +8;X]O>EqN@%''O_@%e@?J;%+8(9e>X=MR6S?i^YgA3=].HDXF.R$lIL@"pJ+EP(%0 +b]6ajmNZn*!='OQZeQ^Y*,=]?C.B+\Ulg9dhD*"iC[;*=3`oP1[!S^)?1)IZ4dup` +E1r!/,*0[*9.aFIR2&b-C#soRZ7Dl%MLY\.?d>Mn +6%Q2oYfNRF$$+ON<+]RUJmC0InDZ4OTs0S!saG>GGKUlQ*Q?45:CI&4J'_2j$XKrcYp0n+Xl_nU*O( +l[$6Nn+Z_Nq0]s7hs]`XX1nZ8&94a\~> endstream endobj 88 0 obj <>/ExtGState<>>>/Subtype/Form>>stream +/CS0 cs 0 0 0 scn +/GS0 gs +507.579 6.422 -494.579 114.578 re +f + endstream endobj 89 0 obj <>/ExtGState<>>>/Subtype/Form>>stream +/CS0 cs 1 1 1 scn +/GS0 gs +q 1 0 0 1 536.5762 405.4023 cm +0 0 m +0 -88.638 -130.614 -160.492 -291.735 -160.492 c +-452.856 -160.492 -583.471 -88.638 -583.471 0 c +-583.471 88.637 -452.856 160.492 -291.735 160.492 c +-130.614 160.492 0 88.637 0 0 c +f +Q + endstream endobj 95 0 obj <> endobj 81 0 obj <> endobj 79 0 obj [/ICCBased 96 0 R] endobj 96 0 obj <>stream +H‰œ–yTSwÇoÉž•°Ãc [€°5la‘QIBHØADED„ª•2ÖmtFOE.®c­Ö}êÒõ0êè8´׎8GNg¦Óïï÷9÷wïïÝß½÷ó '¥ªµÕ0 Ö ÏJŒÅb¤  + 2y­.-;!à’ÆK°ZÜ ü‹ž^i½"LÊÀ0ðÿ‰-×é @8(”µrœ;q®ª7èLöœy¥•&†Qëñq¶4±jž½ç|æ9ÚÄ +V³)gB£0ñiœWו8#©8wÕ©•õ8_Å٥ʨQãüÜ«QÊj@é&»A)/ÇÙgº>'K‚óÈtÕ;\ú” Ó¥$ÕºF½ZUnÀÜå˜(4TŒ%)ë«”ƒ0C&¯”阤Z£“i˜¿óœ8¦Úbx‘ƒE¡ÁÁBÑ;…ú¯›¿P¦ÞÎӓ̹žAü om?çW= +€x¯Íú·¶Ò-Œ¯Àòæ[›Ëû0ñ¾¾øÎ}ø¦y)7ta¾¾õõõ>j¥ÜÇTÐ7úŸ¿@ï¼ÏÇtÜ›ò`qÊ2™±Ê€™ê&¯®ª6ê±ZL®Ä„?â_øóyxg)Ë”z¥ÈçL­UáíÖ*ÔuµSkÿSeØO4?׸¸c¯¯Ø°.òò· åÒR´ ßÞô-•’2ð5ßáÞüÜÏ ú÷Sá>Ó£V­š‹“då`r£¾n~ÏôY &à+`œ;ÂA4ˆÉ 䀰ÈA9Ð=¨- t°lÃ`;»Á~pŒƒÁ ðGp| ®[`Lƒ‡`<¯ "A ˆ YA+äùCb(Š‡R¡,¨*T2B-Ð +¨ꇆ¡Ðnè÷ÐQètº}MA ï —0Óal»Á¾°ŽSàx ¬‚kà&¸^Á£ð>ø0|>_ƒ'á‡ð,ÂG!"F$H:Rˆ”!z¤éF‘Qd?r 9‹\A&‘GÈ ”ˆrQ ¢áhš‹ÊÑ´íE‡Ñ]èaô4zBgÐ×Á–àE#H ‹*B=¡‹0HØIøˆp†p0MxJ$ùD1„˜D, V›‰½Ä­ÄÄãÄKÄ»ÄY‰dEò"EÒI2’ÔEÚBÚGúŒt™4MzN¦‘Èþär!YKî ’÷?%_&ß#¿¢°(®”0J:EAi¤ôQÆ(Ç()Ó”WT6U@ æP+¨íÔ!ê~êêmêæD ¥eÒÔ´å´!ÚïhŸÓ¦h/èº']B/¢éëèÒÓ¿¢?a0nŒhF!ÃÀXÇØÍ8ÅøšñÜŒkæc&5S˜µ™˜6»lö˜Iaº2c˜K™MÌAæ!æEæ#…åÆ’°d¬VÖë(ëk–Íe‹Øél »—½‡}Ž}ŸCâ¸qâ9 +N'çÎ)Î].ÂuæJ¸rî +î÷ wšGä xR^¯‡÷[ÞoÆœchžgÞ`>bþ‰ù$á»ñ¥ü*~ÿ ÿ:ÿ¥…EŒ…ÒbÅ~‹ËÏ,m,£-•–Ý–,¯Y¾´Â¬â­*­6X[ݱF­=­3­ë­·YŸ±~dó ·‘ÛtÛ´¹i ÛzÚfÙ6Û~`{ÁvÖÎÞ.ÑNg·Åî”Ý#{¾}´}…ý€ý§ö¸‘j‡‡ÏþŠ™c1X6„Æfm“Ž;'_9 œr:œ8Ýq¦:‹ËœœO:ϸ8¸¤¹´¸ìu¹éJq»–»nv=ëúÌMà–ï¶ÊmÜí¾ÀR 4 ö +n»3Ü£ÜkÜGݯz=Ä•[=¾ô„=ƒ<Ë=GTB(É/ÙSòƒ,]6*›-•–¾W:#—È7Ë*¢ŠÊe¿ò^YDYÙ}U„j£êAyTù`ù#µD=¬þ¶"©b{ųÊôÊ+¬Ê¯: !kJ4Gµm¥ötµ}uCõ%—®K7YV³©fFŸ¢ßY Õ.©=bàá?SŒîÆ•Æ©ºÈº‘ºçõyõ‡Ø Ú† žkï5%4ý¦m–7Ÿlqlio™Z³lG+ÔZÚz²Í¹­³mzyâò]íÔöÊö?uøuôw|¿"űN»ÎåwW&®ÜÛe֥ﺱ*|ÕöÕèjõê‰5k¶¬yÝ­èþ¢Ç¯g°ç‡^yïkEk‡Öþ¸®lÝD_p߶õÄõÚõ×7DmØÕÏîoê¿»1mãál {àûMśΠnßLÝlÜ<9”úO¤[þ˜¸™$™™üšhšÕ›B›¯œœ‰œ÷dÒž@ž®ŸŸ‹Ÿú i Ø¡G¡¶¢&¢–££v£æ¤V¤Ç¥8¥©¦¦‹¦ý§n§à¨R¨Ä©7©©ªª««u«é¬\¬Ð­D­¸®-®¡¯¯‹°°u°ê±`±Ö²K²Â³8³®´%´œµµŠ¶¶y¶ð·h·à¸Y¸Ñ¹J¹Âº;ºµ».»§¼!¼›½½¾ +¾„¾ÿ¿z¿õÀpÀìÁgÁãÂ_ÂÛÃXÃÔÄQÄÎÅKÅÈÆFÆÃÇAÇ¿È=ȼÉ:ɹÊ8Ê·Ë6˶Ì5̵Í5͵Î6ζÏ7ϸÐ9кÑ<ѾÒ?ÒÁÓDÓÆÔIÔËÕNÕÑÖUÖØ×\×àØdØèÙlÙñÚvÚûÛ€ÜÜŠÝÝ–ÞÞ¢ß)߯à6à½áDáÌâSâÛãcãëäsäüå„æ æ–çç©è2è¼éFéÐê[êåëpëûì†ííœî(î´ï@ïÌðXðåñrñÿòŒóó§ô4ôÂõPõÞömöû÷Šøø¨ù8ùÇúWúçûwüü˜ý)ýºþKþÜÿmÿÿ ÷„óû endstream endobj 94 0 obj <> endobj 84 0 obj <> endobj 85 0 obj <> endobj 86 0 obj <> endobj 87 0 obj <> endobj 98 0 obj <>stream + endstream endobj 97 0 obj <> endobj 99 0 obj <> endobj 100 0 obj <> endobj 71 0 obj <> endobj 72 0 obj <> endobj 73 0 obj <> endobj 74 0 obj <> endobj 107 0 obj [/View/Design] endobj 108 0 obj <>>> endobj 105 0 obj [/View/Design] endobj 106 0 obj <>>> endobj 103 0 obj [/View/Design] endobj 104 0 obj <>>> endobj 101 0 obj [/View/Design] endobj 102 0 obj <>>> endobj 80 0 obj <> endobj 82 0 obj <> endobj 83 0 obj <> endobj 110 0 obj <> endobj 111 0 obj [0.0] endobj 112 0 obj <>/XObject<>>>/Subtype/Form>>stream +0 g +/GS0 gs +-46.895 565.894 583.471 -320.984 re +f +q +0 Tc 0 Tw 0 Ts 100 Tz 0 Tr /Fm0 Do +Q + endstream endobj 113 0 obj <> endobj 114 0 obj <>/ExtGState<>/Shading<>>>/Subtype/Form>>stream +q +419.6 365.446 m +414.319 365.446 409.165 364.915 404.179 363.916 c +374.027 434.636 303.875 484.212 222.14 484.212 c +112.892 484.212 24.329 395.649 24.329 286.402 c +24.329 241.821 39.081 200.689 63.963 167.609 c +51.904 153.863 44.578 135.862 44.578 116.139 c +44.578 73.004 79.545 38.036 122.68 38.036 c +156.741 38.036 185.693 59.849 196.373 90.261 c +204.807 89.163 213.406 88.591 222.14 88.591 c +230.657 88.591 239.049 89.13 247.283 90.175 c +257.895 59.637 286.907 37.708 321.059 37.708 c +364.193 37.708 399.16 72.675 399.16 115.81 c +399.16 135.448 391.896 153.38 379.928 167.104 c +390 180.404 398.426 195.017 404.91 210.641 c +409.67 209.734 414.576 209.241 419.6 209.241 c +462.734 209.241 497.701 244.209 497.701 287.343 c +497.701 330.478 462.734 365.446 419.6 365.446 c +W n +q +0 g +/GS0 gs +-0.0000153 446.5039062 446.5039062 0.0000153 261.0146484 37.7080078 cm +BX /Sh0 sh EX Q +Q +/CS1 CS 0 0 0 SCN +10 w 4 M 0 j 0 J []0 d +/GS0 gs +q 1 0 0 1 419.5996 365.4458 cm +0 0 m +-5.28 0 -10.435 -0.531 -15.421 -1.53 c +-45.572 69.19 -115.725 118.767 -197.46 118.767 c +-306.708 118.767 -395.271 30.204 -395.271 -79.044 c +-395.271 -123.625 -380.519 -164.756 -355.636 -197.836 c +-367.696 -211.583 -375.022 -229.583 -375.022 -249.307 c +-375.022 -292.442 -340.055 -327.41 -296.92 -327.41 c +-262.858 -327.41 -233.907 -305.597 -223.227 -275.185 c +-214.792 -276.283 -206.193 -276.855 -197.46 -276.855 c +-188.942 -276.855 -180.55 -276.316 -172.316 -275.271 c +-161.705 -305.809 -132.692 -327.738 -98.541 -327.738 c +-55.406 -327.738 -20.439 -292.771 -20.439 -249.636 c +-20.439 -229.998 -27.704 -212.066 -39.672 -198.342 c +-29.6 -185.042 -21.174 -170.429 -14.689 -154.805 c +-9.93 -155.711 -5.023 -156.205 0 -156.205 c +43.135 -156.205 78.102 -121.237 78.102 -78.103 c +78.102 -34.968 43.135 0 0 0 c +h +S +Q + endstream endobj 115 0 obj <> endobj 116 0 obj <> endobj 118 0 obj <> endobj 119 0 obj <> endobj 120 0 obj <> endobj 121 0 obj <> endobj 117 0 obj [/ICCBased 96 0 R] endobj 109 0 obj <> endobj 122 0 obj [0.0] endobj 123 0 obj <>/XObject<>>>/Subtype/Form>>stream +0 g +/GS0 gs +13 121 494.579 -114.578 re +f +q +0 Tc 0 Tw 0 Ts 100 Tz 0 Tr /Fm0 Do +Q + endstream endobj 124 0 obj <> endobj 125 0 obj <>/XObject<>>>/Subtype/Form>>stream +q +/GS0 gs +0 Tc 0 Tw 0 Ts 100 Tz 0 Tr /Fm0 Do +Q + endstream endobj 126 0 obj <> endobj 128 0 obj <>/ExtGState<>/Shading<>>>/Subtype/Form>>stream +q +7.977 8.752 m +113.295 8.752 l +408.581 8.752 l +507.01 8.752 l +507.01 37.756 l +507.01 77.308 l +408.581 77.308 l +113.295 77.308 l +7.977 77.308 l +7.977 37.756 l +h +W n +q +0 g +/GS0 gs +1 0 0 -1 0 0 cm +BX /Sh0 sh EX Q +Q + endstream endobj 129 0 obj <> endobj 130 0 obj <>stream +þý €‰þý 1}þý Òpþý ÒpüÔ“4 Òpû—)I ÒpúY¿] 1}úY¿]€‰úY¿]úY¿]û—)IüÔ“4€‰üÔ“4 1}üÔ“4 1}û—)I€‰û—)I úY¿]€‰úY¿] 1}úY¿] ÒpúY¿] ÒpùUr Òp÷Þë‡ Òpö¡› 1}ö¡›€‰ö¡›ö¡›÷Þë‡ùUr€‰ùUr 1}ùUr 1}÷Þ뇀‰÷Þë‡  Òpþý bùþý ‚ó‚þý „ þý „ üÔ“4„ û—)I„ úY¿]‚ó‚úY¿]bùúY¿] ÒpúY¿] Òpû—)I ÒpüÔ“4bùüÔ“4‚ó‚üÔ“4‚ó‚û—)Ibùû—)I ÒpúY¿]bùúY¿]‚ó‚úY¿]„ úY¿]„ ùUr„ ÷Þ뇄 ö¡›‚ó‚ö¡›bùö¡› Òpö¡› Òp÷Þë‡ ÒpùUrbùùUr‚ó‚ùUr‚ó‚÷Þë‡bù÷Þë‡ ;;;ö¡›€‰ö¡› 1}ö¡› Òpö¡› Òpõd° Òpô&­Ä ÒpòéCÙ 1}òéCÙ€‰òéCÙòéCÙô&­Äõd°€‰õd° 1}õd° 1}ô&­Ä€‰ô&­Ä---òéCÙ€‰òéCÙ 1}òéCÙ ÒpòéCÙ Òpñ«Ùí Òpðnp Òpï1 1}ï1€‰ï1ï1ðnpñ«Ù퀉ñ«Ùí 1}ñ«Ùí 1}ðnp€‰ðnp---333 Òpö¡›bùö¡›‚ó‚ö¡›„ ö¡›„ õd°„ ô&­Ä„ òéCÙ‚ó‚òéCÙbùòéCÙ ÒpòéCÙ Òpô&­Ä Òpõd°bùõd°‚ó‚õd°‚ó‚ô&­Äbùô&­Ä;;;PPP--- ÒpòéCÙbùòéCÙ‚ó‚òéCÙ„ òéCÙ„ ñ«Ùí„ ðnp„ ï1‚ó‚ï1bùï1 Òpï1 Òpðnp Òpñ«Ùíbùñ«Ùí‚ó‚ñ«Ùí‚ó‚ðnpbùðnp---PPPXXX333„ þý „”þý $µˆþý (…V{þý (…V{üÔ“4(…V{û—)I(…V{úY¿]$µˆúY¿]„”úY¿]„ úY¿]„ û—)I„ üÔ“4„”üÔ“4$µˆüÔ“4$µˆû—)I„”û—)I---„ úY¿]„”úY¿]$µˆúY¿](…V{úY¿](…V{ùUr(…V{÷Þë‡(…V{ö¡›$µˆö¡›„”ö¡›„ ö¡›„ ÷Þ뇄 ùUr„”ùUr$µˆùUr$µˆ÷Þ뇄”÷Þë‡---PPP;;;(…V{þý -çþý 1†wþý 6þý 6üÔ“46û—)I6úY¿]1†wúY¿]-çúY¿](…V{úY¿](…V{û—)I(…V{üÔ“4-çüÔ“41†wüÔ“41†wû—)I-çû—)I333---(…V{úY¿]-çúY¿]1†wúY¿]6úY¿]6ùUr6÷Þë‡6ö¡›1†wö¡›-çö¡›(…V{ö¡›(…V{÷Þë‡(…V{ùUr-çùUr1†wùUr1†w÷Þë‡-ç÷Þë‡---333XXXPPP„ ö¡›„”ö¡›$µˆö¡›(…V{ö¡›(…V{õd°(…V{ô&­Ä(…V{òéCÙ$µˆòéCÙ„”òéCÙ„ òéCÙ„ ô&­Ä„ õd°„”õd°$µˆõd°$µˆô&­Ä„”ô&­Ä;;;PPPfffPPP„ òéCÙ„”òéCÙ$µˆòéCÙ(…V{òéCÙ(…V{ñ«Ùí(…V{ðnp(…V{ï1$µˆï1„”ï1„ ï1„ ðnp„ ñ«Ùí„”ñ«Ùí$µˆñ«Ùí$µˆðnp„”ðnpPPPfffnnnXXX(…V{ö¡›-çö¡›1†wö¡›6ö¡›6õd°6ô&­Ä6òéCÙ1†wòéCÙ-çòéCÙ(…V{òéCÙ(…V{ô&­Ä(…V{õd°-çõd°1†wõd°1†wô&­Ä-çô&­ÄPPPXXXnnnfff(…V{òéCÙ-çòéCÙ1†wòéCÙ6òéCÙ6ñ«Ùí6ðnp6ï11†wï1-çï1(…V{ï1(…V{ðnp(…V{ñ«Ùí-çñ«Ùí1†wñ«Ùí1†wðnp-çðnpfffnnnuuunnn6þý h…Fþý ›„ þý ÍÂþý ÍÂüÔ“4ÍÂû—)IÍÂúY¿]›„ úY¿]h…FúY¿]6úY¿]6û—)I6üÔ“4h…FüÔ“4›„ üÔ“4›„ û—)Ih…Fû—)I3333336úY¿]h…FúY¿]›„ úY¿]ÍÂúY¿]ÍÂùUrÍÂ÷Þë‡ÍÂö¡››„ ö¡›h…Fö¡›6ö¡›6÷Þë‡6ùUrh…FùUr›„ ùUr›„ ÷Þë‡h…F÷Þë‡333333XXXXXX6ö¡›h…Fö¡››„ ö¡›ÍÂö¡›ÍÂõd°ÍÂô&­ÄÍÂòéCÙ›„ òéCÙh…FòéCÙ6òéCÙ6ô&­Ä6õd°h…Fõd°›„ õd°›„ ô&­Äh…Fô&­ÄXXXXXXnnnnnn6òéCÙh…FòéCÙ›„ òéCÙÍÂòéCÙÍÂñ«ÙíÍÂðnpÍÂï1›„ ï1h…Fï16ï16ðnp6ñ«Ùíh…Fñ«Ù후 ñ«Ù후 ðnph…FðnpnnnnnnuuuuuuÍÂþý Ѷé¤þý ÕìDþý Ú!8äþý Ú!8äüÔ“4Ú!8äû—)IÚ!8äúY¿]ÕìDúY¿]Ѷé¤úY¿]ÍÂúY¿]ÍÂû—)IÍÂüÔ“4Ѷé¤üÔ“4ÕìDüÔ“4ÕìDû—)IѶé¤û—)I---333ÍÂúY¿]Ѷé¤úY¿]ÕìDúY¿]Ú!8äúY¿]Ú!8äùUrÚ!8ä÷Þë‡Ú!8äö¡›ÕìDö¡›Ñ¶é¤ö¡›ÍÂö¡›ÍÂ÷Þë‡ÍÂùUrѶé¤ùUrÕìDùUrÕìD÷Þë‡Ñ¶é¤÷Þë‡333---PPPXXXÚ!8äþý ÞVXþý ⋨øþý æÀИþý æÀИüÔ“4æÀИû—)IæÀИúY¿]⋨øúY¿]ÞVXúY¿]Ú!8äúY¿]Ú!8äû—)IÚ!8äüÔ“4ÞVXüÔ“4⋨øüÔ“4⋨øû—)IÞVXû—)I---Ú!8äúY¿]ÞVXúY¿]⋨øúY¿]æÀИúY¿]æÀИùUræÀИ÷Þë‡æÀИö¡›â‹¨øö¡›ÞVXö¡›Ú!8äö¡›Ú!8ä÷Þë‡Ú!8äùUrÞVXùUr⋨øùUr⋨ø÷Þë‡ÞVX÷Þë‡---;;;PPPÍÂö¡›Ñ¶é¤ö¡›ÕìDö¡›Ú!8äö¡›Ú!8äõd°Ú!8äô&­ÄÚ!8äòéCÙÕìDòéCÙѶé¤òéCÙÍÂòéCÙÍÂô&­ÄÍÂõd°Ñ¶é¤õd°ÕìDõd°ÕìDô&­ÄѶé¤ô&­ÄXXXPPPfffnnnÍÂòéCÙѶé¤òéCÙÕìDòéCÙÚ!8äòéCÙÚ!8äñ«ÙíÚ!8äðnpÚ!8äï1ÕìDï1Ѷé¤ï1ÍÂï1ÍÂðnpÍÂñ«ÙíѶé¤ñ«ÙíÕìDñ«ÙíÕìDðnpѶé¤ðnpnnnfffnnnuuuÚ!8äö¡›ÞVXö¡›â‹¨øö¡›æÀИö¡›æÀИõd°æÀИô&­ÄæÀИòéCÙ⋨øòéCÙÞVXòéCÙÚ!8äòéCÙÚ!8äô&­ÄÚ!8äõd°ÞVXõd°â‹¨øõd°â‹¨øô&­ÄÞVXô&­ÄPPP;;;PPPfffÚ!8äòéCÙÞVXòéCÙ⋨øòéCÙæÀИòéCÙæÀИñ«ÙíæÀИðnpæÀИï1⋨øï1ÞVXï1Ú!8äï1Ú!8äðnpÚ!8äñ«ÙíÞVXñ«Ùí⋨øñ«Ùí⋨øðnpÞVXðnpfffPPPXXXnnnæÀИþý êõø7þý ï+×þý ó`hKþý ó`hKüÔ“4ó`hKû—)Ió`hKúY¿]ï+×úY¿]êõø7úY¿]æÀИúY¿]æÀИû—)IæÀИüÔ“4êõø7üÔ“4ï+×üÔ“4ï+×û—)Iêõø7û—)I æÀИúY¿]êõø7úY¿]ï+×úY¿]ó`hKúY¿]ó`hKùUró`hK÷Þë‡ó`hKö¡›ï+×ö¡›êõø7ö¡›æÀИö¡›æÀИ÷Þë‡æÀИùUrêõø7ùUrï+×ùUrï+×÷Þë‡êõø7÷Þë‡ ;;;ó`hKþý ÷•ëþý ûÊ·‹þý ÿÿÿÿþý ÿÿÿÿüÔ“4ÿÿÿÿû—)IÿÿÿÿúY¿]ûÊ·‹úY¿]÷•ëúY¿]ó`hKúY¿]ó`hKû—)Ió`hKüÔ“4÷•ëüÔ“4ûÊ·‹üÔ“4ûÊ·‹û—)I÷•ëû—)I ó`hKúY¿]÷•ëúY¿]ûÊ·‹úY¿]ÿÿÿÿúY¿]ÿÿÿÿùUrÿÿÿÿ÷Þë‡ÿÿÿÿö¡›ûÊ·‹ö¡›÷•ëö¡›ó`hKö¡›ó`hK÷Þë‡ó`hKùUr÷•ëùUrûÊ·‹ùUrûÊ·‹÷Þë‡÷•ë÷Þë‡ æÀИö¡›êõø7ö¡›ï+×ö¡›ó`hKö¡›ó`hKõd°ó`hKô&­Äó`hKòéCÙï+×òéCÙêõø7òéCÙæÀИòéCÙæÀИô&­ÄæÀИõd°êõø7õd°ï+×õd°ï+×ô&­Äêõø7ô&­Ä;;;---PPPæÀИòéCÙêõø7òéCÙï+×òéCÙó`hKòéCÙó`hKñ«Ùíó`hKðnpó`hKï1ï+×ï1êõø7ï1æÀИï1æÀИðnpæÀИñ«Ùíêõø7ñ«Ùíï+×ñ«Ùíï+×ðnpêõø7ðnpPPP---333XXXó`hKö¡›÷•ëö¡›ûÊ·‹ö¡›ÿÿÿÿö¡›ÿÿÿÿõd°ÿÿÿÿô&­ÄÿÿÿÿòéCÙûÊ·‹òéCÙ÷•ëòéCÙó`hKòéCÙó`hKô&­Äó`hKõd°÷•ëõd°ûÊ·‹õd°ûÊ·‹ô&­Ä÷•ëô&­Ä---ó`hKòéCÙ÷•ëòéCÙûÊ·‹òéCÙÿÿÿÿòéCÙÿÿÿÿñ«Ùíÿÿÿÿðnpÿÿÿÿï1ûÊ·‹ï1÷•ëï1ó`hKï1ó`hKðnpó`hKñ«Ùí÷•ëñ«ÙíûÊ·‹ñ«ÙíûÊ·‹ðnp÷•ëðnp---333ï1€‰ï1 1}ï1 Òpï1 Òpí€/Õ ÒpëÏY” ÒpêƒS 1}êƒS€‰êƒSêƒSëÏY”í€/Õ€‰í€/Õ 1}í€/Õ 1}ëÏY”€‰ëÏY”333---êƒS€‰êƒS 1}êƒS ÒpêƒS Òpèm­ Òpæ¼ÖÑ Òpå 1}å €‰å å æ¼ÖÑèm­€‰èm­ 1}èm­ 1}æ¼ÖÑ€‰æ¼ÖÑ--- Òpï1bùï1‚ó‚ï1„ ï1„ í€/Õ„ ëÏY”„ êƒS‚ó‚êƒSbùêƒS ÒpêƒS ÒpëÏY” Òpí€/Õbùí€/Õ‚ó‚í€/Õ‚ó‚ëÏY”bùëÏY”333XXXPPP--- ÒpêƒSbùêƒS‚ó‚êƒS„ êƒS„ èm­„ æ¼ÖÑ„ å ‚ó‚å bùå Òpå Òpæ¼ÖÑ Òpèm­bùèm­‚ó‚èm­‚ó‚æ¼ÖÑbùæ¼ÖÑ---PPP;;;å €‰å 1}å Òpå Òpã[*O ÒpáªT Òpßù}Í 1}ßù}Í€‰ßù}Íßù}ÍáªTã[*O€‰ã[*O 1}ã[*O 1}áªT€‰áªT ßù}Í€‰ßù}Í 1}ßù}Í Òpßù}Í ÒpÞH§‹ ÒpÜ—°u ÒpÚæÚ4 1}ÚæÚ4€‰ÚæÚ4ÚæÚ4Ü—°uÞH§‹€‰ÞH§‹ 1}ÞH§‹ 1}Ü—°u€‰Ü—°u Òpå bùå ‚ó‚å „ å „ ã[*O„ áªT„ ßù}Í‚ó‚ßù}Íbùßù}Í Òpßù}Í ÒpáªT Òpã[*Obùã[*O‚ó‚ã[*O‚ó‚áªTbùáªT;;; Òpßù}Íbùßù}Í‚ó‚ßù}Í„ ßù}Í„ ÞH§‹„ Ü—°u„ ÚæÚ4‚ó‚ÚæÚ4bùÚæÚ4 ÒpÚæÚ4 ÒpÜ—°u ÒpÞH§‹bùÞH§‹‚ó‚ÞH§‹‚ó‚Ü—°ubùÜ—°u „ ï1„”ï1$µˆï1(…V{ï1(…V{í€/Õ(…V{ëÏY”(…V{êƒS$µˆêƒS„”êƒS„ êƒS„ ëÏY”„ í€/Õ„”í€/Õ$µˆí€/Õ$µˆëÏY”„”ëÏY”XXXnnnfffPPP„ êƒS„”êƒS$µˆêƒS(…V{êƒS(…V{èm­(…V{æ¼ÖÑ(…V{å $µˆå „”å „ å „ æ¼ÖÑ„ èm­„”èm­$µˆèm­$µˆæ¼ÖÑ„”æ¼ÖÑPPPfffPPP;;;(…V{ï1-çï11†wï16ï16í€/Õ6ëÏY”6êƒS1†wêƒS-çêƒS(…V{êƒS(…V{ëÏY”(…V{í€/Õ-çí€/Õ1†wí€/Õ1†wëÏY”-çëÏY”nnnuuunnnfff(…V{êƒS-çêƒS1†wêƒS6êƒS6èm­6æ¼ÖÑ6å 1†wå -çå (…V{å (…V{æ¼ÖÑ(…V{èm­-çèm­1†wèm­1†wæ¼ÖÑ-çæ¼ÖÑfffnnnXXXPPP„ å „”å $µˆå (…V{å (…V{ã[*O(…V{áªT(…V{ßù}Í$µˆßù}Í„”ßù}Í„ ßù}Í„ áªT„ ã[*O„”ã[*O$µˆã[*O$µˆáªT„”áªT;;;PPP---„ ßù}Í„”ßù}Í$µˆßù}Í(…V{ßù}Í(…V{ÞH§‹(…V{Ü—°u(…V{ÚæÚ4$µˆÚæÚ4„”ÚæÚ4„ ÚæÚ4„ Ü—°u„ ÞH§‹„”ÞH§‹$µˆÞH§‹$µˆÜ—°u„”Ü—°u---(…V{å -çå 1†wå 6å 6ã[*O6áªT6ßù}Í1†wßù}Í-çßù}Í(…V{ßù}Í(…V{áªT(…V{ã[*O-çã[*O1†wã[*O1†wáªT-çáªTPPPXXX333---(…V{ßù}Í-çßù}Í1†wßù}Í6ßù}Í6ÞH§‹6Ü—°u6ÚæÚ41†wÚæÚ4-çÚæÚ4(…V{ÚæÚ4(…V{Ü—°u(…V{ÞH§‹-çÞH§‹1†wÞH§‹1†wÜ—°u-çÜ—°u---3336ï1h…Fï1›„ ï1ÍÂï1ÍÂí€/ÕÍÂëÏY”ÍÂêƒS›„ êƒSh…FêƒS6êƒS6ëÏY”6í€/Õh…Fí€/Õ›„ í€/Õ›„ ëÏY”h…FëÏY”uuuuuunnnnnn6êƒSh…FêƒS›„ êƒSÍÂêƒSÍÂèm­ÍÂæ¼ÖÑÍÂå ›„ å h…Få 6å 6æ¼ÖÑ6èm­h…Fèm­›„ èm­›„ æ¼ÖÑh…Fæ¼ÖÑnnnnnnXXXXXX6å h…Få ›„ å ÍÂå ÍÂã[*OÍÂáªTÍÂßù}Í›„ ßù}Íh…Fßù}Í6ßù}Í6áªT6ã[*Oh…Fã[*O›„ ã[*O›„ áªTh…FáªTXXXXXX3333336ßù}Íh…Fßù}Í›„ ßù}ÍÍÂßù}ÍÍÂÞH§‹ÍÂÜ—°uÍÂÚæÚ4›„ ÚæÚ4h…FÚæÚ46ÚæÚ46Ü—°u6ÞH§‹h…FÞH§‹›„ ÞH§‹›„ Ü—°uh…FÜ—°u333333ÍÂï1Ѷé¤ï1ÕìDï1Ú!8äï1Ú!8äí€/ÕÚ!8äëÏY”Ú!8äêƒSÕìDêƒSѶé¤êƒSÍÂêƒSÍÂëÏY”ÍÂí€/ÕѶé¤í€/ÕÕìDí€/ÕÕìDëÏY”Ѷé¤ëÏY”uuunnnfffnnnÍÂêƒSѶé¤êƒSÕìDêƒSÚ!8äêƒSÚ!8äèm­Ú!8äæ¼ÖÑÚ!8äå ÕìDå Ѷé¤å ÍÂå ÍÂæ¼ÖÑÍÂèm­Ѷé¤èm­ÕìDèm­ÕìDæ¼ÖÑѶé¤æ¼ÖÑnnnfffPPPXXXÚ!8äï1ÞVXï1⋨øï1æÀИï1æÀИí€/ÕæÀИëÏY”æÀИêƒS⋨øêƒSÞVXêƒSÚ!8äêƒSÚ!8äëÏY”Ú!8äí€/ÕÞVXí€/Õ⋨øí€/Õ⋨øëÏY”ÞVXëÏY”nnnXXXPPPfffÚ!8äêƒSÞVXêƒS⋨øêƒSæÀИêƒSæÀИèm­æÀИæ¼ÖÑæÀИå ⋨øå ÞVXå Ú!8äå Ú!8äæ¼ÖÑÚ!8äèm­ÞVXèm­⋨øèm­⋨øæ¼ÖÑÞVXæ¼ÖÑfffPPP;;;PPPÍÂå Ѷé¤å ÕìDå Ú!8äå Ú!8äã[*OÚ!8äáªTÚ!8äßù}ÍÕìDßù}ÍѶé¤ßù}ÍÍÂßù}ÍÍÂáªTÍÂã[*OѶé¤ã[*OÕìDã[*OÕìDáªTѶé¤áªTXXXPPP---333ÍÂßù}ÍѶé¤ßù}ÍÕìDßù}ÍÚ!8äßù}ÍÚ!8äÞH§‹Ú!8äÜ—°uÚ!8äÚæÚ4ÕìDÚæÚ4Ѷé¤ÚæÚ4ÍÂÚæÚ4ÍÂÜ—°uÍÂÞH§‹Ñ¶é¤ÞH§‹ÕìDÞH§‹ÕìDÜ—°uѶé¤Ü—°u333---Ú!8äå ÞVXå ⋨øå æÀИå æÀИã[*OæÀИáªTæÀИßù}Í⋨øßù}ÍÞVXßù}ÍÚ!8äßù}ÍÚ!8äáªTÚ!8äã[*OÞVXã[*O⋨øã[*O⋨øáªTÞVXáªTPPP;;;---Ú!8äßù}ÍÞVXßù}Í⋨øßù}ÍæÀИßù}ÍæÀИÞH§‹æÀИܗ°uæÀИÚæÚ4⋨øÚæÚ4ÞVXÚæÚ4Ú!8äÚæÚ4Ú!8äÜ—°uÚ!8äÞH§‹ÞVXÞH§‹â‹¨øÞH§‹â‹¨øÜ—°uÞVXÜ—°u---æÀИï1êõø7ï1ï+×ï1ó`hKï1ó`hKí€/Õó`hKëÏY”ó`hKêƒSï+×êƒSêõø7êƒSæÀИêƒSæÀИëÏY”æÀИí€/Õêõø7í€/Õï+×í€/Õï+×ëÏY”êõø7ëÏY”XXX333---PPPæÀИêƒSêõø7êƒSï+×êƒSó`hKêƒSó`hKèm­ó`hKæ¼ÖÑó`hKå ï+×å êõø7å æÀИå æÀИæ¼ÖÑæÀИèm­êõø7èm­ï+×èm­ï+×æ¼ÖÑêõø7æ¼ÖÑPPP---;;;ó`hKï1÷•ëï1ûÊ·‹ï1ÿÿÿÿï1ÿÿÿÿí€/ÕÿÿÿÿëÏY”ÿÿÿÿêƒSûÊ·‹êƒS÷•ëêƒSó`hKêƒSó`hKëÏY”ó`hKí€/Õ÷•ëí€/ÕûÊ·‹í€/ÕûÊ·‹ëÏY”÷•ëëÏY”333---ó`hKêƒS÷•ëêƒSûÊ·‹êƒSÿÿÿÿêƒSÿÿÿÿèm­ÿÿÿÿæ¼ÖÑÿÿÿÿå ûÊ·‹å ÷•ëå ó`hKå ó`hKæ¼ÖÑó`hKèm­÷•ëèm­ûÊ·‹èm­ûÊ·‹æ¼ÖÑ÷•ëæ¼ÖÑ---æÀИå êõø7å ï+×å ó`hKå ó`hKã[*Oó`hKáªTó`hKßù}Íï+×ßù}Íêõø7ßù}ÍæÀИßù}ÍæÀИáªTæÀИã[*Oêõø7ã[*Oï+×ã[*Oï+×áªTêõø7áªT;;; æÀИßù}Íêõø7ßù}Íï+×ßù}Íó`hKßù}Íó`hKÞH§‹ó`hKÜ—°uó`hKÚæÚ4ï+×ÚæÚ4êõø7ÚæÚ4æÀИÚæÚ4æÀИܗ°uæÀИÞH§‹êõø7ÞH§‹ï+×ÞH§‹ï+×Ü—°uêõø7Ü—°u ó`hKå ÷•ëå ûÊ·‹å ÿÿÿÿå ÿÿÿÿã[*OÿÿÿÿáªTÿÿÿÿßù}ÍûÊ·‹ßù}Í÷•ëßù}Íó`hKßù}Íó`hKáªTó`hKã[*O÷•ëã[*OûÊ·‹ã[*OûÊ·‹áªT÷•ëáªT ó`hKßù}Í÷•ëßù}ÍûÊ·‹ßù}Íÿÿÿÿßù}ÍÿÿÿÿÞH§‹ÿÿÿÿÜ—°uÿÿÿÿÚæÚ4ûÊ·‹ÚæÚ4÷•ëÚæÚ4ó`hKÚæÚ4ó`hKÜ—°uó`hKÞH§‹÷•ëÞH§‹ûÊ·‹ÞH§‹ûÊ·‹Ü—°u÷•ëÜ—°u endstream endobj 127 0 obj <> endobj 78 0 obj <> endobj 131 0 obj <> endobj 132 0 obj <>stream +%!PS-Adobe-3.0 %%Creator: Adobe Illustrator(R) 15.0 %%AI8_CreatorVersion: 15.0.2 %%For: (Aleks Kissinger) () %%Title: (tikzit.ai) %%CreationDate: 10/01/2018 09:38 %%Canvassize: 16383 %%BoundingBox: -47 32 537 566 %%HiResBoundingBox: -46.8945 32.708 536.5762 565.894 %%DocumentProcessColors: Cyan Magenta Yellow Black %AI5_FileFormat 11.0 %AI12_BuildNumber: 399 %AI3_ColorUsage: Color %AI7_ImageSettings: 0 %%RGBProcessColor: 0 0 0 ([Registration]) %AI3_Cropmarks: 0 0 512 512 %AI3_TemplateBox: 256.5 255.5 256.5 255.5 %AI3_TileBox: -50 -140 562 652 %AI3_DocumentPreview: None %AI5_ArtSize: 14400 14400 %AI5_RulerUnits: 6 %AI9_ColorModel: 1 %AI5_ArtFlags: 0 0 0 1 0 0 1 0 0 %AI5_TargetResolution: 800 %AI5_NumLayers: 4 %AI9_OpenToView: -745 843 0.5 979 715 18 0 0 73 134 0 0 0 1 1 0 1 1 0 1 %AI5_OpenViewLayers: 7772 %%PageOrigin:0 0 %AI7_GridSettings: 72 8 72 8 1 0 0.8 0.8 0.8 0.9 0.9 0.9 %AI9_Flatten: 1 %AI12_CMSettings: 00.MS %%EndComments endstream endobj 133 0 obj <>stream +%%BoundingBox: -47 32 537 566 %%HiResBoundingBox: -46.8945 32.708 536.5762 565.894 %AI7_Thumbnail: 128 120 8 %%BeginData: 14412 Hex Bytes %0000330000660000990000CC0033000033330033660033990033CC0033FF %0066000066330066660066990066CC0066FF009900009933009966009999 %0099CC0099FF00CC0000CC3300CC6600CC9900CCCC00CCFF00FF3300FF66 %00FF9900FFCC3300003300333300663300993300CC3300FF333300333333 %3333663333993333CC3333FF3366003366333366663366993366CC3366FF %3399003399333399663399993399CC3399FF33CC0033CC3333CC6633CC99 %33CCCC33CCFF33FF0033FF3333FF6633FF9933FFCC33FFFF660000660033 %6600666600996600CC6600FF6633006633336633666633996633CC6633FF %6666006666336666666666996666CC6666FF669900669933669966669999 %6699CC6699FF66CC0066CC3366CC6666CC9966CCCC66CCFF66FF0066FF33 %66FF6666FF9966FFCC66FFFF9900009900339900669900999900CC9900FF %9933009933339933669933999933CC9933FF996600996633996666996699 %9966CC9966FF9999009999339999669999999999CC9999FF99CC0099CC33 %99CC6699CC9999CCCC99CCFF99FF0099FF3399FF6699FF9999FFCC99FFFF %CC0000CC0033CC0066CC0099CC00CCCC00FFCC3300CC3333CC3366CC3399 %CC33CCCC33FFCC6600CC6633CC6666CC6699CC66CCCC66FFCC9900CC9933 %CC9966CC9999CC99CCCC99FFCCCC00CCCC33CCCC66CCCC99CCCCCCCCCCFF %CCFF00CCFF33CCFF66CCFF99CCFFCCCCFFFFFF0033FF0066FF0099FF00CC %FF3300FF3333FF3366FF3399FF33CCFF33FFFF6600FF6633FF6666FF6699 %FF66CCFF66FFFF9900FF9933FF9966FF9999FF99CCFF99FFFFCC00FFCC33 %FFCC66FFCC99FFCCCCFFCCFFFFFF33FFFF66FFFF99FFFFCC110000001100 %000011111111220000002200000022222222440000004400000044444444 %550000005500000055555555770000007700000077777777880000008800 %000088888888AA000000AA000000AAAAAAAABB000000BB000000BBBBBBBB %DD000000DD000000DDDDDDDDEE000000EE000000EEEEEEEE0000000000FF %00FF0000FFFFFF0000FF00FFFFFF00FFFFFF %524C45FDFCFFFDFCFFFDFCFFFDFCFFFDFCFFFDFCFFFDFCFFFDFCFFFD5BFF %A8FD76FFA8A85252FD0427F827F8272752527D7DA8A8FD6AFF7D52FD13F8 %27277DA8FD63FFA85227FD07F827277D527D7DA87D7D52522727FD06F827 %7DA8FD5EFF7D52FD05F85252A8A8FD0FFFA87D2727FD04F827A8FD5AFF7D %27FD04F8527DFD0BFFA8FD0BFFA8A85227F8F8F8277DFD56FF7D27F8F8F8 %277DFD1DFFA97D27F8F8F827A8FD52FFA827F8F8F827A8FD04FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFFFFF7D52F8F8 %F827A8FD4FFF7DF8F8F8277DFD26FFA827F8F8F852FD4CFFA827F8F8F87D %FFFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFFFFF7D27F8F827FD4AFF7D27F8F827FD05FFA8FF %FFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFF %A8FFFFFFA8FFFFFFA852F8F8F8A8FD47FF52F8F8F852FFFFFFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFFF7DF8F8F87DFD45FF52F8F827A8FFFFFFCBFFFFFF %CBFFFFFFCBFFFFFFCBFFFFFFCBFFFFFFCBFFFFFFCBFFFFFFCBFFFFFFCBFF %FFFFCBFFFFFFCBFFFFFFA9FFFFA827F8F852FD43FF27F8F827A8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFFFFF27F8F852FD41FF27F8F852 %A8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FF %FFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFF52F8F852 %FD3FFF52F8F852A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FF52F8F852FD3DFF7DF8F852FFFFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFFFFF52F8F87DFD3BFF7DF8F827A8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF27 %F8F87DFD39FFA8F8F827A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FF27F8F8A8FD37FFA827F8F87EFFA8A8A8 %FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8 %A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFFD04A8 %F8F8F8FD37FF7DF8F87DFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFFFA8F8F852FD35FFA8F8F852FFA8FF %A8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8 %A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FF %A8A8A8FFFF52F8F87DFD34FF27F8F8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA827F827FD33 %FF52F8F87DFD45A8FF7DF8F87DFD31FFA827F852A8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FF52F8F8FD31FF52F8F87DFFFD48A8F8F852FD30FFF8F852FFA8A8A8FF %A8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A9 %A8FFA8FFA8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FF %A8A8A8FFA8A8A8FFFF7DF8F8A8FD2EFF52F8F8FD22A8FFFD07A8FFFD1FA8 %AFA8F8F8527D7D527D7DA8A8FD27FF27F852A8FFA8AFA8FFA8AFA8FFA8AF %A8FFA8AFA8FFA8AFA8FFA8AFA8FFA8AFA8FFA8FF7D7D2752275227522752 %7DA8A8FFA8AFA8FFA8AFA8FFA8AFA8FFA8AFA8FFA8AFA8FFA8AFA8FFA8AF %A8FFA8FF52FD08F827277DFD24FF7DF8F87DFD1CA8AFA87D27FD0CF8527D %FFFD1EA8F8F8F827F827FD05F82752FD22FF27F827FFA8A8A8A9A8A8A8A9 %A8A8A8A9A8A8A8A9A8A8A8A9A8A8A8A9A8A8A8FF7D27F827F827F827F827 %F827F827F827F82727FD04A8A9A8A8A8A9A8A8A8A9A8A8A8A9A8A8A8A9A8 %A8A8A9A8A8A8FFA87D7DFD05A87D7D27FD04F8A8FD1FFFA8F8F87DFD1CA8 %27F8F827F827F827F827F827F827F827F827F8F8F87DFD23A8A9A8A87D52 %F8F8F852FD1EFF7DF827A8FFA8A8A8A9A8A8A8A9A8A8A8A9A8A8A8A9A8A8 %A8A9FD06A82727F827F827F827F827F827F827F827F827F827F827F87DA8 %FFA8A8A8A9A8A8A8A9A8A8A8A9A8A8A8A9A8A8A8A9A8A8A8A9A8A8A8A9A8 %A8A8A9A8A8A8FFA8A827F8F852FD1DFF27F827FD1BA827F8F827F827F827 %F827F827F827F827F827F827F827F827F87DFD28A827F8F852FD1CFF27F8 %7DFD1AA82727F827F827F827F827F827F827F827F827F827F827F827F827 %F87DFD1DA8FFFD09A8FF52F8F852FD1AFFA8F8F87DA8A8A87DA8A8A87DA8 %A8A87DA8A8A87DA8A8A87DA8A8A87DA852F8F827F827F827F827F827F827 %F827F827F827F827F827F827F827F8FD05A87DA8A8A87DA8A8A87DA8A8A8 %7DA8A8A87DFD05A87D7D7D7E7DFD05A87DA8A8A827F8F87DFD19FF7DF8F8 %FD18A8FF7D27F8272727F8272727F8272727F8272727F8272727F8272727 %F8FD0427FFFD16A87D522727F827F82752FD08A8FF27F8F8FD19FF52F827 %FD04A87DA8A8A87DA8A8A87DA8A8A87DA8A8A87DFD04A852F827F827F827 %F827F827F827F827F827F827F827F827F827F827F827F8F87DA8A8A87DA8 %A8A87DA8A8A87DA8A8A87DFD05A827F8F827F827F827F8F8F852A8A87DFD %04A87EF8F852FD18FF27F852FFFD17A87DF8272727F8272727F8272727F8 %272727F8272727F8272727F8272727F827F852FD14A82727F827F8272727 %F8272727F852FD07A852F827A8FD16FFA8F8F87DA8A87DA87DA87DA87DA8 %7DA87DA87DA87DA87DA87DA87DA827F8F827F827F827F827F827F827F827 %F827F827F827F827F827F827F827F827F87DA8A87DA87DA87DA87DA87DA8 %7DA87DA87DA827F8F827F827F827F827F827F827F852A8A87DA87DA87DF8 %F87DFD16FFA8F8F87DFD18A827F8272727F8272727F8272727F8272727F8 %272727F8272727F8272727F827272752FFFD0FA8FF5227F8272727F82727 %27F8272727F827F87DFD06A827F827FD16FF7DF8F8A8A8A87DA87EA87DA8 %7EA87DA87EA87DA87EA87DA87EA8A87DF827F827F827F827F827F827F827 %F827F827F827F827F827F827F827F827F827F8277DA87EA87DA87EA87DA8 %7EA87DA87EA87D27F827F827F827F827F827F827F827F82727A87DA87DA8 %847DF8F8A8FD15FFA8F8277DA8A8A884A8A8A884A8A8A884A8A8A884A8A8 %A884A8A8A852272727F8272727F8272727F8272727F8272727F8272727F8 %272727F8272727F827F85284A8A8A884A8A8A884A8A8A884A8A852F82727 %27F8272727F8272727F8272727F82759A87DA87DA87DF8F8A8FD15FF52F8 %F8A87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA8A852F827F827 %F827F827F827F827F827F827F827F827F827F827F827F827F827F827F827 %F82752A8A8A87DA8A8A87DFD05A82727F827F827F827F827F827F827F827 %F827F8527DA87DA87DA8F8F852FD15FF7DF8277EFD17A8FD2427F827277D %7DA87DA87DA87DA87D7DFD1527A87DA87DA87D27F87DFD15FF52F827A87D %A87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87D27F827F827F827F8 %27F827F827F827F827F827F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F827F827F827F827F827F827F827F827F8 %F8F8277DA87DA87DA827F852FD15FF7DF8277DA87DA87EA87DA8A8A87DA8 %A8A87DA8A8A87DA8A8A87DA82727F8272727F8272727F8272727F8272727 %F8272727F8272727F8272727F8272727F8272727F8FD0427522752275227 %27F8272727F8272727F8FD0727FD05F8A87DA87DA8A852F852FD15FF52F8 %05A87D7D7DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87D52F827F827 %F827F827F827F827F827F827F827F827F827F827F827F827F827F827F827 %F827275252A87DA87DA87DA87DA87D52F827F827F827F827F827F827FD07 %F8277DA87D7D7DA827F852FD15FF7DF8277DA87DA87DA87DA87DA87DA8A8 %A87DA8A8A87DA8A8A87DA852FD232752FD05A884A8A8A87EFD04A852FD0A %27FD08F827A87DA87DA87D27F87DFD15FF7DF8F87E7D7D7DA87D7D7DA87D %7D7DA87DA87DA87DA87DA87DA87D7DF827F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F827F827F82752A87DA87DA87DA87DA87D %A87DA87DA85227F827F827F827FD0BF8527DA8FD047DF8F87DFD15FFA8F8 %277DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DFD2227A8 %7DA87DA87DA87DA87DA87DA87DA8A8A8FD0427FD0DF8277DA87DA87DA852 %F8F8FD16FF7DF8F8FD127DA87DA87DA87D7E2727F827F827F827F827F827 %F827F827F827F827F827F827F827F827F827F827F8527DA87DA87DA87DA8 %7DA87DA87DA87DA87D52FD10F852A8FD057D27F827FD17FFF8F852A87DA8 %7DA87DA87DA87DA87DA87DA87DA87DA87DA87DA8A87DFD20277DA87DA87D %A87DA87DA87DA87DA87DA87DA87D52FD0EF827A87DA87DA87D7DF8F852FD %16FFA827F852FD177DA87D27F827F8272727F8272727F8272727F8272727 %F8272727F8272727F8FD0427A87DA87DA87DA87DA8FD0B7D27FD0CF827FD %067DA852F8F8A8FD17FF27F827A87DA87D7D7DA87D7D7DA87D7D7DA87D7D %7DA87D7D7D847DA827F8F827F8FD1A277D7DA87DA87DA87D7D7DA87D7D7D %847D7D7DA87DA87D52FD09F82752A87D7D7DA87DA87D27F852FD18FF52F8 %27FD1A7DFD0DF827F827F827F827F827F827F827F8F8F852FD187D2727F8 %F8F827F852FD097D27F8F8A8FD18FF7DF8F87D7DA87D7D7DA87D7D7DA87D %7D7DA87D7D7DA87D7D7DA87D7D7D52FD1BF8277D7E7D847D7D7DA87D7D7D %A87D7D7DA87D7D7DA87D7D7D847DA8FD057DA87D847DA87D7D7DA87D52F8 %F852FD19FFA8F8F852FD1A7D27FD1AF8527EFD277D52F8F827FD1BFF27F8 %52FD1B7D27FD18F852A8FD257D7E7D52F8F8F8FD1CFF52F8F87D7D7D537D %7D7D537D7D7D537D7D7D537D7D7D537D7D7D537D7D7D52FD18F87D7D7D53 %7D7D7D537D7D7D537D7D7D537D7D7D537D7D7D537D7D7D537D7D7D537D7D %7D537D7D7D5227F8F8F8A8FD1CFFA8F8F852FD1B7DFD17F852FD237DA87D %7D5227F8F827FD1EFFA827F8527D7D597D7D7D597D7D7D597D7D7D597D7D %7D597D7D7D597D7D7D5327FD16F8277D7D7D597D7D7D597D7D7D597D7D7D %597D7D7D597D7D7D597D7D7D52FD077D5252FD04F852FD20FF52F8F8FD1B %7DFD17F852FD1B7D27F8FD0527FD05F852A8FD21FFA8F8F8527D527D527D %527D527D527D527D527D527D527D527D527D527D52FD05F8275252522727 %F827275252522827FD04F8277D527D527D527D527D527D527D527D527D52 %7D527D527D527D7D52FD09F82727A8FD24FF27F827FD197D52F8F8F8527D %7EFD0E7DF8F8F827FD1A7D27F8F87D5252277D7DA8FD27FF7DF8F8527D7D %527D537D527D537D527D537D527D537D527D537D527D27F8F8527D7D527D %537D527D537D527D537D527D7D7DF8F8F8527D7D537D527D537D527D537D %527D537D527D537D527D537D52F8F87DFD2FFF27F8277D7D7D537D7D7D53 %7D7D7D537D7D7D537D7D7D537D7D7D52F8F852FD047D537D7D7D537D7D7D %537D7D7D537D7D7DF8F8277D537D7D7D537D7D7D537D7D7D537D7D7D537D %7D7D537D7D27F827FD30FF7DF8F82E7D527D527D527D527D527D527D527D %527D527D527D7D27F8277D7D527D527D527D527D527D527D527D527D527D %7D52F8F8527D527D527D527D527D527D527D527D527D527D527D5252F8F8 %52FD31FF27F8277D7D537D7D7D537D7D7D537D7D7D537D7D7D537D7D7DF8 %27527D537D7D7D537D7D7D537D7D7D537D7D7D53FD047D52F827FD047D53 %7D7D7D537D7D7D537D7D7D53FD057D27F827FD32FF7DF8F8527D7D527D52 %7D527D527D527D527D527D527D527D05F8277D527D527D527D527D527D52 %7D527D527D527D527D527D5227F852527D527D527D527D527D527D527D52 %7D527D527D27F8F87DFD33FF52F8F87D7D7D527D537D527D537D527D537D %527D537D52F8F87D527D537D527D537D527D537D527D537D527D537D527D %537D27F8F87D527D537D527D537D527D537D527D537D527D52F8F852FD35 %FFF8F8F87D527D527D527D527D527D527D527D527D52F8F852527D527D52 %7D527D527D527D527D527D527D527D527D527D527DF8F8277D527D527D52 %7D527D527D527D527D527D5227F8F8A8FD35FFA8F8F8277D527D537D527D %537D527D7D7D527D7D27F8277D7D527D537D527D537D527D537D527D537D %527D537D527D537D7D52F8F8527D7D7D537D7D7D527D527D527D537D7D52 %F8F87DFD36FF52F8F852527D527D527D527D525227FD045227F8F8277D52 %7D527D527D527D527D527D527D527D527D527D527D527D527D5227F8F827 %7D52522752527D527D527D527D527D27F8F87DFD35FF7DF8F82E527D527D %527D7D522727FD09F87D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D27FD04F827F8F8F8272752527D527D527D527D27F8F8 %A8FD34FF27F8275259527D527D5227FD0BF8005253527D5252527D525252 %7D5252527D5252527D5252527D5252527D5252FD0CF8277D5252527D5252 %F8F827FD33FFA8F8F8527D527D527D5227FD0DF852527D527D527D527D52 %7D527D527D527D527D527D527D527D527D527D27FD0DF8527D527D527D52 %52F8F87DFD32FF27F8F87D5252527D5227FD0FF852527D5252527D525252 %7D5252527D5252527D5252527D5252527D27FD0FF8527D527D52525227F8 %52FD31FFA8F8F852527D527D5252FD10F8277D527D527D527D527D527D52 %7D527D527D527D527D527D527D52FD10F827527D527D527D27F8F8FD31FF %7DF8F8FD0652FD12F827FD185227FD11F8FD0752F8F87DFD30FF52F8277D %527D527D27FD12F827527D527D527D527D527D527D527D527D527D527D52 %7D5252FD13F87D527D527D5227F852FD30FF27F827FD055227FD13F8FD16 %527D27FD13F8FD05525327F827FD30FFF8F8277D5252527D27FD13F85253 %527D5252527D5252527D5252527D5252527D52525227FD13F8FD04527D52 %52F827FD2FFFA8F8F8FD065227FD13F8FD1752FD14F827FD055227F8F8FD %30FFF8F8277D5252527D27FD12F827527D527D5252527D5252527D525252 %7D5252527D52525227FD13F8FD04527D5252F827FD2FFFA8F8F8FD065227 %FD13F8FD175227FD13F827FD055227F8F8FD30FFF8F827FD04525327FD12 %F827FD1852FD13F8FD0752F827FD30FF27F827525228525252FD12F82752 %28FD07522852525228FD0752285227FD12F827525228525252F8F827FD30 %FF52F8F8FD065227FD11F8FD0A527D52525259FD0A5227FD11F827FD0652 %27F87DFD30FF7DF8F828FD055227FD10F827FD0652FD05F827F827F827F8 %F8F827FD0652FD11F8FD0752F8F87DFD31FF27F8FD06525327FD0EF82752 %535252525952FD0EF8FD0752FD0FF8FD06527D27F8F8FD32FF27F8F8FD07 %5227FD0CF827FD075227F8F8527D525227FD04527DF8F827FD065227FD0D %F8FD0852F8F852FD32FFA8F8F8277D527D5259527D5227FD09F852527D52 %7D52595253F8F852FD0AFF52F827527D527D52595252FD0AF8277D525952 %7D52595252F8F8A8FD33FF52F8F8525252535252527D5228F827F8F8F827 %27525259525252535259F8F8F8A8FD0AFFA8F8F827525252535252525327 %27F827F8F8F8275253FD0852F8F827FD34FFA8F8F827527D527D527D527D %527D527D527D527D527D527D527D527D27F8F87DFD0CFF52F8F852537D52 %7D527D527D527D527D527D527D527D527D527D527D27F8F8FD36FF7DF8F8 %2752595259525252595252527D5252525952525259527D27F8F827FD0EFF %F8F8F8FD045259525252595252527D5252525952525259527D00F8F87DFD %37FF52F8F827527D527D527D527D527D527D527D527D527D537D5205F827 %A8FD0EFFA8F8F8F8527D7D527D527D527D527D527D527D527D527D7D7D27 %F8F852FD39FF27F8F827527D527D527D527D527D527D527D527D527D27F8 %F827A8FD10FFA8F8F8F852527D527D527D527D527D527D527D527D5259F8 %F8F852FD3BFF52F8F8F8277D7D7D527D537D527D537D527D7D52F8F8F827 %A8FD12FFA8F8F8F827527D7D7D527D537D527D597D537D5952F8F8F852FD %3DFF7DFD04F827527D527D597D527D52592727F8F8F852A8FD14FFA827F8 %F8F82752527D527D537D527D52522727F8F8F87DFD3FFFA852FD05F82827 %5227522727FD04F827A8FD18FF7D27F8F8F82727FD05522727FD04F827FD %43FFA85227FD0BF8277DFD1BFFA87DFD0DF8527DFD46FFA8A85252FD0527 %527DA8FD20FFA87D2727F827F827277D7DFD7AFFA8FD2EFFFF %%EndData endstream endobj 134 0 obj <>stream +%AI12_CompressedDataxœì=‰BIÓÿ ä•0Ó×ÌèzäD”kÁóó`ˆ„s¸«OÿWuwõL ˆ»gu¡ÒSÓU]wWOær[;K…ƒö^}‰ç½lfn®Ô©×zíÎý¬†fW›Í~·×AÐÂöbÖ—yVÃ];ðU½Óm´[÷õGyVñî…B³~ÒÍ>ot»ÖQ½³˜]X„Ï^4zÍ:|Úkœ|kôòµÆ"=p”k=øÌ÷–=™y~˜õ¢û<ĵ֗ ú†+r€ÛýÖ .¶ÿ¹Ÿ]A–³¬äAV*Ÿ>ml×»CCT>Œ„„qùÀ a¬ÊË@ÁMJâpS¹½ß?­·z[ö~½Û-µ›íN÷~¶ôµÖʮ׎à“Zöm½Ùlÿ-6kû'àƒÜ­6šu ù´ÖËú>r§°ê³Ýb¿Ñ<ØèŸîÕ<ŠÌw5Ê—]Àhñg»«§Ù©÷z0Yx rx{¥˜œõµðn»~ÔÐ  û°hÑvÚg§µÎI× “>ÿæ³õÓ³&0V3I þ•ú_÷³ „VI/»ä @ìQÒ"Š¹SÿÒ¨ÿ}?»ÑnÕ +ÞŽY!<Ïük>Ùî7ë—­F¦¦¬·êMïî¯6kG]¢Òÿ5^Ô:Gõ,i»Ùïii é ÀãµÚ×:.”0Ø<«·^´_é9.°â¡àYh‚(ø2‹’WÀ³>î‘~ü¯ÁŒx ¡‚Å{ Öj³Ó8j´îÛù»+ÆA¼~ˆæMB>Lü诙+ÝëÕ[– 7¥õ„xùõxb¥uPjŸ"ï»(ø -fûÈ|æ~ÖŸÀíý3C€þ}–i«Óh!Î̆þ$ÜÝjöᣕN»¶Ú:lgŒ²Ãl:õ¬ùVÿJÿ]=[¼ðîrýÔ ¾Ý@+­/õfû,ÖAj­ƒìëZçìrÔ[ÍZ«ÖÉj¸Ã¼ÖøŸÔ€´w ›)¬êY}¿§oÑC†pÁ€ÄG—?èE§¶ÜÏnî}‚[àn pJÙ|íì²i×zÇ`ê­ƒ®C`~dƒ]>»}ÁN¶Øéw³/Úí¦C;ø‘ÃnÁŠãÓñŒ-}Ck³e4ú$;`øI`|R÷}þàÃ4c/ÕšÍÆQ§vvÜØ÷€1Ÿ»'™Ï®"X_O÷ÚÍF÷4–§d«Öé5ö›õ¯Ý^ýô"lÈÃFëq§ßèÕãÙ¶OÏ0ŒÈî×Îêg︪Gî8„rÌpÒÐ.-eül±•0Ã+ÚA,8Ä>/[­Úiý {dAYî-fÆBÁ{ðlñ ó.óG&*ÃUŠŠp¢( +Á™‘Šd$àâ‹üÈ‹¼°VÂrXÒ‹a®( à T¡ E¡SÈB?ô‚j&¨å ƒBeÁÜ(aGéqz˜W~P2`pù§ªªWY•T®‚ŠT¨¥”Ì(¡¸bʇË3O0«öу8 Vˆ€kÌ„»<„ÛbGä‹ßSž¬ê'Š Î9㫲2+±"‹X“•L0Î|,«~Ù/ùE¿$0;é ŸûÌÇ?žWõ*^Ù+yE¸ +ä)\0Oé'Àã.“\ Æpqr±ð\´|Ì€ðœ,[NÆÜåAžZÍ7\äâúó"ô.æ.ž9 Z"2 ƒ"AÂT*”…*™)#FpýÍÚ+j.V«ÕJµ\-U‹ÕB5ª†Àa (ª¼Êª>x j¥R)WJ•b¥P‰*a%++¢Â+¬âƒª–+år¹T.– `% ¿*˲(ó2¡ôJÕR¥T.•JÅR¡•BXJU’%Qâ%VÕ+V‹•b¹X*‹06a1+‹¢È‹ ,„—)T •B¹P* …BqD2$ ¢À ¬à¼¨Ul@BሠFl(â‘¢ A2‰„%" Š(ª ïO¾¿4SPHq#¸èg ‚ø¡|Ì Är×æãu¸x.3åð‡ò‘eP $3C1qÌÇïâdð¼Ëxyè:’ÊJøŸçá;™¹ÝÑŠ]ÍD U>'ß1îC¸Ë¡ý ÆË./¡Ìã‚š<7WYk´êºðb“2•Q<“QžâŒíÕB¾0aIc[ +>5ãœ*ºTtªäRÝé 3=ßBÈ»Q¥¨q¡É dLl|nt\Ì$d +üx"ð‹ã{ +þƇJ‡f@„ :Ô1 vÄ»Š1ˆº\±ç üxA €î"Àt¯ o.àŸ¢VøFÿXí1WÙ^}Uñ*êÐ\¨t?$ðZÙÌPÀdB¦Ñ€i4ðÄ ™üŒ[f¥ƒÎÂáK‰p)±Ú‰l(sNÈ9fÙãðè¢uÏPjg–=±ð£KéØŸ¢ÿѵ×ëžqKŸ\øá¥/$Wü:áï9)„YËq)ĸàwp%Ç¿ùf†ˆËÖW2¹–æ¢$†¿¨ÄFI‘+C¯¸<ð¥µÍèÅÅå5Ùo8Ó ¯0­1­2­³Ur\ëLb±ãåÖ n—Ü(¼Qy­ô¿R~^®¬L&,L†Är¬ë0B[–á<öF#^Ì€ðU´àq-sÆI”ÑA€¬ í + _(]>È"¢2ˆ‚#A`°2Ra Å°KÏ`¹XÞbTÖJ+@GCÐÅ2XYB áM¡NùzAì~ ±ÿrø5|MÈfLRà +؃X†¨[–BÅ`9¬ª'ªÀ´2X•"¬u+ÀºK°9Â_x¼ +ƨ&©”ÛT) AVÈŒ)(úº¤X±EÅ‚-+*SX¼ IêÓ:åe~È*ÂÒf&_Cðbº<ü›¬å¿œ\B’þƒtÒ­fæ*iVs 9Ÿ™¤e×O°.Ƞؘ Ša¥(ƒ*I{aŠ±Hh/'@`Š¥ä2¥ +TÃð²ï.†W$/‘¸¤»”½ý—.Ï”uH¢Å·¼2úE-ÙÅï¾b áðÙ+tW ÿšKÅ—ÙùA/LM—eªöïÂfÚ¿kÏA›ùa¹Ÿ¹R˜^Ѓe@Ê•Þ^)CèƒFH]Ä/šPÏúy©=}Ö¢6§q•c,ŽÑwEgV˜Qñ ¨®]eŽ@©‹°ePò*AåAŠAùAôÚ›•§5/Ø5O¬uÆ.·—\l»Ò|`ÕÈDi®™1½'VÑ{b¡Þ~QvG,Þ +é0Ü¥Å~z$ùs×<ŠÀã(öüø5t•“]m5ƒÙŠ h½Œoþ0·Û \ÚevÄB›HG:!(ÚB mA@äks1Œ!Ëè” a¡ƒaLÍ09 ôÆTNÁ¹ddǤÞn¿Ó6¦ÃfHÞ2:£M Àeä˜É¡ºa6WÒ]Y‡QU³©¡ hi³>iÐ+‹1†¢Œ·”pL™ó=Óå‘Æ8×”q¾é»bQ甹,Ö€•£Íèhd;ÚìÖj?¼‚s¯ðÜ+Š¯Lòk\Æ]Ås¯¡?™O4sUÇ_k×Æ]þ9‹¯ä´‘v]™ávKÐ$ñ&W¶VØŠ ¦ô‘Në .µ/Ùô^Ûý eù.ÓŸë›l?™ñ‡‰ +O¢Ê“Êý+ZEÆçÿ¦ìWLý'.ýé +P¦P(‡Š~e*ú%J~hP‡…¾¤öSÆSAªšÑî*Ҹ̟’v\檠£K;2ãÌ’K\ -™¹„õ|tÉÁ릗=nBß–í¹+ ¢û¢o –öyä¥ÀŒf´[ŠRŶk ã@3ôjT7¥W?ôÏ¿„²<—Fbèëô’¿¢NMú§ ýƒäR¿Dâgó>™q‰¦}Eö &}Ì&}&åÄOê„O§{6×ÃL/ÐJ/°Œi^E;ÓÌ :QMT ÌA¨Ý&8LÅ¡Ÿ4[èK€#ˆåoÞX?©j[Ä*6ø,Ùv®¢1^ÚJ†¶± }´n“ÚU ÝÌ CÓF¦Ý6:lq(j^Ðf7ÔŽ<Ð{;R{sôçTñ‹+¹TÇ¥r­ñ˜øG{fíPM9ÊúYªëËøaôÈÆ;O>ÛxoãÉW7ŒãùM`c˜XÁÄ &Š0…‰/(Þþ'|þ˜‹\|äÉ+cc.5rc®pðʸúÞðUsÇ^¥ä•±?Œ/~TιªÉkLÿýûóãâ2ku,jUDEä:‡©ê¦¨³Ô<Ô;s$uÎèêš°yf¶Ú—Ñ©M 3f‹}”/tŽØìÀìBù. D€’›X#èc¦sÁ1ˆ¡ø€Ÿ D™ñA‚®ÒT]u†»HÁÄ +a¢CÅ[ˆÑ™m·ËîŠ lqŦà.Óu‡þÿ õ3ç'büÁð>ìã°žúE9¹ÊëCA|цïÉÐ]Ú BvÏÆê©ÇQº‹Ð36@Î+CQ9Åäc4ÎÇÄâ•L2×¾e0lñÍ泶4'mžpÅ;f‹y~Ò·êÐU¾Bç%û)“ÝZÉ^­ñM1ãÎ( £Iôj tkvÞQd˜àu|(26DL†ðÔri‚ø8Œ7ábÊÇyq@_ɸó ya“¾ÐÂ8XOŸøy©˜Ì†úñ<žÌÁ¦ç%}ì<úÏ éEú¸|À¤Àóòž!ÑbPùÀW"+Ã|&¦¯ƒDÏô D9ªP<í;`þ"BžÛ;E 1e<L}üüﻟŒÌòÑ÷¹{Dz<ŠobyÃB¤"ŠÍ W¼Ñ>-÷†t“ÍykVÙdwÄåc¯Ò± ?Õšƒ声¬?í(Ÿv”O;ʧåÓŽòiGù…§åÓŽòiGùíBžv”ÿ:kùÛu”OÒ)>i×ùwgPlLÅ5vAM«€Ó*à´ +˜’*àMµ§{2ÿâžÌ´ƒcÚÁq]ü(¦ÓŽiÇ íà˜ž_™ž_9ײOþ™ž_F8=¿2=¿2=¿2=¿2=¿2=¿’Žó+Ó·›Lßn2}»IJNßn2}»Éôí&7åí&ïþ•NÞÿ¸ùçõ\§¤ç<­ù?û¬ÂÄý#ßœä«qߧÐé{ʧ]åÓ®òiWù´«|ÚU~ ÂiWù´«|ÚU~c;‘§]å¿ÎZþv]å‰Þðˆå¹cºÆé“Á÷•s™‡ü2Ó‹NŸ\”Y~‹í…ß#ÎÍ'ö!Û<<ìÖ{ÙÏýZ§Þ¥¯B†dìœÌ·Õ˼„¾þèù0뾦Ô&ŒÙ7_õ¯ÏàÇOü;+²ëÙw¼ì†¿Ù¶|9Õÿ·X²kðÛ昧óìÿ[úçM´BìÑ!æÊdæŽò€I3¤ŒtN é½N®™/•†ètÿMíLæþÞéëÕ+›H‘'uöøœ6}S}^˜'2•‡ø–dÄJ?`,Ê ™ç!Æ…<Œî]ƒfåé 1˜5Ã"RÍõÃd>Œ<Å ´–q–‘2ôÒã`‰[5^raè §ãï÷€q3ß–£Ï÷%pƒÈ3„æYÖœ‡¶–€‰0Ï•o°Ð½ã`É{[D"I„œ\)XRéyJa}$ +1;ЫŽKK¢4U˜µ?ÙÕ ¸Ãg‘a <݃̂@k ÌB…‘4Ø;ÇÁ·Ž +¤'åë9b1W—»$äYMG$ð /}æ4þ/pÒfÊ X*< , Bi–`>*±8ÌGmŒî]ƒoP`EÇÌ) ¤ÉÐ<ŒcaŽ9ÐZ$ò‘ ¹å1Ë3ˆl´–)x‹?õã`‰[G„Ø«Å ±­-B\„Bs\W{½|ˆŠ#­žyÉ:úÿi6h=7fmÌ}#ÖPpì,ÚL! Ö<¬8RnakIÌ2Š™+sï8XâÞAùÂE…ˆ% <ò°º~j´•@k1H›ÄÀ²ÕÞ9–¼µ•#ÏÖPùaæÈh:GW„•l½wܶÅoÏ„6 ¾1d¦p>ķ‰gì¼9Ž!eÛКxyŽEyñ¡~,^è#^ [KÀÈB¯%îKÞ븉sAeµµÇãF¼(°Üy‚#¬š7J›4™›‹=jfI}˜ÜB°µ ¨‡Ó,Ý;–¼wT ð´ª K ŽÞÔç“K‚›46{(€9MÀ.Súù²€(^Bz€êKíýB2Ú:;ÐZ "Ÿ°–¸s,yë8£=ô„Ósn÷ˆ133ß8ÊÐáˆô³d–­u÷aQl-#·³–¸w,yïEz|iP9<™Ósâ&â¦×ФÇÀ’÷; 9·§³žÝÆCq´AD)&㸹g H¢ q­%@À0GÊLÑÞ9–¸gó2S1© äB6Mù®Ü(4Ÿ;ýî1áq{RŠYÐ"äzøûæïL?3òŒOxtº³q™Ïz +ª.%jã]XV01xmÌ0 58‰ä°CÒÊ Ø\;¤1Ø•ßØ!¤Ð3•1.ü0k†‰Ð(ÑÎLƒ\¢ sC¢¡6À `«‚CûðRæPsÆIæ ½å§ÄðCc†Ÿ<0ÛT,>3–s¥ Yg1Gº”4‚„\¢KæÓX.‰6©Ì@ d L +Øû#ˆÚ½ÐLÀ$²!”>„ÿ•é±¡a½y ˆ7èk\ØÉ2¥”‘ó¸JZöÊ€q ä¾oñJ à ^Ó¢ Xz;–1H+ •ËCE<‚(F ·À’Ù±¸ï@BF~h2ö~‘ÇZ¼13€1@æ-ÐW‚&à¿ Îm lË”e—|·Ð( &cÍ‹IÃq3 ”}ƒÀHºYI9‹ ’€ÖY`D‹ ¥s’¯'Ã<ó••£0²³á`$`ÎíýH¶²s„å!9M*@Á·÷[áB½Ýý&t0"ëÓý*2÷c ƤFÈxDW®(­ðAZæFIfe$(9-´)°¼™r@"i üÈZ1±OÀíã³(@¢€µ†Ûž´³å^Hx±ËÁè˜ 9 X…ž…Nq 0â$I¡ + âté°„/3‘º™/(¯Å AXVkÍ - ¥H0͹3Úf[ |;cí œ®ç‡ÊN!òh}i¤Fú"^IAô¢u …Û`Æ‚Ø ‘0Zj!©9‘€ÕƒÂ¡HÄXرôˆãhÜ-0 HÇTAÄÉЄÜL 4±¹¡f !=)"ÝG06¦ph¥&ÌãølS±@Ìž¢QИ?F>÷IŒ±W‘±91· ‚W‘Ì: +RÝ{„€ÖXÉ!àÜ9`T2ˆ±‰€t×± ÂHË)Ž]ð¹IìòiR@[|’¢À3¢n°FFŠÛIm P×',©B9æEcp ãÂyfìŒ ÀuY¾r¥%#@'ÈÈøaâZ"ô(aÜ%‚0Þ4Ûnç”Ì#EšÌ‰`답}(7£Äœ û)§ïsËH_°Å8ûÖŽ À瓧±xAå˜pZdÒ7´4æYà,Á:Zw¿Df xŸ@{PÒcåAäqÒyP=Vè¼DÀ„<äA`Å9‰ ã4ÈËͳ$æ<Ã,”°˜!O˜Bƒ©ˆ ½žÓmO) Þ€ÿ"Š¹ÐΚãI0D!MŒGqÆóÞÀE,>)âõIdÉßÊEÑqx@ä‡Â#ÇZv‡MÜÇ·cO8û`YÀ’’È1§Þfð! „ÍXlå'Ö˜À0ŠÄt-Ä Ë)œW¡õ»E`% ÅÊhüMÜÀÈùÞ(V9&S„0W‘ØãË,¬aH~•o211 ±FÚë…ä¾ü t÷ƒägE÷Ǯ݌fòIÞ'^L)¨÷€ùY ßN<²0p@%‚XĽ(°‘#€Eàq8f`!óy‚‰¨-¹@gMh¥çË¡¥‰tË"àÖ Â“ÀýP0å‡òÉNH[0â¾*PH†W{ä©°É q_Á„ÀØôP'rŠ¦e| +½BÇ!"Ë +suS)…s%!ôóL¿CŒ7 ¬÷€¶1£7ô"2õºŒdœÑ£8é €ñð‹XXÂWPH @)Ȧ)æÙU°ÈÙÈÐX`kÓ8é¢Aú¤ ¡Oñ;€u bÈTdǘ¬À# ¤ÄI‡@WâÑ» ÆÃ,EBg)80¾–ÇNŒÛ`„H¢l€‡X#Ò%(0ülhb(ÆZç-‡<îÂ0ß…÷ |³´>w@02â€L8Ìí÷š N–C»1 %!‘1‰StÀZåRF¢œY­Ð˜½Uš(páRˆ±6Z PF‘½§¬¸£¯#5œÝÄ99ë&·ùŠØP€LR$bK³‡eýˆ@õÂ76Xù´(N¨¯" ó \|.MtKBF9À°{ÀÜ(¦¾&è Ñ­I. g5FÅ‘h¨[ó“zd€2+6Ç Xš€P¾C \€+\Õ ÀÚÍp`¥80‹:¸ AÂJãö†Ã«ùlµÞò¨m[b@` µäªŒ¹º&B\B*/báô $³’d„.'Bᶦ܈ÈFÚL €Âi\PˆF‰2²â =,Ð <“²Ä6R#@°GvGç\è¹pÎêÂ|’ÄQ‹÷GäRÚdNñBψ=yDN#r¸¢"Gè` yÒv ®°YGEŠa… "¯ˆªm¾ UäFfÈid„‡Wέ¿0*9ÂÊâ6=zJòiè%Ìý ÌÝO- $y½D¡ß·OòÝýؤk£›'P0BFÎ-0°¥6DJ¡7Çp¡•Y³`È@É{WGáœ$–{Ò}WüÑ·´X$Y?À8¶ÑѨJ›ì ®µ°ô(Ôà0tbV¸™-TEÒ¥ëIG‰àÈ‘„ p1Œ²É"±ß‹„ˆÜT„¦šÓ¼°¶i±*²&zw…f@ñièSyVÏÀwBo +ˆ7 _lŽ@ŸæŠíÕÕa¥+zDhßA´vI(j•Š"®&RpÅ…-˜LÏ#¯ø‘R%ý …ãö¸S;IöÿXõ°ú¥\qÅ€À|GÖ«[±fÁÂÆÊT5 …T +^A"œÖ®“ð +—hHë\¨"Z)M$a‘Èã ™3°öîâif·7p4¹«„慉ʞ´I§0H¹tì4ëz²â¶…®’ðJÌíoy’cÀ9(J*[êÂG r7Ú%Ɖ9FJvÎ_E65Ó3p +)âû±Á|0r0 £8›B_Æ%¥Ð% QV• + +hβÈ…smvÍr +|¤ó6Q"7ŒlÞ @!5[AäL#¾Q…I=µX#*G6@ ‹´u|/’PD:¹i12Öq]À2¢š6­WärP[”`à¹Ø³º_9'!M@9/¬}£}§€Ü…ÞQ\®ÓFÏ +'@]˜§íŒÇ>×M6tq~‚…qÙ@‹!=LO1i@#<¶óÃ:µ3@ª *SêÑ[w6Fk%lÞŽÀ¸¡D ¶ì‘pÛ˜TƒU,ÞQdö0½¸Žè$ ùd&H ,²q¦Çlaɀɽj‘!´´É`5 ,£™¼T¤À¼†&‹‚G„iS‹##IŽAG31—mP8ˆ`RO[B•ë\j‹@JAlðL·G®@áøÊ]‰^™ºg‰|Š„4ØÆ'À,šé·Õ8 +Ó+³¿h`Ûq;âf6h×@aŠ¶¤]0eöó ”tZlËjiº+ìR[ZfX#0óôœ Ó‘¯*Êa…ÙðB ó©’AÊ¥¡®‚çÖ:ŠD™ýkuÚå/ F,Xhå˜mh \8=ŒÓe3!XçΖ±JÒXÆ,Ùu ÌΗYWÚÓC¯ŒLˆ@øÎqD„4ˆ\)†L4‚utïžµf¡ É@ooÀà‚eD†ß¤¬YX-ׄU9ípHC­áD ÷œ5õ# ð“^†H^ãSH¦DÑÖqäE Æêaƒ·Y\r+|KWduPÐr“Î3a…#r5‹!´{ &©€üÎI§¢z<©ækã3À×ÍfVlâ¿»=8eŠÑ˜ 5Å °Íjpbº Ákm´b¦Î„c#g#d`l„›ƒ>á ìÖœF (¹ä¦ø„@î 2H# ÏEˆ¶€P]d´¡EØ¡R +p³¯„@|t‚B@aª2:‹ÀVu”I PGuÖðØœYƒm¤à¢pûu0ƒˆ[XLíß#T«-¿#º]¯ò •[mEŒÄšËL¶Óöd¬¤H¬«)éë¹úTúw•{ý¸ˆ6cu#á… —ö̬MC¼´dv“õíŠöZtUéüÛ±¥ƒÂ0azoô@Ï%·"ž•ÞÏ10I·KgÏL‰À(¢Xƒùœî—Χ*[uǡʉ¦7xs±%î¸Òó#WTT$Òuã¸Â9§™ÆNQO pÉ­1ÿ8Öã¤]&«B`l „ a|ŒÓ(¾åžC@"hwŠô8ß'ÕääλOòÚG±€žOûO*¹˜C‘¶Awä£ÿ +ýÄ\ ù4-]:5”ÛôT´q¡±†Î˜žF`¡#ðƒˆ¼"·Ú¥°‹Ûº‚š@,ÊA˜¸zŠîµÛdC”œ‚næüºäóM=)ò·%¤òööÀôÄ‚in×ÅN²¶ÿ¡4'RÌtÉÑÛ½3òD‘0r(©ÇBQç#+ÕÒl j Ãâ+’‰0F§u¥5e +þÈIƒ^5zpQÜ¡ÌþmòÁ¶Ø… 8P±ñJÞÎ9= ¢] [QÑsb$ÍA¼èÇÉÒ£9X³Ð8JWä•°5CZªl"¯îYnSFƒ}êi L]K±…LOè6åѦ‘»?ô(O co Aƒ µs694~Ú®¼g$òJæs&Â)E~!¢¸ FëFËEë."Óh0÷ ^çíüÐÙ”-©¤Ç¹ þ”èUnbº½ÒRF +€ÛʧL^e€Êž´0ª¨x·B£u € ÂâÌÄÖäͳøP”çcj©0²ób^"L³=µçÛy±, äv!Uò~¦ˆ®À”ä(8¹ʬ©+ñ +Ê`˜—:»9§‘F$ê”Î(ÄŽœÈØú$ãðÙ¶”FÌ7{ñ6vUñ 9»²û8ÚS.¹ÅzÆv-vº!fl3>æë›­ÐTɽàØ€*åÌ…È]‡7íˆÜu8G¼!•"ÅAèS8e·Ûø2Œ—ÑÜÏ\M(±b,âèj«R]m@dâR¹2a¨*IAIOX m†Á¥í8Ö-™®IÚ‡IÒòÈ:=†]t”µº2‰Aà,•i= KËK:Žg8°¾$Hx¸Ê·©Ló™2ß¹¸Ð'qILº’"Ií–”k{´â|‘+å I"ñn®4M+z¶a4lʃD\m7Iµ+_ÑýTmt-èÓ6¿Þê5÷‡f;L=XàÚFelap QW‚!prh_œ9Hç "ןc÷ +ÍýXÔ#!àv‡µ…n_Ñj"…¢N‰¸ àx?šJNZàÇw‚ú]Oêš$#§.ÜÅæ<AjeÎ}ù‰˜ŠûÆÀfíú‘zPEn/š*w84¨M›ŽmèÁ®È kܺl7¨5P]ºÎ@hãÆ)ÏÚh†’š^#’áHAÝßaD±ÇþmêñUvƒ¢3:{£›Ò ¶œmû¸AÀÜY';Û5 Ž;ϸˆ +nÚÍX“SLB;kˆ`NçÈt=iÍ‚c9Ô…v-ÉöCázèM7au‰4ABkÞñJg£¨©Á¾¤“IÒV6(ÝI0kQqº>Ú這Fëz§l;.²&.ªÙ[BO[JX9²]ź`ë+¢‹ŸtÉ×V}¸+]aùÚžCõ¨^¬{),V·i)]àÁMž¹döe„TÄÄÈmøÙò77­nsÐÆ®ÜDꦪÈ\Ç 7[¨Kf‡Ô¶ q#ÀKzß5²\g;´™êÙÈ…›âíòR*Ê©ÇRo‡‚¡£Kh]í ÷”%ñQo½.éÝçXh(ÒÃ}jTD¸Sçî€GŒ@[‚ä´‰»òJY~Åf]70 æ‘m¯ \œgÏ`/ÙÆfiÕ=Ô¯@çj¸Ù·\³`Mº¥×îá#0´x)/ð컺='ì™°A7UÃ%Ý´벊‹ö78<{ ÕÜo3IO¸2.‹Û`éì!XÛ¯J­,Z3 Z»£À€Ñ|[  ²Áýã[]ïÚ"Ô7'ñ² BÌ%Ü4AÌå&X 4<Ñø3ˆÀNºÈÎé#’z½ p.VìV¦UÔ]oç¥3gí=/áX¬t˜®8Ò;æZÍ·uË)>À.Q¦ˆßöÚaÀHzàÎ7Gñ!ûÞ€5 öä5£ì ¦z17¯G0@È -‚¸‹‘»T–»ˆQüj}|ÚÂôj˜ç»–yl¢¤ž=é=ÜI‘ÞÁ0íÚ ¤N†èx‚#RŸˆ}×ÖÇw·À Hk_ã>tnZ£Lw;Uplê¦{ÛÖÀM"jà[†HgôΟmº—Ä»%¬n %µ¿i¼’ð¾=½¹3LÜôyÚœ¾{‡AˆGÙB5ýñÛ@‘ÛºåæyAèœòø¬J`Ž;v {I&gåštC‘P{áŽÑAdìY3ºxTI‘I÷ƒP¸óð¨ÿaDc# +ì¹ÒÄ()¬lu 3 ú¤#‚…X1 +Eb â³­xÞÊnFðøt’p¿<>®ƒa +^½Ómp×ÕÅíö¦>Ù%ÉS·wÈÝKJxÞ±G¨ÝI°á‚9Uop³ë¶¤OÝQÄ)ÖG 5Ò'´Oj¤º }Éœùµã6x[Òç£i%NbáÁs{ +Àf'@¿hÀö2w6WÅG™™9ä¡(X|ûNîŽT"Ð#2&è­ +t¸—›Ö„€yÎÄ™t„Åb(Ü[˜mñåqä¬ÑÚ¢1³}¨úe‰µì#Ðv”±ÄÁ |E`œ=£½Y|iu‡0ײ/#wŠŠ%Åeä"\æ Ð}]¥„Θ’ïÒﱩ<3ň5 “02³ÿA`æÑ:Ð;:èIšo`šH»,¨ñ•(ºÅMƒmƒ¯… ™ ¿l›²ñÕ8¶w‹%ŽYH/i©=sšZD®0Ũ‹ïáÑ{”–·äT„r%îN=c}Æ#·ÐÛâw-Yap×#ã2ôPŒ¼uè•~QDo + ]rvjÁ:T1ã=EE‰HÐ tmìHN/‚ˆe¬|Jó•{S ™M­F™yS¦“‘rÑhDO ,݉‘Уš,E(Ø.k¦†@I1^¼ÉlLeé¸~7r!PQ3¡çZ4X|^]¹BÓí(Ô5Q–ã_ï‰)kVù=Qi#éZ=QK,eÔ|ÿ–FÚ(ù¾¾¨býK½¹s\;hÿÊÃ07¯eh½Ý9;n7ÛG_Ó袮”⧫„ôÛt ]1>h4k)+“Ÿ—k“tó$o´Q³S;hô'íÑôóéz‘Mþj÷¯cÖÒu>âšf-eš25fi—·©1ûezR÷Ò±_·ç&UÄŒÙp™XßÓµ,£ +?qKíRÊZQ¯zPuzZÿß^’kŸÖßK™;™žÕ¿‰½„?ú¬~º„rä¬þ÷ù×”¹¥k8Øt-Ï¥•Êa·TntÏšµýúi½Õ[¯¥Ñ7]͆_² +þ éÉÄ?iS”ѦŸÉu>]26Tw¯ÐˆŸ.Zºã:ðÿ)×Z­zs§Þ¬ïO^¿ÙNe£D m[~‘…T9JÄ;R›íÎz ý“FGt…$锈HÏÚ\?=JW~]ך.Ãw4]ë2êŽô&Mæ¼,]Ù‘ýSE5Ñx%{÷¿Ò#ùðZ«qZKgëÿa£Ùœ¸U¯KWÊÌ~ÄÌöj‰[š×¾^¢.ÿ½­5 4ðë0&ÕëtQd§>¤‘öéì_6ª¬_Ö_×ÏÒµ4z⃴ôÚ7²ˆÓ$¤vpÐè5¾LFvêº8“*¢bIƒÌm½}0)iÍF«^KWxLÁТíï÷Oû—7$*î­”­Y‚‚!Úh膞üd‡¸&~…ÔMæ 1?õM{é2E×Í–R–c\#[J׺Œ)Þ]ýmé +F¦/hÛOׂL›aR¹,×i† SEÉ´æ×k†ÙO×~Ý´fÒX ]uÑßí› +¿ËæÍ1]ÃŦËjüöí0ûéÚåºf$š~=™¸&mŠrv˜”ÉØõÚaÒXOÛa¦í0Óv˜em®Ÿ ¥«$z]ך2#~4]ëò£Ûaüi;Ì͈¼Ó•¨^×<¤L©®aÒµ.ÓýŸékõ.4:“«hÊû»ÖþƯBÚ¶—ÏUHã›H®ß‹òc»Y~û·ú)#ézo3LÛ]ã šÒEÈ÷½Ì°Ôn7‹éëNŸ~Ïëô¥ÿ ¾Iß_ðë¾ìJïÓJW p·i]]‚'1ße½Ä»éâÈô5´S‹6µhW±h*U$¥Á¢¥‹#S‹6µhÿŽE«wÚ—E»‰-]ÉO5h\ái„6µgS{vsíYºÂ‘سt1ä¦Ú³´w’|Ǻ0®´ÇÿïèKrwÓÅ©Ú¤Fm‚T FÚÔ&]ܹ™jók¼I«S?m_öZšé›´~@ˆ9þMZWê ö³þæe} ÿzYøû~†ÿ?€²©¢6nþ•_6ù›¶ü”‘3æU[Ó7T¹×á;ªREÙô U¾–AÛ—YÔŸýzªAÏvV¯õÊ›’Fë ~Øh5R¶m— ã÷=û±—¶ï6ÿm¾¯tò×€¥m‰~ÈAtås×8RjŸžµ»t¦UW;F”lö/¹åfÙ„ô)Ð5ÞÆ棑3\qçè²ý‰ÛF¿½AH×Á½ëžM«¥»¾eHcès]»Pë4zǧõ^Ê ÞyÛÊ'—lñÄ£T‘ƒÓ"ä¥O+!þ!“êPº¬ÜɈâœ\ÒD”VBø}èôtõ5NW§Ök§ótéD{‘[êÍ­fíënÊXú»’%õÒÚiü•^V¦ËU%(˜n'ÿ@c9ÝNþ%·“µã†2ó¤O™§[ÈC1hÊÈ™n!_@ÚôKŽ¦[È?–Æéòt ù&‡Ó[G!iº…œ’®±…\nö»õ5|O1Mãk¦iܯ˜Æ}­7›í¿uêõÖ°MõàßGí_íf½÷ S?xÐîÔZGéZÏi~7”ߥÿÛx§ùÝ4¿ûköCó»¦ –öñ[ÒEè4É» ªOÙê­Ùw—¦.¸ª}kœö'i˜®b«›ý ÛëM˜Èr•.ªÓÿÑG.¯”Ó˜Œ$U¼ù º@'ÍçÓ¸HÀ qWqÊC‰Oªh¦c$]»Ê +¦«=b`þCyŽÑ¡R»¥Ýô$o„†+(;gõ}R;ÓºÓ´îô[Ôl•ÉÔlJ—Ÿ¦u§iÝéVxZwšÖRAÙ´î4­;¥¾î4q–Û¼ü[~zŽ;-¢M‹hç±¥kó«´2üõ ißQyòoNé‰äªòÏ “—.RFá㩼j&]¶h”ŠPF„<5UDŽÖ¯®ü:ÇåQ{ŸV²¦gåÇ'3©"è·‡F³ÑÛª5.s_7Ë"¤ù4ßoR¹©:}wÆ9t¥+̻ƻ3Òµ£xwg¤lE¾ÿÝ)#äªïÎøõ|gºTäšÎ3•Áuüfzóƒ©ï¼núÞ©´Ó÷NýË~óW|ïT:½õ/ñΩKÌÈOß¾sêüŽæÔ½¦æF¿sjúî„T'7é­«“ôïH—¾Æû6»õTö]IyÚš ´úAúdî×o³8ø:!-éúÎKœö!—„i%äŸizóŸ¥7)·6ä9¿âª¤}+òF&ž;ǵƒößÓ7ÿܬsššMS³ij6azªHš¦f)–¦©™£%L!×HÍRFÈ45›¦fÓÔlššMÎØãúåçã}vîÍ¥Š§4ûAYþ»q0ùáH‘2’ìä)šÔ¯.ù2]ÔŒxÖIkê(ùg$p»BQ#]›8Ó¢Fê‹/ú½~³ÞÚÿ¯£³éû‘þ=‘ümÞtØiŸNÚL™O×a3õ¡lpâ—z¤ÿA½öÄ “®o:À‰’2}ÝÑôuG?cÍ~èëŽöjÝzµSÿÜ_I”?}ÛÑO|ÛÑ•£3Ù‰˜sØ©í÷jÍv#eAÆï­Èï§+ñ_ïö½ýãæÄíµ­öŽ¾'UÄ 1Ha«º öebSö>“äü)»‚ùLmÈ9DÃwní§¬qbôlߤo`K™Ñ0Õ’+ÒS}vryJÙ*Lß»26¬JA¿wåêb;Q±µWKÛ©Ùi©uZj½–½¾BÑK’¹vt¥Š¢iq#»c~tá¥<øíBÖÔŠiÐú[­Wë­ñRÖˆòzkÒFÒµzkRFËwwÖ¤ŒŽï뫉ƒöÝK^3Mø¦ ß/šðýºûF©‹ä¦)ß„¦ë¬úNùÒEÝ4ãK˜f|ÓŒošñ¥‡¤iÆ—>:®ñ¥«î:ÍøRŸñM_ñßçF¿Ì‰ÍïêaJÝ"Z©ïxáEºÒŸé /R~ý×áÅÄö M—"jF,ÂôÍŠ?™«¾¾£Úl·/‹ÓoÅÒ÷Eß箉˜SGÐ8ïÿuâo©=D13_³y¯YÛ?y5 öYm¿Ñûz?m…QKܯSFiV®kÔ|S¾V¿té÷»l{W¿Ð£”>!¼ê)•²ùâÉ5û-ÊÿyM¦ÜÐ_M½f æ©3¹K„þê”–q÷µoÓþäe|ž®«›ý Qõ&Lä*ïëLשÆÄôô>Ô•â…4~í´têå“Oô;‡µýúÎ~mâ´"]6f€AâšÖI.M|:òþ>NÛÛ†É× u•L׉ãùÕƒŒ +•Ú-sÜHòFh¸R´·c¿.uîýp/U’1ö¦ÑÞäÑ^Z¿8ù×ø~é‰ÄªòÏY»UŸÜǦKIG©OåŽ$F‰øM¢Ýßr7àµ÷i%kÚ>Ž²ïü–F¾5=U«ò;õNlRYý»¶=¨u½ãÓzÚÞÖtÞîàÉ%í q§}ªÈÁirI$šÒˆ§=DȤú“²Qœ“KŽ¯§•>õiZkúÎTÒt·™Þô`ê:o„}û~×™2B¾ßu¦,ø~×™2B®ê:§_Òøý/H}å÷ÈÂ_•‡×ß™»ÂjNßDôo/êµßDô"/Õ¾èfn0þØ¥þ´×(äþÎZŸX¯Á n¸}?%"Ò³׶ì+0‘î彩0ìëNJÝÕh)GO`b#žõì5î'IÉDà•,Æ/õ¢’Ôf]?d£1}dé8›¾âã¦+Ñfº ×T¥ÔÒ5ªK¿c)]1ù5ÞŽ±”.cpå×cü:{ŽH êÊ‹´½ïôšúŸÎü:)·×ÓV¾_0ÐNZ‡tD¿¦yH­Ùû!¡¶Ÿ²ï¡½F°­=-˜xÑ©µº‡?áŸÕ~k;š|…*[¯¶—2O8®È¦gùê*å–MW~€‚«½p ¤le*e©”²|õ²é¢ëZrVœÊY:åÌ¿ÁæìßD߀÷¯6:éZù_8Mýmë!¦ ÿ«‰ZjUèúÓy4kZ™ö˜^¯›1ÅÆèGõ4~·¡Ö+\h6SÅ•ØDÿXÎ\íÛŸdʾ–ç|ûSÚHºÖ·?-ù)£æ»¿ÿ)u”|ß7@½n·Ž:µ”9Üé×?ÅCí×?ÍV}o·Ò:p_… ‰Ývk (Ò/fY2àbý¨ÑJ~Ù8Ó8„ùhçëé^» "Ðé´ÿ^ÌxÙü}ów¦¯//»™ñòaHó¼d2®7,/÷y?ÿdßÔ2qëØ›¯ðË3øá€þΊìzöÝ/{€è·3K2ÀÝ*ëçe¤²§1(È+%=‘]Ë0–ácx‚ç©+¹QKñ°FØF÷Žƒ%@ÃóXËfæva}{K8·»°„³À? m* ûûýÓívÏöçvav3/3Qva1ûæõÀOc1K+h°(| V½ÞimÃÒt{ô…•¹¹]6:ߥÔéÅC¼ìr±ÝnŽia c¥ß80¢dgH³ŠʈÂ÷HSh>ÙjöáßM­p Rí½z¶Øéw³ëµVí¨ÞÉnvêÅ‹?ËšKµf³qdÒ;ò¶œ•Ù³^>[mÖzËv(ðt³ÔøÅìRf!\:®uöÛµæòb6of +¤ ÌóÓ{δ®xÞ‹Øu)áBE‰ôöú¯f™äXbŠÄ­EÜWXξl¡=°c¶átÁÜó üLê˜/U¤"‚O³z|Ð|?Ïý¤ø›üôFæ m¿£¢›Y~ÞjÿÝÒ¿ ïØѯ—õݪ´=üR§Ï—u Ü„ûv=äG£•5ªöëõpÞËvˆN^5º P0D8Ša§WÛ?¹†b­ÛØOÞÞiŸÔ'¿Ÿéš›{ã+ÒÛ½íú~Tí?4Ã,²çZoß4ßzÈAƸ¤l&»ÀCÞ + î*»¼UëôÆPVj·úÞ$D%±\†æìºÂÝrqżÜÌÄíÔx]äGì2Ø¡Fö:+ÿ²[¯|©·6&äºÑþr§}–%mðϧvšqùZã 4Çè(Œ®[ZÀµü¢Ñ»œO>Mÿ¬Öè$k {Í–&„åÁ#/o×k0æ¸ÝùfiÖcö»ýűÌÎC”Â0LQAÑ‚þÁc ¬M>ò|%ˆó×Y†î~SÏ‚I3Ä/êžõ—zGg{¾çè Ö9A €y«æØeÿãðb›õÖÁ’]ìʆ æL|ÿ¹4e–+ÿÔ÷û8ýý>ÓA#ý µ~³÷!a§w§gMg§ÏѬíÉ% 0qœê[Ð'j“ÖÞÜSìk.uX[µfâ1=õ­½‰'»ð. ~XÔD¿ù–†g¶öG¹²ðZ¿9R6¹zÀZ‚Ó"Œù(âQj†ùnÈöJ1»]?°¨=åG¡vëùHI_„vñØ·õf =\±@Aœ@ø’ãV:uH¡Ì0éæ&°àQ䈣ѥ¯5B~ 0 Tä«äQ\ÄÄÎ f*Š<¤<Â=îf^‡´Õ«Ùñ¾Š€B¤.£y±€ |œ§¡¤ +~äKa–”÷ÊÀ¢|èG<»òGÙâC!‰mܪ4‹}Á„ÆÏW:áñ"¡?Bd8Uß‹BÇøÂÌ-­œŸÿB/FÈ|ÄÃE(BÄ>÷¤ABB†*Ë?d˜frB(q‚8áâCB!}nçÃý0SȸÔ0Ÿ¢if&†¬ãšwœV: "Ã0 ãZB w4œ œâ:_¯,cäÍ^äktš\j‡F¨!VÖBç€YžŒH`„‡„F8=Eø¡|éê¢À3©1ˆ +¢a —ñ‘¤0ÃAƒOê…}@RÅC©÷@˜#>Gf‚ŽçÌ L€A¤§%ÿŠøthõà\RKYhAaÊSÒ¬«ðmóQS’È<ä™$­@Õ¤™Ènæû´†Ž:#È Ž8ßwˆB!p2^ä…zVBR†g,0ÓR ½ZÕÈ´*«/²ZQ õd6°_!QÆ”"ƒÐ )Äl°#ª8+ÆH›Â@rÍÉ”c«):­JLÄç8‘0$nG ,F»¥0å."Í[ÏÕ)-~üâÅ´3S€Whú„™˜6×°^ _Zç„d£„i.’ÔsƒÑJ½z4ê8!•LOÌ„o•)2¢ÊXˆr"bë3ÄJ½‡J ‚3£…‘”z@9ÐŽ˜€Už!,0?dפYÒ¦€Ì¯/H›Àü :MTÀ<-¾úÚ&ƒ*/ÔKëx$¾ R9£áƒ¤Šˆi¯à…ÓòÀ­ÞÇì3ó#£Áˆ‘{ÜÍ5®‚'Hb?`Ì+<*@ñIº®×ùäåX¨Ósp¦í7¸Pa¼t@â¡ÐS ÿyÀMÚP˾ãXe¡•pr#½@‡– zÚ†+ÕC Ð8ÞKt}>Z;g¹Y8àvÜÀm£a`Ç"m·«"CΓ® +].ièR"€Lø)p?Ô¸À ÌÙ4» ÌØaƒ4Ä©jUÒ±Qƺ…<ÒœWàC#†hs\áüôãXbuЈ¤ÒjBF“û2’\ËŒÃÍÁ{iñ‰ÂÈÓ«b9 ŒYÁÙëR‹Å«P}írBFhãFþái´¡ðàgí!”¯›<'_k}GÒóhÇ㌇ J/—`®µ_ä óh©™`×ÝŽ•)p¹PDµßv‘¬×÷nÃZ}WS¤Ô1‚óŽV!A•bÖFÈÃXâ«c ðFÊ(aàkµT ÛšŒæê“ZyÆü¬š¯\[]£LŽ Ë.¬5ZõZbÔÚA¢C<Üñ¹iž#Ðãb13æ‹ÂÓâ1"Þ†!%¼âÑ;Ο&»ò4ÙdÓ¼ñèˆØäÉî|î×:õnÖªp™ë]ñ‡ìÙ¹·–l&ó³[8‹£ÌÂó„oò €Œmž™ßCú›ßú]˜ßý.Íï’~Wæwá|ŸùÝ…º¡ùÑïMˆ~×)îÆ1X†O[E—VRöx•è¤‡É„ÚU@GÒW=ò»¶‘¼ä6¢ù?·—4´±`><ÿ!vòåö~ÿD¥\ëÕp¿„~×[%ËC['‰Á¹Ý…Ù;ö’ýιÝKz^æv£ 6ÿô&ŽÙþžÁi½W;€‰_µÝ\0/µNw{vêzô§Oâ§Ïá¿äÂ9›Á£b{î./~to”–ûÝÀP%þã…˜¤Áã=—Osa¾ÕÝÝïw{íÓç NÌù¢ýøaˆ†ÑåÐÜÿ2y ‡Ý´‡4Ü›D¿S +€v× ÍËxµ×Ðí~úX•¤bTšíý“úe 60®ÕnÇ…ŸHÍþß”‚+Ø‚4+Ë„L¤½{ø÷Oó€Ýfcÿ—pšÓ¬»¸RIÓà”]³êÅó T—R2ÚL‰¼ÇͪÃtQÃêÅd)ÏŒRF–kX¦êë¥-ùŠc¡+m$}Ÿ\NŽPù0Šw°SBÍ?ã¨Ùk÷ >\«ö6;#ÝŸz1q®» %TðŽ¤}Ökœ6¾é½^ˆF0kþyù]¯Ö9ª÷~ú4¶6V˜¨¶;§µÿ2ÍüNÐÃw7œÕ:ö´7K„'?*¦‰y‚0ØKañÄG‰jµ×±¶X²ßÓy³œü(qÐݬíßÀ5KN}”°ÓÉ×la¶ªÿ¤/á8Z»+5ñ¯Oh@'°¶?W!£21è¯VË“ˆüÈô¦ù™ÿŠdþ(ßðÄÿ'pûâÉ'vCtLw¢žV·jX0¤Ýþ^·Þ«¶[½î6†—Ïë_™=0úõqcÿx«ÓF…s#]¸20t«\ÅfmÀ¹×h6z_U«°êûY··²Ý?Ë®ÕZGýÚQ=»Õ>ëŸFÃ'r +Þ^»Ö9÷rêd0eÈÞ*lˆÄ _Ýjƒ;Ù®7_´·MtŽ±â¾Ȟ¤?e4q¼mÒ›ü!άvi²v7ncÄØ”ݳfíëºmžÛ ° Bÿ?U?i»ß¬w“ »æôÍ´¡)hŽouêÝzçK=û¢þO/[9hôjC«Cƒwª¯³ætQöE;[ÚÙ¹h­q¡s×1 C¿=èé‹õµ,¸ìJ{­ñ¥NÂÓŠÐÇÝñ¢ü“û§‰Â…wÁð3:ÝÊéYïk©Þlv/¿eõs½v6î4Öù£×Úû‰ƒaâò)½ªwzýZsdíÆ<£µßì ›P…º?âi»ÓøêN¹p)^vëné/ä¨n‚pÁ—HÀmºÕÛ,yTùŸ±sKzÝh´ÿî^:nÝ4çõþtÀ4 Ï0 w§ö }ˆ1è×òõo$Þ„7eQ²þ8Ѿì&oœü]v“µbþ¤D™»¸-è]é&aç'®t—ü®»ÔwÝØ»®ÆÂpHŽ.ˆñ5ÄF,k_&OÞd·˜ Ž_â‹ïyïyVYxÅûØxÞ_zÿÎûΑ«Kï“Ãëv.ãÇkg³oÖ·ÆZe0‘ÆÞg!”:l7ñë¸q¥öÙ×l±¶rÔÁ] ü6ðÎdl:ˆ0;Î$¨/÷Ï€šZ/IO±~ ’™ÈÍP=ÀÊl\»2`ÓÇËð8os Ð¡pŒÛŽ‡du’ Þ£Ö#òTÌ——ß5\Ø?ÔÌ OºŽ£51ð–$CÔÄçɨÊË61aoÁ:µû½f£UÏvõyÈQ;¸±ØÅh÷›³ì~›@þÉvêG° #?ÒG‹a‚»Òiì&B+ér•áA6zIFz¾›à©z!Ïìy·%ÒÙÕÖAýŸj£Ó½äI÷ìÔ÷Ûäp‚H[9Å€:Ô餤„*˜leµ8^ki5†ñk;1Žóò‘á['Yàøñƒ+,ÎW«Wúß@l¹ÑíÅŽBœk‚‘ÉUÈ; ­£¦“ƒ%éy—N­î~ÑB5ŽÇç?SS5òÐs$Éq`¼ªà‘I„)Æ3,Mç[T}Ï€E½p–±5½Èðê¡ kŠ~G^4Ö™þ_æ½;°¢qí&¥„&ÊžÕÎ`}»Ó~3Q_äq‰mö{g Mô<=0!G<ܳ^ï_rÇ¥‚щ;J—o˜Z†áPÀô}g3>‹åÚªk¢,r ¦…Ñý€åx‡dùS{/O³Ž IÑðPàÔšMºe¨Z<<ØЉy†u /ëtëíN²Z0vd÷¤q¶~åd²IgÅ#ãðU[1Íܾܞ}ÖÞ[m¶³±…½òvM±A‹RØ)­®†²\ÇeÀs¹\¥m=+îæÞ>zÄËË›O£ÕÚ\çaqçp}v?ØÈå:¯½Ü¼xºýäþæ“^Ô¨®¿ÿn¾íWçWÖξ}û–Ë-þUÎåîÜžÉåžÍdæB¹VÙüÿ§äؓΟ«>üp«ƒ¿¾(ŽšðÃÜŸðÏL¸R|R_Ñó™?ÆÏå“W>/·oë_+í¯>Ã_è_‹<|ðÝ4ƒ_üoÿ>þº¯-„ò3øaaqÿQ·>ÂO‹ñ×™¹•ÛùÂ=øùšÙ^™;ÙàðÓ½ ¼»Rjt_,ã¯z¢²œß^êÂK¾þ´Zªw>ã¯/ñ×¥Ê_>/à5ø'’Ev¼×Ñ¿jZ"˜™’§ñçÕÒᇇßÔÿÔÙqeï…7Sý£Ü/äùÚã;¼¸¼´Uxñ¹;W­ï0àõ‡ÊÞ­ûïʇ·ŸÎ•Ÿ÷ùGÍ2ÍLž™ÓÌ¿[˜Í³ò*_gå[ïî{½ò·¿}›?»Õy¢Ô³Æ‘z±ôö¬’[*.Ÿ>ºKë‘™Ãõãâ½<´‹wçä˜øôVX3;ƒ|¾»«p7€Ÿ™·ŸðIƒÆÎÜÇÕÙÜ…OV·ãÙZZŠî<ùû¼¿R|û¿íÂöÁãùbeyVà|òGŸ?Þ-?:yX™o¿¹³R|¯þ*žÜ?¸÷äóÛF1!J1ÖM3Ä› ÿ`þäsá´}Ô¯þQ]ÝTêùþ«RãáÓûw+ëkþ“Ï÷ƒ»•µê†â·úûß¾-Ÿ<{ž»û¨× ,‡ZÏîvî=i•GQ§ïåËõîã ò¿ÃjñÉýO'ËÏïŠàôÿrh6ëV»O7+{Þ½~áùÛÙCXÉOw‹KÑŸïÊ««·3sÅæ“&/6åÜ^,wy¡³¿êß=‰> zÌüù ž¼Ö.ìôsÇw‹v¸Rð;KwŸ”nïÂ¥üLùpé=/×× /©YËoZ†¿åfý¥Üìòþinæàé§\®üZ€ÌvJ¹Üãg=œçŒ]«Å;fr‹o>çîÜîh×ë +#¬Æ.|Àßf« íÐû¦^/5ï>é.…øÑÊvn>73ÿá~nö^y#w‹ÝÝËÍ ºó7%ÈþíûÞJnáqó]n±²ÓÎÝyþ Ÿ»ûçL1wïÕÇW¹¥÷•O¹üÞÒbnù¨ñ0çný™ó»A=Çg{·r¼ÿRåäüÏrêÞìÇ\àïvrá“už‹ªâiîþËÜÇ܃}|]îáüë ÷èѳÍÜãWrOZþÝ\ñþr®ônv7W™ïÜÊU·>?É=;{Ÿ[Ý<›Í=_êrkµ¹ÝÜÆ㻋¹­yµšûs¯ÐÈí¬®‹ÜKïÍËÜ«þ§™Ü›ö½Jî»á)ïß¼ rÿl¾ÏýõBÞËí½ÚÞɼ9»•;Ìœm…«ð”Þí—jvf§skv^<>ž]l콞]ÚQOg}þ6œ•óüîlaÓì=8œ}²ýé³åg›³Ow¼êìÚ듇³[ïÿ³/>=\š};»x{öCt63[ƒX~¶~´s:û‰=ÿ”™›mm—Žg»ó…£[3›oݾW:ºu÷ãÊñ-ïÁóO·dîåé­èýîç[žŸån•Êþí[OyaéÖúÝ×òÖö½îÃ[¯ó÷Wn½_~µu«vöÝ­ÃõçÇ·NþêöoõVòs¹ý‡™¹¹ù7kswû·ßÏùµÖœêîÎý±1ÿh®èîÌ­ÿy<·þüáâÜN2÷v¦÷fîcóäóÜÁ§†šû´û×ÖÜÙáþé|î &æoŸü9ŸŸ?=›Á̃ùû[þ»ù'ÂBfn~E½z>¿þæ¤5ÿbþÞÃùÿý¹²7_óbþ¨.ßͷʯóóý¥Å׷绯—n/Õ—ßܯ>äo?øóÁûÛÅçmq{usçàöÖûGo¿n,œÝþØ?^¿}¨ÞÞ½}º¶º{»wòä1Ø¿Ûæò‡Ñ›©û ?…½…JõÁ›…u°Š /Z;ó ïß×öž­-4‹žZèŸÏ,Þ.Ö÷—Kw·ƒµµG‹?vó‹+ŸËÝÅ­üÉÁâ›g¥×‹µsÏ^ÀS?7Cyg®üùîüü»Ù;êCùóÇOÅɧüVýΟóíÚ·íúÇ;ܼ¿sÒøðîN¯½ûîîââч»,lïÞ}ðtfïnù/ïðîƽróîëõ7»µ™îÜÝOëaþnof;ÈÌÝ[Ø-ÞcÕÕ{,µßÝ«t«{›ûÝÙ{o?lñ{ûñʽӽ“×K3­'KKsî.÷— +K…ϯ—ž7ÛK¯ä{¾ô×û×ëK'ùíã¥þÑÿ¼üÝâ»õ¼šßk柟ÁSòÏ_-¼Î¿ZûãV¾öüåÓ|óY«¹<óŒÿ±¼´½½·ÌÊåRÿéÇåÍû=¾ü¿—Ï>.ƒ ÊåÏ[÷¼……Â9{â=–µª÷¬·5ë½:*¿ööþäÒkÁsý¹Õ…µÌœïo,.ûwýÕš·î¿lÌßóKm¿õtë›ûÜ(0öðö]ö¨]i²ç¥oÙ›;ùAnÀ>¯ÍÞæ‹åWbñ/^’½ä[AñÿÝzÂ?­…bæõ¦—™˽Ò]ñð`^<{{wF¼¹s«'êoouE—ßêÊ»'wz2zÌÈ•RiN¾\Þ\”ûKGžü|ïN îÜ)>V¡ÿ×SU-.ï¨Û;»j¯¹ÐTŸ£·óÁ÷BÑâAüÙÊÇço‚WØIpÐiß ºè[Ö7_‡<}z>/Eø¿G6ÂÆó'Ÿ¢ÙÍ',bõç[QqþÕYôgåøè¯ú-Ð÷ð{÷ï4Þþyÿ~u&6ëñÊý·õã³ûË™¹·ž7ÛDi¥ú \¾Ý}ð¢üaíÁÁëg·ôjÞë?¼…YùÇ“Ò§Æ[Çû«ÔÂ÷‹|>üß_—¿-=|tç`ñáFíxÿáî«[Ïž=“üѽ•çGË{m<¿³úh÷ë°úÎgó—–J'mt><Þ<[Ûz\«Þ+?îœÕ¢'Ë›+ËO +¿ýdga.÷äàôä¬ûøá¤Àkï…ÊÁÛ£Âë£×‡…O·kÇÅÛœ|*FöO‹ÏϼNñcqe¶xÖÙ¿›™+å7îðR­=*íôzÏJ‡{+¯Ê·ÞôÊÁæF·ül3Ÿ/x}\(Ÿýµ¾SYžÔ¨Ã;‹•—ïs…JãÎéÛêíןºÕËÇQu£~ò²º·Ùë®äî/>\‘KáÇ•ÕÅ xÊʇ¹ýõ•Ïw;O½èyéiy«sòôÍqåÑÓÓ;Í£Õ{/ž?Z-,.~Z}ùn¿´ú)Zé<[ì³gê³wŸí¼8þðìøUýÑó…ÍwÝçÿ÷ñÕsH#°—ÞÚBØy»öp—3sk;· wÖŽ_½û´¾èç^­?jKë/^6Øú§âƒÜÆÝàèx£ *ï6^ËÙÓ?Þ—7óëÕ›åÛ|7Ó¿·ù¹rr{‹ý?y﹞¼²$ +_÷` ˜ + 2&'c 8€‰“ÓÞ³æÇ\û©ne! Þß|Ï9³æõ©©ê®®®Ô]]㮥V¾ýÜ×:»ö®nþíëáÂòºþqØL¶úÈÍ8ŸþñtKÿ†ž^ÂþÛ§ùÃs¥áÞ<7Šþ§^£ýè\5Íןîf¸yoÖ¢ŽÇæÏnÔ{võ_,Ï™»èó{#UÞ4cÓ—`;A¾Ü“÷/£›üï«3Ó˜l¯éŸÑóë{Øvýº%óoLéë÷íÑ툽ýLïû-÷·5ÔÊ}=÷Z_TøÝ܌ޣãêí{Ó]¾ÏóÎê9Úº>îèŸöÇ ÝK~:}ógÖ6yÿüì­’_æ/ßÉö{ˆö¾žëêײ9 µ]ÆÒ~4¿Ú“ë¹ã{~ÎwÊ2Ôé¿ÝßÎ@yÿ]ÓïöǮߵ–{ŸÝÛÔËk÷=Ukt÷åZ½{ªÕz/ƒ—Zoãê=õû“­ßØ’ýå]¹;`ÝóßÕO91ÜÌÓ—\:4Ýþ®º³x¾žµöäp~ý6OÎSñÆ|Þ¦ +•…ݱ/òvòsÑ÷‰¥'äÛ-+%úu9î%ã+Šx´¬jÎ÷jé6WL¶uø;\¿–»×3ínR¾¯—MÇ*n¶Qä’‚s«HÈá+”{ýÝ ï÷³Ýd5¦å®þ‘pƒA‘:Û“Åt¶Ýùàh_w¶ëÏ6ÂABC­Ií‚´ñdÛŸÿ3UFÄ5A‹qæh?F›áz/¦|Žôd·é®¤ñ _è‚Áp±=}ëÏúkÝ_.ø+XmúhÃ`q”E/Ä"6¦|(H8Ú/ú†¦â¦;äâVí·[þÞÌãØd§×`2ÆŽ|kú¤Ö†˜—:‰y©S˜—R2¯> PJæ%$Wùjýäî¥Nâ^JνÔ1ІÁžÀ½äiÜKjp/‹êqt†Ù—<‰}É“Ø—<…}É“Ø—<…}I%ûêóyȾ¡#ìKžÂ¾äIìKÊÙW-`-mì ìKœÆ¾„ûâë…ã2Ì»ÄI¼KœÄ»Ä)¼KœÄ»Ä)¼K(yWŸˆCÞeÈcNà]â$Þ%ä¼{´a°ÞÕ±£úâYµc\GŸÆá´‡³7}Gf˜Åi9ÓòûKåÅô +]'ÙZÒÛ* +Ü>Þ|¸ã¯ {¬ûæ©Ð7ÞLjSœ£? s¥`ö8ìÙI×·µ2Ï¥ŸýçUuÐ|¡\Á ½w¹ß¯LàÝëIÏ—Õ-ø»±;ÉXö…\ÀúšùÙ_M¶Üˆ¨ôTYC‘Qè¥þñ™nf}/ÚH¥í¢_©ø´ð•Šn}swÎcÛÅÁÈdÃÄ*|w÷¹Ñ×kí¼EG™ñ.;½“2r|ßäúduŠßÚ_Y8Ðåm¶ýÓ^§›5ÚD0g¼á_kºáµ,Ø>¼u{“-òëp÷óý`Ý‘:±xÚF߸3žo´{ð\È÷®äKÅ2ŽõûÝ)ú4qçGÕ1‹™$üÝÐfbýŽNÚ•Aff»µ{7îÏ}ºÚ¸Y£þ;S±Ê˜6Ù˜ØËW*½èÛçîÄ}Ìš&&²Œ()@ìç*Û [È> ½ÒÄ :Éú»0¿ä}Âáõ 3³PmÎŽ Uµ¥²å¸å50/åÆ’ e—mwüeð¥z–/ 6¹°Á€’ŒË‚¦äƒyeê D§dfêd¼k¾ ªùe¹Ïù»ñ›‚Ùý¾AXô¢¡à&&Ñ».ðgw²ç>Å_ówló¬'ÿÍ£ZTX÷p'“y•»ýIpp^ñØà÷¡gRè0À{Ì9,Ð(S:ð%v€t$žP£a? š3¹&5Úk +0ïÌo?ÝÌýºs#ÿÝ:ßíÚ­¦÷\—rdº9îïÒ5kÿ>ݤh˜ýtè«eß Þóoß·{D,×ÊØ´=…g¾M‰Ÿ°Ö27j䘞¶ët'-±Wv†d“-ß!Ý/™À[¥ÚlÆÏèýë-ž¡pp²a`ò\wfi+I)¸”î<؉E L¶˜;±wr32CT‚QøS$&,œ$Ó[¦bÍÝuºYÙíI©˜I Ýù‰ۘѳ&ȱµo’VÒiÿ7+gvÌ<½ç{DÜ•n6bXKÄ„Ž°äˆQ-¦;s[Üû]@+õΗ+ÿ†ºìÚg'4ÜXÏïÒíÌ}!;ª„ ò®7(dóž*sPÌ̘ī›ÙUï™RÓ’PôÁdƒ^ sÅ©m¨êq¼ÇHŒ¢¯ËÃÞ*Ûõá“gW\]÷"w,ð  H¬¼]Ž²“í„AÒÒûQ£œ–rIUl½™ÃJ~r"öºw'*ïéÏ'È1ÞÚª®â®3˜§ß•œ’pX#{‰I7ï—?©—f¹[ȇëo&[ÜMä?r¬òžåU¸a¢o0çûH¾?]ßðð™uYÁ|óa¯‚xLØÓO³•KÚ®Þ-ø³BOc—/}×j,L6‰çßwRÍÐÍc¶ºn’2•áºÉÒö¶L< +§yŒ‡2w1„%ì)Þr³ÞOešFòk(Ñâ2ïiö@Åú+,ì7«;™`hü–Û‡žÔhhfÔ¤™»»+y ñ|Љߢ±ü¸lóæ}Ê–™Uš«q}†Â·W õÒó‡j¥û'²×~NÓ7fkžrZÛY²˜­¦Ð§$°8™ †½è-éqdo…gI“Mþ¶%~†¾fPÌââ¯L£JÕÑÛþµ€ ‹žeXP鸷 +zsOTç}•GMâ “Qsô ' Ê F" Â'‘:Ÿ~ÃMPoj¸K¸0€“f»‚†Éu +Q§‰žÅ00 ¡$ê²Rü•£‚Øÿ&†ÞâaÜŠ¤d£Î±T\üÄê ˜ž–¸d,âä%u§ÖðD(¦ÁdSLûD,6¦“œ <*ñ+%`.Š}0Ùäs™Tc9Ý)a»Œ? £b‘Š_YSe lW…Q‰¬¢äYv,šÄJ°#Å+‡'GB3jü¨FTÅJ5Ù&Ãh•ƒ¸•÷&+þ¿U åæE\wŽ‘ÍjRäZÜQ"­²TbBk‚ð`™”KÓƒ5JjItù“fÑQ€T€xhÂÒ< ñ„°‹ pŸ˜0é|ÄŸXò # 1/¾ð_šÓ{‘ô"ý4ú¹³òn¥PéæËÝ¢"É©ÉV´;@“ ƒ‘Ø&ûº-^èìš®TŒ¨™Ýù—·¯Ê¼V‰9!± +”^’´p2r XóT°[âš‘pXî2ŒL?燦7Š½W izj­`?@> 7vL¶ð²B„ò^Ï(»»]¤X2aúiÑxN7våyÞ]õ;äog…TĶâŠ'§è|±ÊÍuú1›©!†³®æ2€Š¬0ùH%ÆF(Ö~J‡>+O¹ÊÆõ­ ,}•Ów¯u°“¹ž=Û¦ÅíãpÙ~U&jûÓ'ø>}ßAßs@Öï; `¡Ðó×ð.7ªoþIíÌæü:ËÚÛ4uý¡ï iºB&›Ô9 õ°ßÒ…Üïk';ùeü±ÑÜöö­‹š$¿C¡§ÁuÎ+ÚGœÛ˜}‰ €“9`ÿ7yŒKˆ$s?^ç-‹ N'¿ÁP{´gÇîVÖ?I&¢Ü\Éé$óE¦Àö¾‚胓ÎA­„ÉHi +TYžç˜SÒ-§â&Éò¹¸j¥x¢ý/·þ%L‡wYÐÀ]øî$#¹b+4w˜Aß]fzïÓ¾6×lEZÚ™)•0‹/„@ÌgR"ˆÚïb´<>Ü™µ”¤Kwå«»o_ºkA3”ŠÝµ®Á}›å°Óâàæ%±¡RÏæž< Çž"–á ÇnÇÛ=žäH„*`iwDs›ï¬È^*öl÷I‚dTpvík¿éæs·¢3¢ð™¢¡7%¯ • “-2+,GZC +-›üê•3¸ziiDQý“¾ÉõÃÆÑÕ+éZ½?ÀÉgm+ä‚ï”;ÙúrB4àåKÀV%«7SíŒ1=a^’LeŸó= ¼ø̳ ¢šÌua‘åBƒÀ|ÞÕz9Éùßb)žžö¡Ã&‘0\„÷'ý·X4¹ûôS3µ>ä Ë6;IÜoSÑ‚­ËÜ2oÅìCöåV°N¿„â“þG®Üªe¯Ôî`âÛ3(¢^pTn«‘ÒgaÇÁÜ$ú€Ñî˜Ø5=ÊýX¾¡èÊ—shâAa« —ˆé>âN«­ƒ¸;žïùßWrË›íY¸ycm:–›ŒÏý™oÿîú8yHÏâ.ß˸&[ôÞM¤›Í³ŒYnËØ*¥âØ¢Ê +aþ맃”,…lú LÄTù äXÎÓ +1C¶·‘i:ßL‡"O?‘ÀwfƒÌšM"è"WÉé]xš‚y^XóåvšŠ'W¯(åbAܨ€f¦ö]%h]?—Ÿ»¡‘rfž ŠÃ÷‰°LËà~ä—ÒuǤ–HVpö¬_Ú.Â{D%Ã懂³UÛ¥ïZä@‚4q÷0È ætÏzæ)ÿ8ýå/+„—ßã d¥ +»¬Àu?,s£He–ë¹&¶Hõ{/¤g‹kUð Ì>ÚÊ‹>dýŸ¹»»¸Ÿ5Õ¨zÃ[È“#G!š~ºæ'ôÕ’¿ég…t2ÃØVÁ\¹;³ÈŸYÍ ´ùzB²Ô—»+_gAZÊPܳ¯µ +)b×9_ô +f—‡öý&BÁÊ¡¿aÞ†%`i—ÃÉ:—¡f¨Íï]¥lòÝ7Ž±‚£9n2w„A‚úò³Ìïo-•+ê»\Åá( mÐ2»o”žuçØ4ÊïnÊfseÖø¡ñZU³`93vc ¾ó¤ë®hÈþœ”ŠãÊ~G”?ŠqÅzàÆJ¿}h÷ö…ï65GxIw™tØSFo& + ¢Ey~r¸e‘ÆÎôÓw¥.Ú n‰‚Õ“d;U¿Î÷[ÃX÷lþYNòí·ñ3«ù¤#`3Ï¿,ß5«…Ol±1ò‘w±e¾Ï8ƒ™{§sZ”ëîÃHw,Åû‚½h+XßóÞVøLwÚ+™}aÁ1ë»îmâ37t€Ð‹“ʱp\‰X/:Mä¾&-‹„ÑÄ…‹Tˆÿ9)ï²€®gÇ©7Wže_ÓËôÈ!; Åi§L8]{÷,%ã—żttÁžïï¯'H#ó½f>(îÕË0¿‡ÁP) °ì]²!TxI½ÖÝ7*û(è_Ozqk®¾_Z Ÿ¹ŠyDH:ÇÁî´cåÇÒ}{îÁX†Qüú."V㌲ +ñƒŒ' øôJFÊD-_†Ž#wþÞUçöàÀÒûÉ{¾YY#Ïùkäçu=+«ÔfÏ@e¹(•eïêq…’I¶’4”P(BJ¯¾¶j¨]B%Y-“ÿÎjÃÍhÈ­“]B’WùZã +•øEñ]uöö烫@¤w= Ÿ<*o÷ ‚*û"°ìí! +°Ò{Ùß°÷‹ø_Ø3ÒåWãàNp—$6U/I”·iHo]IoQ4rÍ‚ s·ŽlþÒåâÉç710%ÁƒFpüƒôf»­KnYMjãV—ЧµxÎb)^Cy5Yàk2ÑUìÆ®ŠQ;¼ú™O}½Ùp8XŽF¾ývK-ƒ¾êÜüÒŸûø[1—»±Þ¥.’–âlµþІ4;ž} ßÕë°díî ÿŸŽÆëcíÓyõ/JÿÂŒ§¾évk?×;}¼l¶>¶^«ÓÈ=;¸}w±XŠœtxt7â¯ÝêP˜m(=ð¬Þd¸@—„ tyM§Óÿµ’v>@ –«ÁþHƒí1ý¥ö\@tã«~ö :{Ѭ..®¥ä–Ù FËŸB”`¡¥Ör£l)ECå}²‡ °b§_ò¡ˆy;‰DU6wÃÍPÞŒìã;àuív¸r«nEñv‹áOWvcœZ£>¯´†:.Þé«d´Øù¶ûžò +Me“Álµ-¥7÷j4¥‚jN–óîfºEÂ’-vg¸ùF¼Å×@ëÝre¸íl8RÞú«-⥽6Ð|#«2q¬µÐkme½V×Kø–µ^w£Çܨº%„ƒäz8ͦèN°Éb´<†y#‰ŽÒäóx(Õ´"Ün0!BR‘S뢴Þd7ï®”ÒæˆâÁ8à׻ɎWyF~Áª6QMjs‹ª]i#SCªSßß |Èr™uW¾l§C-Ôl7™ ·Lª*yh³í÷zÂm³š ù[êb–mÖ ù¾m7>6ÆÍÏq:@ŽšÂAMV\ýÿ­ÆËÍë·Zn©}d õgŸ`öØ„*½¶¼æ^-wz%´E¯ õ­ñŽÀ-»¤´™Dh*±ÕìS¡]«Ê¬‡{0ÜN~Ç(¹Zm|øL=6@ÆKÉmíÚÍþm¬ÙxxD¢³ÀDiåÈ G ¿W½®rÐé›#â~.)û¡T%#4Âå äZ”<Òø¨6ZÑDB;Q éôTJ3>Jˆ¦êjA“[KGžB£ÜŽínÆ5_­Ú¨Q3µÐÎdh‹–åLRÀÎÀÐ2nÑ­±íy†«vÄsA±¯+zÊòû=Ó|ciæ‘«T?ʳÙËÍÕùQ0êY-Wè7Ý$ĸÚz¾ +ÿK\$·ü÷bÛE­ˆ–ÚOï—‹e¼Y·âïï&‹6ò¿¬Á) æ’º‹¤‡å”^òdIó)É]z t""\û$Ý[þËÀ((iŒ\ˆ¦yP˜9†I2Ý"ª# †ö^c€ª™»Ñç(Ÿá6vÝÅ@(Cr¶ìr1ÀVEyX'£‰^„‡)ŽU'zW÷BÓjÊG˜ ,ëî†Íñ~Þ[t'³Ãà¬ügÆ.uVÿ-‹’­ŒR.6ü÷r3­ + +B£§GK✗Qðª€Ã‚ÆD _÷P"ÌPñC€’í®Øˆ¾oTP}‘°jˉayÕЇñ";¥ñ{ÝÉ+šb‡Œ—._µÅõ!f“¾Î ¡«¯Ãªó 1ì5›‹õCqùÐKÖ'á ‰SUrLɨÉ7ýÙÆÂJ>ÝGõQF×9ç›> P©O-k¬1€Z‹%’ ,<í¢QFVJÜý^wWíþ3Üè™ãra§u‘µ}:b·Ê7uMWYÓŒÄxÖ¿_‡PÂÏq•§0pŽ2¬žš“.cµ¡ÔrPÖÞÕÉð?in&sÄe¯ÓÞàJ~b£Mÿ<µŠùæ†[Â]¹±¨/¦ŠR&:šcàà+0G®vãágQ_mùR¥ÿW[¶^wq%5oñå€Ý-zœ,{Ã+@'Ôçðá:w; \ìŸåþjý +8hÈjŒš÷Ó,о”‘ç + ?]Ó^í–Dx5Á›XÝ«Y÷T ¤»b ü!îÜîûcÔ½ò"‡½i ‹m»‡Þ-G"úÉöj¿˜.€Z>ÃÒßLVçš™c`Í_6u£»š?“ˆ½Õ$á3é +Òw/ä:ã4»]näÊ|=”üÔ× Û˜c¨o¦ë—ԃ̎OóHH‘oÏ…¶”Ö8¡Ð‚5ײ‚o(tÝÊ=¨j5^þ»4ˆêN£Ù‚e9Ä%Ë¢Bà%{ˆB¹½,=_¡¶…QÖºXuüžKìÐIŽ¡3:‘N~1à†Žv ‡$ÙÉ€h\ ítþ O¶ô‰êHîdð;ä¾}éù ¿ûÞã¾ïhô‰ +ÄëQZxQ>á1ú¶¹ËäF‘â´dyJts#¢•ÞRîÄ36;éRÂìõÛŸL6³;9›ï³g~'éL˜3ïÌüßK‚Ïòˆo‰Rg˜5Ù6›d¢—ö¬*©»È6.Å_}…å{à%¿ù|'rï…V³H'ú¤+ZpXhkÝõºž_•Ñ.; ]XÑ Ye£êv³‰m›€ÄS&ü; ±gÛpa÷Bµ—ÓbpCbÌ"ØͱìðÞ,šoðÀñ¼ä¦>ÿ6\ „×±_øZœÁ¯[99ÒÏÍ×ýg]i1ÔFËmŸ*Ò¶õ¡j²)ЊH™É]ѦŽ4nvl¶¤m£Ž´F~®©¨KDj²‰h·vϽWipìèÚ[yu¤ç§;Ný¨ôºÐ˜l–çÕ¬ª6V¢¹Ki e,ÖÅÆ™Ð@Új…ÑCCDŠï ÐÍñ²Òiª"-–¨¦&y©÷dó#^ìååsú +œü¹OVZçá¬:ZôÇŒtÒÀò€•ªD†CZ³ÛHƒÁyg%"9™EÛÙ|M ¤©.*XIU¤íÛï'-¤%“ÍJ;bŸêc›¿¶–ñðIi=ëL®­óªRwlMŠHa^ä¬äº}O=ª# ´ZD!B<¨"½.ü„¬OsêQ ©ÉF¾¾ +ce,¶éâ>«…´K=ß/êH‹DÚ>t„Z©É¦$ðÎâ¹å¶¼o Ž¼ùÏiA†ô=NTC^!u)šlÛëÒpÉ|¼;ªH_ì‹M¤qý»‡‘šl‡cý(/w«¸:Ò*m{.¤â u¤«ÊµRÉíK§x½Ó ðÇ#ñz{—SGzŸÌwÚõ¯/U¤_Ó2FŠôËáX[ÁAAég˜øÚμêH~WóÇH˜V ,m§ì]hxck¸ÍH[ÏD~2¯¨" ?x¯Í©//È1@]+;êpH{´S±hœïÕ® #¥ìIGI>Ò*ñ튦Rˆ° ´öwÍ ýÄF‰t»¼IpHw·nÅHÍŸÝ'‹4Ó"ËrAèÙlŸ“fÀh}‡R©ìÅc¤ÙÝ(,]3,Ò[òΫ„žUàÕ4´5š½ÃH­u³éö)¡@ºÙ¤‡Kž+fÒmð7ÊišÛhݧ ïõrøÝ4qöðÛaä*=ß´—QÍ·­:9Ñz;&J߶½øö@òƒèÍÝhüæàÆåûõ; )Þ2a²ÓäÞn§áƒUÉ,Æ×ojïY¡X+G?5߆)×Ó·öÛq·m(vø>Mݼ÷5ßVÝ‹[Jûmïqß*(ÆX¯û½’Ưå›Rüy˾Ù×ÅoŸÝÞ8‘×ÑŠ=÷*…Ú{VÊåÜÓæÛW[ÏoÖ~û™‹&xŠ©¼ÿ¶µCVÍ·¿»Úª¤ùvúBeêâۊͧ…d[ë×Ð¥z,¨ù¶B’oÚ³õ½FUë×7æ›ò§Kóm>}ßj¾­P·×¤6ÅÒfÊêŒj¼ –ˆ|ÂÅ9êˆ)Þº›õí-÷6ë‹+We©ù]t¥Å÷mÀó$÷À²ÄÀþ‘åäÏ·m†Þ®8w´Ð ²¢'³Ü>°ŸdrŒÚY‘‡™5{+‘x˜¿MôLJžÌžÜSýyÅþ›à½±2‚Ã×}Êð’osMÙ5/'ÏÁÏ‘ÙcI m‡Væxm OG²"ü÷á…üØ·=ˆÖëÀ7Š ø,þI¢çétßì¿}^™¸Ý\›l"Zìéh e,ÈÏùPGh½k"%òK*ì1éX±§£‰©¼¾Òi >²mø!Ó ÜÜXD¤ØúÒ +ò"ë_iq&CêlaïUŠVFॉ[ÿHÁë¿-"…±ÈÆú¥‰¼ h#EÖ¿&R“ Ùÿcõ±ÆÍ>=¤U»&RlSˆHÑÚ—¡E6ES6«Ãâ&™}Ì´kïç éÚ×hÉXÖíüÛãÑvÁ1Çwœ´ÈÀ˜?Óœ´swŒèè×yÖ™WŸÝ¬9>“M!þ£9ƒüü5®ÏŸEŸ‹ã1µ"ãõY‡XÆço‰ù“õ, KéÊü4A™Œ°;O¬˜÷$ÎùJ¦‘YÎ*~®O§¼*ÝÁ¸yç8ùbÊS™÷HEŸî&mbÉEóPô´órÑCkŠÓ1ÖÍ–7R +]–ð†=ê´k£»uykôÇ“÷°8Ú‘ uÚµ¼fM±­µ*qvšjÉd;e~‹ˆ&¥Ó­'µµ?(Êå´ +±î—¢âÕéÒ©+Ÿ¸þ1é KÚ?u&›±/_×°8fóËfpaÓ5,N˜¿bm.‚b9ù`…~Áª4L®PNí¿ÃËké;1§ RjÕ]L±Îæ)&—h'ök%Ã|‡6Žë.¹=Ó:–í¿@JjΠ–A«ª ©ÌÛØ|DŽI lõU¹»½þ³U™y[[Os”Ùý؃™,¡-“ªH䉟NÖõQçC°-•ÔInµ|4Œ n–BAu½Ÿ¦äVßÅSt„ãä:¢°-ϣɑe/éë#»5TÔO …®?NðÉÙMIù!#álõµíù$møTF<Ÿ?FP,A³Ž £*>4HYßì0ÙNé”åL —–hÉ}ílújÙ¨(‹À¨¿¯=>»’›Œ]f+g(-y1Ö÷[F›z¯ÁT¹™ÿÚEÉ ; §êøhøäÀûcÚ(r;VzÄ2¾Ä5Ýì%±N\â2b Kÿ‚¶F¦~ù¯ ±È—¸ª×}<º\{m,B¢K¨(C²ÊÞè…d’yEnÁk8ÅÇC²04ÉBâfÿä0IK¸7Þ¼$eW*{¹Z>#¼|°¦ð€ðI•ƒÙ2>W +ª÷1Ùô¢tó +ÚÜm]÷Ad9ëSˆx ¢cˆ“%rSiXÉLéÔ^iJh9™lÀ˜FT¾SšÒ§ÐŽµÇplúý1_ oŸCvGH|±“áÂ>o½DëNý¡çó;Qù úåŒhôêN©÷´d²ép:ðŽ\é#nŸmAÓ‘97F˜Î‘ ½I¡ê´lY ŽBÑÓCR[–‹DÕ¡Í*»ôü<3 š«NÂÉYèï´˜÷á˜ßjÚN¾+jx €iÅ[Õ¢­¬g¡oEÀNX|êþ,“íâM + #åt"¥ÄüŒ®eZL)ѶSçDÛN•x$šj„$ „I­/•hÏ¢Dã½×S,x%°ãÍdp ;_¢ «²ø²ü‰³¦&ÑN^ûçt‰v»`á\.Ñ”Ë÷^1Ý OÆ!ìâøM65k@¦„^–z´tëPÝF xžäç-Áç9ˆ£g—nÀòúed_k‹!ƒ–YÖùãNm1³øÓÄ,{1Ÿ$dM6M1{æéùb~Á¾´Ì?Ç@YSjÒ’0Çá3í5¡à8 À¹ü†¢áP+vÞÑoº /«ì&``«fu!ŒÏ¬ ¹6„§ÞKì{ “v¯Ÿ¶{|o¯F£Y’Ø…¦6|=ɾ×Á"`—Û÷Ÿk5]xªC³vzHëP‹!8—Ø÷(‚.<_‹a8*ö½Á{Õ€cTêëB,a>×kC™.ì(÷‰1xú'Ç‘üQ=‡ÅéJÙá)ñ†¦-ÐÙèL‰””»ooo—Īq~véê–ôKem럵֡˜!s—ŸI„EË#‚¹ôZç:»§Y ç‹_'reà8¢KšÏö]^JÅ”õyÔRÖç7äWPLTæm yòÙ‡asJëW%8`4Òû‘“kûÓ¦N²Ç—SØ8›N1—Œ]å¹¢‚ŽwIþ_ŽQä{|zÀôÏaŽõËœ3<>Eäêp½'ºÿô.id>‰\éuI-e夤9C²&¯8 +"ží9-jwÒQöü˜êaÓÃÆZAc|3ØÅñª–×¢?4“Ád7ùIÈSƒ˜“aÎ/³ÉnZÛ6r/éX²›¶ª¿á ‘–yÝà 2×ô˜’Wd3È2…“Á"wlzÔúXæ£1™Õ-œäôâU©åööhí#”'¥˜âÜ·{ƒY‡Ç}{ –Ú^¶`†ÎŽ§á•"L¿}V=4{ÆŽUQÓìÒÌ“XJÊ<°£f—á<¾ý±3ð'äñõŽå¿XdA+íÔ4í$}Súð ¼=1¶hu*¥–¢©=GÏÀ>E0(Ê#˜ªóg4/¼9–£Ç òÓéØŸeˆnÄ­Ì”S€çxã“X/¤ØÑ4Qãƒ%ÚY“~©Ì[Ë+?èTR¬WÉä2fËÄ|Ý,a©?©Ç-õóå 4L¯åYÄ7Õ&ÑŸoÝÕ]2àì ßgï§dØÙÓ <£xˆcW£À< ·jK•;k†:Äqý›4êË¥¸2˜tCÒ(+MÉ;`{½9Ó‘4g[žx@úWž˜Ü+;2º=8ÊïÈí \²3¢ÅÉ¿åÓÂ;*®k)I;:ÚQ;Um~†=V6ºâÅõ®iý–O ïh§Ù)OM§ñ‘HƒIáJh³À‰Y—dùÈÐ)ê”ð‡N—ä‹ù¸Ó¡SÀh—ôO§OŠÓë’òîŸ"þ˦$ýED¦‚#2žRKØj "ÃíñIϱF}7—Dd$þ~åòˆ pèœî8! 휈ÌA¶à唆¦ˆÈhe¤ËÏ œ‘QóW ¤çKÎA)z°àŽs²±ã{¨T!7–ïDcYûܸc™¾}v[ 0ƒ~NâêîoN2 y‰ÖíÔ¡EGÎôIC;ó»T¿ 2íèÒ écGT³åÕ|höð„*Ϋ3x^O7¯N’:ª“)|<z§{I•dõJlKÝ£zµÃ»HÑ3ƒŠŽÏy×:˜ô7ùpË_œ©Óχ;ýþ±sòáÔNA×æwAžÅ ùpz'Tÿ.E­/\òáTnÕLâ:?NvŠÿý¯óá”÷Ž²qwô–€?ɇ“íX8jy^>œÒÓÚÖA™l—gÖ#÷gg"”üL¤–miäLäËÒЙÈck;¥/5²ø€ÄåÙèŽçØì„c$D +ka8Éup’Aç üq‰†’ë´b‡ç%µl4N<Û×®ƒÏöõ‘‰P,BÍhÏÛË%ËPL>’D.]†L÷Z59¦¹ [+£ËPÇGô>Í_Te´¿¹ Ã9mùhä#œ?I„Ìùi±£p´¯Ö¸MKë˜õá•ÀGoC“G¥·5:=‡1,”|¦±ÓQ‡ZÈH%¯Ï= "³ÖÅÂge¤v¯;’H f¤v¯{FBGRýþ$#õsý7©Î_d¤¢|±Ë3R”¿ÈHEpŒ]­p‰ÕÎõá¢}iêɇŒœ^nöåËðíâe¨H…S—c +‡Ïóëžèù‹T8ÕyùóT¸óã–rŠéûî'ø•¤ÂIï ÂÉpÿ‘T8•¨Â N=>fÐ?ké†RQ ½?Y/ñi¬yVÕÈðr{,ë;â=è…@ E 0í›íN´a.>usA’Þ2¸…£w;/ˆr5•'b9žÜ¬Ì«ûÔ¼G©ø訊z×/ªçQÃÇÍ.q™|g/ÝNÎ2Øç kª]h&kù”gÉ_hÞ†Z¸lxî=¿I¥KL³’ÍøúÙlƇŠ4V¼:²Íä]æ"Nò\,µ¬3ä%q9JÚygáz´&e/y²[¬ÿx/ >KÇ.[ܼÔÊ° ´Þô’Ý~M¤D¡™ÑË°³=Nî»ZH¿u½ Re.VÔ½•Dá”Én·qU¨L¨H»vè%»‘>Ry=¾Ø\+ÃŽ±XÖÌþS+ÙíC/ël®Ÿa·l65‘ÞT‡ãÒ¡~=¾ú›6ÒüÃGQ“¼Öëh!­Ë3ìð¬Â‚åF?q|5Ø.¦ÖŽ*ÈZ>«† œ5¶§:«ŒŠ!úÀ{IÉÂ~¦T¨z±cGnå¬{ÁŽE¶GT»YþMjÏñªÊ¨‰v«µ.IöÅt:uìpê±s¬÷ú—•äÔÊŽ¨Ü©b º¤WIî¤(ÜGÎðÉ#ÙøNÈÎõ+"§{®Ï8?)"§9>µºoÇŠßñZ†‰~¬Îˆâ.µ êÇ_/Å¡v!"Íã®F ÐéGzÏɦ;/sj6šÀ×âü»l:ƒ÷Ã\˜M§T®—˳éÔréÎÍ|ÔΦS‹Å«Ÿ´¿$›NFnͪÞ?vQ6¨#7„œ‘Mw¦F>1›NmŸFЕ–M§–K'õ÷ÿ&›N-—ÎàÙž²éÔbí|ö¿Ë¦S›]éýÓl:5ãFzvôo²éÔré4n›¿ ›î°Kc‹¶¥tn6šqj²ýu6Úü©œ†º0›N êhMá³²é´l˿ͦ3N±K²é ”{â”MwÅNΦÓͱú³l:õÜê¿Î¦SXþ8›Nm·Dqþ²éÔăÜ{ý‹lº#;#”Mw\¿üE61Dkü¯²éŽerýM6Z.f=¾Ë@¯èÊê‹tu“v¯Ã"•ÊÚŸÖG»Œø¥V-›óëÕti‡vyþº^¶uaŒN;·ý$:‰T’„D9™G ƒ, KPÐÈzÖꔢKFEêrò©³º„(:©ì²^—ÔRhJ:é”]Ö™H‹É=¢[²²UxD´5²:RØ\?2'TËÒ+twq™;É=WMòsÊÜiV—»3”«d°ÌV&—±D:C$ôÏ'‹…î.›«bke¤ÊŒn”ÊP™»£ED˜‹ËÜq6Œ~¡»‹Ëܱ¹oG +ÝÛ  Žž3| +€;Ñ­°˾?É|¼|+UÔ¹œ›}ƒp ÕvUƒ"9ÙÕø‹ˆ¡d²«f +ÏeÇÀ %ÖjÕ€P&Ö6‡‰µÅßÝ +ˆ€ýI!cÌcÐ[#ÂLª»4IÙT#åÑz¯zg¨]‡[º(ïðµ®'®u†z¸þIfŠpóñé–Ä!¨êþ¯*‹šö±áµÿ|R¡j­Ý7Txíbs‚…¢wªó8pK çÒjÕ,~ªÝpxÚYÕg‰ 'íð:Ý*ËðÅ@"ƒ¡üÅîøüJ­wg,C•ÃçÖ­>­Â^æãËg4®ÂÝŸTÊ;šOd¬RÞ¥ùDB¥¼Ë—¡N…;y^’‘üs*ÜéÕ{E5îN¯pgôVs”ýtybíçZ4s´¼Wɵ츙c2bè°µéÎK¬Uf>/¡üÂ{ÕtèÓî¹ÂpΛwD 8’ÏyOóÅŽÂÑÎ…U$1™Ž]3Ëå’ß®–Ä$ÝEÂs° £Ž#a ®Å×}3˜Æd$‰Éžh+=Q‰3’Æ$ä‘Ø©J˜Í4¦¨ÃP†º®Û.¬Ê¨ÃȪ4’ÄdO,”Æ÷¹~åÛIILZ'ˆPíDM{šaøÆåð^p+¿Â0T¹,ñ­ÅÖ€ø‹׬OûV1ä¿œZ‘î¤r˜”ÚöXëﮦjáÝ·?Êqmi^Muº ÓÛžTîñH¥<ÿ™9®’õ)Ã0õ|<Ǻd8ëY/Ç•‹¡‰¨†Ôññ¦Êx+%š¹)™Íø+¯9Ë°Ò0Ùr·îF3±üv3ð©XÃÙ}…·Ï€²'¯s¬âÁ¡]Iì˜û$KÂ{¸}’"•åÙl[ËK«& UÉë°E³-|8§vÞfÿ%å2Y‘†G¸´rÿ‹5ôäüÒJÂûÔD +c¹.¬hͱEËû³&R{¹çûѪÃæ‘ +™\"kAJ‚Tžš¶µ‡nÄ:‚´"ËÑé¸ý˜©!5Ù•5çdix]e¼wñšRÆb <ä¾Å¬2#®£ƒ´he´‘ë–w5¤¸î[¸$K­T"}Ò«#x÷¢4Ÿ.ÈNvZ+zï>qI˜{WÂ/Ÿ}vt–Ðl'ͯ$¾]Ñ´ˆîèr—Õ$Œ¹PÂf í‘+ϬNœXPtMQƒN¼$«bvüà¤Ý °ÊĦ£픤ãUš]Bœ¬Ý©¬‘Ô¦ã‰MÛ¿ªÌ‚ºG*³$åôViNÝAe@Ð8åš^ÖâæÉ ²ÒŽœÐd©d2ÆOŠM¯SÇ'D­QÞÝÉU5ºtpJK¹^ ý¤SZ&›^§´ãħu ¤¥ö9-®?gcâ*ÿ™tÉ7¯ó‡5SÎs%vÙÀÕ×Gb°íü_]ÞØòšÝph I7¼lt—§¿ä&Z1'ñàʸ³’ÝÔ·¬Oº×º?3²,¿Ee^z ­Ú]qšùbǼ–ûât õø˜üЈÊk·pR½m Sø3¹[PJ˜sw½Ù„;­uŒw¬Ž—¯“õLç?²Ãõø4£*õÁ‚ixsº=¢QûÉžxÓÞ<-‘ì žÅeÙô3™NʱŠœtϤKŠü—AQ/v|Ô—uIrTŸÛ­–¬ÚS§V©œÒ{®tR•4>2âÎû xòYY€]:È”îW²ý9ÕåEùŒWd»¤(Ÿd,ÿÁ¢|Q…ÿHQ¾cÙþ¦(›3¢o \^”ÏdS± +ÿ¼(ßa}äÿDQ>íúÈY”ÏPýÊKŠòI£ +¨SŒf§8K Ö®êwùÝP•¿¸Ê`]?CwC]\×O2´?¸J«®ßiç”έë§_Õכּ¡TêúéG…Ô=ñÓëú©3ŸîÝPgÔõ;ÎÉQ×Oÿdˆ¹º°®ß±L®? +èêVõ3ÙN +èjÖõÓš"vqv]?YGªúQDµ®Ÿþ€ÔN¨žS×O5QïVsã„1œ)«zôuýôoþöÄ/¬ë§«è²X‹ýA]?ý°ðI7PéÔõÓwuUOAŸQ×O-MR\z—Õãûƒœ÷“êúéCAqþ¿¨ë§¿¡b2 ç’ÄweFê¹uýTLMIU?iu₺~ŠeHÈ«úÉîì:9=…êúÍ{ý“º~úUýN¾°®ŸþkIFêEuýÄü-5^TÜsuv]?}b öêú鬵í”þ£z|.}(†ëñ)'g¸ßEuý(ªËçÔlŽƒº~:yGOÛO­ë§oÉ£þ¢®Ÿ–9ÜI±0ûû«½W +ÉÙW¤þìrxçN{f!J?iËzŸaÌŸÝ Ÿ¾S¶`8Vº¹\?×ÓÖ‡É +úýð}áÍwçÛ˜ƒÕbà;ó4}¾4î™×qsø\¿8†#ëkÚÈý^7Ÿî¦ÑYüm9¼u,ÖÐÚ¶I-˜óëíÝJ;ŠŒmôQ.;÷cËG`ù9Œrkçv&Ÿ›³ÏÝN™©Ÿõ‹;NÛSD!s—! +£~…(27O›Íwıن_Ë[K›émƒ½šiÙt'üÞW]\óio¿þÍös‰ŠÍE,lnõ¡ ‘å—ÆÞ«Hº__!‡Z(‰êIî¿I›+ªVÔˆ…‰ÃÝÝ y¡­fͱâŒFG×>¬Y^Þ›Iëbã/ÜPŸ½e60P&i…O5ï=«À:¯v¿À9‰æt¡Ù´Öáûûµ¥Üd_)– ­–•$͉ñVÉÐ@¬©Ñ!Éز{“-÷^¾ášÙ¯âÓó\§ü»x%åßb…ˆeZË¿¦è6m‘,Î^Þ>Ó%ÆÜ8/k,[>ÓAº§!”ÊØj§bUó*=_"NNß½¾vÜù—·ú®Í|(i×úõÉ`kƒ='¿s Ó+‰ýAŸÿD:pì(ZÀ× gý‚À)¯àkƒ%ŒÅZìc²>þ‡!O݇l‰pç<¶}ÁQ*—I}Üá;z甾ˆìºÂ ·ôEÕÝ7Ù„W^é«vh(¼ðK_¬²? Rò¢˜Y£ì‚—ôÙ³£‡ãÙðH_ý<œ®oH–¬)©+Yòhô‚I´œ’¥Û'ôµ.…Ýûq#ÊÖ=l“¾5öÅ@"öÊ}o‚Dü(oiNöoˈlul¿þŒÁ¢¤Ö¸QÛr‹±Z²RNoYÿM Y(çm*Æb‰¡ ï§ÌÌ÷ãJ×ú£jî®lnˆ,)l d厫Mîpf(g©Wƒœ|.Äz5!@Ìw5ë°øõþI7öÖIþ}P#ШH̽,'S_ûv*;éúIÂßjÓ<{5’¡çnC}~Â^½˜€T®žEðÕϳý+Àî}¡Úl¯$gî_9ëb‰>Ó§ "›3ðõƒØéã‰÷ó¿~'„OnCÇb'|oÞiüÂdã^å¦Ö|ºŽþéoË;W^“pZÃ5kØòžˆ6ñb•†j¾ÜŽ*; ñúNw$ƒ_>±?ôó‘õ þ´^è)|¢¤íîèY@¥7õÂ÷K+›s‡Kþþ%,µ8Už•šß ©¤Ú·»kj_н»³3þ0{ýö¤…s&›Ùš Ç9œœÞ¢W³g½zD/àkš˜=÷o%³kmÙHô5š+`Hÿ Z4~†îœˆzºØ5dO Ê’œd„%ŽŽwyQª2Aз¯ùn¡ãüÀ·£å\rà•Š¬>+¹XT(^Eå¼n,ñçÅK G»x|¦ÌÉm_‚´T÷0ƒeYku.DÁÇ)2à@§Ï}ÄÀáˆr‹"ÅÒÙvEÛÑ8ÿ4åÁOa˜OkøZöÁÞZ®w>¹È$r•ø’€&$Ö hÕµÙµÍN]1áñ÷›DBÏÍY}¬+¶}H =° „,®¢hÉ=ÀŸÐK)û=M¨ƒ-€x’À¦oŸÍ{}Îa÷ÄE74s·<=Rk-ßÂRyÚ!«®.»½sÛÖ Ï°*Ùæ7ýðÄÂÅÏÌ;ÇVQ;p}RzN l‹Üf“Xº¤F®˜÷ò·Íc€rDZ´h·²&ˆ-cÍñ ú7 2þ{ÁÌ)‘…·")ˈ"¾9²˜»ÑÉáäs2þ‰'šÄf ÿìeÍ?kmü“Ç…›¶Æãߘ»éÛ—‡;™uÆp¢K/"f±ª3ªnfïˆxà WQ{öü õp-`4 °è´äkklè™ÿtØÒ¨›‡×QpWpóÖ*ó¨^š¯±)ÜÝñÀ_QñCȬQ\P[: ê§.;×Ç–ªSé7ª ®,Å‚Èm‚±¬¸!Ä+§&ñÍ[¡ Š7@ÁníYŸ>Á¦ +•eµK߉z¿1R˜ô¢%NPL1·ÑÚරYQÒ-ܪ R¯®. ìV œïƒÀAä·œáËe½8±øš´C0/†AàÀÒY¤äö÷‰ÑsÔ¯ +ú°’p?˜Ã.lHz²6·ØN¬&¯ñ™d;Ï©/¼yšSmi;PZ=d©k_éz­e’CU,eDTˆNkI;°Æ|—~I·ü’Ùìƒâe¤_‡!é¼T é×vêV: û8$ýJ,ÂÒ}dä`ĤïÛ¡„ôëO")írõ:"ýúìˆJ¿¶}RPà>Ä¥³ô¢6¸RØàOHû]bª)é×Û§´äk¯m“v(We{mT¦E–1Eú‹F½E=ß_4ê-rvò™þ¢QoQÀr–¿hÔ[d3¹Îõz‹ˆÇÎ÷z‹\ öLѨ·hºÈ_4ê-šl—ø‹F½EÀr¿hÔ[„Uy¿hÔ[Ä7í/ʽEtoÄ0ãæ"j;Od]pbÌRvåt¯+NÌÉ|£—5âêÍç½õ ³ÿ _C,Ž°‰ï†’‰£F€[•È.Xs´ ¦¼øî/¤PÞaɽpñ±a-gPߪgm@ç|*ÉËž!A"̯"½Ü*‚ËËÊ,¼ŽAñøy‡¬àDômLg™Ùõ¢€ôìX¹rJ²êµóE‹)7âƒ{T¢§À-¼ˆNÎ),V§ðà¤S ÂŒµ—üOÒŠÐÁ«p ºò?ígÃÍãfò3Y\yL1“?]&ÉçÅ`YØ ‡ÍáírËþ~>\쮢Wþt#[.‡ƒ¹a9^á ãàwH°•=œ—Éí…K· d›ä¬È"ÅiÉò”èæFD+)ÙBÇ^›“.%P àÉdCAƒ¸Ù6$ïÌžño}-°–´0¨Ã¸õ7,0ÆeÉ 7™}Þ}_}Uˆ.ìˆg½ü:÷^¢U)E·&Ž?2ßT#t—ºõÀ×¾³43–íÐH"'…Büf3•b£ îúõƒÙÝ÷=¨‡B„X  +¡ÜìzreÉ' A¿Ö–X²˜Ø=0àO’]jlxzíÿœïÂáó³ l3÷éwˆ´eÉÉÅCìkÄä%7÷5ê@Ä(ñb­2,«¿Ë„ÈëD©»‹ðqŒS|!A2á–¼èZ³ þEÖ ó"¼¢2ïÏ·ü«²_º¢b?iþ…"ö¬¦bÂ%>“b.f=’P{[Š»Xö! åSçÓÍ.µ¯íï@ðWû üµ”»ƒOìÁ³6“\¢€DR)Œ âj„×#LmíÑD›¬­ðõƒu±“ã¯}ÐþûÆi¦[b°¡‚VÕ+ ýæ±`ŽŠåüÝøMôga.Äó_ÉN»†£„8¬6î"ÐÃEV„¨=ˆl"é(†è¬„ë‘p±²›¹ò aæVSë´<% ¶:g Ç^­n@zWÊ^½G,=œåÚ{öslß{#È^µì„O$§˜zm*)S0W½.Ú˜ä>7µÓ' Ñ‹O+À×7?÷ëéÁj‹ÜÖ£ì·Õ$כ逖¼h›éŒi¨ïûµ7æ –Yt&L‡cös”3…ÇÌ,l Kä!‰±dyeÆÿaÏó‡<ÀªóIÖKŸc–]› ‹dÊŸº$ÿi@‰í8²û ô&¸{)¸œÉXèÅ{}_ø¾·E„C$z¶bÔaás£&¾œë2#ä8ç°ŪAåù:¥0ã™ +ësw¢‘èDaãwìy 6Œ›möÒ ~jY3û{Ä·M bß«­qÄ™‹7¿S•ƒxs¢5âÍÏ8œ(°ÀçVM +"¸,(AÐåDƒHrg¤€"˜²¬”+tì”sž ¡Í´mPlÿÈ,qrO»k÷lzíÖ +Ü=QYÆbs\èPZÞàa8µ-;ÀqMÔÑk>ä)‰³:Üò 0ŒE= ì[òáÔÖ»N•ßYL¡ Ù–¢oì…¼žãa`À6\¬Påžjþ¢ƒ ;̾v?tg« +_ d3¤ÏŸ;{ů[|a\@ßë?ÞkƒÀ×n^Ð|™]Ñ­Ù }N¬jס±E`xHÈúyŠÉ@|)¸_Jt6thQö V¥¼¥8~ÝÍî£FÉn)—®ÈrD)×è ¨Š}VA³]jf„)i} .‹<?w´NrÕõ)ÞQ߇œçýõ}L¶K¼£¾ˆåïǨïƒlþó½£¾Âr¾÷cÔ÷1]äýõ}Xæ\ïǨïƒ(v¾÷cÔ÷‚zgy?F}“íïǨï#õ’N÷~Øí<Ü`>à(’h±²¸2í`¤¸x£±âu×^~7&à÷b„ ;ºmÄ‘›G謊Dµ–>vÆž2q~%ÚÛô`¡O}íãeÿämçcs&ž¨›Ú *òµ{CðÁyÑ‹gÎÙ%Ãp<¦\xƒd{VLÍ)ë^Èvmá<É®2¼À‰:±{Á®—L^˜déX|v ØÏ#»WÃNù ø¸ìcXS¼‹S|$Xé$ Ÿ)>x·ýŸ¤)#)“d'¿HÛ&› ž4†»ý +5v2ßɢÚýg¸1WäûýG_…"èÿ©`¾Ñ£jÏäÀM¯ΫêÂdëøÓ›]nÒßM–‹î柫(zôv_}.箢WlÛ´]9 3DZÃ+' +©vÈ+f¹œ¡7ÂëUþ¿VËÍîŠÿ2ÙNz³áUsy•m4Ž·—¶ƒwLäUþ½ýÆ”†ðž¬àÓ£‰ð…‚£ô1¡¦ñ‚¢(ø!H&Àÿ­k‰ñö|©À‡_xôï«ÀÕýÕÇq5@°ŸLA"ä †"äã Pd8|57‘´ð¥Š¾€±*6T|›Ž4ˆzßÝNñ§·üÕ!®~ð‹áv|õf†Ô•ÿe¸Ù¯®Þ,èU¶»Ù ·“îâÊßüg5dŸ~ÐWÔו¿1ùoî?×Ýu¹w0TxWã¿Áç'¾Ñð_“þ𩘹ògbkÌ/!_$Ä0Wa ,u }•ý"¼#þ‰\‘òAñs’¤}T$àÃ~s +û€:A¾ƒëVqÓýGÚ/_€‘Â¥Cð»`D×4¡ÂÐëPD¶îÈìW +O“l^EJi @“"Áµ0)óïƒÀ¼t$x>q„¤Cz$Ž*òÑDˆñß%M˜€¤hU¾àF&a¿ò?à)!ÀT!1)ggEªQXÁÐÈ¢hF`áC†Tél€û‚a’äWÿUdbš$|d¢Oäb? ‘„6*l||ÂE®†®Ç·¤Œo½2Šj :„«Ân‡]>ºð@äÑCjdRÏ@$‘K…6:\zÀì¬-_W)¯† *¬Â¬J> >:™õñTúŒôADÂܯ„¯"³BÐùH„:dÖC Âìð¿gYh£-_ rý!‹‹c×ãVê(·¢:€«Âx¹ì€H‘…é¦Gmž‡„_‰ì*´Ña׶?àqqü:ìê#’µ:°%&”`6ýÃ>¹zÀæÊá¼z{…OÏð/"|{sÃ0å6;…qW,¦Ãâav6Y­&‹ö1Á?ÎM¶]°ŠÇåÅ¿†`øp±éé ûIbþ‡ AÔÆͺšaml ¶S½Þ››¼bÿã„ ¶¶Y»ûÀæ¦N°¹©ÿ›[0µ ÁÔ¾z2Nå´•‰C2ƒò#h…2A_ Dw€ øh2B‹ÏDÄG2`¾gGÈbu`ñP8OhxÂ\eM4¬"‚ +Ñ`M| ÍÀ"$h_8¼ +„`/P )ÊGÒ€LxÒ7‘$å G`Tb+ÀN%KÖBD|@…Á¸'ÈüJx ,LS@G@–!™FQ P¿, &äc€’5I  ²9ýbhèi|´*é < $H: +Ãë›øG!°‘±“/€í“fûA¡é `HAÆ +”Ø& #‰P ²"¾p ð#ŒQÌU,)†Aç( h˜6B¤¦‘ª£a´ 9 U"DX¤ÿÈ@Ãhƒ!Jlƒè€©CP(Ð?T ä£Â4…0‘¡@a +†€â ê ÌSÓ5B„X© @hŠôÁ0Ãï›Ð¼C„ÔI$&|@ò€$”t~$<£…~f+ËÍ‚îÁ_„ +…ð4‘DŒî ƒJ!h^A‘RÀ‚$pð8Ëz’@Ö%’•â=ÄŸ ƒ† Bt p…x8&DO(4§ O`rŠm.¶Š Â +&žJ„A†€kàgü3èÁúàáˆ+æ`]õM™È(ÇóbÑW?›î`‚NIÑ„¯To„È/öoæÇä%€ñ¯7`|A˜]ø„ôI–÷VwIXFosî§4 ÷†AÁý‚Œîà U|þE¦Ï#&CW^X +>† +RÆ0gxÌ€ûÊ ƒ€õ¡÷SXÀoñ—'ô³du¸g¢®2u±*­ ´Ærüª¿œ¯–{P»Ûqœùùr0”ß“U t I…Õã;ä º†üßÔ5kÓþ±ÊæÇ°ž!8†B2V (áMSÀ0ùû°ÎLH€Ò +†‚âœ0ËC…ÄgdPÈiç! O|ð;á,Ú0MÀÔð°@ëPÄ'<ñÉ÷Jl%Œ†‡t8¾¬iĪ㫢 $r$ØêþÿIbl–á¸KU"k_Bá j =¨ZÊG#%Œ& 0HXÉá %>A:ä*TxFƒ" ÍÁÁá¿K( 'ןõïì$‘œ›ly·‹¡G;Ħ¹QäÝS°g•z,aØüG&yÝ,·¹ÒpX–¼ý­­Å¯ûPšym5ðž»+øäÝ´L¶Â·ã‹ÊÌR3o, lÛì¬R¿¾uúîõ{&™:ÆSî²Ã ’îÏ¢mZÜÅ +][% mS/õ[” ³zAŸBÀ/Öp! O`,ßLö%«øhÛüƒJmŠó1G!MFþ (Ñìæ|>ï†oWG;·;àëÏ×®ÀÞâC£·JÆòƒÖtŒ¨Üº©\Åmw¯g4A•^ÌéfzQ!¨~`“ ´¢VáòGÛÁ§Ÿz76l×Ë0ž š 6"ßó¿oL°–hGø¿ÿÏdSy(yj6›ËÉ\yðCb@¢ÀÉz¢×½ÝÞ%È›ô Jõüt=K¹Ñ ®|sàØ[zÏ?(_[¢Ãï›AM}ïx>5ž +NWÁBÄ“d%™õxCËÇûx!;p‡St*òJTR·ß<”GVdgc¡…òýNÅŽ¿Êi¯-^¼…¯¯ ZD!ü&ÁB¹—Cdù$Ìç¨^$/Ð9…bVõ1ÜÔ_Tjјú‹^9¯eØ{ΪÿfÚ­ª¾¸süÞ©¿ ?ÒÒ!j—Šcàì·žgr±(X+__ÀZRŸHH–ÂÍ/ºÍγDk¸ËlsýQM½öC¡;ë˜uè{&œÝ­ÉÁ÷æ‰rý¶ö@ÅU…ô8ÍodÆóJú\£g“¶Æc²ï»«‘Þù艨´ž_¨|¼_£íË䘸ÛôÝ°JŸš©¸·öƒÀÛUS¶€+6Ž–[}¼¯n⢛|”4½ i°Té¨d°T$¦ƒðLj;€­ŒÐÈv~+<›©À;4\{0”É„#8bÅ„È ¥Áà(°yáYï¸ðOÀI·0ñ¿;ÜÓktõFÎ ´ +…Id¿S`Ì0èI€ hÑAL‡`P|’5‰Ï" Ïf&ñ—ü3:2å´×rÐ÷,7Dò*g¢Q<(ˆÀcš›±WU°W%¿•ôèOP*»ˆ€.’A 5Å L`+dIFB>&Ÿ„õ„Þp?£fA!7Ô„ +ƒ»ÑÒd¹ÿ¤„„ɪwXø¥@Bz„'ˆ ^v'¡ëYfg@QÞÙAOz#É°`LYá° rÒd0Gà L%X‹Aq(“>¦]HÚˆ +}¸Yá ~Ä=F„#,%f;ZDÄ?Âò½ÚðæŽJÇ¿ù‡ÿ›®Íÿ—ΗÀ\yi"Èú9 ÿöÉÿNNŒ${Õ6*QHçn™T£NŽê¯)5'‡ú6G²Tg~¦3áå}3ù½ùÿ›“CåÍ/¹““¡\æRŒ3³N¬MÒ=M¥°Q˜m?¸^ÙÑß>ƒ(ÖRy\¿ì+ÎK3 Õ;ØÛŠyŸf”à Ñ‚'äbvÕÇçÔ:]ÙZ®æ8W*øØ“¬»dô±'Þ‹©Xsw ¶ä¦Ïìtèsg“ª£Âìë«èŠŸx¿±¸ƒD¥>„býç'„°JÆRr,,€êýCäO:ýÀ|ƒYÛ»é"Gì¡œŠ}µúj_žßR¢K?Q¿ÈÝÆ#åS ²ç¤,´!ø›ÊæidØ }äûÆJ~K F+ßD‘å,ª˜K@oKe“-¸"ÓBÇpF~7®ñÚ;÷í´ ?ïËæË»+i%0$„¸Ø¾`ß‚¹0psúöY!‰%iOÛÓ6Äœ]v5{ó1ó,WÚ5Oô¨ Çøîséá¶tá¬ÔQ/ŠšèÇîçLô£mYÅÞÒ67kV+´"JwuÝRæÐY÷Å+õ ^¯HŸx}ûâZ)hWCZº×iy<0»rT ÚÀ5,~ù¡öLžzF—ôÓó{–Ü=hèZ¹×ŽH‡ó´7ßØ9ÅÁàÀìN+'ìñ„ß/èå–DB1é¯uB('2§*¸ÕŒ‚ÃÌʘªÉÐ7xc>LG®Â/—Á±Âp/¸Vº×Sˆ!cØ‘L¸ý£Þ‘ŒRŒ¬Â€ tM7–8AˆüK\GŸp4CÏÏÐ4™Qx;U¹ëÆ¡o >¥»kšL™-á}Šqm7ž^&±ô  f€÷¨YaüD ÆH¸©†¦cZ8‡Fg‘á2Š0ÊÐto_›¾Jdë½Âl* +Σ†£q¸Cíø†pAkÝÈQHw>S¡s¨áªX6žëÁÐ#%˜‘ë§bPœª®³‹¤¬+ˆÛ”ÈfÀj˜Ð¤‰71 ¾2Îe#…èKBìèµ¹…Q¹`9§",Ì….(¼AÖU|‰ÄÀ$Ê׆ÿŽQ´H» Ê<†€}àc¦ohª’Ze€U›鸋ŞZöã,âyáuâq†¡€E|kü÷x{¬ê;8öß™‚ÿqìû÷âXqë±ù +ÇziVÌ\å$îŽ [ƒcèÑ‚…:ø‚4uÜÊŽíñßű£óýÁDJÇKÉÃhn›5ïv àÎÜíÃYÉC/ÛeZ¼7bûÃÚ =»ÚñÒˆBA6 ˜(‰oÜ÷‡Qù|±§£d¡Ïgè,ÌÓ—h;˜óçäÑ=Ûc³^øØÓdŽE-ó¼ß˜gÓa^<+:P©Š‡G{¯¾Œ³+wõ™×…AÄ胱ˆc°bÁ‘w¬r=:„=–|qlSèÆHïÖÑìjâC;øa¶W7$q6Û9§·ô,"—¶´÷tº’mÁ?9®@µI¶,mQ{Y¸ì|ÂÍ"âUÒ–Á¯à—ƒcXÙÙEúqž¿‘ÑtµÕ–0r¹OîS/Nøâ*ŸáÊAšµ£DÙRSPVû7žŸNtìg^ÜÞooc?µÕc^OÞûÖ¤ƒŠˆ$e^&qpø4鵤O+ø‹ÀX<ŸPÍî$¾ Š«E x×ΗgïýŠ,\ck§Ù¼ø9Ã*¤¬„iÄ×+ÒØs?‘õÎÒÙðŠR>/ž½PM®W9æ·*lÜ›»~Å´Øz¼}1ë¦fÁ öºRÎÞ+ç° YËîwWÃ`,ôIz¶ž7n(«vÖqóÇ3rœ¸ÐÏ’mÏŽÚBùô ¬:µ”X´z7|RÒ¶èàvï˜ÝÍà“Açe¥‹õ˜Cvìv¢}˜QKY?á)w+Ê2Äh].H;Z¬ëFÙüøO 2 ,ŽyÂ>[Áõ°=K­fcÆOÀiè^´€B: …2Llæ©U¸SEìÁ/ó=£*¦£s=À4Ši² +_!"ôüÀ •7¡/H4̾öØŠjÌMâõá¦Á·…¥V!Ó‰uåÏ¡UÇ’%ò­›¾ +eë¢ë $‰ÆF5˜`æu…ÓÖm…tçC³a}º‚ a +ĵd0ŠiÕ\0Ñ’Óš®õ€‰0AP¾½> endobj 6 0 obj <> endobj 7 0 obj <> endobj 8 0 obj <> endobj 42 0 obj [/View/Design] endobj 43 0 obj <>>> endobj 40 0 obj [/View/Design] endobj 41 0 obj <>>> endobj 38 0 obj [/View/Design] endobj 39 0 obj <>>> endobj 36 0 obj [/View/Design] endobj 37 0 obj <>>> endobj 75 0 obj [74 0 R 73 0 R 72 0 R 71 0 R] endobj 135 0 obj <> endobj xref 0 136 0000000004 65535 f +0000000016 00000 n +0000000242 00000 n +0000042777 00000 n +0000000000 00000 f +0000134069 00000 n +0000134139 00000 n +0000134209 00000 n +0000134279 00000 n +0000000000 00000 f +0000042829 00000 n +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000134702 00000 n +0000134733 00000 n +0000134586 00000 n +0000134617 00000 n +0000134470 00000 n +0000134501 00000 n +0000134354 00000 n +0000134385 00000 n +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000051735 00000 n +0000051808 00000 n +0000051881 00000 n +0000051954 00000 n +0000134818 00000 n +0000043361 00000 n +0000045264 00000 n +0000067864 00000 n +0000047535 00000 n +0000052504 00000 n +0000047422 00000 n +0000052620 00000 n +0000052733 00000 n +0000050281 00000 n +0000050424 00000 n +0000050615 00000 n +0000050807 00000 n +0000046632 00000 n +0000046900 00000 n +0000045326 00000 n +0000134034 00000 n +0000046071 00000 n +0000046119 00000 n +0000050218 00000 n +0000047359 00000 n +0000047570 00000 n +0000051390 00000 n +0000051000 00000 n +0000051509 00000 n +0000051614 00000 n +0000052386 00000 n +0000052418 00000 n +0000052268 00000 n +0000052300 00000 n +0000052150 00000 n +0000052182 00000 n +0000052032 00000 n +0000052064 00000 n +0000056072 00000 n +0000052859 00000 n +0000052925 00000 n +0000052948 00000 n +0000053249 00000 n +0000053327 00000 n +0000055354 00000 n +0000055428 00000 n +0000056036 00000 n +0000055573 00000 n +0000055718 00000 n +0000055809 00000 n +0000055915 00000 n +0000056138 00000 n +0000056161 00000 n +0000056448 00000 n +0000056526 00000 n +0000056781 00000 n +0000067740 00000 n +0000056855 00000 n +0000057304 00000 n +0000057368 00000 n +0000067939 00000 n +0000068117 00000 n +0000069113 00000 n +0000083726 00000 n +0000134864 00000 n +trailer <<779150255FD24E0494C6DDB168101D01>]>> startxref 135035 %%EOF \ No newline at end of file diff --git a/images/tikzit48x48.png b/images/tikzit48x48.png index 056d04b..802d504 100644 Binary files a/images/tikzit48x48.png and b/images/tikzit48x48.png differ diff --git a/images/tikzit512x512.png b/images/tikzit512x512.png new file mode 100644 index 0000000..89b17ec Binary files /dev/null and b/images/tikzit512x512.png differ diff --git a/src/gui/tikzscene.cpp b/src/gui/tikzscene.cpp index 3431c0c..edc1af4 100644 --- a/src/gui/tikzscene.cpp +++ b/src/gui/tikzscene.cpp @@ -124,6 +124,11 @@ void TikzScene::mousePressEvent(QGraphicsSceneMouseEvent *event) case ToolPalette::VERTEX: break; case ToolPalette::EDGE: + { + QLineF line(mousePos,mousePos); + _drawEdgeItem->setLine(line); + _drawEdgeItem->setVisible(true); + } break; case ToolPalette::CROP: break; @@ -226,6 +231,11 @@ void TikzScene::mouseMoveEvent(QGraphicsSceneMouseEvent *event) case ToolPalette::VERTEX: break; case ToolPalette::EDGE: + if (_drawEdgeItem->isVisible()) { + QPointF p1 = _drawEdgeItem->line().p1(); + QLineF line(p1, mousePos); + _drawEdgeItem->setLine(line); + } break; case ToolPalette::CROP: break; @@ -293,6 +303,7 @@ void TikzScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) } break; case ToolPalette::EDGE: + _drawEdgeItem->setVisible(false); break; case ToolPalette::CROP: break; -- cgit v1.2.3 From 7ba78eb787b925c99bfd5838543bb98e0d4743c8 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Thu, 11 Jan 2018 13:39:59 +0100 Subject: added more source code documentation --- Doxyfile | 6 ++++-- images/tikzit128x128.png | Bin 0 -> 6525 bytes src/data/graph.h | 2 +- src/data/tikzdocument.h | 2 +- src/data/tikzlexer.l | 5 +++++ src/data/tikzparser.y | 6 ++++++ src/gui/mainwindow.h | 2 +- src/gui/nodeitem.h | 2 +- src/gui/propertypalette.h | 2 +- src/gui/tikzscene.h | 2 +- src/gui/tikzview.h | 2 +- src/gui/toolpalette.h | 2 +- src/gui/undocommands.h | 4 +++- src/main.cpp | 6 ++++++ src/tikzit.h | 29 +++++++++++++++++++++++++---- src/util.h | 2 +- 16 files changed, 58 insertions(+), 16 deletions(-) create mode 100644 images/tikzit128x128.png diff --git a/Doxyfile b/Doxyfile index 039ed89..56cedb0 100644 --- a/Doxyfile +++ b/Doxyfile @@ -51,7 +51,7 @@ PROJECT_BRIEF = "A GUI diagram editor for TikZ" # pixels and the maximum width should not exceed 200 pixels. Doxygen will copy # the logo to the output directory. -PROJECT_LOGO = images/tikzit48x48.png +PROJECT_LOGO = /Users/alek/git/tikzit/images/tikzit128x128.png # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path # into which the generated documentation will be written. If a relative path is @@ -859,7 +859,9 @@ FILE_PATTERNS = *.c \ *.vhd \ *.vhdl \ *.ucf \ - *.qsf + *.qsf \ + *.l \ + *.y # The RECURSIVE tag can be used to specify whether or not subdirectories should # be searched for input files as well. diff --git a/images/tikzit128x128.png b/images/tikzit128x128.png new file mode 100644 index 0000000..2b09b4e Binary files /dev/null and b/images/tikzit128x128.png differ diff --git a/src/data/graph.h b/src/data/graph.h index 8856e5c..c25d51b 100644 --- a/src/data/graph.h +++ b/src/data/graph.h @@ -1,4 +1,4 @@ -/** +/*! * A graph defined by tikz code. */ diff --git a/src/data/tikzdocument.h b/src/data/tikzdocument.h index f574f5c..d3a18b1 100644 --- a/src/data/tikzdocument.h +++ b/src/data/tikzdocument.h @@ -1,4 +1,4 @@ -/** +/*! * This class contains a tikz Graph, source code, file info, and undo stack. It serves as the model * in the MVC triple (TikzDocument, TikzView, TikzScene). */ diff --git a/src/data/tikzlexer.l b/src/data/tikzlexer.l index 8dd23c6..800ef8e 100644 --- a/src/data/tikzlexer.l +++ b/src/data/tikzlexer.l @@ -1,4 +1,9 @@ %{ +/*! + * \file tikzlexer.l + * + * The lexer for tikz input. + */ /* * Copyright 2010 Chris Heunen * Copyright 2010-2013 Aleks Kissinger diff --git a/src/data/tikzparser.y b/src/data/tikzparser.y index 420b8a0..aa6ac76 100644 --- a/src/data/tikzparser.y +++ b/src/data/tikzparser.y @@ -1,4 +1,10 @@ %{ +/*! + * \file tikzparser.y + * + * The parser for tikz input. + */ + /* * Copyright 2010 Chris Heunen * Copyright 2010-2013 Aleks Kissinger diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h index f27677a..8adf1bc 100644 --- a/src/gui/mainwindow.h +++ b/src/gui/mainwindow.h @@ -1,4 +1,4 @@ -/** +/*! * A top-level window, which contains a single TikzDocument. */ diff --git a/src/gui/nodeitem.h b/src/gui/nodeitem.h index 9a3edb0..eb3fbb3 100644 --- a/src/gui/nodeitem.h +++ b/src/gui/nodeitem.h @@ -1,4 +1,4 @@ -/** +/*! * A QGraphicsItem that handles drawing a single node. */ diff --git a/src/gui/propertypalette.h b/src/gui/propertypalette.h index 7910d70..80f2d88 100644 --- a/src/gui/propertypalette.h +++ b/src/gui/propertypalette.h @@ -1,4 +1,4 @@ -/** +/*! * Enables the user to edit properties of the graph, as well as the selected node/edge. */ diff --git a/src/gui/tikzscene.h b/src/gui/tikzscene.h index 6817792..936d42e 100644 --- a/src/gui/tikzscene.h +++ b/src/gui/tikzscene.h @@ -1,4 +1,4 @@ -/** +/*! * Manage the scene, which contains a single Graph, and respond to user input. This serves as * the controller for the MVC (TikzDocument, TikzView, TikzScene). */ diff --git a/src/gui/tikzview.h b/src/gui/tikzview.h index fc3cba4..f89729b 100644 --- a/src/gui/tikzview.h +++ b/src/gui/tikzview.h @@ -1,4 +1,4 @@ -/** +/*! * Display a Graph, and manage any user input that purely changes the view (e.g. Zoom). This * serves as the view in the MVC (TikzDocument, TikzView, TikzScene). */ diff --git a/src/gui/toolpalette.h b/src/gui/toolpalette.h index ba6aed5..c28b5a1 100644 --- a/src/gui/toolpalette.h +++ b/src/gui/toolpalette.h @@ -1,4 +1,4 @@ -/** +/*! * A small window that lets the user select the current editing tool. */ diff --git a/src/gui/undocommands.h b/src/gui/undocommands.h index ffff876..0a7dece 100644 --- a/src/gui/undocommands.h +++ b/src/gui/undocommands.h @@ -1,4 +1,6 @@ -/** +/*! + * \file undocommands.h + * * All changes to a TikzDocument are done via subclasses of QUndoCommand. When a controller * (e.g. TikzScene) gets input from the user to change the document, it will push one of * these commands onto the TikzDocument's undo stack, which automatically calls the redo() diff --git a/src/main.cpp b/src/main.cpp index b676211..6b14549 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,3 +1,9 @@ +/** + * \file main.cpp + * + * The main entry point for the TikZiT executable. + */ + #include "tikzit.h" #include diff --git a/src/tikzit.h b/src/tikzit.h index deb683e..1846b15 100644 --- a/src/tikzit.h +++ b/src/tikzit.h @@ -1,7 +1,28 @@ -/** - * Tikzit is the top-level class which maintains the global application state. For convenience, - * it also inherits the main menu. - */ +/*! + * + * \mainpage TikZiT Documentation + * + * This is the source code documentation for TikZiT. The global entry point + * for the TikZiT executable is in main.cpp, whereas the class Tikzit maintains + * the global application state. + * + * The TikZ parser is implemented in flex/bison in the files tikzlexer.l and tikzparser.y. + * + * Most of the interesting code for handling user input is in the class TikzScene. Anything + * that makes a change to the tikz file should be implemented as a QUndoCommand. Currently, + * these are all in undocommands.h. + * + */ + +/*! + * + * \class Tikzit + * + * Tikzit is the top-level class which maintains the global application state. For convenience, + * it also holds an instance of the main menu for macOS (or Ubuntu unity) style GUIs which only + * have one, application-level menu. + * + */ #ifndef TIKZIT_H #define TIKZIT_H diff --git a/src/util.h b/src/util.h index 2952214..7622269 100644 --- a/src/util.h +++ b/src/util.h @@ -1,4 +1,4 @@ -/** +/*! * Various utility functions, mostly for mathematical calculation. */ -- cgit v1.2.3 From 1302198001ddba65c825d213476b2e049d376d08 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Thu, 11 Jan 2018 13:49:54 +0100 Subject: ... --- src/tikzit.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/tikzit.h b/src/tikzit.h index 1846b15..dc47a27 100644 --- a/src/tikzit.h +++ b/src/tikzit.h @@ -12,6 +12,9 @@ * that makes a change to the tikz file should be implemented as a QUndoCommand. Currently, * these are all in undocommands.h. * + * I've basically been adding documentation as I go. Other bits and pieces can be accessed + * by searching, or via the class list/class hierarchy links in the menu above. + * */ /*! -- cgit v1.2.3 From b7af46fb5b23890387628528c2cf6e310fc96c25 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Sun, 14 Jan 2018 18:50:34 +0100 Subject: add edge implementation 1/2 --- src/gui/tikzscene.cpp | 29 ++++++++++++++++++++++------- src/gui/tikzscene.h | 2 ++ 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/src/gui/tikzscene.cpp b/src/gui/tikzscene.cpp index edc1af4..1d7ebd0 100644 --- a/src/gui/tikzscene.cpp +++ b/src/gui/tikzscene.cpp @@ -12,6 +12,7 @@ TikzScene::TikzScene(TikzDocument *tikzDocument, QObject *parent) : QGraphicsScene(parent), _tikzDocument(tikzDocument) { _modifyEdgeItem = 0; + _edgeStartNodeItem = 0; _drawEdgeItem = new QGraphicsLineItem(); setSceneRect(-310,-230,620,450); @@ -124,10 +125,15 @@ void TikzScene::mousePressEvent(QGraphicsSceneMouseEvent *event) case ToolPalette::VERTEX: break; case ToolPalette::EDGE: - { - QLineF line(mousePos,mousePos); - _drawEdgeItem->setLine(line); - _drawEdgeItem->setVisible(true); + foreach (QGraphicsItem *gi, items(mousePos)) { + if (NodeItem *ni = dynamic_cast(gi)){ + _edgeStartNodeItem = ni; + _edgeEndNodeItem = ni; + QLineF line(toScreen(ni->node()->point()), mousePos); + _drawEdgeItem->setLine(line); + _drawEdgeItem->setVisible(true); + break; + } } break; case ToolPalette::CROP: @@ -232,8 +238,17 @@ void TikzScene::mouseMoveEvent(QGraphicsSceneMouseEvent *event) break; case ToolPalette::EDGE: if (_drawEdgeItem->isVisible()) { + _edgeEndNodeItem = 0; + foreach (QGraphicsItem *gi, items(mousePos)) { + if (NodeItem *ni = dynamic_cast(gi)){ + _edgeEndNodeItem = ni; + break; + } + } QPointF p1 = _drawEdgeItem->line().p1(); - QLineF line(p1, mousePos); + QPointF p2 = (_edgeEndNodeItem != 0) ? toScreen(_edgeEndNodeItem->node()->point()) : mousePos; + QLineF line(p1, p2); + _drawEdgeItem->setLine(line); } break; @@ -295,8 +310,8 @@ void TikzScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) QRectF grow(gridPos.x() - GLOBAL_SCALEF, gridPos.y() - GLOBAL_SCALEF, 2 * GLOBAL_SCALEF, 2 * GLOBAL_SCALEF); QRectF newBounds = sceneRect().united(grow); - qDebug() << grow; - qDebug() << newBounds; + //qDebug() << grow; + //qDebug() << newBounds; AddNodeCommand *cmd = new AddNodeCommand(this, n, newBounds); _tikzDocument->undoStack()->push(cmd); diff --git a/src/gui/tikzscene.h b/src/gui/tikzscene.h index 936d42e..5e236d7 100644 --- a/src/gui/tikzscene.h +++ b/src/gui/tikzscene.h @@ -48,6 +48,8 @@ private: QMap _edgeItems; QGraphicsLineItem *_drawEdgeItem; EdgeItem *_modifyEdgeItem; + NodeItem *_edgeStartNodeItem; + NodeItem *_edgeEndNodeItem; bool _firstControlPoint; QMap _oldNodePositions; -- cgit v1.2.3 From 4c4ced442811452e0a56800125db1620b2718c91 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Sun, 14 Jan 2018 19:01:59 +0100 Subject: add edge implementation 2/2 --- src/gui/tikzscene.cpp | 9 ++++++++- src/gui/undocommands.cpp | 24 ++++++++++++++++++++++++ src/gui/undocommands.h | 11 +++++++++++ 3 files changed, 43 insertions(+), 1 deletion(-) diff --git a/src/gui/tikzscene.cpp b/src/gui/tikzscene.cpp index 1d7ebd0..746e9dc 100644 --- a/src/gui/tikzscene.cpp +++ b/src/gui/tikzscene.cpp @@ -305,7 +305,7 @@ void TikzScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { int gridSize = GLOBAL_SCALE / 8; QPointF gridPos(round(mousePos.x()/gridSize)*gridSize, round(mousePos.y()/gridSize)*gridSize); - Node *n = new Node(); + Node *n = new Node(_tikzDocument); n->setPoint(fromScreen(gridPos)); QRectF grow(gridPos.x() - GLOBAL_SCALEF, gridPos.y() - GLOBAL_SCALEF, 2 * GLOBAL_SCALEF, 2 * GLOBAL_SCALEF); @@ -318,6 +318,13 @@ void TikzScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) } break; case ToolPalette::EDGE: + if (_edgeStartNodeItem != 0 && _edgeEndNodeItem != 0) { + Edge *e = new Edge(_edgeStartNodeItem->node(), _edgeEndNodeItem->node(), _tikzDocument); + AddEdgeCommand *cmd = new AddEdgeCommand(this, e); + _tikzDocument->undoStack()->push(cmd); + } + _edgeStartNodeItem = 0; + _edgeEndNodeItem = 0; _drawEdgeItem->setVisible(false); break; case ToolPalette::CROP: diff --git a/src/gui/undocommands.cpp b/src/gui/undocommands.cpp index 736c258..0fb235d 100644 --- a/src/gui/undocommands.cpp +++ b/src/gui/undocommands.cpp @@ -160,3 +160,27 @@ void AddNodeCommand::redo() _scene->setBounds(_newBounds); } + +AddEdgeCommand::AddEdgeCommand(TikzScene *scene, Edge *edge) : + _scene(scene), _edge(edge) +{ +} + +void AddEdgeCommand::undo() +{ + EdgeItem *ei = _scene->edgeItems()[_edge]; + _scene->removeItem(ei); + _scene->edgeItems().remove(_edge); + delete ei; + + _scene->graph()->removeEdge(_edge); +} + +void AddEdgeCommand::redo() +{ + // TODO: get the current style + _scene->graph()->addEdge(_edge); + EdgeItem *ei = new EdgeItem(_edge); + _scene->edgeItems().insert(_edge, ei); + _scene->addItem(ei); +} diff --git a/src/gui/undocommands.h b/src/gui/undocommands.h index 0a7dece..9032274 100644 --- a/src/gui/undocommands.h +++ b/src/gui/undocommands.h @@ -79,4 +79,15 @@ private: QRectF _newBounds; }; +class AddEdgeCommand : public QUndoCommand +{ +public: + explicit AddEdgeCommand(TikzScene *scene, Edge *edge); + void undo() override; + void redo() override; +private: + TikzScene *_scene; + Edge *_edge; +}; + #endif // UNDOCOMMANDS_H -- cgit v1.2.3 From d163561b49accb90dd9eb9028d9aa7c05266a539 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Sun, 21 Jan 2018 22:57:11 +0900 Subject: started style palette --- .gitignore | 1 + images/document-new.png | Bin 0 -> 692 bytes images/document-open.png | Bin 0 -> 919 bytes stylepalette.cpp | 14 ++++++++++++++ stylepalette.h | 22 ++++++++++++++++++++++ stylepalette.ui | 18 ++++++++++++++++++ tikzit.pro | 9 ++++++--- tikzit.qrc | 2 ++ 8 files changed, 63 insertions(+), 3 deletions(-) create mode 100644 images/document-new.png create mode 100644 images/document-open.png create mode 100644 stylepalette.cpp create mode 100644 stylepalette.h create mode 100644 stylepalette.ui diff --git a/.gitignore b/.gitignore index 22e1dab..f7651c0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .qmake.stash build-tikzit-* *.pro.user +*.autosave Makefile tikzit.app target_wrapper.sh diff --git a/images/document-new.png b/images/document-new.png new file mode 100644 index 0000000..e3808a1 Binary files /dev/null and b/images/document-new.png differ diff --git a/images/document-open.png b/images/document-open.png new file mode 100644 index 0000000..254a6b8 Binary files /dev/null and b/images/document-open.png differ diff --git a/stylepalette.cpp b/stylepalette.cpp new file mode 100644 index 0000000..ba0cd0d --- /dev/null +++ b/stylepalette.cpp @@ -0,0 +1,14 @@ +#include "stylepalette.h" +#include "ui_stylepalette.h" + +StylePalette::StylePalette(QWidget *parent) : + QDockWidget(parent), + ui(new Ui::StylePalette) +{ + ui->setupUi(this); +} + +StylePalette::~StylePalette() +{ + delete ui; +} diff --git a/stylepalette.h b/stylepalette.h new file mode 100644 index 0000000..8a90d95 --- /dev/null +++ b/stylepalette.h @@ -0,0 +1,22 @@ +#ifndef STYLEPALETTE_H +#define STYLEPALETTE_H + +#include + +namespace Ui { +class StylePalette; +} + +class StylePalette : public QDockWidget +{ + Q_OBJECT + +public: + explicit StylePalette(QWidget *parent = 0); + ~StylePalette(); + +private: + Ui::StylePalette *ui; +}; + +#endif // STYLEPALETTE_H diff --git a/stylepalette.ui b/stylepalette.ui new file mode 100644 index 0000000..dd4190e --- /dev/null +++ b/stylepalette.ui @@ -0,0 +1,18 @@ + + + StylePalette + + + + 0 + 0 + 400 + 300 + + + + DockWidget + + + + diff --git a/tikzit.pro b/tikzit.pro index b14822b..2e71e73 100644 --- a/tikzit.pro +++ b/tikzit.pro @@ -48,7 +48,8 @@ SOURCES += src/gui/mainwindow.cpp \ src/data/tikzdocument.cpp \ src/gui/undocommands.cpp \ src/gui/mainmenu.cpp \ - src/util.cpp + src/util.cpp \ + stylepalette.cpp HEADERS += src/gui/mainwindow.h \ src/gui/toolpalette.h \ @@ -70,11 +71,13 @@ HEADERS += src/gui/mainwindow.h \ src/data/tikzdocument.h \ src/gui/undocommands.h \ src/gui/mainmenu.h \ - src/util.h + src/util.h \ + stylepalette.h FORMS += src/gui/mainwindow.ui \ src/gui/propertypalette.ui \ - src/gui/mainmenu.ui + src/gui/mainmenu.ui \ + stylepalette.ui INCLUDEPATH += src src/gui src/data diff --git a/tikzit.qrc b/tikzit.qrc index 9f98a38..484b399 100644 --- a/tikzit.qrc +++ b/tikzit.qrc @@ -4,5 +4,7 @@ images/draw-path.png images/select-rectangular.png images/transform-crop-and-resize.png + images/document-new.png + images/document-open.png -- cgit v1.2.3 From 768e097abd17d07dd2748894b4dc1b09471dd6da Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Fri, 26 Jan 2018 22:34:15 +0900 Subject: started implementing project loader --- src/data/project.cpp | 13 ++++++ src/data/project.h | 21 +++++++++ src/data/tikzassembler.cpp | 54 +++++++++++++++++++++++ src/data/tikzassembler.h | 42 ++++++++++++++++++ src/data/tikzdocument.cpp | 4 +- src/data/tikzgraphassembler.cpp | 33 -------------- src/data/tikzgraphassembler.h | 31 ------------- src/data/tikzlexer.l | 3 +- src/data/tikzparser.y | 15 ++++++- src/data/tikzparserdefs.h | 2 +- src/gui/mainwindow.cpp | 2 +- src/gui/propertypalette.ui | 3 ++ src/test/testparser.cpp | 14 +++--- src/test/testtikzoutput.cpp | 4 +- src/tikzit.cpp | 2 + src/tikzit.h | 2 + stylepalette.cpp | 7 +++ stylepalette.h | 3 ++ stylepalette.ui | 96 ++++++++++++++++++++++++++++++++++++++--- tikzit.pro | 16 ++++--- tikzlexer.h | 4 +- 21 files changed, 276 insertions(+), 95 deletions(-) create mode 100644 src/data/project.cpp create mode 100644 src/data/project.h create mode 100644 src/data/tikzassembler.cpp create mode 100644 src/data/tikzassembler.h delete mode 100644 src/data/tikzgraphassembler.cpp delete mode 100644 src/data/tikzgraphassembler.h diff --git a/src/data/project.cpp b/src/data/project.cpp new file mode 100644 index 0000000..b129dc0 --- /dev/null +++ b/src/data/project.cpp @@ -0,0 +1,13 @@ +#include "project.h" + +#include "QDebug" + +Project::Project(QObject *parent) : QObject(parent) +{ + +} + +void Project::addStyle(QString name, GraphElementData *properties) +{ + qDebug() << "got style {" << name << "} = [" << properties << "]"; +} diff --git a/src/data/project.h b/src/data/project.h new file mode 100644 index 0000000..cbc2cb9 --- /dev/null +++ b/src/data/project.h @@ -0,0 +1,21 @@ +#ifndef PROJECT_H +#define PROJECT_H + +#include "graphelementdata.h" + +#include +#include + +class Project : public QObject +{ + Q_OBJECT +public: + explicit Project(QObject *parent = 0); + void addStyle(QString name, GraphElementData *properties); + +signals: + +public slots: +}; + +#endif // PROJECT_H diff --git a/src/data/tikzassembler.cpp b/src/data/tikzassembler.cpp new file mode 100644 index 0000000..456464a --- /dev/null +++ b/src/data/tikzassembler.cpp @@ -0,0 +1,54 @@ +#include "tikzassembler.h" + +#include "tikzparserdefs.h" +#include "tikzparser.parser.hpp" +#include "tikzlexer.h" + +int yyparse(void *scanner); + +TikzAssembler::TikzAssembler(Graph *graph, QObject *parent) : + QObject(parent), _graph(graph), _project(0) +{ + yylex_init(&scanner); + yyset_extra(this, scanner); +} + +TikzAssembler::TikzAssembler(Project *project, QObject *parent) : + QObject(parent), _graph(0), _project(project) +{ + yylex_init(&scanner); + yyset_extra(this, scanner); +} + +void TikzAssembler::addNodeToMap(Node *n) { _nodeMap.insert(n->name(), n); } +Node *TikzAssembler::nodeWithName(QString name) { return _nodeMap[name]; } + +bool TikzAssembler::parse(const QString &tikz) +{ + yy_scan_string(tikz.toLatin1().data(), scanner); + int result = yyparse(scanner); + + if (result == 0) return true; + else return false; +} + +Graph *TikzAssembler::graph() const +{ + return _graph; +} + +Project *TikzAssembler::project() const +{ + return _project; +} + +bool TikzAssembler::isGraph() const +{ + return _graph != 0; +} + +bool TikzAssembler::isProject() const +{ + return _project != 0; +} + diff --git a/src/data/tikzassembler.h b/src/data/tikzassembler.h new file mode 100644 index 0000000..8dbbc9b --- /dev/null +++ b/src/data/tikzassembler.h @@ -0,0 +1,42 @@ +/** + * Convenience class to hold the parser state while loading tikz graphs or projects. + */ + +#ifndef TIKZASSEMBLER_H +#define TIKZASSEMBLER_H + +#include "node.h" +#include "graph.h" +#include "project.h" + +#include +#include + +class TikzAssembler : public QObject +{ + Q_OBJECT +public: + explicit TikzAssembler(Graph *graph, QObject *parent = 0); + explicit TikzAssembler(Project *project, QObject *parent = 0); + void addNodeToMap(Node *n); + Node *nodeWithName(QString name); + bool parse(const QString &tikz); + + Graph *graph() const; + Project *project() const; + bool isGraph() const; + bool isProject() const; + + +signals: + +public slots: + +private: + QHash _nodeMap; + Graph *_graph; + Project *_project; + void *scanner; +}; + +#endif // TIKZASSEMBLER_H diff --git a/src/data/tikzdocument.cpp b/src/data/tikzdocument.cpp index 13d4c6e..a3fa961 100644 --- a/src/data/tikzdocument.cpp +++ b/src/data/tikzdocument.cpp @@ -5,7 +5,7 @@ #include #include "tikzdocument.h" -#include "tikzgraphassembler.h" +#include "tikzassembler.h" TikzDocument::TikzDocument(QObject *parent) : QObject(parent) { @@ -58,7 +58,7 @@ void TikzDocument::open(QString fileName) file.close(); Graph *newGraph = new Graph(this); - TikzGraphAssembler ass(newGraph); + TikzAssembler ass(newGraph); if (ass.parse(_tikz)) { delete _graph; _graph = newGraph; diff --git a/src/data/tikzgraphassembler.cpp b/src/data/tikzgraphassembler.cpp deleted file mode 100644 index c05a5c8..0000000 --- a/src/data/tikzgraphassembler.cpp +++ /dev/null @@ -1,33 +0,0 @@ -#include "tikzgraphassembler.h" - -#include "tikzparserdefs.h" -#include "tikzparser.parser.hpp" -#include "tikzlexer.h" - -int yyparse(void *scanner); - - -TikzGraphAssembler::TikzGraphAssembler(Graph *graph, QObject *parent) : - QObject(parent), _graph(graph) -{ - yylex_init(&scanner); - yyset_extra(this, scanner); -} - -void TikzGraphAssembler::addNodeToMap(Node *n) { _nodeMap.insert(n->name(), n); } -Node *TikzGraphAssembler::nodeWithName(QString name) { return _nodeMap[name]; } - -bool TikzGraphAssembler::parse(const QString &tikz) -{ - yy_scan_string(tikz.toLatin1().data(), scanner); - int result = yyparse(scanner); - - if (result == 0) return true; - else return false; -} - -Graph *TikzGraphAssembler::graph() const -{ - return _graph; -} - diff --git a/src/data/tikzgraphassembler.h b/src/data/tikzgraphassembler.h deleted file mode 100644 index 79b89b0..0000000 --- a/src/data/tikzgraphassembler.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef TIKZGRAPHASSEMBLER_H -#define TIKZGRAPHASSEMBLER_H - -#include "node.h" -#include "graph.h" - -#include -#include - -class TikzGraphAssembler : public QObject -{ - Q_OBJECT -public: - explicit TikzGraphAssembler(Graph *graph, QObject *parent = 0); - void addNodeToMap(Node *n); - Node *nodeWithName(QString name); - bool parse(const QString &tikz); - - Graph *graph() const; - -signals: - -public slots: - -private: - QHash _nodeMap; - Graph *_graph; - void *scanner; -}; - -#endif // TIKZGRAPHASSEMBLER_H diff --git a/src/data/tikzlexer.l b/src/data/tikzlexer.l index 800ef8e..faf0d43 100644 --- a/src/data/tikzlexer.l +++ b/src/data/tikzlexer.l @@ -38,11 +38,12 @@ %} %option reentrant bison-bridge bison-locations 8bit +%option bison-locations 8bit %option nounput %option yylineno %option noyywrap %option header-file="tikzlexer.h" -%option extra-type="TikzGraphAssembler *" +%option extra-type="TikzAssembler *" %s props %s xcoord diff --git a/src/data/tikzparser.y b/src/data/tikzparser.y index aa6ac76..a4db3dd 100644 --- a/src/data/tikzparser.y +++ b/src/data/tikzparser.y @@ -62,7 +62,7 @@ #include "graphelementproperty.h" #include "tikzlexer.h" -#import "tikzgraphassembler.h" +#import "tikzassembler.h" /* the assembler (used by this parser) is stored in the lexer state as "extra" data */ #define assembler yyget_extra(scanner) @@ -127,9 +127,20 @@ void yyerror(YYLTYPE *yylloc, void *scanner, const char *str) { %% + +tikz: tikzstyles | tikzpicture; + +tikzstyles: tikzstyles tikzstyle | ; +tikzstyle: "\\tikzstyle" DELIMITEDSTRING "=" "[" properties "]" + { + if (assembler->isProject()) { + assembler->project()->addStyle(QString($2), $5); + } + } + tikzpicture: "\\begin{tikzpicture}" optproperties tikzcmds "\\end{tikzpicture}" { - if ($2) { + if (assembler->isGraph() && $2) { assembler->graph()->setData($2); } }; diff --git a/src/data/tikzparserdefs.h b/src/data/tikzparserdefs.h index 9d4bfe8..b51a8c9 100644 --- a/src/data/tikzparserdefs.h +++ b/src/data/tikzparserdefs.h @@ -4,7 +4,7 @@ #include "graphelementproperty.h" #include "graphelementdata.h" #include "node.h" -#include "tikzgraphassembler.h" +#include "tikzassembler.h" #include #include diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 19b6a59..54474ae 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -1,6 +1,6 @@ #include "mainwindow.h" #include "ui_mainwindow.h" -#include "tikzgraphassembler.h" +#include "tikzassembler.h" #include "toolpalette.h" #include "tikzit.h" diff --git a/src/gui/propertypalette.ui b/src/gui/propertypalette.ui index 83d586e..a8ba5d2 100644 --- a/src/gui/propertypalette.ui +++ b/src/gui/propertypalette.ui @@ -10,6 +10,9 @@ 341 + + false + Properties diff --git a/src/test/testparser.cpp b/src/test/testparser.cpp index e220e2e..284930e 100644 --- a/src/test/testparser.cpp +++ b/src/test/testparser.cpp @@ -1,6 +1,6 @@ #include "testparser.h" #include "graph.h" -#include "tikzgraphassembler.h" +#include "tikzassembler.h" #include #include @@ -18,7 +18,7 @@ void TestParser::parseEmptyGraph() { Graph *g = new Graph(); - TikzGraphAssembler ga(g); + TikzAssembler ga(g); bool res = ga.parse("\\begin{tikzpicture}\n\\end{tikzpicture}"); QVERIFY(res); QVERIFY(g->nodes().size() == 0); @@ -29,7 +29,7 @@ void TestParser::parseEmptyGraph() void TestParser::parseNodeGraph() { Graph *g = new Graph(); - TikzGraphAssembler ga(g); + TikzAssembler ga(g); bool res = ga.parse( "\\begin{tikzpicture}\n" " \\node (node0) at (1.1, -2.2) {};\n" @@ -50,7 +50,7 @@ void TestParser::parseNodeGraph() void TestParser::parseEdgeGraph() { Graph *g = new Graph(); - TikzGraphAssembler ga(g); + TikzAssembler ga(g); bool res = ga.parse( "\\begin{tikzpicture}\n" " \\begin{pgfonlayer}{nodelayer}\n" @@ -81,7 +81,7 @@ void TestParser::parseEdgeGraph() void TestParser::parseEdgeNode() { Graph *g = new Graph(); - TikzGraphAssembler ga(g); + TikzAssembler ga(g); bool res = ga.parse( "\\begin{tikzpicture}\n" " \\begin{pgfonlayer}{nodelayer}\n" @@ -106,7 +106,7 @@ void TestParser::parseEdgeNode() void TestParser::parseEdgeBends() { Graph *g = new Graph(); - TikzGraphAssembler ga(g); + TikzAssembler ga(g); bool res = ga.parse( "\\begin{tikzpicture}\n" " \\begin{pgfonlayer}{nodelayer}\n" @@ -136,7 +136,7 @@ void TestParser::parseEdgeBends() void TestParser::parseBbox() { Graph *g = new Graph(); - TikzGraphAssembler ga(g); + TikzAssembler ga(g); bool res = ga.parse( "\\begin{tikzpicture}\n" " \\path [use as bounding box] (-1.5,-1.5) rectangle (1.5,1.5);\n" diff --git a/src/test/testtikzoutput.cpp b/src/test/testtikzoutput.cpp index f086786..1c25439 100644 --- a/src/test/testtikzoutput.cpp +++ b/src/test/testtikzoutput.cpp @@ -2,7 +2,7 @@ #include "graphelementproperty.h" #include "graphelementdata.h" #include "graph.h" -#include "tikzgraphassembler.h" +#include "tikzassembler.h" #include #include @@ -58,7 +58,7 @@ void TestTikzOutput::graphEmpty() void TestTikzOutput::graphFromTikz() { Graph *g = new Graph(); - TikzGraphAssembler ga(g); + TikzAssembler ga(g); QString tikz = "\\begin{tikzpicture}\n" diff --git a/src/tikzit.cpp b/src/tikzit.cpp index 42d16e8..a488b8a 100644 --- a/src/tikzit.cpp +++ b/src/tikzit.cpp @@ -18,11 +18,13 @@ Tikzit::Tikzit() _toolPalette = new ToolPalette(dummy); _propertyPalette = new PropertyPalette(dummy); + _stylePalette = new StylePalette(dummy); loadStyles(); _toolPalette->show(); _propertyPalette->show(); + _stylePalette->show(); _windows << new MainWindow(); _windows[0]->show(); diff --git a/src/tikzit.h b/src/tikzit.h index dc47a27..a241a78 100644 --- a/src/tikzit.h +++ b/src/tikzit.h @@ -36,6 +36,7 @@ #include "toolpalette.h" #include "propertypalette.h" +#include "stylepalette.h" #include "nodestyle.h" #include @@ -83,6 +84,7 @@ private: MainMenu *_mainMenu; ToolPalette *_toolPalette; PropertyPalette *_propertyPalette; + StylePalette *_stylePalette; QVector _windows; MainWindow *_activeWindow; QVector _nodeStyles; diff --git a/stylepalette.cpp b/stylepalette.cpp index ba0cd0d..2781a90 100644 --- a/stylepalette.cpp +++ b/stylepalette.cpp @@ -1,6 +1,8 @@ #include "stylepalette.h" #include "ui_stylepalette.h" +#include + StylePalette::StylePalette(QWidget *parent) : QDockWidget(parent), ui(new Ui::StylePalette) @@ -12,3 +14,8 @@ StylePalette::~StylePalette() { delete ui; } + +void StylePalette::on_buttonOpenProject_clicked() +{ + qDebug() << "got click"; +} diff --git a/stylepalette.h b/stylepalette.h index 8a90d95..99afe51 100644 --- a/stylepalette.h +++ b/stylepalette.h @@ -15,6 +15,9 @@ public: explicit StylePalette(QWidget *parent = 0); ~StylePalette(); +public slots: + void on_buttonOpenProject_clicked(); + private: Ui::StylePalette *ui; }; diff --git a/stylepalette.ui b/stylepalette.ui index dd4190e..941212b 100644 --- a/stylepalette.ui +++ b/stylepalette.ui @@ -1,18 +1,102 @@ - + StylePalette - + 0 0 - 400 - 300 + 250 + 350 + + + 250 + 350 + + - DockWidget + Styles - + + + + + 10 + 12 + 51 + 16 + + + + Project: + + + + + + 60 + 13 + 131 + 16 + + + + + Courier + 75 + true + + + + [default] + + + + + + 195 + 10 + 22 + 22 + + + + New Project + + + + + + + :/images/document-new.png:/images/document-new.png + + + + + + 220 + 10 + 22 + 22 + + + + New Project + + + + + + + :/images/document-open.png:/images/document-open.png + + + + + + + diff --git a/tikzit.pro b/tikzit.pro index 2e71e73..d3a9c62 100644 --- a/tikzit.pro +++ b/tikzit.pro @@ -35,7 +35,6 @@ SOURCES += src/gui/mainwindow.cpp \ src/data/graph.cpp \ src/data/node.cpp \ src/data/edge.cpp \ - src/data/tikzgraphassembler.cpp \ src/data/graphelementdata.cpp \ src/data/graphelementproperty.cpp \ src/gui/propertypalette.cpp \ @@ -49,7 +48,9 @@ SOURCES += src/gui/mainwindow.cpp \ src/gui/undocommands.cpp \ src/gui/mainmenu.cpp \ src/util.cpp \ - stylepalette.cpp + stylepalette.cpp \ + src/data/project.cpp \ + src/data/tikzassembler.cpp HEADERS += src/gui/mainwindow.h \ src/gui/toolpalette.h \ @@ -57,7 +58,6 @@ HEADERS += src/gui/mainwindow.h \ src/data/graph.h \ src/data/node.h \ src/data/edge.h \ - src/data/tikzgraphassembler.h \ src/data/graphelementdata.h \ src/data/graphelementproperty.h \ src/gui/propertypalette.h \ @@ -72,11 +72,13 @@ HEADERS += src/gui/mainwindow.h \ src/gui/undocommands.h \ src/gui/mainmenu.h \ src/util.h \ - stylepalette.h + stylepalette.h \ + src/data/project.h \ + src/data/tikzassembler.h -FORMS += src/gui/mainwindow.ui \ - src/gui/propertypalette.ui \ - src/gui/mainmenu.ui \ +FORMS += src/gui/mainwindow.ui \ + src/gui/propertypalette.ui \ + src/gui/mainmenu.ui \ stylepalette.ui INCLUDEPATH += src src/gui src/data diff --git a/tikzlexer.h b/tikzlexer.h index 6598601..73df7b6 100644 --- a/tikzlexer.h +++ b/tikzlexer.h @@ -234,7 +234,7 @@ void yyfree (void * ,yyscan_t yyscanner ); #include #endif -#define YY_EXTRA_TYPE TikzGraphAssembler * +#define YY_EXTRA_TYPE TikzAssembler * int yylex_init (yyscan_t* scanner); @@ -338,7 +338,7 @@ extern int yylex \ #undef YY_DECL #endif -#line 174 "src/data/tikzlexer.l" +#line 188 "src/data/tikzlexer.l" #line 344 "tikzlexer.h" #undef yyIN_HEADER -- cgit v1.2.3 From 09c331761648541de907c866c56fb6084c6f7a9b Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Thu, 15 Feb 2018 16:32:33 +0100 Subject: added support for changing edge mode, and started working on windows support --- images/Inkscape_icons_draw_calligraphic.svg | 201 ++++ images/Inkscape_icons_draw_ellipse.svg | 117 ++ images/Inkscape_icons_draw_path.svg | 177 +++ images/Inkscape_icons_draw_rectangle.svg | 95 ++ images/Inkscape_icons_edit_select_all.svg | 1513 ++++++++++++++++++++++++++ images/Inkscape_icons_node_segment_curve.svg | 50 + images/crop.svg | 47 + images/document-new.svg | 448 ++++++++ images/document-open.svg | 535 +++++++++ images/edge.svg | 64 ++ images/node.svg | 39 + images/select.svg | 90 ++ qt.conf | 2 + src/data/edge.cpp | 5 + src/data/edge.h | 1 + src/data/graphelementdata.h | 1 + src/gui/mainmenu.cpp | 5 + src/gui/mainmenu.h | 1 + src/gui/mainmenu.ui | 7 + src/gui/mainwindow.cpp | 17 +- src/gui/mainwindow.h | 4 + src/gui/mainwindow.ui | 8 +- src/gui/propertypalette.cpp | 2 +- src/gui/tikzscene.cpp | 24 +- src/gui/tikzscene.h | 5 +- src/gui/tikzview.cpp | 1 + src/gui/toolpalette.cpp | 10 +- src/gui/undocommands.cpp | 22 + src/gui/undocommands.h | 11 + src/main.cpp | 5 + src/tikzit.cpp | 17 +- src/tikzit.h | 1 + stylepalette.cpp | 14 + stylepalette.h | 3 + stylepalette.ui | 7 +- tikzit.qrc | 15 + 36 files changed, 3543 insertions(+), 21 deletions(-) create mode 100644 images/Inkscape_icons_draw_calligraphic.svg create mode 100644 images/Inkscape_icons_draw_ellipse.svg create mode 100644 images/Inkscape_icons_draw_path.svg create mode 100644 images/Inkscape_icons_draw_rectangle.svg create mode 100644 images/Inkscape_icons_edit_select_all.svg create mode 100644 images/Inkscape_icons_node_segment_curve.svg create mode 100644 images/crop.svg create mode 100644 images/document-new.svg create mode 100644 images/document-open.svg create mode 100644 images/edge.svg create mode 100644 images/node.svg create mode 100644 images/select.svg create mode 100644 qt.conf diff --git a/images/Inkscape_icons_draw_calligraphic.svg b/images/Inkscape_icons_draw_calligraphic.svg new file mode 100644 index 0000000..e1b3352 --- /dev/null +++ b/images/Inkscape_icons_draw_calligraphic.svg @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/images/Inkscape_icons_draw_ellipse.svg b/images/Inkscape_icons_draw_ellipse.svg new file mode 100644 index 0000000..26c4446 --- /dev/null +++ b/images/Inkscape_icons_draw_ellipse.svg @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/images/Inkscape_icons_draw_path.svg b/images/Inkscape_icons_draw_path.svg new file mode 100644 index 0000000..b7cb2db --- /dev/null +++ b/images/Inkscape_icons_draw_path.svg @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/images/Inkscape_icons_draw_rectangle.svg b/images/Inkscape_icons_draw_rectangle.svg new file mode 100644 index 0000000..7504d56 --- /dev/null +++ b/images/Inkscape_icons_draw_rectangle.svg @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/images/Inkscape_icons_edit_select_all.svg b/images/Inkscape_icons_edit_select_all.svg new file mode 100644 index 0000000..0da2e0b --- /dev/null +++ b/images/Inkscape_icons_edit_select_all.svg @@ -0,0 +1,1513 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/images/Inkscape_icons_node_segment_curve.svg b/images/Inkscape_icons_node_segment_curve.svg new file mode 100644 index 0000000..fad6969 --- /dev/null +++ b/images/Inkscape_icons_node_segment_curve.svg @@ -0,0 +1,50 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/images/crop.svg b/images/crop.svg new file mode 100644 index 0000000..226faa8 --- /dev/null +++ b/images/crop.svg @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/images/document-new.svg b/images/document-new.svg new file mode 100644 index 0000000..1bfdb16 --- /dev/null +++ b/images/document-new.svg @@ -0,0 +1,448 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + New Document + + + Jakub Steiner + + + http://jimmac.musichall.cz + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/images/document-open.svg b/images/document-open.svg new file mode 100644 index 0000000..55e6177 --- /dev/null +++ b/images/document-open.svg @@ -0,0 +1,535 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Folder Icon Accept + 2005-01-31 + + + Jakub Steiner + + + + http://jimmac.musichall.cz + Active state - when files are being dragged to. + + + Novell, Inc. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/images/edge.svg b/images/edge.svg new file mode 100644 index 0000000..f4a9716 --- /dev/null +++ b/images/edge.svg @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/images/node.svg b/images/node.svg new file mode 100644 index 0000000..c728086 --- /dev/null +++ b/images/node.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/images/select.svg b/images/select.svg new file mode 100644 index 0000000..7ffc893 --- /dev/null +++ b/images/select.svg @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/qt.conf b/qt.conf new file mode 100644 index 0000000..81319bc --- /dev/null +++ b/qt.conf @@ -0,0 +1,2 @@ +[Platforms] +WindowsArguments = dpiawareness=1 diff --git a/src/data/edge.cpp b/src/data/edge.cpp index 6802b2d..e4d5d69 100644 --- a/src/data/edge.cpp +++ b/src/data/edge.cpp @@ -278,6 +278,11 @@ float Edge::cpDist() const return _cpDist; } +void Edge::setBasicBendMode(bool mode) +{ + _basicBendMode = mode; +} + void Edge::setBend(int bend) { _bend = bend; diff --git a/src/data/edge.h b/src/data/edge.h index d2913b8..595b094 100644 --- a/src/data/edge.h +++ b/src/data/edge.h @@ -50,6 +50,7 @@ public: bool basicBendMode() const; float cpDist() const; + void setBasicBendMode(bool mode); void setBend(int bend); void setInAngle(int inAngle); void setOutAngle(int outAngle); diff --git a/src/data/graphelementdata.h b/src/data/graphelementdata.h index 1139a00..0d43bb8 100644 --- a/src/data/graphelementdata.h +++ b/src/data/graphelementdata.h @@ -22,6 +22,7 @@ public: QString property(QString key); bool atom(QString atom); + QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE; QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; diff --git a/src/gui/mainmenu.cpp b/src/gui/mainmenu.cpp index c9e83ba..714ed34 100644 --- a/src/gui/mainmenu.cpp +++ b/src/gui/mainmenu.cpp @@ -32,6 +32,11 @@ void MainMenu::on_actionSave_As_triggered() // TODO } +void MainMenu::on_actionExit_triggered() +{ + tikzit->quit(); +} + // Edit void MainMenu::on_actionUndo_triggered() diff --git a/src/gui/mainmenu.h b/src/gui/mainmenu.h index d85e271..ee167e6 100644 --- a/src/gui/mainmenu.h +++ b/src/gui/mainmenu.h @@ -21,6 +21,7 @@ public slots: void on_actionClose_triggered(); void on_actionSave_triggered(); void on_actionSave_As_triggered(); + void on_actionExit_triggered(); // Edit void on_actionUndo_triggered(); diff --git a/src/gui/mainmenu.ui b/src/gui/mainmenu.ui index c9b6f44..2f15d5a 100644 --- a/src/gui/mainmenu.ui +++ b/src/gui/mainmenu.ui @@ -20,6 +20,8 @@ + + @@ -177,6 +179,11 @@ Ctrl+- + + + Exit + + diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 54474ae..eac7c44 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -1,5 +1,7 @@ #include "mainwindow.h" #include "ui_mainwindow.h" + +#include "mainmenu.h" #include "tikzassembler.h" #include "toolpalette.h" #include "tikzit.h" @@ -22,11 +24,22 @@ MainWindow::MainWindow(QWidget *parent) : ui->setupUi(this); setAttribute(Qt::WA_DeleteOnClose, true); _tikzDocument = new TikzDocument(this); - _tikzScene = new TikzScene(_tikzDocument, this); + + _tools = new ToolPalette(this); + addToolBar(_tools); + + _tikzScene = new TikzScene(_tikzDocument, _tools, this); ui->tikzView->setScene(_tikzScene); _fileName = ""; _pristine = true; + + // TODO: check if each window should have a menu + _menu = new MainMenu(); + _menu->setParent(this); + + setMenuBar(_menu); + // initially, the source view should be collapsed QList sz = ui->splitter->sizes(); sz[0] = sz[0] + sz[1]; @@ -59,7 +72,7 @@ void MainWindow::open(QString fileName) void MainWindow::closeEvent(QCloseEvent *event) { - //qDebug() << "got close event"; + qDebug() << "got close event"; QMainWindow::closeEvent(event); } diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h index 8adf1bc..ba680b0 100644 --- a/src/gui/mainwindow.h +++ b/src/gui/mainwindow.h @@ -9,6 +9,8 @@ #include "tikzview.h" #include "graph.h" #include "tikzdocument.h" +#include "mainmenu.h" +#include "toolpalette.h" #include #include @@ -38,6 +40,8 @@ protected: private: TikzScene *_tikzScene; TikzDocument *_tikzDocument; + MainMenu *_menu; + ToolPalette *_tools; Ui::MainWindow *ui; QString _fileName; bool _pristine; diff --git a/src/gui/mainwindow.ui b/src/gui/mainwindow.ui index 56a5c2d..137d6cf 100644 --- a/src/gui/mainwindow.ui +++ b/src/gui/mainwindow.ui @@ -7,13 +7,19 @@ 0 0 640 - 480 + 580 TikZiT - untitled + + + 0 + 0 + + 0 diff --git a/src/gui/propertypalette.cpp b/src/gui/propertypalette.cpp index b06e866..3e4ba88 100644 --- a/src/gui/propertypalette.cpp +++ b/src/gui/propertypalette.cpp @@ -22,7 +22,7 @@ PropertyPalette::PropertyPalette(QWidget *parent) : d->setProperty("key 2", "value 2"); //QModelIndex i = d->index(0,0); - ui->treeView->setModel(d); + //ui->treeView->setModel(d); QSettings settings("tikzit", "tikzit"); QVariant geom = settings.value("property-palette-geometry"); diff --git a/src/gui/tikzscene.cpp b/src/gui/tikzscene.cpp index 746e9dc..a3dd8ce 100644 --- a/src/gui/tikzscene.cpp +++ b/src/gui/tikzscene.cpp @@ -8,8 +8,8 @@ #include -TikzScene::TikzScene(TikzDocument *tikzDocument, QObject *parent) : - QGraphicsScene(parent), _tikzDocument(tikzDocument) +TikzScene::TikzScene(TikzDocument *tikzDocument, ToolPalette *tools, QObject *parent) : + QGraphicsScene(parent), _tikzDocument(tikzDocument), _tools(tools) { _modifyEdgeItem = 0; _edgeStartNodeItem = 0; @@ -73,7 +73,7 @@ void TikzScene::mousePressEvent(QGraphicsSceneMouseEvent *event) qreal cpR = GLOBAL_SCALEF * (0.05); qreal cpR2 = cpR * cpR; - switch (tikzit->toolPalette()->currentTool()) { + switch (_tools->currentTool()) { case ToolPalette::SELECT: // check if we grabbed a control point of an edge foreach (QGraphicsItem *gi, selectedItems()) { @@ -145,8 +145,10 @@ void TikzScene::mouseMoveEvent(QGraphicsSceneMouseEvent *event) { // current mouse position, in scene coordinates QPointF mousePos = event->scenePos(); + QRectF rb = views()[0]->rubberBandRect(); + invalidate(-800,-800,1600,1600); - switch (tikzit->toolPalette()->currentTool()) { + switch (_tools->currentTool()) { case ToolPalette::SELECT: if (_modifyEdgeItem != 0) { Edge *e = _modifyEdgeItem->edge(); @@ -262,7 +264,7 @@ void TikzScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) // current mouse position, in scene coordinates QPointF mousePos = event->scenePos(); - switch (tikzit->toolPalette()->currentTool()) { + switch (_tools->currentTool()) { case ToolPalette::SELECT: if (_modifyEdgeItem != 0) { // finished dragging a control point @@ -361,6 +363,18 @@ void TikzScene::keyReleaseEvent(QKeyEvent *event) } } +void TikzScene::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) +{ + QPointF mousePos = event->scenePos(); + foreach (QGraphicsItem *gi, items(mousePos)) { + if (EdgeItem *ei = dynamic_cast(gi)) { + ChangeEdgeModeCommand *cmd = new ChangeEdgeModeCommand(this, ei->edge()); + _tikzDocument->undoStack()->push(cmd); + break; + } + } +} + void TikzScene::getSelection(QSet &selNodes, QSet &selEdges) { foreach (QGraphicsItem *gi, selectedItems()) { diff --git a/src/gui/tikzscene.h b/src/gui/tikzscene.h index 5e236d7..cb684b2 100644 --- a/src/gui/tikzscene.h +++ b/src/gui/tikzscene.h @@ -10,6 +10,7 @@ #include "nodeitem.h" #include "edgeitem.h" #include "tikzdocument.h" +#include "toolpalette.h" #include #include @@ -23,7 +24,7 @@ class TikzScene : public QGraphicsScene { Q_OBJECT public: - TikzScene(TikzDocument *tikzDocument, QObject *parent); + TikzScene(TikzDocument *tikzDocument, ToolPalette *tools, QObject *parent); ~TikzScene(); Graph *graph(); QMap &nodeItems(); @@ -42,8 +43,10 @@ protected: void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override; void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; void keyReleaseEvent(QKeyEvent *event) override; + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override; private: TikzDocument *_tikzDocument; + ToolPalette *_tools; QMap _nodeItems; QMap _edgeItems; QGraphicsLineItem *_drawEdgeItem; diff --git a/src/gui/tikzview.cpp b/src/gui/tikzview.cpp index fe6c401..b8ae1c0 100644 --- a/src/gui/tikzview.cpp +++ b/src/gui/tikzview.cpp @@ -2,6 +2,7 @@ #include "tikzit.h" #include +#include TikzView::TikzView(QWidget *parent) : QGraphicsView(parent) { diff --git a/src/gui/toolpalette.cpp b/src/gui/toolpalette.cpp index 3c08bce..430df3f 100644 --- a/src/gui/toolpalette.cpp +++ b/src/gui/toolpalette.cpp @@ -13,14 +13,14 @@ ToolPalette::ToolPalette(QWidget *parent) : | Qt::WindowDoesNotAcceptFocus); setOrientation(Qt::Vertical); setFocusPolicy(Qt::NoFocus); - setGeometry(100,200,30,195); + //setGeometry(100,200,30,195); tools = new QActionGroup(this); - select = new QAction(QIcon(":/images/select-rectangular.png"), "Select"); - vertex = new QAction(QIcon(":/images/draw-ellipse.png"), "Add Vertex"); - edge = new QAction(QIcon(":/images/draw-path.png"), "Add Edge"); - crop = new QAction(QIcon(":/images/transform-crop-and-resize.png"), "Bounding Box"); + select = new QAction(QIcon(":/images/Inkscape_icons_edit_select_all.svg"), "Select"); + vertex = new QAction(QIcon(":/images/Inkscape_icons_draw_ellipse.svg"), "Add Vertex"); + edge = new QAction(QIcon(":/images/Inkscape_icons_draw_path.svg"), "Add Edge"); + crop = new QAction(QIcon(":/images/Inkscape_icons_draw_rectangle.svg"), "Bounding Box"); tools->addAction(select); tools->addAction(vertex); diff --git a/src/gui/undocommands.cpp b/src/gui/undocommands.cpp index 0fb235d..9c6a9c3 100644 --- a/src/gui/undocommands.cpp +++ b/src/gui/undocommands.cpp @@ -183,4 +183,26 @@ void AddEdgeCommand::redo() EdgeItem *ei = new EdgeItem(_edge); _scene->edgeItems().insert(_edge, ei); _scene->addItem(ei); + + // edges should always be stacked below nodes + if (!_scene->graph()->nodes().isEmpty()) { + ei->stackBefore(_scene->nodeItems()[_scene->graph()->nodes().first()]); + } +} + +ChangeEdgeModeCommand::ChangeEdgeModeCommand(TikzScene *scene, Edge *edge) : + _scene(scene), _edge(edge) +{ +} + +void ChangeEdgeModeCommand::undo() +{ + _edge->setBasicBendMode(!_edge->basicBendMode()); + _scene->edgeItems()[_edge]->readPos(); +} + +void ChangeEdgeModeCommand::redo() +{ + _edge->setBasicBendMode(!_edge->basicBendMode()); + _scene->edgeItems()[_edge]->readPos(); } diff --git a/src/gui/undocommands.h b/src/gui/undocommands.h index 9032274..eea39ae 100644 --- a/src/gui/undocommands.h +++ b/src/gui/undocommands.h @@ -90,4 +90,15 @@ private: Edge *_edge; }; +class ChangeEdgeModeCommand : public QUndoCommand +{ +public: + explicit ChangeEdgeModeCommand(TikzScene *scene, Edge *edge); + void undo() override; + void redo() override; +private: + TikzScene *_scene; + Edge *_edge; +}; + #endif // UNDOCOMMANDS_H diff --git a/src/main.cpp b/src/main.cpp index 6b14549..96069ef 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -10,8 +10,13 @@ #include + + int main(int argc, char *argv[]) { + QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); + //QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling); QApplication a(argc, argv); a.setQuitOnLastWindowClosed(false); tikzit = new Tikzit(); diff --git a/src/tikzit.cpp b/src/tikzit.cpp index a488b8a..746268c 100644 --- a/src/tikzit.cpp +++ b/src/tikzit.cpp @@ -22,8 +22,8 @@ Tikzit::Tikzit() loadStyles(); - _toolPalette->show(); - _propertyPalette->show(); + //_toolPalette->show(); + //_propertyPalette->show(); _stylePalette->show(); _windows << new MainWindow(); @@ -73,8 +73,11 @@ void Tikzit::removeWindow(MainWindow *w) { _windows.removeAll(w); if (_activeWindow == w) { - if (_windows.isEmpty()) _activeWindow = 0; - else _activeWindow = _windows[0]; + if (_windows.isEmpty()) { + _activeWindow = 0; + // TODO: check if we should quit when last window closed + quit(); + } else _activeWindow = _windows[0]; } } @@ -105,3 +108,9 @@ void Tikzit::open() } } } + +void Tikzit::quit() +{ + _stylePalette->close(); + QApplication::quit(); +} diff --git a/src/tikzit.h b/src/tikzit.h index a241a78..07878aa 100644 --- a/src/tikzit.h +++ b/src/tikzit.h @@ -76,6 +76,7 @@ public: void newDoc(); void open(); + void quit(); private: // void createMenu(); diff --git a/stylepalette.cpp b/stylepalette.cpp index 2781a90..312f675 100644 --- a/stylepalette.cpp +++ b/stylepalette.cpp @@ -2,12 +2,19 @@ #include "ui_stylepalette.h" #include +#include StylePalette::StylePalette(QWidget *parent) : QDockWidget(parent), ui(new Ui::StylePalette) { ui->setupUi(this); + + QSettings settings("tikzit", "tikzit"); + QVariant geom = settings.value("style-palette-geometry"); + if (geom != QVariant()) { + restoreGeometry(geom.toByteArray()); + } } StylePalette::~StylePalette() @@ -19,3 +26,10 @@ void StylePalette::on_buttonOpenProject_clicked() { qDebug() << "got click"; } + +void StylePalette::closeEvent(QCloseEvent *event) +{ + QSettings settings("tikzit", "tikzit"); + settings.setValue("style-palette-geometry", saveGeometry()); + QDockWidget::closeEvent(event); +} diff --git a/stylepalette.h b/stylepalette.h index 99afe51..b5c16f1 100644 --- a/stylepalette.h +++ b/stylepalette.h @@ -20,6 +20,9 @@ public slots: private: Ui::StylePalette *ui; + +protected: + void closeEvent(QCloseEvent *event) override; }; #endif // STYLEPALETTE_H diff --git a/stylepalette.ui b/stylepalette.ui index 941212b..8068ea4 100644 --- a/stylepalette.ui +++ b/stylepalette.ui @@ -16,6 +16,9 @@ 350 + + true + Styles @@ -70,7 +73,7 @@ - :/images/document-new.png:/images/document-new.png + :/images/document-new.svg:/images/document-new.svg @@ -90,7 +93,7 @@ - :/images/document-open.png:/images/document-open.png + :/images/document-open.svg:/images/document-open.svg diff --git a/tikzit.qrc b/tikzit.qrc index 484b399..65cfcd9 100644 --- a/tikzit.qrc +++ b/tikzit.qrc @@ -6,5 +6,20 @@ images/transform-crop-and-resize.png images/document-new.png images/document-open.png + images/document-new.svg + images/document-open.svg + images/Inkscape_icons_draw_calligraphic.svg + images/Inkscape_icons_draw_ellipse.svg + images/Inkscape_icons_draw_path.svg + images/Inkscape_icons_draw_rectangle.svg + images/Inkscape_icons_node_segment_curve.svg + images/Inkscape_icons_edit_select_all.svg + images/crop.svg + images/edge.svg + images/node.svg + images/select.svg + + + qt.conf -- cgit v1.2.3 From 39c2c74c664a6c770639ead8f45322352cacb997 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Mon, 12 Mar 2018 21:44:49 +0100 Subject: style loading works --- images/crop.svg | 48 +--------- images/refresh.svg | 1 + src/data/graphelementdata.cpp | 2 +- src/data/node.cpp | 2 +- src/data/nodestyle.cpp | 119 +++++++++++++++++++++---- src/data/nodestyle.h | 32 +++++-- src/data/project.cpp | 13 --- src/data/project.h | 21 ----- src/data/tikzassembler.cpp | 14 +-- src/data/tikzassembler.h | 10 +-- src/data/tikzlexer.l | 2 + src/data/tikzparser.y | 7 +- src/data/tikzstyles.cpp | 36 ++++++++ src/data/tikzstyles.h | 29 +++++++ src/gui/nodeitem.cpp | 6 +- src/gui/toolpalette.cpp | 2 +- src/main.cpp | 1 + src/tikzit.cpp | 91 ++++++++++++++----- src/tikzit.h | 14 ++- stylepalette.cpp | 33 ++++++- stylepalette.h | 5 +- stylepalette.ui | 197 ++++++++++++++++++++++++++---------------- tikzit.pro | 8 +- tikzit.qrc | 1 + 24 files changed, 457 insertions(+), 237 deletions(-) create mode 100644 images/refresh.svg delete mode 100644 src/data/project.cpp delete mode 100644 src/data/project.h create mode 100644 src/data/tikzstyles.cpp create mode 100644 src/data/tikzstyles.h diff --git a/images/crop.svg b/images/crop.svg index 226faa8..d10e9ba 100644 --- a/images/crop.svg +++ b/images/crop.svg @@ -1,47 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/images/refresh.svg b/images/refresh.svg new file mode 100644 index 0000000..29dff8a --- /dev/null +++ b/images/refresh.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/data/graphelementdata.cpp b/src/data/graphelementdata.cpp index 41fcbf0..43f7516 100644 --- a/src/data/graphelementdata.cpp +++ b/src/data/graphelementdata.cpp @@ -66,7 +66,7 @@ QString GraphElementData::property(QString key) if (i != -1) { return _properties[i].value(); } else { - return 0; + return QString(); // null QString } } diff --git a/src/data/node.cpp b/src/data/node.cpp index f94a3df..c78f49c 100644 --- a/src/data/node.cpp +++ b/src/data/node.cpp @@ -70,7 +70,7 @@ void Node::setStyleName(const QString &styleName) void Node::attachStyle() { if (_styleName == "none") _style = noneStyle; - else _style = tikzit->nodeStyle(_styleName); + else _style = tikzit->styles()->nodeStyle(_styleName); } NodeStyle *Node::style() const diff --git a/src/data/nodestyle.cpp b/src/data/nodestyle.cpp index 7eca791..e38d3a3 100644 --- a/src/data/nodestyle.cpp +++ b/src/data/nodestyle.cpp @@ -1,32 +1,113 @@ #include "nodestyle.h" +#include NodeStyle *noneStyle = new NodeStyle(); -NodeStyle::NodeStyle() +NodeStyle::NodeStyle() : _name("none"), _data(0) { - name = "none"; - shape = NodeShape::Circle; - fillColor = Qt::white; - strokeColor = Qt::black; - strokeThickness = 1; } -NodeStyle::NodeStyle(QString nm, NodeShape sh, QColor fillCol) + +NodeStyle::NodeStyle(QString name, GraphElementData *data): _name(name), _data(data) +{ +} + +bool NodeStyle::isNone() { return _data == 0; } + +GraphElementData *NodeStyle::data() const +{ + return _data; +} + +QString NodeStyle::name() const +{ + return _name; +} + +NodeShape NodeStyle::shape() const { - name = nm; - shape = sh; - fillColor = fillCol; - strokeColor = Qt::black; - strokeThickness = 1; + QString sh = _data->property("shape"); + if (sh.isNull()) return NodeShape::Circle; + else if (sh == "circle") return NodeShape::Circle; + else if (sh == "rectangle") return NodeShape::Rectangle; + else return NodeShape::Circle; } -NodeStyle::NodeStyle(QString nm, NodeShape sh, QColor fillCol, QColor strokeCol, int strokeThick) +QColor NodeStyle::fillColor() const { - name = nm; - shape = sh; - fillColor = fillCol; - strokeColor = strokeCol; - strokeThickness = strokeThick; + QString col = _data->property("fill"); + + if (col.isNull()) { + return QColor(Qt::white); + } else { + QColor namedColor(col); + if (namedColor.isValid()) { + return namedColor; + } else { + // TODO: read RGB colors + return QColor(Qt::white); + } + } +} + +QColor NodeStyle::strokeColor() const +{ + QString col = _data->property("draw"); + + if (col.isNull()) { + return QColor(Qt::black); + } else { + QColor namedColor(col); + if (namedColor.isValid()) { + return namedColor; + } else { + // TODO: read RGB colors + return QColor(Qt::white); + } + } +} + +int NodeStyle::strokeThickness() const +{ + return 1; +} + +QPen NodeStyle::pen() const +{ + QPen p(strokeColor()); + p.setWidthF((float)strokeThickness() * 3.0f); + return p; +} + +QBrush NodeStyle::brush() const +{ + return QBrush(fillColor()); +} + +QPainterPath NodeStyle::path() const +{ + QPainterPath pth; + pth.addEllipse(QPointF(0.0f,0.0f), 30.0f, 30.0f); + return pth; +} + +QPainterPath NodeStyle::palettePath() const +{ + return path(); +} + +QIcon NodeStyle::icon() const +{ + // draw an icon matching the style + QPixmap px(100,100); + px.fill(Qt::transparent); + QPainter painter(&px); + QPainterPath pth = path(); + painter.setPen(pen()); + painter.setBrush(brush()); + + pth.translate(50.0f, 50.0f); + painter.drawPath(pth); + return QIcon(px); } -bool NodeStyle::isNone() { return name == "none"; } diff --git a/src/data/nodestyle.h b/src/data/nodestyle.h index 00d1b20..58c0c12 100644 --- a/src/data/nodestyle.h +++ b/src/data/nodestyle.h @@ -1,24 +1,40 @@ #ifndef NODESTYLE_H #define NODESTYLE_H +#include "graphelementdata.h" + #include +#include +#include +#include +#include enum NodeShape { - Square, UpTriangle, DownTriangle, Circle + Rectangle, UpTriangle, DownTriangle, Circle }; class NodeStyle { public: NodeStyle(); - NodeStyle(QString nm, NodeShape sh, QColor fillCol); - NodeStyle(QString nm, NodeShape sh, QColor fillCol, QColor strokeCol, int strokeThick); + NodeStyle(QString name, GraphElementData *data); bool isNone(); - QString name; - NodeShape shape; - QColor fillColor; - QColor strokeColor; - int strokeThickness; + + GraphElementData *data() const; + QString name() const; + NodeShape shape() const; + QColor fillColor() const; + QColor strokeColor() const; + int strokeThickness() const; + + QPen pen() const; + QBrush brush() const; + QPainterPath path() const; + QPainterPath palettePath() const; + QIcon icon() const; +private: + QString _name; + GraphElementData *_data; }; extern NodeStyle *noneStyle; diff --git a/src/data/project.cpp b/src/data/project.cpp deleted file mode 100644 index b129dc0..0000000 --- a/src/data/project.cpp +++ /dev/null @@ -1,13 +0,0 @@ -#include "project.h" - -#include "QDebug" - -Project::Project(QObject *parent) : QObject(parent) -{ - -} - -void Project::addStyle(QString name, GraphElementData *properties) -{ - qDebug() << "got style {" << name << "} = [" << properties << "]"; -} diff --git a/src/data/project.h b/src/data/project.h deleted file mode 100644 index cbc2cb9..0000000 --- a/src/data/project.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef PROJECT_H -#define PROJECT_H - -#include "graphelementdata.h" - -#include -#include - -class Project : public QObject -{ - Q_OBJECT -public: - explicit Project(QObject *parent = 0); - void addStyle(QString name, GraphElementData *properties); - -signals: - -public slots: -}; - -#endif // PROJECT_H diff --git a/src/data/tikzassembler.cpp b/src/data/tikzassembler.cpp index 456464a..e0197da 100644 --- a/src/data/tikzassembler.cpp +++ b/src/data/tikzassembler.cpp @@ -7,14 +7,14 @@ int yyparse(void *scanner); TikzAssembler::TikzAssembler(Graph *graph, QObject *parent) : - QObject(parent), _graph(graph), _project(0) + QObject(parent), _graph(graph), _tikzStyles(0) { yylex_init(&scanner); yyset_extra(this, scanner); } -TikzAssembler::TikzAssembler(Project *project, QObject *parent) : - QObject(parent), _graph(0), _project(project) +TikzAssembler::TikzAssembler(TikzStyles *tikzStyles, QObject *parent) : + QObject(parent), _graph(0), _tikzStyles(tikzStyles) { yylex_init(&scanner); yyset_extra(this, scanner); @@ -37,9 +37,9 @@ Graph *TikzAssembler::graph() const return _graph; } -Project *TikzAssembler::project() const +TikzStyles *TikzAssembler::tikzStyles() const { - return _project; + return _tikzStyles; } bool TikzAssembler::isGraph() const @@ -47,8 +47,8 @@ bool TikzAssembler::isGraph() const return _graph != 0; } -bool TikzAssembler::isProject() const +bool TikzAssembler::isTikzStyles() const { - return _project != 0; + return _tikzStyles != 0; } diff --git a/src/data/tikzassembler.h b/src/data/tikzassembler.h index 8dbbc9b..38d67a7 100644 --- a/src/data/tikzassembler.h +++ b/src/data/tikzassembler.h @@ -7,7 +7,7 @@ #include "node.h" #include "graph.h" -#include "project.h" +#include "tikzstyles.h" #include #include @@ -17,15 +17,15 @@ class TikzAssembler : public QObject Q_OBJECT public: explicit TikzAssembler(Graph *graph, QObject *parent = 0); - explicit TikzAssembler(Project *project, QObject *parent = 0); + explicit TikzAssembler(TikzStyles *tikzStyles, QObject *parent = 0); void addNodeToMap(Node *n); Node *nodeWithName(QString name); bool parse(const QString &tikz); Graph *graph() const; - Project *project() const; + TikzStyles *tikzStyles() const; bool isGraph() const; - bool isProject() const; + bool isTikzStyles() const; signals: @@ -35,7 +35,7 @@ public slots: private: QHash _nodeMap; Graph *_graph; - Project *_project; + TikzStyles *_tikzStyles; void *scanner; }; diff --git a/src/data/tikzlexer.l b/src/data/tikzlexer.l index faf0d43..0a7ff39 100644 --- a/src/data/tikzlexer.l +++ b/src/data/tikzlexer.l @@ -68,6 +68,7 @@ FLOAT \-?[0-9]*(\.[0-9]+)? \\begin\{tikzpicture\} { return BEGIN_TIKZPICTURE_CMD; } \\end\{tikzpicture\} { return END_TIKZPICTURE_CMD; } +\\tikzstyle { return TIKZSTYLE_CMD; } \\begin\{pgfonlayer\} { return BEGIN_PGFONLAYER_CMD; } \\end\{pgfonlayer\} { return END_PGFONLAYER_CMD; } \\draw { return DRAW_CMD; } @@ -78,6 +79,7 @@ node { return NODE; } at { return AT; } to { return TO; } ; { return SEMICOLON; } += { return EQUALS; } \([ ]*{FLOAT}[ ]*,[ ]*{FLOAT}[ ]*\) { yylloc->last_column = yylloc->first_column + 1; diff --git a/src/data/tikzparser.y b/src/data/tikzparser.y index a4db3dd..76674f1 100644 --- a/src/data/tikzparser.y +++ b/src/data/tikzparser.y @@ -7,7 +7,7 @@ /* * Copyright 2010 Chris Heunen - * Copyright 2010-2013 Aleks Kissinger + * Copyright 2010-2017 Aleks Kissinger * Copyright 2013 K. Johan Paulsson * Copyright 2013 Alex Merry * @@ -85,6 +85,7 @@ void yyerror(YYLTYPE *yylloc, void *scanner, const char *str) { %token BEGIN_TIKZPICTURE_CMD "\\begin{tikzpicture}" %token END_TIKZPICTURE_CMD "\\end{tikzpicture}" +%token TIKZSTYLE_CMD "\\tikzstyle" %token BEGIN_PGFONLAYER_CMD "\\begin{pgfonlayer}" %token END_PGFONLAYER_CMD "\\end{pgfonlayer}" %token DRAW_CMD "\\draw" @@ -133,8 +134,8 @@ tikz: tikzstyles | tikzpicture; tikzstyles: tikzstyles tikzstyle | ; tikzstyle: "\\tikzstyle" DELIMITEDSTRING "=" "[" properties "]" { - if (assembler->isProject()) { - assembler->project()->addStyle(QString($2), $5); + if (assembler->isTikzStyles()) { + assembler->tikzStyles()->addStyle(QString($2), $5); } } diff --git a/src/data/tikzstyles.cpp b/src/data/tikzstyles.cpp new file mode 100644 index 0000000..186e19b --- /dev/null +++ b/src/data/tikzstyles.cpp @@ -0,0 +1,36 @@ +#include "tikzstyles.h" +#include "nodestyle.h" + +#include + +TikzStyles::TikzStyles(QObject *parent) : QObject(parent) +{ + +} + +NodeStyle *TikzStyles::nodeStyle(QString name) const +{ + foreach (NodeStyle *s , _nodeStyles) + if (s->name() == name) return s; + return noneStyle; //NodeStyle(name, NodeShape::Circle, Qt::white); +} + +QVector TikzStyles::nodeStyles() const +{ + return _nodeStyles; +} + +void TikzStyles::clear() +{ + _nodeStyles.clear(); +} + +void TikzStyles::addStyle(QString name, GraphElementData *data) +{ + //qDebug() << "got style {" << name << "} = [" << data << "]"; + if (!data->property("fill").isNull()) { // node style + _nodeStyles << new NodeStyle(name, data); + } else { // edge style + // TODO: edge styles + } +} diff --git a/src/data/tikzstyles.h b/src/data/tikzstyles.h new file mode 100644 index 0000000..eaf7e64 --- /dev/null +++ b/src/data/tikzstyles.h @@ -0,0 +1,29 @@ +#ifndef PROJECT_H +#define PROJECT_H + +#include "graphelementdata.h" +#include "nodestyle.h" + +#include +#include + +class TikzStyles : public QObject +{ + Q_OBJECT +public: + explicit TikzStyles(QObject *parent = 0); + void addStyle(QString name, GraphElementData *data); + + NodeStyle *nodeStyle(QString name) const; + QVector nodeStyles() const; + void clear(); + +signals: + +public slots: + +private: + QVector _nodeStyles; +}; + +#endif // PROJECT_H diff --git a/src/gui/nodeitem.cpp b/src/gui/nodeitem.cpp index 71226f3..21cdf79 100644 --- a/src/gui/nodeitem.cpp +++ b/src/gui/nodeitem.cpp @@ -57,10 +57,10 @@ void NodeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidge painter->setBrush(Qt::NoBrush); painter->drawPath(shape()); } else { - QPen pen(_node->style()->strokeColor); - pen.setWidth(_node->style()->strokeThickness); + QPen pen(_node->style()->strokeColor()); + pen.setWidth(_node->style()->strokeThickness()); painter->setPen(pen); - painter->setBrush(QBrush(_node->style()->fillColor)); + painter->setBrush(QBrush(_node->style()->fillColor())); painter->drawPath(shape()); } diff --git a/src/gui/toolpalette.cpp b/src/gui/toolpalette.cpp index 430df3f..0a832a6 100644 --- a/src/gui/toolpalette.cpp +++ b/src/gui/toolpalette.cpp @@ -20,7 +20,7 @@ ToolPalette::ToolPalette(QWidget *parent) : select = new QAction(QIcon(":/images/Inkscape_icons_edit_select_all.svg"), "Select"); vertex = new QAction(QIcon(":/images/Inkscape_icons_draw_ellipse.svg"), "Add Vertex"); edge = new QAction(QIcon(":/images/Inkscape_icons_draw_path.svg"), "Add Edge"); - crop = new QAction(QIcon(":/images/Inkscape_icons_draw_rectangle.svg"), "Bounding Box"); + crop = new QAction(QIcon(":/images/crop.svg"), "Bounding Box"); tools->addAction(select); tools->addAction(vertex); diff --git a/src/main.cpp b/src/main.cpp index 96069ef..49b064d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -20,6 +20,7 @@ int main(int argc, char *argv[]) QApplication a(argc, argv); a.setQuitOnLastWindowClosed(false); tikzit = new Tikzit(); + tikzit->init(); return a.exec(); } diff --git a/src/tikzit.cpp b/src/tikzit.cpp index 746268c..6ef86dd 100644 --- a/src/tikzit.cpp +++ b/src/tikzit.cpp @@ -1,7 +1,12 @@ #include "tikzit.h" +#include "tikzassembler.h" +#include "tikzstyles.h" +#include #include #include +#include +#include // application-level instance of Tikzit Tikzit *tikzit; @@ -9,25 +14,27 @@ Tikzit *tikzit; // font to use for node labels QFont Tikzit::LABEL_FONT("Courrier", 9); -Tikzit::Tikzit() +Tikzit::Tikzit() : _styleFile("[default]"), _activeWindow(0) { - _mainMenu = new MainMenu(); +} - _activeWindow = 0; +void Tikzit::init() +{ + QSettings settings("tikzit", "tikzit"); + _mainMenu = new MainMenu(); QMainWindow *dummy = new QMainWindow(); _toolPalette = new ToolPalette(dummy); _propertyPalette = new PropertyPalette(dummy); _stylePalette = new StylePalette(dummy); + _styles = new TikzStyles(this); - loadStyles(); - - //_toolPalette->show(); - //_propertyPalette->show(); _stylePalette->show(); - _windows << new MainWindow(); _windows[0]->show(); + + QString styleFile = settings.value("previous-tikzstyles-file").toString(); + if (!styleFile.isEmpty()) loadStyles(styleFile); } //QMenuBar *Tikzit::mainMenu() const @@ -45,13 +52,6 @@ PropertyPalette *Tikzit::propertyPalette() const return _propertyPalette; } -void Tikzit::loadStyles() -{ - _nodeStyles << new NodeStyle("black dot", NodeShape::Circle, Qt::black, Qt::black, 1); - _nodeStyles << new NodeStyle("white dot", NodeShape::Circle, Qt::white, Qt::black, 1); - _nodeStyles << new NodeStyle("gray dot", NodeShape::Circle, Qt::gray, Qt::black, 1); -} - void Tikzit::newDoc() { MainWindow *w = new MainWindow(); @@ -81,13 +81,6 @@ void Tikzit::removeWindow(MainWindow *w) } } -NodeStyle *Tikzit::nodeStyle(QString name) -{ - foreach (NodeStyle *s , _nodeStyles) - if (s->name == name) return s; - return noneStyle; //NodeStyle(name, NodeShape::Circle, Qt::white); -} - void Tikzit::open() { QSettings settings("tikzit", "tikzit"); @@ -109,8 +102,62 @@ void Tikzit::open() } } +void Tikzit::openTikzStyles() { + QSettings settings("tikzit", "tikzit"); + QString fileName = QFileDialog::getOpenFileName(0, + tr("Open File"), + settings.value("previous-tikzstyles-path").toString(), + tr("TiKZ Style Files (*.tikzstyles)")); + + if (!fileName.isEmpty()) { + loadStyles(fileName); + } +} + +void Tikzit::loadStyles(QString fileName) +{ + QSettings settings("tikzit", "tikzit"); + QFile file(fileName); + if (file.open(QIODevice::ReadOnly)) { + QFileInfo fi(file); + settings.setValue("previous-tikzstyles-path", fi.absolutePath()); + settings.setValue("previous-tikzstyles-file", fileName); + _styleFile = fi.fileName(); + QTextStream in(&file); + QString styleTikz = in.readAll(); + file.close(); + + _styles->clear(); + TikzAssembler ass(_styles); + bool parseSuccess = ass.parse(styleTikz); + if (parseSuccess) { + qDebug() << "parse successful"; + } else { + qDebug() << "parse failed"; + } + _stylePalette->reloadStyles(); + + } else { + settings.setValue("previous-tikzstyles-file", ""); + QMessageBox::warning(0, "Style file not found.", "Could not open style file, reverting to default."); + } +} + +QString Tikzit::styleFile() const +{ + return _styleFile; +} + + +TikzStyles *Tikzit::styles() const +{ + return _styles; +} + void Tikzit::quit() { _stylePalette->close(); QApplication::quit(); } + + diff --git a/src/tikzit.h b/src/tikzit.h index 07878aa..802b3ab 100644 --- a/src/tikzit.h +++ b/src/tikzit.h @@ -38,6 +38,7 @@ #include "propertypalette.h" #include "stylepalette.h" #include "nodestyle.h" +#include "tikzstyles.h" #include #include @@ -68,7 +69,6 @@ public: MainWindow *activeWindow() const; void setActiveWindow(MainWindow *activeWindow); void removeWindow(MainWindow *w); - NodeStyle *nodeStyle(QString name); static QFont LABEL_FONT; // Ui::MainMenu *_mainMenuUi; @@ -77,10 +77,15 @@ public: void newDoc(); void open(); void quit(); + void init(); + + void openTikzStyles(); + TikzStyles *styles() const; + QString styleFile() const; private: -// void createMenu(); - void loadStyles(); + // void createMenu(); + void loadStyles(QString fileName); MainMenu *_mainMenu; ToolPalette *_toolPalette; @@ -88,7 +93,8 @@ private: StylePalette *_stylePalette; QVector _windows; MainWindow *_activeWindow; - QVector _nodeStyles; + TikzStyles *_styles; + QString _styleFile; }; diff --git a/stylepalette.cpp b/stylepalette.cpp index 312f675..8852eb7 100644 --- a/stylepalette.cpp +++ b/stylepalette.cpp @@ -1,8 +1,14 @@ #include "stylepalette.h" #include "ui_stylepalette.h" +#include "tikzit.h" #include +#include +#include #include +#include +#include +#include StylePalette::StylePalette(QWidget *parent) : QDockWidget(parent), @@ -15,6 +21,13 @@ StylePalette::StylePalette(QWidget *parent) : if (geom != QVariant()) { restoreGeometry(geom.toByteArray()); } + + _model = new QStandardItemModel(this); + ui->styleListView->setModel(_model); + ui->styleListView->setViewMode(QListView::IconMode); + ui->styleListView->setMovement(QListView::Static); + + ui->styleListView->setGridSize(QSize(75,60)); } StylePalette::~StylePalette() @@ -22,9 +35,25 @@ StylePalette::~StylePalette() delete ui; } -void StylePalette::on_buttonOpenProject_clicked() +void StylePalette::reloadStyles() +{ + _model->clear(); + QString f = tikzit->styleFile(); + // + ui->styleFile->setText(f); + + QStandardItem *it; + QSize sz(60,60); + + foreach(NodeStyle *ns, tikzit->styles()->nodeStyles()) { + it = new QStandardItem(ns->icon(), ns->name()); + _model->appendRow(it); + } +} + +void StylePalette::on_buttonOpenTikzstyles_clicked() { - qDebug() << "got click"; + tikzit->openTikzStyles(); } void StylePalette::closeEvent(QCloseEvent *event) diff --git a/stylepalette.h b/stylepalette.h index b5c16f1..99dde02 100644 --- a/stylepalette.h +++ b/stylepalette.h @@ -2,6 +2,7 @@ #define STYLEPALETTE_H #include +#include namespace Ui { class StylePalette; @@ -14,12 +15,14 @@ class StylePalette : public QDockWidget public: explicit StylePalette(QWidget *parent = 0); ~StylePalette(); + void reloadStyles(); public slots: - void on_buttonOpenProject_clicked(); + void on_buttonOpenTikzstyles_clicked(); private: Ui::StylePalette *ui; + QStandardItemModel *_model; protected: void closeEvent(QCloseEvent *event) override; diff --git a/stylepalette.ui b/stylepalette.ui index 8068ea4..a8c893f 100644 --- a/stylepalette.ui +++ b/stylepalette.ui @@ -7,13 +7,13 @@ 0 0 250 - 350 + 430 250 - 350 + 430 @@ -23,79 +23,126 @@ Styles - - - - 10 - 12 - 51 - 16 - - - - Project: - - - - - - 60 - 13 - 131 - 16 - - - - - Courier - 75 - true - - - - [default] - - - - - - 195 - 10 - 22 - 22 - - - - New Project - - - - - - - :/images/document-new.svg:/images/document-new.svg - - - - - - 220 - 10 - 22 - 22 - - - - New Project - - - - - - - :/images/document-open.svg:/images/document-open.svg - - + + + + + 2 + + + 0 + + + + + Styles: + + + + + + + + 0 + 0 + + + + + Courier + 75 + true + + + + [default] + + + + + + + New Project + + + + + + + :/images/document-open.svg:/images/document-open.svg + + + + + + + + + + + :/images/refresh.svg:/images/refresh.svg + + + + + + + + + + 8 + true + + + + + + + + 2 + + + + + + 25 + 25 + + + + + + + + + + + + + 25 + 25 + + + + - + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + diff --git a/tikzit.pro b/tikzit.pro index d3a9c62..673730b 100644 --- a/tikzit.pro +++ b/tikzit.pro @@ -49,8 +49,8 @@ SOURCES += src/gui/mainwindow.cpp \ src/gui/mainmenu.cpp \ src/util.cpp \ stylepalette.cpp \ - src/data/project.cpp \ - src/data/tikzassembler.cpp + src/data/tikzassembler.cpp \ + src/data/tikzstyles.cpp HEADERS += src/gui/mainwindow.h \ src/gui/toolpalette.h \ @@ -73,8 +73,8 @@ HEADERS += src/gui/mainwindow.h \ src/gui/mainmenu.h \ src/util.h \ stylepalette.h \ - src/data/project.h \ - src/data/tikzassembler.h + src/data/tikzassembler.h \ + src/data/tikzstyles.h FORMS += src/gui/mainwindow.ui \ src/gui/propertypalette.ui \ diff --git a/tikzit.qrc b/tikzit.qrc index 65cfcd9..effe396 100644 --- a/tikzit.qrc +++ b/tikzit.qrc @@ -18,6 +18,7 @@ images/edge.svg images/node.svg images/select.svg + images/refresh.svg qt.conf -- cgit v1.2.3 From 3cea1514203a451c0a8806d276807863b463a78f Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Sat, 17 Mar 2018 19:01:02 -0400 Subject: added saving, style application, and copy and paste --- src/data/edge.cpp | 22 ++++++ src/data/edge.h | 1 + src/data/graph.cpp | 82 +++++++++++++++++++- src/data/graph.h | 25 ++++++ src/data/graphelementdata.cpp | 17 +++- src/data/graphelementdata.h | 6 +- src/data/node.cpp | 35 +++++++-- src/data/node.h | 7 +- src/data/nodestyle.cpp | 10 +-- src/data/nodestyle.h | 10 +-- src/data/tikzdocument.cpp | 45 +++++++++++ src/data/tikzdocument.h | 3 + src/gui/mainmenu.cpp | 21 +++-- src/gui/mainwindow.cpp | 23 +++++- src/gui/mainwindow.h | 8 +- src/gui/nodeitem.cpp | 4 +- src/gui/tikzscene.cpp | 176 ++++++++++++++++++++++++++++++++++-------- src/gui/tikzscene.h | 10 ++- src/gui/toolpalette.cpp | 18 +++++ src/gui/toolpalette.h | 1 + src/gui/undocommands.cpp | 147 +++++++++++++++++++++++++++++++---- src/gui/undocommands.h | 63 +++++++++++---- src/main.cpp | 3 +- src/tikzit.cpp | 25 +++++- src/tikzit.h | 7 +- stylepalette.cpp | 27 ++++++- stylepalette.h | 4 + stylepalette.ui | 19 +---- 28 files changed, 691 insertions(+), 128 deletions(-) diff --git a/src/data/edge.cpp b/src/data/edge.cpp index e4d5d69..d3396e8 100644 --- a/src/data/edge.cpp +++ b/src/data/edge.cpp @@ -25,6 +25,28 @@ Edge::~Edge() delete _edgeNode; } +/*! + * @brief Edge::copy makes a deep copy of an edge. + * @param nodeTable is an optional pointer to a table mapping the old source/target + * node pointers to their new, copied versions. This is used when making a copy of + * an entire (sub)graph. + * @return a copy of the edge + */ +Edge *Edge::copy(QMap *nodeTable) +{ + Edge *e; + if (nodeTable == 0) e = new Edge(_source, _target); + else e = new Edge(nodeTable->value(_source), nodeTable->value(_target)); + e->setData(_data->copy()); + e->setBasicBendMode(_basicBendMode); + e->setBend(_bend); + e->setInAngle(_inAngle); + e->setOutAngle(_outAngle); + e->setWeight(_weight); + e->updateControls(); + return e; +} + Node *Edge::source() const { return _source; diff --git a/src/data/edge.h b/src/data/edge.h index 595b094..f010acd 100644 --- a/src/data/edge.h +++ b/src/data/edge.h @@ -13,6 +13,7 @@ class Edge : public QObject public: explicit Edge(Node *s, Node *t, QObject *parent = 0); ~Edge(); + Edge *copy(QMap *nodeTable = 0); Node *source() const; Node *target() const; diff --git a/src/data/graph.cpp b/src/data/graph.cpp index ba9a4c6..7a5fedc 100644 --- a/src/data/graph.cpp +++ b/src/data/graph.cpp @@ -54,6 +54,32 @@ void Graph::removeEdge(Edge *e) _edges.removeOne(e); } +int Graph::maxIntName() +{ + int max = -1; + int i; + bool ok; + foreach (Node *n, _nodes) { + i = n->name().toInt(&ok); + if (ok && i > max) max = i; + } + return max; +} + +QString Graph::freshNodeName() +{ + return QString::number(maxIntName() + 1); +} + +void Graph::renameApart(Graph *graph) +{ + int i = graph->maxIntName() + 1; + foreach (Node *n, _nodes) { + n->setName(QString::number(i)); + i++; + } +} + GraphElementData *Graph::data() const { return _data; @@ -92,21 +118,27 @@ QString Graph::tikz() { QString str; QTextStream code(&str); + int line = 0; code << "\\begin{tikzpicture}" << _data->tikz() << "\n"; + line++; if (hasBbox()) { code << "\t\\path [use as bounding box] (" << _bbox.topLeft().x() << "," << _bbox.topLeft().y() << ") rectangle (" << _bbox.bottomRight().x() << "," << _bbox.bottomRight().y() << ");\n"; + line++; } - if (!_nodes.isEmpty()) + if (!_nodes.isEmpty()) { code << "\t\\begin{pgfonlayer}{nodelayer}\n"; + line++; + } Node *n; foreach (n, _nodes) { + n->setTikzLine(line); code << "\t\t\\node "; if (!n->data()->isEmpty()) @@ -115,17 +147,23 @@ QString Graph::tikz() code << "(" << n->name() << ") at (" << n->point().x() << ", " << n->point().y() << ") {" << n->label() << "};\n"; + line++; } - if (!_nodes.isEmpty()) + if (!_nodes.isEmpty()) { code << "\t\\end{pgfonlayer}\n"; + line++; + } - if (!_edges.isEmpty()) + if (!_edges.isEmpty()) { code << "\t\\begin{pgfonlayer}{edgelayer}\n"; + line++; + } Edge *e; foreach (e, _edges) { + e->updateData(); code << "\t\t\\draw "; if (!e->data()->isEmpty()) @@ -153,17 +191,53 @@ QString Graph::tikz() } code << ";\n"; + line++; } - if (!_edges.isEmpty()) + if (!_edges.isEmpty()) { code << "\t\\end{pgfonlayer}\n"; + line++; + } code << "\\end{tikzpicture}\n"; + line++; code.flush(); return str; } +Graph *Graph::copyOfSubgraphWithNodes(QSet nds) +{ + Graph *g = new Graph(); + g->setData(_data->copy()); + QMap nodeTable; + foreach (Node *n, nds) { + Node *n1 = n->copy(); + nodeTable.insert(n, n1); + g->addNode(n1); + } + foreach (Edge *e, edges()) { + if (nds.contains(e->source()) || nds.contains(e->target())) { + g->addEdge(e->copy(&nodeTable)); + } + } + + return g; +} + +void Graph::insertGraph(Graph *graph) +{ + QMap nodeTable; + foreach (Node *n, graph->nodes()) { + Node *n1 = n->copy(); + nodeTable.insert(n, n1); + addNode(n1); + } + foreach (Edge *e, graph->edges()) { + addEdge(e->copy(&nodeTable)); + } +} + void Graph::setBbox(const QRectF &bbox) { _bbox = bbox; diff --git a/src/data/graph.h b/src/data/graph.h index c25d51b..4d575e4 100644 --- a/src/data/graph.h +++ b/src/data/graph.h @@ -27,6 +27,15 @@ public: void addEdge(Edge *e); void addEdge(Edge *e, int index); void removeEdge(Edge *e); + int maxIntName(); + QString freshNodeName(); + + /*! + * \brief renameApart assigns fresh names to all of the nodes in "this", + * with respect to the given graph + * \param graph + */ + void renameApart(Graph *graph); GraphElementData *data() const; void setData(GraphElementData *data); @@ -40,6 +49,22 @@ public: void clearBbox(); QString tikz(); + + /*! + * \brief copyOfSubgraphWithNodes produces a copy of the full subgraph + * with the given nodes. Used for cutting and copying to clipboard. + * \param nds + * \return + */ + Graph *copyOfSubgraphWithNodes(QSet nds); + + /*! + * \brief insertGraph inserts a copy of the given graph. Prior to calling this + * method, the node names in the given graph should be made fresh via + * "renameApart". + * \param graph + */ + void insertGraph(Graph *graph); signals: public slots: diff --git a/src/data/graphelementdata.cpp b/src/data/graphelementdata.cpp index 43f7516..63c8cea 100644 --- a/src/data/graphelementdata.cpp +++ b/src/data/graphelementdata.cpp @@ -3,9 +3,14 @@ #include #include -GraphElementData::GraphElementData(QObject *parent) : QAbstractItemModel(parent) +GraphElementData::GraphElementData(QVector init, QObject *parent) : QAbstractItemModel(parent) { root = new GraphElementProperty(); + _properties = init; +} + +GraphElementData::GraphElementData(QObject *parent) : QAbstractItemModel(parent) { + root = new GraphElementProperty(); } GraphElementData::~GraphElementData() @@ -13,6 +18,11 @@ GraphElementData::~GraphElementData() delete root; } +GraphElementData *GraphElementData::copy() +{ + return new GraphElementData(_properties); +} + void GraphElementData::setProperty(QString key, QString value) { GraphElementProperty m(key, true); @@ -170,3 +180,8 @@ bool GraphElementData::isEmpty() { return _properties.isEmpty(); } + +QVector GraphElementData::properties() const +{ + return _properties; +} diff --git a/src/data/graphelementdata.h b/src/data/graphelementdata.h index 0d43bb8..319edf7 100644 --- a/src/data/graphelementdata.h +++ b/src/data/graphelementdata.h @@ -13,8 +13,11 @@ class GraphElementData : public QAbstractItemModel { Q_OBJECT public: + explicit GraphElementData(QVector init, + QObject *parent = 0); explicit GraphElementData(QObject *parent = 0); ~GraphElementData(); + GraphElementData *copy(); void setProperty(QString key, QString value); void unsetProperty(QString key); void setAtom(QString atom); @@ -22,7 +25,6 @@ public: QString property(QString key); bool atom(QString atom); - QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE; QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; @@ -55,6 +57,8 @@ public: QString tikz(); bool isEmpty(); + QVector properties() const; + signals: public slots: diff --git a/src/data/node.cpp b/src/data/node.cpp index c78f49c..085bdf5 100644 --- a/src/data/node.cpp +++ b/src/data/node.cpp @@ -3,11 +3,11 @@ #include -Node::Node(QObject *parent) : QObject(parent) +Node::Node(QObject *parent) : QObject(parent), _tikzLine(-1) { _data = new GraphElementData(); _style = noneStyle; - _styleName = "none"; + _data->setProperty("style", "none"); } Node::~Node() @@ -15,6 +15,17 @@ Node::~Node() delete _data; } +Node *Node::copy() { + Node *n1 = new Node(); + n1->setName(name()); + n1->setData(data()->copy()); + n1->setPoint(point()); + n1->setLabel(label()); + n1->attachStyle(); + n1->setTikzLine(tikzLine()); + return n1; +} + QPointF Node::point() const { return _point; @@ -54,26 +65,36 @@ void Node::setData(GraphElementData *data) { delete _data; _data = data; - if (_data->property("style") != 0) _styleName = _data->property("style"); } QString Node::styleName() const { - return _styleName; + return _data->property("style"); } void Node::setStyleName(const QString &styleName) { - _styleName = styleName; + _data->setProperty("style", styleName); } void Node::attachStyle() { - if (_styleName == "none") _style = noneStyle; - else _style = tikzit->styles()->nodeStyle(_styleName); + QString nm = styleName(); + if (nm == "none") _style = noneStyle; + else _style = tikzit->styles()->nodeStyle(nm); } NodeStyle *Node::style() const { return _style; } + +int Node::tikzLine() const +{ + return _tikzLine; +} + +void Node::setTikzLine(int tikzLine) +{ + _tikzLine = tikzLine; +} diff --git a/src/data/node.h b/src/data/node.h index ee70835..241d1ca 100644 --- a/src/data/node.h +++ b/src/data/node.h @@ -15,6 +15,8 @@ public: explicit Node(QObject *parent = 0); ~Node(); + Node *copy(); + QPointF point() const; void setPoint(const QPointF &point); @@ -33,6 +35,9 @@ public: void attachStyle(); NodeStyle *style() const; + int tikzLine() const; + void setTikzLine(int tikzLine); + signals: public slots: @@ -41,9 +46,9 @@ private: QPointF _point; QString _name; QString _label; - QString _styleName; NodeStyle *_style; GraphElementData *_data; + int _tikzLine; }; #endif // NODE_H diff --git a/src/data/nodestyle.cpp b/src/data/nodestyle.cpp index e38d3a3..302ab84 100644 --- a/src/data/nodestyle.cpp +++ b/src/data/nodestyle.cpp @@ -24,13 +24,13 @@ QString NodeStyle::name() const return _name; } -NodeShape NodeStyle::shape() const +NodeStyle::Shape NodeStyle::shape() const { QString sh = _data->property("shape"); - if (sh.isNull()) return NodeShape::Circle; - else if (sh == "circle") return NodeShape::Circle; - else if (sh == "rectangle") return NodeShape::Rectangle; - else return NodeShape::Circle; + if (sh.isNull()) return NodeStyle::Circle; + else if (sh == "circle") return NodeStyle::Circle; + else if (sh == "rectangle") return NodeStyle::Rectangle; + else return NodeStyle::Circle; } QColor NodeStyle::fillColor() const diff --git a/src/data/nodestyle.h b/src/data/nodestyle.h index 58c0c12..0b9f282 100644 --- a/src/data/nodestyle.h +++ b/src/data/nodestyle.h @@ -9,20 +9,20 @@ #include #include -enum NodeShape { - Rectangle, UpTriangle, DownTriangle, Circle -}; - class NodeStyle { public: + enum Shape { + Rectangle, UpTriangle, DownTriangle, Circle + }; + NodeStyle(); NodeStyle(QString name, GraphElementData *data); bool isNone(); GraphElementData *data() const; QString name() const; - NodeShape shape() const; + Shape shape() const; QColor fillColor() const; QColor strokeColor() const; int strokeThickness() const; diff --git a/src/data/tikzdocument.cpp b/src/data/tikzdocument.cpp index a3fa961..eeb4e14 100644 --- a/src/data/tikzdocument.cpp +++ b/src/data/tikzdocument.cpp @@ -3,9 +3,12 @@ #include #include #include +#include +#include "tikzit.h" #include "tikzdocument.h" #include "tikzassembler.h" +#include "mainwindow.h" TikzDocument::TikzDocument(QObject *parent) : QObject(parent) { @@ -71,6 +74,41 @@ void TikzDocument::open(QString fileName) } } +void TikzDocument::save() { + if (_fileName == "") { + saveAs(); + } else { + refreshTikz(); + QFile file(_fileName); + QFileInfo fi(file); + _shortName = fi.fileName(); + QSettings settings("tikzit", "tikzit"); + settings.setValue("previous-file-path", fi.absolutePath()); + + if (file.open(QIODevice::ReadWrite)) { + QTextStream stream(&file); + stream << _tikz; + file.close(); + tikzit->activeWindow()->updateFileName(); + } else { + QMessageBox::warning(0, "Save Failed", "Could not open file: '" + _fileName + "' for writing."); + } + } +} + +void TikzDocument::saveAs() { + QSettings settings("tikzit", "tikzit"); + QString fileName = QFileDialog::getSaveFileName(tikzit->activeWindow(), + tr("Save File As"), + settings.value("previous-file-path").toString(), + tr("TiKZ Files (*.tikz)")); + + if (!fileName.isEmpty()) { + _fileName = fileName; + save(); + } +} + QString TikzDocument::shortName() const { return _shortName; @@ -80,3 +118,10 @@ bool TikzDocument::parseSuccess() const { return _parseSuccess; } + +void TikzDocument::refreshTikz() +{ + _tikz = _graph->tikz(); + if (MainWindow *w = dynamic_cast(parent())) + w->refreshTikz(); +} diff --git a/src/data/tikzdocument.h b/src/data/tikzdocument.h index d3a18b1..edb1beb 100644 --- a/src/data/tikzdocument.h +++ b/src/data/tikzdocument.h @@ -22,11 +22,14 @@ public: QString tikz() const; QUndoStack *undoStack() const; bool parseSuccess() const; + void refreshTikz(); void open(QString fileName); QString shortName() const; + void saveAs(); + void save(); private: Graph *_graph; QString _tikz; diff --git a/src/gui/mainmenu.cpp b/src/gui/mainmenu.cpp index 714ed34..dfb447f 100644 --- a/src/gui/mainmenu.cpp +++ b/src/gui/mainmenu.cpp @@ -19,17 +19,20 @@ void MainMenu::on_actionOpen_triggered() void MainMenu::on_actionClose_triggered() { - // TODO + if (tikzit->activeWindow() != 0) + tikzit->activeWindow()->close(); } void MainMenu::on_actionSave_triggered() { - // TODO + if (tikzit->activeWindow() != 0) + tikzit->activeWindow()->tikzDocument()->save(); } void MainMenu::on_actionSave_As_triggered() { - // TODO + if (tikzit->activeWindow() != 0) + tikzit->activeWindow()->tikzDocument()->saveAs(); } void MainMenu::on_actionExit_triggered() @@ -53,22 +56,26 @@ void MainMenu::on_actionRedo_triggered() void MainMenu::on_actionCut_triggered() { - // TODO + if (tikzit->activeWindow() != 0) + tikzit->activeWindow()->tikzScene()->cutToClipboard(); } void MainMenu::on_actionCopy_triggered() { - // TODO + if (tikzit->activeWindow() != 0) + tikzit->activeWindow()->tikzScene()->copyToClipboard(); } void MainMenu::on_actionPaste_triggered() { - // TODO + if (tikzit->activeWindow() != 0) + tikzit->activeWindow()->tikzScene()->pasteFromClipboard(); } void MainMenu::on_actionDelete_triggered() { - // TODO + if (tikzit->activeWindow() != 0) + tikzit->activeWindow()->tikzScene()->deleteSelectedItems(); } void MainMenu::on_actionSelect_All_triggered() diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index eac7c44..26e19b6 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -25,12 +25,11 @@ MainWindow::MainWindow(QWidget *parent) : setAttribute(Qt::WA_DeleteOnClose, true); _tikzDocument = new TikzDocument(this); - _tools = new ToolPalette(this); - addToolBar(_tools); + _toolPalette = new ToolPalette(this); + addToolBar(_toolPalette); - _tikzScene = new TikzScene(_tikzDocument, _tools, this); + _tikzScene = new TikzScene(_tikzDocument, _toolPalette, this); ui->tikzView->setScene(_tikzScene); - _fileName = ""; _pristine = true; @@ -80,10 +79,26 @@ void MainWindow::changeEvent(QEvent *event) { if (event->type() == QEvent::ActivationChange && isActiveWindow()) { tikzit->setActiveWindow(this); + tikzit->stylePalette()->raise(); } QMainWindow::changeEvent(event); } +void MainWindow::updateFileName() +{ + setWindowTitle("TiKZiT - " + _tikzDocument->shortName()); +} + +void MainWindow::refreshTikz() +{ + ui->tikzSource->setText(_tikzDocument->tikz()); +} + +ToolPalette *MainWindow::toolPalette() const +{ + return _toolPalette; +} + TikzDocument *MainWindow::tikzDocument() const { return _tikzDocument; diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h index ba680b0..613bfcb 100644 --- a/src/gui/mainwindow.h +++ b/src/gui/mainwindow.h @@ -33,17 +33,19 @@ public: TikzView *tikzView() const; TikzScene *tikzScene() const; TikzDocument *tikzDocument() const; - + ToolPalette *toolPalette() const; + void updateFileName(); + void refreshTikz(); protected: void closeEvent(QCloseEvent *event); void changeEvent(QEvent *event); + private: TikzScene *_tikzScene; TikzDocument *_tikzDocument; MainMenu *_menu; - ToolPalette *_tools; + ToolPalette *_toolPalette; Ui::MainWindow *ui; - QString _fileName; bool _pristine; int _windowId; static int _numWindows; diff --git a/src/gui/nodeitem.cpp b/src/gui/nodeitem.cpp index 21cdf79..36d488c 100644 --- a/src/gui/nodeitem.cpp +++ b/src/gui/nodeitem.cpp @@ -15,8 +15,8 @@ NodeItem::NodeItem(Node *node) { _node = node; setFlag(QGraphicsItem::ItemIsSelectable); - setFlag(QGraphicsItem::ItemIsMovable); - setFlag(QGraphicsItem::ItemSendsGeometryChanges); + //setFlag(QGraphicsItem::ItemIsMovable); + //setFlag(QGraphicsItem::ItemSendsGeometryChanges); readPos(); } diff --git a/src/gui/tikzscene.cpp b/src/gui/tikzscene.cpp index a3dd8ce..2ee3c50 100644 --- a/src/gui/tikzscene.cpp +++ b/src/gui/tikzscene.cpp @@ -2,10 +2,12 @@ #include "util.h" #include "tikzscene.h" #include "undocommands.h" +#include "tikzassembler.h" #include #include #include +#include TikzScene::TikzScene(TikzDocument *tikzDocument, ToolPalette *tools, QObject *parent) : @@ -63,7 +65,9 @@ void TikzScene::graphReplaced() void TikzScene::mousePressEvent(QGraphicsSceneMouseEvent *event) { // current mouse position, in scene coordinates - QPointF mousePos = event->scenePos(); + _mouseDownPos = event->scenePos(); + + _draggingNodes = false; // disable rubber band drag, which will clear the selection. Only re-enable it // for the SELECT tool, and when no control point has been clicked. @@ -80,8 +84,8 @@ void TikzScene::mousePressEvent(QGraphicsSceneMouseEvent *event) if (EdgeItem *ei = dynamic_cast(gi)) { qreal dx, dy; - dx = ei->cp1Item()->pos().x() - mousePos.x(); - dy = ei->cp1Item()->pos().y() - mousePos.y(); + dx = ei->cp1Item()->pos().x() - _mouseDownPos.x(); + dy = ei->cp1Item()->pos().y() - _mouseDownPos.y(); if (dx*dx + dy*dy <= cpR2) { _modifyEdgeItem = ei; @@ -89,8 +93,8 @@ void TikzScene::mousePressEvent(QGraphicsSceneMouseEvent *event) break; } - dx = ei->cp2Item()->pos().x() - mousePos.x(); - dy = ei->cp2Item()->pos().y() - mousePos.y(); + dx = ei->cp2Item()->pos().x() - _mouseDownPos.x(); + dy = ei->cp2Item()->pos().y() - _mouseDownPos.y(); if (dx*dx + dy*dy <= cpR2) { _modifyEdgeItem = ei; @@ -119,17 +123,21 @@ void TikzScene::mousePressEvent(QGraphicsSceneMouseEvent *event) _oldNodePositions.insert(ni->node(), ni->node()->point()); } } + + auto its = items(_mouseDownPos); + if (!its.isEmpty() && dynamic_cast(its[0])) + _draggingNodes = true; } break; case ToolPalette::VERTEX: break; case ToolPalette::EDGE: - foreach (QGraphicsItem *gi, items(mousePos)) { + foreach (QGraphicsItem *gi, items(_mouseDownPos)) { if (NodeItem *ni = dynamic_cast(gi)){ _edgeStartNodeItem = ni; _edgeEndNodeItem = ni; - QLineF line(toScreen(ni->node()->point()), mousePos); + QLineF line(toScreen(ni->node()->point()), _mouseDownPos); _drawEdgeItem->setLine(line); _drawEdgeItem->setVisible(true); break; @@ -145,8 +153,9 @@ void TikzScene::mouseMoveEvent(QGraphicsSceneMouseEvent *event) { // current mouse position, in scene coordinates QPointF mousePos = event->scenePos(); - QRectF rb = views()[0]->rubberBandRect(); - invalidate(-800,-800,1600,1600); + //QRectF rb = views()[0]->rubberBandRect(); + //invalidate(-800,-800,1600,1600); + invalidate(QRectF(), QGraphicsScene::BackgroundLayer); switch (_tools->currentTool()) { case ToolPalette::SELECT: @@ -229,10 +238,25 @@ void TikzScene::mouseMoveEvent(QGraphicsSceneMouseEvent *event) _modifyEdgeItem->readPos(); + } else if (_draggingNodes) { // nodes being dragged + QGraphicsScene::mouseMoveEvent(event); + + // apply the same offset to all nodes, otherwise we get odd rounding behaviour with + // multiple selection. + QPointF shift = mousePos - _mouseDownPos; + int gridSize = GLOBAL_SCALE / 8; + shift = QPointF(round(shift.x()/gridSize)*gridSize, round(shift.y()/gridSize)*gridSize); + + foreach (Node *n, _oldNodePositions.keys()) { + NodeItem *ni = _nodeItems[n]; + ni->setPos(toScreen(_oldNodePositions[n]) + shift); + ni->writePos(); + } + + refreshAdjacentEdges(_oldNodePositions.keys()); } else { // otherwise, process mouse move normally QGraphicsScene::mouseMoveEvent(event); - refreshAdjacentEdges(_oldNodePositions.keys()); } break; @@ -308,7 +332,9 @@ void TikzScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) int gridSize = GLOBAL_SCALE / 8; QPointF gridPos(round(mousePos.x()/gridSize)*gridSize, round(mousePos.y()/gridSize)*gridSize); Node *n = new Node(_tikzDocument); + n->setName(graph()->freshNodeName()); n->setPoint(fromScreen(gridPos)); + n->setStyleName(tikzit->stylePalette()->activeNodeStyleName()); QRectF grow(gridPos.x() - GLOBAL_SCALEF, gridPos.y() - GLOBAL_SCALEF, 2 * GLOBAL_SCALEF, 2 * GLOBAL_SCALEF); QRectF newBounds = sceneRect().united(grow); @@ -332,34 +358,31 @@ void TikzScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) case ToolPalette::CROP: break; } + + // clear artefacts from rubber band selection + invalidate(QRect(), QGraphicsScene::BackgroundLayer); } void TikzScene::keyReleaseEvent(QKeyEvent *event) { if (event->key() == Qt::Key_Backspace || event->key() == Qt::Key_Delete) { - QSet selNodes; - QSet selEdges; - getSelection(selNodes, selEdges); - - QMap deleteNodes; - QMap deleteEdges; - - for (int i = 0; i < _tikzDocument->graph()->nodes().length(); ++i) { - Node *n = _tikzDocument->graph()->nodes()[i]; - if (selNodes.contains(n)) deleteNodes.insert(i, n); - } - - for (int i = 0; i < _tikzDocument->graph()->edges().length(); ++i) { - Edge *e = _tikzDocument->graph()->edges()[i]; - if (selEdges.contains(e) || - selNodes.contains(e->source()) || - selNodes.contains(e->target())) deleteEdges.insert(i, e); + deleteSelectedItems(); + } else if (event->modifiers() == Qt::NoModifier) { + switch(event->key()) { + case Qt::Key_S: + tikzit->activeWindow()->toolPalette()->setCurrentTool(ToolPalette::SELECT); + break; + case Qt::Key_V: + case Qt::Key_N: + tikzit->activeWindow()->toolPalette()->setCurrentTool(ToolPalette::VERTEX); + break; + case Qt::Key_E: + tikzit->activeWindow()->toolPalette()->setCurrentTool(ToolPalette::EDGE); + break; + case Qt::Key_B: + tikzit->activeWindow()->toolPalette()->setCurrentTool(ToolPalette::CROP); + break; } - - //qDebug() << "nodes:" << deleteNodes; - //qDebug() << "edges:" << deleteEdges; - DeleteCommand *cmd = new DeleteCommand(this, deleteNodes, deleteEdges, selEdges); - _tikzDocument->undoStack()->push(cmd); } } @@ -375,6 +398,78 @@ void TikzScene::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) } } +void TikzScene::applyActiveStyleToNodes() { + ApplyStyleToNodesCommand *cmd = new ApplyStyleToNodesCommand(this, tikzit->stylePalette()->activeNodeStyleName()); + _tikzDocument->undoStack()->push(cmd); +} + +void TikzScene::deleteSelectedItems() +{ + QSet selNodes; + QSet selEdges; + getSelection(selNodes, selEdges); + + QMap deleteNodes; + QMap deleteEdges; + + for (int i = 0; i < _tikzDocument->graph()->nodes().length(); ++i) { + Node *n = _tikzDocument->graph()->nodes()[i]; + if (selNodes.contains(n)) deleteNodes.insert(i, n); + } + + for (int i = 0; i < _tikzDocument->graph()->edges().length(); ++i) { + Edge *e = _tikzDocument->graph()->edges()[i]; + if (selEdges.contains(e) || + selNodes.contains(e->source()) || + selNodes.contains(e->target())) deleteEdges.insert(i, e); + } + + //qDebug() << "nodes:" << deleteNodes; + //qDebug() << "edges:" << deleteEdges; + DeleteCommand *cmd = new DeleteCommand(this, deleteNodes, deleteEdges, selEdges); + _tikzDocument->undoStack()->push(cmd); +} + +void TikzScene::copyToClipboard() +{ + Graph *g = graph()->copyOfSubgraphWithNodes(getSelectedNodes()); + QGuiApplication::clipboard()->setText(g->tikz()); + delete g; +} + +void TikzScene::cutToClipboard() +{ + copyToClipboard(); + deleteSelectedItems(); +} + + +void TikzScene::pasteFromClipboard() +{ + QString tikz = QGuiApplication::clipboard()->text(); + Graph *g = new Graph(); + TikzAssembler ass(g); + + // attempt to parse whatever's on the clipboard, if we get a + // non-empty tikz graph, insert it. + if (ass.parse(tikz) && !g->nodes().isEmpty()) { + // make sure names in the new subgraph are fresh + g->renameApart(graph()); + + // shift g to the right until there is some free space + QPointF p0 = toScreen(g->nodes()[0]->point()); + QPointF p = p0; + while (!items(p).isEmpty()) p.setX(p.x()+GLOBAL_SCALEF); + QPointF shift(roundf((p.x() - p0.x())/GLOBAL_SCALEF), 0.0f); + foreach (Node *n, g->nodes()) { + n->setPoint(n->point() + shift); + } + + PasteCommand *cmd = new PasteCommand(this, g); + _tikzDocument->undoStack()->push(cmd); + } +} + void TikzScene::getSelection(QSet &selNodes, QSet &selEdges) { foreach (QGraphicsItem *gi, selectedItems()) { @@ -383,6 +478,15 @@ void TikzScene::getSelection(QSet &selNodes, QSet &selEdges) } } +QSet TikzScene::getSelectedNodes() +{ + QSet selNodes; + foreach (QGraphicsItem *gi, selectedItems()) { + if (NodeItem *ni = dynamic_cast(gi)) selNodes << ni->node(); + } + return selNodes; +} + TikzDocument *TikzScene::tikzDocument() const { @@ -395,6 +499,14 @@ void TikzScene::setTikzDocument(TikzDocument *tikzDocument) graphReplaced(); } +void TikzScene::reloadStyles() +{ + foreach (NodeItem *ni, _nodeItems) { + ni->node()->attachStyle(); + ni->readPos(); // trigger a repaint + } +} + void TikzScene::refreshAdjacentEdges(QList nodes) { if (nodes.empty()) return; diff --git a/src/gui/tikzscene.h b/src/gui/tikzscene.h index cb684b2..5d3eec2 100644 --- a/src/gui/tikzscene.h +++ b/src/gui/tikzscene.h @@ -34,7 +34,12 @@ public: TikzDocument *tikzDocument() const; void setTikzDocument(TikzDocument *tikzDocument); - + void reloadStyles(); + void applyActiveStyleToNodes(); + void deleteSelectedItems(); + void copyToClipboard(); + void cutToClipboard(); + void pasteFromClipboard(); public slots: void graphReplaced(); @@ -54,6 +59,8 @@ private: NodeItem *_edgeStartNodeItem; NodeItem *_edgeEndNodeItem; bool _firstControlPoint; + QPointF _mouseDownPos; + bool _draggingNodes; QMap _oldNodePositions; float _oldWeight; @@ -62,6 +69,7 @@ private: int _oldOutAngle; void getSelection(QSet &selNodes, QSet &selEdges); + QSet getSelectedNodes(); }; #endif // TIKZSCENE_H diff --git a/src/gui/toolpalette.cpp b/src/gui/toolpalette.cpp index 0a832a6..0d0bd30 100644 --- a/src/gui/toolpalette.cpp +++ b/src/gui/toolpalette.cpp @@ -48,3 +48,21 @@ ToolPalette::Tool ToolPalette::currentTool() const else return SELECT; } +void ToolPalette::setCurrentTool(ToolPalette::Tool tool) +{ + switch(tool) { + case SELECT: + select->setChecked(true); + break; + case VERTEX: + vertex->setChecked(true); + break; + case EDGE: + edge->setChecked(true); + break; + case CROP: + crop->setChecked(true); + break; + } +} + diff --git a/src/gui/toolpalette.h b/src/gui/toolpalette.h index c28b5a1..1876043 100644 --- a/src/gui/toolpalette.h +++ b/src/gui/toolpalette.h @@ -23,6 +23,7 @@ public: }; Tool currentTool() const; + void setCurrentTool(Tool tool); private: QActionGroup *tools; QAction *select; diff --git a/src/gui/undocommands.cpp b/src/gui/undocommands.cpp index 9c6a9c3..0ebfd21 100644 --- a/src/gui/undocommands.cpp +++ b/src/gui/undocommands.cpp @@ -4,12 +4,28 @@ #include +GraphUpdateCommand::GraphUpdateCommand(TikzScene *scene, QUndoCommand *parent) : QUndoCommand(parent), _scene(scene) +{ +} + +void GraphUpdateCommand::undo() +{ + _scene->tikzDocument()->refreshTikz(); + _scene->invalidate(); +} + +void GraphUpdateCommand::redo() +{ + _scene->tikzDocument()->refreshTikz(); + _scene->invalidate(); +} + + MoveCommand::MoveCommand(TikzScene *scene, QMap oldNodePositions, QMap newNodePositions, QUndoCommand *parent) : - QUndoCommand(parent), - _scene(scene), + GraphUpdateCommand(scene, parent), _oldNodePositions(oldNodePositions), _newNodePositions(newNodePositions) {} @@ -25,6 +41,7 @@ void MoveCommand::undo() } _scene->refreshAdjacentEdges(_oldNodePositions.keys()); + GraphUpdateCommand::undo(); } void MoveCommand::redo() @@ -37,12 +54,14 @@ void MoveCommand::redo() } _scene->refreshAdjacentEdges(_newNodePositions.keys()); + GraphUpdateCommand::redo(); } EdgeBendCommand::EdgeBendCommand(TikzScene *scene, Edge *edge, float oldWeight, int oldBend, - int oldInAngle, int oldOutAngle) : - _scene(scene), _edge(edge), + int oldInAngle, int oldOutAngle, QUndoCommand *parent) : + GraphUpdateCommand(scene, parent), + _edge(edge), _oldWeight(oldWeight), _oldBend(oldBend), _oldInAngle(oldInAngle), _oldOutAngle(oldOutAngle) { @@ -65,6 +84,7 @@ void EdgeBendCommand::undo() break; } } + GraphUpdateCommand::undo(); } void EdgeBendCommand::redo() @@ -80,20 +100,23 @@ void EdgeBendCommand::redo() break; } } + + GraphUpdateCommand::redo(); } DeleteCommand::DeleteCommand(TikzScene *scene, QMap deleteNodes, QMap deleteEdges, - QSet selEdges) : - _scene(scene), _deleteNodes(deleteNodes), - _deleteEdges(deleteEdges), _selEdges(selEdges) + QSet selEdges, QUndoCommand *parent) : + GraphUpdateCommand(scene, parent), + _deleteNodes(deleteNodes), _deleteEdges(deleteEdges), _selEdges(selEdges) {} void DeleteCommand::undo() { for (auto it = _deleteNodes.begin(); it != _deleteNodes.end(); ++it) { Node *n = it.value(); + n->attachStyle(); // in case styles have changed _scene->graph()->addNode(n, it.key()); NodeItem *ni = new NodeItem(n); _scene->nodeItems().insert(n, ni); @@ -110,6 +133,8 @@ void DeleteCommand::undo() if (_selEdges.contains(e)) ei->setSelected(true); } + + GraphUpdateCommand::undo(); } void DeleteCommand::redo() @@ -131,10 +156,12 @@ void DeleteCommand::redo() _scene->graph()->removeNode(n); } + + GraphUpdateCommand::redo(); } -AddNodeCommand::AddNodeCommand(TikzScene *scene, Node *node, QRectF newBounds) : - _scene(scene), _node(node), _oldBounds(_scene->sceneRect()), _newBounds(newBounds) +AddNodeCommand::AddNodeCommand(TikzScene *scene, Node *node, QRectF newBounds, QUndoCommand *parent) : + GraphUpdateCommand(scene, parent), _node(node), _oldBounds(_scene->sceneRect()), _newBounds(newBounds) { } @@ -148,21 +175,24 @@ void AddNodeCommand::undo() _scene->graph()->removeNode(_node); _scene->setBounds(_oldBounds); + + GraphUpdateCommand::undo(); } void AddNodeCommand::redo() { - // TODO: get the current style + _node->attachStyle(); // in case styles have changed _scene->graph()->addNode(_node); NodeItem *ni = new NodeItem(_node); _scene->nodeItems().insert(_node, ni); _scene->addItem(ni); _scene->setBounds(_newBounds); + GraphUpdateCommand::redo(); } -AddEdgeCommand::AddEdgeCommand(TikzScene *scene, Edge *edge) : - _scene(scene), _edge(edge) +AddEdgeCommand::AddEdgeCommand(TikzScene *scene, Edge *edge, QUndoCommand *parent) : + GraphUpdateCommand(scene, parent), _edge(edge) { } @@ -174,6 +204,7 @@ void AddEdgeCommand::undo() delete ei; _scene->graph()->removeEdge(_edge); + GraphUpdateCommand::undo(); } void AddEdgeCommand::redo() @@ -188,10 +219,12 @@ void AddEdgeCommand::redo() if (!_scene->graph()->nodes().isEmpty()) { ei->stackBefore(_scene->nodeItems()[_scene->graph()->nodes().first()]); } + + GraphUpdateCommand::redo(); } -ChangeEdgeModeCommand::ChangeEdgeModeCommand(TikzScene *scene, Edge *edge) : - _scene(scene), _edge(edge) +ChangeEdgeModeCommand::ChangeEdgeModeCommand(TikzScene *scene, Edge *edge, QUndoCommand *parent) : + GraphUpdateCommand(scene, parent), _edge(edge) { } @@ -199,10 +232,96 @@ void ChangeEdgeModeCommand::undo() { _edge->setBasicBendMode(!_edge->basicBendMode()); _scene->edgeItems()[_edge]->readPos(); + GraphUpdateCommand::undo(); } void ChangeEdgeModeCommand::redo() { _edge->setBasicBendMode(!_edge->basicBendMode()); _scene->edgeItems()[_edge]->readPos(); + GraphUpdateCommand::redo(); +} + +ApplyStyleToNodesCommand::ApplyStyleToNodesCommand(TikzScene *scene, QString style, QUndoCommand *parent) : + GraphUpdateCommand(scene, parent), _style(style), _oldStyles() +{ + foreach (QGraphicsItem *it, scene->selectedItems()) { + if (NodeItem *ni = dynamic_cast(it)) { + _oldStyles.insert(ni->node(), ni->node()->styleName()); + } + } +} + +void ApplyStyleToNodesCommand::undo() +{ + foreach (Node *n, _oldStyles.keys()) { + n->setStyleName(_oldStyles[n]); + n->attachStyle(); + } + + GraphUpdateCommand::undo(); +} + +void ApplyStyleToNodesCommand::redo() +{ + foreach (Node *n, _oldStyles.keys()) { + n->setStyleName(_style); + n->attachStyle(); + } + GraphUpdateCommand::redo(); +} + +PasteCommand::PasteCommand(TikzScene *scene, Graph *graph, QUndoCommand *parent) : + GraphUpdateCommand(scene, parent), _graph(graph) +{ + _oldSelection = scene->selectedItems(); +} + +void PasteCommand::undo() +{ + _scene->clearSelection(); + + foreach (Edge *e, _graph->edges()) { + EdgeItem *ei = _scene->edgeItems()[e]; + _scene->edgeItems().remove(e); + _scene->removeItem(ei); + delete ei; + + _scene->graph()->removeEdge(e); + } + + foreach (Node *n, _graph->nodes()) { + NodeItem *ni = _scene->nodeItems()[n]; + _scene->nodeItems().remove(n); + _scene->removeItem(ni); + delete ni; + + _scene->graph()->removeNode(n); + } + + foreach (auto it, _oldSelection) it->setSelected(true); + + GraphUpdateCommand::undo(); +} + +void PasteCommand::redo() +{ + _scene->clearSelection(); + _scene->graph()->insertGraph(_graph); + + foreach (Node *n, _graph->nodes()) { + n->attachStyle(); // in case styles have changed + NodeItem *ni = new NodeItem(n); + _scene->nodeItems().insert(n, ni); + _scene->addItem(ni); + ni->setSelected(true); + } + + foreach (Edge *e, _graph->edges()) { + EdgeItem *ei = new EdgeItem(e); + _scene->edgeItems().insert(e, ei); + _scene->addItem(ei); + } + + GraphUpdateCommand::redo(); } diff --git a/src/gui/undocommands.h b/src/gui/undocommands.h index eea39ae..354e455 100644 --- a/src/gui/undocommands.h +++ b/src/gui/undocommands.h @@ -14,7 +14,17 @@ #include -class MoveCommand : public QUndoCommand +class GraphUpdateCommand : public QUndoCommand { +public: + explicit GraphUpdateCommand(TikzScene *scene, + QUndoCommand *parent = 0); + void undo() override; + void redo() override; +protected: + TikzScene *_scene; +}; + +class MoveCommand : public GraphUpdateCommand { public: explicit MoveCommand(TikzScene *scene, @@ -24,21 +34,20 @@ public: void undo() override; void redo() override; private: - TikzScene *_scene; QMap _oldNodePositions; QMap _newNodePositions; }; -class EdgeBendCommand : public QUndoCommand +class EdgeBendCommand : public GraphUpdateCommand { public: explicit EdgeBendCommand(TikzScene *scene, Edge *edge, float oldWeight, int oldBend, - int oldInAngle, int oldOutAngle); + int oldInAngle, int oldOutAngle, + QUndoCommand *parent = 0); void undo() override; void redo() override; private: - TikzScene *_scene; Edge *_edge; float _oldWeight; int _oldBend; @@ -50,55 +59,75 @@ private: int _newOutAngle; }; -class DeleteCommand : public QUndoCommand +class DeleteCommand : public GraphUpdateCommand { public: explicit DeleteCommand(TikzScene *scene, QMap deleteNodes, QMap deleteEdges, - QSet selEdges); + QSet selEdges, + QUndoCommand *parent = 0); void undo() override; void redo() override; private: - TikzScene *_scene; QMap _deleteNodes; QMap _deleteEdges; QSet _selEdges; }; -class AddNodeCommand : public QUndoCommand +class AddNodeCommand : public GraphUpdateCommand { public: - explicit AddNodeCommand(TikzScene *scene, Node *node, QRectF newBounds); + explicit AddNodeCommand(TikzScene *scene, Node *node, QRectF newBounds, + QUndoCommand *parent = 0); void undo() override; void redo() override; private: - TikzScene *_scene; Node *_node; QRectF _oldBounds; QRectF _newBounds; }; -class AddEdgeCommand : public QUndoCommand +class AddEdgeCommand : public GraphUpdateCommand { public: - explicit AddEdgeCommand(TikzScene *scene, Edge *edge); + explicit AddEdgeCommand(TikzScene *scene, Edge *edge, QUndoCommand *parent = 0); void undo() override; void redo() override; private: - TikzScene *_scene; Edge *_edge; }; -class ChangeEdgeModeCommand : public QUndoCommand +class ChangeEdgeModeCommand : public GraphUpdateCommand { public: - explicit ChangeEdgeModeCommand(TikzScene *scene, Edge *edge); + explicit ChangeEdgeModeCommand(TikzScene *scene, Edge *edge, QUndoCommand *parent = 0); void undo() override; void redo() override; private: - TikzScene *_scene; Edge *_edge; }; +class ApplyStyleToNodesCommand : public GraphUpdateCommand +{ +public: + explicit ApplyStyleToNodesCommand(TikzScene *scene, QString style, QUndoCommand *parent = 0); + void undo() override; + void redo() override; +private: + QString _style; + QMap _oldStyles; +}; + +class PasteCommand : public GraphUpdateCommand +{ +public: + explicit PasteCommand(TikzScene *scene, Graph *graph, QUndoCommand *parent = 0); + void undo() override; + void redo() override; +private: + Graph *_graph; + QList _oldSelection; +}; + #endif // UNDOCOMMANDS_H diff --git a/src/main.cpp b/src/main.cpp index 49b064d..4433f58 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -11,7 +11,6 @@ - int main(int argc, char *argv[]) { QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); @@ -20,7 +19,7 @@ int main(int argc, char *argv[]) QApplication a(argc, argv); a.setQuitOnLastWindowClosed(false); tikzit = new Tikzit(); - tikzit->init(); + tikzit->init(&a); return a.exec(); } diff --git a/src/tikzit.cpp b/src/tikzit.cpp index 6ef86dd..53e83b6 100644 --- a/src/tikzit.cpp +++ b/src/tikzit.cpp @@ -18,7 +18,7 @@ Tikzit::Tikzit() : _styleFile("[default]"), _activeWindow(0) { } -void Tikzit::init() +void Tikzit::init(QApplication *app) { QSettings settings("tikzit", "tikzit"); _mainMenu = new MainMenu(); @@ -35,6 +35,8 @@ void Tikzit::init() QString styleFile = settings.value("previous-tikzstyles-file").toString(); if (!styleFile.isEmpty()) loadStyles(styleFile); + + connect(app, &QApplication::focusChanged, this, &focusChanged); } //QMenuBar *Tikzit::mainMenu() const @@ -137,9 +139,13 @@ void Tikzit::loadStyles(QString fileName) } _stylePalette->reloadStyles(); + foreach (MainWindow *w, _windows) { + w->tikzScene()->reloadStyles(); + } + } else { settings.setValue("previous-tikzstyles-file", ""); - QMessageBox::warning(0, "Style file not found.", "Could not open style file, reverting to default."); + QMessageBox::warning(0, "Style file not found.", "Could not open style file: '" + fileName + "', reverting to default."); } } @@ -148,6 +154,21 @@ QString Tikzit::styleFile() const return _styleFile; } +void Tikzit::focusChanged(QWidget *old, QWidget *nw) +{ +// foreach (MainWindow *w, _windows) { +// if (w->isActiveWindow()) { +// _stylePalette->raise(); +// break; +// } +// } +} + +StylePalette *Tikzit::stylePalette() const +{ + return _stylePalette; +} + TikzStyles *Tikzit::styles() const { diff --git a/src/tikzit.h b/src/tikzit.h index 802b3ab..51aea20 100644 --- a/src/tikzit.h +++ b/src/tikzit.h @@ -77,15 +77,18 @@ public: void newDoc(); void open(); void quit(); - void init(); + void init(QApplication *app); void openTikzStyles(); + void loadStyles(QString fileName); TikzStyles *styles() const; QString styleFile() const; + StylePalette *stylePalette() const; +public slots: + void focusChanged(QWidget *old, QWidget *nw); private: // void createMenu(); - void loadStyles(QString fileName); MainMenu *_mainMenu; ToolPalette *_toolPalette; diff --git a/stylepalette.cpp b/stylepalette.cpp index 8852eb7..c2ddc21 100644 --- a/stylepalette.cpp +++ b/stylepalette.cpp @@ -26,8 +26,7 @@ StylePalette::StylePalette(QWidget *parent) : ui->styleListView->setModel(_model); ui->styleListView->setViewMode(QListView::IconMode); ui->styleListView->setMovement(QListView::Static); - - ui->styleListView->setGridSize(QSize(75,60)); + ui->styleListView->setGridSize(QSize(70,60)); } StylePalette::~StylePalette() @@ -47,15 +46,39 @@ void StylePalette::reloadStyles() foreach(NodeStyle *ns, tikzit->styles()->nodeStyles()) { it = new QStandardItem(ns->icon(), ns->name()); + it->setData(ns->name()); _model->appendRow(it); } } +QString StylePalette::activeNodeStyleName() +{ + const QModelIndexList i = ui->styleListView->selectionModel()->selectedIndexes(); + + if (i.isEmpty()) { + return "none"; + } else { + return i[0].data().toString(); + } +} + void StylePalette::on_buttonOpenTikzstyles_clicked() { tikzit->openTikzStyles(); } +void StylePalette::on_buttonRefreshTikzstyles_clicked() +{ + QSettings settings("tikzit", "tikzit"); + QString path = settings.value("previous-tikzstyles-file").toString(); + if (!path.isEmpty()) tikzit->loadStyles(path); +} + +void StylePalette::on_buttonApplyNodeStyle_clicked() +{ + if (tikzit->activeWindow() != 0) tikzit->activeWindow()->tikzScene()->applyActiveStyleToNodes(); +} + void StylePalette::closeEvent(QCloseEvent *event) { QSettings settings("tikzit", "tikzit"); diff --git a/stylepalette.h b/stylepalette.h index 99dde02..3861008 100644 --- a/stylepalette.h +++ b/stylepalette.h @@ -16,9 +16,13 @@ public: explicit StylePalette(QWidget *parent = 0); ~StylePalette(); void reloadStyles(); + QString activeNodeStyleName(); + public slots: void on_buttonOpenTikzstyles_clicked(); + void on_buttonRefreshTikzstyles_clicked(); + void on_buttonApplyNodeStyle_clicked(); private: Ui::StylePalette *ui; diff --git a/stylepalette.ui b/stylepalette.ui index a8c893f..dab1b32 100644 --- a/stylepalette.ui +++ b/stylepalette.ui @@ -74,7 +74,7 @@ - + @@ -102,7 +102,7 @@ 2 - + 25 @@ -110,20 +110,7 @@ - + - - - - - - - - 25 - 25 - - - - - + Apply -- cgit v1.2.3 From 8b8ea9395bdda4bb1404497ff654b82098084822 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Sun, 18 Mar 2018 11:58:33 -0400 Subject: finally got bboxes working...i think --- src/data/graph.cpp | 23 +++++++++++------- src/data/graph.h | 14 +++++++++-- src/gui/tikzscene.cpp | 62 ++++++++++++++++++++++++++++++++---------------- src/gui/tikzscene.h | 3 ++- src/gui/undocommands.cpp | 7 ++++-- src/tikzit.h | 16 +++++++++++-- 6 files changed, 90 insertions(+), 35 deletions(-) diff --git a/src/data/graph.cpp b/src/data/graph.cpp index 7a5fedc..208cd00 100644 --- a/src/data/graph.cpp +++ b/src/data/graph.cpp @@ -66,6 +66,19 @@ int Graph::maxIntName() return max; } +QRectF Graph::realBbox() +{ + float maxX = 0.0f; + QRectF rect = bbox(); + foreach (Node *n, _nodes) { + rect = rect.united(QRectF(n->point().x()-0.5f, + n->point().y()-0.5f, + 1.0f, 1.0f)); + } + + return rect; +} + QString Graph::freshNodeName() { return QString::number(maxIntName() + 1); @@ -228,14 +241,8 @@ Graph *Graph::copyOfSubgraphWithNodes(QSet nds) void Graph::insertGraph(Graph *graph) { QMap nodeTable; - foreach (Node *n, graph->nodes()) { - Node *n1 = n->copy(); - nodeTable.insert(n, n1); - addNode(n1); - } - foreach (Edge *e, graph->edges()) { - addEdge(e->copy(&nodeTable)); - } + foreach (Node *n, graph->nodes()) addNode(n); + foreach (Edge *e, graph->edges()) addEdge(e); } void Graph::setBbox(const QRectF &bbox) diff --git a/src/data/graph.h b/src/data/graph.h index 4d575e4..d00d2b2 100644 --- a/src/data/graph.h +++ b/src/data/graph.h @@ -48,6 +48,15 @@ public: bool hasBbox(); void clearBbox(); + /*! + * \brief realBbox computes the union of the user-defined + * bounding box, and the bounding boxes of the graph's + * contents. + * + * \return + */ + QRectF realBbox(); + QString tikz(); /*! @@ -59,9 +68,10 @@ public: Graph *copyOfSubgraphWithNodes(QSet nds); /*! - * \brief insertGraph inserts a copy of the given graph. Prior to calling this + * \brief insertGraph inserts the given graph into "this". Prior to calling this * method, the node names in the given graph should be made fresh via - * "renameApart". + * "renameApart". Note that the parameter "graph" relinquishes ownership of its + * nodes and edges, so it should be not be allowed to exist longer than "this". * \param graph */ void insertGraph(Graph *graph); diff --git a/src/gui/tikzscene.cpp b/src/gui/tikzscene.cpp index 2ee3c50..59faa65 100644 --- a/src/gui/tikzscene.cpp +++ b/src/gui/tikzscene.cpp @@ -456,13 +456,15 @@ void TikzScene::pasteFromClipboard() // make sure names in the new subgraph are fresh g->renameApart(graph()); - // shift g to the right until there is some free space - QPointF p0 = toScreen(g->nodes()[0]->point()); - QPointF p = p0; - while (!items(p).isEmpty()) p.setX(p.x()+GLOBAL_SCALEF); - QPointF shift(roundf((p.x() - p0.x())/GLOBAL_SCALEF), 0.0f); - foreach (Node *n, g->nodes()) { - n->setPoint(n->point() + shift); + QRectF srcRect = g->realBbox(); + QRectF tgtRect = graph()->realBbox(); + QPointF shift(tgtRect.right() - srcRect.left(), 0.0f); + + // shift g to the right until it is in free space + if (shift.x() > 0) { + foreach (Node *n, g->nodes()) { + n->setPoint(n->point() + shift); + } } PasteCommand *cmd = new PasteCommand(this, g); @@ -507,6 +509,26 @@ void TikzScene::reloadStyles() } } +void TikzScene::refreshSceneBounds() +{ + if (!views().empty()) { + QGraphicsView *v = views().first(); + QRectF viewB = v->mapToScene(v->viewport()->rect()).boundingRect(); + //QPointF tl = v->mapToScene(viewB.topLeft()); + //viewB.setTopLeft(tl); + + QRectF bounds = viewB.united(rectToScreen(graph()->realBbox().adjusted(-1.0f, -1.0f, 1.0f, 1.0f))); + qDebug() << viewB; + + if (bounds != sceneRect()) { + QPointF c = viewB.center(); + setSceneRect(bounds); + v->centerOn(c); + } + } + //setBounds(graphB); +} + void TikzScene::refreshAdjacentEdges(QList nodes) { if (nodes.empty()) return; @@ -518,19 +540,19 @@ void TikzScene::refreshAdjacentEdges(QList nodes) } } -void TikzScene::setBounds(QRectF bounds) -{ - if (bounds != sceneRect()) { - if (!views().empty()) { - QGraphicsView *v = views().first(); - QPointF c = v->mapToScene(v->viewport()->rect().center()); - setSceneRect(bounds); - v->centerOn(c); - } else { - setSceneRect(bounds); - } - } -} +//void TikzScene::setBounds(QRectF bounds) +//{ +// if (bounds != sceneRect()) { +// if (!views().empty()) { +// QGraphicsView *v = views().first(); +// QPointF c = v->mapToScene(v->viewport()->rect().center()); +// setSceneRect(bounds); +// v->centerOn(c); +// } else { +// setSceneRect(bounds); +// } +// } +//} QMap &TikzScene::nodeItems() { diff --git a/src/gui/tikzscene.h b/src/gui/tikzscene.h index 5d3eec2..b551abd 100644 --- a/src/gui/tikzscene.h +++ b/src/gui/tikzscene.h @@ -30,11 +30,12 @@ public: QMap &nodeItems(); QMap &edgeItems(); void refreshAdjacentEdges(QList nodes); - void setBounds(QRectF bounds); +// void setBounds(QRectF bounds); TikzDocument *tikzDocument() const; void setTikzDocument(TikzDocument *tikzDocument); void reloadStyles(); + void refreshSceneBounds(); void applyActiveStyleToNodes(); void deleteSelectedItems(); void copyToClipboard(); diff --git a/src/gui/undocommands.cpp b/src/gui/undocommands.cpp index 0ebfd21..c9ca041 100644 --- a/src/gui/undocommands.cpp +++ b/src/gui/undocommands.cpp @@ -11,12 +11,14 @@ GraphUpdateCommand::GraphUpdateCommand(TikzScene *scene, QUndoCommand *parent) : void GraphUpdateCommand::undo() { _scene->tikzDocument()->refreshTikz(); + _scene->refreshSceneBounds(); _scene->invalidate(); } void GraphUpdateCommand::redo() { _scene->tikzDocument()->refreshTikz(); + _scene->refreshSceneBounds(); _scene->invalidate(); } @@ -174,7 +176,7 @@ void AddNodeCommand::undo() _scene->graph()->removeNode(_node); - _scene->setBounds(_oldBounds); + //_scene->setBounds(_oldBounds); GraphUpdateCommand::undo(); } @@ -187,7 +189,8 @@ void AddNodeCommand::redo() _scene->nodeItems().insert(_node, ni); _scene->addItem(ni); - _scene->setBounds(_newBounds); + //_scene->setBounds(_newBounds); + GraphUpdateCommand::redo(); } diff --git a/src/tikzit.h b/src/tikzit.h index 51aea20..5b23083 100644 --- a/src/tikzit.h +++ b/src/tikzit.h @@ -51,13 +51,25 @@ // divisible by 8 to avoid rounding errors with e.g. grid-snapping. #define GLOBAL_SCALE 80 #define GLOBAL_SCALEF 80.0f +#define GLOBAL_SCALEF_INV 0.0125f inline QPointF toScreen(QPointF src) { src.setY(-src.y()); src *= GLOBAL_SCALEF; return src; } inline QPointF fromScreen(QPointF src) -{ src.setY(-src.y()); src /= GLOBAL_SCALEF; return src; } - +{ src.setY(-src.y()); src *= GLOBAL_SCALEF_INV; return src; } + +inline QRectF rectToScreen(QRectF src) +{ return QRectF(src.x() * GLOBAL_SCALEF, + -(src.y()+src.height()) * GLOBAL_SCALEF, + src.width() * GLOBAL_SCALEF, + src.height() * GLOBAL_SCALEF); } + +inline QRectF rectFromScreen(QRectF src) +{ return QRectF(src.x() * GLOBAL_SCALEF_INV, + -(src.y()+src.height()) * GLOBAL_SCALEF_INV, + src.width() * GLOBAL_SCALEF_INV, + src.height() * GLOBAL_SCALEF_INV); } class Tikzit : public QObject { Q_OBJECT -- cgit v1.2.3 From 1a71fd8efa0350d1e121f6792e8fad67e82b25c1 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Thu, 5 Apr 2018 13:20:20 +0200 Subject: fixed name conflict, now builds in MSVC --- src/data/edge.cpp | 32 +++++++------- src/data/graph.cpp | 7 ++- src/data/tikzdocument.cpp | 2 +- src/data/tikzparser.y | 52 +++++++++++----------- src/data/tikzparserdefs.h | 4 ++ src/gui/mainmenu.cpp | 6 ++- src/gui/nodeitem.cpp | 2 +- src/gui/tikzscene.cpp | 107 +++++++++++++++++++++++++++++++++++----------- src/gui/tikzscene.h | 3 ++ src/gui/tikzview.cpp | 33 ++++++++------ src/gui/tikzview.h | 1 + src/gui/undocommands.cpp | 12 +++--- src/main.cpp | 1 - src/tikzit.cpp | 2 +- src/tikzit.h | 9 ++-- src/util.cpp | 6 +++ src/util.h | 6 +++ stylepalette.ui | 34 ++++++++++++++- 18 files changed, 223 insertions(+), 96 deletions(-) diff --git a/src/data/edge.cpp b/src/data/edge.cpp index d3396e8..bcf127f 100644 --- a/src/data/edge.cpp +++ b/src/data/edge.cpp @@ -222,21 +222,23 @@ void Edge::updateData() // TODO: style handling? - if (_basicBendMode && _bend != 0) { - QString bendKey; - int b; - if (_bend < 0) { - bendKey = "bend left"; - b = -_bend; - } else { - bendKey = "bend right"; - b = _bend; - } - - if (b == 30) { - _data->setAtom(bendKey); - } else { - _data->setProperty(bendKey, QString::number(b)); + if (_basicBendMode) { + if (_bend != 0) { + QString bendKey; + int b; + if (_bend < 0) { + bendKey = "bend left"; + b = -_bend; + } else { + bendKey = "bend right"; + b = _bend; + } + + if (b == 30) { + _data->setAtom(bendKey); + } else { + _data->setProperty(bendKey, QString::number(b)); + } } } else { _data->setProperty("in", QString::number(_inAngle)); diff --git a/src/data/graph.cpp b/src/data/graph.cpp index 208cd00..33af93d 100644 --- a/src/data/graph.cpp +++ b/src/data/graph.cpp @@ -1,4 +1,5 @@ #include "graph.h" +#include "util.h" #include #include @@ -158,7 +159,9 @@ QString Graph::tikz() code << n->data()->tikz() << " "; code << "(" << n->name() << ") at (" - << n->point().x() << ", " << n->point().y() + << floatToString(n->point().x()) + << ", " + << floatToString(n->point().y()) << ") {" << n->label() << "};\n"; line++; } @@ -230,7 +233,7 @@ Graph *Graph::copyOfSubgraphWithNodes(QSet nds) g->addNode(n1); } foreach (Edge *e, edges()) { - if (nds.contains(e->source()) || nds.contains(e->target())) { + if (nds.contains(e->source()) && nds.contains(e->target())) { g->addEdge(e->copy(&nodeTable)); } } diff --git a/src/data/tikzdocument.cpp b/src/data/tikzdocument.cpp index eeb4e14..4a813ad 100644 --- a/src/data/tikzdocument.cpp +++ b/src/data/tikzdocument.cpp @@ -85,7 +85,7 @@ void TikzDocument::save() { QSettings settings("tikzit", "tikzit"); settings.setValue("previous-file-path", fi.absolutePath()); - if (file.open(QIODevice::ReadWrite)) { + if (file.open(QIODevice::WriteOnly)) { QTextStream stream(&file); stream << _tikz; file.close(); diff --git a/src/data/tikzparser.y b/src/data/tikzparser.y index 76674f1..6e708a3 100644 --- a/src/data/tikzparser.y +++ b/src/data/tikzparser.y @@ -25,6 +25,7 @@ * along with this program. If not, see . */ + #include "tikzparserdefs.h" %} @@ -62,7 +63,7 @@ #include "graphelementproperty.h" #include "tikzlexer.h" -#import "tikzassembler.h" +#include "tikzassembler.h" /* the assembler (used by this parser) is stored in the lexer state as "extra" data */ #define assembler yyget_extra(scanner) @@ -71,7 +72,7 @@ void yyerror(YYLTYPE *yylloc, void *scanner, const char *str) { // TODO: implement reportError() //assembler->reportError(str, yylloc); - qDebug() << "parse error: " << str; + qDebug() << "\nparse error: " << str << " line:" << yylloc->first_line; } %} @@ -104,7 +105,7 @@ void yyerror(YYLTYPE *yylloc, void *scanner, const char *str) { %token RIGHTBRACKET "]" %token FULLSTOP "." %token EQUALS "=" -%token COORD "co-ordinate" +%token TCOORD "coordinate" %token PROPSTRING "key/value string" %token REFSTRING "string" %token DELIMITEDSTRING "{-delimited string" @@ -187,7 +188,7 @@ property: val: PROPSTRING { $$ = $1; } | DELIMITEDSTRING { $$ = $1; }; nodename: "(" REFSTRING ")" { $$ = $2; }; -node: "\\node" optproperties nodename "at" COORD DELIMITEDSTRING ";" +node: "\\node" optproperties nodename "at" TCOORD DELIMITEDSTRING ";" { Node *node = new Node(); @@ -240,36 +241,39 @@ edge: "\\draw" optproperties noderef "to" optedgenode optnoderef ";" t = s; } - Edge *edge = new Edge(s, t); - if ($2) { - edge->setData($2); - edge->setAttributesFromData(); - } + // if the source or the target of the edge doesn't exist, quietly ignore it. + if (s != 0 && t != 0) { + Edge *edge = new Edge(s, t); + if ($2) { + edge->setData($2); + edge->setAttributesFromData(); + } - if ($5) - edge->setEdgeNode($5); - if ($3.anchor) { - edge->setSourceAnchor(QString($3.anchor)); - free($3.anchor); - } + if ($5) + edge->setEdgeNode($5); + if ($3.anchor) { + edge->setSourceAnchor(QString($3.anchor)); + free($3.anchor); + } - if ($6.node) { - if ($6.anchor) { - edge->setTargetAnchor(QString($6.anchor)); - free($6.anchor); + if ($6.node) { + if ($6.anchor) { + edge->setTargetAnchor(QString($6.anchor)); + free($6.anchor); + } + } else { + edge->setTargetAnchor(edge->sourceAnchor()); } - } else { - edge->setTargetAnchor(edge->sourceAnchor()); - } - assembler->graph()->addEdge(edge); + assembler->graph()->addEdge(edge); + } }; ignoreprop: val | val "=" val; ignoreprops: ignoreprop ignoreprops | ; optignoreprops: "[" ignoreprops "]"; boundingbox: - "\\path" optignoreprops COORD "rectangle" COORD ";" + "\\path" optignoreprops TCOORD "rectangle" TCOORD ";" { assembler->graph()->setBbox(QRectF(*$3, *$5)); delete $3; diff --git a/src/data/tikzparserdefs.h b/src/data/tikzparserdefs.h index b51a8c9..1625136 100644 --- a/src/data/tikzparserdefs.h +++ b/src/data/tikzparserdefs.h @@ -1,6 +1,8 @@ #ifndef TIKZPARSERDEFS_H #define TIKZPARSERDEFS_H +#define YY_NO_UNISTD_H 1 + #include "graphelementproperty.h" #include "graphelementdata.h" #include "node.h" @@ -15,4 +17,6 @@ struct noderef { char *anchor; }; +inline int isatty(void*) { return 0; } + #endif // TIKZPARSERDEFS_H diff --git a/src/gui/mainmenu.cpp b/src/gui/mainmenu.cpp index dfb447f..0166caf 100644 --- a/src/gui/mainmenu.cpp +++ b/src/gui/mainmenu.cpp @@ -80,12 +80,14 @@ void MainMenu::on_actionDelete_triggered() void MainMenu::on_actionSelect_All_triggered() { - // TODO + if (tikzit->activeWindow() != 0) + tikzit->activeWindow()->tikzScene()->selectAllNodes(); } void MainMenu::on_actionDeselect_All_triggered() { - // TODO + if (tikzit->activeWindow() != 0) + tikzit->activeWindow()->tikzScene()->deselectAll(); } diff --git a/src/gui/nodeitem.cpp b/src/gui/nodeitem.cpp index 36d488c..06b46ff 100644 --- a/src/gui/nodeitem.cpp +++ b/src/gui/nodeitem.cpp @@ -94,7 +94,7 @@ void NodeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidge QPainterPath NodeItem::shape() const { QPainterPath path; - path.addEllipse(QPointF(0,0), GLOBAL_SCALEF * 0.1, GLOBAL_SCALEF * 0.1); + path.addEllipse(QPointF(0,0), GLOBAL_SCALEF * 0.2, GLOBAL_SCALEF * 0.2); return path; } diff --git a/src/gui/tikzscene.cpp b/src/gui/tikzscene.cpp index 59faa65..24f4ad1 100644 --- a/src/gui/tikzscene.cpp +++ b/src/gui/tikzscene.cpp @@ -8,6 +8,7 @@ #include #include #include +#include TikzScene::TikzScene(TikzDocument *tikzDocument, ToolPalette *tools, QObject *parent) : @@ -16,15 +17,28 @@ TikzScene::TikzScene(TikzDocument *tikzDocument, ToolPalette *tools, QObject *pa _modifyEdgeItem = 0; _edgeStartNodeItem = 0; _drawEdgeItem = new QGraphicsLineItem(); - setSceneRect(-310,-230,620,450); + _rubberBandItem = new QGraphicsRectItem(); + //setSceneRect(-310,-230,620,450); + setSceneRect(-1000,-1000,2000,2000); QPen pen; pen.setColor(QColor::fromRgbF(0.5f, 0.0f, 0.5f)); pen.setWidth(3); + pen.setCosmetic(true); _drawEdgeItem->setPen(pen); _drawEdgeItem->setLine(0,0,0,0); _drawEdgeItem->setVisible(false); addItem(_drawEdgeItem); + + pen.setColor(QColor::fromRgbF(0.6f, 0.6f, 0.8f)); + pen.setWidth(3); + QVector dash; + dash << 4.0 << 4.0; + pen.setDashPattern(dash); + _rubberBandItem->setPen(pen); + + _rubberBandItem->setVisible(false); + addItem(_rubberBandItem); } TikzScene::~TikzScene() { @@ -71,7 +85,7 @@ void TikzScene::mousePressEvent(QGraphicsSceneMouseEvent *event) // disable rubber band drag, which will clear the selection. Only re-enable it // for the SELECT tool, and when no control point has been clicked. - views()[0]->setDragMode(QGraphicsView::NoDrag); + //views()[0]->setDragMode(QGraphicsView::NoDrag); // radius of a control point for bezier edges, in scene coordinates qreal cpR = GLOBAL_SCALEF * (0.05); @@ -113,9 +127,23 @@ void TikzScene::mousePressEvent(QGraphicsSceneMouseEvent *event) _oldWeight = e->weight(); } else { // since we are not dragging a control point, process the click normally - views()[0]->setDragMode(QGraphicsView::RubberBandDrag); + //views()[0]->setDragMode(QGraphicsView::RubberBandDrag); QGraphicsScene::mousePressEvent(event); + if (items(_mouseDownPos).isEmpty()) { + _rubberBandItem->setRect(QRectF(_mouseDownPos,_mouseDownPos)); + _rubberBandItem->setVisible(true); + qDebug() << "starting rubber band drag"; + } + +// foreach (QGraphicsItem *gi, items()) { +// if (EdgeItem *ei = dynamic_cast(gi)) { +// //qDebug() << "got an edge item: " << ei; +// ei->setFlag(QGraphicsItem::ItemIsSelectable, false); +// //ei->setSelected(true); +// } +// } + // save current node positions for undo support _oldNodePositions.clear(); foreach (QGraphicsItem *gi, selectedItems()) { @@ -155,7 +183,7 @@ void TikzScene::mouseMoveEvent(QGraphicsSceneMouseEvent *event) QPointF mousePos = event->scenePos(); //QRectF rb = views()[0]->rubberBandRect(); //invalidate(-800,-800,1600,1600); - invalidate(QRectF(), QGraphicsScene::BackgroundLayer); + //invalidate(QRectF(), QGraphicsScene::BackgroundLayer); switch (_tools->currentTool()) { case ToolPalette::SELECT: @@ -244,8 +272,7 @@ void TikzScene::mouseMoveEvent(QGraphicsSceneMouseEvent *event) // apply the same offset to all nodes, otherwise we get odd rounding behaviour with // multiple selection. QPointF shift = mousePos - _mouseDownPos; - int gridSize = GLOBAL_SCALE / 8; - shift = QPointF(round(shift.x()/gridSize)*gridSize, round(shift.y()/gridSize)*gridSize); + shift = QPointF(round(shift.x()/GRID_SEP)*GRID_SEP, round(shift.y()/GRID_SEP)*GRID_SEP); foreach (Node *n, _oldNodePositions.keys()) { NodeItem *ni = _nodeItems[n]; @@ -257,6 +284,15 @@ void TikzScene::mouseMoveEvent(QGraphicsSceneMouseEvent *event) } else { // otherwise, process mouse move normally QGraphicsScene::mouseMoveEvent(event); + + if (_rubberBandItem->isVisible()) { + qreal left = std::min(_mouseDownPos.x(), mousePos.x()); + qreal top = std::min(_mouseDownPos.y(), mousePos.y()); + qreal w = std::abs(_mouseDownPos.x() - mousePos.x()); + qreal h = std::abs(_mouseDownPos.y() - mousePos.y()); + + _rubberBandItem->setRect(QRectF(left, top, w, h)); + } } break; @@ -308,6 +344,19 @@ void TikzScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) // otherwise, process mouse move normally QGraphicsScene::mouseReleaseEvent(event); + if (_rubberBandItem->isVisible()) { + QPainterPath sel; + sel.addRect(_rubberBandItem->rect()); + foreach (QGraphicsItem *gi, items()) { + if (NodeItem *ni = dynamic_cast(gi)) { + if (sel.contains(toScreen(ni->node()->point()))) ni->setSelected(true); + } + } + //setSelectionArea(sel); + } + + _rubberBandItem->setVisible(false); + if (!_oldNodePositions.empty()) { QMap newNodePositions; @@ -329,8 +378,7 @@ void TikzScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) break; case ToolPalette::VERTEX: { - int gridSize = GLOBAL_SCALE / 8; - QPointF gridPos(round(mousePos.x()/gridSize)*gridSize, round(mousePos.y()/gridSize)*gridSize); + QPointF gridPos(round(mousePos.x()/GRID_SEP)*GRID_SEP, round(mousePos.y()/GRID_SEP)*GRID_SEP); Node *n = new Node(_tikzDocument); n->setName(graph()->freshNodeName()); n->setPoint(fromScreen(gridPos)); @@ -460,7 +508,6 @@ void TikzScene::pasteFromClipboard() QRectF tgtRect = graph()->realBbox(); QPointF shift(tgtRect.right() - srcRect.left(), 0.0f); - // shift g to the right until it is in free space if (shift.x() > 0) { foreach (Node *n, g->nodes()) { n->setPoint(n->point() + shift); @@ -472,6 +519,18 @@ void TikzScene::pasteFromClipboard() } } +void TikzScene::selectAllNodes() +{ + foreach (NodeItem *ni, _nodeItems.values()) { + ni->setSelected(true); + } +} + +void TikzScene::deselectAll() +{ + selectedItems().clear(); +} + void TikzScene::getSelection(QSet &selNodes, QSet &selEdges) { foreach (QGraphicsItem *gi, selectedItems()) { @@ -511,21 +570,21 @@ void TikzScene::reloadStyles() void TikzScene::refreshSceneBounds() { - if (!views().empty()) { - QGraphicsView *v = views().first(); - QRectF viewB = v->mapToScene(v->viewport()->rect()).boundingRect(); - //QPointF tl = v->mapToScene(viewB.topLeft()); - //viewB.setTopLeft(tl); - - QRectF bounds = viewB.united(rectToScreen(graph()->realBbox().adjusted(-1.0f, -1.0f, 1.0f, 1.0f))); - qDebug() << viewB; - - if (bounds != sceneRect()) { - QPointF c = viewB.center(); - setSceneRect(bounds); - v->centerOn(c); - } - } +// if (!views().empty()) { +// QGraphicsView *v = views().first(); +// QRectF viewB = v->mapToScene(v->viewport()->rect()).boundingRect(); +// //QPointF tl = v->mapToScene(viewB.topLeft()); +// //viewB.setTopLeft(tl); + +// QRectF bounds = viewB.united(rectToScreen(graph()->realBbox().adjusted(-1.0f, -1.0f, 1.0f, 1.0f))); +// //qDebug() << viewB; + +// if (bounds != sceneRect()) { +// QPointF c = viewB.center(); +// setSceneRect(bounds); +// v->centerOn(c); +// } +// } //setBounds(graphB); } diff --git a/src/gui/tikzscene.h b/src/gui/tikzscene.h index b551abd..f7735ee 100644 --- a/src/gui/tikzscene.h +++ b/src/gui/tikzscene.h @@ -41,6 +41,8 @@ public: void copyToClipboard(); void cutToClipboard(); void pasteFromClipboard(); + void selectAllNodes(); + void deselectAll(); public slots: void graphReplaced(); @@ -56,6 +58,7 @@ private: QMap _nodeItems; QMap _edgeItems; QGraphicsLineItem *_drawEdgeItem; + QGraphicsRectItem *_rubberBandItem; EdgeItem *_modifyEdgeItem; NodeItem *_edgeStartNodeItem; NodeItem *_edgeEndNodeItem; diff --git a/src/gui/tikzview.cpp b/src/gui/tikzview.cpp index b8ae1c0..60dc2bc 100644 --- a/src/gui/tikzview.cpp +++ b/src/gui/tikzview.cpp @@ -7,7 +7,7 @@ TikzView::TikzView(QWidget *parent) : QGraphicsView(parent) { setRenderHint(QPainter::Antialiasing); - setDragMode(QGraphicsView::RubberBandDrag); + //setDragMode(QGraphicsView::RubberBandDrag); _scale = 1.0f; } @@ -24,10 +24,15 @@ void TikzView::zoomOut() scale(0.625,0.625); } +void TikzView::setScene(QGraphicsScene *scene) +{ + QGraphicsView::setScene(scene); + centerOn(QPointF(0.0f,-230.0f)); +} + void TikzView::drawBackground(QPainter *painter, const QRectF &rect) { // draw the grid - int step = GLOBAL_SCALE / 8; QPen pen1; pen1.setWidth(1); @@ -43,38 +48,38 @@ void TikzView::drawBackground(QPainter *painter, const QRectF &rect) painter->setPen(pen1); if (_scale > 0.2f) { - for (int x = -step; x > rect.left(); x -= step) { - if (x % (step * 8) != 0) painter->drawLine(x, rect.top(), x, rect.bottom()); + for (int x = -GRID_SEP; x > rect.left(); x -= GRID_SEP) { + if (x % (GRID_SEP * GRID_N) != 0) painter->drawLine(x, rect.top(), x, rect.bottom()); } - for (int x = step; x < rect.right(); x += step) { - if (x % (step * 8) != 0) painter->drawLine(x, rect.top(), x, rect.bottom()); + for (int x = GRID_SEP; x < rect.right(); x += GRID_SEP) { + if (x % (GRID_SEP * GRID_N) != 0) painter->drawLine(x, rect.top(), x, rect.bottom()); } - for (int y = -step; y > rect.top(); y -= step) { - if (y % (step * 8) != 0) painter->drawLine(rect.left(), y, rect.right(), y); + for (int y = -GRID_SEP; y > rect.top(); y -= GRID_SEP) { + if (y % (GRID_SEP * GRID_N) != 0) painter->drawLine(rect.left(), y, rect.right(), y); } - for (int y = step; y < rect.bottom(); y += step) { - if (y % (step * 8) != 0) painter->drawLine(rect.left(), y, rect.right(), y); + for (int y = GRID_SEP; y < rect.bottom(); y += GRID_SEP) { + if (y % (GRID_SEP * GRID_N) != 0) painter->drawLine(rect.left(), y, rect.right(), y); } } painter->setPen(pen2); - for (int x = -step*8; x > rect.left(); x -= step*8) { + for (int x = -GRID_SEP*GRID_N; x > rect.left(); x -= GRID_SEP*GRID_N) { painter->drawLine(x, rect.top(), x, rect.bottom()); } - for (int x = step*8; x < rect.right(); x += step*8) { + for (int x = GRID_SEP*GRID_N; x < rect.right(); x += GRID_SEP*GRID_N) { painter->drawLine(x, rect.top(), x, rect.bottom()); } - for (int y = -step*8; y > rect.top(); y -= step*8) { + for (int y = -GRID_SEP*GRID_N; y > rect.top(); y -= GRID_SEP*GRID_N) { painter->drawLine(rect.left(), y, rect.right(), y); } - for (int y = step*8; y < rect.bottom(); y += step*8) { + for (int y = GRID_SEP*GRID_N; y < rect.bottom(); y += GRID_SEP*GRID_N) { painter->drawLine(rect.left(), y, rect.right(), y); } diff --git a/src/gui/tikzview.h b/src/gui/tikzview.h index f89729b..cb41fd4 100644 --- a/src/gui/tikzview.h +++ b/src/gui/tikzview.h @@ -23,6 +23,7 @@ public: public slots: void zoomIn(); void zoomOut(); + void setScene(QGraphicsScene *scene); protected: void drawBackground(QPainter *painter, const QRectF &rect); private: diff --git a/src/gui/undocommands.cpp b/src/gui/undocommands.cpp index c9ca041..f64b1db 100644 --- a/src/gui/undocommands.cpp +++ b/src/gui/undocommands.cpp @@ -312,6 +312,12 @@ void PasteCommand::redo() _scene->clearSelection(); _scene->graph()->insertGraph(_graph); + foreach (Edge *e, _graph->edges()) { + EdgeItem *ei = new EdgeItem(e); + _scene->edgeItems().insert(e, ei); + _scene->addItem(ei); + } + foreach (Node *n, _graph->nodes()) { n->attachStyle(); // in case styles have changed NodeItem *ni = new NodeItem(n); @@ -320,11 +326,5 @@ void PasteCommand::redo() ni->setSelected(true); } - foreach (Edge *e, _graph->edges()) { - EdgeItem *ei = new EdgeItem(e); - _scene->edgeItems().insert(e, ei); - _scene->addItem(ei); - } - GraphUpdateCommand::redo(); } diff --git a/src/main.cpp b/src/main.cpp index 4433f58..b15840d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -20,6 +20,5 @@ int main(int argc, char *argv[]) a.setQuitOnLastWindowClosed(false); tikzit = new Tikzit(); tikzit->init(&a); - return a.exec(); } diff --git a/src/tikzit.cpp b/src/tikzit.cpp index 53e83b6..78cb7a1 100644 --- a/src/tikzit.cpp +++ b/src/tikzit.cpp @@ -36,7 +36,7 @@ void Tikzit::init(QApplication *app) QString styleFile = settings.value("previous-tikzstyles-file").toString(); if (!styleFile.isEmpty()) loadStyles(styleFile); - connect(app, &QApplication::focusChanged, this, &focusChanged); + //connect(app, &QApplication::focusChanged, this, &focusChanged); } //QMenuBar *Tikzit::mainMenu() const diff --git a/src/tikzit.h b/src/tikzit.h index 5b23083..39aa9e4 100644 --- a/src/tikzit.h +++ b/src/tikzit.h @@ -49,9 +49,12 @@ // Number of pixels between (0,0) and (1,0) at 100% zoom level. This should be // divisible by 8 to avoid rounding errors with e.g. grid-snapping. -#define GLOBAL_SCALE 80 -#define GLOBAL_SCALEF 80.0f -#define GLOBAL_SCALEF_INV 0.0125f +#define GLOBAL_SCALE 40 +#define GLOBAL_SCALEF 40.0f +#define GLOBAL_SCALEF_INV 0.025f +#define GRID_N 4 +#define GRID_SEP 10 +#define GRID_SEPF 10.0f inline QPointF toScreen(QPointF src) { src.setY(-src.y()); src *= GLOBAL_SCALEF; return src; } diff --git a/src/util.cpp b/src/util.cpp index 64716d2..5e56cd9 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -46,3 +46,9 @@ float normaliseAngleRad (float rads) { } return rads; } + +// convert float to string, squashing very small floats to zero +QString floatToString(float f) { + if (f >= -0.000001 && f <= 0.000001) return "0"; + else return QString::number(f); +} diff --git a/src/util.h b/src/util.h index 7622269..706928d 100644 --- a/src/util.h +++ b/src/util.h @@ -6,8 +6,13 @@ #define UTIL_H #include +#include #include +#ifndef M_PI +#define M_PI 3.14159265358979323846264338327950288 +#endif + // interpolate on a cubic bezier curve float bezierInterpolate(float dist, float c0, float c1, float c2, float c3); QPointF bezierInterpolateFull (float dist, QPointF c0, QPointF c1, QPointF c2, QPointF c3); @@ -15,6 +20,7 @@ QPointF bezierInterpolateFull (float dist, QPointF c0, QPointF c1, QPointF c2, Q // rounding float roundToNearest(float stepSize, float val); float radiansToDegrees (float radians); +QString floatToString(float f); // angles float degreesToRadians(float degrees); diff --git a/stylepalette.ui b/stylepalette.ui index dab1b32..5e370b6 100644 --- a/stylepalette.ui +++ b/stylepalette.ui @@ -105,8 +105,8 @@ - 25 - 25 + 0 + 0 @@ -129,6 +129,36 @@ + + + + + + + 2 + + + + + Apply + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + -- cgit v1.2.3 From e57923c7d767f5a532bc35571d74a5470eb76314 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Thu, 5 Apr 2018 14:21:24 +0200 Subject: built-in style palette --- src/data/nodestyle.cpp | 32 ++++++++++-- src/gui/mainwindow.cpp | 13 ++++- src/gui/mainwindow.h | 7 ++- src/gui/tikzscene.cpp | 10 ++-- src/gui/tikzscene.h | 4 +- src/tikzit.cpp | 16 +++--- src/tikzit.h | 4 +- stylepalette.cpp | 35 +++++++++----- stylepalette.h | 3 +- stylepalette.ui | 129 +++++++++++++++---------------------------------- 10 files changed, 130 insertions(+), 123 deletions(-) diff --git a/src/data/nodestyle.cpp b/src/data/nodestyle.cpp index 302ab84..b3d72fb 100644 --- a/src/data/nodestyle.cpp +++ b/src/data/nodestyle.cpp @@ -26,6 +26,8 @@ QString NodeStyle::name() const NodeStyle::Shape NodeStyle::shape() const { + if (_data == 0) return NodeStyle::Circle; + QString sh = _data->property("shape"); if (sh.isNull()) return NodeStyle::Circle; else if (sh == "circle") return NodeStyle::Circle; @@ -35,6 +37,8 @@ NodeStyle::Shape NodeStyle::shape() const QColor NodeStyle::fillColor() const { + if (_data == 0) return Qt::white; + QString col = _data->property("fill"); if (col.isNull()) { @@ -52,6 +56,8 @@ QColor NodeStyle::fillColor() const QColor NodeStyle::strokeColor() const { + if (_data == 0) return Qt::black; + QString col = _data->property("draw"); if (col.isNull()) { @@ -103,11 +109,29 @@ QIcon NodeStyle::icon() const px.fill(Qt::transparent); QPainter painter(&px); QPainterPath pth = path(); - painter.setPen(pen()); - painter.setBrush(brush()); - pth.translate(50.0f, 50.0f); - painter.drawPath(pth); + + if (_data == 0) { + QColor c(180,180,200); + painter.setPen(QPen(c)); + painter.setBrush(QBrush(c)); + painter.drawEllipse(QPointF(50.0f,50.0f), 3,3); + + QPen pen(QColor(180,180,220)); + pen.setWidth(3); + QVector p; + p << 2.0 << 2.0; + pen.setDashPattern(p); + painter.setPen(pen); + painter.setBrush(Qt::NoBrush); + painter.drawPath(pth); + } else { + painter.setPen(pen()); + painter.setBrush(brush()); + painter.drawPath(pth); + } + + return QIcon(px); } diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 26e19b6..9ce340a 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -28,7 +28,11 @@ MainWindow::MainWindow(QWidget *parent) : _toolPalette = new ToolPalette(this); addToolBar(_toolPalette); - _tikzScene = new TikzScene(_tikzDocument, _toolPalette, this); + _stylePalette = new StylePalette(this); + addDockWidget(Qt::RightDockWidgetArea, _stylePalette); + + + _tikzScene = new TikzScene(_tikzDocument, _toolPalette, _stylePalette, this); ui->tikzView->setScene(_tikzScene); _pristine = true; @@ -79,11 +83,16 @@ void MainWindow::changeEvent(QEvent *event) { if (event->type() == QEvent::ActivationChange && isActiveWindow()) { tikzit->setActiveWindow(this); - tikzit->stylePalette()->raise(); + //tikzit->stylePalette()->raise(); } QMainWindow::changeEvent(event); } +StylePalette *MainWindow::stylePalette() const +{ + return _stylePalette; +} + void MainWindow::updateFileName() { setWindowTitle("TiKZiT - " + _tikzDocument->shortName()); diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h index 613bfcb..facce2b 100644 --- a/src/gui/mainwindow.h +++ b/src/gui/mainwindow.h @@ -11,6 +11,7 @@ #include "tikzdocument.h" #include "mainmenu.h" #include "toolpalette.h" +#include "stylepalette.h" #include #include @@ -33,9 +34,12 @@ public: TikzView *tikzView() const; TikzScene *tikzScene() const; TikzDocument *tikzDocument() const; - ToolPalette *toolPalette() const; + ToolPalette *toolPalette() const; + StylePalette *stylePalette() const; + void updateFileName(); void refreshTikz(); + protected: void closeEvent(QCloseEvent *event); void changeEvent(QEvent *event); @@ -45,6 +49,7 @@ private: TikzDocument *_tikzDocument; MainMenu *_menu; ToolPalette *_toolPalette; + StylePalette *_stylePalette; Ui::MainWindow *ui; bool _pristine; int _windowId; diff --git a/src/gui/tikzscene.cpp b/src/gui/tikzscene.cpp index 24f4ad1..8378f5e 100644 --- a/src/gui/tikzscene.cpp +++ b/src/gui/tikzscene.cpp @@ -11,8 +11,9 @@ #include -TikzScene::TikzScene(TikzDocument *tikzDocument, ToolPalette *tools, QObject *parent) : - QGraphicsScene(parent), _tikzDocument(tikzDocument), _tools(tools) +TikzScene::TikzScene(TikzDocument *tikzDocument, ToolPalette *tools, + StylePalette *styles, QObject *parent) : + QGraphicsScene(parent), _tikzDocument(tikzDocument), _tools(tools), _styles(styles) { _modifyEdgeItem = 0; _edgeStartNodeItem = 0; @@ -382,7 +383,7 @@ void TikzScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) Node *n = new Node(_tikzDocument); n->setName(graph()->freshNodeName()); n->setPoint(fromScreen(gridPos)); - n->setStyleName(tikzit->stylePalette()->activeNodeStyleName()); + n->setStyleName(_styles->activeNodeStyleName()); QRectF grow(gridPos.x() - GLOBAL_SCALEF, gridPos.y() - GLOBAL_SCALEF, 2 * GLOBAL_SCALEF, 2 * GLOBAL_SCALEF); QRectF newBounds = sceneRect().united(grow); @@ -447,7 +448,7 @@ void TikzScene::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) } void TikzScene::applyActiveStyleToNodes() { - ApplyStyleToNodesCommand *cmd = new ApplyStyleToNodesCommand(this, tikzit->stylePalette()->activeNodeStyleName()); + ApplyStyleToNodesCommand *cmd = new ApplyStyleToNodesCommand(this, _styles->activeNodeStyleName()); _tikzDocument->undoStack()->push(cmd); } @@ -562,6 +563,7 @@ void TikzScene::setTikzDocument(TikzDocument *tikzDocument) void TikzScene::reloadStyles() { + _styles->reloadStyles(); foreach (NodeItem *ni, _nodeItems) { ni->node()->attachStyle(); ni->readPos(); // trigger a repaint diff --git a/src/gui/tikzscene.h b/src/gui/tikzscene.h index f7735ee..7061143 100644 --- a/src/gui/tikzscene.h +++ b/src/gui/tikzscene.h @@ -11,6 +11,7 @@ #include "edgeitem.h" #include "tikzdocument.h" #include "toolpalette.h" +#include "stylepalette.h" #include #include @@ -24,7 +25,7 @@ class TikzScene : public QGraphicsScene { Q_OBJECT public: - TikzScene(TikzDocument *tikzDocument, ToolPalette *tools, QObject *parent); + TikzScene(TikzDocument *tikzDocument, ToolPalette *tools, StylePalette *styles, QObject *parent); ~TikzScene(); Graph *graph(); QMap &nodeItems(); @@ -55,6 +56,7 @@ protected: private: TikzDocument *_tikzDocument; ToolPalette *_tools; + StylePalette *_styles; QMap _nodeItems; QMap _edgeItems; QGraphicsLineItem *_drawEdgeItem; diff --git a/src/tikzit.cpp b/src/tikzit.cpp index 78cb7a1..e91976c 100644 --- a/src/tikzit.cpp +++ b/src/tikzit.cpp @@ -26,10 +26,10 @@ void Tikzit::init(QApplication *app) _toolPalette = new ToolPalette(dummy); _propertyPalette = new PropertyPalette(dummy); - _stylePalette = new StylePalette(dummy); + //_stylePalette = new StylePalette(dummy); _styles = new TikzStyles(this); - _stylePalette->show(); + //_stylePalette->show(); _windows << new MainWindow(); _windows[0]->show(); @@ -137,7 +137,7 @@ void Tikzit::loadStyles(QString fileName) } else { qDebug() << "parse failed"; } - _stylePalette->reloadStyles(); + //_stylePalette->reloadStyles(); foreach (MainWindow *w, _windows) { w->tikzScene()->reloadStyles(); @@ -164,10 +164,10 @@ void Tikzit::focusChanged(QWidget *old, QWidget *nw) // } } -StylePalette *Tikzit::stylePalette() const -{ - return _stylePalette; -} +//StylePalette *Tikzit::stylePalette() const +//{ +// return _stylePalette; +//} TikzStyles *Tikzit::styles() const @@ -177,7 +177,7 @@ TikzStyles *Tikzit::styles() const void Tikzit::quit() { - _stylePalette->close(); + //_stylePalette->close(); QApplication::quit(); } diff --git a/src/tikzit.h b/src/tikzit.h index 39aa9e4..6a191b5 100644 --- a/src/tikzit.h +++ b/src/tikzit.h @@ -98,7 +98,7 @@ public: void loadStyles(QString fileName); TikzStyles *styles() const; QString styleFile() const; - StylePalette *stylePalette() const; + //StylePalette *stylePalette() const; public slots: void focusChanged(QWidget *old, QWidget *nw); @@ -108,7 +108,7 @@ private: MainMenu *_mainMenu; ToolPalette *_toolPalette; PropertyPalette *_propertyPalette; - StylePalette *_stylePalette; + //StylePalette *_stylePalette; QVector _windows; MainWindow *_activeWindow; TikzStyles *_styles; diff --git a/stylepalette.cpp b/stylepalette.cpp index c2ddc21..bd82e30 100644 --- a/stylepalette.cpp +++ b/stylepalette.cpp @@ -16,17 +16,19 @@ StylePalette::StylePalette(QWidget *parent) : { ui->setupUi(this); - QSettings settings("tikzit", "tikzit"); - QVariant geom = settings.value("style-palette-geometry"); - if (geom != QVariant()) { - restoreGeometry(geom.toByteArray()); - } +// QSettings settings("tikzit", "tikzit"); +// QVariant geom = settings.value("style-palette-geometry"); +// if (geom != QVariant()) { +// restoreGeometry(geom.toByteArray()); +// } _model = new QStandardItemModel(this); ui->styleListView->setModel(_model); ui->styleListView->setViewMode(QListView::IconMode); ui->styleListView->setMovement(QListView::Static); - ui->styleListView->setGridSize(QSize(70,60)); + ui->styleListView->setGridSize(QSize(70,40)); + + connect(ui->styleListView, SIGNAL(doubleClicked(const QModelIndex &)), this, SLOT( itemDoubleClicked(const QModelIndex&)) ); } StylePalette::~StylePalette() @@ -42,10 +44,16 @@ void StylePalette::reloadStyles() ui->styleFile->setText(f); QStandardItem *it; - QSize sz(60,60); + //QSize sz(60,60); + + it = new QStandardItem(noneStyle->icon(), noneStyle->name()); + it->setEditable(false); + it->setData(noneStyle->name()); + _model->appendRow(it); foreach(NodeStyle *ns, tikzit->styles()->nodeStyles()) { it = new QStandardItem(ns->icon(), ns->name()); + it->setEditable(false); it->setData(ns->name()); _model->appendRow(it); } @@ -62,6 +70,11 @@ QString StylePalette::activeNodeStyleName() } } +void StylePalette::itemDoubleClicked(const QModelIndex &index) +{ + tikzit->activeWindow()->tikzScene()->applyActiveStyleToNodes(); +} + void StylePalette::on_buttonOpenTikzstyles_clicked() { tikzit->openTikzStyles(); @@ -74,10 +87,10 @@ void StylePalette::on_buttonRefreshTikzstyles_clicked() if (!path.isEmpty()) tikzit->loadStyles(path); } -void StylePalette::on_buttonApplyNodeStyle_clicked() -{ - if (tikzit->activeWindow() != 0) tikzit->activeWindow()->tikzScene()->applyActiveStyleToNodes(); -} +//void StylePalette::on_buttonApplyNodeStyle_clicked() +//{ +// if (tikzit->activeWindow() != 0) tikzit->activeWindow()->tikzScene()->applyActiveStyleToNodes(); +//} void StylePalette::closeEvent(QCloseEvent *event) { diff --git a/stylepalette.h b/stylepalette.h index 3861008..8d2187e 100644 --- a/stylepalette.h +++ b/stylepalette.h @@ -20,9 +20,10 @@ public: public slots: + void itemDoubleClicked(const QModelIndex &index); void on_buttonOpenTikzstyles_clicked(); void on_buttonRefreshTikzstyles_clicked(); - void on_buttonApplyNodeStyle_clicked(); + //void on_buttonApplyNodeStyle_clicked(); private: Ui::StylePalette *ui; diff --git a/stylepalette.ui b/stylepalette.ui index 5e370b6..3362ce2 100644 --- a/stylepalette.ui +++ b/stylepalette.ui @@ -6,21 +6,33 @@ 0 0 - 250 - 430 + 88 + 518 + + + 0 + 0 + + - 250 - 430 + 88 + 0 + + + + + 88 + 524287 - true + false - Styles + @@ -33,31 +45,17 @@ 0 - - - Styles: - - - - - - - - 0 - 0 - - - - - Courier - 75 - true - + + + Qt::Horizontal - - [default] + + + 40 + 20 + - + @@ -86,6 +84,19 @@ + + + + + 0 + 0 + + + + [default] + + + @@ -96,69 +107,9 @@ - - - - 2 - - - - - - 0 - 0 - - - - Apply - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - 2 - - - - - Apply - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - -- cgit v1.2.3 From 9e2116497660509afd417cc3b952ea80bbb72ce5 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Thu, 5 Apr 2018 15:07:57 +0200 Subject: can now edit node labels --- src/data/edge.cpp | 2 ++ src/gui/tikzscene.cpp | 15 +++++++++++++++ src/gui/tikzview.cpp | 2 +- src/gui/undocommands.cpp | 23 +++++++++++++++++++++++ src/gui/undocommands.h | 16 ++++++++++++++++ 5 files changed, 57 insertions(+), 1 deletion(-) diff --git a/src/data/edge.cpp b/src/data/edge.cpp index bcf127f..5c49aba 100644 --- a/src/data/edge.cpp +++ b/src/data/edge.cpp @@ -248,6 +248,8 @@ void Edge::updateData() if (_source == _target) _data->setAtom("loop"); if (!isSelfLoop() && !isStraight() && _weight != 0.4f) _data->setProperty("looseness", QString::number(_weight*2.5f, 'f', 2)); + if (_source->style()->isNone()) _sourceAnchor = "center"; + if (_target->style()->isNone()) _targetAnchor = "center"; } diff --git a/src/gui/tikzscene.cpp b/src/gui/tikzscene.cpp index 8378f5e..ffc111c 100644 --- a/src/gui/tikzscene.cpp +++ b/src/gui/tikzscene.cpp @@ -8,6 +8,7 @@ #include #include #include +#include #include @@ -444,6 +445,20 @@ void TikzScene::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) _tikzDocument->undoStack()->push(cmd); break; } + + if (NodeItem *ni = dynamic_cast(gi)) { + bool ok; + QString newLabel = QInputDialog::getText(views()[0], tr("Node label"), + tr("Label:"), QLineEdit::Normal, + ni->node()->label(), &ok); + if (ok && !newLabel.isEmpty()) { + QMap oldLabels; + oldLabels.insert(ni->node(), ni->node()->label()); + ChangeLabelCommand *cmd = new ChangeLabelCommand(this, graph(), oldLabels, newLabel); + _tikzDocument->undoStack()->push(cmd); + } + break; + } } } diff --git a/src/gui/tikzview.cpp b/src/gui/tikzview.cpp index 60dc2bc..60db665 100644 --- a/src/gui/tikzview.cpp +++ b/src/gui/tikzview.cpp @@ -6,7 +6,7 @@ TikzView::TikzView(QWidget *parent) : QGraphicsView(parent) { - setRenderHint(QPainter::Antialiasing); + //setRenderHint(QPainter::Antialiasing); //setDragMode(QGraphicsView::RubberBandDrag); _scale = 1.0f; diff --git a/src/gui/undocommands.cpp b/src/gui/undocommands.cpp index f64b1db..32fafbe 100644 --- a/src/gui/undocommands.cpp +++ b/src/gui/undocommands.cpp @@ -328,3 +328,26 @@ void PasteCommand::redo() GraphUpdateCommand::redo(); } + +ChangeLabelCommand::ChangeLabelCommand(TikzScene *scene, Graph *graph, QMap oldLabels, QString newLabel, QUndoCommand *parent) : + GraphUpdateCommand(scene, parent), _oldLabels(oldLabels), _newLabel(newLabel) +{ +} + +void ChangeLabelCommand::undo() +{ + foreach (Node *n, _oldLabels.keys()) { + n->setLabel(_oldLabels[n]); + } + + GraphUpdateCommand::undo(); +} + +void ChangeLabelCommand::redo() +{ + foreach (Node *n, _oldLabels.keys()) { + n->setLabel(_newLabel); + } + + GraphUpdateCommand::redo(); +} diff --git a/src/gui/undocommands.h b/src/gui/undocommands.h index 354e455..e716458 100644 --- a/src/gui/undocommands.h +++ b/src/gui/undocommands.h @@ -130,4 +130,20 @@ private: QList _oldSelection; }; +class ChangeLabelCommand : public GraphUpdateCommand +{ +public: + explicit ChangeLabelCommand(TikzScene *scene, + Graph *graph, + QMap oldLabels, + QString newLabel, + QUndoCommand *parent = 0); + void undo() override; + void redo() override; +private: + Graph *_graph; + QMap _oldLabels; + QString _newLabel; +}; + #endif // UNDOCOMMANDS_H -- cgit v1.2.3 From e840508c39b8e85328875477bfdbe0417c4e0eb0 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Fri, 6 Apr 2018 08:36:18 +0200 Subject: parse tikz feature --- src/data/tikzdocument.cpp | 6 ++++++ src/data/tikzdocument.h | 2 ++ src/gui/mainmenu.cpp | 14 +++++++++++++- src/gui/mainmenu.h | 1 + src/gui/mainmenu.ui | 8 +++++++- src/gui/mainwindow.cpp | 17 +++++++++++++++++ src/gui/mainwindow.h | 3 +++ src/gui/tikzscene.cpp | 33 +++++++++++++++++++++++++++++++++ src/gui/tikzscene.h | 5 +++++ src/gui/tikzview.cpp | 4 ++++ src/gui/tikzview.h | 1 + src/gui/undocommands.cpp | 17 +++++++++++++++++ src/gui/undocommands.h | 14 ++++++++++++++ stylepalette.cpp | 2 ++ 14 files changed, 125 insertions(+), 2 deletions(-) diff --git a/src/data/tikzdocument.cpp b/src/data/tikzdocument.cpp index 4a813ad..bf39f67 100644 --- a/src/data/tikzdocument.cpp +++ b/src/data/tikzdocument.cpp @@ -96,6 +96,12 @@ void TikzDocument::save() { } } +void TikzDocument::setGraph(Graph *graph) +{ + _graph = graph; + refreshTikz(); +} + void TikzDocument::saveAs() { QSettings settings("tikzit", "tikzit"); QString fileName = QFileDialog::getSaveFileName(tikzit->activeWindow(), diff --git a/src/data/tikzdocument.h b/src/data/tikzdocument.h index edb1beb..9b6893a 100644 --- a/src/data/tikzdocument.h +++ b/src/data/tikzdocument.h @@ -19,6 +19,7 @@ public: ~TikzDocument(); Graph *graph() const; + void setGraph(Graph *graph); QString tikz() const; QUndoStack *undoStack() const; bool parseSuccess() const; @@ -30,6 +31,7 @@ public: void saveAs(); void save(); + private: Graph *_graph; QString _tikz; diff --git a/src/gui/mainmenu.cpp b/src/gui/mainmenu.cpp index 0166caf..7ebb6af 100644 --- a/src/gui/mainmenu.cpp +++ b/src/gui/mainmenu.cpp @@ -94,7 +94,19 @@ void MainMenu::on_actionDeselect_All_triggered() // Tikz void MainMenu::on_actionParse_triggered() { - // TODO + MainWindow *win = tikzit->activeWindow(); + if (win != 0) { + win->tikzScene()->parseTikz(win->tikzSource()); + } +} + +void MainMenu::on_actionRevert_triggered() +{ + MainWindow *win = tikzit->activeWindow(); + if (win != 0) { + win->tikzDocument()->refreshTikz(); + win->tikzScene()->setEnabled(true); + } } diff --git a/src/gui/mainmenu.h b/src/gui/mainmenu.h index ee167e6..103a74a 100644 --- a/src/gui/mainmenu.h +++ b/src/gui/mainmenu.h @@ -35,6 +35,7 @@ public slots: // Tikz void on_actionParse_triggered(); + void on_actionRevert_triggered(); // View void on_actionZoom_In_triggered(); diff --git a/src/gui/mainmenu.ui b/src/gui/mainmenu.ui index 2f15d5a..ccd6c38 100644 --- a/src/gui/mainmenu.ui +++ b/src/gui/mainmenu.ui @@ -43,6 +43,7 @@ Tikz + @@ -157,7 +158,7 @@ - Parse + Parse Tikz Ctrl+T @@ -184,6 +185,11 @@ Exit + + + Revert Tikz + + diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 9ce340a..9436eb3 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -12,6 +12,7 @@ #include #include #include +#include int MainWindow::_numWindows = 0; @@ -32,8 +33,11 @@ MainWindow::MainWindow(QWidget *parent) : addDockWidget(Qt::RightDockWidgetArea, _stylePalette); + _tikzScene = new TikzScene(_tikzDocument, _toolPalette, _stylePalette, this); ui->tikzView->setScene(_tikzScene); + + _pristine = true; @@ -93,6 +97,11 @@ StylePalette *MainWindow::stylePalette() const return _stylePalette; } +QString MainWindow::tikzSource() +{ + return ui->tikzSource->toPlainText(); +} + void MainWindow::updateFileName() { setWindowTitle("TiKZiT - " + _tikzDocument->shortName()); @@ -100,7 +109,10 @@ void MainWindow::updateFileName() void MainWindow::refreshTikz() { + // don't emit textChanged() when we update the tikz + ui->tikzSource->blockSignals(true); ui->tikzSource->setText(_tikzDocument->tikz()); + ui->tikzSource->blockSignals(false); } ToolPalette *MainWindow::toolPalette() const @@ -133,4 +145,9 @@ bool MainWindow::pristine() const return _pristine; } +void MainWindow::on_tikzSource_textChanged() +{ + if (_tikzScene->enabled()) _tikzScene->setEnabled(false); +} + diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h index facce2b..dc69fbc 100644 --- a/src/gui/mainwindow.h +++ b/src/gui/mainwindow.h @@ -36,10 +36,13 @@ public: TikzDocument *tikzDocument() const; ToolPalette *toolPalette() const; StylePalette *stylePalette() const; + QString tikzSource(); void updateFileName(); void refreshTikz(); +public slots: + void on_tikzSource_textChanged(); protected: void closeEvent(QCloseEvent *event); void changeEvent(QEvent *event); diff --git a/src/gui/tikzscene.cpp b/src/gui/tikzscene.cpp index ffc111c..a650961 100644 --- a/src/gui/tikzscene.cpp +++ b/src/gui/tikzscene.cpp @@ -80,6 +80,8 @@ void TikzScene::graphReplaced() void TikzScene::mousePressEvent(QGraphicsSceneMouseEvent *event) { + if (!_enabled) return; + // current mouse position, in scene coordinates _mouseDownPos = event->scenePos(); @@ -181,6 +183,8 @@ void TikzScene::mousePressEvent(QGraphicsSceneMouseEvent *event) void TikzScene::mouseMoveEvent(QGraphicsSceneMouseEvent *event) { + if (!_enabled) return; + // current mouse position, in scene coordinates QPointF mousePos = event->scenePos(); //QRectF rb = views()[0]->rubberBandRect(); @@ -323,6 +327,8 @@ void TikzScene::mouseMoveEvent(QGraphicsSceneMouseEvent *event) void TikzScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { + if (!_enabled) return; + // current mouse position, in scene coordinates QPointF mousePos = event->scenePos(); @@ -415,6 +421,8 @@ void TikzScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) void TikzScene::keyReleaseEvent(QKeyEvent *event) { + if (!_enabled) return; + if (event->key() == Qt::Key_Backspace || event->key() == Qt::Key_Delete) { deleteSelectedItems(); } else if (event->modifiers() == Qt::NoModifier) { @@ -438,6 +446,8 @@ void TikzScene::keyReleaseEvent(QKeyEvent *event) void TikzScene::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) { + if (!_enabled) return; + QPointF mousePos = event->scenePos(); foreach (QGraphicsItem *gi, items(mousePos)) { if (EdgeItem *ei = dynamic_cast(gi)) { @@ -462,6 +472,18 @@ void TikzScene::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) } } +bool TikzScene::enabled() const +{ + return _enabled; +} + +void TikzScene::setEnabled(bool enabled) +{ + _enabled = enabled; + update(); +} + + void TikzScene::applyActiveStyleToNodes() { ApplyStyleToNodesCommand *cmd = new ApplyStyleToNodesCommand(this, _styles->activeNodeStyleName()); _tikzDocument->undoStack()->push(cmd); @@ -547,6 +569,17 @@ void TikzScene::deselectAll() selectedItems().clear(); } +void TikzScene::parseTikz(QString tikz) +{ + Graph *newGraph = new Graph(this); + TikzAssembler ass(newGraph); + if (ass.parse(tikz)) { + ReplaceGraphCommand *cmd = new ReplaceGraphCommand(this, graph(), newGraph); + tikzDocument()->undoStack()->push(cmd); + setEnabled(true); + } +} + void TikzScene::getSelection(QSet &selNodes, QSet &selEdges) { foreach (QGraphicsItem *gi, selectedItems()) { diff --git a/src/gui/tikzscene.h b/src/gui/tikzscene.h index 7061143..3cc2e87 100644 --- a/src/gui/tikzscene.h +++ b/src/gui/tikzscene.h @@ -44,6 +44,10 @@ public: void pasteFromClipboard(); void selectAllNodes(); void deselectAll(); + void parseTikz(QString tikz); + bool enabled() const; + void setEnabled(bool enabled); + public slots: void graphReplaced(); @@ -73,6 +77,7 @@ private: int _oldBend; int _oldInAngle; int _oldOutAngle; + bool _enabled; void getSelection(QSet &selNodes, QSet &selEdges); QSet getSelectedNodes(); diff --git a/src/gui/tikzview.cpp b/src/gui/tikzview.cpp index 60db665..047ef50 100644 --- a/src/gui/tikzview.cpp +++ b/src/gui/tikzview.cpp @@ -32,6 +32,10 @@ void TikzView::setScene(QGraphicsScene *scene) void TikzView::drawBackground(QPainter *painter, const QRectF &rect) { + // draw a gray background if disabled + TikzScene *sc = static_cast(scene()); + if (!sc->enabled()) painter->fillRect(rect, QBrush(QColor(240,240,240))); + // draw the grid QPen pen1; diff --git a/src/gui/tikzview.h b/src/gui/tikzview.h index cb41fd4..b2006c8 100644 --- a/src/gui/tikzview.h +++ b/src/gui/tikzview.h @@ -20,6 +20,7 @@ class TikzView : public QGraphicsView Q_OBJECT public: explicit TikzView(QWidget *parent = 0); + public slots: void zoomIn(); void zoomOut(); diff --git a/src/gui/undocommands.cpp b/src/gui/undocommands.cpp index 32fafbe..4c5d0dc 100644 --- a/src/gui/undocommands.cpp +++ b/src/gui/undocommands.cpp @@ -351,3 +351,20 @@ void ChangeLabelCommand::redo() GraphUpdateCommand::redo(); } + +ReplaceGraphCommand::ReplaceGraphCommand(TikzScene *scene, Graph *oldGraph, Graph *newGraph, QUndoCommand *parent) : + GraphUpdateCommand(scene, parent), _oldGraph(oldGraph), _newGraph(newGraph) +{ +} + +void ReplaceGraphCommand::undo() +{ + _scene->tikzDocument()->setGraph(_oldGraph); + _scene->graphReplaced(); +} + +void ReplaceGraphCommand::redo() +{ + _scene->tikzDocument()->setGraph(_newGraph); + _scene->graphReplaced(); +} diff --git a/src/gui/undocommands.h b/src/gui/undocommands.h index e716458..a0abb26 100644 --- a/src/gui/undocommands.h +++ b/src/gui/undocommands.h @@ -146,4 +146,18 @@ private: QString _newLabel; }; +class ReplaceGraphCommand : public GraphUpdateCommand +{ +public: + explicit ReplaceGraphCommand(TikzScene *scene, + Graph *oldGraph, + Graph *newGraph, + QUndoCommand *parent = 0); + void undo() override; + void redo() override; +private: + Graph *_oldGraph; + Graph *_newGraph; +}; + #endif // UNDOCOMMANDS_H diff --git a/stylepalette.cpp b/stylepalette.cpp index bd82e30..1416cc3 100644 --- a/stylepalette.cpp +++ b/stylepalette.cpp @@ -28,6 +28,8 @@ StylePalette::StylePalette(QWidget *parent) : ui->styleListView->setMovement(QListView::Static); ui->styleListView->setGridSize(QSize(70,40)); + reloadStyles(); + connect(ui->styleListView, SIGNAL(doubleClicked(const QModelIndex &)), this, SLOT( itemDoubleClicked(const QModelIndex&)) ); } -- cgit v1.2.3 From ba8e3d516afefbb4a43227525ddb6525547a650e Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Mon, 9 Apr 2018 11:40:54 +0200 Subject: added support for tikz editing/parsing --- src/data/edge.cpp | 10 ++ src/data/edge.h | 5 + src/data/graph.cpp | 1 + src/data/tikzdocument.cpp | 42 ++++++- src/data/tikzdocument.h | 3 + src/data/tikzlexer.l | 2 +- src/data/tikzparserdefs.h | 2 +- src/gui/edgeitem.cpp | 13 +- src/gui/mainmenu.cpp | 11 ++ src/gui/mainmenu.h | 1 + src/gui/mainmenu.ui | 9 ++ src/gui/mainwindow.cpp | 37 +++--- src/gui/mainwindow.h | 8 +- src/gui/tikzscene.cpp | 34 +++-- src/gui/tikzscene.h | 1 + src/tikzit.cpp | 5 +- tikzlexer.h | 308 ++++++++++++++++++++++++++++++++++++---------- 17 files changed, 392 insertions(+), 100 deletions(-) diff --git a/src/data/edge.cpp b/src/data/edge.cpp index 5c49aba..d0f0deb 100644 --- a/src/data/edge.cpp +++ b/src/data/edge.cpp @@ -329,6 +329,16 @@ void Edge::setWeight(float weight) _weight = weight; } +int Edge::tikzLine() const +{ + return _tikzLine; +} + +void Edge::setTikzLine(int tikzLine) +{ + _tikzLine = tikzLine; +} + QPointF Edge::mid() const { return _mid; diff --git a/src/data/edge.h b/src/data/edge.h index f010acd..7df899f 100644 --- a/src/data/edge.h +++ b/src/data/edge.h @@ -57,6 +57,9 @@ public: void setOutAngle(int outAngle); void setWeight(float weight); + int tikzLine() const; + void setTikzLine(int tikzLine); + signals: public slots: @@ -86,6 +89,8 @@ private: QPointF _cp1; QPointF _cp2; QPointF _mid; + + int _tikzLine; }; #endif // EDGE_H diff --git a/src/data/graph.cpp b/src/data/graph.cpp index 33af93d..dec992f 100644 --- a/src/data/graph.cpp +++ b/src/data/graph.cpp @@ -179,6 +179,7 @@ QString Graph::tikz() Edge *e; foreach (e, _edges) { + e->setTikzLine(line); e->updateData(); code << "\t\t\\draw "; diff --git a/src/data/tikzdocument.cpp b/src/data/tikzdocument.cpp index bf39f67..206ec5b 100644 --- a/src/data/tikzdocument.cpp +++ b/src/data/tikzdocument.cpp @@ -17,6 +17,7 @@ TikzDocument::TikzDocument(QObject *parent) : QObject(parent) _fileName = ""; _shortName = ""; _undoStack = new QUndoStack(); + _undoStack->setClean(); } TikzDocument::~TikzDocument() @@ -68,6 +69,8 @@ void TikzDocument::open(QString fileName) foreach (Node *n, _graph->nodes()) n->attachStyle(); foreach (Edge *e, _graph->edges()) e->updateControls(); _parseSuccess = true; + refreshTikz(); + setClean(); } else { delete newGraph; _parseSuccess = false; @@ -78,6 +81,18 @@ void TikzDocument::save() { if (_fileName == "") { saveAs(); } else { + MainWindow *win = tikzit->activeWindow(); + if (win != 0 && !win->tikzScene()->enabled()) { + win->tikzScene()->parseTikz(win->tikzSource()); + if (!win->tikzScene()->enabled()) { + auto resp = QMessageBox::question(0, + tr("Tikz failed to parse"), + tr("Cannot save file with invalid TiKZ source. Revert changes and save?")); + if (resp == QMessageBox::Yes) win->tikzScene()->setEnabled(true); + else return; // ABORT the save + } + } + refreshTikz(); QFile file(_fileName); QFileInfo fi(file); @@ -89,13 +104,23 @@ void TikzDocument::save() { QTextStream stream(&file); stream << _tikz; file.close(); - tikzit->activeWindow()->updateFileName(); + setClean(); } else { QMessageBox::warning(0, "Save Failed", "Could not open file: '" + _fileName + "' for writing."); } } } +bool TikzDocument::isClean() const +{ + return _undoStack->isClean(); +} + +void TikzDocument::setClean() +{ + _undoStack->setClean(); +} + void TikzDocument::setGraph(Graph *graph) { _graph = graph; @@ -103,6 +128,18 @@ void TikzDocument::setGraph(Graph *graph) } void TikzDocument::saveAs() { + MainWindow *win = tikzit->activeWindow(); + if (win != 0 && !win->tikzScene()->enabled()) { + win->tikzScene()->parseTikz(win->tikzSource()); + if (!win->tikzScene()->enabled()) { + auto resp = QMessageBox::question(0, + tr("Tikz failed to parse"), + tr("Cannot save file with invalid TiKZ source. Revert changes and save?")); + if (resp == QMessageBox::Yes) win->tikzScene()->setEnabled(true); + else return; // ABORT the save + } + } + QSettings settings("tikzit", "tikzit"); QString fileName = QFileDialog::getSaveFileName(tikzit->activeWindow(), tr("Save File As"), @@ -112,6 +149,9 @@ void TikzDocument::saveAs() { if (!fileName.isEmpty()) { _fileName = fileName; save(); + + // clean state might not change, so update title bar manually + tikzit->activeWindow()->updateFileName(); } } diff --git a/src/data/tikzdocument.h b/src/data/tikzdocument.h index 9b6893a..8f16a53 100644 --- a/src/data/tikzdocument.h +++ b/src/data/tikzdocument.h @@ -32,6 +32,9 @@ public: void saveAs(); void save(); + bool isClean() const; + void setClean(); + private: Graph *_graph; QString _tikz; diff --git a/src/data/tikzlexer.l b/src/data/tikzlexer.l index 0a7ff39..d90ad4b 100644 --- a/src/data/tikzlexer.l +++ b/src/data/tikzlexer.l @@ -97,7 +97,7 @@ to { return TO; } } \) { BEGIN(INITIAL); - return COORD; + return TCOORD; } /* when we see "[", change parsing mode */ diff --git a/src/data/tikzparserdefs.h b/src/data/tikzparserdefs.h index 1625136..5865739 100644 --- a/src/data/tikzparserdefs.h +++ b/src/data/tikzparserdefs.h @@ -17,6 +17,6 @@ struct noderef { char *anchor; }; -inline int isatty(void*) { return 0; } +inline int isatty(int) { return 0; } #endif // TIKZPARSERDEFS_H diff --git a/src/gui/edgeitem.cpp b/src/gui/edgeitem.cpp index 04ee7b6..f174186 100644 --- a/src/gui/edgeitem.cpp +++ b/src/gui/edgeitem.cpp @@ -34,9 +34,16 @@ void EdgeItem::readPos() QPainterPath path; path.moveTo (toScreen(_edge->tail())); - path.cubicTo(toScreen(_edge->cp1()), - toScreen(_edge->cp2()), - toScreen(_edge->head())); + + if (_edge->bend() != 0 || !_edge->basicBendMode()) { + path.cubicTo(toScreen(_edge->cp1()), + toScreen(_edge->cp2()), + toScreen(_edge->head())); + } + else { + path.lineTo(toScreen(_edge->head())); + } + setPath(path); _cp1Item->setPos(toScreen(_edge->cp1())); diff --git a/src/gui/mainmenu.cpp b/src/gui/mainmenu.cpp index 7ebb6af..7e2584c 100644 --- a/src/gui/mainmenu.cpp +++ b/src/gui/mainmenu.cpp @@ -1,6 +1,8 @@ #include "mainmenu.h" #include "tikzit.h" +#include + MainMenu::MainMenu() { ui.setupUi(this); @@ -109,6 +111,15 @@ void MainMenu::on_actionRevert_triggered() } } +void MainMenu::on_actionJump_to_Selection_triggered() +{ + MainWindow *win = tikzit->activeWindow(); + if (win != 0) { + qDebug() << "jump to selection on line:" << win->tikzScene()->lineNumberForSelection(); + win->setSourceLine(win->tikzScene()->lineNumberForSelection()); + } +} + // View void MainMenu::on_actionZoom_In_triggered() diff --git a/src/gui/mainmenu.h b/src/gui/mainmenu.h index 103a74a..bceb69d 100644 --- a/src/gui/mainmenu.h +++ b/src/gui/mainmenu.h @@ -36,6 +36,7 @@ public slots: // Tikz void on_actionParse_triggered(); void on_actionRevert_triggered(); + void on_actionJump_to_Selection_triggered(); // View void on_actionZoom_In_triggered(); diff --git a/src/gui/mainmenu.ui b/src/gui/mainmenu.ui index ccd6c38..6a2511e 100644 --- a/src/gui/mainmenu.ui +++ b/src/gui/mainmenu.ui @@ -44,6 +44,7 @@ + @@ -190,6 +191,14 @@ Revert Tikz + + + Jump to Selection + + + Ctrl+J + + diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 9436eb3..15b6943 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -13,6 +13,7 @@ #include #include #include +#include int MainWindow::_numWindows = 0; @@ -32,15 +33,9 @@ MainWindow::MainWindow(QWidget *parent) : _stylePalette = new StylePalette(this); addDockWidget(Qt::RightDockWidgetArea, _stylePalette); - - _tikzScene = new TikzScene(_tikzDocument, _toolPalette, _stylePalette, this); ui->tikzView->setScene(_tikzScene); - - _pristine = true; - - // TODO: check if each window should have a menu _menu = new MainMenu(); _menu->setParent(this); @@ -52,6 +47,10 @@ MainWindow::MainWindow(QWidget *parent) : sz[0] = sz[0] + sz[1]; sz[1] = 0; ui->splitter->setSizes(sz); + + _tikzDocument->refreshTikz(); + + connect(_tikzDocument->undoStack(), SIGNAL(cleanChanged(bool)), this, SLOT(updateFileName())); } MainWindow::~MainWindow() @@ -62,15 +61,16 @@ MainWindow::~MainWindow() void MainWindow::open(QString fileName) { - _pristine = false; _tikzDocument->open(fileName); - ui->tikzSource->setText(_tikzDocument->tikz()); + + //ui->tikzSource->setText(_tikzDocument->tikz()); if (_tikzDocument->parseSuccess()) { statusBar()->showMessage("TiKZ parsed successfully", 2000); - setWindowTitle("TiKZiT - " + _tikzDocument->shortName()); + //setWindowTitle("TiKZiT - " + _tikzDocument->shortName()); _tikzScene->setTikzDocument(_tikzDocument); + updateFileName(); } else { statusBar()->showMessage("Cannot read TiKZ source"); } @@ -102,9 +102,21 @@ QString MainWindow::tikzSource() return ui->tikzSource->toPlainText(); } +void MainWindow::setSourceLine(int line) +{ + QTextCursor cursor(ui->tikzSource->document()->findBlockByLineNumber(line)); + cursor.movePosition(QTextCursor::EndOfLine); + //ui->tikzSource->moveCursor(QTextCursor::End); + ui->tikzSource->setTextCursor(cursor); + ui->tikzSource->setFocus(); +} + void MainWindow::updateFileName() { - setWindowTitle("TiKZiT - " + _tikzDocument->shortName()); + QString nm = _tikzDocument->shortName(); + if (nm.isEmpty()) nm = "untitled"; + if (!_tikzDocument->isClean()) nm += "*"; + setWindowTitle("TiKZiT - " + nm); } void MainWindow::refreshTikz() @@ -140,11 +152,6 @@ TikzView *MainWindow::tikzView() const return ui->tikzView; } -bool MainWindow::pristine() const -{ - return _pristine; -} - void MainWindow::on_tikzSource_textChanged() { if (_tikzScene->enabled()) _tikzScene->setEnabled(false); diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h index dc69fbc..1e05239 100644 --- a/src/gui/mainwindow.h +++ b/src/gui/mainwindow.h @@ -29,7 +29,6 @@ public: ~MainWindow(); void open(QString fileName); - bool pristine() const; int windowId() const; TikzView *tikzView() const; TikzScene *tikzScene() const; @@ -37,12 +36,12 @@ public: ToolPalette *toolPalette() const; StylePalette *stylePalette() const; QString tikzSource(); - - void updateFileName(); - void refreshTikz(); + void setSourceLine(int line); public slots: void on_tikzSource_textChanged(); + void updateFileName(); + void refreshTikz(); protected: void closeEvent(QCloseEvent *event); void changeEvent(QEvent *event); @@ -54,7 +53,6 @@ private: ToolPalette *_toolPalette; StylePalette *_stylePalette; Ui::MainWindow *ui; - bool _pristine; int _windowId; static int _numWindows; }; diff --git a/src/gui/tikzscene.cpp b/src/gui/tikzscene.cpp index a650961..b26c4ba 100644 --- a/src/gui/tikzscene.cpp +++ b/src/gui/tikzscene.cpp @@ -20,6 +20,7 @@ TikzScene::TikzScene(TikzDocument *tikzDocument, ToolPalette *tools, _edgeStartNodeItem = 0; _drawEdgeItem = new QGraphicsLineItem(); _rubberBandItem = new QGraphicsRectItem(); + _enabled = true; //setSceneRect(-310,-230,620,450); setSceneRect(-1000,-1000,2000,2000); @@ -72,6 +73,7 @@ void TikzScene::graphReplaced() } foreach (Node *n, graph()->nodes()) { + n->attachStyle(); NodeItem *ni = new NodeItem(n); _nodeItems.insert(n, ni); addItem(ni); @@ -366,19 +368,25 @@ void TikzScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) _rubberBandItem->setVisible(false); if (!_oldNodePositions.empty()) { - QMap newNodePositions; + QPointF shift = mousePos - _mouseDownPos; + shift = QPointF(round(shift.x()/GRID_SEP)*GRID_SEP, round(shift.y()/GRID_SEP)*GRID_SEP); - foreach (QGraphicsItem *gi, selectedItems()) { - if (NodeItem *ni = dynamic_cast(gi)) { - ni->writePos(); - newNodePositions.insert(ni->node(), ni->node()->point()); + if (shift.x() != 0 || shift.y() != 0) { + QMap newNodePositions; + + foreach (QGraphicsItem *gi, selectedItems()) { + if (NodeItem *ni = dynamic_cast(gi)) { + ni->writePos(); + newNodePositions.insert(ni->node(), ni->node()->point()); + } } - } - //qDebug() << _oldNodePositions; - //qDebug() << newNodePositions; + //qDebug() << _oldNodePositions; + //qDebug() << newNodePositions; + + _tikzDocument->undoStack()->push(new MoveCommand(this, _oldNodePositions, newNodePositions)); + } - _tikzDocument->undoStack()->push(new MoveCommand(this, _oldNodePositions, newNodePositions)); _oldNodePositions.clear(); } } @@ -483,6 +491,14 @@ void TikzScene::setEnabled(bool enabled) update(); } +int TikzScene::lineNumberForSelection() +{ + foreach (QGraphicsItem *gi, selectedItems()) { + if (NodeItem *ni = dynamic_cast(gi)) return ni->node()->tikzLine(); + if (EdgeItem *ei = dynamic_cast(gi)) return ei->edge()->tikzLine(); + } +} + void TikzScene::applyActiveStyleToNodes() { ApplyStyleToNodesCommand *cmd = new ApplyStyleToNodesCommand(this, _styles->activeNodeStyleName()); diff --git a/src/gui/tikzscene.h b/src/gui/tikzscene.h index 3cc2e87..3b4a1e1 100644 --- a/src/gui/tikzscene.h +++ b/src/gui/tikzscene.h @@ -47,6 +47,7 @@ public: void parseTikz(QString tikz); bool enabled() const; void setEnabled(bool enabled); + int lineNumberForSelection(); public slots: void graphReplaced(); diff --git a/src/tikzit.cpp b/src/tikzit.cpp index e91976c..a55473e 100644 --- a/src/tikzit.cpp +++ b/src/tikzit.cpp @@ -92,7 +92,10 @@ void Tikzit::open() tr("TiKZ Files (*.tikz)")); if (!fileName.isEmpty()) { - if (_windows.size() == 1 && _windows[0]->pristine()) { + if (_windows.size() == 1 && + _windows[0]->tikzDocument()->isClean() && + _windows[0]->tikzDocument()->shortName().isEmpty()) + { _windows[0]->open(fileName); _windows[0]->show(); } else { diff --git a/tikzlexer.h b/tikzlexer.h index 73df7b6..0275165 100644 --- a/tikzlexer.h +++ b/tikzlexer.h @@ -2,9 +2,9 @@ #define yyHEADER_H 1 #define yyIN_HEADER 1 -#line 6 "tikzlexer.h" +#line 5 "tikzlexer.h" -#line 8 "tikzlexer.h" +#line 7 "tikzlexer.h" #define YY_INT_ALIGNED short int @@ -12,12 +12,36 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 35 +#define YY_FLEX_MINOR_VERSION 6 +#define YY_FLEX_SUBMINOR_VERSION 4 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif +#ifdef yyget_lval +#define yyget_lval_ALREADY_DEFINED +#else +#define yyget_lval yyget_lval +#endif + +#ifdef yyset_lval +#define yyset_lval_ALREADY_DEFINED +#else +#define yyset_lval yyset_lval +#endif + +#ifdef yyget_lloc +#define yyget_lloc_ALREADY_DEFINED +#else +#define yyget_lloc yyget_lloc +#endif + +#ifdef yyset_lloc +#define yyset_lloc_ALREADY_DEFINED +#else +#define yyset_lloc yyset_lloc +#endif + /* First, we deal with platform-specific or compiler-specific issues. */ /* begin standard C headers. */ @@ -51,7 +75,6 @@ typedef int16_t flex_int16_t; typedef uint16_t flex_uint16_t; typedef int32_t flex_int32_t; typedef uint32_t flex_uint32_t; -typedef uint64_t flex_uint64_t; #else typedef signed char flex_int8_t; typedef short int flex_int16_t; @@ -59,7 +82,6 @@ typedef int flex_int32_t; typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; -#endif /* ! C99 */ /* Limits of integral types. */ #ifndef INT8_MIN @@ -90,27 +112,23 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif -#endif /* ! FLEXINT_H */ - -#ifdef __cplusplus - -/* The "const" storage-class-modifier is valid. */ -#define YY_USE_CONST - -#else /* ! __cplusplus */ +#ifndef SIZE_MAX +#define SIZE_MAX (~(size_t)0) +#endif -/* C99 requires __STDC__ to be defined as 1. */ -#if defined (__STDC__) +#endif /* ! C99 */ -#define YY_USE_CONST +#endif /* ! FLEXINT_H */ -#endif /* defined (__STDC__) */ -#endif /* ! __cplusplus */ +/* begin standard C++ headers. */ -#ifdef YY_USE_CONST +/* TODO: this is always defined, so inline it */ #define yyconst const + +#if defined(__GNUC__) && __GNUC__ >= 3 +#define yynoreturn __attribute__((__noreturn__)) #else -#define yyconst +#define yynoreturn #endif /* An opaque pointer. */ @@ -132,7 +150,15 @@ typedef void* yyscan_t; /* Size of default input buffer. */ #ifndef YY_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k. + * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. + * Ditto for the __ia64__ case accordingly. + */ +#define YY_BUF_SIZE 32768 +#else #define YY_BUF_SIZE 16384 +#endif /* __ia64__ */ #endif #ifndef YY_TYPEDEF_YY_BUFFER_STATE @@ -157,12 +183,12 @@ struct yy_buffer_state /* Size of input buffer in bytes, not including room for EOB * characters. */ - yy_size_t yy_buf_size; + int yy_buf_size; /* Number of characters read into yy_ch_buf, not including EOB * characters. */ - yy_size_t yy_n_chars; + int yy_n_chars; /* Whether we "own" the buffer - i.e., we know we created it, * and can realloc() it to grow it, and should free() it to @@ -185,7 +211,7 @@ struct yy_buffer_state int yy_bs_lineno; /**< The line count. */ int yy_bs_column; /**< The column count. */ - + /* Whether to try to fill the input buffer when we reach the * end of it. */ @@ -196,23 +222,23 @@ struct yy_buffer_state }; #endif /* !YY_STRUCT_YY_BUFFER_STATE */ -void yyrestart (FILE *input_file ,yyscan_t yyscanner ); -void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); -YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ,yyscan_t yyscanner ); -void yy_delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); -void yy_flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); -void yypush_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); -void yypop_buffer_state (yyscan_t yyscanner ); +void yyrestart ( FILE *input_file , yyscan_t yyscanner ); +void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size , yyscan_t yyscanner ); +void yy_delete_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); +void yy_flush_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); +void yypush_buffer_state ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); +void yypop_buffer_state ( yyscan_t yyscanner ); -YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner ); -YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ,yyscan_t yyscanner ); -YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len ,yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_string ( const char *yy_str , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len , yyscan_t yyscanner ); -void *yyalloc (yy_size_t ,yyscan_t yyscanner ); -void *yyrealloc (void *,yy_size_t ,yyscan_t yyscanner ); -void yyfree (void * ,yyscan_t yyscanner ); +void *yyalloc ( yy_size_t , yyscan_t yyscanner ); +void *yyrealloc ( void *, yy_size_t , yyscan_t yyscanner ); +void yyfree ( void * , yyscan_t yyscanner ); -#define yywrap(n) 1 +#define yywrap(yyscanner) (/*CONSTCOND*/1) #define YY_SKIP_YYWRAP #define yytext_ptr yytext_r @@ -233,49 +259,53 @@ void yyfree (void * ,yyscan_t yyscanner ); */ #include #endif - + #define YY_EXTRA_TYPE TikzAssembler * int yylex_init (yyscan_t* scanner); -int yylex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner); +int yylex_init_extra ( YY_EXTRA_TYPE user_defined, yyscan_t* scanner); /* Accessor methods to globals. These are made visible to non-reentrant scanners for convenience. */ -int yylex_destroy (yyscan_t yyscanner ); +int yylex_destroy ( yyscan_t yyscanner ); + +int yyget_debug ( yyscan_t yyscanner ); + +void yyset_debug ( int debug_flag , yyscan_t yyscanner ); -int yyget_debug (yyscan_t yyscanner ); +YY_EXTRA_TYPE yyget_extra ( yyscan_t yyscanner ); -void yyset_debug (int debug_flag ,yyscan_t yyscanner ); +void yyset_extra ( YY_EXTRA_TYPE user_defined , yyscan_t yyscanner ); -YY_EXTRA_TYPE yyget_extra (yyscan_t yyscanner ); +FILE *yyget_in ( yyscan_t yyscanner ); -void yyset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner ); +void yyset_in ( FILE * _in_str , yyscan_t yyscanner ); -FILE *yyget_in (yyscan_t yyscanner ); +FILE *yyget_out ( yyscan_t yyscanner ); -void yyset_in (FILE * in_str ,yyscan_t yyscanner ); +void yyset_out ( FILE * _out_str , yyscan_t yyscanner ); -FILE *yyget_out (yyscan_t yyscanner ); + int yyget_leng ( yyscan_t yyscanner ); -void yyset_out (FILE * out_str ,yyscan_t yyscanner ); +char *yyget_text ( yyscan_t yyscanner ); -yy_size_t yyget_leng (yyscan_t yyscanner ); +int yyget_lineno ( yyscan_t yyscanner ); -char *yyget_text (yyscan_t yyscanner ); +void yyset_lineno ( int _line_number , yyscan_t yyscanner ); -int yyget_lineno (yyscan_t yyscanner ); +int yyget_column ( yyscan_t yyscanner ); -void yyset_lineno (int line_number ,yyscan_t yyscanner ); +void yyset_column ( int _column_no , yyscan_t yyscanner ); -YYSTYPE * yyget_lval (yyscan_t yyscanner ); +YYSTYPE * yyget_lval ( yyscan_t yyscanner ); -void yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner ); +void yyset_lval ( YYSTYPE * yylval_param , yyscan_t yyscanner ); - YYLTYPE *yyget_lloc (yyscan_t yyscanner ); + YYLTYPE *yyget_lloc ( yyscan_t yyscanner ); - void yyset_lloc (YYLTYPE * yylloc_param ,yyscan_t yyscanner ); + void yyset_lloc ( YYLTYPE * yylloc_param , yyscan_t yyscanner ); /* Macros after this point can all be overridden by user definitions in * section 1. @@ -283,18 +313,18 @@ void yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner ); #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int yywrap (yyscan_t yyscanner ); +extern "C" int yywrap ( yyscan_t yyscanner ); #else -extern int yywrap (yyscan_t yyscanner ); +extern int yywrap ( yyscan_t yyscanner ); #endif #endif #ifndef yytext_ptr -static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner); +static void yy_flex_strncpy ( char *, const char *, int , yyscan_t yyscanner); #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner); +static int yy_flex_strlen ( const char * , yyscan_t yyscanner); #endif #ifndef YY_NO_INPUT @@ -303,7 +333,12 @@ static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner); /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k */ +#define YY_READ_BUF_SIZE 16384 +#else #define YY_READ_BUF_SIZE 8192 +#endif /* __ia64__ */ #endif /* Number of entries by which start-condition stack grows. */ @@ -318,7 +353,7 @@ static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner); #define YY_DECL_IS_OURS 1 extern int yylex \ - (YYSTYPE * yylval_param,YYLTYPE * yylloc_param ,yyscan_t yyscanner); + (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner); #define YY_DECL int yylex \ (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner) @@ -338,8 +373,153 @@ extern int yylex \ #undef YY_DECL #endif -#line 188 "src/data/tikzlexer.l" +#ifndef yy_create_buffer_ALREADY_DEFINED +#undef yy_create_buffer +#endif +#ifndef yy_delete_buffer_ALREADY_DEFINED +#undef yy_delete_buffer +#endif +#ifndef yy_scan_buffer_ALREADY_DEFINED +#undef yy_scan_buffer +#endif +#ifndef yy_scan_string_ALREADY_DEFINED +#undef yy_scan_string +#endif +#ifndef yy_scan_bytes_ALREADY_DEFINED +#undef yy_scan_bytes +#endif +#ifndef yy_init_buffer_ALREADY_DEFINED +#undef yy_init_buffer +#endif +#ifndef yy_flush_buffer_ALREADY_DEFINED +#undef yy_flush_buffer +#endif +#ifndef yy_load_buffer_state_ALREADY_DEFINED +#undef yy_load_buffer_state +#endif +#ifndef yy_switch_to_buffer_ALREADY_DEFINED +#undef yy_switch_to_buffer +#endif +#ifndef yypush_buffer_state_ALREADY_DEFINED +#undef yypush_buffer_state +#endif +#ifndef yypop_buffer_state_ALREADY_DEFINED +#undef yypop_buffer_state +#endif +#ifndef yyensure_buffer_stack_ALREADY_DEFINED +#undef yyensure_buffer_stack +#endif +#ifndef yylex_ALREADY_DEFINED +#undef yylex +#endif +#ifndef yyrestart_ALREADY_DEFINED +#undef yyrestart +#endif +#ifndef yylex_init_ALREADY_DEFINED +#undef yylex_init +#endif +#ifndef yylex_init_extra_ALREADY_DEFINED +#undef yylex_init_extra +#endif +#ifndef yylex_destroy_ALREADY_DEFINED +#undef yylex_destroy +#endif +#ifndef yyget_debug_ALREADY_DEFINED +#undef yyget_debug +#endif +#ifndef yyset_debug_ALREADY_DEFINED +#undef yyset_debug +#endif +#ifndef yyget_extra_ALREADY_DEFINED +#undef yyget_extra +#endif +#ifndef yyset_extra_ALREADY_DEFINED +#undef yyset_extra +#endif +#ifndef yyget_in_ALREADY_DEFINED +#undef yyget_in +#endif +#ifndef yyset_in_ALREADY_DEFINED +#undef yyset_in +#endif +#ifndef yyget_out_ALREADY_DEFINED +#undef yyget_out +#endif +#ifndef yyset_out_ALREADY_DEFINED +#undef yyset_out +#endif +#ifndef yyget_leng_ALREADY_DEFINED +#undef yyget_leng +#endif +#ifndef yyget_text_ALREADY_DEFINED +#undef yyget_text +#endif +#ifndef yyget_lineno_ALREADY_DEFINED +#undef yyget_lineno +#endif +#ifndef yyset_lineno_ALREADY_DEFINED +#undef yyset_lineno +#endif +#ifndef yyget_column_ALREADY_DEFINED +#undef yyget_column +#endif +#ifndef yyset_column_ALREADY_DEFINED +#undef yyset_column +#endif +#ifndef yywrap_ALREADY_DEFINED +#undef yywrap +#endif +#ifndef yyget_lval_ALREADY_DEFINED +#undef yyget_lval +#endif +#ifndef yyset_lval_ALREADY_DEFINED +#undef yyset_lval +#endif +#ifndef yyget_lloc_ALREADY_DEFINED +#undef yyget_lloc +#endif +#ifndef yyset_lloc_ALREADY_DEFINED +#undef yyset_lloc +#endif +#ifndef yyalloc_ALREADY_DEFINED +#undef yyalloc +#endif +#ifndef yyrealloc_ALREADY_DEFINED +#undef yyrealloc +#endif +#ifndef yyfree_ALREADY_DEFINED +#undef yyfree +#endif +#ifndef yytext_ALREADY_DEFINED +#undef yytext +#endif +#ifndef yyleng_ALREADY_DEFINED +#undef yyleng +#endif +#ifndef yyin_ALREADY_DEFINED +#undef yyin +#endif +#ifndef yyout_ALREADY_DEFINED +#undef yyout +#endif +#ifndef yy_flex_debug_ALREADY_DEFINED +#undef yy_flex_debug +#endif +#ifndef yylineno_ALREADY_DEFINED +#undef yylineno +#endif +#ifndef yytables_fload_ALREADY_DEFINED +#undef yytables_fload +#endif +#ifndef yytables_destroy_ALREADY_DEFINED +#undef yytables_destroy +#endif +#ifndef yyTABLES_NAME_ALREADY_DEFINED +#undef yyTABLES_NAME +#endif + +#line 191 "src\\data\\tikzlexer.l" -#line 344 "tikzlexer.h" +#line 523 "tikzlexer.h" #undef yyIN_HEADER #endif /* yyHEADER_H */ -- cgit v1.2.3 From 17bf89fb876b8ba7a35d06feec93125cd65f5f71 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Mon, 9 Apr 2018 12:02:23 +0200 Subject: updated README --- README.md | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 57a7255..09835a7 100644 --- a/README.md +++ b/README.md @@ -5,11 +5,20 @@ TikZiT is a graphical tool for rapidly creating graphs and diagrams using PGF/Ti ## Building on Windows -TODO +TiKZiT can be built in Windows using Qt Creator (part of Qt for Windows) or Visual Studio with the Qt VS Tools extension. + +To build with Qt Creator, simply click 'Open Project' and navigate to the `.pro` file in the TikZiT repo. + +To install Qt VS Tools in Visual Studio 2017, go to `Tools > Extensions and Updates`, then click "Online" in the sidebar and search for Qt. Configure your Qt install under `Qt VS Tools > Qt Options`. If you installed Qt using the Windows package above, the path to Qt is probably something like `C:\Qt\5.XXX\msvc2017_64`. Once that is done, open the `.pro` file in the TikZiT repo via `Qt VS Tools > Open Qt Project File`. ## Building on Linux -TODO +This should be buildable in Linux using a "standard" dev setup (gcc, flex, bison, make). You will also need to configure Qt (instructions for Ubuntu are here). After that, building is: + + $ qmake + $ make + + ## Building on MacOS @@ -21,12 +30,18 @@ This doesn't add Qt binaries to the PATH by default, so you may wish to add this export PATH="/usr/local/opt/qt/bin:$PATH" +Then, TikZiT is built just like a normal Qt project: + + $ qmake + $ make + + +## Building Poppler with Qt bindings + +Although TikZiT doesn't currently support PDF preview, it probably will in the near future via Poppler. Here's the instructions for building it as a developer. + Poppler should be built from source to get the Qt5 bindings. If Qt is setup correctly, the configure script included with Poppler should enable these automatically. Also, note that clang needs to have C++11 features enabled to build successfully. TikZiT has been tested on MacOS with poppler-0.50.0 (available here), built with the following commands: $ CXXFLAGS="-std=c++11" ./configure $ CXXFLAGS="-std=c++11" make -Then, TikZiT is built just like a normal Qt project: - - $ qmake - $ make -- cgit v1.2.3 From 23de2539173b2ebcd01e2420b3ed1e0d5d4bc2f5 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Mon, 9 Apr 2018 12:07:09 +0200 Subject: flex/bison instructions --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 09835a7..c42fdf7 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,9 @@ To build with Qt Creator, simply click 'Open Project' and navigate to the `.pro` To install Qt VS Tools in Visual Studio 2017, go to `Tools > Extensions and Updates`, then click "Online" in the sidebar and search for Qt. Configure your Qt install under `Qt VS Tools > Qt Options`. If you installed Qt using the Windows package above, the path to Qt is probably something like `C:\Qt\5.XXX\msvc2017_64`. Once that is done, open the `.pro` file in the TikZiT repo via `Qt VS Tools > Open Qt Project File`. +The only dependency besides Qt itself is flex/bison, which is used to build the TikZ parser. The simplest way to install this is to download WinFlexBison, then rename or copy `win_flex.exe` and `win_bison.exe` to `flex.exe` and `bison.exe` respectively, and make sure both are in your `%PATH%` so the build tools can find them. + + ## Building on Linux This should be buildable in Linux using a "standard" dev setup (gcc, flex, bison, make). You will also need to configure Qt (instructions for Ubuntu are here). After that, building is: -- cgit v1.2.3 From 4271b6364f581b37f5fe125c1992e1420b3e51d1 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Mon, 9 Apr 2018 12:12:08 +0200 Subject: links for other distros --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c42fdf7..9b8e982 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ The only dependency besides Qt itself is flex/bison, which is used to build the ## Building on Linux -This should be buildable in Linux using a "standard" dev setup (gcc, flex, bison, make). You will also need to configure Qt (instructions for Ubuntu are here). After that, building is: +This should be buildable in Linux using a "standard" dev setup (gcc, flex, bison, make). You will also need to configure Qt (see instructions for openSUSE, Ubuntu and Arch Linux). After that, building is: $ qmake $ make -- cgit v1.2.3 From 72433d3354ce4cdfad8c88f993364a76b192e3e5 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Mon, 9 Apr 2018 13:22:47 +0200 Subject: major speed boost --- src/gui/edgeitem.cpp | 40 +++++++++++++++++++++++++++------------- src/gui/edgeitem.h | 9 ++++++++- src/gui/tikzscene.cpp | 1 + 3 files changed, 36 insertions(+), 14 deletions(-) diff --git a/src/gui/edgeitem.cpp b/src/gui/edgeitem.cpp index f174186..ec87815 100644 --- a/src/gui/edgeitem.cpp +++ b/src/gui/edgeitem.cpp @@ -9,9 +9,6 @@ EdgeItem::EdgeItem(Edge *edge) _edge = edge; setFlag(QGraphicsItem::ItemIsSelectable); - QPen pen(Qt::black); - pen.setWidth(2); - setPen(pen); _cp1Item = new QGraphicsEllipseItem(this); _cp1Item->setParentItem(this); _cp1Item->setRect(GLOBAL_SCALEF * (-0.05), GLOBAL_SCALEF * (-0.05), @@ -53,7 +50,9 @@ void EdgeItem::readPos() void EdgeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) { //QGraphicsPathItem::paint(painter, option, widget); - painter->setPen(pen()); + QPen pen(Qt::black); + pen.setWidth(2); + painter->setPen(pen); painter->setBrush(Qt::NoBrush); painter->drawPath(path()); @@ -107,19 +106,12 @@ void EdgeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidge QRectF EdgeItem::boundingRect() const { - float r = GLOBAL_SCALEF * (_edge->cpDist() + 0.2); - return shape().boundingRect().adjusted(-r,-r,r,r); + return _boundingRect; } QPainterPath EdgeItem::shape() const { - // get the shape of the edge, and expand a bit to make selection easier - QPainterPath oldShape = QGraphicsPathItem::shape(); - QPainterPathStroker stroker; - stroker.setWidth(5); - stroker.setJoinStyle(Qt::MiterJoin); - QPainterPath newShape = (stroker.createStroke(oldShape) + oldShape).simplified(); - return newShape; + return _expPath; } Edge *EdgeItem::edge() const @@ -136,3 +128,25 @@ QGraphicsEllipseItem *EdgeItem::cp2Item() const { return _cp2Item; } + +QPainterPath EdgeItem::path() const +{ + return _path; +} + +void EdgeItem::setPath(const QPainterPath &path) +{ + _path = path; + + // get the shape of the edge, and expand a bit to make selection easier + QPainterPathStroker stroker; + stroker.setWidth(5); + stroker.setJoinStyle(Qt::MiterJoin); + _expPath = (stroker.createStroke(_path) + _path).simplified(); + + float r = GLOBAL_SCALEF * (_edge->cpDist() + 0.2); + _boundingRect = _path.boundingRect().adjusted(-r,-r,r,r); + + prepareGeometryChange(); + update(); +} diff --git a/src/gui/edgeitem.h b/src/gui/edgeitem.h index 3701372..5641912 100644 --- a/src/gui/edgeitem.h +++ b/src/gui/edgeitem.h @@ -14,7 +14,7 @@ #include #include -class EdgeItem : public QGraphicsPathItem +class EdgeItem : public QGraphicsItem { public: EdgeItem(Edge *edge); @@ -26,8 +26,15 @@ public: QGraphicsEllipseItem *cp1Item() const; QGraphicsEllipseItem *cp2Item() const; + + QPainterPath path() const; + void setPath(const QPainterPath &path); + private: Edge *_edge; + QPainterPath _path; + QPainterPath _expPath; + QRectF _boundingRect; QGraphicsEllipseItem *_cp1Item; QGraphicsEllipseItem *_cp2Item; }; diff --git a/src/gui/tikzscene.cpp b/src/gui/tikzscene.cpp index b26c4ba..927809e 100644 --- a/src/gui/tikzscene.cpp +++ b/src/gui/tikzscene.cpp @@ -84,6 +84,7 @@ void TikzScene::mousePressEvent(QGraphicsSceneMouseEvent *event) { if (!_enabled) return; + // current mouse position, in scene coordinates _mouseDownPos = event->scenePos(); -- cgit v1.2.3 From 075a94d502020a7056dfa8fa1a4ba500378efe31 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Mon, 9 Apr 2018 13:24:12 +0200 Subject: bigger bezier handles --- src/gui/edgeitem.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/edgeitem.cpp b/src/gui/edgeitem.cpp index ec87815..08a5ad1 100644 --- a/src/gui/edgeitem.cpp +++ b/src/gui/edgeitem.cpp @@ -11,14 +11,14 @@ EdgeItem::EdgeItem(Edge *edge) _cp1Item = new QGraphicsEllipseItem(this); _cp1Item->setParentItem(this); - _cp1Item->setRect(GLOBAL_SCALEF * (-0.05), GLOBAL_SCALEF * (-0.05), - GLOBAL_SCALEF * 0.1, GLOBAL_SCALEF * 0.1); + _cp1Item->setRect(GLOBAL_SCALEF * (-0.1), GLOBAL_SCALEF * (-0.1), + GLOBAL_SCALEF * 0.2, GLOBAL_SCALEF * 0.2); _cp1Item->setVisible(false); _cp2Item = new QGraphicsEllipseItem(this); _cp2Item->setParentItem(this); - _cp2Item->setRect(GLOBAL_SCALEF * (-0.05), GLOBAL_SCALEF * (-0.05), - GLOBAL_SCALEF * 0.1, GLOBAL_SCALEF * 0.1); + _cp2Item->setRect(GLOBAL_SCALEF * (-0.1), GLOBAL_SCALEF * (-0.1), + GLOBAL_SCALEF * 0.2, GLOBAL_SCALEF * 0.2); _cp2Item->setVisible(false); readPos(); -- cgit v1.2.3 From 271786e632a5b3ed31487b54374a418476edc65b Mon Sep 17 00:00:00 2001 From: Jon Moroney Date: Mon, 9 Apr 2018 14:44:45 +0200 Subject: Remove register keyword and add objectfiles to gitignore --- .gitignore | 1 + tikzlexer.h | 308 +++++++++++++----------------------------------------------- 2 files changed, 65 insertions(+), 244 deletions(-) diff --git a/.gitignore b/.gitignore index f7651c0..17ba8b5 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ target_wrapper.sh src/data/tikzlexer.lexer.cpp src/data/tikzparser.parser.cpp src/data/tikzparser.parser.hpp +*.o diff --git a/tikzlexer.h b/tikzlexer.h index 0275165..dea6836 100644 --- a/tikzlexer.h +++ b/tikzlexer.h @@ -2,9 +2,9 @@ #define yyHEADER_H 1 #define yyIN_HEADER 1 -#line 5 "tikzlexer.h" +#line 6 "tikzlexer.h" -#line 7 "tikzlexer.h" +#line 8 "tikzlexer.h" #define YY_INT_ALIGNED short int @@ -12,36 +12,12 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 6 -#define YY_FLEX_SUBMINOR_VERSION 4 +#define YY_FLEX_MINOR_VERSION 5 +#define YY_FLEX_SUBMINOR_VERSION 35 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif -#ifdef yyget_lval -#define yyget_lval_ALREADY_DEFINED -#else -#define yyget_lval yyget_lval -#endif - -#ifdef yyset_lval -#define yyset_lval_ALREADY_DEFINED -#else -#define yyset_lval yyset_lval -#endif - -#ifdef yyget_lloc -#define yyget_lloc_ALREADY_DEFINED -#else -#define yyget_lloc yyget_lloc -#endif - -#ifdef yyset_lloc -#define yyset_lloc_ALREADY_DEFINED -#else -#define yyset_lloc yyset_lloc -#endif - /* First, we deal with platform-specific or compiler-specific issues. */ /* begin standard C headers. */ @@ -75,6 +51,7 @@ typedef int16_t flex_int16_t; typedef uint16_t flex_uint16_t; typedef int32_t flex_int32_t; typedef uint32_t flex_uint32_t; +typedef uint64_t flex_uint64_t; #else typedef signed char flex_int8_t; typedef short int flex_int16_t; @@ -82,6 +59,7 @@ typedef int flex_int32_t; typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; +#endif /* ! C99 */ /* Limits of integral types. */ #ifndef INT8_MIN @@ -112,23 +90,27 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif -#ifndef SIZE_MAX -#define SIZE_MAX (~(size_t)0) -#endif +#endif /* ! FLEXINT_H */ -#endif /* ! C99 */ +#ifdef __cplusplus -#endif /* ! FLEXINT_H */ +/* The "const" storage-class-modifier is valid. */ +#define YY_USE_CONST -/* begin standard C++ headers. */ +#else /* ! __cplusplus */ -/* TODO: this is always defined, so inline it */ -#define yyconst const +/* C99 requires __STDC__ to be defined as 1. */ +#if defined (__STDC__) + +#define YY_USE_CONST -#if defined(__GNUC__) && __GNUC__ >= 3 -#define yynoreturn __attribute__((__noreturn__)) +#endif /* defined (__STDC__) */ +#endif /* ! __cplusplus */ + +#ifdef YY_USE_CONST +#define yyconst const #else -#define yynoreturn +#define yyconst #endif /* An opaque pointer. */ @@ -150,15 +132,7 @@ typedef void* yyscan_t; /* Size of default input buffer. */ #ifndef YY_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k. - * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. - * Ditto for the __ia64__ case accordingly. - */ -#define YY_BUF_SIZE 32768 -#else #define YY_BUF_SIZE 16384 -#endif /* __ia64__ */ #endif #ifndef YY_TYPEDEF_YY_BUFFER_STATE @@ -183,12 +157,12 @@ struct yy_buffer_state /* Size of input buffer in bytes, not including room for EOB * characters. */ - int yy_buf_size; + yy_size_t yy_buf_size; /* Number of characters read into yy_ch_buf, not including EOB * characters. */ - int yy_n_chars; + yy_size_t yy_n_chars; /* Whether we "own" the buffer - i.e., we know we created it, * and can realloc() it to grow it, and should free() it to @@ -211,7 +185,7 @@ struct yy_buffer_state int yy_bs_lineno; /**< The line count. */ int yy_bs_column; /**< The column count. */ - + /* Whether to try to fill the input buffer when we reach the * end of it. */ @@ -222,23 +196,23 @@ struct yy_buffer_state }; #endif /* !YY_STRUCT_YY_BUFFER_STATE */ -void yyrestart ( FILE *input_file , yyscan_t yyscanner ); -void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); -YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size , yyscan_t yyscanner ); -void yy_delete_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); -void yy_flush_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); -void yypush_buffer_state ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); -void yypop_buffer_state ( yyscan_t yyscanner ); +void yyrestart (FILE *input_file ,yyscan_t yyscanner ); +void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); +YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ,yyscan_t yyscanner ); +void yy_delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); +void yy_flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); +void yypush_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); +void yypop_buffer_state (yyscan_t yyscanner ); -YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size , yyscan_t yyscanner ); -YY_BUFFER_STATE yy_scan_string ( const char *yy_str , yyscan_t yyscanner ); -YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ,yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len ,yyscan_t yyscanner ); -void *yyalloc ( yy_size_t , yyscan_t yyscanner ); -void *yyrealloc ( void *, yy_size_t , yyscan_t yyscanner ); -void yyfree ( void * , yyscan_t yyscanner ); +void *yyalloc (yy_size_t ,yyscan_t yyscanner ); +void *yyrealloc (void *,yy_size_t ,yyscan_t yyscanner ); +void yyfree (void * ,yyscan_t yyscanner ); -#define yywrap(yyscanner) (/*CONSTCOND*/1) +#define yywrap(n) 1 #define YY_SKIP_YYWRAP #define yytext_ptr yytext_r @@ -259,53 +233,49 @@ void yyfree ( void * , yyscan_t yyscanner ); */ #include #endif - + #define YY_EXTRA_TYPE TikzAssembler * int yylex_init (yyscan_t* scanner); -int yylex_init_extra ( YY_EXTRA_TYPE user_defined, yyscan_t* scanner); +int yylex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner); /* Accessor methods to globals. These are made visible to non-reentrant scanners for convenience. */ -int yylex_destroy ( yyscan_t yyscanner ); - -int yyget_debug ( yyscan_t yyscanner ); - -void yyset_debug ( int debug_flag , yyscan_t yyscanner ); +int yylex_destroy (yyscan_t yyscanner ); -YY_EXTRA_TYPE yyget_extra ( yyscan_t yyscanner ); +int yyget_debug (yyscan_t yyscanner ); -void yyset_extra ( YY_EXTRA_TYPE user_defined , yyscan_t yyscanner ); +void yyset_debug (int debug_flag ,yyscan_t yyscanner ); -FILE *yyget_in ( yyscan_t yyscanner ); +YY_EXTRA_TYPE yyget_extra (yyscan_t yyscanner ); -void yyset_in ( FILE * _in_str , yyscan_t yyscanner ); +void yyset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner ); -FILE *yyget_out ( yyscan_t yyscanner ); +FILE *yyget_in (yyscan_t yyscanner ); -void yyset_out ( FILE * _out_str , yyscan_t yyscanner ); +void yyset_in (FILE * in_str ,yyscan_t yyscanner ); - int yyget_leng ( yyscan_t yyscanner ); +FILE *yyget_out (yyscan_t yyscanner ); -char *yyget_text ( yyscan_t yyscanner ); +void yyset_out (FILE * out_str ,yyscan_t yyscanner ); -int yyget_lineno ( yyscan_t yyscanner ); +yy_size_t yyget_leng (yyscan_t yyscanner ); -void yyset_lineno ( int _line_number , yyscan_t yyscanner ); +char *yyget_text (yyscan_t yyscanner ); -int yyget_column ( yyscan_t yyscanner ); +int yyget_lineno (yyscan_t yyscanner ); -void yyset_column ( int _column_no , yyscan_t yyscanner ); +void yyset_lineno (int line_number ,yyscan_t yyscanner ); -YYSTYPE * yyget_lval ( yyscan_t yyscanner ); +YYSTYPE * yyget_lval (yyscan_t yyscanner ); -void yyset_lval ( YYSTYPE * yylval_param , yyscan_t yyscanner ); +void yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner ); - YYLTYPE *yyget_lloc ( yyscan_t yyscanner ); + YYLTYPE *yyget_lloc (yyscan_t yyscanner ); - void yyset_lloc ( YYLTYPE * yylloc_param , yyscan_t yyscanner ); + void yyset_lloc (YYLTYPE * yylloc_param ,yyscan_t yyscanner ); /* Macros after this point can all be overridden by user definitions in * section 1. @@ -313,18 +283,18 @@ void yyset_lval ( YYSTYPE * yylval_param , yyscan_t yyscanner ); #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int yywrap ( yyscan_t yyscanner ); +extern "C" int yywrap (yyscan_t yyscanner ); #else -extern int yywrap ( yyscan_t yyscanner ); +extern int yywrap (yyscan_t yyscanner ); #endif #endif #ifndef yytext_ptr -static void yy_flex_strncpy ( char *, const char *, int , yyscan_t yyscanner); +static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner); #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen ( const char * , yyscan_t yyscanner); +static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner); #endif #ifndef YY_NO_INPUT @@ -333,12 +303,7 @@ static int yy_flex_strlen ( const char * , yyscan_t yyscanner); /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k */ -#define YY_READ_BUF_SIZE 16384 -#else #define YY_READ_BUF_SIZE 8192 -#endif /* __ia64__ */ #endif /* Number of entries by which start-condition stack grows. */ @@ -353,7 +318,7 @@ static int yy_flex_strlen ( const char * , yyscan_t yyscanner); #define YY_DECL_IS_OURS 1 extern int yylex \ - (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner); + (YYSTYPE * yylval_param,YYLTYPE * yylloc_param ,yyscan_t yyscanner); #define YY_DECL int yylex \ (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner) @@ -373,153 +338,8 @@ extern int yylex \ #undef YY_DECL #endif -#ifndef yy_create_buffer_ALREADY_DEFINED -#undef yy_create_buffer -#endif -#ifndef yy_delete_buffer_ALREADY_DEFINED -#undef yy_delete_buffer -#endif -#ifndef yy_scan_buffer_ALREADY_DEFINED -#undef yy_scan_buffer -#endif -#ifndef yy_scan_string_ALREADY_DEFINED -#undef yy_scan_string -#endif -#ifndef yy_scan_bytes_ALREADY_DEFINED -#undef yy_scan_bytes -#endif -#ifndef yy_init_buffer_ALREADY_DEFINED -#undef yy_init_buffer -#endif -#ifndef yy_flush_buffer_ALREADY_DEFINED -#undef yy_flush_buffer -#endif -#ifndef yy_load_buffer_state_ALREADY_DEFINED -#undef yy_load_buffer_state -#endif -#ifndef yy_switch_to_buffer_ALREADY_DEFINED -#undef yy_switch_to_buffer -#endif -#ifndef yypush_buffer_state_ALREADY_DEFINED -#undef yypush_buffer_state -#endif -#ifndef yypop_buffer_state_ALREADY_DEFINED -#undef yypop_buffer_state -#endif -#ifndef yyensure_buffer_stack_ALREADY_DEFINED -#undef yyensure_buffer_stack -#endif -#ifndef yylex_ALREADY_DEFINED -#undef yylex -#endif -#ifndef yyrestart_ALREADY_DEFINED -#undef yyrestart -#endif -#ifndef yylex_init_ALREADY_DEFINED -#undef yylex_init -#endif -#ifndef yylex_init_extra_ALREADY_DEFINED -#undef yylex_init_extra -#endif -#ifndef yylex_destroy_ALREADY_DEFINED -#undef yylex_destroy -#endif -#ifndef yyget_debug_ALREADY_DEFINED -#undef yyget_debug -#endif -#ifndef yyset_debug_ALREADY_DEFINED -#undef yyset_debug -#endif -#ifndef yyget_extra_ALREADY_DEFINED -#undef yyget_extra -#endif -#ifndef yyset_extra_ALREADY_DEFINED -#undef yyset_extra -#endif -#ifndef yyget_in_ALREADY_DEFINED -#undef yyget_in -#endif -#ifndef yyset_in_ALREADY_DEFINED -#undef yyset_in -#endif -#ifndef yyget_out_ALREADY_DEFINED -#undef yyget_out -#endif -#ifndef yyset_out_ALREADY_DEFINED -#undef yyset_out -#endif -#ifndef yyget_leng_ALREADY_DEFINED -#undef yyget_leng -#endif -#ifndef yyget_text_ALREADY_DEFINED -#undef yyget_text -#endif -#ifndef yyget_lineno_ALREADY_DEFINED -#undef yyget_lineno -#endif -#ifndef yyset_lineno_ALREADY_DEFINED -#undef yyset_lineno -#endif -#ifndef yyget_column_ALREADY_DEFINED -#undef yyget_column -#endif -#ifndef yyset_column_ALREADY_DEFINED -#undef yyset_column -#endif -#ifndef yywrap_ALREADY_DEFINED -#undef yywrap -#endif -#ifndef yyget_lval_ALREADY_DEFINED -#undef yyget_lval -#endif -#ifndef yyset_lval_ALREADY_DEFINED -#undef yyset_lval -#endif -#ifndef yyget_lloc_ALREADY_DEFINED -#undef yyget_lloc -#endif -#ifndef yyset_lloc_ALREADY_DEFINED -#undef yyset_lloc -#endif -#ifndef yyalloc_ALREADY_DEFINED -#undef yyalloc -#endif -#ifndef yyrealloc_ALREADY_DEFINED -#undef yyrealloc -#endif -#ifndef yyfree_ALREADY_DEFINED -#undef yyfree -#endif -#ifndef yytext_ALREADY_DEFINED -#undef yytext -#endif -#ifndef yyleng_ALREADY_DEFINED -#undef yyleng -#endif -#ifndef yyin_ALREADY_DEFINED -#undef yyin -#endif -#ifndef yyout_ALREADY_DEFINED -#undef yyout -#endif -#ifndef yy_flex_debug_ALREADY_DEFINED -#undef yy_flex_debug -#endif -#ifndef yylineno_ALREADY_DEFINED -#undef yylineno -#endif -#ifndef yytables_fload_ALREADY_DEFINED -#undef yytables_fload -#endif -#ifndef yytables_destroy_ALREADY_DEFINED -#undef yytables_destroy -#endif -#ifndef yyTABLES_NAME_ALREADY_DEFINED -#undef yyTABLES_NAME -#endif - -#line 191 "src\\data\\tikzlexer.l" +#line 190 "src/data/tikzlexer.l" -#line 523 "tikzlexer.h" +#line 344 "tikzlexer.h" #undef yyIN_HEADER #endif /* yyHEADER_H */ -- cgit v1.2.3 From 90061e2996b1f573a85edade35a995d25f0e660d Mon Sep 17 00:00:00 2001 From: Jon Moroney Date: Mon, 9 Apr 2018 14:50:22 +0200 Subject: comment out unused variable --- src/data/graph.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/data/graph.cpp b/src/data/graph.cpp index dec992f..4153bc0 100644 --- a/src/data/graph.cpp +++ b/src/data/graph.cpp @@ -69,7 +69,7 @@ int Graph::maxIntName() QRectF Graph::realBbox() { - float maxX = 0.0f; + //float maxX = 0.0f; QRectF rect = bbox(); foreach (Node *n, _nodes) { rect = rect.united(QRectF(n->point().x()-0.5f, @@ -253,5 +253,3 @@ void Graph::setBbox(const QRectF &bbox) { _bbox = bbox; } - - -- cgit v1.2.3 From 16890898289e32d4d0ba4641c55a5cae32eae6f2 Mon Sep 17 00:00:00 2001 From: Jon Moroney Date: Mon, 9 Apr 2018 14:51:00 +0200 Subject: Add default return --- src/gui/tikzscene.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/tikzscene.cpp b/src/gui/tikzscene.cpp index 927809e..a8ff199 100644 --- a/src/gui/tikzscene.cpp +++ b/src/gui/tikzscene.cpp @@ -84,7 +84,6 @@ void TikzScene::mousePressEvent(QGraphicsSceneMouseEvent *event) { if (!_enabled) return; - // current mouse position, in scene coordinates _mouseDownPos = event->scenePos(); @@ -498,6 +497,7 @@ int TikzScene::lineNumberForSelection() if (NodeItem *ni = dynamic_cast(gi)) return ni->node()->tikzLine(); if (EdgeItem *ei = dynamic_cast(gi)) return ei->edge()->tikzLine(); } + return 0; } -- cgit v1.2.3 From f144fbf42b9e8ff82b237a1be1fb0b906186795d Mon Sep 17 00:00:00 2001 From: Jon Moroney Date: Mon, 9 Apr 2018 15:23:46 +0200 Subject: Revert "bigger bezier handles" This reverts commit 075a94d502020a7056dfa8fa1a4ba500378efe31. --- src/gui/edgeitem.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/edgeitem.cpp b/src/gui/edgeitem.cpp index 08a5ad1..ec87815 100644 --- a/src/gui/edgeitem.cpp +++ b/src/gui/edgeitem.cpp @@ -11,14 +11,14 @@ EdgeItem::EdgeItem(Edge *edge) _cp1Item = new QGraphicsEllipseItem(this); _cp1Item->setParentItem(this); - _cp1Item->setRect(GLOBAL_SCALEF * (-0.1), GLOBAL_SCALEF * (-0.1), - GLOBAL_SCALEF * 0.2, GLOBAL_SCALEF * 0.2); + _cp1Item->setRect(GLOBAL_SCALEF * (-0.05), GLOBAL_SCALEF * (-0.05), + GLOBAL_SCALEF * 0.1, GLOBAL_SCALEF * 0.1); _cp1Item->setVisible(false); _cp2Item = new QGraphicsEllipseItem(this); _cp2Item->setParentItem(this); - _cp2Item->setRect(GLOBAL_SCALEF * (-0.1), GLOBAL_SCALEF * (-0.1), - GLOBAL_SCALEF * 0.2, GLOBAL_SCALEF * 0.2); + _cp2Item->setRect(GLOBAL_SCALEF * (-0.05), GLOBAL_SCALEF * (-0.05), + GLOBAL_SCALEF * 0.1, GLOBAL_SCALEF * 0.1); _cp2Item->setVisible(false); readPos(); -- cgit v1.2.3 From 83a91bf9cc7fe3a379d8b0e5b63c653214851768 Mon Sep 17 00:00:00 2001 From: Jon Moroney Date: Mon, 9 Apr 2018 16:13:39 +0200 Subject: Remove calls to refreshSceneBounds --- src/gui/undocommands.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gui/undocommands.cpp b/src/gui/undocommands.cpp index 4c5d0dc..6d3162c 100644 --- a/src/gui/undocommands.cpp +++ b/src/gui/undocommands.cpp @@ -11,14 +11,16 @@ GraphUpdateCommand::GraphUpdateCommand(TikzScene *scene, QUndoCommand *parent) : void GraphUpdateCommand::undo() { _scene->tikzDocument()->refreshTikz(); - _scene->refreshSceneBounds(); + //refreshSceneBounds does nothing + //_scene->refreshSceneBounds(); _scene->invalidate(); } void GraphUpdateCommand::redo() { _scene->tikzDocument()->refreshTikz(); - _scene->refreshSceneBounds(); + //refreshSceneBounds does nothing + //_scene->refreshSceneBounds(); _scene->invalidate(); } -- cgit v1.2.3 From 8b9fa72d80cde6dc54ea2105aa9295af733b643f Mon Sep 17 00:00:00 2001 From: Jon Moroney Date: Mon, 9 Apr 2018 16:14:17 +0200 Subject: Remove calls to refreshSceneBounds --- src/gui/tikzscene.cpp | 38 +++++++++++++++++++------------------- src/gui/tikzscene.h | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/gui/tikzscene.cpp b/src/gui/tikzscene.cpp index a8ff199..f303fab 100644 --- a/src/gui/tikzscene.cpp +++ b/src/gui/tikzscene.cpp @@ -635,25 +635,25 @@ void TikzScene::reloadStyles() } } -void TikzScene::refreshSceneBounds() -{ -// if (!views().empty()) { -// QGraphicsView *v = views().first(); -// QRectF viewB = v->mapToScene(v->viewport()->rect()).boundingRect(); -// //QPointF tl = v->mapToScene(viewB.topLeft()); -// //viewB.setTopLeft(tl); - -// QRectF bounds = viewB.united(rectToScreen(graph()->realBbox().adjusted(-1.0f, -1.0f, 1.0f, 1.0f))); -// //qDebug() << viewB; - -// if (bounds != sceneRect()) { -// QPointF c = viewB.center(); -// setSceneRect(bounds); -// v->centerOn(c); -// } -// } - //setBounds(graphB); -} +// void TikzScene::refreshSceneBounds() +// { +// // if (!views().empty()) { +// // QGraphicsView *v = views().first(); +// // QRectF viewB = v->mapToScene(v->viewport()->rect()).boundingRect(); +// // //QPointF tl = v->mapToScene(viewB.topLeft()); +// // //viewB.setTopLeft(tl); +// +// // QRectF bounds = viewB.united(rectToScreen(graph()->realBbox().adjusted(-1.0f, -1.0f, 1.0f, 1.0f))); +// // //qDebug() << viewB; +// +// // if (bounds != sceneRect()) { +// // QPointF c = viewB.center(); +// // setSceneRect(bounds); +// // v->centerOn(c); +// // } +// // } +// //setBounds(graphB); +// } void TikzScene::refreshAdjacentEdges(QList nodes) { diff --git a/src/gui/tikzscene.h b/src/gui/tikzscene.h index 3b4a1e1..fe1f784 100644 --- a/src/gui/tikzscene.h +++ b/src/gui/tikzscene.h @@ -36,7 +36,7 @@ public: TikzDocument *tikzDocument() const; void setTikzDocument(TikzDocument *tikzDocument); void reloadStyles(); - void refreshSceneBounds(); + //void refreshSceneBounds(); void applyActiveStyleToNodes(); void deleteSelectedItems(); void copyToClipboard(); -- cgit v1.2.3 From 86641371a35086e94e89d3ccc389a75c073a9312 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 10 Apr 2018 08:00:02 +0200 Subject: nudging --- src/data/graphelementdata.cpp | 2 +- src/data/graphelementdata.h | 2 +- src/gui/tikzscene.cpp | 66 ++++++++++++++++++++++++++++++++++++++----- src/gui/tikzscene.h | 1 + stylepalette.cpp | 24 ++++++++++++++++ stylepalette.h | 4 +++ 6 files changed, 90 insertions(+), 9 deletions(-) diff --git a/src/data/graphelementdata.cpp b/src/data/graphelementdata.cpp index 63c8cea..01736b8 100644 --- a/src/data/graphelementdata.cpp +++ b/src/data/graphelementdata.cpp @@ -131,7 +131,7 @@ int GraphElementData::rowCount(const QModelIndex &parent) const } } -int GraphElementData::columnCount(const QModelIndex &parent) const +int GraphElementData::columnCount(const QModelIndex &) const { return 2; } diff --git a/src/data/graphelementdata.h b/src/data/graphelementdata.h index 319edf7..740d4dc 100644 --- a/src/data/graphelementdata.h +++ b/src/data/graphelementdata.h @@ -34,7 +34,7 @@ public: QModelIndex parent(const QModelIndex &index) const Q_DECL_OVERRIDE; int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + int columnCount(const QModelIndex &) const Q_DECL_OVERRIDE; Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; diff --git a/src/gui/tikzscene.cpp b/src/gui/tikzscene.cpp index f303fab..2a9b2fb 100644 --- a/src/gui/tikzscene.cpp +++ b/src/gui/tikzscene.cpp @@ -40,6 +40,9 @@ TikzScene::TikzScene(TikzDocument *tikzDocument, ToolPalette *tools, pen.setDashPattern(dash); _rubberBandItem->setPen(pen); + QBrush brush(QColor::fromRgbF(0.6,0.6,0.8,0.2)); + _rubberBandItem->setBrush(brush); + _rubberBandItem->setVisible(false); addItem(_rubberBandItem); } @@ -427,6 +430,8 @@ void TikzScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) invalidate(QRect(), QGraphicsScene::BackgroundLayer); } + + void TikzScene::keyReleaseEvent(QKeyEvent *event) { if (!_enabled) return; @@ -452,19 +457,67 @@ void TikzScene::keyReleaseEvent(QKeyEvent *event) } } +void TikzScene::keyPressEvent(QKeyEvent *event) +{ + bool capture = false; + + if (event->key() == Qt::Key_QuoteLeft) { + capture = true; + _styles->nextStyle(); + } + + if (event->modifiers() & Qt::ControlModifier) { + QPointF delta(0,0); + float shift = (event->modifiers() & Qt::ShiftModifier) ? 1.0f : 10.0f; + switch(event->key()) { + case Qt::Key_Left: + delta.setX(-0.025f * shift); + break; + case Qt::Key_Right: + delta.setX(0.025f * shift); + break; + case Qt::Key_Up: + delta.setY(0.025f * shift); + break; + case Qt::Key_Down: + delta.setY(-0.025f * shift); + break; + } + + if (!delta.isNull()) { + capture = true; + QMap oldNodePositions; + QMap newNodePositions; + QPointF pos; + + foreach (QGraphicsItem *gi, selectedItems()) { + if (NodeItem *ni = dynamic_cast(gi)) { + pos = ni->node()->point(); + oldNodePositions.insert(ni->node(), pos); + newNodePositions.insert(ni->node(), pos + delta); + } + } + + MoveCommand *cmd = new MoveCommand(this, oldNodePositions, newNodePositions); + _tikzDocument->undoStack()->push(cmd); + } + } + + if (!capture) QGraphicsScene::keyPressEvent(event); +} + void TikzScene::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) { if (!_enabled) return; QPointF mousePos = event->scenePos(); - foreach (QGraphicsItem *gi, items(mousePos)) { - if (EdgeItem *ei = dynamic_cast(gi)) { + auto sel = items(mousePos); + + if (!sel.isEmpty()) { + if (EdgeItem *ei = dynamic_cast(sel[0])) { ChangeEdgeModeCommand *cmd = new ChangeEdgeModeCommand(this, ei->edge()); _tikzDocument->undoStack()->push(cmd); - break; - } - - if (NodeItem *ni = dynamic_cast(gi)) { + } else if (NodeItem *ni = dynamic_cast(sel[0])) { bool ok; QString newLabel = QInputDialog::getText(views()[0], tr("Node label"), tr("Label:"), QLineEdit::Normal, @@ -475,7 +528,6 @@ void TikzScene::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) ChangeLabelCommand *cmd = new ChangeLabelCommand(this, graph(), oldLabels, newLabel); _tikzDocument->undoStack()->push(cmd); } - break; } } } diff --git a/src/gui/tikzscene.h b/src/gui/tikzscene.h index fe1f784..634a848 100644 --- a/src/gui/tikzscene.h +++ b/src/gui/tikzscene.h @@ -57,6 +57,7 @@ protected: void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override; void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; void keyReleaseEvent(QKeyEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override; private: TikzDocument *_tikzDocument; diff --git a/stylepalette.cpp b/stylepalette.cpp index 1416cc3..c599750 100644 --- a/stylepalette.cpp +++ b/stylepalette.cpp @@ -61,6 +61,30 @@ void StylePalette::reloadStyles() } } +void StylePalette::changeStyle(int increment) +{ + QModelIndexList i = ui->styleListView->selectionModel()->selectedIndexes(); + int row = 0; + if (!i.isEmpty()) { + int row = (i[0].row()+increment)%_model->rowCount(); + if (row < 0) row += _model->rowCount(); + } + + QModelIndex i1 = ui->styleListView->rootIndex().child(row, 0); + ui->styleListView->selectionModel()->select(i1, QItemSelectionModel::ClearAndSelect); + ui->styleListView->scrollTo(i1); +} + +void StylePalette::nextStyle() +{ + changeStyle(1); +} + +void StylePalette::previousStyle() +{ + changeStyle(-1); +} + QString StylePalette::activeNodeStyleName() { const QModelIndexList i = ui->styleListView->selectionModel()->selectedIndexes(); diff --git a/stylepalette.h b/stylepalette.h index 8d2187e..a465034 100644 --- a/stylepalette.h +++ b/stylepalette.h @@ -16,6 +16,8 @@ public: explicit StylePalette(QWidget *parent = 0); ~StylePalette(); void reloadStyles(); + void nextStyle(); + void previousStyle(); QString activeNodeStyleName(); @@ -26,6 +28,8 @@ public slots: //void on_buttonApplyNodeStyle_clicked(); private: + void changeStyle(int increment); + Ui::StylePalette *ui; QStandardItemModel *_model; -- cgit v1.2.3 From 716db4a4951a4c6259ba6a1fa06e8228970e37b7 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 10 Apr 2018 08:00:28 +0200 Subject: Revert "Revert "bigger bezier handles"" This reverts commit f144fbf42b9e8ff82b237a1be1fb0b906186795d. --- src/gui/edgeitem.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/edgeitem.cpp b/src/gui/edgeitem.cpp index ec87815..08a5ad1 100644 --- a/src/gui/edgeitem.cpp +++ b/src/gui/edgeitem.cpp @@ -11,14 +11,14 @@ EdgeItem::EdgeItem(Edge *edge) _cp1Item = new QGraphicsEllipseItem(this); _cp1Item->setParentItem(this); - _cp1Item->setRect(GLOBAL_SCALEF * (-0.05), GLOBAL_SCALEF * (-0.05), - GLOBAL_SCALEF * 0.1, GLOBAL_SCALEF * 0.1); + _cp1Item->setRect(GLOBAL_SCALEF * (-0.1), GLOBAL_SCALEF * (-0.1), + GLOBAL_SCALEF * 0.2, GLOBAL_SCALEF * 0.2); _cp1Item->setVisible(false); _cp2Item = new QGraphicsEllipseItem(this); _cp2Item->setParentItem(this); - _cp2Item->setRect(GLOBAL_SCALEF * (-0.05), GLOBAL_SCALEF * (-0.05), - GLOBAL_SCALEF * 0.1, GLOBAL_SCALEF * 0.1); + _cp2Item->setRect(GLOBAL_SCALEF * (-0.1), GLOBAL_SCALEF * (-0.1), + GLOBAL_SCALEF * 0.2, GLOBAL_SCALEF * 0.2); _cp2Item->setVisible(false); readPos(); -- cgit v1.2.3 From facfa3e8aa7e3c278b0016c02c6a9f1f019903e2 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 10 Apr 2018 08:02:10 +0200 Subject: updated gitignore --- .gitignore | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitignore b/.gitignore index 17ba8b5..c419805 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,11 @@ +GeneratedFiles +.vs +debug +release +*.vcxproj* +*.sln +x64 +target_wrapper.bat .qmake.stash build-tikzit-* *.pro.user -- cgit v1.2.3 From eac7dee2d8ba86001afbc61c4e9d7baae7341cb8 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 10 Apr 2018 16:07:44 +0200 Subject: added edgestyles, but cant apply to nodes yet --- src/data/edgestyle.cpp | 109 ++++++++++++++++++++++++++++++++++ src/data/edgestyle.h | 38 ++++++++++++ src/data/nodestyle.cpp | 80 +++++-------------------- src/data/nodestyle.h | 21 ++----- src/data/style.cpp | 60 +++++++++++++++++++ src/data/style.h | 36 ++++++++++++ src/data/tikzlexer.l | 9 +-- src/data/tikzstyles.cpp | 27 +++++++-- src/data/tikzstyles.h | 4 ++ src/gui/stylepalette.cpp | 149 +++++++++++++++++++++++++++++++++++++++++++++++ src/gui/stylepalette.h | 42 +++++++++++++ src/gui/stylepalette.ui | 120 ++++++++++++++++++++++++++++++++++++++ src/gui/tikzscene.cpp | 2 +- src/gui/tikzview.cpp | 2 +- stylepalette.cpp | 126 --------------------------------------- stylepalette.h | 40 ------------- stylepalette.ui | 120 -------------------------------------- tikzit.pro | 18 +++--- 18 files changed, 619 insertions(+), 384 deletions(-) create mode 100644 src/data/edgestyle.cpp create mode 100644 src/data/edgestyle.h create mode 100644 src/data/style.cpp create mode 100644 src/data/style.h create mode 100644 src/gui/stylepalette.cpp create mode 100644 src/gui/stylepalette.h create mode 100644 src/gui/stylepalette.ui delete mode 100644 stylepalette.cpp delete mode 100644 stylepalette.h delete mode 100644 stylepalette.ui diff --git a/src/data/edgestyle.cpp b/src/data/edgestyle.cpp new file mode 100644 index 0000000..d366946 --- /dev/null +++ b/src/data/edgestyle.cpp @@ -0,0 +1,109 @@ +#include "edgestyle.h" + +#include +#include + +EdgeStyle *noneEdgeStyle = new EdgeStyle(); + +EdgeStyle::EdgeStyle() : Style() +{ +} + +EdgeStyle::EdgeStyle(QString name, GraphElementData *data) : Style(name, data) +{ +} + +EdgeStyle::ArrowTipStyle EdgeStyle::arrowHead() const +{ + if (_data == 0) return NoTip; + + if (_data->atom("->") || _data->atom("<->") || _data->atom("|->")) return Pointer; + if (_data->atom("-|") || _data->atom("<-|") || _data->atom("|-|")) return Flat; + return NoTip; +} + +EdgeStyle::ArrowTipStyle EdgeStyle::arrowTail() const +{ + if (_data == 0) return NoTip; + if (_data->atom("<-") || _data->atom("<->") || _data->atom("<-|")) return Pointer; + if (_data->atom("|-") || _data->atom("|->") || _data->atom("|-|")) return Flat; + return NoTip; +} + +EdgeStyle::DrawStyle EdgeStyle::drawStyle() const +{ + if (_data == 0) return Solid; + if (_data->atom("dashed")) return Dashed; + if (_data->atom("dotted")) return Dotted; + return Solid; +} + +QPen EdgeStyle::pen() const +{ + QPen p(strokeColor()); + p.setWidthF((float)strokeThickness() * 3.0f); + + QVector pat; + switch (drawStyle()) { + case Dashed: + pat << 3.0 << 3.0; + p.setDashPattern(pat); + break; + case Dotted: + pat << 1.0 << 1.0; + p.setDashPattern(pat); + break; + } + + return p; +} + +QPainterPath EdgeStyle::path() const +{ + return QPainterPath(); +} + +QPainterPath EdgeStyle::palettePath() const +{ + return QPainterPath(); +} + +QIcon EdgeStyle::icon() const +{ + // draw an icon matching the style + QPixmap px(100,100); + px.fill(Qt::transparent); + QPainter painter(&px); + + if (_data == 0) { + QPen pen(Qt::black); + pen.setWidth(3); + } else { + painter.setPen(pen()); + } + + painter.drawLine(10, 50, 90, 50); + + switch (arrowHead()) { + case Pointer: + painter.drawLine(90,50,80,40); + painter.drawLine(90,50,80,60); + break; + case Flat: + painter.drawLine(90,40,90,60); + break; + } + + switch (arrowTail()) { + case Pointer: + painter.drawLine(10,50,20,40); + painter.drawLine(10,50,20,60); + break; + case Flat: + painter.drawLine(10,40,10,60); + break; + } + + + return QIcon(px); +} diff --git a/src/data/edgestyle.h b/src/data/edgestyle.h new file mode 100644 index 0000000..6b0c3bb --- /dev/null +++ b/src/data/edgestyle.h @@ -0,0 +1,38 @@ +#ifndef EDGESTYLE_H +#define EDGESTYLE_H + +#include "style.h" + +#include +#include +#include +#include +#include + +class EdgeStyle : public Style +{ +public: + EdgeStyle(); + EdgeStyle(QString name, GraphElementData *data); + + enum ArrowTipStyle { + Flat, Pointer, NoTip + }; + + enum DrawStyle { + Solid, Dotted, Dashed + }; + + ArrowTipStyle arrowHead() const; + ArrowTipStyle arrowTail() const; + DrawStyle drawStyle() const; + + QPen pen() const; + QPainterPath path() const override; + QPainterPath palettePath() const override; + QIcon icon() const override; +}; + +extern EdgeStyle *noneEdgeStyle; + +#endif // EDGESTYLE_H diff --git a/src/data/nodestyle.cpp b/src/data/nodestyle.cpp index b3d72fb..3f2c921 100644 --- a/src/data/nodestyle.cpp +++ b/src/data/nodestyle.cpp @@ -3,91 +3,43 @@ NodeStyle *noneStyle = new NodeStyle(); -NodeStyle::NodeStyle() : _name("none"), _data(0) +NodeStyle::NodeStyle() : Style() { } -NodeStyle::NodeStyle(QString name, GraphElementData *data): _name(name), _data(data) +NodeStyle::NodeStyle(QString name, GraphElementData *data): Style(name, data) { } -bool NodeStyle::isNone() { return _data == 0; } - -GraphElementData *NodeStyle::data() const -{ - return _data; -} - -QString NodeStyle::name() const -{ - return _name; -} - -NodeStyle::Shape NodeStyle::shape() const -{ - if (_data == 0) return NodeStyle::Circle; - - QString sh = _data->property("shape"); - if (sh.isNull()) return NodeStyle::Circle; - else if (sh == "circle") return NodeStyle::Circle; - else if (sh == "rectangle") return NodeStyle::Rectangle; - else return NodeStyle::Circle; -} - QColor NodeStyle::fillColor() const { if (_data == 0) return Qt::white; - QString col = _data->property("fill"); - - if (col.isNull()) { - return QColor(Qt::white); - } else { - QColor namedColor(col); - if (namedColor.isValid()) { - return namedColor; - } else { - // TODO: read RGB colors - return QColor(Qt::white); - } - } -} - -QColor NodeStyle::strokeColor() const -{ - if (_data == 0) return Qt::black; + QString col = propertyWithDefault("fill", "white"); - QString col = _data->property("draw"); - - if (col.isNull()) { - return QColor(Qt::black); + QColor namedColor(col); + if (namedColor.isValid()) { + return namedColor; } else { - QColor namedColor(col); - if (namedColor.isValid()) { - return namedColor; - } else { - // TODO: read RGB colors - return QColor(Qt::white); - } + // TODO: read RGB colors + return QColor(Qt::white); } } -int NodeStyle::strokeThickness() const +QBrush NodeStyle::brush() const { - return 1; + return QBrush(fillColor()); } -QPen NodeStyle::pen() const +NodeStyle::Shape NodeStyle::shape() const { - QPen p(strokeColor()); - p.setWidthF((float)strokeThickness() * 3.0f); - return p; -} + if (_data == 0) return NodeStyle::Circle; -QBrush NodeStyle::brush() const -{ - return QBrush(fillColor()); + QString sh = propertyWithDefault("shape", "circle"); + if (sh == "circle") return NodeStyle::Circle; + else if (sh == "rectangle") return NodeStyle::Rectangle; + else return NodeStyle::Circle; } QPainterPath NodeStyle::path() const diff --git a/src/data/nodestyle.h b/src/data/nodestyle.h index 0b9f282..4b48bb3 100644 --- a/src/data/nodestyle.h +++ b/src/data/nodestyle.h @@ -1,7 +1,7 @@ #ifndef NODESTYLE_H #define NODESTYLE_H -#include "graphelementdata.h" +#include "style.h" #include #include @@ -9,7 +9,7 @@ #include #include -class NodeStyle +class NodeStyle : public Style { public: enum Shape { @@ -18,23 +18,14 @@ public: NodeStyle(); NodeStyle(QString name, GraphElementData *data); - bool isNone(); - GraphElementData *data() const; - QString name() const; - Shape shape() const; QColor fillColor() const; - QColor strokeColor() const; - int strokeThickness() const; - - QPen pen() const; QBrush brush() const; QPainterPath path() const; - QPainterPath palettePath() const; - QIcon icon() const; -private: - QString _name; - GraphElementData *_data; + Shape shape() const; + + QPainterPath palettePath() const override; + QIcon icon() const override; }; extern NodeStyle *noneStyle; diff --git a/src/data/style.cpp b/src/data/style.cpp new file mode 100644 index 0000000..927271c --- /dev/null +++ b/src/data/style.cpp @@ -0,0 +1,60 @@ +#include "style.h" + +Style::Style() : _name("none"), _data(0) +{ +} + +Style::Style(QString name, GraphElementData *data) : _name(name), _data(data) +{ +} + +bool Style::isNone() +{ + return _data == 0; +} + +GraphElementData *Style::data() const +{ + return _data; +} + +QString Style::name() const +{ + return _name; +} + +QColor Style::strokeColor() const +{ + if (_data == 0) return Qt::black; + + QString col = propertyWithDefault("draw", "black"); + + QColor namedColor(col); + if (namedColor.isValid()) { + return namedColor; + } else { + // TODO: read RGB colors + return QColor(Qt::black); + } +} + +// TODO +int Style::strokeThickness() const +{ + return 1; +} + +QPen Style::pen() const +{ + QPen p(strokeColor()); + p.setWidthF((float)strokeThickness() * 3.0f); + return p; +} + +QString Style::propertyWithDefault(QString prop, QString def) const +{ + QString val = _data->property("tikzit " + prop); + if (val.isNull()) val = _data->property(prop); + if (val.isNull()) val = def; + return val; +} diff --git a/src/data/style.h b/src/data/style.h new file mode 100644 index 0000000..9d58ebe --- /dev/null +++ b/src/data/style.h @@ -0,0 +1,36 @@ +#ifndef STYLE_H +#define STYLE_H + + +#include "graphelementdata.h" + +#include +#include +#include +#include +#include + +class Style +{ +public: + Style(); + Style(QString name, GraphElementData *data); + bool isNone(); + + // properties that both edges and nodes have + GraphElementData *data() const; + QString name() const; + QColor strokeColor() const; + int strokeThickness() const; + + // methods that are implemented differently for edges and nodes + virtual QPen pen() const; + virtual QPainterPath path() const = 0; + virtual QPainterPath palettePath() const = 0; + virtual QIcon icon() const = 0; +protected: + QString propertyWithDefault(QString prop, QString def) const; + QString _name; + GraphElementData *_data; +}; +#endif // STYLE_H diff --git a/src/data/tikzlexer.l b/src/data/tikzlexer.l index d90ad4b..45494d2 100644 --- a/src/data/tikzlexer.l +++ b/src/data/tikzlexer.l @@ -65,6 +65,7 @@ FLOAT \-?[0-9]*(\.[0-9]+)? yylloc->first_column = yylloc->last_column = 0; } [\t ]+ { } +%.*$ { } \\begin\{tikzpicture\} { return BEGIN_TIKZPICTURE_CMD; } \\end\{tikzpicture\} { return END_TIKZPICTURE_CMD; } @@ -74,12 +75,12 @@ FLOAT \-?[0-9]*(\.[0-9]+)? \\draw { return DRAW_CMD; } \\node { return NODE_CMD; } \\path { return PATH_CMD; } -rectangle { return RECTANGLE; } -node { return NODE; } -at { return AT; } -to { return TO; } ; { return SEMICOLON; } = { return EQUALS; } +rectangle { return RECTANGLE; } +node { return NODE; } +at { return AT; } +to { return TO; } \([ ]*{FLOAT}[ ]*,[ ]*{FLOAT}[ ]*\) { yylloc->last_column = yylloc->first_column + 1; diff --git a/src/data/tikzstyles.cpp b/src/data/tikzstyles.cpp index 186e19b..c198412 100644 --- a/src/data/tikzstyles.cpp +++ b/src/data/tikzstyles.cpp @@ -12,7 +12,14 @@ NodeStyle *TikzStyles::nodeStyle(QString name) const { foreach (NodeStyle *s , _nodeStyles) if (s->name() == name) return s; - return noneStyle; //NodeStyle(name, NodeShape::Circle, Qt::white); + return noneStyle; +} + +EdgeStyle *TikzStyles::edgeStyle(QString name) const +{ + foreach (EdgeStyle *s , _edgeStyles) + if (s->name() == name) return s; + return noneEdgeStyle; } QVector TikzStyles::nodeStyles() const @@ -23,14 +30,24 @@ QVector TikzStyles::nodeStyles() const void TikzStyles::clear() { _nodeStyles.clear(); + _edgeStyles.clear(); +} + +QVector TikzStyles::edgeStyles() const +{ + return _edgeStyles; } void TikzStyles::addStyle(QString name, GraphElementData *data) { - //qDebug() << "got style {" << name << "} = [" << data << "]"; - if (!data->property("fill").isNull()) { // node style + if (data->atom("-") || data->atom("->") || data->atom("-|") || + data->atom("<-") || data->atom("<->") || data->atom("<-|") || + data->atom("|-") || data->atom("|->") || data->atom("|-|")) + { // edge style + qDebug() << "got edge style" << name; + _edgeStyles << new EdgeStyle(name, data); + } else { // node style + qDebug() << "got node style" << name; _nodeStyles << new NodeStyle(name, data); - } else { // edge style - // TODO: edge styles } } diff --git a/src/data/tikzstyles.h b/src/data/tikzstyles.h index eaf7e64..4cd7d6e 100644 --- a/src/data/tikzstyles.h +++ b/src/data/tikzstyles.h @@ -3,6 +3,7 @@ #include "graphelementdata.h" #include "nodestyle.h" +#include "edgestyle.h" #include #include @@ -15,7 +16,9 @@ public: void addStyle(QString name, GraphElementData *data); NodeStyle *nodeStyle(QString name) const; + EdgeStyle *edgeStyle(QString name) const; QVector nodeStyles() const; + QVector edgeStyles() const; void clear(); signals: @@ -24,6 +27,7 @@ public slots: private: QVector _nodeStyles; + QVector _edgeStyles; }; #endif // PROJECT_H diff --git a/src/gui/stylepalette.cpp b/src/gui/stylepalette.cpp new file mode 100644 index 0000000..f7c17c0 --- /dev/null +++ b/src/gui/stylepalette.cpp @@ -0,0 +1,149 @@ +#include "stylepalette.h" +#include "ui_stylepalette.h" +#include "tikzit.h" + +#include +#include +#include +#include +#include +#include +#include + +StylePalette::StylePalette(QWidget *parent) : + QDockWidget(parent), + ui(new Ui::StylePalette) +{ + ui->setupUi(this); + +// QSettings settings("tikzit", "tikzit"); +// QVariant geom = settings.value("style-palette-geometry"); +// if (geom != QVariant()) { +// restoreGeometry(geom.toByteArray()); +// } + + _nodeModel = new QStandardItemModel(this); + _edgeModel = new QStandardItemModel(this); + + ui->styleListView->setModel(_nodeModel); + ui->styleListView->setViewMode(QListView::IconMode); + ui->styleListView->setMovement(QListView::Static); + ui->styleListView->setGridSize(QSize(70,40)); + + ui->edgeStyleListView->setModel(_edgeModel); + ui->edgeStyleListView->setViewMode(QListView::IconMode); + ui->edgeStyleListView->setMovement(QListView::Static); + ui->edgeStyleListView->setGridSize(QSize(70,40)); + + reloadStyles(); + + connect(ui->styleListView, SIGNAL(doubleClicked(const QModelIndex &)), this, SLOT( nodeStyleDoubleClicked(const QModelIndex&)) ); +} + +StylePalette::~StylePalette() +{ + delete ui; +} + +void StylePalette::reloadStyles() +{ + _nodeModel->clear(); + _edgeModel->clear(); + QString f = tikzit->styleFile(); + ui->styleFile->setText(f); + + QStandardItem *it; + + it = new QStandardItem(noneStyle->icon(), noneStyle->name()); + it->setEditable(false); + it->setData(noneStyle->name()); + _nodeModel->appendRow(it); + + foreach(NodeStyle *ns, tikzit->styles()->nodeStyles()) { + it = new QStandardItem(ns->icon(), ns->name()); + it->setEditable(false); + it->setData(ns->name()); + _nodeModel->appendRow(it); + } + + it = new QStandardItem(noneEdgeStyle->icon(), noneEdgeStyle->name()); + it->setEditable(false); + it->setData(noneEdgeStyle->name()); + _edgeModel->appendRow(it); + + foreach(EdgeStyle *es, tikzit->styles()->edgeStyles()) { + it = new QStandardItem(es->icon(), es->name()); + it->setEditable(false); + it->setData(es->name()); + _edgeModel->appendRow(it); + } +} + +void StylePalette::changeNodeStyle(int increment) +{ + QModelIndexList i = ui->styleListView->selectionModel()->selectedIndexes(); + int row = 0; + if (!i.isEmpty()) { + int row = (i[0].row()+increment)%_nodeModel->rowCount(); + if (row < 0) row += _nodeModel->rowCount(); + } + + QModelIndex i1 = ui->styleListView->rootIndex().child(row, 0); + ui->styleListView->selectionModel()->select(i1, QItemSelectionModel::ClearAndSelect); + ui->styleListView->scrollTo(i1); +} + +void StylePalette::nextNodeStyle() +{ + changeNodeStyle(1); +} + +void StylePalette::previousNodeStyle() +{ + changeNodeStyle(-1); +} + +QString StylePalette::activeNodeStyleName() +{ + const QModelIndexList i = ui->styleListView->selectionModel()->selectedIndexes(); + + if (i.isEmpty()) { + return "none"; + } else { + return i[0].data().toString(); + } +} + +void StylePalette::nodeStyleDoubleClicked(const QModelIndex &index) +{ + tikzit->activeWindow()->tikzScene()->applyActiveStyleToNodes(); +} + +void StylePalette::edgeStyleDoubleClicked(const QModelIndex &index) +{ + // TODO +} + +void StylePalette::on_buttonOpenTikzstyles_clicked() +{ + tikzit->openTikzStyles(); +} + +void StylePalette::on_buttonRefreshTikzstyles_clicked() +{ + QSettings settings("tikzit", "tikzit"); + QString path = settings.value("previous-tikzstyles-file").toString(); + if (!path.isEmpty()) tikzit->loadStyles(path); +} + +//void StylePalette::on_buttonApplyNodeStyle_clicked() +//{ +// if (tikzit->activeWindow() != 0) tikzit->activeWindow()->tikzScene()->applyActiveStyleToNodes(); +//} + +void StylePalette::closeEvent(QCloseEvent *event) +{ + QSettings settings("tikzit", "tikzit"); + settings.setValue("style-palette-geometry", saveGeometry()); + QDockWidget::closeEvent(event); +} diff --git a/src/gui/stylepalette.h b/src/gui/stylepalette.h new file mode 100644 index 0000000..8663cc4 --- /dev/null +++ b/src/gui/stylepalette.h @@ -0,0 +1,42 @@ +#ifndef STYLEPALETTE_H +#define STYLEPALETTE_H + +#include +#include + +namespace Ui { +class StylePalette; +} + +class StylePalette : public QDockWidget +{ + Q_OBJECT + +public: + explicit StylePalette(QWidget *parent = 0); + ~StylePalette(); + void reloadStyles(); + void nextNodeStyle(); + void previousNodeStyle(); + QString activeNodeStyleName(); + + +public slots: + void nodeStyleDoubleClicked(const QModelIndex &index); + void edgeStyleDoubleClicked(const QModelIndex &index); + void on_buttonOpenTikzstyles_clicked(); + void on_buttonRefreshTikzstyles_clicked(); + //void on_buttonApplyNodeStyle_clicked(); + +private: + void changeNodeStyle(int increment); + + Ui::StylePalette *ui; + QStandardItemModel *_nodeModel; + QStandardItemModel *_edgeModel; + +protected: + void closeEvent(QCloseEvent *event) override; +}; + +#endif // STYLEPALETTE_H diff --git a/src/gui/stylepalette.ui b/src/gui/stylepalette.ui new file mode 100644 index 0000000..4f5b58d --- /dev/null +++ b/src/gui/stylepalette.ui @@ -0,0 +1,120 @@ + + + StylePalette + + + + 0 + 0 + 88 + 518 + + + + + 0 + 0 + + + + + 88 + 191 + + + + + 88 + 524287 + + + + false + + + + + + + + + + 2 + + + 0 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + New Project + + + + + + + :/images/document-open.svg:/images/document-open.svg + + + + + + + + + + + :/images/refresh.svg:/images/refresh.svg + + + + + + + + + + 0 + 0 + + + + [default] + + + + + + + + 8 + true + + + + + + + + + + + + + + + diff --git a/src/gui/tikzscene.cpp b/src/gui/tikzscene.cpp index 2a9b2fb..9b6c2d6 100644 --- a/src/gui/tikzscene.cpp +++ b/src/gui/tikzscene.cpp @@ -463,7 +463,7 @@ void TikzScene::keyPressEvent(QKeyEvent *event) if (event->key() == Qt::Key_QuoteLeft) { capture = true; - _styles->nextStyle(); + _styles->nextNodeStyle(); } if (event->modifiers() & Qt::ControlModifier) { diff --git a/src/gui/tikzview.cpp b/src/gui/tikzview.cpp index 047ef50..9997106 100644 --- a/src/gui/tikzview.cpp +++ b/src/gui/tikzview.cpp @@ -6,7 +6,7 @@ TikzView::TikzView(QWidget *parent) : QGraphicsView(parent) { - //setRenderHint(QPainter::Antialiasing); + setRenderHint(QPainter::Antialiasing); //setDragMode(QGraphicsView::RubberBandDrag); _scale = 1.0f; diff --git a/stylepalette.cpp b/stylepalette.cpp deleted file mode 100644 index c599750..0000000 --- a/stylepalette.cpp +++ /dev/null @@ -1,126 +0,0 @@ -#include "stylepalette.h" -#include "ui_stylepalette.h" -#include "tikzit.h" - -#include -#include -#include -#include -#include -#include -#include - -StylePalette::StylePalette(QWidget *parent) : - QDockWidget(parent), - ui(new Ui::StylePalette) -{ - ui->setupUi(this); - -// QSettings settings("tikzit", "tikzit"); -// QVariant geom = settings.value("style-palette-geometry"); -// if (geom != QVariant()) { -// restoreGeometry(geom.toByteArray()); -// } - - _model = new QStandardItemModel(this); - ui->styleListView->setModel(_model); - ui->styleListView->setViewMode(QListView::IconMode); - ui->styleListView->setMovement(QListView::Static); - ui->styleListView->setGridSize(QSize(70,40)); - - reloadStyles(); - - connect(ui->styleListView, SIGNAL(doubleClicked(const QModelIndex &)), this, SLOT( itemDoubleClicked(const QModelIndex&)) ); -} - -StylePalette::~StylePalette() -{ - delete ui; -} - -void StylePalette::reloadStyles() -{ - _model->clear(); - QString f = tikzit->styleFile(); - // - ui->styleFile->setText(f); - - QStandardItem *it; - //QSize sz(60,60); - - it = new QStandardItem(noneStyle->icon(), noneStyle->name()); - it->setEditable(false); - it->setData(noneStyle->name()); - _model->appendRow(it); - - foreach(NodeStyle *ns, tikzit->styles()->nodeStyles()) { - it = new QStandardItem(ns->icon(), ns->name()); - it->setEditable(false); - it->setData(ns->name()); - _model->appendRow(it); - } -} - -void StylePalette::changeStyle(int increment) -{ - QModelIndexList i = ui->styleListView->selectionModel()->selectedIndexes(); - int row = 0; - if (!i.isEmpty()) { - int row = (i[0].row()+increment)%_model->rowCount(); - if (row < 0) row += _model->rowCount(); - } - - QModelIndex i1 = ui->styleListView->rootIndex().child(row, 0); - ui->styleListView->selectionModel()->select(i1, QItemSelectionModel::ClearAndSelect); - ui->styleListView->scrollTo(i1); -} - -void StylePalette::nextStyle() -{ - changeStyle(1); -} - -void StylePalette::previousStyle() -{ - changeStyle(-1); -} - -QString StylePalette::activeNodeStyleName() -{ - const QModelIndexList i = ui->styleListView->selectionModel()->selectedIndexes(); - - if (i.isEmpty()) { - return "none"; - } else { - return i[0].data().toString(); - } -} - -void StylePalette::itemDoubleClicked(const QModelIndex &index) -{ - tikzit->activeWindow()->tikzScene()->applyActiveStyleToNodes(); -} - -void StylePalette::on_buttonOpenTikzstyles_clicked() -{ - tikzit->openTikzStyles(); -} - -void StylePalette::on_buttonRefreshTikzstyles_clicked() -{ - QSettings settings("tikzit", "tikzit"); - QString path = settings.value("previous-tikzstyles-file").toString(); - if (!path.isEmpty()) tikzit->loadStyles(path); -} - -//void StylePalette::on_buttonApplyNodeStyle_clicked() -//{ -// if (tikzit->activeWindow() != 0) tikzit->activeWindow()->tikzScene()->applyActiveStyleToNodes(); -//} - -void StylePalette::closeEvent(QCloseEvent *event) -{ - QSettings settings("tikzit", "tikzit"); - settings.setValue("style-palette-geometry", saveGeometry()); - QDockWidget::closeEvent(event); -} diff --git a/stylepalette.h b/stylepalette.h deleted file mode 100644 index a465034..0000000 --- a/stylepalette.h +++ /dev/null @@ -1,40 +0,0 @@ -#ifndef STYLEPALETTE_H -#define STYLEPALETTE_H - -#include -#include - -namespace Ui { -class StylePalette; -} - -class StylePalette : public QDockWidget -{ - Q_OBJECT - -public: - explicit StylePalette(QWidget *parent = 0); - ~StylePalette(); - void reloadStyles(); - void nextStyle(); - void previousStyle(); - QString activeNodeStyleName(); - - -public slots: - void itemDoubleClicked(const QModelIndex &index); - void on_buttonOpenTikzstyles_clicked(); - void on_buttonRefreshTikzstyles_clicked(); - //void on_buttonApplyNodeStyle_clicked(); - -private: - void changeStyle(int increment); - - Ui::StylePalette *ui; - QStandardItemModel *_model; - -protected: - void closeEvent(QCloseEvent *event) override; -}; - -#endif // STYLEPALETTE_H diff --git a/stylepalette.ui b/stylepalette.ui deleted file mode 100644 index 3362ce2..0000000 --- a/stylepalette.ui +++ /dev/null @@ -1,120 +0,0 @@ - - - StylePalette - - - - 0 - 0 - 88 - 518 - - - - - 0 - 0 - - - - - 88 - 0 - - - - - 88 - 524287 - - - - false - - - - - - - - - - 2 - - - 0 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - New Project - - - - - - - :/images/document-open.svg:/images/document-open.svg - - - - - - - - - - - :/images/refresh.svg:/images/refresh.svg - - - - - - - - - - 0 - 0 - - - - [default] - - - - - - - - 8 - true - - - - - - - - - - - - - - - diff --git a/tikzit.pro b/tikzit.pro index 673730b..33a9ef3 100644 --- a/tikzit.pro +++ b/tikzit.pro @@ -4,11 +4,9 @@ # #------------------------------------------------- -QT += core gui +QT += core gui widgets CONFIG += testcase -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets - TARGET = tikzit TEMPLATE = app @@ -48,9 +46,11 @@ SOURCES += src/gui/mainwindow.cpp \ src/gui/undocommands.cpp \ src/gui/mainmenu.cpp \ src/util.cpp \ - stylepalette.cpp \ + src/gui/stylepalette.cpp \ src/data/tikzassembler.cpp \ - src/data/tikzstyles.cpp + src/data/tikzstyles.cpp \ + src/data/edgestyle.cpp \ + src/data/style.cpp HEADERS += src/gui/mainwindow.h \ src/gui/toolpalette.h \ @@ -72,14 +72,16 @@ HEADERS += src/gui/mainwindow.h \ src/gui/undocommands.h \ src/gui/mainmenu.h \ src/util.h \ - stylepalette.h \ + src/gui/stylepalette.h \ src/data/tikzassembler.h \ - src/data/tikzstyles.h + src/data/tikzstyles.h \ + src/data/edgestyle.h \ + src/data/style.h FORMS += src/gui/mainwindow.ui \ src/gui/propertypalette.ui \ src/gui/mainmenu.ui \ - stylepalette.ui + src/gui/stylepalette.ui INCLUDEPATH += src src/gui src/data -- cgit v1.2.3 From 10d739ce2ac904501a6f78b127f91c944a774a18 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Sun, 15 Apr 2018 11:19:38 +0300 Subject: added icon and fixed edge handle bug --- images/logo.ico | Bin 0 -> 14347 bytes src/gui/tikzscene.cpp | 11 ++++++----- tikzit.pro | 2 ++ 3 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 images/logo.ico diff --git a/images/logo.ico b/images/logo.ico new file mode 100644 index 0000000..ef92c90 Binary files /dev/null and b/images/logo.ico differ diff --git a/src/gui/tikzscene.cpp b/src/gui/tikzscene.cpp index 9b6c2d6..345d02c 100644 --- a/src/gui/tikzscene.cpp +++ b/src/gui/tikzscene.cpp @@ -97,7 +97,7 @@ void TikzScene::mousePressEvent(QGraphicsSceneMouseEvent *event) //views()[0]->setDragMode(QGraphicsView::NoDrag); // radius of a control point for bezier edges, in scene coordinates - qreal cpR = GLOBAL_SCALEF * (0.05); + qreal cpR = GLOBAL_SCALEF * (0.1); qreal cpR2 = cpR * cpR; switch (_tools->currentTool()) { @@ -511,13 +511,13 @@ void TikzScene::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) if (!_enabled) return; QPointF mousePos = event->scenePos(); - auto sel = items(mousePos); - if (!sel.isEmpty()) { - if (EdgeItem *ei = dynamic_cast(sel[0])) { + foreach (QGraphicsItem *it, items(mousePos)) { + if (EdgeItem *ei = dynamic_cast(it)) { ChangeEdgeModeCommand *cmd = new ChangeEdgeModeCommand(this, ei->edge()); _tikzDocument->undoStack()->push(cmd); - } else if (NodeItem *ni = dynamic_cast(sel[0])) { + break; + } else if (NodeItem *ni = dynamic_cast(it)) { bool ok; QString newLabel = QInputDialog::getText(views()[0], tr("Node label"), tr("Label:"), QLineEdit::Normal, @@ -528,6 +528,7 @@ void TikzScene::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) ChangeLabelCommand *cmd = new ChangeLabelCommand(this, graph(), oldLabels, newLabel); _tikzDocument->undoStack()->push(cmd); } + break; } } } diff --git a/tikzit.pro b/tikzit.pro index 33a9ef3..c30d173 100644 --- a/tikzit.pro +++ b/tikzit.pro @@ -10,6 +10,8 @@ CONFIG += testcase TARGET = tikzit TEMPLATE = app +win32:RC_ICONS += images/logo.ico + # The following define makes your compiler emit warnings if you use # any feature of Qt which as been marked as deprecated (the exact warnings # depend on your compiler). Please consult the documentation of the -- cgit v1.2.3 From 34b60b77d3f9830ddb6a0107bd65aa3c79701305 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Sun, 15 Apr 2018 12:11:19 +0300 Subject: fixed crash on paste --- src/gui/tikzscene.h | 7 ++++--- src/gui/undocommands.cpp | 5 +++-- src/gui/undocommands.h | 4 +++- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/gui/tikzscene.h b/src/gui/tikzscene.h index 634a848..9d90c4f 100644 --- a/src/gui/tikzscene.h +++ b/src/gui/tikzscene.h @@ -49,6 +49,10 @@ public: void setEnabled(bool enabled); int lineNumberForSelection(); + + void getSelection(QSet &selNodes, QSet &selEdges); + QSet getSelectedNodes(); + public slots: void graphReplaced(); @@ -80,9 +84,6 @@ private: int _oldInAngle; int _oldOutAngle; bool _enabled; - - void getSelection(QSet &selNodes, QSet &selEdges); - QSet getSelectedNodes(); }; #endif // TIKZSCENE_H diff --git a/src/gui/undocommands.cpp b/src/gui/undocommands.cpp index 6d3162c..daa2fee 100644 --- a/src/gui/undocommands.cpp +++ b/src/gui/undocommands.cpp @@ -279,7 +279,7 @@ void ApplyStyleToNodesCommand::redo() PasteCommand::PasteCommand(TikzScene *scene, Graph *graph, QUndoCommand *parent) : GraphUpdateCommand(scene, parent), _graph(graph) { - _oldSelection = scene->selectedItems(); + scene->getSelection(_oldSelectedNodes, _oldSelectedEdges); } void PasteCommand::undo() @@ -304,7 +304,8 @@ void PasteCommand::undo() _scene->graph()->removeNode(n); } - foreach (auto it, _oldSelection) it->setSelected(true); + foreach(Node *n, _oldSelectedNodes) _scene->nodeItems()[n]->setSelected(true); + foreach(Edge *e, _oldSelectedEdges) _scene->edgeItems()[e]->setSelected(true); GraphUpdateCommand::undo(); } diff --git a/src/gui/undocommands.h b/src/gui/undocommands.h index a0abb26..3f74afb 100644 --- a/src/gui/undocommands.h +++ b/src/gui/undocommands.h @@ -13,6 +13,7 @@ #include "tikzscene.h" #include +#include class GraphUpdateCommand : public QUndoCommand { public: @@ -127,7 +128,8 @@ public: void redo() override; private: Graph *_graph; - QList _oldSelection; + QSet _oldSelectedNodes; + QSet _oldSelectedEdges; }; class ChangeLabelCommand : public GraphUpdateCommand -- cgit v1.2.3 From 8ac7248513189d82fe5bdf90c0d7fc15f2e718ce Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 17 Apr 2018 11:03:24 +0300 Subject: fixed bounding box bug --- images/tikzdoc.ico | Bin 0 -> 310308 bytes images/tikzit.ico | Bin 0 -> 322831 bytes src/gui/edgeitem.cpp | 5 +++-- src/gui/nodeitem.cpp | 46 +++++++++++++++++++++++++++++++--------------- src/gui/nodeitem.h | 7 ++++--- src/gui/tikzscene.cpp | 30 ++++++++++++++++++++---------- src/gui/undocommands.cpp | 4 ++++ src/main.cpp | 5 +++++ src/tikzit.cpp | 34 ++++++++++++++++++++-------------- src/tikzit.h | 1 + tikzit.pro | 3 ++- 11 files changed, 90 insertions(+), 45 deletions(-) create mode 100644 images/tikzdoc.ico create mode 100644 images/tikzit.ico diff --git a/images/tikzdoc.ico b/images/tikzdoc.ico new file mode 100644 index 0000000..ccb1666 Binary files /dev/null and b/images/tikzdoc.ico differ diff --git a/images/tikzit.ico b/images/tikzit.ico new file mode 100644 index 0000000..e49d469 Binary files /dev/null and b/images/tikzit.ico differ diff --git a/src/gui/edgeitem.cpp b/src/gui/edgeitem.cpp index 08a5ad1..88a4e85 100644 --- a/src/gui/edgeitem.cpp +++ b/src/gui/edgeitem.cpp @@ -136,7 +136,9 @@ QPainterPath EdgeItem::path() const void EdgeItem::setPath(const QPainterPath &path) { - _path = path; + prepareGeometryChange(); + + _path = path; // get the shape of the edge, and expand a bit to make selection easier QPainterPathStroker stroker; @@ -147,6 +149,5 @@ void EdgeItem::setPath(const QPainterPath &path) float r = GLOBAL_SCALEF * (_edge->cpDist() + 0.2); _boundingRect = _path.boundingRect().adjusted(-r,-r,r,r); - prepareGeometryChange(); update(); } diff --git a/src/gui/nodeitem.cpp b/src/gui/nodeitem.cpp index 06b46ff..b0b7ea6 100644 --- a/src/gui/nodeitem.cpp +++ b/src/gui/nodeitem.cpp @@ -18,6 +18,7 @@ NodeItem::NodeItem(Node *node) //setFlag(QGraphicsItem::ItemIsMovable); //setFlag(QGraphicsItem::ItemSendsGeometryChanges); readPos(); + updateBounds(); } void NodeItem::readPos() @@ -98,27 +99,42 @@ QPainterPath NodeItem::shape() const return path; } +// TODO: nodeitem should sync boundingRect()-relevant stuff (label etc) explicitly, +// to allow prepareGeometryChange() QRectF NodeItem::boundingRect() const { - QRectF r = labelRect(); - return r.united(shape().boundingRect()).adjusted(-4,-4,4,4); + return _boundingRect; } -Node *NodeItem::node() const +void NodeItem::updateBounds() { - return _node; + prepareGeometryChange(); + QString label = _node->label(); + if (label != "") { + QFontMetrics fm(Tikzit::LABEL_FONT); + QRectF labelRect = fm.boundingRect(label); + labelRect.moveCenter(QPointF(0, 0)); + _boundingRect = labelRect.united(shape().boundingRect()).adjusted(-4, -4, 4, 4); + } else { + _boundingRect = shape().boundingRect().adjusted(-4, -4, 4, 4); + } } -QVariant NodeItem::itemChange(GraphicsItemChange change, const QVariant &value) +Node *NodeItem::node() const { - if (change == ItemPositionChange) { - QPointF newPos = value.toPointF(); - int gridSize = GLOBAL_SCALE / 8; - QPointF gridPos(round(newPos.x()/gridSize)*gridSize, round(newPos.y()/gridSize)*gridSize); - _node->setPoint(fromScreen(gridPos)); - - return gridPos; - } else { - return QGraphicsItem::itemChange(change, value); - } + return _node; } + +//QVariant NodeItem::itemChange(GraphicsItemChange change, const QVariant &value) +//{ +// if (change == ItemPositionChange) { +// QPointF newPos = value.toPointF(); +// int gridSize = GLOBAL_SCALE / 8; +// QPointF gridPos(round(newPos.x()/gridSize)*gridSize, round(newPos.y()/gridSize)*gridSize); +// _node->setPoint(fromScreen(gridPos)); +// +// return gridPos; +// } else { +// return QGraphicsItem::itemChange(change, value); +// } +//} diff --git a/src/gui/nodeitem.h b/src/gui/nodeitem.h index eb3fbb3..91b3f63 100644 --- a/src/gui/nodeitem.h +++ b/src/gui/nodeitem.h @@ -19,14 +19,15 @@ public: void readPos(); void writePos(); void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *); - QVariant itemChange(GraphicsItemChange change, const QVariant &value); - QPainterPath shape() const; - QRectF boundingRect() const; + QPainterPath shape() const override; + QRectF boundingRect() const override; + void updateBounds(); Node *node() const; private: Node *_node; QRectF labelRect() const; + QRectF _boundingRect; }; #endif // NODEITEM_H diff --git a/src/gui/tikzscene.cpp b/src/gui/tikzscene.cpp index 345d02c..40d56e7 100644 --- a/src/gui/tikzscene.cpp +++ b/src/gui/tikzscene.cpp @@ -57,15 +57,16 @@ Graph *TikzScene::graph() void TikzScene::graphReplaced() { - foreach (NodeItem *ni, _nodeItems) { + + foreach (NodeItem *ni, _nodeItems) { removeItem(ni); - delete ni; + //delete ni; } _nodeItems.clear(); foreach (EdgeItem *ei, _edgeItems) { removeItem(ei); - delete ei; + //delete ei; } _edgeItems.clear(); @@ -287,8 +288,12 @@ void TikzScene::mouseMoveEvent(QGraphicsSceneMouseEvent *event) foreach (Node *n, _oldNodePositions.keys()) { NodeItem *ni = _nodeItems[n]; - ni->setPos(toScreen(_oldNodePositions[n]) + shift); - ni->writePos(); + + // in (rare) cases, the graph can change while we are dragging + if (ni != 0) { + ni->setPos(toScreen(_oldNodePositions[n]) + shift); + ni->writePos(); + } } refreshAdjacentEdges(_oldNodePositions.keys()); @@ -711,11 +716,16 @@ void TikzScene::reloadStyles() void TikzScene::refreshAdjacentEdges(QList nodes) { if (nodes.empty()) return; - foreach (EdgeItem *ei, _edgeItems) { - if (nodes.contains(ei->edge()->source()) || nodes.contains(ei->edge()->target())) { - ei->edge()->updateControls(); - ei->readPos(); - } + foreach (Edge *e, _edgeItems.keys()) { + EdgeItem *ei = _edgeItems[e]; + + // the list "nodes" can be out of date, e.g. if the graph changes while dragging + if (ei != 0) { + if (nodes.contains(ei->edge()->source()) || nodes.contains(ei->edge()->target())) { + ei->edge()->updateControls(); + ei->readPos(); + } + } } } diff --git a/src/gui/undocommands.cpp b/src/gui/undocommands.cpp index daa2fee..baa8c0e 100644 --- a/src/gui/undocommands.cpp +++ b/src/gui/undocommands.cpp @@ -341,6 +341,8 @@ void ChangeLabelCommand::undo() { foreach (Node *n, _oldLabels.keys()) { n->setLabel(_oldLabels[n]); + NodeItem *ni = _scene->nodeItems()[n]; + if (ni != 0) ni->updateBounds(); } GraphUpdateCommand::undo(); @@ -350,6 +352,8 @@ void ChangeLabelCommand::redo() { foreach (Node *n, _oldLabels.keys()) { n->setLabel(_newLabel); + NodeItem *ni = _scene->nodeItems()[n]; + if (ni != 0) ni->updateBounds(); } GraphUpdateCommand::redo(); diff --git a/src/main.cpp b/src/main.cpp index b15840d..3532888 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -20,5 +20,10 @@ int main(int argc, char *argv[]) a.setQuitOnLastWindowClosed(false); tikzit = new Tikzit(); tikzit->init(&a); + + if (a.arguments().length() > 1) { + tikzit->open(a.arguments()[1]); + } + return a.exec(); } diff --git a/src/tikzit.cpp b/src/tikzit.cpp index a55473e..dca6d95 100644 --- a/src/tikzit.cpp +++ b/src/tikzit.cpp @@ -91,20 +91,26 @@ void Tikzit::open() settings.value("previous-file-path").toString(), tr("TiKZ Files (*.tikz)")); - if (!fileName.isEmpty()) { - if (_windows.size() == 1 && - _windows[0]->tikzDocument()->isClean() && - _windows[0]->tikzDocument()->shortName().isEmpty()) - { - _windows[0]->open(fileName); - _windows[0]->show(); - } else { - MainWindow *w = new MainWindow(); - w->show(); - w->open(fileName); - _windows << w; - } - } + open(fileName); +} + +void Tikzit::open(QString fileName) +{ + if (!fileName.isEmpty()) { + if (_windows.size() == 1 && + _windows[0]->tikzDocument()->isClean() && + _windows[0]->tikzDocument()->shortName().isEmpty()) + { + _windows[0]->open(fileName); + _windows[0]->show(); + } + else { + MainWindow *w = new MainWindow(); + w->show(); + w->open(fileName); + _windows << w; + } + } } void Tikzit::openTikzStyles() { diff --git a/src/tikzit.h b/src/tikzit.h index 6a191b5..5ae9490 100644 --- a/src/tikzit.h +++ b/src/tikzit.h @@ -91,6 +91,7 @@ public: void newDoc(); void open(); + void open(QString fileName); void quit(); void init(QApplication *app); diff --git a/tikzit.pro b/tikzit.pro index c30d173..f933af7 100644 --- a/tikzit.pro +++ b/tikzit.pro @@ -10,7 +10,8 @@ CONFIG += testcase TARGET = tikzit TEMPLATE = app -win32:RC_ICONS += images/logo.ico +win32:RC_ICONS += images/tikzit.ico +win32:RC_ICONS += images/tikzdoc.ico # The following define makes your compiler emit warnings if you use # any feature of Qt which as been marked as deprecated (the exact warnings -- cgit v1.2.3 From a791a440354845621108b999556ff671016c5886 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 17 Apr 2018 18:17:28 +0200 Subject: cleaning up node/edge items again --- src/gui/tikzscene.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/tikzscene.cpp b/src/gui/tikzscene.cpp index 40d56e7..bc55ada 100644 --- a/src/gui/tikzscene.cpp +++ b/src/gui/tikzscene.cpp @@ -60,13 +60,13 @@ void TikzScene::graphReplaced() foreach (NodeItem *ni, _nodeItems) { removeItem(ni); - //delete ni; + delete ni; } _nodeItems.clear(); foreach (EdgeItem *ei, _edgeItems) { removeItem(ei); - //delete ei; + delete ei; } _edgeItems.clear(); -- cgit v1.2.3 From 9dd19037afd93d879ec32c5191314196f7f50592 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 17 Apr 2018 18:18:54 +0200 Subject: ignore rc files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index c419805..8734edf 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ debug release *.vcxproj* *.sln +*.rc x64 target_wrapper.bat .qmake.stash -- cgit v1.2.3 From b00c5250d7a56b6d20980d89cf331a114fdfdee0 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Sat, 21 Apr 2018 22:53:05 +0200 Subject: edge styles 90 percent --- src/data/edge.cpp | 68 +++++++++-- src/data/edge.h | 16 +++ src/data/edgestyle.cpp | 6 +- src/gui/edgeitem.cpp | 56 ++++++++- src/gui/edgeitem.h | 2 + src/gui/stylepalette.cpp | 11 ++ src/gui/stylepalette.h | 1 + src/gui/tikzscene.cpp | 7 ++ src/gui/undocommands.cpp | 39 +++++- src/gui/undocommands.h | 11 ++ tikzlexer.h | 308 +++++++++++++++++++++++++++++++++++++---------- 11 files changed, 444 insertions(+), 81 deletions(-) diff --git a/src/data/edge.cpp b/src/data/edge.cpp index d0f0deb..a18c8ea 100644 --- a/src/data/edge.cpp +++ b/src/data/edge.cpp @@ -16,6 +16,7 @@ Edge::Edge(Node *s, Node *t, QObject *parent) : _inAngle = 0; _outAngle = 0; _weight = 0.4f; + _style = noneEdgeStyle; updateControls(); } @@ -43,6 +44,7 @@ Edge *Edge::copy(QMap *nodeTable) e->setInAngle(_inAngle); e->setOutAngle(_outAngle); e->setWeight(_weight); + e->attachStyle(); e->updateControls(); return e; } @@ -79,6 +81,19 @@ void Edge::setData(GraphElementData *data) setAttributesFromData(); } +QString Edge::styleName() const +{ + QString nm = _data->property("style"); + if (nm.isNull()) return "none"; + else return nm; +} + +void Edge::setStyleName(const QString &styleName) +{ + if (!styleName.isNull() && styleName != "none") _data->setProperty("style", styleName); + else _data->unsetProperty("style"); +} + QString Edge::sourceAnchor() const { return _sourceAnchor; @@ -142,15 +157,15 @@ void Edge::updateControls() { if (_source->style()->isNone()) { _tail = src; } else { - _tail = QPointF(src.x() + std::cos(outAngleR) * 0.1, - src.y() + std::sin(outAngleR) * 0.1); + _tail = QPointF(src.x() + std::cos(outAngleR) * 0.2, + src.y() + std::sin(outAngleR) * 0.2); } if (_target->style()->isNone()) { _head = targ; } else { - _head = QPointF(targ.x() + std::cos(inAngleR) * 0.1, - targ.y() + std::sin(inAngleR) * 0.1); + _head = QPointF(targ.x() + std::cos(inAngleR) * 0.2, + targ.y() + std::sin(inAngleR) * 0.2); } // give a default distance for self-loops @@ -163,12 +178,8 @@ void Edge::updateControls() { targ.y() + (_cpDist * std::sin(inAngleR))); _mid = bezierInterpolateFull (0.5f, _tail, _cp1, _cp2, _head); -// midTan = [self _findTanFor:mid usingSpanFrom:0.4f to:0.6f]; - -// tailTan = [self _findTanFor:tail usingSpanFrom:0.0f to:0.1f]; -// headTan = [self _findTanFor:head usingSpanFrom:1.0f to:0.9f]; - //_dirty = false; - //} + _tailTangent = bezierTangent(0.0f, 0.1f); + _headTangent = bezierTangent(1.0f, 0.9f); } void Edge::setAttributesFromData() @@ -344,4 +355,41 @@ QPointF Edge::mid() const return _mid; } +QPointF Edge::headTangent() const +{ + return _headTangent; +} + +QPointF Edge::tailTangent() const +{ + return _tailTangent; +} + +void Edge::attachStyle() +{ + QString nm = styleName(); + if (nm.isNull()) _style = noneEdgeStyle; + else _style = tikzit->styles()->edgeStyle(nm); +} +EdgeStyle * Edge::style() const +{ + return _style; +} + +QPointF Edge::bezierTangent(float start, float end) const +{ + float dx = bezierInterpolate(end, _tail.x(), _cp1.x(), _cp2.x(), _head.x()) - + bezierInterpolate(start, _tail.x(), _cp1.x(), _cp2.x(), _head.x()); + float dy = bezierInterpolate(end, _tail.y(), _cp1.y(), _cp2.y(), _head.y()) - + bezierInterpolate(start, _tail.y(), _cp1.y(), _cp2.y(), _head.y()); + + // normalise + float len = sqrt(dx*dx + dy * dy); + if (len != 0) { + dx = (dx / len) * 0.1f; + dy = (dy / len) * 0.1f; + } + + return QPointF(dx, dy); +} diff --git a/src/data/edge.h b/src/data/edge.h index 7df899f..3dc0211 100644 --- a/src/data/edge.h +++ b/src/data/edge.h @@ -3,6 +3,7 @@ #include "graphelementdata.h" #include "node.h" +#include "edgestyle.h" #include #include @@ -43,6 +44,8 @@ public: QPointF cp1() const; QPointF cp2() const; QPointF mid() const; + QPointF headTangent() const; + QPointF tailTangent() const; int bend() const; int inAngle() const; @@ -60,11 +63,18 @@ public: int tikzLine() const; void setTikzLine(int tikzLine); + + void attachStyle(); + QString styleName() const; + void setStyleName(const QString & styleName); + EdgeStyle *style() const; + signals: public slots: private: + QPointF bezierTangent(float start, float end) const; QString _sourceAnchor; QString _targetAnchor; @@ -76,6 +86,9 @@ private: Node *_source; Node *_target; + + EdgeStyle *_style; + bool _dirty; bool _basicBendMode; int _bend; @@ -90,6 +103,9 @@ private: QPointF _cp2; QPointF _mid; + QPointF _headTangent; + QPointF _tailTangent; + int _tikzLine; }; diff --git a/src/data/edgestyle.cpp b/src/data/edgestyle.cpp index d366946..9fb2638 100644 --- a/src/data/edgestyle.cpp +++ b/src/data/edgestyle.cpp @@ -41,7 +41,7 @@ EdgeStyle::DrawStyle EdgeStyle::drawStyle() const QPen EdgeStyle::pen() const { QPen p(strokeColor()); - p.setWidthF((float)strokeThickness() * 3.0f); + p.setWidthF((float)strokeThickness() * 2.0f); QVector pat; switch (drawStyle()) { @@ -84,6 +84,10 @@ QIcon EdgeStyle::icon() const painter.drawLine(10, 50, 90, 50); + QPen pn = pen(); + pn.setStyle(Qt::SolidLine); + painter.setPen(pn); + switch (arrowHead()) { case Pointer: painter.drawLine(90,50,80,40); diff --git a/src/gui/edgeitem.cpp b/src/gui/edgeitem.cpp index 88a4e85..de51db3 100644 --- a/src/gui/edgeitem.cpp +++ b/src/gui/edgeitem.cpp @@ -50,12 +50,61 @@ void EdgeItem::readPos() void EdgeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) { //QGraphicsPathItem::paint(painter, option, widget); - QPen pen(Qt::black); - pen.setWidth(2); - painter->setPen(pen); + QPen pen = _edge->style()->pen(); + painter->setPen(pen); painter->setBrush(Qt::NoBrush); painter->drawPath(path()); + QPointF ht = _edge->headTangent(); + QPointF hLeft(-ht.y(), ht.x()); + QPointF hRight(ht.y(), -ht.x()); + QPointF tt = _edge->tailTangent(); + QPointF tLeft(-ht.y(), ht.x()); + QPointF tRight(ht.y(), -ht.x()); + + pen.setStyle(Qt::SolidLine); + painter->setPen(pen); + + + + switch (_edge->style()->arrowHead()) { + case EdgeStyle::Flat: + { + painter->drawLine( + toScreen(_edge->head() + hLeft), + toScreen(_edge->head() + hRight)); + break; + } + case EdgeStyle::Pointer: + { + QPainterPath pth; + pth.moveTo(toScreen(_edge->head() + ht + hLeft)); + pth.lineTo(toScreen(_edge->head())); + pth.lineTo(toScreen(_edge->head() + ht + hRight)); + painter->drawPath(pth); + break; + } + } + + switch (_edge->style()->arrowTail()) { + case EdgeStyle::Flat: + { + painter->drawLine( + toScreen(_edge->tail() + tLeft), + toScreen(_edge->tail() + tRight)); + break; + } + case EdgeStyle::Pointer: + { + QPainterPath pth; + pth.moveTo(toScreen(_edge->tail() + tt + tLeft)); + pth.lineTo(toScreen(_edge->tail())); + pth.lineTo(toScreen(_edge->tail() + tt + tRight)); + painter->drawPath(pth); + break; + } + } + if (isSelected()) { QColor draw; QColor draw1; @@ -151,3 +200,4 @@ void EdgeItem::setPath(const QPainterPath &path) update(); } + diff --git a/src/gui/edgeitem.h b/src/gui/edgeitem.h index 5641912..948f137 100644 --- a/src/gui/edgeitem.h +++ b/src/gui/edgeitem.h @@ -13,6 +13,7 @@ #include #include #include +#include class EdgeItem : public QGraphicsItem { @@ -30,6 +31,7 @@ public: QPainterPath path() const; void setPath(const QPainterPath &path); + private: Edge *_edge; QPainterPath _path; diff --git a/src/gui/stylepalette.cpp b/src/gui/stylepalette.cpp index f7c17c0..f1462df 100644 --- a/src/gui/stylepalette.cpp +++ b/src/gui/stylepalette.cpp @@ -114,6 +114,17 @@ QString StylePalette::activeNodeStyleName() } } +QString StylePalette::activeEdgeStyleName() +{ + const QModelIndexList i = ui->edgeStyleListView->selectionModel()->selectedIndexes(); + + if (i.isEmpty()) { + return "none"; + } else { + return i[0].data().toString(); + } +} + void StylePalette::nodeStyleDoubleClicked(const QModelIndex &index) { tikzit->activeWindow()->tikzScene()->applyActiveStyleToNodes(); diff --git a/src/gui/stylepalette.h b/src/gui/stylepalette.h index 8663cc4..cc8fb73 100644 --- a/src/gui/stylepalette.h +++ b/src/gui/stylepalette.h @@ -19,6 +19,7 @@ public: void nextNodeStyle(); void previousNodeStyle(); QString activeNodeStyleName(); + QString activeEdgeStyleName(); public slots: diff --git a/src/gui/tikzscene.cpp b/src/gui/tikzscene.cpp index bc55ada..3c8fb71 100644 --- a/src/gui/tikzscene.cpp +++ b/src/gui/tikzscene.cpp @@ -71,6 +71,7 @@ void TikzScene::graphReplaced() _edgeItems.clear(); foreach (Edge *e, graph()->edges()) { + e->attachStyle(); EdgeItem *ei = new EdgeItem(e); _edgeItems.insert(e, ei); addItem(ei); @@ -420,6 +421,7 @@ void TikzScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) case ToolPalette::EDGE: if (_edgeStartNodeItem != 0 && _edgeEndNodeItem != 0) { Edge *e = new Edge(_edgeStartNodeItem->node(), _edgeEndNodeItem->node(), _tikzDocument); + e->setStyleName(_styles->activeEdgeStyleName()); AddEdgeCommand *cmd = new AddEdgeCommand(this, e); _tikzDocument->undoStack()->push(cmd); } @@ -687,6 +689,11 @@ void TikzScene::setTikzDocument(TikzDocument *tikzDocument) void TikzScene::reloadStyles() { _styles->reloadStyles(); + foreach(EdgeItem *ei, _edgeItems) { + ei->edge()->attachStyle(); + ei->readPos(); // trigger a repaint + } + foreach (NodeItem *ni, _nodeItems) { ni->node()->attachStyle(); ni->readPos(); // trigger a repaint diff --git a/src/gui/undocommands.cpp b/src/gui/undocommands.cpp index baa8c0e..5ce6941 100644 --- a/src/gui/undocommands.cpp +++ b/src/gui/undocommands.cpp @@ -130,6 +130,7 @@ void DeleteCommand::undo() for (auto it = _deleteEdges.begin(); it != _deleteEdges.end(); ++it) { Edge *e = it.value(); + e->attachStyle(); _scene->graph()->addEdge(e, it.key()); EdgeItem *ei = new EdgeItem(e); _scene->edgeItems().insert(e, ei); @@ -185,7 +186,7 @@ void AddNodeCommand::undo() void AddNodeCommand::redo() { - _node->attachStyle(); // in case styles have changed + _node->attachStyle(); // do for every redo, in case styles have changed _scene->graph()->addNode(_node); NodeItem *ni = new NodeItem(_node); _scene->nodeItems().insert(_node, ni); @@ -214,12 +215,13 @@ void AddEdgeCommand::undo() void AddEdgeCommand::redo() { - // TODO: get the current style + _edge->attachStyle(); // do for every redo, in case styles have changed _scene->graph()->addEdge(_edge); EdgeItem *ei = new EdgeItem(_edge); _scene->edgeItems().insert(_edge, ei); _scene->addItem(ei); + // TODO: deal consistently with stacking order // edges should always be stacked below nodes if (!_scene->graph()->nodes().isEmpty()) { ei->stackBefore(_scene->nodeItems()[_scene->graph()->nodes().first()]); @@ -235,7 +237,8 @@ ChangeEdgeModeCommand::ChangeEdgeModeCommand(TikzScene *scene, Edge *edge, QUndo void ChangeEdgeModeCommand::undo() { - _edge->setBasicBendMode(!_edge->basicBendMode()); + // FIXME: this act strangely sometimes + _edge->setBasicBendMode(!_edge->basicBendMode()); _scene->edgeItems()[_edge]->readPos(); GraphUpdateCommand::undo(); } @@ -276,6 +279,35 @@ void ApplyStyleToNodesCommand::redo() GraphUpdateCommand::redo(); } +ApplyStyleToEdgesCommand::ApplyStyleToEdgesCommand(TikzScene *scene, QString style, QUndoCommand *parent) : + GraphUpdateCommand(scene, parent), _style(style), _oldStyles() +{ + foreach(QGraphicsItem *it, scene->selectedItems()) { + if (EdgeItem *ei = dynamic_cast(it)) { + _oldStyles.insert(ei->edge(), ei->edge()->styleName()); + } + } +} + +void ApplyStyleToEdgesCommand::undo() +{ + foreach(Edge *e, _oldStyles.keys()) { + e->setStyleName(_oldStyles[e]); + e->attachStyle(); + } + + GraphUpdateCommand::undo(); +} + +void ApplyStyleToEdgesCommand::redo() +{ + foreach(Edge *e, _oldStyles.keys()) { + e->setStyleName(_style); + e->attachStyle(); + } + GraphUpdateCommand::redo(); +} + PasteCommand::PasteCommand(TikzScene *scene, Graph *graph, QUndoCommand *parent) : GraphUpdateCommand(scene, parent), _graph(graph) { @@ -316,6 +348,7 @@ void PasteCommand::redo() _scene->graph()->insertGraph(_graph); foreach (Edge *e, _graph->edges()) { + e->attachStyle(); // in case styles have changed EdgeItem *ei = new EdgeItem(e); _scene->edgeItems().insert(e, ei); _scene->addItem(ei); diff --git a/src/gui/undocommands.h b/src/gui/undocommands.h index 3f74afb..ad76479 100644 --- a/src/gui/undocommands.h +++ b/src/gui/undocommands.h @@ -120,6 +120,17 @@ private: QMap _oldStyles; }; +class ApplyStyleToEdgesCommand : public GraphUpdateCommand +{ +public: + explicit ApplyStyleToEdgesCommand(TikzScene *scene, QString style, QUndoCommand *parent = 0); + void undo() override; + void redo() override; +private: + QString _style; + QMap _oldStyles; +}; + class PasteCommand : public GraphUpdateCommand { public: diff --git a/tikzlexer.h b/tikzlexer.h index dea6836..d461581 100644 --- a/tikzlexer.h +++ b/tikzlexer.h @@ -2,9 +2,9 @@ #define yyHEADER_H 1 #define yyIN_HEADER 1 -#line 6 "tikzlexer.h" +#line 5 "tikzlexer.h" -#line 8 "tikzlexer.h" +#line 7 "tikzlexer.h" #define YY_INT_ALIGNED short int @@ -12,12 +12,36 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 35 +#define YY_FLEX_MINOR_VERSION 6 +#define YY_FLEX_SUBMINOR_VERSION 4 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif +#ifdef yyget_lval +#define yyget_lval_ALREADY_DEFINED +#else +#define yyget_lval yyget_lval +#endif + +#ifdef yyset_lval +#define yyset_lval_ALREADY_DEFINED +#else +#define yyset_lval yyset_lval +#endif + +#ifdef yyget_lloc +#define yyget_lloc_ALREADY_DEFINED +#else +#define yyget_lloc yyget_lloc +#endif + +#ifdef yyset_lloc +#define yyset_lloc_ALREADY_DEFINED +#else +#define yyset_lloc yyset_lloc +#endif + /* First, we deal with platform-specific or compiler-specific issues. */ /* begin standard C headers. */ @@ -51,7 +75,6 @@ typedef int16_t flex_int16_t; typedef uint16_t flex_uint16_t; typedef int32_t flex_int32_t; typedef uint32_t flex_uint32_t; -typedef uint64_t flex_uint64_t; #else typedef signed char flex_int8_t; typedef short int flex_int16_t; @@ -59,7 +82,6 @@ typedef int flex_int32_t; typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; -#endif /* ! C99 */ /* Limits of integral types. */ #ifndef INT8_MIN @@ -90,27 +112,23 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif -#endif /* ! FLEXINT_H */ - -#ifdef __cplusplus - -/* The "const" storage-class-modifier is valid. */ -#define YY_USE_CONST - -#else /* ! __cplusplus */ +#ifndef SIZE_MAX +#define SIZE_MAX (~(size_t)0) +#endif -/* C99 requires __STDC__ to be defined as 1. */ -#if defined (__STDC__) +#endif /* ! C99 */ -#define YY_USE_CONST +#endif /* ! FLEXINT_H */ -#endif /* defined (__STDC__) */ -#endif /* ! __cplusplus */ +/* begin standard C++ headers. */ -#ifdef YY_USE_CONST +/* TODO: this is always defined, so inline it */ #define yyconst const + +#if defined(__GNUC__) && __GNUC__ >= 3 +#define yynoreturn __attribute__((__noreturn__)) #else -#define yyconst +#define yynoreturn #endif /* An opaque pointer. */ @@ -132,7 +150,15 @@ typedef void* yyscan_t; /* Size of default input buffer. */ #ifndef YY_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k. + * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. + * Ditto for the __ia64__ case accordingly. + */ +#define YY_BUF_SIZE 32768 +#else #define YY_BUF_SIZE 16384 +#endif /* __ia64__ */ #endif #ifndef YY_TYPEDEF_YY_BUFFER_STATE @@ -157,12 +183,12 @@ struct yy_buffer_state /* Size of input buffer in bytes, not including room for EOB * characters. */ - yy_size_t yy_buf_size; + int yy_buf_size; /* Number of characters read into yy_ch_buf, not including EOB * characters. */ - yy_size_t yy_n_chars; + int yy_n_chars; /* Whether we "own" the buffer - i.e., we know we created it, * and can realloc() it to grow it, and should free() it to @@ -185,7 +211,7 @@ struct yy_buffer_state int yy_bs_lineno; /**< The line count. */ int yy_bs_column; /**< The column count. */ - + /* Whether to try to fill the input buffer when we reach the * end of it. */ @@ -196,23 +222,23 @@ struct yy_buffer_state }; #endif /* !YY_STRUCT_YY_BUFFER_STATE */ -void yyrestart (FILE *input_file ,yyscan_t yyscanner ); -void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); -YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ,yyscan_t yyscanner ); -void yy_delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); -void yy_flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); -void yypush_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); -void yypop_buffer_state (yyscan_t yyscanner ); +void yyrestart ( FILE *input_file , yyscan_t yyscanner ); +void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size , yyscan_t yyscanner ); +void yy_delete_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); +void yy_flush_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); +void yypush_buffer_state ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); +void yypop_buffer_state ( yyscan_t yyscanner ); -YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner ); -YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ,yyscan_t yyscanner ); -YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len ,yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_string ( const char *yy_str , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len , yyscan_t yyscanner ); -void *yyalloc (yy_size_t ,yyscan_t yyscanner ); -void *yyrealloc (void *,yy_size_t ,yyscan_t yyscanner ); -void yyfree (void * ,yyscan_t yyscanner ); +void *yyalloc ( yy_size_t , yyscan_t yyscanner ); +void *yyrealloc ( void *, yy_size_t , yyscan_t yyscanner ); +void yyfree ( void * , yyscan_t yyscanner ); -#define yywrap(n) 1 +#define yywrap(yyscanner) (/*CONSTCOND*/1) #define YY_SKIP_YYWRAP #define yytext_ptr yytext_r @@ -233,49 +259,53 @@ void yyfree (void * ,yyscan_t yyscanner ); */ #include #endif - + #define YY_EXTRA_TYPE TikzAssembler * int yylex_init (yyscan_t* scanner); -int yylex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner); +int yylex_init_extra ( YY_EXTRA_TYPE user_defined, yyscan_t* scanner); /* Accessor methods to globals. These are made visible to non-reentrant scanners for convenience. */ -int yylex_destroy (yyscan_t yyscanner ); +int yylex_destroy ( yyscan_t yyscanner ); + +int yyget_debug ( yyscan_t yyscanner ); + +void yyset_debug ( int debug_flag , yyscan_t yyscanner ); -int yyget_debug (yyscan_t yyscanner ); +YY_EXTRA_TYPE yyget_extra ( yyscan_t yyscanner ); -void yyset_debug (int debug_flag ,yyscan_t yyscanner ); +void yyset_extra ( YY_EXTRA_TYPE user_defined , yyscan_t yyscanner ); -YY_EXTRA_TYPE yyget_extra (yyscan_t yyscanner ); +FILE *yyget_in ( yyscan_t yyscanner ); -void yyset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner ); +void yyset_in ( FILE * _in_str , yyscan_t yyscanner ); -FILE *yyget_in (yyscan_t yyscanner ); +FILE *yyget_out ( yyscan_t yyscanner ); -void yyset_in (FILE * in_str ,yyscan_t yyscanner ); +void yyset_out ( FILE * _out_str , yyscan_t yyscanner ); -FILE *yyget_out (yyscan_t yyscanner ); + int yyget_leng ( yyscan_t yyscanner ); -void yyset_out (FILE * out_str ,yyscan_t yyscanner ); +char *yyget_text ( yyscan_t yyscanner ); -yy_size_t yyget_leng (yyscan_t yyscanner ); +int yyget_lineno ( yyscan_t yyscanner ); -char *yyget_text (yyscan_t yyscanner ); +void yyset_lineno ( int _line_number , yyscan_t yyscanner ); -int yyget_lineno (yyscan_t yyscanner ); +int yyget_column ( yyscan_t yyscanner ); -void yyset_lineno (int line_number ,yyscan_t yyscanner ); +void yyset_column ( int _column_no , yyscan_t yyscanner ); -YYSTYPE * yyget_lval (yyscan_t yyscanner ); +YYSTYPE * yyget_lval ( yyscan_t yyscanner ); -void yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner ); +void yyset_lval ( YYSTYPE * yylval_param , yyscan_t yyscanner ); - YYLTYPE *yyget_lloc (yyscan_t yyscanner ); + YYLTYPE *yyget_lloc ( yyscan_t yyscanner ); - void yyset_lloc (YYLTYPE * yylloc_param ,yyscan_t yyscanner ); + void yyset_lloc ( YYLTYPE * yylloc_param , yyscan_t yyscanner ); /* Macros after this point can all be overridden by user definitions in * section 1. @@ -283,18 +313,18 @@ void yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner ); #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int yywrap (yyscan_t yyscanner ); +extern "C" int yywrap ( yyscan_t yyscanner ); #else -extern int yywrap (yyscan_t yyscanner ); +extern int yywrap ( yyscan_t yyscanner ); #endif #endif #ifndef yytext_ptr -static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner); +static void yy_flex_strncpy ( char *, const char *, int , yyscan_t yyscanner); #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner); +static int yy_flex_strlen ( const char * , yyscan_t yyscanner); #endif #ifndef YY_NO_INPUT @@ -303,7 +333,12 @@ static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner); /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k */ +#define YY_READ_BUF_SIZE 16384 +#else #define YY_READ_BUF_SIZE 8192 +#endif /* __ia64__ */ #endif /* Number of entries by which start-condition stack grows. */ @@ -318,7 +353,7 @@ static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner); #define YY_DECL_IS_OURS 1 extern int yylex \ - (YYSTYPE * yylval_param,YYLTYPE * yylloc_param ,yyscan_t yyscanner); + (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner); #define YY_DECL int yylex \ (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner) @@ -338,8 +373,153 @@ extern int yylex \ #undef YY_DECL #endif -#line 190 "src/data/tikzlexer.l" +#ifndef yy_create_buffer_ALREADY_DEFINED +#undef yy_create_buffer +#endif +#ifndef yy_delete_buffer_ALREADY_DEFINED +#undef yy_delete_buffer +#endif +#ifndef yy_scan_buffer_ALREADY_DEFINED +#undef yy_scan_buffer +#endif +#ifndef yy_scan_string_ALREADY_DEFINED +#undef yy_scan_string +#endif +#ifndef yy_scan_bytes_ALREADY_DEFINED +#undef yy_scan_bytes +#endif +#ifndef yy_init_buffer_ALREADY_DEFINED +#undef yy_init_buffer +#endif +#ifndef yy_flush_buffer_ALREADY_DEFINED +#undef yy_flush_buffer +#endif +#ifndef yy_load_buffer_state_ALREADY_DEFINED +#undef yy_load_buffer_state +#endif +#ifndef yy_switch_to_buffer_ALREADY_DEFINED +#undef yy_switch_to_buffer +#endif +#ifndef yypush_buffer_state_ALREADY_DEFINED +#undef yypush_buffer_state +#endif +#ifndef yypop_buffer_state_ALREADY_DEFINED +#undef yypop_buffer_state +#endif +#ifndef yyensure_buffer_stack_ALREADY_DEFINED +#undef yyensure_buffer_stack +#endif +#ifndef yylex_ALREADY_DEFINED +#undef yylex +#endif +#ifndef yyrestart_ALREADY_DEFINED +#undef yyrestart +#endif +#ifndef yylex_init_ALREADY_DEFINED +#undef yylex_init +#endif +#ifndef yylex_init_extra_ALREADY_DEFINED +#undef yylex_init_extra +#endif +#ifndef yylex_destroy_ALREADY_DEFINED +#undef yylex_destroy +#endif +#ifndef yyget_debug_ALREADY_DEFINED +#undef yyget_debug +#endif +#ifndef yyset_debug_ALREADY_DEFINED +#undef yyset_debug +#endif +#ifndef yyget_extra_ALREADY_DEFINED +#undef yyget_extra +#endif +#ifndef yyset_extra_ALREADY_DEFINED +#undef yyset_extra +#endif +#ifndef yyget_in_ALREADY_DEFINED +#undef yyget_in +#endif +#ifndef yyset_in_ALREADY_DEFINED +#undef yyset_in +#endif +#ifndef yyget_out_ALREADY_DEFINED +#undef yyget_out +#endif +#ifndef yyset_out_ALREADY_DEFINED +#undef yyset_out +#endif +#ifndef yyget_leng_ALREADY_DEFINED +#undef yyget_leng +#endif +#ifndef yyget_text_ALREADY_DEFINED +#undef yyget_text +#endif +#ifndef yyget_lineno_ALREADY_DEFINED +#undef yyget_lineno +#endif +#ifndef yyset_lineno_ALREADY_DEFINED +#undef yyset_lineno +#endif +#ifndef yyget_column_ALREADY_DEFINED +#undef yyget_column +#endif +#ifndef yyset_column_ALREADY_DEFINED +#undef yyset_column +#endif +#ifndef yywrap_ALREADY_DEFINED +#undef yywrap +#endif +#ifndef yyget_lval_ALREADY_DEFINED +#undef yyget_lval +#endif +#ifndef yyset_lval_ALREADY_DEFINED +#undef yyset_lval +#endif +#ifndef yyget_lloc_ALREADY_DEFINED +#undef yyget_lloc +#endif +#ifndef yyset_lloc_ALREADY_DEFINED +#undef yyset_lloc +#endif +#ifndef yyalloc_ALREADY_DEFINED +#undef yyalloc +#endif +#ifndef yyrealloc_ALREADY_DEFINED +#undef yyrealloc +#endif +#ifndef yyfree_ALREADY_DEFINED +#undef yyfree +#endif +#ifndef yytext_ALREADY_DEFINED +#undef yytext +#endif +#ifndef yyleng_ALREADY_DEFINED +#undef yyleng +#endif +#ifndef yyin_ALREADY_DEFINED +#undef yyin +#endif +#ifndef yyout_ALREADY_DEFINED +#undef yyout +#endif +#ifndef yy_flex_debug_ALREADY_DEFINED +#undef yy_flex_debug +#endif +#ifndef yylineno_ALREADY_DEFINED +#undef yylineno +#endif +#ifndef yytables_fload_ALREADY_DEFINED +#undef yytables_fload +#endif +#ifndef yytables_destroy_ALREADY_DEFINED +#undef yytables_destroy +#endif +#ifndef yyTABLES_NAME_ALREADY_DEFINED +#undef yyTABLES_NAME +#endif + +#line 192 "src\\data\\tikzlexer.l" -#line 344 "tikzlexer.h" +#line 523 "tikzlexer.h" #undef yyIN_HEADER #endif /* yyHEADER_H */ -- cgit v1.2.3 From f83ee82a6170845e6207aad19d6bd096db89f4c7 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Sun, 22 Apr 2018 10:53:39 +0200 Subject: edge styles done --- src/gui/stylepalette.cpp | 4 +++- src/gui/tikzscene.cpp | 5 +++++ src/gui/tikzscene.h | 1 + src/gui/undocommands.cpp | 6 +++++- src/main.cpp | 4 ++-- 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/gui/stylepalette.cpp b/src/gui/stylepalette.cpp index 6d6599b..04d0ba6 100644 --- a/src/gui/stylepalette.cpp +++ b/src/gui/stylepalette.cpp @@ -56,6 +56,7 @@ StylePalette::StylePalette(QWidget *parent) : reloadStyles(); connect(ui->styleListView, SIGNAL(doubleClicked(const QModelIndex &)), this, SLOT( nodeStyleDoubleClicked(const QModelIndex&)) ); + connect(ui->edgeStyleListView, SIGNAL(doubleClicked(const QModelIndex &)), this, SLOT(edgeStyleDoubleClicked(const QModelIndex&))); } StylePalette::~StylePalette() @@ -150,7 +151,8 @@ void StylePalette::nodeStyleDoubleClicked(const QModelIndex &index) void StylePalette::edgeStyleDoubleClicked(const QModelIndex &index) { - // TODO + qDebug() << "got double click"; + tikzit->activeWindow()->tikzScene()->applyActiveStyleToEdges(); } void StylePalette::on_buttonOpenTikzstyles_clicked() diff --git a/src/gui/tikzscene.cpp b/src/gui/tikzscene.cpp index 772c67b..f25ebe1 100644 --- a/src/gui/tikzscene.cpp +++ b/src/gui/tikzscene.cpp @@ -584,6 +584,11 @@ void TikzScene::applyActiveStyleToNodes() { _tikzDocument->undoStack()->push(cmd); } +void TikzScene::applyActiveStyleToEdges() { + ApplyStyleToEdgesCommand *cmd = new ApplyStyleToEdgesCommand(this, _styles->activeEdgeStyleName()); + _tikzDocument->undoStack()->push(cmd); +} + void TikzScene::deleteSelectedItems() { QSet selNodes; diff --git a/src/gui/tikzscene.h b/src/gui/tikzscene.h index 4ac56c7..b6b2560 100644 --- a/src/gui/tikzscene.h +++ b/src/gui/tikzscene.h @@ -56,6 +56,7 @@ public: void reloadStyles(); //void refreshSceneBounds(); void applyActiveStyleToNodes(); + void applyActiveStyleToEdges(); void deleteSelectedItems(); void copyToClipboard(); void cutToClipboard(); diff --git a/src/gui/undocommands.cpp b/src/gui/undocommands.cpp index 5525cb7..c8221fe 100644 --- a/src/gui/undocommands.cpp +++ b/src/gui/undocommands.cpp @@ -284,6 +284,7 @@ void ApplyStyleToNodesCommand::undo() n->setStyleName(_oldStyles[n]); n->attachStyle(); } + _scene->refreshAdjacentEdges(_oldStyles.keys()); GraphUpdateCommand::undo(); } @@ -294,10 +295,13 @@ void ApplyStyleToNodesCommand::redo() n->setStyleName(_style); n->attachStyle(); } + _scene->refreshAdjacentEdges(_oldStyles.keys()); + GraphUpdateCommand::redo(); } -ApplyStyleToEdgesCommand::ApplyStyleToEdgesCommand(TikzScene *scene, QString style, QUndoCommand *parent) : + +ApplyStyleToEdgesCommand::ApplyStyleToEdgesCommand(TikzScene * scene, QString style, QUndoCommand * parent) : GraphUpdateCommand(scene, parent), _style(style), _oldStyles() { foreach(QGraphicsItem *it, scene->selectedItems()) { diff --git a/src/main.cpp b/src/main.cpp index 4d6f9a7..699fbb0 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -41,8 +41,8 @@ int main(int argc, char *argv[]) tikzit->init(&a); if (a.arguments().length() > 1) { - tikzit->open(a.arguments()[1]); - } + tikzit->open(a.arguments()[1]); + } return a.exec(); } -- cgit v1.2.3 From d7f0b3e19fddc89fd22692847e9d840023d2b7f3 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Mon, 7 May 2018 13:21:59 +0200 Subject: GPLed --- COPYING | 674 + src/data/edge.cpp | 18 + src/data/edge.h | 18 + src/data/edgestyle.cpp | 18 + src/data/edgestyle.h | 18 + src/data/graph.cpp | 18 + src/data/graph.h | 18 + src/data/graphelementdata.cpp | 18 + src/data/graphelementdata.h | 18 + src/data/graphelementproperty.cpp | 18 + src/data/graphelementproperty.h | 18 + src/data/node.cpp | 18 + src/data/node.h | 18 + src/data/nodestyle.cpp | 18 + src/data/nodestyle.h | 18 + src/data/style.cpp | 18 + src/data/style.h | 18 + src/data/tikzassembler.cpp | 18 + src/data/tikzassembler.h | 20 +- src/data/tikzdocument.cpp | 18 + src/data/tikzdocument.h | 18 + src/data/tikzlexer.l | 39 +- src/data/tikzparserdefs.h | 18 + src/data/tikzstyles.cpp | 18 + src/data/tikzstyles.h | 18 + src/gui/edgeitem.cpp | 18 + src/gui/edgeitem.h | 20 +- src/gui/mainmenu.cpp | 18 + src/gui/mainmenu.h | 18 + src/gui/nodeitem.cpp | 18 + src/gui/nodeitem.h | 18 + src/gui/propertypalette.cpp | 18 + src/gui/propertypalette.h | 18 + src/gui/stylepalette.cpp | 18 + src/gui/stylepalette.h | 18 + src/gui/tikzscene.cpp | 18 + src/gui/tikzscene.h | 18 + src/gui/tikzview.cpp | 18 + src/gui/tikzview.h | 18 + src/gui/toolpalette.cpp | 18 + src/gui/toolpalette.h | 18 + src/gui/undocommands.cpp | 18 + src/gui/undocommands.h | 18 + src/main.cpp | 21 +- src/tikzit.cpp | 18 + src/tikzit.h | 19 + src/util.cpp | 18 + src/util.h | 18 + tikzit-old/.gitignore | 235 - tikzit-old/AH_latex_head.png | Bin 6334 -> 0 bytes tikzit-old/AH_latex_tail.png | Bin 6324 -> 0 bytes tikzit-old/AH_none.png | Bin 6183 -> 0 bytes tikzit-old/AH_plain_head.png | Bin 6298 -> 0 bytes tikzit-old/AH_plain_tail.png | Bin 6320 -> 0 bytes tikzit-old/COPYING | 340 - tikzit-old/DESIGN-GTK | 23 - tikzit-old/ED_arrow.png | Bin 6357 -> 0 bytes tikzit-old/ED_none.png | Bin 6190 -> 0 bytes tikzit-old/ED_tick.png | Bin 6258 -> 0 bytes tikzit-old/English.lproj/Credits.rtf | 18 - tikzit-old/English.lproj/CustomNodes.xib | 256 - tikzit-old/English.lproj/InfoPlist.strings | 2 - tikzit-old/English.lproj/MainMenu.xib | 453 - tikzit-old/English.lproj/Preamble.xib | 235 - tikzit-old/English.lproj/Preview.xib | 70 - tikzit-old/English.lproj/PropertyInspector.xib | 769 - tikzit-old/English.lproj/StylePalette.xib | 631 - tikzit-old/English.lproj/TikzDocument.xib | 161 - tikzit-old/English.lproj/UserDefaults.plist | 10 - .../Frameworks/SFBInspectors.framework/Headers | 1 - .../Frameworks/SFBInspectors.framework/Resources | 1 - .../SFBInspectors.framework/SFBInspectors | 1 - .../Versions/A/Headers/SFBInspectorPane.h | 31 - .../Versions/A/Headers/SFBInspectorPaneBody.h | 16 - .../Versions/A/Headers/SFBInspectorPaneHeader.h | 24 - .../Versions/A/Headers/SFBInspectorView.h | 17 - .../Versions/A/Headers/SFBViewSelector.h | 22 - .../Versions/A/Headers/SFBViewSelectorBar.h | 29 - .../Versions/A/Headers/SFBViewSelectorBarItem.h | 28 - .../A/Resources/English.lproj/InfoPlist.strings | Bin 92 -> 0 bytes .../Versions/A/Resources/Info.plist | 24 - .../Versions/A/SFBInspectors | Bin 280648 -> 0 bytes .../SFBInspectors.framework/Versions/Current | 1 - tikzit-old/Frameworks/Sparkle.framework/Headers | 1 - tikzit-old/Frameworks/Sparkle.framework/Resources | 1 - tikzit-old/Frameworks/Sparkle.framework/Sparkle | 1 - .../Versions/A/Headers/SUAppcast.h | 33 - .../Versions/A/Headers/SUAppcastItem.h | 47 - .../Versions/A/Headers/SUUpdater.h | 118 - .../A/Headers/SUVersionComparisonProtocol.h | 27 - .../Sparkle.framework/Versions/A/Headers/Sparkle.h | 21 - .../Versions/A/Resources/Info.plist | 24 - .../Versions/A/Resources/License.txt | 7 - .../Versions/A/Resources/SUModelTranslation.plist | 174 - .../Versions/A/Resources/SUStatus.nib/classes.nib | 56 - .../Versions/A/Resources/SUStatus.nib/info.nib | 20 - .../A/Resources/SUStatus.nib/keyedobjects.nib | Bin 7344 -> 0 bytes .../SUAutomaticUpdateAlert.nib/classes.nib | 50 - .../de.lproj/SUAutomaticUpdateAlert.nib/info.nib | 20 - .../SUAutomaticUpdateAlert.nib/keyedobjects.nib | Bin 7278 -> 0 bytes .../de.lproj/SUUpdateAlert.nib/classes.nib | 67 - .../Resources/de.lproj/SUUpdateAlert.nib/info.nib | 20 - .../de.lproj/SUUpdateAlert.nib/keyedobjects.nib | Bin 10493 -> 0 bytes .../SUUpdatePermissionPrompt.nib/classes.nib | 59 - .../de.lproj/SUUpdatePermissionPrompt.nib/info.nib | 20 - .../SUUpdatePermissionPrompt.nib/keyedobjects.nib | Bin 13189 -> 0 bytes .../Versions/A/Resources/de.lproj/Sparkle.strings | Bin 9806 -> 0 bytes .../SUAutomaticUpdateAlert.nib/classes.nib | 50 - .../en.lproj/SUAutomaticUpdateAlert.nib/info.nib | 20 - .../SUAutomaticUpdateAlert.nib/keyedobjects.nib | Bin 7148 -> 0 bytes .../en.lproj/SUUpdateAlert.nib/classes.nib | 67 - .../Resources/en.lproj/SUUpdateAlert.nib/info.nib | 20 - .../en.lproj/SUUpdateAlert.nib/keyedobjects.nib | Bin 10623 -> 0 bytes .../SUUpdatePermissionPrompt.nib/classes.nib | 59 - .../en.lproj/SUUpdatePermissionPrompt.nib/info.nib | 21 - .../SUUpdatePermissionPrompt.nib/keyedobjects.nib | Bin 13263 -> 0 bytes .../Versions/A/Resources/en.lproj/Sparkle.strings | Bin 8216 -> 0 bytes .../SUAutomaticUpdateAlert.nib/classes.nib | 50 - .../es.lproj/SUAutomaticUpdateAlert.nib/info.nib | 20 - .../SUAutomaticUpdateAlert.nib/keyedobjects.nib | Bin 7273 -> 0 bytes .../es.lproj/SUUpdateAlert.nib/classes.nib | 67 - .../Resources/es.lproj/SUUpdateAlert.nib/info.nib | 20 - .../es.lproj/SUUpdateAlert.nib/keyedobjects.nib | Bin 10668 -> 0 bytes .../SUUpdatePermissionPrompt.nib/classes.nib | 59 - .../es.lproj/SUUpdatePermissionPrompt.nib/info.nib | 20 - .../SUUpdatePermissionPrompt.nib/keyedobjects.nib | Bin 13404 -> 0 bytes .../Versions/A/Resources/es.lproj/Sparkle.strings | Bin 8020 -> 0 bytes .../SUAutomaticUpdateAlert.nib/classes.nib | 50 - .../fr.lproj/SUAutomaticUpdateAlert.nib/info.nib | 16 - .../SUAutomaticUpdateAlert.nib/keyedobjects.nib | Bin 7245 -> 0 bytes .../fr.lproj/SUUpdateAlert.nib/classes.nib | 67 - .../Resources/fr.lproj/SUUpdateAlert.nib/info.nib | 16 - .../fr.lproj/SUUpdateAlert.nib/keyedobjects.nib | Bin 10338 -> 0 bytes .../SUUpdatePermissionPrompt.nib/classes.nib | 59 - .../fr.lproj/SUUpdatePermissionPrompt.nib/info.nib | 16 - .../SUUpdatePermissionPrompt.nib/keyedobjects.nib | Bin 13156 -> 0 bytes .../Versions/A/Resources/fr.lproj/Sparkle.strings | Bin 8554 -> 0 bytes .../Versions/A/Resources/fr_CA.lproj | 1 - .../SUAutomaticUpdateAlert.nib/classes.nib | 50 - .../it.lproj/SUAutomaticUpdateAlert.nib/info.nib | 20 - .../SUAutomaticUpdateAlert.nib/keyedobjects.nib | Bin 7161 -> 0 bytes .../it.lproj/SUUpdateAlert.nib/classes.nib | 67 - .../Resources/it.lproj/SUUpdateAlert.nib/info.nib | 20 - .../it.lproj/SUUpdateAlert.nib/keyedobjects.nib | Bin 10360 -> 0 bytes .../SUUpdatePermissionPrompt.nib/classes.nib | 59 - .../it.lproj/SUUpdatePermissionPrompt.nib/info.nib | 20 - .../SUUpdatePermissionPrompt.nib/keyedobjects.nib | Bin 12659 -> 0 bytes .../Versions/A/Resources/it.lproj/Sparkle.strings | Bin 8914 -> 0 bytes .../SUAutomaticUpdateAlert.nib/classes.nib | 50 - .../nl.lproj/SUAutomaticUpdateAlert.nib/info.nib | 18 - .../SUAutomaticUpdateAlert.nib/keyedobjects.nib | Bin 7234 -> 0 bytes .../nl.lproj/SUUpdateAlert.nib/classes.nib | 67 - .../Resources/nl.lproj/SUUpdateAlert.nib/info.nib | 16 - .../nl.lproj/SUUpdateAlert.nib/keyedobjects.nib | Bin 10220 -> 0 bytes .../SUUpdatePermissionPrompt.nib/classes.nib | 59 - .../nl.lproj/SUUpdatePermissionPrompt.nib/info.nib | 16 - .../SUUpdatePermissionPrompt.nib/keyedobjects.nib | Bin 12535 -> 0 bytes .../Versions/A/Resources/nl.lproj/Sparkle.strings | Bin 8514 -> 0 bytes .../Versions/A/Resources/relaunch | Bin 58924 -> 0 bytes .../SUAutomaticUpdateAlert.nib/classes.nib | 50 - .../ru.lproj/SUAutomaticUpdateAlert.nib/info.nib | 20 - .../SUAutomaticUpdateAlert.nib/keyedobjects.nib | Bin 7675 -> 0 bytes .../ru.lproj/SUUpdateAlert.nib/classes.nib | 67 - .../Resources/ru.lproj/SUUpdateAlert.nib/info.nib | 20 - .../ru.lproj/SUUpdateAlert.nib/keyedobjects.nib | Bin 10895 -> 0 bytes .../SUUpdatePermissionPrompt.nib/classes.nib | 59 - .../ru.lproj/SUUpdatePermissionPrompt.nib/info.nib | 18 - .../SUUpdatePermissionPrompt.nib/keyedobjects.nib | Bin 12898 -> 0 bytes .../Versions/A/Resources/ru.lproj/Sparkle.strings | Bin 8364 -> 0 bytes .../SUAutomaticUpdateAlert.nib/classes.nib | 50 - .../sv.lproj/SUAutomaticUpdateAlert.nib/info.nib | 20 - .../SUAutomaticUpdateAlert.nib/keyedobjects.nib | Bin 7474 -> 0 bytes .../sv.lproj/SUUpdateAlert.nib/classes.nib | 39 - .../Resources/sv.lproj/SUUpdateAlert.nib/info.nib | 18 - .../sv.lproj/SUUpdateAlert.nib/keyedobjects.nib | Bin 10180 -> 0 bytes .../SUUpdatePermissionPrompt.nib/classes.nib | 59 - .../sv.lproj/SUUpdatePermissionPrompt.nib/info.nib | 20 - .../SUUpdatePermissionPrompt.nib/keyedobjects.nib | Bin 13483 -> 0 bytes .../Versions/A/Resources/sv.lproj/Sparkle.strings | Bin 8142 -> 0 bytes .../Sparkle.framework/Versions/A/Sparkle | Bin 463812 -> 0 bytes .../Frameworks/Sparkle.framework/Versions/Current | 1 - tikzit-old/INSTALL | 34 - tikzit-old/Makefile.am | 3 - tikzit-old/NEWS | 75 - tikzit-old/README | 7 - tikzit-old/README.release | 98 - tikzit-old/TODO | 15 - tikzit-old/TikZiT-Info.plist | 61 - tikzit-old/TikZiT.xcodeproj/project.pbxproj | 1322 - .../project.xcworkspace/contents.xcworkspacedata | 7 - .../xcshareddata/TikZiT.xccheckout | 37 - .../UserInterfaceState.xcuserstate | 24539 ------------------- .../aleks.xcuserdatad/WorkspaceSettings.xcsettings | 22 - .../xcdebugger/Breakpoints.xcbkptlist | 123 - .../aleks.xcuserdatad/xcschemes/TikZiT.xcscheme | 72 - .../aleks.xcuserdatad/xcschemes/tests.xcscheme | 72 - .../xcschemes/xcschememanagement.plist | 32 - tikzit-old/TikZiT_Prefix.pch | 30 - tikzit-old/autogen.sh | 1578 -- tikzit-old/build/DEBIAN/control | 11 - tikzit-old/configure.ac | 141 - tikzit-old/customshape.png | Bin 1281 -> 0 bytes tikzit-old/docs/Doxyfile | 1600 -- tikzit-old/draw-ellipse.png | Bin 3493 -> 0 bytes tikzit-old/draw-path.png | Bin 920 -> 0 bytes tikzit-old/emblem-important.png | Bin 717 -> 0 bytes tikzit-old/emblem-unreadable-grey.png | Bin 3554 -> 0 bytes tikzit-old/engine.png | Bin 1546 -> 0 bytes tikzit-old/format-indent-less.png | Bin 767 -> 0 bytes tikzit-old/m4/objc.m4 | 135 - tikzit-old/preamble.png | Bin 851 -> 0 bytes tikzit-old/scripts/generate_keys.rb | 13 - tikzit-old/scripts/prepare_release.sh | 40 - tikzit-old/scripts/sign_update.rb | 7 - tikzit-old/select-rectangular.png | Bin 499 -> 0 bytes tikzit-old/shapes/cap.tikz | 13 - tikzit-old/shapes/copants.tikz | 19 - tikzit-old/shapes/cup.tikz | 13 - tikzit-old/shapes/oval.tikz | 11 - tikzit-old/shapes/pants.tikz | 19 - tikzit-old/share/Makefile.am | 10 - tikzit-old/share/applications/tikzit.desktop | 11 - .../share/icons/hicolor/128x128/apps/tikzit.png | Bin 9098 -> 0 bytes .../hicolor/128x128/mimetypes/text-x-tikz.png | Bin 7316 -> 0 bytes .../share/icons/hicolor/16x16/apps/tikzit.png | Bin 882 -> 0 bytes .../icons/hicolor/16x16/mimetypes/text-x-tikz.png | Bin 564 -> 0 bytes .../share/icons/hicolor/22x22/apps/tikzit.png | Bin 1273 -> 0 bytes .../icons/hicolor/22x22/mimetypes/text-x-tikz.png | Bin 866 -> 0 bytes .../share/icons/hicolor/24x24/apps/tikzit.png | Bin 1406 -> 0 bytes .../share/icons/hicolor/32x32/apps/tikzit.png | Bin 1987 -> 0 bytes .../icons/hicolor/32x32/mimetypes/text-x-tikz.png | Bin 1352 -> 0 bytes .../share/icons/hicolor/48x48/apps/tikzit.png | Bin 3132 -> 0 bytes .../icons/hicolor/48x48/mimetypes/text-x-tikz.png | Bin 2445 -> 0 bytes .../share/icons/hicolor/64x64/apps/tikzit.png | Bin 4315 -> 0 bytes .../icons/hicolor/64x64/mimetypes/text-x-tikz.png | Bin 3532 -> 0 bytes .../share/icons/hicolor/scalable/apps/tikzit.svg | 79 - .../hicolor/scalable/mimetypes/text-x-tikz.svg | 488 - tikzit-old/share/mime/packages/tikzit.xml | 10 - tikzit-old/share/tikzit | 1 - tikzit-old/src/Makefile.am | 178 - tikzit-old/src/common/CircleShape.h | 33 - tikzit-old/src/common/CircleShape.m | 57 - tikzit-old/src/common/ColorRGB.h | 64 - tikzit-old/src/common/ColorRGB.m | 353 - tikzit-old/src/common/DiamondShape.h | 34 - tikzit-old/src/common/DiamondShape.m | 63 - tikzit-old/src/common/Edge.h | 401 - tikzit-old/src/common/Edge.m | 757 - tikzit-old/src/common/EdgeStyle.h | 71 - tikzit-old/src/common/EdgeStyle.m | 222 - tikzit-old/src/common/Graph.h | 401 - tikzit-old/src/common/Graph.m | 922 - tikzit-old/src/common/GraphChange.h | 344 - tikzit-old/src/common/GraphChange.m | 369 - tikzit-old/src/common/GraphElementData.h | 94 - tikzit-old/src/common/GraphElementData.m | 188 - tikzit-old/src/common/GraphElementProperty.h | 88 - tikzit-old/src/common/GraphElementProperty.m | 164 - tikzit-old/src/common/Grid.h | 110 - tikzit-old/src/common/Grid.m | 186 - tikzit-old/src/common/NSError+Tikzit.h | 44 - tikzit-old/src/common/NSError+Tikzit.m | 64 - tikzit-old/src/common/NSFileManager+Utils.h | 29 - tikzit-old/src/common/NSFileManager+Utils.m | 46 - tikzit-old/src/common/NSString+LatexConstants.h | 33 - tikzit-old/src/common/NSString+LatexConstants.m | 212 - tikzit-old/src/common/NSString+Tikz.h | 26 - tikzit-old/src/common/NSString+Tikz.m | 72 - tikzit-old/src/common/NSString+Util.h | 27 - tikzit-old/src/common/NSString+Util.m | 66 - tikzit-old/src/common/Node.h | 181 - tikzit-old/src/common/Node.m | 214 - tikzit-old/src/common/NodeStyle.h | 125 - tikzit-old/src/common/NodeStyle.m | 246 - tikzit-old/src/common/PickSupport.h | 164 - tikzit-old/src/common/PickSupport.m | 232 - tikzit-old/src/common/Preambles.h | 73 - tikzit-old/src/common/Preambles.m | 320 - tikzit-old/src/common/PropertyHolder.h | 36 - tikzit-old/src/common/PropertyHolder.m | 74 - tikzit-old/src/common/RColor.h | 50 - tikzit-old/src/common/RColor.m | 33 - tikzit-old/src/common/RectangleShape.h | 33 - tikzit-old/src/common/RectangleShape.m | 57 - tikzit-old/src/common/RegularPolyShape.h | 50 - tikzit-old/src/common/RegularPolyShape.m | 76 - tikzit-old/src/common/RenderContext.h | 156 - tikzit-old/src/common/Shape.h | 49 - tikzit-old/src/common/Shape.m | 171 - tikzit-old/src/common/ShapeNames.h | 27 - tikzit-old/src/common/StyleManager.h | 49 - tikzit-old/src/common/StyleManager.m | 378 - tikzit-old/src/common/SupportDir.h | 36 - tikzit-old/src/common/SupportDir.m | 65 - tikzit-old/src/common/TikzGraphAssembler+Parser.h | 36 - tikzit-old/src/common/TikzGraphAssembler.h | 115 - tikzit-old/src/common/TikzGraphAssembler.m | 310 - tikzit-old/src/common/TikzShape.h | 37 - tikzit-old/src/common/TikzShape.m | 70 - tikzit-old/src/common/Transformer.h | 154 - tikzit-old/src/common/Transformer.m | 231 - tikzit-old/src/common/test/Makefile | 14 - tikzit-old/src/common/test/color.m | 80 - tikzit-old/src/common/test/common.m | 34 - tikzit-old/src/common/test/maths.m | 562 - tikzit-old/src/common/test/parser.m | 86 - tikzit-old/src/common/test/test.h | 57 - tikzit-old/src/common/test/test.m | 175 - tikzit-old/src/common/tikzlexer.lm | 170 - tikzit-old/src/common/tikzparser.ym | 224 - tikzit-old/src/common/tikzparserdefs.h | 49 - tikzit-old/src/common/util.h | 201 - tikzit-old/src/common/util.m | 403 - tikzit-old/src/gtk/Application.h | 155 - tikzit-old/src/gtk/Application.m | 377 - tikzit-old/src/gtk/BoundingBoxTool.h | 45 - tikzit-old/src/gtk/BoundingBoxTool.m | 353 - tikzit-old/src/gtk/CairoRenderContext.h | 59 - tikzit-old/src/gtk/CairoRenderContext.m | 344 - tikzit-old/src/gtk/ColorRGB+Gtk.h | 30 - tikzit-old/src/gtk/ColorRGB+Gtk.m | 46 - tikzit-old/src/gtk/ColorRGB+IntegerListStorage.h | 32 - tikzit-old/src/gtk/ColorRGB+IntegerListStorage.m | 57 - tikzit-old/src/gtk/Configuration.h | 447 - tikzit-old/src/gtk/Configuration.m | 450 - tikzit-old/src/gtk/ContextWindow.h | 53 - tikzit-old/src/gtk/ContextWindow.m | 169 - tikzit-old/src/gtk/CreateEdgeTool.h | 45 - tikzit-old/src/gtk/CreateEdgeTool.m | 226 - tikzit-old/src/gtk/CreateNodeTool.h | 42 - tikzit-old/src/gtk/CreateNodeTool.m | 169 - tikzit-old/src/gtk/DocumentContext.h | 27 - tikzit-old/src/gtk/Edge+Render.h | 34 - tikzit-old/src/gtk/Edge+Render.m | 267 - tikzit-old/src/gtk/EdgeStyle+Gtk.h | 29 - tikzit-old/src/gtk/EdgeStyle+Gtk.m | 33 - tikzit-old/src/gtk/EdgeStyle+Storage.h | 29 - tikzit-old/src/gtk/EdgeStyle+Storage.m | 55 - tikzit-old/src/gtk/EdgeStyleEditor.h | 45 - tikzit-old/src/gtk/EdgeStyleEditor.m | 499 - tikzit-old/src/gtk/EdgeStyleSelector.h | 61 - tikzit-old/src/gtk/EdgeStyleSelector.m | 143 - tikzit-old/src/gtk/EdgeStylesModel.h | 62 - tikzit-old/src/gtk/EdgeStylesModel.m | 367 - tikzit-old/src/gtk/EdgeStylesPalette.h | 43 - tikzit-old/src/gtk/EdgeStylesPalette.m | 198 - tikzit-old/src/gtk/FileChooserDialog.h | 56 - tikzit-old/src/gtk/FileChooserDialog.m | 152 - tikzit-old/src/gtk/GraphEditorPanel.h | 53 - tikzit-old/src/gtk/GraphEditorPanel.m | 240 - tikzit-old/src/gtk/GraphRenderer.h | 84 - tikzit-old/src/gtk/GraphRenderer.m | 476 - tikzit-old/src/gtk/HandTool.h | 33 - tikzit-old/src/gtk/HandTool.m | 75 - tikzit-old/src/gtk/InputDelegate.h | 77 - tikzit-old/src/gtk/Menu.h | 86 - tikzit-old/src/gtk/Menu.m | 737 - tikzit-old/src/gtk/NSError+Glib.h | 28 - tikzit-old/src/gtk/NSError+Glib.m | 50 - tikzit-old/src/gtk/NSFileManager+Glib.h | 31 - tikzit-old/src/gtk/NSFileManager+Glib.m | 55 - tikzit-old/src/gtk/NSString+Glib.h | 50 - tikzit-old/src/gtk/NSString+Glib.m | 96 - tikzit-old/src/gtk/Node+Render.h | 44 - tikzit-old/src/gtk/Node+Render.m | 188 - tikzit-old/src/gtk/NodeStyle+Gtk.h | 31 - tikzit-old/src/gtk/NodeStyle+Gtk.m | 41 - tikzit-old/src/gtk/NodeStyle+Render.h | 30 - tikzit-old/src/gtk/NodeStyle+Storage.h | 29 - tikzit-old/src/gtk/NodeStyle+Storage.m | 62 - tikzit-old/src/gtk/NodeStyleEditor.h | 45 - tikzit-old/src/gtk/NodeStyleEditor.m | 477 - tikzit-old/src/gtk/NodeStyleSelector.h | 61 - tikzit-old/src/gtk/NodeStyleSelector.m | 135 - tikzit-old/src/gtk/NodeStylesModel.h | 62 - tikzit-old/src/gtk/NodeStylesModel.m | 381 - tikzit-old/src/gtk/NodeStylesPalette.h | 43 - tikzit-old/src/gtk/NodeStylesPalette.m | 197 - tikzit-old/src/gtk/PreambleEditor.h | 51 - tikzit-old/src/gtk/PreambleEditor.m | 568 - tikzit-old/src/gtk/Preambles+Storage.h | 29 - tikzit-old/src/gtk/Preambles+Storage.m | 84 - tikzit-old/src/gtk/PreviewRenderer.h | 48 - tikzit-old/src/gtk/PreviewRenderer.m | 250 - tikzit-old/src/gtk/PreviewWindow.h | 51 - tikzit-old/src/gtk/PreviewWindow.m | 195 - tikzit-old/src/gtk/PropertiesPane.h | 69 - tikzit-old/src/gtk/PropertiesPane.m | 763 - tikzit-old/src/gtk/PropertyListEditor.h | 65 - tikzit-old/src/gtk/PropertyListEditor.m | 501 - tikzit-old/src/gtk/RecentManager.h | 30 - tikzit-old/src/gtk/RecentManager.m | 74 - tikzit-old/src/gtk/SelectTool.h | 63 - tikzit-old/src/gtk/SelectTool.m | 590 - tikzit-old/src/gtk/SelectionPane.h | 56 - tikzit-old/src/gtk/SelectionPane.m | 432 - tikzit-old/src/gtk/SettingsDialog.h | 54 - tikzit-old/src/gtk/SettingsDialog.m | 328 - tikzit-old/src/gtk/Shape+Render.h | 29 - tikzit-old/src/gtk/Shape+Render.m | 57 - tikzit-old/src/gtk/StyleManager+Storage.h | 26 - tikzit-old/src/gtk/StyleManager+Storage.m | 82 - tikzit-old/src/gtk/Surface.h | 107 - tikzit-old/src/gtk/TZFoundation.h | 30 - tikzit-old/src/gtk/TikzDocument.h | 149 - tikzit-old/src/gtk/TikzDocument.m | 911 - tikzit-old/src/gtk/Tool.h | 41 - tikzit-old/src/gtk/ToolBox.h | 45 - tikzit-old/src/gtk/ToolBox.m | 280 - tikzit-old/src/gtk/WidgetSurface.h | 54 - tikzit-old/src/gtk/WidgetSurface.m | 630 - tikzit-old/src/gtk/Window.h | 182 - tikzit-old/src/gtk/Window.m | 991 - tikzit-old/src/gtk/cairo_helpers.h | 25 - tikzit-old/src/gtk/cairo_helpers.m | 28 - tikzit-old/src/gtk/clipboard.h | 41 - tikzit-old/src/gtk/clipboard.m | 57 - tikzit-old/src/gtk/gtkhelpers.h | 60 - tikzit-old/src/gtk/gtkhelpers.m | 275 - tikzit-old/src/gtk/logo.h | 32 - tikzit-old/src/gtk/logo.m | 64 - tikzit-old/src/gtk/main.m | 111 - tikzit-old/src/gtk/mkdtemp.h | 32 - tikzit-old/src/gtk/mkdtemp.m | 180 - tikzit-old/src/gtk/stat.h | 25 - tikzit-old/src/gtk/test/gtk.m | 27 - tikzit-old/src/gtk/test/main.m | 50 - tikzit-old/src/gtk/tzstockitems.h | 26 - tikzit-old/src/gtk/tzstockitems.m | 64 - tikzit-old/src/gtk/tztoolpalette.h | 56 - tikzit-old/src/gtk/tztoolpalette.m | 158 - tikzit-old/src/osx/AppDelegate.h | 57 - tikzit-old/src/osx/AppDelegate.m | 124 - tikzit-old/src/osx/CALayer+DrawLabel.h | 21 - tikzit-old/src/osx/CALayer+DrawLabel.m | 84 - tikzit-old/src/osx/CoreGraphicsRenderContext.h | 44 - tikzit-old/src/osx/CoreGraphicsRenderContext.m | 234 - tikzit-old/src/osx/CustomNodeCellView.h | 23 - tikzit-old/src/osx/CustomNodeCellView.m | 83 - tikzit-old/src/osx/CustomNodeController.h | 35 - tikzit-old/src/osx/CustomNodeController.m | 58 - tikzit-old/src/osx/CustomNodes.xib | 249 - tikzit-old/src/osx/DraggablePDFView.h | 28 - tikzit-old/src/osx/DraggablePDFView.m | 60 - tikzit-old/src/osx/EdgeControlLayer.h | 44 - tikzit-old/src/osx/EdgeControlLayer.m | 150 - tikzit-old/src/osx/EdgeStyle+Coder.h | 30 - tikzit-old/src/osx/EdgeStyle+Coder.m | 50 - tikzit-old/src/osx/Graph+Coder.h | 17 - tikzit-old/src/osx/Graph+Coder.m | 24 - tikzit-old/src/osx/GraphicsView.h | 129 - tikzit-old/src/osx/GraphicsView.m | 1216 - tikzit-old/src/osx/Grid.h | 48 - tikzit-old/src/osx/Grid.m | 152 - tikzit-old/src/osx/MultiCombo.h | 18 - tikzit-old/src/osx/MultiCombo.m | 38 - tikzit-old/src/osx/MultiField.h | 18 - tikzit-old/src/osx/MultiField.m | 53 - tikzit-old/src/osx/NilToEmptyStringTransformer.h | 28 - tikzit-old/src/osx/NilToEmptyStringTransformer.m | 53 - tikzit-old/src/osx/NodeLayer.h | 62 - tikzit-old/src/osx/NodeLayer.m | 238 - tikzit-old/src/osx/NodeSelectionLayer.h | 45 - tikzit-old/src/osx/NodeSelectionLayer.m | 93 - tikzit-old/src/osx/NodeStyle+Coder.h | 36 - tikzit-old/src/osx/NodeStyle+Coder.m | 91 - tikzit-old/src/osx/ParseErrorView.h | 13 - tikzit-old/src/osx/ParseErrorView.m | 40 - tikzit-old/src/osx/PreambleController.h | 57 - tikzit-old/src/osx/PreambleController.m | 168 - tikzit-old/src/osx/Preambles+Coder.h | 32 - tikzit-old/src/osx/Preambles+Coder.m | 41 - tikzit-old/src/osx/PreferenceController.h | 49 - tikzit-old/src/osx/PreferenceController.m | 133 - tikzit-old/src/osx/Preferences.xib | 1165 - tikzit-old/src/osx/PreviewController.h | 52 - tikzit-old/src/osx/PreviewController.m | 147 - tikzit-old/src/osx/PropertyInspectorController.h | 83 - tikzit-old/src/osx/PropertyInspectorController.m | 280 - tikzit-old/src/osx/SelectBoxLayer.h | 22 - tikzit-old/src/osx/SelectBoxLayer.m | 48 - tikzit-old/src/osx/SelectableCollectionViewItem.h | 33 - tikzit-old/src/osx/SelectableCollectionViewItem.m | 54 - tikzit-old/src/osx/SelectableNodeView.h | 38 - tikzit-old/src/osx/SelectableNodeView.m | 96 - tikzit-old/src/osx/StylePaletteController.h | 80 - tikzit-old/src/osx/StylePaletteController.m | 252 - tikzit-old/src/osx/TikzDocument.h | 37 - tikzit-old/src/osx/TikzDocument.m | 84 - tikzit-old/src/osx/TikzFormatter.h | 29 - tikzit-old/src/osx/TikzFormatter.m | 91 - tikzit-old/src/osx/TikzSourceController.h | 71 - tikzit-old/src/osx/TikzSourceController.m | 241 - tikzit-old/src/osx/TikzWindowController.h | 31 - tikzit-old/src/osx/TikzWindowController.m | 66 - tikzit-old/src/osx/ToolPaletteController.h | 42 - tikzit-old/src/osx/ToolPaletteController.m | 58 - tikzit-old/src/osx/UpdatePreferenceController.h | 34 - tikzit-old/src/osx/UpdatePreferenceController.m | 49 - tikzit-old/src/osx/UpdatePreferencePanel.xib | 95 - tikzit-old/src/osx/main.m | 26 - tikzit-old/src/osx/test/main.m | 56 - tikzit-old/src/osx/test/osx.m | 64 - tikzit-old/src/tikzit.rc | 24 - tikzit-old/text-x-generic.png | Bin 744 -> 0 bytes tikzit-old/text-x-script.png | Bin 1416 -> 0 bytes tikzit-old/tikzit.icns | Bin 166599 -> 0 bytes tikzit-old/tikzit.ico | Bin 34494 -> 0 bytes tikzit-old/tikzit.spec | 98 - tikzit-old/tikzit48x48.png | Bin 2606 -> 0 bytes tikzit-old/tikzit_dsa_pub.pem | 20 - tikzit-old/tikzitdoc.icns | Bin 154929 -> 0 bytes tikzit-old/transform-crop-and-resize.png | Bin 1132 -> 0 bytes tikzit-old/transform-move.png | Bin 638 -> 0 bytes tikzit-old/updates.png | Bin 1953 -> 0 bytes 515 files changed, 1527 insertions(+), 74410 deletions(-) create mode 100644 COPYING delete mode 100644 tikzit-old/.gitignore delete mode 100644 tikzit-old/AH_latex_head.png delete mode 100644 tikzit-old/AH_latex_tail.png delete mode 100644 tikzit-old/AH_none.png delete mode 100644 tikzit-old/AH_plain_head.png delete mode 100644 tikzit-old/AH_plain_tail.png delete mode 100644 tikzit-old/COPYING delete mode 100644 tikzit-old/DESIGN-GTK delete mode 100644 tikzit-old/ED_arrow.png delete mode 100644 tikzit-old/ED_none.png delete mode 100644 tikzit-old/ED_tick.png delete mode 100644 tikzit-old/English.lproj/Credits.rtf delete mode 100644 tikzit-old/English.lproj/CustomNodes.xib delete mode 100644 tikzit-old/English.lproj/InfoPlist.strings delete mode 100644 tikzit-old/English.lproj/MainMenu.xib delete mode 100644 tikzit-old/English.lproj/Preamble.xib delete mode 100644 tikzit-old/English.lproj/Preview.xib delete mode 100644 tikzit-old/English.lproj/PropertyInspector.xib delete mode 100644 tikzit-old/English.lproj/StylePalette.xib delete mode 100644 tikzit-old/English.lproj/TikzDocument.xib delete mode 100644 tikzit-old/English.lproj/UserDefaults.plist delete mode 120000 tikzit-old/Frameworks/SFBInspectors.framework/Headers delete mode 120000 tikzit-old/Frameworks/SFBInspectors.framework/Resources delete mode 120000 tikzit-old/Frameworks/SFBInspectors.framework/SFBInspectors delete mode 100644 tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPane.h delete mode 100644 tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPaneBody.h delete mode 100644 tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPaneHeader.h delete mode 100644 tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorView.h delete mode 100644 tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelector.h delete mode 100644 tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelectorBar.h delete mode 100644 tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelectorBarItem.h delete mode 100644 tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Resources/English.lproj/InfoPlist.strings delete mode 100644 tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Resources/Info.plist delete mode 100755 tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/SFBInspectors delete mode 120000 tikzit-old/Frameworks/SFBInspectors.framework/Versions/Current delete mode 120000 tikzit-old/Frameworks/Sparkle.framework/Headers delete mode 120000 tikzit-old/Frameworks/Sparkle.framework/Resources delete mode 120000 tikzit-old/Frameworks/Sparkle.framework/Sparkle delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcast.h delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Headers/SUUpdater.h delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Headers/Sparkle.h delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/Info.plist delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/License.txt delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/SUModelTranslation.plist delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/classes.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/info.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/keyedobjects.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/classes.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/info.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/classes.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/info.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/classes.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/info.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/classes.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/info.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/classes.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/info.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/classes.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/info.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/Sparkle.strings delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/classes.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/info.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/classes.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/info.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/classes.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/info.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/Sparkle.strings delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/classes.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/info.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/classes.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/info.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/classes.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/info.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/Sparkle.strings delete mode 120000 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr_CA.lproj delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/classes.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/info.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/classes.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/info.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/classes.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/info.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/Sparkle.strings delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/classes.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/info.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/classes.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/info.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/classes.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/info.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/Sparkle.strings delete mode 100755 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/relaunch delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/classes.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/info.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/classes.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/info.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/classes.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/info.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/classes.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/info.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/classes.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/info.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/keyedobjects.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/classes.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/info.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib delete mode 100644 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/Sparkle.strings delete mode 100755 tikzit-old/Frameworks/Sparkle.framework/Versions/A/Sparkle delete mode 120000 tikzit-old/Frameworks/Sparkle.framework/Versions/Current delete mode 100644 tikzit-old/INSTALL delete mode 100644 tikzit-old/Makefile.am delete mode 100644 tikzit-old/NEWS delete mode 100644 tikzit-old/README delete mode 100644 tikzit-old/README.release delete mode 100644 tikzit-old/TODO delete mode 100644 tikzit-old/TikZiT-Info.plist delete mode 100644 tikzit-old/TikZiT.xcodeproj/project.pbxproj delete mode 100644 tikzit-old/TikZiT.xcodeproj/project.xcworkspace/contents.xcworkspacedata delete mode 100644 tikzit-old/TikZiT.xcodeproj/project.xcworkspace/xcshareddata/TikZiT.xccheckout delete mode 100644 tikzit-old/TikZiT.xcodeproj/project.xcworkspace/xcuserdata/aleks.xcuserdatad/UserInterfaceState.xcuserstate delete mode 100644 tikzit-old/TikZiT.xcodeproj/project.xcworkspace/xcuserdata/aleks.xcuserdatad/WorkspaceSettings.xcsettings delete mode 100644 tikzit-old/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist delete mode 100644 tikzit-old/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/TikZiT.xcscheme delete mode 100644 tikzit-old/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/tests.xcscheme delete mode 100644 tikzit-old/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/xcschememanagement.plist delete mode 100644 tikzit-old/TikZiT_Prefix.pch delete mode 100755 tikzit-old/autogen.sh delete mode 100644 tikzit-old/build/DEBIAN/control delete mode 100644 tikzit-old/configure.ac delete mode 100755 tikzit-old/customshape.png delete mode 100644 tikzit-old/docs/Doxyfile delete mode 100644 tikzit-old/draw-ellipse.png delete mode 100644 tikzit-old/draw-path.png delete mode 100644 tikzit-old/emblem-important.png delete mode 100644 tikzit-old/emblem-unreadable-grey.png delete mode 100755 tikzit-old/engine.png delete mode 100644 tikzit-old/format-indent-less.png delete mode 100644 tikzit-old/m4/objc.m4 delete mode 100755 tikzit-old/preamble.png delete mode 100755 tikzit-old/scripts/generate_keys.rb delete mode 100755 tikzit-old/scripts/prepare_release.sh delete mode 100755 tikzit-old/scripts/sign_update.rb delete mode 100644 tikzit-old/select-rectangular.png delete mode 100644 tikzit-old/shapes/cap.tikz delete mode 100644 tikzit-old/shapes/copants.tikz delete mode 100644 tikzit-old/shapes/cup.tikz delete mode 100644 tikzit-old/shapes/oval.tikz delete mode 100644 tikzit-old/shapes/pants.tikz delete mode 100644 tikzit-old/share/Makefile.am delete mode 100644 tikzit-old/share/applications/tikzit.desktop delete mode 100644 tikzit-old/share/icons/hicolor/128x128/apps/tikzit.png delete mode 100644 tikzit-old/share/icons/hicolor/128x128/mimetypes/text-x-tikz.png delete mode 100644 tikzit-old/share/icons/hicolor/16x16/apps/tikzit.png delete mode 100644 tikzit-old/share/icons/hicolor/16x16/mimetypes/text-x-tikz.png delete mode 100644 tikzit-old/share/icons/hicolor/22x22/apps/tikzit.png delete mode 100644 tikzit-old/share/icons/hicolor/22x22/mimetypes/text-x-tikz.png delete mode 100644 tikzit-old/share/icons/hicolor/24x24/apps/tikzit.png delete mode 100644 tikzit-old/share/icons/hicolor/32x32/apps/tikzit.png delete mode 100644 tikzit-old/share/icons/hicolor/32x32/mimetypes/text-x-tikz.png delete mode 100644 tikzit-old/share/icons/hicolor/48x48/apps/tikzit.png delete mode 100644 tikzit-old/share/icons/hicolor/48x48/mimetypes/text-x-tikz.png delete mode 100644 tikzit-old/share/icons/hicolor/64x64/apps/tikzit.png delete mode 100644 tikzit-old/share/icons/hicolor/64x64/mimetypes/text-x-tikz.png delete mode 100644 tikzit-old/share/icons/hicolor/scalable/apps/tikzit.svg delete mode 100644 tikzit-old/share/icons/hicolor/scalable/mimetypes/text-x-tikz.svg delete mode 100644 tikzit-old/share/mime/packages/tikzit.xml delete mode 120000 tikzit-old/share/tikzit delete mode 100644 tikzit-old/src/Makefile.am delete mode 100644 tikzit-old/src/common/CircleShape.h delete mode 100644 tikzit-old/src/common/CircleShape.m delete mode 100644 tikzit-old/src/common/ColorRGB.h delete mode 100644 tikzit-old/src/common/ColorRGB.m delete mode 100644 tikzit-old/src/common/DiamondShape.h delete mode 100644 tikzit-old/src/common/DiamondShape.m delete mode 100644 tikzit-old/src/common/Edge.h delete mode 100644 tikzit-old/src/common/Edge.m delete mode 100644 tikzit-old/src/common/EdgeStyle.h delete mode 100644 tikzit-old/src/common/EdgeStyle.m delete mode 100644 tikzit-old/src/common/Graph.h delete mode 100644 tikzit-old/src/common/Graph.m delete mode 100644 tikzit-old/src/common/GraphChange.h delete mode 100644 tikzit-old/src/common/GraphChange.m delete mode 100644 tikzit-old/src/common/GraphElementData.h delete mode 100644 tikzit-old/src/common/GraphElementData.m delete mode 100644 tikzit-old/src/common/GraphElementProperty.h delete mode 100644 tikzit-old/src/common/GraphElementProperty.m delete mode 100644 tikzit-old/src/common/Grid.h delete mode 100644 tikzit-old/src/common/Grid.m delete mode 100644 tikzit-old/src/common/NSError+Tikzit.h delete mode 100644 tikzit-old/src/common/NSError+Tikzit.m delete mode 100644 tikzit-old/src/common/NSFileManager+Utils.h delete mode 100644 tikzit-old/src/common/NSFileManager+Utils.m delete mode 100644 tikzit-old/src/common/NSString+LatexConstants.h delete mode 100644 tikzit-old/src/common/NSString+LatexConstants.m delete mode 100644 tikzit-old/src/common/NSString+Tikz.h delete mode 100644 tikzit-old/src/common/NSString+Tikz.m delete mode 100644 tikzit-old/src/common/NSString+Util.h delete mode 100644 tikzit-old/src/common/NSString+Util.m delete mode 100644 tikzit-old/src/common/Node.h delete mode 100644 tikzit-old/src/common/Node.m delete mode 100644 tikzit-old/src/common/NodeStyle.h delete mode 100644 tikzit-old/src/common/NodeStyle.m delete mode 100644 tikzit-old/src/common/PickSupport.h delete mode 100644 tikzit-old/src/common/PickSupport.m delete mode 100644 tikzit-old/src/common/Preambles.h delete mode 100644 tikzit-old/src/common/Preambles.m delete mode 100644 tikzit-old/src/common/PropertyHolder.h delete mode 100644 tikzit-old/src/common/PropertyHolder.m delete mode 100644 tikzit-old/src/common/RColor.h delete mode 100644 tikzit-old/src/common/RColor.m delete mode 100644 tikzit-old/src/common/RectangleShape.h delete mode 100644 tikzit-old/src/common/RectangleShape.m delete mode 100644 tikzit-old/src/common/RegularPolyShape.h delete mode 100644 tikzit-old/src/common/RegularPolyShape.m delete mode 100644 tikzit-old/src/common/RenderContext.h delete mode 100644 tikzit-old/src/common/Shape.h delete mode 100644 tikzit-old/src/common/Shape.m delete mode 100644 tikzit-old/src/common/ShapeNames.h delete mode 100644 tikzit-old/src/common/StyleManager.h delete mode 100644 tikzit-old/src/common/StyleManager.m delete mode 100644 tikzit-old/src/common/SupportDir.h delete mode 100644 tikzit-old/src/common/SupportDir.m delete mode 100644 tikzit-old/src/common/TikzGraphAssembler+Parser.h delete mode 100644 tikzit-old/src/common/TikzGraphAssembler.h delete mode 100644 tikzit-old/src/common/TikzGraphAssembler.m delete mode 100644 tikzit-old/src/common/TikzShape.h delete mode 100644 tikzit-old/src/common/TikzShape.m delete mode 100644 tikzit-old/src/common/Transformer.h delete mode 100644 tikzit-old/src/common/Transformer.m delete mode 100644 tikzit-old/src/common/test/Makefile delete mode 100644 tikzit-old/src/common/test/color.m delete mode 100644 tikzit-old/src/common/test/common.m delete mode 100644 tikzit-old/src/common/test/maths.m delete mode 100644 tikzit-old/src/common/test/parser.m delete mode 100644 tikzit-old/src/common/test/test.h delete mode 100644 tikzit-old/src/common/test/test.m delete mode 100644 tikzit-old/src/common/tikzlexer.lm delete mode 100644 tikzit-old/src/common/tikzparser.ym delete mode 100644 tikzit-old/src/common/tikzparserdefs.h delete mode 100644 tikzit-old/src/common/util.h delete mode 100644 tikzit-old/src/common/util.m delete mode 100644 tikzit-old/src/gtk/Application.h delete mode 100644 tikzit-old/src/gtk/Application.m delete mode 100644 tikzit-old/src/gtk/BoundingBoxTool.h delete mode 100644 tikzit-old/src/gtk/BoundingBoxTool.m delete mode 100644 tikzit-old/src/gtk/CairoRenderContext.h delete mode 100644 tikzit-old/src/gtk/CairoRenderContext.m delete mode 100644 tikzit-old/src/gtk/ColorRGB+Gtk.h delete mode 100644 tikzit-old/src/gtk/ColorRGB+Gtk.m delete mode 100644 tikzit-old/src/gtk/ColorRGB+IntegerListStorage.h delete mode 100644 tikzit-old/src/gtk/ColorRGB+IntegerListStorage.m delete mode 100644 tikzit-old/src/gtk/Configuration.h delete mode 100644 tikzit-old/src/gtk/Configuration.m delete mode 100644 tikzit-old/src/gtk/ContextWindow.h delete mode 100644 tikzit-old/src/gtk/ContextWindow.m delete mode 100644 tikzit-old/src/gtk/CreateEdgeTool.h delete mode 100644 tikzit-old/src/gtk/CreateEdgeTool.m delete mode 100644 tikzit-old/src/gtk/CreateNodeTool.h delete mode 100644 tikzit-old/src/gtk/CreateNodeTool.m delete mode 100644 tikzit-old/src/gtk/DocumentContext.h delete mode 100644 tikzit-old/src/gtk/Edge+Render.h delete mode 100644 tikzit-old/src/gtk/Edge+Render.m delete mode 100644 tikzit-old/src/gtk/EdgeStyle+Gtk.h delete mode 100644 tikzit-old/src/gtk/EdgeStyle+Gtk.m delete mode 100644 tikzit-old/src/gtk/EdgeStyle+Storage.h delete mode 100644 tikzit-old/src/gtk/EdgeStyle+Storage.m delete mode 100644 tikzit-old/src/gtk/EdgeStyleEditor.h delete mode 100644 tikzit-old/src/gtk/EdgeStyleEditor.m delete mode 100644 tikzit-old/src/gtk/EdgeStyleSelector.h delete mode 100644 tikzit-old/src/gtk/EdgeStyleSelector.m delete mode 100644 tikzit-old/src/gtk/EdgeStylesModel.h delete mode 100644 tikzit-old/src/gtk/EdgeStylesModel.m delete mode 100644 tikzit-old/src/gtk/EdgeStylesPalette.h delete mode 100644 tikzit-old/src/gtk/EdgeStylesPalette.m delete mode 100644 tikzit-old/src/gtk/FileChooserDialog.h delete mode 100644 tikzit-old/src/gtk/FileChooserDialog.m delete mode 100644 tikzit-old/src/gtk/GraphEditorPanel.h delete mode 100644 tikzit-old/src/gtk/GraphEditorPanel.m delete mode 100644 tikzit-old/src/gtk/GraphRenderer.h delete mode 100644 tikzit-old/src/gtk/GraphRenderer.m delete mode 100644 tikzit-old/src/gtk/HandTool.h delete mode 100644 tikzit-old/src/gtk/HandTool.m delete mode 100644 tikzit-old/src/gtk/InputDelegate.h delete mode 100644 tikzit-old/src/gtk/Menu.h delete mode 100644 tikzit-old/src/gtk/Menu.m delete mode 100644 tikzit-old/src/gtk/NSError+Glib.h delete mode 100644 tikzit-old/src/gtk/NSError+Glib.m delete mode 100644 tikzit-old/src/gtk/NSFileManager+Glib.h delete mode 100644 tikzit-old/src/gtk/NSFileManager+Glib.m delete mode 100644 tikzit-old/src/gtk/NSString+Glib.h delete mode 100644 tikzit-old/src/gtk/NSString+Glib.m delete mode 100644 tikzit-old/src/gtk/Node+Render.h delete mode 100644 tikzit-old/src/gtk/Node+Render.m delete mode 100644 tikzit-old/src/gtk/NodeStyle+Gtk.h delete mode 100644 tikzit-old/src/gtk/NodeStyle+Gtk.m delete mode 100644 tikzit-old/src/gtk/NodeStyle+Render.h delete mode 100644 tikzit-old/src/gtk/NodeStyle+Storage.h delete mode 100644 tikzit-old/src/gtk/NodeStyle+Storage.m delete mode 100644 tikzit-old/src/gtk/NodeStyleEditor.h delete mode 100644 tikzit-old/src/gtk/NodeStyleEditor.m delete mode 100644 tikzit-old/src/gtk/NodeStyleSelector.h delete mode 100644 tikzit-old/src/gtk/NodeStyleSelector.m delete mode 100644 tikzit-old/src/gtk/NodeStylesModel.h delete mode 100644 tikzit-old/src/gtk/NodeStylesModel.m delete mode 100644 tikzit-old/src/gtk/NodeStylesPalette.h delete mode 100644 tikzit-old/src/gtk/NodeStylesPalette.m delete mode 100644 tikzit-old/src/gtk/PreambleEditor.h delete mode 100644 tikzit-old/src/gtk/PreambleEditor.m delete mode 100644 tikzit-old/src/gtk/Preambles+Storage.h delete mode 100644 tikzit-old/src/gtk/Preambles+Storage.m delete mode 100644 tikzit-old/src/gtk/PreviewRenderer.h delete mode 100644 tikzit-old/src/gtk/PreviewRenderer.m delete mode 100644 tikzit-old/src/gtk/PreviewWindow.h delete mode 100644 tikzit-old/src/gtk/PreviewWindow.m delete mode 100644 tikzit-old/src/gtk/PropertiesPane.h delete mode 100644 tikzit-old/src/gtk/PropertiesPane.m delete mode 100644 tikzit-old/src/gtk/PropertyListEditor.h delete mode 100644 tikzit-old/src/gtk/PropertyListEditor.m delete mode 100644 tikzit-old/src/gtk/RecentManager.h delete mode 100644 tikzit-old/src/gtk/RecentManager.m delete mode 100644 tikzit-old/src/gtk/SelectTool.h delete mode 100644 tikzit-old/src/gtk/SelectTool.m delete mode 100644 tikzit-old/src/gtk/SelectionPane.h delete mode 100644 tikzit-old/src/gtk/SelectionPane.m delete mode 100644 tikzit-old/src/gtk/SettingsDialog.h delete mode 100644 tikzit-old/src/gtk/SettingsDialog.m delete mode 100644 tikzit-old/src/gtk/Shape+Render.h delete mode 100644 tikzit-old/src/gtk/Shape+Render.m delete mode 100644 tikzit-old/src/gtk/StyleManager+Storage.h delete mode 100644 tikzit-old/src/gtk/StyleManager+Storage.m delete mode 100644 tikzit-old/src/gtk/Surface.h delete mode 100644 tikzit-old/src/gtk/TZFoundation.h delete mode 100644 tikzit-old/src/gtk/TikzDocument.h delete mode 100644 tikzit-old/src/gtk/TikzDocument.m delete mode 100644 tikzit-old/src/gtk/Tool.h delete mode 100644 tikzit-old/src/gtk/ToolBox.h delete mode 100644 tikzit-old/src/gtk/ToolBox.m delete mode 100644 tikzit-old/src/gtk/WidgetSurface.h delete mode 100644 tikzit-old/src/gtk/WidgetSurface.m delete mode 100644 tikzit-old/src/gtk/Window.h delete mode 100644 tikzit-old/src/gtk/Window.m delete mode 100644 tikzit-old/src/gtk/cairo_helpers.h delete mode 100644 tikzit-old/src/gtk/cairo_helpers.m delete mode 100644 tikzit-old/src/gtk/clipboard.h delete mode 100644 tikzit-old/src/gtk/clipboard.m delete mode 100644 tikzit-old/src/gtk/gtkhelpers.h delete mode 100644 tikzit-old/src/gtk/gtkhelpers.m delete mode 100644 tikzit-old/src/gtk/logo.h delete mode 100644 tikzit-old/src/gtk/logo.m delete mode 100644 tikzit-old/src/gtk/main.m delete mode 100644 tikzit-old/src/gtk/mkdtemp.h delete mode 100644 tikzit-old/src/gtk/mkdtemp.m delete mode 100644 tikzit-old/src/gtk/stat.h delete mode 100644 tikzit-old/src/gtk/test/gtk.m delete mode 100644 tikzit-old/src/gtk/test/main.m delete mode 100644 tikzit-old/src/gtk/tzstockitems.h delete mode 100644 tikzit-old/src/gtk/tzstockitems.m delete mode 100644 tikzit-old/src/gtk/tztoolpalette.h delete mode 100644 tikzit-old/src/gtk/tztoolpalette.m delete mode 100644 tikzit-old/src/osx/AppDelegate.h delete mode 100644 tikzit-old/src/osx/AppDelegate.m delete mode 100644 tikzit-old/src/osx/CALayer+DrawLabel.h delete mode 100644 tikzit-old/src/osx/CALayer+DrawLabel.m delete mode 100644 tikzit-old/src/osx/CoreGraphicsRenderContext.h delete mode 100644 tikzit-old/src/osx/CoreGraphicsRenderContext.m delete mode 100644 tikzit-old/src/osx/CustomNodeCellView.h delete mode 100644 tikzit-old/src/osx/CustomNodeCellView.m delete mode 100644 tikzit-old/src/osx/CustomNodeController.h delete mode 100644 tikzit-old/src/osx/CustomNodeController.m delete mode 100644 tikzit-old/src/osx/CustomNodes.xib delete mode 100644 tikzit-old/src/osx/DraggablePDFView.h delete mode 100644 tikzit-old/src/osx/DraggablePDFView.m delete mode 100644 tikzit-old/src/osx/EdgeControlLayer.h delete mode 100644 tikzit-old/src/osx/EdgeControlLayer.m delete mode 100644 tikzit-old/src/osx/EdgeStyle+Coder.h delete mode 100644 tikzit-old/src/osx/EdgeStyle+Coder.m delete mode 100644 tikzit-old/src/osx/Graph+Coder.h delete mode 100644 tikzit-old/src/osx/Graph+Coder.m delete mode 100644 tikzit-old/src/osx/GraphicsView.h delete mode 100644 tikzit-old/src/osx/GraphicsView.m delete mode 100644 tikzit-old/src/osx/Grid.h delete mode 100644 tikzit-old/src/osx/Grid.m delete mode 100644 tikzit-old/src/osx/MultiCombo.h delete mode 100644 tikzit-old/src/osx/MultiCombo.m delete mode 100644 tikzit-old/src/osx/MultiField.h delete mode 100644 tikzit-old/src/osx/MultiField.m delete mode 100644 tikzit-old/src/osx/NilToEmptyStringTransformer.h delete mode 100644 tikzit-old/src/osx/NilToEmptyStringTransformer.m delete mode 100644 tikzit-old/src/osx/NodeLayer.h delete mode 100644 tikzit-old/src/osx/NodeLayer.m delete mode 100644 tikzit-old/src/osx/NodeSelectionLayer.h delete mode 100644 tikzit-old/src/osx/NodeSelectionLayer.m delete mode 100644 tikzit-old/src/osx/NodeStyle+Coder.h delete mode 100644 tikzit-old/src/osx/NodeStyle+Coder.m delete mode 100644 tikzit-old/src/osx/ParseErrorView.h delete mode 100644 tikzit-old/src/osx/ParseErrorView.m delete mode 100644 tikzit-old/src/osx/PreambleController.h delete mode 100644 tikzit-old/src/osx/PreambleController.m delete mode 100644 tikzit-old/src/osx/Preambles+Coder.h delete mode 100644 tikzit-old/src/osx/Preambles+Coder.m delete mode 100644 tikzit-old/src/osx/PreferenceController.h delete mode 100644 tikzit-old/src/osx/PreferenceController.m delete mode 100644 tikzit-old/src/osx/Preferences.xib delete mode 100644 tikzit-old/src/osx/PreviewController.h delete mode 100644 tikzit-old/src/osx/PreviewController.m delete mode 100644 tikzit-old/src/osx/PropertyInspectorController.h delete mode 100644 tikzit-old/src/osx/PropertyInspectorController.m delete mode 100644 tikzit-old/src/osx/SelectBoxLayer.h delete mode 100644 tikzit-old/src/osx/SelectBoxLayer.m delete mode 100644 tikzit-old/src/osx/SelectableCollectionViewItem.h delete mode 100644 tikzit-old/src/osx/SelectableCollectionViewItem.m delete mode 100644 tikzit-old/src/osx/SelectableNodeView.h delete mode 100644 tikzit-old/src/osx/SelectableNodeView.m delete mode 100644 tikzit-old/src/osx/StylePaletteController.h delete mode 100644 tikzit-old/src/osx/StylePaletteController.m delete mode 100644 tikzit-old/src/osx/TikzDocument.h delete mode 100644 tikzit-old/src/osx/TikzDocument.m delete mode 100644 tikzit-old/src/osx/TikzFormatter.h delete mode 100644 tikzit-old/src/osx/TikzFormatter.m delete mode 100644 tikzit-old/src/osx/TikzSourceController.h delete mode 100644 tikzit-old/src/osx/TikzSourceController.m delete mode 100644 tikzit-old/src/osx/TikzWindowController.h delete mode 100644 tikzit-old/src/osx/TikzWindowController.m delete mode 100644 tikzit-old/src/osx/ToolPaletteController.h delete mode 100644 tikzit-old/src/osx/ToolPaletteController.m delete mode 100644 tikzit-old/src/osx/UpdatePreferenceController.h delete mode 100644 tikzit-old/src/osx/UpdatePreferenceController.m delete mode 100644 tikzit-old/src/osx/UpdatePreferencePanel.xib delete mode 100644 tikzit-old/src/osx/main.m delete mode 100644 tikzit-old/src/osx/test/main.m delete mode 100644 tikzit-old/src/osx/test/osx.m delete mode 100644 tikzit-old/src/tikzit.rc delete mode 100644 tikzit-old/text-x-generic.png delete mode 100644 tikzit-old/text-x-script.png delete mode 100644 tikzit-old/tikzit.icns delete mode 100644 tikzit-old/tikzit.ico delete mode 100644 tikzit-old/tikzit.spec delete mode 100644 tikzit-old/tikzit48x48.png delete mode 100644 tikzit-old/tikzit_dsa_pub.pem delete mode 100644 tikzit-old/tikzitdoc.icns delete mode 100644 tikzit-old/transform-crop-and-resize.png delete mode 100644 tikzit-old/transform-move.png delete mode 100755 tikzit-old/updates.png diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/COPYING @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/src/data/edge.cpp b/src/data/edge.cpp index a18c8ea..d741c56 100644 --- a/src/data/edge.cpp +++ b/src/data/edge.cpp @@ -1,3 +1,21 @@ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + #include "edge.h" #include "tikzit.h" #include "util.h" diff --git a/src/data/edge.h b/src/data/edge.h index 3dc0211..dd09469 100644 --- a/src/data/edge.h +++ b/src/data/edge.h @@ -1,3 +1,21 @@ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + #ifndef EDGE_H #define EDGE_H diff --git a/src/data/edgestyle.cpp b/src/data/edgestyle.cpp index 9fb2638..079d4f5 100644 --- a/src/data/edgestyle.cpp +++ b/src/data/edgestyle.cpp @@ -1,3 +1,21 @@ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + #include "edgestyle.h" #include diff --git a/src/data/edgestyle.h b/src/data/edgestyle.h index 6b0c3bb..cf55d06 100644 --- a/src/data/edgestyle.h +++ b/src/data/edgestyle.h @@ -1,3 +1,21 @@ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + #ifndef EDGESTYLE_H #define EDGESTYLE_H diff --git a/src/data/graph.cpp b/src/data/graph.cpp index 4153bc0..00b2dce 100644 --- a/src/data/graph.cpp +++ b/src/data/graph.cpp @@ -1,3 +1,21 @@ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + #include "graph.h" #include "util.h" diff --git a/src/data/graph.h b/src/data/graph.h index d00d2b2..77af253 100644 --- a/src/data/graph.h +++ b/src/data/graph.h @@ -1,3 +1,21 @@ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + /*! * A graph defined by tikz code. */ diff --git a/src/data/graphelementdata.cpp b/src/data/graphelementdata.cpp index 01736b8..5b35f63 100644 --- a/src/data/graphelementdata.cpp +++ b/src/data/graphelementdata.cpp @@ -1,3 +1,21 @@ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + #include "graphelementdata.h" #include diff --git a/src/data/graphelementdata.h b/src/data/graphelementdata.h index 740d4dc..58e57a0 100644 --- a/src/data/graphelementdata.h +++ b/src/data/graphelementdata.h @@ -1,3 +1,21 @@ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + #ifndef GRAPHELEMENTDATA_H #define GRAPHELEMENTDATA_H diff --git a/src/data/graphelementproperty.cpp b/src/data/graphelementproperty.cpp index a50af58..0717952 100644 --- a/src/data/graphelementproperty.cpp +++ b/src/data/graphelementproperty.cpp @@ -1,3 +1,21 @@ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + #include "graphelementproperty.h" #include diff --git a/src/data/graphelementproperty.h b/src/data/graphelementproperty.h index 01b6e5a..d37f69e 100644 --- a/src/data/graphelementproperty.h +++ b/src/data/graphelementproperty.h @@ -1,3 +1,21 @@ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + #ifndef GRAPHELEMENTPROPERTY_H #define GRAPHELEMENTPROPERTY_H diff --git a/src/data/node.cpp b/src/data/node.cpp index 085bdf5..ce4286f 100644 --- a/src/data/node.cpp +++ b/src/data/node.cpp @@ -1,3 +1,21 @@ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + #include "node.h" #include "tikzit.h" diff --git a/src/data/node.h b/src/data/node.h index 241d1ca..4d4beee 100644 --- a/src/data/node.h +++ b/src/data/node.h @@ -1,3 +1,21 @@ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + #ifndef NODE_H #define NODE_H diff --git a/src/data/nodestyle.cpp b/src/data/nodestyle.cpp index 3f2c921..b22105c 100644 --- a/src/data/nodestyle.cpp +++ b/src/data/nodestyle.cpp @@ -1,3 +1,21 @@ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + #include "nodestyle.h" #include diff --git a/src/data/nodestyle.h b/src/data/nodestyle.h index 4b48bb3..db38a0a 100644 --- a/src/data/nodestyle.h +++ b/src/data/nodestyle.h @@ -1,3 +1,21 @@ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + #ifndef NODESTYLE_H #define NODESTYLE_H diff --git a/src/data/style.cpp b/src/data/style.cpp index 927271c..2811612 100644 --- a/src/data/style.cpp +++ b/src/data/style.cpp @@ -1,3 +1,21 @@ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + #include "style.h" Style::Style() : _name("none"), _data(0) diff --git a/src/data/style.h b/src/data/style.h index 9d58ebe..ac7e606 100644 --- a/src/data/style.h +++ b/src/data/style.h @@ -1,3 +1,21 @@ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + #ifndef STYLE_H #define STYLE_H diff --git a/src/data/tikzassembler.cpp b/src/data/tikzassembler.cpp index e0197da..fed3c39 100644 --- a/src/data/tikzassembler.cpp +++ b/src/data/tikzassembler.cpp @@ -1,3 +1,21 @@ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + #include "tikzassembler.h" #include "tikzparserdefs.h" diff --git a/src/data/tikzassembler.h b/src/data/tikzassembler.h index 38d67a7..f5b580c 100644 --- a/src/data/tikzassembler.h +++ b/src/data/tikzassembler.h @@ -1,4 +1,22 @@ -/** +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +/*! * Convenience class to hold the parser state while loading tikz graphs or projects. */ diff --git a/src/data/tikzdocument.cpp b/src/data/tikzdocument.cpp index 206ec5b..f685656 100644 --- a/src/data/tikzdocument.cpp +++ b/src/data/tikzdocument.cpp @@ -1,3 +1,21 @@ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + #include #include #include diff --git a/src/data/tikzdocument.h b/src/data/tikzdocument.h index 8f16a53..0d6b48c 100644 --- a/src/data/tikzdocument.h +++ b/src/data/tikzdocument.h @@ -1,3 +1,21 @@ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + /*! * This class contains a tikz Graph, source code, file info, and undo stack. It serves as the model * in the MVC triple (TikzDocument, TikzView, TikzScene). diff --git a/src/data/tikzlexer.l b/src/data/tikzlexer.l index 45494d2..7d7e990 100644 --- a/src/data/tikzlexer.l +++ b/src/data/tikzlexer.l @@ -1,28 +1,29 @@ %{ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger, Chris Heunen, + K. Johan Paulsson, Alex Merry + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + + /*! * \file tikzlexer.l * * The lexer for tikz input. */ -/* - * Copyright 2010 Chris Heunen - * Copyright 2010-2013 Aleks Kissinger - * Copyright 2013 K. Johan Paulsson - * Copyright 2013 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ #include "tikzparserdefs.h" #include "tikzparser.parser.hpp" diff --git a/src/data/tikzparserdefs.h b/src/data/tikzparserdefs.h index 5865739..a5e77be 100644 --- a/src/data/tikzparserdefs.h +++ b/src/data/tikzparserdefs.h @@ -1,3 +1,21 @@ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + #ifndef TIKZPARSERDEFS_H #define TIKZPARSERDEFS_H diff --git a/src/data/tikzstyles.cpp b/src/data/tikzstyles.cpp index c198412..a924c01 100644 --- a/src/data/tikzstyles.cpp +++ b/src/data/tikzstyles.cpp @@ -1,3 +1,21 @@ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + #include "tikzstyles.h" #include "nodestyle.h" diff --git a/src/data/tikzstyles.h b/src/data/tikzstyles.h index 4cd7d6e..0f7cce1 100644 --- a/src/data/tikzstyles.h +++ b/src/data/tikzstyles.h @@ -1,3 +1,21 @@ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + #ifndef PROJECT_H #define PROJECT_H diff --git a/src/gui/edgeitem.cpp b/src/gui/edgeitem.cpp index de51db3..f469506 100644 --- a/src/gui/edgeitem.cpp +++ b/src/gui/edgeitem.cpp @@ -1,3 +1,21 @@ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + #include "tikzit.h" #include "edgeitem.h" diff --git a/src/gui/edgeitem.h b/src/gui/edgeitem.h index 948f137..3d4758a 100644 --- a/src/gui/edgeitem.h +++ b/src/gui/edgeitem.h @@ -1,4 +1,22 @@ -/** +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +/*! * A QGraphicsItem that handles drawing a single edge. */ diff --git a/src/gui/mainmenu.cpp b/src/gui/mainmenu.cpp index 7e2584c..3625338 100644 --- a/src/gui/mainmenu.cpp +++ b/src/gui/mainmenu.cpp @@ -1,3 +1,21 @@ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + #include "mainmenu.h" #include "tikzit.h" diff --git a/src/gui/mainmenu.h b/src/gui/mainmenu.h index bceb69d..aa5c727 100644 --- a/src/gui/mainmenu.h +++ b/src/gui/mainmenu.h @@ -1,3 +1,21 @@ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + #ifndef MAINMENU_H #define MAINMENU_H diff --git a/src/gui/nodeitem.cpp b/src/gui/nodeitem.cpp index b0b7ea6..922747d 100644 --- a/src/gui/nodeitem.cpp +++ b/src/gui/nodeitem.cpp @@ -1,3 +1,21 @@ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + #include "tikzit.h" #include "nodeitem.h" #include "tikzscene.h" diff --git a/src/gui/nodeitem.h b/src/gui/nodeitem.h index 91b3f63..678a7e8 100644 --- a/src/gui/nodeitem.h +++ b/src/gui/nodeitem.h @@ -1,3 +1,21 @@ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + /*! * A QGraphicsItem that handles drawing a single node. */ diff --git a/src/gui/propertypalette.cpp b/src/gui/propertypalette.cpp index 3e4ba88..c27b8b2 100644 --- a/src/gui/propertypalette.cpp +++ b/src/gui/propertypalette.cpp @@ -1,3 +1,21 @@ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + #include "propertypalette.h" #include "graphelementdata.h" #include "ui_propertypalette.h" diff --git a/src/gui/propertypalette.h b/src/gui/propertypalette.h index 80f2d88..29fb0af 100644 --- a/src/gui/propertypalette.h +++ b/src/gui/propertypalette.h @@ -1,3 +1,21 @@ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + /*! * Enables the user to edit properties of the graph, as well as the selected node/edge. */ diff --git a/src/gui/stylepalette.cpp b/src/gui/stylepalette.cpp index f1462df..6d6599b 100644 --- a/src/gui/stylepalette.cpp +++ b/src/gui/stylepalette.cpp @@ -1,3 +1,21 @@ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + #include "stylepalette.h" #include "ui_stylepalette.h" #include "tikzit.h" diff --git a/src/gui/stylepalette.h b/src/gui/stylepalette.h index cc8fb73..45dc8da 100644 --- a/src/gui/stylepalette.h +++ b/src/gui/stylepalette.h @@ -1,3 +1,21 @@ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + #ifndef STYLEPALETTE_H #define STYLEPALETTE_H diff --git a/src/gui/tikzscene.cpp b/src/gui/tikzscene.cpp index 3c8fb71..772c67b 100644 --- a/src/gui/tikzscene.cpp +++ b/src/gui/tikzscene.cpp @@ -1,3 +1,21 @@ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + #include "tikzit.h" #include "util.h" #include "tikzscene.h" diff --git a/src/gui/tikzscene.h b/src/gui/tikzscene.h index 9d90c4f..4ac56c7 100644 --- a/src/gui/tikzscene.h +++ b/src/gui/tikzscene.h @@ -1,3 +1,21 @@ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + /*! * Manage the scene, which contains a single Graph, and respond to user input. This serves as * the controller for the MVC (TikzDocument, TikzView, TikzScene). diff --git a/src/gui/tikzview.cpp b/src/gui/tikzview.cpp index 9997106..700cf29 100644 --- a/src/gui/tikzview.cpp +++ b/src/gui/tikzview.cpp @@ -1,3 +1,21 @@ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + #include "tikzview.h" #include "tikzit.h" diff --git a/src/gui/tikzview.h b/src/gui/tikzview.h index b2006c8..4ec9f3d 100644 --- a/src/gui/tikzview.h +++ b/src/gui/tikzview.h @@ -1,3 +1,21 @@ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + /*! * Display a Graph, and manage any user input that purely changes the view (e.g. Zoom). This * serves as the view in the MVC (TikzDocument, TikzView, TikzScene). diff --git a/src/gui/toolpalette.cpp b/src/gui/toolpalette.cpp index 0d0bd30..43a4a49 100644 --- a/src/gui/toolpalette.cpp +++ b/src/gui/toolpalette.cpp @@ -1,3 +1,21 @@ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + #include "toolpalette.h" #include diff --git a/src/gui/toolpalette.h b/src/gui/toolpalette.h index 1876043..a001055 100644 --- a/src/gui/toolpalette.h +++ b/src/gui/toolpalette.h @@ -1,3 +1,21 @@ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + /*! * A small window that lets the user select the current editing tool. */ diff --git a/src/gui/undocommands.cpp b/src/gui/undocommands.cpp index 5ce6941..5525cb7 100644 --- a/src/gui/undocommands.cpp +++ b/src/gui/undocommands.cpp @@ -1,3 +1,21 @@ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + #include "undocommands.h" #include "nodeitem.h" #include "edgeitem.h" diff --git a/src/gui/undocommands.h b/src/gui/undocommands.h index ad76479..292632e 100644 --- a/src/gui/undocommands.h +++ b/src/gui/undocommands.h @@ -1,3 +1,21 @@ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + /*! * \file undocommands.h * diff --git a/src/main.cpp b/src/main.cpp index 3532888..4d6f9a7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,4 +1,23 @@ -/** +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + + +/*! * \file main.cpp * * The main entry point for the TikZiT executable. diff --git a/src/tikzit.cpp b/src/tikzit.cpp index dca6d95..9a4e166 100644 --- a/src/tikzit.cpp +++ b/src/tikzit.cpp @@ -1,3 +1,21 @@ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + #include "tikzit.h" #include "tikzassembler.h" #include "tikzstyles.h" diff --git a/src/tikzit.h b/src/tikzit.h index 5ae9490..232a4aa 100644 --- a/src/tikzit.h +++ b/src/tikzit.h @@ -1,3 +1,22 @@ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + + /*! * * \mainpage TikZiT Documentation diff --git a/src/util.cpp b/src/util.cpp index 5e56cd9..9c699f5 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -1,3 +1,21 @@ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + #include "util.h" float bezierInterpolate(float dist, float c0, float c1, float c2, float c3) { diff --git a/src/util.h b/src/util.h index 706928d..aff0587 100644 --- a/src/util.h +++ b/src/util.h @@ -1,3 +1,21 @@ +/* + TikZiT - a GUI diagram editor for TikZ + Copyright (C) 2018 Aleks Kissinger + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + /*! * Various utility functions, mostly for mathematical calculation. */ diff --git a/tikzit-old/.gitignore b/tikzit-old/.gitignore deleted file mode 100644 index fc1d580..0000000 --- a/tikzit-old/.gitignore +++ /dev/null @@ -1,235 +0,0 @@ -# Previous gitignore items - -*~ -*.swp -*.o -.deps -.dirstamp -Makefile -Makefile.in -/aclocal.m4 -/autom4te.cache -/config.guess -/config.log -/config.status -/config.sub -/configure -/depcomp -/install-sh -/missing -/src/tikzit -/src/tikzit.res -/src/common/tikzlexer.h -/src/common/tikzlexer.m -/src/common/tikzparser.m -/src/common/tikzparser.h -/src/gtk/icondata.m -/src/gtk/logodata.m -/src/gtk/edgedecdata.m -/tikzit-*.tar.gz -/tikzit-*.tar.bz2 -xbuild - -######################### -# .gitignore file for Xcode4 and Xcode5 Source projects -# -# Apple bugs, waiting for Apple to fix/respond: -# -# 15564624 - what does the xccheckout file in Xcode5 do? Where's the documentation? -# -# Version 2.3 -# For latest version, see: http://stackoverflow.com/questions/49478/git-ignore-file-for-xcode-projects -# -# 2014 updates: -# - appended non-standard items DISABLED by default (uncomment if you use those tools) -# - removed the edit that an SO.com moderator made without bothering to ask me -# - researched CocoaPods .lock more carefully, thanks to Gokhan Celiker -# 2013 updates: -# - fixed the broken "save personal Schemes" -# - added line-by-line explanations for EVERYTHING (some were missing) -# -# NB: if you are storing "built" products, this WILL NOT WORK, -# and you should use a different .gitignore (or none at all) -# This file is for SOURCE projects, where there are many extra -# files that we want to exclude -# -######################### - -##### -# OS X temporary files that should never be committed -# -# c.f. http://www.westwind.com/reference/os-x/invisibles.html - -.DS_Store -.Trashes -*.swp - -# -# *.lock - this is used and abused by many editors for many different things. -# For the main ones I use (e.g. Eclipse), it should be excluded -# from source-control, but YMMV. -# (lock files are usually local-only file-synchronization on the local FS that should NOT go in git) -# c.f. the "OPTIONAL" section at bottom though, for tool-specific variations! - -*.lock - - -# -# profile - REMOVED temporarily (on double-checking, I can't find it in OS X docs?) -#profile - - -#### -# Xcode temporary files that should never be committed -# -# NB: NIB/XIB files still exist even on Storyboard projects, so we want this... - -*~.nib - - -#### -# Xcode build files - -# -# NB: slash on the end, so we only remove the FOLDER, not any files that were badly named "DerivedData" - -DerivedData/ - -# NB: slash on the end, so we only remove the FOLDER, not any files that were badly named "build" - -build/ - - -##### -# Xcode private settings (window sizes, bookmarks, breakpoints, custom executables, smart groups) -# -# This is complicated: -# -# SOMETIMES you need to put this file in version control. -# Apple designed it poorly - if you use "custom executables", they are -# saved in this file. -# 99% of projects do NOT use those, so they do NOT want to version control this file. -# ..but if you're in the 1%, comment out the line "*.pbxuser" - -# .pbxuser: http://lists.apple.com/archives/xcode-users/2004/Jan/msg00193.html - -*.pbxuser - -# .mode1v3: http://lists.apple.com/archives/xcode-users/2007/Oct/msg00465.html - -*.mode1v3 - -# .mode2v3: http://lists.apple.com/archives/xcode-users/2007/Oct/msg00465.html - -*.mode2v3 - -# .perspectivev3: http://stackoverflow.com/questions/5223297/xcode-projects-what-is-a-perspectivev3-file - -*.perspectivev3 - -# NB: also, whitelist the default ones, some projects need to use these -!default.pbxuser -!default.mode1v3 -!default.mode2v3 -!default.perspectivev3 - - -#### -# Xcode 4 - semi-personal settings -# -# -# OPTION 1: --------------------------------- -# throw away ALL personal settings (including custom schemes! -# - unless they are "shared") -# -# NB: this is exclusive with OPTION 2 below -xcuserdata - -# OPTION 2: --------------------------------- -# get rid of ALL personal settings, but KEEP SOME OF THEM -# - NB: you must manually uncomment the bits you want to keep -# -# NB: this *requires* git v1.8.2 or above; you may need to upgrade to latest OS X, -# or manually install git over the top of the OS X version -# NB: this is exclusive with OPTION 1 above -# -#xcuserdata/**/* - -# (requires option 2 above): Personal Schemes -# -#!xcuserdata/**/xcschemes/* - -#### -# XCode 4 workspaces - more detailed -# -# Workspaces are important! They are a core feature of Xcode - don't exclude them :) -# -# Workspace layout is quite spammy. For reference: -# -# /(root)/ -# /(project-name).xcodeproj/ -# project.pbxproj -# /project.xcworkspace/ -# contents.xcworkspacedata -# /xcuserdata/ -# /(your name)/xcuserdatad/ -# UserInterfaceState.xcuserstate -# /xcsshareddata/ -# /xcschemes/ -# (shared scheme name).xcscheme -# /xcuserdata/ -# /(your name)/xcuserdatad/ -# (private scheme).xcscheme -# xcschememanagement.plist -# -# - -#### -# Xcode 4 - Deprecated classes -# -# Allegedly, if you manually "deprecate" your classes, they get moved here. -# -# We're using source-control, so this is a "feature" that we do not want! - -*.moved-aside - -#### -# OPTIONAL: Some well-known tools that people use side-by-side with Xcode / iOS development -# -# NB: I'd rather not include these here, but gitignore's design is weak and doesn't allow -# modular gitignore: you have to put EVERYTHING in one file. -# -# COCOAPODS: -# -# c.f. http://guides.cocoapods.org/using/using-cocoapods.html#what-is-a-podfilelock -# c.f. http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control -# -#!Podfile.lock -# -# RUBY: -# -# c.f. http://yehudakatz.com/2010/12/16/clarifying-the-roles-of-the-gemspec-and-gemfile/ -# -#!Gemfile.lock -# -# IDEA: -# -#.idea -# -# TEXTMATE: -# -# -- UNVERIFIED: c.f. http://stackoverflow.com/a/50283/153422 -# -#tm_build_errors - -#### -# UNKNOWN: recommended by others, but I can't discover what these files are -# -# Community suggestions (unverified, no evidence available - DISABLED by default) -# -# 1. Xcode 5 - VCS file -# -# "The data in this file not represent state of your project. -# If you'll leave this file in git - you will have merge conflicts during -# pull your cahnges to other's repo" -# -#*.xccheckout \ No newline at end of file diff --git a/tikzit-old/AH_latex_head.png b/tikzit-old/AH_latex_head.png deleted file mode 100644 index b25cf6d..0000000 Binary files a/tikzit-old/AH_latex_head.png and /dev/null differ diff --git a/tikzit-old/AH_latex_tail.png b/tikzit-old/AH_latex_tail.png deleted file mode 100644 index 0825cda..0000000 Binary files a/tikzit-old/AH_latex_tail.png and /dev/null differ diff --git a/tikzit-old/AH_none.png b/tikzit-old/AH_none.png deleted file mode 100644 index 6322374..0000000 Binary files a/tikzit-old/AH_none.png and /dev/null differ diff --git a/tikzit-old/AH_plain_head.png b/tikzit-old/AH_plain_head.png deleted file mode 100644 index 8a398fa..0000000 Binary files a/tikzit-old/AH_plain_head.png and /dev/null differ diff --git a/tikzit-old/AH_plain_tail.png b/tikzit-old/AH_plain_tail.png deleted file mode 100644 index 45b1876..0000000 Binary files a/tikzit-old/AH_plain_tail.png and /dev/null differ diff --git a/tikzit-old/COPYING b/tikzit-old/COPYING deleted file mode 100644 index 1f963da..0000000 --- a/tikzit-old/COPYING +++ /dev/null @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. - diff --git a/tikzit-old/DESIGN-GTK b/tikzit-old/DESIGN-GTK deleted file mode 100644 index 7952a34..0000000 --- a/tikzit-old/DESIGN-GTK +++ /dev/null @@ -1,23 +0,0 @@ -Some documentation on how the GTK+ port is designed. - -State classes: - -StyleManager keeps track of what user-defined styles the application -knows about, and which one is currently "active". The active style -is used when creating new nodes. - -Preambles keeps track of the preambles used for previews. - - -GUI classes: - -MainWindow is the core class that manages the application as a whole. -It manages the main GtkWindow and is generally responsible for loading -the various UI elements. It also keeps track of the main application -configuration file, the user-defined styles (via StyleManager) and the -custom preambles (via Preambles). - -The Menu class manages the menu and toolbar for MainWindow. It uses -GtkUiManager to load these from an XML description, and deals with the -GTK+ callbacks for the various actions. - diff --git a/tikzit-old/ED_arrow.png b/tikzit-old/ED_arrow.png deleted file mode 100644 index 153d2e1..0000000 Binary files a/tikzit-old/ED_arrow.png and /dev/null differ diff --git a/tikzit-old/ED_none.png b/tikzit-old/ED_none.png deleted file mode 100644 index f95140c..0000000 Binary files a/tikzit-old/ED_none.png and /dev/null differ diff --git a/tikzit-old/ED_tick.png b/tikzit-old/ED_tick.png deleted file mode 100644 index a3882fe..0000000 Binary files a/tikzit-old/ED_tick.png and /dev/null differ diff --git a/tikzit-old/English.lproj/Credits.rtf b/tikzit-old/English.lproj/Credits.rtf deleted file mode 100644 index 708d138..0000000 --- a/tikzit-old/English.lproj/Credits.rtf +++ /dev/null @@ -1,18 +0,0 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf250 -{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fnil\fcharset0 LucidaSans-Typewriter;} -{\colortbl;\red255\green255\blue255;\red0\green0\blue0;} -\vieww9000\viewh8400\viewkind0 -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural - -\f0\b\fs24 \cf0 TikZiT\ -\ -Copyright 2010 Aleks Kissinger. All rights reserved.\ - -\b0 \ -\pard\tx560\pardeftab560\ql\qnatural\pardirnatural - -\f1\fs22 \cf2 \CocoaLigature0 TikZiT is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\ -\ -TikZiT is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\ -\ -You should have received a copy of the GNU General Public License along with TikZiT. If not, see .} \ No newline at end of file diff --git a/tikzit-old/English.lproj/CustomNodes.xib b/tikzit-old/English.lproj/CustomNodes.xib deleted file mode 100644 index 33f6e3a..0000000 --- a/tikzit-old/English.lproj/CustomNodes.xib +++ /dev/null @@ -1,256 +0,0 @@ - - - - - - - - - - - - - - - - - - - - name - strokeThickness - strokeColor - fillColor - strokeColorIsKnown - fillColorIsKnown - representedObject.name - shapeName - scale - @distinctUnionOfObjects.category - category - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \begin{tikzpicture} - -\end{tikzpicture} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tikzit-old/English.lproj/InfoPlist.strings b/tikzit-old/English.lproj/InfoPlist.strings deleted file mode 100644 index 477b28f..0000000 --- a/tikzit-old/English.lproj/InfoPlist.strings +++ /dev/null @@ -1,2 +0,0 @@ -/* Localized versions of Info.plist keys */ - diff --git a/tikzit-old/English.lproj/MainMenu.xib b/tikzit-old/English.lproj/MainMenu.xib deleted file mode 100644 index c7f22d7..0000000 --- a/tikzit-old/English.lproj/MainMenu.xib +++ /dev/null @@ -1,453 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -CA - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tikzit-old/English.lproj/Preamble.xib b/tikzit-old/English.lproj/Preamble.xib deleted file mode 100644 index 54a4125..0000000 --- a/tikzit-old/English.lproj/Preamble.xib +++ /dev/null @@ -1,235 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NSNegateBoolean - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NSNegateBoolean - - - - - - - - - - - - - - - - - - - - - - - - - - - - key - - - default - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tikzit-old/English.lproj/Preview.xib b/tikzit-old/English.lproj/Preview.xib deleted file mode 100644 index cb1e82c..0000000 --- a/tikzit-old/English.lproj/Preview.xib +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tikzit-old/English.lproj/PropertyInspector.xib b/tikzit-old/English.lproj/PropertyInspector.xib deleted file mode 100644 index 9f19b5c..0000000 --- a/tikzit-old/English.lproj/PropertyInspector.xib +++ /dev/null @@ -1,769 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Multiple Values - NilToEmptyStringTransformer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NSNegateBoolean - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NilToEmptyStringTransformer - - - - - - - - - - - - - - - - - - - - - - - NSNegateBoolean - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NilToEmptyStringTransformer - - - - - - - - - - - - - - - - - - - - - - - NSNegateBoolean - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NilToEmptyStringTransformer - - - - - - - - - - - - - - - - - - - - - - - NSNegateBoolean - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NilToEmptyStringTransformer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - key - value - isAtom - - - - - key - value - isAtom - - - - - key - value - isAtom - - - - - key - value - isAtom - - - - - label - - - - - - - - edgeNode - - - - - - - - - - - - - - - - - - - - - - - - - - - NilToEmptyStringTransformer - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tikzit-old/English.lproj/StylePalette.xib b/tikzit-old/English.lproj/StylePalette.xib deleted file mode 100644 index 6385ba8..0000000 --- a/tikzit-old/English.lproj/StylePalette.xib +++ /dev/null @@ -1,631 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - uncategorized - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - uncategorized - - - - - - - - - name - strokeThickness - strokeColor - fillColor - strokeColorIsKnown - fillColorIsKnown - representedObject.name - shapeName - scale - @distinctUnionOfObjects.category - category - - - - - - - - @distinctUnionOfObjects.category - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - uncategorized - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - uncategorized - - - - - - - - - - - name - headStyle - tailStyle - decorationStyle - category - - - - - - - - name - headStyle - tailStyle - decorationStyle - category - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tikzit-old/English.lproj/TikzDocument.xib b/tikzit-old/English.lproj/TikzDocument.xib deleted file mode 100644 index 842b810..0000000 --- a/tikzit-old/English.lproj/TikzDocument.xib +++ /dev/null @@ -1,161 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \begin{tikzpicture} - -\end{tikzpicture} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tikzit-old/English.lproj/UserDefaults.plist b/tikzit-old/English.lproj/UserDefaults.plist deleted file mode 100644 index cdd5c8f..0000000 --- a/tikzit-old/English.lproj/UserDefaults.plist +++ /dev/null @@ -1,10 +0,0 @@ - - - - - net.sourceforge.tikzit.pdflatexpath - /usr/texbin/pdflatex - net.sourceforge.tikzit.previewfocus - - - diff --git a/tikzit-old/Frameworks/SFBInspectors.framework/Headers b/tikzit-old/Frameworks/SFBInspectors.framework/Headers deleted file mode 120000 index a177d2a..0000000 --- a/tikzit-old/Frameworks/SFBInspectors.framework/Headers +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Headers \ No newline at end of file diff --git a/tikzit-old/Frameworks/SFBInspectors.framework/Resources b/tikzit-old/Frameworks/SFBInspectors.framework/Resources deleted file mode 120000 index 953ee36..0000000 --- a/tikzit-old/Frameworks/SFBInspectors.framework/Resources +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Resources \ No newline at end of file diff --git a/tikzit-old/Frameworks/SFBInspectors.framework/SFBInspectors b/tikzit-old/Frameworks/SFBInspectors.framework/SFBInspectors deleted file mode 120000 index d0c5a0b..0000000 --- a/tikzit-old/Frameworks/SFBInspectors.framework/SFBInspectors +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/SFBInspectors \ No newline at end of file diff --git a/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPane.h b/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPane.h deleted file mode 100644 index b50c12d..0000000 --- a/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPane.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (C) 2009 Stephen F. Booth - * All Rights Reserved - */ - -#import - -#define INSPECTOR_PANE_HEADER_HEIGHT 17 - -@class SFBInspectorPaneHeader, SFBInspectorPaneBody; - -@interface SFBInspectorPane : NSView -{ -@private - BOOL _collapsed; - SFBInspectorPaneHeader *_headerView; - SFBInspectorPaneBody *_bodyView; -} - -@property (readonly, assign, getter=isCollapsed) BOOL collapsed; - -- (NSString *) title; -- (void) setTitle:(NSString *)title; - -- (IBAction) toggleCollapsed:(id)sender; -- (void) setCollapsed:(BOOL)collapsed animate:(BOOL)animate; - -- (SFBInspectorPaneHeader *) headerView; -- (SFBInspectorPaneBody *) bodyView; - -@end diff --git a/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPaneBody.h b/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPaneBody.h deleted file mode 100644 index 250f9e6..0000000 --- a/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPaneBody.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (C) 2009 Stephen F. Booth - * All Rights Reserved - */ - -#import - -@interface SFBInspectorPaneBody : NSView -{ -@private - CGFloat _normalHeight; -} - -@property (readonly, assign) CGFloat normalHeight; - -@end diff --git a/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPaneHeader.h b/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPaneHeader.h deleted file mode 100644 index 3512d75..0000000 --- a/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorPaneHeader.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2009 Stephen F. Booth - * All Rights Reserved - */ - -#import - -@class SFBInspectorPane; - -@interface SFBInspectorPaneHeader : NSView -{ -@private - BOOL _pressed; - NSButton *_disclosureButton; - NSTextField *_titleTextField; -} - -- (NSString *) title; -- (void) setTitle:(NSString *)title; - -- (NSButton *) disclosureButton; -- (NSTextField *) titleTextField; - -@end diff --git a/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorView.h b/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorView.h deleted file mode 100644 index e7f4b53..0000000 --- a/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBInspectorView.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (C) 2009 Stephen F. Booth - * All Rights Reserved - */ - -#import - -@interface SFBInspectorView : NSView -{ -@private - NSSize _initialWindowSize; -} - -- (void) addInspectorPaneController:(NSViewController *)paneController; -- (void) addInspectorPane:(NSView *)paneBody title:(NSString *)title; - -@end diff --git a/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelector.h b/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelector.h deleted file mode 100644 index 8645914..0000000 --- a/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelector.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (C) 2009 Stephen F. Booth - * All Rights Reserved - */ - -#import - -#define VIEW_SELECTOR_BAR_HEIGHT 25 - -@class SFBViewSelectorBar; - -@interface SFBViewSelector : NSView -{ -@private - NSSize _initialWindowSize; - SFBViewSelectorBar *_selectorBar; - NSView *_bodyView; -} - -- (SFBViewSelectorBar *) selectorBar; - -@end diff --git a/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelectorBar.h b/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelectorBar.h deleted file mode 100644 index d0c8c30..0000000 --- a/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelectorBar.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2009 Stephen F. Booth - * All Rights Reserved - */ - -#import - -@class SFBViewSelectorBarItem; - -@interface SFBViewSelectorBar : NSView -{ -@private - NSInteger _selectedIndex; - NSInteger _pressedIndex; - NSMutableArray *_items; -} - -@property (assign) NSInteger selectedIndex; -@property (readonly) SFBViewSelectorBarItem * selectedItem; - -- (void) addItem:(SFBViewSelectorBarItem *)item; - -- (BOOL) selectItem:(SFBViewSelectorBarItem *)item; -- (BOOL) selectItemWithIdentifer:(NSString *)itemIdentifier; - -- (SFBViewSelectorBarItem *) itemAtIndex:(NSInteger)itemIndex; -- (SFBViewSelectorBarItem *) itemWithIdentifier:(NSString *)itemIdentifier; - -@end diff --git a/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelectorBarItem.h b/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelectorBarItem.h deleted file mode 100644 index c18cfb3..0000000 --- a/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Headers/SFBViewSelectorBarItem.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (C) 2009 Stephen F. Booth - * All Rights Reserved - */ - -#import - -@interface SFBViewSelectorBarItem : NSObject -{ -@private - NSString *_identifier; - NSString *_label; - NSString *_tooltip; - NSImage *_image; - NSView *_view; -} - -@property (copy) NSString * identifier; -@property (copy) NSString * label; -@property (copy) NSString * tooltip; -@property (copy) NSImage * image; -@property (retain) NSView * view; - -+ (id) itemWithIdentifier:(NSString *)identifier label:(NSString *)label tooltip:(NSString *)tooltip image:(NSImage *)image view:(NSView *)view; - -- (id) initWithIdentifier:(NSString *)identifier label:(NSString *)label tooltip:(NSString *)tooltip image:(NSImage *)image view:(NSView *)view; - -@end diff --git a/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Resources/English.lproj/InfoPlist.strings b/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Resources/English.lproj/InfoPlist.strings deleted file mode 100644 index dea12de..0000000 Binary files a/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Resources/English.lproj/InfoPlist.strings and /dev/null differ diff --git a/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Resources/Info.plist b/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Resources/Info.plist deleted file mode 100644 index d3e80f3..0000000 --- a/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/Resources/Info.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - SFBInspectors - CFBundleIdentifier - org.sbooth.Inspectors - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - SFBInspectors - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - - diff --git a/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/SFBInspectors b/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/SFBInspectors deleted file mode 100755 index 6174fbb..0000000 Binary files a/tikzit-old/Frameworks/SFBInspectors.framework/Versions/A/SFBInspectors and /dev/null differ diff --git a/tikzit-old/Frameworks/SFBInspectors.framework/Versions/Current b/tikzit-old/Frameworks/SFBInspectors.framework/Versions/Current deleted file mode 120000 index 8c7e5a6..0000000 --- a/tikzit-old/Frameworks/SFBInspectors.framework/Versions/Current +++ /dev/null @@ -1 +0,0 @@ -A \ No newline at end of file diff --git a/tikzit-old/Frameworks/Sparkle.framework/Headers b/tikzit-old/Frameworks/Sparkle.framework/Headers deleted file mode 120000 index a177d2a..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Headers +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Headers \ No newline at end of file diff --git a/tikzit-old/Frameworks/Sparkle.framework/Resources b/tikzit-old/Frameworks/Sparkle.framework/Resources deleted file mode 120000 index 953ee36..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Resources +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Resources \ No newline at end of file diff --git a/tikzit-old/Frameworks/Sparkle.framework/Sparkle b/tikzit-old/Frameworks/Sparkle.framework/Sparkle deleted file mode 120000 index b2c5273..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Sparkle +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Sparkle \ No newline at end of file diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcast.h b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcast.h deleted file mode 100644 index 171148a..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcast.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// SUAppcast.h -// Sparkle -// -// Created by Andy Matuschak on 3/12/06. -// Copyright 2006 Andy Matuschak. All rights reserved. -// - -#ifndef SUAPPCAST_H -#define SUAPPCAST_H - -@class SUAppcastItem; -@interface SUAppcast : NSObject { - NSArray *items; - NSString *userAgentString; - id delegate; - NSMutableData *incrementalData; -} - -- (void)fetchAppcastFromURL:(NSURL *)url; -- (void)setDelegate:delegate; -- (void)setUserAgentString:(NSString *)userAgentString; - -- (NSArray *)items; - -@end - -@interface NSObject (SUAppcastDelegate) -- (void)appcastDidFinishLoading:(SUAppcast *)appcast; -- (void)appcast:(SUAppcast *)appcast failedToLoadWithError:(NSError *)error; -@end - -#endif diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h deleted file mode 100644 index 7f1ca65..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h +++ /dev/null @@ -1,47 +0,0 @@ -// -// SUAppcastItem.h -// Sparkle -// -// Created by Andy Matuschak on 3/12/06. -// Copyright 2006 Andy Matuschak. All rights reserved. -// - -#ifndef SUAPPCASTITEM_H -#define SUAPPCASTITEM_H - -@interface SUAppcastItem : NSObject { - NSString *title; - NSDate *date; - NSString *itemDescription; - - NSURL *releaseNotesURL; - - NSString *DSASignature; - NSString *minimumSystemVersion; - - NSURL *fileURL; - NSString *versionString; - NSString *displayVersionString; - - NSDictionary *propertiesDictionary; -} - -// Initializes with data from a dictionary provided by the RSS class. -- initWithDictionary:(NSDictionary *)dict; - -- (NSString *)title; -- (NSString *)versionString; -- (NSString *)displayVersionString; -- (NSDate *)date; -- (NSString *)itemDescription; -- (NSURL *)releaseNotesURL; -- (NSURL *)fileURL; -- (NSString *)DSASignature; -- (NSString *)minimumSystemVersion; - -// Returns the dictionary provided in initWithDictionary; this might be useful later for extensions. -- (NSDictionary *)propertiesDictionary; - -@end - -#endif diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Headers/SUUpdater.h b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Headers/SUUpdater.h deleted file mode 100644 index e78c4d3..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Headers/SUUpdater.h +++ /dev/null @@ -1,118 +0,0 @@ -// -// SUUpdater.h -// Sparkle -// -// Created by Andy Matuschak on 1/4/06. -// Copyright 2006 Andy Matuschak. All rights reserved. -// - -#ifndef SUUPDATER_H -#define SUUPDATER_H - -#import - -@class SUUpdateDriver, SUAppcastItem, SUHost, SUAppcast; -@interface SUUpdater : NSObject { - NSTimer *checkTimer; - SUUpdateDriver *driver; - - SUHost *host; - IBOutlet id delegate; -} - -+ (SUUpdater *)sharedUpdater; -+ (SUUpdater *)updaterForBundle:(NSBundle *)bundle; -- (NSBundle *)hostBundle; - -- (void)setDelegate:(id)delegate; -- delegate; - -- (void)setAutomaticallyChecksForUpdates:(BOOL)automaticallyChecks; -- (BOOL)automaticallyChecksForUpdates; - -- (void)setUpdateCheckInterval:(NSTimeInterval)interval; -- (NSTimeInterval)updateCheckInterval; - -- (void)setFeedURL:(NSURL *)feedURL; -- (NSURL *)feedURL; - -- (void)setSendsSystemProfile:(BOOL)sendsSystemProfile; -- (BOOL)sendsSystemProfile; - -- (void)setAutomaticallyDownloadsUpdates:(BOOL)automaticallyDownloadsUpdates; -- (BOOL)automaticallyDownloadsUpdates; - -// This IBAction is meant for a main menu item. Hook up any menu item to this action, -// and Sparkle will check for updates and report back its findings verbosely. -- (IBAction)checkForUpdates:sender; - -// This kicks off an update meant to be programmatically initiated. That is, it will display no UI unless it actually finds an update, -// in which case it proceeds as usual. If the fully automated updating is turned on, however, this will invoke that behavior, and if an -// update is found, it will be downloaded and prepped for installation. -- (void)checkForUpdatesInBackground; - -// Date of last update check. Returns null if no check has been performed. -- (NSDate*)lastUpdateCheckDate; - -// This begins a "probing" check for updates which will not actually offer to update to that version. The delegate methods, though, -// (up to updater:didFindValidUpdate: and updaterDidNotFindUpdate:), are called, so you can use that information in your UI. -- (void)checkForUpdateInformation; - -// Call this to appropriately schedule or cancel the update checking timer according to the preferences for time interval and automatic checks. This call does not change the date of the next check, but only the internal NSTimer. -- (void)resetUpdateCycle; - -- (BOOL)updateInProgress; -@end - -@interface NSObject (SUUpdaterDelegateInformalProtocol) -// This method allows you to add extra parameters to the appcast URL, potentially based on whether or not Sparkle will also be sending along the system profile. This method should return an array of dictionaries with keys: "key", "value", "displayKey", "displayValue", the latter two being specifically for display to the user. -- (NSArray *)feedParametersForUpdater:(SUUpdater *)updater sendingSystemProfile:(BOOL)sendingProfile; - -// Use this to override the default behavior for Sparkle prompting the user about automatic update checks. -- (BOOL)updaterShouldPromptForPermissionToCheckForUpdates:(SUUpdater *)bundle; - -// Implement this if you want to do some special handling with the appcast once it finishes loading. -- (void)updater:(SUUpdater *)updater didFinishLoadingAppcast:(SUAppcast *)appcast; - -// If you're using special logic or extensions in your appcast, implement this to use your own logic for finding -// a valid update, if any, in the given appcast. -- (SUAppcastItem *)bestValidUpdateInAppcast:(SUAppcast *)appcast forUpdater:(SUUpdater *)bundle; - -// Sent when a valid update is found by the update driver. -- (void)updater:(SUUpdater *)updater didFindValidUpdate:(SUAppcastItem *)update; - -// Sent when a valid update is not found. -- (void)updaterDidNotFindUpdate:(SUUpdater *)update; - -// Sent immediately before installing the specified update. -- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)update; - -// Return YES to delay the relaunch until you do some processing; invoke the given NSInvocation to continue. -- (BOOL)updater:(SUUpdater *)updater shouldPostponeRelaunchForUpdate:(SUAppcastItem *)update untilInvoking:(NSInvocation *)invocation; - -// Called immediately before relaunching. -- (void)updaterWillRelaunchApplication:(SUUpdater *)updater; - -// This method allows you to provide a custom version comparator. -// If you don't implement this method or return nil, the standard version comparator will be used. -- (id )versionComparatorForUpdater:(SUUpdater *)updater; - -// Returns the path which is used to relaunch the client after the update is installed. By default, the path of the host bundle. -- (NSString *)pathToRelaunchForUpdater:(SUUpdater *)updater; - -@end - -// Define some minimum intervals to avoid DOS-like checking attacks. These are in seconds. -#ifdef DEBUG -#define SU_MIN_CHECK_INTERVAL 60 -#else -#define SU_MIN_CHECK_INTERVAL 60*60 -#endif - -#ifdef DEBUG -#define SU_DEFAULT_CHECK_INTERVAL 60 -#else -#define SU_DEFAULT_CHECK_INTERVAL 60*60*24 -#endif - -#endif diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h deleted file mode 100644 index 3d11ae8..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h +++ /dev/null @@ -1,27 +0,0 @@ -// -// SUVersionComparisonProtocol.h -// Sparkle -// -// Created by Andy Matuschak on 12/21/07. -// Copyright 2007 Andy Matuschak. All rights reserved. -// - -#ifndef SUVERSIONCOMPARISONPROTOCOL_H -#define SUVERSIONCOMPARISONPROTOCOL_H - -/*! - @protocol - @abstract Implement this protocol to provide version comparison facilities for Sparkle. -*/ -@protocol SUVersionComparison - -/*! - @method - @abstract An abstract method to compare two version strings. - @discussion Should return NSOrderedAscending if b > a, NSOrderedDescending if b < a, and NSOrderedSame if they are equivalent. -*/ -- (NSComparisonResult)compareVersion:(NSString *)versionA toVersion:(NSString *)versionB; - -@end - -#endif diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Headers/Sparkle.h b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Headers/Sparkle.h deleted file mode 100644 index 08dd577..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Headers/Sparkle.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// Sparkle.h -// Sparkle -// -// Created by Andy Matuschak on 3/16/06. (Modified by CDHW on 23/12/07) -// Copyright 2006 Andy Matuschak. All rights reserved. -// - -#ifndef SPARKLE_H -#define SPARKLE_H - -// This list should include the shared headers. It doesn't matter if some of them aren't shared (unless -// there are name-space collisions) so we can list all of them to start with: - -#import - -#import -#import -#import - -#endif diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/Info.plist b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/Info.plist deleted file mode 100644 index c7f277d..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/Info.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - Sparkle - CFBundleIdentifier - org.andymatuschak.Sparkle - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - Sparkle - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.5 Beta 6 - CFBundleSignature - ???? - CFBundleVersion - 313 - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/License.txt b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/License.txt deleted file mode 100644 index 20466c4..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/License.txt +++ /dev/null @@ -1,7 +0,0 @@ -Copyright (c) 2006 Andy Matuschak - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/SUModelTranslation.plist b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/SUModelTranslation.plist deleted file mode 100644 index 92ef947..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/SUModelTranslation.plist +++ /dev/null @@ -1,174 +0,0 @@ - - - - - ADP2,1 - Developer Transition Kit - MacBook1,1 - MacBook (Core Duo) - MacBook2,1 - MacBook (Core 2 Duo) - MacBook4,1 - MacBook (Core 2 Duo Feb 2008) - MacBookAir1,1 - MacBook Air (January 2008) - MacBookPro1,1 - MacBook Pro Core Duo (15-inch) - MacBookPro1,2 - MacBook Pro Core Duo (17-inch) - MacBookPro2,1 - MacBook Pro Core 2 Duo (17-inch) - MacBookPro2,2 - MacBook Pro Core 2 Duo (15-inch) - MacBookPro3,1 - MacBook Pro Core 2 Duo (15-inch LED, Core 2 Duo) - MacBookPro3,2 - MacBook Pro Core 2 Duo (17-inch HD, Core 2 Duo) - MacBookPro4,1 - MacBook Pro (Core 2 Duo Feb 2008) - MacPro1,1 - Mac Pro (four-core) - MacPro2,1 - Mac Pro (eight-core) - MacPro3,1 - Mac Pro (January 2008 4- or 8- core "Harpertown") - Macmini1,1 - Mac Mini (Core Solo/Duo) - PowerBook1,1 - PowerBook G3 - PowerBook2,1 - iBook G3 - PowerBook2,2 - iBook G3 (FireWire) - PowerBook2,3 - iBook G3 - PowerBook2,4 - iBook G3 - PowerBook3,1 - PowerBook G3 (FireWire) - PowerBook3,2 - PowerBook G4 - PowerBook3,3 - PowerBook G4 (Gigabit Ethernet) - PowerBook3,4 - PowerBook G4 (DVI) - PowerBook3,5 - PowerBook G4 (1GHz / 867MHz) - PowerBook4,1 - iBook G3 (Dual USB, Late 2001) - PowerBook4,2 - iBook G3 (16MB VRAM) - PowerBook4,3 - iBook G3 Opaque 16MB VRAM, 32MB VRAM, Early 2003) - PowerBook5,1 - PowerBook G4 (17 inch) - PowerBook5,2 - PowerBook G4 (15 inch FW 800) - PowerBook5,3 - PowerBook G4 (17-inch 1.33GHz) - PowerBook5,4 - PowerBook G4 (15 inch 1.5/1.33GHz) - PowerBook5,5 - PowerBook G4 (17-inch 1.5GHz) - PowerBook5,6 - PowerBook G4 (15 inch 1.67GHz/1.5GHz) - PowerBook5,7 - PowerBook G4 (17-inch 1.67GHz) - PowerBook5,8 - PowerBook G4 (Double layer SD, 15 inch) - PowerBook5,9 - PowerBook G4 (Double layer SD, 17 inch) - PowerBook6,1 - PowerBook G4 (12 inch) - PowerBook6,2 - PowerBook G4 (12 inch, DVI) - PowerBook6,3 - iBook G4 - PowerBook6,4 - PowerBook G4 (12 inch 1.33GHz) - PowerBook6,5 - iBook G4 (Early-Late 2004) - PowerBook6,7 - iBook G4 (Mid 2005) - PowerBook6,8 - PowerBook G4 (12 inch 1.5GHz) - PowerMac1,1 - Power Macintosh G3 (Blue & White) - PowerMac1,2 - Power Macintosh G4 (PCI Graphics) - PowerMac10,1 - Mac Mini G4 - PowerMac10,2 - Mac Mini (Late 2005) - PowerMac11,2 - Power Macintosh G5 (Late 2005) - PowerMac12,1 - iMac G5 (iSight) - PowerMac2,1 - iMac G3 (Slot-loading CD-ROM) - PowerMac2,2 - iMac G3 (Summer 2000) - PowerMac3,1 - Power Macintosh G4 (AGP Graphics) - PowerMac3,2 - Power Macintosh G4 (AGP Graphics) - PowerMac3,3 - Power Macintosh G4 (Gigabit Ethernet) - PowerMac3,4 - Power Macintosh G4 (Digital Audio) - PowerMac3,5 - Power Macintosh G4 (Quick Silver) - PowerMac3,6 - Power Macintosh G4 (Mirrored Drive Door) - PowerMac4,1 - iMac G3 (Early/Summer 2001) - PowerMac4,2 - iMac G4 (Flat Panel) - PowerMac4,4 - eMac - PowerMac4,5 - iMac G4 (17-inch Flat Panel) - PowerMac5,1 - Power Macintosh G4 Cube - PowerMac6,1 - iMac G4 (USB 2.0) - PowerMac6,3 - iMac G4 (20-inch Flat Panel) - PowerMac6,4 - eMac (USB 2.0, 2005) - PowerMac7,2 - Power Macintosh G5 - PowerMac7,3 - Power Macintosh G5 - PowerMac8,1 - iMac G5 - PowerMac8,2 - iMac G5 (Ambient Light Sensor) - PowerMac9,1 - Power Macintosh G5 (Late 2005) - RackMac1,1 - Xserve G4 - RackMac1,2 - Xserve G4 (slot-loading, cluster node) - RackMac3,1 - Xserve G5 - Xserve1,1 - Xserve (Intel Xeon) - Xserve2,1 - Xserve (January 2008 quad-core) - iMac1,1 - iMac G3 (Rev A-D) - iMac4,1 - iMac (Core Duo) - iMac4,2 - iMac for Education (17-inch, Core Duo) - iMac5,1 - iMac (Core 2 Duo, 17 or 20 inch, SuperDrive) - iMac5,2 - iMac (Core 2 Duo, 17 inch, Combo Drive) - iMac6,1 - iMac (Core 2 Duo, 24 inch, SuperDrive) - iMac8,1 - iMac (April 2008) - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/classes.nib deleted file mode 100644 index 22f13f8..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/classes.nib +++ /dev/null @@ -1,56 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - CLASS - NSApplication - LANGUAGE - ObjC - SUPERCLASS - NSResponder - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - CLASS - SUStatusController - LANGUAGE - ObjC - OUTLETS - - actionButton - NSButton - progressBar - NSProgressIndicator - - SUPERCLASS - SUWindowController - - - IBVersion - 1 - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/info.nib deleted file mode 100644 index a9ac867..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 670 - IBLastKnownRelativeProjectPath - Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 10A96 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/keyedobjects.nib deleted file mode 100644 index 4f1d598..0000000 Binary files a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/SUStatus.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/classes.nib deleted file mode 100644 index 4b1ab30..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,50 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - doNotInstall - id - installLater - id - installNow - id - - CLASS - SUAutomaticUpdateAlert - LANGUAGE - ObjC - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/info.nib deleted file mode 100644 index 2e04cfa..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 667 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 9D34 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index 6b92630..0000000 Binary files a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/classes.nib deleted file mode 100644 index 994d4c3..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,67 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - CLASS - NSApplication - LANGUAGE - ObjC - SUPERCLASS - NSResponder - - - ACTIONS - - installUpdate - id - remindMeLater - id - skipThisVersion - id - - CLASS - SUUpdateAlert - LANGUAGE - ObjC - OUTLETS - - delegate - id - description - NSTextField - releaseNotesView - WebView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/info.nib deleted file mode 100644 index 2e04cfa..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 667 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 9D34 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index b4353d2..0000000 Binary files a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/classes.nib deleted file mode 100644 index 5220a22..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/classes.nib +++ /dev/null @@ -1,59 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - finishPrompt - id - toggleMoreInfo - id - - CLASS - SUUpdatePermissionPrompt - LANGUAGE - ObjC - OUTLETS - - delegate - id - descriptionTextField - NSTextField - moreInfoButton - NSButton - moreInfoView - NSView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/info.nib deleted file mode 100644 index 2e04cfa..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 667 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 9D34 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib deleted file mode 100644 index b403a3e..0000000 Binary files a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings deleted file mode 100644 index b31f928..0000000 Binary files a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings and /dev/null differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/classes.nib deleted file mode 100644 index 4b1ab30..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,50 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - doNotInstall - id - installLater - id - installNow - id - - CLASS - SUAutomaticUpdateAlert - LANGUAGE - ObjC - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/info.nib deleted file mode 100644 index ab36d31..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 658 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 9C7010 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index 7630390..0000000 Binary files a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/classes.nib deleted file mode 100644 index 994d4c3..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,67 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - CLASS - NSApplication - LANGUAGE - ObjC - SUPERCLASS - NSResponder - - - ACTIONS - - installUpdate - id - remindMeLater - id - skipThisVersion - id - - CLASS - SUUpdateAlert - LANGUAGE - ObjC - OUTLETS - - delegate - id - description - NSTextField - releaseNotesView - WebView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/info.nib deleted file mode 100644 index 2fb8a83..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 670 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 18 - - IBSystem Version - 10A96 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index e7e7497..0000000 Binary files a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/classes.nib deleted file mode 100644 index 5220a22..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/classes.nib +++ /dev/null @@ -1,59 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - finishPrompt - id - toggleMoreInfo - id - - CLASS - SUUpdatePermissionPrompt - LANGUAGE - ObjC - OUTLETS - - delegate - id - descriptionTextField - NSTextField - moreInfoButton - NSButton - moreInfoView - NSView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/info.nib deleted file mode 100644 index b1cd28e..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/info.nib +++ /dev/null @@ -1,21 +0,0 @@ - - - - - IBFramework Version - 670 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - 41 - - IBSystem Version - 10A96 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib deleted file mode 100644 index e8dc5b8..0000000 Binary files a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/Sparkle.strings b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/Sparkle.strings deleted file mode 100644 index 16e0787..0000000 Binary files a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/en.lproj/Sparkle.strings and /dev/null differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/classes.nib deleted file mode 100644 index 4b1ab30..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,50 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - doNotInstall - id - installLater - id - installNow - id - - CLASS - SUAutomaticUpdateAlert - LANGUAGE - ObjC - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/info.nib deleted file mode 100644 index 2e04cfa..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 667 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 9D34 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index 6b2f938..0000000 Binary files a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/classes.nib deleted file mode 100644 index 994d4c3..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,67 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - CLASS - NSApplication - LANGUAGE - ObjC - SUPERCLASS - NSResponder - - - ACTIONS - - installUpdate - id - remindMeLater - id - skipThisVersion - id - - CLASS - SUUpdateAlert - LANGUAGE - ObjC - OUTLETS - - delegate - id - description - NSTextField - releaseNotesView - WebView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/info.nib deleted file mode 100644 index 2e04cfa..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 667 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 9D34 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index c9b1e7d..0000000 Binary files a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/classes.nib deleted file mode 100644 index 5220a22..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/classes.nib +++ /dev/null @@ -1,59 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - finishPrompt - id - toggleMoreInfo - id - - CLASS - SUUpdatePermissionPrompt - LANGUAGE - ObjC - OUTLETS - - delegate - id - descriptionTextField - NSTextField - moreInfoButton - NSButton - moreInfoView - NSView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/info.nib deleted file mode 100644 index 3eb7f81..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 667 - IBLastKnownRelativeProjectPath - ../../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 9D34 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib deleted file mode 100644 index 8c54c21..0000000 Binary files a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/Sparkle.strings b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/Sparkle.strings deleted file mode 100644 index f83ea23..0000000 Binary files a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/es.lproj/Sparkle.strings and /dev/null differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/classes.nib deleted file mode 100644 index 4b1ab30..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,50 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - doNotInstall - id - installLater - id - installNow - id - - CLASS - SUAutomaticUpdateAlert - LANGUAGE - ObjC - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/info.nib deleted file mode 100644 index 33a6020..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/info.nib +++ /dev/null @@ -1,16 +0,0 @@ - - - - - IBFramework Version - 629 - IBOldestOS - 5 - IBOpenObjects - - IBSystem Version - 9D34 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index 4cd529a..0000000 Binary files a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/classes.nib deleted file mode 100644 index 994d4c3..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,67 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - CLASS - NSApplication - LANGUAGE - ObjC - SUPERCLASS - NSResponder - - - ACTIONS - - installUpdate - id - remindMeLater - id - skipThisVersion - id - - CLASS - SUUpdateAlert - LANGUAGE - ObjC - OUTLETS - - delegate - id - description - NSTextField - releaseNotesView - WebView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/info.nib deleted file mode 100644 index d2586ea..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/info.nib +++ /dev/null @@ -1,16 +0,0 @@ - - - - - IBFramework Version - 629 - IBOldestOS - 5 - IBOpenObjects - - IBSystem Version - 9E17 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index 65dfc95..0000000 Binary files a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/classes.nib deleted file mode 100644 index 5220a22..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/classes.nib +++ /dev/null @@ -1,59 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - finishPrompt - id - toggleMoreInfo - id - - CLASS - SUUpdatePermissionPrompt - LANGUAGE - ObjC - OUTLETS - - delegate - id - descriptionTextField - NSTextField - moreInfoButton - NSButton - moreInfoView - NSView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/info.nib deleted file mode 100644 index d2586ea..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/info.nib +++ /dev/null @@ -1,16 +0,0 @@ - - - - - IBFramework Version - 629 - IBOldestOS - 5 - IBOpenObjects - - IBSystem Version - 9E17 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib deleted file mode 100644 index 4b7cc90..0000000 Binary files a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/Sparkle.strings b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/Sparkle.strings deleted file mode 100644 index ea175ae..0000000 Binary files a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/Sparkle.strings and /dev/null differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr_CA.lproj b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr_CA.lproj deleted file mode 120000 index 61a7d4e..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/fr_CA.lproj +++ /dev/null @@ -1 +0,0 @@ -/Users/andym/Development/Build Products/Release (GC dual-mode; 10.5-only)/Sparkle.framework/Resources/fr.lproj \ No newline at end of file diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/classes.nib deleted file mode 100644 index 4b1ab30..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,50 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - doNotInstall - id - installLater - id - installNow - id - - CLASS - SUAutomaticUpdateAlert - LANGUAGE - ObjC - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/info.nib deleted file mode 100644 index 2e04cfa..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 667 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 9D34 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index 15ba8f4..0000000 Binary files a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/classes.nib deleted file mode 100644 index 994d4c3..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,67 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - CLASS - NSApplication - LANGUAGE - ObjC - SUPERCLASS - NSResponder - - - ACTIONS - - installUpdate - id - remindMeLater - id - skipThisVersion - id - - CLASS - SUUpdateAlert - LANGUAGE - ObjC - OUTLETS - - delegate - id - description - NSTextField - releaseNotesView - WebView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/info.nib deleted file mode 100644 index 2e04cfa..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 667 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 9D34 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index 2984064..0000000 Binary files a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/classes.nib deleted file mode 100644 index 5220a22..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/classes.nib +++ /dev/null @@ -1,59 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - finishPrompt - id - toggleMoreInfo - id - - CLASS - SUUpdatePermissionPrompt - LANGUAGE - ObjC - OUTLETS - - delegate - id - descriptionTextField - NSTextField - moreInfoButton - NSButton - moreInfoView - NSView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/info.nib deleted file mode 100644 index c493485..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 667 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 5 - - IBSystem Version - 9D34 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib deleted file mode 100644 index 55cc2c2..0000000 Binary files a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/Sparkle.strings b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/Sparkle.strings deleted file mode 100644 index 5c410d0..0000000 Binary files a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/it.lproj/Sparkle.strings and /dev/null differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/classes.nib deleted file mode 100644 index 4b1ab30..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,50 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - doNotInstall - id - installLater - id - installNow - id - - CLASS - SUAutomaticUpdateAlert - LANGUAGE - ObjC - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/info.nib deleted file mode 100644 index 3f09790..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/info.nib +++ /dev/null @@ -1,18 +0,0 @@ - - - - - IBFramework Version - 629 - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 9D34 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index aa38f86..0000000 Binary files a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/classes.nib deleted file mode 100644 index 994d4c3..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,67 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - CLASS - NSApplication - LANGUAGE - ObjC - SUPERCLASS - NSResponder - - - ACTIONS - - installUpdate - id - remindMeLater - id - skipThisVersion - id - - CLASS - SUUpdateAlert - LANGUAGE - ObjC - OUTLETS - - delegate - id - description - NSTextField - releaseNotesView - WebView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/info.nib deleted file mode 100644 index d2586ea..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/info.nib +++ /dev/null @@ -1,16 +0,0 @@ - - - - - IBFramework Version - 629 - IBOldestOS - 5 - IBOpenObjects - - IBSystem Version - 9E17 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index c82d358..0000000 Binary files a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/classes.nib deleted file mode 100644 index 5220a22..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/classes.nib +++ /dev/null @@ -1,59 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - finishPrompt - id - toggleMoreInfo - id - - CLASS - SUUpdatePermissionPrompt - LANGUAGE - ObjC - OUTLETS - - delegate - id - descriptionTextField - NSTextField - moreInfoButton - NSButton - moreInfoView - NSView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/info.nib deleted file mode 100644 index d2586ea..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/info.nib +++ /dev/null @@ -1,16 +0,0 @@ - - - - - IBFramework Version - 629 - IBOldestOS - 5 - IBOpenObjects - - IBSystem Version - 9E17 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib deleted file mode 100644 index ac298ce..0000000 Binary files a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/Sparkle.strings b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/Sparkle.strings deleted file mode 100644 index 67cf535..0000000 Binary files a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/nl.lproj/Sparkle.strings and /dev/null differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/relaunch b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/relaunch deleted file mode 100755 index e7b96d6..0000000 Binary files a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/relaunch and /dev/null differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/classes.nib deleted file mode 100644 index 4b1ab30..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,50 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - doNotInstall - id - installLater - id - installNow - id - - CLASS - SUAutomaticUpdateAlert - LANGUAGE - ObjC - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/info.nib deleted file mode 100644 index 2b3d425..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 670 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 9E17 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index 1d4655c..0000000 Binary files a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/classes.nib deleted file mode 100644 index 994d4c3..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,67 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - CLASS - NSApplication - LANGUAGE - ObjC - SUPERCLASS - NSResponder - - - ACTIONS - - installUpdate - id - remindMeLater - id - skipThisVersion - id - - CLASS - SUUpdateAlert - LANGUAGE - ObjC - OUTLETS - - delegate - id - description - NSTextField - releaseNotesView - WebView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/info.nib deleted file mode 100644 index 2b3d425..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 670 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 9E17 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index 103b1cf..0000000 Binary files a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/classes.nib deleted file mode 100644 index 0f776c8..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/classes.nib +++ /dev/null @@ -1,59 +0,0 @@ - - - - - IBClasses - - - CLASS - NSObject - LANGUAGE - ObjC - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - finishPrompt - id - toggleMoreInfo - id - - CLASS - SUUpdatePermissionPrompt - LANGUAGE - ObjC - OUTLETS - - delegate - id - descriptionTextField - NSTextField - moreInfoButton - NSButton - moreInfoView - NSView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - IBVersion - 1 - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/info.nib deleted file mode 100644 index 5132e29..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/info.nib +++ /dev/null @@ -1,18 +0,0 @@ - - - - - IBFramework Version - 670 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - IBSystem Version - 9E17 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib deleted file mode 100644 index c09d9e7..0000000 Binary files a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings deleted file mode 100644 index f3ff9d8..0000000 Binary files a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings and /dev/null differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/classes.nib deleted file mode 100644 index 4b1ab30..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,50 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - doNotInstall - id - installLater - id - installNow - id - - CLASS - SUAutomaticUpdateAlert - LANGUAGE - ObjC - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/info.nib deleted file mode 100644 index c5a067e..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 670 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 10A96 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index 53cb91a..0000000 Binary files a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/classes.nib deleted file mode 100644 index 018710a..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/classes.nib +++ /dev/null @@ -1,39 +0,0 @@ -{ - IBClasses = ( - { - CLASS = FirstResponder; - LANGUAGE = ObjC; - SUPERCLASS = NSObject; - }, - { - CLASS = NSApplication; - LANGUAGE = ObjC; - SUPERCLASS = NSResponder; - }, - { - CLASS = NSObject; - LANGUAGE = ObjC; - }, - { - ACTIONS = { - installUpdate = id; - remindMeLater = id; - skipThisVersion = id; - }; - CLASS = SUUpdateAlert; - LANGUAGE = ObjC; - OUTLETS = { - delegate = id; - description = NSTextField; - releaseNotesView = WebView; - }; - SUPERCLASS = SUWindowController; - }, - { - CLASS = SUWindowController; - LANGUAGE = ObjC; - SUPERCLASS = NSWindowController; - } - ); - IBVersion = 1; -} \ No newline at end of file diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/info.nib deleted file mode 100644 index 6b787d4..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/info.nib +++ /dev/null @@ -1,18 +0,0 @@ - - - - - IBDocumentLocation - 69 14 356 240 0 0 1280 778 - IBFramework Version - 489.0 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBSystem Version - 9D34 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/keyedobjects.nib deleted file mode 100644 index 7e6d490..0000000 Binary files a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/classes.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/classes.nib deleted file mode 100644 index 5220a22..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/classes.nib +++ /dev/null @@ -1,59 +0,0 @@ - - - - - IBClasses - - - CLASS - SUWindowController - LANGUAGE - ObjC - SUPERCLASS - NSWindowController - - - ACTIONS - - finishPrompt - id - toggleMoreInfo - id - - CLASS - SUUpdatePermissionPrompt - LANGUAGE - ObjC - OUTLETS - - delegate - id - descriptionTextField - NSTextField - moreInfoButton - NSButton - moreInfoView - NSView - - SUPERCLASS - SUWindowController - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/info.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/info.nib deleted file mode 100644 index c5a067e..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 670 - IBLastKnownRelativeProjectPath - ../Sparkle.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 6 - - IBSystem Version - 10A96 - targetFramework - IBCocoaFramework - - diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib deleted file mode 100644 index 64babac..0000000 Binary files a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib and /dev/null differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/Sparkle.strings b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/Sparkle.strings deleted file mode 100644 index b676a4f..0000000 Binary files a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Resources/sv.lproj/Sparkle.strings and /dev/null differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Sparkle b/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Sparkle deleted file mode 100755 index 2d9bb2a..0000000 Binary files a/tikzit-old/Frameworks/Sparkle.framework/Versions/A/Sparkle and /dev/null differ diff --git a/tikzit-old/Frameworks/Sparkle.framework/Versions/Current b/tikzit-old/Frameworks/Sparkle.framework/Versions/Current deleted file mode 120000 index 8c7e5a6..0000000 --- a/tikzit-old/Frameworks/Sparkle.framework/Versions/Current +++ /dev/null @@ -1 +0,0 @@ -A \ No newline at end of file diff --git a/tikzit-old/INSTALL b/tikzit-old/INSTALL deleted file mode 100644 index b938f14..0000000 --- a/tikzit-old/INSTALL +++ /dev/null @@ -1,34 +0,0 @@ -For building on systems other than MacOS/X: - -Dependencies: - GNUstep (core libraries) >= 1.18.0 - gtk+-2.0 >= 2.18.0 - gdk-pixbuf >= 2.16.0 - poppler >= 0.10 - including glib bindings, which may be in - a separate poppler-glib package - Objective C compiler (eg: gcc with ObjC support) with - support for properties, optional protocols and - fast enumeration (eg: gcc 4.6 or clang). - pkg-config - build-time dependency only - -To install, just run: - - ./configure - make - make install - - - -To build from subversion (and for development) you will additionally need: - flex >= 2.5.34 - bison >= 2.3 - autoconf >= 2.60 - automake >= 1.10 - -and you will need to prepare the source tree by running - ./autogen.sh - - - diff --git a/tikzit-old/Makefile.am b/tikzit-old/Makefile.am deleted file mode 100644 index d9793a4..0000000 --- a/tikzit-old/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -SUBDIRS = src share -appdir = $(datarootdir)/tikzit -nobase_dist_app_DATA = shapes/*.tikz diff --git a/tikzit-old/NEWS b/tikzit-old/NEWS deleted file mode 100644 index 827abe7..0000000 --- a/tikzit-old/NEWS +++ /dev/null @@ -1,75 +0,0 @@ -tikzit 1.1 (2015-07-22) : - * Fix bug where copy-and-paste would lose edge anchors - * Allow tikzit-specific preview code to be omitted from preambles - * Holding down CTRL allows you to drag the graph - * Fix parsing bug where property lists would be reversed - * Better error messages when files can't be opened - -tikzit 1.0 (2013-05-07): - * GIMP-like user interface (multiple documents, separate toolboxes) - * Preferences now called Configuration, and includes node and edge styles - * Error-highlighting in the code pane - * Single-key-shortcuts for tool selection, and to update the preview - * Edge anchor support - * Option for drag-select to select nodes, edges or both - * Memory leak fixes - * Should now be impossible to use the UI to create a graph that cannot be parsed - -tikzit 0.9 (2012-08-24): - * Compilers without basic Objective C 2 support cannot be - used to compile TikZiT any more - * Add support for scale to node styles - * Add support for editing edge styles - * Add support for multiple custom preambles - * The path to pdflatex is now configurable - * Make everything look a bit better - * Edges now start from the edge of a node, not the centre, - which is what tikz does - * Edges can now have arrow heads and arrow tails - * Nodes and edges have consistent ordering, and this can be - changed with Edge->Arrange - * Edges now have colours - * Edges can now be reversed easily - * Fix various crashes - -tikzit 0.7 (2011-12-06): - * Add bounding box support - * Add support for different node shapes - * Improved error reporting - * Add scrolling support (CTRL+mouse wheel) - * Add a pan tool to move around the graph - * Add edge and graph property palettes - -tikzit 0.6 (2011-02-08): - * Fix the displaying of colours in the styles editor - * Cut, copy and paste support - * More useful buttons on the toolbar - * Improve how previewing works - * Allow custom preambles for preview generation - -tikzit 0.5 (2010-12-01): - * Hide font size commands (\small etc) in node labels - * Always output the "style" node property first - * Provide a list of recent files - * Remember the folder for Open and Save As dialogs - * Remember window dimensions - * Remember the styles list - * Add a "Node properties" pane - * Bring the separate windows into the main application window - * Improve graphics rendering / remove flicker - * Shorten the window title to something useful - -tikzit 0.4 (2010-09-19): - * Support for bounding boxes, variable-precision tikz output - * Fixed stroke width display - * Updated tikz output to handle separate edge/node layers - * Using [Graph tikz] for tikz output, attaching style after parse - * All platforms now use the same lex-based parser - * Added a menu item for showing node styles if closed - * Pre-amble support - * Added test suite - * Added preview and node labels to GTK version - -tikzit 0.3b (2010-05-11): - * Various build-system fixes on Linux - diff --git a/tikzit-old/README b/tikzit-old/README deleted file mode 100644 index 9b83327..0000000 --- a/tikzit-old/README +++ /dev/null @@ -1,7 +0,0 @@ -TikZit is a cross-platform application that allows the creation and modification of TeX diagrams written using the pgf/TikZ macro library. It is especially geared toward rapidly creating "dot"-diagrams for use in academic papers. - -For more info, see http://tikzit.sf.net - -On OS/X, the Cocoa framework is used. - -On other platforms, GTK+ and GNUstep are used. \ No newline at end of file diff --git a/tikzit-old/README.release b/tikzit-old/README.release deleted file mode 100644 index a6f1642..0000000 --- a/tikzit-old/README.release +++ /dev/null @@ -1,98 +0,0 @@ -Notes on how to make a release -============================== - -Updating doc files ------------------- - -Put all the user-visible changes since the last release into NEWS. - -Make sure the dependency requirements in INSTALL are correct. - - - -Making the source tarballs --------------------------- - -The version should be set in configure.ac (in AC_INIT) -and the package should be re-configured -(run ./configure). - -Then run `make dist` to create the source tarball in tar.gz format, and -`make dist-bzip2` to get it in tar.bz2 format. - - - -Uploading the source --------------------- - -Update /www/sourceforge/README.mkd - -Log into sourceforge.net, go to -https://sourceforge.net/projects/tikzit/files/ - -Create a folder called tikzit-[version]. - -Upload README.mkd. - -Upload the tar.bz2 and tar.gz files. - -Set the tar.bz2 file as default for everything except windows and mac -(click the (i) symbol on the right for that file to do this). - - - -Updating the website --------------------- - -Edit /www/htdocs/link.php, and update the versions. - -sftp to - [sf-username],tikzit@web.sourceforge.net - -Upload link.php into htdocs. - - - -Updating the packages ---------------------- - -Contact Gard Spreemann about the new version by sending him a message -on Launchpad (https://launchpad.net/~gspreemann). - -Update tikzit.spec (the version, the changelog and the dependencies). - -Test the spec file: -- if you don't have ~/rpmbuild, run rpmdev-setuptree -- copy the tar.bz2 file into ~/rpmbuild/SOURCES -- copy tikzit.spec into ~/rpmbuild/SPECS -- cd into ~/rpmbuild/SPECS -- run `rpmbuild -ba tikzit.spec` -- run `rpmlint ..` and check the warnings (there will be some that are - not important) - -Update the OBS packages: -- https://build.opensuse.org/package/show?package=tikzit&project=home%3Arandomguy3 -- Upload the tar.bz2 file and the tikzit.spec file. -- Wait for the build to finish - -Update the AUR package: -- http://aur.archlinux.org/packages.php?ID=37119 - - -TODO: find out how the Debian build system works - - -Publishing an OSX Update ------------------------------------------ -In OSX, the steps to publish an update are as follows. Firstly all updates are signed, so you need the private key 'tikzit_dsa_priv.pem' in the root of your working directory. This is not in the repository (for obvious reasons), so ask Aleks for a copy. Also, make sure you have ruby in your $PATH to do the actual signing. - -1. Update the SVN and note the revision number -2. In TikZiT-Info.plist, set the Bundle Version key to (MAJOR).(MINOR).(SVN REVISION + 1) -3. In the TikZiT working directory, run scripts/prepare_release.sh -4. Copy and paste the XML output into docs/web/appcast/tikzit.xml -5. Update the release notes in docs/web/appcast/rnotes.html -6. Use SFTP to upload the changed files into htdocs/appcast -7. Commit the SVN - - - diff --git a/tikzit-old/TODO b/tikzit-old/TODO deleted file mode 100644 index ca1a1b9..0000000 --- a/tikzit-old/TODO +++ /dev/null @@ -1,15 +0,0 @@ -GTK port: - - Use GooCanvas for the graph display - - -OSX port: - - node properties toolbox - - support for more than one custom preamble - - -General: - - push more code up into common (make use of RenderContext) - - vi-like mode lines in tikz files - - use mode lines for preamble knowledge - - per-document preamble selection? - diff --git a/tikzit-old/TikZiT-Info.plist b/tikzit-old/TikZiT-Info.plist deleted file mode 100644 index a495c5b..0000000 --- a/tikzit-old/TikZiT-Info.plist +++ /dev/null @@ -1,61 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleDocumentTypes - - - CFBundleTypeExtensions - - tikz - - CFBundleTypeIconFile - tikzitdoc.icns - CFBundleTypeMIMETypes - - text/plain - - CFBundleTypeName - DocumentType - CFBundleTypeOSTypes - - ???? - - CFBundleTypeRole - Editor - NSDocumentClass - TikzDocument - - - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIconFile - tikzit.icns - CFBundleIdentifier - net.sourceforge.tikzit.${PRODUCT_NAME:rfc1034identifier} - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - APPL - CFBundleShortVersionString - 0.8 - CFBundleSignature - ???? - CFBundleVersion - 0.8.398 - LSMinimumSystemVersion - ${MACOSX_DEPLOYMENT_TARGET} - NSMainNibFile - MainMenu - NSPrincipalClass - NSApplication - SUFeedURL - http://tikzit.sourceforge.net/appcast/tikzit.xml - SUPublicDSAKeyFile - tikzit_dsa_pub.pem - - diff --git a/tikzit-old/TikZiT.xcodeproj/project.pbxproj b/tikzit-old/TikZiT.xcodeproj/project.pbxproj deleted file mode 100644 index 04a7f3f..0000000 --- a/tikzit-old/TikZiT.xcodeproj/project.pbxproj +++ /dev/null @@ -1,1322 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 46; - objects = { - -/* Begin PBXBuildFile section */ - 1DDD582C0DA1D0D100B32029 /* TikzDocument.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD58280DA1D0D100B32029 /* TikzDocument.xib */; }; - 1DDD582D0DA1D0D100B32029 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD582A0DA1D0D100B32029 /* MainMenu.xib */; }; - 5504C82E11D23595002A1478 /* common.m in Sources */ = {isa = PBXBuildFile; fileRef = 5504C82A11D23595002A1478 /* common.m */; }; - 5504C82F11D23595002A1478 /* parser.m in Sources */ = {isa = PBXBuildFile; fileRef = 5504C82B11D23595002A1478 /* parser.m */; }; - 5504C83011D23595002A1478 /* test.m in Sources */ = {isa = PBXBuildFile; fileRef = 5504C82D11D23595002A1478 /* test.m */; }; - 5504C83211D23685002A1478 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 5504C83111D23685002A1478 /* main.m */; }; - 5504C84F11D23945002A1478 /* ColorRGB.m in Sources */ = {isa = PBXBuildFile; fileRef = 559EFB6711CB88E300D020F4 /* ColorRGB.m */; }; - 5504C93F11D39422002A1478 /* osx.m in Sources */ = {isa = PBXBuildFile; fileRef = 5504C93E11D39422002A1478 /* osx.m */; }; - 552202C4135F15FD007EA086 /* MultiField.m in Sources */ = {isa = PBXBuildFile; fileRef = 552202C3135F15FD007EA086 /* MultiField.m */; }; - 552202C5135F15FD007EA086 /* MultiField.m in Sources */ = {isa = PBXBuildFile; fileRef = 552202C3135F15FD007EA086 /* MultiField.m */; }; - 55391AF613D324FE007DBE71 /* Preview.xib in Resources */ = {isa = PBXBuildFile; fileRef = 55391AF513D324FE007DBE71 /* Preview.xib */; }; - 55391AF813D3250F007DBE71 /* Preamble.xib in Resources */ = {isa = PBXBuildFile; fileRef = 55391AF713D3250F007DBE71 /* Preamble.xib */; }; - 55391B0213D32608007DBE71 /* PropertyInspector.xib in Resources */ = {isa = PBXBuildFile; fileRef = 55391B0013D32608007DBE71 /* PropertyInspector.xib */; }; - 55391B0A13D32765007DBE71 /* PropertyInspectorController.m in Sources */ = {isa = PBXBuildFile; fileRef = 55391B0913D32765007DBE71 /* PropertyInspectorController.m */; }; - 55397C7914498C22006942FB /* EdgeStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 55397C7814498C22006942FB /* EdgeStyle.m */; }; - 55397C7C144990EA006942FB /* EdgeStyle+Coder.m in Sources */ = {isa = PBXBuildFile; fileRef = 55397C7B144990EA006942FB /* EdgeStyle+Coder.m */; }; - 55397C7F144999C4006942FB /* PropertyHolder.m in Sources */ = {isa = PBXBuildFile; fileRef = 55397C7E144999C4006942FB /* PropertyHolder.m */; }; - 55397C811449A877006942FB /* ED_arrow.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C801449A877006942FB /* ED_arrow.png */; }; - 55397C831449A8F1006942FB /* ED_tick.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C821449A8F1006942FB /* ED_tick.png */; }; - 55397C851449A9BF006942FB /* ED_none.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C841449A9BF006942FB /* ED_none.png */; }; - 55397C8A1449AB91006942FB /* AH_none.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C871449AB91006942FB /* AH_none.png */; }; - 55397C8B1449AB91006942FB /* AH_plain_tail.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C881449AB91006942FB /* AH_plain_tail.png */; }; - 55397C8D1449ABFC006942FB /* AH_latex_tail.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C8C1449ABFC006942FB /* AH_latex_tail.png */; }; - 55397C901449AC7C006942FB /* AH_latex_head.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C8E1449AC7C006942FB /* AH_latex_head.png */; }; - 55397C911449AC7C006942FB /* AH_plain_head.png in Resources */ = {isa = PBXBuildFile; fileRef = 55397C8F1449AC7C006942FB /* AH_plain_head.png */; }; - 553A4C5A144ED3D500AA6FAC /* NilToEmptyStringTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 553A4C59144ED3D500AA6FAC /* NilToEmptyStringTransformer.m */; }; - 55432E061444BF2D00401BB3 /* GraphElementProperty.m in Sources */ = {isa = PBXBuildFile; fileRef = 55432E051444BF2D00401BB3 /* GraphElementProperty.m */; }; - 55598E351635372E0023450A /* DiamondShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55598E341635372E0023450A /* DiamondShape.m */; }; - 555B30F911D8BE3300CAECF5 /* emblem-important.png in Resources */ = {isa = PBXBuildFile; fileRef = 555B30F811D8BE3300CAECF5 /* emblem-important.png */; }; - 555B313511D8C6DA00CAECF5 /* color.m in Sources */ = {isa = PBXBuildFile; fileRef = 555B313411D8C6DA00CAECF5 /* color.m */; }; - 555ECE9B1378A3AA0052DB71 /* CALayer+DrawLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 555ECE9A1378A3AA0052DB71 /* CALayer+DrawLabel.m */; }; - 55652DF913E1F2030023F4C6 /* SupportDir.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652DF813E1F2030023F4C6 /* SupportDir.m */; }; - 55652E3B13E1FAEE0023F4C6 /* CircleShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3413E1FAED0023F4C6 /* CircleShape.m */; }; - 55652E3C13E1FAEE0023F4C6 /* RectangleShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3613E1FAED0023F4C6 /* RectangleShape.m */; }; - 55652E3D13E1FAEE0023F4C6 /* RegularPolyShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3813E1FAED0023F4C6 /* RegularPolyShape.m */; }; - 55652E3E13E1FAEE0023F4C6 /* TikzShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3A13E1FAEE0023F4C6 /* TikzShape.m */; }; - 55652E4113E1FB0A0023F4C6 /* Shape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E4013E1FB0A0023F4C6 /* Shape.m */; }; - 55652E5613E1FC660023F4C6 /* cap.tikz in Copy Shapes */ = {isa = PBXBuildFile; fileRef = 55652E5113E1FC660023F4C6 /* cap.tikz */; }; - 55652E5713E1FC660023F4C6 /* copants.tikz in Copy Shapes */ = {isa = PBXBuildFile; fileRef = 55652E5213E1FC660023F4C6 /* copants.tikz */; }; - 55652E5813E1FC660023F4C6 /* cup.tikz in Copy Shapes */ = {isa = PBXBuildFile; fileRef = 55652E5313E1FC660023F4C6 /* cup.tikz */; }; - 55652E5913E1FC660023F4C6 /* oval.tikz in Copy Shapes */ = {isa = PBXBuildFile; fileRef = 55652E5413E1FC660023F4C6 /* oval.tikz */; }; - 55652E5A13E1FC660023F4C6 /* pants.tikz in Copy Shapes */ = {isa = PBXBuildFile; fileRef = 55652E5513E1FC660023F4C6 /* pants.tikz */; }; - 556979431168747B007E5703 /* StylePalette.xib in Resources */ = {isa = PBXBuildFile; fileRef = 556979421168747B007E5703 /* StylePalette.xib */; }; - 5573B8BA11D9FC8D00B5DC5D /* Quartz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5573B8B911D9FC8D00B5DC5D /* Quartz.framework */; }; - 5573B8C211D9FD3200B5DC5D /* PreviewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5573B8C111D9FD3200B5DC5D /* PreviewController.m */; }; - 5573B90F11DA231A00B5DC5D /* PreambleController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5573B90E11DA231A00B5DC5D /* PreambleController.m */; }; - 5573B92111DA259C00B5DC5D /* text-x-generic.png in Resources */ = {isa = PBXBuildFile; fileRef = 5573B92011DA259C00B5DC5D /* text-x-generic.png */; }; - 5573B92511DA273400B5DC5D /* format-indent-less.png in Resources */ = {isa = PBXBuildFile; fileRef = 5573B92411DA273400B5DC5D /* format-indent-less.png */; }; - 5573B92911DA292F00B5DC5D /* Preambles.m in Sources */ = {isa = PBXBuildFile; fileRef = 5573B92811DA292F00B5DC5D /* Preambles.m */; }; - 5573B98811DA377C00B5DC5D /* text-x-script.png in Resources */ = {isa = PBXBuildFile; fileRef = 5573B98711DA377C00B5DC5D /* text-x-script.png */; }; - 5573BDCB11DB4D2600B5DC5D /* Preambles+Coder.m in Sources */ = {isa = PBXBuildFile; fileRef = 5573BDCA11DB4D2600B5DC5D /* Preambles+Coder.m */; }; - 5585E5C2117F681800124513 /* NodeStyle+Coder.m in Sources */ = {isa = PBXBuildFile; fileRef = 5585E5C1117F681800124513 /* NodeStyle+Coder.m */; }; - 5589A9FF11C51E780064D310 /* TikzGraphAssembler.m in Sources */ = {isa = PBXBuildFile; fileRef = 5589A9FE11C51E780064D310 /* TikzGraphAssembler.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 5589AA6C11C542D30064D310 /* TikzGraphAssembler.m in Sources */ = {isa = PBXBuildFile; fileRef = 5589A9FE11C51E780064D310 /* TikzGraphAssembler.m */; }; - 5589AA6D11C542D30064D310 /* tikzlexer.lm in Sources */ = {isa = PBXBuildFile; fileRef = 5589A9AA11C500060064D310 /* tikzlexer.lm */; }; - 5589AA6E11C542D30064D310 /* tikzparser.ym in Sources */ = {isa = PBXBuildFile; fileRef = 5589A9AB11C500060064D310 /* tikzparser.ym */; }; - 5589AA7211C542E60064D310 /* Edge.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18BA117B031C009863B2 /* Edge.m */; }; - 5589AA7611C542E60064D310 /* Graph.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18BC117B031C009863B2 /* Graph.m */; }; - 5589AA7811C542E60064D310 /* GraphChange.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18BE117B031C009863B2 /* GraphChange.m */; }; - 5589AA7A11C542E60064D310 /* GraphElementData.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C0117B031C009863B2 /* GraphElementData.m */; }; - 5589AA7C11C542E60064D310 /* Node.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C2117B031C009863B2 /* Node.m */; }; - 5589AA8011C542E60064D310 /* NodeStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C4117B031C009863B2 /* NodeStyle.m */; }; - 5589AA8511C543500064D310 /* util.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18CD117B03DD009863B2 /* util.m */; }; - 5589AD4411C633EE0064D310 /* SelectBoxLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 5589AD4311C633EE0064D310 /* SelectBoxLayer.m */; }; - 558F18C5117B031C009863B2 /* Edge.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18BA117B031C009863B2 /* Edge.m */; }; - 558F18C6117B031C009863B2 /* Graph.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18BC117B031C009863B2 /* Graph.m */; }; - 558F18C7117B031C009863B2 /* GraphChange.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18BE117B031C009863B2 /* GraphChange.m */; }; - 558F18C8117B031C009863B2 /* GraphElementData.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C0117B031C009863B2 /* GraphElementData.m */; }; - 558F18C9117B031C009863B2 /* Node.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C2117B031C009863B2 /* Node.m */; }; - 558F18CA117B031C009863B2 /* NodeStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18C4117B031C009863B2 /* NodeStyle.m */; }; - 558F18CE117B03DD009863B2 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18CB117B03DD009863B2 /* main.m */; }; - 558F18CF117B03DD009863B2 /* util.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18CD117B03DD009863B2 /* util.m */; }; - 558F18F7117B043C009863B2 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18DA117B043B009863B2 /* AppDelegate.m */; }; - 558F18F9117B043C009863B2 /* EdgeControlLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18DE117B043B009863B2 /* EdgeControlLayer.m */; }; - 558F18FA117B043C009863B2 /* GraphicsView.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18E0117B043B009863B2 /* GraphicsView.m */; }; - 558F18FB117B043C009863B2 /* Grid.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18E2117B043B009863B2 /* Grid.m */; }; - 558F18FC117B043C009863B2 /* NodeLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18E4117B043B009863B2 /* NodeLayer.m */; }; - 558F18FD117B043C009863B2 /* NodeSelectionLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18E6117B043B009863B2 /* NodeSelectionLayer.m */; }; - 558F18FF117B043C009863B2 /* SelectableCollectionViewItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18EA117B043B009863B2 /* SelectableCollectionViewItem.m */; }; - 558F1900117B043C009863B2 /* SelectableNodeView.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18EC117B043B009863B2 /* SelectableNodeView.m */; }; - 558F1901117B043C009863B2 /* StylePaletteController.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18EE117B043B009863B2 /* StylePaletteController.m */; }; - 558F1902117B043C009863B2 /* TikzDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18F0117B043B009863B2 /* TikzDocument.m */; }; - 558F1903117B043C009863B2 /* TikzSourceController.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18F2117B043B009863B2 /* TikzSourceController.m */; }; - 558F1904117B043C009863B2 /* ToolPaletteController.m in Sources */ = {isa = PBXBuildFile; fileRef = 558F18F4117B043B009863B2 /* ToolPaletteController.m */; }; - 55900AA1135FA918002DD28E /* MultiCombo.m in Sources */ = {isa = PBXBuildFile; fileRef = 55900AA0135FA918002DD28E /* MultiCombo.m */; }; - 55900AA2135FA918002DD28E /* MultiCombo.m in Sources */ = {isa = PBXBuildFile; fileRef = 55900AA0135FA918002DD28E /* MultiCombo.m */; }; - 55900AE3135FB305002DD28E /* emblem-unreadable-grey.png in Resources */ = {isa = PBXBuildFile; fileRef = 55900AE2135FB305002DD28E /* emblem-unreadable-grey.png */; }; - 559EFA4811C7D49800D020F4 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 559EFA4711C7D49800D020F4 /* Sparkle.framework */; }; - 559EFA4E11C7D4BD00D020F4 /* Sparkle.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 559EFA4711C7D49800D020F4 /* Sparkle.framework */; }; - 559EFA5711C7D95F00D020F4 /* tikzit_dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 559EFA5611C7D95F00D020F4 /* tikzit_dsa_pub.pem */; }; - 559EFB6811CB88E300D020F4 /* ColorRGB.m in Sources */ = {isa = PBXBuildFile; fileRef = 559EFB6711CB88E300D020F4 /* ColorRGB.m */; }; - 55CA98D512EF8FCE008F0368 /* SFBInspectors.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55CA98D412EF8FCE008F0368 /* SFBInspectors.framework */; }; - 55CA98DA12EF9098008F0368 /* SFBInspectors.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 55CA98D412EF8FCE008F0368 /* SFBInspectors.framework */; }; - 55CA98DD12EF910F008F0368 /* SFBInspectors.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55CA98D412EF8FCE008F0368 /* SFBInspectors.framework */; }; - 55CA997212F08281008F0368 /* TikzWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 55CA997112F08281008F0368 /* TikzWindowController.m */; }; - 55CA9AC912F831E5008F0368 /* RColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 55CA9AC812F831E5008F0368 /* RColor.m */; }; - 55CA9ACA12F831E5008F0368 /* RColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 55CA9AC812F831E5008F0368 /* RColor.m */; }; - 55D2E0B21186ED950060B4EC /* Graph+Coder.m in Sources */ = {isa = PBXBuildFile; fileRef = 55D2E0B11186ED950060B4EC /* Graph+Coder.m */; }; - 55D945721165904F0044178C /* tikzitdoc.icns in Resources */ = {isa = PBXBuildFile; fileRef = 55D945701165904F0044178C /* tikzitdoc.icns */; }; - 55D945731165904F0044178C /* tikzit.icns in Resources */ = {isa = PBXBuildFile; fileRef = 55D945711165904F0044178C /* tikzit.icns */; }; - 55D949141165D8870044178C /* draw-ellipse.png in Resources */ = {isa = PBXBuildFile; fileRef = 55D949111165D8870044178C /* draw-ellipse.png */; }; - 55D949151165D8870044178C /* draw-path.png in Resources */ = {isa = PBXBuildFile; fileRef = 55D949121165D8870044178C /* draw-path.png */; }; - 55D949161165D8870044178C /* select-rectangular.png in Resources */ = {isa = PBXBuildFile; fileRef = 55D949131165D8870044178C /* select-rectangular.png */; }; - 55E5E99E1215C8E300256F69 /* transform-crop-and-resize.png in Resources */ = {isa = PBXBuildFile; fileRef = 55E5E99D1215C8E300256F69 /* transform-crop-and-resize.png */; }; - 55F9585C1181B09600F99434 /* PickSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F958591181B09600F99434 /* PickSupport.m */; }; - 55F9585D1181B09600F99434 /* Transformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F9585B1181B09600F99434 /* Transformer.m */; }; - 55F9E04511FF54F000F5659E /* NSString+LatexConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F9E04411FF54F000F5659E /* NSString+LatexConstants.m */; }; - 7F18A321184C577000BC3081 /* UpdatePreferenceController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F18A320184C577000BC3081 /* UpdatePreferenceController.m */; }; - 7F18A323184C599100BC3081 /* UpdatePreferencePanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7F18A322184C599100BC3081 /* UpdatePreferencePanel.xib */; }; - 7F6E2C7D16B007F000BFE20D /* EdgeStyle.m in Sources */ = {isa = PBXBuildFile; fileRef = 55397C7814498C22006942FB /* EdgeStyle.m */; }; - 7F6E2C7E16B0080400BFE20D /* GraphElementProperty.m in Sources */ = {isa = PBXBuildFile; fileRef = 55432E051444BF2D00401BB3 /* GraphElementProperty.m */; }; - 7F6E2C7F16B0081D00BFE20D /* PropertyHolder.m in Sources */ = {isa = PBXBuildFile; fileRef = 55397C7E144999C4006942FB /* PropertyHolder.m */; }; - 7F6E2C8016B0083300BFE20D /* Shape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E4013E1FB0A0023F4C6 /* Shape.m */; }; - 7F6E2C8116B0084600BFE20D /* Transformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 55F9585B1181B09600F99434 /* Transformer.m */; }; - 7F6E2C8216B008B000BFE20D /* DiamondShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55598E341635372E0023450A /* DiamondShape.m */; }; - 7F6E2C8316B008B000BFE20D /* CircleShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3413E1FAED0023F4C6 /* CircleShape.m */; }; - 7F6E2C8416B008B000BFE20D /* RectangleShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3613E1FAED0023F4C6 /* RectangleShape.m */; }; - 7F6E2C8516B008B000BFE20D /* RegularPolyShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3813E1FAED0023F4C6 /* RegularPolyShape.m */; }; - 7F6E2C8616B008B000BFE20D /* TikzShape.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652E3A13E1FAEE0023F4C6 /* TikzShape.m */; }; - 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 */; }; - 7F73438A184AC559002897D0 /* DraggablePDFView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F734389184AC559002897D0 /* DraggablePDFView.m */; }; - 7F781C1A16B5DE1400239826 /* ParseErrorView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F781C1916B5DE1400239826 /* ParseErrorView.m */; }; - 7F7B6DED18DE0C9E004F6CA8 /* tikzlexer.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F7B6DEA18DE0C9E004F6CA8 /* tikzlexer.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 7F7B6DEE18DE0C9E004F6CA8 /* tikzparser.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F7B6DEC18DE0C9E004F6CA8 /* tikzparser.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - 7F7B6DF418DE0D7A004F6CA8 /* CustomNodeCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F7B6DF118DE0D7A004F6CA8 /* CustomNodeCellView.m */; }; - 7F7B6DF518DE0D7A004F6CA8 /* CustomNodeController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F7B6DF318DE0D7A004F6CA8 /* CustomNodeController.m */; }; - 7F90E88616DD29600069EBCD /* NSString+Tikz.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F90E88516DD29600069EBCD /* NSString+Tikz.m */; }; - 7F90E88D16DD47540069EBCD /* PreferenceController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F90E88B16DD47540069EBCD /* PreferenceController.m */; }; - 7F90E88E16DD47540069EBCD /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7F90E88C16DD47540069EBCD /* Preferences.xib */; }; - 7F90E89116DD54440069EBCD /* UserDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 7F90E88F16DD54440069EBCD /* UserDefaults.plist */; }; - 7F93852E184D176E00FAED38 /* updates.png in Resources */ = {isa = PBXBuildFile; fileRef = 7F93852D184D176E00FAED38 /* updates.png */; }; - 7F938530184D178B00FAED38 /* engine.png in Resources */ = {isa = PBXBuildFile; fileRef = 7F93852F184D178B00FAED38 /* engine.png */; }; - 7F938532184D184700FAED38 /* preamble.png in Resources */ = {isa = PBXBuildFile; fileRef = 7F938531184D184700FAED38 /* preamble.png */; }; - 7FB9BFEE16B57C2E00773146 /* TikzFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FB9BFED16B57C2E00773146 /* TikzFormatter.m */; }; - 7FD5D44B18E1CB5300E2A930 /* CustomNodes.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7FD5D44918E1CB5300E2A930 /* CustomNodes.xib */; }; - 7FD5D44D18E1CC0B00E2A930 /* customshape.png in Resources */ = {isa = PBXBuildFile; fileRef = 7FD5D44C18E1CC0B00E2A930 /* customshape.png */; }; - 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 */; }; - 8D15AC340486D014006FF6A4 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A7FEA54F5311CA2CBB /* Cocoa.framework */; }; -/* End PBXBuildFile section */ - -/* Begin PBXContainerItemProxy section */ - 5504C91A11D36CD5002A1478 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 2A37F4A9FDCFA73011CA2CEA /* Project object */; - proxyType = 1; - remoteGlobalIDString = 8D15AC270486D014006FF6A4; - remoteInfo = TikZiT; - }; -/* End PBXContainerItemProxy section */ - -/* Begin PBXCopyFilesBuildPhase section */ - 55652E6613E1FD080023F4C6 /* Copy Shapes */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = shapes; - dstSubfolderSpec = 7; - files = ( - 55652E5613E1FC660023F4C6 /* cap.tikz in Copy Shapes */, - 55652E5713E1FC660023F4C6 /* copants.tikz in Copy Shapes */, - 55652E5813E1FC660023F4C6 /* cup.tikz in Copy Shapes */, - 55652E5913E1FC660023F4C6 /* oval.tikz in Copy Shapes */, - 55652E5A13E1FC660023F4C6 /* pants.tikz in Copy Shapes */, - ); - name = "Copy Shapes"; - runOnlyForDeploymentPostprocessing = 0; - }; - 559EFA5511C7D4DD00D020F4 /* Copy Frameworks */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - 55CA98DA12EF9098008F0368 /* SFBInspectors.framework in Copy Frameworks */, - 559EFA4E11C7D4BD00D020F4 /* Sparkle.framework in Copy Frameworks */, - ); - name = "Copy Frameworks"; - runOnlyForDeploymentPostprocessing = 0; - }; - 7F6E2C8B16B00A9200BFE20D /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - 7F6E2C8C16B00ABA00BFE20D /* SFBInspectors.framework in CopyFiles */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - 089C1660FE840EACC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; - 1058C7A7FEA54F5311CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; - 13E42FBA07B3F13500E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = ""; }; - 1DDD58290DA1D0D100B32029 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/TikzDocument.xib; sourceTree = ""; }; - 1DDD582B0DA1D0D100B32029 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = ""; }; - 2564AD2C0F5327BB00F57823 /* TikZiT_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TikZiT_Prefix.pch; sourceTree = ""; }; - 2A37F4BAFDCFA73011CA2CEA /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/Credits.rtf; sourceTree = ""; }; - 2A37F4C4FDCFA73011CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; - 2A37F4C5FDCFA73011CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; - 5504C82A11D23595002A1478 /* common.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = common.m; path = src/common/test/common.m; sourceTree = ""; }; - 5504C82B11D23595002A1478 /* parser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = parser.m; path = src/common/test/parser.m; sourceTree = ""; }; - 5504C82C11D23595002A1478 /* test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = test.h; path = src/common/test/test.h; sourceTree = ""; }; - 5504C82D11D23595002A1478 /* test.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = test.m; path = src/common/test/test.m; sourceTree = ""; }; - 5504C83111D23685002A1478 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = src/osx/test/main.m; sourceTree = ""; }; - 5504C83711D237F5002A1478 /* tests */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = tests; sourceTree = BUILT_PRODUCTS_DIR; }; - 5504C93E11D39422002A1478 /* osx.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = osx.m; path = src/osx/test/osx.m; sourceTree = ""; }; - 552202C2135F15FD007EA086 /* MultiField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MultiField.h; path = src/osx/MultiField.h; sourceTree = ""; }; - 552202C3135F15FD007EA086 /* MultiField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MultiField.m; path = src/osx/MultiField.m; sourceTree = ""; }; - 55391B0113D32608007DBE71 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/PropertyInspector.xib; sourceTree = ""; }; - 55391B0813D32765007DBE71 /* PropertyInspectorController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PropertyInspectorController.h; path = src/osx/PropertyInspectorController.h; sourceTree = ""; }; - 55391B0913D32765007DBE71 /* PropertyInspectorController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PropertyInspectorController.m; path = src/osx/PropertyInspectorController.m; sourceTree = ""; }; - 55397C7714498C21006942FB /* EdgeStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EdgeStyle.h; path = src/common/EdgeStyle.h; sourceTree = ""; }; - 55397C7814498C22006942FB /* EdgeStyle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = EdgeStyle.m; path = src/common/EdgeStyle.m; sourceTree = ""; }; - 55397C7A144990EA006942FB /* EdgeStyle+Coder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "EdgeStyle+Coder.h"; path = "src/osx/EdgeStyle+Coder.h"; sourceTree = ""; }; - 55397C7B144990EA006942FB /* EdgeStyle+Coder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "EdgeStyle+Coder.m"; path = "src/osx/EdgeStyle+Coder.m"; sourceTree = ""; }; - 55397C7D144999C4006942FB /* PropertyHolder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PropertyHolder.h; path = src/common/PropertyHolder.h; sourceTree = ""; }; - 55397C7E144999C4006942FB /* PropertyHolder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PropertyHolder.m; path = src/common/PropertyHolder.m; sourceTree = ""; }; - 55397C801449A877006942FB /* ED_arrow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ED_arrow.png; sourceTree = ""; }; - 55397C821449A8F1006942FB /* ED_tick.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ED_tick.png; sourceTree = ""; }; - 55397C841449A9BF006942FB /* ED_none.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ED_none.png; sourceTree = ""; }; - 55397C871449AB91006942FB /* AH_none.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AH_none.png; sourceTree = ""; }; - 55397C881449AB91006942FB /* AH_plain_tail.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AH_plain_tail.png; sourceTree = ""; }; - 55397C8C1449ABFC006942FB /* AH_latex_tail.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AH_latex_tail.png; sourceTree = ""; }; - 55397C8E1449AC7C006942FB /* AH_latex_head.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AH_latex_head.png; sourceTree = ""; }; - 55397C8F1449AC7C006942FB /* AH_plain_head.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AH_plain_head.png; sourceTree = ""; }; - 553A4C58144ED3D500AA6FAC /* NilToEmptyStringTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NilToEmptyStringTransformer.h; path = src/osx/NilToEmptyStringTransformer.h; sourceTree = ""; }; - 553A4C59144ED3D500AA6FAC /* NilToEmptyStringTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NilToEmptyStringTransformer.m; path = src/osx/NilToEmptyStringTransformer.m; sourceTree = ""; }; - 55432E041444BF2D00401BB3 /* GraphElementProperty.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GraphElementProperty.h; path = src/common/GraphElementProperty.h; sourceTree = ""; }; - 55432E051444BF2D00401BB3 /* GraphElementProperty.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GraphElementProperty.m; path = src/common/GraphElementProperty.m; sourceTree = ""; }; - 55598E331635372E0023450A /* DiamondShape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DiamondShape.h; path = src/common/DiamondShape.h; sourceTree = ""; }; - 55598E341635372E0023450A /* DiamondShape.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DiamondShape.m; path = src/common/DiamondShape.m; sourceTree = ""; }; - 555B30F811D8BE3300CAECF5 /* emblem-important.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emblem-important.png"; sourceTree = ""; }; - 555B313411D8C6DA00CAECF5 /* color.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = color.m; path = src/common/test/color.m; sourceTree = ""; }; - 555ECE991378A3AA0052DB71 /* CALayer+DrawLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "CALayer+DrawLabel.h"; path = "src/osx/CALayer+DrawLabel.h"; sourceTree = ""; }; - 555ECE9A1378A3AA0052DB71 /* CALayer+DrawLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "CALayer+DrawLabel.m"; path = "src/osx/CALayer+DrawLabel.m"; sourceTree = ""; }; - 555ECF361379E9F80052DB71 /* ShapeNames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ShapeNames.h; path = src/common/ShapeNames.h; sourceTree = ""; }; - 55652DF713E1F2030023F4C6 /* SupportDir.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SupportDir.h; path = src/common/SupportDir.h; sourceTree = ""; }; - 55652DF813E1F2030023F4C6 /* SupportDir.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SupportDir.m; path = src/common/SupportDir.m; sourceTree = ""; }; - 55652E3313E1FAED0023F4C6 /* CircleShape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CircleShape.h; path = src/common/CircleShape.h; sourceTree = ""; }; - 55652E3413E1FAED0023F4C6 /* CircleShape.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CircleShape.m; path = src/common/CircleShape.m; sourceTree = ""; }; - 55652E3513E1FAED0023F4C6 /* RectangleShape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RectangleShape.h; path = src/common/RectangleShape.h; sourceTree = ""; }; - 55652E3613E1FAED0023F4C6 /* RectangleShape.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RectangleShape.m; path = src/common/RectangleShape.m; sourceTree = ""; }; - 55652E3713E1FAED0023F4C6 /* RegularPolyShape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RegularPolyShape.h; path = src/common/RegularPolyShape.h; sourceTree = ""; }; - 55652E3813E1FAED0023F4C6 /* RegularPolyShape.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RegularPolyShape.m; path = src/common/RegularPolyShape.m; sourceTree = ""; }; - 55652E3913E1FAEE0023F4C6 /* TikzShape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TikzShape.h; path = src/common/TikzShape.h; sourceTree = ""; }; - 55652E3A13E1FAEE0023F4C6 /* TikzShape.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TikzShape.m; path = src/common/TikzShape.m; sourceTree = ""; }; - 55652E3F13E1FB0A0023F4C6 /* Shape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Shape.h; path = src/common/Shape.h; sourceTree = ""; }; - 55652E4013E1FB0A0023F4C6 /* Shape.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Shape.m; path = src/common/Shape.m; sourceTree = ""; }; - 55652E5113E1FC660023F4C6 /* cap.tikz */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cap.tikz; sourceTree = ""; }; - 55652E5213E1FC660023F4C6 /* copants.tikz */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = copants.tikz; sourceTree = ""; }; - 55652E5313E1FC660023F4C6 /* cup.tikz */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cup.tikz; sourceTree = ""; }; - 55652E5413E1FC660023F4C6 /* oval.tikz */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = oval.tikz; sourceTree = ""; }; - 55652E5513E1FC660023F4C6 /* pants.tikz */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = pants.tikz; sourceTree = ""; }; - 5573B8B911D9FC8D00B5DC5D /* Quartz.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quartz.framework; path = System/Library/Frameworks/Quartz.framework; sourceTree = SDKROOT; }; - 5573B8BD11D9FCD400B5DC5D /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Preview.xib; sourceTree = ""; }; - 5573B8C011D9FD3200B5DC5D /* PreviewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PreviewController.h; path = src/osx/PreviewController.h; sourceTree = ""; }; - 5573B8C111D9FD3200B5DC5D /* PreviewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PreviewController.m; path = src/osx/PreviewController.m; sourceTree = ""; }; - 5573B90D11DA231A00B5DC5D /* PreambleController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PreambleController.h; path = src/osx/PreambleController.h; sourceTree = ""; }; - 5573B90E11DA231A00B5DC5D /* PreambleController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PreambleController.m; path = src/osx/PreambleController.m; sourceTree = ""; }; - 5573B91011DA233E00B5DC5D /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Preamble.xib; sourceTree = ""; }; - 5573B92011DA259C00B5DC5D /* text-x-generic.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "text-x-generic.png"; sourceTree = ""; }; - 5573B92411DA273400B5DC5D /* format-indent-less.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "format-indent-less.png"; sourceTree = ""; }; - 5573B92711DA292F00B5DC5D /* Preambles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Preambles.h; path = src/common/Preambles.h; sourceTree = ""; }; - 5573B92811DA292F00B5DC5D /* Preambles.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Preambles.m; path = src/common/Preambles.m; sourceTree = ""; }; - 5573B98711DA377C00B5DC5D /* text-x-script.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "text-x-script.png"; sourceTree = ""; }; - 5573BDC911DB4D2600B5DC5D /* Preambles+Coder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "Preambles+Coder.h"; path = "src/osx/Preambles+Coder.h"; sourceTree = ""; }; - 5573BDCA11DB4D2600B5DC5D /* Preambles+Coder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "Preambles+Coder.m"; path = "src/osx/Preambles+Coder.m"; sourceTree = ""; }; - 5585E5C0117F681800124513 /* NodeStyle+Coder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NodeStyle+Coder.h"; path = "src/osx/NodeStyle+Coder.h"; sourceTree = ""; }; - 5585E5C1117F681800124513 /* NodeStyle+Coder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NodeStyle+Coder.m"; path = "src/osx/NodeStyle+Coder.m"; sourceTree = ""; }; - 5589A9AA11C500060064D310 /* tikzlexer.lm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.lex; name = tikzlexer.lm; path = src/common/tikzlexer.lm; sourceTree = ""; }; - 5589A9AB11C500060064D310 /* tikzparser.ym */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.yacc; name = tikzparser.ym; path = src/common/tikzparser.ym; sourceTree = ""; }; - 5589A9FD11C51E780064D310 /* TikzGraphAssembler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TikzGraphAssembler.h; path = src/common/TikzGraphAssembler.h; sourceTree = ""; }; - 5589A9FE11C51E780064D310 /* TikzGraphAssembler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TikzGraphAssembler.m; path = src/common/TikzGraphAssembler.m; sourceTree = ""; }; - 5589AD4211C633EE0064D310 /* SelectBoxLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SelectBoxLayer.h; path = src/osx/SelectBoxLayer.h; sourceTree = ""; }; - 5589AD4311C633EE0064D310 /* SelectBoxLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SelectBoxLayer.m; path = src/osx/SelectBoxLayer.m; sourceTree = ""; }; - 558F18B9117B031C009863B2 /* Edge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Edge.h; path = src/common/Edge.h; sourceTree = ""; }; - 558F18BA117B031C009863B2 /* Edge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Edge.m; path = src/common/Edge.m; sourceTree = ""; }; - 558F18BB117B031C009863B2 /* Graph.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Graph.h; path = src/common/Graph.h; sourceTree = ""; }; - 558F18BC117B031C009863B2 /* Graph.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Graph.m; path = src/common/Graph.m; sourceTree = ""; }; - 558F18BD117B031C009863B2 /* GraphChange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GraphChange.h; path = src/common/GraphChange.h; sourceTree = ""; }; - 558F18BE117B031C009863B2 /* GraphChange.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GraphChange.m; path = src/common/GraphChange.m; sourceTree = ""; }; - 558F18BF117B031C009863B2 /* GraphElementData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GraphElementData.h; path = src/common/GraphElementData.h; sourceTree = ""; }; - 558F18C0117B031C009863B2 /* GraphElementData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GraphElementData.m; path = src/common/GraphElementData.m; sourceTree = ""; }; - 558F18C1117B031C009863B2 /* Node.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Node.h; path = src/common/Node.h; sourceTree = ""; }; - 558F18C2117B031C009863B2 /* Node.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Node.m; path = src/common/Node.m; sourceTree = ""; }; - 558F18C3117B031C009863B2 /* NodeStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NodeStyle.h; path = src/common/NodeStyle.h; sourceTree = ""; }; - 558F18C4117B031C009863B2 /* NodeStyle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NodeStyle.m; path = src/common/NodeStyle.m; sourceTree = ""; }; - 558F18CB117B03DD009863B2 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = src/osx/main.m; sourceTree = ""; }; - 558F18CC117B03DD009863B2 /* util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = util.h; path = src/common/util.h; sourceTree = ""; }; - 558F18CD117B03DD009863B2 /* util.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = util.m; path = src/common/util.m; sourceTree = ""; }; - 558F18D9117B043B009863B2 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = src/osx/AppDelegate.h; sourceTree = ""; }; - 558F18DA117B043B009863B2 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = src/osx/AppDelegate.m; sourceTree = ""; }; - 558F18DD117B043B009863B2 /* EdgeControlLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EdgeControlLayer.h; path = src/osx/EdgeControlLayer.h; sourceTree = ""; }; - 558F18DE117B043B009863B2 /* EdgeControlLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = EdgeControlLayer.m; path = src/osx/EdgeControlLayer.m; sourceTree = ""; }; - 558F18DF117B043B009863B2 /* GraphicsView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GraphicsView.h; path = src/osx/GraphicsView.h; sourceTree = ""; }; - 558F18E0117B043B009863B2 /* GraphicsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GraphicsView.m; path = src/osx/GraphicsView.m; sourceTree = ""; }; - 558F18E1117B043B009863B2 /* Grid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Grid.h; path = src/osx/Grid.h; sourceTree = ""; }; - 558F18E2117B043B009863B2 /* Grid.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Grid.m; path = src/osx/Grid.m; sourceTree = ""; }; - 558F18E3117B043B009863B2 /* NodeLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NodeLayer.h; path = src/osx/NodeLayer.h; sourceTree = ""; }; - 558F18E4117B043B009863B2 /* NodeLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NodeLayer.m; path = src/osx/NodeLayer.m; sourceTree = ""; }; - 558F18E5117B043B009863B2 /* NodeSelectionLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NodeSelectionLayer.h; path = src/osx/NodeSelectionLayer.h; sourceTree = ""; }; - 558F18E6117B043B009863B2 /* NodeSelectionLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NodeSelectionLayer.m; path = src/osx/NodeSelectionLayer.m; sourceTree = ""; }; - 558F18E9117B043B009863B2 /* SelectableCollectionViewItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SelectableCollectionViewItem.h; path = src/osx/SelectableCollectionViewItem.h; sourceTree = ""; }; - 558F18EA117B043B009863B2 /* SelectableCollectionViewItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SelectableCollectionViewItem.m; path = src/osx/SelectableCollectionViewItem.m; sourceTree = ""; }; - 558F18EB117B043B009863B2 /* SelectableNodeView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SelectableNodeView.h; path = src/osx/SelectableNodeView.h; sourceTree = ""; }; - 558F18EC117B043B009863B2 /* SelectableNodeView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SelectableNodeView.m; path = src/osx/SelectableNodeView.m; sourceTree = ""; }; - 558F18ED117B043B009863B2 /* StylePaletteController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StylePaletteController.h; path = src/osx/StylePaletteController.h; sourceTree = ""; }; - 558F18EE117B043B009863B2 /* StylePaletteController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = StylePaletteController.m; path = src/osx/StylePaletteController.m; sourceTree = ""; }; - 558F18EF117B043B009863B2 /* TikzDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TikzDocument.h; path = src/osx/TikzDocument.h; sourceTree = ""; }; - 558F18F0117B043B009863B2 /* TikzDocument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TikzDocument.m; path = src/osx/TikzDocument.m; sourceTree = ""; }; - 558F18F1117B043B009863B2 /* TikzSourceController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TikzSourceController.h; path = src/osx/TikzSourceController.h; sourceTree = ""; }; - 558F18F2117B043B009863B2 /* TikzSourceController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TikzSourceController.m; path = src/osx/TikzSourceController.m; sourceTree = ""; }; - 558F18F3117B043B009863B2 /* ToolPaletteController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ToolPaletteController.h; path = src/osx/ToolPaletteController.h; sourceTree = ""; }; - 558F18F4117B043B009863B2 /* ToolPaletteController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ToolPaletteController.m; path = src/osx/ToolPaletteController.m; sourceTree = ""; }; - 55900A9F135FA918002DD28E /* MultiCombo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MultiCombo.h; path = src/osx/MultiCombo.h; sourceTree = ""; }; - 55900AA0135FA918002DD28E /* MultiCombo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MultiCombo.m; path = src/osx/MultiCombo.m; sourceTree = ""; }; - 55900AE2135FB305002DD28E /* emblem-unreadable-grey.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "emblem-unreadable-grey.png"; sourceTree = ""; }; - 559EFA4711C7D49800D020F4 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = Frameworks/Sparkle.framework; sourceTree = ""; }; - 559EFA5611C7D95F00D020F4 /* tikzit_dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = tikzit_dsa_pub.pem; sourceTree = ""; }; - 559EFB6611CB88E300D020F4 /* ColorRGB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ColorRGB.h; path = src/common/ColorRGB.h; sourceTree = ""; }; - 559EFB6711CB88E300D020F4 /* ColorRGB.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ColorRGB.m; path = src/common/ColorRGB.m; sourceTree = ""; }; - 55CA98D412EF8FCE008F0368 /* SFBInspectors.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SFBInspectors.framework; path = Frameworks/SFBInspectors.framework; sourceTree = ""; }; - 55CA997012F08281008F0368 /* TikzWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TikzWindowController.h; path = src/osx/TikzWindowController.h; sourceTree = ""; }; - 55CA997112F08281008F0368 /* TikzWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TikzWindowController.m; path = src/osx/TikzWindowController.m; sourceTree = ""; }; - 55CA9AC712F831E5008F0368 /* RColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RColor.h; path = src/common/RColor.h; sourceTree = ""; }; - 55CA9AC812F831E5008F0368 /* RColor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RColor.m; path = src/common/RColor.m; sourceTree = ""; }; - 55D2E0B01186ED950060B4EC /* Graph+Coder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "Graph+Coder.h"; path = "src/osx/Graph+Coder.h"; sourceTree = ""; }; - 55D2E0B11186ED950060B4EC /* Graph+Coder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "Graph+Coder.m"; path = "src/osx/Graph+Coder.m"; sourceTree = ""; }; - 55D945701165904F0044178C /* tikzitdoc.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = tikzitdoc.icns; sourceTree = ""; }; - 55D945711165904F0044178C /* tikzit.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = tikzit.icns; sourceTree = ""; }; - 55D947301165A5D40044178C /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/StylePalette.xib; sourceTree = ""; }; - 55D949111165D8870044178C /* draw-ellipse.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "draw-ellipse.png"; sourceTree = ""; }; - 55D949121165D8870044178C /* draw-path.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "draw-path.png"; sourceTree = ""; }; - 55D949131165D8870044178C /* select-rectangular.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "select-rectangular.png"; sourceTree = ""; }; - 55E5E99D1215C8E300256F69 /* transform-crop-and-resize.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "transform-crop-and-resize.png"; sourceTree = ""; }; - 55F958581181B09600F99434 /* PickSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PickSupport.h; path = src/common/PickSupport.h; sourceTree = ""; }; - 55F958591181B09600F99434 /* PickSupport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PickSupport.m; path = src/common/PickSupport.m; sourceTree = ""; }; - 55F9585A1181B09600F99434 /* Transformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Transformer.h; path = src/common/Transformer.h; sourceTree = ""; }; - 55F9585B1181B09600F99434 /* Transformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Transformer.m; path = src/common/Transformer.m; sourceTree = ""; }; - 55F9E04311FF54F000F5659E /* NSString+LatexConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSString+LatexConstants.h"; path = "src/common/NSString+LatexConstants.h"; sourceTree = ""; }; - 55F9E04411FF54F000F5659E /* NSString+LatexConstants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSString+LatexConstants.m"; path = "src/common/NSString+LatexConstants.m"; sourceTree = ""; }; - 55FF4E64116A401B000C22B4 /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = usr/lib/libicucore.dylib; sourceTree = SDKROOT; }; - 7F18A31F184C577000BC3081 /* UpdatePreferenceController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UpdatePreferenceController.h; path = src/osx/UpdatePreferenceController.h; sourceTree = ""; }; - 7F18A320184C577000BC3081 /* UpdatePreferenceController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = UpdatePreferenceController.m; path = src/osx/UpdatePreferenceController.m; sourceTree = ""; }; - 7F18A322184C599100BC3081 /* UpdatePreferencePanel.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = UpdatePreferencePanel.xib; path = src/osx/UpdatePreferencePanel.xib; sourceTree = ""; }; - 7F6E2C8716B0091300BFE20D /* maths.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = maths.m; path = src/common/test/maths.m; sourceTree = ""; }; - 7F734388184AC559002897D0 /* DraggablePDFView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DraggablePDFView.h; path = src/osx/DraggablePDFView.h; sourceTree = ""; }; - 7F734389184AC559002897D0 /* DraggablePDFView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DraggablePDFView.m; path = src/osx/DraggablePDFView.m; sourceTree = ""; }; - 7F781C1816B5DE1400239826 /* ParseErrorView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ParseErrorView.h; path = src/osx/ParseErrorView.h; sourceTree = ""; }; - 7F781C1916B5DE1400239826 /* ParseErrorView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ParseErrorView.m; path = src/osx/ParseErrorView.m; sourceTree = ""; }; - 7F7B6DE918DE0C9E004F6CA8 /* tikzlexer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tikzlexer.h; path = xbuild/TikZiT.build/Debug/TikZiT.build/DerivedSources/tikzlexer.h; sourceTree = ""; }; - 7F7B6DEA18DE0C9E004F6CA8 /* tikzlexer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = tikzlexer.m; path = xbuild/TikZiT.build/Debug/TikZiT.build/DerivedSources/tikzlexer.m; sourceTree = ""; }; - 7F7B6DEB18DE0C9E004F6CA8 /* tikzparser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tikzparser.h; path = xbuild/TikZiT.build/Debug/TikZiT.build/DerivedSources/tikzparser.h; sourceTree = ""; }; - 7F7B6DEC18DE0C9E004F6CA8 /* tikzparser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = tikzparser.m; path = xbuild/TikZiT.build/Debug/TikZiT.build/DerivedSources/tikzparser.m; sourceTree = ""; }; - 7F7B6DF018DE0D7A004F6CA8 /* CustomNodeCellView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CustomNodeCellView.h; path = src/osx/CustomNodeCellView.h; sourceTree = ""; }; - 7F7B6DF118DE0D7A004F6CA8 /* CustomNodeCellView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CustomNodeCellView.m; path = src/osx/CustomNodeCellView.m; sourceTree = ""; }; - 7F7B6DF218DE0D7A004F6CA8 /* CustomNodeController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CustomNodeController.h; path = src/osx/CustomNodeController.h; sourceTree = ""; }; - 7F7B6DF318DE0D7A004F6CA8 /* CustomNodeController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CustomNodeController.m; path = src/osx/CustomNodeController.m; sourceTree = ""; }; - 7F90E88416DD29600069EBCD /* NSString+Tikz.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSString+Tikz.h"; path = "src/common/NSString+Tikz.h"; sourceTree = ""; }; - 7F90E88516DD29600069EBCD /* NSString+Tikz.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSString+Tikz.m"; path = "src/common/NSString+Tikz.m"; sourceTree = ""; }; - 7F90E88A16DD47540069EBCD /* PreferenceController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PreferenceController.h; path = src/osx/PreferenceController.h; sourceTree = ""; }; - 7F90E88B16DD47540069EBCD /* PreferenceController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PreferenceController.m; path = src/osx/PreferenceController.m; sourceTree = ""; }; - 7F90E88C16DD47540069EBCD /* Preferences.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = Preferences.xib; path = src/osx/Preferences.xib; sourceTree = ""; }; - 7F90E89016DD54440069EBCD /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = English; path = English.lproj/UserDefaults.plist; sourceTree = ""; }; - 7F93852D184D176E00FAED38 /* updates.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = updates.png; sourceTree = ""; }; - 7F93852F184D178B00FAED38 /* engine.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = engine.png; sourceTree = ""; }; - 7F938531184D184700FAED38 /* preamble.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = preamble.png; sourceTree = ""; }; - 7FB9BFEC16B57C2E00773146 /* TikzFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TikzFormatter.h; path = src/osx/TikzFormatter.h; sourceTree = ""; }; - 7FB9BFED16B57C2E00773146 /* TikzFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TikzFormatter.m; path = src/osx/TikzFormatter.m; sourceTree = ""; }; - 7FD5D44A18E1CB5300E2A930 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/CustomNodes.xib; sourceTree = ""; }; - 7FD5D44C18E1CC0B00E2A930 /* customshape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = customshape.png; sourceTree = ""; }; - 7FEED45516B1A7C400B056CB /* StyleManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StyleManager.h; path = src/common/StyleManager.h; sourceTree = ""; }; - 7FEED45616B1A7C500B056CB /* StyleManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = StyleManager.m; path = src/common/StyleManager.m; sourceTree = ""; }; - 8D15AC360486D014006FF6A4 /* TikZiT-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "TikZiT-Info.plist"; sourceTree = ""; }; - 8D15AC370486D014006FF6A4 /* TikZiT.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TikZiT.app; sourceTree = BUILT_PRODUCTS_DIR; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 5589AA6311C5429C0064D310 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 55CA98DD12EF910F008F0368 /* SFBInspectors.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 8D15AC330486D014006FF6A4 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 8D15AC340486D014006FF6A4 /* Cocoa.framework in Frameworks */, - 559EFA4811C7D49800D020F4 /* Sparkle.framework in Frameworks */, - 5573B8BA11D9FC8D00B5DC5D /* Quartz.framework in Frameworks */, - 55CA98D512EF8FCE008F0368 /* SFBInspectors.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 1058C7A6FEA54F5311CA2CBB /* Linked Frameworks */ = { - isa = PBXGroup; - children = ( - 1058C7A7FEA54F5311CA2CBB /* Cocoa.framework */, - 55FF4E64116A401B000C22B4 /* libicucore.dylib */, - 559EFA4711C7D49800D020F4 /* Sparkle.framework */, - 55CA98D412EF8FCE008F0368 /* SFBInspectors.framework */, - ); - name = "Linked Frameworks"; - sourceTree = ""; - }; - 1058C7A8FEA54F5311CA2CBB /* Other Frameworks */ = { - isa = PBXGroup; - children = ( - 2A37F4C4FDCFA73011CA2CEA /* AppKit.framework */, - 13E42FBA07B3F13500E4EEF1 /* CoreData.framework */, - 2A37F4C5FDCFA73011CA2CEA /* Foundation.framework */, - 5573B8B911D9FC8D00B5DC5D /* Quartz.framework */, - ); - name = "Other Frameworks"; - sourceTree = ""; - }; - 19C28FB0FE9D524F11CA2CBB /* Products */ = { - isa = PBXGroup; - children = ( - 8D15AC370486D014006FF6A4 /* TikZiT.app */, - 5504C83711D237F5002A1478 /* tests */, - ); - name = Products; - sourceTree = ""; - }; - 2A37F4AAFDCFA73011CA2CEA /* TikZiT */ = { - isa = PBXGroup; - children = ( - 2A37F4ABFDCFA73011CA2CEA /* TikZiT */, - 2A37F4AFFDCFA73011CA2CEA /* Other Sources */, - 2A37F4B8FDCFA73011CA2CEA /* Resources */, - 2A37F4C3FDCFA73011CA2CEA /* Frameworks */, - 19C28FB0FE9D524F11CA2CBB /* Products */, - ); - name = TikZiT; - sourceTree = ""; - }; - 2A37F4ABFDCFA73011CA2CEA /* TikZiT */ = { - isa = PBXGroup; - children = ( - 5504C82611D23477002A1478 /* Test */, - 55D946141165924F0044178C /* Graph */, - 55D946071165922F0044178C /* Parser */, - 55D9467311659F5E0044178C /* Gui */, - 558F18D9117B043B009863B2 /* AppDelegate.h */, - 558F18DA117B043B009863B2 /* AppDelegate.m */, - 55F9E04311FF54F000F5659E /* NSString+LatexConstants.h */, - 55F9E04411FF54F000F5659E /* NSString+LatexConstants.m */, - ); - name = TikZiT; - sourceTree = ""; - }; - 2A37F4AFFDCFA73011CA2CEA /* Other Sources */ = { - isa = PBXGroup; - children = ( - 55CA9AC712F831E5008F0368 /* RColor.h */, - 55CA9AC812F831E5008F0368 /* RColor.m */, - 558F18CB117B03DD009863B2 /* main.m */, - 558F18CC117B03DD009863B2 /* util.h */, - 558F18CD117B03DD009863B2 /* util.m */, - 2564AD2C0F5327BB00F57823 /* TikZiT_Prefix.pch */, - 55652DF713E1F2030023F4C6 /* SupportDir.h */, - 55652DF813E1F2030023F4C6 /* SupportDir.m */, - ); - name = "Other Sources"; - sourceTree = ""; - }; - 2A37F4B8FDCFA73011CA2CEA /* Resources */ = { - isa = PBXGroup; - children = ( - 55397C8E1449AC7C006942FB /* AH_latex_head.png */, - 55397C8F1449AC7C006942FB /* AH_plain_head.png */, - 55397C8C1449ABFC006942FB /* AH_latex_tail.png */, - 55397C871449AB91006942FB /* AH_none.png */, - 55397C881449AB91006942FB /* AH_plain_tail.png */, - 55397C841449A9BF006942FB /* ED_none.png */, - 55397C821449A8F1006942FB /* ED_tick.png */, - 55397C801449A877006942FB /* ED_arrow.png */, - 7F93852C184D175400FAED38 /* Icons */, - 55652E5013E1FC660023F4C6 /* shapes */, - 55900AE2135FB305002DD28E /* emblem-unreadable-grey.png */, - 55E5E99D1215C8E300256F69 /* transform-crop-and-resize.png */, - 5573B98711DA377C00B5DC5D /* text-x-script.png */, - 8D15AC360486D014006FF6A4 /* TikZiT-Info.plist */, - 7F90E88F16DD54440069EBCD /* UserDefaults.plist */, - 089C165FFE840EACC02AAC07 /* InfoPlist.strings */, - 2A37F4B9FDCFA73011CA2CEA /* Credits.rtf */, - 55D949111165D8870044178C /* draw-ellipse.png */, - 55D949121165D8870044178C /* draw-path.png */, - 555B30F811D8BE3300CAECF5 /* emblem-important.png */, - 5573B92411DA273400B5DC5D /* format-indent-less.png */, - 55D949131165D8870044178C /* select-rectangular.png */, - 5573B92011DA259C00B5DC5D /* text-x-generic.png */, - 559EFA5611C7D95F00D020F4 /* tikzit_dsa_pub.pem */, - 55D945701165904F0044178C /* tikzitdoc.icns */, - 55D945711165904F0044178C /* tikzit.icns */, - 7F90E88C16DD47540069EBCD /* Preferences.xib */, - 7FD5D44918E1CB5300E2A930 /* CustomNodes.xib */, - 7F18A322184C599100BC3081 /* UpdatePreferencePanel.xib */, - 55391AF713D3250F007DBE71 /* Preamble.xib */, - 55391AF513D324FE007DBE71 /* Preview.xib */, - 55391B0013D32608007DBE71 /* PropertyInspector.xib */, - 556979421168747B007E5703 /* StylePalette.xib */, - 1DDD58280DA1D0D100B32029 /* TikzDocument.xib */, - 1DDD582A0DA1D0D100B32029 /* MainMenu.xib */, - ); - name = Resources; - sourceTree = ""; - }; - 2A37F4C3FDCFA73011CA2CEA /* Frameworks */ = { - isa = PBXGroup; - children = ( - 1058C7A6FEA54F5311CA2CBB /* Linked Frameworks */, - 1058C7A8FEA54F5311CA2CBB /* Other Frameworks */, - ); - name = Frameworks; - sourceTree = ""; - }; - 5504C82611D23477002A1478 /* Test */ = { - isa = PBXGroup; - children = ( - 555B313411D8C6DA00CAECF5 /* color.m */, - 5504C93E11D39422002A1478 /* osx.m */, - 5504C82A11D23595002A1478 /* common.m */, - 5504C83111D23685002A1478 /* main.m */, - 5504C82B11D23595002A1478 /* parser.m */, - 5504C82C11D23595002A1478 /* test.h */, - 5504C82D11D23595002A1478 /* test.m */, - 7F6E2C8716B0091300BFE20D /* maths.m */, - ); - name = Test; - sourceTree = ""; - }; - 55391B0713D326E5007DBE71 /* PropertyInspector */ = { - isa = PBXGroup; - children = ( - 552202C2135F15FD007EA086 /* MultiField.h */, - 552202C3135F15FD007EA086 /* MultiField.m */, - 55900A9F135FA918002DD28E /* MultiCombo.h */, - 55900AA0135FA918002DD28E /* MultiCombo.m */, - 55391B0813D32765007DBE71 /* PropertyInspectorController.h */, - 55391B0913D32765007DBE71 /* PropertyInspectorController.m */, - ); - name = PropertyInspector; - sourceTree = ""; - }; - 55652E5013E1FC660023F4C6 /* shapes */ = { - isa = PBXGroup; - children = ( - 55652E5113E1FC660023F4C6 /* cap.tikz */, - 55652E5213E1FC660023F4C6 /* copants.tikz */, - 55652E5313E1FC660023F4C6 /* cup.tikz */, - 55652E5413E1FC660023F4C6 /* oval.tikz */, - 55652E5513E1FC660023F4C6 /* pants.tikz */, - ); - path = shapes; - sourceTree = ""; - }; - 5573B8BF11D9FD1800B5DC5D /* Preview */ = { - isa = PBXGroup; - children = ( - 7F734388184AC559002897D0 /* DraggablePDFView.h */, - 7F734389184AC559002897D0 /* DraggablePDFView.m */, - 5573B8C011D9FD3200B5DC5D /* PreviewController.h */, - 5573B8C111D9FD3200B5DC5D /* PreviewController.m */, - ); - name = Preview; - sourceTree = ""; - }; - 5573B90C11DA22E500B5DC5D /* Preamble */ = { - isa = PBXGroup; - children = ( - 5573B92711DA292F00B5DC5D /* Preambles.h */, - 5573B92811DA292F00B5DC5D /* Preambles.m */, - 5573BDC911DB4D2600B5DC5D /* Preambles+Coder.h */, - 5573BDCA11DB4D2600B5DC5D /* Preambles+Coder.m */, - ); - name = Preamble; - sourceTree = ""; - }; - 55900AFC13605498002DD28E /* Shapes */ = { - isa = PBXGroup; - children = ( - 55598E331635372E0023450A /* DiamondShape.h */, - 55598E341635372E0023450A /* DiamondShape.m */, - 55652E3F13E1FB0A0023F4C6 /* Shape.h */, - 55652E4013E1FB0A0023F4C6 /* Shape.m */, - 55652E3313E1FAED0023F4C6 /* CircleShape.h */, - 55652E3413E1FAED0023F4C6 /* CircleShape.m */, - 55652E3513E1FAED0023F4C6 /* RectangleShape.h */, - 55652E3613E1FAED0023F4C6 /* RectangleShape.m */, - 55652E3713E1FAED0023F4C6 /* RegularPolyShape.h */, - 55652E3813E1FAED0023F4C6 /* RegularPolyShape.m */, - 55652E3913E1FAEE0023F4C6 /* TikzShape.h */, - 55652E3A13E1FAEE0023F4C6 /* TikzShape.m */, - 555ECF361379E9F80052DB71 /* ShapeNames.h */, - ); - name = Shapes; - sourceTree = ""; - }; - 55D946071165922F0044178C /* Parser */ = { - isa = PBXGroup; - children = ( - 7F7B6DE218DE0BE1004F6CA8 /* Generated sources */, - 5589A9AA11C500060064D310 /* tikzlexer.lm */, - 5589A9AB11C500060064D310 /* tikzparser.ym */, - 5589A9FD11C51E780064D310 /* TikzGraphAssembler.h */, - 5589A9FE11C51E780064D310 /* TikzGraphAssembler.m */, - ); - name = Parser; - sourceTree = ""; - }; - 55D946141165924F0044178C /* Graph */ = { - isa = PBXGroup; - children = ( - 55432E041444BF2D00401BB3 /* GraphElementProperty.h */, - 55432E051444BF2D00401BB3 /* GraphElementProperty.m */, - 559EFB6611CB88E300D020F4 /* ColorRGB.h */, - 559EFB6711CB88E300D020F4 /* ColorRGB.m */, - 558F18B9117B031C009863B2 /* Edge.h */, - 558F18BA117B031C009863B2 /* Edge.m */, - 558F18BB117B031C009863B2 /* Graph.h */, - 558F18BC117B031C009863B2 /* Graph.m */, - 55D2E0B01186ED950060B4EC /* Graph+Coder.h */, - 55D2E0B11186ED950060B4EC /* Graph+Coder.m */, - 558F18BD117B031C009863B2 /* GraphChange.h */, - 558F18BE117B031C009863B2 /* GraphChange.m */, - 7FEED45516B1A7C400B056CB /* StyleManager.h */, - 7FEED45616B1A7C500B056CB /* StyleManager.m */, - 558F18BF117B031C009863B2 /* GraphElementData.h */, - 558F18C0117B031C009863B2 /* GraphElementData.m */, - 558F18C1117B031C009863B2 /* Node.h */, - 558F18C2117B031C009863B2 /* Node.m */, - 7F90E88416DD29600069EBCD /* NSString+Tikz.h */, - 7F90E88516DD29600069EBCD /* NSString+Tikz.m */, - 558F18C3117B031C009863B2 /* NodeStyle.h */, - 558F18C4117B031C009863B2 /* NodeStyle.m */, - 5585E5C0117F681800124513 /* NodeStyle+Coder.h */, - 5585E5C1117F681800124513 /* NodeStyle+Coder.m */, - 55397C7714498C21006942FB /* EdgeStyle.h */, - 55397C7814498C22006942FB /* EdgeStyle.m */, - 55397C7A144990EA006942FB /* EdgeStyle+Coder.h */, - 55397C7B144990EA006942FB /* EdgeStyle+Coder.m */, - 55397C7D144999C4006942FB /* PropertyHolder.h */, - 55397C7E144999C4006942FB /* PropertyHolder.m */, - ); - name = Graph; - sourceTree = ""; - }; - 55D9467311659F5E0044178C /* Gui */ = { - isa = PBXGroup; - children = ( - 7FB9BFE616B54BE300773146 /* Formatter */, - 55D9468011659FD50044178C /* GraphicsView */, - 5573B90C11DA22E500B5DC5D /* Preamble */, - 5573B8BF11D9FD1800B5DC5D /* Preview */, - 55391B0713D326E5007DBE71 /* PropertyInspector */, - 55D9468D11659FF00044178C /* StylePalette */, - 558F18EF117B043B009863B2 /* TikzDocument.h */, - 7F781C1816B5DE1400239826 /* ParseErrorView.h */, - 7F781C1916B5DE1400239826 /* ParseErrorView.m */, - 558F18F0117B043B009863B2 /* TikzDocument.m */, - 558F18F1117B043B009863B2 /* TikzSourceController.h */, - 558F18F2117B043B009863B2 /* TikzSourceController.m */, - 558F18F3117B043B009863B2 /* ToolPaletteController.h */, - 558F18F4117B043B009863B2 /* ToolPaletteController.m */, - 55CA997012F08281008F0368 /* TikzWindowController.h */, - 55CA997112F08281008F0368 /* TikzWindowController.m */, - 553A4C58144ED3D500AA6FAC /* NilToEmptyStringTransformer.h */, - 553A4C59144ED3D500AA6FAC /* NilToEmptyStringTransformer.m */, - 7F18A31E184C563800BC3081 /* Preferences */, - ); - name = Gui; - sourceTree = ""; - }; - 55D9468011659FD50044178C /* GraphicsView */ = { - isa = PBXGroup; - children = ( - 55900AFC13605498002DD28E /* Shapes */, - 558F18DD117B043B009863B2 /* EdgeControlLayer.h */, - 558F18DE117B043B009863B2 /* EdgeControlLayer.m */, - 558F18DF117B043B009863B2 /* GraphicsView.h */, - 558F18E0117B043B009863B2 /* GraphicsView.m */, - 558F18E1117B043B009863B2 /* Grid.h */, - 558F18E2117B043B009863B2 /* Grid.m */, - 558F18E3117B043B009863B2 /* NodeLayer.h */, - 558F18E4117B043B009863B2 /* NodeLayer.m */, - 558F18E5117B043B009863B2 /* NodeSelectionLayer.h */, - 558F18E6117B043B009863B2 /* NodeSelectionLayer.m */, - 55F958581181B09600F99434 /* PickSupport.h */, - 55F958591181B09600F99434 /* PickSupport.m */, - 55F9585A1181B09600F99434 /* Transformer.h */, - 55F9585B1181B09600F99434 /* Transformer.m */, - 5589AD4211C633EE0064D310 /* SelectBoxLayer.h */, - 5589AD4311C633EE0064D310 /* SelectBoxLayer.m */, - 555ECE991378A3AA0052DB71 /* CALayer+DrawLabel.h */, - 555ECE9A1378A3AA0052DB71 /* CALayer+DrawLabel.m */, - ); - name = GraphicsView; - sourceTree = ""; - }; - 55D9468D11659FF00044178C /* StylePalette */ = { - isa = PBXGroup; - children = ( - 558F18E9117B043B009863B2 /* SelectableCollectionViewItem.h */, - 558F18EA117B043B009863B2 /* SelectableCollectionViewItem.m */, - 558F18EB117B043B009863B2 /* SelectableNodeView.h */, - 558F18EC117B043B009863B2 /* SelectableNodeView.m */, - 558F18ED117B043B009863B2 /* StylePaletteController.h */, - 558F18EE117B043B009863B2 /* StylePaletteController.m */, - ); - name = StylePalette; - sourceTree = ""; - }; - 7F18A31E184C563800BC3081 /* Preferences */ = { - isa = PBXGroup; - children = ( - 7F7B6DEF18DE0D70004F6CA8 /* CustomNode */, - 5573B90D11DA231A00B5DC5D /* PreambleController.h */, - 5573B90E11DA231A00B5DC5D /* PreambleController.m */, - 7F90E88A16DD47540069EBCD /* PreferenceController.h */, - 7F90E88B16DD47540069EBCD /* PreferenceController.m */, - 7F18A31F184C577000BC3081 /* UpdatePreferenceController.h */, - 7F18A320184C577000BC3081 /* UpdatePreferenceController.m */, - ); - name = Preferences; - sourceTree = ""; - }; - 7F7B6DE218DE0BE1004F6CA8 /* Generated sources */ = { - isa = PBXGroup; - children = ( - 7F7B6DE918DE0C9E004F6CA8 /* tikzlexer.h */, - 7F7B6DEA18DE0C9E004F6CA8 /* tikzlexer.m */, - 7F7B6DEB18DE0C9E004F6CA8 /* tikzparser.h */, - 7F7B6DEC18DE0C9E004F6CA8 /* tikzparser.m */, - ); - name = "Generated sources"; - sourceTree = ""; - }; - 7F7B6DEF18DE0D70004F6CA8 /* CustomNode */ = { - isa = PBXGroup; - children = ( - 7F7B6DF018DE0D7A004F6CA8 /* CustomNodeCellView.h */, - 7F7B6DF118DE0D7A004F6CA8 /* CustomNodeCellView.m */, - 7F7B6DF218DE0D7A004F6CA8 /* CustomNodeController.h */, - 7F7B6DF318DE0D7A004F6CA8 /* CustomNodeController.m */, - ); - name = CustomNode; - sourceTree = ""; - }; - 7F93852C184D175400FAED38 /* Icons */ = { - isa = PBXGroup; - children = ( - 7F93852F184D178B00FAED38 /* engine.png */, - 7F938531184D184700FAED38 /* preamble.png */, - 7FD5D44C18E1CC0B00E2A930 /* customshape.png */, - 7F93852D184D176E00FAED38 /* updates.png */, - ); - name = Icons; - sourceTree = ""; - }; - 7FB9BFE616B54BE300773146 /* Formatter */ = { - isa = PBXGroup; - children = ( - 7FB9BFEC16B57C2E00773146 /* TikzFormatter.h */, - 7FB9BFED16B57C2E00773146 /* TikzFormatter.m */, - ); - name = Formatter; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 5589AA6411C5429C0064D310 /* tests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 5589AA8311C543240064D310 /* Build configuration list for PBXNativeTarget "tests" */; - buildPhases = ( - 5589AA6211C5429C0064D310 /* Sources */, - 5589AA6311C5429C0064D310 /* Frameworks */, - 7F6E2C8B16B00A9200BFE20D /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - 5504C91B11D36CD5002A1478 /* PBXTargetDependency */, - ); - name = tests; - productName = testparser; - productReference = 5504C83711D237F5002A1478 /* tests */; - productType = "com.apple.product-type.tool"; - }; - 8D15AC270486D014006FF6A4 /* TikZiT */ = { - isa = PBXNativeTarget; - buildConfigurationList = C05733C708A9546B00998B17 /* Build configuration list for PBXNativeTarget "TikZiT" */; - buildPhases = ( - 559EFA5511C7D4DD00D020F4 /* Copy Frameworks */, - 8D15AC2B0486D014006FF6A4 /* Resources */, - 55652E6613E1FD080023F4C6 /* Copy Shapes */, - 7F7B6DE018DE02AC004F6CA8 /* Run Flex */, - 7F7B6DE118DE0A6E004F6CA8 /* Run Bison */, - 8D15AC300486D014006FF6A4 /* Sources */, - 8D15AC330486D014006FF6A4 /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = TikZiT; - productInstallPath = "$(HOME)/Applications"; - productName = TikZiT; - productReference = 8D15AC370486D014006FF6A4 /* TikZiT.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 2A37F4A9FDCFA73011CA2CEA /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 0410; - ORGANIZATIONNAME = "Aleks Kissinger"; - }; - buildConfigurationList = C05733CB08A9546B00998B17 /* Build configuration list for PBXProject "TikZiT" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; - hasScannedForEncodings = 1; - knownRegions = ( - English, - Japanese, - French, - German, - ); - mainGroup = 2A37F4AAFDCFA73011CA2CEA /* TikZiT */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 8D15AC270486D014006FF6A4 /* TikZiT */, - 5589AA6411C5429C0064D310 /* tests */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 8D15AC2B0486D014006FF6A4 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 8D15AC2C0486D014006FF6A4 /* Credits.rtf in Resources */, - 8D15AC2F0486D014006FF6A4 /* InfoPlist.strings in Resources */, - 7F938532184D184700FAED38 /* preamble.png in Resources */, - 1DDD582C0DA1D0D100B32029 /* TikzDocument.xib in Resources */, - 7F938530184D178B00FAED38 /* engine.png in Resources */, - 1DDD582D0DA1D0D100B32029 /* MainMenu.xib in Resources */, - 7FD5D44D18E1CC0B00E2A930 /* customshape.png in Resources */, - 55D945721165904F0044178C /* tikzitdoc.icns in Resources */, - 55D945731165904F0044178C /* tikzit.icns in Resources */, - 556979431168747B007E5703 /* StylePalette.xib in Resources */, - 55D949141165D8870044178C /* draw-ellipse.png in Resources */, - 55D949151165D8870044178C /* draw-path.png in Resources */, - 55D949161165D8870044178C /* select-rectangular.png in Resources */, - 559EFA5711C7D95F00D020F4 /* tikzit_dsa_pub.pem in Resources */, - 7F93852E184D176E00FAED38 /* updates.png in Resources */, - 555B30F911D8BE3300CAECF5 /* emblem-important.png in Resources */, - 55391AF613D324FE007DBE71 /* Preview.xib in Resources */, - 55391AF813D3250F007DBE71 /* Preamble.xib in Resources */, - 5573B92111DA259C00B5DC5D /* text-x-generic.png in Resources */, - 5573B92511DA273400B5DC5D /* format-indent-less.png in Resources */, - 5573B98811DA377C00B5DC5D /* text-x-script.png in Resources */, - 55E5E99E1215C8E300256F69 /* transform-crop-and-resize.png in Resources */, - 55900AE3135FB305002DD28E /* emblem-unreadable-grey.png in Resources */, - 55391B0213D32608007DBE71 /* PropertyInspector.xib in Resources */, - 55397C811449A877006942FB /* ED_arrow.png in Resources */, - 55397C831449A8F1006942FB /* ED_tick.png in Resources */, - 55397C851449A9BF006942FB /* ED_none.png in Resources */, - 55397C8A1449AB91006942FB /* AH_none.png in Resources */, - 55397C8B1449AB91006942FB /* AH_plain_tail.png in Resources */, - 55397C8D1449ABFC006942FB /* AH_latex_tail.png in Resources */, - 7FD5D44B18E1CB5300E2A930 /* CustomNodes.xib in Resources */, - 55397C901449AC7C006942FB /* AH_latex_head.png in Resources */, - 55397C911449AC7C006942FB /* AH_plain_head.png in Resources */, - 7F18A323184C599100BC3081 /* UpdatePreferencePanel.xib in Resources */, - 7F90E88E16DD47540069EBCD /* Preferences.xib in Resources */, - 7F90E89116DD54440069EBCD /* UserDefaults.plist in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXShellScriptBuildPhase section */ - 7F7B6DE018DE02AC004F6CA8 /* Run Flex */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "$(SRCROOT)/src/common/tikzlexer.lm", - ); - name = "Run Flex"; - outputPaths = ( - "$(DERIVED_SOURCES_DIR)/tikzlexer.m", - "$(DERIVED_SOURCES_DIR)/tikzlexer.h", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "cd ${SRCROOT}/src/\nexport INPUT_FILE_BASE=`basename \"${SCRIPT_INPUT_FILE_0}\" .lm`\nflex -o common/${INPUT_FILE_BASE}.m common/${INPUT_FILE_BASE}.lm\nmv common/${INPUT_FILE_BASE}.m common/${INPUT_FILE_BASE}.h ${DERIVED_SOURCES_DIR}\n"; - }; - 7F7B6DE118DE0A6E004F6CA8 /* Run Bison */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "$(SRCROOT)/src/common/tikzparser.ym", - ); - name = "Run Bison"; - outputPaths = ( - "$(DERIVED_SOURCES_DIR)/tikzparser.m", - "$(DERIVED_SOURCES_DIR)/tikzparser.h", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "cd ${SRCROOT}/src/\nexport INPUT_FILE_BASE=`basename \"${SCRIPT_INPUT_FILE_0}\" .ym`\nbison --defines=common/${INPUT_FILE_BASE}.h --output=common/${INPUT_FILE_BASE}.m common/${INPUT_FILE_BASE}.ym\nmv common/${INPUT_FILE_BASE}.m common/${INPUT_FILE_BASE}.h ${DERIVED_SOURCES_DIR}"; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 5589AA6211C5429C0064D310 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 5504C84F11D23945002A1478 /* ColorRGB.m in Sources */, - 5589AA8511C543500064D310 /* util.m in Sources */, - 5589AA7211C542E60064D310 /* Edge.m in Sources */, - 5589AA7611C542E60064D310 /* Graph.m in Sources */, - 5589AA7811C542E60064D310 /* GraphChange.m in Sources */, - 5589AA7A11C542E60064D310 /* GraphElementData.m in Sources */, - 5589AA7C11C542E60064D310 /* Node.m in Sources */, - 5589AA8011C542E60064D310 /* NodeStyle.m in Sources */, - 5589AA6C11C542D30064D310 /* TikzGraphAssembler.m in Sources */, - 5589AA6D11C542D30064D310 /* tikzlexer.lm in Sources */, - 7F6E2C8216B008B000BFE20D /* DiamondShape.m in Sources */, - 7F6E2C8316B008B000BFE20D /* CircleShape.m in Sources */, - 7F6E2C8A16B0096000BFE20D /* SupportDir.m in Sources */, - 7F6E2C8416B008B000BFE20D /* RectangleShape.m in Sources */, - 7F6E2C8516B008B000BFE20D /* RegularPolyShape.m in Sources */, - 7F6E2C8616B008B000BFE20D /* TikzShape.m in Sources */, - 7F6E2C8016B0083300BFE20D /* Shape.m in Sources */, - 7F6E2C8116B0084600BFE20D /* Transformer.m in Sources */, - 5589AA6E11C542D30064D310 /* tikzparser.ym in Sources */, - 5504C82E11D23595002A1478 /* common.m in Sources */, - 5504C82F11D23595002A1478 /* parser.m in Sources */, - 5504C83011D23595002A1478 /* test.m in Sources */, - 7F6E2C7F16B0081D00BFE20D /* PropertyHolder.m in Sources */, - 5504C83211D23685002A1478 /* main.m in Sources */, - 5504C93F11D39422002A1478 /* osx.m in Sources */, - 555B313511D8C6DA00CAECF5 /* color.m in Sources */, - 7F6E2C7E16B0080400BFE20D /* GraphElementProperty.m in Sources */, - 7F6E2C7D16B007F000BFE20D /* EdgeStyle.m in Sources */, - 55CA9ACA12F831E5008F0368 /* RColor.m in Sources */, - 552202C4135F15FD007EA086 /* MultiField.m in Sources */, - 55900AA1135FA918002DD28E /* MultiCombo.m in Sources */, - 7F6E2C8916B0091300BFE20D /* maths.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 8D15AC300486D014006FF6A4 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 7F7B6DEE18DE0C9E004F6CA8 /* tikzparser.m in Sources */, - 7F7B6DED18DE0C9E004F6CA8 /* tikzlexer.m in Sources */, - 558F18C5117B031C009863B2 /* Edge.m in Sources */, - 558F18C6117B031C009863B2 /* Graph.m in Sources */, - 558F18C7117B031C009863B2 /* GraphChange.m in Sources */, - 7F7B6DF418DE0D7A004F6CA8 /* CustomNodeCellView.m in Sources */, - 558F18C8117B031C009863B2 /* GraphElementData.m in Sources */, - 558F18C9117B031C009863B2 /* Node.m in Sources */, - 558F18CA117B031C009863B2 /* NodeStyle.m in Sources */, - 558F18CE117B03DD009863B2 /* main.m in Sources */, - 558F18CF117B03DD009863B2 /* util.m in Sources */, - 558F18F7117B043C009863B2 /* AppDelegate.m in Sources */, - 558F18F9117B043C009863B2 /* EdgeControlLayer.m in Sources */, - 558F18FA117B043C009863B2 /* GraphicsView.m in Sources */, - 7F73438A184AC559002897D0 /* DraggablePDFView.m in Sources */, - 558F18FB117B043C009863B2 /* Grid.m in Sources */, - 558F18FC117B043C009863B2 /* NodeLayer.m in Sources */, - 558F18FD117B043C009863B2 /* NodeSelectionLayer.m in Sources */, - 558F18FF117B043C009863B2 /* SelectableCollectionViewItem.m in Sources */, - 558F1900117B043C009863B2 /* SelectableNodeView.m in Sources */, - 558F1901117B043C009863B2 /* StylePaletteController.m in Sources */, - 558F1902117B043C009863B2 /* TikzDocument.m in Sources */, - 558F1903117B043C009863B2 /* TikzSourceController.m in Sources */, - 558F1904117B043C009863B2 /* ToolPaletteController.m in Sources */, - 5585E5C2117F681800124513 /* NodeStyle+Coder.m in Sources */, - 55F9585C1181B09600F99434 /* PickSupport.m in Sources */, - 55F9585D1181B09600F99434 /* Transformer.m in Sources */, - 55D2E0B21186ED950060B4EC /* Graph+Coder.m in Sources */, - 5589A9FF11C51E780064D310 /* TikzGraphAssembler.m in Sources */, - 7F7B6DF518DE0D7A004F6CA8 /* CustomNodeController.m in Sources */, - 5589AD4411C633EE0064D310 /* SelectBoxLayer.m in Sources */, - 559EFB6811CB88E300D020F4 /* ColorRGB.m in Sources */, - 5573B8C211D9FD3200B5DC5D /* PreviewController.m in Sources */, - 5573B90F11DA231A00B5DC5D /* PreambleController.m in Sources */, - 5573B92911DA292F00B5DC5D /* Preambles.m in Sources */, - 5573BDCB11DB4D2600B5DC5D /* Preambles+Coder.m in Sources */, - 55F9E04511FF54F000F5659E /* NSString+LatexConstants.m in Sources */, - 55CA997212F08281008F0368 /* TikzWindowController.m in Sources */, - 55CA9AC912F831E5008F0368 /* RColor.m in Sources */, - 552202C5135F15FD007EA086 /* MultiField.m in Sources */, - 55900AA2135FA918002DD28E /* MultiCombo.m in Sources */, - 555ECE9B1378A3AA0052DB71 /* CALayer+DrawLabel.m in Sources */, - 55391B0A13D32765007DBE71 /* PropertyInspectorController.m in Sources */, - 55652DF913E1F2030023F4C6 /* SupportDir.m in Sources */, - 55652E3B13E1FAEE0023F4C6 /* CircleShape.m in Sources */, - 55652E3C13E1FAEE0023F4C6 /* RectangleShape.m in Sources */, - 55652E3D13E1FAEE0023F4C6 /* RegularPolyShape.m in Sources */, - 55652E3E13E1FAEE0023F4C6 /* TikzShape.m in Sources */, - 55652E4113E1FB0A0023F4C6 /* Shape.m in Sources */, - 55432E061444BF2D00401BB3 /* GraphElementProperty.m in Sources */, - 55397C7914498C22006942FB /* EdgeStyle.m in Sources */, - 55397C7C144990EA006942FB /* EdgeStyle+Coder.m in Sources */, - 55397C7F144999C4006942FB /* PropertyHolder.m in Sources */, - 553A4C5A144ED3D500AA6FAC /* NilToEmptyStringTransformer.m in Sources */, - 55598E351635372E0023450A /* DiamondShape.m in Sources */, - 7FEED45716B1A7C500B056CB /* StyleManager.m in Sources */, - 7FB9BFEE16B57C2E00773146 /* TikzFormatter.m in Sources */, - 7F781C1A16B5DE1400239826 /* ParseErrorView.m in Sources */, - 7F90E88616DD29600069EBCD /* NSString+Tikz.m in Sources */, - 7F90E88D16DD47540069EBCD /* PreferenceController.m in Sources */, - 7F18A321184C577000BC3081 /* UpdatePreferenceController.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXTargetDependency section */ - 5504C91B11D36CD5002A1478 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 8D15AC270486D014006FF6A4 /* TikZiT */; - targetProxy = 5504C91A11D36CD5002A1478 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - -/* Begin PBXVariantGroup section */ - 089C165FFE840EACC02AAC07 /* InfoPlist.strings */ = { - isa = PBXVariantGroup; - children = ( - 089C1660FE840EACC02AAC07 /* English */, - ); - name = InfoPlist.strings; - sourceTree = ""; - }; - 1DDD58280DA1D0D100B32029 /* TikzDocument.xib */ = { - isa = PBXVariantGroup; - children = ( - 1DDD58290DA1D0D100B32029 /* English */, - ); - name = TikzDocument.xib; - sourceTree = ""; - }; - 1DDD582A0DA1D0D100B32029 /* MainMenu.xib */ = { - isa = PBXVariantGroup; - children = ( - 1DDD582B0DA1D0D100B32029 /* English */, - ); - name = MainMenu.xib; - sourceTree = ""; - }; - 2A37F4B9FDCFA73011CA2CEA /* Credits.rtf */ = { - isa = PBXVariantGroup; - children = ( - 2A37F4BAFDCFA73011CA2CEA /* English */, - ); - name = Credits.rtf; - sourceTree = ""; - }; - 55391AF513D324FE007DBE71 /* Preview.xib */ = { - isa = PBXVariantGroup; - children = ( - 5573B8BD11D9FCD400B5DC5D /* English */, - ); - name = Preview.xib; - sourceTree = ""; - }; - 55391AF713D3250F007DBE71 /* Preamble.xib */ = { - isa = PBXVariantGroup; - children = ( - 5573B91011DA233E00B5DC5D /* English */, - ); - name = Preamble.xib; - sourceTree = ""; - }; - 55391B0013D32608007DBE71 /* PropertyInspector.xib */ = { - isa = PBXVariantGroup; - children = ( - 55391B0113D32608007DBE71 /* English */, - ); - name = PropertyInspector.xib; - sourceTree = ""; - }; - 556979421168747B007E5703 /* StylePalette.xib */ = { - isa = PBXVariantGroup; - children = ( - 55D947301165A5D40044178C /* English */, - ); - name = StylePalette.xib; - sourceTree = ""; - }; - 7F90E88F16DD54440069EBCD /* UserDefaults.plist */ = { - isa = PBXVariantGroup; - children = ( - 7F90E89016DD54440069EBCD /* English */, - ); - name = UserDefaults.plist; - sourceTree = ""; - }; - 7FD5D44918E1CB5300E2A930 /* CustomNodes.xib */ = { - isa = PBXVariantGroup; - children = ( - 7FD5D44A18E1CB5300E2A930 /* English */, - ); - name = CustomNodes.xib; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - -/* Begin XCBuildConfiguration section */ - 5589AA6711C5429E0064D310 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/Frameworks\"", - ); - GCC_DYNAMIC_NO_PIC = NO; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; - INSTALL_PATH = /usr/local/bin; - OTHER_LDFLAGS = ( - "-framework", - Foundation, - "-framework", - AppKit, - ); - PRODUCT_NAME = tests; - SDKROOT = macosx; - }; - name = Debug; - }; - 5589AA6811C5429E0064D310 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/Frameworks\"", - ); - GCC_MODEL_TUNING = G5; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h"; - INSTALL_PATH = /usr/local/bin; - OTHER_LDFLAGS = ( - "-framework", - Foundation, - "-framework", - AppKit, - ); - PRODUCT_NAME = tests; - SDKROOT = macosx; - ZERO_LINK = NO; - }; - name = Release; - }; - C05733C808A9546B00998B17 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; - CLANG_ENABLE_OBJC_ARC = YES; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)\"", - "\"$(SRCROOT)/Frameworks\"", - ); - GCC_DYNAMIC_NO_PIC = NO; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = TikZiT_Prefix.pch; - INFOPLIST_FILE = "TikZiT-Info.plist"; - INSTALL_PATH = "$(HOME)/Applications"; - LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.7; - PRODUCT_NAME = TikZiT; - SDKROOT = macosx; - }; - name = Debug; - }; - C05733C908A9546B00998B17 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; - CLANG_ENABLE_OBJC_ARC = YES; - COMBINE_HIDPI_IMAGES = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)\"", - "\"$(SRCROOT)/Frameworks\"", - ); - GCC_MODEL_TUNING = G5; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = TikZiT_Prefix.pch; - INFOPLIST_FILE = "TikZiT-Info.plist"; - INSTALL_PATH = "$(HOME)/Applications"; - LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.7; - PRODUCT_NAME = TikZiT; - SDKROOT = macosx; - }; - name = Release; - }; - C05733CC08A9546B00998B17 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.5; - ONLY_ACTIVE_ARCH = YES; - PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO; - SDKROOT = macosx; - SYMROOT = xbuild; - USER_HEADER_SEARCH_PATHS = "src/osx src/common"; - VALID_ARCHS = "i386 x86_64"; - }; - name = Debug; - }; - C05733CD08A9546B00998B17 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ""; - MACOSX_DEPLOYMENT_TARGET = 10.5; - ONLY_ACTIVE_ARCH = NO; - PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO; - SDKROOT = macosx; - SYMROOT = xbuild; - USER_HEADER_SEARCH_PATHS = "src/osx src/common"; - VALID_ARCHS = "i386 x86_64"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 5589AA8311C543240064D310 /* Build configuration list for PBXNativeTarget "tests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 5589AA6711C5429E0064D310 /* Debug */, - 5589AA6811C5429E0064D310 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - C05733C708A9546B00998B17 /* Build configuration list for PBXNativeTarget "TikZiT" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - C05733C808A9546B00998B17 /* Debug */, - C05733C908A9546B00998B17 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - C05733CB08A9546B00998B17 /* Build configuration list for PBXProject "TikZiT" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - C05733CC08A9546B00998B17 /* Debug */, - C05733CD08A9546B00998B17 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 2A37F4A9FDCFA73011CA2CEA /* Project object */; -} diff --git a/tikzit-old/TikZiT.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/tikzit-old/TikZiT.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 82f3c48..0000000 --- a/tikzit-old/TikZiT.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/tikzit-old/TikZiT.xcodeproj/project.xcworkspace/xcshareddata/TikZiT.xccheckout b/tikzit-old/TikZiT.xcodeproj/project.xcworkspace/xcshareddata/TikZiT.xccheckout deleted file mode 100644 index c3ec4fe..0000000 --- a/tikzit-old/TikZiT.xcodeproj/project.xcworkspace/xcshareddata/TikZiT.xccheckout +++ /dev/null @@ -1,37 +0,0 @@ - - - - - IDESourceControlProjectFavoriteDictionaryKey - - IDESourceControlProjectIdentifier - 26857C1F-E0FE-4FFB-BDAC-44158C649772 - IDESourceControlProjectOriginsDictionary - - F6FA2C351D428A0F1026539971510A626DEEFF59 - https://github.com/tikzit/tikzit.git - - IDESourceControlProjectRelativeInstallPathDictionary - - F6FA2C351D428A0F1026539971510A626DEEFF59 - TikZiT/ - - IDESourceControlProjectURL - https://github.com/tikzit/tikzit.git - IDESourceControlProjectVersion - 111 - IDESourceControlProjectWCCIdentifier - F6FA2C351D428A0F1026539971510A626DEEFF59 - IDESourceControlProjectWCConfigurations - - - IDESourceControlRepositoryExtensionIdentifierKey - public.vcs.git - IDESourceControlWCCIdentifierKey - F6FA2C351D428A0F1026539971510A626DEEFF59 - IDESourceControlWCCName - TikZiT - - - - diff --git a/tikzit-old/TikZiT.xcodeproj/project.xcworkspace/xcuserdata/aleks.xcuserdatad/UserInterfaceState.xcuserstate b/tikzit-old/TikZiT.xcodeproj/project.xcworkspace/xcuserdata/aleks.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index 99a5997..0000000 --- a/tikzit-old/TikZiT.xcodeproj/project.xcworkspace/xcuserdata/aleks.xcuserdatad/UserInterfaceState.xcuserstate +++ /dev/null @@ -1,24539 +0,0 @@ - - - - - $archiver - NSKeyedArchiver - $objects - - $null - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 2 - - - CF$UID - 3 - - - CF$UID - 4 - - - CF$UID - 5 - - - NS.objects - - - CF$UID - 6 - - - CF$UID - 194 - - - CF$UID - 441 - - - CF$UID - 533 - - - - 5D4A1A9F-B7F3-4B80-B1F2-42874F168C6C - FCF6616B-37CA-49A5-B7DD-7EC65F973E7D - E8D758DD-8E38-40E4-B712-F6B0919F77C9 - IDEWorkspaceDocument - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 7 - - - CF$UID - 8 - - - CF$UID - 9 - - - CF$UID - 10 - - - CF$UID - 11 - - - CF$UID - 12 - - - CF$UID - 13 - - - CF$UID - 14 - - - NS.objects - - - CF$UID - 15 - - - CF$UID - 192 - - - CF$UID - 193 - - - CF$UID - 25 - - - CF$UID - 2 - - - CF$UID - 7 - - - CF$UID - 25 - - - CF$UID - 25 - - - - IDEWorkspaceTabController_255C042C-F813-417B-AD8A-811609B9E1F2 - IDEWindowFrame - IDEOrderedWorkspaceTabControllers - IDEWindowInFullscreenMode - IDEWorkspaceWindowControllerUniqueIdentifier - IDEActiveWorkspaceTabController - IDEWindowToolbarIsVisible - IDEWindowTabBarIsVisible - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 16 - - - CF$UID - 17 - - - CF$UID - 18 - - - CF$UID - 19 - - - CF$UID - 20 - - - CF$UID - 21 - - - CF$UID - 22 - - - CF$UID - 23 - - - NS.objects - - - CF$UID - 24 - - - CF$UID - 25 - - - CF$UID - 26 - - - CF$UID - 27 - - - CF$UID - 40 - - - CF$UID - 78 - - - CF$UID - 25 - - - CF$UID - 87 - - - - IDETabLabel - IDEShowNavigator - AssistantEditorsLayout - IDEWorkspaceTabControllerUtilityAreaSplitView - IDENavigatorArea - IDEWorkspaceTabControllerDesignAreaSplitView - IDEShowUtilities - IDEEditorArea - Graph.m - - 0 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 29 - - - - DVTSplitViewItems - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 30 - - - CF$UID - 36 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 33 - - - CF$UID - 34 - - - - DVTIdentifier - DVTViewMagnitude - - 127 - - $classes - - NSDictionary - NSObject - - $classname - NSDictionary - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 33 - - - CF$UID - 37 - - - - 473 - - $classes - - NSMutableArray - NSArray - NSObject - - $classname - NSMutableArray - - - $classes - - NSMutableDictionary - NSDictionary - NSObject - - $classname - NSMutableDictionary - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 41 - - - CF$UID - 42 - - - NS.objects - - - CF$UID - 42 - - - CF$UID - 43 - - - - SelectedNavigator - Xcode.IDEKit.Navigator.Structure - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 44 - - - CF$UID - 45 - - - CF$UID - 46 - - - CF$UID - 47 - - - CF$UID - 48 - - - CF$UID - 49 - - - CF$UID - 50 - - - NS.objects - - - CF$UID - 51 - - - CF$UID - 25 - - - CF$UID - 52 - - - CF$UID - 25 - - - CF$UID - 25 - - - CF$UID - 54 - - - CF$UID - 61 - - - - IDEVisibleRect - IDEUnsavedDocumentFilteringEnabled - IDENavigatorExpandedItemsBeforeFilteringSet - IDERecentDocumentFilteringEnabled - IDESCMStatusFilteringEnabled - IDESelectedObjects - IDEExpandedItemsSet - {{0, 0}, {0, 0}} - - $class - - CF$UID - 53 - - NS.objects - - - - $classes - - NSSet - NSObject - - $classname - NSSet - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 55 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 56 - - - CF$UID - 57 - - - CF$UID - 58 - - - CF$UID - 59 - - - - TikZiT - TikZiT - Graph - Graph.m - - $classes - - NSArray - NSObject - - $classname - NSArray - - - $class - - CF$UID - 53 - - NS.objects - - - CF$UID - 62 - - - CF$UID - 63 - - - CF$UID - 65 - - - CF$UID - 66 - - - CF$UID - 68 - - - CF$UID - 72 - - - CF$UID - 73 - - - CF$UID - 75 - - - CF$UID - 76 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 56 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 56 - - - CF$UID - 64 - - - - Resources - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 56 - - - CF$UID - 57 - - - CF$UID - 58 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 56 - - - CF$UID - 57 - - - CF$UID - 67 - - - - Parser - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 56 - - - CF$UID - 69 - - - CF$UID - 70 - - - CF$UID - 71 - - - - Frameworks - Linked Frameworks - SFBInspectors.framework - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 56 - - - CF$UID - 69 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 56 - - - CF$UID - 64 - - - CF$UID - 74 - - - - shapes - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 56 - - - CF$UID - 69 - - - CF$UID - 70 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 56 - - - CF$UID - 77 - - - - Other Sources - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 79 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 80 - - - CF$UID - 82 - - - CF$UID - 84 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 20 - - - CF$UID - 81 - - - - 225 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 23 - - - CF$UID - 83 - - - - 815 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 85 - - - CF$UID - 86 - - - - IDEUtilitiesArea - 260 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 88 - - - CF$UID - 89 - - - CF$UID - 90 - - - CF$UID - 91 - - - CF$UID - 92 - - - CF$UID - 93 - - - CF$UID - 94 - - - CF$UID - 95 - - - NS.objects - - - CF$UID - 96 - - - CF$UID - 116 - - - CF$UID - 156 - - - CF$UID - 182 - - - CF$UID - 26 - - - CF$UID - 183 - - - CF$UID - 191 - - - CF$UID - 25 - - - - layoutTree - IDEEditorMode_Standard - IDEEDitorArea_DebugArea - IDEShowEditor - EditorMode - DebuggerSplitView - DefaultPersistentRepresentations - ShowDebuggerArea - - $class - - CF$UID - 115 - - geniusEditorContextNode - - CF$UID - 0 - - primaryEditorContextNode - - CF$UID - 97 - - rootLayoutTreeNode - - CF$UID - 112 - - - - $class - - CF$UID - 114 - - children - - CF$UID - 0 - - contentType - 1 - documentArchivableRepresentation - - CF$UID - 98 - - orientation - 0 - parent - - CF$UID - 112 - - - - $class - - CF$UID - 111 - - DocumentLocation - - CF$UID - 107 - - DomainIdentifier - - CF$UID - 99 - - IdentifierPath - - CF$UID - 100 - - IndexOfDocumentIdentifier - - CF$UID - 26 - - - Xcode.IDENavigableItemDomain.WorkspaceStructure - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 101 - - - CF$UID - 103 - - - CF$UID - 104 - - - CF$UID - 105 - - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 59 - - - - $classes - - IDEArchivableStringIndexPair - NSObject - - $classname - IDEArchivableStringIndexPair - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 58 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 57 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 106 - - - TikZiT - - $class - - CF$UID - 110 - - documentURL - - CF$UID - 108 - - timestamp - - CF$UID - 0 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/Graph.m - - - $classes - - NSMutableString - NSString - NSObject - - $classname - NSMutableString - - - $classes - - DVTDocumentLocation - NSObject - - $classname - DVTDocumentLocation - - - $classes - - IDENavigableItemArchivableRepresentation - NSObject - - $classname - IDENavigableItemArchivableRepresentation - - - $class - - CF$UID - 114 - - children - - CF$UID - 113 - - contentType - 0 - documentArchivableRepresentation - - CF$UID - 0 - - orientation - 0 - parent - - CF$UID - 0 - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 97 - - - - - $classes - - IDEWorkspaceTabControllerLayoutTreeNode - NSObject - - $classname - IDEWorkspaceTabControllerLayoutTreeNode - - - $classes - - IDEWorkspaceTabControllerLayoutTree - NSObject - - $classname - IDEWorkspaceTabControllerLayoutTree - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 117 - - - NS.objects - - - CF$UID - 118 - - - - EditorLayout_PersistentRepresentation - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 119 - - - NS.objects - - - CF$UID - 120 - - - - Main - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 121 - - - CF$UID - 122 - - - CF$UID - 123 - - - NS.objects - - - CF$UID - 124 - - - CF$UID - 26 - - - CF$UID - 154 - - - - EditorLayout_StateSavingStateDictionaries - EditorLayout_Selected - EditorLayout_Geometry - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 125 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 126 - - - CF$UID - 127 - - - CF$UID - 128 - - - CF$UID - 129 - - - CF$UID - 130 - - - CF$UID - 131 - - - CF$UID - 132 - - - NS.objects - - - CF$UID - 133 - - - CF$UID - 134 - - - CF$UID - 141 - - - CF$UID - 149 - - - CF$UID - 59 - - - CF$UID - 150 - - - CF$UID - 151 - - - - FileDataType - ArchivableRepresentation - EditorState - NavigableItemName - DocumentNavigableItemName - DocumentExtensionIdentifier - DocumentURL - public.objective-c-source - - $class - - CF$UID - 111 - - DocumentLocation - - CF$UID - 107 - - DomainIdentifier - - CF$UID - 99 - - IdentifierPath - - CF$UID - 135 - - IndexOfDocumentIdentifier - - CF$UID - 26 - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 136 - - - CF$UID - 137 - - - CF$UID - 138 - - - CF$UID - 139 - - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 59 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 58 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 57 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 140 - - - TikZiT - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 142 - - - CF$UID - 143 - - - CF$UID - 144 - - - CF$UID - 145 - - - NS.objects - - - CF$UID - 146 - - - CF$UID - 147 - - - CF$UID - 25 - - - CF$UID - 148 - - - - PrimaryDocumentTimestamp - PrimaryDocumentVisibleCharacterRange - HideAllIssues - PrimaryDocumentSelectedCharacterRange - 381083683.77450001 - {18089, 1176} - {19467, 0} - -tikz - Xcode.IDEKit.EditorDocument.SourceCode - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 152 - - - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/Graph.m - - $classes - - NSURL - NSObject - - $classname - NSURL - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 155 - - - - {{0, 0}, {600, 600}} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 157 - - - CF$UID - 158 - - - CF$UID - 159 - - - CF$UID - 160 - - - CF$UID - 161 - - - CF$UID - 162 - - - NS.objects - - - CF$UID - 163 - - - CF$UID - 164 - - - CF$UID - 166 - - - CF$UID - 163 - - - CF$UID - 168 - - - CF$UID - 176 - - - - LayoutFocusMode - console - variables - LayoutMode - IDEDebugArea_SplitView - IDEDebuggerAreaSplitView - 1 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 165 - - - NS.objects - - - CF$UID - 26 - - - - ConsoleFilterMode - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 167 - - - NS.objects - - - CF$UID - 163 - - - - VariablesViewSelectedScope - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 169 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 170 - - - CF$UID - 173 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 171 - - - CF$UID - 172 - - - - VariablesView - 301 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 174 - - - CF$UID - 175 - - - - ConsoleArea - 298 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 177 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 178 - - - CF$UID - 180 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 171 - - - CF$UID - 179 - - - - 301 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 174 - - - CF$UID - 181 - - - - 298 - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 184 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 185 - - - CF$UID - 188 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 186 - - - CF$UID - 187 - - - - IDEEditor - 203 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 189 - - - CF$UID - 190 - - - - IDEDebuggerArea - 115 - - $class - - CF$UID - 39 - - NS.keys - - NS.objects - - - {{264, 446}, {600, 624}} - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 7 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 8 - - - CF$UID - 9 - - - CF$UID - 195 - - - CF$UID - 10 - - - CF$UID - 196 - - - CF$UID - 12 - - - CF$UID - 13 - - - CF$UID - 14 - - - NS.objects - - - CF$UID - 197 - - - CF$UID - 198 - - - CF$UID - 199 - - - CF$UID - 25 - - - CF$UID - 3 - - - CF$UID - 195 - - - CF$UID - 182 - - - CF$UID - 25 - - - - IDEWorkspaceTabController_9038AF6D-AD9C-4682-ADF8-6CB1A302CFE7 - IDEWorkspaceWindowControllerUniqueIdentifier - {{447, 347}, {1300, 786}} - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 195 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 18 - - - CF$UID - 17 - - - CF$UID - 16 - - - CF$UID - 19 - - - CF$UID - 20 - - - CF$UID - 21 - - - CF$UID - 22 - - - CF$UID - 23 - - - NS.objects - - - CF$UID - 26 - - - CF$UID - 182 - - - CF$UID - 200 - - - CF$UID - 201 - - - CF$UID - 207 - - - CF$UID - 281 - - - CF$UID - 182 - - - CF$UID - 289 - - - - Graph.m - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 202 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 203 - - - CF$UID - 205 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 33 - - - CF$UID - 204 - - - - 403 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 33 - - - CF$UID - 206 - - - - 307 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 208 - - - CF$UID - 41 - - - CF$UID - 209 - - - CF$UID - 210 - - - CF$UID - 211 - - - CF$UID - 42 - - - CF$UID - 212 - - - NS.objects - - - CF$UID - 213 - - - CF$UID - 42 - - - CF$UID - 224 - - - CF$UID - 241 - - - CF$UID - 247 - - - CF$UID - 258 - - - CF$UID - 273 - - - - Xcode.IDEKit.Navigator.Symbol - Xcode.IDEKit.Navigator.Issues - Xcode.IDEKit.Navigator.Debug - Xcode.IDEKit.Navigator.Breakpoints - Xcode.IDEKit.Navigator.Logs - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 214 - - - CF$UID - 215 - - - CF$UID - 216 - - - CF$UID - 217 - - - CF$UID - 218 - - - CF$UID - 219 - - - CF$UID - 220 - - - NS.objects - - - CF$UID - 182 - - - CF$UID - 182 - - - CF$UID - 25 - - - CF$UID - 182 - - - CF$UID - 221 - - - CF$UID - 222 - - - CF$UID - 223 - - - - IDESymbolNavigatorShowWorkspaceOnly - IDESymbolNavigatorShowHierarchy - IDESymbolNavigatorShowContainersOnly - IDESymbolNavigatorShowClassesOnly - IDESymbolNamePatternString - IDESymbolNavigatorSelectedSymbols - IDEExpandedItems - - - $class - - CF$UID - 38 - - NS.objects - - - - $class - - CF$UID - 38 - - NS.objects - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 225 - - - CF$UID - 226 - - - CF$UID - 227 - - - CF$UID - 228 - - - CF$UID - 229 - - - CF$UID - 230 - - - CF$UID - 231 - - - CF$UID - 232 - - - CF$UID - 233 - - - NS.objects - - - CF$UID - 25 - - - CF$UID - 234 - - - CF$UID - 235 - - - CF$UID - 237 - - - CF$UID - 238 - - - CF$UID - 25 - - - CF$UID - 239 - - - CF$UID - 25 - - - CF$UID - 240 - - - - IDEErrorFilteringEnabled - IDEVisibleRect - IDECollapsedFiles - IDEExpandedIssues - IDESelectedNavigables - IDEShowsByType - IDECollapsedTypes - IDERecentFilteringEnabled - IDECollapsedGroups - {{0, 0}, {209, 644}} - - $class - - CF$UID - 236 - - NS.objects - - - - $classes - - NSMutableSet - NSSet - NSObject - - $classname - NSMutableSet - - - $class - - CF$UID - 236 - - NS.objects - - - - $class - - CF$UID - 38 - - NS.objects - - - - $class - - CF$UID - 236 - - NS.objects - - - - $class - - CF$UID - 236 - - NS.objects - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 242 - - - CF$UID - 243 - - - CF$UID - 244 - - - NS.objects - - - CF$UID - 245 - - - CF$UID - 246 - - - CF$UID - 25 - - - - IDEStackCompressionValue - IDEThreadOrQueueMode - IDEShowOnlyInterestingContent - 2 - 0 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 248 - - - CF$UID - 249 - - - CF$UID - 250 - - - CF$UID - 251 - - - NS.objects - - - CF$UID - 52 - - - CF$UID - 25 - - - CF$UID - 252 - - - CF$UID - 257 - - - - IDECollapsedtemsSet - IDEBreakpointNavigatorFilterOnEnabled - IDESelectedObjects - IDEVisibleRect - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 253 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 254 - - - CF$UID - 255 - - - CF$UID - 256 - - - - TikZiT - SelectableNodeView.m - -setNodeStyle: - {{0, 0}, {224, 686}} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 44 - - - CF$UID - 45 - - - CF$UID - 46 - - - CF$UID - 47 - - - CF$UID - 48 - - - CF$UID - 49 - - - CF$UID - 50 - - - NS.objects - - - CF$UID - 259 - - - CF$UID - 25 - - - CF$UID - 52 - - - CF$UID - 25 - - - CF$UID - 25 - - - CF$UID - 260 - - - CF$UID - 263 - - - - {{0, 0}, {209, 666}} - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 261 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 262 - - - CF$UID - 57 - - - CF$UID - 58 - - - CF$UID - 59 - - - - TikZiT - - $class - - CF$UID - 53 - - NS.objects - - - CF$UID - 264 - - - CF$UID - 265 - - - CF$UID - 266 - - - CF$UID - 267 - - - CF$UID - 268 - - - CF$UID - 269 - - - CF$UID - 270 - - - CF$UID - 271 - - - CF$UID - 272 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 262 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 262 - - - CF$UID - 64 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 262 - - - CF$UID - 57 - - - CF$UID - 67 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 262 - - - CF$UID - 69 - - - CF$UID - 70 - - - CF$UID - 71 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 262 - - - CF$UID - 64 - - - CF$UID - 74 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 262 - - - CF$UID - 69 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 262 - - - CF$UID - 77 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 262 - - - CF$UID - 57 - - - CF$UID - 58 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 262 - - - CF$UID - 69 - - - CF$UID - 70 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 274 - - - CF$UID - 275 - - - CF$UID - 276 - - - CF$UID - 277 - - - NS.objects - - - CF$UID - 278 - - - CF$UID - 279 - - - CF$UID - 25 - - - CF$UID - 280 - - - - IDELogNavigatorExpandedItemsStateKey - IDELogNavigatorSelectedObjectsStateKey - IDELogNavigatorRecentFilterStateKey - IDELogNavigatorVisibleRectStateKey - - $class - - CF$UID - 38 - - NS.objects - - - - $class - - CF$UID - 38 - - NS.objects - - - {{0, 0}, {464, 738}} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 282 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 283 - - - CF$UID - 285 - - - CF$UID - 287 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 20 - - - CF$UID - 284 - - - - 225 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 23 - - - CF$UID - 286 - - - - 815 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 85 - - - CF$UID - 288 - - - - 260 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 95 - - - CF$UID - 89 - - - CF$UID - 90 - - - CF$UID - 91 - - - CF$UID - 92 - - - CF$UID - 290 - - - CF$UID - 93 - - - CF$UID - 94 - - - CF$UID - 291 - - - CF$UID - 88 - - - NS.objects - - - CF$UID - 182 - - - CF$UID - 292 - - - CF$UID - 314 - - - CF$UID - 182 - - - CF$UID - 26 - - - CF$UID - 329 - - - CF$UID - 368 - - - CF$UID - 374 - - - CF$UID - 375 - - - CF$UID - 430 - - - - IDEEditorMode_Version - IDEEditorMode_Genius - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 117 - - - NS.objects - - - CF$UID - 293 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 119 - - - NS.objects - - - CF$UID - 294 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 121 - - - CF$UID - 122 - - - CF$UID - 123 - - - NS.objects - - - CF$UID - 295 - - - CF$UID - 26 - - - CF$UID - 312 - - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 296 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 126 - - - CF$UID - 127 - - - CF$UID - 128 - - - CF$UID - 129 - - - CF$UID - 130 - - - CF$UID - 131 - - - CF$UID - 132 - - - NS.objects - - - CF$UID - 133 - - - CF$UID - 297 - - - CF$UID - 306 - - - CF$UID - 149 - - - CF$UID - 59 - - - CF$UID - 150 - - - CF$UID - 310 - - - - - $class - - CF$UID - 111 - - DocumentLocation - - CF$UID - 305 - - DomainIdentifier - - CF$UID - 298 - - IdentifierPath - - CF$UID - 299 - - IndexOfDocumentIdentifier - - CF$UID - 26 - - - Xcode.IDENavigableItemDomain.WorkspaceStructure - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 300 - - - CF$UID - 301 - - - CF$UID - 302 - - - CF$UID - 303 - - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 59 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 58 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 57 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 304 - - - TikZiT - - $class - - CF$UID - 110 - - documentURL - - CF$UID - 108 - - timestamp - - CF$UID - 0 - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 142 - - - CF$UID - 143 - - - CF$UID - 144 - - - CF$UID - 145 - - - NS.objects - - - CF$UID - 307 - - - CF$UID - 308 - - - CF$UID - 25 - - - CF$UID - 309 - - - - 381083686.29558802 - {18344, 1251} - {19467, 0} - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 311 - - - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/Graph.m - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 313 - - - - {{0, 0}, {815, 588}} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 157 - - - CF$UID - 158 - - - CF$UID - 161 - - - CF$UID - 160 - - - CF$UID - 162 - - - CF$UID - 159 - - - NS.objects - - - CF$UID - 163 - - - CF$UID - 315 - - - CF$UID - 316 - - - CF$UID - 163 - - - CF$UID - 322 - - - CF$UID - 328 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 165 - - - NS.objects - - - CF$UID - 26 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 317 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 318 - - - CF$UID - 320 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 171 - - - CF$UID - 319 - - - - 389 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 174 - - - CF$UID - 321 - - - - 425 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 323 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 324 - - - CF$UID - 326 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 171 - - - CF$UID - 325 - - - - 389 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 174 - - - CF$UID - 327 - - - - 425 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 167 - - - NS.objects - - - CF$UID - 26 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 330 - - - CF$UID - 331 - - - NS.objects - - - CF$UID - 246 - - - CF$UID - 332 - - - - VersionsEditorSubmode - EditorLayout_PersistentRepresentation - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 333 - - - NS.objects - - - CF$UID - 334 - - - - Main - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 335 - - - CF$UID - 336 - - - CF$UID - 337 - - - NS.objects - - - CF$UID - 338 - - - CF$UID - 246 - - - CF$UID - 366 - - - - EditorLayout_StateSavingStateDictionaries - EditorLayout_Selected - EditorLayout_Geometry - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 339 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 340 - - - CF$UID - 341 - - - CF$UID - 342 - - - CF$UID - 343 - - - CF$UID - 344 - - - CF$UID - 345 - - - CF$UID - 346 - - - NS.objects - - - CF$UID - 347 - - - CF$UID - 348 - - - CF$UID - 356 - - - CF$UID - 351 - - - CF$UID - 351 - - - CF$UID - 363 - - - CF$UID - 364 - - - - FileDataType - ArchivableRepresentation - EditorState - NavigableItemName - DocumentNavigableItemName - DocumentExtensionIdentifier - DocumentURL - com.apple.xml-property-list - - $class - - CF$UID - 111 - - DocumentLocation - - CF$UID - 354 - - DomainIdentifier - - CF$UID - 298 - - IdentifierPath - - CF$UID - 349 - - IndexOfDocumentIdentifier - - CF$UID - 26 - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 350 - - - CF$UID - 352 - - - CF$UID - 353 - - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 351 - - - TikZiT-Info.plist - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 64 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 254 - - - - $class - - CF$UID - 110 - - documentURL - - CF$UID - 355 - - timestamp - - CF$UID - 0 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/TikZiT-Info.plist - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 357 - - - CF$UID - 358 - - - CF$UID - 359 - - - NS.objects - - - CF$UID - 360 - - - CF$UID - 361 - - - CF$UID - 362 - - - - PrimaryDocumentSelectedCharacterRange - PrimaryDocumentVisibleCharacterRange - PrimaryDocumentTimestamp - {0, 0} - {0, 1053} - 348502952.18491101 - Xcode.IDEKit.EditorDocument.SourceCode-from-Plist - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 365 - - - file://localhost/Users/aleks/svn/tikzit/tikzit/TikZiT-Info.plist - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 367 - - - - {{0, 0}, {815, 602}} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 369 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 370 - - - CF$UID - 372 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 186 - - - CF$UID - 371 - - - - 610 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 189 - - - CF$UID - 373 - - - - 100 - - $class - - CF$UID - 39 - - NS.keys - - NS.objects - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 376 - - - CF$UID - 331 - - - NS.objects - - - CF$UID - 377 - - - CF$UID - 378 - - - - SplitPosition - 0.4993864893913269 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 379 - - - CF$UID - 333 - - - NS.objects - - - CF$UID - 380 - - - CF$UID - 409 - - - - Alternate - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 335 - - - CF$UID - 336 - - - CF$UID - 337 - - - NS.objects - - - CF$UID - 381 - - - CF$UID - 246 - - - CF$UID - 407 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 382 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 340 - - - CF$UID - 341 - - - CF$UID - 342 - - - CF$UID - 343 - - - CF$UID - 344 - - - CF$UID - 345 - - - CF$UID - 346 - - - NS.objects - - - CF$UID - 383 - - - CF$UID - 384 - - - CF$UID - 399 - - - CF$UID - 387 - - - CF$UID - 387 - - - CF$UID - 404 - - - CF$UID - 405 - - - - public.c-header - - $class - - CF$UID - 111 - - DocumentLocation - - CF$UID - 397 - - DomainIdentifier - - CF$UID - 0 - - IdentifierPath - - CF$UID - 385 - - IndexOfDocumentIdentifier - - CF$UID - 26 - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 386 - - - CF$UID - 388 - - - CF$UID - 390 - - - CF$UID - 391 - - - CF$UID - 394 - - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 387 - - - Graph.h - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 389 - - - Graph - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 254 - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 392 - - - CF$UID - 393 - - - NS.objects - - - CF$UID - 298 - - - CF$UID - 254 - - - - manualDomainIdentifier - navigableItem_name - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 395 - - - NS.objects - - - CF$UID - 396 - - - - identifier - Xcode.IDEKit.GeniusCategory.Manual - - $class - - CF$UID - 110 - - documentURL - - CF$UID - 398 - - timestamp - - CF$UID - 0 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/Graph.h - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 401 - - - CF$UID - 402 - - - CF$UID - 25 - - - CF$UID - 403 - - - - HideAllIssues - 348502936.56562501 - {1735, 943} - {998, 0} - Xcode.IDEKit.EditorDocument.SourceCode - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 406 - - - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/Graph.h - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 408 - - - - {{0, 0}, {407, 602}} - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 335 - - - CF$UID - 336 - - - CF$UID - 337 - - - NS.objects - - - CF$UID - 410 - - - CF$UID - 246 - - - CF$UID - 429 - - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 411 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 340 - - - CF$UID - 341 - - - CF$UID - 342 - - - CF$UID - 343 - - - CF$UID - 344 - - - CF$UID - 345 - - - CF$UID - 346 - - - NS.objects - - - CF$UID - 347 - - - CF$UID - 412 - - - CF$UID - 419 - - - CF$UID - 351 - - - CF$UID - 351 - - - CF$UID - 427 - - - CF$UID - 428 - - - - - $class - - CF$UID - 111 - - DocumentLocation - - CF$UID - 417 - - DomainIdentifier - - CF$UID - 298 - - IdentifierPath - - CF$UID - 413 - - IndexOfDocumentIdentifier - - CF$UID - 26 - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 414 - - - CF$UID - 415 - - - CF$UID - 416 - - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 351 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 64 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 254 - - - - $class - - CF$UID - 110 - - documentURL - - CF$UID - 418 - - timestamp - - CF$UID - 0 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/TikZiT-Info.plist - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 420 - - - CF$UID - 421 - - - CF$UID - 422 - - - NS.objects - - - CF$UID - 423 - - - CF$UID - 425 - - - CF$UID - 426 - - - - IDE_PLIST_EDITOR_SELECTION_KEY - IDE_PLIST_EDITOR_EXPANSION_KEY - IDE_PLIST_EDITOR_VISIBLERECT_KEY - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 424 - - - - CFBundleVersion - - $class - - CF$UID - 236 - - NS.objects - - - {{0, 0}, {407, 563}} - Xcode.IDEKit.EditorDocument.PlistEditor - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 365 - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 367 - - - - - $class - - CF$UID - 115 - - geniusEditorContextNode - - CF$UID - 0 - - primaryEditorContextNode - - CF$UID - 431 - - rootLayoutTreeNode - - CF$UID - 439 - - - - $class - - CF$UID - 114 - - children - - CF$UID - 0 - - contentType - 1 - documentArchivableRepresentation - - CF$UID - 432 - - orientation - 0 - parent - - CF$UID - 439 - - - - $class - - CF$UID - 111 - - DocumentLocation - - CF$UID - 305 - - DomainIdentifier - - CF$UID - 298 - - IdentifierPath - - CF$UID - 433 - - IndexOfDocumentIdentifier - - CF$UID - 26 - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 434 - - - CF$UID - 435 - - - CF$UID - 436 - - - CF$UID - 437 - - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 59 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 58 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 57 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 438 - - - TikZiT - - $class - - CF$UID - 114 - - children - - CF$UID - 440 - - contentType - 0 - documentArchivableRepresentation - - CF$UID - 0 - - orientation - 0 - parent - - CF$UID - 0 - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 431 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 8 - - - CF$UID - 9 - - - CF$UID - 442 - - - CF$UID - 10 - - - CF$UID - 11 - - - CF$UID - 12 - - - CF$UID - 13 - - - CF$UID - 14 - - - NS.objects - - - CF$UID - 443 - - - CF$UID - 444 - - - CF$UID - 445 - - - CF$UID - 25 - - - CF$UID - 4 - - - CF$UID - 442 - - - CF$UID - 25 - - - CF$UID - 25 - - - - IDEWorkspaceTabController_5BA15B20-6E8C-4183-8118-E8E43B2873EF - {{264, 446}, {600, 624}} - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 442 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 16 - - - CF$UID - 17 - - - CF$UID - 18 - - - CF$UID - 19 - - - CF$UID - 20 - - - CF$UID - 21 - - - CF$UID - 22 - - - CF$UID - 23 - - - NS.objects - - - CF$UID - 446 - - - CF$UID - 25 - - - CF$UID - 26 - - - CF$UID - 447 - - - CF$UID - 453 - - - CF$UID - 469 - - - CF$UID - 25 - - - CF$UID - 477 - - - - tikzparser.ym - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 448 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 449 - - - CF$UID - 451 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 33 - - - CF$UID - 450 - - - - 127 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 33 - - - CF$UID - 452 - - - - 473 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 41 - - - CF$UID - 42 - - - NS.objects - - - CF$UID - 42 - - - CF$UID - 454 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 44 - - - CF$UID - 45 - - - CF$UID - 46 - - - CF$UID - 47 - - - CF$UID - 48 - - - CF$UID - 49 - - - CF$UID - 50 - - - NS.objects - - - CF$UID - 455 - - - CF$UID - 25 - - - CF$UID - 52 - - - CF$UID - 25 - - - CF$UID - 25 - - - CF$UID - 456 - - - CF$UID - 460 - - - - {{0, 0}, {0, 0}} - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 457 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 458 - - - CF$UID - 57 - - - CF$UID - 67 - - - CF$UID - 459 - - - - TikZiT - tikzparser.ym - - $class - - CF$UID - 53 - - NS.objects - - - CF$UID - 461 - - - CF$UID - 462 - - - CF$UID - 463 - - - CF$UID - 464 - - - CF$UID - 465 - - - CF$UID - 466 - - - CF$UID - 467 - - - CF$UID - 468 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 458 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 458 - - - CF$UID - 64 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 458 - - - CF$UID - 57 - - - CF$UID - 67 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 458 - - - CF$UID - 77 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 458 - - - CF$UID - 69 - - - CF$UID - 70 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 458 - - - CF$UID - 69 - - - CF$UID - 70 - - - CF$UID - 71 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 458 - - - CF$UID - 69 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 458 - - - CF$UID - 64 - - - CF$UID - 74 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 470 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 471 - - - CF$UID - 473 - - - CF$UID - 475 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 20 - - - CF$UID - 472 - - - - 225 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 23 - - - CF$UID - 474 - - - - 815 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 85 - - - CF$UID - 476 - - - - 260 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 88 - - - CF$UID - 89 - - - CF$UID - 90 - - - CF$UID - 91 - - - CF$UID - 92 - - - CF$UID - 93 - - - CF$UID - 94 - - - CF$UID - 95 - - - NS.objects - - - CF$UID - 478 - - - CF$UID - 491 - - - CF$UID - 511 - - - CF$UID - 182 - - - CF$UID - 26 - - - CF$UID - 526 - - - CF$UID - 532 - - - CF$UID - 25 - - - - - $class - - CF$UID - 115 - - geniusEditorContextNode - - CF$UID - 0 - - primaryEditorContextNode - - CF$UID - 479 - - rootLayoutTreeNode - - CF$UID - 489 - - - - $class - - CF$UID - 114 - - children - - CF$UID - 0 - - contentType - 1 - documentArchivableRepresentation - - CF$UID - 480 - - orientation - 0 - parent - - CF$UID - 489 - - - - $class - - CF$UID - 111 - - DocumentLocation - - CF$UID - 487 - - DomainIdentifier - - CF$UID - 99 - - IdentifierPath - - CF$UID - 481 - - IndexOfDocumentIdentifier - - CF$UID - 26 - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 482 - - - CF$UID - 483 - - - CF$UID - 484 - - - CF$UID - 485 - - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 459 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 67 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 57 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 486 - - - TikZiT - - $class - - CF$UID - 110 - - documentURL - - CF$UID - 488 - - timestamp - - CF$UID - 0 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/tikzparser.ym - - - $class - - CF$UID - 114 - - children - - CF$UID - 490 - - contentType - 0 - documentArchivableRepresentation - - CF$UID - 0 - - orientation - 0 - parent - - CF$UID - 0 - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 479 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 117 - - - NS.objects - - - CF$UID - 492 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 119 - - - NS.objects - - - CF$UID - 493 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 121 - - - CF$UID - 122 - - - CF$UID - 123 - - - NS.objects - - - CF$UID - 494 - - - CF$UID - 26 - - - CF$UID - 509 - - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 495 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 126 - - - CF$UID - 127 - - - CF$UID - 128 - - - CF$UID - 129 - - - CF$UID - 130 - - - CF$UID - 131 - - - CF$UID - 132 - - - NS.objects - - - CF$UID - 496 - - - CF$UID - 497 - - - CF$UID - 504 - - - CF$UID - 459 - - - CF$UID - 459 - - - CF$UID - 150 - - - CF$UID - 507 - - - - public.yacc-source - - $class - - CF$UID - 111 - - DocumentLocation - - CF$UID - 487 - - DomainIdentifier - - CF$UID - 99 - - IdentifierPath - - CF$UID - 498 - - IndexOfDocumentIdentifier - - CF$UID - 26 - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 499 - - - CF$UID - 500 - - - CF$UID - 501 - - - CF$UID - 502 - - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 459 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 67 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 57 - - - - $class - - CF$UID - 102 - - Identifier - - CF$UID - 503 - - - TikZiT - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 142 - - - CF$UID - 143 - - - CF$UID - 144 - - - CF$UID - 145 - - - NS.objects - - - CF$UID - 505 - - - CF$UID - 506 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 381079264.11013299 - {1063, 652} - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 508 - - - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/tikzparser.ym - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 510 - - - - {{0, 0}, {600, 600}} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 157 - - - CF$UID - 158 - - - CF$UID - 159 - - - CF$UID - 160 - - - CF$UID - 161 - - - CF$UID - 162 - - - NS.objects - - - CF$UID - 163 - - - CF$UID - 512 - - - CF$UID - 513 - - - CF$UID - 163 - - - CF$UID - 514 - - - CF$UID - 520 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 165 - - - NS.objects - - - CF$UID - 26 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 167 - - - NS.objects - - - CF$UID - 163 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 515 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 516 - - - CF$UID - 518 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 171 - - - CF$UID - 517 - - - - 301 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 174 - - - CF$UID - 519 - - - - 298 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 521 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 522 - - - CF$UID - 524 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 171 - - - CF$UID - 523 - - - - 301 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 174 - - - CF$UID - 525 - - - - 298 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 28 - - - NS.objects - - - CF$UID - 527 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 528 - - - CF$UID - 530 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 186 - - - CF$UID - 529 - - - - 203 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 31 - - - CF$UID - 32 - - - NS.objects - - - CF$UID - 189 - - - CF$UID - 531 - - - - 115 - - $class - - CF$UID - 39 - - NS.keys - - NS.objects - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 534 - - - CF$UID - 535 - - - CF$UID - 536 - - - CF$UID - 537 - - - CF$UID - 538 - - - CF$UID - 539 - - - CF$UID - 540 - - - CF$UID - 541 - - - CF$UID - 542 - - - CF$UID - 543 - - - CF$UID - 544 - - - NS.objects - - - CF$UID - 182 - - - CF$UID - 545 - - - CF$UID - 26 - - - CF$UID - 1624 - - - CF$UID - 1629 - - - CF$UID - 1632 - - - CF$UID - 1662 - - - CF$UID - 1663 - - - CF$UID - 1758 - - - CF$UID - 25 - - - CF$UID - 25 - - - - BreakpointsActivated - DefaultEditorStatesForURLs - DebuggingWindowBehavior - ActiveRunDestination - ActiveScheme - LastCompletedPersistentSchemeBasedActivityReport - DocumentWindows - DefaultEditorFrameSizeForURLs - RecentEditorDocumentURLs - AppFocusInMiniDebugging - MiniDebuggingConsole - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 546 - - - CF$UID - 427 - - - CF$UID - 547 - - - CF$UID - 404 - - - CF$UID - 548 - - - CF$UID - 549 - - - CF$UID - 363 - - - CF$UID - 550 - - - CF$UID - 551 - - - NS.objects - - - CF$UID - 552 - - - CF$UID - 576 - - - CF$UID - 596 - - - CF$UID - 713 - - - CF$UID - 1449 - - - CF$UID - 1466 - - - CF$UID - 1472 - - - CF$UID - 1475 - - - CF$UID - 1585 - - - - IDEQuickLookEditor.Editor - Xcode.IDEKit.CocoaIntegration.EditorDocument.Cocoa - Xcode.IDEKit.EditorDocument.SourceCodeComparisonEditor - Xcode.IDEKit.EditorDocument.SourceCode-from-NIB - Xcode.Xcode3ProjectSupport.EditorDocument.Xcode3Project - Xcode.IDEKit.EditorDocument.LogDocument - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 553 - - - CF$UID - 555 - - - CF$UID - 557 - - - NS.objects - - - CF$UID - 559 - - - CF$UID - 566 - - - CF$UID - 571 - - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 554 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/AH_latex_tail - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 556 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/AH_latex_head.png - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 558 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/ED_none.png - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 560 - - - NS.objects - - - CF$UID - 561 - - - - SelectedDocumentLocations - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 562 - - - - - $class - - CF$UID - 565 - - IDEQuickLookPageNumber - - CF$UID - 26 - - documentURL - - CF$UID - 563 - - timestamp - - CF$UID - 564 - - - file://localhost/Users/aleks/svn/tikzit/AH_latex_tail - 340372422.96159899 - - $classes - - IDEQuickLookDocumentLocation - DVTDocumentLocation - NSObject - - $classname - IDEQuickLookDocumentLocation - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 560 - - - NS.objects - - - CF$UID - 567 - - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 568 - - - - - $class - - CF$UID - 565 - - IDEQuickLookPageNumber - - CF$UID - 26 - - documentURL - - CF$UID - 569 - - timestamp - - CF$UID - 570 - - - file://localhost/Users/aleks/svn/tikzit/AH_latex_head.png - 340372923.18815899 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 560 - - - NS.objects - - - CF$UID - 572 - - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 573 - - - - - $class - - CF$UID - 565 - - IDEQuickLookPageNumber - - CF$UID - 26 - - documentURL - - CF$UID - 574 - - timestamp - - CF$UID - 575 - - - file://localhost/Users/aleks/svn/tikzit/ED_none.png - 340371928.114389 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 577 - - - CF$UID - 579 - - - CF$UID - 581 - - - NS.objects - - - CF$UID - 583 - - - CF$UID - 587 - - - CF$UID - 592 - - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 578 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/TikZiT-Info.plist - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 580 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/TikZiT-Info.plist - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 582 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/git/tikzit/tikzit/TikZiT-Info.plist - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 420 - - - CF$UID - 421 - - - CF$UID - 422 - - - NS.objects - - - CF$UID - 584 - - - CF$UID - 585 - - - CF$UID - 586 - - - - - $class - - CF$UID - 60 - - NS.objects - - - - $class - - CF$UID - 236 - - NS.objects - - - {{0, 0}, {743, 502}} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 420 - - - CF$UID - 422 - - - CF$UID - 421 - - - NS.objects - - - CF$UID - 588 - - - CF$UID - 590 - - - CF$UID - 591 - - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 589 - - - - CFBundleIconFile - {{0, 0}, {815, 552}} - - $class - - CF$UID - 236 - - NS.objects - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 420 - - - CF$UID - 421 - - - CF$UID - 422 - - - NS.objects - - - CF$UID - 593 - - - CF$UID - 594 - - - CF$UID - 595 - - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 589 - - - - - $class - - CF$UID - 236 - - NS.objects - - - {{0, 0}, {815, 550}} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 597 - - - CF$UID - 599 - - - CF$UID - 601 - - - CF$UID - 603 - - - CF$UID - 605 - - - CF$UID - 607 - - - CF$UID - 609 - - - CF$UID - 611 - - - CF$UID - 613 - - - CF$UID - 615 - - - NS.objects - - - CF$UID - 617 - - - CF$UID - 638 - - - CF$UID - 650 - - - CF$UID - 657 - - - CF$UID - 668 - - - CF$UID - 677 - - - CF$UID - 685 - - - CF$UID - 693 - - - CF$UID - 699 - - - CF$UID - 705 - - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 598 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/English.lproj/PropertyInspector.xib - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 600 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/English.lproj/StylePalette.xib - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 602 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/English.lproj/PropertyInspector.xib - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 604 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/English.lproj/StylePalette.xib - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 606 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/English.lproj/TikzDocument.xib - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 608 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/English.lproj/Preview.xib - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 610 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/English.lproj/MainMenu.xib - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 612 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/English.lproj/Preamble.xib - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 614 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/English.lproj/MainMenu.xib - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 616 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/English.lproj/Preamble.xib - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 618 - - - CF$UID - 619 - - - CF$UID - 620 - - - CF$UID - 621 - - - NS.objects - - - CF$UID - 622 - - - CF$UID - 584 - - - CF$UID - 621 - - - CF$UID - 625 - - - - IBDockViewController - SelectedObjectIDs - SelectionProvider - IBCanvasViewController - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 623 - - - NS.objects - - - CF$UID - 624 - - - - LastKnownOutlineViewWidth - 224 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 626 - - - CF$UID - 627 - - - NS.objects - - - CF$UID - 628 - - - CF$UID - 637 - - - - ObjectIDToLastKnownCanvasPositionMap - EditedTopLevelObjectIDs - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 629 - - - CF$UID - 630 - - - CF$UID - 631 - - - CF$UID - 632 - - - NS.objects - - - CF$UID - 633 - - - CF$UID - 634 - - - CF$UID - 635 - - - CF$UID - 636 - - - - 301 - 185 - 461 - 361 - {46, 13} - {46, 189} - {318, 118} - {46, 385} - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 629 - - - CF$UID - 632 - - - CF$UID - 630 - - - CF$UID - 631 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 618 - - - CF$UID - 619 - - - CF$UID - 620 - - - CF$UID - 621 - - - NS.objects - - - CF$UID - 639 - - - CF$UID - 641 - - - CF$UID - 643 - - - CF$UID - 644 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 623 - - - NS.objects - - - CF$UID - 640 - - - - 224 - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 642 - - - - -2 - IBStructureViewController - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 626 - - - CF$UID - 627 - - - NS.objects - - - CF$UID - 645 - - - CF$UID - 646 - - - - - $class - - CF$UID - 39 - - NS.keys - - NS.objects - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 647 - - - CF$UID - 648 - - - CF$UID - 649 - - - - 3 - 649 - 181 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 618 - - - CF$UID - 619 - - - CF$UID - 620 - - - CF$UID - 621 - - - NS.objects - - - CF$UID - 651 - - - CF$UID - 653 - - - CF$UID - 621 - - - CF$UID - 654 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 623 - - - NS.objects - - - CF$UID - 652 - - - - 224 - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 631 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 626 - - - CF$UID - 627 - - - NS.objects - - - CF$UID - 655 - - - CF$UID - 656 - - - - - $class - - CF$UID - 39 - - NS.keys - - NS.objects - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 631 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 618 - - - CF$UID - 619 - - - CF$UID - 620 - - - CF$UID - 621 - - - NS.objects - - - CF$UID - 658 - - - CF$UID - 584 - - - CF$UID - 621 - - - CF$UID - 660 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 623 - - - NS.objects - - - CF$UID - 659 - - - - 224 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 626 - - - CF$UID - 627 - - - NS.objects - - - CF$UID - 661 - - - CF$UID - 667 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 647 - - - CF$UID - 649 - - - CF$UID - 662 - - - CF$UID - 648 - - - NS.objects - - - CF$UID - 663 - - - CF$UID - 664 - - - CF$UID - 665 - - - CF$UID - 666 - - - - 524 - {306, -2} - {71, 17} - {118, 105} - {71, 359} - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 648 - - - CF$UID - 647 - - - CF$UID - 649 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 618 - - - CF$UID - 619 - - - CF$UID - 620 - - - CF$UID - 621 - - - NS.objects - - - CF$UID - 669 - - - CF$UID - 671 - - - CF$UID - 643 - - - CF$UID - 673 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 623 - - - NS.objects - - - CF$UID - 670 - - - - 224 - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 672 - - - - 100024 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 626 - - - CF$UID - 627 - - - NS.objects - - - CF$UID - 674 - - - CF$UID - 675 - - - - - $class - - CF$UID - 39 - - NS.keys - - NS.objects - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 676 - - - - 5 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 618 - - - CF$UID - 619 - - - CF$UID - 620 - - - CF$UID - 621 - - - NS.objects - - - CF$UID - 678 - - - CF$UID - 680 - - - CF$UID - 621 - - - CF$UID - 682 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 623 - - - NS.objects - - - CF$UID - 679 - - - - 224 - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 681 - - - - 11 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 626 - - - CF$UID - 627 - - - NS.objects - - - CF$UID - 683 - - - CF$UID - 684 - - - - - $class - - CF$UID - 39 - - NS.keys - - NS.objects - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 163 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 618 - - - CF$UID - 619 - - - CF$UID - 620 - - - CF$UID - 621 - - - NS.objects - - - CF$UID - 686 - - - CF$UID - 584 - - - CF$UID - 621 - - - CF$UID - 688 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 623 - - - NS.objects - - - CF$UID - 687 - - - - 200 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 626 - - - CF$UID - 627 - - - NS.objects - - - CF$UID - 689 - - - CF$UID - 690 - - - - - $class - - CF$UID - 39 - - NS.keys - - NS.objects - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 691 - - - CF$UID - 692 - - - - 535 - 29 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 618 - - - CF$UID - 619 - - - CF$UID - 620 - - - CF$UID - 621 - - - NS.objects - - - CF$UID - 694 - - - CF$UID - 584 - - - CF$UID - 621 - - - CF$UID - 696 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 623 - - - NS.objects - - - CF$UID - 695 - - - - 224 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 626 - - - CF$UID - 627 - - - NS.objects - - - CF$UID - 697 - - - CF$UID - 698 - - - - - $class - - CF$UID - 39 - - NS.keys - - NS.objects - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 163 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 618 - - - CF$UID - 619 - - - CF$UID - 620 - - - CF$UID - 621 - - - NS.objects - - - CF$UID - 700 - - - CF$UID - 584 - - - CF$UID - 621 - - - CF$UID - 702 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 623 - - - NS.objects - - - CF$UID - 701 - - - - 224 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 626 - - - CF$UID - 627 - - - NS.objects - - - CF$UID - 703 - - - CF$UID - 704 - - - - - $class - - CF$UID - 39 - - NS.keys - - NS.objects - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 692 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 618 - - - CF$UID - 619 - - - CF$UID - 620 - - - CF$UID - 621 - - - NS.objects - - - CF$UID - 706 - - - CF$UID - 708 - - - CF$UID - 621 - - - CF$UID - 710 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 623 - - - NS.objects - - - CF$UID - 707 - - - - 200 - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 709 - - - - 27 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 626 - - - CF$UID - 627 - - - NS.objects - - - CF$UID - 711 - - - CF$UID - 712 - - - - - $class - - CF$UID - 39 - - NS.keys - - NS.objects - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 163 - - - CF$UID - 647 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 714 - - - CF$UID - 716 - - - CF$UID - 718 - - - CF$UID - 720 - - - CF$UID - 722 - - - CF$UID - 724 - - - CF$UID - 726 - - - CF$UID - 728 - - - CF$UID - 730 - - - CF$UID - 732 - - - CF$UID - 734 - - - CF$UID - 736 - - - CF$UID - 738 - - - CF$UID - 740 - - - CF$UID - 742 - - - CF$UID - 744 - - - CF$UID - 746 - - - CF$UID - 748 - - - CF$UID - 750 - - - CF$UID - 752 - - - CF$UID - 754 - - - CF$UID - 756 - - - CF$UID - 758 - - - CF$UID - 760 - - - CF$UID - 762 - - - CF$UID - 764 - - - CF$UID - 766 - - - CF$UID - 768 - - - CF$UID - 770 - - - CF$UID - 772 - - - CF$UID - 774 - - - CF$UID - 776 - - - CF$UID - 778 - - - CF$UID - 780 - - - CF$UID - 782 - - - CF$UID - 784 - - - CF$UID - 785 - - - CF$UID - 787 - - - CF$UID - 789 - - - CF$UID - 791 - - - CF$UID - 793 - - - CF$UID - 795 - - - CF$UID - 797 - - - CF$UID - 799 - - - CF$UID - 801 - - - CF$UID - 803 - - - CF$UID - 805 - - - CF$UID - 807 - - - CF$UID - 809 - - - CF$UID - 811 - - - CF$UID - 813 - - - CF$UID - 815 - - - CF$UID - 817 - - - CF$UID - 819 - - - CF$UID - 821 - - - CF$UID - 823 - - - CF$UID - 825 - - - CF$UID - 827 - - - CF$UID - 829 - - - CF$UID - 831 - - - CF$UID - 833 - - - CF$UID - 835 - - - CF$UID - 837 - - - CF$UID - 839 - - - CF$UID - 841 - - - CF$UID - 843 - - - CF$UID - 845 - - - CF$UID - 847 - - - CF$UID - 849 - - - CF$UID - 851 - - - CF$UID - 853 - - - CF$UID - 855 - - - CF$UID - 857 - - - CF$UID - 859 - - - CF$UID - 861 - - - CF$UID - 863 - - - CF$UID - 865 - - - CF$UID - 867 - - - CF$UID - 869 - - - CF$UID - 871 - - - CF$UID - 873 - - - CF$UID - 875 - - - CF$UID - 877 - - - CF$UID - 879 - - - CF$UID - 881 - - - CF$UID - 883 - - - CF$UID - 885 - - - CF$UID - 887 - - - CF$UID - 889 - - - CF$UID - 891 - - - CF$UID - 893 - - - CF$UID - 895 - - - CF$UID - 897 - - - CF$UID - 899 - - - CF$UID - 901 - - - CF$UID - 903 - - - CF$UID - 905 - - - CF$UID - 907 - - - CF$UID - 908 - - - CF$UID - 910 - - - CF$UID - 912 - - - CF$UID - 914 - - - CF$UID - 916 - - - CF$UID - 918 - - - CF$UID - 920 - - - CF$UID - 922 - - - CF$UID - 924 - - - CF$UID - 926 - - - CF$UID - 928 - - - CF$UID - 930 - - - CF$UID - 932 - - - CF$UID - 934 - - - CF$UID - 936 - - - CF$UID - 938 - - - CF$UID - 940 - - - CF$UID - 942 - - - CF$UID - 944 - - - CF$UID - 946 - - - CF$UID - 948 - - - CF$UID - 950 - - - CF$UID - 952 - - - CF$UID - 954 - - - CF$UID - 956 - - - CF$UID - 958 - - - CF$UID - 960 - - - CF$UID - 962 - - - CF$UID - 964 - - - CF$UID - 966 - - - NS.objects - - - CF$UID - 968 - - - CF$UID - 972 - - - CF$UID - 976 - - - CF$UID - 980 - - - CF$UID - 984 - - - CF$UID - 988 - - - CF$UID - 992 - - - CF$UID - 996 - - - CF$UID - 1000 - - - CF$UID - 1003 - - - CF$UID - 1007 - - - CF$UID - 1011 - - - CF$UID - 1015 - - - CF$UID - 1019 - - - CF$UID - 1022 - - - CF$UID - 1025 - - - CF$UID - 1029 - - - CF$UID - 1033 - - - CF$UID - 1037 - - - CF$UID - 1041 - - - CF$UID - 1045 - - - CF$UID - 1049 - - - CF$UID - 1053 - - - CF$UID - 1057 - - - CF$UID - 1061 - - - CF$UID - 1065 - - - CF$UID - 1069 - - - CF$UID - 1073 - - - CF$UID - 1077 - - - CF$UID - 1081 - - - CF$UID - 1085 - - - CF$UID - 1089 - - - CF$UID - 1093 - - - CF$UID - 1097 - - - CF$UID - 1101 - - - CF$UID - 1105 - - - CF$UID - 1109 - - - CF$UID - 1113 - - - CF$UID - 1117 - - - CF$UID - 1120 - - - CF$UID - 1124 - - - CF$UID - 1128 - - - CF$UID - 1132 - - - CF$UID - 1136 - - - CF$UID - 1140 - - - CF$UID - 1143 - - - CF$UID - 1147 - - - CF$UID - 1151 - - - CF$UID - 1155 - - - CF$UID - 1158 - - - CF$UID - 1162 - - - CF$UID - 1165 - - - CF$UID - 1168 - - - CF$UID - 1171 - - - CF$UID - 1175 - - - CF$UID - 1178 - - - CF$UID - 1181 - - - CF$UID - 1185 - - - CF$UID - 1189 - - - CF$UID - 1193 - - - CF$UID - 1197 - - - CF$UID - 1200 - - - CF$UID - 1204 - - - CF$UID - 1208 - - - CF$UID - 1212 - - - CF$UID - 1215 - - - CF$UID - 1218 - - - CF$UID - 1221 - - - CF$UID - 1225 - - - CF$UID - 1229 - - - CF$UID - 1233 - - - CF$UID - 1236 - - - CF$UID - 1239 - - - CF$UID - 1243 - - - CF$UID - 1247 - - - CF$UID - 1251 - - - CF$UID - 1254 - - - CF$UID - 1257 - - - CF$UID - 1261 - - - CF$UID - 1264 - - - CF$UID - 1268 - - - CF$UID - 1272 - - - CF$UID - 1276 - - - CF$UID - 1280 - - - CF$UID - 1284 - - - CF$UID - 1288 - - - CF$UID - 1292 - - - CF$UID - 1296 - - - CF$UID - 1300 - - - CF$UID - 1304 - - - CF$UID - 1308 - - - CF$UID - 1312 - - - CF$UID - 1316 - - - CF$UID - 1320 - - - CF$UID - 1324 - - - CF$UID - 1327 - - - CF$UID - 1330 - - - CF$UID - 1334 - - - CF$UID - 1338 - - - CF$UID - 1342 - - - CF$UID - 1346 - - - CF$UID - 1350 - - - CF$UID - 1354 - - - CF$UID - 1358 - - - CF$UID - 1362 - - - CF$UID - 1366 - - - CF$UID - 1370 - - - CF$UID - 1373 - - - CF$UID - 1376 - - - CF$UID - 1380 - - - CF$UID - 1384 - - - CF$UID - 1388 - - - CF$UID - 1392 - - - CF$UID - 1396 - - - CF$UID - 1400 - - - CF$UID - 1404 - - - CF$UID - 1408 - - - CF$UID - 1412 - - - CF$UID - 1415 - - - CF$UID - 1418 - - - CF$UID - 1421 - - - CF$UID - 1425 - - - CF$UID - 1429 - - - CF$UID - 1432 - - - CF$UID - 1436 - - - CF$UID - 1439 - - - CF$UID - 1443 - - - CF$UID - 1446 - - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 715 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/GraphicsView.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 717 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/GraphicsView.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 719 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/Grid.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 721 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/git/tikzit/tikzit/src/osx/Grid.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 723 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/SelectBoxLayer.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 725 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/TikzSourceController.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 727 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/EdgeControlLayer.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 729 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/Edge.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 731 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/Edge.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 733 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/EdgeStyle+Coder.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 735 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/TikzShape.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 737 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/BasicMapTable.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 739 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/GraphChange.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 741 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/-%5BNSWindowController%20window%5D_disassembly_0x00007fff93905981.s - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 743 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/_objc_empty_vtable_disassembly_0x00007fff760e2f60.s - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 745 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/SupportDir.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 747 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/AppDelegate.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 749 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/PickSupport.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 751 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/NodeLayer.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 753 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/PropertyInspectorController.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 755 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/TikzDocument.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 757 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/EdgeStyle.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 759 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/EdgeStyle.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 761 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/NodeStyle.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 763 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/NSString+UnicharUtilities.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 765 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/Grid.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 767 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/DiffMatchPatch.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 769 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/CALayer+DrawLabel.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 771 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/NSString+UnicharUtilities.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 773 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/GraphDiff.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 775 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/contrib/DiffMatchPatch/NSString+DiffMatchPatchUtils.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 777 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/Graph.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 779 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/EdgeStyle.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 781 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/EdgeStyle.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 783 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/Graph.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 108 - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 786 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/SelectableNodeView.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 788 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/StylePaletteController.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 790 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/PreviewController.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 792 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/Transformer.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 794 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Developer/SDKs/MacOSX10.7.sdk/System/Library/Frameworks/Foundation.framework/Versions/C/Headers/NSArray.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 796 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/DiffMatchPatchCFUtilities.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 798 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/GraphChange.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 800 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/GraphChange.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 802 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/-%5BNSObject%20performSelector:%5D_disassembly_0x00007fff8ce162e1.s - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 804 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/DiffMatchPatchCFUtilities.c - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 806 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/PreambleController.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 808 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/PreambleController.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 810 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/CGContextAddPath_disassembly_0x00007fff910e972e.s - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 812 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/contrib/DiffMatchPatch/NSString+DiffMatchPatchUtils.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 814 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/-%5BNSCustomView%20nibInstantiateWithObjectInstantiator:%5D_disassembly_0x00007fff96b86f29.s - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 816 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/COPYING.DiffMatchPatch - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 818 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/__cxa_throw_disassembly_0x00007fff933e00e9.s - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 820 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/AppDelegate.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 822 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/AppDelegate.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 824 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/SelectBoxLayer.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 826 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/PropertyHolder.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 828 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/DiffMatchPatch.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 830 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/NSString+JavaSubstring.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 832 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/Transformer.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 834 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/Node.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 836 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/EdgeStyle+Coder.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 838 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/NSMutableDictionary+DMPExtensions.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 840 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/GraphElementProperty.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 842 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/Graph+Coder.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 844 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/test/test.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 846 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/SelectableNodeView.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 848 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Developer/SDKs/MacOSX10.7.sdk/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/CoreGraphics.framework/Versions/A/Headers/CGColor.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 850 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/NilToEmptyStringTransformer.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 852 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/NodeSelectionLayer.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 854 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/auto_fatal_disassembly_0x00007fff894d9f6f.s - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 856 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/GraphElementData.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 858 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/TikzWindowController.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 860 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/scratch/objc/TestDiff/contrib/DiffMatchPatch/NSString+UriCompatibility.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 862 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/NodeStyle.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 864 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/CABackingStoreUpdate__disassembly_0x00007fff8d778b05.s - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 866 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/test/common.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 868 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/test/main.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 870 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/main.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 872 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/scratch/SFBInspectors/SFBInspectorView.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 874 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/ToolPaletteController.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 876 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/GraphicsView.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 878 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/GraphicsView.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 880 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/git/tikzit/tikzit/src/osx/GraphicsView.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 882 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/TikZiT-Info.plist - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 884 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/TikzGraphAssembler.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 886 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/SelectableCollectionViewItem.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 888 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/SelectableCollectionViewItem.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 890 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/TikzSourceController.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 892 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/Node.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 894 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/tikzlexer.lm - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 896 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/PickSupport.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 898 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/PickSupport.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 900 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/NilToEmptyStringTransformer.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 902 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/CFRelease_disassembly_0x00007fff8cc2b07b.s - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 904 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/GraphElementData.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 906 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/NodeStyle+Coder.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 488 - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 909 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/EdgeControlLayer.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 911 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/NodeStyle+Coder.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 913 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/Edge.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 915 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/Edge.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 917 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/Edge.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 919 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/TikzDocument.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 921 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/PropertyHolder.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 923 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/TikzGraphAssembler.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 925 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/StylePaletteController.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 927 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/StylePaletteController.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 929 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/TikzGraphAssembler.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 931 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/PropertyInspectorController.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 933 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/PropertyInspectorController.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 935 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/PreviewController.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 937 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/PreviewController.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 939 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/Graph.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 941 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/Graph.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 943 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/Graph+Coder.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 945 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/util.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 947 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/-%5BNSCollectionView%20newItemForRepresentedObject:%5D_disassembly_0x00007fff8fa0a94e.s - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 949 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/Shape.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 951 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/common/Shape.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 953 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Developer/SDKs/MacOSX10.7.sdk/System/Library/Frameworks/CoreFoundation.framework/Versions/A/Headers/CFString.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 955 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/TikzWindowController.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 957 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/GraphDiff.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 959 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/NodeSelectionLayer.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 961 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/GraphElementProperty.h - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 963 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/osx/NodeLayer.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 965 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/NodeLayer.m - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 967 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/src/common/ColorRGB.m - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 969 - - - CF$UID - 970 - - - CF$UID - 25 - - - CF$UID - 971 - - - - 345762860.65236199 - {2200, 1151} - {2909, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 973 - - - CF$UID - 974 - - - CF$UID - 25 - - - CF$UID - 975 - - - - 348421987.42822403 - {2200, 1157} - {3223, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 977 - - - CF$UID - 978 - - - CF$UID - 25 - - - CF$UID - 979 - - - - 345403783.61108297 - {842, 693} - {1356, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 981 - - - CF$UID - 982 - - - CF$UID - 25 - - - CF$UID - 983 - - - - 380738928.58536297 - {2001, 1508} - {2090, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 985 - - - CF$UID - 986 - - - CF$UID - 25 - - - CF$UID - 987 - - - - 345416623.559434 - {0, 379} - {276, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 989 - - - CF$UID - 990 - - - CF$UID - 25 - - - CF$UID - 991 - - - - 345403324.869367 - {881, 944} - {1433, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 993 - - - CF$UID - 994 - - - CF$UID - 25 - - - CF$UID - 995 - - - - 345571191.17329699 - {104, 1058} - {1155, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 997 - - - CF$UID - 998 - - - CF$UID - 25 - - - CF$UID - 999 - - - - 345403538.85177398 - {943, 1136} - {9769, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1001 - - - CF$UID - 1002 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 348682214.50559098 - {1692, 820} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1004 - - - CF$UID - 1005 - - - CF$UID - 25 - - - CF$UID - 1006 - - - - 340459449.14873803 - {0, 953} - {898, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1008 - - - CF$UID - 1009 - - - CF$UID - 25 - - - CF$UID - 1010 - - - - 345404849.21465802 - {1684, 1007} - {2065, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1012 - - - CF$UID - 1013 - - - CF$UID - 25 - - - CF$UID - 1014 - - - - 345994252.86864501 - {1109, 746} - {790, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1016 - - - CF$UID - 1017 - - - CF$UID - 25 - - - CF$UID - 1018 - - - - 340625465.61212498 - {6290, 1393} - {7112, 58} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1020 - - - CF$UID - 1021 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 348348273.15865397 - {0, 2528} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1023 - - - CF$UID - 1024 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 345409605.10440803 - {0, 2496} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1026 - - - CF$UID - 1027 - - - CF$UID - 25 - - - CF$UID - 1028 - - - - 348328967.72804999 - {831, 996} - {1464, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1030 - - - CF$UID - 1031 - - - CF$UID - 25 - - - CF$UID - 1032 - - - - 345487190.58582902 - {592, 1437} - {1769, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1034 - - - CF$UID - 1035 - - - CF$UID - 25 - - - CF$UID - 1036 - - - - 348348232.74814701 - {2312, 1269} - {3305, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1038 - - - CF$UID - 1039 - - - CF$UID - 25 - - - CF$UID - 1040 - - - - 345416712.81625599 - {812, 967} - {1608, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1042 - - - CF$UID - 1043 - - - CF$UID - 25 - - - CF$UID - 1044 - - - - 345404437.01901197 - {960, 1373} - {1257, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1046 - - - CF$UID - 1047 - - - CF$UID - 25 - - - CF$UID - 1048 - - - - 340624392.15628898 - {0, 1080} - {928, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1050 - - - CF$UID - 1051 - - - CF$UID - 25 - - - CF$UID - 1052 - - - - 340473820.49560201 - {1062, 1380} - {19, 768} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1054 - - - CF$UID - 1055 - - - CF$UID - 25 - - - CF$UID - 1056 - - - - 348682101.30419898 - {0, 1156} - {811, 26} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1058 - - - CF$UID - 1059 - - - CF$UID - 25 - - - CF$UID - 1060 - - - - 345763213.21294802 - {1210, 686} - {1261, 115} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1062 - - - CF$UID - 1063 - - - CF$UID - 25 - - - CF$UID - 1064 - - - - 340632134.97458899 - {30, 1204} - {902, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1066 - - - CF$UID - 1067 - - - CF$UID - 25 - - - CF$UID - 1068 - - - - 340501555.21261299 - {97, 1322} - {976, 23} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1070 - - - CF$UID - 1071 - - - CF$UID - 25 - - - CF$UID - 1072 - - - - 340631784.15413302 - {4723, 1844} - {5843, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1074 - - - CF$UID - 1075 - - - CF$UID - 25 - - - CF$UID - 1076 - - - - 340706474.47886401 - {298, 1417} - {624, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1078 - - - CF$UID - 1079 - - - CF$UID - 25 - - - CF$UID - 1080 - - - - 340631841.98603201 - {0, 968} - {841, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1082 - - - CF$UID - 1083 - - - CF$UID - 25 - - - CF$UID - 1084 - - - - 340622423.14766902 - {0, 1050} - {947, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1086 - - - CF$UID - 1087 - - - CF$UID - 25 - - - CF$UID - 1088 - - - - 340631322.39264601 - {52, 1607} - {270, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1090 - - - CF$UID - 1091 - - - CF$UID - 25 - - - CF$UID - 1092 - - - - 340925457.76799399 - {2611, 845} - {3012, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1094 - - - CF$UID - 1095 - - - CF$UID - 25 - - - CF$UID - 1096 - - - - 340410882.75886202 - {933, 1045} - {1918, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1098 - - - CF$UID - 1099 - - - CF$UID - 25 - - - CF$UID - 1100 - - - - 348682102.890167 - {0, 1214} - {964, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1102 - - - CF$UID - 1103 - - - CF$UID - 25 - - - CF$UID - 1104 - - - - 348502930.726179 - {13299, 942} - {13697, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 142 - - - CF$UID - 143 - - - CF$UID - 144 - - - CF$UID - 145 - - - NS.objects - - - CF$UID - 1106 - - - CF$UID - 1107 - - - CF$UID - 25 - - - CF$UID - 1108 - - - - 381083509.44221699 - {18344, 1253} - {19467, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1110 - - - CF$UID - 1111 - - - CF$UID - 25 - - - CF$UID - 1112 - - - - 345488697.68925297 - {0, 1055} - {907, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1114 - - - CF$UID - 1115 - - - CF$UID - 25 - - - CF$UID - 1116 - - - - 345487787.078866 - {403, 1549} - {1655, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1118 - - - CF$UID - 1119 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 348489963.85380399 - {288, 1153} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1121 - - - CF$UID - 1122 - - - CF$UID - 25 - - - CF$UID - 1123 - - - - 340978354.92465001 - {969, 1145} - {1174, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1125 - - - CF$UID - 1126 - - - CF$UID - 25 - - - CF$UID - 1127 - - - - 340709461.72300398 - {0, 1410} - {369, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1129 - - - CF$UID - 1130 - - - CF$UID - 25 - - - CF$UID - 1131 - - - - 340632182.87597102 - {300, 1742} - {1087, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1133 - - - CF$UID - 1134 - - - CF$UID - 25 - - - CF$UID - 1135 - - - - 340625462.37954402 - {2270, 728} - {1004, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1137 - - - CF$UID - 1138 - - - CF$UID - 25 - - - CF$UID - 1139 - - - - 348419924.36261398 - {3536, 958} - {353, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1141 - - - CF$UID - 1142 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 348347980.23595798 - {0, 1071} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1144 - - - CF$UID - 1145 - - - CF$UID - 25 - - - CF$UID - 1146 - - - - 340632849.17894697 - {0, 1631} - {914, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1148 - - - CF$UID - 1149 - - - CF$UID - 25 - - - CF$UID - 1150 - - - - 345404279.50111699 - {1864, 1059} - {2502, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1152 - - - CF$UID - 1153 - - - CF$UID - 25 - - - CF$UID - 1154 - - - - 348491190.94514698 - {3485, 1369} - {4064, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1156 - - - CF$UID - 1157 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 340734505.19957298 - {0, 1949} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1159 - - - CF$UID - 1160 - - - CF$UID - 25 - - - CF$UID - 1161 - - - - 340630944.19481701 - {0, 254} - {227, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1163 - - - CF$UID - 1164 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 340715007.520365 - {3185, 2419} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1166 - - - CF$UID - 1167 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 340634798.489407 - {0, 1840} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1169 - - - CF$UID - 1170 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 340645018.90256602 - {0, 1609} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1172 - - - CF$UID - 1173 - - - CF$UID - 25 - - - CF$UID - 1174 - - - - 345487388.13644803 - {912, 1366} - {1795, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1176 - - - CF$UID - 1177 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 348348274.649975 - {784, 1230} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1179 - - - CF$UID - 1180 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 345416620.55954498 - {175, 713} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1182 - - - CF$UID - 1183 - - - CF$UID - 25 - - - CF$UID - 1184 - - - - 340588857.98394001 - {0, 1072} - {24, 767} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1186 - - - CF$UID - 1187 - - - CF$UID - 25 - - - CF$UID - 1188 - - - - 340631785.03849697 - {28409, 1632} - {29398, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1190 - - - CF$UID - 1191 - - - CF$UID - 25 - - - CF$UID - 1192 - - - - 340632146.36382198 - {0, 1162} - {1153, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1194 - - - CF$UID - 1195 - - - CF$UID - 25 - - - CF$UID - 1196 - - - - 340978419.60591 - {392, 1123} - {5521, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1198 - - - CF$UID - 1199 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 345763164.73803198 - {1306, 858} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1201 - - - CF$UID - 1202 - - - CF$UID - 25 - - - CF$UID - 1203 - - - - 340459404.56984299 - {0, 1634} - {1293, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1205 - - - CF$UID - 1206 - - - CF$UID - 25 - - - CF$UID - 1207 - - - - 340632182.02007103 - {2123, 1102} - {358, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1209 - - - CF$UID - 1210 - - - CF$UID - 25 - - - CF$UID - 1211 - - - - 345407440.14106703 - {980, 563} - {1308, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1213 - - - CF$UID - 1214 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 345570963.43227798 - {0, 307} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1216 - - - CF$UID - 1217 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 348493987.74653798 - {1400, 772} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1219 - - - CF$UID - 1220 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 345762938.27138197 - {1967, 722} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1222 - - - CF$UID - 1223 - - - CF$UID - 25 - - - CF$UID - 1224 - - - - 340715018.37839699 - {732, 1720} - {1614, 68} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1226 - - - CF$UID - 1227 - - - CF$UID - 25 - - - CF$UID - 1228 - - - - 340710896.240381 - {0, 907} - {71, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1230 - - - CF$UID - 1231 - - - CF$UID - 25 - - - CF$UID - 1232 - - - - 340978941.82531101 - {1271, 874} - {1724, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1234 - - - CF$UID - 1235 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 340743258.14034998 - {332, 2129} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1237 - - - CF$UID - 1238 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 345570916.35617101 - {1868, 787} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1240 - - - CF$UID - 1241 - - - CF$UID - 25 - - - CF$UID - 1242 - - - - 340624895.44772601 - {0, 956} - {1590, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1244 - - - CF$UID - 1245 - - - CF$UID - 25 - - - CF$UID - 1246 - - - - 340632090.00535399 - {855, 1347} - {2165, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1248 - - - CF$UID - 1249 - - - CF$UID - 25 - - - CF$UID - 1250 - - - - 345763208.75864798 - {2157, 874} - {2538, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1252 - - - CF$UID - 1253 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 340734675.59256703 - {2612, 2357} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1255 - - - CF$UID - 1256 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 348493972.20554298 - {0, 948} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1258 - - - CF$UID - 1259 - - - CF$UID - 25 - - - CF$UID - 1260 - - - - 348494575.91981101 - {202, 1322} - {1013, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1262 - - - CF$UID - 1263 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 340643026.22692502 - {0, 760} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1265 - - - CF$UID - 1266 - - - CF$UID - 25 - - - CF$UID - 1267 - - - - 345993841.814812 - {4603, 1030} - {5559, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1269 - - - CF$UID - 1270 - - - CF$UID - 25 - - - CF$UID - 1271 - - - - 345403242.32928503 - {47, 1110} - {798, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1273 - - - CF$UID - 1274 - - - CF$UID - 25 - - - CF$UID - 1275 - - - - 345994942.28171802 - {0, 1189} - {176, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1277 - - - CF$UID - 1278 - - - CF$UID - 25 - - - CF$UID - 1279 - - - - 348769524.87817502 - {27280, 1795} - {28593, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1281 - - - CF$UID - 1282 - - - CF$UID - 25 - - - CF$UID - 1283 - - - - 376240707.96911001 - {2531, 1228} - {23808, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1285 - - - CF$UID - 1286 - - - CF$UID - 25 - - - CF$UID - 1287 - - - - 348605533.47624701 - {0, 1341} - {605, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1289 - - - CF$UID - 1290 - - - CF$UID - 25 - - - CF$UID - 1291 - - - - 340567695.969051 - {0, 1207} - {830, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1293 - - - CF$UID - 1294 - - - CF$UID - 25 - - - CF$UID - 1295 - - - - 345489807.49887401 - {0, 1229} - {1146, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1297 - - - CF$UID - 1298 - - - CF$UID - 25 - - - CF$UID - 1299 - - - - 345489863.78087598 - {476, 1185} - {1510, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1301 - - - CF$UID - 1302 - - - CF$UID - 25 - - - CF$UID - 1303 - - - - 345404020.64375901 - {4401, 1141} - {5428, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1305 - - - CF$UID - 1306 - - - CF$UID - 25 - - - CF$UID - 1307 - - - - 345489170.70111698 - {709, 717} - {1130, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 142 - - - CF$UID - 143 - - - CF$UID - 144 - - - CF$UID - 145 - - - NS.objects - - - CF$UID - 1309 - - - CF$UID - 1310 - - - CF$UID - 25 - - - CF$UID - 1311 - - - - 381079266.26616299 - {1088, 2047} - {2268, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1313 - - - CF$UID - 1314 - - - CF$UID - 25 - - - CF$UID - 1315 - - - - 340715684.42909598 - {3334, 813} - {3831, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1317 - - - CF$UID - 1318 - - - CF$UID - 25 - - - CF$UID - 1319 - - - - 348348259.35793602 - {592, 833} - {3224, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1321 - - - CF$UID - 1322 - - - CF$UID - 25 - - - CF$UID - 1323 - - - - 340710918.149167 - {413, 867} - {1123, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1325 - - - CF$UID - 1326 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 340979058.26628602 - {0, 2158} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1328 - - - CF$UID - 1329 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 345763100.69483101 - {1412, 1093} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1331 - - - CF$UID - 1332 - - - CF$UID - 25 - - - CF$UID - 1333 - - - - 345401288.84783798 - {0, 1034} - {948, 79} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 142 - - - CF$UID - 143 - - - CF$UID - 144 - - - CF$UID - 145 - - - NS.objects - - - CF$UID - 1335 - - - CF$UID - 1336 - - - CF$UID - 25 - - - CF$UID - 1337 - - - - 381083143.218243 - {1711, 1286} - {2266, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1339 - - - CF$UID - 1340 - - - CF$UID - 25 - - - CF$UID - 1341 - - - - 345571135.33805102 - {3644, 993} - {4607, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1343 - - - CF$UID - 1344 - - - CF$UID - 25 - - - CF$UID - 1345 - - - - 345763340.54909998 - {1782, 1377} - {1408, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1347 - - - CF$UID - 1348 - - - CF$UID - 25 - - - CF$UID - 1349 - - - - 345403635.98861599 - {9317, 1036} - {9522, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1351 - - - CF$UID - 1352 - - - CF$UID - 25 - - - CF$UID - 1353 - - - - 348682251.432365 - {5303, 1025} - {5439, 6} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 142 - - - CF$UID - 143 - - - CF$UID - 144 - - - CF$UID - 145 - - - NS.objects - - - CF$UID - 1355 - - - CF$UID - 1356 - - - CF$UID - 25 - - - CF$UID - 1357 - - - - 381083685.054461 - {1472, 1140} - {1127, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1359 - - - CF$UID - 1360 - - - CF$UID - 25 - - - CF$UID - 1361 - - - - 345403910.70446801 - {898, 1274} - {1480, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1363 - - - CF$UID - 1364 - - - CF$UID - 25 - - - CF$UID - 1365 - - - - 340408281.394584 - {0, 1070} - {818, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1367 - - - CF$UID - 1368 - - - CF$UID - 25 - - - CF$UID - 1369 - - - - 340567709.72924697 - {111, 1169} - {2498, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1371 - - - CF$UID - 1372 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 345993841.44873297 - {6640, 969} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1374 - - - CF$UID - 1375 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 348492100.48254102 - {984, 1424} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 142 - - - CF$UID - 143 - - - CF$UID - 144 - - - CF$UID - 145 - - - NS.objects - - - CF$UID - 1377 - - - CF$UID - 1378 - - - CF$UID - 25 - - - CF$UID - 1379 - - - - 381079265.50655103 - {0, 1180} - {652, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1381 - - - CF$UID - 1382 - - - CF$UID - 25 - - - CF$UID - 1383 - - - - 345996220.58187401 - {4812, 1832} - {5468, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1385 - - - CF$UID - 1386 - - - CF$UID - 25 - - - CF$UID - 1387 - - - - 348328941.80720401 - {4812, 1747} - {5015, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1389 - - - CF$UID - 1390 - - - CF$UID - 25 - - - CF$UID - 1391 - - - - 345404215.00799 - {2896, 1165} - {3929, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1393 - - - CF$UID - 1394 - - - CF$UID - 25 - - - CF$UID - 1395 - - - - 352300514.86549997 - {1565, 1736} - {2412, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1397 - - - CF$UID - 1398 - - - CF$UID - 25 - - - CF$UID - 1399 - - - - 340724015.08366603 - {2833, 942} - {6706, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1401 - - - CF$UID - 1402 - - - CF$UID - 25 - - - CF$UID - 1403 - - - - 348425521.71969801 - {5676, 932} - {6233, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1405 - - - CF$UID - 1406 - - - CF$UID - 25 - - - CF$UID - 1407 - - - - 345570983.01814902 - {0, 528} - {521, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1409 - - - CF$UID - 1410 - - - CF$UID - 25 - - - CF$UID - 1411 - - - - 340497412.20933402 - {1831, 988} - {2427, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1413 - - - CF$UID - 1414 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 345407318.56900901 - {0, 2329} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1416 - - - CF$UID - 1417 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 345406868.72379202 - {2708, 1368} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1419 - - - CF$UID - 1420 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 348682639.65947402 - {2316, 1465} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1422 - - - CF$UID - 1423 - - - CF$UID - 25 - - - CF$UID - 1424 - - - - 340629051.56177503 - {10183, 1616} - {10616, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1426 - - - CF$UID - 1427 - - - CF$UID - 25 - - - CF$UID - 1428 - - - - 345403358.18671203 - {0, 778} - {177, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1430 - - - CF$UID - 1431 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 340628546.57123297 - {644, 1063} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1433 - - - CF$UID - 1434 - - - CF$UID - 25 - - - CF$UID - 1435 - - - - 345403253.67140001 - {106, 1057} - {1029, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1437 - - - CF$UID - 1438 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 345407415.72300202 - {798, 781} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1440 - - - CF$UID - 1441 - - - CF$UID - 25 - - - CF$UID - 1442 - - - - 345488818.74460101 - {35, 1246} - {1367, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1444 - - - CF$UID - 1445 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 348682657.38014698 - {3283, 1343} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1447 - - - CF$UID - 1448 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 340411515.847987 - {0, 1981} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 948 - - - CF$UID - 787 - - - CF$UID - 924 - - - CF$UID - 1450 - - - CF$UID - 950 - - - NS.objects - - - CF$UID - 1452 - - - CF$UID - 1456 - - - CF$UID - 1458 - - - CF$UID - 1461 - - - CF$UID - 1464 - - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1451 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/TikZiT.xcodeproj/aleks.mode1v3 - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1453 - - - CF$UID - 1454 - - - CF$UID - 25 - - - CF$UID - 1455 - - - - 340366198.37379301 - {1726, 1368} - {1954, 0} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 357 - - - CF$UID - 359 - - - CF$UID - 358 - - - NS.objects - - - CF$UID - 360 - - - CF$UID - 1457 - - - CF$UID - 360 - - - - 340393968.41070002 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 357 - - - CF$UID - 359 - - - CF$UID - 358 - - - NS.objects - - - CF$UID - 360 - - - CF$UID - 1459 - - - CF$UID - 1460 - - - - 340394097.732535 - {4237, 1279} - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 357 - - - CF$UID - 358 - - - CF$UID - 359 - - - NS.objects - - - CF$UID - 360 - - - CF$UID - 1462 - - - CF$UID - 1463 - - - - {0, 1026} - 340539479.94429201 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 359 - - - CF$UID - 358 - - - CF$UID - 400 - - - CF$UID - 357 - - - NS.objects - - - CF$UID - 1465 - - - CF$UID - 360 - - - CF$UID - 25 - - - CF$UID - 360 - - - - 348502939.40997303 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1467 - - - NS.objects - - - CF$UID - 1469 - - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1468 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/var/folders/y0/_h88tzh153vdf2wysdw2tjjr0000gp/T/StylePalette-fPGoyqLn.xib - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 357 - - - CF$UID - 358 - - - CF$UID - 359 - - - NS.objects - - - CF$UID - 360 - - - CF$UID - 1470 - - - CF$UID - 1471 - - - - {89564, 1173} - 340370036.79549003 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 881 - - - NS.objects - - - CF$UID - 1473 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 357 - - - CF$UID - 358 - - - CF$UID - 359 - - - NS.objects - - - CF$UID - 360 - - - CF$UID - 361 - - - CF$UID - 1474 - - - - 348502941.57143199 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1476 - - - CF$UID - 1478 - - - CF$UID - 1480 - - - NS.objects - - - CF$UID - 1482 - - - CF$UID - 1506 - - - CF$UID - 1551 - - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1477 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/git/tikzit/tikzit/TikZiT.xcodeproj/ - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1479 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/TikZiT.xcodeproj - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1481 - - - - $class - - CF$UID - 109 - - NS.string - file://localhost/Users/aleks/svn/tikzit/tikzit/TikZiT.xcodeproj/ - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1483 - - - CF$UID - 1484 - - - CF$UID - 1485 - - - CF$UID - 1486 - - - NS.objects - - - CF$UID - 1487 - - - CF$UID - 1496 - - - CF$UID - 1497 - - - CF$UID - 1505 - - - - Xcode3ProjectEditor.sourceList.splitview - Xcode3ProjectEditorPreviousTargetEditorClass - Xcode3ProjectEditorSelectedDocumentLocations - Xcode3ProjectEditor_Xcode3TargetEditor - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1488 - - - NS.objects - - - CF$UID - 1489 - - - - DVTSplitViewItems - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 1490 - - - CF$UID - 1494 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1491 - - - CF$UID - 1492 - - - NS.objects - - - CF$UID - 221 - - - CF$UID - 1493 - - - - DVTIdentifier - DVTViewMagnitude - 170 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1491 - - - CF$UID - 1492 - - - NS.objects - - - CF$UID - 221 - - - CF$UID - 1495 - - - - 645 - Xcode3TargetEditor - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 1498 - - - - - $class - - CF$UID - 1504 - - documentURL - - CF$UID - 1499 - - selection - - CF$UID - 1501 - - timestamp - - CF$UID - 1500 - - - file://localhost/Users/aleks/git/tikzit/tikzit/TikZiT.xcodeproj/ - 380738961.54778898 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1502 - - - CF$UID - 1503 - - - NS.objects - - - CF$UID - 1496 - - - CF$UID - 254 - - - - Editor - Target - - $classes - - Xcode3ProjectDocumentLocation - DVTDocumentLocation - NSObject - - $classname - Xcode3ProjectDocumentLocation - - - $class - - CF$UID - 39 - - NS.keys - - NS.objects - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1507 - - - CF$UID - 1483 - - - CF$UID - 1484 - - - CF$UID - 1485 - - - CF$UID - 1508 - - - NS.objects - - - CF$UID - 1509 - - - CF$UID - 1510 - - - CF$UID - 1509 - - - CF$UID - 1516 - - - CF$UID - 1550 - - - - Xcode3ProjectEditorPreviousProjectEditorClass - Xcode3ProjectEditor_Xcode3BuildSettingsEditor - Xcode3BuildSettingsEditor - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1488 - - - NS.objects - - - CF$UID - 1511 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 1512 - - - CF$UID - 1514 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1491 - - - CF$UID - 1492 - - - NS.objects - - - CF$UID - 221 - - - CF$UID - 1513 - - - - 170 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1491 - - - CF$UID - 1492 - - - NS.objects - - - CF$UID - 221 - - - CF$UID - 1515 - - - - 645 - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 1517 - - - - - $class - - CF$UID - 1504 - - documentURL - - CF$UID - 1518 - - selection - - CF$UID - 1520 - - timestamp - - CF$UID - 1519 - - - file://localhost/Users/aleks/svn/tikzit/TikZiT.xcodeproj/ - 345993840.88442099 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1521 - - - CF$UID - 1502 - - - CF$UID - 1522 - - - NS.objects - - - CF$UID - 254 - - - CF$UID - 1509 - - - CF$UID - 1523 - - - - Project - Xcode3BuildSettingsEditorLocations - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 1524 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1525 - - - CF$UID - 1526 - - - CF$UID - 1527 - - - CF$UID - 1528 - - - CF$UID - 1529 - - - CF$UID - 1530 - - - NS.objects - - - CF$UID - 1531 - - - CF$UID - 1548 - - - CF$UID - 246 - - - CF$UID - 246 - - - CF$UID - 163 - - - CF$UID - 163 - - - - Collapsed Build Property Categories - Selected Build Properties - Xcode3BuildSettingsEditorDisplayMode - Xcode3BuildPropertyValueDisplayMode - Xcode3BuildSettingsEditorMode - Xcode3BuildPropertyNameDisplayMode - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 1532 - - - CF$UID - 1533 - - - CF$UID - 1534 - - - CF$UID - 1535 - - - CF$UID - 1536 - - - CF$UID - 1537 - - - CF$UID - 1538 - - - CF$UID - 1539 - - - CF$UID - 1540 - - - CF$UID - 1541 - - - CF$UID - 1542 - - - CF$UID - 1543 - - - CF$UID - 1544 - - - CF$UID - 1545 - - - CF$UID - 1546 - - - CF$UID - 1547 - - - - - $class - - CF$UID - 109 - - NS.string - Architectures||ARCHS - - - $class - - CF$UID - 109 - - NS.string - Architectures||SDKROOT - - - $class - - CF$UID - 109 - - NS.string - Architectures||VALID_ARCHS - - - $class - - CF$UID - 109 - - NS.string - Build Locations||SYMROOT - - - $class - - CF$UID - 109 - - NS.string - Build Options||PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR - - - $class - - CF$UID - 109 - - NS.string - Deployment||INSTALL_PATH - - - $class - - CF$UID - 109 - - NS.string - Deployment||MACOSX_DEPLOYMENT_TARGET - - - $class - - CF$UID - 109 - - NS.string - Deployment||STRIP_INSTALLED_PRODUCT - - - $class - - CF$UID - 109 - - NS.string - Packaging||INFOPLIST_FILE - - - $class - - CF$UID - 109 - - NS.string - Packaging||PRODUCT_NAME - - - $class - - CF$UID - 109 - - NS.string - Search Paths||HEADER_SEARCH_PATHS - - - $class - - CF$UID - 109 - - NS.string - Search Paths||USER_HEADER_SEARCH_PATHS - - - $class - - CF$UID - 109 - - NS.string - LLVM GCC 4.2 - Code Generation||GCC_ENABLE_OBJC_GC - - - $class - - CF$UID - 109 - - NS.string - LLVM GCC 4.2 - Language||GCC_C_LANGUAGE_STANDARD - - - $class - - CF$UID - 109 - - NS.string - LLVM GCC 4.2 - Warnings||GCC_WARN_ABOUT_RETURN_TYPE - - - $class - - CF$UID - 109 - - NS.string - LLVM GCC 4.2 - Warnings||GCC_WARN_UNUSED_VARIABLE - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 1549 - - - - - $class - - CF$UID - 109 - - NS.string - LLVM GCC 4.2 - Code Generation||GCC_ENABLE_OBJC_GC - - - $class - - CF$UID - 39 - - NS.keys - - NS.objects - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1507 - - - CF$UID - 1483 - - - CF$UID - 1484 - - - CF$UID - 1485 - - - CF$UID - 1508 - - - NS.objects - - - CF$UID - 1509 - - - CF$UID - 1552 - - - CF$UID - 1509 - - - CF$UID - 1558 - - - CF$UID - 1584 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1488 - - - NS.objects - - - CF$UID - 1553 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 1554 - - - CF$UID - 1556 - - - - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1491 - - - CF$UID - 1492 - - - NS.objects - - - CF$UID - 221 - - - CF$UID - 1555 - - - - 170 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1491 - - - CF$UID - 1492 - - - NS.objects - - - CF$UID - 221 - - - CF$UID - 1557 - - - - 645 - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 1559 - - - - - $class - - CF$UID - 1504 - - documentURL - - CF$UID - 1560 - - selection - - CF$UID - 1562 - - timestamp - - CF$UID - 1561 - - - file://localhost/Users/aleks/svn/tikzit/tikzit/TikZiT.xcodeproj/ - 348348307.809012 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1521 - - - CF$UID - 1502 - - - CF$UID - 1522 - - - NS.objects - - - CF$UID - 254 - - - CF$UID - 1509 - - - CF$UID - 1563 - - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 1564 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1530 - - - CF$UID - 1526 - - - CF$UID - 1527 - - - CF$UID - 1528 - - - CF$UID - 1529 - - - CF$UID - 1525 - - - NS.objects - - - CF$UID - 163 - - - CF$UID - 1565 - - - CF$UID - 246 - - - CF$UID - 246 - - - CF$UID - 163 - - - CF$UID - 1567 - - - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 1566 - - - - - $class - - CF$UID - 109 - - NS.string - Architectures||VALID_ARCHS - - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 1568 - - - CF$UID - 1569 - - - CF$UID - 1570 - - - CF$UID - 1571 - - - CF$UID - 1572 - - - CF$UID - 1573 - - - CF$UID - 1574 - - - CF$UID - 1575 - - - CF$UID - 1576 - - - CF$UID - 1577 - - - CF$UID - 1578 - - - CF$UID - 1579 - - - CF$UID - 1580 - - - CF$UID - 1581 - - - CF$UID - 1582 - - - CF$UID - 1583 - - - - - $class - - CF$UID - 109 - - NS.string - Architectures||ARCHS - - - $class - - CF$UID - 109 - - NS.string - Architectures||SDKROOT - - - $class - - CF$UID - 109 - - NS.string - Architectures||VALID_ARCHS - - - $class - - CF$UID - 109 - - NS.string - Build Locations||SYMROOT - - - $class - - CF$UID - 109 - - NS.string - Build Options||PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR - - - $class - - CF$UID - 109 - - NS.string - Deployment||INSTALL_PATH - - - $class - - CF$UID - 109 - - NS.string - Deployment||MACOSX_DEPLOYMENT_TARGET - - - $class - - CF$UID - 109 - - NS.string - Deployment||STRIP_INSTALLED_PRODUCT - - - $class - - CF$UID - 109 - - NS.string - Packaging||INFOPLIST_FILE - - - $class - - CF$UID - 109 - - NS.string - Packaging||PRODUCT_NAME - - - $class - - CF$UID - 109 - - NS.string - Search Paths||HEADER_SEARCH_PATHS - - - $class - - CF$UID - 109 - - NS.string - Search Paths||USER_HEADER_SEARCH_PATHS - - - $class - - CF$UID - 109 - - NS.string - LLVM GCC 4.2 - Code Generation||GCC_ENABLE_OBJC_GC - - - $class - - CF$UID - 109 - - NS.string - LLVM GCC 4.2 - Language||GCC_C_LANGUAGE_STANDARD - - - $class - - CF$UID - 109 - - NS.string - LLVM GCC 4.2 - Warnings||GCC_WARN_ABOUT_RETURN_TYPE - - - $class - - CF$UID - 109 - - NS.string - LLVM GCC 4.2 - Warnings||GCC_WARN_UNUSED_VARIABLE - - - $class - - CF$UID - 39 - - NS.keys - - NS.objects - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1586 - - - CF$UID - 1588 - - - CF$UID - 1590 - - - CF$UID - 1592 - - - CF$UID - 1594 - - - NS.objects - - - CF$UID - 1596 - - - CF$UID - 1604 - - - CF$UID - 1609 - - - CF$UID - 1614 - - - CF$UID - 1619 - - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1587 - - - x-xcode-log://93BF0A7E-9B8F-4127-9E53-6FD4359563C8 - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1589 - - - x-xcode-log://E16FA7B2-DE55-4431-89C7-43D8A6C6BE2B - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1591 - - - x-xcode-log://541A0579-23A7-4735-AC53-0CA54C1CC926 - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1593 - - - x-xcode-log://4E6ECE08-C292-42A5-9EB8-F1D770002C74 - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1595 - - - x-xcode-log://56055AA1-9319-4181-AD73-7A2BA288B024 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 560 - - - NS.objects - - - CF$UID - 1597 - - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 1598 - - - - - $class - - CF$UID - 1603 - - documentURL - - CF$UID - 1587 - - expandTranscript - - indexPath - - CF$UID - 1599 - - timestamp - - CF$UID - 0 - - - - $class - - CF$UID - 1602 - - NSIndexPathData - - CF$UID - 1600 - - NSIndexPathLength - 2 - - - $class - - CF$UID - 1601 - - NS.data - - AEc= - - - - $classes - - NSMutableData - NSData - NSObject - - $classname - NSMutableData - - - $classes - - NSIndexPath - NSObject - - $classname - NSIndexPath - - - $classes - - IDELogDocumentLocation - DVTDocumentLocation - NSObject - - $classname - IDELogDocumentLocation - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 560 - - - NS.objects - - - CF$UID - 1605 - - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 1606 - - - - - $class - - CF$UID - 1603 - - documentURL - - CF$UID - 1589 - - expandTranscript - - indexPath - - CF$UID - 1607 - - timestamp - - CF$UID - 0 - - - - $class - - CF$UID - 1602 - - NSIndexPathData - - CF$UID - 1608 - - NSIndexPathLength - 2 - - - $class - - CF$UID - 1601 - - NS.data - - AEc= - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 560 - - - NS.objects - - - CF$UID - 1610 - - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 1611 - - - - - $class - - CF$UID - 1603 - - documentURL - - CF$UID - 1591 - - expandTranscript - - indexPath - - CF$UID - 1612 - - timestamp - - CF$UID - 0 - - - - $class - - CF$UID - 1602 - - NSIndexPathData - - CF$UID - 1613 - - NSIndexPathLength - 2 - - - $class - - CF$UID - 1601 - - NS.data - - AEc= - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 560 - - - NS.objects - - - CF$UID - 1615 - - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 1616 - - - - - $class - - CF$UID - 1603 - - documentURL - - CF$UID - 1593 - - expandTranscript - - indexPath - - CF$UID - 1617 - - timestamp - - CF$UID - 0 - - - - $class - - CF$UID - 1602 - - NSIndexPathData - - CF$UID - 1618 - - NSIndexPathLength - 2 - - - $class - - CF$UID - 1601 - - NS.data - - AEc= - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 560 - - - NS.objects - - - CF$UID - 1620 - - - - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 1621 - - - - - $class - - CF$UID - 1603 - - documentURL - - CF$UID - 1595 - - expandTranscript - - indexPath - - CF$UID - 1622 - - timestamp - - CF$UID - 0 - - - - $class - - CF$UID - 1602 - - NSIndexPathData - - CF$UID - 1623 - - NSIndexPathLength - 2 - - - $class - - CF$UID - 1601 - - NS.data - - AEg= - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1625 - - - CF$UID - 1626 - - - NS.objects - - - CF$UID - 1627 - - - CF$UID - 1628 - - - - IDEDeviceLocation - IDEDeviceArchitecture - dvtdevice-local-computer:localhost - i386 - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1630 - - - NS.objects - - - CF$UID - 1631 - - - - IDENameString - TikZiT - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1633 - - - CF$UID - 1634 - - - CF$UID - 1635 - - - NS.objects - - - CF$UID - 1636 - - - CF$UID - 1661 - - - CF$UID - 57 - - - - IDEActivityReportCompletionSummaryStringSegments - IDEActivityReportOptions - IDEActivityReportTitle - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 1637 - - - CF$UID - 1644 - - - CF$UID - 1648 - - - CF$UID - 1652 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1638 - - - CF$UID - 1639 - - - CF$UID - 1640 - - - NS.objects - - - CF$UID - 1641 - - - CF$UID - 1642 - - - CF$UID - 1643 - - - - IDEActivityReportStringSegmentPriority - IDEActivityReportStringSegmentBackSeparator - IDEActivityReportStringSegmentStringValue - 2 - - Build - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1638 - - - CF$UID - 1639 - - - CF$UID - 1640 - - - NS.objects - - - CF$UID - 1645 - - - CF$UID - 1646 - - - CF$UID - 1647 - - - - 4 - : - TikZiT - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1638 - - - CF$UID - 1639 - - - CF$UID - 1640 - - - NS.objects - - - CF$UID - 1649 - - - CF$UID - 1650 - - - CF$UID - 1651 - - - - 1 - │ - - $class - - CF$UID - 1601 - - NS.data - - YnBsaXN0MDDUAQIDBAUGOzxYJHZlcnNpb25YJG9iamVjdHNZJGFy - Y2hpdmVyVCR0b3ASAAGGoK0HCA8QGhscJCUrMTQ3VSRudWxs0wkK - CwwNDlxOU0F0dHJpYnV0ZXNWJGNsYXNzWE5TU3RyaW5ngAOADIAC - WVN1Y2NlZWRlZNMKERITFBdXTlMua2V5c1pOUy5vYmplY3RzgAui - FRaABIAFohgZgAaACVZOU0ZvbnRXTlNDb2xvctQKHR4fICEiI1ZO - U05hbWVWTlNTaXplWE5TZkZsYWdzgAiAByNAJgAAAAAAABENEF8Q - EUx1Y2lkYUdyYW5kZS1Cb2xk0iYnKClaJGNsYXNzbmFtZVgkY2xh - c3Nlc1ZOU0ZvbnSiKCpYTlNPYmplY3TTCiwtLi8wXE5TQ29sb3JT - cGFjZVdOU1doaXRlgAoQA0IwANImJzIzV05TQ29sb3KiMirSJic1 - NlxOU0RpY3Rpb25hcnmiNSrSJic4OV8QEk5TQXR0cmlidXRlZFN0 - cmluZ6I6Kl8QEk5TQXR0cmlidXRlZFN0cmluZ18QD05TS2V5ZWRB - cmNoaXZlctE9PlRyb290gAEACAARABoAIwAtADIANwBFAEsAUgBf - AGYAbwBxAHMAdQB/AIYAjgCZAJsAngCgAKIApQCnAKkAsAC4AMEA - yADPANgA2gDcAOUA6AD8AQEBDAEVARwBHwEoAS8BPAFEAUYBSAFL - AVABWAFbAWABbQFwAXUBigGNAaIBtAG3AbwAAAAAAAACAQAAAAAA - AAA/AAAAAAAAAAAAAAAAAAABvg== - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1638 - - - CF$UID - 1653 - - - CF$UID - 1654 - - - CF$UID - 1640 - - - CF$UID - 1655 - - - CF$UID - 1656 - - - NS.objects - - - CF$UID - 1657 - - - CF$UID - 163 - - - CF$UID - 1658 - - - CF$UID - 1660 - - - CF$UID - 163 - - - CF$UID - 163 - - - - IDEActivityReportStringSegmentType - IDEActivityReportStringSegmentDate - IDEActivityReportStringSegmentDateStyle - IDEActivityReportStringSegmentTimeStyle - 3 - - $class - - CF$UID - 1659 - - NS.time - 381083546.00637001 - - - $classes - - NSDate - NSObject - - $classname - NSDate - - Today at 16:32 - 234 - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 3 - - - - - $class - - CF$UID - 39 - - NS.keys - - - CF$UID - 1664 - - - CF$UID - 1666 - - - CF$UID - 1668 - - - CF$UID - 1670 - - - CF$UID - 1672 - - - CF$UID - 1674 - - - CF$UID - 1676 - - - CF$UID - 1678 - - - CF$UID - 1680 - - - CF$UID - 1682 - - - CF$UID - 784 - - - CF$UID - 1684 - - - CF$UID - 1685 - - - CF$UID - 1687 - - - CF$UID - 1689 - - - CF$UID - 1691 - - - CF$UID - 1693 - - - CF$UID - 1695 - - - CF$UID - 907 - - - NS.objects - - - CF$UID - 1697 - - - CF$UID - 1702 - - - CF$UID - 1705 - - - CF$UID - 1708 - - - CF$UID - 1711 - - - CF$UID - 1714 - - - CF$UID - 1717 - - - CF$UID - 1720 - - - CF$UID - 1723 - - - CF$UID - 1726 - - - CF$UID - 1729 - - - CF$UID - 1734 - - - CF$UID - 1737 - - - CF$UID - 1740 - - - CF$UID - 1743 - - - CF$UID - 1746 - - - CF$UID - 1749 - - - CF$UID - 1752 - - - CF$UID - 1755 - - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1665 - - - file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/GraphicsView.m - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1667 - - - file://localhost/Users/aleks/svn/tikzit/src/common/NodeStyle.m - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1669 - - - file://localhost/Users/aleks/svn/tikzit/English.lproj/TikzDocument.xib - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1671 - - - file://localhost/Users/aleks/svn/tikzit/src/common/Node.m - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1673 - - - file://localhost/Users/aleks/svn/tikzit/src/osx/PropertyInspectorController.m - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1675 - - - file://localhost/Users/aleks/git/tikzit/tikzit/src/osx/GraphicsView.m - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1677 - - - file://localhost/Users/aleks/svn/tikzit/English.lproj/StylePalette.xib - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1679 - - - file://localhost/Users/aleks/svn/tikzit/src/osx/StylePaletteController.m - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1681 - - - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/Edge.m - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1683 - - - file://localhost/Users/aleks/git/tikzit/tikzit/src/osx/Grid.m - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1518 - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1686 - - - file://localhost/Users/aleks/svn/tikzit/English.lproj/PropertyInspector.xib - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1688 - - - file://localhost/Users/aleks/svn/tikzit/tikzit/src/osx/PreviewController.m - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1690 - - - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/TikzGraphAssembler.m - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1692 - - - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/tikzlexer.lm - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1694 - - - file://localhost/Users/aleks/svn/tikzit/src/osx/NodeLayer.h - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1696 - - - file://localhost/Users/aleks/svn/tikzit/English.lproj/Preview.xib - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1700 - - - CF$UID - 1701 - - - - width - height - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1703 - - - CF$UID - 1704 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1706 - - - CF$UID - 1707 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1709 - - - CF$UID - 1710 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1712 - - - CF$UID - 1713 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1715 - - - CF$UID - 1716 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1718 - - - CF$UID - 1719 - - - - 1133 - 763 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1721 - - - CF$UID - 1722 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1724 - - - CF$UID - 1725 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1727 - - - CF$UID - 1728 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1730 - - - CF$UID - 1731 - - - NS.objects - - - CF$UID - 1732 - - - CF$UID - 1733 - - - - width - height - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1735 - - - CF$UID - 1736 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1738 - - - CF$UID - 1739 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1741 - - - CF$UID - 1742 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1744 - - - CF$UID - 1745 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1747 - - - CF$UID - 1748 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1750 - - - CF$UID - 1751 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1698 - - - CF$UID - 1699 - - - NS.objects - - - CF$UID - 1753 - - - CF$UID - 1754 - - - - 600 - 600 - - $class - - CF$UID - 35 - - NS.keys - - - CF$UID - 1730 - - - CF$UID - 1731 - - - NS.objects - - - CF$UID - 1756 - - - CF$UID - 1757 - - - - 600 - 600 - - $class - - CF$UID - 38 - - NS.objects - - - CF$UID - 1759 - - - CF$UID - 1761 - - - CF$UID - 1763 - - - CF$UID - 1765 - - - CF$UID - 1767 - - - CF$UID - 1769 - - - CF$UID - 1771 - - - CF$UID - 1772 - - - CF$UID - 1773 - - - CF$UID - 1774 - - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1760 - - - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/Graph.m - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1762 - - - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/Edge.m - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1764 - - - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/tikzparser.ym - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1766 - - - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/tikzlexer.lm - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1768 - - - file://localhost/Users/aleks/git/tikzit/tikzit/src/common/TikzGraphAssembler.m - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1770 - - - file://localhost/Users/aleks/git/tikzit/tikzit/TikZiT-Info.plist - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1499 - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1683 - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 1675 - - - - $class - - CF$UID - 153 - - NS.base - - CF$UID - 0 - - NS.relative - - CF$UID - 365 - - - - $top - - State - - CF$UID - 1 - - - $version - 100000 - - diff --git a/tikzit-old/TikZiT.xcodeproj/project.xcworkspace/xcuserdata/aleks.xcuserdatad/WorkspaceSettings.xcsettings b/tikzit-old/TikZiT.xcodeproj/project.xcworkspace/xcuserdata/aleks.xcuserdatad/WorkspaceSettings.xcsettings deleted file mode 100644 index c1034ce..0000000 --- a/tikzit-old/TikZiT.xcodeproj/project.xcworkspace/xcuserdata/aleks.xcuserdatad/WorkspaceSettings.xcsettings +++ /dev/null @@ -1,22 +0,0 @@ - - - - - IDEWorkspaceUserSettings_BuildLocationStyle - 2 - IDEWorkspaceUserSettings_BuildSubfolderNameStyle - 0 - IDEWorkspaceUserSettings_DerivedDataLocationStyle - 0 - IDEWorkspaceUserSettings_HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges - - IDEWorkspaceUserSettings_IssueFilterStyle - 0 - IDEWorkspaceUserSettings_LiveSourceIssuesEnabled - - IDEWorkspaceUserSettings_SnapshotAutomaticallyBeforeSignificantChanges - - IDEWorkspaceUserSettings_SnapshotLocationStyle - 0 - - diff --git a/tikzit-old/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist b/tikzit-old/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist deleted file mode 100644 index 5a56e60..0000000 --- a/tikzit-old/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tikzit-old/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/TikZiT.xcscheme b/tikzit-old/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/TikZiT.xcscheme deleted file mode 100644 index 86e70a8..0000000 --- a/tikzit-old/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/TikZiT.xcscheme +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tikzit-old/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/tests.xcscheme b/tikzit-old/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/tests.xcscheme deleted file mode 100644 index 9e1a430..0000000 --- a/tikzit-old/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/tests.xcscheme +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tikzit-old/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/xcschememanagement.plist b/tikzit-old/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/xcschememanagement.plist deleted file mode 100644 index 3291a35..0000000 --- a/tikzit-old/TikZiT.xcodeproj/xcuserdata/aleks.xcuserdatad/xcschemes/xcschememanagement.plist +++ /dev/null @@ -1,32 +0,0 @@ - - - - - SchemeUserState - - TikZiT.xcscheme - - orderHint - 1 - - tests.xcscheme - - orderHint - 0 - - - SuppressBuildableAutocreation - - 5589AA6411C5429C0064D310 - - primary - - - 8D15AC270486D014006FF6A4 - - primary - - - - - diff --git a/tikzit-old/TikZiT_Prefix.pch b/tikzit-old/TikZiT_Prefix.pch deleted file mode 100644 index 78e4d0f..0000000 --- a/tikzit-old/TikZiT_Prefix.pch +++ /dev/null @@ -1,30 +0,0 @@ -// -// TikZiT_Prefix.pch -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -// -// Prefix header for all source files of the 'TikZiT' target in the 'TikZiT' project -// - -#ifdef __OBJC__ - #import -#endif diff --git a/tikzit-old/autogen.sh b/tikzit-old/autogen.sh deleted file mode 100755 index 132ecd0..0000000 --- a/tikzit-old/autogen.sh +++ /dev/null @@ -1,1578 +0,0 @@ -#!/bin/sh -# a u t o g e n . s h -# -# Copyright (c) 2005-2009 United States Government as represented by -# the U.S. Army Research Laboratory. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following -# disclaimer in the documentation and/or other materials provided -# with the distribution. -# -# 3. The name of the author may not be used to endorse or promote -# products derived from this software without specific prior written -# permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS -# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -### -# -# Script for automatically preparing the sources for compilation by -# performing the myriad of necessary steps. The script attempts to -# detect proper version support, and outputs warnings about particular -# systems that have autotool peculiarities. -# -# Basically, if everything is set up and installed correctly, the -# script will validate that minimum versions of the GNU Build System -# tools are installed, account for several common configuration -# issues, and then simply run autoreconf for you. -# -# If autoreconf fails, which can happen for many valid configurations, -# this script proceeds to run manual preparation steps effectively -# providing a POSIX shell script (mostly complete) reimplementation of -# autoreconf. -# -# The AUTORECONF, AUTOCONF, AUTOMAKE, LIBTOOLIZE, ACLOCAL, AUTOHEADER -# environment variables and corresponding _OPTIONS variables (e.g. -# AUTORECONF_OPTIONS) may be used to override the default automatic -# detection behaviors. Similarly the _VERSION variables will override -# the minimum required version numbers. -# -# Examples: -# -# To obtain help on usage: -# ./autogen.sh --help -# -# To obtain verbose output: -# ./autogen.sh --verbose -# -# To skip autoreconf and prepare manually: -# AUTORECONF=false ./autogen.sh -# -# To verbosely try running with an older (unsupported) autoconf: -# AUTOCONF_VERSION=2.50 ./autogen.sh --verbose -# -# Author: -# Christopher Sean Morrison -# -# Patches: -# Sebastian Pipping -# -###################################################################### - -# set to minimum acceptable version of autoconf -if [ "x$AUTOCONF_VERSION" = "x" ] ; then - AUTOCONF_VERSION=2.60 -fi -# set to minimum acceptable version of automake -if [ "x$AUTOMAKE_VERSION" = "x" ] ; then - AUTOMAKE_VERSION=1.6.0 -fi -# set to minimum acceptable version of libtool -if [ "x$LIBTOOL_VERSION" = "x" ] ; then - LIBTOOL_VERSION=1.4.2 -fi - - -################## -# ident function # -################## -ident ( ) { - # extract copyright from header - __copyright="`grep Copyright $AUTOGEN_SH | head -${HEAD_N}1 | awk '{print $4}'`" - if [ "x$__copyright" = "x" ] ; then - __copyright="`date +%Y`" - fi - - # extract version from CVS Id string - __id="$Id: autogen.sh 33925 2009-03-01 23:27:06Z brlcad $" - __version="`echo $__id | sed 's/.*\([0-9][0-9][0-9][0-9]\)[-\/]\([0-9][0-9]\)[-\/]\([0-9][0-9]\).*/\1\2\3/'`" - if [ "x$__version" = "x" ] ; then - __version="" - fi - - echo "autogen.sh build preparation script by Christopher Sean Morrison" - echo " + config.guess download patch by Sebastian Pipping (2008-12-03)" - echo "revised 3-clause BSD-style license, copyright (c) $__copyright" - echo "script version $__version, ISO/IEC 9945 POSIX shell script" -} - - -################## -# USAGE FUNCTION # -################## -usage ( ) { - echo "Usage: $AUTOGEN_SH [-h|--help] [-v|--verbose] [-q|--quiet] [-d|--download] [--version]" - echo " --help Help on $NAME_OF_AUTOGEN usage" - echo " --verbose Verbose progress output" - echo " --quiet Quiet suppressed progress output" - echo " --download Download the latest config.guess from gnulib" - echo " --version Only perform GNU Build System version checks" - echo - echo "Description: This script will validate that minimum versions of the" - echo "GNU Build System tools are installed and then run autoreconf for you." - echo "Should autoreconf fail, manual preparation steps will be run" - echo "potentially accounting for several common preparation issues. The" - - echo "AUTORECONF, AUTOCONF, AUTOMAKE, LIBTOOLIZE, ACLOCAL, AUTOHEADER," - echo "PROJECT, & CONFIGURE environment variables and corresponding _OPTIONS" - echo "variables (e.g. AUTORECONF_OPTIONS) may be used to override the" - echo "default automatic detection behavior." - echo - - ident - - return 0 -} - - -########################## -# VERSION_ERROR FUNCTION # -########################## -version_error ( ) { - if [ "x$1" = "x" ] ; then - echo "INTERNAL ERROR: version_error was not provided a version" - exit 1 - fi - if [ "x$2" = "x" ] ; then - echo "INTERNAL ERROR: version_error was not provided an application name" - exit 1 - fi - $ECHO - $ECHO "ERROR: To prepare the ${PROJECT} build system from scratch," - $ECHO " at least version $1 of $2 must be installed." - $ECHO - $ECHO "$NAME_OF_AUTOGEN does not need to be run on the same machine that will" - $ECHO "run configure or make. Either the GNU Autotools will need to be installed" - $ECHO "or upgraded on this system, or $NAME_OF_AUTOGEN must be run on the source" - $ECHO "code on another system and then transferred to here. -- Cheers!" - $ECHO -} - -########################## -# VERSION_CHECK FUNCTION # -########################## -version_check ( ) { - if [ "x$1" = "x" ] ; then - echo "INTERNAL ERROR: version_check was not provided a minimum version" - exit 1 - fi - _min="$1" - if [ "x$2" = "x" ] ; then - echo "INTERNAL ERROR: version check was not provided a comparison version" - exit 1 - fi - _cur="$2" - - # needed to handle versions like 1.10 and 1.4-p6 - _min="`echo ${_min}. | sed 's/[^0-9]/./g' | sed 's/\.\././g'`" - _cur="`echo ${_cur}. | sed 's/[^0-9]/./g' | sed 's/\.\././g'`" - - _min_major="`echo $_min | cut -d. -f1`" - _min_minor="`echo $_min | cut -d. -f2`" - _min_patch="`echo $_min | cut -d. -f3`" - - _cur_major="`echo $_cur | cut -d. -f1`" - _cur_minor="`echo $_cur | cut -d. -f2`" - _cur_patch="`echo $_cur | cut -d. -f3`" - - if [ "x$_min_major" = "x" ] ; then - _min_major=0 - fi - if [ "x$_min_minor" = "x" ] ; then - _min_minor=0 - fi - if [ "x$_min_patch" = "x" ] ; then - _min_patch=0 - fi - if [ "x$_cur_minor" = "x" ] ; then - _cur_major=0 - fi - if [ "x$_cur_minor" = "x" ] ; then - _cur_minor=0 - fi - if [ "x$_cur_patch" = "x" ] ; then - _cur_patch=0 - fi - - $VERBOSE_ECHO "Checking if ${_cur_major}.${_cur_minor}.${_cur_patch} is greater than ${_min_major}.${_min_minor}.${_min_patch}" - - if [ $_min_major -lt $_cur_major ] ; then - return 0 - elif [ $_min_major -eq $_cur_major ] ; then - if [ $_min_minor -lt $_cur_minor ] ; then - return 0 - elif [ $_min_minor -eq $_cur_minor ] ; then - if [ $_min_patch -lt $_cur_patch ] ; then - return 0 - elif [ $_min_patch -eq $_cur_patch ] ; then - return 0 - fi - fi - fi - return 1 -} - - -###################################### -# LOCATE_CONFIGURE_TEMPLATE FUNCTION # -###################################### -locate_configure_template ( ) { - _pwd="`pwd`" - if test -f "./configure.ac" ; then - echo "./configure.ac" - elif test -f "./configure.in" ; then - echo "./configure.in" - elif test -f "$_pwd/configure.ac" ; then - echo "$_pwd/configure.ac" - elif test -f "$_pwd/configure.in" ; then - echo "$_pwd/configure.in" - elif test -f "$PATH_TO_AUTOGEN/configure.ac" ; then - echo "$PATH_TO_AUTOGEN/configure.ac" - elif test -f "$PATH_TO_AUTOGEN/configure.in" ; then - echo "$PATH_TO_AUTOGEN/configure.in" - fi -} - - -################## -# argument check # -################## -ARGS="$*" -PATH_TO_AUTOGEN="`dirname $0`" -NAME_OF_AUTOGEN="`basename $0`" -AUTOGEN_SH="$PATH_TO_AUTOGEN/$NAME_OF_AUTOGEN" - -LIBTOOL_M4="${PATH_TO_AUTOGEN}/misc/libtool.m4" - -if [ "x$HELP" = "x" ] ; then - HELP=no -fi -if [ "x$QUIET" = "x" ] ; then - QUIET=no -fi -if [ "x$VERBOSE" = "x" ] ; then - VERBOSE=no -fi -if [ "x$VERSION_ONLY" = "x" ] ; then - VERSION_ONLY=no -fi -if [ "x$DOWNLOAD" = "x" ] ; then - DOWNLOAD=no -fi -if [ "x$AUTORECONF_OPTIONS" = "x" ] ; then - AUTORECONF_OPTIONS="-i -f" -fi -if [ "x$AUTOCONF_OPTIONS" = "x" ] ; then - AUTOCONF_OPTIONS="-f" -fi -if [ "x$AUTOMAKE_OPTIONS" = "x" ] ; then - AUTOMAKE_OPTIONS="-a -c -f" -fi -ALT_AUTOMAKE_OPTIONS="-a -c" -if [ "x$LIBTOOLIZE_OPTIONS" = "x" ] ; then - LIBTOOLIZE_OPTIONS="--automake -c -f" -fi -ALT_LIBTOOLIZE_OPTIONS="--automake --copy --force" -if [ "x$ACLOCAL_OPTIONS" = "x" ] ; then - ACLOCAL_OPTIONS="" -fi -if [ "x$AUTOHEADER_OPTIONS" = "x" ] ; then - AUTOHEADER_OPTIONS="" -fi -if [ "x$CONFIG_GUESS_URL" = "x" ] ; then - CONFIG_GUESS_URL="http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;f=build-aux/config.guess;hb=HEAD" -fi -for arg in $ARGS ; do - case "x$arg" in - x--help) HELP=yes ;; - x-[hH]) HELP=yes ;; - x--quiet) QUIET=yes ;; - x-[qQ]) QUIET=yes ;; - x--verbose) VERBOSE=yes ;; - x-[dD]) DOWNLOAD=yes ;; - x--download) DOWNLOAD=yes ;; - x-[vV]) VERBOSE=yes ;; - x--version) VERSION_ONLY=yes ;; - *) - echo "Unknown option: $arg" - echo - usage - exit 1 - ;; - esac -done - - -##################### -# environment check # -##################### - -# sanity check before recursions potentially begin -if [ ! -f "$AUTOGEN_SH" ] ; then - echo "INTERNAL ERROR: $AUTOGEN_SH does not exist" - if [ ! "x$0" = "x$AUTOGEN_SH" ] ; then - echo "INTERNAL ERROR: dirname/basename inconsistency: $0 != $AUTOGEN_SH" - fi - exit 1 -fi - -# force locale setting to C so things like date output as expected -LC_ALL=C - -# commands that this script expects -for __cmd in echo head tail pwd ; do - echo "test" | $__cmd > /dev/null 2>&1 - if [ $? != 0 ] ; then - echo "INTERNAL ERROR: '${__cmd}' command is required" - exit 2 - fi -done -echo "test" | grep "test" > /dev/null 2>&1 -if test ! x$? = x0 ; then - echo "INTERNAL ERROR: grep command is required" - exit 1 -fi -echo "test" | sed "s/test/test/" > /dev/null 2>&1 -if test ! x$? = x0 ; then - echo "INTERNAL ERROR: sed command is required" - exit 1 -fi - - -# determine the behavior of echo -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -esac - -# determine the behavior of head -case "x`echo 'head' | head -n 1 2>&1`" in - *xhead*) HEAD_N="n " ;; - *) HEAD_N="" ;; -esac - -# determine the behavior of tail -case "x`echo 'tail' | tail -n 1 2>&1`" in - *xtail*) TAIL_N="n " ;; - *) TAIL_N="" ;; -esac - -VERBOSE_ECHO=: -ECHO=: -if [ "x$QUIET" = "xyes" ] ; then - if [ "x$VERBOSE" = "xyes" ] ; then - echo "Verbose output quelled by quiet option. Further output disabled." - fi -else - ECHO=echo - if [ "x$VERBOSE" = "xyes" ] ; then - echo "Verbose output enabled" - VERBOSE_ECHO=echo - fi -fi - - -# allow a recursive run to disable further recursions -if [ "x$RUN_RECURSIVE" = "x" ] ; then - RUN_RECURSIVE=yes -fi - - -################################################ -# check for help arg and bypass version checks # -################################################ -if [ "x`echo $ARGS | sed 's/.*[hH][eE][lL][pP].*/help/'`" = "xhelp" ] ; then - HELP=yes -fi -if [ "x$HELP" = "xyes" ] ; then - usage - $ECHO "---" - $ECHO "Help was requested. No preparation or configuration will be performed." - exit 0 -fi - - -####################### -# set up signal traps # -####################### -untrap_abnormal ( ) { - for sig in 1 2 13 15; do - trap - $sig - done -} - -# do this cleanup whenever we exit. -trap ' - # start from the root - if test -d "$START_PATH" ; then - cd "$START_PATH" - fi - - # restore/delete backup files - if test "x$PFC_INIT" = "x1" ; then - recursive_restore - fi -' 0 - -# trap SIGHUP (1), SIGINT (2), SIGPIPE (13), SIGTERM (15) -for sig in 1 2 13 15; do - trap ' - $ECHO "" - $ECHO "Aborting $NAME_OF_AUTOGEN: caught signal '$sig'" - - # start from the root - if test -d "$START_PATH" ; then - cd "$START_PATH" - fi - - # clean up on abnormal exit - $VERBOSE_ECHO "rm -rf autom4te.cache" - rm -rf autom4te.cache - - if test -f "acinclude.m4.$$.backup" ; then - $VERBOSE_ECHO "cat acinclude.m4.$$.backup > acinclude.m4" - chmod u+w acinclude.m4 - cat acinclude.m4.$$.backup > acinclude.m4 - - $VERBOSE_ECHO "rm -f acinclude.m4.$$.backup" - rm -f acinclude.m4.$$.backup - fi - - { (exit 1); exit 1; } -' $sig -done - - -############################# -# look for a configure file # -############################# -if [ "x$CONFIGURE" = "x" ] ; then - CONFIGURE="`locate_configure_template`" - if [ ! "x$CONFIGURE" = "x" ] ; then - $VERBOSE_ECHO "Found a configure template: $CONFIGURE" - fi -else - $ECHO "Using CONFIGURE environment variable override: $CONFIGURE" -fi -if [ "x$CONFIGURE" = "x" ] ; then - if [ "x$VERSION_ONLY" = "xyes" ] ; then - CONFIGURE=/dev/null - else - $ECHO - $ECHO "A configure.ac or configure.in file could not be located implying" - $ECHO "that the GNU Build System is at least not used in this directory. In" - $ECHO "any case, there is nothing to do here without one of those files." - $ECHO - $ECHO "ERROR: No configure.in or configure.ac file found in `pwd`" - exit 1 - fi -fi - -#################### -# get project name # -#################### -if [ "x$PROJECT" = "x" ] ; then - PROJECT="`grep AC_INIT $CONFIGURE | grep -v '.*#.*AC_INIT' | tail -${TAIL_N}1 | sed 's/^[ ]*AC_INIT(\([^,)]*\).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`" - if [ "x$PROJECT" = "xAC_INIT" ] ; then - # projects might be using the older/deprecated arg-less AC_INIT .. look for AM_INIT_AUTOMAKE instead - PROJECT="`grep AM_INIT_AUTOMAKE $CONFIGURE | grep -v '.*#.*AM_INIT_AUTOMAKE' | tail -${TAIL_N}1 | sed 's/^[ ]*AM_INIT_AUTOMAKE(\([^,)]*\).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`" - fi - if [ "x$PROJECT" = "xAM_INIT_AUTOMAKE" ] ; then - PROJECT="project" - fi - if [ "x$PROJECT" = "x" ] ; then - PROJECT="project" - fi -else - $ECHO "Using PROJECT environment variable override: $PROJECT" -fi -$ECHO "Preparing the $PROJECT build system...please wait" -$ECHO - - -######################## -# check for autoreconf # -######################## -HAVE_AUTORECONF=no -if [ "x$AUTORECONF" = "x" ] ; then - for AUTORECONF in autoreconf ; do - $VERBOSE_ECHO "Checking autoreconf version: $AUTORECONF --version" - $AUTORECONF --version > /dev/null 2>&1 - if [ $? = 0 ] ; then - HAVE_AUTORECONF=yes - break - fi - done -else - HAVE_AUTORECONF=yes - $ECHO "Using AUTORECONF environment variable override: $AUTORECONF" -fi - - -########################## -# autoconf version check # -########################## -_acfound=no -if [ "x$AUTOCONF" = "x" ] ; then - for AUTOCONF in autoconf ; do - $VERBOSE_ECHO "Checking autoconf version: $AUTOCONF --version" - $AUTOCONF --version > /dev/null 2>&1 - if [ $? = 0 ] ; then - _acfound=yes - break - fi - done -else - _acfound=yes - $ECHO "Using AUTOCONF environment variable override: $AUTOCONF" -fi - -_report_error=no -if [ ! "x$_acfound" = "xyes" ] ; then - $ECHO "ERROR: Unable to locate GNU Autoconf." - _report_error=yes -else - _version="`$AUTOCONF --version | head -${HEAD_N}1 | sed 's/[^0-9]*\([0-9\.][0-9\.]*\)/\1/'`" - if [ "x$_version" = "x" ] ; then - _version="0.0.0" - fi - $ECHO "Found GNU Autoconf version $_version" - version_check "$AUTOCONF_VERSION" "$_version" - if [ $? -ne 0 ] ; then - _report_error=yes - fi -fi -if [ "x$_report_error" = "xyes" ] ; then - version_error "$AUTOCONF_VERSION" "GNU Autoconf" - exit 1 -fi - - -########################## -# automake version check # -########################## -_amfound=no -if [ "x$AUTOMAKE" = "x" ] ; then - for AUTOMAKE in automake ; do - $VERBOSE_ECHO "Checking automake version: $AUTOMAKE --version" - $AUTOMAKE --version > /dev/null 2>&1 - if [ $? = 0 ] ; then - _amfound=yes - break - fi - done -else - _amfound=yes - $ECHO "Using AUTOMAKE environment variable override: $AUTOMAKE" -fi - - -_report_error=no -if [ ! "x$_amfound" = "xyes" ] ; then - $ECHO - $ECHO "ERROR: Unable to locate GNU Automake." - _report_error=yes -else - _version="`$AUTOMAKE --version | head -${HEAD_N}1 | sed 's/[^0-9]*\([0-9\.][0-9\.]*\)/\1/'`" - if [ "x$_version" = "x" ] ; then - _version="0.0.0" - fi - $ECHO "Found GNU Automake version $_version" - version_check "$AUTOMAKE_VERSION" "$_version" - if [ $? -ne 0 ] ; then - _report_error=yes - fi -fi -if [ "x$_report_error" = "xyes" ] ; then - version_error "$AUTOMAKE_VERSION" "GNU Automake" - exit 1 -fi - - -######################## -# check for libtoolize # -######################## -HAVE_LIBTOOLIZE=yes -HAVE_ALT_LIBTOOLIZE=no -_ltfound=no -if [ "x$LIBTOOLIZE" = "x" ] ; then - LIBTOOLIZE=libtoolize - $VERBOSE_ECHO "Checking libtoolize version: $LIBTOOLIZE --version" - $LIBTOOLIZE --version > /dev/null 2>&1 - if [ ! $? = 0 ] ; then - HAVE_LIBTOOLIZE=no - $ECHO - if [ "x$HAVE_AUTORECONF" = "xno" ] ; then - $ECHO "Warning: libtoolize does not appear to be available." - else - $ECHO "Warning: libtoolize does not appear to be available. This means that" - $ECHO "the automatic build preparation via autoreconf will probably not work." - $ECHO "Preparing the build by running each step individually, however, should" - $ECHO "work and will be done automatically for you if autoreconf fails." - fi - - # look for some alternates - for tool in glibtoolize libtoolize15 libtoolize14 libtoolize13 ; do - $VERBOSE_ECHO "Checking libtoolize alternate: $tool --version" - _glibtoolize="`$tool --version > /dev/null 2>&1`" - if [ $? = 0 ] ; then - $VERBOSE_ECHO "Found $tool --version" - _glti="`which $tool`" - if [ "x$_glti" = "x" ] ; then - $VERBOSE_ECHO "Cannot find $tool with which" - continue; - fi - if test ! -f "$_glti" ; then - $VERBOSE_ECHO "Cannot use $tool, $_glti is not a file" - continue; - fi - _gltidir="`dirname $_glti`" - if [ "x$_gltidir" = "x" ] ; then - $VERBOSE_ECHO "Cannot find $tool path with dirname of $_glti" - continue; - fi - if test ! -d "$_gltidir" ; then - $VERBOSE_ECHO "Cannot use $tool, $_gltidir is not a directory" - continue; - fi - HAVE_ALT_LIBTOOLIZE=yes - LIBTOOLIZE="$tool" - $ECHO - $ECHO "Fortunately, $tool was found which means that your system may simply" - $ECHO "have a non-standard or incomplete GNU Autotools install. If you have" - $ECHO "sufficient system access, it may be possible to quell this warning by" - $ECHO "running:" - $ECHO - sudo -V > /dev/null 2>&1 - if [ $? = 0 ] ; then - $ECHO " sudo ln -s $_glti $_gltidir/libtoolize" - $ECHO - else - $ECHO " ln -s $_glti $_gltidir/libtoolize" - $ECHO - $ECHO "Run that as root or with proper permissions to the $_gltidir directory" - $ECHO - fi - _ltfound=yes - break - fi - done - else - _ltfound=yes - fi -else - _ltfound=yes - $ECHO "Using LIBTOOLIZE environment variable override: $LIBTOOLIZE" -fi - - -############################ -# libtoolize version check # -############################ -_report_error=no -if [ ! "x$_ltfound" = "xyes" ] ; then - $ECHO - $ECHO "ERROR: Unable to locate GNU Libtool." - _report_error=yes -else - _version="`$LIBTOOLIZE --version | head -${HEAD_N}1 | sed 's/[^0-9]*\([0-9\.][0-9\.]*\)/\1/'`" - if [ "x$_version" = "x" ] ; then - _version="0.0.0" - fi - $ECHO "Found GNU Libtool version $_version" - version_check "$LIBTOOL_VERSION" "$_version" - if [ $? -ne 0 ] ; then - _report_error=yes - fi -fi -if [ "x$_report_error" = "xyes" ] ; then - version_error "$LIBTOOL_VERSION" "GNU Libtool" - exit 1 -fi - - -##################### -# check for aclocal # -##################### -if [ "x$ACLOCAL" = "x" ] ; then - for ACLOCAL in aclocal ; do - $VERBOSE_ECHO "Checking aclocal version: $ACLOCAL --version" - $ACLOCAL --version > /dev/null 2>&1 - if [ $? = 0 ] ; then - break - fi - done -else - $ECHO "Using ACLOCAL environment variable override: $ACLOCAL" -fi - - -######################## -# check for autoheader # -######################## -if [ "x$AUTOHEADER" = "x" ] ; then - for AUTOHEADER in autoheader ; do - $VERBOSE_ECHO "Checking autoheader version: $AUTOHEADER --version" - $AUTOHEADER --version > /dev/null 2>&1 - if [ $? = 0 ] ; then - break - fi - done -else - $ECHO "Using AUTOHEADER environment variable override: $AUTOHEADER" -fi - - -######################### -# check if version only # -######################### -$VERBOSE_ECHO "Checking whether to only output version information" -if [ "x$VERSION_ONLY" = "xyes" ] ; then - $ECHO - ident - $ECHO "---" - $ECHO "Version requested. No preparation or configuration will be performed." - exit 0 -fi - - -################################# -# PROTECT_FROM_CLOBBER FUNCTION # -################################# -protect_from_clobber ( ) { - PFC_INIT=1 - - # protect COPYING & INSTALL from overwrite by automake. the - # automake force option will (inappropriately) ignore the existing - # contents of a COPYING and/or INSTALL files (depending on the - # version) instead of just forcing *missing* files like it does - # for AUTHORS, NEWS, and README. this is broken but extremely - # prevalent behavior, so we protect against it by keeping a backup - # of the file that can later be restored. - - for file in COPYING INSTALL ; do - if test -f ${file} ; then - if test -f ${file}.$$.protect_from_automake.backup ; then - $VERBOSE_ECHO "Already backed up ${file} in `pwd`" - else - $VERBOSE_ECHO "Backing up ${file} in `pwd`" - $VERBOSE_ECHO "cp -p ${file} ${file}.$$.protect_from_automake.backup" - cp -p ${file} ${file}.$$.protect_from_automake.backup - fi - fi - done -} - - -############################## -# RECURSIVE_PROTECT FUNCTION # -############################## -recursive_protect ( ) { - - # for projects using recursive configure, run the build - # preparation steps for the subdirectories. this function assumes - # START_PATH was set to pwd before recursion begins so that - # relative paths work. - - # git 'r done, protect COPYING and INSTALL from being clobbered - protect_from_clobber - - if test -d autom4te.cache ; then - $VERBOSE_ECHO "Found an autom4te.cache directory, deleting it" - $VERBOSE_ECHO "rm -rf autom4te.cache" - rm -rf autom4te.cache - fi - - # find configure template - _configure="`locate_configure_template`" - if [ "x$_configure" = "x" ] ; then - return - fi - # $VERBOSE_ECHO "Looking for configure template found `pwd`/$_configure" - - # look for subdirs - # $VERBOSE_ECHO "Looking for subdirs in `pwd`" - _det_config_subdirs="`grep AC_CONFIG_SUBDIRS $_configure | grep -v '.*#.*AC_CONFIG_SUBDIRS' | sed 's/^[ ]*AC_CONFIG_SUBDIRS(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`" - CHECK_DIRS="" - for dir in $_det_config_subdirs ; do - if test -d "`pwd`/$dir" ; then - CHECK_DIRS="$CHECK_DIRS \"`pwd`/$dir\"" - fi - done - - # process subdirs - if [ ! "x$CHECK_DIRS" = "x" ] ; then - $VERBOSE_ECHO "Recursively scanning the following directories:" - $VERBOSE_ECHO " $CHECK_DIRS" - for dir in $CHECK_DIRS ; do - $VERBOSE_ECHO "Protecting files from automake in $dir" - cd "$START_PATH" - eval "cd $dir" - - # recursively git 'r done - recursive_protect - done - fi -} # end of recursive_protect - - -############################# -# RESTORE_CLOBBERED FUNCION # -############################# -restore_clobbered ( ) { - - # The automake (and autoreconf by extension) -f/--force-missing - # option may overwrite COPYING and INSTALL even if they do exist. - # Here we restore the files if necessary. - - spacer=no - - for file in COPYING INSTALL ; do - if test -f ${file}.$$.protect_from_automake.backup ; then - if test -f ${file} ; then - # compare entire content, restore if needed - if test "x`cat ${file}`" != "x`cat ${file}.$$.protect_from_automake.backup`" ; then - if test "x$spacer" = "xno" ; then - $VERBOSE_ECHO - spacer=yes - fi - # restore the backup - $VERBOSE_ECHO "Restoring ${file} from backup (automake -f likely clobbered it)" - $VERBOSE_ECHO "rm -f ${file}" - rm -f ${file} - $VERBOSE_ECHO "mv ${file}.$$.protect_from_automake.backup ${file}" - mv ${file}.$$.protect_from_automake.backup ${file} - fi # check contents - elif test -f ${file}.$$.protect_from_automake.backup ; then - $VERBOSE_ECHO "mv ${file}.$$.protect_from_automake.backup ${file}" - mv ${file}.$$.protect_from_automake.backup ${file} - fi # -f ${file} - - # just in case - $VERBOSE_ECHO "rm -f ${file}.$$.protect_from_automake.backup" - rm -f ${file}.$$.protect_from_automake.backup - fi # -f ${file}.$$.protect_from_automake.backup - done - - CONFIGURE="`locate_configure_template`" - if [ "x$CONFIGURE" = "x" ] ; then - return - fi - - _aux_dir="`grep AC_CONFIG_AUX_DIR $CONFIGURE | grep -v '.*#.*AC_CONFIG_AUX_DIR' | tail -${TAIL_N}1 | sed 's/^[ ]*AC_CONFIG_AUX_DIR(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`" - if test ! -d "$_aux_dir" ; then - _aux_dir=. - fi - - for file in config.guess config.sub ltmain.sh ; do - if test -f "${_aux_dir}/${file}" ; then - $VERBOSE_ECHO "rm -f \"${_aux_dir}/${file}.backup\"" - rm -f "${_aux_dir}/${file}.backup" - fi - done -} # end of restore_clobbered - - -############################## -# RECURSIVE_RESTORE FUNCTION # -############################## -recursive_restore ( ) { - - # restore COPYING and INSTALL from backup if they were clobbered - # for each directory recursively. - - # git 'r undone - restore_clobbered - - # find configure template - _configure="`locate_configure_template`" - if [ "x$_configure" = "x" ] ; then - return - fi - - # look for subdirs - _det_config_subdirs="`grep AC_CONFIG_SUBDIRS $_configure | grep -v '.*#.*AC_CONFIG_SUBDIRS' | sed 's/^[ ]*AC_CONFIG_SUBDIRS(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`" - CHECK_DIRS="" - for dir in $_det_config_subdirs ; do - if test -d "`pwd`/$dir" ; then - CHECK_DIRS="$CHECK_DIRS \"`pwd`/$dir\"" - fi - done - - # process subdirs - if [ ! "x$CHECK_DIRS" = "x" ] ; then - $VERBOSE_ECHO "Recursively scanning the following directories:" - $VERBOSE_ECHO " $CHECK_DIRS" - for dir in $CHECK_DIRS ; do - $VERBOSE_ECHO "Checking files for automake damage in $dir" - cd "$START_PATH" - eval "cd $dir" - - # recursively git 'r undone - recursive_restore - done - fi -} # end of recursive_restore - - -####################### -# INITIALIZE FUNCTION # -####################### -initialize ( ) { - - # this routine performs a variety of directory-specific - # initializations. some are sanity checks, some are preventive, - # and some are necessary setup detection. - # - # this function sets: - # CONFIGURE - # SEARCH_DIRS - # CONFIG_SUBDIRS - - ################################## - # check for a configure template # - ################################## - CONFIGURE="`locate_configure_template`" - if [ "x$CONFIGURE" = "x" ] ; then - $ECHO - $ECHO "A configure.ac or configure.in file could not be located implying" - $ECHO "that the GNU Build System is at least not used in this directory. In" - $ECHO "any case, there is nothing to do here without one of those files." - $ECHO - $ECHO "ERROR: No configure.in or configure.ac file found in `pwd`" - exit 1 - fi - - ##################### - # detect an aux dir # - ##################### - _aux_dir="`grep AC_CONFIG_AUX_DIR $CONFIGURE | grep -v '.*#.*AC_CONFIG_AUX_DIR' | tail -${TAIL_N}1 | sed 's/^[ ]*AC_CONFIG_AUX_DIR(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`" - if test ! -d "$_aux_dir" ; then - _aux_dir=. - else - $VERBOSE_ECHO "Detected auxillary directory: $_aux_dir" - fi - - ################################ - # detect a recursive configure # - ################################ - CONFIG_SUBDIRS="" - _det_config_subdirs="`grep AC_CONFIG_SUBDIRS $CONFIGURE | grep -v '.*#.*AC_CONFIG_SUBDIRS' | sed 's/^[ ]*AC_CONFIG_SUBDIRS(\(.*\)).*/\1/' | sed 's/.*\[\(.*\)\].*/\1/'`" - for dir in $_det_config_subdirs ; do - if test -d "`pwd`/$dir" ; then - $VERBOSE_ECHO "Detected recursive configure directory: `pwd`/$dir" - CONFIG_SUBDIRS="$CONFIG_SUBDIRS `pwd`/$dir" - fi - done - - ########################################################### - # make sure certain required files exist for GNU projects # - ########################################################### - _marker_found="" - _marker_found_message_intro='Detected non-GNU marker "' - _marker_found_message_mid='" in ' - for marker in foreign cygnus ; do - _marker_found_message=${_marker_found_message_intro}${marker}${_marker_found_message_mid} - _marker_found="`grep 'AM_INIT_AUTOMAKE.*'${marker} $CONFIGURE`" - if [ ! "x$_marker_found" = "x" ] ; then - $VERBOSE_ECHO "${_marker_found_message}`basename \"$CONFIGURE\"`" - break - fi - if test -f "`dirname \"$CONFIGURE\"/Makefile.am`" ; then - _marker_found="`grep 'AUTOMAKE_OPTIONS.*'${marker} Makefile.am`" - if [ ! "x$_marker_found" = "x" ] ; then - $VERBOSE_ECHO "${_marker_found_message}Makefile.am" - break - fi - fi - done - if [ "x${_marker_found}" = "x" ] ; then - _suggest_foreign=no - for file in AUTHORS COPYING ChangeLog INSTALL NEWS README ; do - if [ ! -f $file ] ; then - $VERBOSE_ECHO "Touching ${file} since it does not exist" - _suggest_foreign=yes - touch $file - fi - done - - if [ "x${_suggest_foreign}" = "xyes" ] ; then - $ECHO - $ECHO "Warning: Several files expected of projects that conform to the GNU" - $ECHO "coding standards were not found. The files were automatically added" - $ECHO "for you since you do not have a 'foreign' declaration specified." - $ECHO - $ECHO "Considered adding 'foreign' to AM_INIT_AUTOMAKE in `basename \"$CONFIGURE\"`" - if test -f "`dirname \"$CONFIGURE\"/Makefile.am`" ; then - $ECHO "or to AUTOMAKE_OPTIONS in your top-level Makefile.am file." - fi - $ECHO - fi - fi - - ################################################## - # make sure certain generated files do not exist # - ################################################## - for file in config.guess config.sub ltmain.sh ; do - if test -f "${_aux_dir}/${file}" ; then - $VERBOSE_ECHO "mv -f \"${_aux_dir}/${file}\" \"${_aux_dir}/${file}.backup\"" - mv -f "${_aux_dir}/${file}" "${_aux_dir}/${file}.backup" - fi - done - - ############################ - # search alternate m4 dirs # - ############################ - SEARCH_DIRS="" - for dir in m4 ; do - if [ -d $dir ] ; then - $VERBOSE_ECHO "Found extra aclocal search directory: $dir" - SEARCH_DIRS="$SEARCH_DIRS -I $dir" - fi - done - - ###################################### - # remove any previous build products # - ###################################### - if test -d autom4te.cache ; then - $VERBOSE_ECHO "Found an autom4te.cache directory, deleting it" - $VERBOSE_ECHO "rm -rf autom4te.cache" - rm -rf autom4te.cache - fi -# tcl/tk (and probably others) have a customized aclocal.m4, so can't delete it -# if test -f aclocal.m4 ; then -# $VERBOSE_ECHO "Found an aclocal.m4 file, deleting it" -# $VERBOSE_ECHO "rm -f aclocal.m4" -# rm -f aclocal.m4 -# fi - -} # end of initialize() - - -############## -# initialize # -############## - -# stash path -START_PATH="`pwd`" - -# Before running autoreconf or manual steps, some prep detection work -# is necessary or useful. Only needs to occur once per directory, but -# does need to traverse the entire subconfigure hierarchy to protect -# files from being clobbered even by autoreconf. -recursive_protect - -# start from where we started -cd "$START_PATH" - -# get ready to process -initialize - - -######################################### -# DOWNLOAD_GNULIB_CONFIG_GUESS FUNCTION # -######################################### - -# TODO - should make sure wget/curl exist and/or work before trying to -# use them. - -download_gnulib_config_guess () { - # abuse gitweb to download gnulib's latest config.guess via HTTP - config_guess_temp="config.guess.$$.download" - ret=1 - for __cmd in wget curl fetch ; do - $VERBOSE_ECHO "Checking for command ${__cmd}" - ${__cmd} --version > /dev/null 2>&1 - ret=$? - if [ ! $ret = 0 ] ; then - continue - fi - - __cmd_version=`${__cmd} --version | head -n 1 | sed -e 's/^[^0-9]\+//' -e 's/ .*//'` - $VERBOSE_ECHO "Found ${__cmd} ${__cmd_version}" - - opts="" - case ${__cmd} in - wget) - opts="-O" - ;; - curl) - opts="-o" - ;; - fetch) - opts="-t 5 -f" - ;; - esac - - $VERBOSE_ECHO "Running $__cmd \"${CONFIG_GUESS_URL}\" $opts \"${config_guess_temp}\"" - eval "$__cmd \"${CONFIG_GUESS_URL}\" $opts \"${config_guess_temp}\"" > /dev/null 2>&1 - if [ $? = 0 ] ; then - mv -f "${config_guess_temp}" ${_aux_dir}/config.guess - ret=0 - break - fi - done - - if [ ! $ret = 0 ] ; then - $ECHO "Warning: config.guess download failed from: $CONFIG_GUESS_URL" - rm -f "${config_guess_temp}" - fi -} - - -############################## -# LIBTOOLIZE_NEEDED FUNCTION # -############################## -libtoolize_needed () { - ret=1 # means no, don't need libtoolize - for feature in AC_PROG_LIBTOOL AM_PROG_LIBTOOL LT_INIT ; do - $VERBOSE_ECHO "Searching for $feature in $CONFIGURE" - found="`grep \"^$feature.*\" $CONFIGURE`" - if [ ! "x$found" = "x" ] ; then - ret=0 # means yes, need to run libtoolize - break - fi - done - return ${ret} -} - - - -############################################ -# prepare build via autoreconf or manually # -############################################ -reconfigure_manually=no -if [ "x$HAVE_AUTORECONF" = "xyes" ] ; then - $ECHO - $ECHO $ECHO_N "Automatically preparing build ... $ECHO_C" - - $VERBOSE_ECHO "$AUTORECONF $SEARCH_DIRS $AUTORECONF_OPTIONS" - autoreconf_output="`$AUTORECONF $SEARCH_DIRS $AUTORECONF_OPTIONS 2>&1`" - ret=$? - $VERBOSE_ECHO "$autoreconf_output" - - if [ ! $ret = 0 ] ; then - if [ "x$HAVE_ALT_LIBTOOLIZE" = "xyes" ] ; then - if [ ! "x`echo \"$autoreconf_output\" | grep libtoolize | grep \"No such file or directory\"`" = "x" ] ; then - $ECHO - $ECHO "Warning: autoreconf failed but due to what is usually a common libtool" - $ECHO "misconfiguration issue. This problem is encountered on systems that" - $ECHO "have installed libtoolize under a different name without providing a" - $ECHO "symbolic link or without setting the LIBTOOLIZE environment variable." - $ECHO - $ECHO "Restarting the preparation steps with LIBTOOLIZE set to $LIBTOOLIZE" - - export LIBTOOLIZE - RUN_RECURSIVE=no - export RUN_RECURSIVE - untrap_abnormal - - $VERBOSE_ECHO sh $AUTOGEN_SH "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9" - sh "$AUTOGEN_SH" "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9" - exit $? - fi - fi - - $ECHO "Warning: $AUTORECONF failed" - - if test -f ltmain.sh ; then - $ECHO "libtoolize being run by autoreconf is not creating ltmain.sh in the auxillary directory like it should" - fi - - $ECHO "Attempting to run the preparation steps individually" - reconfigure_manually=yes - else - if [ "x$DOWNLOAD" = "xyes" ] ; then - if libtoolize_needed ; then - download_gnulib_config_guess - fi - fi - fi -else - reconfigure_manually=yes -fi - - -############################ -# LIBTOOL_FAILURE FUNCTION # -############################ -libtool_failure ( ) { - - # libtool is rather error-prone in comparison to the other - # autotools and this routine attempts to compensate for some - # common failures. the output after a libtoolize failure is - # parsed for an error related to AC_PROG_LIBTOOL and if found, we - # attempt to inject a project-provided libtool.m4 file. - - _autoconf_output="$1" - - if [ "x$RUN_RECURSIVE" = "xno" ] ; then - # we already tried the libtool.m4, don't try again - return 1 - fi - - if test -f "$LIBTOOL_M4" ; then - found_libtool="`$ECHO $_autoconf_output | grep AC_PROG_LIBTOOL`" - if test ! "x$found_libtool" = "x" ; then - if test -f acinclude.m4 ; then - rm -f acinclude.m4.$$.backup - $VERBOSE_ECHO "cat acinclude.m4 > acinclude.m4.$$.backup" - cat acinclude.m4 > acinclude.m4.$$.backup - fi - $VERBOSE_ECHO "cat \"$LIBTOOL_M4\" >> acinclude.m4" - chmod u+w acinclude.m4 - cat "$LIBTOOL_M4" >> acinclude.m4 - - # don't keep doing this - RUN_RECURSIVE=no - export RUN_RECURSIVE - untrap_abnormal - - $ECHO - $ECHO "Restarting the preparation steps with libtool macros in acinclude.m4" - $VERBOSE_ECHO sh $AUTOGEN_SH "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9" - sh "$AUTOGEN_SH" "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9" - exit $? - fi - fi -} - - -########################### -# MANUAL_AUTOGEN FUNCTION # -########################### -manual_autogen ( ) { - - ################################################## - # Manual preparation steps taken are as follows: # - # aclocal [-I m4] # - # libtoolize --automake -c -f # - # aclocal [-I m4] # - # autoconf -f # - # autoheader # - # automake -a -c -f # - ################################################## - - ########### - # aclocal # - ########### - $VERBOSE_ECHO "$ACLOCAL $SEARCH_DIRS $ACLOCAL_OPTIONS" - aclocal_output="`$ACLOCAL $SEARCH_DIRS $ACLOCAL_OPTIONS 2>&1`" - ret=$? - $VERBOSE_ECHO "$aclocal_output" - if [ ! $ret = 0 ] ; then $ECHO "ERROR: $ACLOCAL failed" && exit 2 ; fi - - ############## - # libtoolize # - ############## - if libtoolize_needed ; then - if [ "x$HAVE_LIBTOOLIZE" = "xyes" ] ; then - $VERBOSE_ECHO "$LIBTOOLIZE $LIBTOOLIZE_OPTIONS" - libtoolize_output="`$LIBTOOLIZE $LIBTOOLIZE_OPTIONS 2>&1`" - ret=$? - $VERBOSE_ECHO "$libtoolize_output" - - if [ ! $ret = 0 ] ; then $ECHO "ERROR: $LIBTOOLIZE failed" && exit 2 ; fi - else - if [ "x$HAVE_ALT_LIBTOOLIZE" = "xyes" ] ; then - $VERBOSE_ECHO "$LIBTOOLIZE $ALT_LIBTOOLIZE_OPTIONS" - libtoolize_output="`$LIBTOOLIZE $ALT_LIBTOOLIZE_OPTIONS 2>&1`" - ret=$? - $VERBOSE_ECHO "$libtoolize_output" - - if [ ! $ret = 0 ] ; then $ECHO "ERROR: $LIBTOOLIZE failed" && exit 2 ; fi - fi - fi - - ########### - # aclocal # - ########### - # re-run again as instructed by libtoolize - $VERBOSE_ECHO "$ACLOCAL $SEARCH_DIRS $ACLOCAL_OPTIONS" - aclocal_output="`$ACLOCAL $SEARCH_DIRS $ACLOCAL_OPTIONS 2>&1`" - ret=$? - $VERBOSE_ECHO "$aclocal_output" - - # libtoolize might put ltmain.sh in the wrong place - if test -f ltmain.sh ; then - if test ! -f "${_aux_dir}/ltmain.sh" ; then - $ECHO - $ECHO "Warning: $LIBTOOLIZE is creating ltmain.sh in the wrong directory" - $ECHO - $ECHO "Fortunately, the problem can be worked around by simply copying the" - $ECHO "file to the appropriate location (${_aux_dir}/). This has been done for you." - $ECHO - $VERBOSE_ECHO "cp -p ltmain.sh \"${_aux_dir}/ltmain.sh\"" - cp -p ltmain.sh "${_aux_dir}/ltmain.sh" - $ECHO $ECHO_N "Continuing build preparation ... $ECHO_C" - fi - fi # ltmain.sh - - if [ "x$DOWNLOAD" = "xyes" ] ; then - download_gnulib_config_guess - fi - fi # libtoolize_needed - - ############ - # autoconf # - ############ - $VERBOSE_ECHO - $VERBOSE_ECHO "$AUTOCONF $AUTOCONF_OPTIONS" - autoconf_output="`$AUTOCONF $AUTOCONF_OPTIONS 2>&1`" - ret=$? - $VERBOSE_ECHO "$autoconf_output" - - if [ ! $ret = 0 ] ; then - # retry without the -f and check for usage of macros that are too new - ac2_59_macros="AC_C_RESTRICT AC_INCLUDES_DEFAULT AC_LANG_ASSERT AC_LANG_WERROR AS_SET_CATFILE" - ac2_55_macros="AC_COMPILER_IFELSE AC_FUNC_MBRTOWC AC_HEADER_STDBOOL AC_LANG_CONFTEST AC_LANG_SOURCE AC_LANG_PROGRAM AC_LANG_CALL AC_LANG_FUNC_TRY_LINK AC_MSG_FAILURE AC_PREPROC_IFELSE" - ac2_54_macros="AC_C_BACKSLASH_A AC_CONFIG_LIBOBJ_DIR AC_GNU_SOURCE AC_PROG_EGREP AC_PROG_FGREP AC_REPLACE_FNMATCH AC_FUNC_FNMATCH_GNU AC_FUNC_REALLOC AC_TYPE_MBSTATE_T" - - macros_to_search="" - ac_major="`echo ${AUTOCONF_VERSION}. | cut -d. -f1 | sed 's/[^0-9]//g'`" - ac_minor="`echo ${AUTOCONF_VERSION}. | cut -d. -f2 | sed 's/[^0-9]//g'`" - - if [ $ac_major -lt 2 ] ; then - macros_to_search="$ac2_59_macros $ac2_55_macros $ac2_54_macros" - else - if [ $ac_minor -lt 54 ] ; then - macros_to_search="$ac2_59_macros $ac2_55_macros $ac2_54_macros" - elif [ $ac_minor -lt 55 ] ; then - macros_to_search="$ac2_59_macros $ac2_55_macros" - elif [ $ac_minor -lt 59 ] ; then - macros_to_search="$ac2_59_macros" - fi - fi - - configure_ac_macros=__none__ - for feature in $macros_to_search ; do - $VERBOSE_ECHO "Searching for $feature in $CONFIGURE" - found="`grep \"^$feature.*\" $CONFIGURE`" - if [ ! "x$found" = "x" ] ; then - if [ "x$configure_ac_macros" = "x__none__" ] ; then - configure_ac_macros="$feature" - else - configure_ac_macros="$feature $configure_ac_macros" - fi - fi - done - if [ ! "x$configure_ac_macros" = "x__none__" ] ; then - $ECHO - $ECHO "Warning: Unsupported macros were found in $CONFIGURE" - $ECHO - $ECHO "The `basename \"$CONFIGURE\"` file was scanned in order to determine if any" - $ECHO "unsupported macros are used that exceed the minimum version" - $ECHO "settings specified within this file. As such, the following macros" - $ECHO "should be removed from configure.ac or the version numbers in this" - $ECHO "file should be increased:" - $ECHO - $ECHO "$configure_ac_macros" - $ECHO - $ECHO $ECHO_N "Ignorantly continuing build preparation ... $ECHO_C" - fi - - ################### - # autoconf, retry # - ################### - $VERBOSE_ECHO - $VERBOSE_ECHO "$AUTOCONF" - autoconf_output="`$AUTOCONF 2>&1`" - ret=$? - $VERBOSE_ECHO "$autoconf_output" - - if [ ! $ret = 0 ] ; then - # test if libtool is busted - libtool_failure "$autoconf_output" - - # let the user know what went wrong - cat < -Provides: tikzit -Description: TikZiT is a GTK+ application that allows the creation and modification of TeX diagrams written using the pgf/TikZ macro library. It is especially geared toward rapidly creating "dot"-diagrams for use in academic papers. diff --git a/tikzit-old/configure.ac b/tikzit-old/configure.ac deleted file mode 100644 index a86156b..0000000 --- a/tikzit-old/configure.ac +++ /dev/null @@ -1,141 +0,0 @@ -# -*- Autoconf -*- -# Process this file with autoconf to produce a configure script. - -AC_PREREQ([2.60]) -AC_INIT([TikZiT], [1.1], - [http://sourceforge.net/apps/trac/tikzit], - [tikzit], - [http://tikzit.sourceforge.net]) -AM_INIT_AUTOMAKE([1.10 foreign subdir-objects -Wall -Werror]) -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -AC_OUTPUT(Makefile - src/Makefile - share/Makefile -) -AC_CONFIG_SRCDIR([src/gtk/main.m]) - -m4_include([m4/objc.m4]) - -# Checks for programs. -AC_PROG_OBJC([gcc clang objc objcc]) -AC_LANG([Objective C]) - -AC_CHECK_PROGS([FLEX], [flex lex], [flex]) -AS_IF([$FLEX --version 2>/dev/null | grep "^flex" >/dev/null 2>/dev/null],[], - [ - AC_MSG_WARN([flex not found; this may cause problems for developers]) - # in case a lex that wasn't flex was found - FLEX=flex - ]) -AM_MISSING_PROG([LEX], [$FLEX]) - -AC_CHECK_PROGS([BISON], [bison yacc], [bison]) -AS_IF([$BISON --version 2>/dev/null | grep "^bison" >/dev/null 2>/dev/null],[], - [ - AC_MSG_WARN([bison not found; this may cause problems for developers]) - # in case a yacc that wasn't bison was found - BISON=bison - ]) -AM_MISSING_PROG([YACC], [$BISON]) - -# Checks for libraries. -FOUNDATION_OBJCFLAGS=`eval "gnustep-config --objc-flags"` -AS_IF([test "x$FOUNDATION_OBJCFLAGS" = "x"], - [AC_MSG_ERROR([GNUstep not found])]) -FOUNDATION_LIBS=`eval "gnustep-config --base-libs"` -AS_IF([test "x$FOUNDATION_LIBS" = "x"], - [AC_MSG_ERROR([GNUstep not found])]) -AC_SUBST([FOUNDATION_OBJCFLAGS]) -AC_SUBST([FOUNDATION_LIBS]) - -TZ_TEST_OBJCFLAGS="$FOUNDATION_OBJCFLAGS" -TZ_TEST_LDFLAGS="$FOUNDATION_LIBS" - -TZ_OBJC_FOUNDATION -AS_IF([test "x$tz_cv_objc_foundation" != "xyes"], - [AC_MSG_ERROR([Objective C Foundation not found -- missing gnustep-base(-devel)?])]) - -AC_ARG_WITH([poppler], AS_HELP_STRING([--without-poppler], [Ignore presence of poppler, disabling preview support])) - -AS_IF([test "x$with_poppler" != "xno"], - [ - AC_MSG_CHECKING([for poppler-glib]) - PKG_CHECK_EXISTS([poppler-glib >= 0.10], - [have_poppler=yes], - [have_poppler=no]) - AS_IF([test "x$have_poppler" = "xyes"], - [ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_POPPLER, 1) - ], - [ - AC_MSG_RESULT([no]) - AS_IF([test "x$with_poppler" = "xyes"], - [AC_MSG_ERROR([poppler requested but not found (note that poppler-glib is required)])] - ) - ]) - ], - [have_poppler=no]) -AM_CONDITIONAL([HAVE_POPPLER],[test "x$have_poppler" = "xyes"]) - -# Test all the pkg-config stuff together, so that -# dependencies and duplicate flags are correctly handled -AS_IF([test "x$have_poppler" = "xyes"], - [PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.18.0 gdk-pixbuf-2.0 >= 2.16.0 pango >= 1.16 cairo >= 1.4 poppler-glib >= 0.10])], - [PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.18.0 gdk-pixbuf-2.0 >= 2.16.0 pango >= 1.16 cairo >= 1.4])]) - -# Checks for header files. -AC_FUNC_ALLOCA -AC_CHECK_HEADERS([inttypes.h libintl.h limits.h malloc.h stddef.h stdint.h stdlib.h string.h unistd.h]) - -# Checks for typedefs, structures, and compiler characteristics. -AC_TYPE_INT16_T -AC_TYPE_INT32_T -AC_TYPE_INT8_T -AC_TYPE_SIZE_T -AC_TYPE_UINT16_T -AC_TYPE_UINT32_T -AC_TYPE_UINT64_T -AC_TYPE_UINT8_T -AC_HEADER_STDBOOL -AC_HEADER_STAT -AC_CHECK_HEADERS([stdint.h inttypes.h unistd.h sys/time.h time.h]) - -# Checks for library functions. -AC_FUNC_MALLOC -AC_FUNC_REALLOC -AC_CHECK_FUNCS([floor gettimeofday memset mkdtemp sqrt strdup]) - -TZ_OBJC2_FEATURES -AS_IF([test "x$tz_cv_objc_properties$tz_cv_objc_fast_enumeration$tz_cv_objc_optional_keyword" != "xyesyesyes"], - [AC_MSG_ERROR([Your Objective C compiler does not support the required Objective C 2 features])]) - -dnl ---------------------------------------------------------------------------- -dnl -dnl platform-specific stuff. - -AC_CANONICAL_HOST -have_msw="no" -case $host_os in - - *mingw32*) - have_msw="yes" - OBJCFLAGS="$OBJCFLAGS -mwindows" - AC_SUBST([WINDOWS]) - AC_SUBST([WIN32]) - AC_SUBST([_WIN32]) - ;; - -esac - -AM_CONDITIONAL([WINDOWS],[test "x$have_msw" = "xyes"]) - -AS_IF([test "x$with_poppler" != "xno"], - [AS_IF([test "x$have_poppler" != "xyes"], - AC_MSG_WARN([poppler-glib was not found; preview support will be disabled]) - )] - ) - -AC_OUTPUT - -# vi:sts=2:sw=2:et diff --git a/tikzit-old/customshape.png b/tikzit-old/customshape.png deleted file mode 100755 index cff8275..0000000 Binary files a/tikzit-old/customshape.png and /dev/null differ diff --git a/tikzit-old/docs/Doxyfile b/tikzit-old/docs/Doxyfile deleted file mode 100644 index 70a27f7..0000000 --- a/tikzit-old/docs/Doxyfile +++ /dev/null @@ -1,1600 +0,0 @@ -# Doxyfile 1.6.3 - -# This file describes the settings to be used by the documentation system -# doxygen (www.doxygen.org) for a project -# -# All text after a hash (#) is considered a comment and will be ignored -# The format is: -# TAG = value [value, ...] -# For lists items can also be appended using: -# TAG += value [value, ...] -# Values that contain spaces should be placed between quotes (" ") - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- - -# This tag specifies the encoding used for all characters in the config file -# that follow. The default is UTF-8 which is also the encoding used for all -# text before the first occurrence of this tag. Doxygen uses libiconv (or the -# iconv built into libc) for the transcoding. See -# http://www.gnu.org/software/libiconv for the list of possible encodings. - -DOXYFILE_ENCODING = UTF-8 - -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded -# by quotes) that should identify the project. - -PROJECT_NAME = TikZiT - -# The PROJECT_NUMBER tag can be used to enter a project or revision number. -# This could be handy for archiving the generated documentation or -# if some version control system is used. - -PROJECT_NUMBER = 0.3 - -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) -# base path where the generated documentation will be put. -# If a relative path is entered, it will be relative to the location -# where doxygen was started. If left blank the current directory will be used. - -OUTPUT_DIRECTORY = doxygen - -# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create -# 4096 sub-directories (in 2 levels) under the output directory of each output -# format and will distribute the generated files over these directories. -# Enabling this option can be useful when feeding doxygen a huge amount of -# source files, where putting all generated files in the same directory would -# otherwise cause performance problems for the file system. - -CREATE_SUBDIRS = NO - -# The OUTPUT_LANGUAGE tag is used to specify the language in which all -# documentation generated by doxygen is written. Doxygen will use this -# information to generate all constant output in the proper language. -# The default language is English, other supported languages are: -# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, -# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, -# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English -# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, -# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, -# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. - -OUTPUT_LANGUAGE = English - -# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will -# include brief member descriptions after the members that are listed in -# the file and class documentation (similar to JavaDoc). -# Set to NO to disable this. - -BRIEF_MEMBER_DESC = YES - -# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend -# the brief description of a member or function before the detailed description. -# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the -# brief descriptions will be completely suppressed. - -REPEAT_BRIEF = YES - -# This tag implements a quasi-intelligent brief description abbreviator -# that is used to form the text in various listings. Each string -# in this list, if found as the leading text of the brief description, will be -# stripped from the text and the result after processing the whole list, is -# used as the annotated text. Otherwise, the brief description is used as-is. -# If left blank, the following values are used ("$name" is automatically -# replaced with the name of the entity): "The $name class" "The $name widget" -# "The $name file" "is" "provides" "specifies" "contains" -# "represents" "a" "an" "the" - -ABBREVIATE_BRIEF = "The $name class" \ - "The $name widget" \ - "The $name file" \ - is \ - provides \ - specifies \ - contains \ - represents \ - a \ - an \ - the - -# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# Doxygen will generate a detailed section even if there is only a brief -# description. - -ALWAYS_DETAILED_SEC = NO - -# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all -# inherited members of a class in the documentation of that class as if those -# members were ordinary class members. Constructors, destructors and assignment -# operators of the base classes will not be shown. - -INLINE_INHERITED_MEMB = NO - -# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full -# path before files name in the file list and in the header files. If set -# to NO the shortest path that makes the file name unique will be used. - -FULL_PATH_NAMES = YES - -# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag -# can be used to strip a user-defined part of the path. Stripping is -# only done if one of the specified strings matches the left-hand part of -# the path. The tag can be used to show relative paths in the file list. -# If left blank the directory from which doxygen is run is used as the -# path to strip. - -STRIP_FROM_PATH = /Applications/ - -# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of -# the path mentioned in the documentation of a class, which tells -# the reader which header file to include in order to use a class. -# If left blank only the name of the header file containing the class -# definition is used. Otherwise one should specify the include paths that -# are normally passed to the compiler using the -I flag. - -STRIP_FROM_INC_PATH = - -# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter -# (but less readable) file names. This can be useful is your file systems -# doesn't support long names like on DOS, Mac, or CD-ROM. - -SHORT_NAMES = NO - -# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen -# will interpret the first line (until the first dot) of a JavaDoc-style -# comment as the brief description. If set to NO, the JavaDoc -# comments will behave just like regular Qt-style comments -# (thus requiring an explicit @brief command for a brief description.) - -JAVADOC_AUTOBRIEF = NO - -# If the QT_AUTOBRIEF tag is set to YES then Doxygen will -# interpret the first line (until the first dot) of a Qt-style -# comment as the brief description. If set to NO, the comments -# will behave just like regular Qt-style comments (thus requiring -# an explicit \brief command for a brief description.) - -QT_AUTOBRIEF = NO - -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen -# treat a multi-line C++ special comment block (i.e. a block of //! or /// -# comments) as a brief description. This used to be the default behaviour. -# The new default is to treat a multi-line C++ comment block as a detailed -# description. Set this tag to YES if you prefer the old behaviour instead. - -MULTILINE_CPP_IS_BRIEF = NO - -# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented -# member inherits the documentation from any documented member that it -# re-implements. - -INHERIT_DOCS = YES - -# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce -# a new page for each member. If set to NO, the documentation of a member will -# be part of the file/class/namespace that contains it. - -SEPARATE_MEMBER_PAGES = NO - -# The TAB_SIZE tag can be used to set the number of spaces in a tab. -# Doxygen uses this value to replace tabs by spaces in code fragments. - -TAB_SIZE = 8 - -# This tag can be used to specify a number of aliases that acts -# as commands in the documentation. An alias has the form "name=value". -# For example adding "sideeffect=\par Side Effects:\n" will allow you to -# put the command \sideeffect (or @sideeffect) in the documentation, which -# will result in a user-defined paragraph with heading "Side Effects:". -# You can put \n's in the value part of an alias to insert newlines. - -ALIASES = - -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C -# sources only. Doxygen will then generate output that is more tailored for C. -# For instance, some of the names that are used will be different. The list -# of all members will be omitted, etc. - -OPTIMIZE_OUTPUT_FOR_C = NO - -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java -# sources only. Doxygen will then generate output that is more tailored for -# Java. For instance, namespaces will be presented as packages, qualified -# scopes will look different, etc. - -OPTIMIZE_OUTPUT_JAVA = NO - -# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran -# sources only. Doxygen will then generate output that is more tailored for -# Fortran. - -OPTIMIZE_FOR_FORTRAN = NO - -# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL -# sources. Doxygen will then generate output that is tailored for -# VHDL. - -OPTIMIZE_OUTPUT_VHDL = NO - -# Doxygen selects the parser to use depending on the extension of the files it parses. -# With this tag you can assign which parser to use for a given extension. -# Doxygen has a built-in mapping, but you can override or extend it using this tag. -# The format is ext=language, where ext is a file extension, and language is one of -# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, -# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat -# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), -# use: inc=Fortran f=C. Note that for custom extensions you also need to set -# FILE_PATTERNS otherwise the files are not read by doxygen. - -EXTENSION_MAPPING = - -# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want -# to include (a tag file for) the STL sources as input, then you should -# set this tag to YES in order to let doxygen match functions declarations and -# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. -# func(std::string) {}). This also make the inheritance and collaboration -# diagrams that involve STL classes more complete and accurate. - -BUILTIN_STL_SUPPORT = NO - -# If you use Microsoft's C++/CLI language, you should set this option to YES to -# enable parsing support. - -CPP_CLI_SUPPORT = NO - -# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. -# Doxygen will parse them like normal C++ but will assume all classes use public -# instead of private inheritance when no explicit protection keyword is present. - -SIP_SUPPORT = NO - -# For Microsoft's IDL there are propget and propput attributes to indicate getter -# and setter methods for a property. Setting this option to YES (the default) -# will make doxygen to replace the get and set methods by a property in the -# documentation. This will only work if the methods are indeed getting or -# setting a simple type. If this is not the case, or you want to show the -# methods anyway, you should set this option to NO. - -IDL_PROPERTY_SUPPORT = YES - -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES, then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default -# all members of a group must be documented explicitly. - -DISTRIBUTE_GROUP_DOC = NO - -# Set the SUBGROUPING tag to YES (the default) to allow class member groups of -# the same type (for instance a group of public functions) to be put as a -# subgroup of that type (e.g. under the Public Functions section). Set it to -# NO to prevent subgrouping. Alternatively, this can be done per class using -# the \nosubgrouping command. - -SUBGROUPING = YES - -# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum -# is documented as struct, union, or enum with the name of the typedef. So -# typedef struct TypeS {} TypeT, will appear in the documentation as a struct -# with name TypeT. When disabled the typedef will appear as a member of a file, -# namespace, or class. And the struct will be named TypeS. This can typically -# be useful for C code in case the coding convention dictates that all compound -# types are typedef'ed and only the typedef is referenced, never the tag name. - -TYPEDEF_HIDES_STRUCT = NO - -# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to -# determine which symbols to keep in memory and which to flush to disk. -# When the cache is full, less often used symbols will be written to disk. -# For small to medium size projects (<1000 input files) the default value is -# probably good enough. For larger projects a too small cache size can cause -# doxygen to be busy swapping symbols to and from disk most of the time -# causing a significant performance penality. -# If the system has enough physical memory increasing the cache will improve the -# performance by keeping more symbols in memory. Note that the value works on -# a logarithmic scale so increasing the size by one will rougly double the -# memory usage. The cache size is given by this formula: -# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, -# corresponding to a cache size of 2^16 = 65536 symbols - -SYMBOL_CACHE_SIZE = 0 - -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- - -# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in -# documentation are documented, even if no documentation was available. -# Private class members and static file members will be hidden unless -# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES - -EXTRACT_ALL = YES - -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class -# will be included in the documentation. - -EXTRACT_PRIVATE = NO - -# If the EXTRACT_STATIC tag is set to YES all static members of a file -# will be included in the documentation. - -EXTRACT_STATIC = NO - -# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) -# defined locally in source files will be included in the documentation. -# If set to NO only classes defined in header files are included. - -EXTRACT_LOCAL_CLASSES = YES - -# This flag is only useful for Objective-C code. When set to YES local -# methods, which are defined in the implementation section but not in -# the interface are included in the documentation. -# If set to NO (the default) only methods in the interface are included. - -EXTRACT_LOCAL_METHODS = NO - -# If this flag is set to YES, the members of anonymous namespaces will be -# extracted and appear in the documentation as a namespace called -# 'anonymous_namespace{file}', where file will be replaced with the base -# name of the file that contains the anonymous namespace. By default -# anonymous namespace are hidden. - -EXTRACT_ANON_NSPACES = NO - -# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all -# undocumented members of documented classes, files or namespaces. -# If set to NO (the default) these members will be included in the -# various overviews, but no documentation section is generated. -# This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_MEMBERS = YES - -# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. -# If set to NO (the default) these classes will be included in the various -# overviews. This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_CLASSES = YES - -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all -# friend (class|struct|union) declarations. -# If set to NO (the default) these declarations will be included in the -# documentation. - -HIDE_FRIEND_COMPOUNDS = NO - -# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any -# documentation blocks found inside the body of a function. -# If set to NO (the default) these blocks will be appended to the -# function's detailed documentation block. - -HIDE_IN_BODY_DOCS = NO - -# The INTERNAL_DOCS tag determines if documentation -# that is typed after a \internal command is included. If the tag is set -# to NO (the default) then the documentation will be excluded. -# Set it to YES to include the internal documentation. - -INTERNAL_DOCS = NO - -# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate -# file names in lower-case letters. If set to YES upper-case letters are also -# allowed. This is useful if you have classes or files whose names only differ -# in case and if your file system supports case sensitive file names. Windows -# and Mac users are advised to set this option to NO. - -CASE_SENSE_NAMES = NO - -# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen -# will show members with their full class and namespace scopes in the -# documentation. If set to YES the scope will be hidden. - -HIDE_SCOPE_NAMES = NO - -# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen -# will put a list of the files that are included by a file in the documentation -# of that file. - -SHOW_INCLUDE_FILES = YES - -# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen -# will list include files with double quotes in the documentation -# rather than with sharp brackets. - -FORCE_LOCAL_INCLUDES = NO - -# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] -# is inserted in the documentation for inline members. - -INLINE_INFO = YES - -# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen -# will sort the (detailed) documentation of file and class members -# alphabetically by member name. If set to NO the members will appear in -# declaration order. - -SORT_MEMBER_DOCS = YES - -# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the -# brief documentation of file, namespace and class members alphabetically -# by member name. If set to NO (the default) the members will appear in -# declaration order. - -SORT_BRIEF_DOCS = NO - -# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen -# will sort the (brief and detailed) documentation of class members so that -# constructors and destructors are listed first. If set to NO (the default) -# the constructors will appear in the respective orders defined by -# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. -# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO -# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO. - -SORT_MEMBERS_CTORS_1ST = NO - -# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the -# hierarchy of group names into alphabetical order. If set to NO (the default) -# the group names will appear in their defined order. - -SORT_GROUP_NAMES = NO - -# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be -# sorted by fully-qualified names, including namespaces. If set to -# NO (the default), the class list will be sorted only by class name, -# not including the namespace part. -# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. -# Note: This option applies only to the class list, not to the -# alphabetical list. - -SORT_BY_SCOPE_NAME = NO - -# The GENERATE_TODOLIST tag can be used to enable (YES) or -# disable (NO) the todo list. This list is created by putting \todo -# commands in the documentation. - -GENERATE_TODOLIST = YES - -# The GENERATE_TESTLIST tag can be used to enable (YES) or -# disable (NO) the test list. This list is created by putting \test -# commands in the documentation. - -GENERATE_TESTLIST = YES - -# The GENERATE_BUGLIST tag can be used to enable (YES) or -# disable (NO) the bug list. This list is created by putting \bug -# commands in the documentation. - -GENERATE_BUGLIST = YES - -# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or -# disable (NO) the deprecated list. This list is created by putting -# \deprecated commands in the documentation. - -GENERATE_DEPRECATEDLIST= YES - -# The ENABLED_SECTIONS tag can be used to enable conditional -# documentation sections, marked by \if sectionname ... \endif. - -ENABLED_SECTIONS = - -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines -# the initial value of a variable or define consists of for it to appear in -# the documentation. If the initializer consists of more lines than specified -# here it will be hidden. Use a value of 0 to hide initializers completely. -# The appearance of the initializer of individual variables and defines in the -# documentation can be controlled using \showinitializer or \hideinitializer -# command in the documentation regardless of this setting. - -MAX_INITIALIZER_LINES = 30 - -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated -# at the bottom of the documentation of classes and structs. If set to YES the -# list will mention the files that were used to generate the documentation. - -SHOW_USED_FILES = YES - -# If the sources in your project are distributed over multiple directories -# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy -# in the documentation. The default is NO. - -SHOW_DIRECTORIES = NO - -# Set the SHOW_FILES tag to NO to disable the generation of the Files page. -# This will remove the Files entry from the Quick Index and from the -# Folder Tree View (if specified). The default is YES. - -SHOW_FILES = YES - -# Set the SHOW_NAMESPACES tag to NO to disable the generation of the -# Namespaces page. This will remove the Namespaces entry from the Quick Index -# and from the Folder Tree View (if specified). The default is YES. - -SHOW_NAMESPACES = YES - -# The FILE_VERSION_FILTER tag can be used to specify a program or script that -# doxygen should invoke to get the current version for each file (typically from -# the version control system). Doxygen will invoke the program by executing (via -# popen()) the command , where is the value of -# the FILE_VERSION_FILTER tag, and is the name of an input file -# provided by doxygen. Whatever the program writes to standard output -# is used as the file version. See the manual for examples. - -FILE_VERSION_FILTER = - -# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by -# doxygen. The layout file controls the global structure of the generated output files -# in an output format independent way. The create the layout file that represents -# doxygen's defaults, run doxygen with the -l option. You can optionally specify a -# file name after the option, if omitted DoxygenLayout.xml will be used as the name -# of the layout file. - -LAYOUT_FILE = - -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- - -# The QUIET tag can be used to turn on/off the messages that are generated -# by doxygen. Possible values are YES and NO. If left blank NO is used. - -QUIET = NO - -# The WARNINGS tag can be used to turn on/off the warning messages that are -# generated by doxygen. Possible values are YES and NO. If left blank -# NO is used. - -WARNINGS = YES - -# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings -# for undocumented members. If EXTRACT_ALL is set to YES then this flag will -# automatically be disabled. - -WARN_IF_UNDOCUMENTED = YES - -# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as not documenting some -# parameters in a documented function, or documenting parameters that -# don't exist or using markup commands wrongly. - -WARN_IF_DOC_ERROR = YES - -# This WARN_NO_PARAMDOC option can be abled to get warnings for -# functions that are documented, but have no documentation for their parameters -# or return value. If set to NO (the default) doxygen will only warn about -# wrong or incomplete parameter documentation, but not about the absence of -# documentation. - -WARN_NO_PARAMDOC = YES - -# The WARN_FORMAT tag determines the format of the warning messages that -# doxygen can produce. The string should contain the $file, $line, and $text -# tags, which will be replaced by the file and line number from which the -# warning originated and the warning text. Optionally the format may contain -# $version, which will be replaced by the version of the file (if it could -# be obtained via FILE_VERSION_FILTER) - -WARN_FORMAT = "$file:$line: $text" - -# The WARN_LOGFILE tag can be used to specify a file to which warning -# and error messages should be written. If left blank the output is written -# to stderr. - -WARN_LOGFILE = - -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- - -# The INPUT tag can be used to specify the files and/or directories that contain -# documented source files. You may enter file names like "myfile.cpp" or -# directories like "/usr/src/myproject". Separate the files or directories -# with spaces. - -INPUT = ../src - -# This tag can be used to specify the character encoding of the source files -# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is -# also the default input encoding. Doxygen uses libiconv (or the iconv built -# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for -# the list of possible encodings. - -INPUT_ENCODING = UTF-8 - -# If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank the following patterns are tested: -# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx -# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 - -FILE_PATTERNS = *.c \ - *.cc \ - *.cxx \ - *.cpp \ - *.c++ \ - *.d \ - *.java \ - *.ii \ - *.ixx \ - *.ipp \ - *.i++ \ - *.inl \ - *.h \ - *.hh \ - *.hxx \ - *.hpp \ - *.h++ \ - *.idl \ - *.odl \ - *.cs \ - *.php \ - *.php3 \ - *.inc \ - *.m \ - *.mm \ - *.dox \ - *.py \ - *.f90 \ - *.f \ - *.vhd \ - *.vhdl - -# The RECURSIVE tag can be used to turn specify whether or not subdirectories -# should be searched for input files as well. Possible values are YES and NO. -# If left blank NO is used. - -RECURSIVE = YES - -# The EXCLUDE tag can be used to specify files and/or directories that should -# excluded from the INPUT source files. This way you can easily exclude a -# subdirectory from a directory tree whose root is specified with the INPUT tag. - -EXCLUDE = ../src/ParseKit - -# The EXCLUDE_SYMLINKS tag can be used select whether or not files or -# directories that are symbolic links (a Unix filesystem feature) are excluded -# from the input. - -EXCLUDE_SYMLINKS = NO - -# If the value of the INPUT tag contains directories, you can use the -# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. Note that the wildcards are matched -# against the file with absolute path, so to exclude all test directories -# for example use the pattern */test/* - -EXCLUDE_PATTERNS = - -# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names -# (namespaces, classes, functions, etc.) that should be excluded from the -# output. The symbol name can be a fully qualified name, a word, or if the -# wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test - -EXCLUDE_SYMBOLS = - -# The EXAMPLE_PATH tag can be used to specify one or more files or -# directories that contain example code fragments that are included (see -# the \include command). - -EXAMPLE_PATH = - -# If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank all files are included. - -EXAMPLE_PATTERNS = * - -# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be -# searched for input files to be used with the \include or \dontinclude -# commands irrespective of the value of the RECURSIVE tag. -# Possible values are YES and NO. If left blank NO is used. - -EXAMPLE_RECURSIVE = NO - -# The IMAGE_PATH tag can be used to specify one or more files or -# directories that contain image that are included in the documentation (see -# the \image command). - -IMAGE_PATH = - -# The INPUT_FILTER tag can be used to specify a program that doxygen should -# invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command , where -# is the value of the INPUT_FILTER tag, and is the name of an -# input file. Doxygen will then use the output that the filter program writes -# to standard output. If FILTER_PATTERNS is specified, this tag will be -# ignored. - -INPUT_FILTER = - -# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern -# basis. Doxygen will compare the file name with each pattern and apply the -# filter if there is a match. The filters are a list of the form: -# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further -# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER -# is applied to all files. - -FILTER_PATTERNS = - -# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER) will be used to filter the input files when producing source -# files to browse (i.e. when SOURCE_BROWSER is set to YES). - -FILTER_SOURCE_FILES = NO - -#--------------------------------------------------------------------------- -# configuration options related to source browsing -#--------------------------------------------------------------------------- - -# If the SOURCE_BROWSER tag is set to YES then a list of source files will -# be generated. Documented entities will be cross-referenced with these sources. -# Note: To get rid of all source code in the generated output, make sure also -# VERBATIM_HEADERS is set to NO. - -SOURCE_BROWSER = YES - -# Setting the INLINE_SOURCES tag to YES will include the body -# of functions and classes directly in the documentation. - -INLINE_SOURCES = NO - -# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct -# doxygen to hide any special comment blocks from generated source code -# fragments. Normal C and C++ comments will always remain visible. - -STRIP_CODE_COMMENTS = YES - -# If the REFERENCED_BY_RELATION tag is set to YES -# then for each documented function all documented -# functions referencing it will be listed. - -REFERENCED_BY_RELATION = NO - -# If the REFERENCES_RELATION tag is set to YES -# then for each documented function all documented entities -# called/used by that function will be listed. - -REFERENCES_RELATION = NO - -# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) -# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from -# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will -# link to the source code. Otherwise they will link to the documentation. - -REFERENCES_LINK_SOURCE = YES - -# If the USE_HTAGS tag is set to YES then the references to source code -# will point to the HTML generated by the htags(1) tool instead of doxygen -# built-in source browser. The htags tool is part of GNU's global source -# tagging system (see http://www.gnu.org/software/global/global.html). You -# will need version 4.8.6 or higher. - -USE_HTAGS = NO - -# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen -# will generate a verbatim copy of the header file for each class for -# which an include is specified. Set to NO to disable this. - -VERBATIM_HEADERS = NO - -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- - -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index -# of all compounds will be generated. Enable this if the project -# contains a lot of classes, structs, unions or interfaces. - -ALPHABETICAL_INDEX = NO - -# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then -# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns -# in which this list will be split (can be a number in the range [1..20]) - -COLS_IN_ALPHA_INDEX = 5 - -# In case all classes in a project start with a common prefix, all -# classes will be put under the same header in the alphabetical index. -# The IGNORE_PREFIX tag can be used to specify one or more prefixes that -# should be ignored while generating the index headers. - -IGNORE_PREFIX = - -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- - -# If the GENERATE_HTML tag is set to YES (the default) Doxygen will -# generate HTML output. - -GENERATE_HTML = YES - -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `html' will be used as the default path. - -HTML_OUTPUT = html - -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for -# each generated HTML page (for example: .htm,.php,.asp). If it is left blank -# doxygen will generate files with .html extension. - -HTML_FILE_EXTENSION = .html - -# The HTML_HEADER tag can be used to specify a personal HTML header for -# each generated HTML page. If it is left blank doxygen will generate a -# standard header. - -HTML_HEADER = - -# The HTML_FOOTER tag can be used to specify a personal HTML footer for -# each generated HTML page. If it is left blank doxygen will generate a -# standard footer. - -HTML_FOOTER = - -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading -# style sheet that is used by each HTML page. It can be used to -# fine-tune the look of the HTML output. If the tag is left blank doxygen -# will generate a default style sheet. Note that doxygen will try to copy -# the style sheet file to the HTML output directory, so don't put your own -# stylesheet in the HTML output directory as well, or it will be erased! - -HTML_STYLESHEET = - -# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML -# page will contain the date and time when the page was generated. Setting -# this to NO can help when comparing the output of multiple runs. - -HTML_TIMESTAMP = YES - -# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, -# files or namespaces will be aligned in HTML using tables. If set to -# NO a bullet list will be used. - -HTML_ALIGN_MEMBERS = YES - -# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML -# documentation will contain sections that can be hidden and shown after the -# page has loaded. For this to work a browser that supports -# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox -# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). - -HTML_DYNAMIC_SECTIONS = NO - -# If the GENERATE_DOCSET tag is set to YES, additional index files -# will be generated that can be used as input for Apple's Xcode 3 -# integrated development environment, introduced with OSX 10.5 (Leopard). -# To create a documentation set, doxygen will generate a Makefile in the -# HTML output directory. Running make will produce the docset in that -# directory and running "make install" will install the docset in -# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find -# it at startup. -# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information. - -GENERATE_DOCSET = NO - -# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the -# feed. A documentation feed provides an umbrella under which multiple -# documentation sets from a single provider (such as a company or product suite) -# can be grouped. - -DOCSET_FEEDNAME = "Doxygen generated docs" - -# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that -# should uniquely identify the documentation set bundle. This should be a -# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen -# will append .docset to the name. - -DOCSET_BUNDLE_ID = org.doxygen.Project - -# If the GENERATE_HTMLHELP tag is set to YES, additional index files -# will be generated that can be used as input for tools like the -# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) -# of the generated HTML documentation. - -GENERATE_HTMLHELP = NO - -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can -# be used to specify the file name of the resulting .chm file. You -# can add a path in front of the file if the result should not be -# written to the html output directory. - -CHM_FILE = - -# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can -# be used to specify the location (absolute path including file name) of -# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run -# the HTML help compiler on the generated index.hhp. - -HHC_LOCATION = - -# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag -# controls if a separate .chi index file is generated (YES) or that -# it should be included in the master .chm file (NO). - -GENERATE_CHI = NO - -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING -# is used to encode HtmlHelp index (hhk), content (hhc) and project file -# content. - -CHM_INDEX_ENCODING = - -# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag -# controls whether a binary table of contents is generated (YES) or a -# normal table of contents (NO) in the .chm file. - -BINARY_TOC = NO - -# The TOC_EXPAND flag can be set to YES to add extra items for group members -# to the contents of the HTML help documentation and to the tree view. - -TOC_EXPAND = NO - -# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER -# are set, an additional index file will be generated that can be used as input for -# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated -# HTML documentation. - -GENERATE_QHP = NO - -# If the QHG_LOCATION tag is specified, the QCH_FILE tag can -# be used to specify the file name of the resulting .qch file. -# The path specified is relative to the HTML output folder. - -QCH_FILE = - -# The QHP_NAMESPACE tag specifies the namespace to use when generating -# Qt Help Project output. For more information please see -# http://doc.trolltech.com/qthelpproject.html#namespace - -QHP_NAMESPACE = org.doxygen.Project - -# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating -# Qt Help Project output. For more information please see -# http://doc.trolltech.com/qthelpproject.html#virtual-folders - -QHP_VIRTUAL_FOLDER = doc - -# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add. -# For more information please see -# http://doc.trolltech.com/qthelpproject.html#custom-filters - -QHP_CUST_FILTER_NAME = - -# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see -# Qt Help Project / Custom Filters. - -QHP_CUST_FILTER_ATTRS = - -# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's -# filter section matches. -# Qt Help Project / Filter Attributes. - -QHP_SECT_FILTER_ATTRS = - -# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can -# be used to specify the location of Qt's qhelpgenerator. -# If non-empty doxygen will try to run qhelpgenerator on the generated -# .qhp file. - -QHG_LOCATION = - -# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files -# will be generated, which together with the HTML files, form an Eclipse help -# plugin. To install this plugin and make it available under the help contents -# menu in Eclipse, the contents of the directory containing the HTML and XML -# files needs to be copied into the plugins directory of eclipse. The name of -# the directory within the plugins directory should be the same as -# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before -# the help appears. - -GENERATE_ECLIPSEHELP = NO - -# A unique identifier for the eclipse help plugin. When installing the plugin -# the directory name containing the HTML and XML files should also have -# this name. - -ECLIPSE_DOC_ID = org.doxygen.Project - -# The DISABLE_INDEX tag can be used to turn on/off the condensed index at -# top of each HTML page. The value NO (the default) enables the index and -# the value YES disables it. - -DISABLE_INDEX = NO - -# This tag can be used to set the number of enum values (range [1..20]) -# that doxygen will group on one line in the generated HTML documentation. - -ENUM_VALUES_PER_LINE = 4 - -# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index -# structure should be generated to display hierarchical information. -# If the tag value is set to YES, a side panel will be generated -# containing a tree-like index structure (just like the one that -# is generated for HTML Help). For this to work a browser that supports -# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). -# Windows users are probably better off using the HTML help feature. - -GENERATE_TREEVIEW = NO - -# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, -# and Class Hierarchy pages using a tree view instead of an ordered list. - -USE_INLINE_TREES = NO - -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be -# used to set the initial width (in pixels) of the frame in which the tree -# is shown. - -TREEVIEW_WIDTH = 250 - -# Use this tag to change the font size of Latex formulas included -# as images in the HTML documentation. The default is 10. Note that -# when you change the font size after a successful doxygen run you need -# to manually remove any form_*.png images from the HTML output directory -# to force them to be regenerated. - -FORMULA_FONTSIZE = 10 - -# When the SEARCHENGINE tag is enabled doxygen will generate a search box -# for the HTML output. The underlying search engine uses javascript -# and DHTML and should work on any modern browser. Note that when using -# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets -# (GENERATE_DOCSET) there is already a search function so this one should -# typically be disabled. For large projects the javascript based search engine -# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. - -SEARCHENGINE = NO - -# When the SERVER_BASED_SEARCH tag is enabled the search engine will be -# implemented using a PHP enabled web server instead of at the web client -# using Javascript. Doxygen will generate the search PHP script and index -# file to put on the web server. The advantage of the server -# based approach is that it scales better to large projects and allows -# full text search. The disadvances is that it is more difficult to setup -# and does not have live searching capabilities. - -SERVER_BASED_SEARCH = NO - -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- - -# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will -# generate Latex output. - -GENERATE_LATEX = NO - -# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `latex' will be used as the default path. - -LATEX_OUTPUT = latex - -# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be -# invoked. If left blank `latex' will be used as the default command name. -# Note that when enabling USE_PDFLATEX this option is only used for -# generating bitmaps for formulas in the HTML output, but not in the -# Makefile that is written to the output directory. - -LATEX_CMD_NAME = latex - -# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to -# generate index for LaTeX. If left blank `makeindex' will be used as the -# default command name. - -MAKEINDEX_CMD_NAME = makeindex - -# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact -# LaTeX documents. This may be useful for small projects and may help to -# save some trees in general. - -COMPACT_LATEX = NO - -# The PAPER_TYPE tag can be used to set the paper type that is used -# by the printer. Possible values are: a4, a4wide, letter, legal and -# executive. If left blank a4wide will be used. - -PAPER_TYPE = a4wide - -# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX -# packages that should be included in the LaTeX output. - -EXTRA_PACKAGES = - -# The LATEX_HEADER tag can be used to specify a personal LaTeX header for -# the generated latex document. The header should contain everything until -# the first chapter. If it is left blank doxygen will generate a -# standard header. Notice: only use this tag if you know what you are doing! - -LATEX_HEADER = - -# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated -# is prepared for conversion to pdf (using ps2pdf). The pdf file will -# contain links (just like the HTML output) instead of page references -# This makes the output suitable for online browsing using a pdf viewer. - -PDF_HYPERLINKS = YES - -# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of -# plain latex in the generated Makefile. Set this option to YES to get a -# higher quality PDF documentation. - -USE_PDFLATEX = YES - -# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. -# command to the generated LaTeX files. This will instruct LaTeX to keep -# running if errors occur, instead of asking the user for help. -# This option is also used when generating formulas in HTML. - -LATEX_BATCHMODE = NO - -# If LATEX_HIDE_INDICES is set to YES then doxygen will not -# include the index chapters (such as File Index, Compound Index, etc.) -# in the output. - -LATEX_HIDE_INDICES = NO - -# If LATEX_SOURCE_CODE is set to YES then doxygen will include -# source code with syntax highlighting in the LaTeX output. -# Note that which sources are shown also depends on other settings -# such as SOURCE_BROWSER. - -LATEX_SOURCE_CODE = NO - -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- - -# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output -# The RTF output is optimized for Word 97 and may not look very pretty with -# other RTF readers or editors. - -GENERATE_RTF = NO - -# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `rtf' will be used as the default path. - -RTF_OUTPUT = rtf - -# If the COMPACT_RTF tag is set to YES Doxygen generates more compact -# RTF documents. This may be useful for small projects and may help to -# save some trees in general. - -COMPACT_RTF = NO - -# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated -# will contain hyperlink fields. The RTF file will -# contain links (just like the HTML output) instead of page references. -# This makes the output suitable for online browsing using WORD or other -# programs which support those fields. -# Note: wordpad (write) and others do not support links. - -RTF_HYPERLINKS = NO - -# Load stylesheet definitions from file. Syntax is similar to doxygen's -# config file, i.e. a series of assignments. You only have to provide -# replacements, missing definitions are set to their default value. - -RTF_STYLESHEET_FILE = - -# Set optional variables used in the generation of an rtf document. -# Syntax is similar to doxygen's config file. - -RTF_EXTENSIONS_FILE = - -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- - -# If the GENERATE_MAN tag is set to YES (the default) Doxygen will -# generate man pages - -GENERATE_MAN = NO - -# The MAN_OUTPUT tag is used to specify where the man pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `man' will be used as the default path. - -MAN_OUTPUT = man - -# The MAN_EXTENSION tag determines the extension that is added to -# the generated man pages (default is the subroutine's section .3) - -MAN_EXTENSION = .3 - -# If the MAN_LINKS tag is set to YES and Doxygen generates man output, -# then it will generate one additional man file for each entity -# documented in the real man page(s). These additional files -# only source the real man page, but without them the man command -# would be unable to find the correct page. The default is NO. - -MAN_LINKS = NO - -#--------------------------------------------------------------------------- -# configuration options related to the XML output -#--------------------------------------------------------------------------- - -# If the GENERATE_XML tag is set to YES Doxygen will -# generate an XML file that captures the structure of -# the code including all documentation. - -GENERATE_XML = YES - -# The XML_OUTPUT tag is used to specify where the XML pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `xml' will be used as the default path. - -XML_OUTPUT = xml - -# The XML_SCHEMA tag can be used to specify an XML schema, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_SCHEMA = - -# The XML_DTD tag can be used to specify an XML DTD, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_DTD = - -# If the XML_PROGRAMLISTING tag is set to YES Doxygen will -# dump the program listings (including syntax highlighting -# and cross-referencing information) to the XML output. Note that -# enabling this will significantly increase the size of the XML output. - -XML_PROGRAMLISTING = YES - -#--------------------------------------------------------------------------- -# configuration options for the AutoGen Definitions output -#--------------------------------------------------------------------------- - -# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will -# generate an AutoGen Definitions (see autogen.sf.net) file -# that captures the structure of the code including all -# documentation. Note that this feature is still experimental -# and incomplete at the moment. - -GENERATE_AUTOGEN_DEF = NO - -#--------------------------------------------------------------------------- -# configuration options related to the Perl module output -#--------------------------------------------------------------------------- - -# If the GENERATE_PERLMOD tag is set to YES Doxygen will -# generate a Perl module file that captures the structure of -# the code including all documentation. Note that this -# feature is still experimental and incomplete at the -# moment. - -GENERATE_PERLMOD = NO - -# If the PERLMOD_LATEX tag is set to YES Doxygen will generate -# the necessary Makefile rules, Perl scripts and LaTeX code to be able -# to generate PDF and DVI output from the Perl module output. - -PERLMOD_LATEX = NO - -# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be -# nicely formatted so it can be parsed by a human reader. This is useful -# if you want to understand what is going on. On the other hand, if this -# tag is set to NO the size of the Perl module output will be much smaller -# and Perl will parse it just the same. - -PERLMOD_PRETTY = YES - -# The names of the make variables in the generated doxyrules.make file -# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. -# This is useful so different doxyrules.make files included by the same -# Makefile don't overwrite each other's variables. - -PERLMOD_MAKEVAR_PREFIX = - -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- - -# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will -# evaluate all C-preprocessor directives found in the sources and include -# files. - -ENABLE_PREPROCESSING = YES - -# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro -# names in the source code. If set to NO (the default) only conditional -# compilation will be performed. Macro expansion can be done in a controlled -# way by setting EXPAND_ONLY_PREDEF to YES. - -MACRO_EXPANSION = NO - -# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES -# then the macro expansion is limited to the macros specified with the -# PREDEFINED and EXPAND_AS_DEFINED tags. - -EXPAND_ONLY_PREDEF = NO - -# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files -# in the INCLUDE_PATH (see below) will be search if a #include is found. - -SEARCH_INCLUDES = YES - -# The INCLUDE_PATH tag can be used to specify one or more directories that -# contain include files that are not input files but should be processed by -# the preprocessor. - -INCLUDE_PATH = - -# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard -# patterns (like *.h and *.hpp) to filter out the header-files in the -# directories. If left blank, the patterns specified with FILE_PATTERNS will -# be used. - -INCLUDE_FILE_PATTERNS = - -# The PREDEFINED tag can be used to specify one or more macro names that -# are defined before the preprocessor is started (similar to the -D option of -# gcc). The argument of the tag is a list of macros of the form: name -# or name=definition (no spaces). If the definition and the = are -# omitted =1 is assumed. To prevent a macro definition from being -# undefined via #undef or recursively expanded use the := operator -# instead of the = operator. - -PREDEFINED = __APPLE__ - -# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then -# this tag can be used to specify a list of macro names that should be expanded. -# The macro definition that is found in the sources will be used. -# Use the PREDEFINED tag if you want to use a different macro definition. - -EXPAND_AS_DEFINED = - -# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then -# doxygen's preprocessor will remove all function-like macros that are alone -# on a line, have an all uppercase name, and do not end with a semicolon. Such -# function macros are typically used for boiler-plate code, and will confuse -# the parser if not removed. - -SKIP_FUNCTION_MACROS = YES - -#--------------------------------------------------------------------------- -# Configuration::additions related to external references -#--------------------------------------------------------------------------- - -# The TAGFILES option can be used to specify one or more tagfiles. -# Optionally an initial location of the external documentation -# can be added for each tagfile. The format of a tag file without -# this location is as follows: -# TAGFILES = file1 file2 ... -# Adding location for the tag files is done as follows: -# TAGFILES = file1=loc1 "file2 = loc2" ... -# where "loc1" and "loc2" can be relative or absolute paths or -# URLs. If a location is present for each tag, the installdox tool -# does not have to be run to correct the links. -# Note that each tag file must have a unique name -# (where the name does NOT include the path) -# If a tag file is not located in the directory in which doxygen -# is run, you must also specify the path to the tagfile here. - -TAGFILES = - -# When a file name is specified after GENERATE_TAGFILE, doxygen will create -# a tag file that is based on the input files it reads. - -GENERATE_TAGFILE = - -# If the ALLEXTERNALS tag is set to YES all external classes will be listed -# in the class index. If set to NO only the inherited external classes -# will be listed. - -ALLEXTERNALS = NO - -# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed -# in the modules index. If set to NO, only the current project's groups will -# be listed. - -EXTERNAL_GROUPS = YES - -# The PERL_PATH should be the absolute path and name of the perl script -# interpreter (i.e. the result of `which perl'). - -PERL_PATH = /usr/bin/perl - -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- - -# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will -# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base -# or super classes. Setting the tag to NO turns the diagrams off. Note that -# this option is superseded by the HAVE_DOT option below. This is only a -# fallback. It is recommended to install and use dot, since it yields more -# powerful graphs. - -CLASS_DIAGRAMS = NO - -# You can define message sequence charts within doxygen comments using the \msc -# command. Doxygen will then run the mscgen tool (see -# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the -# documentation. The MSCGEN_PATH tag allows you to specify the directory where -# the mscgen tool resides. If left empty the tool is assumed to be found in the -# default search path. - -MSCGEN_PATH = /Applications/Doxygen.app/Contents/Resources/ - -# If set to YES, the inheritance and collaboration graphs will hide -# inheritance and usage relations if the target is undocumented -# or is not a class. - -HIDE_UNDOC_RELATIONS = YES - -# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is -# available from the path. This tool is part of Graphviz, a graph visualization -# toolkit from AT&T and Lucent Bell Labs. The other options in this section -# have no effect if this option is set to NO (the default) - -HAVE_DOT = YES - -# By default doxygen will write a font called FreeSans.ttf to the output -# directory and reference it in all dot files that doxygen generates. This -# font does not include all possible unicode characters however, so when you need -# these (or just want a differently looking font) you can specify the font name -# using DOT_FONTNAME. You need need to make sure dot is able to find the font, -# which can be done by putting it in a standard location or by setting the -# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory -# containing the font. - -DOT_FONTNAME = FreeSans - -# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. -# The default size is 10pt. - -DOT_FONTSIZE = 10 - -# By default doxygen will tell dot to use the output directory to look for the -# FreeSans.ttf font (which doxygen will put there itself). If you specify a -# different font using DOT_FONTNAME you can set the path where dot -# can find it using this tag. - -DOT_FONTPATH = - -# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect inheritance relations. Setting this tag to YES will force the -# the CLASS_DIAGRAMS tag to NO. - -CLASS_GRAPH = YES - -# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect implementation dependencies (inheritance, containment, and -# class references variables) of the class with other documented classes. - -COLLABORATION_GRAPH = YES - -# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for groups, showing the direct groups dependencies - -GROUP_GRAPHS = YES - -# If the UML_LOOK tag is set to YES doxygen will generate inheritance and -# collaboration diagrams in a style similar to the OMG's Unified Modeling -# Language. - -UML_LOOK = NO - -# If set to YES, the inheritance and collaboration graphs will show the -# relations between templates and their instances. - -TEMPLATE_RELATIONS = NO - -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT -# tags are set to YES then doxygen will generate a graph for each documented -# file showing the direct and indirect include dependencies of the file with -# other documented files. - -INCLUDE_GRAPH = YES - -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and -# HAVE_DOT tags are set to YES then doxygen will generate a graph for each -# documented header file showing the documented files that directly or -# indirectly include this file. - -INCLUDED_BY_GRAPH = YES - -# If the CALL_GRAPH and HAVE_DOT options are set to YES then -# doxygen will generate a call dependency graph for every global function -# or class method. Note that enabling this option will significantly increase -# the time of a run. So in most cases it will be better to enable call graphs -# for selected functions only using the \callgraph command. - -CALL_GRAPH = YES - -# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then -# doxygen will generate a caller dependency graph for every global function -# or class method. Note that enabling this option will significantly increase -# the time of a run. So in most cases it will be better to enable caller -# graphs for selected functions only using the \callergraph command. - -CALLER_GRAPH = NO - -# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen -# will graphical hierarchy of all classes instead of a textual one. - -GRAPHICAL_HIERARCHY = YES - -# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES -# then doxygen will show the dependencies a directory has on other directories -# in a graphical way. The dependency relations are determined by the #include -# relations between the files in the directories. - -DIRECTORY_GRAPH = YES - -# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images -# generated by dot. Possible values are png, jpg, or gif -# If left blank png will be used. - -DOT_IMAGE_FORMAT = png - -# The tag DOT_PATH can be used to specify the path where the dot tool can be -# found. If left blank, it is assumed the dot tool can be found in the path. - -DOT_PATH = /Applications/Doxygen.app/Contents/Resources/ - -# The DOTFILE_DIRS tag can be used to specify one or more directories that -# contain dot files that are included in the documentation (see the -# \dotfile command). - -DOTFILE_DIRS = - -# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of -# nodes that will be shown in the graph. If the number of nodes in a graph -# becomes larger than this value, doxygen will truncate the graph, which is -# visualized by representing a node as a red box. Note that doxygen if the -# number of direct children of the root node in a graph is already larger than -# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note -# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. - -DOT_GRAPH_MAX_NODES = 50 - -# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the -# graphs generated by dot. A depth value of 3 means that only nodes reachable -# from the root by following a path via at most 3 edges will be shown. Nodes -# that lay further from the root node will be omitted. Note that setting this -# option to 1 or 2 may greatly reduce the computation time needed for large -# code bases. Also note that the size of a graph can be further restricted by -# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. - -MAX_DOT_GRAPH_DEPTH = 1000 - -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not -# seem to support this out of the box. Warning: Depending on the platform used, -# enabling this option may lead to badly anti-aliased labels on the edges of -# a graph (i.e. they become hard to read). - -DOT_TRANSPARENT = NO - -# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output -# files in one run (i.e. multiple -o and -T options on the command line). This -# makes dot run faster, but since only newer versions of dot (>1.8.10) -# support this, this feature is disabled by default. - -DOT_MULTI_TARGETS = NO - -# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will -# generate a legend page explaining the meaning of the various boxes and -# arrows in the dot generated graphs. - -GENERATE_LEGEND = YES - -# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will -# remove the intermediate dot files that are used to generate -# the various graphs. - -DOT_CLEANUP = YES diff --git a/tikzit-old/draw-ellipse.png b/tikzit-old/draw-ellipse.png deleted file mode 100644 index d8e3e6f..0000000 Binary files a/tikzit-old/draw-ellipse.png and /dev/null differ diff --git a/tikzit-old/draw-path.png b/tikzit-old/draw-path.png deleted file mode 100644 index ec5e691..0000000 Binary files a/tikzit-old/draw-path.png and /dev/null differ diff --git a/tikzit-old/emblem-important.png b/tikzit-old/emblem-important.png deleted file mode 100644 index 81e9ed2..0000000 Binary files a/tikzit-old/emblem-important.png and /dev/null differ diff --git a/tikzit-old/emblem-unreadable-grey.png b/tikzit-old/emblem-unreadable-grey.png deleted file mode 100644 index 09572ab..0000000 Binary files a/tikzit-old/emblem-unreadable-grey.png and /dev/null differ diff --git a/tikzit-old/engine.png b/tikzit-old/engine.png deleted file mode 100755 index 1e45370..0000000 Binary files a/tikzit-old/engine.png and /dev/null differ diff --git a/tikzit-old/format-indent-less.png b/tikzit-old/format-indent-less.png deleted file mode 100644 index 7ced16f..0000000 Binary files a/tikzit-old/format-indent-less.png and /dev/null differ diff --git a/tikzit-old/m4/objc.m4 b/tikzit-old/m4/objc.m4 deleted file mode 100644 index 8c7cc78..0000000 --- a/tikzit-old/m4/objc.m4 +++ /dev/null @@ -1,135 +0,0 @@ -# Checks for a working Foundation -# tz_cv_objc_foundation -# to either "yes" or "no" -# -AC_DEFUN([TZ_OBJC_FOUNDATION], -[ -AC_LANG_ASSERT([Objective C]) -tz_old_objcflags="$OBJCFLAGS" -OBJCFLAGS="$OBJCFLAGS $TZ_TEST_OBJCFLAGS" - -AC_CACHE_CHECK([for Objective C Foundation], - [tz_cv_objc_foundation], -[AC_COMPILE_IFELSE( - [AC_LANG_SOURCE([[ -#import - -@interface TestObj : NSObject { - int intVar; - NSObject *objVar; - NSString *strVar; -} --(id)init; -@end - -@implementation TestObj --(id)init { - self = [super init]; - intVar = 0; - objVar = nil; - strVar = @"Foo"; - return self; -} -@end - -int main(void) { - TestObj *obj = [[TestObj alloc] init]; - [obj release]; - return 0; -} - ]])], - [tz_cv_objc_foundation=yes], - [tz_cv_objc_foundation=no])]) - -OBJCFLAGS="$tz_old_objcflags" -]) - - -# Checks for Objective C 2 feature support -# and sets the shell variables -# tz_cv_objc_properties -# tz_cv_objc_fast_enumeration -# tz_cv_objc_optional_keyword -# to either "yes" or "no" -# -AC_DEFUN([TZ_OBJC2_FEATURES], -[ -AC_LANG_ASSERT([Objective C]) -tz_old_objcflags="$OBJCFLAGS" -OBJCFLAGS="$OBJCFLAGS $TZ_TEST_OBJCFLAGS" - -AC_CACHE_CHECK([for Objective C 2 @property support], - [tz_cv_objc_properties], -[AC_COMPILE_IFELSE( - [AC_LANG_SOURCE([[ -#import - -@interface TestObj : NSObject { - int intProp1; - NSObject *copyObjProp; - NSObject *fooProp; -} -@property (assign,nonatomic) int intProp; -@property (retain,readonly) NSObject *retainObjProp; -@property (copy,readwrite) NSObject *copyObjProp; -@property (retain,getter=foo,setter=foo1:) NSObject *fooProp; -@end - -@implementation TestObj -@synthesize intProp=intProp1; -@dynamic retainObjProp; -- (NSObject*) retainObjProp { return nil; } -@synthesize copyObjProp; -@synthesize fooProp; -@end - -int main(void) { - TestObj *obj = [[TestObj alloc] init]; - obj.intProp = 4; - NSObject *result = obj.retainObjProp; - return 0; -} - ]])], - [tz_cv_objc_properties=yes], - [tz_cv_objc_properties=no])]) - - -AC_CACHE_CHECK([for Objective C 2 fast enumeration support], - [tz_cv_objc_fast_enumeration], -[AC_COMPILE_IFELSE( - [AC_LANG_SOURCE([[ -#import - -int main(void) { - NSArray *array = [NSArray arrayWithObjects: @"One", @"Two", @"Three", @"Four", nil]; - for (NSString *element in array) { - NSLog(@"element: %@", element); - } - return 0; -} - ]])], - [tz_cv_objc_fast_enumeration=yes], - [tz_cv_objc_fast_enumeration=no])]) - -AC_CACHE_CHECK([for Objective C 2 @optional support], - [tz_cv_objc_optional_keyword], -[AC_COMPILE_IFELSE( - [AC_LANG_SOURCE([[ -#import - -@protocol Foo -@optional -- (void) foo; -@required -- (void) bar; -@end - -int main(void) { - return 0; -} - ]])], - [tz_cv_objc_optional_keyword=yes], - [tz_cv_objc_optional_keyword=no])]) - -OBJCFLAGS="$tz_old_objcflags" -]) diff --git a/tikzit-old/preamble.png b/tikzit-old/preamble.png deleted file mode 100755 index d940d24..0000000 Binary files a/tikzit-old/preamble.png and /dev/null differ diff --git a/tikzit-old/scripts/generate_keys.rb b/tikzit-old/scripts/generate_keys.rb deleted file mode 100755 index b22439c..0000000 --- a/tikzit-old/scripts/generate_keys.rb +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/ruby -["dsaparam.pem", "dsa_priv.pem", "dsa_pub.pem"].each do |file| - if File.exist? file - puts "There's already a #{file} here! Move it aside or be more careful!" - end -end -`openssl dsaparam 2048 < /dev/urandom > dsaparam.pem` -`openssl gendsa dsaparam.pem -out dsa_priv.pem` -`openssl dsa -in dsa_priv.pem -pubout -out dsa_pub.pem` -`rm dsaparam.pem` -puts "\nGenerated private and public keys: dsa_priv.pem and dsa_pub.pem.\n -BACK UP YOUR PRIVATE KEY AND KEEP IT SAFE!\n -If you lose it, your users will be unable to upgrade!\n" \ No newline at end of file diff --git a/tikzit-old/scripts/prepare_release.sh b/tikzit-old/scripts/prepare_release.sh deleted file mode 100755 index 5f5edfc..0000000 --- a/tikzit-old/scripts/prepare_release.sh +++ /dev/null @@ -1,40 +0,0 @@ -set -o errexit - -PROJECT_NAME=TikZiT -APP_BUNDLE=xbuild/Release/$PROJECT_NAME.app - -VERSION=$(defaults read "$(pwd)/$APP_BUNDLE/Contents/Info" CFBundleVersion) -DOWNLOAD_BASE_URL="http://tikzit.sourceforge.net/appcast" -RELEASENOTES_URL="$DOWNLOAD_BASE_URL/rnotes.html" - -ARCHIVE_FILENAME="$PROJECT_NAME $VERSION.tar.bz2" -ARCHIVE_PATH="../www/htdocs/appcast/files/$ARCHIVE_FILENAME" -DOWNLOAD_URL="$DOWNLOAD_BASE_URL/files/$ARCHIVE_FILENAME" - -if [ -e "$ARCHIVE_PATH" ]; then - echo 'Archive already exists. Either remove this archive or increment version.' - exit 1 -fi - -tar cjf "$ARCHIVE_PATH" "$APP_BUNDLE" - -SIZE=$(stat -f %z "$ARCHIVE_PATH") -PUBDATE=$(LC_TIME=en_US date +"%a, %d %b %G %T %z") -SIGNATURE=$(scripts/sign_update.rb "$ARCHIVE_PATH" tikzit_dsa_priv.pem) - -cat < - Version $VERSION - - $RELEASENOTES_URL - - $PUBDATE - - -EOF diff --git a/tikzit-old/scripts/sign_update.rb b/tikzit-old/scripts/sign_update.rb deleted file mode 100755 index 6d03e2e..0000000 --- a/tikzit-old/scripts/sign_update.rb +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/ruby -if ARGV.length < 2 - puts "Usage: ruby sign_update.rb update_archive private_key" - exit -end - -puts `openssl dgst -sha1 -binary < "#{ARGV[0]}" | openssl dgst -dss1 -sign "#{ARGV[1]}" | openssl enc -base64` \ No newline at end of file diff --git a/tikzit-old/select-rectangular.png b/tikzit-old/select-rectangular.png deleted file mode 100644 index 866b602..0000000 Binary files a/tikzit-old/select-rectangular.png and /dev/null differ diff --git a/tikzit-old/shapes/cap.tikz b/tikzit-old/shapes/cap.tikz deleted file mode 100644 index a98ff39..0000000 --- a/tikzit-old/shapes/cap.tikz +++ /dev/null @@ -1,13 +0,0 @@ -\begin{tikzpicture} - \path [use as bounding box] (-2,-2) rectangle (2,2); - \begin{pgfonlayer}{nodelayer} - \node [style=none] (0) at (0, 0.75) {}; - \node [style=none] (1) at (-0.5, 0) {}; - \node [style=none] (2) at (0.5, 0) {}; - \end{pgfonlayer} - \begin{pgfonlayer}{edgelayer} - \draw [in=0, out=90] (2.center) to (0.center); - \draw [in=270, out=-90, looseness=0.75] (1.center) to (2.center); - \draw [in=90, out=180] (0.center) to (1.center); - \end{pgfonlayer} -\end{tikzpicture} \ No newline at end of file diff --git a/tikzit-old/shapes/copants.tikz b/tikzit-old/shapes/copants.tikz deleted file mode 100644 index d2b8e3c..0000000 --- a/tikzit-old/shapes/copants.tikz +++ /dev/null @@ -1,19 +0,0 @@ -\begin{tikzpicture} - \path [use as bounding box] (-2,-2) rectangle (2,2); - \begin{pgfonlayer}{nodelayer} - \node [style=none] (0) at (-1.5, 1) {}; - \node [style=none] (1) at (-0.5, 1) {}; - \node [style=none] (2) at (0.5, 1) {}; - \node [style=none] (3) at (1.5, 1) {}; - \node [style=none] (4) at (-0.5, -1) {}; - \node [style=none] (5) at (0.5, -1) {}; - \end{pgfonlayer} - \begin{pgfonlayer}{edgelayer} - \draw [in=-90, out=90, looseness=0.75] (5.center) to (3.center); - \draw [in=90, out=90, looseness=0.75] (4.center) to (5.center); - \draw [in=270, out=-90, looseness=0.75] (1.center) to (0.center); - \draw [in=270, out=-90, looseness=0.75] (3.center) to (2.center); - \draw [in=-270, out=-90, looseness=0.75] (0.center) to (4.center); - \draw [in=-90, out=-90, looseness=1.75] (2.center) to (1.center); - \end{pgfonlayer} -\end{tikzpicture} \ No newline at end of file diff --git a/tikzit-old/shapes/cup.tikz b/tikzit-old/shapes/cup.tikz deleted file mode 100644 index 1dc1faa..0000000 --- a/tikzit-old/shapes/cup.tikz +++ /dev/null @@ -1,13 +0,0 @@ -\begin{tikzpicture} - \path [use as bounding box] (-2,-2) rectangle (2,2); - \begin{pgfonlayer}{nodelayer} - \node [style=none] (0) at (-0.5, 0) {}; - \node [style=none] (1) at (0.5, 0) {}; - \node [style=none] (2) at (0, -0.75) {}; - \end{pgfonlayer} - \begin{pgfonlayer}{edgelayer} - \draw [in=0, out=-90] (1.center) to (2.center); - \draw [in=-270, out=90, looseness=0.75] (0.center) to (1.center); - \draw [in=-90, out=-180] (2.center) to (0.center); - \end{pgfonlayer} -\end{tikzpicture} \ No newline at end of file diff --git a/tikzit-old/shapes/oval.tikz b/tikzit-old/shapes/oval.tikz deleted file mode 100644 index b5d2891..0000000 --- a/tikzit-old/shapes/oval.tikz +++ /dev/null @@ -1,11 +0,0 @@ -\begin{tikzpicture} - \path [use as bounding box] (-2,-2) rectangle (2,2); - \begin{pgfonlayer}{nodelayer} - \node [style=none] (0) at (-0.5, 0) {}; - \node [style=none] (1) at (0.5, 0) {}; - \end{pgfonlayer} - \begin{pgfonlayer}{edgelayer} - \draw [in=90, out=90, looseness=0.75] (0.center) to (1.center); - \draw [in=-90, out=270, looseness=0.75] (1.center) to (0.center); - \end{pgfonlayer} -\end{tikzpicture} \ No newline at end of file diff --git a/tikzit-old/shapes/pants.tikz b/tikzit-old/shapes/pants.tikz deleted file mode 100644 index c2c15c2..0000000 --- a/tikzit-old/shapes/pants.tikz +++ /dev/null @@ -1,19 +0,0 @@ -\begin{tikzpicture} - \path [use as bounding box] (-2,-2) rectangle (2,2); - \begin{pgfonlayer}{nodelayer} - \node [style=none] (0) at (-0.5, 1) {}; - \node [style=none] (1) at (0.5, 1) {}; - \node [style=none] (2) at (-1.5, -1) {}; - \node [style=none] (3) at (-0.5, -1) {}; - \node [style=none] (4) at (0.5, -1) {}; - \node [style=none] (5) at (1.5, -1) {}; - \end{pgfonlayer} - \begin{pgfonlayer}{edgelayer} - \draw [in=90, out=90, looseness=1.75] (4.center) to (3.center); - \draw [in=270, out=90, looseness=0.75] (2.center) to (0.center); - \draw [in=-90, out=-90, looseness=0.75] (0.center) to (1.center); - \draw [in=90, out=-90, looseness=0.75] (1.center) to (5.center); - \draw [in=-270, out=90, looseness=0.75] (5.center) to (4.center); - \draw [in=-270, out=90, looseness=0.75] (3.center) to (2.center); - \end{pgfonlayer} -\end{tikzpicture} \ No newline at end of file diff --git a/tikzit-old/share/Makefile.am b/tikzit-old/share/Makefile.am deleted file mode 100644 index 658b4d9..0000000 --- a/tikzit-old/share/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -if WINDOWS -else -sharedir = $(datarootdir) -nobase_dist_share_DATA = \ - applications/tikzit.desktop \ - mime/packages/tikzit.xml \ - icons/hicolor/*/*/*.png \ - icons/hicolor/scalable/*/*.svg -endif - diff --git a/tikzit-old/share/applications/tikzit.desktop b/tikzit-old/share/applications/tikzit.desktop deleted file mode 100644 index 12b6fa5..0000000 --- a/tikzit-old/share/applications/tikzit.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Name=TikZit -Comment=Editor for PGF/TikZ-based node-and-edge graphs for LaTeX documents -GenericName=TikZ Graph Editor -MimeType=text/x-tikz -Exec=tikzit -Icon=tikzit -Categories=GTK;Graphics;Education;Science; -StartupNotify=false diff --git a/tikzit-old/share/icons/hicolor/128x128/apps/tikzit.png b/tikzit-old/share/icons/hicolor/128x128/apps/tikzit.png deleted file mode 100644 index e8ee92b..0000000 Binary files a/tikzit-old/share/icons/hicolor/128x128/apps/tikzit.png and /dev/null differ diff --git a/tikzit-old/share/icons/hicolor/128x128/mimetypes/text-x-tikz.png b/tikzit-old/share/icons/hicolor/128x128/mimetypes/text-x-tikz.png deleted file mode 100644 index 6b3bbe6..0000000 Binary files a/tikzit-old/share/icons/hicolor/128x128/mimetypes/text-x-tikz.png and /dev/null differ diff --git a/tikzit-old/share/icons/hicolor/16x16/apps/tikzit.png b/tikzit-old/share/icons/hicolor/16x16/apps/tikzit.png deleted file mode 100644 index 9b7a377..0000000 Binary files a/tikzit-old/share/icons/hicolor/16x16/apps/tikzit.png and /dev/null differ diff --git a/tikzit-old/share/icons/hicolor/16x16/mimetypes/text-x-tikz.png b/tikzit-old/share/icons/hicolor/16x16/mimetypes/text-x-tikz.png deleted file mode 100644 index 364e831..0000000 Binary files a/tikzit-old/share/icons/hicolor/16x16/mimetypes/text-x-tikz.png and /dev/null differ diff --git a/tikzit-old/share/icons/hicolor/22x22/apps/tikzit.png b/tikzit-old/share/icons/hicolor/22x22/apps/tikzit.png deleted file mode 100644 index be803da..0000000 Binary files a/tikzit-old/share/icons/hicolor/22x22/apps/tikzit.png and /dev/null differ diff --git a/tikzit-old/share/icons/hicolor/22x22/mimetypes/text-x-tikz.png b/tikzit-old/share/icons/hicolor/22x22/mimetypes/text-x-tikz.png deleted file mode 100644 index 6436a9e..0000000 Binary files a/tikzit-old/share/icons/hicolor/22x22/mimetypes/text-x-tikz.png and /dev/null differ diff --git a/tikzit-old/share/icons/hicolor/24x24/apps/tikzit.png b/tikzit-old/share/icons/hicolor/24x24/apps/tikzit.png deleted file mode 100644 index 478aeab..0000000 Binary files a/tikzit-old/share/icons/hicolor/24x24/apps/tikzit.png and /dev/null differ diff --git a/tikzit-old/share/icons/hicolor/32x32/apps/tikzit.png b/tikzit-old/share/icons/hicolor/32x32/apps/tikzit.png deleted file mode 100644 index 75174e1..0000000 Binary files a/tikzit-old/share/icons/hicolor/32x32/apps/tikzit.png and /dev/null differ diff --git a/tikzit-old/share/icons/hicolor/32x32/mimetypes/text-x-tikz.png b/tikzit-old/share/icons/hicolor/32x32/mimetypes/text-x-tikz.png deleted file mode 100644 index 7faaded..0000000 Binary files a/tikzit-old/share/icons/hicolor/32x32/mimetypes/text-x-tikz.png and /dev/null differ diff --git a/tikzit-old/share/icons/hicolor/48x48/apps/tikzit.png b/tikzit-old/share/icons/hicolor/48x48/apps/tikzit.png deleted file mode 100644 index 7186458..0000000 Binary files a/tikzit-old/share/icons/hicolor/48x48/apps/tikzit.png and /dev/null differ diff --git a/tikzit-old/share/icons/hicolor/48x48/mimetypes/text-x-tikz.png b/tikzit-old/share/icons/hicolor/48x48/mimetypes/text-x-tikz.png deleted file mode 100644 index d061ed9..0000000 Binary files a/tikzit-old/share/icons/hicolor/48x48/mimetypes/text-x-tikz.png and /dev/null differ diff --git a/tikzit-old/share/icons/hicolor/64x64/apps/tikzit.png b/tikzit-old/share/icons/hicolor/64x64/apps/tikzit.png deleted file mode 100644 index 1641e85..0000000 Binary files a/tikzit-old/share/icons/hicolor/64x64/apps/tikzit.png and /dev/null differ diff --git a/tikzit-old/share/icons/hicolor/64x64/mimetypes/text-x-tikz.png b/tikzit-old/share/icons/hicolor/64x64/mimetypes/text-x-tikz.png deleted file mode 100644 index 2197553..0000000 Binary files a/tikzit-old/share/icons/hicolor/64x64/mimetypes/text-x-tikz.png and /dev/null differ diff --git a/tikzit-old/share/icons/hicolor/scalable/apps/tikzit.svg b/tikzit-old/share/icons/hicolor/scalable/apps/tikzit.svg deleted file mode 100644 index dc5cc84..0000000 --- a/tikzit-old/share/icons/hicolor/scalable/apps/tikzit.svg +++ /dev/null @@ -1,79 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/tikzit-old/share/icons/hicolor/scalable/mimetypes/text-x-tikz.svg b/tikzit-old/share/icons/hicolor/scalable/mimetypes/text-x-tikz.svg deleted file mode 100644 index 1642e87..0000000 --- a/tikzit-old/share/icons/hicolor/scalable/mimetypes/text-x-tikz.svg +++ /dev/null @@ -1,488 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - text - plaintext - regular - script - shell - bash - python - perl - php - ruby - - - - - - Jakub Steiner - - - http://jimmac.musichall.cz - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tikzit-old/share/mime/packages/tikzit.xml b/tikzit-old/share/mime/packages/tikzit.xml deleted file mode 100644 index c6e7c0c..0000000 --- a/tikzit-old/share/mime/packages/tikzit.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/tikzit-old/share/tikzit b/tikzit-old/share/tikzit deleted file mode 120000 index a96aa0e..0000000 --- a/tikzit-old/share/tikzit +++ /dev/null @@ -1 +0,0 @@ -.. \ No newline at end of file diff --git a/tikzit-old/src/Makefile.am b/tikzit-old/src/Makefile.am deleted file mode 100644 index 5108e9c..0000000 --- a/tikzit-old/src/Makefile.am +++ /dev/null @@ -1,178 +0,0 @@ -if WINDOWS -sharedir = ../ -else -sharedir = @datarootdir@/tikzit -endif - -AM_OBJCFLAGS = @FOUNDATION_OBJCFLAGS@ \ - @GTK_CFLAGS@ \ - -I common \ - -I gtk \ - -DTIKZITSHAREDIR=\"$(sharedir)\" \ - -std=c99 \ - -D_GNU_SOURCE -LIBS = @FOUNDATION_LIBS@ \ - @GTK_LIBS@ -AM_YFLAGS = -d -PARSERFILES = common/tikzlexer.m common/tikzlexer.h common/tikzparser.m common/tikzparser.h -ICONFILES = ../draw-ellipse.png \ - ../draw-path.png \ - ../select-rectangular.png \ - ../transform-crop-and-resize.png \ - ../transform-move.png -EDGEDECFILES = ../AH_*.png ../ED_*.png - -bin_PROGRAMS = tikzit -BUILT_SOURCES = $(PARSERFILES) -tikzit_SOURCES = gtk/Application.m \ - gtk/BoundingBoxTool.m \ - gtk/CairoRenderContext.m \ - gtk/ColorRGB+IntegerListStorage.m \ - gtk/ColorRGB+Gtk.m \ - gtk/Configuration.m \ - gtk/ContextWindow.m \ - gtk/CreateEdgeTool.m \ - gtk/CreateNodeTool.m \ - gtk/Edge+Render.m \ - gtk/EdgeStyle+Gtk.m \ - gtk/EdgeStyle+Storage.m \ - gtk/EdgeStyleEditor.m \ - gtk/EdgeStyleSelector.m \ - gtk/EdgeStylesModel.m \ - gtk/EdgeStylesPalette.m \ - gtk/FileChooserDialog.m \ - gtk/HandTool.m \ - gtk/GraphEditorPanel.m \ - gtk/GraphRenderer.m \ - gtk/Menu.m \ - gtk/Node+Render.m \ - gtk/NodeStyle+Gtk.m \ - gtk/NodeStyle+Storage.m \ - gtk/NodeStyleEditor.m \ - gtk/NodeStylesModel.m \ - gtk/NodeStyleSelector.m \ - gtk/NodeStylesPalette.m \ - gtk/NSError+Glib.m \ - gtk/NSFileManager+Glib.m \ - gtk/NSString+Glib.m \ - gtk/PropertiesPane.m \ - gtk/PropertyListEditor.m \ - gtk/RecentManager.m \ - gtk/SelectTool.m \ - gtk/SelectionPane.m \ - gtk/SettingsDialog.m \ - gtk/Shape+Render.m \ - gtk/StyleManager+Storage.m \ - gtk/TikzDocument.m \ - gtk/ToolBox.m \ - gtk/WidgetSurface.m \ - gtk/Window.m \ - gtk/cairo_helpers.m \ - gtk/clipboard.m \ - gtk/gtkhelpers.m \ - gtk/logo.m \ - gtk/mkdtemp.m \ - gtk/main.m \ - gtk/tzstockitems.m \ - gtk/tztoolpalette.m \ - common/CircleShape.m \ - common/ColorRGB.m \ - common/DiamondShape.m \ - common/Edge.m \ - common/EdgeStyle.m \ - common/GraphChange.m \ - common/GraphElementData.m \ - common/Graph.m \ - common/Grid.m \ - common/Node.m \ - common/NodeStyle.m \ - common/NSError+Tikzit.m \ - common/NSFileManager+Utils.m \ - common/NSString+LatexConstants.m \ - common/NSString+Tikz.m \ - common/NSString+Util.m \ - common/PickSupport.m \ - common/PropertyHolder.m \ - common/GraphElementProperty.m \ - common/RColor.m \ - common/RectangleShape.m \ - common/RegularPolyShape.m \ - common/Shape.m \ - common/StyleManager.m \ - common/SupportDir.m \ - common/TikzGraphAssembler.m \ - common/TikzShape.m \ - common/Transformer.m \ - common/tikzparser.m \ - common/tikzlexer.m \ - common/util.m - -if HAVE_POPPLER -tikzit_SOURCES += \ - common/Preambles.m \ - gtk/PreambleEditor.m \ - gtk/Preambles+Storage.m \ - gtk/PreviewRenderer.m \ - gtk/PreviewWindow.m -endif - -if WINDOWS -tikzit.res: tikzit.rc - $(AM_V_GEN)windres $^ -O coff -o $@ - -tikzit_LDADD = tikzit.res -CLEANFILES = tikzit.res -endif - -common/tikzlexer.m common/tikzlexer.h: common/tikzlexer.lm - $(AM_V_GEN)$(LEX) -o common/tikzlexer.m $^ -# ordering hack for parallel builds -common/tikzlexer.h: common/tikzlexer.m - -common/tikzparser.m common/tikzparser.h: common/tikzparser.ym - $(AM_V_GEN)$(YACC) --defines=common/tikzparser.h --output=common/tikzparser.m $^ -# ordering hack for parallel builds -common/tikzparser.h: common/tikzparser.m - -gtk/icondata.m: $(ICONFILES) - $(AM_V_GEN)gdk-pixbuf-csource --struct --static --raw --build-list \ - draw_ellipse ../draw-ellipse.png \ - draw_path ../draw-path.png \ - select_rectangular ../select-rectangular.png \ - transform_crop_and_resize ../transform-crop-and-resize.png \ - transform_move ../transform-move.png \ - > $@ - -gtk/logodata.m: ../share/icons/hicolor/*/apps/tikzit.png - $(AM_V_GEN)gdk-pixbuf-csource --struct --static --raw --build-list \ - logo16 ../share/icons/hicolor/16x16/apps/tikzit.png \ - logo24 ../share/icons/hicolor/24x24/apps/tikzit.png \ - logo32 ../share/icons/hicolor/32x32/apps/tikzit.png \ - logo48 ../share/icons/hicolor/48x48/apps/tikzit.png \ - logo64 ../share/icons/hicolor/64x64/apps/tikzit.png \ - logo128 ../share/icons/hicolor/128x128/apps/tikzit.png \ - > $@ - -gtk/edgedecdata.m: $(EDGEDECFILES) - $(AM_V_GEN)gdk-pixbuf-csource --struct --static --raw --build-list \ - AH_none_pixdata ../AH_none.png \ - AH_latex_head_pixdata ../AH_latex_head.png \ - AH_latex_tail_pixdata ../AH_latex_tail.png \ - AH_plain_head_pixdata ../AH_plain_head.png \ - AH_plain_tail_pixdata ../AH_plain_tail.png \ - ED_none_pixdata ../ED_none.png \ - ED_arrow_pixdata ../ED_arrow.png \ - ED_tick_pixdata ../ED_tick.png \ - > $@ - -gtk/Menu.m: gtk/icondata.m -gtk/logo.m: gtk/logodata.m -gtk/EdgeStyleEditor.m: gtk/edgedecdata.m - -EXTRA_DIST = gtk/*.h common/*.h \ - $(PARSERFILES) common/tikzlexer.lm common/tikzparser.ym \ - $(ICONFILES) gtk/icondata.m \ - gtk/logodata.m \ - $(EDGEDECFILES) gtk/edgedecdata.m \ - tikzit.rc ../tikzit.ico -MAINTAINERCLEANFILES = $(PARSERFILES) gtk/icondata.m gtk/logodata.m gtk/edgedecdata.m diff --git a/tikzit-old/src/common/CircleShape.h b/tikzit-old/src/common/CircleShape.h deleted file mode 100644 index 8215b92..0000000 --- a/tikzit-old/src/common/CircleShape.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// CircleShape.h -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "Shape.h" - -@interface CircleShape : Shape { -} - - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/CircleShape.m b/tikzit-old/src/common/CircleShape.m deleted file mode 100644 index f2d1d52..0000000 --- a/tikzit-old/src/common/CircleShape.m +++ /dev/null @@ -1,57 +0,0 @@ -// -// CircleShape.m -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "CircleShape.h" -#import "Node.h" -#import "Edge.h" - -@implementation CircleShape - -- (id)init { - self = [super init]; - if (self) { - Node *n0,*n1,*n2,*n3; - - n0 = [Node nodeWithPoint:NSMakePoint( 0.0f, 0.2f)]; - n1 = [Node nodeWithPoint:NSMakePoint( 0.2f, 0.0f)]; - n2 = [Node nodeWithPoint:NSMakePoint( 0.0f, -0.2f)]; - n3 = [Node nodeWithPoint:NSMakePoint(-0.2f, 0.0f)]; - - Edge *e0,*e1,*e2,*e3; - - e0 = [Edge edgeWithSource:n0 andTarget:n1]; [e0 setBend:-45]; - e1 = [Edge edgeWithSource:n1 andTarget:n2]; [e1 setBend:-45]; - e2 = [Edge edgeWithSource:n2 andTarget:n3]; [e2 setBend:-45]; - e3 = [Edge edgeWithSource:n3 andTarget:n0]; [e3 setBend:-45]; - - paths = [[NSSet alloc] initWithObjects:[NSArray arrayWithObjects:e0,e1,e2,e3,nil],nil]; - - styleTikz = @"circle"; - } - return self; -} - - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/ColorRGB.h b/tikzit-old/src/common/ColorRGB.h deleted file mode 100644 index 607ba64..0000000 --- a/tikzit-old/src/common/ColorRGB.h +++ /dev/null @@ -1,64 +0,0 @@ -// -// ColorRGB.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "RColor.h" - -@interface ColorRGB : NSObject { - unsigned short red, green, blue; -} - -@property (assign) unsigned short red; -@property (assign) unsigned short green; -@property (assign) unsigned short blue; - -@property (assign) float redFloat; -@property (assign) float greenFloat; -@property (assign) float blueFloat; - -@property (readonly) NSString *name; - -- (RColor)rColor; -- (RColor)rColorWithAlpha:(CGFloat)alpha; - -- (NSString*)hexName; -- (BOOL)isEqual:(id)col; -- (float)distanceFromColor:(ColorRGB*)col; -- (int)hash; - -- (id)initWithRed:(unsigned short)r green:(unsigned short)g blue:(unsigned short)b; -- (id)initWithFloatRed:(float)r green:(float)g blue:(float)b; -- (id)initWithRColor:(RColor)color; - -- (void)setToClosestHashed; - -+ (ColorRGB*)colorWithRed:(unsigned short)r green:(unsigned short)g blue:(unsigned short)b; -+ (ColorRGB*)colorWithFloatRed:(float)r green:(float)g blue:(float)b; -+ (ColorRGB*)colorWithRColor:(RColor)color; - -+ (void)makeColorHash; -+ (void)releaseColorHash; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/ColorRGB.m b/tikzit-old/src/common/ColorRGB.m deleted file mode 100644 index 840d716..0000000 --- a/tikzit-old/src/common/ColorRGB.m +++ /dev/null @@ -1,353 +0,0 @@ -// -// ColorRGB.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "ColorRGB.h" -#import "util.h" - -typedef struct { -#if __has_feature(objc_arc) - __unsafe_unretained NSString *name; -#else - NSString *name; -#endif - unsigned short r, g, b; -} ColorRGBEntry; - -static const ColorRGBEntry kColors[147] = { - { @"AliceBlue", 240, 248, 255 }, - { @"AntiqueWhite", 250, 235, 215 }, - { @"Aqua", 0, 255, 255 }, - { @"Aquamarine", 127, 255, 212 }, - { @"Azure", 240, 255, 255 }, - { @"Beige", 245, 245, 220 }, - { @"Bisque", 255, 228, 196 }, - { @"Black", 0, 0, 0 }, - { @"BlanchedAlmond", 255, 235, 205 }, - { @"Blue", 0, 0, 255 }, - { @"BlueViolet", 138, 43, 226 }, - { @"Brown", 165, 42, 42 }, - { @"BurlyWood", 222, 184, 135 }, - { @"CadetBlue", 95, 158, 160 }, - { @"Chartreuse", 127, 255, 0 }, - { @"Chocolate", 210, 105, 30 }, - { @"Coral", 255, 127, 80 }, - { @"CornflowerBlue", 100, 149, 237 }, - { @"Cornsilk", 255, 248, 220 }, - { @"Crimson", 220, 20, 60 }, - { @"Cyan", 0, 255, 255 }, - { @"DarkBlue", 0, 0, 139 }, - { @"DarkCyan", 0, 139, 139 }, - { @"DarkGoldenrod", 184, 134, 11 }, - { @"DarkGray", 169, 169, 169 }, - { @"DarkGreen", 0, 100, 0 }, - { @"DarkGrey", 169, 169, 169 }, - { @"DarkKhaki", 189, 183, 107 }, - { @"DarkMagenta", 139, 0, 139 }, - { @"DarkOliveGreen", 85, 107, 47 }, - { @"DarkOrange", 255, 140, 0 }, - { @"DarkOrchid", 153, 50, 204 }, - { @"DarkRed", 139, 0, 0 }, - { @"DarkSalmon", 233, 150, 122 }, - { @"DarkSeaGreen", 143, 188, 143 }, - { @"DarkSlateBlue", 72, 61, 139 }, - { @"DarkSlateGray", 47, 79, 79 }, - { @"DarkSlateGrey", 47, 79, 79 }, - { @"DarkTurquoise", 0, 206, 209 }, - { @"DarkViolet", 148, 0, 211 }, - { @"DeepPink", 255, 20, 147 }, - { @"DeepSkyBlue", 0, 191, 255 }, - { @"DimGray", 105, 105, 105 }, - { @"DimGrey", 105, 105, 105 }, - { @"DodgerBlue", 30, 144, 255 }, - { @"FireBrick", 178, 34, 34 }, - { @"FloralWhite", 255, 250, 240 }, - { @"ForestGreen", 34, 139, 34 }, - { @"Fuchsia", 255, 0, 255 }, - { @"Gainsboro", 220, 220, 220 }, - { @"GhostWhite", 248, 248, 255 }, - { @"Gold", 255, 215, 0 }, - { @"Goldenrod", 218, 165, 32 }, - { @"Gray", 128, 128, 128 }, - { @"Grey", 128, 128, 128 }, - { @"Green", 0, 128, 0 }, - { @"GreenYellow", 173, 255, 47 }, - { @"Honeydew", 240, 255, 240 }, - { @"HotPink", 255, 105, 180 }, - { @"IndianRed", 205, 92, 92 }, - { @"Indigo", 75, 0, 130 }, - { @"Ivory", 255, 255, 240 }, - { @"Khaki", 240, 230, 140 }, - { @"Lavender", 230, 230, 250 }, - { @"LavenderBlush", 255, 240, 245 }, - { @"LawnGreen", 124, 252, 0 }, - { @"LemonChiffon", 255, 250, 205 }, - { @"LightBlue", 173, 216, 230 }, - { @"LightCoral", 240, 128, 128 }, - { @"LightCyan", 224, 255, 255 }, - { @"LightGoldenrodYellow", 250, 250, 210 }, - { @"LightGray", 211, 211, 211 }, - { @"LightGreen", 144, 238, 144 }, - { @"LightGrey", 211, 211, 211 }, - { @"LightPink", 255, 182, 193 }, - { @"LightSalmon", 255, 160, 122 }, - { @"LightSeaGreen", 32, 178, 170 }, - { @"LightSkyBlue", 135, 206, 250 }, - { @"LightSlateGray", 119, 136, 153 }, - { @"LightSlateGrey", 119, 136, 153 }, - { @"LightSteelBlue", 176, 196, 222 }, - { @"LightYellow", 255, 255, 224 }, - { @"Lime", 0, 255, 0 }, - { @"LimeGreen", 50, 205, 50 }, - { @"Linen", 250, 240, 230 }, - { @"Magenta", 255, 0, 255 }, - { @"Maroon", 128, 0, 0 }, - { @"MediumAquamarine", 102, 205, 170 }, - { @"MediumBlue", 0, 0, 205 }, - { @"MediumOrchid", 186, 85, 211 }, - { @"MediumPurple", 147, 112, 219 }, - { @"MediumSeaGreen", 60, 179, 113 }, - { @"MediumSlateBlue", 123, 104, 238 }, - { @"MediumSpringGreen", 0, 250, 154 }, - { @"MediumTurquoise", 72, 209, 204 }, - { @"MediumVioletRed", 199, 21, 133 }, - { @"MidnightBlue", 25, 25, 112 }, - { @"MintCream", 245, 255, 250 }, - { @"MistyRose", 255, 228, 225 }, - { @"Moccasin", 255, 228, 181 }, - { @"NavajoWhite", 255, 222, 173 }, - { @"Navy", 0, 0, 128 }, - { @"OldLace", 253, 245, 230 }, - { @"Olive", 128, 128, 0 }, - { @"OliveDrab", 107, 142, 35 }, - { @"Orange", 255, 165, 0 }, - { @"OrangeRed", 255, 69, 0 }, - { @"Orchid", 218, 112, 214 }, - { @"PaleGoldenrod", 238, 232, 170 }, - { @"PaleGreen", 152, 251, 152 }, - { @"PaleTurquoise", 175, 238, 238 }, - { @"PaleVioletRed", 219, 112, 147 }, - { @"PapayaWhip", 255, 239, 213 }, - { @"PeachPuff", 255, 218, 185 }, - { @"Peru", 205, 133, 63 }, - { @"Pink", 255, 192, 203 }, - { @"Plum", 221, 160, 221 }, - { @"PowderBlue", 176, 224, 230 }, - { @"Purple", 128, 0, 128 }, - { @"Red", 255, 0, 0 }, - { @"RosyBrown", 188, 143, 143 }, - { @"RoyalBlue", 65, 105, 225 }, - { @"SaddleBrown", 139, 69, 19 }, - { @"Salmon", 250, 128, 114 }, - { @"SandyBrown", 244, 164, 96 }, - { @"SeaGreen", 46, 139, 87 }, - { @"Seashell", 255, 245, 238 }, - { @"Sienna", 160, 82, 45 }, - { @"Silver", 192, 192, 192 }, - { @"SkyBlue", 135, 206, 235 }, - { @"SlateBlue", 106, 90, 205 }, - { @"SlateGray", 112, 128, 144 }, - { @"SlateGrey", 112, 128, 144 }, - { @"Snow", 255, 250, 250 }, - { @"SpringGreen", 0, 255, 127 }, - { @"SteelBlue", 70, 130, 180 }, - { @"Tan", 210, 180, 140 }, - { @"Teal", 0, 128, 128 }, - { @"Thistle", 216, 191, 216 }, - { @"Tomato", 255, 99, 71 }, - { @"Turquoise", 64, 224, 208 }, - { @"Violet", 238, 130, 238 }, - { @"Wheat", 245, 222, 179 }, - { @"White", 255, 255, 255 }, - { @"WhiteSmoke", 245, 245, 245 }, - { @"Yellow", 255, 255, 0 }, - { @"YellowGreen", 154, 205, 50 } -}; - -static NSMapTable *colorHash = nil; - -@implementation ColorRGB - -+ (void)initialize { - [self setKeys:[NSArray arrayWithObject:@"red"] triggerChangeNotificationsForDependentKey:@"redFloat"]; - [self setKeys:[NSArray arrayWithObject:@"green"] triggerChangeNotificationsForDependentKey:@"greenFloat"]; - [self setKeys:[NSArray arrayWithObject:@"blue"] triggerChangeNotificationsForDependentKey:@"blueFloat"]; - [self setKeys:[NSArray arrayWithObjects:@"red", @"green", @"blue", nil] - triggerChangeNotificationsForDependentKey:@"name"]; -} - -@synthesize red, green, blue; - -- (float)redFloat { return ((float)red)/255.0f; } -- (void)setRedFloat:(float)r { [self setRed:round(r*255.0f)]; } -- (float)greenFloat { return ((float)green)/255.0f; } -- (void)setGreenFloat:(float)g { [self setGreen:round(g*255.0f)]; } -- (float)blueFloat { return ((float)blue)/255.0f; } -- (void)setBlueFloat:(float)b { [self setBlue:round(b*255.0f)]; } - -- (int)hash { - return (red<<4) + (green<<2) + blue; -} - -- (id)initWithRed:(unsigned short)r green:(unsigned short)g blue:(unsigned short)b { - self = [super init]; - if (self) { - red = r; - green = g; - blue = b; - } - return self; -} - -- (id)initWithFloatRed:(float)r green:(float)g blue:(float)b { - self = [super init]; - if (self) { - red = round(r*255.0f); - green = round(g*255.0f); - blue = round(b*255.0f); - } - return self; -} - -- (id) initWithRColor:(RColor)color { - return [self initWithFloatRed:color.red green:color.green blue:color.blue]; -} - -- (RColor) rColor { - return MakeSolidRColor ([self redFloat], [self greenFloat], [self blueFloat]); -} - -- (RColor) rColorWithAlpha:(CGFloat)alpha { - return MakeRColor ([self redFloat], [self greenFloat], [self blueFloat], alpha); -} - -- (NSString*)name { - if (colorHash == nil) - [ColorRGB makeColorHash]; - return [colorHash objectForKey:self]; -} - -- (NSString*)hexName { - return [NSString stringWithFormat:@"hexcolor0x%.2x%.2x%.2x", red, green, blue]; -} - -- (NSComparisonResult)compare:(ColorRGB*)col { - if (red > [col red]) return NSOrderedDescending; - else if (red < [col red]) return NSOrderedAscending; - else { - if (green > [col green]) return NSOrderedDescending; - else if (green < [col green]) return NSOrderedAscending; - else { - if (blue > [col blue]) return NSOrderedDescending; - else if (blue < [col blue]) return NSOrderedAscending; - else return NSOrderedSame; - } - } -} - -- (BOOL)isEqual:(id)col { - return [self compare:col] == NSOrderedSame; -} - -- (float)distanceFromColor:(ColorRGB *)col { - float dr = (float)(red - [col red]); - float dg = (float)(green - [col green]); - float db = (float)(blue - [col blue]); - return dr*dr + dg*dg + db*db; -} - -- (id)copyWithZone:(NSZone*)zone { - ColorRGB *col = [[ColorRGB allocWithZone:zone] initWithRed:red green:green blue:blue]; - return col; -} - -+ (ColorRGB*)colorWithRed:(unsigned short)r green:(unsigned short)g blue:(unsigned short)b { - ColorRGB *col = [[ColorRGB alloc] initWithRed:r green:g blue:b]; -#if __has_feature(objc_arc) - return col; -#else - return [col autorelease]; -#endif -} - - -+ (ColorRGB*)colorWithFloatRed:(float)r green:(float)g blue:(float)b { - ColorRGB *col = [[ColorRGB alloc] initWithFloatRed:r green:g blue:b]; -#if __has_feature(objc_arc) - return col; -#else - return [col autorelease]; -#endif -} - -+ (ColorRGB*) colorWithRColor:(RColor)color { -#if __has_feature(objc_arc) - return [[self alloc] initWithRColor:color]; -#else - return [[[self alloc] initWithRColor:color] autorelease]; -#endif -} - -+ (void)makeColorHash { - NSMapTable *h = [[NSMapTable alloc] init]; - int i; - for (i = 0; i < 147; ++i) { - ColorRGB *col = [[ColorRGB alloc] initWithRed:kColors[i].r - green:kColors[i].g - blue:kColors[i].b]; - [h setObject:kColors[i].name forKey:col]; - //NSLog(@"adding color %@ (%d)", kColors[i].name, [col hash]); -#if ! __has_feature(objc_arc) - [col release]; -#endif - } - colorHash = h; -} - -+ (void)releaseColorHash { -#if ! __has_feature(objc_arc) - [colorHash release]; -#endif -} - -- (void)setToClosestHashed { - if (colorHash == nil) - [ColorRGB makeColorHash]; - float bestDist = -1; - ColorRGB *bestColor = nil; - NSEnumerator *enumerator = [colorHash keyEnumerator]; - ColorRGB *tryColor; - while ((tryColor = [enumerator nextObject]) != nil) { - float dist = [self distanceFromColor:tryColor]; - if (bestDist<0 || dist. -// - -#import -#import "Shape.h" - -@interface DiamondShape : Shape { -} - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 - diff --git a/tikzit-old/src/common/DiamondShape.m b/tikzit-old/src/common/DiamondShape.m deleted file mode 100644 index 1a578b8..0000000 --- a/tikzit-old/src/common/DiamondShape.m +++ /dev/null @@ -1,63 +0,0 @@ -// -// DiamondShape.m -// TikZiT -// -// Copyright 2011 Aleks Kissinger -// Copyright 2012 Alex Merry -// All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "DiamondShape.h" - -#import "Node.h" -#import "Edge.h" - -@implementation DiamondShape - -- (id)init { - self = [super init]; - - if (!self) - return nil; - - Node *n0,*n1,*n2,*n3; - float sz = 0.25f; - - n0 = [Node nodeWithPoint:NSMakePoint(0, sz)]; - n1 = [Node nodeWithPoint:NSMakePoint(sz, 0)]; - n2 = [Node nodeWithPoint:NSMakePoint(0,-sz)]; - n3 = [Node nodeWithPoint:NSMakePoint(-sz,0)]; - - Edge *e0,*e1,*e2,*e3; - - e0 = [Edge edgeWithSource:n0 andTarget:n1]; - e1 = [Edge edgeWithSource:n1 andTarget:n2]; - e2 = [Edge edgeWithSource:n2 andTarget:n3]; - e3 = [Edge edgeWithSource:n3 andTarget:n0]; - - paths = [[NSSet alloc] initWithObjects:[NSArray arrayWithObjects:e0,e1,e2,e3,nil],nil]; - - styleTikz = @"shape=diamond"; - - return self; -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/Edge.h b/tikzit-old/src/common/Edge.h deleted file mode 100644 index accf38c..0000000 --- a/tikzit-old/src/common/Edge.h +++ /dev/null @@ -1,401 +0,0 @@ -// -// Edge.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - - -// Edge : store the data associated with an edge. Also, lazily compute -// bezier curve control points based on bend and the coordinates of -// the endpoints. - -#import "Node.h" -#import "EdgeStyle.h" - -/*! - @typedef enum EdgeBendMode - @brief Indicates the type of edge bend. - @var EdgeBendModeBasic A basic, one-angle bend. Positive values will be interpreted - as bend left, negative as bend right. - @var EdgeBendModeInOut A two-angle bend mode, using inAngle and outAngle. - */ -typedef enum { - EdgeBendModeBasic, - EdgeBendModeInOut -} EdgeBendMode; - -/*! - @class Edge - @brief A graph edge, with associated bend and style data. - @details A graph edge, with associated bend and style data. This class - also contains methods for computing the bezier control points - and the midpoint of the curve. - */ -@interface Edge : NSObject { - Node *source; - Node *target; - Node *edgeNode; - int bend; - int inAngle, outAngle; - EdgeBendMode bendMode; - float weight; - EdgeStyle *style; - GraphElementData *data; - NSString *sourceAnchor; - NSString *targetAnchor; - - // When set to YES, lazily create the edge node, and keep it around when set - // to NO (at least until saved/loaded). - BOOL hasEdgeNode; - BOOL dirty; - - // these are all cached values computed from the above - NSPoint src; - NSPoint targ; - NSPoint head; - NSPoint tail; - NSPoint cp1; - NSPoint cp2; - NSPoint mid; - NSPoint midTan; - NSPoint headTan; - NSPoint tailTan; -} - -/*! - @property data - @brief Associated edge data. - */ -@property (copy) GraphElementData *data; - -// KVC methods -- (void) insertObject:(GraphElementProperty*)gep - inDataAtIndex:(NSUInteger)index; -- (void) removeObjectFromDataAtIndex:(NSUInteger)index; -- (void) replaceObjectInDataAtIndex:(NSUInteger)index - withObject:(GraphElementProperty*)gep; - -/*! - @property style - @brief Edge style. - */ -@property (retain) EdgeStyle *style; - -/*! - @property source - @brief Source node. - */ -@property (retain) Node *source; - -/*! - @property target - @brief Target node. - */ -@property (retain) Node *target; - -/*! - @property edgeNode - @brief A node attached to this edge, as in a label or tick. - */ -@property (retain) Node *edgeNode; - -/*! - @property sourceAnchor - @brief The source node anchor point, as in north or center. - */ -@property (copy) NSString *sourceAnchor; - -/*! - @property targetAnchor - @brief The target node anchor point, as in north or center. - */ -@property (copy) NSString *targetAnchor; - -/*! - @property hasEdgeNode - @brief A read/write property. When set to true, a new edge node is actually constructed. -*/ -@property (assign) BOOL hasEdgeNode; - -/*! - @property bend - @brief The degrees by which the edge bends. - */ -@property (assign) int bend; - -/*! - @property weight - @brief How close the edge will pass to control points. - */ -@property (assign) float weight; - -/*! - @property inAngle - @brief The angle by which the edge enters its target. - */ -@property (assign) int inAngle; - -/*! - @property outAngle - @brief The angle by which the edge leaves its target. - */ -@property (assign) int outAngle; - -/*! - @property bendMode - @brief The mode of the edge bend. Either simple bend in in/out style. - */ -@property (assign) EdgeBendMode bendMode; - -/*! - @property head - @brief The starting point of the edge. - @detail This value is computed based on the source, target and - either bend or in/out angles. It is where the edge - makes contact with the source node. - */ -@property (readonly) NSPoint head; - -/*! - @property tail - @brief The ending point of the edge. - @detail This value is computed based on the source, target and - either bend or in/out angles. It is where the edge - makes contact with the target node. - */ -@property (readonly) NSPoint tail; - -/*! - @property cp1 - @brief The first control point of the edge. - @detail This value is computed based on the source, target and - either bend or in/out angles. - */ -@property (readonly) NSPoint cp1; - -/*! - @property cp2 - @brief The second control point of the edge. - @detail This value is computed based on the source, target and - either bend or in/out angles. - */ -@property (readonly) NSPoint cp2; - -/*! - @property mid - @brief The midpoint of the curve. Computed from the source, target, and control points. - */ -@property (readonly) NSPoint mid; - -/*! - @property mid_tan - @brief The second point of a line tangent to the midpoint. (The first is the midpoint itself.) - */ -@property (readonly) NSPoint midTan; - -/*! - @property left_normal - @brief The second point in a line perp. to the edge coming from mid-point. (left side) - */ -@property (readonly) NSPoint leftNormal; - -/*! - @property left_normal - @brief The second point in a line perp. to the edge coming from mid-point. (right side) - */ -@property (readonly) NSPoint rightNormal; - -@property (readonly) NSPoint headTan; - -/*! - @property leftHeadNormal - */ -@property (readonly) NSPoint leftHeadNormal; - -/*! - @property rightHeadNormal - */ -@property (readonly) NSPoint rightHeadNormal; - -@property (readonly) NSPoint tailTan; - -/*! - @property leftTailNormal - */ -@property (readonly) NSPoint leftTailNormal; - -/*! - @property rightTailNormal - */ -@property (readonly) NSPoint rightTailNormal; - -/*! - @property isSelfLoop - @brief Returns YES if this edge is a self loop. - */ -@property (readonly) BOOL isSelfLoop; - -/*! - @property isStraight - @brief Returns YES if this edge can be drawn as a straight line (as opposed to a bezier curve). - */ -@property (readonly) BOOL isStraight; - - -/*! - @brief Construct a blank edge. - @result An edge. - */ -- (id)init; - -/*! - @brief Construct an edge with the given source and target. - @param s the source node. - @param t the target node. - @result An edge. - */ -- (id)initWithSource:(Node*)s andTarget:(Node*)t; - -/*! - @brief Force the recalculation of the derived properties. - */ -- (void)recalculateProperties; - -/*! - @brief Recompute the control points and midpoint. - */ -- (void)updateControls; - -/*! - @brief Push edge properties back into its GraphElementData. - */ -- (void)updateData; - -/*! - @brief Set edge properties from fields in GraphElementData. - */ -- (void)setAttributesFromData; - -/*! - @brief Use data.style to find and attach the EdgeStyle object from the given array. - */ -- (BOOL)attachStyleFromTable:(NSArray*)styles; - -/*! - @brief Convert the bend angle to an inAngle and outAngle. - */ -- (void)convertBendToAngles; - -/*! - @brief Set the bend angle to the average of the in and out angles. - */ -- (void)convertAnglesToBend; - -/*! - @brief Update this edge to look just like the given edge. - @param e an edge to mimic. - */ -- (void)setPropertiesFromEdge:(Edge *)e; - -/*! - @brief Get a bounding rect for this edge. - @detail Note that this may not be a tight bound. - */ -- (NSRect)boundingRect; - -/*! - @brief Moves the first control point, updating edge properties as necessary - @detail This will move a control point and adjust the weight and - bend (or outAngle) to fit. - - A courseness can be specified for both the weight and the - bend, allowing them to be constrained to certain values. For - example, passing 10 as the bend courseness will force the bend - to be a multiple of 5. Passing 0 for either of these will - cause the relevant value to be unconstrained. - @param point the new position of the control point - @param wc force the weight to be a multiple of this value (unless 0) - @param bc force the bend (or outAngle) to be a multiple of this value (unless 0) - @param link when in EdgeBendModeInOut, change both the in and out angles at once - */ -- (void) moveCp1To:(NSPoint)point withWeightCourseness:(float)wc andBendCourseness:(int)bc forceLinkControlPoints:(BOOL)link; - -/*! - @brief Moves the first control point, updating edge properties as necessary - @detail This will move a control point and adjust the weight and - bend (or outAngle) to fit. - - The same as moveCp1To:point withWeightCourseness:0.0f andBendCourseness:0 forceLinkControlPoints:No - @param point the new position of the control point - @param wc force the weight to be a multiple of this value (unless 0) - @param bc force the bend (or outAngle) to be a multiple of this value (unless 0) - @param link when in EdgeBendModeInOut, change both the in and out angles at once - */ -- (void) moveCp1To:(NSPoint)point; - -/*! - @brief Moves the first control point, updating edge properties as necessary - @detail This will move a control point and adjust the weight and - bend (or inAngle) to fit. - - A courseness can be specified for both the weight and the - bend, allowing them to be constrained to certain values. For - example, passing 10 as the bend courseness will force the bend - to be a multiple of 5. Passing 0 for either of these will - cause the relevant value to be unconstrained. - @param point the new position of the control point - @param wc force the weight to be a multiple of this value (unless 0) - @param bc force the bend (or inAngle) to be a multiple of this value (unless 0) - @param link when in EdgeBendModeInOut, change both the in and out angles at once - */ -- (void) moveCp2To:(NSPoint)point withWeightCourseness:(float)wc andBendCourseness:(int)bc forceLinkControlPoints:(BOOL)link; - -/*! - @brief Moves the first control point, updating edge properties as necessary - @detail This will move a control point and adjust the weight and - bend (or inAngle) to fit. - - The same as moveCp2To:point withWeightCourseness:0.0f andBendCourseness:0 forceLinkControlPoints:No - @param point the new position of the control point - */ -- (void) moveCp2To:(NSPoint)point; - -/*! - @brief Reverse edge direction, updating bend/inAngle/outAngle/etc - */ -- (void)reverse; - -/*! - @brief Factory method to make a blank edge. - @result An edge. - */ -+ (Edge*)edge; - -/*! - @brief Factory method to make an edge with the given source and target. - @param s a source node. - @param t a target node. - @result An edge. - */ -+ (Edge*)edgeWithSource:(Node*)s andTarget:(Node*)t; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/Edge.m b/tikzit-old/src/common/Edge.m deleted file mode 100644 index 0c88e9d..0000000 --- a/tikzit-old/src/common/Edge.m +++ /dev/null @@ -1,757 +0,0 @@ -// -// Edge.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "Edge.h" -#import "Shape.h" -#import "util.h" - -@implementation Edge - -- (id)init { - self = [super init]; - if (self) { - data = [[GraphElementData alloc] init]; - bend = 0; - inAngle = 135; - outAngle = 45; - bendMode = EdgeBendModeBasic; - weight = 0.4f; - dirty = YES; - source = nil; - target = nil; - edgeNode = nil; - sourceAnchor = @""; - targetAnchor = @""; - } - return self; -} - -- (id)initWithSource:(Node*)s andTarget:(Node*)t { - self = [self init]; - if (self) { - [self setSource:s]; - [self setTarget:t]; - edgeNode = nil; - - dirty = YES; - } - return self; -} - -- (BOOL)attachStyleFromTable:(NSArray*)styles { - NSString *style_name = [data propertyForKey:@"style"]; - - [self setStyle:nil]; - if (style_name == nil) return YES; - - for (EdgeStyle *s in styles) { - if ([[s name] compare:style_name]==NSOrderedSame) { - [self setStyle:s]; - return YES; - } - } - - // if we didn't find a style, fill in a default one -#if __has_feature(objc_arc) - style = [EdgeStyle defaultEdgeStyleWithName:style_name]; -#else - style = [[EdgeStyle defaultEdgeStyleWithName:style_name] retain]; -#endif - return NO; -} - -- (NSPoint) _findContactPointOn:(Node*)node at:(float)angle { - NSPoint rayStart = [node point]; - Shape *shape = [node shape]; - if (shape == nil) { - return rayStart; - } - - Transformer *shapeTrans = [node shapeTransformer]; - // rounding errors are a pain - NSRect searchArea = NSInsetRect([node boundsUsingShapeTransform:shapeTrans],-0.01,-0.01); - if (!NSPointInRect(rayStart, searchArea)) { - return rayStart; - } - - NSPoint rayEnd = findExitPointOfRay (rayStart, angle, searchArea); - - for (NSArray *path in [shape paths]) { - for (Edge *curve in path) { - NSPoint intersect; - [curve updateControls]; - if (lineSegmentIntersectsBezier (rayStart, rayEnd, - [shapeTrans toScreen:curve->tail], - [shapeTrans toScreen:curve->cp1], - [shapeTrans toScreen:curve->cp2], - [shapeTrans toScreen:curve->head], - &intersect)) { - // we just keep shortening the line - rayStart = intersect; - } - } - } - - return rayStart; -} - -- (NSPoint) _findTanFor:(NSPoint)pt usingSpanFrom:(float)t1 to:(float)t2 { - float dx = bezierInterpolate(t2, tail.x, cp1.x, cp2.x, head.x) - - bezierInterpolate(t1, tail.x, cp1.x, cp2.x, head.x); - float dy = bezierInterpolate(t2, tail.y, cp1.y, cp2.y, head.y) - - bezierInterpolate(t1, tail.y, cp1.y, cp2.y, head.y); - - // normalise - float len = sqrt(dx*dx+dy*dy); - if (len != 0) { - dx = (dx/len) * 0.1f; - dy = (dy/len) * 0.1f; - } - - return NSMakePoint (pt.x + dx, pt.y + dy); -} - -- (void)recalculateProperties { - dirty = YES; -} - -- (void)updateControls { - // check for external modification to the node locations - if (src.x != [source point].x || src.y != [source point].y || - targ.x != [target point].x || targ.y != [target point].y) - { - dirty = YES; - } - - if (dirty) { - src = [source point]; - targ = [target point]; - - float dx = (targ.x - src.x); - float dy = (targ.y - src.y); - - float angleSrc = 0.0f; - float angleTarg = 0.0f; - - if (bendMode == EdgeBendModeBasic) { - float angle = good_atan(dx, dy); - float bnd = (float)bend * (M_PI / 180.0f); - angleSrc = angle - bnd; - angleTarg = M_PI + angle + bnd; - } else if (bendMode == EdgeBendModeInOut) { - angleSrc = (float)outAngle * (M_PI / 180.0f); - angleTarg = (float)inAngle * (M_PI / 180.0f); - } - - tail = [self _findContactPointOn:source at:angleSrc]; - head = [self _findContactPointOn:target at:angleTarg]; - - // give a default distance for self-loops - float cdist = (dx==0.0f && dy==0.0f) ? weight : sqrt(dx*dx + dy*dy) * weight; - - cp1 = NSMakePoint(src.x + (cdist * cos(angleSrc)), - src.y + (cdist * sin(angleSrc))); - - cp2 = NSMakePoint(targ.x + (cdist * cos(angleTarg)), - targ.y + (cdist * sin(angleTarg))); - - mid = bezierInterpolateFull (0.5f, tail, cp1, cp2, head); - midTan = [self _findTanFor:mid usingSpanFrom:0.4f to:0.6f]; - - tailTan = [self _findTanFor:tail usingSpanFrom:0.0f to:0.1f]; - headTan = [self _findTanFor:head usingSpanFrom:1.0f to:0.9f]; - } - dirty = NO; -} - -- (void)convertBendToAngles { - float dx = (targ.x - src.x); - float dy = (targ.y - src.y); - float angle = good_atan(dx, dy); - float bnd = (float)bend * (M_PI / 180.0f); - - [self setOutAngle:round((angle - bnd) * (180.0f/M_PI))]; - [self setInAngle:round((M_PI + angle + bnd) * (180.0f/M_PI))]; - dirty = YES; -} - -- (void)convertAnglesToBend { - float dx = (targ.x - src.x); - float dy = (targ.y - src.y); - int angle = round((180.0f/M_PI) * good_atan(dx, dy)); - - // compute bend1 and bend2 to match inAngle and outAngle, resp. - int bend1, bend2; - - bend1 = outAngle - angle; - bend2 = angle - inAngle; - - [self setBend:(bend1 + bend2) / 2]; -} - -- (BOOL)isSelfLoop { - return (source == target); -} - -- (BOOL)isStraight { - return (bendMode == EdgeBendModeBasic && bend == 0); -} - -- (NSPoint)mid { - [self updateControls]; - return mid; -} - -- (NSPoint)midTan { - [self updateControls]; - return midTan; -} - -- (NSPoint)leftNormal { - [self updateControls]; - return NSMakePoint(mid.x + (mid.y - midTan.y), mid.y - (mid.x - midTan.x)); -} - -- (NSPoint)rightNormal { - [self updateControls]; - return NSMakePoint(mid.x - (mid.y - midTan.y), mid.y + (mid.x - midTan.x)); -} - -- (NSPoint)headTan { - [self updateControls]; - return headTan; -} - -- (NSPoint)leftHeadNormal { - [self updateControls]; - return NSMakePoint(headTan.x + (head.y - headTan.y), headTan.y - (head.x - headTan.x)); -} - -- (NSPoint)rightHeadNormal { - [self updateControls]; - return NSMakePoint(headTan.x - (head.y - headTan.y), headTan.y + (head.x - headTan.x)); -} - -- (NSPoint)tailTan { - [self updateControls]; - return tailTan; -} - -- (NSPoint)leftTailNormal { - [self updateControls]; - return NSMakePoint(tailTan.x + (tail.y - tailTan.y), tailTan.y - (tail.x - tailTan.x)); -} - -- (NSPoint)rightTailNormal { - [self updateControls]; - return NSMakePoint(tailTan.x - (tail.y - tailTan.y), tailTan.y + (tail.x - tailTan.x)); -} - -- (NSPoint) head { - [self updateControls]; - return head; -} - -- (NSPoint) tail { - [self updateControls]; - return tail; -} - -- (NSPoint)cp1 { - [self updateControls]; - return cp1; -} - -- (NSPoint)cp2 { - [self updateControls]; - return cp2; -} - -- (int)inAngle {return inAngle;} -- (void)setInAngle:(int)a { - inAngle = normaliseAngleDeg (a); - dirty = YES; -} - -- (int)outAngle {return outAngle;} -- (void)setOutAngle:(int)a { - outAngle = normaliseAngleDeg (a); - dirty = YES; -} - -- (EdgeBendMode)bendMode {return bendMode;} -- (void)setBendMode:(EdgeBendMode)mode { - bendMode = mode; - dirty = YES; -} - -- (int)bend {return bend;} -- (void)setBend:(int)b { - bend = normaliseAngleDeg (b); - dirty = YES; -} - -- (float)weight {return weight;} -- (void)setWeight:(float)w { -// if (source == target) weight = 1.0f; -// else weight = w; - weight = w; - dirty = YES; -} - -- (EdgeStyle*)style {return style;} -- (void)setStyle:(EdgeStyle*)s { - if (style != s) { -#if __has_feature(objc_arc) - style = s; -#else - [style release]; - style = [s retain]; -#endif - } -} - -- (Node*)source {return source;} -- (void)setSource:(Node *)s { - if (source != s) { - [source removeObserver:self - forKeyPath:@"style"]; - - if ([s style] == nil) { - [self setSourceAnchor:@"center"]; - } else if ([sourceAnchor isEqual:@"center"]) { - [self setSourceAnchor:@""]; - } - -#if __has_feature(objc_arc) - source = s; -#else - [source release]; - source = [s retain]; -#endif - - if (source==target) { - bendMode = EdgeBendModeInOut; - weight = 1.0f; - } - - [source addObserver:self - forKeyPath:@"style" - options:NSKeyValueObservingOptionNew - | NSKeyValueObservingOptionOld - context:NULL]; - - dirty = YES; - } -} - -- (Node*)target {return target;} -- (void)setTarget:(Node *)t { - if (target != t) { - [target removeObserver:self - forKeyPath:@"style"]; - - if ([t style] == nil) { - [self setTargetAnchor:@"center"]; - } else if ([targetAnchor isEqual:@"center"]) { - [self setTargetAnchor:@""]; - } - -#if __has_feature(objc_arc) - target = t; -#else - [target release]; - target = [t retain]; -#endif - - if (source==target) { - bendMode = EdgeBendModeInOut; - weight = 1.0f; - } - - [target addObserver:self - forKeyPath:@"style" - options:NSKeyValueObservingOptionNew - | NSKeyValueObservingOptionOld - context:NULL]; - - dirty = YES; - } -} - -- (void)observeValueForKeyPath:(NSString *)keyPath - ofObject:(id)object - change:(NSDictionary *)change - context:(void *)context - -{ - if ([keyPath isEqual:@"style"]) { - id oldStyle = [change objectForKey:NSKeyValueChangeOldKey]; - id newStyle = [change objectForKey:NSKeyValueChangeNewKey]; - id none = [NSNull null]; - if (object == source) { - if (oldStyle != none && newStyle == none) { - [self setSourceAnchor:@"center"]; - } else if (oldStyle == none && newStyle != none && - [sourceAnchor isEqual:@"center"]) { - [self setSourceAnchor:@""]; - } - } - if (object == target) { - if (oldStyle != none && newStyle == none) { - [self setTargetAnchor:@"center"]; - } else if (oldStyle == none && newStyle != none && - [targetAnchor isEqual:@"center"]) { - [self setTargetAnchor:@""]; - } - } - } - dirty = YES; -} - - -// edgeNode and hasEdgeNode use a bit of key-value observing to help the mac GUI keep up - -- (Node*)edgeNode {return edgeNode;} -- (void)setEdgeNode:(Node *)n { - [self willChangeValueForKey:@"edgeNode"]; - [self willChangeValueForKey:@"hasEdgeNode"]; - if (edgeNode != n) { - hasEdgeNode = (n != nil); -#if __has_feature(objc_arc) - edgeNode = n; -#else - [edgeNode release]; - edgeNode = [n retain]; -#endif - // don't set dirty bit, because control points don't need update - } - [self didChangeValueForKey:@"edgeNode"]; - [self didChangeValueForKey:@"hasEdgeNode"]; -} - -- (BOOL)hasEdgeNode { return hasEdgeNode; } -- (void)setHasEdgeNode:(BOOL)b { - [self willChangeValueForKey:@"edgeNode"]; - [self willChangeValueForKey:@"hasEdgeNode"]; - hasEdgeNode = b; - if (hasEdgeNode && edgeNode == nil) { - edgeNode = [[Node alloc] init]; - } - [self didChangeValueForKey:@"edgeNode"]; - [self didChangeValueForKey:@"hasEdgeNode"]; -} - -- (NSString*) sourceAnchor { return sourceAnchor; } -- (void)setSourceAnchor:(NSString *)_sourceAnchor{ - NSString *oldSourceAnchor = sourceAnchor; - if(_sourceAnchor != nil){ - sourceAnchor = [_sourceAnchor copy]; - }else{ - sourceAnchor = @""; - } -#if ! __has_feature(objc_arc) - [oldSourceAnchor release]; -#endif -} - -- (NSString*) targetAnchor { return targetAnchor; } -- (void)setTargetAnchor:(NSString *)_targetAnchor{ - NSString *oldTargetAnchor = targetAnchor; - if(_targetAnchor != nil){ - targetAnchor = [_targetAnchor copy]; - }else{ - targetAnchor = @""; - } -#if ! __has_feature(objc_arc) - [oldTargetAnchor release]; -#endif -} - -@synthesize data; -- (void) insertObject:(GraphElementProperty*)gep - inDataAtIndex:(NSUInteger)index { - [data insertObject:gep atIndex:index]; -} -- (void) removeObjectFromDataAtIndex:(NSUInteger)index { - [data removeObjectAtIndex:index]; -} -- (void) replaceObjectInDataAtIndex:(NSUInteger)index - withObject:(GraphElementProperty*)gep { - [data replaceObjectAtIndex:index withObject:gep]; -} - -- (void)updateData { - // unset everything to avoid redundant defs - [data unsetAtom:@"loop"]; - [data unsetProperty:@"in"]; - [data unsetProperty:@"out"]; - [data unsetAtom:@"bend left"]; - [data unsetAtom:@"bend right"]; - [data unsetProperty:@"bend left"]; - [data unsetProperty:@"bend right"]; - [data unsetProperty:@"looseness"]; - - if (style == nil) { - [data unsetProperty:@"style"]; - } else { - [data setProperty:[style name] forKey:@"style"]; - } - - if (bendMode == EdgeBendModeBasic && bend != 0) { - NSString *bendkey = @"bend right"; - int b = [self bend]; - if (b < 0) { - bendkey = @"bend left"; - b = -b; - } - - if (b == 30) { - [data setAtom:bendkey]; - } else { - [data setProperty:[NSString stringWithFormat:@"%d",b] forKey:bendkey]; - } - - } else if (bendMode == EdgeBendModeInOut) { - [data setProperty:[NSString stringWithFormat:@"%d",inAngle] - forKey:@"in"]; - [data setProperty:[NSString stringWithFormat:@"%d",outAngle] - forKey:@"out"]; - } - - // loop needs to come after in/out - if (source == target) [data setAtom:@"loop"]; - - if (![self isSelfLoop] && ![self isStraight]) - { - [data setProperty:[NSString stringWithFormat:@"%.2f",weight*2.5f] - forKey:@"looseness"]; - } -} - -- (void)setAttributesFromData { - bendMode = EdgeBendModeBasic; - - if ([data isAtomSet:@"bend left"]) { - [self setBend:-30]; - } else if ([data isAtomSet:@"bend right"]) { - [self setBend:30]; - } else if ([data propertyForKey:@"bend left"] != nil) { - NSString *bnd = [data propertyForKey:@"bend left"]; - [self setBend:-[bnd intValue]]; - } else if ([data propertyForKey:@"bend right"] != nil) { - NSString *bnd = [data propertyForKey:@"bend right"]; - [self setBend:[bnd intValue]]; - } else { - [self setBend:0]; - - if ([data propertyForKey:@"in"] != nil && [data propertyForKey:@"out"] != nil) { - bendMode = EdgeBendModeInOut; - [self setInAngle:[[data propertyForKey:@"in"] intValue]]; - [self setOutAngle:[[data propertyForKey:@"out"] intValue]]; - } - } - - if ([data propertyForKey:@"looseness"] != nil) { - weight = [[data propertyForKey:@"looseness"] floatValue] / 2.5f; - } else { - weight = ([self isSelfLoop]) ? 1.0f : 0.4f; - } -} - -- (void)setPropertiesFromEdge:(Edge*)e { - Node *en = [[e edgeNode] copy]; - [self setEdgeNode:en]; -#if ! __has_feature(objc_arc) - [en release]; -#endif - - GraphElementData *d = [[e data] copy]; - [self setData:d]; -#if ! __has_feature(objc_arc) - [d release]; -#endif - - [self setStyle:[e style]]; - [self setBend:[e bend]]; - [self setInAngle:[e inAngle]]; - [self setOutAngle:[e outAngle]]; - [self setBendMode:[e bendMode]]; - [self setWeight:[e weight]]; - - dirty = YES; // cached data will be recomputed lazily, rather than copied -} - -- (NSRect)boundingRect { - [self updateControls]; - NSRect bound = NSRectAround4Points(head, tail, cp1, cp2); - if ([self style] != nil) { - switch ([[self style] decorationStyle]) { - case ED_Arrow: - bound = NSRectWithPoint(bound, [self midTan]); - case ED_Tick: - bound = NSRectWithPoint(bound, [self leftNormal]); - bound = NSRectWithPoint(bound, [self rightNormal]); - case ED_None: - break; - } - if ([[self style] headStyle] != AH_None) { - bound = NSRectWithPoint(bound, [self leftHeadNormal]); - bound = NSRectWithPoint(bound, [self rightHeadNormal]); - } - if ([[self style] tailStyle] != AH_None) { - bound = NSRectWithPoint(bound, [self leftTailNormal]); - bound = NSRectWithPoint(bound, [self rightTailNormal]); - } - } - return bound; -} - -- (void) adjustWeight:(float)handle_dist withCourseness:(float)wcourseness { - float base_dist = NSDistanceBetweenPoints (src, targ); - if (base_dist == 0.0f) { - base_dist = 1.0f; - } - - [self setWeight:roundToNearest(wcourseness, handle_dist / base_dist)]; -} - -- (float) angleOf:(NSPoint)point relativeTo:(NSPoint)base { - float dx = point.x - base.x; - float dy = point.y - base.y; - return radiansToDegrees (good_atan(dx, dy)); -} - -- (void) moveCp1To:(NSPoint)point withWeightCourseness:(float)wc andBendCourseness:(int)bc forceLinkControlPoints:(BOOL)link { - [self updateControls]; - [self adjustWeight:NSDistanceBetweenPoints (point, src) withCourseness:wc]; - - float control_angle = [self angleOf:point relativeTo:src]; - if (bendMode == EdgeBendModeBasic) { - float base_angle = [self angleOf:targ relativeTo:src]; - int b = (int)roundToNearest (bc, base_angle - control_angle); - [self setBend:b]; - } else { - int angle = (int)roundToNearest (bc, control_angle); - if (link) { - [self setInAngle:(inAngle + angle - outAngle)]; - } - [self setOutAngle:angle]; - } -} - -- (void) moveCp1To:(NSPoint)point { - [self moveCp1To:point withWeightCourseness:0.0f andBendCourseness:0 forceLinkControlPoints:NO]; -} - -- (void) moveCp2To:(NSPoint)point withWeightCourseness:(float)wc andBendCourseness:(int)bc forceLinkControlPoints:(BOOL)link { - [self updateControls]; - - if (![self isSelfLoop]) { - [self adjustWeight:NSDistanceBetweenPoints (point, targ) withCourseness:wc]; - } - - float control_angle = [self angleOf:point relativeTo:targ]; - if (bendMode == EdgeBendModeBasic) { - float base_angle = [self angleOf:src relativeTo:targ]; - int b = (int)roundToNearest (bc, control_angle - base_angle); - [self setBend:b]; - } else { - int angle = (int)roundToNearest (bc, control_angle); - if (link) { - [self setOutAngle:(outAngle + angle - inAngle)]; - } - [self setInAngle: angle]; - } -} - -- (void) moveCp2To:(NSPoint)point { - [self moveCp2To:point withWeightCourseness:0.0f andBendCourseness:0 forceLinkControlPoints:NO]; -} - -- (void)reverse { - Node *n; - float f; - NSString *a; - - n = source; - source = target; - target = n; - - f = inAngle; - inAngle = outAngle; - outAngle = f; - - a = sourceAnchor; - sourceAnchor = targetAnchor; - targetAnchor = a; - - [self setBend:-bend]; - - dirty = YES; -} - -- (void)dealloc { - [source removeObserver:self - forKeyPath:@"style"]; - [target removeObserver:self - forKeyPath:@"style"]; -#if ! __has_feature(objc_arc) - [source release]; - [target release]; - [data release]; - [sourceAnchor release]; - [targetAnchor release]; - [super dealloc]; -#endif -} - -- (id)copyWithZone:(NSZone*)zone { - Edge *cp = [[Edge allocWithZone:zone] init]; - [cp setSource:[self source]]; - [cp setTarget:[self target]]; - [cp setSourceAnchor:[self sourceAnchor]]; - [cp setTargetAnchor:[self targetAnchor]]; - [cp setPropertiesFromEdge:self]; - return cp; -} - -+ (Edge*)edge { -#if __has_feature(objc_arc) - return [[Edge alloc] init]; -#else - return [[[Edge alloc] init] autorelease]; -#endif -} - -+ (Edge*)edgeWithSource:(Node*)s andTarget:(Node*)t { -#if __has_feature(objc_arc) - return [[Edge alloc] initWithSource:s andTarget:t]; -#else - return [[[Edge alloc] initWithSource:s andTarget:t] autorelease]; -#endif -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/EdgeStyle.h b/tikzit-old/src/common/EdgeStyle.h deleted file mode 100644 index a51f129..0000000 --- a/tikzit-old/src/common/EdgeStyle.h +++ /dev/null @@ -1,71 +0,0 @@ -// -// EdgeStyle.h -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "PropertyHolder.h" -#import "ColorRGB.h" - -typedef enum { - AH_None = 0, - AH_Plain = 1, - AH_Latex = 2 -} ArrowHeadStyle; - -typedef enum { - ED_None = 0, - ED_Arrow = 1, - ED_Tick = 2 -} EdgeDectorationStyle; - -@interface EdgeStyle : PropertyHolder { - ArrowHeadStyle headStyle, tailStyle; - EdgeDectorationStyle decorationStyle; - float thickness; - ColorRGB *colorRGB; - NSString *name; - NSString *category; -} - -/*! - @property colorRGB - @brief The color to render the line in - */ -@property (copy) ColorRGB *colorRGB; - -@property (copy) NSString *name; -@property (copy) NSString *category; -@property (assign) ArrowHeadStyle headStyle; -@property (assign) ArrowHeadStyle tailStyle; -@property (assign) EdgeDectorationStyle decorationStyle; -@property (assign) float thickness; - -@property (readonly) NSString *tikz; - -- (id)init; -- (id)initWithName:(NSString*)nm; -+ (EdgeStyle*)defaultEdgeStyleWithName:(NSString*)nm; -- (void) updateFromStyle:(EdgeStyle*)style; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/EdgeStyle.m b/tikzit-old/src/common/EdgeStyle.m deleted file mode 100644 index c61e94a..0000000 --- a/tikzit-old/src/common/EdgeStyle.m +++ /dev/null @@ -1,222 +0,0 @@ -// -// EdgeStyle.m -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "EdgeStyle.h" - -@implementation EdgeStyle - -+ (void)initialize { - [self setKeys:[NSArray arrayWithObjects: - @"tailStyle", - @"headStyle", - @"decorationStyle", - @"thickness", - @"colorRGB.red", - @"colorRGB.blue", - @"colorRGB.green", - @"name", - nil] - triggerChangeNotificationsForDependentKey:@"tikz"]; - [self setKeys:[NSArray arrayWithObjects: - @"colorRGB.name", - nil] - triggerChangeNotificationsForDependentKey:@"colorIsKnown"]; -} - -- (id)initWithName:(NSString*)nm { - self = [super initWithNotificationName:@"EdgeStylePropertyChanged"]; - - if (self != nil) { - headStyle = AH_None; - tailStyle = AH_None; - decorationStyle = ED_None; - colorRGB = [[ColorRGB alloc] initWithRed:0 green:0 blue:0]; - name = nm; - category = nil; - thickness = 1.0f; - } - - return self; -} - -- (id)init { - self = [self initWithName:@"new"]; - return self; -} - -- (id)copyWithZone:(NSZone*)zone { - EdgeStyle *style = [[EdgeStyle allocWithZone:zone] init]; - [style setName:[self name]]; - [style setCategory:[self category]]; - [style setHeadStyle:[self headStyle]]; - [style setTailStyle:[self tailStyle]]; - [style setDecorationStyle:[self decorationStyle]]; - [style setThickness:[self thickness]]; - [style setColorRGB:[self colorRGB]]; - return style; -} - -- (void)dealloc { -#if ! __has_feature(objc_arc) - [name release]; - [category release]; - [colorRGB release]; - [super dealloc]; -#endif -} - -- (NSString*) description { - return [NSString stringWithFormat:@"Edge style \"%@\"", name]; -} - -- (void) updateFromStyle:(EdgeStyle*)style { - [self setName:[style name]]; - [self setCategory:[style category]]; - [self setHeadStyle:[style headStyle]]; - [self setTailStyle:[style tailStyle]]; - [self setDecorationStyle:[style decorationStyle]]; - [self setThickness:[style thickness]]; - [self setColorRGB:[style colorRGB]]; -} - -+ (EdgeStyle*)defaultEdgeStyleWithName:(NSString*)nm { -#if __has_feature(objc_arc) - return [[EdgeStyle alloc] initWithName:nm]; -#else - return [[[EdgeStyle alloc] initWithName:nm] autorelease]; -#endif -} - -- (NSString*)name { return name; } -- (void)setName:(NSString *)s { - if (name != s) { - NSString *oldValue = name; - name = [s copy]; - [self postPropertyChanged:@"name" oldValue:oldValue]; -#if ! __has_feature(objc_arc) - [oldValue release]; -#endif - } -} - -- (ArrowHeadStyle)headStyle { return headStyle; } -- (void)setHeadStyle:(ArrowHeadStyle)s { - ArrowHeadStyle oldValue = headStyle; - headStyle = s; - [self postPropertyChanged:@"headStyle" oldValue:[NSNumber numberWithInt:oldValue]]; -} - -- (ArrowHeadStyle)tailStyle { return tailStyle; } -- (void)setTailStyle:(ArrowHeadStyle)s { - ArrowHeadStyle oldValue = tailStyle; - tailStyle = s; - [self postPropertyChanged:@"tailStyle" oldValue:[NSNumber numberWithInt:oldValue]]; -} - -- (EdgeDectorationStyle)decorationStyle { return decorationStyle; } -- (void)setDecorationStyle:(EdgeDectorationStyle)s { - EdgeDectorationStyle oldValue = decorationStyle; - decorationStyle = s; - [self postPropertyChanged:@"decorationStyle" oldValue:[NSNumber numberWithInt:oldValue]]; -} -- (float)thickness { return thickness; } -- (void)setThickness:(float)s { - float oldValue = thickness; - thickness = s; - [self postPropertyChanged:@"thickness" oldValue:[NSNumber numberWithFloat:oldValue]]; -} - -- (NSString*)category { - return category; -} - -- (void)setCategory:(NSString *)s { - if (category != s) { - NSString *oldValue = category; - category = [s copy]; - [self postPropertyChanged:@"category" oldValue:oldValue]; -#if ! __has_feature(objc_arc) - [oldValue release]; -#endif - } -} - -- (ColorRGB*)colorRGB { - return colorRGB; -} - -- (void)setColorRGB:(ColorRGB*)c { - if (colorRGB != c) { - ColorRGB *oldValue = colorRGB; - colorRGB = [c copy]; - [self postPropertyChanged:@"colorRGB" oldValue:oldValue]; -#if ! __has_feature(objc_arc) - [oldValue release]; -#endif - } -} - -- (NSString*)tikz { - NSMutableString *buf = [NSMutableString stringWithFormat:@"\\tikzstyle{%@}=[", name]; - - NSString *colorName = [colorRGB name]; - if (colorName == nil) - colorName = [colorRGB hexName]; - - if (tailStyle == AH_Plain) - [buf appendString:@"<"]; - else if (tailStyle == AH_Latex) - [buf appendString:@"latex"]; - - [buf appendString:@"-"]; - - if (headStyle == AH_Plain) - [buf appendString:@">"]; - else if (headStyle == AH_Latex) - [buf appendString:@"latex"]; - - if(colorName != nil){ - [buf appendString:@",draw="]; - [buf appendString:colorName]; - } - - if (decorationStyle != ED_None) { - [buf appendString:@",postaction={decorate},decoration={markings,mark="]; - if (decorationStyle == ED_Arrow) - [buf appendString:@"at position .5 with {\\arrow{>}}"]; - else if (decorationStyle == ED_Tick) - [buf appendString:@"at position .5 with {\\draw (0,-0.1) -- (0,0.1);}"]; - [buf appendString:@"}"]; - } - - if (thickness != 1.0f) { - [buf appendFormat:@",line width=%.3f", thickness]; - } - - [buf appendString:@"]"]; - return buf; -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/Graph.h b/tikzit-old/src/common/Graph.h deleted file mode 100644 index 1f98858..0000000 --- a/tikzit-old/src/common/Graph.h +++ /dev/null @@ -1,401 +0,0 @@ -// -// Graph.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - - -/*! - - @mainpage TikZiT - TikZiT is a GUI application for drawing, editing, and parsing TikZ - diagrams. Common code is in src/common, and plaform-specific code is - in src/{osx,linux}. - - */ - - -#import "Node.h" -#import "Edge.h" -#import "GraphChange.h" -#import "Transformer.h" - -/*! - @class Graph - @brief Store a graph, output to TikZ. - @details All of the methods that change a graph return an object of type GraphChange. - Graph changes can be re-done by calling applyGraphChange. They can be undone - by calling applyGraphChange on [change inverse]. - */ -@interface Graph : NSObject { - NSRecursiveLock *graphLock; - BOOL dirty; // keep track of when inEdges and outEdges need an update - NSMutableArray *nodes; - NSMutableArray *edges; - - NSMapTable *inEdges; - NSMapTable *outEdges; - - GraphElementData *data; - NSRect boundingBox; -} - -/*! - @property data - @brief Data associated with the graph. - */ -@property (copy) GraphElementData *data; - -// KVC methods -- (void) insertObject:(GraphElementProperty*)gep - inDataAtIndex:(NSUInteger)index; -- (void) removeObjectFromDataAtIndex:(NSUInteger)index; -- (void) replaceObjectInDataAtIndex:(NSUInteger)index - withObject:(GraphElementProperty*)gep; - -/*! - @property nodes - @brief The set of nodes. - @details The node set is cached internally, so no need to lock - the graph when enumerating. - */ -@property (readonly) NSArray *nodes; - -/*! - @property edges - @brief The set of edges. - @details The edge set is cached internally, so no need to lock - the graph when enumerating. - */ -@property (readonly) NSArray *edges; - -/*! - @property boundingBox - @brief The bounding box of a graph - @details Optional data containing the bounding box, set with - \path [use as bounding box] .... - */ -@property (assign) NSRect boundingBox; - -/*! - @property hasBoundingBox - @brief Returns true if this graph has a bounding box. - */ -@property (readonly) BOOL hasBoundingBox; - - -/*! - @brief Computes graph bounds. - @result Graph bounds. - */ -- (NSRect)bounds; - -/*! - @brief Returns the set of edges incident to the given node set. - @param nds a set of nodes. - @result A set of incident edges. - */ -- (NSSet*)incidentEdgesForNodes:(NSSet*)nds; - -/*! - @brief Returns the set of in-edges for this node. - @param nd a node. - @result A set of edges. -*/ -- (NSSet*)inEdgesForNode:(Node*)nd; - -/*! - @brief Returns the set of out-edges for this node. - @param nd a node. - @result A set of edges. -*/ -- (NSSet*)outEdgesForNode:(Node*)nd; - -/*! - @brief Gives a copy of the full subgraph with the given nodes. - @param nds a set of nodes. - @result A subgraph. - */ -- (Graph*)copyOfSubgraphWithNodes:(NSSet*)nds; - -/*! - @brief Gives a copy of the full subgraph with the given nodes. - @param nds a set of nodes. - @param zone an allocation zone - @result A subgraph. - */ -- (Graph*)copyOfSubgraphWithNodes:(NSSet*)nds zone:(NSZone*)zone; - -/*! - @brief Gives a set of edge-arrays that partition all of the edges in the graph. - @result An NSet of NSArrays of edges. - */ -- (NSSet*)pathCover; - -/*! - @brief Adds a node. - @param node - @result A GraphChange recording this action. - */ -- (GraphChange*)addNode:(Node*)node; - -/*! - @brief Removes a node. - @param node - @result A GraphChange recording this action. - */ -- (GraphChange*)removeNode:(Node*)node; - -/*! - @brief Removes a set of nodes. - @param nds a set of nodes - @result A GraphChange recording this action. - */ -- (GraphChange*)removeNodes:(NSSet *)nds; - -/*! - @brief Adds an edge. - @param edge - @result A GraphChange recording this action. - */ -- (GraphChange*)addEdge:(Edge*)edge; - -/*! - @brief Removed an edge. - @param edge - @result A GraphChange recording this action. - */ -- (GraphChange*)removeEdge:(Edge*)edge; - -/*! - @brief Removes a set of edges. - @param es a set of edges. - @result A GraphChange recording this action. - */ -- (GraphChange*)removeEdges:(NSSet *)es; - -/*! - @brief Convenience function, intializes an edge with the given - source and target and adds it. - @param source the source of the edge. - @param target the target of the edge. - @result A GraphChange recording this action. - */ -- (GraphChange*)addEdgeFrom:(Node*)source to:(Node*)target; - -/*! - @brief Return the z-index for a given node (lower is farther back). - @param node a node in the graph - @result An int - */ -- (int)indexOfNode:(Node*)node; - -/*! - @brief Set the z-index for a given node (lower is farther back). - @param idx a new z-index - @param node a node in the graph - */ -- (void)setIndex:(int)idx ofNode:(Node*)node; - -/*! - @brief Bring set of nodes forward by one. - @param nodeSet a set of nodes - */ -- (GraphChange*)bringNodesForward:(NSSet*)nodeSet; - -/*! - @brief Bring set of nodes to the front. - @param nodeSet a set of nodes - */ -- (GraphChange*)bringNodesToFront:(NSSet*)nodeSet; - -/*! - @brief Bring set of edges to the front. - @param edgeSet a set of edges - */ -- (GraphChange*)bringEdgesToFront:(NSSet*)edgeSet; - -/*! - @brief Bring set of edges forward by one. - @param edgeSet a set of edges - */ -- (GraphChange*)bringEdgesForward:(NSSet*)edgeSet; - -/*! - @brief Send set of nodes backward by one. - @param nodeSet a set of nodes - */ -- (GraphChange*)sendNodesBackward:(NSSet*)nodeSet; - -/*! - @brief Send set of edges backward by one. - @param edgeSet a set of edges - */ -- (GraphChange*)sendEdgesBackward:(NSSet*)edgeSet; - -/*! - @brief Send set of nodes to back. - @param nodeSet a set of nodes - */ -- (GraphChange*)sendNodesToBack:(NSSet*)nodeSet; - -/*! - @brief Send set of edges to back. - @param edgeSet a set of edges - */ -- (GraphChange*)sendEdgesToBack:(NSSet*)edgeSet; - - -/*! - @brief Transform every node in the graph to screen space. - @param t a transformer - */ -- (void)applyTransformer:(Transformer*)t; - -/*! - @brief Shift nodes by a given distance. - @param ns a set of nodes. - @param p an x and y distance, given as an NSPoint. - @result A GraphChange recording this action. - */ -- (GraphChange*)shiftNodes:(id)ns byPoint:(NSPoint)p; - -/*! - @brief Reverse the given edges - @param es the edges to reverse - @result A GraphChange recording this action. - */ -- (GraphChange*)reverseEdges:(NSSet *)es; - -/*! - @brief Insert the given graph into this one. Used for copy - and paste. - @param g a graph. - @result A GraphChange recording this action. - */ -- (GraphChange*)insertGraph:(Graph*)g; - -/*! - @brief Flip the subgraph defined by the given node set - horizontally. - @param nds a set of nodes. - @result A GraphChange recording this action. - */ -- (GraphChange*)flipHorizontalNodes:(NSSet*)nds; - -/*! - @brief Flip the subgraph defined by the given node set - vertically. - @param nds a set of nodes. - @result A GraphChange recording this action. - */ -- (GraphChange*)flipVerticalNodes:(NSSet*)nds; - -/*! - @brief Apply a graph change. - @details An undo manager should maintain a stack of GraphChange - objects returned. To undo a GraphChange, call this method - with [change inverse] as is argument. - @param ch a graph change. - */ -- (void)applyGraphChange:(GraphChange*)ch; - -/*! - @brief The TikZ representation of this graph. - @details The TikZ representation of this graph. The TikZ code should - contain enough data to totally reconstruct the graph. - @result A string containing TikZ code. - */ -- (NSString*)tikz; - - -/*! - @brief Copy the node set and return a table of copies, whose - keys are the original nodes. This is used to save the state - of a set of nodes in a GraphChange. - @param nds a set of nodes. - @result A NSMapTable of node copies. - */ -+ (NSMapTable*)nodeTableForNodes:(NSSet*)nds; - -+ (NSMapTable*)nodeTableForNodes:(NSSet*)nds withZone:(NSZone*)zone; - -/*! - @brief Copy the edge set and return a table of copies, whose - keys are the original edges. This is used to save the state - of a set of edges in a GraphChange. - @param es a set of edges. - @result A NSMapTable of edge copies. - */ -+ (NSMapTable*)edgeTableForEdges:(NSSet*)es; - -+ (NSMapTable*)edgeTableForEdges:(NSSet*)es withZone:(NSZone*)zone; - -/*! - @brief Compute the bounds for a set of nodes. - @param nds an enumerable collection of nodes. - @result The bounds. - */ -+ (NSRect)boundsForNodes:(id)nds; - -/*! - @brief Factory method for constructing graphs. - @result An empty graph. - */ -+ (Graph*)graph; - -/** - * Initialize an empty graph - */ -- (id)init; - -/** - * Constructs a graph from the given tikz code - * - * See TikzGraphAssembler for more information about the error argument. - */ -+ (Graph*)graphFromTikz:(NSString*)tikz error:(NSError**)e; - -/** - * Constructs a graph from the given tikz code - */ -+ (Graph*)graphFromTikz:(NSString*)tikz; - -/** - * Initialize an empty graph from the given tikz code - * - * Note that this may not return the same object it was called on, - * and will return nil if parsing failed. - * - * See TikzGraphAssembler for more information about the error argument. - */ -- (id)initFromTikz:(NSString*)tikz error:(NSError**)e; - -/** - * Initialize an empty graph from the given tikz code - * - * Note that this may not return the same object it was called on, - * and will return nil if parsing failed. - */ -- (id)initFromTikz:(NSString*)tikz; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/Graph.m b/tikzit-old/src/common/Graph.m deleted file mode 100644 index cf09a69..0000000 --- a/tikzit-old/src/common/Graph.m +++ /dev/null @@ -1,922 +0,0 @@ -// -// Graph.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "Graph.h" -#import "TikzGraphAssembler.h" -#import "Shape.h" - -@interface Graph (Private) -- (void) shapeDictionaryReplaced:(NSNotification*)notification; -@end - -@implementation Graph - -- (id)init { - self = [super init]; - if (self != nil) { - data = [[GraphElementData alloc] init]; - boundingBox = NSMakeRect(0, 0, 0, 0); - graphLock = [[NSRecursiveLock alloc] init]; - nodes = [[NSMutableArray alloc] initWithCapacity:10]; - edges = [[NSMutableArray alloc] initWithCapacity:10]; - inEdges = nil; - outEdges = nil; - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(shapeDictionaryReplaced:) - name:@"ShapeDictionaryReplaced" - object:[Shape class]]; - } - return self; -} - -- (id)initFromTikz:(NSString*)tikz error:(NSError**)e { -#if __has_feature(objc_arc) - return [TikzGraphAssembler parseTikz:tikz error:e]; -#else - [self release]; - return [[TikzGraphAssembler parseTikz:tikz error:e] retain]; -#endif -} - -- (id)initFromTikz:(NSString*)tikz { - return [self initFromTikz:tikz error:NULL]; -} - -- (id) copyWithZone:(NSZone*)zone { - Graph *newGraph = [self copyOfSubgraphWithNodes:[NSSet setWithArray:nodes] zone:zone]; - [newGraph setData:[self data]]; - return newGraph; -} - -- (void)dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - [graphLock lock]; -#if ! __has_feature(objc_arc) - [inEdges release]; - [outEdges release]; - [edges release]; - [nodes release]; - [data release]; - [graphLock unlock]; - [graphLock release]; - - [super dealloc]; -#endif -} - -- (void)sync { - [graphLock lock]; - if (dirty) { -#if ! __has_feature(objc_arc) - [inEdges release]; - [outEdges release]; -#endif - inEdges = [[NSMapTable alloc] initWithKeyOptions:NSMapTableStrongMemory valueOptions:NSMapTableStrongMemory capacity:10]; - outEdges = [[NSMapTable alloc] initWithKeyOptions:NSMapTableStrongMemory valueOptions:NSMapTableStrongMemory capacity:10]; - -#if ! __has_feature(objc_arc) - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; -#endif - - for (Edge *e in edges) { - NSMutableSet *ie = [inEdges objectForKey:[e target]]; - NSMutableSet *oe = [outEdges objectForKey:[e source]]; - - if (ie == nil) { - ie = [NSMutableSet setWithCapacity:4]; - [inEdges setObject:ie forKey:[e target]]; - } - - if (oe == nil) { - oe = [NSMutableSet setWithCapacity:4]; - [outEdges setObject:oe forKey:[e source]]; - } - - [ie addObject:e]; - [oe addObject:e]; - } - -#if ! __has_feature(objc_arc) - [pool drain]; -#endif - - dirty = NO; - } - [graphLock unlock]; -} - -@synthesize nodes; -@synthesize edges; - -@synthesize data; -- (void) insertObject:(GraphElementProperty*)gep - inDataAtIndex:(NSUInteger)index { - [data insertObject:gep atIndex:index]; -} -- (void) removeObjectFromDataAtIndex:(NSUInteger)index { - [data removeObjectAtIndex:index]; -} -- (void) replaceObjectInDataAtIndex:(NSUInteger)index - withObject:(GraphElementProperty*)gep { - [data replaceObjectAtIndex:index withObject:gep]; -} - -@synthesize boundingBox; - -- (NSRect)bounds { - [graphLock lock]; - NSRect b = [Graph boundsForNodes:nodes]; - [graphLock unlock]; - return b; -} - -- (BOOL)hasBoundingBox { - return !( - boundingBox.size.width == 0 && - boundingBox.size.height == 0 - ); -} - -- (NSSet*)inEdgesForNode:(Node*)nd { - [self sync]; -#if __has_feature(objc_arc) - return [inEdges objectForKey:nd]; -#else - return [[[inEdges objectForKey:nd] retain] autorelease]; -#endif -} - -- (NSSet*)outEdgesForNode:(Node*)nd { - [self sync]; -#if __has_feature(objc_arc) - return [outEdges objectForKey:nd]; -#else - return [[[outEdges objectForKey:nd] retain] autorelease]; -#endif -} - -- (NSSet*)incidentEdgesForNodes:(NSSet*)nds { - [self sync]; - - NSMutableSet *mset = [NSMutableSet setWithCapacity:10]; - for (Node *n in nds) { - [mset unionSet:[self inEdgesForNode:n]]; - [mset unionSet:[self outEdgesForNode:n]]; - } - - return mset; -} - -- (void)applyTransformer:(Transformer *)t { - [graphLock lock]; - for (Node *n in nodes) { - [n setPoint:[t toScreen:[n point]]]; - } - [graphLock unlock]; -} - -- (GraphChange*)addNode:(Node *)node{ - [graphLock lock]; - NSSet *addedNode; - - // addNode is a no-op if graph already contains node - if (![nodes containsObject:node]) { - [nodes addObject:node]; - dirty = YES; - addedNode = [NSSet setWithObject:node]; - } else { - addedNode = [NSSet set]; - } - [graphLock unlock]; - - return [GraphChange graphAdditionWithNodes:addedNode - edges:[NSSet set]]; -} - -- (GraphChange*)removeNode:(Node*)node { - [graphLock lock]; - NSMutableSet *affectedEdges = [NSMutableSet set]; - for (Edge *e in edges) { - if ([e source] == node || [e target] == node) { - [affectedEdges addObject:e]; - } - } - for (Edge *e in affectedEdges) { - [edges removeObject:e]; - } - [nodes removeObject:node]; - dirty = YES; - [graphLock unlock]; - - return [GraphChange graphDeletionWithNodes:[NSSet setWithObject:node] - edges:affectedEdges]; -} - -- (GraphChange*)removeNodes:(NSSet *)nds { - [graphLock lock]; - - Node *n; - Edge *e; - - NSMutableSet *affectedEdges = [NSMutableSet set]; - NSEnumerator *en = [edges objectEnumerator]; - while ((e = [en nextObject])) { - if ([nds containsObject:[e source]] || [nds containsObject:[e target]]) { - [affectedEdges addObject:e]; - } - } - - en = [affectedEdges objectEnumerator]; - while ((e = [en nextObject])) [edges removeObject:e]; - - en = [nds objectEnumerator]; - while ((n = [en nextObject])) [nodes removeObject:n]; - - dirty = YES; - [graphLock unlock]; - - return [GraphChange graphDeletionWithNodes:nds edges:affectedEdges]; -} - -- (GraphChange*)addEdge:(Edge*)edge { - [graphLock lock]; - NSSet *addedEdge; - - // addEdge is a no-op if graph already contains edge - if (![edges containsObject:edge]) { - [edges addObject:edge]; - dirty = YES; - addedEdge = [NSSet setWithObject:edge]; - } else { - addedEdge = [NSSet set]; - } - [graphLock unlock]; - - return [GraphChange graphAdditionWithNodes:[NSSet set] - edges:addedEdge]; -} - -- (GraphChange*)removeEdge:(Edge *)edge { - [graphLock lock]; - [edges removeObject:edge]; - dirty = YES; - [graphLock unlock]; - return [GraphChange graphDeletionWithNodes:[NSSet set] - edges:[NSSet setWithObject:edge]]; -} - -- (GraphChange*)removeEdges:(NSSet *)es { - [graphLock lock]; - - for (Edge *e in es) { - [edges removeObject:e]; - } - dirty = YES; - [graphLock unlock]; - return [GraphChange graphDeletionWithNodes:[NSSet set] edges:es]; -} - -- (GraphChange*)addEdgeFrom:(Node *)source to:(Node *)target { - return [self addEdge:[Edge edgeWithSource:source andTarget:target]]; -} - -- (GraphChange*)shiftNodes:(id)ns byPoint:(NSPoint)p { - NSPoint newLoc; - NSMutableSet *nodeSet = [NSMutableSet setWithCapacity:5]; - for (Node *n in ns) { - newLoc = NSMakePoint([n point].x + p.x, [n point].y + p.y); - [n setPoint:newLoc]; - [nodeSet addObject:n]; - } - return [GraphChange shiftNodes:nodeSet byPoint:p]; -} - -- (GraphChange*)reverseEdges:(NSSet *)es { - [graphLock lock]; - for (Edge *e in es) { - [e reverse]; - } - dirty = YES; - [graphLock unlock]; - return [GraphChange reverseEdges:es]; -} - -- (int)indexOfNode:(Node *)node { - return [nodes indexOfObject:node]; -} - -- (void)setIndex:(int)idx ofNode:(Node *)node { - [graphLock lock]; - - if ([nodes containsObject:node]) { - [nodes removeObject:node]; - [nodes insertObject:node atIndex:idx]; - } - - [graphLock unlock]; -} - -- (int)indexOfEdge:(Edge *)edge { - return [edges indexOfObject:edge]; -} - -- (void)setIndex:(int)idx ofEdge:(Edge *)edge { - [graphLock lock]; - - if ([edges containsObject:edge]) { - [edges removeObject:edge]; - [edges insertObject:edge atIndex:idx]; - } - - [graphLock unlock]; -} - -- (GraphChange*)bringNodesForward:(NSSet*)nodeSet { - NSArray *oldOrder = [nodes copy]; - [graphLock lock]; - // start at the top of the array and work backwards - for (int i = [nodes count]-2; i >= 0; --i) { - if ( [nodeSet containsObject:[nodes objectAtIndex:i]] && - ![nodeSet containsObject:[nodes objectAtIndex:i+1]]) - { - [self setIndex:(i+1) ofNode:[nodes objectAtIndex:i]]; - } - } - GraphChange *change = [GraphChange nodeOrderChangeFrom:oldOrder to:nodes moved:nodeSet]; - [graphLock unlock]; - -#if ! __has_feature(objc_arc) - [oldOrder release]; -#endif - - return change; -} - -- (GraphChange*)bringNodesToFront:(NSSet*)nodeSet { - NSArray *oldOrder = [nodes copy]; - int i = 0, top = [nodes count]-1; - - while (i <= top) { - if ([nodeSet containsObject:[nodes objectAtIndex:i]]) { - [self setIndex:([nodes count]-1) ofNode:[nodes objectAtIndex:i]]; - --top; - } else { - ++i; - } - } - GraphChange *change = [GraphChange nodeOrderChangeFrom:oldOrder to:nodes moved:nodeSet]; - -#if ! __has_feature(objc_arc) - [oldOrder release]; -#endif - - return change; -} - -- (GraphChange*)bringEdgesForward:(NSSet*)edgeSet { - [graphLock lock]; - NSArray *oldOrder = [edges copy]; - // start at the top of the array and work backwards - for (int i = [edges count]-2; i >= 0; --i) { - if ( [edgeSet containsObject:[edges objectAtIndex:i]] && - ![edgeSet containsObject:[edges objectAtIndex:i+1]]) - { - [self setIndex:(i+1) ofEdge:[edges objectAtIndex:i]]; - } - } - GraphChange *change = [GraphChange edgeOrderChangeFrom:oldOrder to:edges moved:edgeSet]; - [graphLock unlock]; - -#if ! __has_feature(objc_arc) - [oldOrder release]; -#endif - - return change; -} - -- (GraphChange*)bringEdgesToFront:(NSSet*)edgeSet { - NSArray *oldOrder = [edges copy]; - int i = 0, top = [edges count]-1; - - while (i <= top) { - if ([edgeSet containsObject:[edges objectAtIndex:i]]) { - [self setIndex:([edges count]-1) ofEdge:[edges objectAtIndex:i]]; - --top; - } else { - ++i; - } - } - GraphChange *change = [GraphChange edgeOrderChangeFrom:oldOrder to:edges moved:edgeSet]; - -#if ! __has_feature(objc_arc) - [oldOrder release]; -#endif - - return change; -} - -- (GraphChange*)sendNodesBackward:(NSSet*)nodeSet { - [graphLock lock]; - NSArray *oldOrder = [nodes copy]; - // start at the top of the array and work backwards - for (int i = 1; i < [nodes count]; ++i) { - if ( [nodeSet containsObject:[nodes objectAtIndex:i]] && - ![nodeSet containsObject:[nodes objectAtIndex:i-1]]) - { - [self setIndex:(i-1) ofNode:[nodes objectAtIndex:i]]; - } - } - GraphChange *change = [GraphChange nodeOrderChangeFrom:oldOrder to:nodes moved:nodeSet]; - [graphLock unlock]; - -#if ! __has_feature(objc_arc) - [oldOrder release]; -#endif - - return change; -} - -- (GraphChange*)sendEdgesBackward:(NSSet*)edgeSet { - [graphLock lock]; - NSArray *oldOrder = [edges copy]; - // start at the top of the array and work backwards - for (int i = 1; i < [edges count]; ++i) { - if ( [edgeSet containsObject:[edges objectAtIndex:i]] && - ![edgeSet containsObject:[edges objectAtIndex:i-1]]) - { - [self setIndex:(i-1) ofEdge:[edges objectAtIndex:i]]; - } - } - GraphChange *change = [GraphChange edgeOrderChangeFrom:oldOrder to:edges moved:edgeSet]; - [graphLock unlock]; - -#if ! __has_feature(objc_arc) - [oldOrder release]; -#endif - - return change; -} - -- (GraphChange*)sendNodesToBack:(NSSet*)nodeSet { - NSArray *oldOrder = [nodes copy]; - int i = [nodes count]-1, bot = 0; - - while (i >= bot) { - if ([nodeSet containsObject:[nodes objectAtIndex:i]]) { - [self setIndex:0 ofNode:[nodes objectAtIndex:i]]; - ++bot; - } else { - --i; - } - } - GraphChange *change = [GraphChange nodeOrderChangeFrom:oldOrder to:nodes moved:nodeSet]; - -#if ! __has_feature(objc_arc) - [oldOrder release]; -#endif - - return change; -} - -- (GraphChange*)sendEdgesToBack:(NSSet*)edgeSet { - NSArray *oldOrder = [edges copy]; - int i = [edges count]-1, bot = 0; - - while (i >= bot) { - if ([edgeSet containsObject:[edges objectAtIndex:i]]) { - [self setIndex:0 ofEdge:[edges objectAtIndex:i]]; - ++bot; - } else { - --i; - } - } - GraphChange *change = [GraphChange edgeOrderChangeFrom:oldOrder to:edges moved:edgeSet]; - -#if ! __has_feature(objc_arc) - [oldOrder release]; -#endif - - return change; -} - -- (GraphChange*)insertGraph:(Graph*)g { - [graphLock lock]; - - for (Node *n in [g nodes]) { - [self addNode:n]; - } - - for (Edge *e in [g edges]) { - [self addEdge:e]; - } - - dirty = YES; - - [graphLock unlock]; - - - return [GraphChange graphAdditionWithNodes:[NSSet setWithArray:[g nodes]] edges:[NSSet setWithArray:[g edges]]]; -} - -- (void)flipNodes:(NSSet*)nds horizontal:(BOOL)horiz { - [graphLock lock]; - - NSRect bds = [Graph boundsForNodes:nds]; - float ctr; - if (horiz) ctr = bds.origin.x + (bds.size.width/2); - else ctr = bds.origin.y + (bds.size.height/2); - - Node *n; - NSPoint p; - NSEnumerator *en = [nds objectEnumerator]; - while ((n = [en nextObject])) { - p = [n point]; - if (horiz) p.x = 2 * ctr - p.x; - else p.y = 2 * ctr - p.y; - [n setPoint:p]; - } - - Edge *e; - en = [edges objectEnumerator]; - while ((e = [en nextObject])) { - if ([nds containsObject:[e source]] && - [nds containsObject:[e target]]) - { - if ([e bendMode] == EdgeBendModeInOut) { - if (horiz) { - if ([e inAngle] < 0) [e setInAngle:(-180 - [e inAngle])]; - else [e setInAngle:180 - [e inAngle]]; - - if ([e outAngle] < 0) [e setOutAngle:(-180 - [e outAngle])]; - else [e setOutAngle:180 - [e outAngle]]; - } else { - [e setInAngle:-[e inAngle]]; - [e setOutAngle:-[e outAngle]]; - } - } else { - [e setBend:-[e bend]]; - } - } - } - - [graphLock unlock]; -} - -- (GraphChange*)flipHorizontalNodes:(NSSet*)nds { - [self flipNodes:nds horizontal:YES]; - return [GraphChange flipNodes:nds horizontal:YES]; -} - -- (GraphChange*)flipVerticalNodes:(NSSet*)nds { - [self flipNodes:nds horizontal:NO]; - return [GraphChange flipNodes:nds horizontal:NO]; -} - -- (Graph*)copyOfSubgraphWithNodes:(NSSet*)nds { - return [self copyOfSubgraphWithNodes:nds zone:NSDefaultMallocZone()]; -} - -- (Graph*)copyOfSubgraphWithNodes:(NSSet*)nds zone:(NSZone*)zone { - [graphLock lock]; - - NSMapTable *newNds = [Graph nodeTableForNodes:nds withZone:zone]; - Graph* newGraph = [[Graph allocWithZone:zone] init]; - - for (Node *nd in [newNds objectEnumerator]) { - [newGraph addNode:nd]; - } - - for (Edge *e in edges) { - if ([nds containsObject:[e source]] && [nds containsObject:[e target]]) { - Edge *e1 = [e copyWithZone:zone]; - [e1 setSource:[newNds objectForKey:[e source]]]; - [e1 setTarget:[newNds objectForKey:[e target]]]; - [newGraph addEdge:e1]; -#if ! __has_feature(objc_arc) - [e1 release]; // e1 belongs to newGraph -#endif - } - } - - [graphLock unlock]; - - return newGraph; -} - -- (NSSet*)pathCover { - [self sync]; - - NSMutableSet *cover = [NSMutableSet set]; -#if ! __has_feature(objc_arc) - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; -#endif - NSMutableSet *remainingEdges = [NSMutableSet setWithArray:edges]; - - while ([remainingEdges count] != 0) { - NSMutableArray *path = [[NSMutableArray alloc] init]; - NSSet *succs; - Edge *succ; - NSEnumerator *en; - - Edge *e = [remainingEdges anyObject]; - - while (e!=nil) { - [path addObject:e]; - [remainingEdges removeObject:e]; - - succs = [self outEdgesForNode:[e target]]; - en = [succs objectEnumerator]; - e = nil; - - while ((succ = [en nextObject])) { - if ([remainingEdges containsObject:succ]) e = succ; - } - } - - [cover addObject:path]; -#if ! __has_feature(objc_arc) - [path release]; -#endif - } - -#if ! __has_feature(objc_arc) - [pool drain]; -#endif - return cover; -} - -- (void)applyGraphChange:(GraphChange*)ch { - [graphLock lock]; - switch ([ch changeType]) { - case GraphAddition: - for (Node *n in [[ch affectedNodes] objectEnumerator]) { - [nodes addObject:n]; - } - - for (Edge *e in [[ch affectedEdges] objectEnumerator]) { - [edges addObject:e]; - } - - break; - case GraphDeletion: - for (Edge *e in [[ch affectedEdges] objectEnumerator]) { - [edges removeObject:e]; - } - - for (Node *n in [[ch affectedNodes] objectEnumerator]) { - [nodes removeObject:n]; - } - - break; - case NodePropertyChange: - [[ch nodeRef] setPropertiesFromNode:[ch nwNode]]; - break; - case NodesPropertyChange: - for (Node *key in [[ch nwNodeTable] keyEnumerator]) { - [key setPropertiesFromNode:[[ch nwNodeTable] objectForKey:key]]; - } - break; - case EdgePropertyChange: - [[ch edgeRef] setPropertiesFromEdge:[ch nwEdge]]; - break; - case EdgesPropertyChange: - for (Edge *key in [[ch nwEdgeTable] keyEnumerator]) { - [key setPropertiesFromEdge:[[ch nwEdgeTable] objectForKey:key]]; - } - break; - case NodesShift: - for (Node *n in [[ch affectedNodes] objectEnumerator]) { - [n setPoint:NSMakePoint([n point].x + [ch shiftPoint].x, - [n point].y + [ch shiftPoint].y)]; - } - break; - case NodesFlip: - [self flipNodes:[ch affectedNodes] horizontal:[ch horizontal]]; - break; - case EdgesReverse: - for (Edge *e in [[ch affectedEdges] objectEnumerator]) { - [e reverse]; - } - break; - case BoundingBoxChange: - [self setBoundingBox:[ch nwBoundingBox]]; - break; - case GraphPropertyChange: - [data setArray:[ch nwGraphData]]; - break; - case NodeOrderChange: - [nodes setArray:[ch nwNodeOrder]]; - break; - case EdgeOrderChange: - [edges setArray:[ch nwEdgeOrder]]; - break; - } - - dirty = YES; - [graphLock unlock]; -} - -//- (void)undoGraphChange:(GraphChange*)ch { -// [self applyGraphChange:[GraphChange inverseGraphChange:ch]]; -//} - -- (NSString*)tikz { - [graphLock lock]; - - NSMutableString *code = [NSMutableString - stringWithFormat:@"\\begin{tikzpicture}%@\n", - [[self data] tikzList]]; - - if ([self hasBoundingBox]) { - [code appendFormat:@"\t\\path [use as bounding box] (%@,%@) rectangle (%@,%@);\n", - [NSNumber numberWithFloat:boundingBox.origin.x], - [NSNumber numberWithFloat:boundingBox.origin.y], - [NSNumber numberWithFloat:boundingBox.origin.x + boundingBox.size.width], - [NSNumber numberWithFloat:boundingBox.origin.y + boundingBox.size.height]]; - } - -// NSArray *sortedNodeList = [[nodes allObjects] -// sortedArrayUsingSelector:@selector(compareTo:)]; - //NSMutableDictionary *nodeNames = [NSMutableDictionary dictionary]; - - if ([nodes count] > 0) [code appendFormat:@"\t\\begin{pgfonlayer}{nodelayer}\n"]; - - int i = 0; - for (Node *n in nodes) { - [n updateData]; - [n setName:[NSString stringWithFormat:@"%d", i]]; - [code appendFormat:@"\t\t\\node %@ (%d) at (%@, %@) {%@};\n", - [[n data] tikzList], - i, - formatFloat([n point].x, 4), - formatFloat([n point].y, 4), - [n label] - ]; - i++; - } - - if ([nodes count] > 0) [code appendFormat:@"\t\\end{pgfonlayer}\n"]; - if ([edges count] > 0) [code appendFormat:@"\t\\begin{pgfonlayer}{edgelayer}\n"]; - - NSString *nodeStr; - for (Edge *e in edges) { - [e updateData]; - - if ([e hasEdgeNode]) { - nodeStr = [NSString stringWithFormat:@"node%@{%@} ", - [[[e edgeNode] data] tikzList], - [[e edgeNode] label] - ]; - } else { - nodeStr = @""; - } - - NSString *edata = [[e data] tikzList]; - - NSString *srcAnchor; - NSString *tgtAnchor; - - if ([[e sourceAnchor] isEqual:@""]) { - srcAnchor = @""; - } else { - srcAnchor = [NSString stringWithFormat:@".%@", [e sourceAnchor]]; - } - - if ([[e targetAnchor] isEqual:@""]) { - tgtAnchor = @""; - } else { - tgtAnchor = [NSString stringWithFormat:@".%@", [e targetAnchor]]; - } - - [code appendFormat:@"\t\t\\draw%@ (%@%@) to %@(%@%@);\n", - ([edata isEqual:@""]) ? @"" : [NSString stringWithFormat:@" %@", edata], - [[e source] name], - srcAnchor, - nodeStr, - ([e source] == [e target]) ? @"" : [[e target] name], - tgtAnchor - ]; - } - - if ([edges count] > 0) [code appendFormat:@"\t\\end{pgfonlayer}\n"]; - - [code appendString:@"\\end{tikzpicture}"]; - - [graphLock unlock]; - - return code; -} - -+ (Graph*)graph { -#if __has_feature(objc_arc) - return [[self alloc] init]; -#else - return [[[self alloc] init] autorelease]; -#endif -} - -+ (Graph*)graphFromTikz:(NSString*)tikz error:(NSError**)e { - return [TikzGraphAssembler parseTikz:tikz error:e]; -} - -+ (Graph*)graphFromTikz:(NSString*)tikz { - return [self graphFromTikz:tikz error:NULL]; -} - -+ (NSMapTable*)nodeTableForNodes:(NSSet*)nds { - return [self nodeTableForNodes:nds withZone:NSDefaultMallocZone()]; -} - -+ (NSMapTable*)nodeTableForNodes:(NSSet*)nds withZone:(NSZone*)zone { - NSMapTable *tab = [[NSMapTable allocWithZone:zone] - initWithKeyOptions:NSMapTableStrongMemory - valueOptions:NSMapTableStrongMemory - capacity:[nds count]]; - for (Node *n in nds) { - Node *ncopy = [n copyWithZone:zone]; - [tab setObject:ncopy forKey:n]; -#if ! __has_feature(objc_arc) - [ncopy release]; // tab should still retain ncopy. -#endif - } -#if __has_feature(objc_arc) - return tab; -#else - return [tab autorelease]; -#endif -} - -+ (NSMapTable*)edgeTableForEdges:(NSSet*)es { - return [self edgeTableForEdges:es withZone:NSDefaultMallocZone()]; -} - -+ (NSMapTable*)edgeTableForEdges:(NSSet*)es withZone:(NSZone*)zone { - NSMapTable *tab = [[NSMapTable allocWithZone:zone] - initWithKeyOptions:NSMapTableStrongMemory - valueOptions:NSMapTableStrongMemory - capacity:[es count]]; - for (Edge *e in es) { - Edge *ecopy = [e copyWithZone:zone]; - [tab setObject:ecopy forKey:e]; -#if ! __has_feature(objc_arc) - [ecopy release]; // tab should still retain ecopy. -#endif - } - return tab; -} - - -+ (NSRect)boundsForNodes:(id)nds { - NSPoint tl, br; - NSPoint p; - BOOL hasPoints = NO; - for (Node *n in nds) { - p = [n point]; - if (!hasPoints) { - tl = p; - br = p; - hasPoints = YES; - } else { - if (p.x < tl.x) tl.x = p.x; - if (p.y > tl.y) tl.y = p.y; - if (p.x > br.x) br.x = p.x; - if (p.y < br.y) br.y = p.y; - } - } - - return (hasPoints) ? NSRectAroundPoints(tl, br) : NSMakeRect(0, 0, 0, 0); -} - -@end - -@implementation Graph (Private) -- (void) shapeDictionaryReplaced:(NSNotification*)notification { - for (Edge *e in edges) { - [e recalculateProperties]; - } -} -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/GraphChange.h b/tikzit-old/src/common/GraphChange.h deleted file mode 100644 index 0e71a90..0000000 --- a/tikzit-old/src/common/GraphChange.h +++ /dev/null @@ -1,344 +0,0 @@ -// -// GraphChange.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "Node.h" -#import "Edge.h" - -typedef enum { - GraphAddition, - GraphDeletion, - NodePropertyChange, - EdgePropertyChange, - NodesPropertyChange, - EdgesPropertyChange, - NodesShift, - NodesFlip, - EdgesReverse, - BoundingBoxChange, - GraphPropertyChange, - NodeOrderChange, - EdgeOrderChange -} ChangeType; - -/*! - @class GraphChange - @brief Store the data associated with a graph change. - @details All of the methods that change a graph return an object of type GraphChange. - Graph changes can be re-done by calling [graph applyGraphChange:]. They can be undone - by calling applyGraphChange on [change inverse]. This class has no public initializer, - so everything should be constructed by factory methods. - */ -@interface GraphChange : NSObject { - ChangeType changeType; - - // for addition, deletion, and shifts - NSSet *affectedNodes; - NSSet *affectedEdges; - NSPoint shiftPoint; - - // for flip - BOOL horizontal; - - // for property changes - Node *nodeRef; - Edge *edgeRef; - - Node *oldNode, *nwNode; - Edge *oldEdge, *nwEdge; - NSMapTable *oldNodeTable, *nwNodeTable; - NSMapTable *oldEdgeTable, *nwEdgeTable; - NSRect oldBoundingBox, nwBoundingBox; - GraphElementData *oldGraphData, *nwGraphData; - - NSArray *oldNodeOrder, *nwNodeOrder; - NSArray *oldEdgeOrder, *nwEdgeOrder; -} - -/*! - @property changeType - @brief Type of GraphChange. - */ -@property (assign) ChangeType changeType; - -/*! - @property shiftPoint - @brief A point storing a shifted distance. - */ -@property (assign) NSPoint shiftPoint; - -/*! - @property horizontal - @brief Flags whether nodes were flipped horizontally - */ -@property (assign) BOOL horizontal; - -/*! - @property affectedNodes - @brief A set of nodes affected by this change, may be undefined. - */ -@property (copy) NSSet *affectedNodes; - -/*! - @property affectedEdges - @brief A set of edges affected by this change, may be undefined. - */ -@property (copy) NSSet *affectedEdges; - -/*! - @property nodeRef - @brief A reference to a single node affected by this change, may be undefined. - */ -@property (retain) Node *nodeRef; - -/*! - @property oldNode - @brief A copy of the node pre-change. - */ -@property (copy) Node *oldNode; - -/*! - @property nwNode - @brief A copy of the node post-change. - */ -@property (copy) Node *nwNode; - -/*! - @property edgeRef - @brief A reference to a single edge affected by this change, may be undefined. - */ -@property (retain) Edge *edgeRef; - -/*! - @property oldEdge - @brief A copy of the edge pre-change. - */ -@property (copy) Edge *oldEdge; - -/*! - @property nwEdge - @brief A copy of the edge post-change. - */ -@property (copy) Edge *nwEdge; - -/*! - @property oldNodeTable - @brief A a table containing copies of a set of nodes pre-change. - */ -@property (retain) NSMapTable *oldNodeTable; - -/*! - @property nwNodeTable - @brief A a table containing copies of a set of nodes post-change. - */ -@property (retain) NSMapTable *nwNodeTable; - -/*! - @property oldEdgeTable - @brief A a table containing copies of a set of edges pre-change. - */ -@property (retain) NSMapTable *oldEdgeTable; - -/*! - @property nwEdgeTable - @brief A a table containing copies of a set of edges post-change. - */ -@property (retain) NSMapTable *nwEdgeTable; - -/*! - @property oldBoundingBox - @brief The old bounding box. - */ -@property (assign) NSRect oldBoundingBox; - -/*! - @property nwBoundingBox - @brief The new bounding box. - */ -@property (assign) NSRect nwBoundingBox; - -/*! - @property oldGraphData - @brief The old graph data. - */ -@property (copy) GraphElementData *oldGraphData; - -/*! - @property nwGraphData - @brief The new graph data. - */ -@property (copy) GraphElementData *nwGraphData; - -/*! - @property oldNodeOrder - @brief The old node list. - */ -@property (copy) NSArray *oldNodeOrder; - -/*! - @property nwNodeOrder - @brief The new node list. - */ -@property (copy) NSArray *nwNodeOrder; - -/*! - @property oldEdgeOrder - @brief The old edge list. - */ -@property (copy) NSArray *oldEdgeOrder; - -/*! - @property nwEdgeOrder - @brief The new edge list. - */ -@property (copy) NSArray *nwEdgeOrder; - -/*! - @brief Invert a GraphChange. - @details Invert a GraphChange. Calling [graph applyGraphChange:[[graph msg:...] invert]] - should leave the graph unchanged for any method of Graph that returns a - GraphChange. - @result The inverse of the current Graph Change. - */ -- (GraphChange*)invert; - -/*! - @brief Construct a graph addition. affectedNodes are the added nodes, - affectedEdges are the added edges. - @param ns a set of nodes. - @param es a set of edges. - @result A graph addition. - */ -+ (GraphChange*)graphAdditionWithNodes:(NSSet*)ns edges:(NSSet*)es; - -/*! - @brief Construct a graph deletion. affectedNodes are the deleted nodes, - affectedEdges are the deleted edges. - @param ns a set of nodes. - @param es a set of edges. - @result A graph deletion. - */ -+ (GraphChange*)graphDeletionWithNodes:(NSSet*)ns edges:(NSSet*)es; - -/*! - @brief Construct a property change of a single node. - @param nd the affected node. - @param old a copy of the node pre-change - @param nw a copy of the node post-change - @result A property change of a single node. - */ -+ (GraphChange*)propertyChangeOfNode:(Node*)nd fromOld:(Node*)old toNew:(Node*)nw; - -/*! - @brief Construct a property change of a single edge. - @param e the affected edge. - @param old a copy of the edge pre-change - @param nw a copy of the edge post-change - @result A property change of a single node. - */ -+ (GraphChange*)propertyChangeOfEdge:(Edge*)e fromOld:(Edge *)old toNew:(Edge *)nw; - -/*! - @brief Construct a property change of set of nodes. - @details Construct a property change of set of nodes. oldC and newC should be - constructed using the class method [Graph nodeTableForNodes:] before - and after the property change, respectively. The affected nodes are - keys(oldC) = keys(newC). - @param oldC a table of copies of nodes pre-change - @param newC a table of copies of nodes post-change - @result A property change of a set of nodes. - */ -+ (GraphChange*)propertyChangeOfNodesFromOldCopies:(NSMapTable*)oldC - toNewCopies:(NSMapTable*)newC; - -/*! - @brief Construct a property change of set of edges. - @details Construct a property change of set of edges. oldC and newC should be - constructed using the class method [Graph edgeTableForEdges:] before - and after the property change, respectively. The affected edges are - keys(oldC) = keys(newC). - @param oldC a table of copies of edges pre-change - @param newC a table of copies of edges post-change - @result A property change of a set of edges. - */ -+ (GraphChange*)propertyChangeOfEdgesFromOldCopies:(NSMapTable*)oldC - toNewCopies:(NSMapTable*)newC; - - -/*! - @brief Construct a shift of a set of nodes by a given point. - @param ns the affected nodes. - @param p a point storing (dx,dy) - @result A shift of a set of nodes. - */ -+ (GraphChange*)shiftNodes:(NSSet*)ns byPoint:(NSPoint)p; - -/*! - @brief Construct a horizontal or vertical flip of a set of nodes. - @param ns the affected nodes. - @param b flag for whether to flip horizontally - @result A flip of a set of nodes. - */ -+ (GraphChange*)flipNodes:(NSSet*)ns horizontal:(BOOL)b; - -/*! - @brief Construct a reversal of a set of edges. - @param es the affected edges. - @result A reverse of a set of edges. - */ -+ (GraphChange*)reverseEdges:(NSSet*)es; - -/*! - @brief Construct a bounding box change - @param oldBB the old bounding box - @param newBB the new bounding box - @result A bounding box change. - */ -+ (GraphChange*)changeBoundingBoxFrom:(NSRect)oldBB to:(NSRect)newBB; - -/*! - @brief Construct a graph property change - @param oldData the old graph data - @param newData the new graph data - @result A graph property change. - */ -+ (GraphChange*)propertyChangeOfGraphFrom:(GraphElementData*)oldData to:(GraphElementData*)newData; - -/*! - @brief Construct a node order change - @param old The old ordering - @param new The new ordering - @result A node order change - */ -+ (GraphChange*)nodeOrderChangeFrom:(NSArray*)old to:(NSArray*)new moved:(NSSet*)affected; - -/*! - @brief Construct an edge order change - @param old The old ordering - @param new The new ordering - @result A edge order change - */ -+ (GraphChange*)edgeOrderChangeFrom:(NSArray*)old to:(NSArray*)new moved:(NSSet*)affected; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/GraphChange.m b/tikzit-old/src/common/GraphChange.m deleted file mode 100644 index 29a3939..0000000 --- a/tikzit-old/src/common/GraphChange.m +++ /dev/null @@ -1,369 +0,0 @@ -// -// GraphChange.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - - -// GraphChange : store the data associated to a single, undo-able change -// to a graph. An undo manager should maintain a stack of such changes -// and undo/redo them on request using [graph applyGraphChange:...]. - -#import "GraphChange.h" - - -@implementation GraphChange - -- (id)init { - return [super init]; -} - -- (void)dealloc { -#if ! __has_feature(objc_arc) - [affectedNodes release]; - [affectedEdges release]; - [nodeRef release]; - [edgeRef release]; - [oldNode release]; - [nwNode release]; - [oldEdge release]; - [nwEdge release]; - [oldNodeTable release]; - [nwNodeTable release]; - [oldEdgeTable release]; - [nwEdgeTable release]; - [oldGraphData release]; - [nwGraphData release]; - [oldNodeOrder release]; - [nwNodeOrder release]; - [oldEdgeOrder release]; - [nwEdgeOrder release]; - - [super dealloc]; -#endif -} - -@synthesize changeType; -@synthesize shiftPoint, horizontal; -@synthesize affectedEdges, affectedNodes; -@synthesize edgeRef, nodeRef; -@synthesize nwNode, oldNode; -@synthesize nwEdge, oldEdge; -@synthesize oldNodeTable, nwNodeTable; -@synthesize oldEdgeTable, nwEdgeTable; -@synthesize oldBoundingBox, nwBoundingBox; -@synthesize oldGraphData, nwGraphData; -@synthesize oldNodeOrder, nwNodeOrder; -@synthesize oldEdgeOrder, nwEdgeOrder; - -- (GraphChange*)invert { - GraphChange *inverse = [[GraphChange alloc] init]; - [inverse setChangeType:[self changeType]]; - switch ([self changeType]) { - case GraphAddition: - [inverse setChangeType:GraphDeletion]; -#if __has_feature(objc_arc) - inverse->affectedNodes = affectedNodes; - inverse->affectedEdges = affectedEdges; -#else - inverse->affectedNodes = [affectedNodes retain]; - inverse->affectedEdges = [affectedEdges retain]; -#endif - break; - case GraphDeletion: - [inverse setChangeType:GraphAddition]; -#if __has_feature(objc_arc) - inverse->affectedNodes = affectedNodes; - inverse->affectedEdges = affectedEdges; -#else - inverse->affectedNodes = [affectedNodes retain]; - inverse->affectedEdges = [affectedEdges retain]; -#endif - break; - case NodePropertyChange: -#if __has_feature(objc_arc) - inverse->nodeRef = nodeRef; - inverse->oldNode = nwNode; - inverse->nwNode = oldNode; -#else - inverse->nodeRef = [nodeRef retain]; - inverse->oldNode = [nwNode retain]; - inverse->nwNode = [oldNode retain]; -#endif - break; - case NodesPropertyChange: -#if __has_feature(objc_arc) - -#else - inverse->oldNodeTable = [nwNodeTable retain]; - inverse->nwNodeTable = [oldNodeTable retain]; -#endif - break; - case EdgePropertyChange: -#if __has_feature(objc_arc) - inverse->edgeRef = edgeRef; - inverse->oldEdge = nwEdge; - inverse->nwEdge = oldEdge; -#else - inverse->edgeRef = [edgeRef retain]; - inverse->oldEdge = [nwEdge retain]; - inverse->nwEdge = [oldEdge retain]; -#endif - break; - case EdgesPropertyChange: -#if __has_feature(objc_arc) - inverse->oldEdgeTable = nwEdgeTable; - inverse->nwEdgeTable = oldEdgeTable; -#else - inverse->oldEdgeTable = [nwEdgeTable retain]; - inverse->nwEdgeTable = [oldEdgeTable retain]; -#endif - break; - case NodesShift: -#if __has_feature(objc_arc) - inverse->affectedNodes = affectedNodes; -#else - inverse->affectedNodes = [affectedNodes retain]; -#endif - [inverse setShiftPoint:NSMakePoint(-[self shiftPoint].x, - -[self shiftPoint].y)]; - break; - case NodesFlip: -#if __has_feature(objc_arc) - inverse->affectedNodes = affectedNodes; -#else - inverse->affectedNodes = [affectedNodes retain]; -#endif - [inverse setHorizontal:[self horizontal]]; - break; - case EdgesReverse: -#if __has_feature(objc_arc) - inverse->affectedEdges = affectedEdges; -#else - inverse->affectedEdges = [affectedEdges retain]; -#endif - break; - case BoundingBoxChange: - inverse->oldBoundingBox = nwBoundingBox; - inverse->nwBoundingBox = oldBoundingBox; - break; - case GraphPropertyChange: -#if __has_feature(objc_arc) - inverse->oldGraphData = nwGraphData; - inverse->nwGraphData = oldGraphData; -#else - inverse->oldGraphData = [nwGraphData retain]; - inverse->nwGraphData = [oldGraphData retain]; -#endif - break; - case NodeOrderChange: -#if __has_feature(objc_arc) - inverse->affectedNodes = affectedNodes; - inverse->oldNodeOrder = nwNodeOrder; - inverse->nwNodeOrder = oldNodeOrder; -#else - inverse->affectedNodes = [affectedNodes retain]; - inverse->oldNodeOrder = [nwNodeOrder retain]; - inverse->nwNodeOrder = [oldNodeOrder retain]; -#endif - break; - case EdgeOrderChange: -#if __has_feature(objc_arc) - inverse->affectedEdges = affectedEdges; - inverse->oldEdgeOrder = nwEdgeOrder; - inverse->nwEdgeOrder = oldEdgeOrder; -#else - inverse->affectedEdges = [affectedEdges retain]; - inverse->oldEdgeOrder = [nwEdgeOrder retain]; - inverse->nwEdgeOrder = [oldEdgeOrder retain]; -#endif - break; - } -#if __has_feature(objc_arc) - return inverse; -#else - return [inverse autorelease]; -#endif -} - -+ (GraphChange*)graphAdditionWithNodes:(NSSet *)ns edges:(NSSet *)es { - GraphChange *gc = [[GraphChange alloc] init]; - [gc setChangeType:GraphAddition]; - [gc setAffectedNodes:ns]; - [gc setAffectedEdges:es]; -#if __has_feature(objc_arc) - return gc; -#else - return [gc autorelease]; -#endif -} - -+ (GraphChange*)graphDeletionWithNodes:(NSSet *)ns edges:(NSSet *)es { - GraphChange *gc = [[GraphChange alloc] init]; - [gc setChangeType:GraphDeletion]; - [gc setAffectedNodes:ns]; - [gc setAffectedEdges:es]; -#if __has_feature(objc_arc) - return gc; -#else - return [gc autorelease]; -#endif -} - -+ (GraphChange*)propertyChangeOfNode:(Node*)nd fromOld:(Node*)old toNew:(Node*)nw { - GraphChange *gc = [[GraphChange alloc] init]; - [gc setChangeType:NodePropertyChange]; - [gc setNodeRef:nd]; - [gc setOldNode:old]; - [gc setNwNode:nw]; -#if __has_feature(objc_arc) - return gc; -#else - return [gc autorelease]; -#endif -} - -+ (GraphChange*)propertyChangeOfNodesFromOldCopies:(NSMapTable*)oldC - toNewCopies:(NSMapTable*)newC { - GraphChange *gc = [[GraphChange alloc] init]; - [gc setChangeType:NodesPropertyChange]; - [gc setOldNodeTable:oldC]; - [gc setNwNodeTable:newC]; -#if __has_feature(objc_arc) - return gc; -#else - return [gc autorelease]; -#endif -} - -+ (GraphChange*)propertyChangeOfEdge:(Edge*)e fromOld:(Edge *)old toNew:(Edge *)nw { - GraphChange *gc = [[GraphChange alloc] init]; - [gc setChangeType:EdgePropertyChange]; - [gc setEdgeRef:e]; - [gc setOldEdge:old]; - [gc setNwEdge:nw]; -#if __has_feature(objc_arc) - return gc; -#else - return [gc autorelease]; -#endif -} - -+ (GraphChange*)propertyChangeOfEdgesFromOldCopies:(NSMapTable*)oldC - toNewCopies:(NSMapTable*)newC { - GraphChange *gc = [[GraphChange alloc] init]; - [gc setChangeType:EdgesPropertyChange]; - [gc setOldEdgeTable:oldC]; - [gc setNwEdgeTable:newC]; -#if __has_feature(objc_arc) - return gc; -#else - return [gc autorelease]; -#endif -} - -+ (GraphChange*)shiftNodes:(NSSet*)ns byPoint:(NSPoint)p { - GraphChange *gc = [[GraphChange alloc] init]; - [gc setChangeType:NodesShift]; - [gc setAffectedNodes:ns]; - [gc setShiftPoint:p]; -#if __has_feature(objc_arc) - return gc; -#else - return [gc autorelease]; -#endif -} - -+ (GraphChange*)flipNodes:(NSSet*)ns horizontal:(BOOL)b { - GraphChange *gc = [[GraphChange alloc] init]; - [gc setChangeType:NodesFlip]; - [gc setAffectedNodes:ns]; - [gc setHorizontal:b]; -#if __has_feature(objc_arc) - return gc; -#else - return [gc autorelease]; -#endif -} - -+ (GraphChange*)reverseEdges:(NSSet*)es { - GraphChange *gc = [[GraphChange alloc] init]; - [gc setChangeType:EdgesReverse]; - [gc setAffectedEdges:es]; -#if __has_feature(objc_arc) - return gc; -#else - return [gc autorelease]; -#endif -} - -+ (GraphChange*)changeBoundingBoxFrom:(NSRect)oldBB to:(NSRect)newBB { - GraphChange *gc = [[GraphChange alloc] init]; - [gc setChangeType:BoundingBoxChange]; - [gc setOldBoundingBox:oldBB]; - [gc setNwBoundingBox:newBB]; -#if __has_feature(objc_arc) - return gc; -#else - return [gc autorelease]; -#endif -} - -+ (GraphChange*)propertyChangeOfGraphFrom:(GraphElementData*)oldData to:(GraphElementData*)newData { - GraphChange *gc = [[GraphChange alloc] init]; - [gc setChangeType:GraphPropertyChange]; - [gc setOldGraphData:oldData]; - [gc setNwGraphData:newData]; -#if __has_feature(objc_arc) - return gc; -#else - return [gc autorelease]; -#endif -} - -+ (GraphChange*)nodeOrderChangeFrom:(NSArray*)old to:(NSArray*)new moved:(NSSet*)affected { - GraphChange *gc = [[GraphChange alloc] init]; - [gc setChangeType:NodeOrderChange]; - [gc setAffectedNodes:affected]; - [gc setOldNodeOrder:old]; - [gc setNwNodeOrder:new]; -#if __has_feature(objc_arc) - return gc; -#else - return [gc autorelease]; -#endif -} - -+ (GraphChange*)edgeOrderChangeFrom:(NSArray*)old to:(NSArray*)new moved:(NSSet*)affected { - GraphChange *gc = [[GraphChange alloc] init]; - [gc setChangeType:EdgeOrderChange]; - [gc setAffectedEdges:affected]; - [gc setOldEdgeOrder:old]; - [gc setNwEdgeOrder:new]; -#if __has_feature(objc_arc) - return gc; -#else - return [gc autorelease]; -#endif -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/GraphElementData.h b/tikzit-old/src/common/GraphElementData.h deleted file mode 100644 index a65e6df..0000000 --- a/tikzit-old/src/common/GraphElementData.h +++ /dev/null @@ -1,94 +0,0 @@ -// -// GraphElementData.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - - -#import - -/*! - @class GraphElementData - @brief Store extra data associated with a graph, node, or edge. - @details Store the extra (style, ...) data associated with - a graph, node, or edge. This data is stored as a mutable - array of properties. It also implements hash-like accessors, - but care should be taken using these, as the list can contain - multiple occurrences of the same key. - - Convention: Getters and setters act on the *first* occurrence - of the key. 'Unsetters' remove *all* occurrences. - */ -@interface GraphElementData : NSMutableArray { - NSMutableArray *properties; -} - -- (id)init; -+ (id)data; - -/*! - @brief Set the given value for the *first* property matching this key. Add a - new property if it doesn't already exist. - @param val the value to set - @param key the key for this property - */ -- (void)setProperty:(NSString*)val forKey:(NSString*)key; - -/*! - @brief Remove *all* occurences of the property with the given key. - @param key - */ -- (void)unsetProperty:(NSString*)key; - -/*! - @brief Return the value of the *first* occurrence of the given key. - @param key - */ -- (NSString*)propertyForKey:(NSString*)key; - -/*! - @brief Add the given atom to the list, if it's not already present. - @param atom - */ -- (void)setAtom:(NSString*)atom; - -/*! - @brief Remove *all* occurrences of the given atom. - @param atom - */ -- (void)unsetAtom:(NSString*)atom; - -/*! - @brief Returns YES if the list contains at least one occurrence of - the given atom. - @param atom - @result A boolean value. - */ -- (BOOL)isAtomSet:(NSString*)atom; - -/*! - @brief Returns a TikZ-friendly string containing all of the properties. - @result A string. - */ -- (NSString*)tikzList; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/GraphElementData.m b/tikzit-old/src/common/GraphElementData.m deleted file mode 100644 index 41dc9aa..0000000 --- a/tikzit-old/src/common/GraphElementData.m +++ /dev/null @@ -1,188 +0,0 @@ -// -// GraphElementData.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "GraphElementData.h" -#import "GraphElementProperty.h" - - -@implementation GraphElementData - -+ (id)data { -#if __has_feature(objc_arc) - return [[self alloc] init]; -#else - return [[[self alloc] init] autorelease]; -#endif -} - -- (id)init { - self = [super init]; - if (self) { - properties = [[NSMutableArray alloc] init]; - } - return self; -} - -// all of the array messages delegate to 'properties' - -- (NSUInteger)count { return [properties count]; } -- (id)objectAtIndex:(NSUInteger)index { - return [properties objectAtIndex:index]; -} -- (NSArray*)objectsAtIndexes:(NSIndexSet*)indexes { - return [properties objectsAtIndexes:indexes]; -} - -#if __has_feature(objc_arc) -- (void) getObjects:(__unsafe_unretained id*)buffer range:(NSRange)range { -#else -- (void) getObjects:(id*)buffer range:(NSRange)range { -#endif - [properties getObjects:buffer range:range]; -} - -- (void)insertObject:(id)anObject atIndex:(NSUInteger)index { - [properties insertObject:anObject atIndex:index]; -} -- (void)removeObjectAtIndex:(NSUInteger)index { - [properties removeObjectAtIndex:index]; -} -- (void)addObject:(id)anObject { - [properties addObject:anObject]; -} -- (void)removeLastObject { - [properties removeLastObject]; -} -- (void)replaceObjectAtIndex:(NSUInteger)index withObject:(id)anObject { - [properties replaceObjectAtIndex:index withObject:anObject]; -} - -#if __has_feature(objc_arc) -- (NSUInteger) countByEnumeratingWithState:(NSFastEnumerationState *)state - objects:(__unsafe_unretained id [])stackbuf - count:(NSUInteger)len { -#else -- (NSUInteger)countByEnumeratingWithState:(NSFastEnumerationState *)state - objects:(id *)stackbuf - count:(NSUInteger)len { -#endif - return [properties countByEnumeratingWithState:state objects:stackbuf count:len]; -} - -- (void)setProperty:(NSString*)val forKey:(NSString*)key { - GraphElementProperty *m = [[GraphElementProperty alloc] initWithKeyMatching:key]; - NSInteger idx = [properties indexOfObject:m]; -#if !__has_feature(objc_arc) - [m release]; -#endif - - GraphElementProperty *p; - if (idx == NSNotFound) { - p = [[GraphElementProperty alloc] initWithPropertyValue:val forKey:key]; - [properties addObject:p]; -#if !__has_feature(objc_arc) - [p release]; -#endif - } else { - p = [properties objectAtIndex:idx]; - [p setValue:val]; - } -} - -- (void)unsetProperty:(NSString*)key { - GraphElementProperty *m = [[GraphElementProperty alloc] initWithKeyMatching:key]; - [properties removeObject:m]; -#if !__has_feature(objc_arc) - [m release]; -#endif - -} - -- (NSString*)propertyForKey:(NSString*)key { - GraphElementProperty *m = [[GraphElementProperty alloc] initWithKeyMatching:key]; - NSInteger idx = [properties indexOfObject:m]; -#if !__has_feature(objc_arc) - [m release]; -#endif - - - if (idx == NSNotFound) { - return nil; - }else { - GraphElementProperty *p = [properties objectAtIndex:idx]; - return [p value]; - } -} - -- (void)setAtom:(NSString*)atom { - GraphElementProperty *a = [[GraphElementProperty alloc] initWithAtomName:atom]; - if (![properties containsObject:a]) [properties addObject:a]; -#if !__has_feature(objc_arc) - [a release]; -#endif -} - -- (void)unsetAtom:(NSString*)atom { - GraphElementProperty *a = [[GraphElementProperty alloc] initWithAtomName:atom]; - [properties removeObject:a]; -#if !__has_feature(objc_arc) - [a release]; -#endif -} - -- (BOOL)isAtomSet:(NSString*)atom { - GraphElementProperty *a = [[GraphElementProperty alloc] initWithAtomName:atom]; - BOOL set = [properties containsObject:a]; -#if !__has_feature(objc_arc) - [a release]; -#endif - return set; -} - -- (NSString*)tikzList { - NSString *s = [properties componentsJoinedByString:@", "]; - return ([s isEqualToString:@""]) ? @"" : [NSString stringWithFormat:@"[%@]", s]; -} - -- (id)copyWithZone:(NSZone *)zone { - GraphElementData *cp = [[GraphElementData allocWithZone:zone] init]; - for (GraphElementProperty *p in properties) { - GraphElementProperty *p2 = [p copy]; - [cp addObject:p2]; -#if !__has_feature(objc_arc) - [p2 release]; -#endif - } - return cp; -} - -- (void)dealloc { -#if !__has_feature(objc_arc) - [properties release]; - [super dealloc]; -#endif -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/GraphElementProperty.h b/tikzit-old/src/common/GraphElementProperty.h deleted file mode 100644 index 057cdbb..0000000 --- a/tikzit-old/src/common/GraphElementProperty.h +++ /dev/null @@ -1,88 +0,0 @@ -// -// GraphElementProperty.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import - -/*! - @class GraphElementProperty - @brief A property. I.e. a single entry in a node's/edge's/graph's - GraphElementData table. - */ -@interface GraphElementProperty : NSObject { - NSString *key; - NSString *value; - BOOL isAtom; - BOOL isKeyMatch; -} - -@property (copy) NSString *key; -@property (copy) NSString *value; -@property (readonly) BOOL isAtom; -@property (readonly) BOOL isKeyMatch; - -/*! - @brief Initialize a new key-matching object. - @param k a key to match - @result A key-matching object. - */ -- (id)initWithKeyMatching:(NSString*)k; -+ (id)keyMatching:(NSString*)k; - -/*! - @brief Initialize a new atomic property. - @param n the atom's name - @result An atom. - */ -- (id)initWithAtomName:(NSString*)n; -+ (id)atom:(NSString*)n; - -/*! - @brief Initialize a new property. - @param v the property's value - @param k the associated key - @result A property. - */ -- (id)initWithPropertyValue:(NSString*)v forKey:(NSString*)k; -+ (id)property:(NSString*)k withValue:(NSString*)v; - -/*! - @brief A matching function for properties. - @details Two properties match iff their keys match and one of the following: - (a) they are both atomic, (b) one is a key-matching and one is a non-atomic - property, or (c) they are both non-atomic and their values match. - @param object another GraphElementProperty - @result A boolean. - */ -- (BOOL)matches:(GraphElementProperty*)object; - -/*! - @brief An alias for matches:. This allows one to use built-in methods that - filter on isEqual: for NSObjects. - @param object another GraphElementProperty - @result A boolean. - */ -- (BOOL)isEqual:(id)object; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/GraphElementProperty.m b/tikzit-old/src/common/GraphElementProperty.m deleted file mode 100644 index 25e1b15..0000000 --- a/tikzit-old/src/common/GraphElementProperty.m +++ /dev/null @@ -1,164 +0,0 @@ -// -// -// GraphElementProperty.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "GraphElementProperty.h" -#import "NSString+Tikz.h" - -@implementation GraphElementProperty - -+ (id)atom:(NSString*)n { -#if __has_feature(objc_arc) - return [[self alloc] initWithAtomName:n]; -#else - return [[[self alloc] initWithAtomName:n] autorelease]; -#endif -} -+ (id)property:(NSString*)k withValue:(NSString*)v { -#if __has_feature(objc_arc) - return [[self alloc] initWithPropertyValue:v forKey:k]; -#else - return [[[self alloc] initWithPropertyValue:v forKey:k] autorelease]; -#endif -} -+ (id)keyMatching:(NSString*)k { -#if __has_feature(objc_arc) - return [[self alloc] initWithKeyMatching:k]; -#else - return [[[self alloc] initWithKeyMatching:k] autorelease]; -#endif -} - -- (id)initWithAtomName:(NSString*)n { - self = [super init]; - if (self) { - [self setKey:n]; - isAtom = YES; - } - return self; -} - -- (id)initWithPropertyValue:(NSString*)v forKey:(NSString*)k { - self = [super init]; - if (self) { - [self setKey:k]; - [self setValue:v]; - } - return self; -} - -- (id)initWithKeyMatching:(NSString*)k { - self = [super init]; - if (self) { - [self setKey:k]; - isKeyMatch = YES; - } - return self; -} - -- (void) dealloc { -#if ! __has_feature(objc_arc) - [key release]; - [value release]; - [super dealloc]; -#endif -} - -- (void)setValue:(NSString *)v { - if (value != v) { -#if ! __has_feature(objc_arc) - [value release]; -#endif - value = [v copy]; - } -} - -- (NSString*)value { - if (isAtom) { - return @"(atom)"; - } else { - return value; - } -} - - -- (void)setKey:(NSString *)k { - if (key != k) { -#if ! __has_feature(objc_arc) - [key release]; -#endif - key = [k copy]; - } - if (key == nil) - key = @""; // don't allow nil keys -} - -- (NSString*)key { - return key; -} - -- (BOOL)isAtom { return isAtom; } -- (BOOL)isKeyMatch { return isKeyMatch; } - -- (BOOL)matches:(GraphElementProperty*)object { - // properties and atoms are taken to be incomparable - if ([self isAtom] != [object isAtom]) return NO; - - // only compare keys if (a) we are both atoms, (b) i am a key match, or (c) object is a key match - if (([self isAtom] && [object isAtom]) || [self isKeyMatch] || [object isKeyMatch]) { - return [[self key] isEqual:[object key]]; - } - - // otherwise compare key and value - return [[self key] isEqual:[object key]] && [[self value] isEqual:[object value]]; -} - -- (BOOL)isEqual:(id)object { - return [self matches:object]; -} - -- (id)copyWithZone:(NSZone*)zone { - if (isAtom) { - return [[GraphElementProperty allocWithZone:zone] initWithAtomName:[self key]]; - } else if (isKeyMatch) { - return [[GraphElementProperty allocWithZone:zone] initWithKeyMatching:[self key]]; - } else { - return [[GraphElementProperty allocWithZone:zone] initWithPropertyValue:[self value] forKey:[self key]]; - } -} - -- (NSString*)description { - if ([self isAtom]) { - return [[self key] tikzEscapedString]; - } else if ([self isKeyMatch]) { - return [NSString stringWithFormat:@"%@=*", [[self key] tikzEscapedString]]; - } else { - return [NSString stringWithFormat:@"%@=%@", - [[self key] tikzEscapedString], - [[self value] tikzEscapedString]]; - } -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/Grid.h b/tikzit-old/src/common/Grid.h deleted file mode 100644 index b267536..0000000 --- a/tikzit-old/src/common/Grid.h +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import -#import "RenderContext.h" -#import "Transformer.h" - -/*! - * Provides a grid, which can be use for snapping points - * - * The grid is divided into cells, and each cell is further subdivided. - * These subdivisions are the snap points for the grid. - */ -@interface Grid: NSObject { - Transformer *transformer; - float spacing; - int cellSubdivisions; -} - -/*! - * The number of times to subdivide the edge of each cell - * - * Each cell will be divided into cellSubdivisions^2 squares. - */ -@property (assign) int cellSubdivisions; - -/*! - * The cell spacing - * - * Each cell will be @p cellSpacing wide and @p cellSpacing high. - */ -@property (assign) float cellSpacing; - - -/*! - * Create a new grid object. - * - * @param sp the cell spacing - this will be the width and height of each cell - * @param subs the number of cell subdivisions; the cell will end up being - * divided into subs*subs squares that are each sp/subs wide and high - * @param t the transformer to be used when snapping screen points - */ -+ (Grid*) gridWithSpacing:(float)sp subdivisions:(int)subs transformer:(Transformer*)t; -/*! - * Initialize a grid object. - * - * @param sp the cell spacing - this will be the width and height of each cell - * @param subs the number of cell subdivisions; each cell will end up being - * divided into subs*subs squares that are each sp/subs wide and high - * @param t the transformer to be used when snapping screen points - */ -- (id) initWithSpacing:(float)sp subdivisions:(int)subs transformer:(Transformer*)t; - -/*! - * Snap a point in screen co-ordinates - * - * @param p the point to snap, in screen co-ordinates - * @result @p p aligned to the nearest corner of a cell subdivision - */ -- (NSPoint) snapScreenPoint:(NSPoint)p; -/*! - * Snap a point in base co-ordinates - * - * @param p the point to snap - * @result @p p aligned to the nearest corner of a cell subdivision - */ -- (NSPoint) snapPoint:(NSPoint)p; - -/** - * Renders the grid - * - * The grid is rendered across the entire surface (subject to the context's - * clip). - * - * The internal transformer is used to convert between graph co-ordinates - * and graphics co-ordinates. - * - * @param cr the context to render in - */ -- (void) renderGridInContext:(id)cr; - -/** - * Renders the grid - * - * The grid is rendered across the entire surface (subject to the context's - * clip). - * - * @param cr the context to render in - * @param t a transformer that will be used to map graph co-ordinates - * to graphics co-ordinates - */ -- (void) renderGridInContext:(id)cr transformer:(Transformer*)t; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/Grid.m b/tikzit-old/src/common/Grid.m deleted file mode 100644 index f597a4a..0000000 --- a/tikzit-old/src/common/Grid.m +++ /dev/null @@ -1,186 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * Copyright 2010 Chris Heunen - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "Grid.h" -#import "util.h" - -@implementation Grid - -+ (Grid*) gridWithSpacing:(float)sp subdivisions:(int)subs transformer:(Transformer*)t { - return [[[self alloc] initWithSpacing:sp subdivisions:subs transformer:t] autorelease]; -} - -- (id) initWithSpacing:(float)sp subdivisions:(int)subs transformer:(Transformer*)t { - self = [super init]; - - if (self) { - transformer = [t retain]; - spacing = sp; - cellSubdivisions = subs; - } - - return self; -} - -- (id) copyWithZone:(NSZone*)zone { - return [[Grid allocWithZone:zone] - initWithSpacing:spacing - subdivisions:cellSubdivisions - transformer:transformer]; -} - -- (void) dealloc { - [transformer release]; - [super dealloc]; -} - -- (int) cellSubdivisions { - return cellSubdivisions; -} - -- (void) setCellSubdivisions:(int)count { - cellSubdivisions = count; -} - -- (float) cellSpacing { - return spacing; -} - -- (void) setCellSpacing:(float)sp { - spacing = sp; -} - -- (NSPoint) snapScreenPoint:(NSPoint)point { - NSPoint gridPoint = [transformer fromScreen:point]; - return [transformer toScreen:[self snapPoint:gridPoint]]; -} - -- (NSPoint) snapPoint:(NSPoint)p { - const float snapDistance = spacing/(float)cellSubdivisions; - p.x = roundToNearest (snapDistance, p.x); - p.y = roundToNearest (snapDistance, p.y); - return p; -} - -- (void) _setupLinesForContext:(id)context withSpacing:(float)offset omittingEvery:(int)omitEvery origin:(NSPoint)origin { - NSRect clip = [context clipBoundingBox]; - float clipx1 = clip.origin.x; - float clipx2 = clipx1 + clip.size.width; - float clipy1 = clip.origin.y; - float clipy2 = clipy1 + clip.size.height; - - // left of the Y axis, moving outwards - unsigned int count = 1; - float x = origin.x - offset; - while (x >= clipx1) { - if (omitEvery == 0 || (count % omitEvery != 0)) { - [context moveTo:NSMakePoint(x, clipy1)]; - [context lineTo:NSMakePoint(x, clipy2)]; - } - - x -= offset; - ++count; - } - // right of the Y axis, moving outwards - count = 1; - x = origin.x + offset; - while (x <= clipx2) { - if (omitEvery == 0 || (count % omitEvery != 0)) { - [context moveTo:NSMakePoint(x, clipy1)]; - [context lineTo:NSMakePoint(x, clipy2)]; - } - - x += offset; - ++count; - } - - // above the Y axis, moving outwards - count = 1; - float y = origin.y - offset; - while (y >= clipy1) { - if (omitEvery == 0 || (count % omitEvery != 0)) { - [context moveTo:NSMakePoint(clipx1, y)]; - [context lineTo:NSMakePoint(clipx2, y)]; - } - - y -= offset; - ++count; - } - // below the Y axis, moving outwards - count = 1; - y = origin.y + offset; - while (y <= clipy2) { - if (omitEvery == 0 || (count % omitEvery != 0)) { - [context moveTo:NSMakePoint(clipx1, y)]; - [context lineTo:NSMakePoint(clipx2, y)]; - } - - y += offset; - ++count; - } -} - -- (void) _renderSubdivisionsWithContext:(id)context origin:(NSPoint)origin cellSize:(float)cellSize { - const float offset = cellSize / cellSubdivisions; - - [self _setupLinesForContext:context withSpacing:offset omittingEvery:cellSubdivisions origin:origin]; - - [context strokePathWithColor:MakeSolidRColor (0.9, 0.9, 1.0)]; -} - -- (void) _renderCellsWithContext:(id)context origin:(NSPoint)origin cellSize:(float)cellSize { - [self _setupLinesForContext:context withSpacing:cellSize omittingEvery:0 origin:origin]; - - [context strokePathWithColor:MakeSolidRColor (0.8, 0.8, 0.9)]; -} - -- (void) _renderAxesWithContext:(id)context origin:(NSPoint)origin { - NSRect clip = [context clipBoundingBox]; - - [context moveTo:NSMakePoint(origin.x, clip.origin.y)]; - [context lineTo:NSMakePoint(origin.x, clip.origin.y + clip.size.height)]; - [context moveTo:NSMakePoint(clip.origin.x, origin.y)]; - [context lineTo:NSMakePoint(clip.origin.x + clip.size.width, origin.y)]; - - [context strokePathWithColor:MakeSolidRColor (0.6, 0.6, 0.7)]; -} - -- (void) renderGridInContext:(id)cr { - [self renderGridInContext:cr transformer:transformer]; -} - -- (void) renderGridInContext:(id)context transformer:(Transformer*)t { - const NSPoint origin = [t toScreen:NSZeroPoint]; - const float cellSize = [t scaleToScreen:spacing]; - - [context saveState]; - - // common line settings - [context setLineWidth:1.0]; - [context setAntialiasMode:AntialiasDisabled]; - - [self _renderSubdivisionsWithContext:context origin:origin cellSize:cellSize]; - [self _renderCellsWithContext:context origin:origin cellSize:cellSize]; - [self _renderAxesWithContext:context origin:origin]; - - [context restoreState]; -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/NSError+Tikzit.h b/tikzit-old/src/common/NSError+Tikzit.h deleted file mode 100644 index 0f45fba..0000000 --- a/tikzit-old/src/common/NSError+Tikzit.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import - -NSString* const TZErrorDomain; - -enum { - TZ_ERR_OTHER = 1, - TZ_ERR_BADSTATE, - TZ_ERR_BADFORMAT, - TZ_ERR_IO, - TZ_ERR_TOOL_FAILED, - TZ_ERR_NOTDIRECTORY, - TZ_ERR_PARSE -}; - -NSString* const TZToolOutputErrorKey; - -@interface NSError(Tikzit) -+ (NSString*)tikzitErrorDomain; -+ (id) errorWithMessage:(NSString*)message code:(NSInteger)code cause:(NSError*)cause; -+ (id) errorWithMessage:(NSString*)message code:(NSInteger)code; -+ (id) errorWithLibcError:(NSInteger)errnum; -- (NSString*)toolOutput; -@end - -void logError (NSError *error, NSString *message); - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/NSError+Tikzit.m b/tikzit-old/src/common/NSError+Tikzit.m deleted file mode 100644 index 6b9404b..0000000 --- a/tikzit-old/src/common/NSError+Tikzit.m +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "NSError+Tikzit.h" - -NSString* const TZErrorDomain = @"tikzit"; - -NSString* const TZToolOutputErrorKey = @"tool-output"; - -@implementation NSError(Tikzit) -+ (NSString*)tikzitErrorDomain { - return TZErrorDomain; -} - -+ (id) errorWithMessage:(NSString*)message code:(NSInteger)code cause:(NSError*)cause { - NSMutableDictionary *errorDetail = [NSMutableDictionary dictionaryWithCapacity:2]; - [errorDetail setValue:message forKey:NSLocalizedDescriptionKey]; - if (cause) - [errorDetail setValue:cause forKey:NSUnderlyingErrorKey]; - return [self errorWithDomain:TZErrorDomain code:code userInfo:errorDetail]; -} - -+ (id) errorWithMessage:(NSString*)message code:(NSInteger)code { - NSMutableDictionary *errorDetail = [NSMutableDictionary dictionaryWithObject:message - forKey:NSLocalizedDescriptionKey]; - return [self errorWithDomain:TZErrorDomain code:code userInfo:errorDetail]; -} - -+ (id) errorWithLibcError:(NSInteger)errnum { - NSString *message = [NSString stringWithUTF8String:strerror(errnum)]; - NSMutableDictionary *errorDetail = [NSMutableDictionary dictionaryWithObject:message - forKey:NSLocalizedDescriptionKey]; - return [self errorWithDomain:NSPOSIXErrorDomain code:errnum userInfo:errorDetail]; -} - -- (NSString*)toolOutput { - return [[self userInfo] objectForKey:TZToolOutputErrorKey]; -} - -@end - -void logError (NSError *error, NSString *message) { - if (message == nil) { - NSLog (@"%@", [error localizedDescription]); - } else { - NSLog (@"%@: %@", message, [error localizedDescription]); - } -} - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/NSFileManager+Utils.h b/tikzit-old/src/common/NSFileManager+Utils.h deleted file mode 100644 index 1349919..0000000 --- a/tikzit-old/src/common/NSFileManager+Utils.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// NSFileManager+Utils.h -// TikZiT -// -// Copyright 2010 Alex Merry -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import - -@interface NSFileManager(Utils) -- (BOOL) ensureDirectoryExists:(NSString*)path error:(NSError**)error; -@end - -// vi:ft=objc:sts=4:sw=4:ts=4:noet diff --git a/tikzit-old/src/common/NSFileManager+Utils.m b/tikzit-old/src/common/NSFileManager+Utils.m deleted file mode 100644 index 87ede95..0000000 --- a/tikzit-old/src/common/NSFileManager+Utils.m +++ /dev/null @@ -1,46 +0,0 @@ -// -// NSFileManager+Utils.h -// TikZiT -// -// Copyright 2010 Alex Merry -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "NSError+Tikzit.h" - -@implementation NSFileManager(Utils) -- (BOOL) ensureDirectoryExists:(NSString*)directory error:(NSError**)error { - BOOL isDirectory = NO; - if (![self fileExistsAtPath:directory isDirectory:&isDirectory]) { - if (![self createDirectoryAtPath:directory withIntermediateDirectories:YES attributes:nil error:error]) { - return NO; - } - } else if (!isDirectory) { - if (error) { - NSMutableDictionary *errorDetail = [NSMutableDictionary dictionary]; - [errorDetail setValue:@"Directory is a file" forKey:NSLocalizedDescriptionKey]; - [errorDetail setValue:directory forKey:NSFilePathErrorKey]; - *error = [NSError errorWithDomain:TZErrorDomain code:TZ_ERR_NOTDIRECTORY userInfo:errorDetail]; - } - return NO; - } - return YES; -} -@end - -// vi:ft=objc:sts=4:sw=4:ts=4:noet diff --git a/tikzit-old/src/common/NSString+LatexConstants.h b/tikzit-old/src/common/NSString+LatexConstants.h deleted file mode 100644 index f4b5236..0000000 --- a/tikzit-old/src/common/NSString+LatexConstants.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// NSString+LatexConstants.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import - - -@interface NSString(LatexConstants) - -- (NSString*)stringByExpandingLatexConstants; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/NSString+LatexConstants.m b/tikzit-old/src/common/NSString+LatexConstants.m deleted file mode 100644 index 634c189..0000000 --- a/tikzit-old/src/common/NSString+LatexConstants.m +++ /dev/null @@ -1,212 +0,0 @@ -// -// NSString+LatexConstants.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "NSString+LatexConstants.h" - -// can't use sizeof() in non-fragile ABI (eg: clang) -#define texConstantCount 63 -static NSString *texConstantNames[texConstantCount] = { - @"alpha", - @"beta", - @"gamma", - @"delta", - @"epsilon", - @"zeta", - @"eta", - @"theta", - @"iota", - @"kappa", - @"lambda", - @"mu", - @"nu", - @"xi", - @"pi", - @"rho", - @"sigma", - @"tau", - @"upsilon", - @"phi", - @"chi", - @"psi", - @"omega", - @"Gamma", - @"Delta", - @"Theta", - @"Lambda", - @"Xi", - @"Pi", - @"Sigma", - @"Upsilon", - @"Phi", - @"Psi", - @"Omega", - - @"pm", - @"to", - @"Rightarrow", - @"Leftrightarrow", - @"forall", - @"partial", - @"exists", - @"emptyset", - @"nabla", - @"in", - @"notin", - @"prod", - @"sum", - @"surd", - @"infty", - @"wedge", - @"vee", - @"cap", - @"cup", - @"int", - @"approx", - @"neq", - @"equiv", - @"leq", - @"geq", - @"subset", - @"supset", - @"cdot", - @"ldots" -}; - -static char * texConstantCodes[texConstantCount] = { - "\u03b1","\u03b2","\u03b3","\u03b4","\u03b5","\u03b6","\u03b7", - "\u03b8","\u03b9","\u03ba","\u03bb","\u03bc","\u03bd","\u03be", - "\u03c0","\u03c1","\u03c3","\u03c4","\u03c5","\u03c6","\u03c7", - "\u03c8","\u03c9","\u0393","\u0394","\u0398","\u039b","\u039e", - "\u03a0","\u03a3","\u03a5","\u03a6","\u03a8","\u03a9", - - "\u00b1","\u2192","\u21d2","\u21d4","\u2200","\u2202","\u2203", - "\u2205","\u2207","\u2208","\u2209","\u220f","\u2211","\u221a", - "\u221e","\u2227","\u2228","\u2229","\u222a","\u222b","\u2248", - "\u2260","\u2261","\u2264","\u2265","\u2282","\u2283","\u22c5", - "\u2026" -}; - -#define texModifierCount 10 -static NSString *texModifierNames[texModifierCount] = { - @"tiny", - @"scriptsize", - @"footnotesize", - @"small", - @"normalsize", - @"large", - @"Large", - @"LARGE", - @"huge", - @"Huge" -}; - -static NSDictionary *texConstants = nil; -static NSSet *texModifiers = nil; - -@implementation NSString(LatexConstants) - -- (NSString*)stringByExpandingLatexConstants { - - if (texConstants == nil) { - NSMutableDictionary *constants = [[NSMutableDictionary alloc] initWithCapacity:texConstantCount]; - for (int i = 0; i < texConstantCount; ++i) { - [constants setObject:[NSString stringWithUTF8String:texConstantCodes[i]] forKey:texConstantNames[i]]; - } - texConstants = constants; - } - if (texModifiers == nil) { - texModifiers = [[NSSet alloc] initWithObjects:texModifierNames count:texModifierCount]; - } - - NSMutableString *buf = [[NSMutableString alloc] initWithCapacity:[self length]]; - NSMutableString *wordBuf = [[NSMutableString alloc] initWithCapacity:10]; - - unichar c_a = [@"a" characterAtIndex:0]; - unichar c_z = [@"z" characterAtIndex:0]; - unichar c_A = [@"A" characterAtIndex:0]; - unichar c_Z = [@"Z" characterAtIndex:0]; - - int state = 0; - // a tiny little DFA to replace \\([\w*]) with unicode of $1 - unichar c; - NSString *code; - int i; - for (i = 0; i<[self length]; ++i) { - c = [self characterAtIndex:i]; - switch (state) { - case 0: - if (c=='\\') { - state = 1; - } else if (c!='$') { - [buf appendFormat:@"%C", c]; - } - break; - case 1: - if ((c>=c_a && c<=c_z) || (c>=c_A && c<=c_Z)) { - [wordBuf appendFormat:@"%C", c]; - } else { - code = [texConstants objectForKey:wordBuf]; - if (code != nil) { - [buf appendString:code]; - } else if (![texModifiers containsObject:wordBuf]) { - [buf appendFormat:@"\\%@", wordBuf]; - } - - [wordBuf setString:@""]; - if (c=='\\') { - state = 1; - } else { - if (c!='$') { - [buf appendFormat:@"%C", c]; - } - state = 0; - } - - } - break; - } - } - - if (state == 1) { - code = [texConstants objectForKey:wordBuf]; - if (code != nil) { - [buf appendString:code]; - } else if (![texModifiers containsObject:wordBuf]) { - [buf appendFormat:@"\\%@", wordBuf]; - } - } - - NSString *ret = [buf copy]; -#if __has_feature(objc_arc) - return ret; -#else - [buf release]; - [wordBuf release]; - - return [ret autorelease]; -#endif -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/NSString+Tikz.h b/tikzit-old/src/common/NSString+Tikz.h deleted file mode 100644 index ea6ea40..0000000 --- a/tikzit-old/src/common/NSString+Tikz.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2013 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import - -@interface NSString (Tikz) - - (NSString*) tikzEscapedString; - - (BOOL) isValidTikzPropertyNameOrValue; - - (BOOL) isValidAnchor; -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/NSString+Tikz.m b/tikzit-old/src/common/NSString+Tikz.m deleted file mode 100644 index 1e3073b..0000000 --- a/tikzit-old/src/common/NSString+Tikz.m +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright 2013 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "NSString+Tikz.h" -#import "TikzGraphAssembler.h" - -@implementation NSString (Tikz) - -- (NSString*) tikzEscapedString { - static NSCharacterSet *avoid = nil; - if (avoid == nil) -#if __has_feature(objc_arc) - avoid = [[NSCharacterSet characterSetWithCharactersInString:@"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ<>-'0123456789. "] invertedSet]; -#else - avoid = [[[NSCharacterSet characterSetWithCharactersInString:@"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ<>-'0123456789. "] invertedSet] retain]; -#endif - - - if ([self rangeOfCharacterFromSet:avoid].length > 0) { - return [NSString stringWithFormat:@"{%@}", self]; - } else { -#if __has_feature(objc_arc) - return self; -#else - return [[self retain] autorelease]; -#endif - } -} - -- (BOOL) isValidTikzPropertyNameOrValue { - NSUInteger length = [self length]; - unsigned int brace_depth = 0; - unsigned int escape = 0; - for (NSUInteger i = 0; i < length; ++i) { - unichar c = [self characterAtIndex:i]; - - if (escape) { - escape = 0; - } else if (c == '\\') { - escape = 1; - } else if (c == '{') { - brace_depth++; - } else if (c == '}') { - if (brace_depth == 0) - return NO; - brace_depth--; - } - } - return !escape && brace_depth == 0; -} - -- (BOOL) isValidAnchor { - return [TikzGraphAssembler validateTikzEdgeAnchor:self]; -} - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/NSString+Util.h b/tikzit-old/src/common/NSString+Util.h deleted file mode 100644 index 548edb3..0000000 --- a/tikzit-old/src/common/NSString+Util.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2013 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import - -@interface NSString (Util) - + (NSString*) stringWithContentsOfFile:(NSString*)path - error:(NSError**)error; - - (id) initWithContentsOfFile:(NSString*)path - error:(NSError**)error; -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/NSString+Util.m b/tikzit-old/src/common/NSString+Util.m deleted file mode 100644 index b18f397..0000000 --- a/tikzit-old/src/common/NSString+Util.m +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright 2013 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import -#import "NSString+Util.h" -#import "NSError+Tikzit.h" - -@implementation NSString (Util) -+ (NSString*) stringWithContentsOfFile:(NSString*)path - error:(NSError**)error -{ - return [[[self alloc] initWithContentsOfFile:path error:error] autorelease]; -} -- (id) initWithContentsOfFile:(NSString*)path - error:(NSError**)error -{ - // Fun fact: on GNUstep, at least, - // [stringWithContentsOfFile:usedEncoding:error:] only - // sets error objects if the decoding fails, not if file - // access fails. - // Fun fact 2: on GNUstep, trying to read a directory using - // [stringWithContentsOfFile:] causes an out-of-memory error; - // hence we do these checks *before* trying to read the file. - NSFileManager *fm = [NSFileManager defaultManager]; - BOOL isDir = NO; - NSString *msg = nil; - if (![fm fileExistsAtPath:path isDirectory:&isDir]) { - msg = [NSString stringWithFormat:@"\"%@\" does not exist", path]; - } else if (isDir) { - msg = [NSString stringWithFormat:@"\"%@\" is a directory", path]; - } else if (![fm isReadableFileAtPath:path]) { - msg = [NSString stringWithFormat:@"\"%@\" is not readable", path]; - } - if (msg != nil) { - if (error) { - *error = [NSError errorWithMessage:msg - code:TZ_ERR_IO]; - } - return nil; - } - self = [self initWithContentsOfFile:path]; - if (self == nil) { - if (error) { - *error = [NSError errorWithMessage:@"unknown error" - code:TZ_ERR_IO]; - } - } - return self; -} -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/Node.h b/tikzit-old/src/common/Node.h deleted file mode 100644 index 1e580ce..0000000 --- a/tikzit-old/src/common/Node.h +++ /dev/null @@ -1,181 +0,0 @@ -// -// Node.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - - -// Node : store the data associated with a node. - -#import - -#import "NodeStyle.h" -#import "GraphElementData.h" - -@class GraphElementProperty; -@class Shape; -@class Transformer; - -/*! - @class Node - @brief A graph node, with associated location and style data. - */ -@interface Node : NSObject { - NSPoint point; - NodeStyle *style; - NSString *name; - NSString *label; - GraphElementData *data; -} - -/*! - @property shape - @brief The shape to use - @detail This is a convenience property that resolves the shape name - from the style, and uses a circle if there is no style. - - This property is NOT KVO-compliant - */ -@property (readonly) Shape *shape; - -/*! - @property point - @brief The point where this node is located. - */ -@property (assign) NSPoint point; - -/*! - @property style - @brief The style of this node. - */ -@property (retain) NodeStyle *style; - -/*! - @property name - @brief The name of this node. This is a temporary name and may change between - successive TikZ outputs. - */ -@property (copy) NSString *name; - -/*! - @property label - @brief The latex label that appears on this node. - */ -@property (copy) NSString *label; - -/*! - @property data - @brief Associated extra data. - */ -@property (copy) GraphElementData *data; - -// KVC methods -- (void) insertObject:(GraphElementProperty*)gep - inDataAtIndex:(NSUInteger)index; -- (void) removeObjectFromDataAtIndex:(NSUInteger)index; -- (void) replaceObjectInDataAtIndex:(NSUInteger)index - withObject:(GraphElementProperty*)gep; - -/*! - @brief Initialize a new node with the given point. - @param p a point. - @result A node. - */ -- (id)initWithPoint:(NSPoint)p; - -/*! - @brief Initialize a new node at (0,0). - @result A node. - */ -- (id)init; - -/*! - @brief Composes the shape transformer with another transformer - @param t The transform to apply before the shape transform - @result A transformer that first maps according to t, then according - to -shapeTransformer. - */ -- (Transformer*) shapeTransformerFromTransformer:(Transformer*)t; - -/*! - @brief A transformer that may be used to convert the shape to the - right position and scale - */ -- (Transformer*) shapeTransformer; - -/*! - @brief The bounding rect in the given co-ordinate system - @detail This is the bounding rect of the shape (after being - suitably translated and scaled). The label is not - considered. - @param shapeTrans The mapping from graph co-ordinates to the required - co-ordinates - @result The bounding rectangle - */ -- (NSRect) boundsUsingShapeTransform:(Transformer*)shapeTrans; - -/*! - @brief The bounding rect in graph co-ordinates - @detail This is the bounding rect of the shape (after being suitably - translated and scaled). The label is not considered. - */ -- (NSRect) boundingRect; - -/*! - @brief Try to attach a style of the correct name from the given style list. - @param styles an array of styles. - @result YES if successfully attached, NO otherwise. - */ -- (BOOL)attachStyleFromTable:(NSArray*)styles; - -/*! - @brief Set node properties from GraphElementData. - */ -- (void)updateData; - -/*! - @brief Set properties of this node to match the given node. - @param nd a node to mimic. - */ -- (void)setPropertiesFromNode:(Node *)nd; - -/*! - @brief Compare a node to another node using a lex ordering on coordinates. - @param nd another node. - @result A comparison result. - */ -- (NSComparisonResult)compareTo:(id)nd; - -/*! - @brief Factory method to construct a node with the given point. - @param p a point. - @result A node. - */ -+ (Node*)nodeWithPoint:(NSPoint)p; - -/*! - @brief Factory method to construct a node at (0,0). - @result A node. - */ -+ (Node*)node; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/Node.m b/tikzit-old/src/common/Node.m deleted file mode 100644 index c5b11d1..0000000 --- a/tikzit-old/src/common/Node.m +++ /dev/null @@ -1,214 +0,0 @@ -// -// Node.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "Node.h" - -#import "Shape.h" - - -@implementation Node - -- (id)initWithPoint:(NSPoint)p { - self = [super init]; - if (self) { - data = [[GraphElementData alloc] init]; - style = nil; - label = @""; - point = p; - } - return self; -} - -- (id)init { - return [self initWithPoint:NSMakePoint(0.0f, 0.0f)]; -} - -- (id)copyWithZone:(NSZone*)z { - Node *cp = [[Node allocWithZone:z] init]; - [cp setPropertiesFromNode:self]; - return cp; -} - -- (void)dealloc { -#if ! __has_feature(objc_arc) - [name release]; - [style release]; - [data release]; - [label release]; - [super dealloc]; -#endif -} - -- (Shape*) shape { - if (style) { - return [Shape shapeForName:[style shapeName]]; - } else { - return nil; - } -} - -- (Transformer*) shapeTransformerFromTransformer:(Transformer*)t { - // we take a copy to keep the reflection attributes -#if ! __has_feature(objc_arc) - Transformer *transformer = [[t copy] autorelease]; -#else - Transformer *transformer = [t copy]; -#endif - NSPoint screenPos = [t toScreen:point]; - [transformer setOrigin:screenPos]; - float scale = [t scale]; - if (style) { - scale *= [style scale]; - } - [transformer setScale:scale]; - return transformer; -} - -- (Transformer*) shapeTransformer { - float scale = 1.0f; - if (style) { - scale = [style scale]; - } - return [Transformer transformerWithOrigin:point andScale:scale]; -} - -- (NSRect) boundsUsingShapeTransform:(Transformer*)shapeTrans { - //if (style) { - return [shapeTrans rectToScreen:[[self shape] boundingRect]]; - /*} else { - NSRect r = NSZeroRect; - r.origin = [shapeTrans toScreen:[self point]]; - return r; - }*/ -} - -- (NSRect) boundingRect { - return [self boundsUsingShapeTransform:[self shapeTransformer]]; -} - -- (BOOL)attachStyleFromTable:(NSArray*)styles { -#if __has_feature(objc_arc) - NSString *style_name = [data propertyForKey:@"style"]; -#else - NSString *style_name = [[[data propertyForKey:@"style"] retain] autorelease]; -#endif - - [self setStyle:nil]; - - // 'none' is a reserved style - if (style_name == nil || [style_name isEqualToString:@"none"]) return YES; - - for (NodeStyle *s in styles) { - if ([[s name] compare:style_name]==NSOrderedSame) { - [self setStyle:s]; - return YES; - } - } - - // if we didn't find a style, fill in a default one - [self setStyle:[NodeStyle defaultNodeStyleWithName:style_name]]; - return NO; -} - -- (void)updateData { - if (style == nil) { - [data setProperty:@"none" forKey:@"style"]; - } else { - [data setProperty:[style name] forKey:@"style"]; - } -} - -- (void)setPropertiesFromNode:(Node*)nd { - [self setPoint:[nd point]]; - [self setStyle:[nd style]]; - [self setName:[nd name]]; - [self setData:[nd data]]; - [self setLabel:[nd label]]; -} - -+ (Node*)nodeWithPoint:(NSPoint)p { -#if __has_feature(objc_arc) - return [[Node alloc] initWithPoint:p]; -#else - return [[[Node alloc] initWithPoint:p] autorelease]; -#endif -} - -+ (Node*)node { -#if __has_feature(objc_arc) - return [[Node alloc] init]; -#else - return [[[Node alloc] init] autorelease]; -#endif -} - - -// perform a lexicographic ordering (-y, x) on coordinates. -- (NSComparisonResult)compareTo:(id)nd { - Node *node = (Node*)nd; - if (point.y > [node point].y) return NSOrderedAscending; - else if (point.y < [node point].y) return NSOrderedDescending; - else { - if (point.x < [node point].x) return NSOrderedAscending; - else if (point.x > [node point].x) return NSOrderedDescending; - else return NSOrderedSame; - } -} - -@synthesize name; -@synthesize label; -@synthesize point; - -@synthesize data; -- (void) insertObject:(GraphElementProperty*)gep - inDataAtIndex:(NSUInteger)index { - [data insertObject:gep atIndex:index]; -} -- (void) removeObjectFromDataAtIndex:(NSUInteger)index { - [data removeObjectAtIndex:index]; -} -- (void) replaceObjectInDataAtIndex:(NSUInteger)index - withObject:(GraphElementProperty*)gep { - [data replaceObjectAtIndex:index withObject:gep]; -} - -- (NodeStyle*)style { - return style; -} - -- (void)setStyle:(NodeStyle *)st { - if (style != st) { -#if __has_feature(objc_arc) - style = st; -#else - NodeStyle *oldStyle = style; - style = [st retain]; - [oldStyle release]; -#endif - } - [self updateData]; -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/NodeStyle.h b/tikzit-old/src/common/NodeStyle.h deleted file mode 100644 index 034f95d..0000000 --- a/tikzit-old/src/common/NodeStyle.h +++ /dev/null @@ -1,125 +0,0 @@ -// -// NodeStyle.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "util.h" -#import "ColorRGB.h" -#import "PropertyHolder.h" - -/*! - @class NodeStyle - @brief Store node style information. - @details Store node style information. These properties affect how a node - is displayed in TikZiT. Colors are stored in the ColorRGB struct - to avoid any Cocoa dependency. These styles should be persistant, - which should be implemented in a platform-specific category. For - OS X, this is NodeStyle+Coder. - */ -@interface NodeStyle : PropertyHolder { - int strokeThickness; - float scale; - ColorRGB *strokeColorRGB; - ColorRGB *fillColorRGB; - NSString *name; - NSString *shapeName; - NSString *category; -} - -/*! - @property strokeThickness - @brief Thickness of the stroke. - */ -@property (assign) int strokeThickness; - -/*! - @property scale - @brief Overall scale of the shape. Defaults to 1.0. - */ -@property (assign) float scale; - - -/*! - @property strokeColorRGB - @brief The stroke color used to render the node - */ -@property (copy) ColorRGB *strokeColorRGB; - -/*! - @property fillColorRGB - @brief The fill color used to render the node - */ -@property (copy) ColorRGB *fillColorRGB; - -/*! - @property name - @brief Style name. - @details Style name. This is the only thing that affects how the node - will look when the latex code is rendered. - */ -@property (copy) NSString *name; - -/*! - @property shapeName - @brief The name of the shape that will be drawn in TikZiT. - */ -@property (copy) NSString *shapeName; - -/*! - @property category - @brief ??? - */ -@property (copy) NSString *category; - -@property (readonly) NSString *tikz; -@property (readonly) BOOL strokeColorIsKnown; -@property (readonly) BOOL fillColorIsKnown; - -+ (int) defaultStrokeThickness; - -/*! - @brief Designated initializer. Construct a blank style with name 'new'. - @result A default style. - */ -- (id)init; - -/*! - @brief Create a named style. - @param nm the style name. - @result A NodeStyle with the given name. - */ -- (id)initWithName:(NSString *)nm; - -/*! - @brief Factory method for initWithName: - @param nm the style name. - @result A NodeStyle with the given name. - */ -+ (NodeStyle*)defaultNodeStyleWithName:(NSString *)nm; - -/*! - * Make this style the same as the given one - */ -- (void) updateFromStyle:(NodeStyle*)style; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/NodeStyle.m b/tikzit-old/src/common/NodeStyle.m deleted file mode 100644 index 193d44d..0000000 --- a/tikzit-old/src/common/NodeStyle.m +++ /dev/null @@ -1,246 +0,0 @@ -// -// NodeStyle.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "NodeStyle.h" -#import "Shape.h" -#import "ShapeNames.h" - -@implementation NodeStyle - -+ (void)initialize { - [self setKeys:[NSArray arrayWithObjects: - @"fillColorRGB.red", - @"fillColorRGB.blue", - @"fillColorRGB.green", - @"strokeColorRGB.red", - @"strokeColorRGB.blue", - @"strokeColorRGB.green", - @"strokeThickness", - @"shapeName", - @"name", - nil] - triggerChangeNotificationsForDependentKey:@"tikz"]; - [self setKeys:[NSArray arrayWithObjects: - @"fillColorRGB.name", - nil] - triggerChangeNotificationsForDependentKey:@"fillColorIsKnown"]; - [self setKeys:[NSArray arrayWithObjects: - @"strokeColorRGB.name", - nil] - triggerChangeNotificationsForDependentKey:@"strokeColorIsKnown"]; -} - -+ (int) defaultStrokeThickness { return 1; } - -- (id)initWithName:(NSString*)nm { - self = [super initWithNotificationName:@"NodeStylePropertyChanged"]; - if (self != nil) { - strokeThickness = [NodeStyle defaultStrokeThickness]; - scale = 1.0f; - strokeColorRGB = [[ColorRGB alloc] initWithRed:0 green:0 blue:0]; - fillColorRGB = [[ColorRGB alloc] initWithRed:255 green:255 blue:255]; - - name = nm; - category = nil; - shapeName = SHAPE_CIRCLE; - } - return self; -} - -- (id)init { - self = [self initWithName:@"new"]; - return self; -} - -- (id)copyWithZone:(NSZone*)zone { - NodeStyle *style = [[NodeStyle allocWithZone:zone] init]; - - [style setStrokeThickness:[self strokeThickness]]; - [style setScale:[self scale]]; - [style setStrokeColorRGB:[self strokeColorRGB]]; - [style setFillColorRGB:[self fillColorRGB]]; - [style setName:[self name]]; - [style setShapeName:[self shapeName]]; - [style setCategory:[self category]]; - - return style; -} - -- (void)dealloc { -#if ! __has_feature(objc_arc) - [name release]; - [category release]; - [shapeName release]; - [strokeColorRGB release]; - [fillColorRGB release]; - [super dealloc]; -#endif -} - -- (NSString*) description { - return [NSString stringWithFormat:@"Node style \"%@\"", name]; -} - -- (void) updateFromStyle:(NodeStyle*)style { - [self setStrokeThickness:[style strokeThickness]]; - [self setScale:[style scale]]; - [self setStrokeColorRGB:[style strokeColorRGB]]; - [self setFillColorRGB:[style fillColorRGB]]; - [self setName:[style name]]; - [self setShapeName:[style shapeName]]; - [self setCategory:[style category]]; -} - -+ (NodeStyle*)defaultNodeStyleWithName:(NSString*)nm { -#if __has_feature(objc_arc) - return [[NodeStyle alloc] initWithName:nm]; -#else - return [[[NodeStyle alloc] initWithName:nm] autorelease]; -#endif -} - -- (NSString*)name { - return name; -} - -- (void)setName:(NSString *)s { - if (name != s) { - NSString *oldValue = name; - name = [s copy]; - [self postPropertyChanged:@"name" oldValue:oldValue]; -#if ! __has_feature(objc_arc) - [oldValue release]; -#endif - } -} - -- (NSString*)shapeName { - return shapeName; -} - -- (void)setShapeName:(NSString *)s { - if (shapeName != s) { - NSString *oldValue = shapeName; - shapeName = [s copy]; - [self postPropertyChanged:@"shapeName" oldValue:oldValue]; -#if ! __has_feature(objc_arc) - [oldValue release]; -#endif - } -} - -- (NSString*)category { - return category; -} - -- (void)setCategory:(NSString *)s { - if (category != s) { - NSString *oldValue = category; - category = [s copy]; - [self postPropertyChanged:@"category" oldValue:oldValue]; -#if ! __has_feature(objc_arc) - [oldValue release]; -#endif - } -} - -- (int)strokeThickness { return strokeThickness; } -- (void)setStrokeThickness:(int)i { - int oldValue = strokeThickness; - strokeThickness = i; - [self postPropertyChanged:@"strokeThickness" oldValue:[NSNumber numberWithInt:oldValue]]; -} - -- (float)scale { return scale; } -- (void)setScale:(float)s { - float oldValue = scale; - scale = s; - [self postPropertyChanged:@"scale" oldValue:[NSNumber numberWithFloat:oldValue]]; -} - -- (ColorRGB*)strokeColorRGB { - return strokeColorRGB; -} - -- (void)setStrokeColorRGB:(ColorRGB*)c { - if (strokeColorRGB != c) { - ColorRGB *oldValue = strokeColorRGB; - strokeColorRGB = [c copy]; - [self postPropertyChanged:@"strokeColorRGB" oldValue:oldValue]; -#if ! __has_feature(objc_arc) - [oldValue release]; -#endif - } -} - -- (ColorRGB*)fillColorRGB { - return fillColorRGB; -} - -- (void)setFillColorRGB:(ColorRGB*)c { - if (fillColorRGB != c) { - ColorRGB *oldValue = fillColorRGB; - fillColorRGB = [c copy]; - [self postPropertyChanged:@"fillColorRGB" oldValue:oldValue]; -#if ! __has_feature(objc_arc) - [oldValue release]; -#endif - } -} - -- (NSString*)tikz { - NSString *fillName = [fillColorRGB name]; - NSString *strokeName = [strokeColorRGB name]; - NSString *stroke = @""; - if (strokeThickness != 1) { - stroke = [NSString stringWithFormat:@",line width=%@ pt", - [NSNumber numberWithFloat:(float)strokeThickness * 0.4f]]; - } - - // If the colors are unknown, fall back on hexnames. These should be defined as colors - // in the Preambles class. - if (fillName == nil) fillName = [fillColorRGB hexName]; - if (strokeName == nil) strokeName = [strokeColorRGB hexName]; - - NSString *shapeDesc = [[Shape shapeForName:shapeName] styleTikz]; - if (shapeDesc == nil) shapeDesc = shapeName; - - return [NSString stringWithFormat:@"\\tikzstyle{%@}=[%@,fill=%@,draw=%@%@]", - name, - shapeDesc, - fillName, - strokeName, - stroke]; -} - -- (BOOL)strokeColorIsKnown { - return ([strokeColorRGB name] != nil); -} - -- (BOOL)fillColorIsKnown { - return ([fillColorRGB name] != nil); -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/PickSupport.h b/tikzit-old/src/common/PickSupport.h deleted file mode 100644 index 0749649..0000000 --- a/tikzit-old/src/common/PickSupport.h +++ /dev/null @@ -1,164 +0,0 @@ -// -// PickSupport.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - - -#import -#import "Node.h" -#import "Edge.h" - -/*! - @class PickSupport - @brief Maintain the selection state of nodes and edges. - @detail In addition to the notifications listed for specific methods, - whenever the node selection changes, a "NodeSelectionChanged" - signal is emitted, and whenever the edge selection changes, - an "EdgeSelectionChanged" signal is emitted. - */ -@interface PickSupport : NSObject { - NSMutableSet *selectedNodes; - NSMutableSet *selectedEdges; -} - -/*! - @property selectedNodes - @brief A set of selected nodes. - */ -@property (readonly) NSSet *selectedNodes; - -// KVC methods -- (void)addSelectedNodesObject:(Node*)node; -- (void)addSelectedNodes:(NSSet*)nodes; -- (void)removeSelectedNodesObject:(Node*)node; -- (void)removeSelectedNodes:(NSSet*)nodes; - -/*! - @property selectedEdges - @brief A set of selected edges. - */ -@property (readonly) NSSet *selectedEdges; - -// KVC methods -- (void)addSelectedEdgesObject:(Edge*)edge; -- (void)addSelectedEdges:(NSSet*)edges; -- (void)removeSelectedEdgesObject:(Edge*)edge; -- (void)removeSelectedEdges:(NSSet*)edges; - -/*! - @brief Check if a node is selected. - @param nd a node. - @result YES if nd is selected. - */ -- (BOOL)isNodeSelected:(Node*)nd; - -/*! - @brief Check if an edge is selected. - @param e an edge. - @result YES if e is selected. - */ -- (BOOL)isEdgeSelected:(Edge*)e; - -/*! - @brief Select a node. - @details Sends the "NodeSelected" notification if the node was not - already selected, with @p nd as "node" in the userInfo - @param nd a node. - */ -- (void)selectNode:(Node*)nd; - -/*! - @brief Deselect a node. - @details Sends the "NodeDeselected" notification if the node was - selected, with @p nd as "node" in the userInfo - @param nd a node. - */ -- (void)deselectNode:(Node*)nd; - -/*! - @brief Select an edge. - @details Sends the "EdgeSelected" notification if the node was not - already selected, with @p e as "edge" in the userInfo - @param e an edge. - */ -- (void)selectEdge:(Edge*)e; - -/*! - @brief Deselect an edge. - @details Sends the "EdgeDeselected" notification if the node was - selected, with @p e as "edge" in the userInfo - @param e an edge. - */ -- (void)deselectEdge:(Edge*)e; - -/*! - @brief Toggle the selected state of the given node. - @details Sends the "NodeSelected" or "NodeDeselected" notification as - appropriate, with @p nd as "node" in the userInfo - @param nd a node. - */ -- (void)toggleNodeSelected:(Node*)nd; - -/*! - @brief Select all nodes in the given set. - @details Sends the "NodeSelectionReplaced" notification if this - caused the selection to change. - - Equivalent to selectAllNodes:nodes replacingSelection:YES - @param nodes a set of nodes. - */ -- (void)selectAllNodes:(NSSet*)nodes; - -/*! - @brief Select all nodes in the given set. - @details Sends the "NodeSelectionReplaced" notification if this - caused the selection to change. - - If replace is NO, @p nodes will be added to the existing - selection, otherwise it will replace the existing selection. - @param nodes a set of nodes. - @param replace whether to replace the existing selection - */ -- (void)selectAllNodes:(NSSet*)nodes replacingSelection:(BOOL)replace; - -/*! - @brief Deselect all nodes. - @details Sends the "NodeSelectionReplaced" notification if there - were any nodes previously selected - */ -- (void)deselectAllNodes; - -/*! - @brief Deselect all edges. - @details Sends the "EdgeSelectionReplaced" notification if there - were any edges previously selected - */ -- (void)deselectAllEdges; - -/*! - @brief Factory method for getting a new PickSupport object. - @result An empty PickSupport. - */ -+ (PickSupport*)pickSupport; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/PickSupport.m b/tikzit-old/src/common/PickSupport.m deleted file mode 100644 index 560fc2c..0000000 --- a/tikzit-old/src/common/PickSupport.m +++ /dev/null @@ -1,232 +0,0 @@ -// -// PickSupport.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "PickSupport.h" - - -@implementation PickSupport - -- (void) postNodeSelectionChanged { - [[NSNotificationCenter defaultCenter] - postNotificationName:@"NodeSelectionChanged" - object:self]; -} - -- (void) postEdgeSelectionChanged { - [[NSNotificationCenter defaultCenter] - postNotificationName:@"EdgeSelectionChanged" - object:self]; -} - -- (id) init { - self = [super init]; - - if (self) { -#if __has_feature(objc_arc) - selectedNodes = [NSMutableSet set]; - selectedEdges = [NSMutableSet set]; -#else - selectedNodes = [[NSMutableSet set] retain]; - selectedEdges = [[NSMutableSet set] retain]; -#endif - } - - return self; -} - -+ (PickSupport*)pickSupport { -#if __has_feature(objc_arc) - return [[PickSupport alloc] init]; -#else - return [[[PickSupport alloc] init] autorelease]; -#endif -} - -@synthesize selectedNodes; -- (void)addSelectedNodesObject:(Node*)node { - return [self selectNode:node]; -} -- (void)addSelectedNodes:(NSSet*)nodes { - return [self selectAllNodes:nodes replacingSelection:NO]; -} -- (void)removeSelectedNodesObject:(Node*)node { - return [self deselectNode:node]; -} -- (void)removeSelectedNodes:(NSSet*)nodes { - if ([selectedNodes count] > 0) { - [selectedNodes minusSet:nodes]; - [[NSNotificationCenter defaultCenter] - postNotificationName:@"NodeSelectionReplaced" - object:self]; - [self postNodeSelectionChanged]; - } -} - -@synthesize selectedEdges; -- (void)addSelectedEdgesObject:(Edge*)edge { - return [self selectEdge:edge]; -} -- (void)addSelectedEdges:(NSSet*)edges { - if (selectedEdges == edges) { - return; - } - if ([edges count] == 0) { - return; - } - - [selectedEdges unionSet:edges]; - [[NSNotificationCenter defaultCenter] - postNotificationName:@"EdgeSelectionReplaced" - object:self]; - [self postEdgeSelectionChanged]; -} -- (void)removeSelectedEdgesObject:(Edge*)edge { - return [self deselectEdge:edge]; -} -- (void)removeSelectedEdges:(NSSet*)edges { - if ([selectedEdges count] > 0 && [edges count] > 0) { - [selectedEdges minusSet:edges]; - [[NSNotificationCenter defaultCenter] - postNotificationName:@"EdgeSelectionReplaced" - object:self]; - [self postEdgeSelectionChanged]; - } -} - -- (BOOL)isNodeSelected:(Node*)nd { - return [selectedNodes containsObject:nd]; -} - -- (BOOL)isEdgeSelected:(Edge*)e { - return [selectedEdges containsObject:e]; -} - -- (void)selectNode:(Node*)nd { - if (nd != nil && ![selectedNodes member:nd]) { - [selectedNodes addObject:nd]; - [[NSNotificationCenter defaultCenter] - postNotificationName:@"NodeSelected" - object:self - userInfo:[NSDictionary dictionaryWithObject:nd forKey:@"node"]]; - [self postNodeSelectionChanged]; - } -} - -- (void)deselectNode:(Node*)nd { - if (nd != nil && [selectedNodes member:nd]) { - [selectedNodes removeObject:nd]; - [[NSNotificationCenter defaultCenter] - postNotificationName:@"NodeDeselected" - object:self - userInfo:[NSDictionary dictionaryWithObject:nd forKey:@"node"]]; - [self postNodeSelectionChanged]; - } -} - -- (void)selectEdge:(Edge*)e { - if (e != nil && ![selectedEdges member:e]) { - [selectedEdges addObject:e]; - [[NSNotificationCenter defaultCenter] - postNotificationName:@"EdgeSelected" - object:self - userInfo:[NSDictionary dictionaryWithObject:e forKey:@"edge"]]; - [self postEdgeSelectionChanged]; - } -} - -- (void)deselectEdge:(Edge*)e { - if (e != nil && [selectedEdges member:e]) { - [selectedEdges removeObject:e]; - [[NSNotificationCenter defaultCenter] - postNotificationName:@"EdgeDeselected" - object:self - userInfo:[NSDictionary dictionaryWithObject:e forKey:@"edge"]]; - [self postEdgeSelectionChanged]; - } -} - -- (void)toggleNodeSelected:(Node*)nd { - if ([self isNodeSelected:nd]) - [self deselectNode:nd]; - else - [self selectNode:nd]; -} - -- (void)selectAllNodes:(NSSet*)nodes { - [self selectAllNodes:nodes replacingSelection:YES]; -} - -- (void)selectAllNodes:(NSSet*)nodes replacingSelection:(BOOL)replace { - if (selectedNodes == nodes) { - return; - } - if (!replace && [nodes count] == 0) { - return; - } - - if (replace) { -#if ! __has_feature(objc_arc) - [selectedNodes release]; -#endif - selectedNodes = [nodes mutableCopy]; - } else { - [selectedNodes unionSet:nodes]; - } - [[NSNotificationCenter defaultCenter] - postNotificationName:@"NodeSelectionReplaced" - object:self]; - [self postNodeSelectionChanged]; -} - -- (void)deselectAllNodes { - if ([selectedNodes count] > 0) { - [selectedNodes removeAllObjects]; - [[NSNotificationCenter defaultCenter] - postNotificationName:@"NodeSelectionReplaced" - object:self]; - [self postNodeSelectionChanged]; - } -} - -- (void)deselectAllEdges { - if ([selectedEdges count] > 0) { - [selectedEdges removeAllObjects]; - [[NSNotificationCenter defaultCenter] - postNotificationName:@"EdgeSelectionReplaced" - object:self]; - [self postEdgeSelectionChanged]; - } -} - -- (void)dealloc { -#if ! __has_feature(objc_arc) - [selectedNodes release]; - [selectedEdges release]; - - [super dealloc]; -#endif -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/Preambles.h b/tikzit-old/src/common/Preambles.h deleted file mode 100644 index 2fb084a..0000000 --- a/tikzit-old/src/common/Preambles.h +++ /dev/null @@ -1,73 +0,0 @@ -// -// Preambles.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// Copyright 2011 Alex Merry. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "StyleManager.h" - -@class Graph; - -@interface Preambles : NSObject { - NSMutableDictionary *preambleDict; - NSString *selectedPreambleName; - NSArray *styles; - NSArray *edges; - StyleManager *styleManager; -} - -@property (copy) NSString *selectedPreambleName; -@property (retain) NSString *currentPreamble; -@property (retain) StyleManager *styleManager; -@property (readonly) NSMutableDictionary *preambleDict; - -+ (Preambles*)preambles; -- (id)init; -- (void)setStyles:(NSArray*)sty; -- (void)setEdges:(NSArray*)edg; - -- (NSString*)preambleForName:(NSString*)name; -- (BOOL)setPreamble:(NSString*)content forName:(NSString*)name; - -- (NSString*)addPreamble; -- (NSString*)addPreambleWithNameBase:(NSString*)name; - -- (BOOL)renamePreambleFrom:(NSString*)old to:(NSString*)new; -- (BOOL)removePreamble:(NSString*)name; - -- (NSEnumerator*)customPreambleNameEnumerator; - -- (void)removeAllPreambles; - -- (BOOL)selectedPreambleIsDefault; - -- (NSString*)styleDefinitions; -- (NSString*)defaultPreamble; -- (NSString*)defaultPreambleName; -- (NSString*)currentPostamble; - -- (NSString*)buildDocumentForTikz:(NSString*)tikz; -- (NSString*)buildDocumentForGraph:(Graph*)g; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/Preambles.m b/tikzit-old/src/common/Preambles.m deleted file mode 100644 index 922fc30..0000000 --- a/tikzit-old/src/common/Preambles.m +++ /dev/null @@ -1,320 +0,0 @@ -// -// Preambles.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "Preambles.h" -#import "NodeStyle.h" -#import "EdgeStyle.h" -#import "Graph.h" - -static NSString *DEF_PREAMBLE_START = -@"\\usepackage[svgnames]{xcolor}\n" -@"\\usepackage{tikz}\n" -@"\\usetikzlibrary{decorations.markings}\n" -@"\\usetikzlibrary{shapes.geometric}\n" -@"\n" -@"\\pgfdeclarelayer{edgelayer}\n" -@"\\pgfdeclarelayer{nodelayer}\n" -@"\\pgfsetlayers{edgelayer,nodelayer,main}\n" -@"\n" -@"\\tikzstyle{none}=[inner sep=0pt]\n"; - -static NSString *PREAMBLE_TAIL = -@"\n" -@"\\pagestyle{empty}\n" -@"\\usepackage[graphics,tightpage,active]{preview}\n" -@"\\PreviewEnvironment{tikzpicture}\n" -@"\\newlength{\\imagewidth}\n" -@"\\newlength{\\imagescale}\n" -@"\n" -@"\\begin{document}\n"; - -static NSString *POSTAMBLE = -@"\n" -@"\\end{document}\n"; - -@implementation Preambles - -+ (Preambles*)preambles { -#if __has_feature(objc_arc) - return [[self alloc] init]; -#else - return [[[self alloc] init] autorelease]; -#endif -} - -- (id)init { - self = [super init]; - if (self) { - selectedPreambleName = @"default"; - preambleDict = [[NSMutableDictionary alloc] initWithCapacity:1]; - [preambleDict setObject:[self defaultPreamble] forKey:@"custom"]; - styles = nil; - edges = nil; - styleManager = nil; - } - return self; -} - -- (void)dealloc { -#if ! __has_feature(objc_arc) - [selectedPreambleName release]; - [styles release]; - [styleManager release]; - [super dealloc]; -#endif -} - -- (NSString*)preambleForName:(NSString*)name { - if ([name isEqualToString:@"default"]) - return [self defaultPreamble]; - else - return [preambleDict objectForKey:name]; -} - -- (BOOL)setPreamble:(NSString*)content forName:(NSString*)name { - if ([name isEqualToString:@"default"]) - return NO; - [preambleDict setObject:content forKey:name]; - return YES; -} - -- (void)removeAllPreambles { - [preambleDict removeAllObjects]; -} - -- (NSEnumerator*)customPreambleNameEnumerator { - return [preambleDict keyEnumerator]; -} - -- (void)setStyles:(NSArray*)sty { -#if ! __has_feature(objc_arc) - [sty retain]; - [styles release]; -#endif - styles = sty; -} - -- (void)setEdges:(NSArray*)edg { -#if ! __has_feature(objc_arc) - [edg retain]; - [edges release]; -#endif - edges = edg; -} - -- (NSString*)styleDefinitions { - if (styleManager != nil) { - [self setStyles:[styleManager nodeStyles]]; - } -#if ! __has_feature(objc_arc) - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; -#endif - NSMutableString *buf = [NSMutableString string]; - NSMutableString *colbuf = [NSMutableString string]; - NSMutableSet *colors = [NSMutableSet setWithCapacity:2*[styles count]]; - for (NodeStyle *st in styles) { - [buf appendFormat:@"%@\n", [st tikz]]; - ColorRGB *fill = [st fillColorRGB]; - ColorRGB *stroke = [st strokeColorRGB]; - if ([fill name] == nil && ![colors containsObject:fill]) { - [colors addObject:fill]; - [colbuf appendFormat:@"\\definecolor{%@}{rgb}{%.3f,%.3f,%.3f}\n", - [fill hexName], [fill redFloat], [fill greenFloat], [fill blueFloat]]; - } - - if ([stroke name] == nil && ![colors containsObject:stroke]) { - [colors addObject:stroke]; - [colbuf appendFormat:@"\\definecolor{%@}{rgb}{%.3f,%.3f,%.3f}\n", - [stroke hexName], [stroke redFloat], [stroke greenFloat], [stroke blueFloat]]; - } - } - - if (styleManager != nil) { - [self setEdges:[styleManager edgeStyles]]; - } - - [buf appendString:@"\n"]; - for (EdgeStyle *st in edges) { - [buf appendFormat:@"%@\n", [st tikz]]; - ColorRGB *color = [st colorRGB]; - if (color != nil && [color name] == nil && ![colors containsObject:color]) { - [colors addObject:color]; - [colbuf appendFormat:@"\\definecolor{%@}{rgb}{%.3f,%.3f,%.3f}\n", - [color hexName], [color redFloat], [color greenFloat], [color blueFloat]]; - } - } - - NSString *defs = [[NSString alloc] initWithFormat:@"%@\n%@", colbuf, buf]; - -#if __has_feature(objc_arc) - return defs; -#else - [pool drain]; - return [defs autorelease]; -#endif -} - -- (NSString*)defaultPreamble { - return [NSString stringWithFormat:@"%@%@", - DEF_PREAMBLE_START, [self styleDefinitions]]; -} - -- (BOOL)selectedPreambleIsDefault { - return [selectedPreambleName isEqualToString:@"default"]; -} - -- (NSString*)selectedPreambleName { return selectedPreambleName; } -- (void)setSelectedPreambleName:(NSString *)sel { - if (sel != selectedPreambleName) { -#if ! __has_feature(objc_arc) - [selectedPreambleName release]; -#endif - selectedPreambleName = [sel copy]; - } -} - -- (NSString*)currentPreamble { - NSString *pre = [self preambleForName:selectedPreambleName]; - return (pre == nil) ? [self defaultPreamble] : pre; -} - -- (void)setCurrentPreamble:(NSString*)str { - if (![selectedPreambleName isEqualToString:@"default"]) - [preambleDict setObject:str forKey:selectedPreambleName]; -} - -- (StyleManager*)styleManager { - return styleManager; -} - -- (void)setStyleManager:(StyleManager *)manager { -#if ! __has_feature(objc_arc) - [manager retain]; - [styleManager release]; -#endif - styleManager = manager; -} - -- (NSString*)currentPostamble { - return POSTAMBLE; -} - -- (NSMutableDictionary*)preambleDict { - return preambleDict; -} - -- (NSString*)defaultPreambleName { - return @"default"; -} - -- (NSString*)addPreamble { - return [self addPreambleWithNameBase:@"new preamble"]; -} - -- (NSString*)addPreambleWithNameBase:(NSString*)base { - if ([preambleDict objectForKey:base] == nil) { - [self setPreamble:[self defaultPreamble] forName:base]; - return base; - } - int i = 0; - NSString *tryName = nil; - do { - ++i; - tryName = [NSString stringWithFormat:@"%@ %d", base, i]; - } while ([preambleDict objectForKey:tryName] != nil); - - [self setPreamble:[self defaultPreamble] forName:tryName]; - return tryName; -} - -- (BOOL)renamePreambleFrom:(NSString*)old to:(NSString*)new { - if ([old isEqualToString:@"default"]) - return NO; - if ([new isEqualToString:@"default"]) - return NO; - if ([old isEqualToString:new]) - return YES; - BOOL isSelected = NO; - if ([old isEqualToString:selectedPreambleName]) { - [self setSelectedPreambleName:nil]; - isSelected = YES; - } - NSString *preamble = [preambleDict objectForKey:old]; -#if ! __has_feature(objc_arc) - [preamble retain]; -#endif - [preambleDict removeObjectForKey:old]; - [preambleDict setObject:preamble forKey:new]; -#if ! __has_feature(objc_arc) - [preamble release]; -#endif - if (isSelected) { - [self setSelectedPreambleName:new]; - } - return YES; -} - -- (BOOL)removePreamble:(NSString*)name { - if ([name isEqualToString:@"default"]) - return NO; - // "name" may be held only by being the selected preamble... -#if ! __has_feature(objc_arc) - [name retain]; -#endif - if ([name isEqualToString:selectedPreambleName]) - [self setSelectedPreambleName:nil]; - [preambleDict removeObjectForKey:name]; -#if ! __has_feature(objc_arc) - [name release]; -#endif - return YES; -} - -- (NSString*)buildDocumentForTikz:(NSString*)tikz -{ - NSString *preamble = [self currentPreamble]; - NSString *doc_head = @""; - if (![preamble hasPrefix:@"\\documentclass"]) { - doc_head = @"\\documentclass{article}\n"; - } - NSString *preamble_suffix = @""; - if ([preamble rangeOfString:@"\\begin{document}" - options:NSBackwardsSearch].length == 0) { - preamble_suffix = PREAMBLE_TAIL; - } - return [NSString stringWithFormat:@"%@%@%@%@%@", - doc_head, - [self currentPreamble], - preamble_suffix, - tikz, - POSTAMBLE]; -} - -- (NSString*)buildDocumentForGraph:(Graph*)g -{ - return [self buildDocumentForTikz:[g tikz]]; -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/PropertyHolder.h b/tikzit-old/src/common/PropertyHolder.h deleted file mode 100644 index ba1d825..0000000 --- a/tikzit-old/src/common/PropertyHolder.h +++ /dev/null @@ -1,36 +0,0 @@ -// -// PropertyHolder.h -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import - -@interface PropertyHolder : NSObject { - NSString *notificationName; -} - -- (id)initWithNotificationName:(NSString*)name; -- (void) postPropertyChanged:(NSString*)property oldValue:(id)value; -- (void) postPropertyChanged:(NSString*)property; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/PropertyHolder.m b/tikzit-old/src/common/PropertyHolder.m deleted file mode 100644 index 6aaf125..0000000 --- a/tikzit-old/src/common/PropertyHolder.m +++ /dev/null @@ -1,74 +0,0 @@ -// -// PropertyHolder.m -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "PropertyHolder.h" - -@implementation PropertyHolder - - -- (id)init { - self = [super init]; - if (self) { - notificationName = @"UnknownPropertyChanged"; - } - return self; -} - -- (id)initWithNotificationName:(NSString*)n { - self = [super init]; - if (self) { - notificationName = [n copy]; - } - return self; -} - -- (void)postPropertyChanged:(NSString*)property oldValue:(id)value { - NSDictionary *userInfo; - if (value != nil) { - userInfo = [NSDictionary dictionaryWithObjectsAndKeys: - property, @"propertyName", - value, @"oldValue", - nil]; - } else { - userInfo = [NSDictionary dictionaryWithObject:property - forKey:@"propertyName"]; - } - [[NSNotificationCenter defaultCenter] postNotificationName:notificationName - object:self - userInfo:userInfo]; -} - -- (void)postPropertyChanged:(NSString*)property { - [self postPropertyChanged:property oldValue:nil]; -} - -- (void)dealloc { -#if ! __has_feature(objc_arc) - [notificationName release]; - [super dealloc]; -#endif -} - -@end - -// vi:ft=objc:ts=4:et:sts=4:sw=4 diff --git a/tikzit-old/src/common/RColor.h b/tikzit-old/src/common/RColor.h deleted file mode 100644 index 7f22547..0000000 --- a/tikzit-old/src/common/RColor.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import - -#ifndef CGFloat -#define CGFloat float -#endif - -/** - * A lightweight color structure used by RenderContext - * - * This is mainly to avoid the overhead of ColorRGB when - * rendering things not based on a NodeStyle - * - * All values range from 0.0f to 1.0f. - */ -typedef struct { - CGFloat red; - CGFloat green; - CGFloat blue; - CGFloat alpha; -} -RColor; - -/** Solid white */ -static const RColor WhiteRColor __attribute__((unused)) = {1.0, 1.0, 1.0, 1.0}; -/** Solid black */ -static const RColor BlackRColor __attribute__((unused)) = {0.0, 0.0, 0.0, 1.0}; - -/** Create a color with alpha set to 1.0 */ -RColor MakeSolidRColor (CGFloat red, CGFloat green, CGFloat blue); -/** Create a color */ -RColor MakeRColor (CGFloat red, CGFloat green, CGFloat blue, CGFloat alpha); - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/RColor.m b/tikzit-old/src/common/RColor.m deleted file mode 100644 index 49914fe..0000000 --- a/tikzit-old/src/common/RColor.m +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "RColor.h" - -RColor MakeSolidRColor (CGFloat red, CGFloat green, CGFloat blue) { - return MakeRColor (red, green, blue, 1.0); -} - -RColor MakeRColor (CGFloat red, CGFloat green, CGFloat blue, CGFloat alpha) { - RColor color; - color.red = red; - color.green = green; - color.blue = blue; - color.alpha = alpha; - return color; -} - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/RectangleShape.h b/tikzit-old/src/common/RectangleShape.h deleted file mode 100644 index 3fa0f31..0000000 --- a/tikzit-old/src/common/RectangleShape.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// RectangleShape.h -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "Shape.h" - - -@interface RectangleShape : Shape { -} - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/RectangleShape.m b/tikzit-old/src/common/RectangleShape.m deleted file mode 100644 index db9c803..0000000 --- a/tikzit-old/src/common/RectangleShape.m +++ /dev/null @@ -1,57 +0,0 @@ -// -// RectangleShape.m -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "RectangleShape.h" -#import "Node.h" -#import "Edge.h" - -@implementation RectangleShape - -- (id)init { - self = [super init]; - if (self) { - Node *n0,*n1,*n2,*n3; - float sz = 0.2f; - - n0 = [Node nodeWithPoint:NSMakePoint(-sz, sz)]; - n1 = [Node nodeWithPoint:NSMakePoint( sz, sz)]; - n2 = [Node nodeWithPoint:NSMakePoint( sz,-sz)]; - n3 = [Node nodeWithPoint:NSMakePoint(-sz,-sz)]; - - Edge *e0,*e1,*e2,*e3; - - e0 = [Edge edgeWithSource:n0 andTarget:n1]; - e1 = [Edge edgeWithSource:n1 andTarget:n2]; - e2 = [Edge edgeWithSource:n2 andTarget:n3]; - e3 = [Edge edgeWithSource:n3 andTarget:n0]; - - paths = [[NSSet alloc] initWithObjects:[NSArray arrayWithObjects:e0,e1,e2,e3,nil],nil]; - - styleTikz = @"rectangle"; - } - return self; -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/RegularPolyShape.h b/tikzit-old/src/common/RegularPolyShape.h deleted file mode 100644 index 1fd8f1e..0000000 --- a/tikzit-old/src/common/RegularPolyShape.h +++ /dev/null @@ -1,50 +0,0 @@ -// -// RegularPolyShape.h -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "Shape.h" - -/** - * A regular polygon - * - * Matches the "regular polygon" shape in the shapes.geometric - * PGF/TikZ library. - */ -@interface RegularPolyShape : Shape { -} - -/** - * Initialise a regular polygon - * - * A rotation of 0 will produce a polygon with one - * edge flat along the bottom (just like PGF/TikZ - * does it). - * - * @param sides the number of sides the polygon should have - * @param rotation the rotation of the polygon, in degrees - */ -- (id)initWithSides:(int)sides rotation:(int)rotation; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/RegularPolyShape.m b/tikzit-old/src/common/RegularPolyShape.m deleted file mode 100644 index 3555115..0000000 --- a/tikzit-old/src/common/RegularPolyShape.m +++ /dev/null @@ -1,76 +0,0 @@ -// -// RegularPolyShape.m -// TikZiT -// -// Copyright 2011 Aleks Kissinger -// Copyright 2012 Alex Merry -// All rights reserved. -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "RegularPolyShape.h" -#import "Node.h" -#import "Edge.h" -#import "util.h" - -@implementation RegularPolyShape - -- (id)initWithSides:(int)sides rotation:(int)rotation { - self = [super init]; - if (self == nil) - return nil; - - // TikZ draws regular polygons using a radius inscribed - // _inside_ the shape (touching middles of edges), not - // outside (touching points) - const float innerRadius = 0.2f; - - NSMutableArray *nodes = [NSMutableArray arrayWithCapacity:sides]; - NSMutableArray *edges = [NSMutableArray arrayWithCapacity:sides]; - - float dtheta = (M_PI * 2.0f) / ((float)sides); - float theta = (dtheta/2.0f) - (M_PI / 2.0f); - theta += degreesToRadians(rotation); - // radius of the outer circle - float radius = ABS(innerRadius / cos(dtheta)); - - for (int i = 0; i < sides; ++i) { - NSPoint p; - p.x = radius * cos(theta); - p.y = radius * sin(theta); - - [nodes addObject:[Node nodeWithPoint:p]]; - theta += dtheta; - } - - for (int i = 0; i < sides; ++i) { - [edges addObject:[Edge edgeWithSource:[nodes objectAtIndex:i] - andTarget:[nodes objectAtIndex:(i+1)%sides]]]; - } - - paths = [[NSSet alloc] initWithObjects:edges,nil]; - - styleTikz = [[NSString alloc] initWithFormat: - @"regular polygon,regular polygon sides=%d,shape border rotate=%d", - sides, rotation]; - - return self; -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/RenderContext.h b/tikzit-old/src/common/RenderContext.h deleted file mode 100644 index 8633944..0000000 --- a/tikzit-old/src/common/RenderContext.h +++ /dev/null @@ -1,156 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import -#import "RColor.h" - -typedef enum { - AntialiasDisabled, - AntialiasDefault -} AntialiasMode; - -// encapsulates a CTLine on OSX and -// a PangoLayout in GTK+ -@protocol TextLayout -@property (readonly) NSSize size; -@property (readonly) NSString *text; -- (void) showTextAt:(NSPoint)topLeft withColor:(RColor)color; -@end - -@protocol RenderContext -- (void) saveState; -- (void) restoreState; - -- (NSRect) clipBoundingBox; -- (BOOL) strokeIncludesPoint:(NSPoint)p; -- (BOOL) fillIncludesPoint:(NSPoint)p; -- (id) layoutText:(NSString*)text withSize:(CGFloat)fontSize; - -// this may not affect text rendering -- (void) setAntialiasMode:(AntialiasMode)mode; -- (void) setLineWidth:(CGFloat)width; -// setting to 0 will unset the dash -- (void) setLineDash:(CGFloat)dashLength; - -/** - * Clear the current path, including all subpaths - */ -- (void) startPath; -/** - * Close the current subpath - */ -- (void) closeSubPath; -/** - * Start a new subpath, and set the current point. - * - * The point will be the current point and the starting point - * for the subpath. - */ -- (void) moveTo:(NSPoint)p; -/** - * Add a cubic bezier curve to the current subpath. - * - * The curve will start at the current point, terminate at end and - * be defined by cp1 and cp2. - */ -- (void) curveTo:(NSPoint)end withCp1:(NSPoint)cp1 andCp2:(NSPoint)cp2; -/** - * Add a straight line to the current subpath. - * - * The line will start at the current point, and terminate at end. - */ -- (void) lineTo:(NSPoint)end; -/** - * Add a new rectangular subpath. - * - * The current point is undefined after this call. - */ -- (void) rect:(NSRect)rect; -/** - * Add a new circular subpath. - * - * The current point is undefined after this call. - */ -- (void) circleAt:(NSPoint)c withRadius:(CGFloat)r; - -/** - * Paint along the current path. - * - * The current line width and dash style will be used, - * and the colour is given by color. - * - * The path will be cleared by this call, as though - * startPath had been called. - */ -- (void) strokePathWithColor:(RColor)color; -/** - * Paint inside the current path. - * - * The fill colour is given by color. - * - * The path will be cleared by this call, as though - * startPath had been called. - */ -- (void) fillPathWithColor:(RColor)color; -/** - * Paint along and inside the current path. - * - * The current line width and dash style will be used, - * and the colour is given by color. - * - * The path will be cleared by this call, as though - * startPath had been called. - * - * Note that the fill and stroke may overlap, although - * the stroke is always painted on top, so this is only - * relevant when the stroke colour has an alpha channel - * other than 1.0f. - */ -- (void) strokePathWithColor:(RColor)scolor - andFillWithColor:(RColor)fcolor; -/** - * Paint along and inside the current path using an alpha channel. - * - * The current line width and dash style will be used, - * and the colour is given by color. - * - * The path will be cleared by this call, as though - * startPath had been called. - * - * Note that the fill and stroke may overlap, although - * the stroke is always painted on top, so this is only - * relevant when the stroke colour has an alpha channel - * other than 1.0f. - */ -- (void) strokePathWithColor:(RColor)scolor - andFillWithColor:(RColor)fcolor - usingAlpha:(CGFloat)alpha; -/** - * Set the clip to the current path. - * - * The path will be cleared by this call, as though - * startPath had been called. - */ -- (void) clipToPath; - -/** - * Paint everywhere within the clip. - */ -- (void) paintWithColor:(RColor)color; -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/Shape.h b/tikzit-old/src/common/Shape.h deleted file mode 100644 index b401a87..0000000 --- a/tikzit-old/src/common/Shape.h +++ /dev/null @@ -1,49 +0,0 @@ -// -// Shape.h -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "Transformer.h" - -@interface Shape : NSObject { - NSSet *paths; - NSRect boundingRect; // cache - NSString *styleTikz; -} - -@property (retain) NSSet *paths; -@property (readonly) NSRect boundingRect; -/** - * The tikz code to use in style properties for this shape - * - * This can return nil, in which case the shape name should be used - */ -@property (retain) NSString *styleTikz; - -- (id)init; -+ (void)refreshShapeDictionary; -+ (NSDictionary*)shapeDictionary; -+ (Shape*)shapeForName:(NSString*)shapeName; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/Shape.m b/tikzit-old/src/common/Shape.m deleted file mode 100644 index e887688..0000000 --- a/tikzit-old/src/common/Shape.m +++ /dev/null @@ -1,171 +0,0 @@ -// -// Shape.m -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "Shape.h" - -#import "Edge.h" -#import "SupportDir.h" -#import "ShapeNames.h" - -#import "CircleShape.h" -#import "DiamondShape.h" -#import "RectangleShape.h" -#import "RegularPolyShape.h" -#import "TikzShape.h" - -#import "util.h" - -@implementation Shape - -- (void)calcBoundingRect { - boundingRect = NSZeroRect; - - if (paths == nil) - return; - - for (NSArray *arr in paths) { - for (Edge *e in arr) { - boundingRect = NSUnionRect(boundingRect, [e boundingRect]); - } - } -} - -- (id)init { - self = [super init]; - if (self) { - paths = nil; - } - return self; -} - -- (NSSet*)paths {return paths;} -- (void)setPaths:(NSSet *)p { - if (paths != p) { -#if __has_feature(objc_arc) - paths = p; -#else - [paths release]; - paths = [p retain]; -#endif - [self calcBoundingRect]; - } -} - -- (NSRect)boundingRect { return boundingRect; } - -@synthesize styleTikz; - -- (id)copyWithZone:(NSZone*)zone { - Shape *cp = [[[self class] allocWithZone:zone] init]; - [cp setPaths:paths]; - [cp setStyleTikz:styleTikz]; - return cp; -} - -- (void)dealloc { -#if ! __has_feature(objc_arc) - [paths release]; - [styleTikz release]; - [super dealloc]; -#endif -} - -NSDictionary *shapeDictionary = nil; - -+ (void)addShapesInDir:(NSString*)shapeDir to:(NSMutableDictionary*)shapeDict { - NSFileManager *fileManager = [NSFileManager defaultManager]; - NSError *err = nil; - NSArray *files = [fileManager contentsOfDirectoryAtPath:shapeDir error:&err]; - - if (files != nil) { - NSString *nm; - for (NSString *f in files) { - if ([f hasSuffix:@".tikz"]) { - nm = [f substringToIndex:[f length]-5]; - TikzShape *sh = - [[TikzShape alloc] initWithTikzFile: - [shapeDir stringByAppendingPathComponent:f]]; - if (sh != nil) { - [shapeDict setObject:sh forKey:nm]; -#if ! __has_feature(objc_arc) - [sh release]; -#endif - } - } - } - } -} - -+ (void)refreshShapeDictionary { - Shape *shapes[5] = { - [[CircleShape alloc] init], - [[RectangleShape alloc] init], - [[DiamondShape alloc] init], - [[RegularPolyShape alloc] initWithSides:3 rotation:0], - [[RegularPolyShape alloc] initWithSides:3 rotation:180]}; - NSMutableDictionary *shapeDict = [[NSMutableDictionary alloc] initWithObjectsAndKeys: - shapes[0], SHAPE_CIRCLE, - shapes[1], SHAPE_RECTANGLE, - shapes[2], SHAPE_DIAMOND, - shapes[3], SHAPE_UP_TRIANGLE, - shapes[4], SHAPE_DOWN_TRIANGLE, - nil]; -#if ! __has_feature(objc_arc) - for (int i = 0; i<5; ++i) [shapes[i] release]; -#endif - - NSString *systemShapeDir = [[SupportDir systemSupportDir] stringByAppendingPathComponent:@"shapes"]; - NSString *userShapeDir = [[SupportDir userSupportDir] stringByAppendingPathComponent:@"shapes"]; - - [Shape addShapesInDir:systemShapeDir to:shapeDict]; - [Shape addShapesInDir:userShapeDir to:shapeDict]; - - NSDictionary *oldShapeDictionary = shapeDictionary; - shapeDictionary = shapeDict; - - [[NSNotificationCenter defaultCenter] - postNotificationName:@"ShapeDictionaryReplaced" - object:self]; - -#if ! __has_feature(objc_arc) - [oldShapeDictionary release]; -#endif -} - -+ (NSDictionary*)shapeDictionary { - if (shapeDictionary == nil) [Shape refreshShapeDictionary]; - return shapeDictionary; -} - -+ (Shape*)shapeForName:(NSString*)shapeName { - Shape *s = [[[self shapeDictionary] objectForKey:shapeName] copy]; -#if __has_feature(objc_arc) - return s; -#else - return [s autorelease]; -#endif -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/ShapeNames.h b/tikzit-old/src/common/ShapeNames.h deleted file mode 100644 index 66ecfb1..0000000 --- a/tikzit-old/src/common/ShapeNames.h +++ /dev/null @@ -1,27 +0,0 @@ -// -// ShapeNames.h -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// - -#define SHAPE_CIRCLE @"circle" -#define SHAPE_RECTANGLE @"rectangle" -#define SHAPE_UP_TRIANGLE @"up triangle" -#define SHAPE_DOWN_TRIANGLE @"down triangle" -#define SHAPE_DIAMOND @"diamond" - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/StyleManager.h b/tikzit-old/src/common/StyleManager.h deleted file mode 100644 index bc920e7..0000000 --- a/tikzit-old/src/common/StyleManager.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import -#import "NodeStyle.h" -#import "EdgeStyle.h" - -@interface StyleManager: NSObject { - NSMutableArray *nodeStyles; - NSMutableArray *edgeStyles; -} - -+ (StyleManager*) manager; -- (id) init; - -@property (readonly) NSArray *nodeStyles; -@property (readonly) NSArray *edgeStyles; - -// only for use by loading code -- (void) _setNodeStyles:(NSMutableArray*)styles; -- (void) _setEdgeStyles:(NSMutableArray*)styles; - -- (NodeStyle*) nodeStyleForName:(NSString*)name; -- (EdgeStyle*) edgeStyleForName:(NSString*)name; - -- (void) addNodeStyle:(NodeStyle*)style; -- (void) removeNodeStyle:(NodeStyle*)style; -- (void) addEdgeStyle:(EdgeStyle*)style; -- (void) removeEdgeStyle:(EdgeStyle*)style; - -- (void) updateFromManager:(StyleManager*)manager; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/StyleManager.m b/tikzit-old/src/common/StyleManager.m deleted file mode 100644 index 05c6c86..0000000 --- a/tikzit-old/src/common/StyleManager.m +++ /dev/null @@ -1,378 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "StyleManager.h" - -@implementation StyleManager - -- (void) nodeStylePropertyChanged:(NSNotification*)n { - if ([[[n userInfo] objectForKey:@"propertyName"] isEqual:@"name"]) { - NSDictionary *userInfo; - userInfo = [NSDictionary dictionaryWithObjectsAndKeys: - [n object], @"style", - [[n userInfo] objectForKey:@"oldValue"], @"oldName", - nil]; - [[NSNotificationCenter defaultCenter] postNotificationName:@"NodeStyleRenamed" - object:self - userInfo:userInfo]; - } -} - -- (void) ignoreAllNodeStyles { - [[NSNotificationCenter defaultCenter] - removeObserver:self - name:@"NodeStylePropertyChanged" - object:nil]; -} - -- (void) ignoreNodeStyle:(NodeStyle*)style { - [[NSNotificationCenter defaultCenter] - removeObserver:self - name:@"NodeStylePropertyChanged" - object:style]; -} - -- (void) listenToNodeStyle:(NodeStyle*)style { - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(nodeStylePropertyChanged:) - name:@"NodeStylePropertyChanged" - object:style]; -} - -- (void) edgeStylePropertyChanged:(NSNotification*)n { - if ([[[n userInfo] objectForKey:@"propertyName"] isEqual:@"name"]) { - NSDictionary *userInfo; - userInfo = [NSDictionary dictionaryWithObjectsAndKeys: - [n object], @"style", - [[n userInfo] objectForKey:@"oldValue"], @"oldName", - nil]; - [[NSNotificationCenter defaultCenter] postNotificationName:@"EdgeStyleRenamed" - object:self - userInfo:userInfo]; - } -} - -- (void) ignoreAllEdgeStyles { - [[NSNotificationCenter defaultCenter] - removeObserver:self - name:@"EdgeStylePropertyChanged" - object:nil]; -} - -- (void) ignoreEdgeStyle:(EdgeStyle*)style { - [[NSNotificationCenter defaultCenter] - removeObserver:self - name:@"EdgeStylePropertyChanged" - object:style]; -} - -- (void) listenToEdgeStyle:(EdgeStyle*)style { - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(edgeStylePropertyChanged:) - name:@"EdgeStylePropertyChanged" - object:style]; -} - -+ (StyleManager*) manager { -#if __has_feature(objc_arc) - return [[self alloc] init]; -#else - return [[[self alloc] init] autorelease]; -#endif -} - -- (id) init { - self = [super init]; - - if (self) { - // we lazily load the default styles, since they may not be needed - nodeStyles = nil; - edgeStyles = nil; - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; -#if ! __has_feature(objc_arc) - [nodeStyles release]; - [edgeStyles release]; - - [super dealloc]; -#endif -} - -- (void) loadDefaultEdgeStyles { -#if ! __has_feature(objc_arc) - [edgeStyles release]; -#endif - edgeStyles = [[NSMutableArray alloc] initWithCapacity:3]; - - EdgeStyle *simple = [EdgeStyle defaultEdgeStyleWithName:@"simple"]; - [simple setThickness:2.0f]; - [self listenToEdgeStyle:simple]; - - EdgeStyle *arrow = [EdgeStyle defaultEdgeStyleWithName:@"arrow"]; - [arrow setThickness:2.0f]; - [arrow setDecorationStyle:ED_Arrow]; - [self listenToEdgeStyle:arrow]; - - EdgeStyle *tick = [EdgeStyle defaultEdgeStyleWithName:@"tick"]; - [tick setThickness:2.0f]; - [tick setDecorationStyle:ED_Tick]; - [self listenToEdgeStyle:tick]; - - [edgeStyles addObject:simple]; - [edgeStyles addObject:arrow]; - [edgeStyles addObject:tick]; -} - -- (void) loadDefaultNodeStyles { -#if ! __has_feature(objc_arc) - [nodeStyles release]; -#endif - nodeStyles = [[NSMutableArray alloc] initWithCapacity:3]; - - NodeStyle *rn = [NodeStyle defaultNodeStyleWithName:@"rn"]; - [rn setStrokeThickness:2]; - [rn setStrokeColorRGB:[ColorRGB colorWithFloatRed:0 green:0 blue:0]]; - [rn setFillColorRGB:[ColorRGB colorWithFloatRed:1 green:0 blue:0]]; - [self listenToNodeStyle:rn]; - - NodeStyle *gn = [NodeStyle defaultNodeStyleWithName:@"gn"]; - [gn setStrokeThickness:2]; - [gn setStrokeColorRGB:[ColorRGB colorWithFloatRed:0 green:0 blue:0]]; - [gn setFillColorRGB:[ColorRGB colorWithFloatRed:0 green:1 blue:0]]; - [self listenToNodeStyle:gn]; - - NodeStyle *yn = [NodeStyle defaultNodeStyleWithName:@"yn"]; - [yn setStrokeThickness:2]; - [yn setStrokeColorRGB:[ColorRGB colorWithFloatRed:0 green:0 blue:0]]; - [yn setFillColorRGB:[ColorRGB colorWithFloatRed:1 green:1 blue:0]]; - [self listenToNodeStyle:yn]; - - [nodeStyles addObject:rn]; - [nodeStyles addObject:gn]; - [nodeStyles addObject:yn]; -} - -- (void) postNodeStyleAdded:(NodeStyle*)style { - [[NSNotificationCenter defaultCenter] postNotificationName:@"NodeStyleAdded" - object:self - userInfo:[NSDictionary dictionaryWithObject:style forKey:@"style"]]; -} - -- (void) postNodeStyleRemoved:(NodeStyle*)style { - [[NSNotificationCenter defaultCenter] postNotificationName:@"NodeStyleRemoved" - object:self - userInfo:[NSDictionary dictionaryWithObject:style forKey:@"style"]]; -} - -- (void) postEdgeStyleAdded:(EdgeStyle*)style { - [[NSNotificationCenter defaultCenter] postNotificationName:@"EdgeStyleAdded" - object:self - userInfo:[NSDictionary dictionaryWithObject:style forKey:@"style"]]; -} - -- (void) postEdgeStyleRemoved:(EdgeStyle*)style { - [[NSNotificationCenter defaultCenter] postNotificationName:@"EdgeStyleRemoved" - object:self - userInfo:[NSDictionary dictionaryWithObject:style forKey:@"style"]]; -} - -- (void) postNodeStylesReplaced { - [[NSNotificationCenter defaultCenter] postNotificationName:@"NodeStylesReplaced" object:self]; -} - -- (void) postEdgeStylesReplaced { - [[NSNotificationCenter defaultCenter] postNotificationName:@"EdgeStylesReplaced" object:self]; -} - -- (NSArray*) nodeStyles { - if (nodeStyles == nil) { - [self loadDefaultNodeStyles]; - } - return nodeStyles; -} - -- (NSArray*) edgeStyles { - if (edgeStyles == nil) { - [self loadDefaultEdgeStyles]; - } - return edgeStyles; -} - -- (void) _setNodeStyles:(NSMutableArray*)styles { - [self ignoreAllNodeStyles]; -#if ! __has_feature(objc_arc) - [nodeStyles release]; - [styles retain]; -#endif - nodeStyles = styles; - for (NodeStyle *style in styles) { - [self listenToNodeStyle:style]; - } - [self postNodeStylesReplaced]; -} - -- (void) _setEdgeStyles:(NSMutableArray*)styles { - [self ignoreAllEdgeStyles]; -#if ! __has_feature(objc_arc) - [edgeStyles release]; - [styles retain]; -#endif - edgeStyles = styles; - for (EdgeStyle *style in styles) { - [self listenToEdgeStyle:style]; - } - [self postEdgeStylesReplaced]; -} - -- (NodeStyle*) nodeStyleForName:(NSString*)name { - for (NodeStyle *s in nodeStyles) { - if ([[s name] isEqualToString:name]) { - return s; - } - } - - return nil; -} - -- (void) addNodeStyle:(NodeStyle*)style { - if (nodeStyles == nil) { - [self loadDefaultNodeStyles]; - } - [nodeStyles addObject:style]; - [self listenToNodeStyle:style]; - [self postNodeStyleAdded:style]; -} - -- (void) removeNodeStyle:(NodeStyle*)style { - if (nodeStyles == nil) { - [self loadDefaultNodeStyles]; - } - - [self ignoreNodeStyle:style]; -#if ! __has_feature(objc_arc) - [style retain]; -#endif - [nodeStyles removeObject:style]; - [self postNodeStyleRemoved:style]; -#if ! __has_feature(objc_arc) - [style release]; -#endif -} - -- (EdgeStyle*) edgeStyleForName:(NSString*)name { - for (EdgeStyle *s in edgeStyles) { - if ([[s name] isEqualToString:name]) { - return s; - } - } - - return nil; -} - -- (void) addEdgeStyle:(EdgeStyle*)style { - if (edgeStyles == nil) { - [self loadDefaultEdgeStyles]; - } - [edgeStyles addObject:style]; - [self listenToEdgeStyle:style]; - [self postEdgeStyleAdded:style]; -} - -- (void) removeEdgeStyle:(EdgeStyle*)style { - if (edgeStyles == nil) { - [self loadDefaultEdgeStyles]; - } - - [self ignoreEdgeStyle:style]; -#if ! __has_feature(objc_arc) - [style retain]; -#endif - [edgeStyles removeObject:style]; - [self postEdgeStyleRemoved:style]; -#if ! __has_feature(objc_arc) - [style release]; -#endif -} - -- (void) updateFromManager:(StyleManager*)m { - NSMutableArray *ns = [NSMutableArray arrayWithCapacity:[[m nodeStyles] count]]; - for (NodeStyle *style in [m nodeStyles]) { - NodeStyle *currentStyle = [self nodeStyleForName:[style name]]; - if (currentStyle != nil) { - [currentStyle updateFromStyle:style]; - [ns addObject:currentStyle]; - } else { -#if __has_feature(objc_arc) - [ns addObject:[style copy]]; -#else - [ns addObject:[[style copy] autorelease]]; -#endif - } - } - NSMutableArray *es = [NSMutableArray arrayWithCapacity:[[m edgeStyles] count]]; - for (EdgeStyle *style in [m edgeStyles]) { - EdgeStyle *currentStyle = [self edgeStyleForName:[style name]]; - if (currentStyle != nil) { - [currentStyle updateFromStyle:style]; - [es addObject:currentStyle]; - } else { -#if __has_feature(objc_arc) - [es addObject:[style copy]]; -#else - [es addObject:[[style copy] autorelease]]; -#endif - } - } - [self _setNodeStyles:ns]; - [self _setEdgeStyles:es]; -} - -- (id) copyWithZone:(NSZone*)zone { - StyleManager *m = [[StyleManager allocWithZone:zone] init]; - - NSMutableArray *ns = [NSMutableArray arrayWithCapacity:[nodeStyles count]]; - for (NodeStyle *style in nodeStyles) { -#if __has_feature(objc_arc) - [ns addObject:[style copyWithZone:zone]]; -#else - [ns addObject:[[style copyWithZone:zone] autorelease]]; -#endif - } - NSMutableArray *es = [NSMutableArray arrayWithCapacity:[edgeStyles count]]; - for (EdgeStyle *style in edgeStyles) { -#if __has_feature(objc_arc) - [es addObject:[style copyWithZone:zone]]; -#else - [es addObject:[[style copyWithZone:zone] autorelease]]; -#endif - } - [m _setNodeStyles:ns]; - [m _setEdgeStyles:es]; - - return m; -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/SupportDir.h b/tikzit-old/src/common/SupportDir.h deleted file mode 100644 index 30ccbcb..0000000 --- a/tikzit-old/src/common/SupportDir.h +++ /dev/null @@ -1,36 +0,0 @@ -// -// SupportDir.h -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import - - -@interface SupportDir : NSObject { -} - -+ (void)createUserSupportDir; -+ (NSString*)userSupportDir; -+ (NSString*)systemSupportDir; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/SupportDir.m b/tikzit-old/src/common/SupportDir.m deleted file mode 100644 index 22fed1b..0000000 --- a/tikzit-old/src/common/SupportDir.m +++ /dev/null @@ -1,65 +0,0 @@ -// -// SupportDir.m -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "SupportDir.h" - -#ifndef __APPLE__ -#import -#import "stat.h" -#endif - -@implementation SupportDir - -+ (NSString*)userSupportDir { -#ifdef __APPLE__ - return [[NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory,NSUserDomainMask,YES) - objectAtIndex:0] stringByAppendingPathComponent:@"TikZiT"]; -#else - return [NSString stringWithFormat:@"%s/tikzit", g_get_user_config_dir ()]; -#endif -} - -+ (NSString*)systemSupportDir { -#ifdef __APPLE__ - return [[NSBundle mainBundle] resourcePath]; -#else - return @TIKZITSHAREDIR; -#endif -} - -+ (void)createUserSupportDir { -#ifdef __APPLE__ - NSFileManager *fileManager = [NSFileManager defaultManager]; - [fileManager createDirectoryAtPath:[SupportDir userSupportDir] - withIntermediateDirectories:YES - attributes:nil - error:NULL]; -#else - // NSFileManager is slightly dodgy on Windows - g_mkdir_with_parents ([[SupportDir userSupportDir] UTF8String], S_IRUSR | S_IWUSR | S_IXUSR); -#endif -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/TikzGraphAssembler+Parser.h b/tikzit-old/src/common/TikzGraphAssembler+Parser.h deleted file mode 100644 index c9391a9..0000000 --- a/tikzit-old/src/common/TikzGraphAssembler+Parser.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2013 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * TikzGraphAssember+Parser.h - * - * This file exposes some TikzGraphAssembler functions - * that are only of use to the parser. - */ - -#import "TikzGraphAssembler.h" - -@interface TikzGraphAssembler (Parser) -- (Graph*) graph; -/** Store a node so that it can be looked up by name later */ -- (void) addNodeToMap:(Node*)n; -/** Get a previously-stored node by name */ -- (Node*) nodeWithName:(NSString*)name; -- (void) reportError:(const char *)message atLocation:(YYLTYPE*)yylloc; -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/TikzGraphAssembler.h b/tikzit-old/src/common/TikzGraphAssembler.h deleted file mode 100644 index 3403969..0000000 --- a/tikzit-old/src/common/TikzGraphAssembler.h +++ /dev/null @@ -1,115 +0,0 @@ -// -// TikzGraphAssembler.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "Graph.h" - -/** - * Parses (a subset of) tikz code and produces the corresponding Graph - * - * A note on errors: - * If parsing fails and a non-NULL error argument is given, it will be - * populated with an error with domain TZErrorDomain and code TZ_ERR_PARSE - * (see NSError+Tikzit.h). - * - * This will have a description set, typically something like - * "syntax error, unexpected [, expecting (" - * It may also have the following keys (it will have all or none of these), - * where numbers are stored using NSNumber: - * - startLine: the line (starting at 1) containing the first character - * of the bad token - * - startColumn: the column (starting at 1; tabs count for 1) of the first - * character of the bad token - * - endLine: the line (starting at 1) containing the last character - * of the bad token - * - endColumn: the column (starting at 1; tabs count for 1) of the last - * character of the bad token - * - syntaxString: an excerpt of the input string (typically the contents - * from startLine to endLine) providing some context - * - tokenOffset: the character offset (starting at 0) of the bad token - * within syntaxString - * - tokenLength: the character length (including newlines) of the bad token - * within syntaxString - */ -@interface TikzGraphAssembler : NSObject { - const char *tikzStr; - Graph *graph; - void *scanner; - NSMutableDictionary *nodeMap; - NSError *lastError; -} - -/** - * Parse tikz and place the result in gr - * - * Note that the graph must be empty; this might be used from an init - * method, for example, although don't forget that you can return a - * different object in init methods, providing you get the allocation - * right. - * - * @param tikz the tikz string to parse - * @param gr the graph to store the result in (must be empty, non-nil) - * @param e a location to store an error if parsing fails (may be NULL) - * @return YES if parsing succeeded, NO otherwise - */ -+ (BOOL) parseTikz:(NSString*)tikz forGraph:(Graph*)gr error:(NSError**)e; -/** - * Overload for -[parseTikz:forGraph:error:] with the error set to NULL - */ -+ (BOOL) parseTikz:(NSString*)tikz forGraph:(Graph*)gr; -/** - * Parse tikz - * - * @param tikz the tikz string to parse - * @param e a location to store an error if parsing fails (may be NULL) - * @return a Graph object if parsing succeeded, nil otherwise - */ -+ (Graph*) parseTikz:(NSString*)tikz error:(NSError**)e; -/** - * Overload for -[parseTikz:error:] with the error set to NULL - */ -+ (Graph*) parseTikz:(NSString*)tikz; -/** - * Validate a property string or value - * - * Wraps the string in "{" and "}" and checks it lexes completely; in other - * words, makes sure that "{" and "}" are balanced (ignoring escaped versions). - * @param tikz the string to validate - * @return YES if the string can be used as a property name or value, NO - * otherwise - */ -+ (BOOL)validateTikzPropertyNameOrValue:(NSString*)tikz; - -/** - * Validate an edge anchor - * - * Checks that the given string will successfully lex if used as an anchor for - * and edge - * @param tikz the string to validate - * @return YES if the string can be used as an edge anchor, NO otherwise - */ -+ (BOOL)validateTikzEdgeAnchor:(NSString*)tikz; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/TikzGraphAssembler.m b/tikzit-old/src/common/TikzGraphAssembler.m deleted file mode 100644 index c5d2811..0000000 --- a/tikzit-old/src/common/TikzGraphAssembler.m +++ /dev/null @@ -1,310 +0,0 @@ -// -// TikzGraphAssembler.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "TikzGraphAssembler.h" -#import "tikzparserdefs.h" -#import "tikzparser.h" -#import "TikzGraphAssembler+Parser.h" -#import "tikzlexer.h" -#import "NSError+Tikzit.h" - -@implementation TikzGraphAssembler - -- (id)init { -#if ! __has_feature(objc_arc) - [self release]; -#endif - return nil; -} - -- (id)initWithGraph:(Graph*)g { - self = [super init]; - if (self) { -#if __has_feature(objc_arc) - graph = g; -#else - graph = [g retain]; -#endif - nodeMap = [[NSMutableDictionary alloc] init]; - yylex_init (&scanner); - yyset_extra(self, scanner); - } - return self; -} - -- (void)dealloc { -#if ! __has_feature(objc_arc) - [graph release]; - [nodeMap release]; - [lastError release]; - yylex_destroy (scanner); - [super dealloc]; -#endif -} - -- (BOOL) parseTikz:(NSString*)t error:(NSError**)error { -#if ! __has_feature(objc_arc) - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; -#endif - - tikzStr = [t UTF8String]; - yy_scan_string(tikzStr, scanner); - int result = yyparse(scanner); - tikzStr = NULL; - -#if ! __has_feature(objc_arc) - [pool drain]; -#endif - - if (result == 0) { - return YES; - } else { - if (error) { - if (lastError) { -#if __has_feature(objc_arc) - *error = lastError; -#else - *error = [[lastError retain] autorelease]; -#endif - } else if (result == 1) { - *error = [NSError errorWithMessage:@"Syntax error" - code:TZ_ERR_PARSE]; - } else if (result == 2) { - *error = [NSError errorWithMessage:@"Insufficient memory" - code:TZ_ERR_PARSE]; - } else { - *error = [NSError errorWithMessage:@"Unknown error" - code:TZ_ERR_PARSE]; - } - } - return NO; - } -} - -+ (BOOL) parseTikz:(NSString*)tikz forGraph:(Graph*)gr { - return [self parseTikz:tikz forGraph:gr error:NULL]; -} -+ (Graph*) parseTikz:(NSString*)tikz error:(NSError**)e { - Graph *gr = [[Graph alloc] init]; - if ([self parseTikz:tikz forGraph:gr error:e]) { -#if __has_feature(objc_arc) - return gr; -#else - return [gr autorelease]; -#endif - } else { -#if ! __has_feature(objc_arc) - [gr release]; -#endif - return nil; - } -} -+ (Graph*) parseTikz:(NSString*)tikz { - return [self parseTikz:tikz error:NULL]; -} - -+ (BOOL) parseTikz:(NSString*)tikz forGraph:(Graph*)gr error:(NSError**)error { - if([tikz length] == 0) { - // empty string -> empty graph - return YES; - } - - TikzGraphAssembler *assembler = [[self alloc] initWithGraph:gr]; - BOOL success = [assembler parseTikz:tikz error:error]; -#if ! __has_feature(objc_arc) - [assembler release]; -#endif - return success; -} - -+ (BOOL)validateTikzPropertyNameOrValue:(NSString*)tikz { - BOOL valid; - - NSString * testTikz = [NSString stringWithFormat: @"{%@}", tikz]; - - void *scanner; - yylex_init (&scanner); - yyset_extra(nil, scanner); - yy_scan_string([testTikz UTF8String], scanner); - YYSTYPE lval; - YYLTYPE lloc; - int result = yylex(&lval, &lloc, scanner); - valid = (result == DELIMITEDSTRING) && - (yyget_leng(scanner) == [testTikz length]); - yylex_destroy(scanner); - - return valid; -} - -+ (BOOL)validateTikzEdgeAnchor:(NSString*)tikz { - if ([tikz length] == 0) - return YES; - - BOOL valid = YES; - - NSString * testTikz = [NSString stringWithFormat: @"(1.%@)", tikz]; - - void *scanner; - yylex_init (&scanner); - yyset_extra(nil, scanner); - yy_scan_string([testTikz UTF8String], scanner); - YYSTYPE lval; - YYLTYPE lloc; - valid = valid && (yylex(&lval, &lloc, scanner) == LEFTPARENTHESIS); - valid = valid && (yylex(&lval, &lloc, scanner) == REFSTRING); - valid = valid && (yylex(&lval, &lloc, scanner) == FULLSTOP); - valid = valid && (yylex(&lval, &lloc, scanner) == REFSTRING); - valid = valid && (yylex(&lval, &lloc, scanner) == RIGHTPARENTHESIS); - valid = valid && (lloc.last_column == [testTikz length]); - yylex_destroy(scanner); - - return valid; -} - -@end - -@implementation TikzGraphAssembler (Parser) -- (Graph*)graph { return graph; } - -- (void)addNodeToMap:(Node*)n { - [nodeMap setObject:n forKey:[n name]]; -} - -- (Node*)nodeWithName:(NSString*)name { - return [nodeMap objectForKey:name]; -} - -- (void) setLastError:(NSError*)error { -#if ! __has_feature(objc_arc) - [error retain]; - [lastError release]; -#endif - lastError = error; -} - -- (void) reportError:(const char *)message atLocation:(YYLTYPE*)yylloc { - NSString *nsmsg = [NSString stringWithUTF8String:message]; - - const char *first_line_start = find_start_of_nth_line ( - tikzStr, yylloc->first_line - 1); - const char *last_line_start = find_start_of_nth_line ( - first_line_start, yylloc->last_line - yylloc->first_line); - const char *last_line_end = last_line_start; - while (*last_line_end && *last_line_end != '\n') { - // points to just after end of last line - ++last_line_end; - } - - size_t context_len = last_line_end - first_line_start; - size_t token_offset = yylloc->first_column - 1; - size_t token_len = ((last_line_start - first_line_start) + yylloc->last_column) - token_offset; - - if (token_offset + token_len > context_len) { - // error position state is corrupted - NSLog(@"Got bad error state for error \"%s\": start(%i,%i), end(%i,%i)", - message, - yylloc->first_line, - yylloc->first_column, - yylloc->last_line, - yylloc->last_column); - [self setLastError:[NSError errorWithMessage:nsmsg - code:TZ_ERR_PARSE]]; - } else { - char *context = malloc (context_len + 1); - strncpy (context, first_line_start, context_len); - *(context + context_len) = '\0'; - - NSDictionary *userInfo = - [NSDictionary dictionaryWithObjectsAndKeys: - nsmsg, - NSLocalizedDescriptionKey, - [NSNumber numberWithInt:yylloc->first_line], - @"startLine", - [NSNumber numberWithInt:yylloc->first_column], - @"startColumn", - [NSNumber numberWithInt:yylloc->last_line], - @"endLine", - [NSNumber numberWithInt:yylloc->last_column], - @"endColumn", - [NSString stringWithUTF8String:context], - @"syntaxString", - [NSNumber numberWithInt:token_offset], - @"tokenStart", - [NSNumber numberWithInt:token_len], - @"tokenLength", - nil]; - [self setLastError: - [NSError errorWithDomain:TZErrorDomain - code:TZ_ERR_PARSE - userInfo:userInfo]]; - - // we can now freely edit context string - // we only bother printing out the first line - if (yylloc->last_line > yylloc->first_line) { - char *nlp = strchr(context, '\n'); - if (nlp) { - *nlp = '\0'; - context_len = nlp - context; - NSAssert2(token_offset < context_len, @"token_offset (%lu) < context_len (%lu)", token_offset, context_len); - if (token_offset + token_len > context_len) { - token_len = context_len - token_offset; - } - } else { - NSLog(@"Didn't find any newlines in context string!"); - } - } - size_t token_col_offset = 0; - size_t token_col_len = 0; - for (int i = 0; i < token_offset; ++i) { - if (*(context + i) == '\t') - token_col_offset += 8; - else - ++token_col_offset; - } - for (int i = token_offset; i < token_offset + token_len; ++i) { - if (*(context + i) == '\t') - token_col_len += 8; - else - ++token_col_len; - } - NSString *pointerLinePadding = - [@"" stringByPaddingToLength:token_col_offset - withString:@" " - startingAtIndex:0]; - NSString *pointerLineCarets = - [@"" stringByPaddingToLength:token_col_len - withString:@"^" - startingAtIndex:0]; - NSLog(@"Parse error on line %i, starting at %i: %s\n%s\n%@%@", - yylloc->first_line, - yylloc->first_column, - message, - context, - pointerLinePadding, - pointerLineCarets); - free (context); - } -} -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/TikzShape.h b/tikzit-old/src/common/TikzShape.h deleted file mode 100644 index 6a91f91..0000000 --- a/tikzit-old/src/common/TikzShape.h +++ /dev/null @@ -1,37 +0,0 @@ -// -// TikzShape.h -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "Shape.h" - -@interface TikzShape : Shape { - NSString *tikzSrc; -} - -@property (copy) NSString *tikzSrc; - -- (id)initWithTikzFile:(NSString*)file; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/TikzShape.m b/tikzit-old/src/common/TikzShape.m deleted file mode 100644 index 555a7df..0000000 --- a/tikzit-old/src/common/TikzShape.m +++ /dev/null @@ -1,70 +0,0 @@ -// -// TikzShape.m -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "TikzShape.h" -#import "Graph.h" - -@implementation TikzShape - -@synthesize tikzSrc; - -- (id)initWithTikzFile:(NSString*)file { - self = [super init]; - if (self) { - NSString *tikz = [NSString stringWithContentsOfFile:file - encoding:NSUTF8StringEncoding - error:NULL]; - if (tikz == nil) return nil; - - tikzSrc = [tikz copy]; - - Graph *graph = [Graph graphFromTikz:tikz]; - if (graph == nil) return nil; - - NSRect graphBounds = ([graph hasBoundingBox]) ? [graph boundingBox] : [graph bounds]; - - float sz = 0.5f; - - // the "screen" coordinate space fits in the shape bounds - Transformer *t = [Transformer transformer]; - float width_ratio = (2*sz) / graphBounds.size.width; - float height_ratio = (2*sz) / graphBounds.size.height; - [t setScale:MIN(width_ratio, height_ratio)]; - NSRect bds = [t rectToScreen:graphBounds]; - NSPoint shift = NSMakePoint(-NSMidX(bds), - -NSMidY(bds)); - [t setOrigin:shift]; - [graph applyTransformer:t]; -#if __has_feature(objc_arc) - paths = [graph pathCover]; -#else - paths = [[graph pathCover] retain]; -#endif - } - return self; -} - - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/Transformer.h b/tikzit-old/src/common/Transformer.h deleted file mode 100644 index 1b0108a..0000000 --- a/tikzit-old/src/common/Transformer.h +++ /dev/null @@ -1,154 +0,0 @@ -// -// Transformer.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - - -#import - -extern float const PIXELS_PER_UNIT; - -/*! - @class Transformer - @brief Do affine coordinate transforms between an abstract co-ordinate - space (such as the graph's) and the screen's. - - This currently allows zooming and panning. - */ -@interface Transformer : NSObject { - NSPoint origin; - float x_scale; - float y_scale; -} - -/*! - @brief The screen co-ordinate of the abstract space origin. - */ -@property (assign) NSPoint origin; - -/*! - @brief The scale (from abstract space to screen space) - @detail This is the size of a single unit (a distance of 1.0) - of the abstract space on the screen. - - Around 50 is a reasonable value. - */ -@property (assign) float scale; - -/*! - @brief Whether co-ordinates are flipped about the X axis - @detail TikZ considers X co-ordinates to run left to right, - which is not necessarily how the screen views - them. - */ -@property (assign,getter=isFlippedAboutXAxis) BOOL flippedAboutXAxis; - -/*! - @brief Whether co-ordinates are flipped about the Y axis - @detail TikZ considers Y co-ordinates to run up the page, - which is not necessarily how the screen views - them. - */ -@property (assign,getter=isFlippedAboutYAxis) BOOL flippedAboutYAxis; - -/*! - @brief Transform a point from screen space to abstract space. - @param p a point in screen space. - @result A point in abstract space. - */ -- (NSPoint)fromScreen:(NSPoint)p; - -/*! - @brief Transform a point from abstract space to screen space. - @param p a point in abstract space. - @result A point in screen space. - */ -- (NSPoint)toScreen:(NSPoint)p; - -/*! - @brief Scale a distance from screen space to abstract space. - @param dist a distance in screen space. - @result A distance in abstract space. - */ -- (float)scaleFromScreen:(float)dist; - -/*! - @brief Scale a distance from abstract space to screen space. - @param dist a distance in abstract space. - @result A distance in screen space. - */ -- (float)scaleToScreen:(float)dist; - -/*! - @brief Scale a rectangle from screen space to abstract space. - @param r a rectangle in screen space. - @result A rectangle in abstract space. - */ -- (NSRect)rectFromScreen:(NSRect)r; - -/*! - @brief Scale a rectangle from abstract space to screen space. - @param r a rectangle in abstract space. - @result A rectangle in screen space. - */ -- (NSRect)rectToScreen:(NSRect)r; - -/*! - @brief Factory method to get an identity transformer. - @result A transformer. - */ -+ (Transformer*)transformer; - -/*! - @brief Factory method to get a transformer identical to another - @result A transformer. - */ -+ (Transformer*)transformerWithTransformer:(Transformer*)t; - -/*! - @brief Factory method to get a transformer. - @param o The screen co-ordinate of the abstract space origin - @param scale The scale (from abstract space to screen space) - @result A transformer. - */ -+ (Transformer*)transformerWithOrigin:(NSPoint)o andScale:(float)scale; - -/*! - @brief Get a global 'actual size' transformer. - @result A transformer. - */ -+ (Transformer*)defaultTransformer; - -/*! - @brief A transformer set up from two bounding rects. - - graphRect is made as large as possible while still fitting into screenRect. - @result A transformer. - */ -+ (Transformer*)transformerToFit:(NSRect)graphRect intoScreenRect:(NSRect)screenRect flippedAboutXAxis:(BOOL)flipX flippedAboutYAxis:(BOOL)flipY; - -+ (Transformer*)transformerToFit:(NSRect)graphRect intoScreenRect:(NSRect)screenRect flippedAboutXAxis:(BOOL)flipX; -+ (Transformer*)transformerToFit:(NSRect)graphRect intoScreenRect:(NSRect)screenRect flippedAboutYAxis:(BOOL)flipY; -+ (Transformer*)transformerToFit:(NSRect)graphRect intoScreenRect:(NSRect)screenRect; - -@end - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/Transformer.m b/tikzit-old/src/common/Transformer.m deleted file mode 100644 index 2b56813..0000000 --- a/tikzit-old/src/common/Transformer.m +++ /dev/null @@ -1,231 +0,0 @@ -// -// Transformer.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "Transformer.h" - -float const PIXELS_PER_UNIT = 50; - -@implementation Transformer - -+ (Transformer*)transformer { -#if __has_feature(objc_arc) - return [[Transformer alloc] init]; -#else - return [[[Transformer alloc] init] autorelease]; -#endif -} - -+ (Transformer*)transformerWithTransformer:(Transformer*)t { -#if __has_feature(objc_arc) - return [t copy]; -#else - return [[t copy] autorelease]; -#endif -} - -+ (Transformer*)transformerWithOrigin:(NSPoint)o andScale:(float)scale { - Transformer *trans = [self transformer]; - [trans setOrigin:o]; - [trans setScale:scale]; - return trans; -} - -+ (Transformer*)transformerToFit:(NSRect)graphRect - intoScreenRect:(NSRect)screenRect { - return [self transformerToFit:graphRect - intoScreenRect:screenRect - flippedAboutXAxis:NO - flippedAboutYAxis:NO]; -} - -+ (Transformer*)transformerToFit:(NSRect)graphRect - intoScreenRect:(NSRect)screenRect - flippedAboutXAxis:(BOOL)flipX { - return [self transformerToFit:graphRect - intoScreenRect:screenRect - flippedAboutXAxis:flipX - flippedAboutYAxis:NO]; -} - -+ (Transformer*)transformerToFit:(NSRect)graphRect - intoScreenRect:(NSRect)screenRect - flippedAboutYAxis:(BOOL)flipY { - return [self transformerToFit:graphRect - intoScreenRect:screenRect - flippedAboutXAxis:NO - flippedAboutYAxis:flipY]; -} - -+ (Transformer*)transformerToFit:(NSRect)graphRect - intoScreenRect:(NSRect)screenRect - flippedAboutXAxis:(BOOL)flipAboutXAxis - flippedAboutYAxis:(BOOL)flipAboutYAxis { - - const float wscale = screenRect.size.width / graphRect.size.width; - const float hscale = screenRect.size.height / graphRect.size.height; - const float scale = (wscale < hscale) ? wscale : hscale; - const float xpad = (screenRect.size.width - (graphRect.size.width * scale)) / 2.0; - const float ypad = (screenRect.size.height - (graphRect.size.height * scale)) / 2.0; - - // if we are flipping, we need to calculate the origin from the opposite edge - const float gx = flipAboutYAxis ? -(graphRect.size.width + graphRect.origin.x) - : graphRect.origin.x; - const float gy = flipAboutXAxis ? -(graphRect.size.height + graphRect.origin.y) - : graphRect.origin.y; - const float origin_x = screenRect.origin.x - (gx * scale) + xpad; - const float origin_y = screenRect.origin.y - (gy * scale) + ypad; - - Transformer *trans = [self transformer]; - [trans setOrigin:NSMakePoint(origin_x, origin_y)]; - [trans setScale:scale]; - [trans setFlippedAboutXAxis:flipAboutXAxis]; - [trans setFlippedAboutYAxis:flipAboutYAxis]; - return trans; -} - -- (id) init { - self = [super init]; - - if (self) { - origin = NSZeroPoint; - x_scale = 1.0f; - y_scale = 1.0f; - } - - return self; -} - -- (id)copyWithZone:(NSZone *)zone { - Transformer *cp = [[[self class] allocWithZone:zone] init]; - if (cp) { - cp->origin = origin; - cp->x_scale = x_scale; - cp->y_scale = y_scale; - } - return cp; -} - -- (NSPoint)origin { return origin; } -- (void)setOrigin:(NSPoint)o { - origin = o; -} - -- (float)scale { return ABS(x_scale); } -- (void)setScale:(float)s { - x_scale = (x_scale < 0.0) ? -s : s; - y_scale = (y_scale < 0.0) ? -s : s; -} - -- (BOOL)isFlippedAboutXAxis { - return y_scale < 0.0; -} - -- (void)setFlippedAboutXAxis:(BOOL)flip { - if (flip != [self isFlippedAboutXAxis]) { - y_scale *= -1; - } -} - -- (BOOL)isFlippedAboutYAxis { - return x_scale < 0.0; -} - -- (void)setFlippedAboutYAxis:(BOOL)flip { - if (flip != [self isFlippedAboutYAxis]) { - x_scale *= -1; - } -} - -- (NSPoint)fromScreen:(NSPoint)p { - NSPoint trans; - trans.x = (p.x - origin.x) / x_scale; - trans.y = (p.y - origin.y) / y_scale; - return trans; -} - -- (NSPoint)toScreen:(NSPoint)p { - NSPoint trans; - trans.x = (p.x * x_scale) + origin.x; - trans.y = (p.y * y_scale) + origin.y; - return trans; -} - -- (float)scaleFromScreen:(float)dist { - return dist / ABS(x_scale); -} - -- (float)scaleToScreen:(float)dist { - return dist * ABS(x_scale); -} - -- (NSRect)rectFromScreen:(NSRect)r { - NSRect r1; - r1.origin = [self fromScreen:r.origin]; - r1.size.width = [self scaleFromScreen:r.size.width]; - r1.size.height = [self scaleFromScreen:r.size.height]; - // if we're flipped, the origin will be at a different corner - if ([self isFlippedAboutYAxis]) { - r1.origin.x -= r1.size.width; - } - if ([self isFlippedAboutXAxis]) { - r1.origin.y -= r1.size.height; - } - return r1; -} - -- (NSRect)rectToScreen:(NSRect)r { - NSPoint o = r.origin; - // if we're flipped, the origin will be at a different corner - if ([self isFlippedAboutYAxis]) { - o.x = NSMaxX(r); - } - if ([self isFlippedAboutXAxis]) { - o.y = NSMaxY(r); - } - NSRect r1; - r1.origin = [self toScreen:o]; - r1.size.width = [self scaleToScreen:r.size.width]; - r1.size.height = [self scaleToScreen:r.size.height]; - return r1; -} - -- (BOOL)isEqual:(id)object { - Transformer *t = (Transformer*)object; - return ([t origin].x == [self origin].x && - [t origin].y == [self origin].y && - [t scale] == [self scale]); -} - -Transformer *defaultTransformer = nil; - -+ (Transformer*)defaultTransformer { - if (defaultTransformer == nil) { - defaultTransformer = [[Transformer alloc] init]; - [defaultTransformer setScale:PIXELS_PER_UNIT]; - } - return defaultTransformer; -} - -@end - -// vi:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/common/test/Makefile b/tikzit-old/src/common/test/Makefile deleted file mode 100644 index d158d16..0000000 --- a/tikzit-old/src/common/test/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -OBJC = gcc -MMD -MP -DSTAND_ALONE -DGNUSTEP -DGNUSTEP_BASE_LIBRARY=1 -DGNU_RUNTIME=1 -DGNUSTEP_BASE_LIBRARY=1 -fno-strict-aliasing -fPIC -Wall -DGSWARN -DGSDIAGNOSE -Wno-import -O0 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic -fgnu-runtime -fconstant-string-class=NSConstantString -I. -I.. -I/users/alemer/GNUstep/Library/Headers -std=c99 -D_GNU_SOURCE -rdynamic -fgnu-runtime -L/users/alemer/GNUstep/Library/Libraries -L/usr/local/lib64 -L/usr/lib64 -lgnustep-base -lpthread -lobjc -lm - -maths_test_objects = test.m maths.m ../util.m -color_test_objects = test.m color.m ../ColorRGB.m ../util.m ../BasicMapTable.m ../RColor.m - -test: maths-test color-test - ./maths-test - ./color-test - -maths-test: $(maths_test_objects) - $(OBJC) $(maths_test_objects) -o $@ - -color-test: $(color_test_objects) - $(OBJC) $(color_test_objects) -o $@ diff --git a/tikzit-old/src/common/test/color.m b/tikzit-old/src/common/test/color.m deleted file mode 100644 index 48a6ff4..0000000 --- a/tikzit-old/src/common/test/color.m +++ /dev/null @@ -1,80 +0,0 @@ -// -// color.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// -#import "test/test.h" -#import "ColorRGB.h" - -#ifdef STAND_ALONE -void runTests() { -#else -void testColor() { -#endif - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - startTestBlock(@"color"); - - ColorRGB *red = [ColorRGB colorWithRed:255 green:0 blue:0]; - ColorRGB *lime = [ColorRGB colorWithRed:0 green:255 blue:0]; - ColorRGB *green = [ColorRGB colorWithRed:0 green:128 blue:0]; - TEST(@"Recognised red", - [red name] != nil && - [[red name] isEqualToString:@"Red"]); - TEST(@"Recognised lime", - [lime name] != nil && - [[lime name] isEqualToString:@"Lime"]); - TEST(@"Recognised green", - [green name] != nil && - [[green name] isEqualToString:@"Green"]); - - ColorRGB *floatRed = [ColorRGB colorWithFloatRed:1.0f green:0.0f blue:0.0f]; - ColorRGB *floatLime = [ColorRGB colorWithFloatRed:0.0f green:1.0f blue:0.0f]; - ColorRGB *floatGreen = [ColorRGB colorWithFloatRed:0.0f green:0.5f blue:0.0f]; - - TEST(@"Float red equal to int red", [floatRed isEqual:red]); - TEST(@"Float lime equal to int lime", [floatLime isEqual:lime]); - TEST(@"Float green equal to int green", [floatGreen isEqual:green]); - - TEST(@"Recognised float red", - [floatRed name] != nil && - [[floatRed name] isEqualToString:@"Red"]); - - TEST(@"Recognised float lime", - [floatLime name] != nil && - [[floatLime name] isEqualToString:@"Lime"]); - - TEST(@"Recognised float green", - [floatGreen name] != nil && - [[floatGreen name] isEqualToString:@"Green"]); - - [floatRed setRedFloat:0.99f]; - TEST(@"Nudged red, not recognised now", [floatRed name] == nil); - [floatRed setToClosestHashed]; - TEST(@"Set to closest hashed, reconised again", - [floatRed name] != nil && - [[floatRed name] isEqualToString:@"Red"]); - - TEST(@"Red has correct hex (ff0000)", [[red hexName] isEqualToString:@"hexcolor0xff0000"]); - TEST(@"Lime has correct hex (00ff00)", [[lime hexName] isEqualToString:@"hexcolor0x00ff00"]); - TEST(@"Green has correct hex (008000)", [[green hexName] isEqualToString:@"hexcolor0x008000"]); - - endTestBlock(@"color"); - [pool drain]; -} diff --git a/tikzit-old/src/common/test/common.m b/tikzit-old/src/common/test/common.m deleted file mode 100644 index c9ac980..0000000 --- a/tikzit-old/src/common/test/common.m +++ /dev/null @@ -1,34 +0,0 @@ -// -// common.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// -#import "test/test.h" -void testParser(); -void testColor(); -void testMaths(); - -void testCommon() { - startTestBlock(@"common"); - testParser(); - testColor(); - testMaths(); - endTestBlock(@"common"); -} diff --git a/tikzit-old/src/common/test/maths.m b/tikzit-old/src/common/test/maths.m deleted file mode 100644 index a11e58e..0000000 --- a/tikzit-old/src/common/test/maths.m +++ /dev/null @@ -1,562 +0,0 @@ -// -// TikZiT -// -// Copyright 2011 Alex Merry -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "../util.h" - -#import "test.h" - -void testRectAroundPoints() { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - startTestBlock(@"NSRectAroundPoints"); - - NSRect rect = NSRectAroundPoints (NSZeroPoint, NSZeroPoint); - assertRectsEqual (@"(0,0) and (0,0)", rect, NSZeroRect); - - rect = NSRectAroundPoints (NSZeroPoint, NSMakePoint (1.0f, 1.0f)); - assertRectsEqual (@"(0,0) and (1,1)", rect, NSMakeRect (0.0f, 0.0f, 1.0f, 1.0f)); - - rect = NSRectAroundPoints (NSMakePoint (-1.0f, 1.0f), NSMakePoint (1.0f, -1.0f)); - assertRectsEqual (@"(-1,1) and (1,-1)", rect, NSMakeRect (-1.0f, -1.0f, 2.0f, 2.0f)); - - endTestBlock(@"NSRectAroundPoints"); - [pool drain]; -} - -void testRectAroundPointsWithPadding() { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - startTestBlock(@"NSRectAroundPointsWithPadding"); - - NSRect rect = NSRectAroundPointsWithPadding (NSZeroPoint, NSZeroPoint, 0.0f); - assertRectsEqual (@"(0,0) and (0,0); 0 padding", rect, NSZeroRect); - - rect = NSRectAroundPointsWithPadding (NSZeroPoint, NSZeroPoint, 0.2f); - assertRectsEqual (@"(0,0) and (0,0); 0.2 padding", rect, NSMakeRect (-0.2f, -0.2f, 0.4f, 0.4f)); - - rect = NSRectAroundPointsWithPadding (NSZeroPoint, NSMakePoint (1.0f, 1.0f), -0.2f); - assertRectsEqual (@"(0,0) and (1,1); -0.2 padding", rect, NSMakeRect (0.2f, 0.2f, 0.6f, 0.6f)); - - endTestBlock(@"NSRectAroundPointsWithPadding"); - [pool drain]; -} - -void testGoodAtan() { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - startTestBlock(@"good_atan"); - - assertFloatsEqual (@"0.0, 0.0", good_atan (0.0f, 0.0f), 0.0f); - assertFloatsEqual (@"0.0, 1.0", good_atan (0.0f, 1.0f), 0.5f * M_PI); - assertFloatsEqual (@"0.0, -1.0", good_atan (0.0f, -1.0f), 1.5f * M_PI); - assertFloatsEqual (@"1.0, 0.0", good_atan (1.0f, 0.0f), 0.0f); - assertFloatsEqual (@"1.0, 0.1", good_atan (1.0f, 0.1f), 0.0996687f); - - endTestBlock(@"good_atan"); - [pool drain]; -} - -void testBezierInterpolate() { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - startTestBlock(@"bezierInterpolate"); - - assertFloatsEqual (@"0.0, (0.0, 0.1, 0.2, 0.3)", bezierInterpolate (0.0f, 0.0f, 0.1f, 0.2f, 0.3f), 0.0f); - assertFloatsEqual (@"1.0, (0.0, 0.1, 0.2, 0.3)", bezierInterpolate (1.0f, 0.0f, 0.1f, 0.2f, 0.3f), 0.3f); - assertFloatsEqual (@"0.5, (0.0, 0.1, 0.2, 0.3)", bezierInterpolate (0.5f, 0.0f, 0.1f, 0.2f, 0.3f), 0.15f); - // FIXME: other tests - - endTestBlock(@"bezierInterpolate"); - [pool drain]; -} - -void testLineSegmentsIntersect() { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - startTestBlock(@"lineSegmentsIntersect"); - - BOOL result = NO; - NSPoint intersection = NSMakePoint (-1.0f, -1.0f); - - result = lineSegmentsIntersect (NSMakePoint (-1.0f, -1.0f), NSMakePoint (1.0f, 1.0f), - NSMakePoint (-1.0f, 1.0f), NSMakePoint (1.0f, -1.0f), - &intersection); - TEST (@"Cross at zero: has intersection", result); - assertPointsEqual (@"Cross at zero: intersection value", intersection, NSZeroPoint); - - result = lineSegmentsIntersect (NSMakePoint (-1.0f, -1.0f), NSMakePoint (-0.5f, -0.5f), - NSMakePoint (-1.0f, 1.0f), NSMakePoint (1.0f, -1.0f), - &intersection); - TEST (@"Fail to cross at zero", !result); - - result = lineSegmentsIntersect (NSMakePoint (1.0f, 1.0f), NSMakePoint (1.0f, -1.0f), - NSMakePoint (0.0f, 0.0f), NSMakePoint (1.0f, 0.0f), - &intersection); - TEST (@"Touch at one: has intersection", result); - assertPointsEqual (@"Touch at one: intersection value", intersection, NSMakePoint (1.0f, 0.0f)); - - endTestBlock(@"lineSegmentsIntersect"); - [pool drain]; -} - -void testLineSegmentIntersectsRect() { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - startTestBlock(@"lineSegmentIntersectsRect"); - - BOOL result = NO; - - result = lineSegmentIntersectsRect ( - NSMakePoint (-1.0f, -1.0f), - NSMakePoint (0.0f, 0.0f), - NSZeroRect); - TEST (@"Zero rect; line touches zero", result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (-1.0f, -1.0f), - NSMakePoint (-0.1f, -0.1f), - NSZeroRect); - TEST (@"Zero rect; line short of zero", !result); - - NSRect rect = NSMakeRect (1.0f, 1.0f, 1.0f, 1.0f); - - result = lineSegmentIntersectsRect ( - NSMakePoint (0.0f, 0.0f), - NSMakePoint (3.0f, 1.0f), - rect); - TEST (@"Line underneath", !result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (0.0f, 0.0f), - NSMakePoint (1.0f, 3.0f), - rect); - TEST (@"Line to left", !result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (0.0f, 2.0f), - NSMakePoint (3.0f, 3.0f), - rect); - TEST (@"Line above", !result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (2.0f, 0.0f), - NSMakePoint (3.0f, 3.0f), - rect); - TEST (@"Line to right", !result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (0.0f, 0.0f), - NSMakePoint (0.9f, 0.9f), - rect); - TEST (@"Line short", !result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (1.1f, 1.1f), - NSMakePoint (1.9f, 1.9f), - rect); - TEST (@"Line inside", result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (0.0f, 1.5f), - NSMakePoint (3.0f, 1.5f), - rect); - TEST (@"Horizontal line through", result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (1.5f, 0.0f), - NSMakePoint (1.5f, 3.0f), - rect); - TEST (@"Vertical line through", result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (0.5f, 1.0f), - NSMakePoint (2.0f, 2.5f), - rect); - TEST (@"Cut top and left", result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (2.0f, 0.5f), - NSMakePoint (0.5f, 2.0f), - rect); - TEST (@"Cut bottom and left", result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (1.0f, 0.5f), - NSMakePoint (2.5f, 2.0f), - rect); - TEST (@"Cut bottom and right", result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (0.0f, 1.0f), - NSMakePoint (2.0f, 3.0f), - rect); - TEST (@"Touch top left", result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (1.0f, 0.0f), - NSMakePoint (3.0f, 2.0f), - rect); - TEST (@"Touch bottom right", result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (1.0f, 0.0f), - NSMakePoint (1.0f, 3.0f), - rect); - TEST (@"Along left side", result); - - result = lineSegmentIntersectsRect ( - NSMakePoint (0.0f, 1.0f), - NSMakePoint (3.0f, 1.0f), - rect); - TEST (@"Along bottom side", result); - - endTestBlock(@"lineSegmentIntersectsRect"); - [pool drain]; -} - -struct line_bezier_test { - NSString *msg; - NSPoint lstart; - NSPoint lend; - NSPoint c0; - NSPoint c1; - NSPoint c2; - NSPoint c3; - BOOL expectedResult; - float expectedT; - NSPoint expectedIntersect; -}; - -static struct line_bezier_test line_bezier_tests[] = { - { - @"Outside box", - {0.0f, 0.0f}, - {1.0f, 0.0f}, - {0.0f, 1.0f}, - {0.0f, 2.0f}, - {1.0f, 2.0f}, - {1.0f, 1.0f}, - NO, - -1.0f, - {0.0f, 0.0f} - }, - { - @"Single intersect", - {100.0f, 20.0f}, - {195.0f, 255.0f}, - {93.0f, 163.0f}, - {40.0f, 30.0f}, - {270.0f, 115.0f}, - {219.0f, 178.0f}, - YES, - -0.4f, - {129.391693f, 92.705772f} - }, - { - @"Double intersect", - {100.0f, 20.0f}, - {195.0f, 255.0f}, - {93.0f, 163.0f}, - {40.0f, 30.0f}, - {270.0f, 115.0f}, - {154.0f, 212.0f}, - YES, - -0.909f, - {170.740646f,194.990021f} - }, - { - @"Near miss", - {100.0f, 20.0f}, - {195.0f, 255.0f}, - {93.0f, 163.0f}, - {40.0f, 30.0f}, - {176.0f, 100.0f}, - {154.0f, 212.0f}, - NO, - -1.0f, - {0.0f,0.0f} - } -}; -static unsigned int n_line_bezier_tests = sizeof (line_bezier_tests) / sizeof (line_bezier_tests[0]); - -void testLineSegmentIntersectsBezier() { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - startTestBlock(@"lineSegmentIntersectsBezier"); - - for (unsigned int i = 0; i < n_line_bezier_tests; ++i) { - NSPoint intersect; - BOOL result = lineSegmentIntersectsBezier ( - line_bezier_tests[i].lstart, - line_bezier_tests[i].lend, - line_bezier_tests[i].c0, - line_bezier_tests[i].c1, - line_bezier_tests[i].c2, - line_bezier_tests[i].c3, - &intersect); - if (result) { - if (line_bezier_tests[i].expectedT < 0.0f) { - assertPointsEqual (line_bezier_tests[i].msg, intersect, line_bezier_tests[i].expectedIntersect); - } else { - assertPointsEqual (line_bezier_tests[i].msg, intersect, - bezierInterpolateFull (line_bezier_tests[i].expectedT, line_bezier_tests[i].c0, line_bezier_tests[i].c1, line_bezier_tests[i].c2, line_bezier_tests[i].c3)); - } - } else { - if (line_bezier_tests[i].expectedResult) - fail (line_bezier_tests[i].msg); - else - pass (line_bezier_tests[i].msg); - } - } - -BOOL lineSegmentIntersectsBezier (NSPoint lstart, NSPoint lend, NSPoint c0, NSPoint c1, NSPoint c2, NSPoint c3, NSPoint *result); - endTestBlock(@"lineSegmentIntersectsBezier"); - [pool drain]; -} - -struct exit_point_test { - NSString *msg; - NSPoint rayStart; - float angle; - NSRect rect; - NSPoint expected; -}; - -static struct exit_point_test exit_point_tests[] = { - { - @"0.0 rads", - {0.0f, 0.0f}, - 0.0f, - {{-1.0f, -1.0f}, {2.0f, 2.0f}}, - {1.0f, 0.0f} - }, - { - @"pi/2 rads", - {0.0f, 0.0f}, - M_PI / 2.0f, - {{-1.0f, -1.0f}, {2.0f, 2.0f}}, - {0.0f, 1.0f} - }, - { - @"-pi/2 rads", - {0.0f, 0.0f}, - -M_PI / 2.0f, - {{-1.0f, -1.0f}, {2.0f, 2.0f}}, - {0.0f, -1.0f} - }, - { - @"pi rads", - {0.0f, 0.0f}, - M_PI, - {{-1.0f, -1.0f}, {2.0f, 2.0f}}, - {-1.0f, 0.0f} - }, - { - @"-pi rads", - {0.0f, 0.0f}, - -M_PI, - {{-1.0f, -1.0f}, {2.0f, 2.0f}}, - {-1.0f, 0.0f} - }, - { - @"pi/4 rads", - {0.0f, 0.0f}, - M_PI / 4.0f, - {{-1.0f, -1.0f}, {2.0f, 2.0f}}, - {1.0f, 1.0f} - }, - { - @"3pi/4 rads", - {0.0f, 0.0f}, - (3.0f * M_PI) / 4.0f, - {{-1.0f, -1.0f}, {2.0f, 2.0f}}, - {-1.0f, 1.0f} - }, - { - @"-pi/4 rads", - {0.0f, 0.0f}, - -M_PI / 4.0f, - {{-1.0f, -1.0f}, {2.0f, 2.0f}}, - {1.0f, -1.0f} - }, - { - @"-3pi/4 rads", - {0.0f, 0.0f}, - (-3.0f * M_PI) / 4.0f, - {{-1.0f, -1.0f}, {2.0f, 2.0f}}, - {-1.0f, -1.0f} - }, - { - @"pi/8 rads", - {0.0f, 0.0f}, - M_PI / 8.0f, - {{-1.0f, -1.0f}, {2.0f, 2.0f}}, - {1.0f, 0.414213562373095f} - }, - { - @"3pi/8 rads", - {0.0f, 0.0f}, - 3.0f * M_PI / 8.0f, - {{-1.0f, -1.0f}, {2.0f, 2.0f}}, - {0.414213562373095f, 1.0f} - }, - { - @"-5pi/8 rads", - {0.0f, 0.0f}, - -5.0f * M_PI / 8.0f, - {{-1.0f, -1.0f}, {2.0f, 2.0f}}, - {-0.414213562373095f, -1.0f} - }, - { - @"-7pi/8 rads", - {0.0f, 0.0f}, - -7.0f * M_PI / 8.0f, - {{-1.0f, -1.0f}, {2.0f, 2.0f}}, - {-1.0f, -0.414213562373095f} - }, - { - @"pi/8 rads; origin (1,1)", - {1.0f, 1.0f}, - M_PI / 8.0f, - {{0.0f, 0.0f}, {2.0f, 2.0f}}, - {2.0f, 1.414213562373095f} - }, - { - @"7pi/8 rads; origin (-2,2)", - {-2.0f, 2.0f}, - 7.0f * M_PI / 8.0f, - {{-3.0f, 1.0f}, {2.0f, 2.0f}}, - {-3.0f, 2.414213562373095f} - }, - { - @"pi/8 rads; origin (1,1); SW of box", - {1.0f, 1.0f}, - M_PI / 8.0f, - {{1.0f, 1.0f}, {1.0f, 1.0f}}, - {2.0f, 1.414213562373095f} - }, - { - @"pi/8 rads; origin (1,1); SE of box", - {1.0f, 1.0f}, - M_PI / 8.0f, - {{0.0f, 1.0f}, {1.0f, 1.0f}}, - {1.0f, 1.0f} - }, - { - @"pi/8 rads; origin (1,1); NE of box", - {1.0f, 1.0f}, - M_PI / 8.0f, - {{0.0f, 1.0f}, {1.0f, 1.0f}}, - {1.0f, 1.0f} - }, - { - @"pi/8 rads; origin (1,1); NW of box", - {1.0f, 1.0f}, - M_PI / 8.0f, - {{1.0f, 0.0f}, {1.0f, 1.0f}}, - {1.0f, 1.0f} - }, - { - @"pi/8 rads; origin (1,1); N of box", - {1.0f, 1.0f}, - M_PI / 8.0f, - {{0.5f, 0.0f}, {1.0f, 1.0f}}, - {1.0f, 1.0f} - }, - { - @"7pi/8 rads; origin (1,1); N of box", - {1.0f, 1.0f}, - 7.0f * M_PI / 8.0f, - {{0.5f, 0.0f}, {1.0f, 1.0f}}, - {1.0f, 1.0f} - }, - { - @"-pi/8 rads; origin (1,1); S of box", - {1.0f, 1.0f}, - -M_PI / 8.0f, - {{0.5f, 1.0f}, {1.0f, 1.0f}}, - {1.0f, 1.0f} - }, - { - @"-pi/8 rads; origin (1,1); E of box", - {1.0f, 1.0f}, - -M_PI / 8.0f, - {{0.0f, 0.5f}, {1.0f, 1.0f}}, - {1.0f, 1.0f} - }, - { - @"-7pi/8 rads; origin (1,1); W of box", - {1.0f, 1.0f}, - -7.0f * M_PI / 8.0f, - {{1.0f, 0.5f}, {1.0f, 1.0f}}, - {1.0f, 1.0f} - }, - { - @"7pi/8 rads; origin (1,1); W of box", - {1.0f, 1.0f}, - 7.0f * M_PI / 8.0f, - {{1.0f, 0.5f}, {1.0f, 1.0f}}, - {1.0f, 1.0f} - }, - { - @"pi/8 rads; origin (1,1); leave through top", - {1.0f, 1.0f}, - M_PI / 8.0f, - {{0.9f, 0.1f}, {1.0f, 1.0f}}, - {1.2414213562373f, 1.1f} - }, - { - @"0 rads; origin (1,1); N of box", - {1.0f, 1.0f}, - 0.0f, - {{0.5f, 0.0f}, {1.0f, 1.0f}}, - {1.5f, 1.0f} - } -}; -static unsigned int n_exit_point_tests = sizeof (exit_point_tests) / sizeof (exit_point_tests[0]); - -void testFindExitPointOfRay() { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - startTestBlock(@"findExitPointOfRay"); - - for (unsigned int i = 0; i < n_exit_point_tests; ++i) { - NSPoint exitPoint = findExitPointOfRay ( - exit_point_tests[i].rayStart, - exit_point_tests[i].angle, - exit_point_tests[i].rect); - assertPointsEqual (exit_point_tests[i].msg, exitPoint, exit_point_tests[i].expected); - } - - endTestBlock(@"findExitPointOfRay"); - [pool drain]; -} - -#ifdef STAND_ALONE -void runTests() { -#else -void testMaths() { -#endif - startTestBlock(@"maths"); - testRectAroundPoints(); - testRectAroundPointsWithPadding(); - testGoodAtan(); - testBezierInterpolate(); - testLineSegmentsIntersect(); - testLineSegmentIntersectsRect(); - testFindExitPointOfRay(); - testLineSegmentIntersectsBezier(); - endTestBlock(@"maths"); -} - -// vim:ft=objc:ts=4:sts=4:sw=4:noet diff --git a/tikzit-old/src/common/test/parser.m b/tikzit-old/src/common/test/parser.m deleted file mode 100644 index 3346acd..0000000 --- a/tikzit-old/src/common/test/parser.m +++ /dev/null @@ -1,86 +0,0 @@ -// -// parser.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// -#import "test/test.h" -#import "TikzGraphAssembler.h" - - -#ifdef STAND_ALONE -void runTests() { -#else -void testParser() { -#endif - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - startTestBlock(@"parser"); - - [TikzGraphAssembler setup]; - - NodeStyle *rn = [NodeStyle defaultNodeStyleWithName:@"rn"]; - NSArray *styles = [NSArray arrayWithObject:rn]; - - NSString *tikz = - @"\\begin{tikzpicture}[dotpic]" - @" \\begin{pgfonlayer}{foo}" //ignored - @" \\node [style=rn] (0) at (-2,3.4) {stuff{$\\alpha$ in here}};" - @" \\node (b) at (1,1) {};" - @" \\end{pgfonlayer}" //ignored - @" \\draw [bend right=20] (0) to node[tick]{-} (b.center);" - @"\\end{tikzpicture}"; - - TikzGraphAssembler *ga = [[TikzGraphAssembler alloc] init]; - TEST(@"Parsing TikZ", [ga parseTikz:tikz]); - - Graph *g = [ga graph]; - TEST(@"Graph is non-nil", g != nil); - TEST(@"Graph has correct number of nodes", [[g nodes] count]==2); - TEST(@"Graph has correct number of edges", [[g edges] count]==1); - - NSEnumerator *en = [[g nodes] objectEnumerator]; - Node *n; - Node *n1, *n2; - while ((n=[en nextObject])) { - [n attachStyleFromTable:styles]; - if ([n style] == rn) n1 = n; - else if ([n style] == nil) n2 = n; - } - - TEST(@"Styles attached correctly", n1!=nil && n2!=nil); - - TEST(@"Nodes labeled correctly", - [[n1 label] isEqualToString:@"stuff{$\\alpha$ in here}"] && - [[n2 label] isEqualToString:@""] - ); - - Edge *e1 = [[[g edges] objectEnumerator] nextObject]; - - TEST(@"Edge has edge node", [e1 edgeNode]!=nil); - TEST(@"Edge node labeled correctly", [[[e1 edgeNode] label] isEqualToString:@"-"]); -// NSString *sty = [[[[[e1 edgeNode] data] atoms] objectEnumerator] nextObject]; -// TEST(@"Edge node styled correctly", sty!=nil && [sty isEqualToString:@"tick"]); - - PUTS(@"Source anchor: %@",[e1 sourceAnchor]); - PUTS(@"Target anchor: %@",[e1 targetAnchor]); - - endTestBlock(@"parser"); - - [pool drain]; -} diff --git a/tikzit-old/src/common/test/test.h b/tikzit-old/src/common/test/test.h deleted file mode 100644 index 59dcdd4..0000000 --- a/tikzit-old/src/common/test/test.h +++ /dev/null @@ -1,57 +0,0 @@ -// -// test.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// -#import - -@interface Allocator : NSObject -{} -@end - -BOOL fuzzyCompare (float f1, float f2); -BOOL fuzzyComparePoints (NSPoint p1, NSPoint p2); - -void setColorEnabled(BOOL b); - -void pass(NSString *msg); -void fail(NSString *msg); -void TEST(NSString *msg, BOOL test); -void assertRectsEqual (NSString *msg, NSRect val, NSRect exp); -void assertPointsEqual (NSString *msg, NSPoint val, NSPoint exp); -void assertFloatsEqual (NSString *msg, float val, float exp); - -void startTests(); -void endTests(); - -void startTestBlock(NSString *name); -void endTestBlock(NSString *name); - -#define PUTS(fmt, ...) { \ - NSString *_str = [[NSString alloc] initWithFormat:fmt, ##__VA_ARGS__]; \ - printf("%s\n", [_str UTF8String]); \ - [_str release]; } - -#define failFmt(fmt, ...) { \ - NSString *_fstr = [[NSString alloc] initWithFormat:fmt, ##__VA_ARGS__]; \ - fail(_fstr); \ - [_fstr release]; } - -// vim:ft=objc:ts=4:sts=4:sw=4:noet diff --git a/tikzit-old/src/common/test/test.m b/tikzit-old/src/common/test/test.m deleted file mode 100644 index 9afcd67..0000000 --- a/tikzit-old/src/common/test/test.m +++ /dev/null @@ -1,175 +0,0 @@ -// -// test.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// -#import "test/test.h" - -static int PASSES; -static int FAILS; - -static int ALLOC_INSTANCES = 0; - -static BOOL colorEnabled = YES; -static int depth = 0; - -static NSString *RED, *GREEN, *BLUE, *OFF; - -static NSString *indents[6] = - {@"", @" ", @" ", @" ", - @" ", @" "}; - -#define INDENT ((depth >= 6) ? indents[5] : indents[depth]) - - -@implementation Allocator - -+ (id)alloc { - ++ALLOC_INSTANCES; - return [super alloc]; -} - -- (void)dealloc { - --ALLOC_INSTANCES; - [super dealloc]; -} - -+ (Allocator*)allocator { - return [[[Allocator alloc] init] autorelease]; -} - -@end - -BOOL fuzzyCompare(float f1, float f2) { - return (ABS(f1 - f2) <= 0.00001f * MAX(1.0f,MIN(ABS(f1), ABS(f2)))); -} - -BOOL fuzzyComparePoints (NSPoint p1, NSPoint p2) { - return fuzzyCompare (p1.x, p2.x) && fuzzyCompare (p1.y, p2.y); -} - -void pass(NSString *msg) { - PUTS(@"%@[%@PASS%@] %@", INDENT, GREEN, OFF, msg); - ++PASSES; -} - -void fail(NSString *msg) { - PUTS(@"%@[%@FAIL%@] %@", INDENT, RED, OFF, msg); - ++FAILS; -} - -void TEST(NSString *msg, BOOL test) { - if (test) { - pass (msg); - } else { - fail (msg); - } -} - -void assertRectsEqual (NSString *msg, NSRect r1, NSRect r2) { - BOOL equal = fuzzyCompare (r1.origin.x, r2.origin.x) && - fuzzyCompare (r1.origin.y, r2.origin.y) && - fuzzyCompare (r1.size.width, r2.size.width) && - fuzzyCompare (r1.size.height, r2.size.height); - if (equal) { - pass (msg); - } else { - failFmt(@"%@ (expected (%f,%f:%fx%f) but got (%f,%f:%fx%f))", - msg, - r2.origin.x, r2.origin.y, r2.size.width, r2.size.height, - r1.origin.x, r1.origin.y, r1.size.width, r1.size.height); - } -} - -void assertPointsEqual (NSString *msg, NSPoint p1, NSPoint p2) { - BOOL equal = fuzzyCompare (p1.x, p2.x) && fuzzyCompare (p1.y, p2.y); - if (equal) { - pass (msg); - } else { - failFmt(@"%@ (expected (%f,%f) but got (%f,%f)", - msg, - p2.x, p2.y, - p1.x, p1.y); - } -} - -void assertFloatsEqual (NSString *msg, float f1, float f2) { - if (fuzzyCompare (f1, f2)) { - pass (msg); - } else { - failFmt(@"%@ (expected %f but got %f", msg, f2, f1); - } -} - -void startTests() { - PASSES = 0; - FAILS = 0; -} - -void endTests() { - PUTS(@"Done testing. %@%d%@ passed, %@%d%@ failed.", - GREEN, PASSES, OFF, - RED, FAILS, OFF); -} - -void startTestBlock(NSString *name) { - PUTS(@"%@Starting %@%@%@ tests.", INDENT, BLUE, name, OFF); - ++depth; -} - -void endTestBlock(NSString *name) { - --depth; - PUTS(@"%@Done with %@%@%@ tests.", INDENT, BLUE, name, OFF); -} - -void setColorEnabled(BOOL b) { - colorEnabled = b; - if (b) { - RED = @"\033[31;1m"; - GREEN = @"\033[32;1m"; - BLUE = @"\033[36;1m"; - OFF = @"\033[0m"; - } else { - RED = @""; - GREEN = @""; - BLUE = @""; - OFF = @""; - } -} - -#ifdef STAND_ALONE -void runTests(); - -int main() { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - setColorEnabled (NO); - startTests(); - - runTests(); - - endTests(); - - [pool drain]; - return 0; -} -#endif - -// vim:ft=objc:ts=4:sts=4:sw=4:noet diff --git a/tikzit-old/src/common/tikzlexer.lm b/tikzit-old/src/common/tikzlexer.lm deleted file mode 100644 index 1e92f73..0000000 --- a/tikzit-old/src/common/tikzlexer.lm +++ /dev/null @@ -1,170 +0,0 @@ -%{ -/* - * Copyright 2010 Chris Heunen - * Copyright 2010-2013 Aleks Kissinger - * Copyright 2013 K. Johan Paulsson - * Copyright 2013 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import -#import "tikzparserdefs.h" -#import "tikzparser.h" - -#define YY_USER_ACTION \ - yylloc->first_line = yylloc->last_line; \ - yylloc->first_column = yylloc->last_column + 1; \ - yylloc->last_column = yylloc->first_column + yyleng - 1; - -%} - -%option reentrant bison-bridge bison-locations 8bit -%option nounput -%option yylineno -%option noyywrap -%option header-file="common/tikzlexer.h" -%option extra-type="TikzGraphAssembler *" - - -%s props -%s xcoord -%s ycoord -%s noderef - -FLOAT \-?[0-9]*(\.[0-9]+)? - -%% - - /* whitespace is ignored, except for position counting; we don't - count formfeed and vtab as whitespace, because it's not obvious - how they should be dealt with and no-one actually uses them */ - - /* lex will take the longest-matching string */ -\r\n|\r|\n { - yylloc->first_line += 1; - yylloc->last_line = yylloc->first_line; - yylloc->first_column = yylloc->last_column = 0; -} -[\t ]+ { } - -\\begin\{tikzpicture\} { return BEGIN_TIKZPICTURE_CMD; } -\\end\{tikzpicture\} { return END_TIKZPICTURE_CMD; } -\\begin\{pgfonlayer\} { return BEGIN_PGFONLAYER_CMD; } -\\end\{pgfonlayer\} { return END_PGFONLAYER_CMD; } -\\draw { return DRAW_CMD; } -\\node { return NODE_CMD; } -\\path { return PATH_CMD; } -rectangle { return RECTANGLE; } -node { return NODE; } -at { return AT; } -to { return TO; } -; { return SEMICOLON; } - -\([ ]*{FLOAT}[ ]*,[ ]*{FLOAT}[ ]*\) { - yylloc->last_column = yylloc->first_column + 1; - yyless(1); - BEGIN(xcoord); -} -{FLOAT} { - yylval->pt.x=(float)strtod(yytext,NULL); - BEGIN(ycoord); -} -, { } -{FLOAT} { - yylval->pt.y=(float)strtod(yytext,NULL); -} -\) { - BEGIN(INITIAL); - return COORD; -} - - /* when we see "[", change parsing mode */ -\[ /*syntaxhlfix]*/ { - BEGIN(props); - return LEFTBRACKET; -} -= { return EQUALS; } -, { return COMMA; } - /* technically, it is possible to have newlines in the middle of - property names or values, but in practice this is unlikely and - screws up our line counting */ -[^=,\{\] \t\n]([^=,\{\]\n]*[^=,\{\] \t\n])? { - yylval->nsstr=[NSString stringWithUTF8String:yytext]; - return PROPSTRING; -} -\] { - BEGIN(INITIAL); - return RIGHTBRACKET; -} - -\( { - BEGIN(noderef); - return LEFTPARENTHESIS; -} -\. { - return FULLSTOP; -} - /* we assume node names (and anchor names) never contain - newlines */ -[^\.\{\)\n]+ { - yylval->nsstr=[NSString stringWithUTF8String:yytext]; - return REFSTRING; -} -\) { - BEGIN(INITIAL); - return RIGHTPARENTHESIS; -} - -\{ { - NSMutableString *buf = [NSMutableString string]; - unsigned int brace_depth = 1; - unsigned int escape = 0; - while (1) { - char c = input(yyscanner); - // eof reached before closing brace - if (c == '\0' || c == EOF) { - return UNCLOSED_DELIM_STR; - } - - yylloc->last_column += 1; - yyleng += 1; - if (escape) { - escape = 0; - } else if (c == '\\') { - escape = 1; - } else if (c == '{') { - brace_depth++; - } else if (c == '}') { - brace_depth--; - if (brace_depth == 0) break; - } else if (c == '\n') { - yylloc->last_line += 1; - yylloc->last_column = 0; - } - [buf appendFormat:@"%c", c]; - } - - yylval->nsstr = buf; - return DELIMITEDSTRING; -} - -\\begin { return UNKNOWN_BEGIN_CMD; } -\\end { return UNKNOWN_END_CMD; } -\\[a-zA-Z0-9]+ { return UNKNOWN_CMD; } -[a-zA-Z0-9]+ { return UNKNOWN_STR; } -. { return UNKNOWN_STR; } - - /* vi:ft=lex:noet:ts=4:sts=4:sw=4: - */ diff --git a/tikzit-old/src/common/tikzparser.ym b/tikzit-old/src/common/tikzparser.ym deleted file mode 100644 index 344e969..0000000 --- a/tikzit-old/src/common/tikzparser.ym +++ /dev/null @@ -1,224 +0,0 @@ -%{ -/* - * Copyright 2010 Chris Heunen - * Copyright 2010-2013 Aleks Kissinger - * Copyright 2013 K. Johan Paulsson - * Copyright 2013 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "tikzparserdefs.h" -%} - -/* we use features added to bison 2.4 */ -%require "2.3" - -%error-verbose -/* enable maintaining locations for better error messages */ -%locations -/* the name of the header file */ -/*%defines "common/tikzparser.h"*/ -/* make it re-entrant (no global variables) */ -%pure-parser -/* We use a pure (re-entrant) lexer. This means yylex - will take a void* (opaque) type to maintain its state */ -%lex-param {void *scanner} -/* Since this parser is also pure, yyparse needs to take - that lexer state as an argument */ -%parse-param {void *scanner} - -/* possible data types for semantic values */ -%union { - NSString *nsstr; - GraphElementProperty *prop; - GraphElementData *data; - Node *node; - NSPoint pt; - struct noderef noderef; -} - -%{ -#import "GraphElementData.h" -#import "GraphElementProperty.h" -#import "Node.h" -#import "Edge.h" - -#import "tikzlexer.h" -#import "TikzGraphAssembler+Parser.h" -/* the assembler (used by this parser) is stored in the lexer - state as "extra" data */ -#define assembler yyget_extra(scanner) - -/* pass errors off to the assembler */ -void yyerror(YYLTYPE *yylloc, void *scanner, const char *str) { - [assembler reportError:str atLocation:yylloc]; -} -%} - -/* yyloc is set up with first_column = last_column = 1 by default; - however, it makes more sense to think of us being "before the - start of the line" before we parse anything */ -%initial-action { - yylloc.first_column = yylloc.last_column = 0; -} - - -%token BEGIN_TIKZPICTURE_CMD "\\begin{tikzpicture}" -%token END_TIKZPICTURE_CMD "\\end{tikzpicture}" -%token BEGIN_PGFONLAYER_CMD "\\begin{pgfonlayer}" -%token END_PGFONLAYER_CMD "\\end{pgfonlayer}" -%token DRAW_CMD "\\draw" -%token NODE_CMD "\\node" -%token PATH_CMD "\\path" -%token RECTANGLE "rectangle" -%token NODE "node" -%token AT "at" -%token TO "to" -%token SEMICOLON ";" -%token COMMA "," - -%token LEFTPARENTHESIS "(" -%token RIGHTPARENTHESIS ")" -%token LEFTBRACKET "[" -%token RIGHTBRACKET "]" -%token FULLSTOP "." -%token EQUALS "=" -%token COORD "co-ordinate" -%token PROPSTRING "key/value string" -%token REFSTRING "string" -%token DELIMITEDSTRING "{-delimited string" - -%token UNKNOWN_BEGIN_CMD "unknown \\begin command" -%token UNKNOWN_END_CMD "unknown \\end command" -%token UNKNOWN_CMD "unknown latex command" -%token UNKNOWN_STR "unknown string" -%token UNCLOSED_DELIM_STR "unclosed {-delimited string" - -%type nodename -%type optanchor -%type val -%type property -%type extraproperties -%type properties -%type optproperties -%type optedgenode -%type noderef -%type optnoderef - -%% - -tikzpicture: "\\begin{tikzpicture}" optproperties tikzcmds "\\end{tikzpicture}" - { - if ($2) { - [[assembler graph] setData:$2]; - } - }; -tikzcmds: tikzcmds tikzcmd | ; -tikzcmd: node | edge | boundingbox | ignore; - -ignore: "\\begin{pgfonlayer}" DELIMITEDSTRING | "\\end{pgfonlayer}"; - -optproperties: - "[" "]" - { $$ = nil; } - | "[" properties "]" - { $$ = $2; } - | { $$ = nil; }; -properties: extraproperties property - { - [$1 addObject:$2]; - $$ = $1; - }; -extraproperties: - extraproperties property "," - { - [$1 addObject:$2]; - $$ = $1; - } - | { $$ = [GraphElementData data]; }; -property: - val "=" val - { $$ = [GraphElementProperty property:$1 withValue:$3]; } - | val - { $$ = [GraphElementProperty atom:$1]; }; -val: PROPSTRING { $$ = $1; } | DELIMITEDSTRING { $$ = $1; }; - -nodename: "(" REFSTRING ")" { $$ = $2; }; -node: "\\node" optproperties nodename "at" COORD DELIMITEDSTRING ";" - { - Node *node = [[Node alloc] init]; - if ($2) - [node setData:$2]; - [node setName:$3]; - [node setPoint:$5]; - [node setLabel:$6]; - [assembler addNodeToMap:node]; - [[assembler graph] addNode:node]; -#if ! __has_feature(objc_arc) - [node release]; -#endif - }; - -optanchor: { $$ = nil; } | "." REFSTRING { $$ = $2; }; -noderef: "(" REFSTRING optanchor ")" - { - $$.node = [assembler nodeWithName:$2]; - $$.anchor = $3; - }; -optnoderef: - noderef { $$ = $1; } - | "(" ")" { $$.node = nil; $$.anchor = nil; } -optedgenode: - { $$ = nil; } - | "node" optproperties DELIMITEDSTRING - { - $$ = [Node node]; - if ($2) - [$$ setData:$2]; - [$$ setLabel:$3]; - } -edge: "\\draw" optproperties noderef "to" optedgenode optnoderef ";" - { - Edge *edge = [[Edge alloc] init]; - if ($2) - [edge setData:$2]; - [edge setSource:$3.node]; - [edge setSourceAnchor:$3.anchor]; - [edge setEdgeNode:$5]; - if ($6.node) { - [edge setTarget:$6.node]; - [edge setTargetAnchor:$6.anchor]; - } else { - [edge setTarget:$3.node]; - [edge setTargetAnchor:$3.anchor]; - } - [edge setAttributesFromData]; - [[assembler graph] addEdge:edge]; -#if ! __has_feature(objc_arc) - [edge release]; -#endif - }; - -ignoreprop: val | val "=" val; -ignoreprops: ignoreprop ignoreprops | ; -optignoreprops: "[" ignoreprops "]"; -boundingbox: - "\\path" optignoreprops COORD "rectangle" COORD ";" - { - [[assembler graph] setBoundingBox:NSRectAroundPoints($3, $5)]; - }; - -/* vi:ft=yacc:noet:ts=4:sts=4:sw=4 -*/ diff --git a/tikzit-old/src/common/tikzparserdefs.h b/tikzit-old/src/common/tikzparserdefs.h deleted file mode 100644 index cde3345..0000000 --- a/tikzit-old/src/common/tikzparserdefs.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright 2013 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/* - * This file sets up some defs (particularly struct noderef) needed for - * the tikz parser and its users. - * - * It is needed because we wish to support bison 2.3, which is the - * version shipped with OSX. bison 2.4 onwards allows us to put this - * stuff in a "%code requires" block, where it will be put in the - * generated header file by bison. - * - * All the types used by the %union directive in tikzparser.ym should - * be declared, defined or imported here. - */ - -// Foundation has NSPoint and NSString -#import - -@class TikzGraphAssembler; -@class GraphElementData; -@class GraphElementProperty; -@class Node; - -struct noderef { -#if __has_feature(objc_arc) - __unsafe_unretained Node *node; - __unsafe_unretained NSString *anchor; -#else - Node *node; - NSString *anchor; -#endif -}; - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/common/util.h b/tikzit-old/src/common/util.h deleted file mode 100644 index b34f25d..0000000 --- a/tikzit-old/src/common/util.h +++ /dev/null @@ -1,201 +0,0 @@ -// -// util.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// - -#import - -#include - -#ifndef M_PI -#define M_PI 3.141592654 -#endif - -#ifndef MAX -#define MAX(a,b) (((a) > (b)) ? (a) : (b)) -#endif - -#ifndef MIN -#define MIN(a,b) (((a) < (b)) ? (a) : (b)) -#endif - -/*! - @brief Compute a bounding rectangle for two given points. - @param p1 a point. - @param p2 another point. - @result A bounding rectangle for p1 and p2. - */ -NSRect NSRectAroundPoints(NSPoint p1, NSPoint p2); - -/*! - @brief Compute a bounding rectangle for two given points. - @param rect the base rectangle - @param the point to ensure is included - @result A rectangle containing rect and p - */ -NSRect NSRectWithPoint(NSRect rect, NSPoint p); - -/*! - @brief Compute a bounding rectangle for two given points with a given padding. - @param p1 a point. - @param p2 another point. - @param padding a padding. - @result A bounding rectangle for p1 and p2 with padding. - */ -NSRect NSRectAroundPointsWithPadding(NSPoint p1, NSPoint p2, float padding); - -/*! - @brief Compute a bounding rectangle for four given points. - @result A bounding rectangle for p1, p2, p3 and p4. - */ -NSRect NSRectAround4Points(NSPoint p1, NSPoint p2, NSPoint p3, NSPoint p4); - -/*! - @brief Compute a bounding rectangle for four given points. - @param padding the amount to pad the rectangle - @result A bounding rectangle for p1, p2, p3 and p4 with padding - */ -NSRect NSRectAround4PointsWithPadding(NSPoint p1, NSPoint p2, NSPoint p3, NSPoint p4, float padding); - -/*! - @brief Find the distance between two points - @param p1 The first point - @param p2 The second point - @result The distance between p1 and p2 - */ -float NSDistanceBetweenPoints(NSPoint p1, NSPoint p2); - -/*! - @brief Compute the 'real' arctan for two points. Always succeeds and gives a good angle, - regardless of sign, zeroes, etc. - @param dx the x distance between points. - @param dy the y distance between points. - @result An angle in radians. - */ -float good_atan(float dx, float dy); - -/*! - @brief Interpolate along a bezier curve to the given distance. To find the x coord, - use the relavant x coordinates for c0-c3, and for y use the y's. - @param dist a distance from 0 to 1 spanning the whole curve. - @param c0 the x (resp. y) coordinate of the start point. - @param c1 the x (resp. y) coordinate of the first control point. - @param c2 the x (resp. y) coordinate of the second control point. - @param c3 the x (resp. y) coordinate of the end point. - @result The x (resp. y) coordinate of the point at 'dist'. - */ -float bezierInterpolate (float dist, float c0, float c1, float c2, float c3); - -/*! - @brief Interpolate along a bezier curve to the given distance. - @param dist a distance from 0 to 1 spanning the whole curve. - @param c0 the x start point. - @param c1 the x first control point. - @param c2 the x second control point. - @param c3 the x end point. - @result The point at 'dist'. - */ -NSPoint bezierInterpolateFull (float dist, NSPoint c0, NSPoint c1, NSPoint c2, NSPoint c3); - -/*! - * @brief Find whether two line segments intersect - * @param l1start The starting point of line segment 1 - * @param l1end The ending point of line segment 1 - * @param l2start The starting point of line segment 2 - * @param l2end The ending point of line segment 2 - * @param result A location to store the intersection point - * @result YES if they intersect, NO if they do not - */ -BOOL lineSegmentsIntersect (NSPoint l1start, NSPoint l1end, NSPoint l2start, NSPoint l2end, NSPoint *result); - -/*! - * @brief Find whether a line segment intersects a bezier curve - * @detail Always finds the intersection furthest along the line segment - * @param lstart The starting point of the line segment - * @param lend The ending point of the line segment - * @param c0 The starting point of the bezier curve - * @param c1 The first control point of the bezier curve - * @param c2 The second control point of the bezier curve - * @param c3 The ending point of the bezier curve - * @param result A location to store the intersection point - * @result YES if they intersect, NO if they do not - */ -BOOL lineSegmentIntersectsBezier (NSPoint lstart, NSPoint lend, NSPoint c0, NSPoint c1, NSPoint c2, NSPoint c3, NSPoint *result); - -/*! - * @brief Find whether a line segment enters a rectangle - * @param lineStart The starting point of the line segment - * @param lineEnd The ending point of the line segment - * @param rect The rectangle - * @result YES if they intersect, NO if they do not - */ -BOOL lineSegmentIntersectsRect (NSPoint lineStart, NSPoint lineEnd, NSRect rect); - -/*! - * @brief Find where a ray exits a rectangle - * @param rayStart The starting point of the ray; must be contained in rect - * @param angle_rads The angle of the ray, in radians - * @param rect The rectangle - * @result The point at which the ray leaves the rect - */ -NSPoint findExitPointOfRay (NSPoint rayStart, float angle_rads, NSRect rect); - -/*! - @brief Round val to nearest stepSize - @param stepSize the courseness - @param val a value to round - */ -float roundToNearest(float stepSize, float val); - -/*! - @brief Convert radians into degrees - */ -float radiansToDegrees(float radians); - -/*! - @brief Convert degrees into radians - */ -float degreesToRadians(float degrees); - -/*! - @brief Normalises an angle (in degrees) to fall between -179 and 180 - */ -int normaliseAngleDeg (int degrees); - -/*! - @brief Normalises an angle (in radians) to fall in the range (-pi,pi] - */ -float normaliseAngleRad (float rads); - -/*! - @brief Express a byte as alpha-only hex, with digits (0..16) -> (a..jA..F) - @param sh A number 0-255 - @result A string 'aa'-'FF' - */ -NSString *alphaHex(unsigned short sh); - -const char *find_start_of_nth_line (const char * string, int line); - -/*! - @brief Formats a CGFloat as a string, removing trailing zeros - @detail Unlike formatting an NSNumber, or using %g, it will never - produce scientific notation (like "2.00e2"). Unlike %f, - it will not include unnecessary trailing zeros. - */ -NSString *formatFloat(CGFloat f, int maxdps); - diff --git a/tikzit-old/src/common/util.m b/tikzit-old/src/common/util.m deleted file mode 100644 index e9b8899..0000000 --- a/tikzit-old/src/common/util.m +++ /dev/null @@ -1,403 +0,0 @@ -// -// util.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// - -#import "util.h" -#import "math.h" - -static BOOL fuzzyCompare(float f1, float f2) { - return (ABS(f1 - f2) <= 0.00001f * MIN(ABS(f1), ABS(f2))); -} - -NSRect NSRectWithPoint(NSRect rect, NSPoint p) { - CGFloat minX = NSMinX(rect); - CGFloat maxX = NSMaxX(rect); - CGFloat minY = NSMinY(rect); - CGFloat maxY = NSMaxY(rect); - if (p.x < minX) { - minX = p.x; - } else if (p.x > maxX) { - maxX = p.x; - } - if (p.y < minY) { - minY = p.y; - } else if (p.y > maxY) { - maxY = p.y; - } - return NSMakeRect(minX, minY, maxX - minX, maxY - minY); -} - -NSRect NSRectAroundPointsWithPadding(NSPoint p1, NSPoint p2, float padding) { - return NSMakeRect(MIN(p1.x,p2.x)-padding, - MIN(p1.y,p2.y)-padding, - ABS(p2.x-p1.x)+(2.0f*padding), - ABS(p2.y-p1.y)+(2.0f*padding)); -} - -NSRect NSRectAroundPoints(NSPoint p1, NSPoint p2) { - return NSRectAroundPointsWithPadding(p1, p2, 0.0f); -} - -NSRect NSRectAround4PointsWithPadding(NSPoint p1, NSPoint p2, NSPoint p3, NSPoint p4, float padding) { - float leftMost = MIN(p1.x, p2.x); - leftMost = MIN(leftMost, p3.x); - leftMost = MIN(leftMost, p4.x); - float rightMost = MAX(p1.x, p2.x); - rightMost = MAX(rightMost, p3.x); - rightMost = MAX(rightMost, p4.x); - float topMost = MIN(p1.y, p2.y); - topMost = MIN(topMost, p3.y); - topMost = MIN(topMost, p4.y); - float bottomMost = MAX(p1.y, p2.y); - bottomMost = MAX(bottomMost, p3.y); - bottomMost = MAX(bottomMost, p4.y); - return NSMakeRect(leftMost-padding, - topMost-padding, - (rightMost - leftMost)+(2.0f*padding), - (bottomMost - topMost)+(2.0f*padding)); -} - -NSRect NSRectAround4Points(NSPoint p1, NSPoint p2, NSPoint p3, NSPoint p4) { - return NSRectAround4PointsWithPadding(p1, p2, p3, p4, 0.0f); -} - -float NSDistanceBetweenPoints(NSPoint p1, NSPoint p2) { - float dx = p2.x - p1.x; - float dy = p2.y - p1.y; - return sqrt(dx * dx + dy * dy); -} - -float good_atan(float dx, float dy) { - if (dx > 0) { - return atan(dy/dx); - } else if (dx < 0) { - return M_PI + atan(dy/dx); - } else { - if (dy > 0) return 0.5 * M_PI; - else if (dy < 0) return 1.5 * M_PI; - else return 0; - } -} - -// interpolate on a cubic bezier curve -float bezierInterpolate(float dist, float c0, float c1, float c2, float c3) { - float distp = 1 - dist; - return (distp*distp*distp) * c0 + - 3 * (distp*distp) * dist * c1 + - 3 * (dist*dist) * distp * c2 + - (dist*dist*dist) * c3; -} - -NSPoint bezierInterpolateFull (float dist, NSPoint c0, NSPoint c1, NSPoint c2, NSPoint c3) { - return NSMakePoint (bezierInterpolate (dist, c0.x, c1.x, c2.x, c3.x), - bezierInterpolate (dist, c0.y, c1.y, c2.y, c3.y)); -} - -static void lineCoeffsFromPoints(NSPoint p1, NSPoint p2, float *A, float *B, float *C) { - *A = p2.y - p1.y; - *B = p1.x - p2.x; - *C = (*A) * p1.x + (*B) * p1.y; -} - -static void lineCoeffsFromPointAndAngle(NSPoint p, float angle, float *A, float *B, float *C) { - *A = sin (angle); - *B = -cos (angle); - *C = (*A) * p.x + (*B) * p.y; -} - -static BOOL lineSegmentContainsPoint(NSPoint l1, NSPoint l2, float x, float y) { - float minX = MIN(l1.x, l2.x); - float maxX = MAX(l1.x, l2.x); - float minY = MIN(l1.y, l2.y); - float maxY = MAX(l1.y, l2.y); - return (x >= minX || fuzzyCompare (x, minX)) && - (x <= maxX || fuzzyCompare (x, maxX)) && - (y >= minY || fuzzyCompare (y, minY)) && - (y <= maxY || fuzzyCompare (y, maxY)); -} - -BOOL lineSegmentsIntersect(NSPoint l1start, NSPoint l1end, NSPoint l2start, NSPoint l2end, NSPoint *result) { - // Ax + By = C - float A1, B1, C1; - lineCoeffsFromPoints(l1start, l1end, &A1, &B1, &C1); - float A2, B2, C2; - lineCoeffsFromPoints(l2start, l2end, &A2, &B2, &C2); - - float det = A1*B2 - A2*B1; - if (det == 0.0f) { - // parallel - return NO; - } else { - float x = (B2*C1 - B1*C2)/det; - float y = (A1*C2 - A2*C1)/det; - - if (lineSegmentContainsPoint(l1start, l1end, x, y) && - lineSegmentContainsPoint(l2start, l2end, x, y)) { - if (result) { - (*result).x = x; - (*result).y = y; - } - return YES; - } - } - return NO; -} - -BOOL lineSegmentIntersectsBezier (NSPoint lstart, NSPoint lend, NSPoint c0, NSPoint c1, NSPoint c2, NSPoint c3, NSPoint *result) { - NSRect curveBounds = NSRectAround4Points(c0, c1, c2, c3); - if (!lineSegmentIntersectsRect(lstart, lend, curveBounds)) - return NO; - - const int divisions = 20; - const float chunkSize = 1.0f/(float)divisions; - float chunkStart = 0.0f; - BOOL found = NO; - - for (int i = 0; i < divisions; ++i) { - float chunkEnd = chunkStart + chunkSize; - - NSPoint p1 = bezierInterpolateFull (chunkStart, c0, c1, c2, c3); - NSPoint p2 = bezierInterpolateFull (chunkEnd, c0, c1, c2, c3); - - NSPoint p; - if (lineSegmentsIntersect (lstart, lend, p1, p2, &p)) { - lstart = p; - found = YES; - } - - chunkStart = chunkEnd; - } - if (found && result) { - *result = lstart; - } - return found; -} - -BOOL lineSegmentIntersectsRect(NSPoint lineStart, NSPoint lineEnd, NSRect rect) { - const float rectMaxX = NSMaxX(rect); - const float rectMinX = NSMinX(rect); - const float rectMaxY = NSMaxY(rect); - const float rectMinY = NSMinY(rect); - - // check if the segment is entirely to one side of the rect - if (lineStart.x > rectMaxX && lineEnd.x > rectMaxX) { - return NO; - } - if (lineStart.x < rectMinX && lineEnd.x < rectMinX) { - return NO; - } - if (lineStart.y > rectMaxY && lineEnd.y > rectMaxY) { - return NO; - } - if (lineStart.y < rectMinY && lineEnd.y < rectMinY) { - return NO; - } - - // Now check whether the (infinite) line intersects the rect - // (if it does, so does the segment, due to above checks) - - // Ax + By = C - float A, B, C; - lineCoeffsFromPoints(lineStart, lineEnd, &A, &B, &C); - - const float tlVal = A * rectMinX + B * rectMaxY - C; - const float trVal = A * rectMaxX + B * rectMaxY - C; - const float blVal = A * rectMinX + B * rectMinY - C; - const float brVal = A * rectMaxX + B * rectMinY - C; - - if (tlVal < 0 && trVal < 0 && blVal < 0 && brVal < 0) { - // rect below line - return NO; - } - if (tlVal > 0 && trVal > 0 && blVal > 0 && brVal > 0) { - // rect above line - return NO; - } - - return YES; -} - -NSPoint findExitPointOfRay (NSPoint p, float angle_rads, NSRect rect) { - const float rectMinX = NSMinX (rect); - const float rectMaxX = NSMaxX (rect); - const float rectMinY = NSMinY (rect); - const float rectMaxY = NSMaxY (rect); - - const float angle = normaliseAngleRad (angle_rads); - - // special case the edges - if (p.y == rectMaxY && angle > 0 && angle < M_PI) { - // along the top of the box - return p; - } - if (p.y == rectMinY && angle < 0 && angle > -M_PI) { - // along the bottom of the box - return p; - } - if (p.x == rectMaxX && angle > -M_PI/2.0f && angle < M_PI/2.0f) { - // along the right of the box - return p; - } - if (p.x == rectMinX && (angle > M_PI/2.0f || angle < -M_PI/2.0f)) { - // along the left of the box - return p; - } - - float A1, B1, C1; - lineCoeffsFromPointAndAngle(p, angle, &A1, &B1, &C1); - //NSLog(@"Ray is %fx + %fy = %f", A1, B1, C1); - - const float tlAngle = normaliseAngleRad (good_atan (rectMinX - p.x, rectMaxY - p.y)); - const float trAngle = normaliseAngleRad (good_atan (rectMaxX - p.x, rectMaxY - p.y)); - if (angle <= tlAngle && angle >= trAngle) { - // exit top - float A2, B2, C2; - lineCoeffsFromPoints(NSMakePoint (rectMinX, rectMaxY), - NSMakePoint (rectMaxX, rectMaxY), - &A2, &B2, &C2); - float det = A1*B2 - A2*B1; - NSCAssert(det != 0.0f, @"Parallel lines?"); - NSPoint intersect = NSMakePoint ((B2*C1 - B1*C2)/det, - (A1*C2 - A2*C1)/det); - return intersect; - } - - const float brAngle = normaliseAngleRad (good_atan (rectMaxX - p.x, rectMinY - p.y)); - if (angle <= trAngle && angle >= brAngle) { - // exit right - float A2, B2, C2; - lineCoeffsFromPoints(NSMakePoint (rectMaxX, rectMaxY), - NSMakePoint (rectMaxX, rectMinY), - &A2, &B2, &C2); - //NSLog(@"Edge is %fx + %fy = %f", A2, B2, C2); - float det = A1*B2 - A2*B1; - NSCAssert(det != 0.0f, @"Parallel lines?"); - NSPoint intersect = NSMakePoint ((B2*C1 - B1*C2)/det, - (A1*C2 - A2*C1)/det); - return intersect; - } - - const float blAngle = normaliseAngleRad (good_atan (rectMinX - p.x, rectMinY - p.y)); - if (angle <= brAngle && angle >= blAngle) { - // exit bottom - float A2, B2, C2; - lineCoeffsFromPoints(NSMakePoint (rectMaxX, rectMinY), - NSMakePoint (rectMinX, rectMinY), - &A2, &B2, &C2); - float det = A1*B2 - A2*B1; - NSCAssert(det != 0.0f, @"Parallel lines?"); - NSPoint intersect = NSMakePoint ((B2*C1 - B1*C2)/det, - (A1*C2 - A2*C1)/det); - return intersect; - } else { - // exit left - float A2, B2, C2; - lineCoeffsFromPoints(NSMakePoint (rectMinX, rectMaxY), - NSMakePoint (rectMinX, rectMinY), - &A2, &B2, &C2); - float det = A1*B2 - A2*B1; - NSCAssert(det != 0.0f, @"Parallel lines?"); - NSPoint intersect = NSMakePoint ((B2*C1 - B1*C2)/det, - (A1*C2 - A2*C1)/det); - return intersect; - } -} - -float roundToNearest(float stepSize, float val) { - if (stepSize==0.0f) return val; - else return round(val/stepSize)*stepSize; -} - -float radiansToDegrees (float radians) { - return (radians * 180.0f) / M_PI; -} - -float degreesToRadians(float degrees) { - return (degrees * M_PI) / 180.0f; -} - -int normaliseAngleDeg (int degrees) { - while (degrees > 180) { - degrees -= 360; - } - while (degrees <= -180) { - degrees += 360; - } - return degrees; -} - -float normaliseAngleRad (float rads) { - while (rads > M_PI) { - rads -= 2 * M_PI; - } - while (rads <= -M_PI) { - rads += 2 * M_PI; - } - return rads; -} - -static char ahex[] = -{'a','b','c','d','e','f','g','h','i','j', - 'A','B','C','D','E','F'}; - -NSString *alphaHex(unsigned short sh) { - if (sh > 255) return @"!!"; - return [NSString stringWithFormat:@"%c%c", ahex[sh/16], ahex[sh%16]]; -} - -const char *find_start_of_nth_line (const char * string, int line) { - int l = 0; - const char *lineStart = string; - while (*lineStart && l < line) { - while (*lineStart && *lineStart != '\n') { - ++lineStart; - } - if (*lineStart) { - ++l; - ++lineStart; - } - } - return lineStart; -} - -NSString *formatFloat(CGFloat f, int maxdps) { - NSMutableString *result = [NSMutableString - stringWithFormat:@"%.*f", maxdps, f]; - // delete trailing zeros - NSUInteger lastPos = [result length] - 1; - NSUInteger firstDigit = ([result characterAtIndex:0] == '-') ? 1 : 0; - while (lastPos > firstDigit) { - if ([result characterAtIndex:lastPos] == '0') { - [result deleteCharactersInRange:NSMakeRange(lastPos, 1)]; - lastPos -= 1; - } else { - break; - } - } - if ([result characterAtIndex:lastPos] == '.') { - [result deleteCharactersInRange:NSMakeRange(lastPos, 1)]; - lastPos -= 1; - } - if ([@"-0" isEqualToString:result]) - return @"0"; - else - return result; -} - -// vi:ft=objc:noet:ts=4:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/Application.h b/tikzit-old/src/gtk/Application.h deleted file mode 100644 index 1b48a79..0000000 --- a/tikzit-old/src/gtk/Application.h +++ /dev/null @@ -1,155 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "InputDelegate.h" - -@class Application; -@class Configuration; -@class ContextWindow; -@class Preambles; -@class PreambleEditor; -@class PreviewWindow; -@class SettingsDialog; -@class StyleManager; -@class TikzDocument; -@class ToolBox; -@class Window; -@protocol Tool; - -extern Application* app; - -/** - * Manages the main application window - */ -@interface Application: NSObject { - // the main application configuration - Configuration *configFile; - // maintains the known (user-defined) styles - StyleManager *styleManager; - // maintains the preambles used for previews - Preambles *preambles; - // the last-accessed folders (for open and save dialogs) - NSString *lastOpenFolder; - NSString *lastSaveAsFolder; - - ToolBox *toolBox; - PreambleEditor *preambleWindow; - ContextWindow *contextWindow; - SettingsDialog *settingsDialog; - - // the open windows (array of Window*) - NSMutableArray *openWindows; - - // tools - id activeTool; - NSArray *tools; -} - -/** - * The main application configuration file - */ -@property (readonly) Configuration *mainConfiguration; - -/** - * The app-wide style manager instance - */ -@property (readonly) StyleManager *styleManager; - -/** - * The app-wide preambles registry - */ -@property (readonly) Preambles *preambles; - -/** - * The tools - */ -@property (readonly) NSArray *tools; - -/** - * The currently-selected tool - */ -@property (assign) id activeTool; - -/** - * The folder last actively chosen by a user for opening a file - */ -@property (copy) NSString *lastOpenFolder; - -/** - * The folder last actively chosen by a user for saving a file - */ -@property (copy) NSString *lastSaveAsFolder; - -/** - * The application instance. - */ -+ (Application*) app; - -/** - * Starts the application with a single window containing an empty file - */ -- (id) init; -/** - * Starts the application with the given files open - */ -- (id) initWithFiles:(NSArray*)files; - -/** - * Loads a new, empty document in a new window - */ -- (void) newWindow; -/** - * Loads an existing document from a file in a new window - * - * @param doc the document the new window should show - */ -- (void) newWindowWithDocument:(TikzDocument*)doc; -/** - * Quit the application, confirming with the user if there are - * changes to any open documents. - */ -- (void) quit; - -/** - * Show the dialog for editing preambles. - */ -- (void) presentPreamblesEditor; -/** - * Show the context-aware window - */ -- (void) presentContextWindow; -/** - * Show the settings dialog. - */ -- (void) presentSettingsDialog; - -/** - * Save the application configuration to permanent storage - * - * Should be called just before the application exits - */ -- (void) saveConfiguration; - -/** - * @result YES if key event was processed, NO otherwise - */ -- (BOOL) activateToolForKey:(unsigned int)keyVal withMask:(InputMask)mask; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/Application.m b/tikzit-old/src/gtk/Application.m deleted file mode 100644 index e9935bd..0000000 --- a/tikzit-old/src/gtk/Application.m +++ /dev/null @@ -1,377 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "Application.h" - -#import "Configuration.h" -#import "EdgeStylesModel.h" -#import "NodeStylesModel.h" -#import "PreambleEditor.h" -#import "ContextWindow.h" -#import "Shape.h" -#import "SettingsDialog.h" -#import "StyleManager.h" -#import "StyleManager+Storage.h" -#import "SupportDir.h" -#import "TikzDocument.h" -#import "ToolBox.h" -#import "Window.h" - -#ifdef HAVE_POPPLER -#import "Preambles.h" -#import "Preambles+Storage.h" -#endif - -#import "BoundingBoxTool.h" -#import "CreateNodeTool.h" -#import "CreateEdgeTool.h" -#import "HandTool.h" -#import "SelectTool.h" - -// used for args to g_mkdir_with_parents -#import "stat.h" - -Application* app = nil; - -@interface Application (Notifications) -- (void) windowClosed:(NSNotification*)notification; -- (void) windowGainedFocus:(NSNotification*)notification; -- (void) selectedToolChanged:(NSNotification*)notification; -- (void) windowDocumentChanged:(NSNotification*)n; -@end - -@interface Application (Private) -- (void) setActiveWindow:(Window*)window; -@end - -@implementation Application - -@synthesize mainConfiguration=configFile; -@synthesize styleManager, preambles; -@synthesize lastOpenFolder, lastSaveAsFolder; -@synthesize tools; - -+ (Application*) app { - if (app == nil) { - [[[self alloc] init] release]; - } - return app; -} - -- (id) _initCommon { - if (app != nil) { - [self release]; - self = app; - return self; - } - self = [super init]; - - if (self) { - NSError *error = nil; - configFile = [[Configuration alloc] initWithName:@"tikzit" loadError:&error]; - if (error != nil) { - logError (error, @"WARNING: Failed to load configuration"); - } - - styleManager = [[StyleManager alloc] init]; - [styleManager loadStylesUsingConfigurationName:@"styles"]; // FIXME: error message? - NodeStylesModel *nsm = [NodeStylesModel modelWithStyleManager:styleManager]; - EdgeStylesModel *esm = [EdgeStylesModel modelWithStyleManager:styleManager]; - -#ifdef HAVE_POPPLER - NSString *preamblesDir = [[SupportDir userSupportDir] stringByAppendingPathComponent:@"preambles"]; - preambles = [[Preambles alloc] initFromDirectory:preamblesDir]; // FIXME: error message? - [preambles setStyleManager:styleManager]; - NSString *selectedPreamble = [configFile stringEntry:@"selectedPreamble" inGroup:@"Preambles"]; - if (selectedPreamble != nil) { - [preambles setSelectedPreambleName:selectedPreamble]; - } -#endif - - lastOpenFolder = [[configFile stringEntry:@"lastOpenFolder" inGroup:@"Paths"] retain]; - if (lastOpenFolder == nil) - lastOpenFolder = [[configFile stringEntry:@"lastFolder" inGroup:@"Paths"] retain]; - lastSaveAsFolder = [[configFile stringEntry:@"lastSaveAsFolder" inGroup:@"Paths"] retain]; - if (lastSaveAsFolder == nil) - lastSaveAsFolder = [[configFile stringEntry:@"lastFolder" inGroup:@"Paths"] retain]; - - openWindows = [[NSMutableArray alloc] init]; - - tools = [[NSArray alloc] initWithObjects: - [SelectTool tool], - [CreateNodeTool toolWithNodeStylesModel:nsm], - [CreateEdgeTool toolWithEdgeStylesModel:esm], - [BoundingBoxTool tool], - [HandTool tool], - nil]; - activeTool = [tools objectAtIndex:0]; - for (id tool in tools) { - [tool loadConfiguration:configFile]; - } - - toolBox = [[ToolBox alloc] initWithTools:tools]; - [toolBox loadConfiguration:configFile]; - [toolBox setSelectedTool:activeTool]; - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(selectedToolChanged:) - name:@"ToolSelectionChanged" - object:toolBox]; - [toolBox show]; - - contextWindow = [[ContextWindow alloc] initWithNodeStylesModel:nsm - andEdgeStylesModel:esm]; - [contextWindow loadConfiguration:configFile]; - - app = [self retain]; - } - - return self; -} - -- (id) init { - self = [self _initCommon]; - - if (self) { - [self newWindow]; - } - - return self; -} - -- (id) initWithFiles:(NSArray*)files { - self = [self _initCommon]; - - if (self) { - int fileOpenCount = 0; - for (NSString *file in files) { - NSError *error = nil; - TikzDocument *doc = [TikzDocument documentFromFile:file styleManager:styleManager error:&error]; - if (doc != nil) { - [self newWindowWithDocument:doc]; - ++fileOpenCount; - } else { - logError(error, @"WARNING: failed to open file"); - } - } - if (fileOpenCount == 0) { - [self newWindow]; - } - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - [configFile release]; - [styleManager release]; - [preambles release]; - [lastOpenFolder release]; - [lastSaveAsFolder release]; - [preambleWindow release]; - [settingsDialog release]; - [openWindows release]; - [tools release]; - [activeTool release]; - [toolBox release]; - [contextWindow release]; - - [super dealloc]; -} - -- (id) activeTool { return activeTool; } -- (void) setActiveTool:(id)tool { - if (activeTool == tool) - return; - - activeTool = tool; - [toolBox setSelectedTool:tool]; - for (Window* window in openWindows) { - [window setActiveTool:tool]; - } -} - -- (BOOL) activateToolForKey:(unsigned int)keyVal withMask:(InputMask)mask { - // FIXME: cache the accel info, rather than reparsing it every time? - for (id tool in tools) { - guint toolKey = 0; - GdkModifierType toolMod = 0; - gtk_accelerator_parse ([[tool shortcut] UTF8String], &toolKey, &toolMod); - if (toolKey != 0 && toolKey == keyVal && (int)mask == (int)toolMod) { - [self setActiveTool:tool]; - return YES; - } - } - return NO; -} - -- (void) _addWindow:(Window*)window { - [window setActiveTool:activeTool]; - [openWindows addObject:window]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(windowClosed:) - name:@"WindowClosed" - object:window]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(windowGainedFocus:) - name:@"WindowGainedFocus" - object:window]; - if ([window hasFocus]) { - [self setActiveWindow:window]; - } -} - -- (void) newWindow { - [self _addWindow:[Window window]]; -} - -- (void) newWindowWithDocument:(TikzDocument*)doc { - [self _addWindow:[Window windowWithDocument:doc]]; -} - -- (void) quit { - NSMutableArray *unsavedDocs = [NSMutableArray arrayWithCapacity:[openWindows count]]; - for (Window *window in openWindows) { - TikzDocument *doc = [window document]; - if ([doc hasUnsavedChanges]) { - [unsavedDocs addObject:doc]; - } - } - if ([unsavedDocs count] > 0) { - // FIXME: show a dialog - return; - } - gtk_main_quit(); -} - -- (void) presentPreamblesEditor { -#ifdef HAVE_POPPLER - if (preambleWindow == nil) { - preambleWindow = [[PreambleEditor alloc] initWithPreambles:preambles]; - //[preambleWindow setParentWindow:mainWindow]; - } - [preambleWindow present]; -#endif -} - -- (void) presentContextWindow { - [contextWindow present]; -} - -- (void) presentSettingsDialog { - if (settingsDialog == nil) { - settingsDialog = [[SettingsDialog alloc] initWithConfiguration:configFile - andStyleManager:styleManager]; - //[settingsDialog setParentWindow:mainWindow]; - } - [settingsDialog present]; -} - -- (Configuration*) mainConfiguration { - return configFile; -} - -- (void) saveConfiguration { - NSError *error = nil; - -#ifdef HAVE_POPPLER - if (preambles != nil) { - NSString *preamblesDir = [[SupportDir userSupportDir] stringByAppendingPathComponent:@"preambles"]; - // NSFileManager is slightly dodgy on Windows - g_mkdir_with_parents ([preamblesDir UTF8String], S_IRUSR | S_IWUSR | S_IXUSR); - [preambles storeToDirectory:preamblesDir]; - [configFile setStringEntry:@"selectedPreamble" inGroup:@"Preambles" value:[preambles selectedPreambleName]]; - } -#endif - - [styleManager saveStylesUsingConfigurationName:@"styles"]; - - for (id tool in tools) { - [tool saveConfiguration:configFile]; - } - [toolBox saveConfiguration:configFile]; - - [contextWindow saveConfiguration:configFile]; - - if (lastOpenFolder != nil) { - [configFile setStringEntry:@"lastOpenFolder" inGroup:@"Paths" value:lastOpenFolder]; - } - if (lastSaveAsFolder != nil) { - [configFile setStringEntry:@"lastSaveAsFolder" inGroup:@"Paths" value:lastSaveAsFolder]; - } - - if (![configFile writeToStoreWithError:&error]) { - logError (error, @"Could not write config file"); - } -} - -@end - -@implementation Application (Notifications) -- (void) windowClosed:(NSNotification*)notification { - Window *window = [notification object]; - [openWindows removeObjectIdenticalTo:window]; - [[NSNotificationCenter defaultCenter] removeObserver:self - name:nil - object:window]; - if ([openWindows count] == 0) { - gtk_main_quit(); - } else { - [self setActiveWindow:[openWindows objectAtIndex:0]]; - } -} - -- (void) windowGainedFocus:(NSNotification*)notification { - Window *window = [notification object]; - [self setActiveWindow:window]; -} - -- (void) selectedToolChanged:(NSNotification*)n { - id tool = [[n userInfo] objectForKey:@"tool"]; - if (tool != nil) - [self setActiveTool:tool]; - else - NSLog(@"nil tool!"); -} - -- (void) windowDocumentChanged:(NSNotification*)n { - [contextWindow setDocument:[[n userInfo] objectForKey:@"document"]]; -} -@end - -@implementation Application (Private) -- (void) setActiveWindow:(Window*)window { - [[NSNotificationCenter defaultCenter] removeObserver:self - name:@"DocumentChanged" - object:nil]; - - [contextWindow setDocument:[window document]]; - - [contextWindow attachToWindow:window]; - [toolBox attachToWindow:window]; - - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(windowDocumentChanged:) - name:@"DocumentChanged" - object:window]; -} -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/BoundingBoxTool.h b/tikzit-old/src/gtk/BoundingBoxTool.h deleted file mode 100644 index f6498b0..0000000 --- a/tikzit-old/src/gtk/BoundingBoxTool.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "Tool.h" - -typedef enum { - NoHandle, - EastHandle, - SouthEastHandle, - SouthHandle, - SouthWestHandle, - WestHandle, - NorthWestHandle, - NorthHandle, - NorthEastHandle -} ResizeHandle; - -@interface BoundingBoxTool : NSObject { - GraphRenderer *renderer; - NSPoint dragOrigin; - ResizeHandle currentResizeHandle; - BOOL drawingNewBox; -} - -+ (id) tool; -- (id) init; -@end - - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/BoundingBoxTool.m b/tikzit-old/src/gtk/BoundingBoxTool.m deleted file mode 100644 index 483705e..0000000 --- a/tikzit-old/src/gtk/BoundingBoxTool.m +++ /dev/null @@ -1,353 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "BoundingBoxTool.h" - -#import "GraphRenderer.h" -#import "TikzDocument.h" -#import "tzstockitems.h" - -static const float handle_size = 8.0; -float sideHandleTop(NSRect bbox) { - return (NSMinY(bbox) + NSMaxY(bbox) - handle_size)/2.0f; -} -float tbHandleLeft(NSRect bbox) { - return (NSMinX(bbox) + NSMaxX(bbox) - handle_size)/2.0f; -} - -@interface BoundingBoxTool (Private) -- (NSRect) screenBoundingBox; -- (ResizeHandle) boundingBoxResizeHandleAt:(NSPoint)p; -- (NSRect) boundingBoxResizeHandleRect:(ResizeHandle)handle; -- (void) setResizeCursorForHandle:(ResizeHandle)handle; -@end - -@implementation BoundingBoxTool -- (NSString*) name { return @"Bounding Box"; } -- (const gchar*) stockId { return TIKZIT_STOCK_BOUNDING_BOX; } -- (NSString*) helpText { return @"Set the bounding box"; } -- (NSString*) shortcut { return @"b"; } - -+ (id) tool { - return [[[self alloc] init] autorelease]; -} - -- (id) init { - self = [super init]; - - if (self) { - currentResizeHandle = NoHandle; - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - [renderer release]; - - [super dealloc]; -} - -- (GraphRenderer*) activeRenderer { return renderer; } -- (void) setActiveRenderer:(GraphRenderer*)r { - if (r == renderer) - return; - - [[renderer surface] setCursor:NormalCursor]; - - [r retain]; - [renderer release]; - renderer = r; -} - -- (GtkWidget*) configurationWidget { return NULL; } - -- (void) mousePressAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { - if (button != LeftButton) - return; - - dragOrigin = pos; - currentResizeHandle = [self boundingBoxResizeHandleAt:pos]; - [[renderer document] startChangeBoundingBox]; - if (currentResizeHandle == NoHandle) { - drawingNewBox = YES; - [[[renderer document] graph] setBoundingBox:NSZeroRect]; - } else { - drawingNewBox = NO; - } - [renderer invalidateGraph]; -} - -- (void) mouseMoveTo:(NSPoint)pos withButtons:(MouseButton)buttons andMask:(InputMask)mask { - if (!(buttons & LeftButton)) { - ResizeHandle handle = [self boundingBoxResizeHandleAt:pos]; - [self setResizeCursorForHandle:handle]; - return; - } - - Transformer *transformer = [renderer transformer]; - Grid *grid = [renderer grid]; - Graph *graph = [[renderer document] graph]; - - if (currentResizeHandle == NoHandle) { - NSRect bbox = NSRectAroundPoints( - [grid snapScreenPoint:dragOrigin], - [grid snapScreenPoint:pos] - ); - [graph setBoundingBox:[transformer rectFromScreen:bbox]]; - } else { - NSRect bbox = [transformer rectToScreen:[graph boundingBox]]; - NSPoint p2 = [grid snapScreenPoint:pos]; - - if (currentResizeHandle == NorthWestHandle || - currentResizeHandle == NorthHandle || - currentResizeHandle == NorthEastHandle) { - - float dy = p2.y - NSMinY(bbox); - if (dy < bbox.size.height) { - bbox.origin.y += dy; - bbox.size.height -= dy; - } else { - bbox.origin.y = NSMaxY(bbox); - bbox.size.height = 0; - } - - } else if (currentResizeHandle == SouthWestHandle || - currentResizeHandle == SouthHandle || - currentResizeHandle == SouthEastHandle) { - - float dy = p2.y - NSMaxY(bbox); - if (-dy < bbox.size.height) { - bbox.size.height += dy; - } else { - bbox.size.height = 0; - } - } - - if (currentResizeHandle == NorthWestHandle || - currentResizeHandle == WestHandle || - currentResizeHandle == SouthWestHandle) { - - float dx = p2.x - NSMinX(bbox); - if (dx < bbox.size.width) { - bbox.origin.x += dx; - bbox.size.width -= dx; - } else { - bbox.origin.x = NSMaxX(bbox); - bbox.size.width = 0; - } - - } else if (currentResizeHandle == NorthEastHandle || - currentResizeHandle == EastHandle || - currentResizeHandle == SouthEastHandle) { - - float dx = p2.x - NSMaxX(bbox); - if (-dx < bbox.size.width) { - bbox.size.width += dx; - } else { - bbox.size.width = 0; - } - } - [graph setBoundingBox:[transformer rectFromScreen:bbox]]; - } - [[renderer document] changeBoundingBoxCheckPoint]; - [renderer invalidateGraph]; -} - -- (void) mouseReleaseAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { - if (button != LeftButton) - return; - - [[renderer document] endChangeBoundingBox]; - drawingNewBox = NO; - [renderer invalidateGraph]; -} - -- (void) renderWithContext:(id)context onSurface:(id)surface { - if (!drawingNewBox && [[[renderer document] graph] hasBoundingBox]) { - [context saveState]; - - [context setAntialiasMode:AntialiasDisabled]; - [context setLineWidth:1.0]; - - [context startPath]; - [context rect:[self boundingBoxResizeHandleRect:EastHandle]]; - [context rect:[self boundingBoxResizeHandleRect:SouthEastHandle]]; - [context rect:[self boundingBoxResizeHandleRect:SouthHandle]]; - [context rect:[self boundingBoxResizeHandleRect:SouthWestHandle]]; - [context rect:[self boundingBoxResizeHandleRect:WestHandle]]; - [context rect:[self boundingBoxResizeHandleRect:NorthWestHandle]]; - [context rect:[self boundingBoxResizeHandleRect:NorthHandle]]; - [context rect:[self boundingBoxResizeHandleRect:NorthEastHandle]]; - [context strokePathWithColor:MakeSolidRColor (0.5, 0.5, 0.5)]; - - [context restoreState]; - } -} -- (void) loadConfiguration:(Configuration*)config {} -- (void) saveConfiguration:(Configuration*)config {} -@end - -@implementation BoundingBoxTool (Private) -- (NSRect) screenBoundingBox { - Transformer *transformer = [[renderer surface] transformer]; - Graph *graph = [[renderer document] graph]; - return [transformer rectToScreen:[graph boundingBox]]; -} - -- (ResizeHandle) boundingBoxResizeHandleAt:(NSPoint)p { - NSRect bbox = [self screenBoundingBox]; - if (p.x >= NSMaxX(bbox)) { - if (p.x <= NSMaxX(bbox) + handle_size) { - if (p.y >= NSMaxY(bbox)) { - if (p.y <= NSMaxY(bbox) + handle_size) { - return SouthEastHandle; - } - } else if (p.y <= NSMinY(bbox)) { - if (p.y >= NSMinY(bbox) - handle_size) { - return NorthEastHandle; - } - } else { - float eastHandleTop = sideHandleTop(bbox); - if (p.y >= eastHandleTop && p.y <= (eastHandleTop + handle_size)) { - return EastHandle; - } - } - } - } else if (p.x <= NSMinX(bbox)) { - if (p.x >= NSMinX(bbox) - handle_size) { - if (p.y >= NSMaxY(bbox)) { - if (p.y <= NSMaxY(bbox) + handle_size) { - return SouthWestHandle; - } - } else if (p.y <= NSMinY(bbox)) { - if (p.y >= NSMinY(bbox) - handle_size) { - return NorthWestHandle; - } - } else { - float westHandleTop = sideHandleTop(bbox); - if (p.y >= westHandleTop && p.y <= (westHandleTop + handle_size)) { - return WestHandle; - } - } - } - } else if (p.y >= NSMaxY(bbox)) { - if (p.y <= NSMaxY(bbox) + handle_size) { - float southHandleLeft = tbHandleLeft(bbox); - if (p.x >= southHandleLeft && p.x <= (southHandleLeft + handle_size)) { - return SouthHandle; - } - } - } else if (p.y <= NSMinY(bbox)) { - if (p.y >= NSMinY(bbox) - handle_size) { - float northHandleLeft = tbHandleLeft(bbox); - if (p.x >= northHandleLeft && p.x <= (northHandleLeft + handle_size)) { - return NorthHandle; - } - } - } - return NoHandle; -} - -- (NSRect) boundingBoxResizeHandleRect:(ResizeHandle)handle { - Graph *graph = [[renderer document] graph]; - if (![graph hasBoundingBox]) { - return NSZeroRect; - } - NSRect bbox = [self screenBoundingBox]; - float x; - float y; - switch (handle) { - case NorthEastHandle: - case EastHandle: - case SouthEastHandle: - x = NSMaxX(bbox); - break; - case NorthWestHandle: - case WestHandle: - case SouthWestHandle: - x = NSMinX(bbox) - handle_size; - break; - case SouthHandle: - case NorthHandle: - x = tbHandleLeft(bbox); - break; - default: - return NSZeroRect; - } - switch (handle) { - case EastHandle: - case WestHandle: - y = sideHandleTop(bbox); - break; - case SouthEastHandle: - case SouthHandle: - case SouthWestHandle: - y = NSMaxY(bbox); - break; - case NorthEastHandle: - case NorthHandle: - case NorthWestHandle: - y = NSMinY(bbox) - handle_size; - break; - default: - return NSZeroRect; - } - return NSMakeRect(x, y, handle_size, handle_size); -} - -- (void) setResizeCursorForHandle:(ResizeHandle)handle { - if (handle != currentResizeHandle) { - currentResizeHandle = handle; - Cursor c = NormalCursor; - switch (handle) { - case EastHandle: - c = ResizeRightCursor; - break; - case SouthEastHandle: - c = ResizeBottomRightCursor; - break; - case SouthHandle: - c = ResizeBottomCursor; - break; - case SouthWestHandle: - c = ResizeBottomLeftCursor; - break; - case WestHandle: - c = ResizeLeftCursor; - break; - case NorthWestHandle: - c = ResizeTopLeftCursor; - break; - case NorthHandle: - c = ResizeTopCursor; - break; - case NorthEastHandle: - c = ResizeTopRightCursor; - break; - default: - c = NormalCursor; - break; - } - [[renderer surface] setCursor:c]; - } -} -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/CairoRenderContext.h b/tikzit-old/src/gtk/CairoRenderContext.h deleted file mode 100644 index ac9c5ee..0000000 --- a/tikzit-old/src/gtk/CairoRenderContext.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "RenderContext.h" -#import "Transformer.h" -#import -#import -#import - -@interface PangoTextLayout: NSObject { - PangoLayout *layout; - cairo_t *context; -} - -+ (PangoTextLayout*) layoutForContext:(cairo_t*)cr withFontSize:(CGFloat)fontSize; -- (id) initWithContext:(cairo_t*)cr fontSize:(CGFloat)fontSize; -- (void) setText:(NSString*)text; - -@end - -@interface CairoRenderContext: NSObject { - cairo_t *context; -} - -+ (CairoRenderContext*) contextForSurface:(cairo_surface_t*)surface; -- (id) initForSurface:(cairo_surface_t*)surface; - -+ (CairoRenderContext*) contextForWidget:(GtkWidget*)widget; -- (id) initForWidget:(GtkWidget*)widget; - -+ (CairoRenderContext*) contextForDrawable:(GdkDrawable*)d; -- (id) initForDrawable:(GdkDrawable*)d; - -+ (CairoRenderContext*) contextForPixbuf:(GdkPixbuf*)buf; -- (id) initForPixbuf:(GdkPixbuf*)buf; - -- (cairo_t*) cairoContext; -- (void) applyTransform:(Transformer*)transformer; - -- (void) clearSurface; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/CairoRenderContext.m b/tikzit-old/src/gtk/CairoRenderContext.m deleted file mode 100644 index 77e10b5..0000000 --- a/tikzit-old/src/gtk/CairoRenderContext.m +++ /dev/null @@ -1,344 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "CairoRenderContext.h" - -#import "cairo_helpers.h" -#import "util.h" - -#import - -@implementation PangoTextLayout - -- (id) init { - [self release]; - return nil; -} - -+ (PangoTextLayout*) layoutForContext:(cairo_t*)cr withFontSize:(CGFloat)fontSize { - return [[[self alloc] initWithContext:cr fontSize:fontSize] autorelease]; -} - -- (id) initWithContext:(cairo_t*)cr fontSize:(CGFloat)fontSize { - self = [super init]; - - if (self) { - cairo_reference (cr); - context = cr; - layout = pango_cairo_create_layout (cr); - - PangoFontDescription *font_desc = pango_font_description_new (); - pango_font_description_set_family_static (font_desc, "Sans"); - pango_font_description_set_size (font_desc, pango_units_from_double (fontSize)); - pango_layout_set_font_description (layout, font_desc); - pango_font_description_free (font_desc); - } - - return self; -} - -- (void) setText:(NSString*)text { - pango_layout_set_text (layout, [text UTF8String], -1); -} - -- (NSSize) size { - int width, height; - pango_layout_get_size (layout, &width, &height); - return NSMakeSize (pango_units_to_double (width), pango_units_to_double (height)); -} - -- (NSString*) text { - return [NSString stringWithUTF8String:pango_layout_get_text (layout)]; -} - -- (void) showTextAt:(NSPoint)topLeft withColor:(RColor)color { - cairo_save (context); - - cairo_move_to(context, topLeft.x, topLeft.y); - cairo_set_source_rcolor (context, color); - pango_cairo_show_layout (context, layout); - - cairo_restore (context); -} - -- (void) dealloc { - if (layout) - g_object_unref (G_OBJECT (layout)); - if (context) - cairo_destroy (context); - - [super dealloc]; -} - -@end - -@implementation CairoRenderContext - -- (id) init { - [self release]; - return nil; -} - -+ (CairoRenderContext*) contextForSurface:(cairo_surface_t*)surface { - return [[[self alloc] initForSurface:surface] autorelease]; -} - -- (id) initForSurface:(cairo_surface_t*)surface { - self = [super init]; - - if (self) { - context = cairo_create (surface); - } - - return self; -} - -+ (CairoRenderContext*) contextForWidget:(GtkWidget*)widget { - return [[[self alloc] initForWidget:widget] autorelease]; -} - -- (id) initForWidget:(GtkWidget*)widget { - self = [super init]; - - if (self) { - GdkWindow *window = gtk_widget_get_window (widget); - if (window) { - context = gdk_cairo_create (window); - } else { - [self release]; - self = nil; - } - } - - return self; -} - -+ (CairoRenderContext*) contextForDrawable:(GdkDrawable*)d { - return [[[self alloc] initForDrawable:d] autorelease]; -} - -- (id) initForDrawable:(GdkDrawable*)d { - self = [super init]; - - if (self) { - context = gdk_cairo_create (d); - } - - return self; -} - -+ (CairoRenderContext*) contextForPixbuf:(GdkPixbuf*)pixbuf { - return [[[self alloc] initForPixbuf:pixbuf] autorelease]; -} - -- (id) initForPixbuf:(GdkPixbuf*)pixbuf { - self = [super init]; - - if (self) { - cairo_format_t format = -1; - - if (gdk_pixbuf_get_colorspace (pixbuf) != GDK_COLORSPACE_RGB) { - NSLog(@"Unsupported colorspace (must be RGB)"); - [self release]; - return nil; - } - if (gdk_pixbuf_get_bits_per_sample (pixbuf) != 8) { - NSLog(@"Unsupported bits per sample (must be 8)"); - [self release]; - return nil; - } - if (gdk_pixbuf_get_has_alpha (pixbuf)) { - if (gdk_pixbuf_get_n_channels (pixbuf) != 4) { - NSLog(@"Unsupported bits per sample (must be 4 for an image with alpha)"); - [self release]; - return nil; - } - format = CAIRO_FORMAT_ARGB32; - } else { - if (gdk_pixbuf_get_n_channels (pixbuf) != 3) { - NSLog(@"Unsupported bits per sample (must be 3 for an image without alpha)"); - [self release]; - return nil; - } - format = CAIRO_FORMAT_RGB24; - } - - cairo_surface_t *surface = cairo_image_surface_create_for_data( - gdk_pixbuf_get_pixels(pixbuf), - format, - gdk_pixbuf_get_width(pixbuf), - gdk_pixbuf_get_height(pixbuf), - gdk_pixbuf_get_rowstride(pixbuf)); - context = cairo_create (surface); - cairo_surface_destroy (surface); - } - - return self; -} - -- (cairo_t*) cairoContext { - return context; -} - -- (void) applyTransform:(Transformer*)transformer { - NSPoint origin = [transformer toScreen:NSZeroPoint]; - cairo_translate (context, origin.x, origin.y); - NSPoint scale = [transformer toScreen:NSMakePoint (1.0f, 1.0f)]; - scale.x -= origin.x; - scale.y -= origin.y; - cairo_scale (context, scale.x, scale.y); -} - -- (void) saveState { - cairo_save (context); -} - -- (void) restoreState { - cairo_restore (context); -} - -- (NSRect) clipBoundingBox { - double clipx1, clipx2, clipy1, clipy2; - cairo_clip_extents (context, &clipx1, &clipy1, &clipx2, &clipy2); - return NSMakeRect (clipx1, clipy1, clipx2-clipx1, clipy2-clipy1); -} - -- (BOOL) strokeIncludesPoint:(NSPoint)p { - return cairo_in_stroke (context, p.x, p.y); -} - -- (BOOL) fillIncludesPoint:(NSPoint)p { - return cairo_in_fill (context, p.x, p.y); -} - -- (id) layoutText:(NSString*)text withSize:(CGFloat)fontSize { - PangoTextLayout *layout = [PangoTextLayout layoutForContext:context withFontSize:fontSize]; - [layout setText:text]; - return layout; -} - -- (void) setAntialiasMode:(AntialiasMode)mode { - if (mode == AntialiasDisabled) { - cairo_set_antialias (context, CAIRO_ANTIALIAS_NONE); - } else { - cairo_set_antialias (context, CAIRO_ANTIALIAS_DEFAULT); - } -} - -- (void) setLineWidth:(CGFloat)width { - cairo_set_line_width (context, width); -} - -- (void) setLineDash:(CGFloat)dashLength { - if (dashLength <= 0.0) { - cairo_set_dash (context, NULL, 0, 0); - } else { - double dashes[] = { dashLength }; - cairo_set_dash (context, dashes, 1, 0); - } -} - -// paths -- (void) startPath { - cairo_new_path (context); -} - -- (void) closeSubPath { - cairo_close_path (context); -} - -- (void) moveTo:(NSPoint)p { - cairo_move_to(context, p.x, p.y); -} - -- (void) curveTo:(NSPoint)end withCp1:(NSPoint)cp1 andCp2:(NSPoint)cp2 { - cairo_curve_to (context, cp1.x, cp1.y, cp2.x, cp2.y, end.x, end.y); -} - -- (void) lineTo:(NSPoint)end { - cairo_line_to (context, end.x, end.y); -} - -- (void) rect:(NSRect)rect { - cairo_rectangle (context, rect.origin.x, rect.origin.y, rect.size.width, rect.size.height); -} - -- (void) circleAt:(NSPoint)c withRadius:(CGFloat)r { - cairo_new_sub_path (context); - cairo_arc (context, c.x, c.y, r, 0, 2 * M_PI); -} - -- (void) strokePathWithColor:(RColor)color { - cairo_set_source_rcolor (context, color); - cairo_stroke (context); -} - -- (void) fillPathWithColor:(RColor)color { - cairo_set_source_rcolor (context, color); - cairo_fill (context); -} - -- (void) strokePathWithColor:(RColor)scolor - andFillWithColor:(RColor)fcolor { - cairo_set_source_rcolor (context, fcolor); - cairo_fill_preserve (context); - cairo_set_source_rcolor (context, scolor); - cairo_stroke (context); -} - -- (void) strokePathWithColor:(RColor)scolor - andFillWithColor:(RColor)fcolor - usingAlpha:(CGFloat)alpha { - cairo_push_group (context); - cairo_set_source_rcolor (context, fcolor); - cairo_fill_preserve (context); - cairo_set_source_rcolor (context, scolor); - cairo_stroke (context); - cairo_pop_group_to_source (context); - cairo_paint_with_alpha (context, alpha); -} - -- (void) clipToPath { - cairo_clip (context); -} - -- (void) paintWithColor:(RColor)color { - cairo_set_source_rcolor (context, color); - cairo_paint (context); -} - -- (void) clearSurface { - cairo_operator_t old_op = cairo_get_operator (context); - - cairo_set_operator (context, CAIRO_OPERATOR_SOURCE); - cairo_set_source_rgba (context, 0.0, 0.0, 0.0, 0.0); - cairo_paint (context); - - cairo_set_operator (context, old_op); -} - -- (void) dealloc { - if (context) { - cairo_destroy (context); - } - - [super dealloc]; -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/ColorRGB+Gtk.h b/tikzit-old/src/gtk/ColorRGB+Gtk.h deleted file mode 100644 index 5cfb4d7..0000000 --- a/tikzit-old/src/gtk/ColorRGB+Gtk.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "ColorRGB.h" -#import - -@interface ColorRGB (Gtk) - -+ (ColorRGB*) colorWithGdkColor:(GdkColor)color; -- (id) initWithGdkColor:(GdkColor)color; -- (GdkColor) gdkColor; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/ColorRGB+Gtk.m b/tikzit-old/src/gtk/ColorRGB+Gtk.m deleted file mode 100644 index be5dd56..0000000 --- a/tikzit-old/src/gtk/ColorRGB+Gtk.m +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * Copyright 2010 Chris Heunen - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "ColorRGB+Gtk.h" - -// 257 = 65535/255 -// GdkColor values run from 0 to 65535, not from 0 to 255 -#define GDK_FACTOR 257 - -@implementation ColorRGB (Gtk) - -+ (ColorRGB*) colorWithGdkColor:(GdkColor)color { - return [ColorRGB colorWithRed:color.red/GDK_FACTOR green:color.green/GDK_FACTOR blue:color.blue/GDK_FACTOR]; -} - -- (id) initWithGdkColor:(GdkColor)color { - return [self initWithRed:color.red/GDK_FACTOR green:color.green/GDK_FACTOR blue:color.blue/GDK_FACTOR]; -} - -- (GdkColor) gdkColor { - GdkColor color; - color.pixel = 0; - color.red = GDK_FACTOR * [self red]; - color.green = GDK_FACTOR * [self green]; - color.blue = GDK_FACTOR * [self blue]; - return color; -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/ColorRGB+IntegerListStorage.h b/tikzit-old/src/gtk/ColorRGB+IntegerListStorage.h deleted file mode 100644 index 118eaee..0000000 --- a/tikzit-old/src/gtk/ColorRGB+IntegerListStorage.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "ColorRGB.h" - -/** - * Stores a ColorRGB as a list of short integers - */ -@interface ColorRGB (IntegerListStorage) - -+ (ColorRGB*) colorFromValueList:(NSArray*)values; -- (id) initFromValueList:(NSArray*)values; -- (NSArray*) valueList; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/ColorRGB+IntegerListStorage.m b/tikzit-old/src/gtk/ColorRGB+IntegerListStorage.m deleted file mode 100644 index 0103a3c..0000000 --- a/tikzit-old/src/gtk/ColorRGB+IntegerListStorage.m +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * Copyright 2010 Chris Heunen - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "ColorRGB+IntegerListStorage.h" - -@implementation ColorRGB (IntegerListStorage) - -+ (ColorRGB*) colorFromValueList:(NSArray*)values { - if ([values count] != 3) { - return nil; - } - - unsigned short redValue = [[values objectAtIndex:0] intValue]; - unsigned short greenValue = [[values objectAtIndex:1] intValue]; - unsigned short blueValue = [[values objectAtIndex:2] intValue]; - return [ColorRGB colorWithRed:redValue green:greenValue blue:blueValue]; -} - -- (id) initFromValueList:(NSArray*)values { - if ([values count] != 3) { - [self release]; - return nil; - } - - unsigned short redValue = [[values objectAtIndex:0] intValue]; - unsigned short greenValue = [[values objectAtIndex:1] intValue]; - unsigned short blueValue = [[values objectAtIndex:2] intValue]; - - return [self initWithRed:redValue green:greenValue blue:blueValue]; -} - -- (NSArray*) valueList { - NSMutableArray *array = [NSMutableArray arrayWithCapacity:3]; - [array addObject:[NSNumber numberWithInt:[self red]]]; - [array addObject:[NSNumber numberWithInt:[self green]]]; - [array addObject:[NSNumber numberWithInt:[self blue]]]; - return array; -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/Configuration.h b/tikzit-old/src/gtk/Configuration.h deleted file mode 100644 index 6c68681..0000000 --- a/tikzit-old/src/gtk/Configuration.h +++ /dev/null @@ -1,447 +0,0 @@ -// -// Configuration.h -// TikZiT -// -// Copyright 2010 Alex Merry -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "TZFoundation.h" - -/** - * Manages configuration information in a grouped key-value format. - */ -@interface Configuration : NSObject { - NSString *name; - GKeyFile *file; -} - -/** - * Check whether there is any existing configuration. - */ -+ (BOOL) configurationExistsWithName:(NSString*)name; -/** - * Create a blank configuration with the given name, without loading - * any existing configuration information. - * - * @param name the name of the configuration - */ -+ (Configuration*) emptyConfigurationWithName:(NSString*)name; -/** - * Load an existing configuration for the given name. - * - * If there was no existing configuration, or it could not be opened, - * an empty configuration will be returned. - * - * @param name the name of the configuration - */ -+ (Configuration*) configurationWithName:(NSString*)name; -/** - * Load an existing configuration for the given name. - * - * If there was no existing configuration, or it could not be opened, - * an empty configuration will be returned. - * - * @param name the name of the configuration - * @param error this will be set if the configuration exists, but could - * not be opened. - */ -+ (Configuration*) configurationWithName:(NSString*)name loadError:(NSError**)error; - -/** - * Initialise the configuration to be empty - * - * Does not attempt to load any existing configuration data. - * - * @param name the name of the configuration - */ -- (id) initEmptyWithName:(NSString*)name; -/** - * Initialise a configuration, loading it if it had previously been stored. - * - * If there was no existing configuration, or it could not be opened, - * an empty configuration will be returned. - * - * @param name the name of the configuration - */ -- (id) initWithName:(NSString*)name; -/** - * Initialise a configuration, loading it if it had previously been stored. - * - * If there was no existing configuration, or it could not be opened, - * an empty configuration will be returned. - * - * @param name the name of the configuration - * @param error this will be set if the configuration exists, but could - * not be opened. - */ -- (id) initWithName:(NSString*)name loadError:(NSError**)error; - -/** - * The name of the configuration. - * - * Configurations with different names are stored independently. - */ -- (NSString*) name; -/** - * Set the name of the configuration. - * - * This will affect the behaviour of [-writeToStore] - * - * Configurations with different names are stored independently. - */ -- (void) setName:(NSString*)name; - -/** - * Writes the configuration to the backing store. - * - * The location the configuration is written to is determined by the - * [-name] property. - * - * @result YES if the configuration was successfully written, NO otherwise - */ -- (BOOL) writeToStore; -/** - * Writes the configuration to the backing store. - * - * The location the configuration is written to is determined by the - * [-name] property. - * - * @param error this will be set if the configuration could not be written - * to the backing store - * @result YES if the configuration was successfully written, NO otherwise - */ -- (BOOL) writeToStoreWithError:(NSError**)error; - -/** - * Check whether a particular key exists within a group - * - * @param key the key to check for - * @param group the name of the group to look in - * @result YES if the key exists, NO otherwise - */ -- (BOOL) hasKey:(NSString*)key inGroup:(NSString*)group; -/** - * Check whether a particular group exists - * - * @param group the name of the group to check for - * @result YES if the group exists, NO otherwise - */ -- (BOOL) hasGroup:(NSString*)group; -/** - * List the groups in the configuration. - * - * @result a list of group names - */ -- (NSArray*) groups; - -/** - * Get the value associated with a key as a string - * - * This is only guaranteed to work if the value was stored as a string. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @result the value associated with key as a string, or nil - * if no string value was associated with key - */ -- (NSString*) stringEntry:(NSString*)key inGroup:(NSString*)group; -/** - * Get the value associated with a key as a string - * - * This is only guaranteed to work if the value was stored as a string. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @param def the value to return if no string value was associated with key - * @result the value associated with key as a string, or default - */ -- (NSString*) stringEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSString*)def; -/** - * Get the value associated with a key as a boolean - * - * This is only guaranteed to work if the value was stored as a boolean. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @result the value associated with key as a boolean, or NO - * if no boolean value was associated with key - */ -- (BOOL) booleanEntry:(NSString*)key inGroup:(NSString*)group; -/** - * Get the value associated with a key as a boolean - * - * This is only guaranteed to work if the value was stored as a boolean. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @param def the value to return if no boolean value was associated with key - * @result the value associated with key as a boolean, or def - */ -- (BOOL) booleanEntry:(NSString*)key inGroup:(NSString*)group withDefault:(BOOL)def; -/** - * Get the value associated with a key as a integer - * - * This is only guaranteed to work if the value was stored as a integer. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @result the value associated with key as a integer, or 0 - * if no integer value was associated with key - */ -- (int) integerEntry:(NSString*)key inGroup:(NSString*)group; -/** - * Get the value associated with a key as a integer - * - * This is only guaranteed to work if the value was stored as a integer. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @param def the value to return if no integer value was associated with key - * @result the value associated with key as a integer, or def - */ -- (int) integerEntry:(NSString*)key inGroup:(NSString*)group withDefault:(int)def; -/** - * Get the value associated with a key as a double - * - * This is only guaranteed to work if the value was stored as a double. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @result the value associated with key as a double, or 0 - * if no double value was associated with key - */ -- (double) doubleEntry:(NSString*)key inGroup:(NSString*)group; -/** - * Get the value associated with a key as a double - * - * This is only guaranteed to work if the value was stored as a double. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @param def the value to return if no double value was associated with key - * @result the value associated with key as a double, or def - */ -- (double) doubleEntry:(NSString*)key inGroup:(NSString*)group withDefault:(double)def; - -/** - * Get the value associated with a key as a list of strings - * - * This is only guaranteed to work if the value was stored as a - * list of strings. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @result the value associated with key as a list of strings, - * or nil if no list of strings was associated with key - */ -- (NSArray*) stringListEntry:(NSString*)key inGroup:(NSString*)group; -/** - * Get the value associated with a key as a list of strings - * - * This is only guaranteed to work if the value was stored as a - * list of strings. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @param def the value to return if no string list value was associated with key - * @result the value associated with key as a list of strings, or def - */ -- (NSArray*) stringListEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSArray*)def; -/** - * Get the value associated with a key as a list of booleans - * - * This is only guaranteed to work if the value was stored as a - * list of booleans. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @result the value associated with key as a list of NSNumber - * objects, containing boolean values, or nil - */ -- (NSArray*) booleanListEntry:(NSString*)key inGroup:(NSString*)group; -/** - * Get the value associated with a key as a list of booleans - * - * This is only guaranteed to work if the value was stored as a - * list of booleans. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @param def the value to return if no boolean list value was associated with key - * @result the value associated with key as a list of NSNumber - * objects, containing boolean values, or def - */ -- (NSArray*) booleanListEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSArray*)def; -/** - * Get the value associated with a key as a list of integers - * - * This is only guaranteed to work if the value was stored as a - * list of integers. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @result the value associated with key as a list of NSNumber - * objects, containing integer values, or nil - */ -- (NSArray*) integerListEntry:(NSString*)key inGroup:(NSString*)group; -/** - * Get the value associated with a key as a list of integers - * - * This is only guaranteed to work if the value was stored as a - * list of integers. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @param def the value to return if no integer list value was associated with key - * @result the value associated with key as a list of NSNumber - * objects, containing integer values, or def - */ -- (NSArray*) integerListEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSArray*)def; -/** - * Get the value associated with a key as a list of doubles - * - * This is only guaranteed to work if the value was stored as a - * list of doubles. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @result the value associated with key as a list of NSNumber - * objects, containing double values, or nil - */ -- (NSArray*) doubleListEntry:(NSString*)key inGroup:(NSString*)group; -/** - * Get the value associated with a key as a list of doubles - * - * This is only guaranteed to work if the value was stored as a - * list of doubles. - * - * @param key the key to fetch the data for - * @param group the name of the group to look in - * @param def the value to return if no double list value was associated with key - * @result the value associated with key as a list of NSNumber - * objects, containing double values, or def - */ -- (NSArray*) doubleListEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSArray*)def; - -/** - * Associate a string value with a key. - * - * Any previous value (of any type) with the same key and group will - * be overwritten. - * - * @param key the key to associate the value with - * @param group the group to store the association in - * @param value the value to store - */ -- (void) setStringEntry:(NSString*)key inGroup:(NSString*)group value:(NSString*)value; -/** - * Associate a boolean value with a key. - * - * Any previous value (of any type) with the same key and group will - * be overwritten. - * - * @param key the key to associate the value with - * @param group the group to store the association in - * @param value the value to store - */ -- (void) setBooleanEntry:(NSString*)key inGroup:(NSString*)group value:(BOOL)value; -/** - * Associate a integer value with a key. - * - * Any previous value (of any type) with the same key and group will - * be overwritten. - * - * @param key the key to associate the value with - * @param group the group to store the association in - * @param value the value to store - */ -- (void) setIntegerEntry:(NSString*)key inGroup:(NSString*)group value:(int)value; -/** - * Associate a double value with a key. - * - * Any previous value (of any type) with the same key and group will - * be overwritten. - * - * @param key the key to associate the value with - * @param group the group to store the association in - * @param value the value to store - */ -- (void) setDoubleEntry:(NSString*)key inGroup:(NSString*)group value:(double)value; - -/** - * Associate a list of string values with a key. - * - * Any previous value (of any type) with the same key and group will - * be overwritten. - * - * @param key the key to associate the list with - * @param group the group to store the association in - * @param value the list to store, as an array of strings - */ -- (void) setStringListEntry:(NSString*)key inGroup:(NSString*)group value:(NSArray*)value; -/** - * Associate a list of boolean values with a key. - * - * Any previous value (of any type) with the same key and group will - * be overwritten. - * - * @param key the key to associate the list with - * @param group the group to store the association in - * @param value the list to store, as an array of NSNumber objects - */ -- (void) setBooleanListEntry:(NSString*)key inGroup:(NSString*)group value:(NSArray*)value; -/** - * Associate a list of integer values with a key. - * - * Any previous value (of any type) with the same key and group will - * be overwritten. - * - * @param key the key to associate the list with - * @param group the group to store the association in - * @param value the list to store, as an array of NSNumber objects - */ -- (void) setIntegerListEntry:(NSString*)key inGroup:(NSString*)group value:(NSArray*)value; -/** - * Associate a list of double values with a key. - * - * Any previous value (of any type) with the same key and group will - * be overwritten. - * - * @param key the key to associate the list with - * @param group the group to store the association in - * @param value the list to store, as an array of NSNumber objects - */ -- (void) setDoubleListEntry:(NSString*)key inGroup:(NSString*)group value:(NSArray*)value; - -/** - * Remove a group from the configuration - * - * This will remove all the groups key-value associations. - */ -- (void) removeGroup:(NSString*)group; -/** - * Remove a key from the configuration - * - * @param key the key to remove - * @param group the group to remove it from - */ -- (void) removeKey:(NSString*)key inGroup:(NSString*)group; - -@end - -// vim:ft=objc:sts=4:sw=4:et diff --git a/tikzit-old/src/gtk/Configuration.m b/tikzit-old/src/gtk/Configuration.m deleted file mode 100644 index 4a3ed79..0000000 --- a/tikzit-old/src/gtk/Configuration.m +++ /dev/null @@ -1,450 +0,0 @@ -// -// Configuration.h -// TikZiT -// -// Copyright 2010 Alex Merry -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "Configuration.h" -#import "SupportDir.h" - -@implementation Configuration - -+ (NSString*) _pathFromName:(NSString*)name { - return [NSString stringWithFormat:@"%@/%@.conf", [SupportDir userSupportDir], name]; -} - -+ (BOOL) configurationExistsWithName:(NSString*)name { - BOOL isDir; - BOOL exists = [[NSFileManager defaultManager] fileExistsAtPath:[self _pathFromName:name] isDirectory:&isDir]; - return exists && !isDir; -} - -+ (Configuration*) emptyConfigurationWithName:(NSString*)name - { return [[[self alloc] initEmptyWithName:name] autorelease]; } -+ (Configuration*) configurationWithName:(NSString*)name - { return [[[self alloc] initWithName:name] autorelease]; } -+ (Configuration*) configurationWithName:(NSString*)name loadError:(NSError**)error - { return [[[self alloc] initWithName:name loadError:error] autorelease]; } - -- (id) init -{ - [self release]; - return nil; -} - -- (id) initEmptyWithName:(NSString*)n -{ - self = [super init]; - if (self) { - name = [n retain]; - file = g_key_file_new (); - } - - return self; -} - -- (id) _initFromFile:(NSString*)path error:(NSError**)error -{ - self = [super init]; - if (self) { - file = g_key_file_new (); - - NSFileManager *manager = [NSFileManager defaultManager]; - if ([manager fileExistsAtPath:path]) { - gchar *filename = [path glibFilename]; - - GError *gerror = NULL; - g_key_file_load_from_file (file, - filename, - G_KEY_FILE_NONE, - &gerror); - g_free (filename); - - if (gerror) { - GErrorToNSError (gerror, error); - g_error_free (gerror); - } - } - } - - return self; -} - -- (id) initWithName:(NSString*)n { - return [self initWithName:n loadError:NULL]; -} - -- (id) initWithName:(NSString*)n loadError:(NSError**)error { - self = [self _initFromFile:[Configuration _pathFromName:n] error:error]; - - if (self) { - name = [n retain]; - } - - return self; -} - -- (BOOL) _ensureParentExists:(NSString*)path error:(NSError**)error { - NSString *directory = [path stringByDeletingLastPathComponent]; - return [[NSFileManager defaultManager] ensureDirectoryExists:directory error:error]; -} - -- (BOOL) _writeFileTo:(NSString*)path error:(NSError**)error -{ - if (![self _ensureParentExists:path error:error]) { - return NO; - } - - BOOL success = NO; - gsize length; - gchar *data = g_key_file_to_data (file, &length, NULL); // never reports an error - if (data && length) { - GError *gerror = NULL; - gchar* nativePath = [path glibFilename]; - success = g_file_set_contents (nativePath, data, length, &gerror) ? YES : NO; - g_free (data); - g_free (nativePath); - if (gerror) { - g_warning ("Failed to write file: %s\n", gerror->message); - GErrorToNSError (gerror, error); - g_error_free (gerror); - } - } else { - [[NSFileManager defaultManager] removeFileAtPath:path handler:nil]; - success = YES; - } - - return success; -} - -- (NSString*) name { - return name; -} - -- (void) setName:(NSString*)n { - [n retain]; - [name release]; - name = n; -} - -- (BOOL) writeToStore { - return [self writeToStoreWithError:NULL]; -} - -- (BOOL) writeToStoreWithError:(NSError**)error { - return [self _writeFileTo:[Configuration _pathFromName:name] error:error]; -} - -- (BOOL) hasKey:(NSString*)key inGroup:(NSString*)group -{ - gboolean result = g_key_file_has_key (file, [group UTF8String], [key UTF8String], NULL); - return result ? YES : NO; -} - -- (BOOL) hasGroup:(NSString*)group -{ - gboolean result = g_key_file_has_group (file, [group UTF8String]); - return result ? YES : NO; -} - -- (NSArray*) keys:(NSString*)group -{ - gsize length; - gchar **keys = g_key_file_get_keys (file, [group UTF8String], &length, NULL); - if (!keys) - length = 0; - - NSMutableArray *array = [NSMutableArray arrayWithCapacity:length]; - for (int i = 0; i < length; ++i) { - [array addObject:[NSString stringWithUTF8String:keys[i]]]; - } - g_strfreev (keys); - return array; -} - -- (NSArray*) groups -{ - gsize length; - gchar **groups = g_key_file_get_groups (file, &length); - NSMutableArray *array = [NSMutableArray arrayWithCapacity:length]; - for (int i = 0; i < length; ++i) { - [array addObject:[NSString stringWithUTF8String:groups[i]]]; - } - g_strfreev (groups); - return array; -} - -- (NSString*) stringEntry:(NSString*)key inGroup:(NSString*)group -{ - return [self stringEntry:key inGroup:group withDefault:nil]; -} - -- (NSString*) stringEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSString*)def -{ - NSString *result = def; - gchar *entry = g_key_file_get_string (file, [group UTF8String], [key UTF8String], NULL); - if (entry) { - result = [NSString stringWithUTF8String:entry]; - g_free (entry); - } - return result; -} - -- (BOOL) booleanEntry:(NSString*)key inGroup:(NSString*)group withDefault:(BOOL)def -{ - GError *error = NULL; - gboolean result = g_key_file_get_boolean (file, [group UTF8String], [key UTF8String], &error); - if (error != NULL) { - g_error_free (error); - return def; - } else { - return result ? YES : NO; - } -} - -- (BOOL) booleanEntry:(NSString*)key inGroup:(NSString*)group -{ - gboolean result = g_key_file_get_boolean (file, [group UTF8String], [key UTF8String], NULL); - return result ? YES : NO; -} - -- (int) integerEntry:(NSString*)key inGroup:(NSString*)group withDefault:(int)def -{ - GError *error = NULL; - int result = g_key_file_get_integer (file, [group UTF8String], [key UTF8String], &error); - if (error != NULL) { - g_error_free (error); - return def; - } else { - return result; - } -} - -- (int) integerEntry:(NSString*)key inGroup:(NSString*)group -{ - return g_key_file_get_integer (file, [group UTF8String], [key UTF8String], NULL); -} - -- (double) doubleEntry:(NSString*)key inGroup:(NSString*)group withDefault:(double)def -{ - GError *error = NULL; - double result = g_key_file_get_double (file, [group UTF8String], [key UTF8String], &error); - if (error != NULL) { - g_error_free (error); - return def; - } else { - return result; - } -} - -- (double) doubleEntry:(NSString*)key inGroup:(NSString*)group -{ - return g_key_file_get_double (file, [group UTF8String], [key UTF8String], NULL); -} - -- (NSArray*) stringListEntry:(NSString*)key inGroup:(NSString*)group -{ - return [self stringListEntry:key inGroup:group withDefault:nil]; -} - -- (NSArray*) stringListEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSArray*)def -{ - gsize length; - gchar **list = g_key_file_get_string_list (file, [group UTF8String], [key UTF8String], &length, NULL); - if (list) { - NSMutableArray *result = [NSMutableArray arrayWithCapacity:length]; - for (int i = 0; i < length; ++i) { - [result addObject:[NSString stringWithUTF8String:list[i]]]; - } - g_strfreev (list); - return result; - } else { - return def; - } -} - -- (NSArray*) booleanListEntry:(NSString*)key inGroup:(NSString*)group -{ - return [self booleanListEntry:key inGroup:group withDefault:nil]; -} - -- (NSArray*) booleanListEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSArray*)def -{ - gsize length; - gboolean *list = g_key_file_get_boolean_list (file, [group UTF8String], [key UTF8String], &length, NULL); - if (list) { - NSMutableArray *result = [NSMutableArray arrayWithCapacity:length]; - for (int i = 0; i < length; ++i) { - [result addObject:[NSNumber numberWithBool:list[i]]]; - } - g_free (list); - return result; - } else { - return def; - } -} - -- (NSArray*) integerListEntry:(NSString*)key inGroup:(NSString*)group -{ - return [self integerListEntry:key inGroup:group withDefault:nil]; -} - -- (NSArray*) integerListEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSArray*)def -{ - gsize length; - gint *list = g_key_file_get_integer_list (file, [group UTF8String], [key UTF8String], &length, NULL); - if (list) { - NSMutableArray *result = [NSMutableArray arrayWithCapacity:length]; - for (int i = 0; i < length; ++i) { - [result addObject:[NSNumber numberWithInt:list[i]]]; - } - g_free (list); - return result; - } else { - return def; - } -} - -- (NSArray*) doubleListEntry:(NSString*)key inGroup:(NSString*)group -{ - return [self doubleListEntry:key inGroup:group withDefault:nil]; -} - -- (NSArray*) doubleListEntry:(NSString*)key inGroup:(NSString*)group withDefault:(NSArray*)def -{ - gsize length; - double *list = g_key_file_get_double_list (file, [group UTF8String], [key UTF8String], &length, NULL); - if (list) { - NSMutableArray *result = [NSMutableArray arrayWithCapacity:length]; - for (int i = 0; i < length; ++i) { - [result addObject:[NSNumber numberWithDouble:list[i]]]; - } - g_free (list); - return result; - } else { - return def; - } -} - -- (void) setStringEntry:(NSString*)key inGroup:(NSString*)group value:(NSString*)value -{ - if (value == nil) { - [self removeKey:key inGroup:group]; - return; - } - g_key_file_set_string (file, [group UTF8String], [key UTF8String], [value UTF8String]); -} - -- (void) setBooleanEntry:(NSString*)key inGroup:(NSString*)group value:(BOOL)value; -{ - g_key_file_set_boolean (file, [group UTF8String], [key UTF8String], value); -} - -- (void) setIntegerEntry:(NSString*)key inGroup:(NSString*)group value:(int)value; -{ - g_key_file_set_integer (file, [group UTF8String], [key UTF8String], value); -} - -- (void) setDoubleEntry:(NSString*)key inGroup:(NSString*)group value:(double)value; -{ - g_key_file_set_double (file, [group UTF8String], [key UTF8String], value); -} - - -- (void) setStringListEntry:(NSString*)key inGroup:(NSString*)group value:(NSArray*)value -{ - if (value == nil) { - [self removeKey:key inGroup:group]; - return; - } - gsize length = [value count]; - const gchar * *list = g_new (const gchar *, length); - for (int i = 0; i < length; ++i) { - list[i] = [[value objectAtIndex:i] UTF8String]; - } - g_key_file_set_string_list (file, [group UTF8String], [key UTF8String], list, length); - g_free (list); -} - -- (void) setBooleanListEntry:(NSString*)key inGroup:(NSString*)group value:(NSArray*)value; -{ - if (value == nil) { - [self removeKey:key inGroup:group]; - return; - } - gsize length = [value count]; - gboolean *list = g_new (gboolean, length); - for (int i = 0; i < length; ++i) { - list[i] = [[value objectAtIndex:i] boolValue]; - } - g_key_file_set_boolean_list (file, [group UTF8String], [key UTF8String], list, length); - g_free (list); -} - -- (void) setIntegerListEntry:(NSString*)key inGroup:(NSString*)group value:(NSArray*)value; -{ - if (value == nil) { - [self removeKey:key inGroup:group]; - return; - } - gsize length = [value count]; - gint *list = g_new (gint, length); - for (int i = 0; i < length; ++i) { - list[i] = [[value objectAtIndex:i] intValue]; - } - g_key_file_set_integer_list (file, [group UTF8String], [key UTF8String], list, length); - g_free (list); -} - -- (void) setDoubleListEntry:(NSString*)key inGroup:(NSString*)group value:(NSArray*)value; -{ - if (value == nil) { - [self removeKey:key inGroup:group]; - return; - } - gsize length = [value count]; - gdouble *list = g_new (gdouble, length); - for (int i = 0; i < length; ++i) { - list[i] = [[value objectAtIndex:i] doubleValue]; - } - g_key_file_set_double_list (file, [group UTF8String], [key UTF8String], list, length); - g_free (list); -} - -- (void) removeGroup:(NSString*)group -{ - g_key_file_remove_group (file, [group UTF8String], NULL); -} - -- (void) removeKey:(NSString*)key inGroup:(NSString*)group; -{ - g_key_file_remove_key (file, [group UTF8String], [key UTF8String], NULL); -} - -- (void) dealloc -{ - [name release]; - g_key_file_free (file); - file = NULL; - [super dealloc]; -} - -@end - -// vim:ft=objc:sts=4:sw=4:et diff --git a/tikzit-old/src/gtk/ContextWindow.h b/tikzit-old/src/gtk/ContextWindow.h deleted file mode 100644 index fcad9df..0000000 --- a/tikzit-old/src/gtk/ContextWindow.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class Configuration; -@class EdgeStylesModel; -@class NodeStylesModel; -@class PropertiesPane; -@class SelectionPane; -@class StyleManager; -@class TikzDocument; -@class Window; - -@interface ContextWindow: NSObject { - PropertiesPane *propsPane; - SelectionPane *selPane; - - GtkWidget *window; - GtkWidget *layout; -} - -@property (retain) TikzDocument *document; -@property (assign) BOOL visible; - -- (id) initWithStyleManager:(StyleManager*)mgr; -- (id) initWithNodeStylesModel:(NodeStylesModel*)nsm - andEdgeStylesModel:(EdgeStylesModel*)esm; - -- (void) present; -- (void) attachToWindow:(Window*)parent; - -- (void) loadConfiguration:(Configuration*)config; -- (void) saveConfiguration:(Configuration*)config; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/ContextWindow.m b/tikzit-old/src/gtk/ContextWindow.m deleted file mode 100644 index d8e9d20..0000000 --- a/tikzit-old/src/gtk/ContextWindow.m +++ /dev/null @@ -1,169 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "ContextWindow.h" - -#import "Configuration.h" -#import "EdgeStylesModel.h" -#import "NodeStylesModel.h" -#import "PropertiesPane.h" -#import "SelectionPane.h" -#import "StyleManager.h" -#import "Window.h" - -#import "gtkhelpers.h" - -static gboolean props_window_delete_event_cb (GtkWidget *widget, GdkEvent *event, ContextWindow *window); - -@implementation ContextWindow - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithStyleManager:(StyleManager*)sm { - return [self initWithNodeStylesModel:[NodeStylesModel modelWithStyleManager:sm] - andEdgeStylesModel:[EdgeStylesModel modelWithStyleManager:sm]]; -} - -- (id) initWithNodeStylesModel:(NodeStylesModel*)nsm - andEdgeStylesModel:(EdgeStylesModel*)esm { - self = [super init]; - - if (self) { - window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - g_object_ref_sink (window); - gtk_window_set_title (GTK_WINDOW (window), "Context"); - gtk_window_set_role (GTK_WINDOW (window), "context"); - gtk_window_set_type_hint (GTK_WINDOW (window), - GDK_WINDOW_TYPE_HINT_UTILITY); - gtk_window_set_default_size (GTK_WINDOW (window), 200, 500); - g_signal_connect (G_OBJECT (window), - "delete-event", - G_CALLBACK (props_window_delete_event_cb), - self); - - layout = gtk_vbox_new (FALSE, 3); - g_object_ref_sink (layout); - gtk_widget_show (layout); - gtk_container_set_border_width (GTK_CONTAINER (layout), 6); - - gtk_container_add (GTK_CONTAINER (window), layout); - - propsPane = [[PropertiesPane alloc] init]; - gtk_box_pack_start (GTK_BOX (layout), [propsPane gtkWidget], - TRUE, TRUE, 0); - - GtkWidget *sep = gtk_hseparator_new (); - gtk_widget_show (sep); - gtk_box_pack_start (GTK_BOX (layout), sep, - FALSE, FALSE, 0); - - selPane = [[SelectionPane alloc] initWithNodeStylesModel:nsm - andEdgeStylesModel:esm]; - gtk_box_pack_start (GTK_BOX (layout), [selPane gtkWidget], - FALSE, FALSE, 0); - - // hack to position the context window somewhere sensible - // (upper right) - gtk_window_parse_geometry (GTK_WINDOW (window), "-0+0"); - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - g_object_unref (layout); - g_object_unref (window); - - [propsPane release]; - - [super dealloc]; -} - -- (TikzDocument*) document { - return [propsPane document]; -} - -- (void) setDocument:(TikzDocument*)doc { - [propsPane setDocument:doc]; - [selPane setDocument:doc]; -} - -- (BOOL) visible { - return gtk_widget_get_visible (window); -} - -- (void) setVisible:(BOOL)visible { - gtk_widget_set_visible (window, visible); -} - -- (void) present { - gtk_window_present (GTK_WINDOW (window)); -} - -- (void) attachToWindow:(Window*)parent { - utility_window_attach (GTK_WINDOW (window), [parent gtkWindow]); -} - -- (void) loadConfiguration:(Configuration*)config { - [propsPane loadConfiguration:config]; - [selPane loadConfiguration:config]; - - if ([config hasGroup:@"ContextWindow"]) { - tz_restore_window (GTK_WINDOW (window), - [config integerEntry:@"x" inGroup:@"ContextWindow"], - [config integerEntry:@"y" inGroup:@"ContextWindow"], - [config integerEntry:@"w" inGroup:@"ContextWindow"], - [config integerEntry:@"h" inGroup:@"ContextWindow"]); - } - [self setVisible:[config booleanEntry:@"visible" - inGroup:@"ContextWindow" - withDefault:YES]]; -} - -- (void) saveConfiguration:(Configuration*)config { - gint x, y, w, h; - - gtk_window_get_position (GTK_WINDOW (window), &x, &y); - gtk_window_get_size (GTK_WINDOW (window), &w, &h); - - [config setIntegerEntry:@"x" inGroup:@"ContextWindow" value:x]; - [config setIntegerEntry:@"y" inGroup:@"ContextWindow" value:y]; - [config setIntegerEntry:@"w" inGroup:@"ContextWindow" value:w]; - [config setIntegerEntry:@"h" inGroup:@"ContextWindow" value:h]; - [config setBooleanEntry:@"visible" - inGroup:@"ContextWindow" - value:[self visible]]; - - [propsPane saveConfiguration:config]; - [selPane saveConfiguration:config]; -} - -@end - -static gboolean props_window_delete_event_cb (GtkWidget *widget, GdkEvent *event, ContextWindow *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window setVisible:NO]; - [pool drain]; - return TRUE; -} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/CreateEdgeTool.h b/tikzit-old/src/gtk/CreateEdgeTool.h deleted file mode 100644 index d33efce..0000000 --- a/tikzit-old/src/gtk/CreateEdgeTool.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "Tool.h" - -@class EdgeStyle; -@class EdgeStylesModel; -@class EdgeStyleSelector; -@class Node; -@class StyleManager; - -@interface CreateEdgeTool : NSObject { - GraphRenderer *renderer; - EdgeStyleSelector *stylePicker; - GtkWidget *configWidget; - Node *sourceNode; - NSPoint sourceNodeScreenPoint; - NSPoint halfEdgeEnd; -} - -@property (retain) EdgeStyle *activeStyle; - -+ (id) toolWithStyleManager:(StyleManager*)sm; -- (id) initWithStyleManager:(StyleManager*)sm; -+ (id) toolWithEdgeStylesModel:(EdgeStylesModel*)esm; -- (id) initWithEdgeStylesModel:(EdgeStylesModel*)esm; -@end - - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/CreateEdgeTool.m b/tikzit-old/src/gtk/CreateEdgeTool.m deleted file mode 100644 index f3fb2c0..0000000 --- a/tikzit-old/src/gtk/CreateEdgeTool.m +++ /dev/null @@ -1,226 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "CreateEdgeTool.h" - -#import "Configuration.h" -#import "EdgeStyleSelector.h" -#import "EdgeStylesModel.h" -#import "GraphRenderer.h" -#import "TikzDocument.h" -#import "tzstockitems.h" - -static void clear_style_button_cb (GtkButton *widget, - EdgeStyleSelector *selector); - -@implementation CreateEdgeTool -- (NSString*) name { return @"Create Edge"; } -- (const gchar*) stockId { return TIKZIT_STOCK_CREATE_EDGE; } -- (NSString*) helpText { return @"Create new edges"; } -- (NSString*) shortcut { return @"e"; } -@synthesize activeRenderer=renderer; -@synthesize configurationWidget=configWidget; - -+ (id) toolWithStyleManager:(StyleManager*)sm { - return [[[self alloc] initWithStyleManager:sm] autorelease]; -} - -+ (id) toolWithEdgeStylesModel:(EdgeStylesModel*)esm { - return [[[self alloc] initWithEdgeStylesModel:esm] autorelease]; -} - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithStyleManager:(StyleManager*)sm { - return [self initWithEdgeStylesModel:[EdgeStylesModel modelWithStyleManager:sm]]; -} - -- (id) initWithEdgeStylesModel:(EdgeStylesModel*)esm { - self = [super init]; - - if (self) { - stylePicker = [[EdgeStyleSelector alloc] initWithModel:esm]; - - configWidget = gtk_vbox_new (FALSE, 0); - g_object_ref_sink (configWidget); - - GtkWidget *label = gtk_label_new ("Edge style:"); - gtk_widget_show (label); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_box_pack_start (GTK_BOX (configWidget), - label, - FALSE, - FALSE, - 0); - - GtkWidget *selWindow = gtk_scrolled_window_new (NULL, NULL); - gtk_widget_show (selWindow); - gtk_container_add (GTK_CONTAINER (selWindow), - [stylePicker widget]); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (selWindow), - GTK_POLICY_NEVER, - GTK_POLICY_AUTOMATIC); - gtk_widget_show ([stylePicker widget]); - - GtkWidget *selectorFrame = gtk_frame_new (NULL); - gtk_widget_show (selectorFrame); - gtk_box_pack_start (GTK_BOX (configWidget), - selectorFrame, - TRUE, - TRUE, - 0); - gtk_container_add (GTK_CONTAINER (selectorFrame), - selWindow); - - GtkWidget *button = gtk_button_new_with_label ("No style"); - gtk_widget_show (button); - gtk_box_pack_start (GTK_BOX (configWidget), - button, - FALSE, - FALSE, - 0); - g_signal_connect (G_OBJECT (button), - "clicked", - G_CALLBACK (clear_style_button_cb), - stylePicker); - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - [renderer release]; - [stylePicker release]; - [sourceNode release]; - - g_object_unref (G_OBJECT (configWidget)); - - [super dealloc]; -} - -- (EdgeStyle*) activeStyle { - return [stylePicker selectedStyle]; -} - -- (void) setActiveStyle:(EdgeStyle*)style { - return [stylePicker setSelectedStyle:style]; -} - -- (void) invalidateHalfEdge { - NSRect invRect = NSRectAroundPoints(sourceNodeScreenPoint, halfEdgeEnd); - [renderer invalidateRect:NSInsetRect (invRect, -2.0f, -2.0f)]; -} - -- (void) mousePressAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { - if (button != LeftButton) - return; - - sourceNode = [renderer anyNodeAt:pos]; - if (sourceNode != nil) { - Transformer *transformer = [[renderer surface] transformer]; - sourceNodeScreenPoint = [transformer toScreen:[sourceNode point]]; - halfEdgeEnd = pos; - [renderer setNode:sourceNode highlighted:YES]; - } -} - -- (void) mouseMoveTo:(NSPoint)pos withButtons:(MouseButton)buttons andMask:(InputMask)mask { - if (!(buttons & LeftButton)) - return; - if (sourceNode == nil) - return; - - [self invalidateHalfEdge]; - - [renderer clearHighlightedNodes]; - [renderer setNode:sourceNode highlighted:YES]; - halfEdgeEnd = pos; - Node *targ = [renderer anyNodeAt:pos]; - if (targ != nil) { - [renderer setNode:targ highlighted:YES]; - } - - [self invalidateHalfEdge]; -} - -- (void) mouseReleaseAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { - if (button != LeftButton) - return; - if (sourceNode == nil) - return; - - [renderer clearHighlightedNodes]; - [self invalidateHalfEdge]; - - Node *targ = [renderer anyNodeAt:pos]; - if (targ != nil) { - Edge *edge = [Edge edgeWithSource:sourceNode andTarget:targ]; - [edge setStyle:[self activeStyle]]; - [[renderer document] addEdge:edge]; - [renderer invalidateEdge:edge]; - } - - sourceNode = nil; -} - -- (void) renderWithContext:(id)context onSurface:(id)surface { - if (sourceNode == nil) { - return; - } - [context saveState]; - - [context setLineWidth:1.0]; - [context startPath]; - [context moveTo:sourceNodeScreenPoint]; - [context lineTo:halfEdgeEnd]; - [context strokePathWithColor:MakeRColor (0, 0, 0, 0.5)]; - - [context restoreState]; -} - -- (StyleManager*) styleManager { - return [[stylePicker model] styleManager]; -} - -- (void) loadConfiguration:(Configuration*)config { - NSString *styleName = [config stringEntry:@"ActiveStyle" - inGroup:@"CreateEdgeTool" - withDefault:nil]; - [self setActiveStyle:[[self styleManager] edgeStyleForName:styleName]]; -} - -- (void) saveConfiguration:(Configuration*)config { - [config setStringEntry:@"ActiveStyle" - inGroup:@"CreateEdgeTool" - value:[[self activeStyle] name]]; -} -@end - -static void clear_style_button_cb (GtkButton *widget, - EdgeStyleSelector *selector) -{ - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [selector setSelectedStyle:nil]; - [pool drain]; -} - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/CreateNodeTool.h b/tikzit-old/src/gtk/CreateNodeTool.h deleted file mode 100644 index 94d6b31..0000000 --- a/tikzit-old/src/gtk/CreateNodeTool.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import -#import "Tool.h" - -@class NodeStyle; -@class NodeStyleSelector; -@class NodeStylesModel; -@class StyleManager; - -@interface CreateNodeTool : NSObject { - GraphRenderer *renderer; - NodeStyleSelector *stylePicker; - GtkWidget *configWidget; -} - -@property (retain) NodeStyle *activeStyle; - -+ (id) toolWithStyleManager:(StyleManager*)sm; -- (id) initWithStyleManager:(StyleManager*)sm; -+ (id) toolWithNodeStylesModel:(NodeStylesModel*)nsm; -- (id) initWithNodeStylesModel:(NodeStylesModel*)nsm; -@end - - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/CreateNodeTool.m b/tikzit-old/src/gtk/CreateNodeTool.m deleted file mode 100644 index 77b24f0..0000000 --- a/tikzit-old/src/gtk/CreateNodeTool.m +++ /dev/null @@ -1,169 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "CreateNodeTool.h" - -#import "Configuration.h" -#import "GraphRenderer.h" -#import "NodeStyleSelector.h" -#import "NodeStylesModel.h" -#import "TikzDocument.h" -#import "tzstockitems.h" - -static void clear_style_button_cb (GtkButton *widget, - NodeStyleSelector *selector); - -@implementation CreateNodeTool -- (NSString*) name { return @"Create Node"; } -- (const gchar*) stockId { return TIKZIT_STOCK_CREATE_NODE; } -- (NSString*) helpText { return @"Create new nodes"; } -- (NSString*) shortcut { return @"n"; } -@synthesize activeRenderer=renderer; -@synthesize configurationWidget=configWidget; - -+ (id) toolWithStyleManager:(StyleManager*)sm { - return [[[self alloc] initWithStyleManager:sm] autorelease]; -} - -+ (id) toolWithNodeStylesModel:(NodeStylesModel*)nsm { - return [[[self alloc] initWithNodeStylesModel:nsm] autorelease]; -} - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithStyleManager:(StyleManager*)sm { - return [self initWithNodeStylesModel:[NodeStylesModel modelWithStyleManager:sm]]; -} - -- (id) initWithNodeStylesModel:(NodeStylesModel*)nsm { - self = [super init]; - - if (self) { - stylePicker = [[NodeStyleSelector alloc] initWithModel:nsm]; - - configWidget = gtk_vbox_new (FALSE, 0); - g_object_ref_sink (configWidget); - - GtkWidget *label = gtk_label_new ("Node style:"); - gtk_widget_show (label); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_box_pack_start (GTK_BOX (configWidget), - label, - FALSE, - FALSE, - 0); - - GtkWidget *selWindow = gtk_scrolled_window_new (NULL, NULL); - gtk_widget_show (selWindow); - gtk_container_add (GTK_CONTAINER (selWindow), - [stylePicker widget]); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (selWindow), - GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); - gtk_widget_show ([stylePicker widget]); - - GtkWidget *selectorFrame = gtk_frame_new (NULL); - gtk_widget_show (selectorFrame); - gtk_box_pack_start (GTK_BOX (configWidget), - selectorFrame, - TRUE, - TRUE, - 0); - gtk_container_add (GTK_CONTAINER (selectorFrame), - selWindow); - - GtkWidget *button = gtk_button_new_with_label ("No style"); - gtk_widget_show (button); - gtk_box_pack_start (GTK_BOX (configWidget), - button, - FALSE, - FALSE, - 0); - g_signal_connect (G_OBJECT (button), - "clicked", - G_CALLBACK (clear_style_button_cb), - stylePicker); - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - [renderer release]; - [stylePicker release]; - - g_object_unref (G_OBJECT (configWidget)); - - [super dealloc]; -} - -- (NodeStyle*) activeStyle { - return [stylePicker selectedStyle]; -} - -- (void) setActiveStyle:(NodeStyle*)style { - return [stylePicker setSelectedStyle:style]; -} - -// FIXME: create node on press, and drag it around? -- (void) mousePressAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask {} - -- (void) mouseReleaseAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { - if (button != LeftButton) - return; - - Transformer *transformer = [renderer transformer]; - NSPoint nodePoint = [transformer fromScreen:[[renderer grid] snapScreenPoint:pos]]; - Node *node = [Node nodeWithPoint:nodePoint]; - [node setStyle:[self activeStyle]]; - [[renderer document] addNode:node]; -} - -- (void) renderWithContext:(id)context onSurface:(id)surface {} - -- (StyleManager*) styleManager { - return [[stylePicker model] styleManager]; -} - -- (void) loadConfiguration:(Configuration*)config { - NSString *styleName = [config stringEntry:@"ActiveStyle" - inGroup:@"CreateNodeTool" - withDefault:nil]; - [self setActiveStyle:[[self styleManager] nodeStyleForName:styleName]]; -} - -- (void) saveConfiguration:(Configuration*)config { - [config setStringEntry:@"ActiveStyle" - inGroup:@"CreateNodeTool" - value:[[self activeStyle] name]]; -} -@end - -static void clear_style_button_cb (GtkButton *widget, - NodeStyleSelector *selector) -{ - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [selector setSelectedStyle:nil]; - [pool drain]; -} - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/DocumentContext.h b/tikzit-old/src/gtk/DocumentContext.h deleted file mode 100644 index e4c1065..0000000 --- a/tikzit-old/src/gtk/DocumentContext.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" - -@class TikzDocument; - -@interface DocumentContext { - TikzDocument *document; - GraphRenderer *renderSurface; -} - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/Edge+Render.h b/tikzit-old/src/gtk/Edge+Render.h deleted file mode 100644 index e88b28a..0000000 --- a/tikzit-old/src/gtk/Edge+Render.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "Edge.h" -#import "RenderContext.h" -#import "Surface.h" - -@interface Edge (Render) - -+ (float) controlPointRadius; -- (void) renderControlsInContext:(id)context withTransformer:(Transformer*)transformer; -- (void) renderBasicEdgeInContext:(id)context withTransformer:(Transformer*)t selected:(BOOL)selected; -- (void) renderToSurface:(id)surface withContext:(id)context selected:(BOOL)selected; -- (NSRect) renderedBoundsWithTransformer:(Transformer*)t whenSelected:(BOOL)selected; -- (BOOL) hitByPoint:(NSPoint)p onSurface:(id)surface withFuzz:(float)fuzz; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/Edge+Render.m b/tikzit-old/src/gtk/Edge+Render.m deleted file mode 100644 index 3cc2a14..0000000 --- a/tikzit-old/src/gtk/Edge+Render.m +++ /dev/null @@ -1,267 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * Copyright 2010 Chris Heunen - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "Edge+Render.h" -#import "Node+Render.h" -#import "../common/util.h" - -static const float edgeWidth = 2.0; -static const float cpRadius = 3.0; -static const float cpLineWidth = 1.0; - -@implementation Edge (Render) - -+ (float) controlPointRadius { - return cpRadius; -} - -- (float) controlDistance { - const float dx = (targ.x - src.x); - const float dy = (targ.y - src.y); - if (dx == 0 && dy == 0) { - return weight; - } else { - return NSDistanceBetweenPoints(src, targ) * weight; - } -} - -- (void) renderControlsInContext:(id)context withTransformer:(Transformer*)transformer { - [context saveState]; - - [self updateControls]; - - NSPoint c_source = [transformer toScreen:src]; - NSPoint c_target = [transformer toScreen:targ]; - NSPoint c_mid = [transformer toScreen:mid]; - - const float dx = (c_target.x - c_source.x); - const float dy = (c_target.y - c_source.y); - - [context setLineWidth:cpLineWidth]; - RColor fillColor = MakeRColor (1.0, 1.0, 1.0, 0.5); - - // draw a circle at the mid point - [context startPath]; - [context circleAt:c_mid withRadius:cpRadius]; - [context strokePathWithColor:MakeSolidRColor(0, 0, 1) andFillWithColor:fillColor]; - - //[context setAntialiasMode:AntialiasDisabled]; - - // size of control circles - float c_dist = 0.0f; - if (dx == 0 && dy == 0) { - c_dist = [transformer scaleToScreen:weight]; - } else { - c_dist = NSDistanceBetweenPoints(c_source, c_target) * weight; - } - - // basic bend is blue, in-out is green - RColor controlTrackColor; - if ([self bendMode] == EdgeBendModeBasic) { - controlTrackColor = MakeRColor (0.0, 0.0, 1.0, 0.4); - } else { - controlTrackColor = MakeRColor (0.0, 0.7, 0.0, 0.4); - } - - [context startPath]; - [context circleAt:c_source withRadius:c_dist]; - if (dx != 0 || dy != 0) { - [context circleAt:c_target withRadius:c_dist]; - } - [context strokePathWithColor:controlTrackColor]; - - RColor handleColor = MakeRColor (1.0, 0.0, 1.0, 0.6); - if ([self bendMode] == EdgeBendModeBasic) { - if (bend % 45 != 0) { - handleColor = MakeRColor (0.0, 0.0, 0.1, 0.4); - } - } else if ([self bendMode] == EdgeBendModeInOut) { - if (outAngle % 45 != 0) { - handleColor = MakeRColor (0.0, 0.7, 0.0, 0.4); - } - } - - NSPoint c_cp1 = [transformer toScreen:cp1]; - [context moveTo:c_source]; - [context lineTo:c_cp1]; - [context circleAt:c_cp1 withRadius:cpRadius]; - [context strokePathWithColor:handleColor]; - - if ([self bendMode] == EdgeBendModeInOut) { - // recalculate color based on inAngle - if (inAngle % 45 == 0) { - handleColor = MakeRColor (1.0, 0.0, 1.0, 0.6); - } else { - handleColor = MakeRColor (0.0, 0.7, 0.0, 0.4); - } - } - - NSPoint c_cp2 = [transformer toScreen:cp2]; - [context moveTo:c_target]; - [context lineTo:c_cp2]; - [context circleAt:c_cp2 withRadius:cpRadius]; - [context strokePathWithColor:handleColor]; - - [context restoreState]; -} - -- (void) renderArrowStrokePathInContext:(id)context withTransformer:(Transformer*)transformer color:(RColor)color { - - if ([self style] != nil) { - switch ([[self style] headStyle]) { - case AH_None: - break; - case AH_Plain: - [context startPath]; - [context moveTo:[transformer toScreen:[self leftHeadNormal]]]; - [context lineTo:[transformer toScreen:head]]; - [context lineTo:[transformer toScreen:[self rightHeadNormal]]]; - [context strokePathWithColor:color]; - break; - case AH_Latex: - [context startPath]; - [context moveTo:[transformer toScreen:[self leftHeadNormal]]]; - [context lineTo:[transformer toScreen:head]]; - [context lineTo:[transformer toScreen:[self rightHeadNormal]]]; - [context closeSubPath]; - [context strokePathWithColor:color andFillWithColor:color]; - break; - } - switch ([[self style] tailStyle]) { - case AH_None: - break; - case AH_Plain: - [context startPath]; - [context moveTo:[transformer toScreen:[self leftTailNormal]]]; - [context lineTo:[transformer toScreen:tail]]; - [context lineTo:[transformer toScreen:[self rightTailNormal]]]; - [context strokePathWithColor:color]; - break; - case AH_Latex: - [context startPath]; - [context moveTo:[transformer toScreen:[self leftTailNormal]]]; - [context lineTo:[transformer toScreen:tail]]; - [context lineTo:[transformer toScreen:[self rightTailNormal]]]; - [context closeSubPath]; - [context strokePathWithColor:color andFillWithColor:color]; - break; - } - } -} - -- (void) createStrokePathInContext:(id)context withTransformer:(Transformer*)transformer { - NSPoint c_tail = [transformer toScreen:tail]; - NSPoint c_cp1 = [transformer toScreen:cp1]; - NSPoint c_cp2 = [transformer toScreen:cp2]; - NSPoint c_head = [transformer toScreen:head]; - - [context startPath]; - [context moveTo:c_tail]; - [context curveTo:c_head withCp1:c_cp1 andCp2:c_cp2]; - - if ([self style] != nil) { - // draw edge decoration - switch ([[self style] decorationStyle]) { - case ED_None: - break; - case ED_Tick: - [context moveTo:[transformer toScreen:[self leftNormal]]]; - [context lineTo:[transformer toScreen:[self rightNormal]]]; - break; - case ED_Arrow: - [context moveTo:[transformer toScreen:[self leftNormal]]]; - [context lineTo:[transformer toScreen:[self midTan]]]; - [context lineTo:[transformer toScreen:[self rightNormal]]]; - break; - } - - } -} - -- (RColor) color { - if (style) { - return [[style colorRGB] rColor]; - } else { - return BlackRColor; - } -} - -- (void) renderBasicEdgeInContext:(id)context withTransformer:(Transformer*)t selected:(BOOL)selected { - [self updateControls]; - [context saveState]; - - const CGFloat lineWidth = style ? [style thickness] : edgeWidth; - [context setLineWidth:lineWidth]; - RColor color = [self color]; - if (selected) { - color.alpha = 0.5; - } - - [self createStrokePathInContext:context withTransformer:t]; - [context strokePathWithColor:color]; - - [self renderArrowStrokePathInContext:context withTransformer:t color:color]; - - [context restoreState]; -} - -- (void) renderToSurface:(id )surface withContext:(id)context selected:(BOOL)selected { - [self renderBasicEdgeInContext:context withTransformer:[surface transformer] selected:selected]; - - if (selected) { - [self renderControlsInContext:context withTransformer:[surface transformer]]; - } - - if ([self hasEdgeNode]) { - NSPoint labelPt = [[surface transformer] toScreen:[self mid]]; - [[self edgeNode] renderLabelAt:labelPt - withContext:context]; - } -} - -- (NSRect) renderedBoundsWithTransformer:(Transformer*)t whenSelected:(BOOL)selected { - if (selected) { - float c_dist = [self controlDistance] + cpRadius; // include handle - NSRect cp1circ = NSMakeRect (head.x - c_dist, head.y - c_dist, 2*c_dist, 2*c_dist); - NSRect cp2circ = NSMakeRect (tail.x - c_dist, tail.y - c_dist, 2*c_dist, 2*c_dist); - NSRect rect = NSUnionRect ([self boundingRect], NSUnionRect (cp1circ, cp2circ)); - return [t rectToScreen:rect]; - } else { - return [t rectToScreen:[self boundingRect]]; - } -} - -- (BOOL) hitByPoint:(NSPoint)p onSurface:(id)surface withFuzz:(float)fuzz { - [self updateControls]; - - NSRect boundingRect = [[surface transformer] rectToScreen:[self boundingRect]]; - if (!NSPointInRect(p, NSInsetRect(boundingRect, -fuzz, -fuzz))) { - return NO; - } - - id cr = [surface createRenderContext]; - - [cr setLineWidth:edgeWidth + 2 * fuzz]; - [self createStrokePathInContext:cr withTransformer:[surface transformer]]; - - return [cr strokeIncludesPoint:p]; -} - -@end - -// vim:ft=objc:ts=4:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/EdgeStyle+Gtk.h b/tikzit-old/src/gtk/EdgeStyle+Gtk.h deleted file mode 100644 index 4323593..0000000 --- a/tikzit-old/src/gtk/EdgeStyle+Gtk.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "EdgeStyle.h" -#import - -@interface EdgeStyle (Gtk) - -- (GdkColor) color; -- (void) setColor:(GdkColor)color; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/EdgeStyle+Gtk.m b/tikzit-old/src/gtk/EdgeStyle+Gtk.m deleted file mode 100644 index 886329e..0000000 --- a/tikzit-old/src/gtk/EdgeStyle+Gtk.m +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "EdgeStyle+Gtk.h" -#import "ColorRGB+Gtk.h" - -@implementation EdgeStyle (Gtk) - -- (GdkColor) color { - return [[self colorRGB] gdkColor]; -} - -- (void) setColor:(GdkColor)color { - [self setColorRGB:[ColorRGB colorWithGdkColor:color]]; -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/EdgeStyle+Storage.h b/tikzit-old/src/gtk/EdgeStyle+Storage.h deleted file mode 100644 index 74881f3..0000000 --- a/tikzit-old/src/gtk/EdgeStyle+Storage.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "EdgeStyle.h" -#import "Configuration.h" - -@interface EdgeStyle (Storage) - -- (id) initFromConfigurationGroup:(NSString*)groupName config:(Configuration*)configFile; -- (void) storeToConfigurationGroup:(NSString*)groupName config:(Configuration*)configFile; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/EdgeStyle+Storage.m b/tikzit-old/src/gtk/EdgeStyle+Storage.m deleted file mode 100644 index 45e2a20..0000000 --- a/tikzit-old/src/gtk/EdgeStyle+Storage.m +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "EdgeStyle+Storage.h" -#import "ColorRGB+IntegerListStorage.h" - -@implementation EdgeStyle (Storage) - -- (id) initFromConfigurationGroup:(NSString*)groupName config:(Configuration*)configFile { - self = [self init]; - - if (self) { - [self setName:[configFile stringEntry:@"Name" inGroup:groupName withDefault:name]]; - [self setCategory:[configFile stringEntry:@"Category" inGroup:groupName withDefault:category]]; - headStyle = [configFile integerEntry:@"HeadStyle" inGroup:groupName withDefault:headStyle]; - tailStyle = [configFile integerEntry:@"TailStyle" inGroup:groupName withDefault:tailStyle]; - decorationStyle = [configFile integerEntry:@"DecorationStyle" inGroup:groupName withDefault:decorationStyle]; - thickness = [configFile doubleEntry:@"Thickness" inGroup:groupName withDefault:thickness]; - [self setColorRGB: - [ColorRGB colorFromValueList: - [configFile integerListEntry:@"Color" - inGroup:groupName - withDefault:[colorRGB valueList]]]]; - } - - return self; -} - -- (void) storeToConfigurationGroup:(NSString*)groupName config:(Configuration*)configFile { - [configFile setStringEntry:@"Name" inGroup:groupName value:name]; - [configFile setStringEntry:@"Category" inGroup:groupName value:category]; - [configFile setIntegerEntry:@"HeadStyle" inGroup:groupName value:headStyle]; - [configFile setIntegerEntry:@"TailStyle" inGroup:groupName value:tailStyle]; - [configFile setIntegerEntry:@"DecorationStyle" inGroup:groupName value:decorationStyle]; - [configFile setDoubleEntry:@"Thickness" inGroup:groupName value:thickness]; - [configFile setIntegerListEntry:@"Color" inGroup:groupName value:[[self colorRGB] valueList]]; -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/EdgeStyleEditor.h b/tikzit-old/src/gtk/EdgeStyleEditor.h deleted file mode 100644 index 2224bbb..0000000 --- a/tikzit-old/src/gtk/EdgeStyleEditor.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class EdgeStyle; - -@interface EdgeStyleEditor: NSObject { - EdgeStyle *style; - GtkTable *table; - GtkEntry *nameEdit; - GtkComboBox *decorationCombo; - GtkComboBox *headArrowCombo; - GtkComboBox *tailArrowCombo; - GtkColorButton *colorButton; - GtkWidget *makeColorTexSafeButton; - GtkAdjustment *thicknessAdj; - BOOL blockSignals; -} - -@property (retain) EdgeStyle *style; -@property (readonly) GtkWidget *widget; - -- (id) init; - -- (void) selectNameField; - -@end - -// vim:ft=objc:ts=4:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/EdgeStyleEditor.m b/tikzit-old/src/gtk/EdgeStyleEditor.m deleted file mode 100644 index c7ca8bd..0000000 --- a/tikzit-old/src/gtk/EdgeStyleEditor.m +++ /dev/null @@ -1,499 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "EdgeStyleEditor.h" - -#import "EdgeStyle.h" -#import "EdgeStyle+Gtk.h" -#import "Shape.h" - -#include - -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wpointer-sign" -#import "edgedecdata.m" -#pragma GCC diagnostic pop - -// {{{ Data Types -enum { - DEC_NAME_COL = 0, - DEC_PREVIEW_COL, - DEC_VALUE_COL, - DEC_N_COLS -}; - -struct dec_info { - const gchar *name; - const GdkPixdata *pixdata; - int value; -}; -static struct dec_info ed_entries[] = { - { "None", &ED_none_pixdata, ED_None }, - { "Arrow", &ED_arrow_pixdata, ED_Arrow }, - { "Tick", &ED_tick_pixdata, ED_Tick } -}; -static guint n_ed_entries = G_N_ELEMENTS (ed_entries); -static struct dec_info ah_head_entries[] = { - { "None", &AH_none_pixdata, AH_None }, - { "Plain", &AH_plain_head_pixdata, AH_Plain }, - { "Latex", &AH_latex_head_pixdata, AH_Latex } -}; -static guint n_ah_head_entries = G_N_ELEMENTS (ah_head_entries); -static struct dec_info ah_tail_entries[] = { - { "None", &AH_none_pixdata, AH_None }, - { "Plain", &AH_plain_tail_pixdata, AH_Plain }, - { "Latex", &AH_latex_tail_pixdata, AH_Latex } -}; -static guint n_ah_tail_entries = G_N_ELEMENTS (ah_tail_entries); - -static const guint row_count = 6; - -// }}} -// {{{ Internal interfaces -// {{{ GTK+ Callbacks -static void style_name_edit_changed_cb (GtkEditable *widget, EdgeStyleEditor *editor); -static void decoration_combo_changed_cb (GtkComboBox *widget, EdgeStyleEditor *editor); -static void head_arrow_combo_changed_cb (GtkComboBox *widget, EdgeStyleEditor *editor); -static void tail_arrow_combo_changed_cb (GtkComboBox *widget, EdgeStyleEditor *editor); -static void thickness_adjustment_changed_cb (GtkAdjustment *widget, EdgeStyleEditor *editor); -static void color_changed_cb (GtkColorButton *widget, EdgeStyleEditor *editor); -static void make_color_safe_button_clicked_cb (GtkButton *widget, EdgeStyleEditor *editor); -// }}} -// {{{ Notifications - -@interface EdgeStyleEditor (Notifications) -- (void) nameChangedTo:(NSString*)value; -- (void) edgeDecorationChangedTo:(EdgeDectorationStyle)value; -- (void) headArrowChangedTo:(ArrowHeadStyle)value; -- (void) tailArrowChangedTo:(ArrowHeadStyle)value; -- (void) thicknessChangedTo:(double)value; -- (void) makeColorTexSafe; -- (void) colorChangedTo:(GdkColor)value; -@end - -// }}} -// {{{ Private - -@interface EdgeStyleEditor (Private) -- (void) load:(guint)count decorationStylesFrom:(struct dec_info*)info into:(GtkListStore*)list; -- (void) clearDecCombo:(GtkComboBox*)combo; -- (void) setDecCombo:(GtkComboBox*)combo toValue:(int)value; -@end - -// }}} -// }}} -// {{{ API - -@implementation EdgeStyleEditor - -- (void) _addWidget:(GtkWidget*)w withLabel:(gchar *)label atRow:(guint)row { - NSAssert(row < row_count, @"row_count is wrong!"); - - GtkWidget *l = gtk_label_new (label); - gtk_misc_set_alignment (GTK_MISC (l), 0, 0.5); - gtk_widget_show (l); - gtk_widget_show (w); - - gtk_table_attach (table, l, - 0, 1, row, row+1, // l, r, t, b - GTK_FILL, // x opts - GTK_FILL | GTK_EXPAND, // y opts - 5, // x padding - 0); // y padding - - gtk_table_attach (table, w, - 1, 2, row, row+1, // l, r, t, b - GTK_FILL | GTK_EXPAND, // x opts - GTK_FILL | GTK_EXPAND, // y opts - 0, // x padding - 0); // y padding -} - -- (GtkComboBox*) _createDecComboWithEntries:(struct dec_info*)entries count:(guint)n { - GtkListStore *store = gtk_list_store_new (DEC_N_COLS, G_TYPE_STRING, GDK_TYPE_PIXBUF, G_TYPE_INT); - [self load:n decorationStylesFrom:entries into:store]; - - GtkComboBox *combo = GTK_COMBO_BOX (gtk_combo_box_new_with_model (GTK_TREE_MODEL (store))); - g_object_unref (store); - GtkCellRenderer *cellRend = gtk_cell_renderer_pixbuf_new (); - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), - cellRend, - TRUE); - gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo), cellRend, "pixbuf", DEC_PREVIEW_COL); - g_object_ref_sink (combo); - - return combo; -} - -- (GtkWidget*) _createMakeColorTexSafeButton { - GtkWidget *b = gtk_button_new (); - GtkWidget *icon = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_BUTTON); - gtk_widget_show (icon); - gtk_container_add (GTK_CONTAINER (b), icon); - NSString *ttip = @"The colour is not a predefined TeX colour.\nClick here to choose the nearest TeX-safe colour."; - gtk_widget_set_tooltip_text (b, [ttip UTF8String]); - return b; -} - -- (id) init { - self = [super init]; - - if (self != nil) { - style = nil; - table = GTK_TABLE (gtk_table_new (row_count, 2, FALSE)); - gtk_table_set_col_spacings (table, 6); - gtk_table_set_row_spacings (table, 6); - gtk_widget_set_sensitive (GTK_WIDGET (table), FALSE); - blockSignals = NO; - - /** - * Name - */ - nameEdit = GTK_ENTRY (gtk_entry_new ()); - g_object_ref_sink (nameEdit); - [self _addWidget:GTK_WIDGET (nameEdit) - withLabel:"Name" - atRow:0]; - g_signal_connect (G_OBJECT (nameEdit), - "changed", - G_CALLBACK (style_name_edit_changed_cb), - self); - - - /** - * Edge decoration style - */ - decorationCombo = [self _createDecComboWithEntries:ed_entries count:n_ed_entries]; - [self _addWidget:GTK_WIDGET (decorationCombo) - withLabel:"Decoration" - atRow:1]; - g_signal_connect (G_OBJECT (decorationCombo), - "changed", - G_CALLBACK (decoration_combo_changed_cb), - self); - - - /** - * Head arrow style - */ - headArrowCombo = [self _createDecComboWithEntries:ah_head_entries count:n_ah_head_entries]; - [self _addWidget:GTK_WIDGET (headArrowCombo) - withLabel:"Arrow head" - atRow:2]; - g_signal_connect (G_OBJECT (headArrowCombo), - "changed", - G_CALLBACK (head_arrow_combo_changed_cb), - self); - - - /** - * Tail arrow style - */ - tailArrowCombo = [self _createDecComboWithEntries:ah_tail_entries count:n_ah_tail_entries]; - [self _addWidget:GTK_WIDGET (tailArrowCombo) - withLabel:"Arrow tail" - atRow:3]; - g_signal_connect (G_OBJECT (tailArrowCombo), - "changed", - G_CALLBACK (tail_arrow_combo_changed_cb), - self); - - - /** - * Colour - */ - GtkWidget *colorBox = gtk_hbox_new (FALSE, 0); - [self _addWidget:colorBox - withLabel:"Colour" - atRow:4]; - colorButton = GTK_COLOR_BUTTON (gtk_color_button_new ()); - g_object_ref_sink (colorButton); - gtk_widget_show (GTK_WIDGET (colorButton)); - gtk_box_pack_start (GTK_BOX (colorBox), GTK_WIDGET (colorButton), - FALSE, FALSE, 0); - makeColorTexSafeButton = [self _createMakeColorTexSafeButton]; - g_object_ref_sink (makeColorTexSafeButton); - gtk_box_pack_start (GTK_BOX (colorBox), makeColorTexSafeButton, - FALSE, FALSE, 0); - g_signal_connect (G_OBJECT (colorButton), - "color-set", - G_CALLBACK (color_changed_cb), - self); - g_signal_connect (G_OBJECT (makeColorTexSafeButton), - "clicked", - G_CALLBACK (make_color_safe_button_clicked_cb), - self); - - - /** - * Thickness - */ - thicknessAdj = GTK_ADJUSTMENT (gtk_adjustment_new ( - 1.0, // value - 0.0, // lower - 50.0, // upper - 0.20, // step - 1.0, // page - 0.0)); // (irrelevant) - g_object_ref_sink (thicknessAdj); - GtkWidget *scaleSpin = gtk_spin_button_new (thicknessAdj, 0.0, 2); - [self _addWidget:scaleSpin - withLabel:"Thickness" - atRow:5]; - g_signal_connect (G_OBJECT (thicknessAdj), - "value-changed", - G_CALLBACK (thickness_adjustment_changed_cb), - self); - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - g_object_unref (nameEdit); - g_object_unref (decorationCombo); - g_object_unref (colorButton); - g_object_unref (makeColorTexSafeButton); - g_object_unref (thicknessAdj); - g_object_unref (table); - [style release]; - - [super dealloc]; -} - -- (EdgeStyle*) style { - return style; -} - -- (void) setStyle:(EdgeStyle*)s { - blockSignals = YES; - EdgeStyle *oldStyle = style; - style = [s retain]; - - if (style != nil) { - gtk_widget_set_sensitive (GTK_WIDGET (table), TRUE); - - gtk_entry_set_text(nameEdit, [[style name] UTF8String]); - - [self setDecCombo:decorationCombo toValue:[style decorationStyle]]; - [self setDecCombo:headArrowCombo toValue:[style headStyle]]; - [self setDecCombo:tailArrowCombo toValue:[style tailStyle]]; - - GdkColor c = [style color]; - gtk_color_button_set_color(colorButton, &c); - gtk_widget_set_visible (makeColorTexSafeButton, ([[style colorRGB] name] == nil)); - - gtk_adjustment_set_value(thicknessAdj, [style thickness]); - } else { - gtk_entry_set_text(nameEdit, ""); - [self clearDecCombo:decorationCombo]; - [self clearDecCombo:headArrowCombo]; - [self clearDecCombo:tailArrowCombo]; - gtk_widget_set_visible (makeColorTexSafeButton, FALSE); - gtk_adjustment_set_value(thicknessAdj, 1.0); - gtk_widget_set_sensitive (GTK_WIDGET (table), FALSE); - } - - [oldStyle release]; - blockSignals = NO; -} - -- (GtkWidget*) widget { - return GTK_WIDGET (table); -} - -- (void) selectNameField { - gtk_widget_grab_focus (GTK_WIDGET (nameEdit)); - gtk_editable_select_region (GTK_EDITABLE (nameEdit), 0, -1); -} - -@end - -// }}} -// {{{ Notifications - -@implementation EdgeStyleEditor (Notifications) -- (void) nameChangedTo:(NSString*)value { - [style setName:value]; -} - -- (void) edgeDecorationChangedTo:(EdgeDectorationStyle)value { - [style setDecorationStyle:value]; -} - -- (void) headArrowChangedTo:(ArrowHeadStyle)value { - [style setHeadStyle:value]; -} - -- (void) tailArrowChangedTo:(ArrowHeadStyle)value { - [style setTailStyle:value]; -} - -- (void) thicknessChangedTo:(double)value { - [style setThickness:(float)value]; -} - -- (void) colorChangedTo:(GdkColor)value { - [style setColor:value]; - gtk_widget_set_visible (makeColorTexSafeButton, - [[style colorRGB] name] == nil); -} - -- (void) makeColorTexSafe { - if (style != nil) { - [[style colorRGB] setToClosestHashed]; - GdkColor color = [style color]; - gtk_color_button_set_color(colorButton, &color); - gtk_widget_set_visible (makeColorTexSafeButton, FALSE); - } -} -@end - -// }}} -// {{{ Private - -@implementation EdgeStyleEditor (Private) -- (BOOL) signalsBlocked { return blockSignals; } - -- (void) load:(guint)count decorationStylesFrom:(struct dec_info*)info into:(GtkListStore*)list { - GtkTreeIter iter; - - for (guint i = 0; i < count; ++i) { - GdkPixbuf *buf = gdk_pixbuf_from_pixdata (info[i].pixdata, FALSE, NULL); - gtk_list_store_append (list, &iter); - gtk_list_store_set (list, &iter, - DEC_NAME_COL, info[i].name, - DEC_PREVIEW_COL, buf, - DEC_VALUE_COL, info[i].value, - -1); - g_object_unref (buf); - } -} - -- (void) clearDecCombo:(GtkComboBox*)combo { - gtk_combo_box_set_active (combo, -1); -} - -- (void) setDecCombo:(GtkComboBox*)combo toValue:(int)value { - GtkTreeModel *model = gtk_combo_box_get_model (combo); - GtkTreeIter iter; - if (gtk_tree_model_get_iter_first (model, &iter)) { - do { - int rowValue; - gtk_tree_model_get (model, &iter, DEC_VALUE_COL, &rowValue, -1); - if (rowValue == value) { - gtk_combo_box_set_active_iter (combo, &iter); - return; - } - } while (gtk_tree_model_iter_next (model, &iter)); - } -} -@end - -// }}} -// {{{ GTK+ callbacks - -static void style_name_edit_changed_cb (GtkEditable *widget, EdgeStyleEditor *editor) { - if ([editor signalsBlocked]) - return; - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - const gchar *contents = gtk_entry_get_text (GTK_ENTRY (widget)); - [editor nameChangedTo:[NSString stringWithUTF8String:contents]]; - - [pool drain]; -} - -static void decoration_combo_changed_cb (GtkComboBox *widget, EdgeStyleEditor *editor) { - if ([editor signalsBlocked]) - return; - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - GtkTreeIter iter; - gtk_combo_box_get_active_iter (widget, &iter); - EdgeDectorationStyle dec = ED_None; - gtk_tree_model_get (gtk_combo_box_get_model (widget), &iter, DEC_VALUE_COL, &dec, -1); - [editor edgeDecorationChangedTo:dec]; - - [pool drain]; -} - -static void head_arrow_combo_changed_cb (GtkComboBox *widget, EdgeStyleEditor *editor) { - if ([editor signalsBlocked]) - return; - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - GtkTreeIter iter; - gtk_combo_box_get_active_iter (widget, &iter); - ArrowHeadStyle dec = AH_None; - gtk_tree_model_get (gtk_combo_box_get_model (widget), &iter, DEC_VALUE_COL, &dec, -1); - [editor headArrowChangedTo:dec]; - - [pool drain]; -} - -static void tail_arrow_combo_changed_cb (GtkComboBox *widget, EdgeStyleEditor *editor) { - if ([editor signalsBlocked]) - return; - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - GtkTreeIter iter; - gtk_combo_box_get_active_iter (widget, &iter); - ArrowHeadStyle dec = AH_None; - gtk_tree_model_get (gtk_combo_box_get_model (widget), &iter, DEC_VALUE_COL, &dec, -1); - [editor tailArrowChangedTo:dec]; - - [pool drain]; -} - -static void thickness_adjustment_changed_cb (GtkAdjustment *adj, EdgeStyleEditor *editor) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor thicknessChangedTo:gtk_adjustment_get_value (adj)]; - [pool drain]; -} - -static void color_changed_cb (GtkColorButton *widget, EdgeStyleEditor *editor) { - if ([editor signalsBlocked]) - return; - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - GdkColor color; - gtk_color_button_get_color (widget, &color); - [editor colorChangedTo:color]; - - [pool drain]; -} - -static void make_color_safe_button_clicked_cb (GtkButton *widget, EdgeStyleEditor *editor) { - if ([editor signalsBlocked]) - return; - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor makeColorTexSafe]; - [pool drain]; -} - -// }}} - -// vim:ft=objc:ts=4:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/EdgeStyleSelector.h b/tikzit-old/src/gtk/EdgeStyleSelector.h deleted file mode 100644 index 904bd93..0000000 --- a/tikzit-old/src/gtk/EdgeStyleSelector.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class EdgeStyle; -@class EdgeStylesModel; -@class StyleManager; - -@interface EdgeStyleSelector: NSObject { - EdgeStylesModel *model; - GtkTreeView *view; -} - -/*! - @property widget - @brief The GTK widget - */ -@property (readonly) GtkWidget *widget; - -/*! - @property model - @brief The model to use. - */ -@property (retain) EdgeStylesModel *model; - -/*! - @property selectedStyle - @brief The selected style. - - When this changes, a SelectedStyleChanged notification will be posted - */ -@property (assign) EdgeStyle *selectedStyle; - -/*! - * Initialise with a new model for the given style manager - */ -- (id) initWithStyleManager:(StyleManager*)m; -/*! - * Initialise with the given model - */ -- (id) initWithModel:(EdgeStylesModel*)model; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/EdgeStyleSelector.m b/tikzit-old/src/gtk/EdgeStyleSelector.m deleted file mode 100644 index 6a9db33..0000000 --- a/tikzit-old/src/gtk/EdgeStyleSelector.m +++ /dev/null @@ -1,143 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "EdgeStyleSelector.h" - -#import "EdgeStylesModel.h" - -// {{{ Internal interfaces -static void selection_changed_cb (GtkTreeSelection *sel, EdgeStyleSelector *mgr); -// }}} -// {{{ API - -@implementation EdgeStyleSelector - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithStyleManager:(StyleManager*)m { - return [self initWithModel:[EdgeStylesModel modelWithStyleManager:m]]; -} -- (id) initWithModel:(EdgeStylesModel*)m { - self = [super init]; - - if (self) { - model = [m retain]; - - view = GTK_TREE_VIEW (gtk_tree_view_new_with_model ([m model])); - gtk_tree_view_set_headers_visible (view, FALSE); - g_object_ref (view); - - GtkCellRenderer *renderer; - GtkTreeViewColumn *column; - renderer = gtk_cell_renderer_pixbuf_new (); - column = gtk_tree_view_column_new_with_attributes ( - "Preview", - renderer, - "pixbuf", EDGE_STYLES_ICON_COL, - NULL); - gtk_tree_view_append_column (view, column); - gtk_tree_view_set_tooltip_column (view, EDGE_STYLES_NAME_COL); - - GtkTreeSelection *sel = gtk_tree_view_get_selection (view); - gtk_tree_selection_set_mode (sel, GTK_SELECTION_SINGLE); - - g_signal_connect (G_OBJECT (sel), - "changed", - G_CALLBACK (selection_changed_cb), - self); - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - g_object_unref (view); - [model release]; - - [super dealloc]; -} - -- (EdgeStylesModel*) model { - return model; -} - -- (void) setModel:(EdgeStylesModel*)m { - if (m == model) - return; - - EdgeStylesModel *oldModel = model; - model = [m retain]; - gtk_tree_view_set_model (view, [model model]); - [oldModel release]; -} - -- (GtkWidget*) widget { - return GTK_WIDGET (view); -} - -- (EdgeStyle*) selectedStyle { - GtkTreeSelection *sel = gtk_tree_view_get_selection (view); - GtkTreeIter iter; - - if (!gtk_tree_selection_get_selected (sel, NULL, &iter)) { - return nil; - } - - EdgeStyle *style = nil; - gtk_tree_model_get ([model model], &iter, EDGE_STYLES_PTR_COL, &style, -1); - - return style; -} - -- (void) setSelectedStyle:(EdgeStyle*)style { - GtkTreeSelection *sel = gtk_tree_view_get_selection (view); - - if (style == nil) { - gtk_tree_selection_unselect_all (sel); - return; - } - - GtkTreePath *path = [model pathFromStyle:style]; - if (path) { - gtk_tree_selection_unselect_all (sel); - gtk_tree_selection_select_path (sel, path); - gtk_tree_path_free (path); - } -} -@end - -// }}} -// {{{ GTK+ callbacks - -static void selection_changed_cb (GtkTreeSelection *sel, EdgeStyleSelector *mgr) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - [[NSNotificationCenter defaultCenter] - postNotificationName:@"SelectedStyleChanged" - object:mgr]; - - [pool drain]; -} -// }}} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker - diff --git a/tikzit-old/src/gtk/EdgeStylesModel.h b/tikzit-old/src/gtk/EdgeStylesModel.h deleted file mode 100644 index 1166f92..0000000 --- a/tikzit-old/src/gtk/EdgeStylesModel.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class EdgeStyle; -@class StyleManager; - -enum { - EDGE_STYLES_NAME_COL = 0, - EDGE_STYLES_ICON_COL, - EDGE_STYLES_PTR_COL, - EDGE_STYLES_N_COLS -}; - -@interface EdgeStylesModel: NSObject { - GtkListStore *store; - StyleManager *styleManager; -} - -/*! - @property model - @brief The GTK+ tree model - */ -@property (readonly) GtkTreeModel *model; - -/*! - @property manager - @brief The StyleManager to use. - */ -@property (retain) StyleManager *styleManager; - -/*! - * Initialise with the given style manager - */ -- (id) initWithStyleManager:(StyleManager*)m; - -+ (id) modelWithStyleManager:(StyleManager*)m; - -- (EdgeStyle*) styleFromPath:(GtkTreePath*)path; -- (GtkTreePath*) pathFromStyle:(EdgeStyle*)style; -- (EdgeStyle*) styleFromIter:(GtkTreeIter*)iter; -- (GtkTreeIter*) iterFromStyle:(EdgeStyle*)style; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/EdgeStylesModel.m b/tikzit-old/src/gtk/EdgeStylesModel.m deleted file mode 100644 index 2de57ed..0000000 --- a/tikzit-old/src/gtk/EdgeStylesModel.m +++ /dev/null @@ -1,367 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "EdgeStylesModel.h" - -#import "CairoRenderContext.h" -#import "Edge.h" -#import "Edge+Render.h" -#import "EdgeStyle.h" -#import "Node.h" -#import "StyleManager.h" - -#import "gtkhelpers.h" - -#import - -// {{{ Internal interfaces - -@interface EdgeStylesModel (Notifications) -- (void) edgeStylesReplaced:(NSNotification*)notification; -- (void) edgeStyleAdded:(NSNotification*)notification; -- (void) edgeStyleRemoved:(NSNotification*)notification; -- (void) observeValueForKeyPath:(NSString*)keyPath - ofObject:(id)object - change:(NSDictionary*)change - context:(void*)context; -@end - -@interface EdgeStylesModel (Private) -- (cairo_surface_t*) createEdgeIconSurface; -- (GdkPixbuf*) pixbufOfEdgeInStyle:(EdgeStyle*)style; -- (GdkPixbuf*) pixbufOfEdgeInStyle:(EdgeStyle*)style usingSurface:(cairo_surface_t*)surface; -- (void) addEdgeStyle:(EdgeStyle*)style; -- (void) addEdgeStyle:(EdgeStyle*)style usingSurface:(cairo_surface_t*)surface; -- (void) observeEdgeStyle:(EdgeStyle*)style; -- (void) stopObservingEdgeStyle:(EdgeStyle*)style; -- (void) clearEdgeStylesModel; -- (void) reloadEdgeStyles; -@end - -// }}} -// {{{ API - -@implementation EdgeStylesModel - -+ (id) modelWithStyleManager:(StyleManager*)m { - return [[[self alloc] initWithStyleManager:m] autorelease]; -} - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithStyleManager:(StyleManager*)m { - self = [super init]; - - if (self) { - store = gtk_list_store_new (EDGE_STYLES_N_COLS, - G_TYPE_STRING, - GDK_TYPE_PIXBUF, - G_TYPE_POINTER); - g_object_ref_sink (store); - - [self setStyleManager:m]; - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - [self clearEdgeStylesModel]; - g_object_unref (store); - [styleManager release]; - - [super dealloc]; -} - -- (GtkTreeModel*) model { - return GTK_TREE_MODEL (store); -} - -- (StyleManager*) styleManager { - return styleManager; -} - -- (void) setStyleManager:(StyleManager*)m { - if (m == nil) { - [NSException raise:NSInvalidArgumentException format:@"Style manager cannot be nil"]; - } - [m retain]; - - [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:styleManager]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(edgeStylesReplaced:) - name:@"EdgeStylesReplaced" - object:m]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(edgeStyleAdded:) - name:@"EdgeStyleAdded" - object:m]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(edgeStyleRemoved:) - name:@"EdgeStyleRemoved" - object:m]; - - [styleManager release]; - styleManager = m; - - [self reloadEdgeStyles]; -} - -- (EdgeStyle*) styleFromPath:(GtkTreePath*)path { - GtkTreeIter iter; - gtk_tree_model_get_iter (GTK_TREE_MODEL (store), &iter, path); - EdgeStyle *style = nil; - gtk_tree_model_get (GTK_TREE_MODEL (store), &iter, EDGE_STYLES_PTR_COL, &style, -1); - return style; -} - -- (GtkTreePath*) pathFromStyle:(EdgeStyle*)style { - GtkTreeModel *m = GTK_TREE_MODEL (store); - GtkTreeIter row; - if (gtk_tree_model_get_iter_first (m, &row)) { - do { - EdgeStyle *rowStyle; - gtk_tree_model_get (m, &row, EDGE_STYLES_PTR_COL, &rowStyle, -1); - if (style == rowStyle) { - return gtk_tree_model_get_path (m, &row); - } - } while (gtk_tree_model_iter_next (m, &row)); - } - return NULL; -} - -- (EdgeStyle*) styleFromIter:(GtkTreeIter*)iter { - EdgeStyle *style = nil; - gtk_tree_model_get (GTK_TREE_MODEL (store), iter, EDGE_STYLES_PTR_COL, &style, -1); - return style; -} - -- (GtkTreeIter*) iterFromStyle:(EdgeStyle*)style { - GtkTreeModel *m = GTK_TREE_MODEL (store); - GtkTreeIter row; - if (gtk_tree_model_get_iter_first (m, &row)) { - do { - EdgeStyle *rowStyle; - gtk_tree_model_get (m, &row, EDGE_STYLES_PTR_COL, &rowStyle, -1); - if (style == rowStyle) { - return gtk_tree_iter_copy (&row); - } - } while (gtk_tree_model_iter_next (m, &row)); - } - return NULL; -} -@end - -// }}} -// {{{ Notifications - -@implementation EdgeStylesModel (Notifications) - -- (void) edgeStylesReplaced:(NSNotification*)notification { - [self reloadEdgeStyles]; -} - -- (void) edgeStyleAdded:(NSNotification*)notification { - [self addEdgeStyle:[[notification userInfo] objectForKey:@"style"]]; -} - -- (void) edgeStyleRemoved:(NSNotification*)notification { - EdgeStyle *style = [[notification userInfo] objectForKey:@"style"]; - - GtkTreeModel *model = GTK_TREE_MODEL (store); - GtkTreeIter row; - if (gtk_tree_model_get_iter_first (model, &row)) { - do { - EdgeStyle *rowStyle; - gtk_tree_model_get (model, &row, EDGE_STYLES_PTR_COL, &rowStyle, -1); - if (style == rowStyle) { - gtk_list_store_remove (store, &row); - [self stopObservingEdgeStyle:rowStyle]; - [rowStyle release]; - return; - } - } while (gtk_tree_model_iter_next (model, &row)); - } -} - -- (void) observeValueForKeyPath:(NSString*)keyPath - ofObject:(id)object - change:(NSDictionary*)change - context:(void*)context -{ - if ([object class] != [EdgeStyle class]) - return; - - EdgeStyle *style = object; - - GtkTreeModel *model = GTK_TREE_MODEL (store); - GtkTreeIter row; - if (gtk_tree_model_get_iter_first (model, &row)) { - do { - EdgeStyle *rowStyle; - gtk_tree_model_get (model, &row, EDGE_STYLES_PTR_COL, &rowStyle, -1); - if (style == rowStyle) { - if ([@"name" isEqual:keyPath]) { - gtk_list_store_set (store, &row, EDGE_STYLES_NAME_COL, [[style name] UTF8String], -1); - } else { - GdkPixbuf *pixbuf = [self pixbufOfEdgeInStyle:style]; - gtk_list_store_set (store, &row, EDGE_STYLES_ICON_COL, pixbuf, -1); - g_object_unref (pixbuf); - } - } - } while (gtk_tree_model_iter_next (model, &row)); - } -} -@end - -// }}} -// {{{ Private - -@implementation EdgeStylesModel (Private) -- (cairo_surface_t*) createEdgeIconSurface { - return cairo_image_surface_create (CAIRO_FORMAT_ARGB32, 48, 18); -} - -- (GdkPixbuf*) pixbufOfEdgeInStyle:(EdgeStyle*)style { - cairo_surface_t *surface = [self createEdgeIconSurface]; - GdkPixbuf *pixbuf = [self pixbufOfEdgeInStyle:style usingSurface:surface]; - cairo_surface_destroy (surface); - return pixbuf; -} - -- (GdkPixbuf*) pixbufOfEdgeInStyle:(EdgeStyle*)style usingSurface:(cairo_surface_t*)surface { - Transformer *transformer = [Transformer defaultTransformer]; - [transformer setFlippedAboutXAxis:YES]; - - int width = cairo_image_surface_get_width (surface); - int height = cairo_image_surface_get_height (surface); - NSRect pixbufBounds = NSMakeRect(0.0, 0.0, width, height); - NSRect graphBounds = [transformer rectFromScreen:pixbufBounds]; - - NSPoint start = NSMakePoint (NSMinX (graphBounds) + 0.1f, NSMidY (graphBounds)); - NSPoint end = NSMakePoint (NSMaxX (graphBounds) - 0.1f, NSMidY (graphBounds)); - Node *src = [Node nodeWithPoint:start]; - Node *tgt = [Node nodeWithPoint:end]; - Edge *e = [Edge edgeWithSource:src andTarget:tgt]; - [e setStyle:style]; - - CairoRenderContext *context = [[CairoRenderContext alloc] initForSurface:surface]; - [context clearSurface]; - [e renderBasicEdgeInContext:context withTransformer:transformer selected:NO]; - [context release]; - - return pixbuf_get_from_surface (surface); -} - -- (void) addEdgeStyle:(EdgeStyle*)style usingSurface:(cairo_surface_t*)surface { - GtkTreeIter iter; - gtk_list_store_append (store, &iter); - - GdkPixbuf *pixbuf = [self pixbufOfEdgeInStyle:style usingSurface:surface]; - gtk_list_store_set (store, &iter, - EDGE_STYLES_NAME_COL, [[style name] UTF8String], - EDGE_STYLES_ICON_COL, pixbuf, - EDGE_STYLES_PTR_COL, (gpointer)[style retain], - -1); - g_object_unref (pixbuf); - [self observeEdgeStyle:style]; -} - -- (void) addEdgeStyle:(EdgeStyle*)style { - cairo_surface_t *surface = [self createEdgeIconSurface]; - [self addEdgeStyle:style usingSurface:surface]; - cairo_surface_destroy (surface); -} - -- (void) observeEdgeStyle:(EdgeStyle*)style { - [style addObserver:self - forKeyPath:@"name" - options:NSKeyValueObservingOptionNew - context:NULL]; - [style addObserver:self - forKeyPath:@"thickness" - options:0 - context:NULL]; - [style addObserver:self - forKeyPath:@"headStyle" - options:0 - context:NULL]; - [style addObserver:self - forKeyPath:@"tailStyle" - options:0 - context:NULL]; - [style addObserver:self - forKeyPath:@"decorationStyle" - options:0 - context:NULL]; - [style addObserver:self - forKeyPath:@"colorRGB.red" - options:0 - context:NULL]; - [style addObserver:self - forKeyPath:@"colorRGB.green" - options:0 - context:NULL]; - [style addObserver:self - forKeyPath:@"colorRGB.blue" - options:0 - context:NULL]; -} - -- (void) stopObservingEdgeStyle:(EdgeStyle*)style { - [style removeObserver:self forKeyPath:@"name"]; - [style removeObserver:self forKeyPath:@"thickness"]; - [style removeObserver:self forKeyPath:@"headStyle"]; - [style removeObserver:self forKeyPath:@"tailStyle"]; - [style removeObserver:self forKeyPath:@"decorationStyle"]; - [style removeObserver:self forKeyPath:@"colorRGB.red"]; - [style removeObserver:self forKeyPath:@"colorRGB.green"]; - [style removeObserver:self forKeyPath:@"colorRGB.blue"]; -} - -- (void) clearEdgeStylesModel { - GtkTreeModel *model = GTK_TREE_MODEL (store); - GtkTreeIter row; - if (gtk_tree_model_get_iter_first (model, &row)) { - do { - EdgeStyle *rowStyle; - gtk_tree_model_get (model, &row, EDGE_STYLES_PTR_COL, &rowStyle, -1); - [self stopObservingEdgeStyle:rowStyle]; - [rowStyle release]; - } while (gtk_tree_model_iter_next (model, &row)); - } - gtk_list_store_clear (store); -} - -- (void) reloadEdgeStyles { - [self clearEdgeStylesModel]; - cairo_surface_t *surface = [self createEdgeIconSurface]; - for (EdgeStyle *style in [styleManager edgeStyles]) { - [self addEdgeStyle:style usingSurface:surface]; - } - cairo_surface_destroy (surface); -} -@end - -// }}} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/EdgeStylesPalette.h b/tikzit-old/src/gtk/EdgeStylesPalette.h deleted file mode 100644 index c0c6c4b..0000000 --- a/tikzit-old/src/gtk/EdgeStylesPalette.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class StyleManager; -@class EdgeStyleSelector; -@class EdgeStyleEditor; - -@interface EdgeStylesPalette: NSObject { - EdgeStyleSelector *selector; - EdgeStyleEditor *editor; - - GtkWidget *palette; - - GtkWidget *removeStyleButton; - GtkWidget *applyStyleButton; - GtkWidget *clearStyleButton; -} - -@property (retain) StyleManager *styleManager; -@property (readonly) GtkWidget *widget; - -- (id) initWithManager:(StyleManager*)m; - -@end - -// vim:ft=objc:ts=4:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/EdgeStylesPalette.m b/tikzit-old/src/gtk/EdgeStylesPalette.m deleted file mode 100644 index 33264cf..0000000 --- a/tikzit-old/src/gtk/EdgeStylesPalette.m +++ /dev/null @@ -1,198 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "EdgeStylesPalette.h" - -#import "EdgeStylesModel.h" -#import "EdgeStyleSelector.h" -#import "EdgeStyleEditor.h" -#import "StyleManager.h" - -// {{{ Internal interfaces -// {{{ GTK+ Callbacks -static void add_style_button_cb (GtkButton *widget, EdgeStylesPalette *palette); -static void remove_style_button_cb (GtkButton *widget, EdgeStylesPalette *palette); -// }}} -// {{{ Notifications - -@interface EdgeStylesPalette (Notifications) -- (void) selectedStyleChanged:(NSNotification*)notification; -@end - -// }}} -// {{{ Private - -@interface EdgeStylesPalette (Private) -- (void) updateButtonState; -- (void) removeSelectedStyle; -- (void) addStyle; -@end - -// }}} -// }}} -// {{{ API - -@implementation EdgeStylesPalette - -@synthesize widget=palette; - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithManager:(StyleManager*)m { - self = [super init]; - - if (self) { - selector = [[EdgeStyleSelector alloc] initWithStyleManager:m]; - editor = [[EdgeStyleEditor alloc] init]; - - palette = gtk_vbox_new (FALSE, 6); - gtk_container_set_border_width (GTK_CONTAINER (palette), 6); - g_object_ref_sink (palette); - - GtkWidget *mainBox = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (palette), mainBox, FALSE, FALSE, 0); - gtk_widget_show (mainBox); - - GtkWidget *selectorScroller = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (selectorScroller), - GTK_POLICY_NEVER, - GTK_POLICY_AUTOMATIC); - GtkWidget *selectorFrame = gtk_frame_new (NULL); - gtk_container_add (GTK_CONTAINER (selectorScroller), [selector widget]); - gtk_container_add (GTK_CONTAINER (selectorFrame), selectorScroller); - gtk_box_pack_start (GTK_BOX (mainBox), selectorFrame, TRUE, TRUE, 0); - gtk_widget_show (selectorScroller); - gtk_widget_show (selectorFrame); - gtk_widget_show ([selector widget]); - - gtk_box_pack_start (GTK_BOX (mainBox), [editor widget], TRUE, TRUE, 0); - gtk_widget_show ([editor widget]); - - GtkBox *buttonBox = GTK_BOX (gtk_hbox_new(FALSE, 0)); - gtk_box_pack_start (GTK_BOX (palette), GTK_WIDGET (buttonBox), FALSE, FALSE, 0); - - GtkWidget *addStyleButton = gtk_button_new (); - gtk_widget_set_tooltip_text (addStyleButton, "Add a new style"); - GtkWidget *addIcon = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON); - gtk_container_add (GTK_CONTAINER (addStyleButton), addIcon); - gtk_box_pack_start (buttonBox, addStyleButton, FALSE, FALSE, 0); - g_signal_connect (G_OBJECT (addStyleButton), - "clicked", - G_CALLBACK (add_style_button_cb), - self); - - removeStyleButton = gtk_button_new (); - g_object_ref_sink (removeStyleButton); - gtk_widget_set_tooltip_text (removeStyleButton, "Delete selected style"); - GtkWidget *removeIcon = gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_BUTTON); - gtk_container_add (GTK_CONTAINER (removeStyleButton), removeIcon); - gtk_box_pack_start (buttonBox, removeStyleButton, FALSE, FALSE, 0); - g_signal_connect (G_OBJECT (removeStyleButton), - "clicked", - G_CALLBACK (remove_style_button_cb), - self); - - gtk_widget_show_all (GTK_WIDGET (buttonBox)); - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(selectedStyleChanged:) - name:@"SelectedStyleChanged" - object:selector]; - - [self updateButtonState]; - } - - return self; -} - -- (StyleManager*) styleManager { - return [[selector model] styleManager]; -} - -- (void) setStyleManager:(StyleManager*)m { - [[selector model] setStyleManager:m]; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - [editor release]; - [selector release]; - - g_object_unref (palette); - g_object_unref (removeStyleButton); - - [super dealloc]; -} - -@end - -// }}} -// {{{ Notifications - -@implementation EdgeStylesPalette (Notifications) -- (void) selectedStyleChanged:(NSNotification*)notification { - [editor setStyle:[selector selectedStyle]]; - [self updateButtonState]; -} -@end - -// }}} -// {{{ Private - -@implementation EdgeStylesPalette (Private) -- (void) updateButtonState { - gboolean hasStyleSelection = [selector selectedStyle] != nil; - gtk_widget_set_sensitive (removeStyleButton, hasStyleSelection); -} - -- (void) removeSelectedStyle { - EdgeStyle *style = [selector selectedStyle]; - if (style) - [[[selector model] styleManager] removeEdgeStyle:style]; -} - -- (void) addStyle { - EdgeStyle *newStyle = [EdgeStyle defaultEdgeStyleWithName:@"newstyle"]; - [[self styleManager] addEdgeStyle:newStyle]; - [selector setSelectedStyle:newStyle]; - [editor selectNameField]; -} - -@end - -// }}} -// {{{ GTK+ callbacks - -static void add_style_button_cb (GtkButton *widget, EdgeStylesPalette *palette) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [palette addStyle]; - [pool drain]; -} - -static void remove_style_button_cb (GtkButton *widget, EdgeStylesPalette *palette) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [palette removeSelectedStyle]; - [pool drain]; -} - -// }}} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/FileChooserDialog.h b/tikzit-old/src/gtk/FileChooserDialog.h deleted file mode 100644 index 80b03f5..0000000 --- a/tikzit-old/src/gtk/FileChooserDialog.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@interface FileChooserDialog: NSObject { - GtkFileChooser *dialog; -} - -+ (FileChooserDialog*) saveDialog; -+ (FileChooserDialog*) saveDialogWithParent:(GtkWindow*)parent; -+ (FileChooserDialog*) saveDialogWithTitle:(NSString*)title parent:(GtkWindow*)parent; -+ (FileChooserDialog*) openDialog; -+ (FileChooserDialog*) openDialogWithParent:(GtkWindow*)parent; -+ (FileChooserDialog*) openDialogWithTitle:(NSString*)title parent:(GtkWindow*)parent; - -- (id) initSaveDialog; -- (id) initSaveDialogWithParent:(GtkWindow*)parent; -- (id) initSaveDialogWithTitle:(NSString*)title parent:(GtkWindow*)parent; -- (id) initOpenDialog; -- (id) initOpenDialogWithParent:(GtkWindow*)parent; -- (id) initOpenDialogWithTitle:(NSString*)title parent:(GtkWindow*)parent; - -- (void) addStandardFilters; -- (void) addFileFilter:(NSString*)filterName withPattern:(NSString*)filePattern; -- (void) addFileFilter:(NSString*)filterName withPattern:(NSString*)filePattern setSelected:(BOOL)selected; - -- (void) setCurrentFolder:(NSString*)path; -- (NSString*) currentFolder; - -- (void) setSuggestedName:(NSString*)fileName; - -- (NSString*) filePath; - -- (BOOL) showDialog; - -- (void) destroy; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/FileChooserDialog.m b/tikzit-old/src/gtk/FileChooserDialog.m deleted file mode 100644 index 9498e4c..0000000 --- a/tikzit-old/src/gtk/FileChooserDialog.m +++ /dev/null @@ -1,152 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "FileChooserDialog.h" - -@implementation FileChooserDialog: NSObject - -+ (FileChooserDialog*) saveDialog { return [[[self alloc] initSaveDialog] autorelease]; } -+ (FileChooserDialog*) saveDialogWithParent:(GtkWindow*)parent - { return [[[self alloc] initSaveDialogWithParent:parent] autorelease]; } -+ (FileChooserDialog*) saveDialogWithTitle:(NSString*)title parent:(GtkWindow*)parent - { return [[[self alloc] initSaveDialogWithTitle:title parent:parent] autorelease]; } -+ (FileChooserDialog*) openDialog { return [[[self alloc] initOpenDialog] autorelease]; } -+ (FileChooserDialog*) openDialogWithParent:(GtkWindow*)parent - { return [[[self alloc] initOpenDialogWithParent:parent] autorelease]; } -+ (FileChooserDialog*) openDialogWithTitle:(NSString*)title parent:(GtkWindow*)parent - { return [[[self alloc] initOpenDialogWithTitle:title parent:parent] autorelease]; } - -- (id) initSaveDialog { return [self initSaveDialogWithParent:NULL]; } -- (id) initSaveDialogWithParent:(GtkWindow*)parent - { return [self initSaveDialogWithTitle:@"Save file" parent:parent]; } -- (id) initSaveDialogWithTitle:(NSString*)title parent:(GtkWindow*)parent { - self = [super init]; - - if (self) { - dialog = GTK_FILE_CHOOSER (gtk_file_chooser_dialog_new ( - [title UTF8String], - parent, - GTK_FILE_CHOOSER_ACTION_SAVE, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, - NULL)); - gtk_file_chooser_set_do_overwrite_confirmation (dialog, TRUE); - } - - return self; -} - -- (id) initOpenDialog { return [self initOpenDialogWithParent:NULL]; } -- (id) initOpenDialogWithParent:(GtkWindow*)parent - { return [self initOpenDialogWithTitle:@"Open file" parent:parent]; } -- (id) initOpenDialogWithTitle:(NSString*)title parent:(GtkWindow*)parent { - self = [super init]; - - if (self) { - dialog = GTK_FILE_CHOOSER (gtk_file_chooser_dialog_new ( - [title UTF8String], - parent, - GTK_FILE_CHOOSER_ACTION_OPEN, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, - NULL)); - } - - return self; -} - -- (void) addStandardFilters { - GtkFileFilter *tikzfilter = gtk_file_filter_new(); - gtk_file_filter_set_name(tikzfilter, ".tikz files"); - gtk_file_filter_add_pattern(tikzfilter, "*.tikz"); - gtk_file_chooser_add_filter(dialog, tikzfilter); - GtkFileFilter *allfilter = gtk_file_filter_new(); - gtk_file_filter_set_name(allfilter, "all files"); - gtk_file_filter_add_pattern(allfilter, "*"); - gtk_file_chooser_add_filter(dialog, allfilter); - gtk_file_chooser_set_filter(dialog, tikzfilter); -} - -- (void) addFileFilter:(NSString*)filterName withPattern:(NSString*)filePattern { - [self addFileFilter:filterName withPattern:filePattern setSelected:NO]; -} - -- (void) addFileFilter:(NSString*)filterName withPattern:(NSString*)filePattern setSelected:(BOOL)selected { - GtkFileFilter *oldFilter = selected ? NULL : gtk_file_chooser_get_filter (dialog); - GtkFileFilter *filter = gtk_file_filter_new(); - gtk_file_filter_set_name(filter, [filterName UTF8String]); - gtk_file_filter_add_pattern(filter, [filePattern UTF8String]); - gtk_file_chooser_add_filter(dialog, filter); - if (selected) { - gtk_file_chooser_set_filter (dialog, filter); - } else if (oldFilter) { - gtk_file_chooser_set_filter (dialog, oldFilter); - } -} - -- (void) setCurrentFolder:(NSString*)path { - gchar *folder = [path glibFilename]; - if (folder) { - gtk_file_chooser_set_current_folder(dialog, folder); - g_free (folder); - } -} - -- (NSString*) currentFolder { - NSString *path = nil; - gchar *folder = gtk_file_chooser_get_current_folder(dialog); - if (folder) { - path = [NSString stringWithGlibFilename:folder]; - g_free (folder); - } - return path; -} - -- (void) setSuggestedName:(NSString*)fileName { - gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), [fileName UTF8String]); -} - -- (NSString*) filePath { - NSString *path = nil; - gchar *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); - if (filename) { - path = [NSString stringWithGlibFilename:filename]; - g_free (filename); - } - return path; -} - -- (BOOL) showDialog { - return (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) ? YES : NO; -} - -- (void) destroy { - gtk_widget_destroy (GTK_WIDGET (dialog)); - dialog = NULL; -} - -- (void) dealloc { - if (dialog) { - g_warning ("Failed to destroy file chooser dialog!\n"); - gtk_widget_destroy (GTK_WIDGET (dialog)); - } - [super dealloc]; -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/GraphEditorPanel.h b/tikzit-old/src/gtk/GraphEditorPanel.h deleted file mode 100644 index 2b93259..0000000 --- a/tikzit-old/src/gtk/GraphEditorPanel.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "Tool.h" -#import - -@class GraphInputHandler; -@class GraphRenderer; -@class TikzDocument; -@class WidgetSurface; - -@protocol PreviewHandler -- (void) showPreview; -@end -@interface GraphEditorPanel : NSObject { - GraphRenderer *renderer; - WidgetSurface *surface; - GraphInputHandler *inputHandler; - id previewHandler; - id tool; -} -@property (retain) TikzDocument *document; -@property (readonly) GtkWidget *widget; -@property (retain) id activeTool; -@property (assign) id previewHandler; - -- (id) init; -- (id) initWithDocument:(TikzDocument*)document; -- (void) grabTool; -- (void) zoomInAboutPoint:(NSPoint)pos; -- (void) zoomOutAboutPoint:(NSPoint)pos; -- (void) zoomIn; -- (void) zoomOut; -- (void) zoomReset; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/GraphEditorPanel.m b/tikzit-old/src/gtk/GraphEditorPanel.m deleted file mode 100644 index dac52a0..0000000 --- a/tikzit-old/src/gtk/GraphEditorPanel.m +++ /dev/null @@ -1,240 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "GraphEditorPanel.h" - -#import "Application.h" -#import "GraphRenderer.h" -#import "HandTool.h" -#import "InputDelegate.h" -#import "TikzDocument.h" -#import "WidgetSurface.h" - -#import - -@class GraphRenderer; -@class WidgetSurface; - -static const InputMask zoomPanMask = ControlMask; - -/** - * Mostly just a multiplexer, but also handles zoom and pan - * when ctrl is held - */ -@interface GraphInputHandler : NSObject { - GraphEditorPanel *panel; - NSPoint dragOrigin; - NSPoint oldGraphOrigin; - BOOL zoomPanActive; -} -- (id) initForPanel:(GraphEditorPanel*)p; -@end - -@implementation GraphEditorPanel - -@synthesize previewHandler; - -- (id) init { - return [self initWithDocument:nil]; -} -- (id) initWithDocument:(TikzDocument*)document { - self = [super init]; - if (self) { - surface = [[WidgetSurface alloc] init]; - [surface setDefaultScale:50.0f]; - [surface setKeepCentered:YES]; - [surface setCanFocus:YES]; - renderer = [[GraphRenderer alloc] initWithSurface:surface document:document]; - - inputHandler = [[GraphInputHandler alloc] initForPanel:self]; - [surface setInputDelegate:inputHandler]; - } - return self; -} - -- (void) dealloc { - [renderer release]; - [surface release]; - [inputHandler release]; - - [super dealloc]; -} - -- (GraphRenderer*) renderer { - return renderer; -} -- (TikzDocument*) document { - return [renderer document]; -} -- (void) setDocument:(TikzDocument*)doc { - [renderer setDocument:doc]; -} -- (GtkWidget*) widget { - return [surface widget]; -} -- (id) activeTool { - return tool; -} -- (void) setActiveTool:(id)t { - if (t == tool) - return; - - [[[renderer document] pickSupport] deselectAllNodes]; - [[[renderer document] pickSupport] deselectAllEdges]; - - id oldTool = tool; - BOOL weHadTool = ([oldTool activeRenderer] == renderer); - if (weHadTool) { - [oldTool setActiveRenderer:nil]; - } - - tool = [t retain]; - [oldTool release]; - - if (weHadTool) { - [self grabTool]; - } -} - -- (BOOL) hasTool { - return [tool activeRenderer] == renderer; -} - -- (void) grabTool { - if ([tool activeRenderer] != renderer) { - [[tool activeRenderer] setPostRenderer:nil]; - [tool setActiveRenderer:renderer]; - } - [renderer setPostRenderer:tool]; -} - -- (void) zoomInAboutPoint:(NSPoint)pos { [surface zoomInAboutPoint:pos]; } -- (void) zoomOutAboutPoint:(NSPoint)pos { [surface zoomOutAboutPoint:pos]; } -- (void) zoomIn { [surface zoomIn]; } -- (void) zoomOut { [surface zoomOut]; } -- (void) zoomReset { [surface zoomReset]; } - -@end - -@implementation GraphInputHandler -- (id) initForPanel:(GraphEditorPanel*)p { - self = [super init]; - if (self) { - // NB: no retention! - panel = p; - } - return self; -} -- (id) init { - [self release]; - return nil; -} -- (void) dealloc { - [super dealloc]; -} - -// FIXME: share code with HandTool? -- (void) mousePressAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { - if (mask == zoomPanMask && button == LeftButton) { - dragOrigin = pos; - oldGraphOrigin = [[[panel renderer] transformer] origin]; - zoomPanActive = YES; - } else { - zoomPanActive = NO; - [panel grabTool]; - id tool = [panel activeTool]; - if ([tool respondsToSelector:@selector(mousePressAt:withButton:andMask:)]) { - [tool mousePressAt:pos withButton:button andMask:mask]; - } - } -} - -- (void) mouseDoubleClickAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { - [panel grabTool]; - id tool = [panel activeTool]; - if ([tool respondsToSelector:@selector(mouseDoubleClickAt:withButton:andMask:)]) { - [tool mouseDoubleClickAt:pos withButton:button andMask:mask]; - } -} - -- (void) mouseReleaseAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { - if (zoomPanActive && button == LeftButton) { - zoomPanActive = NO; - } else if ([panel hasTool]) { - id tool = [panel activeTool]; - if ([tool respondsToSelector:@selector(mouseReleaseAt:withButton:andMask:)]) { - [tool mouseReleaseAt:pos withButton:button andMask:mask]; - } - } -} - -- (void) mouseMoveTo:(NSPoint)pos withButtons:(MouseButton)buttons andMask:(InputMask)mask { - if (zoomPanActive && (buttons & LeftButton)) { - NSPoint newGraphOrigin = oldGraphOrigin; - newGraphOrigin.x += pos.x - dragOrigin.x; - newGraphOrigin.y += pos.y - dragOrigin.y; - [[[panel renderer] transformer] setOrigin:newGraphOrigin]; - [[panel renderer] invalidateGraph]; - } else if ([panel hasTool]) { - id tool = [panel activeTool]; - if ([tool respondsToSelector:@selector(mouseMoveTo:withButtons:andMask:)]) { - [tool mouseMoveTo:pos withButtons:buttons andMask:mask]; - } - } -} - -- (void) mouseScrolledAt:(NSPoint)pos inDirection:(ScrollDirection)dir withMask:(InputMask)mask { - if (mask == zoomPanMask) { - if (dir == ScrollUp) { - [panel zoomInAboutPoint:pos]; - } else if (dir == ScrollDown) { - [panel zoomOutAboutPoint:pos]; - } - } else { - id tool = [panel activeTool]; - if ([panel hasTool] && [tool respondsToSelector:@selector(mouseScrolledAt:inDirection:withMask:)]) { - [tool mouseScrolledAt:pos inDirection:dir withMask:mask]; - } - } -} - -- (void) keyPressed:(unsigned int)keyVal withMask:(InputMask)mask { - if (keyVal == GDK_KEY_space && !mask) { - return; - } - if (![app activateToolForKey:keyVal withMask:mask]) { - id tool = [panel activeTool]; - if ([panel hasTool] && [tool respondsToSelector:@selector(keyPressed:withMask:)]) { - [tool keyPressed:keyVal withMask:mask]; - } - } -} - -- (void) keyReleased:(unsigned int)keyVal withMask:(InputMask)mask { - if (keyVal == GDK_KEY_space && !mask) { - [[panel previewHandler] showPreview]; - } - if (![app activateToolForKey:keyVal withMask:mask]) { - id tool = [panel activeTool]; - if ([panel hasTool] && [tool respondsToSelector:@selector(keyReleased:withMask:)]) { - [tool keyReleased:keyVal withMask:mask]; - } - } -} -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/GraphRenderer.h b/tikzit-old/src/gtk/GraphRenderer.h deleted file mode 100644 index 730d606..0000000 --- a/tikzit-old/src/gtk/GraphRenderer.h +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -// classes -#import "Graph.h" -#import "Grid.h" -#import "PickSupport.h" -#import "TikzDocument.h" - -// protocols -#import "Surface.h" - -@interface GraphRenderer: NSObject { - TikzDocument *doc; - NSObject *surface; - Grid *grid; - NSMutableSet *highlightedNodes; - id postRenderer; -} - -@property (retain) id postRenderer; - -- (id) initWithSurface:(NSObject *)surface; -- (id) initWithSurface:(NSObject *)surface document:(TikzDocument*)document; -- (void) renderWithContext:(id)context; -- (void) invalidateRect:(NSRect)rect; -- (void) invalidateGraph; -- (void) invalidateNode:(Node*)node; -- (void) invalidateEdge:(Edge*)edge; -- (void) invalidateNodesHitBy:(NSPoint)point; -- (BOOL) point:(NSPoint)p hitsNode:(Node*)node; -- (BOOL) point:(NSPoint)p hitsEdge:(Edge*)edge withFuzz:(float)fuzz; -/** - * Finds a node at the given screen location. - * - * If there is more than one node at this point (because they overlap), - * an arbitrary one is returned. - */ -- (Node*) anyNodeAt:(NSPoint)p; -/** - * Finds an edge at the given screen location. - * - * If there is more than one edge at this point (because they overlap), - * an arbitrary one is returned. - * - * @param fuzz the fuzz for detecting edges: this will pick up - * edges that are close to the point - */ -- (Edge*) anyEdgeAt:(NSPoint)p withFuzz:(float)fuzz; - -- (id) surface; -- (Transformer*) transformer; -- (Grid*) grid; -- (PickSupport*) pickSupport; - -- (Graph*) graph; - -- (TikzDocument*) document; -- (void) setDocument:(TikzDocument*)document; - -- (BOOL) isNodeHighlighted:(Node*)node; -- (void) setNode:(Node*)node highlighted:(BOOL)h; -- (void) clearHighlightedNodes; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/GraphRenderer.m b/tikzit-old/src/gtk/GraphRenderer.m deleted file mode 100644 index b413d3e..0000000 --- a/tikzit-old/src/gtk/GraphRenderer.m +++ /dev/null @@ -1,476 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * Copyright 2010 Chris Heunen - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "GraphRenderer.h" -#import "Edge+Render.h" -#import "Node+Render.h" -#import "Shape.h" - -void graph_renderer_expose_event(GtkWidget *widget, GdkEventExpose *event); - -@interface GraphRenderer (Private) -- (enum NodeState) nodeState:(Node*)node; -- (void) renderBoundingBoxWithContext:(id)context; -- (void) nodeNeedsRefreshing:(NSNotification*)notification; -- (void) edgeNeedsRefreshing:(NSNotification*)notification; -- (void) graphNeedsRefreshing:(NSNotification*)notification; -- (void) graphChanged:(NSNotification*)notification; -- (void) nodeStylePropertyChanged:(NSNotification*)notification; -- (void) edgeStylePropertyChanged:(NSNotification*)notification; -- (void) shapeDictionaryReplaced:(NSNotification*)notification; -@end - -@implementation GraphRenderer - -- (id) initWithSurface:(NSObject *)s { - self = [super init]; - - if (self) { - surface = [s retain]; - grid = [[Grid alloc] initWithSpacing:1.0f subdivisions:4 transformer:[s transformer]]; - highlightedNodes = [[NSMutableSet alloc] initWithCapacity:10]; - [surface setRenderDelegate:self]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(nodeStylePropertyChanged:) - name:@"NodeStylePropertyChanged" - object:nil]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(edgeStylePropertyChanged:) - name:@"EdgeStylePropertyChanged" - object:nil]; - } - - return self; -} - -- (id) initWithSurface:(NSObject *)s document:(TikzDocument*)document { - self = [self initWithSurface:s]; - - if (self) { - [self setDocument:document]; - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - [doc release]; - [grid release]; - [highlightedNodes release]; - [surface release]; - - [super dealloc]; -} - -- (id) postRenderer { - return postRenderer; -} -- (void) setPostRenderer:(id)r { - if (r == postRenderer) - return; - - [r retain]; - [postRenderer release]; - postRenderer = r; - - [self invalidateGraph]; -} - -- (void) renderWithContext:(id)context onSurface:(id)s { - [self renderWithContext:context]; - if ([s hasFocus]) { - [s renderFocus]; - } -} - -- (void) renderWithContext:(id)context { - // blank surface - [context paintWithColor:WhiteRColor]; - - // draw grid - [grid renderGridInContext:context]; - - // draw edges - NSEnumerator *enumerator = [doc edgeEnumerator]; - Edge *edge; - while ((edge = [enumerator nextObject]) != nil) { - [edge renderToSurface:surface withContext:context selected:[doc isEdgeSelected:edge]]; - } - - // draw nodes - enumerator = [doc nodeEnumerator]; - Node *node; - while ((node = [enumerator nextObject]) != nil) { - [node renderToSurface:surface withContext:context state:[self nodeState:node]]; - } - - [self renderBoundingBoxWithContext:context]; - [postRenderer renderWithContext:context onSurface:surface]; -} - -- (void) invalidateGraph { - [surface invalidate]; -} - -- (void) invalidateRect:(NSRect)rect { - [surface invalidateRect:rect]; -} - -- (void) invalidateNodes:(NSSet*)nodes { - for (Node *node in nodes) { - [self invalidateNode:node]; - } -} - -- (void) invalidateEdges:(NSSet*)edges { - for (Edge *edge in edges) { - [self invalidateEdge:edge]; - } -} - -- (void) invalidateNode:(Node*)node { - if (node == nil) { - return; - } - NSRect nodeRect = [node renderBoundsWithLabelForSurface:surface]; - nodeRect = NSInsetRect (nodeRect, -2.0f, -2.0f); - [surface invalidateRect:nodeRect]; -} - -- (void) invalidateEdge:(Edge*)edge { - if (edge == nil) { - return; - } - BOOL selected = [doc isEdgeSelected:edge]; - NSRect edgeRect = [edge renderedBoundsWithTransformer:[surface transformer] whenSelected:selected]; - edgeRect = NSInsetRect (edgeRect, -2.0f, -2.0f); - [surface invalidateRect:edgeRect]; -} - -- (void) invalidateNodesHitBy:(NSPoint)point { - NSEnumerator *enumerator = [doc nodeEnumerator]; - Node *node = nil; - while ((node = [enumerator nextObject]) != nil) { - if ([self point:point hitsNode:node]) { - [self invalidateNode:node]; - } - } -} - -- (BOOL) point:(NSPoint)p hitsNode:(Node*)node { - return [node hitByPoint:p onSurface:surface]; -} - -- (BOOL) point:(NSPoint)p fuzzyHitsNode:(Node*)node { - NSRect bounds = [node renderBoundsForSurface:surface]; - return NSPointInRect(p, bounds); -} - -- (BOOL) point:(NSPoint)p hitsEdge:(Edge*)edge withFuzz:(float)fuzz { - return [edge hitByPoint:p onSurface:surface withFuzz:fuzz]; -} - -- (Node*) anyNodeAt:(NSPoint)p { - NSEnumerator *enumerator = [doc nodeEnumerator]; - Node *node; - while ((node = [enumerator nextObject]) != nil) { - if ([self point:p hitsNode:node]) { - return node; - } - } - return nil; -} - -- (Edge*) anyEdgeAt:(NSPoint)p withFuzz:(float)fuzz { - // FIXME: is there an efficient way to find the "nearest" edge - // if the fuzz is the reason we hit more than one? - NSEnumerator *enumerator = [doc edgeEnumerator]; - Edge *edge; - while ((edge = [enumerator nextObject]) != nil) { - if ([self point:p hitsEdge:edge withFuzz:fuzz]) { - return edge; - } - } - return nil; -} - -- (id) surface { - return surface; -} - -- (Transformer*) transformer { - return [surface transformer]; -} - -- (Grid*) grid { - return grid; -} - -- (PickSupport*) pickSupport { - return [doc pickSupport]; -} - -- (Graph*) graph { - return [doc graph]; -} - -- (TikzDocument*) document { - return doc; -} - -- (void) setDocument:(TikzDocument*)document { - if (doc == document) { - return; - } - - if (doc != nil) { - [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:doc]; - [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:[doc pickSupport]]; - } - - [document retain]; - [doc release]; - doc = document; - - if (doc != nil) { - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(graphNeedsRefreshing:) - name:@"GraphReplaced" object:doc]; - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(graphChanged:) - name:@"GraphChanged" object:doc]; - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(graphChanged:) - name:@"GraphBeingChanged" object:doc]; - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(graphChanged:) - name:@"GraphChangeCancelled" object:doc]; - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(nodeNeedsRefreshing:) - name:@"NodeSelected" object:[doc pickSupport]]; - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(nodeNeedsRefreshing:) - name:@"NodeDeselected" object:[doc pickSupport]]; - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(graphNeedsRefreshing:) - name:@"NodeSelectionReplaced" object:[doc pickSupport]]; - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(edgeNeedsRefreshing:) - name:@"EdgeSelected" object:[doc pickSupport]]; - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(edgeNeedsRefreshing:) - name:@"EdgeDeselected" object:[doc pickSupport]]; - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(graphNeedsRefreshing:) - name:@"EdgeSelectionReplaced" object:[doc pickSupport]]; - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(shapeDictionaryReplaced:) - name:@"ShapeDictionaryReplaced" - object:[Shape class]]; - } - [surface invalidate]; -} - -- (BOOL) isNodeHighlighted:(Node*)node { - return [highlightedNodes containsObject:node]; -} -- (void) setNode:(Node*)node highlighted:(BOOL)h { - if (h) { - if (![highlightedNodes containsObject:node]) { - [highlightedNodes addObject:node]; - [self invalidateNode:node]; - } - } else { - if ([highlightedNodes containsObject:node]) { - [highlightedNodes removeObject:node]; - [self invalidateNode:node]; - } - } -} -- (void) clearHighlightedNodes { - [self invalidateNodes:highlightedNodes]; - [highlightedNodes removeAllObjects]; -} - -@end - -@implementation GraphRenderer (Private) -- (enum NodeState) nodeState:(Node*)node { - if ([doc isNodeSelected:node]) { - return NodeSelected; - } else if ([self isNodeHighlighted:node]) { - return NodeHighlighted; - } else { - return NodeNormal; - } -} - -- (void) renderBoundingBoxWithContext:(id)context { - if ([[self graph] hasBoundingBox]) { - [context saveState]; - - NSRect bbox = [[surface transformer] rectToScreen:[[self graph] boundingBox]]; - - [context setAntialiasMode:AntialiasDisabled]; - [context setLineWidth:1.0]; - [context startPath]; - [context rect:bbox]; - [context strokePathWithColor:MakeSolidRColor (1.0, 0.7, 0.5)]; - - [context restoreState]; - } -} - -- (void) nodeNeedsRefreshing:(NSNotification*)notification { - [self invalidateNode:[[notification userInfo] objectForKey:@"node"]]; -} - -- (void) edgeNeedsRefreshing:(NSNotification*)notification { - Edge *edge = [[notification userInfo] objectForKey:@"edge"]; - NSRect edgeRect = [edge renderedBoundsWithTransformer:[surface transformer] whenSelected:YES]; - edgeRect = NSInsetRect (edgeRect, -2, -2); - [surface invalidateRect:edgeRect]; -} - -- (void) graphNeedsRefreshing:(NSNotification*)notification { - [self invalidateGraph]; -} - -- (void) invalidateBentIncidentEdgesForNode:(Node*)nd { - for (Edge *e in [[self graph] inEdgesForNode:nd]) { - if (![e isStraight]) { - [self invalidateEdge:e]; - } - } - for (Edge *e in [[self graph] outEdgesForNode:nd]) { - if (![e isStraight]) { - [self invalidateEdge:e]; - } - } -} - -- (void) graphChanged:(NSNotification*)notification { - GraphChange *change = [[notification userInfo] objectForKey:@"change"]; - switch ([change changeType]) { - case GraphAddition: - case GraphDeletion: - [self invalidateNodes:[change affectedNodes]]; - [self invalidateEdges:[change affectedEdges]]; - break; - case NodePropertyChange: - if (!NSEqualPoints ([[change oldNode] point], [[change nwNode] point])) { - // if the node has moved, it may be affecting edges - [surface invalidate]; - } else if ([[change oldNode] style] != [[change nwNode] style]) { - // change in style means that edges may touch at a different point, - // but this only matters for bent edges - [self invalidateBentIncidentEdgesForNode:[change nodeRef]]; - // invalide both old and new (old node may be larger) - [self invalidateNode:[change oldNode]]; - [self invalidateNode:[change nwNode]]; - } else { - // invalide both old and new (old node may be larger) - [self invalidateNode:[change oldNode]]; - [self invalidateNode:[change nwNode]]; - } - break; - case EdgePropertyChange: - // invalide both old and new (old bend may increase bounds) - [self invalidateEdge:[change oldEdge]]; - [self invalidateEdge:[change nwEdge]]; - [self invalidateEdge:[change edgeRef]]; - break; - case NodesPropertyChange: - { - NSEnumerator *enumerator = [[change oldNodeTable] keyEnumerator]; - Node *node = nil; - while ((node = [enumerator nextObject]) != nil) { - NSPoint oldPos = [[[change oldNodeTable] objectForKey:node] point]; - NSPoint newPos = [[[change nwNodeTable] objectForKey:node] point]; - NodeStyle *oldStyle = [[[change oldNodeTable] objectForKey:node] style]; - NodeStyle *newStyle = [[[change nwNodeTable] objectForKey:node] style]; - if (!NSEqualPoints (oldPos, newPos)) { - [surface invalidate]; - break; - } else if (oldStyle != newStyle) { - [self invalidateBentIncidentEdgesForNode:node]; - [self invalidateNode:[[change oldNodeTable] objectForKey:node]]; - [self invalidateNode:[[change nwNodeTable] objectForKey:node]]; - } else { - [self invalidateNode:[[change oldNodeTable] objectForKey:node]]; - [self invalidateNode:[[change nwNodeTable] objectForKey:node]]; - } - } - } - break; - case NodesShift: - case NodesFlip: - case BoundingBoxChange: - [surface invalidate]; - break; - default: - // unknown change - [surface invalidate]; - break; - }; -} - -- (void) nodeStylePropertyChanged:(NSNotification*)notification { - if (![@"name" isEqual:[[notification userInfo] objectForKey:@"propertyName"]]) { - BOOL affected = NO; - for (Node *node in [[self graph] nodes]) { - if ([node style] == [notification object]) - affected = YES; - } - if (affected) - [surface invalidate]; - } -} - -- (void) edgeStylePropertyChanged:(NSNotification*)notification { - if (![@"name" isEqual:[[notification userInfo] objectForKey:@"propertyName"]]) { - BOOL affected = NO; - for (Edge *edge in [[self graph] edges]) { - if ([edge style] == [notification object]) - affected = YES; - } - if (affected) - [surface invalidate]; - } -} - -- (void) shapeDictionaryReplaced:(NSNotification*)notification { - [surface invalidate]; -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/HandTool.h b/tikzit-old/src/gtk/HandTool.h deleted file mode 100644 index c96de36..0000000 --- a/tikzit-old/src/gtk/HandTool.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "Tool.h" - -@interface HandTool : NSObject { - GraphRenderer *renderer; - NSPoint dragOrigin; - NSPoint oldGraphOrigin; -} - - -+ (id) tool; -- (id) init; -@end - - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/HandTool.m b/tikzit-old/src/gtk/HandTool.m deleted file mode 100644 index c3a0fb4..0000000 --- a/tikzit-old/src/gtk/HandTool.m +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "HandTool.h" - -#import "GraphRenderer.h" -#import "TikzDocument.h" -#import "tzstockitems.h" - -@implementation HandTool -- (NSString*) name { return @"Drag"; } -- (const gchar*) stockId { return TIKZIT_STOCK_DRAG; } -- (NSString*) helpText { return @"Move the diagram to view different parts"; } -- (NSString*) shortcut { return @"m"; } -@synthesize activeRenderer=renderer; - -+ (id) tool { - return [[[self alloc] init] autorelease]; -} - -- (id) init { - return [super init]; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - [renderer release]; - - [super dealloc]; -} - -- (GtkWidget*) configurationWidget { return NULL; } - -- (void) mousePressAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { - if (button != LeftButton) - return; - - dragOrigin = pos; - oldGraphOrigin = [[renderer transformer] origin]; -} - -- (void) mouseMoveTo:(NSPoint)pos withButtons:(MouseButton)buttons andMask:(InputMask)mask { - if (!(buttons & LeftButton)) - return; - - NSPoint newGraphOrigin = oldGraphOrigin; - newGraphOrigin.x += pos.x - dragOrigin.x; - newGraphOrigin.y += pos.y - dragOrigin.y; - [[renderer transformer] setOrigin:newGraphOrigin]; - [renderer invalidateGraph]; -} - -- (void) mouseReleaseAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask {} - -- (void) renderWithContext:(id)context onSurface:(id)surface {} -- (void) loadConfiguration:(Configuration*)config {} -- (void) saveConfiguration:(Configuration*)config {} -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/InputDelegate.h b/tikzit-old/src/gtk/InputDelegate.h deleted file mode 100644 index 9f9b426..0000000 --- a/tikzit-old/src/gtk/InputDelegate.h +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" - -typedef enum { - LeftButton = 1, - MiddleButton = 2, - RightButton = 3, - Button4 = 4, - Button5 = 5 -} MouseButton; - -typedef enum { - ShiftMask = 1, - ControlMask = 2, - MetaMask = 4 -} InputMask; - -typedef enum { - ScrollUp = 1, - ScrollDown = 2, - ScrollLeft = 3, - ScrollRight = 4, -} ScrollDirection; - -@protocol InputDelegate -@optional -/** - * A mouse button was pressed. - */ -- (void) mousePressAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask; -/** - * A mouse button was released. - */ -- (void) mouseReleaseAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask; -/** - * A mouse button was double-clicked. - * - * Note that mouseDown and mouseUp events will still be delivered. - * This will be triggered between the second mouseDown and the second - * mouseUp. - */ -- (void) mouseDoubleClickAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask; -/** - * The mouse was moved - */ -- (void) mouseMoveTo:(NSPoint)pos withButtons:(MouseButton)button andMask:(InputMask)mask; -/** - * The mouse was scrolled - */ -- (void) mouseScrolledAt:(NSPoint)pos inDirection:(ScrollDirection)dir withMask:(InputMask)mask; -/** - * A key was pressed - */ -- (void) keyPressed:(unsigned int)keyVal withMask:(InputMask)mask; -/** - * A key was released - */ -- (void) keyReleased:(unsigned int)keyVal withMask:(InputMask)mask; -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/Menu.h b/tikzit-old/src/gtk/Menu.h deleted file mode 100644 index e0f78d4..0000000 --- a/tikzit-old/src/gtk/Menu.h +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class Window; -@class PickSupport; - -/** - * Manages the menu - */ -@interface Menu: NSObject { - GtkWidget *menubar; - GtkActionGroup *appActions; - GtkActionGroup *windowActions; - GtkAction *undoAction; // no ref - GtkAction *redoAction; // no ref - GtkAction *pasteAction; // no ref - GtkAction **nodeSelBasedActions; - guint nodeSelBasedActionCount; - GtkAction **edgeSelBasedActions; - guint edgeSelBasedActionCount; - GtkAction **selBasedActions; - guint selBasedActionCount; -} - -/** - * The menubar widget, to be inserted into the window - */ -@property (readonly) GtkWidget *menubar; - -/** - * Constructs the menu for @p window - * - * @param window the window that will be acted upon - */ -- (id) initForWindow:(Window*)window; - -/** - * Enables or disables the undo action - */ -- (void) setUndoActionEnabled:(BOOL)enabled; -/** - * Sets the text that describes what action will be undone - * - * @param detail a text description of the action, or nil - */ -- (void) setUndoActionDetail:(NSString*)detail; -/** - * Enables or disables the redo action - */ -- (void) setRedoActionEnabled:(BOOL)enabled; -/** - * Sets the text that describes what action will be redone - * - * @param detail a text description of the action, or nil - */ -- (void) setRedoActionDetail:(NSString*)detail; - -/** - * Gets the paste action - */ -- (GtkAction*) pasteAction; - -/** - * Enables or disables the actions that act on a selection - */ -- (void) notifySelectionChanged:(PickSupport*)pickSupport; -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/Menu.m b/tikzit-old/src/gtk/Menu.m deleted file mode 100644 index 04c9c31..0000000 --- a/tikzit-old/src/gtk/Menu.m +++ /dev/null @@ -1,737 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * Stuff stolen from glade-window.c in Glade: - * Copyright (C) 2001 Ximian, Inc. - * Copyright (C) 2007 Vincent Geddes. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "Menu.h" - -#import "Application.h" -#import "Window.h" -#import "Configuration.h" -#import "PickSupport.h" -#import "Shape.h" -#import "Tool.h" -#import "TikzDocument.h" - -#import -#ifdef _ -#undef _ -#endif -#import -#import - -#import "gtkhelpers.h" - -#import "logo.h" - -// {{{ Application actions -static void new_cb (GtkAction *action, Application *appl) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [appl newWindow]; - [pool drain]; -} - -static void refresh_shapes_cb (GtkAction *action, Application *appl) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [Shape refreshShapeDictionary]; - [pool drain]; -} - -static void show_preferences_cb (GtkAction *action, Application *appl) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [appl presentSettingsDialog]; - [pool drain]; -} - -#ifdef HAVE_POPPLER -static void show_preamble_cb (GtkAction *action, Application *appl) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [appl presentPreamblesEditor]; - [pool drain]; -} -#endif - -static void show_context_window_cb (GtkAction *action, Application *appl) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [appl presentContextWindow]; - [pool drain]; -} - -static void quit_cb (GtkAction *action, Application *appl) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [appl quit]; - [pool drain]; -} - -static void help_cb (GtkAction *action, Application *appl) { - GError *gerror = NULL; - gtk_show_uri (NULL, "http://tikzit.sourceforge.net/manual.html", GDK_CURRENT_TIME, &gerror); - if (gerror != NULL) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - logGError (gerror, @"Could not show help"); - [pool drain]; - } -} - -static void about_cb (GtkAction *action, Application *appl) { - static const gchar * const authors[] = - { "Aleks Kissinger ", - "Chris Heunen ", - "Alex Merry ", - NULL }; - - static const gchar license[] = - N_("TikZiT is free software; you can redistribute it and/or modify " - "it under the terms of the GNU General Public License as " - "published by the Free Software Foundation; either version 2 of the " - "License, or (at your option) any later version." - "\n\n" - "TikZiT is distributed in the hope that it will be useful, " - "but WITHOUT ANY WARRANTY; without even the implied warranty of " - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the " - "GNU General Public License for more details." - "\n\n" - "You should have received a copy of the GNU General Public License " - "along with TikZiT; if not, write to the Free Software " - "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, " - "MA 02110-1301, USA."); - - static const gchar copyright[] = - "Copyright \xc2\xa9 2010-2011 Aleks Kissinger, Chris Heunen and Alex Merry."; - - GdkPixbuf *logo = get_logo (LOGO_SIZE_128); - gtk_show_about_dialog (NULL, - "program-name", PACKAGE_NAME, - "logo", logo, - "authors", authors, - "translator-credits", _("translator-credits"), - "comments", _("A graph manipulation program for pgf/tikz graphs"), - "license", _(license), - "wrap-license", TRUE, - "copyright", copyright, - "version", PACKAGE_VERSION, - "website", "http://tikzit.sourceforge.net", - NULL); - g_object_unref (logo); -} - -static GtkActionEntry app_action_entries[] = { - /* - Fields: - * action name - * stock id or name of icon for action - * label for action (mark for translation with N_) - * accelerator (as understood by gtk_accelerator_parse()) - * tooltip (mark for translation with N_) - * callback - */ - { "New", GTK_STOCK_NEW, NULL, "N", - N_("Create a new graph"), G_CALLBACK (new_cb) }, - - { "RefreshShapes", NULL, N_("_Refresh shapes"), NULL, - N_(""), G_CALLBACK (refresh_shapes_cb) }, - - { "Quit", GTK_STOCK_QUIT, NULL, "Q", - N_("Quit the program"), G_CALLBACK (quit_cb) }, - - { "Tool", NULL, N_("_Tool") }, - - { "ShowPreferences", GTK_STOCK_PREFERENCES, N_("Configure TikZiT..."), NULL, - N_("Edit the TikZiT configuration"), G_CALLBACK (show_preferences_cb) }, - -#ifdef HAVE_POPPLER - { "ShowPreamble", NULL, N_("_Edit Preambles..."), NULL, - N_("Edit the preambles used to generate the preview"), G_CALLBACK (show_preamble_cb) }, -#endif - - { "ShowContextWindow", NULL, N_("_Context Window"), NULL, - N_("Show the contextual tools window"), G_CALLBACK (show_context_window_cb) }, - - /* HelpMenu */ - { "HelpManual", GTK_STOCK_HELP, N_("_Online manual"), "F1", - N_("TikZiT manual (online)"), G_CALLBACK (help_cb) }, - - { "About", GTK_STOCK_ABOUT, NULL, NULL, - N_("About this application"), G_CALLBACK (about_cb) }, -}; -static guint n_app_action_entries = G_N_ELEMENTS (app_action_entries); -// }}} -// {{{ Window actions - -static void open_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window openFile]; - [pool drain]; -} - -static void close_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window close]; - [pool drain]; -} - -static void save_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window saveActiveDocument]; - [pool drain]; -} - -static void save_as_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window saveActiveDocumentAs]; - [pool drain]; -} - -static void save_as_shape_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window saveActiveDocumentAsShape]; - [pool drain]; -} - -static void undo_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - TikzDocument *document = [window document]; - if ([document canUndo]) { - [document undo]; - } else { - g_warning ("Can't undo!\n"); - gtk_action_set_sensitive (action, FALSE); - } - - [pool drain]; -} - -static void redo_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - TikzDocument *document = [window document]; - if ([document canRedo]) { - [document redo]; - } else { - g_warning ("Can't redo!\n"); - gtk_action_set_sensitive (action, FALSE); - } - - [pool drain]; -} - -static void cut_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window selectionCutToClipboard]; - [pool drain]; -} - -static void copy_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window selectionCopyToClipboard]; - [pool drain]; -} - -static void paste_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window pasteFromClipboard]; - [pool drain]; -} - -static void delete_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [[window document] removeSelected]; - [pool drain]; -} - -static void select_all_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - TikzDocument *document = [window document]; - [[document pickSupport] selectAllNodes:[NSSet setWithArray:[[document graph] nodes]]]; - [pool drain]; -} - -static void deselect_all_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - TikzDocument *document = [window document]; - [[document pickSupport] deselectAllNodes]; - [[document pickSupport] deselectAllEdges]; - [pool drain]; -} - -static void flip_horiz_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [[window document] flipSelectedNodesHorizontally]; - [pool drain]; -} - -static void flip_vert_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [[window document] flipSelectedNodesVertically]; - [pool drain]; -} - -static void reverse_edges_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [[window document] reverseSelectedEdges]; - [pool drain]; -} - -static void bring_forward_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [[window document] bringSelectionForward]; - [pool drain]; -} - -static void send_backward_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [[window document] sendSelectionBackward]; - [pool drain]; -} - -static void bring_to_front_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [[window document] bringSelectionToFront]; - [pool drain]; -} - -static void send_to_back_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [[window document] sendSelectionToBack]; - [pool drain]; -} - -#ifdef HAVE_POPPLER -static void show_preview_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window presentPreview]; - [pool drain]; -} -#endif - -static void zoom_in_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window zoomIn]; - [pool drain]; -} - -static void zoom_out_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window zoomOut]; - [pool drain]; -} - -static void zoom_reset_cb (GtkAction *action, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window zoomReset]; - [pool drain]; -} - -static void recent_chooser_item_activated_cb (GtkRecentChooser *chooser, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - gchar *uri, *path; - GError *error = NULL; - - uri = gtk_recent_chooser_get_current_uri (chooser); - - path = g_filename_from_uri (uri, NULL, NULL); - if (error) { - g_warning ("Could not convert uri \"%s\" to a local path: %s", uri, error->message); - g_error_free (error); - return; - } - - [window openFileAtPath:[NSString stringWithGlibFilename:path]]; - - g_free (uri); - g_free (path); - - [pool drain]; -} - - -static GtkActionEntry window_action_entries[] = { - /* - Fields: - * action name - * stock id or name of icon for action - * label for action (mark for translation with N_) - * accelerator (as understood by gtk_accelerator_parse()) - * tooltip (mark for translation with N_) - * callback - */ - { "FileMenu", NULL, N_("_File") }, - { "EditMenu", NULL, N_("_Edit") }, - { "ViewMenu", NULL, N_("_View") }, - { "HelpMenu", NULL, N_("_Help") }, - - { "Arrange", NULL, N_("_Arrange") }, - { "Zoom", NULL, N_("_Zoom") }, - - { "Open", GTK_STOCK_OPEN, N_("_Open\342\200\246") ,"O", - N_("Open a graph"), G_CALLBACK (open_cb) }, - - { "Close", GTK_STOCK_CLOSE, NULL, "W", - N_("Close the current graph"), G_CALLBACK (close_cb) }, - - { "ZoomIn", GTK_STOCK_ZOOM_IN, NULL, "plus", - NULL, G_CALLBACK (zoom_in_cb) }, - - { "ZoomOut", GTK_STOCK_ZOOM_OUT, NULL, "minus", - NULL, G_CALLBACK (zoom_out_cb) }, - - { "ZoomReset", GTK_STOCK_ZOOM_100, N_("_Reset zoom"), "0", - NULL, G_CALLBACK (zoom_reset_cb) }, - - { "Save", GTK_STOCK_SAVE, NULL, "S", - N_("Save the current graph"), G_CALLBACK (save_cb) }, - - { "SaveAs", GTK_STOCK_SAVE_AS, N_("Save _As\342\200\246"), NULL, - N_("Save the current graph with a different name"), G_CALLBACK (save_as_cb) }, - - { "SaveAsShape", NULL, N_("Save As S_hape\342\200\246"), NULL, - N_("Save the current graph as a shape for use in styles"), G_CALLBACK (save_as_shape_cb) }, - - { "Undo", GTK_STOCK_UNDO, NULL, "Z", - N_("Undo the last action"), G_CALLBACK (undo_cb) }, - - { "Redo", GTK_STOCK_REDO, NULL, "Z", - N_("Redo the last action"), G_CALLBACK (redo_cb) }, - - { "Cut", GTK_STOCK_CUT, NULL, NULL, - N_("Cut the selection"), G_CALLBACK (cut_cb) }, - - { "Copy", GTK_STOCK_COPY, NULL, NULL, - N_("Copy the selection"), G_CALLBACK (copy_cb) }, - - { "Paste", GTK_STOCK_PASTE, NULL, NULL, - N_("Paste the clipboard"), G_CALLBACK (paste_cb) }, - - { "Delete", GTK_STOCK_DELETE, NULL, "Delete", - N_("Delete the selection"), G_CALLBACK (delete_cb) }, - - { "SelectAll", GTK_STOCK_SELECT_ALL, NULL, "A", - N_("Select all nodes on the graph"), G_CALLBACK (select_all_cb) }, - - { "DeselectAll", NULL, N_("D_eselect all"), "A", - N_("Deselect everything"), G_CALLBACK (deselect_all_cb) }, - - { "FlipHoriz", NULL, N_("Flip nodes _horizonally"), NULL, - N_("Flip the selected nodes horizontally"), G_CALLBACK (flip_horiz_cb) }, - - { "FlipVert", NULL, N_("Flip nodes _vertically"), NULL, - N_("Flip the selected nodes vertically"), G_CALLBACK (flip_vert_cb) }, - - { "ReverseEdges", NULL, N_("Rever_se edges"), NULL, - N_("Reverse the selected edges"), G_CALLBACK (reverse_edges_cb) }, - - { "SendToBack", NULL, N_("Send to _back"), NULL, - N_("Send the selected nodes and edges to the back of the graph"), G_CALLBACK (send_to_back_cb) }, - - { "SendBackward", NULL, N_("Send b_ackward"), NULL, - N_("Send the selected nodes and edges backward"), G_CALLBACK (send_backward_cb) }, - - { "BringForward", NULL, N_("Bring f_orward"), NULL, - N_("Bring the selected nodes and edges forward"), G_CALLBACK (bring_forward_cb) }, - - { "BringToFront", NULL, N_("Bring to _front"), NULL, - N_("Bring the selected nodes and edges to the front of the graph"), G_CALLBACK (bring_to_front_cb) }, - - /* ViewMenu */ -#ifdef HAVE_POPPLER - { "ShowPreview", NULL, N_("_Preview"), "L", - N_("See the graph as it will look when rendered in LaTeX"), G_CALLBACK (show_preview_cb) }, -#endif -}; -static guint n_window_action_entries = G_N_ELEMENTS (window_action_entries); - -// }}} -// {{{ UI XML - -static const gchar ui_info[] = -"" -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -#ifdef HAVE_POPPLER -" " -" " -#endif -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -/* -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -" " -*/ -""; - - - -// }}} -// {{{ Helper methods - -static void configure_recent_chooser (GtkRecentChooser *chooser) -{ - gtk_recent_chooser_set_local_only (chooser, TRUE); - gtk_recent_chooser_set_show_icons (chooser, FALSE); - gtk_recent_chooser_set_sort_type (chooser, GTK_RECENT_SORT_MRU); - - GtkRecentFilter *filter = gtk_recent_filter_new (); - gtk_recent_filter_add_application (filter, g_get_application_name()); - gtk_recent_chooser_set_filter (chooser, filter); -} - -static void tool_cb (GtkAction *action, id tool) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [app setActiveTool:tool]; - [pool drain]; -} - - - -// }}} -// {{{ API - -@implementation Menu - -- (id) init { - [self release]; - return nil; -} - -- (id) initForWindow:(Window*)window { - self = [super init]; - if (!self) { - return nil; - } - - GError *error = NULL; - - appActions = gtk_action_group_new ("TZApp"); - //gtk_action_group_set_translation_domain (actions, GETTEXT_PACKAGE); - gtk_action_group_add_actions (appActions, - app_action_entries, - n_app_action_entries, - app); - for (id tool in [app tools]) { - NSString *tooltip = [NSString stringWithFormat: - @"%@: %@ (%@)", [tool name], [tool helpText], [tool shortcut]]; - GtkAction *action = gtk_action_new ( - [[tool name] UTF8String], - [[tool name] UTF8String], - [tooltip UTF8String], - [tool stockId]); - gtk_action_group_add_action_with_accel ( - appActions, - action, - NULL); - g_signal_connect ( - G_OBJECT (action), - "activate", - G_CALLBACK (tool_cb), - tool); - g_object_unref (action); - } - - windowActions = gtk_action_group_new ("TZWindow"); - //gtk_action_group_set_translation_domain (windowActions, GETTEXT_PACKAGE); - - gtk_action_group_add_actions (windowActions, - window_action_entries, - n_window_action_entries, - window); - - GtkAction *action = gtk_recent_action_new ("OpenRecent", N_("Open _Recent"), NULL, NULL); - g_signal_connect (G_OBJECT (action), - "item-activated", - G_CALLBACK (recent_chooser_item_activated_cb), - window); - configure_recent_chooser (GTK_RECENT_CHOOSER (action)); - gtk_action_group_add_action_with_accel (windowActions, action, NULL); - g_object_unref (action); - - /* Save refs to actions that will need to be updated */ - undoAction = gtk_action_group_get_action (windowActions, "Undo"); - redoAction = gtk_action_group_get_action (windowActions, "Redo"); - pasteAction = gtk_action_group_get_action (windowActions, "Paste"); - - nodeSelBasedActionCount = 4; - nodeSelBasedActions = g_new (GtkAction*, nodeSelBasedActionCount); - nodeSelBasedActions[0] = gtk_action_group_get_action (windowActions, "Cut"); - nodeSelBasedActions[1] = gtk_action_group_get_action (windowActions, "Copy"); - nodeSelBasedActions[2] = gtk_action_group_get_action (windowActions, "FlipHoriz"); - nodeSelBasedActions[3] = gtk_action_group_get_action (windowActions, "FlipVert"); - edgeSelBasedActionCount = 1; - edgeSelBasedActions = g_new (GtkAction*, edgeSelBasedActionCount); - edgeSelBasedActions[0] = gtk_action_group_get_action (windowActions, "ReverseEdges"); - selBasedActionCount = 2; - selBasedActions = g_new (GtkAction*, selBasedActionCount); - selBasedActions[0] = gtk_action_group_get_action (windowActions, "Delete"); - selBasedActions[1] = gtk_action_group_get_action (windowActions, "DeselectAll"); - - - GtkUIManager *ui = gtk_ui_manager_new (); - gtk_ui_manager_insert_action_group (ui, windowActions, 0); - gtk_ui_manager_insert_action_group (ui, appActions, 1); - gtk_window_add_accel_group ([window gtkWindow], gtk_ui_manager_get_accel_group (ui)); - if (!gtk_ui_manager_add_ui_from_string (ui, ui_info, -1, &error)) - { - g_message ("Building menus failed: %s", error->message); - g_error_free (error); - g_object_unref (ui); - [self release]; - return nil; - } - guint tool_merge_id = gtk_ui_manager_new_merge_id (ui); - for (id tool in [app tools]) { - gtk_ui_manager_add_ui (ui, - tool_merge_id, - "/ui/MenuBar/EditMenu/Tool", - [[tool name] UTF8String], - [[tool name] UTF8String], - GTK_UI_MANAGER_AUTO, - FALSE); - } - menubar = gtk_ui_manager_get_widget (ui, "/MenuBar"); - g_object_ref_sink (menubar); - g_object_unref (ui); - - return self; -} - -- (void) dealloc { - g_free (nodeSelBasedActions); - g_free (edgeSelBasedActions); - g_free (selBasedActions); - g_object_unref (menubar); - g_object_unref (appActions); - g_object_unref (windowActions); - - [super dealloc]; -} - -@synthesize menubar; - -- (void) setUndoActionEnabled:(BOOL)enabled { - gtk_action_set_sensitive (undoAction, enabled); -} - -- (void) setUndoActionDetail:(NSString*)detail { - gtk_action_set_detailed_label (undoAction, "_Undo", [detail UTF8String]); -} - -- (void) setRedoActionEnabled:(BOOL)enabled { - gtk_action_set_sensitive (redoAction, enabled); -} - -- (void) setRedoActionDetail:(NSString*)detail { - gtk_action_set_detailed_label (redoAction, "_Redo", [detail UTF8String]); -} - -- (GtkAction*) pasteAction { - return pasteAction; -} - -- (void) notifySelectionChanged:(PickSupport*)pickSupport { - BOOL hasSelectedNodes = [[pickSupport selectedNodes] count] > 0; - BOOL hasSelectedEdges = [[pickSupport selectedEdges] count] > 0; - for (int i = 0; i < nodeSelBasedActionCount; ++i) { - if (nodeSelBasedActions[i]) { - gtk_action_set_sensitive (nodeSelBasedActions[i], hasSelectedNodes); - } - } - for (int i = 0; i < edgeSelBasedActionCount; ++i) { - if (edgeSelBasedActions[i]) { - gtk_action_set_sensitive (edgeSelBasedActions[i], hasSelectedEdges); - } - } - for (int i = 0; i < selBasedActionCount; ++i) { - if (selBasedActions[i]) { - gtk_action_set_sensitive (selBasedActions[i], hasSelectedNodes || hasSelectedEdges); - } - } -} - -@end - -// }}} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/NSError+Glib.h b/tikzit-old/src/gtk/NSError+Glib.h deleted file mode 100644 index 137977e..0000000 --- a/tikzit-old/src/gtk/NSError+Glib.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import -#import - -@interface NSError(Glib) -+ (id) errorWithGError:(GError*)gerror; -@end - -void GErrorToNSError(GError *errorIn, NSError **errorOut); -void logGError (GError *error, NSString *message); - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/NSError+Glib.m b/tikzit-old/src/gtk/NSError+Glib.m deleted file mode 100644 index f466d9e..0000000 --- a/tikzit-old/src/gtk/NSError+Glib.m +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "NSError+Glib.h" -#import "TZFoundation.h" - -@implementation NSError(Glib) -+ (id) errorWithGError:(GError*)gerror { - if (!gerror) - return nil; - - NSString *message = [NSString stringWithUTF8String:gerror->message]; - NSString *domain = [NSString stringWithUTF8String:g_quark_to_string(gerror->domain)]; - - NSMutableDictionary *errorDetail = [NSMutableDictionary dictionaryWithObject:message - forKey:NSLocalizedDescriptionKey]; - return [self errorWithDomain:domain code:gerror->code userInfo:errorDetail]; -} -@end - -void GErrorToNSError(GError *errorIn, NSError **errorOut) -{ - if (errorOut && errorIn) { - *errorOut = [NSError errorWithGError:errorIn]; - } -} - -void logGError (GError *error, NSString *message) { - if (message == nil) { - NSLog (@"%s", error->message); - } else { - NSLog (@"%@: %s", message, error->message); - } -} - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/NSFileManager+Glib.h b/tikzit-old/src/gtk/NSFileManager+Glib.h deleted file mode 100644 index cb49fcb..0000000 --- a/tikzit-old/src/gtk/NSFileManager+Glib.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import - -@interface NSFileManager(Glib) -/** - * Creates a directory in the system temp directory - */ -- (NSString*) createTempDirectoryWithError:(NSError**)error; -/** - * Creates a directory in the system temp directory - */ -- (NSString*) createTempDirectory; -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/NSFileManager+Glib.m b/tikzit-old/src/gtk/NSFileManager+Glib.m deleted file mode 100644 index b3e9de6..0000000 --- a/tikzit-old/src/gtk/NSFileManager+Glib.m +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "NSFileManager+Glib.h" -#import "TZFoundation.h" -#import "mkdtemp.h" - -@implementation NSFileManager(Glib) - -- (NSString*) createTempDirectoryWithError:(NSError**)error { - NSString *result = nil; -#if GLIB_CHECK_VERSION (2, 30, 0) - GError *gerror = NULL; - gchar *dir = g_dir_make_tmp ("tikzitXXXXXX", &gerror); - GErrorToNSError (gerror, error); - if (dir) - result = [NSString stringWithGlibFilename:dir]; - g_free (dir); -#else -//#if (!GLIB_CHECK_VERSION (2, 26, 0)) -#define g_mkdtemp mkdtemp -//#endif - gchar *dir = g_build_filename (g_get_tmp_dir(), "tikzitXXXXXX", NULL); - gchar *rdir = g_mkdtemp (dir); - if (rdir) { - result = [NSString stringWithGlibFilename:dir]; - } else if (error) { - *error = [NSError errorWithLibcError:errno]; - } - g_free (dir); -#endif - return result; -} - -- (NSString*) createTempDirectory { - return [self createTempDirectoryWithError:NULL]; -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/NSString+Glib.h b/tikzit-old/src/gtk/NSString+Glib.h deleted file mode 100644 index ac59833..0000000 --- a/tikzit-old/src/gtk/NSString+Glib.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import -#import - -@interface NSString(Glib) -/** - * Initialise a string with a string in the GLib filename encoding - */ -- (id) initWithGlibFilename:(const gchar *)filename; -/** - * Create a string from a string in the GLib filename encoding - */ -+ (id) stringWithGlibFilename:(const gchar *)filename; -/** - * Get a copy of the string in GLib filename encoding. - * - * This will need to be freed with g_free. - */ -- (gchar*)glibFilename; -/** - * Get a copy of the string as a GLib URI - * - * This will need to be freed with g_free. - */ -- (gchar*)glibUriWithError:(NSError**)error; -/** - * Get a copy of the string as a GLib URI - * - * This will need to be freed with g_free. - */ -- (gchar*)glibUri; -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/NSString+Glib.m b/tikzit-old/src/gtk/NSString+Glib.m deleted file mode 100644 index b6dc765..0000000 --- a/tikzit-old/src/gtk/NSString+Glib.m +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "NSString+Glib.h" -#import "TZFoundation.h" - -@implementation NSString(Glib) -+ (id) stringWithGlibFilename:(const gchar *)filename { - return [[[self alloc] initWithGlibFilename:filename] autorelease]; -} - -- (id) initWithGlibFilename:(const gchar *)filename { - if (self == nil) { - return nil; - } - - if (filename == NULL) { - [self release]; - return nil; - } - - GError *error = NULL; - gchar *utf8file = g_filename_to_utf8 (filename, -1, NULL, NULL, &error); - if (utf8file == NULL) { - if (error) - logGError (error, @"Failed to convert a GLib filename to UTF8"); - [self release]; - return nil; - } - - self = [self initWithUTF8String:utf8file]; - g_free (utf8file); - - return self; -} - -- (gchar*)glibFilenameWithError:(NSError**)error { - GError *gerror = NULL; - gchar *result = g_filename_from_utf8 ([self UTF8String], -1, NULL, NULL, &gerror); - GErrorToNSError (gerror, error); - if (gerror) { - logGError (gerror, @"Failed to convert a UTF8 string to a GLib filename"); - } - return result; -} - -- (gchar*)glibFilename { - return [self glibFilenameWithError:NULL]; -} - -- (gchar*)glibUriWithError:(NSError**)error { - gchar *filepath; - gchar *uri; - NSError *cause = nil; - - filepath = [self glibFilenameWithError:&cause]; - if (!filepath) { - if (error) { - NSString *message = [NSString stringWithFormat:@"Could not convert \"%@\" to the GLib filename encoding", self]; - *error = [NSError errorWithMessage:message code:TZ_ERR_OTHER cause:cause]; - } - return NULL; - } - - GError *gerror = NULL; - GError **gerrorptr = error ? &gerror : NULL; - uri = g_filename_to_uri (filepath, NULL, gerrorptr); - if (!uri && error) { - NSString *message = [NSString stringWithFormat:@"Could not convert \"%@\" to a GLib URI", self]; - *error = [NSError errorWithMessage:message code:TZ_ERR_BADFORMAT cause:[NSError errorWithGError:gerror]]; - } - g_free (filepath); - return uri; -} - -- (gchar*)glibUri { - return [self glibUriWithError:NULL]; -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/Node+Render.h b/tikzit-old/src/gtk/Node+Render.h deleted file mode 100644 index 60d2573..0000000 --- a/tikzit-old/src/gtk/Node+Render.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "Node.h" -#import "RenderContext.h" -#import "Surface.h" - -enum NodeState { - NodeNormal, - NodeSelected, - NodeHighlighted -}; - -@interface Node(Render) - -- (Transformer*) shapeTransformerForSurface:(id)surface; -// the total rendered bounds, excluding label -- (NSRect) renderBoundsForSurface:(id)surface; -- (NSRect) renderBoundsWithLabelForSurface:(id)surface; -- (NSString*) renderedLabel; -- (NSSize) renderedLabelSizeInContext:(id)context; -- (void) renderLabelToSurface:(id)surface withContext:(id)context; -- (void) renderLabelAt:(NSPoint)point withContext:(id)context; -- (void) renderToSurface:(id)surface withContext:(id)context state:(enum NodeState)state; -- (BOOL) hitByPoint:(NSPoint)p onSurface:(id)surface; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/Node+Render.m b/tikzit-old/src/gtk/Node+Render.m deleted file mode 100644 index 907d818..0000000 --- a/tikzit-old/src/gtk/Node+Render.m +++ /dev/null @@ -1,188 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * Copyright 2010 Chris Heunen - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "Node+Render.h" -#import "Shape.h" -#import "Shape+Render.h" -#import "ShapeNames.h" - -#define MAX_LABEL_LENGTH 10 -#define LABEL_PADDING_X 2 -#define LABEL_PADDING_Y 2 - -@implementation Node (Render) - -- (Shape*) shapeToRender { - if (style) { - return [Shape shapeForName:[style shapeName]]; - } else { - return [Shape shapeForName:SHAPE_CIRCLE]; - } -} - -- (Transformer*) shapeTransformerForSurface:(id)surface { - return [self shapeTransformerFromTransformer:[surface transformer]]; -} - -- (NSRect) renderBoundsUsingShapeTransform:(Transformer*)shapeTrans { - float strokeThickness = style ? [style strokeThickness] : [NodeStyle defaultStrokeThickness]; - NSRect screenBounds = [shapeTrans rectToScreen:[[self shapeToRender] boundingRect]]; - screenBounds = NSInsetRect(screenBounds, -strokeThickness, -strokeThickness); - return screenBounds; -} - -- (NSRect) renderBoundsForSurface:(id)surface { - return [self renderBoundsUsingShapeTransform:[self shapeTransformerForSurface:surface]]; -} - -- (NSRect) renderBoundsWithLabelForSurface:(id)surface { - NSRect nodeBounds = [self renderBoundsForSurface:surface]; - NSRect labelRect = NSZeroRect; - if (![label isEqual:@""]) { - id cr = [surface createRenderContext]; - labelRect.size = [self renderedLabelSizeInContext:cr]; - NSPoint nodePos = [[surface transformer] toScreen:point]; - labelRect.origin.x = nodePos.x - (labelRect.size.width / 2); - labelRect.origin.y = nodePos.y - (labelRect.size.height / 2); - } - return NSUnionRect(nodeBounds, labelRect); -} - -- (RColor) strokeColor { - if (style) { - return [[style strokeColorRGB] rColor]; - } else { - return MakeRColor (0.4, 0.4, 0.7, 0.8); - } -} - -- (RColor) fillColor { - if (style) { - return [[style fillColorRGB] rColor]; - } else { - return MakeRColor (0.4, 0.4, 0.7, 0.3); - } -} - -- (NSString*) renderedLabel { - NSString *r_label = [label stringByExpandingLatexConstants]; - if ([r_label length] > MAX_LABEL_LENGTH) { - r_label = [[[r_label substringToIndex:MAX_LABEL_LENGTH-1] stringByTrimmingSpaces] stringByAppendingString:@"..."]; - } else { - r_label = [r_label stringByTrimmingSpaces]; - } - return r_label; -} - -- (NSSize) renderedLabelSizeInContext:(id)context { - NSSize result = {0, 0}; - if (![label isEqual:@""]) { - NSString *r_label = [self renderedLabel]; - - id layout = [context layoutText:r_label withSize:9]; - - result = [layout size]; - result.width += LABEL_PADDING_X; - result.height += LABEL_PADDING_Y; - } - return result; -} - -- (void) renderLabelToSurface:(id )surface withContext:(id)context { - [self renderLabelAt:[[surface transformer] toScreen:point] withContext:context]; -} - -- (void) renderLabelAt:(NSPoint)p withContext:(id)context { - // draw latex code overlayed on node - if (![label isEqual:@""]) { - [context saveState]; - - NSString *r_label = [self renderedLabel]; - id layout = [context layoutText:r_label withSize:9]; - - NSSize labelSize = [layout size]; - - NSRect textBounds = NSMakeRect (p.x - labelSize.width/2, - p.y - labelSize.height/2, - labelSize.width, - labelSize.height); - NSRect backRect = NSInsetRect (textBounds, -LABEL_PADDING_X, -LABEL_PADDING_Y); - - [context startPath]; - [context setLineWidth:1.0]; - [context rect:backRect]; - RColor fColor = MakeRColor (1.0, 1.0, 0.5, 0.7); - RColor sColor = MakeRColor (0.5, 0.0, 0.0, 0.7); - [context strokePathWithColor:sColor andFillWithColor:fColor]; - - [layout showTextAt:textBounds.origin withColor:BlackRColor]; - - [context restoreState]; - } -} - -- (void) renderToSurface:(id )surface withContext:(id)context state:(enum NodeState)state { - Transformer *shapeTrans = [self shapeTransformerForSurface:surface]; - float strokeThickness = style ? [style strokeThickness] : [NodeStyle defaultStrokeThickness]; - - [context saveState]; - - [[self shapeToRender] drawPathWithTransform:shapeTrans andContext:context]; - - [context setLineWidth:strokeThickness]; - if (!style) { - [context setLineDash:3.0]; - } - [context strokePathWithColor:[self strokeColor] andFillWithColor:[self fillColor]]; - - if (state != NodeNormal) { - [context setLineWidth:strokeThickness + 4.0]; - [context setLineDash:0.0]; - float alpha = 0.0f; - if (state == NodeSelected) - alpha = 0.5f; - else if (state == NodeHighlighted) - alpha = 0.25f; - RColor selectionColor = MakeSolidRColor(0.61f, 0.735f, 1.0f); - - [[self shapeToRender] drawPathWithTransform:shapeTrans andContext:context]; - [context strokePathWithColor:selectionColor andFillWithColor:selectionColor usingAlpha:alpha]; - } - - [context restoreState]; - [self renderLabelToSurface:surface withContext:context]; -} - -- (BOOL) hitByPoint:(NSPoint)p onSurface:(id)surface { - Transformer *shapeTrans = [self shapeTransformerForSurface:surface]; - - NSRect screenBounds = [self renderBoundsUsingShapeTransform:shapeTrans]; - if (!NSPointInRect(p, screenBounds)) { - return NO; - } - - float strokeThickness = style ? [style strokeThickness] : [NodeStyle defaultStrokeThickness]; - id ctx = [surface createRenderContext]; - [ctx setLineWidth:strokeThickness]; - [[self shapeToRender] drawPathWithTransform:shapeTrans andContext:ctx]; - return [ctx strokeIncludesPoint:p] || [ctx fillIncludesPoint:p]; -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/NodeStyle+Gtk.h b/tikzit-old/src/gtk/NodeStyle+Gtk.h deleted file mode 100644 index 4fa5edd..0000000 --- a/tikzit-old/src/gtk/NodeStyle+Gtk.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "NodeStyle.h" -#import - -@interface NodeStyle (Gtk) - -- (GdkColor) strokeColor; -- (void) setStrokeColor:(GdkColor)color; -- (GdkColor) fillColor; -- (void) setFillColor:(GdkColor)color; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/NodeStyle+Gtk.m b/tikzit-old/src/gtk/NodeStyle+Gtk.m deleted file mode 100644 index 1954def..0000000 --- a/tikzit-old/src/gtk/NodeStyle+Gtk.m +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "NodeStyle+Gtk.h" -#import "ColorRGB+Gtk.h" - -@implementation NodeStyle (Gtk) - -- (GdkColor) strokeColor { - return [[self strokeColorRGB] gdkColor]; -} - -- (void) setStrokeColor:(GdkColor)color { - [self setStrokeColorRGB:[ColorRGB colorWithGdkColor:color]]; -} - -- (GdkColor) fillColor { - return [[self fillColorRGB] gdkColor]; -} - -- (void) setFillColor:(GdkColor)color { - [self setFillColorRGB:[ColorRGB colorWithGdkColor:color]]; -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/NodeStyle+Render.h b/tikzit-old/src/gtk/NodeStyle+Render.h deleted file mode 100644 index 00edd27..0000000 --- a/tikzit-old/src/gtk/NodeStyle+Render.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "NodeStyle.h" -#import "RenderContext.h" -#import "Surface.h" - -@interface NodeStyle (Render) - -- (void) renderToSurface:(id)surface withContext:(id)context at:(NSPoint)p; -- (BOOL) hitByPoint:(NSPoint)p onSurface:(id)surface; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/NodeStyle+Storage.h b/tikzit-old/src/gtk/NodeStyle+Storage.h deleted file mode 100644 index 7649414..0000000 --- a/tikzit-old/src/gtk/NodeStyle+Storage.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "NodeStyle.h" -#import "Configuration.h" - -@interface NodeStyle (Storage) - -- (id) initFromConfigurationGroup:(NSString*)groupName config:(Configuration*)configFile; -- (void) storeToConfigurationGroup:(NSString*)groupName config:(Configuration*)configFile; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/NodeStyle+Storage.m b/tikzit-old/src/gtk/NodeStyle+Storage.m deleted file mode 100644 index 088b062..0000000 --- a/tikzit-old/src/gtk/NodeStyle+Storage.m +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * Copyright 2010 Chris Heunen - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "NodeStyle+Storage.h" -#import "ColorRGB+IntegerListStorage.h" - -@implementation NodeStyle (Storage) - -- (id) initFromConfigurationGroup:(NSString*)groupName config:(Configuration*)configFile { - self = [self init]; - - if (self) { - [self setName:[configFile stringEntry:@"Name" inGroup:groupName withDefault:name]]; - [self setCategory:[configFile stringEntry:@"Category" inGroup:groupName withDefault:category]]; - [self setShapeName:[configFile stringEntry:@"ShapeName" inGroup:groupName withDefault:shapeName]]; - [self setScale:[configFile doubleEntry:@"Scale" inGroup:groupName withDefault:scale]]; - [self setStrokeThickness:[configFile integerEntry:@"StrokeThickness" - inGroup:groupName - withDefault:strokeThickness]]; - [self setStrokeColorRGB: - [ColorRGB colorFromValueList: - [configFile integerListEntry:@"StrokeColor" - inGroup:groupName - withDefault:[strokeColorRGB valueList]]]]; - [self setFillColorRGB: - [ColorRGB colorFromValueList: - [configFile integerListEntry:@"FillColor" - inGroup:groupName - withDefault:[fillColorRGB valueList]]]]; - } - - return self; -} - -- (void) storeToConfigurationGroup:(NSString*)groupName config:(Configuration*)configFile { - [configFile setStringEntry:@"Name" inGroup:groupName value:[self name]]; - [configFile setStringEntry:@"Category" inGroup:groupName value:[self category]]; - [configFile setStringEntry:@"ShapeName" inGroup:groupName value:[self shapeName]]; - [configFile setDoubleEntry:@"Scale" inGroup:groupName value:[self scale]]; - [configFile setIntegerEntry:@"StrokeThickness" inGroup:groupName value:[self strokeThickness]]; - [configFile setIntegerListEntry:@"StrokeColor" inGroup:groupName value:[[self strokeColorRGB] valueList]]; - [configFile setIntegerListEntry:@"FillColor" inGroup:groupName value:[[self fillColorRGB] valueList]]; -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/NodeStyleEditor.h b/tikzit-old/src/gtk/NodeStyleEditor.h deleted file mode 100644 index b45c992..0000000 --- a/tikzit-old/src/gtk/NodeStyleEditor.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class NodeStyle; - -@interface NodeStyleEditor: NSObject { - NodeStyle *style; - GtkTable *table; - GtkEntry *nameEdit; - GtkComboBox *shapeNameCombo; - GtkColorButton *strokeColorButton; - GtkWidget *makeStrokeTexSafeButton; - GtkColorButton *fillColorButton; - GtkWidget *makeFillTexSafeButton; - GtkAdjustment *scaleAdj; - BOOL blockSignals; -} - -@property (retain) NodeStyle *style; -@property (readonly) GtkWidget *widget; - -- (id) init; - -- (void) selectNameField; - -@end - -// vim:ft=objc:ts=4:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/NodeStyleEditor.m b/tikzit-old/src/gtk/NodeStyleEditor.m deleted file mode 100644 index fcf4147..0000000 --- a/tikzit-old/src/gtk/NodeStyleEditor.m +++ /dev/null @@ -1,477 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "NodeStyleEditor.h" -#import "NodeStyle.h" -#import "NodeStyle+Gtk.h" -#import "Shape.h" - -static const guint row_count = 5; - -// {{{ Internal interfaces -// {{{ GTK+ Callbacks -static void style_name_edit_changed_cb (GtkEditable *widget, NodeStyleEditor *editor); -static void style_shape_combo_changed_cb (GtkComboBox *widget, NodeStyleEditor *editor); -static void stroke_color_changed_cb (GtkColorButton *widget, NodeStyleEditor *editor); -static void fill_color_changed_cb (GtkColorButton *widget, NodeStyleEditor *editor); -static void make_stroke_safe_button_clicked_cb (GtkButton *widget, NodeStyleEditor *editor); -static void make_fill_safe_button_clicked_cb (GtkButton *widget, NodeStyleEditor *editor); -static void scale_adjustment_changed_cb (GtkAdjustment *widget, NodeStyleEditor *editor); -// }}} -// {{{ Notifications - -@interface NodeStyleEditor (Notifications) -- (void) shapeDictionaryReplaced:(NSNotification*)n; -- (void) nameChangedTo:(NSString*)value; -- (void) shapeNameChangedTo:(NSString*)value; -- (void) strokeColorChangedTo:(GdkColor)value; -- (void) makeStrokeColorTexSafe; -- (void) fillColorChangedTo:(GdkColor)value; -- (void) makeFillColorTexSafe; -- (void) scaleChangedTo:(double)value; -@end - -// }}} -// {{{ Private - -@interface NodeStyleEditor (Private) -- (void) loadShapeNames; -- (void) setActiveShapeName:(NSString*)name; -@end - -// }}} -// }}} -// {{{ API - -@implementation NodeStyleEditor - -- (void) _addWidget:(GtkWidget*)w withLabel:(gchar *)label atRow:(guint)row { - NSAssert(row < row_count, @"row_count is wrong!"); - - GtkWidget *l = gtk_label_new (label); - gtk_misc_set_alignment (GTK_MISC (l), 0, 0.5); - gtk_widget_show (l); - gtk_widget_show (w); - - gtk_table_attach (table, l, - 0, 1, row, row+1, // l, r, t, b - GTK_FILL, // x opts - GTK_FILL | GTK_EXPAND, // y opts - 5, // x padding - 0); // y padding - - gtk_table_attach (table, w, - 1, 2, row, row+1, // l, r, t, b - GTK_FILL | GTK_EXPAND, // x opts - GTK_FILL | GTK_EXPAND, // y opts - 0, // x padding - 0); // y padding -} - -- (GtkWidget*) _createMakeColorTexSafeButton:(NSString*)type { - GtkWidget *b = gtk_button_new (); - GtkWidget *icon = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_BUTTON); - gtk_widget_show (icon); - gtk_container_add (GTK_CONTAINER (b), icon); - NSString *ttip = [NSString stringWithFormat:@"The %@ colour is not a predefined TeX colour.\nClick here to choose the nearest TeX-safe colour.", type]; - gtk_widget_set_tooltip_text (b, [ttip UTF8String]); - return b; -} - -- (id) init { - self = [super init]; - - if (self != nil) { - style = nil; - table = GTK_TABLE (gtk_table_new (row_count, 2, FALSE)); - gtk_table_set_col_spacings (table, 6); - gtk_table_set_row_spacings (table, 6); - gtk_widget_set_sensitive (GTK_WIDGET (table), FALSE); - blockSignals = NO; - - /** - * Name - */ - nameEdit = GTK_ENTRY (gtk_entry_new ()); - g_object_ref_sink (nameEdit); - [self _addWidget:GTK_WIDGET (nameEdit) - withLabel:"Name" - atRow:0]; - g_signal_connect (G_OBJECT (nameEdit), - "changed", - G_CALLBACK (style_name_edit_changed_cb), - self); - - - /** - * Shape - */ - GtkListStore *store = gtk_list_store_new (1, G_TYPE_STRING); - shapeNameCombo = GTK_COMBO_BOX (gtk_combo_box_new_with_model (GTK_TREE_MODEL (store))); - GtkCellRenderer *cellRend = gtk_cell_renderer_text_new (); - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (shapeNameCombo), - cellRend, - TRUE); - gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (shapeNameCombo), cellRend, "text", 0); - g_object_ref_sink (shapeNameCombo); - [self _addWidget:GTK_WIDGET (shapeNameCombo) - withLabel:"Shape" - atRow:1]; - g_signal_connect (G_OBJECT (shapeNameCombo), - "changed", - G_CALLBACK (style_shape_combo_changed_cb), - self); - - - /** - * Stroke colour - */ - GtkWidget *strokeBox = gtk_hbox_new (FALSE, 0); - [self _addWidget:strokeBox - withLabel:"Stroke colour" - atRow:2]; - strokeColorButton = GTK_COLOR_BUTTON (gtk_color_button_new ()); - g_object_ref_sink (strokeColorButton); - gtk_widget_show (GTK_WIDGET (strokeColorButton)); - gtk_box_pack_start (GTK_BOX (strokeBox), GTK_WIDGET (strokeColorButton), - FALSE, FALSE, 0); - makeStrokeTexSafeButton = [self _createMakeColorTexSafeButton:@"stroke"]; - g_object_ref_sink (makeStrokeTexSafeButton); - gtk_box_pack_start (GTK_BOX (strokeBox), makeStrokeTexSafeButton, - FALSE, FALSE, 0); - g_signal_connect (G_OBJECT (strokeColorButton), - "color-set", - G_CALLBACK (stroke_color_changed_cb), - self); - g_signal_connect (G_OBJECT (makeStrokeTexSafeButton), - "clicked", - G_CALLBACK (make_stroke_safe_button_clicked_cb), - self); - - - /** - * Fill colour - */ - GtkWidget *fillBox = gtk_hbox_new (FALSE, 0); - [self _addWidget:fillBox - withLabel:"Fill colour" - atRow:3]; - fillColorButton = GTK_COLOR_BUTTON (gtk_color_button_new ()); - g_object_ref_sink (fillColorButton); - gtk_widget_show (GTK_WIDGET (fillColorButton)); - gtk_box_pack_start (GTK_BOX (fillBox), GTK_WIDGET (fillColorButton), - FALSE, FALSE, 0); - makeFillTexSafeButton = [self _createMakeColorTexSafeButton:@"fill"]; - g_object_ref_sink (makeFillTexSafeButton); - gtk_box_pack_start (GTK_BOX (fillBox), makeFillTexSafeButton, - FALSE, FALSE, 0); - g_signal_connect (G_OBJECT (fillColorButton), - "color-set", - G_CALLBACK (fill_color_changed_cb), - self); - g_signal_connect (G_OBJECT (makeFillTexSafeButton), - "clicked", - G_CALLBACK (make_fill_safe_button_clicked_cb), - self); - - - /** - * Scale - */ - scaleAdj = GTK_ADJUSTMENT (gtk_adjustment_new ( - 1.0, // value - 0.0, // lower - 50.0, // upper - 0.20, // step - 1.0, // page - 0.0)); // (irrelevant) - g_object_ref_sink (scaleAdj); - GtkWidget *scaleSpin = gtk_spin_button_new (scaleAdj, 0.0, 2); - [self _addWidget:scaleSpin - withLabel:"Scale" - atRow:4]; - g_signal_connect (G_OBJECT (scaleAdj), - "value-changed", - G_CALLBACK (scale_adjustment_changed_cb), - self); - - [self loadShapeNames]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(shapeDictionaryReplaced:) - name:@"ShapeDictionaryReplaced" - object:[Shape class]]; - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - g_object_unref (nameEdit); - g_object_unref (shapeNameCombo); - g_object_unref (strokeColorButton); - g_object_unref (makeStrokeTexSafeButton); - g_object_unref (fillColorButton); - g_object_unref (makeFillTexSafeButton); - g_object_unref (scaleAdj); - g_object_unref (table); - [style release]; - - [super dealloc]; -} - -- (NodeStyle*) style { - return style; -} - -- (void) setStyle:(NodeStyle*)s { - blockSignals = YES; - NodeStyle *oldStyle = style; - style = [s retain]; - - if (style != nil) { - gtk_widget_set_sensitive (GTK_WIDGET (table), TRUE); - - gtk_entry_set_text(nameEdit, [[style name] UTF8String]); - - [self setActiveShapeName:[style shapeName]]; - - GdkColor c = [style strokeColor]; - gtk_color_button_set_color(strokeColorButton, &c); - - gtk_widget_set_visible (makeStrokeTexSafeButton, ([[style strokeColorRGB] name] == nil)); - - c = [style fillColor]; - gtk_color_button_set_color(fillColorButton, &c); - - gtk_widget_set_visible (makeFillTexSafeButton, ([[style fillColorRGB] name] == nil)); - - gtk_adjustment_set_value(scaleAdj, [style scale]); - } else { - gtk_entry_set_text(nameEdit, ""); - [self setActiveShapeName:nil]; - gtk_widget_set_visible (makeStrokeTexSafeButton, FALSE); - gtk_widget_set_visible (makeFillTexSafeButton, FALSE); - gtk_adjustment_set_value(scaleAdj, 1.0); - gtk_widget_set_sensitive (GTK_WIDGET (table), FALSE); - } - - [oldStyle release]; - blockSignals = NO; -} - -- (GtkWidget*) widget { - return GTK_WIDGET (table); -} - -- (void) selectNameField { - gtk_widget_grab_focus (GTK_WIDGET (nameEdit)); - gtk_editable_select_region (GTK_EDITABLE (nameEdit), 0, -1); -} - -@end - -// }}} -// {{{ Notifications - -@implementation NodeStyleEditor (Notifications) -- (void) shapeDictionaryReplaced:(NSNotification*)n { - blockSignals = YES; - - [self loadShapeNames]; - [self setActiveShapeName:[style shapeName]]; - - blockSignals = NO; -} - -- (void) nameChangedTo:(NSString*)value { - [style setName:value]; -} - -- (void) shapeNameChangedTo:(NSString*)value { - [style setShapeName:value]; -} - -- (void) strokeColorChangedTo:(GdkColor)value { - [style setStrokeColor:value]; - gtk_widget_set_visible (makeStrokeTexSafeButton, - [[style strokeColorRGB] name] == nil); -} - -- (void) makeStrokeColorTexSafe { - if (style != nil) { - [[style strokeColorRGB] setToClosestHashed]; - GdkColor color = [style strokeColor]; - gtk_color_button_set_color(strokeColorButton, &color); - gtk_widget_set_visible (makeStrokeTexSafeButton, FALSE); - } -} - -- (void) fillColorChangedTo:(GdkColor)value { - [style setFillColor:value]; - gtk_widget_set_visible (makeFillTexSafeButton, - [[style fillColorRGB] name] == nil); -} - -- (void) makeFillColorTexSafe { - if (style != nil) { - [[style fillColorRGB] setToClosestHashed]; - GdkColor color = [style fillColor]; - gtk_color_button_set_color(fillColorButton, &color); - gtk_widget_set_visible (makeFillTexSafeButton, FALSE); - } -} - -- (void) scaleChangedTo:(double)value { - [style setScale:value]; -} -@end - -// }}} -// {{{ Private - -@implementation NodeStyleEditor (Private) -- (BOOL) signalsBlocked { return blockSignals; } - -- (void) loadShapeNames { - blockSignals = YES; - - gtk_combo_box_set_active (shapeNameCombo, -1); - - GtkListStore *list = GTK_LIST_STORE (gtk_combo_box_get_model (shapeNameCombo)); - gtk_list_store_clear (list); - - NSEnumerator *en = [[Shape shapeDictionary] keyEnumerator]; - NSString *shapeName; - GtkTreeIter iter; - while ((shapeName = [en nextObject]) != nil) { - gtk_list_store_append (list, &iter); - gtk_list_store_set (list, &iter, 0, [shapeName UTF8String], -1); - } - - blockSignals = NO; -} - -- (void) setActiveShapeName:(NSString*)name { - if (name == nil) { - gtk_combo_box_set_active (shapeNameCombo, -1); - return; - } - const gchar *shapeName = [name UTF8String]; - - GtkTreeModel *model = gtk_combo_box_get_model (shapeNameCombo); - GtkTreeIter iter; - if (gtk_tree_model_get_iter_first (model, &iter)) { - do { - gchar *rowShapeName; - gtk_tree_model_get (model, &iter, 0, &rowShapeName, -1); - if (g_strcmp0 (shapeName, rowShapeName) == 0) { - gtk_combo_box_set_active_iter (shapeNameCombo, &iter); - g_free (rowShapeName); - return; - } - g_free (rowShapeName); - } while (gtk_tree_model_iter_next (model, &iter)); - } -} -@end - -// }}} -// {{{ GTK+ callbacks - -static void style_name_edit_changed_cb (GtkEditable *widget, NodeStyleEditor *editor) { - if ([editor signalsBlocked]) - return; - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - const gchar *contents = gtk_entry_get_text (GTK_ENTRY (widget)); - [editor nameChangedTo:[NSString stringWithUTF8String:contents]]; - - [pool drain]; -} - -static void style_shape_combo_changed_cb (GtkComboBox *widget, NodeStyleEditor *editor) { - if ([editor signalsBlocked]) - return; - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - GtkTreeIter iter; - gtk_combo_box_get_active_iter (widget, &iter); - gchar *shapeName = NULL; - gtk_tree_model_get (gtk_combo_box_get_model (widget), &iter, 0, &shapeName, -1); - [editor shapeNameChangedTo:[NSString stringWithUTF8String:shapeName]]; - g_free (shapeName); - - [pool drain]; -} - -static void stroke_color_changed_cb (GtkColorButton *widget, NodeStyleEditor *editor) { - if ([editor signalsBlocked]) - return; - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - GdkColor color; - gtk_color_button_get_color (widget, &color); - [editor strokeColorChangedTo:color]; - - [pool drain]; -} - -static void fill_color_changed_cb (GtkColorButton *widget, NodeStyleEditor *editor) { - if ([editor signalsBlocked]) - return; - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - GdkColor color; - gtk_color_button_get_color (widget, &color); - [editor fillColorChangedTo:color]; - - [pool drain]; -} - -static void make_stroke_safe_button_clicked_cb (GtkButton *widget, NodeStyleEditor *editor) { - if ([editor signalsBlocked]) - return; - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor makeStrokeColorTexSafe]; - [pool drain]; -} - -static void make_fill_safe_button_clicked_cb (GtkButton *widget, NodeStyleEditor *editor) { - if ([editor signalsBlocked]) - return; - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor makeFillColorTexSafe]; - [pool drain]; -} - -static void scale_adjustment_changed_cb (GtkAdjustment *adj, NodeStyleEditor *editor) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor scaleChangedTo:gtk_adjustment_get_value (adj)]; - [pool drain]; -} - -// }}} - -// vim:ft=objc:ts=4:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/NodeStyleSelector.h b/tikzit-old/src/gtk/NodeStyleSelector.h deleted file mode 100644 index a699dc8..0000000 --- a/tikzit-old/src/gtk/NodeStyleSelector.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class NodeStyle; -@class NodeStylesModel; -@class StyleManager; - -@interface NodeStyleSelector: NSObject { - NodeStylesModel *model; - GtkIconView *view; -} - -/*! - @property widget - @brief The GTK widget - */ -@property (readonly) GtkWidget *widget; - -/*! - @property model - @brief The model to use. - */ -@property (retain) NodeStylesModel *model; - -/*! - @property selectedStyle - @brief The selected style. - - When this changes, a SelectedStyleChanged notification will be posted - */ -@property (assign) NodeStyle *selectedStyle; - -/*! - * Initialise with a new model for the given style manager - */ -- (id) initWithStyleManager:(StyleManager*)manager; -/*! - * Initialise with the given model - */ -- (id) initWithModel:(NodeStylesModel*)model; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/NodeStyleSelector.m b/tikzit-old/src/gtk/NodeStyleSelector.m deleted file mode 100644 index 14cdc75..0000000 --- a/tikzit-old/src/gtk/NodeStyleSelector.m +++ /dev/null @@ -1,135 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "NodeStyleSelector.h" - -#import "NodeStylesModel.h" - -// {{{ Internal interfaces -static void selection_changed_cb (GtkIconView *widget, NodeStyleSelector *mgr); -// }}} -// {{{ API - -@implementation NodeStyleSelector - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithStyleManager:(StyleManager*)m { - return [self initWithModel:[NodeStylesModel modelWithStyleManager:m]]; -} -- (id) initWithModel:(NodeStylesModel*)m { - self = [super init]; - - if (self) { - model = [m retain]; - - view = GTK_ICON_VIEW (gtk_icon_view_new ()); - g_object_ref_sink (view); - - gtk_icon_view_set_model (view, [model model]); - gtk_icon_view_set_pixbuf_column (view, NODE_STYLES_ICON_COL); - gtk_icon_view_set_tooltip_column (view, NODE_STYLES_NAME_COL); - gtk_icon_view_set_selection_mode (view, GTK_SELECTION_SINGLE); - - g_signal_connect (G_OBJECT (view), - "selection-changed", - G_CALLBACK (selection_changed_cb), - self); - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - g_object_unref (view); - [model release]; - - [super dealloc]; -} - -- (NodeStylesModel*) model { - return model; -} - -- (void) setModel:(NodeStylesModel*)m { - if (m == model) - return; - - NodeStylesModel *oldModel = model; - model = [m retain]; - gtk_icon_view_set_model (view, [model model]); - [oldModel release]; -} - -- (GtkWidget*) widget { - return GTK_WIDGET (view); -} - -- (NodeStyle*) selectedStyle { - GList *list = gtk_icon_view_get_selected_items (view); - if (!list) { - return nil; - } - if (list->next != NULL) { - NSLog(@"Multiple selected items in NodeStyleSelector!"); - } - - GtkTreePath *path = (GtkTreePath*) list->data; - NodeStyle *style = [model styleFromPath:path]; - - g_list_foreach (list, (GFunc)gtk_tree_path_free, NULL); - g_list_free (list); - - return style; -} - -- (void) setSelectedStyle:(NodeStyle*)style { - if (style == nil) { - gtk_icon_view_unselect_all (view); - return; - } - - GtkTreePath *path = [model pathFromStyle:style]; - if (path) { - gtk_icon_view_unselect_all (view); - gtk_icon_view_select_path (view, path); - gtk_tree_path_free (path); - } -} - -@end - -// }}} -// {{{ GTK+ callbacks - -static void selection_changed_cb (GtkIconView *view, NodeStyleSelector *mgr) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - [[NSNotificationCenter defaultCenter] - postNotificationName:@"SelectedStyleChanged" - object:mgr]; - - [pool drain]; -} -// }}} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/NodeStylesModel.h b/tikzit-old/src/gtk/NodeStylesModel.h deleted file mode 100644 index a048560..0000000 --- a/tikzit-old/src/gtk/NodeStylesModel.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class NodeStyle; -@class StyleManager; - -enum { - NODE_STYLES_NAME_COL = 0, - NODE_STYLES_ICON_COL, - NODE_STYLES_PTR_COL, - NODE_STYLES_N_COLS -}; - -@interface NodeStylesModel: NSObject { - GtkListStore *store; - StyleManager *styleManager; -} - -/*! - @property model - @brief The GTK+ tree model - */ -@property (readonly) GtkTreeModel *model; - -/*! - @property manager - @brief The StyleManager to use. - */ -@property (retain) StyleManager *styleManager; - -/*! - * Initialise with the given style manager - */ -- (id) initWithStyleManager:(StyleManager*)m; - -+ (id) modelWithStyleManager:(StyleManager*)m; - -- (NodeStyle*) styleFromPath:(GtkTreePath*)path; -- (GtkTreePath*) pathFromStyle:(NodeStyle*)style; -- (NodeStyle*) styleFromIter:(GtkTreeIter*)iter; -- (GtkTreeIter*) iterFromStyle:(NodeStyle*)style; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/NodeStylesModel.m b/tikzit-old/src/gtk/NodeStylesModel.m deleted file mode 100644 index 3cc5771..0000000 --- a/tikzit-old/src/gtk/NodeStylesModel.m +++ /dev/null @@ -1,381 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "NodeStylesModel.h" - -#import "CairoRenderContext.h" -#import "NodeStyle.h" -#import "Shape.h" -#import "Shape+Render.h" -#import "ShapeNames.h" -#import "StyleManager.h" - -#import "gtkhelpers.h" - -#import - -// {{{ Internal interfaces - -@interface NodeStylesModel (Notifications) -- (void) nodeStylesReplaced:(NSNotification*)notification; -- (void) nodeStyleAdded:(NSNotification*)notification; -- (void) nodeStyleRemoved:(NSNotification*)notification; -- (void) shapeDictionaryReplaced:(NSNotification*)n; -- (void) observeValueForKeyPath:(NSString*)keyPath - ofObject:(id)object - change:(NSDictionary*)change - context:(void*)context; -@end - -@interface NodeStylesModel (Private) -- (cairo_surface_t*) createNodeIconSurface; -- (GdkPixbuf*) pixbufOfNodeInStyle:(NodeStyle*)style; -- (GdkPixbuf*) pixbufOfNodeInStyle:(NodeStyle*)style usingSurface:(cairo_surface_t*)surface; -- (void) addNodeStyle:(NodeStyle*)style; -- (void) addNodeStyle:(NodeStyle*)style usingSurface:(cairo_surface_t*)surface; -- (void) observeNodeStyle:(NodeStyle*)style; -- (void) stopObservingNodeStyle:(NodeStyle*)style; -- (void) clearNodeStylesModel; -- (void) reloadNodeStyles; -@end - -// }}} -// {{{ API - -@implementation NodeStylesModel - -+ (id) modelWithStyleManager:(StyleManager*)m { - return [[[self alloc] initWithStyleManager:m] autorelease]; -} - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithStyleManager:(StyleManager*)m { - self = [super init]; - - if (self) { - store = gtk_list_store_new (NODE_STYLES_N_COLS, - G_TYPE_STRING, - GDK_TYPE_PIXBUF, - G_TYPE_POINTER); - g_object_ref_sink (store); - - [self setStyleManager:m]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(shapeDictionaryReplaced:) - name:@"ShapeDictionaryReplaced" - object:[Shape class]]; - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - [self clearNodeStylesModel]; - g_object_unref (store); - [styleManager release]; - - [super dealloc]; -} - -- (StyleManager*) styleManager { - return styleManager; -} - -- (void) setStyleManager:(StyleManager*)m { - if (m == nil) { - [NSException raise:NSInvalidArgumentException format:@"Style manager cannot be nil"]; - } - [m retain]; - - [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:styleManager]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(nodeStylesReplaced:) - name:@"NodeStylesReplaced" - object:m]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(nodeStyleAdded:) - name:@"NodeStyleAdded" - object:m]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(nodeStyleRemoved:) - name:@"NodeStyleRemoved" - object:m]; - - [styleManager release]; - styleManager = m; - - [self reloadNodeStyles]; -} - -- (GtkTreeModel*) model { - return GTK_TREE_MODEL (store); -} - -- (NodeStyle*) styleFromPath:(GtkTreePath*)path { - GtkTreeIter iter; - gtk_tree_model_get_iter (GTK_TREE_MODEL (store), &iter, path); - NodeStyle *style = nil; - gtk_tree_model_get (GTK_TREE_MODEL (store), &iter, NODE_STYLES_PTR_COL, &style, -1); - return style; -} - -- (GtkTreePath*) pathFromStyle:(NodeStyle*)style { - GtkTreeModel *m = GTK_TREE_MODEL (store); - GtkTreeIter row; - if (gtk_tree_model_get_iter_first (m, &row)) { - do { - NodeStyle *rowStyle; - gtk_tree_model_get (m, &row, NODE_STYLES_PTR_COL, &rowStyle, -1); - if (style == rowStyle) { - return gtk_tree_model_get_path (m, &row); - } - } while (gtk_tree_model_iter_next (m, &row)); - } - return NULL; -} - -- (NodeStyle*) styleFromIter:(GtkTreeIter*)iter { - NodeStyle *style = nil; - gtk_tree_model_get (GTK_TREE_MODEL (store), iter, NODE_STYLES_PTR_COL, &style, -1); - return style; -} - -- (GtkTreeIter*) iterFromStyle:(NodeStyle*)style { - GtkTreeModel *m = GTK_TREE_MODEL (store); - GtkTreeIter row; - if (gtk_tree_model_get_iter_first (m, &row)) { - do { - NodeStyle *rowStyle; - gtk_tree_model_get (m, &row, NODE_STYLES_PTR_COL, &rowStyle, -1); - if (style == rowStyle) { - return gtk_tree_iter_copy (&row); - } - } while (gtk_tree_model_iter_next (m, &row)); - } - return NULL; -} -@end - -// }}} -// {{{ Notifications - -@implementation NodeStylesModel (Notifications) - -- (void) nodeStylesReplaced:(NSNotification*)notification { - [self reloadNodeStyles]; -} - -- (void) nodeStyleAdded:(NSNotification*)notification { - [self addNodeStyle:[[notification userInfo] objectForKey:@"style"]]; -} - -- (void) nodeStyleRemoved:(NSNotification*)notification { - NodeStyle *style = [[notification userInfo] objectForKey:@"style"]; - - GtkTreeModel *model = GTK_TREE_MODEL (store); - GtkTreeIter row; - if (gtk_tree_model_get_iter_first (model, &row)) { - do { - NodeStyle *rowStyle; - gtk_tree_model_get (model, &row, NODE_STYLES_PTR_COL, &rowStyle, -1); - if (style == rowStyle) { - gtk_list_store_remove (store, &row); - [self stopObservingNodeStyle:rowStyle]; - [rowStyle release]; - return; - } - } while (gtk_tree_model_iter_next (model, &row)); - } -} - -- (void) observeValueForKeyPath:(NSString*)keyPath - ofObject:(id)object - change:(NSDictionary*)change - context:(void*)context -{ - if ([object class] == [NodeStyle class]) { - NodeStyle *style = object; - - GtkTreeModel *model = GTK_TREE_MODEL (store); - GtkTreeIter row; - if (gtk_tree_model_get_iter_first (model, &row)) { - do { - NodeStyle *rowStyle; - gtk_tree_model_get (model, &row, NODE_STYLES_PTR_COL, &rowStyle, -1); - if (style == rowStyle) { - if ([@"name" isEqual:keyPath]) { - gtk_list_store_set (store, &row, NODE_STYLES_NAME_COL, [[style name] UTF8String], -1); - } else { - GdkPixbuf *pixbuf = [self pixbufOfNodeInStyle:style]; - gtk_list_store_set (store, &row, NODE_STYLES_ICON_COL, pixbuf, -1); - g_object_unref (pixbuf); - } - } - } while (gtk_tree_model_iter_next (model, &row)); - } - } -} - -- (void) shapeDictionaryReplaced:(NSNotification*)n { - [self reloadNodeStyles]; -} -@end - -// }}} -// {{{ Private - -@implementation NodeStylesModel (Private) -- (cairo_surface_t*) createNodeIconSurface { - return cairo_image_surface_create (CAIRO_FORMAT_ARGB32, 24, 24); -} - -- (GdkPixbuf*) pixbufOfNodeInStyle:(NodeStyle*)style { - cairo_surface_t *surface = [self createNodeIconSurface]; - GdkPixbuf *pixbuf = [self pixbufOfNodeInStyle:style usingSurface:surface]; - cairo_surface_destroy (surface); - return pixbuf; -} - -- (GdkPixbuf*) pixbufOfNodeInStyle:(NodeStyle*)style usingSurface:(cairo_surface_t*)surface { - Shape *shape = [Shape shapeForName:[style shapeName]]; - - int width = cairo_image_surface_get_width (surface); - int height = cairo_image_surface_get_height (surface); - NSRect pixbufBounds = NSMakeRect(0.0, 0.0, width, height); - const CGFloat lineWidth = [style strokeThickness]; - Transformer *shapeTrans = [Transformer transformerToFit:[shape boundingRect] - intoScreenRect:NSInsetRect(pixbufBounds, lineWidth, lineWidth) - flippedAboutXAxis:YES]; - if ([style scale] < 1.0) - [shapeTrans setScale:[style scale] * [shapeTrans scale]]; - - CairoRenderContext *context = [[CairoRenderContext alloc] initForSurface:surface]; - [context clearSurface]; - [shape drawPathWithTransform:shapeTrans andContext:context]; - [context setLineWidth:lineWidth]; - [context strokePathWithColor:[[style strokeColorRGB] rColor] - andFillWithColor:[[style fillColorRGB] rColor]]; - [context release]; - - return pixbuf_get_from_surface (surface); -} - -- (void) addNodeStyle:(NodeStyle*)style usingSurface:(cairo_surface_t*)surface { - GtkTreeIter iter; - gtk_list_store_append (store, &iter); - - GdkPixbuf *pixbuf = [self pixbufOfNodeInStyle:style usingSurface:surface]; - gtk_list_store_set (store, &iter, - NODE_STYLES_NAME_COL, [[style name] UTF8String], - NODE_STYLES_ICON_COL, pixbuf, - NODE_STYLES_PTR_COL, (gpointer)[style retain], - -1); - g_object_unref (pixbuf); - [self observeNodeStyle:style]; -} - -- (void) addNodeStyle:(NodeStyle*)style { - cairo_surface_t *surface = [self createNodeIconSurface]; - [self addNodeStyle:style usingSurface:surface]; - cairo_surface_destroy (surface); -} - -- (void) observeNodeStyle:(NodeStyle*)style { - [style addObserver:self - forKeyPath:@"name" - options:NSKeyValueObservingOptionNew - context:NULL]; - [style addObserver:self - forKeyPath:@"strokeThickness" - options:0 - context:NULL]; - [style addObserver:self - forKeyPath:@"strokeColorRGB.red" - options:0 - context:NULL]; - [style addObserver:self - forKeyPath:@"strokeColorRGB.green" - options:0 - context:NULL]; - [style addObserver:self - forKeyPath:@"strokeColorRGB.blue" - options:0 - context:NULL]; - [style addObserver:self - forKeyPath:@"fillColorRGB.red" - options:0 - context:NULL]; - [style addObserver:self - forKeyPath:@"fillColorRGB.green" - options:0 - context:NULL]; - [style addObserver:self - forKeyPath:@"fillColorRGB.blue" - options:0 - context:NULL]; - [style addObserver:self - forKeyPath:@"shapeName" - options:0 - context:NULL]; -} - -- (void) stopObservingNodeStyle:(NodeStyle*)style { - [style removeObserver:self forKeyPath:@"name"]; - [style removeObserver:self forKeyPath:@"strokeThickness"]; - [style removeObserver:self forKeyPath:@"strokeColorRGB.red"]; - [style removeObserver:self forKeyPath:@"strokeColorRGB.green"]; - [style removeObserver:self forKeyPath:@"strokeColorRGB.blue"]; - [style removeObserver:self forKeyPath:@"fillColorRGB.red"]; - [style removeObserver:self forKeyPath:@"fillColorRGB.green"]; - [style removeObserver:self forKeyPath:@"fillColorRGB.blue"]; - [style removeObserver:self forKeyPath:@"shapeName"]; -} - -- (void) clearNodeStylesModel { - GtkTreeModel *model = GTK_TREE_MODEL (store); - GtkTreeIter row; - if (gtk_tree_model_get_iter_first (model, &row)) { - do { - NodeStyle *rowStyle; - gtk_tree_model_get (model, &row, NODE_STYLES_PTR_COL, &rowStyle, -1); - [self stopObservingNodeStyle:rowStyle]; - [rowStyle release]; - } while (gtk_tree_model_iter_next (model, &row)); - } - gtk_list_store_clear (store); -} - -- (void) reloadNodeStyles { - [self clearNodeStylesModel]; - cairo_surface_t *surface = [self createNodeIconSurface]; - for (NodeStyle *style in [styleManager nodeStyles]) { - [self addNodeStyle:style usingSurface:surface]; - } - cairo_surface_destroy (surface); -} -@end - -// }}} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/NodeStylesPalette.h b/tikzit-old/src/gtk/NodeStylesPalette.h deleted file mode 100644 index ac712ea..0000000 --- a/tikzit-old/src/gtk/NodeStylesPalette.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class StyleManager; -@class NodeStyleSelector; -@class NodeStyleEditor; - -@interface NodeStylesPalette: NSObject { - NodeStyleSelector *selector; - NodeStyleEditor *editor; - - GtkWidget *palette; - - GtkWidget *removeStyleButton; - GtkWidget *applyStyleButton; - GtkWidget *clearStyleButton; -} - -@property (retain) StyleManager *styleManager; -@property (readonly) GtkWidget *widget; - -- (id) initWithManager:(StyleManager*)m; - -@end - -// vim:ft=objc:ts=4:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/NodeStylesPalette.m b/tikzit-old/src/gtk/NodeStylesPalette.m deleted file mode 100644 index e28edbb..0000000 --- a/tikzit-old/src/gtk/NodeStylesPalette.m +++ /dev/null @@ -1,197 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "NodeStylesPalette.h" - -#import "NodeStyleSelector.h" -#import "NodeStyleEditor.h" -#import "NodeStylesModel.h" -#import "StyleManager.h" - -// {{{ Internal interfaces -// {{{ GTK+ Callbacks -static void add_style_button_cb (GtkButton *widget, NodeStylesPalette *palette); -static void remove_style_button_cb (GtkButton *widget, NodeStylesPalette *palette); -// }}} -// {{{ Notifications - -@interface NodeStylesPalette (Notifications) -- (void) selectedStyleChanged:(NSNotification*)notification; -@end - -// }}} -// {{{ Private - -@interface NodeStylesPalette (Private) -- (void) updateButtonState; -- (void) removeSelectedStyle; -- (void) addStyle; -@end - -// }}} -// }}} -// {{{ API - -@implementation NodeStylesPalette - -@synthesize widget=palette; - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithManager:(StyleManager*)m { - self = [super init]; - - if (self) { - selector = [[NodeStyleSelector alloc] initWithStyleManager:m]; - editor = [[NodeStyleEditor alloc] init]; - - palette = gtk_vbox_new (FALSE, 6); - gtk_container_set_border_width (GTK_CONTAINER (palette), 6); - g_object_ref_sink (palette); - - GtkWidget *mainBox = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (palette), mainBox, FALSE, FALSE, 0); - gtk_widget_show (mainBox); - - GtkWidget *selectorScroller = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (selectorScroller), - GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); - GtkWidget *selectorFrame = gtk_frame_new (NULL); - gtk_container_add (GTK_CONTAINER (selectorScroller), [selector widget]); - gtk_container_add (GTK_CONTAINER (selectorFrame), selectorScroller); - gtk_box_pack_start (GTK_BOX (mainBox), selectorFrame, TRUE, TRUE, 0); - gtk_widget_show (selectorScroller); - gtk_widget_show (selectorFrame); - gtk_widget_show ([selector widget]); - - gtk_box_pack_start (GTK_BOX (mainBox), [editor widget], TRUE, TRUE, 0); - gtk_widget_show ([editor widget]); - - GtkBox *buttonBox = GTK_BOX (gtk_hbox_new(FALSE, 0)); - gtk_box_pack_start (GTK_BOX (palette), GTK_WIDGET (buttonBox), FALSE, FALSE, 0); - - GtkWidget *addStyleButton = gtk_button_new (); - gtk_widget_set_tooltip_text (addStyleButton, "Add a new style"); - GtkWidget *addIcon = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON); - gtk_container_add (GTK_CONTAINER (addStyleButton), addIcon); - gtk_box_pack_start (buttonBox, addStyleButton, FALSE, FALSE, 0); - g_signal_connect (G_OBJECT (addStyleButton), - "clicked", - G_CALLBACK (add_style_button_cb), - self); - - removeStyleButton = gtk_button_new (); - g_object_ref_sink (removeStyleButton); - gtk_widget_set_tooltip_text (removeStyleButton, "Delete selected style"); - GtkWidget *removeIcon = gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_BUTTON); - gtk_container_add (GTK_CONTAINER (removeStyleButton), removeIcon); - gtk_box_pack_start (buttonBox, removeStyleButton, FALSE, FALSE, 0); - g_signal_connect (G_OBJECT (removeStyleButton), - "clicked", - G_CALLBACK (remove_style_button_cb), - self); - - gtk_widget_show_all (GTK_WIDGET (buttonBox)); - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(selectedStyleChanged:) - name:@"SelectedStyleChanged" - object:selector]; - - [self updateButtonState]; - } - - return self; -} - -- (StyleManager*) styleManager { - return [[selector model] styleManager]; -} - -- (void) setStyleManager:(StyleManager*)m { - [[selector model] setStyleManager:m]; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - [editor release]; - [selector release]; - g_object_unref (palette); - g_object_unref (removeStyleButton); - - [super dealloc]; -} - -@end - -// }}} -// {{{ Notifications - -@implementation NodeStylesPalette (Notifications) -- (void) selectedStyleChanged:(NSNotification*)notification { - [editor setStyle:[selector selectedStyle]]; - [self updateButtonState]; -} -@end - -// }}} -// {{{ Private - -@implementation NodeStylesPalette (Private) -- (void) updateButtonState { - gboolean hasStyleSelection = [selector selectedStyle] != nil; - - gtk_widget_set_sensitive (removeStyleButton, hasStyleSelection); -} - -- (void) removeSelectedStyle { - NodeStyle *style = [selector selectedStyle]; - if (style) - [[[selector model] styleManager] removeNodeStyle:style]; -} - -- (void) addStyle { - NodeStyle *newStyle = [NodeStyle defaultNodeStyleWithName:@"newstyle"]; - [[self styleManager] addNodeStyle:newStyle]; - [selector setSelectedStyle:newStyle]; - [editor selectNameField]; -} - -@end - -// }}} -// {{{ GTK+ callbacks - -static void add_style_button_cb (GtkButton *widget, NodeStylesPalette *palette) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [palette addStyle]; - [pool drain]; -} - -static void remove_style_button_cb (GtkButton *widget, NodeStylesPalette *palette) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [palette removeSelectedStyle]; - [pool drain]; -} - -// }}} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/PreambleEditor.h b/tikzit-old/src/gtk/PreambleEditor.h deleted file mode 100644 index f181446..0000000 --- a/tikzit-old/src/gtk/PreambleEditor.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class Preambles; - -@interface PreambleEditor: NSObject { - Preambles *preambles; - - // we don't keep any refs, as we control - // the top window - GtkWindow *parentWindow; - GtkWindow *window; - GtkListStore *preambleListStore; - GtkTreeView *preambleSelector; - GtkTextView *preambleView; - BOOL blockSignals; - BOOL adding; -} - -- (id) initWithPreambles:(Preambles*)p; - -- (void) setParentWindow:(GtkWindow*)parent; - -- (Preambles*) preambles; - -- (void) present; -- (void) show; -- (void) hide; -- (BOOL) isVisible; -- (void) setVisible:(BOOL)visible; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/PreambleEditor.m b/tikzit-old/src/gtk/PreambleEditor.m deleted file mode 100644 index d1f72ee..0000000 --- a/tikzit-old/src/gtk/PreambleEditor.m +++ /dev/null @@ -1,568 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "PreambleEditor.h" - -#import "Application.h" -#import "Preambles.h" -#import - -enum { - NAME_COLUMN, - IS_CUSTOM_COLUMN, - N_COLUMNS -}; - -// {{{ Internal interfaces -// {{{ Signals -static gboolean window_delete_event_cb (GtkWidget *widget, - GdkEvent *event, - PreambleEditor *editor); -static gboolean window_focus_out_event_cb (GtkWidget *widget, - GdkEvent *event, - PreambleEditor *editor); -static void close_button_clicked_cb (GtkButton *widget, PreambleEditor *editor); -static void add_button_clicked_cb (GtkButton *widget, PreambleEditor *editor); -static void remove_button_clicked_cb (GtkButton *widget, PreambleEditor *editor); -/* -static void undo_button_clicked_cb (GtkButton *widget, PreambleEditor *editor); -static void redo_button_clicked_cb (GtkButton *widget, PreambleEditor *editor); -*/ -static void preamble_name_edited_cb (GtkCellRendererText *renderer, - gchar *path, - gchar *new_text, - PreambleEditor *editor); -static void preamble_selection_changed_cb (GtkTreeSelection *treeselection, - PreambleEditor *editor); -// }}} - -@interface PreambleEditor (Private) -- (void) loadUi; -- (void) save; -- (void) revert; -- (void) update; -- (void) fillListStore; -- (BOOL) isDefaultPreambleSelected; -- (NSString*) selectedPreambleName; -- (void) addPreamble; -- (void) deletePreamble; -- (void) renamePreambleAtPath:(gchar*)path to:(gchar*)newValue; -- (void) nodeStylePropertyChanged:(NSNotification*)notification; -- (void) edgeStylePropertyChanged:(NSNotification*)notification; -@end - -// }}} -// {{{ API - -@implementation PreambleEditor - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithPreambles:(Preambles*)p { - self = [super init]; - - if (self) { - preambles = [p retain]; - parentWindow = NULL; - window = NULL; - preambleView = NULL; - preambleSelector = NULL; - blockSignals = NO; - adding = NO; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(nodeStylePropertyChanged:) - name:@"NodeStylePropertyChanged" - object:nil]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(edgeStylePropertyChanged:) - name:@"EdgeStylePropertyChanged" - object:nil]; - } - - return self; -} - -- (Preambles*) preambles { - return preambles; -} - -- (void) setParentWindow:(GtkWindow*)parent { - GtkWindow *oldParent = parentWindow; - - if (parentWindow) - g_object_ref (parentWindow); - parentWindow = parent; - if (oldParent) - g_object_unref (oldParent); - - if (window) { - gtk_window_set_transient_for (window, parentWindow); - } -} - -- (void) present { - [self loadUi]; - gtk_window_present (GTK_WINDOW (window)); - [self revert]; -} - -- (void) show { - [self loadUi]; - gtk_widget_show (GTK_WIDGET (window)); - [self revert]; -} - -- (void) hide { - if (!window) { - return; - } - [self save]; - gtk_widget_hide (GTK_WIDGET (window)); -} - -- (BOOL) isVisible { - if (!window) { - return NO; - } - gboolean visible; - g_object_get (G_OBJECT (window), "visible", &visible, NULL); - return visible ? YES : NO; -} - -- (void) setVisible:(BOOL)visible { - if (visible) { - [self show]; - } else { - [self hide]; - } -} - -- (void) dealloc { - [preambles release]; - preambles = nil; - if (window) { - gtk_widget_destroy (GTK_WIDGET (window)); - window = NULL; - } - if (parentWindow) { - g_object_ref (parentWindow); - } - - [super dealloc]; -} - -@end - -// }}} -// {{{ Private - -@implementation PreambleEditor (Private) -- (GtkWidget*) createPreambleList { - preambleListStore = gtk_list_store_new (N_COLUMNS, G_TYPE_STRING, G_TYPE_BOOLEAN); - preambleSelector = GTK_TREE_VIEW (gtk_tree_view_new_with_model ( - GTK_TREE_MODEL (preambleListStore))); - gtk_widget_set_size_request (GTK_WIDGET (preambleSelector), 150, -1); - gtk_tree_view_set_headers_visible (preambleSelector, FALSE); - - GtkCellRenderer *renderer; - GtkTreeViewColumn *column; - - renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes ("Preamble", - renderer, - "text", NAME_COLUMN, - "editable", IS_CUSTOM_COLUMN, - NULL); - gtk_tree_view_append_column (preambleSelector, column); - g_signal_connect (G_OBJECT (renderer), - "edited", - G_CALLBACK (preamble_name_edited_cb), - self); - - GtkWidget *listScroller = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (listScroller), - GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); - gtk_container_add (GTK_CONTAINER (listScroller), - GTK_WIDGET (preambleSelector)); - - [self fillListStore]; - - GtkTreeSelection *sel = gtk_tree_view_get_selection (preambleSelector); - gtk_tree_selection_set_mode (sel, GTK_SELECTION_BROWSE); - g_signal_connect (G_OBJECT (sel), - "changed", - G_CALLBACK (preamble_selection_changed_cb), - self); - - return listScroller; -} - -- (void) loadUi { - if (window) { - return; - } - - window = GTK_WINDOW (gtk_window_new (GTK_WINDOW_TOPLEVEL)); - gtk_window_set_title (window, "Preamble editor"); - gtk_window_set_position (window, GTK_WIN_POS_CENTER_ON_PARENT); - gtk_window_set_default_size (window, 600, 400); - gtk_window_set_type_hint (window, GDK_WINDOW_TYPE_HINT_DIALOG); - if (parentWindow) { - gtk_window_set_transient_for (window, parentWindow); - } - GdkEventMask mask; - g_object_get (G_OBJECT (window), "events", &mask, NULL); - mask |= GDK_FOCUS_CHANGE_MASK; - g_object_set (G_OBJECT (window), "events", mask, NULL); - g_signal_connect (window, - "delete-event", - G_CALLBACK (window_delete_event_cb), - self); - g_signal_connect (window, - "focus-out-event", - G_CALLBACK (window_focus_out_event_cb), - self); - - GtkWidget *mainBox = gtk_vbox_new (FALSE, 18); - gtk_container_set_border_width (GTK_CONTAINER (mainBox), 12); - gtk_container_add (GTK_CONTAINER (window), mainBox); - - GtkPaned *paned = GTK_PANED (gtk_hpaned_new ()); - gtk_box_pack_start (GTK_BOX (mainBox), - GTK_WIDGET (paned), - TRUE, TRUE, 0); - - GtkWidget *listWidget = [self createPreambleList]; - GtkWidget *listFrame = gtk_frame_new (NULL); - gtk_container_add (GTK_CONTAINER (listFrame), listWidget); - - GtkBox *listBox = GTK_BOX (gtk_vbox_new (FALSE, 6)); - gtk_box_pack_start (listBox, listFrame, TRUE, TRUE, 0); - - GtkContainer *listButtonBox = GTK_CONTAINER (gtk_hbox_new (FALSE, 6)); - gtk_box_pack_start (listBox, GTK_WIDGET (listButtonBox), FALSE, TRUE, 0); - GtkWidget *addButton = gtk_button_new_from_stock (GTK_STOCK_ADD); - g_signal_connect (addButton, - "clicked", - G_CALLBACK (add_button_clicked_cb), - self); - gtk_container_add (listButtonBox, addButton); - GtkWidget *removeButton = gtk_button_new_from_stock (GTK_STOCK_REMOVE); - g_signal_connect (removeButton, - "clicked", - G_CALLBACK (remove_button_clicked_cb), - self); - gtk_container_add (listButtonBox, removeButton); - - gtk_paned_pack1 (paned, GTK_WIDGET (listBox), FALSE, TRUE); - - preambleView = GTK_TEXT_VIEW (gtk_text_view_new ()); - gtk_text_view_set_left_margin (preambleView, 3); - gtk_text_view_set_right_margin (preambleView, 3); - GtkWidget *scroller = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroller), - GTK_POLICY_AUTOMATIC, // horiz - GTK_POLICY_ALWAYS); // vert - gtk_container_add (GTK_CONTAINER (scroller), GTK_WIDGET (preambleView)); - GtkWidget *editorFrame = gtk_frame_new (NULL); - gtk_container_add (GTK_CONTAINER (editorFrame), scroller); - gtk_paned_pack2 (paned, editorFrame, TRUE, TRUE); - - GtkContainer *buttonBox = GTK_CONTAINER (gtk_hbutton_box_new ()); - gtk_box_set_spacing (GTK_BOX (buttonBox), 6); - gtk_button_box_set_layout (GTK_BUTTON_BOX (buttonBox), GTK_BUTTONBOX_END); - gtk_box_pack_start (GTK_BOX (mainBox), - GTK_WIDGET (buttonBox), - FALSE, TRUE, 0); - GtkWidget *closeButton = gtk_button_new_from_stock (GTK_STOCK_CLOSE); - gtk_container_add (buttonBox, closeButton); - g_signal_connect (closeButton, - "clicked", - G_CALLBACK (close_button_clicked_cb), - self); - /* - GtkWidget *undoButton = gtk_button_new_from_stock (GTK_STOCK_UNDO); - gtk_container_add (buttonBox, undoButton); - gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (buttonBox), - undoButton, - TRUE); - g_signal_connect (undoButton, - "clicked", - G_CALLBACK (undo_button_clicked_cb), - self); - GtkWidget *redoButton = gtk_button_new_from_stock (GTK_STOCK_REDO); - gtk_container_add (buttonBox, redoButton); - gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (buttonBox), - redoButton, - TRUE); - g_signal_connect (redoButton, - "clicked", - G_CALLBACK (redo_button_clicked_cb), - self); - */ - [self revert]; - - gtk_widget_show_all (mainBox); -} - -- (void) save { - if (!preambleView) - return; - if ([self isDefaultPreambleSelected]) - return; - GtkTextIter start,end; - GtkTextBuffer *preambleBuffer = gtk_text_view_get_buffer (preambleView); - gtk_text_buffer_get_bounds(preambleBuffer, &start, &end); - gchar *text = gtk_text_buffer_get_text(preambleBuffer, &start, &end, FALSE); - NSString *preamble = [NSString stringWithUTF8String:text]; - g_free (text); - [preambles setCurrentPreamble:preamble]; - [app saveConfiguration]; -} - -- (void) revert { - if (!preambleView) - return; - GtkTextBuffer *preambleBuffer = gtk_text_view_get_buffer (preambleView); - gtk_text_buffer_set_text (preambleBuffer, [[preambles currentPreamble] UTF8String], -1); - gtk_text_view_set_editable (preambleView, ![self isDefaultPreambleSelected]); -} - -- (void) update { - if (!blockSignals) { - [self save]; - } - GtkTreeSelection *sel = gtk_tree_view_get_selection (preambleSelector); - GtkTreeIter row; - GtkTreeModel *model; - if (gtk_tree_selection_get_selected (sel, &model, &row)) { - gchar *name; - gtk_tree_model_get (model, &row, NAME_COLUMN, &name, -1); - NSString *preambleName = [NSString stringWithUTF8String:name]; - [preambles setSelectedPreambleName:preambleName]; - g_free (name); - } - [self revert]; -} - -- (void) fillListStore { - blockSignals = YES; - - GtkTreeIter row; - gtk_list_store_clear (preambleListStore); - - gtk_list_store_append (preambleListStore, &row); - gtk_list_store_set (preambleListStore, &row, - NAME_COLUMN, [[preambles defaultPreambleName] UTF8String], - IS_CUSTOM_COLUMN, FALSE, - -1); - GtkTreeSelection *sel = gtk_tree_view_get_selection (preambleSelector); - if ([self isDefaultPreambleSelected]) { - gtk_tree_selection_select_iter (sel, &row); - } - - NSEnumerator *en = [preambles customPreambleNameEnumerator]; - NSString *preambleName; - while ((preambleName = [en nextObject])) { - gtk_list_store_append (preambleListStore, &row); - gtk_list_store_set (preambleListStore, &row, - NAME_COLUMN, [preambleName UTF8String], - IS_CUSTOM_COLUMN, TRUE, - -1); - if ([preambleName isEqualToString:[self selectedPreambleName]]) { - gtk_tree_selection_select_iter (sel, &row); - } - } - - blockSignals = NO; -} - -- (BOOL) isDefaultPreambleSelected { - return [preambles selectedPreambleIsDefault]; -} - -- (NSString*) selectedPreambleName { - return [preambles selectedPreambleName]; -} - -- (void) addPreamble { - NSString *newName = [preambles addPreamble]; - - GtkTreeIter row; - gtk_list_store_append (preambleListStore, &row); - gtk_list_store_set (preambleListStore, &row, - NAME_COLUMN, [newName UTF8String], - IS_CUSTOM_COLUMN, TRUE, - -1); - - GtkTreeSelection *sel = gtk_tree_view_get_selection (preambleSelector); - gtk_tree_selection_select_iter (sel, &row); -} - -- (void) deletePreamble { - if ([self isDefaultPreambleSelected]) - return; - - NSString *name = [self selectedPreambleName]; - - GtkTreeIter row; - GtkTreeModel *model = GTK_TREE_MODEL (preambleListStore); - - gtk_tree_model_get_iter_first (model, &row); - // ignore first; it is the default one - gboolean found = FALSE; - while (!found && gtk_tree_model_iter_next (model, &row)) { - gchar *candidate; - gtk_tree_model_get (model, &row, NAME_COLUMN, &candidate, -1); - if (g_strcmp0 (candidate, [name UTF8String]) == 0) { - found = TRUE; - } - g_free (candidate); - } - - if (!found) - return; - - if (![preambles removePreamble:name]) - return; - - blockSignals = YES; - - gboolean had_next = gtk_list_store_remove (preambleListStore, &row); - if (!had_next) { - // select the last item - gint length = gtk_tree_model_iter_n_children (model, NULL); - gtk_tree_model_iter_nth_child (model, &row, NULL, length - 1); - } - - GtkTreeSelection *sel = gtk_tree_view_get_selection (preambleSelector); - gtk_tree_selection_select_iter (sel, &row); - - [self revert]; - - blockSignals = NO; -} - -- (void) renamePreambleAtPath:(gchar*)path to:(gchar*)newValue { - NSString *newName = [NSString stringWithUTF8String:newValue]; - - GtkTreeIter row; - GtkTreeModel *model = GTK_TREE_MODEL (preambleListStore); - - if (!gtk_tree_model_get_iter_from_string (model, &row, path)) - return; - - gchar *oldValue; - gtk_tree_model_get (model, &row, NAME_COLUMN, &oldValue, -1); - - NSString* oldName = [NSString stringWithUTF8String:oldValue]; - if ([preambles renamePreambleFrom:oldName to:newName]) { - gtk_list_store_set (preambleListStore, &row, - NAME_COLUMN, newValue, - -1); - } -} - -- (void) nodeStylePropertyChanged:(NSNotification*)notification { - if ([self isDefaultPreambleSelected]) { - [self revert]; - } -} - -- (void) edgeStylePropertyChanged:(NSNotification*)notification { - if ([self isDefaultPreambleSelected]) { - [self revert]; - } -} -@end - -// }}} -// {{{ GTK+ callbacks - -static gboolean window_delete_event_cb (GtkWidget *widget, - GdkEvent *event, - PreambleEditor *editor) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor hide]; - [pool drain]; - return TRUE; // we dealt with this event -} - -static gboolean window_focus_out_event_cb (GtkWidget *widget, - GdkEvent *event, - PreambleEditor *editor) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor save]; - [pool drain]; - return FALSE; -} - -static void close_button_clicked_cb (GtkButton *widget, PreambleEditor *editor) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor hide]; - [pool drain]; -} - -static void add_button_clicked_cb (GtkButton *widget, PreambleEditor *editor) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor addPreamble]; - [pool drain]; -} - -static void remove_button_clicked_cb (GtkButton *widget, PreambleEditor *editor) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor deletePreamble]; - [pool drain]; -} - -/* -static void undo_button_clicked_cb (GtkButton *widget, PreambleEditor *editor) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - NSLog(@"Undo"); - [pool drain]; -} - -static void redo_button_clicked_cb (GtkButton *widget, PreambleEditor *editor) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - NSLog(@"Redo"); - [pool drain]; -} -*/ - -static void preamble_name_edited_cb (GtkCellRendererText *renderer, - gchar *path, - gchar *new_text, - PreambleEditor *editor) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor renamePreambleAtPath:path to:new_text]; - [pool drain]; -} - -static void preamble_selection_changed_cb (GtkTreeSelection *treeselection, - PreambleEditor *editor) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor update]; - [pool drain]; -} - -// }}} - -// vim:ft=objc:ts=4:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/Preambles+Storage.h b/tikzit-old/src/gtk/Preambles+Storage.h deleted file mode 100644 index 76f56cc..0000000 --- a/tikzit-old/src/gtk/Preambles+Storage.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "Preambles.h" - -@interface Preambles (Storage) - -+ (Preambles*) preamblesFromDirectory:(NSString*)directory; -- (id) initFromDirectory:(NSString*)directory; -- (void) loadFromDirectory:(NSString*)directory; -- (void) storeToDirectory:(NSString*)directory; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/Preambles+Storage.m b/tikzit-old/src/gtk/Preambles+Storage.m deleted file mode 100644 index bd3ea03..0000000 --- a/tikzit-old/src/gtk/Preambles+Storage.m +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "Preambles+Storage.h" - -static NSString *ext = @"preamble"; - -@implementation Preambles (Storage) - -+ (Preambles*) preamblesFromDirectory:(NSString*)directory { - return [[[self alloc] initFromDirectory:directory] autorelease]; -} - -- (id) initFromDirectory:(NSString*)directory { - BOOL isDir = NO; - if ([[NSFileManager defaultManager] fileExistsAtPath:directory isDirectory:&isDir] && isDir) { - self = [super init]; - - if (self) { - selectedPreambleName = @"default"; - preambleDict = nil; - [self loadFromDirectory:directory]; - } - } else { - self = [self init]; - } - - return self; -} - -- (void) loadFromDirectory:(NSString*)directory { - preambleDict = [[NSMutableDictionary alloc] initWithCapacity:1]; - NSDirectoryEnumerator *en = [[NSFileManager defaultManager] enumeratorAtPath:directory]; - NSString *filename; - while ((filename = [en nextObject]) != nil) { - if ([filename hasSuffix:ext] && [[en fileAttributes] fileType] == NSFileTypeRegular) { - NSString *path = [directory stringByAppendingPathComponent:filename]; - NSString *contents = [NSString stringWithContentsOfFile:path]; - if (contents) { - [preambleDict setObject:contents forKey:[filename stringByDeletingPathExtension]]; - } - } - } -} - -- (void) storeToDirectory:(NSString*)directory { - NSDirectoryEnumerator *den = [[NSFileManager defaultManager] enumeratorAtPath:directory]; - NSString *filename; - while ((filename = [den nextObject]) != nil) { - if ([filename hasSuffix:ext] && [[den fileAttributes] fileType] == NSFileTypeRegular) { - NSString *path = [directory stringByAppendingPathComponent:filename]; - NSString *entry = [filename stringByDeletingPathExtension]; - if ([preambleDict objectForKey:entry] == nil) { - [[NSFileManager defaultManager] removeFileAtPath:path handler:nil]; - } - } - } - - NSEnumerator *en = [self customPreambleNameEnumerator]; - NSString *entry; - while ((entry = [en nextObject]) != nil) { - NSString *path = [directory stringByAppendingPathComponent:[entry stringByAppendingPathExtension:ext]]; - NSString *contents = [preambleDict objectForKey:entry]; - [contents writeToFile:path atomically:YES]; - } -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/PreviewRenderer.h b/tikzit-old/src/gtk/PreviewRenderer.h deleted file mode 100644 index d691722..0000000 --- a/tikzit-old/src/gtk/PreviewRenderer.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -#import "Surface.h" - -@class Configuration; -@class Preambles; -@class TikzDocument; - -@interface PreviewRenderer: NSObject { - Configuration *config; - Preambles *preambles; - TikzDocument *document; - PopplerDocument *pdfDocument; - PopplerPage *pdfPage; -} - -@property (readonly) Preambles *preambles; -@property (retain) TikzDocument *document; -@property (readonly) double height; -@property (readonly) double width; - -- (id) initWithPreambles:(Preambles*)p config:(Configuration*)c; - -- (BOOL) updateWithError:(NSError**)error; -- (BOOL) update; -- (BOOL) isValid; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/PreviewRenderer.m b/tikzit-old/src/gtk/PreviewRenderer.m deleted file mode 100644 index 28113d6..0000000 --- a/tikzit-old/src/gtk/PreviewRenderer.m +++ /dev/null @@ -1,250 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "PreviewRenderer.h" - -#import "CairoRenderContext.h" -#import "Configuration.h" -#import "Preambles.h" -#import "TikzDocument.h" - -@implementation PreviewRenderer - -@synthesize preambles, document; - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithPreambles:(Preambles*)p config:(Configuration*)c { - self = [super init]; - - if (self) { - document = nil; - config = [c retain]; - preambles = [p retain]; - pdfDocument = NULL; - pdfPage = NULL; - } - - return self; -} - -- (void) dealloc { - [document release]; - [config release]; - [preambles release]; - - if (pdfDocument) { - g_object_unref (pdfDocument); - pdfDocument = NULL; - } - if (pdfPage) { - g_object_unref (pdfPage); - pdfPage = NULL; - } - - [super dealloc]; -} - -- (BOOL) update { - NSError *error = nil; - BOOL result = [self updateWithError:&error]; - if (error) { - logError (error, @"Could not update preview"); - if ([error code] == TZ_ERR_TOOL_FAILED) { - NSLog (@"Output: %@", [[error userInfo] objectForKey:TZToolOutputErrorKey]); - } - } - return result; -} - -- (BOOL) updateWithError:(NSError**)error { - if (document == nil) { - if (error) { - *error = [NSError errorWithMessage:@"No document given" code:TZ_ERR_BADSTATE]; - } - if (pdfDocument) { - g_object_unref (pdfDocument); - pdfDocument = NULL; - } - if (pdfPage) { - g_object_unref (pdfPage); - pdfPage = NULL; - } - return NO; - } - - NSString *tex = [preambles buildDocumentForTikz:[document tikz]]; - - NSString *tempDir = [[NSFileManager defaultManager] createTempDirectoryWithError:error]; - if (!tempDir) { - if (error) { - *error = [NSError errorWithMessage:@"Could not create temporary directory" code:TZ_ERR_IO cause:*error]; - } - return NO; - } - - // write tex code to temporary file - NSString *texFile = [NSString stringWithFormat:@"%@/tikzit.tex", tempDir]; - NSString *pdfFile = [NSString stringWithFormat:@"file://%@/tikzit.pdf", tempDir]; - [tex writeToFile:texFile atomically:YES]; - - NSTask *latexTask = [[NSTask alloc] init]; - [latexTask setCurrentDirectoryPath:tempDir]; - - // GNUStep is clever enough to use PATH - NSString *path = [config stringEntry:@"pdflatex" - inGroup:@"Previews" - withDefault:@"pdflatex"]; - [latexTask setLaunchPath:path]; - - NSArray *args = [NSArray arrayWithObjects: - @"-fmt=latex", - @"-output-format=pdf", - @"-interaction=nonstopmode", - @"-halt-on-error", - texFile, - nil]; - [latexTask setArguments:args]; - - NSPipe *pout = [NSPipe pipe]; - [latexTask setStandardOutput:pout]; - - NSFileHandle *latexOut = [pout fileHandleForReading]; - - BOOL success = NO; - - NS_DURING { - [latexTask launch]; - [latexTask waitUntilExit]; - } NS_HANDLER { - NSLog(@"Failed to run '%@'; error was: %@", path, [localException reason]); - (void)localException; - if (error) { - NSString *desc = [NSString stringWithFormat:@"Failed to run '%@'", path]; - NSMutableDictionary *errorDetail = [NSMutableDictionary dictionaryWithCapacity:2]; - [errorDetail setValue:desc forKey:NSLocalizedDescriptionKey]; - *error = [NSError errorWithDomain:TZErrorDomain code:TZ_ERR_IO userInfo:errorDetail]; - } - - // remove all temporary files - [[NSFileManager defaultManager] removeFileAtPath:tempDir handler:NULL]; - [latexTask release]; - - return NO; - } NS_ENDHANDLER - - if ([latexTask terminationStatus] != 0) { - if (error) { - NSData *data = [latexOut readDataToEndOfFile]; - NSString *str = [[NSString alloc] initWithData:data - encoding:NSUTF8StringEncoding]; - NSMutableDictionary *errorDetail = [NSMutableDictionary dictionaryWithCapacity:2]; - [errorDetail setValue:@"Generating a PDF file with pdflatex failed" forKey:NSLocalizedDescriptionKey]; - [errorDetail setValue:str forKey:TZToolOutputErrorKey]; - *error = [NSError errorWithDomain:TZErrorDomain code:TZ_ERR_TOOL_FAILED userInfo:errorDetail]; - [str release]; - } - } else { - // load pdf document - GError* gerror = NULL; - pdfDocument = poppler_document_new_from_file([pdfFile UTF8String], NULL, &gerror); - if (!pdfDocument) { - if (error) { - *error = [NSError errorWithMessage:[NSString stringWithFormat:@"Could not load PDF document", pdfFile] - code:TZ_ERR_IO - cause:[NSError errorWithGError:gerror]]; - } - g_error_free(gerror); - } else { - pdfPage = poppler_document_get_page(pdfDocument, 0); - if(!pdfPage) { - if (error) { - *error = [NSError errorWithMessage:@"Could not open first page of PDF document" - code:TZ_ERR_OTHER]; - } - g_object_unref(pdfDocument); - } else { - success = YES; - } - } - } - - // remove all temporary files - [[NSFileManager defaultManager] removeFileAtPath:tempDir handler:NULL]; - [latexTask release]; - - return success; -} - -- (BOOL) isValid { - return pdfPage ? YES : NO; -} - -- (double) width { - double w = 0.0; - if (pdfPage) - poppler_page_get_size(pdfPage, &w, NULL); - return w; -} - -- (double) height { - double h = 0.0; - if (pdfPage) - poppler_page_get_size(pdfPage, NULL, &h); - return h; -} - -- (void) renderWithContext:(id)c onSurface:(id)surface { - if (document != nil && pdfPage) { - CairoRenderContext *context = (CairoRenderContext*)c; - - double w = 0.0; - double h = 0.0; - poppler_page_get_size(pdfPage, &w, &h); - if (w==0) w = 1.0; - if (h==0) h = 1.0; - - double scale = ([surface height] / h) * 0.95; - if (w * scale > [surface width]) scale = [surface width] / w; - [[surface transformer] setScale:scale]; - - NSPoint origin; - w *= scale; - h *= scale; - origin.x = ([surface width] - w) / 2; - origin.y = ([surface height] - h) / 2; - - [[surface transformer] setOrigin:origin]; - - [context saveState]; - [context applyTransform:[surface transformer]]; - - // white-out - [context paintWithColor:WhiteRColor]; - - poppler_page_render (pdfPage, [context cairoContext]); - - [context restoreState]; - } -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/PreviewWindow.h b/tikzit-old/src/gtk/PreviewWindow.h deleted file mode 100644 index 8bcd3e5..0000000 --- a/tikzit-old/src/gtk/PreviewWindow.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class Configuration; -@class Preambles; -@class PreviewRenderer; -@class TikzDocument; -@class WidgetSurface; - -@interface PreviewWindow: NSObject { - PreviewRenderer *previewer; - GtkWindow *window; - WidgetSurface *surface; - GtkWindow *parent; -} - -- (id) initWithPreambles:(Preambles*)p config:(Configuration*)c; - -- (void) setParentWindow:(GtkWindow*)parent; - -- (TikzDocument*) document; -- (void) setDocument:(TikzDocument*)doc; - -- (BOOL) update; - -- (void) present; -- (void) show; -- (void) hide; -- (BOOL) isVisible; -- (void) setVisible:(BOOL)visible; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/PreviewWindow.m b/tikzit-old/src/gtk/PreviewWindow.m deleted file mode 100644 index fc0e7a3..0000000 --- a/tikzit-old/src/gtk/PreviewWindow.m +++ /dev/null @@ -1,195 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "PreviewWindow.h" - -#import "Preambles.h" -#import "PreviewRenderer.h" -#import "TikzDocument.h" -#import "WidgetSurface.h" - -#import "gtkhelpers.h" - -@interface PreviewWindow (Private) -- (BOOL) updateOrShowError; -- (void) updateDefaultSize; -@end - -// {{{ API - -@implementation PreviewWindow - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithPreambles:(Preambles*)p config:(Configuration*)c { - self = [super init]; - - if (self) { - parent = NULL; - previewer = [[PreviewRenderer alloc] initWithPreambles:p config:c]; - - window = GTK_WINDOW (gtk_window_new (GTK_WINDOW_TOPLEVEL)); - gtk_window_set_title (window, "Preview"); - gtk_window_set_resizable (window, TRUE); - gtk_window_set_default_size (window, 150.0, 150.0); - g_signal_connect (G_OBJECT (window), - "delete-event", - G_CALLBACK (gtk_widget_hide_on_delete), - NULL); - - GtkWidget *pdfArea = gtk_drawing_area_new (); - gtk_container_add (GTK_CONTAINER (window), pdfArea); - gtk_widget_show (pdfArea); - surface = [[WidgetSurface alloc] initWithWidget:pdfArea]; - [surface setRenderDelegate:previewer]; - Transformer *t = [surface transformer]; - [t setFlippedAboutXAxis:![t isFlippedAboutXAxis]]; - } - - return self; -} - -- (void) setParentWindow:(GtkWindow*)p { - parent = p; - gtk_window_set_transient_for (window, p); - if (p != NULL) { - gtk_window_set_position (window, GTK_WIN_POS_CENTER_ON_PARENT); - } -} - -- (TikzDocument*) document { - return [previewer document]; -} - -- (void) setDocument:(TikzDocument*)doc { - [previewer setDocument:doc]; -} - -- (void) present { - if ([self updateOrShowError]) { - [self updateDefaultSize]; - gtk_window_present (GTK_WINDOW (window)); - [surface invalidate]; - } -} - -- (BOOL) update { - if ([self updateOrShowError]) { - [self updateDefaultSize]; - return YES; - } - - return NO; -} - -- (void) show { - if ([self updateOrShowError]) { - [self updateDefaultSize]; - gtk_widget_show (GTK_WIDGET (window)); - [surface invalidate]; - } -} - -- (void) hide { - gtk_widget_hide (GTK_WIDGET (window)); -} - -- (BOOL) isVisible { - gboolean visible; - g_object_get (G_OBJECT (window), "visible", &visible, NULL); - return visible ? YES : NO; -} - -- (void) setVisible:(BOOL)visible { - if (visible) { - [self show]; - } else { - [self hide]; - } -} - -- (void) dealloc { - gtk_widget_destroy (GTK_WIDGET (window)); - [previewer release]; - [surface release]; - - [super dealloc]; -} - -@end -// }}} - -@implementation PreviewWindow (Private) -- (BOOL) updateOrShowError { - NSError *error = nil; - if (![previewer updateWithError:&error]) { - GtkWindow *dparent = gtk_widget_get_visible (GTK_WIDGET (window)) - ? window - : parent; - GtkWidget *dialog = gtk_message_dialog_new (dparent, - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_CLOSE, - "Failed to generate the preview: %s", - [[error localizedDescription] UTF8String]); -#if GTK_CHECK_VERSION(2,22,0) - if ([error code] == TZ_ERR_TOOL_FAILED) { - GtkBox *box = GTK_BOX (gtk_message_dialog_get_message_area (GTK_MESSAGE_DIALOG (dialog))); - GtkWidget *label = gtk_label_new ("pdflatex said:"); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5f); - gtk_widget_show (label); - gtk_box_pack_start (box, label, FALSE, TRUE, 0); - - GtkWidget *view = gtk_text_view_new (); - GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)); - gtk_text_buffer_set_text (buffer, [[error toolOutput] UTF8String], -1); - gtk_text_view_set_editable (GTK_TEXT_VIEW (view), FALSE); - gtk_widget_show (view); - GtkWidget *scrolledView = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledView), - GTK_POLICY_NEVER, // horiz - GTK_POLICY_ALWAYS); // vert - gtk_widget_set_size_request (scrolledView, -1, 120); - gtk_container_add (GTK_CONTAINER (scrolledView), view); - gtk_widget_show (scrolledView); - gtk_box_pack_start (box, scrolledView, TRUE, TRUE, 0); - } -#endif // GTK+ 2.22.0 - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - return NO; - } - return YES; -} - -- (void) updateDefaultSize { - double width = 150; - double height = 150; - if ([previewer isValid]) { - double pWidth = [previewer width]; - double pHeight = [previewer height]; - width = (width < pWidth + 4) ? pWidth + 4 : width; - height = (height < pHeight + 4) ? pHeight + 4 : height; - } - gtk_window_set_default_size (window, width, height); -} -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/PropertiesPane.h b/tikzit-old/src/gtk/PropertiesPane.h deleted file mode 100644 index c76efae..0000000 --- a/tikzit-old/src/gtk/PropertiesPane.h +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class Configuration; -@class EdgePropertyDelegate; -@class EdgeStylesModel; -@class GraphPropertyDelegate; -@class NodePropertyDelegate; -@class NodeStylesModel; -@class PropertyListEditor; -@class StyleManager; -@class TikzDocument; - -@interface PropertiesPane: NSObject { - TikzDocument *document; - BOOL blockUpdates; - - PropertyListEditor *graphProps; - PropertyListEditor *nodeProps; - PropertyListEditor *edgeProps; - PropertyListEditor *edgeNodeProps; - - GraphPropertyDelegate *graphPropDelegate; - NodePropertyDelegate *nodePropDelegate; - EdgePropertyDelegate *edgePropDelegate; - - GtkWidget *layout; - - GtkWidget *currentPropsWidget; // no ref! - - GtkWidget *graphPropsWidget; - GtkWidget *nodePropsWidget; - GtkWidget *edgePropsWidget; - - GtkEntry *nodeLabelEntry; - GtkToggleButton *edgeNodeToggle; - GtkWidget *edgeNodePropsWidget; - GtkEntry *edgeNodeLabelEntry; - GtkEntry *edgeSourceAnchorEntry; - GtkEntry *edgeTargetAnchorEntry; -} - -@property (retain) TikzDocument *document; -@property (assign) BOOL visible; -@property (readonly) GtkWidget *gtkWidget; - -- (void) loadConfiguration:(Configuration*)config; -- (void) saveConfiguration:(Configuration*)config; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/PropertiesPane.m b/tikzit-old/src/gtk/PropertiesPane.m deleted file mode 100644 index ba43298..0000000 --- a/tikzit-old/src/gtk/PropertiesPane.m +++ /dev/null @@ -1,763 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "PropertiesPane.h" - -#import "GraphElementProperty.h" -#import "PropertyListEditor.h" -#import "TikzDocument.h" - -#import "gtkhelpers.h" - -// {{{ Internal interfaces -// {{{ GTK+ helpers -static GtkWidget *createLabelledEntry (const gchar *labelText, GtkEntry **entry); -static GtkWidget *createPropsPaneWithLabelEntry (PropertyListEditor *props, GtkEntry **labelEntry); -static GtkWidget *createBoldLabel (const gchar *text); -// }}} -// {{{ GTK+ callbacks -static void node_label_changed_cb (GtkEditable *widget, PropertiesPane *pane); -static void edge_node_label_changed_cb (GtkEditable *widget, PropertiesPane *pane); -static void edge_node_toggled_cb (GtkToggleButton *widget, PropertiesPane *pane); -static void edge_source_anchor_changed_cb (GtkEditable *widget, PropertiesPane *pane); -static void edge_target_anchor_changed_cb (GtkEditable *widget, PropertiesPane *pane); -// }}} - -@interface PropertiesPane (Notifications) -- (void) nodeSelectionChanged:(NSNotification*)n; -- (void) edgeSelectionChanged:(NSNotification*)n; -- (void) graphChanged:(NSNotification*)n; -- (void) nodeLabelEdited:(NSString*)newValue; -- (void) edgeNodeLabelEdited:(NSString*)newValue; -- (void) edgeNodeToggled:(BOOL)newValue; -- (BOOL) edgeSourceAnchorEdited:(NSString*)newValue; -- (BOOL) edgeTargetAnchorEdited:(NSString*)newValue; -@end - -@interface PropertiesPane (Private) -- (void) _updatePane; -- (void) _setDisplayedWidget:(GtkWidget*)widget; -@end - -// {{{ Delegates - -@interface GraphPropertyDelegate : NSObject { - TikzDocument *doc; -} -- (void) setDocument:(TikzDocument*)d; -@end - -@interface NodePropertyDelegate : NSObject { - TikzDocument *doc; - Node *node; -} -- (void) setDocument:(TikzDocument*)d; -- (void) setNode:(Node*)n; -@end - -@interface EdgePropertyDelegate : NSObject { - TikzDocument *doc; - Edge *edge; -} -- (void) setDocument:(TikzDocument*)d; -- (void) setEdge:(Edge*)e; -@end - -// }}} - -// }}} -// {{{ API - -@implementation PropertiesPane - -- (id) init { - self = [super init]; - - if (self) { - document = nil; - blockUpdates = NO; - - graphProps = [[PropertyListEditor alloc] init]; - graphPropDelegate = [[GraphPropertyDelegate alloc] init]; - [graphProps setDelegate:graphPropDelegate]; - - nodeProps = [[PropertyListEditor alloc] init]; - nodePropDelegate = [[NodePropertyDelegate alloc] init]; - [nodeProps setDelegate:nodePropDelegate]; - - edgeProps = [[PropertyListEditor alloc] init]; - edgePropDelegate = [[EdgePropertyDelegate alloc] init]; - [edgeProps setDelegate:edgePropDelegate]; - - edgeNodeProps = [[PropertyListEditor alloc] init]; - [edgeNodeProps setDelegate:edgePropDelegate]; - - layout = gtk_vbox_new (FALSE, 0); - g_object_ref_sink (layout); - gtk_widget_show (layout); - - /* - * Graph properties - */ - graphPropsWidget = gtk_vbox_new (FALSE, 6); - g_object_ref_sink (graphPropsWidget); - gtk_widget_show (graphPropsWidget); - - GtkWidget *label = createBoldLabel ("Graph properties"); - gtk_widget_show (label); - gtk_box_pack_start (GTK_BOX (graphPropsWidget), - label, - FALSE, FALSE, 0); - - gtk_widget_show ([graphProps widget]); - gtk_box_pack_start (GTK_BOX (graphPropsWidget), - [graphProps widget], - TRUE, TRUE, 0); - - gtk_box_pack_start (GTK_BOX (layout), - graphPropsWidget, - TRUE, TRUE, 0); - - - /* - * Node properties - */ - nodePropsWidget = gtk_vbox_new (FALSE, 6); - g_object_ref_sink (nodePropsWidget); - gtk_box_pack_start (GTK_BOX (layout), - nodePropsWidget, - TRUE, TRUE, 0); - - label = createBoldLabel ("Node properties"); - gtk_widget_show (label); - gtk_box_pack_start (GTK_BOX (nodePropsWidget), - label, - FALSE, FALSE, 0); - - GtkWidget *labelWidget = createLabelledEntry ("Label", &nodeLabelEntry); - gtk_widget_show (labelWidget); - gtk_box_pack_start (GTK_BOX (nodePropsWidget), - labelWidget, - FALSE, FALSE, 0); - - gtk_widget_show ([nodeProps widget]); - gtk_box_pack_start (GTK_BOX (nodePropsWidget), - [nodeProps widget], - TRUE, TRUE, 0); - - g_signal_connect (G_OBJECT (nodeLabelEntry), - "changed", - G_CALLBACK (node_label_changed_cb), - self); - - /* - * Edge properties - */ - edgePropsWidget = gtk_vbox_new (FALSE, 6); - g_object_ref_sink (edgePropsWidget); - gtk_box_pack_start (GTK_BOX (layout), - edgePropsWidget, - TRUE, TRUE, 0); - - label = createBoldLabel ("Edge properties"); - gtk_widget_show (label); - gtk_box_pack_start (GTK_BOX (edgePropsWidget), - label, - FALSE, FALSE, 0); - - gtk_widget_show ([edgeProps widget]); - gtk_box_pack_start (GTK_BOX (edgePropsWidget), - [edgeProps widget], - TRUE, TRUE, 0); - - GtkWidget *split = gtk_hseparator_new (); - gtk_widget_show (split); - gtk_box_pack_start (GTK_BOX (edgePropsWidget), - split, - FALSE, FALSE, 0); - - GtkWidget *anchorTable = gtk_table_new (2, 2, FALSE); - - label = gtk_label_new ("Source anchor:"); - gtk_table_attach_defaults (GTK_TABLE (anchorTable), label, - 0, 1, 0, 1); - edgeSourceAnchorEntry = GTK_ENTRY (gtk_entry_new ()); - g_object_ref_sink (edgeSourceAnchorEntry); - gtk_table_attach_defaults (GTK_TABLE (anchorTable), - GTK_WIDGET (edgeSourceAnchorEntry), - 1, 2, 0, 1); - g_signal_connect (G_OBJECT (edgeSourceAnchorEntry), - "changed", - G_CALLBACK (edge_source_anchor_changed_cb), - self); - - label = gtk_label_new ("Target anchor:"); - gtk_table_attach_defaults (GTK_TABLE (anchorTable), label, - 0, 1, 1, 2); - edgeTargetAnchorEntry = GTK_ENTRY (gtk_entry_new ()); - g_object_ref_sink (edgeTargetAnchorEntry); - gtk_table_attach_defaults (GTK_TABLE (anchorTable), - GTK_WIDGET (edgeTargetAnchorEntry), - 1, 2, 1, 2); - g_signal_connect (G_OBJECT (edgeTargetAnchorEntry), - "changed", - G_CALLBACK (edge_target_anchor_changed_cb), - self); - - gtk_widget_show_all (anchorTable); - gtk_box_pack_start (GTK_BOX (edgePropsWidget), - anchorTable, - FALSE, FALSE, 0); - - split = gtk_hseparator_new (); - gtk_widget_show (split); - gtk_box_pack_start (GTK_BOX (edgePropsWidget), - split, - FALSE, FALSE, 0); - - edgeNodeToggle = GTK_TOGGLE_BUTTON (gtk_check_button_new_with_label ("Child node")); - g_object_ref_sink (edgeNodeToggle); - gtk_widget_show (GTK_WIDGET (edgeNodeToggle)); - gtk_box_pack_start (GTK_BOX (edgePropsWidget), - GTK_WIDGET (edgeNodeToggle), - FALSE, FALSE, 0); - g_signal_connect (G_OBJECT (GTK_WIDGET (edgeNodeToggle)), - "toggled", - G_CALLBACK (edge_node_toggled_cb), - self); - - edgeNodePropsWidget = createPropsPaneWithLabelEntry(edgeNodeProps, &edgeNodeLabelEntry); - g_object_ref_sink (edgeNodePropsWidget); - g_object_ref_sink (edgeNodeLabelEntry); - gtk_box_pack_start (GTK_BOX (edgePropsWidget), - edgeNodePropsWidget, - TRUE, TRUE, 0); - g_signal_connect (G_OBJECT (edgeNodeLabelEntry), - "changed", - G_CALLBACK (edge_node_label_changed_cb), - self); - - /* - * Misc setup - */ - - [self _setDisplayedWidget:graphPropsWidget]; - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - g_object_unref (graphPropsWidget); - g_object_unref (nodePropsWidget); - g_object_unref (edgePropsWidget); - - g_object_unref (nodeLabelEntry); - g_object_unref (edgeNodeToggle); - g_object_unref (edgeNodePropsWidget); - g_object_unref (edgeNodeLabelEntry); - g_object_unref (edgeSourceAnchorEntry); - g_object_unref (edgeTargetAnchorEntry); - - g_object_unref (layout); - - [graphProps release]; - [nodeProps release]; - [edgeProps release]; - [edgeNodeProps release]; - - [graphPropDelegate release]; - [nodePropDelegate release]; - [edgePropDelegate release]; - - [document release]; - - [super dealloc]; -} - -- (TikzDocument*) document { - return document; -} - -- (void) setDocument:(TikzDocument*)doc { - if (document != nil) { - [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:document]; - [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:[document pickSupport]]; - } - - [doc retain]; - [document release]; - document = doc; - - [graphPropDelegate setDocument:doc]; - [nodePropDelegate setDocument:doc]; - [edgePropDelegate setDocument:doc]; - - if (doc != nil) { - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(nodeSelectionChanged:) - name:@"NodeSelectionChanged" object:[doc pickSupport]]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(edgeSelectionChanged:) - name:@"EdgeSelectionChanged" object:[doc pickSupport]]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(graphChanged:) - name:@"TikzChanged" object:doc]; - } - - [self _updatePane]; -} - -- (BOOL) visible { - return gtk_widget_get_visible (layout); -} - -- (void) setVisible:(BOOL)visible { - gtk_widget_set_visible (layout, visible); -} - -- (GtkWidget*) gtkWidget { - return layout; -} - -- (void) loadConfiguration:(Configuration*)config { -} - -- (void) saveConfiguration:(Configuration*)config { -} - -@end -// }}} -// {{{ Notifications - -@implementation PropertiesPane (Notifications) - -- (void) nodeSelectionChanged:(NSNotification*)n { - [self _updatePane]; -} - -- (void) edgeSelectionChanged:(NSNotification*)n { - [self _updatePane]; -} - -- (void) graphChanged:(NSNotification*)n { - [self _updatePane]; -} - -- (void) nodeLabelEdited:(NSString*)newValue { - if (blockUpdates) - return; - - NSSet *sel = [[document pickSupport] selectedNodes]; - if ([sel count] != 1) { - NSLog(@"Expected single node selected; got %lu", [sel count]); - return; - } - - if ([newValue isValidTikzPropertyNameOrValue]) { - Node *node = [sel anyObject]; - [document startModifyNode:node]; - [node setLabel:newValue]; - [document endModifyNode]; - } else { - widget_set_error (GTK_WIDGET (nodeLabelEntry)); - } -} - -- (void) edgeNodeLabelEdited:(NSString*)newValue { - if (blockUpdates) - return; - - NSSet *sel = [[document pickSupport] selectedEdges]; - if ([sel count] != 1) { - NSLog(@"Expected single edge selected; got %lu", [sel count]); - return; - } - - Edge *edge = [sel anyObject]; - if (![edge hasEdgeNode]) { - NSLog(@"Expected edge with edge node"); - return; - } - - if ([newValue isValidTikzPropertyNameOrValue]) { - [document startModifyEdge:edge]; - [[edge edgeNode] setLabel:newValue]; - [document endModifyEdge]; - } else { - widget_set_error (GTK_WIDGET (edgeNodeLabelEntry)); - } -} - -- (void) edgeNodeToggled:(BOOL)newValue { - if (blockUpdates) - return; - - NSSet *sel = [[document pickSupport] selectedEdges]; - if ([sel count] != 1) { - NSLog(@"Expected single edge selected; got %lu", [sel count]); - return; - } - - Edge *edge = [sel anyObject]; - - [document startModifyEdge:edge]; - [edge setHasEdgeNode:newValue]; - [document endModifyEdge]; -} - -- (BOOL) edgeSourceAnchorEdited:(NSString*)newValue { - if (blockUpdates) - return YES; - - NSSet *sel = [[document pickSupport] selectedEdges]; - if ([sel count] != 1) { - NSLog(@"Expected single edge selected; got %lu", [sel count]); - return YES; - } - - Edge *edge = [sel anyObject]; - if ([newValue isValidAnchor]) { - [document startModifyEdge:edge]; - [edge setSourceAnchor:newValue]; - [document endModifyEdge]; - return YES; - } else { - return NO; - } -} - -- (BOOL) edgeTargetAnchorEdited:(NSString*)newValue { - if (blockUpdates) - return YES; - - NSSet *sel = [[document pickSupport] selectedEdges]; - if ([sel count] != 1) { - NSLog(@"Expected single edge selected; got %lu", [sel count]); - return YES; - } - - Edge *edge = [sel anyObject]; - if ([newValue isValidAnchor]) { - [document startModifyEdge:edge]; - [edge setTargetAnchor:newValue]; - [document endModifyEdge]; - return YES; - } else { - return NO; - } -} - -@end -// }}} -// {{{ Private - -@implementation PropertiesPane (Private) - -- (void) _setDisplayedWidget:(GtkWidget*)widget { - if (currentPropsWidget != widget) { - if (currentPropsWidget) - gtk_widget_hide (currentPropsWidget); - currentPropsWidget = widget; - if (widget) - gtk_widget_show (widget); - } -} - -- (void) _updatePane { - blockUpdates = YES; - - BOOL editGraphProps = YES; - GraphElementData *data = [[document graph] data]; - [graphProps setData:data]; - - NSSet *nodeSel = [[document pickSupport] selectedNodes]; - if ([nodeSel count] == 1) { - Node *n = [nodeSel anyObject]; - [nodePropDelegate setNode:n]; - [nodeProps setData:[n data]]; - gtk_entry_set_text (nodeLabelEntry, [[n label] UTF8String]); - widget_clear_error (GTK_WIDGET (nodeLabelEntry)); - [self _setDisplayedWidget:nodePropsWidget]; - editGraphProps = NO; - } else { - [nodePropDelegate setNode:nil]; - [nodeProps setData:nil]; - gtk_entry_set_text (nodeLabelEntry, ""); - - NSSet *edgeSel = [[document pickSupport] selectedEdges]; - if ([edgeSel count] == 1) { - Edge *e = [edgeSel anyObject]; - [edgePropDelegate setEdge:e]; - [edgeProps setData:[e data]]; - gtk_entry_set_text (edgeSourceAnchorEntry, - [[e sourceAnchor] UTF8String]); - gtk_entry_set_text (edgeTargetAnchorEntry, - [[e targetAnchor] UTF8String]); - widget_clear_error (GTK_WIDGET (edgeSourceAnchorEntry)); - widget_clear_error (GTK_WIDGET (edgeTargetAnchorEntry)); - widget_clear_error (GTK_WIDGET (edgeNodeLabelEntry)); - if ([e hasEdgeNode]) { - gtk_toggle_button_set_active (edgeNodeToggle, TRUE); - gtk_widget_show (edgeNodePropsWidget); - gtk_entry_set_text (edgeNodeLabelEntry, [[[e edgeNode] label] UTF8String]); - [edgeNodeProps setData:[[e edgeNode] data]]; - gtk_widget_set_sensitive (edgeNodePropsWidget, TRUE); - } else { - gtk_toggle_button_set_active (edgeNodeToggle, FALSE); - gtk_widget_hide (edgeNodePropsWidget); - gtk_entry_set_text (edgeNodeLabelEntry, ""); - [edgeNodeProps setData:nil]; - gtk_widget_set_sensitive (edgeNodePropsWidget, FALSE); - } - [self _setDisplayedWidget:edgePropsWidget]; - editGraphProps = NO; - } else { - [edgePropDelegate setEdge:nil]; - [edgeProps setData:nil]; - [edgeNodeProps setData:nil]; - gtk_entry_set_text (edgeNodeLabelEntry, ""); - } - } - - if (editGraphProps) { - [self _setDisplayedWidget:graphPropsWidget]; - } - - blockUpdates = NO; -} - -@end - -// }}} -// {{{ Delegates - -@implementation GraphPropertyDelegate -- (id) init { - self = [super init]; - if (self) { - doc = nil; - } - return self; -} -- (void) dealloc { - // doc is not retained - [super dealloc]; -} -- (void) setDocument:(TikzDocument*)d { - doc = d; -} -- (BOOL)startEdit { - if ([doc graph] != nil) { - [doc startChangeGraphProperties]; - return YES; - } - return NO; -} -- (void)endEdit { - [doc endChangeGraphProperties]; -} -- (void)cancelEdit { - [doc cancelChangeGraphProperties]; -} -@end - -@implementation NodePropertyDelegate -- (id) init { - self = [super init]; - if (self) { - doc = nil; - node = nil; - } - return self; -} -- (void) dealloc { - // doc,node not retained - [super dealloc]; -} -- (void) setDocument:(TikzDocument*)d { - doc = d; - node = nil; -} -- (void) setNode:(Node*)n { - node = n; -} -- (BOOL)startEdit { - if (node != nil) { - [doc startModifyNode:node]; - return YES; - } - return NO; -} -- (void)endEdit { - [doc endModifyNode]; -} -- (void)cancelEdit { - [doc cancelModifyNode]; -} -@end - -@implementation EdgePropertyDelegate -- (id) init { - self = [super init]; - if (self) { - doc = nil; - edge = nil; - } - return self; -} -- (void) dealloc { - // doc,edge not retained - [super dealloc]; -} -- (void) setDocument:(TikzDocument*)d { - doc = d; - edge = nil; -} -- (void) setEdge:(Edge*)e { - edge = e; -} -- (BOOL)startEdit { - if (edge != nil) { - [doc startModifyEdge:edge]; - return YES; - } - return NO; -} -- (void)endEdit { - [doc endModifyEdge]; -} -- (void)cancelEdit { - [doc cancelModifyEdge]; -} -@end - -// }}} -// {{{ GTK+ helpers - -static GtkWidget *createLabelledEntry (const gchar *labelText, GtkEntry **entry) { - GtkBox *box = GTK_BOX (gtk_hbox_new (FALSE, 0)); - GtkWidget *label = gtk_label_new (labelText); - gtk_widget_show (label); - GtkWidget *entryWidget = gtk_entry_new (); - gtk_widget_show (entryWidget); - // container widget expand fill pad - gtk_box_pack_start (box, label, FALSE, TRUE, 5); - gtk_box_pack_start (box, entryWidget, TRUE, TRUE, 0); - if (entry) - *entry = GTK_ENTRY (entryWidget); - return GTK_WIDGET (box); -} - -static GtkWidget *createPropsPaneWithLabelEntry (PropertyListEditor *props, GtkEntry **labelEntry) { - GtkBox *box = GTK_BOX (gtk_vbox_new (FALSE, 6)); - - GtkWidget *labelWidget = createLabelledEntry ("Label", labelEntry); - gtk_widget_show (labelWidget); - // box widget expand fill pad - gtk_box_pack_start (box, labelWidget, FALSE, FALSE, 0); - gtk_box_pack_start (box, [props widget], TRUE, TRUE, 0); - gtk_widget_show ([props widget]); - return GTK_WIDGET (box); -} - -static GtkWidget *createBoldLabel (const gchar *text) { - GtkWidget *label = gtk_label_new (text); - label_set_bold (GTK_LABEL (label)); - return label; -} - -// }}} -// {{{ GTK+ callbacks - -static void node_label_changed_cb (GtkEditable *editable, PropertiesPane *pane) { - if (!gtk_widget_is_sensitive (GTK_WIDGET (editable))) { - // clearly wasn't the user editing - return; - } - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - NSString *newValue = gtk_editable_get_string (editable, 0, -1); - [pane nodeLabelEdited:newValue]; - - [pool drain]; -} - -static void edge_node_label_changed_cb (GtkEditable *editable, PropertiesPane *pane) { - if (!gtk_widget_is_sensitive (GTK_WIDGET (editable))) { - // clearly wasn't the user editing - return; - } - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - NSString *newValue = gtk_editable_get_string (editable, 0, -1); - [pane edgeNodeLabelEdited:newValue]; - - [pool drain]; -} - -static void edge_node_toggled_cb (GtkToggleButton *toggle, PropertiesPane *pane) { - if (!gtk_widget_is_sensitive (GTK_WIDGET (toggle))) { - // clearly wasn't the user editing - return; - } - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - gboolean newValue = gtk_toggle_button_get_active (toggle); - [pane edgeNodeToggled:newValue]; - - [pool drain]; -} - -static void edge_source_anchor_changed_cb (GtkEditable *editable, PropertiesPane *pane) { - if (!gtk_widget_is_sensitive (GTK_WIDGET (editable))) { - // clearly wasn't the user editing - return; - } - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - NSString *newValue = gtk_editable_get_string (editable, 0, -1); - if (![pane edgeSourceAnchorEdited:newValue]) - widget_set_error (GTK_WIDGET (editable)); - - [pool drain]; -} - -static void edge_target_anchor_changed_cb (GtkEditable *editable, PropertiesPane *pane) { - if (!gtk_widget_is_sensitive (GTK_WIDGET (editable))) { - // clearly wasn't the user editing - return; - } - - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - NSString *newValue = gtk_editable_get_string (editable, 0, -1); - if (![pane edgeTargetAnchorEdited:newValue]) - widget_set_error (GTK_WIDGET (editable)); - - [pool drain]; -} - -// }}} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/PropertyListEditor.h b/tikzit-old/src/gtk/PropertyListEditor.h deleted file mode 100644 index 2d3166a..0000000 --- a/tikzit-old/src/gtk/PropertyListEditor.h +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import -#import "GraphElementData.h" -#import "GraphElementProperty.h" - -@protocol PropertyChangeDelegate -@optional -- (BOOL)startEdit; -- (void)endEdit; -- (void)cancelEdit; -@end - -@interface PropertyListEditor: NSObject { - GraphElementData *data; - NSObject *delegate; - - GtkListStore *list; - GtkWidget *view; - GtkWidget *widget; - GtkWidget *removeButton; -} - -/*! - @property widget - @brief The widget displaying the editable list - */ -@property (readonly) GtkWidget *widget; - -/*! - @property data - @brief The GraphElementData that should be reflected in the list - */ -@property (retain) GraphElementData *data; - -/*! - @property delegate - @brief A delegate for dealing with property changes - */ -@property (retain) NSObject *delegate; - -/*! - * Reload the properties from the data store - */ -- (void) reloadProperties; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/PropertyListEditor.m b/tikzit-old/src/gtk/PropertyListEditor.m deleted file mode 100644 index 9760618..0000000 --- a/tikzit-old/src/gtk/PropertyListEditor.m +++ /dev/null @@ -1,501 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "PropertyListEditor.h" -#import "gtkhelpers.h" - -// {{{ Constants - -enum { - PLM_NAME_COL = 0, - PLM_VALUE_COL, - PLM_IS_PROPERTY_COL, - PLM_PROPERTY_COL, - PLM_N_COLS -}; - -// }}} -// {{{ Internal interfaces -// {{{ Signals - -static void value_edited_cb (GtkCellRendererText *renderer, - gchar *path, - gchar *new_text, - PropertyListEditor *editor); -static void name_edited_cb (GtkCellRendererText *renderer, - gchar *path, - gchar *new_text, - PropertyListEditor *editor); -static void add_prop_clicked_cb (GtkButton *button, - PropertyListEditor *editor); -static void add_atom_clicked_cb (GtkButton *button, - PropertyListEditor *editor); -static void remove_clicked_cb (GtkButton *button, - PropertyListEditor *editor); -static void text_editing_started (GtkCellRenderer *cell, - GtkCellEditable *editable, - const gchar *path, - PropertyListEditor *editor); -static void text_changed_cb (GtkEditable *editable, - PropertyListEditor *pane); -static void selection_changed_cb (GtkTreeSelection *selection, - PropertyListEditor *pane); - -// }}} -// {{{ Private - -@interface PropertyListEditor (Private) -- (void) updatePath:(gchar*)path withValue:(NSString*)newText; -- (void) updatePath:(gchar*)path withName:(NSString*)newText; -- (void) addProperty; -- (void) addAtom; -- (void) removeSelected; -- (void) selectionCountChanged:(int)newSelectionCount; -- (void) clearStore; -@end - -// }}} -// }}} -// {{{ API - -@implementation PropertyListEditor - -- (id) init { - self = [super init]; - - if (self) { - list = gtk_list_store_new (PLM_N_COLS, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_BOOLEAN, - G_TYPE_POINTER); - g_object_ref_sink (G_OBJECT (list)); - view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (list)); - g_object_ref_sink (G_OBJECT (view)); - GtkWidget *scrolledview = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledview), - GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); - gtk_container_add (GTK_CONTAINER (scrolledview), view); - gtk_widget_set_size_request (view, -1, 150); - data = nil; - delegate = nil; - - GtkCellRenderer *renderer; - GtkTreeViewColumn *column; - - renderer = gtk_cell_renderer_text_new (); - g_object_set (G_OBJECT (renderer), - "editable", TRUE, - NULL); - column = gtk_tree_view_column_new_with_attributes ("Key/Atom", - renderer, - "text", PLM_NAME_COL, - NULL); - gtk_tree_view_append_column (GTK_TREE_VIEW (view), column); - g_signal_connect (G_OBJECT (renderer), - "editing-started", - G_CALLBACK (text_editing_started), - self); - g_signal_connect (G_OBJECT (renderer), - "edited", - G_CALLBACK (name_edited_cb), - self); - - renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes ("Value", - renderer, - "text", PLM_VALUE_COL, - "editable", PLM_IS_PROPERTY_COL, - "sensitive", PLM_IS_PROPERTY_COL, - NULL); - gtk_tree_view_append_column (GTK_TREE_VIEW (view), column); - g_signal_connect (G_OBJECT (renderer), - "edited", - G_CALLBACK (value_edited_cb), - self); - - widget = gtk_vbox_new (FALSE, 0); - gtk_box_set_spacing (GTK_BOX (widget), 6); - g_object_ref_sink (G_OBJECT (widget)); - - GtkWidget *listFrame = gtk_frame_new (NULL); - gtk_container_add (GTK_CONTAINER (listFrame), scrolledview); - gtk_widget_show (listFrame); - gtk_container_add (GTK_CONTAINER (widget), listFrame); - - GtkBox *buttonBox = GTK_BOX (gtk_hbox_new(FALSE, 0)); - gtk_box_pack_start (GTK_BOX (widget), GTK_WIDGET (buttonBox), FALSE, FALSE, 0); - - GtkWidget *addPropButton = gtk_button_new (); - //gtk_widget_set_size_request (addPropButton, 27, 27); - gtk_widget_set_tooltip_text (addPropButton, "Add property"); - GtkWidget *addPropContents = gtk_hbox_new(FALSE, 0); - GtkWidget *addPropIcon = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON); - gtk_container_add (GTK_CONTAINER (addPropContents), addPropIcon); - gtk_container_add (GTK_CONTAINER (addPropContents), gtk_label_new ("P")); - gtk_container_add (GTK_CONTAINER (addPropButton), addPropContents); - gtk_box_pack_start (buttonBox, addPropButton, FALSE, FALSE, 0); - g_signal_connect (G_OBJECT (addPropButton), - "clicked", - G_CALLBACK (add_prop_clicked_cb), - self); - - GtkWidget *addAtomButton = gtk_button_new (); - //gtk_widget_set_size_request (addAtomButton, 27, 27); - gtk_widget_set_tooltip_text (addAtomButton, "Add atom"); - GtkWidget *addAtomContents = gtk_hbox_new(FALSE, 0); - GtkWidget *addAtomIcon = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON); - gtk_container_add (GTK_CONTAINER (addAtomContents), addAtomIcon); - gtk_container_add (GTK_CONTAINER (addAtomContents), gtk_label_new ("A")); - gtk_container_add (GTK_CONTAINER (addAtomButton), addAtomContents); - gtk_box_pack_start (buttonBox, addAtomButton, FALSE, FALSE, 0); - g_signal_connect (G_OBJECT (addAtomButton), - "clicked", - G_CALLBACK (add_atom_clicked_cb), - self); - - removeButton = gtk_button_new (); - g_object_ref_sink (G_OBJECT (removeButton)); - gtk_widget_set_sensitive (removeButton, FALSE); - //gtk_widget_set_size_request (removeButton, 27, 27); - gtk_widget_set_tooltip_text (removeButton, "Remove selected"); - GtkWidget *removeIcon = gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_BUTTON); - gtk_container_add (GTK_CONTAINER (removeButton), removeIcon); - gtk_box_pack_start (buttonBox, removeButton, FALSE, FALSE, 0); - g_signal_connect (G_OBJECT (removeButton), - "clicked", - G_CALLBACK (remove_clicked_cb), - self); - - GtkTreeSelection *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view)); - g_signal_connect (G_OBJECT (selection), - "changed", - G_CALLBACK (selection_changed_cb), - self); - - gtk_widget_show_all (GTK_WIDGET (buttonBox)); - gtk_widget_show_all (scrolledview); - - gtk_widget_set_sensitive (widget, FALSE); - } - - return self; -} - -- (void) dealloc { - [self clearStore]; - - [data release]; - [delegate release]; - - g_object_unref (list); - g_object_unref (view); - g_object_unref (widget); - g_object_unref (removeButton); - - [super dealloc]; -} - -@synthesize widget, delegate; - -- (GraphElementData*) data { return data; } -- (void) setData:(GraphElementData*)d { - [d retain]; - [data release]; - data = d; - [self reloadProperties]; - gtk_widget_set_sensitive (widget, data != nil); -} - -- (void) reloadProperties { - [self clearStore]; - int pos = 0; - for (GraphElementProperty *p in data) { - GtkTreeIter iter; - [p retain]; - gtk_list_store_insert_with_values (list, &iter, pos, - PLM_NAME_COL, [[p key] UTF8String], - PLM_VALUE_COL, [[p value] UTF8String], - PLM_IS_PROPERTY_COL, ![p isAtom], - PLM_PROPERTY_COL, (void *)p, - -1); - ++pos; - } -} - -@end - -// }}} -// {{{ Private - -@implementation PropertyListEditor (Private) -- (void) updatePath:(gchar*)pathStr withValue:(NSString*)newText { - if (![newText isValidTikzPropertyNameOrValue]) - return; - - GtkTreeIter iter; - GtkTreePath *path = gtk_tree_path_new_from_string (pathStr); - - if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (list), &iter, path)) { - gtk_tree_path_free (path); - return; - } - - void *propPtr; - gtk_tree_model_get (GTK_TREE_MODEL (list), &iter, - PLM_PROPERTY_COL, &propPtr, - -1); - GraphElementProperty *prop = (GraphElementProperty*)propPtr; - - if (![prop isAtom]) { - if (![delegate respondsToSelector:@selector(startEdit)] || [delegate startEdit]) { - [prop setValue:newText]; - gtk_list_store_set (list, &iter, - PLM_VALUE_COL, [newText UTF8String], - -1); - [delegate endEdit]; - } - } - - gtk_tree_path_free (path); -} - -- (void) updatePath:(gchar*)pathStr withName:(NSString*)newText { - if (![newText isValidTikzPropertyNameOrValue]) - return; - - GtkTreeIter iter; - GtkTreePath *path = gtk_tree_path_new_from_string (pathStr); - - if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (list), &iter, path)) { - gtk_tree_path_free (path); - return; - } - - void *propPtr; - gtk_tree_model_get (GTK_TREE_MODEL (list), &iter, - PLM_PROPERTY_COL, &propPtr, - -1); - GraphElementProperty *prop = (GraphElementProperty*)propPtr; - - if (![delegate respondsToSelector:@selector(startEdit)] || [delegate startEdit]) { - if ([newText isEqualToString:@""]) { - [data removeObjectIdenticalTo:prop]; - gtk_list_store_remove (list, &iter); - [prop release]; - } else { - [prop setKey:newText]; - gtk_list_store_set (list, &iter, - PLM_NAME_COL, [newText UTF8String], - -1); - } - [delegate endEdit]; - } - - gtk_tree_path_free (path); -} - -- (void) addProperty { - GtkTreeIter iter; - GraphElementProperty *p = [[GraphElementProperty alloc] initWithPropertyValue:@"" forKey:@"new property"]; - if (![delegate respondsToSelector:@selector(startEdit)] || [delegate startEdit]) { - [data addObject:p]; - gint pos = [data count] - 1; - gtk_list_store_insert_with_values (list, &iter, pos, - PLM_NAME_COL, "new property", - PLM_VALUE_COL, "", - PLM_IS_PROPERTY_COL, TRUE, - PLM_PROPERTY_COL, (void *)p, - -1); - [delegate endEdit]; - } else { - [p release]; - } -} - -- (void) addAtom { - GtkTreeIter iter; - GraphElementProperty *p = [[GraphElementProperty alloc] initWithAtomName:@"new atom"]; - if (![delegate respondsToSelector:@selector(startEdit)] || [delegate startEdit]) { - [data addObject:p]; - gint pos = [data count] - 1; - gtk_list_store_insert_with_values (list, &iter, pos, - PLM_NAME_COL, "new atom", - PLM_VALUE_COL, [[p value] UTF8String], - PLM_IS_PROPERTY_COL, FALSE, - PLM_PROPERTY_COL, (void *)p, - -1); - [delegate endEdit]; - } else { - [p release]; - } -} - -- (void) removeSelected { - GtkTreeSelection *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view)); - GList *selPaths = gtk_tree_selection_get_selected_rows (selection, NULL); - GList *selIters = NULL; - - // Convert to iters, as GtkListStore has persistent iters - GList *curr = selPaths; - while (curr != NULL) { - GtkTreeIter iter; - gtk_tree_model_get_iter (GTK_TREE_MODEL (list), - &iter, - (GtkTreePath*)curr->data); - selIters = g_list_prepend (selIters, gtk_tree_iter_copy (&iter)); - curr = g_list_next (curr); - } - - // remove all iters - curr = selIters; - while (curr != NULL) { - GtkTreeIter *iter = (GtkTreeIter*)curr->data; - void *propPtr; - gtk_tree_model_get (GTK_TREE_MODEL (list), iter, - PLM_PROPERTY_COL, &propPtr, - -1); - GraphElementProperty *prop = (GraphElementProperty*)propPtr; - if (![delegate respondsToSelector:@selector(startEdit)] || [delegate startEdit]) { - [data removeObjectIdenticalTo:prop]; - gtk_list_store_remove (list, iter); - [prop release]; - [delegate endEdit]; - } - curr = g_list_next (curr); - } - - g_list_foreach (selIters, (GFunc) gtk_tree_iter_free, NULL); - g_list_free (selIters); - g_list_foreach (selPaths, (GFunc) gtk_tree_path_free, NULL); - g_list_free (selPaths); -} - -- (void) selectionCountChanged:(int)count { - gtk_widget_set_sensitive (removeButton, count > 0); -} - -- (void) clearStore { - GtkTreeIter iter; - if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list), &iter)) { - do { - void *prop; - gtk_tree_model_get (GTK_TREE_MODEL (list), &iter, - PLM_PROPERTY_COL, &prop, - -1); - [(id)prop release]; - } while (gtk_tree_model_iter_next (GTK_TREE_MODEL (list), &iter)); - gtk_list_store_clear (list); - } -} -@end - -// }}} -// {{{ GTK+ callbacks - -static void value_edited_cb (GtkCellRendererText *renderer, - gchar *path, - gchar *new_text, - PropertyListEditor *editor) -{ - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor updatePath:path withValue:[NSString stringWithUTF8String:new_text]]; - [pool drain]; -} - -static void name_edited_cb (GtkCellRendererText *renderer, - gchar *path, - gchar *new_text, - PropertyListEditor *editor) -{ - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor updatePath:path withName:[NSString stringWithUTF8String:new_text]]; - [pool drain]; -} - -static void add_prop_clicked_cb (GtkButton *button, - PropertyListEditor *editor) -{ - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor addProperty]; - [pool drain]; -} - -static void add_atom_clicked_cb (GtkButton *button, - PropertyListEditor *editor) -{ - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor addAtom]; - [pool drain]; -} - -static void remove_clicked_cb (GtkButton *button, - PropertyListEditor *editor) -{ - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [editor removeSelected]; - [pool drain]; -} - -static void text_editing_started (GtkCellRenderer *cell, - GtkCellEditable *editable, - const gchar *path, - PropertyListEditor *editor) -{ - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - if (GTK_IS_EDITABLE (editable) && GTK_IS_WIDGET (editable)) { - g_signal_handlers_disconnect_by_func (G_OBJECT (editable), - G_CALLBACK (text_changed_cb), - editor); - widget_clear_error (GTK_WIDGET (editable)); - g_signal_connect (G_OBJECT (editable), - "changed", - G_CALLBACK (text_changed_cb), - editor); - } - - [pool drain]; -} - -static void text_changed_cb (GtkEditable *editable, PropertyListEditor *pane) -{ - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - NSString *newValue = gtk_editable_get_string (editable, 0, -1); - if (![newValue isValidTikzPropertyNameOrValue]) { - widget_set_error (GTK_WIDGET (editable)); - } else { - widget_clear_error (GTK_WIDGET (editable)); - } - - [pool drain]; -} - -static void selection_changed_cb (GtkTreeSelection *selection, - PropertyListEditor *pane) -{ - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - int selcount = gtk_tree_selection_count_selected_rows (selection); - [pane selectionCountChanged:selcount]; - [pool drain]; -} - -// }}} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/RecentManager.h b/tikzit-old/src/gtk/RecentManager.h deleted file mode 100644 index e2c2793..0000000 --- a/tikzit-old/src/gtk/RecentManager.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" - -@interface RecentManager: NSObject { -} - -+ (RecentManager*) defaultManager; - -- (void)addRecentFile:(NSString*)path; -- (void)removeRecentFile:(NSString*)path; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/RecentManager.m b/tikzit-old/src/gtk/RecentManager.m deleted file mode 100644 index c6074c6..0000000 --- a/tikzit-old/src/gtk/RecentManager.m +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "RecentManager.h" -#import - -static RecentManager *defMan = nil; - -@implementation RecentManager -- (id) init { - self = [super init]; - return self; -} - -+ (RecentManager*) defaultManager { - if (defMan == nil) { - defMan = [[self alloc] init]; - } - return defMan; -} - -- (void)addRecentFile:(NSString*)path { - NSError *error = nil; - gchar *uri = [path glibUriWithError:&error]; - if (error) { - logError (error, @"Could not add recent file"); - return; - } - - GtkRecentData recent_data; - recent_data.display_name = NULL; - recent_data.description = NULL; - recent_data.mime_type = "text/x-tikz"; - recent_data.app_name = (gchar *) g_get_application_name (); - recent_data.app_exec = g_strjoin (" ", g_get_prgname (), "%u", NULL); - recent_data.groups = NULL; - recent_data.is_private = FALSE; - - gtk_recent_manager_add_full (gtk_recent_manager_get_default(), uri, &recent_data); - - g_free (uri); - g_free (recent_data.app_exec); -} - -- (void)removeRecentFile:(NSString*)path { - NSError *error = nil; - gchar *uri = [path glibUriWithError:&error]; - if (error) { - logError (error, @"Could not remove recent file"); - return; - } - - gtk_recent_manager_remove_item (gtk_recent_manager_get_default(), uri, NULL); - - g_free (uri); -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/SelectTool.h b/tikzit-old/src/gtk/SelectTool.h deleted file mode 100644 index 65f511a..0000000 --- a/tikzit-old/src/gtk/SelectTool.h +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "Tool.h" - -@class Edge; -@class Node; - -// FIXME: replace this with delegates -typedef enum { - QuietState, - SelectBoxState, - ToggleSelectState, - MoveSelectedNodesState, - DragEdgeControlPoint1, - DragEdgeControlPoint2 -} SelectToolState; - -typedef enum { - DragSelectsNodes = 1, - DragSelectsEdges = 2, - DragSelectsBoth = DragSelectsNodes | DragSelectsEdges -} DragSelectMode; - -@interface SelectTool : NSObject { - GraphRenderer *renderer; - SelectToolState state; - float edgeFuzz; - DragSelectMode dragSelectMode; - NSPoint dragOrigin; - Node *leaderNode; - NSPoint oldLeaderPos; - Edge *modifyEdge; - NSRect selectionBox; - NSMutableSet *selectionBoxContents; - - GtkWidget *configWidget; - GSList *dragSelectModeButtons; -} - -@property (assign) float edgeFuzz; -@property (assign) DragSelectMode dragSelectMode; - -- (id) init; -+ (id) tool; -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/SelectTool.m b/tikzit-old/src/gtk/SelectTool.m deleted file mode 100644 index b3121ae..0000000 --- a/tikzit-old/src/gtk/SelectTool.m +++ /dev/null @@ -1,590 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "SelectTool.h" - -#import "Configuration.h" -#import "Edge+Render.h" -#import "GraphRenderer.h" -#import "TikzDocument.h" -#import "tzstockitems.h" - -#import - -#define DRAG_SELECT_MODE_KEY "tikzit-drag-select-mode" - -static const InputMask unionSelectMask = ShiftMask; - -static void drag_select_mode_cb (GtkToggleButton *button, SelectTool *tool); - -@interface SelectTool (Private) -- (TikzDocument*) doc; -- (void) shiftNodesByMovingLeader:(Node*)leader to:(NSPoint)to; -- (void) deselectAllNodes; -- (void) deselectAllEdges; -- (void) deselectAll; -- (BOOL) circleWithCenter:(NSPoint)c andRadius:(float)r containsPoint:(NSPoint)p; -- (void) lookForControlPointAt:(NSPoint)pos; -- (void) setSelectionBox:(NSRect)box; -- (void) clearSelectionBox; -- (BOOL) selectionBoxContainsNode:(Node*)node; -@end - -@implementation SelectTool -- (NSString*) name { return @"Select"; } -- (const gchar*) stockId { return TIKZIT_STOCK_SELECT; } -- (NSString*) helpText { return @"Select, move and edit nodes and edges"; } -- (NSString*) shortcut { return @"s"; } -@synthesize configurationWidget=configWidget; -@synthesize edgeFuzz; - -+ (id) tool { - return [[[self alloc] init] autorelease]; -} - -- (id) init { - self = [super init]; - - if (self) { - state = QuietState; - edgeFuzz = 3.0f; - dragSelectMode = DragSelectsNodes; - - configWidget = gtk_vbox_new (FALSE, 0); - g_object_ref_sink (configWidget); - - GtkWidget *label = gtk_label_new ("Drag selects:"); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_box_pack_start (GTK_BOX (configWidget), - label, - FALSE, - FALSE, - 0); - - GtkWidget *nodeOpt = gtk_radio_button_new_with_label (NULL, "nodes (N)"); - g_object_set_data (G_OBJECT (nodeOpt), - DRAG_SELECT_MODE_KEY, - (gpointer)DragSelectsNodes); - gtk_box_pack_start (GTK_BOX (configWidget), - nodeOpt, - FALSE, - FALSE, - 0); - g_signal_connect (G_OBJECT (nodeOpt), - "toggled", - G_CALLBACK (drag_select_mode_cb), - self); - - GtkWidget *edgeOpt = gtk_radio_button_new_with_label ( - gtk_radio_button_get_group (GTK_RADIO_BUTTON (nodeOpt)), - "edges (E)"); - g_object_set_data (G_OBJECT (edgeOpt), - DRAG_SELECT_MODE_KEY, - (gpointer)DragSelectsEdges); - gtk_box_pack_start (GTK_BOX (configWidget), - edgeOpt, - FALSE, - FALSE, - 0); - g_signal_connect (G_OBJECT (edgeOpt), - "toggled", - G_CALLBACK (drag_select_mode_cb), - self); - - GtkWidget *bothOpt = gtk_radio_button_new_with_label ( - gtk_radio_button_get_group (GTK_RADIO_BUTTON (edgeOpt)), - "both (B)"); - g_object_set_data (G_OBJECT (bothOpt), - DRAG_SELECT_MODE_KEY, - (gpointer)DragSelectsBoth); - gtk_box_pack_start (GTK_BOX (configWidget), - bothOpt, - FALSE, - FALSE, - 0); - g_signal_connect (G_OBJECT (bothOpt), - "toggled", - G_CALLBACK (drag_select_mode_cb), - self); - dragSelectModeButtons = gtk_radio_button_get_group (GTK_RADIO_BUTTON (bothOpt)); - - gtk_widget_show_all (configWidget); - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - [renderer release]; - [leaderNode release]; - [modifyEdge release]; - - g_object_unref (G_OBJECT (configWidget)); - - [super dealloc]; -} - -- (DragSelectMode) dragSelectMode { - return dragSelectMode; -} - -- (void) setDragSelectMode:(DragSelectMode)mode { - if (dragSelectMode == mode) - return; - - dragSelectMode = mode; - - GSList *entry = dragSelectModeButtons; - while (entry) { - GtkToggleButton *button = GTK_TOGGLE_BUTTON (entry->data); - DragSelectMode buttonMode = - (DragSelectMode) g_object_get_data ( - G_OBJECT (button), - DRAG_SELECT_MODE_KEY); - if (buttonMode == dragSelectMode) { - gtk_toggle_button_set_active (button, TRUE); - break; - } - - entry = g_slist_next (entry); - } -} - -- (GraphRenderer*) activeRenderer { return renderer; } -- (void) setActiveRenderer:(GraphRenderer*)r { - if (r == renderer) - return; - - [r retain]; - [renderer release]; - renderer = r; - - state = QuietState; -} - -- (void) mousePressAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { - if (button != LeftButton) - return; - - dragOrigin = pos; - - // we should already be in a quiet state, but no harm in making sure - state = QuietState; - - modifyEdge = nil; - [self lookForControlPointAt:pos]; - - if (modifyEdge == nil) { - // we didn't find a control point - - BOOL unionSelect = (mask & unionSelectMask); - - leaderNode = [renderer anyNodeAt:pos]; - // if we hit a node, deselect other nodes (if Shift is up) and go to move mode - if (leaderNode != nil) { - BOOL alreadySelected = [[self doc] isNodeSelected:leaderNode]; - if (!unionSelect && !alreadySelected) { - [self deselectAll]; - } - if (unionSelect && alreadySelected) { - state = ToggleSelectState; - } else { - [[[self doc] pickSupport] selectNode:leaderNode]; - state = MoveSelectedNodesState; - oldLeaderPos = [leaderNode point]; - [[self doc] startShiftNodes:[[[self doc] pickSupport] selectedNodes]]; - } - } - - // if mouse did not hit a node, check if mouse hit an edge - if (leaderNode == nil) { - Edge *edge = [renderer anyEdgeAt:pos withFuzz:edgeFuzz]; - if (edge != nil) { - BOOL alreadySelected = [[self doc] isEdgeSelected:edge]; - if (!unionSelect) { - [self deselectAll]; - } - if (unionSelect && alreadySelected) { - [[[self doc] pickSupport] deselectEdge:edge]; - } else { - [[[self doc] pickSupport] selectEdge:edge]; - } - } else { - // if mouse did not hit anything, put us in box mode - if (!unionSelect) { - [self deselectAll]; - } - [renderer clearHighlightedNodes]; - state = SelectBoxState; - } - } - } -} - -- (void) mouseMoveTo:(NSPoint)pos withButtons:(MouseButton)buttons andMask:(InputMask)mask { - if (!(buttons & LeftButton)) - return; - - Transformer *transformer = [renderer transformer]; - - if (state == ToggleSelectState) { - state = MoveSelectedNodesState; - oldLeaderPos = [leaderNode point]; - [[self doc] startShiftNodes:[[[self doc] pickSupport] selectedNodes]]; - } - - if (state == SelectBoxState) { - [self setSelectionBox:NSRectAroundPoints(dragOrigin, pos)]; - - NSEnumerator *enumerator = [[self doc] nodeEnumerator]; - Node *node; - while ((node = [enumerator nextObject]) != nil) { - NSPoint nodePos = [transformer toScreen:[node point]]; - if (NSPointInRect(nodePos, selectionBox)) { - [renderer setNode:node highlighted:YES]; - } else { - [renderer setNode:node highlighted:NO]; - } - } - } else if (state == MoveSelectedNodesState) { - if (leaderNode != nil) { - [self shiftNodesByMovingLeader:leaderNode to:pos]; - NSPoint shiftSoFar; - shiftSoFar.x = [leaderNode point].x - oldLeaderPos.x; - shiftSoFar.y = [leaderNode point].y - oldLeaderPos.y; - [[self doc] shiftNodesUpdate:shiftSoFar]; - } - } else if (state == DragEdgeControlPoint1 || state == DragEdgeControlPoint2) { - // invalidate once before we start changing it: we may be shrinking - // the control circles - [[self doc] modifyEdgeCheckPoint]; - if (state == DragEdgeControlPoint1) { - [modifyEdge moveCp1To:[transformer fromScreen:pos] - withWeightCourseness:0.1f - andBendCourseness:15 - forceLinkControlPoints:(mask & ControlMask)]; - } else { - [modifyEdge moveCp2To:[transformer fromScreen:pos] - withWeightCourseness:0.1f - andBendCourseness:15 - forceLinkControlPoints:(mask & ControlMask)]; - } - [[self doc] modifyEdgeCheckPoint]; - } -} - -- (void) mouseReleaseAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { - if (button != LeftButton) - return; - - if (state == SelectBoxState) { - PickSupport *ps = [[self doc] pickSupport]; - Transformer *transformer = [renderer transformer]; - - if (!(mask & unionSelectMask)) { - [ps deselectAllNodes]; - [ps deselectAllEdges]; - } - - Graph *graph = [[self doc] graph]; - if (dragSelectMode & DragSelectsNodes) { - for (Node *node in [graph nodes]) { - NSPoint nodePos = [transformer toScreen:[node point]]; - if (NSPointInRect(nodePos, selectionBox)) { - [ps selectNode:node]; - } - } - } - if (dragSelectMode & DragSelectsEdges) { - for (Edge *edge in [graph edges]) { - NSPoint edgePos = [transformer toScreen:[edge mid]]; - if (NSPointInRect(edgePos, selectionBox)) { - [ps selectEdge:edge]; - } - } - } - - [self clearSelectionBox]; - } else if (state == ToggleSelectState) { - [[[self doc] pickSupport] deselectNode:leaderNode]; - leaderNode = nil; - } else if (state == MoveSelectedNodesState) { - if (NSEqualPoints (oldLeaderPos, [leaderNode point])) { - [[self doc] cancelShiftNodes]; - } else { - [[self doc] endShiftNodes]; - } - leaderNode = nil; - } else if (state == DragEdgeControlPoint1 || state == DragEdgeControlPoint2) { - // FIXME: check if there was any real change - [[self doc] endModifyEdge]; - } - - state = QuietState; -} - -- (void) mouseDoubleClickAt:(NSPoint)pos withButton:(MouseButton)button andMask:(InputMask)mask { - if (button != LeftButton) - return; - - if (state != QuietState) { - return; - } - // convert bend mode on edge under mouse cursor - Edge *edge = [renderer anyEdgeAt:pos withFuzz:edgeFuzz]; - if (edge != nil) { - [[self doc] startModifyEdge:edge]; - if ([edge bendMode]==EdgeBendModeBasic) { - [edge convertBendToAngles]; - [edge setBendMode:EdgeBendModeInOut]; - } else { - [edge setBendMode:EdgeBendModeBasic]; - } - [[self doc] endModifyEdge]; - - [self deselectAllEdges]; - [[[self doc] pickSupport] selectEdge:edge]; - } -} - -- (void) keyPressed:(unsigned int)keyVal withMask:(InputMask)mask { - if (keyVal == GDK_KEY_N && mask == ShiftMask) { - [self setDragSelectMode:DragSelectsNodes]; - } else if (keyVal == GDK_KEY_E && mask == ShiftMask) { - [self setDragSelectMode:DragSelectsEdges]; - } else if (keyVal == GDK_KEY_B && mask == ShiftMask) { - [self setDragSelectMode:DragSelectsBoth]; - } else if (keyVal == GDK_KEY_D && (!mask || mask == ShiftMask)) { - PickSupport *ps = [[self doc] pickSupport]; - for (Node* node in [ps selectedNodes]) { - NSRect b = [node boundingRect]; - NSLog(@"%@ @ (%f,%f) {style=%@, label=%@, data=%@, bounds=(%f,%f),(%fx%f)}", - [node name], - [node point].x, - [node point].y, - [[node style] name], - [node label], - [[node data] tikzList], - b.origin.x, b.origin.y, b.size.width, b.size.height); - } - for (Edge* edge in [ps selectedEdges]) { - NSRect b = [edge boundingRect]; - NSLog(@"%@:%@->%@:%@ {\n" - @" style=%@, data=%@,\n" - @" bend=%d, weight=%f, inAngle=%d, outAngle=%d, bendMode=%d,\n" - @" head=(%f,%f), headTan=(%f,%f) leftHeadNormal=(%f,%f), rightHeadNormal=(%f,%f),\n" - @" cp1=(%f,%f),\n" - @" mid=(%f,%f), midTan=(%f,%f), leftNormal=(%f,%f), rightNormal=(%f,%f)\n" - @" cp2=(%f,%f),\n" - @" tail=(%f,%f), tailTan=(%f,%f), leftTailNormal=(%f,%f), rightTailNormal=(%f,%f),\n" - @" isSelfLoop=%s, isStraight=%s,\n" - @" bounds=(%f,%f),(%fx%f)\n" - @"}", - [[edge source] name], - [edge sourceAnchor], - [[edge target] name], - [edge targetAnchor], - [[edge style] name], - [[edge data] tikzList], - [edge bend], - [edge weight], - [edge inAngle], - [edge outAngle], - [edge bendMode], - [edge head].x, - [edge head].y, - [edge headTan].x, - [edge headTan].y, - [edge leftHeadNormal].x, - [edge leftHeadNormal].y, - [edge rightHeadNormal].x, - [edge rightHeadNormal].y, - [edge cp1].x, - [edge cp1].y, - [edge mid].x, - [edge mid].y, - [edge midTan].x, - [edge midTan].y, - [edge leftNormal].x, - [edge leftNormal].y, - [edge rightNormal].x, - [edge rightNormal].y, - [edge cp2].x, - [edge cp2].y, - [edge tail].x, - [edge tail].y, - [edge tailTan].x, - [edge tailTan].y, - [edge leftTailNormal].x, - [edge leftTailNormal].y, - [edge rightTailNormal].x, - [edge rightTailNormal].y, - [edge isSelfLoop] ? "yes" : "no", - [edge isStraight] ? "yes" : "no", - b.origin.x, b.origin.y, b.size.width, b.size.height); - } - } -} - -- (void) renderWithContext:(id)context onSurface:(id)surface { - if (!NSIsEmptyRect (selectionBox)) { - [context saveState]; - - [context setAntialiasMode:AntialiasDisabled]; - [context setLineWidth:1.0]; - [context startPath]; - [context rect:selectionBox]; - RColor fColor = MakeRColor (0.8, 0.8, 0.8, 0.2); - RColor sColor = MakeSolidRColor (0.6, 0.6, 0.6); - [context strokePathWithColor:sColor andFillWithColor:fColor]; - - [context restoreState]; - } -} - -- (void) loadConfiguration:(Configuration*)config { - NSString *mode = [config stringEntry:@"Drag select mode" - inGroup:@"SelectTool"]; - if ([mode isEqualToString:@"nodes"]) { - [self setDragSelectMode:DragSelectsNodes]; - } else if ([mode isEqualToString:@"edges"]) { - [self setDragSelectMode:DragSelectsEdges]; - } else if ([mode isEqualToString:@"both"]) { - [self setDragSelectMode:DragSelectsBoth]; - } -} - -- (void) saveConfiguration:(Configuration*)config { - switch (dragSelectMode) { - case DragSelectsNodes: - [config setStringEntry:@"Drag select mode" - inGroup:@"SelectTool" - value:@"nodes"]; - break; - case DragSelectsEdges: - [config setStringEntry:@"Drag select mode" - inGroup:@"SelectTool" - value:@"edges"]; - break; - case DragSelectsBoth: - [config setStringEntry:@"Drag select mode" - inGroup:@"SelectTool" - value:@"both"]; - break; - } -} - -@end - -@implementation SelectTool (Private) -- (TikzDocument*) doc { - return [renderer document]; -} - -- (void) shiftNodesByMovingLeader:(Node*)leader to:(NSPoint)to { - Transformer *transformer = [renderer transformer]; - - NSPoint from = [transformer toScreen:[leader point]]; - to = [[renderer grid] snapScreenPoint:to]; - float dx = to.x - from.x; - float dy = to.y - from.y; - - for (Node *node in [[[self doc] pickSupport] selectedNodes]) { - NSPoint p = [transformer toScreen:[node point]]; - p.x += dx; - p.y += dy; - [node setPoint:[transformer fromScreen:p]]; - } -} - -- (void) deselectAllNodes { - [[[self doc] pickSupport] deselectAllNodes]; -} - -- (void) deselectAllEdges { - [[[self doc] pickSupport] deselectAllEdges]; -} - -- (void) deselectAll { - [[[self doc] pickSupport] deselectAllNodes]; - [[[self doc] pickSupport] deselectAllEdges]; -} - -- (BOOL) circleWithCenter:(NSPoint)c andRadius:(float)r containsPoint:(NSPoint)p { - return (NSDistanceBetweenPoints(c, p) <= r); -} - -- (void) lookForControlPointAt:(NSPoint)pos { - const float cpr = [Edge controlPointRadius]; - for (Edge *e in [[[self doc] pickSupport] selectedEdges]) { - NSPoint cp1 = [[renderer transformer] toScreen:[e cp1]]; - if ([self circleWithCenter:cp1 andRadius:cpr containsPoint:pos]) { - state = DragEdgeControlPoint1; - modifyEdge = e; - [[self doc] startModifyEdge:e]; - return; - } - NSPoint cp2 = [[renderer transformer] toScreen:[e cp2]]; - if ([self circleWithCenter:cp2 andRadius:cpr containsPoint:pos]) { - state = DragEdgeControlPoint2; - modifyEdge = e; - [[self doc] startModifyEdge:e]; - return; - } - } -} - -- (void) setSelectionBox:(NSRect)box { - NSRect invRect = NSUnionRect (selectionBox, box); - selectionBox = box; - [renderer invalidateRect:NSInsetRect (invRect, -2, -2)]; -} - -- (void) clearSelectionBox { - NSRect oldRect = selectionBox; - - selectionBox = NSZeroRect; - - [renderer invalidateRect:NSInsetRect (oldRect, -2, -2)]; - [renderer clearHighlightedNodes]; -} - -- (BOOL) selectionBoxContainsNode:(Node*)node { - if (!NSIsEmptyRect (selectionBox)) - return NO; - - Transformer *transf = [[renderer surface] transformer]; - NSPoint screenPt = [transf toScreen:[node point]]; - return NSPointInRect(screenPt, selectionBox); -} -@end - -static void drag_select_mode_cb (GtkToggleButton *button, SelectTool *tool) { - if (gtk_toggle_button_get_active (button)) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - DragSelectMode buttonMode = - (DragSelectMode) g_object_get_data ( - G_OBJECT (button), - DRAG_SELECT_MODE_KEY); - [tool setDragSelectMode:buttonMode]; - [pool drain]; - } -} - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/SelectionPane.h b/tikzit-old/src/gtk/SelectionPane.h deleted file mode 100644 index 57a766a..0000000 --- a/tikzit-old/src/gtk/SelectionPane.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class Configuration; -@class EdgeStylesModel; -@class NodeStylesModel; -@class StyleManager; -@class TikzDocument; - -@interface SelectionPane: NSObject { - TikzDocument *document; - - NodeStylesModel *nodeStylesModel; - EdgeStylesModel *edgeStylesModel; - - GtkWidget *layout; - - GtkWidget *nodeStyleCombo; - GtkWidget *applyNodeStyleButton; - GtkWidget *clearNodeStyleButton; - GtkWidget *edgeStyleCombo; - GtkWidget *applyEdgeStyleButton; - GtkWidget *clearEdgeStyleButton; -} - -@property (retain) TikzDocument *document; -@property (assign) BOOL visible; -@property (readonly) GtkWidget *gtkWidget; - -- (id) initWithStyleManager:(StyleManager*)mgr; -- (id) initWithNodeStylesModel:(NodeStylesModel*)nsm - andEdgeStylesModel:(EdgeStylesModel*)esm; - -- (void) loadConfiguration:(Configuration*)config; -- (void) saveConfiguration:(Configuration*)config; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/SelectionPane.m b/tikzit-old/src/gtk/SelectionPane.m deleted file mode 100644 index 2931258..0000000 --- a/tikzit-old/src/gtk/SelectionPane.m +++ /dev/null @@ -1,432 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "SelectionPane.h" - -#import "Configuration.h" -#import "EdgeStylesModel.h" -#import "NodeStylesModel.h" -#import "TikzDocument.h" - -#import "gtkhelpers.h" - -// {{{ Internal interfaces - -static void node_style_changed_cb (GtkComboBox *widget, SelectionPane *pane); -static void apply_node_style_button_cb (GtkButton *widget, SelectionPane *pane); -static void clear_node_style_button_cb (GtkButton *widget, SelectionPane *pane); -static void edge_style_changed_cb (GtkComboBox *widget, SelectionPane *pane); -static void apply_edge_style_button_cb (GtkButton *widget, SelectionPane *pane); -static void clear_edge_style_button_cb (GtkButton *widget, SelectionPane *pane); - -static void setup_style_cell_layout (GtkCellLayout *cell_layout, gint pixbuf_col, gint name_col); - -@interface SelectionPane (Notifications) -- (void) nodeSelectionChanged:(NSNotification*)n; -- (void) edgeSelectionChanged:(NSNotification*)n; -@end - -@interface SelectionPane (Private) -- (void) _updateNodeStyleButtons; -- (void) _updateEdgeStyleButtons; -- (NodeStyle*) _selectedNodeStyle; -- (EdgeStyle*) _selectedEdgeStyle; -- (void) _applyNodeStyle; -- (void) _clearNodeStyle; -- (void) _applyEdgeStyle; -- (void) _clearEdgeStyle; -@end - -// }}} -// {{{ API - -@implementation SelectionPane - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithStyleManager:(StyleManager*)sm { - return [self initWithNodeStylesModel:[NodeStylesModel modelWithStyleManager:sm] - andEdgeStylesModel:[EdgeStylesModel modelWithStyleManager:sm]]; -} - -- (id) initWithNodeStylesModel:(NodeStylesModel*)nsm - andEdgeStylesModel:(EdgeStylesModel*)esm { - self = [super init]; - - if (self) { - nodeStylesModel = [nsm retain]; - edgeStylesModel = [esm retain]; - - layout = gtk_vbox_new (FALSE, 0); - g_object_ref_sink (layout); - gtk_widget_show (layout); - - GtkWidget *label = gtk_label_new ("Selection"); - label_set_bold (GTK_LABEL (label)); - gtk_widget_show (label); - gtk_box_pack_start (GTK_BOX (layout), label, - FALSE, FALSE, 0); - - GtkWidget *lvl1_box = gtk_vbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (layout), lvl1_box, - FALSE, FALSE, 3); - - nodeStyleCombo = gtk_combo_box_new_with_model ([nodeStylesModel model]); - g_object_ref_sink (nodeStyleCombo); - setup_style_cell_layout (GTK_CELL_LAYOUT (nodeStyleCombo), - NODE_STYLES_ICON_COL, - NODE_STYLES_NAME_COL); - g_signal_connect (G_OBJECT (nodeStyleCombo), - "changed", - G_CALLBACK (node_style_changed_cb), - self); - gtk_box_pack_start (GTK_BOX (lvl1_box), nodeStyleCombo, - FALSE, FALSE, 0); - - GtkWidget *lvl2_box = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (lvl1_box), lvl2_box, - FALSE, FALSE, 0); - - applyNodeStyleButton = gtk_button_new_with_label ("Apply"); - g_object_ref_sink (applyNodeStyleButton); - gtk_widget_set_tooltip_text (applyNodeStyleButton, "Apply style to selected nodes"); - gtk_widget_set_sensitive (applyNodeStyleButton, FALSE); - g_signal_connect (G_OBJECT (applyNodeStyleButton), - "clicked", - G_CALLBACK (apply_node_style_button_cb), - self); - gtk_box_pack_start (GTK_BOX (lvl2_box), applyNodeStyleButton, - FALSE, FALSE, 0); - - clearNodeStyleButton = gtk_button_new_with_label ("Clear"); - g_object_ref_sink (clearNodeStyleButton); - gtk_widget_set_tooltip_text (clearNodeStyleButton, "Clear style from selected nodes"); - gtk_widget_set_sensitive (clearNodeStyleButton, FALSE); - g_signal_connect (G_OBJECT (clearNodeStyleButton), - "clicked", - G_CALLBACK (clear_node_style_button_cb), - self); - gtk_box_pack_start (GTK_BOX (lvl2_box), clearNodeStyleButton, - FALSE, FALSE, 0); - - lvl1_box = gtk_vbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (layout), lvl1_box, - FALSE, FALSE, 3); - - edgeStyleCombo = gtk_combo_box_new_with_model ([edgeStylesModel model]); - g_object_ref_sink (edgeStyleCombo); - setup_style_cell_layout (GTK_CELL_LAYOUT (edgeStyleCombo), - EDGE_STYLES_ICON_COL, - EDGE_STYLES_NAME_COL); - g_signal_connect (G_OBJECT (edgeStyleCombo), - "changed", - G_CALLBACK (edge_style_changed_cb), - self); - gtk_box_pack_start (GTK_BOX (lvl1_box), edgeStyleCombo, - FALSE, FALSE, 0); - - lvl2_box = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (lvl1_box), lvl2_box, - FALSE, FALSE, 0); - - applyEdgeStyleButton = gtk_button_new_with_label ("Apply"); - g_object_ref_sink (applyEdgeStyleButton); - gtk_widget_set_tooltip_text (applyEdgeStyleButton, "Apply style to selected edges"); - gtk_widget_set_sensitive (applyEdgeStyleButton, FALSE); - g_signal_connect (G_OBJECT (applyEdgeStyleButton), - "clicked", - G_CALLBACK (apply_edge_style_button_cb), - self); - gtk_box_pack_start (GTK_BOX (lvl2_box), applyEdgeStyleButton, - FALSE, FALSE, 0); - - clearEdgeStyleButton = gtk_button_new_with_label ("Clear"); - g_object_ref_sink (clearEdgeStyleButton); - gtk_widget_set_tooltip_text (clearEdgeStyleButton, "Clear style from selected edges"); - gtk_widget_set_sensitive (clearEdgeStyleButton, FALSE); - g_signal_connect (G_OBJECT (clearEdgeStyleButton), - "clicked", - G_CALLBACK (clear_edge_style_button_cb), - self); - gtk_box_pack_start (GTK_BOX (lvl2_box), clearEdgeStyleButton, - FALSE, FALSE, 0); - - gtk_widget_show_all (layout); - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - g_object_unref (nodeStyleCombo); - g_object_unref (applyNodeStyleButton); - g_object_unref (clearNodeStyleButton); - g_object_unref (edgeStyleCombo); - g_object_unref (applyEdgeStyleButton); - g_object_unref (clearEdgeStyleButton); - - g_object_unref (layout); - - [nodeStylesModel release]; - [edgeStylesModel release]; - - [document release]; - - [super dealloc]; -} - -- (TikzDocument*) document { - return document; -} - -- (void) setDocument:(TikzDocument*)doc { - if (document != nil) { - [[NSNotificationCenter defaultCenter] - removeObserver:self - name:nil - object:[document pickSupport]]; - } - - [doc retain]; - [document release]; - document = doc; - - if (doc != nil) { - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(nodeSelectionChanged:) - name:@"NodeSelectionChanged" object:[doc pickSupport]]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(edgeSelectionChanged:) - name:@"EdgeSelectionChanged" object:[doc pickSupport]]; - } - - [self _updateNodeStyleButtons]; - [self _updateEdgeStyleButtons]; -} - -- (BOOL) visible { - return gtk_widget_get_visible (layout); -} - -- (void) setVisible:(BOOL)visible { - gtk_widget_set_visible (layout, visible); -} - -- (GtkWidget*) gtkWidget { - return layout; -} - -- (void) loadConfiguration:(Configuration*)config { - NSString *nodeStyleName = [config stringEntry:@"SelectedNodeStyle" - inGroup:@"SelectionPane" - withDefault:nil]; - NodeStyle *nodeStyle = [[nodeStylesModel styleManager] nodeStyleForName:nodeStyleName]; - if (nodeStyle == nil) { - gtk_combo_box_set_active (GTK_COMBO_BOX (nodeStyleCombo), -1); - } else { - GtkTreeIter *iter = [nodeStylesModel iterFromStyle:nodeStyle]; - if (iter) { - gtk_combo_box_set_active_iter (GTK_COMBO_BOX (nodeStyleCombo), iter); - gtk_tree_iter_free (iter); - } - } - - NSString *edgeStyleName = [config stringEntry:@"SelectedEdgeStyle" - inGroup:@"SelectionPane" - withDefault:nil]; - EdgeStyle *edgeStyle = [[edgeStylesModel styleManager] edgeStyleForName:edgeStyleName]; - if (edgeStyle == nil) { - gtk_combo_box_set_active (GTK_COMBO_BOX (edgeStyleCombo), -1); - } else { - GtkTreeIter *iter = [edgeStylesModel iterFromStyle:edgeStyle]; - if (iter) { - gtk_combo_box_set_active_iter (GTK_COMBO_BOX (edgeStyleCombo), iter); - gtk_tree_iter_free (iter); - } - } -} - -- (void) saveConfiguration:(Configuration*)config { - [config setStringEntry:@"SelectedNodeStyle" - inGroup:@"SelectionPane" - value:[[self _selectedNodeStyle] name]]; - [config setStringEntry:@"SelectedEdgeStyle" - inGroup:@"SelectionPane" - value:[[self _selectedEdgeStyle] name]]; -} - -@end - -// }}} -// {{{ Notifications - -@implementation SelectionPane (Notifications) -- (void) nodeSelectionChanged:(NSNotification*)n { - [self _updateNodeStyleButtons]; -} - -- (void) edgeSelectionChanged:(NSNotification*)n { - [self _updateEdgeStyleButtons]; -} -@end - -// }}} -// {{{ Private - -@implementation SelectionPane (Private) -- (void) _updateNodeStyleButtons { - gboolean hasNodeSelection = [[[document pickSupport] selectedNodes] count] > 0; - - gtk_widget_set_sensitive (applyNodeStyleButton, - hasNodeSelection && [self _selectedNodeStyle] != nil); - gtk_widget_set_sensitive (clearNodeStyleButton, hasNodeSelection); -} - -- (void) _updateEdgeStyleButtons { - gboolean hasEdgeSelection = [[[document pickSupport] selectedEdges] count] > 0; - - gtk_widget_set_sensitive (applyEdgeStyleButton, - hasEdgeSelection && [self _selectedEdgeStyle] != nil); - gtk_widget_set_sensitive (clearEdgeStyleButton, hasEdgeSelection); -} - -- (NodeStyle*) _selectedNodeStyle { - GtkTreeIter iter; - if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (nodeStyleCombo), &iter)) { - return [nodeStylesModel styleFromIter:&iter]; - } else { - return nil; - } -} - -- (EdgeStyle*) _selectedEdgeStyle { - GtkTreeIter iter; - if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (edgeStyleCombo), &iter)) { - return [edgeStylesModel styleFromIter:&iter]; - } else { - return nil; - } -} - -- (void) _applyNodeStyle { - [document startModifyNodes:[[document pickSupport] selectedNodes]]; - - NodeStyle *style = [self _selectedNodeStyle]; - for (Node *node in [[document pickSupport] selectedNodes]) { - [node setStyle:style]; - } - - [document endModifyNodes]; -} - -- (void) _clearNodeStyle { - [document startModifyNodes:[[document pickSupport] selectedNodes]]; - - for (Node *node in [[document pickSupport] selectedNodes]) { - [node setStyle:nil]; - } - - [document endModifyNodes]; -} - -- (void) _applyEdgeStyle { - [document startModifyEdges:[[document pickSupport] selectedEdges]]; - - EdgeStyle *style = [self _selectedEdgeStyle]; - for (Edge *edge in [[document pickSupport] selectedEdges]) { - [edge setStyle:style]; - } - - [document endModifyEdges]; -} - -- (void) _clearEdgeStyle { - [document startModifyEdges:[[document pickSupport] selectedEdges]]; - - for (Edge *edge in [[document pickSupport] selectedEdges]) { - [edge setStyle:nil]; - } - - [document endModifyEdges]; -} -@end - -// }}} -// {{{ GTK+ callbacks - -static void node_style_changed_cb (GtkComboBox *widget, SelectionPane *pane) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [pane _updateNodeStyleButtons]; - [pool drain]; -} - -static void apply_node_style_button_cb (GtkButton *widget, SelectionPane *pane) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [pane _applyNodeStyle]; - [pool drain]; -} - -static void clear_node_style_button_cb (GtkButton *widget, SelectionPane *pane) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [pane _clearNodeStyle]; - [pool drain]; -} - -static void edge_style_changed_cb (GtkComboBox *widget, SelectionPane *pane) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [pane _updateEdgeStyleButtons]; - [pool drain]; -} - -static void apply_edge_style_button_cb (GtkButton *widget, SelectionPane *pane) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [pane _applyEdgeStyle]; - [pool drain]; -} - -static void clear_edge_style_button_cb (GtkButton *widget, SelectionPane *pane) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [pane _clearEdgeStyle]; - [pool drain]; -} - -// }}} -// -static void setup_style_cell_layout (GtkCellLayout *cell_layout, gint pixbuf_col, gint name_col) { - gtk_cell_layout_clear (cell_layout); - GtkCellRenderer *pixbuf_renderer = gtk_cell_renderer_pixbuf_new (); - gtk_cell_layout_pack_start (cell_layout, pixbuf_renderer, FALSE); - gtk_cell_layout_set_attributes ( - cell_layout, - pixbuf_renderer, - "pixbuf", pixbuf_col, - NULL); - GtkCellRenderer *text_renderer = gtk_cell_renderer_text_new (); - gtk_cell_layout_pack_start (cell_layout, text_renderer, FALSE); - gtk_cell_layout_set_attributes ( - cell_layout, - text_renderer, - "text", name_col, - NULL); -} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/SettingsDialog.h b/tikzit-old/src/gtk/SettingsDialog.h deleted file mode 100644 index 0f687b3..0000000 --- a/tikzit-old/src/gtk/SettingsDialog.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class Configuration; -@class EdgeStylesPalette; -@class NodeStylesPalette; -@class StyleManager; - -@interface SettingsDialog: NSObject { - Configuration *configuration; - StyleManager *styleManager; - StyleManager *tempStyleManager; - NodeStylesPalette *nodePalette; - EdgeStylesPalette *edgePalette; - - GtkWindow *parentWindow; - GtkWindow *window; - - // we don't keep any refs, as we control - // the top window - GtkEntry *pdflatexPathEntry; -} - -@property (retain) Configuration *configuration; -@property (retain) StyleManager *styleManager; -@property (assign) GtkWindow *parentWindow; -@property (assign,getter=isVisible) BOOL visible; - -- (id) initWithConfiguration:(Configuration*)c andStyleManager:(StyleManager*)m; - -- (void) present; -- (void) show; -- (void) hide; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/SettingsDialog.m b/tikzit-old/src/gtk/SettingsDialog.m deleted file mode 100644 index bdb5db6..0000000 --- a/tikzit-old/src/gtk/SettingsDialog.m +++ /dev/null @@ -1,328 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "SettingsDialog.h" - -#import "Application.h" -#import "Configuration.h" -#import "EdgeStylesPalette.h" -#import "NodeStylesPalette.h" -#import "StyleManager.h" - -// {{{ Internal interfaces -// {{{ Signals -static gboolean window_delete_event_cb (GtkWidget *widget, - GdkEvent *event, - SettingsDialog *dialog); -static void ok_button_clicked_cb (GtkButton *widget, SettingsDialog *dialog); -static void cancel_button_clicked_cb (GtkButton *widget, SettingsDialog *dialog); -// }}} - -@interface SettingsDialog (Private) -- (void) loadUi; -- (void) save; -- (void) revert; -@end - -// }}} -// {{{ API - -@implementation SettingsDialog - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithConfiguration:(Configuration*)c andStyleManager:(StyleManager*)m { - self = [super init]; - - if (self) { - configuration = [c retain]; - styleManager = [m retain]; - tempStyleManager = [m copy]; - } - - return self; -} - -- (void) dealloc { - if (window) { - gtk_widget_destroy (GTK_WIDGET (window)); - } - if (parentWindow) { - g_object_unref (parentWindow); - } - - [configuration release]; - [tempStyleManager release]; - [styleManager release]; - [nodePalette release]; - [edgePalette release]; - - [super dealloc]; -} - -- (Configuration*) configuration { - return configuration; -} - -- (void) setConfiguration:(Configuration*)c { - [c retain]; - [configuration release]; - configuration = c; - [self revert]; -} - -- (StyleManager*) styleManager { - return styleManager; -} - -- (void) setStyleManager:(StyleManager*)m { - [m retain]; - [styleManager release]; - styleManager = m; -} - -- (GtkWindow*) parentWindow { - return parentWindow; -} - -- (void) setParentWindow:(GtkWindow*)parent { - GtkWindow *oldParent = parentWindow; - - if (parent) - g_object_ref (parent); - parentWindow = parent; - if (oldParent) - g_object_unref (oldParent); - - if (window) { - gtk_window_set_transient_for (window, parentWindow); - } -} - -- (void) present { - [self loadUi]; - [self revert]; - gtk_window_present (GTK_WINDOW (window)); -} - -- (void) show { - [self loadUi]; - [self revert]; - gtk_widget_show (GTK_WIDGET (window)); -} - -- (void) hide { - if (!window) { - return; - } - gtk_widget_hide (GTK_WIDGET (window)); -} - -- (BOOL) isVisible { - if (!window) { - return NO; - } - gboolean visible; - g_object_get (G_OBJECT (window), "visible", &visible, NULL); - return visible ? YES : NO; -} - -- (void) setVisible:(BOOL)visible { - if (visible) { - [self show]; - } else { - [self hide]; - } -} - -@end - -// }}} -// {{{ Private - -@implementation SettingsDialog (Private) -- (void) loadUi { - if (window) { - return; - } - - nodePalette = [[NodeStylesPalette alloc] initWithManager:tempStyleManager]; - edgePalette = [[EdgeStylesPalette alloc] initWithManager:tempStyleManager]; - - window = GTK_WINDOW (gtk_window_new (GTK_WINDOW_TOPLEVEL)); - gtk_window_set_default_size (window, 570, -1); - gtk_window_set_title (window, "TikZiT Configuration"); - gtk_window_set_modal (window, TRUE); - gtk_window_set_position (window, GTK_WIN_POS_CENTER_ON_PARENT); - gtk_window_set_type_hint (window, GDK_WINDOW_TYPE_HINT_DIALOG); - if (parentWindow) { - gtk_window_set_transient_for (window, parentWindow); - } - g_signal_connect (window, - "delete-event", - G_CALLBACK (window_delete_event_cb), - self); - - GtkWidget *mainBox = gtk_vbox_new (FALSE, 18); - gtk_container_set_border_width (GTK_CONTAINER (mainBox), 12); - gtk_container_add (GTK_CONTAINER (window), mainBox); - gtk_widget_show (mainBox); - -#ifdef HAVE_POPPLER - /* - * Path for pdflatex - */ - - GtkWidget *pdflatexFrame = gtk_frame_new ("Previews"); - gtk_box_pack_start (GTK_BOX (mainBox), pdflatexFrame, TRUE, TRUE, 0); - - GtkBox *pdflatexBox = GTK_BOX (gtk_hbox_new (FALSE, 6)); - gtk_container_add (GTK_CONTAINER (pdflatexFrame), GTK_WIDGET (pdflatexBox)); - gtk_container_set_border_width (GTK_CONTAINER (pdflatexBox), 6); - - GtkWidget *pdflatexLabel = gtk_label_new ("Path to pdflatex:"); - gtk_misc_set_alignment (GTK_MISC (pdflatexLabel), 0, 0.5); - gtk_box_pack_start (pdflatexBox, - pdflatexLabel, - FALSE, TRUE, 0); - - pdflatexPathEntry = GTK_ENTRY (gtk_entry_new ()); - gtk_box_pack_start (pdflatexBox, - GTK_WIDGET (pdflatexPathEntry), - TRUE, TRUE, 0); - - gtk_widget_show_all (pdflatexFrame); -#else - pdflatexPathEntry = NULL; -#endif - - /* - * Node styles - */ - GtkWidget *nodeStylesFrame = gtk_frame_new ("Node Styles"); - gtk_widget_show (nodeStylesFrame); - gtk_box_pack_start (GTK_BOX (mainBox), nodeStylesFrame, TRUE, TRUE, 0); - gtk_container_add (GTK_CONTAINER (nodeStylesFrame), - GTK_WIDGET ([nodePalette widget])); - gtk_widget_show ([nodePalette widget]); - - - /* - * Edge styles - */ - GtkWidget *edgeStylesFrame = gtk_frame_new ("Edge Styles"); - gtk_widget_show (edgeStylesFrame); - gtk_box_pack_start (GTK_BOX (mainBox), edgeStylesFrame, TRUE, TRUE, 0); - gtk_container_add (GTK_CONTAINER (edgeStylesFrame), - GTK_WIDGET ([edgePalette widget])); - gtk_widget_show ([edgePalette widget]); - - - /* - * Bottom buttons - */ - - GtkContainer *buttonBox = GTK_CONTAINER (gtk_hbutton_box_new ()); - gtk_box_set_spacing (GTK_BOX (buttonBox), 6); - gtk_button_box_set_layout (GTK_BUTTON_BOX (buttonBox), GTK_BUTTONBOX_END); - gtk_box_pack_start (GTK_BOX (mainBox), - GTK_WIDGET (buttonBox), - FALSE, TRUE, 0); - - GtkWidget *okButton = gtk_button_new_from_stock (GTK_STOCK_OK); - gtk_container_add (buttonBox, okButton); - g_signal_connect (okButton, - "clicked", - G_CALLBACK (ok_button_clicked_cb), - self); - - GtkWidget *cancelButton = gtk_button_new_from_stock (GTK_STOCK_CANCEL); - gtk_container_add (buttonBox, cancelButton); - g_signal_connect (cancelButton, - "clicked", - G_CALLBACK (cancel_button_clicked_cb), - self); - - gtk_widget_show_all (GTK_WIDGET (buttonBox)); - - [self revert]; -} - -- (void) save { - if (!window) - return; - -#ifdef HAVE_POPPLER - const gchar *path = gtk_entry_get_text (pdflatexPathEntry); - if (path && *path) { - [configuration setStringEntry:@"pdflatex" - inGroup:@"Previews" - value:[NSString stringWithUTF8String:path]]; - } -#endif - - [styleManager updateFromManager:tempStyleManager]; - - [app saveConfiguration]; -} - -- (void) revert { - if (!window) - return; - -#ifdef HAVE_POPPLER - NSString *path = [configuration stringEntry:@"pdflatex" - inGroup:@"Previews" - withDefault:@"pdflatex"]; - gtk_entry_set_text (pdflatexPathEntry, [path UTF8String]); -#endif - - [tempStyleManager updateFromManager:styleManager]; -} -@end - -// }}} -// {{{ GTK+ callbacks - -static gboolean window_delete_event_cb (GtkWidget *widget, - GdkEvent *event, - SettingsDialog *dialog) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [dialog hide]; - [pool drain]; - return TRUE; // we dealt with this event -} - -static void ok_button_clicked_cb (GtkButton *widget, SettingsDialog *dialog) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [dialog save]; - [dialog hide]; - [pool drain]; -} - -static void cancel_button_clicked_cb (GtkButton *widget, SettingsDialog *dialog) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [dialog hide]; - [pool drain]; -} - -// }}} - -// vim:ft=objc:ts=4:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/Shape+Render.h b/tikzit-old/src/gtk/Shape+Render.h deleted file mode 100644 index a744c77..0000000 --- a/tikzit-old/src/gtk/Shape+Render.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "Shape.h" -#import "RenderContext.h" -#import "Surface.h" - -@interface Shape (Render) - -- (void) drawPathWithTransform:(Transformer*)transform andContext:(id)context; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/Shape+Render.m b/tikzit-old/src/gtk/Shape+Render.m deleted file mode 100644 index 924bb24..0000000 --- a/tikzit-old/src/gtk/Shape+Render.m +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "Shape+Render.h" - -#import "Edge.h" - -// we use cairo for finding the bounding box etc. -#import - -@implementation Shape (Render) - -- (void) drawPathWithTransform:(Transformer*)transform andContext:(id)context { - [context startPath]; - - for (NSArray *arr in [self paths]) { - BOOL fst = YES; - NSPoint p, cp1, cp2; - - for (Edge *e in arr) { - if (fst) { - fst = NO; - p = [transform toScreen:[[e source] point]]; - [context moveTo:p]; - } - - p = [transform toScreen:[[e target] point]]; - if ([e isStraight]) { - [context lineTo:p]; - } else { - cp1 = [transform toScreen:[e cp1]]; - cp2 = [transform toScreen:[e cp2]]; - [context curveTo:p withCp1:cp1 andCp2:cp2]; - } - } - - [context closeSubPath]; - } -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/StyleManager+Storage.h b/tikzit-old/src/gtk/StyleManager+Storage.h deleted file mode 100644 index 1727786..0000000 --- a/tikzit-old/src/gtk/StyleManager+Storage.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "StyleManager.h" - -@interface StyleManager (Storage) -- (void) loadStylesUsingConfigurationName:(NSString*)name; -- (void) saveStylesUsingConfigurationName:(NSString*)name; -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/StyleManager+Storage.m b/tikzit-old/src/gtk/StyleManager+Storage.m deleted file mode 100644 index f4c8232..0000000 --- a/tikzit-old/src/gtk/StyleManager+Storage.m +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "StyleManager+Storage.h" -#import "Configuration.h" -#import "NodeStyle+Storage.h" -#import "EdgeStyle+Storage.h" - -static NSString *nodeStyleGroupPrefix = @"Style "; -static NSString *edgeStyleGroupPrefix = @"EdgeStyle "; - -@implementation StyleManager (Storage) - -- (void) loadStylesUsingConfigurationName:(NSString*)name { - if (![Configuration configurationExistsWithName:name]) { - NSLog(@"No styles config found"); - return; - } - NSError *error = nil; - Configuration *stylesConfig = [Configuration configurationWithName:name loadError:&error]; - if (error != nil) { - logError (error, @"Could not load styles configuration"); - // stick with the default config - return; - } - NSArray *groups = [stylesConfig groups]; - NSMutableArray *ns = [NSMutableArray arrayWithCapacity:[groups count]]; - NSMutableArray *es = [NSMutableArray arrayWithCapacity:[groups count]]; - - for (NSString *groupName in groups) { - if ([groupName hasPrefix:nodeStyleGroupPrefix]) { - NodeStyle *style = [[NodeStyle alloc] initFromConfigurationGroup:groupName config:stylesConfig]; - [ns addObject:style]; - } else if ([groupName hasPrefix:edgeStyleGroupPrefix]) { - EdgeStyle *style = [[EdgeStyle alloc] initFromConfigurationGroup:groupName config:stylesConfig]; - [es addObject:style]; - } - } - - [self _setNodeStyles:ns]; - [self _setEdgeStyles:es]; -} - -- (void) saveStylesUsingConfigurationName:(NSString*)name { - NSError *error = nil; - Configuration *stylesConfig = [Configuration emptyConfigurationWithName:name]; - NSArray *ns = [self nodeStyles]; - NSArray *es = [self edgeStyles]; - NSUInteger length = [ns count]; - for (int i = 0; i < length; ++i) { - NodeStyle *style = [ns objectAtIndex:i]; - NSString *groupName = [NSString stringWithFormat:@"%@%d", nodeStyleGroupPrefix, i]; - [style storeToConfigurationGroup:groupName config:stylesConfig]; - } - length = [es count]; - for (int i = 0; i < length; ++i) { - EdgeStyle *style = [es objectAtIndex:i]; - NSString *groupName = [NSString stringWithFormat:@"%@%d", edgeStyleGroupPrefix, i]; - [style storeToConfigurationGroup:groupName config:stylesConfig]; - } - if (![stylesConfig writeToStoreWithError:&error]) { - logError (error, @"Could not write styles configuration"); - } -} - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/Surface.h b/tikzit-old/src/gtk/Surface.h deleted file mode 100644 index db4288e..0000000 --- a/tikzit-old/src/gtk/Surface.h +++ /dev/null @@ -1,107 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "RenderContext.h" -#import "Transformer.h" - -typedef enum { - NormalCursor, - ResizeRightCursor, - ResizeBottomRightCursor, - ResizeBottomCursor, - ResizeBottomLeftCursor, - ResizeLeftCursor, - ResizeTopLeftCursor, - ResizeTopCursor, - ResizeTopRightCursor -} Cursor; - -@protocol Surface; - -@protocol RenderDelegate -- (void) renderWithContext:(id)context onSurface:(id)surface; -@end - -/** - * Represents a surface that can be rendered to - * - * This protocol should be implemented by drawing surfaces. It - * provides geometry information and methods to invalidate - * regions of the surface, triggering a redraw. - * - * The surface should send a "SurfaceSizeChanged" notification - * when the width or height changes. - */ -@protocol Surface - -/** - * The width of the surface, in surface units - * - * The surface should send a "SurfaceSizeChanged" notification - * when this property changes. - */ -@property (readonly) int width; -/** - * The height of the surface, in surface units - * - * The surface should send a "SurfaceSizeChanged" notification - * when this property changes. - */ -@property (readonly) int height; -/** - * The transformer that converts between graph units and surface units - */ -@property (readonly) Transformer *transformer; -/** - * The render delegate. - * - * This will be used to redraw (parts of) the surface when necessary. - */ -@property (assign) id renderDelegate; - -/** - * Create a render context for the surface. - */ -- (id) createRenderContext; -/** - * Invalidate a portion of the surface. - * - * This will request that part of the surface be redrawn. - */ -- (void) invalidateRect:(NSRect)rect; -/** - * Invalidate the whole surface. - * - * This will request that the whole surface be redrawn. - */ -- (void) invalidate; - -- (void) zoomIn; -- (void) zoomOut; -- (void) zoomReset; -- (void) zoomInAboutPoint:(NSPoint)p; -- (void) zoomOutAboutPoint:(NSPoint)p; -- (void) zoomResetAboutPoint:(NSPoint)p; - -- (void) setCursor:(Cursor)c; - -- (BOOL) hasFocus; -- (void) renderFocus; -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/TZFoundation.h b/tikzit-old/src/gtk/TZFoundation.h deleted file mode 100644 index 2ff20ca..0000000 --- a/tikzit-old/src/gtk/TZFoundation.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import -#import - -#import "NSError+Glib.h" -#import "NSError+Tikzit.h" -#import "NSFileManager+Glib.h" -#import "NSFileManager+Utils.h" -#import "NSString+Glib.h" -#import "NSString+LatexConstants.h" -#import "NSString+Tikz.h" -#import "NSString+Util.h" - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/TikzDocument.h b/tikzit-old/src/gtk/TikzDocument.h deleted file mode 100644 index 5d15d13..0000000 --- a/tikzit-old/src/gtk/TikzDocument.h +++ /dev/null @@ -1,149 +0,0 @@ -// -// TikzDocument.h -// TikZiT -// -// Copyright 2010 Chris Heunen -// Copyright 2010 Alex Merry -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "TZFoundation.h" -#import -#import "PickSupport.h" -#import "StyleManager.h" - -@interface TikzDocument : NSObject { - StyleManager *styleManager; - Graph *graph; - PickSupport *pickSupport; - NSUndoManager *undoManager; - NSString *tikz; - NSString *path; - NSSet *nodesetBeingModified; - NSMapTable *nodesetBeingModifiedOldCopy; - NSSet *edgesetBeingModified; - NSMapTable *edgesetBeingModifiedOldCopy; - NSPoint currentNodeShift; - Node *nodeBeingModified; - Node *nodeBeingModifiedOldCopy; - Edge *edgeBeingModified; - Edge *edgeBeingModifiedOldCopy; - NSRect oldGraphBounds; - GraphElementData *oldGraphData; - BOOL hasChanges; -} - -+ (TikzDocument*) documentWithStyleManager:(StyleManager*)manager; -+ (TikzDocument*) documentWithGraph:(Graph*)g styleManager:(StyleManager*)manager; -+ (TikzDocument*) documentWithTikz:(NSString*)t styleManager:(StyleManager*)manager error:(NSError**)error; -+ (TikzDocument*) documentFromFile:(NSString*)path styleManager:(StyleManager*)manager error:(NSError**)error; - -- (id) initWithStyleManager:(StyleManager*)manager; -- (id) initWithGraph:(Graph*)g styleManager:(StyleManager*)manager; -- (id) initWithTikz:(NSString*)t styleManager:(StyleManager*)manager error:(NSError**)error; -- (id) initFromFile:(NSString*)path styleManager:(StyleManager*)manager error:(NSError**)error; - -@property (readonly) Graph *graph; -@property (readonly) PickSupport *pickSupport; -@property (readonly) NSString *path; -@property (readonly) NSString *name; -@property (readonly) NSString *suggestedFileName; -@property (readonly) BOOL hasUnsavedChanges; -@property (retain) StyleManager *styleManager; -@property (readonly) NSString *tikz; -@property (readonly) BOOL canUndo; -@property (readonly) BOOL canRedo; -@property (readonly) NSString *undoName; -@property (readonly) NSString *redoName; - -- (BOOL) updateTikz:(NSString*)t error:(NSError**)error; - -- (Graph*) selectionCut; -- (Graph*) selectionCopy; -- (void) paste:(Graph*)graph; -- (void) pasteFromTikz:(NSString*)tikz; - -// some convenience methods: -- (BOOL) isNodeSelected:(Node*)node; -- (BOOL) isEdgeSelected:(Edge*)edge; -- (NSEnumerator*) nodeEnumerator; -- (NSEnumerator*) edgeEnumerator; - -- (void) undo; -- (void) redo; - -- (void) startUndoGroup; -- (void) nameAndEndUndoGroup:(NSString*)nm; -- (void) endUndoGroup; - -- (void) startModifyNode:(Node*)node; -- (void) modifyNodeCheckPoint; -- (void) endModifyNode; -- (void) cancelModifyNode; - -- (void) startModifyNodes:(NSSet*)nodes; -- (void) modifyNodesCheckPoint; -- (void) endModifyNodes; -- (void) cancelModifyNodes; - -- (void) startShiftNodes:(NSSet*)nodes; -- (void) shiftNodesUpdate:(NSPoint)shiftChange; -- (void) endShiftNodes; -- (void) cancelShiftNodes; - -- (void) startModifyEdge:(Edge*)edge; -- (void) modifyEdgeCheckPoint; -- (void) endModifyEdge; -- (void) cancelModifyEdge; - -- (void) startModifyEdges:(NSSet*)edges; -- (void) modifyEdgesCheckPoint; -- (void) endModifyEdges; -- (void) cancelModifyEdges; - -- (void) startChangeBoundingBox; -- (void) changeBoundingBoxCheckPoint; -- (void) endChangeBoundingBox; -- (void) cancelChangeBoundingBox; - -- (void) startChangeGraphProperties; -- (void) changeGraphPropertiesCheckPoint; -- (void) endChangeGraphProperties; -- (void) cancelChangeGraphProperties; - -- (void) removeSelected; -- (void) addNode:(Node*)node; -- (void) removeNode:(Node*)node; -- (void) addEdge:(Edge*)edge; -- (void) removeEdge:(Edge*)edge; -- (void) shiftSelectedNodesByPoint:(NSPoint)offset; -- (void) insertGraph:(Graph*)g; -- (void) flipSelectedNodesHorizontally; -- (void) flipSelectedNodesVertically; -- (void) reverseSelectedEdges; -- (void) bringSelectionForward; -- (void) bringSelectionToFront; -- (void) sendSelectionBackward; -- (void) sendSelectionToBack; - -- (BOOL) saveCopyToPath: (NSString*)path error: (NSError**)error; -- (BOOL) saveToPath: (NSString*)path error: (NSError**)error; -- (BOOL) save: (NSError**)error; - -@end - -// vim:ft=objc:sts=4:sw=4:et diff --git a/tikzit-old/src/gtk/TikzDocument.m b/tikzit-old/src/gtk/TikzDocument.m deleted file mode 100644 index bff5a2e..0000000 --- a/tikzit-old/src/gtk/TikzDocument.m +++ /dev/null @@ -1,911 +0,0 @@ -// -// TikzDocument.h -// TikZiT -// -// Copyright 2010 Chris Heunen -// Copyright 2010 Alex Merry -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "TikzDocument.h" - -@interface TikzDocument (Private) -- (void) styleRenamed:(NSNotification*)n; - -- (void) setPath:(NSString*)path; -- (void) setGraph:(Graph*)g; - -- (void) registerUndoForChange:(GraphChange*)change; -- (void) registerUndoGroupForChange:(GraphChange*)change withName:(NSString*)name; -- (void) undoGraphChange:(GraphChange*)change; -- (void) completedGraphChange:(GraphChange*)change withName:(NSString*)name; -- (void) attachStylesToGraph:(Graph*)g; - -- (void) regenerateTikz; -@end - -@implementation TikzDocument - -+ (TikzDocument*) documentWithStyleManager:(StyleManager*)manager -{ - return [[[TikzDocument alloc] initWithStyleManager:manager] autorelease]; -} - -+ (TikzDocument*) documentWithGraph:(Graph*)g - styleManager:(StyleManager*)manager -{ - return [[[TikzDocument alloc] initWithGraph:g - styleManager:manager] autorelease]; -} - -+ (TikzDocument*) documentWithTikz:(NSString*)t - styleManager:(StyleManager*)manager - error:(NSError**)error -{ - return [[[TikzDocument alloc] initWithTikz:t - styleManager:manager - error:error] autorelease]; -} - -+ (TikzDocument*) documentFromFile:(NSString*)pth - styleManager:(StyleManager*)manager - error:(NSError**)error -{ - return [[[TikzDocument alloc] initFromFile:pth - styleManager:manager - error:error] autorelease]; -} - - -- (id) initWithStyleManager:(StyleManager*)manager { - self = [self initWithGraph:[Graph graph] styleManager:manager]; - return self; -} - -- (id) initWithGraph:(Graph*)g styleManager:(StyleManager*)manager { - self = [super init]; - - if (self) { - graph = nil; - styleManager = [manager retain]; - pickSupport = [[PickSupport alloc] init]; - undoManager = [[NSUndoManager alloc] init]; - [undoManager setGroupsByEvent:NO]; - tikz = nil; - path = nil; - nodesetBeingModified = nil; - nodesetBeingModifiedOldCopy = nil; - nodeBeingModified = nil; - nodeBeingModifiedOldCopy = nil; - edgeBeingModified = nil; - edgeBeingModifiedOldCopy = nil; - - [undoManager disableUndoRegistration]; - [self setGraph:g]; - [undoManager enableUndoRegistration]; - - hasChanges = NO; - - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(styleRenamed:) - name:@"NodeStyleRenamed" - object:styleManager]; - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(styleRenamed:) - name:@"EdgeStyleRenamed" - object:styleManager]; - } - - return self; -} - -- (id) initWithTikz:(NSString*)t - styleManager:(StyleManager*)manager - error:(NSError**)error -{ - self = [self initWithStyleManager:manager]; - - if (self) { - [undoManager disableUndoRegistration]; - BOOL success = [self updateTikz:t error:error]; - if (!success) { - [self release]; - return nil; - } - [undoManager enableUndoRegistration]; - hasChanges = NO; - } - - return self; -} - -- (id) initFromFile:(NSString*)pth - styleManager:(StyleManager*)manager - error:(NSError**)error -{ - NSString *t = [NSString stringWithContentsOfFile:pth error:error]; - if (t == nil) { - [self release]; - return nil; - } - - self = [self initWithTikz:t styleManager:manager error:error]; - - if (self) { - [self setPath:pth]; - } - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - [styleManager release]; - [graph release]; - [pickSupport release]; - [undoManager release]; - [tikz release]; - [path release]; - [nodesetBeingModified release]; - [nodesetBeingModifiedOldCopy release]; - [nodeBeingModified release]; - [nodeBeingModifiedOldCopy release]; - [edgeBeingModified release]; - [edgeBeingModifiedOldCopy release]; - [oldGraphData release]; - [super dealloc]; -} - -@synthesize graph, pickSupport, path; - -- (NSString*) name { - if (path) { - return [[NSFileManager defaultManager] displayNameAtPath: path]; - } else { - return @"Untitled"; - } -} - -- (NSString*) suggestedFileName { - if (path) { - return [path lastPathComponent]; - } else { - return @"untitled.tikz"; - } -} - -- (BOOL) hasUnsavedChanges { - return hasChanges; -} - -- (StyleManager*) styleManager { - return styleManager; -} - -- (void) setStyleManager:(StyleManager*)manager { - StyleManager *oldManager = styleManager; - [[NSNotificationCenter defaultCenter] - removeObserver:self - name:nil - object:oldManager]; - - styleManager = [manager retain]; - - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(styleRenamed:) - name:@"NodeStyleRenamed" - object:styleManager]; - [[NSNotificationCenter defaultCenter] - addObserver:self - selector:@selector(styleRenamed:) - name:@"EdgeStyleRenamed" - object:styleManager]; - - [self attachStylesToGraph:graph]; - [oldManager release]; -} - -- (void) postGraphReplaced { - [[NSNotificationCenter defaultCenter] postNotificationName:@"GraphReplaced" object:self]; -} - -- (void) postGraphChange:(GraphChange*)change { - NSDictionary *info = [NSDictionary dictionaryWithObject:change forKey:@"change"]; - [[NSNotificationCenter defaultCenter] postNotificationName:@"GraphChanged" object:self userInfo:info]; -} - -- (void) postIncompleteGraphChange:(GraphChange*)change { - NSDictionary *info = [NSDictionary dictionaryWithObject:change forKey:@"change"]; - [[NSNotificationCenter defaultCenter] postNotificationName:@"GraphBeingChanged" object:self userInfo:info]; -} - -- (void) postCancelledGraphChange:(GraphChange*)change { - NSDictionary *info = [NSDictionary dictionaryWithObject:change forKey:@"change"]; - [[NSNotificationCenter defaultCenter] postNotificationName:@"GraphChangeCancelled" object:self userInfo:info]; -} - -- (void) postTikzChanged { - [[NSNotificationCenter defaultCenter] postNotificationName:@"TikzChanged" object:self]; -} - -- (void) postUndoStackChanged { - [[NSNotificationCenter defaultCenter] postNotificationName:@"UndoStackChanged" object:self]; -} - -- (NSString*) tikz { - return tikz; -} - -- (BOOL) updateTikz:(NSString*)t error:(NSError**)error { - if (t == nil) { - t = [NSString string]; - } - if (t == tikz || [t isEqual:tikz]) { - return YES; - } - - Graph *g = [Graph graphFromTikz:t error:error]; - if (g) { - // updateTikz actually generates a graph from the tikz, - // and generates the final tikz from that - [self startUndoGroup]; - [self setGraph:g]; - [self nameAndEndUndoGroup:@"Update tikz"]; - return YES; - } - - return NO; -} - -- (Graph*) selectionCut { - Graph *selection = [self selectionCopy]; - [self startUndoGroup]; - [self removeSelected]; - [self nameAndEndUndoGroup:@"Cut"]; - return selection; -} - -- (Graph*) selectionCopy { - return [[graph copyOfSubgraphWithNodes:[pickSupport selectedNodes]] autorelease]; -} - -- (void) paste:(Graph*)g { - if (g == nil || [[g nodes] count] == 0) { - // nothing to paste - return; - } - - // place to the right of the existing graph - NSRect bounds = [graph bounds]; - NSRect gBounds = [g bounds]; - float dx = NSMaxX (bounds) - gBounds.origin.x + 0.5f; - [g shiftNodes:[g nodes] byPoint:NSMakePoint (dx, 0)]; - - GraphChange *change = [graph insertGraph:g]; - [self completedGraphChange:change withName:@"Paste"]; - - // select everything from the clipboard - [pickSupport deselectAllEdges]; - [pickSupport selectAllNodes:[NSSet setWithArray:[g nodes]] replacingSelection:YES]; -} - -- (void) pasteFromTikz:(NSString*)t { - Graph *clipboard = [Graph graphFromTikz:t]; - if (clipboard) { - [self attachStylesToGraph:clipboard]; - [self paste:clipboard]; - } -} - -- (BOOL) isNodeSelected:(Node*)node { - return [pickSupport isNodeSelected:node]; -} - -- (BOOL) isEdgeSelected:(Edge*)edge { - return [pickSupport isEdgeSelected:edge]; -} - -- (NSEnumerator*) nodeEnumerator { - return [[graph nodes] objectEnumerator]; -} - -- (NSEnumerator*) edgeEnumerator { - return [[graph edges] objectEnumerator]; -} - -- (BOOL) canUndo { - return [undoManager canUndo]; -} - -- (void) undo { - [undoManager undo]; - [self postUndoStackChanged]; -} - -- (BOOL) canRedo { - return [undoManager canRedo]; -} - -- (void) redo { - [undoManager redo]; - [self postUndoStackChanged]; -} - -- (NSString*) undoName { - return [undoManager undoActionName]; -} - -- (NSString*) redoName { - return [undoManager redoActionName]; -} - -- (void) startUndoGroup { - [undoManager beginUndoGrouping]; -} - -- (void) nameAndEndUndoGroup:(NSString*)nm { - [undoManager setActionName:nm]; - [undoManager endUndoGrouping]; - [self postUndoStackChanged]; -} - -- (void) endUndoGroup { - [undoManager endUndoGrouping]; - [self postUndoStackChanged]; -} - -- (void) startModifyNode:(Node*)node { - if (nodeBeingModified != nil) { - [NSException raise:@"NSInternalInconsistencyException" format:@"Already modifying a node"]; - } - nodeBeingModified = [node retain]; - nodeBeingModifiedOldCopy = [node copy]; -} - -- (void) modifyNodeCheckPoint { - [self regenerateTikz]; - GraphChange *change = [GraphChange propertyChangeOfNode:nodeBeingModified - fromOld:nodeBeingModifiedOldCopy - toNew:[[nodeBeingModified copy] autorelease]]; - [self postIncompleteGraphChange:change]; -} - -- (void) _finishModifySequence:(GraphChange*)change withName:(NSString*)chName cancelled:(BOOL)cancelled { - if (cancelled) { - change = [change invert]; - [graph applyGraphChange:change]; - [self regenerateTikz]; - [self postCancelledGraphChange:change]; - } else { - [self registerUndoGroupForChange:change withName:chName]; - [self regenerateTikz]; - [self postGraphChange:change]; - } -} - -- (void) _finishModifyNodeCancelled:(BOOL)cancelled { - if (nodeBeingModified == nil) { - [NSException raise:@"NSInternalInconsistencyException" format:@"Not modifying a node"]; - } - - GraphChange *change = [GraphChange propertyChangeOfNode:nodeBeingModified - fromOld:nodeBeingModifiedOldCopy - toNew:[[nodeBeingModified copy] autorelease]]; - [self _finishModifySequence:change withName:@"Modify node" cancelled:cancelled]; - - [nodeBeingModified release]; - nodeBeingModified = nil; - [nodeBeingModifiedOldCopy release]; - nodeBeingModifiedOldCopy = nil; -} - -- (void) endModifyNode { [self _finishModifyNodeCancelled:NO]; } -- (void) cancelModifyNode { [self _finishModifyNodeCancelled:YES]; } - -- (void) startModifyNodes:(NSSet*)nodes { - if (nodesetBeingModified != nil) { - [NSException raise:@"NSInternalInconsistencyException" format:@"Already modifying a node set"]; - } - - nodesetBeingModified = [nodes copy]; - nodesetBeingModifiedOldCopy = [[Graph nodeTableForNodes:nodes] retain]; -} - -- (void) modifyNodesCheckPoint { - [self regenerateTikz]; - GraphChange *change = [GraphChange propertyChangeOfNodesFromOldCopies:nodesetBeingModifiedOldCopy - toNewCopies:[Graph nodeTableForNodes:nodesetBeingModified]]; - [self postIncompleteGraphChange:change]; -} - -- (void) _finishModifyNodes:(BOOL)cancelled { - if (nodesetBeingModified == nil) { - [NSException raise:@"NSInternalInconsistencyException" format:@"Not modifying a node set"]; - } - - GraphChange *change = [GraphChange propertyChangeOfNodesFromOldCopies:nodesetBeingModifiedOldCopy - toNewCopies:[Graph nodeTableForNodes:nodesetBeingModified]]; - [self _finishModifySequence:change withName:@"Modify nodes" cancelled:cancelled]; - - [nodesetBeingModified release]; - nodesetBeingModified = nil; - [nodesetBeingModifiedOldCopy release]; - nodesetBeingModifiedOldCopy = nil; -} - -- (void) endModifyNodes { [self _finishModifyNodes:NO]; } -- (void) cancelModifyNodes { [self _finishModifyNodes:YES]; } - -- (void) startShiftNodes:(NSSet*)nodes { - if (nodesetBeingModified != nil) { - [NSException raise:@"NSInternalInconsistencyException" format:@"Already modifying a node set"]; - } - - nodesetBeingModified = [nodes copy]; - currentNodeShift = NSZeroPoint; -} - -- (void) shiftNodesUpdate:(NSPoint)currentShift { - if (nodesetBeingModified == nil) { - [NSException raise:@"NSInternalInconsistencyException" format:@"Not modifying a node set"]; - } - - currentNodeShift = currentShift; - [self regenerateTikz]; - GraphChange *change = [GraphChange shiftNodes:nodesetBeingModified - byPoint:currentNodeShift]; - [self postIncompleteGraphChange:change]; -} - -- (void) _finishShiftNodesCancelled:(BOOL)cancelled { - if (nodesetBeingModified == nil) { - [NSException raise:@"NSInternalInconsistencyException" format:@"Not modifying a node set"]; - } - - if (!NSEqualPoints (currentNodeShift, NSZeroPoint)) { - GraphChange *change = [GraphChange shiftNodes:nodesetBeingModified - byPoint:currentNodeShift]; - [self _finishModifySequence:change withName:@"Move nodes" cancelled:cancelled]; - } - - [nodesetBeingModified release]; - nodesetBeingModified = nil; -} - -- (void) endShiftNodes { [self _finishShiftNodesCancelled:NO]; } -- (void) cancelShiftNodes { [self _finishShiftNodesCancelled:YES]; } - -- (void) startModifyEdge:(Edge*)edge { - if (edgeBeingModified != nil) { - [NSException raise:@"NSInternalInconsistencyException" format:@"Already modifying an edge"]; - } - edgeBeingModified = [edge retain]; - edgeBeingModifiedOldCopy = [edge copy]; -} - -- (void) modifyEdgeCheckPoint { - [self regenerateTikz]; - GraphChange *change = [GraphChange propertyChangeOfEdge:edgeBeingModified - fromOld:edgeBeingModifiedOldCopy - toNew:[[edgeBeingModified copy] autorelease]]; - [self postIncompleteGraphChange:change]; -} - -- (void) _finishModifyEdgeCancelled:(BOOL)cancelled { - if (edgeBeingModified == nil) { - [NSException raise:@"NSInternalInconsistencyException" format:@"Not modifying an edge"]; - } - - GraphChange *change = [GraphChange propertyChangeOfEdge:edgeBeingModified - fromOld:edgeBeingModifiedOldCopy - toNew:[[edgeBeingModified copy] autorelease]]; - [self _finishModifySequence:change withName:@"Modify edge" cancelled:cancelled]; - - [edgeBeingModified release]; - edgeBeingModified = nil; - [edgeBeingModifiedOldCopy release]; - edgeBeingModifiedOldCopy = nil; -} - -- (void) endModifyEdge { [self _finishModifyEdgeCancelled:NO]; } -- (void) cancelModifyEdge { [self _finishModifyEdgeCancelled:YES]; } - -- (void) startModifyEdges:(NSSet*)edges { - if (edgesetBeingModified != nil) { - [NSException raise:@"NSInternalInconsistencyException" format:@"Already modifying an edge set"]; - } - - edgesetBeingModified = [edges copy]; - edgesetBeingModifiedOldCopy = [[Graph edgeTableForEdges:edges] retain]; -} - -- (void) modifyEdgesCheckPoint { - [self regenerateTikz]; - GraphChange *change = [GraphChange propertyChangeOfEdgesFromOldCopies:edgesetBeingModifiedOldCopy - toNewCopies:[Graph edgeTableForEdges:edgesetBeingModified]]; - [self postIncompleteGraphChange:change]; -} - -- (void) _finishModifyEdgesCancelled:(BOOL)cancelled { - if (edgesetBeingModified == nil) { - [NSException raise:@"NSInternalInconsistencyException" format:@"Not modifying an edge"]; - } - - GraphChange *change = [GraphChange propertyChangeOfEdgesFromOldCopies:edgesetBeingModifiedOldCopy - toNewCopies:[Graph edgeTableForEdges:edgesetBeingModified]]; - [self _finishModifySequence:change withName:@"Modify edges" cancelled:cancelled]; - - [edgesetBeingModified release]; - edgesetBeingModified = nil; - [edgesetBeingModifiedOldCopy release]; - edgesetBeingModifiedOldCopy = nil; -} - -- (void) endModifyEdges { [self _finishModifyEdgesCancelled:NO]; } -- (void) cancelModifyEdges { [self _finishModifyEdgesCancelled:YES]; } - -- (void) startChangeBoundingBox { - oldGraphBounds = [graph boundingBox]; -} - -- (void) changeBoundingBoxCheckPoint { - [self regenerateTikz]; - GraphChange *change = [GraphChange changeBoundingBoxFrom:oldGraphBounds - to:[graph boundingBox]]; - [self postIncompleteGraphChange:change]; -} - -- (void) _finishChangeBoundingBoxCancelled:(BOOL)cancelled { - GraphChange *change = [GraphChange changeBoundingBoxFrom:oldGraphBounds - to:[graph boundingBox]]; - [self _finishModifySequence:change withName:@"Set bounding box" cancelled:cancelled]; -} -- (void) endChangeBoundingBox { [self _finishChangeBoundingBoxCancelled:NO]; } -- (void) cancelChangeBoundingBox { [self _finishChangeBoundingBoxCancelled:YES]; } - -- (void) startChangeGraphProperties { - oldGraphData = [[graph data] copy]; -} - -- (void) changeGraphPropertiesCheckPoint { - [self regenerateTikz]; - GraphChange *change = [GraphChange propertyChangeOfGraphFrom:oldGraphData - to:[graph data]]; - [self postIncompleteGraphChange:change]; -} - -- (void) _finishChangeGraphPropertiesCancelled:(BOOL)cancelled { - GraphChange *change = [GraphChange propertyChangeOfGraphFrom:oldGraphData - to:[graph data]]; - [self _finishModifySequence:change withName:@"Change graph properties" cancelled:cancelled]; - [oldGraphData release]; - oldGraphData = nil; -} -- (void) endChangeGraphProperties { [self _finishChangeGraphPropertiesCancelled:NO]; } -- (void) cancelChangeGraphProperties { [self _finishChangeGraphPropertiesCancelled:YES]; } - -- (void) removeSelected { - NSUInteger selEdges = [[pickSupport selectedEdges] count]; - NSUInteger selNodes = [[pickSupport selectedNodes] count]; - - if (selEdges == 0 && selNodes == 0) { - return; - } - - NSString *actionName = @"Remove selection"; - - [self startUndoGroup]; - if (selEdges > 0) { - GraphChange *change = [graph removeEdges:[pickSupport selectedEdges]]; - [self registerUndoForChange:change]; - [pickSupport deselectAllEdges]; - [self postGraphChange:change]; - } else { - actionName = (selNodes == 1 ? @"Remove node" : @"Remove nodes"); - } - if (selNodes > 0) { - GraphChange *change = [graph removeNodes:[pickSupport selectedNodes]]; - [self registerUndoForChange:change]; - [pickSupport deselectAllNodes]; - [self postGraphChange:change]; - } else { - actionName = (selEdges == 1 ? @"Remove edge" : @"Remove edges"); - } - [self nameAndEndUndoGroup:actionName]; - [self regenerateTikz]; -} - -- (void) addNode:(Node*)node { - GraphChange *change = [graph addNode:node]; - [self completedGraphChange:change withName:@"Add node"]; -} - -- (void) removeNode:(Node*)node { - [pickSupport deselectNode:node]; - GraphChange *change = [graph removeNode:node]; - [self completedGraphChange:change withName:@"Remove node"]; -} - -- (void) addEdge:(Edge*)edge { - GraphChange *change = [graph addEdge:edge]; - [self completedGraphChange:change withName:@"Add edge"]; -} - -- (void) removeEdge:(Edge*)edge { - [pickSupport deselectEdge:edge]; - GraphChange *change = [graph removeEdge:edge]; - [self completedGraphChange:change withName:@"Remove edge"]; -} - -- (void) shiftSelectedNodesByPoint:(NSPoint)offset { - if ([[pickSupport selectedNodes] count] > 0) { - GraphChange *change = [graph shiftNodes:[pickSupport selectedNodes] byPoint:offset]; - [self completedGraphChange:change withName:@"Move nodes"]; - } -} - -- (void) insertGraph:(Graph*)g { - GraphChange *change = [graph insertGraph:g]; - [self completedGraphChange:change withName:@"Insert graph"]; -} - -- (void) flipSelectedNodesHorizontally { - if ([[pickSupport selectedNodes] count] > 0) { - GraphChange *change = [graph flipHorizontalNodes:[pickSupport selectedNodes]]; - [self completedGraphChange:change withName:@"Flip nodes horizontally"]; - } -} - -- (void) flipSelectedNodesVertically { - if ([[pickSupport selectedNodes] count] > 0) { - GraphChange *change = [graph flipVerticalNodes:[pickSupport selectedNodes]]; - [self completedGraphChange:change withName:@"Flip nodes vertically"]; - } -} - -- (void) reverseSelectedEdges { - if ([[pickSupport selectedEdges] count] > 0) { - GraphChange *change = [graph reverseEdges:[pickSupport selectedEdges]]; - [self completedGraphChange:change withName:@"Reverse edges"]; - } -} - -- (void) bringSelectionForward { - BOOL hasNodeSelection = [[pickSupport selectedNodes] count] > 0; - BOOL hasEdgeSelection = [[pickSupport selectedEdges] count] > 0; - if (!hasNodeSelection && !hasEdgeSelection) - return; - - [self startUndoGroup]; - GraphChange *nodeChange; - GraphChange *edgeChange; - if (hasNodeSelection) { - nodeChange = [graph bringNodesForward:[pickSupport selectedNodes]]; - [self registerUndoForChange:nodeChange]; - } - if (hasEdgeSelection) { - edgeChange = [graph bringEdgesForward:[pickSupport selectedEdges]]; - [self registerUndoForChange:edgeChange]; - } - [self nameAndEndUndoGroup:@"Bring forward"]; - [self regenerateTikz]; - if (hasNodeSelection) - [self postGraphChange:nodeChange]; - if (hasEdgeSelection) - [self postGraphChange:edgeChange]; -} - -- (void) bringSelectionToFront { - BOOL hasNodeSelection = [[pickSupport selectedNodes] count] > 0; - BOOL hasEdgeSelection = [[pickSupport selectedEdges] count] > 0; - if (!hasNodeSelection && !hasEdgeSelection) - return; - - [self startUndoGroup]; - GraphChange *nodeChange; - GraphChange *edgeChange; - if (hasNodeSelection) { - nodeChange = [graph bringNodesToFront:[pickSupport selectedNodes]]; - [self registerUndoForChange:nodeChange]; - } - if (hasEdgeSelection) { - edgeChange = [graph bringEdgesToFront:[pickSupport selectedEdges]]; - [self registerUndoForChange:edgeChange]; - } - [self nameAndEndUndoGroup:@"Bring to front"]; - [self regenerateTikz]; - if (hasNodeSelection) - [self postGraphChange:nodeChange]; - if (hasEdgeSelection) - [self postGraphChange:edgeChange]; -} - -- (void) sendSelectionBackward { - BOOL hasNodeSelection = [[pickSupport selectedNodes] count] > 0; - BOOL hasEdgeSelection = [[pickSupport selectedEdges] count] > 0; - if (!hasNodeSelection && !hasEdgeSelection) - return; - - [self startUndoGroup]; - GraphChange *nodeChange; - GraphChange *edgeChange; - if (hasNodeSelection) { - nodeChange = [graph sendNodesBackward:[pickSupport selectedNodes]]; - [self registerUndoForChange:nodeChange]; - } - if (hasEdgeSelection) { - edgeChange = [graph sendNodesBackward:[pickSupport selectedEdges]]; - [self registerUndoForChange:edgeChange]; - } - [self nameAndEndUndoGroup:@"Send backward"]; - [self regenerateTikz]; - if (hasNodeSelection) - [self postGraphChange:nodeChange]; - if (hasEdgeSelection) - [self postGraphChange:edgeChange]; -} - -- (void) sendSelectionToBack { - BOOL hasNodeSelection = [[pickSupport selectedNodes] count] > 0; - BOOL hasEdgeSelection = [[pickSupport selectedEdges] count] > 0; - if (!hasNodeSelection && !hasEdgeSelection) - return; - - [self startUndoGroup]; - GraphChange *nodeChange; - GraphChange *edgeChange; - if (hasNodeSelection) { - nodeChange = [graph sendNodesToBack:[pickSupport selectedNodes]]; - [self registerUndoForChange:nodeChange]; - } - if (hasEdgeSelection) { - edgeChange = [graph sendNodesToBack:[pickSupport selectedEdges]]; - [self registerUndoForChange:edgeChange]; - } - [self nameAndEndUndoGroup:@"Send to back"]; - [self regenerateTikz]; - if (hasNodeSelection) - [self postGraphChange:nodeChange]; - if (hasEdgeSelection) - [self postGraphChange:edgeChange]; -} - -- (BOOL) saveCopyToPath: (NSString*)p error: (NSError**)error { - if (!p) { - [NSException raise:@"No document path" format:@"No path given"]; - } - // we use glib for writing the file, because GNUStep sucks in this regard - // (older versions don't have -[NSString writeToFile:atomically:encoding:error:]) - GError *gerror = NULL; - gchar *filename = [p glibFilename]; - BOOL success = g_file_set_contents (filename, [tikz UTF8String], -1, &gerror) ? YES : NO; - if (gerror) { - GErrorToNSError (gerror, error); - g_error_free (gerror); - } - g_free (filename); - return success; -} - -- (BOOL) saveToPath: (NSString*)p error: (NSError**)error { - BOOL success = [self saveCopyToPath:p error:error]; - if (success) { - [self setPath:p]; - hasChanges = NO; - } - return success; -} - -- (BOOL) save: (NSError**)error { - if (!path) { - [NSException raise:@"No document path" format:@"Tried to save a document when there was no path"]; - } - return [self saveToPath:path error:error]; -} - -@end - -@implementation TikzDocument (Private) -- (void) styleRenamed:(NSNotification*)n { - [self regenerateTikz]; -} - -- (void) setPath:(NSString*)p { - [p retain]; - [path release]; - path = p; -} - -- (void) setGraph:(Graph*)g { - if (g == nil) { - g = [Graph graph]; - } - if (g == graph) { - return; - } - - [pickSupport deselectAllNodes]; - [pickSupport deselectAllEdges]; - - [self startUndoGroup]; - [undoManager registerUndoWithTarget:self selector:@selector(setGraph:) object:graph]; - [g retain]; - [graph release]; - graph = g; - - [self attachStylesToGraph:graph]; - - [self regenerateTikz]; - [self postGraphReplaced]; - [self nameAndEndUndoGroup:@"Replace graph"]; -} - -- (void) registerUndoForChange:(GraphChange*)change { - [undoManager registerUndoWithTarget:self - selector:@selector(undoGraphChange:) - object:change]; -} - -- (void) registerUndoGroupForChange:(GraphChange*)change withName:(NSString*)nm { - [self startUndoGroup]; - [self registerUndoForChange:change]; - [self nameAndEndUndoGroup:nm]; -} - -- (void) undoGraphChange:(GraphChange*)change { - GraphChange *inverse = [change invert]; - [graph applyGraphChange:inverse]; - [self startUndoGroup]; - [undoManager registerUndoWithTarget:self - selector:@selector(undoGraphChange:) - object:inverse]; - [self endUndoGroup]; - [self regenerateTikz]; - [self postGraphChange:change]; -} - -- (void) completedGraphChange:(GraphChange*)change withName:(NSString*)name { - if (change == nil) { - NSLog(@"No graph change given for change %@", name); - return; - } - [self registerUndoGroupForChange:change withName:name]; - [self regenerateTikz]; - [self postGraphChange:change]; -} - -- (void) attachStylesToGraph:(Graph*)g { - for (Node *n in [g nodes]) { - [n attachStyleFromTable:[styleManager nodeStyles]]; - } - for (Edge *e in [g edges]) { - [e attachStyleFromTable:[styleManager edgeStyles]]; - } -} - -- (void) regenerateTikz { - [tikz release]; - tikz = [[graph tikz] retain]; - hasChanges = YES; - [self postTikzChanged]; -} -@end - -// vim:ft=objc:sts=4:sw=4:et diff --git a/tikzit-old/src/gtk/Tool.h b/tikzit-old/src/gtk/Tool.h deleted file mode 100644 index 22c983e..0000000 --- a/tikzit-old/src/gtk/Tool.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "InputDelegate.h" -#import "Surface.h" - -#import -#import - -@class Configuration; -@class GraphRenderer; -@protocol InputDelegate; -@protocol RenderDelegate; - -@protocol Tool -@property (readonly) NSString *name; -@property (readonly) const gchar *stockId; -@property (readonly) NSString *helpText; -@property (readonly) NSString *shortcut; -@property (retain) GraphRenderer *activeRenderer; -@property (readonly) GtkWidget *configurationWidget; -- (void) loadConfiguration:(Configuration*)config; -- (void) saveConfiguration:(Configuration*)config; -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/ToolBox.h b/tikzit-old/src/gtk/ToolBox.h deleted file mode 100644 index 60074c1..0000000 --- a/tikzit-old/src/gtk/ToolBox.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class Configuration; -@class Window; -@protocol Tool; - -@interface ToolBox : NSObject { - GtkWidget *window; - GtkToolItemGroup *toolGroup; - GtkWidget *titleLabel; - GtkWidget *configWidgetContainer; - GtkWidget *configWidget; -} - -@property (assign) id selectedTool; - -- (id) initWithTools:(NSArray*)tools; - -- (void) show; -- (void) present; -- (void) attachToWindow:(Window*)parent; - -- (void) loadConfiguration:(Configuration*)config; -- (void) saveConfiguration:(Configuration*)config; -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/ToolBox.m b/tikzit-old/src/gtk/ToolBox.m deleted file mode 100644 index c6d2ccf..0000000 --- a/tikzit-old/src/gtk/ToolBox.m +++ /dev/null @@ -1,280 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "ToolBox.h" - -#import "Application.h" -#import "Configuration.h" -#import "Tool.h" -#import "Window.h" - -#import "gtkhelpers.h" -#import "tztoolpalette.h" - -static void tool_button_toggled_cb (GtkWidget *widget, ToolBox *toolBox); - -#define TOOL_DATA_KEY "tikzit-tool" - -@implementation ToolBox - -- (id) init { - [self release]; - return nil; -} - -- (id) initWithTools:(NSArray*)tools { - self = [super init]; - - if (self) { - window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - g_object_ref_sink (window); - gtk_window_set_title (GTK_WINDOW (window), "Toolbox"); - gtk_window_set_role (GTK_WINDOW (window), "toolbox"); - gtk_window_set_type_hint (GTK_WINDOW (window), - GDK_WINDOW_TYPE_HINT_UTILITY); - gtk_window_set_deletable (GTK_WINDOW (window), FALSE); - - GtkWidget *mainLayout = gtk_vbox_new (FALSE, 5); - gtk_widget_show (mainLayout); - gtk_container_add (GTK_CONTAINER (window), mainLayout); - - GtkWidget *toolPalette = tz_tool_palette_new (); - gtk_widget_show (toolPalette); - gtk_box_pack_start (GTK_BOX (mainLayout), - toolPalette, - FALSE, - FALSE, - 0); - gtk_tool_palette_set_style (GTK_TOOL_PALETTE (toolPalette), - GTK_TOOLBAR_ICONS); - - toolGroup = GTK_TOOL_ITEM_GROUP (gtk_tool_item_group_new ("Tools")); - g_object_ref_sink (G_OBJECT (toolGroup)); - gtk_tool_item_group_set_label_widget ( - toolGroup, - NULL); - gtk_container_add (GTK_CONTAINER (toolPalette), GTK_WIDGET (toolGroup)); - gtk_widget_show (GTK_WIDGET (toolGroup)); - - GSList *item_group = NULL; - for (id tool in tools) { - NSString *tooltip = [NSString stringWithFormat: - @"%@: %@ (%@)", - [tool name], [tool helpText], [tool shortcut]]; - GtkToolItem *item = gtk_radio_tool_button_new_from_stock ( - item_group, - [tool stockId]); - gtk_tool_item_set_tooltip_text (item, [tooltip UTF8String]); - item_group = gtk_radio_tool_button_get_group ( - GTK_RADIO_TOOL_BUTTON (item)); - gtk_tool_item_group_insert ( - toolGroup, - item, - -1); - gtk_widget_show (GTK_WIDGET (item)); - g_object_set_data_full ( - G_OBJECT(item), - TOOL_DATA_KEY, - [tool retain], - release_obj); - - g_signal_connect (item, "toggled", - G_CALLBACK (tool_button_toggled_cb), - self); - } - - GtkWidget *sep = gtk_hseparator_new (); - gtk_widget_show (sep); - gtk_box_pack_start (GTK_BOX (mainLayout), - sep, - FALSE, - FALSE, - 0); - - titleLabel = gtk_label_new (""); - g_object_ref_sink (titleLabel); - gtk_widget_show (titleLabel); - - PangoAttrList *attrs = pango_attr_list_new (); - pango_attr_list_insert (attrs, - pango_attr_weight_new (PANGO_WEIGHT_SEMIBOLD)); - gtk_label_set_attributes (GTK_LABEL (titleLabel), attrs); - pango_attr_list_unref (attrs); - - gtk_box_pack_start (GTK_BOX (mainLayout), - titleLabel, - FALSE, - FALSE, - 0); - - configWidgetContainer = gtk_alignment_new (0.5, 0.5, 1.0, 1.0); - g_object_ref_sink (configWidgetContainer); - gtk_widget_show (configWidgetContainer); - gtk_box_pack_start (GTK_BOX (mainLayout), - configWidgetContainer, - TRUE, - TRUE, - 0); - gtk_alignment_set_padding (GTK_ALIGNMENT (configWidgetContainer), - 5, 5, 5, 5); - - gint button_width; - gint button_height; - - if (tz_tool_palette_get_button_size (TZ_TOOL_PALETTE (toolPalette), - &button_width, &button_height)) - { - GdkGeometry geometry; - - geometry.min_width = 2 * button_width; - geometry.min_height = -1; - geometry.base_width = button_width; - geometry.base_height = 0; - geometry.width_inc = button_width; - geometry.height_inc = 1; - - gtk_window_set_geometry_hints (GTK_WINDOW (window), - NULL, - &geometry, - GDK_HINT_MIN_SIZE | - GDK_HINT_BASE_SIZE | - GDK_HINT_RESIZE_INC | - GDK_HINT_USER_POS); - } - gtk_window_set_default_size (GTK_WINDOW (window), button_width * 5, 500); - - // hack to position the toolbox window somewhere sensible - // (upper left) - gtk_window_parse_geometry (GTK_WINDOW (window), "+0+0"); - } - - return self; -} - -- (void) dealloc { - if (window) { - g_object_unref (G_OBJECT (toolGroup)); - g_object_unref (G_OBJECT (titleLabel)); - g_object_unref (G_OBJECT (configWidgetContainer)); - if (configWidget) - g_object_unref (G_OBJECT (configWidget)); - gtk_widget_destroy (window); - g_object_unref (G_OBJECT (window)); - } - - [super dealloc]; -} - -- (id) selectedTool { - guint count = gtk_tool_item_group_get_n_items (toolGroup); - for (guint i = 0; i < count; ++i) { - GtkToolItem *item = gtk_tool_item_group_get_nth_item (toolGroup, i); - if (gtk_toggle_tool_button_get_active (GTK_TOGGLE_TOOL_BUTTON (item))) { - return (id)g_object_get_data (G_OBJECT (item), TOOL_DATA_KEY); - } - } - return nil; -} - -- (void) _setToolWidget:(GtkWidget*)widget { - if (configWidget) { - gtk_widget_hide (configWidget); - gtk_container_remove (GTK_CONTAINER (configWidgetContainer), - configWidget); - g_object_unref (configWidget); - } - configWidget = widget; - if (configWidget) { - g_object_ref (configWidget); - gtk_container_add (GTK_CONTAINER (configWidgetContainer), - configWidget); - gtk_widget_show (configWidget); - } -} - -- (void) setSelectedTool:(id)tool { - guint count = gtk_tool_item_group_get_n_items (toolGroup); - for (guint i = 0; i < count; ++i) { - GtkToolItem *item = gtk_tool_item_group_get_nth_item (toolGroup, i); - id data = (id)g_object_get_data (G_OBJECT (item), TOOL_DATA_KEY); - if (data == tool) { - gtk_toggle_tool_button_set_active ( - GTK_TOGGLE_TOOL_BUTTON (item), - TRUE); - break; - } - } - gtk_label_set_label (GTK_LABEL (titleLabel), - [[tool name] UTF8String]); - [self _setToolWidget:[tool configurationWidget]]; -} - -- (void) show { - gtk_widget_show (window); -} - -- (void) present { - gtk_window_present (GTK_WINDOW (window)); -} - -- (void) attachToWindow:(Window*)parent { - utility_window_attach (GTK_WINDOW (window), [parent gtkWindow]); -} - -- (void) loadConfiguration:(Configuration*)config { - if ([config hasGroup:@"ToolBox"]) { - tz_restore_window (GTK_WINDOW (window), - [config integerEntry:@"x" inGroup:@"ToolBox"], - [config integerEntry:@"y" inGroup:@"ToolBox"], - [config integerEntry:@"w" inGroup:@"ToolBox"], - [config integerEntry:@"h" inGroup:@"ToolBox"]); - } -} - -- (void) saveConfiguration:(Configuration*)config { - gint x, y, w, h; - - gtk_window_get_position (GTK_WINDOW (window), &x, &y); - gtk_window_get_size (GTK_WINDOW (window), &w, &h); - - [config setIntegerEntry:@"x" inGroup:@"ToolBox" value:x]; - [config setIntegerEntry:@"y" inGroup:@"ToolBox" value:y]; - [config setIntegerEntry:@"w" inGroup:@"ToolBox" value:w]; - [config setIntegerEntry:@"h" inGroup:@"ToolBox" value:h]; -} - -@end - -static void tool_button_toggled_cb (GtkWidget *widget, ToolBox *toolBox) { - if (gtk_toggle_tool_button_get_active (GTK_TOGGLE_TOOL_BUTTON (widget))) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - id tool = (id)g_object_get_data (G_OBJECT(widget), TOOL_DATA_KEY); - [app setActiveTool:tool]; - NSDictionary *userInfo = [NSDictionary - dictionaryWithObject:tool - forKey:@"tool"]; - [[NSNotificationCenter defaultCenter] - postNotificationName:@"ToolSelectionChanged" - object:toolBox - userInfo:userInfo]; - - [pool drain]; - } -} - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/WidgetSurface.h b/tikzit-old/src/gtk/WidgetSurface.h deleted file mode 100644 index 667749f..0000000 --- a/tikzit-old/src/gtk/WidgetSurface.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import -#import -#import - -/** - * Provides a surface for rendering to a widget. - */ -@interface WidgetSurface: NSObject { - GtkWidget *widget; - Transformer *transformer; - id renderDelegate; - id inputDelegate; - BOOL keepCentered; - BOOL buttonPressesRequired; - CGFloat defaultScale; - NSSize lastKnownSize; -} - -@property (assign) BOOL canFocus; -@property (assign) BOOL keepCentered; -@property (assign) CGFloat defaultScale; - -- (id) initWithWidget:(GtkWidget*)widget; -- (GtkWidget*) widget; - -- (id) inputDelegate; -- (void) setInputDelegate:(id)delegate; - -/** - * Set the minimum size that this widget wants - */ -- (void) setSizeRequestWidth:(double)width height:(double)height; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/WidgetSurface.m b/tikzit-old/src/gtk/WidgetSurface.m deleted file mode 100644 index 004e722..0000000 --- a/tikzit-old/src/gtk/WidgetSurface.m +++ /dev/null @@ -1,630 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "WidgetSurface.h" -#import "gtkhelpers.h" -#import "InputDelegate.h" -#import "CairoRenderContext.h" - -// {{{ Internal interfaces -// {{{ GTK+ callbacks -static gboolean configure_event_cb (GtkWidget *widget, GdkEventConfigure *event, WidgetSurface *surface); -static void realize_cb (GtkWidget *widget, WidgetSurface *surface); -static gboolean expose_event_cb (GtkWidget *widget, GdkEventExpose *event, WidgetSurface *surface); -static gboolean button_press_event_cb (GtkWidget *widget, GdkEventButton *event, WidgetSurface *surface); -static gboolean button_release_event_cb (GtkWidget *widget, GdkEventButton *event, WidgetSurface *surface); -static gboolean motion_notify_event_cb (GtkWidget *widget, GdkEventMotion *event, WidgetSurface *surface); -static gboolean key_press_event_cb (GtkWidget *widget, GdkEventKey *event, WidgetSurface *surface); -static gboolean key_release_event_cb (GtkWidget *widget, GdkEventKey *event, WidgetSurface *surface); -static gboolean scroll_event_cb (GtkWidget *widget, GdkEventScroll *event, WidgetSurface *surface); -static void set_cursor (GtkWidget *widget, GdkCursor *cursor); -static void unref_cursor (gpointer cursor, GClosure *closure); -// }}} - -@interface WidgetSurface (Private) -- (void) updateTransformer; -- (void) widgetSizeChanged:(NSNotification*)notification; -- (void) handleExposeEvent:(GdkEventExpose*)event; -- (void) updateLastKnownSize; -- (void) zoomTo:(CGFloat)scale aboutPoint:(NSPoint)p; -- (void) zoomTo:(CGFloat)scale; -- (void) addToEventMask:(GdkEventMask)values; -- (void) removeFromEventMask:(GdkEventMask)values; -@end -// }}} -// {{{ API -@implementation WidgetSurface - -- (id) init { - return [self initWithWidget:gtk_drawing_area_new ()]; -} - -- (id) initWithWidget:(GtkWidget*)w { - self = [super init]; - - if (self) { - widget = w; - g_object_ref_sink (G_OBJECT (widget)); - defaultScale = 1.0f; - transformer = [[Transformer alloc] init]; - [transformer setFlippedAboutXAxis:YES]; - [self updateLastKnownSize]; - g_object_set (G_OBJECT (widget), "events", GDK_STRUCTURE_MASK, NULL); - g_signal_connect (widget, "expose-event", G_CALLBACK (expose_event_cb), self); - g_signal_connect (widget, "configure-event", G_CALLBACK (configure_event_cb), self); - g_signal_connect (widget, "realize", G_CALLBACK (realize_cb), self); - g_signal_connect (widget, "button-press-event", G_CALLBACK (button_press_event_cb), self); - g_signal_connect (widget, "button-release-event", G_CALLBACK (button_release_event_cb), self); - g_signal_connect (widget, "motion-notify-event", G_CALLBACK (motion_notify_event_cb), self); - g_signal_connect (widget, "key-press-event", G_CALLBACK (key_press_event_cb), self); - g_signal_connect (widget, "key-release-event", G_CALLBACK (key_release_event_cb), self); - g_signal_connect (widget, "scroll-event", G_CALLBACK (scroll_event_cb), self); - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(widgetSizeChanged:) - name:@"SurfaceSizeChanged" - object:self]; - if ([self canFocus]) { - [self addToEventMask:GDK_BUTTON_PRESS_MASK]; - } else { - [self removeFromEventMask:GDK_BUTTON_PRESS_MASK]; - } - } - - return self; -} - -- (void) dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; - [transformer release]; - g_object_unref (G_OBJECT (widget)); - - [super dealloc]; -} - -- (void) invalidateRect:(NSRect)rect { - if (!NSIsEmptyRect (rect)) { - GdkWindow *window = gtk_widget_get_window (widget); - if (window) { - GdkRectangle g_rect = gdk_rectangle_from_ns_rect (rect); - gdk_window_invalidate_rect (window, &g_rect, TRUE); - } - } -} - -- (void) invalidate { - GdkWindow *window = gtk_widget_get_window (widget); - if (window) { - GdkRegion *visible = gdk_drawable_get_visible_region (GDK_DRAWABLE (window)); - gdk_window_invalidate_region (window, visible, TRUE); - gdk_region_destroy (visible); - } -} - -- (id) createRenderContext { - return [CairoRenderContext contextForWidget:widget]; -} - -- (int) width { - int width = 0; - GdkWindow *window = gtk_widget_get_window (widget); - if (window) { - gdk_drawable_get_size (window, &width, NULL); - } - return width; -} - -- (int) height { - int height = 0; - GdkWindow *window = gtk_widget_get_window (widget); - if (window) { - gdk_drawable_get_size (window, NULL, &height); - } - return height; -} - -- (void) setSizeRequestWidth:(double)width height:(double)height { - gtk_widget_set_size_request (widget, width, height); -} - -- (Transformer*) transformer { - return transformer; -} - -- (GtkWidget*) widget { - return widget; -} - -- (void) setRenderDelegate:(id )delegate { - // NB: no retention! - renderDelegate = delegate; - if (renderDelegate == nil) { - [self removeFromEventMask:GDK_EXPOSURE_MASK]; - } else { - [self addToEventMask:GDK_EXPOSURE_MASK]; - } -} - -- (id) inputDelegate { - return inputDelegate; -} - -- (void) setInputDelegate:(id)delegate { - if (delegate == inputDelegate) { - return; - } - buttonPressesRequired = NO; - if (inputDelegate != nil) { - [self removeFromEventMask:GDK_POINTER_MOTION_MASK - | GDK_BUTTON_PRESS_MASK - | GDK_BUTTON_RELEASE_MASK - | GDK_KEY_PRESS_MASK - | GDK_KEY_RELEASE_MASK]; - } - inputDelegate = delegate; - if (delegate != nil) { - GdkEventMask mask = 0; - if ([delegate respondsToSelector:@selector(mousePressAt:withButton:andMask:)]) { - buttonPressesRequired = YES; - mask |= GDK_BUTTON_PRESS_MASK; - } - if ([delegate respondsToSelector:@selector(mouseReleaseAt:withButton:andMask:)]) { - mask |= GDK_BUTTON_RELEASE_MASK; - } - if ([delegate respondsToSelector:@selector(mouseDoubleClickAt:withButton:andMask:)]) { - buttonPressesRequired = YES; - mask |= GDK_BUTTON_PRESS_MASK; - } - if ([delegate respondsToSelector:@selector(mouseMoveTo:withButtons:andMask:)]) { - mask |= GDK_POINTER_MOTION_MASK; - } - if ([delegate respondsToSelector:@selector(keyPressed:withMask:)]) { - mask |= GDK_KEY_PRESS_MASK; - } - if ([delegate respondsToSelector:@selector(keyReleased:withMask:)]) { - mask |= GDK_KEY_RELEASE_MASK; - } - [self addToEventMask:mask]; - } -} - -- (id ) renderDelegate { - return renderDelegate; -} - -- (void) setKeepCentered:(BOOL)centered { - keepCentered = centered; - [self updateTransformer]; -} - -- (BOOL) keepCentered { - return keepCentered; -} - -- (BOOL) canFocus { - return gtk_widget_get_can_focus (widget); -} - -- (void) setCanFocus:(BOOL)focus { - gtk_widget_set_can_focus (widget, focus); - if (focus) { - [self addToEventMask:GDK_BUTTON_PRESS_MASK]; - } else if (!buttonPressesRequired) { - [self removeFromEventMask:GDK_BUTTON_PRESS_MASK]; - } -} - -- (BOOL) hasFocus { - return gtk_widget_has_focus (widget); -} - -- (void) renderFocus { - GdkWindow *window = gtk_widget_get_window (widget); - if (window) { - int width = 0; - int height = 0; - gdk_drawable_get_size (window, &width, &height); - gtk_paint_focus (gtk_widget_get_style (widget), - window, - GTK_STATE_NORMAL, - NULL, - widget, - NULL, - 0, - 0, - width, - height - ); - } -} - -- (CGFloat) defaultScale { - return defaultScale; -} - -- (void) setDefaultScale:(CGFloat)newDefault { - if (defaultScale != newDefault) { - CGFloat oldDefault = defaultScale; - defaultScale = newDefault; - - CGFloat scale = [transformer scale]; - scale *= (newDefault / oldDefault); - [transformer setScale:scale]; - [self invalidate]; - } -} - -- (void) zoomIn { - CGFloat scale = [transformer scale]; - scale *= 1.2f; - [self zoomTo:scale]; -} - -- (void) zoomOut { - CGFloat scale = [transformer scale]; - scale /= 1.2f; - [self zoomTo:scale]; -} - -- (void) zoomReset { - [self zoomTo:defaultScale]; -} - -- (void) zoomInAboutPoint:(NSPoint)p { - CGFloat scale = [transformer scale]; - scale *= 1.2f; - [self zoomTo:scale aboutPoint:p]; -} - -- (void) zoomOutAboutPoint:(NSPoint)p { - CGFloat scale = [transformer scale]; - scale /= 1.2f; - [self zoomTo:scale aboutPoint:p]; -} - -- (void) zoomResetAboutPoint:(NSPoint)p { - [self zoomTo:defaultScale aboutPoint:p]; -} - -- (void) setCursor:(Cursor)c { - GdkCursor *cursor = NULL; - switch (c) { - case ResizeRightCursor: - cursor = gdk_cursor_new (GDK_RIGHT_SIDE); - break; - case ResizeBottomRightCursor: - cursor = gdk_cursor_new (GDK_BOTTOM_RIGHT_CORNER); - break; - case ResizeBottomCursor: - cursor = gdk_cursor_new (GDK_BOTTOM_SIDE); - break; - case ResizeBottomLeftCursor: - cursor = gdk_cursor_new (GDK_BOTTOM_LEFT_CORNER); - break; - case ResizeLeftCursor: - cursor = gdk_cursor_new (GDK_LEFT_SIDE); - break; - case ResizeTopLeftCursor: - cursor = gdk_cursor_new (GDK_TOP_LEFT_CORNER); - break; - case ResizeTopCursor: - cursor = gdk_cursor_new (GDK_TOP_SIDE); - break; - case ResizeTopRightCursor: - cursor = gdk_cursor_new (GDK_TOP_RIGHT_CORNER); - break; - default: break; - } - GdkWindow *window = gtk_widget_get_window (widget); - g_signal_handlers_disconnect_matched (window, - G_SIGNAL_MATCH_FUNC, 0, 0, NULL, - G_CALLBACK (set_cursor), NULL); - if (window) { - gdk_window_set_cursor (window, cursor); - if (cursor != NULL) { - gdk_cursor_unref (cursor); - } - } else { - g_signal_connect_data (widget, - "realize", G_CALLBACK (set_cursor), cursor, - unref_cursor, 0); - } -} - -@end -// }}} -// {{{ Private -@implementation WidgetSurface (Private) -- (void) widgetSizeChanged:(NSNotification*)notification { - [self updateTransformer]; - [self updateLastKnownSize]; -} - -- (void) updateTransformer { - if (keepCentered) { - GdkWindow *window = gtk_widget_get_window (widget); - if (window) { - int width = 0; - int height = 0; - gdk_drawable_get_size (window, &width, &height); - NSPoint origin; - if (lastKnownSize.width < 1 || lastKnownSize.height < 1) { - origin.x = (float)width / 2.0f; - origin.y = (float)height / 2.0f; - } else { - origin = [transformer origin]; - origin.x += ((float)width - lastKnownSize.width) / 2.0f; - origin.y += ((float)height - lastKnownSize.height) / 2.0f; - } - [transformer setOrigin:origin]; - } - } -} - -- (void) handleExposeEvent:(GdkEventExpose*)event { - if (renderDelegate != nil) { - NSRect area = gdk_rectangle_to_ns_rect (event->area); - - id context = [CairoRenderContext contextForWidget:widget]; - [context rect:area]; - [context clipToPath]; - [renderDelegate renderWithContext:context onSurface:self]; - } -} - -- (void) updateLastKnownSize { - GdkWindow *window = gtk_widget_get_window (widget); - if (window) { - int width = 0; - int height = 0; - gdk_drawable_get_size (window, &width, &height); - lastKnownSize.width = (float)width; - lastKnownSize.height = (float)height; - } else { - lastKnownSize = NSZeroSize; - } -} - -- (void) zoomTo:(CGFloat)scale aboutPoint:(NSPoint)p { - NSPoint graphP = [transformer fromScreen:p]; - - [transformer setScale:scale]; - - NSPoint newP = [transformer toScreen:graphP]; - NSPoint origin = [transformer origin]; - origin.x += p.x - newP.x; - origin.y += p.y - newP.y; - [transformer setOrigin:origin]; - - [self invalidate]; -} - -- (void) zoomTo:(CGFloat)scale { - NSPoint centre = NSMakePoint (lastKnownSize.width/2.0f, lastKnownSize.height/2.0f); - [self zoomTo:scale aboutPoint:centre]; -} - -- (void) addToEventMask:(GdkEventMask)values { - GdkEventMask mask; - g_object_get (G_OBJECT (widget), "events", &mask, NULL); - mask |= values; - g_object_set (G_OBJECT (widget), "events", mask, NULL); -} - -- (void) removeFromEventMask:(GdkEventMask)values { - GdkEventMask mask; - g_object_get (G_OBJECT (widget), "events", &mask, NULL); - mask ^= values; - if (buttonPressesRequired || [self canFocus]) { - mask |= GDK_BUTTON_PRESS_MASK; - } - g_object_set (G_OBJECT (widget), "events", mask, NULL); -} - -@end -// }}} -// {{{ GTK+ callbacks -static gboolean configure_event_cb(GtkWidget *widget, GdkEventConfigure *event, WidgetSurface *surface) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [[NSNotificationCenter defaultCenter] postNotificationName:@"SurfaceSizeChanged" object:surface]; - [pool drain]; - return FALSE; -} - -static void realize_cb (GtkWidget *widget, WidgetSurface *surface) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [surface updateTransformer]; - [pool drain]; -} - -static gboolean expose_event_cb(GtkWidget *widget, GdkEventExpose *event, WidgetSurface *surface) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [surface handleExposeEvent:event]; - [pool drain]; - return FALSE; -} - -InputMask mask_from_gdk_modifier_state (GdkModifierType state) { - InputMask mask = 0; - if (state & GDK_SHIFT_MASK) { - mask |= ShiftMask; - } - if (state & GDK_CONTROL_MASK) { - mask |= ControlMask; - } - if (state & GDK_META_MASK) { - mask |= MetaMask; - } - return mask; -} - -ScrollDirection scroll_dir_from_gdk_scroll_dir (GdkScrollDirection dir) { - switch (dir) { - case GDK_SCROLL_UP: return ScrollUp; - case GDK_SCROLL_DOWN: return ScrollDown; - case GDK_SCROLL_LEFT: return ScrollLeft; - case GDK_SCROLL_RIGHT: return ScrollRight; - default: NSLog(@"Invalid scroll direction %i", (int)dir); return ScrollDown; - } -} - -MouseButton buttons_from_gdk_modifier_state (GdkModifierType state) { - MouseButton buttons = 0; - if (state & GDK_BUTTON1_MASK) { - buttons |= LeftButton; - } - if (state & GDK_BUTTON2_MASK) { - buttons |= MiddleButton; - } - if (state & GDK_BUTTON3_MASK) { - buttons |= RightButton; - } - if (state & GDK_BUTTON4_MASK) { - buttons |= Button4; - } - if (state & GDK_BUTTON5_MASK) { - buttons |= Button5; - } - return buttons; -} - -static gboolean button_press_event_cb(GtkWidget *widget, GdkEventButton *event, WidgetSurface *surface) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - if ([surface canFocus]) { - if (!gtk_widget_has_focus (widget)) { - gtk_widget_grab_focus (widget); - } - } - - id delegate = [surface inputDelegate]; - if (delegate != nil) { - NSPoint pos = NSMakePoint (event->x, event->y); - MouseButton button = (MouseButton)event->button; - InputMask mask = mask_from_gdk_modifier_state (event->state); - if (event->type == GDK_BUTTON_PRESS && [delegate respondsToSelector:@selector(mousePressAt:withButton:andMask:)]) { - [delegate mousePressAt:pos withButton:button andMask:mask]; - } - if (event->type == GDK_2BUTTON_PRESS && [delegate respondsToSelector:@selector(mouseDoubleClickAt:withButton:andMask:)]) { - [delegate mouseDoubleClickAt:pos withButton:button andMask:mask]; - } - } - - [pool drain]; - return FALSE; -} - -static gboolean button_release_event_cb(GtkWidget *widget, GdkEventButton *event, WidgetSurface *surface) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - id delegate = [surface inputDelegate]; - if (delegate != nil) { - if ([delegate respondsToSelector:@selector(mouseReleaseAt:withButton:andMask:)]) { - NSPoint pos = NSMakePoint (event->x, event->y); - MouseButton button = (MouseButton)event->button; - InputMask mask = mask_from_gdk_modifier_state (event->state); - [delegate mouseReleaseAt:pos withButton:button andMask:mask]; - } - } - - [pool drain]; - return FALSE; -} - -static gboolean motion_notify_event_cb(GtkWidget *widget, GdkEventMotion *event, WidgetSurface *surface) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - id delegate = [surface inputDelegate]; - if (delegate != nil) { - if ([delegate respondsToSelector:@selector(mouseMoveTo:withButtons:andMask:)]) { - NSPoint pos = NSMakePoint (event->x, event->y); - MouseButton buttons = buttons_from_gdk_modifier_state (event->state); - InputMask mask = mask_from_gdk_modifier_state (event->state); - [delegate mouseMoveTo:pos withButtons:buttons andMask:mask]; - } - } - - [pool drain]; - return FALSE; -} - -static gboolean key_press_event_cb(GtkWidget *widget, GdkEventKey *event, WidgetSurface *surface) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - id delegate = [surface inputDelegate]; - if (delegate != nil) { - if ([delegate respondsToSelector:@selector(keyPressed:withMask:)]) { - InputMask mask = mask_from_gdk_modifier_state (event->state); - [delegate keyPressed:event->keyval withMask:mask]; - } - } - - [pool drain]; - return FALSE; -} - -static gboolean key_release_event_cb(GtkWidget *widget, GdkEventKey *event, WidgetSurface *surface) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - id delegate = [surface inputDelegate]; - if (delegate != nil) { - if ([delegate respondsToSelector:@selector(keyReleased:withMask:)]) { - InputMask mask = mask_from_gdk_modifier_state (event->state); - [delegate keyReleased:event->keyval withMask:mask]; - } - } - - [pool drain]; - return FALSE; -} - -static gboolean scroll_event_cb (GtkWidget *widget, GdkEventScroll *event, WidgetSurface *surface) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - id delegate = [surface inputDelegate]; - if (delegate != nil) { - if ([delegate respondsToSelector:@selector(mouseScrolledAt:inDirection:withMask:)]) { - NSPoint pos = NSMakePoint (event->x, event->y); - InputMask mask = mask_from_gdk_modifier_state (event->state); - ScrollDirection dir = scroll_dir_from_gdk_scroll_dir (event->direction); - [delegate mouseScrolledAt:pos - inDirection:dir - withMask:mask]; - } - } - - [pool drain]; - return FALSE; -} - -static void unref_cursor (gpointer cursor, GClosure *closure) { - if (cursor != NULL) { - gdk_cursor_unref ((GdkCursor*)cursor); - } -} - -static void set_cursor (GtkWidget *widget, GdkCursor *cursor) { - GdkWindow *window = gtk_widget_get_window (widget); - if (window) { - gdk_window_set_cursor (window, cursor); - if (cursor != NULL) { - gdk_cursor_unref (cursor); - } - } -} -// }}} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/Window.h b/tikzit-old/src/gtk/Window.h deleted file mode 100644 index a3ce8a4..0000000 --- a/tikzit-old/src/gtk/Window.h +++ /dev/null @@ -1,182 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import - -@class GraphEditorPanel; -@class Menu; -@class PropertyPane; -@class Preambles; -@class PreambleEditor; -@class PreviewWindow; -@class SettingsDialog; -@class StyleManager; -@class StylesPane; -@class TikzDocument; -@protocol Tool; - -/** - * Manages a document window - */ -@interface Window: NSObject { - // GTK+ widgets - GtkWindow *window; - GtkTextBuffer *tikzBuffer; - GtkStatusbar *statusBar; - GtkPaned *tikzPaneSplitter; - GtkWidget *tikzPane; - - gulong clipboard_handler_id; - GtkTextTag *errorHighlightTag; // owned by tikzBuffer - - // Classes that manage parts of the window - Menu *menu; - GraphEditorPanel *graphPanel; - - PreviewWindow *previewWindow; - - // state variables - BOOL suppressTikzUpdates; - BOOL hasParseError; - - // the document displayed by the window - TikzDocument *document; -} - -/** - * The document displayed by the window - */ -@property (retain) TikzDocument *document; -@property (readonly) BOOL hasFocus; -@property (readonly) GtkWindow *gtkWindow; - -/** - * Create a window with an empty document - */ -- (id) init; -+ (id) window; - -/** - * Create a window with the given document - */ -- (id) initWithDocument:(TikzDocument*)doc; -+ (id) windowWithDocument:(TikzDocument*)doc; - -/** - * Present the window to the user - */ -- (void) present; - -/** - * Open a file, asking the user which file to open - */ -- (void) openFile; -/** - * Open a file - */ -- (BOOL) openFileAtPath:(NSString*)path; -/** - * Save the active document to the path it was opened from - * or last saved to, or ask the user where to save it. - */ -- (BOOL) saveActiveDocument; -/** - * Save the active document, asking the user where to save it. - */ -- (BOOL) saveActiveDocumentAs; -/** - * Save the active document as a shape, asking the user what to name it. - */ -- (void) saveActiveDocumentAsShape; - -/** - * Close the window. - * - * May terminate the application if this is the last window. - * - * Will ask for user confirmation if the document is not saved. - */ -- (void) close; - -/** - * Cut the current selection to the clipboard. - */ -- (void) selectionCutToClipboard; -/** - * Copy the current selection to the clipboard. - */ -- (void) selectionCopyToClipboard; -/** - * Paste from the clipboard to the appropriate place. - */ -- (void) pasteFromClipboard; - -/** - * The GTK+ window that this class manages. - */ -- (GtkWindow*) gtkWindow; -/** - * The menu for the window. - */ -- (Menu*) menu; - -/** - * Present an error to the user - * - * @param error the error to present - */ -- (void) presentError:(NSError*)error; -/** - * Present an error to the user - * - * @param error the error to present - * @param message a message to display with the error - */ -- (void) presentError:(NSError*)error withMessage:(NSString*)message; -/** - * Present an error to the user - * - * @param error the error to present - */ -- (void) presentGError:(GError*)error; -/** - * Present an error to the user - * - * @param error the error to present - * @param message a message to display with the error - */ -- (void) presentGError:(GError*)error withMessage:(NSString*)message; - -- (void) setActiveTool:(id)tool; - -- (void) zoomIn; -- (void) zoomOut; -- (void) zoomReset; - -/** - * Show or update the preview window. - */ -- (void) presentPreview; -/** - * Show or update the preview window without it grabbing focus - */ -- (void) updatePreview; - -@end - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/Window.m b/tikzit-old/src/gtk/Window.m deleted file mode 100644 index 2d9e63a..0000000 --- a/tikzit-old/src/gtk/Window.m +++ /dev/null @@ -1,991 +0,0 @@ -/* - * Copyright 2011-2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "Window.h" - -#import -#import "gtkhelpers.h" -#import "clipboard.h" - -#import "Application.h" -#import "Configuration.h" -#import "FileChooserDialog.h" -#import "GraphEditorPanel.h" -#import "Menu.h" -#import "RecentManager.h" -#import "Shape.h" -#import "SupportDir.h" -#import "TikzDocument.h" - -#ifdef HAVE_POPPLER -#import "PreviewWindow.h" -#endif - -enum { - GraphInfoStatus, - ParseStatus -}; - -// {{{ Internal interfaces -// {{{ Clipboard support - -static void clipboard_provide_data (GtkClipboard *clipboard, - GtkSelectionData *selection_data, - guint info, - gpointer clipboard_graph_data); -static void clipboard_release_data (GtkClipboard *clipboard, gpointer clipboard_graph_data); -static void clipboard_check_targets (GtkClipboard *clipboard, - GdkAtom *atoms, - gint n_atoms, - gpointer action); -static void clipboard_paste_contents (GtkClipboard *clipboard, - GtkSelectionData *selection_data, - gpointer document); - -// }}} -// {{{ Signals - -static void window_toplevel_focus_changed_cb (GObject *gobject, GParamSpec *pspec, Window *window); -static void graph_divider_position_changed_cb (GObject *gobject, GParamSpec *pspec, Window *window); -static void tikz_buffer_changed_cb (GtkTextBuffer *buffer, Window *window); -static gboolean main_window_delete_event_cb (GtkWidget *widget, GdkEvent *event, Window *window); -static void main_window_destroy_cb (GtkWidget *widget, Window *window); -static gboolean main_window_configure_event_cb (GtkWidget *widget, GdkEventConfigure *event, Window *window); -static void update_paste_action (GtkClipboard *clipboard, GdkEvent *event, GtkAction *action); - -// }}} - -@interface Window (Notifications) -- (void) tikzBufferChanged; -- (void) windowSizeChangedWidth:(int)width height:(int)height; -- (void) documentTikzChanged:(NSNotification*)notification; -- (void) documentSelectionChanged:(NSNotification*)notification; -- (void) undoStackChanged:(NSNotification*)notification; -@end - -@interface Window (InitHelpers) -- (void) _loadUi; -- (void) _restoreUiState; -- (void) _connectSignals; -@end - -@interface Window (Private) -- (BOOL) _askCanClose; -/** Open a document, dealing with errors as necessary */ -- (TikzDocument*) _openDocument:(NSString*)path; -- (void) _placeGraphOnClipboard:(Graph*)graph; -- (void) _clearParseError; -- (void) _setParseError:(NSError*)error; -/** Update the window title. */ -- (void) _updateTitle; -/** Update the window status bar default text. */ -- (void) _updateStatus; -/** Update the displayed tikz code to match the active document. */ -- (void) _updateTikz; -/** Update the undo and redo actions to match the active document's - * undo stack. */ -- (void) _updateUndoActions; -- (void) showPreview; -@end - -// }}} -// {{{ API - -@implementation Window - -@synthesize gtkWindow=window; - -- (id) init { - return [self initWithDocument:[TikzDocument documentWithStyleManager:[app styleManager]]]; -} -+ (id) window { - return [[[self alloc] init] autorelease]; -} -- (id) initWithDocument:(TikzDocument*)doc { - self = [super init]; - - if (self) { - [self _loadUi]; - [self _restoreUiState]; - [self _connectSignals]; - - [self setDocument:doc]; - - gtk_widget_show (GTK_WIDGET (window)); - } - - return self; -} -+ (id) windowWithDocument:(TikzDocument*)doc { - return [[[self alloc] initWithDocument:doc] autorelease]; -} - -- (void) dealloc { - // The GTK+ window has already been destroyed at this point - - [[NSNotificationCenter defaultCenter] removeObserver:self]; - g_signal_handler_disconnect ( - gtk_clipboard_get (GDK_SELECTION_CLIPBOARD), - clipboard_handler_id); - - [previewWindow release]; - [menu release]; - [graphPanel release]; - [document release]; - - g_object_unref (tikzBuffer); - g_object_unref (tikzPane); - g_object_unref (tikzPaneSplitter); - g_object_unref (statusBar); - g_object_unref (window); - - [super dealloc]; -} - -- (TikzDocument*) document { - return document; -} -- (void) setDocument:(TikzDocument*)newDoc { - [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:[document pickSupport]]; - [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:document]; - - TikzDocument *oldDoc = document; - document = [newDoc retain]; - - [graphPanel setDocument:document]; - [previewWindow setDocument:document]; - [self _updateTikz]; - [self _updateTitle]; - [self _updateStatus]; - [self _updateUndoActions]; - [menu notifySelectionChanged:[document pickSupport]]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(documentTikzChanged:) - name:@"TikzChanged" object:document]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(undoStackChanged:) - name:@"UndoStackChanged" object:document]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(documentSelectionChanged:) - name:@"NodeSelectionChanged" object:[document pickSupport]]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(documentSelectionChanged:) - name:@"EdgeSelectionChanged" object:[document pickSupport]]; - - if ([document path] != nil) { - [[RecentManager defaultManager] addRecentFile:[document path]]; - } - - NSDictionary *userInfo; - userInfo = [NSDictionary dictionaryWithObjectsAndKeys: - document, @"document", - oldDoc, @"oldDocument", - nil]; - [[NSNotificationCenter defaultCenter] - postNotificationName:@"DocumentChanged" - object:self - userInfo:userInfo]; - [oldDoc release]; -} - -- (BOOL) hasFocus { - return gtk_window_has_toplevel_focus (GTK_WINDOW (window)); -} - -- (void) present { - gtk_window_present (GTK_WINDOW (window)); -} - -- (void) openFile { - FileChooserDialog *dialog = [FileChooserDialog openDialogWithParent:window]; - [dialog addStandardFilters]; - if ([document path]) { - [dialog setCurrentFolder:[[document path] stringByDeletingLastPathComponent]]; - } else if ([app lastOpenFolder]) { - [dialog setCurrentFolder:[app lastOpenFolder]]; - } - - if ([dialog showDialog]) { - if ([self openFileAtPath:[dialog filePath]]) { - [app setLastOpenFolder:[dialog currentFolder]]; - } - } - [dialog destroy]; -} - -- (BOOL) openFileAtPath:(NSString*)path { - TikzDocument *doc = [self _openDocument:path]; - if (doc != nil) { - if (![document hasUnsavedChanges] && [document path] == nil) { - // we just have a fresh, untitled document - replace it - [self setDocument:doc]; - } else { - [app newWindowWithDocument:doc]; - } - return YES; - } - return NO; -} - -- (BOOL) saveActiveDocument { - if ([document path] == nil) { - return [self saveActiveDocumentAs]; - } else { - NSError *error = nil; - if (![document save:&error]) { - [self presentError:error]; - return NO; - } else { - [self _updateTitle]; - return YES; - } - } -} - -- (BOOL) saveActiveDocumentAs { - FileChooserDialog *dialog = [FileChooserDialog saveDialogWithParent:window]; - [dialog addStandardFilters]; - if ([document path] != nil) { - [dialog setCurrentFolder:[[document path] stringByDeletingLastPathComponent]]; - } else if ([app lastSaveAsFolder] != nil) { - [dialog setCurrentFolder:[app lastSaveAsFolder]]; - } - [dialog setSuggestedName:[document suggestedFileName]]; - - BOOL saved = NO; - if ([dialog showDialog]) { - NSString *nfile = [dialog filePath]; - - NSError *error = nil; - if (![document saveToPath:nfile error:&error]) { - [self presentError:error]; - } else { - [self _updateTitle]; - [[RecentManager defaultManager] addRecentFile:nfile]; - [app setLastSaveAsFolder:[dialog currentFolder]]; - saved = YES; - } - } - [dialog destroy]; - return saved; -} - -- (void) saveActiveDocumentAsShape { - GtkWidget *dialog = gtk_dialog_new_with_buttons ( - "Save as shape", - window, - GTK_DIALOG_MODAL, - GTK_STOCK_OK, - GTK_RESPONSE_ACCEPT, - GTK_STOCK_CANCEL, - GTK_RESPONSE_REJECT, - NULL); - GtkBox *content = GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))); - GtkWidget *label1 = gtk_label_new ("Please choose a name for the shape"); - GtkWidget *label2 = gtk_label_new ("Name:"); - GtkWidget *input = gtk_entry_new (); - GtkBox *hbox = GTK_BOX (gtk_hbox_new (FALSE, 5)); - gtk_box_pack_start (hbox, label2, FALSE, TRUE, 0); - gtk_box_pack_start (hbox, input, TRUE, TRUE, 0); - gtk_box_pack_start (content, label1, TRUE, TRUE, 5); - gtk_box_pack_start (content, GTK_WIDGET (hbox), TRUE, TRUE, 5); - gtk_widget_show_all (GTK_WIDGET (content)); - gint response = gtk_dialog_run (GTK_DIALOG (dialog)); - while (response == GTK_RESPONSE_ACCEPT) { - response = GTK_RESPONSE_NONE; - NSDictionary *shapeDict = [Shape shapeDictionary]; - const gchar *dialogInput = gtk_entry_get_text (GTK_ENTRY (input)); - NSString *shapeName = [NSString stringWithUTF8String:dialogInput]; - BOOL doSave = NO; - if ([shapeName isEqual:@""]) { - GtkWidget *emptyStrDialog = gtk_message_dialog_new (window, - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_CLOSE, - "You must specify a shape name"); - gtk_dialog_run (GTK_DIALOG (emptyStrDialog)); - gtk_widget_destroy (emptyStrDialog); - response = gtk_dialog_run (GTK_DIALOG (dialog)); - } else if ([shapeDict objectForKey:shapeName] != nil) { - GtkWidget *overwriteDialog = gtk_message_dialog_new (window, - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_QUESTION, - GTK_BUTTONS_YES_NO, - "Do you want to replace the existing shape named '%s'?", - dialogInput); - gint overwriteResp = gtk_dialog_run (GTK_DIALOG (overwriteDialog)); - gtk_widget_destroy (overwriteDialog); - - if (overwriteResp == GTK_RESPONSE_YES) { - doSave = YES; - } else { - response = gtk_dialog_run (GTK_DIALOG (dialog)); - } - } else { - doSave = YES; - } - if (doSave) { - NSError *error = nil; - NSString *userShapeDir = [[SupportDir userSupportDir] stringByAppendingPathComponent:@"shapes"]; - NSString *file = [NSString stringWithFormat:@"%@/%@.tikz", userShapeDir, shapeName]; - if (![[NSFileManager defaultManager] ensureDirectoryExists:userShapeDir error:&error]) { - [self presentError:error withMessage:@"Could not create user shape directory"]; - } else { - if (![document saveCopyToPath:file error:&error]) { - [self presentError:error withMessage:@"Could not save shape file"]; - } else { - [Shape refreshShapeDictionary]; - } - } - } - } - gtk_widget_destroy (dialog); -} - -- (void) close { - if ([self _askCanClose]) { - gtk_widget_destroy (GTK_WIDGET (window)); - } -} - -- (void) selectionCutToClipboard { - if ([[[document pickSupport] selectedNodes] count] > 0) { - [self _placeGraphOnClipboard:[document selectionCut]]; - } -} - -- (void) selectionCopyToClipboard { - if ([[[document pickSupport] selectedNodes] count] > 0) { - [self _placeGraphOnClipboard:[document selectionCopy]]; - } -} - -- (void) pasteFromClipboard { - gtk_clipboard_request_contents (gtk_clipboard_get (GDK_SELECTION_CLIPBOARD), - tikzit_picture_atom, - clipboard_paste_contents, - document); -} - -- (GtkWindow*) gtkWindow { - return window; -} - -- (Configuration*) mainConfiguration { - return [app mainConfiguration]; -} - -- (Menu*) menu { - return menu; -} - -- (void) presentError:(NSError*)error { - const gchar *errorDesc = "unknown error"; - if (error && [error localizedDescription]) { - errorDesc = [[error localizedDescription] UTF8String]; - } - GtkWidget *dialog = gtk_message_dialog_new (window, - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_CLOSE, - "%s", - errorDesc); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); -} - -- (void) presentError:(NSError*)error withMessage:(NSString*)message { - const gchar *errorDesc = "unknown error"; - if (error && [error localizedDescription]) { - errorDesc = [[error localizedDescription] UTF8String]; - } - GtkWidget *dialog = gtk_message_dialog_new (window, - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_CLOSE, - "%s: %s", - [message UTF8String], - errorDesc); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); -} - -- (void) presentGError:(GError*)error { - const gchar *errorDesc = "unknown error"; - if (error && error->message) { - errorDesc = error->message; - } - GtkWidget *dialog = gtk_message_dialog_new (window, - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_CLOSE, - "%s", - errorDesc); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); -} - -- (void) presentGError:(GError*)error withMessage:(NSString*)message { - const gchar *errorDesc = "unknown error"; - if (error && error->message) { - errorDesc = error->message; - } - GtkWidget *dialog = gtk_message_dialog_new (window, - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_CLOSE, - "%s: %s", - [message UTF8String], - errorDesc); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); -} - -- (void) setActiveTool:(id)tool { - [graphPanel setActiveTool:tool]; - gboolean hasfocus; - g_object_get (G_OBJECT (window), "has-toplevel-focus", &hasfocus, NULL); - if (hasfocus) { - [graphPanel grabTool]; - } -} - -- (void) zoomIn { - [graphPanel zoomIn]; -} - -- (void) zoomOut { - [graphPanel zoomOut]; -} - -- (void) zoomReset { - [graphPanel zoomReset]; -} - -- (void) presentPreview { -#ifdef HAVE_POPPLER - if (previewWindow == nil) { - previewWindow = [[PreviewWindow alloc] initWithPreambles:[app preambles] - config:[app mainConfiguration]]; - //[previewWindow setParentWindow:self]; - [previewWindow setDocument:document]; - } - [previewWindow present]; -#endif -} - -- (void) updatePreview { -#ifdef HAVE_POPPLER - if (previewWindow == nil) { - previewWindow = [[PreviewWindow alloc] initWithPreambles:[app preambles] - config:[app mainConfiguration]]; - //[previewWindow setParentWindow:self]; - [previewWindow setDocument:document]; - } - [previewWindow show]; -#endif -} - -@end - -// }}} -// {{{ Notifications - -@implementation Window (Notifications) -- (void) graphHeightChanged:(int)newHeight { - [[app mainConfiguration] setIntegerEntry:@"graphHeight" - inGroup:@"window" - value:newHeight]; -} - -- (void) tikzBufferChanged { - if (!suppressTikzUpdates) { - suppressTikzUpdates = TRUE; - - GtkTextIter start, end; - gtk_text_buffer_get_bounds (tikzBuffer, &start, &end); - gchar *text = gtk_text_buffer_get_text (tikzBuffer, &start, &end, FALSE); - - NSError *error = nil; - BOOL success = [document updateTikz:[NSString stringWithUTF8String:text] error:&error]; - if (success) - [self _clearParseError]; - else - [self _setParseError:error]; - - g_free (text); - - suppressTikzUpdates = FALSE; - } -} - -- (void) windowSizeChangedWidth:(int)width height:(int)height { - if (width > 0 && height > 0) { - NSNumber *w = [NSNumber numberWithInt:width]; - NSNumber *h = [NSNumber numberWithInt:height]; - NSMutableArray *size = [NSMutableArray arrayWithCapacity:2]; - [size addObject:w]; - [size addObject:h]; - [[app mainConfiguration] setIntegerListEntry:@"windowSize" - inGroup:@"window" - value:size]; - } -} - -- (void) documentTikzChanged:(NSNotification*)notification { - [self _updateTitle]; - [self _updateTikz]; -} - -- (void) documentSelectionChanged:(NSNotification*)notification { - [self _updateStatus]; - [menu notifySelectionChanged:[document pickSupport]]; -} - -- (void) undoStackChanged:(NSNotification*)notification { - [self _updateUndoActions]; -} -@end - -// }}} -// {{{ InitHelpers - -@implementation Window (InitHelpers) - -- (void) _loadUi { - window = GTK_WINDOW (gtk_window_new (GTK_WINDOW_TOPLEVEL)); - g_object_ref_sink (window); - gtk_window_set_title (window, "TikZiT"); - gtk_window_set_default_size (window, 700, 400); - - GtkBox *mainLayout = GTK_BOX (gtk_vbox_new (FALSE, 0)); - gtk_widget_show (GTK_WIDGET (mainLayout)); - gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (mainLayout)); - - menu = [[Menu alloc] initForWindow:self]; - - GtkWidget *menubar = [menu menubar]; - gtk_box_pack_start (mainLayout, menubar, FALSE, TRUE, 0); - gtk_box_reorder_child (mainLayout, menubar, 0); - gtk_widget_show (menubar); - - tikzPaneSplitter = GTK_PANED (gtk_vpaned_new ()); - g_object_ref_sink (tikzPaneSplitter); - gtk_widget_show (GTK_WIDGET (tikzPaneSplitter)); - gtk_box_pack_start (mainLayout, GTK_WIDGET (tikzPaneSplitter), TRUE, TRUE, 0); - - graphPanel = [[GraphEditorPanel alloc] initWithDocument:document]; - [graphPanel setPreviewHandler:self]; - GtkWidget *graphEditorWidget = [graphPanel widget]; - gtk_widget_show (graphEditorWidget); - GtkWidget *graphFrame = gtk_frame_new (NULL); - gtk_container_add (GTK_CONTAINER (graphFrame), graphEditorWidget); - gtk_widget_show (graphFrame); - gtk_paned_pack1 (tikzPaneSplitter, graphFrame, TRUE, TRUE); - - tikzBuffer = gtk_text_buffer_new (NULL); - g_object_ref_sink (tikzBuffer); - errorHighlightTag = gtk_text_buffer_create_tag ( - tikzBuffer, NULL, - "foreground", "#d40000", - "foreground-set", TRUE, - "weight", PANGO_WEIGHT_SEMIBOLD, - "weight-set", TRUE, - NULL); - GtkWidget *tikzScroller = gtk_scrolled_window_new (NULL, NULL); - gtk_widget_show (tikzScroller); - - tikzPane = gtk_text_view_new_with_buffer (tikzBuffer); - gtk_text_view_set_left_margin (GTK_TEXT_VIEW (tikzPane), 3); - gtk_text_view_set_right_margin (GTK_TEXT_VIEW (tikzPane), 3); - g_object_ref_sink (tikzPane); - gtk_widget_show (tikzPane); - gtk_container_add (GTK_CONTAINER (tikzScroller), tikzPane); - GtkWidget *tikzFrame = gtk_frame_new (NULL); - gtk_container_add (GTK_CONTAINER (tikzFrame), tikzScroller); - gtk_widget_show (tikzFrame); - gtk_paned_pack2 (tikzPaneSplitter, tikzFrame, FALSE, TRUE); - - statusBar = GTK_STATUSBAR (gtk_statusbar_new ()); - g_object_ref_sink (statusBar); - gtk_widget_show (GTK_WIDGET (statusBar)); - gtk_box_pack_start (mainLayout, GTK_WIDGET (statusBar), FALSE, TRUE, 0); - - GtkClipboard *clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); - update_paste_action (clipboard, NULL, [menu pasteAction]); -} - -- (void) _restoreUiState { - Configuration *config = [app mainConfiguration]; - NSArray *windowSize = [config integerListEntry:@"windowSize" - inGroup:@"window"]; - if (windowSize && [windowSize count] == 2) { - gint width = [[windowSize objectAtIndex:0] intValue]; - gint height = [[windowSize objectAtIndex:1] intValue]; - if (width > 0 && height > 0) { - gtk_window_set_default_size (window, width, height); - } - } - int panePos = [config integerEntry:@"graphHeight" - inGroup:@"window"]; - if (panePos > 0) { - gtk_paned_set_position (tikzPaneSplitter, panePos); - } -} - -- (void) _connectSignals { - GtkClipboard *clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); - clipboard_handler_id = - g_signal_connect (G_OBJECT (clipboard), - "owner-change", - G_CALLBACK (update_paste_action), - [menu pasteAction]); - g_signal_connect (G_OBJECT (window), - "key-press-event", - G_CALLBACK (tz_hijack_key_press), - NULL); - g_signal_connect (G_OBJECT (window), - "notify::has-toplevel-focus", - G_CALLBACK (window_toplevel_focus_changed_cb), - self); - g_signal_connect (G_OBJECT (tikzPaneSplitter), - "notify::position", - G_CALLBACK (graph_divider_position_changed_cb), - self); - g_signal_connect (G_OBJECT (tikzBuffer), - "changed", - G_CALLBACK (tikz_buffer_changed_cb), - self); - g_signal_connect (G_OBJECT (window), - "delete-event", - G_CALLBACK (main_window_delete_event_cb), - self); - g_signal_connect (G_OBJECT (window), - "destroy", - G_CALLBACK (main_window_destroy_cb), - self); - g_signal_connect (G_OBJECT (window), - "configure-event", - G_CALLBACK (main_window_configure_event_cb), - self); -} -@end - -// }}} -// {{{ Private - -@implementation Window (Private) - -- (BOOL) _askCanClose { - if ([document hasUnsavedChanges]) { - GtkWidget *dialog = gtk_message_dialog_new (window, - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_QUESTION, - GTK_BUTTONS_NONE, - "Save changes to the document \"%s\" before closing?", - [[document name] UTF8String]); - gtk_dialog_add_buttons (GTK_DIALOG (dialog), - "Save", GTK_RESPONSE_YES, - "Don't save", GTK_RESPONSE_NO, - "Cancel", GTK_RESPONSE_CANCEL, - NULL); - gint result = gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - if (result == GTK_RESPONSE_YES) { - return [self saveActiveDocument]; - } else { - return result == GTK_RESPONSE_NO; - } - } else { - return YES; - } -} - -- (TikzDocument*) _openDocument:(NSString*)path { - NSError *error = nil; - TikzDocument *d = [TikzDocument documentFromFile:path - styleManager:[app styleManager] - error:&error]; - if (d != nil) { - return d; - } else { - if ([error code] == TZ_ERR_PARSE) { - [self presentError:error withMessage:@"Invalid file"]; - } else { - [self presentError:error withMessage:@"Could not open file"]; - } - [[RecentManager defaultManager] removeRecentFile:path]; - return nil; - } -} - -- (void) _placeGraphOnClipboard:(Graph*)graph { - GtkClipboard *clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); - - static const GtkTargetEntry targets[] = { - { "TIKZITPICTURE", 0, TARGET_TIKZIT_PICTURE }, - { "UTF8_STRING", 0, TARGET_UTF8_STRING } }; - - gtk_clipboard_set_with_data (clipboard, - targets, G_N_ELEMENTS (targets), - clipboard_provide_data, - clipboard_release_data, - clipboard_graph_data_new (graph)); -} - -- (void) _clearParseError { - if (!hasParseError) - return; - gtk_statusbar_pop (statusBar, ParseStatus); - text_buffer_clear_tag (tikzBuffer, errorHighlightTag); - widget_clear_error (tikzPane); - hasParseError = NO; -} - -- (void) _setParseError:(NSError*)error { - if (!hasParseError) { - widget_set_error (tikzPane); - hasParseError = YES; - } - NSString *message = [NSString stringWithFormat:@"Parse error: %@", [error localizedDescription]]; - gtk_statusbar_pop (statusBar, ParseStatus); - gtk_statusbar_push (statusBar, ParseStatus, [message UTF8String]); - - text_buffer_clear_tag (tikzBuffer, errorHighlightTag); - - NSDictionary *errorInfo = [error userInfo]; - if ([errorInfo objectForKey:@"startLine"] != nil) { - GtkTextIter symbolStart; - GtkTextIter symbolEnd; - gtk_text_buffer_get_iter_at_line_index (tikzBuffer, &symbolStart, - [[errorInfo objectForKey:@"startLine"] intValue] - 1, - [[errorInfo objectForKey:@"startColumn"] intValue] - 1); - gtk_text_buffer_get_iter_at_line_index (tikzBuffer, &symbolEnd, - [[errorInfo objectForKey:@"endLine"] intValue] - 1, - [[errorInfo objectForKey:@"endColumn"] intValue]); - gtk_text_buffer_apply_tag (tikzBuffer, errorHighlightTag, - &symbolStart, &symbolEnd); - } -} - -- (void) _updateUndoActions { - [menu setUndoActionEnabled:[document canUndo]]; - [menu setUndoActionDetail:[document undoName]]; - - [menu setRedoActionEnabled:[document canRedo]]; - [menu setRedoActionDetail:[document redoName]]; -} - -- (void) _updateTitle { - NSString *title = [NSString stringWithFormat:@"TikZiT - %@%s", - [document name], - ([document hasUnsavedChanges] ? "*" : "")]; - gtk_window_set_title(window, [title UTF8String]); -} - -- (void) _updateStatus { - // FIXME: show tooltips or something instead - GString *buffer = g_string_sized_new (30); - gchar *nextNode = 0; - - for (Node *n in [[document pickSupport] selectedNodes]) { - if (nextNode) { - if (buffer->len == 0) { - g_string_printf(buffer, "Nodes %s", nextNode); - } else { - g_string_append_printf(buffer, ", %s", nextNode); - } - } - nextNode = (gchar *)[[n name] UTF8String]; - } - if (nextNode) { - if (buffer->len == 0) { - g_string_printf(buffer, "Node %s is selected", nextNode); - } else { - g_string_append_printf(buffer, " and %s are selected", nextNode); - } - } - - if (buffer->len == 0) { - int nrNodes = [[[document graph] nodes] count]; - int nrEdges = [[[document graph] edges] count]; - g_string_printf(buffer, "Graph has %d node%s and %d edge%s", - nrNodes, - nrNodes!=1 ? "s" : "", - nrEdges, - nrEdges!=1 ? "s" : ""); - } - gtk_statusbar_pop(statusBar, GraphInfoStatus); - gtk_statusbar_push(statusBar, GraphInfoStatus, buffer->str); - - g_string_free (buffer, TRUE); -} - -- (void) _updateTikz { - if (document != nil && !suppressTikzUpdates) { - suppressTikzUpdates = TRUE; - - if (document != nil) { - const char *tikzString = [[document tikz] UTF8String]; - gtk_text_buffer_set_text (tikzBuffer, tikzString, -1); - } else { - gtk_text_buffer_set_text (tikzBuffer, "", -1); - } - [self _clearParseError]; - - suppressTikzUpdates = FALSE; - } -} - -- (GraphEditorPanel*) _graphPanel { - return graphPanel; -} - -- (void) showPreview { - [self updatePreview]; -} - -@end - -// }}} -// {{{ GTK+ callbacks - -static void window_toplevel_focus_changed_cb (GObject *gobject, GParamSpec *pspec, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - gboolean hasfocus; - g_object_get (gobject, "has-toplevel-focus", &hasfocus, NULL); - if (hasfocus) { - [[NSNotificationCenter defaultCenter] - postNotificationName:@"WindowGainedFocus" - object:window]; - [[window _graphPanel] grabTool]; - } else { - [[NSNotificationCenter defaultCenter] - postNotificationName:@"WindowLostFocus" - object:window]; - } - [pool drain]; -} - -static void graph_divider_position_changed_cb (GObject *gobject, GParamSpec *pspec, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - gint position; - g_object_get (gobject, "position", &position, NULL); - [window graphHeightChanged:position]; - [pool drain]; -} - -static void tikz_buffer_changed_cb (GtkTextBuffer *buffer, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window tikzBufferChanged]; - [pool drain]; -} - -static gboolean main_window_delete_event_cb (GtkWidget *widget, GdkEvent *event, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window close]; - [pool drain]; - return TRUE; -} - -static void main_window_destroy_cb (GtkWidget *widget, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [[NSNotificationCenter defaultCenter] postNotificationName:@"WindowClosed" - object:window]; - [pool drain]; -} - -static gboolean main_window_configure_event_cb (GtkWidget *widget, GdkEventConfigure *event, Window *window) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - [window windowSizeChangedWidth:event->width height:event->height]; - [pool drain]; - return FALSE; -} - -static void clipboard_provide_data (GtkClipboard *clipboard, - GtkSelectionData *selection_data, - guint info, - gpointer clipboard_graph_data) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - ClipboardGraphData *data = (ClipboardGraphData*)clipboard_graph_data; - if (info == TARGET_UTF8_STRING || info == TARGET_TIKZIT_PICTURE) { - clipboard_graph_data_convert (data); - GdkAtom target = (info == TARGET_UTF8_STRING) ? utf8_atom : tikzit_picture_atom; - gtk_selection_data_set (selection_data, - target, - 8*sizeof(gchar), - (guchar*)data->tikz, - data->tikz_length); - } - - [pool drain]; -} - -static void clipboard_release_data (GtkClipboard *clipboard, gpointer data) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - clipboard_graph_data_free ((ClipboardGraphData*)data); - [pool drain]; -} - -static void clipboard_check_targets (GtkClipboard *clipboard, - GdkAtom *atoms, - gint n_atoms, - gpointer action) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - gboolean found = FALSE; - for (gint i = 0; i < n_atoms; ++i) { - if (atoms[i] == tikzit_picture_atom) { - found = TRUE; - break; - } - } - gtk_action_set_sensitive (GTK_ACTION (action), found); - - [pool drain]; -} - -static void update_paste_action (GtkClipboard *clipboard, GdkEvent *event, GtkAction *action) { - gtk_action_set_sensitive (action, FALSE); - gtk_clipboard_request_targets (clipboard, clipboard_check_targets, action); -} - -static void clipboard_paste_contents (GtkClipboard *clipboard, - GtkSelectionData *selection_data, - gpointer document) { - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - TikzDocument *doc = (TikzDocument*)document; - gint length = gtk_selection_data_get_length (selection_data); - if (length >= 0) { - const guchar *raw_data = gtk_selection_data_get_data (selection_data); - gchar *data = g_new (gchar, length+1); - g_strlcpy (data, (const gchar *)raw_data, length+1); - NSString *tikz = [NSString stringWithUTF8String:data]; - if (tikz != nil) { - [doc pasteFromTikz:tikz]; - } - g_free (data); - } - - [pool drain]; -} - -// }}} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/cairo_helpers.h b/tikzit-old/src/gtk/cairo_helpers.h deleted file mode 100644 index e95357b..0000000 --- a/tikzit-old/src/gtk/cairo_helpers.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import "RColor.h" -#import - -void cairo_ns_rectangle (cairo_t* cr, NSRect rect); -void cairo_set_source_rcolor (cairo_t* cr, RColor color); - -// vim:ft=objc:sts=4:sw=4:et diff --git a/tikzit-old/src/gtk/cairo_helpers.m b/tikzit-old/src/gtk/cairo_helpers.m deleted file mode 100644 index 104e686..0000000 --- a/tikzit-old/src/gtk/cairo_helpers.m +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "cairo_helpers.h" - -void cairo_ns_rectangle (cairo_t* cr, NSRect rect) { - cairo_rectangle (cr, rect.origin.x, rect.origin.y, rect.size.width, rect.size.height); -} - -void cairo_set_source_rcolor (cairo_t* cr, RColor color) { - cairo_set_source_rgba (cr, color.red, color.green, color.blue, color.alpha); -} - -// vim:ft=objc:sts=4:sw=4:et diff --git a/tikzit-old/src/gtk/clipboard.h b/tikzit-old/src/gtk/clipboard.h deleted file mode 100644 index 568fc50..0000000 --- a/tikzit-old/src/gtk/clipboard.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "TZFoundation.h" -#import -#import - -enum { - TARGET_UTF8_STRING, - TARGET_TIKZIT_PICTURE -}; -typedef struct -{ - Graph *graph; - gchar *tikz; - gint tikz_length; -} ClipboardGraphData; - -extern GdkAtom utf8_atom; -extern GdkAtom tikzit_picture_atom; - -void clipboard_init (); -ClipboardGraphData *clipboard_graph_data_new (Graph *graph); -void clipboard_graph_data_free (ClipboardGraphData *data); -void clipboard_graph_data_convert (ClipboardGraphData *data); - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/clipboard.m b/tikzit-old/src/gtk/clipboard.m deleted file mode 100644 index 7001717..0000000 --- a/tikzit-old/src/gtk/clipboard.m +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "clipboard.h" - -GdkAtom utf8_atom; -GdkAtom tikzit_picture_atom; - -void clipboard_init () { - if (utf8_atom == GDK_NONE) { - utf8_atom = gdk_atom_intern ("UTF8_STRING", FALSE); - } - if (tikzit_picture_atom == GDK_NONE) { - tikzit_picture_atom = gdk_atom_intern ("TIKZITPICTURE", FALSE); - } -} - -ClipboardGraphData *clipboard_graph_data_new (Graph *graph) { - ClipboardGraphData *data = g_new (ClipboardGraphData, 1); - data->graph = [graph retain]; - data->tikz = NULL; - data->tikz_length = 0; - return data; -} - -void clipboard_graph_data_free (ClipboardGraphData *data) { - [data->graph release]; - if (data->tikz) { - g_free (data->tikz); - } - g_free (data); -} - -void clipboard_graph_data_convert (ClipboardGraphData *data) { - if (data->graph != nil && !data->tikz) { - data->tikz = g_strdup ([[data->graph tikz] UTF8String]); - data->tikz_length = strlen (data->tikz); - [data->graph release]; - data->graph = nil; - } -} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/gtkhelpers.h b/tikzit-old/src/gtk/gtkhelpers.h deleted file mode 100644 index e4b79b8..0000000 --- a/tikzit-old/src/gtk/gtkhelpers.h +++ /dev/null @@ -1,60 +0,0 @@ -// -// gtkhelpers.h -// TikZiT -// -// Copyright 2010 Alex Merry. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// -#import "TZFoundation.h" -#include -#import - -/** - * Releases the Objective-C object pointed to by data - * - * Intended for use as a cleanup function in Glib/GObject-based - * code. - */ -void release_obj (gpointer data); - -NSString * gtk_editable_get_string (GtkEditable *editable, gint start, gint end); - -GdkRectangle gdk_rectangle_from_ns_rect (NSRect rect); -NSRect gdk_rectangle_to_ns_rect (GdkRectangle rect); - -void gtk_action_set_detailed_label (GtkAction *action, const gchar *baseLabel, const gchar *actionName); - -gint tz_hijack_key_press (GtkWindow *win, - GdkEventKey *event, - gpointer user_data); - -// Equivalent of GTK+3's gdk_pixbuf_get_from_surface() -GdkPixbuf * pixbuf_get_from_surface(cairo_surface_t *surface); - -void tz_restore_window (GtkWindow *window, gint x, gint y, gint w, gint h); - -void label_set_bold (GtkLabel *label); - -void widget_set_error (GtkWidget *widget); -void widget_clear_error (GtkWidget *widget); - -void text_buffer_clear_tag (GtkTextBuffer *buffer, GtkTextTag *tag); - -void utility_window_attach (GtkWindow *util_win, GtkWindow *parent_win); - -// vim:ft=objc:sts=2:sw=2:et diff --git a/tikzit-old/src/gtk/gtkhelpers.m b/tikzit-old/src/gtk/gtkhelpers.m deleted file mode 100644 index 9d26af5..0000000 --- a/tikzit-old/src/gtk/gtkhelpers.m +++ /dev/null @@ -1,275 +0,0 @@ -// -// gtkhelpers.h -// TikZiT -// -// Copyright 2010 Alex Merry. All rights reserved. -// -// Some code from Glade: -// Copyright 2001 Ximian, Inc. -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// -#import "gtkhelpers.h" -#import - -void release_obj (gpointer data) { - id obj = (id)data; - [obj release]; -} - -NSString * gtk_editable_get_string (GtkEditable *editable, gint start, gint end) -{ - gchar *text = gtk_editable_get_chars (editable, start, end); - NSString *string = [NSString stringWithUTF8String:text]; - g_free (text); - return string; -} - -GdkRectangle gdk_rectangle_from_ns_rect (NSRect box) { - GdkRectangle rect; - rect.x = box.origin.x; - rect.y = box.origin.y; - rect.width = box.size.width; - rect.height = box.size.height; - return rect; -} - -NSRect gdk_rectangle_to_ns_rect (GdkRectangle rect) { - NSRect result; - result.origin.x = rect.x; - result.origin.y = rect.y; - result.size.width = rect.width; - result.size.height = rect.height; - return result; -} - -void gtk_action_set_detailed_label (GtkAction *action, const gchar *baseLabel, const gchar *actionName) { - if (actionName == NULL || *actionName == '\0') { - gtk_action_set_label (action, baseLabel); - } else { - GString *label = g_string_sized_new (30); - g_string_printf(label, "%s: %s", baseLabel, actionName); - gtk_action_set_label (action, label->str); - g_string_free (label, TRUE); - } -} - -/** - * tz_hijack_key_press: - * @win: a #GtkWindow - * event: the GdkEventKey - * user_data: unused - * - * This function is meant to be attached to key-press-event of a toplevel, - * it simply allows the window contents to treat key events /before/ - * accelerator keys come into play (this way widgets dont get deleted - * when cutting text in an entry etc.). - * - * Returns: whether the event was handled - */ -gint -tz_hijack_key_press (GtkWindow *win, - GdkEventKey *event, - gpointer user_data) -{ - GtkWidget *focus_widget; - - focus_widget = gtk_window_get_focus (win); - if (focus_widget && - (event->keyval == GDK_Delete || /* Filter Delete from accelerator keys */ - ((event->state & GDK_CONTROL_MASK) && /* CTRL keys... */ - ((event->keyval == GDK_c || event->keyval == GDK_C) || /* CTRL-C (copy) */ - (event->keyval == GDK_x || event->keyval == GDK_X) || /* CTRL-X (cut) */ - (event->keyval == GDK_v || event->keyval == GDK_V) || /* CTRL-V (paste) */ - (event->keyval == GDK_a || event->keyval == GDK_A) || /* CTRL-A (select-all) */ - (event->keyval == GDK_n || event->keyval == GDK_N))))) /* CTRL-N (new document) ?? */ - { - return gtk_widget_event (focus_widget, - (GdkEvent *)event); - } - return FALSE; -} - -GdkPixbuf * pixbuf_get_from_surface(cairo_surface_t *surface) { - cairo_surface_flush (surface); - - int width = cairo_image_surface_get_width (surface); - int height = cairo_image_surface_get_height (surface); - int stride = cairo_image_surface_get_stride (surface); - unsigned char *data = cairo_image_surface_get_data (surface); - - GdkPixbuf *pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, - TRUE, - 8, - width, - height); - unsigned char *pbdata = gdk_pixbuf_get_pixels (pixbuf); - int pbstride = gdk_pixbuf_get_rowstride (pixbuf); - - for (int y = 0; y < height; ++y) { - uint32_t *line = (uint32_t*)(data + y*stride); - unsigned char *pbline = pbdata + (y*pbstride); - for (int x = 0; x < width; ++x) { - uint32_t pixel = *(line + x); - unsigned char *pbpixel = pbline + (x*4); - // NB: We should un-pre-mult the alpha here. - // However, in our world, alpha is always - // on or off, so it doesn't really matter - pbpixel[3] = ((pixel & 0xff000000) >> 24); - pbpixel[0] = ((pixel & 0x00ff0000) >> 16); - pbpixel[1] = ((pixel & 0x0000ff00) >> 8); - pbpixel[2] = (pixel & 0x000000ff); - } - } - - return pixbuf; -} - -/* This function mostly lifted from - * gtk+/gdk/gdkscreen.c:gdk_screen_get_monitor_at_window() - */ -static gint -get_appropriate_monitor (GdkScreen *screen, - gint x, - gint y, - gint w, - gint h) -{ - GdkRectangle rect; - gint area = 0; - gint monitor = -1; - gint num_monitors; - gint i; - - rect.x = x; - rect.y = y; - rect.width = w; - rect.height = h; - - num_monitors = gdk_screen_get_n_monitors (screen); - - for (i = 0; i < num_monitors; i++) - { - GdkRectangle geometry; - - gdk_screen_get_monitor_geometry (screen, i, &geometry); - - if (gdk_rectangle_intersect (&rect, &geometry, &geometry) && - geometry.width * geometry.height > area) - { - area = geometry.width * geometry.height; - monitor = i; - } - } - - if (monitor >= 0) - return monitor; - else - return gdk_screen_get_monitor_at_point (screen, - rect.x + rect.width / 2, - rect.y + rect.height / 2); -} - -/* This function mostly lifted from gimp_session_info_apply_geometry - * in gimp-2.6/app/widgets/gimpsessioninfo.c - */ -void tz_restore_window (GtkWindow *window, gint x, gint y, gint w, gint h) -{ - gint forced_w = w; - gint forced_h = h; - if (w <= 0 || h <= 0) { - gtk_window_get_default_size (window, &w, &h); - } - if (w <= 0 || h <= 0) { - gtk_window_get_size (window, &w, &h); - } - - GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET (window)); - - gint monitor = 0; - if (w > 0 && h > 0) { - monitor = get_appropriate_monitor (screen, x, y, w, h); - } else { - monitor = gdk_screen_get_monitor_at_point (screen, x, y); - } - - GdkRectangle rect; - gdk_screen_get_monitor_geometry (screen, monitor, &rect); - - x = CLAMP (x, - rect.x, - rect.x + rect.width - (w > 0 ? w : 128)); - y = CLAMP (y, - rect.y, - rect.y + rect.height - (h > 0 ? h : 128)); - - gchar geom[32]; - g_snprintf (geom, sizeof (geom), "%+d%+d", x, y); - - gtk_window_parse_geometry (window, geom); - - if (forced_w > 0 && forced_h > 0) { - gtk_window_set_default_size (window, forced_w, forced_h); - } -} - -void label_set_bold (GtkLabel *label) { - PangoAttrList *attrs = pango_attr_list_new (); - pango_attr_list_insert (attrs, - pango_attr_weight_new (PANGO_WEIGHT_SEMIBOLD)); - gtk_label_set_attributes (label, attrs); - pango_attr_list_unref (attrs); -} - -void widget_set_error (GtkWidget *widget) { - GdkColor color = {0, 65535, 61184, 61184}; - gtk_widget_modify_base (widget, GTK_STATE_NORMAL, &color); -} - -void widget_clear_error (GtkWidget *widget) { - gtk_widget_modify_base (widget, GTK_STATE_NORMAL, NULL); -} - -void text_buffer_clear_tag (GtkTextBuffer *buffer, GtkTextTag *tag) { - GtkTextIter start; - GtkTextIter end; - gtk_text_buffer_get_start_iter (buffer, &start); - gtk_text_buffer_get_end_iter (buffer, &end); - gtk_text_buffer_remove_tag (buffer, tag, &start, &end); -} - -void utility_window_attach (GtkWindow *util_win, GtkWindow *parent_win) { - if (parent_win == gtk_window_get_transient_for (util_win)) - return; - - // HACK: X window managers tend to move windows around when they are - // unmapped and mapped again, so we save the position - gint x, y; - gtk_window_get_position (util_win, &x, &y); - - // HACK: Altering WM_TRANSIENT_FOR on a non-hidden but unmapped window - // (eg: when you have minimised the original parent window) can - // cause the window to be lost forever, so we hide it first - gtk_widget_hide (GTK_WIDGET (util_win)); - gtk_window_set_focus_on_map (util_win, FALSE); - gtk_window_set_transient_for (util_win, parent_win); - gtk_widget_show (GTK_WIDGET (util_win)); - - // HACK: see above - gtk_window_move (util_win, x, y); -} - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/logo.h b/tikzit-old/src/gtk/logo.h deleted file mode 100644 index e778da9..0000000 --- a/tikzit-old/src/gtk/logo.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include - -typedef enum { - LOGO_SIZE_16, - LOGO_SIZE_24, - LOGO_SIZE_32, - LOGO_SIZE_48, - LOGO_SIZE_64, - LOGO_SIZE_128, - LOGO_SIZE_COUNT -} LogoSize; - -GdkPixbuf *get_logo (LogoSize size); - -// vim:ft=objc:ts=8:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/logo.m b/tikzit-old/src/gtk/logo.m deleted file mode 100644 index 57533c7..0000000 --- a/tikzit-old/src/gtk/logo.m +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import "logo.h" -#include - -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wpointer-sign" -#import "logodata.m" -#pragma GCC diagnostic pop - -static GdkPixbuf *pixbufCache[LOGO_SIZE_COUNT]; - -GdkPixbuf *get_logo (LogoSize size) { - const GdkPixdata *data = NULL; - switch (size) { - case LOGO_SIZE_16: - data = &logo16; - break; - case LOGO_SIZE_24: - data = &logo24; - break; - case LOGO_SIZE_32: - data = &logo32; - break; - case LOGO_SIZE_48: - data = &logo48; - break; - case LOGO_SIZE_64: - data = &logo64; - break; - case LOGO_SIZE_128: - data = &logo128; - break; - default: - return NULL; - }; - if (pixbufCache[size]) { - g_object_ref (pixbufCache[size]); - return pixbufCache[size]; - } else { - GdkPixbuf *buf = gdk_pixbuf_from_pixdata (data, FALSE, NULL); - pixbufCache[size] = buf; - g_object_add_weak_pointer (G_OBJECT (buf), (void**)(&(pixbufCache[size]))); - return buf; - } -} - -// vim:ft=objc:ts=8:et:sts=4:sw=4 - diff --git a/tikzit-old/src/gtk/main.m b/tikzit-old/src/gtk/main.m deleted file mode 100644 index 5d9f4a4..0000000 --- a/tikzit-old/src/gtk/main.m +++ /dev/null @@ -1,111 +0,0 @@ -// -// main.m -// TikZiT -// -// Copyright 2010 Chris Heunen. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "TZFoundation.h" -#import -#import "clipboard.h" -#import "logo.h" -#import "tzstockitems.h" - -#import "Application.h" - -static GOptionEntry entries[] = -{ - //{ "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose, "Be verbose", NULL }, - { NULL } -}; - -void onUncaughtException(NSException* exception) -{ - NSString *joinStr = @"\n "; - NSLog(@"uncaught exception: %@\n backtrace: %@", - [exception description], - [[exception callStackSymbols] componentsJoinedByString:joinStr]); -} - -int main (int argc, char *argv[]) { - NSSetUncaughtExceptionHandler(&onUncaughtException); - - [[NSAutoreleasePool alloc] init]; - - GError *error = NULL; - GOptionContext *context; - context = g_option_context_new ("[FILES] - PGF/TikZ-based graph editor"); - g_option_context_add_main_entries (context, entries, NULL); - g_option_context_add_group (context, gtk_get_option_group (TRUE)); - if (!g_option_context_parse (context, &argc, &argv, &error)) - { - if (error->domain == G_OPTION_ERROR) { - g_print ("%s\nUse --help to see available options\n", error->message); - } else { - g_print ("Unexpected error parsing options: %s\n", error->message); - } - exit (1); - } - g_option_context_free (context); - -#ifndef WINDOWS - GList *icon_list = NULL; - icon_list = g_list_prepend (icon_list, get_logo(LOGO_SIZE_128)); - icon_list = g_list_prepend (icon_list, get_logo(LOGO_SIZE_64)); - icon_list = g_list_prepend (icon_list, get_logo(LOGO_SIZE_48)); - icon_list = g_list_prepend (icon_list, get_logo(LOGO_SIZE_32)); - icon_list = g_list_prepend (icon_list, get_logo(LOGO_SIZE_24)); - icon_list = g_list_prepend (icon_list, get_logo(LOGO_SIZE_16)); - gtk_window_set_default_icon_list (icon_list); - GList *list_head = icon_list; - while (list_head) { - g_object_unref ((GObject*)list_head->data); - list_head = list_head->next; - } -#endif - - NSAutoreleasePool *initPool = [[NSAutoreleasePool alloc] init]; - - tz_register_stock_items(); - clipboard_init(); - - Application *app = nil; - if (argc > 1) { - NSMutableArray *files = [NSMutableArray arrayWithCapacity:argc-1]; - for (int i = 1; i < argc; ++i) { - [files insertObject:[NSString stringWithGlibFilename:argv[i]] - atIndex:i-1]; - } - NSLog(@"Files: %@", files); - app = [[Application alloc] initWithFiles:files]; - } else { - app = [[Application alloc] init]; - } - - [initPool drain]; - - gtk_main (); - - [app saveConfiguration]; - [app release]; - - return 0; -} - -// vim:ft=objc:et:sts=4:sw=4 diff --git a/tikzit-old/src/gtk/mkdtemp.h b/tikzit-old/src/gtk/mkdtemp.h deleted file mode 100644 index 65ee99e..0000000 --- a/tikzit-old/src/gtk/mkdtemp.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Creating a private temporary directory. - Copyright (C) 2001-2002 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - -#if HAVE_MKDTEMP - -/* Get mkdtemp() declaration. */ -#include - -#else - -/* Create a unique temporary directory from TEMPLATE. - The last six characters of TEMPLATE must be "XXXXXX"; - they are replaced with a string that makes the directory name unique. - Returns TEMPLATE, or a null pointer if it cannot get a unique name. - The directory is created mode 700. */ -extern char * mkdtemp (char *template); - -#endif diff --git a/tikzit-old/src/gtk/mkdtemp.m b/tikzit-old/src/gtk/mkdtemp.m deleted file mode 100644 index ee3cd7c..0000000 --- a/tikzit-old/src/gtk/mkdtemp.m +++ /dev/null @@ -1,180 +0,0 @@ -/* Copyright (C) 1999, 2001-2003 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - see . - */ - -/* Extracted from misc/mkdtemp.c and sysdeps/posix/tempname.c. */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -/* Specification. */ -#include "mkdtemp.h" - -#include -#ifndef __set_errno -# define __set_errno(Val) errno = (Val) -#endif - -#include -#include -#include - -#include -#ifndef TMP_MAX -# define TMP_MAX 238328 -#endif - -#if HAVE_STDINT_H || _LIBC -# include -#endif -#if HAVE_INTTYPES_H -# include -#endif - -#if HAVE_UNISTD_H || _LIBC -# include -#endif - -#if HAVE_GETTIMEOFDAY || _LIBC -# if HAVE_SYS_TIME_H || _LIBC -# include -# endif -#else -# if HAVE_TIME_H || _LIBC -# include -# endif -#endif - -#include "stat.h" - -#ifdef __MINGW32__ -/* mingw's mkdir() function has 1 argument, but we pass 2 arguments. - Therefore we have to disable the argument count checking. */ -# define mkdir ((int (*)()) mkdir) -#endif - -#if !_LIBC -# define __getpid getpid -# define __gettimeofday gettimeofday -# define __mkdir mkdir -#endif - -/* Use the widest available unsigned type if uint64_t is not - available. The algorithm below extracts a number less than 62**6 - (approximately 2**35.725) from uint64_t, so ancient hosts where - uintmax_t is only 32 bits lose about 3.725 bits of randomness, - which is better than not having mkstemp at all. */ -#if !defined UINT64_MAX && !defined uint64_t -# define uint64_t uintmax_t -#endif - -/* These are the characters used in temporary filenames. */ -static const char letters[] = -"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; - -/* Generate a temporary file name based on TMPL. TMPL must match the - rules for mk[s]temp (i.e. end in "XXXXXX"). The name constructed - does not exist at the time of the call to __gen_tempname. TMPL is - overwritten with the result. - - KIND is: - __GT_DIR: create a directory, which will be mode 0700. - - We use a clever algorithm to get hard-to-predict names. */ -static int -gen_tempname (char *tmpl) -{ - int len; - char *XXXXXX; - static uint64_t value; - uint64_t random_time_bits; - int count, fd = -1; - int save_errno = errno; - - len = strlen (tmpl); - if (len < 6 || strcmp (&tmpl[len - 6], "XXXXXX")) - { - __set_errno (EINVAL); - return -1; - } - - /* This is where the Xs start. */ - XXXXXX = &tmpl[len - 6]; - - /* Get some more or less random data. */ -#ifdef RANDOM_BITS - RANDOM_BITS (random_time_bits); -#else -# if HAVE_GETTIMEOFDAY || _LIBC - { - struct timeval tv; - __gettimeofday (&tv, NULL); - random_time_bits = ((uint64_t) tv.tv_usec << 16) ^ tv.tv_sec; - } -# else - random_time_bits = time (NULL); -# endif -#endif - value += random_time_bits ^ __getpid (); - - for (count = 0; count < TMP_MAX; value += 7777, ++count) - { - uint64_t v = value; - - /* Fill in the random bits. */ - XXXXXX[0] = letters[v % 62]; - v /= 62; - XXXXXX[1] = letters[v % 62]; - v /= 62; - XXXXXX[2] = letters[v % 62]; - v /= 62; - XXXXXX[3] = letters[v % 62]; - v /= 62; - XXXXXX[4] = letters[v % 62]; - v /= 62; - XXXXXX[5] = letters[v % 62]; - - fd = __mkdir (tmpl, S_IRUSR | S_IWUSR | S_IXUSR); - - if (fd >= 0) - { - __set_errno (save_errno); - return fd; - } - else if (errno != EEXIST) - return -1; - } - - /* We got out of the loop because we ran out of combinations to try. */ - __set_errno (EEXIST); - return -1; -} - -/* Generate a unique temporary directory from TEMPLATE. - The last six characters of TEMPLATE must be "XXXXXX"; - they are replaced with a string that makes the filename unique. - The directory is created, mode 700, and its name is returned. - (This function comes from OpenBSD.) */ -char * -mkdtemp (char *template) -{ - if (gen_tempname (template)) - return NULL; - else - return template; -} diff --git a/tikzit-old/src/gtk/stat.h b/tikzit-old/src/gtk/stat.h deleted file mode 100644 index a9829ae..0000000 --- a/tikzit-old/src/gtk/stat.h +++ /dev/null @@ -1,25 +0,0 @@ -#include -#if STAT_MACROS_BROKEN -# undef S_ISDIR -#endif -#if !defined S_ISDIR && defined S_IFDIR -# define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR) -#endif -#if !S_IRUSR && S_IREAD -# define S_IRUSR S_IREAD -#endif -#if !S_IRUSR -# define S_IRUSR 00400 -#endif -#if !S_IWUSR && S_IWRITE -# define S_IWUSR S_IWRITE -#endif -#if !S_IWUSR -# define S_IWUSR 00200 -#endif -#if !S_IXUSR && S_IEXEC -# define S_IXUSR S_IEXEC -#endif -#if !S_IXUSR -# define S_IXUSR 00100 -#endif diff --git a/tikzit-old/src/gtk/test/gtk.m b/tikzit-old/src/gtk/test/gtk.m deleted file mode 100644 index aabb0f2..0000000 --- a/tikzit-old/src/gtk/test/gtk.m +++ /dev/null @@ -1,27 +0,0 @@ -// -// linux.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// -#import "test/test.h" - -void testGtk() { - -} diff --git a/tikzit-old/src/gtk/test/main.m b/tikzit-old/src/gtk/test/main.m deleted file mode 100644 index 639a335..0000000 --- a/tikzit-old/src/gtk/test/main.m +++ /dev/null @@ -1,50 +0,0 @@ -// -// main.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// -#include "config.h" -#import "test/test.h" -#include -void testCommon(); - -int main(int argc, char **argv) { - if (argc == 2 && strcmp(argv[1], "--disable-color")==0) { - setColorEnabled(NO); - } else { - setColorEnabled(YES); - } - - PUTS(@""); - PUTS(@"**********************************************"); - PUTS(@"TikZiT TESTS, LINUX VERSION %@", VERSION); - PUTS(@"**********************************************"); - PUTS(@""); - - startTests(); - testCommon(); - testLinux(); - - PUTS(@""); - PUTS(@"**********************************************"); - endTests(); - PUTS(@"**********************************************"); - PUTS(@""); -} diff --git a/tikzit-old/src/gtk/tzstockitems.h b/tikzit-old/src/gtk/tzstockitems.h deleted file mode 100644 index 5ad0da9..0000000 --- a/tikzit-old/src/gtk/tzstockitems.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#define TIKZIT_STOCK_SELECT "tikzit-select" -#define TIKZIT_STOCK_CREATE_NODE "tikzit-create-node" -#define TIKZIT_STOCK_CREATE_EDGE "tikzit-create-edge" -#define TIKZIT_STOCK_BOUNDING_BOX "tikzit-bounding-box" -#define TIKZIT_STOCK_DRAG "tikzit-drag" - -void tz_register_stock_items(); - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/tzstockitems.m b/tikzit-old/src/gtk/tzstockitems.m deleted file mode 100644 index 5eba912..0000000 --- a/tikzit-old/src/gtk/tzstockitems.m +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright 2012 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "tzstockitems.h" -#include -#include - -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wpointer-sign" -#import "icondata.m" -#pragma GCC diagnostic pop - -static GtkStockItem stock_items[] = { - // gchar *stock_id; - // gchar *label; - // GdkModifierType modifier; - // guint keyval; - // gchar *translation_domain; - { TIKZIT_STOCK_SELECT, "Select", 0, 0, NULL }, - { TIKZIT_STOCK_CREATE_NODE, "Create Node", 0, 0, NULL }, - { TIKZIT_STOCK_CREATE_EDGE, "Create Edge", 0, 0, NULL }, - { TIKZIT_STOCK_BOUNDING_BOX, "Bounding Box", 0, 0, NULL }, - { TIKZIT_STOCK_DRAG, "Drag", 0, 0, NULL }, -}; -static guint n_stock_items = G_N_ELEMENTS (stock_items); - -static void icon_factory_add_pixdata (GtkIconFactory *factory, - const gchar *stock_id, - const GdkPixdata *image_data) { - - GdkPixbuf *buf = gdk_pixbuf_from_pixdata (image_data, FALSE, NULL); - GtkIconSet *icon_set = gtk_icon_set_new_from_pixbuf (buf); - gtk_icon_factory_add (factory, stock_id, icon_set); - gtk_icon_set_unref (icon_set); - g_object_unref (G_OBJECT (buf)); -} - -void tz_register_stock_items() { - gtk_stock_add_static (stock_items, n_stock_items); - - GtkIconFactory *factory = gtk_icon_factory_new (); - icon_factory_add_pixdata (factory, TIKZIT_STOCK_SELECT, &select_rectangular); - icon_factory_add_pixdata (factory, TIKZIT_STOCK_CREATE_NODE, &draw_ellipse); - icon_factory_add_pixdata (factory, TIKZIT_STOCK_CREATE_EDGE, &draw_path); - icon_factory_add_pixdata (factory, TIKZIT_STOCK_BOUNDING_BOX, &transform_crop_and_resize); - icon_factory_add_pixdata (factory, TIKZIT_STOCK_DRAG, &transform_move); - gtk_icon_factory_add_default (factory); -} - -// vim:ft=objc:ts=8:et:sts=4:sw=4:foldmethod=marker diff --git a/tikzit-old/src/gtk/tztoolpalette.h b/tikzit-old/src/gtk/tztoolpalette.h deleted file mode 100644 index 45ec2ac..0000000 --- a/tikzit-old/src/gtk/tztoolpalette.h +++ /dev/null @@ -1,56 +0,0 @@ -/* GIMP - The GNU Image Manipulation Program - * Copyright (C) 1995 Spencer Kimball and Peter Mattis - * - * tztoolpalette.h, based on gimptoolpalette.h - * Copyright (C) 2010 Michael Natterer - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef __TZ_TOOL_PALETTE_H__ -#define __TZ_TOOL_PALETTE_H__ - - -#define TZ_TYPE_TOOL_PALETTE (tz_tool_palette_get_type ()) -#define TZ_TOOL_PALETTE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TZ_TYPE_TOOL_PALETTE, TzToolPalette)) -#define TZ_TOOL_PALETTE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TZ_TYPE_TOOL_PALETTE, TzToolPaletteClass)) -#define TZ_IS_TOOL_PALETTE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TZ_TYPE_TOOL_PALETTE)) -#define TZ_IS_TOOL_PALETTE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TZ_TYPE_TOOL_PALETTE)) -#define TZ_TOOL_PALETTE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TZ_TYPE_TOOL_PALETTE, TzToolPaletteClass)) - - -typedef struct _TzToolPaletteClass TzToolPaletteClass; -typedef struct _TzToolPalette TzToolPalette; - -struct _TzToolPalette -{ - GtkToolPalette parent_instance; -}; - -struct _TzToolPaletteClass -{ - GtkToolPaletteClass parent_class; -}; - - -GType tz_tool_palette_get_type (void) G_GNUC_CONST; - -GtkWidget * tz_tool_palette_new (void); - -gboolean tz_tool_palette_get_button_size (TzToolPalette *widget, - gint *width, - gint *height); - - -#endif /* __TZ_TOOL_PALETTE_H__ */ diff --git a/tikzit-old/src/gtk/tztoolpalette.m b/tikzit-old/src/gtk/tztoolpalette.m deleted file mode 100644 index a948127..0000000 --- a/tikzit-old/src/gtk/tztoolpalette.m +++ /dev/null @@ -1,158 +0,0 @@ -/* GIMP - The GNU Image Manipulation Program - * Copyright (C) 1995 Spencer Kimball and Peter Mattis - * - * tztoolpalette.c, based on gimptoolpalette.c - * Copyright (C) 2010 Michael Natterer - * Copyright (C) 2012 Alex Merry - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include - -#include "tztoolpalette.h" - - -#define DEFAULT_TOOL_ICON_SIZE GTK_ICON_SIZE_BUTTON -#define DEFAULT_BUTTON_RELIEF GTK_RELIEF_NONE - -#define TOOL_BUTTON_DATA_KEY "tz-tool-palette-item" -#define TOOL_INFO_DATA_KEY "tz-tool-info" - - -typedef struct _TzToolPalettePrivate TzToolPalettePrivate; - -struct _TzToolPalettePrivate -{ - gint tool_rows; - gint tool_columns; -}; - -#define GET_PRIVATE(p) G_TYPE_INSTANCE_GET_PRIVATE (p, \ - TZ_TYPE_TOOL_PALETTE, \ - TzToolPalettePrivate) - - -static void tz_tool_palette_size_allocate (GtkWidget *widget, - GtkAllocation *allocation); - - -G_DEFINE_TYPE (TzToolPalette, tz_tool_palette, GTK_TYPE_TOOL_PALETTE) - -#define parent_class tz_tool_palette_parent_class - - -static void -tz_tool_palette_class_init (TzToolPaletteClass *klass) -{ - GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); - - widget_class->size_allocate = tz_tool_palette_size_allocate; - - g_type_class_add_private (klass, sizeof (TzToolPalettePrivate)); -} - -static void -tz_tool_palette_init (TzToolPalette *palette) -{ -} - -static GtkToolItemGroup * -tz_tool_palette_tool_group (TzToolPalette *palette) -{ - GList *children; - GtkToolItemGroup *group; - - children = gtk_container_get_children (GTK_CONTAINER (palette)); - g_return_val_if_fail (children, NULL); - group = GTK_TOOL_ITEM_GROUP (children->data); - g_list_free (children); - - return group; -} - -gboolean -tz_tool_palette_get_button_size (TzToolPalette *palette, - gint *width, - gint *height) -{ - g_return_val_if_fail (width || height, FALSE); - - GtkToolItemGroup *group = tz_tool_palette_tool_group (palette); - g_return_val_if_fail (group, FALSE); - - guint tool_count = gtk_tool_item_group_get_n_items (group); - if (tool_count > 0) - { - GtkWidget *tool_button; - GtkRequisition button_requisition; - - tool_button = GTK_WIDGET (gtk_tool_item_group_get_nth_item (group, 0)); - gtk_widget_size_request (tool_button, &button_requisition); - if (width) - *width = button_requisition.width; - if (height) - *height = button_requisition.height; - return TRUE; - } - return FALSE; -} - -static void -tz_tool_palette_size_allocate (GtkWidget *widget, - GtkAllocation *allocation) -{ - TzToolPalettePrivate *private = GET_PRIVATE (widget); - GtkToolItemGroup *group = tz_tool_palette_tool_group (TZ_TOOL_PALETTE (widget)); - - g_return_if_fail (group); - - GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation); - - guint tool_count = gtk_tool_item_group_get_n_items (group); - if (tool_count > 0) - { - GtkWidget *tool_button; - GtkRequisition button_requisition; - gint tool_rows; - gint tool_columns; - - tool_button = GTK_WIDGET (gtk_tool_item_group_get_nth_item (group, 0)); - gtk_widget_size_request (tool_button, &button_requisition); - - tool_columns = MAX (1, (allocation->width / button_requisition.width)); - tool_rows = tool_count / tool_columns; - - if (tool_count % tool_columns) - tool_rows++; - - if (private->tool_rows != tool_rows || - private->tool_columns != tool_columns) - { - private->tool_rows = tool_rows; - private->tool_columns = tool_columns; - - gtk_widget_set_size_request (widget, -1, - tool_rows * button_requisition.height); - } - } -} - -GtkWidget * -tz_tool_palette_new (void) -{ - return g_object_new (TZ_TYPE_TOOL_PALETTE, NULL); -} - -// vim:ft=objc:ts=8:et:sts=2:sw=2:foldmethod=marker diff --git a/tikzit-old/src/osx/AppDelegate.h b/tikzit-old/src/osx/AppDelegate.h deleted file mode 100644 index 92d9add..0000000 --- a/tikzit-old/src/osx/AppDelegate.h +++ /dev/null @@ -1,57 +0,0 @@ -// -// AppDelegate.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "StylePaletteController.h" -#import "ToolPaletteController.h" -#import "PropertyInspectorController.h" -#import "PreambleController.h" -#import "PreviewController.h" -#import "GraphicsView.h" -#import "PreferenceController.h" - -@interface AppDelegate : NSObject { - NSMapTable *table; - StylePaletteController *stylePaletteController; - PropertyInspectorController *propertyInspectorController; - PreambleController *preambleController; - PreviewController *previewController; - PreferenceController *preferenceController; - ToolPaletteController *toolPaletteController; - IBOutlet GraphicsView *graphicsView; - NSString *tempDir; -} - -@property IBOutlet StylePaletteController *stylePaletteController; -@property (strong) IBOutlet ToolPaletteController *toolPaletteController; - -- (void)awakeFromNib; -+ (void)setDefaults; -- (void)applicationWillTerminate:(NSNotification *)notification; -- (IBAction)toggleStyleInspector:(id)sender; -- (IBAction)togglePropertyInspector:(id)sender; -- (IBAction)togglePreamble:(id)sender; -- (IBAction)togglePreferences:(id)sender; -- (IBAction)refreshShapes:(id)sender; - -@end diff --git a/tikzit-old/src/osx/AppDelegate.m b/tikzit-old/src/osx/AppDelegate.m deleted file mode 100644 index 94f5507..0000000 --- a/tikzit-old/src/osx/AppDelegate.m +++ /dev/null @@ -1,124 +0,0 @@ -// -// AppDelegate.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "AppDelegate.h" -#import "TikzDocument.h" -#import "Shape.h" -#import "SupportDir.h" - -@implementation AppDelegate - -@synthesize stylePaletteController, toolPaletteController; - -+(void)initialize{ - [self setDefaults]; -} - -- (void)awakeFromNib { - [SupportDir createUserSupportDir]; - NSString *supportDir = [SupportDir userSupportDir]; - //NSLog(stylePlist); - stylePaletteController = - [[StylePaletteController alloc] initWithWindowNibName:@"StylePalette" - supportDir:supportDir]; - - propertyInspectorController = - [[PropertyInspectorController alloc] initWithWindowNibName:@"PropertyInspector"]; - - [propertyInspectorController setStylePaletteController:stylePaletteController]; - - NSString *preamblePlist = [supportDir stringByAppendingPathComponent:@"preambles.plist"]; - preambleController = - [[PreambleController alloc] initWithNibName:@"Preamble" - plist:preamblePlist - styles:[stylePaletteController nodeStyles] - edges:[stylePaletteController edgeStyles]]; - - - char template[] = "/tmp/tikzit_tmp_XXXXXXX"; - char *dir = mkdtemp(template); - tempDir = [NSString stringWithUTF8String:dir]; - - NSLog(@"created temp dir: %@", tempDir); - NSLog(@"system support dir: %@", [SupportDir systemSupportDir]); - - previewController = - [[PreviewController alloc] initWithWindowNibName:@"Preview" - preambleController:preambleController - tempDir:tempDir]; - - preferenceController = [[PreferenceController alloc] initWithWindowNibName:@"Preferences" preambleController:preambleController]; - - // each application has one global preview controller - [PreviewController setDefaultPreviewController:previewController]; -} - -+ (void)setDefaults{ - NSString *userDefaultsValuesPath; - NSDictionary *userDefaultsValuesDict; - - userDefaultsValuesPath=[[NSBundle mainBundle] pathForResource:@"UserDefaults" - ofType:@"plist"]; - userDefaultsValuesDict=[NSDictionary dictionaryWithContentsOfFile:userDefaultsValuesPath]; - - [[NSUserDefaults standardUserDefaults] registerDefaults:userDefaultsValuesDict]; -} - -- (void)applicationWillTerminate:(NSNotification *)notification { - NSString *supportDir = [SupportDir userSupportDir]; - [stylePaletteController saveStyles:supportDir]; - [preambleController savePreambles:[supportDir stringByAppendingPathComponent:@"preambles.plist"]]; - - NSLog(@"wiping temp dir: %@", tempDir); - [[NSFileManager defaultManager] removeItemAtPath:tempDir error:NULL]; -} - -- (void)toggleController:(NSWindowController*)c { - if ([[c window] isVisible]) { - [c close]; - } else { - [c showWindow:self]; - } -} - -- (IBAction)toggleStyleInspector:(id)sender { - [self toggleController:stylePaletteController]; -} - -- (IBAction)togglePropertyInspector:(id)sender { - [self toggleController:propertyInspectorController]; -} - -- (IBAction)togglePreamble:(id)sender { - [self toggleController:(NSWindowController *) preambleController]; -} - -- (IBAction)togglePreferences:(id)sender { - [self toggleController:preferenceController]; -} - -- (IBAction)refreshShapes:(id)sender { - [Shape refreshShapeDictionary]; -} - -@end diff --git a/tikzit-old/src/osx/CALayer+DrawLabel.h b/tikzit-old/src/osx/CALayer+DrawLabel.h deleted file mode 100644 index 32282d9..0000000 --- a/tikzit-old/src/osx/CALayer+DrawLabel.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// CALayer+DrawLabel.h -// TikZiT -// -// Created by Aleks Kissinger on 09/05/2011. -// Copyright 2011 Aleks Kissinger. All rights reserved. -// - -#import -#import - -@class Transformer; - -@interface CALayer(DrawLabel) - -- (void)drawLabel:(NSString*)label - atPoint:(NSPoint)pt - inContext:(CGContextRef)context - usingTrans:(Transformer*)t; - -@end diff --git a/tikzit-old/src/osx/CALayer+DrawLabel.m b/tikzit-old/src/osx/CALayer+DrawLabel.m deleted file mode 100644 index 4860a3c..0000000 --- a/tikzit-old/src/osx/CALayer+DrawLabel.m +++ /dev/null @@ -1,84 +0,0 @@ -// -// CALayer+DrawLabel.m -// TikZiT -// -// Created by Aleks Kissinger on 09/05/2011. -// Copyright 2011 Aleks Kissinger. All rights reserved. -// - -#import "CALayer+DrawLabel.h" -#import "Transformer.h" - -@implementation CALayer(DrawLabel) - -- (void)drawLabel:(NSString*)label - atPoint:(NSPoint)pt - inContext:(CGContextRef)context - usingTrans:(Transformer*)t { - - CGContextSaveGState(context); - - if ([label length] > 15) { - label = [[label substringToIndex:12] stringByAppendingString:@"..."]; - } - - float fontSize = [t scaleToScreen:0.18f]; // size 9 @ 100% - if (fontSize > 18.0f) fontSize = 18.0f; - - // Prepare font - CTFontRef font = CTFontCreateWithName(CFSTR("Monaco"), fontSize, NULL); - - // Create an attributed string - CFStringRef keys[] = { kCTFontAttributeName }; - CFTypeRef values[] = { font }; - CFDictionaryRef attr = CFDictionaryCreate(NULL, - (const void **)&keys, - (const void **)&values, - sizeof(keys) / sizeof(keys[0]), - &kCFTypeDictionaryKeyCallBacks, - &kCFTypeDictionaryValueCallBacks); - CFAttributedStringRef attrString = - CFAttributedStringCreate(NULL, (CFStringRef)label, attr); - CFRelease(attr); - - // Draw the string - CTLineRef line = CTLineCreateWithAttributedString(attrString); - CGContextSetTextMatrix(context, CGAffineTransformIdentity); - CGContextSetTextPosition(context, 0, 0); - - CGRect labelBounds = CGRectIntegral(CTLineGetImageBounds(line, context)); - //int shiftx = round(labelBounds.size.width / 2); - - CGContextSetTextPosition(context, - round(pt.x - (labelBounds.size.width/2)), - round(pt.y - (0.9*labelBounds.size.height/2))); - - labelBounds = CGRectIntegral(CTLineGetImageBounds(line, context)); - labelBounds.origin.x -= 2; - labelBounds.origin.y -= 2; - labelBounds.size.width += 4; - labelBounds.size.height += 4; - - CGContextSetShouldAntialias(context, NO); - - CGContextSetRGBFillColor(context, 1.0f, 1.0f, 0.5f, 0.7f); - CGContextSetRGBStrokeColor(context, 0.5f, 0.0f, 0.0f, 0.7f); - - CGContextFillRect(context, labelBounds); - CGContextStrokeRect(context, labelBounds); - - CGContextSetShouldAntialias(context, YES); - - CGContextSetRGBFillColor(context, 0.3f, 0.3f, 0.3f, 0.7f); - - CTLineDraw(line, context); - - // Clean up - CFRelease(line); - CFRelease(attrString); - CFRelease(font); - - CGContextRestoreGState(context); -} - -@end diff --git a/tikzit-old/src/osx/CoreGraphicsRenderContext.h b/tikzit-old/src/osx/CoreGraphicsRenderContext.h deleted file mode 100644 index 7b00484..0000000 --- a/tikzit-old/src/osx/CoreGraphicsRenderContext.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import -#import "RenderContext.h" - -@interface CoreTextLayout: NSObject { - CFAttributedStringRef attrString; - CTFontRef font; - CTLineRef line; - CGContextRef ctx; -} - -+ (CoreTextLayout*) layoutForContext:(CGContextRef)c withString:(NSString*)string fontSize:(CGFloat)fontSize; -- (id) initWithContext:(CGContextRef)cr withString:(NSString*)string fontSize:(CGFloat)fontSize; - -@end - -@interface CoreGraphicsRenderContext: NSObject { - CGContextRef ctx; -} - -+ (CoreGraphicsRenderContext*) contextWithCGContext:(CGContextRef)c; -+ (id) initWithCGContext:(CGContextRef)c; - -- (CGContextRef) ctx; - -@end - -// vim:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/osx/CoreGraphicsRenderContext.m b/tikzit-old/src/osx/CoreGraphicsRenderContext.m deleted file mode 100644 index 1cb0daf..0000000 --- a/tikzit-old/src/osx/CoreGraphicsRenderContext.m +++ /dev/null @@ -1,234 +0,0 @@ -/* - * Copyright 2011 Alex Merry - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#import -#import "RenderContext.h" - -@implementation CoreTextLayout - -+ (CoreTextLayout*) layoutForContext:(CGContextRef)c withString:(NSString*)string fontSize:(CGFloat)fontSize { - return [[[self alloc] initWithContext:c withString:string fontSize:fontSize] autorelease]; -} - -- (id) initWithContext:(CGContextRef)cr withString:(NSString*)string fontSize:(CGFloat)fontSize { - self = [super init]; - - if (self == nil) { - return nil; - } - - CGContextRetain (cr); - ctx = cr; - font = CTFontCreateWithName(CFSTR("Monaco"), fontSize, NULL); - - // Create an attributed string - CFStringRef keys[] = { kCTFontAttributeName }; - CFTypeRef values[] = { font }; - CFDictionaryRef attr = CFDictionaryCreate(NULL, - (const void **)&keys, - (const void **)&values, - sizeof(keys) / sizeof(keys[0]), - &kCFTypeDictionaryKeyCallBacks, - &kCFTypeDictionaryValueCallBacks); - attrString = CFAttributedStringCreate(NULL, (CFStringRef)lab, attr); - CFRelease(attr); - line = CTLineCreateWithAttributedString(attrString); - - return self; -} - -- (NSSize) size { - CGRect labelBounds = CGRectIntegral(CTLineGetImageBounds(line, ctx)); - return labelBounds.size; -} - -- (NSString*) text { - return CFAttributedStringGetString (attrString); -} - -- (void) showTextAt:(NSPoint)topLeft withColor:(RColor)color { - CGContextSaveGState(ctx); - - CGContextSetRGBFillColor(ctx, color.red, color.green, color.blue, color.alpha); - CGContextSetRGBStrokeColor(ctx, color.red, color.green, color.blue, color.alpha); - CGContextSetShouldAntialias(ctx, YES); - - CGContextSetTextMatrix(ctx, CGAffineTransformIdentity); - CGContextSetTextPosition(ctx, 0, 0); - CGRect bounds = CGRectIntegral(CTLineGetImageBounds(line, ctx)); - CGContextSetTextPosition(ctx, topLeft.x - bounds.x, topLeft.y - bounds.y); - - CTLineDraw(line, ctx); - - CGContextRestoreGState(ctx); -} - -- (void) dealloc { - CFRelease(line); - CFRelease(attrString); - CFRelease(font); - CGContextRelease (ctx); - - [super dealloc]; -} - -@end - -@implementation CoreGraphicsRenderContext - -+ (CoreGraphicsRenderContext*) contextWithCGContext:(CGContextRef)c { - return [[[self alloc] initWithCGContext:c] autorelease]; -} - -+ (id) initWithCGContext:(CGContextRef)c { - self = [super init]; - - if (self) { - ctx = c; - CGContextRetain (ctx); - } - - return self; -} - -- (void) dealloc { - CGContextRelease (ctx); - - [super dealloc]; -} - -- (CGContextRef) ctx { - return ctx; -} - -- (void) saveState { - CGContextSaveGState(ctx); -} - -- (void) restoreState { - CGContextRestoreGState(ctx); -} - -- (NSRect) clipBoundingBox { - return CGContextGetClipBoundingBox (ctx); -} - -- (BOOL) strokeIncludesPoint:(NSPoint)p { - return CGContextPathContainsPoint(ctx, NSPointToCGPoint(p), kCGPathStroke); -} - -- (BOOL) fillIncludesPoint:(NSPoint)p { - return CGContextPathContainsPoint(ctx, NSPointToCGPoint(p), kCGPathFill); -} - -- (id) layoutText:(NSString*)text withSize:(CGFloat)fontSize { - return [CoreTextLayout layoutForContext:ctx withString:text fontSize:fontSize]; -} - -// this may not affect text rendering -- (void) setAntialiasMode:(AntialiasMode)mode { - CGContextSetShouldAntialias(ctx, mode != AntialiasDisabled); -} - -- (void) setLineWidth:(CGFloat)width { - CGContextSetLineWidth(ctx, width); -} - -// setting to 0 will unset the dash -- (void) setLineDash:(CGFloat)dashLength { - if (dashLength <= 0.0f) { - CGContextSetLineDash(ctx, 0.0f, NULL, 0); - } else { - const CGFloat dash[] = {dashLength, dashLength}; - CGContextSetLineDash(ctx, 0.0f, dash, 2); - } -} - -// paths -- (void) startPath { - CGContextBeginPath (ctx); -} - -- (void) closeSubPath { - CGContextClosePath (ctx); -} - -- (void) moveTo:(NSPoint)p { - CGContextMoveToPoint (ctx, p.x, p.y); -} - -- (void) curveTo:(NSPoint)end withCp1:(NSPoint)cp1 andCp2:(NSPoint)cp2 { - CGContextAddCurveToPoint(ctx, cp1.x, cp1.y, cp2.x, cp2.y, end.x, end.y); -} - -- (void) lineTo:(NSPoint)end { - CGContextAddLineToPoint(ctx, end.x, end.y); -} - -- (void) rect:(NSRect)rect { - CGContextAddRect (ctx, rect); -} - -- (void) circleAt:(NSPoint)c withRadius:(CGFloat)r { - CGContextMoveToPoint (ctx, c.x + r, c.y); - CGContextAddArc (ctx, c.x, c.y, r, 0.0f, M_PI, 1); -} - -// these methods clear the path -- (void) strokePathWithColor:(RColor)color { - CGContextSetRGBStrokeColor(ctx, color.red, color.green, color.blue, color.alpha); - CGContextDrawPath (ctx, kCGPathStroke); -} - -- (void) fillPathWithColor:(RColor)color { - CGContextSetRGBFillColor(ctx, color.red, color.green, color.blue, color.alpha); - CGContextDrawPath (ctx, kCGPathFill); -} - -- (void) strokePathWithColor:(RColor)scolor - andFillWithColor:(RColor)fcolor { - CGContextSetRGBFillColor(ctx, color.red, color.green, color.blue, color.alpha); - CGContextSetRGBStrokeColor(ctx, color.red, color.green, color.blue, color.alpha); - CGContextDrawPath (ctx, kCGPathFillStroke); -} - -- (void) strokePathWithColor:(RColor)scolor - andFillWithColor:(RColor)fcolor - usingAlpha:(CGFloat)alpha { - CGContextSetRGBFillColor(ctx, color.red, color.green, color.blue, color.alpha * alpha); - CGContextSetRGBStrokeColor(ctx, color.red, color.green, color.blue, color.alpha * alpha); - CGContextDrawPath (ctx, kCGPathFillStroke); -} - -- (void) clipToPath { - CGContextClip (ctx); -} - -// paint everywhere within the clip -- (void) paintWithColor:(RColor)color { - CGContextSetRGBFillColor(ctx, color.red, color.green, color.blue, color.alpha); - CGRect r = CGContextGetClipBoundingBox (ctx); - r.origin.x -= 1; - r.origin.y -= 1; - r.size.width += 2; - r.size.height += 2; - CGContextFillRect(context, r); -} - -@end - -// vim:ft=objc:ts=4:noet:sts=4:sw=4 diff --git a/tikzit-old/src/osx/CustomNodeCellView.h b/tikzit-old/src/osx/CustomNodeCellView.h deleted file mode 100644 index 22606d7..0000000 --- a/tikzit-old/src/osx/CustomNodeCellView.h +++ /dev/null @@ -1,23 +0,0 @@ -// -// CustomNodeCellView.h -// TikZiT -// -// Created by Johan Paulsson on 12/12/13. -// Copyright (c) 2013 Aleks Kissinger. All rights reserved. -// - -#import - -#import "NodeLayer.h" -#import "NodeStyle.h" -#import "NodeStyle+Coder.h" - -@interface CustomNodeCellView : NSTableCellView{ - NodeLayer *nodeLayer; - NodeStyle *nodeStyle; - BOOL selected; -} - -@property (strong) id objectValue; - -@end diff --git a/tikzit-old/src/osx/CustomNodeCellView.m b/tikzit-old/src/osx/CustomNodeCellView.m deleted file mode 100644 index 612394b..0000000 --- a/tikzit-old/src/osx/CustomNodeCellView.m +++ /dev/null @@ -1,83 +0,0 @@ -// -// CustomNodeCellView.m -// TikZiT -// -// Created by Johan Paulsson on 12/12/13. -// Copyright (c) 2013 Aleks Kissinger. All rights reserved. -// - -#import "CustomNodeCellView.h" - -@implementation CustomNodeCellView - -- (id)initWithFrame:(NSRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - // Initialization code here. - } - return self; -} - -- (void)drawRect:(NSRect)dirtyRect -{ - [super drawRect:dirtyRect]; - - // Drawing code here. -} - -- (id) objectValue{ - return [super objectValue]; -} - --(void)drawLayer:(CALayer *)layer inContext:(CGContextRef)context { - if (nodeLayer!=nil) { - if (![[[self layer] sublayers] containsObject:nodeLayer]) { - [[self layer] addSublayer:nodeLayer]; - NSPoint c = NSMakePoint((CGRectGetMinX([[self layer] frame])+CGRectGetWidth([nodeLayer bounds])/2), - CGRectGetMidY([[self layer] frame])); - //c = NSMakePoint(-16.5,-16.5); - [nodeLayer setCenter:c andAnimateWhen:NO]; - [[self textField] setFrame:NSMakeRect(CGRectGetWidth([nodeLayer bounds]), CGRectGetMidY([[self layer] frame]), CGRectGetWidth([[self textField] frame]), CGRectGetHeight([[self textField] frame]))]; - } - - if (selected){ - [nodeStyle setStrokeColor:[NSColor whiteColor]]; - [[nodeLayer node] setStyle:nodeStyle]; - }else{ - [nodeStyle setStrokeColor:[NSColor blackColor]]; - [[nodeLayer node] setStyle:nodeStyle]; - } - - [nodeLayer updateFrame]; - } -} - -- (void) setObjectValue:(id)objectValue{ - if(objectValue == nil) - return; - - nodeStyle = (NodeStyle *)objectValue; - [[self textField] setStringValue:[nodeStyle shapeName]]; - - if (nodeLayer == nil) { - nodeLayer = [[NodeLayer alloc] initWithNode:[Node node] - transformer:[Transformer defaultTransformer]]; - [nodeLayer setRescale:NO]; - } - [nodeStyle setName:[nodeStyle shapeName]]; - - [[nodeLayer node] setStyle:nodeStyle]; - [nodeLayer updateFrame]; - - NSLog(@"asd"); -} - -- (void)setBackgroundStyle:(NSBackgroundStyle)backgroundStyle { - [super setBackgroundStyle:backgroundStyle]; - - selected = (backgroundStyle == NSBackgroundStyleDark); - [self setNeedsDisplay:YES]; -} - -@end diff --git a/tikzit-old/src/osx/CustomNodeController.h b/tikzit-old/src/osx/CustomNodeController.h deleted file mode 100644 index 67adf0b..0000000 --- a/tikzit-old/src/osx/CustomNodeController.h +++ /dev/null @@ -1,35 +0,0 @@ -// -// CustomNodeController.h -// TikZiT -// -// Created by Johan Paulsson on 12/4/13. -// Copyright (c) 2013 Aleks Kissinger. All rights reserved. -// - -#import -#import "Shape.h" -#import "TikzShape.h" - -#import "GraphicsView.h" -#import "TikzSourceController.h" - -#import "SupportDir.h" - -@interface CustomNodeController : NSViewController { - NSDictionary *nodeStyles; - NSMutableArray* customNodeStyles; - - GraphicsView *__weak graphicsView; - TikzSourceController *__weak tikzSourceController; - NSTableView *customNodeTable; -} - -@property NSDictionary *nodeStyles; -@property NSMutableArray* customNodeStyles; - -@property IBOutlet NSTableView *customNodeTable; - -@property (weak) IBOutlet GraphicsView *graphicsView; -@property (weak) IBOutlet TikzSourceController *tikzSourceController; - -@end diff --git a/tikzit-old/src/osx/CustomNodeController.m b/tikzit-old/src/osx/CustomNodeController.m deleted file mode 100644 index 4f46acc..0000000 --- a/tikzit-old/src/osx/CustomNodeController.m +++ /dev/null @@ -1,58 +0,0 @@ -// -// CustomNodeController.m -// TikZiT -// -// Created by Johan Paulsson on 12/4/13. -// Copyright (c) 2013 Aleks Kissinger. All rights reserved. -// - -#import "CustomNodeController.h" -#import "NodeStyle.h" - -@interface CustomNodeController () - -@end - -@implementation CustomNodeController - -@synthesize nodeStyles, customNodeStyles; -@synthesize graphicsView, tikzSourceController; -@synthesize customNodeTable; - -- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil -{ - if (self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]) { - nodeStyles = [Shape shapeDictionary]; - customNodeStyles = [NSMutableArray array]; - - for(id key in nodeStyles) { - Shape *value = [nodeStyles objectForKey:key]; - - if([value isKindOfClass:[TikzShape class]]){ - NodeStyle *newNodeStyle = [[NodeStyle alloc] init]; - [newNodeStyle setShapeName:key]; - - [customNodeStyles addObject:newNodeStyle]; - } - } - } - - return self; -} - -- (void)tableViewSelectionDidChange:(NSNotification *)aNotification{ - NSInteger selectedRow = [customNodeTable selectedRow]; - - NodeStyle* selectedNodeStyle = [customNodeStyles objectAtIndex:selectedRow]; - TikzShape *tikzshape = (TikzShape *) [nodeStyles objectForKey:[selectedNodeStyle shapeName]]; - - [[tikzSourceController graphicsView] setEnabled:NO]; - [tikzSourceController setTikz:[tikzshape tikzSrc]]; - [tikzSourceController parseTikz:self]; -} - -- (id)valueForUndefinedKey:(NSString *)key{ - return nil; -} - -@end diff --git a/tikzit-old/src/osx/CustomNodes.xib b/tikzit-old/src/osx/CustomNodes.xib deleted file mode 100644 index 1cc8db2..0000000 --- a/tikzit-old/src/osx/CustomNodes.xib +++ /dev/null @@ -1,249 +0,0 @@ - - - - - - - - - - - - - - - - - - - name - strokeThickness - strokeColor - fillColor - strokeColorIsKnown - fillColorIsKnown - representedObject.name - shapeName - scale - @distinctUnionOfObjects.category - category - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \begin{tikzpicture} - -\end{tikzpicture} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tikzit-old/src/osx/DraggablePDFView.h b/tikzit-old/src/osx/DraggablePDFView.h deleted file mode 100644 index 9e53c44..0000000 --- a/tikzit-old/src/osx/DraggablePDFView.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// PreviewController.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import - -@interface DraggablePDFView : PDFView - -@end diff --git a/tikzit-old/src/osx/DraggablePDFView.m b/tikzit-old/src/osx/DraggablePDFView.m deleted file mode 100644 index ce393c7..0000000 --- a/tikzit-old/src/osx/DraggablePDFView.m +++ /dev/null @@ -1,60 +0,0 @@ -// -// PreviewController.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "DraggablePDFView.h" - -@implementation DraggablePDFView - -- (id)initWithFrame:(NSRect)frame -{ - self = [super initWithFrame:frame]; - return self; -} - -- (void)drawRect:(NSRect)dirtyRect -{ - [super drawRect:dirtyRect]; -} - -- (void)mouseDown:(NSEvent *)theEvent -{ - NSRect pageBox = [[[self document] pageAtIndex:0] boundsForBox:kPDFDisplayBoxMediaBox]; - NSRect pageRect= [self convertRect:pageBox fromPage:[[self document] pageAtIndex:0]]; - - NSArray *fileList = [NSArray arrayWithObjects:[[[self document] documentURL] path], nil]; - NSPasteboard *pboard = [NSPasteboard pasteboardWithName:NSDragPboard]; - [pboard declareTypes:[NSArray arrayWithObject:NSFilenamesPboardType] owner:nil]; - [pboard setPropertyList:fileList forType:NSFilenamesPboardType]; - - [self dragImage:[[NSImage alloc] initWithData:[[self document] dataRepresentation]] - at:pageRect.origin - offset:pageRect.size - event:theEvent - pasteboard:pboard - source:self - slideBack:YES]; - - return; -} - -@end diff --git a/tikzit-old/src/osx/EdgeControlLayer.h b/tikzit-old/src/osx/EdgeControlLayer.h deleted file mode 100644 index 4cdf8bc..0000000 --- a/tikzit-old/src/osx/EdgeControlLayer.h +++ /dev/null @@ -1,44 +0,0 @@ -// -// EdgeControlLayer.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import -#import "Edge.h" -#import "Transformer.h" - - -@interface EdgeControlLayer : CALayer { - Edge *edge; - Transformer *transformer; - BOOL selected; -} - -- (id)initWithEdge:(Edge*)e andTransformer:(Transformer*)t; -- (void)highlight; -- (void)unhighlight; -- (void)select; -- (void)deselect; - -+ (float)handleRadius; - -@end diff --git a/tikzit-old/src/osx/EdgeControlLayer.m b/tikzit-old/src/osx/EdgeControlLayer.m deleted file mode 100644 index facdd84..0000000 --- a/tikzit-old/src/osx/EdgeControlLayer.m +++ /dev/null @@ -1,150 +0,0 @@ -// -// EdgeControlLayer.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "EdgeControlLayer.h" -#import "util.h" - - -@implementation EdgeControlLayer - - -- (id)initWithEdge:(Edge*)e andTransformer:(Transformer*)t { - if (!(self = [super init])) return nil; - transformer = t; - edge = e; - self.opacity = 0.0f; - return self; -} - -- (void)select { - selected = YES; - self.opacity = 1.0f; -} - -- (void)deselect { - selected = NO; - self.opacity = 0.0f; -} - -- (void)highlight { - if (!selected) { - self.opacity = 0.5f; - } -} - -- (void)unhighlight { - if (!selected) { - self.opacity = 0.0f; - } -} - -- (void)drawInContext:(CGContextRef)ctx { - CGContextSaveGState(ctx); - - [edge updateControls]; - CGPoint source = NSPointToCGPoint([transformer toScreen:[[edge source] point]]); - CGPoint target = NSPointToCGPoint([transformer toScreen:[[edge target] point]]); - CGPoint mid = NSPointToCGPoint([transformer toScreen:[edge mid]]); - CGPoint cp1 = NSPointToCGPoint([transformer toScreen:[edge cp1]]); - CGPoint cp2 = NSPointToCGPoint([transformer toScreen:[edge cp2]]); - - float dx = (target.x - source.x); - float dy = (target.y - source.y); - - // draw a circle at the midpoint - CGRect mid_rect = CGRectMake(mid.x-3.0f, mid.y-3.0f, 6.0f, 6.0f); - CGContextAddEllipseInRect(ctx, mid_rect); - CGContextSetLineWidth(ctx, 1.0f); - CGContextSetRGBFillColor(ctx, 1.0f, 1.0f, 1.0f, 0.5f); - CGContextSetRGBStrokeColor(ctx, 0.0f, 0.0f, 1.0f, 0.5f); - CGContextDrawPath(ctx, kCGPathFillStroke); - - - CGContextSetShouldAntialias(ctx, YES); - - // compute size of control circles - float cdist; - if (dx == 0 && dy == 0) cdist = [transformer scaleToScreen:edge.weight]; - else cdist = sqrt(dx*dx + dy*dy) * edge.weight; - - // if basic bend, draw blue, if inout, draw green - if ([edge bendMode] == EdgeBendModeBasic) CGContextSetRGBStrokeColor(ctx, 0, 0, 1, 0.4f); - else CGContextSetRGBStrokeColor(ctx, 0, 0.7f, 0, 0.4f); - - // draw source control circle - CGRect ellipse1 = CGRectMake(source.x-cdist, source.y-cdist, cdist*2.0f, cdist*2.0f); - CGContextAddEllipseInRect(ctx, ellipse1); - if (dx!=0 || dy!=0) { - CGRect ellipse2 = CGRectMake(target.x-cdist, target.y-cdist, cdist*2.0f, cdist*2.0f); - CGContextAddEllipseInRect(ctx, ellipse2); - } - - CGContextStrokePath(ctx); - - float handleRad = [EdgeControlLayer handleRadius]; - - // handles - CGRect ctrl1 = CGRectMake(cp1.x-handleRad, cp1.y-handleRad, 2*handleRad, 2*handleRad); - CGRect ctrl2 = CGRectMake(cp2.x-handleRad, cp2.y-handleRad, 2*handleRad, 2*handleRad); - - CGContextSetRGBFillColor(ctx, 1.0f, 1.0f, 1.0f, 0.8f); - - // draw a line from source vertex to first handle - if ([edge bendMode] == EdgeBendModeInOut) { - if ([edge outAngle] % 45 == 0) CGContextSetRGBStrokeColor(ctx, 1, 0, 1, 0.6f); - else CGContextSetRGBStrokeColor(ctx, 0, 0.7f, 0, 0.4f); - } else { - if ([edge bend] % 45 == 0) CGContextSetRGBStrokeColor(ctx, 1, 0, 1, 0.6f); - else CGContextSetRGBStrokeColor(ctx, 0, 0, 1, 0.4f); - } - - CGContextMoveToPoint(ctx, source.x, source.y); - CGContextAddLineToPoint(ctx, cp1.x, cp1.y); - CGContextStrokePath(ctx); - - CGContextAddEllipseInRect(ctx, ctrl1); - CGContextDrawPath(ctx, kCGPathFillStroke); - - - // draw a line from target vertex to second handle - if ([edge bendMode] == EdgeBendModeInOut) { - if ([edge inAngle] % 45 == 0) CGContextSetRGBStrokeColor(ctx, 1, 0, 1, 0.6f); - else CGContextSetRGBStrokeColor(ctx, 0, 0.7f, 0, 0.4f); - } else { - if ([edge bend] % 45 == 0) CGContextSetRGBStrokeColor(ctx, 1, 0, 1, 0.6f); - else CGContextSetRGBStrokeColor(ctx, 0, 0, 1, 0.4f); - } - - CGContextMoveToPoint(ctx, target.x, target.y); - CGContextAddLineToPoint(ctx, cp2.x, cp2.y); - CGContextStrokePath(ctx); - - CGContextAddEllipseInRect(ctx, ctrl2); - CGContextDrawPath(ctx, kCGPathFillStroke); - - CGContextRestoreGState(ctx); -} - -+ (float)handleRadius { return 4.0f; } - -@end diff --git a/tikzit-old/src/osx/EdgeStyle+Coder.h b/tikzit-old/src/osx/EdgeStyle+Coder.h deleted file mode 100644 index e35c18f..0000000 --- a/tikzit-old/src/osx/EdgeStyle+Coder.h +++ /dev/null @@ -1,30 +0,0 @@ -// -// EdgeStyle+Coder.h -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "EdgeStyle.h" - -@interface EdgeStyle (Coder) -- (id)initWithCoder:(NSCoder*)coder; -- (void)encodeWithCoder:(NSCoder*)coder; -@end diff --git a/tikzit-old/src/osx/EdgeStyle+Coder.m b/tikzit-old/src/osx/EdgeStyle+Coder.m deleted file mode 100644 index 039344d..0000000 --- a/tikzit-old/src/osx/EdgeStyle+Coder.m +++ /dev/null @@ -1,50 +0,0 @@ -// -// EdgeStyle+Coder.m -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "EdgeStyle+Coder.h" - -@implementation EdgeStyle (Coder) - -- (id)initWithCoder:(NSCoder*)coder { - if (!(self = [super init])) return nil; - - name = [coder decodeObjectForKey:@"name"]; - category = [coder decodeObjectForKey:@"category"]; - headStyle = [coder decodeIntForKey:@"headStyle"]; - tailStyle = [coder decodeIntForKey:@"tailStyle"]; - decorationStyle = [coder decodeIntForKey:@"decorationStyle"]; - thickness = [coder decodeFloatForKey:@"thickness"]; - - return self; -} - -- (void)encodeWithCoder:(NSCoder*)coder { - [coder encodeObject:name forKey:@"name"]; - [coder encodeObject:category forKey:@"category"]; - [coder encodeInt:headStyle forKey:@"headStyle"]; - [coder encodeInt:tailStyle forKey:@"tailStyle"]; - [coder encodeInt:decorationStyle forKey:@"decorationStyle"]; - [coder encodeFloat:thickness forKey:@"thickness"]; -} - -@end diff --git a/tikzit-old/src/osx/Graph+Coder.h b/tikzit-old/src/osx/Graph+Coder.h deleted file mode 100644 index 1404fc2..0000000 --- a/tikzit-old/src/osx/Graph+Coder.h +++ /dev/null @@ -1,17 +0,0 @@ -// -// Graph+Coder.h -// TikZiT -// -// Created by Aleks Kissinger on 27/04/2010. -// Copyright 2010 __MyCompanyName__. All rights reserved. -// - -#import -#import "Graph.h" - -@interface Graph (Coder) - -- (id)initWithCoder:(NSCoder*)coder; -- (void)encodeWithCoder:(NSCoder*)coder; - -@end diff --git a/tikzit-old/src/osx/Graph+Coder.m b/tikzit-old/src/osx/Graph+Coder.m deleted file mode 100644 index 7d3787e..0000000 --- a/tikzit-old/src/osx/Graph+Coder.m +++ /dev/null @@ -1,24 +0,0 @@ -// -// Graph+Coder.m -// TikZiT -// -// Created by Aleks Kissinger on 27/04/2010. -// Copyright 2010 __MyCompanyName__. All rights reserved. -// - -#import "Graph+Coder.h" -#import "TikzGraphAssembler.h" - -@implementation Graph(Coder) - -- (id)initWithCoder:(NSCoder*)coder { - NSString *tikz = [coder decodeObject]; - [TikzGraphAssembler parseTikz:tikz forGraph:self]; - return self; -} - -- (void)encodeWithCoder:(NSCoder*)coder { - [coder encodeObject:[self tikz]]; -} - -@end diff --git a/tikzit-old/src/osx/GraphicsView.h b/tikzit-old/src/osx/GraphicsView.h deleted file mode 100644 index 329b1e5..0000000 --- a/tikzit-old/src/osx/GraphicsView.h +++ /dev/null @@ -1,129 +0,0 @@ -// -// GraphicsView.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import -#import "PickSupport.h" -#import "Grid.h" -#import "Transformer.h" -#import "Graph.h" -#import "NodeStyle.h" -#import "StylePaletteController.h" -#import "ToolPaletteController.h" -#import "SelectBoxLayer.h" - -// mouse modes, corresponding to different tools. format: (tool)[sub-mode]Mode -typedef enum { - SelectMode = 0x10, - SelectBoxMode = 0x11, - SelectMoveMode = 0x12, - SelectEdgeBendMode = 0x14, - - NodeMode = 0x20, - - EdgeMode = 0x40, - EdgeDragMode = 0x41, - - CropMode = 0x80, - CropDragMode = 0x81 -} MouseMode; - -@class TikzSourceController; - -@interface GraphicsView : NSView { - BOOL enabled; - - IBOutlet NSApplication *application; - StylePaletteController *stylePaletteController; - ToolPaletteController *toolPaletteController; - - BOOL frameMoveMode; - - Graph *graph; - NSString *graphTikzOnMouseDown; - PickSupport *pickSupport; - //NSMapTable *nodeSelectionLayers; - NSMapTable *edgeControlLayers; - NSMapTable *nodeLayers; - NSPoint dragOrigin; - NSPoint dragTarget; - NSPoint oldTransformerOrigin; - NSPoint oldMainOrigin; - NSRect oldBounds; - //NSRect selectionBox; - Transformer *transformer; - - CALayer *mainLayer; - CALayer *gridLayer; - CALayer *graphLayer; - CALayer *hudLayer; - SelectBoxLayer *selectionLayer; - - MouseMode mouseMode; - Node *leaderNode; - Grid *grid; - - Edge *modifyEdge; - BOOL firstControlPoint; - - int bboxLeftRight; - int bboxBottomTop; - - NSUndoManager *documentUndoManager; - NSPoint startPoint; - - TikzSourceController *tikzSourceController; -} - -@property BOOL enabled; -@property (weak) Graph *graph; -@property IBOutlet TikzSourceController *tikzSourceController; -@property (readonly) Transformer *transformer; -@property (readonly) PickSupport *pickSupport; - -- (void)setDocumentUndoManager:(NSUndoManager*)um; -- (void)applyStyleToSelectedNodes:(NodeStyle*)style; -- (void)applyStyleToSelectedEdges:(EdgeStyle*)style; - -- (void)updateMouseMode; -- (void)refreshLayers; - -//- (void)registerUndo:(GraphChange *)change withActionName:(NSString*)name; -- (void)registerUndo:(NSString*)oldTikz withActionName:(NSString*)name; -//- (void)undoGraphChange:(GraphChange *)change; -- (void)undoGraphChange:(NSString*)oldTikz; -- (void)postGraphChange; -- (void)postSelectionChange; - -- (void)deselectAll:(id)sender; -- (void)selectAll:(id)sender; -- (void)cut:(id)sender; -- (void)copy:(id)sender; -- (void)paste:(id)sender; -- (void)delete:(id)sender; -- (void)bringForward:(id)sender; -- (void)flipHorizonal:(id)sender; -- (void)flipVertical:(id)sender; -- (void)reverseEdgeDirection:(id)sender; - -@end diff --git a/tikzit-old/src/osx/GraphicsView.m b/tikzit-old/src/osx/GraphicsView.m deleted file mode 100644 index efa7ecb..0000000 --- a/tikzit-old/src/osx/GraphicsView.m +++ /dev/null @@ -1,1216 +0,0 @@ -// -// GraphicsView.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "GraphicsView.h" -#import "util.h" -#import "CALayer+DrawLabel.h" - -#import "NodeSelectionLayer.h" -#import "NodeLayer.h" -#import "EdgeControlLayer.h" -#import "AppDelegate.h" -#import "TikzGraphAssembler.h" -#import "TikzSourceController.h" - -@interface GraphicsView (Private) -- (void)setupLayers; -- (void)addNodeLayers:(Node*)n; -- (void)addEdgeLayers:(Edge*)e; -- (void)removeNodeLayers:(Node*)n; -- (void)resetMainOrigin; -- (void)setMainOrigin:(NSPoint)o; -@end - -static CGColorRef cgGrayColor, cgWhiteColor, cgClearColor = nil; - - -@implementation GraphicsView - -@synthesize enabled, transformer, pickSupport, tikzSourceController; - -- (void)postGraphChange { - [[NSNotificationCenter defaultCenter] postNotificationName:@"GraphChanged" - object:self]; - [self postSelectionChange]; -} - -- (void)postSelectionChange { - [[NSNotificationCenter defaultCenter] postNotificationName:@"SelectionChanged" - object:self]; -} - -- (id)initWithFrame:(NSRect)frame { - self = [super initWithFrame:frame]; - if (self) { - if (cgClearColor == nil) { - cgClearColor = CGColorGetConstantColor(kCGColorClear); - cgGrayColor = CGColorCreateGenericGray(0.5f, 0.5f); - cgWhiteColor = CGColorCreateGenericRGB(1, 1, 1, 1); - } - - transformer = [[Transformer alloc] init]; - mouseMode = SelectMode; - grid = [Grid gridWithSpacing:1.0f - subdivisions:4 - transformer:transformer]; - [grid setSize:NSSizeFromCGSize([gridLayer bounds].size)]; - [transformer setScale:PIXELS_PER_UNIT]; - - [self setupLayers]; - - leaderNode = nil; - pickSupport = [[PickSupport alloc] init]; - frameMoveMode = NO; - - enabled = YES; - [self setGraph:[Graph graph]]; - } - return self; -} - -- (void)awakeFromNib { - AppDelegate *del = [application delegate]; - stylePaletteController = [del stylePaletteController]; - toolPaletteController = [del toolPaletteController]; - [self refreshLayers]; - [self postGraphChange]; -} - -- (void)setupLayers { - mainLayer = [CALayer layer]; - [mainLayer setBackgroundColor:cgWhiteColor]; - [mainLayer setFrame:CGRectIntegral(NSRectToCGRect([self bounds]))]; - [mainLayer setOpacity:1.0f]; - [self setLayer:mainLayer]; - [self resetMainOrigin]; - - gridLayer = [CALayer layer]; - [gridLayer setDelegate:grid]; - [gridLayer setOpacity:0.3f]; - [mainLayer addSublayer:gridLayer]; - - graphLayer = [CALayer layer]; - [graphLayer setDelegate:self]; - [mainLayer addSublayer:graphLayer]; - - hudLayer = [CALayer layer]; - [mainLayer addSublayer:hudLayer]; - - selectionLayer = [SelectBoxLayer layer]; - [mainLayer addSublayer:selectionLayer]; - - [transformer setOrigin:NSMakePoint(NSMidX([self bounds]),NSMidY([self bounds]))]; - oldBounds = [self bounds]; - [self refreshLayers]; -} - -// Lion resume feature -//- (void)encodeRestorableStateWithCoder:(NSCoder*)coder { -// NSLog(@"got encode request"); -//} -//- (void)restoreStateWithCoder:(NSCoder*)coder { -// NSLog(@"got decode request"); -//} - -- (void)registerUndo:(NSString*)oldTikz withActionName:(NSString*)nm { - [documentUndoManager registerUndoWithTarget:self - selector:@selector(undoGraphChange:) - object:oldTikz]; - [documentUndoManager setActionName:nm]; -} - -- (void)revertToTikz:(NSString*)tikz { - [tikzSourceController setTikz:tikz]; - [tikzSourceController tryParseTikz]; - [self refreshLayers]; - [self postGraphChange]; -} - - -- (void)undoGraphChange:(NSString*)oldTikz { - NSString *currentTikz = [graph tikz]; - [self revertToTikz:oldTikz]; - [documentUndoManager registerUndoWithTarget:self - selector:@selector(undoGraphChange:) - object:currentTikz]; -} - -- (void)setGraph:(Graph*)gr { - graph = gr; - - NSEnumerator *e; - CALayer *layer; - - e = [edgeControlLayers objectEnumerator]; - while (layer = [e nextObject]) [layer removeFromSuperlayer]; - edgeControlLayers = [NSMapTable mapTableWithStrongToStrongObjects]; - - - e = [nodeLayers objectEnumerator]; - while (layer = [e nextObject]) [layer removeFromSuperlayer]; - nodeLayers = [NSMapTable mapTableWithStrongToStrongObjects]; - - for (Node *n in [graph nodes]) { - [n attachStyleFromTable:[stylePaletteController nodeStyles]]; - [self addNodeLayers:n]; - } - - for (Edge *e in [graph edges]) { - [e setAttributesFromData]; - [e attachStyleFromTable:[stylePaletteController edgeStyles]]; - [self addEdgeLayers:e]; - } -} - -- (Graph*)graph { return graph; } - -- (void)setMainOrigin:(NSPoint)o { - o.x = round(o.x); - o.y = round(o.y); - CGRect rect = [mainLayer frame]; - rect.origin = NSPointToCGPoint(o); - [mainLayer setFrame:rect]; -} - -- (void)resetMainOrigin { - NSRect bds = [self bounds]; - bds.origin.x -= bds.size.width; - bds.origin.y -= bds.size.height; - bds.size.width *= 3; - bds.size.height *= 3; - [mainLayer setFrame:NSRectToCGRect([self bounds])]; -} - -- (void)refreshLayers { - [gridLayer setFrame:[mainLayer frame]]; - [graphLayer setFrame:[mainLayer frame]]; - [hudLayer setFrame:[mainLayer frame]]; - [selectionLayer setFrame:[mainLayer frame]]; - - if (enabled) { - [hudLayer setBackgroundColor:cgClearColor]; - } else { - [hudLayer setBackgroundColor:cgGrayColor]; - } - - [grid setSize:NSSizeFromCGSize([gridLayer bounds].size)]; - [gridLayer setNeedsDisplay]; - [graphLayer setNeedsDisplay]; - [hudLayer setNeedsDisplay]; - - NSEnumerator *e = [edgeControlLayers objectEnumerator]; - CALayer *layer; - while (layer = [e nextObject]) { - [layer setFrame:[graphLayer frame]]; - [layer setNeedsDisplay]; - } -} - - -- (void)viewDidEndLiveResize { - [super viewDidEndLiveResize]; - NSPoint o = [transformer origin]; - o.x += round(([self bounds].size.width - oldBounds.size.width)/2.0f); - o.y += round(([self bounds].size.height - oldBounds.size.height)/2.0f); - [transformer setOrigin:o]; - oldBounds = [self bounds]; - [self refreshLayers]; -} - -- (void)applyStyleToSelectedNodes:(NodeStyle*)style { - NSString *oldTikz = [graph tikz]; - - for (Node *n in [pickSupport selectedNodes]) { - [n setStyle:style]; - [[nodeLayers objectForKey:n] setNeedsDisplay]; - } - - [self registerUndo:oldTikz withActionName:@"Apply Style to Nodes"]; - [self refreshLayers]; - [self postGraphChange]; -} - -- (void)applyStyleToSelectedEdges:(EdgeStyle*)style { - NSString *oldTikz = [graph tikz]; - - for (Edge *e in [pickSupport selectedEdges]) { - [e setStyle:style]; - } - - [self registerUndo:oldTikz withActionName:@"Apply Style to Edges"]; - [self refreshLayers]; - [self postGraphChange]; -} - -- (void)addNodeLayers:(Node*)n { - // add a node to the graph - [graph addNode:n]; - - NSPoint pt = [transformer toScreen:[n point]]; - - // add a node layer - NodeLayer *nl = [[NodeLayer alloc] initWithNode:n transformer:transformer]; - [nl setCenter:pt]; - [nodeLayers setObject:nl forKey:n]; - [graphLayer addSublayer:nl]; - [nl setNeedsDisplay]; -} - -- (void)removeNodeLayers:(Node*)n { - [[nodeLayers objectForKey:n] removeFromSuperlayer]; - [nodeLayers removeObjectForKey:n]; -} - -- (void)addEdgeLayers:(Edge *)e { - [graph addEdge:e]; - EdgeControlLayer *ecl = [[EdgeControlLayer alloc] initWithEdge:e andTransformer:transformer]; - [edgeControlLayers setObject:ecl forKey:e]; - [ecl setFrame:CGRectMake(10, 10, 100, 100)]; - [hudLayer addSublayer:ecl]; - [ecl setNeedsDisplay]; -} - -- (void)removeEdgeLayers:(Edge*)e { - [[edgeControlLayers objectForKey:e] removeFromSuperlayer]; - [edgeControlLayers removeObjectForKey:e]; - [self refreshLayers]; -} - -- (BOOL)circleWithCenter:(NSPoint)center andRadius:(float)radius containsPoint:(NSPoint)p { - float dx = center.x - p.x; - float dy = center.y - p.y; - return (dx*dx + dy*dy) <= radius*radius; -} - -- (BOOL)node:(Node*)node containsPoint:(NSPoint)p { - NodeLayer *nl = [nodeLayers objectForKey:node]; - return [nl nodeContainsPoint:p]; -} - -- (BOOL)edge:(Edge*)edge containsPoint:(NSPoint)p { -// NSPoint center = [transformer toScreen:edge.mid]; -// float dx = center.x - p.x; -// float dy = center.y - p.y; -// float radius = 5.0f; // tolerence for clicks -// return (dx*dx + dy*dy) <= radius*radius; - - CGContextRef ctx = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort]; - - // Save the graphics state before doing the hit detection. - CGContextSaveGState(ctx); - - NSPoint src = [transformer toScreen:[edge tail]]; - NSPoint targ = [transformer toScreen:[edge head]]; - NSPoint cp1 = [transformer toScreen:[edge cp1]]; - NSPoint cp2 = [transformer toScreen:[edge cp2]]; - - CGContextSetLineWidth(ctx, 8.0f); - - CGContextMoveToPoint(ctx, src.x, src.y); - CGContextAddCurveToPoint(ctx, cp1.x, cp1.y, cp2.x, cp2.y, targ.x, targ.y); - - BOOL containsPoint = CGContextPathContainsPoint(ctx, NSPointToCGPoint(p), kCGPathStroke); - - CGContextSetRGBStrokeColor(ctx, 0, 0, 0, 0); - - CGContextStrokePath(ctx); - //CGContextFlush(ctx); - CGContextRestoreGState(ctx); - - return containsPoint; -} - -- (void)shiftNodes:(NSSet*)set from:(NSPoint)source to:(NSPoint)dest { - float dx = dest.x - source.x; - float dy = dest.y - source.y; - - for (Node *n in set) { - NSPoint p = [transformer toScreen:[n point]]; - p = [grid snapScreenPoint:NSMakePoint(p.x+dx, p.y+dy)]; - [n setPoint:[transformer fromScreen:p]]; - } -} - - -- (void)mouseDown:(NSEvent*)theEvent { - if (!enabled) return; - - [self updateMouseMode]; - - dragOrigin = [self convertPoint:[theEvent locationInWindow] fromView:nil]; - dragTarget = dragOrigin; - - graphTikzOnMouseDown = [graph tikz]; - - if ([theEvent modifierFlags] & NSCommandKeyMask) { - oldTransformerOrigin = [transformer origin]; - oldMainOrigin = [self frame].origin; - frameMoveMode = YES; - return; - } - - if (mouseMode == SelectMode) { - [selectionLayer setActive:YES]; - [selectionLayer setSelectBox:NSRectAroundPoints(dragOrigin, dragOrigin)]; - [selectionLayer setNeedsDisplay]; - - modifyEdge = nil; - NSPoint cp1, cp2; - for (Edge *e in [pickSupport selectedEdges]) { - cp1 = [transformer toScreen:[e cp1]]; - cp2 = [transformer toScreen:[e cp2]]; - if ([self circleWithCenter:cp1 - andRadius:[EdgeControlLayer handleRadius] - containsPoint:dragOrigin]) - { - mouseMode = SelectEdgeBendMode; - modifyEdge = e; - firstControlPoint = YES; - break; - } else if ([self circleWithCenter:cp2 - andRadius:[EdgeControlLayer handleRadius] - containsPoint:dragOrigin]) - { - mouseMode = SelectEdgeBendMode; - modifyEdge = e; - firstControlPoint = NO; - break; - } - } - - if (modifyEdge == nil) { // skip all the rest if we're modifying an edge - - leaderNode = nil; - - // in first pass, try to find a leader node, under the mouse - for (Node* n in [graph nodes]) { - if ([self node:n containsPoint:dragOrigin]) { - leaderNode = n; - [gridLayer setOpacity:1.0f]; - break; - } - } - - // if we found one, deselect the others (if appropriate) and go to move mode - if (leaderNode != nil) { - startPoint = [leaderNode point]; - - // if we select a node, we should always deselect all edges: - for (Edge *e in [graph edges]) [[edgeControlLayers objectForKey:e] deselect]; - [pickSupport deselectAllEdges]; - - BOOL shouldDeselect = - !([theEvent modifierFlags] & NSShiftKeyMask) - && ![pickSupport isNodeSelected:leaderNode]; - for (Node *n in [graph nodes]) { - if (n != leaderNode && shouldDeselect) { - [pickSupport deselectNode:n]; - [[[nodeLayers objectForKey:n] selection] deselect]; - } - } - - // ensure the leader node is actually selected - if (![pickSupport isNodeSelected:leaderNode]) { - [pickSupport selectNode:leaderNode]; - [[[nodeLayers objectForKey:leaderNode] selection] select]; - } - - - // put us in move mode - mouseMode = SelectMoveMode; - } else { - mouseMode = SelectBoxMode; - - // if we didn't select a node, start hunting for an edge to select - BOOL shouldDeselect = !([theEvent modifierFlags] & NSShiftKeyMask); - - if (shouldDeselect) { - [pickSupport deselectAllEdges]; - for (Edge *e in graph.edges) [[edgeControlLayers objectForKey:e] deselect]; - } - - for (Edge* e in [graph edges]) { - // find the first node under the pointer, select it, show its controls - // and deselect all others if shift isn't down - if ([self edge:e containsPoint:dragOrigin]) { - for (Node *n in [pickSupport selectedNodes]) [[[nodeLayers objectForKey:n] selection] deselect]; - - [pickSupport deselectAllNodes]; - [pickSupport selectEdge:e]; - [[edgeControlLayers objectForKey:e] select]; - break; - } - } // end for e in [graph edges] - } // end if leaderNode == nil - } // end if modifyEdge == nil - - } else if (mouseMode == NodeMode) { - // do nothing... - } else if (mouseMode == EdgeMode) { - for (Node *n in [graph nodes]) { - if ([self node:n containsPoint:dragOrigin]) { - [[[nodeLayers objectForKey:n] selection] highlight]; - } - } - mouseMode = EdgeDragMode; - } else if (mouseMode == CropMode) { - if ([graph hasBoundingBox]) { - float fudge = 3; - - NSRect bb = [graph boundingBox]; - NSPoint bl = [transformer toScreen:bb.origin]; - NSPoint tr = [transformer - toScreen:NSMakePoint(bb.origin.x+bb.size.width, - bb.origin.y+bb.size.height)]; - if (dragOrigin.x > bl.x-fudge && dragOrigin.x < tr.x+fudge && - dragOrigin.y > tr.y-fudge && dragOrigin.y < tr.y+fudge) - { - bboxBottomTop = 1; - } else if (dragOrigin.x > bl.x-fudge && dragOrigin.x < tr.x+fudge && - dragOrigin.y > bl.y-fudge && dragOrigin.y < bl.y+fudge) - { - bboxBottomTop = -1; - } else { - bboxBottomTop = 0; - } - - if (dragOrigin.y > bl.y-fudge && dragOrigin.y < tr.y+fudge && - dragOrigin.x > tr.x-fudge && dragOrigin.x < tr.x+fudge) - { - bboxLeftRight = 1; - } else if (dragOrigin.y > bl.y-fudge && dragOrigin.y < tr.y+fudge && - dragOrigin.x > bl.x-fudge && dragOrigin.x < bl.x+fudge) - { - bboxLeftRight = -1; - } else { - bboxLeftRight = 0; - } - - if (bboxBottomTop != 0 || bboxLeftRight != 0) { - mouseMode = CropDragMode; - } - } - } else { - printf("WARNING: MOUSE DOWN IN INVALID MODE.\n"); - } - - [self refreshLayers]; -} - -- (void)mouseDragged:(NSEvent *)theEvent { - if (!enabled) return; - dragTarget = [self convertPoint:[theEvent locationInWindow] fromView:nil]; - - if (frameMoveMode) { - NSPoint newTransOrigin, newMainOrigin; - NSPoint diff = NSMakePoint(dragTarget.x - dragOrigin.x, dragTarget.y - dragOrigin.y); - newTransOrigin.x = oldTransformerOrigin.x + diff.x; - newTransOrigin.y = oldTransformerOrigin.y + diff.y; - newMainOrigin.x = oldMainOrigin.x + diff.x; - newMainOrigin.y = oldMainOrigin.y + diff.y; - - [CATransaction begin]; - [CATransaction setValue:(id)kCFBooleanTrue forKey:kCATransactionDisableActions]; - [self setMainOrigin:newMainOrigin]; - [CATransaction commit]; - - [transformer setOrigin:newTransOrigin]; - return; - } - - if (mouseMode == SelectBoxMode) { - [selectionLayer setSelectBox:NSRectAroundPoints(dragOrigin, dragTarget)]; - [selectionLayer setNeedsDisplay]; - - for (Node* n in [graph nodes]) { - if (NSPointInRect([transformer toScreen:[n point]], [selectionLayer selectBox])) { - [[[nodeLayers objectForKey:n] selection] highlight]; - } else if (!([theEvent modifierFlags] & NSShiftKeyMask)) { - [[[nodeLayers objectForKey:n] selection] unhighlight]; - } - } - } else if (mouseMode == SelectMoveMode) { - if (leaderNode != nil) { - [self shiftNodes:[pickSupport selectedNodes] - from:[transformer toScreen:[leaderNode point]] - to:dragTarget]; - } else { - printf("WARNING: LEADER NODE SHOULD NOT BE NIL.\n"); - } - - [self refreshLayers]; - } else if (mouseMode == SelectEdgeBendMode) { - NSPoint src = [transformer toScreen:[[modifyEdge source] point]]; - NSPoint targ = [transformer toScreen:[[modifyEdge target] point]]; - float dx1 = targ.x - src.x; - float dy1 = targ.y - src.y; - float dx2, dy2; - if (firstControlPoint) { - dx2 = dragTarget.x - src.x; - dy2 = dragTarget.y - src.y; - } else { - dx2 = dragTarget.x - targ.x; - dy2 = dragTarget.y - targ.y; - } - float base_dist = sqrt(dx1*dx1 + dy1*dy1); - float handle_dist = sqrt(dx2*dx2 + dy2*dy2); - float wcourseness = 0.1f; - - if (![modifyEdge isSelfLoop]) { - if (base_dist != 0) { - [modifyEdge setWeight:roundToNearest(wcourseness, handle_dist/base_dist)]; - //round(handle_dist / (base_dist*wcourseness)) * wcourseness; - } else { - [modifyEdge setWeight: - roundToNearest(wcourseness, [transformer scaleFromScreen:handle_dist])]; - } - } - - - float control_angle = good_atan(dx2, dy2); - - int bcourseness = 15; - - if ([modifyEdge bendMode] == EdgeBendModeBasic) { - float bnd; - float base_angle = good_atan(dx1, dy1); - if (firstControlPoint) { - bnd = base_angle - control_angle; - } else { - bnd = control_angle - base_angle + pi; - if (bnd > pi) bnd -= 2*pi; - } - - [modifyEdge setBend:round(bnd * (180.0f / pi) * - (1.0f / (float)bcourseness)) * - bcourseness]; - } else { - int bnd = round(control_angle * (180.0f / pi) * - (1.0f / (float)bcourseness)) * - bcourseness; - if (firstControlPoint) { - if ([theEvent modifierFlags] & NSAlternateKeyMask) { - if ([modifyEdge isSelfLoop]) { - [modifyEdge setInAngle:[modifyEdge inAngle] + - (bnd - [modifyEdge outAngle])]; - } else { - [modifyEdge setInAngle:[modifyEdge inAngle] - - (bnd - [modifyEdge outAngle])]; - } - } - - [modifyEdge setOutAngle:bnd]; - } else { - if (theEvent.modifierFlags & NSAlternateKeyMask) { - if ([modifyEdge isSelfLoop]) { - [modifyEdge setOutAngle:[modifyEdge outAngle] + - (bnd - [modifyEdge inAngle])]; - } else { - [modifyEdge setOutAngle:[modifyEdge outAngle] - - (bnd - [modifyEdge inAngle])]; - } - } - - [modifyEdge setInAngle:bnd]; - } - } - - [self refreshLayers]; - } else if (mouseMode == NodeMode) { - // do nothing... - } else if (mouseMode == EdgeDragMode) { - for (Node *n in [graph nodes]) { - if ([self node:n containsPoint:dragOrigin] || - [self node:n containsPoint:dragTarget]) - { - [[[nodeLayers objectForKey:n] selection] highlight]; - } else { - [[[nodeLayers objectForKey:n] selection] unhighlight]; - } - } - - [self refreshLayers]; - } else if (mouseMode == CropMode || mouseMode == CropDragMode) { - NSPoint p1 = [transformer fromScreen:[grid snapScreenPoint:dragOrigin]]; - NSPoint p2 = [transformer fromScreen:[grid snapScreenPoint:dragTarget]]; - - NSRect bbox; - if (mouseMode == CropDragMode) { - bbox = [graph boundingBox]; - if (bboxBottomTop == -1) { - float dy = p2.y - bbox.origin.y; - bbox.origin.y += dy; - bbox.size.height -= dy; - } else if (bboxBottomTop == 1) { - float dy = p2.y - (bbox.origin.y + bbox.size.height); - bbox.size.height += dy; - } - - if (bboxLeftRight == -1) { - float dx = p2.x - bbox.origin.x; - bbox.origin.x += dx; - bbox.size.width -= dx; - } else if (bboxLeftRight == 1) { - float dx = p2.x - (bbox.origin.x + bbox.size.width); - bbox.size.width += dx; - } - } else { - bbox = NSRectAroundPoints(p1, p2); - } - - [graph setBoundingBox:bbox]; - [self postGraphChange]; - [self refreshLayers]; - } else { - printf("WARNING: MOUSE DRAGGED IN INVALID MODE.\n"); - } -} - -- (void)mouseUp:(NSEvent*)theEvent { - if (!enabled) return; - - if (frameMoveMode) { - [CATransaction begin]; - [CATransaction setValue:(id)kCFBooleanTrue forKey:kCATransactionDisableActions]; - [self resetMainOrigin]; - [self refreshLayers]; - [CATransaction commit]; - frameMoveMode = NO; - return; - } - - dragTarget = [self convertPoint:[theEvent locationInWindow] fromView:nil]; - - if ((mouseMode & SelectMode) == SelectMode && [theEvent clickCount] == 2) { - for (Edge *e in [graph edges]) { - if ([self edge:e containsPoint:dragTarget]) { - if ([e bendMode] == EdgeBendModeBasic) { - [e convertBendToAngles]; - [e setBendMode:EdgeBendModeInOut]; - } else { - [e convertAnglesToBend]; - [e setBendMode:EdgeBendModeBasic]; - } - - [self registerUndo:graphTikzOnMouseDown withActionName:@"Change Edge Mode"]; - [self postGraphChange]; - break; - } - } - } - - if (mouseMode == SelectBoxMode) { - for (Node* n in [graph nodes]) { - if (NSPointInRect([transformer toScreen:[n point]], [selectionLayer selectBox])) { - [pickSupport selectNode:n]; - [[[nodeLayers objectForKey:n] selection] select]; - } else if (!([theEvent modifierFlags] & NSShiftKeyMask)) { - [pickSupport deselectNode:n]; - [[[nodeLayers objectForKey:n] selection] deselect]; - } - } - - [selectionLayer setActive:NO]; - [selectionLayer setNeedsDisplay]; - [self postSelectionChange]; - - mouseMode = SelectMode; - } else if (mouseMode == SelectMoveMode) { - [gridLayer setOpacity:0.3f]; - - if (dragTarget.x != dragOrigin.x || dragTarget.y != dragOrigin.y) { - [self registerUndo:graphTikzOnMouseDown withActionName:@"Shift Nodes"]; - } - - leaderNode = nil; - - [self postGraphChange]; - mouseMode = SelectMode; - } else if (mouseMode == SelectEdgeBendMode) { - [self registerUndo:graphTikzOnMouseDown withActionName:@"Adjust Edge"]; - [self postGraphChange]; - mouseMode = SelectMode; - modifyEdge = nil; - } else if (mouseMode == NodeMode) { - NSPoint coords = [transformer fromScreen:[grid snapScreenPoint:dragTarget]]; - Node *n = [Node nodeWithPoint:coords]; - [n setStyle:[stylePaletteController activeNodeStyle]]; - [graph addNode:n]; - - [self registerUndo:graphTikzOnMouseDown withActionName:@"Add Node"]; - - [self addNodeLayers:n]; - [self postGraphChange]; - } else if (mouseMode == EdgeDragMode) { - Node *src = nil; - Node *targ = nil; - BOOL found = NO; // don't break the loop until everything is unhighlighted - for (Node *n in [graph nodes]) { - [[[nodeLayers objectForKey:n] selection] unhighlight]; - if (!found) { - if ([self node:n containsPoint:dragOrigin]) src = n; - if ([self node:n containsPoint:dragTarget]) targ = n; - if (src != nil && targ != nil) { - Edge *e = [Edge edgeWithSource:src andTarget:targ]; - [e setStyle:[stylePaletteController activeEdgeStyle]]; - [graph addEdge:e]; - [self registerUndo:graphTikzOnMouseDown withActionName:@"Add Edge"]; - [self addEdgeLayers:e]; - found = YES; - } - } - } - - [self postGraphChange]; - mouseMode = EdgeMode; - } else if (mouseMode == CropMode || mouseMode == CropDragMode) { - if (dragOrigin.x == dragTarget.x && dragOrigin.y == dragTarget.y) { - [graph setBoundingBox:NSMakeRect(0, 0, 0, 0)]; - [self registerUndo:graphTikzOnMouseDown withActionName:@"Clear Bounding Box"]; - [self postGraphChange]; - } else { - [self registerUndo:graphTikzOnMouseDown withActionName:@"Change Bounding Box"]; - } - - mouseMode = CropMode; - } else { - if (! ([theEvent modifierFlags] & NSCommandKeyMask)) - printf("WARNING: MOUSE UP IN INVALID MODE.\n"); - } - - [self refreshLayers]; -} - -- (void)drawNode:(Node*)nd onLayer:(CALayer*)layer inContext:(CGContextRef)context { - NSPoint pt = [transformer toScreen:[nd point]]; - - NodeLayer *nl = [nodeLayers objectForKey:nd]; - //[nl setStrokeWidth:2.0f]; - [nl setCenter:pt andAnimateWhen:(mouseMode != SelectMoveMode)]; -} - -- (void)drawEdge:(Edge*)e onLayer:(CALayer*)layer inContext:(CGContextRef)context { - CGContextSaveGState(context); - NSPoint src = [transformer toScreen:[e tail]]; - NSPoint targ = [transformer toScreen:[e head]]; - NSPoint cp1 = [transformer toScreen:[e cp1]]; - NSPoint cp2 = [transformer toScreen:[e cp2]]; - - // all nodes have the same radius. this will need to be fixed - float sradius = 0;//(slayer.ghost) ? 0 : slayer.radius; - float tradius = 0;//(tlayer.ghost) ? 0 : tlayer.radius; - - float sdx = cp1.x - src.x; - float sdy = cp1.y - src.y; - float sdist = sqrt(sdx*sdx + sdy*sdy); - float sshortx = (sdist==0) ? 0 : sdx/sdist * sradius; - float sshorty = (sdist==0) ? 0 : sdy/sdist * sradius; - - float tdx = cp2.x - targ.x; - float tdy = cp2.y - targ.y; - float tdist = sqrt(tdx*tdx + tdy*tdy); - float tshortx = (tdist==0) ? 0 : tdx/tdist * tradius; - float tshorty = (tdist==0) ? 0 : tdy/tdist * tradius; - - CGContextMoveToPoint(context, src.x+sshortx, src.y+sshorty); - CGContextAddCurveToPoint(context, cp1.x, cp1.y, cp2.x, cp2.y, targ.x+tshortx, targ.y+tshorty); - - - float lineWidth = [transformer scaleToScreen:0.04f]; - - CGContextSetLineWidth(context, lineWidth); - CGContextSetRGBStrokeColor(context, 0, 0, 0, 1); - CGContextSetRGBFillColor(context, 0, 0, 0, 1); - CGContextStrokePath(context); - - if ([e style] != nil) { - NSPoint p1,p2,p3; - - // draw edge decoration - switch ([[e style] decorationStyle]) { - case ED_None: - break; - case ED_Tick: - p1 = [transformer toScreen:[e leftNormal]]; - p2 = [transformer toScreen:[e rightNormal]]; - CGContextMoveToPoint(context, p1.x, p1.y); - CGContextAddLineToPoint(context, p2.x, p2.y); - CGContextStrokePath(context); - break; - case ED_Arrow: - p1 = [transformer toScreen:[e leftNormal]]; - p2 = [transformer toScreen:[e midTan]]; - p3 = [transformer toScreen:[e rightNormal]]; - CGContextMoveToPoint(context, p1.x, p1.y); - CGContextAddLineToPoint(context, p2.x, p2.y); - CGContextAddLineToPoint(context, p3.x, p3.y); - CGContextStrokePath(context); - break; - } - - // draw arrow head - switch ([[e style] headStyle]) { - case AH_None: - break; - case AH_Plain: - p1 = [transformer toScreen:[e leftHeadNormal]]; - p2 = [transformer toScreen:[e head]]; - p3 = [transformer toScreen:[e rightHeadNormal]]; - CGContextMoveToPoint(context, p1.x, p1.y); - CGContextAddLineToPoint(context, p2.x, p2.y); - CGContextAddLineToPoint(context, p3.x, p3.y); - CGContextStrokePath(context); - break; - case AH_Latex: - p1 = [transformer toScreen:[e leftHeadNormal]]; - p2 = [transformer toScreen:[e head]]; - p3 = [transformer toScreen:[e rightHeadNormal]]; - CGContextMoveToPoint(context, p1.x, p1.y); - CGContextAddLineToPoint(context, p2.x, p2.y); - CGContextAddLineToPoint(context, p3.x, p3.y); - CGContextClosePath(context); - CGContextFillPath(context); - break; - } - - // draw arrow tail - switch ([[e style] tailStyle]) { - case AH_None: - break; - case AH_Plain: - p1 = [transformer toScreen:[e leftTailNormal]]; - p2 = [transformer toScreen:[e tail]]; - p3 = [transformer toScreen:[e rightTailNormal]]; - CGContextMoveToPoint(context, p1.x, p1.y); - CGContextAddLineToPoint(context, p2.x, p2.y); - CGContextAddLineToPoint(context, p3.x, p3.y); - CGContextStrokePath(context); - break; - case AH_Latex: - p1 = [transformer toScreen:[e leftTailNormal]]; - p2 = [transformer toScreen:[e tail]]; - p3 = [transformer toScreen:[e rightTailNormal]]; - CGContextMoveToPoint(context, p1.x, p1.y); - CGContextAddLineToPoint(context, p2.x, p2.y); - CGContextAddLineToPoint(context, p3.x, p3.y); - CGContextClosePath(context); - CGContextFillPath(context); - break; - } - } - - - CGContextRestoreGState(context); - - if ([e hasEdgeNode]) { - Node *en = [e edgeNode]; - NSPoint mid = [transformer toScreen:[e mid]]; - if (![[en label] isEqual:@""]) { - [layer drawLabel:[en label] - atPoint:mid - inContext:context - usingTrans:transformer]; - } - } - - EdgeControlLayer *ecl = [edgeControlLayers objectForKey:e]; - [ecl setNeedsDisplay]; -} - - -// draw the graph layer --(void)drawLayer:(CALayer *)layer inContext:(CGContextRef)context { - for (Edge* e in [graph edges]) [self drawEdge:e onLayer:layer inContext:context]; - - for (Node* n in [graph nodes]) [self drawNode:n onLayer:layer inContext:context]; - - if ([graph hasBoundingBox]) { - CGRect bbox = NSRectToCGRect(NSIntegralRect( - [transformer rectToScreen:[graph boundingBox]])); - CGContextSetRGBStrokeColor(context, 1.0f, 0.7f, 0.5f, 1.0f); - CGContextSetLineWidth(context, 1.0f); - CGContextSetShouldAntialias(context, NO); - CGContextStrokeRect(context, bbox); - CGContextSetShouldAntialias(context, YES); - } - - if (mouseMode == EdgeDragMode) { - CGContextMoveToPoint(context, dragOrigin.x, dragOrigin.y); - CGContextAddLineToPoint(context, dragTarget.x, dragTarget.y); - CGContextSetLineWidth(context, 2); - CGContextSetRGBStrokeColor(context, 0, 0, 1, 1); - CGContextStrokePath(context); - } -} - -// if enabled, suppress the default "bonk" behaviour on key presses -- (void)keyDown:(NSEvent *)theEvent { - if (!enabled) [super keyDown:theEvent]; -} - -- (void)delete:(id)sender { - BOOL didDelete = NO; - NSString *oldTikz = [graph tikz]; - - if ([[pickSupport selectedNodes] count] != 0) { - GraphChange *change = [graph removeNodes:[pickSupport selectedNodes]]; - for (Node *n in [change affectedNodes]) [self removeNodeLayers:n]; - for (Edge *e in [change affectedEdges]) [self removeEdgeLayers:e]; - - [self refreshLayers]; - [self postGraphChange]; - didDelete = YES; - } - - if ([[pickSupport selectedEdges] count] != 0) { - [graph removeEdges:[pickSupport selectedEdges]]; - for (Edge *e in [pickSupport selectedEdges]) [self removeEdgeLayers:e]; - [self refreshLayers]; - [self postGraphChange]; - didDelete = YES; - } - - [pickSupport deselectAllNodes]; - [pickSupport deselectAllEdges]; - - if (didDelete) [self registerUndo:oldTikz withActionName:@"Delete Nodes or Edges"]; -} - -- (void)keyUp:(NSEvent *)theEvent { - if (!enabled) return; - - id sender = self; - switch ([theEvent keyCode]) { - case 51: // delete - [self delete:sender]; // "self" is the sender - break; - case 1: // S - [toolPaletteController setSelectedTool:TikzToolSelect]; - break; - case 45: // N - case 9: // V - [toolPaletteController setSelectedTool:TikzToolNode]; - break; - case 14: // E - [toolPaletteController setSelectedTool:TikzToolEdge]; - //[self updateMouseMode]; - break; - case 40: // K - [toolPaletteController setSelectedTool:TikzToolCrop]; - break; - } - [self refreshLayers]; -} - - -- (void)deselectAll:(id)sender { - [pickSupport deselectAllNodes]; - [pickSupport deselectAllEdges]; - - for (Node *n in [graph nodes]) { - [[[nodeLayers objectForKey:n] selection] deselect]; - } - - for (Edge *e in [graph edges]) { - [[edgeControlLayers objectForKey:e] deselect]; - } - - [self postSelectionChange]; -} - -- (void)selectAll:(id)sender { - [pickSupport selectAllNodes:[NSSet setWithArray:[graph nodes]]]; - - for (Node *n in [graph nodes]) { - [[[nodeLayers objectForKey:n] selection] select]; - } - - [self postSelectionChange]; -} - - -- (void)updateMouseMode { - switch (toolPaletteController.selectedTool) { - case TikzToolSelect: - mouseMode = SelectMode; - break; - case TikzToolNode: - mouseMode = NodeMode; - break; - case TikzToolEdge: - mouseMode = EdgeMode; - break; - case TikzToolCrop: - mouseMode = CropMode; - break; - } -} - -- (void)setDocumentUndoManager:(NSUndoManager *)um { - documentUndoManager = um; -} - -- (void)copy:(id)sender { - if ([[pickSupport selectedNodes] count] != 0) { - Graph *clip = [graph copyOfSubgraphWithNodes:[pickSupport selectedNodes]]; - NSString *tikz = [clip tikz]; - NSData *data = [tikz dataUsingEncoding:NSUTF8StringEncoding]; - //NSLog(@"about to copy: %@", tikz); - NSPasteboard *cb = [NSPasteboard generalPasteboard]; - [cb declareTypes:[NSArray arrayWithObject:@"tikzpicture"] owner:self]; - [cb setData:data forType:@"tikzpicture"]; - } -} - -- (void)cut:(id)sender { - if ([[pickSupport selectedNodes] count] != 0) { - [self copy:sender]; - [self delete:sender]; - - // otherwise, menu will say "Undo Delete Graph" - [documentUndoManager setActionName:@"Cut Graph"]; - } -} - -- (void)paste:(id)sender { - NSPasteboard *cb = [NSPasteboard generalPasteboard]; - NSString *type = [cb availableTypeFromArray:[NSArray arrayWithObject:@"tikzpicture"]]; - if (type) { - NSData *data = [cb dataForType:type]; - NSString *tikz = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]; - //NSLog(@"pasting tikz:\n%@",tikz); - Graph *clip = [TikzGraphAssembler parseTikz:tikz]; - if (clip) { - //NSLog(@"tikz pasted:\n%@",tikz); - NSRect graphBounds = [graph bounds]; - NSRect clipBounds = [clip bounds]; - float dx = graphBounds.origin.x + - graphBounds.size.width - - clipBounds.origin.x + 0.5f; - [clip shiftNodes:[clip nodes] byPoint:NSMakePoint(dx, 0)]; - - if ([[clip nodes] count] != 0) { - NSString *oldTikz = [graph tikz]; - [self deselectAll:self]; - - // select everything from the clipboard - for (Node *n in [clip nodes]) { - [n attachStyleFromTable:[stylePaletteController nodeStyles]]; - [self addNodeLayers:n]; - [pickSupport selectNode:n]; - [[[nodeLayers objectForKey:n] selection] select]; - } - - for (Edge *e in [clip edges]) { - [e attachStyleFromTable:[stylePaletteController edgeStyles]]; - [self addEdgeLayers:e]; - } - - [graph insertGraph:clip]; - - [self registerUndo:oldTikz withActionName:@"Paste Graph"]; - [self refreshLayers]; - [self postGraphChange]; - } - } else { - NSLog(@"Error: couldn't parse tikz picture from clipboard."); - } - - } -} - -- (void)bringForward:(id)sender { - NSString *oldTikz = [graph tikz]; - [graph bringNodesForward:[pickSupport selectedNodes]]; - [graph bringEdgesForward:[pickSupport selectedEdges]]; - [self registerUndo:oldTikz withActionName:@"Bring Forward"]; - [self postGraphChange]; - [self refreshLayers]; -} - -- (void)sendBackward:(id)sender { - NSString *oldTikz = [graph tikz]; - [graph sendNodesBackward:[pickSupport selectedNodes]]; - [graph sendEdgesBackward:[pickSupport selectedEdges]]; - [self registerUndo:oldTikz withActionName:@"Send Backward"]; - [self postGraphChange]; - [self refreshLayers]; -} - -- (void)bringToFront:(id)sender { - NSString *oldTikz = [graph tikz]; - [graph bringNodesToFront:[pickSupport selectedNodes]]; - [graph bringEdgesToFront:[pickSupport selectedEdges]]; - [self registerUndo:oldTikz withActionName:@"Bring to Front"]; - [self postGraphChange]; - [self refreshLayers]; -} - -- (void)sendToBack:(id)sender { - NSString *oldTikz = [graph tikz]; - [graph sendNodesToBack:[pickSupport selectedNodes]]; - [graph sendEdgesToBack:[pickSupport selectedEdges]]; - [self registerUndo:oldTikz withActionName:@"Send to Back"]; - [self postGraphChange]; - [self refreshLayers]; -} - -- (void)flipHorizonal:(id)sender { - NSString *oldTikz = [graph tikz]; - [graph flipHorizontalNodes:[pickSupport selectedNodes]]; - [self registerUndo:oldTikz withActionName:@"Flip Horizontal"]; - [self postGraphChange]; - [self refreshLayers]; -} - -- (void)flipVertical:(id)sender { - NSString *oldTikz = [graph tikz]; - [graph flipVerticalNodes:[pickSupport selectedNodes]]; - [self registerUndo:oldTikz withActionName:@"Flip Vertical"]; - [self postGraphChange]; - [self refreshLayers]; -} - -- (void)reverseEdgeDirection:(id)sender { - NSString *oldTikz = [graph tikz]; - - NSSet *es; - if ([[pickSupport selectedEdges] count] != 0) { - es = [pickSupport selectedEdges]; - } else { - es = [graph incidentEdgesForNodes:[pickSupport selectedNodes]]; - } - - for (Edge *e in es) [e reverse]; - - [self registerUndo:oldTikz withActionName:@"Flip Edge Direction"]; - [self postGraphChange]; - [self refreshLayers]; -} - -- (BOOL)acceptsFirstResponder { return YES; } -- (BOOL)acceptsFirstMouse:(NSEvent *)theEvent { return YES; } -- (BOOL)canBecomeKeyView { return YES; } - - -@end diff --git a/tikzit-old/src/osx/Grid.h b/tikzit-old/src/osx/Grid.h deleted file mode 100644 index 76826e2..0000000 --- a/tikzit-old/src/osx/Grid.h +++ /dev/null @@ -1,48 +0,0 @@ -// -// Grid.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "Transformer.h" - -@interface Grid : NSObject { - float gridX, gridY; - //float gridCellX, gridCellY; - int subdivisions; - Transformer *transformer; - NSSize size; -} - -@property NSSize size; - -- (id)initWithSpacing:(float)spacing subdivisions:(int)subs transformer:(Transformer*)t; -+ (Grid*)gridWithSpacing:(float)spacing subdivisions:(int)subs transformer:(Transformer*)t; -- (NSPoint)snapScreenPoint:(NSPoint)p; -- (float)gridX; -- (float)gridY; -- (int)subdivisions; -- (void)setSubdivisions:(int)subs; - -// Grid can also draw itself on a layer -- (void)drawLayer:(CALayer *)layer inContext:(CGContextRef)ctx; - -@end diff --git a/tikzit-old/src/osx/Grid.m b/tikzit-old/src/osx/Grid.m deleted file mode 100644 index aa35c1f..0000000 --- a/tikzit-old/src/osx/Grid.m +++ /dev/null @@ -1,152 +0,0 @@ -// -// Grid.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "Grid.h" - - -@implementation Grid - -@synthesize size; - -- (id)initWithSpacing:(float)spacing - subdivisions:(int)subs - transformer:(Transformer*)t -{ - if (!(self = [super init])) return nil; - gridX = spacing; - gridY = spacing; - subdivisions = subs; - size.width = 0; - size.height = 0; - transformer = t; - return self; -} - -+ (Grid*)gridWithSpacing:(float)spacing - subdivisions:(int)subs - transformer:(Transformer*)t -{ - return [[Grid alloc] initWithSpacing:spacing - subdivisions:subs - transformer:t]; -} - -- (float)gridX { - return gridX; -} - -- (float)gridY { - return gridY; -} - -- (int)subdivisions { - return subdivisions; -} - -- (void)setSubdivisions:(int)subs { - subdivisions = subs; -} - -- (NSPoint)snapScreenPoint:(NSPoint)p { - NSPoint snap; - - float gridCellX = [transformer scaleToScreen:gridX] / (float)subdivisions; - float gridCellY = [transformer scaleToScreen:gridY] / (float)subdivisions; - - // snap along grid lines, relative to the origin - snap.x = floor(((p.x-[transformer origin].x)/gridCellX)+0.5)*gridCellX + [transformer origin].x; - snap.y = floor(((p.y-[transformer origin].y)/gridCellY)+0.5)*gridCellY + [transformer origin].y; - return snap; -} - --(void)drawLayer:(CALayer *)layer inContext:(CGContextRef)context -{ - CGContextSaveGState(context); - - CGContextSetShouldAntialias(context, NO); - - float x,y; - float grX = [transformer scaleToScreen:gridX]; - float grY = [transformer scaleToScreen:gridY]; - - float gridCellX = grX / (float)subdivisions; - float gridCellY = grY / (float)subdivisions; - - for (x = [transformer origin].x + gridCellX; x < size.width; x += gridCellX) { - CGContextMoveToPoint(context, x, 0); - CGContextAddLineToPoint(context, x, size.height); - } - - for (x = [transformer origin].x - gridCellX; x > 0; x -= gridCellX) { - CGContextMoveToPoint(context, x, 0); - CGContextAddLineToPoint(context, x, size.height); - } - - for (y = [transformer origin].y + gridCellY; y < size.height; y += gridCellY) { - CGContextMoveToPoint(context, 0, y); - CGContextAddLineToPoint(context, size.width, y); - } - - for (y = [transformer origin].y - gridCellY; y > 0; y -= gridCellY) { - CGContextMoveToPoint(context, 0, y); - CGContextAddLineToPoint(context, size.width, y); - } - - CGContextSetRGBStrokeColor(context, 0.9, 0.9, 1, 1); - CGContextStrokePath(context); - - for (x = [transformer origin].x + grX; x < size.width; x += grX) { - CGContextMoveToPoint(context, x, 0); - CGContextAddLineToPoint(context, x, size.height); - } - - for (x = [transformer origin].x - grX; x > 0; x -= grX) { - CGContextMoveToPoint(context, x, 0); - CGContextAddLineToPoint(context, x, size.height); - } - - for (y = [transformer origin].y + grY; y < size.height; y += grY) { - CGContextMoveToPoint(context, 0, y); - CGContextAddLineToPoint(context, size.width, y); - } - - for (y = [transformer origin].y + grY; y > 0; y -= grY) { - CGContextMoveToPoint(context, 0, y); - CGContextAddLineToPoint(context, size.width, y); - } - - CGContextSetRGBStrokeColor(context, 0.8, 0.8, 0.9, 1); - CGContextStrokePath(context); - - CGContextMoveToPoint(context, [transformer origin].x, 0); - CGContextAddLineToPoint(context, [transformer origin].x, size.height); - CGContextMoveToPoint(context, 0, [transformer origin].y); - CGContextAddLineToPoint(context, size.width, [transformer origin].y); - - CGContextSetRGBStrokeColor(context, 0.6, 0.6, 0.7, 1); - CGContextStrokePath(context); - - CGContextRestoreGState(context); -} - -@end diff --git a/tikzit-old/src/osx/MultiCombo.h b/tikzit-old/src/osx/MultiCombo.h deleted file mode 100644 index c8ec769..0000000 --- a/tikzit-old/src/osx/MultiCombo.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// MultiCombo.h -// TikZiT -// -// Created by Aleks Kissinger on 21/04/2011. -// Copyright 2011 __MyCompanyName__. All rights reserved. -// - -#import - - -@interface MultiCombo : NSComboBox { - BOOL multi; -} - -@property (readwrite,assign) BOOL multi; - -@end diff --git a/tikzit-old/src/osx/MultiCombo.m b/tikzit-old/src/osx/MultiCombo.m deleted file mode 100644 index 8930460..0000000 --- a/tikzit-old/src/osx/MultiCombo.m +++ /dev/null @@ -1,38 +0,0 @@ -// -// MultiCombo.m -// TikZiT -// -// Created by Aleks Kissinger on 21/04/2011. -// Copyright 2011 __MyCompanyName__. All rights reserved. -// - -#import "MultiCombo.h" - - -@implementation MultiCombo - -- (void)textDidChange:(NSNotification *)notification { - [super textDidChange:notification]; - [self setMulti:NO]; -} - -- (void)setMulti:(BOOL)m { - multi = m; - if (multi) { - [self setTextColor:[NSColor grayColor]]; - [self setStringValue:@"multiple values"]; - } -} - -- (BOOL)multi { return multi; } - -- (BOOL)becomeFirstResponder { - [super becomeFirstResponder]; - if ([self multi]) { - [self setTextColor:[NSColor blackColor]]; - [self setStringValue:@""]; - } - return YES; -} - -@end diff --git a/tikzit-old/src/osx/MultiField.h b/tikzit-old/src/osx/MultiField.h deleted file mode 100644 index 39eeefa..0000000 --- a/tikzit-old/src/osx/MultiField.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// LabelField.h -// TikZiT -// -// Created by Aleks Kissinger on 20/04/2011. -// Copyright 2011 __MyCompanyName__. All rights reserved. -// - -#import - - -@interface MultiField : NSTextField { - BOOL multi; -} - -@property (readwrite,assign) BOOL multi; - -@end diff --git a/tikzit-old/src/osx/MultiField.m b/tikzit-old/src/osx/MultiField.m deleted file mode 100644 index 7c5aac3..0000000 --- a/tikzit-old/src/osx/MultiField.m +++ /dev/null @@ -1,53 +0,0 @@ -// -// LabelField.m -// TikZiT -// -// Created by Aleks Kissinger on 20/04/2011. -// Copyright 2011 __MyCompanyName__. All rights reserved. -// - -#import "MultiField.h" - - -@implementation MultiField - -- (void)textDidChange:(NSNotification *)notification { - [super textDidChange:notification]; - [self setMulti:NO]; -} - -- (void)setMulti:(BOOL)m { - multi = m; - if (multi) { - [self setTextColor:[NSColor grayColor]]; - [self setStringValue:@"multiple values"]; - } -} - -- (BOOL)multi { return multi; } - -- (BOOL)becomeFirstResponder { - [super becomeFirstResponder]; - if ([self multi]) { - [self setTextColor:[NSColor blackColor]]; - [self setStringValue:@""]; - } - return YES; -} - -//- (BOOL)textShouldBeginEditing:(NSText *)textObject { -// [super textShouldBeginEditing:textObject]; -// NSLog(@"about to type"); -// return YES; -//} - -//- (void)textDidEndEditing:(NSNotification *)obj { -// [super textDidEndEditing:obj]; -// -// NSLog(@"focus lost"); -// if ([self multi]) { -// [self setMulti:YES]; -// } -//} - -@end diff --git a/tikzit-old/src/osx/NilToEmptyStringTransformer.h b/tikzit-old/src/osx/NilToEmptyStringTransformer.h deleted file mode 100644 index 1445a94..0000000 --- a/tikzit-old/src/osx/NilToEmptyStringTransformer.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// NilToEmptyStringTransformer.h -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import - -@interface NilToEmptyStringTransformer : NSValueTransformer - -@end diff --git a/tikzit-old/src/osx/NilToEmptyStringTransformer.m b/tikzit-old/src/osx/NilToEmptyStringTransformer.m deleted file mode 100644 index 413f404..0000000 --- a/tikzit-old/src/osx/NilToEmptyStringTransformer.m +++ /dev/null @@ -1,53 +0,0 @@ -// -// NilToEmptyStringTransformer.m -// TikZiT -// -// Copyright 2011 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "NilToEmptyStringTransformer.h" - -@implementation NilToEmptyStringTransformer - -- (id)init { - if (!(self = [super init])) return nil; - return self; -} - -+ (Class)transformedValueClass { - return [NSString class]; -} - -+ (BOOL)allowsReverseTransformation { - return YES; -} - -- (id)transformedValue:(id)value { - if (value == nil) { - return @""; - } else { - return value; - } -} - -- (id)reverseTransformedValue:(id)value { - return [self transformedValue:value]; -} - -@end diff --git a/tikzit-old/src/osx/NodeLayer.h b/tikzit-old/src/osx/NodeLayer.h deleted file mode 100644 index dbcdac5..0000000 --- a/tikzit-old/src/osx/NodeLayer.h +++ /dev/null @@ -1,62 +0,0 @@ -// -// NodeLayer.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import -#import "Transformer.h" -#import "Shape.h" -#import "Node.h" -#import "NodeStyle+Coder.h" -#import "NodeSelectionLayer.h" - -@interface NodeLayer : CALayer { - Node *node; - Shape *shape; - CGMutablePathRef path; - float textwidth; - NSPoint center; - Transformer *transformer; - Transformer *localTrans; - NodeSelectionLayer *selection; - BOOL rescale; - BOOL dirty; // need to rebuild CGBezierPath of the shape -} - -@property (strong) Node *node; -@property (assign) NSPoint center; -@property (assign) BOOL rescale; -@property (strong) NodeSelectionLayer *selection; -@property (readonly) CGMutablePathRef path; - -- (id)initWithNode:(Node*)n transformer:(Transformer*)t; -- (NSColor*)strokeColor; -- (NSColor*)fillColor; -- (float)strokeWidth; - -- (void)setCenter:(NSPoint)ctr andAnimateWhen:(BOOL)anim; -- (void)updateFrame; -- (BOOL)nodeContainsPoint:(NSPoint)p; - -- (void)drawInContext:(CGContextRef)context; - -@end diff --git a/tikzit-old/src/osx/NodeLayer.m b/tikzit-old/src/osx/NodeLayer.m deleted file mode 100644 index 5d15585..0000000 --- a/tikzit-old/src/osx/NodeLayer.m +++ /dev/null @@ -1,238 +0,0 @@ -// -// NodeLayer.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "NodeLayer.h" -#import "CALayer+DrawLabel.h" -#import "NSString+LatexConstants.h" -#import "Shape.h" -#import "ShapeNames.h" -#import "Node.h" -#import "Edge.h" - -@implementation NodeLayer - -@synthesize node, selection, rescale; - -- (id)initWithNode:(Node *)n transformer:(Transformer*)t { - if (!(self = [super init])) return nil; - node = n; - selection = [[NodeSelectionLayer alloc] init]; - [selection setNodeLayer:self]; - localTrans = [[Transformer alloc] init]; - - [self addSublayer:selection]; - textwidth = 0.0f; - center = NSMakePoint(0.0f, 0.0f); - transformer = t; - - path = NULL; - rescale = YES; - dirty = YES; - - [self updateFrame]; - return self; -} - -- (NSColor*)strokeColor { - if ([node style] != nil) { - return [[[node style] strokeColor] colorUsingColorSpace:[NSColorSpace deviceRGBColorSpace]]; - } else { - return nil; - } -} - -- (NSColor*)fillColor { - if ([node style] != nil) { - return [[[node style] fillColor] colorUsingColorSpace:[NSColorSpace deviceRGBColorSpace]]; - } else { - return nil; - } -} - -- (float)strokeWidth { - if ([node style] != nil) { - return [node.style strokeThickness]; - } else { - return [NodeStyle defaultStrokeThickness]; - } -} - -- (NSPoint)center { return center; } - -- (void)setCenter:(NSPoint)ctr { - center.x = round(ctr.x); - center.y = round(ctr.y); - [self updateFrame]; -} - -- (void)setCenter:(NSPoint)ctr andAnimateWhen:(BOOL)anim { - [CATransaction begin]; - if (!anim) { - [CATransaction setValue:(id)kCFBooleanTrue forKey:kCATransactionDisableActions]; - } - [self setCenter:ctr]; - [CATransaction commit]; -} - -- (void)updateShape { - Shape *s = ([node style] != nil) ? - [Shape shapeForName:[[node style] shapeName]] : - [Shape shapeForName:SHAPE_CIRCLE]; - if (s != shape) { // straight pointer comparison - shape = s; - dirty = YES; - } -} - -- (void)updateLocalTrans { - float scale = ([node style] != nil) ? [[node style] scale] : 1.0f; - - Transformer *t = [Transformer transformer]; - float rad = ([transformer scaleToScreen:scale] / 2.0f) + 8.0f; - [t setOrigin:NSMakePoint(rad, rad)]; - [t setScale:[transformer scale]*((rescale)?scale:0.8f)]; - - if (![localTrans isEqual:t]) { - dirty = YES; - localTrans = t; - } -} - -- (void)updateFrame { - [self updateLocalTrans]; - [self updateShape]; - float rad = [localTrans origin].x; - [self setFrame:CGRectIntegral(CGRectMake(center.x - rad, center.y - rad, 2*rad, 2*rad))]; - NSRect bds = NSMakeRect(0, 0, 2*rad, 2*rad); - [selection setFrame:NSRectToCGRect(bds)]; - - [self setNeedsDisplay]; - [selection setNeedsDisplay]; -} - -- (CGMutablePathRef)path { - if (dirty) { - CGMutablePathRef pth = CGPathCreateMutable(); - NSPoint p, cp1, cp2; - for (NSArray *arr in [shape paths]) { - BOOL fst = YES; - for (Edge *e in arr) { - if (fst) { - fst = NO; - p = [localTrans toScreen:[[e source] point]]; - CGPathMoveToPoint(pth, nil, p.x, p.y); - } - - p = [localTrans toScreen:[[e target] point]]; - if ([e isStraight]) { - CGPathAddLineToPoint(pth, nil, p.x, p.y); - } else { - cp1 = [localTrans toScreen:[e cp1]]; - cp2 = [localTrans toScreen:[e cp2]]; - CGPathAddCurveToPoint(pth, nil, cp1.x, cp1.y, cp2.x, cp2.y, p.x, p.y); - } - } - - CGPathCloseSubpath(pth); - } - - if (path != NULL) CFRelease(path); - path = pth; - dirty = NO; - } - - - return path; -} - -- (BOOL)nodeContainsPoint:(NSPoint)p { - CGPoint p1 = CGPointMake(p.x - [self frame].origin.x, p.y - [self frame].origin.y); - return CGPathContainsPoint([self path],nil,p1,NO); -} - - -- (void)drawInContext:(CGContextRef)context { - CGContextSaveGState(context); - - - if ([node style] == nil) { - CGContextSetRGBStrokeColor(context, 0.4f, 0.4f, 0.7f, 1.0f); - CGContextSetRGBFillColor(context, 0.4f, 0.4f, 0.7f, 1.0f); - //CGRect fr = [self frame]; - CGRect bds = NSRectToCGRect([localTrans rectToScreen:NSMakeRect(-0.5, -0.5, 1, 1)]); - CGRect pt = CGRectMake(CGRectGetMidX(bds)-1.0f, CGRectGetMidY(bds)-1.0f, 2.0f, 2.0f); - CGContextSetLineWidth(context, 0); - CGContextAddEllipseInRect(context, pt); - CGContextFillPath(context); - - // HACK: for some reason, CGFloat isn't getting typedef'ed properly - -#ifdef __x86_64__ - const double dash[2] = {2.0,2.0}; -#else - const float dash[2] = {2.0,2.0}; -#endif - CGContextSetLineDash(context, 0.0, dash, 2); - CGContextSetLineWidth(context, 1); - CGContextAddPath(context, [self path]); - CGContextStrokePath(context); - } else { - NSColor *stroke = [self strokeColor]; - NSColor *fill = [self fillColor]; - - CGContextSetRGBStrokeColor(context, - [stroke redComponent], - [stroke greenComponent], - [stroke blueComponent], - [stroke alphaComponent]); - - CGContextSetLineWidth(context, [self strokeWidth]); - - CGContextSetRGBFillColor(context, - [fill redComponent], - [fill greenComponent], - [fill blueComponent], - [fill alphaComponent]); - - - CGContextSetLineWidth(context, [self strokeWidth]); - CGContextAddPath(context, [self path]); - CGContextDrawPath(context, kCGPathFillStroke); - } - - if (!([node label] == nil || [[node label] isEqual:@""])) { - NSPoint labelPt = NSMakePoint([self frame].size.width/2, [self frame].size.height/2); - [self drawLabel:[[node label] stringByExpandingLatexConstants] - atPoint:labelPt - inContext:context - usingTrans:transformer]; - } - - CGContextRestoreGState(context); -} - -- (void)dealloc { - if (path != NULL) CFRelease(path); -} - -@end diff --git a/tikzit-old/src/osx/NodeSelectionLayer.h b/tikzit-old/src/osx/NodeSelectionLayer.h deleted file mode 100644 index 99ee75f..0000000 --- a/tikzit-old/src/osx/NodeSelectionLayer.h +++ /dev/null @@ -1,45 +0,0 @@ -// -// NodeSelectionLayer.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import -#import "Shape.h" - -@class NodeLayer; - -@interface NodeSelectionLayer : CALayer { - BOOL selected; - CGMutablePathRef path; - NSLock *drawLock; - NodeLayer *nodeLayer; -} - -@property NodeLayer *nodeLayer; - -- (id)init; -- (void)select; -- (void)deselect; -- (void)highlight; -- (void)unhighlight; - -@end diff --git a/tikzit-old/src/osx/NodeSelectionLayer.m b/tikzit-old/src/osx/NodeSelectionLayer.m deleted file mode 100644 index 02b8ac2..0000000 --- a/tikzit-old/src/osx/NodeSelectionLayer.m +++ /dev/null @@ -1,93 +0,0 @@ -// -// NodeSelectionLayer.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "NodeSelectionLayer.h" -#import "NodeLayer.h" -#import "CircleShape.h" - -@implementation NodeSelectionLayer - -@synthesize nodeLayer; - -- (id)init { - if (!(self = [super init])) return nil; - selected = NO; - drawLock = [[NSLock alloc] init]; - nodeLayer = nil; - [self setOpacity:0.0f]; - return self; -} - - -- (void)select { - selected = YES; - [self setOpacity:0.5f]; -} - -- (void)deselect { - selected = NO; - [self setOpacity:0.0f]; -} - -- (void)highlight { - if (!selected) { - [self setOpacity:0.25f]; - } -} - -- (void)unhighlight { - if (!selected) { - [self setOpacity:0.0f]; - } -} - -//- (CGMutablePathRef)path { -// return path; -//} -// -//- (void)setPath:(CGMutablePathRef)p { -// path = CGPathCreateMutableCopy(p); -// CFMakeCollectable(path); -//} - -- (void)drawInContext:(CGContextRef)context { - [drawLock lock]; - CGContextSaveGState(context); - - //CGContextSetRGBStrokeColor(context, 0.61f, 0.735f, 1.0f, 1.0f); - CGContextSetRGBStrokeColor(context, 0.61f, 0.735f, 1.0f, 1.0f); - CGContextSetRGBFillColor(context, 0.61f, 0.735f, 1.0f, 1.0f); - CGContextSetLineWidth(context, 6.0f); - - if (nodeLayer != nil) { - CGContextAddPath(context, [nodeLayer path]); - } else { - NSLog(@"WARNING: attempting to draw selection with path = nil."); - } - CGContextDrawPath(context, kCGPathFillStroke); - - CGContextRestoreGState(context); - [drawLock unlock]; -} - -@end diff --git a/tikzit-old/src/osx/NodeStyle+Coder.h b/tikzit-old/src/osx/NodeStyle+Coder.h deleted file mode 100644 index b6443af..0000000 --- a/tikzit-old/src/osx/NodeStyle+Coder.h +++ /dev/null @@ -1,36 +0,0 @@ -// -// NodeStyle+Coder.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "NodeStyle.h" - - -@interface NodeStyle(Coder) - -@property (copy) NSColor *fillColor; -@property (copy) NSColor *strokeColor; - -- (id)initWithCoder:(NSCoder *)coder; -- (void)encodeWithCoder:(NSCoder *)coder; - -@end diff --git a/tikzit-old/src/osx/NodeStyle+Coder.m b/tikzit-old/src/osx/NodeStyle+Coder.m deleted file mode 100644 index d3623f5..0000000 --- a/tikzit-old/src/osx/NodeStyle+Coder.m +++ /dev/null @@ -1,91 +0,0 @@ -// -// NodeStyle+Coder.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "NodeStyle+Coder.h" -#import "ShapeNames.h" - -@implementation NodeStyle(Coder) - -- (NSColor*)fillColor { - return [NSColor colorWithDeviceRed:fillColorRGB.redFloat - green:fillColorRGB.greenFloat - blue:fillColorRGB.blueFloat - alpha:1.0f]; -} - -- (void)setFillColor:(NSColor*)c { - NSColor *c1 = [c colorUsingColorSpaceName:NSDeviceRGBColorSpace]; - [self willChangeValueForKey:@"fillColorIsKnown"]; - fillColorRGB = [ColorRGB colorWithFloatRed:c1.redComponent - green:c1.greenComponent - blue:c1.blueComponent]; - [self didChangeValueForKey:@"fillColorIsKnown"]; -} - -- (NSColor*)strokeColor { - return [NSColor colorWithDeviceRed:strokeColorRGB.redFloat - green:strokeColorRGB.greenFloat - blue:strokeColorRGB.blueFloat - alpha:1.0f]; -} - -- (void)setStrokeColor:(NSColor*)c { - NSColor *c1 = [c colorUsingColorSpaceName:NSDeviceRGBColorSpace]; - [self willChangeValueForKey:@"strokeColorIsKnown"]; - strokeColorRGB = [ColorRGB colorWithFloatRed:c1.redComponent - green:c1.greenComponent - blue:c1.blueComponent]; - [self didChangeValueForKey:@"strokeColorIsKnown"]; -} - -- (id)initWithCoder:(NSCoder *)coder { - if (!(self = [super init])) return nil; - - // decode keys - name = [coder decodeObjectForKey:@"name"]; - [self setStrokeColor:[coder decodeObjectForKey:@"strokeColor"]]; - [self setFillColor:[coder decodeObjectForKey:@"fillColor"]]; - strokeThickness = [coder decodeIntForKey:@"strokeThickness"]; - shapeName = [coder decodeObjectForKey:@"shapeName"]; - category = [coder decodeObjectForKey:@"category"]; - scale = [coder decodeFloatForKey:@"scale"]; - - // apply defaults - if (scale == 0.0f) scale = 1.0f; - if (shapeName == nil) shapeName = SHAPE_CIRCLE; - - return self; -} - -- (void)encodeWithCoder:(NSCoder *)coder { - [coder encodeObject:name forKey:@"name"]; - [coder encodeObject:[self strokeColor] forKey:@"strokeColor"]; - [coder encodeObject:[self fillColor] forKey:@"fillColor"]; - [coder encodeInt:strokeThickness forKey:@"strokeThickness"]; - [coder encodeObject:shapeName forKey:@"shapeName"]; - [coder encodeObject:category forKey:@"category"]; - [coder encodeFloat:scale forKey:@"scale"]; -} - - -@end diff --git a/tikzit-old/src/osx/ParseErrorView.h b/tikzit-old/src/osx/ParseErrorView.h deleted file mode 100644 index bb6141f..0000000 --- a/tikzit-old/src/osx/ParseErrorView.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// ParseErrorView.h -// TikZiT -// -// Created by Karl Johan Paulsson on 27/01/2013. -// Copyright (c) 2013 Aleks Kissinger. All rights reserved. -// - -#import - -@interface ParseErrorView : NSView - -@end diff --git a/tikzit-old/src/osx/ParseErrorView.m b/tikzit-old/src/osx/ParseErrorView.m deleted file mode 100644 index 83383f0..0000000 --- a/tikzit-old/src/osx/ParseErrorView.m +++ /dev/null @@ -1,40 +0,0 @@ -// -// ParseErrorView.m -// TikZiT -// -// Created by Karl Johan Paulsson on 27/01/2013. -// Copyright (c) 2013 Aleks Kissinger. All rights reserved. -// - -#import "ParseErrorView.h" - -@implementation ParseErrorView - -- (id)initWithFrame:(NSRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - // Initialization code here. - } - - return self; -} - -- (void)drawRect:(NSRect)dirtyRect -{ - // Drawing code here. -} - -- (void)awakeFromNib{ - self.layer = [CALayer layer]; - self.wantsLayer = YES; - CALayer *newLayer = [CALayer layer]; - self.layer.backgroundColor = [[NSColor controlColor] CGColor]; - //CGColorCreate(CGColorSpaceCreateDeviceRGB(), (CGFloat[]){ 1, .9, .64, 1 }); -// newLayer.backgroundColor = [NSColor redColor].CGColor; - newLayer.frame = CGRectMake(100,100,100,100);//NSMakeRect(0,0,image.size.width,image.size.height); - newLayer.position = CGPointMake(20,20); - //[self.layer addSublayer:newLayer]; -} - -@end diff --git a/tikzit-old/src/osx/PreambleController.h b/tikzit-old/src/osx/PreambleController.h deleted file mode 100644 index 5b0931d..0000000 --- a/tikzit-old/src/osx/PreambleController.h +++ /dev/null @@ -1,57 +0,0 @@ -// -// PreambleController.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "Preambles.h" -#import "Preambles+Coder.h" - -@interface PreambleController : NSViewController { - Preambles *preambles; - IBOutlet NSTextView *textView; - IBOutlet NSDictionaryController *preambleDictionaryController; - - NSDictionary *textAttrs; - NSAttributedString *preambleText; - NSColor *ghostColor; - NSIndexSet *selectionIndexes; -} - -@property (readonly) BOOL useDefaultPreamble; -@property (readonly) Preambles *preambles; -@property (strong) NSAttributedString *preambleText; -@property (strong) NSIndexSet *selectionIndexes; - -- (id)initWithNibName:(NSString *)nibName plist:(NSString*)plist styles:(NSArray*)sty edges:(NSArray*)edg; -- (void)savePreambles:(NSString*)plist; -- (NSString*)currentPreamble; -- (NSString*)currentPostamble; -- (NSString*)buildDocumentForTikz:(NSString*)tikz; - -- (IBAction)setPreambleToDefault:(id)sender; -- (IBAction)setPreamble:(id)sender; -- (IBAction)insertDefaultStyles:(id)sender; - -- (IBAction)addPreamble:(id)sender; -- (IBAction)duplicatePreamble:(id)sender; - -@end diff --git a/tikzit-old/src/osx/PreambleController.m b/tikzit-old/src/osx/PreambleController.m deleted file mode 100644 index 206bb30..0000000 --- a/tikzit-old/src/osx/PreambleController.m +++ /dev/null @@ -1,168 +0,0 @@ -// -// PreambleController.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "PreambleController.h" - - -@implementation PreambleController - -@synthesize preambleText, preambles; - -- (id)initWithNibName:(NSString *)nibName plist:(NSString*)plist styles:(NSArray*)sty edges:(NSArray*)edg { - if (!(self = [super initWithNibName:nibName bundle:Nil])) return nil; - - preambles = (Preambles*)[NSKeyedUnarchiver unarchiveObjectWithFile:plist]; - [preambles setStyles:sty]; - [preambles setEdges:edg]; - if (preambles == nil) preambles = [[Preambles alloc] init]; - - preambleText = nil; - - NSFont *font = [NSFont userFixedPitchFontOfSize:11.0f]; - textAttrs = [NSDictionary dictionaryWithObject:font forKey:NSFontAttributeName]; - ghostColor = [NSColor colorWithDeviceRed:0.9f green:0.9f blue:0.9f alpha:1.0f]; - - - - return self; -} - -- (void)awakeFromNib { - NSArray *arr = [preambleDictionaryController arrangedObjects]; - NSString *current = [preambles selectedPreambleName]; - - if (current != nil && ![current isEqual:@"default"]) { - for (int i = 0; i < [arr count]; ++i) { - if ([[[arr objectAtIndex:i] key] isEqual:current]) { - [self setSelectionIndexes:[NSIndexSet indexSetWithIndex:i]]; - break; - } - } - } -} - -- (BOOL)useDefaultPreamble { - return [[preambles selectedPreambleName] isEqualToString:@"default"]; -} - -- (void)flushText { - if (preambleText != nil && ![self useDefaultPreamble]) { - [preambles setCurrentPreamble:[preambleText string]]; - } -} - -- (void)setCurrentPreamble:(NSString*)current { - [self flushText]; - - [self willChangeValueForKey:@"useDefaultPreamble"]; - [preambles setSelectedPreambleName:current]; - [self didChangeValueForKey:@"useDefaultPreamble"]; - - [self setPreambleText: - [[NSAttributedString alloc] initWithString:[preambles currentPreamble] - attributes:textAttrs]]; -} - -- (void)savePreambles:(NSString*)plist { - [self flushText]; - [NSKeyedArchiver archiveRootObject:preambles toFile:plist]; -} - -- (NSString*)currentPreamble { - [self flushText]; - return [preambles currentPreamble]; -} - -- (NSString*)currentPostamble { - return [preambles currentPostamble]; -} - -- (NSString*)buildDocumentForTikz:(NSString*)tikz { - [self flushText]; - return [preambles buildDocumentForTikz:tikz]; -} - -- (void)setSelectionIndexes:(NSIndexSet *)idx { - [self willChangeValueForKey:@"selectionIndexes"]; - selectionIndexes = idx; - [self didChangeValueForKey:@"selectionIndexes"]; - - [self setPreamble:self]; -} - -- (NSIndexSet*)selectionIndexes { - return selectionIndexes; -} - -- (IBAction)setPreambleToDefault:(id)sender{ - [self setCurrentPreamble:@"default"]; - [textView setBackgroundColor:ghostColor]; -} - -- (IBAction)setPreamble:(id)sender { - //if ([[toolbar selectedItemIdentifier] isEqualToString:[defaultToolbarItem itemIdentifier]]) { - // [self setCurrentPreamble:@"default"]; - // [textView setBackgroundColor:ghostColor]; - //} else if ([[toolbar selectedItemIdentifier] isEqualToString:[customToolbarItem itemIdentifier]]) { - NSString *key = nil; - if ([selectionIndexes count]==1) { - int i = [selectionIndexes firstIndex]; - key = [[[preambleDictionaryController arrangedObjects] objectAtIndex:i] key]; - } - if (key != nil) { - [self setCurrentPreamble:key]; - //NSLog(@"preamble set to %@", key); - } else { - [self setCurrentPreamble:@"custom"]; - //NSLog(@"preamble set to custom"); - } - [textView setBackgroundColor:[NSColor whiteColor]]; - //} -} - -- (IBAction)insertDefaultStyles:(id)sender { - [textView insertText:[preambles styleDefinitions]]; -} - -- (IBAction)addPreamble:(id)sender { - [preambleDictionaryController setInitialKey:@"new preamble"]; - [preambleDictionaryController setInitialValue:[preambles defaultPreamble]]; - [preambleDictionaryController add:sender]; -} - -- (void)controlTextDidEndEditing:(NSNotification *)obj { - //NSLog(@"got a text change"); - [self setPreamble:[obj object]]; -} - - -// NOT IMPLEMENTED -- (IBAction)duplicatePreamble:(id)sender { -// NSLog(@"set text to: %@", [preambles currentPreamble]); -// [preambleDictionaryController setInitialKey:[preambles selectedPreambleName]]; -// [preambleDictionaryController setInitialValue:[preambles currentPreamble]]; -// [preambleDictionaryController add:sender]; -} - - -@end diff --git a/tikzit-old/src/osx/Preambles+Coder.h b/tikzit-old/src/osx/Preambles+Coder.h deleted file mode 100644 index 5a270c5..0000000 --- a/tikzit-old/src/osx/Preambles+Coder.h +++ /dev/null @@ -1,32 +0,0 @@ -// -// Preambles+Coder.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "Preambles.h" -#import - -@interface Preambles (Coder) - -- (id)initWithCoder:(NSCoder *)coder; -- (void)encodeWithCoder:(NSCoder *)coder; - -@end diff --git a/tikzit-old/src/osx/Preambles+Coder.m b/tikzit-old/src/osx/Preambles+Coder.m deleted file mode 100644 index 5e468b2..0000000 --- a/tikzit-old/src/osx/Preambles+Coder.m +++ /dev/null @@ -1,41 +0,0 @@ -// -// Preambles+Coder.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "Preambles+Coder.h" - - -@implementation Preambles (Coder) - -- (id)initWithCoder:(NSCoder *)coder { - if (!(self = [super init])) return nil; - selectedPreambleName = [coder decodeObjectForKey:@"selectedPreamble"]; - preambleDict = [coder decodeObjectForKey:@"preambles"]; - return self; -} - -- (void)encodeWithCoder:(NSCoder *)coder { - [coder encodeObject:selectedPreambleName forKey:@"selectedPreamble"]; - [coder encodeObject:preambleDict forKey:@"preambles"]; -} - -@end diff --git a/tikzit-old/src/osx/PreferenceController.h b/tikzit-old/src/osx/PreferenceController.h deleted file mode 100644 index b2b23f3..0000000 --- a/tikzit-old/src/osx/PreferenceController.h +++ /dev/null @@ -1,49 +0,0 @@ -// -// PreferenceController.h -// TikZiT -// -// Created by Karl Johan Paulsson on 26/02/2013. -// Copyright (c) 2013 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "UpdatePreferenceController.h" -#import "PreambleController.h" -#import "CustomNodeController.h" - -@interface PreferenceController : NSWindowController{ - - IBOutlet NSView *engineView; - IBOutlet NSView *generalView; - IBOutlet NSView *updateView; - IBOutlet NSView *preambleView; - IBOutlet NSView *customNodeView; - - UpdatePreferenceController *updateController; - PreambleController *preambleController; - CustomNodeController *customNodeController; - - int currentViewTag; -} - -- (id)initWithWindowNibName:(NSString *)windowNibName preambleController:(PreambleController *)pc; - -- (IBAction)switchView:(id)sender; - -@end diff --git a/tikzit-old/src/osx/PreferenceController.m b/tikzit-old/src/osx/PreferenceController.m deleted file mode 100644 index e785358..0000000 --- a/tikzit-old/src/osx/PreferenceController.m +++ /dev/null @@ -1,133 +0,0 @@ -// -// PreferenceController.m -// TikZiT -// -// Created by Karl Johan Paulsson on 26/02/2013. -// Copyright (c) 2013 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "PreferenceController.h" - -@interface PreferenceController () - -@end - -@implementation PreferenceController - -- (id)initWithWindowNibName:(NSString *)windowNibName preambleController:(PreambleController *)pc{ - if (!(self = [super initWithWindowNibName:windowNibName])) return nil; - - preambleController = pc; - - return self; -} - -- (NSRect)newFrameForNewContentView:(NSView*)view { - NSWindow *window = [self window]; - NSRect newFrameRect = [window frameRectForContentRect:[view frame]]; - NSRect oldFrameRect = [window frame]; - NSSize newSize = newFrameRect.size; - NSSize oldSize = oldFrameRect.size; - - NSRect frame = [window frame]; - frame.size = newSize; - frame.origin.y -= (newSize.height - oldSize.height); - - return frame; -} - -- (NSView *)viewForTag:(int)tag { - - NSView *view = nil; - switch (tag) { - default: - case 0: - view = generalView; - break; - case 1: - view = engineView; - break; - case 2: - view = updateView; - break; - case 3: - view = preambleView; - break; - case 4: - view = customNodeView; - break; - } - - return view; -} - -- (BOOL)validateToolbarItem:(NSToolbarItem *)item { - - if ([item tag] == currentViewTag) return NO; - else return YES; - -} - -- (void)awakeFromNib { - - [[self window] setContentSize:[generalView frame].size]; - [[[self window] contentView] addSubview:generalView]; - [[[self window] contentView] setWantsLayer:YES]; - - updateController = [[UpdatePreferenceController alloc] initWithNibName:@"UpdatePreferencePanel" bundle:nil]; - [[updateController view] setFrame:[updateView frame]]; - [[[self window] contentView] replaceSubview:updateView with:[updateController view]]; - updateView = [updateController view]; - - [[preambleController view] setFrame:[preambleView frame]]; - [[[self window] contentView] replaceSubview:preambleView with:[preambleController view]]; - preambleView = [preambleController view]; - - customNodeController = [[CustomNodeController alloc] initWithNibName:@"CustomNodes" bundle:nil]; - [[customNodeController view] setFrame:[customNodeView frame]]; - [[[self window] contentView] replaceSubview:customNodeView with:[customNodeController view]]; - customNodeView = [customNodeController view]; - - [[self window] setContentSize:[engineView frame].size]; - [[[self window] contentView] addSubview:engineView]; - currentViewTag = 1; -} - -- (IBAction)switchView:(id)sender { - - int tag = [sender tag]; - NSView *view = [self viewForTag:tag]; - NSView *previousView = [self viewForTag:currentViewTag]; - currentViewTag = tag; - - NSRect newFrame = [self newFrameForNewContentView:view]; - - [NSAnimationContext beginGrouping]; - - if ([[NSApp currentEvent] modifierFlags] & NSShiftKeyMask) - [[NSAnimationContext currentContext] setDuration:1.0]; - - [[[[self window] contentView] animator] replaceSubview:previousView with:view]; - [[[self window] animator] setFrame:newFrame display:YES]; - - [NSAnimationContext endGrouping]; - -} - -@end diff --git a/tikzit-old/src/osx/Preferences.xib b/tikzit-old/src/osx/Preferences.xib deleted file mode 100644 index 1be3f9f..0000000 --- a/tikzit-old/src/osx/Preferences.xib +++ /dev/null @@ -1,1165 +0,0 @@ - - - - 1070 - 13C64 - 5053 - 1265.19 - 697.40 - - com.apple.InterfaceBuilder.CocoaPlugin - 5053 - - - IBNSLayoutConstraint - NSButton - NSButtonCell - NSCustomObject - NSCustomView - NSTextField - NSTextFieldCell - NSToolbar - NSToolbarItem - NSUserDefaultsController - NSView - NSWindowTemplate - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - PreferenceController - - - FirstResponder - - - NSApplication - - - 7 - 2 - {{196, 240}, {480, 270}} - 544736256 - Preferences - NSWindow - - - C1747407-DC9A-4297-9C1C-0A5010984E6C - - - YES - YES - NO - NO - 1 - 1 - - - - 197F9408-AFB0-404B-B2B6-4DB1250B0A80 - - Updates - Updates - - - - NSImage - updates - - - - {0, 0} - {0, 0} - YES - YES - 2 - YES - 0 - - - - A3DDD070-5637-444B-92C6-905084CAC389 - - General - General - - - - NSImage - NSPreferencesGeneral - - - - {0, 0} - {0, 0} - YES - YES - 1 - YES - 0 - - - - A96DC4D4-2171-4D05-8C08-8D01B3829158 - - Preamble - Preamble - - - - NSImage - preamble - - - - {0, 0} - {0, 0} - YES - YES - 3 - YES - 0 - - - - CBA2626C-DD4C-4ADD-BD5D-26D21216D9A8 - - Custom Nodes - Custom Nodes - - - - NSImage - customshape - - - - {0, 0} - {0, 0} - YES - YES - 4 - YES - 0 - - - - F85FE7C2-9847-4E58-8BF6-BE334E918CA7 - - Engine - Engine - - - - NSImage - engine - - - - {0, 0} - {0, 0} - YES - YES - 1 - YES - 0 - - - - - - - - - - - - - - - - - - - - - {480, 270} - - - - - {{0, 0}, {1680, 1028}} - {10000000000000, 10000000000000} - YES - - - - 268 - - - - 268 - {{18, 106}, {219, 18}} - - - - _NS:9 - YES - - -2080374784 - 268435456 - Keep inspector windows on top - - .LucidaGrandeUI - 13 - 1044 - - _NS:9 - - 1211912448 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 - - NO - - - - 268 - {{18, 126}, {168, 18}} - - - - _NS:9 - YES - - -2080374784 - 268435456 - Autocomplete brackets - - _NS:9 - - 1211912448 - 2 - - - - - 200 - 25 - - NO - - - - 268 - {{18, 18}, {214, 18}} - - - - _NS:9 - YES - - -2080374784 - 268435456 - Bring preview window to focus - - _NS:9 - - 1211912448 - 2 - - - - - 200 - 25 - - NO - - - - 268 - {{20, 42}, {440, 22}} - - - - _NS:9 - YES - - -1804599231 - 272630784 - - - _NS:9 - - YES - - 6 - System - textBackgroundColor - - 3 - MQA - - - - 6 - System - textColor - - 3 - MAA - - - - NO - 1 - - - - 268 - {{18, 72}, {140, 17}} - - - - _NS:1535 - YES - - 68157504 - 272630784 - pdfLaTeX source path - - _NS:1535 - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - - - NO - 1 - - - {480, 162} - - - - _NS:9 - NSView - - - - 268 - - {480, 96} - - - - _NS:9 - NSView - - - - 12 - - {480, 115} - - - - _NS:9 - NSView - - - - 12 - - {557, 354} - - - - _NS:9 - NSView - - - - 12 - - {557, 354} - - - - _NS:9 - NSView - - - YES - - - - - - - window - - - - 3 - - - - engineView - - - - 23 - - - - generalView - - - - 25 - - - - switchView: - - - - 26 - - - - switchView: - - - - 27 - - - - switchView: - - - - 116 - - - - updateView - - - - 117 - - - - switchView: - - - - 120 - - - - preambleView - - - - 121 - - - - customNodeView - - - - 123 - - - - switchView: - - - - 125 - - - - delegate - - - - 4 - - - - value: values.net.sourceforge.tikzit.pdflatexpath - - - - - - value: values.net.sourceforge.tikzit.pdflatexpath - value - values.net.sourceforge.tikzit.pdflatexpath - 2 - - - 54 - - - - value: values.net.sourceforge.tikzit.previewfocus - - - - - - value: values.net.sourceforge.tikzit.previewfocus - value - values.net.sourceforge.tikzit.previewfocus - 2 - - - 62 - - - - value: values.net.sourceforge.tikzit.autocomplete - - - - - - value: values.net.sourceforge.tikzit.autocomplete - value - values.net.sourceforge.tikzit.autocomplete - 2 - - - 149 - - - - value: values.net.sourceforge.tikzit.inspectorsontop - - - - - - value: values.net.sourceforge.tikzit.inspectorsontop - value - values.net.sourceforge.tikzit.inspectorsontop - 2 - - - 150 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 1 - - - - - - - - - 2 - - - - - 5 - - - - - - - - - - - - 11 - - - - - 12 - - - - - 13 - - - - - 4 - 0 - - 4 - 1 - 1 - - 20 - - 1000 - - 8 - 23 - 3 - NO - - - - 3 - 0 - - 4 - 1 - 1 - - 8 - - 1000 - - 6 - 24 - 3 - NO - - - - 5 - 0 - - 5 - 1 - 1 - - 20 - - 1000 - - 0 - 29 - 3 - NO - - - - 6 - 0 - - 6 - 1 - 1 - - 20 - - 1000 - - 0 - 29 - 3 - NO - - - - 3 - 0 - - 4 - 1 - 1 - - 8 - - 1000 - - 6 - 24 - 3 - NO - - - - 5 - 0 - - 5 - 1 - 1 - - 20 - - 1000 - - 0 - 29 - 3 - NO - - - - 5 - 0 - - 5 - 1 - 1 - - 20 - - 1000 - - 0 - 29 - 3 - NO - - - - 5 - 0 - - 5 - 1 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - NO - - - - 3 - 0 - - 4 - 1 - 1 - - 6 - - 1000 - - 6 - 24 - 3 - NO - - - - 5 - 0 - - 5 - 1 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - NO - - - - 3 - 0 - - 3 - 1 - 1 - - 20 - - 1000 - - 8 - 23 - 3 - NO - - - - - - - - - - - 14 - - - - - - 15 - - - - - - - - 16 - - - - - 30 - - - - - 32 - - - - - - - - 33 - - - - - 36 - - - - - 39 - - - - - 55 - - - - - 56 - - - - - 57 - - - - - - - - 58 - - - - - 59 - - - - - 60 - - - - - 64 - - - - - - 115 - - - - - 118 - - - - - 119 - - - - - 122 - - - - - 124 - - - - - 126 - - - - - 127 - - - - - - - - 128 - - - - - 130 - - - - - 131 - - - - - - - - 132 - - - - - 134 - - - - - 135 - - - - - 153 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{357, 418}, {480, 270}} - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - - - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - 153 - - - - - PreferenceController - NSWindowController - - switchView: - id - - - switchView: - - switchView: - id - - - - NSView - NSView - NSView - NSView - NSView - - - - customNodeView - NSView - - - engineView - NSView - - - generalView - NSView - - - preambleView - NSView - - - updateView - NSView - - - - IBProjectSource - ./Classes/PreferenceController.h - - - - - 0 - IBCocoaFramework - YES - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES - 3 - - {32, 32} - {15, 15} - {32, 32} - {32, 32} - {32, 32} - {32, 32} - - YES - - diff --git a/tikzit-old/src/osx/PreviewController.h b/tikzit-old/src/osx/PreviewController.h deleted file mode 100644 index 6c51a23..0000000 --- a/tikzit-old/src/osx/PreviewController.h +++ /dev/null @@ -1,52 +0,0 @@ -// -// PreviewController.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - - -#import -#import "DraggablePDFView.h" - -@class PDFView; -@class PreambleController; - -@interface PreviewController : NSWindowController { - IBOutlet DraggablePDFView *pdfView; - IBOutlet NSProgressIndicator *progressIndicator; - IBOutlet NSScrollView *errorTextView; - IBOutlet NSTextView *errorText; - PreambleController *preambleController; - NSString *tempDir; - NSLock *latexLock; - int typesetCount; -} - - -- (id)initWithWindowNibName:(NSString*)nib - preambleController:(PreambleController*)pc - tempDir:(NSString*)dir; - -- (void)buildTikz:(NSString*)tikz; - -+ (void)setDefaultPreviewController:(PreviewController*)pc; -+ (PreviewController*)defaultPreviewController; - -@end diff --git a/tikzit-old/src/osx/PreviewController.m b/tikzit-old/src/osx/PreviewController.m deleted file mode 100644 index cf069b1..0000000 --- a/tikzit-old/src/osx/PreviewController.m +++ /dev/null @@ -1,147 +0,0 @@ -// -// PreviewController.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "PreviewController.h" -#import "AppDelegate.h" -#import "PreambleController.h" -#import - -@implementation PreviewController - -static PreviewController *preview = nil; - -- (id)initWithWindowNibName:(NSString*)nib - preambleController:(PreambleController*)pc - tempDir:(NSString*)dir { - if (!(self = [super initWithWindowNibName:nib])) return nil; - tempDir = [dir copy]; - typesetCount = 0; - preambleController = pc; - latexLock = [[NSLock alloc] init]; - return self; -} - -- (void)runLatex:(id)tikz { - // Only build one tex file at a time, so we don't get funky results. - //[latexLock lock]; - [progressIndicator startAnimation:self]; - - if([[NSUserDefaults standardUserDefaults] boolForKey:@"net.sourceforge.tikzit.previewfocus"]){ - [[preview window] makeKeyAndOrderFront:self]; - } - - int fnum = typesetCount++; - - NSString *tex = [preambleController buildDocumentForTikz:tikz]; - - NSString *texFile = [NSString stringWithFormat:@"%@/tikzit_%d.tex", tempDir, fnum]; - NSString *pdfFile = [NSString stringWithFormat:@"%@/tikzit_%d.pdf", tempDir, fnum]; - - [tex writeToFile:texFile atomically:NO encoding:NSUTF8StringEncoding error:NULL]; - - NSString *pdflatexPath = [[NSUserDefaults standardUserDefaults] stringForKey:@"net.sourceforge.tikzit.pdflatexpath"]; - - // We run pdflatex in a bash shell to have easy access to the setup from unix-land - NSTask *latexTask = [[NSTask alloc] init]; - [latexTask setCurrentDirectoryPath:tempDir]; - [latexTask setLaunchPath:@"/bin/bash"]; - - // This assumes the user has $PATH set up to find pdflatex in either .profile - // or .bashrc. This should be improved to take other path setups into account - // and to be customisable. - NSString *latexCmd = - [NSString stringWithFormat: - @"if [ -e ~/.profile ]; then source ~/.profile; fi\n" - @"if [ -e ~/.bashrc ]; then source ~/.bashrc; fi\n" - @"%@ -interaction=nonstopmode -output-format=pdf -halt-on-error '%@'\n", pdflatexPath, texFile]; - - NSLog(@"Telling bash: %@", latexCmd); - - NSPipe *pout = [NSPipe pipe]; - NSPipe *pin = [NSPipe pipe]; - [latexTask setStandardOutput:pout]; - [latexTask setStandardInput:pin]; - - NSFileHandle *latexIn = [pin fileHandleForWriting]; - NSFileHandle *latexOut = [pout fileHandleForReading]; - - [latexTask launch]; - [latexIn writeData:[latexCmd dataUsingEncoding:NSUTF8StringEncoding]]; - [latexIn closeFile]; - - - NSData *data = [latexOut readDataToEndOfFile]; - NSString *str = [[NSString alloc] initWithData:data - encoding:NSUTF8StringEncoding]; - - [latexTask waitUntilExit]; - if ([latexTask terminationStatus] != 0) { - if ([latexTask terminationStatus] == 127) { - [errorTextView setHidden:YES]; - [errorText setString:@"\nCouldn't find pdflatex, change settings and try again."]; - [errorTextView setHidden:NO]; - }else{ - [errorTextView setHidden:YES]; - [errorText setString:[@"\nAN ERROR HAS OCCURRED, PDFLATEX SAID:\n\n" stringByAppendingString:str]]; - [errorTextView setHidden:NO]; - } - } else { - [errorText setString:@""]; - [errorTextView setHidden:YES]; - - PDFDocument *doc = [[PDFDocument alloc] initWithURL:[[NSURL alloc] initFileURLWithPath:pdfFile]]; - - // pad the PDF by a couple of pixels - if ([doc pageCount] >= 1) { - PDFPage *page = [doc pageAtIndex:0]; - NSRect box = [page boundsForBox:kPDFDisplayBoxCropBox]; - box.origin.x -= 2.0f; - box.origin.y -= 2.0f; - box.size.width += 4.0f; - box.size.height += 4.0f; - [page setBounds:box forBox:kPDFDisplayBoxCropBox]; - [page setBounds:box forBox:kPDFDisplayBoxMediaBox]; - } - - [pdfView setDocument:doc]; - } - - [progressIndicator stopAnimation:self]; - //[latexLock unlock]; -} - -- (void)buildTikz:(NSString*)tikz { - // Build on a separate thread to keep the interface responsive. - [NSThread detachNewThreadSelector:@selector(runLatex:) toTarget:self withObject:tikz]; -} - -+ (void)setDefaultPreviewController:(PreviewController*)pc { - preview = pc; -} - -+ (PreviewController*)defaultPreviewController { - return preview; -} - - -@end diff --git a/tikzit-old/src/osx/PropertyInspectorController.h b/tikzit-old/src/osx/PropertyInspectorController.h deleted file mode 100644 index 663ee4a..0000000 --- a/tikzit-old/src/osx/PropertyInspectorController.h +++ /dev/null @@ -1,83 +0,0 @@ -// -// PropertyInspectorController.h -// TikZiT -// -// Created by Aleks Kissinger on 17/07/2011. -// Copyright 2011 Aleks Kissinger. All rights reserved. -// - -#import -#import "NodeStyle.h" -#import "GraphElementData.h" - -@class SFBInspectorView; -@class StylePaletteController; - -@interface PropertyInspectorController : NSWindowController { - IBOutlet SFBInspectorView *propertyInspectorView; - IBOutlet NSView *nodePropertiesView; - IBOutlet NSView *graphPropertiesView; - IBOutlet NSView *edgePropertiesView; - IBOutlet NSComboBox *sourceAnchorComboBox; - IBOutlet NSComboBox *targetAnchorComboBox; - IBOutlet NSTextField *edgeNodeLabelField; - IBOutlet NSButton *edgeNodeCheckbox; - IBOutlet NSArrayController *nodeDataArrayController; - IBOutlet NSArrayController *graphDataArrayController; - IBOutlet NSArrayController *edgeDataArrayController; - IBOutlet NSArrayController *edgeNodeDataArrayController; - - NSMutableArray *sourceAnchorNames; - IBOutlet NSArrayController *sourceAnchorNamesArrayController; - - NSMutableArray *targetAnchorNames; - IBOutlet NSArrayController *targetAnchorNamesArrayController; - - NSMutableArray *selectedNodes; - IBOutlet NSArrayController *selectedNodesArrayController; - - NSMutableArray *selectedEdges; - IBOutlet NSArrayController *selectedEdgesArrayController; - - // this data lists exists solely for displaying messages in disabled data tables - GraphElementData *noSelection; - GraphElementData *multipleSelection; - GraphElementData *noEdgeNode; - GraphElementData *noGraph; - - - // used to get access to the global style table - StylePaletteController *stylePaletteController; -} - -//@property (readonly) BOOL enableNodeDataControls; -//@property (readonly) BOOL enableEdgeDataControls; -@property (strong) NSMutableArray *selectedNodes; -@property (strong) NSMutableArray *selectedEdges; -@property (strong) NSMutableArray *sourceAnchorNames; -@property (strong) NSMutableArray *targetAnchorNames; -@property (strong) StylePaletteController *stylePaletteController; - -- (id)initWithWindowNibName:(NSString *)windowNibName; -- (void)graphSelectionChanged:(NSNotification*)notification; - -- (IBAction)addNodeProperty:(id)sender; -- (IBAction)addNodeAtom:(id)sender; -- (IBAction)removeNodeProperty:(id)sender; - -- (IBAction)addGraphProperty:(id)sender; -- (IBAction)addGraphAtom:(id)sender; -- (IBAction)removeGraphProperty:(id)sender; - -- (IBAction)addEdgeProperty:(id)sender; -- (IBAction)addEdgeAtom:(id)sender; -- (IBAction)removeEdgeProperty:(id)sender; - -- (IBAction)addEdgeNodeProperty:(id)sender; -- (IBAction)addEdgeNodeAtom:(id)sender; -- (IBAction)removeEdgeNodeProperty:(id)sender; - -//- (IBAction)addRemoveChildNode:(id)sender; -- (IBAction)refreshDocument:(id)sender; - -@end diff --git a/tikzit-old/src/osx/PropertyInspectorController.m b/tikzit-old/src/osx/PropertyInspectorController.m deleted file mode 100644 index 039a30f..0000000 --- a/tikzit-old/src/osx/PropertyInspectorController.m +++ /dev/null @@ -1,280 +0,0 @@ -// -// PropertyInspectorController.m -// TikZiT -// -// Created by Aleks Kissinger on 17/07/2011. -// Copyright 2011 Aleks Kissinger. All rights reserved. -// - -#import "PropertyInspectorController.h" -#import "StylePaletteController.h" -#import "TikzDocument.h" -#import "SFBInspectors/SFBInspectorView.h" -#import "PickSupport.h" -#import "Node.h" -#import "Edge.h" -#import "NodeStyle.h" -#import "GraphicsView.h" -#import "GraphElementProperty.h" -#import "Shape.h" - -@implementation PropertyInspectorController - -@synthesize stylePaletteController; -@synthesize selectedNodes, selectedEdges; -@synthesize sourceAnchorNames, targetAnchorNames; - -- (id)initWithWindowNibName:(NSString *)windowNibName { - if (!(self = [super initWithWindowNibName:windowNibName])) return nil; - - noSelection = [[GraphElementData alloc] init]; - [noSelection setProperty:@"" forKey:@"No Selection"]; - multipleSelection = [[GraphElementData alloc] init]; - [multipleSelection setProperty:@"" forKey:@"Mult. Selection"]; - noEdgeNode = [[GraphElementData alloc] init]; - [noEdgeNode setProperty:@"" forKey:@"No Child"]; - noGraph = [[GraphElementData alloc] init]; - [noGraph setProperty:@"" forKey:@"No Graph"]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(graphSelectionChanged:) - name:@"SelectionChanged" - object:nil]; - -// [[NSDocumentController sharedDocumentController] addObserver:self -// forKeyPath:@"currentDocument" -// options:NSKeyValueObservingOptionNew -// context:NULL]; - - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(graphSelectionChanged:) - name:@"NSWindowDidBecomeMainNotification" - object:nil]; - - [self setSourceAnchorNames: [[NSMutableArray alloc] initWithArray: [@"north south west east" componentsSeparatedByString:@" "]]]; - - [self setTargetAnchorNames: [[NSMutableArray alloc] initWithArray:[@"north south west east" componentsSeparatedByString:@" "]]]; - - - if ([[NSUserDefaults standardUserDefaults] boolForKey:@"net.sourceforge.tikzit.inspectorsontop"] == YES) { - [[self window] setLevel:NSFloatingWindowLevel]; - } else { - [[self window] setLevel:NSNormalWindowLevel]; - } - - [self showWindow:self]; - return self; -} - -- (void)observeValueForKeyPath:(NSString*)keyPath - ofObject:(id)object - change:(NSDictionary*)change - context:(void*)context { - [self graphSelectionChanged:nil]; -} - -//- (void)willChangeValueForKey:(NSString *)key { -// [super willChangeValueForKey:key]; -// NSLog(@"will: %@",key); -//} -// -//- (void)didChangeValueForKey:(NSString *)key { -// [super didChangeValueForKey:key]; -// NSLog(@"did: %@",key); -//} - -- (void)windowDidLoad { - [[self window] setMovableByWindowBackground:YES]; - - [propertyInspectorView addInspectorPane:graphPropertiesView - title:@"Graph Properties"]; - [propertyInspectorView addInspectorPane:nodePropertiesView - title:@"Node Properties"]; - [propertyInspectorView addInspectorPane:edgePropertiesView - title:@"Edge Properties"]; - [super windowDidLoad]; -} - -- (IBAction)refreshDocument:(id)sender { - NSDocumentController *dc = [NSDocumentController sharedDocumentController]; - TikzDocument *doc = (TikzDocument*)[dc currentDocument]; - - if (doc != nil) { - [[doc graphicsView] postGraphChange]; - [[doc graphicsView] refreshLayers]; - } -} - - -- (void)updateGraphFields { - NSDocumentController *dc = [NSDocumentController sharedDocumentController]; - TikzDocument *doc = (TikzDocument*)[dc currentDocument]; - - if (doc != nil) { - [graphDataArrayController setContent:[[[doc graphicsView] graph] data]]; - [graphDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; - [graphDataArrayController setEditable:YES]; - } else { - [graphDataArrayController setContent:noGraph]; - [graphDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; - [graphDataArrayController setEditable:NO]; - } -} - -- (void)updateNodeFields { - NSDocumentController *dc = [NSDocumentController sharedDocumentController]; - TikzDocument *doc = (TikzDocument*)[dc currentDocument]; - if (doc != nil) { - NSSet *sel = [[[doc graphicsView] pickSupport] selectedNodes]; - [self setSelectedNodes:[[sel allObjects] mutableCopy]]; - [selectedNodesArrayController setSelectedObjects:selectedNodes]; - if ([sel count] == 1) { - Node *n = [sel anyObject]; - [nodeDataArrayController setContent:[n data]]; - [nodeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; - [nodeDataArrayController setEditable:YES]; - } else if ([sel count] == 0) { - [nodeDataArrayController setContent:noSelection]; - [nodeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; - [nodeDataArrayController setEditable:NO]; - } else { - [nodeDataArrayController setContent:multipleSelection]; - [nodeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; - [nodeDataArrayController setEditable:NO]; - } - } else { - [nodeDataArrayController setContent:noGraph]; - [nodeDataArrayController setEditable:NO]; - } -} - -- (void)updateEdgeFields { - NSDocumentController *dc = [NSDocumentController sharedDocumentController]; - TikzDocument *doc = (TikzDocument*)[dc currentDocument]; - - if (doc != nil) { - NSSet *sel = [[[doc graphicsView] pickSupport] selectedEdges]; - [self setSelectedEdges:[[sel allObjects] mutableCopy]]; - [selectedEdgesArrayController setSelectedObjects:selectedEdges]; - if ([sel count] == 1) { - Edge *e = [sel anyObject]; - [edgeDataArrayController setContent:[e data]]; - [edgeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; - [edgeDataArrayController setEditable:YES]; - if ([e hasEdgeNode]) { - Node *n = [e edgeNode]; - [edgeNodeDataArrayController setContent:[n data]]; - [edgeNodeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; - [edgeNodeDataArrayController setEditable:YES]; - } else { - [edgeNodeDataArrayController setContent:noEdgeNode]; - [edgeNodeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; - [edgeNodeDataArrayController setEditable:NO]; - } - } else if ([sel count] == 0) { - [edgeDataArrayController setContent:noSelection]; - [edgeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; - [edgeDataArrayController setEditable:NO]; - [edgeNodeDataArrayController setContent:noSelection]; - [edgeNodeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; - [edgeNodeDataArrayController setEditable:NO]; - } else { - [edgeDataArrayController setContent:multipleSelection]; - [edgeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; - [edgeDataArrayController setEditable:NO]; - [edgeNodeDataArrayController setContent:multipleSelection]; - [edgeNodeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; - [edgeNodeDataArrayController setEditable:NO]; - } - } else { - [edgeDataArrayController setContent:noGraph]; - [edgeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; - [edgeDataArrayController setEditable:NO]; - [edgeNodeDataArrayController setContent:noGraph]; - [edgeNodeDataArrayController setSelectionIndexes:[NSIndexSet indexSet]]; - [edgeNodeDataArrayController setEditable:NO]; - } -} - -- (void)graphSelectionChanged:(NSNotification*)notification { - [self updateNodeFields]; - [self updateEdgeFields]; - [self updateGraphFields]; -} - -- (void)controlTextDidEndEditing:(NSNotification*)notification { - NSDocumentController *dc = [NSDocumentController sharedDocumentController]; - TikzDocument *doc = (TikzDocument*)[dc currentDocument]; - if (doc != nil) { - PickSupport *pick = [[doc graphicsView] pickSupport]; - for (Node *n in [pick selectedNodes]) { - [n attachStyleFromTable:[stylePaletteController nodeStyles]]; - } - - for (Edge *e in [pick selectedEdges]) { - [e attachStyleFromTable:[stylePaletteController edgeStyles]]; - } - } - - [self refreshDocument:[notification object]]; -} - -- (void)addPropertyToAC:(NSArrayController*)ac { - [ac addObject:[[GraphElementProperty alloc] initWithPropertyValue:@"val" forKey:@"new_property"]]; - [self refreshDocument:nil]; -} - -- (void)addAtomToAC:(NSArrayController*)ac { - [ac addObject:[[GraphElementProperty alloc] initWithAtomName:@"new_atom"]]; - [self refreshDocument:nil]; -} - -- (void)removeFromAC:(NSArrayController*)ac { - [ac remove:nil]; - [self refreshDocument:nil]; -} - -- (IBAction)addNodeProperty:(id)sender { [self addPropertyToAC:nodeDataArrayController]; } -- (IBAction)addNodeAtom:(id)sender { [self addAtomToAC:nodeDataArrayController]; } -- (IBAction)removeNodeProperty:(id)sender { [self removeFromAC:nodeDataArrayController]; } - -- (IBAction)addGraphProperty:(id)sender { [self addPropertyToAC:graphDataArrayController]; } -- (IBAction)addGraphAtom:(id)sender { [self addAtomToAC:graphDataArrayController]; } -- (IBAction)removeGraphProperty:(id)sender { [self removeFromAC:graphDataArrayController]; } - -- (IBAction)addEdgeProperty:(id)sender { [self addPropertyToAC:edgeDataArrayController]; } -- (IBAction)addEdgeAtom:(id)sender { [self addAtomToAC:edgeDataArrayController]; } -- (IBAction)removeEdgeProperty:(id)sender { [self removeFromAC:edgeDataArrayController]; } - -- (IBAction)addEdgeNodeProperty:(id)sender { [self addPropertyToAC:edgeNodeDataArrayController]; } -- (IBAction)addEdgeNodeAtom:(id)sender { [self addAtomToAC:edgeNodeDataArrayController]; } -- (IBAction)removeEdgeNodeProperty:(id)sender { [self removeFromAC:edgeNodeDataArrayController]; } - -//- (BOOL)enableEdgeDataControls { -// NSDocumentController *dc = [NSDocumentController sharedDocumentController]; -// TikzDocument *doc = (TikzDocument*)[dc currentDocument]; -// -// if (doc != nil) { -// return ([[[[doc graphicsView] pickSupport] selectedEdges] count] == 1); -// } else { -// return NO; -// } -//} -// -//- (BOOL)enableEdgeNodeDataControls { -// NSDocumentController *dc = [NSDocumentController sharedDocumentController]; -// TikzDocument *doc = (TikzDocument*)[dc currentDocument]; -// -// if (doc != nil) { -// PickSupport *pick = [[doc graphicsView] pickSupport]; -// if ([[pick selectedEdges] count] == 1) { -// return ([[[pick selectedEdges] anyObject] hasEdgeNode]); -// } else { -// return NO; -// } -// } else { -// return NO; -// } -//} - -@end diff --git a/tikzit-old/src/osx/SelectBoxLayer.h b/tikzit-old/src/osx/SelectBoxLayer.h deleted file mode 100644 index 45b43c7..0000000 --- a/tikzit-old/src/osx/SelectBoxLayer.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// SelectBoxLayer.h -// TikZiT -// -// Created by Aleks Kissinger on 14/06/2010. -// Copyright 2010 __MyCompanyName__. All rights reserved. -// - -#import -#import - -@interface SelectBoxLayer : CALayer { - BOOL active; - CGRect box; -} - -@property (assign) BOOL active; -@property (assign) NSRect selectBox; - -+ (SelectBoxLayer*)layer; - -@end diff --git a/tikzit-old/src/osx/SelectBoxLayer.m b/tikzit-old/src/osx/SelectBoxLayer.m deleted file mode 100644 index a7abe33..0000000 --- a/tikzit-old/src/osx/SelectBoxLayer.m +++ /dev/null @@ -1,48 +0,0 @@ -// -// SelectBoxLayer.m -// TikZiT -// -// Created by Aleks Kissinger on 14/06/2010. -// Copyright 2010 __MyCompanyName__. All rights reserved. -// - -#import "SelectBoxLayer.h" - - -@implementation SelectBoxLayer - -@synthesize active; - -- (id)init { - if (!(self = [super init])) return nil; - box = CGRectMake(0.0f, 0.0f, 0.0f, 0.0f); - active = NO; - return self; -} - -- (void)setSelectBox:(NSRect)r { - box = NSRectToCGRect(r); -} - -- (NSRect)selectBox { - return NSRectFromCGRect(box); -} - -- (void)drawInContext:(CGContextRef)context { - if (active) { - CGContextAddRect(context, box); - - CGContextSetRGBStrokeColor(context, 0.6, 0.6, 0.6, 1); - CGContextSetRGBFillColor(context, 0.8, 0.8, 0.8, 0.2); - CGContextSetLineWidth(context, 1); - - CGContextSetShouldAntialias(context, NO); - CGContextDrawPath(context, kCGPathFillStroke); - } -} - -+ (SelectBoxLayer*)layer { - return [[SelectBoxLayer alloc] init]; -} - -@end diff --git a/tikzit-old/src/osx/SelectableCollectionViewItem.h b/tikzit-old/src/osx/SelectableCollectionViewItem.h deleted file mode 100644 index 4a2c571..0000000 --- a/tikzit-old/src/osx/SelectableCollectionViewItem.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// SelectableCollectionViewItem.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "StylePaletteController.h" - -@interface SelectableCollectionViewItem : NSCollectionViewItem { - IBOutlet StylePaletteController *stylePaletteController; -} - -- (void)setStylePaletteController:(StylePaletteController*)spc; - -@end diff --git a/tikzit-old/src/osx/SelectableCollectionViewItem.m b/tikzit-old/src/osx/SelectableCollectionViewItem.m deleted file mode 100644 index 880c37b..0000000 --- a/tikzit-old/src/osx/SelectableCollectionViewItem.m +++ /dev/null @@ -1,54 +0,0 @@ -// -// SelectableCollectionViewItem.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "SelectableCollectionViewItem.h" -#import "SelectableNodeView.h" - -@implementation SelectableCollectionViewItem - -- (id)copyWithZone:(NSZone *)zone { - SelectableCollectionViewItem *item = [super copyWithZone:zone]; - [item setStylePaletteController:stylePaletteController]; - return (id)item; -} - -- (void)setSelected:(BOOL)flag { - [super setSelected:flag]; - [(SelectableNodeView*)[self view] setSelected:flag]; - - // only fire this event from the view that lost selection - //if (flag == NO) [stylePaletteController selectionDidChange]; - - [[self view] setNeedsDisplay:YES]; -} - -- (void)setRepresentedObject:(id)object { - [super setRepresentedObject:object]; - [(SelectableNodeView*)[self view] setNodeStyle:(NodeStyle*)object]; -} - -- (void)setStylePaletteController:(StylePaletteController*)spc { - stylePaletteController = spc; -} - -@end diff --git a/tikzit-old/src/osx/SelectableNodeView.h b/tikzit-old/src/osx/SelectableNodeView.h deleted file mode 100644 index 6b0841d..0000000 --- a/tikzit-old/src/osx/SelectableNodeView.h +++ /dev/null @@ -1,38 +0,0 @@ -// -// SelectableView.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "NodeLayer.h" -#import "NodeStyle.h" -#import "NodeStyle+Coder.h" - -@interface SelectableNodeView : NSView { - BOOL selected; - NodeLayer *nodeLayer; -} - -@property (assign) BOOL selected; -@property (strong) NodeStyle *nodeStyle; - - -@end diff --git a/tikzit-old/src/osx/SelectableNodeView.m b/tikzit-old/src/osx/SelectableNodeView.m deleted file mode 100644 index 797a137..0000000 --- a/tikzit-old/src/osx/SelectableNodeView.m +++ /dev/null @@ -1,96 +0,0 @@ -// -// SelectableView.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "SelectableNodeView.h" -#import "Shape.h" -#import "Transformer.h" - -@implementation SelectableNodeView - -@synthesize selected; - -- (id)initWithFrame:(NSRect)frameRect { - if (!(self = [super initWithFrame:frameRect])) return nil; - nodeLayer = nil; - return self; -} - --(void)drawLayer:(CALayer *)layer inContext:(CGContextRef)context { -// NSLog(@"got draw"); -// CGContextSaveGState(context); -// -// if (selected) { -// CGContextSetRGBStrokeColor(context, 0.61f, 0.735f, 1.0f, 1.0f); -// CGContextSetRGBFillColor(context, 0.61f, 0.735f, 1.0f, 0.5f); -// CGContextSetLineWidth(context, 1.0f); -// -// CGRect box = CGRectMake([layer frame].origin.x + 2, -// [layer frame].origin.y + 2, -// [layer frame].size.width - 4, -// [layer frame].size.height - 4); -// -// //CGContextAddRect(context, box); -// CGContextDrawPath(context, kCGPathFillStroke); -// } -// -// CGContextRestoreGState(context); - - if (nodeLayer!=nil) { - if (![[[self layer] sublayers] containsObject:nodeLayer]) { - [[self layer] addSublayer:nodeLayer]; - NSPoint c = NSMakePoint(CGRectGetMidX([[self layer] frame]), - CGRectGetMidY([[self layer] frame])); - [nodeLayer setCenter:c andAnimateWhen:NO]; - } - - if (selected) [[nodeLayer selection] select]; - else [[nodeLayer selection] deselect]; - - [nodeLayer updateFrame]; - } -} - -- (void)drawRect:(NSRect)rect { - [super drawRect:rect]; -} - -- (BOOL)acceptsFirstMouse:(NSEvent *)theEvent { return YES; } - -- (void)setNodeStyle:(NodeStyle *)sty { - if (nodeLayer == nil) { - nodeLayer = [[NodeLayer alloc] initWithNode:[Node node] - transformer:[Transformer defaultTransformer]]; - [nodeLayer setRescale:NO]; - } - - [[nodeLayer node] setStyle:sty]; - [nodeLayer updateFrame]; -} - -- (NodeStyle*)nodeStyle { - if (nodeLayer != nil) return [[nodeLayer node] style]; - else return nil; -} - - -@end diff --git a/tikzit-old/src/osx/StylePaletteController.h b/tikzit-old/src/osx/StylePaletteController.h deleted file mode 100644 index 05f0684..0000000 --- a/tikzit-old/src/osx/StylePaletteController.h +++ /dev/null @@ -1,80 +0,0 @@ -// -// StylePaletteController.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "NodeStyle.h" -#import "EdgeStyle.h" - -@class SFBInspectorView; - -@interface StylePaletteController : NSWindowController { - NSMutableArray *nodeStyles; - NSMutableArray *edgeStyles; - IBOutlet NSArrayController *nodeStyleArrayController; - IBOutlet NSArrayController *filteredNodeStyleArrayController; - IBOutlet NSArrayController *edgeStyleArrayController; - IBOutlet NSArrayController *filteredEdgeStyleArrayController; - IBOutlet NSCollectionView *collectionView; - IBOutlet SFBInspectorView *nodeStyleInspectorView; - IBOutlet NSView *nodeStyleView; - IBOutlet NSView *edgeStyleView; - IBOutlet NSPopUpButton *shapeDropdown; - NSString *displayedNodeStyleCategory; - NSString *displayedEdgeStyleCategory; -} - -@property (strong) NSMutableArray *nodeStyles; -@property (strong) NSMutableArray *edgeStyles; -@property (readonly) BOOL documentActive; -@property (strong) NodeStyle *activeNodeStyle; -@property (strong) EdgeStyle *activeEdgeStyle; -@property (copy) NSString *displayedNodeStyleCategory; -@property (copy) NSString *displayedEdgeStyleCategory; -@property (readonly) NSPredicate *displayedNodeStylePredicate; -@property (readonly) NSPredicate *displayedEdgeStylePredicate; - -//@property NSString *nodeLabel; - -- (id)initWithWindowNibName:(NSString *)windowNibName - supportDir:(NSString*)supportDir; -- (void)saveStyles:(NSString *)plist; - -- (IBAction)refreshCollection:(id)sender; - -- (IBAction)applyActiveNodeStyle:(id)sender; -- (IBAction)clearActiveNodeStyle:(id)sender; -- (IBAction)addNodeStyle:(id)sender; - -- (IBAction)appleActiveEdgeStyle:(id)sender; -- (IBAction)clearActiveEdgeStyle:(id)sender; -- (IBAction)addEdgeStyle:(id)sender; -- (void)setActiveEdgeStyle:(EdgeStyle*)style; - -- (IBAction)setFillToClosestHashed:(id)sender; -- (IBAction)setStrokeToClosestHashed:(id)sender; - - -//- (IBAction)changeShape:(id)sender; - - -@end diff --git a/tikzit-old/src/osx/StylePaletteController.m b/tikzit-old/src/osx/StylePaletteController.m deleted file mode 100644 index 4fe46be..0000000 --- a/tikzit-old/src/osx/StylePaletteController.m +++ /dev/null @@ -1,252 +0,0 @@ -// -// StylePaletteController.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "StylePaletteController.h" -#import "TikzDocument.h" -#import "SFBInspectors/SFBInspectorView.h" -#import "PickSupport.h" -#import "Node.h" -#import "Edge.h" -#import "NodeStyle.h" -#import "GraphicsView.h" -#import "GraphElementProperty.h" -#import "Shape.h" - -@implementation StylePaletteController - -@synthesize nodeStyles, edgeStyles; - -- (id)initWithWindowNibName:(NSString *)windowNibName - supportDir:(NSString*)supportDir -{ - if (self = [super initWithWindowNibName:windowNibName]) { - NSString *ns = [supportDir stringByAppendingPathComponent:@"nodeStyles.plist"]; - NSString *es = [supportDir stringByAppendingPathComponent:@"edgeStyles.plist"]; - nodeStyles = (NSMutableArray*)[NSKeyedUnarchiver - unarchiveObjectWithFile:ns]; - edgeStyles = (NSMutableArray*)[NSKeyedUnarchiver - unarchiveObjectWithFile:es]; - - if (nodeStyles == nil) nodeStyles = [NSMutableArray array]; - if (edgeStyles == nil) edgeStyles = [NSMutableArray array]; - - if ([[NSUserDefaults standardUserDefaults] boolForKey:@"net.sourceforge.tikzit.inspectorsontop"] == YES) { - [[self window] setLevel:NSFloatingWindowLevel]; - } else { - [[self window] setLevel:NSNormalWindowLevel]; - } - - [self showWindow:self]; - } - - return self; -} - -- (void)windowDidLoad { - [[self window] setMovableByWindowBackground:YES]; - [shapeDropdown addItemsWithTitles:[[Shape shapeDictionary] allKeys]]; - if ([self activeNodeStyle] != nil) { - [shapeDropdown setTitle:[[self activeNodeStyle] shapeName]]; - } - - [nodeStyleInspectorView addInspectorPane:nodeStyleView - title:@"Node Styles"]; - - [nodeStyleInspectorView addInspectorPane:edgeStyleView - title:@"Edge Styles"]; - - [super windowDidLoad]; -} - -- (void)saveStyles:(NSString*)supportDir { - NSString *ns = [supportDir stringByAppendingPathComponent:@"nodeStyles.plist"]; - NSString *es = [supportDir stringByAppendingPathComponent:@"edgeStyles.plist"]; - [NSKeyedArchiver archiveRootObject:nodeStyles toFile:ns]; - [NSKeyedArchiver archiveRootObject:edgeStyles toFile:es]; -} - -- (IBAction)refreshCollection:(id)sender { - [collectionView setNeedsDisplay:YES]; -} - - -- (BOOL)documentActive { - NSDocumentController *dc = [NSDocumentController sharedDocumentController]; - return dc.currentDocument != nil; -} - --(BOOL)collectionView:(NSCollectionView*)collectionView canDragItemsAtIndexes:(NSIndexSet*)indexes withEvent:(NSEvent*)event { - return YES; -} - - -//=========================== -//= setting SVG-safe colors = -//=========================== -- (IBAction)setFillToClosestHashed:(id)sender { - NSArray *sel = [nodeStyleArrayController selectedObjects]; - if ([sel count] != 0) { - NodeStyle *sty = [sel objectAtIndex:0]; - [sty willChangeValueForKey:@"fillColor"]; - [sty willChangeValueForKey:@"fillColorIsKnown"]; - [sty.fillColorRGB setToClosestHashed]; - [sty didChangeValueForKey:@"fillColor"]; - [sty didChangeValueForKey:@"fillColorIsKnown"]; - } -} - -- (IBAction)setStrokeToClosestHashed:(id)sender { - NSArray *sel = [nodeStyleArrayController selectedObjects]; - if ([sel count] != 0) { - NodeStyle *sty = [sel objectAtIndex:0]; - [sty willChangeValueForKey:@"strokeColor"]; - [sty willChangeValueForKey:@"strokeColorIsKnown"]; - [sty.strokeColorRGB setToClosestHashed]; - [sty didChangeValueForKey:@"strokeColor"]; - [sty didChangeValueForKey:@"strokeColorIsKnown"]; - } -} - -//================================================= -//= setting filter predicates for nodes and edges = -//================================================= -- (NSString*)displayedNodeStyleCategory { - return displayedNodeStyleCategory; -} - -- (void)setDisplayedNodeStyleCategory:(NSString *)cat { - [self willChangeValueForKey:@"displayedNodeStylePredicate"]; - displayedNodeStyleCategory = cat; - [self didChangeValueForKey:@"displayedNodeStylePredicate"]; -} - -- (NSString*)displayedEdgeStyleCategory { - return displayedEdgeStyleCategory; -} - -- (void)setDisplayedEdgeStyleCategory:(NSString *)cat { - [self willChangeValueForKey:@"displayedEdgeStylePredicate"]; - displayedEdgeStyleCategory = cat; - [self didChangeValueForKey:@"displayedEdgeStylePredicate"]; -} - -- (NSPredicate*)displayedNodeStylePredicate { - return [NSPredicate predicateWithFormat:@"category == %@", displayedNodeStyleCategory]; -} - -- (NSPredicate*)displayedEdgeStylePredicate { - return [NSPredicate predicateWithFormat:@"category == %@", displayedEdgeStyleCategory]; -} - - -//============================== -//= getting and setting styles = -//============================== - -- (IBAction)applyActiveNodeStyle:(id)sender { - NSDocumentController *dc = [NSDocumentController sharedDocumentController]; - TikzDocument *doc = (TikzDocument*)[dc currentDocument]; - - if (doc != nil) { - [[doc graphicsView] applyStyleToSelectedNodes:[self activeNodeStyle]]; - } - - [[doc graphicsView] postSelectionChange]; -} - -- (IBAction)clearActiveNodeStyle:(id)sender { - [self setActiveNodeStyle:nil]; - - NSDocumentController *dc = [NSDocumentController sharedDocumentController]; - TikzDocument *doc = (TikzDocument*)[dc currentDocument]; - - if (doc != nil) { - [[doc graphicsView] applyStyleToSelectedNodes:nil]; - } - - [[doc graphicsView] postSelectionChange]; -} - -- (NodeStyle*)activeNodeStyle { - NSArray *sel = [filteredNodeStyleArrayController selectedObjects]; - if ([sel count] == 0) return nil; - else return [sel objectAtIndex:0]; -} - -- (void)setActiveNodeStyle:(NodeStyle*)style { - if ([nodeStyles containsObject:style]) { - [filteredNodeStyleArrayController setSelectedObjects:[NSArray arrayWithObject:style]]; - } else { - [filteredNodeStyleArrayController setSelectedObjects:[NSArray array]]; - } -} - -- (IBAction)appleActiveEdgeStyle:(id)sender { - NSDocumentController *dc = [NSDocumentController sharedDocumentController]; - TikzDocument *doc = (TikzDocument*)[dc currentDocument]; - - if (doc != nil) { - [[doc graphicsView] applyStyleToSelectedEdges:[self activeEdgeStyle]]; - } -} - -- (IBAction)clearActiveEdgeStyle:(id)sender { - [self setActiveEdgeStyle:nil]; - [self appleActiveEdgeStyle:sender]; -} - -- (EdgeStyle*)activeEdgeStyle { - NSArray *sel = [filteredEdgeStyleArrayController selectedObjects]; - if ([sel count] == 0) return nil; - else return [sel objectAtIndex:0]; -} - -- (void)setActiveEdgeStyle:(EdgeStyle*)style { - if ([edgeStyles containsObject:style]) { - [filteredEdgeStyleArrayController setSelectedObjects:[NSArray arrayWithObject:style]]; - } else { - [filteredEdgeStyleArrayController setSelectedObjects:[NSArray array]]; - } -} - - -//================= -//= adding styles = -//================= - -- (IBAction)addEdgeStyle:(id)sender { - EdgeStyle *sty = [[EdgeStyle alloc] init]; - [sty setCategory:displayedEdgeStyleCategory]; - [edgeStyleArrayController addObject:sty]; - [self setActiveEdgeStyle:sty]; -} - -- (IBAction)addNodeStyle:(id)sender { - NodeStyle *sty = [[NodeStyle alloc] init]; - [sty setCategory:displayedNodeStyleCategory]; - [nodeStyleArrayController addObject:sty]; - [self setActiveNodeStyle:sty]; -} - - -@end diff --git a/tikzit-old/src/osx/TikzDocument.h b/tikzit-old/src/osx/TikzDocument.h deleted file mode 100644 index 1881994..0000000 --- a/tikzit-old/src/osx/TikzDocument.h +++ /dev/null @@ -1,37 +0,0 @@ -// -// TikzDocument.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import "GraphicsView.h" -#import "TikzSourceController.h" -#import "PreviewController.h" -#import "GraphicsView.h" - -@interface TikzDocument : NSDocument { - NSString *tikz; -} - -@property (readonly) NSString *tikz; -@property (weak, readonly) GraphicsView *graphicsView; - -@end diff --git a/tikzit-old/src/osx/TikzDocument.m b/tikzit-old/src/osx/TikzDocument.m deleted file mode 100644 index ef5908d..0000000 --- a/tikzit-old/src/osx/TikzDocument.m +++ /dev/null @@ -1,84 +0,0 @@ -// -// TikzDocument.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "TikzDocument.h" -#import "TikzWindowController.h" - -@implementation TikzDocument - -@synthesize tikz; - -- (id)init { - self = [super init]; - if (self) { - tikz = nil; - } - return self; -} - -//- (NSString *)windowNibName { -// // Override returning the nib file name of the document -// // If you need to use a subclass of NSWindowController or if your document supports multiple NSWindowControllers, you should remove this method and override -makeWindowControllers instead. -// return @"TikzDocument"; -//} - -- (void)makeWindowControllers { - TikzWindowController *wc = [[TikzWindowController alloc] initWithDocument:self]; - [self addWindowController:wc]; -} - -- (void)windowControllerDidLoadNib:(NSWindowController *) aController { - [super windowControllerDidLoadNib:aController]; - [[self graphicsView] refreshLayers]; - // Add any code here that needs to be executed once the windowController has loaded the document's window. -} - -- (NSData *)dataOfType:(NSString *)typeName error:(NSError **)outError { - TikzWindowController *wc = - (TikzWindowController*)[[self windowControllers] objectAtIndex:0]; - NSData *outData = [[[wc tikzSourceController] tikz] dataUsingEncoding:NSUTF8StringEncoding]; - - if ( outError != NULL ) { - *outError = [NSError errorWithDomain:NSOSStatusErrorDomain code:unimpErr userInfo:NULL]; - } - return outData; -} - -- (BOOL)readFromData:(NSData *)data ofType:(NSString *)typeName error:(NSError **)outError { - tikz = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]; - - if ( outError != NULL ) { - *outError = [NSError errorWithDomain:NSOSStatusErrorDomain code:unimpErr userInfo:NULL]; - } - - return YES; -} - -- (GraphicsView*)graphicsView { - TikzWindowController *wc = - (TikzWindowController*)[[self windowControllers] objectAtIndex:0]; - return [wc graphicsView]; -} - - -@end diff --git a/tikzit-old/src/osx/TikzFormatter.h b/tikzit-old/src/osx/TikzFormatter.h deleted file mode 100644 index 4d9ec04..0000000 --- a/tikzit-old/src/osx/TikzFormatter.h +++ /dev/null @@ -1,29 +0,0 @@ -// -// NSTikzFormatter.h -// TikZiT -// -// Created by Karl Johan Paulsson on 27/01/2013. -// Copyright (c) 2013 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import - -@interface TikzFormatter : NSFormatter - -@end diff --git a/tikzit-old/src/osx/TikzFormatter.m b/tikzit-old/src/osx/TikzFormatter.m deleted file mode 100644 index cb0865d..0000000 --- a/tikzit-old/src/osx/TikzFormatter.m +++ /dev/null @@ -1,91 +0,0 @@ -// -// NSTikzFormatter.m -// TikZiT -// -// Created by Karl Johan Paulsson on 27/01/2013. -// Copyright (c) 2013 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "TikzFormatter.h" -#import "TikzGraphAssembler.h" - -@implementation TikzFormatter - -- (NSString *)stringForObjectValue:(id)obj{ - if (![obj isKindOfClass:[NSString class]]) { - return @""; - } - - return [NSString stringWithString:obj]; -} - -- (BOOL)getObjectValue:(out id *)obj forString:(NSString *)string errorDescription:(out NSString **)error{ - *obj = [NSString stringWithString:string]; - - BOOL r = [TikzGraphAssembler validateTikzPropertyNameOrValue:string]; - - if (!r && error) - *error = NSLocalizedString(@"Invalid input, couldn't parse value.", @"tikz user input error"); - - return r; -} - -- (BOOL)isPartialStringValid:(NSString **)partialStringPtr proposedSelectedRange:(NSRangePointer)proposedSelRangePtr originalString:(NSString *)origString originalSelectedRange:(NSRange)origSelRange errorDescription:(NSString **)error{ - NSRange addedRange; - NSString *addedString; - - if(![[NSUserDefaults standardUserDefaults] boolForKey:@"net.sourceforge.tikzit.autocomplete"]){ - return YES; - } - - addedRange = NSMakeRange(origSelRange.location, proposedSelRangePtr->location - origSelRange.location); - addedString = [*partialStringPtr substringWithRange: addedRange]; - - if([addedString isEqualToString:@"{"]){ - NSString *s = [[NSString stringWithString:*partialStringPtr] stringByAppendingString:@"}"]; - *partialStringPtr = s; - - return NO; - } - - if([addedString isEqualToString:@"}"]){ - NSScanner *scanner = [NSScanner scannerWithString:*partialStringPtr]; - - NSCharacterSet *cs = [NSCharacterSet characterSetWithCharactersInString:@"{}"]; - NSMutableString *strippedString = [NSMutableString stringWithCapacity:[*partialStringPtr length]]; - - while ([scanner isAtEnd] == NO) { - NSString *buffer; - if ([scanner scanCharactersFromSet:cs intoString:&buffer]) { - [strippedString appendString:buffer]; - - } else { - [scanner setScanLocation:([scanner scanLocation] + 1)]; - } - } - - if([strippedString length] % 2 == 1){ - return NO; - } - } - - return YES; -} - -@end diff --git a/tikzit-old/src/osx/TikzSourceController.h b/tikzit-old/src/osx/TikzSourceController.h deleted file mode 100644 index 84d36da..0000000 --- a/tikzit-old/src/osx/TikzSourceController.h +++ /dev/null @@ -1,71 +0,0 @@ -// -// TikzSourceController.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import - -#import "GraphicsView.h" -#import "ParseErrorView.h" - -@interface TikzSourceController : NSObject { - GraphicsView *__weak graphicsView; - NSTextView *__unsafe_unretained sourceView; - NSAttributedString *source; - NSTextField *__weak status; - NSDictionary *textAttrs; - NSColor *successColor; - NSColor *failedColor; - NSTextField *__weak errorMessage; - ParseErrorView *__weak errorNotification; - - NSUndoManager *__weak documentUndoManager; - - BOOL tikzChanged; - BOOL justUndid; - - NSError *lastError; -} - -@property BOOL tikzChanged; -@property (weak) IBOutlet GraphicsView *graphicsView; -@property (unsafe_unretained) IBOutlet NSTextView *sourceView; -@property (weak) IBOutlet NSTextField *status; -@property (weak) NSUndoManager *documentUndoManager; -@property (copy) NSAttributedString *source; -@property (copy) NSString *tikz; -@property (weak) IBOutlet ParseErrorView *errorNotification; -@property (weak) IBOutlet NSTextField *errorMessage; - -- (void)updateTikzFromGraph; -- (void)graphChanged:(NSNotification*)n; - -- (IBAction)closeParseError:(id)pId; - -// called by code, these do not register an undo -- (BOOL)tryParseTikz; -- (void)doRevertTikz; - -// called by user, these do register an undo -- (void)parseTikz:(id)sender; -- (void)revertTikz:(id)sender; - -@end diff --git a/tikzit-old/src/osx/TikzSourceController.m b/tikzit-old/src/osx/TikzSourceController.m deleted file mode 100644 index 84eb3a5..0000000 --- a/tikzit-old/src/osx/TikzSourceController.m +++ /dev/null @@ -1,241 +0,0 @@ -// -// TikzSourceController.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "TikzSourceController.h" -#import "TikzGraphAssembler.h" -#import "Graph.h" - -@implementation TikzSourceController - -@synthesize graphicsView, sourceView, source, status; -@synthesize documentUndoManager, tikzChanged; -@synthesize errorMessage, errorNotification; - -- (void)endEditing { - NSResponder *res = [[sourceView window] firstResponder]; - [[sourceView window] makeFirstResponder:nil]; - [[sourceView window] makeFirstResponder:res]; -} - -- (void)undoParseTikz:(Graph *)oldGraph { - [graphicsView setGraph:oldGraph]; - [graphicsView setEnabled:NO]; - [graphicsView postGraphChange]; - [graphicsView refreshLayers]; - - [documentUndoManager registerUndoWithTarget:self - selector:@selector(parseTikz:) - object:self]; - [documentUndoManager setActionName:@"Parse Tikz"]; -} - -- (void)undoRevertTikz:(NSString*)oldTikz { - [self setTikz:oldTikz]; - [graphicsView setEnabled:NO]; - [graphicsView refreshLayers]; - - [documentUndoManager registerUndoWithTarget:self - selector:@selector(revertTikz:) - object:self]; - [documentUndoManager setActionName:@"Revert Tikz"]; -} - -- (void)undoTikzChange:(id)ignore { - [graphicsView setEnabled:YES]; - [graphicsView refreshLayers]; - [self endEditing]; - [self updateTikzFromGraph]; - [documentUndoManager registerUndoWithTarget:self - selector:@selector(redoTikzChange:) - object:nil]; - [documentUndoManager setActionName:@"Tikz Change"]; -} - -- (void)redoTikzChange:(id)ignore { - [graphicsView setEnabled:NO]; - [graphicsView refreshLayers]; - [documentUndoManager registerUndoWithTarget:self - selector:@selector(undoTikzChange:) - object:nil]; - [documentUndoManager setActionName:@"Tikz Change"]; -} - - -- (void)awakeFromNib { - justUndid = NO; - successColor = [NSColor colorWithCalibratedRed:0.0f - green:0.5f - blue:0.0f - alpha:1.0f]; - failedColor = [NSColor redColor]; - - NSFont *font = [NSFont userFixedPitchFontOfSize:11.0f]; - - if (font != nil) { - textAttrs = [NSDictionary dictionaryWithObject:font - forKey:NSFontAttributeName]; - } else { - NSLog(@"WARNING: couldn't find monospaced font."); - textAttrs = [NSDictionary dictionary]; - } - - - [self graphChanged:nil]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(graphChanged:) - name:@"GraphChanged" - object:graphicsView]; -} - -- (void)setTikz:(NSString *)str { - [self willChangeValueForKey:@"source"]; - source = [[NSAttributedString alloc] initWithString:str attributes:textAttrs]; - [self didChangeValueForKey:@"source"]; -} - -- (NSString*)tikz { - return [source string]; -} - -- (void)updateTikzFromGraph { - [self setTikz:[[graphicsView graph] tikz]]; - [errorNotification setHidden:TRUE]; -} - -- (void)graphChanged:(NSNotification*)n { - if ([graphicsView enabled]) [self updateTikzFromGraph]; -} - -- (IBAction)closeParseError:(id)pId{ - [errorNotification setHidden:TRUE]; -} - -- (void)textDidBeginEditing:(NSNotification *)notification { - if ([graphicsView enabled]){ - [graphicsView setEnabled:NO]; - [graphicsView refreshLayers]; - [documentUndoManager registerUndoWithTarget:self - selector:@selector(undoTikzChange:) - object:nil]; - [documentUndoManager setActionName:@"Tikz Change"]; - } -} - -- (BOOL)tryParseTikz { - NSError *thisError; - - Graph *g = [TikzGraphAssembler parseTikz:[self tikz] - error:&thisError]; - - lastError = thisError; - - if (g) { - [graphicsView deselectAll:self]; - [graphicsView setGraph:g]; - [graphicsView refreshLayers]; - [self doRevertTikz]; - return YES; - } else { - return NO; - } -} - -- (void)doRevertTikz { - [self updateTikzFromGraph]; - [self endEditing]; - [graphicsView setEnabled:YES]; - [graphicsView refreshLayers]; - [status setStringValue:@""]; -} - -- (void)parseTikz:(id)sender { - if (![graphicsView enabled]) { - Graph *oldGraph = [graphicsView graph]; - if ([self tryParseTikz]) { - [self endEditing]; - [documentUndoManager registerUndoWithTarget:self - selector:@selector(undoParseTikz:) - object:oldGraph]; - [documentUndoManager setActionName:@"Parse Tikz"]; - - [status setStringValue:@"success"]; - [status setTextColor:successColor]; - - [errorNotification setHidden:TRUE]; - } else { - [status setStringValue:@"parse error"]; - [status setTextColor:failedColor]; - - NSDictionary *d = [lastError userInfo]; - - NSString *ts = [NSString stringWithFormat: @"Parse error on line %@: %@\n", [d valueForKey:@"startLine"], [d valueForKey:NSLocalizedDescriptionKey]]; - NSMutableAttributedString *as = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat: @"Parse error on line %@: %@\n%@\n", [d valueForKey:@"startLine"], [d valueForKey:NSLocalizedDescriptionKey], [[d valueForKey:@"syntaxString"] stringByReplacingOccurrencesOfString:@"\t" withString:@""]]]; - - NSInteger tokenLength = [[d valueForKey:@"tokenLength"] integerValue]; - // Bit of a mess, offset around to find correct position and correct for 4 characters for every one character of \t - NSInteger addedTokenStart = [[d valueForKey:@"tokenStart"] integerValue] + [ts length] - ([[[d valueForKey:@"syntaxString"] componentsSeparatedByString:@"\t"] count]-1)*4 - tokenLength; - - // Can't see if the error is a start paranthesis as only that will be underlined, underline the entire paranthesis instead - if(tokenLength == 1 && [[as string] characterAtIndex:addedTokenStart] == '('){ - tokenLength += [[[as string] substringFromIndex:addedTokenStart+1] rangeOfString:@")"].location + 1; - } - - // Same if unexpected endparanthesis - if(tokenLength == 1 && [[as string] characterAtIndex:addedTokenStart] == ')'){ - NSInteger d = addedTokenStart - [[[as string] substringToIndex:addedTokenStart] rangeOfString:@"(" options:NSBackwardsSearch].location; - - tokenLength += d; - addedTokenStart -= d; - } - - [as beginEditing]; - [as addAttributes:[NSDictionary dictionaryWithObjectsAndKeys: - [NSNumber numberWithInt:NSUnderlineStyleSingle | NSUnderlinePatternDot], NSUnderlineStyleAttributeName, - [NSColor redColor], NSUnderlineColorAttributeName, - nil] - range:NSMakeRange(addedTokenStart, tokenLength)]; - [as endEditing]; - - [errorMessage setAttributedStringValue:as]; - [errorNotification setHidden:FALSE]; - } - } -} - -- (void)revertTikz:(id)sender { - if (![graphicsView enabled]) { - NSString *oldTikz = [[self tikz] copy]; - [self doRevertTikz]; - - [documentUndoManager registerUndoWithTarget:self - selector:@selector(undoRevertTikz:) - object:oldTikz]; - [documentUndoManager setActionName:@"Revert Tikz"]; - } -} - -- (void)dealloc { - [[NSNotificationCenter defaultCenter] removeObserver:self]; -} - -@end diff --git a/tikzit-old/src/osx/TikzWindowController.h b/tikzit-old/src/osx/TikzWindowController.h deleted file mode 100644 index eab427c..0000000 --- a/tikzit-old/src/osx/TikzWindowController.h +++ /dev/null @@ -1,31 +0,0 @@ -// -// TikzWindowController.h -// TikZiT -// -// Created by Aleks Kissinger on 26/01/2011. -// Copyright 2011 __MyCompanyName__. All rights reserved. -// - -#import - -@class TikzDocument, GraphicsView, TikzSourceController; - -@interface TikzWindowController : NSWindowController { - GraphicsView *__weak graphicsView; - TikzSourceController *__weak tikzSourceController; - TikzDocument *document; -} - -@property (weak) IBOutlet GraphicsView *graphicsView; -@property (weak) IBOutlet TikzSourceController *tikzSourceController; - -- (id)initWithDocument:(TikzDocument*)doc; - -// pass these straight to the tikz source controller -- (void)parseTikz:(id)sender; -- (void)revertTikz:(id)sender; -- (void)zoomIn:(id)sender; -- (void)zoomOut:(id)sender; -- (void)zoomToActualSize:(id)sender; - -@end diff --git a/tikzit-old/src/osx/TikzWindowController.m b/tikzit-old/src/osx/TikzWindowController.m deleted file mode 100644 index bfacbfb..0000000 --- a/tikzit-old/src/osx/TikzWindowController.m +++ /dev/null @@ -1,66 +0,0 @@ -// -// TikzWindowController.m -// TikZiT -// -// Created by Aleks Kissinger on 26/01/2011. -// Copyright 2011 __MyCompanyName__. All rights reserved. -// - -#import "TikzWindowController.h" -#import "TikzDocument.h" -#import "GraphicsView.h" -#import "TikzSourceController.h" - -@implementation TikzWindowController - -@synthesize graphicsView, tikzSourceController; - -- (id)initWithDocument:(TikzDocument*)doc { - if (!(self = [super initWithWindowNibName:@"TikzDocument"])) return nil; - document = doc; - return self; -} - -- (void)awakeFromNib { - if ([document tikz] != nil) { - [graphicsView setEnabled:NO]; - [tikzSourceController setTikz:[document tikz]]; - [tikzSourceController parseTikz:self]; - } - - [graphicsView setDocumentUndoManager:[document undoManager]]; - [tikzSourceController setDocumentUndoManager:[document undoManager]]; -} - -- (void)parseTikz:(id)sender { - [tikzSourceController parseTikz:sender]; -} - -- (void)revertTikz:(id)sender { - [tikzSourceController revertTikz:sender]; -} - -- (void)previewTikz:(id)sender { - PreviewController *pc = [PreviewController defaultPreviewController]; - if (![[pc window] isVisible]) [pc showWindow:sender]; - [pc buildTikz:[tikzSourceController tikz]]; -} - -- (void)zoomIn:(id)sender { - float scale = [[graphicsView transformer] scale] * 1.25f; - [[graphicsView transformer] setScale:scale]; - [graphicsView refreshLayers]; -} - -- (void)zoomOut:(id)sender { - float scale = [[graphicsView transformer] scale] * 0.8f; - [[graphicsView transformer] setScale:scale]; - [graphicsView refreshLayers]; -} - -- (void)zoomToActualSize:(id)sender { - [[graphicsView transformer] setScale:50.0f]; - [graphicsView refreshLayers]; -} - -@end diff --git a/tikzit-old/src/osx/ToolPaletteController.h b/tikzit-old/src/osx/ToolPaletteController.h deleted file mode 100644 index 6301c6b..0000000 --- a/tikzit-old/src/osx/ToolPaletteController.h +++ /dev/null @@ -1,42 +0,0 @@ -// -// ToolPaletteController.h -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// -#import - -typedef enum { - TikzToolSelect, - TikzToolNode, - TikzToolEdge, - TikzToolCrop -} TikzTool; - -@interface ToolPaletteController : NSObject { - NSPanel *__weak toolPalette; - NSMatrix *__weak toolMatrix; -} - -@property TikzTool selectedTool; -@property (weak) IBOutlet NSPanel *toolPalette; -@property (weak) IBOutlet NSMatrix *toolMatrix; - - -@end diff --git a/tikzit-old/src/osx/ToolPaletteController.m b/tikzit-old/src/osx/ToolPaletteController.m deleted file mode 100644 index 000287d..0000000 --- a/tikzit-old/src/osx/ToolPaletteController.m +++ /dev/null @@ -1,58 +0,0 @@ -// -// ToolPaletteController.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "ToolPaletteController.h" - - -@implementation ToolPaletteController - -@synthesize toolPalette, toolMatrix; - -- (TikzTool)selectedTool { - switch (toolMatrix.selectedRow) { - case 0: return TikzToolSelect; - case 1: return TikzToolNode; - case 2: return TikzToolEdge; - case 3: return TikzToolCrop; - } - return TikzToolSelect; -} - -- (void)setSelectedTool:(TikzTool)tool { - switch (tool) { - case TikzToolSelect: - [toolMatrix selectCellAtRow:0 column:0]; - break; - case TikzToolNode: - [toolMatrix selectCellAtRow:1 column:0]; - break; - case TikzToolEdge: - [toolMatrix selectCellAtRow:2 column:0]; - break; - case TikzToolCrop: - [toolMatrix selectCellAtRow:3 column:0]; - break; - } -} - -@end diff --git a/tikzit-old/src/osx/UpdatePreferenceController.h b/tikzit-old/src/osx/UpdatePreferenceController.h deleted file mode 100644 index 816322f..0000000 --- a/tikzit-old/src/osx/UpdatePreferenceController.h +++ /dev/null @@ -1,34 +0,0 @@ -// -// UpdatePreferenceController.h -// TikZiT -// -// Copyright (c) 2013 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import -#import - -@interface UpdatePreferenceController : NSViewController{ - IBOutlet SUUpdater *sharedUpdater; - IBOutlet NSDate *lastUpdate; -} - -- (IBAction)checkForUpdates:(id)sender; - -@end diff --git a/tikzit-old/src/osx/UpdatePreferenceController.m b/tikzit-old/src/osx/UpdatePreferenceController.m deleted file mode 100644 index 2ff270f..0000000 --- a/tikzit-old/src/osx/UpdatePreferenceController.m +++ /dev/null @@ -1,49 +0,0 @@ -// -// UpdatePreferenceController.h -// TikZiT -// -// Copyright (c) 2013 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "UpdatePreferenceController.h" - -@interface UpdatePreferenceController () - -@end - -@implementation UpdatePreferenceController - -- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil -{ - self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]; - if (self) { - sharedUpdater = [SUUpdater sharedUpdater]; - } - return self; -} - -- (IBAction)checkForUpdates:(id)sender{ - [sharedUpdater checkForUpdates:sender]; -} - -- (NSDate*)getLastUpdate{ - return [sharedUpdater lastUpdateCheckDate]; -} - -@end diff --git a/tikzit-old/src/osx/UpdatePreferencePanel.xib b/tikzit-old/src/osx/UpdatePreferencePanel.xib deleted file mode 100644 index a9f57bd..0000000 --- a/tikzit-old/src/osx/UpdatePreferencePanel.xib +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tikzit-old/src/osx/main.m b/tikzit-old/src/osx/main.m deleted file mode 100644 index e6b4499..0000000 --- a/tikzit-old/src/osx/main.m +++ /dev/null @@ -1,26 +0,0 @@ -// -// main.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// - -#import - -int main(int argc, char *argv[]) -{ - return NSApplicationMain(argc, (const char **) argv); -} diff --git a/tikzit-old/src/osx/test/main.m b/tikzit-old/src/osx/test/main.m deleted file mode 100644 index ad0c1f7..0000000 --- a/tikzit-old/src/osx/test/main.m +++ /dev/null @@ -1,56 +0,0 @@ -// -// main.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// - -#import "test/test.h" -#include - -void testCommon(); -void testOSX(); - -int main(int argc, char **argv) { - if (argc == 2 && strcmp(argv[1], "--disable-color")==0) { - setColorEnabled(NO); - } else { - setColorEnabled(YES); - } - - NSBundle *bund = [NSBundle bundleWithPath:@"TikZiT.app"]; - - - PUTS(@""); - PUTS(@"**********************************************"); - PUTS(@"TikZiT TESTS, OS X BUNDLE VERSION %@", - [bund objectForInfoDictionaryKey:@"CFBundleVersion"]); - PUTS(@"**********************************************"); - PUTS(@""); - - startTests(); - testCommon(); - testOSX(); - - PUTS(@""); - PUTS(@"**********************************************"); - endTests(); - PUTS(@"**********************************************"); - PUTS(@""); -} \ No newline at end of file diff --git a/tikzit-old/src/osx/test/osx.m b/tikzit-old/src/osx/test/osx.m deleted file mode 100644 index f9565ab..0000000 --- a/tikzit-old/src/osx/test/osx.m +++ /dev/null @@ -1,64 +0,0 @@ -// -// osx.m -// TikZiT -// -// Copyright 2010 Aleks Kissinger. All rights reserved. -// -// -// This file is part of TikZiT. -// -// TikZiT is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// TikZiT is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with TikZiT. If not, see . -// -#import "test/test.h" - -#import - -void testOSX() { -// char template[] = "/tmp/tikzit_test_tmp_XXXXXXX"; -// char *dir = mkdtemp(template); -// NSString *tempDir = [NSString stringWithUTF8String:dir]; -// -// NSString *testLatex = -// @"\\documentclass{article}\n" -// @"\\begin{document}\n" -// @"test document\n" -// @"\\end{document}\n"; -// -// NSString *texFile = [NSString stringWithFormat:@"%@/test.tex", tempDir]; -// NSString *pdfFile = [NSString stringWithFormat:@"%@/test.pdf", tempDir]; -// -// [testLatex writeToFile:texFile atomically:NO encoding:NSUTF8StringEncoding error:NULL]; -// -// NSTask *task = [[NSTask alloc] init]; -// [task setLaunchPath:@"/bin/bash"]; -// NSPipe *inpt = [NSPipe pipe]; -// NSPipe *outpt = [NSPipe pipe]; -// [task setStandardInput:inpt]; -// [task setStandardOutput:outpt]; -// -// [task launch]; -// -// NSFileHandle *wr = [inpt fileHandleForWriting]; -// NSString *cmd = -// [NSString stringWithFormat: -// @"if [ -e ~/.profile ]; then source ~/.profile; fi" -// @"if [ -e ~/.profile ]; then source ~/.profile; fi"; -// [wr writeData:[cmd dataUsingEncoding:NSUTF8StringEncoding]]; -// [wr closeFile]; -// -// NSFileHandle *rd = [outpt fileHandleForReading]; -// NSString *res = [[NSString alloc] initWithData:[rd readDataToEndOfFile] -// encoding:NSUTF8StringEncoding]; -// NSLog(@"got:\n %@", res); -} diff --git a/tikzit-old/src/tikzit.rc b/tikzit-old/src/tikzit.rc deleted file mode 100644 index 072f825..0000000 --- a/tikzit-old/src/tikzit.rc +++ /dev/null @@ -1,24 +0,0 @@ -1 VERSIONINFO -FILEVERSION 0,7,0,0 -PRODUCTVERSION 0,7,0,0 -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "080904E4" - BEGIN - VALUE "FileDescription", "A graph editor for LaTeX" - VALUE "FileVersion", "1.0" - VALUE "InternalName", "tikzit" - VALUE "LegalCopyright", "Aleks Kissinger, Alex Merry, Chris Heunen" - VALUE "OriginalFilename", "tikzit.exe" - VALUE "ProductName", "TikZiT" - VALUE "ProductVersion", "0.7" - END - END - - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x809, 1252 - END -END -id ICON "../tikzit.ico" diff --git a/tikzit-old/text-x-generic.png b/tikzit-old/text-x-generic.png deleted file mode 100644 index 928a679..0000000 Binary files a/tikzit-old/text-x-generic.png and /dev/null differ diff --git a/tikzit-old/text-x-script.png b/tikzit-old/text-x-script.png deleted file mode 100644 index 801dcd6..0000000 Binary files a/tikzit-old/text-x-script.png and /dev/null differ diff --git a/tikzit-old/tikzit.icns b/tikzit-old/tikzit.icns deleted file mode 100644 index dc66f7f..0000000 Binary files a/tikzit-old/tikzit.icns and /dev/null differ diff --git a/tikzit-old/tikzit.ico b/tikzit-old/tikzit.ico deleted file mode 100644 index 3132b4c..0000000 Binary files a/tikzit-old/tikzit.ico and /dev/null differ diff --git a/tikzit-old/tikzit.spec b/tikzit-old/tikzit.spec deleted file mode 100644 index 237c543..0000000 --- a/tikzit-old/tikzit.spec +++ /dev/null @@ -1,98 +0,0 @@ -Name: tikzit -Version: 1.0 -Release: 1%{?dist} -Summary: Tool for creating and modifying PGF/TikZ-based node-and-edge graphs for LaTeX documents - -# try to choose a sensible group for this distro -%if 0%{?suse_version} -Group: Productivity/Graphics/Visualization/Graph -%else -%if 0%{?mdkversion} -Group: Sciences/Other -%else -Group: Applications/Productivity -%endif -%endif - -%if 0%{?suse_version} -License: GPL-2.0+ -%else -License: GPLv2+ -%endif -URL: http://tikzit.sourceforge.net -Source0: http://switch.dl.sourceforge.net/project/%{name}/%{name}-%{version}/%{name}-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-build - -BuildRequires: gcc-objc >= 4.6.0 -BuildRequires: gnustep-base-devel >= 1.18.0 -BuildRequires: gtk2-devel >= 2.18.0 -BuildRequires: pango-devel >= 1.16 -BuildRequires: cairo-devel >= 1.4 -%if 0%{?suse_version}%{?mdkversion} -BuildRequires: libpoppler-glib-devel >= 0.10 -%else -BuildRequires: poppler-glib-devel >= 0.10 -%endif -%if 0%{?suse_version} -BuildRequires: update-desktop-files -%endif - -%description -TikZiT is a GTK+ application that allows the creation and modification of TeX -diagrams written using the pgf/TikZ macro library. It is especially geared -toward rapidly creating "dot"-diagrams for use in academic papers. - - -%prep -%setup -q - - -%build -%configure -make %{?_smp_mflags} - - -%install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} -%if 0%{?suse_version} -# SuSE is particularly fussy about desktop file categories -%suse_update_desktop_file %{name} -r Graphics 2DGraphics -%endif - - -%clean -rm -rf %{buildroot} - - -%files -%defattr(-,root,root,-) -%doc -%{_bindir}/tikzit -%{_datadir}/tikzit/ -%{_datadir}/applications/tikzit.desktop -%{_datadir}/icons/hicolor/* - - -%changelog -* Fri May 17 2013 Alex Merry 1.0-2 --Fixed license on openSUSE - -* Tue May 7 2013 Alex Merry 1.0-1 --Bumped version - -* Fri Aug 24 2012 Alex Merry 0.9-1 --Bumped version --Bumped requirements - -* Tue Dec 06 2011 Alex Merry 0.7-1 --Bumped version - -* Tue Feb 08 2011 Alex Merry 0.6-1 --Bumped version --Added Pango and Cairo to BuildRequires --Set minimum version for GNUStep-base - -* Thu Dec 02 2010 Alex Merry 0.5-1 --Rewrote spec file - diff --git a/tikzit-old/tikzit48x48.png b/tikzit-old/tikzit48x48.png deleted file mode 100644 index 056d04b..0000000 Binary files a/tikzit-old/tikzit48x48.png and /dev/null differ diff --git a/tikzit-old/tikzit_dsa_pub.pem b/tikzit-old/tikzit_dsa_pub.pem deleted file mode 100644 index c97cc04..0000000 --- a/tikzit-old/tikzit_dsa_pub.pem +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN PUBLIC KEY----- -MIIDOjCCAi0GByqGSM44BAEwggIgAoIBAQDAdRlqLgJYjdAKkDsKtZDXgVlhqwyl -OXWCILHuE/MLh24I/mAaro4hucdhj92V5td9KNdM/R19904yZ3XcLj2/SodDVD7I -lEHPGwC/y+mJd9CaMNI/ARgFbLwJ+3+l/Ia3sraa/ASGAzardJPzYdkkRbZ/1DJn -wtHh2HgmPBdOMZZrbDmw3g4lj69Vacj4Wdz+YDG7750FjAUd+IcOvaDip28B8ogj -ogVirSXGe5YLoYbw078gx92PzSw6vfOZ3b7Gqk7zilYGB0bUJXUPSLOkxa5TMSx1 -Lr2UdW+vXrudI76rBhW52B32i7f801N4/W/qUfg8tw4tUGi/Uw8n2/S5AhUA0F82 -Qxit1jmqP0mZSLAn+qIVPuUCggEAEkSBjRxMo4KRvHOSppZphdaV2RWmQ6w9mxMj -3Z4AGDNU/buQ+TWJEYGVsIXpykI7DYCfgp8XO9uhj1hporfDsU4QGNZd0rG7SLK3 -DHwSf9QTgXY+D5IRQvkBtocxYRgNpuW+mfwl886SPmrRcT3QvsiFaI7/Iw787Tr6 -Yip4D7GjqTvj+epJH6kZq1xbdnrfBEA4dKs5IrZupF75npU8d1EjcdLlTyuzxuoZ -5a3SQWoBvT4l0xvbtR4yv+Af++MB+uxdxBSYMIgtQPgoIjFWtTDRZCwFAig1RWxz -fHEI5Fk4mqGhLAVbROL/pebYYZ5UxTKt9AMjmgmuM10/L5TXbwOCAQUAAoIBAA7t -W96VBoZgbbO2EfSxt5az4EnAJmuua6DNjZzESpcb67/DR7nLd5yveZEPL+9x6c1S -FtduIk8allplryOJtwysf8KkxrPVej83XiVJ9PDLMktsYjtnVksGIk9CS3v98OgT -c3g+xgJpRbwB6dROa5ZMxvoCU100ngfI3F/RUqeYYh7PP5kEL6SfqEHG5udIf1K7 -jUmOycNzI5Fsi+IDh8qtzxoOVTjoMPlN2F4T27xuWXA0BEd/NZqtgGLIFsbww5oD -8VPQIeo9UwQkYo/Qz1/uuaXi1u2PbTbbx2FTUL+zJuqrAv3oqmG2Ktyi0RXZaUAJ -4+P+kdS46Ip2NybQbkE= ------END PUBLIC KEY----- diff --git a/tikzit-old/tikzitdoc.icns b/tikzit-old/tikzitdoc.icns deleted file mode 100644 index 2f8bbcd..0000000 Binary files a/tikzit-old/tikzitdoc.icns and /dev/null differ diff --git a/tikzit-old/transform-crop-and-resize.png b/tikzit-old/transform-crop-and-resize.png deleted file mode 100644 index 4dedd93..0000000 Binary files a/tikzit-old/transform-crop-and-resize.png and /dev/null differ diff --git a/tikzit-old/transform-move.png b/tikzit-old/transform-move.png deleted file mode 100644 index ae4201b..0000000 Binary files a/tikzit-old/transform-move.png and /dev/null differ diff --git a/tikzit-old/updates.png b/tikzit-old/updates.png deleted file mode 100755 index 469ae30..0000000 Binary files a/tikzit-old/updates.png and /dev/null differ -- cgit v1.2.3 From 8708fb31cc1f8a19b9e1e3cc2424f7f391a5d2ce Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Mon, 7 May 2018 13:29:22 +0200 Subject: ... --- tikzlexer.h | 263 ++++++++++-------------------------------------------------- 1 file changed, 44 insertions(+), 219 deletions(-) diff --git a/tikzlexer.h b/tikzlexer.h index d461581..b1857e2 100644 --- a/tikzlexer.h +++ b/tikzlexer.h @@ -2,9 +2,9 @@ #define yyHEADER_H 1 #define yyIN_HEADER 1 -#line 5 "tikzlexer.h" +#line 6 "tikzlexer.h" -#line 7 "tikzlexer.h" +#line 8 "tikzlexer.h" #define YY_INT_ALIGNED short int @@ -13,35 +13,11 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 6 -#define YY_FLEX_SUBMINOR_VERSION 4 +#define YY_FLEX_SUBMINOR_VERSION 1 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif -#ifdef yyget_lval -#define yyget_lval_ALREADY_DEFINED -#else -#define yyget_lval yyget_lval -#endif - -#ifdef yyset_lval -#define yyset_lval_ALREADY_DEFINED -#else -#define yyset_lval yyset_lval -#endif - -#ifdef yyget_lloc -#define yyget_lloc_ALREADY_DEFINED -#else -#define yyget_lloc yyget_lloc -#endif - -#ifdef yyset_lloc -#define yyset_lloc_ALREADY_DEFINED -#else -#define yyset_lloc yyset_lloc -#endif - /* First, we deal with platform-specific or compiler-specific issues. */ /* begin standard C headers. */ @@ -112,16 +88,10 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif -#ifndef SIZE_MAX -#define SIZE_MAX (~(size_t)0) -#endif - #endif /* ! C99 */ #endif /* ! FLEXINT_H */ -/* begin standard C++ headers. */ - /* TODO: this is always defined, so inline it */ #define yyconst const @@ -222,21 +192,21 @@ struct yy_buffer_state }; #endif /* !YY_STRUCT_YY_BUFFER_STATE */ -void yyrestart ( FILE *input_file , yyscan_t yyscanner ); -void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); -YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size , yyscan_t yyscanner ); -void yy_delete_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); -void yy_flush_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); -void yypush_buffer_state ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); -void yypop_buffer_state ( yyscan_t yyscanner ); +void yyrestart (FILE *input_file ,yyscan_t yyscanner ); +void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); +YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ,yyscan_t yyscanner ); +void yy_delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); +void yy_flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); +void yypush_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); +void yypop_buffer_state (yyscan_t yyscanner ); -YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size , yyscan_t yyscanner ); -YY_BUFFER_STATE yy_scan_string ( const char *yy_str , yyscan_t yyscanner ); -YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ,yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len ,yyscan_t yyscanner ); -void *yyalloc ( yy_size_t , yyscan_t yyscanner ); -void *yyrealloc ( void *, yy_size_t , yyscan_t yyscanner ); -void yyfree ( void * , yyscan_t yyscanner ); +void *yyalloc (yy_size_t ,yyscan_t yyscanner ); +void *yyrealloc (void *,yy_size_t ,yyscan_t yyscanner ); +void yyfree (void * ,yyscan_t yyscanner ); #define yywrap(yyscanner) (/*CONSTCOND*/1) #define YY_SKIP_YYWRAP @@ -259,53 +229,53 @@ void yyfree ( void * , yyscan_t yyscanner ); */ #include #endif - + #define YY_EXTRA_TYPE TikzAssembler * int yylex_init (yyscan_t* scanner); -int yylex_init_extra ( YY_EXTRA_TYPE user_defined, yyscan_t* scanner); +int yylex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner); /* Accessor methods to globals. These are made visible to non-reentrant scanners for convenience. */ -int yylex_destroy ( yyscan_t yyscanner ); +int yylex_destroy (yyscan_t yyscanner ); -int yyget_debug ( yyscan_t yyscanner ); +int yyget_debug (yyscan_t yyscanner ); -void yyset_debug ( int debug_flag , yyscan_t yyscanner ); +void yyset_debug (int debug_flag ,yyscan_t yyscanner ); -YY_EXTRA_TYPE yyget_extra ( yyscan_t yyscanner ); +YY_EXTRA_TYPE yyget_extra (yyscan_t yyscanner ); -void yyset_extra ( YY_EXTRA_TYPE user_defined , yyscan_t yyscanner ); +void yyset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner ); -FILE *yyget_in ( yyscan_t yyscanner ); +FILE *yyget_in (yyscan_t yyscanner ); -void yyset_in ( FILE * _in_str , yyscan_t yyscanner ); +void yyset_in (FILE * _in_str ,yyscan_t yyscanner ); -FILE *yyget_out ( yyscan_t yyscanner ); +FILE *yyget_out (yyscan_t yyscanner ); -void yyset_out ( FILE * _out_str , yyscan_t yyscanner ); +void yyset_out (FILE * _out_str ,yyscan_t yyscanner ); - int yyget_leng ( yyscan_t yyscanner ); + int yyget_leng (yyscan_t yyscanner ); -char *yyget_text ( yyscan_t yyscanner ); +char *yyget_text (yyscan_t yyscanner ); -int yyget_lineno ( yyscan_t yyscanner ); +int yyget_lineno (yyscan_t yyscanner ); -void yyset_lineno ( int _line_number , yyscan_t yyscanner ); +void yyset_lineno (int _line_number ,yyscan_t yyscanner ); -int yyget_column ( yyscan_t yyscanner ); +int yyget_column (yyscan_t yyscanner ); -void yyset_column ( int _column_no , yyscan_t yyscanner ); +void yyset_column (int _column_no ,yyscan_t yyscanner ); -YYSTYPE * yyget_lval ( yyscan_t yyscanner ); +YYSTYPE * yyget_lval (yyscan_t yyscanner ); -void yyset_lval ( YYSTYPE * yylval_param , yyscan_t yyscanner ); +void yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner ); - YYLTYPE *yyget_lloc ( yyscan_t yyscanner ); + YYLTYPE *yyget_lloc (yyscan_t yyscanner ); - void yyset_lloc ( YYLTYPE * yylloc_param , yyscan_t yyscanner ); + void yyset_lloc (YYLTYPE * yylloc_param ,yyscan_t yyscanner ); /* Macros after this point can all be overridden by user definitions in * section 1. @@ -313,18 +283,18 @@ void yyset_lval ( YYSTYPE * yylval_param , yyscan_t yyscanner ); #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int yywrap ( yyscan_t yyscanner ); +extern "C" int yywrap (yyscan_t yyscanner ); #else -extern int yywrap ( yyscan_t yyscanner ); +extern int yywrap (yyscan_t yyscanner ); #endif #endif #ifndef yytext_ptr -static void yy_flex_strncpy ( char *, const char *, int , yyscan_t yyscanner); +static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner); #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen ( const char * , yyscan_t yyscanner); +static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner); #endif #ifndef YY_NO_INPUT @@ -353,7 +323,7 @@ static int yy_flex_strlen ( const char * , yyscan_t yyscanner); #define YY_DECL_IS_OURS 1 extern int yylex \ - (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner); + (YYSTYPE * yylval_param,YYLTYPE * yylloc_param ,yyscan_t yyscanner); #define YY_DECL int yylex \ (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner) @@ -373,153 +343,8 @@ extern int yylex \ #undef YY_DECL #endif -#ifndef yy_create_buffer_ALREADY_DEFINED -#undef yy_create_buffer -#endif -#ifndef yy_delete_buffer_ALREADY_DEFINED -#undef yy_delete_buffer -#endif -#ifndef yy_scan_buffer_ALREADY_DEFINED -#undef yy_scan_buffer -#endif -#ifndef yy_scan_string_ALREADY_DEFINED -#undef yy_scan_string -#endif -#ifndef yy_scan_bytes_ALREADY_DEFINED -#undef yy_scan_bytes -#endif -#ifndef yy_init_buffer_ALREADY_DEFINED -#undef yy_init_buffer -#endif -#ifndef yy_flush_buffer_ALREADY_DEFINED -#undef yy_flush_buffer -#endif -#ifndef yy_load_buffer_state_ALREADY_DEFINED -#undef yy_load_buffer_state -#endif -#ifndef yy_switch_to_buffer_ALREADY_DEFINED -#undef yy_switch_to_buffer -#endif -#ifndef yypush_buffer_state_ALREADY_DEFINED -#undef yypush_buffer_state -#endif -#ifndef yypop_buffer_state_ALREADY_DEFINED -#undef yypop_buffer_state -#endif -#ifndef yyensure_buffer_stack_ALREADY_DEFINED -#undef yyensure_buffer_stack -#endif -#ifndef yylex_ALREADY_DEFINED -#undef yylex -#endif -#ifndef yyrestart_ALREADY_DEFINED -#undef yyrestart -#endif -#ifndef yylex_init_ALREADY_DEFINED -#undef yylex_init -#endif -#ifndef yylex_init_extra_ALREADY_DEFINED -#undef yylex_init_extra -#endif -#ifndef yylex_destroy_ALREADY_DEFINED -#undef yylex_destroy -#endif -#ifndef yyget_debug_ALREADY_DEFINED -#undef yyget_debug -#endif -#ifndef yyset_debug_ALREADY_DEFINED -#undef yyset_debug -#endif -#ifndef yyget_extra_ALREADY_DEFINED -#undef yyget_extra -#endif -#ifndef yyset_extra_ALREADY_DEFINED -#undef yyset_extra -#endif -#ifndef yyget_in_ALREADY_DEFINED -#undef yyget_in -#endif -#ifndef yyset_in_ALREADY_DEFINED -#undef yyset_in -#endif -#ifndef yyget_out_ALREADY_DEFINED -#undef yyget_out -#endif -#ifndef yyset_out_ALREADY_DEFINED -#undef yyset_out -#endif -#ifndef yyget_leng_ALREADY_DEFINED -#undef yyget_leng -#endif -#ifndef yyget_text_ALREADY_DEFINED -#undef yyget_text -#endif -#ifndef yyget_lineno_ALREADY_DEFINED -#undef yyget_lineno -#endif -#ifndef yyset_lineno_ALREADY_DEFINED -#undef yyset_lineno -#endif -#ifndef yyget_column_ALREADY_DEFINED -#undef yyget_column -#endif -#ifndef yyset_column_ALREADY_DEFINED -#undef yyset_column -#endif -#ifndef yywrap_ALREADY_DEFINED -#undef yywrap -#endif -#ifndef yyget_lval_ALREADY_DEFINED -#undef yyget_lval -#endif -#ifndef yyset_lval_ALREADY_DEFINED -#undef yyset_lval -#endif -#ifndef yyget_lloc_ALREADY_DEFINED -#undef yyget_lloc -#endif -#ifndef yyset_lloc_ALREADY_DEFINED -#undef yyset_lloc -#endif -#ifndef yyalloc_ALREADY_DEFINED -#undef yyalloc -#endif -#ifndef yyrealloc_ALREADY_DEFINED -#undef yyrealloc -#endif -#ifndef yyfree_ALREADY_DEFINED -#undef yyfree -#endif -#ifndef yytext_ALREADY_DEFINED -#undef yytext -#endif -#ifndef yyleng_ALREADY_DEFINED -#undef yyleng -#endif -#ifndef yyin_ALREADY_DEFINED -#undef yyin -#endif -#ifndef yyout_ALREADY_DEFINED -#undef yyout -#endif -#ifndef yy_flex_debug_ALREADY_DEFINED -#undef yy_flex_debug -#endif -#ifndef yylineno_ALREADY_DEFINED -#undef yylineno -#endif -#ifndef yytables_fload_ALREADY_DEFINED -#undef yytables_fload -#endif -#ifndef yytables_destroy_ALREADY_DEFINED -#undef yytables_destroy -#endif -#ifndef yyTABLES_NAME_ALREADY_DEFINED -#undef yyTABLES_NAME -#endif - -#line 192 "src\\data\\tikzlexer.l" +#line 192 "src/data/tikzlexer.l" -#line 523 "tikzlexer.h" +#line 349 "tikzlexer.h" #undef yyIN_HEADER #endif /* yyHEADER_H */ -- cgit v1.2.3 From 7c4faa67f4b45671884bdccd99d83f92ca655366 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Fri, 20 Jul 2018 11:00:29 +0200 Subject: ... --- src/gui/nodeitem.cpp | 3 ++- src/gui/stylepalette.cpp | 5 +++-- src/gui/tikzscene.cpp | 11 ++++++----- src/gui/tikzview.cpp | 40 ++++++++++++++++++++++++++++------------ 4 files changed, 39 insertions(+), 20 deletions(-) diff --git a/src/gui/nodeitem.cpp b/src/gui/nodeitem.cpp index 922747d..b452848 100644 --- a/src/gui/nodeitem.cpp +++ b/src/gui/nodeitem.cpp @@ -70,8 +70,9 @@ void NodeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidge QPen pen(QColor(180,180,220)); QVector p; - p << 2.0 << 2.0; + p << 1.0 << 2.0; pen.setDashPattern(p); + pen.setWidthF(2.0f); painter->setPen(pen); painter->setBrush(Qt::NoBrush); painter->drawPath(shape()); diff --git a/src/gui/stylepalette.cpp b/src/gui/stylepalette.cpp index 6d6599b..e3fea0b 100644 --- a/src/gui/stylepalette.cpp +++ b/src/gui/stylepalette.cpp @@ -46,12 +46,13 @@ StylePalette::StylePalette(QWidget *parent) : ui->styleListView->setModel(_nodeModel); ui->styleListView->setViewMode(QListView::IconMode); ui->styleListView->setMovement(QListView::Static); - ui->styleListView->setGridSize(QSize(70,40)); + ui->styleListView->setGridSize(QSize(48,48)); + ui->edgeStyleListView->setModel(_edgeModel); ui->edgeStyleListView->setViewMode(QListView::IconMode); ui->edgeStyleListView->setMovement(QListView::Static); - ui->edgeStyleListView->setGridSize(QSize(70,40)); + ui->edgeStyleListView->setGridSize(QSize(48,48)); reloadStyles(); diff --git a/src/gui/tikzscene.cpp b/src/gui/tikzscene.cpp index 772c67b..47464fe 100644 --- a/src/gui/tikzscene.cpp +++ b/src/gui/tikzscene.cpp @@ -44,7 +44,7 @@ TikzScene::TikzScene(TikzDocument *tikzDocument, ToolPalette *tools, QPen pen; pen.setColor(QColor::fromRgbF(0.5f, 0.0f, 0.5f)); - pen.setWidth(3); + //pen.setWidth(3.0f); pen.setCosmetic(true); _drawEdgeItem->setPen(pen); _drawEdgeItem->setLine(0,0,0,0); @@ -52,10 +52,11 @@ TikzScene::TikzScene(TikzDocument *tikzDocument, ToolPalette *tools, addItem(_drawEdgeItem); pen.setColor(QColor::fromRgbF(0.6f, 0.6f, 0.8f)); - pen.setWidth(3); - QVector dash; - dash << 4.0 << 4.0; - pen.setDashPattern(dash); + //pen.setWidth(3.0f); + //QVector dash; + //dash << 4.0 << 4.0; + pen.setStyle(Qt::DashLine); + //pen.setDashPattern(dash); _rubberBandItem->setPen(pen); QBrush brush(QColor::fromRgbF(0.6,0.6,0.8,0.2)); diff --git a/src/gui/tikzview.cpp b/src/gui/tikzview.cpp index 700cf29..6cdb17c 100644 --- a/src/gui/tikzview.cpp +++ b/src/gui/tikzview.cpp @@ -57,52 +57,68 @@ void TikzView::drawBackground(QPainter *painter, const QRectF &rect) // draw the grid QPen pen1; - pen1.setWidth(1); + //pen1.setWidthF(0.5); pen1.setCosmetic(true); - pen1.setColor(QColor(230,230,230)); + pen1.setColor(QColor(250,250,255)); QPen pen2 = pen1; - pen2.setColor(QColor(200,200,200)); + pen2.setColor(QColor(240,240,250)); QPen pen3 = pen1; - pen3.setColor(QColor(160,160,160)); + pen3.setColor(QColor(220,220,240)); painter->setPen(pen1); if (_scale > 0.2f) { for (int x = -GRID_SEP; x > rect.left(); x -= GRID_SEP) { - if (x % (GRID_SEP * GRID_N) != 0) painter->drawLine(x, rect.top(), x, rect.bottom()); + if (x % (GRID_SEP * GRID_N) != 0) { + qreal xf = (qreal)x; + painter->drawLine(xf, rect.top(), xf, rect.bottom()); + } } for (int x = GRID_SEP; x < rect.right(); x += GRID_SEP) { - if (x % (GRID_SEP * GRID_N) != 0) painter->drawLine(x, rect.top(), x, rect.bottom()); + if (x % (GRID_SEP * GRID_N) != 0) { + qreal xf = (qreal)x; + painter->drawLine(xf, rect.top(), xf, rect.bottom()); + } } for (int y = -GRID_SEP; y > rect.top(); y -= GRID_SEP) { - if (y % (GRID_SEP * GRID_N) != 0) painter->drawLine(rect.left(), y, rect.right(), y); + if (y % (GRID_SEP * GRID_N) != 0) { + qreal yf = (qreal)y; + painter->drawLine(rect.left(), yf, rect.right(), yf); + } } for (int y = GRID_SEP; y < rect.bottom(); y += GRID_SEP) { - if (y % (GRID_SEP * GRID_N) != 0) painter->drawLine(rect.left(), y, rect.right(), y); + if (y % (GRID_SEP * GRID_N) != 0) { + qreal yf = (qreal)y; + painter->drawLine(rect.left(), yf, rect.right(), yf); + } } } painter->setPen(pen2); for (int x = -GRID_SEP*GRID_N; x > rect.left(); x -= GRID_SEP*GRID_N) { - painter->drawLine(x, rect.top(), x, rect.bottom()); + qreal xf = (qreal)x; + painter->drawLine(xf, rect.top(), xf, rect.bottom()); } for (int x = GRID_SEP*GRID_N; x < rect.right(); x += GRID_SEP*GRID_N) { - painter->drawLine(x, rect.top(), x, rect.bottom()); + qreal xf = (qreal)x; + painter->drawLine(xf, rect.top(), xf, rect.bottom()); } for (int y = -GRID_SEP*GRID_N; y > rect.top(); y -= GRID_SEP*GRID_N) { - painter->drawLine(rect.left(), y, rect.right(), y); + qreal yf = (qreal)y; + painter->drawLine(rect.left(), yf, rect.right(), yf); } for (int y = GRID_SEP*GRID_N; y < rect.bottom(); y += GRID_SEP*GRID_N) { - painter->drawLine(rect.left(), y, rect.right(), y); + qreal yf = (qreal)y; + painter->drawLine(rect.left(), yf, rect.right(), yf); } painter->setPen(pen3); -- cgit v1.2.3 From 59eee652c5fea36945a4a8ce2936843bd90d0e1b Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Fri, 20 Jul 2018 11:01:34 +0200 Subject: ... --- .gitignore | 40 +- COPYING | 1348 +++++----- Doxyfile | 5028 ++++++++++++++++++------------------- README.md | 100 +- bison.pri | 28 +- flex.pri | 16 +- images/edge.svg | 128 +- images/node.svg | 78 +- images/select.svg | 180 +- qt.conf | 4 +- src/data/edge.cpp | 826 +++--- src/data/edge.h | 260 +- src/data/edgestyle.cpp | 262 +- src/data/edgestyle.h | 112 +- src/data/graph.cpp | 546 ++-- src/data/graph.h | 218 +- src/data/graphelementdata.cpp | 410 +-- src/data/graphelementdata.h | 178 +- src/data/graphelementproperty.cpp | 154 +- src/data/graphelementproperty.h | 116 +- src/data/node.cpp | 236 +- src/data/node.h | 144 +- src/data/nodestyle.cpp | 214 +- src/data/nodestyle.h | 102 +- src/data/style.cpp | 156 +- src/data/style.h | 108 +- src/data/tikzassembler.cpp | 144 +- src/data/tikzassembler.h | 120 +- src/data/tikzdocument.cpp | 382 +-- src/data/tikzdocument.h | 138 +- src/data/tikzlexer.l | 382 +-- src/data/tikzparser.y | 568 ++--- src/data/tikzparserdefs.h | 80 +- src/data/tikzstyles.cpp | 142 +- src/data/tikzstyles.h | 102 +- src/gui/commands.h | 8 +- src/gui/edgeitem.cpp | 442 ++-- src/gui/edgeitem.h | 124 +- src/gui/mainmenu.cpp | 302 +-- src/gui/mainmenu.h | 128 +- src/gui/mainmenu.ui | 418 +-- src/gui/mainwindow.cpp | 320 +-- src/gui/mainwindow.h | 120 +- src/gui/mainwindow.ui | 410 +-- src/gui/nodeitem.cpp | 318 +-- src/gui/nodeitem.h | 102 +- src/gui/propertypalette.cpp | 122 +- src/gui/propertypalette.h | 92 +- src/gui/propertypalette.ui | 66 +- src/gui/stylepalette.cpp | 358 +-- src/gui/stylepalette.h | 122 +- src/gui/stylepalette.ui | 240 +- src/gui/tikzscene.cpp | 1560 ++++++------ src/gui/tikzscene.h | 214 +- src/gui/tikzview.cpp | 256 +- src/gui/tikzview.h | 104 +- src/gui/toolpalette.cpp | 172 +- src/gui/toolpalette.h | 106 +- src/gui/undocommands.cpp | 856 +++---- src/gui/undocommands.h | 388 +-- src/main.cpp | 96 +- src/test/testmain.cpp | 44 +- src/test/testparser.cpp | 326 +-- src/test/testparser.h | 36 +- src/test/testtest.cpp | 20 +- src/test/testtest.h | 34 +- src/test/testtikzoutput.cpp | 194 +- src/test/testtikzoutput.h | 34 +- src/tikzit.cpp | 422 ++-- src/tikzit.h | 282 +-- src/util.cpp | 144 +- src/util.h | 96 +- tikzit.pro | 216 +- tikzit.qrc | 52 +- tikzlexer.h | 700 +++--- 75 files changed, 11547 insertions(+), 11547 deletions(-) diff --git a/.gitignore b/.gitignore index 8734edf..8bbf502 100644 --- a/.gitignore +++ b/.gitignore @@ -1,20 +1,20 @@ -GeneratedFiles -.vs -debug -release -*.vcxproj* -*.sln -*.rc -x64 -target_wrapper.bat -.qmake.stash -build-tikzit-* -*.pro.user -*.autosave -Makefile -tikzit.app -target_wrapper.sh -src/data/tikzlexer.lexer.cpp -src/data/tikzparser.parser.cpp -src/data/tikzparser.parser.hpp -*.o +GeneratedFiles +.vs +debug +release +*.vcxproj* +*.sln +*.rc +x64 +target_wrapper.bat +.qmake.stash +build-tikzit-* +*.pro.user +*.autosave +Makefile +tikzit.app +target_wrapper.sh +src/data/tikzlexer.lexer.cpp +src/data/tikzparser.parser.cpp +src/data/tikzparser.parser.hpp +*.o diff --git a/COPYING b/COPYING index f288702..3877ae0 100644 --- a/COPYING +++ b/COPYING @@ -1,674 +1,674 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/Doxyfile b/Doxyfile index 56cedb0..06516f9 100644 --- a/Doxyfile +++ b/Doxyfile @@ -1,2514 +1,2514 @@ -# Doxyfile 1.8.14 - -# This file describes the settings to be used by the documentation system -# doxygen (www.doxygen.org) for a project. -# -# All text after a double hash (##) is considered a comment and is placed in -# front of the TAG it is preceding. -# -# All text after a single hash (#) is considered a comment and will be ignored. -# The format is: -# TAG = value [value, ...] -# For lists, items can also be appended using: -# TAG += value [value, ...] -# Values that contain spaces should be placed between quotes (\" \"). - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- - -# This tag specifies the encoding used for all characters in the config file -# that follow. The default is UTF-8 which is also the encoding used for all text -# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See -# https://www.gnu.org/software/libiconv/ for the list of possible encodings. -# The default value is: UTF-8. - -DOXYFILE_ENCODING = UTF-8 - -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by -# double-quotes, unless you are using Doxywizard) that should identify the -# project for which the documentation is generated. This name is used in the -# title of most generated pages and in a few other places. -# The default value is: My Project. - -PROJECT_NAME = TikZiT - -# The PROJECT_NUMBER tag can be used to enter a project or revision number. This -# could be handy for archiving the generated documentation or if some version -# control system is used. - -PROJECT_NUMBER = 2.0 - -# Using the PROJECT_BRIEF tag one can provide an optional one line description -# for a project that appears at the top of each page and should give viewer a -# quick idea about the purpose of the project. Keep the description short. - -PROJECT_BRIEF = "A GUI diagram editor for TikZ" - -# With the PROJECT_LOGO tag one can specify a logo or an icon that is included -# in the documentation. The maximum height of the logo should not exceed 55 -# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy -# the logo to the output directory. - -PROJECT_LOGO = /Users/alek/git/tikzit/images/tikzit128x128.png - -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path -# into which the generated documentation will be written. If a relative path is -# entered, it will be relative to the location where doxygen was started. If -# left blank the current directory will be used. - -OUTPUT_DIRECTORY = ../tikzit.github.io/docs - -# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- -# directories (in 2 levels) under the output directory of each output format and -# will distribute the generated files over these directories. Enabling this -# option can be useful when feeding doxygen a huge amount of source files, where -# putting all generated files in the same directory would otherwise causes -# performance problems for the file system. -# The default value is: NO. - -CREATE_SUBDIRS = NO - -# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII -# characters to appear in the names of generated files. If set to NO, non-ASCII -# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode -# U+3044. -# The default value is: NO. - -ALLOW_UNICODE_NAMES = NO - -# The OUTPUT_LANGUAGE tag is used to specify the language in which all -# documentation generated by doxygen is written. Doxygen will use this -# information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, -# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), -# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, -# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, -# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, -# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, -# Ukrainian and Vietnamese. -# The default value is: English. - -OUTPUT_LANGUAGE = English - -# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member -# descriptions after the members that are listed in the file and class -# documentation (similar to Javadoc). Set to NO to disable this. -# The default value is: YES. - -BRIEF_MEMBER_DESC = YES - -# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief -# description of a member or function before the detailed description -# -# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the -# brief descriptions will be completely suppressed. -# The default value is: YES. - -REPEAT_BRIEF = YES - -# This tag implements a quasi-intelligent brief description abbreviator that is -# used to form the text in various listings. Each string in this list, if found -# as the leading text of the brief description, will be stripped from the text -# and the result, after processing the whole list, is used as the annotated -# text. Otherwise, the brief description is used as-is. If left blank, the -# following values are used ($name is automatically replaced with the name of -# the entity):The $name class, The $name widget, The $name file, is, provides, -# specifies, contains, represents, a, an and the. - -ABBREVIATE_BRIEF = "The $name class" \ - "The $name widget" \ - "The $name file" \ - is \ - provides \ - specifies \ - contains \ - represents \ - a \ - an \ - the - -# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# doxygen will generate a detailed section even if there is only a brief -# description. -# The default value is: NO. - -ALWAYS_DETAILED_SEC = NO - -# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all -# inherited members of a class in the documentation of that class as if those -# members were ordinary class members. Constructors, destructors and assignment -# operators of the base classes will not be shown. -# The default value is: NO. - -INLINE_INHERITED_MEMB = NO - -# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path -# before files name in the file list and in the header files. If set to NO the -# shortest path that makes the file name unique will be used -# The default value is: YES. - -FULL_PATH_NAMES = YES - -# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path. -# Stripping is only done if one of the specified strings matches the left-hand -# part of the path. The tag can be used to show relative paths in the file list. -# If left blank the directory from which doxygen is run is used as the path to -# strip. -# -# Note that you can specify absolute paths here, but also relative paths, which -# will be relative from the directory where doxygen is started. -# This tag requires that the tag FULL_PATH_NAMES is set to YES. - -STRIP_FROM_PATH = - -# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the -# path mentioned in the documentation of a class, which tells the reader which -# header file to include in order to use a class. If left blank only the name of -# the header file containing the class definition is used. Otherwise one should -# specify the list of include paths that are normally passed to the compiler -# using the -I flag. - -STRIP_FROM_INC_PATH = - -# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but -# less readable) file names. This can be useful is your file systems doesn't -# support long names like on DOS, Mac, or CD-ROM. -# The default value is: NO. - -SHORT_NAMES = NO - -# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the -# first line (until the first dot) of a Javadoc-style comment as the brief -# description. If set to NO, the Javadoc-style will behave just like regular Qt- -# style comments (thus requiring an explicit @brief command for a brief -# description.) -# The default value is: NO. - -JAVADOC_AUTOBRIEF = NO - -# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first -# line (until the first dot) of a Qt-style comment as the brief description. If -# set to NO, the Qt-style will behave just like regular Qt-style comments (thus -# requiring an explicit \brief command for a brief description.) -# The default value is: NO. - -QT_AUTOBRIEF = NO - -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a -# multi-line C++ special comment block (i.e. a block of //! or /// comments) as -# a brief description. This used to be the default behavior. The new default is -# to treat a multi-line C++ comment block as a detailed description. Set this -# tag to YES if you prefer the old behavior instead. -# -# Note that setting this tag to YES also means that rational rose comments are -# not recognized any more. -# The default value is: NO. - -MULTILINE_CPP_IS_BRIEF = NO - -# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the -# documentation from any documented member that it re-implements. -# The default value is: YES. - -INHERIT_DOCS = YES - -# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new -# page for each member. If set to NO, the documentation of a member will be part -# of the file/class/namespace that contains it. -# The default value is: NO. - -SEPARATE_MEMBER_PAGES = NO - -# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen -# uses this value to replace tabs by spaces in code fragments. -# Minimum value: 1, maximum value: 16, default value: 4. - -TAB_SIZE = 4 - -# This tag can be used to specify a number of aliases that act as commands in -# the documentation. An alias has the form: -# name=value -# For example adding -# "sideeffect=@par Side Effects:\n" -# will allow you to put the command \sideeffect (or @sideeffect) in the -# documentation, which will result in a user-defined paragraph with heading -# "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines (in the resulting output). You can put ^^ in the value part of an -# alias to insert a newline as if a physical newline was in the original file. - -ALIASES = - -# This tag can be used to specify a number of word-keyword mappings (TCL only). -# A mapping has the form "name=value". For example adding "class=itcl::class" -# will allow you to use the command class in the itcl::class meaning. - -TCL_SUBST = - -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources -# only. Doxygen will then generate output that is more tailored for C. For -# instance, some of the names that are used will be different. The list of all -# members will be omitted, etc. -# The default value is: NO. - -OPTIMIZE_OUTPUT_FOR_C = NO - -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or -# Python sources only. Doxygen will then generate output that is more tailored -# for that language. For instance, namespaces will be presented as packages, -# qualified scopes will look different, etc. -# The default value is: NO. - -OPTIMIZE_OUTPUT_JAVA = NO - -# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran -# sources. Doxygen will then generate output that is tailored for Fortran. -# The default value is: NO. - -OPTIMIZE_FOR_FORTRAN = NO - -# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL -# sources. Doxygen will then generate output that is tailored for VHDL. -# The default value is: NO. - -OPTIMIZE_OUTPUT_VHDL = NO - -# Doxygen selects the parser to use depending on the extension of the files it -# parses. With this tag you can assign which parser to use for a given -# extension. Doxygen has a built-in mapping, but you can override or extend it -# using this tag. The format is ext=language, where ext is a file extension, and -# language is one of the parsers supported by doxygen: IDL, Java, Javascript, -# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran: -# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran: -# Fortran. In the later case the parser tries to guess whether the code is fixed -# or free formatted code, this is the default for Fortran type files), VHDL. For -# instance to make doxygen treat .inc files as Fortran files (default is PHP), -# and .f files as C (default is Fortran), use: inc=Fortran f=C. -# -# Note: For files without extension you can use no_extension as a placeholder. -# -# Note that for custom extensions you also need to set FILE_PATTERNS otherwise -# the files are not read by doxygen. - -EXTENSION_MAPPING = - -# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments -# according to the Markdown format, which allows for more readable -# documentation. See http://daringfireball.net/projects/markdown/ for details. -# The output of markdown processing is further processed by doxygen, so you can -# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in -# case of backward compatibilities issues. -# The default value is: YES. - -MARKDOWN_SUPPORT = YES - -# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up -# to that level are automatically included in the table of contents, even if -# they do not have an id attribute. -# Note: This feature currently applies only to Markdown headings. -# Minimum value: 0, maximum value: 99, default value: 0. -# This tag requires that the tag MARKDOWN_SUPPORT is set to YES. - -TOC_INCLUDE_HEADINGS = 0 - -# When enabled doxygen tries to link words that correspond to documented -# classes, or namespaces to their corresponding documentation. Such a link can -# be prevented in individual cases by putting a % sign in front of the word or -# globally by setting AUTOLINK_SUPPORT to NO. -# The default value is: YES. - -AUTOLINK_SUPPORT = YES - -# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want -# to include (a tag file for) the STL sources as input, then you should set this -# tag to YES in order to let doxygen match functions declarations and -# definitions whose arguments contain STL classes (e.g. func(std::string); -# versus func(std::string) {}). This also make the inheritance and collaboration -# diagrams that involve STL classes more complete and accurate. -# The default value is: NO. - -BUILTIN_STL_SUPPORT = NO - -# If you use Microsoft's C++/CLI language, you should set this option to YES to -# enable parsing support. -# The default value is: NO. - -CPP_CLI_SUPPORT = NO - -# Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen -# will parse them like normal C++ but will assume all classes use public instead -# of private inheritance when no explicit protection keyword is present. -# The default value is: NO. - -SIP_SUPPORT = NO - -# For Microsoft's IDL there are propget and propput attributes to indicate -# getter and setter methods for a property. Setting this option to YES will make -# doxygen to replace the get and set methods by a property in the documentation. -# This will only work if the methods are indeed getting or setting a simple -# type. If this is not the case, or you want to show the methods anyway, you -# should set this option to NO. -# The default value is: YES. - -IDL_PROPERTY_SUPPORT = YES - -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default -# all members of a group must be documented explicitly. -# The default value is: NO. - -DISTRIBUTE_GROUP_DOC = NO - -# If one adds a struct or class to a group and this option is enabled, then also -# any nested class or struct is added to the same group. By default this option -# is disabled and one has to add nested compounds explicitly via \ingroup. -# The default value is: NO. - -GROUP_NESTED_COMPOUNDS = NO - -# Set the SUBGROUPING tag to YES to allow class member groups of the same type -# (for instance a group of public functions) to be put as a subgroup of that -# type (e.g. under the Public Functions section). Set it to NO to prevent -# subgrouping. Alternatively, this can be done per class using the -# \nosubgrouping command. -# The default value is: YES. - -SUBGROUPING = YES - -# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions -# are shown inside the group in which they are included (e.g. using \ingroup) -# instead of on a separate page (for HTML and Man pages) or section (for LaTeX -# and RTF). -# -# Note that this feature does not work in combination with -# SEPARATE_MEMBER_PAGES. -# The default value is: NO. - -INLINE_GROUPED_CLASSES = NO - -# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions -# with only public data fields or simple typedef fields will be shown inline in -# the documentation of the scope in which they are defined (i.e. file, -# namespace, or group documentation), provided this scope is documented. If set -# to NO, structs, classes, and unions are shown on a separate page (for HTML and -# Man pages) or section (for LaTeX and RTF). -# The default value is: NO. - -INLINE_SIMPLE_STRUCTS = NO - -# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or -# enum is documented as struct, union, or enum with the name of the typedef. So -# typedef struct TypeS {} TypeT, will appear in the documentation as a struct -# with name TypeT. When disabled the typedef will appear as a member of a file, -# namespace, or class. And the struct will be named TypeS. This can typically be -# useful for C code in case the coding convention dictates that all compound -# types are typedef'ed and only the typedef is referenced, never the tag name. -# The default value is: NO. - -TYPEDEF_HIDES_STRUCT = NO - -# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This -# cache is used to resolve symbols given their name and scope. Since this can be -# an expensive process and often the same symbol appears multiple times in the -# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small -# doxygen will become slower. If the cache is too large, memory is wasted. The -# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range -# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536 -# symbols. At the end of a run doxygen will report the cache usage and suggest -# the optimal cache size from a speed point of view. -# Minimum value: 0, maximum value: 9, default value: 0. - -LOOKUP_CACHE_SIZE = 0 - -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- - -# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in -# documentation are documented, even if no documentation was available. Private -# class members and static file members will be hidden unless the -# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES. -# Note: This will also disable the warnings about undocumented members that are -# normally produced when WARNINGS is set to YES. -# The default value is: NO. - -EXTRACT_ALL = NO - -# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will -# be included in the documentation. -# The default value is: NO. - -EXTRACT_PRIVATE = NO - -# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal -# scope will be included in the documentation. -# The default value is: NO. - -EXTRACT_PACKAGE = NO - -# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be -# included in the documentation. -# The default value is: NO. - -EXTRACT_STATIC = NO - -# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined -# locally in source files will be included in the documentation. If set to NO, -# only classes defined in header files are included. Does not have any effect -# for Java sources. -# The default value is: YES. - -EXTRACT_LOCAL_CLASSES = YES - -# This flag is only useful for Objective-C code. If set to YES, local methods, -# which are defined in the implementation section but not in the interface are -# included in the documentation. If set to NO, only methods in the interface are -# included. -# The default value is: NO. - -EXTRACT_LOCAL_METHODS = NO - -# If this flag is set to YES, the members of anonymous namespaces will be -# extracted and appear in the documentation as a namespace called -# 'anonymous_namespace{file}', where file will be replaced with the base name of -# the file that contains the anonymous namespace. By default anonymous namespace -# are hidden. -# The default value is: NO. - -EXTRACT_ANON_NSPACES = NO - -# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all -# undocumented members inside documented classes or files. If set to NO these -# members will be included in the various overviews, but no documentation -# section is generated. This option has no effect if EXTRACT_ALL is enabled. -# The default value is: NO. - -HIDE_UNDOC_MEMBERS = NO - -# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. If set -# to NO, these classes will be included in the various overviews. This option -# has no effect if EXTRACT_ALL is enabled. -# The default value is: NO. - -HIDE_UNDOC_CLASSES = NO - -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend -# (class|struct|union) declarations. If set to NO, these declarations will be -# included in the documentation. -# The default value is: NO. - -HIDE_FRIEND_COMPOUNDS = NO - -# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any -# documentation blocks found inside the body of a function. If set to NO, these -# blocks will be appended to the function's detailed documentation block. -# The default value is: NO. - -HIDE_IN_BODY_DOCS = NO - -# The INTERNAL_DOCS tag determines if documentation that is typed after a -# \internal command is included. If the tag is set to NO then the documentation -# will be excluded. Set it to YES to include the internal documentation. -# The default value is: NO. - -INTERNAL_DOCS = NO - -# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file -# names in lower-case letters. If set to YES, upper-case letters are also -# allowed. This is useful if you have classes or files whose names only differ -# in case and if your file system supports case sensitive file names. Windows -# and Mac users are advised to set this option to NO. -# The default value is: system dependent. - -CASE_SENSE_NAMES = NO - -# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with -# their full class and namespace scopes in the documentation. If set to YES, the -# scope will be hidden. -# The default value is: NO. - -HIDE_SCOPE_NAMES = NO - -# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will -# append additional text to a page's title, such as Class Reference. If set to -# YES the compound reference will be hidden. -# The default value is: NO. - -HIDE_COMPOUND_REFERENCE= NO - -# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of -# the files that are included by a file in the documentation of that file. -# The default value is: YES. - -SHOW_INCLUDE_FILES = YES - -# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each -# grouped member an include statement to the documentation, telling the reader -# which file to include in order to use the member. -# The default value is: NO. - -SHOW_GROUPED_MEMB_INC = NO - -# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include -# files with double quotes in the documentation rather than with sharp brackets. -# The default value is: NO. - -FORCE_LOCAL_INCLUDES = NO - -# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the -# documentation for inline members. -# The default value is: YES. - -INLINE_INFO = YES - -# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the -# (detailed) documentation of file and class members alphabetically by member -# name. If set to NO, the members will appear in declaration order. -# The default value is: YES. - -SORT_MEMBER_DOCS = YES - -# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief -# descriptions of file, namespace and class members alphabetically by member -# name. If set to NO, the members will appear in declaration order. Note that -# this will also influence the order of the classes in the class list. -# The default value is: NO. - -SORT_BRIEF_DOCS = NO - -# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the -# (brief and detailed) documentation of class members so that constructors and -# destructors are listed first. If set to NO the constructors will appear in the -# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS. -# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief -# member documentation. -# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting -# detailed member documentation. -# The default value is: NO. - -SORT_MEMBERS_CTORS_1ST = NO - -# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy -# of group names into alphabetical order. If set to NO the group names will -# appear in their defined order. -# The default value is: NO. - -SORT_GROUP_NAMES = NO - -# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by -# fully-qualified names, including namespaces. If set to NO, the class list will -# be sorted only by class name, not including the namespace part. -# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. -# Note: This option applies only to the class list, not to the alphabetical -# list. -# The default value is: NO. - -SORT_BY_SCOPE_NAME = NO - -# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper -# type resolution of all parameters of a function it will reject a match between -# the prototype and the implementation of a member function even if there is -# only one candidate or it is obvious which candidate to choose by doing a -# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still -# accept a match between prototype and implementation in such cases. -# The default value is: NO. - -STRICT_PROTO_MATCHING = NO - -# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo -# list. This list is created by putting \todo commands in the documentation. -# The default value is: YES. - -GENERATE_TODOLIST = YES - -# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test -# list. This list is created by putting \test commands in the documentation. -# The default value is: YES. - -GENERATE_TESTLIST = YES - -# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug -# list. This list is created by putting \bug commands in the documentation. -# The default value is: YES. - -GENERATE_BUGLIST = YES - -# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO) -# the deprecated list. This list is created by putting \deprecated commands in -# the documentation. -# The default value is: YES. - -GENERATE_DEPRECATEDLIST= YES - -# The ENABLED_SECTIONS tag can be used to enable conditional documentation -# sections, marked by \if ... \endif and \cond -# ... \endcond blocks. - -ENABLED_SECTIONS = - -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the -# initial value of a variable or macro / define can have for it to appear in the -# documentation. If the initializer consists of more lines than specified here -# it will be hidden. Use a value of 0 to hide initializers completely. The -# appearance of the value of individual variables and macros / defines can be -# controlled using \showinitializer or \hideinitializer command in the -# documentation regardless of this setting. -# Minimum value: 0, maximum value: 10000, default value: 30. - -MAX_INITIALIZER_LINES = 30 - -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at -# the bottom of the documentation of classes and structs. If set to YES, the -# list will mention the files that were used to generate the documentation. -# The default value is: YES. - -SHOW_USED_FILES = YES - -# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This -# will remove the Files entry from the Quick Index and from the Folder Tree View -# (if specified). -# The default value is: YES. - -SHOW_FILES = YES - -# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces -# page. This will remove the Namespaces entry from the Quick Index and from the -# Folder Tree View (if specified). -# The default value is: YES. - -SHOW_NAMESPACES = YES - -# The FILE_VERSION_FILTER tag can be used to specify a program or script that -# doxygen should invoke to get the current version for each file (typically from -# the version control system). Doxygen will invoke the program by executing (via -# popen()) the command command input-file, where command is the value of the -# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided -# by doxygen. Whatever the program writes to standard output is used as the file -# version. For an example see the documentation. - -FILE_VERSION_FILTER = - -# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed -# by doxygen. The layout file controls the global structure of the generated -# output files in an output format independent way. To create the layout file -# that represents doxygen's defaults, run doxygen with the -l option. You can -# optionally specify a file name after the option, if omitted DoxygenLayout.xml -# will be used as the name of the layout file. -# -# Note that if you run doxygen from a directory containing a file called -# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE -# tag is left empty. - -LAYOUT_FILE = - -# The CITE_BIB_FILES tag can be used to specify one or more bib files containing -# the reference definitions. This must be a list of .bib files. The .bib -# extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. -# For LaTeX the style of the bibliography can be controlled using -# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the -# search path. See also \cite for info how to create references. - -CITE_BIB_FILES = - -#--------------------------------------------------------------------------- -# Configuration options related to warning and progress messages -#--------------------------------------------------------------------------- - -# The QUIET tag can be used to turn on/off the messages that are generated to -# standard output by doxygen. If QUIET is set to YES this implies that the -# messages are off. -# The default value is: NO. - -QUIET = NO - -# The WARNINGS tag can be used to turn on/off the warning messages that are -# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES -# this implies that the warnings are on. -# -# Tip: Turn warnings on while writing the documentation. -# The default value is: YES. - -WARNINGS = YES - -# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate -# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag -# will automatically be disabled. -# The default value is: YES. - -WARN_IF_UNDOCUMENTED = YES - -# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as not documenting some parameters -# in a documented function, or documenting parameters that don't exist or using -# markup commands wrongly. -# The default value is: YES. - -WARN_IF_DOC_ERROR = YES - -# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that -# are documented, but have no documentation for their parameters or return -# value. If set to NO, doxygen will only warn about wrong or incomplete -# parameter documentation, but not about the absence of documentation. -# The default value is: NO. - -WARN_NO_PARAMDOC = NO - -# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when -# a warning is encountered. -# The default value is: NO. - -WARN_AS_ERROR = NO - -# The WARN_FORMAT tag determines the format of the warning messages that doxygen -# can produce. The string should contain the $file, $line, and $text tags, which -# will be replaced by the file and line number from which the warning originated -# and the warning text. Optionally the format may contain $version, which will -# be replaced by the version of the file (if it could be obtained via -# FILE_VERSION_FILTER) -# The default value is: $file:$line: $text. - -WARN_FORMAT = "$file:$line: $text" - -# The WARN_LOGFILE tag can be used to specify a file to which warning and error -# messages should be written. If left blank the output is written to standard -# error (stderr). - -WARN_LOGFILE = - -#--------------------------------------------------------------------------- -# Configuration options related to the input files -#--------------------------------------------------------------------------- - -# The INPUT tag is used to specify the files and/or directories that contain -# documented source files. You may enter file names like myfile.cpp or -# directories like /usr/src/myproject. Separate the files or directories with -# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING -# Note: If this tag is empty the current directory is searched. - -INPUT = /Users/alek/git/tikzit/src - -# This tag can be used to specify the character encoding of the source files -# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses -# libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: https://www.gnu.org/software/libiconv/) for the list of -# possible encodings. -# The default value is: UTF-8. - -INPUT_ENCODING = UTF-8 - -# If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and -# *.h) to filter out the source-files in the directories. -# -# Note that for custom extensions or not directly supported extensions you also -# need to set EXTENSION_MAPPING for the extension otherwise the files are not -# read by doxygen. -# -# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp, -# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, -# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, -# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, -# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf and *.qsf. - -FILE_PATTERNS = *.c \ - *.cc \ - *.cxx \ - *.cpp \ - *.c++ \ - *.java \ - *.ii \ - *.ixx \ - *.ipp \ - *.i++ \ - *.inl \ - *.idl \ - *.ddl \ - *.odl \ - *.h \ - *.hh \ - *.hxx \ - *.hpp \ - *.h++ \ - *.cs \ - *.d \ - *.php \ - *.php4 \ - *.php5 \ - *.phtml \ - *.inc \ - *.m \ - *.markdown \ - *.md \ - *.mm \ - *.dox \ - *.py \ - *.pyw \ - *.f90 \ - *.f95 \ - *.f03 \ - *.f08 \ - *.f \ - *.for \ - *.tcl \ - *.vhd \ - *.vhdl \ - *.ucf \ - *.qsf \ - *.l \ - *.y - -# The RECURSIVE tag can be used to specify whether or not subdirectories should -# be searched for input files as well. -# The default value is: NO. - -RECURSIVE = YES - -# The EXCLUDE tag can be used to specify files and/or directories that should be -# excluded from the INPUT source files. This way you can easily exclude a -# subdirectory from a directory tree whose root is specified with the INPUT tag. -# -# Note that relative paths are relative to the directory from which doxygen is -# run. - -EXCLUDE = - -# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or -# directories that are symbolic links (a Unix file system feature) are excluded -# from the input. -# The default value is: NO. - -EXCLUDE_SYMLINKS = NO - -# If the value of the INPUT tag contains directories, you can use the -# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. -# -# Note that the wildcards are matched against the file with absolute path, so to -# exclude all test directories for example use the pattern */test/* - -EXCLUDE_PATTERNS = - -# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names -# (namespaces, classes, functions, etc.) that should be excluded from the -# output. The symbol name can be a fully qualified name, a word, or if the -# wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test -# -# Note that the wildcards are matched against the file with absolute path, so to -# exclude all test directories use the pattern */test/* - -EXCLUDE_SYMBOLS = - -# The EXAMPLE_PATH tag can be used to specify one or more files or directories -# that contain example code fragments that are included (see the \include -# command). - -EXAMPLE_PATH = - -# If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and -# *.h) to filter out the source-files in the directories. If left blank all -# files are included. - -EXAMPLE_PATTERNS = * - -# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be -# searched for input files to be used with the \include or \dontinclude commands -# irrespective of the value of the RECURSIVE tag. -# The default value is: NO. - -EXAMPLE_RECURSIVE = NO - -# The IMAGE_PATH tag can be used to specify one or more files or directories -# that contain images that are to be included in the documentation (see the -# \image command). - -IMAGE_PATH = - -# The INPUT_FILTER tag can be used to specify a program that doxygen should -# invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command: -# -# -# -# where is the value of the INPUT_FILTER tag, and is the -# name of an input file. Doxygen will then use the output that the filter -# program writes to standard output. If FILTER_PATTERNS is specified, this tag -# will be ignored. -# -# Note that the filter must not add or remove lines; it is applied before the -# code is scanned, but not when the output code is generated. If lines are added -# or removed, the anchors will not be placed correctly. -# -# Note that for custom extensions or not directly supported extensions you also -# need to set EXTENSION_MAPPING for the extension otherwise the files are not -# properly processed by doxygen. - -INPUT_FILTER = - -# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern -# basis. Doxygen will compare the file name with each pattern and apply the -# filter if there is a match. The filters are a list of the form: pattern=filter -# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how -# filters are used. If the FILTER_PATTERNS tag is empty or if none of the -# patterns match the file name, INPUT_FILTER is applied. -# -# Note that for custom extensions or not directly supported extensions you also -# need to set EXTENSION_MAPPING for the extension otherwise the files are not -# properly processed by doxygen. - -FILTER_PATTERNS = - -# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER) will also be used to filter the input files that are used for -# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES). -# The default value is: NO. - -FILTER_SOURCE_FILES = NO - -# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file -# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and -# it is also possible to disable source filtering for a specific pattern using -# *.ext= (so without naming a filter). -# This tag requires that the tag FILTER_SOURCE_FILES is set to YES. - -FILTER_SOURCE_PATTERNS = - -# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that -# is part of the input, its contents will be placed on the main page -# (index.html). This can be useful if you have a project on for instance GitHub -# and want to reuse the introduction page also for the doxygen output. - -USE_MDFILE_AS_MAINPAGE = - -#--------------------------------------------------------------------------- -# Configuration options related to source browsing -#--------------------------------------------------------------------------- - -# If the SOURCE_BROWSER tag is set to YES then a list of source files will be -# generated. Documented entities will be cross-referenced with these sources. -# -# Note: To get rid of all source code in the generated output, make sure that -# also VERBATIM_HEADERS is set to NO. -# The default value is: NO. - -SOURCE_BROWSER = YES - -# Setting the INLINE_SOURCES tag to YES will include the body of functions, -# classes and enums directly into the documentation. -# The default value is: NO. - -INLINE_SOURCES = NO - -# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any -# special comment blocks from generated source code fragments. Normal C, C++ and -# Fortran comments will always remain visible. -# The default value is: YES. - -STRIP_CODE_COMMENTS = YES - -# If the REFERENCED_BY_RELATION tag is set to YES then for each documented -# function all documented functions referencing it will be listed. -# The default value is: NO. - -REFERENCED_BY_RELATION = NO - -# If the REFERENCES_RELATION tag is set to YES then for each documented function -# all documented entities called/used by that function will be listed. -# The default value is: NO. - -REFERENCES_RELATION = NO - -# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set -# to YES then the hyperlinks from functions in REFERENCES_RELATION and -# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will -# link to the documentation. -# The default value is: YES. - -REFERENCES_LINK_SOURCE = YES - -# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the -# source code will show a tooltip with additional information such as prototype, -# brief description and links to the definition and documentation. Since this -# will make the HTML file larger and loading of large files a bit slower, you -# can opt to disable this feature. -# The default value is: YES. -# This tag requires that the tag SOURCE_BROWSER is set to YES. - -SOURCE_TOOLTIPS = YES - -# If the USE_HTAGS tag is set to YES then the references to source code will -# point to the HTML generated by the htags(1) tool instead of doxygen built-in -# source browser. The htags tool is part of GNU's global source tagging system -# (see https://www.gnu.org/software/global/global.html). You will need version -# 4.8.6 or higher. -# -# To use it do the following: -# - Install the latest version of global -# - Enable SOURCE_BROWSER and USE_HTAGS in the config file -# - Make sure the INPUT points to the root of the source tree -# - Run doxygen as normal -# -# Doxygen will invoke htags (and that will in turn invoke gtags), so these -# tools must be available from the command line (i.e. in the search path). -# -# The result: instead of the source browser generated by doxygen, the links to -# source code will now point to the output of htags. -# The default value is: NO. -# This tag requires that the tag SOURCE_BROWSER is set to YES. - -USE_HTAGS = NO - -# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a -# verbatim copy of the header file for each class for which an include is -# specified. Set to NO to disable this. -# See also: Section \class. -# The default value is: YES. - -VERBATIM_HEADERS = YES - -# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the -# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the -# cost of reduced performance. This can be particularly helpful with template -# rich C++ code for which doxygen's built-in parser lacks the necessary type -# information. -# Note: The availability of this option depends on whether or not doxygen was -# generated with the -Duse-libclang=ON option for CMake. -# The default value is: NO. - -CLANG_ASSISTED_PARSING = NO - -# If clang assisted parsing is enabled you can provide the compiler with command -# line options that you would normally use when invoking the compiler. Note that -# the include paths will already be set by doxygen for the files and directories -# specified with INPUT and INCLUDE_PATH. -# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES. - -CLANG_OPTIONS = - -# If clang assisted parsing is enabled you can provide the clang parser with the -# path to the compilation database (see: -# http://clang.llvm.org/docs/HowToSetupToolingForLLVM.html) used when the files -# were built. This is equivalent to specifying the "-p" option to a clang tool, -# such as clang-check. These options will then be passed to the parser. -# Note: The availability of this option depends on whether or not doxygen was -# generated with the -Duse-libclang=ON option for CMake. -# The default value is: 0. - -CLANG_COMPILATION_DATABASE_PATH= 0 - -#--------------------------------------------------------------------------- -# Configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- - -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all -# compounds will be generated. Enable this if the project contains a lot of -# classes, structs, unions or interfaces. -# The default value is: YES. - -ALPHABETICAL_INDEX = YES - -# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in -# which the alphabetical index list will be split. -# Minimum value: 1, maximum value: 20, default value: 5. -# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. - -COLS_IN_ALPHA_INDEX = 5 - -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. -# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. - -IGNORE_PREFIX = - -#--------------------------------------------------------------------------- -# Configuration options related to the HTML output -#--------------------------------------------------------------------------- - -# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output -# The default value is: YES. - -GENERATE_HTML = YES - -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a -# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of -# it. -# The default directory is: html. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_OUTPUT = html - -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each -# generated HTML page (for example: .htm, .php, .asp). -# The default value is: .html. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_FILE_EXTENSION = .html - -# The HTML_HEADER tag can be used to specify a user-defined HTML header file for -# each generated HTML page. If the tag is left blank doxygen will generate a -# standard header. -# -# To get valid HTML the header file that includes any scripts and style sheets -# that doxygen needs, which is dependent on the configuration options used (e.g. -# the setting GENERATE_TREEVIEW). It is highly recommended to start with a -# default header using -# doxygen -w html new_header.html new_footer.html new_stylesheet.css -# YourConfigFile -# and then modify the file new_header.html. See also section "Doxygen usage" -# for information on how to generate the default header that doxygen normally -# uses. -# Note: The header is subject to change so you typically have to regenerate the -# default header when upgrading to a newer version of doxygen. For a description -# of the possible markers and block names see the documentation. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_HEADER = - -# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each -# generated HTML page. If the tag is left blank doxygen will generate a standard -# footer. See HTML_HEADER for more information on how to generate a default -# footer and what special commands can be used inside the footer. See also -# section "Doxygen usage" for information on how to generate the default footer -# that doxygen normally uses. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_FOOTER = - -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style -# sheet that is used by each HTML page. It can be used to fine-tune the look of -# the HTML output. If left blank doxygen will generate a default style sheet. -# See also section "Doxygen usage" for information on how to generate the style -# sheet that doxygen normally uses. -# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as -# it is more robust and this tag (HTML_STYLESHEET) will in the future become -# obsolete. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_STYLESHEET = - -# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined -# cascading style sheets that are included after the standard style sheets -# created by doxygen. Using this option one can overrule certain style aspects. -# This is preferred over using HTML_STYLESHEET since it does not replace the -# standard style sheet and is therefore more robust against future updates. -# Doxygen will copy the style sheet files to the output directory. -# Note: The order of the extra style sheet files is of importance (e.g. the last -# style sheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_EXTRA_STYLESHEET = - -# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or -# other source files which should be copied to the HTML output directory. Note -# that these files will be copied to the base HTML output directory. Use the -# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these -# files. In the HTML_STYLESHEET file, use the file name only. Also note that the -# files will be copied as-is; there are no commands or markers available. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_EXTRA_FILES = - -# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen -# will adjust the colors in the style sheet and background images according to -# this color. Hue is specified as an angle on a colorwheel, see -# https://en.wikipedia.org/wiki/Hue for more information. For instance the value -# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 -# purple, and 360 is red again. -# Minimum value: 0, maximum value: 359, default value: 220. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_COLORSTYLE_HUE = 220 - -# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors -# in the HTML output. For a value of 0 the output will use grayscales only. A -# value of 255 will produce the most vivid colors. -# Minimum value: 0, maximum value: 255, default value: 100. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_COLORSTYLE_SAT = 100 - -# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the -# luminance component of the colors in the HTML output. Values below 100 -# gradually make the output lighter, whereas values above 100 make the output -# darker. The value divided by 100 is the actual gamma applied, so 80 represents -# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not -# change the gamma. -# Minimum value: 40, maximum value: 240, default value: 80. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_COLORSTYLE_GAMMA = 80 - -# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML -# page will contain the date and time when the page was generated. Setting this -# to YES can help to show when doxygen was last run and thus if the -# documentation is up to date. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_TIMESTAMP = NO - -# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML -# documentation will contain a main index with vertical navigation menus that -# are dynamically created via Javascript. If disabled, the navigation index will -# consists of multiple levels of tabs that are statically embedded in every HTML -# page. Disable this option to support browsers that do not have Javascript, -# like the Qt help browser. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_DYNAMIC_MENUS = YES - -# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML -# documentation will contain sections that can be hidden and shown after the -# page has loaded. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_DYNAMIC_SECTIONS = NO - -# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries -# shown in the various tree structured indices initially; the user can expand -# and collapse entries dynamically later on. Doxygen will expand the tree to -# such a level that at most the specified number of entries are visible (unless -# a fully collapsed tree already exceeds this amount). So setting the number of -# entries 1 will produce a full collapsed tree by default. 0 is a special value -# representing an infinite number of entries and will result in a full expanded -# tree by default. -# Minimum value: 0, maximum value: 9999, default value: 100. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_INDEX_NUM_ENTRIES = 100 - -# If the GENERATE_DOCSET tag is set to YES, additional index files will be -# generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: https://developer.apple.com/tools/xcode/), introduced with -# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a -# Makefile in the HTML output directory. Running make will produce the docset in -# that directory and running make install will install the docset in -# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html -# for more information. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -GENERATE_DOCSET = NO - -# This tag determines the name of the docset feed. A documentation feed provides -# an umbrella under which multiple documentation sets from a single provider -# (such as a company or product suite) can be grouped. -# The default value is: Doxygen generated docs. -# This tag requires that the tag GENERATE_DOCSET is set to YES. - -DOCSET_FEEDNAME = "Doxygen generated docs" - -# This tag specifies a string that should uniquely identify the documentation -# set bundle. This should be a reverse domain-name style string, e.g. -# com.mycompany.MyDocSet. Doxygen will append .docset to the name. -# The default value is: org.doxygen.Project. -# This tag requires that the tag GENERATE_DOCSET is set to YES. - -DOCSET_BUNDLE_ID = org.doxygen.Project - -# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify -# the documentation publisher. This should be a reverse domain-name style -# string, e.g. com.mycompany.MyDocSet.documentation. -# The default value is: org.doxygen.Publisher. -# This tag requires that the tag GENERATE_DOCSET is set to YES. - -DOCSET_PUBLISHER_ID = org.doxygen.Publisher - -# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher. -# The default value is: Publisher. -# This tag requires that the tag GENERATE_DOCSET is set to YES. - -DOCSET_PUBLISHER_NAME = Publisher - -# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three -# additional HTML index files: index.hhp, index.hhc, and index.hhk. The -# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop -# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on -# Windows. -# -# The HTML Help Workshop contains a compiler that can convert all HTML output -# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML -# files are now used as the Windows 98 help format, and will replace the old -# Windows help format (.hlp) on all Windows platforms in the future. Compressed -# HTML files also contain an index, a table of contents, and you can search for -# words in the documentation. The HTML workshop also contains a viewer for -# compressed HTML files. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -GENERATE_HTMLHELP = NO - -# The CHM_FILE tag can be used to specify the file name of the resulting .chm -# file. You can add a path in front of the file if the result should not be -# written to the html output directory. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -CHM_FILE = - -# The HHC_LOCATION tag can be used to specify the location (absolute path -# including file name) of the HTML help compiler (hhc.exe). If non-empty, -# doxygen will try to run the HTML help compiler on the generated index.hhp. -# The file has to be specified with full path. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -HHC_LOCATION = - -# The GENERATE_CHI flag controls if a separate .chi index file is generated -# (YES) or that it should be included in the master .chm file (NO). -# The default value is: NO. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -GENERATE_CHI = NO - -# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc) -# and project file content. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -CHM_INDEX_ENCODING = - -# The BINARY_TOC flag controls whether a binary table of contents is generated -# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it -# enables the Previous and Next buttons. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -BINARY_TOC = NO - -# The TOC_EXPAND flag can be set to YES to add extra items for group members to -# the table of contents of the HTML help documentation and to the tree view. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -TOC_EXPAND = NO - -# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and -# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that -# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help -# (.qch) of the generated HTML documentation. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -GENERATE_QHP = NO - -# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify -# the file name of the resulting .qch file. The path specified is relative to -# the HTML output folder. -# This tag requires that the tag GENERATE_QHP is set to YES. - -QCH_FILE = - -# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help -# Project output. For more information please see Qt Help Project / Namespace -# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace). -# The default value is: org.doxygen.Project. -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHP_NAMESPACE = org.doxygen.Project - -# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt -# Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders). -# The default value is: doc. -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHP_VIRTUAL_FOLDER = doc - -# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom -# filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHP_CUST_FILTER_NAME = - -# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the -# custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters). -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHP_CUST_FILTER_ATTRS = - -# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this -# project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes). -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHP_SECT_FILTER_ATTRS = - -# The QHG_LOCATION tag can be used to specify the location of Qt's -# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the -# generated .qhp file. -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHG_LOCATION = - -# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be -# generated, together with the HTML files, they form an Eclipse help plugin. To -# install this plugin and make it available under the help contents menu in -# Eclipse, the contents of the directory containing the HTML and XML files needs -# to be copied into the plugins directory of eclipse. The name of the directory -# within the plugins directory should be the same as the ECLIPSE_DOC_ID value. -# After copying Eclipse needs to be restarted before the help appears. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -GENERATE_ECLIPSEHELP = NO - -# A unique identifier for the Eclipse help plugin. When installing the plugin -# the directory name containing the HTML and XML files should also have this -# name. Each documentation set should have its own identifier. -# The default value is: org.doxygen.Project. -# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES. - -ECLIPSE_DOC_ID = org.doxygen.Project - -# If you want full control over the layout of the generated HTML pages it might -# be necessary to disable the index and replace it with your own. The -# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top -# of each HTML page. A value of NO enables the index and the value YES disables -# it. Since the tabs in the index contain the same information as the navigation -# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -DISABLE_INDEX = NO - -# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index -# structure should be generated to display hierarchical information. If the tag -# value is set to YES, a side panel will be generated containing a tree-like -# index structure (just like the one that is generated for HTML Help). For this -# to work a browser that supports JavaScript, DHTML, CSS and frames is required -# (i.e. any modern browser). Windows users are probably better off using the -# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can -# further fine-tune the look of the index. As an example, the default style -# sheet generated by doxygen has an example that shows how to put an image at -# the root of the tree instead of the PROJECT_NAME. Since the tree basically has -# the same information as the tab index, you could consider setting -# DISABLE_INDEX to YES when enabling this option. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -GENERATE_TREEVIEW = NO - -# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that -# doxygen will group on one line in the generated HTML documentation. -# -# Note that a value of 0 will completely suppress the enum values from appearing -# in the overview section. -# Minimum value: 0, maximum value: 20, default value: 4. -# This tag requires that the tag GENERATE_HTML is set to YES. - -ENUM_VALUES_PER_LINE = 4 - -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used -# to set the initial width (in pixels) of the frame in which the tree is shown. -# Minimum value: 0, maximum value: 1500, default value: 250. -# This tag requires that the tag GENERATE_HTML is set to YES. - -TREEVIEW_WIDTH = 250 - -# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to -# external symbols imported via tag files in a separate window. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -EXT_LINKS_IN_WINDOW = NO - -# Use this tag to change the font size of LaTeX formulas included as images in -# the HTML documentation. When you change the font size after a successful -# doxygen run you need to manually remove any form_*.png images from the HTML -# output directory to force them to be regenerated. -# Minimum value: 8, maximum value: 50, default value: 10. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_FONTSIZE = 10 - -# Use the FORMULA_TRANSPARENT tag to determine whether or not the images -# generated for formulas are transparent PNGs. Transparent PNGs are not -# supported properly for IE 6.0, but are supported on all modern browsers. -# -# Note that when changing this option you need to delete any form_*.png files in -# the HTML output directory before the changes have effect. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_TRANSPARENT = YES - -# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# https://www.mathjax.org) which uses client side Javascript for the rendering -# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX -# installed or if you want to formulas look prettier in the HTML output. When -# enabled you may also need to install MathJax separately and configure the path -# to it using the MATHJAX_RELPATH option. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -USE_MATHJAX = NO - -# When MathJax is enabled you can set the default output format to be used for -# the MathJax output. See the MathJax site (see: -# http://docs.mathjax.org/en/latest/output.html) for more details. -# Possible values are: HTML-CSS (which is slower, but has the best -# compatibility), NativeMML (i.e. MathML) and SVG. -# The default value is: HTML-CSS. -# This tag requires that the tag USE_MATHJAX is set to YES. - -MATHJAX_FORMAT = HTML-CSS - -# When MathJax is enabled you need to specify the location relative to the HTML -# output directory using the MATHJAX_RELPATH option. The destination directory -# should contain the MathJax.js script. For instance, if the mathjax directory -# is located at the same level as the HTML output directory, then -# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax -# Content Delivery Network so you can quickly see the result without installing -# MathJax. However, it is strongly recommended to install a local copy of -# MathJax from https://www.mathjax.org before deployment. -# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/. -# This tag requires that the tag USE_MATHJAX is set to YES. - -MATHJAX_RELPATH = https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/ - -# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax -# extension names that should be enabled during MathJax rendering. For example -# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols -# This tag requires that the tag USE_MATHJAX is set to YES. - -MATHJAX_EXTENSIONS = - -# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces -# of code that will be used on startup of the MathJax code. See the MathJax site -# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an -# example see the documentation. -# This tag requires that the tag USE_MATHJAX is set to YES. - -MATHJAX_CODEFILE = - -# When the SEARCHENGINE tag is enabled doxygen will generate a search box for -# the HTML output. The underlying search engine uses javascript and DHTML and -# should work on any modern browser. Note that when using HTML help -# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET) -# there is already a search function so this one should typically be disabled. -# For large projects the javascript based search engine can be slow, then -# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to -# search using the keyboard; to jump to the search box use + S -# (what the is depends on the OS and browser, but it is typically -# , / + + Qt::ScrollBarAlwaysOn + + + Qt::ScrollBarAlwaysOff + -- cgit v1.2.3 From 4417ac396302b1ba28985238a2b6993a161f464a Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 11 Sep 2018 10:06:16 +0200 Subject: added logo files --- images/logo.pdf | Bin 0 -> 1991 bytes images/logo.png | Bin 0 -> 17595 bytes images/logo.svg | 268 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 268 insertions(+) create mode 100644 images/logo.pdf create mode 100644 images/logo.png create mode 100644 images/logo.svg diff --git a/images/logo.pdf b/images/logo.pdf new file mode 100644 index 0000000..1fe8a28 Binary files /dev/null and b/images/logo.pdf differ diff --git a/images/logo.png b/images/logo.png new file mode 100644 index 0000000..000d172 Binary files /dev/null and b/images/logo.png differ diff --git a/images/logo.svg b/images/logo.svg new file mode 100644 index 0000000..5fb38c6 --- /dev/null +++ b/images/logo.svg @@ -0,0 +1,268 @@ + + + +image/svg+xml \ No newline at end of file -- cgit v1.2.3 From 5708cb51035cfd40692afd308fb2bf326528b885 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 11 Sep 2018 10:40:21 +0200 Subject: nodeitem respects shape --- src/gui/nodeitem.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/gui/nodeitem.cpp b/src/gui/nodeitem.cpp index b452848..18ff43c 100644 --- a/src/gui/nodeitem.cpp +++ b/src/gui/nodeitem.cpp @@ -114,7 +114,12 @@ void NodeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidge QPainterPath NodeItem::shape() const { QPainterPath path; - path.addEllipse(QPointF(0,0), GLOBAL_SCALEF * 0.2, GLOBAL_SCALEF * 0.2); + + if (_node->style()->shape() == "rectangle") { + path.addRect(-0.2 * GLOBAL_SCALEF, -0.2 * GLOBAL_SCALEF, 0.4 * GLOBAL_SCALEF, 0.4 * GLOBAL_SCALEF); + } else { + path.addEllipse(QPointF(0, 0), GLOBAL_SCALEF * 0.2, GLOBAL_SCALEF * 0.2); + } return path; } -- cgit v1.2.3 From afcf3dba0753d71b801fb035277b2ec857f19de9 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Thu, 20 Sep 2018 22:23:39 +0200 Subject: restructured menu --- src/gui/mainmenu.ui | 38 ++++++++++++++++++++++++++++++++++---- src/gui/toolpalette.cpp | 2 +- src/main.cpp | 1 - 3 files changed, 35 insertions(+), 6 deletions(-) diff --git a/src/gui/mainmenu.ui b/src/gui/mainmenu.ui index 80a7c81..1517fb1 100644 --- a/src/gui/mainmenu.ui +++ b/src/gui/mainmenu.ui @@ -36,6 +36,22 @@ + + + Reorder + + + + + + + Transform + + + + + + @@ -48,10 +64,8 @@ - - - - + + @@ -278,6 +292,22 @@ Shift+Down + + + Bring to Front + + + Ctrl+] + + + + + Send to Back + + + Ctrl+[ + + diff --git a/src/gui/toolpalette.cpp b/src/gui/toolpalette.cpp index 044e8d0..c0e2a22 100644 --- a/src/gui/toolpalette.cpp +++ b/src/gui/toolpalette.cpp @@ -43,7 +43,7 @@ ToolPalette::ToolPalette(QWidget *parent) : select = new QAction(QIcon(":/images/select-ak.svg"), "Select"); vertex = new QAction(QIcon(":/images/node-ak.svg"), "Add Vertex"); edge = new QAction(QIcon(":/images/edge-ak.svg"), "Add Edge"); - crop = new QAction(QIcon(":/images/crop.svg"), "Bounding Box"); + //crop = new QAction(QIcon(":/images/crop.svg"), "Bounding Box"); tools->addAction(select); diff --git a/src/main.cpp b/src/main.cpp index 1fcefc0..97dbe4d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -32,7 +32,6 @@ // #include // #endif - int main(int argc, char *argv[]) { // #ifdef Q_OS_WIN -- cgit v1.2.3 From 5e5a98b97871ebaa3899e2f1bf08534e32f1f983 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Fri, 21 Sep 2018 08:48:43 +0200 Subject: fixed bug with edge styles --- src/data/nodestyle.cpp | 1 + src/data/tikzdocument.cpp | 5 ++++- src/gui/undocommands.cpp | 12 +++++++++--- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/data/nodestyle.cpp b/src/data/nodestyle.cpp index 9c38dfd..20245d9 100644 --- a/src/data/nodestyle.cpp +++ b/src/data/nodestyle.cpp @@ -22,6 +22,7 @@ #include NodeStyle *noneStyle = new NodeStyle(); +NodeStyle *unknownStyle = new NodeStyle("unknown", new GraphElementData({GraphElementProperty("tikzit fill", "red")})); NodeStyle::NodeStyle() : Style() { diff --git a/src/data/tikzdocument.cpp b/src/data/tikzdocument.cpp index 5ddec90..fd70e92 100644 --- a/src/data/tikzdocument.cpp +++ b/src/data/tikzdocument.cpp @@ -85,7 +85,10 @@ void TikzDocument::open(QString fileName) delete _graph; _graph = newGraph; foreach (Node *n, _graph->nodes()) n->attachStyle(); - foreach (Edge *e, _graph->edges()) e->updateControls(); + foreach (Edge *e, _graph->edges()) { + e->attachStyle(); + e->updateControls(); + } _parseSuccess = true; refreshTikz(); setClean(); diff --git a/src/gui/undocommands.cpp b/src/gui/undocommands.cpp index 0cfa0bd..2ed5034 100644 --- a/src/gui/undocommands.cpp +++ b/src/gui/undocommands.cpp @@ -422,7 +422,10 @@ ReplaceGraphCommand::ReplaceGraphCommand(TikzScene *scene, Graph *oldGraph, Grap void ReplaceGraphCommand::undo() { foreach (Node *n, _oldGraph->nodes()) n->attachStyle(); - foreach (Edge *e, _oldGraph->edges()) e->updateControls(); + foreach (Edge *e, _oldGraph->edges()) { + e->attachStyle(); + e->updateControls(); + } _scene->tikzDocument()->setGraph(_oldGraph); _scene->graphReplaced(); } @@ -430,7 +433,10 @@ void ReplaceGraphCommand::undo() void ReplaceGraphCommand::redo() { foreach (Node *n, _newGraph->nodes()) n->attachStyle(); - foreach (Edge *e, _newGraph->edges()) e->updateControls(); + foreach (Edge *e, _newGraph->edges()) { + e->attachStyle(); + e->updateControls(); + } _scene->tikzDocument()->setGraph(_newGraph); _scene->graphReplaced(); } @@ -496,4 +502,4 @@ void RotateNodesCommand::redo() _scene->refreshAdjacentEdges(_nodes.toList()); GraphUpdateCommand::redo(); -} \ No newline at end of file +} -- cgit v1.2.3 From 1f57600e248bc4171dbf72e211b3b061045ebeb4 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Fri, 21 Sep 2018 09:19:21 +0200 Subject: fixed edge selection bug --- src/gui/edgeitem.cpp | 11 ++++++++--- src/gui/tikzscene.cpp | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/gui/edgeitem.cpp b/src/gui/edgeitem.cpp index f469506..146b4e0 100644 --- a/src/gui/edgeitem.cpp +++ b/src/gui/edgeitem.cpp @@ -102,7 +102,12 @@ void EdgeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidge painter->drawPath(pth); break; } - } + } + + //QPen outline = QPen(Qt::red); + //painter->setPen(outline); + //painter->drawPath(_expPath); + //painter->setPen(pen); switch (_edge->style()->arrowTail()) { case EdgeStyle::Flat: @@ -209,9 +214,9 @@ void EdgeItem::setPath(const QPainterPath &path) // get the shape of the edge, and expand a bit to make selection easier QPainterPathStroker stroker; - stroker.setWidth(5); + stroker.setWidth(8); stroker.setJoinStyle(Qt::MiterJoin); - _expPath = (stroker.createStroke(_path) + _path).simplified(); + _expPath = stroker.createStroke(_path).simplified(); float r = GLOBAL_SCALEF * (_edge->cpDist() + 0.2); _boundingRect = _path.boundingRect().adjusted(-r,-r,r,r); diff --git a/src/gui/tikzscene.cpp b/src/gui/tikzscene.cpp index 8950325..2a37014 100644 --- a/src/gui/tikzscene.cpp +++ b/src/gui/tikzscene.cpp @@ -164,7 +164,7 @@ void TikzScene::mousePressEvent(QGraphicsSceneMouseEvent *event) if (items(_mouseDownPos).isEmpty()) { _rubberBandItem->setRect(QRectF(_mouseDownPos,_mouseDownPos)); _rubberBandItem->setVisible(true); - qDebug() << "starting rubber band drag"; + //qDebug() << "starting rubber band drag"; } // foreach (QGraphicsItem *gi, items()) { -- cgit v1.2.3 From 331c5d069e79b387eb8964c546dde8109ccf4798 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Fri, 21 Sep 2018 18:35:24 +0200 Subject: fixed bug with fractional coordinates on linux --- src/data/graph.cpp | 10 ++++++---- src/data/tikzlexer.l | 6 ++++-- src/gui/tikzscene.cpp | 4 ++++ 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/data/graph.cpp b/src/data/graph.cpp index 7d71ceb..2c9a84e 100644 --- a/src/data/graph.cpp +++ b/src/data/graph.cpp @@ -269,10 +269,12 @@ Graph *Graph::copyOfSubgraphWithNodes(QSet nds) Graph *g = new Graph(); g->setData(_data->copy()); QMap nodeTable; - foreach (Node *n, nds) { - Node *n1 = n->copy(); - nodeTable.insert(n, n1); - g->addNode(n1); + foreach (Node *n, nodes()) { + if (nds.contains(n)) { + Node *n1 = n->copy(); + nodeTable.insert(n, n1); + g->addNode(n1); + } } foreach (Edge *e, edges()) { if (nds.contains(e->source()) && nds.contains(e->target())) { diff --git a/src/data/tikzlexer.l b/src/data/tikzlexer.l index 0a67d1d..0d80467 100644 --- a/src/data/tikzlexer.l +++ b/src/data/tikzlexer.l @@ -90,12 +90,14 @@ FLOAT \-?[0-9]*(\.[0-9]+)? } {FLOAT} { yylval->pt = new QPointF(); - yylval->pt->setX(strtod(yytext,NULL)); + QString s(yytext); + yylval->pt->setX(s.toDouble()); BEGIN(ycoord); } , { } {FLOAT} { - yylval->pt->setY(strtod(yytext,NULL)); + QString s(yytext); + yylval->pt->setY(s.toDouble()); } \) { BEGIN(INITIAL); diff --git a/src/gui/tikzscene.cpp b/src/gui/tikzscene.cpp index 2a37014..1c6f0bb 100644 --- a/src/gui/tikzscene.cpp +++ b/src/gui/tikzscene.cpp @@ -621,6 +621,7 @@ void TikzScene::deleteSelectedItems() void TikzScene::copyToClipboard() { Graph *g = graph()->copyOfSubgraphWithNodes(getSelectedNodes()); + //qDebug() << g->tikz(); QGuiApplication::clipboard()->setText(g->tikz()); delete g; } @@ -641,8 +642,11 @@ void TikzScene::pasteFromClipboard() // attempt to parse whatever's on the clipboard, if we get a // non-empty tikz graph, insert it. if (ass.parse(tikz) && !g->nodes().isEmpty()) { + qDebug() << "CLIPBOARD:" << tikz; + qDebug() << "PARSED:" << g->tikz(); // make sure names in the new subgraph are fresh g->renameApart(graph()); + qDebug() << "FRESH:" << g->tikz(); QRectF srcRect = g->realBbox(); QRectF tgtRect = graph()->realBbox(); -- cgit v1.2.3 From 93cf29d4f47ac20cc0b1162284304b2e75bb777c Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Sat, 22 Sep 2018 11:55:12 +0200 Subject: setting the window icon --- src/gui/mainwindow.cpp | 5 +++++ tikzit.qrc | 1 + 2 files changed, 6 insertions(+) diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 537a612..4525aef 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -14,6 +14,8 @@ #include #include #include +#include +#include int MainWindow::_numWindows = 0; @@ -24,6 +26,9 @@ MainWindow::MainWindow(QWidget *parent) : _windowId = _numWindows; _numWindows++; ui->setupUi(this); + + setWindowIcon(QIcon(":/images/logo.png")); + setAttribute(Qt::WA_DeleteOnClose, true); _tikzDocument = new TikzDocument(this); diff --git a/tikzit.qrc b/tikzit.qrc index ed033b6..b3852aa 100644 --- a/tikzit.qrc +++ b/tikzit.qrc @@ -12,6 +12,7 @@ images/node-ak.svg images/select-ak.svg images/refresh.svg + images/logo.png qt.conf -- cgit v1.2.3 From 82e1e16580b4832e1241ceb9e38906e660baec85 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Sat, 22 Sep 2018 14:05:32 +0200 Subject: extend selection --- src/gui/mainmenu.cpp | 24 +++++++++++++++++ src/gui/mainmenu.h | 4 +++ src/gui/mainmenu.ui | 12 ++++----- src/gui/tikzscene.cpp | 75 ++++++++++++++++++++++++++++++++++++++++++++++++--- src/gui/tikzscene.h | 4 +++ 5 files changed, 110 insertions(+), 9 deletions(-) diff --git a/src/gui/mainmenu.cpp b/src/gui/mainmenu.cpp index 6bbc95a..ca837fa 100644 --- a/src/gui/mainmenu.cpp +++ b/src/gui/mainmenu.cpp @@ -132,6 +132,30 @@ void MainMenu::on_actionRotateCCW_triggered() { tikzit->activeWindow()->tikzScene()->rotateNodes(false); } +void MainMenu::on_actionExtendUp_triggered() +{ + if (tikzit->activeWindow() != 0) + tikzit->activeWindow()->tikzScene()->extendSelectionUp(); +} + +void MainMenu::on_actionExtendDown_triggered() +{ + if (tikzit->activeWindow() != 0) + tikzit->activeWindow()->tikzScene()->extendSelectionDown(); +} + +void MainMenu::on_actionExtendLeft_triggered() +{ + if (tikzit->activeWindow() != 0) + tikzit->activeWindow()->tikzScene()->extendSelectionLeft(); +} + +void MainMenu::on_actionExtendRight_triggered() +{ + if (tikzit->activeWindow() != 0) + tikzit->activeWindow()->tikzScene()->extendSelectionRight(); +} + // Tikz void MainMenu::on_actionParse_triggered() diff --git a/src/gui/mainmenu.h b/src/gui/mainmenu.h index b561eab..7132dde 100644 --- a/src/gui/mainmenu.h +++ b/src/gui/mainmenu.h @@ -54,6 +54,10 @@ public slots: void on_actionReflectVertical_triggered(); void on_actionRotateCW_triggered(); void on_actionRotateCCW_triggered(); + void on_actionExtendUp_triggered(); + void on_actionExtendDown_triggered(); + void on_actionExtendLeft_triggered(); + void on_actionExtendRight_triggered(); // Tikz void on_actionParse_triggered(); diff --git a/src/gui/mainmenu.ui b/src/gui/mainmenu.ui index 1517fb1..d144fce 100644 --- a/src/gui/mainmenu.ui +++ b/src/gui/mainmenu.ui @@ -33,8 +33,8 @@ - - + + @@ -276,17 +276,17 @@ Shift+Right - + - Above + Upward Shift+Up - + - Below + Downward Shift+Down diff --git a/src/gui/tikzscene.cpp b/src/gui/tikzscene.cpp index 1c6f0bb..947620f 100644 --- a/src/gui/tikzscene.cpp +++ b/src/gui/tikzscene.cpp @@ -105,6 +105,78 @@ void TikzScene::graphReplaced() } } +void TikzScene::extendSelectionUp() +{ + bool found = false; + float m = 0.0f; + foreach (Node *n, getSelectedNodes()) { + if (!found) { + m = n->point().y(); + found = true; + } else { + if (n->point().y() > m) m = n->point().y(); + } + } + + foreach (NodeItem *ni, nodeItems().values()) { + if (ni->node()->point().y() >= m) ni->setSelected(true); + } +} + +void TikzScene::extendSelectionDown() +{ + bool found = false; + float m = 0.0f; + foreach (Node *n, getSelectedNodes()) { + if (!found) { + m = n->point().y(); + found = true; + } else { + if (n->point().y() < m) m = n->point().y(); + } + } + + foreach (NodeItem *ni, nodeItems().values()) { + if (ni->node()->point().y() <= m) ni->setSelected(true); + } +} + +void TikzScene::extendSelectionLeft() +{ + bool found = false; + float m = 0.0f; + foreach (Node *n, getSelectedNodes()) { + if (!found) { + m = n->point().x(); + found = true; + } else { + if (n->point().x() < m) m = n->point().x(); + } + } + + foreach (NodeItem *ni, nodeItems().values()) { + if (ni->node()->point().x() <= m) ni->setSelected(true); + } +} + +void TikzScene::extendSelectionRight() +{ + bool found = false; + float m = 0.0f; + foreach (Node *n, getSelectedNodes()) { + if (!found) { + m = n->point().x(); + found = true; + } else { + if (n->point().x() < m) m = n->point().x(); + } + } + + foreach (NodeItem *ni, nodeItems().values()) { + if (ni->node()->point().x() >= m) ni->setSelected(true); + } +} + void TikzScene::mousePressEvent(QGraphicsSceneMouseEvent *event) { if (!_enabled) return; @@ -642,11 +714,8 @@ void TikzScene::pasteFromClipboard() // attempt to parse whatever's on the clipboard, if we get a // non-empty tikz graph, insert it. if (ass.parse(tikz) && !g->nodes().isEmpty()) { - qDebug() << "CLIPBOARD:" << tikz; - qDebug() << "PARSED:" << g->tikz(); // make sure names in the new subgraph are fresh g->renameApart(graph()); - qDebug() << "FRESH:" << g->tikz(); QRectF srcRect = g->realBbox(); QRectF tgtRect = graph()->realBbox(); diff --git a/src/gui/tikzscene.h b/src/gui/tikzscene.h index 91f606f..16af125 100644 --- a/src/gui/tikzscene.h +++ b/src/gui/tikzscene.h @@ -76,6 +76,10 @@ public: public slots: void graphReplaced(); + void extendSelectionUp(); + void extendSelectionDown(); + void extendSelectionLeft(); + void extendSelectionRight(); protected: void mousePressEvent(QGraphicsSceneMouseEvent *event) override; -- cgit v1.2.3 From 1ca36f064da2a3619f0f8058f48e9f9dc6d07436 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Sun, 23 Sep 2018 09:52:35 +0200 Subject: more consistent z-ordering --- src/gui/tikzscene.cpp | 16 ++++++++++++++++ src/gui/tikzscene.h | 1 + src/gui/undocommands.cpp | 10 ++++++++++ 3 files changed, 27 insertions(+) diff --git a/src/gui/tikzscene.cpp b/src/gui/tikzscene.cpp index 947620f..39f8b76 100644 --- a/src/gui/tikzscene.cpp +++ b/src/gui/tikzscene.cpp @@ -103,6 +103,8 @@ void TikzScene::graphReplaced() _nodeItems.insert(n, ni); addItem(ni); } + + refreshZIndices(); } void TikzScene::extendSelectionUp() @@ -177,6 +179,20 @@ void TikzScene::extendSelectionRight() } } +void TikzScene::refreshZIndices() +{ + qreal z = 0.0; + foreach (Edge *e, graph()->edges()) { + edgeItems()[e]->setZValue(z); + z += 1.0; + } + + foreach (Node *n, graph()->nodes()) { + nodeItems()[n]->setZValue(z); + z += 1.0; + } +} + void TikzScene::mousePressEvent(QGraphicsSceneMouseEvent *event) { if (!_enabled) return; diff --git a/src/gui/tikzscene.h b/src/gui/tikzscene.h index 16af125..b7beca9 100644 --- a/src/gui/tikzscene.h +++ b/src/gui/tikzscene.h @@ -80,6 +80,7 @@ public slots: void extendSelectionDown(); void extendSelectionLeft(); void extendSelectionRight(); + void refreshZIndices(); protected: void mousePressEvent(QGraphicsSceneMouseEvent *event) override; diff --git a/src/gui/undocommands.cpp b/src/gui/undocommands.cpp index 2ed5034..7b254d1 100644 --- a/src/gui/undocommands.cpp +++ b/src/gui/undocommands.cpp @@ -157,6 +157,7 @@ void DeleteCommand::undo() if (_selEdges.contains(e)) ei->setSelected(true); } + _scene->refreshZIndices(); GraphUpdateCommand::undo(); } @@ -180,6 +181,7 @@ void DeleteCommand::redo() _scene->graph()->removeNode(n); } + _scene->refreshZIndices(); GraphUpdateCommand::redo(); } @@ -199,6 +201,7 @@ void AddNodeCommand::undo() //_scene->setBounds(_oldBounds); + _scene->refreshZIndices(); GraphUpdateCommand::undo(); } @@ -212,6 +215,7 @@ void AddNodeCommand::redo() //_scene->setBounds(_newBounds); + _scene->refreshZIndices(); GraphUpdateCommand::redo(); } @@ -228,6 +232,7 @@ void AddEdgeCommand::undo() delete ei; _scene->graph()->removeEdge(_edge); + _scene->refreshZIndices(); GraphUpdateCommand::undo(); } @@ -245,6 +250,7 @@ void AddEdgeCommand::redo() ei->stackBefore(_scene->nodeItems()[_scene->graph()->nodes().first()]); } + _scene->refreshZIndices(); GraphUpdateCommand::redo(); } @@ -361,6 +367,7 @@ void PasteCommand::undo() foreach(Node *n, _oldSelectedNodes) _scene->nodeItems()[n]->setSelected(true); foreach(Edge *e, _oldSelectedEdges) _scene->edgeItems()[e]->setSelected(true); + _scene->refreshZIndices(); GraphUpdateCommand::undo(); } @@ -384,6 +391,7 @@ void PasteCommand::redo() ni->setSelected(true); } + _scene->refreshZIndices(); GraphUpdateCommand::redo(); } @@ -428,6 +436,7 @@ void ReplaceGraphCommand::undo() } _scene->tikzDocument()->setGraph(_oldGraph); _scene->graphReplaced(); + GraphUpdateCommand::undo(); } void ReplaceGraphCommand::redo() @@ -439,6 +448,7 @@ void ReplaceGraphCommand::redo() } _scene->tikzDocument()->setGraph(_newGraph); _scene->graphReplaced(); + GraphUpdateCommand::redo(); } ReflectNodesCommand::ReflectNodesCommand(TikzScene *scene, QSet nodes, bool horizontal, QUndoCommand *parent) : -- cgit v1.2.3 From fa3d7da179b25d2ece40b56f5f9adddb3831906e Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Sun, 23 Sep 2018 12:30:08 +0200 Subject: added reordering of nodes and edges --- src/data/graph.cpp | 10 ++++++++++ src/data/graph.h | 3 +++ src/gui/mainmenu.cpp | 12 ++++++++++++ src/gui/mainmenu.h | 2 ++ src/gui/tikzscene.cpp | 29 +++++++++++++++++++++++++++++ src/gui/tikzscene.h | 11 +++++++---- src/gui/undocommands.cpp | 28 ++++++++++++++++++++++++++++ src/gui/undocommands.h | 18 ++++++++++++++++++ 8 files changed, 109 insertions(+), 4 deletions(-) diff --git a/src/data/graph.cpp b/src/data/graph.cpp index 2c9a84e..b63289b 100644 --- a/src/data/graph.cpp +++ b/src/data/graph.cpp @@ -85,6 +85,16 @@ int Graph::maxIntName() return max; } +void Graph::reorderNodes(const QVector &newOrder) +{ + _nodes = newOrder; +} + +void Graph::reorderEdges(const QVector &newOrder) +{ + _edges = newOrder; +} + QRectF Graph::realBbox() { //float maxX = 0.0f; diff --git a/src/data/graph.h b/src/data/graph.h index 404fd8c..286ccdc 100644 --- a/src/data/graph.h +++ b/src/data/graph.h @@ -32,6 +32,7 @@ #include #include #include +#include class Graph : public QObject { @@ -46,6 +47,8 @@ public: void addEdge(Edge *e, int index); void removeEdge(Edge *e); int maxIntName(); + void reorderNodes(const QVector &newOrder); + void reorderEdges(const QVector &newOrder); QRectF boundsForNodes(QSet ns); QString freshNodeName(); diff --git a/src/gui/mainmenu.cpp b/src/gui/mainmenu.cpp index ca837fa..c159981 100644 --- a/src/gui/mainmenu.cpp +++ b/src/gui/mainmenu.cpp @@ -132,6 +132,18 @@ void MainMenu::on_actionRotateCCW_triggered() { tikzit->activeWindow()->tikzScene()->rotateNodes(false); } +void MainMenu::on_actionBring_to_Front_triggered() +{ + if (tikzit->activeWindow() != 0) + tikzit->activeWindow()->tikzScene()->reorderSelection(true); +} + +void MainMenu::on_actionSend_to_Back_triggered() +{ + if (tikzit->activeWindow() != 0) + tikzit->activeWindow()->tikzScene()->reorderSelection(false); +} + void MainMenu::on_actionExtendUp_triggered() { if (tikzit->activeWindow() != 0) diff --git a/src/gui/mainmenu.h b/src/gui/mainmenu.h index 7132dde..c4079bf 100644 --- a/src/gui/mainmenu.h +++ b/src/gui/mainmenu.h @@ -54,6 +54,8 @@ public slots: void on_actionReflectVertical_triggered(); void on_actionRotateCW_triggered(); void on_actionRotateCCW_triggered(); + void on_actionBring_to_Front_triggered(); + void on_actionSend_to_Back_triggered(); void on_actionExtendUp_triggered(); void on_actionExtendDown_triggered(); void on_actionExtendLeft_triggered(); diff --git a/src/gui/tikzscene.cpp b/src/gui/tikzscene.cpp index 39f8b76..b9afe4a 100644 --- a/src/gui/tikzscene.cpp +++ b/src/gui/tikzscene.cpp @@ -179,6 +179,35 @@ void TikzScene::extendSelectionRight() } } +void TikzScene::reorderSelection(bool toFront) +{ + QVector nodeOrd, nodeOrd1; + QVector edgeOrd, edgeOrd1; + QSet selNodes; + QSet selEdges; + getSelection(selNodes, selEdges); + foreach (Node *n, graph()->nodes()) { + if (selNodes.contains(n)) nodeOrd1 << n; + else nodeOrd << n; + } + + foreach (Edge *e, graph()->edges()) { + if (selEdges.contains(e)) edgeOrd1 << e; + else edgeOrd << e; + } + + if (toFront) { + nodeOrd += nodeOrd1; + edgeOrd += edgeOrd1; + } else { + nodeOrd = nodeOrd1 + nodeOrd; + edgeOrd = edgeOrd1 + edgeOrd; + } + + ReorderCommand *cmd = new ReorderCommand(this, graph()->nodes(), nodeOrd, graph()->edges(), edgeOrd); + _tikzDocument->undoStack()->push(cmd); +} + void TikzScene::refreshZIndices() { qreal z = 0.0; diff --git a/src/gui/tikzscene.h b/src/gui/tikzscene.h index b7beca9..2a3e988 100644 --- a/src/gui/tikzscene.h +++ b/src/gui/tikzscene.h @@ -70,16 +70,19 @@ public: void setEnabled(bool enabled); int lineNumberForSelection(); + void extendSelectionUp(); + void extendSelectionDown(); + void extendSelectionLeft(); + void extendSelectionRight(); + + void reorderSelection(bool toFront); + void getSelection(QSet &selNodes, QSet &selEdges); QSet getSelectedNodes(); public slots: void graphReplaced(); - void extendSelectionUp(); - void extendSelectionDown(); - void extendSelectionLeft(); - void extendSelectionRight(); void refreshZIndices(); protected: diff --git a/src/gui/undocommands.cpp b/src/gui/undocommands.cpp index 7b254d1..50b81a4 100644 --- a/src/gui/undocommands.cpp +++ b/src/gui/undocommands.cpp @@ -513,3 +513,31 @@ void RotateNodesCommand::redo() _scene->refreshAdjacentEdges(_nodes.toList()); GraphUpdateCommand::redo(); } + +ReorderCommand::ReorderCommand(TikzScene *scene, + const QVector &oldNodeOrder, + const QVector &newNodeOrder, + const QVector &oldEdgeOrder, + const QVector &newEdgeOrder, + QUndoCommand *parent) : + GraphUpdateCommand(scene, parent), + _oldNodeOrder(oldNodeOrder), _newNodeOrder(newNodeOrder), + _oldEdgeOrder(oldEdgeOrder), _newEdgeOrder(newEdgeOrder) +{ +} + +void ReorderCommand::undo() +{ + _scene->graph()->reorderNodes(_oldNodeOrder); + _scene->graph()->reorderEdges(_oldEdgeOrder); + _scene->refreshZIndices(); + GraphUpdateCommand::undo(); +} + +void ReorderCommand::redo() +{ + _scene->graph()->reorderNodes(_newNodeOrder); + _scene->graph()->reorderEdges(_newEdgeOrder); + _scene->refreshZIndices(); + GraphUpdateCommand::redo(); +} diff --git a/src/gui/undocommands.h b/src/gui/undocommands.h index 688c2ba..1836892 100644 --- a/src/gui/undocommands.h +++ b/src/gui/undocommands.h @@ -219,4 +219,22 @@ private: bool _clockwise; }; +class ReorderCommand : public GraphUpdateCommand +{ +public: + explicit ReorderCommand(TikzScene *scene, + const QVector &oldNodeOrder, + const QVector &newNodeOrder, + const QVector &oldEdgeOrder, + const QVector &newEdgeOrder, + QUndoCommand *parent = 0); + void undo() override; + void redo() override; +private: + QVector _oldNodeOrder; + QVector _newNodeOrder; + QVector _oldEdgeOrder; + QVector _newEdgeOrder; +}; + #endif // UNDOCOMMANDS_H -- cgit v1.2.3 From 6e40278f58e63adcf6459242219f3a8d282fdebc Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Thu, 20 Sep 2018 22:16:53 +0200 Subject: made doc resizable --- src/gui/mainwindow.cpp | 1 + src/gui/stylepalette.ui | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 4525aef..f9743a1 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -37,6 +37,7 @@ MainWindow::MainWindow(QWidget *parent) : _stylePalette = new StylePalette(this); addDockWidget(Qt::RightDockWidgetArea, _stylePalette); + resizeDocks({_stylePalette}, {130}, Qt::Horizontal); _tikzScene = new TikzScene(_tikzDocument, _toolPalette, _stylePalette, this); ui->tikzView->setScene(_tikzScene); diff --git a/src/gui/stylepalette.ui b/src/gui/stylepalette.ui index 10e7392..681d83e 100644 --- a/src/gui/stylepalette.ui +++ b/src/gui/stylepalette.ui @@ -24,7 +24,7 @@ - 130 + 400 524287 -- cgit v1.2.3 From f448114bc7eaa9b99780c108d5172f649c626a88 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Mon, 1 Oct 2018 15:08:42 +0200 Subject: adjusted font sized --- src/data/edge.cpp | 6 +- src/data/node.cpp | 5 ++ src/data/node.h | 2 + src/data/nodestyle.cpp | 11 ++-- src/data/nodestyle.h | 1 + src/data/tikzstyles.cpp | 2 +- src/gui/styleeditor.ui | 168 +++++++++++++++++++++++++++++++++++++++++++++--- src/gui/stylepalette.ui | 11 +++- src/gui/tikzview.cpp | 8 +++ src/gui/tikzview.h | 1 + 10 files changed, 197 insertions(+), 18 deletions(-) diff --git a/src/data/edge.cpp b/src/data/edge.cpp index 8b2a851..b4c7ec1 100644 --- a/src/data/edge.cpp +++ b/src/data/edge.cpp @@ -277,8 +277,10 @@ void Edge::updateData() if (_source == _target) _data->setAtom("loop"); if (!isSelfLoop() && !isStraight() && _weight != 0.4f) _data->setProperty("looseness", QString::number(_weight*2.5f, 'f', 2)); - if (_source->style()->isNone()) _sourceAnchor = "center"; - if (_target->style()->isNone()) _targetAnchor = "center"; + if (_source->isBlankNode()) _sourceAnchor = "center"; + else _sourceAnchor = ""; + if (_target->isBlankNode()) _targetAnchor = "center"; + else _targetAnchor = ""; } diff --git a/src/data/node.cpp b/src/data/node.cpp index 44e3c77..a4ee39b 100644 --- a/src/data/node.cpp +++ b/src/data/node.cpp @@ -107,6 +107,11 @@ NodeStyle *Node::style() const return _style; } +bool Node::isBlankNode() +{ + return styleName() == "none"; +} + int Node::tikzLine() const { return _tikzLine; diff --git a/src/data/node.h b/src/data/node.h index 2a6627e..111bf19 100644 --- a/src/data/node.h +++ b/src/data/node.h @@ -53,6 +53,8 @@ public: void attachStyle(); NodeStyle *style() const; + bool isBlankNode(); + int tikzLine() const; void setTikzLine(int tikzLine); diff --git a/src/data/nodestyle.cpp b/src/data/nodestyle.cpp index 20245d9..8bdb763 100644 --- a/src/data/nodestyle.cpp +++ b/src/data/nodestyle.cpp @@ -20,9 +20,10 @@ #include "tikzit.h" #include +#include NodeStyle *noneStyle = new NodeStyle(); -NodeStyle *unknownStyle = new NodeStyle("unknown", new GraphElementData({GraphElementProperty("tikzit fill", "red")})); +NodeStyle *unknownStyle = new NodeStyle("unknown", new GraphElementData({GraphElementProperty("tikzit fill", "blue")})); NodeStyle::NodeStyle() : Style() { @@ -72,9 +73,12 @@ QPainterPath NodeStyle::palettePath() const QIcon NodeStyle::icon() const { // draw an icon matching the style - QPixmap px(100,100); + QImage px(100,100,QImage::Format_ARGB32_Premultiplied); px.fill(Qt::transparent); + + QPainter painter(&px); + painter.setRenderHint(QPainter::Antialiasing); QPainterPath pth = path(); pth.translate(50.0f, 50.0f); @@ -98,7 +102,6 @@ QIcon NodeStyle::icon() const painter.drawPath(pth); } - - return QIcon(px); + return QIcon(QPixmap::fromImage(px)); } diff --git a/src/data/nodestyle.h b/src/data/nodestyle.h index 67219db..a3842ff 100644 --- a/src/data/nodestyle.h +++ b/src/data/nodestyle.h @@ -43,5 +43,6 @@ public: }; extern NodeStyle *noneStyle; +extern NodeStyle *unknownStyle; #endif // NODESTYLE_H diff --git a/src/data/tikzstyles.cpp b/src/data/tikzstyles.cpp index 68b3dcd..a827db5 100644 --- a/src/data/tikzstyles.cpp +++ b/src/data/tikzstyles.cpp @@ -33,7 +33,7 @@ NodeStyle *TikzStyles::nodeStyle(QString name) const { foreach (NodeStyle *s , _nodeStyles) if (s->name() == name) return s; - return noneStyle; + return unknownStyle; } EdgeStyle *TikzStyles::edgeStyle(QString name) const diff --git a/src/gui/styleeditor.ui b/src/gui/styleeditor.ui index 697a084..f2c2437 100644 --- a/src/gui/styleeditor.ui +++ b/src/gui/styleeditor.ui @@ -33,6 +33,11 @@ 20 + + + 9 + + Name @@ -52,6 +57,11 @@ 20 + + + 9 + + Category @@ -71,6 +81,11 @@ 20 + + + 9 + + Fill Color @@ -90,6 +105,11 @@ 20 + + + 9 + + Draw Color @@ -109,6 +129,11 @@ 20 + + + 9 + + @@ -119,6 +144,11 @@ 22 + + + 9 + + true @@ -172,12 +202,13 @@ 390 110 - 61 + 71 17 + 9 false @@ -190,12 +221,13 @@ 390 140 - 61 + 71 17 + 9 false @@ -206,7 +238,7 @@ - 450 + 460 110 31 18 @@ -225,7 +257,7 @@ - 450 + 460 140 31 18 @@ -250,6 +282,11 @@ 20 + + + 9 + + Shape @@ -269,6 +306,11 @@ 22 + + + 9 + + true @@ -293,12 +335,13 @@ 290 200 - 61 + 71 17 + 9 false @@ -309,12 +352,17 @@ - 350 + 370 200 - 131 + 111 22 + + + 9 + + @@ -340,6 +388,11 @@ 20 + + + 9 + + Arrowhead @@ -359,6 +412,11 @@ 22 + + + 9 + + false @@ -405,6 +463,11 @@ 22 + + + 9 + + false @@ -433,6 +496,11 @@ 20 + + + 9 + + Properties @@ -452,6 +520,11 @@ 18 + + + 9 + + + @@ -465,6 +538,11 @@ 18 + + + 9 + + +a @@ -478,6 +556,11 @@ 18 + + + 9 + + - @@ -491,6 +574,11 @@ 18 + + + 9 + + ^ @@ -504,6 +592,11 @@ 18 + + + 9 + + v @@ -517,6 +610,12 @@ 251 + + + 8 + true + + @@ -527,6 +626,12 @@ 151 + + + 8 + true + + @@ -537,6 +642,11 @@ 18 + + + 9 + + + @@ -550,6 +660,11 @@ 18 + + + 9 + + - @@ -563,6 +678,11 @@ 18 + + + 9 + + ^ @@ -576,6 +696,11 @@ 18 + + + 9 + + v @@ -589,6 +714,11 @@ 18 + + + 9 + + - @@ -602,6 +732,11 @@ 18 + + + 9 + + + @@ -615,6 +750,11 @@ 18 + + + 9 + + ^ @@ -628,6 +768,11 @@ 18 + + + 9 + + v @@ -635,12 +780,17 @@ - 489 + 479 490 - 81 + 91 20 + + + 9 + + Save and Close diff --git a/src/gui/stylepalette.ui b/src/gui/stylepalette.ui index 681d83e..abba648 100644 --- a/src/gui/stylepalette.ui +++ b/src/gui/stylepalette.ui @@ -19,7 +19,7 @@ 130 - 218 + 268 @@ -134,7 +134,14 @@ - + + + + 8 + true + + + diff --git a/src/gui/tikzview.cpp b/src/gui/tikzview.cpp index 6cdb17c..0f1dc30 100644 --- a/src/gui/tikzview.cpp +++ b/src/gui/tikzview.cpp @@ -126,3 +126,11 @@ void TikzView::drawBackground(QPainter *painter, const QRectF &rect) painter->drawLine(0, rect.top(), 0, rect.bottom()); } +void TikzView::wheelEvent(QWheelEvent *event) +{ + if (event->modifiers() & Qt::ShiftModifier) { + event->setModifiers(Qt::NoModifier); + QGraphicsView::wheelEvent(event); + } +} + diff --git a/src/gui/tikzview.h b/src/gui/tikzview.h index 4ec9f3d..e13fe72 100644 --- a/src/gui/tikzview.h +++ b/src/gui/tikzview.h @@ -45,6 +45,7 @@ public slots: void setScene(QGraphicsScene *scene); protected: void drawBackground(QPainter *painter, const QRectF &rect); + void wheelEvent(QWheelEvent *event) override; private: float _scale; }; -- cgit v1.2.3 From e7a10091b64ddeb1d3e21e3f36abbf412021c815 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Mon, 1 Oct 2018 16:19:21 +0200 Subject: fixed many warnings --- src/data/edgestyle.cpp | 6 + src/data/graph.cpp | 2 +- src/data/graphelementdata.cpp | 8 +- src/data/graphelementdata.h | 5 +- src/data/tikzparser.y | 2 +- src/gui/edgeitem.cpp | 4 + src/gui/mainwindow.ui | 4 +- src/gui/stylepalette.cpp | 7 +- src/gui/stylepalette.h | 4 +- src/gui/tikzscene.cpp | 2 +- src/gui/undocommands.cpp | 2 +- src/gui/undocommands.h | 2 - src/main.cpp | 2 +- src/tikzit.cpp | 12 +- src/tikzit.h | 8 +- tikzlexer.h | 1050 ++++++++++++++++++++--------------------- 16 files changed, 559 insertions(+), 561 deletions(-) diff --git a/src/data/edgestyle.cpp b/src/data/edgestyle.cpp index 275393e..8f3008f 100644 --- a/src/data/edgestyle.cpp +++ b/src/data/edgestyle.cpp @@ -71,6 +71,8 @@ QPen EdgeStyle::pen() const pat << 1.0 << 1.0; p.setDashPattern(pat); break; + case Solid: + break; } return p; @@ -114,6 +116,8 @@ QIcon EdgeStyle::icon() const case Flat: painter.drawLine(90,40,90,60); break; + case NoTip: + break; } switch (arrowTail()) { @@ -124,6 +128,8 @@ QIcon EdgeStyle::icon() const case Flat: painter.drawLine(10,40,10,60); break; + case NoTip: + break; } diff --git a/src/data/graph.cpp b/src/data/graph.cpp index b63289b..bba2061 100644 --- a/src/data/graph.cpp +++ b/src/data/graph.cpp @@ -341,7 +341,7 @@ void Graph::reflectNodes(QSet nds, bool horizontal) void Graph::rotateNodes(QSet nds, bool clockwise) { - QRectF bds = boundsForNodes(nds); + //QRectF bds = boundsForNodes(nds); // QPointF ctr = bds.center(); // ctr.setX((float)floor(ctr.x() * 4.0f) / 4.0f); // ctr.setY((float)floor(ctr.y() * 4.0f) / 4.0f); diff --git a/src/data/graphelementdata.cpp b/src/data/graphelementdata.cpp index 66ef16f..25ba08e 100644 --- a/src/data/graphelementdata.cpp +++ b/src/data/graphelementdata.cpp @@ -118,9 +118,9 @@ QVariant GraphElementData::data(const QModelIndex &index, int role) const QString s = (index.column() == 0) ? p.key() : p.value(); return QVariant(s); } - } else { - return QVariant(); } + + return QVariant(); } QVariant GraphElementData::headerData(int section, Qt::Orientation orientation, int role) const @@ -133,12 +133,12 @@ QVariant GraphElementData::headerData(int section, Qt::Orientation orientation, return QVariant(); } -QModelIndex GraphElementData::index(int row, int column, const QModelIndex &parent) const +QModelIndex GraphElementData::index(int row, int column, const QModelIndex &) const { return createIndex(row, column, (void*)0); } -QModelIndex GraphElementData::parent(const QModelIndex &index) const +QModelIndex GraphElementData::parent(const QModelIndex &) const { // there is no nesting, so always return an invalid index return QModelIndex(); diff --git a/src/data/graphelementdata.h b/src/data/graphelementdata.h index e57cf49..acaada7 100644 --- a/src/data/graphelementdata.h +++ b/src/data/graphelementdata.h @@ -48,9 +48,8 @@ public: QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; - QModelIndex index(int row, int column, - const QModelIndex &parent = QModelIndex()) const override; - QModelIndex parent(const QModelIndex &index) const override; + QModelIndex index(int row, int column, const QModelIndex &) const override; + QModelIndex parent(const QModelIndex &) const override; int rowCount(const QModelIndex &parent = QModelIndex()) const override; int columnCount(const QModelIndex &) const override; diff --git a/src/data/tikzparser.y b/src/data/tikzparser.y index 3dfb66f..4473107 100644 --- a/src/data/tikzparser.y +++ b/src/data/tikzparser.y @@ -69,7 +69,7 @@ #define assembler yyget_extra(scanner) /* pass errors off to the assembler */ -void yyerror(YYLTYPE *yylloc, void *scanner, const char *str) { +void yyerror(YYLTYPE *yylloc, void * /*scanner*/, const char *str) { // TODO: implement reportError() //assembler->reportError(str, yylloc); qDebug() << "\nparse error: " << str << " line:" << yylloc->first_line; diff --git a/src/gui/edgeitem.cpp b/src/gui/edgeitem.cpp index 146b4e0..2f5b15c 100644 --- a/src/gui/edgeitem.cpp +++ b/src/gui/edgeitem.cpp @@ -102,6 +102,8 @@ void EdgeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidge painter->drawPath(pth); break; } + case EdgeStyle::NoTip: + break; } //QPen outline = QPen(Qt::red); @@ -126,6 +128,8 @@ void EdgeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidge painter->drawPath(pth); break; } + case EdgeStyle::NoTip: + break; } if (isSelected()) { diff --git a/src/gui/mainwindow.ui b/src/gui/mainwindow.ui index cae5735..8eff5ee 100644 --- a/src/gui/mainwindow.ui +++ b/src/gui/mainwindow.ui @@ -62,8 +62,8 @@ p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Courier New'; font-size:10pt; font-weight:400; font-style:normal;"> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'.SF NS Text'; font-size:13pt;"><br /></p></body></html> - - 20 + + 20.000000000000000 diff --git a/src/gui/stylepalette.cpp b/src/gui/stylepalette.cpp index 447e7a4..7423f29 100644 --- a/src/gui/stylepalette.cpp +++ b/src/gui/stylepalette.cpp @@ -89,7 +89,8 @@ void StylePalette::changeNodeStyle(int increment) if (row < 0) row += _nodeModel->rowCount(); } - QModelIndex i1 = ui->styleListView->rootIndex().child(row, 0); + //QModelIndex i1 = ui->styleListView->rootIndex().child(row, 0); + QModelIndex i1 = _nodeModel->index(row,0); ui->styleListView->selectionModel()->select(i1, QItemSelectionModel::ClearAndSelect); ui->styleListView->scrollTo(i1); } @@ -126,12 +127,12 @@ QString StylePalette::activeEdgeStyleName() } } -void StylePalette::nodeStyleDoubleClicked(const QModelIndex &index) +void StylePalette::nodeStyleDoubleClicked(const QModelIndex &) { tikzit->activeWindow()->tikzScene()->applyActiveStyleToNodes(); } -void StylePalette::edgeStyleDoubleClicked(const QModelIndex &index) +void StylePalette::edgeStyleDoubleClicked(const QModelIndex &) { qDebug() << "got double click"; tikzit->activeWindow()->tikzScene()->applyActiveStyleToEdges(); diff --git a/src/gui/stylepalette.h b/src/gui/stylepalette.h index 5943e52..fc4e253 100644 --- a/src/gui/stylepalette.h +++ b/src/gui/stylepalette.h @@ -41,8 +41,8 @@ public: public slots: - void nodeStyleDoubleClicked(const QModelIndex &index); - void edgeStyleDoubleClicked(const QModelIndex &index); + void nodeStyleDoubleClicked(const QModelIndex &); + void edgeStyleDoubleClicked(const QModelIndex &); void on_buttonOpenTikzstyles_clicked(); void on_buttonEditTikzstyles_clicked(); void on_buttonRefreshTikzstyles_clicked(); diff --git a/src/gui/tikzscene.cpp b/src/gui/tikzscene.cpp index b9afe4a..b2c5fd7 100644 --- a/src/gui/tikzscene.cpp +++ b/src/gui/tikzscene.cpp @@ -669,7 +669,7 @@ void TikzScene::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) if (ok) { QMap oldLabels; oldLabels.insert(ni->node(), ni->node()->label()); - ChangeLabelCommand *cmd = new ChangeLabelCommand(this, graph(), oldLabels, newLabel); + ChangeLabelCommand *cmd = new ChangeLabelCommand(this, oldLabels, newLabel); _tikzDocument->undoStack()->push(cmd); } break; diff --git a/src/gui/undocommands.cpp b/src/gui/undocommands.cpp index 50b81a4..f713582 100644 --- a/src/gui/undocommands.cpp +++ b/src/gui/undocommands.cpp @@ -395,7 +395,7 @@ void PasteCommand::redo() GraphUpdateCommand::redo(); } -ChangeLabelCommand::ChangeLabelCommand(TikzScene *scene, Graph *graph, QMap oldLabels, QString newLabel, QUndoCommand *parent) : +ChangeLabelCommand::ChangeLabelCommand(TikzScene *scene, QMap oldLabels, QString newLabel, QUndoCommand *parent) : GraphUpdateCommand(scene, parent), _oldLabels(oldLabels), _newLabel(newLabel) { } diff --git a/src/gui/undocommands.h b/src/gui/undocommands.h index 1836892..dc60549 100644 --- a/src/gui/undocommands.h +++ b/src/gui/undocommands.h @@ -165,14 +165,12 @@ class ChangeLabelCommand : public GraphUpdateCommand { public: explicit ChangeLabelCommand(TikzScene *scene, - Graph *graph, QMap oldLabels, QString newLabel, QUndoCommand *parent = 0); void undo() override; void redo() override; private: - Graph *_graph; QMap _oldLabels; QString _newLabel; }; diff --git a/src/main.cpp b/src/main.cpp index 97dbe4d..9ad40ae 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -43,7 +43,7 @@ int main(int argc, char *argv[]) QApplication a(argc, argv); a.setQuitOnLastWindowClosed(false); tikzit = new Tikzit(); - tikzit->init(&a); + tikzit->init(); if (a.arguments().length() > 1) { tikzit->open(a.arguments()[1]); diff --git a/src/tikzit.cpp b/src/tikzit.cpp index a327f9f..967d76e 100644 --- a/src/tikzit.cpp +++ b/src/tikzit.cpp @@ -36,7 +36,7 @@ Tikzit::Tikzit() : _styleFile("[default]"), _activeWindow(0) { } -void Tikzit::init(QApplication *app) +void Tikzit::init() { QSettings settings("tikzit", "tikzit"); @@ -263,16 +263,6 @@ QString Tikzit::styleFile() const return _styleFile; } -void Tikzit::focusChanged(QWidget *old, QWidget *nw) -{ -// foreach (MainWindow *w, _windows) { -// if (w->isActiveWindow()) { -// _stylePalette->raise(); -// break; -// } -// } -} - QString Tikzit::styleFilePath() const { return _styleFilePath; diff --git a/src/tikzit.h b/src/tikzit.h index 35b19de..525696d 100644 --- a/src/tikzit.h +++ b/src/tikzit.h @@ -115,7 +115,7 @@ public: void open(); void open(QString fileName); void quit(); - void init(QApplication *app); + void init(); // convenience functions for named colors QColor colorByIndex(int i); @@ -132,7 +132,7 @@ public: QString styleFilePath() const; public slots: - void focusChanged(QWidget *old, QWidget *nw); + //void focusChanged(QWidget *old, QWidget *nw); private: // void createMenu(); @@ -140,11 +140,11 @@ private: ToolPalette *_toolPalette; PropertyPalette *_propertyPalette; //StylePalette *_stylePalette; - QVector _windows; - MainWindow *_activeWindow; TikzStyles *_styles; QString _styleFile; QString _styleFilePath; + QVector _windows; + MainWindow *_activeWindow; StyleEditor *_styleEditor; QStringList _colNames; QVector _cols; diff --git a/tikzlexer.h b/tikzlexer.h index 9345d23..438947f 100644 --- a/tikzlexer.h +++ b/tikzlexer.h @@ -1,525 +1,525 @@ -#ifndef yyHEADER_H -#define yyHEADER_H 1 -#define yyIN_HEADER 1 - -#line 5 "tikzlexer.h" - -#line 7 "tikzlexer.h" - -#define YY_INT_ALIGNED short int - -/* A lexical scanner generated by flex */ - -#define FLEX_SCANNER -#define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 6 -#define YY_FLEX_SUBMINOR_VERSION 4 -#if YY_FLEX_SUBMINOR_VERSION > 0 -#define FLEX_BETA -#endif - -#ifdef yyget_lval -#define yyget_lval_ALREADY_DEFINED -#else -#define yyget_lval yyget_lval -#endif - -#ifdef yyset_lval -#define yyset_lval_ALREADY_DEFINED -#else -#define yyset_lval yyset_lval -#endif - -#ifdef yyget_lloc -#define yyget_lloc_ALREADY_DEFINED -#else -#define yyget_lloc yyget_lloc -#endif - -#ifdef yyset_lloc -#define yyset_lloc_ALREADY_DEFINED -#else -#define yyset_lloc yyset_lloc -#endif - -/* First, we deal with platform-specific or compiler-specific issues. */ - -/* begin standard C headers. */ -#include -#include -#include -#include - -/* end standard C headers. */ - -/* flex integer type definitions */ - -#ifndef FLEXINT_H -#define FLEXINT_H - -/* C99 systems have . Non-C99 systems may or may not. */ - -#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L - -/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, - * if you want the limit (max/min) macros for int types. - */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS 1 -#endif - -#include -typedef int8_t flex_int8_t; -typedef uint8_t flex_uint8_t; -typedef int16_t flex_int16_t; -typedef uint16_t flex_uint16_t; -typedef int32_t flex_int32_t; -typedef uint32_t flex_uint32_t; -#else -typedef signed char flex_int8_t; -typedef short int flex_int16_t; -typedef int flex_int32_t; -typedef unsigned char flex_uint8_t; -typedef unsigned short int flex_uint16_t; -typedef unsigned int flex_uint32_t; - -/* Limits of integral types. */ -#ifndef INT8_MIN -#define INT8_MIN (-128) -#endif -#ifndef INT16_MIN -#define INT16_MIN (-32767-1) -#endif -#ifndef INT32_MIN -#define INT32_MIN (-2147483647-1) -#endif -#ifndef INT8_MAX -#define INT8_MAX (127) -#endif -#ifndef INT16_MAX -#define INT16_MAX (32767) -#endif -#ifndef INT32_MAX -#define INT32_MAX (2147483647) -#endif -#ifndef UINT8_MAX -#define UINT8_MAX (255U) -#endif -#ifndef UINT16_MAX -#define UINT16_MAX (65535U) -#endif -#ifndef UINT32_MAX -#define UINT32_MAX (4294967295U) -#endif - -#ifndef SIZE_MAX -#define SIZE_MAX (~(size_t)0) -#endif - -#endif /* ! C99 */ - -#endif /* ! FLEXINT_H */ - -/* begin standard C++ headers. */ - -/* TODO: this is always defined, so inline it */ -#define yyconst const - -#if defined(__GNUC__) && __GNUC__ >= 3 -#define yynoreturn __attribute__((__noreturn__)) -#else -#define yynoreturn -#endif - -/* An opaque pointer. */ -#ifndef YY_TYPEDEF_YY_SCANNER_T -#define YY_TYPEDEF_YY_SCANNER_T -typedef void* yyscan_t; -#endif - -/* For convenience, these vars (plus the bison vars far below) - are macros in the reentrant scanner. */ -#define yyin yyg->yyin_r -#define yyout yyg->yyout_r -#define yyextra yyg->yyextra_r -#define yyleng yyg->yyleng_r -#define yytext yyg->yytext_r -#define yylineno (YY_CURRENT_BUFFER_LVALUE->yy_bs_lineno) -#define yycolumn (YY_CURRENT_BUFFER_LVALUE->yy_bs_column) -#define yy_flex_debug yyg->yy_flex_debug_r - -/* Size of default input buffer. */ -#ifndef YY_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k. - * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. - * Ditto for the __ia64__ case accordingly. - */ -#define YY_BUF_SIZE 32768 -#else -#define YY_BUF_SIZE 16384 -#endif /* __ia64__ */ -#endif - -#ifndef YY_TYPEDEF_YY_BUFFER_STATE -#define YY_TYPEDEF_YY_BUFFER_STATE -typedef struct yy_buffer_state *YY_BUFFER_STATE; -#endif - -#ifndef YY_TYPEDEF_YY_SIZE_T -#define YY_TYPEDEF_YY_SIZE_T -typedef size_t yy_size_t; -#endif - -#ifndef YY_STRUCT_YY_BUFFER_STATE -#define YY_STRUCT_YY_BUFFER_STATE -struct yy_buffer_state - { - FILE *yy_input_file; - - char *yy_ch_buf; /* input buffer */ - char *yy_buf_pos; /* current position in input buffer */ - - /* Size of input buffer in bytes, not including room for EOB - * characters. - */ - int yy_buf_size; - - /* Number of characters read into yy_ch_buf, not including EOB - * characters. - */ - int yy_n_chars; - - /* Whether we "own" the buffer - i.e., we know we created it, - * and can realloc() it to grow it, and should free() it to - * delete it. - */ - int yy_is_our_buffer; - - /* Whether this is an "interactive" input source; if so, and - * if we're using stdio for input, then we want to use getc() - * instead of fread(), to make sure we stop fetching input after - * each newline. - */ - int yy_is_interactive; - - /* Whether we're considered to be at the beginning of a line. - * If so, '^' rules will be active on the next match, otherwise - * not. - */ - int yy_at_bol; - - int yy_bs_lineno; /**< The line count. */ - int yy_bs_column; /**< The column count. */ - - /* Whether to try to fill the input buffer when we reach the - * end of it. - */ - int yy_fill_buffer; - - int yy_buffer_status; - - }; -#endif /* !YY_STRUCT_YY_BUFFER_STATE */ - -void yyrestart ( FILE *input_file , yyscan_t yyscanner ); -void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); -YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size , yyscan_t yyscanner ); -void yy_delete_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); -void yy_flush_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); -void yypush_buffer_state ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); -void yypop_buffer_state ( yyscan_t yyscanner ); - -YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size , yyscan_t yyscanner ); -YY_BUFFER_STATE yy_scan_string ( const char *yy_str , yyscan_t yyscanner ); -YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len , yyscan_t yyscanner ); - -void *yyalloc ( yy_size_t , yyscan_t yyscanner ); -void *yyrealloc ( void *, yy_size_t , yyscan_t yyscanner ); -void yyfree ( void * , yyscan_t yyscanner ); - -#define yywrap(yyscanner) (/*CONSTCOND*/1) -#define YY_SKIP_YYWRAP - -#define yytext_ptr yytext_r - -#ifdef YY_HEADER_EXPORT_START_CONDITIONS -#define INITIAL 0 -#define props 1 -#define xcoord 2 -#define ycoord 3 -#define noderef 4 - -#endif - -#ifndef YY_NO_UNISTD_H -/* Special case for "unistd.h", since it is non-ANSI. We include it way - * down here because we want the user's section 1 to have been scanned first. - * The user has a chance to override it with an option. - */ -#include -#endif - -#define YY_EXTRA_TYPE TikzAssembler * - -int yylex_init (yyscan_t* scanner); - -int yylex_init_extra ( YY_EXTRA_TYPE user_defined, yyscan_t* scanner); - -/* Accessor methods to globals. - These are made visible to non-reentrant scanners for convenience. */ - -int yylex_destroy ( yyscan_t yyscanner ); - -int yyget_debug ( yyscan_t yyscanner ); - -void yyset_debug ( int debug_flag , yyscan_t yyscanner ); - -YY_EXTRA_TYPE yyget_extra ( yyscan_t yyscanner ); - -void yyset_extra ( YY_EXTRA_TYPE user_defined , yyscan_t yyscanner ); - -FILE *yyget_in ( yyscan_t yyscanner ); - -void yyset_in ( FILE * _in_str , yyscan_t yyscanner ); - -FILE *yyget_out ( yyscan_t yyscanner ); - -void yyset_out ( FILE * _out_str , yyscan_t yyscanner ); - - int yyget_leng ( yyscan_t yyscanner ); - -char *yyget_text ( yyscan_t yyscanner ); - -int yyget_lineno ( yyscan_t yyscanner ); - -void yyset_lineno ( int _line_number , yyscan_t yyscanner ); - -int yyget_column ( yyscan_t yyscanner ); - -void yyset_column ( int _column_no , yyscan_t yyscanner ); - -YYSTYPE * yyget_lval ( yyscan_t yyscanner ); - -void yyset_lval ( YYSTYPE * yylval_param , yyscan_t yyscanner ); - - YYLTYPE *yyget_lloc ( yyscan_t yyscanner ); - - void yyset_lloc ( YYLTYPE * yylloc_param , yyscan_t yyscanner ); - -/* Macros after this point can all be overridden by user definitions in - * section 1. - */ - -#ifndef YY_SKIP_YYWRAP -#ifdef __cplusplus -extern "C" int yywrap ( yyscan_t yyscanner ); -#else -extern int yywrap ( yyscan_t yyscanner ); -#endif -#endif - -#ifndef yytext_ptr -static void yy_flex_strncpy ( char *, const char *, int , yyscan_t yyscanner); -#endif - -#ifdef YY_NEED_STRLEN -static int yy_flex_strlen ( const char * , yyscan_t yyscanner); -#endif - -#ifndef YY_NO_INPUT - -#endif - -/* Amount of stuff to slurp up with each read. */ -#ifndef YY_READ_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k */ -#define YY_READ_BUF_SIZE 16384 -#else -#define YY_READ_BUF_SIZE 8192 -#endif /* __ia64__ */ -#endif - -/* Number of entries by which start-condition stack grows. */ -#ifndef YY_START_STACK_INCR -#define YY_START_STACK_INCR 25 -#endif - -/* Default declaration of generated scanner - a define so the user can - * easily add parameters. - */ -#ifndef YY_DECL -#define YY_DECL_IS_OURS 1 - -extern int yylex \ - (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner); - -#define YY_DECL int yylex \ - (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner) -#endif /* !YY_DECL */ - -/* yy_get_previous_state - get the state just before the EOB char was reached */ - -#undef YY_NEW_FILE -#undef YY_FLUSH_BUFFER -#undef yy_set_bol -#undef yy_new_buffer -#undef yy_set_interactive -#undef YY_DO_BEFORE_ACTION - -#ifdef YY_DECL_IS_OURS -#undef YY_DECL_IS_OURS -#undef YY_DECL -#endif - -#ifndef yy_create_buffer_ALREADY_DEFINED -#undef yy_create_buffer -#endif -#ifndef yy_delete_buffer_ALREADY_DEFINED -#undef yy_delete_buffer -#endif -#ifndef yy_scan_buffer_ALREADY_DEFINED -#undef yy_scan_buffer -#endif -#ifndef yy_scan_string_ALREADY_DEFINED -#undef yy_scan_string -#endif -#ifndef yy_scan_bytes_ALREADY_DEFINED -#undef yy_scan_bytes -#endif -#ifndef yy_init_buffer_ALREADY_DEFINED -#undef yy_init_buffer -#endif -#ifndef yy_flush_buffer_ALREADY_DEFINED -#undef yy_flush_buffer -#endif -#ifndef yy_load_buffer_state_ALREADY_DEFINED -#undef yy_load_buffer_state -#endif -#ifndef yy_switch_to_buffer_ALREADY_DEFINED -#undef yy_switch_to_buffer -#endif -#ifndef yypush_buffer_state_ALREADY_DEFINED -#undef yypush_buffer_state -#endif -#ifndef yypop_buffer_state_ALREADY_DEFINED -#undef yypop_buffer_state -#endif -#ifndef yyensure_buffer_stack_ALREADY_DEFINED -#undef yyensure_buffer_stack -#endif -#ifndef yylex_ALREADY_DEFINED -#undef yylex -#endif -#ifndef yyrestart_ALREADY_DEFINED -#undef yyrestart -#endif -#ifndef yylex_init_ALREADY_DEFINED -#undef yylex_init -#endif -#ifndef yylex_init_extra_ALREADY_DEFINED -#undef yylex_init_extra -#endif -#ifndef yylex_destroy_ALREADY_DEFINED -#undef yylex_destroy -#endif -#ifndef yyget_debug_ALREADY_DEFINED -#undef yyget_debug -#endif -#ifndef yyset_debug_ALREADY_DEFINED -#undef yyset_debug -#endif -#ifndef yyget_extra_ALREADY_DEFINED -#undef yyget_extra -#endif -#ifndef yyset_extra_ALREADY_DEFINED -#undef yyset_extra -#endif -#ifndef yyget_in_ALREADY_DEFINED -#undef yyget_in -#endif -#ifndef yyset_in_ALREADY_DEFINED -#undef yyset_in -#endif -#ifndef yyget_out_ALREADY_DEFINED -#undef yyget_out -#endif -#ifndef yyset_out_ALREADY_DEFINED -#undef yyset_out -#endif -#ifndef yyget_leng_ALREADY_DEFINED -#undef yyget_leng -#endif -#ifndef yyget_text_ALREADY_DEFINED -#undef yyget_text -#endif -#ifndef yyget_lineno_ALREADY_DEFINED -#undef yyget_lineno -#endif -#ifndef yyset_lineno_ALREADY_DEFINED -#undef yyset_lineno -#endif -#ifndef yyget_column_ALREADY_DEFINED -#undef yyget_column -#endif -#ifndef yyset_column_ALREADY_DEFINED -#undef yyset_column -#endif -#ifndef yywrap_ALREADY_DEFINED -#undef yywrap -#endif -#ifndef yyget_lval_ALREADY_DEFINED -#undef yyget_lval -#endif -#ifndef yyset_lval_ALREADY_DEFINED -#undef yyset_lval -#endif -#ifndef yyget_lloc_ALREADY_DEFINED -#undef yyget_lloc -#endif -#ifndef yyset_lloc_ALREADY_DEFINED -#undef yyset_lloc -#endif -#ifndef yyalloc_ALREADY_DEFINED -#undef yyalloc -#endif -#ifndef yyrealloc_ALREADY_DEFINED -#undef yyrealloc -#endif -#ifndef yyfree_ALREADY_DEFINED -#undef yyfree -#endif -#ifndef yytext_ALREADY_DEFINED -#undef yytext -#endif -#ifndef yyleng_ALREADY_DEFINED -#undef yyleng -#endif -#ifndef yyin_ALREADY_DEFINED -#undef yyin -#endif -#ifndef yyout_ALREADY_DEFINED -#undef yyout -#endif -#ifndef yy_flex_debug_ALREADY_DEFINED -#undef yy_flex_debug -#endif -#ifndef yylineno_ALREADY_DEFINED -#undef yylineno -#endif -#ifndef yytables_fload_ALREADY_DEFINED -#undef yytables_fload -#endif -#ifndef yytables_destroy_ALREADY_DEFINED -#undef yytables_destroy -#endif -#ifndef yyTABLES_NAME_ALREADY_DEFINED -#undef yyTABLES_NAME -#endif - -#line 193 "src\\data\\tikzlexer.l" - -#line 523 "tikzlexer.h" -#undef yyIN_HEADER -#endif /* yyHEADER_H */ +#ifndef yyHEADER_H +#define yyHEADER_H 1 +#define yyIN_HEADER 1 + +#line 6 "tikzlexer.h" + +#line 8 "tikzlexer.h" + +#define YY_INT_ALIGNED short int + +/* A lexical scanner generated by flex */ + +#define FLEX_SCANNER +#define YY_FLEX_MAJOR_VERSION 2 +#define YY_FLEX_MINOR_VERSION 6 +#define YY_FLEX_SUBMINOR_VERSION 4 +#if YY_FLEX_SUBMINOR_VERSION > 0 +#define FLEX_BETA +#endif + +#ifdef yyget_lval +#define yyget_lval_ALREADY_DEFINED +#else +#define yyget_lval yyget_lval +#endif + +#ifdef yyset_lval +#define yyset_lval_ALREADY_DEFINED +#else +#define yyset_lval yyset_lval +#endif + +#ifdef yyget_lloc +#define yyget_lloc_ALREADY_DEFINED +#else +#define yyget_lloc yyget_lloc +#endif + +#ifdef yyset_lloc +#define yyset_lloc_ALREADY_DEFINED +#else +#define yyset_lloc yyset_lloc +#endif + +/* First, we deal with platform-specific or compiler-specific issues. */ + +/* begin standard C headers. */ +#include +#include +#include +#include + +/* end standard C headers. */ + +/* flex integer type definitions */ + +#ifndef FLEXINT_H +#define FLEXINT_H + +/* C99 systems have . Non-C99 systems may or may not. */ + +#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L + +/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, + * if you want the limit (max/min) macros for int types. + */ +#ifndef __STDC_LIMIT_MACROS +#define __STDC_LIMIT_MACROS 1 +#endif + +#include +typedef int8_t flex_int8_t; +typedef uint8_t flex_uint8_t; +typedef int16_t flex_int16_t; +typedef uint16_t flex_uint16_t; +typedef int32_t flex_int32_t; +typedef uint32_t flex_uint32_t; +#else +typedef signed char flex_int8_t; +typedef short int flex_int16_t; +typedef int flex_int32_t; +typedef unsigned char flex_uint8_t; +typedef unsigned short int flex_uint16_t; +typedef unsigned int flex_uint32_t; + +/* Limits of integral types. */ +#ifndef INT8_MIN +#define INT8_MIN (-128) +#endif +#ifndef INT16_MIN +#define INT16_MIN (-32767-1) +#endif +#ifndef INT32_MIN +#define INT32_MIN (-2147483647-1) +#endif +#ifndef INT8_MAX +#define INT8_MAX (127) +#endif +#ifndef INT16_MAX +#define INT16_MAX (32767) +#endif +#ifndef INT32_MAX +#define INT32_MAX (2147483647) +#endif +#ifndef UINT8_MAX +#define UINT8_MAX (255U) +#endif +#ifndef UINT16_MAX +#define UINT16_MAX (65535U) +#endif +#ifndef UINT32_MAX +#define UINT32_MAX (4294967295U) +#endif + +#ifndef SIZE_MAX +#define SIZE_MAX (~(size_t)0) +#endif + +#endif /* ! C99 */ + +#endif /* ! FLEXINT_H */ + +/* begin standard C++ headers. */ + +/* TODO: this is always defined, so inline it */ +#define yyconst const + +#if defined(__GNUC__) && __GNUC__ >= 3 +#define yynoreturn __attribute__((__noreturn__)) +#else +#define yynoreturn +#endif + +/* An opaque pointer. */ +#ifndef YY_TYPEDEF_YY_SCANNER_T +#define YY_TYPEDEF_YY_SCANNER_T +typedef void* yyscan_t; +#endif + +/* For convenience, these vars (plus the bison vars far below) + are macros in the reentrant scanner. */ +#define yyin yyg->yyin_r +#define yyout yyg->yyout_r +#define yyextra yyg->yyextra_r +#define yyleng yyg->yyleng_r +#define yytext yyg->yytext_r +#define yylineno (YY_CURRENT_BUFFER_LVALUE->yy_bs_lineno) +#define yycolumn (YY_CURRENT_BUFFER_LVALUE->yy_bs_column) +#define yy_flex_debug yyg->yy_flex_debug_r + +/* Size of default input buffer. */ +#ifndef YY_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k. + * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. + * Ditto for the __ia64__ case accordingly. + */ +#define YY_BUF_SIZE 32768 +#else +#define YY_BUF_SIZE 16384 +#endif /* __ia64__ */ +#endif + +#ifndef YY_TYPEDEF_YY_BUFFER_STATE +#define YY_TYPEDEF_YY_BUFFER_STATE +typedef struct yy_buffer_state *YY_BUFFER_STATE; +#endif + +#ifndef YY_TYPEDEF_YY_SIZE_T +#define YY_TYPEDEF_YY_SIZE_T +typedef size_t yy_size_t; +#endif + +#ifndef YY_STRUCT_YY_BUFFER_STATE +#define YY_STRUCT_YY_BUFFER_STATE +struct yy_buffer_state + { + FILE *yy_input_file; + + char *yy_ch_buf; /* input buffer */ + char *yy_buf_pos; /* current position in input buffer */ + + /* Size of input buffer in bytes, not including room for EOB + * characters. + */ + int yy_buf_size; + + /* Number of characters read into yy_ch_buf, not including EOB + * characters. + */ + int yy_n_chars; + + /* Whether we "own" the buffer - i.e., we know we created it, + * and can realloc() it to grow it, and should free() it to + * delete it. + */ + int yy_is_our_buffer; + + /* Whether this is an "interactive" input source; if so, and + * if we're using stdio for input, then we want to use getc() + * instead of fread(), to make sure we stop fetching input after + * each newline. + */ + int yy_is_interactive; + + /* Whether we're considered to be at the beginning of a line. + * If so, '^' rules will be active on the next match, otherwise + * not. + */ + int yy_at_bol; + + int yy_bs_lineno; /**< The line count. */ + int yy_bs_column; /**< The column count. */ + + /* Whether to try to fill the input buffer when we reach the + * end of it. + */ + int yy_fill_buffer; + + int yy_buffer_status; + + }; +#endif /* !YY_STRUCT_YY_BUFFER_STATE */ + +void yyrestart ( FILE *input_file , yyscan_t yyscanner ); +void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size , yyscan_t yyscanner ); +void yy_delete_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); +void yy_flush_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); +void yypush_buffer_state ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); +void yypop_buffer_state ( yyscan_t yyscanner ); + +YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_string ( const char *yy_str , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len , yyscan_t yyscanner ); + +void *yyalloc ( yy_size_t , yyscan_t yyscanner ); +void *yyrealloc ( void *, yy_size_t , yyscan_t yyscanner ); +void yyfree ( void * , yyscan_t yyscanner ); + +#define yywrap(yyscanner) (/*CONSTCOND*/1) +#define YY_SKIP_YYWRAP + +#define yytext_ptr yytext_r + +#ifdef YY_HEADER_EXPORT_START_CONDITIONS +#define INITIAL 0 +#define props 1 +#define xcoord 2 +#define ycoord 3 +#define noderef 4 + +#endif + +#ifndef YY_NO_UNISTD_H +/* Special case for "unistd.h", since it is non-ANSI. We include it way + * down here because we want the user's section 1 to have been scanned first. + * The user has a chance to override it with an option. + */ +#include +#endif + +#define YY_EXTRA_TYPE TikzAssembler * + +int yylex_init (yyscan_t* scanner); + +int yylex_init_extra ( YY_EXTRA_TYPE user_defined, yyscan_t* scanner); + +/* Accessor methods to globals. + These are made visible to non-reentrant scanners for convenience. */ + +int yylex_destroy ( yyscan_t yyscanner ); + +int yyget_debug ( yyscan_t yyscanner ); + +void yyset_debug ( int debug_flag , yyscan_t yyscanner ); + +YY_EXTRA_TYPE yyget_extra ( yyscan_t yyscanner ); + +void yyset_extra ( YY_EXTRA_TYPE user_defined , yyscan_t yyscanner ); + +FILE *yyget_in ( yyscan_t yyscanner ); + +void yyset_in ( FILE * _in_str , yyscan_t yyscanner ); + +FILE *yyget_out ( yyscan_t yyscanner ); + +void yyset_out ( FILE * _out_str , yyscan_t yyscanner ); + + int yyget_leng ( yyscan_t yyscanner ); + +char *yyget_text ( yyscan_t yyscanner ); + +int yyget_lineno ( yyscan_t yyscanner ); + +void yyset_lineno ( int _line_number , yyscan_t yyscanner ); + +int yyget_column ( yyscan_t yyscanner ); + +void yyset_column ( int _column_no , yyscan_t yyscanner ); + +YYSTYPE * yyget_lval ( yyscan_t yyscanner ); + +void yyset_lval ( YYSTYPE * yylval_param , yyscan_t yyscanner ); + + YYLTYPE *yyget_lloc ( yyscan_t yyscanner ); + + void yyset_lloc ( YYLTYPE * yylloc_param , yyscan_t yyscanner ); + +/* Macros after this point can all be overridden by user definitions in + * section 1. + */ + +#ifndef YY_SKIP_YYWRAP +#ifdef __cplusplus +extern "C" int yywrap ( yyscan_t yyscanner ); +#else +extern int yywrap ( yyscan_t yyscanner ); +#endif +#endif + +#ifndef yytext_ptr +static void yy_flex_strncpy ( char *, const char *, int , yyscan_t yyscanner); +#endif + +#ifdef YY_NEED_STRLEN +static int yy_flex_strlen ( const char * , yyscan_t yyscanner); +#endif + +#ifndef YY_NO_INPUT + +#endif + +/* Amount of stuff to slurp up with each read. */ +#ifndef YY_READ_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k */ +#define YY_READ_BUF_SIZE 16384 +#else +#define YY_READ_BUF_SIZE 8192 +#endif /* __ia64__ */ +#endif + +/* Number of entries by which start-condition stack grows. */ +#ifndef YY_START_STACK_INCR +#define YY_START_STACK_INCR 25 +#endif + +/* Default declaration of generated scanner - a define so the user can + * easily add parameters. + */ +#ifndef YY_DECL +#define YY_DECL_IS_OURS 1 + +extern int yylex \ + (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner); + +#define YY_DECL int yylex \ + (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner) +#endif /* !YY_DECL */ + +/* yy_get_previous_state - get the state just before the EOB char was reached */ + +#undef YY_NEW_FILE +#undef YY_FLUSH_BUFFER +#undef yy_set_bol +#undef yy_new_buffer +#undef yy_set_interactive +#undef YY_DO_BEFORE_ACTION + +#ifdef YY_DECL_IS_OURS +#undef YY_DECL_IS_OURS +#undef YY_DECL +#endif + +#ifndef yy_create_buffer_ALREADY_DEFINED +#undef yy_create_buffer +#endif +#ifndef yy_delete_buffer_ALREADY_DEFINED +#undef yy_delete_buffer +#endif +#ifndef yy_scan_buffer_ALREADY_DEFINED +#undef yy_scan_buffer +#endif +#ifndef yy_scan_string_ALREADY_DEFINED +#undef yy_scan_string +#endif +#ifndef yy_scan_bytes_ALREADY_DEFINED +#undef yy_scan_bytes +#endif +#ifndef yy_init_buffer_ALREADY_DEFINED +#undef yy_init_buffer +#endif +#ifndef yy_flush_buffer_ALREADY_DEFINED +#undef yy_flush_buffer +#endif +#ifndef yy_load_buffer_state_ALREADY_DEFINED +#undef yy_load_buffer_state +#endif +#ifndef yy_switch_to_buffer_ALREADY_DEFINED +#undef yy_switch_to_buffer +#endif +#ifndef yypush_buffer_state_ALREADY_DEFINED +#undef yypush_buffer_state +#endif +#ifndef yypop_buffer_state_ALREADY_DEFINED +#undef yypop_buffer_state +#endif +#ifndef yyensure_buffer_stack_ALREADY_DEFINED +#undef yyensure_buffer_stack +#endif +#ifndef yylex_ALREADY_DEFINED +#undef yylex +#endif +#ifndef yyrestart_ALREADY_DEFINED +#undef yyrestart +#endif +#ifndef yylex_init_ALREADY_DEFINED +#undef yylex_init +#endif +#ifndef yylex_init_extra_ALREADY_DEFINED +#undef yylex_init_extra +#endif +#ifndef yylex_destroy_ALREADY_DEFINED +#undef yylex_destroy +#endif +#ifndef yyget_debug_ALREADY_DEFINED +#undef yyget_debug +#endif +#ifndef yyset_debug_ALREADY_DEFINED +#undef yyset_debug +#endif +#ifndef yyget_extra_ALREADY_DEFINED +#undef yyget_extra +#endif +#ifndef yyset_extra_ALREADY_DEFINED +#undef yyset_extra +#endif +#ifndef yyget_in_ALREADY_DEFINED +#undef yyget_in +#endif +#ifndef yyset_in_ALREADY_DEFINED +#undef yyset_in +#endif +#ifndef yyget_out_ALREADY_DEFINED +#undef yyget_out +#endif +#ifndef yyset_out_ALREADY_DEFINED +#undef yyset_out +#endif +#ifndef yyget_leng_ALREADY_DEFINED +#undef yyget_leng +#endif +#ifndef yyget_text_ALREADY_DEFINED +#undef yyget_text +#endif +#ifndef yyget_lineno_ALREADY_DEFINED +#undef yyget_lineno +#endif +#ifndef yyset_lineno_ALREADY_DEFINED +#undef yyset_lineno +#endif +#ifndef yyget_column_ALREADY_DEFINED +#undef yyget_column +#endif +#ifndef yyset_column_ALREADY_DEFINED +#undef yyset_column +#endif +#ifndef yywrap_ALREADY_DEFINED +#undef yywrap +#endif +#ifndef yyget_lval_ALREADY_DEFINED +#undef yyget_lval +#endif +#ifndef yyset_lval_ALREADY_DEFINED +#undef yyset_lval +#endif +#ifndef yyget_lloc_ALREADY_DEFINED +#undef yyget_lloc +#endif +#ifndef yyset_lloc_ALREADY_DEFINED +#undef yyset_lloc +#endif +#ifndef yyalloc_ALREADY_DEFINED +#undef yyalloc +#endif +#ifndef yyrealloc_ALREADY_DEFINED +#undef yyrealloc +#endif +#ifndef yyfree_ALREADY_DEFINED +#undef yyfree +#endif +#ifndef yytext_ALREADY_DEFINED +#undef yytext +#endif +#ifndef yyleng_ALREADY_DEFINED +#undef yyleng +#endif +#ifndef yyin_ALREADY_DEFINED +#undef yyin +#endif +#ifndef yyout_ALREADY_DEFINED +#undef yyout +#endif +#ifndef yy_flex_debug_ALREADY_DEFINED +#undef yy_flex_debug +#endif +#ifndef yylineno_ALREADY_DEFINED +#undef yylineno +#endif +#ifndef yytables_fload_ALREADY_DEFINED +#undef yytables_fload +#endif +#ifndef yytables_destroy_ALREADY_DEFINED +#undef yytables_destroy +#endif +#ifndef yyTABLES_NAME_ALREADY_DEFINED +#undef yyTABLES_NAME +#endif + +#line 195 "src/data/tikzlexer.l" + +#line 524 "tikzlexer.h" +#undef yyIN_HEADER +#endif /* yyHEADER_H */ -- cgit v1.2.3 From f085393232f29237e7d6bfb1469d77a78e4a511a Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Mon, 1 Oct 2018 17:46:11 +0200 Subject: moving properties up and down --- .gitignore | 5 +++++ src/data/graphelementdata.cpp | 36 ++++++++++++++++++++++++++++++++++++ src/data/graphelementdata.h | 5 +++++ src/gui/styleeditor.cpp | 35 ++++++++++++++++++++++++++++++++--- 4 files changed, 78 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e86ac94..8485ec0 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,8 @@ src/data/tikzlexer.lexer.cpp src/data/tikzparser.parser.cpp src/data/tikzparser.parser.hpp *.o +moc_*.cpp +moc_*.h +ui_*.h +qrc_*.cpp +tikzit diff --git a/src/data/graphelementdata.cpp b/src/data/graphelementdata.cpp index 25ba08e..b478842 100644 --- a/src/data/graphelementdata.cpp +++ b/src/data/graphelementdata.cpp @@ -110,6 +110,42 @@ int GraphElementData::indexOfKey(QString key) return -1; } +bool GraphElementData::removeRows(int row, int /*count*/, const QModelIndex &parent) +{ + if (row >= 0 && row < _properties.length()) { + beginRemoveRows(parent, row, row+1); + _properties.remove(row); + endRemoveRows(); + return true; + } else { + return false; + } +} + +bool GraphElementData::moveRows(const QModelIndex &sourceParent, + int sourceRow, + int /*count*/, + const QModelIndex &destinationParent, + int destinationRow) +{ + if (sourceRow >= 0 && sourceRow < _properties.length() && + destinationRow >= 0 && destinationRow <= _properties.length()) + { + beginMoveRows(sourceParent, sourceRow, sourceRow, destinationParent, destinationRow); + GraphElementProperty p = _properties[sourceRow]; + _properties.remove(sourceRow); + if (sourceRow < destinationRow) { + _properties.insert(destinationRow - 1, p); + } else { + _properties.insert(destinationRow, p); + } + endMoveRows(); + return true; + } else { + return false; + } +} + QVariant GraphElementData::data(const QModelIndex &index, int role) const { if (role == Qt::DisplayRole || role == Qt::EditRole) { diff --git a/src/data/graphelementdata.h b/src/data/graphelementdata.h index acaada7..f48f228 100644 --- a/src/data/graphelementdata.h +++ b/src/data/graphelementdata.h @@ -43,6 +43,11 @@ public: QString property(QString key); bool atom(QString atom); int indexOfKey(QString key); + bool removeRows(int row, int count, const QModelIndex &parent) override; + bool moveRows(const QModelIndex &sourceParent, + int sourceRow, int, + const QModelIndex &destinationParent, + int destinationRow) override; QVariant data(const QModelIndex &index, int role) const override; QVariant headerData(int section, Qt::Orientation orientation, diff --git a/src/gui/styleeditor.cpp b/src/gui/styleeditor.cpp index fbf73a9..f6e3f48 100644 --- a/src/gui/styleeditor.cpp +++ b/src/gui/styleeditor.cpp @@ -447,17 +447,46 @@ void StyleEditor::on_addAtom_clicked() void StyleEditor::on_removeProperty_clicked() { - + Style *s = activeStyle(); + if (s != 0) { + QModelIndexList sel = ui->properties->selectionModel()->selectedRows(); + if (!sel.isEmpty()) { + s->data()->removeRows(sel[0].row(), 1, sel[0].parent()); + _dirty = true; + } + } } void StyleEditor::on_propertyUp_clicked() { - + Style *s = activeStyle(); + if (s != 0) { + QModelIndexList sel = ui->properties->selectionModel()->selectedRows(); + if (!sel.isEmpty()) { + s->data()->moveRows( + sel[0].parent(), + sel[0].row(), 1, + sel[0].parent(), + sel[0].row() - 1); + _dirty = true; + } + } } void StyleEditor::on_propertyDown_clicked() { - + Style *s = activeStyle(); + if (s != 0) { + QModelIndexList sel = ui->properties->selectionModel()->selectedRows(); + if (!sel.isEmpty()) { + s->data()->moveRows( + sel[0].parent(), + sel[0].row(), 1, + sel[0].parent(), + sel[0].row() + 2); + _dirty = true; + } + } } void StyleEditor::on_save_clicked() -- cgit v1.2.3 From 52f2d4b7f3df910db6592ae16b1eec825b70c4d6 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 2 Oct 2018 17:18:56 +0200 Subject: disabled self-loops (for now at least) --- src/gui/tikzscene.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gui/tikzscene.cpp b/src/gui/tikzscene.cpp index b2c5fd7..119d0d1 100644 --- a/src/gui/tikzscene.cpp +++ b/src/gui/tikzscene.cpp @@ -556,7 +556,8 @@ void TikzScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) } break; case ToolPalette::EDGE: - if (_edgeStartNodeItem != 0 && _edgeEndNodeItem != 0) { + // add an edge. Currently, self-loops are not supported (since they aren't drawn properly) + if (_edgeStartNodeItem != 0 && _edgeEndNodeItem != 0 && _edgeStartNodeItem != _edgeEndNodeItem) { Edge *e = new Edge(_edgeStartNodeItem->node(), _edgeEndNodeItem->node(), _tikzDocument); e->setStyleName(_styles->activeEdgeStyleName()); AddEdgeCommand *cmd = new AddEdgeCommand(this, e); -- cgit v1.2.3 From e61fb864ec68a58abdb9cc9df047b4b75801c5e7 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 2 Oct 2018 17:46:03 +0200 Subject: fixed self-loop support --- src/data/edge.cpp | 21 +++++++++++++++------ src/gui/tikzscene.cpp | 10 ++++++---- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/src/data/edge.cpp b/src/data/edge.cpp index b4c7ec1..ca63954 100644 --- a/src/data/edge.cpp +++ b/src/data/edge.cpp @@ -29,11 +29,20 @@ Edge::Edge(Node *s, Node *t, QObject *parent) : _data = new GraphElementData(); _edgeNode = 0; _dirty = true; - _basicBendMode = true; - _bend = 0; - _inAngle = 0; - _outAngle = 0; - _weight = 0.4f; + + if (s != t) { + _basicBendMode = true; + _bend = 0; + _inAngle = 0; + _outAngle = 0; + _weight = 0.4f; + } else { + _basicBendMode = false; + _bend = 0; + _inAngle = 135; + _outAngle = 45; + _weight = 1.0f; + } _style = noneEdgeStyle; updateControls(); } @@ -227,7 +236,7 @@ void Edge::setAttributesFromData() } } - if (_data->property("looseness") != 0) { + if (!_data->property("looseness").isNull()) { _weight = _data->property("looseness").toFloat(&ok) / 2.5f; if (!ok) _weight = 0.4f; } else { diff --git a/src/gui/tikzscene.cpp b/src/gui/tikzscene.cpp index 119d0d1..c061221 100644 --- a/src/gui/tikzscene.cpp +++ b/src/gui/tikzscene.cpp @@ -556,8 +556,8 @@ void TikzScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) } break; case ToolPalette::EDGE: - // add an edge. Currently, self-loops are not supported (since they aren't drawn properly) - if (_edgeStartNodeItem != 0 && _edgeEndNodeItem != 0 && _edgeStartNodeItem != _edgeEndNodeItem) { + // add an edge + if (_edgeStartNodeItem != 0 && _edgeEndNodeItem != 0) { Edge *e = new Edge(_edgeStartNodeItem->node(), _edgeEndNodeItem->node(), _tikzDocument); e->setStyleName(_styles->activeEdgeStyleName()); AddEdgeCommand *cmd = new AddEdgeCommand(this, e); @@ -659,8 +659,10 @@ void TikzScene::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) foreach (QGraphicsItem *it, items(mousePos)) { if (EdgeItem *ei = dynamic_cast(it)) { - ChangeEdgeModeCommand *cmd = new ChangeEdgeModeCommand(this, ei->edge()); - _tikzDocument->undoStack()->push(cmd); + if (!ei->edge()->isSelfLoop()) { + ChangeEdgeModeCommand *cmd = new ChangeEdgeModeCommand(this, ei->edge()); + _tikzDocument->undoStack()->push(cmd); + } break; } else if (NodeItem *ni = dynamic_cast(it)) { bool ok; -- cgit v1.2.3 From 6359b28b155355e0be67961cc21eccdbd2c61cc2 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Sat, 6 Oct 2018 15:49:50 +0200 Subject: unified node and edge syles --- src/data/edgestyle.cpp | 210 +++++++++++++++++++++--------------------- src/data/edgestyle.h | 32 +++---- src/data/nodestyle.cpp | 145 +++++++++++++++-------------- src/data/nodestyle.h | 13 +-- src/data/nodestylelist.cpp | 113 +++++++++++++++++++++++ src/data/nodestylelist.h | 40 ++++++++ src/data/style.cpp | 182 ++++++++++++++++++++++++++++++++++-- src/data/style.h | 39 ++++++-- src/data/tikzstyles.cpp | 34 ++++--- src/data/tikzstyles.h | 6 +- tikzit.pro | 224 +++++++++++++++++++++++---------------------- 11 files changed, 689 insertions(+), 349 deletions(-) create mode 100644 src/data/nodestylelist.cpp create mode 100644 src/data/nodestylelist.h diff --git a/src/data/edgestyle.cpp b/src/data/edgestyle.cpp index 8f3008f..7897c6f 100644 --- a/src/data/edgestyle.cpp +++ b/src/data/edgestyle.cpp @@ -21,7 +21,7 @@ #include #include -EdgeStyle *noneEdgeStyle = new EdgeStyle(); +EdgeStyle *noneEdgeStyle = new EdgeStyle("none", new GraphElementData({GraphElementProperty("-")})); EdgeStyle::EdgeStyle() : Style() { @@ -31,107 +31,107 @@ EdgeStyle::EdgeStyle(QString name, GraphElementData *data) : Style(name, data) { } -EdgeStyle::ArrowTipStyle EdgeStyle::arrowHead() const -{ - if (_data == 0) return NoTip; - - if (_data->atom("->") || _data->atom("<->") || _data->atom("|->")) return Pointer; - if (_data->atom("-|") || _data->atom("<-|") || _data->atom("|-|")) return Flat; - return NoTip; -} - -EdgeStyle::ArrowTipStyle EdgeStyle::arrowTail() const -{ - if (_data == 0) return NoTip; - if (_data->atom("<-") || _data->atom("<->") || _data->atom("<-|")) return Pointer; - if (_data->atom("|-") || _data->atom("|->") || _data->atom("|-|")) return Flat; - return NoTip; -} - -EdgeStyle::DrawStyle EdgeStyle::drawStyle() const -{ - if (_data == 0) return Solid; - if (_data->atom("dashed")) return Dashed; - if (_data->atom("dotted")) return Dotted; - return Solid; -} - -QPen EdgeStyle::pen() const -{ - QPen p(strokeColor()); - p.setWidthF((float)strokeThickness() * 2.0f); - - QVector pat; - switch (drawStyle()) { - case Dashed: - pat << 3.0 << 3.0; - p.setDashPattern(pat); - break; - case Dotted: - pat << 1.0 << 1.0; - p.setDashPattern(pat); - break; - case Solid: - break; - } - - return p; -} - -QPainterPath EdgeStyle::path() const -{ - return QPainterPath(); -} - -QPainterPath EdgeStyle::palettePath() const -{ - return QPainterPath(); -} - -QIcon EdgeStyle::icon() const -{ - // draw an icon matching the style - QPixmap px(100,100); - px.fill(Qt::transparent); - QPainter painter(&px); - - if (_data == 0) { - QPen pen(Qt::black); - pen.setWidth(3); - } else { - painter.setPen(pen()); - } - - painter.drawLine(10, 50, 90, 50); - - QPen pn = pen(); - pn.setStyle(Qt::SolidLine); - painter.setPen(pn); - - switch (arrowHead()) { - case Pointer: - painter.drawLine(90,50,80,40); - painter.drawLine(90,50,80,60); - break; - case Flat: - painter.drawLine(90,40,90,60); - break; - case NoTip: - break; - } - - switch (arrowTail()) { - case Pointer: - painter.drawLine(10,50,20,40); - painter.drawLine(10,50,20,60); - break; - case Flat: - painter.drawLine(10,40,10,60); - break; - case NoTip: - break; - } - - - return QIcon(px); -} +//EdgeStyle::ArrowTipStyle EdgeStyle::arrowHead() const +//{ +// if (_data == 0) return NoTip; + +// if (_data->atom("->") || _data->atom("<->") || _data->atom("|->")) return Pointer; +// if (_data->atom("-|") || _data->atom("<-|") || _data->atom("|-|")) return Flat; +// return NoTip; +//} + +//EdgeStyle::ArrowTipStyle EdgeStyle::arrowTail() const +//{ +// if (_data == 0) return NoTip; +// if (_data->atom("<-") || _data->atom("<->") || _data->atom("<-|")) return Pointer; +// if (_data->atom("|-") || _data->atom("|->") || _data->atom("|-|")) return Flat; +// return NoTip; +//} + +//EdgeStyle::DrawStyle EdgeStyle::drawStyle() const +//{ +// if (_data == 0) return Solid; +// if (_data->atom("dashed")) return Dashed; +// if (_data->atom("dotted")) return Dotted; +// return Solid; +//} + +//QPen EdgeStyle::pen() const +//{ +// QPen p(strokeColor()); +// p.setWidthF((float)strokeThickness() * 2.0f); + +// QVector pat; +// switch (drawStyle()) { +// case Dashed: +// pat << 3.0 << 3.0; +// p.setDashPattern(pat); +// break; +// case Dotted: +// pat << 1.0 << 1.0; +// p.setDashPattern(pat); +// break; +// case Solid: +// break; +// } + +// return p; +//} + +//QPainterPath EdgeStyle::path() const +//{ +// return QPainterPath(); +//} + +//QPainterPath EdgeStyle::palettePath() const +//{ +// return QPainterPath(); +//} + +//QIcon EdgeStyle::icon() const +//{ +// // draw an icon matching the style +// QPixmap px(100,100); +// px.fill(Qt::transparent); +// QPainter painter(&px); + +// if (_data == 0) { +// QPen pen(Qt::black); +// pen.setWidth(3); +// } else { +// painter.setPen(pen()); +// } + +// painter.drawLine(10, 50, 90, 50); + +// QPen pn = pen(); +// pn.setStyle(Qt::SolidLine); +// painter.setPen(pn); + +// switch (arrowHead()) { +// case Pointer: +// painter.drawLine(90,50,80,40); +// painter.drawLine(90,50,80,60); +// break; +// case Flat: +// painter.drawLine(90,40,90,60); +// break; +// case NoTip: +// break; +// } + +// switch (arrowTail()) { +// case Pointer: +// painter.drawLine(10,50,20,40); +// painter.drawLine(10,50,20,60); +// break; +// case Flat: +// painter.drawLine(10,40,10,60); +// break; +// case NoTip: +// break; +// } + + +// return QIcon(px); +//} diff --git a/src/data/edgestyle.h b/src/data/edgestyle.h index eac060a..0e7b554 100644 --- a/src/data/edgestyle.h +++ b/src/data/edgestyle.h @@ -33,22 +33,22 @@ public: EdgeStyle(); EdgeStyle(QString name, GraphElementData *data); - enum ArrowTipStyle { - Flat, Pointer, NoTip - }; - - enum DrawStyle { - Solid, Dotted, Dashed - }; - - ArrowTipStyle arrowHead() const; - ArrowTipStyle arrowTail() const; - DrawStyle drawStyle() const; - - QPen pen() const override; - QPainterPath path() const override; - QPainterPath palettePath() const override; - QIcon icon() const override; +// enum ArrowTipStyle { +// Flat, Pointer, NoTip +// }; + +// enum DrawStyle { +// Solid, Dotted, Dashed +// }; + +// ArrowTipStyle arrowHead() const; +// ArrowTipStyle arrowTail() const; +// DrawStyle drawStyle() const; + +// QPen pen() const override; +// QPainterPath path() const override; +// QPainterPath palettePath() const override; +// QIcon icon() const override; }; extern EdgeStyle *noneEdgeStyle; diff --git a/src/data/nodestyle.cpp b/src/data/nodestyle.cpp index 8bdb763..b379565 100644 --- a/src/data/nodestyle.cpp +++ b/src/data/nodestyle.cpp @@ -34,74 +34,79 @@ NodeStyle::NodeStyle(QString name, GraphElementData *data): Style(name, data) { } -QColor NodeStyle::fillColor(bool tikzitOverride) const -{ - if (_data == 0) return Qt::white; - - QString col = propertyWithDefault("fill", "white", tikzitOverride); - return tikzit->colorByName(col); -} - -QBrush NodeStyle::brush() const -{ - return QBrush(fillColor()); -} - -QString NodeStyle::shape(bool tikzitOverride) const -{ - return propertyWithDefault("shape", "circle", tikzitOverride); -} - -QPainterPath NodeStyle::path() const -{ - QPainterPath pth; - QString sh = shape(); - - if (sh == "rectangle") { - pth.addRect(-30.0f, -30.0f, 60.0f, 60.0f); - } else { // default is 'circle' - pth.addEllipse(QPointF(0.0f,0.0f), 30.0f, 30.0f); - } - return pth; -} - -QPainterPath NodeStyle::palettePath() const -{ - return path(); -} - -QIcon NodeStyle::icon() const -{ - // draw an icon matching the style - QImage px(100,100,QImage::Format_ARGB32_Premultiplied); - px.fill(Qt::transparent); - - - QPainter painter(&px); - painter.setRenderHint(QPainter::Antialiasing); - QPainterPath pth = path(); - pth.translate(50.0f, 50.0f); - - if (_data == 0) { - QColor c(180,180,200); - painter.setPen(QPen(c)); - painter.setBrush(QBrush(c)); - painter.drawEllipse(QPointF(50.0f,50.0f), 3,3); - - QPen pen(QColor(180,180,220)); - pen.setWidth(3); - QVector p; - p << 2.0 << 2.0; - pen.setDashPattern(p); - painter.setPen(pen); - painter.setBrush(Qt::NoBrush); - painter.drawPath(pth); - } else { - painter.setPen(pen()); - painter.setBrush(brush()); - painter.drawPath(pth); - } - - return QIcon(QPixmap::fromImage(px)); -} +//QColor NodeStyle::fillColor(bool tikzitOverride) const +//{ +// if (_data == 0) return Qt::white; + +// QString col = propertyWithDefault("fill", "white", tikzitOverride); +// return tikzit->colorByName(col); +//} + +//QBrush NodeStyle::brush() const +//{ +// return QBrush(fillColor()); +//} + +//QString NodeStyle::shape(bool tikzitOverride) const +//{ +// return propertyWithDefault("shape", "circle", tikzitOverride); +//} + +//QPainterPath NodeStyle::path() const +//{ +// QPainterPath pth; +// QString sh = shape(); + +// if (sh == "rectangle") { +// pth.addRect(-30.0f, -30.0f, 60.0f, 60.0f); +// } else { // default is 'circle' +// pth.addEllipse(QPointF(0.0f,0.0f), 30.0f, 30.0f); +// } +// return pth; +//} + +//QPainterPath NodeStyle::palettePath() const +//{ +// return path(); +//} + +//QIcon NodeStyle::icon() const +//{ +// // draw an icon matching the style +// QImage px(100,100,QImage::Format_ARGB32_Premultiplied); +// px.fill(Qt::transparent); + + +// QPainter painter(&px); +// painter.setRenderHint(QPainter::Antialiasing); +// QPainterPath pth = path(); +// pth.translate(50.0f, 50.0f); + +// if (_data == 0) { +// QColor c(180,180,200); +// painter.setPen(QPen(c)); +// painter.setBrush(QBrush(c)); +// painter.drawEllipse(QPointF(50.0f,50.0f), 3,3); + +// QPen pen(QColor(180,180,220)); +// pen.setWidth(3); +// QVector p; +// p << 2.0 << 2.0; +// pen.setDashPattern(p); +// painter.setPen(pen); +// painter.setBrush(Qt::NoBrush); +// painter.drawPath(pth); +// } else { +// painter.setPen(pen()); +// painter.setBrush(brush()); +// painter.drawPath(pth); +// } + +// return QIcon(QPixmap::fromImage(px)); +//} + +//QString NodeStyle::category() +//{ +// return propertyWithDefault("tikzit category", "", false); +//} diff --git a/src/data/nodestyle.h b/src/data/nodestyle.h index a3842ff..36bd5d5 100644 --- a/src/data/nodestyle.h +++ b/src/data/nodestyle.h @@ -33,13 +33,14 @@ public: NodeStyle(); NodeStyle(QString name, GraphElementData *data); - QColor fillColor(bool tikzitOverride=true) const; - QBrush brush() const; - QPainterPath path() const override; - QString shape(bool tikzitOverride=true) const; +// QColor fillColor(bool tikzitOverride=true) const; +// QBrush brush() const; +// QPainterPath path() const override; +// QString shape(bool tikzitOverride=true) const; + +// QPainterPath palettePath() const override; +// QIcon icon() const override; - QPainterPath palettePath() const override; - QIcon icon() const override; }; extern NodeStyle *noneStyle; diff --git a/src/data/nodestylelist.cpp b/src/data/nodestylelist.cpp new file mode 100644 index 0000000..41749db --- /dev/null +++ b/src/data/nodestylelist.cpp @@ -0,0 +1,113 @@ +#include "nodestylelist.h" + +#include + +NodeStyleList::NodeStyleList(QObject *parent) : QAbstractListModel(parent) +{ +} + +NodeStyle *NodeStyleList::style(QString name) +{ + foreach (NodeStyle *s, _styles) + if (s->name() == name) return s; + return nullptr; +} + +NodeStyle *NodeStyleList::style(int i) +{ + return _styles[i]; +} + +int NodeStyleList::length() const +{ + return _styles.length(); +} + +void NodeStyleList::addStyle(NodeStyle *s) +{ + if (s->category() == _category) { + int n = numInCategory(); + beginInsertRows(QModelIndex(), n, n); + _styles << s; + endInsertRows(); + } else { + _styles << s; + } +} + +void NodeStyleList::clear() +{ + int n = numInCategory(); + if (n > 0) { + beginRemoveRows(QModelIndex(), 0, n - 1); + _styles.clear(); + endRemoveRows(); + } else { + _styles.clear(); + } + + _category = ""; +} + +QString NodeStyleList::tikz() +{ + QString str; + QTextStream code(&str); + foreach (NodeStyle *s, _styles) code << s->tikz() << "\n"; + code.flush(); + return str; +} + +int NodeStyleList::numInCategory() const +{ + int c = 0; + foreach (NodeStyle *s, _styles) { + if (_category == "" || s->category() == _category) { + ++c; + } + } + return c; +} + +int NodeStyleList::nthInCategory(int n) const +{ + int c = 0; + for (int j = 0; j < _styles.length(); ++j) { + if (_category == "" || _styles[j]->category() == _category) { + if (c == n) return j; + else ++c; + } + } + return -1; +} + +NodeStyle *NodeStyleList::styleInCategory(int n) const +{ + return _styles[nthInCategory(n)]; +} + +QVariant NodeStyleList::data(const QModelIndex &index, int role) const +{ + if (role == Qt::DisplayRole) { + return QVariant(styleInCategory(index.row())->name()); + } else if (role == Qt::DecorationRole) { + return QVariant(styleInCategory(index.row())->icon()); + } else { + return QVariant(); + } +} + +int NodeStyleList::rowCount(const QModelIndex &/*parent*/) const +{ + return numInCategory(); +} + +QString NodeStyleList::category() const +{ + return _category; +} + +void NodeStyleList::setCategory(const QString &category) +{ + _category = category; +} diff --git a/src/data/nodestylelist.h b/src/data/nodestylelist.h new file mode 100644 index 0000000..03f7ed5 --- /dev/null +++ b/src/data/nodestylelist.h @@ -0,0 +1,40 @@ +#ifndef NODESTYLELIST_H +#define NODESTYLELIST_H + +#include "nodestyle.h" + +#include + +class NodeStyleList : public QAbstractListModel +{ + Q_OBJECT +public: + explicit NodeStyleList(QObject *parent = nullptr); + NodeStyle *style(QString name); + NodeStyle *style(int i); + int length() const; + void addStyle(NodeStyle *s); + void clear(); + QString tikz(); + + int numInCategory() const; + int nthInCategory(int n) const; + NodeStyle *styleInCategory(int n) const; + + QVariant data(const QModelIndex &index, int role) const override; + int rowCount(const QModelIndex &/*parent*/) const override; + + + QString category() const; + void setCategory(const QString &category); + +signals: + +public slots: + +private: + QVector _styles; + QString _category; +}; + +#endif // NODESTYLELIST_H diff --git a/src/data/style.cpp b/src/data/style.cpp index 63747ec..39314cb 100644 --- a/src/data/style.cpp +++ b/src/data/style.cpp @@ -19,17 +19,19 @@ #include "style.h" #include "tikzit.h" -Style::Style() : _name("none"), _data(0) +Style::Style() : _name("none") { + _data = new GraphElementData(this); } Style::Style(QString name, GraphElementData *data) : _name(name), _data(data) { + _data->setParent(this); } -bool Style::isNone() +bool Style::isNone() const { - return _data == 0; + return _name == "none"; } GraphElementData *Style::data() const @@ -44,25 +46,43 @@ QString Style::name() const QColor Style::strokeColor(bool tikzitOverride) const { - if (_data == 0) return QColor(Qt::black); - QString col = propertyWithDefault("draw", "black", tikzitOverride); return tikzit->colorByName(col); } +QColor Style::fillColor(bool tikzitOverride) const +{ + QString col = propertyWithDefault("fill", "white", tikzitOverride); + return tikzit->colorByName(col); +} + +QBrush Style::brush() const +{ + return QBrush(fillColor()); +} + +QString Style::shape(bool tikzitOverride) const +{ + return propertyWithDefault("shape", "circle", tikzitOverride); +} + + // TODO int Style::strokeThickness() const { return 1; } -QPen Style::pen() const +bool Style::isEdgeStyle() const { - QPen p(strokeColor()); - p.setWidthF((float)strokeThickness() * 3.0f); - return p; + if (_data->atom("-") || _data->atom("->") || _data->atom("-|") || + _data->atom("<-") || _data->atom("<->") || _data->atom("<-|") || + _data->atom("|-") || _data->atom("|->") || _data->atom("|-|")) return true; + else return false; } + + QString Style::propertyWithDefault(QString prop, QString def, bool tikzitOverride) const { if (_data == 0) return def; @@ -86,3 +106,147 @@ void Style::setName(const QString &name) { _name = name; } + +Style::ArrowTipStyle Style::arrowHead() const +{ + if (_data->atom("->") || _data->atom("<->") || _data->atom("|->")) return Pointer; + if (_data->atom("-|") || _data->atom("<-|") || _data->atom("|-|")) return Flat; + return NoTip; +} + +Style::ArrowTipStyle Style::arrowTail() const +{ + if (_data->atom("<-") || _data->atom("<->") || _data->atom("<-|")) return Pointer; + if (_data->atom("|-") || _data->atom("|->") || _data->atom("|-|")) return Flat; + return NoTip; +} + +Style::DrawStyle Style::drawStyle() const +{ + if (_data->atom("dashed")) return Dashed; + if (_data->atom("dotted")) return Dotted; + return Solid; +} + + +QPen Style::pen() const +{ + QPen p(strokeColor()); + p.setWidthF((float)strokeThickness() * 2.0f); + + QVector pat; + switch (drawStyle()) { + case Dashed: + pat << 3.0 << 3.0; + p.setDashPattern(pat); + break; + case Dotted: + pat << 1.0 << 1.0; + p.setDashPattern(pat); + break; + case Solid: + break; + } + + return p; +} + +QPainterPath Style::path() const +{ + QPainterPath pth; + QString sh = shape(); + + if (sh == "rectangle") { + pth.addRect(-30.0f, -30.0f, 60.0f, 60.0f); + } else { // default is 'circle' + pth.addEllipse(QPointF(0.0f,0.0f), 30.0f, 30.0f); + } + return pth; +} + +QIcon Style::icon() const +{ + if (!isEdgeStyle()) { + // draw an icon matching the style + QImage px(100,100,QImage::Format_ARGB32_Premultiplied); + px.fill(Qt::transparent); + + + QPainter painter(&px); + painter.setRenderHint(QPainter::Antialiasing); + QPainterPath pth = path(); + pth.translate(50.0f, 50.0f); + + if (isNone()) { + QColor c(180,180,200); + painter.setPen(QPen(c)); + painter.setBrush(QBrush(c)); + painter.drawEllipse(QPointF(50.0f,50.0f), 3,3); + + QPen pen(QColor(180,180,220)); + pen.setWidth(3); + QVector p; + p << 2.0 << 2.0; + pen.setDashPattern(p); + painter.setPen(pen); + painter.setBrush(Qt::NoBrush); + painter.drawPath(pth); + } else { + painter.setPen(pen()); + painter.setBrush(brush()); + painter.drawPath(pth); + } + + return QIcon(QPixmap::fromImage(px)); + } else { + // draw an icon matching the style + QPixmap px(100,100); + px.fill(Qt::transparent); + QPainter painter(&px); + + if (_data == 0) { + QPen pen(Qt::black); + pen.setWidth(3); + } else { + painter.setPen(pen()); + } + + painter.drawLine(10, 50, 90, 50); + + QPen pn = pen(); + pn.setStyle(Qt::SolidLine); + painter.setPen(pn); + + switch (arrowHead()) { + case Pointer: + painter.drawLine(90,50,80,40); + painter.drawLine(90,50,80,60); + break; + case Flat: + painter.drawLine(90,40,90,60); + break; + case NoTip: + break; + } + + switch (arrowTail()) { + case Pointer: + painter.drawLine(10,50,20,40); + painter.drawLine(10,50,20,60); + break; + case Flat: + painter.drawLine(10,40,10,60); + break; + case NoTip: + break; + } + + + return QIcon(px); + } +} + +QString Style::category() const +{ + return propertyWithDefault("tikzit category", "", false); +} diff --git a/src/data/style.h b/src/data/style.h index cef7c7b..ca2e604 100644 --- a/src/data/style.h +++ b/src/data/style.h @@ -22,34 +22,53 @@ #include "graphelementdata.h" +#include #include #include #include #include #include -class Style +class Style : public QObject { + Q_OBJECT public: + enum ArrowTipStyle { + Flat, Pointer, NoTip + }; + + enum DrawStyle { + Solid, Dotted, Dashed + }; + Style(); Style(QString name, GraphElementData *data); - bool isNone(); + bool isNone() const; + bool isEdgeStyle() const; - // properties that both edges and nodes have + // for node and edge styles GraphElementData *data() const; QString name() const; QColor strokeColor(bool tikzitOverride=true) const; int strokeThickness() const; - - // methods that are implemented differently for edges and nodes - virtual QPen pen() const; - virtual QPainterPath path() const = 0; - virtual QPainterPath palettePath() const = 0; - virtual QIcon icon() const = 0; + QPen pen() const; + QPainterPath path() const; + QIcon icon() const; void setName(const QString &name); QString propertyWithDefault(QString prop, QString def, bool tikzitOverride=true) const; - QString tikz() const; + + // only relevant for node styles + QColor fillColor(bool tikzitOverride=true) const; + QBrush brush() const; + QString shape(bool tikzitOverride=true) const; + + // only relevant for edge styles + Style::ArrowTipStyle arrowHead() const; + Style::ArrowTipStyle arrowTail() const; + Style::DrawStyle drawStyle() const; + QString category() const; + protected: QString _name; GraphElementData *_data; diff --git a/src/data/tikzstyles.cpp b/src/data/tikzstyles.cpp index a827db5..e3a735c 100644 --- a/src/data/tikzstyles.cpp +++ b/src/data/tikzstyles.cpp @@ -27,13 +27,14 @@ TikzStyles::TikzStyles(QObject *parent) : QObject(parent) { + _nodeStyles = new NodeStyleList(this); } NodeStyle *TikzStyles::nodeStyle(QString name) const { - foreach (NodeStyle *s , _nodeStyles) - if (s->name() == name) return s; - return unknownStyle; + NodeStyle *s = _nodeStyles->style(name); + + return (s == nullptr) ? unknownStyle : s; } EdgeStyle *TikzStyles::edgeStyle(QString name) const @@ -43,14 +44,10 @@ EdgeStyle *TikzStyles::edgeStyle(QString name) const return noneEdgeStyle; } -QVector TikzStyles::nodeStyles() const -{ - return _nodeStyles; -} void TikzStyles::clear() { - _nodeStyles.clear(); + _nodeStyles->clear(); _edgeStyles.clear(); } @@ -102,7 +99,9 @@ void TikzStyles::refreshModels(QStandardItemModel *nodeModel, QStandardItemModel it->setSizeHint(QSize(48,48)); } - foreach(NodeStyle *ns, _nodeStyles) { + NodeStyle *ns; + for (int i = 0; i < _nodeStyles->length(); ++i) { + ns = _nodeStyles->style(i); if (category == "" || category == ns->propertyWithDefault("tikzit category", "", false)) { it = new QStandardItem(ns->icon(), ns->name()); @@ -131,16 +130,15 @@ void TikzStyles::refreshModels(QStandardItemModel *nodeModel, QStandardItemModel } } -QVector TikzStyles::edgeStyles() const -{ - return _edgeStyles; -} - QStringList TikzStyles::categories() const { QMap cats; // use a QMap to keep keys sorted cats.insert("", true); - foreach (NodeStyle *s, _nodeStyles) cats.insert(s->propertyWithDefault("tikzit category", "", false), true); + NodeStyle *ns; + for (int i = 0; i < _nodeStyles->length(); ++i) { + ns = _nodeStyles->style(i); + cats.insert(ns->propertyWithDefault("tikzit category", "", false), true); + } //foreach (EdgeStyle *s, _edgeStyles) cats << s->propertyWithDefault("tikzit category", "", false); return QStringList(cats.keys()); } @@ -156,10 +154,10 @@ QString TikzStyles::tikz() const code << "% \\tikzstyle{NAME}=[PROPERTY LIST]\n\n"; code << "% Node styles\n"; - foreach (NodeStyle *s, nodeStyles()) code << s->tikz() << "\n"; + code << _nodeStyles->tikz(); code << "\n% Edge styles\n"; - foreach (EdgeStyle *s, edgeStyles()) code << s->tikz() << "\n"; + foreach (EdgeStyle *s, _edgeStyles) code << s->tikz() << "\n"; code.flush(); return str; @@ -173,7 +171,7 @@ void TikzStyles::addStyle(QString name, GraphElementData *data) { // edge style _edgeStyles << new EdgeStyle(name, data); } else { // node style - _nodeStyles << new NodeStyle(name, data); + _nodeStyles->addStyle(new NodeStyle(name, data)); } } diff --git a/src/data/tikzstyles.h b/src/data/tikzstyles.h index 558901e..68bd9ce 100644 --- a/src/data/tikzstyles.h +++ b/src/data/tikzstyles.h @@ -20,7 +20,7 @@ #define PROJECT_H #include "graphelementdata.h" -#include "nodestyle.h" +#include "nodestylelist.h" #include "edgestyle.h" #include @@ -37,8 +37,6 @@ public: NodeStyle *nodeStyle(QString name) const; EdgeStyle *edgeStyle(QString name) const; - QVector nodeStyles() const; - QVector edgeStyles() const; QStringList categories() const; QString tikz() const; void clear(); @@ -55,7 +53,7 @@ signals: public slots: private: - QVector _nodeStyles; + NodeStyleList *_nodeStyles; QVector _edgeStyles; QStringList _colNames; QVector _cols; diff --git a/tikzit.pro b/tikzit.pro index 0cb4c9c..79cb6c6 100644 --- a/tikzit.pro +++ b/tikzit.pro @@ -1,111 +1,113 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2017-01-11T17:30:16 -# -#------------------------------------------------- - -QT += core gui widgets -CONFIG += testcase - -TARGET = tikzit -TEMPLATE = app - -win32:RC_ICONS += images/tikzit.ico -win32:RC_ICONS += images/tikzdoc.ico - -# The following define makes your compiler emit warnings if you use -# any feature of Qt which as been marked as deprecated (the exact warnings -# depend on your compiler). Please consult the documentation of the -# deprecated API in order to know how to port your code away from it. -DEFINES += QT_DEPRECATED_WARNINGS - -# You can also make your code fail to compile if you use deprecated APIs. -# In order to do so, uncomment the following line. -# You can also select to disable deprecated APIs only up to a certain version of Qt. -#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 - -FLEXSOURCES = src/data/tikzlexer.l -BISONSOURCES = src/data/tikzparser.y - -include(flex.pri) -include(bison.pri) - -SOURCES += src/gui/mainwindow.cpp \ - src/gui/toolpalette.cpp \ - src/gui/tikzscene.cpp \ - src/data/graph.cpp \ - src/data/node.cpp \ - src/data/edge.cpp \ - src/data/graphelementdata.cpp \ - src/data/graphelementproperty.cpp \ - src/gui/propertypalette.cpp \ - src/gui/tikzview.cpp \ - src/gui/nodeitem.cpp \ - src/gui/edgeitem.cpp \ - src/tikzit.cpp \ - src/data/nodestyle.cpp \ - src/gui/commands.cpp \ - src/data/tikzdocument.cpp \ - src/gui/undocommands.cpp \ - src/gui/mainmenu.cpp \ - src/util.cpp \ - src/gui/stylepalette.cpp \ - src/data/tikzassembler.cpp \ - src/data/tikzstyles.cpp \ - src/data/edgestyle.cpp \ - src/data/style.cpp \ - src/gui/styleeditor.cpp - -HEADERS += src/gui/mainwindow.h \ - src/gui/toolpalette.h \ - src/gui/tikzscene.h \ - src/data/graph.h \ - src/data/node.h \ - src/data/edge.h \ - src/data/graphelementdata.h \ - src/data/graphelementproperty.h \ - src/gui/propertypalette.h \ - src/data/tikzparserdefs.h \ - src/gui/tikzview.h \ - src/gui/nodeitem.h \ - src/tikzit.h \ - src/gui/edgeitem.h \ - src/data/nodestyle.h \ - src/gui/commands.h \ - src/data/tikzdocument.h \ - src/gui/undocommands.h \ - src/gui/mainmenu.h \ - src/util.h \ - src/gui/stylepalette.h \ - src/data/tikzassembler.h \ - src/data/tikzstyles.h \ - src/data/edgestyle.h \ - src/data/style.h \ - src/gui/styleeditor.h - -FORMS += src/gui/mainwindow.ui \ - src/gui/propertypalette.ui \ - src/gui/mainmenu.ui \ - src/gui/stylepalette.ui \ - src/gui/styleeditor.ui - -INCLUDEPATH += src src/gui src/data - -DISTFILES += - -RESOURCES += tikzit.qrc - -test { - QT += testlib - TARGET = UnitTests - SOURCES -= src/main.cpp - HEADERS += src/test/testtest.h \ - src/test/testparser.h \ - src/test/testtikzoutput.h - SOURCES += src/test/testmain.cpp \ - src/test/testtest.cpp \ - src/test/testparser.cpp \ - src/test/testtikzoutput.cpp -} else { - SOURCES += src/main.cpp -} +#------------------------------------------------- +# +# Project created by QtCreator 2017-01-11T17:30:16 +# +#------------------------------------------------- + +QT += core gui widgets +CONFIG += testcase + +TARGET = tikzit +TEMPLATE = app + +win32:RC_ICONS += images/tikzit.ico +win32:RC_ICONS += images/tikzdoc.ico + +# The following define makes your compiler emit warnings if you use +# any feature of Qt which as been marked as deprecated (the exact warnings +# depend on your compiler). Please consult the documentation of the +# deprecated API in order to know how to port your code away from it. +DEFINES += QT_DEPRECATED_WARNINGS + +# You can also make your code fail to compile if you use deprecated APIs. +# In order to do so, uncomment the following line. +# You can also select to disable deprecated APIs only up to a certain version of Qt. +#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 + +FLEXSOURCES = src/data/tikzlexer.l +BISONSOURCES = src/data/tikzparser.y + +include(flex.pri) +include(bison.pri) + +SOURCES += src/gui/mainwindow.cpp \ + src/gui/toolpalette.cpp \ + src/gui/tikzscene.cpp \ + src/data/graph.cpp \ + src/data/node.cpp \ + src/data/edge.cpp \ + src/data/graphelementdata.cpp \ + src/data/graphelementproperty.cpp \ + src/gui/propertypalette.cpp \ + src/gui/tikzview.cpp \ + src/gui/nodeitem.cpp \ + src/gui/edgeitem.cpp \ + src/tikzit.cpp \ + src/data/nodestyle.cpp \ + src/gui/commands.cpp \ + src/data/tikzdocument.cpp \ + src/gui/undocommands.cpp \ + src/gui/mainmenu.cpp \ + src/util.cpp \ + src/gui/stylepalette.cpp \ + src/data/tikzassembler.cpp \ + src/data/tikzstyles.cpp \ + src/data/edgestyle.cpp \ + src/data/style.cpp \ + src/gui/styleeditor.cpp \ + src/data/nodestylelist.cpp + +HEADERS += src/gui/mainwindow.h \ + src/gui/toolpalette.h \ + src/gui/tikzscene.h \ + src/data/graph.h \ + src/data/node.h \ + src/data/edge.h \ + src/data/graphelementdata.h \ + src/data/graphelementproperty.h \ + src/gui/propertypalette.h \ + src/data/tikzparserdefs.h \ + src/gui/tikzview.h \ + src/gui/nodeitem.h \ + src/tikzit.h \ + src/gui/edgeitem.h \ + src/data/nodestyle.h \ + src/gui/commands.h \ + src/data/tikzdocument.h \ + src/gui/undocommands.h \ + src/gui/mainmenu.h \ + src/util.h \ + src/gui/stylepalette.h \ + src/data/tikzassembler.h \ + src/data/tikzstyles.h \ + src/data/edgestyle.h \ + src/data/style.h \ + src/gui/styleeditor.h \ + src/data/nodestylelist.h + +FORMS += src/gui/mainwindow.ui \ + src/gui/propertypalette.ui \ + src/gui/mainmenu.ui \ + src/gui/stylepalette.ui \ + src/gui/styleeditor.ui + +INCLUDEPATH += src src/gui src/data + +DISTFILES += + +RESOURCES += tikzit.qrc + +test { + QT += testlib + TARGET = UnitTests + SOURCES -= src/main.cpp + HEADERS += src/test/testtest.h \ + src/test/testparser.h \ + src/test/testtikzoutput.h + SOURCES += src/test/testmain.cpp \ + src/test/testtest.cpp \ + src/test/testparser.cpp \ + src/test/testtikzoutput.cpp +} else { + SOURCES += src/main.cpp +} -- cgit v1.2.3 From c0b8dea3d3b93fd4b87e5311b6c6422a7ccdb723 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Sat, 6 Oct 2018 16:06:06 +0200 Subject: removed EdgeStyle and NodeStyle classes --- src/data/edge.cpp | 2 +- src/data/edge.h | 6 +- src/data/edgestyle.cpp | 137 --------------------------------------------- src/data/edgestyle.h | 56 ------------------ src/data/node.cpp | 2 +- src/data/node.h | 6 +- src/data/nodestyle.cpp | 112 ------------------------------------ src/data/nodestyle.h | 49 ---------------- src/data/nodestylelist.cpp | 15 ++--- src/data/nodestylelist.h | 12 ++-- src/data/style.cpp | 4 ++ src/data/style.h | 5 ++ src/data/tikzstyles.cpp | 26 ++++----- src/data/tikzstyles.h | 8 +-- src/gui/edgeitem.cpp | 12 ++-- src/gui/styleeditor.cpp | 12 ++-- src/gui/styleeditor.h | 7 +-- src/tikzit.h | 1 - tikzit.pro | 4 -- 19 files changed, 62 insertions(+), 414 deletions(-) delete mode 100644 src/data/edgestyle.cpp delete mode 100644 src/data/edgestyle.h delete mode 100644 src/data/nodestyle.cpp delete mode 100644 src/data/nodestyle.h diff --git a/src/data/edge.cpp b/src/data/edge.cpp index ca63954..0ae566b 100644 --- a/src/data/edge.cpp +++ b/src/data/edge.cpp @@ -401,7 +401,7 @@ void Edge::attachStyle() else _style = tikzit->styles()->edgeStyle(nm); } -EdgeStyle * Edge::style() const +Style *Edge::style() const { return _style; } diff --git a/src/data/edge.h b/src/data/edge.h index 85959bb..ad71364 100644 --- a/src/data/edge.h +++ b/src/data/edge.h @@ -21,7 +21,7 @@ #include "graphelementdata.h" #include "node.h" -#include "edgestyle.h" +#include "style.h" #include #include @@ -85,7 +85,7 @@ public: void attachStyle(); QString styleName() const; void setStyleName(const QString & styleName); - EdgeStyle *style() const; + Style *style() const; signals: @@ -105,7 +105,7 @@ private: Node *_target; - EdgeStyle *_style; + Style *_style; bool _dirty; bool _basicBendMode; diff --git a/src/data/edgestyle.cpp b/src/data/edgestyle.cpp deleted file mode 100644 index 7897c6f..0000000 --- a/src/data/edgestyle.cpp +++ /dev/null @@ -1,137 +0,0 @@ -/* - TikZiT - a GUI diagram editor for TikZ - Copyright (C) 2018 Aleks Kissinger - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -*/ - -#include "edgestyle.h" - -#include -#include - -EdgeStyle *noneEdgeStyle = new EdgeStyle("none", new GraphElementData({GraphElementProperty("-")})); - -EdgeStyle::EdgeStyle() : Style() -{ -} - -EdgeStyle::EdgeStyle(QString name, GraphElementData *data) : Style(name, data) -{ -} - -//EdgeStyle::ArrowTipStyle EdgeStyle::arrowHead() const -//{ -// if (_data == 0) return NoTip; - -// if (_data->atom("->") || _data->atom("<->") || _data->atom("|->")) return Pointer; -// if (_data->atom("-|") || _data->atom("<-|") || _data->atom("|-|")) return Flat; -// return NoTip; -//} - -//EdgeStyle::ArrowTipStyle EdgeStyle::arrowTail() const -//{ -// if (_data == 0) return NoTip; -// if (_data->atom("<-") || _data->atom("<->") || _data->atom("<-|")) return Pointer; -// if (_data->atom("|-") || _data->atom("|->") || _data->atom("|-|")) return Flat; -// return NoTip; -//} - -//EdgeStyle::DrawStyle EdgeStyle::drawStyle() const -//{ -// if (_data == 0) return Solid; -// if (_data->atom("dashed")) return Dashed; -// if (_data->atom("dotted")) return Dotted; -// return Solid; -//} - -//QPen EdgeStyle::pen() const -//{ -// QPen p(strokeColor()); -// p.setWidthF((float)strokeThickness() * 2.0f); - -// QVector pat; -// switch (drawStyle()) { -// case Dashed: -// pat << 3.0 << 3.0; -// p.setDashPattern(pat); -// break; -// case Dotted: -// pat << 1.0 << 1.0; -// p.setDashPattern(pat); -// break; -// case Solid: -// break; -// } - -// return p; -//} - -//QPainterPath EdgeStyle::path() const -//{ -// return QPainterPath(); -//} - -//QPainterPath EdgeStyle::palettePath() const -//{ -// return QPainterPath(); -//} - -//QIcon EdgeStyle::icon() const -//{ -// // draw an icon matching the style -// QPixmap px(100,100); -// px.fill(Qt::transparent); -// QPainter painter(&px); - -// if (_data == 0) { -// QPen pen(Qt::black); -// pen.setWidth(3); -// } else { -// painter.setPen(pen()); -// } - -// painter.drawLine(10, 50, 90, 50); - -// QPen pn = pen(); -// pn.setStyle(Qt::SolidLine); -// painter.setPen(pn); - -// switch (arrowHead()) { -// case Pointer: -// painter.drawLine(90,50,80,40); -// painter.drawLine(90,50,80,60); -// break; -// case Flat: -// painter.drawLine(90,40,90,60); -// break; -// case NoTip: -// break; -// } - -// switch (arrowTail()) { -// case Pointer: -// painter.drawLine(10,50,20,40); -// painter.drawLine(10,50,20,60); -// break; -// case Flat: -// painter.drawLine(10,40,10,60); -// break; -// case NoTip: -// break; -// } - - -// return QIcon(px); -//} diff --git a/src/data/edgestyle.h b/src/data/edgestyle.h deleted file mode 100644 index 0e7b554..0000000 --- a/src/data/edgestyle.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - TikZiT - a GUI diagram editor for TikZ - Copyright (C) 2018 Aleks Kissinger - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -*/ - -#ifndef EDGESTYLE_H -#define EDGESTYLE_H - -#include "style.h" - -#include -#include -#include -#include -#include - -class EdgeStyle : public Style -{ -public: - EdgeStyle(); - EdgeStyle(QString name, GraphElementData *data); - -// enum ArrowTipStyle { -// Flat, Pointer, NoTip -// }; - -// enum DrawStyle { -// Solid, Dotted, Dashed -// }; - -// ArrowTipStyle arrowHead() const; -// ArrowTipStyle arrowTail() const; -// DrawStyle drawStyle() const; - -// QPen pen() const override; -// QPainterPath path() const override; -// QPainterPath palettePath() const override; -// QIcon icon() const override; -}; - -extern EdgeStyle *noneEdgeStyle; - -#endif // EDGESTYLE_H diff --git a/src/data/node.cpp b/src/data/node.cpp index a4ee39b..75acd00 100644 --- a/src/data/node.cpp +++ b/src/data/node.cpp @@ -102,7 +102,7 @@ void Node::attachStyle() else _style = tikzit->styles()->nodeStyle(nm); } -NodeStyle *Node::style() const +Style *Node::style() const { return _style; } diff --git a/src/data/node.h b/src/data/node.h index 111bf19..490393d 100644 --- a/src/data/node.h +++ b/src/data/node.h @@ -20,7 +20,7 @@ #define NODE_H #include "graphelementdata.h" -#include "nodestyle.h" +#include "style.h" #include #include @@ -51,7 +51,7 @@ public: void setStyleName(const QString &styleName); void attachStyle(); - NodeStyle *style() const; + Style *style() const; bool isBlankNode(); @@ -66,7 +66,7 @@ private: QPointF _point; QString _name; QString _label; - NodeStyle *_style; + Style *_style; GraphElementData *_data; int _tikzLine; }; diff --git a/src/data/nodestyle.cpp b/src/data/nodestyle.cpp deleted file mode 100644 index b379565..0000000 --- a/src/data/nodestyle.cpp +++ /dev/null @@ -1,112 +0,0 @@ -/* - TikZiT - a GUI diagram editor for TikZ - Copyright (C) 2018 Aleks Kissinger - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -*/ - -#include "nodestyle.h" -#include "tikzit.h" - -#include -#include - -NodeStyle *noneStyle = new NodeStyle(); -NodeStyle *unknownStyle = new NodeStyle("unknown", new GraphElementData({GraphElementProperty("tikzit fill", "blue")})); - -NodeStyle::NodeStyle() : Style() -{ -} - - -NodeStyle::NodeStyle(QString name, GraphElementData *data): Style(name, data) -{ -} - -//QColor NodeStyle::fillColor(bool tikzitOverride) const -//{ -// if (_data == 0) return Qt::white; - -// QString col = propertyWithDefault("fill", "white", tikzitOverride); -// return tikzit->colorByName(col); -//} - -//QBrush NodeStyle::brush() const -//{ -// return QBrush(fillColor()); -//} - -//QString NodeStyle::shape(bool tikzitOverride) const -//{ -// return propertyWithDefault("shape", "circle", tikzitOverride); -//} - -//QPainterPath NodeStyle::path() const -//{ -// QPainterPath pth; -// QString sh = shape(); - -// if (sh == "rectangle") { -// pth.addRect(-30.0f, -30.0f, 60.0f, 60.0f); -// } else { // default is 'circle' -// pth.addEllipse(QPointF(0.0f,0.0f), 30.0f, 30.0f); -// } -// return pth; -//} - -//QPainterPath NodeStyle::palettePath() const -//{ -// return path(); -//} - -//QIcon NodeStyle::icon() const -//{ -// // draw an icon matching the style -// QImage px(100,100,QImage::Format_ARGB32_Premultiplied); -// px.fill(Qt::transparent); - - -// QPainter painter(&px); -// painter.setRenderHint(QPainter::Antialiasing); -// QPainterPath pth = path(); -// pth.translate(50.0f, 50.0f); - -// if (_data == 0) { -// QColor c(180,180,200); -// painter.setPen(QPen(c)); -// painter.setBrush(QBrush(c)); -// painter.drawEllipse(QPointF(50.0f,50.0f), 3,3); - -// QPen pen(QColor(180,180,220)); -// pen.setWidth(3); -// QVector p; -// p << 2.0 << 2.0; -// pen.setDashPattern(p); -// painter.setPen(pen); -// painter.setBrush(Qt::NoBrush); -// painter.drawPath(pth); -// } else { -// painter.setPen(pen()); -// painter.setBrush(brush()); -// painter.drawPath(pth); -// } - -// return QIcon(QPixmap::fromImage(px)); -//} - -//QString NodeStyle::category() -//{ -// return propertyWithDefault("tikzit category", "", false); -//} - diff --git a/src/data/nodestyle.h b/src/data/nodestyle.h deleted file mode 100644 index 36bd5d5..0000000 --- a/src/data/nodestyle.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - TikZiT - a GUI diagram editor for TikZ - Copyright (C) 2018 Aleks Kissinger - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -*/ - -#ifndef NODESTYLE_H -#define NODESTYLE_H - -#include "style.h" - -#include -#include -#include -#include -#include - -class NodeStyle : public Style -{ -public: - NodeStyle(); - NodeStyle(QString name, GraphElementData *data); - -// QColor fillColor(bool tikzitOverride=true) const; -// QBrush brush() const; -// QPainterPath path() const override; -// QString shape(bool tikzitOverride=true) const; - -// QPainterPath palettePath() const override; -// QIcon icon() const override; - -}; - -extern NodeStyle *noneStyle; -extern NodeStyle *unknownStyle; - -#endif // NODESTYLE_H diff --git a/src/data/nodestylelist.cpp b/src/data/nodestylelist.cpp index 41749db..7f17ff0 100644 --- a/src/data/nodestylelist.cpp +++ b/src/data/nodestylelist.cpp @@ -6,14 +6,14 @@ NodeStyleList::NodeStyleList(QObject *parent) : QAbstractListModel(parent) { } -NodeStyle *NodeStyleList::style(QString name) +Style *NodeStyleList::style(QString name) { - foreach (NodeStyle *s, _styles) + foreach (Style *s, _styles) if (s->name() == name) return s; return nullptr; } -NodeStyle *NodeStyleList::style(int i) +Style *NodeStyleList::style(int i) { return _styles[i]; } @@ -23,8 +23,9 @@ int NodeStyleList::length() const return _styles.length(); } -void NodeStyleList::addStyle(NodeStyle *s) +void NodeStyleList::addStyle(Style *s) { + s->setParent(this); if (s->category() == _category) { int n = numInCategory(); beginInsertRows(QModelIndex(), n, n); @@ -53,7 +54,7 @@ QString NodeStyleList::tikz() { QString str; QTextStream code(&str); - foreach (NodeStyle *s, _styles) code << s->tikz() << "\n"; + foreach (Style *s, _styles) code << s->tikz() << "\n"; code.flush(); return str; } @@ -61,7 +62,7 @@ QString NodeStyleList::tikz() int NodeStyleList::numInCategory() const { int c = 0; - foreach (NodeStyle *s, _styles) { + foreach (Style *s, _styles) { if (_category == "" || s->category() == _category) { ++c; } @@ -81,7 +82,7 @@ int NodeStyleList::nthInCategory(int n) const return -1; } -NodeStyle *NodeStyleList::styleInCategory(int n) const +Style *NodeStyleList::styleInCategory(int n) const { return _styles[nthInCategory(n)]; } diff --git a/src/data/nodestylelist.h b/src/data/nodestylelist.h index 03f7ed5..5a53721 100644 --- a/src/data/nodestylelist.h +++ b/src/data/nodestylelist.h @@ -1,7 +1,7 @@ #ifndef NODESTYLELIST_H #define NODESTYLELIST_H -#include "nodestyle.h" +#include "style.h" #include @@ -10,16 +10,16 @@ class NodeStyleList : public QAbstractListModel Q_OBJECT public: explicit NodeStyleList(QObject *parent = nullptr); - NodeStyle *style(QString name); - NodeStyle *style(int i); + Style *style(QString name); + Style *style(int i); int length() const; - void addStyle(NodeStyle *s); + void addStyle(Style *s); void clear(); QString tikz(); int numInCategory() const; int nthInCategory(int n) const; - NodeStyle *styleInCategory(int n) const; + Style *styleInCategory(int n) const; QVariant data(const QModelIndex &index, int role) const override; int rowCount(const QModelIndex &/*parent*/) const override; @@ -33,7 +33,7 @@ signals: public slots: private: - QVector _styles; + QVector _styles; QString _category; }; diff --git a/src/data/style.cpp b/src/data/style.cpp index 39314cb..7af95ca 100644 --- a/src/data/style.cpp +++ b/src/data/style.cpp @@ -19,6 +19,10 @@ #include "style.h" #include "tikzit.h" +Style *noneStyle = new Style("none", new GraphElementData()); +Style *unknownStyle = new Style("unknown", new GraphElementData({GraphElementProperty("tikzit fill", "blue")})); +Style *noneEdgeStyle = new Style("none", new GraphElementData({GraphElementProperty("-")})); + Style::Style() : _name("none") { _data = new GraphElementData(this); diff --git a/src/data/style.h b/src/data/style.h index ca2e604..476af77 100644 --- a/src/data/style.h +++ b/src/data/style.h @@ -73,4 +73,9 @@ protected: QString _name; GraphElementData *_data; }; + +extern Style *noneStyle; +extern Style *unknownStyle; +extern Style *noneEdgeStyle; + #endif // STYLE_H diff --git a/src/data/tikzstyles.cpp b/src/data/tikzstyles.cpp index e3a735c..0645a72 100644 --- a/src/data/tikzstyles.cpp +++ b/src/data/tikzstyles.cpp @@ -17,7 +17,6 @@ */ #include "tikzstyles.h" -#include "nodestyle.h" #include "tikzassembler.h" #include @@ -30,16 +29,16 @@ TikzStyles::TikzStyles(QObject *parent) : QObject(parent) _nodeStyles = new NodeStyleList(this); } -NodeStyle *TikzStyles::nodeStyle(QString name) const +Style *TikzStyles::nodeStyle(QString name) const { - NodeStyle *s = _nodeStyles->style(name); + Style *s = _nodeStyles->style(name); return (s == nullptr) ? unknownStyle : s; } -EdgeStyle *TikzStyles::edgeStyle(QString name) const +Style *TikzStyles::edgeStyle(QString name) const { - foreach (EdgeStyle *s , _edgeStyles) + foreach (Style *s , _edgeStyles) if (s->name() == name) return s; return noneEdgeStyle; } @@ -99,7 +98,7 @@ void TikzStyles::refreshModels(QStandardItemModel *nodeModel, QStandardItemModel it->setSizeHint(QSize(48,48)); } - NodeStyle *ns; + Style *ns; for (int i = 0; i < _nodeStyles->length(); ++i) { ns = _nodeStyles->style(i); if (category == "" || category == ns->propertyWithDefault("tikzit category", "", false)) @@ -119,7 +118,7 @@ void TikzStyles::refreshModels(QStandardItemModel *nodeModel, QStandardItemModel edgeModel->appendRow(it); } - foreach(EdgeStyle *es, _edgeStyles) { + foreach(Style *es, _edgeStyles) { //if (category == "" || category == es->propertyWithDefault("tikzit category", "", false)) //{ it = new QStandardItem(es->icon(), es->name()); @@ -134,7 +133,7 @@ QStringList TikzStyles::categories() const { QMap cats; // use a QMap to keep keys sorted cats.insert("", true); - NodeStyle *ns; + Style *ns; for (int i = 0; i < _nodeStyles->length(); ++i) { ns = _nodeStyles->style(i); cats.insert(ns->propertyWithDefault("tikzit category", "", false), true); @@ -157,7 +156,7 @@ QString TikzStyles::tikz() const code << _nodeStyles->tikz(); code << "\n% Edge styles\n"; - foreach (EdgeStyle *s, _edgeStyles) code << s->tikz() << "\n"; + foreach (Style *s, _edgeStyles) code << s->tikz() << "\n"; code.flush(); return str; @@ -165,13 +164,12 @@ QString TikzStyles::tikz() const void TikzStyles::addStyle(QString name, GraphElementData *data) { - if (data->atom("-") || data->atom("->") || data->atom("-|") || - data->atom("<-") || data->atom("<->") || data->atom("<-|") || - data->atom("|-") || data->atom("|->") || data->atom("|-|")) + Style *s = new Style(name, data); + if (s->isEdgeStyle()) { // edge style - _edgeStyles << new EdgeStyle(name, data); + _edgeStyles << s; } else { // node style - _nodeStyles->addStyle(new NodeStyle(name, data)); + _nodeStyles->addStyle(new Style(name, data)); } } diff --git a/src/data/tikzstyles.h b/src/data/tikzstyles.h index 68bd9ce..fbb12ff 100644 --- a/src/data/tikzstyles.h +++ b/src/data/tikzstyles.h @@ -21,7 +21,7 @@ #include "graphelementdata.h" #include "nodestylelist.h" -#include "edgestyle.h" +#include "style.h" #include #include @@ -35,8 +35,8 @@ public: explicit TikzStyles(QObject *parent = 0); void addStyle(QString name, GraphElementData *data); - NodeStyle *nodeStyle(QString name) const; - EdgeStyle *edgeStyle(QString name) const; + Style *nodeStyle(QString name) const; + Style *edgeStyle(QString name) const; QStringList categories() const; QString tikz() const; void clear(); @@ -54,7 +54,7 @@ public slots: private: NodeStyleList *_nodeStyles; - QVector _edgeStyles; + QVector _edgeStyles; QStringList _colNames; QVector _cols; }; diff --git a/src/gui/edgeitem.cpp b/src/gui/edgeitem.cpp index 2f5b15c..48f321e 100644 --- a/src/gui/edgeitem.cpp +++ b/src/gui/edgeitem.cpp @@ -86,14 +86,14 @@ void EdgeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidge switch (_edge->style()->arrowHead()) { - case EdgeStyle::Flat: + case Style::Flat: { painter->drawLine( toScreen(_edge->head() + hLeft), toScreen(_edge->head() + hRight)); break; } - case EdgeStyle::Pointer: + case Style::Pointer: { QPainterPath pth; pth.moveTo(toScreen(_edge->head() + ht + hLeft)); @@ -102,7 +102,7 @@ void EdgeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidge painter->drawPath(pth); break; } - case EdgeStyle::NoTip: + case Style::NoTip: break; } @@ -112,14 +112,14 @@ void EdgeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidge //painter->setPen(pen); switch (_edge->style()->arrowTail()) { - case EdgeStyle::Flat: + case Style::Flat: { painter->drawLine( toScreen(_edge->tail() + tLeft), toScreen(_edge->tail() + tRight)); break; } - case EdgeStyle::Pointer: + case Style::Pointer: { QPainterPath pth; pth.moveTo(toScreen(_edge->tail() + tt + tLeft)); @@ -128,7 +128,7 @@ void EdgeItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidge painter->drawPath(pth); break; } - case EdgeStyle::NoTip: + case Style::NoTip: break; } diff --git a/src/gui/styleeditor.cpp b/src/gui/styleeditor.cpp index f6e3f48..46df095 100644 --- a/src/gui/styleeditor.cpp +++ b/src/gui/styleeditor.cpp @@ -368,26 +368,26 @@ void StyleEditor::refreshDisplay() ui->leftArrow->setEnabled(true); switch (_activeEdgeStyle->arrowTail()) { - case EdgeStyle::NoTip: + case Style::NoTip: ui->leftArrow->setCurrentText(""); break; - case EdgeStyle::Pointer: + case Style::Pointer: ui->leftArrow->setCurrentText("<"); break; - case EdgeStyle::Flat: + case Style::Flat: ui->leftArrow->setCurrentText("|"); break; } ui->rightArrow->setEnabled(true); switch (_activeEdgeStyle->arrowHead()) { - case EdgeStyle::NoTip: + case Style::NoTip: ui->rightArrow->setCurrentText(""); break; - case EdgeStyle::Pointer: + case Style::Pointer: ui->rightArrow->setCurrentText(">"); break; - case EdgeStyle::Flat: + case Style::Flat: ui->rightArrow->setCurrentText("|"); break; } diff --git a/src/gui/styleeditor.h b/src/gui/styleeditor.h index f5df025..e40facd 100644 --- a/src/gui/styleeditor.h +++ b/src/gui/styleeditor.h @@ -1,8 +1,7 @@ #ifndef STYLEEDITOR_H #define STYLEEDITOR_H -#include "nodestyle.h" -#include "edgestyle.h" +#include "style.h" #include "tikzstyles.h" #include @@ -62,8 +61,8 @@ private: QStandardItemModel *_nodeModel; QStandardItemModel *_edgeModel; QStandardItem *_activeItem; - NodeStyle *_activeNodeStyle; - EdgeStyle *_activeEdgeStyle; + Style *_activeNodeStyle; + Style *_activeEdgeStyle; //QString _activeCategory; Style *activeStyle(); TikzStyles *_styles; diff --git a/src/tikzit.h b/src/tikzit.h index 525696d..6612ff1 100644 --- a/src/tikzit.h +++ b/src/tikzit.h @@ -57,7 +57,6 @@ #include "toolpalette.h" #include "propertypalette.h" #include "stylepalette.h" -#include "nodestyle.h" #include "tikzstyles.h" #include diff --git a/tikzit.pro b/tikzit.pro index 79cb6c6..bd25e7d 100644 --- a/tikzit.pro +++ b/tikzit.pro @@ -43,7 +43,6 @@ SOURCES += src/gui/mainwindow.cpp \ src/gui/nodeitem.cpp \ src/gui/edgeitem.cpp \ src/tikzit.cpp \ - src/data/nodestyle.cpp \ src/gui/commands.cpp \ src/data/tikzdocument.cpp \ src/gui/undocommands.cpp \ @@ -52,7 +51,6 @@ SOURCES += src/gui/mainwindow.cpp \ src/gui/stylepalette.cpp \ src/data/tikzassembler.cpp \ src/data/tikzstyles.cpp \ - src/data/edgestyle.cpp \ src/data/style.cpp \ src/gui/styleeditor.cpp \ src/data/nodestylelist.cpp @@ -71,7 +69,6 @@ HEADERS += src/gui/mainwindow.h \ src/gui/nodeitem.h \ src/tikzit.h \ src/gui/edgeitem.h \ - src/data/nodestyle.h \ src/gui/commands.h \ src/data/tikzdocument.h \ src/gui/undocommands.h \ @@ -80,7 +77,6 @@ HEADERS += src/gui/mainwindow.h \ src/gui/stylepalette.h \ src/data/tikzassembler.h \ src/data/tikzstyles.h \ - src/data/edgestyle.h \ src/data/style.h \ src/gui/styleeditor.h \ src/data/nodestylelist.h -- cgit v1.2.3 From 263678a6d295d492351698db50a57c9db3bfe8ae Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Sat, 6 Oct 2018 19:55:55 +0200 Subject: switched to custom style model --- src/data/nodestylelist.cpp | 114 ---------------------------------------- src/data/nodestylelist.h | 40 -------------- src/data/stylelist.cpp | 127 +++++++++++++++++++++++++++++++++++++++++++++ src/data/stylelist.h | 41 +++++++++++++++ src/data/tikzstyles.cpp | 55 +++++++++++--------- src/data/tikzstyles.h | 9 ++-- src/gui/stylepalette.cpp | 21 ++++---- src/gui/stylepalette.h | 2 - tikzit.pro | 4 +- 9 files changed, 218 insertions(+), 195 deletions(-) delete mode 100644 src/data/nodestylelist.cpp delete mode 100644 src/data/nodestylelist.h create mode 100644 src/data/stylelist.cpp create mode 100644 src/data/stylelist.h diff --git a/src/data/nodestylelist.cpp b/src/data/nodestylelist.cpp deleted file mode 100644 index 7f17ff0..0000000 --- a/src/data/nodestylelist.cpp +++ /dev/null @@ -1,114 +0,0 @@ -#include "nodestylelist.h" - -#include - -NodeStyleList::NodeStyleList(QObject *parent) : QAbstractListModel(parent) -{ -} - -Style *NodeStyleList::style(QString name) -{ - foreach (Style *s, _styles) - if (s->name() == name) return s; - return nullptr; -} - -Style *NodeStyleList::style(int i) -{ - return _styles[i]; -} - -int NodeStyleList::length() const -{ - return _styles.length(); -} - -void NodeStyleList::addStyle(Style *s) -{ - s->setParent(this); - if (s->category() == _category) { - int n = numInCategory(); - beginInsertRows(QModelIndex(), n, n); - _styles << s; - endInsertRows(); - } else { - _styles << s; - } -} - -void NodeStyleList::clear() -{ - int n = numInCategory(); - if (n > 0) { - beginRemoveRows(QModelIndex(), 0, n - 1); - _styles.clear(); - endRemoveRows(); - } else { - _styles.clear(); - } - - _category = ""; -} - -QString NodeStyleList::tikz() -{ - QString str; - QTextStream code(&str); - foreach (Style *s, _styles) code << s->tikz() << "\n"; - code.flush(); - return str; -} - -int NodeStyleList::numInCategory() const -{ - int c = 0; - foreach (Style *s, _styles) { - if (_category == "" || s->category() == _category) { - ++c; - } - } - return c; -} - -int NodeStyleList::nthInCategory(int n) const -{ - int c = 0; - for (int j = 0; j < _styles.length(); ++j) { - if (_category == "" || _styles[j]->category() == _category) { - if (c == n) return j; - else ++c; - } - } - return -1; -} - -Style *NodeStyleList::styleInCategory(int n) const -{ - return _styles[nthInCategory(n)]; -} - -QVariant NodeStyleList::data(const QModelIndex &index, int role) const -{ - if (role == Qt::DisplayRole) { - return QVariant(styleInCategory(index.row())->name()); - } else if (role == Qt::DecorationRole) { - return QVariant(styleInCategory(index.row())->icon()); - } else { - return QVariant(); - } -} - -int NodeStyleList::rowCount(const QModelIndex &/*parent*/) const -{ - return numInCategory(); -} - -QString NodeStyleList::category() const -{ - return _category; -} - -void NodeStyleList::setCategory(const QString &category) -{ - _category = category; -} diff --git a/src/data/nodestylelist.h b/src/data/nodestylelist.h deleted file mode 100644 index 5a53721..0000000 --- a/src/data/nodestylelist.h +++ /dev/null @@ -1,40 +0,0 @@ -#ifndef NODESTYLELIST_H -#define NODESTYLELIST_H - -#include "style.h" - -#include - -class NodeStyleList : public QAbstractListModel -{ - Q_OBJECT -public: - explicit NodeStyleList(QObject *parent = nullptr); - Style *style(QString name); - Style *style(int i); - int length() const; - void addStyle(Style *s); - void clear(); - QString tikz(); - - int numInCategory() const; - int nthInCategory(int n) const; - Style *styleInCategory(int n) const; - - QVariant data(const QModelIndex &index, int role) const override; - int rowCount(const QModelIndex &/*parent*/) const override; - - - QString category() const; - void setCategory(const QString &category); - -signals: - -public slots: - -private: - QVector _styles; - QString _category; -}; - -#endif // NODESTYLELIST_H diff --git a/src/data/stylelist.cpp b/src/data/stylelist.cpp new file mode 100644 index 0000000..2c79d10 --- /dev/null +++ b/src/data/stylelist.cpp @@ -0,0 +1,127 @@ +#include "stylelist.h" + +#include + +StyleList::StyleList(bool edgeStyles, QObject *parent) : QAbstractListModel(parent), _edgeStyles(edgeStyles) +{ + if (edgeStyles) { + _styles << noneEdgeStyle; + } else { + _styles << noneStyle; + } +} + +Style *StyleList::style(QString name) +{ + foreach (Style *s, _styles) + if (s->name() == name) return s; + return nullptr; +} + +Style *StyleList::style(int i) +{ + return _styles[i]; +} + +int StyleList::length() const +{ + return _styles.length(); +} + +void StyleList::addStyle(Style *s) +{ + s->setParent(this); + if (s->category() == _category) { + int n = numInCategory(); + beginInsertRows(QModelIndex(), n, n); + _styles << s; + endInsertRows(); + } else { + _styles << s; + } +} + +void StyleList::clear() +{ + int n = numInCategory(); + if (n > 0) { + beginRemoveRows(QModelIndex(), 1, n - 1); + _styles.clear(); + if (_edgeStyles) _styles << noneEdgeStyle; + else _styles << noneStyle; + endRemoveRows(); + } else { + _styles.clear(); + if (_edgeStyles) _styles << noneEdgeStyle; + else _styles << noneStyle; + } + + _category = ""; +} + +QString StyleList::tikz() +{ + QString str; + QTextStream code(&str); + foreach (Style *s, _styles) code << s->tikz() << "\n"; + code.flush(); + return str; +} + +int StyleList::numInCategory() const +{ + int c = 0; + foreach (Style *s, _styles) { + if (_category == "" || s->isNone() || s->category() == _category) { + ++c; + } + } + return c; +} + +int StyleList::nthInCategory(int n) const +{ + int c = 0; + for (int j = 0; j < _styles.length(); ++j) { + if (_category == "" || _styles[j]->isNone() || _styles[j]->category() == _category) { + if (c == n) return j; + else ++c; + } + } + return -1; +} + +Style *StyleList::styleInCategory(int n) const +{ + return _styles[nthInCategory(n)]; +} + +QVariant StyleList::data(const QModelIndex &index, int role) const +{ + if (role == Qt::DisplayRole) { + return QVariant(styleInCategory(index.row())->name()); + } else if (role == Qt::DecorationRole) { + return QVariant(styleInCategory(index.row())->icon()); + } else { + return QVariant(); + } +} + +int StyleList::rowCount(const QModelIndex &/*parent*/) const +{ + return numInCategory(); +} + +QString StyleList::category() const +{ + return _category; +} + +void StyleList::setCategory(const QString &category) +{ + if (category != _category) { + beginResetModel(); + _category = category; + endResetModel(); + } +} diff --git a/src/data/stylelist.h b/src/data/stylelist.h new file mode 100644 index 0000000..f698761 --- /dev/null +++ b/src/data/stylelist.h @@ -0,0 +1,41 @@ +#ifndef NODESTYLELIST_H +#define NODESTYLELIST_H + +#include "style.h" + +#include + +class StyleList : public QAbstractListModel +{ + Q_OBJECT +public: + explicit StyleList(bool edgeStyles = false, QObject *parent = nullptr); + Style *style(QString name); + Style *style(int i); + int length() const; + void addStyle(Style *s); + void clear(); + QString tikz(); + + int numInCategory() const; + int nthInCategory(int n) const; + Style *styleInCategory(int n) const; + + QVariant data(const QModelIndex &index, int role) const override; + int rowCount(const QModelIndex &/*parent*/) const override; + + + QString category() const; + void setCategory(const QString &category); + +signals: + +public slots: + +private: + QVector _styles; + QString _category; + bool _edgeStyles; +}; + +#endif // NODESTYLELIST_H diff --git a/src/data/tikzstyles.cpp b/src/data/tikzstyles.cpp index 0645a72..522b3f5 100644 --- a/src/data/tikzstyles.cpp +++ b/src/data/tikzstyles.cpp @@ -26,7 +26,8 @@ TikzStyles::TikzStyles(QObject *parent) : QObject(parent) { - _nodeStyles = new NodeStyleList(this); + _nodeStyles = new StyleList(false, this); + _edgeStyles = new StyleList(true, this); } Style *TikzStyles::nodeStyle(QString name) const @@ -38,16 +39,15 @@ Style *TikzStyles::nodeStyle(QString name) const Style *TikzStyles::edgeStyle(QString name) const { - foreach (Style *s , _edgeStyles) - if (s->name() == name) return s; - return noneEdgeStyle; + Style *s = _edgeStyles->style(name); + return (s == nullptr) ? noneEdgeStyle : s; } void TikzStyles::clear() { _nodeStyles->clear(); - _edgeStyles.clear(); + _edgeStyles->clear(); } bool TikzStyles::loadStyles(QString fileName) @@ -98,14 +98,14 @@ void TikzStyles::refreshModels(QStandardItemModel *nodeModel, QStandardItemModel it->setSizeHint(QSize(48,48)); } - Style *ns; + Style *s; for (int i = 0; i < _nodeStyles->length(); ++i) { - ns = _nodeStyles->style(i); - if (category == "" || category == ns->propertyWithDefault("tikzit category", "", false)) + s = _nodeStyles->style(i); + if (category == "" || category == s->propertyWithDefault("tikzit category", "", false)) { - it = new QStandardItem(ns->icon(), ns->name()); + it = new QStandardItem(s->icon(), s->name()); it->setEditable(false); - it->setData(ns->name()); + it->setData(s->name()); it->setSizeHint(QSize(48,48)); nodeModel->appendRow(it); } @@ -118,17 +118,26 @@ void TikzStyles::refreshModels(QStandardItemModel *nodeModel, QStandardItemModel edgeModel->appendRow(it); } - foreach(Style *es, _edgeStyles) { - //if (category == "" || category == es->propertyWithDefault("tikzit category", "", false)) - //{ - it = new QStandardItem(es->icon(), es->name()); - it->setEditable(false); - it->setData(es->name()); - edgeModel->appendRow(it); - //} + for (int i = 0; i < _edgeStyles->length(); ++i) { + s = _edgeStyles->style(i); + it = new QStandardItem(s->icon(), s->name()); + it->setEditable(false); + it->setData(s->name()); + it->setSizeHint(QSize(48,48)); + edgeModel->appendRow(it); } } +StyleList *TikzStyles::nodeStyles() const +{ + return _nodeStyles; +} + +StyleList *TikzStyles::edgeStyles() const +{ + return _edgeStyles; +} + QStringList TikzStyles::categories() const { QMap cats; // use a QMap to keep keys sorted @@ -156,7 +165,7 @@ QString TikzStyles::tikz() const code << _nodeStyles->tikz(); code << "\n% Edge styles\n"; - foreach (Style *s, _edgeStyles) code << s->tikz() << "\n"; + code << _edgeStyles->tikz(); code.flush(); return str; @@ -165,12 +174,8 @@ QString TikzStyles::tikz() const void TikzStyles::addStyle(QString name, GraphElementData *data) { Style *s = new Style(name, data); - if (s->isEdgeStyle()) - { // edge style - _edgeStyles << s; - } else { // node style - _nodeStyles->addStyle(new Style(name, data)); - } + if (s->isEdgeStyle()) _edgeStyles->addStyle(s); + else _nodeStyles->addStyle(s); } diff --git a/src/data/tikzstyles.h b/src/data/tikzstyles.h index fbb12ff..5f372ab 100644 --- a/src/data/tikzstyles.h +++ b/src/data/tikzstyles.h @@ -20,7 +20,7 @@ #define PROJECT_H #include "graphelementdata.h" -#include "nodestylelist.h" +#include "stylelist.h" #include "style.h" #include @@ -48,13 +48,16 @@ public: QString category="", bool includeNone=true); + StyleList *nodeStyles() const; + StyleList *edgeStyles() const; + signals: public slots: private: - NodeStyleList *_nodeStyles; - QVector _edgeStyles; + StyleList *_nodeStyles; + StyleList* _edgeStyles; QStringList _colNames; QVector _cols; }; diff --git a/src/gui/stylepalette.cpp b/src/gui/stylepalette.cpp index 7423f29..953d9d5 100644 --- a/src/gui/stylepalette.cpp +++ b/src/gui/stylepalette.cpp @@ -40,16 +40,16 @@ StylePalette::StylePalette(QWidget *parent) : // restoreGeometry(geom.toByteArray()); // } - _nodeModel = new QStandardItemModel(this); - _edgeModel = new QStandardItemModel(this); +// _nodeModel = new QStandardItemModel(this); +// _edgeModel = new QStandardItemModel(this); - ui->styleListView->setModel(_nodeModel); + ui->styleListView->setModel(tikzit->styles()->nodeStyles()); ui->styleListView->setViewMode(QListView::IconMode); ui->styleListView->setMovement(QListView::Static); ui->styleListView->setGridSize(QSize(48,48)); - ui->edgeStyleListView->setModel(_edgeModel); + ui->edgeStyleListView->setModel(tikzit->styles()->edgeStyles()); ui->edgeStyleListView->setViewMode(QListView::IconMode); ui->edgeStyleListView->setMovement(QListView::Static); ui->edgeStyleListView->setGridSize(QSize(48,48)); @@ -70,6 +70,9 @@ void StylePalette::reloadStyles() QString f = tikzit->styleFile(); ui->styleFile->setText(f); + ui->styleListView->setModel(tikzit->styles()->nodeStyles()); + ui->edgeStyleListView->setModel(tikzit->styles()->edgeStyles()); + QString cat = ui->currentCategory->currentText(); ui->currentCategory->clear(); @@ -85,12 +88,12 @@ void StylePalette::changeNodeStyle(int increment) QModelIndexList i = ui->styleListView->selectionModel()->selectedIndexes(); int row = 0; if (!i.isEmpty()) { - int row = (i[0].row()+increment)%_nodeModel->rowCount(); - if (row < 0) row += _nodeModel->rowCount(); + int row = (i[0].row()+increment)% tikzit->styles()->nodeStyles()->numInCategory(); + if (row < 0) row += tikzit->styles()->nodeStyles()->numInCategory(); } //QModelIndex i1 = ui->styleListView->rootIndex().child(row, 0); - QModelIndex i1 = _nodeModel->index(row,0); + QModelIndex i1 =tikzit->styles()->nodeStyles()->index(row,0); ui->styleListView->selectionModel()->select(i1, QItemSelectionModel::ClearAndSelect); ui->styleListView->scrollTo(i1); } @@ -134,7 +137,6 @@ void StylePalette::nodeStyleDoubleClicked(const QModelIndex &) void StylePalette::edgeStyleDoubleClicked(const QModelIndex &) { - qDebug() << "got double click"; tikzit->activeWindow()->tikzScene()->applyActiveStyleToEdges(); } @@ -157,7 +159,8 @@ void StylePalette::on_buttonRefreshTikzstyles_clicked() void StylePalette::on_currentCategory_currentTextChanged(const QString &cat) { - tikzit->styles()->refreshModels(_nodeModel, _edgeModel, cat); + //tikzit->styles()->refreshModels(_nodeModel, _edgeModel, cat); + tikzit->styles()->nodeStyles()->setCategory(cat); } //void StylePalette::on_buttonApplyNodeStyle_clicked() diff --git a/src/gui/stylepalette.h b/src/gui/stylepalette.h index fc4e253..7cdef0c 100644 --- a/src/gui/stylepalette.h +++ b/src/gui/stylepalette.h @@ -53,8 +53,6 @@ private: void changeNodeStyle(int increment); Ui::StylePalette *ui; - QStandardItemModel *_nodeModel; - QStandardItemModel *_edgeModel; protected: void closeEvent(QCloseEvent *event) override; diff --git a/tikzit.pro b/tikzit.pro index bd25e7d..5ff61fa 100644 --- a/tikzit.pro +++ b/tikzit.pro @@ -53,7 +53,7 @@ SOURCES += src/gui/mainwindow.cpp \ src/data/tikzstyles.cpp \ src/data/style.cpp \ src/gui/styleeditor.cpp \ - src/data/nodestylelist.cpp + src/data/stylelist.cpp HEADERS += src/gui/mainwindow.h \ src/gui/toolpalette.h \ @@ -79,7 +79,7 @@ HEADERS += src/gui/mainwindow.h \ src/data/tikzstyles.h \ src/data/style.h \ src/gui/styleeditor.h \ - src/data/nodestylelist.h + src/data/stylelist.h FORMS += src/gui/mainwindow.ui \ src/gui/propertypalette.ui \ -- cgit v1.2.3 From 07c9d67859248840bba0a178aab0dff4306c01c4 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Sun, 7 Oct 2018 16:51:00 +0200 Subject: style editor uses custom models --- src/gui/styleeditor.cpp | 331 ++++++++++++++++++++---------------------------- src/gui/styleeditor.h | 9 +- 2 files changed, 138 insertions(+), 202 deletions(-) diff --git a/src/gui/styleeditor.cpp b/src/gui/styleeditor.cpp index 46df095..e3f8ace 100644 --- a/src/gui/styleeditor.cpp +++ b/src/gui/styleeditor.cpp @@ -18,27 +18,16 @@ StyleEditor::StyleEditor(QWidget *parent) : ui->leftArrow << ui->rightArrow << ui->properties; - _styles = 0; + _styles = nullptr; - _nodeModel = new QStandardItemModel(this); - _edgeModel = new QStandardItemModel(this); - - ui->styleListView->setModel(_nodeModel); ui->styleListView->setViewMode(QListView::IconMode); ui->styleListView->setMovement(QListView::Static); ui->styleListView->setGridSize(QSize(48,48)); - ui->edgeStyleListView->setModel(_edgeModel); ui->edgeStyleListView->setViewMode(QListView::IconMode); ui->edgeStyleListView->setMovement(QListView::Static); ui->edgeStyleListView->setGridSize(QSize(48,48)); - connect(ui->styleListView->selectionModel(), - SIGNAL(currentChanged(QModelIndex,QModelIndex)), - this, SLOT(nodeItemChanged(QModelIndex))); - connect(ui->edgeStyleListView->selectionModel(), - SIGNAL(currentChanged(QModelIndex,QModelIndex)), - this, SLOT(edgeItemChanged(QModelIndex))); connect(ui->category->lineEdit(), SIGNAL(editingFinished()), this, SLOT(categoryChanged())); @@ -80,9 +69,6 @@ StyleEditor::StyleEditor(QWidget *parent) : pos += 1; } - _activeNodeStyle = 0; - _activeEdgeStyle = 0; - _activeItem = 0; refreshDisplay(); } @@ -92,16 +78,19 @@ StyleEditor::~StyleEditor() } void StyleEditor::open() { - if (_styles != 0) delete _styles; + if (_styles != nullptr) delete _styles; _styles = new TikzStyles; - _activeNodeStyle = 0; - _activeEdgeStyle = 0; - _activeItem = 0; - ui->styleListView->selectionModel()->clear(); - ui->edgeStyleListView->selectionModel()->clear(); + ui->styleListView->setModel(_styles->nodeStyles()); + ui->edgeStyleListView->setModel(_styles->edgeStyles()); + connect(ui->styleListView->selectionModel(), + SIGNAL(currentChanged(QModelIndex,QModelIndex)), + this, SLOT(nodeItemChanged(QModelIndex))); + connect(ui->edgeStyleListView->selectionModel(), + SIGNAL(currentChanged(QModelIndex,QModelIndex)), + this, SLOT(edgeItemChanged(QModelIndex))); + if (_styles->loadStyles(tikzit->styleFilePath())) { _dirty = false; - _styles->refreshModels(_nodeModel, _edgeModel, "", false); refreshCategories(); refreshDisplay(); show(); @@ -136,42 +125,22 @@ void StyleEditor::closeEvent(QCloseEvent *event) void StyleEditor::nodeItemChanged(QModelIndex sel) { - //ui->edgeStyleListView->blockSignals(true); - ui->edgeStyleListView->selectionModel()->clear(); - //ui->edgeStyleListView->blockSignals(false); - //qDebug() << "got node item change"; - - _activeNodeStyle = 0; - _activeEdgeStyle = 0; - _activeItem = 0; - QString sty; if (sel.isValid()) { - _activeItem = _nodeModel->itemFromIndex(sel); - sty = _activeItem->text(); - if (sty != "none") - _activeNodeStyle = _styles->nodeStyle(sty); + ui->edgeStyleListView->selectionModel()->clear(); + qDebug() << "active style:" << ((activeStyle() == nullptr) ? "null" : activeStyle()->tikz()); + qDebug() << "style from index:" << _styles->nodeStyles()->styleInCategory(sel.row())->tikz(); } + _nodeStyleIndex = sel; refreshDisplay(); } void StyleEditor::edgeItemChanged(QModelIndex sel) { - //ui->styleListView->blockSignals(true); - ui->styleListView->selectionModel()->clear(); - //ui->styleListView->blockSignals(false); - //qDebug() << "got edge item change"; - - _activeNodeStyle = 0; - _activeEdgeStyle = 0; - _activeItem = 0; - - QString sty; if (sel.isValid()) { - _activeItem = _edgeModel->itemFromIndex(sel); - sty = _activeItem->text(); - if (sty != "none") - _activeEdgeStyle = _styles->edgeStyle(sty); + ui->styleListView->selectionModel()->clear(); + //_nodeStyleIndex = QModelIndex(); } + _edgeStyleIndex = sel; refreshDisplay(); } @@ -192,37 +161,6 @@ void StyleEditor::categoryChanged() void StyleEditor::currentCategoryChanged() { - qDebug() << "refreshing models on category change"; - _styles->refreshModels(_nodeModel, _edgeModel, ui->currentCategory->currentText(), false); - _activeItem = 0; - - // try to keep the selection as is, or clear the current style - if (_activeNodeStyle != 0) { - ui->styleListView->selectionModel()->clear(); - for (int i = 0; i < _nodeModel->rowCount(); ++i) { - if (_activeNodeStyle->name() == _nodeModel->item(i)->data()) { - _activeItem = _nodeModel->item(i); - ui->styleListView->selectionModel()->select( - _nodeModel->index(i,0), - QItemSelectionModel::SelectCurrent); - } - } - } else if (_activeEdgeStyle != 0) { - ui->edgeStyleListView->selectionModel()->clear(); - for (int i = 0; i < _edgeModel->rowCount(); ++i) { - if (_activeEdgeStyle->name() == _edgeModel->item(i)->data()) { - _activeItem = _edgeModel->item(i); - ui->edgeStyleListView->selectionModel()->select( - _edgeModel->index(i,0), - QItemSelectionModel::SelectCurrent); - } - } - } - - if (_activeItem == 0) { - _activeNodeStyle = 0; - _activeEdgeStyle = 0; - } } void StyleEditor::refreshCategories() @@ -234,7 +172,7 @@ void StyleEditor::refreshCategories() ui->currentCategory->clear(); ui->category->clear(); - if (_styles != 0) { + if (_styles != nullptr) { foreach(QString c, _styles->categories()) { ui->category->addItem(c); ui->currentCategory->addItem(c); @@ -249,11 +187,13 @@ void StyleEditor::refreshCategories() void StyleEditor::propertyChanged() { - if (_activeNodeStyle != 0) { - _activeItem->setIcon(_activeNodeStyle->icon()); + QModelIndexList nSel = ui->styleListView->selectionModel()->selectedRows(); + QModelIndexList eSel = ui->edgeStyleListView->selectionModel()->selectedRows(); + if (!nSel.isEmpty()) { + emit _styles->nodeStyles()->dataChanged(nSel[0], nSel[0]); refreshCategories(); - } else if (_activeEdgeStyle != 0) { - _activeItem->setIcon(_activeEdgeStyle->icon()); + } else if (!eSel.isEmpty()) { + emit _styles->edgeStyles()->dataChanged(eSel[0], eSel[0]); } _dirty = true; refreshDisplay(); @@ -285,115 +225,98 @@ void StyleEditor::refreshDisplay() ui->rightArrow->setCurrentText(""); ui->properties->setModel(0); - if (_activeNodeStyle != 0) { - //_activeItem->setText(_activeNodeStyle->name()); - //_activeItem->setIcon(_activeNodeStyle->icon()); + Style *s = activeStyle(); + if (s != nullptr && !s->isNone()) { + // name ui->name->setEnabled(true); - ui->name->setText(_activeNodeStyle->name()); - - ui->category->setEnabled(true); - ui->category->setCurrentText( - _activeNodeStyle->propertyWithDefault("tikzit category", "", false)); - - // passing 'false' to these methods prevents 'tikzit foo' from overriding property 'foo' - QColor realFill = _activeNodeStyle->fillColor(false); - QColor fill = _activeNodeStyle->fillColor(); - bool fillOverride = realFill != fill; - QColor realDraw = _activeNodeStyle->strokeColor(false); - QColor draw = _activeNodeStyle->strokeColor(); - bool drawOverride = realDraw != draw; + ui->name->setText(s->name()); - ui->fillColor->setEnabled(true); - setColor(ui->fillColor, realFill); + // property list + ui->properties->setEnabled(true); + setPropertyModel(s->data()); + // draw + QColor realDraw = s->strokeColor(false); + QColor draw = s->strokeColor(); ui->drawColor->setEnabled(true); setColor(ui->drawColor, realDraw); - - ui->hasTikzitFillColor->setEnabled(true); - ui->hasTikzitFillColor->setChecked(fillOverride); - - ui->tikzitFillColor->setEnabled(fillOverride); - if (fillOverride) setColor(ui->tikzitFillColor, fill); - + // tikzit draw + bool drawOverride = realDraw != draw; ui->hasTikzitDrawColor->setEnabled(true); ui->hasTikzitDrawColor->setChecked(drawOverride); ui->tikzitDrawColor->setEnabled(drawOverride); if (drawOverride) setColor(ui->tikzitDrawColor, draw); - QString realShape = _activeNodeStyle->propertyWithDefault("shape", "", false); - QString shape = _activeNodeStyle->propertyWithDefault("tikzit shape", "", false); - bool shapeOverride = shape != realShape; - ui->shape->setEnabled(true); - ui->shape->setCurrentText(realShape); - - ui->hasTikzitShape->setEnabled(true); - ui->tikzitShape->setEnabled(shapeOverride); - if (shapeOverride) ui->tikzitShape->setCurrentText(shape); - - ui->properties->setEnabled(true); - setPropertyModel(_activeNodeStyle->data()); - qDebug() << _activeNodeStyle->data()->tikz(); - } else if (_activeEdgeStyle != 0) { - //_activeItem->setText(_activeEdgeStyle->name()); - //_activeItem->setIcon(_activeEdgeStyle->icon()); - ui->name->setEnabled(true); - ui->name->setText(_activeEdgeStyle->name()); - - //ui->category->setEnabled(true); - //ui->category->setCurrentText( - // _activeEdgeStyle->propertyWithDefault("tikzit category", "", false)); - - setColor(ui->fillColor, QColor(Qt::gray)); - setColor(ui->tikzitFillColor, QColor(Qt::gray)); - ui->hasTikzitFillColor->setChecked(false); - - - // passing 'false' to these methods prevents 'tikzit foo' from overriding property 'foo' - QColor realDraw = _activeEdgeStyle->strokeColor(false); - QColor draw = _activeEdgeStyle->strokeColor(); - bool drawOverride = realDraw != draw; - - ui->drawColor->setEnabled(true); - setColor(ui->drawColor, realDraw); - - ui->hasTikzitDrawColor->setEnabled(true); - ui->hasTikzitDrawColor->setChecked(drawOverride); - - ui->tikzitDrawColor->setEnabled(drawOverride); - setColor(ui->tikzitDrawColor, draw); - - ui->leftArrow->setEnabled(true); - - switch (_activeEdgeStyle->arrowTail()) { - case Style::NoTip: - ui->leftArrow->setCurrentText(""); - break; - case Style::Pointer: - ui->leftArrow->setCurrentText("<"); - break; - case Style::Flat: - ui->leftArrow->setCurrentText("|"); - break; - } + if (!s->isEdgeStyle()) { + // category + ui->category->setEnabled(true); + ui->category->setCurrentText( + s->propertyWithDefault("tikzit category", "", false)); + + // fill + QColor realFill = s->fillColor(false); + QColor fill = s->fillColor(); + ui->fillColor->setEnabled(true); + setColor(ui->fillColor, realFill); + + // tikzit fill + bool fillOverride = realFill != fill; + ui->hasTikzitFillColor->setEnabled(true); + ui->hasTikzitFillColor->setChecked(fillOverride); + ui->tikzitFillColor->setEnabled(fillOverride); + if (fillOverride) setColor(ui->tikzitFillColor, fill); + + // shape + QString realShape = s->propertyWithDefault("shape", "", false); + QString shape = s->propertyWithDefault("tikzit shape", "", false); + ui->shape->setEnabled(true); + ui->shape->setCurrentText(realShape); + + // tikzit shape + bool shapeOverride = shape != realShape; + ui->hasTikzitShape->setEnabled(true); + ui->tikzitShape->setEnabled(shapeOverride); + if (shapeOverride) ui->tikzitShape->setCurrentText(shape); + } else { + // set fill to gray (disabled) + setColor(ui->fillColor, QColor(Qt::gray)); + setColor(ui->tikzitFillColor, QColor(Qt::gray)); + ui->hasTikzitFillColor->setChecked(false); + + + // arrow tail + ui->leftArrow->setEnabled(true); + + switch (s->arrowTail()) { + case Style::NoTip: + ui->leftArrow->setCurrentText(""); + break; + case Style::Pointer: + ui->leftArrow->setCurrentText("<"); + break; + case Style::Flat: + ui->leftArrow->setCurrentText("|"); + break; + } - ui->rightArrow->setEnabled(true); - switch (_activeEdgeStyle->arrowHead()) { - case Style::NoTip: - ui->rightArrow->setCurrentText(""); - break; - case Style::Pointer: - ui->rightArrow->setCurrentText(">"); - break; - case Style::Flat: - ui->rightArrow->setCurrentText("|"); - break; + // arrow head + ui->rightArrow->setEnabled(true); + switch (s->arrowHead()) { + case Style::NoTip: + ui->rightArrow->setCurrentText(""); + break; + case Style::Pointer: + ui->rightArrow->setCurrentText(">"); + break; + case Style::Flat: + ui->rightArrow->setCurrentText("|"); + break; + } } - ui->properties->setEnabled(true); - setPropertyModel(_activeEdgeStyle->data()); } else { setColor(ui->fillColor, QColor(Qt::gray)); setColor(ui->drawColor, QColor(Qt::gray)); @@ -529,18 +452,19 @@ void StyleEditor::on_name_editingFinished() if (s != 0) { s->setName(ui->name->text()); - _activeItem->setText(ui->name->text()); - refreshDisplay(); + refreshActiveStyle(); +// refreshDisplay(); _dirty = true; } } void StyleEditor::on_shape_currentTextChanged() { - if (_activeNodeStyle != 0) { - _activeNodeStyle->data()->setProperty("shape", ui->shape->currentText()); - _activeItem->setIcon(_activeNodeStyle->icon()); - refreshDisplay(); + Style *s = activeStyle(); + if (s != 0) { + s->data()->setProperty("shape", ui->shape->currentText()); + refreshActiveStyle(); +// refreshDisplay(); _dirty = true; } } @@ -572,8 +496,26 @@ QColor StyleEditor::color(QPushButton *btn) Style *StyleEditor::activeStyle() { - if (_activeNodeStyle != 0) return _activeNodeStyle; - else return _activeEdgeStyle; + if (_styles != nullptr) { + if (_nodeStyleIndex.isValid()) + return _styles->nodeStyles()->styleInCategory(_nodeStyleIndex.row()); + + if (_edgeStyleIndex.isValid()) + return _styles->edgeStyles()->styleInCategory(_edgeStyleIndex.row()); + } + + return nullptr; +} + +void StyleEditor::refreshActiveStyle() +{ + if (_styles != nullptr) { + if (_nodeStyleIndex.isValid()) + emit _styles->nodeStyles()->dataChanged(_nodeStyleIndex, _nodeStyleIndex); + + if (_edgeStyleIndex.isValid()) + emit _styles->edgeStyles()->dataChanged(_edgeStyleIndex, _edgeStyleIndex); + } } void StyleEditor::updateColor(QPushButton *btn, QString name, QString propName) @@ -583,17 +525,12 @@ void StyleEditor::updateColor(QPushButton *btn, QString name, QString propName) this, name, QColorDialog::DontUseNativeDialog); - if (col.isValid()) { - setColor(btn, col); - if (_activeNodeStyle != 0) { - _activeNodeStyle->data()->setProperty(propName, tikzit->nameForColor(col)); - _activeItem->setIcon(_activeNodeStyle->icon()); - } else if (_activeEdgeStyle != 0) { - _activeEdgeStyle->data()->setProperty(propName, tikzit->nameForColor(col)); - _activeItem->setIcon(_activeEdgeStyle->icon()); - } - - refreshDisplay(); + setColor(btn, col); + Style *s = activeStyle(); + if (s != nullptr) { + s->data()->setProperty(propName, tikzit->nameForColor(col)); + refreshActiveStyle(); +// refreshDisplay(); _dirty = true; } } diff --git a/src/gui/styleeditor.h b/src/gui/styleeditor.h index e40facd..fed2908 100644 --- a/src/gui/styleeditor.h +++ b/src/gui/styleeditor.h @@ -58,17 +58,16 @@ private: void setColor(QPushButton *btn, QColor col); void setPropertyModel(GraphElementData *d); QColor color(QPushButton *btn); - QStandardItemModel *_nodeModel; - QStandardItemModel *_edgeModel; - QStandardItem *_activeItem; - Style *_activeNodeStyle; - Style *_activeEdgeStyle; //QString _activeCategory; Style *activeStyle(); + void refreshActiveStyle(); TikzStyles *_styles; void updateColor(QPushButton *btn, QString name, QString propName); QVector _formWidgets; bool _dirty; + + QModelIndex _nodeStyleIndex; + QModelIndex _edgeStyleIndex; }; #endif // STYLEEDITOR_H -- cgit v1.2.3 From e0f973435c6cf24f4eefc9f767b8b6a957daf8ac Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Mon, 8 Oct 2018 08:51:13 +0200 Subject: fixed tikzstyles output --- src/data/stylelist.cpp | 3 ++- src/gui/styleeditor.cpp | 68 +++++++++++++++++++++++++++++++++++-------------- src/gui/styleeditor.h | 1 + 3 files changed, 52 insertions(+), 20 deletions(-) diff --git a/src/data/stylelist.cpp b/src/data/stylelist.cpp index 2c79d10..c8baf3f 100644 --- a/src/data/stylelist.cpp +++ b/src/data/stylelist.cpp @@ -63,7 +63,8 @@ QString StyleList::tikz() { QString str; QTextStream code(&str); - foreach (Style *s, _styles) code << s->tikz() << "\n"; + for (int i = 1; i < _styles.length(); ++i) + code << _styles[i]->tikz() << "\n"; code.flush(); return str; } diff --git a/src/gui/styleeditor.cpp b/src/gui/styleeditor.cpp index e3f8ace..06bb718 100644 --- a/src/gui/styleeditor.cpp +++ b/src/gui/styleeditor.cpp @@ -19,6 +19,7 @@ StyleEditor::StyleEditor(QWidget *parent) : ui->properties; _styles = nullptr; + _activeStyle = nullptr; ui->styleListView->setViewMode(QListView::IconMode); ui->styleListView->setMovement(QListView::Static); @@ -80,6 +81,7 @@ StyleEditor::~StyleEditor() void StyleEditor::open() { if (_styles != nullptr) delete _styles; _styles = new TikzStyles; + _activeStyle = nullptr; ui->styleListView->setModel(_styles->nodeStyles()); ui->edgeStyleListView->setModel(_styles->edgeStyles()); connect(ui->styleListView->selectionModel(), @@ -127,8 +129,7 @@ void StyleEditor::nodeItemChanged(QModelIndex sel) { if (sel.isValid()) { ui->edgeStyleListView->selectionModel()->clear(); - qDebug() << "active style:" << ((activeStyle() == nullptr) ? "null" : activeStyle()->tikz()); - qDebug() << "style from index:" << _styles->nodeStyles()->styleInCategory(sel.row())->tikz(); + _activeStyle = _styles->nodeStyles()->styleInCategory(sel.row()); } _nodeStyleIndex = sel; refreshDisplay(); @@ -138,7 +139,7 @@ void StyleEditor::edgeItemChanged(QModelIndex sel) { if (sel.isValid()) { ui->styleListView->selectionModel()->clear(); - //_nodeStyleIndex = QModelIndex(); + _activeStyle = _styles->edgeStyles()->styleInCategory(sel.row()); } _edgeStyleIndex = sel; refreshDisplay(); @@ -150,17 +151,43 @@ void StyleEditor::categoryChanged() QString cat = ui->category->currentText(); //qDebug() << "got category: " << cat; - if (s != 0 && s->data()->property("tikzit category") != cat) { + if (s != nullptr && s->data()->property("tikzit category") != cat) { if (cat.isEmpty()) s->data()->unsetProperty("tikzit category"); else s->data()->setProperty("tikzit category", cat); _dirty = true; refreshCategories(); - refreshDisplay(); + + if (_styles->nodeStyles()->category() != "") { + ui->currentCategory->setCurrentText(cat); + //qDebug() << "after cat change, cat reports:" << _styles->nodeStyles()->category(); + } + //refreshDisplay(); } } void StyleEditor::currentCategoryChanged() { + if (_styles != nullptr) { + QString cat = ui->currentCategory->currentText(); + qDebug() << "got category:" << cat; + qDebug() << "node style category:" << _styles->nodeStyles()->category(); + if (cat != _styles->nodeStyles()->category()) { + ui->styleListView->selectionModel()->clear(); + _styles->nodeStyles()->setCategory(cat); + + if (_activeStyle != nullptr && !_activeStyle->isEdgeStyle()) { + for (int i = 0; i < _styles->nodeStyles()->numInCategory(); ++i) { + if (_styles->nodeStyles()->styleInCategory(i) == _activeStyle) { + ui->styleListView->selectionModel()->setCurrentIndex( + _styles->nodeStyles()->index(i), + QItemSelectionModel::ClearAndSelect); + break; + } + } + if (!_nodeStyleIndex.isValid()) _activeStyle = nullptr; + } + } + } } void StyleEditor::refreshCategories() @@ -187,13 +214,16 @@ void StyleEditor::refreshCategories() void StyleEditor::propertyChanged() { - QModelIndexList nSel = ui->styleListView->selectionModel()->selectedRows(); - QModelIndexList eSel = ui->edgeStyleListView->selectionModel()->selectedRows(); - if (!nSel.isEmpty()) { - emit _styles->nodeStyles()->dataChanged(nSel[0], nSel[0]); - refreshCategories(); - } else if (!eSel.isEmpty()) { - emit _styles->edgeStyles()->dataChanged(eSel[0], eSel[0]); + if (_nodeStyleIndex.isValid()) { + emit _styles->nodeStyles()->dataChanged(_nodeStyleIndex, _nodeStyleIndex); + + if (_activeStyle->category() != _styles->nodeStyles()->category()) { + refreshCategories(); + if (_styles->nodeStyles()->category() != "") + ui->currentCategory->setCurrentText(_activeStyle->category()); + } + } else if (_edgeStyleIndex.isValid()) { + emit _styles->edgeStyles()->dataChanged(_edgeStyleIndex, _edgeStyleIndex); } _dirty = true; refreshDisplay(); @@ -496,15 +526,15 @@ QColor StyleEditor::color(QPushButton *btn) Style *StyleEditor::activeStyle() { - if (_styles != nullptr) { - if (_nodeStyleIndex.isValid()) - return _styles->nodeStyles()->styleInCategory(_nodeStyleIndex.row()); +// if (_styles != nullptr) { +// if (_nodeStyleIndex.isValid()) +// return _styles->nodeStyles()->styleInCategory(_nodeStyleIndex.row()); - if (_edgeStyleIndex.isValid()) - return _styles->edgeStyles()->styleInCategory(_edgeStyleIndex.row()); - } +// if (_edgeStyleIndex.isValid()) +// return _styles->edgeStyles()->styleInCategory(_edgeStyleIndex.row()); +// } - return nullptr; + return _activeStyle; } void StyleEditor::refreshActiveStyle() diff --git a/src/gui/styleeditor.h b/src/gui/styleeditor.h index fed2908..f9caf9c 100644 --- a/src/gui/styleeditor.h +++ b/src/gui/styleeditor.h @@ -68,6 +68,7 @@ private: QModelIndex _nodeStyleIndex; QModelIndex _edgeStyleIndex; + Style *_activeStyle; }; #endif // STYLEEDITOR_H -- cgit v1.2.3 From 59f92c45fd751aeb7811ca68d76d3af4ee72a9c4 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Mon, 8 Oct 2018 14:14:54 +0200 Subject: anchor to center --- src/gui/mainwindow.cpp | 22 +++++++++++++++-- src/gui/styleeditor.cpp | 45 +++++++++++++++++++++++++++++++++-- src/gui/styleeditor.h | 2 ++ src/gui/stylepalette.cpp | 7 ++++++ src/gui/stylepalette.h | 1 + src/gui/stylepalette.ui | 62 +++++++++++++++++++++++++++--------------------- src/gui/tikzview.cpp | 3 ++- src/gui/toolpalette.cpp | 1 + 8 files changed, 111 insertions(+), 32 deletions(-) diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index f9743a1..cdf7bea 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -23,6 +23,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) { + QSettings settings("tikzit", "tikzit"); _windowId = _numWindows; _numWindows++; ui->setupUi(this); @@ -36,8 +37,6 @@ MainWindow::MainWindow(QWidget *parent) : addToolBar(_toolPalette); _stylePalette = new StylePalette(this); - addDockWidget(Qt::RightDockWidgetArea, _stylePalette); - resizeDocks({_stylePalette}, {130}, Qt::Horizontal); _tikzScene = new TikzScene(_tikzDocument, _toolPalette, _stylePalette, this); ui->tikzView->setScene(_tikzScene); @@ -48,6 +47,20 @@ MainWindow::MainWindow(QWidget *parent) : setMenuBar(_menu); + QVariant geom = settings.value("geometry-main"); + QVariant state = settings.value("windowState-main"); + + if (geom.isValid()) { + restoreGeometry(geom.toByteArray()); + } + + if (state.isValid()) { + restoreState(state.toByteArray(), 2); + } else { + addDockWidget(Qt::RightDockWidgetArea, _stylePalette); + resizeDocks({_stylePalette}, {130}, Qt::Horizontal); + } + // initially, the source view should be collapsed QList sz = ui->splitter->sizes(); sz[0] = sz[0] + sz[1]; @@ -90,6 +103,11 @@ QSplitter *MainWindow::splitter() const { void MainWindow::closeEvent(QCloseEvent *event) { qDebug() << "got close event"; + + QSettings settings("tikzit", "tikzit"); + settings.setValue("geometry-main", saveGeometry()); + settings.setValue("windowState-main", saveState(2)); + QMainWindow::closeEvent(event); } diff --git a/src/gui/styleeditor.cpp b/src/gui/styleeditor.cpp index 06bb718..36ae93a 100644 --- a/src/gui/styleeditor.cpp +++ b/src/gui/styleeditor.cpp @@ -442,6 +442,39 @@ void StyleEditor::on_propertyDown_clicked() } } +void StyleEditor::on_addStyle_clicked() +{ + int i = 0; + + // get a fresh name + QString name; + while (true) { + name = QString("new style ") + QString::number(i); + if (_styles->nodeStyles()->style(name) == nullptr) break; + ++i; + } + + // add the style to the current category + Style *s; + if (_styles->nodeStyles()->category() == "") { + s = new Style(name, new GraphElementData()); + } else { + s = new Style(name, + new GraphElementData({ + GraphElementProperty("category",_styles->nodeStyles()->category()) + })); + } + _styles->nodeStyles()->addStyle(s); + + // set dirty flag and select the newly-added style + _dirty = true; +// ui->styleListView->selectionModel()->clear(); +// ui->edgeStyleListView->selectionModel()->clear(); + ui->styleListView->selectionModel()->setCurrentIndex( + _styles->nodeStyles()->index(_styles->nodeStyles()->numInCategory()-1), + QItemSelectionModel::ClearAndSelect); +} + void StyleEditor::on_save_clicked() { save(); @@ -540,11 +573,19 @@ Style *StyleEditor::activeStyle() void StyleEditor::refreshActiveStyle() { if (_styles != nullptr) { - if (_nodeStyleIndex.isValid()) + if (_nodeStyleIndex.isValid()) { emit _styles->nodeStyles()->dataChanged(_nodeStyleIndex, _nodeStyleIndex); - if (_edgeStyleIndex.isValid()) + // force a re-layout + ui->styleListView->setGridSize(QSize(48,48)); + } + + if (_edgeStyleIndex.isValid()) { emit _styles->edgeStyles()->dataChanged(_edgeStyleIndex, _edgeStyleIndex); + + // force a re-layout + ui->edgeStyleListView->setGridSize(QSize(48,48)); + } } } diff --git a/src/gui/styleeditor.h b/src/gui/styleeditor.h index f9caf9c..bc548f0 100644 --- a/src/gui/styleeditor.h +++ b/src/gui/styleeditor.h @@ -48,6 +48,8 @@ public slots: void on_propertyUp_clicked(); void on_propertyDown_clicked(); + void on_addStyle_clicked(); + void on_save_clicked(); void on_currentCategory_currentIndexChanged(int); diff --git a/src/gui/stylepalette.cpp b/src/gui/stylepalette.cpp index 953d9d5..5e6de43 100644 --- a/src/gui/stylepalette.cpp +++ b/src/gui/stylepalette.cpp @@ -174,3 +174,10 @@ void StylePalette::closeEvent(QCloseEvent *event) settings.setValue("style-palette-geometry", saveGeometry()); QDockWidget::closeEvent(event); } + +void StylePalette::resizeEvent(QResizeEvent *event) +{ + QDockWidget::resizeEvent(event); + ui->styleListView->setGridSize(QSize(48,48)); + ui->edgeStyleListView->setGridSize(QSize(48,48)); +} diff --git a/src/gui/stylepalette.h b/src/gui/stylepalette.h index 7cdef0c..b76aa03 100644 --- a/src/gui/stylepalette.h +++ b/src/gui/stylepalette.h @@ -56,6 +56,7 @@ private: protected: void closeEvent(QCloseEvent *event) override; + void resizeEvent(QResizeEvent *event) override; }; #endif // STYLEPALETTE_H diff --git a/src/gui/stylepalette.ui b/src/gui/stylepalette.ui index abba648..39e796b 100644 --- a/src/gui/stylepalette.ui +++ b/src/gui/stylepalette.ui @@ -32,10 +32,28 @@ false - + Styles + + + + + 0 + 0 + + + + + true + + + + [default] + + + @@ -44,19 +62,6 @@ 0 - - - - Qt::Horizontal - - - - 40 - 20 - - - - @@ -99,21 +104,21 @@ + + + + Qt::Horizontal + + + + 40 + 20 + + + + - - - - - 0 - 0 - - - - [default] - - - @@ -131,6 +136,9 @@ Qt::ScrollBarAlwaysOff + + QListView::Adjust + diff --git a/src/gui/tikzview.cpp b/src/gui/tikzview.cpp index 0f1dc30..3f107be 100644 --- a/src/gui/tikzview.cpp +++ b/src/gui/tikzview.cpp @@ -25,6 +25,7 @@ TikzView::TikzView(QWidget *parent) : QGraphicsView(parent) { setRenderHint(QPainter::Antialiasing); + setResizeAnchor(QGraphicsView::AnchorViewCenter); //setDragMode(QGraphicsView::RubberBandDrag); _scale = 1.0f; @@ -45,7 +46,7 @@ void TikzView::zoomOut() void TikzView::setScene(QGraphicsScene *scene) { QGraphicsView::setScene(scene); - centerOn(QPointF(0.0f,-230.0f)); + centerOn(QPointF(0.0f,0.0f)); } void TikzView::drawBackground(QPainter *painter, const QRectF &rect) diff --git a/src/gui/toolpalette.cpp b/src/gui/toolpalette.cpp index c0e2a22..2452bda 100644 --- a/src/gui/toolpalette.cpp +++ b/src/gui/toolpalette.cpp @@ -31,6 +31,7 @@ ToolPalette::ToolPalette(QWidget *parent) : | Qt::WindowDoesNotAcceptFocus); setOrientation(Qt::Vertical); setFocusPolicy(Qt::NoFocus); + setWindowTitle("Tools"); //setGeometry(100,200,30,195); tools = new QActionGroup(this); -- cgit v1.2.3 From 38582ebd4b974150cbe446ac92c9a4a7024f5f09 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 9 Oct 2018 10:33:08 +0200 Subject: style editor is finished --- src/data/stylelist.cpp | 35 ++++++++++ src/data/stylelist.h | 6 ++ src/gui/styleeditor.cpp | 182 ++++++++++++++++++++++++++++++++++++++++++------ src/gui/styleeditor.h | 14 ++++ 4 files changed, 217 insertions(+), 20 deletions(-) diff --git a/src/data/stylelist.cpp b/src/data/stylelist.cpp index c8baf3f..14302c7 100644 --- a/src/data/stylelist.cpp +++ b/src/data/stylelist.cpp @@ -41,6 +41,13 @@ void StyleList::addStyle(Style *s) } } +void StyleList::removeNthStyle(int n) +{ + beginRemoveRows(QModelIndex(), n, n); + _styles.remove(nthInCategory(n)); + endRemoveRows(); +} + void StyleList::clear() { int n = numInCategory(); @@ -113,6 +120,34 @@ int StyleList::rowCount(const QModelIndex &/*parent*/) const return numInCategory(); } +bool StyleList::moveRows(const QModelIndex &sourceParent, + int sourceRow, + int /*count*/, + const QModelIndex &destinationParent, + int destinationRow) +{ + if (sourceRow >= 1 && sourceRow < numInCategory() && + destinationRow >= 1 && destinationRow <= numInCategory()) + { + beginMoveRows(sourceParent, sourceRow, sourceRow, destinationParent, destinationRow); + int sourceIndex = nthInCategory(sourceRow); + int destinationIndex = nthInCategory(destinationRow); + if (destinationIndex == -1) + destinationIndex = _styles.length(); + Style *s = _styles[sourceIndex]; + _styles.remove(sourceIndex); + if (sourceIndex < destinationIndex) { + _styles.insert(destinationIndex - 1, s); + } else { + _styles.insert(destinationIndex, s); + } + endMoveRows(); + return true; + } else { + return false; + } +} + QString StyleList::category() const { return _category; diff --git a/src/data/stylelist.h b/src/data/stylelist.h index f698761..eb1c43a 100644 --- a/src/data/stylelist.h +++ b/src/data/stylelist.h @@ -14,6 +14,7 @@ public: Style *style(int i); int length() const; void addStyle(Style *s); + void removeNthStyle(int n); void clear(); QString tikz(); @@ -23,6 +24,11 @@ public: QVariant data(const QModelIndex &index, int role) const override; int rowCount(const QModelIndex &/*parent*/) const override; + bool moveRows(const QModelIndex &sourceParent, + int sourceRow, + int /*count*/, + const QModelIndex &destinationParent, + int destinationChild); QString category() const; diff --git a/src/gui/styleeditor.cpp b/src/gui/styleeditor.cpp index 36ae93a..63d347b 100644 --- a/src/gui/styleeditor.cpp +++ b/src/gui/styleeditor.cpp @@ -18,6 +18,7 @@ StyleEditor::StyleEditor(QWidget *parent) : ui->leftArrow << ui->rightArrow << ui->properties; + setWindowIcon(QIcon(":/images/logo.png")); _styles = nullptr; _activeStyle = nullptr; @@ -92,7 +93,7 @@ void StyleEditor::open() { this, SLOT(edgeItemChanged(QModelIndex))); if (_styles->loadStyles(tikzit->styleFilePath())) { - _dirty = false; + setDirty(false); refreshCategories(); refreshDisplay(); show(); @@ -105,7 +106,7 @@ void StyleEditor::open() { void StyleEditor::closeEvent(QCloseEvent *event) { - if (_dirty) { + if (dirty()) { QMessageBox::StandardButton resBtn = QMessageBox::question( this, "Save Changes", "Do you wish to save changes to " + tikzit->styleFile() + "?", @@ -113,7 +114,7 @@ void StyleEditor::closeEvent(QCloseEvent *event) QMessageBox::Yes); if (resBtn == QMessageBox::Yes) { - // TODO save here + save(); event->accept(); } else if (resBtn == QMessageBox::No) { event->accept(); @@ -127,6 +128,7 @@ void StyleEditor::closeEvent(QCloseEvent *event) void StyleEditor::nodeItemChanged(QModelIndex sel) { + qDebug() << "nodeItemChanged, new index:" << sel.row(); if (sel.isValid()) { ui->edgeStyleListView->selectionModel()->clear(); _activeStyle = _styles->nodeStyles()->styleInCategory(sel.row()); @@ -154,7 +156,7 @@ void StyleEditor::categoryChanged() if (s != nullptr && s->data()->property("tikzit category") != cat) { if (cat.isEmpty()) s->data()->unsetProperty("tikzit category"); else s->data()->setProperty("tikzit category", cat); - _dirty = true; + setDirty(true); refreshCategories(); if (_styles->nodeStyles()->category() != "") { @@ -225,7 +227,7 @@ void StyleEditor::propertyChanged() } else if (_edgeStyleIndex.isValid()) { emit _styles->edgeStyles()->dataChanged(_edgeStyleIndex, _edgeStyleIndex); } - _dirty = true; + setDirty(true); refreshDisplay(); } @@ -385,7 +387,7 @@ void StyleEditor::on_addProperty_clicked() Style *s = activeStyle(); if (s != 0) { s->data()->add(GraphElementProperty("new property", "")); - _dirty = true; + setDirty(true); } } @@ -394,7 +396,7 @@ void StyleEditor::on_addAtom_clicked() Style *s = activeStyle(); if (s != 0) { s->data()->add(GraphElementProperty("new atom")); - _dirty = true; + setDirty(true); } } @@ -405,7 +407,7 @@ void StyleEditor::on_removeProperty_clicked() QModelIndexList sel = ui->properties->selectionModel()->selectedRows(); if (!sel.isEmpty()) { s->data()->removeRows(sel[0].row(), 1, sel[0].parent()); - _dirty = true; + setDirty(true); } } } @@ -421,7 +423,7 @@ void StyleEditor::on_propertyUp_clicked() sel[0].row(), 1, sel[0].parent(), sel[0].row() - 1); - _dirty = true; + setDirty(true); } } } @@ -437,7 +439,7 @@ void StyleEditor::on_propertyDown_clicked() sel[0].row(), 1, sel[0].parent(), sel[0].row() + 2); - _dirty = true; + setDirty(true); } } } @@ -467,12 +469,123 @@ void StyleEditor::on_addStyle_clicked() _styles->nodeStyles()->addStyle(s); // set dirty flag and select the newly-added style - _dirty = true; -// ui->styleListView->selectionModel()->clear(); -// ui->edgeStyleListView->selectionModel()->clear(); - ui->styleListView->selectionModel()->setCurrentIndex( - _styles->nodeStyles()->index(_styles->nodeStyles()->numInCategory()-1), - QItemSelectionModel::ClearAndSelect); + setDirty(true); + selectNodeStyle(_styles->nodeStyles()->numInCategory()-1); +} + +void StyleEditor::on_removeStyle_clicked() +{ + if (_nodeStyleIndex.isValid()) { + int i = _nodeStyleIndex.row(); + if (i > 0) { + ui->styleListView->selectionModel()->clear(); + _styles->nodeStyles()->removeNthStyle(i); + setDirty(true); + if (i < _styles->nodeStyles()->numInCategory()) { + selectNodeStyle(i); + } + } + } +} + +void StyleEditor::on_styleUp_clicked() +{ + if (_nodeStyleIndex.isValid()) { + int r = _nodeStyleIndex.row(); + if (_styles->nodeStyles()->moveRows( + _nodeStyleIndex.parent(), + r, 1, + _nodeStyleIndex.parent(), + r - 1)) + { + setDirty(true); + nodeItemChanged(_styles->nodeStyles()->index(r - 1)); + } + } +} + +void StyleEditor::on_styleDown_clicked() +{ + if (_nodeStyleIndex.isValid()) { + int r = _nodeStyleIndex.row(); + if (_styles->nodeStyles()->moveRows( + _nodeStyleIndex.parent(), + r, 1, + _nodeStyleIndex.parent(), + r + 2)) + { + setDirty(true); + nodeItemChanged(_styles->nodeStyles()->index(r + 1)); + } + } +} + +void StyleEditor::on_addEdgeStyle_clicked() +{ + int i = 0; + + // get a fresh name + QString name; + while (true) { + name = QString("new edge style ") + QString::number(i); + if (_styles->edgeStyles()->style(name) == nullptr) break; + ++i; + } + + // add the style (edge styles only have one category: "") + Style *s = new Style(name, new GraphElementData({GraphElementProperty("-")})); + _styles->edgeStyles()->addStyle(s); + + // set dirty flag and select the newly-added style + setDirty(true); + selectEdgeStyle(_styles->edgeStyles()->numInCategory()-1); +} + +void StyleEditor::on_removeEdgeStyle_clicked() +{ + if (_edgeStyleIndex.isValid()) { + int i = _edgeStyleIndex.row(); + if (i > 0) { + ui->edgeStyleListView->selectionModel()->clear(); + _styles->edgeStyles()->removeNthStyle(i); + setDirty(true); + if (i < _styles->edgeStyles()->numInCategory()) { + selectEdgeStyle(i); + } + } + } +} + +void StyleEditor::on_edgeStyleUp_clicked() +{ + if (_edgeStyleIndex.isValid()) { + int r = _edgeStyleIndex.row(); + if (_styles->edgeStyles()->moveRows( + _edgeStyleIndex.parent(), + r, 1, + _edgeStyleIndex.parent(), + r - 1)) + { + setDirty(true); + edgeItemChanged(_styles->edgeStyles()->index(r - 1)); + } + } +} + +void StyleEditor::on_edgeStyleDown_clicked() +{ + if (_edgeStyleIndex.isValid()) { + int r = _edgeStyleIndex.row(); + if (_styles->edgeStyles()->moveRows( + _edgeStyleIndex.parent(), + r, 1, + _edgeStyleIndex.parent(), + r + 2)) + { + setDirty(true); + edgeItemChanged(_styles->edgeStyles()->index(r + 1)); + } + } } void StyleEditor::on_save_clicked() @@ -492,7 +605,7 @@ void StyleEditor::save() QString p = tikzit->styleFilePath(); if (_styles->saveStyles(p)) { - _dirty = false; + setDirty(false); tikzit->loadStyles(p); } else { QMessageBox::warning(0, @@ -517,7 +630,7 @@ void StyleEditor::on_name_editingFinished() s->setName(ui->name->text()); refreshActiveStyle(); // refreshDisplay(); - _dirty = true; + setDirty(true); } } @@ -528,7 +641,7 @@ void StyleEditor::on_shape_currentTextChanged() s->data()->setProperty("shape", ui->shape->currentText()); refreshActiveStyle(); // refreshDisplay(); - _dirty = true; + setDirty(true); } } @@ -602,6 +715,35 @@ void StyleEditor::updateColor(QPushButton *btn, QString name, QString propName) s->data()->setProperty(propName, tikzit->nameForColor(col)); refreshActiveStyle(); // refreshDisplay(); - _dirty = true; + setDirty(true); + } +} + +void StyleEditor::selectNodeStyle(int i) +{ + ui->styleListView->selectionModel()->setCurrentIndex( + _styles->nodeStyles()->index(i), + QItemSelectionModel::ClearAndSelect); +} + +void StyleEditor::selectEdgeStyle(int i) +{ + ui->edgeStyleListView->selectionModel()->setCurrentIndex( + _styles->edgeStyles()->index(i), + QItemSelectionModel::ClearAndSelect); +} + +bool StyleEditor::dirty() const +{ + return _dirty; +} + +void StyleEditor::setDirty(bool dirty) +{ + _dirty = dirty; + if (dirty) { + setWindowTitle("Style Editor* - TikZiT"); + } else { + setWindowTitle("Style Editor - TikZiT"); } } diff --git a/src/gui/styleeditor.h b/src/gui/styleeditor.h index bc548f0..b8bf646 100644 --- a/src/gui/styleeditor.h +++ b/src/gui/styleeditor.h @@ -24,6 +24,9 @@ public: void save(); void closeEvent(QCloseEvent *event) override; + bool dirty() const; + void setDirty(bool dirty); + public slots: void refreshDisplay(); void nodeItemChanged(QModelIndex sel); @@ -49,6 +52,14 @@ public slots: void on_propertyDown_clicked(); void on_addStyle_clicked(); + void on_removeStyle_clicked(); + void on_styleUp_clicked(); + void on_styleDown_clicked(); + + void on_addEdgeStyle_clicked(); + void on_removeEdgeStyle_clicked(); + void on_edgeStyleUp_clicked(); + void on_edgeStyleDown_clicked(); void on_save_clicked(); @@ -65,6 +76,9 @@ private: void refreshActiveStyle(); TikzStyles *_styles; void updateColor(QPushButton *btn, QString name, QString propName); + void selectNodeStyle(int i); + void selectEdgeStyle(int i); + QVector _formWidgets; bool _dirty; -- cgit v1.2.3 From 65f489fc6ac4dc27c2107d517ed81ecbeeca9e0e Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 11 Sep 2018 10:41:06 +0200 Subject: added mac icon --- tikzit.pro | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tikzit.pro b/tikzit.pro index 5ff61fa..e1d30ea 100644 --- a/tikzit.pro +++ b/tikzit.pro @@ -12,6 +12,7 @@ TEMPLATE = app win32:RC_ICONS += images/tikzit.ico win32:RC_ICONS += images/tikzdoc.ico +macx:ICON = images/tikzit.icns # The following define makes your compiler emit warnings if you use # any feature of Qt which as been marked as deprecated (the exact warnings @@ -107,3 +108,4 @@ test { } else { SOURCES += src/main.cpp } + -- cgit v1.2.3 From 27521c4f1312a66dd3e196cd4f4912c8fe51695d Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 9 Oct 2018 12:59:33 +0200 Subject: mac icon 2 --- deploy-osx.sh | 5 +++++ images/logo1024.png | Bin 0 -> 38749 bytes images/logo128.png | Bin 0 -> 3863 bytes images/logo16.png | Bin 0 -> 526 bytes images/logo256.png | Bin 0 -> 8439 bytes images/logo32.png | Bin 0 -> 1076 bytes images/logo512.png | Bin 0 -> 17593 bytes images/logo64.png | Bin 0 -> 1876 bytes images/tikzit.icns | Bin 0 -> 153301 bytes 9 files changed, 5 insertions(+) create mode 100755 deploy-osx.sh create mode 100644 images/logo1024.png create mode 100644 images/logo128.png create mode 100644 images/logo16.png create mode 100644 images/logo256.png create mode 100644 images/logo32.png create mode 100644 images/logo512.png create mode 100644 images/logo64.png create mode 100644 images/tikzit.icns diff --git a/deploy-osx.sh b/deploy-osx.sh new file mode 100755 index 0000000..a04f7f7 --- /dev/null +++ b/deploy-osx.sh @@ -0,0 +1,5 @@ +# deploy the Mac app bundle. Note the bin/ directory +# of Qt should be in your PATH + +macdeployqt tikzit.app + diff --git a/images/logo1024.png b/images/logo1024.png new file mode 100644 index 0000000..f47872d Binary files /dev/null and b/images/logo1024.png differ diff --git a/images/logo128.png b/images/logo128.png new file mode 100644 index 0000000..9332929 Binary files /dev/null and b/images/logo128.png differ diff --git a/images/logo16.png b/images/logo16.png new file mode 100644 index 0000000..e96712c Binary files /dev/null and b/images/logo16.png differ diff --git a/images/logo256.png b/images/logo256.png new file mode 100644 index 0000000..d63ad45 Binary files /dev/null and b/images/logo256.png differ diff --git a/images/logo32.png b/images/logo32.png new file mode 100644 index 0000000..f8d149b Binary files /dev/null and b/images/logo32.png differ diff --git a/images/logo512.png b/images/logo512.png new file mode 100644 index 0000000..5f9d53d Binary files /dev/null and b/images/logo512.png differ diff --git a/images/logo64.png b/images/logo64.png new file mode 100644 index 0000000..b2a308b Binary files /dev/null and b/images/logo64.png differ diff --git a/images/tikzit.icns b/images/tikzit.icns new file mode 100644 index 0000000..04a702d Binary files /dev/null and b/images/tikzit.icns differ -- cgit v1.2.3 From 6ead01f547f14604e9cf999c146d0cbb59386735 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 9 Oct 2018 16:19:48 +0200 Subject: fixed bug when there are no styles --- src/data/stylelist.cpp | 2 +- tikzlexer.h | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/data/stylelist.cpp b/src/data/stylelist.cpp index 14302c7..bc2ef37 100644 --- a/src/data/stylelist.cpp +++ b/src/data/stylelist.cpp @@ -51,7 +51,7 @@ void StyleList::removeNthStyle(int n) void StyleList::clear() { int n = numInCategory(); - if (n > 0) { + if (n > 1) { beginRemoveRows(QModelIndex(), 1, n - 1); _styles.clear(); if (_edgeStyles) _styles << noneEdgeStyle; diff --git a/tikzlexer.h b/tikzlexer.h index 438947f..8169c03 100644 --- a/tikzlexer.h +++ b/tikzlexer.h @@ -2,9 +2,9 @@ #define yyHEADER_H 1 #define yyIN_HEADER 1 -#line 6 "tikzlexer.h" +#line 5 "tikzlexer.h" -#line 8 "tikzlexer.h" +#line 7 "tikzlexer.h" #define YY_INT_ALIGNED short int @@ -259,7 +259,7 @@ void yyfree ( void * , yyscan_t yyscanner ); */ #include #endif - + #define YY_EXTRA_TYPE TikzAssembler * int yylex_init (yyscan_t* scanner); @@ -518,8 +518,8 @@ extern int yylex \ #undef yyTABLES_NAME #endif -#line 195 "src/data/tikzlexer.l" +#line 195 "src\\data\\tikzlexer.l" -#line 524 "tikzlexer.h" +#line 523 "tikzlexer.h" #undef yyIN_HEADER #endif /* yyHEADER_H */ -- cgit v1.2.3 From f70f809b9f8fc940edcdfedb4f3bdf21fd82773b Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Wed, 10 Oct 2018 07:51:10 +0200 Subject: fixed edit icon --- images/Inkscape_icons_draw_calligraphic.svg | 201 ---- images/Inkscape_icons_draw_ellipse.svg | 117 -- images/Inkscape_icons_draw_path.svg | 177 --- images/Inkscape_icons_draw_rectangle.svg | 95 -- images/Inkscape_icons_edit_select_all.svg | 1513 -------------------------- images/Inkscape_icons_node_segment_curve.svg | 50 - images/text-x-generic_with_pencil.svg | 531 +++++++++ src/gui/stylepalette.ui | 20 +- tikzit.qrc | 7 +- 9 files changed, 551 insertions(+), 2160 deletions(-) delete mode 100644 images/Inkscape_icons_draw_calligraphic.svg delete mode 100644 images/Inkscape_icons_draw_ellipse.svg delete mode 100644 images/Inkscape_icons_draw_path.svg delete mode 100644 images/Inkscape_icons_draw_rectangle.svg delete mode 100644 images/Inkscape_icons_edit_select_all.svg delete mode 100644 images/Inkscape_icons_node_segment_curve.svg create mode 100644 images/text-x-generic_with_pencil.svg diff --git a/images/Inkscape_icons_draw_calligraphic.svg b/images/Inkscape_icons_draw_calligraphic.svg deleted file mode 100644 index e1b3352..0000000 --- a/images/Inkscape_icons_draw_calligraphic.svg +++ /dev/null @@ -1,201 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - diff --git a/images/Inkscape_icons_draw_ellipse.svg b/images/Inkscape_icons_draw_ellipse.svg deleted file mode 100644 index 26c4446..0000000 --- a/images/Inkscape_icons_draw_ellipse.svg +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/images/Inkscape_icons_draw_path.svg b/images/Inkscape_icons_draw_path.svg deleted file mode 100644 index b7cb2db..0000000 --- a/images/Inkscape_icons_draw_path.svg +++ /dev/null @@ -1,177 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - diff --git a/images/Inkscape_icons_draw_rectangle.svg b/images/Inkscape_icons_draw_rectangle.svg deleted file mode 100644 index 7504d56..0000000 --- a/images/Inkscape_icons_draw_rectangle.svg +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - diff --git a/images/Inkscape_icons_edit_select_all.svg b/images/Inkscape_icons_edit_select_all.svg deleted file mode 100644 index 0da2e0b..0000000 --- a/images/Inkscape_icons_edit_select_all.svg +++ /dev/null @@ -1,1513 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/images/Inkscape_icons_node_segment_curve.svg b/images/Inkscape_icons_node_segment_curve.svg deleted file mode 100644 index fad6969..0000000 --- a/images/Inkscape_icons_node_segment_curve.svg +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/images/text-x-generic_with_pencil.svg b/images/text-x-generic_with_pencil.svg new file mode 100644 index 0000000..558adf6 --- /dev/null +++ b/images/text-x-generic_with_pencil.svg @@ -0,0 +1,531 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/gui/stylepalette.ui b/src/gui/stylepalette.ui index 39e796b..14a4d36 100644 --- a/src/gui/stylepalette.ui +++ b/src/gui/stylepalette.ui @@ -74,6 +74,12 @@ :/images/document-open.svg:/images/document-open.svg + + + 16 + 16 + + @@ -86,7 +92,13 @@ - :/images/document-new.svg:/images/document-new.svg + :/images/text-x-generic_with_pencil.svg:/images/text-x-generic_with_pencil.svg + + + + 16 + 16 + @@ -102,6 +114,12 @@ :/images/refresh.svg:/images/refresh.svg + + + 16 + 16 + + diff --git a/tikzit.qrc b/tikzit.qrc index b3852aa..cf212fe 100644 --- a/tikzit.qrc +++ b/tikzit.qrc @@ -1,11 +1,5 @@ - images/draw-ellipse.png - images/draw-path.png - images/select-rectangular.png - images/transform-crop-and-resize.png - images/document-new.png - images/document-open.png images/document-new.svg images/document-open.svg images/edge-ak.svg @@ -13,6 +7,7 @@ images/select-ak.svg images/refresh.svg images/logo.png + images/text-x-generic_with_pencil.svg qt.conf -- cgit v1.2.3 From 5c2883738ee689483edf202c83f9b657e56fceff Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Wed, 10 Oct 2018 07:58:19 +0200 Subject: relocated icons to standard folders --- images/logo1024.png | Bin 38749 -> 0 bytes images/logo128.png | Bin 3863 -> 0 bytes images/logo16.png | Bin 526 -> 0 bytes images/logo256.png | Bin 8439 -> 0 bytes images/logo32.png | Bin 1076 -> 0 bytes images/logo512.png | Bin 17593 -> 0 bytes images/logo64.png | Bin 1876 -> 0 bytes share/icons/hicolor/1024x1024/apps/tikzit.png | Bin 0 -> 38749 bytes share/icons/hicolor/128x128/apps/tikzit.png | Bin 0 -> 3863 bytes share/icons/hicolor/16x16/apps/tikzit.png | Bin 0 -> 526 bytes share/icons/hicolor/256x256/apps/tikzit.png | Bin 0 -> 8439 bytes share/icons/hicolor/32x32/apps/tikzit.png | Bin 0 -> 1076 bytes share/icons/hicolor/512x512/apps/tikzit.png | Bin 0 -> 17593 bytes share/icons/hicolor/64x64/apps/tikzit.png | Bin 0 -> 1876 bytes 14 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 images/logo1024.png delete mode 100644 images/logo128.png delete mode 100644 images/logo16.png delete mode 100644 images/logo256.png delete mode 100644 images/logo32.png delete mode 100644 images/logo512.png delete mode 100644 images/logo64.png create mode 100644 share/icons/hicolor/1024x1024/apps/tikzit.png create mode 100644 share/icons/hicolor/128x128/apps/tikzit.png create mode 100644 share/icons/hicolor/16x16/apps/tikzit.png create mode 100644 share/icons/hicolor/256x256/apps/tikzit.png create mode 100644 share/icons/hicolor/32x32/apps/tikzit.png create mode 100644 share/icons/hicolor/512x512/apps/tikzit.png create mode 100644 share/icons/hicolor/64x64/apps/tikzit.png diff --git a/images/logo1024.png b/images/logo1024.png deleted file mode 100644 index f47872d..0000000 Binary files a/images/logo1024.png and /dev/null differ diff --git a/images/logo128.png b/images/logo128.png deleted file mode 100644 index 9332929..0000000 Binary files a/images/logo128.png and /dev/null differ diff --git a/images/logo16.png b/images/logo16.png deleted file mode 100644 index e96712c..0000000 Binary files a/images/logo16.png and /dev/null differ diff --git a/images/logo256.png b/images/logo256.png deleted file mode 100644 index d63ad45..0000000 Binary files a/images/logo256.png and /dev/null differ diff --git a/images/logo32.png b/images/logo32.png deleted file mode 100644 index f8d149b..0000000 Binary files a/images/logo32.png and /dev/null differ diff --git a/images/logo512.png b/images/logo512.png deleted file mode 100644 index 5f9d53d..0000000 Binary files a/images/logo512.png and /dev/null differ diff --git a/images/logo64.png b/images/logo64.png deleted file mode 100644 index b2a308b..0000000 Binary files a/images/logo64.png and /dev/null differ diff --git a/share/icons/hicolor/1024x1024/apps/tikzit.png b/share/icons/hicolor/1024x1024/apps/tikzit.png new file mode 100644 index 0000000..f47872d Binary files /dev/null and b/share/icons/hicolor/1024x1024/apps/tikzit.png differ diff --git a/share/icons/hicolor/128x128/apps/tikzit.png b/share/icons/hicolor/128x128/apps/tikzit.png new file mode 100644 index 0000000..9332929 Binary files /dev/null and b/share/icons/hicolor/128x128/apps/tikzit.png differ diff --git a/share/icons/hicolor/16x16/apps/tikzit.png b/share/icons/hicolor/16x16/apps/tikzit.png new file mode 100644 index 0000000..e96712c Binary files /dev/null and b/share/icons/hicolor/16x16/apps/tikzit.png differ diff --git a/share/icons/hicolor/256x256/apps/tikzit.png b/share/icons/hicolor/256x256/apps/tikzit.png new file mode 100644 index 0000000..d63ad45 Binary files /dev/null and b/share/icons/hicolor/256x256/apps/tikzit.png differ diff --git a/share/icons/hicolor/32x32/apps/tikzit.png b/share/icons/hicolor/32x32/apps/tikzit.png new file mode 100644 index 0000000..f8d149b Binary files /dev/null and b/share/icons/hicolor/32x32/apps/tikzit.png differ diff --git a/share/icons/hicolor/512x512/apps/tikzit.png b/share/icons/hicolor/512x512/apps/tikzit.png new file mode 100644 index 0000000..5f9d53d Binary files /dev/null and b/share/icons/hicolor/512x512/apps/tikzit.png differ diff --git a/share/icons/hicolor/64x64/apps/tikzit.png b/share/icons/hicolor/64x64/apps/tikzit.png new file mode 100644 index 0000000..b2a308b Binary files /dev/null and b/share/icons/hicolor/64x64/apps/tikzit.png differ -- cgit v1.2.3 From b43ce81422cfce98836887c6a485793e47f86e9e Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Wed, 10 Oct 2018 08:00:16 +0200 Subject: removed old icons --- images/tikzit128x128.png | Bin 6525 -> 0 bytes images/tikzit48x48.png | Bin 2435 -> 0 bytes images/tikzit512x512.png | Bin 27019 -> 0 bytes 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 images/tikzit128x128.png delete mode 100644 images/tikzit48x48.png delete mode 100644 images/tikzit512x512.png diff --git a/images/tikzit128x128.png b/images/tikzit128x128.png deleted file mode 100644 index 2b09b4e..0000000 Binary files a/images/tikzit128x128.png and /dev/null differ diff --git a/images/tikzit48x48.png b/images/tikzit48x48.png deleted file mode 100644 index 802d504..0000000 Binary files a/images/tikzit48x48.png and /dev/null differ diff --git a/images/tikzit512x512.png b/images/tikzit512x512.png deleted file mode 100644 index 89b17ec..0000000 Binary files a/images/tikzit512x512.png and /dev/null differ -- cgit v1.2.3 From 0a01b053c5b4cb02e1fef8c9dabbe38a883426eb Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Wed, 10 Oct 2018 08:03:09 +0200 Subject: svg --- images/tikzit.ai | 967 --------------------------- share/icons/hicolor/scalable/apps/tikzit.svg | 268 ++++++++ 2 files changed, 268 insertions(+), 967 deletions(-) delete mode 100644 images/tikzit.ai create mode 100644 share/icons/hicolor/scalable/apps/tikzit.svg diff --git a/images/tikzit.ai b/images/tikzit.ai deleted file mode 100644 index b1a8b89..0000000 --- a/images/tikzit.ai +++ /dev/null @@ -1,967 +0,0 @@ -%PDF-1.5 %âãÏÓ -1 0 obj <>/OCGs[5 0 R 6 0 R 7 0 R 8 0 R 71 0 R 72 0 R 73 0 R 74 0 R]>>/Pages 3 0 R/Type/Catalog>> endobj 2 0 obj <>stream - - - - - application/pdf - - - tikzit - - - - - Adobe Illustrator CS5 - 2011-07-30T18:14:32+01:00 - 2018-01-10T09:38:56+01:00 - 2018-01-10T09:38:56+01:00 - - - - 256 - 236 - JPEG - /9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgA7AEAAwER AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE 1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp 0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo +DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8A9U4q7FXYq7FXYq7FXYq7 FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7F XYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FX Yq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXY q7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq 7FXYq7FXYq7FXYq7FXYq7FUJqmr6VpNk99qt5BYWUX95c3MiQxL83cqoxV495s/5y5/KjRTJDpsl zr90mwFlFwh5DxmmMe3ugbFXmGo/85mee9VufqvlXytbRSPXhHKZ7+Y79QsP1cfgcVQ6/mB/zmRr vxWOnX9lFINgulwW6kMBQh7qLl71DYqv/Rf/ADmzenl6l8hTb/enTbcfd6kdcVaN7/zmxpy86X7h fgp6Wm3R2/yeMtenXFVr/wDOQ/8Azkr5YBfzH5d9SBPty6hplxbrSvUSQmBPau+Ksn8t/wDObmiy lI/Mnly4tOzXFhKlwvz9KUQkD/ZnFXs/kz85vy084lItD123kvH2FhOTb3NfBYpQjP8A7CoxVmuK uxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KoTVtY0rR9Pm1LVbuGxsLdeU91c Oscaj3ZiBv2xV8z/AJk/85iF520j8t7I3Mzt6S6xdRMeTNsPq1t9pj4GQf7DFWKaR+Qf51/mbeJr fnzVZdNt5fiVtQLS3IU9orJSiQr/AJJKf6uKvZvKP/OLn5S6AqSXVg+u3i7mfUXLpXvSBOENP9ZW +eKvU9L0rSNJtha6XZW9hbDpBaxJDGKf5MYUYqjPUxV3qYq71MVd6mKsU8z/AJW/lz5nV/035esr qWSvK5EQiuN/+L4uEv8Aw2KvE/Ov/OGejzh7nybrEljP1Wx1D97CT2CzIBIg/wBZXxVhtn+Y3/OQ f5K3kVj5mt5dT0IEJEl8xuLd1Ha3vV5Mhp0Riad0xV9E/lb+fvkP8wkS2srg6drpWsmj3ZCykjr6 L/YmX/V+Km5UYq9JxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KsF/Nb84fKn5b6R9a 1WT6xqc6k6fpETATzkbVPX04wftOwp4VO2KvliGz/N//AJyH8wG7u5vqHlq2kIVyHWwth/LDHWs8 3Hqa18Sopir6S/LX8mfI/kC3VtKtfrGqlaT6vdAPcNXqENKRL/koB7164qz31MVd6mKu9TFXepir vUxV3qYq71MVd6mKu9TFUPfWljqFnLZX9vFd2c6lJ7adFkjdT2ZGBUj54q+cPzU/5xTiLvrv5cyG 0vIm9Y6M8hVSynlytZiaxsD0VjTwI6Yqt/KD/nKLVtI1BfKH5oiWOSBxbprM6lZ4XGwS9UirD/iz r/NX7WKvqiCeC4gjngkWWCVQ8UqEMjowqrKw2II3BGKr8VdirsVdirsVdirsVdirsVdirsVdirsV dirsVebfnd+dOkflp5fElEvPMV6Cul6aW+YM8wBqIkP0sdh3IVfOP5XflT5m/NvzBL548+3M8mkS ycubnhJeshp6UVKenAlOJK0/lXepVV9ZabYafpdhBp+nW8dpY2qCO3t4lCIiDoFAxVFepirvUxV3 qYq71MVd6mKu9TFXepirvUxV3qYq71MVd6mKu9TFXmv5w/kr5e/MOwM1EsPMcCUs9VVa8gOkU4FC 8fh3XqO4Krxn8n/zi8y/lJ5kk8hefo5V0JJOAZ6u1kzHaWEivO3fqVX/AFl3qGVfZEE8FxBHPBIs sEqh4pUIZHRhVWVhsQRuCMVX4q7FXYq7FXYq7FXYq7FXYq7FXYq7FXYqxj8yPzA0byF5SvPMWqHk sA4WtqCFe4uHr6cKV/mO5NNlBPbFXyR+W3kvzB+dPnu986ecXaTRYZh66/EqSsu6WUG/wRRqfioa ge7VxV9a20Nta28VtbRLBbwIscMMahURFFFVVGwAHQYqqc8VdzxV3PFXc8VdzxV3PFXc8VdzxV3P FXc8VdzxV3PFXc8VdzxV53+c/wCU2m/mFoBVAkHmCyUtpl6QBU9fRlNCTG//AAp38QVXm/8AzjH+ b+o+XdbP5W+cS1uqzNb6Q8+zW91yo1o5/kkb+7/yttwwoq+scVdirsVdirsVdirsVdirsVdirsVd iriQBU7AdTir4n/NjzTqv51/m9a+VdBmJ8vadK1vaSrvHxQ/6VfMNq/ZoniAKbscVfTHlrQNL8t6 FZaJpUQhsbGMRxLtU03Z2IpVnarMe5xVM+eKu54q7nirueKu54q7nirueKu54q7nirueKu54q7ni rueKu54q7nirueKvn7/nJ38sfrdmPPejRlNRsAo1YRVDPAtAk44/tQ9GP8u/7OKvXP8AnHf81/8A lYPkaN76QN5h0gra6sNgZDT91cUH+/VBr/lBu1MVepYq7FXYq7FXYq7FXYq7FXYq7FXYq8h/5yf/ ADGbyd+W89rZycNY8wFrCzINGSIr/pMo7/DGeII6MynFXn3/ADjF5BTRPKjeZbtKalroBhqN47ND 8AH/ABlb4z7cfDFXtPP3xV3P3xV3P3xV3P3xV3P3xV3P3xV3P3xVDX+rabp0Hr6heQ2cHT1biRIk /wCCcgYqkzfmV+X6mh8y6Z9F3CR+DYqjNN84eVdTmEOnazZXk5/3TBcRSP8A8CrE4qm3P3xV3P3x V3P3xV3P3xV3P3xV3P3xV3P3xVTuIoLm3lt7hFlgmRo5YnAZWRhRlYHqCDir5Y8tao/5Gfnw8FxK 6+V7s+ncMQz8tOuTWOUqoZma3cb0Wp4sB1xV9Bv/AM5Xfkirso1mZwCQGFldUPuKxg4qn2g/n9+T uuSLFY+abRJX2VLv1LIknsPrSwgn5Yqz6KWKWNZYnWSNwGR1IKkHoQR1xVdirsVdirsVdirsVdir sVfF3586hP8AmP8A85A2flC2lrp+lvHpoKmoBH76+kH+Uu6n/UxV9HWsNva20NrboIreBFihjXoq IOKqPkBiqr6gxV3qDFXeoMVd6gxV3qDFULqmsadpVhNqGo3CWtlbrymnkNFUdPpJOwA3JxV8+eff +ci9ZvpJbLyov6PsRVf0hIA1zIOlUBqsQP0t3qOmKvH7+/1DULlrq/uZbu5f7c87tI5+bMScVQ3H FXccVZx5P/OHzx5YdEhvmvtPWgNheEyx8R2RiecftxNPEHFX0f8Al/8Amj5e86WhNmTbalCoa606 UgyIOhZDtzSu3IfSBXFWX+oMVd6gxV3qDFXeoMVd6gxV3qDFWFfmD+VHlTz3c2FzrRnSTTw6o1s6 xmRJCDwkLK5KgrUUp1xVJE/5xw/KVUCnTZnI6s11PU/cwGKpBrn/ADir5Luo2bR9RvNNuCPhEpS5 hB/1SI3/AOHxVg/1H88/yRn+vaTetd+XkblKIi1xYMCd/Xt2o0RPQuKez4q+kPyY/wCcgfLP5jwi xdRpfmaJOU+lu3JZQo+KS3c05r3K/aX3G+KvVcVdirsVdirsVdiqC1zVrbR9F1DV7ra2062mu5zW n7uCMyNv8lxV8Z/840WNxrfnjzB5uv8A95cxqxaQ97i/kZ3cV78UYf7LFX0pzxV3PFXc8VdzxV3P FVktxHFG8srhI41LO7GgCgVJJPYYq+VvzY/Mu884au1vbSMmgWbkWcG6+ow29eQd2b9kH7I961VY DxxV3HFXccVdxxV3HFUZpGralo+pQalps7W17bNzhmTqD0IIOxBGxB2IxV9a/lz58tfOHl2O/QLH fRUi1C2H7EoHVa78H6r93UHFWU88VdzxV3PFXc8VdzxVKdd83+W9AjEmsajBZ1FVjkb94w6VWNau 30DFWMf8r0/LT1OP6Vbh/vz6vccfu9Pl+GKso0PzZ5e16Iy6PqEF6AOTrG45qD/PGaOv+yGKpnJw kRo5FDxuCrowBBB2IIPbFXzh+cn5S3HlO8Xz35IaSyjtJVnure3JVrSStRPBTpHy+0v7P+r9lV9F fkJ+b0H5keUBcXHGPzDppWDWLdRQFiPgnQfySgHbswI8KqvTMVdirsVdirsVeZ/85Jau2l/kr5mm Q0kuIYrNRvuLmeOFx/yLdsVeRf8AOMmmi0/L2W8I+PUL6WQN34RqsQH0MjYq9c54q7nirueKu54q 7nirzP8APrzTLpflNNMt34XOsOYmI6/V4wDLSn83JVPsTir5t44q7jiruOKu44q7jiruOKu44qz7 8lvNMmhedLe3dqWWrEWdwvbmx/cvTxEhpXwJxV9Qc8VdzxV3PFXc8Vecfm5+aTeVrVdM0sq2uXac hIQGW3jJoJCDszGh4g/M+BVfN95d3l9dSXV5M9zczHlLNKxd2PiWNScVUOOKoiwvr7T7uO8sZ3tr qE8o5omKsp9iMVfSn5S/mefNdk9jqPFNcs0DSlaKs8fT1VUdCDQOBt3HWgVZ9PHDcQSQTxrLBMrR yxuAVZGFGVgeoIxV84eSL6b8oP8AnIOKy9Rl0DUZltZKk8Wsr1qRO3j6ElKn/JPjir7gxV2KuxV2 KuxV4V/zmTd+h+UcMVafWtVtoqUrWkU0tPb+7xVJfyQhW3/K3QoxsTHLIa0r+9nkft/rYVZ1zxV3 PFXc8VdzxV3PFXz5/wA5AXzz+b7W15Ex2tmnwdg8juzH6V44FeY8cVdxxV3HFXccVdxxV3HFXccV bQujq6kqykFWGxBHcYq978j/AJ5aVdWsVl5lY2d+gCfXQpMMtNuTcalGPfbj7jpir0e08waJeIHt NQtrhCK8opkcfgThVEfpGy/5aI/+DX+uKoDV/Nvl3SLZrjUNQggRRUKXBdvZUFWY/IYq+V/NOtz6 95hv9XlrW7mZ0Vuqxj4Y02/lQAYFSvjiruOKu44qnXkrXxoHm7SdQMvpKtwkcvvFKfTkFO/wMcVf V0l0W2Gwwq8B/wCcn9Nj56Fq6CkpE1rK3cheMkf3EvgV9heSdXfWvJug6xIayalp1pdvXryngSQ1 +lsVTrFXYq7FXYq8A/5zVBP5V6WQKga5bk+w+qXQxVJ/ynmp+XeglW6WwFR4hiDhVmSXvZ9/cYqr pMj/AGTXFV3PFXc8VdzxV88/nhbsnnlpD0ntoXX5Dkn60wK8/wCOKu44q7jiruOKu44q7jiruOKu 44qyXyr+XfmXzL+8sYBHZg8WvZzwiqOoGxZj/qg4qz+z/wCcfIuIN5rRLftJDAAB8mZzX/gcVRX/ AEL9o3/V2uP+ATFUu1f/AJx/mjt3k0nVBNMoqtvcR8OXt6isaH/Y4q8lmt5YZnhlQxyxsUkRhQqy mhBHiDiqzjiqlcXNtbissgXwHc/R1xVKbrXWNVtl4j+duv0DFVHRYbjUNf0+3BLz3N1DEldzV5Ao /Xir7X9TCrxz/nJe5T/D2j25+2928i/JIiD/AMTGBX1B+T1s9t+VPlCJ/t/oeyYilCOcCPQg+HKm KsvxV2KuxV2KvFv+cvLBrn8mrqcVpY31pcNTwZzBvt4zYq85/JS+E/5b6WtfigM8T/RO5H/CsMKs 59TFW/Vp3xVUS9kXqeQ98VVlv4z9oEfjiqqtxG3RgcVeS/nzo7MdN1lFqAGtJ28OskX/ABvgV5Dx xV3HFXccVdxxV3HFXccVdxxVNfK+hvrfmCx0xa8biUCUrSqxL8UjCvggJxV9Q2kFtaW0VraxLDbw qEiiQUVVHQAYVVeeKu54qsa4jXqwGKvnz879FfRtXbXbO3Mun6k9ZWGyx3B3YN1/vPtD3rgV5Hca 1fTbBhEvgmx+/riqBLFiSxqT1JxVrFXrH5D+R57/AFpfMt5GV0/TyfqfIbS3FKVAI+zHWtf5qe+K vob1MKvBfzlmuPNf5jaL5R00+pOjRWi03Aub11rWnYJwJwK+6NOsbfT9PtrC3HG3tIkghXwSNQij 7hiqIxV2KuxV2KsI/O7Qm1z8pfNWnKvOQ2ElxElKlpLWlygHuWiFMVfL3/OO+qiTy/qemk/Fa3Im A78Z0A/XEcVes+rhQ71cVd6uKu9XFXeriqWeZdJi13QrvSZZGiW5Skcq1qkinkjihH2WANO/TFXy xqc/mDRdSuNNv/gurVyksbqD03BBoKqw3B7jAlYnmW6H24kb5VH8TiqsvmZf2rc/MP8A2YqqDzLa 94nHyocVXDzJY03jlr8l/wCasVcfMlj2jlr8l/5qxVafMtr2ic/OgxV7d+S2jvb2DeYry3Mc96vC xRzuICamSlP92Ebe3scVemnUpOygYULDfzn9qnyGKrGuHb7TE/Tiq31cVUL61s7+0ls72FLi1mXj LDIAysPcHFXjnmf/AJx9V5nn8uXyxRsaiyu+VF9llUMT7Bl+nAlig/I3z/6vD0LcLWnq+uvH5/zf hirLvK//ADj9DFMlx5kvVuFU1Njacgjf60zcWp4hVHzxV7DaQWtnbR2tpEkFtCoSKGNQqKo6AAbD ChJfO3nSx8raHLqNwQ85qlnbV3llI2HyHVj4Yqk3/OJf5eX+veab38y9cQyQ2zyppzyD+9vZv72U D+WJGKj/ACm2+zgS+uMVdirsVdirsVWyRxyxtHIoeNwVdTuCCKEHFXwb5PtJPIn5z6x5TuGKwmae xjLmnII3q20n+zjAp/rYq9r9TCrvUxV3qYq71MVd6mKu9TFXl/55+V7S80H/ABBGgW+08okzj9uC RwlD/qu4I+nFXgmBXYq7FXYq7FWX/lb5ZtfMPm6G1vF52VtG11cxfzrGQoU+xd1r7Yq+m1ZVUKoC qooANgAMKt+pirvUxV3qYq71MVd6mKu9TFXepirvUxViHm/80/LXlyN42mF7qQ2WxgYFg3/FjCqo Pnv7Yqw78vvy189fnd5mXVtXaSy8r2z8Z74LxjVAam3s1bZ5D+02/Hq3ZSFfbehaHpWhaRaaPpNu tpp1jGIba3Toqr+JJO5J3J3OKo7FXYq7FXYq7FXYq+Rf+cxfKFzo3m7RfP2nL6YveFvdSr+zeWnx Qufd4hQf8Y8VTfQNdt9a0az1S3/u7qMPxrXi3R0PurAjChMPUxV3qYq71MVd6mKu9TFWFfnDqcdt 5EvYmNHvHigiHifUEh/4SM4peIeVvJmu+ZbkxabCPSjNJrqSqwpXsWoan2AJwK9BH5AN6ILa4BNT dRbVWvhX1QfpphpUvk/IbzCHIj1GzZOxb1VP3BG/XjSoy0/IG5Za3esxxt/LFAZB97PH+rGlSXzT +TnmDR4HurGRdUtEFXEalJlA7+nVqj/VJ+WBV35H6lHaecmt3NPrtrJFGP8ALUrKP+FRsVe/+phQ 71MVd6mKu9TFXepirvUxV5X+aPnbzBD5i07y95amkXUWKiRIAGeSa4IWGEKQanetKdxgS5rL/nJ+ ImF9C1FnG3qDT426/wCUkfDFUVbfk3/zk15qIiv4prC0kNHku7mG1i60+KKA+oR/zzOKvUfy8/5w 28s6VLFfecr465dIQw063DQ2YI7O1fVl3/1B4g4q+hrKys7G0hs7KCO2tLdRHBbwqEjRF2CqqgAA e2Kq2KuxV2KuxV2KuxV2KsT/ADT8iWnnryLqnlyfis1zHzsZm/3VdR/FC9etOQo1P2SRir4z/KfX bzRNZvvJusI1vcJNIsUUmxjuYjxliPz47e498Vet+phQ71MVd6mKu9TFXepirx7z5c3XnPzva+WN Of8A0SwJFxKN1V/93Of9QDiP8rbvgS9U0bS9P0fTYdOsIxFbQLRR3J7sx7sx3OFCN9TFXepirvUx V3qYq8f/ADL8syeXtYtvN+iIIkWdHuYlHwpNWoeg/Zk6N7/PAl6nomt2msaVbalamsNygcDup6Mp 91OxwqjfUxQ71MVd6mKu9TFUv8wa/aaJo9zqd0f3duhISu7udkQe7NtilJf+cVfId75u8+3n5g60 vqWekys1uzD4Zb+UVAX2gRuXsSmBX2PirsVdirsVdirsVdirsVdirsVdirsVfJ//ADl/+WkOmXtn +ZGkSLaz3E0dtqcQYI7XCqTBcRiu7cY+LgeAb+Y4qk/kbzYPMWhR3bqUuoj6N2KUX1FANV9mBB9s Ksh9TFDvUxV3qYqxfz/5zi8vaM/pOP0ncqUs4+pBOxkI8E/XilLfyn8t/o3RjqtyK6hqgEnJt2WH qgqf5/tn6PDFWdepih3qYq71MVd6mKu9TFUNqVna6jYXFjdLzt7lDHIvsR1HuOoxS8v8h63L5S8x 3vlTVpeNrJL/AKNM2yiQgcTv0WVKfI/Tir1n1MUO9TFXepirvUxV5D5q1DUvP/nfTvJ2jMFie7W0 hMrcEa4ZuDyPX9lBWnfrTrTAl9zeQ/JWkeSvKmn+W9KX/RrGPi8xADzSt8Ukz0/adiT7dBsMVT/F XYq7FXYq7FXYq7FXYq7FXYq7FXYq+Hv+cgPOl7+ZX5rr5b02auiaLI9nbEboZF/3ruD47rxXxCin XFWTaVYWel6fDYWaenbwLxQdz4sfEk7nChJ/OHnrT/LdsocfWL+UVgtVNDT+dzvxX9f30VeRav8A mF5s1OUs9/JbRn7MFqTCgHh8J5N/sicCUqh1/XYXLw6jdRuerJNIp+8HFUPcXlzd3P1i9mkuJWI9 SSRi7kD/ACmqcVfSmn31ndWMFxZOr2kiAwsvTjTYe1OlO2FCI9TFXepirvUxV3qYq71MVd6mKvFP zdvLG580qLZg8sFusV0V6CQMzcT7hWFfuwJYv/iHXxAtuNSuhAgosXrScAOlAvKmKqln5n8x2bhr bU7mOhrxErlT81JKn6Rir0Pyd+bTzzx2PmDgrOeMeoKAi1PQSqNhX+Ybe3fFXpnq++FDzL80/LTw SxeaNLrBcwuhu2iJVgwI9OdSOjK1ASPY+OKX17+Rf5kDz/8Al7Y6tOw/S1tWz1ZBT/emICr0HQSq Vf6adsCvQcVdirsVdirsVdirsVdirsVdirsVY1+ZfmRvLP5f+YNdjbhPYWM0lsx6euUKw/8AJRlx V8P/AJPacvC/1aT4pGYW0bHr2eT76rhV6Ld3sVrazXUxpFAjSyHwVAWP4DFD541nVrrVtTuNQujW Wdi1Oyr0VR7KNsCUFirsVdir0j8ovMMqXM+iTPWGRTNagn7Lr9tR/rD4vowq9S9TFDvUxV3qYq71 MVd6mKpL5v186N5fur2Mj6xQR24P+/H2U7/y/a+jFXgLu8jtJIxd3JZmY1JJ3JJOBK3FXYq7FXs/ 5XeYZdR0JrSdi1xpxEfI7kxMCY6/KhX6MKsrv7aC+sp7OcVhuI2jcezCmKG/+cNNfudL8+a/5TuG pFe2xmCdvrFlJwNPmkrV/wBUYEvsHFXYq7FXYq7FXYq7FXYq7FXYq7FXln/OULun5FeZyrFSRZCo NNmv7cEfSDir5g/K8hfKq02LTyE/PYfwwoTXzjK/+FtT4dTAw+g7H8MVeEYEuxV2KuxVkX5fs6+b 9PKdeUgPyMTV/DFXt3q4UO9XFXerirvVxV3q4qwf82pGOgWq/sfWlJ+fpvT+OJS8nwK7FXYq7FWf flFJIuqX6j+7MClv9YPt+s4Qr1L1cUJD+Q8rQf8AOTdlHEaJcS6gsnuDZTSnp/lLgS+4sVdirsVd irsVdirsVdirsVdirsVYD+feiSa1+T3mqxjUvItkbpUHUmzdbqgHc/ucVfHX5V3wfR7m0rV7ebnT /JkUU/FGwhWXX9ul5ZXFpJUJcRvExHUB1K1H34oeD3tnPZ3ctrcLwmhYo6+4/h4YEqGKuxV2Ks3/ ACv0h5dTl1R1/c2qmOJt95XFDT5JWvzGEK9P5nFCV/4s8uiZ4W1CFJI2KOrtxowNDu1B1xVWTzDo b7pqFswHWk0Z/jiqnJ5o8vRiralbbbECVCfuBJxVE6fq1hqMLTWUyzxKxRnWtAwANN/Y4qlnnXSn 1Xy/cQRKWuIqTQL3LJ1A9ypIGKvFcCXYq7FXYq9T/LDSpLTSpr6VSHvWHpg/77jqAfpJOEKzMyUF TsB1OKEP/wA4p2UmtfnjeaygPoWVteXZbsPWYQov3Sn7sCX2tirsVdirsVdirsVdirsVdirsVdiq 2WKOWJ4pVDxyKVdGFQVIoQR74q/PzXNCn/K/82tR0C8qumGQrbzNWjWcx528tT14igbwIYYq9BEA IBG4PQ4UMV85+QYtbX61aMsGpIKcm+xKo6K9OhHZvo+SryfVND1fS5fSv7WS3atAzD4W/wBVxVW+ g4EoIAk0AqcVZR5c/L3XdWlV5omsrLq08ylWI/yENC1fHpir13TNFtNNsYrK0ThDEKDuSe7Me5OF CA826xFoeizXbEfWGHp2qd2lYbfQv2jiqp+RX/ONtv8AmJ5ZvfMWu311p1vJOYdKaBUPqmOvrSt6 gbkof4RSm4bAln0//OD2hlwYPNd1GlNw9rG5r8xIn6sVV4P+cIfKgA9fzLfueNCUihQcqdd+e1e3 44q8F8rpfeT/ADrqXlHWh6MyTtbPWvEXERojKT+zIv2T3+HCFelfV8UPPvOf5azXM0mo6MoMsh5T 2ZIUMT1aMnap7g/2Yq83u7G8s5jDdwSW8o6pKpQ/ccCVOKKWWRY4kaSRjRUUEkn2AxVnPlT8sdQu pY7rWYzbWY+IWzbSyezAboPGu/68NK9SjtEjRY41CIgCoqigAGwAGKGM/mHrSaToUkSMBeXwMMK9 wpH7x/oU0+ZGKvcf+cQPy/l0HyHceY72PhfeZJFkgDDcWcFRCfEeozO/uOOBL3vFXYq7FXYq7FXY q7FXYq7FXYq7FXYq8f8A+cjfyVH5heXEvtKRR5p0hWaxrRfrMJ+JrZmNOp3jJ2DeAYnFXy95F88t p8h8ueZA1pPauYIppwUaNkPEwzBt1KkUqenQ4UPTxACARQg7gjCrjbAihFR4YqtWyiUkrGqk9SAB iq/6v7Yql+t6rpei2LXmozCGIbKOrO38qL1JwKwPyb5P80fnV54S3gR7TQbMg3t0BWO1tyd9zs00 lPhHf/VXYJfd+haJpmhaNZ6PpcIt9PsIUgtoR+yiCgqe5PUnucVR2KuxV88f85SfkZdeZrcedfLM DS6/YxhNSs4h8dzbxiqyRgdZYhtTqy7DdQCq8V/L/wA/2+pxx6Xq0gi1NKJFM+wnptuT0k/XhQ9A +r+2FWmtVYUZQR4EVxVpLONBRECjwAp+rFV31f2xVKPMnmDSfL9ibq/kAYg+jbrQySN4KP1noMCs b/KT8tNd/OLzs2q6sjweVrB1N/MKhCqnktnA3d2B+I/sjc7lQQl90W9vBbW8VtbxrDbwoscMKAKi Igoqqo2AAFAMVVMVdirsVdirsVdirsVdirsVdirsVdirsVeRfnP/AM45+WfzDD6paOukeaAtBfol YrjiPhW5QULbbBx8QH8wAGKvmHVtF/OX8qJTbaxp0kujxnjHcFWuLEjt6c6f3deysQf8nFUbp354 aJIgGoadcW8ncwFJlr4/EYj+vDaKRr/nT5NVSVhvHI6KIkqfvkAxtaSPUfzovrtxaaBpR+sSnhC8 pMsjMxoAsMY+14fEflja0yvyL/zjR+Znn3UItX88TTaLpTUJFwB9ddK14Q2x2hB8XAp14tgS+uPJ /k3y55P0OHRPL9mlnYQ7lV3eRyAGklc7u7U3J/ViqdYq7FXYq7FXgX51f84saT5tuLjzB5Tkj0nz DKTJc2rilpdOdyx47xSN3YAqT1FSWxV8+Xer/mr+W90umebNJmNuh4RG7U8WA7QXackkH0tja0nV j+dnleVVF3a3VtIftUVJEH+yDK3/AAuG0UiJ/wA5fJcaVjF1M38qRAf8TZcbWmPX/wCcOtanMth5 a0phczHjCSDcTsT04RIKV/4LG1pnP5c/84s+dvNuoR67+Yk82mae5DNZu1b+ZR0Uqarbp8/iH8o6 4Evrby/5e0Xy9pFto+i2kdjptovCC3iFFA6knuzMd2Y7k7nFUwxV2KuxV2KuxV2KuxV2KuxV2Kux V2KuxV2KuxVbJ6fpt6lPToefKnHjTete2KvGPOf/AEKh9Yl/T/8Ah363X9/9U4etyrvz+pfHy8a7 4qxe3/6Eo9ZOH6O5129T9IcPp5/D9+KvXfy//wCVP+mf8B/oTlT95+i/q3rUp/u30/3lafz4qzTF XYq7FXYq7FXYq7FUJq36J/R836X+r/o+n+kfW+Ho8f8AL9T4afPFXg3mv/oTP13/AEp+h/U35fov 6xxrUVp+jfh+7FUm0v8A6Ee+sD6t9X9Tb/er9McOv/Lz8GKvcPIH/KrPqrf4D/Q/o8f336J+r8qV /wB2+j8XX+bFWW4q7FXYq7FXYq7FXYq7FXYq7FX/2Q== - - - - - - xmp.did:F87F117407206811871F8ABB10CFDF09 - uuid:2febaa8e-26d7-aa43-a652-eb95dd2e0916 - uuid:44F4E52A333FDF119697BF3D5A982C1E - proof:pdf - - uuid:807614af-ea61-034d-bdc9-4644d641c546 - uuid:44F4E52A333FDF119697BF3D5A982C1E - uuid:44F4E52A333FDF119697BF3D5A982C1E - - - - - saved - xmp.iid:F87F117407206811871F8ABB10CFDF09 - 2011-07-30T18:14:29+01:00 - Adobe Illustrator CS5 - / - - - - - - Document - Basic RGB - - - 1 - True - False - - 512.000000 - 512.000000 - Pixels - - - - Cyan - Magenta - Yellow - Black - - - - - - Default Swatch Group - 0 - - - - White - RGB - PROCESS - 255 - 255 - 255 - - - Black - RGB - PROCESS - 0 - 0 - 0 - - - RGB Red - RGB - PROCESS - 255 - 0 - 0 - - - RGB Yellow - RGB - PROCESS - 255 - 255 - 0 - - - RGB Green - RGB - PROCESS - 0 - 255 - 0 - - - RGB Cyan - RGB - PROCESS - 0 - 255 - 255 - - - RGB Blue - RGB - PROCESS - 0 - 0 - 255 - - - RGB Magenta - RGB - PROCESS - 255 - 0 - 255 - - - R=193 G=39 B=45 - RGB - PROCESS - 193 - 39 - 45 - - - R=237 G=28 B=36 - RGB - PROCESS - 237 - 28 - 36 - - - R=241 G=90 B=36 - RGB - PROCESS - 241 - 90 - 36 - - - R=247 G=147 B=30 - RGB - PROCESS - 247 - 147 - 30 - - - R=251 G=176 B=59 - RGB - PROCESS - 251 - 176 - 59 - - - R=252 G=238 B=33 - RGB - PROCESS - 252 - 238 - 33 - - - R=217 G=224 B=33 - RGB - PROCESS - 217 - 224 - 33 - - - R=140 G=198 B=63 - RGB - PROCESS - 140 - 198 - 63 - - - R=57 G=181 B=74 - RGB - PROCESS - 57 - 181 - 74 - - - R=0 G=146 B=69 - RGB - PROCESS - 0 - 146 - 69 - - - R=0 G=104 B=55 - RGB - PROCESS - 0 - 104 - 55 - - - R=34 G=181 B=115 - RGB - PROCESS - 34 - 181 - 115 - - - R=0 G=169 B=157 - RGB - PROCESS - 0 - 169 - 157 - - - R=41 G=171 B=226 - RGB - PROCESS - 41 - 171 - 226 - - - R=0 G=113 B=188 - RGB - PROCESS - 0 - 113 - 188 - - - R=46 G=49 B=146 - RGB - PROCESS - 46 - 49 - 146 - - - R=27 G=20 B=100 - RGB - PROCESS - 27 - 20 - 100 - - - R=102 G=45 B=145 - RGB - PROCESS - 102 - 45 - 145 - - - R=147 G=39 B=143 - RGB - PROCESS - 147 - 39 - 143 - - - R=158 G=0 B=93 - RGB - PROCESS - 158 - 0 - 93 - - - R=212 G=20 B=90 - RGB - PROCESS - 212 - 20 - 90 - - - R=237 G=30 B=121 - RGB - PROCESS - 237 - 30 - 121 - - - R=199 G=178 B=153 - RGB - PROCESS - 199 - 178 - 153 - - - R=153 G=134 B=117 - RGB - PROCESS - 153 - 134 - 117 - - - R=115 G=99 B=87 - RGB - PROCESS - 115 - 99 - 87 - - - R=83 G=71 B=65 - RGB - PROCESS - 83 - 71 - 65 - - - R=198 G=156 B=109 - RGB - PROCESS - 198 - 156 - 109 - - - R=166 G=124 B=82 - RGB - PROCESS - 166 - 124 - 82 - - - R=140 G=98 B=57 - RGB - PROCESS - 140 - 98 - 57 - - - R=117 G=76 B=36 - RGB - PROCESS - 117 - 76 - 36 - - - R=96 G=56 B=19 - RGB - PROCESS - 96 - 56 - 19 - - - R=66 G=33 B=11 - RGB - PROCESS - 66 - 33 - 11 - - - - - - Grayscale - 1 - - - - K=100 - GRAY - PROCESS - 255 - - - K=90 - GRAY - PROCESS - 229 - - - K=80 - GRAY - PROCESS - 204 - - - K=70 - GRAY - PROCESS - 178 - - - K=60 - GRAY - PROCESS - 153 - - - K=50 - GRAY - PROCESS - 127 - - - K=40 - GRAY - PROCESS - 101 - - - K=30 - GRAY - PROCESS - 76 - - - K=20 - GRAY - PROCESS - 50 - - - K=10 - GRAY - PROCESS - 25 - - - R=241 G=241 B=242 - GRAY - PROCESS - 12 - - - - - - - - - Adobe PDF library 9.90 - - - - - - - - - - - - - - - - - - - - - - - - - endstream endobj 3 0 obj <> endobj 10 0 obj <>/Resources<>/ExtGState<>/Properties<>/Shading<>/XObject<>>>/Thumb 90 0 R/TrimBox[0.0 0.0 512.0 512.0]/Type/Page>> endobj 76 0 obj <>stream -H‰ÜW˲7 Ý÷WøÚ×’üÜr¬HŠº‹°¿•„ÅL(‚ßÏ9î¶{¦¤*• u™‘Æ’õ:’üðË£{xóÜ‹—nù¸—DûßÊÿþúmùÕý þÃOOÁýñiyx} îå‡åíòê 6qÙÄßâ FoÚœÖìcPwŒ(¾ª8k>Tq‚ϵ¹l¾es’‹Ïâž—{ú²$ñ-D'É|?FŸJub ¤NR²k?1.ƒQ̇`®4ŸbrV}°ìD6 êy¹§/‹¤ìK”y¼&Ÿ‚Ó|¸£eoÅ\ ^»é'ÆeÑ} ÅÕ涫B’]­>5D·IÔórOCÚ¡Tæq.¶® ºbñZû]R¥ïOÅ×im¶ÒóÑ`‹_|Tñ!µA>/'Æe±½4›N¸‚AýN‰ q?1.“DÅHqd¿¥žG‰D4­=Í‚ôBÁ‰C !Y„xõQ¡®% <ϘB¼yðnã£XtQX¹Ó¨DÐøyR¿£!žµËÍóaÀ¨'ðºoѨáĹLŽ!‘58tZfLònà† ƒ†Ú…°]¬¸ iw+|ð)ÄZ‘æ;â8Ü ¿)ë°P¡f]—ïÜÃÓûà>½w¯Þ¹·½Õ|½W=<âêÇ'ú?÷ôøó"Á}vѽqÓ®NúÏ[%¤ÖFàSåmü麬ÉÓ:·¢ª¢%g’ HT~‚„ÇkL¨-uéiàâçDª/(ÁUP1OrÕ<ÂhjA© u Ü'½‚>v™Á5Ï­p¤~# -¢¤ NJ=ËýÊÚ{Újì¤poU½è«€H4ÕvæÄæ-l6N^SÄ_,"Q‰+þ‚ž¢“†¢Ä+Bx1ëm.#H­ðRóªü‚ ÐR»*½P“–ܻتˆ»OçT^ºGq2 &h-êí!†$m  «ám ÅPd%¤Í&v«UL{gïfô§ý&ÑþÁ€bËî}œQVEÛT˜™Éˆ­§ž BÝ…Ø"³¡>dªcŸRúWÑ7´ ±¬7¡{'u¤/P¦47öщ:ä|é¡€v#¥'°„©ë4‰áøŠ&a éà”Š†KpbR º²¾-¤a<îò¼ž—÷ËÓiÐc(JèxH&‘Á¡’Ô)*9"ñ¯_@R1;rÅ åìSÖÿ€dàõ¹1y©eWˆÉýsÿ`–ÑÈ82ÆI¬òƒýðN¬ýWÆz—ÞôNõ;Ixl×ïŒ0%· üïÑGáìg÷C9¶eû¦{ð¡ L¾æ‘ræ²N1ƒÑ8:kfëÇg$®ÌË\œ¿SS‘)½“ÝýûªÛV7$דêõнß=8aʉúq¼Ù²Ó·ð°¢q ²í^ Ò¢EîuÐe4 s–ƒÜ¸_rï4V²çrpÐñ°à‘3´ìœy G–×a‡qföiyæ\ºe\ò´qR7i ?ë·ÝûËð*À¬›·^¿fÙ—Ö©ƒ“70ÌpZTʘ/UAc -¡å)žVúš|âpÃR¬±Ëú¤pSãÔÁÍ‹‘9t Φ£ß å/îÕ“¿7[–²uâtÎ)oe |_VÇáB)P‡ïM³½Û”ÜmSÿ­WsÕÌÜ~¸Ë` }2õ2ù ™t½‡ŒÞ@F÷²/nHž¡2è™:9aÊþc§þÞݺéH|Á¼æÓ%}ÅÃ%ƒOØ“±<5>•°g`pwêË)@2‹þÌÁã²baBp -q’;K®¢‚ݤW*ÅD:°~ T`íç£JOèh\‰¢ãZSêÖB n7ìÒßQ}K'{I葤LM±÷Ž -íÀº»z -íDµo]îÌ¡/ôA/¹fÄ'Ñž…ïCt" õÓ¥øúJAke9s Ï¥Ü±£iB¿Ø²øP½OÓá`&µ^RÍÚ „óØ3Ñ…φØÐB$#µIDh]+Õ Ùž ×ÿôÂ’Az¾Wt|ôß»[è%Ud°Î¾‚ƒ±TòM™K,€Ä ” k:b|»ä¸9Ôúón@T"eeB˜oŒÜnaæP^¡œ£U€QhéÞJ¨9› uÜs #£™ÐŽÙ¡„ÏWb`ïjŒ0›^(ž¿´ÝÓgròO¾#Y½„Yl·ˆ?sh^JÜö.Á@+ÇòÞEÎI:c~ýЯ7¨Ç¤ÏV¬p‰‰\jJàOÔÛDýíKÍŽ—ZpI´ÿ­üo‡~7ÆhÌÃ뫸—ÆSïíò·…‰R endstream endobj 77 0 obj <> endobj 90 0 obj <>stream -8;ZD.gPs,o%!4_eHG&pt:\mXE#6aOKEBq.IT0"9n@!b"'E$!X((QH?s"5?G?K#P20 -O/d)\T,/P1'qS?i"`crJ?H8d*KjRXIZ+u6FTjS-):gaeT(>+?(!Z6FT)AEal%;;Q@ -kb3O4qsuY.N]*EB(@]Z27":::JI9hMb@0>:^nab-+NNs/JHE@q?G;3L!m9!^.::8g -iM>Jef*'=g%mLeUpPAmn5I8u&(:V"^JE7%&U-SUuQX1AZ47 -)b\i'orh[PJOC%+(N\UM53;RTZn-;X. -d$#BDrYE[.o3UD]5(MDElGJ=9>,`#5E]% -cN&-!^1@~> endstream endobj 92 0 obj [/Indexed/DeviceRGB 255 93 0 R] endobj 93 0 obj <>stream -8;X]O>EqN@%''O_@%e@?J;%+8(9e>X=MR6S?i^YgA3=].HDXF.R$lIL@"pJ+EP(%0 -b]6ajmNZn*!='OQZeQ^Y*,=]?C.B+\Ulg9dhD*"iC[;*=3`oP1[!S^)?1)IZ4dup` -E1r!/,*0[*9.aFIR2&b-C#soRZ7Dl%MLY\.?d>Mn -6%Q2oYfNRF$$+ON<+]RUJmC0InDZ4OTs0S!saG>GGKUlQ*Q?45:CI&4J'_2j$XKrcYp0n+Xl_nU*O( -l[$6Nn+Z_Nq0]s7hs]`XX1nZ8&94a\~> endstream endobj 88 0 obj <>/ExtGState<>>>/Subtype/Form>>stream -/CS0 cs 0 0 0 scn -/GS0 gs -507.579 6.422 -494.579 114.578 re -f - endstream endobj 89 0 obj <>/ExtGState<>>>/Subtype/Form>>stream -/CS0 cs 1 1 1 scn -/GS0 gs -q 1 0 0 1 536.5762 405.4023 cm -0 0 m -0 -88.638 -130.614 -160.492 -291.735 -160.492 c --452.856 -160.492 -583.471 -88.638 -583.471 0 c --583.471 88.637 -452.856 160.492 -291.735 160.492 c --130.614 160.492 0 88.637 0 0 c -f -Q - endstream endobj 95 0 obj <> endobj 81 0 obj <> endobj 79 0 obj [/ICCBased 96 0 R] endobj 96 0 obj <>stream -H‰œ–yTSwÇoÉž•°Ãc [€°5la‘QIBHØADED„ª•2ÖmtFOE.®c­Ö}êÒõ0êè8´׎8GNg¦Óïï÷9÷wïïÝß½÷ó '¥ªµÕ0 Ö ÏJŒÅb¤  - 2y­.-;!à’ÆK°ZÜ ü‹ž^i½"LÊÀ0ðÿ‰-×é @8(”µrœ;q®ª7èLöœy¥•&†Qëñq¶4±jž½ç|æ9ÚÄ -V³)gB£0ñiœWו8#©8wÕ©•õ8_Å٥ʨQãüÜ«QÊj@é&»A)/ÇÙgº>'K‚óÈtÕ;\ú” Ó¥$ÕºF½ZUnÀÜå˜(4TŒ%)ë«”ƒ0C&¯”阤Z£“i˜¿óœ8¦Úbx‘ƒE¡ÁÁBÑ;…ú¯›¿P¦ÞÎӓ̹žAü om?çW= -€x¯Íú·¶Ò-Œ¯Àòæ[›Ëû0ñ¾¾øÎ}ø¦y)7ta¾¾õõõ>j¥ÜÇTÐ7úŸ¿@ï¼ÏÇtÜ›ò`qÊ2™±Ê€™ê&¯®ª6ê±ZL®Ä„?â_øóyxg)Ë”z¥ÈçL­UáíÖ*ÔuµSkÿSeØO4?׸¸c¯¯Ø°.òò· åÒR´ ßÞô-•’2ð5ßáÞüÜÏ ú÷Sá>Ó£V­š‹“då`r£¾n~ÏôY &à+`œ;ÂA4ˆÉ 䀰ÈA9Ð=¨- t°lÃ`;»Á~pŒƒÁ ðGp| ®[`Lƒ‡`<¯ "A ˆ YA+äùCb(Š‡R¡,¨*T2B-Ð -¨ꇆ¡Ðnè÷ÐQètº}MA ï —0Óal»Á¾°ŽSàx ¬‚kà&¸^Á£ð>ø0|>_ƒ'á‡ð,ÂG!"F$H:Rˆ”!z¤éF‘Qd?r 9‹\A&‘GÈ ”ˆrQ ¢áhš‹ÊÑ´íE‡Ñ]èaô4zBgÐ×Á–àE#H ‹*B=¡‹0HØIøˆp†p0MxJ$ùD1„˜D, V›‰½Ä­ÄÄãÄKÄ»ÄY‰dEò"EÒI2’ÔEÚBÚGúŒt™4MzN¦‘Èþär!YKî ’÷?%_&ß#¿¢°(®”0J:EAi¤ôQÆ(Ç()Ó”WT6U@ æP+¨íÔ!ê~êêmêæD ¥eÒÔ´å´!ÚïhŸÓ¦h/èº']B/¢éëèÒÓ¿¢?a0nŒhF!ÃÀXÇØÍ8ÅøšñÜŒkæc&5S˜µ™˜6»lö˜Iaº2c˜K™MÌAæ!æEæ#…åÆ’°d¬VÖë(ëk–Íe‹Øél »—½‡}Ž}ŸCâ¸qâ9 -N'çÎ)Î].ÂuæJ¸rî -î÷ wšGä xR^¯‡÷[ÞoÆœchžgÞ`>bþ‰ù$á»ñ¥ü*~ÿ ÿ:ÿ¥…EŒ…ÒbÅ~‹ËÏ,m,£-•–Ý–,¯Y¾´Â¬â­*­6X[ݱF­=­3­ë­·YŸ±~dó ·‘ÛtÛ´¹i ÛzÚfÙ6Û~`{ÁvÖÎÞ.ÑNg·Åî”Ý#{¾}´}…ý€ý§ö¸‘j‡‡ÏþŠ™c1X6„Æfm“Ž;'_9 œr:œ8Ýq¦:‹ËœœO:ϸ8¸¤¹´¸ìu¹éJq»–»nv=ëúÌMà–ï¶ÊmÜí¾ÀR 4 ö -n»3Ü£ÜkÜGݯz=Ä•[=¾ô„=ƒ<Ë=GTB(É/ÙSòƒ,]6*›-•–¾W:#—È7Ë*¢ŠÊe¿ò^YDYÙ}U„j£êAyTù`ù#µD=¬þ¶"©b{ųÊôÊ+¬Ê¯: !kJ4Gµm¥ötµ}uCõ%—®K7YV³©fFŸ¢ßY Õ.©=bàá?SŒîÆ•Æ©ºÈº‘ºçõyõ‡Ø Ú† žkï5%4ý¦m–7Ÿlqlio™Z³lG+ÔZÚz²Í¹­³mzyâò]íÔöÊö?uøuôw|¿"űN»ÎåwW&®ÜÛe֥ﺱ*|ÕöÕèjõê‰5k¶¬yÝ­èþ¢Ç¯g°ç‡^yïkEk‡Öþ¸®lÝD_p߶õÄõÚõ×7DmØÕÏîoê¿»1mãál {àûMśΠnßLÝlÜ<9”úO¤[þ˜¸™$™™üšhšÕ›B›¯œœ‰œ÷dÒž@ž®ŸŸ‹Ÿú i Ø¡G¡¶¢&¢–££v£æ¤V¤Ç¥8¥©¦¦‹¦ý§n§à¨R¨Ä©7©©ªª««u«é¬\¬Ð­D­¸®-®¡¯¯‹°°u°ê±`±Ö²K²Â³8³®´%´œµµŠ¶¶y¶ð·h·à¸Y¸Ñ¹J¹Âº;ºµ».»§¼!¼›½½¾ -¾„¾ÿ¿z¿õÀpÀìÁgÁãÂ_ÂÛÃXÃÔÄQÄÎÅKÅÈÆFÆÃÇAÇ¿È=ȼÉ:ɹÊ8Ê·Ë6˶Ì5̵Í5͵Î6ζÏ7ϸÐ9кÑ<ѾÒ?ÒÁÓDÓÆÔIÔËÕNÕÑÖUÖØ×\×àØdØèÙlÙñÚvÚûÛ€ÜÜŠÝÝ–ÞÞ¢ß)߯à6à½áDáÌâSâÛãcãëäsäüå„æ æ–çç©è2è¼éFéÐê[êåëpëûì†ííœî(î´ï@ïÌðXðåñrñÿòŒóó§ô4ôÂõPõÞömöû÷Šøø¨ù8ùÇúWúçûwüü˜ý)ýºþKþÜÿmÿÿ ÷„óû endstream endobj 94 0 obj <> endobj 84 0 obj <> endobj 85 0 obj <> endobj 86 0 obj <> endobj 87 0 obj <> endobj 98 0 obj <>stream - endstream endobj 97 0 obj <> endobj 99 0 obj <> endobj 100 0 obj <> endobj 71 0 obj <> endobj 72 0 obj <> endobj 73 0 obj <> endobj 74 0 obj <> endobj 107 0 obj [/View/Design] endobj 108 0 obj <>>> endobj 105 0 obj [/View/Design] endobj 106 0 obj <>>> endobj 103 0 obj [/View/Design] endobj 104 0 obj <>>> endobj 101 0 obj [/View/Design] endobj 102 0 obj <>>> endobj 80 0 obj <> endobj 82 0 obj <> endobj 83 0 obj <> endobj 110 0 obj <> endobj 111 0 obj [0.0] endobj 112 0 obj <>/XObject<>>>/Subtype/Form>>stream -0 g -/GS0 gs --46.895 565.894 583.471 -320.984 re -f -q -0 Tc 0 Tw 0 Ts 100 Tz 0 Tr /Fm0 Do -Q - endstream endobj 113 0 obj <> endobj 114 0 obj <>/ExtGState<>/Shading<>>>/Subtype/Form>>stream -q -419.6 365.446 m -414.319 365.446 409.165 364.915 404.179 363.916 c -374.027 434.636 303.875 484.212 222.14 484.212 c -112.892 484.212 24.329 395.649 24.329 286.402 c -24.329 241.821 39.081 200.689 63.963 167.609 c -51.904 153.863 44.578 135.862 44.578 116.139 c -44.578 73.004 79.545 38.036 122.68 38.036 c -156.741 38.036 185.693 59.849 196.373 90.261 c -204.807 89.163 213.406 88.591 222.14 88.591 c -230.657 88.591 239.049 89.13 247.283 90.175 c -257.895 59.637 286.907 37.708 321.059 37.708 c -364.193 37.708 399.16 72.675 399.16 115.81 c -399.16 135.448 391.896 153.38 379.928 167.104 c -390 180.404 398.426 195.017 404.91 210.641 c -409.67 209.734 414.576 209.241 419.6 209.241 c -462.734 209.241 497.701 244.209 497.701 287.343 c -497.701 330.478 462.734 365.446 419.6 365.446 c -W n -q -0 g -/GS0 gs --0.0000153 446.5039062 446.5039062 0.0000153 261.0146484 37.7080078 cm -BX /Sh0 sh EX Q -Q -/CS1 CS 0 0 0 SCN -10 w 4 M 0 j 0 J []0 d -/GS0 gs -q 1 0 0 1 419.5996 365.4458 cm -0 0 m --5.28 0 -10.435 -0.531 -15.421 -1.53 c --45.572 69.19 -115.725 118.767 -197.46 118.767 c --306.708 118.767 -395.271 30.204 -395.271 -79.044 c --395.271 -123.625 -380.519 -164.756 -355.636 -197.836 c --367.696 -211.583 -375.022 -229.583 -375.022 -249.307 c --375.022 -292.442 -340.055 -327.41 -296.92 -327.41 c --262.858 -327.41 -233.907 -305.597 -223.227 -275.185 c --214.792 -276.283 -206.193 -276.855 -197.46 -276.855 c --188.942 -276.855 -180.55 -276.316 -172.316 -275.271 c --161.705 -305.809 -132.692 -327.738 -98.541 -327.738 c --55.406 -327.738 -20.439 -292.771 -20.439 -249.636 c --20.439 -229.998 -27.704 -212.066 -39.672 -198.342 c --29.6 -185.042 -21.174 -170.429 -14.689 -154.805 c --9.93 -155.711 -5.023 -156.205 0 -156.205 c -43.135 -156.205 78.102 -121.237 78.102 -78.103 c -78.102 -34.968 43.135 0 0 0 c -h -S -Q - endstream endobj 115 0 obj <> endobj 116 0 obj <> endobj 118 0 obj <> endobj 119 0 obj <> endobj 120 0 obj <> endobj 121 0 obj <> endobj 117 0 obj [/ICCBased 96 0 R] endobj 109 0 obj <> endobj 122 0 obj [0.0] endobj 123 0 obj <>/XObject<>>>/Subtype/Form>>stream -0 g -/GS0 gs -13 121 494.579 -114.578 re -f -q -0 Tc 0 Tw 0 Ts 100 Tz 0 Tr /Fm0 Do -Q - endstream endobj 124 0 obj <> endobj 125 0 obj <>/XObject<>>>/Subtype/Form>>stream -q -/GS0 gs -0 Tc 0 Tw 0 Ts 100 Tz 0 Tr /Fm0 Do -Q - endstream endobj 126 0 obj <> endobj 128 0 obj <>/ExtGState<>/Shading<>>>/Subtype/Form>>stream -q -7.977 8.752 m -113.295 8.752 l -408.581 8.752 l -507.01 8.752 l -507.01 37.756 l -507.01 77.308 l -408.581 77.308 l -113.295 77.308 l -7.977 77.308 l -7.977 37.756 l -h -W n -q -0 g -/GS0 gs -1 0 0 -1 0 0 cm -BX /Sh0 sh EX Q -Q - endstream endobj 129 0 obj <> endobj 130 0 obj <>stream -þý €‰þý 1}þý Òpþý ÒpüÔ“4 Òpû—)I ÒpúY¿] 1}úY¿]€‰úY¿]úY¿]û—)IüÔ“4€‰üÔ“4 1}üÔ“4 1}û—)I€‰û—)I úY¿]€‰úY¿] 1}úY¿] ÒpúY¿] ÒpùUr Òp÷Þë‡ Òpö¡› 1}ö¡›€‰ö¡›ö¡›÷Þë‡ùUr€‰ùUr 1}ùUr 1}÷Þ뇀‰÷Þë‡  Òpþý bùþý ‚ó‚þý „ þý „ üÔ“4„ û—)I„ úY¿]‚ó‚úY¿]bùúY¿] ÒpúY¿] Òpû—)I ÒpüÔ“4bùüÔ“4‚ó‚üÔ“4‚ó‚û—)Ibùû—)I ÒpúY¿]bùúY¿]‚ó‚úY¿]„ úY¿]„ ùUr„ ÷Þ뇄 ö¡›‚ó‚ö¡›bùö¡› Òpö¡› Òp÷Þë‡ ÒpùUrbùùUr‚ó‚ùUr‚ó‚÷Þë‡bù÷Þë‡ ;;;ö¡›€‰ö¡› 1}ö¡› Òpö¡› Òpõd° Òpô&­Ä ÒpòéCÙ 1}òéCÙ€‰òéCÙòéCÙô&­Äõd°€‰õd° 1}õd° 1}ô&­Ä€‰ô&­Ä---òéCÙ€‰òéCÙ 1}òéCÙ ÒpòéCÙ Òpñ«Ùí Òpðnp Òpï1 1}ï1€‰ï1ï1ðnpñ«Ù퀉ñ«Ùí 1}ñ«Ùí 1}ðnp€‰ðnp---333 Òpö¡›bùö¡›‚ó‚ö¡›„ ö¡›„ õd°„ ô&­Ä„ òéCÙ‚ó‚òéCÙbùòéCÙ ÒpòéCÙ Òpô&­Ä Òpõd°bùõd°‚ó‚õd°‚ó‚ô&­Äbùô&­Ä;;;PPP--- ÒpòéCÙbùòéCÙ‚ó‚òéCÙ„ òéCÙ„ ñ«Ùí„ ðnp„ ï1‚ó‚ï1bùï1 Òpï1 Òpðnp Òpñ«Ùíbùñ«Ùí‚ó‚ñ«Ùí‚ó‚ðnpbùðnp---PPPXXX333„ þý „”þý $µˆþý (…V{þý (…V{üÔ“4(…V{û—)I(…V{úY¿]$µˆúY¿]„”úY¿]„ úY¿]„ û—)I„ üÔ“4„”üÔ“4$µˆüÔ“4$µˆû—)I„”û—)I---„ úY¿]„”úY¿]$µˆúY¿](…V{úY¿](…V{ùUr(…V{÷Þë‡(…V{ö¡›$µˆö¡›„”ö¡›„ ö¡›„ ÷Þ뇄 ùUr„”ùUr$µˆùUr$µˆ÷Þ뇄”÷Þë‡---PPP;;;(…V{þý -çþý 1†wþý 6þý 6üÔ“46û—)I6úY¿]1†wúY¿]-çúY¿](…V{úY¿](…V{û—)I(…V{üÔ“4-çüÔ“41†wüÔ“41†wû—)I-çû—)I333---(…V{úY¿]-çúY¿]1†wúY¿]6úY¿]6ùUr6÷Þë‡6ö¡›1†wö¡›-çö¡›(…V{ö¡›(…V{÷Þë‡(…V{ùUr-çùUr1†wùUr1†w÷Þë‡-ç÷Þë‡---333XXXPPP„ ö¡›„”ö¡›$µˆö¡›(…V{ö¡›(…V{õd°(…V{ô&­Ä(…V{òéCÙ$µˆòéCÙ„”òéCÙ„ òéCÙ„ ô&­Ä„ õd°„”õd°$µˆõd°$µˆô&­Ä„”ô&­Ä;;;PPPfffPPP„ òéCÙ„”òéCÙ$µˆòéCÙ(…V{òéCÙ(…V{ñ«Ùí(…V{ðnp(…V{ï1$µˆï1„”ï1„ ï1„ ðnp„ ñ«Ùí„”ñ«Ùí$µˆñ«Ùí$µˆðnp„”ðnpPPPfffnnnXXX(…V{ö¡›-çö¡›1†wö¡›6ö¡›6õd°6ô&­Ä6òéCÙ1†wòéCÙ-çòéCÙ(…V{òéCÙ(…V{ô&­Ä(…V{õd°-çõd°1†wõd°1†wô&­Ä-çô&­ÄPPPXXXnnnfff(…V{òéCÙ-çòéCÙ1†wòéCÙ6òéCÙ6ñ«Ùí6ðnp6ï11†wï1-çï1(…V{ï1(…V{ðnp(…V{ñ«Ùí-çñ«Ùí1†wñ«Ùí1†wðnp-çðnpfffnnnuuunnn6þý h…Fþý ›„ þý ÍÂþý ÍÂüÔ“4ÍÂû—)IÍÂúY¿]›„ úY¿]h…FúY¿]6úY¿]6û—)I6üÔ“4h…FüÔ“4›„ üÔ“4›„ û—)Ih…Fû—)I3333336úY¿]h…FúY¿]›„ úY¿]ÍÂúY¿]ÍÂùUrÍÂ÷Þë‡ÍÂö¡››„ ö¡›h…Fö¡›6ö¡›6÷Þë‡6ùUrh…FùUr›„ ùUr›„ ÷Þë‡h…F÷Þë‡333333XXXXXX6ö¡›h…Fö¡››„ ö¡›ÍÂö¡›ÍÂõd°ÍÂô&­ÄÍÂòéCÙ›„ òéCÙh…FòéCÙ6òéCÙ6ô&­Ä6õd°h…Fõd°›„ õd°›„ ô&­Äh…Fô&­ÄXXXXXXnnnnnn6òéCÙh…FòéCÙ›„ òéCÙÍÂòéCÙÍÂñ«ÙíÍÂðnpÍÂï1›„ ï1h…Fï16ï16ðnp6ñ«Ùíh…Fñ«Ù후 ñ«Ù후 ðnph…FðnpnnnnnnuuuuuuÍÂþý Ѷé¤þý ÕìDþý Ú!8äþý Ú!8äüÔ“4Ú!8äû—)IÚ!8äúY¿]ÕìDúY¿]Ѷé¤úY¿]ÍÂúY¿]ÍÂû—)IÍÂüÔ“4Ѷé¤üÔ“4ÕìDüÔ“4ÕìDû—)IѶé¤û—)I---333ÍÂúY¿]Ѷé¤úY¿]ÕìDúY¿]Ú!8äúY¿]Ú!8äùUrÚ!8ä÷Þë‡Ú!8äö¡›ÕìDö¡›Ñ¶é¤ö¡›ÍÂö¡›ÍÂ÷Þë‡ÍÂùUrѶé¤ùUrÕìDùUrÕìD÷Þë‡Ñ¶é¤÷Þë‡333---PPPXXXÚ!8äþý ÞVXþý ⋨øþý æÀИþý æÀИüÔ“4æÀИû—)IæÀИúY¿]⋨øúY¿]ÞVXúY¿]Ú!8äúY¿]Ú!8äû—)IÚ!8äüÔ“4ÞVXüÔ“4⋨øüÔ“4⋨øû—)IÞVXû—)I---Ú!8äúY¿]ÞVXúY¿]⋨øúY¿]æÀИúY¿]æÀИùUræÀИ÷Þë‡æÀИö¡›â‹¨øö¡›ÞVXö¡›Ú!8äö¡›Ú!8ä÷Þë‡Ú!8äùUrÞVXùUr⋨øùUr⋨ø÷Þë‡ÞVX÷Þë‡---;;;PPPÍÂö¡›Ñ¶é¤ö¡›ÕìDö¡›Ú!8äö¡›Ú!8äõd°Ú!8äô&­ÄÚ!8äòéCÙÕìDòéCÙѶé¤òéCÙÍÂòéCÙÍÂô&­ÄÍÂõd°Ñ¶é¤õd°ÕìDõd°ÕìDô&­ÄѶé¤ô&­ÄXXXPPPfffnnnÍÂòéCÙѶé¤òéCÙÕìDòéCÙÚ!8äòéCÙÚ!8äñ«ÙíÚ!8äðnpÚ!8äï1ÕìDï1Ѷé¤ï1ÍÂï1ÍÂðnpÍÂñ«ÙíѶé¤ñ«ÙíÕìDñ«ÙíÕìDðnpѶé¤ðnpnnnfffnnnuuuÚ!8äö¡›ÞVXö¡›â‹¨øö¡›æÀИö¡›æÀИõd°æÀИô&­ÄæÀИòéCÙ⋨øòéCÙÞVXòéCÙÚ!8äòéCÙÚ!8äô&­ÄÚ!8äõd°ÞVXõd°â‹¨øõd°â‹¨øô&­ÄÞVXô&­ÄPPP;;;PPPfffÚ!8äòéCÙÞVXòéCÙ⋨øòéCÙæÀИòéCÙæÀИñ«ÙíæÀИðnpæÀИï1⋨øï1ÞVXï1Ú!8äï1Ú!8äðnpÚ!8äñ«ÙíÞVXñ«Ùí⋨øñ«Ùí⋨øðnpÞVXðnpfffPPPXXXnnnæÀИþý êõø7þý ï+×þý ó`hKþý ó`hKüÔ“4ó`hKû—)Ió`hKúY¿]ï+×úY¿]êõø7úY¿]æÀИúY¿]æÀИû—)IæÀИüÔ“4êõø7üÔ“4ï+×üÔ“4ï+×û—)Iêõø7û—)I æÀИúY¿]êõø7úY¿]ï+×úY¿]ó`hKúY¿]ó`hKùUró`hK÷Þë‡ó`hKö¡›ï+×ö¡›êõø7ö¡›æÀИö¡›æÀИ÷Þë‡æÀИùUrêõø7ùUrï+×ùUrï+×÷Þë‡êõø7÷Þë‡ ;;;ó`hKþý ÷•ëþý ûÊ·‹þý ÿÿÿÿþý ÿÿÿÿüÔ“4ÿÿÿÿû—)IÿÿÿÿúY¿]ûÊ·‹úY¿]÷•ëúY¿]ó`hKúY¿]ó`hKû—)Ió`hKüÔ“4÷•ëüÔ“4ûÊ·‹üÔ“4ûÊ·‹û—)I÷•ëû—)I ó`hKúY¿]÷•ëúY¿]ûÊ·‹úY¿]ÿÿÿÿúY¿]ÿÿÿÿùUrÿÿÿÿ÷Þë‡ÿÿÿÿö¡›ûÊ·‹ö¡›÷•ëö¡›ó`hKö¡›ó`hK÷Þë‡ó`hKùUr÷•ëùUrûÊ·‹ùUrûÊ·‹÷Þë‡÷•ë÷Þë‡ æÀИö¡›êõø7ö¡›ï+×ö¡›ó`hKö¡›ó`hKõd°ó`hKô&­Äó`hKòéCÙï+×òéCÙêõø7òéCÙæÀИòéCÙæÀИô&­ÄæÀИõd°êõø7õd°ï+×õd°ï+×ô&­Äêõø7ô&­Ä;;;---PPPæÀИòéCÙêõø7òéCÙï+×òéCÙó`hKòéCÙó`hKñ«Ùíó`hKðnpó`hKï1ï+×ï1êõø7ï1æÀИï1æÀИðnpæÀИñ«Ùíêõø7ñ«Ùíï+×ñ«Ùíï+×ðnpêõø7ðnpPPP---333XXXó`hKö¡›÷•ëö¡›ûÊ·‹ö¡›ÿÿÿÿö¡›ÿÿÿÿõd°ÿÿÿÿô&­ÄÿÿÿÿòéCÙûÊ·‹òéCÙ÷•ëòéCÙó`hKòéCÙó`hKô&­Äó`hKõd°÷•ëõd°ûÊ·‹õd°ûÊ·‹ô&­Ä÷•ëô&­Ä---ó`hKòéCÙ÷•ëòéCÙûÊ·‹òéCÙÿÿÿÿòéCÙÿÿÿÿñ«Ùíÿÿÿÿðnpÿÿÿÿï1ûÊ·‹ï1÷•ëï1ó`hKï1ó`hKðnpó`hKñ«Ùí÷•ëñ«ÙíûÊ·‹ñ«ÙíûÊ·‹ðnp÷•ëðnp---333ï1€‰ï1 1}ï1 Òpï1 Òpí€/Õ ÒpëÏY” ÒpêƒS 1}êƒS€‰êƒSêƒSëÏY”í€/Õ€‰í€/Õ 1}í€/Õ 1}ëÏY”€‰ëÏY”333---êƒS€‰êƒS 1}êƒS ÒpêƒS Òpèm­ Òpæ¼ÖÑ Òpå 1}å €‰å å æ¼ÖÑèm­€‰èm­ 1}èm­ 1}æ¼ÖÑ€‰æ¼ÖÑ--- Òpï1bùï1‚ó‚ï1„ ï1„ í€/Õ„ ëÏY”„ êƒS‚ó‚êƒSbùêƒS ÒpêƒS ÒpëÏY” Òpí€/Õbùí€/Õ‚ó‚í€/Õ‚ó‚ëÏY”bùëÏY”333XXXPPP--- ÒpêƒSbùêƒS‚ó‚êƒS„ êƒS„ èm­„ æ¼ÖÑ„ å ‚ó‚å bùå Òpå Òpæ¼ÖÑ Òpèm­bùèm­‚ó‚èm­‚ó‚æ¼ÖÑbùæ¼ÖÑ---PPP;;;å €‰å 1}å Òpå Òpã[*O ÒpáªT Òpßù}Í 1}ßù}Í€‰ßù}Íßù}ÍáªTã[*O€‰ã[*O 1}ã[*O 1}áªT€‰áªT ßù}Í€‰ßù}Í 1}ßù}Í Òpßù}Í ÒpÞH§‹ ÒpÜ—°u ÒpÚæÚ4 1}ÚæÚ4€‰ÚæÚ4ÚæÚ4Ü—°uÞH§‹€‰ÞH§‹ 1}ÞH§‹ 1}Ü—°u€‰Ü—°u Òpå bùå ‚ó‚å „ å „ ã[*O„ áªT„ ßù}Í‚ó‚ßù}Íbùßù}Í Òpßù}Í ÒpáªT Òpã[*Obùã[*O‚ó‚ã[*O‚ó‚áªTbùáªT;;; Òpßù}Íbùßù}Í‚ó‚ßù}Í„ ßù}Í„ ÞH§‹„ Ü—°u„ ÚæÚ4‚ó‚ÚæÚ4bùÚæÚ4 ÒpÚæÚ4 ÒpÜ—°u ÒpÞH§‹bùÞH§‹‚ó‚ÞH§‹‚ó‚Ü—°ubùÜ—°u „ ï1„”ï1$µˆï1(…V{ï1(…V{í€/Õ(…V{ëÏY”(…V{êƒS$µˆêƒS„”êƒS„ êƒS„ ëÏY”„ í€/Õ„”í€/Õ$µˆí€/Õ$µˆëÏY”„”ëÏY”XXXnnnfffPPP„ êƒS„”êƒS$µˆêƒS(…V{êƒS(…V{èm­(…V{æ¼ÖÑ(…V{å $µˆå „”å „ å „ æ¼ÖÑ„ èm­„”èm­$µˆèm­$µˆæ¼ÖÑ„”æ¼ÖÑPPPfffPPP;;;(…V{ï1-çï11†wï16ï16í€/Õ6ëÏY”6êƒS1†wêƒS-çêƒS(…V{êƒS(…V{ëÏY”(…V{í€/Õ-çí€/Õ1†wí€/Õ1†wëÏY”-çëÏY”nnnuuunnnfff(…V{êƒS-çêƒS1†wêƒS6êƒS6èm­6æ¼ÖÑ6å 1†wå -çå (…V{å (…V{æ¼ÖÑ(…V{èm­-çèm­1†wèm­1†wæ¼ÖÑ-çæ¼ÖÑfffnnnXXXPPP„ å „”å $µˆå (…V{å (…V{ã[*O(…V{áªT(…V{ßù}Í$µˆßù}Í„”ßù}Í„ ßù}Í„ áªT„ ã[*O„”ã[*O$µˆã[*O$µˆáªT„”áªT;;;PPP---„ ßù}Í„”ßù}Í$µˆßù}Í(…V{ßù}Í(…V{ÞH§‹(…V{Ü—°u(…V{ÚæÚ4$µˆÚæÚ4„”ÚæÚ4„ ÚæÚ4„ Ü—°u„ ÞH§‹„”ÞH§‹$µˆÞH§‹$µˆÜ—°u„”Ü—°u---(…V{å -çå 1†wå 6å 6ã[*O6áªT6ßù}Í1†wßù}Í-çßù}Í(…V{ßù}Í(…V{áªT(…V{ã[*O-çã[*O1†wã[*O1†wáªT-çáªTPPPXXX333---(…V{ßù}Í-çßù}Í1†wßù}Í6ßù}Í6ÞH§‹6Ü—°u6ÚæÚ41†wÚæÚ4-çÚæÚ4(…V{ÚæÚ4(…V{Ü—°u(…V{ÞH§‹-çÞH§‹1†wÞH§‹1†wÜ—°u-çÜ—°u---3336ï1h…Fï1›„ ï1ÍÂï1ÍÂí€/ÕÍÂëÏY”ÍÂêƒS›„ êƒSh…FêƒS6êƒS6ëÏY”6í€/Õh…Fí€/Õ›„ í€/Õ›„ ëÏY”h…FëÏY”uuuuuunnnnnn6êƒSh…FêƒS›„ êƒSÍÂêƒSÍÂèm­ÍÂæ¼ÖÑÍÂå ›„ å h…Få 6å 6æ¼ÖÑ6èm­h…Fèm­›„ èm­›„ æ¼ÖÑh…Fæ¼ÖÑnnnnnnXXXXXX6å h…Få ›„ å ÍÂå ÍÂã[*OÍÂáªTÍÂßù}Í›„ ßù}Íh…Fßù}Í6ßù}Í6áªT6ã[*Oh…Fã[*O›„ ã[*O›„ áªTh…FáªTXXXXXX3333336ßù}Íh…Fßù}Í›„ ßù}ÍÍÂßù}ÍÍÂÞH§‹ÍÂÜ—°uÍÂÚæÚ4›„ ÚæÚ4h…FÚæÚ46ÚæÚ46Ü—°u6ÞH§‹h…FÞH§‹›„ ÞH§‹›„ Ü—°uh…FÜ—°u333333ÍÂï1Ѷé¤ï1ÕìDï1Ú!8äï1Ú!8äí€/ÕÚ!8äëÏY”Ú!8äêƒSÕìDêƒSѶé¤êƒSÍÂêƒSÍÂëÏY”ÍÂí€/ÕѶé¤í€/ÕÕìDí€/ÕÕìDëÏY”Ѷé¤ëÏY”uuunnnfffnnnÍÂêƒSѶé¤êƒSÕìDêƒSÚ!8äêƒSÚ!8äèm­Ú!8äæ¼ÖÑÚ!8äå ÕìDå Ѷé¤å ÍÂå ÍÂæ¼ÖÑÍÂèm­Ѷé¤èm­ÕìDèm­ÕìDæ¼ÖÑѶé¤æ¼ÖÑnnnfffPPPXXXÚ!8äï1ÞVXï1⋨øï1æÀИï1æÀИí€/ÕæÀИëÏY”æÀИêƒS⋨øêƒSÞVXêƒSÚ!8äêƒSÚ!8äëÏY”Ú!8äí€/ÕÞVXí€/Õ⋨øí€/Õ⋨øëÏY”ÞVXëÏY”nnnXXXPPPfffÚ!8äêƒSÞVXêƒS⋨øêƒSæÀИêƒSæÀИèm­æÀИæ¼ÖÑæÀИå ⋨øå ÞVXå Ú!8äå Ú!8äæ¼ÖÑÚ!8äèm­ÞVXèm­⋨øèm­⋨øæ¼ÖÑÞVXæ¼ÖÑfffPPP;;;PPPÍÂå Ѷé¤å ÕìDå Ú!8äå Ú!8äã[*OÚ!8äáªTÚ!8äßù}ÍÕìDßù}ÍѶé¤ßù}ÍÍÂßù}ÍÍÂáªTÍÂã[*OѶé¤ã[*OÕìDã[*OÕìDáªTѶé¤áªTXXXPPP---333ÍÂßù}ÍѶé¤ßù}ÍÕìDßù}ÍÚ!8äßù}ÍÚ!8äÞH§‹Ú!8äÜ—°uÚ!8äÚæÚ4ÕìDÚæÚ4Ѷé¤ÚæÚ4ÍÂÚæÚ4ÍÂÜ—°uÍÂÞH§‹Ñ¶é¤ÞH§‹ÕìDÞH§‹ÕìDÜ—°uѶé¤Ü—°u333---Ú!8äå ÞVXå ⋨øå æÀИå æÀИã[*OæÀИáªTæÀИßù}Í⋨øßù}ÍÞVXßù}ÍÚ!8äßù}ÍÚ!8äáªTÚ!8äã[*OÞVXã[*O⋨øã[*O⋨øáªTÞVXáªTPPP;;;---Ú!8äßù}ÍÞVXßù}Í⋨øßù}ÍæÀИßù}ÍæÀИÞH§‹æÀИܗ°uæÀИÚæÚ4⋨øÚæÚ4ÞVXÚæÚ4Ú!8äÚæÚ4Ú!8äÜ—°uÚ!8äÞH§‹ÞVXÞH§‹â‹¨øÞH§‹â‹¨øÜ—°uÞVXÜ—°u---æÀИï1êõø7ï1ï+×ï1ó`hKï1ó`hKí€/Õó`hKëÏY”ó`hKêƒSï+×êƒSêõø7êƒSæÀИêƒSæÀИëÏY”æÀИí€/Õêõø7í€/Õï+×í€/Õï+×ëÏY”êõø7ëÏY”XXX333---PPPæÀИêƒSêõø7êƒSï+×êƒSó`hKêƒSó`hKèm­ó`hKæ¼ÖÑó`hKå ï+×å êõø7å æÀИå æÀИæ¼ÖÑæÀИèm­êõø7èm­ï+×èm­ï+×æ¼ÖÑêõø7æ¼ÖÑPPP---;;;ó`hKï1÷•ëï1ûÊ·‹ï1ÿÿÿÿï1ÿÿÿÿí€/ÕÿÿÿÿëÏY”ÿÿÿÿêƒSûÊ·‹êƒS÷•ëêƒSó`hKêƒSó`hKëÏY”ó`hKí€/Õ÷•ëí€/ÕûÊ·‹í€/ÕûÊ·‹ëÏY”÷•ëëÏY”333---ó`hKêƒS÷•ëêƒSûÊ·‹êƒSÿÿÿÿêƒSÿÿÿÿèm­ÿÿÿÿæ¼ÖÑÿÿÿÿå ûÊ·‹å ÷•ëå ó`hKå ó`hKæ¼ÖÑó`hKèm­÷•ëèm­ûÊ·‹èm­ûÊ·‹æ¼ÖÑ÷•ëæ¼ÖÑ---æÀИå êõø7å ï+×å ó`hKå ó`hKã[*Oó`hKáªTó`hKßù}Íï+×ßù}Íêõø7ßù}ÍæÀИßù}ÍæÀИáªTæÀИã[*Oêõø7ã[*Oï+×ã[*Oï+×áªTêõø7áªT;;; æÀИßù}Íêõø7ßù}Íï+×ßù}Íó`hKßù}Íó`hKÞH§‹ó`hKÜ—°uó`hKÚæÚ4ï+×ÚæÚ4êõø7ÚæÚ4æÀИÚæÚ4æÀИܗ°uæÀИÞH§‹êõø7ÞH§‹ï+×ÞH§‹ï+×Ü—°uêõø7Ü—°u ó`hKå ÷•ëå ûÊ·‹å ÿÿÿÿå ÿÿÿÿã[*OÿÿÿÿáªTÿÿÿÿßù}ÍûÊ·‹ßù}Í÷•ëßù}Íó`hKßù}Íó`hKáªTó`hKã[*O÷•ëã[*OûÊ·‹ã[*OûÊ·‹áªT÷•ëáªT ó`hKßù}Í÷•ëßù}ÍûÊ·‹ßù}Íÿÿÿÿßù}ÍÿÿÿÿÞH§‹ÿÿÿÿÜ—°uÿÿÿÿÚæÚ4ûÊ·‹ÚæÚ4÷•ëÚæÚ4ó`hKÚæÚ4ó`hKÜ—°uó`hKÞH§‹÷•ëÞH§‹ûÊ·‹ÞH§‹ûÊ·‹Ü—°u÷•ëÜ—°u endstream endobj 127 0 obj <> endobj 78 0 obj <> endobj 131 0 obj <> endobj 132 0 obj <>stream -%!PS-Adobe-3.0 %%Creator: Adobe Illustrator(R) 15.0 %%AI8_CreatorVersion: 15.0.2 %%For: (Aleks Kissinger) () %%Title: (tikzit.ai) %%CreationDate: 10/01/2018 09:38 %%Canvassize: 16383 %%BoundingBox: -47 32 537 566 %%HiResBoundingBox: -46.8945 32.708 536.5762 565.894 %%DocumentProcessColors: Cyan Magenta Yellow Black %AI5_FileFormat 11.0 %AI12_BuildNumber: 399 %AI3_ColorUsage: Color %AI7_ImageSettings: 0 %%RGBProcessColor: 0 0 0 ([Registration]) %AI3_Cropmarks: 0 0 512 512 %AI3_TemplateBox: 256.5 255.5 256.5 255.5 %AI3_TileBox: -50 -140 562 652 %AI3_DocumentPreview: None %AI5_ArtSize: 14400 14400 %AI5_RulerUnits: 6 %AI9_ColorModel: 1 %AI5_ArtFlags: 0 0 0 1 0 0 1 0 0 %AI5_TargetResolution: 800 %AI5_NumLayers: 4 %AI9_OpenToView: -745 843 0.5 979 715 18 0 0 73 134 0 0 0 1 1 0 1 1 0 1 %AI5_OpenViewLayers: 7772 %%PageOrigin:0 0 %AI7_GridSettings: 72 8 72 8 1 0 0.8 0.8 0.8 0.9 0.9 0.9 %AI9_Flatten: 1 %AI12_CMSettings: 00.MS %%EndComments endstream endobj 133 0 obj <>stream -%%BoundingBox: -47 32 537 566 %%HiResBoundingBox: -46.8945 32.708 536.5762 565.894 %AI7_Thumbnail: 128 120 8 %%BeginData: 14412 Hex Bytes %0000330000660000990000CC0033000033330033660033990033CC0033FF %0066000066330066660066990066CC0066FF009900009933009966009999 %0099CC0099FF00CC0000CC3300CC6600CC9900CCCC00CCFF00FF3300FF66 %00FF9900FFCC3300003300333300663300993300CC3300FF333300333333 %3333663333993333CC3333FF3366003366333366663366993366CC3366FF %3399003399333399663399993399CC3399FF33CC0033CC3333CC6633CC99 %33CCCC33CCFF33FF0033FF3333FF6633FF9933FFCC33FFFF660000660033 %6600666600996600CC6600FF6633006633336633666633996633CC6633FF %6666006666336666666666996666CC6666FF669900669933669966669999 %6699CC6699FF66CC0066CC3366CC6666CC9966CCCC66CCFF66FF0066FF33 %66FF6666FF9966FFCC66FFFF9900009900339900669900999900CC9900FF %9933009933339933669933999933CC9933FF996600996633996666996699 %9966CC9966FF9999009999339999669999999999CC9999FF99CC0099CC33 %99CC6699CC9999CCCC99CCFF99FF0099FF3399FF6699FF9999FFCC99FFFF %CC0000CC0033CC0066CC0099CC00CCCC00FFCC3300CC3333CC3366CC3399 %CC33CCCC33FFCC6600CC6633CC6666CC6699CC66CCCC66FFCC9900CC9933 %CC9966CC9999CC99CCCC99FFCCCC00CCCC33CCCC66CCCC99CCCCCCCCCCFF %CCFF00CCFF33CCFF66CCFF99CCFFCCCCFFFFFF0033FF0066FF0099FF00CC %FF3300FF3333FF3366FF3399FF33CCFF33FFFF6600FF6633FF6666FF6699 %FF66CCFF66FFFF9900FF9933FF9966FF9999FF99CCFF99FFFFCC00FFCC33 %FFCC66FFCC99FFCCCCFFCCFFFFFF33FFFF66FFFF99FFFFCC110000001100 %000011111111220000002200000022222222440000004400000044444444 %550000005500000055555555770000007700000077777777880000008800 %000088888888AA000000AA000000AAAAAAAABB000000BB000000BBBBBBBB %DD000000DD000000DDDDDDDDEE000000EE000000EEEEEEEE0000000000FF %00FF0000FFFFFF0000FF00FFFFFF00FFFFFF %524C45FDFCFFFDFCFFFDFCFFFDFCFFFDFCFFFDFCFFFDFCFFFDFCFFFD5BFF %A8FD76FFA8A85252FD0427F827F8272752527D7DA8A8FD6AFF7D52FD13F8 %27277DA8FD63FFA85227FD07F827277D527D7DA87D7D52522727FD06F827 %7DA8FD5EFF7D52FD05F85252A8A8FD0FFFA87D2727FD04F827A8FD5AFF7D %27FD04F8527DFD0BFFA8FD0BFFA8A85227F8F8F8277DFD56FF7D27F8F8F8 %277DFD1DFFA97D27F8F8F827A8FD52FFA827F8F8F827A8FD04FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFFFFF7D52F8F8 %F827A8FD4FFF7DF8F8F8277DFD26FFA827F8F8F852FD4CFFA827F8F8F87D %FFFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFFFFF7D27F8F827FD4AFF7D27F8F827FD05FFA8FF %FFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFF %A8FFFFFFA8FFFFFFA852F8F8F8A8FD47FF52F8F8F852FFFFFFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFFF7DF8F8F87DFD45FF52F8F827A8FFFFFFCBFFFFFF %CBFFFFFFCBFFFFFFCBFFFFFFCBFFFFFFCBFFFFFFCBFFFFFFCBFFFFFFCBFF %FFFFCBFFFFFFCBFFFFFFA9FFFFA827F8F852FD43FF27F8F827A8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFFFFF27F8F852FD41FF27F8F852 %A8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FF %FFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFFA8FFFFFF52F8F852 %FD3FFF52F8F852A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FF52F8F852FD3DFF7DF8F852FFFFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFFFFF52F8F87DFD3BFF7DF8F827A8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF27 %F8F87DFD39FFA8F8F827A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FF27F8F8A8FD37FFA827F8F87EFFA8A8A8 %FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8 %A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFFD04A8 %F8F8F8FD37FF7DF8F87DFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8 %FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFFFA8F8F852FD35FFA8F8F852FFA8FF %A8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8 %A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FF %A8A8A8FFFF52F8F87DFD34FF27F8F8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA827F827FD33 %FF52F8F87DFD45A8FF7DF8F87DFD31FFA827F852A8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FF %A8FF52F8F8FD31FF52F8F87DFFFD48A8F8F852FD30FFF8F852FFA8A8A8FF %A8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A9 %A8FFA8FFA8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FF %A8A8A8FFA8A8A8FFFF7DF8F8A8FD2EFF52F8F8FD22A8FFFD07A8FFFD1FA8 %AFA8F8F8527D7D527D7DA8A8FD27FF27F852A8FFA8AFA8FFA8AFA8FFA8AF %A8FFA8AFA8FFA8AFA8FFA8AFA8FFA8AFA8FFA8FF7D7D2752275227522752 %7DA8A8FFA8AFA8FFA8AFA8FFA8AFA8FFA8AFA8FFA8AFA8FFA8AFA8FFA8AF %A8FFA8FF52FD08F827277DFD24FF7DF8F87DFD1CA8AFA87D27FD0CF8527D %FFFD1EA8F8F8F827F827FD05F82752FD22FF27F827FFA8A8A8A9A8A8A8A9 %A8A8A8A9A8A8A8A9A8A8A8A9A8A8A8A9A8A8A8FF7D27F827F827F827F827 %F827F827F827F82727FD04A8A9A8A8A8A9A8A8A8A9A8A8A8A9A8A8A8A9A8 %A8A8A9A8A8A8FFA87D7DFD05A87D7D27FD04F8A8FD1FFFA8F8F87DFD1CA8 %27F8F827F827F827F827F827F827F827F827F8F8F87DFD23A8A9A8A87D52 %F8F8F852FD1EFF7DF827A8FFA8A8A8A9A8A8A8A9A8A8A8A9A8A8A8A9A8A8 %A8A9FD06A82727F827F827F827F827F827F827F827F827F827F827F87DA8 %FFA8A8A8A9A8A8A8A9A8A8A8A9A8A8A8A9A8A8A8A9A8A8A8A9A8A8A8A9A8 %A8A8A9A8A8A8FFA8A827F8F852FD1DFF27F827FD1BA827F8F827F827F827 %F827F827F827F827F827F827F827F827F87DFD28A827F8F852FD1CFF27F8 %7DFD1AA82727F827F827F827F827F827F827F827F827F827F827F827F827 %F87DFD1DA8FFFD09A8FF52F8F852FD1AFFA8F8F87DA8A8A87DA8A8A87DA8 %A8A87DA8A8A87DA8A8A87DA8A8A87DA852F8F827F827F827F827F827F827 %F827F827F827F827F827F827F827F8FD05A87DA8A8A87DA8A8A87DA8A8A8 %7DA8A8A87DFD05A87D7D7D7E7DFD05A87DA8A8A827F8F87DFD19FF7DF8F8 %FD18A8FF7D27F8272727F8272727F8272727F8272727F8272727F8272727 %F8FD0427FFFD16A87D522727F827F82752FD08A8FF27F8F8FD19FF52F827 %FD04A87DA8A8A87DA8A8A87DA8A8A87DA8A8A87DFD04A852F827F827F827 %F827F827F827F827F827F827F827F827F827F827F827F8F87DA8A8A87DA8 %A8A87DA8A8A87DA8A8A87DFD05A827F8F827F827F827F8F8F852A8A87DFD %04A87EF8F852FD18FF27F852FFFD17A87DF8272727F8272727F8272727F8 %272727F8272727F8272727F8272727F827F852FD14A82727F827F8272727 %F8272727F852FD07A852F827A8FD16FFA8F8F87DA8A87DA87DA87DA87DA8 %7DA87DA87DA87DA87DA87DA87DA827F8F827F827F827F827F827F827F827 %F827F827F827F827F827F827F827F827F87DA8A87DA87DA87DA87DA87DA8 %7DA87DA87DA827F8F827F827F827F827F827F827F852A8A87DA87DA87DF8 %F87DFD16FFA8F8F87DFD18A827F8272727F8272727F8272727F8272727F8 %272727F8272727F8272727F827272752FFFD0FA8FF5227F8272727F82727 %27F8272727F827F87DFD06A827F827FD16FF7DF8F8A8A8A87DA87EA87DA8 %7EA87DA87EA87DA87EA87DA87EA8A87DF827F827F827F827F827F827F827 %F827F827F827F827F827F827F827F827F827F8277DA87EA87DA87EA87DA8 %7EA87DA87EA87D27F827F827F827F827F827F827F827F82727A87DA87DA8 %847DF8F8A8FD15FFA8F8277DA8A8A884A8A8A884A8A8A884A8A8A884A8A8 %A884A8A8A852272727F8272727F8272727F8272727F8272727F8272727F8 %272727F8272727F827F85284A8A8A884A8A8A884A8A8A884A8A852F82727 %27F8272727F8272727F8272727F82759A87DA87DA87DF8F8A8FD15FF52F8 %F8A87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA8A852F827F827 %F827F827F827F827F827F827F827F827F827F827F827F827F827F827F827 %F82752A8A8A87DA8A8A87DFD05A82727F827F827F827F827F827F827F827 %F827F8527DA87DA87DA8F8F852FD15FF7DF8277EFD17A8FD2427F827277D %7DA87DA87DA87DA87D7DFD1527A87DA87DA87D27F87DFD15FF52F827A87D %A87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87D27F827F827F827F8 %27F827F827F827F827F827F827F827F827F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F827F827F827F827F827F827F827F827F8 %F8F8277DA87DA87DA827F852FD15FF7DF8277DA87DA87EA87DA8A8A87DA8 %A8A87DA8A8A87DA8A8A87DA82727F8272727F8272727F8272727F8272727 %F8272727F8272727F8272727F8272727F8272727F8FD0427522752275227 %27F8272727F8272727F8FD0727FD05F8A87DA87DA8A852F852FD15FF52F8 %05A87D7D7DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87D52F827F827 %F827F827F827F827F827F827F827F827F827F827F827F827F827F827F827 %F827275252A87DA87DA87DA87DA87D52F827F827F827F827F827F827FD07 %F8277DA87D7D7DA827F852FD15FF7DF8277DA87DA87DA87DA87DA87DA8A8 %A87DA8A8A87DA8A8A87DA852FD232752FD05A884A8A8A87EFD04A852FD0A %27FD08F827A87DA87DA87D27F87DFD15FF7DF8F87E7D7D7DA87D7D7DA87D %7D7DA87DA87DA87DA87DA87DA87D7DF827F827F827F827F827F827F827F8 %27F827F827F827F827F827F827F827F827F82752A87DA87DA87DA87DA87D %A87DA87DA85227F827F827F827FD0BF8527DA8FD047DF8F87DFD15FFA8F8 %277DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DA87DFD2227A8 %7DA87DA87DA87DA87DA87DA87DA8A8A8FD0427FD0DF8277DA87DA87DA852 %F8F8FD16FF7DF8F8FD127DA87DA87DA87D7E2727F827F827F827F827F827 %F827F827F827F827F827F827F827F827F827F827F8527DA87DA87DA87DA8 %7DA87DA87DA87DA87D52FD10F852A8FD057D27F827FD17FFF8F852A87DA8 %7DA87DA87DA87DA87DA87DA87DA87DA87DA87DA8A87DFD20277DA87DA87D %A87DA87DA87DA87DA87DA87DA87D52FD0EF827A87DA87DA87D7DF8F852FD %16FFA827F852FD177DA87D27F827F8272727F8272727F8272727F8272727 %F8272727F8272727F8FD0427A87DA87DA87DA87DA8FD0B7D27FD0CF827FD %067DA852F8F8A8FD17FF27F827A87DA87D7D7DA87D7D7DA87D7D7DA87D7D %7DA87D7D7D847DA827F8F827F8FD1A277D7DA87DA87DA87D7D7DA87D7D7D %847D7D7DA87DA87D52FD09F82752A87D7D7DA87DA87D27F852FD18FF52F8 %27FD1A7DFD0DF827F827F827F827F827F827F827F8F8F852FD187D2727F8 %F8F827F852FD097D27F8F8A8FD18FF7DF8F87D7DA87D7D7DA87D7D7DA87D %7D7DA87D7D7DA87D7D7DA87D7D7D52FD1BF8277D7E7D847D7D7DA87D7D7D %A87D7D7DA87D7D7DA87D7D7D847DA8FD057DA87D847DA87D7D7DA87D52F8 %F852FD19FFA8F8F852FD1A7D27FD1AF8527EFD277D52F8F827FD1BFF27F8 %52FD1B7D27FD18F852A8FD257D7E7D52F8F8F8FD1CFF52F8F87D7D7D537D %7D7D537D7D7D537D7D7D537D7D7D537D7D7D537D7D7D52FD18F87D7D7D53 %7D7D7D537D7D7D537D7D7D537D7D7D537D7D7D537D7D7D537D7D7D537D7D %7D537D7D7D5227F8F8F8A8FD1CFFA8F8F852FD1B7DFD17F852FD237DA87D %7D5227F8F827FD1EFFA827F8527D7D597D7D7D597D7D7D597D7D7D597D7D %7D597D7D7D597D7D7D5327FD16F8277D7D7D597D7D7D597D7D7D597D7D7D %597D7D7D597D7D7D597D7D7D52FD077D5252FD04F852FD20FF52F8F8FD1B %7DFD17F852FD1B7D27F8FD0527FD05F852A8FD21FFA8F8F8527D527D527D %527D527D527D527D527D527D527D527D527D527D52FD05F8275252522727 %F827275252522827FD04F8277D527D527D527D527D527D527D527D527D52 %7D527D527D527D7D52FD09F82727A8FD24FF27F827FD197D52F8F8F8527D %7EFD0E7DF8F8F827FD1A7D27F8F87D5252277D7DA8FD27FF7DF8F8527D7D %527D537D527D537D527D537D527D537D527D537D527D27F8F8527D7D527D %537D527D537D527D537D527D7D7DF8F8F8527D7D537D527D537D527D537D %527D537D527D537D527D537D52F8F87DFD2FFF27F8277D7D7D537D7D7D53 %7D7D7D537D7D7D537D7D7D537D7D7D52F8F852FD047D537D7D7D537D7D7D %537D7D7D537D7D7DF8F8277D537D7D7D537D7D7D537D7D7D537D7D7D537D %7D7D537D7D27F827FD30FF7DF8F82E7D527D527D527D527D527D527D527D %527D527D527D7D27F8277D7D527D527D527D527D527D527D527D527D527D %7D52F8F8527D527D527D527D527D527D527D527D527D527D527D5252F8F8 %52FD31FF27F8277D7D537D7D7D537D7D7D537D7D7D537D7D7D537D7D7DF8 %27527D537D7D7D537D7D7D537D7D7D537D7D7D53FD047D52F827FD047D53 %7D7D7D537D7D7D537D7D7D53FD057D27F827FD32FF7DF8F8527D7D527D52 %7D527D527D527D527D527D527D527D05F8277D527D527D527D527D527D52 %7D527D527D527D527D527D5227F852527D527D527D527D527D527D527D52 %7D527D527D27F8F87DFD33FF52F8F87D7D7D527D537D527D537D527D537D %527D537D52F8F87D527D537D527D537D527D537D527D537D527D537D527D %537D27F8F87D527D537D527D537D527D537D527D537D527D52F8F852FD35 %FFF8F8F87D527D527D527D527D527D527D527D527D52F8F852527D527D52 %7D527D527D527D527D527D527D527D527D527D527DF8F8277D527D527D52 %7D527D527D527D527D527D5227F8F8A8FD35FFA8F8F8277D527D537D527D %537D527D7D7D527D7D27F8277D7D527D537D527D537D527D537D527D537D %527D537D527D537D7D52F8F8527D7D7D537D7D7D527D527D527D537D7D52 %F8F87DFD36FF52F8F852527D527D527D527D525227FD045227F8F8277D52 %7D527D527D527D527D527D527D527D527D527D527D527D527D5227F8F827 %7D52522752527D527D527D527D527D27F8F87DFD35FF7DF8F82E527D527D %527D7D522727FD09F87D527D527D527D527D527D527D527D527D527D527D %527D527D527D527D27FD04F827F8F8F8272752527D527D527D527D27F8F8 %A8FD34FF27F8275259527D527D5227FD0BF8005253527D5252527D525252 %7D5252527D5252527D5252527D5252527D5252FD0CF8277D5252527D5252 %F8F827FD33FFA8F8F8527D527D527D5227FD0DF852527D527D527D527D52 %7D527D527D527D527D527D527D527D527D527D27FD0DF8527D527D527D52 %52F8F87DFD32FF27F8F87D5252527D5227FD0FF852527D5252527D525252 %7D5252527D5252527D5252527D5252527D27FD0FF8527D527D52525227F8 %52FD31FFA8F8F852527D527D5252FD10F8277D527D527D527D527D527D52 %7D527D527D527D527D527D527D52FD10F827527D527D527D27F8F8FD31FF %7DF8F8FD0652FD12F827FD185227FD11F8FD0752F8F87DFD30FF52F8277D %527D527D27FD12F827527D527D527D527D527D527D527D527D527D527D52 %7D5252FD13F87D527D527D5227F852FD30FF27F827FD055227FD13F8FD16 %527D27FD13F8FD05525327F827FD30FFF8F8277D5252527D27FD13F85253 %527D5252527D5252527D5252527D5252527D52525227FD13F8FD04527D52 %52F827FD2FFFA8F8F8FD065227FD13F8FD1752FD14F827FD055227F8F8FD %30FFF8F8277D5252527D27FD12F827527D527D5252527D5252527D525252 %7D5252527D52525227FD13F8FD04527D5252F827FD2FFFA8F8F8FD065227 %FD13F8FD175227FD13F827FD055227F8F8FD30FFF8F827FD04525327FD12 %F827FD1852FD13F8FD0752F827FD30FF27F827525228525252FD12F82752 %28FD07522852525228FD0752285227FD12F827525228525252F8F827FD30 %FF52F8F8FD065227FD11F8FD0A527D52525259FD0A5227FD11F827FD0652 %27F87DFD30FF7DF8F828FD055227FD10F827FD0652FD05F827F827F827F8 %F8F827FD0652FD11F8FD0752F8F87DFD31FF27F8FD06525327FD0EF82752 %535252525952FD0EF8FD0752FD0FF8FD06527D27F8F8FD32FF27F8F8FD07 %5227FD0CF827FD075227F8F8527D525227FD04527DF8F827FD065227FD0D %F8FD0852F8F852FD32FFA8F8F8277D527D5259527D5227FD09F852527D52 %7D52595253F8F852FD0AFF52F827527D527D52595252FD0AF8277D525952 %7D52595252F8F8A8FD33FF52F8F8525252535252527D5228F827F8F8F827 %27525259525252535259F8F8F8A8FD0AFFA8F8F827525252535252525327 %27F827F8F8F8275253FD0852F8F827FD34FFA8F8F827527D527D527D527D %527D527D527D527D527D527D527D527D27F8F87DFD0CFF52F8F852537D52 %7D527D527D527D527D527D527D527D527D527D527D27F8F8FD36FF7DF8F8 %2752595259525252595252527D5252525952525259527D27F8F827FD0EFF %F8F8F8FD045259525252595252527D5252525952525259527D00F8F87DFD %37FF52F8F827527D527D527D527D527D527D527D527D527D537D5205F827 %A8FD0EFFA8F8F8F8527D7D527D527D527D527D527D527D527D527D7D7D27 %F8F852FD39FF27F8F827527D527D527D527D527D527D527D527D527D27F8 %F827A8FD10FFA8F8F8F852527D527D527D527D527D527D527D527D5259F8 %F8F852FD3BFF52F8F8F8277D7D7D527D537D527D537D527D7D52F8F8F827 %A8FD12FFA8F8F8F827527D7D7D527D537D527D597D537D5952F8F8F852FD %3DFF7DFD04F827527D527D597D527D52592727F8F8F852A8FD14FFA827F8 %F8F82752527D527D537D527D52522727F8F8F87DFD3FFFA852FD05F82827 %5227522727FD04F827A8FD18FF7D27F8F8F82727FD05522727FD04F827FD %43FFA85227FD0BF8277DFD1BFFA87DFD0DF8527DFD46FFA8A85252FD0527 %527DA8FD20FFA87D2727F827F827277D7DFD7AFFA8FD2EFFFF %%EndData endstream endobj 134 0 obj <>stream -%AI12_CompressedDataxœì=‰BIÓÿ ä•0Ó×ÌèzäD”kÁóó`ˆ„s¸«OÿWuwõL ˆ»gu¡ÒSÓU]wWOær[;K…ƒö^}‰ç½lfn®Ô©×zíÎý¬†fW›Í~·×AÐÂöbÖ—yVÃ];ðU½Óm´[÷õGyVñî…B³~ÒÍ>ot»ÖQ½³˜]X„Ï^4zÍ:|Úkœ|kôòµÆ"=p”k=øÌ÷–=™y~˜õ¢û<ĵ֗ ú†+r€ÛýÖ .¶ÿ¹Ÿ]A–³¬äAV*Ÿ>ml×»CCT>Œ„„qùÀ a¬ÊË@ÁMJâpS¹½ß?­·z[ö~½Û-µ›íN÷~¶ôµÖʮ׎à“Zöm½Ùlÿ-6kû'àƒÜ­6šu ù´ÖËú>r§°ê³Ýb¿Ñ<ØèŸîÕ<ŠÌw5Ê—]Àhñg»«§Ù©÷z0Yx rx{¥˜œõµðn»~ÔÐ  û°hÑvÚg§µÎI× “>ÿæ³õÓ³&0V3I þ•ú_÷³ „VI/»ä @ìQÒ"Š¹SÿÒ¨ÿ}?»ÑnÕ -ÞŽY!<Ïük>Ùî7ë—­F¦¦¬·êMïî¯6kG]¢Òÿ5^Ô:Gõ,i»Ùïii é ÀãµÚ×:.”0Ø<«·^´_é9.°â¡àYh‚(ø2‹’WÀ³>î‘~ü¯ÁŒx ¡‚Å{ Öj³Ó8j´îÛù»+ÆA¼~ˆæMB>Lü诙+ÝëÕ[– 7¥õ„xùõxb¥uPjŸ"ï»(ø -fûÈ|æ~ÖŸÀíý3C€þ}–i«Óh!Î̆þ$ÜÝjöᣕN»¶Ú:lgŒ²Ãl:õ¬ùVÿJÿ]=[¼ðîrýÔ ¾Ý@+­/õfû,ÖAj­ƒìëZçìrÔ[ÍZ«ÖÉj¸Ã¼ÖøŸÔ€´w ›)¬êY}¿§oÑC†pÁ€ÄG—?èE§¶ÜÏnî}‚[àn pJÙ|íì²i×zÇ`ê­ƒ®C`~dƒ]>»}ÁN¶Øéw³/Úí¦C;ø‘ÃnÁŠãÓñŒ-}Ck³e4ú$;`øI`|R÷}þàÃ4c/ÕšÍÆQ§vvÜØ÷€1Ÿ»'™Ï®"X_O÷ÚÍF÷4–§d«Öé5ö›õ¯Ý^ýô"lÈÃFëq§ßèÕãÙ¶OÏ0ŒÈî×Îêg︪Gî8„rÌpÒÐ.-eül±•0Ã+ÚA,8Ä>/[­Úiý {dAYî-fÆBÁ{ðlñ ó.óG&*ÃUŠŠp¢( -Á™‘Šd$àâ‹üÈ‹¼°VÂrXÒ‹a®( à T¡ E¡SÈB?ô‚j&¨å ƒBeÁÜ(aGéqz˜W~P2`pù§ªªWY•T®‚ŠT¨¥”Ì(¡¸bʇË3O0«öу8 Vˆ€kÌ„»<„ÛbGä‹ßSž¬ê'Š Î9㫲2+±"‹X“•L0Î|,«~Ù/ùE¿$0;é ŸûÌÇ?žWõ*^Ù+yE¸ -ä)\0Oé'Àã.“\ Æpqr±ð\´|Ì€ðœ,[NÆÜåAžZÍ7\äâúó"ô.æ.ž9 Z"2 ƒ"AÂT*”…*™)#FpýÍÚ+j.V«ÕJµ\-U‹ÕB5ª†Àa (ª¼Êª>x j¥R)WJ•b¥P‰*a%++¢Â+¬âƒª–+år¹T.– `% ¿*˲(ó2¡ôJÕR¥T.•JÅR¡•BXJU’%Qâ%VÕ+V‹•b¹X*‹06a1+‹¢È‹ ,„—)T •B¹P* …BqD2$ ¢À ¬à¼¨Ul@BሠFl(â‘¢ A2‰„%" Š(ª ïO¾¿4SPHq#¸èg ‚ø¡|Ì Är×æãu¸x.3åð‡ò‘eP $3C1qÌÇïâdð¼Ëxyè:’ÊJøŸçá;™¹ÝÑŠ]ÍD U>'ß1îC¸Ë¡ý ÆË./¡Ìã‚š<7WYk´êºðb“2•Q<“QžâŒíÕB¾0aIc[ ->5ãœ*ºTtªäRÝé 3=ßBÈ»Q¥¨q¡É dLl|nt\Ì$d -üx"ð‹ã{ -þƇJ‡f@„ :Ô1 vÄ»Š1ˆº\±ç üxA €î"Àt¯ o.àŸ¢VøFÿXí1WÙ^}Uñ*êÐ\¨t?$ðZÙÌPÀdB¦Ñ€i4ðÄ ™üŒ[f¥ƒÎÂáK‰p)±Ú‰l(sNÈ9fÙãðè¢uÏPjg–=±ð£KéØŸ¢ÿѵ×ëžqKŸ\øá¥/$Wü:áï9)„YËq)ĸàwp%Ç¿ùf†ˆËÖW2¹–æ¢$†¿¨ÄFI‘+C¯¸<ð¥µÍèÅÅå5Ùo8Ó ¯0­1­2­³Ur\ëLb±ãåÖ n—Ü(¼Qy­ô¿R~^®¬L&,L†Är¬ë0B[–á<öF#^Ì€ðU´àq-sÆI”ÑA€¬ í - _(]>È"¢2ˆ‚#A`°2Ra Å°KÏ`¹XÞbTÖJ+@GCÐÅ2XYB áM¡NùzAì~ ±ÿrø5|MÈfLRà -؃X†¨[–BÅ`9¬ª'ªÀ´2X•"¬u+ÀºK°9Â_x¼ -ƨ&©”ÛT) AVÈŒ)(úº¤X±EÅ‚-+*SX¼ IêÓ:åe~È*ÂÒf&_Cðbº<ü›¬å¿œ\B’þƒtÒ­fæ*iVs 9Ÿ™¤e×O°.Ƞؘ Ša¥(ƒ*I{aŠ±Hh/'@`Š¥ä2¥ -TÃð²ï.†W$/‘¸¤»”½ý—.Ï”uH¢Å·¼2úE-ÙÅï¾b áðÙ+tW ÿšKÅ—ÙùA/LM—eªöïÂfÚ¿kÏA›ùa¹Ÿ¹R˜^Ѓe@Ê•Þ^)CèƒFH]Ä/šPÏúy©=}Ö¢6§q•c,ŽÑwEgV˜Qñ ¨®]eŽ@©‹°ePò*AåAŠAùAôÚ›•§5/Ø5O¬uÆ.·—\l»Ò|`ÕÈDi®™1½'VÑ{b¡Þ~QvG,Þ +é0Ü¥Å~z$ùs×<ŠÀã(öüø5t•“]m5ƒÙŠ h½Œoþ0·Û \ÚevÄB›HG:!(ÚB mA@äks1Œ!Ëè” a¡ƒaLÍ09 ôÆTNÁ¹ddǤÞn¿Ó6¦ÃfHÞ2:£M Àeä˜É¡ºa6WÒ]Y‡QU³©¡ hi³>iÐ+‹1†¢Œ·”pL™ó=Óå‘Æ8×”q¾é»bQ甹,Ö€•£Íèhd;ÚìÖj?¼‚s¯ðÜ+Š¯Lòk\Æ]Ås¯¡?™O4sUÇ_k×Æ]þ9‹¯ä´‘v]™ávKÐ$ñ&W¶VØŠ ¦ô‘Në .µ/Ùô^Ûý eù.ÓŸë›l?™ñ‡‰ -O¢Ê“Êý+ZEÆçÿ¦ìWLý'.ýé -P¦P(‡Š~e*ú%J~hP‡…¾¤öSÆSAªšÑî*Ҹ̟’v\檠£K;2ãÌ’K\ -™¹„õ|tÉÁ릗=nBß–í¹+ ¢û¢o –öyä¥ÀŒf´[ŠRŶk ã@3ôjT7¥W?ôÏ¿„²<—Fbèëô’¿¢NMú§ ýƒäR¿Dâgó>™q‰¦}Eö &}Ì&}&åÄOê„O§{6×ÃL/ÐJ/°Œi^E;ÓÌ :QMT ÌA¨Ý&8LÅ¡Ÿ4[èK€#ˆåoÞX?©j[Ä*6ø,Ùv®¢1^ÚJ†¶± }´n“ÚU ÝÌ CÓF¦Ý6:lq(j^Ðf7ÔŽ<Ð{;R{sôçTñ‹+¹TÇ¥r­ñ˜øG{fíPM9ÊúYªëËøaôÈÆ;O>ÛxoãÉW7ŒãùM`c˜XÁÄ &Š0…‰/(Þþ'|þ˜‹\|äÉ+cc.5rc®pðʸúÞðUsÇ^¥ä•±?Œ/~TιªÉkLÿýûóãâ2ku,jUDEä:‡©ê¦¨³Ô<Ô;s$uÎèêš°yf¶Ú—Ñ©M 3f‹}”/tŽØìÀìBù. D€’›X#èc¦sÁ1ˆ¡ø€Ÿ D™ñA‚®ÒT]u†»HÁÄ -a¢CÅ[ˆÑ™m·ËîŠ lqŦà.Óu‡þÿ õ3ç'büÁð>ìã°žúE9¹ÊëCA|цïÉÐ]Ú BvÏÆê©ÇQº‹Ð36@Î+CQ9Åäc4ÎÇÄâ•L2×¾e0lñÍ泶4'mžpÅ;f‹y~Ò·êÐU¾Bç%û)“ÝZÉ^­ñM1ãÎ( £Iôj tkvÞQd˜àu|(26DL†ðÔri‚ø8Œ7ábÊÇyq@_ɸó ya“¾ÐÂ8XOŸøy©˜Ì†úñ<žÌÁ¦ç%}ì<úÏ éEú¸|À¤Àóòž!ÑbPùÀW"+Ã|&¦¯ƒDÏô D9ªP<í;`þ"BžÛ;E 1e<L}üüﻟŒÌòÑ÷¹{Dz<ŠobyÃB¤"ŠÍ W¼Ñ>-÷†t“ÍykVÙdwÄåc¯Ò± ?Õšƒ声¬?í(Ÿv”O;ʧåÓŽòiGù…§åÓŽòiGùíBžv”ÿ:kùÛu”OÒ)>i×ùwgPlLÅ5vAM«€Ó*à´ -˜’*àMµ§{2ÿâžÌ´ƒcÚÁq]ü(¦ÓŽiÇ íà˜ž_™ž_9ײOþ™ž_F8=¿2=¿2=¿2=¿2=¿2=¿’Žó+Ó·›Lßn2}»IJNßn2}»Éôí&7åí&ïþ•NÞÿ¸ùçõ\§¤ç<­ù?û¬ÂÄý#ßœä«qߧÐé{ʧ]åÓ®òiWù´«|ÚU~ ÂiWù´«|ÚU~c;‘§]å¿ÎZþv]å‰Þðˆå¹cºÆé“Á÷•s™‡ü2Ó‹NŸ\”Y~‹í…ß#ÎÍ'ö!Û<<ìÖ{ÙÏýZ§Þ¥¯B†dìœÌ·Õ˼„¾þèù0뾦Ô&ŒÙ7_õ¯ÏàÇOü;+²ëÙw¼ì†¿Ù¶|9Õÿ·X²kðÛ昧óìÿ[úçM´BìÑ!æÊdæŽò€I3¤ŒtN é½N®™/•†ètÿMíLæþÞéëÕ+›H‘'uöøœ6}S}^˜'2•‡ø–dÄJ?`,Ê ™ç!Æ…<Œî]ƒfåé 1˜5Ã"RÍõÃd>Œ<Å ´–q–‘2ôÒã`‰[5^raè §ãï÷€q3ß–£Ï÷%pƒÈ3„æYÖœ‡¶–€‰0Ï•o°Ð½ã`É{[D"I„œ\)XRéyJa}$ -1;ЫŽKK¢4U˜µ?ÙÕ ¸Ãg‘a <݃̂@k ÌB…‘4Ø;ÇÁ·Ž -¤'åë9b1W—»$äYMG$ð /}æ4þ/pÒfÊ X*< , Bi–`>*±8ÌGmŒî]ƒoP`EÇÌ) ¤ÉÐ<ŒcaŽ9ÐZ$ò‘ ¹å1Ë3ˆl´–)x‹?õã`‰[G„Ø«Å ±­-B\„Bs\W{½|ˆŠ#­žyÉ:úÿi6h=7fmÌ}#ÖPpì,ÚL! Ö<¬8RnakIÌ2Š™+sï8XâÞAùÂE…ˆ% <ò°º~j´•@k1H›ÄÀ²ÕÞ9–¼µ•#ÏÖPùaæÈh:GW„•l½wܶÅoÏ„6 ¾1d¦p>ķ‰gì¼9Ž!eÛКxyŽEyñ¡~,^è#^ [KÀÈB¯%îKÞ븉sAeµµÇãF¼(°Üy‚#¬š7J›4™›‹=jfI}˜ÜB°µ ¨‡Ó,Ý;–¼wT ð´ª K ŽÞÔç“K‚›46{(€9MÀ.Súù²€(^Bz€êKíýB2Ú:;ÐZ "Ÿ°–¸s,yë8£=ô„Ósn÷ˆ133ß8ÊÐáˆô³d–­u÷aQl-#·³–¸w,yïEz|iP9<™Ósâ&â¦×ФÇÀ’÷; 9·§³žÝÆCq´AD)&㸹g H¢ q­%@À0GÊLÑÞ9–¸gó2S1© äB6Mù®Ü(4Ÿ;ýî1áq{RŠYÐ"äzøûæïL?3òŒOxtº³q™Ïz -ª.%jã]XV01xmÌ0 58‰ä°CÒÊ Ø\;¤1Ø•ßØ!¤Ð3•1.ü0k†‰Ð(ÑÎLƒ\¢ sC¢¡6À `«‚CûðRæPsÆIæ ½å§ÄðCc†Ÿ<0ÛT,>3–s¥ Yg1Gº”4‚„\¢KæÓX.‰6©Ì@ d L -Øû#ˆÚ½ÐLÀ$²!”>„ÿ•é±¡a½y ˆ7èk\ØÉ2¥”‘ó¸JZöÊ€q ä¾oñJ à ^Ó¢ Xz;–1H+ •ËCE<‚(F ·À’Ù±¸ï@BF~h2ö~‘ÇZ¼13€1@æ-ÐW‚&à¿ Îm lË”e—|·Ð( &cÍ‹IÃq3 ”}ƒÀHºYI9‹ ’€ÖY`D‹ ¥s’¯'Ã<ó••£0²³á`$`ÎíýH¶²s„å!9M*@Á·÷[áB½Ýý&t0"ëÓý*2÷c ƤFÈxDW®(­ðAZæFIfe$(9-´)°¼™r@"i üÈZ1±OÀíã³(@¢€µ†Ûž´³å^Hx±ËÁè˜ 9 X…ž…Nq 0â$I¡ - âté°„/3‘º™/(¯Å AXVkÍ - ¥H0͹3Úf[ |;cí œ®ç‡ÊN!òh}i¤Fú"^IAô¢u …Û`Æ‚Ø ‘0Zj!©9‘€ÕƒÂ¡HÄXرôˆãhÜ-0 HÇTAÄÉЄÜL 4±¹¡f !=)"ÝG06¦ph¥&ÌãølS±@Ìž¢QИ?F>÷IŒ±W‘±91· ‚W‘Ì: -RÝ{„€ÖXÉ!àÜ9`T2ˆ±‰€t×± ÂHË)Ž]ð¹IìòiR@[|’¢À3¢n°FFŠÛIm P×',©B9æEcp ãÂyfìŒ ÀuY¾r¥%#@'ÈÈøaâZ"ô(aÜ%‚0Þ4Ûnç”Ì#EšÌ‰`답}(7£Äœ û)§ïsËH_°Å8ûÖŽ À瓧±xAå˜pZdÒ7´4æYà,Á:Zw¿Df xŸ@{PÒcåAäqÒyP=Vè¼DÀ„<äA`Å9‰ ã4ÈËͳ$æ<Ã,”°˜!O˜Bƒ©ˆ ½žÓmO) Þ€ÿ"Š¹ÐΚãI0D!MŒGqÆóÞÀE,>)âõIdÉßÊEÑqx@ä‡Â#ÇZv‡MÜÇ·cO8û`YÀ’’È1§Þfð! „ÍXlå'Ö˜À0ŠÄt-Ä Ë)œW¡õ»E`% ÅÊhüMÜÀÈùÞ(V9&S„0W‘ØãË,¬aH~•o211 ±FÚë…ä¾ü t÷ƒägE÷Ǯ݌fòIÞ'^L)¨÷€ùY ßN<²0p@%‚XĽ(°‘#€Eàq8f`!óy‚‰¨-¹@gMh¥çË¡¥‰tË"àÖ Â“ÀýP0å‡òÉNH[0â¾*PH†W{ä©°É q_Á„ÀØôP'rŠ¦e| -½BÇ!"Ë -suS)…s%!ôóL¿CŒ7 ¬÷€¶1£7ô"2õºŒdœÑ£8é €ñð‹XXÂWPH @)Ȧ)æÙU°ÈÙÈÐX`kÓ8é¢Aú¤ ¡Oñ;€u bÈTdǘ¬À# ¤ÄI‡@WâÑ» ÆÃ,EBg)80¾–ÇNŒÛ`„H¢l€‡X#Ò%(0ülhb(ÆZç-‡<îÂ0ß…÷ |³´>w@02â€L8Ìí÷š N–C»1 %!‘1‰StÀZåRF¢œY­Ð˜½Uš(páRˆ±6Z PF‘½§¬¸£¯#5œÝÄ99ë&·ùŠØP€LR$bK³‡eýˆ@õÂ76Xù´(N¨¯" ó \|.MtKBF9À°{ÀÜ(¦¾&è Ñ­I. g5FÅ‘h¨[ó“zd€2+6Ç Xš€P¾C \€+\Õ ÀÚÍp`¥80‹:¸ AÂJãö†Ã«ùlµÞò¨m[b@` µäªŒ¹º&B\B*/báô $³’d„.'Bᶦ܈ÈFÚL €Âi\PˆF‰2²â =,Ð <“²Ä6R#@°GvGç\è¹pÎêÂ|’ÄQ‹÷GäRÚdNñBψ=yDN#r¸¢"Gè` yÒv ®°YGEŠa… "¯ˆªm¾ UäFfÈid„‡Wέ¿0*9ÂÊâ6=zJòiè%Ìý ÌÝO- $y½D¡ß·OòÝýؤk£›'P0BFÎ-0°¥6DJ¡7Çp¡•Y³`È@É{WGáœ$–{Ò}WüÑ·´X$Y?À8¶ÑѨJ›ì ®µ°ô(Ôà0tbV¸™-TEÒ¥ëIG‰àÈ‘„ p1Œ²É"±ß‹„ˆÜT„¦šÓ¼°¶i±*²&zw…f@ñièSyVÏÀwBo -ˆ7 _lŽ@ŸæŠíÕÕa¥+zDhßA´vI(j•Š"®&RpÅ…-˜LÏ#¯ø‘R%ý …ãö¸S;IöÿXõ°ú¥\qÅ€À|GÖ«[±fÁÂÆÊT5 …T +^A"œÖ®“ð -—hHë\¨"Z)M$a‘Èã ™3°öîâif·7p4¹«„慉ʞ´I§0H¹tì4ëz²â¶…®’ðJÌíoy’cÀ9(J*[êÂG r7Ú%Ɖ9FJvÎ_E65Ó3p -)âû±Á|0r0 £8›B_Æ%¥Ð% QV• - -hβÈ…smvÍr -|¤ó6Q"7ŒlÞ @!5[AäL#¾Q…I=µX#*G6@ ‹´u|/’PD:¹i12Öq]À2¢š6­WärP[”`à¹Ø³º_9'!M@9/¬}£}§€Ü…ÞQ\®ÓFÏ -'@]˜§íŒÇ>×M6tq~‚…qÙ@‹!=LO1i@#<¶óÃ:µ3@ª *SêÑ[w6Fk%lÞŽÀ¸¡D ¶ì‘pÛ˜TƒU,ÞQdö0½¸Žè$ ùd&H ,²q¦Çlaɀɽj‘!´´É`5 ,£™¼T¤À¼†&‹‚G„iS‹##IŽAG31—mP8ˆ`RO[B•ë\j‹@JAlðL·G®@áøÊ]‰^™ºg‰|Š„4ØÆ'À,šé·Õ8 -Ó+³¿h`Ûq;âf6h×@aŠ¶¤]0eöó ”tZlËjiº+ìR[ZfX#0óôœ Ó‘¯*Êa…ÙðB ó©’AÊ¥¡®‚çÖ:ŠD™ýkuÚå/ F,Xhå˜mh \8=ŒÓe3!XçΖ±JÒXÆ,Ùu ÌΗYWÚÓC¯ŒLˆ@øÎqD„4ˆ\)†L4‚utïžµf¡ É@ooÀà‚eD†ß¤¬YX-ׄU9ípHC­áD ÷œ5õ# ð“^†H^ãSH¦DÑÖqäE Æêaƒ·Y\r+|KWduPÐr“Î3a…#r5‹!´{ &©€üÎI§¢z<©ækã3À×ÍfVlâ¿»=8eŠÑ˜ 5Å °Íjpbº Ákm´b¦Î„c#g#d`l„›ƒ>á ìÖœF (¹ä¦ø„@î 2H# ÏEˆ¶€P]d´¡EØ¡R -p³¯„@|t‚B@aª2:‹ÀVu”I PGuÖðØœYƒm¤à¢pûu0ƒˆ[XLíß#T«-¿#º]¯ò •[mEŒÄšËL¶Óöd¬¤H¬«)éë¹úTúw•{ý¸ˆ6cu#á… —ö̬MC¼´dv“õíŠöZtUéüÛ±¥ƒÂ0azoô@Ï%·"ž•ÞÏ10I·KgÏL‰À(¢Xƒùœî—Χ*[uǡʉ¦7xs±%î¸Òó#WTT$Òuã¸Â9§™ÆNQO pÉ­1ÿ8Öã¤]&«B`l „ a|ŒÓ(¾åžC@"hwŠô8ß'ÕääλOòÚG±€žOûO*¹˜C‘¶Awä£ÿ -ýÄ\ ù4-]:5”ÛôT´q¡±†Î˜žF`¡#ðƒˆ¼"·Ú¥°‹Ûº‚š@,ÊA˜¸zŠîµÛdC”œ‚næüºäóM=)ò·%¤òööÀôÄ‚in×ÅN²¶ÿ¡4'RÌtÉÑÛ½3òD‘0r(©ÇBQç#+ÕÒl j Ãâ+’‰0F§u¥5e -þÈIƒ^5zpQÜ¡ÌþmòÁ¶Ø… 8P±ñJÞÎ9= ¢] [QÑsb$ÍA¼èÇÉÒ£9X³Ð8JWä•°5CZªl"¯îYnSFƒ}êi L]K±…LOè6åѦ‘»?ô(O co Aƒ µs694~Ú®¼g$òJæs&Â)E~!¢¸ FëFËEë."Óh0÷ ^çíüÐÙ”-©¤Ç¹ þ”èUnbº½ÒRF -€ÛʧL^e€Êž´0ª¨x·B£u € ÂâÌÄÖäͳøP”çcj©0²ób^"L³=µçÛy±, äv!Uò~¦ˆ®À”ä(8¹ʬ©+ñ -Ê`˜—:»9§‘F$ê”Î(ÄŽœÈØú$ãðÙ¶”FÌ7{ñ6vUñ 9»²û8ÚS.¹ÅzÆv-vº!fl3>æë›­ÐTɽàØ€*åÌ…È]‡7íˆÜu8G¼!•"ÅAèS8e·Ûø2Œ—ÑÜÏ\M(±b,âèj«R]m@dâR¹2a¨*IAIOX m†Á¥í8Ö-™®IÚ‡IÒòÈ:=†]t”µº2‰Aà,•i= KËK:Žg8°¾$Hx¸Ê·©Ló™2ß¹¸Ð'qILº’"Ií–”k{´â|‘+å I"ñn®4M+z¶a4lʃD\m7Iµ+_ÑýTmt-èÓ6¿Þê5÷‡f;L=XàÚFelap QW‚!prh_œ9Hç "ןc÷ -ÍýXÔ#!àv‡µ…n_Ñj"…¢N‰¸ àx?šJNZàÇw‚ú]Oêš$#§.ÜÅæ<AjeÎ}ù‰˜ŠûÆÀfíú‘zPEn/š*w84¨M›ŽmèÁ®È kܺl7¨5P]ºÎ@hãÆ)ÏÚh†’š^#’áHAÝßaD±ÇþmêñUvƒ¢3:{£›Ò ¶œmû¸AÀÜY';Û5 Ž;ϸˆ -nÚÍX“SLB;kˆ`NçÈt=iÍ‚c9Ô…v-ÉöCázèM7au‰4ABkÞñJg£¨©Á¾¤“IÒV6(ÝI0kQqº>Ú這Fëz§l;.²&.ªÙ[BO[JX9²]ź`ë+¢‹ŸtÉ×V}¸+]aùÚžCõ¨^¬{),V·i)]àÁMž¹döe„TÄÄÈmøÙò77­nsÐÆ®ÜDꦪÈ\Ç 7[¨Kf‡Ô¶ q#ÀKzß5²\g;´™êÙÈ…›âíòR*Ê©ÇRo‡‚¡£Kh]í ÷”%ñQo½.éÝçXh(ÒÃ}jTD¸Sçî€GŒ@[‚ä´‰»òJY~Åf]70 æ‘m¯ \œgÏ`/ÙÆfiÕ=Ô¯@çj¸Ù·\³`Mº¥×îá#0´x)/ð컺='ì™°A7UÃ%Ý´벊‹ö78<{ ÕÜo3IO¸2.‹Û`éì!XÛ¯J­,Z3 Z»£À€Ñ|[  ²Áýã[]ïÚ"Ô7'ñ² BÌ%Ü4AÌå&X 4<Ñø3ˆÀNºÈÎé#’z½ p.VìV¦UÔ]oç¥3gí=/áX¬t˜®8Ò;æZÍ·uË)>À.Q¦ˆßöÚaÀHzàÎ7Gñ!ûÞ€5 öä5£ì ¦z17¯G0@È -‚¸‹‘»T–»ˆQüj}|ÚÂôj˜ç»–yl¢¤ž=é=ÜI‘ÞÁ0íÚ ¤N†èx‚#RŸˆ}×ÖÇw·À Hk_ã>tnZ£Lw;Uplê¦{ÛÖÀM"jà[†HgôΟmº—Ä»%¬n %µ¿i¼’ð¾=½¹3LÜôyÚœ¾{‡AˆGÙB5ýñÛ@‘ÛºåæyAèœòø¬J`Ž;v {I&gåštC‘P{áŽÑAdìY3ºxTI‘I÷ƒP¸óð¨ÿaDc# -ì¹ÒÄ()¬lu 3 ú¤#‚…X1 -Eb â³­xÞÊnFðøt’p¿<>®ƒa -^½Ómp×ÕÅíö¦>Ù%ÉS·wÈÝKJxÞ±G¨ÝI°á‚9Uop³ë¶¤OÝQÄ)ÖG 5Ò'´Oj¤º }Éœùµã6x[Òç£i%NbáÁs{ -Àf'@¿hÀö2w6WÅG™™9ä¡(X|ûNîŽT"Ð#2&è­ -t¸—›Ö„€yÎÄ™t„Åb(Ü[˜mñåqä¬ÑÚ¢1³}¨úe‰µì#Ðv”±ÄÁ |E`œ=£½Y|iu‡0ײ/#wŠŠ%Åeä"\æ Ð}]¥„Θ’ïÒﱩ<3ň5 “02³ÿA`æÑ:Ð;:èIšo`šH»,¨ñ•(ºÅMƒmƒ¯… ™ ¿l›²ñÕ8¶w‹%ŽYH/i©=sšZD®0Ũ‹ïáÑ{”–·äT„r%îN=c}Æ#·ÐÛâw-Yap×#ã2ôPŒ¼uè•~QDo - ]rvjÁ:T1ã=EE‰HÐ tmìHN/‚ˆe¬|Jó•{S ™M­F™yS¦“‘rÑhDO ,݉‘Уš,E(Ø.k¦†@I1^¼ÉlLeé¸~7r!PQ3¡çZ4X|^]¹BÓí(Ô5Q–ã_ï‰)kVù=Qi#éZ=QK,eÔ|ÿ–FÚ(ù¾¾¨býK½¹s\;hÿÊÃ07¯eh½Ý9;n7ÛG_Ó袮”⧫„ôÛt ]1>h4k)+“Ÿ—k“tó$o´Q³S;hô'íÑôóéz‘Mþj÷¯cÖÒu>âšf-eš25fi—·©1ûezR÷Ò±_·ç&UÄŒÙp™XßÓµ,£ -?qKíRÊZQ¯zPuzZÿß^’kŸÖßK™;™žÕ¿‰½„?ú¬~º„rä¬þ÷ù×”¹¥k8Øt-Ï¥•Êa·TntÏšµýúi½Õ[¯¥Ñ7]͆_² -þ éÉÄ?iS”ѦŸÉu>]26Tw¯ÐˆŸ.Zºã:ðÿ)×Z­zs§Þ¬ïO^¿ÙNe£D m[~‘…T9JÄ;R›íÎz ý“FGt…$锈HÏÚ\?=JW~]ך.Ãw4]ë2êŽô&Mæ¼,]Ù‘ýSE5Ñx%{÷¿Ò#ùðZ«qZKgëÿa£Ùœ¸U¯KWÊÌ~ÄÌöj‰[š×¾^¢.ÿ½­5 4ðë0&ÕëtQd§>¤‘öéì_6ª¬_Ö_×ÏÒµ4z⃴ôÚ7²ˆÓ$¤vpÐè5¾LFvêº8“*¢bIƒÌm½}0)iÍF«^KWxLÁТíï÷Oû—7$*î­”­Y‚‚!Úh膞üd‡¸&~…ÔMæ 1?õM{é2E×Í–R–c\#[J׺Œ)Þ]ýmé -F¦/hÛOׂL›aR¹,×i† SEÉ´æ×k†ÙO×~Ý´fÒX ]uÑßí› -¿ËæÍ1]ÃŦËjüöí0ûéÚåºf$š~=™¸&mŠrv˜”ÉØõÚaÒXOÛa¦í0Óv˜em®Ÿ ¥«$z]ך2#~4]ëò£Ûaüi;Ì͈¼Ó•¨^×<¤L©®aÒµ.ÓýŸékõ.4:“«hÊû»ÖþƯBÚ¶—ÏUHã›H®ß‹òc»Y~û·ú)#ézo3LÛ]ã šÒEÈ÷½Ì°Ôn7‹éëNŸ~Ïëô¥ÿ ¾Iß_ðë¾ìJïÓJW p·i]]‚'1ße½Ä»éâÈô5´S‹6µhW±h*U$¥Á¢¥‹#S‹6µhÿŽE«wÚ—E»‰-]ÉO5h\ái„6µgS{vsíYºÂ‘سt1ä¦Ú³´w’|Ǻ0®´ÇÿïèKrwÓÅ©Ú¤Fm‚T FÚÔ&]ܹ™jók¼I«S?m_öZšé›´~@ˆ9þMZWê ö³þæe} ÿzYøû~†ÿ?€²©¢6nþ•_6ù›¶ü”‘3æU[Ó7T¹×á;ªREÙô U¾–AÛ—YÔŸýzªAÏvV¯õÊ›’Fë ~Øh5R¶m— ã÷=û±—¶ï6ÿm¾¯tò×€¥m‰~ÈAtås×8RjŸžµ»t¦UW;F”lö/¹åfÙ„ô)Ð5ÞÆ棑3\qçè²ý‰ÛF¿½AH×Á½ëžM«¥»¾eHcès]»Pë4zǧõ^Ê ÞyÛÊ'—lñÄ£T‘ƒÓ"ä¥O+!þ!“êPº¬ÜɈâœ\ÒD”VBø}èôtõ5NW§Ök§ótéD{‘[êÍ­fíënÊXú»’%õÒÚiü•^V¦ËU%(˜n'ÿ@c9ÝNþ%·“µã†2ó¤O™§[ÈC1hÊÈ™n!_@ÚôKŽ¦[È?–Æéòt ù&‡Ó[G!iº…œ’®±…\nö»õ5|O1Mãk¦iܯ˜Æ}­7›í¿uêõÖ°MõàßGí_íf½÷ S?xÐîÔZGéZÏi~7”ߥÿÛx§ùÝ4¿ûköCó»¦ –öñ[ÒEè4É» ªOÙê­Ùw—¦.¸ª}kœö'i˜®b«›ý ÛëM˜Èr•.ªÓÿÑG.¯”Ó˜Œ$U¼ù º@'ÍçÓ¸HÀ qWqÊC‰Oªh¦c$]»Ê -¦«=b`þCyŽÑ¡R»¥Ýô$o„†+(;gõ}R;ÓºÓ´îô[Ôl•ÉÔlJ—Ÿ¦u§iÝéVxZwšÖRAÙ´î4­;¥¾î4q–Û¼ü[~zŽ;-¢M‹hç±¥kó«´2üõ ißQyòoNé‰äªòÏ “—.RFá㩼j&]¶h”ŠPF„<5UDŽÖ¯®ü:ÇåQ{ŸV²¦gåÇ'3©"è·‡F³ÑÛª5.s_7Ë"¤ù4ßoR¹©:}wÆ9t¥+̻ƻ3Òµ£xwg¤lE¾ÿÝ)#äªïÎøõ|gºTäšÎ3•Áuüfzóƒ©ï¼núÞ©´Ó÷NýË~óW|ïT:½õ/ñΩKÌÈOß¾sêüŽæÔ½¦æF¿sjúî„T'7é­«“ôïH—¾Æû6»õTö]IyÚš ´úAúdî×o³8ø:!-éúÎKœö!—„i%äŸizóŸ¥7)·6ä9¿âª¤}+òF&ž;ǵƒößÓ7ÿܬsššMS³ij6azªHš¦f)–¦©™£%L!×HÍRFÈ45›¦fÓÔlššMÎØãúåçã}vîÍ¥Š§4ûAYþ»q0ùáH‘2’ìä)šÔ¯.ù2]ÔŒxÖIkê(ùg$p»BQ#]›8Ó¢Fê‹/ú½~³ÞÚÿ¯£³éû‘þ=‘ümÞtØiŸNÚL™O×a3õ¡lpâ—z¤ÿA½öÄ “®o:À‰’2}ÝÑôuG?cÍ~èëŽöjÝzµSÿÜ_I”?}ÛÑO|ÛÑ•£3Ù‰˜sØ©í÷jÍv#eAÆï­Èï§+ñ_ïö½ýãæÄíµ­öŽ¾'UÄ 1Ha«º öebSö>“äü)»‚ùLmÈ9DÃwní§¬qbôlߤo`K™Ñ0Õ’+ÒS}vryJÙ*Lß»26¬JA¿wåêb;Q±µWKÛ©Ùi©uZj½–½¾BÑK’¹vt¥Š¢iq#»c~tá¥<øíBÖÔŠiÐú[­Wë­ñRÖˆòzkÒFÒµzkRFËwwÖ¤ŒŽï뫉ƒöÝK^3Mø¦ ß/šðýºûF©‹ä¦)ß„¦ë¬úNùÒEÝ4ãK˜f|ÓŒošñ¥‡¤iÆ—>:®ñ¥«î:ÍøRŸñM_ñßçF¿Ì‰ÍïêaJÝ"Z©ïxáEºÒŸé /R~ý×áÅÄö M—"jF,ÂôÍŠ?™«¾¾£Úl·/‹ÓoÅÒ÷Eß箉˜SGÐ8ïÿuâo©=D13_³y¯YÛ?y5 öYm¿Ñûz?m…QKܯSFiV®kÔ|S¾V¿té÷»l{W¿Ð£”>!¼ê)•²ùâÉ5û-ÊÿyM¦ÜÐ_M½f æ©3¹K„þê”–q÷µoÓþäe|ž®«›ý Qõ&Lä*ïëLשÆÄôô>Ô•â…4~í´têå“Oô;‡µýúÎ~mâ´"]6f€AâšÖI.M|:òþ>NÛÛ†É× u•L׉ãùÕƒŒ -•Ú-sÜHòFh¸R´·c¿.uîýp/U’1ö¦ÑÞäÑ^Z¿8ù×ø~é‰ÄªòÏY»UŸÜǦKIG©OåŽ$F‰øM¢Ýßr7àµ÷i%kÚ>Ž²ïü–F¾5=U«ò;õNlRYý»¶=¨u½ãÓzÚÞÖtÞîàÉ%í q§}ªÈÁirI$šÒˆ§=DȤú“²Qœ“KŽ¯§•>õiZkúÎTÒt·™Þô`ê:o„}û~×™2B¾ßu¦,ø~×™2B®ê:§_Òøý/H}å÷ÈÂ_•‡×ß™»ÂjNßDôo/êµßDô"/Õ¾èfn0þØ¥þ´×(äþÎZŸX¯Á n¸}?%"Ò³׶ì+0‘î彩0ìëNJÝÕh)GO`b#žõì5î'IÉDà•,Æ/õ¢’Ôf]?d£1}dé8›¾âã¦+Ñfº ×T¥ÔÒ5ªK¿c)]1ù5ÞŽ±”.cpå×cü:{ŽH êÊ‹´½ïôšúŸÎü:)·×ÓV¾_0ÐNZ‡tD¿¦yH­Ùû!¡¶Ÿ²ï¡½F°­=-˜xÑ©µº‡?áŸÕ~k;š|…*[¯¶—2O8®È¦gùê*å–MW~€‚«½p ¤le*e©”²|õ²é¢ëZrVœÊY:åÌ¿ÁæìßD߀÷¯6:éZù_8Mýmë!¦ ÿ«‰ZjUèúÓy4kZ™ö˜^¯›1ÅÆèGõ4~·¡Ö+\h6SÅ•ØDÿXÎ\íÛŸdʾ–ç|ûSÚHºÖ·?-ù)£æ»¿ÿ)u”|ß7@½n·Ž:µ”9Üé×?ÅCí×?ÍV}o·Ò:p_… ‰Ývk (Ò/fY2àbý¨ÑJ~Ù8Ó8„ùhçëé^» "Ðé´ÿ^ÌxÙü}ów¦¯//»™ñòaHó¼d2®7,/÷y?ÿdßÔ2qëØ›¯ðË3øá€þΊìzöÝ/{€è·3K2ÀÝ*ëçe¤²§1(È+%=‘]Ë0–ácx‚ç©+¹QKñ°FØF÷Žƒ%@ÃóXËfæva}{K8·»°„³À? m* ûûýÓívÏöçvav3/3Qva1ûæõÀOc1K+h°(| V½ÞimÃÒt{ô…•¹¹]6:ߥÔéÅC¼ìr±ÝnŽia c¥ß80¢dgH³ŠʈÂ÷HSh>ÙjöáßM­p Rí½z¶Øéw³ëµVí¨ÞÉnvêÅ‹?ËšKµf³qdÒ;ò¶œ•Ù³^>[mÖzËv(ðt³ÔøÅìRf!\:®uöÛµæòb6of -¤ ÌóÓ{δ®xÞ‹Øu)áBE‰ôöú¯f™äXbŠÄ­EÜWXξl¡=°c¶átÁÜó üLê˜/U¤"‚O³z|Ð|?Ïý¤ø›üôFæ m¿£¢›Y~ÞjÿÝÒ¿ ïØѯ—õݪ´=üR§Ï—u Ü„ûv=äG£•5ªöëõpÞËvˆN^5º P0D8Ša§WÛ?¹†b­ÛØOÞÞiŸÔ'¿Ÿéš›{ã+ÒÛ½íú~Tí?4Ã,²çZoß4ßzÈAƸ¤l&»ÀCÞ - î*»¼UëôÆPVj·úÞ$D%±\†æìºÂÝrqżÜÌÄíÔx]äGì2Ø¡Fö:+ÿ²[¯|©·6&äºÑþr§}–%mðϧvšqùZã 4Çè(Œ®[ZÀµü¢Ñ»œO>Mÿ¬Öè$k {Í–&„åÁ#/o×k0æ¸ÝùfiÖcö»ýűÌÎC”Â0LQAÑ‚þÁc ¬M>ò|%ˆó×Y†î~SÏ‚I3Ä/êžõ—zGg{¾çè Ö9A €y«æØeÿãðb›õÖÁ’]ìʆ æL|ÿ¹4e–+ÿÔ÷û8ýý>ÓA#ý µ~³÷!a§w§gMg§ÏѬíÉ% 0qœê[Ð'j“ÖÞÜSìk.uX[µfâ1=õ­½‰'»ð. ~XÔD¿ù–†g¶öG¹²ðZ¿9R6¹zÀZ‚Ó"Œù(âQj†ùnÈöJ1»]?°¨=åG¡vëùHI_„vñØ·õf =\±@Aœ@ø’ãV:uH¡Ì0éæ&°àQ䈣ѥ¯5B~ 0 Tä«äQ\ÄÄÎ f*Š<¤<Â=îf^‡´Õ«Ùñ¾Š€B¤.£y±€ |œ§¡¤ -~äKa–”÷ÊÀ¢|èG<»òGÙâC!‰mܪ4‹}Á„ÆÏW:áñ"¡?Bd8Uß‹BÇøÂÌ-­œŸÿB/FÈ|ÄÃE(BÄ>÷¤ABB†*Ë?d˜frB(q‚8áâCB!}nçÃý0SȸÔ0Ÿ¢if&†¬ãšwœV: "Ã0 ãZB w4œ œâ:_¯,cäÍ^äktš\j‡F¨!VÖBç€YžŒH`„‡„F8=Eø¡|éê¢À3©1ˆ -¢a —ñ‘¤0ÃAƒOê…}@RÅC©÷@˜#>Gf‚ŽçÌ L€A¤§%ÿŠøthõà\RKYhAaÊSÒ¬«ðmóQS’È<ä™$­@Õ¤™Ènæû´†Ž:#È Ž8ßwˆB!p2^ä…zVBR†g,0ÓR ½ZÕÈ´*«/²ZQ õd6°_!QÆ”"ƒÐ )Äl°#ª8+ÆH›Â@rÍÉ”c«):­JLÄç8‘0$nG ,F»¥0å."Í[ÏÕ)-~üâÅ´3S€Whú„™˜6×°^ _Zç„d£„i.’ÔsƒÑJ½z4ê8!•LOÌ„o•)2¢ÊXˆr"bë3ÄJ½‡J ‚3£…‘”z@9ÐŽ˜€Už!,0?dפYÒ¦€Ì¯/H›Àü :MTÀ<-¾úÚ&ƒ*/ÔKëx$¾ R9£áƒ¤Šˆi¯à…ÓòÀ­ÞÇì3ó#£Áˆ‘{ÜÍ5®‚'Hb?`Ì+<*@ñIº®×ùäåX¨Ósp¦í7¸Pa¼t@â¡ÐS ÿyÀMÚP˾ãXe¡•pr#½@‡– zÚ†+ÕC Ð8ÞKt}>Z;g¹Y8àvÜÀm£a`Ç"m·«"CΓ® -].ièR"€Lø)p?Ô¸À ÌÙ4» ÌØaƒ4Ä©jUÒ±Qƺ…<ÒœWàC#†hs\áüôãXbuЈ¤ÒjBF“û2’\ËŒÃÍÁ{iñ‰ÂÈÓ«b9 ŒYÁÙëR‹Å«P}írBFhãFþái´¡ðàgí!”¯›<'_k}GÒóhÇ㌇ J/—`®µ_ä óh©™`×ÝŽ•)p¹PDµßv‘¬×÷nÃZ}WS¤Ô1‚óŽV!A•bÖFÈÃXâ«c ðFÊ(aàkµT ÛšŒæê“ZyÆü¬š¯\[]£LŽ Ë.¬5ZõZbÔÚA¢C<Üñ¹iž#Ðãb13æ‹ÂÓâ1"Þ†!%¼âÑ;Ο&»ò4ÙdÓ¼ñèˆØäÉî|î×:õnÖªp™ë]ñ‡ìÙ¹·–l&ó³[8‹£ÌÂó„oò €Œmž™ßCú›ßú]˜ßý.Íï’~Wæwá|ŸùÝ…º¡ùÑïMˆ~×)îÆ1X†O[E—VRöx•è¤‡É„ÚU@GÒW=ò»¶‘¼ä6¢ù?·—4´±`><ÿ!vòåö~ÿD¥\ëÕp¿„~×[%ËC['‰Á¹Ý…Ù;ö’ýιÝKz^æv£ 6ÿô&ŽÙþžÁi½W;€‰_µÝ\0/µNw{vêzô§Oâ§Ïá¿äÂ9›Á£b{î./~to”–ûÝÀP%þã…˜¤Áã=—Osa¾ÕÝÝïw{íÓç NÌù¢ýøaˆ†ÑåÐÜÿ2y ‡Ý´‡4Ü›D¿S -€v× ÍËxµ×Ðí~úX•¤bTšíý“úe 60®ÕnÇ…ŸHÍþß”‚+Ø‚4+Ë„L¤½{ø÷Oó€Ýfcÿ—pšÓ¬»¸RIÓà”]³êÅó T—R2ÚL‰¼ÇͪÃtQÃêÅd)ÏŒRF–kX¦êë¥-ùŠc¡+m$}Ÿ\NŽPù0Šw°SBÍ?ã¨Ùk÷ >\«ö6;#ÝŸz1q®» %TðŽ¤}Ökœ6¾é½^ˆF0kþyù]¯Ö9ª÷~ú4¶6V˜¨¶;§µÿ2ÍüNÐÃw7œÕ:ö´7K„'?*¦‰y‚0ØKañÄG‰jµ×±¶X²ßÓy³œü(qÐݬíßÀ5KN}”°ÓÉ×la¶ªÿ¤/á8Z»+5ñ¯Oh@'°¶?W!£21è¯VË“ˆüÈô¦ù™ÿŠdþ(ßðÄÿ'pûâÉ'vCtLw¢žV·jX0¤Ýþ^·Þ«¶[½î6†—Ïë_™=0úõqcÿx«ÓF…s#]¸20t«\ÅfmÀ¹×h6z_U«°êûY··²Ý?Ë®ÕZGýÚQ=»Õ>ëŸFÃ'r -Þ^»Ö9÷rêd0eÈÞ*lˆÄ _Ýjƒ;Ù®7_´·MtŽ±â¾Ȟ¤?e4q¼mÒ›ü!άvi²v7ncÄØ”ݳfíëºmžÛ ° Bÿ?U?i»ß¬w“ »æôÍ´¡)hŽouêÝzçK=û¢þO/[9hôjC«Cƒwª¯³ætQöE;[ÚÙ¹h­q¡s×1 C¿=èé‹õµ,¸ìJ{­ñ¥NÂÓŠÐÇÝñ¢ü“û§‰Â…wÁð3:ÝÊéYïk©Þlv/¿eõs½v6î4Öù£×Úû‰ƒaâò)½ªwzýZsdíÆ<£µßì ›P…º?âi»ÓøêN¹p)^vëné/ä¨n‚pÁ—HÀmºÕÛ,yTùŸ±sKzÝh´ÿî^:nÝ4çõþtÀ4 Ï0 w§ö }ˆ1è×òõo$Þ„7eQ²þ8Ѿì&oœü]v“µbþ¤D™»¸-è]é&aç'®t—ü®»ÔwÝØ»®ÆÂpHŽ.ˆñ5ÄF,k_&OÞd·˜ Ž_â‹ïyïyVYxÅûØxÞ_zÿÎûΑ«Kï“Ãëv.ãÇkg³oÖ·ÆZe0‘ÆÞg!”:l7ñë¸q¥öÙ×l±¶rÔÁ] ü6ðÎdl:ˆ0;Î$¨/÷Ï€šZ/IO±~ ’™ÈÍP=ÀÊl\»2`ÓÇËð8os Ð¡pŒÛŽ‡du’ Þ£Ö#òTÌ——ß5\Ø?ÔÌ OºŽ£51ð–$CÔÄçɨÊË61aoÁ:µû½f£UÏvõyÈQ;¸±ØÅh÷›³ì~›@þÉvêG° #?ÒG‹a‚»Òiì&B+ér•áA6zIFz¾›à©z!Ïìy·%ÒÙÕÖAýŸj£Ó½äI÷ìÔ÷Ûäp‚H[9Å€:Ô餤„*˜leµ8^ki5†ñk;1Žóò‘á['Yàøñƒ+,ÎW«Wúß@l¹ÑíÅŽBœk‚‘ÉUÈ; ­£¦“ƒ%éy—N­î~ÑB5ŽÇç?SS5òÐs$Éq`¼ªà‘I„)Æ3,Mç[T}Ï€E½p–±5½Èðê¡ kŠ~G^4Ö™þ_æ½;°¢qí&¥„&ÊžÕÎ`}»Ó~3Q_äq‰mö{g Mô<=0!G<ܳ^ï_rÇ¥‚щ;J—o˜Z†áPÀô}g3>‹åÚªk¢,r ¦…Ñý€åx‡dùS{/O³Ž IÑðPàÔšMºe¨Z<<ØЉy†u /ëtëíN²Z0vd÷¤q¶~åd²IgÅ#ãðU[1Íܾܞ}ÖÞ[m¶³±…½òvM±A‹RØ)­®†²\ÇeÀs¹\¥m=+îæÞ>zÄËË›O£ÕÚ\çaqçp}v?ØÈå:¯½Ü¼xºýäþæ“^Ô¨®¿ÿn¾íWçWÖξ}û–Ë-þUÎåîÜžÉåžÍdæB¹VÙüÿ§äؓΟ«>üp«ƒ¿¾(ŽšðÃÜŸðÏL¸R|R_Ñó™?ÆÏå“W>/·oë_+í¯>Ã_è_‹<|ðÝ4ƒ_üoÿ>þº¯-„ò3øaaqÿQ·>ÂO‹ñ×™¹•ÛùÂ=øùšÙ^™;ÙàðÓ½ ¼»Rjt_,ã¯z¢²œß^êÂK¾þ´Zªw>ã¯/ñ×¥Ê_>/à5ø'’Ev¼×Ñ¿jZ"˜™’§ñçÕÒᇇßÔÿÔÙqeï…7Sý£Ü/äùÚã;¼¸¼´Uxñ¹;W­ï0àõ‡ÊÞ­ûïʇ·ŸÎ•Ÿ÷ùGÍ2ÍLž™ÓÌ¿[˜Í³ò*_gå[ïî{½ò·¿}›?»Õy¢Ô³Æ‘z±ôö¬’[*.Ÿ>ºKë‘™Ãõãâ½<´‹wçä˜øôVX3;ƒ|¾»«p7€Ÿ™·ŸðIƒÆÎÜÇÕÙÜ…OV·ãÙZZŠî<ùû¼¿R|û¿íÂöÁãùbeyVà|òGŸ?Þ-?:yX™o¿¹³R|¯þ*žÜ?¸÷äóÛF1!J1ÖM3Ä› ÿ`þäsá´}Ô¯þQ]ÝTêùþ«RãáÓûw+ëkþ“Ï÷ƒ»•µê†â·úûß¾-Ÿ<{ž»û¨× ,‡ZÏîvî=i•GQ§ïåËõîã ò¿ÃjñÉýO'ËÏïŠàôÿrh6ëV»O7+{Þ½~áùÛÙCXÉOw‹KÑŸïÊ««·3sÅæ“&/6åÜ^,wy¡³¿êß=‰> zÌüù ž¼Ö.ìôsÇw‹v¸Rð;KwŸ”nïÂ¥üLùpé=/×× /©YËoZ†¿åfý¥Üìòþinæàé§\®üZ€ÌvJ¹Üãg=œçŒ]«Å;fr‹o>çîÜîh×ë -#¬Æ.|Àßf« íÐû¦^/5ï>é.…øÑÊvn>73ÿá~nö^y#w‹ÝÝËÍ ºó7%ÈþíûÞJnáqó]n±²ÓÎÝyþ Ÿ»ûçL1wïÕÇW¹¥÷•O¹üÞÒbnù¨ñ0çný™ó»A=Çg{·r¼ÿRåäüÏrêÞìÇ\àïvrá“už‹ªâiîþËÜÇ܃}|]îáüë ÷èѳÍÜãWrOZþÝ\ñþr®ônv7W™ïÜÊU·>?É=;{Ÿ[Ý<›Í=_êrkµ¹ÝÜÆ㻋¹­yµšûs¯ÐÈí¬®‹ÜKïÍËÜ«þ§™Ü›ö½Jî»á)ïß¼ rÿl¾ÏýõBÞËí½ÚÞɼ9»•;Ìœm…«ð”Þí—jvf§skv^<>ž]l콞]ÚQOg}þ6œ•óüîlaÓì=8œ}²ýé³åg›³Ow¼êìÚ듇³[ïÿ³/>=\š};»x{öCt63[ƒX~¶~´s:û‰=ÿ”™›mm—Žg»ó…£[3›oݾW:ºu÷ãÊñ-ïÁóO·dîåé­èýîç[žŸån•Êþí[OyaéÖúÝ×òÖö½îÃ[¯ó÷Wn½_~µu«vöÝ­ÃõçÇ·NþêöoõVòs¹ý‡™¹¹ù7kswû·ßÏùµÖœêîÎý±1ÿh®èîÌ­ÿy<·þüáâÜN2÷v¦÷fîcóäóÜÁ§†šû´û×ÖÜÙáþé|î &æoŸü9ŸŸ?=›Á̃ùû[þ»ù'ÂBfn~E½z>¿þæ¤5ÿbþÞÃùÿý¹²7_óbþ¨.ßͷʯóóý¥Å׷绯—n/Õ—ßܯ>äo?øóÁûÛÅçmq{usçàöÖûGo¿n,œÝþØ?^¿}¨ÞÞ½}º¶º{»wòä1Ø¿Ûæò‡Ñ›©û ?…½…JõÁ›…u°Š /Z;ó ïß×öž­-4‹žZèŸÏ,Þ.Ö÷—Kw·ƒµµG‹?vó‹+ŸËÝÅ­üÉÁâ›g¥×‹µsÏ^ÀS?7Cyg®üùîüü»Ù;êCùóÇOÅɧüVýΟóíÚ·íúÇ;ܼ¿sÒøðîN¯½ûîîââч»,lïÞ}ðtfïnù/ïðîƽróîëõ7»µ™îÜÝOëaþnof;ÈÌÝ[Ø-ÞcÕÕ{,µßÝ«t«{›ûÝÙ{o?lñ{ûñʽӽ“×K3­'KKsî.÷— -K…ϯ—ž7ÛK¯ä{¾ô×û×ëK'ùíã¥þÑÿ¼üÝâ»õ¼šßk柟ÁSòÏ_-¼Î¿ZûãV¾öüåÓ|óY«¹<óŒÿ±¼´½½·ÌÊåRÿéÇåÍû=¾ü¿—Ï>.ƒ ÊåÏ[÷¼……Â9{â=–µª÷¬·5ë½:*¿ööþäÒkÁsý¹Õ…µÌœïo,.ûwýÕš·î¿lÌßóKm¿õtë›ûÜ(0öðö]ö¨]i²ç¥oÙ›;ùAnÀ>¯ÍÞæ‹åWbñ/^’½ä[AñÿÝzÂ?­…bæõ¦—™˽Ò]ñð`^<{{wF¼¹s«'êoouE—ßêÊ»'wz2zÌÈ•RiN¾\Þ\”ûKGžü|ïN îÜ)>V¡ÿ×SU-.ï¨Û;»j¯¹ÐTŸ£·óÁ÷BÑâAüÙÊÇço‚WØIpÐiß ºè[Ö7_‡<}z>/Eø¿G6ÂÆó'Ÿ¢ÙÍ',bõç[QqþÕYôgåøè¯ú-Ð÷ð{÷ï4Þþyÿ~u&6ëñÊý·õã³ûË™¹·ž7ÛDi¥ú \¾Ý}ð¢üaíÁÁëg·ôjÞë?¼…YùÇ“Ò§Æ[Çû«ÔÂ÷‹|>üß_—¿-=|tç`ñáFíxÿáî«[Ïž=“üѽ•çGË{m<¿³úh÷ë°úÎgó—–J'mt><Þ<[Ûz\«Þ+?îœÕ¢'Ë›+ËO -¿ýdga.÷äàôä¬ûøá¤Àkï…ÊÁÛ£Âë£×‡…O·kÇÅÛœ|*FöO‹ÏϼNñcqe¶xÖÙ¿›™+å7îðR­=*íôzÏJ‡{+¯Ê·ÞôÊÁæF·ül3Ÿ/x}\(Ÿýµ¾SYžÔ¨Ã;‹•—ïs…JãÎéÛêíןºÕËÇQu£~ò²º·Ùë®äî/>\‘KáÇ•ÕÅ xÊʇ¹ýõ•Ïw;O½èyéiy«sòôÍqåÑÓÓ;Í£Õ{/ž?Z-,.~Z}ùn¿´ú)Zé<[ì³gê³wŸí¼8þðìøUýÑó…ÍwÝçÿ÷ñÕsH#°—ÞÚBØy»öp—3sk;· wÖŽ_½û´¾èç^­?jKë/^6Øú§âƒÜÆÝàèx£ *ï6^ËÙÓ?Þ—7óëÕ›åÛ|7Ó¿·ù¹rr{‹ý?y﹞¼²$ -_÷` ˜ - 2&'c 8€‰“ÓÞ³æÇ\û©ne! Þß|Ï9³æõ©©ê®®®Ô]]㮥V¾ýÜ×:»ö®nþíëáÂòºþqØL¶úÈÍ8ŸþñtKÿ†ž^ÂþÛ§ùÃs¥áÞ<7Šþ§^£ýè\5Íןîf¸yoÖ¢ŽÇæÏnÔ{võ_,Ï™»èó{#UÞ4cÓ—`;A¾Ü“÷/£›üï«3Ó˜l¯éŸÑóë{Øvýº%óoLéë÷íÑ툽ýLïû-÷·5ÔÊ}=÷Z_TøÝ܌ޣãêí{Ó]¾ÏóÎê9Úº>îèŸöÇ ÝK~:}ógÖ6yÿüì­’_æ/ßÉö{ˆö¾žëêײ9 µ]ÆÒ~4¿Ú“ë¹ã{~ÎwÊ2Ôé¿ÝßÎ@yÿ]ÓïöǮߵ–{ŸÝÛÔËk÷=Ukt÷åZ½{ªÕz/ƒ—Zoãê=õû“­ßØ’ýå]¹;`ÝóßÕO91ÜÌÓ—\:4Ýþ®º³x¾žµöäp~ý6OÎSñÆ|Þ¦ -•…ݱ/òvòsÑ÷‰¥'äÛ-+%úu9î%ã+Šx´¬jÎ÷jé6WL¶uø;\¿–»×3ínR¾¯—MÇ*n¶Qä’‚s«HÈá+”{ýÝ ï÷³Ýd5¦å®þ‘pƒA‘:Û“Åt¶Ýùàh_w¶ëÏ6ÂABC­Ií‚´ñdÛŸÿ3UFÄ5A‹qæh?F›áz/¦|Žôd·é®¤ñ _è‚Áp±=}ëÏúkÝ_.ø+XmúhÃ`q”E/Ä"6¦|(H8Ú/ú†¦â¦;äâVí·[þÞÌãØd§×`2ÆŽ|kú¤Ö†˜—:‰y©S˜—R2¯> PJæ%$Wùjýäî¥Nâ^JνÔ1ІÁžÀ½äiÜKjp/‹êqt†Ù—<‰}É“Ø—<…}É“Ø—<…}I%ûêóyȾ¡#ìKžÂ¾äIìKÊÙW-`-mì ìKœÆ¾„ûâë…ã2Ì»ÄI¼KœÄ»Ä)¼KœÄ»Ä)¼K(yWŸˆCÞeÈcNà]â$Þ%ä¼{´a°ÞÕ±£úâYµc\GŸÆá´‡³7}Gf˜Åi9ÓòûKåÅô -]'ÙZÒÛ* -Ü>Þ|¸ã¯ {¬ûæ©Ð7ÞLjSœ£? s¥`ö8ìÙI×·µ2Ï¥ŸýçUuÐ|¡\Á ½w¹ß¯LàÝëIÏ—Õ-ø»±;ÉXö…\ÀúšùÙ_M¶Üˆ¨ôTYC‘Qè¥þñ™nf}/ÚH¥í¢_©ø´ð•Šn}swÎcÛÅÁÈdÃÄ*|w÷¹Ñ×kí¼EG™ñ.;½“2r|ßäúduŠßÚ_Y8Ðåm¶ýÓ^§›5ÚD0g¼á_kºáµ,Ø>¼u{“-òëp÷óý`Ý‘:±xÚF߸3žo´{ð\È÷®äKÅ2ŽõûÝ)ú4qçGÕ1‹™$üÝÐfbýŽNÚ•Aff»µ{7îÏ}ºÚ¸Y£þ;S±Ê˜6Ù˜ØËW*½èÛçîÄ}Ìš&&²Œ()@ìç*Û [È> ½ÒÄ :Éú»0¿ä}Âáõ 3³PmÎŽ Uµ¥²å¸å50/åÆ’ e—mwüeð¥z–/ 6¹°Á€’ŒË‚¦äƒyeê D§dfêd¼k¾ ªùe¹Ïù»ñ›‚Ùý¾AXô¢¡à&&Ñ».ðgw²ç>Å_ówló¬'ÿÍ£ZTX÷p'“y•»ýIpp^ñØà÷¡gRè0À{Ì9,Ð(S:ð%v€t$žP£a? š3¹&5Úk -0ïÌo?ÝÌýºs#ÿÝ:ßíÚ­¦÷\—rdº9îïÒ5kÿ>ݤh˜ýtè«eß Þóoß·{D,×ÊØ´=…g¾M‰Ÿ°Ö27j䘞¶ët'-±Wv†d“-ß!Ý/™À[¥ÚlÆÏèýë-ž¡pp²a`ò\wfi+I)¸”î<؉E L¶˜;±wr32CT‚QøS$&,œ$Ó[¦bÍÝuºYÙíI©˜I Ýù‰ۘѳ&ȱµo’VÒiÿ7+gvÌ<½ç{DÜ•n6bXKÄ„Ž°äˆQ-¦;s[Üû]@+õΗ+ÿ†ºìÚg'4ÜXÏïÒíÌ}!;ª„ ò®7(dóž*sPÌ̘ī›ÙUï™RÓ’PôÁdƒ^ sÅ©m¨êq¼ÇHŒ¢¯ËÃÞ*Ûõá“gW\]÷"w,ð  H¬¼]Ž²“í„AÒÒûQ£œ–rIUl½™ÃJ~r"öºw'*ïéÏ'È1ÞÚª®â®3˜§ß•œ’pX#{‰I7ï—?©—f¹[ȇëo&[ÜMä?r¬òžåU¸a¢o0çûH¾?]ßðð™uYÁ|óa¯‚xLØÓO³•KÚ®Þ-ø³BOc—/}×j,L6‰çßwRÍÐÍc¶ºn’2•áºÉÒö¶L< -§yŒ‡2w1„%ì)Þr³ÞOešFòk(Ñâ2ïiö@Åú+,ì7«;™`hü–Û‡žÔhhfÔ¤™»»+y ñ|Љߢ±ü¸lóæ}Ê–™Uš«q}†Â·W õÒó‡j¥û'²×~NÓ7fkžrZÛY²˜­¦Ð§$°8™ †½è-éqdo…gI“Mþ¶%~†¾fPÌââ¯L£JÕÑÛþµ€ ‹žeXP鸷 -zsOTç}•GMâ “Qsô ' Ê F" Â'‘:Ÿ~ÃMPoj¸K¸0€“f»‚†Éu -Q§‰žÅ00 ¡$ê²Rü•£‚Øÿ&†ÞâaÜŠ¤d£Î±T\üÄê ˜ž–¸d,âä%u§ÖðD(¦ÁdSLûD,6¦“œ <*ñ+%`.Š}0Ùäs™Tc9Ý)a»Œ? £b‘Š_YSe lW…Q‰¬¢äYv,šÄJ°#Å+‡'GB3jü¨FTÅJ5Ù&Ãh•ƒ¸•÷&+þ¿U åæE\wŽ‘ÍjRäZÜQ"­²TbBk‚ð`™”KÓƒ5JjItù“fÑQ€T€xhÂÒ< ñ„°‹ pŸ˜0é|ÄŸXò # 1/¾ð_šÓ{‘ô"ý4ú¹³òn¥PéæËÝ¢"É©ÉV´;@“ ƒ‘Ø&ûº-^èìš®TŒ¨™Ýù—·¯Ê¼V‰9!± -”^’´p2r XóT°[âš‘pXî2ŒL?燦7Š½W izj­`?@> 7vL¶ð²B„ò^Ï(»»]¤X2aúiÑxN7våyÞ]õ;äog…TĶâŠ'§è|±ÊÍuú1›©!†³®æ2€Š¬0ùH%ÆF(Ö~J‡>+O¹ÊÆõ­ ,}•Ów¯u°“¹ž=Û¦ÅíãpÙ~U&jûÓ'ø>}ßAßs@Öï; `¡Ðó×ð.7ªoþIíÌæü:ËÚÛ4uý¡ï iºB&›Ô9 õ°ßÒ…Üïk';ùeü±ÑÜöö­‹š$¿C¡§ÁuÎ+ÚGœÛ˜}‰ €“9`ÿ7yŒKˆ$s?^ç-‹ N'¿ÁP{´gÇîVÖ?I&¢Ü\Éé$óE¦Àö¾‚胓ÎA­„ÉHi -TYžç˜SÒ-§â&Éò¹¸j¥x¢ý/·þ%L‡wYÐÀ]øî$#¹b+4w˜Aß]fzïÓ¾6×lEZÚ™)•0‹/„@ÌgR"ˆÚïb´<>Ü™µ”¤Kwå«»o_ºkA3”ŠÝµ®Á}›å°Óâàæ%±¡RÏæž< Çž"–á ÇnÇÛ=žäH„*`iwDs›ï¬È^*öl÷I‚dTpvík¿éæs·¢3¢ð™¢¡7%¯ • “-2+,GZC --›üê•3¸ziiDQý“¾ÉõÃÆÑÕ+éZ½?ÀÉgm+ä‚ï”;ÙúrB4àåKÀV%«7SíŒ1=a^’LeŸó= ¼ø̳ ¢šÌua‘åBƒÀ|ÞÕz9Éùßb)žžö¡Ã&‘0\„÷'ý·X4¹ûôS3µ>ä Ë6;IÜoSÑ‚­ËÜ2oÅìCöåV°N¿„â“þG®Üªe¯Ôî`âÛ3(¢^pTn«‘ÒgaÇÁÜ$ú€Ñî˜Ø5=ÊýX¾¡èÊ—shâAa« —ˆé>âN«­ƒ¸;žïùßWrË›íY¸ycm:–›ŒÏý™oÿîú8yHÏâ.ß˸&[ôÞM¤›Í³ŒYnËØ*¥âØ¢Ê -aþ맃”,…lú LÄTù äXÎÓ -1C¶·‘i:ßL‡"O?‘ÀwfƒÌšM"è"WÉé]xš‚y^XóåvšŠ'W¯(åbAܨ€f¦ö]%h]?—Ÿ»¡‘rfž ŠÃ÷‰°LËà~ä—ÒuǤ–HVpö¬_Ú.Â{D%Ã懂³UÛ¥ïZä@‚4q÷0È ætÏzæ)ÿ8ýå/+„—ßã d¥ -»¬Àu?,s£He–ë¹&¶Hõ{/¤g‹kUð Ì>ÚÊ‹>dýŸ¹»»¸Ÿ5Õ¨zÃ[È“#G!š~ºæ'ôÕ’¿ég…t2ÃØVÁ\¹;³ÈŸYÍ ´ùzB²Ô—»+_gAZÊPܳ¯µ -)b×9_ô -f—‡öý&BÁÊ¡¿aÞ†%`i—ÃÉ:—¡f¨Íï]¥lòÝ7Ž±‚£9n2w„A‚úò³Ìïo-•+ê»\Åá( mÐ2»o”žuçØ4ÊïnÊfseÖø¡ñZU³`93vc ¾ó¤ë®hÈþœ”ŠãÊ~G”?ŠqÅzàÆJ¿}h÷ö…ï65GxIw™tØSFo& - ¢Ey~r¸e‘ÆÎôÓw¥.Ú n‰‚Õ“d;U¿Î÷[ÃX÷lþYNòí·ñ3«ù¤#`3Ï¿,ß5«…Ol±1ò‘w±e¾Ï8ƒ™{§sZ”ëîÃHw,Åû‚½h+XßóÞVøLwÚ+™}aÁ1ë»îmâ37t€Ð‹“ʱp\‰X/:Mä¾&-‹„ÑÄ…‹Tˆÿ9)ï²€®gÇ©7Wže_ÓËôÈ!; Åi§L8]{÷,%ã—żttÁžïï¯'H#ó½f>(îÕË0¿‡ÁP) °ì]²!TxI½ÖÝ7*û(è_Ozqk®¾_Z Ÿ¹ŠyDH:ÇÁî´cåÇÒ}{îÁX†Qüú."V㌲ -ñƒŒ' øôJFÊD-_†Ž#wþÞUçöàÀÒûÉ{¾YY#Ïùkäçu=+«ÔfÏ@e¹(•eïêq…’I¶’4”P(BJ¯¾¶j¨]B%Y-“ÿÎjÃÍhÈ­“]B’WùZã -•øEñ]uöö烫@¤w= Ÿ<*o÷ ‚*û"°ìí! -°Ò{Ùß°÷‹ø_Ø3ÒåWãàNp—$6U/I”·iHo]IoQ4rÍ‚ s·ŽlþÒåâÉç710%ÁƒFpüƒôf»­KnYMjãV—ЧµxÎb)^Cy5Yàk2ÑUìÆ®ŠQ;¼ú™O}½Ùp8XŽF¾ývK-ƒ¾êÜüÒŸûø[1—»±Þ¥.’–âlµþІ4;ž} ßÕë°díî ÿŸŽÆëcíÓyõ/JÿÂŒ§¾évk?×;}¼l¶>¶^«ÓÈ=;¸}w±XŠœtxt7â¯ÝêP˜m(=ð¬Þd¸@—„ tyM§Óÿµ’v>@ –«ÁþHƒí1ý¥ö\@tã«~ö :{Ѭ..®¥ä–Ù FËŸB”`¡¥Ör£l)ECå}²‡ °b§_ò¡ˆy;‰DU6wÃÍPÞŒìã;àuív¸r«nEñv‹áOWvcœZ£>¯´†:.Þé«d´Øù¶ûžò -Me“Álµ-¥7÷j4¥‚jN–óîfºEÂ’-vg¸ùF¼Å×@ëÝre¸íl8RÞú«-⥽6Ð|#«2q¬µÐkme½V×Kø–µ^w£Çܨº%„ƒäz8ͦèN°Éb´<†y#‰ŽÒäóx(Õ´"Ün0!BR‘S뢴Þd7ï®”ÒæˆâÁ8à׻ɎWyF~Áª6QMjs‹ª]i#SCªSßß |Èr™uW¾l§C-Ôl7™ ·Lª*yh³í÷zÂm³š ù[êb–mÖ ù¾m7>6ÆÍÏq:@ŽšÂAMV\ýÿ­ÆËÍë·Zn©}d õgŸ`öØ„*½¶¼æ^-wz%´E¯ õ­ñŽÀ-»¤´™Dh*±ÕìS¡]«Ê¬‡{0ÜN~Ç(¹Zm|øL=6@ÆKÉmíÚÍþm¬ÙxxD¢³ÀDiåÈ G ¿W½®rÐé›#â~.)û¡T%#4Âå äZ”<Òø¨6ZÑDB;Q éôTJ3>Jˆ¦êjA“[KGžB£ÜŽínÆ5_­Ú¨Q3µÐÎdh‹–åLRÀÎÀÐ2nÑ­±íy†«vÄsA±¯+zÊòû=Ó|ciæ‘«T?ʳÙËÍÕùQ0êY-Wè7Ý$ĸÚz¾ -ÿK\$·ü÷bÛE­ˆ–ÚOï—‹e¼Y·âïï&‹6ò¿¬Á) æ’º‹¤‡å”^òdIó)É]z t""\û$Ý[þËÀ((iŒ\ˆ¦yP˜9†I2Ý"ª# †ö^c€ª™»Ñç(Ÿá6vÝÅ@(Cr¶ìr1ÀVEyX'£‰^„‡)ŽU'zW÷BÓjÊG˜ ,ëî†Íñ~Þ[t'³Ãà¬ügÆ.uVÿ-‹’­ŒR.6ü÷r3­ - -B£§GK✗Qðª€Ã‚ÆD _÷P"ÌPñC€’í®Øˆ¾oTP}‘°jˉayÕЇñ";¥ñ{ÝÉ+šb‡Œ—._µÅõ!f“¾Î ¡«¯Ãªó 1ì5›‹õCqùÐKÖ'á ‰SUrLɨÉ7ýÙÆÂJ>ÝGõQF×9ç›> P©O-k¬1€Z‹%’ ,<í¢QFVJÜý^wWíþ3Üè™ãra§u‘µ}:b·Ê7uMWYÓŒÄxÖ¿_‡PÂÏq•§0pŽ2¬žš“.cµ¡ÔrPÖÞÕÉð?in&sÄe¯ÓÞàJ~b£Mÿ<µŠùæ†[Â]¹±¨/¦ŠR&:šcàà+0G®vãágQ_mùR¥ÿW[¶^wq%5oñå€Ý-zœ,{Ã+@'Ôçðá:w; \ìŸåþjý -8hÈjŒš÷Ó,о”‘ç - ?]Ó^í–Dx5Á›XÝ«Y÷T ¤»b ü!îÜîûcÔ½ò"‡½i ‹m»‡Þ-G"úÉöj¿˜.€Z>ÃÒßLVçš™c`Í_6u£»š?“ˆ½Õ$á3é -Òw/ä:ã4»]näÊ|=”üÔ× Û˜c¨o¦ë—ԃ̎OóHH‘oÏ…¶”Ö8¡Ð‚5ײ‚o(tÝÊ=¨j5^þ»4ˆêN£Ù‚e9Ä%Ë¢Bà%{ˆB¹½,=_¡¶…QÖºXuüžKìÐIŽ¡3:‘N~1à†Žv ‡$ÙÉ€h\ ítþ O¶ô‰êHîdð;ä¾}éù ¿ûÞã¾ïhô‰ -ÄëQZxQ>á1ú¶¹ËäF‘â´dyJts#¢•ÞRîÄ36;éRÂìõÛŸL6³;9›ï³g~'éL˜3ïÌüßK‚Ïòˆo‰Rg˜5Ù6›d¢—ö¬*©»È6.Å_}…å{à%¿ù|'rï…V³H'ú¤+ZpXhkÝõºž_•Ñ.; ]XÑ Ye£êv³‰m›€ÄS&ü; ±gÛpa÷Bµ—ÓbpCbÌ"ØͱìðÞ,šoðÀñ¼ä¦>ÿ6\ „×±_øZœÁ¯[99ÒÏÍ×ýg]i1ÔFËmŸ*Ò¶õ¡j²)ЊH™É]ѦŽ4nvl¶¤m£Ž´F~®©¨KDj²‰h·vϽWipìèÚ[yu¤ç§;Ný¨ôºÐ˜l–çÕ¬ª6V¢¹Ki e,ÖÅÆ™Ð@Új…ÑCCDŠï ÐÍñ²Òiª"-–¨¦&y©÷dó#^ìååsú -œü¹OVZçá¬:ZôÇŒtÒÀò€•ªD†CZ³ÛHƒÁyg%"9™EÛÙ|M ¤©.*XIU¤íÛï'-¤%“ÍJ;bŸêc›¿¶–ñðIi=ëL®­óªRwlMŠHa^ä¬äº}O=ª# ´ZD!B<¨"½.ü„¬OsêQ ©ÉF¾¾ -ce,¶éâ>«…´K=ß/êH‹DÚ>t„Z©É¦$ðÎâ¹å¶¼o Ž¼ùÏiA†ô=NTC^!u)šlÛëÒpÉ|¼;ªH_ì‹M¤qý»‡‘šl‡cý(/w«¸:Ò*m{.¤â u¤«ÊµRÉíK§x½Ó ðÇ#ñz{—SGzŸÌwÚõ¯/U¤_Ó2FŠôËáX[ÁAAég˜øÚμêH~WóÇH˜V ,m§ì]hxck¸ÍH[ÏD~2¯¨" ?x¯Í©//È1@]+;êpH{´S±hœïÕ® #¥ìIGI>Ò*ñ튦Rˆ° ´öwÍ ýÄF‰t»¼IpHw·nÅHÍŸÝ'‹4Ó"ËrAèÙlŸ“fÀh}‡R©ìÅc¤ÙÝ(,]3,Ò[òΫ„žUàÕ4´5š½ÃH­u³éö)¡@ºÙ¤‡Kž+fÒmð7ÊišÛhݧ ïõrøÝ4qöðÛaä*=ß´—QÍ·­:9Ñz;&J߶½øö@òƒèÍÝhüæàÆåûõ; )Þ2a²ÓäÞn§áƒUÉ,Æ×ojïY¡X+G?5߆)×Ó·öÛq·m(vø>Mݼ÷5ßVÝ‹[Jûmïqß*(ÆX¯û½’Ưå›Rüy˾Ù×ÅoŸÝÞ8‘×ÑŠ=÷*…Ú{VÊåÜÓæÛW[ÏoÖ~û™‹&xŠ©¼ÿ¶µCVÍ·¿»Úª¤ùvúBeêâۊͧ…d[ë×Ð¥z,¨ù¶B’oÚ³õ½FUë×7æ›ò§Kóm>}ßj¾­P·×¤6ÅÒfÊêŒj¼ –ˆ|ÂÅ9êˆ)Þº›õí-÷6ë‹+We©ù]t¥Å÷mÀó$÷À²ÄÀþ‘åäÏ·m†Þ®8w´Ð ²¢'³Ü>°ŸdrŒÚY‘‡™5{+‘x˜¿MôLJžÌžÜSýyÅþ›à½±2‚Ã×}Êð’osMÙ5/'ÏÁÏ‘ÙcI m‡Væxm OG²"ü÷á…üØ·=ˆÖëÀ7Š ø,þI¢çétßì¿}^™¸Ý\›l"Zìéh e,ÈÏùPGh½k"%òK*ì1éX±§£‰©¼¾Òi >²mø!Ó ÜÜXD¤ØúÒ -ò"ë_iq&CêlaïUŠVFॉ[ÿHÁë¿-"…±ÈÆú¥‰¼ h#EÖ¿&R“ Ùÿcõ±ÆÍ>=¤U»&RlSˆHÑÚ—¡E6ES6«Ãâ&™}Ì´kïç éÚ×hÉXÖíüÛãÑvÁ1Çwœ´ÈÀ˜?Óœ´swŒèè×yÖ™WŸÝ¬9>“M!þ£9ƒüü5®ÏŸEŸ‹ã1µ"ãõY‡XÆço‰ù“õ, KéÊü4A™Œ°;O¬˜÷$ÎùJ¦‘YÎ*~®O§¼*ÝÁ¸yç8ùbÊS™÷HEŸî&mbÉEóPô´órÑCkŠÓ1ÖÍ–7R -]–ð†=ê´k£»uykôÇ“÷°8Ú‘ uÚµ¼fM±­µ*qvšjÉd;e~‹ˆ&¥Ó­'µµ?(Êå´ -±î—¢âÕéÒ©+Ÿ¸þ1é KÚ?u&›±/_×°8fóËfpaÓ5,N˜¿bm.‚b9ù`…~Áª4L®PNí¿ÃËké;1§ RjÕ]L±Îæ)&—h'ök%Ã|‡6Žë.¹=Ó:–í¿@JjΠ–A«ª ©ÌÛØ|DŽI lõU¹»½þ³U™y[[Os”Ùý؃™,¡-“ªH䉟NÖõQçC°-•ÔInµ|4Œ n–BAu½Ÿ¦äVßÅSt„ãä:¢°-ϣɑe/éë#»5TÔO …®?NðÉÙMIù!#álõµíù$møTF<Ÿ?FP,A³Ž £*>4HYßì0ÙNé”åL —–hÉ}ílújÙ¨(‹À¨¿¯=>»’›Œ]f+g(-y1Ö÷[F›z¯ÁT¹™ÿÚEÉ ; §êøhøäÀûcÚ(r;VzÄ2¾Ä5Ýì%±N\â2b Kÿ‚¶F¦~ù¯ ±È—¸ª×}<º\{m,B¢K¨(C²ÊÞè…d’yEnÁk8ÅÇC²04ÉBâfÿä0IK¸7Þ¼$eW*{¹Z>#¼|°¦ð€ðI•ƒÙ2>W -ª÷1Ùô¢tó -ÚÜm]÷Ad9ëSˆx ¢cˆ“%rSiXÉLéÔ^iJh9™lÀ˜FT¾SšÒ§ÐŽµÇplúý1_ oŸCvGH|±“áÂ>o½DëNý¡çó;Qù úåŒhôêN©÷´d²ép:ðŽ\é#nŸmAÓ‘97F˜Î‘ ½I¡ê´lY ŽBÑÓCR[–‹DÕ¡Í*»ôü<3 š«NÂÉYèï´˜÷á˜ßjÚN¾+jx €iÅ[Õ¢­¬g¡oEÀNX|êþ,“íâM - #åt"¥ÄüŒ®eZL)ѶSçDÛN•x$šj„$ „I­/•hÏ¢Dã½×S,x%°ãÍdp ;_¢ «²ø²ü‰³¦&ÑN^ûçt‰v»`á\.Ñ”Ë÷^1Ý OÆ!ìâøM65k@¦„^–z´tëPÝF xžäç-Áç9ˆ£g—nÀòúed_k‹!ƒ–YÖùãNm1³øÓÄ,{1Ÿ$dM6M1{æéùb~Á¾´Ì?Ç@YSjÒ’0Çá3í5¡à8 À¹ü†¢áP+vÞÑoº /«ì&``«fu!ŒÏ¬ ¹6„§ÞKì{ “v¯Ÿ¶{|o¯F£Y’Ø…¦6|=ɾ×Á"`—Û÷Ÿk5]xªC³vzHëP‹!8—Ø÷(‚.<_‹a8*ö½Á{Õ€cTêëB,a>×kC™.ì(÷‰1xú'Ç‘üQ=‡ÅéJÙá)ñ†¦-ÐÙèL‰””»ooo—Īq~véê–ôKem럵֡˜!s—ŸI„EË#‚¹ôZç:»§Y ç‹_'reà8¢KšÏö]^JÅ”õyÔRÖç7äWPLTæm yòÙ‡asJëW%8`4Òû‘“kûÓ¦N²Ç—SØ8›N1—Œ]å¹¢‚ŽwIþ_ŽQä{|zÀôÏaŽõËœ3<>Eäêp½'ºÿô.id>‰\éuI-e夤9C²&¯8 -"ží9-jwÒQöü˜êaÓÃÆZAc|3ØÅñª–×¢?4“Ád7ùIÈSƒ˜“aÎ/³ÉnZÛ6r/éX²›¶ª¿á ‘–yÝà 2×ô˜’Wd3È2…“Á"wlzÔúXæ£1™Õ-œäôâU©åööhí#”'¥˜âÜ·{ƒY‡Ç}{ –Ú^¶`†ÎŽ§á•"L¿}V=4{ÆŽUQÓìÒÌ“XJÊ<°£f—á<¾ý±3ð'äñõŽå¿XdA+íÔ4í$}Súð ¼=1¶hu*¥–¢©=GÏÀ>E0(Ê#˜ªóg4/¼9–£Ç òÓéØŸeˆnÄ­Ì”S€çxã“X/¤ØÑ4Qãƒ%ÚY“~©Ì[Ë+?èTR¬WÉä2fËÄ|Ý,a©?©Ç-õóå 4L¯åYÄ7Õ&ÑŸoÝÕ]2àì ßgï§dØÙÓ <£xˆcW£À< ·jK•;k†:Äqý›4êË¥¸2˜tCÒ(+MÉ;`{½9Ó‘4g[žx@úWž˜Ü+;2º=8ÊïÈí \²3¢ÅÉ¿åÓÂ;*®k)I;:ÚQ;Um~†=V6ºâÅõ®iý–O ïh§Ù)OM§ñ‘HƒIáJh³À‰Y—dùÈÐ)ê”ð‡N—ä‹ù¸Ó¡SÀh—ôO§OŠÓë’òîŸ"þ˦$ýED¦‚#2žRKØj "ÃíñIϱF}7—Dd$þ~åòˆ pèœî8! 휈ÌA¶à唆¦ˆÈhe¤ËÏ œ‘QóW ¤çKÎA)z°àŽs²±ã{¨T!7–ïDcYûܸc™¾}v[ 0ƒ~NâêîoN2 y‰ÖíÔ¡EGÎôIC;ó»T¿ 2íèÒ écGT³åÕ|höð„*Ϋ3x^O7¯N’:ª“)|<z§{I•dõJlKÝ£zµÃ»HÑ3ƒŠŽÏy×:˜ô7ùpË_œ©Óχ;ýþ±sòáÔNA×æwAžÅ ùpz'Tÿ.E­/\òáTnÕLâ:?NvŠÿý¯óá”÷Ž²qwô–€?ɇ“íX8jy^>œÒÓÚÖA™l—gÖ#÷gg"”üL¤–miäLäËÒЙÈck;¥/5²ø€ÄåÙèŽçØì„c$D -ka8Éup’Aç üq‰†’ë´b‡ç%µl4N<Û×®ƒÏöõ‘‰P,BÍhÏÛË%ËPL>’D.]†L÷Z59¦¹ [+£ËPÇGô>Í_Te´¿¹ Ã9mùhä#œ?I„Ìùi±£p´¯Ö¸MKë˜õá•ÀGoC“G¥·5:=‡1,”|¦±ÓQ‡ZÈH%¯Ï= "³ÖÅÂge¤v¯;’H f¤v¯{FBGRýþ$#õsý7©Î_d¤¢|±Ë3R”¿ÈHEpŒ]­p‰ÕÎõá¢}iêɇŒœ^nöåËðíâe¨H…S—c -‡Ïóëžèù‹T8ÕyùóT¸óã–rŠéûî'ø•¤ÂIï ÂÉpÿ‘T8•¨Â N=>fÐ?ké†RQ ½?Y/ñi¬yVÕÈðr{,ë;â=è…@ E 0í›íN´a.>usA’Þ2¸…£w;/ˆr5•'b9žÜ¬Ì«ûÔ¼G©ø訊z×/ªçQÃÇÍ.q™|g/ÝNÎ2Øç kª]h&kù”gÉ_hÞ†Z¸lxî=¿I¥KL³’ÍøúÙlƇŠ4V¼:²Íä]æ"Nò\,µ¬3ä%q9JÚygáz´&e/y²[¬ÿx/ >KÇ.[ܼÔÊ° ´Þô’Ý~M¤D¡™ÑË°³=Nî»ZH¿u½ Re.VÔ½•Dá”Én·qU¨L¨H»vè%»‘>Ry=¾Ø\+ÃŽ±XÖÌþS+ÙíC/ël®Ÿa·l65‘ÞT‡ãÒ¡~=¾ú›6ÒüÃGQ“¼Öëh!­Ë3ìð¬Â‚åF?q|5Ø.¦ÖŽ*ÈZ>«† œ5¶§:«ŒŠ!úÀ{IÉÂ~¦T¨z±cGnå¬{ÁŽE¶GT»YþMjÏñªÊ¨‰v«µ.IöÅt:uìpê±s¬÷ú—•äÔÊŽ¨Ü©b º¤WIî¤(ÜGÎðÉ#ÙøNÈÎõ+"§{®Ï8?)"§9>µºoÇŠßñZ†‰~¬Îˆâ.µ êÇ_/Å¡v!"Íã®F ÐéGzÏɦ;/sj6šÀ×âü»l:ƒ÷Ã\˜M§T®—˳éÔréÎÍ|ÔΦS‹Å«Ÿ´¿$›NFnͪÞ?vQ6¨#7„œ‘Mw¦F>1›NmŸFЕ–M§–K'õ÷ÿ&›N-—ÎàÙž²éÔbí|ö¿Ë¦S›]éýÓl:5ãFzvôo²éÔré4n›¿ ›î°Kc‹¶¥tn6šqj²ýu6Úü©œ†º0›N êhMá³²é´l˿ͦ3N±K²é ”{â”MwÅNΦÓͱú³l:õÜê¿Î¦SXþ8›Nm·Dqþ²éÔăÜ{ý‹lº#;#”Mw\¿üE61Dkü¯²éŽerýM6Z.f=¾Ë@¯èÊê‹tu“v¯Ã"•ÊÚŸÖG»Œø¥V-›óëÕti‡vyþº^¶uaŒN;·ý$:‰T’„D9™G ƒ, KPÐÈzÖꔢKFEêrò©³º„(:©ì²^—ÔRhJ:é”]Ö™H‹É=¢[²²UxD´5²:RØ\?2'TËÒ+twq™;É=WMòsÊÜiV—»3”«d°ÌV&—±D:C$ôÏ'‹…î.›«bke¤ÊŒn”ÊP™»£ED˜‹ËÜq6Œ~¡»‹Ëܱ¹oG -ÝÛ  Žž3| -€;Ñ­°˾?É|¼|+UÔ¹œ›}ƒp ÕvUƒ"9ÙÕø‹ˆ¡d²«f -ÏeÇÀ %ÖjÕ€P&Ö6‡‰µÅßÝ -ˆ€ýI!cÌcÐ[#ÂLª»4IÙT#åÑz¯zg¨]‡[º(ïðµ®'®u†z¸þIfŠpóñé–Ä!¨êþ¯*‹šö±áµÿ|R¡j­Ý7Txíbs‚…¢wªó8pK çÒjÕ,~ªÝpxÚYÕg‰ 'íð:Ý*ËðÅ@"ƒ¡üÅîøüJ­wg,C•ÃçÖ­>­Â^æãËg4®ÂÝŸTÊ;šOd¬RÞ¥ùDB¥¼Ë—¡N…;y^’‘üs*ÜéÕ{E5îN¯pgôVs”ýtybíçZ4s´¼Wɵ츙c2bè°µéÎK¬Uf>/¡üÂ{ÕtèÓî¹ÂpΛwD 8’ÏyOóÅŽÂÑÎ…U$1™Ž]3Ëå’ß®–Ä$ÝEÂs° £Ž#a ®Å×}3˜Æd$‰Éžh+=Q‰3’Æ$ä‘Ø©J˜Í4¦¨ÃP†º®Û.¬Ê¨ÃȪ4’ÄdO,”Æ÷¹~åÛIILZ'ˆPíDM{šaøÆåð^p+¿Â0T¹,ñ­ÅÖ€ø‹׬OûV1ä¿œZ‘î¤r˜”ÚöXëﮦjáÝ·?Êqmi^Muº ÓÛžTîñH¥<ÿ™9®’õ)Ã0õ|<Ǻd8ëY/Ç•‹¡‰¨†Ôññ¦Êx+%š¹)™Íø+¯9Ë°Ò0Ùr·îF3±üv3ð©XÃÙ}…·Ï€²'¯s¬âÁ¡]Iì˜û$KÂ{¸}’"•åÙl[ËK«& UÉë°E³-|8§vÞfÿ%å2Y‘†G¸´rÿ‹5ôäüÒJÂûÔD -c¹.¬hͱEËû³&R{¹çûѪÃæ‘ -™\"kAJ‚Tžš¶µ‡nÄ:‚´"ËÑé¸ý˜©!5Ù•5çdix]e¼wñšRÆb <ä¾Å¬2#®£ƒ´he´‘ë–w5¤¸î[¸$K­T"}Ò«#x÷¢4Ÿ.ÈNvZ+zï>qI˜{WÂ/Ÿ}vt–Ðl'ͯ$¾]Ñ´ˆîèr—Õ$Œ¹PÂf í‘+ϬNœXPtMQƒN¼$«bvüà¤Ý °ÊĦ£픤ãUš]Bœ¬Ý©¬‘Ô¦ã‰MÛ¿ªÌ‚ºG*³$åôViNÝAe@Ð8åš^ÖâæÉ ²ÒŽœÐd©d2ÆOŠM¯SÇ'D­QÞÝÉU5ºtpJK¹^ ý¤SZ&›^§´ãħu ¤¥ö9-®?gcâ*ÿ™tÉ7¯ó‡5SÎs%vÙÀÕ×Gb°íü_]ÞØòšÝph I7¼lt—§¿ä&Z1'ñàʸ³’ÝÔ·¬Oº×º?3²,¿Ee^z ­Ú]qšùbǼ–ûât õø˜üЈÊk·pR½m Sø3¹[PJ˜sw½Ù„;­uŒw¬Ž—¯“õLç?²Ãõø4£*õÁ‚ixsº=¢QûÉžxÓÞ<-‘ì žÅeÙô3™NʱŠœtϤKŠü—AQ/v|Ô—uIrTŸÛ­–¬ÚS§V©œÒ{®tR•4>2âÎû xòYY€]:È”îW²ý9ÕåEùŒWd»¤(Ÿd,ÿÁ¢|Q…ÿHQ¾cÙþ¦(›3¢o \^”ÏdS± -ÿ¼(ßa}äÿDQ>íúÈY”ÏPýÊKŠòI£ -¨SŒf§8K Ö®êwùÝP•¿¸Ê`]?CwC]\×O2´?¸J«®ßiç”έë§_Õכּ¡TêúéG…Ô=ñÓëú©3ŸîÝPgÔõ;ÎÉQ×Oÿdˆ¹º°®ß±L®? -èêVõ3ÙN -èjÖõÓš"vqv]?YGªúQDµ®Ÿþ€ÔN¨žS×O5QïVsã„1œ)«zôuýôoþöÄ/¬ë§«è²X‹ýA]?ý°ðI7PéÔõÓwuUOAŸQ×O-MR\z—Õãûƒœ÷“êúéCAqþ¿¨ë§¿¡b2 ç’ÄweFê¹uýTLMIU?iu₺~ŠeHÈ«úÉîì:9=…êúÍ{ý“º~úUýN¾°®ŸþkIFêEuýÄü-5^TÜsuv]?}b öêú鬵í”þ£z|.}(†ëñ)'g¸ßEuý(ªËçÔlŽƒº~:yGOÛO­ë§oÉ£þ¢®Ÿ–9ÜI±0ûû«½W -ÉÙW¤þìrxçN{f!J?iËzŸaÌŸÝ Ÿ¾S¶`8Vº¹\?×ÓÖ‡É -úýð}áÍwçÛ˜ƒÕbà;ó4}¾4î™×qsø\¿8†#ëkÚÈý^7Ÿî¦ÑYüm9¼u,ÖÐÚ¶I-˜óëíÝJ;ŠŒmôQ.;÷cËG`ù9Œrkçv&Ÿ›³ÏÝN™©Ÿõ‹;NÛSD!s—! -£~…(27O›Íwıن_Ë[K›émƒ½šiÙt'üÞW]\óio¿þÍös‰ŠÍE,lnõ¡ ‘å—ÆÞ«Hº__!‡Z(‰êIî¿I›+ªVÔˆ…‰ÃÝÝ y¡­fͱâŒFG×>¬Y^Þ›Iëbã/ÜPŸ½e60P&i…O5ï=«À:¯v¿À9‰æt¡Ù´Öáûûµ¥Üd_)– ­–•$͉ñVÉÐ@¬©Ñ!Éز{“-÷^¾ášÙ¯âÓó\§ü»x%åßb…ˆeZË¿¦è6m‘,Î^Þ>Ó%ÆÜ8/k,[>ÓAº§!”ÊØj§bUó*=_"NNß½¾vÜù—·ú®Í|(i×úõÉ`kƒ='¿s Ó+‰ýAŸÿD:pì(ZÀ× gý‚À)¯àkƒ%ŒÅZìc²>þ‡!O݇l‰pç<¶}ÁQ*—I}Üá;z甾ˆìºÂ ·ôEÕÝ7Ù„W^é«vh(¼ðK_¬²? Rò¢˜Y£ì‚—ôÙ³£‡ãÙðH_ý<œ®oH–¬)©+Yòhô‚I´œ’¥Û'ôµ.…Ýûq#ÊÖ=l“¾5öÅ@"öÊ}o‚Dü(oiNöoˈlul¿þŒÁ¢¤Ö¸QÛr‹±Z²RNoYÿM Y(çm*Æb‰¡ ï§ÌÌ÷ãJ×ú£jî®lnˆ,)l d厫Mîpf(g©Wƒœ|.Äz5!@Ìw5ë°øõþI7öÖIþ}P#ШH̽,'S_ûv*;éúIÂßjÓ<{5’¡çnC}~Â^½˜€T®žEðÕϳý+Àî}¡Úl¯$gî_9ëb‰>Ó§ "›3ðõƒØéã‰÷ó¿~'„OnCÇb'|oÞiüÂdã^å¦Ö|ºŽþéoË;W^“pZÃ5kØòžˆ6ñb•†j¾ÜŽ*; ñúNw$ƒ_>±?ôó‘õ þ´^è)|¢¤íîèY@¥7õÂ÷K+›s‡Kþþ%,µ8Už•šß ©¤Ú·»kj_н»³3þ0{ýö¤…s&›Ùš Ç9œœÞ¢W³g½zD/àkš˜=÷o%³kmÙHô5š+`Hÿ Z4~†îœˆzºØ5dO Ê’œd„%ŽŽwyQª2Aз¯ùn¡ãüÀ·£å\rà•Š¬>+¹XT(^Eå¼n,ñçÅK G»x|¦ÌÉm_‚´T÷0ƒeYku.DÁÇ)2à@§Ï}ÄÀáˆr‹"ÅÒÙvEÛÑ8ÿ4åÁOa˜OkøZöÁÞZ®w>¹È$r•ø’€&$Ö hÕµÙµÍN]1áñ÷›DBÏÍY}¬+¶}H =° „,®¢hÉ=ÀŸÐK)û=M¨ƒ-€x’À¦oŸÍ{}Îa÷ÄE74s·<=Rk-ßÂRyÚ!«®.»½sÛÖ Ï°*Ùæ7ýðÄÂÅÏÌ;ÇVQ;p}RzN l‹Üf“Xº¤F®˜÷ò·Íc€rDZ´h·²&ˆ-cÍñ ú7 2þ{ÁÌ)‘…·")ˈ"¾9²˜»ÑÉáäs2þ‰'šÄf ÿìeÍ?kmü“Ç…›¶Æãߘ»éÛ—‡;™uÆp¢K/"f±ª3ªnfïˆxà WQ{öü õp-`4 °è´äkklè™ÿtØÒ¨›‡×QpWpóÖ*ó¨^š¯±)ÜÝñÀ_QñCȬQ\P[: ê§.;×Ç–ªSé7ª ®,Å‚Èm‚±¬¸!Ä+§&ñÍ[¡ Š7@ÁníYŸ>Á¦ -•eµK߉z¿1R˜ô¢%NPL1·ÑÚරYQÒ-ܪ R¯®. ìV œïƒÀAä·œáËe½8±øš´C0/†AàÀÒY¤äö÷‰ÑsÔ¯ -ú°’p?˜Ã.lHz²6·ØN¬&¯ñ™d;Ï©/¼yšSmi;PZ=d©k_éz­e’CU,eDTˆNkI;°Æ|—~I·ü’Ùìƒâe¤_‡!é¼T é×vêV: û8$ýJ,ÂÒ}dä`ĤïÛ¡„ôëO")írõ:"ýúìˆJ¿¶}RPà>Ä¥³ô¢6¸RØàOHû]bª)é×Û§´äk¯m“v(We{mT¦E–1Eú‹F½E=ß_4ê-rvò™þ¢QoQÀr–¿hÔ[d3¹Îõz‹ˆÇÎ÷z‹\ öLѨ·hºÈ_4ê-šl—ø‹F½EÀr¿hÔ[„Uy¿hÔ[Ä7í/ʽEtoÄ0ãæ"j;Od]pbÌRvåt¯+NÌÉ|£—5âêÍç½õ ³ÿ _C,Ž°‰ï†’‰£F€[•È.Xs´ ¦¼øî/¤PÞaɽpñ±a-gPߪgm@ç|*ÉËž!A"̯"½Ü*‚ËËÊ,¼ŽAñøy‡¬àDômLg™Ùõ¢€ôìX¹rJ²êµóE‹)7âƒ{T¢§À-¼ˆNÎ),V§ðà¤S ÂŒµ—üOÒŠÐÁ«p ºò?ígÃÍãfò3Y\yL1“?]&ÉçÅ`YØ ‡ÍáírËþ~>\쮢Wþt#[.‡ƒ¹a9^á ãàwH°•=œ—Éí…K· d›ä¬È"ÅiÉò”èæFD+)ÙBÇ^›“.%P àÉdCAƒ¸Ù6$ïÌžño}-°–´0¨Ã¸õ7,0ÆeÉ 7™}Þ}_}Uˆ.ìˆg½ü:÷^¢U)E·&Ž?2ßT#t—ºõÀ×¾³43–íÐH"'…Büf3•b£ îúõƒÙÝ÷=¨‡B„X  -¡ÜìzreÉ' A¿Ö–X²˜Ø=0àO’]jlxzíÿœïÂáó³ l3÷éwˆ´eÉÉÅCìkÄä%7÷5ê@Ä(ñb­2,«¿Ë„ÈëD©»‹ðqŒS|!A2á–¼èZ³ þEÖ ó"¼¢2ïÏ·ü«²_º¢b?iþ…"ö¬¦bÂ%>“b.f=’P{[Š»Xö! åSçÓÍ.µ¯íï@ðWû üµ”»ƒOìÁ³6“\¢€DR)Œ âj„×#LmíÑD›¬­ðõƒu±“ã¯}ÐþûÆi¦[b°¡‚VÕ+ ýæ±`ŽŠåüÝøMôga.Äó_ÉN»†£„8¬6î"ÐÃEV„¨=ˆl"é(†è¬„ë‘p±²›¹ò aæVSë´<% ¶:g Ç^­n@zWÊ^½G,=œåÚ{öslß{#È^µì„O$§˜zm*)S0W½.Ú˜ä>7µÓ' Ñ‹O+À×7?÷ëéÁj‹ÜÖ£ì·Õ$כ逖¼h›éŒi¨ïûµ7æ –Yt&L‡cös”3…ÇÌ,l Kä!‰±dyeÆÿaÏó‡<ÀªóIÖKŸc–]› ‹dÊŸº$ÿi@‰í8²û ô&¸{)¸œÉXèÅ{}_ø¾·E„C$z¶bÔaás£&¾œë2#ä8ç°ŪAåù:¥0ã™ -ësw¢‘èDaãwìy 6Œ›möÒ ~jY3û{Ä·M bß«­qÄ™‹7¿S•ƒxs¢5âÍÏ8œ(°ÀçVM -"¸,(AÐåDƒHrg¤€"˜²¬”+tì”sž ¡Í´mPlÿÈ,qrO»k÷lzíÖ -Ü=QYÆbs\èPZÞàa8µ-;ÀqMÔÑk>ä)‰³:Üò 0ŒE= ì[òáÔÖ»N•ßYL¡ Ù–¢oì…¼žãa`À6\¬Påžjþ¢ƒ ;̾v?tg« -_ d3¤ÏŸ;{ů[|a\@ßë?ÞkƒÀ×n^Ð|™]Ñ­Ù }N¬jס±E`xHÈúyŠÉ@|)¸_Jt6thQö V¥¼¥8~ÝÍî£FÉn)—®ÈrD)×è ¨Š}VA³]jf„)i} .‹<?w´NrÕõ)ÞQ߇œçýõ}L¶K¼£¾ˆåïǨïƒlþó½£¾Âr¾÷cÔ÷1]äýõ}Xæ\ïǨïƒ(v¾÷cÔ÷‚zgy?F}“íïǨï#õ’N÷~Øí<Ü`>à(’h±²¸2í`¤¸x£±âu×^~7&à÷b„ ;ºmÄ‘›G謊Dµ–>vÆž2q~%ÚÛô`¡O}íãeÿämçcs&ž¨›Ú *òµ{CðÁyÑ‹gÎÙ%Ãp<¦\xƒd{VLÍ)ë^Èvmá<É®2¼À‰:±{Á®—L^˜déX|v ØÏ#»WÃNù ø¸ìcXS¼‹S|$Xé$ Ÿ)>x·ýŸ¤)#)“d'¿HÛ&› ž4†»ý -5v2ßɢÚýg¸1WäûýG_…"èÿ©`¾Ñ£jÏäÀM¯ΫêÂdëøÓ›]nÒßM–‹î柫(zôv_}.箢WlÛ´]9 3DZÃ+' -©vÈ+f¹œ¡7ÂëUþ¿VËÍîŠÿ2ÙNz³áUsy•m4Ž·—¶ƒwLäUþ½ýÆ”†ðž¬àÓ£‰ð…‚£ô1¡¦ñ‚¢(ø!H&Àÿ­k‰ñö|©À‡_xôï«ÀÕýÕÇq5@°ŸLA"ä †"äã Pd8|57‘´ð¥Š¾€±*6T|›Ž4ˆzßÝNñ§·üÕ!®~ð‹áv|õf†Ô•ÿe¸Ù¯®Þ,èU¶»Ù ·“îâÊßüg5dŸ~ÐWÔו¿1ùoî?×Ýu¹w0TxWã¿Áç'¾Ñð_“þ𩘹ògbkÌ/!_$Ä0Wa ,u }•ý"¼#þ‰\‘òAñs’¤}T$àÃ~s -û€:A¾ƒëVqÓýGÚ/_€‘Â¥Cð»`D×4¡ÂÐëPD¶îÈìW -O“l^EJi @“"Áµ0)óïƒÀ¼t$x>q„¤Cz$Ž*òÑDˆñß%M˜€¤hU¾àF&a¿ò?à)!ÀT!1)ggEªQXÁÐÈ¢hF`áC†Tél€û‚a’äWÿUdbš$|d¢Oäb? ‘„6*l||ÂE®†®Ç·¤Œo½2Šj :„«Ân‡]>ºð@äÑCjdRÏ@$‘K…6:\zÀì¬-_W)¯† *¬Â¬J> >:™õñTúŒôADÂܯ„¯"³BÐùH„:dÖC Âìð¿gYh£-_ rý!‹‹c×ãVê(·¢:€«Âx¹ì€H‘…é¦Gmž‡„_‰ì*´Ña׶?àqqü:ìê#’µ:°%&”`6ýÃ>¹zÀæÊá¼z{…OÏð/"|{sÃ0å6;…qW,¦Ãâav6Y­&‹ö1Á?ÎM¶]°ŠÇåÅ¿†`øp±éé ûIbþ‡ AÔÆͺšaml ¶S½Þ››¼bÿã„ ¶¶Y»ûÀæ¦N°¹©ÿ›[0µ ÁÔ¾z2Nå´•‰C2ƒò#h…2A_ Dw€ øh2B‹ÏDÄG2`¾gGÈbu`ñP8OhxÂ\eM4¬"‚ -Ñ`M| ÍÀ"$h_8¼ -„`/P )ÊGÒ€LxÒ7‘$å G`Tb+ÀN%KÖBD|@…Á¸'ÈüJx ,LS@G@–!™FQ P¿, &äc€’5I  ²9ýbhèi|´*é < $H: -Ãë›øG!°‘±“/€í“fûA¡é `HAÆ -”Ø& #‰P ²"¾p ð#ŒQÌU,)†Aç( h˜6B¤¦‘ª£a´ 9 U"DX¤ÿÈ@Ãhƒ!Jlƒè€©CP(Ð?T ä£Â4…0‘¡@a -†€â ê ÌSÓ5B„X© @hŠôÁ0Ãï›Ð¼C„ÔI$&|@ò€$”t~$<£…~f+ËÍ‚îÁ_„ -…ð4‘DŒî ƒJ!h^A‘RÀ‚$pð8Ëz’@Ö%’•â=ÄŸ ƒ† Bt p…x8&DO(4§ O`rŠm.¶Š Â -&žJ„A†€kàgü3èÁúàáˆ+æ`]õM™È(ÇóbÑW?›î`‚NIÑ„¯To„È/öoæÇä%€ñ¯7`|A˜]ø„ôI–÷VwIXFosî§4 ÷†AÁý‚Œîà U|þE¦Ï#&CW^X ->† -RÆ0gxÌ€ûÊ ƒ€õ¡÷SXÀoñ—'ô³du¸g¢®2u±*­ ´Ærüª¿œ¯–{P»Ûqœùùr0”ß“U t I…Õã;ä º†üßÔ5kÓþ±ÊæÇ°ž!8†B2V (áMSÀ0ùû°ÎLH€Ò -†‚âœ0ËC…ÄgdPÈiç! O|ð;á,Ú0MÀÔð°@ëPÄ'<ñÉ÷Jl%Œ†‡t8¾¬iĪ㫢 $r$ØêþÿIbl–á¸KU"k_Bá j =¨ZÊG#%Œ& 0HXÉá %>A:ä*TxFƒ" ÍÁÁá¿K( 'ןõïì$‘œ›ly·‹¡G;Ħ¹QäÝS°g•z,aØüG&yÝ,·¹ÒpX–¼ý­­Å¯ûPšym5ðž»+øäÝ´L¶Â·ã‹ÊÌR3o, lÛì¬R¿¾uúîõ{&™:ÆSî²Ã ’îÏ¢mZÜÅ -][% mS/õ[” ³zAŸBÀ/Öp! O`,ßLö%«øhÛüƒJmŠó1G!MFþ (Ñìæ|>ï†oWG;·;àëÏ×®ÀÞâC£·JÆòƒÖtŒ¨Üº©\Åmw¯g4A•^ÌéfzQ!¨~`“ ´¢VáòGÛÁ§Ÿz76l×Ë0ž š 6"ßó¿oL°–hGø¿ÿÏdSy(yj6›ËÉ\yðCb@¢ÀÉz¢×½ÝÞ%È›ô Jõüt=K¹Ñ ®|sàØ[zÏ?(_[¢Ãï›AM}ïx>5ž -NWÁBÄ“d%™õxCËÇûx!;p‡St*òJTR·ß<”GVdgc¡…òýNÅŽ¿Êi¯-^¼…¯¯ ZD!ü&ÁB¹—Cdù$Ìç¨^$/Ð9…bVõ1ÜÔ_Tjјú‹^9¯eØ{ΪÿfÚ­ª¾¸süÞ©¿ ?ÒÒ!j—Šcàì·žgr±(X+__ÀZRŸHH–ÂÍ/ºÍγDk¸ËlsýQM½öC¡;ë˜uè{&œÝ­ÉÁ÷æ‰rý¶ö@ÅU…ô8ÍodÆóJú\£g“¶Æc²ï»«‘Þù艨´ž_¨|¼_£íË䘸ÛôÝ°JŸš©¸·öƒÀÛUS¶€+6Ž–[}¼¯n⢛|”4½ i°Té¨d°T$¦ƒðLj;€­ŒÐÈv~+<›©À;4\{0”É„#8bÅ„È ¥Áà(°yáYï¸ðOÀI·0ñ¿;ÜÓktõFÎ ´ -…Id¿S`Ì0èI€ hÑAL‡`P|’5‰Ï" Ïf&ñ—ü3:2å´×rÐ÷,7Dò*g¢Q<(ˆÀcš›±WU°W%¿•ôèOP*»ˆ€.’A 5Å L`+dIFB>&Ÿ„õ„Þp?£fA!7Ô„ -ƒ»ÑÒd¹ÿ¤„„ɪwXø¥@Bz„'ˆ ^v'¡ëYfg@QÞÙAOz#É°`LYá° rÒd0Gà L%X‹Aq(“>¦]HÚˆ -}¸Yá ~Ä=F„#,%f;ZDÄ?Âò½ÚðæŽJÇ¿ù‡ÿ›®Íÿ—ΗÀ\yi"Èú9 ÿöÉÿNNŒ${Õ6*QHçn™T£NŽê¯)5'‡ú6G²Tg~¦3áå}3ù½ùÿ›“CåÍ/¹““¡\æRŒ3³N¬MÒ=M¥°Q˜m?¸^ÙÑß>ƒ(ÖRy\¿ì+ÎK3 Õ;ØÛŠyŸf”à Ñ‚'äbvÕÇçÔ:]ÙZ®æ8W*øØ“¬»dô±'Þ‹©Xsw ¶ä¦Ïìtèsg“ª£Âìë«èŠŸx¿±¸ƒD¥>„býç'„°JÆRr,,€êýCäO:ýÀ|ƒYÛ»é"Gì¡œŠ}µúj_žßR¢K?Q¿ÈÝÆ#åS ²ç¤,´!ø›ÊæidØ }äûÆJ~K F+ßD‘å,ª˜K@oKe“-¸"ÓBÇpF~7®ñÚ;÷í´ ?ïËæË»+i%0$„¸Ø¾`ß‚¹0psúöY!‰%iOÛÓ6Äœ]v5{ó1ó,WÚ5Oô¨ Çøîséá¶tá¬ÔQ/ŠšèÇîçLô£mYÅÞÒ67kV+´"JwuÝRæÐY÷Å+õ ^¯HŸx}ûâZ)hWCZº×iy<0»rT ÚÀ5,~ù¡öLžzF—ôÓó{–Ü=hèZ¹×ŽH‡ó´7ßØ9ÅÁàÀìN+'ìñ„ß/èå–DB1é¯uB('2§*¸ÕŒ‚ÃÌʘªÉÐ7xc>LG®Â/—Á±Âp/¸Vº×Sˆ!cØ‘L¸ý£Þ‘ŒRŒ¬Â€ tM7–8AˆüK\GŸp4CÏÏÐ4™Qx;U¹ëÆ¡o >¥»kšL™-á}Šqm7ž^&±ô  f€÷¨YaüD ÆH¸©†¦cZ8‡Fg‘á2Š0ÊÐto_›¾Jdë½Âl* -Σ†£q¸Cíø†pAkÝÈQHw>S¡s¨áªX6žëÁÐ#%˜‘ë§bPœª®³‹¤¬+ˆÛ”ÈfÀj˜Ð¤‰71 ¾2Îe#…èKBìèµ¹…Q¹`9§",Ì….(¼AÖU|‰ÄÀ$Ê׆ÿŽQ´H» Ê<†€}àc¦ohª’Ze€U›鸋ŞZöã,âyáuâq†¡€E|kü÷x{¬ê;8öß™‚ÿqìû÷âXqë±ù -ÇziVÌ\å$îŽ [ƒcèÑ‚…:ø‚4uÜÊŽíñßű£óýÁDJÇKÉÃhn›5ïv àÎÜíÃYÉC/ÛeZ¼7bûÃÚ =»ÚñÒˆBA6 ˜(‰oÜ÷‡Qù|±§£d¡Ïgè,ÌÓ—h;˜óçäÑ=Ûc³^øØÓdŽE-ó¼ß˜gÓa^<+:P©Š‡G{¯¾Œ³+wõ™×…AÄ胱ˆc°bÁ‘w¬r=:„=–|qlSèÆHïÖÑìjâC;øa¶W7$q6Û9§·ô,"—¶´÷tº’mÁ?9®@µI¶,mQ{Y¸ì|ÂÍ"âUÒ–Á¯à—ƒcXÙÙEúqž¿‘ÑtµÕ–0r¹OîS/Nøâ*ŸáÊAšµ£DÙRSPVû7žŸNtìg^ÜÞooc?µÕc^OÞûÖ¤ƒŠˆ$e^&qpø4鵤O+ø‹ÀX<ŸPÍî$¾ Š«E x×ΗgïýŠ,\ck§Ù¼ø9Ã*¤¬„iÄ×+ÒØs?‘õÎÒÙðŠR>/ž½PM®W9æ·*lÜ›»~Å´Øz¼}1ë¦fÁ öºRÎÞ+ç° YËîwWÃ`,ôIz¶ž7n(«vÖqóÇ3rœ¸ÐÏ’mÏŽÚBùô ¬:µ”X´z7|RÒ¶èàvï˜ÝÍà“Açe¥‹õ˜Cvìv¢}˜QKY?á)w+Ê2Äh].H;Z¬ëFÙüøO 2 ,ŽyÂ>[Áõ°=K­fcÆOÀiè^´€B: …2Llæ©U¸SEìÁ/ó=£*¦£s=À4Ši² -_!"ôüÀ •7¡/H4̾öØŠjÌMâõá¦Á·…¥V!Ó‰uåÏ¡UÇ’%ò­›¾ -eë¢ë $‰ÆF5˜`æu…ÓÖm…tçC³a}º‚ a -ĵd0ŠiÕ\0Ñ’Óš®õ€‰0AP¾½> endobj 6 0 obj <> endobj 7 0 obj <> endobj 8 0 obj <> endobj 42 0 obj [/View/Design] endobj 43 0 obj <>>> endobj 40 0 obj [/View/Design] endobj 41 0 obj <>>> endobj 38 0 obj [/View/Design] endobj 39 0 obj <>>> endobj 36 0 obj [/View/Design] endobj 37 0 obj <>>> endobj 75 0 obj [74 0 R 73 0 R 72 0 R 71 0 R] endobj 135 0 obj <> endobj xref 0 136 0000000004 65535 f -0000000016 00000 n -0000000242 00000 n -0000042777 00000 n -0000000000 00000 f -0000134069 00000 n -0000134139 00000 n -0000134209 00000 n -0000134279 00000 n -0000000000 00000 f -0000042829 00000 n -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000134702 00000 n -0000134733 00000 n -0000134586 00000 n -0000134617 00000 n -0000134470 00000 n -0000134501 00000 n -0000134354 00000 n -0000134385 00000 n -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000000000 00000 f -0000051735 00000 n -0000051808 00000 n -0000051881 00000 n -0000051954 00000 n -0000134818 00000 n -0000043361 00000 n -0000045264 00000 n -0000067864 00000 n -0000047535 00000 n -0000052504 00000 n -0000047422 00000 n -0000052620 00000 n -0000052733 00000 n -0000050281 00000 n -0000050424 00000 n -0000050615 00000 n -0000050807 00000 n -0000046632 00000 n -0000046900 00000 n -0000045326 00000 n -0000134034 00000 n -0000046071 00000 n -0000046119 00000 n -0000050218 00000 n -0000047359 00000 n -0000047570 00000 n -0000051390 00000 n -0000051000 00000 n -0000051509 00000 n -0000051614 00000 n -0000052386 00000 n -0000052418 00000 n -0000052268 00000 n -0000052300 00000 n -0000052150 00000 n -0000052182 00000 n -0000052032 00000 n -0000052064 00000 n -0000056072 00000 n -0000052859 00000 n -0000052925 00000 n -0000052948 00000 n -0000053249 00000 n -0000053327 00000 n -0000055354 00000 n -0000055428 00000 n -0000056036 00000 n -0000055573 00000 n -0000055718 00000 n -0000055809 00000 n -0000055915 00000 n -0000056138 00000 n -0000056161 00000 n -0000056448 00000 n -0000056526 00000 n -0000056781 00000 n -0000067740 00000 n -0000056855 00000 n -0000057304 00000 n -0000057368 00000 n -0000067939 00000 n -0000068117 00000 n -0000069113 00000 n -0000083726 00000 n -0000134864 00000 n -trailer <<779150255FD24E0494C6DDB168101D01>]>> startxref 135035 %%EOF \ No newline at end of file diff --git a/share/icons/hicolor/scalable/apps/tikzit.svg b/share/icons/hicolor/scalable/apps/tikzit.svg new file mode 100644 index 0000000..5fb38c6 --- /dev/null +++ b/share/icons/hicolor/scalable/apps/tikzit.svg @@ -0,0 +1,268 @@ + + + +image/svg+xml \ No newline at end of file -- cgit v1.2.3 From d0d81a31afd69594ed098c6afe855f05607db27e Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Wed, 10 Oct 2018 08:06:42 +0200 Subject: removed unused images --- images/AH_latex_head.png | Bin 6334 -> 0 bytes images/AH_latex_tail.png | Bin 6324 -> 0 bytes images/AH_none.png | Bin 6183 -> 0 bytes images/AH_plain_head.png | Bin 6298 -> 0 bytes images/AH_plain_tail.png | Bin 6320 -> 0 bytes images/ED_arrow.png | Bin 6357 -> 0 bytes images/ED_none.png | Bin 6190 -> 0 bytes images/ED_tick.png | Bin 6258 -> 0 bytes images/customshape.png | Bin 1281 -> 0 bytes images/document-new.png | Bin 692 -> 0 bytes images/document-open.png | Bin 919 -> 0 bytes images/draw-ellipse.png | Bin 3493 -> 0 bytes images/draw-path.png | Bin 920 -> 0 bytes images/edge-ak.svg | 36 ----------------------------------- images/emblem-important.png | Bin 717 -> 0 bytes images/emblem-unreadable-grey.png | Bin 3554 -> 0 bytes images/engine.png | Bin 1546 -> 0 bytes images/format-indent-less.png | Bin 767 -> 0 bytes images/preamble.png | Bin 851 -> 0 bytes images/select-rectangular.png | Bin 499 -> 0 bytes images/text-x-generic.png | Bin 744 -> 0 bytes images/text-x-script.png | Bin 1416 -> 0 bytes images/transform-crop-and-resize.png | Bin 1132 -> 0 bytes images/transform-move.png | Bin 638 -> 0 bytes images/updates.png | Bin 1953 -> 0 bytes tikzlexer.h | 10 +++++----- 26 files changed, 5 insertions(+), 41 deletions(-) delete mode 100644 images/AH_latex_head.png delete mode 100644 images/AH_latex_tail.png delete mode 100644 images/AH_none.png delete mode 100644 images/AH_plain_head.png delete mode 100644 images/AH_plain_tail.png delete mode 100644 images/ED_arrow.png delete mode 100644 images/ED_none.png delete mode 100644 images/ED_tick.png delete mode 100644 images/customshape.png delete mode 100644 images/document-new.png delete mode 100644 images/document-open.png delete mode 100644 images/draw-ellipse.png delete mode 100644 images/draw-path.png delete mode 100644 images/edge-ak.svg delete mode 100644 images/emblem-important.png delete mode 100644 images/emblem-unreadable-grey.png delete mode 100644 images/engine.png delete mode 100644 images/format-indent-less.png delete mode 100644 images/preamble.png delete mode 100644 images/select-rectangular.png delete mode 100644 images/text-x-generic.png delete mode 100644 images/text-x-script.png delete mode 100644 images/transform-crop-and-resize.png delete mode 100644 images/transform-move.png delete mode 100644 images/updates.png diff --git a/images/AH_latex_head.png b/images/AH_latex_head.png deleted file mode 100644 index b25cf6d..0000000 Binary files a/images/AH_latex_head.png and /dev/null differ diff --git a/images/AH_latex_tail.png b/images/AH_latex_tail.png deleted file mode 100644 index 0825cda..0000000 Binary files a/images/AH_latex_tail.png and /dev/null differ diff --git a/images/AH_none.png b/images/AH_none.png deleted file mode 100644 index 6322374..0000000 Binary files a/images/AH_none.png and /dev/null differ diff --git a/images/AH_plain_head.png b/images/AH_plain_head.png deleted file mode 100644 index 8a398fa..0000000 Binary files a/images/AH_plain_head.png and /dev/null differ diff --git a/images/AH_plain_tail.png b/images/AH_plain_tail.png deleted file mode 100644 index 45b1876..0000000 Binary files a/images/AH_plain_tail.png and /dev/null differ diff --git a/images/ED_arrow.png b/images/ED_arrow.png deleted file mode 100644 index 153d2e1..0000000 Binary files a/images/ED_arrow.png and /dev/null differ diff --git a/images/ED_none.png b/images/ED_none.png deleted file mode 100644 index f95140c..0000000 Binary files a/images/ED_none.png and /dev/null differ diff --git a/images/ED_tick.png b/images/ED_tick.png deleted file mode 100644 index a3882fe..0000000 Binary files a/images/ED_tick.png and /dev/null differ diff --git a/images/customshape.png b/images/customshape.png deleted file mode 100644 index cff8275..0000000 Binary files a/images/customshape.png and /dev/null differ diff --git a/images/document-new.png b/images/document-new.png deleted file mode 100644 index e3808a1..0000000 Binary files a/images/document-new.png and /dev/null differ diff --git a/images/document-open.png b/images/document-open.png deleted file mode 100644 index 254a6b8..0000000 Binary files a/images/document-open.png and /dev/null differ diff --git a/images/draw-ellipse.png b/images/draw-ellipse.png deleted file mode 100644 index d8e3e6f..0000000 Binary files a/images/draw-ellipse.png and /dev/null differ diff --git a/images/draw-path.png b/images/draw-path.png deleted file mode 100644 index ec5e691..0000000 Binary files a/images/draw-path.png and /dev/null differ diff --git a/images/edge-ak.svg b/images/edge-ak.svg deleted file mode 100644 index eafc423..0000000 --- a/images/edge-ak.svg +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/images/emblem-important.png b/images/emblem-important.png deleted file mode 100644 index 81e9ed2..0000000 Binary files a/images/emblem-important.png and /dev/null differ diff --git a/images/emblem-unreadable-grey.png b/images/emblem-unreadable-grey.png deleted file mode 100644 index 09572ab..0000000 Binary files a/images/emblem-unreadable-grey.png and /dev/null differ diff --git a/images/engine.png b/images/engine.png deleted file mode 100644 index 1e45370..0000000 Binary files a/images/engine.png and /dev/null differ diff --git a/images/format-indent-less.png b/images/format-indent-less.png deleted file mode 100644 index 7ced16f..0000000 Binary files a/images/format-indent-less.png and /dev/null differ diff --git a/images/preamble.png b/images/preamble.png deleted file mode 100644 index d940d24..0000000 Binary files a/images/preamble.png and /dev/null differ diff --git a/images/select-rectangular.png b/images/select-rectangular.png deleted file mode 100644 index 866b602..0000000 Binary files a/images/select-rectangular.png and /dev/null differ diff --git a/images/text-x-generic.png b/images/text-x-generic.png deleted file mode 100644 index 928a679..0000000 Binary files a/images/text-x-generic.png and /dev/null differ diff --git a/images/text-x-script.png b/images/text-x-script.png deleted file mode 100644 index 801dcd6..0000000 Binary files a/images/text-x-script.png and /dev/null differ diff --git a/images/transform-crop-and-resize.png b/images/transform-crop-and-resize.png deleted file mode 100644 index 4dedd93..0000000 Binary files a/images/transform-crop-and-resize.png and /dev/null differ diff --git a/images/transform-move.png b/images/transform-move.png deleted file mode 100644 index ae4201b..0000000 Binary files a/images/transform-move.png and /dev/null differ diff --git a/images/updates.png b/images/updates.png deleted file mode 100644 index 469ae30..0000000 Binary files a/images/updates.png and /dev/null differ diff --git a/tikzlexer.h b/tikzlexer.h index 8169c03..438947f 100644 --- a/tikzlexer.h +++ b/tikzlexer.h @@ -2,9 +2,9 @@ #define yyHEADER_H 1 #define yyIN_HEADER 1 -#line 5 "tikzlexer.h" +#line 6 "tikzlexer.h" -#line 7 "tikzlexer.h" +#line 8 "tikzlexer.h" #define YY_INT_ALIGNED short int @@ -259,7 +259,7 @@ void yyfree ( void * , yyscan_t yyscanner ); */ #include #endif - + #define YY_EXTRA_TYPE TikzAssembler * int yylex_init (yyscan_t* scanner); @@ -518,8 +518,8 @@ extern int yylex \ #undef yyTABLES_NAME #endif -#line 195 "src\\data\\tikzlexer.l" +#line 195 "src/data/tikzlexer.l" -#line 523 "tikzlexer.h" +#line 524 "tikzlexer.h" #undef yyIN_HEADER #endif /* yyHEADER_H */ -- cgit v1.2.3 From dd59a5c4b8b0eadf223a7e4b3fa0cc8bd99375f9 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Wed, 10 Oct 2018 08:10:35 +0200 Subject: wrong edge --- images/edge-ak.svg | 36 ++++++++++++++++++++++++++++ images/edge.svg | 64 ------------------------------------------------- src/gui/mainwindow.cpp | 2 +- src/gui/toolpalette.cpp | 1 + 4 files changed, 38 insertions(+), 65 deletions(-) create mode 100644 images/edge-ak.svg delete mode 100644 images/edge.svg diff --git a/images/edge-ak.svg b/images/edge-ak.svg new file mode 100644 index 0000000..eafc423 --- /dev/null +++ b/images/edge-ak.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/images/edge.svg b/images/edge.svg deleted file mode 100644 index 43280f8..0000000 --- a/images/edge.svg +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index cdf7bea..b0ffdc6 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -102,7 +102,7 @@ QSplitter *MainWindow::splitter() const { void MainWindow::closeEvent(QCloseEvent *event) { - qDebug() << "got close event"; + //qDebug() << "got close event"; QSettings settings("tikzit", "tikzit"); settings.setValue("geometry-main", saveGeometry()); diff --git a/src/gui/toolpalette.cpp b/src/gui/toolpalette.cpp index 2452bda..3d65369 100644 --- a/src/gui/toolpalette.cpp +++ b/src/gui/toolpalette.cpp @@ -32,6 +32,7 @@ ToolPalette::ToolPalette(QWidget *parent) : setOrientation(Qt::Vertical); setFocusPolicy(Qt::NoFocus); setWindowTitle("Tools"); + setObjectName("toolPalette"); //setGeometry(100,200,30,195); tools = new QActionGroup(this); -- cgit v1.2.3 From 1ecc46ee977805418faae3d1c57aefc828203d95 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Wed, 10 Oct 2018 11:03:49 +0200 Subject: maybe a fix for DPI --- src/data/tikzdocument.cpp | 39 +++++++++++++++++++++++++++++---------- src/data/tikzdocument.h | 4 ++-- src/gui/mainwindow.cpp | 22 ++++++++++++++++++++-- src/gui/mainwindow.ui | 2 +- src/main.cpp | 24 ++++++++++++++++++++++-- src/tikzit.cpp | 8 ++++++-- 6 files changed, 80 insertions(+), 19 deletions(-) diff --git a/src/data/tikzdocument.cpp b/src/data/tikzdocument.cpp index fd70e92..2554c21 100644 --- a/src/data/tikzdocument.cpp +++ b/src/data/tikzdocument.cpp @@ -98,9 +98,9 @@ void TikzDocument::open(QString fileName) } } -void TikzDocument::save() { +bool TikzDocument::save() { if (_fileName == "") { - saveAs(); + return saveAs(); } else { MainWindow *win = tikzit->activeWindow(); if (win != 0 && !win->tikzScene()->enabled()) { @@ -110,7 +110,7 @@ void TikzDocument::save() { tr("Tikz failed to parse"), tr("Cannot save file with invalid TiKZ source. Revert changes and save?")); if (resp == QMessageBox::Yes) win->tikzScene()->setEnabled(true); - else return; // ABORT the save + else return false; // ABORT the save } } @@ -126,10 +126,13 @@ void TikzDocument::save() { stream << _tikz; file.close(); setClean(); + return true; } else { QMessageBox::warning(0, "Save Failed", "Could not open file: '" + _fileName + "' for writing."); } } + + return false; } bool TikzDocument::isClean() const @@ -148,7 +151,7 @@ void TikzDocument::setGraph(Graph *graph) refreshTikz(); } -void TikzDocument::saveAs() { +bool TikzDocument::saveAs() { MainWindow *win = tikzit->activeWindow(); if (win != 0 && !win->tikzScene()->enabled()) { win->tikzScene()->parseTikz(win->tikzSource()); @@ -157,23 +160,39 @@ void TikzDocument::saveAs() { tr("Tikz failed to parse"), tr("Cannot save file with invalid TiKZ source. Revert changes and save?")); if (resp == QMessageBox::Yes) win->tikzScene()->setEnabled(true); - else return; // ABORT the save + else return false; // ABORT the save } } QSettings settings("tikzit", "tikzit"); + +// QFileDialog dialog; +// dialog.setDefaultSuffix("tikz"); +// dialog.setWindowTitle(tr("Save File As")); +// dialog.setAcceptMode(QFileDialog::AcceptSave); +// dialog.setNameFilter(tr("TiKZ Files (*.tikz)")); +// dialog.setFileMode(QFileDialog::AnyFile); +// dialog.setDirectory(settings.value("previous-file-path").toString()); +// dialog.setOption(QFileDialog::DontUseNativeDialog); + QString fileName = QFileDialog::getSaveFileName(tikzit->activeWindow(), tr("Save File As"), settings.value("previous-file-path").toString(), - tr("TiKZ Files (*.tikz)")); + tr("TiKZ Files (*.tikz)"), + nullptr, + QFileDialog::DontUseNativeDialog); if (!fileName.isEmpty()) { +// QString fileName = dialog.selectedFiles()[0]; _fileName = fileName; - save(); - - // clean state might not change, so update title bar manually - tikzit->activeWindow()->updateFileName(); + if (save()) { + // clean state might not change, so update title bar manually + tikzit->activeWindow()->updateFileName(); + return true; + } } + + return false; } QString TikzDocument::shortName() const diff --git a/src/data/tikzdocument.h b/src/data/tikzdocument.h index 773f369..fca5434 100644 --- a/src/data/tikzdocument.h +++ b/src/data/tikzdocument.h @@ -47,8 +47,8 @@ public: QString shortName() const; - void saveAs(); - void save(); + bool saveAs(); + bool save(); bool isClean() const; void setClean(); diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index b0ffdc6..479d8ed 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -108,7 +108,25 @@ void MainWindow::closeEvent(QCloseEvent *event) settings.setValue("geometry-main", saveGeometry()); settings.setValue("windowState-main", saveState(2)); - QMainWindow::closeEvent(event); + if (!_tikzDocument->isClean()) { + QString nm = _tikzDocument->shortName(); + if (nm.isEmpty()) nm = "untitled"; + QMessageBox::StandardButton resBtn = QMessageBox::question( + this, "Save Changes", + "Do you wish to save changes to " + nm + "?", + QMessageBox::Cancel | QMessageBox::No | QMessageBox::Yes, + QMessageBox::Yes); + + if (resBtn == QMessageBox::Yes && _tikzDocument->save()) { + event->accept(); + } else if (resBtn == QMessageBox::No) { + event->accept(); + } else { + event->ignore(); + } + } else { + event->accept(); + } } void MainWindow::changeEvent(QEvent *event) @@ -144,7 +162,7 @@ void MainWindow::updateFileName() QString nm = _tikzDocument->shortName(); if (nm.isEmpty()) nm = "untitled"; if (!_tikzDocument->isClean()) nm += "*"; - setWindowTitle("TiKZiT - " + nm); + setWindowTitle(nm + " - TikZiT"); } void MainWindow::refreshTikz() diff --git a/src/gui/mainwindow.ui b/src/gui/mainwindow.ui index 8eff5ee..27e0127 100644 --- a/src/gui/mainwindow.ui +++ b/src/gui/mainwindow.ui @@ -17,7 +17,7 @@ - TikZiT - untitled + untitled - TikZiT diff --git a/src/main.cpp b/src/main.cpp index 9ad40ae..ac8ab13 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -27,6 +27,9 @@ #include #include +#include +#include +#include // #ifdef Q_OS_WIN // #include @@ -37,13 +40,30 @@ int main(int argc, char *argv[]) // #ifdef Q_OS_WIN // SetProcessDPIAware(); // #endif - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); +// QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); - //QCoreApplication::setAttribute(Qt::AA_DisableHighDpiScaling); + + // dummy application for detecting DPI + QApplication *a0 = new QApplication(argc, argv); + qDebug() << "physical DPI" << QApplication::screens()[0]->physicalDotsPerInch(); + + if (QApplication::screens()[0]->physicalDotsPerInch() >= 100) { + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + } else { + QApplication::setAttribute(Qt::AA_DisableHighDpiScaling); + } + + delete a0; + QApplication a(argc, argv); a.setQuitOnLastWindowClosed(false); + + + tikzit = new Tikzit(); tikzit->init(); + + if (a.arguments().length() > 1) { tikzit->open(a.arguments()[1]); diff --git a/src/tikzit.cpp b/src/tikzit.cpp index 967d76e..c649969 100644 --- a/src/tikzit.cpp +++ b/src/tikzit.cpp @@ -181,7 +181,9 @@ void Tikzit::open() QString fileName = QFileDialog::getOpenFileName(0, tr("Open File"), settings.value("previous-file-path").toString(), - tr("TiKZ Files (*.tikz)")); + tr("TiKZ Files (*.tikz)"), + nullptr, + QFileDialog::DontUseNativeDialog); open(fileName); } @@ -210,7 +212,9 @@ void Tikzit::openTikzStyles() { QString fileName = QFileDialog::getOpenFileName(0, tr("Open File"), settings.value("previous-tikzstyles-path").toString(), - tr("TiKZ Style Files (*.tikzstyles)")); + tr("TiKZ Style Files (*.tikzstyles)"), + nullptr, + QFileDialog::DontUseNativeDialog); if (!fileName.isEmpty()) { QFileInfo fi(fileName); -- cgit v1.2.3 From c7fc69f79e739528613e10ca378c82fb4e6489ea Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Wed, 10 Oct 2018 22:35:17 +0200 Subject: added sample tex --- tex/sample/figures/fig.tikz | 14 ++++++++++++++ tex/sample/sample.tex | 18 ++++++++++++++++++ tex/sample/sample.tikzstyles | 14 ++++++++++++++ tex/sample/tikzit.sty | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 78 insertions(+) create mode 100644 tex/sample/figures/fig.tikz create mode 100644 tex/sample/sample.tex create mode 100644 tex/sample/sample.tikzstyles create mode 100644 tex/sample/tikzit.sty diff --git a/tex/sample/figures/fig.tikz b/tex/sample/figures/fig.tikz new file mode 100644 index 0000000..e485d9f --- /dev/null +++ b/tex/sample/figures/fig.tikz @@ -0,0 +1,14 @@ +\begin{tikzpicture} + \begin{pgfonlayer}{nodelayer} + \node [style=red node] (0) at (0, 1) {}; + \node [style=blue node 2] (1) at (1, 0) {}; + \node [style=blue node] (2) at (-1, 0) {}; + \node [style=yellow square] (3) at (0, -1) {foo}; + \end{pgfonlayer} + \begin{pgfonlayer}{edgelayer} + \draw [in=-90, out=0] (3.center) to (1.center); + \draw [bend right=45, looseness=1.25] (3.center) to (2.center); + \draw (2.center) to (0.center); + \draw (0.center) to (1.center); + \end{pgfonlayer} +\end{tikzpicture} diff --git a/tex/sample/sample.tex b/tex/sample/sample.tex new file mode 100644 index 0000000..e957b1e --- /dev/null +++ b/tex/sample/sample.tex @@ -0,0 +1,18 @@ +\documentclass{article} +\usepackage{tikzit} +\input{sample.tikzstyles} + + +\begin{document} + +A centered tikz picture: +\ctikzfig{fig} + +A tikz picture as part of mathematics: +\[ +\tikzfig{fig} \ =\ +\tikzfig{fig} +\] + +\end{document} + diff --git a/tex/sample/sample.tikzstyles b/tex/sample/sample.tikzstyles new file mode 100644 index 0000000..df70248 --- /dev/null +++ b/tex/sample/sample.tikzstyles @@ -0,0 +1,14 @@ +% TiKZ style file generated by TikZiT. You may edit this file manually, +% but some things (e.g. comments) may be overwritten. To be readable in +% TikZiT, the only non-comment lines must be of the form: +% \tikzstyle{NAME}=[PROPERTY LIST] + +% Node styles +\tikzstyle{red node}=[fill=red, tikzit category=nodes] +\tikzstyle{blue node}=[fill=blue] +\tikzstyle{blue node 2}=[tikzit fill=green, fill=blue] +\tikzstyle{yellow square}=[draw=black, fill=yellow, shape=rectangle] + +% Edge styles +\tikzstyle{dashed edge}=[<->, dashed] +\tikzstyle{blue pointer}=[->, draw=blue] diff --git a/tex/sample/tikzit.sty b/tex/sample/tikzit.sty new file mode 100644 index 0000000..b893a4a --- /dev/null +++ b/tex/sample/tikzit.sty @@ -0,0 +1,32 @@ +\usepackage{tikz} +\usetikzlibrary{backgrounds} +\usetikzlibrary{arrows} +\usetikzlibrary{shapes,shapes.geometric,shapes.misc} + +\tikzstyle{every picture}=[baseline=-0.25em,scale=0.5] + +\pgfkeys{/tikz/tikzit fill/.initial=0} +\pgfkeys{/tikz/tikzit draw/.initial=0} +\pgfkeys{/tikz/tikzit shape/.initial=0} +\pgfkeys{/tikz/tikzit category/.initial=0} + +\newcommand{\tikzfig}[1]{% +\IfFileExists{#1.tikz} + {\input{#1.tikz}} + {% + \IfFileExists{./figures/#1.tikz} + {\input{./figures/#1.tikz}} + {\tikz[baseline=-0.5em]{\node[draw=red,font=\color{red},fill=red!10!white] {\textit{#1}};}}% + }% +} +\newcommand{\ctikzfig}[1]{% +\begin{center}\rm + \tikzfig{#1} +\end{center}} + +\pgfdeclarelayer{edgelayer} +\pgfdeclarelayer{nodelayer} +\pgfsetlayers{background,edgelayer,nodelayer,main} +\tikzstyle{none}=[inner sep=0mm] +\tikzstyle{every loop}=[] +\tikzstyle{mark coordinate}=[inner sep=0pt,outer sep=0pt,minimum size=3pt,fill=black,circle] \ No newline at end of file -- cgit v1.2.3 From 23fa72f5f7ce1f19c0698bfe888bfd872703e9f2 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Wed, 10 Oct 2018 22:35:42 +0200 Subject: tikz extension for save as --- src/data/tikzdocument.cpp | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/data/tikzdocument.cpp b/src/data/tikzdocument.cpp index 2554c21..24a793b 100644 --- a/src/data/tikzdocument.cpp +++ b/src/data/tikzdocument.cpp @@ -166,24 +166,24 @@ bool TikzDocument::saveAs() { QSettings settings("tikzit", "tikzit"); -// QFileDialog dialog; -// dialog.setDefaultSuffix("tikz"); -// dialog.setWindowTitle(tr("Save File As")); -// dialog.setAcceptMode(QFileDialog::AcceptSave); -// dialog.setNameFilter(tr("TiKZ Files (*.tikz)")); -// dialog.setFileMode(QFileDialog::AnyFile); -// dialog.setDirectory(settings.value("previous-file-path").toString()); -// dialog.setOption(QFileDialog::DontUseNativeDialog); - - QString fileName = QFileDialog::getSaveFileName(tikzit->activeWindow(), - tr("Save File As"), - settings.value("previous-file-path").toString(), - tr("TiKZ Files (*.tikz)"), - nullptr, - QFileDialog::DontUseNativeDialog); - - if (!fileName.isEmpty()) { -// QString fileName = dialog.selectedFiles()[0]; + QFileDialog dialog; + dialog.setDefaultSuffix("tikz"); + dialog.setWindowTitle(tr("Save File As")); + dialog.setAcceptMode(QFileDialog::AcceptSave); + dialog.setNameFilter(tr("TiKZ Files (*.tikz)")); + dialog.setFileMode(QFileDialog::AnyFile); + dialog.setDirectory(settings.value("previous-file-path").toString()); + dialog.setOption(QFileDialog::DontUseNativeDialog); + +// QString fileName = QFileDialog::getSaveFileName(tikzit->activeWindow(), +// tr("Save File As"), +// settings.value("previous-file-path").toString(), +// tr("TiKZ Files (*.tikz)"), +// nullptr, +// QFileDialog::DontUseNativeDialog); + + if (dialog.exec() && !dialog.selectedFiles().isEmpty()) { + QString fileName = dialog.selectedFiles()[0]; _fileName = fileName; if (save()) { // clean state might not change, so update title bar manually -- cgit v1.2.3 From 4eb599dfd4e8c510ede62be3ef766af9d9b5121a Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Thu, 11 Oct 2018 08:19:26 +0200 Subject: removed unused icons --- images/node.svg | 39 --------------------- images/select.svg | 90 ------------------------------------------------- src/gui/stylepalette.ui | 19 ++++++++++- 3 files changed, 18 insertions(+), 130 deletions(-) delete mode 100644 images/node.svg delete mode 100644 images/select.svg diff --git a/images/node.svg b/images/node.svg deleted file mode 100644 index 0a34687..0000000 --- a/images/node.svg +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/images/select.svg b/images/select.svg deleted file mode 100644 index 80b7757..0000000 --- a/images/select.svg +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/gui/stylepalette.ui b/src/gui/stylepalette.ui index 14a4d36..eb97474 100644 --- a/src/gui/stylepalette.ui +++ b/src/gui/stylepalette.ui @@ -50,7 +50,7 @@ - [default] + [no style file] @@ -62,6 +62,23 @@ 0 + + + + + + + + :/images/document-new.svg:/images/document-new.svg + + + + 16 + 16 + + + + -- cgit v1.2.3 From 68921d37da4f2268af5006c0aed68d70ee7b6dff Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Thu, 11 Oct 2018 08:33:30 +0200 Subject: icons renamed for clarity --- images/edge-ak.svg | 36 ------ images/logo.ico | Bin 14347 -> 0 bytes images/logo.pdf | Bin 1991 -> 0 bytes images/logo.png | Bin 17595 -> 0 bytes images/logo.svg | 268 ------------------------------------------ images/node-ak.svg | 14 --- images/select-ak.svg | 9 -- images/tikzit-tool-edge.svg | 36 ++++++ images/tikzit-tool-node.svg | 14 +++ images/tikzit-tool-select.svg | 9 ++ images/tikzit.pdf | Bin 0 -> 1991 bytes images/tikzit.png | Bin 0 -> 17595 bytes images/tikzit.svg | 268 ++++++++++++++++++++++++++++++++++++++++++ src/gui/mainwindow.cpp | 2 +- src/gui/styleeditor.cpp | 2 +- src/gui/toolpalette.cpp | 6 +- tikzit.qrc | 8 +- 17 files changed, 336 insertions(+), 336 deletions(-) delete mode 100644 images/edge-ak.svg delete mode 100644 images/logo.ico delete mode 100644 images/logo.pdf delete mode 100644 images/logo.png delete mode 100644 images/logo.svg delete mode 100644 images/node-ak.svg delete mode 100644 images/select-ak.svg create mode 100644 images/tikzit-tool-edge.svg create mode 100644 images/tikzit-tool-node.svg create mode 100644 images/tikzit-tool-select.svg create mode 100644 images/tikzit.pdf create mode 100644 images/tikzit.png create mode 100644 images/tikzit.svg diff --git a/images/edge-ak.svg b/images/edge-ak.svg deleted file mode 100644 index eafc423..0000000 --- a/images/edge-ak.svg +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/images/logo.ico b/images/logo.ico deleted file mode 100644 index ef92c90..0000000 Binary files a/images/logo.ico and /dev/null differ diff --git a/images/logo.pdf b/images/logo.pdf deleted file mode 100644 index 1fe8a28..0000000 Binary files a/images/logo.pdf and /dev/null differ diff --git a/images/logo.png b/images/logo.png deleted file mode 100644 index 000d172..0000000 Binary files a/images/logo.png and /dev/null differ diff --git a/images/logo.svg b/images/logo.svg deleted file mode 100644 index 5fb38c6..0000000 --- a/images/logo.svg +++ /dev/null @@ -1,268 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/images/node-ak.svg b/images/node-ak.svg deleted file mode 100644 index 3bad649..0000000 --- a/images/node-ak.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - diff --git a/images/select-ak.svg b/images/select-ak.svg deleted file mode 100644 index 0f95547..0000000 --- a/images/select-ak.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/images/tikzit-tool-edge.svg b/images/tikzit-tool-edge.svg new file mode 100644 index 0000000..eafc423 --- /dev/null +++ b/images/tikzit-tool-edge.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/images/tikzit-tool-node.svg b/images/tikzit-tool-node.svg new file mode 100644 index 0000000..3bad649 --- /dev/null +++ b/images/tikzit-tool-node.svg @@ -0,0 +1,14 @@ + + + + + + + + + diff --git a/images/tikzit-tool-select.svg b/images/tikzit-tool-select.svg new file mode 100644 index 0000000..0f95547 --- /dev/null +++ b/images/tikzit-tool-select.svg @@ -0,0 +1,9 @@ + + + + + + diff --git a/images/tikzit.pdf b/images/tikzit.pdf new file mode 100644 index 0000000..1fe8a28 Binary files /dev/null and b/images/tikzit.pdf differ diff --git a/images/tikzit.png b/images/tikzit.png new file mode 100644 index 0000000..000d172 Binary files /dev/null and b/images/tikzit.png differ diff --git a/images/tikzit.svg b/images/tikzit.svg new file mode 100644 index 0000000..5fb38c6 --- /dev/null +++ b/images/tikzit.svg @@ -0,0 +1,268 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 479d8ed..806d634 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -28,7 +28,7 @@ MainWindow::MainWindow(QWidget *parent) : _numWindows++; ui->setupUi(this); - setWindowIcon(QIcon(":/images/logo.png")); + setWindowIcon(QIcon(":/images/tikzit.png")); setAttribute(Qt::WA_DeleteOnClose, true); _tikzDocument = new TikzDocument(this); diff --git a/src/gui/styleeditor.cpp b/src/gui/styleeditor.cpp index 63d347b..40706ff 100644 --- a/src/gui/styleeditor.cpp +++ b/src/gui/styleeditor.cpp @@ -18,7 +18,7 @@ StyleEditor::StyleEditor(QWidget *parent) : ui->leftArrow << ui->rightArrow << ui->properties; - setWindowIcon(QIcon(":/images/logo.png")); + setWindowIcon(QIcon(":/images/tikzit.png")); _styles = nullptr; _activeStyle = nullptr; diff --git a/src/gui/toolpalette.cpp b/src/gui/toolpalette.cpp index 3d65369..5e93963 100644 --- a/src/gui/toolpalette.cpp +++ b/src/gui/toolpalette.cpp @@ -42,9 +42,9 @@ ToolPalette::ToolPalette(QWidget *parent) : // edge = new QAction(QIcon(":/images/Inkscape_icons_draw_path.svg"), "Add Edge"); // crop = new QAction(QIcon(":/images/crop.svg"), "Bounding Box"); - select = new QAction(QIcon(":/images/select-ak.svg"), "Select"); - vertex = new QAction(QIcon(":/images/node-ak.svg"), "Add Vertex"); - edge = new QAction(QIcon(":/images/edge-ak.svg"), "Add Edge"); + select = new QAction(QIcon(":/images/tikzit-tool-select.svg"), "Select"); + vertex = new QAction(QIcon(":/images/tikzit-tool-node.svg"), "Add Vertex"); + edge = new QAction(QIcon(":/images/tikzit-tool-edge.svg"), "Add Edge"); //crop = new QAction(QIcon(":/images/crop.svg"), "Bounding Box"); diff --git a/tikzit.qrc b/tikzit.qrc index cf212fe..0484c2d 100644 --- a/tikzit.qrc +++ b/tikzit.qrc @@ -2,11 +2,11 @@ images/document-new.svg images/document-open.svg - images/edge-ak.svg - images/node-ak.svg - images/select-ak.svg + images/tikzit-tool-edge.svg + images/tikzit-tool-node.svg + images/tikzit-tool-select.svg images/refresh.svg - images/logo.png + images/tikzit.png images/text-x-generic_with_pencil.svg -- cgit v1.2.3 From d83ee761d8f93def60199932462baee818c2c1eb Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Thu, 11 Oct 2018 13:34:08 +0200 Subject: can now create new tikzstyles --- src/gui/stylepalette.cpp | 7 ++++++- src/gui/stylepalette.h | 1 + src/tikzit.cpp | 37 +++++++++++++++++++++++++++++++++++-- src/tikzit.h | 1 + 4 files changed, 43 insertions(+), 3 deletions(-) diff --git a/src/gui/stylepalette.cpp b/src/gui/stylepalette.cpp index 5e6de43..1fad721 100644 --- a/src/gui/stylepalette.cpp +++ b/src/gui/stylepalette.cpp @@ -137,7 +137,12 @@ void StylePalette::nodeStyleDoubleClicked(const QModelIndex &) void StylePalette::edgeStyleDoubleClicked(const QModelIndex &) { - tikzit->activeWindow()->tikzScene()->applyActiveStyleToEdges(); + tikzit->activeWindow()->tikzScene()->applyActiveStyleToEdges(); +} + +void StylePalette::on_buttonNewTikzstyles_clicked() +{ + tikzit->newTikzStyles(); } void StylePalette::on_buttonOpenTikzstyles_clicked() diff --git a/src/gui/stylepalette.h b/src/gui/stylepalette.h index b76aa03..e83f961 100644 --- a/src/gui/stylepalette.h +++ b/src/gui/stylepalette.h @@ -43,6 +43,7 @@ public: public slots: void nodeStyleDoubleClicked(const QModelIndex &); void edgeStyleDoubleClicked(const QModelIndex &); + void on_buttonNewTikzstyles_clicked(); void on_buttonOpenTikzstyles_clicked(); void on_buttonEditTikzstyles_clicked(); void on_buttonRefreshTikzstyles_clicked(); diff --git a/src/tikzit.cpp b/src/tikzit.cpp index c649969..2210f3a 100644 --- a/src/tikzit.cpp +++ b/src/tikzit.cpp @@ -136,6 +136,41 @@ QString Tikzit::nameForColor(QColor col) "; blue," + QString::number(col.blue()); } +void Tikzit::newTikzStyles() +{ + QSettings settings("tikzit", "tikzit"); + QFileDialog dialog; + dialog.setDefaultSuffix("tikzstyles"); + dialog.setWindowTitle(tr("Create TikZ Style File")); + dialog.setAcceptMode(QFileDialog::AcceptSave); + dialog.setLabelText(QFileDialog::Accept, "Create"); + dialog.setNameFilter(tr("TiKZ Style File (*.tikzstyles)")); + dialog.setFileMode(QFileDialog::AnyFile); + dialog.setDirectory(settings.value("previous-file-path").toString()); + dialog.setOption(QFileDialog::DontUseNativeDialog); + + if (dialog.exec() && !dialog.selectedFiles().isEmpty()) { + QString fileName = dialog.selectedFiles()[0]; + TikzStyles *st = new TikzStyles; + + if (st->saveStyles(fileName)) { + QFileInfo fi(fileName); + _styleFile = fi.fileName(); + _styleFilePath = fi.absoluteFilePath(); + delete _styles; + _styles = st; + + foreach (MainWindow *w, _windows) { + w->tikzScene()->reloadStyles(); + } + } else { + QMessageBox::warning(0, + "Could not write to style file.", + "Could not write to: '" + fileName + "'. Check file permissions or choose a new location."); + } + } +} + ToolPalette *Tikzit::toolPalette() const { return _toolPalette; @@ -222,8 +257,6 @@ void Tikzit::openTikzStyles() { QSettings settings("tikzit", "tikzit"); settings.setValue("previous-tikzstyles-path", fi.absolutePath()); settings.setValue("previous-tikzstyles-file", fileName); - } else { - // BAD STYLE FILE } } } diff --git a/src/tikzit.h b/src/tikzit.h index 6612ff1..8980f17 100644 --- a/src/tikzit.h +++ b/src/tikzit.h @@ -121,6 +121,7 @@ public: QColor colorByName(QString name); QString nameForColor(QColor col); + void newTikzStyles(); void openTikzStyles(); bool loadStyles(QString fileName); void showStyleEditor(); -- cgit v1.2.3 From 0a0dd87c4b740a47bcb8c91fd3c711b9ddebfe8a Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Fri, 12 Oct 2018 15:36:31 +0200 Subject: added some override decls --- src/data/stylelist.h | 2 +- src/gui/edgeitem.h | 6 +++--- src/gui/mainwindow.h | 4 ++-- src/gui/nodeitem.h | 2 +- src/gui/propertypalette.h | 2 +- src/gui/stylepalette.cpp | 11 +++++++++-- src/gui/stylepalette.ui | 9 ++++++--- src/gui/tikzview.cpp | 6 ++++++ src/gui/tikzview.h | 2 +- src/gui/toolpalette.cpp | 6 +++--- src/tikzit.cpp | 2 +- tex/sample/sample.tex | 4 ++-- tikzit.pro | 1 + 13 files changed, 37 insertions(+), 20 deletions(-) diff --git a/src/data/stylelist.h b/src/data/stylelist.h index eb1c43a..cf86c06 100644 --- a/src/data/stylelist.h +++ b/src/data/stylelist.h @@ -28,7 +28,7 @@ public: int sourceRow, int /*count*/, const QModelIndex &destinationParent, - int destinationChild); + int destinationChild) override; QString category() const; diff --git a/src/gui/edgeitem.h b/src/gui/edgeitem.h index 3d4758a..c03edd6 100644 --- a/src/gui/edgeitem.h +++ b/src/gui/edgeitem.h @@ -38,9 +38,9 @@ class EdgeItem : public QGraphicsItem public: EdgeItem(Edge *edge); void readPos(); - void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *); - QRectF boundingRect() const; - QPainterPath shape() const; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) override; + QRectF boundingRect() const override; + QPainterPath shape() const override; Edge *edge() const; QGraphicsEllipseItem *cp1Item() const; QGraphicsEllipseItem *cp2Item() const; diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h index 10695b7..a000784 100644 --- a/src/gui/mainwindow.h +++ b/src/gui/mainwindow.h @@ -45,8 +45,8 @@ public slots: void updateFileName(); void refreshTikz(); protected: - void closeEvent(QCloseEvent *event); - void changeEvent(QEvent *event); + void closeEvent(QCloseEvent *event) override; + void changeEvent(QEvent *event) override; private: TikzScene *_tikzScene; diff --git a/src/gui/nodeitem.h b/src/gui/nodeitem.h index 678a7e8..5be4f3e 100644 --- a/src/gui/nodeitem.h +++ b/src/gui/nodeitem.h @@ -36,7 +36,7 @@ public: NodeItem(Node *node); void readPos(); void writePos(); - void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) override; QPainterPath shape() const override; QRectF boundingRect() const override; void updateBounds(); diff --git a/src/gui/propertypalette.h b/src/gui/propertypalette.h index 29fb0af..69f4515 100644 --- a/src/gui/propertypalette.h +++ b/src/gui/propertypalette.h @@ -38,7 +38,7 @@ public: ~PropertyPalette(); protected: - void closeEvent(QCloseEvent *event); + void closeEvent(QCloseEvent *event) override; private: Ui::PropertyPalette *ui; }; diff --git a/src/gui/stylepalette.cpp b/src/gui/stylepalette.cpp index 1fad721..af096c7 100644 --- a/src/gui/stylepalette.cpp +++ b/src/gui/stylepalette.cpp @@ -27,6 +27,7 @@ #include #include #include +#include StylePalette::StylePalette(QWidget *parent) : QDockWidget(parent), @@ -77,7 +78,7 @@ void StylePalette::reloadStyles() ui->currentCategory->clear(); // TODO: styleFile() should return invalid string if no style file loaded - if (f != "[default]") { + if (f != "[no styles]") { ui->currentCategory->addItems(tikzit->styles()->categories()); ui->currentCategory->setCurrentText(cat); } @@ -152,7 +153,13 @@ void StylePalette::on_buttonOpenTikzstyles_clicked() void StylePalette::on_buttonEditTikzstyles_clicked() { - tikzit->showStyleEditor(); + if (tikzit->styleFile() != "[no styles]") { + tikzit->showStyleEditor(); + } else { + QMessageBox::warning(0, + "No style file", + "You cannot edit styles until a style file is loaded. Either create a new style file or load an existing one."); + } } void StylePalette::on_buttonRefreshTikzstyles_clicked() diff --git a/src/gui/stylepalette.ui b/src/gui/stylepalette.ui index eb97474..94e8a7c 100644 --- a/src/gui/stylepalette.ui +++ b/src/gui/stylepalette.ui @@ -64,6 +64,9 @@ + + New Style File + @@ -82,7 +85,7 @@ - Load Styles + Load Style File @@ -102,7 +105,7 @@ - Edit styles + Edit Styles @@ -122,7 +125,7 @@ - Refresh styles + Refresh Styles diff --git a/src/gui/tikzview.cpp b/src/gui/tikzview.cpp index 3f107be..6235993 100644 --- a/src/gui/tikzview.cpp +++ b/src/gui/tikzview.cpp @@ -132,6 +132,12 @@ void TikzView::wheelEvent(QWheelEvent *event) if (event->modifiers() & Qt::ShiftModifier) { event->setModifiers(Qt::NoModifier); QGraphicsView::wheelEvent(event); + } else if (event->modifiers() & Qt::ControlModifier) { + if (event->angleDelta().y() > 0) { + zoomIn(); + } else if (event->angleDelta().y() < 0) { + zoomOut(); + } } } diff --git a/src/gui/tikzview.h b/src/gui/tikzview.h index e13fe72..60c5841 100644 --- a/src/gui/tikzview.h +++ b/src/gui/tikzview.h @@ -44,7 +44,7 @@ public slots: void zoomOut(); void setScene(QGraphicsScene *scene); protected: - void drawBackground(QPainter *painter, const QRectF &rect); + void drawBackground(QPainter *painter, const QRectF &rect) override; void wheelEvent(QWheelEvent *event) override; private: float _scale; diff --git a/src/gui/toolpalette.cpp b/src/gui/toolpalette.cpp index 5e93963..82b8ba0 100644 --- a/src/gui/toolpalette.cpp +++ b/src/gui/toolpalette.cpp @@ -42,9 +42,9 @@ ToolPalette::ToolPalette(QWidget *parent) : // edge = new QAction(QIcon(":/images/Inkscape_icons_draw_path.svg"), "Add Edge"); // crop = new QAction(QIcon(":/images/crop.svg"), "Bounding Box"); - select = new QAction(QIcon(":/images/tikzit-tool-select.svg"), "Select"); - vertex = new QAction(QIcon(":/images/tikzit-tool-node.svg"), "Add Vertex"); - edge = new QAction(QIcon(":/images/tikzit-tool-edge.svg"), "Add Edge"); + select = new QAction(QIcon(":/images/tikzit-tool-select.svg"), "Select (s)"); + vertex = new QAction(QIcon(":/images/tikzit-tool-node.svg"), "Add Vertex (v)"); + edge = new QAction(QIcon(":/images/tikzit-tool-edge.svg"), "Add Edge (e)"); //crop = new QAction(QIcon(":/images/crop.svg"), "Bounding Box"); diff --git a/src/tikzit.cpp b/src/tikzit.cpp index 2210f3a..76f9234 100644 --- a/src/tikzit.cpp +++ b/src/tikzit.cpp @@ -32,7 +32,7 @@ Tikzit *tikzit; // font to use for node labels QFont Tikzit::LABEL_FONT("Courrier", 9); -Tikzit::Tikzit() : _styleFile("[default]"), _activeWindow(0) +Tikzit::Tikzit() : _styleFile("[no styles]"), _activeWindow(0) { } diff --git a/tex/sample/sample.tex b/tex/sample/sample.tex index e957b1e..57ba88c 100644 --- a/tex/sample/sample.tex +++ b/tex/sample/sample.tex @@ -9,10 +9,10 @@ A centered tikz picture: \ctikzfig{fig} A tikz picture as part of mathematics: -\[ +\begin{equation} \tikzfig{fig} \ =\ \tikzfig{fig} -\] +\end{equation} \end{document} diff --git a/tikzit.pro b/tikzit.pro index e1d30ea..10e3706 100644 --- a/tikzit.pro +++ b/tikzit.pro @@ -6,6 +6,7 @@ QT += core gui widgets CONFIG += testcase +QMAKE_CXXFLAGS += -Wsuggest-override TARGET = tikzit TEMPLATE = app -- cgit v1.2.3 From 0a67b45155b5c70758745c5984ce8db0d9dfab46 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Fri, 12 Oct 2018 15:37:17 +0200 Subject: updated gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 8485ec0..6894d5e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +tex/sample/Output +tex/sample/sample.pdf +*.synctex.gz *.sublime-* src-old GeneratedFiles -- cgit v1.2.3 From f6e37a0c273464a2e1abf65cdbd5001952a506ba Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Fri, 12 Oct 2018 15:43:23 +0200 Subject: added mkspec for override warning --- tikzit.pro | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tikzit.pro b/tikzit.pro index 10e3706..e340a23 100644 --- a/tikzit.pro +++ b/tikzit.pro @@ -6,14 +6,15 @@ QT += core gui widgets CONFIG += testcase -QMAKE_CXXFLAGS += -Wsuggest-override TARGET = tikzit TEMPLATE = app +# platform-specific options win32:RC_ICONS += images/tikzit.ico win32:RC_ICONS += images/tikzdoc.ico macx:ICON = images/tikzit.icns +linux-g++:QMAKE_CXXFLAGS += -Wsuggest-override # The following define makes your compiler emit warnings if you use # any feature of Qt which as been marked as deprecated (the exact warnings -- cgit v1.2.3 From b1cffdb16ca56905a2115aae715ef772f653992c Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Fri, 12 Oct 2018 17:57:51 +0200 Subject: fixed many glitches in style editor --- src/data/graphelementdata.cpp | 5 ++ src/data/graphelementdata.h | 1 + src/data/graphelementproperty.h | 1 - src/data/style.cpp | 17 ++++ src/data/style.h | 1 + src/gui/styleeditor.cpp | 169 +++++++++++++++++++++++++++++++--------- src/gui/styleeditor.h | 10 ++- src/main.cpp | 2 +- 8 files changed, 165 insertions(+), 41 deletions(-) diff --git a/src/data/graphelementdata.cpp b/src/data/graphelementdata.cpp index b478842..810ebd6 100644 --- a/src/data/graphelementdata.cpp +++ b/src/data/graphelementdata.cpp @@ -96,6 +96,11 @@ QString GraphElementData::property(QString key) } } +bool GraphElementData::hasProperty(QString key) +{ + return (indexOfKey(key) != -1); +} + bool GraphElementData::atom(QString atom) { return (indexOfKey(atom) != -1); diff --git a/src/data/graphelementdata.h b/src/data/graphelementdata.h index f48f228..23f0466 100644 --- a/src/data/graphelementdata.h +++ b/src/data/graphelementdata.h @@ -41,6 +41,7 @@ public: void setAtom(QString atom); void unsetAtom(QString atom); QString property(QString key); + bool hasProperty(QString key); bool atom(QString atom); int indexOfKey(QString key); bool removeRows(int row, int count, const QModelIndex &parent) override; diff --git a/src/data/graphelementproperty.h b/src/data/graphelementproperty.h index e9f82d0..4ebe104 100644 --- a/src/data/graphelementproperty.h +++ b/src/data/graphelementproperty.h @@ -53,7 +53,6 @@ private: QString _key; QString _value; bool _atom; - bool _keyMatch; }; #endif // GRAPHELEMENTPROPERTY_H diff --git a/src/data/style.cpp b/src/data/style.cpp index 7af95ca..d0f011d 100644 --- a/src/data/style.cpp +++ b/src/data/style.cpp @@ -106,6 +106,23 @@ QString Style::tikz() const return "\\tikzstyle{" + _name + "}=" + _data->tikz(); } +void Style::setArrowAtom(QString atom) +{ + _data->unsetAtom("-"); + _data->unsetAtom("->"); + _data->unsetAtom("-|"); + + _data->unsetAtom("<-"); + _data->unsetAtom("<->"); + _data->unsetAtom("<-|"); + + _data->unsetAtom("|-"); + _data->unsetAtom("|->"); + _data->unsetAtom("|-|"); + + _data->setAtom(atom); +} + void Style::setName(const QString &name) { _name = name; diff --git a/src/data/style.h b/src/data/style.h index 476af77..78e11dc 100644 --- a/src/data/style.h +++ b/src/data/style.h @@ -57,6 +57,7 @@ public: void setName(const QString &name); QString propertyWithDefault(QString prop, QString def, bool tikzitOverride=true) const; QString tikz() const; + void setArrowAtom(QString atom); // only relevant for node styles QColor fillColor(bool tikzitOverride=true) const; diff --git a/src/gui/styleeditor.cpp b/src/gui/styleeditor.cpp index 40706ff..29192d6 100644 --- a/src/gui/styleeditor.cpp +++ b/src/gui/styleeditor.cpp @@ -37,6 +37,13 @@ StyleEditor::StyleEditor(QWidget *parent) : SIGNAL(currentIndexChanged(int)), this, SLOT(categoryChanged())); + connect(ui->shape->lineEdit(), + SIGNAL(editingFinished()), + this, SLOT(shapeChanged())); + connect(ui->shape, + SIGNAL(currentIndexChanged(int)), + this, SLOT(shapeChanged())); + // setup the color dialog to display only the named colors that tikzit/xcolor knows // about as "standard colors". for (int i = 0; i < 48; ++i) { @@ -128,7 +135,7 @@ void StyleEditor::closeEvent(QCloseEvent *event) void StyleEditor::nodeItemChanged(QModelIndex sel) { - qDebug() << "nodeItemChanged, new index:" << sel.row(); + //qDebug() << "nodeItemChanged, new index:" << sel.row(); if (sel.isValid()) { ui->edgeStyleListView->selectionModel()->clear(); _activeStyle = _styles->nodeStyles()->styleInCategory(sel.row()); @@ -171,8 +178,6 @@ void StyleEditor::currentCategoryChanged() { if (_styles != nullptr) { QString cat = ui->currentCategory->currentText(); - qDebug() << "got category:" << cat; - qDebug() << "node style category:" << _styles->nodeStyles()->category(); if (cat != _styles->nodeStyles()->category()) { ui->styleListView->selectionModel()->clear(); _styles->nodeStyles()->setCategory(cat); @@ -192,6 +197,17 @@ void StyleEditor::currentCategoryChanged() } } +void StyleEditor::shapeChanged() +{ + Style *s = activeStyle(); + if (s != 0) { + s->data()->setProperty("shape", ui->shape->currentText()); + refreshActiveStyle(); + refreshDisplay(); + setDirty(true); + } +} + void StyleEditor::refreshCategories() { ui->currentCategory->blockSignals(true); @@ -233,9 +249,8 @@ void StyleEditor::propertyChanged() void StyleEditor::refreshDisplay() { - // disable all fields and block signals while we set their values + // enable all fields and block signals while we set their values foreach (QWidget *w, _formWidgets) { - w->setEnabled(false); w->blockSignals(true); } @@ -259,7 +274,10 @@ void StyleEditor::refreshDisplay() Style *s = activeStyle(); +// qDebug() << "style" << s; if (s != nullptr && !s->isNone()) { +// qDebug() << "non-null style update"; + // name ui->name->setEnabled(true); ui->name->setText(s->name()); @@ -275,7 +293,7 @@ void StyleEditor::refreshDisplay() setColor(ui->drawColor, realDraw); // tikzit draw - bool drawOverride = realDraw != draw; + bool drawOverride = s->data()->hasProperty("tikzit draw"); ui->hasTikzitDrawColor->setEnabled(true); ui->hasTikzitDrawColor->setChecked(drawOverride); @@ -283,6 +301,7 @@ void StyleEditor::refreshDisplay() if (drawOverride) setColor(ui->tikzitDrawColor, draw); if (!s->isEdgeStyle()) { +// qDebug() << "node style update"; // category ui->category->setEnabled(true); ui->category->setCurrentText( @@ -295,7 +314,7 @@ void StyleEditor::refreshDisplay() setColor(ui->fillColor, realFill); // tikzit fill - bool fillOverride = realFill != fill; + bool fillOverride = s->data()->hasProperty("tikzit fill"); ui->hasTikzitFillColor->setEnabled(true); ui->hasTikzitFillColor->setChecked(fillOverride); ui->tikzitFillColor->setEnabled(fillOverride); @@ -308,15 +327,22 @@ void StyleEditor::refreshDisplay() ui->shape->setCurrentText(realShape); // tikzit shape - bool shapeOverride = shape != realShape; + bool shapeOverride = s->data()->hasProperty("tikzit shape"); ui->hasTikzitShape->setEnabled(true); + ui->hasTikzitShape->setChecked(shapeOverride); ui->tikzitShape->setEnabled(shapeOverride); if (shapeOverride) ui->tikzitShape->setCurrentText(shape); } else { +// qDebug() << "edge style update"; + // set fill to gray (disabled) - setColor(ui->fillColor, QColor(Qt::gray)); - setColor(ui->tikzitFillColor, QColor(Qt::gray)); - ui->hasTikzitFillColor->setChecked(false); + ui->fillColor->setEnabled(false); + ui->tikzitFillColor->setEnabled(false); + ui->hasTikzitFillColor->setEnabled(false); + + ui->shape->setEnabled(false); + ui->tikzitShape->setEnabled(false); + ui->hasTikzitShape->setEnabled(false); // arrow tail @@ -350,10 +376,11 @@ void StyleEditor::refreshDisplay() } } else { - setColor(ui->fillColor, QColor(Qt::gray)); - setColor(ui->drawColor, QColor(Qt::gray)); - setColor(ui->tikzitDrawColor, QColor(Qt::gray)); - setColor(ui->tikzitFillColor, QColor(Qt::gray)); +// qDebug() << "null style update"; + + foreach (QWidget *w, _formWidgets) { + w->setEnabled(false); + } } // unblock signals so we are ready for user input @@ -382,10 +409,78 @@ void StyleEditor::on_tikzitDrawColor_clicked() updateColor(ui->tikzitDrawColor, "TikZiT Draw Color", "tikzit draw"); } +void StyleEditor::on_hasTikzitFillColor_stateChanged(int state) +{ + Style *s = activeStyle(); + if (s != nullptr) { + if (state == Qt::Checked) s->data()->setProperty("tikzit fill", s->data()->property("fill")); + else s->data()->unsetProperty("tikzit fill"); + refreshDisplay(); + setDirty(true); + } +} + +void StyleEditor::on_hasTikzitDrawColor_stateChanged(int state) +{ + Style *s = activeStyle(); + if (s != nullptr) { + if (state == Qt::Checked) s->data()->setProperty("tikzit draw", s->data()->property("draw")); + else s->data()->unsetProperty("tikzit draw"); + refreshDisplay(); + setDirty(true); + } +} + +void StyleEditor::on_hasTikzitShape_stateChanged(int state) +{ + Style *s = activeStyle(); + if (s != nullptr) { + if (state == Qt::Checked) s->data()->setProperty("tikzit shape", s->data()->property("shape")); + else s->data()->unsetProperty("tikzit shape"); + refreshDisplay(); + setDirty(true); + } +} + +void StyleEditor::on_tikzitShape_currentIndexChanged(int) +{ + Style *s = activeStyle(); + if (s != nullptr) { + s->data()->setProperty("tikzit shape", ui->tikzitShape->currentText()); + refreshActiveStyle(); + refreshDisplay(); + setDirty(true); + } +} + +void StyleEditor::on_leftArrow_currentIndexChanged(int) +{ + Style *s = activeStyle(); + if (s != nullptr) { + s->setArrowAtom(ui->leftArrow->currentText() + "-" + + ui->rightArrow->currentText()); + refreshActiveStyle(); + refreshDisplay(); + setDirty(true); + } +} + +void StyleEditor::on_rightArrow_currentIndexChanged(int) +{ + Style *s = activeStyle(); + if (s != nullptr) { + s->setArrowAtom(ui->leftArrow->currentText() + "-" + + ui->rightArrow->currentText()); + refreshActiveStyle(); + refreshDisplay(); + setDirty(true); + } +} + void StyleEditor::on_addProperty_clicked() { Style *s = activeStyle(); - if (s != 0) { + if (s != nullptr) { s->data()->add(GraphElementProperty("new property", "")); setDirty(true); } @@ -459,12 +554,18 @@ void StyleEditor::on_addStyle_clicked() // add the style to the current category Style *s; if (_styles->nodeStyles()->category() == "") { - s = new Style(name, new GraphElementData()); + s = new Style(name, new GraphElementData({ + GraphElementProperty("fill", "white"), + GraphElementProperty("draw", "black"), + GraphElementProperty("shape", "circle") + })); } else { - s = new Style(name, - new GraphElementData({ - GraphElementProperty("category",_styles->nodeStyles()->category()) - })); + s = new Style(name, new GraphElementData({ + GraphElementProperty("fill", "white"), + GraphElementProperty("draw", "black"), + GraphElementProperty("shape", "circle"), + GraphElementProperty("category", _styles->nodeStyles()->category()), + })); } _styles->nodeStyles()->addStyle(s); @@ -634,16 +735,6 @@ void StyleEditor::on_name_editingFinished() } } -void StyleEditor::on_shape_currentTextChanged() -{ - Style *s = activeStyle(); - if (s != 0) { - s->data()->setProperty("shape", ui->shape->currentText()); - refreshActiveStyle(); -// refreshDisplay(); - setDirty(true); - } -} void StyleEditor::setColor(QPushButton *btn, QColor col) { @@ -709,13 +800,15 @@ void StyleEditor::updateColor(QPushButton *btn, QString name, QString propName) this, name, QColorDialog::DontUseNativeDialog); - setColor(btn, col); - Style *s = activeStyle(); - if (s != nullptr) { - s->data()->setProperty(propName, tikzit->nameForColor(col)); - refreshActiveStyle(); -// refreshDisplay(); - setDirty(true); + if (col.isValid()) { + setColor(btn, col); + Style *s = activeStyle(); + if (s != nullptr) { + s->data()->setProperty(propName, tikzit->nameForColor(col)); + refreshActiveStyle(); + refreshDisplay(); + setDirty(true); + } } } diff --git a/src/gui/styleeditor.h b/src/gui/styleeditor.h index b8bf646..4bae7db 100644 --- a/src/gui/styleeditor.h +++ b/src/gui/styleeditor.h @@ -33,17 +33,25 @@ public slots: void edgeItemChanged(QModelIndex sel); void categoryChanged(); void currentCategoryChanged(); + void shapeChanged(); void refreshCategories(); void propertyChanged(); void on_styleListView_clicked(); void on_edgeStyleListView_clicked(); void on_name_editingFinished(); - void on_shape_currentTextChanged(); void on_fillColor_clicked(); void on_drawColor_clicked(); void on_tikzitFillColor_clicked(); void on_tikzitDrawColor_clicked(); + void on_hasTikzitFillColor_stateChanged(int state); + void on_hasTikzitDrawColor_stateChanged(int state); + + void on_hasTikzitShape_stateChanged(int state); + void on_tikzitShape_currentIndexChanged(int); + + void on_leftArrow_currentIndexChanged(int); + void on_rightArrow_currentIndexChanged(int); void on_addProperty_clicked(); void on_addAtom_clicked(); diff --git a/src/main.cpp b/src/main.cpp index ac8ab13..2fa81d1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -45,7 +45,7 @@ int main(int argc, char *argv[]) // dummy application for detecting DPI QApplication *a0 = new QApplication(argc, argv); - qDebug() << "physical DPI" << QApplication::screens()[0]->physicalDotsPerInch(); +// qDebug() << "physical DPI" << QApplication::screens()[0]->physicalDotsPerInch(); if (QApplication::screens()[0]->physicalDotsPerInch() >= 100) { QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); -- cgit v1.2.3 From fd1205804345dbc3871723a7209c060b895ce4d0 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Sat, 13 Oct 2018 10:57:21 +0200 Subject: fixed tikzit not remembering style file location --- src/tikzit.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/tikzit.cpp b/src/tikzit.cpp index 76f9234..791aa83 100644 --- a/src/tikzit.cpp +++ b/src/tikzit.cpp @@ -157,6 +157,8 @@ void Tikzit::newTikzStyles() QFileInfo fi(fileName); _styleFile = fi.fileName(); _styleFilePath = fi.absoluteFilePath(); + settings.setValue("previous-tikzstyles-file", fileName); + settings.setValue("previous-tikzstyles-path", fi.absolutePath()); delete _styles; _styles = st; -- cgit v1.2.3 From c858c52819f0382c9996c95c8e135964f3e19d55 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Mon, 15 Oct 2018 14:18:19 +0200 Subject: explicit background colour --- src/gui/tikzview.cpp | 3 +++ src/main.cpp | 1 + 2 files changed, 4 insertions(+) diff --git a/src/gui/tikzview.cpp b/src/gui/tikzview.cpp index 6235993..52a32cf 100644 --- a/src/gui/tikzview.cpp +++ b/src/gui/tikzview.cpp @@ -28,6 +28,8 @@ TikzView::TikzView(QWidget *parent) : QGraphicsView(parent) setResizeAnchor(QGraphicsView::AnchorViewCenter); //setDragMode(QGraphicsView::RubberBandDrag); + setBackgroundBrush(QBrush(Qt::white)); + _scale = 1.0f; } @@ -51,6 +53,7 @@ void TikzView::setScene(QGraphicsScene *scene) void TikzView::drawBackground(QPainter *painter, const QRectF &rect) { + QGraphicsView::drawBackground(painter, rect); // draw a gray background if disabled TikzScene *sc = static_cast(scene()); if (!sc->enabled()) painter->fillRect(rect, QBrush(QColor(240,240,240))); diff --git a/src/main.cpp b/src/main.cpp index 2fa81d1..99d23e9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -63,6 +63,7 @@ int main(int argc, char *argv[]) tikzit = new Tikzit(); tikzit->init(); + qDebug() << a.arguments().length(); if (a.arguments().length() > 1) { -- cgit v1.2.3 From aa4cc700bd4380a6b22ec600d67b5cdbcd1d6ec1 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Mon, 15 Oct 2018 15:14:08 +0200 Subject: increased GUI spacing to accommodate larger font sizes (fixes #23) --- src/gui/styleeditor.ui | 66 +++++++++++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/src/gui/styleeditor.ui b/src/gui/styleeditor.ui index f2c2437..9c06894 100644 --- a/src/gui/styleeditor.ui +++ b/src/gui/styleeditor.ui @@ -6,7 +6,7 @@ 0 0 - 580 + 608 517 @@ -29,7 +29,7 @@ 200 50 - 61 + 91 20 @@ -53,7 +53,7 @@ 200 80 - 61 + 91 20 @@ -77,7 +77,7 @@ 200 110 - 61 + 91 20 @@ -101,7 +101,7 @@ 200 140 - 61 + 91 20 @@ -123,7 +123,7 @@ - 270 + 300 50 301 20 @@ -138,7 +138,7 @@ - 270 + 300 80 301 22 @@ -156,7 +156,7 @@ - 270 + 300 110 31 18 @@ -178,7 +178,7 @@ - 270 + 300 140 31 18 @@ -200,9 +200,9 @@ - 390 + 420 110 - 71 + 91 17 @@ -219,9 +219,9 @@ - 390 + 420 140 - 71 + 91 17 @@ -238,7 +238,7 @@ - 460 + 510 110 31 18 @@ -257,7 +257,7 @@ - 460 + 510 140 31 18 @@ -278,7 +278,7 @@ 200 170 - 61 + 91 20 @@ -300,9 +300,9 @@ - 270 + 300 170 - 211 + 231 22 @@ -333,9 +333,9 @@ - 290 + 320 200 - 71 + 91 17 @@ -352,7 +352,7 @@ - 370 + 420 200 111 22 @@ -384,7 +384,7 @@ 200 230 - 61 + 91 20 @@ -406,7 +406,7 @@ - 270 + 300 230 41 22 @@ -439,7 +439,7 @@ - 320 + 350 230 16 21 @@ -457,7 +457,7 @@ - 340 + 370 230 41 22 @@ -492,7 +492,7 @@ 200 270 - 61 + 91 20 @@ -514,7 +514,7 @@ - 270 + 300 460 23 18 @@ -532,7 +532,7 @@ - 300 + 330 460 23 18 @@ -550,7 +550,7 @@ - 330 + 360 460 23 18 @@ -568,7 +568,7 @@ - 360 + 390 460 23 18 @@ -586,7 +586,7 @@ - 390 + 420 460 23 18 @@ -782,7 +782,7 @@ 479 490 - 91 + 121 20 @@ -798,7 +798,7 @@ - 270 + 300 270 301 181 -- cgit v1.2.3 From b151db2de2027742ffc665adb22eee074c92404b Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Mon, 15 Oct 2018 16:46:00 +0200 Subject: added travis osx build --- .travis.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..6401ce7 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,27 @@ +language: cpp + +matrix: + include: + - os: osx + compiler: clang + env: + - QT_BASE=510 + +before_install: + +install: + if [ "$TRAVIS_OS_NAME" = "linux" ]; then + # TODO + else + brew install qt5; + brew link --force qt5; + fi + fi + +script: + - qmake -v + - qmake -r + - make + +notifications: + email: false \ No newline at end of file -- cgit v1.2.3 From 47547dec0d45f98db5fe53f48182f276e2aef238 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Mon, 15 Oct 2018 16:49:39 +0200 Subject: fixed yml --- .travis.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6401ce7..7e1efd3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,13 +10,12 @@ matrix: before_install: install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then - # TODO - else - brew install qt5; - brew link --force qt5; - fi - fi + if [ "$TRAVIS_OS_NAME" = "linux" ]; then + # TODO + else + brew install qt5; + brew link --force qt5; + fi script: - qmake -v -- cgit v1.2.3 From a73a1b1c568817e398e7398c4633c46e772459f5 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Mon, 15 Oct 2018 16:51:35 +0200 Subject: ... --- .travis.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7e1efd3..880cc7e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,12 +10,8 @@ matrix: before_install: install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then - # TODO - else - brew install qt5; - brew link --force qt5; - fi + brew install qt5 + brew link --force qt5 script: - qmake -v -- cgit v1.2.3 From 48996f3fa64e14a3a7961560a1223f9847a6458f Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Mon, 15 Oct 2018 16:56:49 +0200 Subject: semicolons --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 880cc7e..a275c96 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,8 +10,8 @@ matrix: before_install: install: - brew install qt5 - brew link --force qt5 + brew install qt5; + brew link --force qt5; script: - qmake -v -- cgit v1.2.3 From 5993a5b08e6d8cd5c292f7067a90e0d58b748f94 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Mon, 15 Oct 2018 17:18:58 +0200 Subject: added dmg making --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index a275c96..ee4ee98 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,8 @@ script: - qmake -v - qmake -r - make + - macdeployqt tikzit.app -dmg + - curl --upload-file tikzit.dmg https://transfer.sh/tikzit.dmg notifications: email: false \ No newline at end of file -- cgit v1.2.3 From dde70dd9eb6ef4723c4efecbc4002c226a4d4805 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Mon, 15 Oct 2018 17:48:25 +0200 Subject: added legacy build --- .travis.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ee4ee98..0d8ef00 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,12 @@ matrix: compiler: clang env: - QT_BASE=510 + - FILE=tikzit-osx.dmg + - os: osx + osx_image: xcode6.4 + env: + - QT_BASE=510 + - FILE=tikzit-osx-yosemite.dmg before_install: @@ -18,7 +24,7 @@ script: - qmake -r - make - macdeployqt tikzit.app -dmg - - curl --upload-file tikzit.dmg https://transfer.sh/tikzit.dmg + - curl --upload-file tikzit.dmg https://transfer.sh/$FILE notifications: email: false \ No newline at end of file -- cgit v1.2.3 From 8b286fe0abf1385f6d40bfd5134668bfc3c4f33a Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Mon, 15 Oct 2018 18:00:45 +0200 Subject: ... --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0d8ef00..275e281 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,10 +8,10 @@ matrix: - QT_BASE=510 - FILE=tikzit-osx.dmg - os: osx - osx_image: xcode6.4 + osx_image: xcode7.3 env: - QT_BASE=510 - - FILE=tikzit-osx-yosemite.dmg + - FILE=tikzit-osx-elcap.dmg before_install: -- cgit v1.2.3 From 99b8307468211b9052eff16503d3b5e9fc642cbf Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Mon, 15 Oct 2018 20:02:30 +0200 Subject: added linux target --- .travis.yml | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 275e281..9e5b146 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,30 +1,35 @@ language: cpp +env: + - DEPLOY_TIKZIT=0 + matrix: include: - os: osx compiler: clang env: - - QT_BASE=510 - - FILE=tikzit-osx.dmg - - os: osx - osx_image: xcode7.3 + - FILE=tikzit-osx.dmg + - os: linux + dist: trusty env: - - QT_BASE=510 - - FILE=tikzit-osx-elcap.dmg + - FILE=tikzit-linux.tar.gz + - PPA=beineri/opt-qt-5.10.1-trusty before_install: + - '[[ "$TRAVIS_OS_NAME" != linux || -z "$PPA" ]] || sudo add-apt-repository -y ppa:$PPA' + - '[[ "$TRAVIS_OS_NAME" != linux ]] || sudo apt-get -qy update' install: - brew install qt5; - brew link --force qt5; + - '[[ "$TRAVIS_OS_NAME" != osx ]] || brew install qt5' + - '[[ "$TRAVIS_OS_NAME" != osx ]] || brew link --force qt5' + - '[[ "$TRAVIS_OS_NAME" != linux ]] || sudo apt-get -qy install qt510base qt510xmlpatterns' script: - qmake -v - qmake -r - make - - macdeployqt tikzit.app -dmg - - curl --upload-file tikzit.dmg https://transfer.sh/$FILE + - '[[ "$TRAVIS_OS_NAME" != osx ]] || (macdeployqt tikzit.app -dmg && mv tikzit.dmg $FILE)' + - '[[ "$DEPLOY_TIKZIT" != 1 ]] || curl --upload-file $FILE https://transfer.sh/$FILE' notifications: email: false \ No newline at end of file -- cgit v1.2.3 From faaeb41bf6161b22f938b523d87246cb1d541cc0 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Mon, 15 Oct 2018 22:02:37 +0200 Subject: qtenv --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 9e5b146..1d69cf7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,7 @@ install: - '[[ "$TRAVIS_OS_NAME" != osx ]] || brew install qt5' - '[[ "$TRAVIS_OS_NAME" != osx ]] || brew link --force qt5' - '[[ "$TRAVIS_OS_NAME" != linux ]] || sudo apt-get -qy install qt510base qt510xmlpatterns' + - '[[ "$TRAVIS_OS_NAME" != linux ]] || . /opt/qt$QT/bin/qt510-env.sh' script: - qmake -v -- cgit v1.2.3 From d6b09792275d53db81c4a8f5f11d6e2a93845be1 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 16 Oct 2018 06:06:18 +0200 Subject: .. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1d69cf7..91e7272 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ install: - '[[ "$TRAVIS_OS_NAME" != osx ]] || brew install qt5' - '[[ "$TRAVIS_OS_NAME" != osx ]] || brew link --force qt5' - '[[ "$TRAVIS_OS_NAME" != linux ]] || sudo apt-get -qy install qt510base qt510xmlpatterns' - - '[[ "$TRAVIS_OS_NAME" != linux ]] || . /opt/qt$QT/bin/qt510-env.sh' + - '[[ "$TRAVIS_OS_NAME" != linux ]] || . /opt/qt510/bin/qt510-env.sh' script: - qmake -v -- cgit v1.2.3 From ad4a51c23939ad34133f3103fcab03021da3c2d1 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 16 Oct 2018 06:14:02 +0200 Subject: removed gcc flag --- tikzit.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tikzit.pro b/tikzit.pro index e340a23..14761a2 100644 --- a/tikzit.pro +++ b/tikzit.pro @@ -14,7 +14,7 @@ TEMPLATE = app win32:RC_ICONS += images/tikzit.ico win32:RC_ICONS += images/tikzdoc.ico macx:ICON = images/tikzit.icns -linux-g++:QMAKE_CXXFLAGS += -Wsuggest-override +# linux-g++:QMAKE_CXXFLAGS += -Wsuggest-override # The following define makes your compiler emit warnings if you use # any feature of Qt which as been marked as deprecated (the exact warnings -- cgit v1.2.3 From 882824e9a14dad61c8570ec9922b8389c6ab611b Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 16 Oct 2018 07:15:15 +0200 Subject: fixed colors --- src/tikzit.cpp | 42 +++++++++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/src/tikzit.cpp b/src/tikzit.cpp index 791aa83..5433577 100644 --- a/src/tikzit.cpp +++ b/src/tikzit.cpp @@ -43,31 +43,55 @@ void Tikzit::init() // 19 standard xcolor colours _colNames << "black" << - "gray" << - "darkgray" << + "darkgray" << + "gray" << "lightgray" << "white" << "red" << "orange" << "yellow" << - "lime" << + "green" << "blue" << "purple" << "brown" << "olive" << - "green" << - "teal" << - "cyan" << + "lime" << + "cyan" << + "teal" << "magenta" << "violet" << "pink"; - for (int i = 0; i < _colNames.length(); ++i) { - _cols << QColor(_colNames[i]); - } + _cols << + QColor::fromRgbF(0,0,0) << + QColor::fromRgbF(0.25,0.25,0.25) << + QColor::fromRgbF(0.5,0.5,0.5) << + QColor::fromRgbF(0.75,0.75,0.75) << + QColor::fromRgbF(1,1,1) << + + QColor::fromRgbF(1,0,0) << + QColor::fromRgbF(1,0.5,0) << + QColor::fromRgbF(1,1,0) << + QColor::fromRgbF(0,1,0) << + QColor::fromRgbF(0,0,1) << + QColor::fromRgbF(0.75,0,0.25) << + + QColor::fromRgbF(0.75,0.5,0.25) << + QColor::fromRgbF(0.5,0.5,0) << + QColor::fromRgbF(0.75,1,0) << + QColor::fromRgbF(0,1,1) << + QColor::fromRgbF(0,0.5,0.5) << + + QColor::fromRgbF(1,0,1) << + QColor::fromRgbF(0.5,0,0.5) << + QColor::fromRgbF(1,0.75,0.75); + +// for (int i = 0; i < _colNames.length(); ++i) { +// _cols << QColor(_colNames[i]); +// } _mainMenu = new MainMenu(); QMainWindow *dummy = new QMainWindow(); -- cgit v1.2.3 From 6e713caf5f8e96575650a0d4e1558488a910be7d Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 16 Oct 2018 07:16:14 +0200 Subject: fixed #19 --- src/tikzit.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/tikzit.cpp b/src/tikzit.cpp index 5433577..585e906 100644 --- a/src/tikzit.cpp +++ b/src/tikzit.cpp @@ -89,10 +89,6 @@ void Tikzit::init() QColor::fromRgbF(0.5,0,0.5) << QColor::fromRgbF(1,0.75,0.75); -// for (int i = 0; i < _colNames.length(); ++i) { -// _cols << QColor(_colNames[i]); -// } - _mainMenu = new MainMenu(); QMainWindow *dummy = new QMainWindow(); -- cgit v1.2.3 From d32b043a03ec1f0fbecc6b6c1fef3be87ea68962 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 16 Oct 2018 07:26:12 +0200 Subject: added some caching for homebrew --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 91e7272..6889032 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,9 @@ matrix: compiler: clang env: - FILE=tikzit-osx.dmg + cache: + directories: + - $HOME/Library/Caches/Homebrew - os: linux dist: trusty env: -- cgit v1.2.3 From 779c19597e129d81865394b4e0dac3caa72f1258 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 16 Oct 2018 07:35:35 +0200 Subject: cache test --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6889032..be176bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,4 +36,4 @@ script: - '[[ "$DEPLOY_TIKZIT" != 1 ]] || curl --upload-file $FILE https://transfer.sh/$FILE' notifications: - email: false \ No newline at end of file + email: false -- cgit v1.2.3 From b5cd9287fbd2dc09bf85b5debd2929f0ee1b8650 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 16 Oct 2018 07:41:05 +0200 Subject: removed cache --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index be176bd..fe46587 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,9 +9,6 @@ matrix: compiler: clang env: - FILE=tikzit-osx.dmg - cache: - directories: - - $HOME/Library/Caches/Homebrew - os: linux dist: trusty env: -- cgit v1.2.3 From c762be3119b33a7d4be6f0577554ffdf0754088a Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 16 Oct 2018 07:47:12 +0200 Subject: ... --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fe46587..91e7272 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,4 +33,4 @@ script: - '[[ "$DEPLOY_TIKZIT" != 1 ]] || curl --upload-file $FILE https://transfer.sh/$FILE' notifications: - email: false + email: false \ No newline at end of file -- cgit v1.2.3 From af6b38f13a800769ee4213c9474c09fdac2bf953 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 16 Oct 2018 10:59:11 +0200 Subject: building again --- tikzit.pro | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tikzit.pro b/tikzit.pro index 14761a2..1b76fa0 100644 --- a/tikzit.pro +++ b/tikzit.pro @@ -16,6 +16,10 @@ win32:RC_ICONS += images/tikzdoc.ico macx:ICON = images/tikzit.icns # linux-g++:QMAKE_CXXFLAGS += -Wsuggest-override +#!versionAtLeast(QT_VERSION, 5.7.0) { +# macx:QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8 +#} + # The following define makes your compiler emit warnings if you use # any feature of Qt which as been marked as deprecated (the exact warnings # depend on your compiler). Please consult the documentation of the -- cgit v1.2.3 From 853831aefef16ef566fc8906214a6465873b97e8 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Thu, 18 Oct 2018 07:46:50 +0200 Subject: added appveyor windows build --- .appveyor.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .appveyor.yml diff --git a/.appveyor.yml b/.appveyor.yml new file mode 100644 index 0000000..bc1e80f --- /dev/null +++ b/.appveyor.yml @@ -0,0 +1,30 @@ +version: '{branch}-{build}' + +environment: + matrix: + # - QTDIR: C:\Qt\5.11.1\mingw53_32 + # - QTDIR: C:\Qt\5.11.1\msvc2015 + - QTDIR: C:\Qt\5.11.1\msvc2015_64 + +configuration: + - release + +install: + # Setup the build toolchains. + - '%QTDIR%\bin\qtenv2.bat' + - qmake -v + - if %QTDIR:_64=%==%QTDIR% ( set ARCH=x86 ) else set ARCH=x64 + - if %QTDIR:msvc=%==%QTDIR% g++ --version + - if %QTDIR:msvc=%==%QTDIR% set make=mingw32-make.exe + - if %QTDIR:msvc=%==%QTDIR% %make% --version + - if not %QTDIR:msvc2013=%==%QTDIR% call "%ProgramFiles(x86)%\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" %ARCH% + - if not %QTDIR:msvc2015=%==%QTDIR% call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %ARCH% + - if not %QTDIR:msvc=%==%QTDIR% set make=nmake.exe + - if not %QTDIR:msvc=%==%QTDIR% %make% /? > nul + + +build_script: + - qmake -v + - qmake -r + - '%make%' + -- cgit v1.2.3 From 3c45f454bb8d65bb11f1c9c56dc1796f3793acc7 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Thu, 18 Oct 2018 07:58:30 +0200 Subject: simplified --- .appveyor.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index bc1e80f..cedcffd 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -12,19 +12,11 @@ configuration: install: # Setup the build toolchains. - '%QTDIR%\bin\qtenv2.bat' - - qmake -v - - if %QTDIR:_64=%==%QTDIR% ( set ARCH=x86 ) else set ARCH=x64 - - if %QTDIR:msvc=%==%QTDIR% g++ --version - - if %QTDIR:msvc=%==%QTDIR% set make=mingw32-make.exe - - if %QTDIR:msvc=%==%QTDIR% %make% --version - - if not %QTDIR:msvc2013=%==%QTDIR% call "%ProgramFiles(x86)%\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" %ARCH% - - if not %QTDIR:msvc2015=%==%QTDIR% call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %ARCH% - - if not %QTDIR:msvc=%==%QTDIR% set make=nmake.exe - - if not %QTDIR:msvc=%==%QTDIR% %make% /? > nul + - call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64 build_script: - qmake -v - qmake -r - - '%make%' + - nmake.exe -- cgit v1.2.3 From 59916355f4afe2d268d6cecd91d43eed9d71f9d9 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Thu, 18 Oct 2018 07:59:54 +0200 Subject: added project --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index cedcffd..6f474b4 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -17,6 +17,6 @@ install: build_script: - qmake -v - - qmake -r + - qmake tikzit.pro - nmake.exe -- cgit v1.2.3 From 38e947dfe92afcc8aff13efc12eb14fbe8192366 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Thu, 18 Oct 2018 08:04:14 +0200 Subject: moving to project dir --- .appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 6f474b4..3209dcf 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -16,7 +16,8 @@ install: build_script: + - cd C:\projects\tikzit - qmake -v - - qmake tikzit.pro + - qmake - nmake.exe -- cgit v1.2.3 From 30669ac45c9d6a7dd752ac7cb707b98151e822ad Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Thu, 18 Oct 2018 07:38:53 +0200 Subject: added winflexbison support and updated appveyor --- .appveyor.yml | 4 +- bison.pri | 17 +++- flex.pri | 8 +- tikzlexer.h | 257 ++++++++++++++++++---------------------------------------- 4 files changed, 104 insertions(+), 182 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 3209dcf..a53c00d 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -10,13 +10,13 @@ configuration: - release install: - # Setup the build toolchains. + - choco install winflexbison - '%QTDIR%\bin\qtenv2.bat' - call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64 + - cd C:\projects\tikzit build_script: - - cd C:\projects\tikzit - qmake -v - qmake - nmake.exe diff --git a/bison.pri b/bison.pri index 3528824..c8fbd32 100644 --- a/bison.pri +++ b/bison.pri @@ -1,14 +1,27 @@ bison.name = Bison ${QMAKE_FILE_IN} bison.input = BISONSOURCES bison.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.parser.cpp -bison.commands = bison -d -o ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.parser.cpp ${QMAKE_FILE_IN} + +win32 { + bison.commands = win_bison.exe -d -o ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.parser.cpp ${QMAKE_FILE_IN} +} else { + bison.commands = bison -d -o ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.parser.cpp ${QMAKE_FILE_IN} +} + + bison.CONFIG += target_predeps bison.variable_out = GENERATED_SOURCES silent:bison.commands = @echo Bison ${QMAKE_FILE_IN} && $$bison.commands QMAKE_EXTRA_COMPILERS += bison bison_header.input = BISONSOURCES bison_header.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.parser.hpp -bison_header.commands = bison -d -o ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.parser.cpp ${QMAKE_FILE_IN} + +win32 { + bison_header.commands = win_bison.exe -d -o ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.parser.cpp ${QMAKE_FILE_IN} +} else { + bison_header.commands = bison -d -o ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.parser.cpp ${QMAKE_FILE_IN} +} + bison_header.CONFIG += target_predeps no_link silent:bison_header.commands = @echo Bison ${QMAKE_FILE_IN} && $$bison.commands QMAKE_EXTRA_COMPILERS += bison_header diff --git a/flex.pri b/flex.pri index f3de228..aa5bba8 100644 --- a/flex.pri +++ b/flex.pri @@ -1,7 +1,13 @@ flex.name = Flex ${QMAKE_FILE_IN} flex.input = FLEXSOURCES flex.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.lexer.cpp -flex.commands = flex --header-file -o ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.lexer.cpp ${QMAKE_FILE_IN} + +win32 { + flex.commands = win_flex.exe --header-file -o ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.lexer.cpp ${QMAKE_FILE_IN} +} else { + flex.commands = flex --header-file -o ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.lexer.cpp ${QMAKE_FILE_IN} +} + flex.CONFIG += target_predeps flex.variable_out = GENERATED_SOURCES silent:flex.commands = @echo Lex ${QMAKE_FILE_IN} && $$flex.commands diff --git a/tikzlexer.h b/tikzlexer.h index 438947f..5f18d12 100644 --- a/tikzlexer.h +++ b/tikzlexer.h @@ -2,9 +2,9 @@ #define yyHEADER_H 1 #define yyIN_HEADER 1 -#line 6 "tikzlexer.h" +#line 5 "tikzlexer.h" -#line 8 "tikzlexer.h" +#line 7 "tikzlexer.h" #define YY_INT_ALIGNED short int @@ -13,34 +13,88 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 6 -#define YY_FLEX_SUBMINOR_VERSION 4 +#define YY_FLEX_SUBMINOR_VERSION 3 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif -#ifdef yyget_lval -#define yyget_lval_ALREADY_DEFINED -#else -#define yyget_lval yyget_lval -#endif + #define yy_create_buffer yy_create_buffer -#ifdef yyset_lval -#define yyset_lval_ALREADY_DEFINED -#else -#define yyset_lval yyset_lval -#endif + #define yy_delete_buffer yy_delete_buffer -#ifdef yyget_lloc -#define yyget_lloc_ALREADY_DEFINED -#else -#define yyget_lloc yyget_lloc -#endif + #define yy_scan_buffer yy_scan_buffer -#ifdef yyset_lloc -#define yyset_lloc_ALREADY_DEFINED -#else -#define yyset_lloc yyset_lloc -#endif + #define yy_scan_string yy_scan_string + + #define yy_scan_bytes yy_scan_bytes + + #define yy_init_buffer yy_init_buffer + + #define yy_flush_buffer yy_flush_buffer + + #define yy_load_buffer_state yy_load_buffer_state + + #define yy_switch_to_buffer yy_switch_to_buffer + + #define yypush_buffer_state yypush_buffer_state + + #define yypop_buffer_state yypop_buffer_state + + #define yyensure_buffer_stack yyensure_buffer_stack + + #define yylex yylex + + #define yyrestart yyrestart + + #define yylex_init yylex_init + + #define yylex_init_extra yylex_init_extra + + #define yylex_destroy yylex_destroy + + #define yyget_debug yyget_debug + + #define yyset_debug yyset_debug + + #define yyget_extra yyget_extra + + #define yyset_extra yyset_extra + + #define yyget_in yyget_in + + #define yyset_in yyset_in + + #define yyget_out yyget_out + + #define yyset_out yyset_out + + #define yyget_leng yyget_leng + + #define yyget_text yyget_text + + #define yyget_lineno yyget_lineno + + #define yyset_lineno yyset_lineno + + #define yyget_column yyget_column + + #define yyset_column yyset_column + + #define yywrap yywrap + + #define yyget_lval yyget_lval + + #define yyset_lval yyset_lval + + #define yyget_lloc yyget_lloc + + #define yyset_lloc yyset_lloc + + #define yyalloc yyalloc + + #define yyrealloc yyrealloc + + #define yyfree yyfree /* First, we deal with platform-specific or compiler-specific issues. */ @@ -112,16 +166,10 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif -#ifndef SIZE_MAX -#define SIZE_MAX (~(size_t)0) -#endif - #endif /* ! C99 */ #endif /* ! FLEXINT_H */ -/* begin standard C++ headers. */ - /* TODO: this is always defined, so inline it */ #define yyconst const @@ -259,7 +307,7 @@ void yyfree ( void * , yyscan_t yyscanner ); */ #include #endif - + #define YY_EXTRA_TYPE TikzAssembler * int yylex_init (yyscan_t* scanner); @@ -373,153 +421,8 @@ extern int yylex \ #undef YY_DECL #endif -#ifndef yy_create_buffer_ALREADY_DEFINED -#undef yy_create_buffer -#endif -#ifndef yy_delete_buffer_ALREADY_DEFINED -#undef yy_delete_buffer -#endif -#ifndef yy_scan_buffer_ALREADY_DEFINED -#undef yy_scan_buffer -#endif -#ifndef yy_scan_string_ALREADY_DEFINED -#undef yy_scan_string -#endif -#ifndef yy_scan_bytes_ALREADY_DEFINED -#undef yy_scan_bytes -#endif -#ifndef yy_init_buffer_ALREADY_DEFINED -#undef yy_init_buffer -#endif -#ifndef yy_flush_buffer_ALREADY_DEFINED -#undef yy_flush_buffer -#endif -#ifndef yy_load_buffer_state_ALREADY_DEFINED -#undef yy_load_buffer_state -#endif -#ifndef yy_switch_to_buffer_ALREADY_DEFINED -#undef yy_switch_to_buffer -#endif -#ifndef yypush_buffer_state_ALREADY_DEFINED -#undef yypush_buffer_state -#endif -#ifndef yypop_buffer_state_ALREADY_DEFINED -#undef yypop_buffer_state -#endif -#ifndef yyensure_buffer_stack_ALREADY_DEFINED -#undef yyensure_buffer_stack -#endif -#ifndef yylex_ALREADY_DEFINED -#undef yylex -#endif -#ifndef yyrestart_ALREADY_DEFINED -#undef yyrestart -#endif -#ifndef yylex_init_ALREADY_DEFINED -#undef yylex_init -#endif -#ifndef yylex_init_extra_ALREADY_DEFINED -#undef yylex_init_extra -#endif -#ifndef yylex_destroy_ALREADY_DEFINED -#undef yylex_destroy -#endif -#ifndef yyget_debug_ALREADY_DEFINED -#undef yyget_debug -#endif -#ifndef yyset_debug_ALREADY_DEFINED -#undef yyset_debug -#endif -#ifndef yyget_extra_ALREADY_DEFINED -#undef yyget_extra -#endif -#ifndef yyset_extra_ALREADY_DEFINED -#undef yyset_extra -#endif -#ifndef yyget_in_ALREADY_DEFINED -#undef yyget_in -#endif -#ifndef yyset_in_ALREADY_DEFINED -#undef yyset_in -#endif -#ifndef yyget_out_ALREADY_DEFINED -#undef yyget_out -#endif -#ifndef yyset_out_ALREADY_DEFINED -#undef yyset_out -#endif -#ifndef yyget_leng_ALREADY_DEFINED -#undef yyget_leng -#endif -#ifndef yyget_text_ALREADY_DEFINED -#undef yyget_text -#endif -#ifndef yyget_lineno_ALREADY_DEFINED -#undef yyget_lineno -#endif -#ifndef yyset_lineno_ALREADY_DEFINED -#undef yyset_lineno -#endif -#ifndef yyget_column_ALREADY_DEFINED -#undef yyget_column -#endif -#ifndef yyset_column_ALREADY_DEFINED -#undef yyset_column -#endif -#ifndef yywrap_ALREADY_DEFINED -#undef yywrap -#endif -#ifndef yyget_lval_ALREADY_DEFINED -#undef yyget_lval -#endif -#ifndef yyset_lval_ALREADY_DEFINED -#undef yyset_lval -#endif -#ifndef yyget_lloc_ALREADY_DEFINED -#undef yyget_lloc -#endif -#ifndef yyset_lloc_ALREADY_DEFINED -#undef yyset_lloc -#endif -#ifndef yyalloc_ALREADY_DEFINED -#undef yyalloc -#endif -#ifndef yyrealloc_ALREADY_DEFINED -#undef yyrealloc -#endif -#ifndef yyfree_ALREADY_DEFINED -#undef yyfree -#endif -#ifndef yytext_ALREADY_DEFINED -#undef yytext -#endif -#ifndef yyleng_ALREADY_DEFINED -#undef yyleng -#endif -#ifndef yyin_ALREADY_DEFINED -#undef yyin -#endif -#ifndef yyout_ALREADY_DEFINED -#undef yyout -#endif -#ifndef yy_flex_debug_ALREADY_DEFINED -#undef yy_flex_debug -#endif -#ifndef yylineno_ALREADY_DEFINED -#undef yylineno -#endif -#ifndef yytables_fload_ALREADY_DEFINED -#undef yytables_fload -#endif -#ifndef yytables_destroy_ALREADY_DEFINED -#undef yytables_destroy -#endif -#ifndef yyTABLES_NAME_ALREADY_DEFINED -#undef yyTABLES_NAME -#endif - -#line 195 "src/data/tikzlexer.l" +#line 195 "src\\data\\tikzlexer.l" -#line 524 "tikzlexer.h" +#line 426 "tikzlexer.h" #undef yyIN_HEADER #endif /* yyHEADER_H */ -- cgit v1.2.3 From 375621b09d85ee3430659c8278c8ebb56d9a4507 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Thu, 18 Oct 2018 11:27:52 +0200 Subject: added docks to View menu (closes #29) --- src/gui/mainmenu.cpp | 8 ++++++++ src/gui/mainmenu.h | 1 + src/gui/mainwindow.cpp | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/gui/mainmenu.cpp b/src/gui/mainmenu.cpp index c159981..7d74fbe 100644 --- a/src/gui/mainmenu.cpp +++ b/src/gui/mainmenu.cpp @@ -26,6 +26,14 @@ MainMenu::MainMenu() ui.setupUi(this); } +void MainMenu::addDocks(QMenu *m) +{ + ui.menuView->addSeparator(); + foreach (QAction *a, m->actions()) { + if (!a->isSeparator()) ui.menuView->addAction(a); + } +} + // File void MainMenu::on_actionNew_triggered() { diff --git a/src/gui/mainmenu.h b/src/gui/mainmenu.h index c4079bf..82c447e 100644 --- a/src/gui/mainmenu.h +++ b/src/gui/mainmenu.h @@ -28,6 +28,7 @@ class MainMenu : public QMenuBar Q_OBJECT public: MainMenu(); + void addDocks(QMenu *m); private: Ui::MainMenu ui; diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 806d634..acbad69 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -44,7 +44,6 @@ MainWindow::MainWindow(QWidget *parent) : // TODO: check if each window should have a menu _menu = new MainMenu(); _menu->setParent(this); - setMenuBar(_menu); QVariant geom = settings.value("geometry-main"); @@ -70,6 +69,7 @@ MainWindow::MainWindow(QWidget *parent) : _tikzDocument->refreshTikz(); connect(_tikzDocument->undoStack(), SIGNAL(cleanChanged(bool)), this, SLOT(updateFileName())); + _menu->addDocks(createPopupMenu()); } MainWindow::~MainWindow() -- cgit v1.2.3 From 092c5c6b84b92a40e210ee7447fc7dbd3b492ca4 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Thu, 18 Oct 2018 15:53:11 +0200 Subject: set up install paths (fixes #32) --- share/applications/tikzit.desktop | 8 ++++++++ share/mime/packages/user-tikz-document.xml | 7 +++++++ tikzit.pro | 21 +++++++++++++++++++-- 3 files changed, 34 insertions(+), 2 deletions(-) create mode 100755 share/applications/tikzit.desktop create mode 100644 share/mime/packages/user-tikz-document.xml diff --git a/share/applications/tikzit.desktop b/share/applications/tikzit.desktop new file mode 100755 index 0000000..1e767f7 --- /dev/null +++ b/share/applications/tikzit.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=TikZiT +Comment=A graphical editor for PGF/TikZ +Exec=tikzit %u +Icon=tikzit +Terminal=false +Type=Application +MimeType=application/x-tikz-document diff --git a/share/mime/packages/user-tikz-document.xml b/share/mime/packages/user-tikz-document.xml new file mode 100644 index 0000000..db884f6 --- /dev/null +++ b/share/mime/packages/user-tikz-document.xml @@ -0,0 +1,7 @@ + + + + tikz document + + + diff --git a/tikzit.pro b/tikzit.pro index 1b76fa0..c0d8729 100644 --- a/tikzit.pro +++ b/tikzit.pro @@ -4,12 +4,27 @@ # #------------------------------------------------- -QT += core gui widgets -CONFIG += testcase +QT += core gui widgets + +test { + CONFIG += testcase +} TARGET = tikzit TEMPLATE = app +PREFIX = $$(PREFIX) + +isEmpty(PREFIX) { + PREFIX=/usr/local +} + +share.path = $${PREFIX}/share +share.files = share/* + +target.path = $${PREFIX}/bin +INSTALLS += target share + # platform-specific options win32:RC_ICONS += images/tikzit.ico win32:RC_ICONS += images/tikzdoc.ico @@ -115,3 +130,5 @@ test { SOURCES += src/main.cpp } + + -- cgit v1.2.3 From 56b21f3107fb36edeed15544a30238e4f57b977c Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Sat, 20 Oct 2018 10:59:37 +0200 Subject: added mac target for qt 5.6 --- .travis.yml | 32 ++++-- src/gui/mainwindow.cpp | 6 ++ src/gui/mainwindow.ui | 3 - tikzit.pro | 7 +- tikzlexer.h | 257 ++++++++++++++++++++++++++++++++++--------------- 5 files changed, 209 insertions(+), 96 deletions(-) diff --git a/.travis.yml b/.travis.yml index 91e7272..98be8d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,21 +9,33 @@ matrix: compiler: clang env: - FILE=tikzit-osx.dmg - - os: linux - dist: trusty + - QTVER=511 + - os: osx + compiler: clang env: - - FILE=tikzit-linux.tar.gz - - PPA=beineri/opt-qt-5.10.1-trusty + - FILE=tikzit-osx-mountain.dmg + - QTVER=56 + # - os: linux + # dist: trusty + # env: + # - FILE=tikzit-linux.tar.gz + # - PPA=beineri/opt-qt-5.10.1-trusty before_install: - - '[[ "$TRAVIS_OS_NAME" != linux || -z "$PPA" ]] || sudo add-apt-repository -y ppa:$PPA' - - '[[ "$TRAVIS_OS_NAME" != linux ]] || sudo apt-get -qy update' + # - '[[ "$TRAVIS_OS_NAME" != linux || -z "$PPA" ]] || sudo add-apt-repository -y ppa:$PPA' + # - '[[ "$TRAVIS_OS_NAME" != linux ]] || sudo apt-get -qy update' + - '[[ "$TRAVIS_OS_NAME" != osx || "$QTVER" != 56 ]] || curl https://raw.githubusercontent.com/GiovanniBussi/macports-ci/master/macports-ci > macports-ci' + - '[[ "$TRAVIS_OS_NAME" != osx || "$QTVER" != 56 ]] || source macports-ci install' + + install: - - '[[ "$TRAVIS_OS_NAME" != osx ]] || brew install qt5' - - '[[ "$TRAVIS_OS_NAME" != osx ]] || brew link --force qt5' - - '[[ "$TRAVIS_OS_NAME" != linux ]] || sudo apt-get -qy install qt510base qt510xmlpatterns' - - '[[ "$TRAVIS_OS_NAME" != linux ]] || . /opt/qt510/bin/qt510-env.sh' + - '[[ "$TRAVIS_OS_NAME" != osx || "$QTVER" != 511 ]] || brew install qt5' + - '[[ "$TRAVIS_OS_NAME" != osx || "$QTVER" != 511 ]] || brew link --force qt5' + - '[[ "$TRAVIS_OS_NAME" != osx || "$QTVER" != 56 ]] || sudo port -N -k install qt56' + - '[[ "$TRAVIS_OS_NAME" != osx || "$QTVER" != 56 ]] || export PATH=/opt/local/libexec/qt5/bin:$PATH' + # - '[[ "$TRAVIS_OS_NAME" != linux ]] || sudo apt-get -qy install qt510base qt510xmlpatterns' + # - '[[ "$TRAVIS_OS_NAME" != linux ]] || . /opt/qt510/bin/qt510-env.sh' script: - qmake -v diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index acbad69..d4d13b5 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -70,6 +70,12 @@ MainWindow::MainWindow(QWidget *parent) : connect(_tikzDocument->undoStack(), SIGNAL(cleanChanged(bool)), this, SLOT(updateFileName())); _menu->addDocks(createPopupMenu()); + +#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)) + ui->tikzSource->setTabStopDistance(20.0); +#else + ui->tikzSource->setTabStopWidth(20); +#endif } MainWindow::~MainWindow() diff --git a/src/gui/mainwindow.ui b/src/gui/mainwindow.ui index 27e0127..bedc695 100644 --- a/src/gui/mainwindow.ui +++ b/src/gui/mainwindow.ui @@ -62,9 +62,6 @@ p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Courier New'; font-size:10pt; font-weight:400; font-style:normal;"> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'.SF NS Text'; font-size:13pt;"><br /></p></body></html> - - 20.000000000000000 - diff --git a/tikzit.pro b/tikzit.pro index c0d8729..c4b8f84 100644 --- a/tikzit.pro +++ b/tikzit.pro @@ -31,9 +31,10 @@ win32:RC_ICONS += images/tikzdoc.ico macx:ICON = images/tikzit.icns # linux-g++:QMAKE_CXXFLAGS += -Wsuggest-override -#!versionAtLeast(QT_VERSION, 5.7.0) { -# macx:QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8 -#} +# Qt 5.8 and above drop support for Mountain Lion +contains(QT_VERSION, ^5\\.[5-7].*) { + macx:QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8 +} # The following define makes your compiler emit warnings if you use # any feature of Qt which as been marked as deprecated (the exact warnings diff --git a/tikzlexer.h b/tikzlexer.h index 5f18d12..438947f 100644 --- a/tikzlexer.h +++ b/tikzlexer.h @@ -2,9 +2,9 @@ #define yyHEADER_H 1 #define yyIN_HEADER 1 -#line 5 "tikzlexer.h" +#line 6 "tikzlexer.h" -#line 7 "tikzlexer.h" +#line 8 "tikzlexer.h" #define YY_INT_ALIGNED short int @@ -13,88 +13,34 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 6 -#define YY_FLEX_SUBMINOR_VERSION 3 +#define YY_FLEX_SUBMINOR_VERSION 4 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif - #define yy_create_buffer yy_create_buffer - - #define yy_delete_buffer yy_delete_buffer - - #define yy_scan_buffer yy_scan_buffer - - #define yy_scan_string yy_scan_string - - #define yy_scan_bytes yy_scan_bytes - - #define yy_init_buffer yy_init_buffer - - #define yy_flush_buffer yy_flush_buffer - - #define yy_load_buffer_state yy_load_buffer_state - - #define yy_switch_to_buffer yy_switch_to_buffer - - #define yypush_buffer_state yypush_buffer_state - - #define yypop_buffer_state yypop_buffer_state - - #define yyensure_buffer_stack yyensure_buffer_stack - - #define yylex yylex - - #define yyrestart yyrestart - - #define yylex_init yylex_init - - #define yylex_init_extra yylex_init_extra - - #define yylex_destroy yylex_destroy - - #define yyget_debug yyget_debug - - #define yyset_debug yyset_debug - - #define yyget_extra yyget_extra - - #define yyset_extra yyset_extra - - #define yyget_in yyget_in - - #define yyset_in yyset_in - - #define yyget_out yyget_out - - #define yyset_out yyset_out - - #define yyget_leng yyget_leng - - #define yyget_text yyget_text - - #define yyget_lineno yyget_lineno - - #define yyset_lineno yyset_lineno - - #define yyget_column yyget_column - - #define yyset_column yyset_column - - #define yywrap yywrap - - #define yyget_lval yyget_lval - - #define yyset_lval yyset_lval - - #define yyget_lloc yyget_lloc - - #define yyset_lloc yyset_lloc +#ifdef yyget_lval +#define yyget_lval_ALREADY_DEFINED +#else +#define yyget_lval yyget_lval +#endif - #define yyalloc yyalloc +#ifdef yyset_lval +#define yyset_lval_ALREADY_DEFINED +#else +#define yyset_lval yyset_lval +#endif - #define yyrealloc yyrealloc +#ifdef yyget_lloc +#define yyget_lloc_ALREADY_DEFINED +#else +#define yyget_lloc yyget_lloc +#endif - #define yyfree yyfree +#ifdef yyset_lloc +#define yyset_lloc_ALREADY_DEFINED +#else +#define yyset_lloc yyset_lloc +#endif /* First, we deal with platform-specific or compiler-specific issues. */ @@ -166,10 +112,16 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif +#ifndef SIZE_MAX +#define SIZE_MAX (~(size_t)0) +#endif + #endif /* ! C99 */ #endif /* ! FLEXINT_H */ +/* begin standard C++ headers. */ + /* TODO: this is always defined, so inline it */ #define yyconst const @@ -307,7 +259,7 @@ void yyfree ( void * , yyscan_t yyscanner ); */ #include #endif - + #define YY_EXTRA_TYPE TikzAssembler * int yylex_init (yyscan_t* scanner); @@ -421,8 +373,153 @@ extern int yylex \ #undef YY_DECL #endif -#line 195 "src\\data\\tikzlexer.l" +#ifndef yy_create_buffer_ALREADY_DEFINED +#undef yy_create_buffer +#endif +#ifndef yy_delete_buffer_ALREADY_DEFINED +#undef yy_delete_buffer +#endif +#ifndef yy_scan_buffer_ALREADY_DEFINED +#undef yy_scan_buffer +#endif +#ifndef yy_scan_string_ALREADY_DEFINED +#undef yy_scan_string +#endif +#ifndef yy_scan_bytes_ALREADY_DEFINED +#undef yy_scan_bytes +#endif +#ifndef yy_init_buffer_ALREADY_DEFINED +#undef yy_init_buffer +#endif +#ifndef yy_flush_buffer_ALREADY_DEFINED +#undef yy_flush_buffer +#endif +#ifndef yy_load_buffer_state_ALREADY_DEFINED +#undef yy_load_buffer_state +#endif +#ifndef yy_switch_to_buffer_ALREADY_DEFINED +#undef yy_switch_to_buffer +#endif +#ifndef yypush_buffer_state_ALREADY_DEFINED +#undef yypush_buffer_state +#endif +#ifndef yypop_buffer_state_ALREADY_DEFINED +#undef yypop_buffer_state +#endif +#ifndef yyensure_buffer_stack_ALREADY_DEFINED +#undef yyensure_buffer_stack +#endif +#ifndef yylex_ALREADY_DEFINED +#undef yylex +#endif +#ifndef yyrestart_ALREADY_DEFINED +#undef yyrestart +#endif +#ifndef yylex_init_ALREADY_DEFINED +#undef yylex_init +#endif +#ifndef yylex_init_extra_ALREADY_DEFINED +#undef yylex_init_extra +#endif +#ifndef yylex_destroy_ALREADY_DEFINED +#undef yylex_destroy +#endif +#ifndef yyget_debug_ALREADY_DEFINED +#undef yyget_debug +#endif +#ifndef yyset_debug_ALREADY_DEFINED +#undef yyset_debug +#endif +#ifndef yyget_extra_ALREADY_DEFINED +#undef yyget_extra +#endif +#ifndef yyset_extra_ALREADY_DEFINED +#undef yyset_extra +#endif +#ifndef yyget_in_ALREADY_DEFINED +#undef yyget_in +#endif +#ifndef yyset_in_ALREADY_DEFINED +#undef yyset_in +#endif +#ifndef yyget_out_ALREADY_DEFINED +#undef yyget_out +#endif +#ifndef yyset_out_ALREADY_DEFINED +#undef yyset_out +#endif +#ifndef yyget_leng_ALREADY_DEFINED +#undef yyget_leng +#endif +#ifndef yyget_text_ALREADY_DEFINED +#undef yyget_text +#endif +#ifndef yyget_lineno_ALREADY_DEFINED +#undef yyget_lineno +#endif +#ifndef yyset_lineno_ALREADY_DEFINED +#undef yyset_lineno +#endif +#ifndef yyget_column_ALREADY_DEFINED +#undef yyget_column +#endif +#ifndef yyset_column_ALREADY_DEFINED +#undef yyset_column +#endif +#ifndef yywrap_ALREADY_DEFINED +#undef yywrap +#endif +#ifndef yyget_lval_ALREADY_DEFINED +#undef yyget_lval +#endif +#ifndef yyset_lval_ALREADY_DEFINED +#undef yyset_lval +#endif +#ifndef yyget_lloc_ALREADY_DEFINED +#undef yyget_lloc +#endif +#ifndef yyset_lloc_ALREADY_DEFINED +#undef yyset_lloc +#endif +#ifndef yyalloc_ALREADY_DEFINED +#undef yyalloc +#endif +#ifndef yyrealloc_ALREADY_DEFINED +#undef yyrealloc +#endif +#ifndef yyfree_ALREADY_DEFINED +#undef yyfree +#endif +#ifndef yytext_ALREADY_DEFINED +#undef yytext +#endif +#ifndef yyleng_ALREADY_DEFINED +#undef yyleng +#endif +#ifndef yyin_ALREADY_DEFINED +#undef yyin +#endif +#ifndef yyout_ALREADY_DEFINED +#undef yyout +#endif +#ifndef yy_flex_debug_ALREADY_DEFINED +#undef yy_flex_debug +#endif +#ifndef yylineno_ALREADY_DEFINED +#undef yylineno +#endif +#ifndef yytables_fload_ALREADY_DEFINED +#undef yytables_fload +#endif +#ifndef yytables_destroy_ALREADY_DEFINED +#undef yytables_destroy +#endif +#ifndef yyTABLES_NAME_ALREADY_DEFINED +#undef yyTABLES_NAME +#endif + +#line 195 "src/data/tikzlexer.l" -#line 426 "tikzlexer.h" +#line 524 "tikzlexer.h" #undef yyIN_HEADER #endif /* yyHEADER_H */ -- cgit v1.2.3 From d443fa28b8bc3b355467bf31e8f9e684e8be8f04 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Sat, 20 Oct 2018 11:01:45 +0200 Subject: removed tikzlexer.h from repo (closes #31) --- tikzlexer.h | 525 ------------------------------------------------------------ 1 file changed, 525 deletions(-) delete mode 100644 tikzlexer.h diff --git a/tikzlexer.h b/tikzlexer.h deleted file mode 100644 index 438947f..0000000 --- a/tikzlexer.h +++ /dev/null @@ -1,525 +0,0 @@ -#ifndef yyHEADER_H -#define yyHEADER_H 1 -#define yyIN_HEADER 1 - -#line 6 "tikzlexer.h" - -#line 8 "tikzlexer.h" - -#define YY_INT_ALIGNED short int - -/* A lexical scanner generated by flex */ - -#define FLEX_SCANNER -#define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 6 -#define YY_FLEX_SUBMINOR_VERSION 4 -#if YY_FLEX_SUBMINOR_VERSION > 0 -#define FLEX_BETA -#endif - -#ifdef yyget_lval -#define yyget_lval_ALREADY_DEFINED -#else -#define yyget_lval yyget_lval -#endif - -#ifdef yyset_lval -#define yyset_lval_ALREADY_DEFINED -#else -#define yyset_lval yyset_lval -#endif - -#ifdef yyget_lloc -#define yyget_lloc_ALREADY_DEFINED -#else -#define yyget_lloc yyget_lloc -#endif - -#ifdef yyset_lloc -#define yyset_lloc_ALREADY_DEFINED -#else -#define yyset_lloc yyset_lloc -#endif - -/* First, we deal with platform-specific or compiler-specific issues. */ - -/* begin standard C headers. */ -#include -#include -#include -#include - -/* end standard C headers. */ - -/* flex integer type definitions */ - -#ifndef FLEXINT_H -#define FLEXINT_H - -/* C99 systems have . Non-C99 systems may or may not. */ - -#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L - -/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, - * if you want the limit (max/min) macros for int types. - */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS 1 -#endif - -#include -typedef int8_t flex_int8_t; -typedef uint8_t flex_uint8_t; -typedef int16_t flex_int16_t; -typedef uint16_t flex_uint16_t; -typedef int32_t flex_int32_t; -typedef uint32_t flex_uint32_t; -#else -typedef signed char flex_int8_t; -typedef short int flex_int16_t; -typedef int flex_int32_t; -typedef unsigned char flex_uint8_t; -typedef unsigned short int flex_uint16_t; -typedef unsigned int flex_uint32_t; - -/* Limits of integral types. */ -#ifndef INT8_MIN -#define INT8_MIN (-128) -#endif -#ifndef INT16_MIN -#define INT16_MIN (-32767-1) -#endif -#ifndef INT32_MIN -#define INT32_MIN (-2147483647-1) -#endif -#ifndef INT8_MAX -#define INT8_MAX (127) -#endif -#ifndef INT16_MAX -#define INT16_MAX (32767) -#endif -#ifndef INT32_MAX -#define INT32_MAX (2147483647) -#endif -#ifndef UINT8_MAX -#define UINT8_MAX (255U) -#endif -#ifndef UINT16_MAX -#define UINT16_MAX (65535U) -#endif -#ifndef UINT32_MAX -#define UINT32_MAX (4294967295U) -#endif - -#ifndef SIZE_MAX -#define SIZE_MAX (~(size_t)0) -#endif - -#endif /* ! C99 */ - -#endif /* ! FLEXINT_H */ - -/* begin standard C++ headers. */ - -/* TODO: this is always defined, so inline it */ -#define yyconst const - -#if defined(__GNUC__) && __GNUC__ >= 3 -#define yynoreturn __attribute__((__noreturn__)) -#else -#define yynoreturn -#endif - -/* An opaque pointer. */ -#ifndef YY_TYPEDEF_YY_SCANNER_T -#define YY_TYPEDEF_YY_SCANNER_T -typedef void* yyscan_t; -#endif - -/* For convenience, these vars (plus the bison vars far below) - are macros in the reentrant scanner. */ -#define yyin yyg->yyin_r -#define yyout yyg->yyout_r -#define yyextra yyg->yyextra_r -#define yyleng yyg->yyleng_r -#define yytext yyg->yytext_r -#define yylineno (YY_CURRENT_BUFFER_LVALUE->yy_bs_lineno) -#define yycolumn (YY_CURRENT_BUFFER_LVALUE->yy_bs_column) -#define yy_flex_debug yyg->yy_flex_debug_r - -/* Size of default input buffer. */ -#ifndef YY_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k. - * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. - * Ditto for the __ia64__ case accordingly. - */ -#define YY_BUF_SIZE 32768 -#else -#define YY_BUF_SIZE 16384 -#endif /* __ia64__ */ -#endif - -#ifndef YY_TYPEDEF_YY_BUFFER_STATE -#define YY_TYPEDEF_YY_BUFFER_STATE -typedef struct yy_buffer_state *YY_BUFFER_STATE; -#endif - -#ifndef YY_TYPEDEF_YY_SIZE_T -#define YY_TYPEDEF_YY_SIZE_T -typedef size_t yy_size_t; -#endif - -#ifndef YY_STRUCT_YY_BUFFER_STATE -#define YY_STRUCT_YY_BUFFER_STATE -struct yy_buffer_state - { - FILE *yy_input_file; - - char *yy_ch_buf; /* input buffer */ - char *yy_buf_pos; /* current position in input buffer */ - - /* Size of input buffer in bytes, not including room for EOB - * characters. - */ - int yy_buf_size; - - /* Number of characters read into yy_ch_buf, not including EOB - * characters. - */ - int yy_n_chars; - - /* Whether we "own" the buffer - i.e., we know we created it, - * and can realloc() it to grow it, and should free() it to - * delete it. - */ - int yy_is_our_buffer; - - /* Whether this is an "interactive" input source; if so, and - * if we're using stdio for input, then we want to use getc() - * instead of fread(), to make sure we stop fetching input after - * each newline. - */ - int yy_is_interactive; - - /* Whether we're considered to be at the beginning of a line. - * If so, '^' rules will be active on the next match, otherwise - * not. - */ - int yy_at_bol; - - int yy_bs_lineno; /**< The line count. */ - int yy_bs_column; /**< The column count. */ - - /* Whether to try to fill the input buffer when we reach the - * end of it. - */ - int yy_fill_buffer; - - int yy_buffer_status; - - }; -#endif /* !YY_STRUCT_YY_BUFFER_STATE */ - -void yyrestart ( FILE *input_file , yyscan_t yyscanner ); -void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); -YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size , yyscan_t yyscanner ); -void yy_delete_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); -void yy_flush_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); -void yypush_buffer_state ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); -void yypop_buffer_state ( yyscan_t yyscanner ); - -YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size , yyscan_t yyscanner ); -YY_BUFFER_STATE yy_scan_string ( const char *yy_str , yyscan_t yyscanner ); -YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len , yyscan_t yyscanner ); - -void *yyalloc ( yy_size_t , yyscan_t yyscanner ); -void *yyrealloc ( void *, yy_size_t , yyscan_t yyscanner ); -void yyfree ( void * , yyscan_t yyscanner ); - -#define yywrap(yyscanner) (/*CONSTCOND*/1) -#define YY_SKIP_YYWRAP - -#define yytext_ptr yytext_r - -#ifdef YY_HEADER_EXPORT_START_CONDITIONS -#define INITIAL 0 -#define props 1 -#define xcoord 2 -#define ycoord 3 -#define noderef 4 - -#endif - -#ifndef YY_NO_UNISTD_H -/* Special case for "unistd.h", since it is non-ANSI. We include it way - * down here because we want the user's section 1 to have been scanned first. - * The user has a chance to override it with an option. - */ -#include -#endif - -#define YY_EXTRA_TYPE TikzAssembler * - -int yylex_init (yyscan_t* scanner); - -int yylex_init_extra ( YY_EXTRA_TYPE user_defined, yyscan_t* scanner); - -/* Accessor methods to globals. - These are made visible to non-reentrant scanners for convenience. */ - -int yylex_destroy ( yyscan_t yyscanner ); - -int yyget_debug ( yyscan_t yyscanner ); - -void yyset_debug ( int debug_flag , yyscan_t yyscanner ); - -YY_EXTRA_TYPE yyget_extra ( yyscan_t yyscanner ); - -void yyset_extra ( YY_EXTRA_TYPE user_defined , yyscan_t yyscanner ); - -FILE *yyget_in ( yyscan_t yyscanner ); - -void yyset_in ( FILE * _in_str , yyscan_t yyscanner ); - -FILE *yyget_out ( yyscan_t yyscanner ); - -void yyset_out ( FILE * _out_str , yyscan_t yyscanner ); - - int yyget_leng ( yyscan_t yyscanner ); - -char *yyget_text ( yyscan_t yyscanner ); - -int yyget_lineno ( yyscan_t yyscanner ); - -void yyset_lineno ( int _line_number , yyscan_t yyscanner ); - -int yyget_column ( yyscan_t yyscanner ); - -void yyset_column ( int _column_no , yyscan_t yyscanner ); - -YYSTYPE * yyget_lval ( yyscan_t yyscanner ); - -void yyset_lval ( YYSTYPE * yylval_param , yyscan_t yyscanner ); - - YYLTYPE *yyget_lloc ( yyscan_t yyscanner ); - - void yyset_lloc ( YYLTYPE * yylloc_param , yyscan_t yyscanner ); - -/* Macros after this point can all be overridden by user definitions in - * section 1. - */ - -#ifndef YY_SKIP_YYWRAP -#ifdef __cplusplus -extern "C" int yywrap ( yyscan_t yyscanner ); -#else -extern int yywrap ( yyscan_t yyscanner ); -#endif -#endif - -#ifndef yytext_ptr -static void yy_flex_strncpy ( char *, const char *, int , yyscan_t yyscanner); -#endif - -#ifdef YY_NEED_STRLEN -static int yy_flex_strlen ( const char * , yyscan_t yyscanner); -#endif - -#ifndef YY_NO_INPUT - -#endif - -/* Amount of stuff to slurp up with each read. */ -#ifndef YY_READ_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k */ -#define YY_READ_BUF_SIZE 16384 -#else -#define YY_READ_BUF_SIZE 8192 -#endif /* __ia64__ */ -#endif - -/* Number of entries by which start-condition stack grows. */ -#ifndef YY_START_STACK_INCR -#define YY_START_STACK_INCR 25 -#endif - -/* Default declaration of generated scanner - a define so the user can - * easily add parameters. - */ -#ifndef YY_DECL -#define YY_DECL_IS_OURS 1 - -extern int yylex \ - (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner); - -#define YY_DECL int yylex \ - (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner) -#endif /* !YY_DECL */ - -/* yy_get_previous_state - get the state just before the EOB char was reached */ - -#undef YY_NEW_FILE -#undef YY_FLUSH_BUFFER -#undef yy_set_bol -#undef yy_new_buffer -#undef yy_set_interactive -#undef YY_DO_BEFORE_ACTION - -#ifdef YY_DECL_IS_OURS -#undef YY_DECL_IS_OURS -#undef YY_DECL -#endif - -#ifndef yy_create_buffer_ALREADY_DEFINED -#undef yy_create_buffer -#endif -#ifndef yy_delete_buffer_ALREADY_DEFINED -#undef yy_delete_buffer -#endif -#ifndef yy_scan_buffer_ALREADY_DEFINED -#undef yy_scan_buffer -#endif -#ifndef yy_scan_string_ALREADY_DEFINED -#undef yy_scan_string -#endif -#ifndef yy_scan_bytes_ALREADY_DEFINED -#undef yy_scan_bytes -#endif -#ifndef yy_init_buffer_ALREADY_DEFINED -#undef yy_init_buffer -#endif -#ifndef yy_flush_buffer_ALREADY_DEFINED -#undef yy_flush_buffer -#endif -#ifndef yy_load_buffer_state_ALREADY_DEFINED -#undef yy_load_buffer_state -#endif -#ifndef yy_switch_to_buffer_ALREADY_DEFINED -#undef yy_switch_to_buffer -#endif -#ifndef yypush_buffer_state_ALREADY_DEFINED -#undef yypush_buffer_state -#endif -#ifndef yypop_buffer_state_ALREADY_DEFINED -#undef yypop_buffer_state -#endif -#ifndef yyensure_buffer_stack_ALREADY_DEFINED -#undef yyensure_buffer_stack -#endif -#ifndef yylex_ALREADY_DEFINED -#undef yylex -#endif -#ifndef yyrestart_ALREADY_DEFINED -#undef yyrestart -#endif -#ifndef yylex_init_ALREADY_DEFINED -#undef yylex_init -#endif -#ifndef yylex_init_extra_ALREADY_DEFINED -#undef yylex_init_extra -#endif -#ifndef yylex_destroy_ALREADY_DEFINED -#undef yylex_destroy -#endif -#ifndef yyget_debug_ALREADY_DEFINED -#undef yyget_debug -#endif -#ifndef yyset_debug_ALREADY_DEFINED -#undef yyset_debug -#endif -#ifndef yyget_extra_ALREADY_DEFINED -#undef yyget_extra -#endif -#ifndef yyset_extra_ALREADY_DEFINED -#undef yyset_extra -#endif -#ifndef yyget_in_ALREADY_DEFINED -#undef yyget_in -#endif -#ifndef yyset_in_ALREADY_DEFINED -#undef yyset_in -#endif -#ifndef yyget_out_ALREADY_DEFINED -#undef yyget_out -#endif -#ifndef yyset_out_ALREADY_DEFINED -#undef yyset_out -#endif -#ifndef yyget_leng_ALREADY_DEFINED -#undef yyget_leng -#endif -#ifndef yyget_text_ALREADY_DEFINED -#undef yyget_text -#endif -#ifndef yyget_lineno_ALREADY_DEFINED -#undef yyget_lineno -#endif -#ifndef yyset_lineno_ALREADY_DEFINED -#undef yyset_lineno -#endif -#ifndef yyget_column_ALREADY_DEFINED -#undef yyget_column -#endif -#ifndef yyset_column_ALREADY_DEFINED -#undef yyset_column -#endif -#ifndef yywrap_ALREADY_DEFINED -#undef yywrap -#endif -#ifndef yyget_lval_ALREADY_DEFINED -#undef yyget_lval -#endif -#ifndef yyset_lval_ALREADY_DEFINED -#undef yyset_lval -#endif -#ifndef yyget_lloc_ALREADY_DEFINED -#undef yyget_lloc -#endif -#ifndef yyset_lloc_ALREADY_DEFINED -#undef yyset_lloc -#endif -#ifndef yyalloc_ALREADY_DEFINED -#undef yyalloc -#endif -#ifndef yyrealloc_ALREADY_DEFINED -#undef yyrealloc -#endif -#ifndef yyfree_ALREADY_DEFINED -#undef yyfree -#endif -#ifndef yytext_ALREADY_DEFINED -#undef yytext -#endif -#ifndef yyleng_ALREADY_DEFINED -#undef yyleng -#endif -#ifndef yyin_ALREADY_DEFINED -#undef yyin -#endif -#ifndef yyout_ALREADY_DEFINED -#undef yyout -#endif -#ifndef yy_flex_debug_ALREADY_DEFINED -#undef yy_flex_debug -#endif -#ifndef yylineno_ALREADY_DEFINED -#undef yylineno -#endif -#ifndef yytables_fload_ALREADY_DEFINED -#undef yytables_fload -#endif -#ifndef yytables_destroy_ALREADY_DEFINED -#undef yytables_destroy -#endif -#ifndef yyTABLES_NAME_ALREADY_DEFINED -#undef yyTABLES_NAME -#endif - -#line 195 "src/data/tikzlexer.l" - -#line 524 "tikzlexer.h" -#undef yyIN_HEADER -#endif /* yyHEADER_H */ -- cgit v1.2.3 From 3f8e544a9062ebe956ba21e12ea8878ba3afb4ba Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Sat, 20 Oct 2018 11:38:07 +0200 Subject: removed new-style QAction constructors --- src/gui/toolpalette.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/gui/toolpalette.cpp b/src/gui/toolpalette.cpp index 82b8ba0..d9ea05b 100644 --- a/src/gui/toolpalette.cpp +++ b/src/gui/toolpalette.cpp @@ -42,10 +42,12 @@ ToolPalette::ToolPalette(QWidget *parent) : // edge = new QAction(QIcon(":/images/Inkscape_icons_draw_path.svg"), "Add Edge"); // crop = new QAction(QIcon(":/images/crop.svg"), "Bounding Box"); - select = new QAction(QIcon(":/images/tikzit-tool-select.svg"), "Select (s)"); - vertex = new QAction(QIcon(":/images/tikzit-tool-node.svg"), "Add Vertex (v)"); - edge = new QAction(QIcon(":/images/tikzit-tool-edge.svg"), "Add Edge (e)"); - //crop = new QAction(QIcon(":/images/crop.svg"), "Bounding Box"); + select = new QAction("Select (s)", this); + select->setIcon(QIcon(":/images/tikzit-tool-select.svg")); + vertex = new QAction("Add Vertex (v)", this); + vertex->setIcon(QIcon(":/images/tikzit-tool-node.svg")); + edge = new QAction("Add Edge (e)", this); + edge->setIcon(QIcon(":/images/tikzit-tool-edge.svg")); tools->addAction(select); -- cgit v1.2.3 From 4f0539769acc2cef5b16e1bb14a3170437fe606f Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Sat, 20 Oct 2018 12:04:46 +0200 Subject: updated readme (#18) and turned mac deployment back on --- .travis.yml | 2 +- README.md | 28 +++++++++++++++++++++++++++- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 98be8d2..5c5e8cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: cpp env: - - DEPLOY_TIKZIT=0 + - DEPLOY_TIKZIT=1 matrix: include: diff --git a/README.md b/README.md index 24753cf..5ae4ba9 100644 --- a/README.md +++ b/README.md @@ -13,14 +13,30 @@ To install Qt VS Tools in Visual Studio 2017, go to `Tools > Extensions and Upda The only dependency besides Qt itself is flex/bison, which is used to build the TikZ parser. The simplest way to install this is to download WinFlexBison, then rename or copy `win_flex.exe` and `win_bison.exe` to `flex.exe` and `bison.exe` respectively, and make sure both are in your `%PATH%` so the build tools can find them. +You can alternatively build from the command line with mingw or Visual Studio, and install necessary dependencies via Chocolatey. This setup has been tested on Windows 10 with Visual Studio 2015 and Qt 5.11.1. After installing Qt 5.11 and Visual Studio, run the following commands in a `cmd` prompt: + + + choco install winflexbison + C:\Qt\5.11.1\msvc2015_64\bin\qtenv2.bat + call "C:\ProgramFiles (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64 + cd C:\path\to\tikzit + qmake + nmake.exe + + ## Building on Linux -This should be buildable in Linux using a "standard" dev setup (gcc, flex, bison, make). You will also need to configure Qt (see instructions for openSUSE, Ubuntu and Arch Linux). After that, building is: +This should be buildable in Linux using a "standard" dev setup (gcc, flex, bison, make) as well as Qt. It has been tested with Qt 5.9, which is packaged with Ubuntu 18.04 (Bionic Beaver). The setup on Ubuntu is: + + $ sudo apt-get install flex bison qt5-default + +After that, building is: $ qmake $ make +Building on other distributions should be similar. For Qt setup, you can find instructions for openSUSE and Arch Linux on the Qt wiki. ## Building on MacOS @@ -39,6 +55,16 @@ Then, TikZiT is built just like a normal Qt project: $ make +On older systems (pre-10.11), you can build with Qt 5.6, which claims to support Mac OS as far back as Mountain Lion. It is installable via MacPorts: + + $ sudo port -N -k install qt56 + $ export PATH=/opt/local/libexec/qt5/bin:$PATH + +Then, you should be able to run `qmake && make`, as above. + + + + ## Building Poppler with Qt bindings Although TikZiT doesn't currently support PDF preview, it probably will in the near future via Poppler. Here's the instructions for building it as a developer. -- cgit v1.2.3 From 99f84f5e5c149284bb6f7efb16fb729c77c07df0 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Sat, 20 Oct 2018 12:19:22 +0200 Subject: set mountain lion job to deploy --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5c5e8cd..c7308fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,5 @@ language: cpp -env: - - DEPLOY_TIKZIT=1 - matrix: include: - os: osx @@ -10,11 +7,13 @@ matrix: env: - FILE=tikzit-osx.dmg - QTVER=511 + - DEPLOY_TIKZIT=0 - os: osx compiler: clang env: - FILE=tikzit-osx-mountain.dmg - QTVER=56 + - DEPLOY_TIKZIT=1 # - os: linux # dist: trusty # env: -- cgit v1.2.3 From 80e9e6f36b4032ed8e1e645ac02b0d38e3e03be2 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Sat, 20 Oct 2018 13:02:10 +0200 Subject: turned deploy back off, added appveyor build for linux --- .appveyor.yml | 22 +++++++++++----------- .travis.yml | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index a53c00d..0242a99 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,23 +1,23 @@ version: '{branch}-{build}' -environment: - matrix: - # - QTDIR: C:\Qt\5.11.1\mingw53_32 - # - QTDIR: C:\Qt\5.11.1\msvc2015 - - QTDIR: C:\Qt\5.11.1\msvc2015_64 +image: + - Visual Studio 2015 + - Ubuntu configuration: - release install: - - choco install winflexbison - - '%QTDIR%\bin\qtenv2.bat' - - call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64 - - cd C:\projects\tikzit - + - cmd: choco install winflexbison + - cmd: 'C:\Qt\5.11.1\msvc2015_64\bin\qtenv2.bat' + - cmd: call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64 + - cmd: cd C:\projects\tikzit + - sh: sudo apt-get install flex bison + - sh: sudo apt-get install qt5-default build_script: - qmake -v - qmake - - nmake.exe + - cmd: nmake.exe + - sh: make diff --git a/.travis.yml b/.travis.yml index c7308fc..1f6853f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ matrix: env: - FILE=tikzit-osx-mountain.dmg - QTVER=56 - - DEPLOY_TIKZIT=1 + - DEPLOY_TIKZIT=0 # - os: linux # dist: trusty # env: -- cgit v1.2.3 From 4d2b59c1dcd7dc9270ab4a9cde38240a1eb6fa85 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Sat, 20 Oct 2018 13:08:22 +0200 Subject: added -y flag --- .appveyor.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 0242a99..20b2c0b 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -12,8 +12,7 @@ install: - cmd: 'C:\Qt\5.11.1\msvc2015_64\bin\qtenv2.bat' - cmd: call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64 - cmd: cd C:\projects\tikzit - - sh: sudo apt-get install flex bison - - sh: sudo apt-get install qt5-default + - sh: sudo apt-get -y install flex bison qt5-default build_script: - qmake -v -- cgit v1.2.3 From f9ca96eb9eb6dc10152b962ee31b6bc90c0a3347 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Sat, 20 Oct 2018 13:17:12 +0200 Subject: use 1804 image --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 20b2c0b..9ae0916 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -2,7 +2,7 @@ version: '{branch}-{build}' image: - Visual Studio 2015 - - Ubuntu + - Ubuntu1804 configuration: - release -- cgit v1.2.3 From 8b3d8aeba693908f4b1b21aa46d394786c35db28 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Sat, 20 Oct 2018 13:22:25 +0200 Subject: update apt --- .appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 9ae0916..e2cb33e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,8 +1,8 @@ version: '{branch}-{build}' image: - - Visual Studio 2015 - Ubuntu1804 + - Visual Studio 2015 configuration: - release @@ -12,6 +12,7 @@ install: - cmd: 'C:\Qt\5.11.1\msvc2015_64\bin\qtenv2.bat' - cmd: call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64 - cmd: cd C:\projects\tikzit + - sh: sudo apt-get update - sh: sudo apt-get -y install flex bison qt5-default build_script: -- cgit v1.2.3 From c2fcad0f3fdaba6690258ad8d059f36c9eba95cb Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Sat, 20 Oct 2018 14:46:45 +0200 Subject: added about box --- src/gui/mainmenu.cpp | 37 +++++++++++++++++++++++++++++++++++++ src/gui/mainmenu.h | 6 ++++++ src/gui/mainmenu.ui | 28 ++++++++++++++++++++++++++++ src/gui/mainwindow.cpp | 5 +++++ src/gui/mainwindow.h | 2 ++ src/tikzit.cpp | 35 ++++++++++++++++++++++++++++++++++- src/tikzit.h | 10 +++++++--- tikzit.pro | 2 +- 8 files changed, 120 insertions(+), 5 deletions(-) diff --git a/src/gui/mainmenu.cpp b/src/gui/mainmenu.cpp index 7d74fbe..b530f58 100644 --- a/src/gui/mainmenu.cpp +++ b/src/gui/mainmenu.cpp @@ -20,10 +20,19 @@ #include "tikzit.h" #include +#include +#include MainMenu::MainMenu() { + QSettings settings("tikzit", "tikzit"); ui.setupUi(this); + + if (!settings.value("check-for-updates").isNull()) { + ui.actionCheck_for_updates_automatically->blockSignals(true); + ui.actionCheck_for_updates_automatically->setChecked(settings.value("check-for-updates").toBool()); + ui.actionCheck_for_updates_automatically->blockSignals(false); + } } void MainMenu::addDocks(QMenu *m) @@ -34,6 +43,11 @@ void MainMenu::addDocks(QMenu *m) } } +QAction *MainMenu::updatesAction() +{ + return ui.actionCheck_for_updates_automatically; +} + // File void MainMenu::on_actionNew_triggered() { @@ -225,3 +239,26 @@ void MainMenu::on_actionZoom_Out_triggered() { if (tikzit->activeWindow() != 0) tikzit->activeWindow()->tikzView()->zoomOut(); } + +void MainMenu::on_actionAbout_triggered() +{ + QMessageBox::about(this, + "TikZiT", + "

TikZiT

" + "

version " TIKZIT_VERSION "

" + "

TikZiT is a GUI diagram editor for PGF/TikZ. It is licensed under the " + "GNU General " + "Public License, version 3.0.

" + "

For more info and updates, visit: " + "tikzit.github.io

"); +} + +void MainMenu::on_actionCheck_for_updates_automatically_triggered() +{ + qDebug() << "check automatically:" << ui.actionCheck_for_updates_automatically->isChecked(); +} + +void MainMenu::on_actionCheck_now_triggered() +{ + qDebug() << "check now"; +} diff --git a/src/gui/mainmenu.h b/src/gui/mainmenu.h index 82c447e..c14a284 100644 --- a/src/gui/mainmenu.h +++ b/src/gui/mainmenu.h @@ -29,6 +29,7 @@ class MainMenu : public QMenuBar public: MainMenu(); void addDocks(QMenu *m); + QAction *updatesAction(); private: Ui::MainMenu ui; @@ -70,6 +71,11 @@ public slots: // View void on_actionZoom_In_triggered(); void on_actionZoom_Out_triggered(); + + // Help + void on_actionAbout_triggered(); + void on_actionCheck_for_updates_automatically_triggered(); + void on_actionCheck_now_triggered(); }; #endif // MAINMENU_H diff --git a/src/gui/mainmenu.ui b/src/gui/mainmenu.ui index d144fce..0481c1d 100644 --- a/src/gui/mainmenu.ui +++ b/src/gui/mainmenu.ui @@ -82,6 +82,15 @@ + + + Help + + + + + + New... @@ -308,10 +317,29 @@ Ctrl+[ + + + true + + + Check for updates automatically + + + + + Check now + + + + + About + + + diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index d4d13b5..c450b5b 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -144,6 +144,11 @@ void MainWindow::changeEvent(QEvent *event) QMainWindow::changeEvent(event); } +MainMenu *MainWindow::menu() const +{ + return _menu; +} + StylePalette *MainWindow::stylePalette() const { return _stylePalette; diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h index a000784..21fbd5a 100644 --- a/src/gui/mainwindow.h +++ b/src/gui/mainwindow.h @@ -40,6 +40,8 @@ public: QString tikzSource(); void setSourceLine(int line); + MainMenu *menu() const; + public slots: void on_tikzSource_textChanged(); void updateFileName(); diff --git a/src/tikzit.cpp b/src/tikzit.cpp index 585e906..fc81739 100644 --- a/src/tikzit.cpp +++ b/src/tikzit.cpp @@ -106,7 +106,19 @@ void Tikzit::init() QString styleFile = settings.value("previous-tikzstyles-file").toString(); if (!styleFile.isEmpty()) loadStyles(styleFile); - //connect(app, &QApplication::focusChanged, this, &focusChanged); + QVariant check = settings.value("check-for-updates"); + if (check.isNull()) { + int resp = QMessageBox::question(0, + tr("Check for updates"), + tr("Would you like TikZiT to check for updates automatically?" + " (You can always change this later in the Help menu.)"), + QMessageBox::Yes | QMessageBox::Default, + QMessageBox::No, + QMessageBox::NoButton); + check.setValue(resp == QMessageBox::Yes); + } + + setCheckForUpdates(check.toBool()); } //QMenuBar *Tikzit::mainMenu() const @@ -327,6 +339,27 @@ QString Tikzit::styleFilePath() const return _styleFilePath; } +void Tikzit::setCheckForUpdates(bool check) +{ + QSettings settings("tikzit", "tikzit"); + settings.setValue("check-for-updates", check); + foreach (MainWindow *w, _windows) { + w->menu()->updatesAction()->blockSignals(true); + w->menu()->updatesAction()->setChecked(check); + w->menu()->updatesAction()->blockSignals(false); + } +} + +void Tikzit::checkForUpdates() +{ + +} + +void Tikzit::updateReply(QNetworkReply *reply) +{ + +} + //StylePalette *Tikzit::stylePalette() const //{ // return _stylePalette; diff --git a/src/tikzit.h b/src/tikzit.h index 8980f17..87599e7 100644 --- a/src/tikzit.h +++ b/src/tikzit.h @@ -49,6 +49,8 @@ #ifndef TIKZIT_H #define TIKZIT_H +#define TIKZIT_VERSION "2.0-rc1" + #include "mainwindow.h" #include "mainmenu.h" #include "ui_mainmenu.h" @@ -67,6 +69,7 @@ #include #include #include +#include // Number of pixels between (0,0) and (1,0) at 100% zoom level. This should be // divisible by 8 to avoid rounding errors with e.g. grid-snapping. @@ -107,8 +110,6 @@ public: void removeWindow(MainWindow *w); static QFont LABEL_FONT; -// Ui::MainMenu *_mainMenuUi; -// QMenuBar *_mainMenu; void newDoc(); void open(); @@ -132,7 +133,10 @@ public: QString styleFilePath() const; public slots: - //void focusChanged(QWidget *old, QWidget *nw); + void setCheckForUpdates(bool check); + void checkForUpdates(); + void updateReply(QNetworkReply *reply); + private: // void createMenu(); diff --git a/tikzit.pro b/tikzit.pro index c4b8f84..0f3e24c 100644 --- a/tikzit.pro +++ b/tikzit.pro @@ -4,7 +4,7 @@ # #------------------------------------------------- -QT += core gui widgets +QT += core gui widgets network test { CONFIG += testcase -- cgit v1.2.3 From 24fbb3b7aca8dd5b957397a046d3cb71a00b324c Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Sun, 21 Oct 2018 13:33:13 +0200 Subject: add automatic update checking (closes #33) --- src/gui/mainmenu.cpp | 4 ++-- src/tikzit.cpp | 41 ++++++++++++++++++++++++++++++++++++++++- src/tikzit.h | 4 ++-- 3 files changed, 44 insertions(+), 5 deletions(-) diff --git a/src/gui/mainmenu.cpp b/src/gui/mainmenu.cpp index b530f58..8166c59 100644 --- a/src/gui/mainmenu.cpp +++ b/src/gui/mainmenu.cpp @@ -255,10 +255,10 @@ void MainMenu::on_actionAbout_triggered() void MainMenu::on_actionCheck_for_updates_automatically_triggered() { - qDebug() << "check automatically:" << ui.actionCheck_for_updates_automatically->isChecked(); + tikzit->setCheckForUpdates(ui.actionCheck_for_updates_automatically->isChecked()); } void MainMenu::on_actionCheck_now_triggered() { - qDebug() << "check now"; + tikzit->checkForUpdates(); } diff --git a/src/tikzit.cpp b/src/tikzit.cpp index fc81739..5d1fef4 100644 --- a/src/tikzit.cpp +++ b/src/tikzit.cpp @@ -25,6 +25,9 @@ #include #include #include +#include +#include +#include // application-level instance of Tikzit Tikzit *tikzit; @@ -119,6 +122,10 @@ void Tikzit::init() } setCheckForUpdates(check.toBool()); + + if (check.toBool()) { + checkForUpdates(); + } } //QMenuBar *Tikzit::mainMenu() const @@ -352,12 +359,44 @@ void Tikzit::setCheckForUpdates(bool check) void Tikzit::checkForUpdates() { + QNetworkAccessManager *manager = new QNetworkAccessManager(this); + connect(manager, SIGNAL(finished(QNetworkReply*)), + this, SLOT(updateReply(QNetworkReply*))); + manager->get(QNetworkRequest(QUrl("http://tikzit.github.io/latest-version.txt"))); } void Tikzit::updateReply(QNetworkReply *reply) { - + if (!reply->isReadable()) return; + + QByteArray data = reply->read(200); + QString strLatest = QString::fromUtf8(data).simplified(); + qDebug() << "got response:" << strLatest; + + QVersionNumber current = QVersionNumber::fromString(TIKZIT_VERSION).normalized(); + QVersionNumber latest = QVersionNumber::fromString(strLatest).normalized(); + + // check for an optional RC suffix. Any non-RC versions are considered later than RC versions. + QRegularExpression re("-[rR][cC]([0-9]+)$"); + QRegularExpressionMatch m; + m = re.match(TIKZIT_VERSION); + int rcCurrent = (m.hasMatch()) ? m.captured(1).toInt() : 1000; + m = re.match(strLatest); + int rcLatest = (m.hasMatch()) ? m.captured(1).toInt() : 1000; + + //qDebug() << "latest" << latest << "rc" << rcLatest; + //qDebug() << "current" << current << "rc" << rcCurrent; + + if (latest > current || (latest == current && rcLatest > rcCurrent)) { + QMessageBox::information(0, + tr("Update available"), + "

A new version of TikZiT is available!

" + "

current version: " TIKZIT_VERSION "
" + "latest version: " + strLatest + "

" + "

Download it now from: " + "tikzit.github.io.

"); + } } //StylePalette *Tikzit::stylePalette() const diff --git a/src/tikzit.h b/src/tikzit.h index 87599e7..635ee5e 100644 --- a/src/tikzit.h +++ b/src/tikzit.h @@ -49,7 +49,7 @@ #ifndef TIKZIT_H #define TIKZIT_H -#define TIKZIT_VERSION "2.0-rc1" +#define TIKZIT_VERSION "2.0-rc3" #include "mainwindow.h" #include "mainmenu.h" @@ -69,7 +69,7 @@ #include #include #include -#include +#include // Number of pixels between (0,0) and (1,0) at 100% zoom level. This should be // divisible by 8 to avoid rounding errors with e.g. grid-snapping. -- cgit v1.2.3 From c9ad86390fe5519e97a0b0f26b01de1bbddcba41 Mon Sep 17 00:00:00 2001 From: Ingo Blechschmidt Date: Sun, 21 Oct 2018 16:11:24 +0200 Subject: Use https instead of http for improved security --- src/tikzit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tikzit.cpp b/src/tikzit.cpp index 5d1fef4..fdbc9d8 100644 --- a/src/tikzit.cpp +++ b/src/tikzit.cpp @@ -363,7 +363,7 @@ void Tikzit::checkForUpdates() connect(manager, SIGNAL(finished(QNetworkReply*)), this, SLOT(updateReply(QNetworkReply*))); - manager->get(QNetworkRequest(QUrl("http://tikzit.github.io/latest-version.txt"))); + manager->get(QNetworkRequest(QUrl("https://tikzit.github.io/latest-version.txt"))); } void Tikzit::updateReply(QNetworkReply *reply) -- cgit v1.2.3 From f0c92dbae31b12799d0622b8219d7841ab10464f Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Mon, 22 Oct 2018 11:25:59 +0200 Subject: updated version in header and added deploy scripts --- .gitignore | 3 +++ deploy-linux.sh | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ deploy-osx.sh | 2 +- deploy-win.bat | 7 +++++ src/tikzit.cpp | 2 +- src/tikzit.h | 2 +- 6 files changed, 95 insertions(+), 3 deletions(-) create mode 100755 deploy-linux.sh create mode 100755 deploy-win.bat diff --git a/.gitignore b/.gitignore index 6894d5e..0fb2e43 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,6 @@ moc_*.h ui_*.h qrc_*.cpp tikzit +tikzlexer.h +dist + diff --git a/deploy-linux.sh b/deploy-linux.sh new file mode 100755 index 0000000..4e92b95 --- /dev/null +++ b/deploy-linux.sh @@ -0,0 +1,82 @@ +#!/bin/bash + +# directory where libQt5XXX.so files can be found +LIBDIR=/usr/lib/x86_64-linux-gnu + +# directory where Qt plugins can be found +PLUGINDIR=$LIBDIR/qt5/plugins + +mkdir -p dist/tikzit +cd dist/tikzit +mkdir -p opt +mkdir -p bin +mkdir -p lib +mkdir -p plugins + +# add README file +cat > README << 'EOF' +This is a portable version of TikZiT 2.0. To launch TikZiT, simply run +'bin/tikzit'. To install launcher and icons for the current user, make +sure the 'bin' sub-directory is in your $PATH and run: + +# ./install-local.sh + +inside the tikzit directory. + + +TikZiT is released under the GNU General Public License, Version 3. See: + +http://tikzit.github.io + +for full details and source code. +EOF + +# add helper scripts +cat > install-local.sh << 'EOF' +#!/bin/bash + +mkdir -p ~/.local +cp -r share ~/.local/ +update-mime-database ~/.local/share/mime +update-desktop-database ~/.local/share/applications +EOF +chmod +x install-local.sh + +cat > bin/tikzit << 'EOF' +#!/bin/bash + +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && cd .. && pwd )" +LD_LIBRARY_PATH=$DIR/lib:$LD_LIBRARY_PATH QT_PLUGIN_PATH=$DIR/plugins $DIR/opt/tikzit $@ +EOF +chmod +x bin/tikzit + +# add tikzit binary +cp ../../tikzit opt + +# add icons, desktop entry, and MIME data +cp -R ../../share . + +# add Qt libs. Keep shortened lib names as symlinks. +cp --no-dereference $LIBDIR/libQt5Core.so* lib +cp --no-dereference $LIBDIR/libQt5DBus.so* lib +cp --no-dereference $LIBDIR/libQt5Widgets.so* lib +cp --no-dereference $LIBDIR/libQt5Svg.so* lib +cp --no-dereference $LIBDIR/libQt5Network.so* lib +cp --no-dereference $LIBDIR/libQt5Gui.so* lib +cp --no-dereference $LIBDIR/libQt5XcbQpa.so* lib + +# add libicu, which is required by Qt5 for unicode support +cp --no-dereference $LIBDIR/libicuuc.so* lib +cp --no-dereference $LIBDIR/libicui18n.so* lib +cp --no-dereference $LIBDIR/libicudata.so* lib + +# add Qt plugins used by TikZiT +cp -R $PLUGINDIR/platforms plugins +cp -R $PLUGINDIR/imageformats plugins +cp -R $PLUGINDIR/platforminputcontexts plugins +cp -R $PLUGINDIR/xcbglintegrations plugins + +# create tar.gz +cd .. +tar czf tikzit.tar.gz tikzit + diff --git a/deploy-osx.sh b/deploy-osx.sh index a04f7f7..15d69f7 100755 --- a/deploy-osx.sh +++ b/deploy-osx.sh @@ -1,5 +1,5 @@ # deploy the Mac app bundle. Note the bin/ directory # of Qt should be in your PATH -macdeployqt tikzit.app +macdeployqt tikzit.app -dmg diff --git a/deploy-win.bat b/deploy-win.bat new file mode 100755 index 0000000..dbd6e9a --- /dev/null +++ b/deploy-win.bat @@ -0,0 +1,7 @@ +mkdir dist +cd dist +mkdir tikzit +cd tikzit +cp ..\..\tikzit.exe . + +windeployqt.exe --no-webkit2 --no-angle --no-opengl-sw --no-system-d3d-compiler --no-translations --no-quick-import .\tikzit.exe \ No newline at end of file diff --git a/src/tikzit.cpp b/src/tikzit.cpp index 5d1fef4..4fd4227 100644 --- a/src/tikzit.cpp +++ b/src/tikzit.cpp @@ -372,7 +372,7 @@ void Tikzit::updateReply(QNetworkReply *reply) QByteArray data = reply->read(200); QString strLatest = QString::fromUtf8(data).simplified(); - qDebug() << "got response:" << strLatest; + //qDebug() << "got response:" << strLatest; QVersionNumber current = QVersionNumber::fromString(TIKZIT_VERSION).normalized(); QVersionNumber latest = QVersionNumber::fromString(strLatest).normalized(); diff --git a/src/tikzit.h b/src/tikzit.h index 635ee5e..69e9237 100644 --- a/src/tikzit.h +++ b/src/tikzit.h @@ -49,7 +49,7 @@ #ifndef TIKZIT_H #define TIKZIT_H -#define TIKZIT_VERSION "2.0-rc3" +#define TIKZIT_VERSION "2.0" #include "mainwindow.h" #include "mainmenu.h" -- cgit v1.2.3 From bf00eb54644dbe5fb766f52b999b4128ecf755f0 Mon Sep 17 00:00:00 2001 From: Ingo Blechschmidt Date: Mon, 22 Oct 2018 15:56:45 +0200 Subject: Allow for the standard way of passing PREFIX to qmake (fixes #35) --- tikzit.pro | 2 -- 1 file changed, 2 deletions(-) diff --git a/tikzit.pro b/tikzit.pro index 0f3e24c..c6f92ab 100644 --- a/tikzit.pro +++ b/tikzit.pro @@ -13,8 +13,6 @@ test { TARGET = tikzit TEMPLATE = app -PREFIX = $$(PREFIX) - isEmpty(PREFIX) { PREFIX=/usr/local } -- cgit v1.2.3 From d005c0ab40b98a5d91a85e288715d948d25c2274 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Mon, 22 Oct 2018 20:48:16 +0200 Subject: added https and linux deploy --- .appveyor.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml index e2cb33e..4675ef3 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,5 +1,8 @@ version: '{branch}-{build}' +environment: + DEPLOY: 1 + image: - Ubuntu1804 - Visual Studio 2015 @@ -21,3 +24,7 @@ build_script: - cmd: nmake.exe - sh: make +after_build: + - sh: ./deploy-linux.sh + - sh: mv dist/tikzit.tar.gz tikzit-linux.tar.gz + - sh: '[[ "$DEPLOY" != 1 ]] || curl -U tikzit-linux.tar.gz https://transfer.sh/tikzit-linux.tar.gz' -- cgit v1.2.3 From 253df5f1d9e8915dfc62261dd338b96014dc1984 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Mon, 22 Oct 2018 20:14:15 +0200 Subject: updated windows deploy script --- deploy-win.bat | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/deploy-win.bat b/deploy-win.bat index dbd6e9a..c06733f 100755 --- a/deploy-win.bat +++ b/deploy-win.bat @@ -2,6 +2,16 @@ mkdir dist cd dist mkdir tikzit cd tikzit -cp ..\..\tikzit.exe . +mkdir icons -windeployqt.exe --no-webkit2 --no-angle --no-opengl-sw --no-system-d3d-compiler --no-translations --no-quick-import .\tikzit.exe \ No newline at end of file +copy ..\..\tikzfiles.reg . +copy ..\..\release\tikzit.exe . +copy ..\..\images\tikzdoc.ico icons\ +copy C:\Windows\System32\msvcp140.dll . +copy C:\Windows\System32\vcruntime140.dll . + +windeployqt.exe --no-compiler-runtime --no-webkit2 --no-angle --no-opengl-sw --no-system-d3d-compiler --no-translations --no-quick-import .\tikzit.exe + +cd .. +7z a -tzip tikzit.zip tikzit +cd .. -- cgit v1.2.3 From b0d269838f2683b1d886a99ed2e979f256515ad1 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 23 Oct 2018 05:58:42 +0200 Subject: all deploy flags on --- .appveyor.yml | 16 ++++++++++++---- .travis.yml | 4 ++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 4675ef3..8b50ed7 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,8 +1,5 @@ version: '{branch}-{build}' -environment: - DEPLOY: 1 - image: - Ubuntu1804 - Visual Studio 2015 @@ -27,4 +24,15 @@ build_script: after_build: - sh: ./deploy-linux.sh - sh: mv dist/tikzit.tar.gz tikzit-linux.tar.gz - - sh: '[[ "$DEPLOY" != 1 ]] || curl -U tikzit-linux.tar.gz https://transfer.sh/tikzit-linux.tar.gz' + # - sh: '[[ "$DEPLOY" != 1 ]] || curl -U tikzit-linux.tar.gz https://transfer.sh/tikzit-linux.tar.gz' + - cmd: deploy-win.bat + - cmd: move dist/tikzit.zip tikzit-win.zip + # - cmd: 'if "%DEPLOY%" == "1" curl -U tikzit-win.zip https://transfer.sh/tikzit-win.zip' + +artifacts: + - file: tikzit-win.zip + name: tikzit + - file: tikzit-linux.tar.gz + name: tikzit + + diff --git a/.travis.yml b/.travis.yml index 1f6853f..1e8c421 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,13 +7,13 @@ matrix: env: - FILE=tikzit-osx.dmg - QTVER=511 - - DEPLOY_TIKZIT=0 + - DEPLOY_TIKZIT=1 - os: osx compiler: clang env: - FILE=tikzit-osx-mountain.dmg - QTVER=56 - - DEPLOY_TIKZIT=0 + - DEPLOY_TIKZIT=1 # - os: linux # dist: trusty # env: -- cgit v1.2.3 From 64778412008ae873bbb3914391049cad090560a6 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 23 Oct 2018 06:09:05 +0200 Subject: added reg file --- tikzfiles.reg | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 tikzfiles.reg diff --git a/tikzfiles.reg b/tikzfiles.reg new file mode 100644 index 0000000..ef48000 --- /dev/null +++ b/tikzfiles.reg @@ -0,0 +1,19 @@ +Windows Registry Editor Version 5.00 + +[HKEY_CLASSES_ROOT\.tikz] +@="tikzit" + +[HKEY_CLASSES_ROOT\tikzit\DefaultIcon] +@="C:\\tikzit\\icons\\tikzdoc.ico,0" + +[HKEY_CLASSES_ROOT\tikzit\shell\open\command] +@="\"C:\\tikzit\\tikzit.exe\" \"%1\"" + +[HKEY_CLASSES_ROOT\Applications\tikzit.exe] +"FriendlyAppName"="TikZiT" + +[HKEY_CLASSES_ROOT\Applications\tikzit.exe\shell\open\command] +@="C:\\tikzit\\tikzit.exe" + +[HKEY_CLASSES_ROOT\Applications\tikzit.exe\SupportedTypes] +".tikz"="" -- cgit v1.2.3 From 5c5e602dbcdc6654a64e099476baa7851d2dec41 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 23 Oct 2018 06:10:28 +0200 Subject: fixed path --- .appveyor.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 8b50ed7..d696180 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -24,15 +24,13 @@ build_script: after_build: - sh: ./deploy-linux.sh - sh: mv dist/tikzit.tar.gz tikzit-linux.tar.gz - # - sh: '[[ "$DEPLOY" != 1 ]] || curl -U tikzit-linux.tar.gz https://transfer.sh/tikzit-linux.tar.gz' - cmd: deploy-win.bat - cmd: move dist/tikzit.zip tikzit-win.zip - # - cmd: 'if "%DEPLOY%" == "1" curl -U tikzit-win.zip https://transfer.sh/tikzit-win.zip' artifacts: - - file: tikzit-win.zip + - path: tikzit-win.zip name: tikzit - - file: tikzit-linux.tar.gz + - path: tikzit-linux.tar.gz name: tikzit -- cgit v1.2.3 From 9430f4615ba4dfe626b9185921bb042b7a9aedf1 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 23 Oct 2018 06:23:52 +0200 Subject: per-build artifacts --- .appveyor.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index d696180..d221ce9 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,8 +1,15 @@ version: '{branch}-{build}' -image: - - Ubuntu1804 - - Visual Studio 2015 +matrix: + allow_failures: + - image: Ubuntu1804 + artifacts: + - path: tikzit-win.zip + - name: tikzit + - image: Visual Studio 2015 + artifacts: + - path: tikzit-linux.tar.gz + - name: tikzit configuration: - release @@ -27,10 +34,5 @@ after_build: - cmd: deploy-win.bat - cmd: move dist/tikzit.zip tikzit-win.zip -artifacts: - - path: tikzit-win.zip - name: tikzit - - path: tikzit-linux.tar.gz - name: tikzit -- cgit v1.2.3 From b653fe5ba301edb9a9d57d5c8b9039a43cdc6a4e Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 23 Oct 2018 06:27:40 +0200 Subject: ... --- .appveyor.yml | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index d221ce9..8fe100c 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,15 +1,8 @@ version: '{branch}-{build}' -matrix: - allow_failures: - - image: Ubuntu1804 - artifacts: - - path: tikzit-win.zip - - name: tikzit - - image: Visual Studio 2015 - artifacts: - - path: tikzit-linux.tar.gz - - name: tikzit +image: + - Ubuntu1804 + - Visual Studio 2015 configuration: - release @@ -31,8 +24,9 @@ build_script: after_build: - sh: ./deploy-linux.sh - sh: mv dist/tikzit.tar.gz tikzit-linux.tar.gz + - sh: appveyor PushArtifact tikzit-linux.tar.gz - cmd: deploy-win.bat - cmd: move dist/tikzit.zip tikzit-win.zip - + - cmd: appveyor PushArtifact tikzit-win.zip -- cgit v1.2.3 From 58b50e4416c0e50320550798a8122291f5f22613 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 23 Oct 2018 07:26:09 +0200 Subject: backslash --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 8fe100c..7970b58 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -26,7 +26,7 @@ after_build: - sh: mv dist/tikzit.tar.gz tikzit-linux.tar.gz - sh: appveyor PushArtifact tikzit-linux.tar.gz - cmd: deploy-win.bat - - cmd: move dist/tikzit.zip tikzit-win.zip + - cmd: move dist\tikzit.zip tikzit-win.zip - cmd: appveyor PushArtifact tikzit-win.zip -- cgit v1.2.3 From 52f57ffc613fc4510c94a8d5d1286eaed4ffba91 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 23 Oct 2018 08:06:19 +0200 Subject: added input validation on version response --- src/tikzit.cpp | 44 +++++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/src/tikzit.cpp b/src/tikzit.cpp index 58cb08e..02b8578 100644 --- a/src/tikzit.cpp +++ b/src/tikzit.cpp @@ -372,30 +372,40 @@ void Tikzit::updateReply(QNetworkReply *reply) QByteArray data = reply->read(200); QString strLatest = QString::fromUtf8(data).simplified(); - //qDebug() << "got response:" << strLatest; QVersionNumber current = QVersionNumber::fromString(TIKZIT_VERSION).normalized(); QVersionNumber latest = QVersionNumber::fromString(strLatest).normalized(); - // check for an optional RC suffix. Any non-RC versions are considered later than RC versions. - QRegularExpression re("-[rR][cC]([0-9]+)$"); + // check for valid version string and capture optional RC suffix + QRegularExpression re("^[1-9]+(\\.[0-9]+)*(-[rR][cC]([0-9]+))?$"); QRegularExpressionMatch m; m = re.match(TIKZIT_VERSION); - int rcCurrent = (m.hasMatch()) ? m.captured(1).toInt() : 1000; + + // any non-RC versions are considered later than RC versions. + int rcCurrent = (!m.captured(3).isEmpty()) ? m.captured(3).toInt() : 1000; + m = re.match(strLatest); - int rcLatest = (m.hasMatch()) ? m.captured(1).toInt() : 1000; - - //qDebug() << "latest" << latest << "rc" << rcLatest; - //qDebug() << "current" << current << "rc" << rcCurrent; - - if (latest > current || (latest == current && rcLatest > rcCurrent)) { - QMessageBox::information(0, - tr("Update available"), - "

A new version of TikZiT is available!

" - "

current version: " TIKZIT_VERSION "
" - "latest version: " + strLatest + "

" - "

Download it now from: " - "tikzit.github.io.

"); + + if (m.hasMatch()) { + int rcLatest = (!m.captured(3).isEmpty()) ? m.captured(3).toInt() : 1000; + + //qDebug() << "latest" << latest << "rc" << rcLatest; + //qDebug() << "current" << current << "rc" << rcCurrent; + + if (latest > current || (latest == current && rcLatest > rcCurrent)) { + QMessageBox::information(0, + tr("Update available"), + "

A new version of TikZiT is available!

" + "

current version: " TIKZIT_VERSION "
" + "latest version: " + strLatest + "

" + "

Download it now from: " + "tikzit.github.io.

"); + } + } else { + QMessageBox::warning(0, + tr("Invalid response"), + "

Got invalid version response from " + "tikzit.github.io.

"); } } -- cgit v1.2.3 From 9eb27d70849f22f04bfaee6e3993cd505390d869 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 23 Oct 2018 09:31:46 +0200 Subject: set lower SDK version for old mac build --- tikzit.pro | 1 + 1 file changed, 1 insertion(+) diff --git a/tikzit.pro b/tikzit.pro index c6f92ab..79ca59d 100644 --- a/tikzit.pro +++ b/tikzit.pro @@ -32,6 +32,7 @@ macx:ICON = images/tikzit.icns # Qt 5.8 and above drop support for Mountain Lion contains(QT_VERSION, ^5\\.[5-7].*) { macx:QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8 + macx:QMAKE_MAC_SDK = macosx10.11 } # The following define makes your compiler emit warnings if you use -- cgit v1.2.3 From 73dcc4c2dd5ee095ef8454f9c1d16787ee13d101 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 23 Oct 2018 09:44:19 +0200 Subject: removed sdk line --- tikzit.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tikzit.pro b/tikzit.pro index 79ca59d..9fa1d15 100644 --- a/tikzit.pro +++ b/tikzit.pro @@ -32,7 +32,7 @@ macx:ICON = images/tikzit.icns # Qt 5.8 and above drop support for Mountain Lion contains(QT_VERSION, ^5\\.[5-7].*) { macx:QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8 - macx:QMAKE_MAC_SDK = macosx10.11 + #macx:QMAKE_MAC_SDK = macosx10.11 } # The following define makes your compiler emit warnings if you use -- cgit v1.2.3 From 0eb35874c48b3078782af671a21ede98f4f92093 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 23 Oct 2018 10:59:41 +0200 Subject: back to http, but with input validation --- src/tikzit.cpp | 16 +++++++++------- src/tikzit.h | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/tikzit.cpp b/src/tikzit.cpp index 02b8578..820b8ec 100644 --- a/src/tikzit.cpp +++ b/src/tikzit.cpp @@ -363,7 +363,7 @@ void Tikzit::checkForUpdates() connect(manager, SIGNAL(finished(QNetworkReply*)), this, SLOT(updateReply(QNetworkReply*))); - manager->get(QNetworkRequest(QUrl("https://tikzit.github.io/latest-version.txt"))); + manager->get(QNetworkRequest(QUrl("http://tikzit.github.io/latest-version.txt"))); } void Tikzit::updateReply(QNetworkReply *reply) @@ -373,9 +373,6 @@ void Tikzit::updateReply(QNetworkReply *reply) QByteArray data = reply->read(200); QString strLatest = QString::fromUtf8(data).simplified(); - QVersionNumber current = QVersionNumber::fromString(TIKZIT_VERSION).normalized(); - QVersionNumber latest = QVersionNumber::fromString(strLatest).normalized(); - // check for valid version string and capture optional RC suffix QRegularExpression re("^[1-9]+(\\.[0-9]+)*(-[rR][cC]([0-9]+))?$"); QRegularExpressionMatch m; @@ -387,12 +384,17 @@ void Tikzit::updateReply(QNetworkReply *reply) m = re.match(strLatest); if (m.hasMatch()) { - int rcLatest = (!m.captured(3).isEmpty()) ? m.captured(3).toInt() : 1000; + QVersionNumber current = QVersionNumber::fromString(TIKZIT_VERSION).normalized(); + QVersionNumber latest = QVersionNumber::fromString(strLatest).normalized(); - //qDebug() << "latest" << latest << "rc" << rcLatest; - //qDebug() << "current" << current << "rc" << rcCurrent; + int rcLatest = (!m.captured(3).isEmpty()) ? m.captured(3).toInt() : 1000; if (latest > current || (latest == current && rcLatest > rcCurrent)) { + // give the version string in standard format + strLatest = QString::number(latest.majorVersion()) + "." + + QString::number(latest.minorVersion()) + "." + + QString::number(latest.microVersion()); + if (rcLatest != 1000) strLatest += "-rc" + QString::number(rcLatest); QMessageBox::information(0, tr("Update available"), "

A new version of TikZiT is available!

" diff --git a/src/tikzit.h b/src/tikzit.h index 69e9237..d36a940 100644 --- a/src/tikzit.h +++ b/src/tikzit.h @@ -49,7 +49,7 @@ #ifndef TIKZIT_H #define TIKZIT_H -#define TIKZIT_VERSION "2.0" +#define TIKZIT_VERSION "2.0.0" #include "mainwindow.h" #include "mainmenu.h" -- cgit v1.2.3 From 43233c4f76c5a96c08dcb033372294fbafbaf663 Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 23 Oct 2018 11:32:29 +0200 Subject: added https again, and including OpenSSL libs in dist --- deploy-win.bat | 2 ++ src/tikzit.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/deploy-win.bat b/deploy-win.bat index c06733f..1c19f40 100755 --- a/deploy-win.bat +++ b/deploy-win.bat @@ -9,6 +9,8 @@ copy ..\..\release\tikzit.exe . copy ..\..\images\tikzdoc.ico icons\ copy C:\Windows\System32\msvcp140.dll . copy C:\Windows\System32\vcruntime140.dll . +copy C:\OpenSSL-Win64\bin\libeay32.dll . +copy C:\OpenSSL-Win64\bin\ssleay32.dll . windeployqt.exe --no-compiler-runtime --no-webkit2 --no-angle --no-opengl-sw --no-system-d3d-compiler --no-translations --no-quick-import .\tikzit.exe diff --git a/src/tikzit.cpp b/src/tikzit.cpp index 820b8ec..c9286c9 100644 --- a/src/tikzit.cpp +++ b/src/tikzit.cpp @@ -363,7 +363,7 @@ void Tikzit::checkForUpdates() connect(manager, SIGNAL(finished(QNetworkReply*)), this, SLOT(updateReply(QNetworkReply*))); - manager->get(QNetworkRequest(QUrl("http://tikzit.github.io/latest-version.txt"))); + manager->get(QNetworkRequest(QUrl("https://tikzit.github.io/latest-version.txt"))); } void Tikzit::updateReply(QNetworkReply *reply) -- cgit v1.2.3